test(F6.1): lock read-only checklist and preparation stage

Precarga únicamente la fuente aprobada Tablas de yacimiento y areas(1).xlsx con jerarquía Departamento → Área → Yacimiento, concesiones y Operadoras. Corrige además el CHECK legacy F4 para permitir contexto físico de Área sin snapshot obligatorio de Empresa. El reset preserva usuarios/RBAC y catálogos/configuración técnica, y valida cardinalidades exactas antes de completar.

.env.example

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

.github/workflows/android.yml

@@ -1,30 +1,36 @@
-name: Android APK
+name: Android CI / RC
-# F3.1: este workflow genera la APK debug verificable de la rama antes de promoverla.
+# F6.1 presentation barrier: lint + real tests + debug artifact + release compile.
 
 on:
   push:
     branches:
-      - 'feature/f2-2*'
+      - 'main'
-      - 'feature/f2-3*'
+      - 'release/f6-1*'
-      - 'feature/f2-4*'
-      - 'feature/f3-1*'
     paths:
       - 'android-app/**'
+      - 'api-v3/src/**'
       - '.github/workflows/android.yml'
   pull_request:
+    branches:
+      - 'main'
     paths:
       - 'android-app/**'
-      - 'api-v3/src/auth/**'
+      - 'api-v3/src/**'
       - '.github/workflows/android.yml'
   workflow_dispatch:
 
 permissions:
   contents: read
 
+concurrency:
+  group: dhv2-android-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  build-debug-apk:
+  android:
+    name: Android · lint, tests, debug APK, release compile
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 35
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -46,18 +52,92 @@ jobs:
         with:
           gradle-version: '8.13'
 
-      - name: Assemble debug
+      - name: Validate mobile security and identity contract
-        working-directory: android-app
+        run: |
-        run: gradle --no-daemon :app:assembleDebug
+          set -Eeuo pipefail
+          grep -Fq 'applicationId = "com.korexlabs.dhinspeccion"' android-app/app/build.gradle.kts
+          grep -Fq 'applicationIdSuffix = ".debug"' android-app/app/build.gradle.kts
+          grep -Fq 'buildConfigField("String", "API_BASE_URL", "\"https://dhv2.korexlabs.com/api/v3/\"")' android-app/app/build.gradle.kts
+          grep -Fq 'android:allowBackup="false"' android-app/app/src/main/AndroidManifest.xml
+          grep -Fq 'android:usesCleartextTraffic="false"' android-app/app/src/main/AndroidManifest.xml
 
-      - name: Unit tests
+      - name: Android lint
+        working-directory: android-app
+        run: gradle --no-daemon :app:lintDebug
+
+      - name: Print complete lint failures
+        if: failure()
+        run: |
+          report="android-app/app/build/intermediates/lint_intermediate_text_report/debug/lintReportDebug/lint-results-debug.txt"
+          if [ -f "$report" ]; then
+            echo '========== ANDROID LINT =========='
+            cat "$report"
+          fi
+
+      - name: Android unit tests
         working-directory: android-app
         run: gradle --no-daemon :app:testDebugUnitTest
 
-      - name: Upload APK
+      - name: Require real unit-test results
+        run: |
+          set -Eeuo pipefail
+          test_dir="android-app/app/build/test-results/testDebugUnitTest"
+          test -d "$test_dir"
+          total="$(grep -h -oE '<testsuite[^>]+tests="[0-9]+"' "$test_dir"/TEST-*.xml 2>/dev/null | sed -E 's/.*tests="([0-9]+)"/\1/' | awk '{sum += $1} END {print sum + 0}')"
+          test "$total" -gt 0
+          echo "Android unit tests discovered: $total"
+
+      - name: Assemble debug APK
+        working-directory: android-app
+        run: gradle --no-daemon :app:assembleDebug
+
+      - name: Compile unsigned release variant
+        working-directory: android-app
+        run: gradle --no-daemon :app:assembleRelease
+
+      - name: Package RC artifact and checksum
+        id: package
+        run: |
+          set -Eeuo pipefail
+          version="$(sed -n 's/^[[:space:]]*versionName = "\([^"]*\)"/\1/p' android-app/app/build.gradle.kts | head -n1)"
+          code="$(sed -n 's/^[[:space:]]*versionCode = \([0-9][0-9]*\)/\1/p' android-app/app/build.gradle.kts | head -n1)"
+          test -n "$version"
+          test -n "$code"
+          short_sha="${GITHUB_SHA::12}"
+          mkdir -p android-app/dist
+          apk="android-app/dist/DH-Inspeccion-${version}-vc${code}-${short_sha}-debug.apk"
+          cp android-app/app/build/outputs/apk/debug/app-debug.apk "$apk"
+          sha256sum "$apk" > "${apk}.sha256"
+          {
+            echo "phase=F6.1"
+            echo "version=$version"
+            echo "versionCode=$code"
+            echo "commit=$GITHUB_SHA"
+            echo "artifact=$(basename "$apk")"
+            echo "applicationId=com.korexlabs.dhinspeccion.debug"
+            echo "apiBaseUrl=https://dhv2.korexlabs.com/api/v3/"
+            echo "channel=DEBUG_RC"
+          } > android-app/dist/release-metadata.txt
+          echo "version=$version" >> "$GITHUB_OUTPUT"
+          echo "version_code=$code" >> "$GITHUB_OUTPUT"
+          echo "short_sha=$short_sha" >> "$GITHUB_OUTPUT"
+
+      - name: Upload debug RC
         uses: actions/upload-artifact@v4
         with:
-          name: DH-Inspeccion-F3.1-0.11.0-debug
+          name: DH-Inspeccion-${{ steps.package.outputs.version }}-vc${{ steps.package.outputs.version_code }}-${{ steps.package.outputs.short_sha }}-debug
-          path: android-app/app/build/outputs/apk/debug/app-debug.apk
+          path: android-app/dist/*
           if-no-files-found: error
+          retention-days: 30
+
+      - name: Upload Android diagnostics
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-diagnostics-${{ github.sha }}
+          path: |
+            android-app/app/build/reports/lint-results-debug.html
+            android-app/app/build/reports/tests/testDebugUnitTest/**
+            android-app/app/build/test-results/testDebugUnitTest/**
+          if-no-files-found: ignore
           retention-days: 14

.github/workflows/ci.yml

@@ -47,6 +47,8 @@ jobs:
           cache-dependency-path: web-v2/package-lock.json
       - run: npm ci
       - run: npm run typecheck
+      - name: F3.1 WEB contract
+        run: bash ../scripts/check-f3-1-web-contract.sh
       - run: npm run build
 
   contract:
@@ -60,7 +62,208 @@ jobs:
           while IFS= read -r -d '' script; do
             bash -n "$script"
           done < <(find scripts -type f -name '*.sh' -print0)
+      - name: Validate deploy preflight parity
+        run: |
+          grep -Fq -- '$STAGE/docker-compose.yml:/docker-compose.yml:ro' scripts/deploy-github.sh
+          grep -Fq -- '$STAGE/web-v2:/web-v2:ro' scripts/deploy-github.sh
+          grep -Fq -- '$STAGE/android-app:/android-app:ro' scripts/deploy-github.sh
       - name: Validate Compose
         run: docker compose --env-file .env.example config >/dev/null
+      - name: Rehearse migrations and real API startup on clean PostGIS
+        run: |
+          set -Eeuo pipefail
+          cleanup() {
+            docker compose --env-file .env.example --profile tools down -v --remove-orphans >/dev/null 2>&1 || true
+          }
+          trap cleanup EXIT
+          cleanup
+
+          docker compose --env-file .env.example up -d db
+
+          # Historical production reset is a one-shot migration that expects the
+          # production admin. Prove the clean chain reaches that exact guard,
+          # mark only that historical reset as applied, then continue the chain.
+          bootstrap_log="$(mktemp)"
+          set +e
+          docker compose --env-file .env.example --profile tools run --build --rm migrate 2>&1 | tee "$bootstrap_log"
+          bootstrap_status=${PIPESTATUS[0]}
+          set -e
+          if [ "$bootstrap_status" -eq 0 ]; then
+            echo "ERROR: clean migration rehearsal unexpectedly passed the historical production reset." >&2
+            exit 1
+          fi
+          grep -Fq 'Production reset aborted: expected exactly one username admin, found 0' "$bootstrap_log" || {
+            echo "ERROR: migration rehearsal failed before the expected historical production-reset guard." >&2
+            exit 1
+          }
+          rm -f "$bootstrap_log"
+
+          docker compose --env-file .env.example exec -T db \
+            psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
+          DO $$
+          DECLARE reset_rows integer;
+          BEGIN
+            SELECT COUNT(*) INTO reset_rows
+            FROM typeorm_migrations
+            WHERE name = 'ResetProductionOperationalData1788652800000';
+            IF reset_rows <> 0 THEN
+              RAISE EXCEPTION 'CI one-shot bypass expected reset migration to be pending, found % rows', reset_rows;
+            END IF;
+            INSERT INTO typeorm_migrations ("timestamp", name)
+            VALUES (1788652800000, 'ResetProductionOperationalData1788652800000');
+          END $$;
+          SQL
+
+          docker compose --env-file .env.example --profile tools run --rm migrate
+
+          # F5.1 performs the historical clean start. F6.1 then seeds only the
+          # presentation territory approved by DH: 7 Departamentos, 64 Áreas,
+          # 230 Yacimientos and 12 real Empresas.
+          docker compose --env-file .env.example exec -T db \
+            psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
+          DO $$
+          DECLARE
+            f5_migrations integer;
+            domain_assets integer;
+            audits integer;
+            applicability integer;
+            territory_sources integer;
+            presentation_sources integer;
+            source_installations integer;
+            source_subinstallations integer;
+            source_findings integer;
+            department_types integer;
+            area_department_rules integer;
+          BEGIN
+            SELECT COUNT(*) INTO f5_migrations
+            FROM typeorm_migrations
+            WHERE name IN (
+              'F5InventoryPhysicalInstance1790087100000',
+              'F5CanonicalInventoryHierarchy1790087150000',
+              'F5AuthoritativeTerritory1790087200000',
+              'F5OperationalContextCompatibility1790087250000',
+              'F5AuthoritativeInventoryCatalog1790087300000',
+              'F51CleanManualInventory1790087400000'
+            );
+            IF f5_migrations <> 6 THEN
+              RAISE EXCEPTION 'Expected 6 F5/F5.1 migrations, got %', f5_migrations;
+            END IF;
+
+            SELECT COUNT(*) INTO domain_assets FROM assets;
+            IF domain_assets <> 313 THEN
+              RAISE EXCEPTION 'F6.1 presentation preload must contain 313 Assets, got %', domain_assets;
+            END IF;
+
+            SELECT COUNT(*) INTO audits FROM audit_events;
+            IF audits <> 0 THEN
+              RAISE EXCEPTION 'F6.1 presentation preload must start with 0 audit events, got %', audits;
+            END IF;
+
+            SELECT COUNT(*) INTO applicability FROM finding_catalog_item_inventory_families;
+            IF applicability <> 0 THEN
+              RAISE EXCEPTION 'Clean migration rehearsal must contain 0 finding applicability links, got %', applicability;
+            END IF;
+
+            SELECT COUNT(*) INTO territory_sources
+            FROM source_documents
+            WHERE document_number='DH-F5-TERRITORY';
+            IF territory_sources <> 0 THEN
+              RAISE EXCEPTION 'F5.1 must remove the old territory source preload, got % rows', territory_sources;
+            END IF;
+
+            SELECT COUNT(*) INTO presentation_sources
+            FROM source_documents
+            WHERE document_number='DH-F6.1-PRESENTATION-TERRITORY-20260909';
+            IF presentation_sources <> 1 THEN
+              RAISE EXCEPTION 'F6.1 must contain exactly one presentation territory source, got %', presentation_sources;
+            END IF;
+
+            SELECT COUNT(*) FILTER (WHERE level='INSTALLATION'),
+                   COUNT(*) FILTER (WHERE level='SUBINSTALLATION')
+            INTO source_installations,source_subinstallations
+            FROM inventory_families
+            WHERE is_active=true AND source_reference LIKE 'F5:final_modelov2.xlsx%';
+            IF source_installations <> 14 OR source_subinstallations <> 109 THEN
+              RAISE EXCEPTION 'F6.1 must preserve technical family masters: installations %, subinstallations %', source_installations,source_subinstallations;
+            END IF;
+
+            SELECT COUNT(*) INTO source_findings
+            FROM finding_catalog_items item
+            JOIN finding_categories category ON category.id=item.category_id
+            WHERE lower(category.code)='f5model' AND item.is_active=true;
+            IF source_findings <> 177 THEN
+              RAISE EXCEPTION 'F6.1 must preserve finding master catalog, got %', source_findings;
+            END IF;
+
+            SELECT COUNT(*) INTO department_types
+            FROM asset_types
+            WHERE lower(code)='departamento' AND can_be_root=true AND is_active=true;
+            IF department_types <> 1 THEN
+              RAISE EXCEPTION 'Expected one active root Departamento type, got %', department_types;
+            END IF;
+
+            SELECT COUNT(*) INTO area_department_rules
+            FROM asset_type_parent_rules rule
+            JOIN asset_types child ON child.id=rule.child_type_id
+            JOIN asset_types parent ON parent.id=rule.parent_type_id
+            WHERE lower(child.code)='area' AND lower(parent.code)='departamento';
+            IF area_department_rules <> 1 THEN
+              RAISE EXCEPTION 'Expected Area → Departamento canonical rule, got %', area_department_rules;
+            END IF;
+          END $$;
+          SQL
+
+          # Both destructive cuts are intentionally one-way: production rollback is
+          # the PRE database backup, not migration:revert. Prove the completed chain
+          # is idempotent and has no pending migration on a second run.
+          rerun_log="$(mktemp)"
+          docker compose --env-file .env.example --profile tools run --rm migrate 2>&1 | tee "$rerun_log"
+          grep -Eq 'No pending migrations|Applied migrations: 0' "$rerun_log" || {
+            echo "ERROR: F6.1 migration chain is not idempotent." >&2
+            cat "$rerun_log" >&2
+            exit 1
+          }
+          rm -f "$rerun_log"
+
+          # A build-only preflight cannot catch Nest dependency-injection or
+          # runtime configuration failures. Start the production API image against
+          # the migrated database and require the public health endpoint to answer.
+          export JWT_ACCESS_SECRET='CI_ACCESS_SECRET_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+          export REFRESH_TOKEN_PEPPER='CI_REFRESH_PEPPER_bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+          export SMTP_SETTINGS_MASTER_KEY=''
+          docker compose --env-file .env.example build api
+          docker compose --env-file .env.example up -d api
+
+          api_ready=0
+          for _ in $(seq 1 30); do
+            if curl -fsS http://127.0.0.1:3101/api/v3/health >/tmp/dhv2-health.json 2>/dev/null; then
+              api_ready=1
+              break
+            fi
+            sleep 2
+          done
+          if [ "$api_ready" -ne 1 ]; then
+            echo 'ERROR: production API image did not become healthy.' >&2
+            docker compose --env-file .env.example logs --no-color api >&2 || true
+            exit 1
+          fi
+          grep -Fq '"status":"ok"' /tmp/dhv2-health.json || {
+            echo 'ERROR: /api/v3/health did not report status ok.' >&2
+            cat /tmp/dhv2-health.json >&2
+            exit 1
+          }
+      - name: Isolated builder test preflight
+        run: |
+          set -Eeuo pipefail
+          image="dhv2-api:ci-vps-preflight-${GITHUB_SHA::12}"
+          docker build --target builder -t "$image" api-v3
+          docker run --rm \
+            -v "$PWD/api-v3/test:/app/test:ro" \
+            -v "$PWD/api-v3/tsconfig.test.json:/app/tsconfig.test.json:ro" \
+            -v "$PWD/docker-compose.yml:/docker-compose.yml:ro" \
+            -v "$PWD/web-v2:/web-v2:ro" \
+            -v "$PWD/android-app:/android-app:ro" \
+            "$image" npm test
+          docker image rm "$image" >/dev/null 2>&1 || true
       - name: Build production images
         run: docker compose --env-file .env.example build api migrate web

.github/workflows/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/inspection-planning-smoke.yml

@@ -0,0 +1,26 @@
+name: Inspection planning smoke
+
+on:
+  pull_request:
+    branches: [main]
+    paths:
+      - 'api-v3/src/inspection-visits/**'
+      - 'api-v3/src/database/migrations/**'
+      - 'api-v3/src/reference-data/**'
+      - 'web-v2/src/pages/InspectionVisitCreateF61Page.tsx'
+      - 'web-v2/src/pages/FieldBriefingsPage.tsx'
+      - 'web-v2/src/layout/AppLayout.tsx'
+      - 'scripts/ci-inspection-planning-smoke.sh'
+      - '.github/workflows/inspection-planning-smoke.yml'
+
+permissions:
+  contents: read
+
+jobs:
+  create-inspection:
+    name: F6.1 · real inspection create
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Rehearse hierarchy and create a real Inspection
+        run: bash scripts/ci-inspection-planning-smoke.sh

.github/workflows/security-audit.yml

@@ -0,0 +1,48 @@
+name: Production dependency audit
+
+on:
+  pull_request:
+    branches: [main]
+  push:
+    branches: [main]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: dhv2-production-audit-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  api:
+    name: API · production dependencies
+    runs-on: ubuntu-latest
+    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: Reject high/critical runtime advisories
+        run: npm audit --omit=dev --audit-level=high
+
+  web:
+    name: WEB · production dependencies
+    runs-on: ubuntu-latest
+    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
+      - name: Reject high/critical runtime advisories
+        run: npm audit --omit=dev --audit-level=high

README.md

@@ -1,35 +1,31 @@
-# 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.
+## Componentes
 
-## Alcance D5.5
+- `api-v3/`: API NestJS/TypeORM y contratos de dominio.
+- `web-v2/`: aplicación WEB React/Vite.
+- `android-app/`: aplicación Android para trabajo de campo.
+- `scripts/`: utilidades operativas, preflight y despliegue.
+- `docs/`: documentación funcional y técnica.
 
-- selección web Área → Organización operadora vigente;
+## Documentación vigente
-- fecha y equipo inspector dentro del plan;
-- checklist automático versionado y append-only;
-- respuestas de empresa vencidas y controles de verificación vencidos;
-- próximos controles dentro de 30 días de la fecha planificada;
-- antecedentes históricos del mismo contexto;
-- incorporación automática de registros accionables;
-- alta manual de registros preventivos del mismo Área/Operadora;
-- exclusiones sólo mediante motivo auditable;
-- reincorporación sin borrar la exclusión histórica;
-- visitas de verificación integradas al mismo contrato de planificación;
-- cambio de contexto o fecha invalida el checklist hasta regeneración explícita;
-- inicio de visita exclusivamente desde APK mediante la política móvil ya existente.
 
-## Migración
+- [Corte de presentación F6.1](docs/PRESENTACION_F6_1.md)
+- [Manual del Programador](docs/MANUAL_PROGRAMADOR.md)
+- [Manual de Usuario](docs/MANUAL_USUARIO.md)
+- [Modelo canónico de Inventarios F6.1](docs/F6_INVENTORY_MODEL.md)
+- [Auditoría de consistencia F6.1](docs/AUDITORIA_CONSISTENCIA_F6_1.md)
+- [Contrato de release Android F6.1](android-app/RELEASE.md)
 
-`1789063200000-phase-d5-5-web-planning-checklist.ts`  
+## Contratos que no deben romperse
-`PhaseD55WebPlanningChecklist1789063200000`
 
-## Despliegue
+- Inventario físico: **Departamento → Área → Yacimiento → Instalación → Subinstalación**.
+- Empresa es un maestro independiente; la Operadora se relaciona temporalmente con Área.
+- Una Inspección puede tener múltiples Actas, pero sólo un Acta `DRAFT` simultánea.
+- Hallazgos directos: Yacimiento, Instalación y Subinstalación, siempre con `OTROS` disponible.
+- La APK puede abrir una Inspección reutilizando el lifecycle canónico del backend.
+- GEDO/IF oficializa el Informe, pero no activa por sí solo el vencimiento No urgente.
 
-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.
+Las reglas detalladas, el procedimiento de cambio seguro y el recorrido de demo están en los documentos enlazados arriba.

android-app/RELEASE.md

@@ -0,0 +1,48 @@
+# DH Inspección Android · release F6.1
+
+## Candidata vigente
+
+- Fase funcional: **F6.1**.
+- `versionName`: **0.15.1**.
+- `versionCode`: **23**.
+- Application ID release: `com.korexlabs.dhinspeccion`.
+- Application ID debug/QA: `com.korexlabs.dhinspeccion.debug`.
+- API: `https://dhv2.korexlabs.com/api/v3/`.
+- Launcher de presentación: adaptación vectorial local inspirada en el escudo institucional publicado por Gobierno de Mendoza en `mendoza.gov.ar`, para reemplazar el ícono genérico del sistema.
+
+La variante debug es independiente de la app productiva y puede instalarse para QA/presentación sin sobrescribir una instalación release histórica.
+
+## Barrera obligatoria
+
+Todo cambio Android o de API que pueda afectar al cliente móvil debe pasar `Android CI / RC`:
+
+1. validación de identidad, HTTPS y políticas básicas del manifest;
+2. Android lint;
+3. unit tests Android reales, con verificación de que exista al menos una prueba ejecutada;
+4. `assembleDebug`;
+5. `assembleRelease` para comprobar que la variante productiva compile;
+6. empaquetado del APK debug con SHA-256 y metadata de commit/versionado.
+
+La barrera de lint exige además manejo explícito de la revocación de permisos de ubicación durante una captura GPS y declara la cámara como capacidad de hardware opcional, sin relajar permisos ni desactivar reglas globalmente.
+
+El artefacto de CI contiene:
+
+- APK debug;
+- archivo `.sha256`;
+- `release-metadata.txt` con fase, versión, versionCode, commit, applicationId, API base y canal.
+
+## Firma release
+
+La clave histórica de firma **no se versiona ni se reemplaza**. La CI compila la variante release para detectar roturas, pero la APK productiva final debe firmarse con la clave histórica antes de instalarse como actualización de `com.korexlabs.dhinspeccion`.
+
+No se debe crear una clave nueva para resolver una falta de acceso: eso rompería la continuidad de actualización de tablets que ya tengan una versión firmada con la clave anterior.
+
+## Criterio de distribución
+
+Antes de distribuir una APK productiva:
+
+- todas las barreras de CI del SHA exacto deben estar verdes;
+- comprobar certificado/huella de firma contra la versión histórica;
+- realizar actualización sobre al menos una tablet con la versión productiva anterior;
+- ejecutar smoke funcional contra el entorno objetivo: login, lista de inspecciones, inicio, inventario, alta de campo, foto/GPS, Acta, Hallazgo y cierre;
+- registrar el SHA Git y SHA-256 de la APK distribuida.

android-app/app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.korexlabs.dhinspeccion"
         minSdk = 26
         targetSdk = 36
-        versionCode = 18
+        versionCode = 23
-        versionName = "0.11.0"
+        versionName = "0.15.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

android-app/app/src/main/AndroidManifest.xml

@@ -3,11 +3,14 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
         android:allowBackup="false"
+        android:icon="@drawable/ic_mendoza_launcher"
+        android:roundIcon="@drawable/ic_mendoza_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.DHInspeccion"

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

@@ -16,6 +16,11 @@ 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
@@ -26,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
@@ -43,11 +49,20 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
 
     var inventory: List<FieldInventoryItem> by mutableStateOf(emptyList())
         private set
+    var inventoryParentId: String? by mutableStateOf(null)
+        private set
     var fieldTypes: List<FieldType> by mutableStateOf(emptyList())
         private set
     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)
@@ -83,8 +98,10 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             visits = emptyList()
             visit = null
             inventory = emptyList()
+            inventoryParentId = null
             fieldTypes = emptyList()
             selectedFieldAsset = null
+            clearActState()
             clearFindingState()
         }
     }
@@ -98,16 +115,20 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun openVisit(id: String) = launchBusy {
         visit = repository.visit(id)
         inventory = emptyList()
+        inventoryParentId = visit?.operationalArea?.id
         fieldTypes = emptyList()
         selectedFieldAsset = null
         clearFindingState()
+        loadActsInternal(id, selectDraft = true)
     }
 
     fun closeVisitView() {
         visit = null
         inventory = emptyList()
+        inventoryParentId = null
         fieldTypes = emptyList()
         selectedFieldAsset = null
+        clearActState()
         clearFindingState()
         loadVisits()
     }
@@ -116,33 +137,99 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         val id = visit?.id ?: return
         launchBusy {
             visit = repository.startVisit(id)
+            inventoryParentId = visit?.operationalArea?.id
             notice = "Inspección iniciada."
+            loadActsInternal(id, selectDraft = true)
             loadVisitsInternal()
         }
     }
 
-    fun searchInventory(search: String, parentId: String? = null) {
+    fun reloadActs() {
-        val id = visit?.id ?: return
+        val visitId = visit?.id ?: return
+        launchBusy { loadActsInternal(visitId, selectDraft = selectedAct == null) }
+    }
+
+    fun selectAct(actId: String) {
         launchBusy {
-            inventory = repository.fieldInventory(id, search, parentId).data
+            selectedAct = actsRepository.get(actId)
+            actClosure = actsRepository.closure(actId)
+            clearFindingState()
+        }
+    }
+
+    fun createActForSelectedInventory(urgency: String = "NON_URGENT") {
+        val currentVisit = visit ?: return
+        val asset = selectedFieldAsset?.asset
+        if (currentVisit.status != "IN_PROGRESS") {
+            error = "La Inspección debe estar en curso para crear un Acta."
+            return
+        }
+        if (urgency !in setOf("URGENT", "NON_URGENT")) {
+            error = "Elegí si el Acta es urgente o no urgente."
+            return
+        }
+        if (asset == null) {
+            error = "Seleccioná primero una Instalación o Subinstalación para iniciar el Acta."
+            return
+        }
+        if (acts.any { it.status == "DRAFT" }) {
+            error = "Ya existe un Acta en borrador. Bloqueala o cancelala antes de crear la siguiente."
+            return
+        }
+        launchBusy {
+            val created = actsRepository.create(
+                currentVisit.id,
+                asset.id,
+                currentVisit.code,
+                urgency,
+            )
+            selectedAct = created
+            actClosure = actsRepository.closure(created.id)
+            loadActsInternal(currentVisit.id, selectDraft = false)
+            val urgencyLabel = if (urgency == "URGENT") "urgente" else "no urgente"
+            notice = "${created.code} creada como $urgencyLabel. Los Hallazgos nuevos quedarán vinculados explícitamente a esta Acta."
+            if (selectedFieldAsset?.capture?.readyForFinding == true) {
+                loadFindingOptionsInternal(currentVisit.id, asset.id, created.id)
+            }
+        }
+    }
+
+    fun searchInventory(search: String, parentId: String? = null) {
+        val currentVisit = visit ?: return
+        launchBusy {
+            val effectiveParentId = parentId ?: inventoryParentId ?: currentVisit.operationalArea?.id
+            inventory = repository.fieldInventory(currentVisit.id, search, effectiveParentId).data
         }
     }
 
     fun loadFieldTypes(parentId: String? = null) {
-        val id = visit?.id ?: return
+        val currentVisit = visit ?: return
         launchBusy {
-            fieldTypes = repository.fieldTypes(id, parentId).data
+            val effectiveParentId = parentId ?: currentVisit.operationalArea?.id
+            inventoryParentId = effectiveParentId
+            fieldTypes = repository.fieldTypes(currentVisit.id, parentId).data
+            inventory = repository.fieldInventory(currentVisit.id, null, effectiveParentId).data
         }
     }
 
+    private suspend fun reloadCurrentInventory(visitId: String) {
+        val effectiveParentId = inventoryParentId ?: visit?.operationalArea?.id
+        inventory = repository.fieldInventory(visitId, null, effectiveParentId).data
+    }
+
     fun selectExisting(item: FieldInventoryItem) {
         val visitId = visit?.id ?: return
         launchBusy {
             selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
-            notice = "Inventario agregado a la inspección."
+            notice = "Inventario agregado a la Inspección."
-            inventory = repository.fieldInventory(visitId, null, null).data
+            reloadCurrentInventory(visitId)
-            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."
             }
         }
     }
@@ -160,11 +247,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     ) {
         val visitId = visit?.id ?: return
         if (visit?.status != "IN_PROGRESS") {
-            error = "La inspección debe estar en curso para dar de alta Inventario."
+            error = "La Inspección debe estar en curso para dar de alta Inventario."
             return
         }
         if (type.familyRequired && familyId == null) {
-            error = "Elegí una familia técnica o la opción Otro / no catalogado."
+            error = "Elegí una clasificación técnica o la opción Otro / no catalogado."
             return
         }
         launchBusy {
@@ -182,7 +269,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             )
             selectedFieldAsset = repository.createFieldAsset(visitId, request)
             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
+            reloadCurrentInventory(visitId)
         }
     }
 
@@ -206,9 +293,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             )
             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
+            reloadCurrentInventory(visitId)
-            if (selectedFieldAsset?.capture?.readyForFinding == true) {
+            val draft = selectedDraftAct()
-                loadFindingOptionsInternal(visitId, result.canonical.id)
+            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)
             }
         }
     }
@@ -236,9 +326,14 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             } else {
                 "Fotografía registrada."
             }
-            inventory = repository.fieldInventory(visitId, null, null).data
+            reloadCurrentInventory(visitId)
-            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."
             }
         }
     }
@@ -246,7 +341,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(
@@ -259,6 +363,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
@@ -272,10 +381,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() },
@@ -285,8 +396,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 ),
             )
             lastCreatedFinding = response.finding
-            notice = "Hallazgo ${response.finding.code} registrado. Podés agregar evidencia fotográfica."
+            notice = "Hallazgo ${response.finding.code} registrado en ${response.act.code}. Podés agregar evidencia fotográfica."
-            loadFindingOptionsInternal(visitId, assetId, keepLastCreated = true)
+            loadFindingOptionsInternal(visitId, assetId, actId, keepLastCreated = true)
+            loadActsInternal(visitId, selectDraft = false)
         }
     }
 
@@ -318,6 +430,138 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         launchBusy { loadEvidenceInternal(findingId) }
     }
 
+    fun setCompanyResponsiblePresent(
+        fullName: String,
+        documentType: String,
+        documentNumber: String,
+        position: String,
+        email: String?,
+        phone: String?,
+    ) {
+        val actId = selectedAct?.id ?: return
+        if (fullName.isBlank() || documentNumber.isBlank() || position.isBlank()) {
+            error = "Completá nombre, documento y cargo del responsable de la empresa."
+            return
+        }
+        launchBusy {
+            actClosure = actsRepository.setResponsible(
+                actId,
+                MobileResponsibleRequest(
+                    attendanceStatus = "PRESENT",
+                    fullName = fullName.trim(),
+                    documentType = documentType,
+                    documentNumber = documentNumber.trim(),
+                    position = position.trim(),
+                    email = email?.trim()?.takeIf { it.isNotBlank() },
+                    phone = phone?.trim()?.takeIf { it.isNotBlank() },
+                ),
+            )
+            notice = "Responsable de empresa registrado para el Acta."
+        }
+    }
+
+    fun setCompanyResponsibleAbsent(reason: String) {
+        val actId = selectedAct?.id ?: return
+        if (reason.trim().length < 10) {
+            error = "Indicá un motivo de ausencia de al menos 10 caracteres."
+            return
+        }
+        launchBusy {
+            actClosure = actsRepository.setResponsible(
+                actId,
+                MobileResponsibleRequest(
+                    attendanceStatus = "ABSENT",
+                    absenceReason = reason.trim(),
+                ),
+            )
+            notice = "Ausencia del responsable registrada. La manifestación de empresa quedará pendiente y deberá resolverse antes de sellar el Acta."
+        }
+    }
+
+    fun prepareSelectedAct() {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.lock(actId)
+            refreshSelectedActInternal(actId)
+            notice = "Acta bloqueada. Su contenido quedó inmutable; ahora deben resolverse las firmas y manifestaciones."
+        }
+    }
+
+    fun reopenSelectedAct() {
+        error = "Un Acta bloqueada es inmutable y no puede volver a borrador."
+    }
+
+    fun signSelectedActAsInspector(
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+    ) {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.signInspector(actId, png, latitude, longitude, accuracyM)
+            notice = "Firma del inspector incorporada al Acta."
+        }
+    }
+
+    fun signSelectedActAsCompany(
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+        manifestation: String,
+        statement: String?,
+    ) {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.signCompany(
+                actId, png, latitude, longitude, accuracyM, manifestation, statement,
+            )
+            notice = if (manifestation == "DISSENT") {
+                "Firma de empresa registrada con disidencia."
+            } else {
+                "Firma de empresa registrada."
+            }
+        }
+    }
+
+    fun recordCompanyOutcome(status: String, reason: String) {
+        val actId = selectedAct?.id ?: return
+        if (status != "REFUSED") {
+            error = "La ausencia no resuelve la manifestación de la empresa. Registrá una firma o una negativa."
+            return
+        }
+        if (reason.trim().length < 10) {
+            error = "Indicá un motivo de al menos 10 caracteres."
+            return
+        }
+        launchBusy {
+            actClosure = actsRepository.companyOutcome(actId, status, reason)
+            notice = "Negativa a firmar asentada."
+        }
+    }
+
+    fun closeSelectedAct() {
+        val currentVisit = visit ?: return
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.seal(actId)
+            refreshSelectedActInternal(actId)
+            loadActsInternal(currentVisit.id, selectDraft = false)
+            clearFindingState()
+            notice = "${selectedAct?.code ?: "Acta"} SELLADA e inmutable. Podés crear otra Acta o continuar hacia el cierre de la Inspección."
+        }
+    }
+
+    fun closeInspection() {
+        val visitId = visit?.id ?: return
+        launchBusy {
+            visit = actsRepository.closeVisit(visitId)
+            loadVisitsInternal()
+            notice = "Inspección cerrada. Todas sus Actas quedaron SELLADAS y disponibles para el circuito de oficina."
+        }
+    }
+
     fun clearFindingFlow() {
         fieldFindingOptions = null
         lastCreatedFinding = null
@@ -330,12 +574,43 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         clearFindingState()
     }
 
+    private fun selectedDraftAct(): MobileActDetail? =
+        selectedAct?.takeIf { it.status == "DRAFT" }
+            ?: acts.firstOrNull { it.status == "DRAFT" }?.let { summary ->
+                selectedAct?.takeIf { it.id == summary.id && it.status == "DRAFT" }
+            }
+
+    private suspend fun loadActsInternal(visitId: String, selectDraft: Boolean) {
+        acts = actsRepository.list(visitId).data
+        val currentId = selectedAct?.id
+        val current = currentId?.let { id -> acts.firstOrNull { it.id == id } }
+        val target = when {
+            current != null -> current.id
+            selectDraft -> acts.firstOrNull { it.status == "DRAFT" }?.id
+            else -> null
+        }
+        if (target != null) {
+            selectedAct = actsRepository.get(target)
+            actClosure = actsRepository.closure(target)
+        } else if (current == null) {
+            selectedAct = null
+            actClosure = null
+        }
+    }
+
+    private suspend fun refreshSelectedActInternal(actId: String) {
+        selectedAct = actsRepository.get(actId)
+        actClosure = actsRepository.closure(actId)
+        visit?.id?.let { loadActsInternal(it, selectDraft = false) }
+    }
+
     private suspend fun loadFindingOptionsInternal(
         visitId: String,
         assetId: String,
+        actId: String,
         keepLastCreated: Boolean = false,
     ) {
-        val options = findingsRepository.options(visitId, assetId)
+        val options = findingsRepository.options(visitId, assetId, actId)
         fieldFindingOptions = options
         if (!keepLastCreated) lastCreatedFinding = null
         val loaded = linkedMapOf<String, List<FieldFindingEvidence>>()
@@ -351,6 +626,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         )
     }
 
+    private fun clearActState() {
+        acts = emptyList()
+        selectedAct = null
+        actClosure = null
+    }
+
     private fun clearFindingState() {
         fieldFindingOptions = null
         lastCreatedFinding = null

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

@@ -90,7 +90,6 @@ data class PersonSummary(
 data class VisitSummary(
     val id: String,
     val code: String,
-    val title: String? = null,
     val objective: String? = null,
     val status: String,
     val scopeAsset: AssetSummary? = null,
@@ -153,7 +152,6 @@ data class ChecklistSummary(
 data class VisitDetail(
     val id: String,
     val code: String,
-    val title: String? = null,
     val objective: String? = null,
     val status: String,
     val operationalArea: AssetSummary? = null,

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

@@ -22,6 +22,7 @@ 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
 
@@ -100,12 +101,15 @@ data class FieldFindingEvidenceListResponse(
 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,
@@ -119,6 +123,7 @@ data class FieldFindingCreateResponse(
     val capture: CaptureStatus = CaptureStatus(),
     val finding: FieldFindingItem,
     val canAddAnother: Boolean = true,
+    val actSelectionMode: String = "EXPLICIT",
 )
 
 private interface FieldFindingsApi {
@@ -127,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}")
@@ -166,7 +172,7 @@ private interface FieldFindingsApi {
 
 /**
  * Cliente de campo para Hallazgos y sus evidencias append-only.
- * Comparte el almacén cifrado de sesión y nunca persiste la contraseña.
+ * F3.2 exige que la APK identifique explícitamente el Acta activa.
  */
 class FieldFindingsRepository(context: Context) {
     private val store = SecureSessionStore(context.applicationContext)
@@ -179,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(

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

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

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

@@ -0,0 +1,103 @@
+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.OkHttpClient
+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.POST
+import retrofit2.http.Path
+
+data class MobilePlanningAsset(
+    val id: String,
+    val code: String,
+    val name: String,
+)
+
+data class MobilePlanningAssetResponse(
+    val data: List<MobilePlanningAsset> = emptyList(),
+)
+
+data class OpenMobileInspectionRequest(
+    val operationalAreaId: String,
+    val operatorCompanyId: String,
+)
+
+private interface MobileInspectionOpenApi {
+    @GET("inspection-visits/mobile/planning-context/areas")
+    suspend fun areas(
+        @Header("Authorization") authorization: String,
+    ): MobilePlanningAssetResponse
+
+    @GET("inspection-visits/mobile/planning-context/areas/{areaId}/operators")
+    suspend fun operators(
+        @Header("Authorization") authorization: String,
+        @Path("areaId") areaId: String,
+    ): MobilePlanningAssetResponse
+
+    @POST("inspection-visits/mobile/open")
+    suspend fun open(
+        @Header("Authorization") authorization: String,
+        @Body request: OpenMobileInspectionRequest,
+    ): VisitDetail
+
+    @POST("auth/mobile/refresh")
+    suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
+}
+
+class MobileInspectionOpenRepository(context: Context) {
+    private val store = SecureSessionStore(context.applicationContext)
+    private val refreshMutex = Mutex()
+    private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
+    private val api: MobileInspectionOpenApi = Retrofit.Builder()
+        .baseUrl(BuildConfig.API_BASE_URL)
+        .client(OkHttpClient.Builder().build())
+        .addConverterFactory(MoshiConverterFactory.create(moshi))
+        .build()
+        .create(MobileInspectionOpenApi::class.java)
+
+    suspend fun areas(): MobilePlanningAssetResponse = authorized { session ->
+        api.areas("Bearer ${session.accessToken}")
+    }
+
+    suspend fun operators(areaId: String): MobilePlanningAssetResponse = authorized { session ->
+        api.operators("Bearer ${session.accessToken}", areaId)
+    }
+
+    suspend fun open(areaId: String, companyId: String): VisitDetail = authorized { session ->
+        api.open(
+            "Bearer ${session.accessToken}",
+            OpenMobileInspectionRequest(areaId, companyId),
+        )
+    }
+
+    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/DhApp.kt

@@ -547,13 +547,17 @@ private suspend fun currentGeo(context: Context): GeoSnapshot = suspendCancellab
     }
     val source = CancellationTokenSource()
     val client = LocationServices.getFusedLocationProviderClient(context)
-    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+    try {
-        .addOnSuccessListener { location ->
+        client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            if (!continuation.isActive) return@addOnSuccessListener
+            .addOnSuccessListener { location ->
-            if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+                if (!continuation.isActive) return@addOnSuccessListener
-            else continuation.resume(GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+                if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
-        }
+                else continuation.resume(GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
-        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
+            }
+            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
+    } catch (error: SecurityException) {
+        if (continuation.isActive) continuation.resumeWithException(error)
+    }
     continuation.invokeOnCancellation { source.cancel() }
 }
 

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

@@ -76,15 +76,31 @@ private data class F3GeoSnapshot(
 @Composable
 fun F3VisitRoot(model: MainViewModel) {
     var inventoryMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
-    if (inventoryMode) {
+    var actsMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
-        F3FieldInventoryScreen(model, onBack = { inventoryMode = false })
+    when {
-    } else {
+        actsMode -> MobileActsScreen(
-        F3VisitOverview(model, onInventory = { inventoryMode = true })
+            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) {
+private fun F3VisitOverview(
+    model: MainViewModel,
+    onInventory: () -> Unit,
+    onActs: () -> Unit,
+) {
     val visit = model.visit ?: return
     Column(
         Modifier
@@ -137,9 +153,17 @@ private fun F3VisitOverview(model: MainViewModel, onInventory: () -> Unit) {
             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 y Hallazgos.",
+                "Primero iniciá la inspección para habilitar altas, fotografías, Actas y Hallazgos.",
                 style = MaterialTheme.typography.bodySmall,
             )
         }
@@ -703,16 +727,20 @@ private suspend fun currentF3Geo(context: Context): F3GeoSnapshot = suspendCance
     }
     val source = CancellationTokenSource()
     val client = LocationServices.getFusedLocationProviderClient(context)
-    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+    try {
-        .addOnSuccessListener { location ->
+        client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            if (!continuation.isActive) return@addOnSuccessListener
+            .addOnSuccessListener { location ->
-            if (location == null) {
+                if (!continuation.isActive) return@addOnSuccessListener
-                continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+                if (location == null) {
-            } else {
+                    continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
-                continuation.resume(F3GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+                } else {
+                    continuation.resume(F3GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+                }
             }
-        }
+            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
-        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
+    } catch (error: SecurityException) {
+        if (continuation.isActive) continuation.resumeWithException(error)
+    }
     continuation.invokeOnCancellation { source.cancel() }
 }
 

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

@@ -389,13 +389,17 @@ private suspend fun currentFindingGeo(context: Context): FindingGeoSnapshot = su
     }
     val source = CancellationTokenSource()
     val client = LocationServices.getFusedLocationProviderClient(context)
-    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+    try {
-        .addOnSuccessListener { location ->
+        client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            if (!continuation.isActive) return@addOnSuccessListener
+            .addOnSuccessListener { location ->
-            if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+                if (!continuation.isActive) return@addOnSuccessListener
-            else continuation.resume(FindingGeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+                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) }
+            }
+            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
+    } catch (error: SecurityException) {
+        if (continuation.isActive) continuation.resumeWithException(error)
+    }
     continuation.invokeOnCancellation { source.cancel() }
 }
 

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

@@ -92,7 +92,7 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
                 )
                 model.fieldFindingOptions != null -> FieldFindingScreen(model)
                 model.visit != null -> F3VisitRoot(model)
-                else -> DhApp(model)
+                else -> MobileHomeScreen(model)
             }
         }
     }

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

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

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

@@ -0,0 +1,231 @@
+package com.korexlabs.dhinspeccion.ui
+
+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.material3.AssistChip
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+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 com.korexlabs.dhinspeccion.MainViewModel
+import com.korexlabs.dhinspeccion.data.DhRepository
+import com.korexlabs.dhinspeccion.data.MobileInspectionOpenRepository
+import com.korexlabs.dhinspeccion.data.MobilePlanningAsset
+import com.korexlabs.dhinspeccion.data.VisitSummary
+import kotlinx.coroutines.launch
+
+@Composable
+fun MobileHomeScreen(model: MainViewModel) {
+    val session = model.session ?: return
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    val openRepository = remember(context) { MobileInspectionOpenRepository(context) }
+
+    var showOpen by rememberSaveable { mutableStateOf(false) }
+    var areas by remember { mutableStateOf<List<MobilePlanningAsset>>(emptyList()) }
+    var operators by remember { mutableStateOf<List<MobilePlanningAsset>>(emptyList()) }
+    var selectedAreaId by rememberSaveable { mutableStateOf<String?>(null) }
+    var selectedCompanyId by rememberSaveable { mutableStateOf<String?>(null) }
+    var loadingContext by remember { mutableStateOf(false) }
+    var opening by remember { mutableStateOf(false) }
+    var localError by remember { mutableStateOf<String?>(null) }
+
+    fun loadAreas() {
+        scope.launch {
+            loadingContext = true
+            localError = null
+            runCatching { openRepository.areas().data }
+                .onSuccess { areas = it }
+                .onFailure { localError = DhRepository.humanError(it) }
+            loadingContext = false
+        }
+    }
+
+    fun chooseArea(areaId: String) {
+        selectedAreaId = areaId
+        selectedCompanyId = null
+        operators = emptyList()
+        scope.launch {
+            loadingContext = true
+            localError = null
+            runCatching { openRepository.operators(areaId).data }
+                .onSuccess { operators = it }
+                .onFailure { localError = DhRepository.humanError(it) }
+            loadingContext = false
+        }
+    }
+
+    LaunchedEffect(showOpen) {
+        if (showOpen && areas.isEmpty()) loadAreas()
+    }
+
+    Column(Modifier.fillMaxSize().padding(top = 28.dp)) {
+        Row(
+            Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 10.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween,
+        ) {
+            Column {
+                Text("Mis inspecciones", style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold)
+                Text(session.displayName, style = MaterialTheme.typography.bodySmall)
+            }
+            Row {
+                OutlinedButton(onClick = { model.loadVisits() }, enabled = !model.busy && !opening) {
+                    Text("Actualizar")
+                }
+                Spacer(Modifier.width(8.dp))
+                OutlinedButton(onClick = { model.logout() }, enabled = !opening) { Text("Salir") }
+            }
+        }
+
+        Column(
+            Modifier.fillMaxWidth().padding(horizontal = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(10.dp),
+        ) {
+            model.error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
+            model.notice?.let { Text(it, color = MaterialTheme.colorScheme.primary) }
+            localError?.let { Text(it, color = MaterialTheme.colorScheme.error) }
+
+            Button(
+                onClick = {
+                    showOpen = !showOpen
+                    localError = null
+                },
+                modifier = Modifier.fillMaxWidth(),
+                enabled = !opening,
+            ) {
+                Text(if (showOpen) "Cancelar nueva inspección" else "Abrir inspección")
+            }
+
+            if (showOpen) {
+                Card(Modifier.fillMaxWidth()) {
+                    Column(
+                        Modifier.fillMaxWidth().padding(14.dp),
+                        verticalArrangement = Arrangement.spacedBy(10.dp),
+                    ) {
+                        Text("Abrir inspección en campo", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                        Text(
+                            "Elegí el Área y la Operadora vigente. La inspección se crea autoasignada a vos y queda iniciada con la fecha y hora del servidor.",
+                            style = MaterialTheme.typography.bodySmall,
+                        )
+
+                        Text("1. Área", fontWeight = FontWeight.SemiBold)
+                        if (loadingContext && areas.isEmpty()) CircularProgressIndicator()
+                        LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                            items(areas, key = { it.id }) { area ->
+                                AssistChip(
+                                    onClick = { chooseArea(area.id) },
+                                    label = { Text(if (area.id == selectedAreaId) "✓ ${area.name}" else area.name) },
+                                )
+                            }
+                        }
+
+                        if (selectedAreaId != null) {
+                            Text("2. Operadora", fontWeight = FontWeight.SemiBold)
+                            if (loadingContext && operators.isEmpty()) {
+                                CircularProgressIndicator()
+                            } else if (operators.isEmpty()) {
+                                Text("No hay una Operadora vigente para el Área seleccionada.", color = MaterialTheme.colorScheme.error)
+                            }
+                            LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                                items(operators, key = { it.id }) { company ->
+                                    AssistChip(
+                                        onClick = { selectedCompanyId = company.id },
+                                        label = { Text(if (company.id == selectedCompanyId) "✓ ${company.name}" else company.name) },
+                                    )
+                                }
+                            }
+                        }
+
+                        Button(
+                            onClick = {
+                                val areaId = selectedAreaId ?: return@Button
+                                val companyId = selectedCompanyId ?: return@Button
+                                scope.launch {
+                                    opening = true
+                                    localError = null
+                                    runCatching { openRepository.open(areaId, companyId) }
+                                        .onSuccess { opened ->
+                                            showOpen = false
+                                            model.openVisit(opened.id)
+                                        }
+                                        .onFailure { localError = DhRepository.humanError(it) }
+                                    opening = false
+                                }
+                            },
+                            modifier = Modifier.fillMaxWidth(),
+                            enabled = selectedAreaId != null && selectedCompanyId != null && !opening && !loadingContext,
+                        ) {
+                            Text(if (opening) "Abriendo…" else "Abrir inspección ahora")
+                        }
+                    }
+                }
+            }
+        }
+
+        if (model.busy && model.visits.isEmpty()) {
+            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { CircularProgressIndicator() }
+        } else if (model.visits.isEmpty()) {
+            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                Text("No tenés inspecciones asignadas. Podés abrir una nueva desde esta tablet.")
+            }
+        } else {
+            LazyColumn(
+                Modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 10.dp),
+                verticalArrangement = Arrangement.spacedBy(10.dp),
+            ) {
+                items(model.visits, key = { it.id }) { visit ->
+                    MobileVisitCard(visit) { model.openVisit(visit.id) }
+                }
+                item { Spacer(Modifier.height(24.dp)) }
+            }
+        }
+    }
+}
+
+@Composable
+private fun MobileVisitCard(visit: VisitSummary, onOpen: () -> Unit) {
+    Card(onClick = onOpen, modifier = Modifier.fillMaxWidth()) {
+        Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                Text(visit.code, fontWeight = FontWeight.Bold)
+                Text(visit.status)
+            }
+            Text(visit.operatorCompany?.name ?: "Operadora sin definir")
+            Text(visit.operationalArea?.name ?: "Área sin definir", style = MaterialTheme.typography.bodySmall)
+            visit.plannedStartAt?.let {
+                Text("Prevista: ${it.replace('T', ' ').take(16)}", style = MaterialTheme.typography.bodySmall)
+            }
+            Text(
+                "Inventario: ${visit.assetCount} · Equipo inspector: ${visit.memberCount}",
+                style = MaterialTheme.typography.bodySmall,
+            )
+        }
+    }
+}

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") }
+        }
+    }
+}

android-app/app/src/main/res/drawable/ic_mendoza_launcher.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Launcher de presentación F6.1 inspirado en el escudo institucional publicado
+  por Gobierno de Mendoza en mendoza.gov.ar. Se mantiene como vector local para
+  evitar el ícono genérico del sistema y no depender de assets remotos.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+
+    <!-- fondo institucional -->
+    <path
+        android:fillColor="#0B5FA5"
+        android:pathData="M54,4 A50,50 0,1 0,54 104 A50,50 0,1 0,54 4" />
+
+    <!-- escudo exterior -->
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M54,13 C72,13 84,22 87,38 L83,65 C80,81 68,93 54,99 C40,93 28,81 25,65 L21,38 C24,22 36,13 54,13 Z" />
+
+    <!-- campo superior celeste -->
+    <path
+        android:fillColor="#22A9E0"
+        android:pathData="M27,38 C30,27 39,21 54,21 C69,21 78,27 81,38 L78,59 L30,59 Z" />
+
+    <!-- campo inferior dorado -->
+    <path
+        android:fillColor="#C6A66A"
+        android:pathData="M30,63 L78,63 L76,68 C73,80 65,89 54,94 C43,89 35,80 32,68 Z" />
+
+    <!-- gorro frigio simplificado -->
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M47,31 C52,26 61,25 67,28 C64,31 63,35 64,39 C58,37 52,37 46,40 C44,36 44,33 47,31 Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M53,39 L57,39 L56,48 L52,48 Z" />
+
+    <!-- racimo de uva simplificado -->
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M53,69 C56,69 58,71 58,74 C58,77 56,79 53,79 C50,79 48,77 48,74 C48,71 50,69 53,69 Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M45,73 C48,73 50,75 50,78 C50,81 48,83 45,83 C42,83 40,81 40,78 C40,75 42,73 45,73 Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M61,73 C64,73 66,75 66,78 C66,81 64,83 61,83 C58,83 56,81 56,78 C56,75 58,73 61,73 Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M53,80 C56,80 58,82 58,85 C58,88 56,90 53,90 C50,90 48,88 48,85 C48,82 50,80 53,80 Z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M52,67 C54,63 58,61 62,61 C60,65 57,68 53,70 Z" />
+</vector>

android-app/app/src/test/java/com/korexlabs/dhinspeccion/ReleaseMetadataTest.kt

@@ -0,0 +1,20 @@
+package com.korexlabs.dhinspeccion
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class ReleaseMetadataTest {
+    @Test
+    fun debugBuildKeepsSeparateApplicationIdentity() {
+        assertEquals("com.korexlabs.dhinspeccion.debug", BuildConfig.APPLICATION_ID)
+        assertEquals(23, BuildConfig.VERSION_CODE)
+        assertEquals("0.15.1-debug", BuildConfig.VERSION_NAME)
+    }
+
+    @Test
+    fun fieldBuildTargetsOnlyTheHttpsProductionApi() {
+        assertEquals("https://dhv2.korexlabs.com/api/v3/", BuildConfig.API_BASE_URL)
+        assertTrue(BuildConfig.API_BASE_URL.startsWith("https://"))
+    }
+}

api-v3/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "dhv2-api",
-  "version": "0.20.0-2",
+  "version": "0.29.0-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dhv2-api",
-      "version": "0.20.0-2",
+      "version": "0.29.0-1",
       "license": "UNLICENSED",
       "dependencies": {
         "@nestjs/common": "^11.0.0",
@@ -4166,9 +4166,9 @@
       "license": "MIT"
     },
     "node_modules/multer": {
-      "version": "2.2.0",
+      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.3.0.tgz",
-      "integrity": "sha512-6rdyFg2kLrMh9Jee7/BMPuV9lEAd7lLW2YUpF9/YxR7njyoUwwQ0ZPh3TaIY50Sw6vlyD2HW3wGOkTS4P79xrQ==",
+      "integrity": "sha512-cjNbm3sttszgZeGfJR124D+jFEfkXCVAsoPBmFn9X7UxmDSFHWqE2CoEj0vrmSpuAFnqWR1Szcm9QTsiHr60Xw==",
       "license": "MIT",
       "dependencies": {
         "append-field": "^1.0.0",
@@ -4666,9 +4666,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.15.3",
+      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.16.0.tgz",
-      "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==",
+      "integrity": "sha512-h6fhOIaRrID2CbEY2fqs+7t+UXZo+MLAnU5gRIq85uFtdiUPCdsApMlHhXogKVM4HM2DVbIjGNTTYH2OcmP1vA==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "es-define-property": "^1.0.1",

api-v3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dhv2-api",
-  "version": "0.24.0-1",
+  "version": "0.29.0-1",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
@@ -42,5 +42,9 @@
     "ts-node": "^10.9.2",
     "tsx": "^4.20.6",
     "typescript": "^5.9.0"
+  },
+  "overrides": {
+    "multer": "2.3.0",
+    "qs": "6.16.0"
   }
 }

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

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

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

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

api-v3/src/app.module.ts

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

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

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

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

@@ -26,9 +26,14 @@ 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 { InventoryTechnicalValuesController } from './inventory-technical-values.controller';
+import { InventoryTechnicalValuesService } from './inventory-technical-values.service';
+import { InventoryFunctionService } from './inventory-function.service';
 import { FieldInventoryMergeController, InventoryMergeController } from './inventory-merge.controller';
 import { InventoryMergeService } from './inventory-merge.service';
 import { MergedInventoryDossierService } from './merged-inventory-dossier.service';
+import { InventoryBrowserController } from './inventory-browser.controller';
+import { InventoryBrowserService } from './inventory-browser.service';
 
 @Module({
   imports: [AuditModule],
@@ -37,6 +42,8 @@ import { MergedInventoryDossierService } from './merged-inventory-dossier.servic
     AssetsController,
     InventoryStructureController,
     InventoryFamilyCatalogController,
+    InventoryTechnicalValuesController,
+    InventoryBrowserController,
     InventoryMergeController,
     FieldInventoryMergeController,
     AssetGeometriesController,
@@ -53,6 +60,9 @@ import { MergedInventoryDossierService } from './merged-inventory-dossier.servic
     AssetsService,
     InventoryStructureService,
     InventoryFamilyCatalogService,
+    InventoryTechnicalValuesService,
+    InventoryFunctionService,
+    InventoryBrowserService,
     InventoryMergeService,
     MergedInventoryDossierService,
     AssetGeometriesService,

api-v3/src/asset-master/asset-operational-relations.service.ts

@@ -79,23 +79,15 @@ export class AssetOperationalRelationsService {
   async listCompaniesForArea(areaId: string): Promise<{ data: OperationalAssetSummary[] }> {
     await this.requireAssetRole(this.dataSource.manager, areaId, AssetTypeOperationalRole.AREA);
     const data = (await this.dataSource.query(`
-      SELECT DISTINCT company.id, company.code, company.name, company.common_name AS "commonName", company_type.name AS "typeName"
+      SELECT DISTINCT company.id, company.code, company.name,
-      FROM (
+        company.common_name AS "commonName", company_type.name AS "typeName"
-        SELECT relation.company_id
+      FROM area_company_relations relation
-        FROM area_company_relations relation
+      INNER JOIN assets company ON company.id = relation.company_id
-        WHERE relation.area_id = $1
-          AND relation.relation_role = 'OPERATOR'
-          AND relation.valid_until IS NULL
-        UNION
-        SELECT asset.operator_company_id AS company_id
-        FROM assets asset
-        WHERE asset.operational_area_id = $1
-          AND asset.operator_company_id IS NOT NULL
-          AND asset.information_status <> 'INACTIVE'
-      ) linked
-      INNER JOIN assets company ON company.id = linked.company_id
       INNER JOIN asset_types company_type ON company_type.id = company.asset_type_id
-      WHERE company.information_status <> 'INACTIVE'
+      WHERE relation.area_id = $1
+        AND relation.relation_role = 'OPERATOR'
+        AND relation.valid_until IS NULL
+        AND company.information_status <> 'INACTIVE'
       ORDER BY company.name, company.code
     `, [areaId])) as OperationalAssetSummary[];
     return { data };
@@ -104,23 +96,15 @@ export class AssetOperationalRelationsService {
   async listAreasForCompany(companyId: string): Promise<{ data: OperationalAssetSummary[] }> {
     await this.requireAssetRole(this.dataSource.manager, companyId, AssetTypeOperationalRole.COMPANY);
     const data = (await this.dataSource.query(`
-      SELECT DISTINCT area.id, area.code, area.name, area.common_name AS "commonName", area_type.name AS "typeName"
+      SELECT DISTINCT area.id, area.code, area.name,
-      FROM (
+        area.common_name AS "commonName", area_type.name AS "typeName"
-        SELECT relation.area_id
+      FROM area_company_relations relation
-        FROM area_company_relations relation
+      INNER JOIN assets area ON area.id = relation.area_id
-        WHERE relation.company_id = $1
-          AND relation.relation_role = 'OPERATOR'
-          AND relation.valid_until IS NULL
-        UNION
-        SELECT asset.operational_area_id AS area_id
-        FROM assets asset
-        WHERE asset.operator_company_id = $1
-          AND asset.operational_area_id IS NOT NULL
-          AND asset.information_status <> 'INACTIVE'
-      ) linked
-      INNER JOIN assets area ON area.id = linked.area_id
       INNER JOIN asset_types area_type ON area_type.id = area.asset_type_id
-      WHERE area.information_status <> 'INACTIVE'
+      WHERE relation.company_id = $1
+        AND relation.relation_role = 'OPERATOR'
+        AND relation.valid_until IS NULL
+        AND area.information_status <> 'INACTIVE'
       ORDER BY area.name, area.code
     `, [companyId])) as OperationalAssetSummary[];
     return { data };
@@ -157,12 +141,38 @@ export class AssetOperationalRelationsService {
           const [document] = await manager.query('SELECT 1 FROM source_documents WHERE id=$1', [dto.sourceDocumentId]);
           if (!document) throw new BadRequestException({ code: 'SOURCE_DOCUMENT_NOT_FOUND', message: 'El documento fuente no existe' });
         }
+
+        if (dto.relationRole === AreaOrganizationRole.OPERATOR) {
+          const [currentOperator] = (await manager.query(`
+            SELECT relation.id,company.name AS "companyName"
+            FROM area_company_relations relation
+            JOIN assets company ON company.id=relation.company_id
+            WHERE relation.area_id=$1
+              AND relation.relation_role='OPERATOR'
+              AND relation.valid_until IS NULL
+              AND relation.company_id<>$2
+            ORDER BY relation.valid_from DESC
+            LIMIT 1
+            FOR UPDATE OF relation
+          `,[dto.areaId,dto.companyId])) as Array<{id:string;companyName:string}>;
+          if (currentOperator) {
+            throw new ConflictException({
+              code:'AREA_ACTIVE_OPERATOR_MUST_END_FIRST',
+              message:`El Área ya tiene una Operadora vigente (${currentOperator.companyName}). Finalizá esa relación antes de registrar la nueva Operadora.`,
+            });
+          }
+        }
+
         const [row] = (await manager.query(`
           INSERT INTO area_company_relations (
             area_id, company_id, relation_role, participation_percent, legal_instrument, source_document_id, start_reason, created_by
           ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
           RETURNING id
         `, [dto.areaId, dto.companyId, dto.relationRole, dto.participationPercent ?? null, dto.legalInstrument ?? null, dto.sourceDocumentId ?? null, dto.reason, principal.userId])) as Array<{ id: string }>;
+
+        // F5/F6: changing the Area operator is a temporal relation event only.
+        // Existing Inventory keeps its creation/historical operator snapshot and
+        // physical hierarchy unchanged. Runtime ownership must resolve this row.
         const created = await this.loadRelation(manager, row.id);
         await this.audit.record({
           ...administrationAuditContext(principal, request),
@@ -170,6 +180,9 @@ export class AssetOperationalRelationsService {
           entityType: 'area_company_relation',
           entityId: row.id,
           afterData: this.auditView(created),
+          metadata: dto.relationRole === AreaOrganizationRole.OPERATOR
+            ? { inventoryHierarchyChanged:false, operatorSnapshotPreserved:true }
+            : undefined,
         }, manager);
         return created;
       });
@@ -198,12 +211,9 @@ export class AssetOperationalRelationsService {
           message: 'La relación ya se encuentra finalizada',
         });
       }
-      if (before.assignedAssetCount > 0) {
+
-        throw new ConflictException({
+      // F5/F6: physical Inventory belongs to Area/Yacimiento hierarchy, not to Company.
-          code: 'AREA_COMPANY_RELATION_IN_USE',
+      // Ending an operator relation never moves, rewrites or blocks existing Inventory.
-          message: `No se puede finalizar la relación: ${before.assignedAssetCount} activo(s) todavía dependen de esta combinación`,
-        });
-      }
       await manager.query(`
         UPDATE area_company_relations
         SET valid_until = CURRENT_TIMESTAMP,
@@ -220,6 +230,10 @@ export class AssetOperationalRelationsService {
         entityId: id,
         beforeData: this.auditView(before),
         afterData: this.auditView(updated),
+        metadata: {
+          inventoryHierarchyChanged:false,
+          retainedCompatibilitySnapshotCount: before.assignedAssetCount,
+        },
       }, manager);
       return updated;
     });
@@ -330,7 +344,8 @@ export class AssetOperationalRelationsService {
         (relation.valid_until IS NULL) AS active,
         CASE WHEN relation.relation_role = 'OPERATOR' THEN (SELECT COUNT(*)::integer FROM assets asset
          WHERE asset.operational_area_id = relation.area_id
-           AND asset.operator_company_id = relation.company_id) ELSE 0 END AS "assignedAssetCount"
+           AND asset.operator_company_id = relation.company_id
+           AND asset.is_inventory_instance=true) ELSE 0 END AS "assignedAssetCount"
       FROM area_company_relations relation
       INNER JOIN assets area ON area.id = relation.area_id
       INNER JOIN asset_types area_type ON area_type.id = area.asset_type_id

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

@@ -137,21 +137,41 @@ export class AssetTemporalService {
     if (!row) throw temporalAssetNotFound();
     const asOf = new Date(query.at);
     row.asOf = asOf;
+
+    // Physical context is reconstructed from the Inventory history, while the
+    // operator is resolved independently from the temporal Area↔Empresa ledger.
+    // This keeps historical operator changes from rewriting the Inventory.
     const [context] = (await this.dataSource.query(`
       SELECT
         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 area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',area.id,'code',area.code,'name',area.name) END AS "operationalArea",
-        CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',company.name) END AS "operatorCompany"
+        CASE WHEN operator_company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',operator_company.id,'code',operator_company.code,'name',operator_company.name
+        ) END AS "operatorCompany"
       FROM asset_context_history history
       LEFT JOIN assets parent ON parent.id=history.parent_id
       LEFT JOIN assets area ON area.id=history.operational_area_id
-      LEFT JOIN assets company ON company.id=history.operator_company_id
+      LEFT JOIN LATERAL (
+        SELECT relation.company_id
+        FROM area_company_relations relation
+        WHERE relation.area_id=history.operational_area_id
+          AND relation.relation_role='OPERATOR'
+          AND relation.valid_from <= $2
+          AND (relation.valid_until IS NULL OR relation.valid_until > $2)
+        ORDER BY relation.valid_from DESC, relation.created_at DESC, relation.id DESC
+        LIMIT 1
+      ) operator_relation ON true
+      LEFT JOIN assets operator_company ON operator_company.id=operator_relation.company_id
       WHERE history.asset_id=$1
         AND history.valid_from <= $2
         AND (history.valid_until IS NULL OR history.valid_until > $2)
       ORDER BY history.valid_from DESC
       LIMIT 1
-    `, [assetId, asOf])) as Array<{ parent: Record<string, unknown> | null; operationalArea: Record<string, unknown> | null; operatorCompany: Record<string, unknown> | null }>;
+    `, [assetId, asOf])) as Array<{
+      parent: Record<string, unknown> | null;
+      operationalArea: Record<string, unknown> | null;
+      operatorCompany: Record<string, unknown> | null;
+    }>;
     if (context && row.snapshot) {
       row.snapshot = {
         ...row.snapshot,

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

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

api-v3/src/asset-master/dto/change-asset-context.dto.ts

@@ -1,5 +1,5 @@
 import { Transform, Type } from 'class-transformer';
-import { IsDate, IsOptional, IsString, IsUUID, MaxLength, MinLength } from 'class-validator';
+import { IsDate, IsEmpty, IsOptional, IsString, IsUUID, MaxLength, MinLength } from 'class-validator';
 
 export class ChangeAssetContextDto {
   @IsOptional()
@@ -10,8 +10,13 @@ export class ChangeAssetContextDto {
   @IsUUID('4')
   operationalAreaId?: string | null;
 
+  /**
+   * Compatibilidad de contrato únicamente. F5/F6 separa la ubicación física
+   * del Inventario de la Operadora temporal del Área, por lo que este valor no
+   * puede modificarse desde un cambio de contexto del Inventario.
+   */
   @IsOptional()
-  @IsUUID('4')
+  @IsEmpty({ message: 'La Operadora se administra en la relación temporal del Área, no en el Inventario' })
   operatorCompanyId?: string | null;
 
   @IsOptional()

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

@@ -9,7 +9,11 @@ import {
   MinLength,
 } from 'class-validator';
 
+// Invariante de dominio: Empresa es un maestro independiente. La jerarquía física
+// se expresa sólo como Departamento → Área → Yacimiento → Instalación → Subinstalación.
 export const INVENTORY_STRUCTURE_KINDS = [
+  'EMPRESA',
+  'DEPARTAMENTO',
   'AREA',
   'YACIMIENTO',
   'INSTALACION',

api-v3/src/asset-master/dto/inventory-browser-query.dto.ts

@@ -0,0 +1,63 @@
+import { Transform, Type } from 'class-transformer';
+import {
+  IsBoolean,
+  IsEnum,
+  IsInt,
+  IsOptional,
+  IsString,
+  IsUUID,
+  Max,
+  MaxLength,
+  Min,
+} from 'class-validator';
+import { AssetInformationStatus, AssetOperationalStatus } from '../../database/entities';
+
+export class InventoryBrowserQueryDto {
+  @IsOptional()
+  @IsString()
+  @MaxLength(200)
+  search?: string;
+
+  @IsOptional()
+  @IsUUID('4')
+  typeId?: string;
+
+  @IsOptional()
+  @IsEnum(AssetInformationStatus)
+  status?: AssetInformationStatus;
+
+  @IsOptional()
+  @IsEnum(AssetOperationalStatus)
+  operationalStatus?: AssetOperationalStatus;
+
+  @IsOptional()
+  @IsUUID('4')
+  operationalAreaId?: string;
+
+  @IsOptional()
+  @IsUUID('4')
+  operatorCompanyId?: string;
+
+  @IsOptional()
+  @Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
+  @IsBoolean()
+  needsValidation?: boolean;
+
+  @IsOptional()
+  @Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
+  @IsBoolean()
+  hasGeometry?: boolean;
+
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  page = 1;
+
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  @Max(100)
+  pageSize = 25;
+}

api-v3/src/asset-master/dto/inventory-family-admin.dto.ts

@@ -0,0 +1,75 @@
+import { Transform } from 'class-transformer';
+import {
+  ArrayMaxSize,
+  IsArray,
+  IsBoolean,
+  IsIn,
+  IsOptional,
+  IsString,
+  IsUUID,
+  MaxLength,
+  MinLength,
+} from 'class-validator';
+
+export class CreateInventoryFamilyDto {
+  @IsIn(['INSTALLATION', 'SUBINSTALLATION'])
+  level!: 'INSTALLATION' | 'SUBINSTALLATION';
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(1)
+  @MaxLength(240)
+  name!: string;
+
+  @IsOptional()
+  @IsArray()
+  @ArrayMaxSize(200)
+  @IsUUID('4', { each: true })
+  parentFamilyIds?: string[];
+
+  @IsOptional()
+  @IsArray()
+  @ArrayMaxSize(100)
+  @IsString({ each: true })
+  @MaxLength(160, { each: true })
+  informationLabels?: string[];
+}
+
+export class UpdateInventoryFamilyDto {
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(1)
+  @MaxLength(240)
+  name?: string;
+
+  @IsOptional()
+  @IsArray()
+  @ArrayMaxSize(200)
+  @IsUUID('4', { each: true })
+  parentFamilyIds?: string[];
+
+  @IsOptional()
+  @IsArray()
+  @ArrayMaxSize(100)
+  @IsString({ each: true })
+  @MaxLength(160, { each: true })
+  informationLabels?: string[];
+
+  @IsOptional()
+  @IsBoolean()
+  isActive?: boolean;
+}
+
+export class ReplaceInventoryFamilyFindingsDto {
+  @IsArray()
+  @ArrayMaxSize(2000)
+  @IsUUID('4', { each: true })
+  itemIds!: string[];
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(5)
+  @MaxLength(2000)
+  reason!: string;
+}

api-v3/src/asset-master/dto/inventory-family-attribute.dto.ts

@@ -0,0 +1,103 @@
+import { Transform, Type } from 'class-transformer';
+import {
+  ArrayMaxSize,
+  IsArray,
+  IsBoolean,
+  IsIn,
+  IsInt,
+  IsOptional,
+  IsString,
+  Matches,
+  Max,
+  MaxLength,
+  Min,
+  MinLength,
+  ValidateIf,
+} from 'class-validator';
+
+const DATA_TYPES = ['TEXT','NUMBER','BOOLEAN','DATE','DATETIME','SELECT'] as const;
+export type InventoryFamilyAttributeDataType = typeof DATA_TYPES[number];
+
+export class CreateInventoryFamilyAttributeDto {
+  @Transform(({ value }) => typeof value === 'string' ? value.trim().toLowerCase() : value)
+  @IsString()
+  @Matches(/^[a-z][a-z0-9_]*$/)
+  @MaxLength(80)
+  code!: string;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(1)
+  @MaxLength(160)
+  name!: string;
+
+  @IsIn(DATA_TYPES)
+  dataType!: InventoryFamilyAttributeDataType;
+
+  @IsOptional()
+  @IsBoolean()
+  isRequired?: boolean;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() || null : value)
+  @ValidateIf((_object, value) => value !== null && value !== undefined)
+  @IsString()
+  @MaxLength(40)
+  unit?: string | null;
+
+  @ValidateIf((object) => object.dataType === 'SELECT')
+  @IsArray()
+  @ArrayMaxSize(200)
+  @IsString({ each: true })
+  @MaxLength(160, { each: true })
+  options?: string[];
+
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(0)
+  @Max(10000)
+  sortOrder?: number;
+}
+
+export class UpdateInventoryFamilyAttributeDto {
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(1)
+  @MaxLength(160)
+  name?: string;
+
+  @IsOptional()
+  @IsIn(DATA_TYPES)
+  dataType?: InventoryFamilyAttributeDataType;
+
+  @IsOptional()
+  @IsBoolean()
+  isRequired?: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  isActive?: boolean;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() || null : value)
+  @ValidateIf((_object, value) => value !== null && value !== undefined)
+  @IsString()
+  @MaxLength(40)
+  unit?: string | null;
+
+  @IsOptional()
+  @IsArray()
+  @ArrayMaxSize(200)
+  @IsString({ each: true })
+  @MaxLength(160, { each: true })
+  options?: string[] | null;
+
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(0)
+  @Max(10000)
+  sortOrder?: number;
+}

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

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

api-v3/src/asset-master/dto/list-asset-tree-query.dto.ts

@@ -1,5 +1,5 @@
 import { Transform } from 'class-transformer';
-import { IsBoolean, IsEnum, IsOptional, IsString, IsUUID, MaxLength } from 'class-validator';
+import { IsBoolean, IsEmpty, IsEnum, IsOptional, IsString, IsUUID, MaxLength } from 'class-validator';
 import { AssetInformationStatus, AssetOperationalStatus } from '../../database/entities';
 
 export class ListAssetTreeQueryDto {
@@ -24,8 +24,12 @@ export class ListAssetTreeQueryDto {
   @IsUUID('4')
   operationalAreaId?: string;
 
+  /**
+   * Retenido sólo para compatibilidad tipada. El árbol operativo no puede
+   * filtrar por el snapshot histórico de Empresa del Inventario.
+   */
   @IsOptional()
-  @IsUUID('4')
+  @IsEmpty({ message: 'Filtrá la Operadora mediante la relación temporal del Área, no mediante el snapshot del Inventario' })
   operatorCompanyId?: string;
 
   @IsOptional()
@@ -37,4 +41,9 @@ export class ListAssetTreeQueryDto {
   @Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
   @IsBoolean()
   hasGeometry?: boolean;
+
+  @IsOptional()
+  @Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
+  @IsBoolean()
+  inventoryOnly?: boolean;
 }

api-v3/src/asset-master/dto/list-assets-query.dto.ts

@@ -1,6 +1,7 @@
 import { Transform, Type } from 'class-transformer';
 import {
   IsBoolean,
+  IsEmpty,
   IsEnum,
   IsInt,
   IsOptional,
@@ -39,7 +40,6 @@ export class ListAssetsQueryDto {
   @IsEnum(AssetInformationStatus)
   status?: AssetInformationStatus;
 
-
   @IsOptional()
   @IsEnum(AssetOperationalStatus)
   operationalStatus?: AssetOperationalStatus;
@@ -54,6 +54,11 @@ export class ListAssetsQueryDto {
   @IsBoolean()
   hasGeometry?: boolean;
 
+  @IsOptional()
+  @Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value)
+  @IsBoolean()
+  inventoryOnly?: boolean;
+
   @IsOptional()
   @IsUUID('4')
   parentId?: string;
@@ -62,7 +67,12 @@ export class ListAssetsQueryDto {
   @IsUUID('4')
   operationalAreaId?: string;
 
+  /**
+   * Retenido sólo para compatibilidad tipada con consumidores históricos.
+   * F5/F6 no permite buscar ownership actual por el snapshot de Empresa del
+   * Inventario; la navegación Área↔Operadora usa area_company_relations.
+   */
   @IsOptional()
-  @IsUUID('4')
+  @IsEmpty({ message: 'Filtrá la Operadora mediante la relación temporal del Área, no mediante el snapshot del Inventario' })
   operatorCompanyId?: string;
 }

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

@@ -1,5 +1,6 @@
 import { Transform } from 'class-transformer';
 import {
+  IsEmpty,
   IsObject,
   IsOptional,
   IsString,
@@ -47,8 +48,12 @@ export class UpdateAssetDto {
   @IsUUID('4')
   operationalAreaId?: string | null;
 
+  /**
+   * Snapshot histórico/de compatibilidad. La Operadora vigente pertenece a la
+   * relación temporal Área↔Empresa y no puede editarse como propiedad física.
+   */
   @IsOptional()
-  @IsUUID('4')
+  @IsEmpty({ message: 'La Operadora se administra en la relación temporal del Área, no en el Inventario' })
   operatorCompanyId?: string | null;
 
   @IsOptional()

api-v3/src/asset-master/dto/update-inventory-technical-values.dto.ts

@@ -0,0 +1,6 @@
+import { IsObject } from 'class-validator';
+
+export class UpdateInventoryTechnicalValuesDto {
+  @IsObject()
+  values!: Record<string, unknown>;
+}

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

@@ -0,0 +1,38 @@
+import { Controller, Get, Param, ParseUUIDPipe, Query } from '@nestjs/common';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import { InventoryBrowserQueryDto } from './dto/inventory-browser-query.dto';
+import { InventoryBrowserService } from './inventory-browser.service';
+
+@Controller('inventory-browser')
+@RequirePermissions('assets.read')
+export class InventoryBrowserController {
+  constructor(private readonly inventoryBrowser: InventoryBrowserService) {}
+
+  @Get('items')
+  items(@Query() query: InventoryBrowserQueryDto) {
+    return this.inventoryBrowser.items(query);
+  }
+
+  @Get('departments')
+  departments(@Query() query: InventoryBrowserQueryDto) {
+    return this.inventoryBrowser.departments(query);
+  }
+
+  @Get('companies')
+  companies(@Query() query: InventoryBrowserQueryDto) {
+    return this.inventoryBrowser.companies(query);
+  }
+
+  @Get('areas')
+  areas(@Query() query: InventoryBrowserQueryDto) {
+    return this.inventoryBrowser.areas(query);
+  }
+
+  @Get(':parentId/children')
+  children(
+    @Param('parentId', new ParseUUIDPipe({ version: '4' })) parentId: string,
+    @Query() query: InventoryBrowserQueryDto,
+  ) {
+    return this.inventoryBrowser.children(parentId, query);
+  }
+}

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

@@ -0,0 +1,335 @@
+import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import type { InventoryBrowserQueryDto } from './dto/inventory-browser-query.dto';
+
+type ParentContext = {
+  id: string;
+  code: string;
+  name: string;
+  typeCode: string;
+};
+
+@Injectable()
+export class InventoryBrowserService {
+  constructor(private readonly dataSource: DataSource) {}
+
+  async items(query: InventoryBrowserQueryDto) {
+    const params: unknown[] = [];
+    const conditions = [
+      "asset.information_status<>'INACTIVE'",
+      'type.is_active=true',
+      "(type.operational_role='COMPANY' OR lower(type.code) IN ('departamento','area','yacimiento','instalacion','subinstalacion'))",
+    ];
+    const add = (value: unknown): string => {
+      params.push(value);
+      return `$${params.length}`;
+    };
+
+    if (query.search?.trim()) {
+      const p = add(`%${query.search.trim()}%`);
+      conditions.push(`(asset.code ILIKE ${p} OR asset.name ILIKE ${p} OR COALESCE(asset.common_name,'') ILIKE ${p})`);
+    }
+    if (query.typeId) conditions.push(`asset.asset_type_id=${add(query.typeId)}::uuid`);
+    if (query.status) conditions.push(`asset.information_status=${add(query.status)}::asset_information_status`);
+    if (query.operationalStatus) conditions.push(`asset.operational_status=${add(query.operationalStatus)}::asset_operational_status`);
+    if (query.needsValidation === true) conditions.push("asset.information_status NOT IN ('VALIDATED','INACTIVE')");
+    if (query.needsValidation === false) conditions.push("asset.information_status='VALIDATED'");
+    if (query.hasGeometry === true) conditions.push('EXISTS (SELECT 1 FROM asset_geometries geometry_filter WHERE geometry_filter.asset_id=asset.id)');
+    if (query.hasGeometry === false) conditions.push('NOT EXISTS (SELECT 1 FROM asset_geometries geometry_filter WHERE geometry_filter.asset_id=asset.id)');
+    if (query.operationalAreaId) {
+      const area = add(query.operationalAreaId);
+      conditions.push(`(asset.id=${area}::uuid OR asset.operational_area_id=${area}::uuid)`);
+    }
+    if (query.operatorCompanyId) {
+      const company = add(query.operatorCompanyId);
+      conditions.push(`(
+        asset.id=${company}::uuid
+        OR EXISTS (
+          SELECT 1 FROM area_company_relations relation
+          WHERE (relation.area_id=asset.operational_area_id OR relation.area_id=asset.id)
+            AND relation.company_id=${company}::uuid
+            AND relation.relation_role='OPERATOR'
+            AND relation.valid_until IS NULL
+        )
+      )`);
+    }
+
+    const where = conditions.join(' AND ');
+    const [countRow] = (await this.dataSource.query(`
+      SELECT COUNT(*)::integer AS total
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      WHERE ${where}
+    `,params)) as Array<{total:number}>;
+    const total=Number(countRow?.total ?? 0);
+    const offset=(query.page-1)*query.pageSize;
+    params.push(query.pageSize);
+    const limit=`$${params.length}`;
+    params.push(offset);
+    const offsetParam=`$${params.length}`;
+
+    const data=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 parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',parent.id,'code',parent.code,'name',parent.name
+        ) END AS parent,
+        CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',area.id,'code',area.code,'name',area.name
+        ) END AS "operationalArea",
+        (
+          SELECT JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',company.name)
+          FROM area_company_relations relation
+          JOIN assets company ON company.id=relation.company_id
+          WHERE relation.area_id=COALESCE(asset.operational_area_id,
+            CASE WHEN type.operational_role='AREA' THEN asset.id ELSE NULL END)
+            AND relation.relation_role='OPERATOR'
+            AND relation.valid_until IS NULL
+          ORDER BY relation.valid_from DESC,relation.created_at DESC
+          LIMIT 1
+        ) AS "operatorCompany",
+        asset.information_status AS "informationStatus",
+        asset.operational_status AS "operationalStatus",
+        (SELECT COUNT(*)::integer FROM assets child
+          WHERE child.parent_id=asset.id AND child.information_status<>'INACTIVE') AS "childrenCount",
+        EXISTS (SELECT 1 FROM asset_geometries geometry WHERE geometry.asset_id=asset.id) AS "hasGeometry",
+        CASE WHEN geometry_type.type IS NULL THEN NULL ELSE geometry_type.type END AS "geometryType",
+        (SELECT COUNT(*)::integer FROM asset_media media WHERE media.asset_id=asset.id AND media.deleted_at IS NULL) AS "mediaCount",
+        asset.data_origin AS "dataOrigin",
+        (asset.provenance_verified_at IS NOT NULL) AS "provenanceVerified",
+        asset.current_version AS "currentVersion",
+        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 assets area ON area.id=asset.operational_area_id
+      LEFT JOIN LATERAL (
+        SELECT ST_GeometryType(geometry.geometry)::text AS type
+        FROM asset_geometries geometry
+        WHERE geometry.asset_id=asset.id
+        ORDER BY geometry.updated_at DESC
+        LIMIT 1
+      ) geometry_type ON true
+      WHERE ${where}
+      ORDER BY CASE
+        WHEN lower(type.code)='departamento' THEN 0
+        WHEN type.operational_role='COMPANY' THEN 1
+        WHEN lower(type.code)='area' THEN 2
+        WHEN lower(type.code)='yacimiento' THEN 3
+        WHEN lower(type.code)='instalacion' THEN 4
+        WHEN lower(type.code)='subinstalacion' THEN 5 ELSE 9 END,
+        asset.name,asset.code
+      LIMIT ${limit} OFFSET ${offsetParam}
+    `,params);
+
+    return {
+      data,
+      meta:{
+        page:query.page,
+        pageSize:query.pageSize,
+        total,
+        totalPages:total===0 ? 0 : Math.ceil(total/query.pageSize),
+      },
+    };
+  }
+
+  async departments(query: InventoryBrowserQueryDto) {
+    const params: unknown[] = [];
+    const conditions = [
+      "lower(type.code)='departamento'",
+      "department.information_status<>'INACTIVE'",
+      'type.is_active=true',
+    ];
+    const add = (value: unknown): string => {
+      params.push(value);
+      return `$${params.length}`;
+    };
+    if (query.search?.trim()) {
+      const p = add(`%${query.search.trim()}%`);
+      conditions.push(`(department.code ILIKE ${p} OR department.name ILIKE ${p} OR COALESCE(department.common_name,'') ILIKE ${p})`);
+    }
+    if (query.operatorCompanyId) {
+      const p = add(query.operatorCompanyId);
+      conditions.push(`EXISTS (
+        SELECT 1
+        FROM assets area
+        JOIN asset_types atype ON atype.id=area.asset_type_id
+        JOIN area_company_relations relation ON relation.area_id=area.id
+        WHERE area.parent_id=department.id
+          AND lower(atype.code)='area'
+          AND relation.company_id=${p}::uuid
+          AND relation.relation_role='OPERATOR'
+          AND relation.valid_until IS NULL
+      )`);
+    }
+
+    const data = await this.dataSource.query(`
+      SELECT
+        department.id,department.code,department.name,department.common_name AS "commonName",
+        JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
+        department.information_status AS "informationStatus",
+        department.operational_status AS "operationalStatus",
+        (SELECT COUNT(*)::integer FROM assets area
+          JOIN asset_types atype ON atype.id=area.asset_type_id
+          WHERE area.parent_id=department.id AND lower(atype.code)='area'
+            AND area.information_status<>'INACTIVE') AS "areaCount",
+        (SELECT COUNT(*)::integer FROM assets child
+          WHERE child.parent_id=department.id AND child.information_status<>'INACTIVE') AS "childrenCount"
+      FROM assets department
+      JOIN asset_types type ON type.id=department.asset_type_id
+      WHERE ${conditions.join(' AND ')}
+      ORDER BY department.name,department.code
+    `, params);
+    return { data, meta: { count: data.length } };
+  }
+
+  async companies(query: InventoryBrowserQueryDto) {
+    const params: unknown[] = [];
+    const conditions = [
+      "type.operational_role='COMPANY'",
+      "company.information_status<>'INACTIVE'",
+      'type.is_active=true',
+    ];
+    if (query.search?.trim()) {
+      params.push(`%${query.search.trim()}%`);
+      conditions.push(`(company.code ILIKE $1 OR company.name ILIKE $1 OR COALESCE(company.common_name,'') ILIKE $1)`);
+    }
+    const data = await this.dataSource.query(`
+      SELECT company.id,company.code,company.name,company.common_name AS "commonName",
+        JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
+        company.information_status AS "informationStatus",
+        (SELECT COUNT(*)::integer FROM area_company_relations relation
+          WHERE relation.company_id=company.id AND relation.relation_role='OPERATOR'
+            AND relation.valid_until IS NULL) AS "areaCount"
+      FROM assets company
+      JOIN asset_types type ON type.id=company.asset_type_id
+      WHERE ${conditions.join(' AND ')}
+      ORDER BY company.name,company.code
+    `,params);
+    return { data,meta:{count:data.length} };
+  }
+
+  async areas(query: InventoryBrowserQueryDto) {
+    const params: unknown[] = [];
+    const conditions = [
+      "type.operational_role='AREA'",
+      "area.information_status<>'INACTIVE'",
+      'type.is_active=true',
+    ];
+    const add = (value: unknown): string => { params.push(value); return `$${params.length}`; };
+    if (query.search?.trim()) {
+      const p = add(`%${query.search.trim()}%`);
+      conditions.push(`(area.code ILIKE ${p} OR area.name ILIKE ${p} OR COALESCE(area.common_name,'') ILIKE ${p})`);
+    }
+    if (query.operationalAreaId) conditions.push(`area.id=${add(query.operationalAreaId)}::uuid`);
+    if (query.operatorCompanyId) {
+      const p = add(query.operatorCompanyId);
+      conditions.push(`EXISTS (SELECT 1 FROM area_company_relations relation
+        WHERE relation.area_id=area.id AND relation.company_id=${p}::uuid
+          AND relation.relation_role='OPERATOR' AND relation.valid_until IS NULL)`);
+    }
+    const data = await this.dataSource.query(`
+      SELECT area.id,area.code,area.name,area.common_name AS "commonName",
+        JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
+        area.information_status AS "informationStatus",area.operational_status AS "operationalStatus",
+        (SELECT JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',company.name)
+          FROM area_company_relations relation JOIN assets company ON company.id=relation.company_id
+          WHERE relation.area_id=area.id AND relation.relation_role='OPERATOR' AND relation.valid_until IS NULL
+          ORDER BY relation.valid_from DESC,relation.created_at DESC LIMIT 1) AS "currentOperator",
+        (SELECT COUNT(*)::integer FROM assets yacimiento JOIN asset_types ytype ON ytype.id=yacimiento.asset_type_id
+          WHERE yacimiento.parent_id=area.id AND lower(ytype.code)='yacimiento'
+            AND yacimiento.information_status<>'INACTIVE') AS "yacimientoCount",
+        (SELECT COUNT(*)::integer FROM assets inventory
+          WHERE inventory.information_status<>'INACTIVE' AND inventory.operational_area_id=area.id) AS "inventoryCount"
+      FROM assets area JOIN asset_types type ON type.id=area.asset_type_id
+      WHERE ${conditions.join(' AND ')}
+      ORDER BY area.name,area.code
+    `, params);
+    return { data, meta: { count: data.length } };
+  }
+
+  async children(parentId: string, query: InventoryBrowserQueryDto) {
+    const parent = await this.parent(parentId);
+    const allowedChildType = this.allowedChildType(parent.typeCode);
+    if (!allowedChildType) return { parent, data: [], meta: { count: 0, hasMore: false } };
+
+    const params: unknown[] = [parentId, allowedChildType];
+    const conditions = [
+      'asset.parent_id=$1::uuid',
+      'lower(type.code)=lower($2)',
+      "asset.information_status<>'INACTIVE'",
+      'type.is_active=true',
+    ];
+    if (query.search?.trim()) {
+      params.push(`%${query.search.trim()}%`);
+      const p = `$${params.length}`;
+      conditions.push(`(asset.code ILIKE ${p} OR asset.name ILIKE ${p} OR COALESCE(asset.common_name,'') ILIKE ${p})`);
+    }
+
+    params.push(201);
+    const limit = `$${params.length}`;
+    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 parent_asset.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',parent_asset.id,'code',parent_asset.code,'name',parent_asset.name
+        ) END AS parent,
+        asset.information_status AS "informationStatus",
+        asset.operational_status AS "operationalStatus",
+        asset.is_inventory_instance AS "isInventoryInstance",
+        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 "inventoryFamily",
+        (SELECT COUNT(*)::integer FROM assets child
+          WHERE child.parent_id=asset.id AND child.information_status<>'INACTIVE') AS "childrenCount",
+        CASE WHEN family.id IS NULL THEN 0 ELSE (
+          SELECT COUNT(*)::integer FROM finding_catalog_item_inventory_families mapping
+          WHERE mapping.inventory_family_id=family.id
+        ) END AS "findingCount",
+        EXISTS (SELECT 1 FROM asset_geometries geometry WHERE geometry.asset_id=asset.id) AS "hasGeometry",
+        asset.updated_at AS "updatedAt"
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      LEFT JOIN assets parent_asset ON parent_asset.id=asset.parent_id
+      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
+      WHERE ${conditions.join(' AND ')}
+      ORDER BY asset.name,asset.code
+      LIMIT ${limit}
+    `, params);
+
+    const hasMore = rows.length > 200;
+    const data = hasMore ? rows.slice(0,200) : rows;
+    return { parent, data, meta: { count: data.length, hasMore } };
+  }
+
+  private async parent(parentId: string): Promise<ParentContext> {
+    const [parent] = await this.dataSource.query(`
+      SELECT asset.id,asset.code,asset.name,type.code AS "typeCode"
+      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 ParentContext[];
+    if (!parent) {
+      throw new NotFoundException({ code:'INVENTORY_BROWSER_PARENT_NOT_FOUND',message:'El nivel de Inventario no existe' });
+    }
+    if (!['departamento','area','yacimiento','instalacion','subinstalacion'].includes(parent.typeCode.toLowerCase())) {
+      throw new BadRequestException({
+        code:'INVENTORY_BROWSER_PARENT_TYPE_INVALID',
+        message:'La navegación de Inventarios admite Departamento → Área → Yacimiento → Instalación → Subinstalación',
+      });
+    }
+    return parent;
+  }
+
+  private allowedChildType(typeCode: string): string | null {
+    switch (typeCode.toLowerCase()) {
+      case 'departamento': return 'area';
+      case 'area': return 'yacimiento';
+      case 'yacimiento': return 'instalacion';
+      case 'instalacion': return 'subinstalacion';
+      default: return null;
+    }
+  }
+}

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

@@ -1,11 +1,99 @@
-import { Controller, Get, Param, ParseUUIDPipe } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Patch,
+  Post,
+  Put,
+  Req,
+} from '@nestjs/common';
+import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
 import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import {
+  CreateInventoryFamilyDto,
+  ReplaceInventoryFamilyFindingsDto,
+  UpdateInventoryFamilyDto,
+} from './dto/inventory-family-admin.dto';
+import {
+  CreateInventoryFamilyAttributeDto,
+  UpdateInventoryFamilyAttributeDto,
+} from './dto/inventory-family-attribute.dto';
 import { InventoryFamilyCatalogService } from './inventory-family-catalog.service';
 
 @Controller('inventory-families')
 export class InventoryFamilyCatalogController {
   constructor(private readonly families: InventoryFamilyCatalogService) {}
 
+  @Get('admin')
+  @RequirePermissions('asset_types.read')
+  admin() {
+    return this.families.listAdmin();
+  }
+
+  @Post()
+  @RequirePermissions('asset_types.manage')
+  create(
+    @Body() dto: CreateInventoryFamilyDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.families.create(dto,principal,request);
+  }
+
+  @Patch(':familyId')
+  @RequirePermissions('asset_types.manage')
+  update(
+    @Param('familyId',new ParseUUIDPipe({version:'4'})) familyId:string,
+    @Body() dto:UpdateInventoryFamilyDto,
+    @CurrentAuth() principal:AuthPrincipal,
+    @Req() request:RequestWithContext,
+  ) {
+    return this.families.update(familyId,dto,principal,request);
+  }
+
+  @Get(':familyId/attributes')
+  @RequirePermissions('asset_types.read')
+  attributes(@Param('familyId',new ParseUUIDPipe({version:'4'})) familyId:string) {
+    return this.families.attributes(familyId);
+  }
+
+  @Post(':familyId/attributes')
+  @RequirePermissions('asset_types.manage')
+  createAttribute(
+    @Param('familyId',new ParseUUIDPipe({version:'4'})) familyId:string,
+    @Body() dto:CreateInventoryFamilyAttributeDto,
+    @CurrentAuth() principal:AuthPrincipal,
+    @Req() request:RequestWithContext,
+  ) {
+    return this.families.createAttribute(familyId,dto,principal,request);
+  }
+
+  @Patch(':familyId/attributes/:attributeId')
+  @RequirePermissions('asset_types.manage')
+  updateAttribute(
+    @Param('familyId',new ParseUUIDPipe({version:'4'})) familyId:string,
+    @Param('attributeId',new ParseUUIDPipe({version:'4'})) attributeId:string,
+    @Body() dto:UpdateInventoryFamilyAttributeDto,
+    @CurrentAuth() principal:AuthPrincipal,
+    @Req() request:RequestWithContext,
+  ) {
+    return this.families.updateAttribute(familyId,attributeId,dto,principal,request);
+  }
+
+  @Put(':familyId/findings')
+  @RequirePermissions('finding_catalog.manage')
+  replaceFindings(
+    @Param('familyId',new ParseUUIDPipe({version:'4'})) familyId:string,
+    @Body() dto:ReplaceInventoryFamilyFindingsDto,
+    @CurrentAuth() principal:AuthPrincipal,
+    @Req() request:RequestWithContext,
+  ) {
+    return this.families.replaceFindings(familyId,dto,principal,request);
+  }
+
   @Get(':familyId/findings')
   @RequirePermissions('assets.read')
   findings(@Param('familyId', new ParseUUIDPipe({ version: '4' })) familyId: string) {

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

@@ -1,28 +1,69 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
+import { randomUUID } from 'node:crypto';
-import { DataSource } from 'typeorm';
+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 {
+  CreateInventoryFamilyDto,
+  ReplaceInventoryFamilyFindingsDto,
+  UpdateInventoryFamilyDto,
+} from './dto/inventory-family-admin.dto';
+import type {
+  CreateInventoryFamilyAttributeDto,
+  InventoryFamilyAttributeDataType,
+  UpdateInventoryFamilyAttributeDto,
+} from './dto/inventory-family-attribute.dto';
+
+type FamilyParent = { id: string; code: string; name: string };
+type FamilyRow = {
+  id: string;
+  code: string;
+  name: string;
+  level: 'INSTALLATION' | 'SUBINSTALLATION';
+  informationLabels: string[];
+  sourceReference: string | null;
+  isActive: boolean;
+  parentFamilyIds: string[];
+  parentFamilies: FamilyParent[];
+  assetCount: number;
+  findingCount: number;
+  findingItemIds: string[];
+  technicalAttributeCount: number;
+};
+type AttributeRow = {
+  id: string;
+  inventoryFamilyId: string;
+  code: string;
+  name: string;
+  dataType: InventoryFamilyAttributeDataType;
+  isRequired: boolean;
+  isActive: boolean;
+  unit: string | null;
+  options: string[] | null;
+  sortOrder: number;
+};
 
 @Injectable()
 export class InventoryFamilyCatalogService {
-  constructor(private readonly dataSource: DataSource) {}
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+  ) {}
+
+  async listAdmin() {
+    const data = await this.dataSource.query(this.familySelect(`ORDER BY family.level,family.is_active DESC,family.name,family.code`)) as FamilyRow[];
+    return { data };
+  }
 
   async findings(familyId: string) {
-    const [family] = await this.dataSource.query(`
+    const family = await this.family(familyId, false);
-      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",
@@ -36,4 +77,369 @@ export class InventoryFamilyCatalogService {
     `, [familyId]);
     return { family, items, count: items.length };
   }
+
+  async attributes(familyId: string) {
+    const family = await this.family(familyId, false);
+    const items = await this.attributeRows(this.dataSource.manager, familyId);
+    return { family, items, count: items.length };
+  }
+
+  async create(
+    dto: CreateInventoryFamilyDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction(async (manager) => {
+      const parentIds = await this.validateParents(manager, dto.level, dto.parentFamilyIds ?? [], null);
+      const code = `CUSTOM-${dto.level === 'INSTALLATION' ? 'I' : 'S'}-${randomUUID().slice(0,8).toUpperCase()}`;
+      const [inserted] = (await manager.query(`
+        INSERT INTO inventory_families(
+          code,name,level,legacy_type_code,information_labels,source_reference,is_active
+        ) VALUES ($1,$2,$3,NULL,$4::jsonb,'MANUAL:F6',true)
+        RETURNING id
+      `,[code,dto.name,dto.level,JSON.stringify(this.cleanLabels(dto.informationLabels ?? []))])) as Array<{id:string}>;
+      if (!inserted) throw new Error('No se pudo crear la clasificación de Inventario');
+      await this.replaceParents(manager, inserted.id, parentIds);
+      const created = await this.family(inserted.id,false,manager);
+      await this.audit.record({
+        ...administrationAuditContext(principal,request),
+        action: AuditAction.ASSET_UPDATED,
+        entityType: 'inventory_family',
+        entityId: inserted.id,
+        afterData: created as unknown as Record<string,unknown>,
+        metadata: { operation:'INVENTORY_FAMILY_CREATED', source:'MANUAL:F6' },
+      },manager);
+      return created;
+    });
+  }
+
+  async update(
+    familyId: string,
+    dto: UpdateInventoryFamilyDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction(async (manager) => {
+      const before = await this.family(familyId,false,manager,true);
+      const nextParentIds = dto.parentFamilyIds === undefined
+        ? before.parentFamilyIds
+        : dto.parentFamilyIds;
+      const parentIds = await this.validateParents(manager,before.level,nextParentIds,familyId);
+      if (before.level === 'SUBINSTALLATION' && dto.parentFamilyIds !== undefined) {
+        await this.assertRemovedCompatibilitiesUnused(manager, familyId, parentIds);
+      }
+      await manager.query(`
+        UPDATE inventory_families SET
+          name=COALESCE($2::varchar,name),
+          information_labels=COALESCE($3::jsonb,information_labels),
+          is_active=COALESCE($4::boolean,is_active),
+          updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1::uuid
+      `,[
+        familyId,
+        dto.name ?? null,
+        dto.informationLabels === undefined ? null : JSON.stringify(this.cleanLabels(dto.informationLabels)),
+        dto.isActive ?? null,
+      ]);
+      if (dto.parentFamilyIds !== undefined) await this.replaceParents(manager, familyId, parentIds);
+      const after = await this.family(familyId,false,manager);
+      await this.audit.record({
+        ...administrationAuditContext(principal,request),
+        action: AuditAction.ASSET_UPDATED,
+        entityType: 'inventory_family',
+        entityId: familyId,
+        beforeData: before as unknown as Record<string,unknown>,
+        afterData: after as unknown as Record<string,unknown>,
+        metadata: { operation:'INVENTORY_FAMILY_UPDATED' },
+      },manager);
+      return after;
+    });
+  }
+
+  async createAttribute(
+    familyId: string,
+    dto: CreateInventoryFamilyAttributeDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction(async (manager) => {
+      await this.family(familyId,false,manager,true);
+      const options = this.attributeOptions(dto.dataType,dto.options);
+      try {
+        const [created] = (await manager.query(`
+          INSERT INTO inventory_family_attribute_definitions(
+            inventory_family_id,code,name,data_type,is_required,is_active,unit,options,sort_order,created_by,updated_by
+          ) VALUES ($1::uuid,$2,$3,$4::asset_attribute_data_type,$5,true,$6,$7::jsonb,$8,$9::uuid,$9::uuid)
+          RETURNING id,inventory_family_id AS "inventoryFamilyId",code,name,data_type AS "dataType",
+            is_required AS "isRequired",is_active AS "isActive",unit,options,sort_order AS "sortOrder"
+        `,[familyId,dto.code,dto.name,dto.dataType,dto.isRequired ?? false,dto.unit ?? null,
+          options === null ? null : JSON.stringify(options),dto.sortOrder ?? 0,principal.userId])) as AttributeRow[];
+        if (!created) throw new Error('No se pudo crear el campo técnico');
+        await this.audit.record({
+          ...administrationAuditContext(principal,request),
+          action: AuditAction.ASSET_UPDATED,
+          entityType:'inventory_family_attribute',entityId:created.id,
+          afterData:created as unknown as Record<string,unknown>,
+          metadata:{operation:'INVENTORY_FAMILY_ATTRIBUTE_CREATED',inventoryFamilyId:familyId},
+        },manager);
+        return created;
+      } catch (error) {
+        if (this.isUniqueViolation(error)) throw new ConflictException({
+          code:'INVENTORY_FAMILY_ATTRIBUTE_CODE_EXISTS',
+          message:'Ya existe un campo técnico con ese código en la clasificación',
+        });
+        throw error;
+      }
+    });
+  }
+
+  async updateAttribute(
+    familyId: string,
+    attributeId: string,
+    dto: UpdateInventoryFamilyAttributeDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction(async (manager) => {
+      await this.family(familyId,false,manager,true);
+      const before = await this.attribute(manager,familyId,attributeId,true);
+      const nextType = dto.dataType ?? before.dataType;
+      const nextOptions = dto.options === undefined
+        ? this.attributeOptions(nextType,before.options ?? undefined)
+        : this.attributeOptions(nextType,dto.options ?? undefined);
+      const [after] = (await manager.query(`
+        UPDATE inventory_family_attribute_definitions SET
+          name=COALESCE($3::varchar,name),
+          data_type=COALESCE($4::asset_attribute_data_type,data_type),
+          is_required=COALESCE($5::boolean,is_required),
+          is_active=COALESCE($6::boolean,is_active),
+          unit=CASE WHEN $7::boolean THEN $8::varchar ELSE unit END,
+          options=$9::jsonb,
+          sort_order=COALESCE($10::integer,sort_order),
+          updated_by=$11::uuid,updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1::uuid AND inventory_family_id=$2::uuid
+        RETURNING id,inventory_family_id AS "inventoryFamilyId",code,name,data_type AS "dataType",
+          is_required AS "isRequired",is_active AS "isActive",unit,options,sort_order AS "sortOrder"
+      `,[attributeId,familyId,dto.name ?? null,dto.dataType ?? null,dto.isRequired ?? null,dto.isActive ?? null,
+        dto.unit !== undefined,dto.unit ?? null,nextOptions === null ? null : JSON.stringify(nextOptions),
+        dto.sortOrder ?? null,principal.userId])) as AttributeRow[];
+      if (!after) throw new NotFoundException({code:'INVENTORY_FAMILY_ATTRIBUTE_NOT_FOUND',message:'El campo técnico no existe'});
+      await this.audit.record({
+        ...administrationAuditContext(principal,request),
+        action: AuditAction.ASSET_UPDATED,
+        entityType:'inventory_family_attribute',entityId:attributeId,
+        beforeData:before as unknown as Record<string,unknown>,afterData:after as unknown as Record<string,unknown>,
+        metadata:{operation:'INVENTORY_FAMILY_ATTRIBUTE_UPDATED',inventoryFamilyId:familyId},
+      },manager);
+      return after;
+    });
+  }
+
+  async replaceFindings(
+    familyId: string,
+    dto: ReplaceInventoryFamilyFindingsDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction(async (manager) => {
+      const family = await this.family(familyId,false,manager,true);
+      const uniqueIds=[...new Set(dto.itemIds)];
+      if (uniqueIds.length) {
+        const [count] = (await manager.query(`
+          SELECT COUNT(*)::integer AS total
+          FROM finding_catalog_items item
+          JOIN finding_categories category ON category.id=item.category_id
+          WHERE item.id=ANY($1::uuid[]) AND item.is_active=true AND category.is_active=true
+        `,[uniqueIds])) as Array<{total:number}>;
+        if (Number(count?.total ?? 0)!==uniqueIds.length) throw new BadRequestException({
+          code:'INVENTORY_FAMILY_FINDING_INVALID',
+          message:'Uno o más Hallazgos elegidos no están activos en el catálogo',
+        });
+      }
+      const beforeIds=family.findingItemIds;
+      await manager.query(`DELETE FROM finding_catalog_item_inventory_families WHERE inventory_family_id=$1::uuid`,[familyId]);
+      if (uniqueIds.length) {
+        await manager.query(`
+          INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id)
+          SELECT item_id,$2::uuid FROM UNNEST($1::uuid[]) AS selected(item_id)
+          ON CONFLICT (catalog_item_id,inventory_family_id) DO NOTHING
+        `,[uniqueIds,familyId]);
+      }
+      const after=await this.family(familyId,false,manager);
+      await this.audit.record({
+        ...administrationAuditContext(principal,request),
+        action: AuditAction.ASSET_UPDATED,
+        entityType:'inventory_family_findings',entityId:familyId,
+        beforeData:{itemIds:beforeIds},afterData:{itemIds:after.findingItemIds},
+        metadata:{operation:'INVENTORY_FAMILY_FINDINGS_REPLACED',reason:dto.reason},
+      },manager);
+      return this.findingsWithManager(manager,familyId);
+    });
+  }
+
+  private async findingsWithManager(manager:EntityManager,familyId:string) {
+    const family=await this.family(familyId,false,manager);
+    const items=await manager.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};
+  }
+
+  private familySelect(suffix:string) {
+    return `
+      SELECT family.id,family.code,family.name,family.level,
+        family.information_labels AS "informationLabels",
+        family.source_reference AS "sourceReference",family.is_active AS "isActive",
+        COALESCE((SELECT JSONB_AGG(rule.parent_family_id ORDER BY parent.name,parent.code)
+          FROM inventory_family_parent_rules rule
+          JOIN inventory_families parent ON parent.id=rule.parent_family_id
+          WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilyIds",
+        COALESCE((SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) ORDER BY parent.name,parent.code)
+          FROM inventory_family_parent_rules rule
+          JOIN inventory_families parent ON parent.id=rule.parent_family_id
+          WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilies",
+        (SELECT COUNT(*)::integer FROM assets asset WHERE asset.inventory_family_id=family.id) AS "assetCount",
+        (SELECT COUNT(*)::integer FROM finding_catalog_item_inventory_families mapping WHERE mapping.inventory_family_id=family.id) AS "findingCount",
+        COALESCE((SELECT JSONB_AGG(mapping.catalog_item_id ORDER BY mapping.catalog_item_id)
+          FROM finding_catalog_item_inventory_families mapping WHERE mapping.inventory_family_id=family.id),'[]'::jsonb) AS "findingItemIds",
+        (SELECT COUNT(*)::integer FROM inventory_family_attribute_definitions definition
+          WHERE definition.inventory_family_id=family.id AND definition.is_active=true) AS "technicalAttributeCount"
+      FROM inventory_families family
+      ${suffix}
+    `;
+  }
+
+  private async family(
+    familyId:string,
+    activeOnly:boolean,
+    manager:EntityManager=this.dataSource.manager,
+    lock=false,
+  ):Promise<FamilyRow> {
+    const lockClause=lock ? 'FOR UPDATE OF family' : '';
+    const rows=(await manager.query(this.familySelect(`
+      WHERE family.id=$1::uuid ${activeOnly ? 'AND family.is_active=true' : ''}
+      ${lockClause}
+    `),[familyId])) as FamilyRow[];
+    if (!rows[0]) throw new NotFoundException({
+      code:'INVENTORY_FAMILY_NOT_FOUND',message:'La clasificación de Inventario no existe',
+    });
+    return rows[0];
+  }
+
+  private async validateParents(
+    manager:EntityManager,
+    level:'INSTALLATION'|'SUBINSTALLATION',
+    requestedIds:string[],
+    ownId:string|null,
+  ):Promise<string[]> {
+    const ids=[...new Set(requestedIds)];
+    if (level==='INSTALLATION') {
+      if (ids.length) throw new BadRequestException({
+        code:'INVENTORY_FAMILY_PARENT_NOT_ALLOWED',
+        message:'Una clasificación de Instalación no lleva compatibilidades padre',
+      });
+      return [];
+    }
+    if (!ids.length) throw new BadRequestException({
+      code:'INVENTORY_FAMILY_PARENT_REQUIRED',
+      message:'Elegí al menos un tipo de Instalación compatible con esta Subinstalación',
+    });
+    if (ownId && ids.includes(ownId)) throw new BadRequestException({
+      code:'INVENTORY_FAMILY_PARENT_CYCLE',message:'Una clasificación no puede ser compatible consigo misma',
+    });
+    const [count]=(await manager.query(`
+      SELECT COUNT(*)::integer AS total FROM inventory_families
+      WHERE id=ANY($1::uuid[]) AND level='INSTALLATION' AND is_active=true
+    `,[ids])) as Array<{total:number}>;
+    if (Number(count?.total ?? 0)!==ids.length) throw new BadRequestException({
+      code:'INVENTORY_FAMILY_PARENT_INVALID',
+      message:'Todas las compatibilidades deben ser clasificaciones de Instalación activas',
+    });
+    return ids;
+  }
+
+  private async replaceParents(manager:EntityManager,familyId:string,parentIds:string[]) {
+    await manager.query(`DELETE FROM inventory_family_parent_rules WHERE child_family_id=$1::uuid`,[familyId]);
+    if (parentIds.length) await manager.query(`
+      INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
+      SELECT $1::uuid,parent_id FROM UNNEST($2::uuid[]) AS selected(parent_id)
+      ON CONFLICT (child_family_id,parent_family_id) DO NOTHING
+    `,[familyId,parentIds]);
+  }
+
+  private async assertRemovedCompatibilitiesUnused(manager:EntityManager,childFamilyId:string,nextParentIds:string[]) {
+    const rows=await manager.query(`
+      SELECT child.name AS "childName",parent.name AS "parentName",COUNT(*)::integer AS total
+      FROM assets child
+      JOIN assets parent ON parent.id=child.parent_id
+      WHERE child.inventory_family_id=$1::uuid
+        AND parent.inventory_family_id IS NOT NULL
+        AND NOT (parent.inventory_family_id=ANY($2::uuid[]))
+      GROUP BY child.name,parent.name
+      ORDER BY total DESC
+      LIMIT 1
+    `,[childFamilyId,nextParentIds]);
+    if (rows[0]) throw new ConflictException({
+      code:'INVENTORY_FAMILY_COMPATIBILITY_IN_USE',
+      message:`No podés quitar esa compatibilidad: ya existen Subinstalaciones de este tipo dentro de ${rows[0].parentName}`,
+    });
+  }
+
+  private async attributeRows(manager:EntityManager,familyId:string):Promise<AttributeRow[]> {
+    return manager.query(`
+      SELECT id,inventory_family_id AS "inventoryFamilyId",code,name,data_type AS "dataType",
+        is_required AS "isRequired",is_active AS "isActive",unit,options,sort_order AS "sortOrder"
+      FROM inventory_family_attribute_definitions
+      WHERE inventory_family_id=$1::uuid
+      ORDER BY is_active DESC,sort_order,name,code
+    `,[familyId]) as Promise<AttributeRow[]>;
+  }
+
+  private async attribute(manager:EntityManager,familyId:string,attributeId:string,lock=false):Promise<AttributeRow> {
+    const rows=(await manager.query(`
+      SELECT id,inventory_family_id AS "inventoryFamilyId",code,name,data_type AS "dataType",
+        is_required AS "isRequired",is_active AS "isActive",unit,options,sort_order AS "sortOrder"
+      FROM inventory_family_attribute_definitions
+      WHERE id=$1::uuid AND inventory_family_id=$2::uuid
+      ${lock ? 'FOR UPDATE' : ''}
+    `,[attributeId,familyId])) as AttributeRow[];
+    if (!rows[0]) throw new NotFoundException({code:'INVENTORY_FAMILY_ATTRIBUTE_NOT_FOUND',message:'El campo técnico no existe'});
+    return rows[0];
+  }
+
+  private attributeOptions(type:InventoryFamilyAttributeDataType,raw:string[]|undefined):string[]|null {
+    if (type!=='SELECT') return null;
+    const values=[...new Map((raw ?? []).map((value) => {
+      const clean=value.trim(); return [clean.toLocaleLowerCase('es-AR'),clean] as const;
+    }).filter(([,value]) => Boolean(value))).values()];
+    if (!values.length) throw new BadRequestException({
+      code:'INVENTORY_FAMILY_ATTRIBUTE_OPTIONS_REQUIRED',
+      message:'Un campo de lista necesita al menos una opción',
+    });
+    return values;
+  }
+
+  private cleanLabels(labels:string[]):string[] {
+    const unique=new Map<string,string>();
+    for (const raw of labels) {
+      const clean=raw.trim(); if (!clean) continue;
+      const identity=clean.toLocaleLowerCase('es-AR');
+      if (!unique.has(identity)) unique.set(identity,clean);
+    }
+    if (unique.size>100) throw new ConflictException({
+      code:'INVENTORY_FAMILY_TOO_MANY_FIELDS',message:'La clasificación admite hasta 100 campos de información',
+    });
+    return [...unique.values()];
+  }
+
+  private isUniqueViolation(error:unknown) {
+    return Boolean(error && typeof error==='object' && 'code' in error && (error as {code?:string}).code==='23505');
+  }
 }

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

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

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

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

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

@@ -39,6 +39,22 @@ type MergeRow = {
   requestId: string | null;
 };
 
+type DocumentInvariantRow = {
+  actId: string;
+  actStatus: string;
+  lockedSha256: string | null;
+  closureSha256: string | null;
+  sealedAt: Date | null;
+  actVersion: number;
+  reportId: string | null;
+  reportStatus: string | null;
+  reportActClosureSha256: string | null;
+  reportFrozenSha256: string | null;
+  gedoPdfSha256: string | null;
+  wordSha256: string | null;
+  reportRevision: number | null;
+};
+
 const MERGEABLE_TYPES = new Set(['instalacion', 'subinstalacion']);
 
 @Injectable()
@@ -161,6 +177,19 @@ export class InventoryMergeService {
     if (!source || !canonical) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
 
     this.validatePair(source, canonical);
+
+    // Empresa is temporal inspection context, not physical ownership. A merge is
+    // valid when both records resolve to the same Area in the physical hierarchy,
+    // even if their historical operator snapshots differ.
+    const [sourceAreaId, canonicalAreaId] = await Promise.all([
+      this.resolvePhysicalAreaId(manager, source.id),
+      this.resolvePhysicalAreaId(manager, canonical.id),
+    ]);
+    if (!sourceAreaId || sourceAreaId !== canonicalAreaId) throw new BadRequestException({
+      code: 'INVENTORY_MERGE_AREA_MISMATCH',
+      message: 'Los duplicados deben pertenecer a la misma Área física',
+    });
+
     const sourceParentCanonical = source.parentId
       ? await this.resolveCanonicalId(manager, source.parentId)
       : null;
@@ -197,6 +226,8 @@ export class InventoryMergeService {
       });
     }
 
+    const affectedAssetIds = [source.id, canonical.id];
+    const documentInvariantsBefore = await this.documentInvariants(manager, affectedAssetIds);
     const [sourceSnapshot, canonicalSnapshot] = await Promise.all([
       this.snapshot(manager, source.id),
       this.snapshot(manager, canonical.id),
@@ -279,6 +310,17 @@ export class InventoryMergeService {
       request,
     );
 
+    // No historical Acta/Finding/Informe foreign key is rewritten by a merge.
+    // Verify that legal/documentary fingerprints are byte-for-byte unchanged
+    // before committing the transaction; otherwise rollback the entire merge.
+    const documentInvariantsAfter = await this.documentInvariants(manager, affectedAssetIds);
+    if (JSON.stringify(documentInvariantsBefore) !== JSON.stringify(documentInvariantsAfter)) {
+      throw new ConflictException({
+        code: 'INVENTORY_MERGE_DOCUMENT_INVARIANT_BROKEN',
+        message: 'La fusión intentó alterar la huella documental histórica y fue revertida',
+      });
+    }
+
     const result = {
       merge: mergeRecord,
       source: { id: source.id, code: source.code, name: source.name },
@@ -286,6 +328,7 @@ export class InventoryMergeService {
       sourceVersionNumber,
       reparentedChildIds,
       historyPolicy: 'HISTORICAL_REFERENCES_PRESERVED',
+      documentaryInvariantsVerified: true,
     };
     await this.audit.record({
       ...administrationAuditContext(principal, request),
@@ -298,10 +341,12 @@ export class InventoryMergeService {
         operation: 'CHRONOLOGICAL_MERGE',
         sourceAssetId: source.id,
         canonicalAssetId: canonical.id,
+        physicalAreaId: sourceAreaId,
         reason: dto.reason,
         sourceVersionNumber,
         reparentedChildIds,
         historicalReferencesRewritten: false,
+        documentaryInvariantsVerified: true,
       },
     }, manager);
     return result;
@@ -322,14 +367,59 @@ export class InventoryMergeService {
       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) {
+  private async resolvePhysicalAreaId(manager: EntityManager, assetId: string): Promise<string | null> {
-      throw new BadRequestException({
+    const rows = (await manager.query(`
-        code: 'INVENTORY_MERGE_CONTEXT_MISMATCH',
+      WITH RECURSIVE lineage AS (
-        message: 'Los registros deben pertenecer a la misma Área y Operadora',
+        SELECT asset.id,asset.parent_id,asset.asset_type_id,0 AS depth
-      });
+        FROM assets asset WHERE asset.id=$1::uuid
-    }
+        UNION ALL
+        SELECT parent.id,parent.parent_id,parent.asset_type_id,lineage.depth+1
+        FROM assets parent
+        JOIN lineage ON lineage.parent_id=parent.id
+        WHERE lineage.depth<32
+      )
+      SELECT lineage.id
+      FROM lineage
+      JOIN asset_types type ON type.id=lineage.asset_type_id
+      WHERE type.operational_role='AREA'
+      ORDER BY lineage.depth
+      LIMIT 1
+    `, [assetId])) as Array<{ id: string }>;
+    return rows[0]?.id ?? null;
+  }
+
+  private async documentInvariants(manager: EntityManager, assetIds: string[]): Promise<DocumentInvariantRow[]> {
+    return (await manager.query(`
+      WITH affected_acts AS (
+        SELECT DISTINCT act.id
+        FROM inspection_acts act
+        LEFT JOIN inspection_act_assets act_asset
+          ON act_asset.act_id=act.id AND act_asset.included=true
+        LEFT JOIN inspection_findings finding ON finding.act_id=act.id
+        WHERE act_asset.asset_id=ANY($1::uuid[])
+           OR finding.asset_id=ANY($1::uuid[])
+      )
+      SELECT
+        act.id AS "actId",
+        act.status AS "actStatus",
+        act.locked_sha256 AS "lockedSha256",
+        act.closure_sha256 AS "closureSha256",
+        act.sealed_at AS "sealedAt",
+        act.current_version AS "actVersion",
+        report.id AS "reportId",
+        report.status AS "reportStatus",
+        report.act_closure_sha256 AS "reportActClosureSha256",
+        report.frozen_sha256 AS "reportFrozenSha256",
+        report.gedo_pdf_sha256 AS "gedoPdfSha256",
+        report.word_sha256 AS "wordSha256",
+        report.current_revision_number AS "reportRevision"
+      FROM affected_acts affected
+      JOIN inspection_acts act ON act.id=affected.id
+      LEFT JOIN inspection_reports report ON report.act_id=act.id
+      ORDER BY act.id,report.id NULLS FIRST
+    `, [assetIds])) as DocumentInvariantRow[];
   }
 
   private async loadAsset(manager: EntityManager, id: string, lock: boolean): Promise<MergeableAssetRow> {

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

@@ -20,6 +20,7 @@ import type { CreateInventoryStructureDto, InventoryStructureKind } from './dto/
 import { AssetHistoryService } from './asset-history.service';
 
 type StructureTypeRow = { id: string; code: string; name: string };
+type FamilyParent = { id: string; code: string; name: string };
 type FamilyRow = {
   id: string;
   code: string;
@@ -27,28 +28,29 @@ type FamilyRow = {
   level: 'INSTALLATION' | 'SUBINSTALLATION';
   legacyTypeCode: string | null;
   informationLabels: string[];
-  parentFamilyId: string | null;
+  parentFamilyIds: string[];
-  parentFamilyCode: string | null;
+  parentFamilies: FamilyParent[];
-  parentFamilyName: string | null;
 };
 type ParentRow = {
   id: string;
   code: string;
   name: string;
   typeCode: string;
-  operationalAreaId: string | null;
-  operatorCompanyId: string | null;
   inventoryFamilyId: string | null;
 };
+type IdRow = { id: string };
 
-const TYPE_CODE_BY_KIND: Record<InventoryStructureKind, string> = {
+const TYPE_CODE_BY_KIND: Record<Exclude<InventoryStructureKind, 'EMPRESA'>, string> = {
+  DEPARTAMENTO: 'departamento',
   AREA: 'area',
   YACIMIENTO: 'yacimiento',
   INSTALACION: 'instalacion',
   SUBINSTALACION: 'subinstalacion',
 };
 const PARENT_TYPE_BY_KIND: Record<InventoryStructureKind, string | null> = {
-  AREA: null,
+  EMPRESA: null,
+  DEPARTAMENTO: null,
+  AREA: 'departamento',
   YACIMIENTO: 'area',
   INSTALACION: 'yacimiento',
   SUBINSTALACION: 'instalacion',
@@ -70,35 +72,58 @@ export class InventoryStructureService {
     const types = (await this.dataSource.query(`
       SELECT id,code,name
       FROM asset_types
-      WHERE lower(code) IN ('area','yacimiento','instalacion','subinstalacion')
+      WHERE (
-        AND is_active=true
+        lower(code) IN ('departamento','area','yacimiento','instalacion','subinstalacion')
-      ORDER BY CASE lower(code)
+        OR operational_role='COMPANY'
-        WHEN 'area' THEN 1 WHEN 'yacimiento' THEN 2
+      ) AND is_active=true
-        WHEN 'instalacion' THEN 3 WHEN 'subinstalacion' THEN 4 ELSE 9 END
+      ORDER BY CASE
+        WHEN operational_role='COMPANY' THEN 0
+        WHEN lower(code)='departamento' THEN 1
+        WHEN lower(code)='area' THEN 2
+        WHEN lower(code)='yacimiento' THEN 3
+        WHEN lower(code)='instalacion' THEN 4
+        WHEN lower(code)='subinstalacion' THEN 5 ELSE 9 END
     `)) as StructureTypeRow[];
-    if (types.length !== 4) {
+    const company = types.find((item) => ['empresa','organizacion'].includes(item.code.toLowerCase()));
+    const departamento = types.find((item) => item.code.toLowerCase()==='departamento');
+    const area = types.find((item) => item.code.toLowerCase()==='area');
+    const yacimiento = types.find((item) => item.code.toLowerCase()==='yacimiento');
+    const instalacion = types.find((item) => item.code.toLowerCase()==='instalacion');
+    const subinstalacion = types.find((item) => item.code.toLowerCase()==='subinstalacion');
+    if (!company || !departamento || !area || !yacimiento || !instalacion || !subinstalacion) {
       throw new ConflictException({
         code: 'INVENTORY_STRUCTURE_TYPES_INCOMPLETE',
-        message: 'La estructura del Inventario todavía no está completamente configurada',
+        message: 'La configuración maestra de Empresa e Inventario todavía no está completa',
       });
     }
+
     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"
+        COALESCE((SELECT JSONB_AGG(rule.parent_family_id ORDER BY parent.name,parent.code)
+          FROM inventory_family_parent_rules rule
+          JOIN inventory_families parent ON parent.id=rule.parent_family_id
+          WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilyIds",
+        COALESCE((SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) ORDER BY parent.name,parent.code)
+          FROM inventory_family_parent_rules rule
+          JOIN inventory_families parent ON parent.id=rule.parent_family_id
+          WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilies"
       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 {
+      independentMasters: [
+        { kind: 'EMPRESA', label: 'Empresa', type: company, parentKind: null, requiresFamily: false },
+      ],
       levels: [
-        { kind: 'AREA', label: 'Área', type: types.find((item) => item.code.toLowerCase()==='area'), parentKind: null, requiresFamily: false },
+        { kind: 'DEPARTAMENTO', label: 'Departamento', type: departamento, parentKind: null, requiresFamily: false },
-        { kind: 'YACIMIENTO', label: 'Yacimiento', type: types.find((item) => item.code.toLowerCase()==='yacimiento'), parentKind: 'AREA', requiresFamily: false },
+        { kind: 'AREA', label: 'Área', type: area, parentKind: 'DEPARTAMENTO', requiresFamily: false },
-        { kind: 'INSTALACION', label: 'Instalación', type: types.find((item) => item.code.toLowerCase()==='instalacion'), parentKind: 'YACIMIENTO', requiresFamily: true },
+        { kind: 'YACIMIENTO', label: 'Yacimiento', type: yacimiento, parentKind: 'AREA', requiresFamily: false },
-        { kind: 'SUBINSTALACION', label: 'Subinstalación', type: types.find((item) => item.code.toLowerCase()==='subinstalacion'), parentKind: 'INSTALACION', requiresFamily: true },
+        { kind: 'INSTALACION', label: 'Instalación', type: instalacion, parentKind: 'YACIMIENTO', requiresFamily: true },
+        { kind: 'SUBINSTALACION', label: 'Subinstalación', type: subinstalacion, parentKind: 'INSTALACION', requiresFamily: true },
       ],
       installationFamilies: families.filter((item) => item.level==='INSTALLATION'),
       subinstallationFamilies: families.filter((item) => item.level==='SUBINSTALLATION'),
@@ -107,7 +132,7 @@ export class InventoryStructureService {
 
   async parents(kindValue: string, search?: string) {
     const kind = kindValue.toUpperCase() as InventoryStructureKind;
-    if (!(kind in PARENT_TYPE_BY_KIND) || kind === 'AREA') {
+    if (!(kind in PARENT_TYPE_BY_KIND) || kind === 'DEPARTAMENTO' || kind === 'EMPRESA') {
       throw new BadRequestException({
         code: 'INVENTORY_STRUCTURE_PARENT_KIND_INVALID',
         message: 'El nivel indicado no requiere un registro padre',
@@ -139,7 +164,7 @@ export class InventoryStructureService {
         AND asset.information_status<>'INACTIVE'
         ${searchSql}
       ORDER BY asset.name,asset.code
-      LIMIT 80
+      LIMIT 100
     `, parameters);
     return { data: rows };
   }
@@ -154,9 +179,10 @@ export class InventoryStructureService {
         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 generatedCode = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
-        const operationalAreaId = parent?.operationalAreaId ?? null;
+        const operationalAreaId = parent && ['YACIMIENTO','INSTALACION','SUBINSTALACION'].includes(dto.kind)
-        const operatorCompanyId = parent?.operatorCompanyId ?? null;
+          ? await this.resolveAreaId(manager, parent)
+          : null;
 
         const inserted = (await manager.query(`
           INSERT INTO assets (
@@ -164,91 +190,82 @@ export class InventoryStructureService {
             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,
+            $1::uuid,$2::uuid,$3::uuid,NULL,$4::uuid,
-            $6::varchar,$7::varchar,$8::varchar,$9::text,$10::asset_information_status,$11::asset_operational_status,
+            $5::varchar,$6::varchar,$7::varchar,$8::text,$9::asset_information_status,$10::asset_operational_status,
-            $12::varchar,$13::varchar,$14::varchar,$15::text,$16::uuid,$16::uuid,$16::uuid
+            $11::varchar,$12::varchar,$13::varchar,$14::text,$15::uuid,$15::uuid,$15::uuid
           ) RETURNING id
         `, [
           type.id,
           parent?.id ?? null,
           operationalAreaId,
-          operatorCompanyId,
           family?.id ?? null,
-          code,
+          generatedCode,
           dto.name,
           dto.commonName ?? null,
           dto.description ?? null,
           AssetInformationStatus.DRAFT,
           AssetOperationalStatus.UNKNOWN,
           AssetDataOrigin.MANUAL,
-          'Inventario estructural F3.1',
+          dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas F6' : 'Estructura manual de Inventario F6',
-          `inventory-structure:${dto.kind.toLowerCase()}`,
+          dto.kind === 'EMPRESA' ? 'inventory-master:empresa' : `inventory-structure:${dto.kind.toLowerCase()}`,
-          family ? `Familia técnica: ${family.code} · ${family.name}` : null,
+          family ? `Clasificación 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');
+        if (!id) throw new Error('No se pudo crear el registro');
+
+        if (dto.kind === 'EMPRESA') {
+          await manager.query(`
+            INSERT INTO organization_profiles(asset_id,organization_kind,legal_name,updated_by)
+            VALUES ($1::uuid,'COMPANY',$2,$3::uuid)
+            ON CONFLICT (asset_id) DO UPDATE SET legal_name=EXCLUDED.legal_name,updated_by=EXCLUDED.updated_by,updated_at=CURRENT_TIMESTAMP
+          `,[id,dto.name,principal.userId]);
+        }
 
         const versionNumber = await this.history.capture(
-          manager,
+          manager,id,AssetVersionChangeType.CREATED,principal,request,
-          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)
+          ) VALUES ($1,$2,$3,NULL,CURRENT_TIMESTAMP,$4,$5,'WEB',$6,$7)
         `, [
-          id,
+          id,parent?.id ?? null,operationalAreaId,
-          parent?.id ?? null,
+          dto.kind === 'EMPRESA' ? 'Alta manual de Empresa independiente F6' : 'Alta manual de estructura de Inventario F6',
-          operationalAreaId,
+          versionNumber,request.requestId,principal.userId,
-          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',
+          entityType: 'asset',entityId: id,
-          entityId: id,
           afterData: created as unknown as Record<string, unknown>,
           metadata: {
-            versionNumber,
+            versionNumber,inventoryStructureKind: dto.kind,
-            inventoryStructureKind: dto.kind,
+            inventoryFamilyId: family?.id ?? null,inventoryFamilyCode: family?.code ?? null,
-            inventoryFamilyId: family?.id ?? null,
+            operatorOwnership: false,
-            inventoryFamilyCode: family?.code ?? null,
           },
         }, manager);
         return created;
       });
     } catch (error) {
-      if (isUniqueViolation(error)) {
+      if (isUniqueViolation(error)) throw new ConflictException({
-        throw new ConflictException({
+        code: 'ASSET_CODE_ALREADY_EXISTS',message: 'Ya existe un registro con ese código',
-          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(`
+    const sql = kind === 'EMPRESA'
-      SELECT id,code,name FROM asset_types
+      ? `SELECT id,code,name FROM asset_types WHERE operational_role='COMPANY' AND is_active=true ORDER BY (lower(code)='empresa') DESC,created_at LIMIT 1`
-      WHERE lower(code)=lower($1::text) AND is_active=true LIMIT 1
+      : `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[];
+    const params = kind === 'EMPRESA' ? [] : [TYPE_CODE_BY_KIND[kind as Exclude<InventoryStructureKind,'EMPRESA'>]];
-    if (!rows[0]) {
+    const rows = (await manager.query(sql,params)) as StructureTypeRow[];
-      throw new ConflictException({
+    if (!rows[0]) throw new ConflictException({
-        code: 'INVENTORY_STRUCTURE_TYPE_NOT_CONFIGURED',
+      code: 'INVENTORY_STRUCTURE_TYPE_NOT_CONFIGURED',message: `El nivel ${kind} no está configurado`,
-        message: `El nivel ${kind} no está configurado`,
+    });
-      });
-    }
     return rows[0];
   }
 
@@ -259,24 +276,20 @@ export class InventoryStructureService {
   ): Promise<ParentRow | null> {
     const expectedType = PARENT_TYPE_BY_KIND[kind];
     if (!expectedType) {
-      if (parentId) {
+      if (parentId) throw new BadRequestException({
-        throw new BadRequestException({
+        code: 'INVENTORY_ROOT_MUST_NOT_HAVE_PARENT',
-          code: 'INVENTORY_AREA_MUST_BE_ROOT',
+        message: kind === 'EMPRESA'
-          message: 'Un Área se crea como registro raíz y no puede tener padre',
+          ? 'Una Empresa es un maestro independiente y no puede tener padre'
-        });
+          : 'Un Departamento es un registro raíz y no puede tener padre',
-      }
+      });
       return null;
     }
-    if (!parentId) {
+    if (!parentId) throw new BadRequestException({
-      throw new BadRequestException({
+      code: 'INVENTORY_STRUCTURE_PARENT_REQUIRED',
-        code: 'INVENTORY_STRUCTURE_PARENT_REQUIRED',
+      message: `Para crear ${kind.toLowerCase()} primero tenés que elegir su ${expectedType}`,
-        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
@@ -285,15 +298,35 @@ export class InventoryStructureService {
     `, [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) {
+    if (parent.typeCode.toLowerCase() !== expectedType) throw new BadRequestException({
-      throw new BadRequestException({
+      code: 'INVENTORY_STRUCTURE_PARENT_INVALID',
-        code: 'INVENTORY_STRUCTURE_PARENT_INVALID',
+      message: 'La jerarquía requerida es Departamento → Área → Yacimiento → Instalación → Subinstalación',
-        message: 'La jerarquía requerida es Área → Yacimiento → Instalación → Subinstalación',
+    });
-      });
-    }
     return parent;
   }
 
+  private async resolveAreaId(manager: EntityManager,parent: ParentRow):Promise<string> {
+    if (parent.typeCode.toLowerCase()==='area') return parent.id;
+    const rows = (await manager.query(`
+      WITH RECURSIVE lineage AS (
+        SELECT asset.id,asset.parent_id,asset.asset_type_id FROM assets asset WHERE asset.id=$1::uuid
+        UNION ALL
+        SELECT parent.id,parent.parent_id,parent.asset_type_id
+        FROM assets parent JOIN lineage child ON child.parent_id=parent.id
+      )
+      SELECT lineage.id
+      FROM lineage JOIN asset_types type ON type.id=lineage.asset_type_id
+      WHERE type.operational_role='AREA'
+      LIMIT 1
+    `,[parent.id])) as IdRow[];
+    const areaId=rows[0]?.id;
+    if (!areaId) throw new ConflictException({
+      code:'INVENTORY_STRUCTURE_AREA_ANCESTOR_MISSING',
+      message:'La ubicación seleccionada no pertenece a un Área válida',
+    });
+    return areaId;
+  }
+
   private async requireFamily(
     manager: EntityManager,
     kind: InventoryStructureKind,
@@ -304,49 +337,59 @@ export class InventoryStructureService {
     if (!expectedLevel) {
       if (familyId) throw new BadRequestException({
         code: 'INVENTORY_STRUCTURE_FAMILY_NOT_ALLOWED',
-        message: 'Área y Yacimiento no llevan familia técnica',
+        message: 'Empresa, Departamento, Área y Yacimiento no llevan clasificación técnica',
       });
       return null;
     }
     if (!familyId) throw new BadRequestException({
       code: 'INVENTORY_STRUCTURE_FAMILY_REQUIRED',
-      message: `Elegí la familia técnica de la ${kind.toLowerCase()}`,
+      message: `Elegí la clasificación 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.legacy_type_code AS "legacyTypeCode",family.information_labels AS "informationLabels",
-        family.information_labels AS "informationLabels",
+        COALESCE((SELECT JSONB_AGG(rule.parent_family_id ORDER BY rule.parent_family_id)
-        parent.id AS "parentFamilyId",parent.code AS "parentFamilyCode",parent.name AS "parentFamilyName"
+          FROM inventory_family_parent_rules rule WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilyIds",
+        COALESCE((SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) ORDER BY parent.name,parent.code)
+          FROM inventory_family_parent_rules rule JOIN inventory_families parent ON parent.id=rule.parent_family_id
+          WHERE rule.child_family_id=family.id),'[]'::jsonb) AS "parentFamilies"
       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) throw new NotFoundException({ code: 'INVENTORY_FAMILY_NOT_FOUND', message: 'La clasificación 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',
+      message: 'La clasificación técnica no corresponde al nivel seleccionado',
     });
-    if (kind === 'SUBINSTALACION' && family.parentFamilyId !== parent?.inventoryFamilyId) {
+    if (kind === 'SUBINSTALACION') {
-      throw new BadRequestException({
+      if (!parent?.inventoryFamilyId) throw new BadRequestException({
+        code:'INVENTORY_PARENT_FAMILY_REQUIRED',
+        message:'La Instalación padre debe tener una clasificación técnica válida',
+      });
+      const [compatible]=(await manager.query(`
+        SELECT 1 AS ok FROM inventory_family_parent_rules
+        WHERE child_family_id=$1::uuid AND parent_family_id=$2::uuid
+        LIMIT 1
+      `,[family.id,parent.inventoryFamilyId])) as Array<{ok:number}>;
+      if (!compatible) throw new BadRequestException({
         code: 'INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID',
-        message: 'La Subinstalación elegida no pertenece a la familia de la Instalación seleccionada',
+        message: 'Ese tipo de Subinstalación no es compatible con la clasificación 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 prefix = kind === 'EMPRESA' ? 'EMP'
-    const readable = name
+      : kind === 'DEPARTAMENTO' ? 'DEP'
-      .normalize('NFD')
+        : kind === 'AREA' ? 'AREA'
-      .replace(/[\u0300-\u036f]/g, '')
+          : kind === 'YACIMIENTO' ? 'YAC'
-      .toUpperCase()
+            : kind === 'INSTALACION' ? 'INST'
-      .replace(/[^A-Z0-9]+/g, '-')
+              : 'SUB';
-      .replace(/^-+|-+$/g, '')
+    const readable = name.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toUpperCase()
-      .slice(0, 48) || 'REGISTRO';
+      .replace(/[^A-Z0-9]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 48) || 'REGISTRO';
     return `${prefix}-${readable}-${randomUUID().slice(0, 8).toUpperCase()}`.slice(0, 120);
   }
 
@@ -356,6 +399,7 @@ export class InventoryStructureService {
         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 area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',area.id,'code',area.code,'name',area.name) END AS "operationalArea",
         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
@@ -364,6 +408,7 @@ export class InventoryStructureService {
       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 assets area ON area.id=asset.operational_area_id
       LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
       WHERE asset.id=$1::uuid
     `, [id]);

api-v3/src/asset-master/inventory-technical-values.controller.ts

@@ -0,0 +1,28 @@
+import { Body, Controller, Get, Param, ParseUUIDPipe, Put, Req } from '@nestjs/common';
+import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { UpdateInventoryTechnicalValuesDto } from './dto/update-inventory-technical-values.dto';
+import { InventoryTechnicalValuesService } from './inventory-technical-values.service';
+
+@Controller('assets/:assetId/technical-values')
+export class InventoryTechnicalValuesController {
+  constructor(private readonly technical:InventoryTechnicalValuesService) {}
+
+  @Get()
+  @RequirePermissions('assets.read')
+  get(@Param('assetId',new ParseUUIDPipe({version:'4'})) assetId:string) {
+    return this.technical.get(assetId);
+  }
+
+  @Put()
+  @RequirePermissions('assets.update')
+  replace(
+    @Param('assetId',new ParseUUIDPipe({version:'4'})) assetId:string,
+    @Body() dto:UpdateInventoryTechnicalValuesDto,
+    @CurrentAuth() principal:AuthPrincipal,
+    @Req() request:RequestWithContext,
+  ) {
+    return this.technical.replace(assetId,dto,principal,request);
+  }
+}

api-v3/src/asset-master/inventory-technical-values.service.ts

@@ -0,0 +1,118 @@
+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 { AuditAction } from '../database/entities';
+import type { UpdateInventoryTechnicalValuesDto } from './dto/update-inventory-technical-values.dto';
+
+type DefinitionRow = {
+  id:string; code:string; name:string; dataType:'TEXT'|'NUMBER'|'BOOLEAN'|'DATE'|'DATETIME'|'SELECT';
+  isRequired:boolean; isActive:boolean; unit:string|null; options:string[]|null; sortOrder:number;
+};
+type AssetRow = { id:string; inventoryFamilyId:string|null; familyCode:string|null; familyName:string|null; familyLevel:string|null };
+
+@Injectable()
+export class InventoryTechnicalValuesService {
+  constructor(private readonly dataSource:DataSource,private readonly audit:AuditService) {}
+
+  async get(assetId:string) {
+    return this.load(this.dataSource.manager,assetId);
+  }
+
+  async replace(assetId:string,dto:UpdateInventoryTechnicalValuesDto,principal:AuthPrincipal,request:RequestWithContext) {
+    return this.dataSource.transaction(async(manager) => {
+      const before=await this.load(manager,assetId,true);
+      const definitions=before.definitions as DefinitionRow[];
+      const definitionById=new Map(definitions.map((definition)=>[definition.id,definition]));
+      const normalized:Record<string,unknown>={};
+      for (const [definitionId,raw] of Object.entries(dto.values)) {
+        const definition=definitionById.get(definitionId);
+        if (!definition || !definition.isActive) throw new BadRequestException({
+          code:'INVENTORY_TECHNICAL_FIELD_INVALID',message:'Uno o más campos técnicos no pertenecen a la clasificación actual',
+        });
+        const value=this.normalize(definition,raw);
+        if (value!==undefined) normalized[definitionId]=value;
+      }
+      for (const definition of definitions.filter((item)=>item.isActive && item.isRequired)) {
+        if (!(definition.id in normalized)) throw new BadRequestException({
+          code:'INVENTORY_TECHNICAL_FIELD_REQUIRED',message:`Completá el campo técnico obligatorio: ${definition.name}`,
+        });
+      }
+      await manager.query('DELETE FROM asset_inventory_attribute_values WHERE asset_id=$1::uuid',[assetId]);
+      const entries=Object.entries(normalized);
+      if (entries.length) await manager.query(`
+        INSERT INTO asset_inventory_attribute_values(asset_id,definition_id,value,updated_by)
+        SELECT $1::uuid,item.definition_id,item.value,$3::uuid
+        FROM JSONB_TO_RECORDSET($2::jsonb) AS item(definition_id uuid,value jsonb)
+      `,[assetId,JSON.stringify(entries.map(([definition_id,value])=>({definition_id,value}))),principal.userId]);
+      const after=await this.load(manager,assetId);
+      await this.audit.record({
+        ...administrationAuditContext(principal,request),action:AuditAction.ASSET_UPDATED,
+        entityType:'asset_inventory_technical_values',entityId:assetId,
+        beforeData:{values:before.values},afterData:{values:after.values},
+        metadata:{operation:'INVENTORY_TECHNICAL_VALUES_REPLACED',inventoryFamilyId:after.family.id},
+      },manager);
+      return after;
+    });
+  }
+
+  private async load(manager:EntityManager,assetId:string,lock=false) {
+    const rows=(await manager.query(`
+      SELECT asset.id,asset.inventory_family_id AS "inventoryFamilyId",
+        family.code AS "familyCode",family.name AS "familyName",family.level::text AS "familyLevel"
+      FROM assets asset LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
+      WHERE asset.id=$1::uuid ${lock ? 'FOR UPDATE OF asset' : ''}
+    `,[assetId])) as AssetRow[];
+    const asset=rows[0];
+    if (!asset) throw new NotFoundException({code:'ASSET_NOT_FOUND',message:'El registro de Inventario no existe'});
+    if (!asset.inventoryFamilyId || !asset.familyCode || !asset.familyName || !asset.familyLevel) throw new BadRequestException({
+      code:'INVENTORY_TECHNICAL_FAMILY_REQUIRED',message:'Este nivel no tiene clasificación técnica y no admite campos técnicos por rubro',
+    });
+    const definitions=(await manager.query(`
+      SELECT id,code,name,data_type AS "dataType",is_required AS "isRequired",is_active AS "isActive",
+        unit,options,sort_order AS "sortOrder"
+      FROM inventory_family_attribute_definitions
+      WHERE inventory_family_id=$1::uuid
+      ORDER BY is_active DESC,sort_order,name,code
+    `,[asset.inventoryFamilyId])) as DefinitionRow[];
+    const valueRows=await manager.query(`
+      SELECT definition_id AS id,value FROM asset_inventory_attribute_values WHERE asset_id=$1::uuid
+    `,[assetId]) as Array<{id:string;value:unknown}>;
+    return {
+      assetId,
+      family:{id:asset.inventoryFamilyId,code:asset.familyCode,name:asset.familyName,level:asset.familyLevel},
+      definitions,
+      values:Object.fromEntries(valueRows.map((row)=>[row.id,row.value])),
+    };
+  }
+
+  private normalize(definition:DefinitionRow,raw:unknown):unknown|undefined {
+    if (raw===null || raw===undefined || raw==='') return undefined;
+    switch(definition.dataType) {
+      case 'TEXT': {
+        if (typeof raw!=='string') return this.invalid(definition);
+        const value=raw.trim(); if (!value) return undefined; if (value.length>4000) return this.invalid(definition); return value;
+      }
+      case 'NUMBER': {
+        const value=typeof raw==='number' ? raw : typeof raw==='string' ? Number(raw) : Number.NaN;
+        if (!Number.isFinite(value)) return this.invalid(definition); return value;
+      }
+      case 'BOOLEAN': if (typeof raw!=='boolean') return this.invalid(definition); return raw;
+      case 'DATE': {
+        if (typeof raw!=='string' || !/^\d{4}-\d{2}-\d{2}$/.test(raw) || Number.isNaN(Date.parse(`${raw}T00:00:00Z`))) return this.invalid(definition);
+        return raw;
+      }
+      case 'DATETIME': {
+        if (typeof raw!=='string' || Number.isNaN(Date.parse(raw))) return this.invalid(definition); return new Date(raw).toISOString();
+      }
+      case 'SELECT': {
+        if (typeof raw!=='string' || !definition.options?.includes(raw)) return this.invalid(definition); return raw;
+      }
+    }
+  }
+
+  private invalid(definition:DefinitionRow):never {
+    throw new BadRequestException({code:'INVENTORY_TECHNICAL_VALUE_INVALID',message:`Valor inválido para ${definition.name}`});
+  }
+}

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

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { AssetsService } from './assets.service';
+import { InventoryFunctionService } from './inventory-function.service';
 import { InventoryMergeService } from './inventory-merge.service';
 
 type LooseRecord = Record<string, any>;
@@ -29,6 +30,7 @@ export class MergedInventoryDossierService {
   constructor(
     private readonly assets: AssetsService,
     private readonly merges: InventoryMergeService,
+    private readonly functions: InventoryFunctionService,
   ) {}
 
   async dossier(requestedAssetId: string): Promise<Record<string, unknown>> {
@@ -44,7 +46,8 @@ export class MergedInventoryDossierService {
     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 functionDossier = await this.functions.getForAsset(assetId).catch(() => null) as LooseRecord | null;
+      return { assetId, identity, dossier, functionDossier };
     }));
 
     const enrich = (entry: LooseRecord, identity: LooseRecord): LooseRecord => ({
@@ -75,6 +78,15 @@ export class MergedInventoryDossierService {
     const media = sortDesc(collect('media'), ['capturedAt', 'createdAt']);
     const versions = sortDesc(collect('versions'), ['occurredAt']);
 
+    const functionHistory = sortDesc(
+      dossiers.flatMap(({ identity, functionDossier }) =>
+        (((functionDossier?.history ?? []) as LooseRecord[]).map((entry) => enrich(entry, identity))),
+      ),
+      ['validFrom', 'createdAt'],
+    );
+    const canonicalFunctionDossier = dossiers.find((item) => item.assetId === canonical.id)?.functionDossier ?? null;
+    const currentFunction = canonicalFunctionDossier?.currentFunction ?? null;
+
     const timelineSource: LooseRecord[] = dossiers.flatMap(({ identity, dossier }) =>
       ((dossier.timeline ?? []) as LooseRecord[]).map((event): LooseRecord => ({
         ...event,
@@ -91,6 +103,25 @@ export class MergedInventoryDossierService {
     );
     const timeline: LooseRecord[] = dedupeById<LooseRecord>(timelineSource);
 
+    for (const assignment of functionHistory) {
+      timeline.push({
+        id: `function:${String(assignment.id)}`,
+        kind: 'FUNCTION_CHANGED',
+        occurredAt: assignment.validFrom,
+        title: `Cambio de función · ${String(assignment.functionName)}`,
+        description: assignment.reason ?? null,
+        meta: {
+          functionId: assignment.functionId,
+          functionCode: assignment.functionCode,
+          functionName: assignment.functionName,
+          validFrom: assignment.validFrom,
+          validUntil: assignment.validUntil,
+          changedByUsername: assignment.changedByUsername,
+          historicalInventory: assignment.historicalInventory,
+        },
+      });
+    }
+
     for (const alias of aliases) {
       timeline.push({
         id: `merge:${String(alias.id)}:${String(alias.mergedAt)}`,
@@ -121,6 +152,7 @@ export class MergedInventoryDossierService {
         code: canonical.code,
         name: canonical.name,
         commonName: dossiers.find((item) => item.assetId === canonical.id)?.identity?.commonName ?? null,
+        currentFunction,
       },
       requestedAsset: {
         id: requested.id,
@@ -146,7 +178,10 @@ export class MergedInventoryDossierService {
         documents: documents.length + media.filter((item) => item.kind === 'DOCUMENT').length,
         photos: evidence.filter((item) => item.kind === 'PHOTO').length + media.filter((item) => item.kind === 'PHOTO').length,
         reports: reports.length + inspectionReports.length,
+        functionChanges: functionHistory.length,
       },
+      currentFunction,
+      functionHistory,
       visits,
       acts,
       findings,

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { DataSource } from 'typeorm';
 
-export interface DashboardAuditItem {
+export interface DashboardInspectorActivityItem {
   id: string;
   occurredAt: Date;
   actorUsername: string | null;
@@ -19,12 +19,13 @@ interface DashboardCountsRow {
   inactiveUsers: number | string;
   activeSessions: number | string;
   openFindings: number | string;
-  awaitingCompanyResponse: number | string;
+  actsInFollowUp: number | string;
-  overdueCompanyResponses: number | string;
+  findingsWithoutControlDate: number | string;
-  companyResponsesDueNext7Days: number | string;
-  awaitingVerificationSchedule: number | string;
   overdueControls: number | string;
   controlsNext30Days: number | string;
+  reportsWorking: number | string;
+  reportsOfficialized: number | string;
+  sealedActsWithoutReport: number | string;
 }
 
 export interface DashboardUpcomingControl {
@@ -49,9 +50,14 @@ export class DashboardService {
     return this.dataSource.transaction('REPEATABLE READ', async (manager) => {
       const [counts] = (await manager.query(`
         SELECT
-          (SELECT COUNT(*) FROM assets WHERE information_status <> 'INACTIVE') AS "totalAssets",
+          (SELECT COUNT(*) FROM assets WHERE is_inventory_instance=true AND information_status <> 'INACTIVE') AS "totalAssets",
-          (SELECT COUNT(*) FROM assets WHERE information_status NOT IN ('VALIDATED','INACTIVE')) AS "assetsNeedValidation",
+          (SELECT COUNT(*) FROM assets WHERE is_inventory_instance=true AND information_status NOT IN ('VALIDATED','INACTIVE')) AS "assetsNeedValidation",
-          (SELECT COUNT(*) FROM assets asset WHERE asset.information_status <> 'INACTIVE' AND NOT EXISTS (SELECT 1 FROM asset_geometries geometry WHERE geometry.asset_id=asset.id)) AS "assetsWithoutGeometry",
+          (
+            SELECT COUNT(*) FROM assets asset
+            WHERE asset.is_inventory_instance=true
+              AND asset.information_status <> 'INACTIVE'
+              AND NOT EXISTS (SELECT 1 FROM asset_geometries geometry WHERE geometry.asset_id=asset.id)
+          ) AS "assetsWithoutGeometry",
           (SELECT COUNT(*) FROM inspection_visits WHERE status='PLANNED') AS "plannedInspections",
           (SELECT COUNT(*) FROM users WHERE status = 'ACTIVE') AS "activeUsers",
           (SELECT COUNT(*) FROM users WHERE status = 'INACTIVE') AS "inactiveUsers",
@@ -61,50 +67,74 @@ export class DashboardService {
             WHERE revoked_at IS NULL
               AND expires_at > CURRENT_TIMESTAMP
           ) AS "activeSessions",
+          (SELECT COUNT(*) FROM inspection_findings WHERE status = 'OPEN') AS "openFindings",
           (
-            SELECT COUNT(*) FROM inspection_findings WHERE status = 'OPEN'
+            SELECT COUNT(*)
-          ) AS "openFindings",
+            FROM inspection_acts act
+            WHERE act.status IN ('SEALED','CLOSED','RECTIFIED')
+              AND NOT (
+                EXISTS (
+                  SELECT 1 FROM inspection_findings finding
+                  WHERE finding.act_id=act.id AND finding.status<>'VOIDED'
+                )
+                AND NOT EXISTS (
+                  SELECT 1 FROM inspection_findings finding
+                  WHERE finding.act_id=act.id AND finding.status='OPEN'
+                )
+              )
+          ) AS "actsInFollowUp",
           (
-            SELECT COUNT(*) FROM inspection_findings
+            SELECT COUNT(*)
-            WHERE status = 'OPEN' AND company_response_received_on IS NULL
+            FROM inspection_findings finding
-          ) AS "awaitingCompanyResponse",
+            WHERE finding.status = 'OPEN'
+              AND finding.next_control_on IS NULL
+              AND COALESCE((
+                SELECT verification.outcome
+                FROM inspection_finding_verification_visits verification
+                WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
+                ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
+                LIMIT 1
+              ), '') <> 'RESOLVED'
+          ) AS "findingsWithoutControlDate",
           (
-            SELECT COUNT(*) FROM inspection_findings
+            SELECT COUNT(*)
-            WHERE status = 'OPEN'
+            FROM inspection_findings finding
-              AND company_response_received_on IS NULL
+            WHERE finding.status = 'OPEN'
-              AND correction_due_on IS NOT NULL
+              AND finding.next_control_on < (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
-              AND correction_due_on < (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
+              AND COALESCE((
-          ) AS "overdueCompanyResponses",
+                SELECT verification.outcome
-          (
+                FROM inspection_finding_verification_visits verification
-            SELECT COUNT(*) FROM inspection_findings
+                WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
-            WHERE status = 'OPEN'
+                ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
-              AND company_response_received_on IS NULL
+                LIMIT 1
-              AND correction_due_on BETWEEN
+              ), '') <> 'RESOLVED'
-                (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
-                AND (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date + 7
-          ) AS "companyResponsesDueNext7Days",
-          (
-            SELECT COUNT(*) FROM inspection_findings
-            WHERE status = 'OPEN'
-              AND company_response_received_on IS NOT NULL
-              AND next_control_on IS NULL
-          ) AS "awaitingVerificationSchedule",
-          (
-            SELECT COUNT(*) FROM inspection_findings
-            WHERE status = 'OPEN'
-              AND company_response_received_on IS NOT NULL
-              AND next_control_on < (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
           ) AS "overdueControls",
           (
-            SELECT COUNT(*) FROM inspection_findings
+            SELECT COUNT(*)
-            WHERE status = 'OPEN'
+            FROM inspection_findings finding
-              AND next_control_on BETWEEN
+            WHERE finding.status = 'OPEN'
+              AND finding.next_control_on BETWEEN
                 (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
                 AND (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date + 30
-          ) AS "controlsNext30Days"
+              AND COALESCE((
+                SELECT verification.outcome
+                FROM inspection_finding_verification_visits verification
+                WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
+                ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
+                LIMIT 1
+              ), '') <> 'RESOLVED'
+          ) AS "controlsNext30Days",
+          (SELECT COUNT(*) FROM inspection_reports WHERE status='WORKING') AS "reportsWorking",
+          (SELECT COUNT(*) FROM inspection_reports WHERE status='OFFICIALIZED') AS "reportsOfficialized",
+          (
+            SELECT COUNT(*)
+            FROM inspection_acts act
+            WHERE act.status='SEALED'
+              AND NOT EXISTS (SELECT 1 FROM inspection_reports report WHERE report.act_id=act.id)
+          ) AS "sealedActsWithoutReport"
       `)) as DashboardCountsRow[];
 
-      const recentAudit = (await manager.query(`
+      const recentInspectorActivity = (await manager.query(`
         SELECT
           event.id,
           event.occurred_at AS "occurredAt",
@@ -113,9 +143,25 @@ export class DashboardService {
           event.entity_type AS "entityType",
           event.entity_id AS "entityId"
         FROM audit_events event
+        WHERE event.actor_user_id IS NOT NULL
+          AND (
+            EXISTS (
+              SELECT 1 FROM inspection_visit_members member
+              WHERE member.user_id=event.actor_user_id AND member.included=true
+            )
+            OR EXISTS (
+              SELECT 1 FROM inspection_visits visit
+              WHERE visit.lead_inspector_user_id=event.actor_user_id
+            )
+          )
+          AND (
+            event.action LIKE 'INSPECTION_%'
+            OR event.action LIKE 'ASSET_%'
+            OR event.action LIKE 'FINDING_%'
+          )
         ORDER BY event.occurred_at DESC, event.id DESC
-        LIMIT 6
+        LIMIT 8
-      `)) as DashboardAuditItem[];
+      `)) as DashboardInspectorActivityItem[];
 
       const upcomingControls = (await manager.query(`
         SELECT
@@ -135,8 +181,14 @@ export class DashboardService {
         INNER JOIN inspection_visits visit ON visit.id = act.visit_id
         INNER JOIN assets asset ON asset.id = finding.asset_id
         WHERE finding.status = 'OPEN'
-          AND finding.company_response_received_on IS NOT NULL
           AND finding.next_control_on IS NOT NULL
+          AND COALESCE((
+            SELECT verification.outcome
+            FROM inspection_finding_verification_visits verification
+            WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
+            ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
+            LIMIT 1
+          ), '') <> 'RESOLVED'
         ORDER BY finding.next_control_on, finding.code
         LIMIT 8
       `)) as DashboardUpcomingControl[];
@@ -151,14 +203,15 @@ export class DashboardService {
           inactiveUsers: Number(counts?.inactiveUsers ?? 0),
           activeSessions: Number(counts?.activeSessions ?? 0),
           openFindings: Number(counts?.openFindings ?? 0),
-          awaitingCompanyResponse: Number(counts?.awaitingCompanyResponse ?? 0),
+          actsInFollowUp: Number(counts?.actsInFollowUp ?? 0),
-          overdueCompanyResponses: Number(counts?.overdueCompanyResponses ?? 0),
+          findingsWithoutControlDate: Number(counts?.findingsWithoutControlDate ?? 0),
-          companyResponsesDueNext7Days: Number(counts?.companyResponsesDueNext7Days ?? 0),
-          awaitingVerificationSchedule: Number(counts?.awaitingVerificationSchedule ?? 0),
           overdueControls: Number(counts?.overdueControls ?? 0),
           controlsNext30Days: Number(counts?.controlsNext30Days ?? 0),
+          reportsWorking: Number(counts?.reportsWorking ?? 0),
+          reportsOfficialized: Number(counts?.reportsOfficialized ?? 0),
+          sealedActsWithoutReport: Number(counts?.sealedActsWithoutReport ?? 0),
         },
-        recentAudit,
+        recentInspectorActivity,
         upcomingControls,
         generatedAt: new Date().toISOString(),
       };

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

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

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

@@ -57,6 +57,9 @@ export class Asset extends TimestampedEntity {
   @Column({ name: 'inventory_family_id', type: 'uuid', nullable: true })
   inventoryFamilyId!: string | null;
 
+  @Column({ name: 'is_inventory_instance', type: 'boolean', default: false })
+  isInventoryInstance!: boolean;
+
   @Column({ type: 'varchar', length: 120 })
   code!: string;
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

api-v3/src/database/migrations/1790087100000-f5-inventory-physical-instance.ts

@@ -0,0 +1,52 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class F5InventoryPhysicalInstance1790087100000 implements MigrationInterface {
+  name = 'F5InventoryPhysicalInstance1790087100000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE assets
+      ADD COLUMN is_inventory_instance boolean NOT NULL DEFAULT false
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_assets_inventory_instance_active
+      ON assets (is_inventory_instance, information_status)
+      WHERE is_inventory_instance = true
+    `);
+    await queryRunner.query(`
+      COMMENT ON COLUMN assets.is_inventory_instance IS
+      'True only for a concrete Instalacion/Subinstalacion instance. Empresa, Area and Yacimiento are structural/context masters.'
+    `);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION classify_new_asset_inventory_instance()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      DECLARE
+        type_code varchar;
+      BEGIN
+        SELECT lower(code)
+        INTO type_code
+        FROM asset_types
+        WHERE id = NEW.asset_type_id;
+
+        NEW.is_inventory_instance := COALESCE(type_code, '') IN ('instalacion', 'subinstalacion');
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_assets_classify_inventory_instance
+      BEFORE INSERT OR UPDATE OF asset_type_id ON assets
+      FOR EACH ROW EXECUTE FUNCTION classify_new_asset_inventory_instance()
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_assets_classify_inventory_instance ON assets');
+    await queryRunner.query('DROP FUNCTION IF EXISTS classify_new_asset_inventory_instance()');
+    await queryRunner.query('DROP INDEX IF EXISTS idx_assets_inventory_instance_active');
+    await queryRunner.query('ALTER TABLE assets DROP COLUMN IF EXISTS is_inventory_instance');
+  }
+}

api-v3/src/database/migrations/1790087150000-f5-canonical-inventory-hierarchy.ts

@@ -0,0 +1,192 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+type TypeRow = {
+  id: string;
+  code: string;
+  role: string;
+  active: boolean;
+  canBeRoot: boolean;
+};
+
+type RuleRow = {
+  childTypeId: string;
+  parentTypeId: string;
+};
+
+type CountRow = { total: number };
+
+const CREATED_TYPES_TABLE = 'f5_canonical_hierarchy_created_types';
+const CREATED_RULES_TABLE = 'f5_canonical_hierarchy_created_rules';
+
+const CANONICAL_TYPES = [
+  {
+    code: 'yacimiento',
+    name: 'Yacimiento',
+    description: 'Yacimiento perteneciente a un Área.',
+  },
+  {
+    code: 'instalacion',
+    name: 'Instalación',
+    description: 'Instancia física de una Instalación dentro de un Yacimiento.',
+  },
+  {
+    code: 'subinstalacion',
+    name: 'Subinstalación',
+    description: 'Instancia física subordinada a una Instalación.',
+  },
+] as const;
+
+const CANONICAL_RULES = [
+  ['yacimiento', 'area'],
+  ['instalacion', 'yacimiento'],
+  ['subinstalacion', 'instalacion'],
+] as const;
+
+export class F5CanonicalInventoryHierarchy1790087150000 implements MigrationInterface {
+  name = 'F5CanonicalInventoryHierarchy1790087150000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE ${CREATED_TYPES_TABLE} (
+        type_id uuid PRIMARY KEY,
+        code varchar(80) NOT NULL UNIQUE,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT fk_f5_canonical_created_type FOREIGN KEY (type_id)
+          REFERENCES asset_types(id) ON DELETE CASCADE
+      )
+    `);
+    await queryRunner.query(`
+      CREATE TABLE ${CREATED_RULES_TABLE} (
+        child_type_id uuid NOT NULL,
+        parent_type_id uuid NOT NULL,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        PRIMARY KEY (child_type_id,parent_type_id),
+        CONSTRAINT fk_f5_canonical_created_rule_child FOREIGN KEY (child_type_id)
+          REFERENCES asset_types(id) ON DELETE CASCADE,
+        CONSTRAINT fk_f5_canonical_created_rule_parent FOREIGN KEY (parent_type_id)
+          REFERENCES asset_types(id) ON DELETE CASCADE
+      )
+    `);
+
+    const area = await this.requireType(queryRunner, 'area');
+    if (area.role !== 'AREA' || !area.active || !area.canBeRoot) {
+      throw new Error('F5 requires canonical active root type area with AREA operational role');
+    }
+
+    for (const definition of CANONICAL_TYPES) {
+      const inserted = (await queryRunner.query(`
+        INSERT INTO asset_types(code,name,description,can_be_root,is_active,operational_role)
+        SELECT $1::varchar,$2::varchar,$3::text,false,true,'GENERIC'
+        WHERE NOT EXISTS (
+          SELECT 1 FROM asset_types WHERE lower(code)=lower($1::varchar)
+        )
+        RETURNING id,code,operational_role AS role,is_active AS active,can_be_root AS "canBeRoot"
+      `, [definition.code, definition.name, definition.description])) as TypeRow[];
+
+      if (inserted[0]?.id) {
+        await queryRunner.query(`
+          INSERT INTO ${CREATED_TYPES_TABLE}(type_id,code)
+          VALUES ($1::uuid,$2::varchar)
+        `, [inserted[0].id, definition.code]);
+      }
+
+      const type = await this.requireType(queryRunner, definition.code);
+      if (type.role !== 'GENERIC' || !type.active || type.canBeRoot) {
+        throw new Error(`F5 incompatible canonical type configuration: ${definition.code}`);
+      }
+    }
+
+    for (const [childCode, parentCode] of CANONICAL_RULES) {
+      const inserted = (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)=lower($1::varchar)
+          AND lower(parent.code)=lower($2::varchar)
+          AND NOT EXISTS (
+            SELECT 1 FROM asset_type_parent_rules existing
+            WHERE existing.child_type_id=child.id AND existing.parent_type_id=parent.id
+          )
+        RETURNING child_type_id AS "childTypeId",parent_type_id AS "parentTypeId"
+      `, [childCode, parentCode])) as RuleRow[];
+
+      if (inserted[0]?.childTypeId && inserted[0]?.parentTypeId) {
+        await queryRunner.query(`
+          INSERT INTO ${CREATED_RULES_TABLE}(child_type_id,parent_type_id)
+          VALUES ($1::uuid,$2::uuid)
+        `, [inserted[0].childTypeId, inserted[0].parentTypeId]);
+      }
+    }
+
+    const [verified] = (await queryRunner.query(`
+      SELECT COUNT(*)::integer AS total
+      FROM asset_type_parent_rules rule
+      JOIN asset_types child ON child.id=rule.child_type_id
+      JOIN asset_types parent ON parent.id=rule.parent_type_id
+      WHERE (lower(child.code)='yacimiento' AND lower(parent.code)='area')
+         OR (lower(child.code)='instalacion' AND lower(parent.code)='yacimiento')
+         OR (lower(child.code)='subinstalacion' AND lower(parent.code)='instalacion')
+    `)) as CountRow[];
+    if (Number(verified?.total ?? 0) !== 3) {
+      throw new Error(`F5 canonical hierarchy verification failed: rules=${Number(verified?.total ?? 0)}`);
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    const [usedCreatedTypes] = (await queryRunner.query(`
+      SELECT COUNT(*)::integer AS total
+      FROM assets asset
+      JOIN ${CREATED_TYPES_TABLE} owned ON owned.type_id=asset.asset_type_id
+    `)) as CountRow[];
+    if (Number(usedCreatedTypes?.total ?? 0) !== 0) {
+      throw new Error('Cannot safely rollback F5 canonical hierarchy: an F5-created type is already used by Inventory');
+    }
+
+    const [foreignRules] = (await queryRunner.query(`
+      SELECT COUNT(*)::integer AS total
+      FROM asset_type_parent_rules rule
+      WHERE (
+        rule.child_type_id IN (SELECT type_id FROM ${CREATED_TYPES_TABLE})
+        OR rule.parent_type_id IN (SELECT type_id FROM ${CREATED_TYPES_TABLE})
+      )
+      AND NOT EXISTS (
+        SELECT 1 FROM ${CREATED_RULES_TABLE} owned
+        WHERE owned.child_type_id=rule.child_type_id
+          AND owned.parent_type_id=rule.parent_type_id
+      )
+    `)) as CountRow[];
+    if (Number(foreignRules?.total ?? 0) !== 0) {
+      throw new Error('Cannot safely rollback F5 canonical hierarchy: an F5-created type gained external parent rules');
+    }
+
+    await queryRunner.query(`
+      DELETE FROM asset_type_parent_rules rule
+      USING ${CREATED_RULES_TABLE} owned
+      WHERE rule.child_type_id=owned.child_type_id
+        AND rule.parent_type_id=owned.parent_type_id
+    `);
+
+    await queryRunner.query(`
+      DELETE FROM asset_types type
+      USING ${CREATED_TYPES_TABLE} owned
+      WHERE type.id=owned.type_id
+    `);
+
+    await queryRunner.query(`DROP TABLE ${CREATED_RULES_TABLE}`);
+    await queryRunner.query(`DROP TABLE ${CREATED_TYPES_TABLE}`);
+  }
+
+  private async requireType(queryRunner: QueryRunner, code: string): Promise<TypeRow> {
+    const rows = (await queryRunner.query(`
+      SELECT id,code,operational_role AS role,is_active AS active,can_be_root AS "canBeRoot"
+      FROM asset_types
+      WHERE lower(code)=lower($1::varchar)
+      ORDER BY created_at
+    `, [code])) as TypeRow[];
+
+    if (rows.length !== 1) {
+      throw new Error(`F5 requires exactly one canonical asset type ${code}; found ${rows.length}`);
+    }
+    return rows[0];
+  }
+}

api-v3/src/database/migrations/1790087200000-f5-authoritative-territory.ts

@@ -0,0 +1,602 @@
+import { createHash } from 'node:crypto';
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { loadF5InventoryAuthoritativeSource } from '../../reference-data/f5-authoritative-inventory-source';
+
+type IdRow = { id: string };
+type CountRow = { total: number };
+
+const TERRITORY_DOCUMENT_NUMBER = 'DH-F5-TERRITORY';
+const TERRITORY_SOURCE_NAME = 'Tablas de yacimiento y areas.xlsx';
+const BACKUP_TABLE = 'f5_territory_relation_backups';
+
+function key(value: string): string {
+  return value.normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, ' ')
+    .trim()
+    .replace(/\s+/g, ' ');
+}
+
+function code(prefix: string, value: string, length = 12): string {
+  return `${prefix}-${createHash('sha1').update(value).digest('hex').slice(0, length).toUpperCase()}`;
+}
+
+function uniqueBy<T>(values: T[], identity: (value: T) => string): T[] {
+  const seen = new Set<string>();
+  const output: T[] = [];
+  for (const value of values) {
+    const id = identity(value);
+    if (seen.has(id)) continue;
+    seen.add(id);
+    output.push(value);
+  }
+  return output;
+}
+
+export class F5AuthoritativeTerritory1790087200000 implements MigrationInterface {
+  name = 'F5AuthoritativeTerritory1790087200000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const source = loadF5InventoryAuthoritativeSource();
+    if (
+      source.areaSource.file !== TERRITORY_SOURCE_NAME
+      || source.areaSource.sheet !== 'cr26e_tabla1'
+      || source.areaSource.sha256 !== '8260fcadebbcd631a4c95260d0a67c3ecb28d497b32decb02a1c0847be5afa78'
+      || source.areaSource.rows.length !== 230
+    ) {
+      throw new Error('F5 territory source contract mismatch');
+    }
+
+    const rows = source.areaSource.rows;
+    const areaRows = uniqueBy(rows, (row) => key(row.area));
+    const pairRows = uniqueBy(rows, (row) => `${key(row.area)}|${key(row.yacimiento)}`);
+    if (areaRows.length !== 64 || pairRows.length !== 230) {
+      throw new Error(`F5 territory cardinality mismatch: areas=${areaRows.length}, pairs=${pairRows.length}`);
+    }
+
+    // Every Area must have one unambiguous source context. The workbook is the
+    // only authority for this preload; conflicting rows must abort the migration.
+    for (const areaRow of areaRows) {
+      const sameArea = rows.filter((row) => key(row.area)===key(areaRow.area));
+      const dimensions = [
+        new Set(sameArea.map((row) => key(row.departamento))),
+        new Set(sameArea.map((row) => key(row.tipoConcesion))),
+        new Set(sameArea.map((row) => key(row.empresaOperadora))),
+      ];
+      if (dimensions.some((values) => values.size !== 1)) {
+        throw new Error(`F5 territory source has conflicting Area context: ${areaRow.area}`);
+      }
+    }
+
+    await this.assertCanonicalTypesAndRules(queryRunner);
+    await this.installHierarchyGuard(queryRunner);
+    await this.ensureBackupTable(queryRunner);
+
+    const preExistingDocument = await this.optionalId(
+      queryRunner,
+      `SELECT id FROM source_documents WHERE document_number=$1 AND issuer='Dirección de Hidrocarburos' LIMIT 1`,
+      [TERRITORY_DOCUMENT_NUMBER],
+    );
+    if (preExistingDocument) {
+      throw new Error('F5 territory source document already exists before migration');
+    }
+
+    const insertedDocument = (await queryRunner.query(`
+      INSERT INTO source_documents (
+        document_type, document_number, title, issuer, external_reference, notes
+      ) VALUES ('SPREADSHEET',$1,$2,'Dirección de Hidrocarburos',$3,$4)
+      RETURNING id
+    `, [
+      TERRITORY_DOCUMENT_NUMBER,
+      TERRITORY_SOURCE_NAME,
+      `sha256:${source.areaSource.sha256}`,
+      `F5 · fuente territorial autorizada · hoja ${source.areaSource.sheet} · ${rows.length} filas`,
+    ])) as IdRow[];
+    const sourceDocumentId = insertedDocument[0]?.id;
+    if (!sourceDocumentId) throw new Error('F5 could not create territory source document');
+
+    const companyTypeId = await this.id(
+      queryRunner,
+      `SELECT id FROM asset_types WHERE operational_role='COMPANY' AND is_active=true ORDER BY (lower(code)='empresa') DESC,created_at LIMIT 1`,
+      [],
+      'COMPANY asset type',
+    );
+    const areaTypeId = await this.id(
+      queryRunner,
+      `SELECT id FROM asset_types WHERE operational_role='AREA' AND is_active=true ORDER BY (lower(code)='area') DESC,created_at LIMIT 1`,
+      [],
+      'AREA asset type',
+    );
+    const fieldTypeId = await this.id(
+      queryRunner,
+      `SELECT id FROM asset_types WHERE lower(code)='yacimiento' AND is_active=true LIMIT 1`,
+      [],
+      'Yacimiento asset type',
+    );
+
+    const companyNames = [...new Set(rows.map((row) => row.empresaOperadora.trim()))]
+      .filter((name) => name && key(name) !== key('Sin Empresa Operadora'))
+      .sort((a, b) => a.localeCompare(b, 'es'));
+    const companyIds = new Map<string, string>();
+    for (const companyName of companyNames) {
+      const companyId = await this.ensureRootAsset(queryRunner, {
+        typeId: companyTypeId,
+        role: 'COMPANY',
+        code: code('F5-ORG', key(companyName)),
+        name: companyName,
+        sourceDocumentId,
+        sourceReference: `F5:TERRITORY:COMPANY:${code('SRC', key(companyName), 10)}`,
+      });
+      companyIds.set(key(companyName), companyId);
+      await queryRunner.query(`
+        INSERT INTO organization_profiles (asset_id,organization_kind,legal_name)
+        VALUES ($1::uuid,$2::organization_kind,$3)
+        ON CONFLICT (asset_id) DO NOTHING
+      `, [companyId, companyName.trim().toUpperCase().startsWith('UTE (') ? 'UTE' : 'COMPANY', companyName]);
+    }
+
+    const departmentIds = new Map<string, string>();
+    for (const departmentName of [...new Set(rows.map((row) => row.departamento.trim()))].sort((a,b)=>a.localeCompare(b,'es'))) {
+      const normalized = key(departmentName);
+      let departmentId = await this.optionalId(queryRunner, `
+        SELECT id FROM administrative_departments
+        WHERE province_code='MENDOZA' AND normalized_name=$1 AND is_active=true
+        LIMIT 1
+      `, [normalized]);
+      if (!departmentId) {
+        const inserted = (await queryRunner.query(`
+          INSERT INTO administrative_departments (
+            province_code,code,name,normalized_name,is_active,source_document_id
+          ) VALUES ('MENDOZA',$1,$2,$3,true,$4::uuid)
+          RETURNING id
+        `, [code('F5-DEP', normalized, 10), departmentName, normalized, sourceDocumentId])) as IdRow[];
+        departmentId=inserted[0]?.id ?? null;
+      }
+      if (!departmentId) throw new Error(`F5 could not seed department ${departmentName}`);
+      departmentIds.set(normalized, departmentId);
+    }
+
+    const areaIds = new Map<string, string>();
+    for (const areaRow of areaRows) {
+      const areaId = await this.ensureRootAsset(queryRunner, {
+        typeId: areaTypeId,
+        role: 'AREA',
+        code: code('F5-AREA', key(areaRow.area)),
+        name: areaRow.area,
+        sourceDocumentId,
+        sourceReference: `F5:TERRITORY:AREA:${code('SRC', key(areaRow.area), 10)}`,
+      });
+      areaIds.set(key(areaRow.area), areaId);
+
+      const departmentId = departmentIds.get(key(areaRow.departamento));
+      if (!departmentId) throw new Error(`F5 missing department ${areaRow.departamento}`);
+      await this.backupAndCloseDepartmentRelations(queryRunner,areaId,departmentId);
+      await queryRunner.query(`
+        INSERT INTO area_department_relations (
+          area_id,department_id,valid_from,source_document_id,notes
+        )
+        SELECT $1::uuid,$2::uuid,CURRENT_DATE,$3::uuid,$4
+        WHERE NOT EXISTS (
+          SELECT 1 FROM area_department_relations
+          WHERE area_id=$1::uuid AND department_id=$2::uuid AND valid_until IS NULL
+        )
+      `, [
+        areaId,
+        departmentId,
+        sourceDocumentId,
+        `F5 · ${TERRITORY_SOURCE_NAME} · ${source.areaSource.sheet}`,
+      ]);
+
+      const operatorId = companyIds.get(key(areaRow.empresaOperadora)) ?? null;
+      await this.backupAndCloseOperatorRelations(queryRunner,areaId,operatorId);
+      if (operatorId) {
+        await queryRunner.query(`
+          INSERT INTO area_company_relations (
+            area_id,company_id,relation_role,source_document_id,valid_from,start_reason
+          )
+          SELECT $1::uuid,$2::uuid,'OPERATOR',$3::uuid,CURRENT_TIMESTAMP,$4
+          WHERE NOT EXISTS (
+            SELECT 1 FROM area_company_relations
+            WHERE area_id=$1::uuid AND company_id=$2::uuid
+              AND relation_role='OPERATOR' AND valid_until IS NULL
+          )
+        `, [
+          areaId,
+          operatorId,
+          sourceDocumentId,
+          `F5 · operadora vigente según ${TERRITORY_SOURCE_NAME}`,
+        ]);
+      }
+
+      const rightType = areaRow.tipoConcesion === 'Exploración'
+        ? 'EXPLORATION_PERMIT'
+        : areaRow.tipoConcesion === 'Explotación'
+          ? 'EXPLOITATION_CONCESSION'
+          : 'OTHER';
+      const rightName = `${areaRow.tipoConcesion} · ${areaRow.area}`;
+      await queryRunner.query(`
+        INSERT INTO area_legal_rights (
+          area_id,right_type,name,status,source_document_id,notes
+        )
+        SELECT $1::uuid,$2::area_legal_right_type,$3::varchar,'ACTIVE',$4::uuid,$5
+        WHERE NOT EXISTS (
+          SELECT 1 FROM area_legal_rights
+          WHERE area_id=$1::uuid
+            AND right_type=$2::area_legal_right_type
+            AND lower(btrim(name))=lower(btrim($3::varchar))
+            AND status IN ('ACTIVE','PENDING')
+        )
+      `, [
+        areaId,
+        rightType,
+        rightName,
+        sourceDocumentId,
+        `F5 · tipo de concesión tomado literalmente de ${TERRITORY_SOURCE_NAME}`,
+      ]);
+    }
+
+    for (const row of pairRows) {
+      const areaId = areaIds.get(key(row.area));
+      if (!areaId) throw new Error(`F5 missing area ${row.area}`);
+      const sourceReference = `F5:TERRITORY:YAC:${code('SRC', `${key(row.area)}|${key(row.yacimiento)}`, 12)}`;
+      let yacimientoId = await this.optionalId(queryRunner, `
+        SELECT asset.id
+        FROM assets asset
+        JOIN asset_types type ON type.id=asset.asset_type_id
+        WHERE lower(type.code)='yacimiento'
+          AND asset.parent_id=$1::uuid
+          AND asset.information_status<>'INACTIVE'
+          AND lower(btrim(asset.name))=lower(btrim($2))
+        ORDER BY asset.created_at
+        LIMIT 1
+      `, [areaId, row.yacimiento]);
+      if (!yacimientoId) {
+        const inserted = (await queryRunner.query(`
+          INSERT INTO assets (
+            asset_type_id,parent_id,operational_area_id,operator_company_id,
+            code,name,description,information_status,operational_status,
+            data_origin,source_name,source_reference,source_notes,is_inventory_instance
+          ) VALUES (
+            $1::uuid,$2::uuid,NULL,NULL,$3,$4,$5,'VALIDATED','UNKNOWN',
+            'PROVIDED_DOCUMENT',$6,$7,$8,false
+          ) RETURNING id
+        `, [
+          fieldTypeId,
+          areaId,
+          code('F5-YAC', `${key(row.area)}|${key(row.yacimiento)}`),
+          row.yacimiento,
+          `Yacimiento del Área ${row.area}`,
+          TERRITORY_SOURCE_NAME,
+          sourceReference,
+          `${source.areaSource.sheet} · fila ${row.sourceRow}`,
+        ])) as IdRow[];
+        yacimientoId = inserted[0]?.id ?? null;
+      }
+      if (!yacimientoId) throw new Error(`F5 could not seed yacimiento ${row.area} / ${row.yacimiento}`);
+      await this.linkSource(queryRunner, yacimientoId, sourceDocumentId, `Hoja ${source.areaSource.sheet} · fila ${row.sourceRow}`);
+    }
+
+    const [verification] = (await queryRunner.query(`
+      SELECT
+        COUNT(DISTINCT asset.id) FILTER (WHERE type.operational_role='AREA')::integer AS areas,
+        COUNT(DISTINCT asset.id) FILTER (WHERE lower(type.code)='yacimiento')::integer AS yacimientos
+      FROM asset_source_documents link
+      JOIN assets asset ON asset.id=link.asset_id
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      WHERE link.document_id=$1::uuid
+    `, [sourceDocumentId])) as Array<{ areas: number; yacimientos: number }>;
+    if (Number(verification?.areas ?? 0) !== 64 || Number(verification?.yacimientos ?? 0) !== 230) {
+      throw new Error(`F5 territory preload verification failed: ${JSON.stringify(verification ?? {})}`);
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    const sourceDocumentId = await this.optionalId(
+      queryRunner,
+      `SELECT id FROM source_documents WHERE document_number=$1 AND issuer='Dirección de Hidrocarburos' LIMIT 1`,
+      [TERRITORY_DOCUMENT_NUMBER],
+    );
+    if (!sourceDocumentId) {
+      await queryRunner.query('DROP TRIGGER IF EXISTS trg_f5_canonical_asset_hierarchy ON assets');
+      await queryRunner.query('DROP FUNCTION IF EXISTS enforce_f5_canonical_asset_hierarchy()');
+      await queryRunner.query(`DROP TABLE IF EXISTS ${BACKUP_TABLE}`);
+      return;
+    }
+
+    await this.assertRelationBackupsUnchanged(queryRunner);
+    await this.assertCreatedMastersUnused(queryRunner,sourceDocumentId);
+
+    await queryRunner.query(`DELETE FROM area_legal_rights WHERE source_document_id=$1::uuid`,[sourceDocumentId]);
+
+    // Remove relations created by F5 first so restoring the previously-active
+    // relation cannot violate active-relation uniqueness constraints.
+    await queryRunner.query(`DELETE FROM area_company_relations WHERE source_document_id=$1::uuid`,[sourceDocumentId]);
+    await queryRunner.query(`DELETE FROM area_department_relations WHERE source_document_id=$1::uuid`,[sourceDocumentId]);
+    await this.restoreRelationBackups(queryRunner);
+
+    await queryRunner.query(`DELETE FROM asset_source_documents WHERE document_id=$1::uuid`,[sourceDocumentId]);
+    await queryRunner.query(`DELETE FROM assets WHERE source_reference LIKE 'F5:TERRITORY:YAC:%'`);
+    await queryRunner.query(`DELETE FROM organization_profiles profile USING assets asset WHERE profile.asset_id=asset.id AND asset.source_reference LIKE 'F5:TERRITORY:COMPANY:%'`);
+    await queryRunner.query(`DELETE FROM assets WHERE source_reference LIKE 'F5:TERRITORY:COMPANY:%'`);
+    await queryRunner.query(`DELETE FROM assets WHERE source_reference LIKE 'F5:TERRITORY:AREA:%'`);
+    await queryRunner.query(`DELETE FROM administrative_departments WHERE source_document_id=$1::uuid`,[sourceDocumentId]);
+    await queryRunner.query(`DELETE FROM source_documents WHERE id=$1::uuid`,[sourceDocumentId]);
+
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_f5_canonical_asset_hierarchy ON assets');
+    await queryRunner.query('DROP FUNCTION IF EXISTS enforce_f5_canonical_asset_hierarchy()');
+    await queryRunner.query(`DROP TABLE IF EXISTS ${BACKUP_TABLE}`);
+  }
+
+  private async assertCanonicalTypesAndRules(queryRunner: QueryRunner): Promise<void> {
+    const [roles] = (await queryRunner.query(`
+      SELECT
+        COUNT(*) FILTER (WHERE operational_role='AREA' AND is_active=true)::integer AS areas,
+        COUNT(*) FILTER (WHERE operational_role='COMPANY' AND is_active=true)::integer AS companies
+      FROM asset_types
+    `)) as Array<{areas:number; companies:number}>;
+    if (Number(roles?.areas ?? 0)<1 || Number(roles?.companies ?? 0)<1) {
+      throw new Error('F5 requires active AREA and COMPANY master types');
+    }
+
+    for (const [typeCode,typeName,description] of [
+      ['yacimiento','Yacimiento','Yacimiento perteneciente a un Área.'],
+      ['instalacion','Instalación','Instancia física de una Instalación dentro de un Yacimiento.'],
+      ['subinstalacion','Subinstalación','Instancia física subordinada a una Instalación.'],
+    ] as const) {
+      await queryRunner.query(`
+        INSERT INTO asset_types(code,name,description,can_be_root,is_active,operational_role)
+        SELECT $1::varchar,$2,$3,false,true,'GENERIC'
+        WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)=lower($1::varchar))
+      `,[typeCode,typeName,description]);
+      const [type] = (await queryRunner.query(`
+        SELECT operational_role AS role,is_active AS active,can_be_root AS "canBeRoot"
+        FROM asset_types WHERE lower(code)=lower($1) LIMIT 1
+      `,[typeCode])) as Array<{role:string;active:boolean;canBeRoot:boolean}>;
+      if (!type || type.role!=='GENERIC' || !type.active || type.canBeRoot) {
+        throw new Error(`F5 incompatible master type configuration: ${typeCode}`);
+      }
+    }
+
+    const [ruleCount] = (await queryRunner.query(`
+      SELECT COUNT(*)::integer AS total
+      FROM asset_type_parent_rules rule
+      JOIN asset_types child ON child.id=rule.child_type_id
+      JOIN asset_types parent ON parent.id=rule.parent_type_id
+      WHERE (lower(child.code)='yacimiento' AND lower(parent.code)='area')
+         OR (lower(child.code)='instalacion' AND lower(parent.code)='yacimiento')
+         OR (lower(child.code)='subinstalacion' AND lower(parent.code)='instalacion')
+    `)) as CountRow[];
+    if (Number(ruleCount?.total ?? 0)!==3) {
+      throw new Error('F5 requires canonical parent rules Area → Yacimiento → Instalación → Subinstalación');
+    }
+  }
+
+  private async installHierarchyGuard(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION enforce_f5_canonical_asset_hierarchy()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      DECLARE child_code text; parent_code text;
+      BEGIN
+        SELECT lower(code) INTO child_code FROM asset_types WHERE id=NEW.asset_type_id;
+        IF child_code IN ('empresa','organizacion','area') THEN
+          IF NEW.parent_id IS NOT NULL THEN
+            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Empresa y Área son maestros raíz independientes';
+          END IF;
+          RETURN NEW;
+        END IF;
+        IF child_code NOT IN ('yacimiento','instalacion','subinstalacion') THEN RETURN NEW; END IF;
+        IF NEW.parent_id IS NULL THEN
+          RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento, Instalación y Subinstalación requieren padre';
+        END IF;
+        SELECT lower(type.code) INTO parent_code
+        FROM assets parent JOIN asset_types type ON type.id=parent.asset_type_id
+        WHERE parent.id=NEW.parent_id;
+        IF (child_code='yacimiento' AND parent_code<>'area')
+          OR (child_code='instalacion' AND parent_code<>'yacimiento')
+          OR (child_code='subinstalacion' AND parent_code<>'instalacion') THEN
+          RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Jerarquía F5 inválida: Área → Yacimiento → Instalación → Subinstalación';
+        END IF;
+        RETURN NEW;
+      END $$;
+    `);
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_f5_canonical_asset_hierarchy ON assets');
+    await queryRunner.query(`
+      CREATE TRIGGER trg_f5_canonical_asset_hierarchy
+      BEFORE INSERT OR UPDATE OF asset_type_id,parent_id ON assets
+      FOR EACH ROW EXECUTE FUNCTION enforce_f5_canonical_asset_hierarchy()
+    `);
+  }
+
+  private async ensureBackupTable(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE ${BACKUP_TABLE} (
+        relation_kind varchar(32) NOT NULL,
+        relation_id uuid NOT NULL,
+        previous_values jsonb NOT NULL,
+        applied_values jsonb NOT NULL,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        PRIMARY KEY (relation_kind,relation_id),
+        CONSTRAINT chk_f5_territory_backup_kind CHECK (relation_kind IN ('AREA_COMPANY','AREA_DEPARTMENT'))
+      )
+    `);
+  }
+
+  private async backupAndCloseDepartmentRelations(queryRunner: QueryRunner,areaId:string,departmentId:string):Promise<void> {
+    const marker='F5: reemplazada por fuente territorial autorizada';
+    await queryRunner.query(`
+      INSERT INTO ${BACKUP_TABLE}(relation_kind,relation_id,previous_values,applied_values)
+      SELECT 'AREA_DEPARTMENT',relation.id,
+        jsonb_build_object('validUntil',relation.valid_until,'notes',relation.notes),
+        jsonb_build_object('validUntil',CURRENT_DATE,'notes',concat_ws(E'\n',relation.notes,$3::text))
+      FROM area_department_relations relation
+      WHERE relation.area_id=$1::uuid
+        AND relation.valid_until IS NULL
+        AND relation.department_id<>$2::uuid
+      ON CONFLICT DO NOTHING
+    `,[areaId,departmentId,marker]);
+    await queryRunner.query(`
+      UPDATE area_department_relations relation
+      SET valid_until=(backup.applied_values->>'validUntil')::date,
+          notes=backup.applied_values->>'notes',
+          updated_at=CURRENT_TIMESTAMP
+      FROM ${BACKUP_TABLE} backup
+      WHERE backup.relation_kind='AREA_DEPARTMENT'
+        AND backup.relation_id=relation.id
+        AND relation.area_id=$1::uuid
+        AND relation.valid_until IS NULL
+    `,[areaId]);
+  }
+
+  private async backupAndCloseOperatorRelations(queryRunner: QueryRunner,areaId:string,operatorId:string|null):Promise<void> {
+    const marker='F5: reemplazada por fuente territorial autorizada';
+    await queryRunner.query(`
+      INSERT INTO ${BACKUP_TABLE}(relation_kind,relation_id,previous_values,applied_values)
+      SELECT 'AREA_COMPANY',relation.id,
+        jsonb_build_object('validUntil',relation.valid_until,'endReason',relation.end_reason),
+        jsonb_build_object('validUntil',CURRENT_TIMESTAMP,'endReason',$3::text)
+      FROM area_company_relations relation
+      WHERE relation.area_id=$1::uuid
+        AND relation.relation_role='OPERATOR'
+        AND relation.valid_until IS NULL
+        AND ($2::uuid IS NULL OR relation.company_id<>$2::uuid)
+      ON CONFLICT DO NOTHING
+    `,[areaId,operatorId,marker]);
+    await queryRunner.query(`
+      UPDATE area_company_relations relation
+      SET valid_until=(backup.applied_values->>'validUntil')::timestamptz,
+          end_reason=backup.applied_values->>'endReason',
+          updated_at=CURRENT_TIMESTAMP
+      FROM ${BACKUP_TABLE} backup
+      WHERE backup.relation_kind='AREA_COMPANY'
+        AND backup.relation_id=relation.id
+        AND relation.area_id=$1::uuid
+        AND relation.valid_until IS NULL
+    `,[areaId]);
+  }
+
+  private async assertRelationBackupsUnchanged(queryRunner: QueryRunner):Promise<void> {
+    const [changed] = (await queryRunner.query(`
+      SELECT COUNT(*)::integer AS total
+      FROM ${BACKUP_TABLE} backup
+      LEFT JOIN area_company_relations company_relation
+        ON backup.relation_kind='AREA_COMPANY' AND company_relation.id=backup.relation_id
+      LEFT JOIN area_department_relations department_relation
+        ON backup.relation_kind='AREA_DEPARTMENT' AND department_relation.id=backup.relation_id
+      WHERE (
+        backup.relation_kind='AREA_COMPANY'
+        AND (
+          company_relation.id IS NULL
+          OR company_relation.valid_until IS DISTINCT FROM (backup.applied_values->>'validUntil')::timestamptz
+          OR company_relation.end_reason IS DISTINCT FROM backup.applied_values->>'endReason'
+        )
+      ) OR (
+        backup.relation_kind='AREA_DEPARTMENT'
+        AND (
+          department_relation.id IS NULL
+          OR department_relation.valid_until IS DISTINCT FROM (backup.applied_values->>'validUntil')::date
+          OR department_relation.notes IS DISTINCT FROM backup.applied_values->>'notes'
+        )
+      )
+    `)) as CountRow[];
+    if (Number(changed?.total ?? 0)>0) {
+      throw new Error('Cannot safely rollback F5 territory: a relation closed by the preload was modified afterwards');
+    }
+  }
+
+  private async restoreRelationBackups(queryRunner: QueryRunner):Promise<void> {
+    await queryRunner.query(`
+      UPDATE area_company_relations relation
+      SET valid_until=(backup.previous_values->>'validUntil')::timestamptz,
+          end_reason=backup.previous_values->>'endReason',
+          updated_at=CURRENT_TIMESTAMP
+      FROM ${BACKUP_TABLE} backup
+      WHERE backup.relation_kind='AREA_COMPANY' AND backup.relation_id=relation.id
+    `);
+    await queryRunner.query(`
+      UPDATE area_department_relations relation
+      SET valid_until=(backup.previous_values->>'validUntil')::date,
+          notes=backup.previous_values->>'notes',
+          updated_at=CURRENT_TIMESTAMP
+      FROM ${BACKUP_TABLE} backup
+      WHERE backup.relation_kind='AREA_DEPARTMENT' AND backup.relation_id=relation.id
+    `);
+  }
+
+  private async assertCreatedMastersUnused(queryRunner:QueryRunner,sourceDocumentId:string):Promise<void> {
+    const [used] = (await queryRunner.query(`
+      SELECT COUNT(*)::integer AS total
+      FROM assets asset
+      WHERE asset.source_reference LIKE 'F5:TERRITORY:%'
+        AND (
+          EXISTS (SELECT 1 FROM assets child WHERE child.parent_id=asset.id AND child.source_reference NOT LIKE 'F5:TERRITORY:%')
+          OR EXISTS (SELECT 1 FROM inspection_visits visit WHERE visit.operational_area_id=asset.id OR visit.operator_company_id=asset.id)
+          OR EXISTS (SELECT 1 FROM inspection_visit_assets link WHERE link.asset_id=asset.id)
+          OR EXISTS (SELECT 1 FROM inspection_findings finding WHERE finding.asset_id=asset.id)
+        )
+    `)) as CountRow[];
+    if (Number(used?.total ?? 0)>0) {
+      throw new Error('Cannot safely rollback F5 territory: F5-created master data is already used by operational records');
+    }
+    void sourceDocumentId;
+  }
+
+  private async ensureRootAsset(
+    queryRunner: QueryRunner,
+    input: {
+      typeId: string;
+      role: 'AREA' | 'COMPANY';
+      code: string;
+      name: string;
+      sourceDocumentId: string;
+      sourceReference: string;
+    },
+  ): Promise<string> {
+    let assetId = await this.optionalId(queryRunner, `
+      SELECT asset.id
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      WHERE type.operational_role=$1::asset_type_operational_role
+        AND asset.information_status<>'INACTIVE'
+        AND lower(btrim(asset.name))=lower(btrim($2))
+      ORDER BY asset.created_at
+      LIMIT 1
+    `,[input.role,input.name]);
+    if (!assetId) {
+      const inserted = (await queryRunner.query(`
+        INSERT INTO assets (
+          asset_type_id,parent_id,operational_area_id,operator_company_id,
+          code,name,information_status,operational_status,data_origin,
+          source_name,source_reference,source_notes,is_inventory_instance
+        ) VALUES ($1::uuid,NULL,NULL,NULL,$2,$3,'VALIDATED','UNKNOWN','PROVIDED_DOCUMENT',$4,$5,$6,false)
+        RETURNING id
+      `,[
+        input.typeId,input.code,input.name,TERRITORY_SOURCE_NAME,input.sourceReference,
+        'F5 · fuente territorial autorizada',
+      ])) as IdRow[];
+      assetId=inserted[0]?.id ?? null;
+    }
+    if (!assetId) throw new Error(`F5 could not seed ${input.role} ${input.name}`);
+    await this.linkSource(queryRunner,assetId,input.sourceDocumentId,'F5 · fuente territorial autorizada');
+    return assetId;
+  }
+
+  private async linkSource(queryRunner:QueryRunner,assetId:string,documentId:string,notes:string):Promise<void> {
+    await queryRunner.query(`
+      INSERT INTO asset_source_documents(asset_id,document_id,relation_type,notes)
+      VALUES ($1::uuid,$2::uuid,'SOURCE',$3)
+      ON CONFLICT (asset_id,document_id,relation_type) DO UPDATE SET notes=EXCLUDED.notes,updated_at=CURRENT_TIMESTAMP
+    `,[assetId,documentId,notes]);
+  }
+
+  private async id(queryRunner: QueryRunner,sql:string,params:unknown[],label:string):Promise<string> {
+    const value=await this.optionalId(queryRunner,sql,params);
+    if (!value) throw new Error(`F5 could not resolve ${label}`);
+    return value;
+  }
+
+  private async optionalId(queryRunner: QueryRunner,sql:string,params:unknown[]):Promise<string|null> {
+    const result=(await queryRunner.query(sql,params)) as IdRow[];
+    return result[0]?.id ?? null;
+  }
+}

api-v3/src/database/migrations/1790087250000-f5-operational-context-compatibility.ts

@@ -0,0 +1,182 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * F5 makes the physical hierarchy Area-owned. Empresa is never a parent nor a
+ * required property of Yacimiento/Instalación/Subinstalación. The current and
+ * historical operator/concession truth lives in area_company_relations and is
+ * frozen separately by each Inspección/Acta.
+ *
+ * operator_company_id is retained only as a backwards-compatible creation/
+ * historical snapshot. Runtime ownership and search MUST NOT depend on it.
+ */
+export class F5OperationalContextCompatibility1790087250000 implements MigrationInterface {
+  name = 'F5OperationalContextCompatibility1790087250000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await this.installAreaOwnedGuard(queryRunner);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await this.installLegacyPairedGuard(queryRunner);
+  }
+
+  private async installAreaOwnedGuard(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION enforce_asset_operational_context()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      DECLARE
+        asset_role asset_type_operational_role;
+        area_role asset_type_operational_role;
+        company_role asset_type_operational_role;
+        active_relation_id uuid;
+      BEGIN
+        SELECT operational_role INTO asset_role
+        FROM asset_types WHERE id=NEW.asset_type_id;
+
+        IF asset_role <> 'GENERIC'::asset_type_operational_role THEN
+          IF NEW.operational_area_id IS NOT NULL OR NEW.operator_company_id IS NOT NULL THEN
+            RAISE EXCEPTION USING ERRCODE='23514',
+              MESSAGE='Área y Empresa no reciben contexto operativo de Inventario';
+          END IF;
+          RETURN NEW;
+        END IF;
+
+        IF NEW.operator_company_id IS NOT NULL AND NEW.operational_area_id IS NULL THEN
+          RAISE EXCEPTION USING ERRCODE='23514',
+            MESSAGE='Un snapshot de Empresa requiere un Área física';
+        END IF;
+
+        -- Once written, an old/current company snapshot cannot be repointed to
+        -- simulate physical ownership. Company changes happen in the temporal
+        -- Area↔Empresa relation instead.
+        IF TG_OP='UPDATE'
+           AND NEW.operator_company_id IS DISTINCT FROM OLD.operator_company_id THEN
+          RAISE EXCEPTION USING ERRCODE='23514',
+            MESSAGE='La Empresa se cambia en la relación temporal del Área, no en el Inventario';
+        END IF;
+
+        IF NEW.operational_area_id IS NULL THEN
+          RETURN NEW;
+        END IF;
+
+        SELECT type.operational_role INTO area_role
+        FROM assets area
+        JOIN asset_types type ON type.id=area.asset_type_id
+        WHERE area.id=NEW.operational_area_id
+          AND area.information_status<>'INACTIVE'
+          AND type.is_active=true;
+        IF area_role IS DISTINCT FROM 'AREA'::asset_type_operational_role THEN
+          RAISE EXCEPTION USING ERRCODE='23514',
+            MESSAGE='operational area must be an active AREA asset';
+        END IF;
+
+        IF NEW.parent_id IS NULL OR NOT EXISTS (
+          WITH RECURSIVE ancestors AS (
+            SELECT id,parent_id FROM assets WHERE id=NEW.parent_id
+            UNION ALL
+            SELECT parent.id,parent.parent_id
+            FROM assets parent
+            JOIN ancestors child ON parent.id=child.parent_id
+          )
+          SELECT 1 FROM ancestors WHERE id=NEW.operational_area_id LIMIT 1
+        ) THEN
+          RAISE EXCEPTION USING ERRCODE='23514',
+            MESSAGE='operational area must be an ancestor in the physical hierarchy';
+        END IF;
+
+        -- A company value is allowed only as the context snapshot that was valid
+        -- at creation time. It is never used to decide future membership.
+        IF NEW.operator_company_id IS NOT NULL THEN
+          SELECT type.operational_role INTO company_role
+          FROM assets company
+          JOIN asset_types type ON type.id=company.asset_type_id
+          WHERE company.id=NEW.operator_company_id
+            AND company.information_status<>'INACTIVE'
+            AND type.is_active=true;
+          IF company_role IS DISTINCT FROM 'COMPANY'::asset_type_operational_role THEN
+            RAISE EXCEPTION USING ERRCODE='23514',
+              MESSAGE='operator snapshot must reference an active COMPANY-role asset';
+          END IF;
+
+          IF TG_OP='INSERT' THEN
+            SELECT relation.id INTO active_relation_id
+            FROM area_company_relations relation
+            WHERE relation.area_id=NEW.operational_area_id
+              AND relation.company_id=NEW.operator_company_id
+              AND relation.relation_role='OPERATOR'::area_organization_role
+              AND relation.valid_until IS NULL
+            FOR KEY SHARE;
+            IF active_relation_id IS NULL THEN
+              RAISE EXCEPTION USING ERRCODE='23514',
+                MESSAGE='creation operator snapshot must be active for the selected Area';
+            END IF;
+          END IF;
+        END IF;
+
+        RETURN NEW;
+      END $$;
+    `);
+  }
+
+  /** Restores the production F4-era paired Area+Empresa guard on rollback. */
+  private async installLegacyPairedGuard(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION enforce_asset_operational_context()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      DECLARE
+        asset_role asset_type_operational_role;
+        area_role asset_type_operational_role;
+        company_role asset_type_operational_role;
+        active_relation_id uuid;
+      BEGIN
+        IF NEW.operational_area_id IS NULL AND NEW.operator_company_id IS NULL THEN
+          RETURN NEW;
+        END IF;
+        IF NEW.operational_area_id IS NULL OR NEW.operator_company_id IS NULL THEN
+          RAISE EXCEPTION USING ERRCODE='23514',
+            MESSAGE='operational area and organization must be assigned together';
+        END IF;
+
+        SELECT operational_role INTO asset_role FROM asset_types WHERE id=NEW.asset_type_id;
+        IF asset_role <> 'GENERIC'::asset_type_operational_role THEN
+          RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='area and organization assets cannot receive an operational assignment';
+        END IF;
+
+        SELECT type.operational_role INTO area_role
+        FROM assets area JOIN asset_types type ON type.id=area.asset_type_id
+        WHERE area.id=NEW.operational_area_id AND area.information_status<>'INACTIVE' AND type.is_active=true;
+        SELECT type.operational_role INTO company_role
+        FROM assets company JOIN asset_types type ON type.id=company.asset_type_id
+        WHERE company.id=NEW.operator_company_id AND company.information_status<>'INACTIVE' AND type.is_active=true;
+        IF area_role IS DISTINCT FROM 'AREA'::asset_type_operational_role THEN
+          RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='operational area must be an active AREA asset';
+        END IF;
+        IF company_role IS DISTINCT FROM 'COMPANY'::asset_type_operational_role THEN
+          RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='operator organization must be an active COMPANY-role asset';
+        END IF;
+
+        SELECT relation.id INTO active_relation_id
+        FROM area_company_relations relation
+        WHERE relation.area_id=NEW.operational_area_id
+          AND relation.company_id=NEW.operator_company_id
+          AND relation.relation_role='OPERATOR'::area_organization_role
+          AND relation.valid_until IS NULL
+        FOR KEY SHARE;
+        IF active_relation_id IS NULL THEN
+          RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='operational area and organization do not have an active OPERATOR relation';
+        END IF;
+
+        IF NEW.parent_id IS NULL OR NOT EXISTS (
+          WITH RECURSIVE ancestors AS (
+            SELECT id,parent_id FROM assets WHERE id=NEW.parent_id
+            UNION ALL
+            SELECT parent.id,parent.parent_id FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
+          ) SELECT 1 FROM ancestors WHERE id=NEW.operational_area_id LIMIT 1
+        ) THEN
+          RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='operational area must be an ancestor in the physical hierarchy';
+        END IF;
+        RETURN NEW;
+      END $$;
+    `);
+  }
+}

api-v3/src/database/migrations/1790087300000-f5-authoritative-inventory-catalog.ts

@@ -0,0 +1,606 @@
+import { createHash } from 'node:crypto';
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import {
+  loadF5InventoryAuthoritativeSource,
+  type F5InstallationCatalogRow,
+  type F5SubinstallationCatalogRow,
+} from '../../reference-data/f5-authoritative-inventory-source';
+
+type IdRow = { id: string };
+type CountRow = { total: number };
+
+const CATALOG_DOCUMENT_NUMBER = 'DH-F5-INVENTORY-CATALOG';
+const CATALOG_CATEGORY_CODE = 'F5MODEL';
+const CATALOG_SOURCE_NAME = 'final_modelov2.xlsx';
+const F5_AUTO_REASON = 'F5 familia técnica: catálogo contextual automático';
+const F5_SOURCE_FAMILY_COUNT = 123;
+
+function findingKey(value: string): string {
+  return value.normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, ' ')
+    .trim()
+    .replace(/\s+/g, ' ');
+}
+
+function hashCode(prefix: string, value: string, length = 12): string {
+  return `${prefix}-${createHash('sha1').update(value).digest('hex').slice(0, length).toUpperCase()}`;
+}
+
+function installationCode(name: string): string {
+  return hashCode('F5-I', findingKey(name));
+}
+
+function subinstallationCode(installation: string, name: string): string {
+  return hashCode('F5-S', `${findingKey(installation)}|${findingKey(name)}`);
+}
+
+function subOtherCode(parentCode: string): string {
+  return hashCode('F5-S-OTRO', parentCode);
+}
+
+export class F5AuthoritativeInventoryCatalog1790087300000 implements MigrationInterface {
+  name = 'F5AuthoritativeInventoryCatalog1790087300000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const source = loadF5InventoryAuthoritativeSource();
+    if (
+      source.catalogSource.file !== CATALOG_SOURCE_NAME
+      || source.catalogSource.sheet !== 'Hoja1'
+      || source.catalogSource.sha256 !== 'c9a2d1db59fff2157162c41009b8c9042a3c7a3001649239a07732a3b8fca155'
+      || source.catalogSource.installations.length !== 14
+      || source.catalogSource.subinstallations.length !== 109
+    ) {
+      throw new Error('F5 inventory catalog source contract mismatch');
+    }
+
+    if (source.catalogSource.universalFindings.length !== 3) {
+      throw new Error(`F5 universal finding contract mismatch: ${source.catalogSource.universalFindings.length}`);
+    }
+    const universalKeys = new Set(source.catalogSource.universalFindings.map(findingKey));
+    for (const required of [
+      'ORDEN Y LIMPIEZA',
+      'CARTELERIA PREVENTIVA / INFORMATIVA',
+      'EXTINTORES',
+    ]) {
+      if (!universalKeys.has(findingKey(required))) {
+        throw new Error(`F5 missing authoritative universal finding: ${required}`);
+      }
+    }
+
+    await queryRunner.query(`
+      INSERT INTO source_documents (
+        document_type,document_number,title,issuer,external_reference,notes
+      )
+      VALUES ('SPREADSHEET',$1,$2,'Dirección de Hidrocarburos',$3,$4)
+      ON CONFLICT (document_number,issuer) WHERE document_number IS NOT NULL AND issuer IS NOT NULL
+      DO UPDATE SET
+        title=EXCLUDED.title,
+        external_reference=EXCLUDED.external_reference,
+        notes=EXCLUDED.notes,
+        updated_at=CURRENT_TIMESTAMP
+    `, [
+      CATALOG_DOCUMENT_NUMBER,
+      CATALOG_SOURCE_NAME,
+      `sha256:${source.catalogSource.sha256}`,
+      `F5 · catálogo técnico autorizado · hoja ${source.catalogSource.sheet} · 14 Instalaciones · 109 Subinstalaciones`,
+    ]);
+
+    // Only the known historical spreadsheet catalog is superseded. Families
+    // created manually by DH (including source_reference NULL) remain untouched.
+    await queryRunner.query(`
+      UPDATE inventory_families
+      SET is_active=false,updated_at=CURRENT_TIMESTAMP
+      WHERE source_reference LIKE 'APLICACION APP%'
+         OR source_reference LIKE 'SYSTEM:F3.1:%'
+    `);
+    await queryRunner.query(`
+      UPDATE finding_categories
+      SET is_active=false,updated_at=CURRENT_TIMESTAMP
+      WHERE lower(code) IN ('app26','app26r2')
+    `);
+
+    const installationIds = new Map<string,string>();
+    for (const installation of source.catalogSource.installations) {
+      const familyId = await this.upsertFamily(
+        queryRunner,
+        installationCode(installation.name),
+        installation.name,
+        'INSTALLATION',
+        `F5:${CATALOG_SOURCE_NAME}|${source.catalogSource.sheet}|rows:${installation.sourceStartRow}-${installation.sourceEndRow}`,
+      );
+      installationIds.set(findingKey(installation.name),familyId);
+    }
+
+    for (const subinstallation of source.catalogSource.subinstallations) {
+      const parentId = installationIds.get(findingKey(subinstallation.installation));
+      if (!parentId) throw new Error(`F5 missing installation family ${subinstallation.installation}`);
+      const childId = await this.upsertFamily(
+        queryRunner,
+        subinstallationCode(subinstallation.installation,subinstallation.name),
+        subinstallation.name,
+        'SUBINSTALLATION',
+        `F5:${CATALOG_SOURCE_NAME}|${source.catalogSource.sheet}|rows:${subinstallation.sourceStartRow}-${subinstallation.sourceEndRow}${subinstallation.reference ? `|reference:${subinstallation.reference}` : ''}`,
+      );
+      await this.parentRule(queryRunner,childId,parentId);
+    }
+
+    const installationOtherId = await this.upsertFamily(
+      queryRunner,
+      'F5-I-OTRO',
+      'Otro / no catalogado',
+      'INSTALLATION',
+      'F5:SYSTEM:OTHER:INSTALLATION',
+    );
+    for (const [installationKey,parentId] of installationIds) {
+      const parent = source.catalogSource.installations.find((item) => findingKey(item.name)===installationKey);
+      if (!parent) continue;
+      const childId = await this.upsertFamily(
+        queryRunner,
+        subOtherCode(installationCode(parent.name)),
+        'Otro / no catalogado',
+        'SUBINSTALLATION',
+        `F5:SYSTEM:OTHER:SUBINSTALLATION:${installationCode(parent.name)}`,
+      );
+      await this.parentRule(queryRunner,childId,parentId);
+    }
+    const rootOtherChild = await this.upsertFamily(
+      queryRunner,
+      subOtherCode('F5-I-OTRO'),
+      'Otro / no catalogado',
+      'SUBINSTALLATION',
+      'F5:SYSTEM:OTHER:SUBINSTALLATION:F5-I-OTRO',
+    );
+    await this.parentRule(queryRunner,rootOtherChild,installationOtherId);
+
+    await queryRunner.query(`
+      INSERT INTO finding_categories(code,name,sort_order,is_active)
+      SELECT $1::varchar,'DH · Modelo de Inventarios F5',270,true
+      WHERE NOT EXISTS (SELECT 1 FROM finding_categories WHERE lower(code)=lower($1::varchar))
+    `, [CATALOG_CATEGORY_CODE]);
+    await queryRunner.query(`
+      UPDATE finding_categories
+      SET name='DH · Modelo de Inventarios F5',sort_order=270,is_active=true,updated_at=CURRENT_TIMESTAMP
+      WHERE lower(code)=lower($1::varchar)
+    `,[CATALOG_CATEGORY_CODE]);
+    const categoryId = await this.id(
+      queryRunner,
+      `SELECT id FROM finding_categories WHERE lower(code)=lower($1::varchar) LIMIT 1`,
+      [CATALOG_CATEGORY_CODE],
+      'F5 finding category',
+    );
+
+    const titleByKey = new Map<string,string>();
+    const register = (title: string): void => {
+      const clean = title.trim();
+      if (!clean || /^idem\b/i.test(clean) || findingKey(clean)==='hallazgos') return;
+      const itemKey = findingKey(clean);
+      if (!titleByKey.has(itemKey)) titleByKey.set(itemKey,clean);
+    };
+    for (const title of source.catalogSource.universalFindings) register(title);
+    for (const family of source.catalogSource.installations) for (const title of family.findings) register(title);
+    for (const family of source.catalogSource.subinstallations) for (const title of family.findings) register(title);
+    if (titleByKey.size !== 177) {
+      throw new Error(`F5 finding normalization contract mismatch: ${titleByKey.size}`);
+    }
+
+    const itemIdByKey = new Map<string,string>();
+    const orderedTitles = [...titleByKey.entries()].sort((a,b)=>a[1].localeCompare(b[1],'es'));
+    let sourceNumber=1;
+    for (const [itemKey,title] of orderedTitles) {
+      const itemCode = hashCode('F5-H',itemKey);
+      let itemId = await this.optionalId(
+        queryRunner,
+        `SELECT id FROM finding_catalog_items WHERE lower(code)=lower($1::varchar) LIMIT 1`,
+        [itemCode],
+      );
+      if (!itemId) {
+        const itemRows = (await queryRunner.query(`
+          INSERT INTO finding_catalog_items (
+            category_id,code,source_number,title,import_note,revision,is_active
+          ) VALUES ($1::uuid,$2,$3,$4,$5,1,true)
+          RETURNING id
+        `,[
+          categoryId,itemCode,sourceNumber,title,
+          `${CATALOG_SOURCE_NAME} · ${source.catalogSource.sheet} · F5 authoritative catalog`,
+        ])) as IdRow[];
+        itemId=itemRows[0]?.id ?? null;
+      } else {
+        await queryRunner.query(`
+          UPDATE finding_catalog_items
+          SET category_id=$2::uuid,source_number=$3,title=$4,import_note=$5,
+              is_active=true,updated_at=CURRENT_TIMESTAMP
+          WHERE id=$1::uuid
+        `,[
+          itemId,categoryId,sourceNumber,title,
+          `${CATALOG_SOURCE_NAME} · ${source.catalogSource.sheet} · F5 authoritative catalog`,
+        ]);
+      }
+      if (!itemId) throw new Error(`F5 could not create finding ${title}`);
+      itemIdByKey.set(itemKey,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:F5'
+        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;
+    }
+
+    // Add F5 mappings only. Never delete mappings created by office users or by
+    // historical migrations; inactive historical families simply stop being offered.
+    for (const family of source.catalogSource.installations) {
+      await this.mapFindings(
+        queryRunner,
+        installationCode(family.name),
+        family,
+        source.catalogSource.universalFindings,
+        itemIdByKey,
+      );
+    }
+    for (const family of source.catalogSource.subinstallations) {
+      await this.mapFindings(
+        queryRunner,
+        subinstallationCode(family.installation,family.name),
+        family,
+        source.catalogSource.universalFindings,
+        itemIdByKey,
+      );
+    }
+
+    await this.installFamilySyncFunctions(queryRunner);
+
+    // Keep pre-existing profile administration untouched. Yacimiento needs a
+    // profile only to expose OTROS because the source does not provide a family.
+    await queryRunner.query(`
+      INSERT INTO finding_catalog_asset_type_profiles(asset_type_id,reason)
+      SELECT id,'F5: Yacimiento admite Hallazgos mediante OTROS; no posee familia precargada en final_modelov2.xlsx.'
+      FROM asset_types WHERE lower(code)='yacimiento'
+      ON CONFLICT (asset_type_id) DO NOTHING
+    `);
+
+    const [counts] = (await queryRunner.query(`
+      SELECT
+        COUNT(*) FILTER (WHERE level='INSTALLATION' AND source_reference LIKE 'F5:${CATALOG_SOURCE_NAME}%')::integer AS installations,
+        COUNT(*) FILTER (WHERE level='SUBINSTALLATION' AND source_reference LIKE 'F5:${CATALOG_SOURCE_NAME}%')::integer AS subinstallations
+      FROM inventory_families WHERE is_active=true
+    `)) as Array<{ installations:number; subinstallations:number }>;
+    if (Number(counts?.installations ?? 0)!==14 || Number(counts?.subinstallations ?? 0)!==109) {
+      throw new Error(`F5 family preload verification failed: ${JSON.stringify(counts ?? {})}`);
+    }
+
+    const [itemCount] = (await queryRunner.query(`
+      SELECT COUNT(*)::integer AS total
+      FROM finding_catalog_items
+      WHERE category_id=$1::uuid AND is_active=true
+    `,[categoryId])) as CountRow[];
+    if (Number(itemCount?.total ?? 0)!==177) {
+      throw new Error(`F5 finding preload verification failed: ${itemCount?.total ?? 0}`);
+    }
+
+    // Verify every universal finding is independently attached to every one of
+    // the 14 + 109 source families. This intentionally avoids optional DB text
+    // extensions such as unaccent.
+    for (const universalTitle of source.catalogSource.universalFindings) {
+      const universalItemId = itemIdByKey.get(findingKey(universalTitle));
+      if (!universalItemId) throw new Error(`F5 missing universal catalog item ${universalTitle}`);
+      const [mappedCount] = (await queryRunner.query(`
+        SELECT COUNT(DISTINCT mapping.inventory_family_id)::integer AS total
+        FROM finding_catalog_item_inventory_families mapping
+        JOIN inventory_families family ON family.id=mapping.inventory_family_id
+        WHERE mapping.catalog_item_id=$1::uuid
+          AND family.is_active=true
+          AND family.source_reference LIKE $2
+      `,[universalItemId,`F5:${CATALOG_SOURCE_NAME}%`])) as CountRow[];
+      if (Number(mappedCount?.total ?? 0)!==F5_SOURCE_FAMILY_COUNT) {
+        throw new Error(`F5 universal mapping verification failed for ${universalTitle}: ${mappedCount?.total ?? 0}`);
+      }
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    const categoryId = await this.optionalId(
+      queryRunner,
+      `SELECT id FROM finding_categories WHERE lower(code)=lower($1::varchar) LIMIT 1`,
+      [CATALOG_CATEGORY_CODE],
+    );
+
+    if (categoryId) {
+      const [usedFinding] = (await queryRunner.query(`
+        SELECT COUNT(*)::integer AS total
+        FROM inspection_findings finding
+        JOIN finding_catalog_items item ON item.id=finding.catalog_item_id
+        WHERE item.category_id=$1::uuid
+      `,[categoryId])) as CountRow[];
+      if (Number(usedFinding?.total ?? 0)>0) {
+        throw new Error('Cannot safely rollback F5 catalog: inspection findings already reference F5 catalog items');
+      }
+    }
+
+    const [usedFamily] = (await queryRunner.query(`
+      SELECT COUNT(*)::integer AS total
+      FROM assets asset
+      JOIN inventory_families family ON family.id=asset.inventory_family_id
+      WHERE family.source_reference LIKE 'F5:%'
+    `)) as CountRow[];
+    if (Number(usedFamily?.total ?? 0)>0) {
+      throw new Error('Cannot safely rollback F5 catalog: inventory instances already reference F5 families');
+    }
+
+    await queryRunner.query(`
+      DELETE FROM finding_catalog_asset_overrides
+      WHERE reason=$1::text
+    `,[F5_AUTO_REASON]);
+
+    if (categoryId) {
+      await queryRunner.query(`
+        DELETE FROM finding_catalog_item_inventory_families mapping
+        USING finding_catalog_items item
+        WHERE item.id=mapping.catalog_item_id AND item.category_id=$1::uuid
+      `,[categoryId]);
+      await queryRunner.query(`
+        DELETE FROM finding_catalog_item_versions version
+        USING finding_catalog_items item
+        WHERE item.id=version.item_id AND item.category_id=$1::uuid
+      `,[categoryId]);
+      await queryRunner.query(`DELETE FROM finding_catalog_items WHERE category_id=$1::uuid`,[categoryId]);
+      await queryRunner.query(`DELETE FROM finding_categories WHERE id=$1::uuid`,[categoryId]);
+    }
+
+    await queryRunner.query(`
+      DELETE FROM inventory_family_parent_rules rule
+      USING inventory_families child
+      WHERE child.id=rule.child_family_id AND child.source_reference LIKE 'F5:%'
+    `);
+    await queryRunner.query(`DELETE FROM inventory_families WHERE source_reference LIKE 'F5:%'`);
+    await queryRunner.query(`
+      UPDATE inventory_families
+      SET is_active=true,updated_at=CURRENT_TIMESTAMP
+      WHERE source_reference LIKE 'APLICACION APP%'
+         OR source_reference LIKE 'SYSTEM:F3.1:%'
+    `);
+    await queryRunner.query(`
+      UPDATE finding_categories SET is_active=true,updated_at=CURRENT_TIMESTAMP
+      WHERE lower(code)='app26r2'
+    `);
+    await queryRunner.query(`
+      DELETE FROM finding_catalog_asset_type_profiles profile
+      USING asset_types type
+      WHERE profile.asset_type_id=type.id
+        AND lower(type.code)='yacimiento'
+        AND profile.reason='F5: Yacimiento admite Hallazgos mediante OTROS; no posee familia precargada en final_modelov2.xlsx.'
+    `);
+    await queryRunner.query(`
+      DELETE FROM source_documents
+      WHERE document_number=$1::varchar AND issuer='Dirección de Hidrocarburos'
+    `,[CATALOG_DOCUMENT_NUMBER]);
+    await this.restoreF31FamilySyncFunctions(queryRunner);
+
+    // Rebuild only automatic historical overrides. Manual overrides have never
+    // been touched by this migration.
+    await queryRunner.query(`
+      DELETE FROM finding_catalog_asset_overrides
+      WHERE reason LIKE 'F3.1 familia técnica:%'
+    `);
+    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
+    `);
+  }
+
+  private async upsertFamily(
+    queryRunner: QueryRunner,
+    familyCode: string,
+    name: string,
+    level: 'INSTALLATION'|'SUBINSTALLATION',
+    sourceReference: string,
+  ): Promise<string> {
+    await queryRunner.query(`
+      INSERT INTO inventory_families(
+        code,name,level,legacy_type_code,information_labels,source_reference,is_active
+      ) VALUES ($1,$2,$3,NULL,'[]'::jsonb,$4,true)
+      ON CONFLICT (code) DO UPDATE SET
+        name=EXCLUDED.name,level=EXCLUDED.level,legacy_type_code=NULL,
+        information_labels='[]'::jsonb,source_reference=EXCLUDED.source_reference,
+        is_active=true,updated_at=CURRENT_TIMESTAMP
+    `,[familyCode,name,level,sourceReference]);
+    return this.id(
+      queryRunner,
+      `SELECT id FROM inventory_families WHERE code=$1::varchar LIMIT 1`,
+      [familyCode],
+      `inventory family ${familyCode}`,
+    );
+  }
+
+  private async parentRule(queryRunner: QueryRunner,childId:string,parentId:string):Promise<void> {
+    await queryRunner.query(`
+      INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
+      VALUES ($1::uuid,$2::uuid)
+      ON CONFLICT (child_family_id) DO UPDATE SET parent_family_id=EXCLUDED.parent_family_id
+    `,[childId,parentId]);
+  }
+
+  private async mapFindings(
+    queryRunner: QueryRunner,
+    familyCode: string,
+    family: F5InstallationCatalogRow|F5SubinstallationCatalogRow,
+    universalFindings: string[],
+    itemIdByKey: Map<string,string>,
+  ): Promise<void> {
+    const familyId = await this.id(
+      queryRunner,
+      `SELECT id FROM inventory_families WHERE code=$1::varchar LIMIT 1`,
+      [familyCode],
+      `family ${familyCode}`,
+    );
+    const mapped = new Set<string>();
+    for (const rawTitle of [...family.findings,...universalFindings]) {
+      const itemKey=findingKey(rawTitle);
+      if (!itemKey || itemKey==='hallazgos' || mapped.has(itemKey)) continue;
+      mapped.add(itemKey);
+      const itemId=itemIdByKey.get(itemKey);
+      if (!itemId) throw new Error(`F5 missing finding item ${rawTitle}`);
+      await queryRunner.query(`
+        INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id)
+        VALUES ($1::uuid,$2::uuid)
+        ON CONFLICT (catalog_item_id,inventory_family_id) DO NOTHING
+      `,[itemId,familyId]);
+    }
+  }
+
+  private async installFamilySyncFunctions(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 'F% 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,
+            'F5 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='F5 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 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 'F% 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,
+          'F5 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='F5 familia técnica: catálogo contextual automático',updated_at=CURRENT_TIMESTAMP;
+        RETURN NEW;
+      END $$;
+    `);
+
+    await queryRunner.query(`
+      DELETE FROM finding_catalog_asset_overrides
+      WHERE reason LIKE 'F% familia técnica:%'
+    `);
+    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,$1::text,
+        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=$1::text,updated_at=CURRENT_TIMESTAMP
+    `,[F5_AUTO_REASON]);
+  }
+
+  private async restoreF31FamilySyncFunctions(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 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 $$;
+    `);
+  }
+
+  private async id(queryRunner: QueryRunner,sql:string,params:unknown[],label:string):Promise<string> {
+    const value=await this.optionalId(queryRunner,sql,params);
+    if (!value) throw new Error(`F5 could not resolve ${label}`);
+    return value;
+  }
+
+  private async optionalId(queryRunner: QueryRunner,sql:string,params:unknown[]):Promise<string|null> {
+    const rows=(await queryRunner.query(sql,params)) as IdRow[];
+    return rows[0]?.id ?? null;
+  }
+}

api-v3/src/database/migrations/1790087400000-f5-1-clean-manual-inventory.ts

@@ -0,0 +1,168 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class F51CleanManualInventory1790087400000 implements MigrationInterface {
+  name = 'F51CleanManualInventory1790087400000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // F5.1 is an intentional clean-start cut. The deployment process creates a
+    // full database backup before migrations, so old domain data is recovered
+    // from that backup rather than by pretending a destructive migration can
+    // reconstruct historical rows.
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_f5_canonical_asset_hierarchy ON assets');
+
+    // Remove all operational/domain instances and every table that depends on
+    // them (visits, acts, findings, reports, versions, media, relations, etc.).
+    // Users/roles/permissions and technical configuration are deliberately not
+    // part of this TRUNCATE.
+    await queryRunner.query('TRUNCATE TABLE assets CASCADE');
+
+    // Imported territorial/source material must not silently repopulate or
+    // influence the new manually curated structure.
+    await queryRunner.query('TRUNCATE TABLE administrative_departments CASCADE');
+    await queryRunner.query('TRUNCATE TABLE source_documents CASCADE');
+
+    // Start the classification ↔ finding applicability review from zero while
+    // preserving both master catalogs themselves.
+    await queryRunner.query('TRUNCATE TABLE finding_catalog_item_inventory_families');
+
+    // Explicitly clear audit history, including authentication/admin events
+    // accumulated during development. New events continue to be recorded after
+    // this migration.
+    await queryRunner.query('TRUNCATE TABLE audit_events');
+
+    // Import/reconciliation tables can contain rows not connected to a current
+    // Asset. Clear every asset_import_* data table without coupling this cut to
+    // one historical import implementation.
+    await queryRunner.query(`
+      DO $$
+      DECLARE table_name text;
+      BEGIN
+        FOR table_name IN
+          SELECT tablename
+          FROM pg_tables
+          WHERE schemaname = current_schema()
+            AND tablename LIKE 'asset_import_%'
+        LOOP
+          EXECUTE format('TRUNCATE TABLE %I CASCADE', table_name);
+        END LOOP;
+      END $$;
+    `);
+
+    // F5.1 decouples the physical Inventory tree from Empresa. A structural
+    // Asset may therefore inherit an Area while no operator has been assigned
+    // yet. Keep the useful invariant that an operator can never exist without
+    // an Area, but remove the old all-or-nothing pair requirement.
+    await queryRunner.query(`
+      ALTER TABLE asset_context_history
+      DROP CONSTRAINT IF EXISTS chk_asset_context_history_context_pair
+    `);
+    await queryRunner.query(`
+      ALTER TABLE asset_context_history
+      ADD CONSTRAINT chk_asset_context_history_context_pair
+      CHECK (operator_company_id IS NULL OR operational_area_id IS NOT NULL)
+    `);
+
+    // Departamento becomes the real root of the physical Inventory tree.
+    await queryRunner.query(`
+      INSERT INTO asset_types(code,name,description,can_be_root,is_active,operational_role)
+      SELECT 'departamento','Departamento','Departamento administrativo que contiene Áreas.',true,true,'GENERIC'
+      WHERE NOT EXISTS (
+        SELECT 1 FROM asset_types WHERE lower(code)='departamento'
+      )
+    `);
+    await queryRunner.query(`
+      UPDATE asset_types
+      SET name='Departamento',
+          description='Departamento administrativo que contiene Áreas.',
+          can_be_root=true,
+          is_active=true,
+          operational_role='GENERIC',
+          updated_at=CURRENT_TIMESTAMP
+      WHERE lower(code)='departamento'
+    `);
+    await queryRunner.query(`
+      UPDATE asset_types
+      SET can_be_root=false,updated_at=CURRENT_TIMESTAMP
+      WHERE lower(code)='area'
+    `);
+
+    // Area has exactly one canonical structural parent kind: Departamento.
+    await queryRunner.query(`
+      DELETE FROM asset_type_parent_rules rule
+      USING asset_types child
+      WHERE rule.child_type_id=child.id AND lower(child.code)='area'
+    `);
+    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)='area' AND lower(parent.code)='departamento'
+      ON CONFLICT (child_type_id,parent_type_id) DO NOTHING
+    `);
+
+    // Database-level guard: UI/API bugs cannot create an invalid physical tree.
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION enforce_f5_canonical_asset_hierarchy()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      DECLARE child_code text; parent_code text;
+      BEGIN
+        SELECT lower(code) INTO child_code FROM asset_types WHERE id=NEW.asset_type_id;
+
+        IF child_code IN ('empresa','organizacion','departamento') THEN
+          IF NEW.parent_id IS NOT NULL THEN
+            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Empresa y Departamento son maestros raíz independientes';
+          END IF;
+          RETURN NEW;
+        END IF;
+
+        IF child_code NOT IN ('area','yacimiento','instalacion','subinstalacion') THEN
+          RETURN NEW;
+        END IF;
+
+        IF NEW.parent_id IS NULL THEN
+          RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La estructura requiere Departamento → Área → Yacimiento → Instalación → Subinstalación';
+        END IF;
+
+        SELECT lower(type.code) INTO parent_code
+        FROM assets parent
+        JOIN asset_types type ON type.id=parent.asset_type_id
+        WHERE parent.id=NEW.parent_id;
+
+        IF (child_code='area' AND parent_code<>'departamento')
+          OR (child_code='yacimiento' AND parent_code<>'area')
+          OR (child_code='instalacion' AND parent_code<>'yacimiento')
+          OR (child_code='subinstalacion' AND parent_code<>'instalacion') THEN
+          RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Jerarquía inválida: Departamento → Área → Yacimiento → Instalación → Subinstalación';
+        END IF;
+        RETURN NEW;
+      END $$;
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_f5_canonical_asset_hierarchy
+      BEFORE INSERT OR UPDATE OF asset_type_id,parent_id ON assets
+      FOR EACH ROW EXECUTE FUNCTION enforce_f5_canonical_asset_hierarchy()
+    `);
+
+    const rows = (await queryRunner.query(`
+      SELECT
+        (SELECT COUNT(*)::integer FROM assets) AS assets,
+        (SELECT COUNT(*)::integer FROM audit_events) AS audits,
+        (SELECT COUNT(*)::integer FROM finding_catalog_item_inventory_families) AS applicability,
+        (SELECT COUNT(*)::integer FROM asset_types WHERE lower(code)='departamento' AND can_be_root=true AND is_active=true) AS departments,
+        (SELECT COUNT(*)::integer
+           FROM asset_type_parent_rules rule
+           JOIN asset_types child ON child.id=rule.child_type_id
+           JOIN asset_types parent ON parent.id=rule.parent_type_id
+          WHERE lower(child.code)='area' AND lower(parent.code)='departamento') AS area_rules
+    `)) as Array<{ assets: number; audits: number; applicability: number; departments: number; area_rules: number }>;
+    const check = rows[0];
+    if (!check || Number(check.assets) !== 0 || Number(check.audits) !== 0 || Number(check.applicability) !== 0
+      || Number(check.departments) !== 1 || Number(check.area_rules) !== 1) {
+      throw new Error(`F5.1 clean-start verification failed: ${JSON.stringify(check ?? {})}`);
+    }
+  }
+
+  public async down(): Promise<void> {
+    throw new Error('F5.1 is an intentional destructive clean-start migration. Restore the pre-deploy database backup to recover previous data.');
+  }
+}

api-v3/src/database/migrations/1790091000000-f6-solid-inventory-model.ts

@@ -0,0 +1,226 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class F6SolidInventoryModel1790091000000 implements MigrationInterface {
+  name = 'F6SolidInventoryModel1790091000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // A technical Subinstallation family may be valid under several Installation
+    // families. F3.1 used child_family_id as the PK, which made this relation
+    // accidentally one-to-one from the child's point of view.
+    await queryRunner.query(`
+      DO $$
+      DECLARE constraint_name text;
+      BEGIN
+        SELECT con.conname INTO constraint_name
+        FROM pg_constraint con
+        JOIN pg_class rel ON rel.oid=con.conrelid
+        WHERE rel.relname='inventory_family_parent_rules' AND con.contype='p'
+        LIMIT 1;
+        IF constraint_name IS NOT NULL THEN
+          EXECUTE format('ALTER TABLE inventory_family_parent_rules DROP CONSTRAINT %I',constraint_name);
+        END IF;
+      END $$;
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inventory_family_parent_rules
+      ADD CONSTRAINT pk_inventory_family_parent_rules
+      PRIMARY KEY (child_family_id,parent_family_id)
+    `);
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS idx_inventory_family_parent_rules_parent
+      ON inventory_family_parent_rules(parent_family_id,child_family_id)
+    `);
+
+    // Protect compatibility semantics at database level.
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION enforce_inventory_family_compatibility_rule()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      DECLARE child_level text; parent_level text;
+      BEGIN
+        SELECT level::text INTO child_level FROM inventory_families WHERE id=NEW.child_family_id;
+        SELECT level::text INTO parent_level FROM inventory_families WHERE id=NEW.parent_family_id;
+        IF child_level IS DISTINCT FROM 'SUBINSTALLATION' OR parent_level IS DISTINCT FROM 'INSTALLATION' THEN
+          RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La compatibilidad debe vincular Subinstalación con Instalación';
+        END IF;
+        RETURN NEW;
+      END $$;
+    `);
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_inventory_family_compatibility_rule ON inventory_family_parent_rules');
+    await queryRunner.query(`
+      CREATE TRIGGER trg_inventory_family_compatibility_rule
+      BEFORE INSERT OR UPDATE OF child_family_id,parent_family_id ON inventory_family_parent_rules
+      FOR EACH ROW EXECUTE FUNCTION enforce_inventory_family_compatibility_rule()
+    `);
+
+    // Family-specific technical fields. Generic asset type attributes remain for
+    // data genuinely shared by a whole structural level.
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS inventory_family_attribute_definitions (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        inventory_family_id uuid NOT NULL REFERENCES inventory_families(id) ON DELETE CASCADE,
+        code varchar(80) NOT NULL,
+        name varchar(160) NOT NULL,
+        data_type asset_attribute_data_type NOT NULL,
+        is_required boolean NOT NULL DEFAULT false,
+        is_active boolean NOT NULL DEFAULT true,
+        unit varchar(40) NULL,
+        options jsonb NULL,
+        sort_order integer NOT NULL DEFAULT 0,
+        created_by uuid NULL,
+        updated_by uuid NULL,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT uq_inventory_family_attribute_code UNIQUE(inventory_family_id,code),
+        CONSTRAINT chk_inventory_family_attribute_code CHECK (code ~ '^[a-z][a-z0-9_]*$'),
+        CONSTRAINT chk_inventory_family_attribute_options CHECK (
+          (data_type='SELECT' AND options IS NOT NULL AND jsonb_typeof(options)='array')
+          OR (data_type<>'SELECT')
+        )
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS idx_inventory_family_attributes_family
+      ON inventory_family_attribute_definitions(inventory_family_id,is_active,sort_order,name)
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS asset_inventory_attribute_values (
+        asset_id uuid NOT NULL REFERENCES assets(id) ON DELETE CASCADE,
+        definition_id uuid NOT NULL REFERENCES inventory_family_attribute_definitions(id) ON DELETE CASCADE,
+        value jsonb NOT NULL,
+        updated_by uuid NULL,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        PRIMARY KEY(asset_id,definition_id)
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS idx_asset_inventory_attribute_values_definition
+      ON asset_inventory_attribute_values(definition_id,asset_id)
+    `);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION enforce_asset_inventory_attribute_family()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      DECLARE asset_family uuid; definition_family uuid;
+      BEGIN
+        SELECT inventory_family_id INTO asset_family FROM assets WHERE id=NEW.asset_id;
+        SELECT inventory_family_id INTO definition_family
+        FROM inventory_family_attribute_definitions WHERE id=NEW.definition_id AND is_active=true;
+        IF asset_family IS NULL OR definition_family IS NULL OR asset_family<>definition_family THEN
+          RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El campo técnico no pertenece a la clasificación del Inventario';
+        END IF;
+        RETURN NEW;
+      END $$;
+    `);
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_asset_inventory_attribute_family ON asset_inventory_attribute_values');
+    await queryRunner.query(`
+      CREATE TRIGGER trg_asset_inventory_attribute_family
+      BEFORE INSERT OR UPDATE OF asset_id,definition_id ON asset_inventory_attribute_values
+      FOR EACH ROW EXECUTE FUNCTION enforce_asset_inventory_attribute_family()
+    `);
+
+    // Enforce classification level and Subinstallation compatibility on every
+    // physical Inventory write, not just through the current WEB/API.
+    // A FIELD_SURVEY+DRAFT row may exist momentarily without family because the
+    // field-discovery transaction creates the provisional record before the F6
+    // structure service assigns the family selected by the inspector. Such a row
+    // remains unusable for findings until classification is present.
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION enforce_f6_asset_family_contract()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      DECLARE child_type text; family_level text; parent_family uuid;
+      BEGIN
+        SELECT lower(code) INTO child_type FROM asset_types WHERE id=NEW.asset_type_id;
+
+        IF child_type IN ('departamento','area','yacimiento') THEN
+          IF NEW.inventory_family_id IS NOT NULL THEN
+            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Departamento, Área y Yacimiento no llevan clasificación técnica';
+          END IF;
+          RETURN NEW;
+        END IF;
+
+        IF child_type='instalacion' THEN
+          IF NEW.inventory_family_id IS NULL THEN
+            IF NEW.data_origin='FIELD_SURVEY' AND NEW.information_status='DRAFT' THEN
+              RETURN NEW;
+            END IF;
+            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La Instalación requiere clasificación técnica';
+          END IF;
+          SELECT level::text INTO family_level FROM inventory_families WHERE id=NEW.inventory_family_id AND is_active=true;
+          IF family_level IS DISTINCT FROM 'INSTALLATION' THEN
+            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La clasificación elegida no corresponde a una Instalación';
+          END IF;
+          RETURN NEW;
+        END IF;
+
+        IF child_type='subinstalacion' THEN
+          IF NEW.parent_id IS NULL THEN
+            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La Subinstalación requiere una Instalación padre';
+          END IF;
+          IF NEW.inventory_family_id IS NULL THEN
+            IF NEW.data_origin='FIELD_SURVEY' AND NEW.information_status='DRAFT' THEN
+              RETURN NEW;
+            END IF;
+            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La Subinstalación requiere clasificación técnica';
+          END IF;
+          SELECT level::text INTO family_level FROM inventory_families WHERE id=NEW.inventory_family_id AND is_active=true;
+          SELECT inventory_family_id INTO parent_family FROM assets WHERE id=NEW.parent_id;
+          IF family_level IS DISTINCT FROM 'SUBINSTALLATION' THEN
+            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La clasificación elegida no corresponde a una Subinstalación';
+          END IF;
+          IF parent_family IS NULL OR NOT EXISTS (
+            SELECT 1 FROM inventory_family_parent_rules rule
+            WHERE rule.child_family_id=NEW.inventory_family_id AND rule.parent_family_id=parent_family
+          ) THEN
+            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La clasificación de Subinstalación no es compatible con la Instalación padre';
+          END IF;
+        END IF;
+        RETURN NEW;
+      END $$;
+    `);
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_f6_asset_family_contract ON assets');
+    await queryRunner.query(`
+      CREATE TRIGGER trg_f6_asset_family_contract
+      BEFORE INSERT OR UPDATE OF asset_type_id,parent_id,inventory_family_id ON assets
+      FOR EACH ROW EXECUTE FUNCTION enforce_f6_asset_family_contract()
+    `);
+
+    const [check] = (await queryRunner.query(`
+      SELECT
+        (SELECT COUNT(*)::integer FROM pg_constraint c JOIN pg_class r ON r.oid=c.conrelid
+          WHERE r.relname='inventory_family_parent_rules' AND c.contype='p'
+            AND pg_get_constraintdef(c.oid) LIKE '%child_family_id, parent_family_id%') AS composite_pk,
+        to_regclass('inventory_family_attribute_definitions') IS NOT NULL AS family_attributes,
+        to_regclass('asset_inventory_attribute_values') IS NOT NULL AS family_values
+    `)) as Array<{ composite_pk:number; family_attributes:boolean; family_values:boolean }>;
+    if (!check || Number(check.composite_pk)!==1 || !check.family_attributes || !check.family_values) {
+      throw new Error(`F6 inventory model verification failed: ${JSON.stringify(check ?? {})}`);
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_f6_asset_family_contract ON assets');
+    await queryRunner.query('DROP FUNCTION IF EXISTS enforce_f6_asset_family_contract()');
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_asset_inventory_attribute_family ON asset_inventory_attribute_values');
+    await queryRunner.query('DROP FUNCTION IF EXISTS enforce_asset_inventory_attribute_family()');
+    await queryRunner.query('DROP TABLE IF EXISTS asset_inventory_attribute_values');
+    await queryRunner.query('DROP TABLE IF EXISTS inventory_family_attribute_definitions');
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_inventory_family_compatibility_rule ON inventory_family_parent_rules');
+    await queryRunner.query('DROP FUNCTION IF EXISTS enforce_inventory_family_compatibility_rule()');
+    await queryRunner.query('DROP INDEX IF EXISTS idx_inventory_family_parent_rules_parent');
+
+    // Old schema allowed only one Installation family per Subinstallation family.
+    // Keep a deterministic first relation if F6 data must be rolled back.
+    await queryRunner.query(`
+      DELETE FROM inventory_family_parent_rules rule
+      USING inventory_family_parent_rules keep
+      WHERE rule.child_family_id=keep.child_family_id
+        AND rule.parent_family_id>keep.parent_family_id
+    `);
+    await queryRunner.query('ALTER TABLE inventory_family_parent_rules DROP CONSTRAINT IF EXISTS pk_inventory_family_parent_rules');
+    await queryRunner.query(`
+      ALTER TABLE inventory_family_parent_rules
+      ADD CONSTRAINT inventory_family_parent_rules_pkey PRIMARY KEY(child_family_id)
+    `);
+  }
+}

api-v3/src/database/migrations/1790094500000-f6-1-area-owned-operational-context-check.ts

@@ -0,0 +1,35 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * F5/F6 permits physical Inventory to belong to an Área without persisting a
+ * Company snapshot. Company snapshots are optional creation/history metadata;
+ * current ownership is resolved from area_company_relations.
+ *
+ * The F4 paired CHECK survived the trigger migration and contradicted that
+ * model. Keep only the invariant that a Company snapshot cannot exist without
+ * an Área.
+ */
+export class F61AreaOwnedOperationalContextCheck1790094500000 implements MigrationInterface {
+  name='F61AreaOwnedOperationalContextCheck1790094500000';
+
+  public async up(queryRunner:QueryRunner):Promise<void>{
+    await queryRunner.query('ALTER TABLE assets DROP CONSTRAINT IF EXISTS chk_assets_operational_assignment_pair');
+    await queryRunner.query(`
+      ALTER TABLE assets
+      ADD CONSTRAINT chk_assets_operational_assignment_pair
+      CHECK (operator_company_id IS NULL OR operational_area_id IS NOT NULL)
+    `);
+  }
+
+  public async down(queryRunner:QueryRunner):Promise<void>{
+    await queryRunner.query('ALTER TABLE assets DROP CONSTRAINT IF EXISTS chk_assets_operational_assignment_pair');
+    await queryRunner.query(`
+      ALTER TABLE assets
+      ADD CONSTRAINT chk_assets_operational_assignment_pair
+      CHECK (
+        (operational_area_id IS NULL AND operator_company_id IS NULL)
+        OR (operational_area_id IS NOT NULL AND operator_company_id IS NOT NULL)
+      )
+    `);
+  }
+}

api-v3/src/database/migrations/1790094600000-f6-1-presentation-territory-reset.ts

@@ -0,0 +1,163 @@
+import { createHash } from 'node:crypto';
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { F61_PRESENTATION_TERRITORY_SOURCE as SOURCE } from '../../reference-data/f6-1-presentation-territory-source';
+
+type IdRow={id:string};
+const NO_OPERATOR='Sin Empresa Operadora';
+const DOC='DH-F6.1-PRESENTATION-TERRITORY-20260909';
+
+const key=(value:string)=>value.normalize('NFD').replace(/[\u0300-\u036f]/g,'').toLowerCase()
+  .replace(/[^a-z0-9]+/g,' ').trim().replace(/\s+/g,' ');
+const code=(prefix:string,value:string,length=12)=>
+  `${prefix}-${createHash('sha1').update(value).digest('hex').slice(0,length).toUpperCase()}`;
+const uniqueBy=<T>(rows:T[],identity:(row:T)=>string)=>{
+  const seen=new Set<string>(); return rows.filter((row)=>{const id=identity(row);if(seen.has(id))return false;seen.add(id);return true;});
+};
+
+export class F61PresentationTerritoryReset1790094600000 implements MigrationInterface {
+  name='F61PresentationTerritoryReset1790094600000';
+
+  public async up(q:QueryRunner):Promise<void>{
+    const rows=SOURCE.rows;
+    if(SOURCE.file!=='Tablas de yacimiento y areas(1).xlsx'||SOURCE.sheet!=='cr26e_tabla1'
+      ||SOURCE.sha256!=='afc8991eed0c0175cf121b6e11e6ca7cc5459ba371c5a186966706e386033cdb'||rows.length!==230)
+      throw new Error('F6.1 presentation source contract mismatch');
+
+    const areas=uniqueBy(rows,(r)=>key(r.area));
+    const pairs=uniqueBy(rows,(r)=>`${key(r.area)}|${key(r.yacimiento)}`);
+    const departments=uniqueBy(rows,(r)=>key(r.departamento));
+    const companies=[...new Set(rows.map((r)=>r.empresaOperadora.trim())
+      .filter((name)=>name&&key(name)!==key(NO_OPERATOR)))].sort((a,b)=>a.localeCompare(b,'es'));
+    if(areas.length!==64||pairs.length!==230||departments.length!==7||companies.length!==12
+      ||areas.filter((r)=>key(r.empresaOperadora)!==key(NO_OPERATOR)).length!==47)
+      throw new Error('F6.1 presentation source cardinality mismatch');
+
+    const concessions=new Set(rows.map((r)=>r.tipoConcesion.trim()));
+    if(concessions.size!==2||!concessions.has('Exploración')||!concessions.has('Explotación'))
+      throw new Error('F6.1 presentation concession contract mismatch');
+    for(const area of areas){
+      const same=rows.filter((r)=>key(r.area)===key(area.area));
+      for(const field of ['departamento','tipoConcesion','empresaOperadora'] as const)
+        if(new Set(same.map((r)=>key(r[field]))).size!==1) throw new Error(`Conflicting ${field}: ${area.area}`);
+    }
+
+    const companyType=await this.type(q,
+      `SELECT id FROM asset_types WHERE operational_role='COMPANY' AND is_active=true ORDER BY (lower(code)='empresa') DESC,created_at LIMIT 1`);
+    const departmentType=await this.type(q,
+      `SELECT id FROM asset_types WHERE lower(code)='departamento' AND is_active=true AND can_be_root=true LIMIT 1`);
+    const areaType=await this.type(q,
+      `SELECT id FROM asset_types WHERE lower(code)='area' AND operational_role='AREA' AND is_active=true LIMIT 1`);
+    const yacimientoType=await this.type(q,
+      `SELECT id FROM asset_types WHERE lower(code)='yacimiento' AND is_active=true LIMIT 1`);
+    const [rules]=await q.query(`
+      SELECT COUNT(*)::integer AS total FROM asset_type_parent_rules rule
+      JOIN asset_types child ON child.id=rule.child_type_id JOIN asset_types parent ON parent.id=rule.parent_type_id
+      WHERE (lower(child.code)='area' AND lower(parent.code)='departamento')
+         OR (lower(child.code)='yacimiento' AND lower(parent.code)='area')`);
+    if(Number(rules?.total)!==2) throw new Error('F6.1 canonical hierarchy rules are incomplete');
+
+    // Destructive clean start requested for the presentation. Users, RBAC,
+    // technical families, Finding masters and system configuration are preserved.
+    // Recovery is the automatic PRE database backup made by deploy-github.sh.
+    await q.query('TRUNCATE TABLE assets CASCADE');
+    await q.query('TRUNCATE TABLE administrative_departments CASCADE');
+    await q.query('TRUNCATE TABLE source_documents CASCADE');
+    await q.query('TRUNCATE TABLE audit_events');
+    await q.query(`DO $$ DECLARE t text; BEGIN FOR t IN SELECT tablename FROM pg_tables
+      WHERE schemaname=current_schema() AND tablename LIKE 'asset_import_%'
+      LOOP EXECUTE format('TRUNCATE TABLE %I CASCADE',t); END LOOP; END $$;`);
+
+    const [doc]=(await q.query(`INSERT INTO source_documents(document_type,document_number,title,issuer,external_reference,notes)
+      VALUES('SPREADSHEET',$1,$2,'Dirección de Hidrocarburos',$3,$4) RETURNING id`,
+      [DOC,SOURCE.file,`sha256:${SOURCE.sha256}`,`F6.1 · ${SOURCE.sheet} · ${rows.length} filas`])) as IdRow[];
+    if(!doc?.id) throw new Error('Could not create F6.1 presentation source');
+
+    const companyIds=new Map<string,string>();
+    for(const name of companies){
+      const id=await this.asset(q,companyType,null,null,code('PRES-ORG',key(name)),name,
+        'Empresa/Operadora del corte de presentación.',`F6.1:PRESENTATION:COMPANY:${code('SRC',key(name),10)}`,'Empresa');
+      companyIds.set(key(name),id);
+      await q.query(`INSERT INTO organization_profiles(asset_id,organization_kind,legal_name)
+        VALUES($1::uuid,$2::organization_kind,$3)`,[id,name.toUpperCase().startsWith('UTE (')?'UTE':'COMPANY',name]);
+      await this.link(q,id,doc.id,'Empresa/Operadora');
+    }
+
+    const departmentIds=new Map<string,string>();
+    for(const row of departments.sort((a,b)=>a.departamento.localeCompare(b.departamento,'es'))){
+      const id=await this.asset(q,departmentType,null,null,code('PRES-DEP',key(row.departamento)),row.departamento,
+        'Departamento administrativo raíz F6.1.',`F6.1:PRESENTATION:DEPARTMENT:${code('SRC',key(row.departamento),10)}`,'Departamento');
+      departmentIds.set(key(row.departamento),id); await this.link(q,id,doc.id,'Departamento');
+    }
+
+    const areaIds=new Map<string,string>();
+    for(const row of areas.sort((a,b)=>a.area.localeCompare(b.area,'es'))){
+      const parent=departmentIds.get(key(row.departamento)); if(!parent)throw new Error(`Missing Departamento ${row.departamento}`);
+      const id=await this.asset(q,areaType,parent,null,code('PRES-AREA',key(row.area)),row.area,
+        `Área del Departamento ${row.departamento}.`,`F6.1:PRESENTATION:AREA:${code('SRC',key(row.area),10)}`,'Área');
+      areaIds.set(key(row.area),id); await this.link(q,id,doc.id,`Área · ${row.departamento}`);
+      await q.query(`INSERT INTO area_legal_rights(area_id,right_type,name,status,source_document_id,notes)
+        VALUES($1::uuid,$2::area_legal_right_type,$3,'ACTIVE',$4::uuid,$5)`,[
+          id,row.tipoConcesion==='Exploración'?'EXPLORATION_PERMIT':'EXPLOITATION_CONCESSION',
+          `${row.tipoConcesion} · ${row.area}`,doc.id,`F6.1 · ${SOURCE.file}`]);
+      if(key(row.empresaOperadora)!==key(NO_OPERATOR)){
+        const company=companyIds.get(key(row.empresaOperadora)); if(!company)throw new Error(`Missing Empresa ${row.empresaOperadora}`);
+        await q.query(`INSERT INTO area_company_relations(area_id,company_id,relation_role,source_document_id,valid_from,start_reason)
+          VALUES($1::uuid,$2::uuid,'OPERATOR',$3::uuid,CURRENT_TIMESTAMP,$4)`,
+          [id,company,doc.id,`F6.1 · operadora vigente según ${SOURCE.file}`]);
+      }
+    }
+
+    for(const row of pairs){
+      const area=areaIds.get(key(row.area)); if(!area)throw new Error(`Missing Área ${row.area}`);
+      const id=await this.asset(q,yacimientoType,area,area,code('PRES-YAC',`${key(row.area)}|${key(row.yacimiento)}`),
+        row.yacimiento,`Yacimiento del Área ${row.area}.`,
+        `F6.1:PRESENTATION:YAC:${code('SRC',`${key(row.area)}|${key(row.yacimiento)}`,12)}`,`${SOURCE.sheet} · fila ${row.sourceRow}`);
+      await this.link(q,id,doc.id,`Yacimiento · ${row.area} · fila ${row.sourceRow}`);
+    }
+
+    const [c]=await q.query(`SELECT
+      (SELECT COUNT(*) FROM assets)::integer total_assets,
+      (SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE t.operational_role='COMPANY')::integer companies,
+      (SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE lower(t.code)='departamento')::integer departments,
+      (SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE lower(t.code)='area')::integer areas,
+      (SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE lower(t.code)='yacimiento')::integer yacimientos,
+      (SELECT COUNT(*) FROM area_legal_rights WHERE status='ACTIVE')::integer legal_rights,
+      (SELECT COUNT(*) FROM area_legal_rights WHERE status='ACTIVE' AND right_type='EXPLORATION_PERMIT')::integer exploration_rights,
+      (SELECT COUNT(*) FROM area_legal_rights WHERE status='ACTIVE' AND right_type='EXPLOITATION_CONCESSION')::integer exploitation_rights,
+      (SELECT COUNT(*) FROM area_company_relations WHERE relation_role='OPERATOR' AND valid_until IS NULL)::integer operators,
+      (SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE lower(t.code)='area'
+        AND NOT EXISTS(SELECT 1 FROM area_company_relations r WHERE r.area_id=a.id AND r.relation_role='OPERATOR' AND r.valid_until IS NULL))::integer areas_without_operator,
+      (SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id LEFT JOIN assets p ON p.id=a.parent_id
+        LEFT JOIN asset_types pt ON pt.id=p.asset_type_id WHERE lower(t.code)='area' AND (p.id IS NULL OR lower(pt.code)<>'departamento'))::integer invalid_area_parents,
+      (SELECT COUNT(*) FROM assets y JOIN asset_types t ON t.id=y.asset_type_id LEFT JOIN assets a ON a.id=y.parent_id
+        LEFT JOIN asset_types at ON at.id=a.asset_type_id WHERE lower(t.code)='yacimiento'
+        AND (a.id IS NULL OR lower(at.code)<>'area' OR y.operational_area_id IS DISTINCT FROM a.id))::integer invalid_yacimiento_contexts,
+      (SELECT COUNT(*) FROM asset_source_documents WHERE document_id=$1::uuid)::integer source_links,
+      (SELECT COUNT(*) FROM source_documents WHERE document_number=$2)::integer source_documents`,[doc.id,DOC]);
+    const expected:Record<string,number>={total_assets:313,companies:12,departments:7,areas:64,yacimientos:230,
+      legal_rights:64,exploration_rights:18,exploitation_rights:46,operators:47,areas_without_operator:17,
+      invalid_area_parents:0,invalid_yacimiento_contexts:0,source_links:313,source_documents:1};
+    for(const [field,value] of Object.entries(expected))
+      if(Number(c?.[field]??-1)!==value)throw new Error(`F6.1 seed verification failed: ${field}=${c?.[field]} expected=${value}`);
+  }
+
+  public async down():Promise<void>{
+    throw new Error('F6.1 presentation reset is destructive. Restore the PRE deploy database backup.');
+  }
+
+  private async type(q:QueryRunner,sql:string):Promise<string>{
+    const rows=(await q.query(sql)) as IdRow[]; if(!rows[0]?.id)throw new Error(`Missing F6.1 master type: ${sql}`); return rows[0].id;
+  }
+  private async asset(q:QueryRunner,typeId:string,parentId:string|null,areaId:string|null,assetCode:string,name:string,
+    description:string,sourceReference:string,sourceNotes:string):Promise<string>{
+    const [row]=(await q.query(`INSERT INTO assets(asset_type_id,parent_id,operational_area_id,operator_company_id,inventory_family_id,
+      code,name,description,information_status,operational_status,data_origin,source_name,source_reference,source_notes,is_inventory_instance)
+      VALUES($1::uuid,$2::uuid,$3::uuid,NULL,NULL,$4,$5,$6,'VALIDATED','UNKNOWN','PROVIDED_DOCUMENT',$7,$8,$9,false) RETURNING id`,
+      [typeId,parentId,areaId,assetCode,name,description,SOURCE.file,sourceReference,sourceNotes])) as IdRow[];
+    if(!row?.id)throw new Error(`Could not seed ${name}`); return row.id;
+  }
+  private async link(q:QueryRunner,assetId:string,documentId:string,notes:string):Promise<void>{
+    await q.query(`INSERT INTO asset_source_documents(asset_id,document_id,relation_type,notes)
+      VALUES($1::uuid,$2::uuid,'SOURCE',$3)`,[assetId,documentId,notes]);
+  }
+}

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

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

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

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

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

@@ -14,6 +14,9 @@ import {
   DocumentSequenceType,
   InspectionAct,
   InspectionActStatus,
+  InspectionActUrgency,
+  InspectionDeadlineBasis,
+  InspectionDeadlineDayType,
   InspectionActVersionEvent,
   InspectionVisit,
   InspectionVisitStatus,
@@ -41,7 +44,6 @@ interface ActAsset {
 interface ActVisitSummary {
   id: string;
   code: string;
-  title: string;
   status: InspectionVisitStatus;
   actualStartedAt: Date | null;
 }
@@ -72,6 +74,17 @@ export interface InspectionActListItem {
   title: string;
   summary: string;
   observations: string | null;
+  urgency: InspectionActUrgency;
+  deadlineDays: number | null;
+  deadlineDayType: InspectionDeadlineDayType | null;
+  deadlineBasis: InspectionDeadlineBasis | null;
+  deadlineBaseAt: Date | null;
+  deadlineAt: Date | null;
+  lockedAt: Date | null;
+  lockedBy: string | null;
+  lockedSha256: string | null;
+  sealedAt: Date | null;
+  sealedBy: string | null;
   currentVersion: number;
   cancellationReason: string | null;
   closedAt: Date | null;
@@ -137,46 +150,30 @@ export class InspectionActsService {
         act.code ILIKE ${search}
         OR act.title ILIKE ${search}
         OR visit.code ILIKE ${search}
-        OR visit.title ILIKE ${search}
         OR EXISTS (
           SELECT 1
           FROM inspection_act_assets search_link
           INNER JOIN assets search_asset ON search_asset.id = search_link.asset_id
-          LEFT JOIN assets search_company ON search_company.id = search_asset.operator_company_id
-          LEFT JOIN assets search_area ON search_area.id = search_asset.operational_area_id
           WHERE search_link.act_id = act.id
             AND search_link.included = true
-            AND (
+            AND (search_asset.code ILIKE ${search} OR search_asset.name ILIKE ${search})
-              search_asset.code ILIKE ${search}
+        )
-              OR search_asset.name ILIKE ${search}
+        OR EXISTS (
-              OR search_company.name ILIKE ${search}
+          SELECT 1 FROM assets search_company
-              OR search_area.name ILIKE ${search}
+          WHERE search_company.id=visit.operator_company_id
-            )
+            AND search_company.name ILIKE ${search}
+        )
+        OR EXISTS (
+          SELECT 1 FROM assets search_area
+          WHERE search_area.id=visit.operational_area_id
+            AND search_area.name ILIKE ${search}
         )
       )`);
     }
     if (query.status) conditions.push(`act.status = ${add(query.status)}`);
     if (query.year) conditions.push(`act.act_year = ${add(query.year)}`);
-    if (query.companyId) {
+    if (query.companyId) conditions.push(`visit.operator_company_id = ${add(query.companyId)}::uuid`);
-      conditions.push(`EXISTS (
+    if (query.areaId) conditions.push(`visit.operational_area_id = ${add(query.areaId)}::uuid`);
-        SELECT 1
-        FROM inspection_act_assets company_link
-        INNER JOIN assets company_asset ON company_asset.id = company_link.asset_id
-        WHERE company_link.act_id = act.id
-          AND company_link.included = true
-          AND company_asset.operator_company_id = ${add(query.companyId)}::uuid
-      )`);
-    }
-    if (query.areaId) {
-      conditions.push(`EXISTS (
-        SELECT 1
-        FROM inspection_act_assets area_link
-        INNER JOIN assets area_asset ON area_asset.id = area_link.asset_id
-        WHERE area_link.act_id = act.id
-          AND area_link.included = true
-          AND area_asset.operational_area_id = ${add(query.areaId)}::uuid
-      )`);
-    }
     if (query.inspectorId) {
       const inspector = add(query.inspectorId);
       conditions.push(`(
@@ -233,24 +230,8 @@ export class InspectionActsService {
     }
     if (query.status) conditions.push(`act.status = ${add(query.status)}`);
     if (query.year) conditions.push(`act.act_year = ${add(query.year)}`);
-    if (query.companyId) {
+    if (query.companyId) conditions.push(`visit.operator_company_id = ${add(query.companyId)}::uuid`);
-      conditions.push(`EXISTS (
+    if (query.areaId) conditions.push(`visit.operational_area_id = ${add(query.areaId)}::uuid`);
-        SELECT 1 FROM inspection_act_assets company_link
-        INNER JOIN assets company_asset ON company_asset.id = company_link.asset_id
-        WHERE company_link.act_id = act.id
-          AND company_link.included = true
-          AND company_asset.operator_company_id = ${add(query.companyId)}::uuid
-      )`);
-    }
-    if (query.areaId) {
-      conditions.push(`EXISTS (
-        SELECT 1 FROM inspection_act_assets area_link
-        INNER JOIN assets area_asset ON area_asset.id = area_link.asset_id
-        WHERE area_link.act_id = act.id
-          AND area_link.included = true
-          AND area_asset.operational_area_id = ${add(query.areaId)}::uuid
-      )`);
-    }
     if (query.inspectorId) {
       const inspector = add(query.inspectorId);
       conditions.push(`(
@@ -313,13 +294,16 @@ export class InspectionActsService {
       const occurredAt = new Date(dto.occurredAt);
       const actYear = await this.yearAtProjectTimezone(manager, occurredAt);
       const actNumber = await this.allocateNumber(manager, actYear);
-      if (actNumber > 999999) {
+      if (actNumber > 99999) {
         throw new ConflictException({
           code: 'INSPECTION_ACT_SEQUENCE_EXHAUSTED',
           message: 'La numeración anual de actas agotó su rango disponible',
         });
       }
-      const code = `ACTA-${actYear}-${String(actNumber).padStart(6, '0')}`;
+      const [dateRow] = (await manager.query(`
+        SELECT TO_CHAR($1::timestamptz AT TIME ZONE 'America/Argentina/Mendoza', 'DD-MM-YY') AS date_part
+      `, [occurredAt])) as Array<{ date_part: string }>;
+      const code = `ACT-${String(actNumber).padStart(5, '0')}-${dateRow.date_part}`;
       const act = manager.getRepository(InspectionAct).create({
         visitId,
         actYear,
@@ -330,6 +314,17 @@ export class InspectionActsService {
         title: dto.title,
         summary: dto.summary,
         observations: dto.observations ?? null,
+        urgency: dto.urgency,
+        deadlineDays: null,
+        deadlineDayType: null,
+        deadlineBasis: null,
+        deadlineBaseAt: null,
+        deadlineAt: null,
+        lockedAt: null,
+        lockedBy: null,
+        lockedSha256: null,
+        sealedAt: null,
+        sealedBy: null,
         currentVersion: 0,
         cancellationReason: null,
         createdBy: principal.userId,
@@ -384,6 +379,7 @@ export class InspectionActsService {
       await this.assertVisitAssets(manager, visit.id, nextAssetIds);
       const before = await this.loadView(manager, id);
       if (dto.occurredAt !== undefined) act.occurredAt = nextOccurredAt;
+      if (dto.urgency !== undefined) act.urgency = dto.urgency;
       if (dto.title !== undefined) act.title = dto.title;
       if (dto.summary !== undefined) act.summary = dto.summary;
       if (dto.observations !== undefined) act.observations = dto.observations;
@@ -462,7 +458,6 @@ export class InspectionActsService {
         JSONB_BUILD_OBJECT(
           'id', visit.id,
           'code', visit.code,
-          'title', visit.title,
           'status', visit.status,
           'actualStartedAt', visit.actual_started_at
         ) AS visit,
@@ -474,6 +469,17 @@ export class InspectionActsService {
         act.title,
         act.summary,
         act.observations,
+        act.urgency,
+        act.deadline_days AS "deadlineDays",
+        act.deadline_day_type AS "deadlineDayType",
+        act.deadline_basis AS "deadlineBasis",
+        act.deadline_base_at AS "deadlineBaseAt",
+        act.deadline_at AS "deadlineAt",
+        act.locked_at AS "lockedAt",
+        act.locked_by AS "lockedBy",
+        act.locked_sha256 AS "lockedSha256",
+        act.sealed_at AS "sealedAt",
+        act.sealed_by AS "sealedBy",
         act.current_version AS "currentVersion",
         act.cancellation_reason AS "cancellationReason",
         act.closed_at AS "closedAt",
@@ -511,21 +517,16 @@ export class InspectionActsService {
       LEFT JOIN inspection_reports report ON report.act_id = act.id
       LEFT JOIN LATERAL (
         SELECT
-          COALESCE(JSONB_AGG(DISTINCT JSONB_BUILD_OBJECT(
+          CASE WHEN company.id IS NULL THEN '[]'::jsonb ELSE JSONB_BUILD_ARRAY(
-            'id', company.id,
+            JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',company.name)
-            'code', company.code,
+          ) END AS companies,
-            'name', company.name
+          CASE WHEN area.id IS NULL THEN '[]'::jsonb ELSE JSONB_BUILD_ARRAY(
-          )) FILTER (WHERE company.id IS NOT NULL), '[]'::jsonb) AS companies,
+            JSONB_BUILD_OBJECT('id',area.id,'code',area.code,'name',area.name)
-          COALESCE(JSONB_AGG(DISTINCT JSONB_BUILD_OBJECT(
+          ) END AS areas
-            'id', area.id,
+        FROM inspection_visits context_visit
-            'code', area.code,
+        LEFT JOIN assets company ON company.id=context_visit.operator_company_id
-            'name', area.name
+        LEFT JOIN assets area ON area.id=context_visit.operational_area_id
-          )) FILTER (WHERE area.id IS NOT NULL), '[]'::jsonb) AS areas
+        WHERE context_visit.id=act.visit_id
-        FROM inspection_act_assets context_link
-        INNER JOIN assets context_asset ON context_asset.id = context_link.asset_id
-        LEFT JOIN assets company ON company.id = context_asset.operator_company_id
-        LEFT JOIN assets area ON area.id = context_asset.operational_area_id
-        WHERE context_link.act_id = act.id AND context_link.included = true
       ) context ON true
       LEFT JOIN LATERAL (
         SELECT COUNT(*) AS total
@@ -645,7 +646,7 @@ export class InspectionActsService {
     if (rows.length > 0) {
       throw new ConflictException({
         code: 'INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS',
-        message: 'La inspección ya tiene un acta en borrador; preparala o cancelala antes de crear otra',
+        message: 'La inspección ya tiene un acta en borrador; finalizala o cancelala antes de crear otra',
       });
     }
   }
@@ -665,7 +666,7 @@ export class InspectionActsService {
     if (assetIds.length < 1 || Number(row?.count ?? 0) !== assetIds.length) {
       throw new BadRequestException({
         code: 'INSPECTION_ACT_ASSET_INVALID',
-        message: 'Cada activo del acta debe estar incluido en la visita',
+        message: 'Cada inventario del acta debe estar incluido en la inspección',
       });
     }
   }
@@ -758,6 +759,15 @@ export class InspectionActsService {
         'title', act.title,
         'summary', act.summary,
         'observations', act.observations,
+        'urgency', act.urgency,
+        'deadlineDays', act.deadline_days,
+        'deadlineDayType', act.deadline_day_type,
+        'deadlineBasis', act.deadline_basis,
+        'deadlineBaseAt', act.deadline_base_at,
+        'deadlineAt', act.deadline_at,
+        'lockedAt', act.locked_at,
+        'lockedSha256', act.locked_sha256,
+        'sealedAt', act.sealed_at,
         'currentVersion', act.current_version,
         'cancellationReason', act.cancellation_reason,
         'createdBy', act.created_by,
@@ -765,9 +775,10 @@ export class InspectionActsService {
         'visit', JSONB_BUILD_OBJECT(
           'id', visit.id,
           'code', visit.code,
-          'title', visit.title,
           'status', visit.status,
           'scopeAssetId', visit.scope_asset_id,
+          'operationalAreaId', visit.operational_area_id,
+          'operatorCompanyId', visit.operator_company_id,
           'actualStartedAt', visit.actual_started_at
         ),
         'assets', COALESCE((
@@ -804,6 +815,15 @@ export class InspectionActsService {
       title: act.title,
       summary: act.summary,
       observations: act.observations,
+      urgency: act.urgency,
+      deadlineDays: act.deadlineDays,
+      deadlineDayType: act.deadlineDayType,
+      deadlineBasis: act.deadlineBasis,
+      deadlineBaseAt: act.deadlineBaseAt,
+      deadlineAt: act.deadlineAt,
+      lockedAt: act.lockedAt,
+      lockedSha256: act.lockedSha256,
+      sealedAt: act.sealedAt,
       currentVersion: act.currentVersion,
       cancellationReason: act.cancellationReason,
       closedAt: act.closedAt,

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

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

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

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

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

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

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

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

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

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