chore(android): publish F6 APK artifact identity

fix(f6): separate technical and finding permissions
feat(f6): show exact classification findings in asset dossier
2026-09-09 11:12:21 -03:00 · 2026-09-09 11:09:29 -03:00 · 2026-09-09 11:06:14 -03:00 · 2026-09-09 11:04:38 -03:00 · 2026-09-09 11:04:21 -03:00 · 2026-09-09 10:58:20 -03:00
211 changed files with 1360 additions and 15838 deletions
@@ -1,36 +1,35 @@
-name: Android CI / RC
-# F6.2 field closing barrier: lint + real tests + debug artifact + release compile.
+name: Android APK
+# F6: genera una APK debug verificable contra la API productiva F6.

 on:
  push:
    branches:
      - 'main'
-      - 'release/f6-1*'
+      - 'release/f5-android-test'
+      - 'feature/f2-2*'
+      - 'feature/f2-3*'
+      - 'feature/f2-4*'
+      - 'feature/f3-1*'
+      - 'feature/f3-2*'
    paths:
      - 'android-app/**'
-      - 'api-v3/src/**'
      - '.github/workflows/android.yml'
  pull_request:
-    branches:
-      - 'main'
    paths:
      - 'android-app/**'
-      - 'api-v3/src/**'
+      - 'api-v3/src/auth/**'
+      - 'api-v3/src/inspection-visits/**'
+      - 'api-v3/src/inspection-acts/**'
      - '.github/workflows/android.yml'
  workflow_dispatch:

 permissions:
  contents: read

-concurrency:
-  group: dhv2-android-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  android:
-    name: Android · lint, tests, debug APK, release compile
+  build-debug-apk:
    runs-on: ubuntu-latest
-    timeout-minutes: 35
+    timeout-minutes: 30
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -48,104 +47,22 @@ jobs:
        run: sdkmanager 'platforms;android-36' 'build-tools;36.0.0'

      - name: Gradle 8.13
-        uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
+        uses: gradle/actions/setup-gradle@v4
        with:
          gradle-version: '8.13'

-      - name: Validate mobile security and identity contract
-        run: |
-          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: Android lint
-        working-directory: android-app
-        run: gradle --no-daemon :app:lintDebug :app:lintRelease
-
-      - 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: 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
+      - name: Assemble debug
        working-directory: android-app
        run: gradle --no-daemon :app:assembleDebug

-      - name: Compile unsigned release variant
+      - name: Unit tests
        working-directory: android-app
-        run: gradle --no-daemon :app:assembleRelease
+        run: gradle --no-daemon :app:testDebugUnitTest

-      - 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.2"
-            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
+      - name: Upload APK
        uses: actions/upload-artifact@v4
        with:
-          name: DH-Inspeccion-${{ steps.package.outputs.version }}-vc${{ steps.package.outputs.version_code }}-${{ steps.package.outputs.short_sha }}-debug
-          path: android-app/dist/*
+          name: DH-Inspeccion-F6-0.14.0-debug
+          path: android-app/app/build/outputs/apk/debug/app-debug.apk
          if-no-files-found: error
-          retention-days: 30
-
-      - name: Upload unsigned release candidate
-        uses: actions/upload-artifact@v4
-        with:
-          name: DH-Inspeccion-${{ steps.package.outputs.version }}-vc${{ steps.package.outputs.version_code }}-${{ steps.package.outputs.short_sha }}-UNSIGNED
-          path: android-app/app/build/outputs/apk/release/app-release-unsigned.apk
-          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
+          retention-days: 30
@@ -69,7 +69,7 @@ jobs:
          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
+      - name: Rehearse migrations on clean PostGIS
        run: |
          set -Eeuo pipefail
          cleanup() {
@@ -116,10 +116,9 @@ jobs:

          docker compose --env-file .env.example --profile tools run --rm migrate

-          # The completed chain must end in the exact authoritative SQL model:
-          # 7 Departamentos, 64 Áreas, 230 Yacimientos, 13 Empresas, 2 Tipos de
-          # concesión, 14/109 technical families, 181 Hallazgos and their exact
-          # 48 + 880 contextual mappings.
+          # F5.1 intentionally ends with zero operational/domain instances. The
+          # technical family and finding masters remain, but territory preload,
+          # imports, applicability links and old audits are deliberately gone.
          docker compose --env-file .env.example exec -T db \
            psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
          DO $$
@@ -128,23 +127,12 @@ jobs:
            domain_assets integer;
            audits integer;
            applicability integer;
-            legacy_territory_sources integer;
-            legacy_presentation_sources integer;
-            authoritative_sources integer;
+            territory_sources integer;
            source_installations integer;
            source_subinstallations integer;
            source_findings integer;
-            concession_types integer;
-            departments integer;
-            areas integer;
-            yacimientos integer;
-            companies integer;
-            invalid_yacimientos integer;
            department_types integer;
            area_department_rules integer;
-            yacimiento_area_rules integer;
-            installation_yacimiento_rules integer;
-            subinstallation_installation_rules integer;
          BEGIN
            SELECT COUNT(*) INTO f5_migrations
            FROM typeorm_migrations
@@ -161,86 +149,42 @@ jobs:
            END IF;

            SELECT COUNT(*) INTO domain_assets FROM assets;
-            IF domain_assets <> 314 THEN
-              RAISE EXCEPTION 'Authoritative model must contain 314 Assets, got %', domain_assets;
+            IF domain_assets <> 0 THEN
+              RAISE EXCEPTION 'F5.1 clean start must contain 0 Assets, got %', domain_assets;
            END IF;

            SELECT COUNT(*) INTO audits FROM audit_events;
            IF audits <> 0 THEN
-              RAISE EXCEPTION 'Clean authoritative rehearsal must start with 0 audit events, got %', audits;
+              RAISE EXCEPTION 'F5.1 clean start must contain 0 audit events, got %', audits;
            END IF;

            SELECT COUNT(*) INTO applicability FROM finding_catalog_item_inventory_families;
-            IF applicability <> 928 THEN
-              RAISE EXCEPTION 'Authoritative model must contain 928 finding applicability links, got %', applicability;
+            IF applicability <> 0 THEN
+              RAISE EXCEPTION 'F5.1 clean start must contain 0 finding applicability links, got %', applicability;
            END IF;

-            SELECT COUNT(*) INTO legacy_territory_sources
+            SELECT COUNT(*) INTO territory_sources
            FROM source_documents
            WHERE document_number='DH-F5-TERRITORY';
-            IF legacy_territory_sources <> 0 THEN
-              RAISE EXCEPTION 'Authoritative model must remove the old F5 territory source, got % rows', legacy_territory_sources;
-            END IF;
-
-            SELECT COUNT(*) INTO legacy_presentation_sources
-            FROM source_documents
-            WHERE document_number='DH-F6.1-PRESENTATION-TERRITORY-20260909';
-            IF legacy_presentation_sources <> 0 THEN
-              RAISE EXCEPTION 'Authoritative model must remove the F6.1 presentation source, got % rows', legacy_presentation_sources;
-            END IF;
-
-            SELECT COUNT(*) INTO authoritative_sources
-            FROM source_documents
-            WHERE document_number IN ('DH-AUTH-TERRITORY-20260911','DH-AUTH-INVENTORY-20260911');
-            IF authoritative_sources <> 2 THEN
-              RAISE EXCEPTION 'Authoritative model must contain its two SQL source documents, got %', authoritative_sources;
+            IF territory_sources <> 0 THEN
+              RAISE EXCEPTION 'F5.1 must remove the old territory source preload, got % rows', territory_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 'modelo_relacional:%';
+            WHERE is_active=true AND source_reference LIKE 'F5:final_modelov2.xlsx%';
            IF source_installations <> 14 OR source_subinstallations <> 109 THEN
-              RAISE EXCEPTION 'Authoritative technical families must be 14 installations and 109 subinstallations, got % and %', source_installations,source_subinstallations;
+              RAISE EXCEPTION 'F5.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)='authmodel' AND item.is_active=true;
-            IF source_findings <> 181 THEN
-              RAISE EXCEPTION 'Authoritative finding catalog must contain 181 items, got %', source_findings;
-            END IF;
-
-            SELECT COUNT(*) INTO concession_types FROM concession_types WHERE is_active=true;
-            IF concession_types <> 2 THEN
-              RAISE EXCEPTION 'Authoritative model must contain 2 concession types, got %', concession_types;
-            END IF;
-
-            SELECT COUNT(*) FILTER (WHERE lower(type.code)='departamento'),
-                   COUNT(*) FILTER (WHERE lower(type.code)='area'),
-                   COUNT(*) FILTER (WHERE lower(type.code)='yacimiento'),
-                   COUNT(*) FILTER (WHERE type.operational_role='COMPANY')
-            INTO departments,areas,yacimientos,companies
-            FROM assets asset
-            JOIN asset_types type ON type.id=asset.asset_type_id;
-            IF departments <> 7 OR areas <> 64 OR yacimientos <> 230 OR companies <> 13 THEN
-              RAISE EXCEPTION 'Authoritative territory mismatch: departments %, areas %, yacimientos %, companies %', departments,areas,yacimientos,companies;
-            END IF;
-
-            SELECT COUNT(*) INTO invalid_yacimientos
-            FROM assets yacimiento
-            JOIN asset_types type ON type.id=yacimiento.asset_type_id
-            JOIN assets area ON area.id=yacimiento.parent_id
-            WHERE lower(type.code)='yacimiento'
-              AND (
-                yacimiento.operational_area_id IS DISTINCT FROM area.id
-                OR yacimiento.operator_company_id IS NULL
-                OR yacimiento.concession_type_id IS NULL
-              );
-            IF invalid_yacimientos <> 0 THEN
-              RAISE EXCEPTION 'Authoritative model contains % invalid Yacimiento relationships', invalid_yacimientos;
+            WHERE lower(category.code)='f5model' AND item.is_active=true;
+            IF source_findings <> 177 THEN
+              RAISE EXCEPTION 'F5.1 must preserve finding master catalog, got %', source_findings;
            END IF;

            SELECT COUNT(*) INTO department_types
@@ -258,81 +202,21 @@ jobs:
            IF area_department_rules <> 1 THEN
              RAISE EXCEPTION 'Expected Area → Departamento canonical rule, got %', area_department_rules;
            END IF;
-
-            SELECT COUNT(*) INTO yacimiento_area_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)='yacimiento' AND lower(parent.code)='area';
-            IF yacimiento_area_rules <> 1 THEN
-              RAISE EXCEPTION 'Expected Yacimiento → Área canonical rule, got %', yacimiento_area_rules;
-            END IF;
-
-            SELECT COUNT(*) INTO installation_yacimiento_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)='instalacion' AND lower(parent.code)='yacimiento';
-            IF installation_yacimiento_rules <> 1 THEN
-              RAISE EXCEPTION 'Expected Instalación → Yacimiento canonical rule, got %', installation_yacimiento_rules;
-            END IF;
-
-            SELECT COUNT(*) INTO subinstallation_installation_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)='subinstalacion' AND lower(parent.code)='instalacion';
-            IF subinstallation_installation_rules <> 1 THEN
-              RAISE EXCEPTION 'Expected Subinstalación → Instalación canonical rule, got %', subinstallation_installation_rules;
-            END IF;
          END $$;
          SQL

-          # 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.
+          # F5.1 is intentionally one-way: production rollback is the PRE database
+          # backup, not migration:revert. Prove instead that 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: authoritative migration chain is not idempotent." >&2
+            echo "ERROR: F5.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
-
-          # In containerized runners (Gitea DinD), 127.0.0.1 of the job
-          # is not the Docker daemon host. Probe the production API from
-          # inside its own container so this barrier works on GitHub and Gitea.
-          api_ready=0
-          for _ in $(seq 1 30); do
-            if docker compose --env-file .env.example exec -T api \
-              node -e 'fetch(`http://127.0.0.1:${process.env.API_PORT}/api/v3/health`).then(async r => { const t = await r.text(); process.stdout.write(t); if (!r.ok) process.exit(1); }).catch(() => process.exit(1))' \
-              >/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
+      - name: VPS-equivalent isolated API preflight
        run: |
          set -Eeuo pipefail
          image="dhv2-api:ci-vps-preflight-${GITHUB_SHA::12}"
@@ -1,26 +0,0 @@
-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
@@ -1,48 +0,0 @@
-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
@@ -2,30 +2,9 @@

 Repositorio del sistema DH Inspección V2.

-## Componentes
+## Estructura

- `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.
-
-## Documentación vigente
-
- [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)
-
-## Contratos que no deben romperse
-
- 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.
-
-Las reglas detalladas, el procedimiento de cambio seguro y el recorrido de demo están en los documentos enlazados arriba.
+- `api-v3/`: API v3.
+- `web-v2/`: aplicación web.
+- `scripts/`: utilidades operativas y de despliegue.
+- `docs/`: documentación técnica.
@@ -1,11 +0,0 @@
-# F6.4 · Android Campo Moderno
-
-Criterios de aceptación:
-
- el buscador de Instalación padre consulta mientras se escribe y cada resultado se puede seleccionar directamente;
- la selección de Instalación abre la clasificación compatible de Subinstalación;
- Actas utiliza un read-model móvil desacoplado del módulo documental de oficina;
- la APK conserva GPS + foto antes de habilitar Hallazgos sobre Inventario nacido en campo;
- el lifecycle Acta DRAFT → LOCKED → SEALED no cambia;
- la interfaz de campo usa el tema DH moderno y mantiene acceso claro a Actas, Inventario y Hallazgos;
- Android lint/tests/debug/release, API tests/build, WEB build y Docker contract deben quedar verdes.
@@ -1,20 +0,0 @@
-# Checklist final Android 0.19.3
-
-La candidata sólo se promueve si el mismo SHA cumple:
-
- iniciar Inspección;
- crear/abrir Acta sin pedir urgencia ni Inventario;
- entrar a **Agregar Hallazgo** y recién allí seleccionar o crear Instalación/Subinstalación;
- exigir GPS + fotografía para Inventario nacido en campo antes de Hallazgos;
- registrar Hallazgos sobre el elemento seleccionado;
- al cerrar el contenido, exigir Urgente/No urgente, persistir esa decisión y mostrar **Pendiente de firma**;
- exigir por cada Acta los datos del **Representante de la empresa**: nombres y apellidos, DNI, cargo/función y email;
- permitir precargar esos datos desde el Acta anterior de la misma Inspección, pero exigir confirmación y firma nueva en cada Acta;
- resolver por Acta **firma en conformidad**, **firma en disconformidad con motivo** o **negativa a firmar con motivo**;
- verificar que la urgencia existe sólo a nivel **Acta** y nunca a nivel Hallazgo;
- completar firma del Inspector y manifestación/firma o negativa de la empresa;
- mostrar el Acta como **Firmada y cerrada**;
- permitir cerrar la Inspección sólo con todas las Actas activas firmadas y cerradas;
- no mostrar **Inventario de campo** como acción paralela de la Inspección;
- no exponer estados internos en inglés en la interfaz de campo;
- Android CI / RC, DH V2 CI y auditoría de dependencias en verde.
@@ -1,128 +0,0 @@
-# DH Inspección Android · release final de campo 0.19.3
-
-## Candidata vigente
-
- Fase funcional: **Flujo final de campo · Inspección → Acta → Hallazgos → Firma**.
- `versionName`: **0.19.3**.
- `versionCode`: **31**.
- Application ID release: `com.korexlabs.dhinspeccion`.
- Application ID debug/QA: `com.korexlabs.dhinspeccion.debug`.
- API: `https://dhv2.korexlabs.com/api/v3/`.
- Servidor compatible de esta candidata: **API 0.29.0-4 / WEB 0.23.0-3**.
-
-La variante debug es independiente de la app productiva y puede instalarse para QA/presentación sin sobrescribir una instalación release histórica.
-
-## Procedimiento operativo validado
-
-La APK 0.19.3 fija como recorrido principal de campo:
-
-1. **Iniciar Inspección**. Al iniciarla se habilita el circuito de **Actas y Hallazgos**; Inventario no es una acción independiente de la Inspección.
-2. **Crear o abrir un Acta**. Puede haber varias Actas dentro de una misma Inspección, pero sólo una puede permanecer en elaboración al mismo tiempo. La urgencia todavía no se define.
-3. **Agregar Hallazgos**. Recién desde esta acción se selecciona la Instalación/Subinstalación afectada.
-4. Si el elemento ya existe, se lo selecciona desde el Inventario del Área/Yacimiento de la Inspección.
-5. Si no existe, se da de alta desde campo sin abandonar el Acta.
-6. Un elemento nuevo debe completar **GPS + fotografía** antes de poder recibir Hallazgos.
-7. Antes del cierre se identifican, para esa Acta, los datos del **Representante de la empresa** que acompañó el recorrido: nombres y apellidos, DNI, cargo/función y email. Si coincide con el Acta anterior, la APK puede precargarlos, pero deben confirmarse nuevamente.
-8. Al terminar el contenido del Acta se elige **Urgente / No urgente** y luego se usa **Cerrar Acta y dejar pendiente de firma**. La urgencia pertenece al Acta completa, nunca a cada Hallazgo; desde ese momento el contenido queda inmutable y el estado visible es **Pendiente de firma**.
-9. La firma del Inspector y la manifestación del representante completan el Acta: **conformidad**, **disconformidad con motivo obligatorio** o **negativa a firmar con motivo obligatorio**. La firma se registra Acta por Acta aunque sea la misma persona.
-10. La Inspección sólo puede cerrarse cuando todas sus Actas no canceladas están firmadas y cerradas.
-
-La nomenclatura técnica interna de API (`DRAFT`, `LOCKED`, `SEALED`, etc.) no se muestra al inspector: la interfaz usa textos operativos en castellano.
-
-## Alta de Instalaciones y Subinstalaciones
-
-El alta móvil queda alineada con el Dashboard y con las validaciones del servidor.
-
-### Instalación
-
- contexto territorial: Yacimiento/Área de la Inspección;
- clasificación técnica compatible;
- **Nombre técnico** obligatorio;
- Nombre habitual opcional;
- Descripción opcional;
- atributos técnicos definidos por el tipo; sólo los marcados como obligatorios bloquean el guardado;
- código DH generado por el sistema cuando corresponde;
- GPS de la tablet;
- fotografía obligatoria antes de crear Hallazgos.
-
-### Subinstalación
-
-Además de lo anterior requiere elegir primero la **Instalación padre**. El buscador consulta mientras se escribe y cada resultado es seleccionable tocando la tarjeta.
-
-La clasificación y los atributos se obtienen dinámicamente desde el mismo catálogo administrado por el Dashboard; la APK no mantiene listas técnicas paralelas.
-
-## Actas y firma
-
-La terminología visible se simplifica:
-
- `DRAFT` → **En elaboración**;
- `LOCKED` → **Pendiente de firma**;
- `SEALED` → **Firmada y cerrada**.
-
-Cerrar el contenido no cierra automáticamente la Inspección y tampoco obliga a terminar la firma en ese instante: puede continuarse con otra Acta. La urgencia se decide en ese cierre, nunca al crear el borrador. Una vez cerrado el contenido, el Acta es inmutable.
-
-Después de la firma/cierre definitivo se mantiene el circuito documental existente: PDF del Acta e informe INF editable (DOCX) para oficina.
-
-## Castellano e identidad visual
-
-Se revisaron las pantallas activas de campo para evitar exponer estados y opciones internas en inglés. Entre otros cambios: Pasaporte/Otro en documentos, estados de Inspección/Acta/Hallazgo en castellano, Correo electrónico, Huella de integridad y terminología de cierre orientada al usuario.
-
-La pantalla de ingreso y el desbloqueo biométrico utilizan la identidad visual de Mendoza ya incorporada al proyecto.
-
-## 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. pruebas unitarias 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.
-
-Además, `DH V2 CI` debe mantener verdes API, WEB y contrato Docker/migraciones antes de promover cambios que afecten al servidor.
-
-## Firma release
-
-La clave histórica de firma **no se versiona ni se reemplaza**. La CI compila la variante release para detectar roturas, pero una APK productiva que deba actualizar `com.korexlabs.dhinspeccion` tiene que firmarse con la clave histórica.
-
-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 si se distribuirá como actualización productiva;
- realizar actualización sobre al menos una tablet con la versión productiva anterior cuando corresponda;
- ejecutar smoke funcional: ingreso, iniciar Inspección, crear Acta, seleccionar/crear Instalación o Subinstalación, GPS/foto, Hallazgo, cerrar Acta → Pendiente de firma, firma/manifestación, cierre de Acta y cierre de Inspección;
- registrar el SHA Git y SHA-256 de la APK distribuida.
-
-## Revisión 0.19.1
-
- Renovación de sesión coordinada entre los cuatro clientes API; no cierra sesión por pérdida de red, HTTP 429/500 o cancelación.
- Una respuesta tardía no puede restaurar una sesión cerrada ni usar la de otro inspector.
- Guardia de escrituras contra doble toque y conteo correcto de operaciones pendientes.
- Búsquedas descartan respuestas antiguas. Cambio de inspección limpia el Acta anterior.
- Mensajes visibles de permisos/GPS en evidencia y respeto de barras de sistema/teclado.
- Diez nuevas pruebas de comportamiento sobre sesión y concurrencia.
-
-### Alcance real
-
-Esta candidata requiere conexión. No implementa trabajo offline ni cola persistente de sincronización; un fallo de red no equivale a guardado. Tras un timeout de escritura debe verificarse el registro antes de repetir. No se presenta el artefacto debug como una release productiva. La firma histórica y el smoke en tablet siguen siendo requisitos para distribuir la release final.
-
-### Segunda pasada funcional
-
- Coordenadas normalizadas al contrato API (6 decimales, precisión 3).
- Yacimiento seleccionable para Hallazgos y como padre explícito de nuevas Instalaciones. Se elimina el fallback que podía presentar un tipo Yacimiento como alta de Instalación.
- Formulario Datos técnicos sobre el elemento seleccionado: carga y guarda las definiciones/valores por familia mediante los endpoints existentes del Dashboard; valida obligatorios, números, Sí/No, fechas y opciones. Es un paso separado del alta estructural y GPS/foto.
- Se agregan siete pruebas para coordenadas y valores técnicos.
-
-
-## Revisión 0.19.3 · flujo conceptual corregido
-
- Se elimina **Inventario de campo** como acción independiente de la pantalla de Inspección.
- El alta o selección de Inventario existe únicamente dentro de **Agregar Hallazgo**.
- El borrador de Acta nace vacío, sin Inventario y sin urgencia predeterminada.
- La urgencia se exige al cerrar el Acta y se persiste en la misma operación que la vuelve inmutable.
- `inspection_acts.urgency` puede quedar pendiente durante el borrador; el bloqueo exige la decisión y calcula el vencimiento desde allí.
@@ -1,49 +0,0 @@
-# DH Android 0.19.1 · revisión de candidata
-
-## Idea funcional verificada contra código y API
-
-La app es la herramienta del inspector en campo. Oficina administra territorio, operadoras, clasificaciones, campos y catálogo; la APK consulta esas fuentes. Una Inspección contiene varias Actas, con una sola en elaboración simultánea. El Hallazgo pertenece al Acta y al elemento seleccionado. Cerrar contenido lo deja inmutable y pendiente de firma. Firma del inspector y manifestación/firma o negativa de empresa permiten sellar el Acta. La Inspección exige todas sus Actas activas selladas.
-
-Yacimiento, Instalación y Subinstalación son destinos de Hallazgos. Una Instalación nueva debe crearse dentro de un Yacimiento y una Subinstalación dentro de una Instalación compatible. El inventario nacido en campo necesita GPS y foto antes del Hallazgo.
-
-## Hallazgos corregidos
-
-| Problema observado | Corrección |
-| --- | --- |
-| Cuatro clientes renovaban por separado la misma sesión | Coordinador compartido; protege rotación, logout y cambio de usuario |
-| Cortes de red durante refresh borraban la sesión | Sólo una respuesta 401 de la sesión vigente la invalida |
-| Operaciones solapadas liberaban ocupado antes de terminar | Conteo de pendientes y rechazo del segundo guardado |
-| Respuestas de búsquedas antiguas sobrescribían resultados recientes | Generación de búsqueda y verificación del ID de inspección |
-| Un Acta anterior podía persistir al cambiar de inspección | Limpieza de estado de Acta al abrir otra inspección |
-| Coordenadas crudas excedían decimales admitidos | Normalización 6 decimales para coordenadas y 3 para precisión |
-| Inventario móvil ocultaba Yacimientos | Selección para Hallazgos y alta de Instalación dentro de Yacimiento |
-| Alta de Instalación podía adoptar otro tipo por fallback | Eliminado; pide elegir el Yacimiento padre correcto |
-| Datos técnicos por familia no estaban editables | Formulario conectado a technical-values; mismos campos de oficina |
-| Fallos de GPS/permisos en evidencia sin mensaje | Error visible y accionable |
-| Barras del sistema/teclado podían tapar controles | Insets de sistema y teclado en la raíz |
-
-## Evidencia automática
-
-25 pruebas Android: 8 contratos existentes y 17 pruebas nuevas de comportamiento (sesión 7, concurrencia 3, GPS 3, campos técnicos 4). Lint debug/release y compilación debug/release en workflow Android. CI general comprueba API, WEB, scripts y migraciones; la auditoría de dependencias se ejecuta separadamente. Consultar las ejecuciones del SHA de la entrega, no sólo un resultado anterior.
-
-## Límites de esta candidata
-
- Requiere conexión. No existe cola persistente offline ni resolución de conflictos sin señal.
- Un timeout de escritura puede ocurrir después de guardar en servidor. Revisar el registro antes de repetir; no se afirma idempotencia general de todas las escrituras.
- Los datos técnicos por familia se completan en un paso separado tras seleccionar/crear el elemento. GPS/foto continúa siendo la barrera de Hallazgos del servidor.
- No se ejecutó aceptación en tablet física: quedan por comprobar cámara, GPS, biometría, rotación/recreación de actividad, firmas y actualización sobre la APK instalada.
- La release compila sin firma. Se requiere la clave histórica y su certificado de referencia para distribuir una actualización productiva. No crear otra clave como sustituto.
- La candidata debug usa com.korexlabs.dhinspeccion.debug y no reemplaza la app productiva. La compatibilidad con una debug anterior depende también de su certificado; no desinstalar una app con información pendiente sin revisar antes.
-
-## Recorrido de aceptación en tablet
-
-1. Ingresar con inspector y cargar inspecciones asignadas.
-2. Iniciar una inspección, crear Acta, seleccionar Yacimiento/Instalación/Subinstalación.
-3. Crear Instalación bajo Yacimiento y Subinstalación compatible; probar GPS permitido/denegado y foto tomada/cancelada.
-4. Completar campos técnicos requeridos, incluyendo No booleano, decimal con coma, fecha y opción de lista; volver a abrir para comprobar persistencia.
-5. Crear Hallazgo catalogado y OTROS, adjuntar evidencia.
-6. Cerrar contenido, comprobar inmutabilidad y estado Pendiente de firma.
-7. Registrar firmas o negativa de empresa; sellar Acta.
-8. Crear otra Acta, comprobar que una pendiente impide cerrar la Inspección; completar y cerrar.
-9. Cortar conexión y recuperarla: errores visibles, sin pérdida de sesión por red ni falso aviso de guardado.
-10. Verificar en Dashboard los mismos registros y documentos.
@@ -12,8 +12,8 @@ android {
        applicationId = "com.korexlabs.dhinspeccion"
        minSdk = 26
        targetSdk = 36
-        versionCode = 31
-        versionName = "0.19.3"
+        versionCode = 21
+        versionName = "0.14.0"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
@@ -77,4 +77,4 @@ dependencies {
    testImplementation("junit:junit:4.13.2")
    androidTestImplementation("androidx.test.ext:junit:1.2.1")
    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-}
+}
@@ -3,14 +3,11 @@
    <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_exact"
-        android:roundIcon="@drawable/ic_mendoza_launcher_exact"
        android:label="@string/app_name"
        android:supportsRtl="true"
        android:theme="@style/Theme.DHInspeccion"
@@ -6,7 +6,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
-import com.korexlabs.dhinspeccion.data.FieldCoordinates
 import com.korexlabs.dhinspeccion.data.CreateFieldFindingRequest
 import com.korexlabs.dhinspeccion.data.CreateFieldInventoryRequest
 import com.korexlabs.dhinspeccion.data.DhRepository
@@ -25,14 +24,11 @@ import com.korexlabs.dhinspeccion.data.MobileResponsibleRequest
 import com.korexlabs.dhinspeccion.data.StoredSession
 import com.korexlabs.dhinspeccion.data.VisitDetail
 import com.korexlabs.dhinspeccion.data.VisitSummary
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.launch
 import java.io.File
 import java.time.Instant

 class MainViewModel(application: Application) : AndroidViewModel(application) {
-    private val operations = OperationTracker()
-    private var inventorySearchGeneration = 0
    private val repository = DhRepository(application)
    private val findingsRepository = FieldFindingsRepository(application)
    private val actsRepository = MobileActsRepository(application)
@@ -88,7 +84,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
            error = "Ingresá usuario y contraseña."
            return
        }
-        launchBusy(mutation = true) {
+        launchBusy {
            session = repository.login(identifier, password)
            notice = "Sesión iniciada."
            loadVisitsInternal()
@@ -117,11 +113,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
    }

    fun openVisit(id: String) = launchBusy {
-        val loadedVisit = repository.visit(id)
-        clearActState()
-        visit = loadedVisit
+        visit = repository.visit(id)
        inventory = emptyList()
-        inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
+        inventoryParentId = visit?.operationalArea?.id
        fieldTypes = emptyList()
        selectedFieldAsset = null
        clearFindingState()
@@ -129,8 +123,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
    }

    fun closeVisitView() {
-        if (busy) return
-        inventorySearchGeneration += 1
        visit = null
        inventory = emptyList()
        inventoryParentId = null
@@ -143,9 +135,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {

    fun startVisit() {
        val id = visit?.id ?: return
-        launchBusy(mutation = true) {
+        launchBusy {
            visit = repository.startVisit(id)
-            inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
+            inventoryParentId = visit?.operationalArea?.id
            notice = "Inspección iniciada."
            loadActsInternal(id, selectDraft = true)
            loadVisitsInternal()
@@ -165,39 +157,55 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        }
    }

-    fun createAct() {
+    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 (acts.any { it.status == "DRAFT" }) {
-            error = "Ya existe un Acta en elaboración. Cerrala o cancelala antes de crear la siguiente."
+        if (urgency !in setOf("URGENT", "NON_URGENT")) {
+            error = "Elegí si el Acta es urgente o no urgente."
            return
        }
-        launchBusy(mutation = true) {
-            val created = actsRepository.create(currentVisit.id, currentVisit.code)
+        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)
-            notice = "${created.code} creada. La urgencia se define recién al cerrar el Acta; los Hallazgos se agregan desde su propio flujo."
+            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
-        val generation = ++inventorySearchGeneration
        launchBusy {
-            val result = repository.fieldInventory(currentVisit.id, search, parentId).data
-            if (generation == inventorySearchGeneration && visit?.id == currentVisit.id) inventory = result
+            val effectiveParentId = parentId ?: inventoryParentId ?: currentVisit.operationalArea?.id
+            inventory = repository.fieldInventory(currentVisit.id, search, effectiveParentId).data
        }
    }

    fun loadFieldTypes(parentId: String? = null) {
        val currentVisit = visit ?: return
        launchBusy {
-            val effectiveParentId = parentId ?: currentVisit.scopeAsset?.id ?: currentVisit.operationalArea?.id
-            inventorySearchGeneration += 1
+            val effectiveParentId = parentId ?: currentVisit.operationalArea?.id
            inventoryParentId = effectiveParentId
            fieldTypes = repository.fieldTypes(currentVisit.id, parentId).data
            inventory = repository.fieldInventory(currentVisit.id, null, effectiveParentId).data
@@ -205,13 +213,13 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
    }

    private suspend fun reloadCurrentInventory(visitId: String) {
-        val effectiveParentId = inventoryParentId ?: visit?.scopeAsset?.id ?: visit?.operationalArea?.id
+        val effectiveParentId = inventoryParentId ?: visit?.operationalArea?.id
        inventory = repository.fieldInventory(visitId, null, effectiveParentId).data
    }

    fun selectExisting(item: FieldInventoryItem) {
        val visitId = visit?.id ?: return
-        launchBusy(mutation = true) {
+        launchBusy {
            selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
            notice = "Inventario agregado a la Inspección."
            reloadCurrentInventory(visitId)
@@ -236,7 +244,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        latitude: Double,
        longitude: Double,
        accuracyM: Double?,
-        description: String? = null,
    ) {
        val visitId = visit?.id ?: return
        if (visit?.status != "IN_PROGRESS") {
@@ -247,18 +254,17 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
            error = "Elegí una clasificación técnica o la opción Otro / no catalogado."
            return
        }
-        launchBusy(mutation = true) {
+        launchBusy {
            val request = CreateFieldInventoryRequest(
                typeId = type.id,
                parentId = parentId,
                familyId = familyId,
                name = name.trim(),
                commonName = commonName?.trim()?.takeIf { it.isNotBlank() },
-                description = description?.trim()?.takeIf { it.isNotBlank() },
                attributes = attributes,
-                deviceLatitude = FieldCoordinates.latitude(latitude),
-                deviceLongitude = FieldCoordinates.longitude(longitude),
-                deviceAccuracyM = accuracyM?.let(FieldCoordinates::accuracy),
+                deviceLatitude = latitude,
+                deviceLongitude = longitude,
+                deviceAccuracyM = accuracyM,
                deviceCapturedAt = Instant.now().toString(),
            )
            selectedFieldAsset = repository.createFieldAsset(visitId, request)
@@ -278,7 +284,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
            error = "Explicá brevemente por qué se trata de un duplicado."
            return
        }
-        launchBusy(mutation = true) {
+        launchBusy {
            val result = repository.mergeFieldAsset(
                visitId = visitId,
                assetId = source.id,
@@ -305,7 +311,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
    ) {
        val visitId = visit?.id ?: return
        val asset = selectedFieldAsset?.asset ?: return
-        launchBusy(mutation = true) {
+        launchBusy {
            val response = repository.uploadFieldPhoto(
                visitId = visitId,
                assetId = asset.id,
@@ -337,10 +343,10 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        val assetId = selectedFieldAsset?.asset?.id ?: return
        val draft = selectedDraftAct()
        if (draft == null) {
-            error = "Creá o seleccioná el Acta en elaboración antes de registrar Hallazgos."
+            error = "Creá o seleccioná el Acta en borrador antes de registrar Hallazgos."
            return
        }
-        launchBusy(mutation = true) {
+        launchBusy {
            selectedAct = actsRepository.ensureAsset(draft.id, assetId)
            loadActsInternal(visitId, selectDraft = false)
            loadFindingOptionsInternal(visitId, assetId, draft.id)
@@ -359,7 +365,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        val assetId = selectedFieldAsset?.asset?.id ?: return
        val actId = selectedDraftAct()?.id
        if (actId == null) {
-            error = "No hay un Acta en elaboración seleccionada."
+            error = "No hay un Acta en borrador seleccionada."
            return
        }
        if (description.isBlank()) {
@@ -374,7 +380,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
            error = "La gravedad debe estar entre 1 y 10."
            return
        }
-        launchBusy(mutation = true) {
+        launchBusy {
            selectedAct = actsRepository.ensureAsset(actId, assetId)
            val response = findingsRepository.create(
                visitId,
@@ -405,7 +411,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        title: String? = null,
        description: String? = null,
    ) {
-        launchBusy(mutation = true) {
+        launchBusy {
            findingsRepository.uploadObservationPhoto(
                findingId = findingId,
                file = file,
@@ -433,13 +439,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        phone: String?,
    ) {
        val actId = selectedAct?.id ?: return
-        val normalizedEmail = email?.trim().orEmpty()
-        val emailValid = Regex("""^[^\s@]+@[^\s@]+\.[^\s@]+$""").matches(normalizedEmail)
-        if (fullName.isBlank() || documentNumber.isBlank() || position.isBlank() || !emailValid) {
-            error = "Completá nombres y apellidos, DNI, cargo/función y un email válido del representante de la empresa."
+        if (fullName.isBlank() || documentNumber.isBlank() || position.isBlank()) {
+            error = "Completá nombre, documento y cargo del responsable de la empresa."
            return
        }
-        launchBusy(mutation = true) {
+        launchBusy {
            actClosure = actsRepository.setResponsible(
                actId,
                MobileResponsibleRequest(
@@ -448,11 +452,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                    documentType = documentType,
                    documentNumber = documentNumber.trim(),
                    position = position.trim(),
-                    email = normalizedEmail.lowercase(),
+                    email = email?.trim()?.takeIf { it.isNotBlank() },
                    phone = phone?.trim()?.takeIf { it.isNotBlank() },
                ),
            )
-            notice = "Representante de la empresa registrado para esta Acta."
+            notice = "Responsable de empresa registrado para el Acta."
        }
    }

@@ -462,7 +466,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
            error = "Indicá un motivo de ausencia de al menos 10 caracteres."
            return
        }
-        launchBusy(mutation = true) {
+        launchBusy {
            actClosure = actsRepository.setResponsible(
                actId,
                MobileResponsibleRequest(
@@ -470,26 +474,21 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                    absenceReason = reason.trim(),
                ),
            )
-            notice = "Ausencia del representante registrada. La manifestación de la empresa deberá resolverse antes de firmar y cerrar el Acta."
+            notice = "Ausencia del responsable registrada. La manifestación de empresa quedará pendiente y deberá resolverse antes de sellar el Acta."
        }
    }

-    fun prepareSelectedAct(urgency: String) {
+    fun prepareSelectedAct() {
        val actId = selectedAct?.id ?: return
-        if (urgency !in setOf("URGENT", "NON_URGENT")) {
-            error = "Definí la urgencia antes de cerrar el Acta."
-            return
-        }
-        launchBusy(mutation = true) {
-            actClosure = actsRepository.lock(actId, urgency)
+        launchBusy {
+            actClosure = actsRepository.lock(actId)
            refreshSelectedActInternal(actId)
-            val urgencyLabel = if (urgency == "URGENT") "urgente" else "no urgente"
-            notice = "Acta cerrada como $urgencyLabel. La urgencia quedó definida sobre el Acta y su contenido quedó inmutable, pendiente de firmas."
+            notice = "Acta bloqueada. Su contenido quedó inmutable; ahora deben resolverse las firmas y manifestaciones."
        }
    }

    fun reopenSelectedAct() {
-        error = "Un Acta pendiente de firma es inmutable y no puede volver a edición."
+        error = "Un Acta bloqueada es inmutable y no puede volver a borrador."
    }

    fun signSelectedActAsInspector(
@@ -499,7 +498,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        accuracyM: Double?,
    ) {
        val actId = selectedAct?.id ?: return
-        launchBusy(mutation = true) {
+        launchBusy {
            actClosure = actsRepository.signInspector(actId, png, latitude, longitude, accuracyM)
            notice = "Firma del inspector incorporada al Acta."
        }
@@ -514,14 +513,14 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        statement: String?,
    ) {
        val actId = selectedAct?.id ?: return
-        launchBusy(mutation = true) {
+        launchBusy {
            actClosure = actsRepository.signCompany(
                actId, png, latitude, longitude, accuracyM, manifestation, statement,
            )
            notice = if (manifestation == "DISSENT") {
-                "Firma del representante registrada en disconformidad."
+                "Firma de empresa registrada con disidencia."
            } else {
-                "Firma del representante de la empresa registrada."
+                "Firma de empresa registrada."
            }
        }
    }
@@ -536,7 +535,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
            error = "Indicá un motivo de al menos 10 caracteres."
            return
        }
-        launchBusy(mutation = true) {
+        launchBusy {
            actClosure = actsRepository.companyOutcome(actId, status, reason)
            notice = "Negativa a firmar asentada."
        }
@@ -545,21 +544,21 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
    fun closeSelectedAct() {
        val currentVisit = visit ?: return
        val actId = selectedAct?.id ?: return
-        launchBusy(mutation = true) {
+        launchBusy {
            actClosure = actsRepository.seal(actId)
            refreshSelectedActInternal(actId)
            loadActsInternal(currentVisit.id, selectDraft = false)
            clearFindingState()
-            notice = "${selectedAct?.code ?: "Acta"} firmada y cerrada. Podés crear otra Acta o continuar hacia el cierre de la Inspección."
+            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(mutation = true) {
+        launchBusy {
            visit = actsRepository.closeVisit(visitId)
            loadVisitsInternal()
-            notice = "Inspección cerrada. Todas sus Actas quedaron firmadas y disponibles para el circuito de oficina."
+            notice = "Inspección cerrada. Todas sus Actas quedaron SELLADAS y disponibles para el circuito de oficina."
        }
    }

@@ -639,21 +638,17 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        fieldFindingEvidence = emptyMap()
    }

-    private fun launchBusy(mutation: Boolean = false, block: suspend () -> Unit) {
-        if (!operations.begin(mutation)) return
-        busy = operations.busy
+    private fun launchBusy(block: suspend () -> Unit) {
        viewModelScope.launch {
+            busy = true
            error = null
            try {
                block()
-            } catch (cancelled: CancellationException) {
-                throw cancelled
            } catch (throwable: Throwable) {
                error = DhRepository.humanError(throwable)
                if (repository.currentSession() == null) session = null
            } finally {
-                operations.end()
-                busy = operations.busy
+                busy = false
            }
        }
    }
@@ -1,16 +0,0 @@
-package com.korexlabs.dhinspeccion
-
-/** Main-thread gate: reads may overlap; a second write is never queued by a double tap. */
-internal class OperationTracker {
-    private var pending = 0
-    val busy: Boolean get() = pending > 0
-    fun begin(mutation: Boolean): Boolean {
-        if (mutation && busy) return false
-        pending += 1
-        return true
-    }
-    fun end() {
-        check(pending > 0)
-        pending -= 1
-    }
-}
@@ -7,6 +7,8 @@ import android.util.Base64
 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
@@ -152,7 +154,6 @@ data class VisitDetail(
    val code: String,
    val objective: String? = null,
    val status: String,
-    val scopeAsset: AssetSummary? = null,
    val operationalArea: AssetSummary? = null,
    val operatorCompany: AssetSummary? = null,
    val leadInspector: PersonSummary? = null,
@@ -449,6 +450,7 @@ class SecureSessionStore(context: Context) {

 class DhRepository(context: Context) {
    private val store = SecureSessionStore(context.applicationContext)
+    private val refreshMutex = Mutex()
    private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
    private val api: DhApi = Retrofit.Builder()
        .baseUrl(BuildConfig.API_BASE_URL)
@@ -527,13 +529,13 @@ class DhRepository(context: Context) {
            visitId = visitId,
            assetId = assetId,
            file = part,
-            latitude = FieldCoordinates.latitude(latitude).toString().toRequestBody(text),
-            longitude = FieldCoordinates.longitude(longitude).toString().toRequestBody(text),
-            accuracy = accuracyM?.let(FieldCoordinates::accuracy)?.toString()?.toRequestBody(text),
+            latitude = latitude.toString().toRequestBody(text),
+            longitude = longitude.toString().toRequestBody(text),
+            accuracy = accuracyM?.toString()?.toRequestBody(text),
            capturedAt = capturedAt.toRequestBody(text),
            deviceLabel = "DH Android".toRequestBody(text),
-            exifLatitude = FieldCoordinates.latitude(latitude).toString().toRequestBody(text),
-            exifLongitude = FieldCoordinates.longitude(longitude).toString().toRequestBody(text),
+            exifLatitude = latitude.toString().toRequestBody(text),
+            exifLongitude = longitude.toString().toRequestBody(text),
            exifCapturedAt = capturedAt.toRequestBody(text),
        )
    }
@@ -545,19 +547,23 @@ class DhRepository(context: Context) {
        } catch (error: HttpException) {
            if (error.code() != 401) throw error
        }
-        session = refresh(session)
+        session = refresh(session.refreshToken)
        return block(session)
    }

-    private suspend fun refresh(previous: StoredSession): StoredSession =
-        MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
-
+    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
+        }
+    }

    companion object {
        fun humanError(error: Throwable): String {
-            if (error is java.io.IOException) {
-                return "No se pudo conectar. Revisá la señal. Si estabas guardando, comprobá el registro antes de reintentar."
-            }
            if (error is HttpException) {
                val body = runCatching { error.response()?.errorBody()?.string() }.getOrNull()
                val message = runCatching { JSONObject(body.orEmpty()).optString("message") }.getOrNull()
@@ -1,14 +0,0 @@
-package com.korexlabs.dhinspeccion.data
-
-import java.math.BigDecimal
-import java.math.RoundingMode
-
-internal object FieldCoordinates {
-    private fun normalized(value: Double, scale: Int, min: Double, max: Double): Double {
-        require(value.isFinite() && value in min..max) { "La ubicación GPS recibida no es válida." }
-        return BigDecimal.valueOf(value).setScale(scale, RoundingMode.HALF_UP).toDouble()
-    }
-    fun latitude(value: Double) = normalized(value, 6, -90.0, 90.0)
-    fun longitude(value: Double) = normalized(value, 6, -180.0, 180.0)
-    fun accuracy(value: Double) = normalized(value, 3, 0.0, 100000.0)
-}
@@ -4,6 +4,8 @@ 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
@@ -174,6 +176,7 @@ private interface FieldFindingsApi {
 */
 class FieldFindingsRepository(context: Context) {
    private val store = SecureSessionStore(context.applicationContext)
+    private val refreshMutex = Mutex()
    private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
    private val api: FieldFindingsApi = Retrofit.Builder()
        .baseUrl(BuildConfig.API_BASE_URL)
@@ -224,9 +227,9 @@ class FieldFindingsRepository(context: Context) {
            title = title?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
            description = description?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
            capturedAt = capturedAt.toRequestBody(text),
-            latitude = FieldCoordinates.latitude(latitude).toString().toRequestBody(text),
-            longitude = FieldCoordinates.longitude(longitude).toString().toRequestBody(text),
-            accuracyM = accuracyM?.let(FieldCoordinates::accuracy)?.toString()?.toRequestBody(text),
+            latitude = latitude.toString().toRequestBody(text),
+            longitude = longitude.toString().toRequestBody(text),
+            accuracyM = accuracyM?.toString()?.toRequestBody(text),
            deviceLabel = "DH Android".toRequestBody(text),
        )
    }
@@ -238,11 +241,18 @@ class FieldFindingsRepository(context: Context) {
        } catch (error: HttpException) {
            if (error.code() != 401) throw error
        }
-        session = refresh(session)
+        session = refresh(session.refreshToken)
        return block(session)
    }

-    private suspend fun refresh(previous: StoredSession): StoredSession =
-        MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
-
+    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
+        }
+    }
 }
@@ -4,6 +4,8 @@ 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
@@ -35,7 +37,7 @@ data class MobileActSummary(
    val title: String,
    val summary: String,
    val observations: String? = null,
-    val urgency: String? = null,
+    val urgency: String = "NON_URGENT",
    val deadlineDays: Int? = null,
    val deadlineDayType: String? = null,
    val deadlineBasis: String? = null,
@@ -60,7 +62,7 @@ data class MobileActDetail(
    val title: String,
    val summary: String,
    val observations: String? = null,
-    val urgency: String? = null,
+    val urgency: String = "NON_URGENT",
    val deadlineDays: Int? = null,
    val deadlineDayType: String? = null,
    val deadlineBasis: String? = null,
@@ -91,16 +93,13 @@ data class MobileActListResponse(

 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 PrepareMobileActRequest(
-    val urgency: String,
-)
-
 data class UpdateMobileActRequest(
    val assetIds: List<String>,
 )
@@ -133,7 +132,7 @@ data class MobileActClosureHeader(
    val code: String,
    val status: String,
    val visitId: String,
-    val urgency: String? = null,
+    val urgency: String = "NON_URGENT",
    val deadlineDays: Int? = null,
    val deadlineDayType: String? = null,
    val deadlineBasis: String? = null,
@@ -188,7 +187,6 @@ data class MobileActClosure(
    val act: MobileActClosureHeader,
    val visit: MobileVisitClosureHeader,
    val responsible: MobileResponsible? = null,
-    val representativeSuggestion: MobileResponsible? = null,
    val closure: MobileClosureRecord? = null,
    val signatures: List<MobileSignature> = emptyList(),
    val consents: MobileClosureConsents = MobileClosureConsents(),
@@ -209,7 +207,7 @@ data class MobileCloseVisitRequest(
 )

 private interface MobileActsApi {
-    @GET("inspection-visits/{visitId}/acts/mobile")
+    @GET("inspection-visits/{visitId}/acts")
    suspend fun listActs(
        @Header("Authorization") authorization: String,
        @Path("visitId") visitId: String,
@@ -253,7 +251,6 @@ private interface MobileActsApi {
    suspend fun lock(
        @Header("Authorization") authorization: String,
        @Path("actId") actId: String,
-        @Body request: PrepareMobileActRequest,
    ): MobileActClosure

    @Multipart
@@ -313,6 +310,7 @@ private interface MobileActsApi {

 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)
@@ -331,16 +329,19 @@ class MobileActsRepository(context: Context) {

    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 = emptyList(),
+                assetIds = listOf(assetId),
            ),
        )
    }
@@ -362,8 +363,8 @@ class MobileActsRepository(context: Context) {
        api.responsible("Bearer ${session.accessToken}", actId, request)
    }

-    suspend fun lock(actId: String, urgency: String): MobileActClosure = authorized { session ->
-        api.lock("Bearer ${session.accessToken}", actId, PrepareMobileActRequest(urgency))
+    suspend fun lock(actId: String): MobileActClosure = authorized { session ->
+        api.lock("Bearer ${session.accessToken}", actId)
    }

    suspend fun signInspector(
@@ -428,9 +429,9 @@ class MobileActsRepository(context: Context) {
        val consent = "true".toRequestBody(text)
        val signedAt = Instant.now().toString().toRequestBody(text)
        val device = "DH Android".toRequestBody(text)
-        val lat = latitude?.let(FieldCoordinates::latitude)?.toString()?.toRequestBody(text)
-        val lon = longitude?.let(FieldCoordinates::longitude)?.toString()?.toRequestBody(text)
-        val accuracy = accuracyM?.let(FieldCoordinates::accuracy)?.toString()?.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,
@@ -453,11 +454,18 @@ class MobileActsRepository(context: Context) {
        } catch (error: HttpException) {
            if (error.code() != 401) throw error
        }
-        session = refresh(session)
+        session = refresh(session.refreshToken)
        return block(session)
    }

-    private suspend fun refresh(previous: StoredSession): StoredSession =
-        MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
-
+    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
+        }
+    }
 }
@@ -1,93 +0,0 @@
-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 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 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)
-        return block(session)
-    }
-
-    private suspend fun refresh(previous: StoredSession): StoredSession =
-        MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
-
-}
@@ -1,32 +0,0 @@
-package com.korexlabs.dhinspeccion.data
-
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import retrofit2.HttpException
-
-/** One refresh lock for every API client sharing the encrypted session. */
-internal object MobileSessionCoordinator {
-    private val mutex = Mutex()
-
-    suspend fun refresh(
-        previous: StoredSession,
-        load: () -> StoredSession?,
-        save: (MobileSessionResponse) -> StoredSession,
-        clear: () -> Unit,
-        request: suspend (RefreshRequest) -> MobileSessionResponse,
-    ): StoredSession = mutex.withLock {
-        val latest = load() ?: throw IllegalStateException("Sesión no iniciada")
-        check(latest.userId == previous.userId) { "La sesión cambió. Volvé a abrir la operación." }
-        if (latest.refreshToken != previous.refreshToken) return@withLock latest
-        val response = try {
-            request(RefreshRequest(previous.refreshToken))
-        } catch (error: HttpException) {
-            // Network failures and server outages must not discard the saved login.
-            if (error.code() == 401 && load()?.refreshToken == previous.refreshToken) clear()
-            throw error
-        }
-        // A logout or another login during the request must never be undone.
-        check(load()?.refreshToken == previous.refreshToken) { "La sesión cambió. Volvé a ingresar." }
-        save(response)
-    }
-}
@@ -1,64 +0,0 @@
-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 retrofit2.HttpException
-import retrofit2.Retrofit
-import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.http.*
-import java.time.LocalDate
-import java.time.OffsetDateTime
-
-internal data class TechnicalDefinition(
-    val id: String, val code: String, val name: String, val dataType: String,
-    val isRequired: Boolean = false, val isActive: Boolean = true,
-    val unit: String? = null, val options: List<String>? = null,
-)
-internal data class TechnicalValues(
-    val assetId: String, val family: FieldInventoryFamily,
-    val definitions: List<TechnicalDefinition>, val values: Map<String, Any?>,
-)
-internal data class TechnicalValuesRequest(val values: Map<String, Any?>)
-private interface TechnicalApi {
-    @GET("assets/{id}/technical-values")
-    suspend fun get(@Header("Authorization") auth: String, @Path("id") id: String): TechnicalValues
-    @PUT("assets/{id}/technical-values")
-    suspend fun put(@Header("Authorization") auth: String, @Path("id") id: String, @Body body: TechnicalValuesRequest): TechnicalValues
-    @POST("auth/mobile/refresh")
-    suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
-}
-internal class TechnicalRepository(context: Context) {
-    private val store = SecureSessionStore(context.applicationContext)
-    private val api = Retrofit.Builder().baseUrl(BuildConfig.API_BASE_URL)
-        .addConverterFactory(MoshiConverterFactory.create(Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()))
-        .build().create(TechnicalApi::class.java)
-    suspend fun get(id: String) = authorized { api.get("Bearer ${it.accessToken}", id) }
-    suspend fun save(id: String, values: Map<String, Any?>) = authorized {
-        api.put("Bearer ${it.accessToken}", id, TechnicalValuesRequest(values))
-    }
-    private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
-        val previous = store.load() ?: error("Sesión no iniciada")
-        try { return block(previous) }
-        catch (error: HttpException) { if (error.code() != 401) throw error }
-        val current = MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear, api::refresh)
-        return block(current)
-    }
-}
-
-/** Keeps IDs and typed JSON values identical to the Dashboard contract. */
-internal fun technicalInputValue(definition: TechnicalDefinition, text: String): Any? {
-    val value = text.trim()
-    require(value.isNotBlank() || !definition.isRequired) { "Completá ${definition.name}." }
-    if (value.isBlank()) return null
-    fun invalid(): Nothing = throw IllegalArgumentException("Revisá el valor de ${definition.name}.")
-    return when (definition.dataType) {
-        "NUMBER" -> value.replace(',', '.').toDoubleOrNull()?.takeIf { it.isFinite() } ?: invalid()
-        "BOOLEAN" -> when (value) { "true" -> true; "false" -> false; else -> invalid() }
-        "DATE" -> runCatching { LocalDate.parse(value).toString() }.getOrElse { invalid() }
-        "DATETIME" -> runCatching { OffsetDateTime.parse(value).toInstant().toString() }.getOrElse { invalid() }
-        "SELECT" -> value.takeIf { it in definition.options.orEmpty() } ?: invalid()
-        else -> value.takeIf { it.length <= 4000 } ?: invalid()
-    }
-}
@@ -547,17 +547,13 @@ private suspend fun currentGeo(context: Context): GeoSnapshot = suspendCancellab
    }
    val source = CancellationTokenSource()
    val client = LocationServices.getFusedLocationProviderClient(context)
-    try {
-        client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            .addOnSuccessListener { location ->
-                if (!continuation.isActive) return@addOnSuccessListener
-                if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
-                else continuation.resume(GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
-            }
-            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
-    } catch (error: SecurityException) {
-        if (continuation.isActive) continuation.resumeWithException(error)
-    }
+    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+            else continuation.resume(GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
    continuation.invokeOnCancellation { source.cancel() }
 }

@@ -1,73 +0,0 @@
-package com.korexlabs.dhinspeccion.ui
-
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-
-private val DhLightColors = lightColorScheme(
-    primary = Color(0xFF075E63),
-    onPrimary = Color(0xFFFFFFFF),
-    primaryContainer = Color(0xFFD6F0F0),
-    onPrimaryContainer = Color(0xFF073F43),
-    secondary = Color(0xFF445E74),
-    onSecondary = Color(0xFFFFFFFF),
-    secondaryContainer = Color(0xFFDCE7F1),
-    onSecondaryContainer = Color(0xFF243F54),
-    tertiary = Color(0xFF6A5A42),
-    background = Color(0xFFF6F8FA),
-    onBackground = Color(0xFF182025),
-    surface = Color(0xFFFFFFFF),
-    onSurface = Color(0xFF182025),
-    surfaceVariant = Color(0xFFEDF1F4),
-    onSurfaceVariant = Color(0xFF455158),
-    outline = Color(0xFF77848B),
-    outlineVariant = Color(0xFFD7DEE2),
-    error = Color(0xFFB3261E),
-    onError = Color(0xFFFFFFFF),
-    errorContainer = Color(0xFFF9DEDC),
-    onErrorContainer = Color(0xFF6F1713),
-)
-
-private val DhDarkColors = darkColorScheme(
-    primary = Color(0xFF88D4D7),
-    onPrimary = Color(0xFF00373A),
-    primaryContainer = Color(0xFF074F53),
-    onPrimaryContainer = Color(0xFFB7EBED),
-    secondary = Color(0xFFB6CBE0),
-    onSecondary = Color(0xFF203646),
-    secondaryContainer = Color(0xFF344C60),
-    onSecondaryContainer = Color(0xFFDCE7F1),
-    background = Color(0xFF101416),
-    onBackground = Color(0xFFE0E4E6),
-    surface = Color(0xFF171C1F),
-    onSurface = Color(0xFFE0E4E6),
-    surfaceVariant = Color(0xFF263035),
-    onSurfaceVariant = Color(0xFFC3CDD2),
-    outline = Color(0xFF8C989E),
-    error = Color(0xFFFFB4AB),
-    onError = Color(0xFF690005),
-    errorContainer = Color(0xFF93000A),
-    onErrorContainer = Color(0xFFFFDAD6),
-)
-
-private val DhShapes = androidx.compose.material3.Shapes(
-    extraSmall = RoundedCornerShape(8.dp),
-    small = RoundedCornerShape(12.dp),
-    medium = RoundedCornerShape(16.dp),
-    large = RoundedCornerShape(22.dp),
-    extraLarge = RoundedCornerShape(28.dp),
-)
-
-@Composable
-fun DhTheme(content: @Composable () -> Unit) {
-    MaterialTheme(
-        colorScheme = if (isSystemInDarkTheme()) DhDarkColors else DhLightColors,
-        shapes = DhShapes,
-        content = content,
-    )
-}
@@ -1,972 +0,0 @@
-package com.korexlabs.dhinspeccion.ui
-
-import android.Manifest
-import android.content.Context
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Environment
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.AssistChip
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateMapOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
-import androidx.exifinterface.media.ExifInterface
-import com.google.android.gms.location.LocationServices
-import com.google.android.gms.location.Priority
-import com.google.android.gms.tasks.CancellationTokenSource
-import com.korexlabs.dhinspeccion.MainViewModel
-import com.korexlabs.dhinspeccion.data.FieldAttributeDefinition
-import com.korexlabs.dhinspeccion.data.FieldInventoryItem
-import com.korexlabs.dhinspeccion.data.FieldType
-import com.korexlabs.dhinspeccion.data.VisitDetail
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
-import java.io.File
-import java.time.Instant
-import java.time.ZoneId
-import java.time.format.DateTimeFormatter
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-
-private data class DynamicGeoSnapshot(
-    val latitude: Double,
-    val longitude: Double,
-    val accuracyM: Double?,
-)
-
-private enum class DynamicInventoryMode {
-    BROWSE,
-    PICK_PARENT,
-    CREATE_INSTALLATION,
-    CREATE_SUBINSTALLATION,
-}
-
-@Composable
-fun DynamicVisitRoot(model: MainViewModel) {
-    var inventoryMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
-    var actsMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
-
-    when {
-        actsMode -> MobileActsScreen(
-            model = model,
-            onBack = { actsMode = false },
-            onGoInventory = {
-                actsMode = false
-                inventoryMode = true
-            },
-        )
-        inventoryMode -> DynamicFieldInventoryScreen(
-            model = model,
-            onBack = {
-                inventoryMode = false
-                actsMode = true
-            },
-        )
-        else -> DynamicVisitOverview(
-            model = model,
-            onInventory = { inventoryMode = true },
-            onActs = { actsMode = true },
-        )
-    }
-}
-
-@Composable
-private fun DynamicVisitOverview(
-    model: MainViewModel,
-    onInventory: () -> Unit,
-    onActs: () -> Unit,
-) {
-    val visit = model.visit ?: return
-    Column(
-        Modifier
-            .fillMaxSize()
-            .verticalScroll(rememberScrollState())
-            .padding(top = 28.dp, start = 16.dp, end = 16.dp, bottom = 30.dp),
-        verticalArrangement = Arrangement.spacedBy(12.dp),
-    ) {
-        Row(
-            Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            OutlinedButton(onClick = { model.closeVisitView() }) { Text("Volver") }
-            Text(dynamicStatusLabel(visit.status), fontWeight = FontWeight.Bold)
-        }
-        Text(visit.code, style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
-        Text("${visit.operatorCompany?.name ?: "Sin operadora"} · ${visit.operationalArea?.name ?: "Sin área"}")
-        visit.scopeAsset?.let {
-            Text("Yacimiento: ${it.name}", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold)
-        }
-        visit.plannedStartAt?.let {
-            Text("Planificada: ${dynamicShortDate(it)}", style = MaterialTheme.typography.bodySmall)
-        }
-        visit.instructions?.takeIf { it.isNotBlank() }?.let {
-            Card(Modifier.fillMaxWidth()) {
-                Column(Modifier.padding(12.dp)) {
-                    Text("Instrucciones", fontWeight = FontWeight.Bold)
-                    Text(it)
-                }
-            }
-        }
-        DynamicMessageStrip(model)
-
-        if (visit.status == "PLANNED") {
-            Card(
-                Modifier.fillMaxWidth(),
-                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
-            ) {
-                Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    Text("Todo listo para comenzar", fontWeight = FontWeight.Bold)
-                    Text("Al iniciar se habilitan Actas, Hallazgos y altas rápidas de campo.")
-                    Button(
-                        onClick = { model.startVisit(); onActs() },
-                        enabled = !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text(if (model.busy) "Iniciando…" else "Iniciar inspección") }
-                }
-            }
-        }
-
-        if (visit.status == "IN_PROGRESS") {
-            Card(
-                Modifier.fillMaxWidth(),
-                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer),
-            ) {
-                Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    Text("Modo campo rápido", fontWeight = FontWeight.Bold)
-                    Text(
-                        "Desde Inventario podés cargar una Subinstalación en tres pasos: elegir Instalación, identificarla y capturar GPS + foto.",
-                        style = MaterialTheme.typography.bodySmall,
-                    )
-                    Button(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
-                        Text("+ Nueva subinstalación / inventario")
-                    }
-                }
-            }
-
-            Button(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
-                val open = model.acts.count { it.status == "DRAFT" || it.status == "READY" }
-                Text("Abrir Actas · ${model.acts.size}${if (open > 0) " · $open abiertas" else ""}")
-            }
-            OutlinedButton(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
-                Text("Buscar Inventario / Hallazgos")
-            }
-        } else if (visit.status == "CLOSED") {
-            OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
-                Text("Ver Actas · ${model.acts.size}")
-            }
-        }
-
-        DynamicChecklistCard(visit)
-
-        Text("Inventario planificado", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-        if (visit.planningAssets.none { it.included }) {
-            Text("Sin elementos planificados.")
-        }
-        visit.planningAssets.filter { it.included }.forEach { asset ->
-            Card(Modifier.fillMaxWidth()) {
-                Column(Modifier.padding(10.dp)) {
-                    Text(asset.name, fontWeight = FontWeight.SemiBold)
-                    Text("${asset.code} · ${asset.typeName.orEmpty()}", style = MaterialTheme.typography.bodySmall)
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DynamicChecklistCard(visit: VisitDetail) {
-    val checklist = visit.checklist
-    Card(Modifier.fillMaxWidth()) {
-        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
-            Text("Antecedentes antes de salir", fontWeight = FontWeight.Bold)
-            Text("Vencidos empresa: ${checklist.companyOverdue} · Verificaciones vencidas: ${checklist.verificationOverdue}")
-            Text("Antecedentes: ${checklist.antecedents} · Próximos controles: ${checklist.upcomingControls}")
-            if (checklist.stale) {
-                Text("El checklist requiere revisión/actualización.", color = MaterialTheme.colorScheme.error)
-            }
-        }
-    }
-}
-
-@Composable
-private fun DynamicFieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
-    val context = LocalContext.current
-    val scope = rememberCoroutineScope()
-    val visit = model.visit ?: return
-
-    var modeName by rememberSaveable(visit.id) { mutableStateOf(DynamicInventoryMode.BROWSE.name) }
-    val mode = runCatching { DynamicInventoryMode.valueOf(modeName) }.getOrDefault(DynamicInventoryMode.BROWSE)
-    var search by rememberSaveable(visit.id) { mutableStateOf("") }
-    var parentSearch by rememberSaveable(visit.id) { mutableStateOf("") }
-    var parentId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var parentLabel by rememberSaveable(visit.id) { mutableStateOf("") }
-    var name by rememberSaveable(visit.id) { mutableStateOf("") }
-    var commonName by rememberSaveable(visit.id) { mutableStateOf("") }
-    var selectedTypeId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var selectedFamilyId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var familySearch by rememberSaveable(visit.id) { mutableStateOf("") }
-    val attributeValues = remember { mutableStateMapOf<String, String>() }
-    var pendingAutoPhoto by rememberSaveable(visit.id) { mutableStateOf(false) }
-    var localError by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var permissionAction by rememberSaveable(visit.id) { mutableStateOf("PHOTO") }
-
-    var mergeSearch by rememberSaveable(visit.id) { mutableStateOf("") }
-    var mergeCandidateId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var mergeReason by rememberSaveable(visit.id) { mutableStateOf("") }
-
-    fun resetForm() {
-        name = ""
-        commonName = ""
-        selectedTypeId = null
-        selectedFamilyId = null
-        familySearch = ""
-        attributeValues.clear()
-        localError = null
-    }
-
-    fun backToBrowse() {
-        modeName = DynamicInventoryMode.BROWSE.name
-        parentId = null
-        parentLabel = ""
-        parentSearch = ""
-        resetForm()
-        model.loadFieldTypes(null)
-    }
-
-    fun startInstallation() {
-        model.clearSelectedFieldAsset()
-        modeName = DynamicInventoryMode.CREATE_INSTALLATION.name
-        parentId = null
-        parentLabel = visit.scopeAsset?.name ?: "Yacimiento de la inspección"
-        resetForm()
-        model.loadFieldTypes(null)
-    }
-
-    fun startSubinstallation() {
-        model.clearSelectedFieldAsset()
-        modeName = DynamicInventoryMode.PICK_PARENT.name
-        parentId = null
-        parentLabel = ""
-        parentSearch = ""
-        resetForm()
-        model.searchInventory("", visit.scopeAsset?.id)
-    }
-
-    fun chooseParent(item: FieldInventoryItem) {
-        parentId = item.id
-        parentLabel = "${item.name} (${item.code})"
-        modeName = DynamicInventoryMode.CREATE_SUBINSTALLATION.name
-        resetForm()
-        model.loadFieldTypes(item.id)
-    }
-
-    LaunchedEffect(visit.id) {
-        model.searchInventory("", visit.scopeAsset?.id)
-    }
-
-    LaunchedEffect(model.fieldTypes, modeName) {
-        if (mode == DynamicInventoryMode.CREATE_INSTALLATION || mode == DynamicInventoryMode.CREATE_SUBINSTALLATION) {
-            val preferred = model.fieldTypes.firstOrNull { type ->
-                val normalized = dynamicNormalize(type.structuralKind ?: type.code.ifBlank { type.name })
-                when (mode) {
-                    DynamicInventoryMode.CREATE_INSTALLATION -> normalized.contains("instalacion") && !normalized.contains("subinstalacion")
-                    DynamicInventoryMode.CREATE_SUBINSTALLATION -> normalized.contains("subinstalacion")
-                    else -> false
-                }
-            } ?: model.fieldTypes.firstOrNull()
-            if (model.fieldTypes.none { it.id == selectedTypeId }) {
-                selectedTypeId = preferred?.id
-                selectedFamilyId = null
-                familySearch = ""
-                attributeValues.clear()
-            }
-        }
-    }
-
-    val selectedType = model.fieldTypes.firstOrNull { it.id == selectedTypeId }
-    val selectedFamily = selectedType?.families?.firstOrNull { it.id == selectedFamilyId }
-    val filteredFamilies = remember(selectedType, familySearch) {
-        val needle = dynamicNormalize(familySearch)
-        selectedType?.families.orEmpty().filter { family ->
-            needle.isBlank() || dynamicNormalize("${family.code} ${family.name}").contains(needle)
-        }
-    }
-
-    var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
-    var pendingPhotoGeo by remember { mutableStateOf<DynamicGeoSnapshot?>(null) }
-
-    val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
-        val file = pendingPhotoFile
-        val geo = pendingPhotoGeo
-        if (success && file != null && geo != null) {
-            runCatching { writeDynamicExif(file, geo) }
-            model.uploadFieldPhoto(file, geo.latitude, geo.longitude, geo.accuracyM)
-        } else if (!success) {
-            localError = "La foto quedó pendiente. Podés tomarla cuando estés listo."
-        }
-        pendingPhotoFile = null
-        pendingPhotoGeo = null
-    }
-
-    val beginPhoto: () -> Unit = {
-        scope.launch {
-            runCatching { currentDynamicGeo(context) }
-                .onSuccess { geo ->
-                    val (file, uri) = newDynamicPhoto(context)
-                    pendingPhotoFile = file
-                    pendingPhotoGeo = geo
-                    takePicture.launch(uri)
-                }
-                .onFailure { localError = it.message ?: "No se pudo obtener el GPS para la fotografía." }
-        }
-    }
-
-    fun createWithLocation() {
-        val type = selectedType ?: return
-        val effectiveParent = when (mode) {
-            DynamicInventoryMode.CREATE_SUBINSTALLATION -> parentId
-            else -> null
-        }
-        scope.launch {
-            runCatching { currentDynamicGeo(context) }
-                .onSuccess { geo ->
-                    pendingAutoPhoto = true
-                    model.createFieldAsset(
-                        type = type,
-                        parentId = effectiveParent,
-                        familyId = selectedFamilyId,
-                        name = name,
-                        commonName = commonName,
-                        attributes = buildDynamicAttributes(type, attributeValues),
-                        latitude = geo.latitude,
-                        longitude = geo.longitude,
-                        accuracyM = geo.accuracyM,
-                    )
-                }
-                .onFailure { localError = it.message ?: "No se pudo capturar la ubicación GPS." }
-        }
-    }
-
-    val permissionsLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
-        val cameraAllowed = result[Manifest.permission.CAMERA] == true || dynamicHasPermission(context, Manifest.permission.CAMERA)
-        val locationAllowed = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
-            result[Manifest.permission.ACCESS_COARSE_LOCATION] == true || dynamicHasLocation(context)
-        when (permissionAction) {
-            "CREATE" -> {
-                if (cameraAllowed && locationAllowed) createWithLocation()
-                else localError = "Para el alta rápida se necesitan cámara y ubicación."
-            }
-            else -> {
-                if (cameraAllowed && locationAllowed) beginPhoto()
-                else localError = "Para completar el alta se necesitan cámara y ubicación."
-            }
-        }
-    }
-
-    fun requestCreate() {
-        permissionAction = "CREATE"
-        if (dynamicHasPermission(context, Manifest.permission.CAMERA) && dynamicHasLocation(context)) {
-            createWithLocation()
-        } else {
-            permissionsLauncher.launch(
-                arrayOf(
-                    Manifest.permission.CAMERA,
-                    Manifest.permission.ACCESS_FINE_LOCATION,
-                    Manifest.permission.ACCESS_COARSE_LOCATION,
-                ),
-            )
-        }
-    }
-
-    fun requestPhoto() {
-        permissionAction = "PHOTO"
-        if (dynamicHasPermission(context, Manifest.permission.CAMERA) && dynamicHasLocation(context)) {
-            beginPhoto()
-        } else {
-            permissionsLauncher.launch(
-                arrayOf(
-                    Manifest.permission.CAMERA,
-                    Manifest.permission.ACCESS_FINE_LOCATION,
-                    Manifest.permission.ACCESS_COARSE_LOCATION,
-                ),
-            )
-        }
-    }
-
-    val selectedCapture = model.selectedFieldAsset
-    LaunchedEffect(selectedCapture?.asset?.id, pendingAutoPhoto) {
-        val capture = selectedCapture?.capture
-        if (pendingAutoPhoto && capture?.captureRequired == true && capture.creationGpsCaptured && capture.fieldPhotoCount == 0) {
-            pendingAutoPhoto = false
-            requestPhoto()
-        }
-    }
-
-    val mergeSource = selectedCapture?.takeIf {
-        it.capture.captureRequired && dynamicItemTypeCode(it.asset) in setOf("instalacion", "subinstalacion")
-    }
-    val mergeCandidates = remember(model.inventory, mergeSource) {
-        if (mergeSource == null) emptyList() else model.inventory.filter { candidate ->
-            candidate.id != mergeSource.asset.id &&
-                candidate.informationStatus != "INACTIVE" &&
-                candidate.type?.id == mergeSource.asset.type?.id &&
-                candidate.parent?.id == mergeSource.asset.parent?.id &&
-                !candidate.captureRequired
-        }
-    }
-
-    Column(Modifier.fillMaxSize().padding(top = 28.dp)) {
-        Row(
-            Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            OutlinedButton(onClick = { if (mode == DynamicInventoryMode.BROWSE) onBack() else backToBrowse() }) {
-                Text(if (mode == DynamicInventoryMode.BROWSE) "Acta" else "Atrás")
-            }
-            Column(horizontalAlignment = Alignment.End) {
-                Text(
-                    when (mode) {
-                        DynamicInventoryMode.PICK_PARENT -> "Elegir Instalación"
-                        DynamicInventoryMode.CREATE_INSTALLATION -> "Nueva Instalación"
-                        DynamicInventoryMode.CREATE_SUBINSTALLATION -> "Nueva Subinstalación"
-                        else -> "Inventario de campo"
-                    },
-                    style = MaterialTheme.typography.titleLarge,
-                    fontWeight = FontWeight.Bold,
-                )
-                Text(visit.scopeAsset?.name ?: visit.code, style = MaterialTheme.typography.bodySmall)
-            }
-        }
-
-        Column(Modifier.padding(horizontal = 16.dp)) {
-            DynamicMessageStrip(model)
-            localError?.let {
-                Card(
-                    modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp),
-                    colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer),
-                    onClick = { localError = null },
-                ) { Text(it, Modifier.padding(12.dp)) }
-            }
-        }
-
-        if (selectedCapture != null) {
-            DynamicCaptureCard(
-                item = selectedCapture.asset,
-                gps = selectedCapture.capture.creationGpsCaptured,
-                photos = selectedCapture.capture.fieldPhotoCount,
-                ready = selectedCapture.capture.readyForFinding,
-                onPhoto = { requestPhoto() },
-                onClose = { model.clearSelectedFieldAsset() },
-                onCreateAnother = {
-                    if (dynamicItemTypeCode(selectedCapture.asset) == "subinstalacion" && selectedCapture.asset.parent != null) {
-                        chooseParent(
-                            FieldInventoryItem(
-                                id = selectedCapture.asset.parent.id,
-                                code = selectedCapture.asset.parent.code,
-                                name = selectedCapture.asset.parent.name,
-                                type = null,
-                            ),
-                        )
-                    } else {
-                        startSubinstallation()
-                    }
-                },
-            )
-        }
-
-        if (mergeSource != null && !mergeSource.capture.readyForFinding) {
-            Card(
-                Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 4.dp),
-                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer),
-            ) {
-                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    Text("¿Ya existía?", fontWeight = FontWeight.Bold)
-                    Text("Antes de seguir, podés fusionar el alta con un registro existente compatible.", style = MaterialTheme.typography.bodySmall)
-                    OutlinedTextField(
-                        value = mergeSearch,
-                        onValueChange = { mergeSearch = it },
-                        label = { Text("Buscar posible duplicado") },
-                        modifier = Modifier.fillMaxWidth(),
-                        singleLine = true,
-                    )
-                    OutlinedButton(
-                        onClick = {
-                            mergeCandidateId = null
-                            model.searchInventory(mergeSearch, mergeSource.asset.parent?.id)
-                        },
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Buscar coincidencias") }
-                    mergeCandidates.take(6).forEach { candidate ->
-                        AssistChip(
-                            onClick = { mergeCandidateId = candidate.id },
-                            label = {
-                                Text(if (mergeCandidateId == candidate.id) "✓ ${candidate.code} · ${candidate.name}" else "${candidate.code} · ${candidate.name}")
-                            },
-                        )
-                    }
-                    if (mergeCandidateId != null) {
-                        OutlinedTextField(
-                            value = mergeReason,
-                            onValueChange = { mergeReason = it },
-                            label = { Text("Motivo de la fusión") },
-                            modifier = Modifier.fillMaxWidth(),
-                            minLines = 2,
-                        )
-                        Button(
-                            onClick = { model.mergeCreatedFieldAsset(mergeCandidateId!!, mergeReason) },
-                            enabled = mergeReason.trim().length >= 8 && !model.busy,
-                            modifier = Modifier.fillMaxWidth(),
-                        ) { Text("Fusionar con el existente") }
-                    }
-                }
-            }
-        }
-
-        when (mode) {
-            DynamicInventoryMode.BROWSE -> {
-                Column(
-                    Modifier.fillMaxWidth().padding(horizontal = 16.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    Card(
-                        Modifier.fillMaxWidth(),
-                        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
-                    ) {
-                        Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                            Text("Alta rápida en campo", fontWeight = FontWeight.Bold)
-                            Text("La Subinstalación se carga guiada, sin navegar por formularios largos.", style = MaterialTheme.typography.bodySmall)
-                            Button(onClick = { startSubinstallation() }, modifier = Modifier.fillMaxWidth(), enabled = visit.status == "IN_PROGRESS") {
-                                Text("+ Nueva Subinstalación")
-                            }
-                            OutlinedButton(onClick = { startInstallation() }, modifier = Modifier.fillMaxWidth(), enabled = visit.status == "IN_PROGRESS") {
-                                Text("+ Nueva Instalación")
-                            }
-                        }
-                    }
-                    OutlinedTextField(
-                        value = search,
-                        onValueChange = { search = it },
-                        label = { Text("Buscar instalación, subinstalación o código") },
-                        modifier = Modifier.fillMaxWidth(),
-                        singleLine = true,
-                    )
-                    Button(
-                        onClick = { model.searchInventory(search) },
-                        enabled = !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Buscar") }
-                }
-
-                Text("Inventario disponible", Modifier.padding(horizontal = 16.dp, vertical = 8.dp), fontWeight = FontWeight.Bold)
-                LazyColumn(
-                    Modifier.fillMaxSize().padding(horizontal = 16.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    items(
-                        model.inventory.filter { dynamicItemTypeCode(it) in setOf("instalacion", "subinstalacion") },
-                        key = { it.id },
-                    ) { item ->
-                        DynamicInventoryCard(
-                            item = item,
-                            onInspect = { model.selectExisting(item) },
-                            onAddChild = { chooseParent(item) },
-                        )
-                    }
-                    item { Spacer(Modifier.height(30.dp)) }
-                }
-            }
-
-            DynamicInventoryMode.PICK_PARENT -> {
-                Column(
-                    Modifier.fillMaxWidth().padding(horizontal = 16.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    DynamicStepHeader(1, "Elegí la Instalación padre")
-                    Text("Solo se muestran Instalaciones del Yacimiento de esta inspección.", style = MaterialTheme.typography.bodySmall)
-                    OutlinedTextField(
-                        value = parentSearch,
-                        onValueChange = { parentSearch = it },
-                        label = { Text("Buscar Instalación por nombre o código") },
-                        modifier = Modifier.fillMaxWidth(),
-                        singleLine = true,
-                    )
-                    Button(
-                        onClick = { model.searchInventory(parentSearch, visit.scopeAsset?.id) },
-                        enabled = !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Buscar Instalación") }
-                }
-                LazyColumn(
-                    Modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 8.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    items(
-                        model.inventory.filter { dynamicItemTypeCode(it) == "instalacion" },
-                        key = { it.id },
-                    ) { item ->
-                        Card(onClick = { chooseParent(item) }, modifier = Modifier.fillMaxWidth()) {
-                            Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
-                                Text(item.name, fontWeight = FontWeight.Bold)
-                                Text(item.code, style = MaterialTheme.typography.bodySmall)
-                                Text("Tocar para agregar una Subinstalación", color = MaterialTheme.colorScheme.primary, style = MaterialTheme.typography.bodySmall)
-                            }
-                        }
-                    }
-                    item { Spacer(Modifier.height(24.dp)) }
-                }
-            }
-
-            DynamicInventoryMode.CREATE_INSTALLATION,
-            DynamicInventoryMode.CREATE_SUBINSTALLATION -> {
-                val isSubinstallation = mode == DynamicInventoryMode.CREATE_SUBINSTALLATION
-                Column(
-                    Modifier
-                        .fillMaxSize()
-                        .padding(horizontal = 16.dp)
-                        .verticalScroll(rememberScrollState()),
-                    verticalArrangement = Arrangement.spacedBy(10.dp),
-                ) {
-                    DynamicStepHeader(if (isSubinstallation) 2 else 1, if (isSubinstallation) "Identificá la Subinstalación" else "Identificá la Instalación")
-                    Text("Ubicación: $parentLabel", style = MaterialTheme.typography.bodySmall, fontWeight = FontWeight.SemiBold)
-                    if (isSubinstallation) {
-                        OutlinedButton(onClick = { startSubinstallation() }, modifier = Modifier.fillMaxWidth()) {
-                            Text("Cambiar Instalación padre")
-                        }
-                    }
-
-                    if (model.fieldTypes.isEmpty()) {
-                        Text("No hay un tipo habilitado para esta ubicación.", color = MaterialTheme.colorScheme.error)
-                    }
-
-                    if (model.fieldTypes.size > 1) {
-                        Text("Nivel de Inventario", fontWeight = FontWeight.Bold)
-                        model.fieldTypes.forEach { type ->
-                            AssistChip(
-                                onClick = {
-                                    selectedTypeId = type.id
-                                    selectedFamilyId = null
-                                    attributeValues.clear()
-                                },
-                                label = { Text(if (selectedTypeId == type.id) "✓ ${type.name}" else type.name) },
-                            )
-                        }
-                    }
-
-                    if (selectedType?.familyRequired == true) {
-                        Text("Clasificación técnica *", fontWeight = FontWeight.Bold)
-                        OutlinedTextField(
-                            value = familySearch,
-                            onValueChange = { familySearch = it },
-                            label = { Text("Buscar clasificación") },
-                            supportingText = { Text("${filteredFamilies.size} opciones compatibles") },
-                            modifier = Modifier.fillMaxWidth(),
-                            singleLine = true,
-                        )
-                        filteredFamilies.take(12).forEach { family ->
-                            AssistChip(
-                                onClick = { selectedFamilyId = family.id },
-                                label = {
-                                    val prefix = when {
-                                        selectedFamilyId == family.id -> "✓ "
-                                        family.isOther -> "+ "
-                                        else -> ""
-                                    }
-                                    Text(prefix + family.name)
-                                },
-                            )
-                        }
-                        if (filteredFamilies.size > 12) {
-                            Text("Escribí parte del nombre para reducir la lista.", style = MaterialTheme.typography.bodySmall)
-                        }
-                        selectedFamily?.let { family ->
-                            if (family.isOther) {
-                                Text("Quedará marcado como no catalogado para revisión en oficina.", color = MaterialTheme.colorScheme.secondary)
-                            }
-                            if (family.informationLabels.isNotEmpty()) {
-                                Text("Datos esperados: ${family.informationLabels.joinToString(" · ")}", style = MaterialTheme.typography.bodySmall)
-                            }
-                        }
-                    }
-
-                    OutlinedTextField(
-                        value = name,
-                        onValueChange = { name = it },
-                        label = { Text("Nombre o código visible *") },
-                        supportingText = { Text("Usá lo que ve el inspector en la placa o en campo.") },
-                        modifier = Modifier.fillMaxWidth(),
-                        singleLine = true,
-                    )
-                    OutlinedTextField(
-                        value = commonName,
-                        onValueChange = { commonName = it },
-                        label = { Text("Nombre habitual") },
-                        modifier = Modifier.fillMaxWidth(),
-                        singleLine = true,
-                    )
-
-                    selectedType?.attributes?.forEach { definition ->
-                        OutlinedTextField(
-                            value = attributeValues[definition.code].orEmpty(),
-                            onValueChange = { attributeValues[definition.code] = it },
-                            label = { Text(definition.name + if (definition.isRequired) " *" else "") },
-                            supportingText = {
-                                val details = listOfNotNull(definition.unit, definition.options?.toString()).joinToString(" · ")
-                                if (details.isNotBlank()) Text(details)
-                            },
-                            keyboardOptions = KeyboardOptions(
-                                keyboardType = if (definition.dataType.uppercase() in setOf("NUMBER", "DECIMAL", "INTEGER", "FLOAT")) KeyboardType.Decimal else KeyboardType.Text,
-                            ),
-                            modifier = Modifier.fillMaxWidth(),
-                        )
-                    }
-
-                    HorizontalDivider()
-                    DynamicStepHeader(if (isSubinstallation) 3 else 2, "GPS + foto en un solo paso")
-                    Text(
-                        "Al guardar se captura la ubicación actual y la cámara se abre automáticamente. La foto sigue siendo obligatoria antes de crear Hallazgos.",
-                        style = MaterialTheme.typography.bodySmall,
-                    )
-
-                    val attributesReady = selectedType?.attributes
-                        ?.filter { it.isRequired }
-                        ?.all { attributeValues[it.code].orEmpty().isNotBlank() }
-                        ?: false
-                    val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
-                    Button(
-                        onClick = { requestCreate() },
-                        enabled = selectedType != null && name.isNotBlank() && attributesReady && familyReady && !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text(if (model.busy) "Guardando…" else "Guardar y tomar foto") }
-                    Spacer(Modifier.height(30.dp))
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DynamicStepHeader(step: Int, title: String) {
-    Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-        Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer)) {
-            Text(step.toString(), Modifier.padding(horizontal = 10.dp, vertical = 6.dp), fontWeight = FontWeight.Bold)
-        }
-        Spacer(Modifier.width(8.dp))
-        Text(title, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-    }
-}
-
-@Composable
-private fun DynamicCaptureCard(
-    item: FieldInventoryItem,
-    gps: Boolean,
-    photos: Int,
-    ready: Boolean,
-    onPhoto: () -> Unit,
-    onClose: () -> Unit,
-    onCreateAnother: () -> Unit,
-) {
-    Card(
-        Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp),
-        colors = CardDefaults.cardColors(
-            containerColor = if (ready) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant,
-        ),
-    ) {
-        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(7.dp)) {
-            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-                Column(Modifier.weight(1f)) {
-                    Text(item.name, fontWeight = FontWeight.Bold)
-                    Text(item.code, style = MaterialTheme.typography.bodySmall)
-                }
-                OutlinedButton(onClick = onClose) { Text("Cerrar") }
-            }
-            Text("GPS: ${if (gps) "OK" else "pendiente"} · Fotos: $photos")
-            if (!ready) {
-                Text("Falta la fotografía obligatoria.", color = MaterialTheme.colorScheme.error)
-                Button(onClick = onPhoto, modifier = Modifier.fillMaxWidth()) { Text("Tomar foto ahora") }
-            } else {
-                Text("Alta completa · lista para Hallazgos", color = MaterialTheme.colorScheme.primary, fontWeight = FontWeight.Bold)
-                OutlinedButton(onClick = onCreateAnother, modifier = Modifier.fillMaxWidth()) {
-                    Text("+ Crear otra Subinstalación")
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DynamicInventoryCard(
-    item: FieldInventoryItem,
-    onInspect: () -> Unit,
-    onAddChild: () -> Unit,
-) {
-    val typeCode = dynamicItemTypeCode(item)
-    Card(Modifier.fillMaxWidth()) {
-        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
-            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-                Text(item.name, fontWeight = FontWeight.SemiBold)
-                Text(if (typeCode == "subinstalacion") "Subinstalación" else "Instalación", style = MaterialTheme.typography.bodySmall)
-            }
-            Text(item.code, style = MaterialTheme.typography.bodySmall)
-            item.commonName?.takeIf { it.isNotBlank() }?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
-            Text(
-                if (item.readyForFinding) "Disponible" else "GPS/foto pendiente",
-                color = if (item.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
-                style = MaterialTheme.typography.bodySmall,
-            )
-            Button(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
-                Text(if (item.selectedInInspection) "Abrir para Hallazgo" else "Usar para Hallazgo")
-            }
-            if (typeCode == "instalacion") {
-                OutlinedButton(onClick = onAddChild, modifier = Modifier.fillMaxWidth()) {
-                    Text("+ Agregar Subinstalación")
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DynamicMessageStrip(model: MainViewModel) {
-    val error = model.error
-    val notice = model.notice
-    if (error != null || notice != null) {
-        Card(
-            modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp),
-            colors = CardDefaults.cardColors(
-                containerColor = if (error != null) MaterialTheme.colorScheme.errorContainer else MaterialTheme.colorScheme.secondaryContainer,
-            ),
-            onClick = { model.clearMessages() },
-        ) {
-            Text(error ?: notice.orEmpty(), Modifier.padding(12.dp))
-        }
-    }
-}
-
-private fun dynamicItemTypeCode(item: FieldInventoryItem): String {
-    val type = item.type ?: return ""
-    return dynamicNormalize(type.typeName ?: type.name)
-}
-
-private fun dynamicNormalize(value: String): String = value.trim().lowercase()
-    .replace('ó', 'o')
-    .replace('í', 'i')
-    .replace('á', 'a')
-    .replace('é', 'e')
-    .replace('ú', 'u')
-    .replace("_", "")
-    .replace("-", "")
-    .replace(" ", "")
-
-private fun dynamicStatusLabel(status: String): String = when (status) {
-    "PLANNED" -> "Planificada"
-    "IN_PROGRESS" -> "En curso"
-    "CLOSED" -> "Cerrada"
-    "CANCELLED" -> "Cancelada"
-    else -> status
-}
-
-private fun buildDynamicAttributes(type: FieldType, values: Map<String, String>): Map<String, Any?> =
-    type.attributes.mapNotNull { definition ->
-        val raw = values[definition.code]?.trim().orEmpty()
-        if (raw.isBlank()) return@mapNotNull null
-        definition.code to coerceDynamicAttribute(definition, raw)
-    }.toMap()
-
-private fun coerceDynamicAttribute(definition: FieldAttributeDefinition, raw: String): Any = when (definition.dataType.uppercase()) {
-    "INTEGER", "INT" -> raw.toLongOrNull() ?: raw
-    "NUMBER", "DECIMAL", "FLOAT", "DOUBLE" -> raw.replace(',', '.').toDoubleOrNull() ?: raw
-    "BOOLEAN", "BOOL" -> raw.lowercase() in setOf("true", "1", "si", "sí", "yes")
-    else -> raw
-}
-
-private fun dynamicHasPermission(context: Context, permission: String): Boolean =
-    ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
-
-private fun dynamicHasLocation(context: Context): Boolean =
-    dynamicHasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ||
-        dynamicHasPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
-
-private suspend fun currentDynamicGeo(context: Context): DynamicGeoSnapshot = suspendCancellableCoroutine { continuation ->
-    if (!dynamicHasLocation(context)) {
-        continuation.resumeWithException(SecurityException("Se necesita permiso de ubicación."))
-        return@suspendCancellableCoroutine
-    }
-    val source = CancellationTokenSource()
-    val client = LocationServices.getFusedLocationProviderClient(context)
-    try {
-        client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            .addOnSuccessListener { location ->
-                if (!continuation.isActive) return@addOnSuccessListener
-                if (location == null) {
-                    continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
-                } else {
-                    continuation.resume(DynamicGeoSnapshot(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() }
-}
-
-private fun newDynamicPhoto(context: Context): Pair<File, Uri> {
-    val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
-        ?: throw IllegalStateException("No se pudo acceder al almacenamiento de fotografías.")
-    directory.mkdirs()
-    val file = File.createTempFile("DH_FAST_${System.currentTimeMillis()}_", ".jpg", directory)
-    val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
-    return file to uri
-}
-
-private fun writeDynamicExif(file: File, geo: DynamicGeoSnapshot) {
-    val now = Instant.now()
-    val exif = ExifInterface(file)
-    exif.setLatLong(geo.latitude, geo.longitude)
-    val formatter = DateTimeFormatter.ofPattern("yyyy:MM:dd HH:mm:ss").withZone(ZoneId.systemDefault())
-    exif.setAttribute(ExifInterface.TAG_DATETIME_ORIGINAL, formatter.format(now))
-    exif.setAttribute(ExifInterface.TAG_DATETIME_DIGITIZED, formatter.format(now))
-    exif.saveAttributes()
-}
-
-private fun dynamicShortDate(value: String): String = value.replace('T', ' ').take(16)
@@ -86,10 +86,7 @@ fun F3VisitRoot(model: MainViewModel) {
                inventoryMode = true
            },
        )
-        inventoryMode -> F3FieldInventoryScreen(model, onBack = {
-            inventoryMode = false
-            actsMode = true
-        })
+        inventoryMode -> F3FieldInventoryScreen(model, onBack = { inventoryMode = false })
        else -> F3VisitOverview(
            model = model,
            onInventory = { inventoryMode = true },
@@ -122,9 +119,6 @@ private fun F3VisitOverview(
        }
        Text(visit.code, style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
        Text("${visit.operatorCompany?.name ?: "Sin operadora"} · ${visit.operationalArea?.name ?: "Sin área"}")
-        visit.scopeAsset?.let {
-            Text("Yacimiento: ${it.name}", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold)
-        }
        visit.plannedStartAt?.let {
            Text("Planificada: ${f3ShortDate(it)}", style = MaterialTheme.typography.bodySmall)
        }
@@ -144,10 +138,10 @@ private fun F3VisitOverview(
                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
            ) {
                Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    Text("Todo listo para comenzar", fontWeight = FontWeight.Bold)
-                    Text("Al iniciar, pasás directamente a las Actas de esta inspección.")
+                    Text("La inspección todavía no comenzó", fontWeight = FontWeight.Bold)
+                    Text("Iniciarla registra fecha/hora real y tu usuario como actor de campo.")
                    Button(
-                        onClick = { model.startVisit(); onActs() },
+                        onClick = { model.startVisit() },
                        enabled = !model.busy,
                        modifier = Modifier.fillMaxWidth(),
                    ) { Text(if (model.busy) "Iniciando…" else "Iniciar inspección") }
@@ -156,12 +150,12 @@ private fun F3VisitOverview(
        }

        if (visit.status == "IN_PROGRESS") {
-            Button(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
-                val open = model.acts.count { it.status == "DRAFT" || it.status == "READY" }
-                Text("Abrir Actas · ${model.acts.size}${if (open > 0) " · $open abiertas" else ""}")
+            Button(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
+                Text("Abrir Inventario de campo")
            }
-            OutlinedButton(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
-                Text("Inventario / Hallazgos")
+            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()) {
@@ -169,7 +163,7 @@ private fun F3VisitOverview(
            }
        } else if (visit.status == "PLANNED") {
            Text(
-                "Primero iniciá la inspección para habilitar Actas, Hallazgos y altas de campo.",
+                "Primero iniciá la inspección para habilitar altas, fotografías, Actas y Hallazgos.",
                style = MaterialTheme.typography.bodySmall,
            )
        }
@@ -215,9 +209,7 @@ private fun F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
    var search by rememberSaveable(visit.id) { mutableStateOf("") }
    var showCreate by rememberSaveable(visit.id) { mutableStateOf(false) }
    var parentId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
-    var parentLabel by rememberSaveable(visit.id) {
-        mutableStateOf(visit.scopeAsset?.name ?: "Yacimiento de la inspección")
-    }
+    var parentLabel by rememberSaveable(visit.id) { mutableStateOf("Área de la inspección") }
    var name by rememberSaveable(visit.id) { mutableStateOf("") }
    var commonName by rememberSaveable(visit.id) { mutableStateOf("") }
    var selectedTypeId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
@@ -331,10 +323,10 @@ private fun F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
            horizontalArrangement = Arrangement.SpaceBetween,
            verticalAlignment = Alignment.CenterVertically,
        ) {
-            OutlinedButton(onClick = onBack) { Text("Acta") }
+            OutlinedButton(onClick = onBack) { Text("Volver") }
            Column(horizontalAlignment = Alignment.End) {
-                Text("Nuevo Hallazgo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
-                Text("Elegí una Instalación o Subinstalación", style = MaterialTheme.typography.bodySmall)
+                Text("Inventario de campo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+                Text("Área → Yacimiento → Instalación → Subinstalación", style = MaterialTheme.typography.bodySmall)
            }
        }
        Column(Modifier.padding(horizontal = 16.dp)) { F3MessageStrip(model) }
@@ -418,182 +410,170 @@ private fun F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
            }
        }

-        Card(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 4.dp)) {
-            Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                Text("¿Dónde encontraste el Hallazgo?", fontWeight = FontWeight.Bold)
-                OutlinedTextField(
-                    value = search,
-                    onValueChange = { search = it },
-                    label = { Text("Buscar instalación o subinstalación") },
-                    modifier = Modifier.fillMaxWidth(),
-                    singleLine = true,
-                )
-                Row(
-                    Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    Button(
-                        onClick = { model.searchInventory(search) },
-                        enabled = !model.busy,
-                        modifier = Modifier.weight(1f),
-                    ) { Text("Buscar") }
-                    OutlinedButton(
-                        onClick = {
-                            showCreate = !showCreate
-                            if (showCreate) model.loadFieldTypes(parentId)
-                        },
-                        modifier = Modifier.weight(1f),
-                    ) { Text(if (showCreate) "Cancelar" else "+ Agregar") }
-                }
+        Row(
+            Modifier.fillMaxWidth().padding(horizontal = 16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedTextField(
+                value = search,
+                onValueChange = { search = it },
+                label = { Text("Buscar por nombre o código") },
+                modifier = Modifier.weight(1f),
+                singleLine = true,
+            )
+            Spacer(Modifier.width(8.dp))
+            Button(onClick = { model.searchInventory(search) }, enabled = !model.busy) { Text("Buscar") }
+        }
+
+        Row(
+            Modifier.fillMaxWidth().padding(16.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Column {
+                Text("Alta en campo", fontWeight = FontWeight.Bold)
+                Text("Padre: $parentLabel", style = MaterialTheme.typography.bodySmall)
            }
+            OutlinedButton(onClick = {
+                showCreate = !showCreate
+                if (showCreate) model.loadFieldTypes(parentId)
+            }) { Text(if (showCreate) "Ocultar" else "Agregar") }
        }

        if (showCreate) {
-            Card(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp)) {
-                Column(
-                    Modifier
-                        .fillMaxWidth()
-                        .padding(12.dp)
-                        .verticalScroll(rememberScrollState())
-                        .weight(1f, fill = false),
-                    verticalArrangement = Arrangement.spacedBy(10.dp),
-                ) {
-                    Text("Nueva alta de campo", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    Text("Ubicación: $parentLabel", style = MaterialTheme.typography.bodySmall)
-                    if (parentId != null) {
-                        OutlinedButton(onClick = {
-                            parentId = null
-                            parentLabel = visit.scopeAsset?.name ?: "Yacimiento de la inspección"
-                            resetCreateForm()
-                            selectedTypeId = null
-                            model.loadFieldTypes(null)
-                        }) { Text("Volver al Yacimiento") }
-                    }
-
-                    if (model.fieldTypes.isEmpty()) {
-                        Text("No hay un tipo disponible para esta ubicación.")
-                    } else {
-                        Text("Tipo de registro", style = MaterialTheme.typography.bodySmall)
-                        LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            items(model.fieldTypes, key = { it.id }) { type ->
-                                AssistChip(
-                                    onClick = {
-                                        selectedTypeId = type.id
-                                        selectedFamilyId = null
-                                        attributeValues.clear()
-                                    },
-                                    label = { Text(if (type.id == selectedTypeId) "✓ ${type.name}" else type.name) },
-                                )
-                            }
-                        }
-                    }
-
-                    if (selectedType?.familyRequired == true) {
-                        Text("Clasificación", fontWeight = FontWeight.Bold)
-                        Text(
-                            "Elegí el tipo técnico. Si no está catalogado, usá Otro / no catalogado.",
-                            style = MaterialTheme.typography.bodySmall,
-                        )
-                        LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                            items(selectedType.families, key = { it.id }) { family ->
-                                AssistChip(
-                                    onClick = { selectedFamilyId = family.id },
-                                    label = {
-                                        val prefix = when {
-                                            selectedFamilyId == family.id -> "✓ "
-                                            family.isOther -> "+ "
-                                            else -> ""
-                                        }
-                                        Text(prefix + family.name)
-                                    },
-                                )
-                            }
-                        }
-                        selectedFamily?.let { family ->
-                            if (family.isOther) {
-                                Text(
-                                    "Se registrará como no catalogado para revisión posterior en oficina.",
-                                    color = MaterialTheme.colorScheme.secondary,
-                                    style = MaterialTheme.typography.bodySmall,
-                                )
-                            }
-                            if (family.informationLabels.isNotEmpty()) {
-                                Text(
-                                    "Información esperada: ${family.informationLabels.joinToString(" · ")}",
-                                    style = MaterialTheme.typography.bodySmall,
-                                )
-                            }
-                        }
-                    }
-
-                    OutlinedTextField(
-                        value = name,
-                        onValueChange = { name = it },
-                        label = { Text("Nombre o código identificable *") },
-                        modifier = Modifier.fillMaxWidth(),
-                    )
-                    OutlinedTextField(
-                        value = commonName,
-                        onValueChange = { commonName = it },
-                        label = { Text("Nombre habitual") },
-                        modifier = Modifier.fillMaxWidth(),
-                    )
-
-                    selectedType?.attributes?.forEach { definition ->
-                        OutlinedTextField(
-                            value = attributeValues[definition.code].orEmpty(),
-                            onValueChange = { attributeValues[definition.code] = it },
-                            label = { Text(definition.name + if (definition.isRequired) " *" else "") },
-                            supportingText = {
-                                val details = listOfNotNull(definition.unit, definition.options?.toString()).joinToString(" · ")
-                                if (details.isNotBlank()) Text(details)
-                            },
-                            keyboardOptions = KeyboardOptions(
-                                keyboardType = if (
-                                    definition.dataType.uppercase() in setOf("NUMBER", "DECIMAL", "INTEGER", "FLOAT")
-                                ) KeyboardType.Decimal else KeyboardType.Text,
-                            ),
-                            modifier = Modifier.fillMaxWidth(),
-                        )
-                    }
-
-                    val attributesReady = selectedType?.attributes
-                        ?.filter { it.isRequired }
-                        ?.all { attributeValues[it.code].orEmpty().isNotBlank() }
-                        ?: false
-                    val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
-                    Button(
-                        onClick = {
-                            if (f3HasLocation(context)) createWithLocation()
-                            else locationPermissionLauncher.launch(
-                                arrayOf(
-                                    Manifest.permission.ACCESS_FINE_LOCATION,
-                                    Manifest.permission.ACCESS_COARSE_LOCATION,
-                                ),
-                            )
-                        },
-                        enabled = selectedType != null && name.isNotBlank() && attributesReady && familyReady && !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Guardar alta y capturar GPS") }
+            Column(
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp)
+                    .verticalScroll(rememberScrollState())
+                    .weight(1f, fill = false),
+                verticalArrangement = Arrangement.spacedBy(10.dp),
+            ) {
+                if (parentId != null) {
+                    OutlinedButton(onClick = {
+                        parentId = null
+                        parentLabel = "Área de la inspección"
+                        resetCreateForm()
+                        selectedTypeId = null
+                        model.loadFieldTypes(null)
+                    }) { Text("Volver al Área") }
                }
+
+                if (model.fieldTypes.isEmpty()) {
+                    Text("Este nivel no admite más hijos estructurales.")
+                } else {
+                    Text("Vas a crear", style = MaterialTheme.typography.bodySmall)
+                    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        items(model.fieldTypes, key = { it.id }) { type ->
+                            AssistChip(
+                                onClick = {
+                                    selectedTypeId = type.id
+                                    selectedFamilyId = null
+                                    attributeValues.clear()
+                                },
+                                label = { Text(if (type.id == selectedTypeId) "✓ ${type.name}" else type.name) },
+                            )
+                        }
+                    }
+                }
+
+                if (selectedType?.familyRequired == true) {
+                    Text("Familia técnica", fontWeight = FontWeight.Bold)
+                    Text(
+                        "Elegí la que corresponda al Excel. Si no existe, usá Otro / no catalogado; nunca quedás bloqueado.",
+                        style = MaterialTheme.typography.bodySmall,
+                    )
+                    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        items(selectedType.families, key = { it.id }) { family ->
+                            AssistChip(
+                                onClick = { selectedFamilyId = family.id },
+                                label = {
+                                    val prefix = when {
+                                        selectedFamilyId == family.id -> "✓ "
+                                        family.isOther -> "+ "
+                                        else -> ""
+                                    }
+                                    Text(prefix + family.name)
+                                },
+                            )
+                        }
+                    }
+                    selectedFamily?.let { family ->
+                        if (family.isOther) {
+                            Text(
+                                "Se registrará como familia no catalogada para revisión posterior en oficina.",
+                                color = MaterialTheme.colorScheme.secondary,
+                                style = MaterialTheme.typography.bodySmall,
+                            )
+                        }
+                        if (family.informationLabels.isNotEmpty()) {
+                            Text(
+                                "Información esperada: ${family.informationLabels.joinToString(" · ")}",
+                                style = MaterialTheme.typography.bodySmall,
+                            )
+                        }
+                    }
+                }
+
+                OutlinedTextField(
+                    value = name,
+                    onValueChange = { name = it },
+                    label = { Text("Nombre identificable *") },
+                    modifier = Modifier.fillMaxWidth(),
+                )
+                OutlinedTextField(
+                    value = commonName,
+                    onValueChange = { commonName = it },
+                    label = { Text("Nombre habitual") },
+                    modifier = Modifier.fillMaxWidth(),
+                )
+
+                selectedType?.attributes?.forEach { definition ->
+                    OutlinedTextField(
+                        value = attributeValues[definition.code].orEmpty(),
+                        onValueChange = { attributeValues[definition.code] = it },
+                        label = { Text(definition.name + if (definition.isRequired) " *" else "") },
+                        supportingText = {
+                            val details = listOfNotNull(definition.unit, definition.options?.toString()).joinToString(" · ")
+                            if (details.isNotBlank()) Text(details)
+                        },
+                        keyboardOptions = KeyboardOptions(
+                            keyboardType = if (
+                                definition.dataType.uppercase() in setOf("NUMBER", "DECIMAL", "INTEGER", "FLOAT")
+                            ) KeyboardType.Decimal else KeyboardType.Text,
+                        ),
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                }
+
+                val attributesReady = selectedType?.attributes
+                    ?.filter { it.isRequired }
+                    ?.all { attributeValues[it.code].orEmpty().isNotBlank() }
+                    ?: false
+                val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
+                Button(
+                    onClick = {
+                        if (f3HasLocation(context)) createWithLocation()
+                        else locationPermissionLauncher.launch(
+                            arrayOf(
+                                Manifest.permission.ACCESS_FINE_LOCATION,
+                                Manifest.permission.ACCESS_COARSE_LOCATION,
+                            ),
+                        )
+                    },
+                    enabled = selectedType != null && name.isNotBlank() && attributesReady && familyReady && !model.busy,
+                    modifier = Modifier.fillMaxWidth(),
+                ) { Text("Capturar GPS y crear") }
+                HorizontalDivider()
            }
        }

-        Text(
-            "Instalaciones y subinstalaciones",
-            modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            fontWeight = FontWeight.Bold,
-        )
+        Text("Estructura disponible", modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), fontWeight = FontWeight.Bold)
        LazyColumn(
            Modifier.fillMaxSize().padding(horizontal = 16.dp),
            verticalArrangement = Arrangement.spacedBy(8.dp),
        ) {
-            items(
-                model.inventory.filter { candidate ->
-                    candidate.type?.let(::f3TypeCode) in setOf("instalacion", "subinstalacion")
-                },
-                key = { it.id },
-            ) { item ->
+            items(model.inventory, key = { it.id }) { item ->
                F3InventoryCard(
                    item = item,
                    onInspect = { model.selectExisting(item) },
@@ -631,10 +611,10 @@ private fun F3CaptureCard(
            if (captureRequired) {
                Text("GPS de alta: ${if (gps) "OK" else "pendiente"} · Fotos: $photos")
                if (!ready) {
-                    Text("Antes de registrar el Hallazgo, completá GPS + foto.", color = MaterialTheme.colorScheme.error)
+                    Text("Antes de registrar Hallazgos, completá GPS + foto.", color = MaterialTheme.colorScheme.error)
                    Button(onClick = onPhoto, modifier = Modifier.fillMaxWidth()) { Text("Tomar foto obligatoria") }
                } else {
-                    Text("Captura completa · listo para el Hallazgo", color = MaterialTheme.colorScheme.primary)
+                    Text("Captura completa · listo para Hallazgos", color = MaterialTheme.colorScheme.primary)
                }
            } else {
                Text("Registro existente seleccionado.", style = MaterialTheme.typography.bodySmall)
@@ -651,8 +631,8 @@ private fun F3InventoryCard(
 ) {
    val typeCode = item.type?.let(::f3TypeCode).orEmpty()
    val canHaveFinding = typeCode in setOf("instalacion", "subinstalacion")
-    val canHaveChild = typeCode == "instalacion"
-    val childLabel = "+ Agregar subinstalación"
+    val canHaveChild = typeCode in setOf("yacimiento", "instalacion")
+    val childLabel = if (typeCode == "yacimiento") "Agregar instalación aquí" else "Agregar subinstalación aquí"

    Card(Modifier.fillMaxWidth()) {
        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
@@ -666,12 +646,12 @@ private fun F3InventoryCard(
            }
            if (canHaveFinding) {
                Text(
-                    if (item.readyForFinding) "Disponible" else "GPS/foto pendiente",
+                    if (item.readyForFinding) "Disponible para Hallazgos" else "GPS/foto pendiente",
                    color = if (item.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
                    style = MaterialTheme.typography.bodySmall,
                )
-                Button(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
-                    Text(if (item.selectedInInspection) "Seleccionar para Hallazgo" else "Usar para Hallazgo")
+                OutlinedButton(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
+                    Text(if (item.selectedInInspection) "Abrir Hallazgos" else "Usar en esta inspección")
                }
            }
            if (canHaveChild) {
@@ -747,20 +727,16 @@ private suspend fun currentF3Geo(context: Context): F3GeoSnapshot = suspendCance
    }
    val source = CancellationTokenSource()
    val client = LocationServices.getFusedLocationProviderClient(context)
-    try {
-        client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            .addOnSuccessListener { location ->
-                if (!continuation.isActive) return@addOnSuccessListener
-                if (location == null) {
-                    continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
-                } else {
-                    continuation.resume(F3GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
-                }
+    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) {
+                continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+            } else {
+                continuation.resume(F3GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
            }
-            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
-    } catch (error: SecurityException) {
-        if (continuation.isActive) continuation.resumeWithException(error)
-    }
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
    continuation.invokeOnCancellation { source.cancel() }
 }

@@ -75,7 +75,6 @@ fun FieldFindingScreen(model: MainViewModel) {
    var severityText by rememberSaveable(asset.id) { mutableStateOf("") }
    var correctionDueOn by rememberSaveable(asset.id) { mutableStateOf("") }

-    var localError by rememberSaveable { mutableStateOf<String?>(null) }
    var requestedFindingId by remember { mutableStateOf<String?>(null) }
    var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
    var pendingPhotoGeo by remember { mutableStateOf<FindingGeoSnapshot?>(null) }
@@ -111,7 +110,6 @@ fun FieldFindingScreen(model: MainViewModel) {
                    pendingPhotoFindingId = findingId
                    takePicture.launch(uri)
                }
-                .onFailure { localError = it.message ?: "No se pudo capturar la ubicación GPS." }
        }
    }

@@ -124,7 +122,6 @@ fun FieldFindingScreen(model: MainViewModel) {
        val findingId = requestedFindingId
        requestedFindingId = null
        if (camera && location && findingId != null) beginPhoto(findingId)
-        else localError = "Permití cámara y ubicación para adjuntar una foto con GPS."
    }

    fun requestPhoto(findingId: String) {
@@ -188,14 +185,13 @@ fun FieldFindingScreen(model: MainViewModel) {
                Text(asset.name, fontWeight = FontWeight.Bold)
                Text("${asset.code} · Acta ${options.act.code}", style = MaterialTheme.typography.bodySmall)
                Text(
-                    "GPS + foto del Inventario: ${if (options.capture.readyForFinding) "completo" else "pendiente"}",
+                    "GPS + foto del Inventario: ${if (options.capture.readyForFinding) "OK" else "pendiente"}",
                    color = if (options.capture.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
                    style = MaterialTheme.typography.bodySmall,
                )
            }
        }

-        localError?.let { Text(it, color = MaterialTheme.colorScheme.error) }
        model.error?.let {
            Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer)) {
                Text(it, Modifier.padding(12.dp))
@@ -214,7 +210,7 @@ fun FieldFindingScreen(model: MainViewModel) {
                Card(Modifier.fillMaxWidth()) {
                    Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
                        Text("${finding.code} · ${finding.title}", fontWeight = FontWeight.SemiBold)
-                        Text("Gravedad: ${finding.severity ?: "s/d"} · ${findingStatusLabelEs(finding.status)}", style = MaterialTheme.typography.bodySmall)
+                        Text("Gravedad: ${finding.severity ?: "s/d"} · ${finding.status}", style = MaterialTheme.typography.bodySmall)
                        Text(
                            "Evidencias: ${evidence.size} · Fotos: ${evidence.count { it.kind == "PHOTO" }}",
                            style = MaterialTheme.typography.bodySmall,
@@ -393,17 +389,13 @@ private suspend fun currentFindingGeo(context: Context): FindingGeoSnapshot = su
    }
    val source = CancellationTokenSource()
    val client = LocationServices.getFusedLocationProviderClient(context)
-    try {
-        client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
-            .addOnSuccessListener { location ->
-                if (!continuation.isActive) return@addOnSuccessListener
-                if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
-                else continuation.resume(FindingGeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
-            }
-            .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
-    } catch (error: SecurityException) {
-        if (continuation.isActive) continuation.resumeWithException(error)
-    }
+    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+            else continuation.resume(FindingGeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
    continuation.invokeOnCancellation { source.cancel() }
 }

@@ -3,18 +3,12 @@ package com.korexlabs.dhinspeccion.ui
 import android.content.Context
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 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.safeDrawingPadding
-import androidx.compose.foundation.layout.imePadding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material.icons.filled.VisibilityOff
@@ -35,9 +29,7 @@ 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.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
@@ -45,7 +37,6 @@ import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import com.korexlabs.dhinspeccion.MainViewModel
-import com.korexlabs.dhinspeccion.R

 private const val BIOMETRIC_PREFS = "dh_v2_biometric"
 private const val BIOMETRIC_ENABLED = "enabled"
@@ -83,8 +74,8 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
        if (model.session == null) unlocked = false
    }

-    DhTheme {
-        Surface(Modifier.fillMaxSize().safeDrawingPadding().imePadding()) {
+    MaterialTheme {
+        Surface(Modifier.fillMaxSize()) {
            when {
                model.session == null -> EnhancedLoginScreen(model) {
                    passwordLoginInFlight = true
@@ -100,8 +91,8 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
                    },
                )
                model.fieldFindingOptions != null -> FieldFindingScreen(model)
-                model.visit != null -> ModernVisitRoot(model)
-                else -> MobileHomeScreen(model)
+                model.visit != null -> F3VisitRoot(model)
+                else -> DhApp(model)
            }
        }
    }
@@ -110,17 +101,11 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
@Composable
 private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Unit) {
    var identifier by rememberSaveable { mutableStateOf("") }
-    var password by remember { mutableStateOf("") }
+    var password by rememberSaveable { mutableStateOf("") }
    var passwordVisible by rememberSaveable { mutableStateOf(false) }

-    Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(24.dp), contentAlignment = Alignment.Center) {
-        Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp), horizontalAlignment = Alignment.CenterHorizontally) {
-            Image(
-                painter = painterResource(R.drawable.ic_mendoza_launcher_exact),
-                contentDescription = "Gobierno de Mendoza",
-                modifier = Modifier.fillMaxWidth().height(170.dp),
-                contentScale = ContentScale.Fit,
-            )
+    Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
+        Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp)) {
            Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
            Text("Aplicación de campo · Dirección de Hidrocarburos")
            model.error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
@@ -128,7 +113,7 @@ private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Uni
            OutlinedTextField(
                value = identifier,
                onValueChange = { identifier = it },
-                label = { Text("Usuario o correo electrónico") },
+                label = { Text("Usuario o email") },
                modifier = Modifier.fillMaxWidth(),
                singleLine = true,
            )
@@ -207,18 +192,12 @@ private fun BiometricUnlockScreen(

    LaunchedEffect(Unit) { authenticate() }

-    Box(Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(24.dp), contentAlignment = Alignment.Center) {
+    Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
        Column(
            Modifier.fillMaxWidth(),
            verticalArrangement = Arrangement.spacedBy(14.dp),
            horizontalAlignment = Alignment.CenterHorizontally,
        ) {
-            Image(
-                painter = painterResource(R.drawable.ic_mendoza_launcher_exact),
-                contentDescription = "Gobierno de Mendoza",
-                modifier = Modifier.fillMaxWidth().height(140.dp),
-                contentScale = ContentScale.Fit,
-            )
            Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
            Text("Ingresá con tu huella")
            error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
@@ -57,31 +57,30 @@ fun MobileActsScreen(
    val visit = model.visit ?: return
    val selected = model.selectedAct
    val closure = model.actClosure
-    val representativeSeed = closure?.responsible ?: closure?.representativeSuggestion
    val context = LocalContext.current
    val scope = rememberCoroutineScope()

-    var closingUrgency by rememberSaveable(selected?.id) { mutableStateOf("") }
+    var newActUrgency by rememberSaveable(visit.id) { mutableStateOf("NON_URGENT") }
    var attendance by rememberSaveable(selected?.id) {
-        mutableStateOf(representativeSeed?.attendanceStatus ?: "PRESENT")
+        mutableStateOf(closure?.responsible?.attendanceStatus ?: "PRESENT")
    }
    var fullName by rememberSaveable(selected?.id) {
-        mutableStateOf(representativeSeed?.fullName.orEmpty())
+        mutableStateOf(closure?.responsible?.fullName.orEmpty())
    }
    var documentType by rememberSaveable(selected?.id) {
-        mutableStateOf("DNI")
+        mutableStateOf(closure?.responsible?.documentType ?: "DNI")
    }
    var documentNumber by rememberSaveable(selected?.id) {
-        mutableStateOf(representativeSeed?.documentNumber.orEmpty())
+        mutableStateOf(closure?.responsible?.documentNumber.orEmpty())
    }
    var position by rememberSaveable(selected?.id) {
-        mutableStateOf(representativeSeed?.position.orEmpty())
+        mutableStateOf(closure?.responsible?.position.orEmpty())
    }
    var email by rememberSaveable(selected?.id) {
-        mutableStateOf(representativeSeed?.email.orEmpty())
+        mutableStateOf(closure?.responsible?.email.orEmpty())
    }
    var phone by rememberSaveable(selected?.id) {
-        mutableStateOf(representativeSeed?.phone.orEmpty())
+        mutableStateOf(closure?.responsible?.phone.orEmpty())
    }
    var absenceReason by rememberSaveable(selected?.id) {
        mutableStateOf(closure?.responsible?.absenceReason.orEmpty())
@@ -127,22 +126,17 @@ fun MobileActsScreen(
            Text("Actas", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
        }
        Text("${visit.code} · ${visit.operatorCompany?.name.orEmpty()}")
-        visit.scopeAsset?.let { Text("Yacimiento: ${it.name}", style = MaterialTheme.typography.bodySmall) }
        F32ActMessage(model)

        Card(Modifier.fillMaxWidth()) {
            Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                Text("Actas de esta inspección", fontWeight = FontWeight.Bold)
+                Text("Actas de esta Inspección", fontWeight = FontWeight.Bold)
                if (model.acts.isEmpty()) {
-                    Text("Todavía no hay Actas. Creá la primera y después agregá los Hallazgos.")
+                    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 = when (act.urgency) {
-                        "URGENT" -> "URGENTE"
-                        "NON_URGENT" -> "No urgente"
-                        else -> "Urgencia pendiente"
-                    }
+                    val urgency = if (act.urgency == "URGENT") "URGENTE" else "No urgente"
                    OutlinedButton(
                        onClick = { model.selectAct(act.id) },
                        modifier = Modifier.fillMaxWidth(),
@@ -162,27 +156,47 @@ fun MobileActsScreen(
                Modifier.fillMaxWidth(),
                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
            ) {
-                Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                    Text("Nueva Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                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(
-                        "La urgencia se define al cerrar el Acta, después de completar los Hallazgos.",
+                        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,
                    )
-                    Text(
-                        "Abrí el Acta primero. Después elegís la Instalación o Subinstalación al agregar cada Hallazgo.",
-                        style = MaterialTheme.typography.bodySmall,
-                    )
-                    Button(
-                        onClick = { model.createAct() },
-                        enabled = !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Crear nueva Acta") }
+                    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") }
+                    }
                }
            }
        }
@@ -193,13 +207,7 @@ fun MobileActsScreen(
                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(
-                        when (selected.urgency) {
-                            "URGENT" -> "Urgencia: Urgente"
-                            "NON_URGENT" -> "Urgencia: No urgente"
-                            else -> "Urgencia: se define al cerrar el Acta"
-                        },
-                    )
+                    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") {
@@ -212,40 +220,29 @@ fun MobileActsScreen(

            when (selected.status) {
                "DRAFT" -> {
-                    Card(
-                        Modifier.fillMaxWidth(),
-                        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
-                    ) {
-                        Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                            Text("Hallazgos", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            Text("Buscá una Instalación o Subinstalación existente. Si no está, podés agregarla en campo en el mismo flujo.")
-                            Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) {
-                                Text("+ Agregar Hallazgo")
-                            }
-                        }
-                    }
-
-                    HorizontalDivider()
-                    Text("Representante de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    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("Nombres y apellidos *") }, modifier = Modifier.fillMaxWidth())
-                        OutlinedTextField(documentNumber, { documentNumber = it.filter(Char::isDigit) }, label = { Text("DNI *") }, modifier = Modifier.fillMaxWidth())
-                        OutlinedTextField(position, { position = it }, label = { Text("Cargo / función *") }, modifier = Modifier.fillMaxWidth())
-                        OutlinedTextField(email, { email = it }, label = { Text("Email *") }, modifier = Modifier.fillMaxWidth())
-                        if (closure?.responsible == null && closure?.representativeSuggestion != null) {
-                            Text("Datos precargados del Acta anterior. Confirmalos para esta Acta.", style = MaterialTheme.typography.bodySmall)
+                        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() && email.contains("@") && email.contains("."),
+                            enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank(),
                            modifier = Modifier.fillMaxWidth(),
-                        ) { Text("Guardar representante") }
+                        ) { Text("Guardar responsable") }
                    } else {
                        OutlinedTextField(
                            absenceReason,
@@ -262,21 +259,16 @@ fun MobileActsScreen(
                    }

                    HorizontalDivider()
-                    Text("Finalizar contenido", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    Text("Al cerrar el Acta, el contenido y los Hallazgos quedan inmutables. Definí ahora una única urgencia para el Acta completa; no para cada Hallazgo.")
-                    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                        AssistChip(
-                            onClick = { closingUrgency = "NON_URGENT" },
-                            label = { Text(if (closingUrgency == "NON_URGENT") "✓ No urgente" else "No urgente") },
-                        )
-                        AssistChip(
-                            onClick = { closingUrgency = "URGENT" },
-                            label = { Text(if (closingUrgency == "URGENT") "✓ Urgente" else "Urgente") },
-                        )
-                    }
+                    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(closingUrgency) },
-                        enabled = !model.busy && closure?.responsible != null && closingUrgency.isNotBlank(),
+                        onClick = { model.prepareSelectedAct() },
+                        enabled = !model.busy && closure?.responsible != null,
                        modifier = Modifier.fillMaxWidth(),
                    ) { Text("Finalizar y BLOQUEAR Acta") }
                }
@@ -308,7 +300,7 @@ fun MobileActsScreen(
                    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 disconformidad" else "Firma en conformidad"
+                            "SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma en conformidad"
                            "REFUSED" -> "Negativa a firmar"
                            else -> companyOutcome.status
                        }
@@ -317,26 +309,26 @@ fun MobileActsScreen(
                        companyOutcome.companyStatement?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
                    } else if (closure?.responsible?.attendanceStatus == "ABSENT") {
                        Text(
-                            "El representante fue registrado como ausente. La ausencia NO resuelve la manifestación: deberá obtenerse firma o negativa posteriormente antes de SELLAR el Acta.",
+                            "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 disconformidad" else "En disconformidad") })
+                            AssistChip(onClick = { manifestation = "DISSENT" }, label = { Text(if (manifestation == "DISSENT") "✓ En disidencia" else "En disidencia") })
                        }
                        if (manifestation == "DISSENT") {
                            OutlinedTextField(
                                dissentStatement,
                                { dissentStatement = it },
-                                label = { Text("Motivo de disconformidad *") },
+                                label = { Text("Manifestación de disidencia *") },
                                minLines = 2,
                                modifier = Modifier.fillMaxWidth(),
                            )
                        }
                        SignaturePad(
-                            label = "Firma del representante de la empresa",
+                            label = "Firma del responsable de empresa",
                            enabled = !model.busy && inspectorSigned && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
                            onCaptured = { file -> signWithGeo(file, company = true) },
                        )
@@ -439,17 +431,13 @@ private suspend fun currentActSignatureGeo(context: Context): ActSignatureGeo =
        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)
-    }
+    LocationServices.getFusedLocationProviderClient(context)
+        .getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) continuation.resumeWithException(IllegalStateException("Ubicación no disponible"))
+            else continuation.resume(ActSignatureGeo(location.latitude, location.longitude, location.accuracy.toDouble()))
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
    continuation.invokeOnCancellation { source.cancel() }
 }
@@ -1,231 +0,0 @@
-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(visitStatusLabelEs(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,
-            )
-        }
-    }
-}
@@ -1,563 +0,0 @@
-package com.korexlabs.dhinspeccion.ui
-
-import android.Manifest
-import android.content.Context
-import android.content.pm.PackageManager
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.layout.Arrangement
-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.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Assignment
-import androidx.compose.material.icons.filled.CheckCircle
-import androidx.compose.material.icons.filled.EditNote
-import androidx.compose.material.icons.filled.ErrorOutline
-import androidx.compose.material.icons.filled.Lock
-import androidx.compose.material.icons.filled.Person
-import androidx.compose.material3.Button
-import androidx.compose.material3.ElevatedCard
-import androidx.compose.material3.FilterChip
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Surface
-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.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-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 ModernActSignatureGeo(
-    val latitude: Double,
-    val longitude: Double,
-    val accuracyM: Double?,
-)
-
-@Composable
-fun ModernMobileActsScreen(
-    model: MainViewModel,
-    onBack: () -> Unit,
-    onGoInventory: () -> Unit,
-) {
-    val visit = model.visit ?: return
-    val selected = model.selectedAct
-    val closure = model.actClosure
-    val representativeSeed = closure?.responsible ?: closure?.representativeSuggestion
-    val context = LocalContext.current
-    val scope = rememberCoroutineScope()
-
-    var closingUrgency by rememberSaveable(selected?.id) { mutableStateOf("") }
-    var attendance by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.attendanceStatus ?: "PRESENT") }
-    var fullName by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.fullName.orEmpty()) }
-    var documentType by rememberSaveable(selected?.id) { mutableStateOf("DNI") }
-    var documentNumber by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.documentNumber.orEmpty()) }
-    var position by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.position.orEmpty()) }
-    var email by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.email.orEmpty()) }
-    var phone by rememberSaveable(selected?.id) { mutableStateOf(representativeSeed?.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 { currentModernActSignatureGeo(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(horizontal = 18.dp, vertical = 16.dp),
-        verticalArrangement = Arrangement.spacedBy(14.dp),
-    ) {
-        ModernHeader(title = "Actas", subtitle = visit.code, onBack = onBack)
-
-        Surface(
-            modifier = Modifier.fillMaxWidth(),
-            shape = MaterialTheme.shapes.large,
-            tonalElevation = 1.dp,
-        ) {
-            Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
-                Text(
-                    visit.scopeAsset?.name ?: "Yacimiento",
-                    style = MaterialTheme.typography.titleMedium,
-                    fontWeight = FontWeight.Bold,
-                )
-                visit.operatorCompany?.name?.takeIf { it.isNotBlank() }?.let {
-                    Text(
-                        it,
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        maxLines = 2,
-                        overflow = TextOverflow.Ellipsis,
-                    )
-                }
-            }
-        }
-
-        ModernMessage(model)
-
-        if (model.acts.isEmpty()) {
-            ElevatedCard(Modifier.fillMaxWidth()) {
-                Column(
-                    Modifier.padding(20.dp),
-                    verticalArrangement = Arrangement.spacedBy(8.dp),
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                ) {
-                    Icon(Icons.Filled.Assignment, contentDescription = null, tint = MaterialTheme.colorScheme.secondary)
-                    Text("Todavía no hay Actas", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    Text(
-                        "Creá la primera Acta y después incorporá Hallazgos seleccionando el Inventario.",
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    )
-                }
-            }
-        } else {
-            Text("Actas de esta inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-            model.acts.forEach { act ->
-                val active = selected?.id == act.id
-                Surface(
-                    onClick = { model.selectAct(act.id) },
-                    modifier = Modifier.fillMaxWidth(),
-                    shape = MaterialTheme.shapes.large,
-                    color = if (active) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface,
-                    tonalElevation = if (active) 1.dp else 0.dp,
-                    border = BorderStroke(
-                        if (active) 2.dp else 1.dp,
-                        if (active) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outlineVariant,
-                    ),
-                ) {
-                    Row(
-                        Modifier.padding(15.dp),
-                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.spacedBy(12.dp),
-                    ) {
-                        Icon(
-                            when (act.status) {
-                                "LOCKED" -> Icons.Filled.Lock
-                                "SEALED" -> Icons.Filled.CheckCircle
-                                else -> Icons.Filled.EditNote
-                            },
-                            contentDescription = null,
-                            tint = if (active) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.secondary,
-                        )
-                        Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) {
-                            Text(act.code, fontWeight = FontWeight.Bold)
-                            Text(
-                                "${modernActStatusLabel(act.status)} · ${when (act.urgency) { "URGENT" -> "Urgente"; "NON_URGENT" -> "No urgente"; else -> "Urgencia pendiente" }}",
-                                style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            )
-                            Text(
-                                "${act.findingCount} Hallazgo${if (act.findingCount == 1) "" else "s"} · ${act.assetCount} elemento${if (act.assetCount == 1) "" else "s"}",
-                                style = MaterialTheme.typography.bodySmall,
-                            )
-                        }
-                        if (active) Icon(Icons.Filled.CheckCircle, "Seleccionada", tint = MaterialTheme.colorScheme.primary)
-                    }
-                }
-            }
-        }
-
-        val hasDraftAct = model.acts.any { it.status == "DRAFT" }
-        if (visit.status == "IN_PROGRESS" && !hasDraftAct) {
-            ElevatedCard(Modifier.fillMaxWidth()) {
-                Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                    Row(verticalAlignment = Alignment.CenterVertically) {
-                        Surface(shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.primaryContainer) {
-                            Icon(Icons.Filled.Add, null, Modifier.padding(10.dp), tint = MaterialTheme.colorScheme.primary)
-                        }
-                        Spacer(Modifier.width(10.dp))
-                        Column {
-                            Text("Nueva Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            Text("Un solo borrador activo por vez", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-                        }
-                    }
-
-                    Text(
-                        "La urgencia se define recién al cerrar el Acta, cuando ya se conoce el resultado de la inspección.",
-                        style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    )
-                    Button(
-                        onClick = { model.createAct() },
-                        enabled = !model.busy,
-                        modifier = Modifier.fillMaxWidth(),
-                    ) {
-                        Icon(Icons.Filled.Add, null)
-                        Spacer(Modifier.width(7.dp))
-                        Text(if (model.busy) "Creando…" else "Crear nueva Acta")
-                    }
-                }
-            }
-        }
-
-        if (selected != null) {
-            HorizontalDivider()
-            Surface(
-                Modifier.fillMaxWidth(),
-                shape = MaterialTheme.shapes.large,
-                color = MaterialTheme.colorScheme.surfaceVariant,
-            ) {
-                Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
-                    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) {
-                        Text(selected.code, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                        StatusPill(modernActStatusLabel(selected.status))
-                    }
-                    Text(
-                        when (selected.urgency) {
-                            "URGENT" -> "Urgencia · Urgente"
-                            "NON_URGENT" -> "Urgencia · No urgente"
-                            else -> "Urgencia · Se define al cerrar el Acta"
-                        },
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    )
-                    Text("${selected.findingCount} Hallazgos · ${selected.assetCount} elementos de Inventario", style = MaterialTheme.typography.bodySmall)
-                    selected.deadlineAt?.let { Text("Vencimiento · $it", style = MaterialTheme.typography.bodySmall) }
-                    if (selected.deadlineAt == null && selected.deadlineBasis == "GEDO_DATE") {
-                        Text("Vencimiento pendiente de fecha GEDO", style = MaterialTheme.typography.bodySmall)
-                    }
-                }
-            }
-
-            when (selected.status) {
-                "DRAFT" -> {
-                    ElevatedCard(Modifier.fillMaxWidth()) {
-                        Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                            Text("Hallazgos", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            Text(
-                                "Elegí una Instalación o Subinstalación existente, o creala en campo si todavía no está registrada.",
-                                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            )
-                            Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) {
-                                Icon(Icons.Filled.Add, null)
-                                Spacer(Modifier.width(6.dp))
-                                Text("Agregar Hallazgo")
-                            }
-                        }
-                    }
-
-                    ElevatedCard(Modifier.fillMaxWidth()) {
-                        Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                            Row(verticalAlignment = Alignment.CenterVertically) {
-                                Icon(Icons.Filled.Person, null, tint = MaterialTheme.colorScheme.primary)
-                                Spacer(Modifier.width(8.dp))
-                                Text("Representante de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            }
-                            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                                FilterChip(selected = attendance == "PRESENT", onClick = { attendance = "PRESENT" }, label = { Text("Presente") })
-                                FilterChip(selected = attendance == "ABSENT", onClick = { attendance = "ABSENT" }, label = { Text("Ausente") })
-                            }
-                            if (attendance == "PRESENT") {
-                                OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombres y apellidos *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                OutlinedTextField(documentNumber, { documentNumber = it.filter(Char::isDigit) }, label = { Text("DNI *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                OutlinedTextField(position, { position = it }, label = { Text("Cargo / función *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                OutlinedTextField(email, { email = it }, label = { Text("Email *") }, modifier = Modifier.fillMaxWidth(), singleLine = true)
-                                if (closure?.responsible == null && closure?.representativeSuggestion != null) {
-                                    Text("Datos precargados del Acta anterior. Confirmalos antes de cerrar esta Acta.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-                                }
-                                Button(
-                                    onClick = { model.setCompanyResponsiblePresent(fullName, documentType, documentNumber, position, email, phone) },
-                                    enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank() && email.contains("@") && email.contains("."),
-                                    modifier = Modifier.fillMaxWidth(),
-                                ) { Text("Guardar representante") }
-                            } 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") }
-                            }
-                        }
-                    }
-
-                    ElevatedCard(Modifier.fillMaxWidth()) {
-                        Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                            Row(verticalAlignment = Alignment.CenterVertically) {
-                                Icon(Icons.Filled.Lock, null, tint = MaterialTheme.colorScheme.error)
-                                Spacer(Modifier.width(8.dp))
-                                Text("Cerrar Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            }
-                            Text(
-                                "Al cerrar el contenido, el Acta queda inmutable y pasa a Pendiente de firma. En este momento definí la urgencia del Acta completa. La urgencia no se asigna a cada Hallazgo.",
-                                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            )
-                            Text("Urgencia del Acta", fontWeight = FontWeight.SemiBold)
-                            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                                FilterChip(
-                                    selected = closingUrgency == "NON_URGENT",
-                                    onClick = { closingUrgency = "NON_URGENT" },
-                                    label = { Text("No urgente") },
-                                )
-                                FilterChip(
-                                    selected = closingUrgency == "URGENT",
-                                    onClick = { closingUrgency = "URGENT" },
-                                    label = { Text("Urgente") },
-                                )
-                            }
-                            Text(
-                                when (closingUrgency) {
-                                    "URGENT" -> "El plazo urgente se computará desde el Acta según la política vigente."
-                                    "NON_URGENT" -> "El plazo no urgente comenzará con la oficialización GEDO."
-                                    else -> "Elegí una opción para habilitar el cierre."
-                                },
-                                style = MaterialTheme.typography.bodySmall,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            )
-                            Button(
-                                onClick = { model.prepareSelectedAct(closingUrgency) },
-                                enabled = !model.busy && closure?.responsible != null && closingUrgency.isNotBlank(),
-                                modifier = Modifier.fillMaxWidth(),
-                            ) { Text("Cerrar Acta y dejar pendiente de firma") }
-                        }
-                    }
-                }
-
-                "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"
-
-                    ElevatedCard(Modifier.fillMaxWidth()) {
-                        Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                            Row(verticalAlignment = Alignment.CenterVertically) {
-                                Icon(Icons.Filled.Lock, null, tint = MaterialTheme.colorScheme.secondary)
-                                Spacer(Modifier.width(8.dp))
-                                Text("Acta pendiente de firma", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                            }
-                            Text("El contenido ya está cerrado e inmutable. Completá la firma del inspector y la manifestación de la empresa cuando corresponda.")
-                            closure?.closure?.preparedSha256?.let { Text("Huella de integridad · $it", style = MaterialTheme.typography.bodySmall) }
-
-                            HorizontalDivider()
-                            Text("Firma del inspector", fontWeight = FontWeight.Bold)
-                            if (inspectorSigned) {
-                                SuccessLine("Firma del inspector registrada")
-                            } 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 disconformidad" else "Firma en conformidad"
-                                    "REFUSED" -> "Negativa a firmar"
-                                    else -> humanBackendLabelEs(companyOutcome.status)
-                                }
-                                SuccessLine(detail)
-                                companyOutcome.reason?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
-                                companyOutcome.companyStatement?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
-                            } else if (closure?.responsible?.attendanceStatus == "ABSENT") {
-                                Surface(Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.errorContainer) {
-                                    Row(Modifier.padding(12.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                                        Icon(Icons.Filled.ErrorOutline, null, tint = MaterialTheme.colorScheme.error)
-                                        Text(
-                                            "La ausencia no resuelve la manifestación. Debe registrarse firma o negativa antes de firmar y cerrar el Acta.",
-                                            Modifier.weight(1f),
-                                            style = MaterialTheme.typography.bodySmall,
-                                        )
-                                    }
-                                }
-                            } else {
-                                Text(closure?.consents?.company.orEmpty(), style = MaterialTheme.typography.bodySmall)
-                                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                                    FilterChip(selected = manifestation == "CONFORMITY", onClick = { manifestation = "CONFORMITY" }, label = { Text("Conforme") })
-                                    FilterChip(selected = manifestation == "DISSENT", onClick = { manifestation = "DISSENT" }, label = { Text("En disconformidad") })
-                                }
-                                if (manifestation == "DISSENT") {
-                                    OutlinedTextField(
-                                        dissentStatement,
-                                        { dissentStatement = it },
-                                        label = { Text("Motivo de disconformidad *") },
-                                        minLines = 2,
-                                        modifier = Modifier.fillMaxWidth(),
-                                    )
-                                }
-                                SignaturePad(
-                                    label = "Firma del representante de la empresa",
-                                    enabled = !model.busy && inspectorSigned && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
-                                    onCaptured = { file -> signWithGeo(file, company = true) },
-                                )
-                                Text("Si se niega a firmar, registrá el motivo.", 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") }
-                            }
-
-                            if (inspectorSigned && companyResolved) {
-                                Button(
-                                    onClick = { model.closeSelectedAct() },
-                                    enabled = !model.busy,
-                                    modifier = Modifier.fillMaxWidth(),
-                                ) {
-                                    Icon(Icons.Filled.CheckCircle, null)
-                                    Spacer(Modifier.width(6.dp))
-                                    Text("Firmar y cerrar Acta")
-                                }
-                            } else {
-                                Text(
-                                    "La Inspección no puede cerrarse hasta completar las manifestaciones de esta Acta.",
-                                    style = MaterialTheme.typography.bodySmall,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                                )
-                            }
-                        }
-                    }
-                }
-
-                "SEALED" -> {
-                    ElevatedCard(Modifier.fillMaxWidth()) {
-                        Row(Modifier.padding(18.dp), horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.Top) {
-                            Icon(Icons.Filled.CheckCircle, null, tint = MaterialTheme.colorScheme.primary)
-                            Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(5.dp)) {
-                                Text("Acta firmada y cerrada", fontWeight = FontWeight.Bold)
-                                Text("Desde este cierre se genera el PDF del Acta y el informe INF editable (DOCX) para el Inspector.")
-                                closure?.closure?.finalSha256?.let { Text("SHA-256 · $it", style = MaterialTheme.typography.bodySmall) }
-                            }
-                        }
-                    }
-                }
-
-                "CANCELLED" -> {
-                    Surface(Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium, color = MaterialTheme.colorScheme.surfaceVariant) {
-                        Text("Esta Acta fue cancelada y permanece como antecedente.", Modifier.padding(14.dp))
-                    }
-                }
-            }
-        }
-
-        if (visit.status == "IN_PROGRESS" && model.acts.isNotEmpty()) {
-            val activeActs = model.acts.filter { it.status != "CANCELLED" }
-            val pendingActs = activeActs.filter { it.status != "SEALED" }
-            ElevatedCard(Modifier.fillMaxWidth()) {
-                Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(9.dp)) {
-                    Text("Finalizar Inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
-                    if (pendingActs.isEmpty()) {
-                        SuccessLine("Todas las Actas están firmadas y cerradas")
-                    } else {
-                        Text(
-                            "Falta firmar y cerrar: ${pendingActs.joinToString { it.code }}",
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.error,
-                        )
-                    }
-                    Button(
-                        onClick = { model.closeInspection() },
-                        enabled = !model.busy && activeActs.isNotEmpty() && pendingActs.isEmpty(),
-                        modifier = Modifier.fillMaxWidth(),
-                    ) { Text("Cerrar Inspección y salir") }
-                }
-            }
-        }
-        Spacer(Modifier.height(32.dp))
-    }
-}
-
-@Composable
-private fun SuccessLine(text: String) {
-    Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp)) {
-        Icon(Icons.Filled.CheckCircle, null, tint = MaterialTheme.colorScheme.primary)
-        Text(text, color = MaterialTheme.colorScheme.primary, fontWeight = FontWeight.SemiBold)
-    }
-}
-
-private fun modernActStatusLabel(status: String): String = actStatusLabelEs(status)
-
-private fun hasModernActLocation(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 currentModernActSignatureGeo(context: Context): ModernActSignatureGeo = suspendCancellableCoroutine { continuation ->
-    if (!hasModernActLocation(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(ModernActSignatureGeo(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() }
-}
@@ -49,7 +49,7 @@ fun SignaturePad(
    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 a la huella de integridad del Acta.",
+            "Firmá dentro del recuadro. La imagen se guarda como PNG y se incorpora al hash del Acta.",
            style = MaterialTheme.typography.bodySmall,
        )
        Canvas(
@@ -1,99 +0,0 @@
-package com.korexlabs.dhinspeccion.ui
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import com.korexlabs.dhinspeccion.data.*
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.launch
-
-@Composable
-internal fun TechnicalFieldsButton(assetId: String, enabled: Boolean) {
-    val context = LocalContext.current
-    val repository = remember { TechnicalRepository(context) }
-    val scope = rememberCoroutineScope()
-    var open by rememberSaveable(assetId) { mutableStateOf(false) }
-    var busy by remember(assetId) { mutableStateOf(false) }
-    var snapshot by remember(assetId) { mutableStateOf<TechnicalValues?>(null) }
-    var error by remember(assetId) { mutableStateOf<String?>(null) }
-    var saved by remember(assetId) { mutableStateOf(false) }
-    val values = remember(assetId) { mutableStateMapOf<String, String>() }
-
-    OutlinedButton(onClick = { open = true }, enabled = enabled,
-        modifier = Modifier.fillMaxWidth().padding(horizontal = 18.dp)) {
-        Text(if (saved) "Datos técnicos guardados · Revisar" else "Completar datos técnicos")
-    }
-    if (!open) return
-    LaunchedEffect(assetId, open) {
-        busy = true; error = null; snapshot = null
-        try {
-            val loaded = repository.get(assetId)
-            snapshot = loaded
-            values.clear()
-            loaded.values.forEach { (id, value) -> values[id] = value?.toString().orEmpty() }
-        } catch (cancelled: CancellationException) { throw cancelled }
-        catch (failure: Exception) { error = DhRepository.humanError(failure) }
-        finally { busy = false }
-    }
-    AlertDialog(
-        onDismissRequest = { if (!busy) open = false },
-        title = { Text(snapshot?.family?.name ?: "Datos técnicos") },
-        text = {
-            Column(Modifier.fillMaxWidth().heightIn(max = 460.dp).verticalScroll(rememberScrollState()),
-                verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                Text("Son los mismos campos de la clasificación administrada en oficina. Los marcados con * son obligatorios.")
-                if (busy) LinearProgressIndicator(Modifier.fillMaxWidth())
-                error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
-                snapshot?.definitions?.filter { it.isActive }?.forEach { definition ->
-                    val label = definition.name + (if (definition.isRequired) " *" else "") + (definition.unit?.let { " ($it)" } ?: "")
-                    val current = values[definition.id].orEmpty()
-                    if (definition.dataType in setOf("BOOLEAN", "SELECT")) {
-                        Text(label)
-                        val options = if (definition.dataType == "BOOLEAN") listOf("true", "false") else definition.options.orEmpty()
-                        options.forEach { option ->
-                            FilterChip(selected = current == option, enabled = !busy,
-                                onClick = { values[definition.id] = option },
-                                label = { Text(if (definition.dataType == "BOOLEAN") if (option == "true") "Sí" else "No" else option) })
-                        }
-                        if (!definition.isRequired) TextButton(enabled = !busy, onClick = { values[definition.id] = "" }) { Text("Sin dato") }
-                    } else {
-                        OutlinedTextField(value = current, onValueChange = { values[definition.id] = it },
-                            label = { Text(label) }, enabled = !busy, modifier = Modifier.fillMaxWidth(),
-                            supportingText = {
-                                when (definition.dataType) {
-                                    "DATE" -> Text("AAAA-MM-DD")
-                                    "DATETIME" -> Text("AAAA-MM-DDTHH:MM:SS-03:00")
-                                    else -> Unit
-                                }
-                            })
-                    }
-                }
-                if (snapshot?.definitions?.none { it.isActive } == true) Text("Esta clasificación no tiene campos técnicos activos.")
-            }
-        },
-        confirmButton = {
-            TextButton(enabled = !busy && snapshot != null, onClick = {
-                val current = snapshot ?: return@TextButton
-                busy = true; error = null
-                scope.launch {
-                    try {
-                        val payload = current.definitions.filter { it.isActive }.mapNotNull { definition ->
-                            technicalInputValue(definition, values[definition.id].orEmpty())?.let { definition.id to it }
-                        }.toMap()
-                        snapshot = repository.save(assetId, payload)
-                        saved = true; open = false
-                    } catch (cancelled: CancellationException) { throw cancelled }
-                    catch (failure: Exception) { error = DhRepository.humanError(failure) }
-                    finally { busy = false }
-                }
-            }) { Text("Guardar datos") }
-        },
-        dismissButton = { TextButton(enabled = !busy, onClick = { open = false }) { Text("Cerrar") } },
-    )
-}
@@ -1,50 +0,0 @@
-package com.korexlabs.dhinspeccion.ui
-
-import java.util.Locale
-
-internal fun visitStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
-    "PLANNED" -> "Planificada"
-    "IN_PROGRESS" -> "En curso"
-    "CLOSED" -> "Cerrada"
-    "CANCELLED" -> "Cancelada"
-    null, "" -> "Sin estado"
-    else -> humanBackendLabelEs(status)
-}
-
-internal fun actStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
-    "DRAFT" -> "En elaboración"
-    "LOCKED" -> "Pendiente de firma"
-    "SEALED" -> "Firmada y cerrada"
-    "CLOSED" -> "Cerrada"
-    "RECTIFIED" -> "Rectificada"
-    "CANCELLED" -> "Cancelada"
-    null, "" -> "Sin estado"
-    else -> humanBackendLabelEs(status)
-}
-
-internal fun findingStatusLabelEs(status: String?): String = when (status?.uppercase(Locale.ROOT)) {
-    "OPEN" -> "Abierto"
-    "PENDING" -> "Pendiente"
-    "COMPANY_RESPONSE_PENDING" -> "Pendiente de respuesta de la empresa"
-    "COMPANY_RESPONDED" -> "Respondido por la empresa"
-    "VERIFICATION_PENDING" -> "Pendiente de verificación"
-    "VERIFICATION_SCHEDULED" -> "Verificación programada"
-    "READY_TO_CLOSE" -> "Listo para cierre"
-    "CLOSED" -> "Cerrado"
-    "CANCELLED" -> "Cancelado"
-    null, "" -> "Sin estado"
-    else -> humanBackendLabelEs(status)
-}
-
-internal fun documentTypeLabelEs(type: String): String = when (type.uppercase(Locale.ROOT)) {
-    "DNI" -> "DNI"
-    "CUIL" -> "CUIL"
-    "PASSPORT" -> "Pasaporte"
-    "OTHER" -> "Otro"
-    else -> humanBackendLabelEs(type)
-}
-
-internal fun humanBackendLabelEs(value: String): String {
-    val clean = value.trim().replace('_', ' ').replace('-', ' ').lowercase(Locale("es", "AR"))
-    return clean.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale("es", "AR")) else it.toString() }
-}
@@ -1,57 +0,0 @@
-<?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>
@@ -1,26 +0,0 @@
-package com.korexlabs.dhinspeccion
-
-import java.io.File
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-class DynamicFieldFlowContractTest {
-    private val source = File("src/main/java/com/korexlabs/dhinspeccion/ui/DynamicVisitRoot.kt").readText()
-
-    @Test
-    fun fastSubinstallationFlowKeepsParentClassificationAndCaptureSteps() {
-        assertTrue(source.contains("Elegí la Instalación padre"))
-        assertTrue(source.contains("Clasificación técnica *"))
-        assertTrue(source.contains("Guardar y tomar foto"))
-        assertTrue(source.contains("model.loadFieldTypes(item.id)"))
-        assertTrue(source.contains("parentId = item.id"))
-    }
-
-    @Test
-    fun fieldCaptureStillRequiresGpsAndPhotoBeforeFindings() {
-        assertTrue(source.contains("La foto sigue siendo obligatoria antes de crear Hallazgos"))
-        assertTrue(source.contains("creationGpsCaptured"))
-        assertTrue(source.contains("fieldPhotoCount == 0"))
-        assertTrue(source.contains("model.uploadFieldPhoto"))
-    }
-}
@@ -1,24 +0,0 @@
-package com.korexlabs.dhinspeccion
-import com.korexlabs.dhinspeccion.data.FieldCoordinates
-import org.junit.Assert.*
-import org.junit.Test
-class FieldCoordinatesTest {
-    @Test fun realGpsIsRoundedToApiPrecision() {
-        assertEquals(-32.889459, FieldCoordinates.latitude(-32.889458762), 0.0)
-        assertEquals(-68.845839, FieldCoordinates.longitude(-68.845838912), 0.0)
-        assertEquals(4.123, FieldCoordinates.accuracy(4.123456789), 0.0)
-    }
-    @Test fun boundsAndZeroRemainValid() {
-        assertEquals(90.0, FieldCoordinates.latitude(90.0), 0.0)
-        assertEquals(-180.0, FieldCoordinates.longitude(-180.0), 0.0)
-        assertEquals(0.0, FieldCoordinates.accuracy(0.0), 0.0)
-    }
-    @Test fun invalidCoordinatesAreRejected() {
-        for (value in listOf(Double.NaN, Double.POSITIVE_INFINITY, 90.1, -90.1)) {
-            try { FieldCoordinates.latitude(value); fail("Invalid latitude accepted") }
-            catch (_: IllegalArgumentException) { }
-        }
-        try { FieldCoordinates.accuracy(-1.0); fail("Negative accuracy accepted") }
-        catch (_: IllegalArgumentException) { }
-    }
-}
@@ -1,66 +0,0 @@
-package com.korexlabs.dhinspeccion
-
-import java.io.File
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-class FinalFieldFlowContractTest {
-    private val visit = File("src/main/java/com/korexlabs/dhinspeccion/ui/ModernVisitRoot.kt").readText()
-    private val acts = File("src/main/java/com/korexlabs/dhinspeccion/ui/ModernMobileActsScreen.kt").readText()
-    private val findings = File("src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt").readText()
-    private val home = File("src/main/java/com/korexlabs/dhinspeccion/ui/MobileHomeScreen.kt").readText()
-    private val labels = File("src/main/java/com/korexlabs/dhinspeccion/ui/UiSpanishLabels.kt").readText()
-
-    @Test
-    fun inspectionActFindingFlowMatchesFieldProcedure() {
-        assertTrue(visit.contains("Iniciar inspección"))
-        assertTrue(acts.contains("Crear nueva Acta"))
-        assertTrue(acts.contains("Agregar Hallazgo"))
-        assertTrue(visit.contains("Instalación"))
-        assertTrue(visit.contains("Subinstalación"))
-        assertTrue(visit.contains("Guardar y tomar foto"))
-        assertTrue(acts.contains("Cerrar Acta y dejar pendiente de firma"))
-        assertTrue(acts.contains("Nombres y apellidos *"))
-        assertTrue(acts.contains("Cargo / función *"))
-        assertTrue(acts.contains("Email *"))
-        assertTrue(acts.contains("En disconformidad"))
-        assertTrue(acts.contains("Motivo de disconformidad *"))
-        assertTrue(acts.contains("urgencia del Acta completa"))
-        assertTrue(acts.contains("urgencia no se asigna a cada Hallazgo"))
-        assertTrue(labels.contains("\"LOCKED\" -> \"Pendiente de firma\""))
-    }
-
-    @Test
-    fun fieldCreateKeepsDashboardEquivalentMinimumAndCaptureBarrier() {
-        assertTrue(visit.contains("Nombre técnico *"))
-        assertTrue(visit.contains("Nombre habitual (opcional)"))
-        assertTrue(visit.contains("Descripción (opcional)"))
-        assertTrue(visit.contains("familyReady"))
-        assertTrue(visit.contains("attributesReady"))
-        assertTrue(visit.contains("GPS + foto"))
-        assertTrue(visit.contains("La foto es obligatoria antes de registrar Hallazgos"))
-    }
-
-    @Test
-    fun structuralSelectionUsesTheServerTypeCode() {
-        assertTrue(visit.contains("type.code.ifBlank { type.typeName ?: type.name }"))
-        assertTrue(visit.contains("modernItemTypeCode(it) in setOf(\"yacimiento\", \"instalacion\", \"subinstalacion\")"))
-    }
-
-    @Test
-    fun currentFieldUiDoesNotExposeBackendEnglishStates() {
-        assertTrue(home.contains("visitStatusLabelEs(visit.status)"))
-        assertTrue(findings.contains("findingStatusLabelEs(finding.status)"))
-        assertTrue(acts.contains("DNI *"))
-        assertFalse(acts.contains("PASSPORT"))
-        assertFalse(acts.contains("OTHER"))
-        assertTrue(labels.contains("\"PASSPORT\" -> \"Pasaporte\""))
-        assertTrue(labels.contains("\"OTHER\" -> \"Otro\""))
-        assertFalse(acts.contains("Finalizar y BLOQUEAR Acta"))
-        assertFalse(acts.contains("Acta BLOQUEADA"))
-        assertFalse(acts.contains("SELLAR Acta"))
-        assertFalse(acts.contains("Acta SELLADA"))
-        assertFalse(acts.contains("Text(\"Email\")"))
-    }
-}
@@ -1,105 +0,0 @@
-package com.korexlabs.dhinspeccion
-
-import com.korexlabs.dhinspeccion.data.*
-import java.io.IOException
-import kotlinx.coroutines.*
-import okhttp3.ResponseBody.Companion.toResponseBody
-import org.junit.Assert.*
-import org.junit.Test
-import retrofit2.HttpException
-import retrofit2.Response
-
-class MobileSessionCoordinatorTest {
-    private fun old() = StoredSession("u1", "inspector", "Inspector", "a1", "r1")
-    private fun response() = MobileSessionResponse(MobileUser("u1", "inspector"), "a2", "r2", 900)
-    private fun http(code: Int) = HttpException(Response.error<Unit>(code, "error".toResponseBody()))
-
-    private class Store(var value: StoredSession?) {
-        var clears = 0
-        fun load() = value
-        fun clear() { clears++; value = null }
-        fun save(r: MobileSessionResponse): StoredSession =
-            StoredSession(r.user.id, r.user.username, r.user.username, r.accessToken, r.refreshToken).also { value = it }
-    }
-
-    @Test fun concurrentClientsRotateTheTokenOnlyOnce() = runBlocking {
-        val previous = old(); val store = Store(previous); var calls = 0
-        val results = coroutineScope {
-            (1..4).map {
-                async {
-                    MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
-                        calls++; delay(20); response()
-                    }
-                }
-            }.awaitAll()
-        }
-        assertEquals(1, calls)
-        assertTrue(results.all { it.refreshToken == "r2" })
-        assertEquals(0, store.clears)
-    }
-
-    @Test fun networkAndServerFailuresKeepSessionForRetry() = runBlocking {
-        for (failure in listOf(IOException("offline"), http(500), http(429))) {
-            val previous = old(); val store = Store(previous)
-            try {
-                MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) { throw failure }
-                fail("Expected request failure")
-            } catch (caught: Exception) { assertSame(failure, caught) }
-            assertEquals(previous, store.value)
-            assertEquals(0, store.clears)
-        }
-    }
-
-    @Test fun invalidRefreshClearsOnlyTheExpiredSession() = runBlocking {
-        val previous = old(); val store = Store(previous)
-        try {
-            MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) { throw http(401) }
-            fail("Expected unauthorized")
-        } catch (caught: HttpException) { assertEquals(401, caught.code()) }
-        assertNull(store.value)
-        assertEquals(1, store.clears)
-    }
-
-    @Test fun cancelledRefreshKeepsSession() = runBlocking {
-        val previous = old(); val store = Store(previous)
-        try {
-            MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) { throw CancellationException("cancel") }
-            fail("Expected cancellation")
-        } catch (_: CancellationException) { }
-        assertEquals(previous, store.value)
-    }
-
-    @Test fun logoutDuringRefreshCannotBeUndone() = runBlocking {
-        val previous = old(); val store = Store(previous)
-        try {
-            MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
-                store.clear(); response()
-            }
-            fail("Must reject a refresh after logout")
-        } catch (_: IllegalStateException) { }
-        assertNull(store.value)
-    }
-
-    @Test fun staleRequestCannotUseAnotherInspectorsSession() = runBlocking {
-        val previous = old(); val store = Store(previous.copy(userId = "u2", refreshToken = "other"))
-        try {
-            MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
-                fail("No refresh allowed for another inspector"); response()
-            }
-            fail("Must reject account switch")
-        } catch (_: IllegalStateException) { }
-        assertEquals("u2", store.value?.userId)
-    }
-
-    @Test fun lateUnauthorizedDoesNotClearANewLogin() = runBlocking {
-        val previous = old(); val store = Store(previous)
-        try {
-            MobileSessionCoordinator.refresh(previous, store::load, store::save, store::clear) {
-                store.value = previous.copy(refreshToken = "new-login")
-                throw http(401)
-            }
-        } catch (_: HttpException) { }
-        assertEquals("new-login", store.value?.refreshToken)
-        assertEquals(0, store.clears)
-    }
-}
@@ -1,28 +0,0 @@
-package com.korexlabs.dhinspeccion
-
-import org.junit.Assert.*
-import org.junit.Test
-
-class OperationTrackerTest {
-    @Test fun doubleTapCannotQueueASecondWrite() {
-        val tracker = OperationTracker()
-        assertTrue(tracker.begin(mutation = true))
-        assertFalse(tracker.begin(mutation = true))
-        tracker.end()
-        assertFalse(tracker.busy)
-        assertTrue(tracker.begin(mutation = true))
-    }
-    @Test fun BusyRemainsUntilEveryReadCompletes() {
-        val tracker = OperationTracker()
-        assertTrue(tracker.begin(false)); assertTrue(tracker.begin(false))
-        tracker.end(); assertTrue(tracker.busy)
-        assertFalse(tracker.begin(true))
-        tracker.end(); assertFalse(tracker.busy)
-    }
-    @Test fun readDuringWriteDoesNotReleaseItsGuardEarly() {
-        val tracker = OperationTracker()
-        assertTrue(tracker.begin(true)); assertTrue(tracker.begin(false))
-        tracker.end(); assertFalse(tracker.begin(true))
-        tracker.end(); assertTrue(tracker.begin(true))
-    }
-}
@@ -1,20 +0,0 @@
-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(31, BuildConfig.VERSION_CODE)
-        assertEquals("0.19.3-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://"))
-    }
-}
@@ -1,28 +0,0 @@
-package com.korexlabs.dhinspeccion
-import com.korexlabs.dhinspeccion.data.*
-import org.junit.Assert.*
-import org.junit.Test
-class TechnicalValuesTest {
-    private fun field(type: String, required: Boolean = false) = TechnicalDefinition("id", "code", "Campo", type, required, options = listOf("A", "B"))
-    @Test fun decimalCommaAndBooleanFalseKeepTheirTypes() {
-        assertEquals(12.5, technicalInputValue(field("NUMBER"), "12,5"))
-        assertEquals(false, technicalInputValue(field("BOOLEAN", true), "false"))
-        assertEquals(0.0, technicalInputValue(field("NUMBER", true), "0"))
-    }
-    @Test fun optionalBlankIsOmittedButRequiredBlankFails() {
-        assertNull(technicalInputValue(field("TEXT"), "  "))
-        try { technicalInputValue(field("TEXT", true), ""); fail("Required missing") }
-        catch (_: IllegalArgumentException) { }
-    }
-    @Test fun invalidNumbersDatesAndOptionsFailBeforeSave() {
-        for ((type, value) in listOf("NUMBER" to "NaN", "DATE" to "2026-02-30", "SELECT" to "C", "BOOLEAN" to "quizás")) {
-            try { technicalInputValue(field(type), value); fail("Invalid value accepted") }
-            catch (_: IllegalArgumentException) { }
-        }
-    }
-    @Test fun validDatesAndSelectRemainCanonical() {
-        assertEquals("2026-09-14", technicalInputValue(field("DATE"), "2026-09-14"))
-        assertEquals("A", technicalInputValue(field("SELECT"), "A"))
-        assertEquals("2026-09-14T13:00:00Z", technicalInputValue(field("DATETIME"), "2026-09-14T10:00:00-03:00"))
-    }
-}
@@ -1,12 +1,12 @@
 {
  "name": "dhv2-api",
-  "version": "0.29.0-4",
+  "version": "0.20.0-2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "dhv2-api",
-      "version": "0.29.0-4",
+      "version": "0.20.0-2",
      "license": "UNLICENSED",
      "dependencies": {
        "@nestjs/common": "^11.0.0",
@@ -4166,9 +4166,9 @@
      "license": "MIT"
    },
    "node_modules/multer": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-2.3.0.tgz",
-      "integrity": "sha512-cjNbm3sttszgZeGfJR124D+jFEfkXCVAsoPBmFn9X7UxmDSFHWqE2CoEj0vrmSpuAFnqWR1Szcm9QTsiHr60Xw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.2.0.tgz",
+      "integrity": "sha512-6rdyFg2kLrMh9Jee7/BMPuV9lEAd7lLW2YUpF9/YxR7njyoUwwQ0ZPh3TaIY50Sw6vlyD2HW3wGOkTS4P79xrQ==",
      "license": "MIT",
      "dependencies": {
        "append-field": "^1.0.0",
@@ -4666,9 +4666,9 @@
      }
    },
    "node_modules/qs": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.16.0.tgz",
-      "integrity": "sha512-h6fhOIaRrID2CbEY2fqs+7t+UXZo+MLAnU5gRIq85uFtdiUPCdsApMlHhXogKVM4HM2DVbIjGNTTYH2OcmP1vA==",
+      "version": "6.15.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz",
+      "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==",
      "license": "BSD-3-Clause",
      "dependencies": {
        "es-define-property": "^1.0.1",
@@ -1,6 +1,6 @@
 {
  "name": "dhv2-api",
-  "version": "0.29.0-4",
+  "version": "0.28.0-1",
  "private": true,
  "license": "UNLICENSED",
  "scripts": {
@@ -42,9 +42,5 @@
    "ts-node": "^10.9.2",
    "tsx": "^4.20.6",
    "typescript": "^5.9.0"
-  },
-  "overrides": {
-    "multer": "2.3.0",
-    "qs": "6.16.0"
  }
-}
+}
@@ -36,20 +36,6 @@ export interface FieldBriefingAct {
  findings: FieldBriefingFinding[];
 }

-function toIsoDate(value: unknown): string {
-  const parsed = value instanceof Date
-    ? value
-    : value == null
-      ? new Date()
-      : new Date(String(value));
-
-  if (Number.isNaN(parsed.getTime())) {
-    throw new Error('La fecha planificada de la inspección no es válida');
-  }
-
-  return parsed.toISOString().slice(0, 10);
-}
-
@Injectable()
 export class FieldBriefingService {
  constructor(private readonly dataSource: DataSource) {}
@@ -81,9 +67,7 @@ export class FieldBriefingService {
      });
    }

-    // PostgreSQL/pg entrega los timestamptz como Date. String(date).slice(0, 10)
-    // produce textos como "Thu Sep 17", que PostgreSQL rechaza al castear a date.
-    const plannedOn = toIsoDate(visit.plannedStartAt);
+    const plannedOn = String(visit.plannedStartAt ?? new Date().toISOString()).slice(0, 10);

    const rows = (await this.dataSource.query(`
      WITH prior_acts AS (
@@ -2,14 +2,13 @@ import { Module } from '@nestjs/common';
 import { AuditModule } from '../audit/audit.module';
 import { AuthModule } from '../auth/auth.module';
 import { PhaseADataModule } from '../core-data/phase-a-data.module';
-import { InspectionReportsModule } from '../inspection-reports/inspection-reports.module';
 import { RolesController } from './roles/roles.controller';
 import { RolesService } from './roles/roles.service';
 import { UsersController } from './users/users.controller';
 import { UsersService } from './users/users.service';

@Module({
-  imports: [PhaseADataModule, AuditModule, AuthModule, InspectionReportsModule],
+  imports: [PhaseADataModule, AuditModule, AuthModule],
  controllers: [UsersController, RolesController],
  providers: [UsersService, RolesService],
 })
@@ -28,9 +28,10 @@ export class CreateUserDto {
  @Transform(({ value }) =>
    typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : null,
  )
+  @IsOptional()
  @IsEmail()
  @MaxLength(320)
-  email!: string;
+  email?: string | null;

  @Transform(({ value }) =>
    typeof value === 'string' && value.trim() ? value.replace(/\D/g, '') : null,
@@ -1,30 +0,0 @@
-import { Transform } from 'class-transformer';
-import {
-  IsEmail,
-  IsOptional,
-  IsString,
-  MaxLength,
-  MinLength,
-} from 'class-validator';
-
-const optionalText = ({ value }: { value: unknown }) =>
-  typeof value === 'string' && value.trim() ? value.trim() : null;
-
-export class UpdateSelfProfileDto {
-  @Transform(({ value }) => typeof value === 'string' ? value.trim().toLowerCase() : value)
-  @IsEmail()
-  @MaxLength(320)
-  email!: string;
-
-  @Transform(optionalText)
-  @IsOptional()
-  @IsString()
-  @MaxLength(40)
-  phone?: string | null;
-
-  @Transform(optionalText)
-  @IsOptional()
-  @IsString()
-  @MaxLength(160)
-  jobTitle?: string | null;
-}
@@ -1,65 +0,0 @@
-import { Transform } from 'class-transformer';
-import {
-  IsBoolean,
-  IsEnum,
-  IsInt,
-  IsOptional,
-  IsString,
-  Max,
-  MaxLength,
-  Min,
-  MinLength,
-  ValidateIf,
-} from 'class-validator';
-import { SmtpSecurityMode } from '../../../database/entities';
-
-export enum UserSmtpMode {
-  SYSTEM = 'SYSTEM',
-  CUSTOM = 'CUSTOM',
-}
-
-const trimmed = ({ value }: { value: unknown }) =>
-  typeof value === 'string' ? value.trim() : value;
-
-export class UpdateUserSmtpSettingsDto {
-  @IsEnum(UserSmtpMode)
-  mode!: UserSmtpMode;
-
-  @ValidateIf((dto: UpdateUserSmtpSettingsDto) => dto.mode === UserSmtpMode.CUSTOM)
-  @Transform(trimmed)
-  @IsString()
-  @MinLength(1)
-  @MaxLength(255)
-  host?: string;
-
-  @ValidateIf((dto: UpdateUserSmtpSettingsDto) => dto.mode === UserSmtpMode.CUSTOM)
-  @IsInt()
-  @Min(1)
-  @Max(65535)
-  port?: number;
-
-  @ValidateIf((dto: UpdateUserSmtpSettingsDto) => dto.mode === UserSmtpMode.CUSTOM)
-  @IsEnum(SmtpSecurityMode)
-  securityMode?: SmtpSecurityMode;
-
-  @IsOptional()
-  @Transform(trimmed)
-  @IsString()
-  @MaxLength(255)
-  username?: string | null;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(512)
-  password?: string | null;
-
-  @IsOptional()
-  @Transform(trimmed)
-  @IsString()
-  @MaxLength(200)
-  fromName?: string | null;
-
-  @IsOptional()
-  @IsBoolean()
-  enabled = true;
-}
@@ -10,33 +10,23 @@ import {
  Query,
  Req,
 } from '@nestjs/common';
-import { AuditService } from '../../audit/audit.service';
 import { RequirePermissions } from '../../authorization/decorators/require-permissions.decorator';
 import { CurrentAuth } from '../../auth/decorators/current-auth.decorator';
 import type {
  AuthPrincipal,
  RequestWithContext,
 } from '../../common/http/request-context';
-import { AuditAction } from '../../database/entities';
-import { SmtpDeliveryService } from '../../inspection-reports/smtp-delivery.service';
-import { administrationAuditContext } from '../common/administration-audit';
 import { ChangeUserStatusDto } from './dto/change-user-status.dto';
 import { CreateUserDto } from './dto/create-user.dto';
 import { ListUsersQueryDto } from './dto/list-users-query.dto';
 import { ReplaceUserRolesDto } from './dto/replace-user-roles.dto';
 import { ResetUserPasswordDto } from './dto/reset-user-password.dto';
-import { UpdateSelfProfileDto } from './dto/update-self-profile.dto';
-import { UpdateUserSmtpSettingsDto } from './dto/update-user-smtp-settings.dto';
 import { UpdateUserDto } from './dto/update-user.dto';
 import { UsersService } from './users.service';

@Controller('users')
 export class UsersController {
-  constructor(
-    private readonly users: UsersService,
-    private readonly smtp: SmtpDeliveryService,
-    private readonly audit: AuditService,
-  ) {}
+  constructor(private readonly users: UsersService) {}

  @Get()
  @RequirePermissions('users.read')
@@ -44,73 +34,6 @@ export class UsersController {
    return this.users.list(query);
  }

-  @Get('self/profile')
-  selfProfile(@CurrentAuth() principal: AuthPrincipal) {
-    return this.users.getSelfProfile(principal.userId);
-  }
-
-  @Patch('self/profile')
-  updateSelfProfile(
-    @Body() dto: UpdateSelfProfileDto,
-    @CurrentAuth() principal: AuthPrincipal,
-    @Req() request: RequestWithContext,
-  ) {
-    return this.users.updateSelfProfile(dto, principal, request);
-  }
-
-  @Get('self/smtp')
-  selfSmtp(@CurrentAuth() principal: AuthPrincipal) {
-    return this.smtp.publicUserSettings(principal.userId);
-  }
-
-  @Put('self/smtp')
-  async updateSelfSmtp(
-    @Body() dto: UpdateUserSmtpSettingsDto,
-    @CurrentAuth() principal: AuthPrincipal,
-    @Req() request: RequestWithContext,
-  ) {
-    const before = await this.smtp.publicUserSettings(principal.userId);
-    const after = await this.smtp.saveUserSettings(principal.userId, dto);
-    await this.audit.record({
-      ...administrationAuditContext(principal, request),
-      action: AuditAction.USER_SMTP_SETTINGS_UPDATED,
-      entityType: 'user_smtp_settings',
-      entityId: principal.userId,
-      beforeData: before as Record<string, unknown>,
-      afterData: after as Record<string, unknown>,
-      metadata: { passwordNeverReturned: true, scope: 'SELF' },
-    });
-    return after;
-  }
-
-  @Post('self/smtp/test')
-  async testSelfSmtp(
-    @CurrentAuth() principal: AuthPrincipal,
-    @Req() request: RequestWithContext,
-  ) {
-    const profile = await this.users.getSelfProfile(principal.userId);
-    if (!profile.email) throw new Error('El usuario no tiene email configurado');
-    const sent = await this.smtp.send({
-      to: profile.email,
-      subject: 'DH Inspección · Prueba de correo personal',
-      text: 'Este correo confirma que tu configuración de correo en DH Inspección funciona correctamente.',
-      attachment: {
-        filename: 'dh-inspeccion-prueba-correo.txt',
-        mimeType: 'text/plain',
-        content: Buffer.from('DH Inspección · Correo personal OK\n', 'utf8'),
-      },
-    }, principal.userId);
-    await this.audit.record({
-      ...administrationAuditContext(principal, request),
-      action: AuditAction.USER_SMTP_TEST_SENT,
-      entityType: 'user_smtp_settings',
-      entityId: principal.userId,
-      afterData: { recipient: profile.email, messageId: sent.messageId },
-      metadata: { scope: 'SELF' },
-    });
-    return { ok: true, recipient: profile.email, messageId: sent.messageId };
-  }
-
  @Post()
  @RequirePermissions('users.create')
  create(
@@ -29,7 +29,6 @@ import type { CreateUserDto } from './dto/create-user.dto';
 import type { ListUsersQueryDto } from './dto/list-users-query.dto';
 import type { ReplaceUserRolesDto } from './dto/replace-user-roles.dto';
 import type { ResetUserPasswordDto } from './dto/reset-user-password.dto';
-import type { UpdateSelfProfileDto } from './dto/update-self-profile.dto';
 import type { UpdateUserDto } from './dto/update-user.dto';

 export interface UserRoleView {
@@ -57,7 +56,6 @@ export interface AdministrativeUserView {
  createdAt: Date;
  updatedAt: Date;
  roles: UserRoleView[];
-  smtpMode: 'SYSTEM' | 'CUSTOM';
 }

 interface UserViewRow extends AdministrativeUserView {
@@ -78,10 +76,10 @@ function roleSelectionInvalid(): BadRequestException {
  });
 }

-function userEmailRequired(): BadRequestException {
+function inspectorEmailRequired(): BadRequestException {
  return new BadRequestException({
-    code: 'USER_EMAIL_REQUIRED',
-    message: 'Cada usuario de Hidrocarburos debe tener un email válido',
+    code: 'INSPECTOR_EMAIL_REQUIRED',
+    message: 'Los usuarios con rol Inspector deben tener un email válido para recibir la documentación de sus inspecciones',
  });
 }

@@ -146,7 +144,6 @@ export class UsersService {
          user_account.password_changed_at AS "passwordChangedAt",
          user_account.created_at AS "createdAt",
          user_account.updated_at AS "updatedAt",
-          COALESCE((SELECT mode FROM user_smtp_settings WHERE user_id=user_account.id),'SYSTEM') AS "smtpMode",
          COALESCE(
            JSONB_AGG(
              JSONB_BUILD_OBJECT(
@@ -188,24 +185,6 @@ export class UsersService {
    );
  }

-  async getSelfProfile(userId: string): Promise<AdministrativeUserView> {
-    return this.getById(userId);
-  }
-
-  async updateSelfProfile(
-    dto: UpdateSelfProfileDto,
-    principal: AuthPrincipal,
-    request: RequestWithContext,
-  ): Promise<AdministrativeUserView> {
-    if (!dto.email?.trim()) throw userEmailRequired();
-    return this.update(
-      principal.userId,
-      { email: dto.email, phone: dto.phone, jobTitle: dto.jobTitle },
-      principal,
-      request,
-    );
-  }
-
  async create(
    dto: CreateUserDto,
    principal: AuthPrincipal,
@@ -216,10 +195,10 @@ export class UsersService {
    try {
      return await this.dataSource.transaction(async (manager) => {
        const roles = await this.resolveRoles(manager, dto.roleIds);
-        if (!dto.email?.trim()) throw userEmailRequired();
+        this.assertInspectorHasEmail(roles, dto.email ?? null);
        const user = manager.getRepository(User).create({
          username: dto.username.trim().toLowerCase(),
-          email: dto.email.trim().toLowerCase(),
+          email: dto.email?.trim().toLowerCase() || null,
          dni: dto.dni ?? null,
          phone: dto.phone ?? null,
          jobTitle: dto.jobTitle ?? null,
@@ -289,13 +268,15 @@ export class UsersService {
      return await this.dataSource.transaction(async (manager) => {
        const user = await this.lockUser(manager, id);
        const before = await this.loadUserView(manager, id);
-        if (dto.email !== undefined && !dto.email) throw userEmailRequired();
+        if (dto.email !== undefined && !dto.email && before.roles.some((role) => role.code === 'inspector')) {
+          throw inspectorEmailRequired();
+        }

        if (dto.username !== undefined) {
          user.username = dto.username.trim().toLowerCase();
        }
        if (dto.email !== undefined) {
-          user.email = dto.email!.trim().toLowerCase();
+          user.email = dto.email?.trim().toLowerCase() || null;
        }
        if (dto.dni !== undefined) user.dni = dto.dni ?? null;
        if (dto.phone !== undefined) user.phone = dto.phone ?? null;
@@ -305,13 +286,6 @@ export class UsersService {
        if (dto.lastName !== undefined) user.lastName = dto.lastName.trim();
        user.updatedBy = principal.userId;
        await manager.getRepository(User).save(user);
-        if (dto.email !== undefined && user.email) {
-          await manager.query(`
-            UPDATE user_smtp_settings
-            SET from_email=$2,reply_to=$2,updated_by=$1,updated_at=CURRENT_TIMESTAMP
-            WHERE user_id=$1 AND mode='CUSTOM'
-          `, [id, user.email]);
-        }

        const updated = await this.loadUserView(manager, id);
        await this.audit.record(
@@ -440,6 +414,7 @@ export class UsersService {
      await this.lockUser(manager, id);
      const roles = await this.resolveRoles(manager, dto.roleIds);
      const before = await this.loadUserView(manager, id);
+      this.assertInspectorHasEmail(roles, before.email);
      const beforeIds = before.roles.map((role) => role.id).sort();
      const afterIds = roles.map((role) => role.id).sort();
      if (beforeIds.join(',') === afterIds.join(',')) return before;
@@ -478,6 +453,12 @@ export class UsersService {
    return roles;
  }

+  private assertInspectorHasEmail(roles: Role[], email: string | null | undefined): void {
+    if (roles.some((role) => role.code === 'inspector') && !email?.trim()) {
+      throw inspectorEmailRequired();
+    }
+  }
+
  private async insertUserRoles(
    manager: EntityManager,
    userId: string,
@@ -530,7 +511,6 @@ export class UsersService {
          user_account.password_changed_at AS "passwordChangedAt",
          user_account.created_at AS "createdAt",
          user_account.updated_at AS "updatedAt",
-          COALESCE((SELECT mode FROM user_smtp_settings WHERE user_id=user_account.id),'SYSTEM') AS "smtpMode",
          COALESCE(
            JSONB_AGG(
              JSONB_BUILD_OBJECT(
@@ -1,407 +0,0 @@
-import { Injectable, Logger, NotFoundException } from '@nestjs/common';
-import { DataSource } from 'typeorm';
-
-type DossierRecord = Record<string, any>;
-
-@Injectable()
-export class ActivityDossierService {
-  private readonly logger = new Logger(ActivityDossierService.name);
-
-  constructor(private readonly dataSource: DataSource) {}
-
-  async dossier(id: string): Promise<Record<string, unknown>> {
-    const assetRows = (await this.dataSource.query(
-      `SELECT id, code, name, common_name AS "commonName", created_at AS "createdAt"
-       FROM assets
-       WHERE id = $1`,
-      [id],
-    )) as Array<{ id: string; code: string; name: string; commonName: string | null; createdAt: Date }>;
-    const asset = assetRows[0];
-    if (!asset) {
-      throw new NotFoundException({
-        code: 'ASSET_NOT_FOUND',
-        message: 'Activo no encontrado',
-      });
-    }
-
-    const failedFacets: string[] = [];
-    const safeQuery = async (facet: string, sql: string): Promise<DossierRecord[]> => {
-      try {
-        return (await this.dataSource.query(sql, [id])) as DossierRecord[];
-      } catch (error) {
-        failedFacets.push(facet);
-        const message = error instanceof Error ? error.message : String(error);
-        this.logger.error(`No se pudo cargar la faceta ${facet} del expediente ${id}: ${message}`);
-        return [];
-      }
-    };
-
-    const [
-      visits,
-      acts,
-      findings,
-      evidence,
-      communications,
-      verificationResults,
-      documents,
-      inspectionReports,
-      media,
-      versions,
-    ] = await Promise.all([
-      safeQuery('visits', `
-        SELECT visit.id, visit.code, visit.status,
-               visit.planned_start_at AS "plannedStartAt",
-               visit.actual_started_at AS "actualStartedAt",
-               visit.actual_closed_at AS "actualClosedAt",
-               visit.created_at AS "createdAt"
-        FROM inspection_visits visit
-        WHERE visit.scope_asset_id = $1
-           OR EXISTS (
-             SELECT 1
-             FROM inspection_visit_assets visit_asset
-             WHERE visit_asset.visit_id = visit.id
-               AND visit_asset.asset_id = $1
-               AND visit_asset.included = true
-           )
-           OR EXISTS (
-             SELECT 1
-             FROM inspection_acts act
-             JOIN inspection_act_assets act_asset
-               ON act_asset.act_id = act.id AND act_asset.included = true
-             WHERE act.visit_id = visit.id
-               AND act_asset.asset_id = $1
-           )
-           OR EXISTS (
-             SELECT 1
-             FROM inspection_acts act
-             JOIN inspection_findings finding ON finding.act_id = act.id
-             WHERE act.visit_id = visit.id
-               AND finding.asset_id = $1
-           )
-        ORDER BY COALESCE(visit.actual_started_at, visit.planned_start_at, visit.created_at) DESC
-        LIMIT 200
-      `),
-      safeQuery('acts', `
-        SELECT 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"
-        FROM inspection_acts act
-        JOIN inspection_visits visit ON visit.id = act.visit_id
-        WHERE EXISTS (
-                SELECT 1
-                FROM inspection_act_assets act_asset
-                WHERE act_asset.act_id = act.id
-                  AND act_asset.asset_id = $1
-                  AND act_asset.included = true
-              )
-           OR EXISTS (
-                SELECT 1
-                FROM inspection_findings finding
-                WHERE finding.act_id = act.id
-                  AND finding.asset_id = $1
-              )
-        ORDER BY act.occurred_at DESC
-        LIMIT 200
-      `),
-      safeQuery('findings', `
-        SELECT finding.id, finding.act_id AS "actId", finding.code, finding.status,
-               finding.title, finding.description,
-               finding.correction_due_on AS "correctionDueOn",
-               finding.company_response_received_on AS "companyResponseReceivedOn",
-               finding.next_control_on AS "nextControlOn",
-               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"
-        FROM inspection_findings finding
-        JOIN inspection_acts act ON act.id = finding.act_id
-        JOIN inspection_visits visit ON visit.id = act.visit_id
-        WHERE finding.asset_id = $1
-        ORDER BY finding.created_at DESC
-        LIMIT 500
-      `),
-      safeQuery('evidence', `
-        SELECT evidence.id, evidence.finding_id AS "findingId", evidence.communication_id AS "communicationId",
-               evidence.kind, evidence.purpose, evidence.original_name AS "originalName",
-               evidence.title, evidence.description, evidence.captured_at AS "capturedAt",
-               evidence.created_at AS "createdAt", finding.code AS "findingCode",
-               finding.title AS "findingTitle"
-        FROM inspection_finding_evidence evidence
-        JOIN inspection_findings finding ON finding.id = evidence.finding_id
-        WHERE finding.asset_id = $1
-        ORDER BY COALESCE(evidence.captured_at, evidence.created_at) DESC
-        LIMIT 500
-      `),
-      safeQuery('communications', `
-        SELECT communication.id, communication.finding_id AS "findingId",
-               communication.direction, communication.channel, communication.type,
-               communication.occurred_at AS "occurredAt", communication.subject,
-               communication.details, communication.contact_name AS "contactName",
-               communication.created_at AS "createdAt", finding.code AS "findingCode",
-               finding.title AS "findingTitle"
-        FROM inspection_finding_communications communication
-        JOIN inspection_findings finding ON finding.id = communication.finding_id
-        WHERE finding.asset_id = $1
-        ORDER BY communication.occurred_at DESC
-        LIMIT 500
-      `),
-      safeQuery('verificationResults', `
-        SELECT verification_link.id,
-               verification_link.finding_id AS "findingId",
-               verification_link.visit_id AS "visitId",
-               verification_link.target_control_on AS "targetControlOn",
-               verification_link.outcome,
-               verification_link.result_notes AS "resultNotes",
-               verification_link.verified_at AS "verifiedAt",
-               verification_link.result_recorded_at AS "resultRecordedAt",
-               verification_link.rescheduled_control_on AS "rescheduledControlOn",
-               finding.code AS "findingCode", finding.title AS "findingTitle",
-               visit.code AS "visitCode", visit.status AS "visitStatus",
-               (SELECT COUNT(*)::integer
-                FROM inspection_finding_evidence verification_evidence
-                WHERE verification_evidence.finding_id = finding.id
-                  AND verification_evidence.verification_visit_id = visit.id
-                  AND verification_evidence.purpose = 'VERIFICATION') AS "evidenceCount"
-        FROM inspection_finding_verification_visits verification_link
-        JOIN inspection_findings finding ON finding.id = verification_link.finding_id
-        JOIN inspection_visits visit ON visit.id = verification_link.visit_id
-        WHERE finding.asset_id = $1 AND verification_link.outcome IS NOT NULL
-        ORDER BY verification_link.verified_at DESC NULLS LAST, verification_link.result_recorded_at DESC
-        LIMIT 500
-      `),
-      safeQuery('documents', `
-        SELECT document.id, document.document_type AS "documentType",
-               document.document_number AS "documentNumber", document.title,
-               document.issuer, document.document_date AS "documentDate",
-               document.external_reference AS "externalReference",
-               link.relation_type AS "relationType", link.notes,
-               link.created_at AS "linkedAt"
-        FROM asset_source_documents link
-        JOIN source_documents document ON document.id = link.document_id
-        WHERE link.asset_id = $1
-        ORDER BY COALESCE(document.document_date::timestamptz, link.created_at) DESC
-        LIMIT 300
-      `),
-      safeQuery('inspectionReports', `
-        SELECT report.id, report.code, report.status,
-               report.pdf_status AS "pdfStatus", report.title,
-               report.generated_at AS "generatedAt", report.frozen_sha256 AS "frozenSha256",
-               act.id AS "actId", act.code AS "actCode",
-               visit.id AS "visitId", visit.code AS "visitCode"
-        FROM inspection_reports report
-        JOIN inspection_acts act ON act.id = report.act_id
-        JOIN inspection_visits visit ON visit.id = report.visit_id
-        WHERE visit.scope_asset_id = $1
-           OR EXISTS (
-                SELECT 1
-                FROM inspection_act_assets act_asset
-                WHERE act_asset.act_id = act.id
-                  AND act_asset.asset_id = $1
-                  AND act_asset.included = true
-              )
-           OR EXISTS (
-                SELECT 1
-                FROM inspection_findings finding
-                WHERE finding.act_id = act.id
-                  AND finding.asset_id = $1
-              )
-        ORDER BY report.generated_at DESC
-        LIMIT 200
-      `),
-      safeQuery('media', `
-        SELECT media.id, media.kind, media.original_name AS "originalName",
-               media.title, media.description, media.captured_at AS "capturedAt",
-               media.created_at AS "createdAt", media.source
-        FROM asset_media media
-        WHERE media.asset_id = $1 AND media.deleted_at IS NULL
-        ORDER BY COALESCE(media.captured_at, media.created_at) DESC
-        LIMIT 500
-      `),
-      safeQuery('versions', `
-        SELECT version.id, version.version_number AS "versionNumber",
-               version.change_type AS "changeType", version.changed_fields AS "changedFields",
-               version.occurred_at AS "occurredAt", version.actor_username AS "actorUsername",
-               version.source
-        FROM asset_versions version
-        WHERE version.asset_id = $1
-        ORDER BY version.occurred_at DESC
-        LIMIT 500
-      `),
-    ]);
-
-    const timeline: DossierRecord[] = [];
-    const push = (event: DossierRecord) => timeline.push(event);
-
-    versions.forEach((version) => push({
-      id: `version:${String(version.id)}`,
-      kind: 'INVENTORY_CHANGE',
-      occurredAt: version.occurredAt,
-      title: version.changeType === 'CREATED' || version.changeType === 'BASELINE'
-        ? 'Registro incorporado al inventario'
-        : 'Inventario actualizado',
-      description: Array.isArray(version.changedFields) && version.changedFields.length > 0
-        ? `Campos: ${(version.changedFields as string[]).join(', ')}`
-        : null,
-      meta: {
-        versionNumber: version.versionNumber,
-        changeType: version.changeType,
-        actorUsername: version.actorUsername,
-        source: version.source,
-      },
-    }));
-    visits.forEach((visit) => push({
-      id: `visit:${String(visit.id)}`,
-      kind: 'INSPECTION',
-      occurredAt: visit.actualStartedAt ?? visit.plannedStartAt ?? visit.createdAt,
-      title: `Inspección ${String(visit.code)}`,
-      description: null,
-      href: `/inspecciones/${String(visit.id)}`,
-      meta: { status: visit.status },
-    }));
-    acts.forEach((act) => push({
-      id: `act:${String(act.id)}`,
-      kind: 'ACT',
-      occurredAt: act.occurredAt,
-      title: `Acta ${String(act.code)}`,
-      description: act.title,
-      href: `/inspecciones/actas/${String(act.id)}`,
-      meta: { status: act.status, visitCode: act.visitCode },
-    }));
-    findings.forEach((finding) => {
-      push({
-        id: `finding:${String(finding.id)}`,
-        kind: 'FINDING',
-        occurredAt: finding.createdAt,
-        title: `Hallazgo ${String(finding.code)}`,
-        description: finding.title,
-        href: `/hallazgos/${String(finding.id)}`,
-        meta: { status: finding.status, actCode: finding.actCode },
-      });
-      if (finding.closedAt) {
-        push({
-          id: `finding-close:${String(finding.id)}`,
-          kind: 'FINDING_CLOSED',
-          occurredAt: finding.closedAt,
-          title: `Hallazgo ${String(finding.code)} cerrado`,
-          description: finding.closureNotes,
-          href: `/hallazgos/${String(finding.id)}`,
-          meta: { status: finding.status },
-        });
-      }
-    });
-    verificationResults.forEach((verification) => push({
-      id: `verification:${String(verification.id)}`,
-      kind: 'VERIFICATION',
-      occurredAt: verification.verifiedAt ?? verification.resultRecordedAt,
-      title: verification.outcome === 'RESOLVED'
-        ? `Verificación conforme · ${String(verification.findingCode)}`
-        : verification.outcome === 'NOT_RESOLVED'
-          ? `Verificación no conforme · ${String(verification.findingCode)}`
-          : `Verificación reprogramada · ${String(verification.findingCode)}`,
-      description: verification.resultNotes,
-      href: `/hallazgos/${String(verification.findingId)}`,
-      meta: {
-        outcome: verification.outcome,
-        visitCode: verification.visitCode,
-        targetControlOn: verification.targetControlOn,
-        rescheduledControlOn: verification.rescheduledControlOn,
-        evidenceCount: verification.evidenceCount,
-      },
-    }));
-    communications.forEach((communication) => push({
-      id: `communication:${String(communication.id)}`,
-      kind: 'COMMUNICATION',
-      occurredAt: communication.occurredAt,
-      title: communication.type === 'COMPANY_RESPONSE'
-        ? 'Respuesta de la empresa'
-        : String(communication.subject),
-      description: communication.details,
-      href: `/hallazgos/${String(communication.findingId)}`,
-      meta: {
-        findingCode: communication.findingCode,
-        direction: communication.direction,
-        channel: communication.channel,
-      },
-    }));
-    evidence.forEach((item) => push({
-      id: `evidence:${String(item.id)}`,
-      kind: item.kind === 'PHOTO' ? 'PHOTO' : 'DOCUMENT',
-      occurredAt: item.capturedAt ?? item.createdAt,
-      title: item.kind === 'PHOTO' ? 'Fotografía / evidencia' : 'Documento incorporado',
-      description: item.title ?? item.originalName,
-      href: `/hallazgos/${String(item.findingId)}`,
-      meta: { findingCode: item.findingCode, purpose: item.purpose },
-    }));
-    inspectionReports.forEach((report) => push({
-      id: `inspection-report:${String(report.id)}`,
-      kind: 'REPORT',
-      occurredAt: report.generatedAt,
-      title: `Informe ${String(report.code)}`,
-      description: report.title,
-      href: `/informes/${String(report.id)}`,
-      meta: { status: report.status, pdfStatus: report.pdfStatus, actCode: report.actCode },
-    }));
-    documents.forEach((document) => push({
-      id: `source-document:${String(document.id)}`,
-      kind: document.documentType === 'TECHNICAL_REPORT' ? 'REPORT' : 'SOURCE_DOCUMENT',
-      occurredAt: document.documentDate ?? document.linkedAt,
-      title: String(document.title),
-      description: document.documentNumber
-        ? `Documento ${String(document.documentNumber)}`
-        : 'Documento vinculado al inventario',
-      meta: { documentType: document.documentType, relationType: document.relationType },
-    }));
-    media.forEach((item) => push({
-      id: `asset-media:${String(item.id)}`,
-      kind: item.kind === 'PHOTO' ? 'PHOTO' : 'DOCUMENT',
-      occurredAt: item.capturedAt ?? item.createdAt,
-      title: item.kind === 'PHOTO' ? 'Fotografía del inventario' : 'Archivo del inventario',
-      description: item.title ?? item.originalName,
-      meta: { source: item.source },
-    }));
-
-    timeline.sort(
-      (a, b) => new Date(String(b.occurredAt ?? 0)).getTime() - new Date(String(a.occurredAt ?? 0)).getTime(),
-    );
-
-    const openFindings = findings.filter((finding) => finding.status === 'OPEN').length;
-    const closedFindings = findings.filter((finding) => finding.status === 'CLOSED').length;
-    const reports = documents.filter((document) => document.documentType === 'TECHNICAL_REPORT');
-
-    return {
-      asset: {
-        id: asset.id,
-        code: asset.code,
-        name: asset.name,
-        commonName: asset.commonName,
-      },
-      counters: {
-        inspections: visits.length,
-        acts: acts.length,
-        findings: findings.length,
-        verifications: verificationResults.length,
-        openFindings,
-        closedFindings,
-        evidence: evidence.length,
-        documents: documents.length + media.filter((item) => item.kind === 'DOCUMENT').length,
-        photos: evidence.filter((item) => item.kind === 'PHOTO').length
-          + media.filter((item) => item.kind === 'PHOTO').length,
-        reports: reports.length + inspectionReports.length,
-      },
-      visits,
-      acts,
-      findings,
-      evidence,
-      communications,
-      verificationResults,
-      documents,
-      inspectionReports,
-      reports,
-      media,
-      versions,
-      timeline: timeline.slice(0, 500),
-      warnings: failedFacets,
-    };
-  }
-}
@@ -24,7 +24,6 @@ import { AssetRegistryService } from './asset-registry.service';
 import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/field-discovery-inspection-link.service';
 import { InventoryStructureController } from './inventory-structure.controller';
 import { InventoryStructureService } from './inventory-structure.service';
-import { SimpleInventoryStructureService } from './simple-inventory-structure.service';
 import { InventoryFamilyCatalogController } from './inventory-family-catalog.controller';
 import { InventoryFamilyCatalogService } from './inventory-family-catalog.service';
 import { InventoryTechnicalValuesController } from './inventory-technical-values.controller';
@@ -32,7 +31,6 @@ import { InventoryTechnicalValuesService } from './inventory-technical-values.se
 import { InventoryFunctionService } from './inventory-function.service';
 import { FieldInventoryMergeController, InventoryMergeController } from './inventory-merge.controller';
 import { InventoryMergeService } from './inventory-merge.service';
-import { ActivityDossierService } from './activity-dossier.service';
 import { MergedInventoryDossierService } from './merged-inventory-dossier.service';
 import { InventoryBrowserController } from './inventory-browser.controller';
 import { InventoryBrowserService } from './inventory-browser.service';
@@ -61,13 +59,11 @@ import { InventoryBrowserService } from './inventory-browser.service';
    AssetTypesService,
    AssetsService,
    InventoryStructureService,
-    SimpleInventoryStructureService,
    InventoryFamilyCatalogService,
    InventoryTechnicalValuesService,
    InventoryFunctionService,
    InventoryBrowserService,
    InventoryMergeService,
-    ActivityDossierService,
    MergedInventoryDossierService,
    AssetGeometriesService,
    AssetHistoryService,
@@ -142,8 +142,27 @@ export class AssetOperationalRelationsService {
          if (!document) throw new BadRequestException({ code: 'SOURCE_DOCUMENT_NOT_FOUND', message: 'El documento fuente no existe' });
        }

-        // F7: un Área puede estar explotada por varias Empresas simultáneamente.
-        // La unicidad válida es Área + Empresa + rol activo; no existe una única Operadora por Área.
+        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
@@ -151,6 +170,20 @@ export class AssetOperationalRelationsService {
          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 }>;

+        // Compatibility snapshot only. This does not move or re-parent Inventory.
+        // area_company_relations remains the temporal source of truth.
+        if (dto.relationRole === AreaOrganizationRole.OPERATOR) {
+          await manager.query(`
+            UPDATE assets asset
+            SET operator_company_id=$2::uuid,updated_at=CURRENT_TIMESTAMP,updated_by=$3::uuid
+            FROM asset_types type
+            WHERE type.id=asset.asset_type_id
+              AND type.operational_role='GENERIC'
+              AND asset.operational_area_id=$1::uuid
+              AND asset.operator_company_id IS DISTINCT FROM $2::uuid
+          `,[dto.areaId,dto.companyId,principal.userId]);
+        }
+
        const created = await this.loadRelation(manager, row.id);
        await this.audit.record({
          ...administrationAuditContext(principal, request),
@@ -159,7 +192,7 @@ export class AssetOperationalRelationsService {
          entityId: row.id,
          afterData: this.auditView(created),
          metadata: dto.relationRole === AreaOrganizationRole.OPERATOR
-            ? { inventoryHierarchyChanged:false, multipleAreaOperatorsAllowed:true }
+            ? { inventoryHierarchyChanged:false, operatorSnapshotSynchronized:true }
            : undefined,
        }, manager);
        return created;
@@ -190,7 +223,8 @@ export class AssetOperationalRelationsService {
        });
      }

-      // Ending an operator relation never moves, rewrites or blocks existing Inventory.
+      // F5: physical Inventory belongs to Area/Yacimiento hierarchy, not to Company.
+      // Ending an operator relation must never be blocked by existing Inventory.
      await manager.query(`
        UPDATE area_company_relations
        SET valid_until = CURRENT_TIMESTAMP,
@@ -209,7 +243,6 @@ export class AssetOperationalRelationsService {
        afterData: this.auditView(updated),
        metadata: {
          inventoryHierarchyChanged:false,
-          operatorSnapshotPreserved:true,
          retainedCompatibilitySnapshotCount: before.assignedAssetCount,
        },
      }, manager);
@@ -137,41 +137,21 @@ 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 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"
+        CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',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 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
+      LEFT JOIN assets company ON company.id=history.operator_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,
@@ -1,5 +1,5 @@
 import { Transform, Type } from 'class-transformer';
-import { IsDate, IsEmpty, IsOptional, IsString, IsUUID, MaxLength, MinLength } from 'class-validator';
+import { IsDate, IsOptional, IsString, IsUUID, MaxLength, MinLength } from 'class-validator';

 export class ChangeAssetContextDto {
  @IsOptional()
@@ -10,13 +10,8 @@ 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()
-  @IsEmpty({ message: 'La Operadora se administra en la relación temporal del Área, no en el Inventario' })
+  @IsUUID('4')
  operatorCompanyId?: string | null;

  @IsOptional()
@@ -54,10 +54,6 @@ export class CreateAssetDto {
  @IsUUID('4')
  operatorCompanyId?: string | null;

-  @IsOptional()
-  @IsUUID('4')
-  concessionTypeId?: string | null;
-
  @IsOptional()
  @Transform(({ value }) =>
    typeof value === 'string' && value.trim() ? value.trim() : null,
@@ -9,9 +9,6 @@ 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.
-// La Empresa y el Tipo de concesión se relacionan directamente con el Yacimiento.
 export const INVENTORY_STRUCTURE_KINDS = [
  'EMPRESA',
  'DEPARTAMENTO',
@@ -53,14 +50,6 @@ export class CreateInventoryStructureDto {
  @IsUUID('4')
  familyId?: string | null;

-  @IsOptional()
-  @IsUUID('4')
-  operatorCompanyId?: string | null;
-
-  @IsOptional()
-  @IsUUID('4')
-  concessionTypeId?: string | null;
-
  @IsOptional()
  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
  @IsString()
@@ -1,5 +1,5 @@
 import { Transform } from 'class-transformer';
-import { IsBoolean, IsEmpty, IsEnum, IsOptional, IsString, IsUUID, MaxLength } from 'class-validator';
+import { IsBoolean, IsEnum, IsOptional, IsString, IsUUID, MaxLength } from 'class-validator';
 import { AssetInformationStatus, AssetOperationalStatus } from '../../database/entities';

 export class ListAssetTreeQueryDto {
@@ -24,12 +24,8 @@ 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()
-  @IsEmpty({ message: 'Filtrá la Operadora mediante la relación temporal del Área, no mediante el snapshot del Inventario' })
+  @IsUUID('4')
  operatorCompanyId?: string;

  @IsOptional()
@@ -1,7 +1,6 @@
 import { Transform, Type } from 'class-transformer';
 import {
  IsBoolean,
-  IsEmpty,
  IsEnum,
  IsInt,
  IsOptional,
@@ -67,12 +66,7 @@ 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()
-  @IsEmpty({ message: 'Filtrá la Operadora mediante la relación temporal del Área, no mediante el snapshot del Inventario' })
+  @IsUUID('4')
  operatorCompanyId?: string;
 }
@@ -1,6 +1,5 @@
 import { Transform } from 'class-transformer';
 import {
-  IsEmpty,
  IsObject,
  IsOptional,
  IsString,
@@ -49,13 +48,9 @@ export class UpdateAssetDto {
  operationalAreaId?: string | null;

  @IsOptional()
-  @IsEmpty({ message: 'La Empresa relacionada se administra en el Yacimiento, no desde la edición genérica del Inventario' })
+  @IsUUID('4')
  operatorCompanyId?: string | null;

-  @IsOptional()
-  @IsEmpty({ message: 'El Tipo de concesión se administra en el Yacimiento, no desde la edición genérica del Inventario' })
-  concessionTypeId?: string | null;
-
  @IsOptional()
  @Transform(({ value }) =>
    typeof value === 'string' && value.trim() ? value.trim() : null,
@@ -4,14 +4,10 @@ import { RequirePermissions } from '../authorization/decorators/require-permissi
 import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
 import { CreateInventoryStructureDto } from './dto/create-inventory-structure.dto';
 import { InventoryStructureService } from './inventory-structure.service';
-import { SimpleInventoryStructureService } from './simple-inventory-structure.service';

@Controller('inventory-structure')
 export class InventoryStructureController {
-  constructor(
-    private readonly inventoryStructure: InventoryStructureService,
-    private readonly simpleInventoryStructure: SimpleInventoryStructureService,
-  ) {}
+  constructor(private readonly inventoryStructure: InventoryStructureService) {}

  @Get()
  @RequirePermissions('assets.read')
@@ -28,17 +24,6 @@ export class InventoryStructureController {
    return this.inventoryStructure.parents(kind, search);
  }

-  @Post('simple')
-  @RequirePermissions('assets.create')
-  createSimple(
-    @Body() dto: CreateInventoryStructureDto,
-    @CurrentAuth() principal: AuthPrincipal,
-    @Req() request: RequestWithContext,
-  ) {
-    return this.simpleInventoryStructure.create(dto, principal, request);
-  }
-
-  // Compatibilidad temporal con el alta anterior. La WEB F7 utiliza /simple.
  @Post()
  @RequirePermissions('assets.create')
  create(
@@ -20,7 +20,6 @@ import type { CreateInventoryStructureDto, InventoryStructureKind } from './dto/
 import { AssetHistoryService } from './asset-history.service';

 type StructureTypeRow = { id: string; code: string; name: string };
-type SimpleOptionRow = { id: string; code: string; name: string };
 type FamilyParent = { id: string; code: string; name: string };
 type FamilyRow = {
  id: string;
@@ -38,17 +37,9 @@ type ParentRow = {
  name: string;
  typeCode: string;
  inventoryFamilyId: string | null;
-  operationalAreaId: string | null;
-  operatorCompanyId: string | null;
 };
 type IdRow = { id: string };

-type YacimientoContext = {
-  companyId: string;
-  concessionTypeId: string;
-  concessionName: string;
-};
-
 const TYPE_CODE_BY_KIND: Record<Exclude<InventoryStructureKind, 'EMPRESA'>, string> = {
  DEPARTAMENTO: 'departamento',
  AREA: 'area',
@@ -123,21 +114,6 @@ export class InventoryStructureService {
      ORDER BY family.level,family.name,family.code
    `)) as FamilyRow[];

-    const companies = (await this.dataSource.query(`
-      SELECT asset.id,asset.code,COALESCE(profile.legal_name,asset.name) AS name
-      FROM assets asset
-      JOIN asset_types type ON type.id=asset.asset_type_id AND type.operational_role='COMPANY' AND type.is_active=true
-      LEFT JOIN organization_profiles profile ON profile.asset_id=asset.id
-      WHERE asset.information_status<>'INACTIVE'
-      ORDER BY COALESCE(profile.legal_name,asset.name),asset.code
-    `)) as SimpleOptionRow[];
-    const concessionTypes = (await this.dataSource.query(`
-      SELECT id,code,name
-      FROM concession_types
-      WHERE is_active=true
-      ORDER BY CASE lower(name) WHEN 'explotación' THEN 1 WHEN 'exploración' THEN 2 ELSE 9 END,name,code
-    `)) as SimpleOptionRow[];
-
    return {
      independentMasters: [
        { kind: 'EMPRESA', label: 'Empresa', type: company, parentKind: null, requiresFamily: false },
@@ -149,8 +125,6 @@ export class InventoryStructureService {
        { kind: 'INSTALACION', label: 'Instalación', type: instalacion, parentKind: 'YACIMIENTO', requiresFamily: true },
        { kind: 'SUBINSTALACION', label: 'Subinstalación', type: subinstalacion, parentKind: 'INSTALACION', requiresFamily: true },
      ],
-      companies,
-      concessionTypes,
      installationFamilies: families.filter((item) => item.level==='INSTALLATION'),
      subinstallationFamilies: families.filter((item) => item.level==='SUBINSTALLATION'),
    };
@@ -205,43 +179,25 @@ 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 yacimientoContext = await this.requireYacimientoContext(manager, dto);
        const generatedCode = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
        const operationalAreaId = parent && ['YACIMIENTO','INSTALACION','SUBINSTALACION'].includes(dto.kind)
          ? await this.resolveAreaId(manager, parent)
          : null;
-        const operatorCompanyId = dto.kind === 'YACIMIENTO'
-          ? yacimientoContext?.companyId ?? null
-          : dto.kind === 'INSTALACION' || dto.kind === 'SUBINSTALACION'
-            ? parent?.operatorCompanyId ?? null
-            : null;
-        const concessionTypeId = dto.kind === 'YACIMIENTO'
-          ? yacimientoContext?.concessionTypeId ?? null
-          : null;
-
-        if ((dto.kind === 'INSTALACION' || dto.kind === 'SUBINSTALACION') && !operatorCompanyId) {
-          throw new ConflictException({
-            code: 'INVENTORY_YACIMIENTO_COMPANY_MISSING',
-            message: 'El Yacimiento de origen no tiene una Empresa relacionada válida',
-          });
-        }

        const inserted = (await manager.query(`
          INSERT INTO assets (
-            asset_type_id,parent_id,operational_area_id,operator_company_id,concession_type_id,inventory_family_id,
+            asset_type_id,parent_id,operational_area_id,operator_company_id,inventory_family_id,
            code,name,common_name,description,information_status,operational_status,
            data_origin,source_name,source_reference,source_notes,created_by,updated_by,provenance_updated_by
          ) VALUES (
-            $1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,$6::uuid,
-            $7::varchar,$8::varchar,$9::varchar,$10::text,$11::asset_information_status,$12::asset_operational_status,
-            $13::varchar,$14::varchar,$15::varchar,$16::text,$17::uuid,$17::uuid,$17::uuid
+            $1::uuid,$2::uuid,$3::uuid,NULL,$4::uuid,
+            $5::varchar,$6::varchar,$7::varchar,$8::text,$9::asset_information_status,$10::asset_operational_status,
+            $11::varchar,$12::varchar,$13::varchar,$14::text,$15::uuid,$15::uuid,$15::uuid
          ) RETURNING id
        `, [
          type.id,
          parent?.id ?? null,
          operationalAreaId,
-          operatorCompanyId,
-          concessionTypeId,
          family?.id ?? null,
          generatedCode,
          dto.name,
@@ -250,13 +206,9 @@ export class InventoryStructureService {
          AssetInformationStatus.DRAFT,
          AssetOperationalStatus.UNKNOWN,
          AssetDataOrigin.MANUAL,
-          dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas' : 'Estructura manual de Inventario',
+          dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas F6' : 'Estructura manual de Inventario F6',
          dto.kind === 'EMPRESA' ? 'inventory-master:empresa' : `inventory-structure:${dto.kind.toLowerCase()}`,
-          family
-            ? `Clasificación técnica: ${family.code} · ${family.name}`
-            : yacimientoContext
-              ? `Tipo de concesión: ${yacimientoContext.concessionName}`
-              : null,
+          family ? `Clasificación técnica: ${family.code} · ${family.name}` : null,
          principal.userId,
        ])) as Array<{ id: string }>;
        const id = inserted[0]?.id;
@@ -269,15 +221,6 @@ export class InventoryStructureService {
            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]);
        }
-        if (dto.kind === 'YACIMIENTO' && operationalAreaId && operatorCompanyId && concessionTypeId) {
-          await this.ensureCompatibilityProjection(
-            manager,
-            operationalAreaId,
-            operatorCompanyId,
-            concessionTypeId,
-            yacimientoContext?.concessionName ?? 'Concesión',
-          );
-        }

        const versionNumber = await this.history.capture(
          manager,id,AssetVersionChangeType.CREATED,principal,request,
@@ -286,14 +229,10 @@ export class InventoryStructureService {
          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,parent?.id ?? null,operationalAreaId,operatorCompanyId,
-          dto.kind === 'YACIMIENTO'
-            ? 'Alta manual de Yacimiento con Área, Empresa y Tipo de concesión'
-            : dto.kind === 'EMPRESA'
-              ? 'Alta manual de Empresa independiente'
-              : 'Alta manual de estructura de Inventario',
+          id,parent?.id ?? null,operationalAreaId,
+          dto.kind === 'EMPRESA' ? 'Alta manual de Empresa independiente F6' : 'Alta manual de estructura de Inventario F6',
          versionNumber,request.requestId,principal.userId,
        ]);
        const created = await this.loadView(manager, id);
@@ -305,8 +244,7 @@ export class InventoryStructureService {
          metadata: {
            versionNumber,inventoryStructureKind: dto.kind,
            inventoryFamilyId: family?.id ?? null,inventoryFamilyCode: family?.code ?? null,
-            operatorCompanyId,
-            concessionTypeId,
+            operatorOwnership: false,
          },
        }, manager);
        return created;
@@ -352,9 +290,7 @@ export class InventoryStructureService {
    });
    const rows = (await manager.query(`
      SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
-        asset.inventory_family_id AS "inventoryFamilyId",
-        asset.operational_area_id AS "operationalAreaId",
-        asset.operator_company_id AS "operatorCompanyId"
+        asset.inventory_family_id AS "inventoryFamilyId"
      FROM assets asset
      JOIN asset_types type ON type.id=asset.asset_type_id
      WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
@@ -369,65 +305,8 @@ export class InventoryStructureService {
    return parent;
  }

-  private async requireYacimientoContext(
-    manager: EntityManager,
-    dto: CreateInventoryStructureDto,
-  ): Promise<YacimientoContext | null> {
-    if (dto.kind !== 'YACIMIENTO') {
-      if (dto.operatorCompanyId || dto.concessionTypeId) {
-        throw new BadRequestException({
-          code: 'INVENTORY_YACIMIENTO_CONTEXT_NOT_ALLOWED',
-          message: 'Empresa relacionada y Tipo de concesión sólo corresponden al Yacimiento',
-        });
-      }
-      return null;
-    }
-    if (!dto.operatorCompanyId) {
-      throw new BadRequestException({
-        code: 'INVENTORY_YACIMIENTO_COMPANY_REQUIRED',
-        message: 'Seleccioná la Empresa relacionada del Yacimiento',
-      });
-    }
-    if (!dto.concessionTypeId) {
-      throw new BadRequestException({
-        code: 'INVENTORY_YACIMIENTO_CONCESSION_REQUIRED',
-        message: 'Seleccioná el Tipo de concesión del Yacimiento',
-      });
-    }
-    const companyRows = (await manager.query(`
-      SELECT asset.id
-      FROM assets asset
-      JOIN asset_types type ON type.id=asset.asset_type_id
-      WHERE asset.id=$1::uuid
-        AND type.operational_role='COMPANY'
-        AND type.is_active=true
-        AND asset.information_status<>'INACTIVE'
-      FOR KEY SHARE
-    `,[dto.operatorCompanyId])) as IdRow[];
-    if (!companyRows[0]) throw new BadRequestException({
-      code: 'INVENTORY_YACIMIENTO_COMPANY_INVALID',
-      message: 'La Empresa relacionada seleccionada no es válida',
-    });
-    const concessionRows = (await manager.query(`
-      SELECT id,name
-      FROM concession_types
-      WHERE id=$1::uuid AND is_active=true
-      FOR KEY SHARE
-    `,[dto.concessionTypeId])) as Array<{id:string;name:string}>;
-    if (!concessionRows[0]) throw new BadRequestException({
-      code: 'INVENTORY_YACIMIENTO_CONCESSION_INVALID',
-      message: 'El Tipo de concesión seleccionado no es válido',
-    });
-    return {
-      companyId: dto.operatorCompanyId,
-      concessionTypeId: dto.concessionTypeId,
-      concessionName: concessionRows[0].name,
-    };
-  }
-
  private async resolveAreaId(manager: EntityManager,parent: ParentRow):Promise<string> {
    if (parent.typeCode.toLowerCase()==='area') return parent.id;
-    if (parent.operationalAreaId) return parent.operationalAreaId;
    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
@@ -502,40 +381,6 @@ export class InventoryStructureService {
    return family;
  }

-  private async ensureCompatibilityProjection(
-    manager: EntityManager,
-    areaId: string,
-    companyId: string,
-    concessionTypeId: string,
-    concessionName: string,
-  ): Promise<void> {
-    const companyProjection = await manager.query(`
-      SELECT id FROM area_company_relations
-      WHERE area_id=$1::uuid AND company_id=$2::uuid AND relation_role='OPERATOR' AND valid_to IS NULL
-      LIMIT 1
-    `,[areaId,companyId]);
-    if (!companyProjection[0]) {
-      await manager.query(`
-        INSERT INTO area_company_relations(area_id,company_id,relation_role,valid_from,start_reason)
-        VALUES($1::uuid,$2::uuid,'OPERATOR',CURRENT_TIMESTAMP,'Proyección derivada de Yacimiento')
-      `,[areaId,companyId]);
-    }
-    const rightType = concessionName.toLocaleLowerCase('es-AR').includes('explor')
-      ? 'EXPLORATION_PERMIT'
-      : 'EXPLOITATION_CONCESSION';
-    const rightProjection = await manager.query(`
-      SELECT id FROM area_legal_rights
-      WHERE area_id=$1::uuid AND right_type=$2::area_legal_right_type AND status='ACTIVE'
-      LIMIT 1
-    `,[areaId,rightType]);
-    if (!rightProjection[0]) {
-      await manager.query(`
-        INSERT INTO area_legal_rights(area_id,right_type,name,status,notes)
-        VALUES($1::uuid,$2::area_legal_right_type,$3,'ACTIVE',$4)
-      `,[areaId,rightType,`${concessionName} · proyección de Yacimiento`,`Tipo de concesión canónico: ${concessionTypeId}`]);
-    }
-  }
-
  private generatedCode(kind: InventoryStructureKind, name: string): string {
    const prefix = kind === 'EMPRESA' ? 'EMP'
      : kind === 'DEPARTAMENTO' ? 'DEP'
@@ -555,8 +400,6 @@ export class InventoryStructureService {
        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 company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',COALESCE(profile.legal_name,company.name)) END AS "operatorCompany",
-        CASE WHEN concession.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',concession.id,'code',concession.code,'name',concession.name) END AS "concessionType",
        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
@@ -566,9 +409,6 @@ export class InventoryStructureService {
      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 assets company ON company.id=asset.operator_company_id
-      LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
-      LEFT JOIN concession_types concession ON concession.id=asset.concession_type_id
      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
      WHERE asset.id=$1::uuid
    `, [id]);
@@ -1,13 +1,10 @@
 import { Injectable } from '@nestjs/common';
-import { ActivityDossierService } from './activity-dossier.service';
 import { AssetsService } from './assets.service';
 import { InventoryFunctionService } from './inventory-function.service';
 import { InventoryMergeService } from './inventory-merge.service';

 type LooseRecord = Record<string, any>;

-const MERGEABLE_DOSSIER_TYPES = new Set(['instalacion', 'subinstalacion']);
-
 function dedupeById<T extends LooseRecord>(items: T[]): T[] {
  const seen = new Set<string>();
  const result: T[] = [];
@@ -32,22 +29,11 @@ function sortDesc(items: LooseRecord[], fieldCandidates: string[]): LooseRecord[
 export class MergedInventoryDossierService {
  constructor(
    private readonly assets: AssetsService,
-    private readonly activity: ActivityDossierService,
    private readonly merges: InventoryMergeService,
    private readonly functions: InventoryFunctionService,
  ) {}

  async dossier(requestedAssetId: string): Promise<Record<string, unknown>> {
-    const requestedAsset = await this.assets.getById(requestedAssetId);
-    const requestedTypeCode = requestedAsset.type.code.trim().toLowerCase();
-
-    // La conciliación/fusión existe sólo para Instalaciones y Subinstalaciones.
-    // Los registros territoriales (Departamento, Área, Yacimiento) deben poder
-    // abrir su Actividad sin depender del subsistema de merge.
-    if (!MERGEABLE_DOSSIER_TYPES.has(requestedTypeCode)) {
-      return await this.activity.dossier(requestedAssetId);
-    }
-
    const mergeStatus = await this.merges.status(requestedAssetId) as LooseRecord;
    const canonical = mergeStatus.canonical as LooseRecord;
    const requested = mergeStatus.requested as LooseRecord;
@@ -58,7 +44,7 @@ export class MergedInventoryDossierService {
      .filter((value, index, all) => all.indexOf(value) === index);

    const dossiers = await Promise.all(inventoryIds.map(async (assetId) => {
-      const dossier = await this.activity.dossier(assetId) as LooseRecord;
+      const dossier = await this.assets.dossier(assetId) as LooseRecord;
      const identity = dossier.asset as LooseRecord;
      const functionDossier = await this.functions.getForAsset(assetId).catch(() => null) as LooseRecord | null;
      return { assetId, identity, dossier, functionDossier };
@@ -159,9 +145,6 @@ export class MergedInventoryDossierService {
    const reports = documents.filter((document) => document.documentType === 'TECHNICAL_REPORT');
    const openFindings = findings.filter((finding) => finding.status === 'OPEN').length;
    const closedFindings = findings.filter((finding) => finding.status === 'CLOSED').length;
-    const warnings = dossiers.flatMap(({ assetId, dossier }) =>
-      ((dossier.warnings ?? []) as string[]).map((facet) => `${assetId}:${facet}`),
-    );

    return {
      asset: {
@@ -211,7 +194,6 @@ export class MergedInventoryDossierService {
      media,
      versions,
      timeline: timeline.slice(0, 1000),
-      warnings,
    };
  }
 }
@@ -1,323 +0,0 @@
-import { randomUUID } from 'node:crypto';
-import {
-  BadRequestException,
-  ConflictException,
-  Injectable,
-  NotFoundException,
-} from '@nestjs/common';
-import { DataSource, EntityManager } from 'typeorm';
-import { administrationAuditContext, isUniqueViolation } from '../administration/common/administration-audit';
-import { AuditService } from '../audit/audit.service';
-import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
-import {
-  AssetDataOrigin,
-  AssetInformationStatus,
-  AssetOperationalStatus,
-  AssetVersionChangeType,
-  AuditAction,
-} from '../database/entities';
-import type { CreateInventoryStructureDto, InventoryStructureKind } from './dto/create-inventory-structure.dto';
-import { AssetHistoryService } from './asset-history.service';
-
-type StructureTypeRow = { id: string; code: string; name: string };
-type ParentRow = {
-  id: string;
-  code: string;
-  name: string;
-  typeCode: string;
-  inventoryFamilyId: string | null;
-  operationalAreaId: string | null;
-  operatorCompanyId: string | null;
-};
-type FamilyRow = {
-  id: string;
-  code: string;
-  name: string;
-  level: 'INSTALLATION' | 'SUBINSTALLATION';
-};
-
-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> = {
-  EMPRESA: null,
-  DEPARTAMENTO: null,
-  AREA: 'departamento',
-  YACIMIENTO: 'area',
-  INSTALACION: 'yacimiento',
-  SUBINSTALACION: 'instalacion',
-};
-
-@Injectable()
-export class SimpleInventoryStructureService {
-  constructor(
-    private readonly dataSource: DataSource,
-    private readonly audit: AuditService,
-    private readonly history: AssetHistoryService,
-  ) {}
-
-  async create(
-    dto: CreateInventoryStructureDto,
-    principal: AuthPrincipal,
-    request: RequestWithContext,
-  ) {
-    try {
-      return await this.dataSource.transaction(async (manager) => {
-        const type = await this.requireStructureType(manager, dto.kind);
-        const parent = await this.requireParent(manager, dto.kind, dto.parentId ?? null);
-        const family = await this.requireFamily(manager, dto.kind, dto.familyId ?? null, parent);
-
-        let operationalAreaId: string | null = null;
-        let operatorCompanyId: string | null = null;
-
-        if (dto.kind === 'YACIMIENTO') {
-          if (!parent) throw new BadRequestException({ code: 'INVENTORY_YACIMIENTO_AREA_REQUIRED', message: 'Seleccioná el Área del Yacimiento' });
-          if (!dto.operatorCompanyId) throw new BadRequestException({ code: 'INVENTORY_YACIMIENTO_COMPANY_REQUIRED', message: 'Seleccioná la Empresa operadora del Yacimiento' });
-          await this.requireAreaCompanyRelation(manager, parent.id, dto.operatorCompanyId);
-          operationalAreaId = parent.id;
-          operatorCompanyId = dto.operatorCompanyId;
-        } else if (dto.kind === 'INSTALACION' || dto.kind === 'SUBINSTALACION') {
-          operationalAreaId = parent?.operationalAreaId ?? null;
-          operatorCompanyId = parent?.operatorCompanyId ?? null;
-          if (!operationalAreaId || !operatorCompanyId) {
-            throw new ConflictException({
-              code: 'INVENTORY_YACIMIENTO_CONTEXT_MISSING',
-              message: 'El Yacimiento de origen debe tener Área y Empresa operadora válidas',
-            });
-          }
-        } else if (dto.operatorCompanyId || dto.concessionTypeId) {
-          throw new BadRequestException({
-            code: 'INVENTORY_SIMPLE_CONTEXT_NOT_ALLOWED',
-            message: 'Empresa operadora sólo corresponde al Yacimiento',
-          });
-        }
-
-        const generatedCode = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
-        const rows = (await manager.query(`
-          INSERT INTO assets (
-            asset_type_id,parent_id,operational_area_id,operator_company_id,concession_type_id,inventory_family_id,
-            code,name,common_name,description,information_status,operational_status,
-            data_origin,source_name,source_reference,source_notes,created_by,updated_by,provenance_updated_by
-          ) VALUES (
-            $1::uuid,$2::uuid,$3::uuid,$4::uuid,NULL,$5::uuid,
-            $6::varchar,$7::varchar,NULL,NULL,$8::asset_information_status,$9::asset_operational_status,
-            $10::varchar,$11::varchar,$12::varchar,$13::text,$14::uuid,$14::uuid,$14::uuid
-          ) RETURNING id
-        `, [
-          type.id,
-          parent?.id ?? null,
-          operationalAreaId,
-          operatorCompanyId,
-          family?.id ?? null,
-          generatedCode,
-          dto.name,
-          AssetInformationStatus.DRAFT,
-          AssetOperationalStatus.UNKNOWN,
-          AssetDataOrigin.MANUAL,
-          dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas' : 'Alta simple de Inventario',
-          `inventory-simple:${dto.kind.toLowerCase()}`,
-          family ? `Tipo: ${family.name}` : null,
-          principal.userId,
-        ])) as Array<{ id: string }>;
-        const id = rows[0]?.id;
-        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,
-          id,
-          AssetVersionChangeType.CREATED,
-          principal,
-          request,
-        );
-
-        await manager.query(`
-          INSERT INTO asset_context_history (
-            asset_id,parent_id,operational_area_id,operator_company_id,valid_from,
-            change_reason,asset_version_number,source,request_id,created_by
-          ) VALUES ($1,$2,$3,$4,CURRENT_TIMESTAMP,$5,$6,'WEB',$7,$8)
-        `, [
-          id,
-          parent?.id ?? null,
-          operationalAreaId,
-          operatorCompanyId,
-          dto.kind === 'YACIMIENTO'
-            ? 'Alta de Yacimiento con Empresa operadora vinculada al Área'
-            : 'Alta simple de Inventario',
-          versionNumber,
-          request.requestId,
-          principal.userId,
-        ]);
-
-        const created = await this.loadView(manager, id);
-        await this.audit.record({
-          ...administrationAuditContext(principal, request),
-          action: AuditAction.ASSET_CREATED,
-          entityType: 'asset',
-          entityId: id,
-          afterData: created as Record<string, unknown>,
-          metadata: {
-            versionNumber,
-            inventoryStructureKind: dto.kind,
-            inventoryFamilyId: family?.id ?? null,
-            inventoryFamilyCode: family?.code ?? null,
-            operatorCompanyId,
-            simpleInventoryFlow: true,
-          },
-        }, manager);
-        return created;
-      });
-    } catch (error) {
-      if (isUniqueViolation(error)) {
-        throw new ConflictException({ code: 'ASSET_CODE_ALREADY_EXISTS', message: 'Ya existe un registro con ese código' });
-      }
-      throw error;
-    }
-  }
-
-  private async requireStructureType(manager: EntityManager, kind: InventoryStructureKind): Promise<StructureTypeRow> {
-    const sql = kind === 'EMPRESA'
-      ? `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`
-      : `SELECT id,code,name FROM asset_types WHERE lower(code)=lower($1::text) AND is_active=true LIMIT 1`;
-    const params = kind === 'EMPRESA' ? [] : [TYPE_CODE_BY_KIND[kind as Exclude<InventoryStructureKind, 'EMPRESA'>]];
-    const rows = (await manager.query(sql, params)) as StructureTypeRow[];
-    if (!rows[0]) throw new ConflictException({ code: 'INVENTORY_STRUCTURE_TYPE_NOT_CONFIGURED', message: `El nivel ${kind} no está configurado` });
-    return rows[0];
-  }
-
-  private async requireParent(
-    manager: EntityManager,
-    kind: InventoryStructureKind,
-    parentId: string | null,
-  ): Promise<ParentRow | null> {
-    const expectedType = PARENT_TYPE_BY_KIND[kind];
-    if (!expectedType) {
-      if (parentId) throw new BadRequestException({ code: 'INVENTORY_ROOT_MUST_NOT_HAVE_PARENT', message: `${kind === 'EMPRESA' ? 'Empresa' : 'Departamento'} no admite padre` });
-      return null;
-    }
-    if (!parentId) throw new BadRequestException({ code: 'INVENTORY_PARENT_REQUIRED', message: `Seleccioná el nivel superior para crear ${kind.toLowerCase()}` });
-
-    const rows = (await manager.query(`
-      SELECT asset.id,asset.code,asset.name,lower(type.code) AS "typeCode",
-        asset.inventory_family_id AS "inventoryFamilyId",
-        CASE WHEN lower(type.code)='area' THEN asset.id ELSE asset.operational_area_id END AS "operationalAreaId",
-        asset.operator_company_id AS "operatorCompanyId"
-      FROM assets asset
-      JOIN asset_types type ON type.id=asset.asset_type_id
-      WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
-      FOR KEY SHARE OF asset
-    `, [parentId])) as ParentRow[];
-    const parent = rows[0];
-    if (!parent || parent.typeCode !== expectedType) {
-      throw new BadRequestException({ code: 'INVENTORY_PARENT_INVALID', message: `El registro padre debe ser ${expectedType}` });
-    }
-    return parent;
-  }
-
-  private async requireAreaCompanyRelation(manager: EntityManager, areaId: string, companyId: string): Promise<void> {
-    const rows = await manager.query(`
-      SELECT 1
-      FROM area_company_relations relation
-      JOIN assets company ON company.id=relation.company_id
-      JOIN asset_types company_type ON company_type.id=company.asset_type_id
-      WHERE relation.area_id=$1::uuid
-        AND relation.company_id=$2::uuid
-        AND relation.relation_role='OPERATOR'
-        AND relation.valid_until IS NULL
-        AND company.information_status<>'INACTIVE'
-        AND company_type.operational_role='COMPANY'
-        AND company_type.is_active=true
-      LIMIT 1
-      FOR KEY SHARE OF relation
-    `, [areaId, companyId]);
-    if (!rows[0]) {
-      throw new BadRequestException({
-        code: 'INVENTORY_YACIMIENTO_COMPANY_NOT_IN_AREA',
-        message: 'La Empresa seleccionada no está vinculada como explotadora del Área',
-      });
-    }
-  }
-
-  private async requireFamily(
-    manager: EntityManager,
-    kind: InventoryStructureKind,
-    familyId: string | null,
-    parent: ParentRow | null,
-  ): Promise<FamilyRow | null> {
-    if (kind !== 'INSTALACION' && kind !== 'SUBINSTALACION') {
-      if (familyId) throw new BadRequestException({ code: 'INVENTORY_FAMILY_NOT_ALLOWED', message: 'Este nivel no usa Tipo de Instalación/Subinstalación' });
-      return null;
-    }
-    if (!familyId) throw new BadRequestException({ code: 'INVENTORY_FAMILY_REQUIRED', message: `Seleccioná el tipo de ${kind === 'INSTALACION' ? 'Instalación' : 'Subinstalación'}` });
-
-    const rows = (await manager.query(`
-      SELECT id,code,name,level::text AS level
-      FROM inventory_families
-      WHERE id=$1::uuid AND is_active=true
-      LIMIT 1
-      FOR KEY SHARE
-    `, [familyId])) as FamilyRow[];
-    const family = rows[0];
-    if (!family) throw new NotFoundException({ code: 'INVENTORY_FAMILY_NOT_FOUND', message: 'El tipo seleccionado no existe o está oculto' });
-    const expected = kind === 'INSTALACION' ? 'INSTALLATION' : 'SUBINSTALLATION';
-    if (family.level !== expected) throw new BadRequestException({ code: 'INVENTORY_FAMILY_LEVEL_INVALID', message: 'El tipo seleccionado no corresponde a este nivel' });
-
-    if (kind === 'SUBINSTALACION') {
-      if (!parent?.inventoryFamilyId) throw new BadRequestException({ code: 'INVENTORY_PARENT_FAMILY_REQUIRED', message: 'La Instalación debe tener un tipo configurado' });
-      const compatible = await manager.query(`
-        SELECT 1 FROM inventory_family_parent_rules
-        WHERE child_family_id=$1::uuid AND parent_family_id=$2::uuid
-        LIMIT 1
-      `, [family.id, parent.inventoryFamilyId]);
-      if (!compatible[0]) throw new BadRequestException({ code: 'INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID', message: 'Ese tipo de Subinstalación no está habilitado dentro de la Instalación seleccionada' });
-    }
-    return family;
-  }
-
-  private generatedCode(kind: InventoryStructureKind, name: string): string {
-    const prefix = kind === 'EMPRESA' ? 'EMP'
-      : kind === 'DEPARTAMENTO' ? 'DEP'
-        : kind === 'AREA' ? 'AREA'
-          : kind === 'YACIMIENTO' ? 'YAC'
-            : kind === 'INSTALACION' ? 'INST'
-              : 'SUB';
-    const readable = name.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toUpperCase()
-      .replace(/[^A-Z0-9]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 48) || 'REGISTRO';
-    return `${prefix}-${readable}-${randomUUID().slice(0, 8).toUpperCase()}`.slice(0, 120);
-  }
-
-  private async loadView(manager: EntityManager, id: string) {
-    const rows = await manager.query(`
-      SELECT asset.id,asset.code,asset.name,asset.common_name AS "commonName",asset.description,
-        asset.information_status AS "informationStatus",asset.operational_status AS "operationalStatus",
-        JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
-        CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) END AS parent,
-        CASE WHEN 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',COALESCE(profile.legal_name,company.name)) END AS "operatorCompany",
-        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",
-        asset.created_at AS "createdAt",asset.updated_at AS "updatedAt"
-      FROM assets asset
-      JOIN asset_types type ON type.id=asset.asset_type_id
-      LEFT JOIN assets parent ON parent.id=asset.parent_id
-      LEFT JOIN assets area ON area.id=asset.operational_area_id
-      LEFT JOIN assets company ON company.id=asset.operator_company_id
-      LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
-      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
-      WHERE asset.id=$1::uuid
-    `, [id]);
-    return rows[0];
-  }
-}
@@ -118,9 +118,10 @@ async function main(): Promise<void> {
        );
      }

-      email = (await prompt.question('Email: ')).trim().toLowerCase();
+      email = (await prompt.question('Email (optional): ')).trim().toLowerCase();
      if (
-        !email || email.length > 320 || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)
+        email &&
+        (email.length > 320 || !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email))
      ) {
        throw new Error('Email is invalid');
      }
@@ -188,7 +189,7 @@ async function main(): Promise<void> {
             OR ($2::text IS NOT NULL AND LOWER(email) = $2)
          LIMIT 1
        `,
-        [username, email],
+        [username, email || null],
      )) as unknown[];
      if (duplicate.length > 0) {
        throw new Error('Username or email already exists');
@@ -201,7 +202,7 @@ async function main(): Promise<void> {

      const user = manager.getRepository(User).create({
        username,
-        email,
+        email: email || null,
        passwordHash,
        firstName,
        lastName,
@@ -33,7 +33,6 @@ export enum AssetDataOrigin {
@Index('idx_assets_parent_id', ['parentId'])
@Index('idx_assets_operational_area_id', ['operationalAreaId'])
@Index('idx_assets_operator_company_id', ['operatorCompanyId'])
-@Index('idx_assets_concession_type_id', ['concessionTypeId'])
@Index('idx_assets_inventory_family_id', ['inventoryFamilyId'])
@Index('idx_assets_information_status', ['informationStatus'])
@Index('idx_assets_operational_status', ['operationalStatus'])
@@ -55,9 +54,6 @@ export class Asset extends TimestampedEntity {
  @Column({ name: 'operator_company_id', type: 'uuid', nullable: true })
  operatorCompanyId!: string | null;

-  @Column({ name: 'concession_type_id', type: 'uuid', nullable: true })
-  concessionTypeId!: string | null;
-
  @Column({ name: 'inventory_family_id', type: 'uuid', nullable: true })
  inventoryFamilyId!: string | null;

@@ -103,8 +103,6 @@ export enum AuditAction {
  INSPECTION_BUSINESS_CALENDAR_UPDATED = 'INSPECTION_BUSINESS_CALENDAR_UPDATED',
  SMTP_SETTINGS_UPDATED = 'SMTP_SETTINGS_UPDATED',
  SMTP_TEST_SENT = 'SMTP_TEST_SENT',
-  USER_SMTP_SETTINGS_UPDATED = 'USER_SMTP_SETTINGS_UPDATED',
-  USER_SMTP_TEST_SENT = 'USER_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',
@@ -30,8 +30,6 @@ export enum InspectionDeadlineBasis {
  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 })
@@ -71,8 +69,8 @@ export class InspectionAct extends TimestampedEntity {
  @Column({ type: 'text', nullable: true })
  observations!: string | null;

-  @Column({ name: 'urgency', type: 'varchar', length: 24, nullable: true })
-  urgency!: InspectionActUrgency | 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;
@@ -16,8 +16,8 @@ export class User extends TimestampedEntity {
  @Column({ type: 'varchar', length: 80 })
  username!: string;

-  @Column({ type: 'varchar', length: 320 })
-  email!: string;
+  @Column({ type: 'varchar', length: 320, nullable: true })
+  email!: string | null;

  @Column({ type: 'varchar', length: 32, nullable: true })
  dni!: string | null;
@@ -1,35 +0,0 @@
-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)
-      )
-    `);
-  }
-}
@@ -1,163 +0,0 @@
-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]);
-  }
-}
@@ -1,39 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class F62FreezeInspectionContext1790098200000 implements MigrationInterface {
-  name = 'F62FreezeInspectionContext1790098200000';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`
-      CREATE OR REPLACE FUNCTION prevent_inspection_context_mutation()
-      RETURNS trigger LANGUAGE plpgsql AS $$
-      BEGIN
-        IF NEW.operational_area_id IS DISTINCT FROM OLD.operational_area_id
-          OR NEW.scope_asset_id IS DISTINCT FROM OLD.scope_asset_id
-          OR NEW.operator_company_id IS DISTINCT FROM OLD.operator_company_id THEN
-          RAISE EXCEPTION USING
-            ERRCODE='23514',
-            MESSAGE='El Área, Yacimiento y Operadora de una Inspección quedan fijos desde su creación';
-        END IF;
-        RETURN NEW;
-      END $$
-    `);
-
-    await queryRunner.query(`
-      DROP TRIGGER IF EXISTS trg_inspection_context_immutable ON inspection_visits
-    `);
-    await queryRunner.query(`
-      CREATE TRIGGER trg_inspection_context_immutable
-      BEFORE UPDATE OF operational_area_id, scope_asset_id, operator_company_id
-      ON inspection_visits
-      FOR EACH ROW EXECUTE FUNCTION prevent_inspection_context_mutation()
-    `);
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`
-      DROP TRIGGER IF EXISTS trg_inspection_context_immutable ON inspection_visits
-    `);
-    await queryRunner.query('DROP FUNCTION IF EXISTS prevent_inspection_context_mutation()');
-  }
-}
@@ -1,57 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class F63MobileFieldCommonAttributes1790099100000 implements MigrationInterface {
-  name = 'F63MobileFieldCommonAttributes1790099100000';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`
-      WITH target_types AS (
-        SELECT id
-        FROM asset_types
-        WHERE lower(code) IN ('instalacion','subinstalacion')
-      ), fields(code,name,sort_order) AS (
-        VALUES
-          ('campo_marca','Marca',10),
-          ('campo_modelo','Modelo',20),
-          ('campo_capacidad','Capacidad',30),
-          ('campo_numero_serie','Número de serie',40),
-          ('campo_funcion','Función',50)
-      )
-      INSERT INTO asset_attribute_definitions (
-        asset_type_id, code, name, data_type, is_required, is_active, sort_order
-      )
-      SELECT target.id, fields.code, fields.name, 'TEXT'::asset_attribute_data_type,
-        false, true, fields.sort_order
-      FROM target_types target
-      CROSS JOIN fields
-      WHERE NOT EXISTS (
-        SELECT 1
-        FROM asset_attribute_definitions existing
-        WHERE existing.asset_type_id=target.id
-          AND lower(existing.code)=lower(fields.code)
-      )
-    `);
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`
-      DELETE FROM asset_attribute_values value
-      USING asset_attribute_definitions definition, asset_types type
-      WHERE value.definition_id=definition.id
-        AND definition.asset_type_id=type.id
-        AND lower(type.code) IN ('instalacion','subinstalacion')
-        AND definition.code IN (
-          'campo_marca','campo_modelo','campo_capacidad','campo_numero_serie','campo_funcion'
-        )
-    `);
-    await queryRunner.query(`
-      DELETE FROM asset_attribute_definitions definition
-      USING asset_types type
-      WHERE definition.asset_type_id=type.id
-        AND lower(type.code) IN ('instalacion','subinstalacion')
-        AND definition.code IN (
-          'campo_marca','campo_modelo','campo_capacidad','campo_numero_serie','campo_funcion'
-        )
-    `);
-  }
-}
@@ -1,240 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-const TARGET_CODES = [
-  'departamento',
-  'area',
-  'yacimiento',
-  'instalacion',
-  'subinstalacion',
-] as const;
-
-const DELETE_ORDER = [
-  'subinstalacion',
-  'instalacion',
-  'yacimiento',
-  'area',
-  'departamento',
-] as const;
-
-type ProtectedSnapshot = {
-  users: string;
-  companies: string;
-  companyProfiles: string;
-  assetTypes: string;
-  assetAttributes: string;
-  inventoryFamilies: string;
-  familyAttributes: string;
-  findingCategories: string;
-  findingItems: string;
-};
-
-export class ResetOperationalHierarchyData1790099200000 implements MigrationInterface {
-  name = 'ResetOperationalHierarchyData1790099200000';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    // This is a one-time live-data cleanup, not a new canonical empty seed.
-    // Fresh CI/bootstrap databases intentionally have no admin account while
-    // replaying the historical migration chain, so they must retain the F6.1
-    // presentation seed used by hierarchy/planning contract tests.
-    const adminRows = (await queryRunner.query(`
-      SELECT id
-      FROM users
-      WHERE lower(btrim(username))='admin'
-      ORDER BY id
-    `)) as Array<{ id: string }>;
-    if (adminRows.length === 0) {
-      // eslint-disable-next-line no-console
-      console.log('[hierarchy-reset] skipped: no live admin account on migration replay');
-      return;
-    }
-    if (adminRows.length !== 1) {
-      throw new Error(
-        `Hierarchy reset aborted: expected exactly one live admin account, found ${adminRows.length}`,
-      );
-    }
-
-    const targetTypes = (await queryRunner.query(
-      `
-      SELECT lower(code) AS code
-      FROM asset_types
-      WHERE lower(code)=ANY($1::text[])
-      ORDER BY lower(code)
-      `,
-      [[...TARGET_CODES]],
-    )) as Array<{ code: string }>;
-
-    const found = new Set(targetTypes.map((row) => row.code));
-    const missing = TARGET_CODES.filter((code) => !found.has(code));
-    if (missing.length > 0) {
-      throw new Error(`Hierarchy reset aborted: missing asset types ${missing.join(', ')}`);
-    }
-
-    const before = await this.protectedSnapshot(queryRunner);
-
-    await queryRunner.query(
-      `
-      CREATE TEMP TABLE reset_target_assets ON COMMIT DROP AS
-      SELECT asset.id
-      FROM assets asset
-      JOIN asset_types type ON type.id=asset.asset_type_id
-      WHERE lower(type.code)=ANY($1::text[])
-      `,
-      [[...TARGET_CODES]],
-    );
-    await queryRunner.query(`CREATE UNIQUE INDEX reset_target_assets_pk ON reset_target_assets(id)`);
-
-    const [targetCount] = (await queryRunner.query(
-      `SELECT COUNT(*)::integer AS total FROM reset_target_assets`,
-    )) as Array<{ total: number }>;
-
-    // An Inspection freezes Area/Yacimiento/Operadora from creation and several
-    // inspection tables hold RESTRICT references to the hierarchy. Keeping a
-    // transaction that points to deleted territory would be invalid, so the
-    // complete disposable inspection graph is cleared first.
-    await queryRunner.query('TRUNCATE TABLE inspection_visits CASCADE');
-
-    // Legacy administrative departments are also presentation/operational data.
-    // Current F6 Departments live in assets, but this prevents old rows from
-    // resurfacing through compatibility paths.
-    await queryRunner.query('TRUNCATE TABLE administrative_departments CASCADE');
-
-    // Legal-right participants depend on area_legal_rights rather than directly
-    // on assets. Remove them before the generic direct-FK cleanup below.
-    await queryRunner.query(`
-      DELETE FROM area_legal_right_organizations organization
-      USING area_legal_rights legal_right
-      WHERE organization.right_id=legal_right.id
-        AND legal_right.area_id IN (SELECT id FROM reset_target_assets)
-    `);
-
-    // Clean every table that directly references one of the hierarchy assets.
-    // This deliberately discovers the current schema instead of maintaining a
-    // fragile hand-written list as new dossier/history tables are added.
-    await queryRunner.query(`
-      DO $$
-      DECLARE dependency record;
-      BEGIN
-        FOR dependency IN
-          SELECT
-            namespace.nspname AS schema_name,
-            relation.relname AS table_name,
-            attribute.attname AS column_name
-          FROM pg_constraint constraint_row
-          JOIN pg_class relation ON relation.oid=constraint_row.conrelid
-          JOIN pg_namespace namespace ON namespace.oid=relation.relnamespace
-          JOIN LATERAL unnest(constraint_row.conkey) WITH ORDINALITY local_key(attnum,ordinality)
-            ON true
-          JOIN LATERAL unnest(constraint_row.confkey) WITH ORDINALITY referenced_key(attnum,ordinality)
-            ON referenced_key.ordinality=local_key.ordinality
-          JOIN pg_attribute attribute
-            ON attribute.attrelid=constraint_row.conrelid
-           AND attribute.attnum=local_key.attnum
-          JOIN pg_attribute referenced_attribute
-            ON referenced_attribute.attrelid=constraint_row.confrelid
-           AND referenced_attribute.attnum=referenced_key.attnum
-          WHERE constraint_row.contype='f'
-            AND constraint_row.confrelid='assets'::regclass
-            AND constraint_row.conrelid<>'assets'::regclass
-            AND array_length(constraint_row.conkey,1)=1
-            AND referenced_attribute.attname='id'
-          ORDER BY namespace.nspname,relation.relname,attribute.attname
-        LOOP
-          EXECUTE format(
-            'DELETE FROM %I.%I WHERE %I IN (SELECT id FROM reset_target_assets)',
-            dependency.schema_name,
-            dependency.table_name,
-            dependency.column_name
-          );
-        END LOOP;
-      END $$;
-    `);
-
-    // parent_id is RESTRICT, therefore physical hierarchy rows are deleted from
-    // the leaves upward. Company/Operator assets are intentionally not targets.
-    for (const code of DELETE_ORDER) {
-      await queryRunner.query(
-        `
-        DELETE FROM assets asset
-        USING asset_types type
-        WHERE asset.asset_type_id=type.id
-          AND lower(type.code)=$1
-        `,
-        [code],
-      );
-    }
-
-    const after = await this.protectedSnapshot(queryRunner);
-    for (const key of Object.keys(before) as Array<keyof ProtectedSnapshot>) {
-      if (before[key] !== after[key]) {
-        throw new Error(
-          `Hierarchy reset verification failed: protected ${key} changed (${before[key]} -> ${after[key]})`,
-        );
-      }
-    }
-
-    const [verification] = (await queryRunner.query(`
-      SELECT
-        (
-          SELECT COUNT(*)::integer
-          FROM assets asset
-          JOIN asset_types type ON type.id=asset.asset_type_id
-          WHERE lower(type.code)=ANY($1::text[])
-        ) AS hierarchy_assets,
-        (SELECT COUNT(*)::integer FROM administrative_departments) AS administrative_departments,
-        (SELECT COUNT(*)::integer FROM inspection_visits) AS inspection_visits
-      `, [[...TARGET_CODES]])) as Array<{
-      hierarchy_assets: number;
-      administrative_departments: number;
-      inspection_visits: number;
-    }>;
-
-    if (
-      !verification
-      || Number(verification.hierarchy_assets) !== 0
-      || Number(verification.administrative_departments) !== 0
-      || Number(verification.inspection_visits) !== 0
-    ) {
-      throw new Error(`Hierarchy reset verification failed: ${JSON.stringify(verification ?? {})}`);
-    }
-
-    // eslint-disable-next-line no-console
-    console.log(
-      `[hierarchy-reset] removed ${Number(targetCount?.total ?? 0)} Departamento/Área/Yacimiento/Instalación/Subinstalación assets; inspections and legacy departments cleared; users=${after.users}; companies=${after.companies} preserved`,
-    );
-  }
-
-  public async down(): Promise<void> {
-    throw new Error(
-      'ResetOperationalHierarchyData is intentionally destructive; restore the automatic deploy PRE database backup instead.',
-    );
-  }
-
-  private async protectedSnapshot(queryRunner: QueryRunner): Promise<ProtectedSnapshot> {
-    const [snapshot] = (await queryRunner.query(`
-      SELECT
-        (SELECT COUNT(*)::text FROM users) AS "users",
-        (
-          SELECT COUNT(*)::text
-          FROM assets asset
-          JOIN asset_types type ON type.id=asset.asset_type_id
-          WHERE type.operational_role='COMPANY'
-        ) AS "companies",
-        (
-          SELECT COUNT(*)::text
-          FROM organization_profiles profile
-          JOIN assets asset ON asset.id=profile.asset_id
-          JOIN asset_types type ON type.id=asset.asset_type_id
-          WHERE type.operational_role='COMPANY'
-        ) AS "companyProfiles",
-        (SELECT COUNT(*)::text FROM asset_types) AS "assetTypes",
-        (SELECT COUNT(*)::text FROM asset_attribute_definitions) AS "assetAttributes",
-        (SELECT COUNT(*)::text FROM inventory_families) AS "inventoryFamilies",
-        (SELECT COUNT(*)::text FROM inventory_family_attribute_definitions) AS "familyAttributes",
-        (SELECT COUNT(*)::text FROM finding_categories) AS "findingCategories",
-        (SELECT COUNT(*)::text FROM finding_catalog_items) AS "findingItems"
-    `)) as ProtectedSnapshot[];
-
-    if (!snapshot) throw new Error('Hierarchy reset aborted: could not snapshot protected masters');
-    return snapshot;
-  }
-}
@@ -1,173 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-/**
- * One-time full live-data reset requested before loading the definitive source files.
- *
- * The database is left with only the single `admin` user and the minimum product
- * scaffolding required to keep authentication/authorization and the core asset
- * model functional. Every business, operational, imported, catalog, history,
- * document, inspection and tenant/company row is removed.
- *
- * Fresh migration replays/CI do not have the live `admin` account at this point,
- * so this migration intentionally no-ops there.
- */
-export class FullLiveDataReset1790103000000 implements MigrationInterface {
-  name = 'FullLiveDataReset1790103000000';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    const adminRows = (await queryRunner.query(`
-      SELECT id, username
-      FROM users
-      WHERE lower(btrim(username))='admin'
-      ORDER BY id
-    `)) as Array<{ id: string; username: string }>;
-
-    if (adminRows.length === 0) {
-      // eslint-disable-next-line no-console
-      console.log('[full-live-reset] skipped: no live admin account on migration replay');
-      return;
-    }
-
-    if (adminRows.length !== 1) {
-      throw new Error(
-        `Full live reset aborted: expected exactly one username admin, found ${adminRows.length}`,
-      );
-    }
-
-    const adminId = adminRows[0].id;
-
-    // These are product/schema scaffolding, not customer/business data.
-    // Everything else in public is disposable live data for this reset.
-    const structuralTables = [
-      'roles',
-      'permissions',
-      'role_permissions',
-      'asset_types',
-      'asset_attribute_definitions',
-      'asset_type_parent_rules',
-    ] as const;
-
-    const preservedTables = new Set<string>([
-      'typeorm_migrations',
-      'users',
-      'user_roles',
-      ...structuralTables,
-    ]);
-
-    const structuralCounts = new Map<string, string>();
-    for (const table of structuralTables) {
-      const safeTable = `"${table.replace(/"/g, '""')}"`;
-      const rows = (await queryRunner.query(
-        `SELECT count(*)::text AS total FROM ${safeTable}`,
-      )) as Array<{ total: string }>;
-      structuralCounts.set(table, rows[0]?.total ?? '0');
-    }
-
-    const adminRolesBefore = (await queryRunner.query(
-      `SELECT count(*)::text AS total FROM user_roles WHERE user_id=$1`,
-      [adminId],
-    )) as Array<{ total: string }>;
-    const adminRoleCount = adminRolesBefore[0]?.total ?? '0';
-    if (adminRoleCount === '0') {
-      throw new Error('Full live reset aborted: admin has no assigned role');
-    }
-
-    const tableRows = (await queryRunner.query(`
-      SELECT table_name
-      FROM information_schema.tables
-      WHERE table_schema='public'
-        AND table_type='BASE TABLE'
-      ORDER BY table_name
-    `)) as Array<{ table_name: string }>;
-
-    const disposableTables = tableRows
-      .map((row) => row.table_name)
-      .filter((table) => !preservedTables.has(table));
-
-    if (disposableTables.length > 0) {
-      const quoted = disposableTables
-        .map((table) => `"${table.replace(/"/g, '""')}"`)
-        .join(', ');
-      await queryRunner.query(`TRUNCATE TABLE ${quoted} RESTART IDENTITY CASCADE`);
-    }
-
-    // Keep only the owner's administrator account. user_roles for other users
-    // are removed through their FK cascade.
-    await queryRunner.query(`DELETE FROM users WHERE id<>$1`, [adminId]);
-
-    // Invalidate any previous login state and unlock the preserved account.
-    await queryRunner.query(
-      `
-      UPDATE users
-      SET failed_login_attempts=0,
-          locked_until=NULL,
-          last_login_at=NULL,
-          updated_at=CURRENT_TIMESTAMP
-      WHERE id=$1
-      `,
-      [adminId],
-    );
-
-    const finalUsers = (await queryRunner.query(`
-      SELECT
-        count(*)::text AS total,
-        count(*) FILTER (WHERE lower(btrim(username))='admin')::text AS admins
-      FROM users
-    `)) as Array<{ total: string; admins: string }>;
-
-    if (finalUsers[0]?.total !== '1' || finalUsers[0]?.admins !== '1') {
-      throw new Error('Full live reset verification failed: users table is not admin-only');
-    }
-
-    const finalAdminRoles = (await queryRunner.query(
-      `
-      SELECT
-        count(*) FILTER (WHERE user_id=$1)::text AS total,
-        count(*) FILTER (WHERE user_id<>$1)::text AS foreign_users
-      FROM user_roles
-      `,
-      [adminId],
-    )) as Array<{ total: string; foreign_users: string }>;
-
-    if (
-      finalAdminRoles[0]?.total !== adminRoleCount ||
-      finalAdminRoles[0]?.foreign_users !== '0'
-    ) {
-      throw new Error('Full live reset verification failed: admin role assignments changed');
-    }
-
-    for (const table of structuralTables) {
-      const safeTable = `"${table.replace(/"/g, '""')}"`;
-      const rows = (await queryRunner.query(
-        `SELECT count(*)::text AS total FROM ${safeTable}`,
-      )) as Array<{ total: string }>;
-      const before = structuralCounts.get(table) ?? '0';
-      if (rows[0]?.total !== before) {
-        throw new Error(
-          `Full live reset verification failed: structural table ${table} changed (${before} -> ${rows[0]?.total ?? 'unknown'})`,
-        );
-      }
-    }
-
-    for (const table of disposableTables) {
-      const safeTable = `"${table.replace(/"/g, '""')}"`;
-      const rows = (await queryRunner.query(
-        `SELECT count(*)::text AS total FROM ${safeTable}`,
-      )) as Array<{ total: string }>;
-      if (rows[0]?.total !== '0') {
-        throw new Error(`Full live reset verification failed: ${table} is not empty`);
-      }
-    }
-
-    // eslint-disable-next-line no-console
-    console.log(
-      `[full-live-reset] kept admin=${adminRows[0].username} (${adminId}); preserved ${structuralTables.length} product tables; cleared ${disposableTables.length} data tables`,
-    );
-  }
-
-  public async down(): Promise<void> {
-    throw new Error(
-      'FullLiveDataReset is intentionally destructive; restore the automatic deploy PRE database backup instead.',
-    );
-  }
-}
@@ -1,380 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-import { AUTHORITATIVE_INVENTORY_MODEL as SOURCE } from '../../reference-data/authoritative-inventory-model';
-
-type IdRow = { id: string };
-
-const TERRITORY_DOC = 'DH-AUTH-TERRITORY-20260911';
-const INVENTORY_DOC = 'DH-AUTH-INVENTORY-20260911';
-const FINDING_CATEGORY_CODE = 'AUTHMODEL';
-
-function sourceCode(prefix: string, id: number): string {
-  return `${prefix}-${String(id).padStart(4, '0')}`;
-}
-
-export class AuthoritativeInventoryRelationships1790106600000 implements MigrationInterface {
-  name = 'AuthoritativeInventoryRelationships1790106600000';
-
-  public async up(q: QueryRunner): Promise<void> {
-    this.assertSource();
-
-    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 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 fieldType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='yacimiento' AND is_active=true LIMIT 1`);
-    const installationType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='instalacion' AND is_active=true LIMIT 1`);
-    const subinstallationType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='subinstalacion' AND is_active=true LIMIT 1`);
-
-    await q.query(`
-      CREATE TABLE IF NOT EXISTS concession_types (
-        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
-        code varchar(80) NOT NULL UNIQUE,
-        name varchar(120) NOT NULL UNIQUE,
-        is_active boolean NOT NULL DEFAULT true,
-        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        CONSTRAINT chk_concession_types_name CHECK (length(btrim(name)) >= 3)
-      )
-    `);
-    await q.query(`ALTER TABLE assets ADD COLUMN IF NOT EXISTS concession_type_id uuid`);
-    await q.query(`
-      DO $$ BEGIN
-        IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname='fk_assets_concession_type') THEN
-          ALTER TABLE assets ADD CONSTRAINT fk_assets_concession_type
-            FOREIGN KEY (concession_type_id) REFERENCES concession_types(id) ON DELETE RESTRICT;
-        END IF;
-      END $$
-    `);
-    await q.query(`CREATE INDEX IF NOT EXISTS idx_assets_concession_type_id ON assets(concession_type_id)`);
-    await q.query(`
-      DO $$ BEGIN
-        IF EXISTS (SELECT 1 FROM pg_roles WHERE rolname='dhv2_app') THEN
-          GRANT SELECT ON concession_types TO dhv2_app;
-        END IF;
-      END $$
-    `);
-
-    await q.query(`DELETE FROM asset_type_parent_rules WHERE child_type_id IN ($1::uuid,$2::uuid,$3::uuid,$4::uuid)`, [areaType, fieldType, installationType, subinstallationType]);
-    await q.query(`
-      INSERT INTO asset_type_parent_rules(child_type_id,parent_type_id) VALUES
-        ($1::uuid,$2::uuid),($3::uuid,$1::uuid),($4::uuid,$3::uuid),($5::uuid,$4::uuid)
-      ON CONFLICT DO NOTHING
-    `, [areaType, departmentType, fieldType, installationType, subinstallationType]);
-    await q.query(`UPDATE asset_types SET can_be_root=true,updated_at=CURRENT_TIMESTAMP WHERE id IN ($1::uuid,$2::uuid)`, [companyType, departmentType]);
-    await q.query(`UPDATE asset_types SET can_be_root=false,updated_at=CURRENT_TIMESTAMP WHERE id IN ($1::uuid,$2::uuid,$3::uuid,$4::uuid)`, [areaType, fieldType, installationType, subinstallationType]);
-    await q.query(`UPDATE asset_types SET description='Área territorial. Sólo posee Nombre y pertenece obligatoriamente a un Departamento.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [areaType]);
-    await q.query(`UPDATE asset_types SET description='Yacimiento. Pertenece a un Área y define directamente Tipo de concesión y Empresa relacionada.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [fieldType]);
-    await q.query(`UPDATE asset_types SET description='Instalación física. Pertenece obligatoriamente a un Yacimiento y utiliza una clasificación técnica.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [installationType]);
-    await q.query(`UPDATE asset_types SET description='Subinstalación física. Pertenece obligatoriamente a una Instalación y utiliza una clasificación técnica compatible.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [subinstallationType]);
-
-    await q.query(`DELETE FROM asset_attribute_definitions WHERE asset_type_id IN ($1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,$6::uuid)`, [companyType, departmentType, areaType, fieldType, installationType, subinstallationType]);
-    await this.insertCommonAttributes(q, installationType, [
-      ['campo_marca','Marca',10],
-      ['tipo_instalacion','Tipo de instalación',20],
-      ['campo_modelo','Modelo',30],
-      ['campo_capacidad','Capacidad',40],
-      ['campo_numero_serie','Número de serie',50],
-      ['campo_funcion','Función',60],
-    ]);
-    await this.insertCommonAttributes(q, subinstallationType, [
-      ['campo_marca','Marca',10],
-      ['campo_modelo','Modelo',20],
-      ['campo_capacidad','Capacidad',30],
-      ['campo_numero_serie','Número de serie',40],
-      ['campo_funcion','Función',50],
-    ]);
-
-    await q.query(`
-      DO $$ DECLARE trigger_name text; BEGIN
-        FOR trigger_name IN
-          SELECT trigger_row.tgname
-          FROM pg_trigger trigger_row
-          JOIN pg_proc function_row ON function_row.oid=trigger_row.tgfoid
-          WHERE trigger_row.tgrelid='assets'::regclass
-            AND NOT trigger_row.tgisinternal
-            AND function_row.proname='enforce_asset_operational_context'
-        LOOP
-          EXECUTE format('DROP TRIGGER %I ON assets',trigger_name);
-        END LOOP;
-      END $$
-    `);
-    await q.query(`DROP FUNCTION IF EXISTS enforce_asset_operational_context()`);
-
-    await q.query(`
-      CREATE OR REPLACE FUNCTION enforce_authoritative_inventory_relationships()
-      RETURNS trigger LANGUAGE plpgsql AS $$
-      DECLARE
-        kind text;
-        asset_role asset_type_operational_role;
-        parent_kind text;
-        parent_area uuid;
-        parent_company uuid;
-        parent_family uuid;
-        company_role asset_type_operational_role;
-        family_level text;
-      BEGIN
-        SELECT lower(code),operational_role INTO kind,asset_role FROM asset_types WHERE id=NEW.asset_type_id;
-        IF kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='asset type does not exist'; END IF;
-
-        IF asset_role='COMPANY'::asset_type_operational_role THEN
-          IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Empresa no admite padre'; END IF;
-          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
-          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-          RETURN NEW;
-        ELSIF kind='departamento' THEN
-          IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Departamento no admite padre'; END IF;
-          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
-          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-          RETURN NEW;
-        END IF;
-
-        IF NEW.parent_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El nivel requiere un padre estructural'; END IF;
-        SELECT lower(parent_type.code), parent.operational_area_id, parent.operator_company_id, parent.inventory_family_id
-          INTO parent_kind,parent_area,parent_company,parent_family
-        FROM assets parent JOIN asset_types parent_type ON parent_type.id=parent.asset_type_id
-        WHERE parent.id=NEW.parent_id AND parent.information_status<>'INACTIVE';
-        IF parent_kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El padre estructural no existe o está inactivo'; END IF;
-
-        IF kind='area' THEN
-          IF parent_kind<>'departamento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Área debe pertenecer a un Departamento'; END IF;
-          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
-          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-        ELSIF kind='yacimiento' THEN
-          IF parent_kind<>'area' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento debe pertenecer a un Área'; END IF;
-          IF NEW.operator_company_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere Empresa relacionada'; END IF;
-          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='La Empresa relacionada del Yacimiento no es válida'; END IF;
-          IF NEW.concession_type_id IS NULL OR NOT EXISTS(SELECT 1 FROM concession_types c WHERE c.id=NEW.concession_type_id AND c.is_active=true) THEN
-            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere un Tipo de concesión válido';
-          END IF;
-          IF NEW.operational_area_id IS NOT NULL AND NEW.operational_area_id<>NEW.parent_id THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Área operativa del Yacimiento debe coincidir con su Área padre'; END IF;
-          NEW.operational_area_id:=NEW.parent_id; NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-        ELSIF kind='instalacion' THEN
-          IF parent_kind<>'yacimiento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Instalación debe pertenecer a un Yacimiento'; 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='Instalación requiere un Tipo de instalación válido'; END IF;
-          NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
-        ELSIF kind='subinstalacion' THEN
-          IF parent_kind<>'instalacion' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación debe pertenecer a una Instalación'; 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 'SUBINSTALLATION' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación requiere un Tipo de subinstalación válido'; END IF;
-          IF 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='El Tipo de subinstalación no es compatible con el Tipo de instalación padre';
-          END IF;
-          NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
-        END IF;
-        RETURN NEW;
-      END $$
-    `);
-    await q.query(`DROP TRIGGER IF EXISTS trg_assets_authoritative_inventory_relationships ON assets`);
-    await q.query(`
-      CREATE TRIGGER trg_assets_authoritative_inventory_relationships
-      BEFORE INSERT OR UPDATE OF asset_type_id,parent_id,operational_area_id,operator_company_id,inventory_family_id,concession_type_id
-      ON assets FOR EACH ROW EXECUTE FUNCTION enforce_authoritative_inventory_relationships()
-    `);
-
-    await q.query(`TRUNCATE TABLE assets CASCADE`);
-    await q.query(`TRUNCATE TABLE source_documents CASCADE`);
-    await q.query(`TRUNCATE TABLE inventory_families CASCADE`);
-    await q.query(`TRUNCATE TABLE finding_categories CASCADE`);
-    await q.query(`TRUNCATE TABLE concession_types CASCADE`);
-
-    const [territoryDoc] = (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
-    `, [TERRITORY_DOC,'modelo_yacimientos.sql','sha256:6a1d96bc8af7e755dd0e2fd9faf08335625b9c76865208c3b8413d868aa5eb1a','Modelo relacional exacto de Departamentos, Áreas, Yacimientos, Empresas y Tipo de concesión.'])) as IdRow[];
-    const [inventoryDoc] = (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
-    `, [INVENTORY_DOC,'modelo_relacional instalaciones y sub.sql','sha256:fb513f3909e78db298361a8a6998ca77026748f9b03cbab44c77b884ca862b49','Modelo relacional exacto de tipos de Instalación/Subinstalación y sus Hallazgos.'])) as IdRow[];
-    if(!territoryDoc?.id || !inventoryDoc?.id) throw new Error('Authoritative source documents could not be created');
-
-    const concessionIds=new Map<number,string>();
-    for(const row of SOURCE.concessionTypes){
-      const [created]=(await q.query(`INSERT INTO concession_types(code,name,is_active) VALUES($1,$2,true) RETURNING id`,[sourceCode('CONC',row.id),row.nombre])) as IdRow[];
-      if(!created?.id)throw new Error(`Could not create concession ${row.nombre}`); concessionIds.set(row.id,created.id);
-    }
-
-    await this.seedFamiliesAndFindings(q);
-
-    const companyIds=new Map<number,string>();
-    for(const row of SOURCE.companies){
-      const id=await this.asset(q,companyType,null,null,null,null,sourceCode('ORG',row.id),row.nombre,'modelo_yacimientos.sql',`empresas:${row.id}`);
-      companyIds.set(row.id,id);
-      await q.query(`INSERT INTO organization_profiles(asset_id,organization_kind,legal_name) VALUES($1::uuid,$2::organization_kind,$3)`,[id,row.nombre.toUpperCase().startsWith('UTE (')?'UTE':'COMPANY',row.nombre]);
-      await this.link(q,id,territoryDoc.id,`Empresa · source id ${row.id}`);
-    }
-    const departmentIds=new Map<number,string>();
-    for(const row of SOURCE.departments){
-      const id=await this.asset(q,departmentType,null,null,null,null,sourceCode('DEP',row.id),row.nombre,'modelo_yacimientos.sql',`departamentos:${row.id}`);
-      departmentIds.set(row.id,id); await this.link(q,id,territoryDoc.id,`Departamento · source id ${row.id}`);
-    }
-    const areaIds=new Map<number,string>();
-    for(const row of SOURCE.areas){
-      const parent=departmentIds.get(row.departamento_id); if(!parent)throw new Error(`Missing source Departamento ${row.departamento_id}`);
-      const id=await this.asset(q,areaType,parent,null,null,null,sourceCode('AREA',row.id),row.nombre,'modelo_yacimientos.sql',`areas:${row.id}`);
-      areaIds.set(row.id,id); await this.link(q,id,territoryDoc.id,`Área · source id ${row.id}`);
-    }
-    for(const row of SOURCE.fields){
-      const area=areaIds.get(row.area_id); const company=companyIds.get(row.empresa_id); const concession=concessionIds.get(row.tipo_concesion_id);
-      if(!area||!company||!concession)throw new Error(`Incomplete source relations for Yacimiento ${row.id}`);
-      const id=await this.asset(q,fieldType,area,area,company,concession,sourceCode('YAC',row.id),row.nombre,'modelo_yacimientos.sql',`yacimientos:${row.id}`);
-      await this.link(q,id,territoryDoc.id,`Yacimiento · source id ${row.id}`);
-    }
-
-    await q.query(`TRUNCATE TABLE area_company_relations CASCADE`);
-    await q.query(`TRUNCATE TABLE area_legal_rights CASCADE`);
-    const projectedPairs=new Set<string>();
-    const projectedRights=new Set<string>();
-    for(const row of SOURCE.fields){
-      const area=areaIds.get(row.area_id)!; const company=companyIds.get(row.empresa_id)!; const concession=concessionIds.get(row.tipo_concesion_id)!;
-      const pair=`${area}|${company}`;
-      if(!projectedPairs.has(pair)){
-        projectedPairs.add(pair);
-        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)`,[area,company,territoryDoc.id,'Derivado automáticamente de Yacimientos del modelo autoritativo']);
-      }
-      const rightKey=`${area}|${concession}`;
-      if(!projectedRights.has(rightKey)){
-        projectedRights.add(rightKey);
-        const concessionRow=SOURCE.concessionTypes.find((item)=>item.id===row.tipo_concesion_id)!;
-        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)`,[
-          area,concessionRow.nombre==='Exploración'?'EXPLORATION_PERMIT':'EXPLOITATION_CONCESSION',
-          `${concessionRow.nombre} · proyección del Yacimiento`,territoryDoc.id,'Compatibilidad derivada; el Tipo de concesión canónico está en Yacimiento.']);
-      }
-    }
-
-    await this.installFamilyFindingSync(q);
-    await this.verify(q);
-  }
-
-  public async down():Promise<void>{
-    throw new Error('Authoritative inventory model is a deliberate clean-load migration; restore the deploy PRE database backup.');
-  }
-
-  private assertSource():void{
-    if(SOURCE.departments.length!==7||SOURCE.companies.length!==13||SOURCE.concessionTypes.length!==2||SOURCE.areas.length!==64||SOURCE.fields.length!==230)
-      throw new Error('Authoritative territory source cardinality mismatch');
-    if(SOURCE.installationFamilies.length!==14||SOURCE.subinstallationFamilies.length!==109||SOURCE.findings.length!==181||SOURCE.installationFindings.length!==48||SOURCE.subinstallationFindings.length!==880)
-      throw new Error('Authoritative inventory source cardinality mismatch');
-    for(const area of SOURCE.areas) if(!SOURCE.departments.some((d)=>d.id===area.departamento_id)) throw new Error(`Area ${area.id} has no source Departamento`);
-    for(const field of SOURCE.fields){
-      if(!SOURCE.areas.some((a)=>a.id===field.area_id)||!SOURCE.companies.some((c)=>c.id===field.empresa_id)||!SOURCE.concessionTypes.some((c)=>c.id===field.tipo_concesion_id))
-        throw new Error(`Yacimiento ${field.id} has invalid source relationship`);
-    }
-  }
-
-  private async insertCommonAttributes(q:QueryRunner,typeId:string,rows:Array<[string,string,number]>):Promise<void>{
-    for(const [code,name,sortOrder] of rows) await q.query(`
-      INSERT INTO asset_attribute_definitions(asset_type_id,code,name,data_type,is_required,is_active,unit,options,sort_order)
-      VALUES($1::uuid,$2,$3,'TEXT'::asset_attribute_data_type,false,true,NULL,NULL,$4)
-    `,[typeId,code,name,sortOrder]);
-  }
-
-  private async seedFamiliesAndFindings(q:QueryRunner):Promise<void>{
-    const installationIds=new Map<number,string>();
-    for(const row of SOURCE.installationFamilies){
-      const [created]=(await q.query(`INSERT INTO inventory_families(code,name,level,information_labels,source_reference,is_active)
-        VALUES($1,$2,'INSTALLATION','[]'::jsonb,$3,true) RETURNING id`,[sourceCode('AUTH-I',row.id),row.nombre,`modelo_relacional:instalaciones:${row.id}`])) as IdRow[];
-      if(!created?.id)throw new Error(`Could not create Instalación family ${row.id}`); installationIds.set(row.id,created.id);
-    }
-    const subIds=new Map<number,string>();
-    for(const row of SOURCE.subinstallationFamilies){
-      const [created]=(await q.query(`INSERT INTO inventory_families(code,name,level,information_labels,source_reference,is_active)
-        VALUES($1,$2,'SUBINSTALLATION','[]'::jsonb,$3,true) RETURNING id`,[sourceCode('AUTH-S',row.id),row.nombre,`modelo_relacional:subinstalaciones:${row.id}`])) as IdRow[];
-      const parent=installationIds.get(row.instalacion_id); if(!created?.id||!parent)throw new Error(`Invalid Subinstalación family ${row.id}`);
-      subIds.set(row.id,created.id);
-      await q.query(`INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id) VALUES($1::uuid,$2::uuid)`,[created.id,parent]);
-    }
-
-    const [category]=(await q.query(`INSERT INTO finding_categories(code,name,sort_order,is_active) VALUES($1,$2,300,true) RETURNING id`,[FINDING_CATEGORY_CODE,'DH · Hallazgos del modelo autoritativo'])) as IdRow[];
-    if(!category?.id)throw new Error('Could not create authoritative finding category');
-    const findingIds=new Map<number,string>();
-    for(const row of SOURCE.findings){
-      const [created]=(await q.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`,[category.id,sourceCode('AUTH-H',row.id),row.id,row.nombre,'modelo_relacional instalaciones y sub.sql'])) as IdRow[];
-      if(!created?.id)throw new Error(`Could not create Hallazgo ${row.id}`); findingIds.set(row.id,created.id);
-      await q.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',item.category_id,'code',item.code,'sourceNumber',item.source_number,'title',item.title,'revision',item.revision,'isActive',item.is_active),'migration:AUTHORITATIVE'
-        FROM finding_catalog_items item WHERE item.id=$1::uuid`,[created.id]);
-    }
-    for(const mapping of SOURCE.installationFindings){
-      const family=installationIds.get(mapping.instalacion_id); const finding=findingIds.get(mapping.hallazgo_id);
-      if(!family||!finding)throw new Error('Invalid installation finding mapping');
-      await q.query(`INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id) VALUES($1::uuid,$2::uuid)`,[finding,family]);
-    }
-    for(const mapping of SOURCE.subinstallationFindings){
-      const family=subIds.get(mapping.subinstalacion_id); const finding=findingIds.get(mapping.hallazgo_id);
-      if(!family||!finding)throw new Error('Invalid subinstallation finding mapping');
-      await q.query(`INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id) VALUES($1::uuid,$2::uuid)`,[finding,family]);
-    }
-  }
-
-  private async installFamilyFindingSync(q:QueryRunner):Promise<void>{
-    await q.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 'AUTHORITATIVE 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,m.catalog_item_id,true,'AUTHORITATIVE familia técnica: catálogo contextual automático',NEW.created_by,NEW.updated_by
-          FROM finding_catalog_item_inventory_families m WHERE m.inventory_family_id=NEW.inventory_family_id
-          ON CONFLICT(asset_id,catalog_item_id) DO UPDATE SET is_enabled=true,reason='AUTHORITATIVE familia técnica: catálogo contextual automático',updated_by=NEW.updated_by,updated_at=CURRENT_TIMESTAMP;
-        END IF;
-        RETURN NEW;
-      END $$
-    `);
-    await q.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 o USING assets a
-          WHERE o.asset_id=a.id AND a.inventory_family_id=OLD.inventory_family_id AND o.catalog_item_id=OLD.catalog_item_id AND o.reason LIKE 'AUTHORITATIVE 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 a.id,NEW.catalog_item_id,true,'AUTHORITATIVE familia técnica: catálogo contextual automático',a.created_by,a.updated_by
-        FROM assets a WHERE a.inventory_family_id=NEW.inventory_family_id
-        ON CONFLICT(asset_id,catalog_item_id) DO UPDATE SET is_enabled=true,reason='AUTHORITATIVE familia técnica: catálogo contextual automático',updated_at=CURRENT_TIMESTAMP;
-        RETURN NEW;
-      END $$
-    `);
-  }
-
-  private async asset(q:QueryRunner,typeId:string,parentId:string|null,areaId:string|null,companyId:string|null,concessionId:string|null,
-    code:string,name:string,sourceName:string,sourceReference:string):Promise<string>{
-    const [row]=(await q.query(`INSERT INTO assets(asset_type_id,parent_id,operational_area_id,operator_company_id,concession_type_id,inventory_family_id,
-      code,name,information_status,operational_status,data_origin,source_name,source_reference,is_inventory_instance)
-      VALUES($1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,NULL,$6,$7,'VALIDATED','UNKNOWN','PROVIDED_DOCUMENT',$8,$9,false) RETURNING id`,
-      [typeId,parentId,areaId,companyId,concessionId,code,name,sourceName,sourceReference])) as IdRow[];
-    if(!row?.id)throw new Error(`Could not seed ${code}`); 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]);
-  }
-
-  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 canonical asset type: ${sql}`); return rows[0].id;
-  }
-
-  private async verify(q:QueryRunner):Promise<void>{
-    const [row]=await q.query(`SELECT
-      (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 fields,
-      (SELECT COUNT(*) FROM concession_types)::integer concessions,
-      (SELECT COUNT(*) FROM inventory_families WHERE level='INSTALLATION')::integer installation_families,
-      (SELECT COUNT(*) FROM inventory_families WHERE level='SUBINSTALLATION')::integer subinstallation_families,
-      (SELECT COUNT(*) FROM finding_catalog_items)::integer findings,
-      (SELECT COUNT(*) FROM finding_catalog_item_inventory_families m JOIN inventory_families f ON f.id=m.inventory_family_id WHERE f.level='INSTALLATION')::integer installation_mappings,
-      (SELECT COUNT(*) FROM finding_catalog_item_inventory_families m JOIN inventory_families f ON f.id=m.inventory_family_id WHERE f.level='SUBINSTALLATION')::integer subinstallation_mappings,
-      (SELECT COUNT(*) FROM assets y JOIN asset_types t ON t.id=y.asset_type_id JOIN assets a ON a.id=y.parent_id WHERE lower(t.code)='yacimiento' AND (y.operational_area_id IS DISTINCT FROM a.id OR y.operator_company_id IS NULL OR y.concession_type_id IS NULL))::integer invalid_fields`);
-    const expected:Record<string,number>={companies:13,departments:7,areas:64,fields:230,concessions:2,installation_families:14,subinstallation_families:109,findings:181,installation_mappings:48,subinstallation_mappings:880,invalid_fields:0};
-    for(const [key,value] of Object.entries(expected)) if(Number(row?.[key]??-1)!==value)throw new Error(`Authoritative inventory verification failed: ${key}=${row?.[key]} expected=${value}`);
-  }
-}
@@ -1,179 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class F7SimpleInventoryContext1790110200000 implements MigrationInterface {
-  name = 'F7SimpleInventoryContext1790110200000';
-
-  public async up(q: QueryRunner): Promise<void> {
-    await q.query(`
-      UPDATE asset_types
-      SET description='Yacimiento. Pertenece a un Área, tiene una única Empresa operadora vigente y puede recibir Hallazgos.',
-          updated_at=CURRENT_TIMESTAMP
-      WHERE lower(code)='yacimiento'
-    `);
-
-    await q.query(`
-      CREATE OR REPLACE FUNCTION enforce_authoritative_inventory_relationships()
-      RETURNS trigger LANGUAGE plpgsql AS $$
-      DECLARE
-        kind text;
-        asset_role asset_type_operational_role;
-        parent_kind text;
-        parent_area uuid;
-        parent_company uuid;
-        parent_family uuid;
-        company_role asset_type_operational_role;
-        family_level text;
-      BEGIN
-        SELECT lower(code),operational_role INTO kind,asset_role FROM asset_types WHERE id=NEW.asset_type_id;
-        IF kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='asset type does not exist'; END IF;
-
-        IF asset_role='COMPANY'::asset_type_operational_role THEN
-          IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Empresa no admite padre'; END IF;
-          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
-          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-          RETURN NEW;
-        ELSIF kind='departamento' THEN
-          IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Departamento no admite padre'; END IF;
-          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
-          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-          RETURN NEW;
-        END IF;
-
-        IF NEW.parent_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El nivel requiere un padre estructural'; END IF;
-        SELECT lower(parent_type.code), parent.operational_area_id, parent.operator_company_id, parent.inventory_family_id
-          INTO parent_kind,parent_area,parent_company,parent_family
-        FROM assets parent JOIN asset_types parent_type ON parent_type.id=parent.asset_type_id
-        WHERE parent.id=NEW.parent_id AND parent.information_status<>'INACTIVE';
-        IF parent_kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El padre estructural no existe o está inactivo'; END IF;
-
-        IF kind='area' THEN
-          IF parent_kind<>'departamento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Área debe pertenecer a un Departamento'; END IF;
-          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
-          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-        ELSIF kind='yacimiento' THEN
-          IF parent_kind<>'area' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento debe pertenecer a un Área'; END IF;
-          IF NEW.operator_company_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere una Empresa operadora'; END IF;
-          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='La Empresa operadora del Yacimiento no es válida';
-          END IF;
-          IF NOT EXISTS(
-            SELECT 1 FROM area_company_relations relation
-            WHERE relation.area_id=NEW.parent_id
-              AND relation.company_id=NEW.operator_company_id
-              AND relation.relation_role='OPERATOR'::area_organization_role
-              AND relation.valid_until IS NULL
-          ) THEN
-            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La Empresa del Yacimiento debe estar vinculada como explotadora del Área';
-          END IF;
-          IF NEW.concession_type_id IS NOT NULL
-             AND NOT EXISTS(SELECT 1 FROM concession_types c WHERE c.id=NEW.concession_type_id AND c.is_active=true) THEN
-            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Tipo de concesión indicado no es válido';
-          END IF;
-          IF NEW.operational_area_id IS NOT NULL AND NEW.operational_area_id<>NEW.parent_id THEN
-            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Área operativa del Yacimiento debe coincidir con su Área padre';
-          END IF;
-          NEW.operational_area_id:=NEW.parent_id; NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-        ELSIF kind='instalacion' THEN
-          IF parent_kind<>'yacimiento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Instalación debe pertenecer a un Yacimiento'; 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='Instalación requiere un Tipo de instalación válido'; END IF;
-          IF parent_company IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Yacimiento debe tener una Empresa operadora'; END IF;
-          NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
-        ELSIF kind='subinstalacion' THEN
-          IF parent_kind<>'instalacion' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación debe pertenecer a una Instalación'; 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 'SUBINSTALLATION' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación requiere un Tipo de subinstalación válido'; END IF;
-          IF 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='El Tipo de subinstalación no está habilitado dentro del Tipo de instalación padre';
-          END IF;
-          IF parent_company IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La Instalación debe pertenecer a un Yacimiento con Empresa operadora'; END IF;
-          NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
-        END IF;
-        RETURN NEW;
-      END $$
-    `);
-  }
-
-  public async down(q: QueryRunner): Promise<void> {
-    await q.query(`
-      UPDATE asset_types
-      SET description='Yacimiento. Pertenece a un Área y define directamente Tipo de concesión y Empresa relacionada.',
-          updated_at=CURRENT_TIMESTAMP
-      WHERE lower(code)='yacimiento'
-    `);
-
-    await q.query(`
-      CREATE OR REPLACE FUNCTION enforce_authoritative_inventory_relationships()
-      RETURNS trigger LANGUAGE plpgsql AS $$
-      DECLARE
-        kind text;
-        asset_role asset_type_operational_role;
-        parent_kind text;
-        parent_area uuid;
-        parent_company uuid;
-        parent_family uuid;
-        company_role asset_type_operational_role;
-        family_level text;
-      BEGIN
-        SELECT lower(code),operational_role INTO kind,asset_role FROM asset_types WHERE id=NEW.asset_type_id;
-        IF kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='asset type does not exist'; END IF;
-
-        IF asset_role='COMPANY'::asset_type_operational_role THEN
-          IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Empresa no admite padre'; END IF;
-          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
-          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-          RETURN NEW;
-        ELSIF kind='departamento' THEN
-          IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Departamento no admite padre'; END IF;
-          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
-          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-          RETURN NEW;
-        END IF;
-
-        IF NEW.parent_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El nivel requiere un padre estructural'; END IF;
-        SELECT lower(parent_type.code), parent.operational_area_id, parent.operator_company_id, parent.inventory_family_id
-          INTO parent_kind,parent_area,parent_company,parent_family
-        FROM assets parent JOIN asset_types parent_type ON parent_type.id=parent.asset_type_id
-        WHERE parent.id=NEW.parent_id AND parent.information_status<>'INACTIVE';
-        IF parent_kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El padre estructural no existe o está inactivo'; END IF;
-
-        IF kind='area' THEN
-          IF parent_kind<>'departamento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Área debe pertenecer a un Departamento'; END IF;
-          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
-          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-        ELSIF kind='yacimiento' THEN
-          IF parent_kind<>'area' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento debe pertenecer a un Área'; END IF;
-          IF NEW.operator_company_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere Empresa relacionada'; END IF;
-          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='La Empresa relacionada del Yacimiento no es válida'; END IF;
-          IF NEW.concession_type_id IS NULL OR NOT EXISTS(SELECT 1 FROM concession_types c WHERE c.id=NEW.concession_type_id AND c.is_active=true) THEN
-            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere un Tipo de concesión válido';
-          END IF;
-          IF NEW.operational_area_id IS NOT NULL AND NEW.operational_area_id<>NEW.parent_id THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Área operativa del Yacimiento debe coincidir con su Área padre'; END IF;
-          NEW.operational_area_id:=NEW.parent_id; NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
-        ELSIF kind='instalacion' THEN
-          IF parent_kind<>'yacimiento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Instalación debe pertenecer a un Yacimiento'; 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='Instalación requiere un Tipo de instalación válido'; END IF;
-          NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
-        ELSIF kind='subinstalacion' THEN
-          IF parent_kind<>'instalacion' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación debe pertenecer a una Instalación'; 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 'SUBINSTALLATION' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación requiere un Tipo de subinstalación válido'; END IF;
-          IF 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='El Tipo de subinstalación no es compatible con el Tipo de instalación padre';
-          END IF;
-          NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
-        END IF;
-        RETURN NEW;
-      END $$
-    `);
-  }
-}
@@ -1,17 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class F61ActUrgencyAtLock1790113800000 implements MigrationInterface {
-  name = 'F61ActUrgencyAtLock1790113800000';
-
-  public async up(q: QueryRunner): Promise<void> {
-    await q.query(`ALTER TABLE inspection_acts ALTER COLUMN urgency DROP DEFAULT`);
-    await q.query(`ALTER TABLE inspection_acts ALTER COLUMN urgency DROP NOT NULL`);
-    await q.query(`UPDATE inspection_acts SET urgency=NULL WHERE status='DRAFT'`);
-  }
-
-  public async down(q: QueryRunner): Promise<void> {
-    await q.query(`UPDATE inspection_acts SET urgency='NON_URGENT' WHERE urgency IS NULL`);
-    await q.query(`ALTER TABLE inspection_acts ALTER COLUMN urgency SET NOT NULL`);
-    await q.query(`ALTER TABLE inspection_acts ALTER COLUMN urgency SET DEFAULT 'NON_URGENT'`);
-  }
-}
@@ -1,105 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-function quoteIdentifier(identifier: string): string {
-  return `"${identifier.replaceAll('"', '""')}"`;
-}
-
-export class F62UserSmtpAndActRepresentative1790117400000 implements MigrationInterface {
-  name = 'F62UserSmtpAndActRepresentative1790117400000';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`
-      DO $$
-      BEGIN
-        IF EXISTS (SELECT 1 FROM users WHERE email IS NULL OR btrim(email)='') THEN
-          RAISE EXCEPTION 'USER_EMAIL_REQUIRED_BEFORE_F62';
-        END IF;
-      END $$
-    `);
-    await queryRunner.query(`ALTER TABLE users ALTER COLUMN email SET NOT NULL`);
-
-    await queryRunner.query(`
-      CREATE TABLE user_smtp_settings (
-        user_id uuid PRIMARY KEY,
-        mode varchar(16) NOT NULL DEFAULT 'SYSTEM',
-        host varchar(255),
-        port integer,
-        security_mode varchar(24),
-        username varchar(255),
-        password_enc text,
-        from_name varchar(200),
-        from_email varchar(320),
-        reply_to varchar(320),
-        enabled boolean NOT NULL DEFAULT true,
-        updated_by uuid,
-        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        CONSTRAINT chk_user_smtp_mode CHECK (mode IN ('SYSTEM','CUSTOM')),
-        CONSTRAINT chk_user_smtp_security CHECK (security_mode IS NULL OR security_mode IN ('NONE','STARTTLS','TLS')),
-        CONSTRAINT chk_user_smtp_port CHECK (port IS NULL OR (port > 0 AND port <= 65535)),
-        CONSTRAINT chk_user_smtp_custom_complete CHECK (
-          mode='SYSTEM' OR (
-            LENGTH(TRIM(COALESCE(host,''))) > 0
-            AND port IS NOT NULL
-            AND security_mode IS NOT NULL
-            AND LENGTH(TRIM(COALESCE(from_email,''))) > 0
-          )
-        ),
-        CONSTRAINT fk_user_smtp_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
-        CONSTRAINT fk_user_smtp_updated_by FOREIGN KEY (updated_by) REFERENCES users(id) ON DELETE SET NULL
-      )
-    `);
-    await queryRunner.query(`
-      ALTER TABLE inspection_act_responsibles
-      DROP CONSTRAINT chk_inspection_act_responsibles_details
-    `);
-    await queryRunner.query(`
-      ALTER TABLE inspection_act_responsibles
-      ADD CONSTRAINT chk_inspection_act_responsibles_details CHECK (
-        (
-          attendance_status = 'PRESENT'
-          AND LENGTH(TRIM(COALESCE(full_name, ''))) > 0
-          AND document_type IS NOT NULL
-          AND LENGTH(TRIM(COALESCE(document_number, ''))) > 0
-          AND LENGTH(TRIM(COALESCE(position, ''))) > 0
-          AND LENGTH(TRIM(COALESCE(email, ''))) > 0
-          AND absence_reason IS NULL
-        ) OR (
-          attendance_status = 'ABSENT'
-          AND LENGTH(TRIM(COALESCE(absence_reason, ''))) >= 10
-        )
-      )
-    `);
-
-    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 user_smtp_settings TO ${applicationRole}`);
-    await queryRunner.query(`REVOKE DELETE ON TABLE user_smtp_settings FROM ${applicationRole}`);
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`
-      ALTER TABLE inspection_act_responsibles
-      DROP CONSTRAINT chk_inspection_act_responsibles_details
-    `);
-    await queryRunner.query(`
-      ALTER TABLE inspection_act_responsibles
-      ADD CONSTRAINT chk_inspection_act_responsibles_details CHECK (
-        (
-          attendance_status = 'PRESENT'
-          AND LENGTH(TRIM(COALESCE(full_name, ''))) > 0
-          AND document_type IS NOT NULL
-          AND LENGTH(TRIM(COALESCE(document_number, ''))) > 0
-          AND LENGTH(TRIM(COALESCE(position, ''))) > 0
-          AND absence_reason IS NULL
-        ) OR (
-          attendance_status = 'ABSENT'
-          AND LENGTH(TRIM(COALESCE(absence_reason, ''))) >= 10
-        )
-      )
-    `);
-    await queryRunner.query(`DROP TABLE IF EXISTS user_smtp_settings`);
-    await queryRunner.query(`ALTER TABLE users ALTER COLUMN email DROP NOT NULL`);
-  }
-}
@@ -1,8 +1,10 @@
 import { Transform } from 'class-transformer';
 import {
  ArrayMaxSize,
+  ArrayMinSize,
  ArrayUnique,
  IsArray,
+  IsEnum,
  IsISO8601,
  IsOptional,
  IsString,
@@ -10,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)
@@ -36,6 +42,7 @@ export class CreateInspectionActDto {
  observations?: string | null;

  @IsArray()
+  @ArrayMinSize(1)
  @ArrayMaxSize(200)
  @ArrayUnique()
  @IsUUID('4', { each: true })
@@ -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()
@@ -5,16 +5,10 @@ import {
  InspectionVisitActsController,
 } from './inspection-acts.controller';
 import { InspectionActsService } from './inspection-acts.service';
-import { MobileInspectionActsController } from './mobile-inspection-acts.controller';
-import { MobileInspectionActsService } from './mobile-inspection-acts.service';

@Module({
  imports: [AuditModule],
-  controllers: [
-    InspectionVisitActsController,
-    MobileInspectionActsController,
-    InspectionActsController,
-  ],
-  providers: [InspectionActsService, MobileInspectionActsService],
+  controllers: [InspectionVisitActsController, InspectionActsController],
+  providers: [InspectionActsService],
 })
 export class InspectionActsModule {}
@@ -74,7 +74,7 @@ export interface InspectionActListItem {
  title: string;
  summary: string;
  observations: string | null;
-  urgency: InspectionActUrgency | null;
+  urgency: InspectionActUrgency;
  deadlineDays: number | null;
  deadlineDayType: InspectionDeadlineDayType | null;
  deadlineBasis: InspectionDeadlineBasis | null;
@@ -154,26 +154,41 @@ export class InspectionActsService {
          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 (search_asset.code ILIKE ${search} OR search_asset.name ILIKE ${search})
-        )
-        OR EXISTS (
-          SELECT 1 FROM assets search_company
-          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}
+            AND (
+              search_asset.code ILIKE ${search}
+              OR search_asset.name ILIKE ${search}
+              OR search_company.name ILIKE ${search}
+              OR 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) conditions.push(`visit.operator_company_id = ${add(query.companyId)}::uuid`);
-    if (query.areaId) conditions.push(`visit.operational_area_id = ${add(query.areaId)}::uuid`);
+    if (query.companyId) {
+      conditions.push(`EXISTS (
+        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(`(
@@ -230,8 +245,24 @@ 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) conditions.push(`visit.operator_company_id = ${add(query.companyId)}::uuid`);
-    if (query.areaId) conditions.push(`visit.operational_area_id = ${add(query.areaId)}::uuid`);
+    if (query.companyId) {
+      conditions.push(`EXISTS (
+        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(`(
@@ -314,7 +345,7 @@ export class InspectionActsService {
        title: dto.title,
        summary: dto.summary,
        observations: dto.observations ?? null,
-        urgency: null,
+        urgency: dto.urgency,
        deadlineDays: null,
        deadlineDayType: null,
        deadlineBasis: null,
@@ -379,6 +410,7 @@ export class InspectionActsService {
      await this.assertVisitAssets(manager, visit.id, nextAssetIds);
      const before = await this.loadView(manager, id);
      if (dto.occurredAt !== undefined) act.occurredAt = nextOccurredAt;
+      if (dto.urgency !== undefined) act.urgency = dto.urgency;
      if (dto.title !== undefined) act.title = dto.title;
      if (dto.summary !== undefined) act.summary = dto.summary;
      if (dto.observations !== undefined) act.observations = dto.observations;
@@ -516,16 +548,21 @@ export class InspectionActsService {
      LEFT JOIN inspection_reports report ON report.act_id = act.id
      LEFT JOIN LATERAL (
        SELECT
-          CASE WHEN company.id IS NULL THEN '[]'::jsonb ELSE JSONB_BUILD_ARRAY(
-            JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',company.name)
-          ) END AS companies,
-          CASE WHEN area.id IS NULL THEN '[]'::jsonb ELSE JSONB_BUILD_ARRAY(
-            JSONB_BUILD_OBJECT('id',area.id,'code',area.code,'name',area.name)
-          ) END AS areas
-        FROM inspection_visits context_visit
-        LEFT JOIN assets company ON company.id=context_visit.operator_company_id
-        LEFT JOIN assets area ON area.id=context_visit.operational_area_id
-        WHERE context_visit.id=act.visit_id
+          COALESCE(JSONB_AGG(DISTINCT JSONB_BUILD_OBJECT(
+            'id', company.id,
+            'code', company.code,
+            'name', company.name
+          )) FILTER (WHERE company.id IS NOT NULL), '[]'::jsonb) AS companies,
+          COALESCE(JSONB_AGG(DISTINCT JSONB_BUILD_OBJECT(
+            'id', area.id,
+            'code', area.code,
+            'name', area.name
+          )) FILTER (WHERE area.id IS NOT NULL), '[]'::jsonb) AS areas
+        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
@@ -655,7 +692,6 @@ export class InspectionActsService {
    visitId: string,
    assetIds: string[],
  ): Promise<void> {
-    if (assetIds.length === 0) return;
    const [row] = (await manager.query(`
      SELECT COUNT(*)::integer AS count
      FROM inspection_visit_assets
@@ -663,7 +699,7 @@ export class InspectionActsService {
        AND asset_id = ANY($2::uuid[])
        AND included = true
    `, [visitId, assetIds])) as Array<{ count: number }>;
-    if (Number(row?.count ?? 0) !== assetIds.length) {
+    if (assetIds.length < 1 || Number(row?.count ?? 0) !== assetIds.length) {
      throw new BadRequestException({
        code: 'INSPECTION_ACT_ASSET_INVALID',
        message: 'Cada inventario del acta debe estar incluido en la inspección',
@@ -728,13 +764,10 @@ export class InspectionActsService {
    principal: AuthPrincipal,
  ): Promise<number> {
    const [row] = (await manager.query(`
-      WITH updated AS (
-        UPDATE inspection_acts
-        SET current_version = current_version + 1
-        WHERE id = $1
-        RETURNING current_version
-      )
-      SELECT current_version AS "versionNumber" FROM updated
+      UPDATE inspection_acts
+      SET current_version = current_version + 1
+      WHERE id = $1
+      RETURNING current_version AS "versionNumber"
    `, [act.id])) as Array<{ versionNumber: number }>;
    const versionNumber = Number(row.versionNumber);
    act.currentVersion = versionNumber;
@@ -780,8 +813,6 @@ export class InspectionActsService {
          'code', visit.code,
          '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((
@@ -1,18 +0,0 @@
-import { Controller, Get, Param, ParseUUIDPipe, Query } from '@nestjs/common';
-import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
-import { ListInspectionActsQueryDto } from './dto/list-inspection-acts-query.dto';
-import { MobileInspectionActsService } from './mobile-inspection-acts.service';
-
-@Controller('inspection-visits/:visitId/acts/mobile')
-export class MobileInspectionActsController {
-  constructor(private readonly acts: MobileInspectionActsService) {}
-
-  @Get()
-  @RequirePermissions('inspection_acts.read')
-  list(
-    @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
-    @Query() query: ListInspectionActsQueryDto,
-  ) {
-    return this.acts.listForVisit(visitId, query);
-  }
-}
@@ -1,102 +0,0 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
-import { DataSource } from 'typeorm';
-import type { ListInspectionActsQueryDto } from './dto/list-inspection-acts-query.dto';
-
-/**
- * Read model intentionally kept small for the field client.
- *
- * The Android app only needs the Act identity/lifecycle, deadlines and counters to
- * open an Inspection. It must not fail because an office-document/report module is
- * unavailable or temporarily schema-drifted. The canonical office endpoints keep
- * their richer projection in InspectionActsService.
- */
-@Injectable()
-export class MobileInspectionActsService {
-  constructor(private readonly dataSource: DataSource) {}
-
-  async listForVisit(visitId: string, query: ListInspectionActsQueryDto) {
-    const [visit] = (await this.dataSource.query(
-      'SELECT id FROM inspection_visits WHERE id = $1::uuid',
-      [visitId],
-    )) as Array<{ id: string }>;
-    if (!visit) {
-      throw new NotFoundException({
-        code: 'INSPECTION_VISIT_NOT_FOUND',
-        message: 'Visita de inspección no encontrada',
-      });
-    }
-
-    const conditions = ['act.visit_id = $1::uuid'];
-    const parameters: unknown[] = [visitId];
-    const add = (value: unknown): string => {
-      parameters.push(value);
-      return `$${parameters.length}`;
-    };
-
-    if (query.search?.trim()) {
-      const search = add(`%${query.search.trim()}%`);
-      conditions.push(`(act.code ILIKE ${search} OR act.title 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.dateFrom) conditions.push(`act.occurred_at::date >= ${add(query.dateFrom)}::date`);
-    if (query.dateTo) conditions.push(`act.occurred_at::date <= ${add(query.dateTo)}::date`);
-
-    const where = `WHERE ${conditions.join(' AND ')}`;
-    const [countRow] = (await this.dataSource.query(
-      `SELECT COUNT(*)::integer AS total FROM inspection_acts act ${where}`,
-      parameters,
-    )) as Array<{ total: number }>;
-    const total = Number(countRow?.total ?? 0);
-
-    const limit = add(query.pageSize);
-    const offset = add((query.page - 1) * query.pageSize);
-    const data = await this.dataSource.query(`
-      SELECT
-        act.id,
-        act.visit_id AS "visitId",
-        act.code,
-        act.status,
-        act.occurred_at AS "occurredAt",
-        act.title,
-        act.summary,
-        act.observations,
-        act.urgency,
-        act.deadline_days AS "deadlineDays",
-        act.deadline_day_type AS "deadlineDayType",
-        act.deadline_basis AS "deadlineBasis",
-        act.deadline_base_at AS "deadlineBaseAt",
-        act.deadline_at AS "deadlineAt",
-        act.locked_at AS "lockedAt",
-        act.locked_sha256 AS "lockedSha256",
-        act.sealed_at AS "sealedAt",
-        act.current_version AS "currentVersion",
-        act.closed_at AS "closedAt",
-        act.closure_sha256 AS "closureSha256",
-        COALESCE((
-          SELECT COUNT(*)::integer
-          FROM inspection_act_assets link
-          WHERE link.act_id = act.id AND link.included = true
-        ), 0)::integer AS "assetCount",
-        COALESCE((
-          SELECT COUNT(*)::integer
-          FROM inspection_findings finding
-          WHERE finding.act_id = act.id AND finding.status <> 'VOIDED'
-        ), 0)::integer AS "findingCount"
-      FROM inspection_acts act
-      ${where}
-      ORDER BY act.act_year DESC, act.act_number DESC
-      LIMIT ${limit} OFFSET ${offset}
-    `, parameters);
-
-    return {
-      data,
-      meta: {
-        page: query.page,
-        pageSize: query.pageSize,
-        total,
-        totalPages: total === 0 ? 0 : Math.ceil(total / query.pageSize),
-      },
-    };
-  }
-}
@@ -213,14 +213,14 @@ export class CompanySignatureInviteService {

    if (!publicUrl) {
      deliveryError = 'COMPANY_SIGNATURE_PUBLIC_BASE_URL no configurada';
-    } else if (!(await this.smtp.configured(principal.userId))) {
+    } 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 disconformidad o registrar una negativa a firmar.',
+        '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}`,
@@ -236,7 +236,7 @@ export class CompanySignatureInviteService {
            mimeType: 'text/plain',
            content: Buffer.from(body, 'utf8'),
          },
-        }, principal.userId);
+        });
        emailSent = true;
        await this.dataSource.query(`
          UPDATE inspection_act_company_signature_invites
@@ -1,7 +0,0 @@
-import { IsEnum } from 'class-validator';
-import { InspectionActUrgency } from '../../database/entities';
-
-export class PrepareInspectionActDto {
-  @IsEnum(InspectionActUrgency)
-  urgency!: InspectionActUrgency;
-}
@@ -54,9 +54,7 @@ export class UpsertInspectionResponsibleDto {
  @MaxLength(200)
  position?: string;

-  @ValidateIf((dto: UpsertInspectionResponsibleDto) => (
-    dto.attendanceStatus === InspectionResponsibleAttendanceStatus.PRESENT
-  ))
+  @IsOptional()
  @Transform(trimOrUndefined)
  @IsEmail()
  @MaxLength(320)
@@ -17,7 +17,6 @@ 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 { CloseInspectionActDto } from './dto/close-inspection-act.dto';
-import { PrepareInspectionActDto } from './dto/prepare-inspection-act.dto';
 import { CreateCompanyOutcomeDto } from './dto/create-company-outcome.dto';
 import { CreateInspectionSignatureDto } from './dto/create-inspection-signature.dto';
 import { CreateCompanySignatureDto } from './dto/create-company-signature.dto';
@@ -53,11 +52,10 @@ export class InspectionClosingController {
  @RequirePermissions('inspection_closure.prepare')
  lock(
    @Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
-    @Body() dto: PrepareInspectionActDto,
    @CurrentAuth() principal: AuthPrincipal,
    @Req() request: RequestWithContext,
  ) {
-    return this.closing.prepare(actId, dto, principal, request);
+    return this.closing.prepare(actId, principal, request);
  }

  @Post('signatures/inspector')
@@ -35,7 +35,6 @@ import { assertMobileInspector } from '../inspection-operations/mobile-inspector
 import { InspectionReportsService } from '../inspection-reports/inspection-reports.service';
 import { sha256CanonicalJson } from './canonical-json';
 import type { CloseInspectionActDto } from './dto/close-inspection-act.dto';
-import type { PrepareInspectionActDto } from './dto/prepare-inspection-act.dto';
 import type { CreateCompanyOutcomeDto } from './dto/create-company-outcome.dto';
 import type { CreateCompanySignatureDto } from './dto/create-company-signature.dto';
 import type { CreateInspectionSignatureDto } from './dto/create-inspection-signature.dto';
@@ -131,7 +130,7 @@ export interface InspectionClosureView {
    code: string;
    status: InspectionActStatus;
    visitId: string;
-    urgency: InspectionActUrgency | null;
+    urgency: InspectionActUrgency;
    deadlineDays: number | null;
    deadlineDayType: InspectionDeadlineDayType | null;
    deadlineBasis: InspectionDeadlineBasis | null;
@@ -152,7 +151,6 @@ export interface InspectionClosureView {
    actualClosedAt: Date | null;
  };
  responsible: ResponsibleView | null;
-  representativeSuggestion: ResponsibleView | null;
  closure: null | {
    schemaVersion: string;
    preparedSha256: string;
@@ -270,7 +268,6 @@ export class InspectionClosingService {
  /** Finaliza el contenido: desde este punto el Acta queda inmutable. */
  async prepare(
    actId: string,
-    dto: PrepareInspectionActDto,
    principal: AuthPrincipal,
    request: RequestWithContext,
  ): Promise<InspectionClosureView> {
@@ -288,16 +285,16 @@ export class InspectionClosingService {
      }

      const policy = await this.deadlinePolicy(manager);
-      const deadlineDays = dto.urgency === InspectionActUrgency.URGENT
+      const deadlineDays = act.urgency === InspectionActUrgency.URGENT
        ? policy.urgentDays
        : policy.nonUrgentDays;
-      const deadlineDayType = dto.urgency === InspectionActUrgency.URGENT
+      const deadlineDayType = act.urgency === InspectionActUrgency.URGENT
        ? policy.urgentDayType
        : policy.nonUrgentDayType;
-      const deadlineBasis = dto.urgency === InspectionActUrgency.URGENT
+      const deadlineBasis = act.urgency === InspectionActUrgency.URGENT
        ? InspectionDeadlineBasis.ACT_DATE
        : InspectionDeadlineBasis.GEDO_DATE;
-      const deadlineBaseAt = dto.urgency === InspectionActUrgency.URGENT
+      const deadlineBaseAt = act.urgency === InspectionActUrgency.URGENT
        ? act.occurredAt
        : null;
      const deadlineAt = deadlineBaseAt
@@ -308,22 +305,20 @@ export class InspectionClosingService {
      const [updated] = (await manager.query(`
        UPDATE inspection_acts
        SET status='LOCKED',
-            urgency=$2,
-            deadline_days=$3,
-            deadline_day_type=$4,
-            deadline_basis=$5,
-            deadline_base_at=$6,
-            deadline_at=$7,
-            locked_at=$8,
-            locked_by=$9,
+            deadline_days=$2,
+            deadline_day_type=$3,
+            deadline_basis=$4,
+            deadline_base_at=$5,
+            deadline_at=$6,
+            locked_at=$7,
+            locked_by=$8,
            current_version=current_version+1,
-            updated_by=$9,
-            updated_at=$8
+            updated_by=$8,
+            updated_at=$7
        WHERE id=$1
        RETURNING current_version AS "versionNumber"
      `, [
        actId,
-        dto.urgency,
        deadlineDays,
        deadlineDayType,
        deadlineBasis,
@@ -1014,7 +1009,7 @@ export class InspectionClosingService {
      WHERE act.id=$1
    `, [actId]) as Array<{
      id: string; code: string; status: InspectionActStatus; visitId: string;
-      urgency: InspectionActUrgency | null; deadlineDays: number | null;
+      urgency: InspectionActUrgency; deadlineDays: number | null;
      deadlineDayType: InspectionDeadlineDayType | null; deadlineBasis: InspectionDeadlineBasis | null;
      deadlineBaseAt: Date | null; deadlineAt: Date | null; lockedAt: Date | null;
      lockedSha256: string | null; sealedAt: Date | null; currentVersion: number;
@@ -1023,7 +1018,6 @@ export class InspectionClosingService {
    }>;
    if (!context) throw actNotFound();
    const responsible = await this.loadResponsible(manager, actId);
-    const representativeSuggestion = responsible ? null : await this.loadResponsibleSuggestion(manager, actId);
    const closure = await this.loadClosure(manager, actId);
    const signatures = await this.loadSignatures(manager, actId);
    return {
@@ -1053,7 +1047,6 @@ export class InspectionClosingService {
        actualClosedAt: context.visitActualClosedAt,
      },
      responsible,
-      representativeSuggestion,
      closure: closure ? {
        schemaVersion: closure.schemaVersion,
        preparedSha256: closure.preparedSha256,
@@ -1086,30 +1079,12 @@ export class InspectionClosingService {
    return row ?? null;
  }

-  private async loadResponsibleSuggestion(manager: EntityManager, actId: string): Promise<ResponsibleView | null> {
-    const [row] = await manager.query(`
-      SELECT responsible.act_id AS "actId",responsible.attendance_status AS "attendanceStatus",
-        responsible.full_name AS "fullName",responsible.document_type AS "documentType",
-        responsible.document_number AS "documentNumber",responsible.position,responsible.email,responsible.phone,
-        responsible.absence_reason AS "absenceReason",responsible.updated_by AS "updatedBy",
-        responsible.created_at AS "createdAt",responsible.updated_at AS "updatedAt"
-      FROM inspection_acts current_act
-      JOIN inspection_acts previous_act
-        ON previous_act.visit_id=current_act.visit_id AND previous_act.id<>current_act.id
-      JOIN inspection_act_responsibles responsible ON responsible.act_id=previous_act.id
-      WHERE current_act.id=$1 AND responsible.attendance_status='PRESENT'
-      ORDER BY responsible.updated_at DESC,previous_act.created_at DESC
-      LIMIT 1
-    `, [actId]) as ResponsibleView[];
-    return row ?? null;
-  }
-
  private async requireResponsible(manager: EntityManager, actId: string): Promise<ResponsibleView> {
    const responsible = await this.loadResponsible(manager, actId);
    if (!responsible) {
      throw new ConflictException({
        code: 'INSPECTION_ACT_RESPONSIBLE_REQUIRED',
-        message: 'Debe identificarse al representante de la empresa o documentar su ausencia antes de cerrar el Acta',
+        message: 'Debe identificarse al responsable o documentar su ausencia antes de finalizar el acta',
      });
    }
    return responsible;
@@ -1,14 +1,10 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { DataSource } from 'typeorm';
 import type { ListFindingCatalogQueryDto } from './dto/list-finding-catalog-query.dto';
-import { FindingCatalogService } from './finding-catalog.service';

@Injectable()
 export class F3FindingCatalogResolverService {
-  constructor(
-    private readonly dataSource: DataSource,
-    private readonly contextualCatalog: FindingCatalogService,
-  ) {}
+  constructor(private readonly dataSource: DataSource) {}

  async listApplicableForAsset(assetId: string, query: ListFindingCatalogQueryDto) {
    const [asset] = await this.dataSource.query(`
@@ -40,28 +36,17 @@ export class F3FindingCatalogResolverService {
      enabled: true,
      code: 'OTHER',
      label: 'OTROS',
-      help: 'Usalo cuando el Hallazgo no exista entre los asociados a este Inventario. Quedará registrado para revisión en oficina.',
+      help: 'Usalo cuando el Hallazgo no exista entre los asociados a esta clasificación. Quedará registrado para revisión en oficina.',
    };

-    if (asset.typeCode.toLowerCase() === 'yacimiento') {
-      const contextual = await this.contextualCatalog.listApplicableForAsset(assetId, query);
-      return {
-        ...contextual,
-        inventoryFamily: null,
-        catalogSource: 'ASSET_TYPE' as const,
-        configurationReason: contextual.configurationReason
-          ?? 'Hallazgos asociados al tipo Yacimiento. OTROS permanece siempre disponible.',
-        other,
-      };
-    }
-
    if (!asset.familyId || asset.familyActive !== true) {
      return {
        asset: { id: asset.id, code: asset.code, name: asset.name },
        inventoryFamily: null,
-        catalogSource: 'INVENTORY_FAMILY' as const,
        typeConfigured: false,
-        configurationReason: 'El elemento todavía no tiene una clasificación técnica activa.',
+        configurationReason: asset.typeCode.toLowerCase() === 'yacimiento'
+          ? 'El Yacimiento es contexto estructural y no posee clasificación técnica. Usá OTROS sólo si necesitás registrar una observación excepcional.'
+          : 'El elemento todavía no tiene una clasificación técnica activa.',
        categories: [],
        items: [],
        other,
@@ -118,7 +103,6 @@ export class F3FindingCatalogResolverService {
        name: asset.familyName,
        level: asset.familyLevel,
      },
-      catalogSource: 'INVENTORY_FAMILY' as const,
      typeConfigured: true,
      configurationReason: `Hallazgos asociados a la clasificación técnica ${asset.familyName ?? asset.familyCode ?? ''}`.trim(),
      categories,
@@ -153,16 +153,13 @@ export class InspectionFindingWorklistService {
      workflowFilters.push(`finding.status = 'OPEN'`);
    }

-    // Hallazgo, Acta e Inspección forman un hecho histórico. Empresa y Área se
-    // leen del contexto congelado de la Inspección que originó el Hallazgo, no
-    // del snapshot de compatibilidad del Inventario.
    const joins = `
      INNER JOIN inspection_acts act ON act.id = finding.act_id
      INNER JOIN inspection_visits visit ON visit.id = act.visit_id
      INNER JOIN assets asset ON asset.id = finding.asset_id
      INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
-      LEFT JOIN assets company ON company.id = visit.operator_company_id
-      LEFT JOIN assets area ON area.id = visit.operational_area_id
+      LEFT JOIN assets company ON company.id = asset.operator_company_id
+      LEFT JOIN assets area ON area.id = asset.operational_area_id
    `;
    const filters = [...contextFilters, ...workflowFilters];
    const where = filters.length ? `WHERE ${filters.join(' AND ')}` : '';
@@ -99,10 +99,8 @@ function lines(snapshot: Record<string, unknown>): string[] {
    `Fecha: ${date(act.occurredAt)}`,
    `Urgencia: ${urgencyLabel(act.urgency)}`,
    `Plazo: ${deadlineText}`,
-    `Representante de la empresa: ${text(responsible.fullName)}`,
-    `DNI: ${text(responsible.documentNumber)}`,
-    `Cargo / funcion: ${text(responsible.position)}`,
-    `Email: ${text(responsible.email)}`,
+    `Responsable empresa: ${text(responsible.fullName)}`,
+    `Cargo: ${text(responsible.position)}`,
    '',
    'RESUMEN',
    ...wrap(text(act.summary)),
@@ -138,7 +136,7 @@ function lines(snapshot: Record<string, unknown>): string[] {
    out.push('Manifestacion de empresa: pendiente.');
  } else if (text(companySignature.status, '') === 'SIGNED') {
    const manifestation = text(companySignature.companyManifestation, 'CONFORMITY');
-    out.push(manifestation === 'DISSENT' ? 'Empresa: firma en disconformidad' : 'Empresa: firma en conformidad');
+    out.push(manifestation === 'DISSENT' ? 'Empresa: firma en disidencia' : 'Empresa: firma en conformidad');
    if (manifestation === 'DISSENT') out.push(...wrap(text(companySignature.companyStatement)));
  } else {
    out.push(...wrap(`Empresa: ${text(companySignature.status)} - ${text(companySignature.reason)}`));
@@ -281,7 +281,7 @@ export class InspectionDocumentDeliveryService {
      email = company?.email ?? null;
    } else if (row.recipientKind === 'INSPECTOR' && row.recipientUserId) {
      const [inspector] = await this.dataSource.query(`
-        SELECT email FROM users WHERE id=$1 AND status='ACTIVE'
+        SELECT email FROM users WHERE id=$1 AND is_active=true
      `, [row.recipientUserId]) as Array<{ email: string | null }>;
      email = inspector?.email ?? null;
    } else {
@@ -305,14 +305,7 @@ export class InspectionDocumentDeliveryService {
      await this.setStatus(row.id,'WAITING_RECIPIENT','Destinatario no configurado');
      return;
    }
-    const [sender] = await this.dataSource.query(`
-      SELECT visit.lead_inspector_user_id AS "userId"
-      FROM inspection_acts act
-      JOIN inspection_visits visit ON visit.id=act.visit_id
-      WHERE act.id=$1
-    `, [row.actId]) as Array<{ userId: string | null }>;
-    const senderUserId = sender?.userId ?? undefined;
-    if (!await this.smtp.configured(senderUserId)) {
+    if (!await this.smtp.configured()) {
      await this.setStatus(row.id,'WAITING_TRANSPORT','SMTP no configurado');
      return;
    }
@@ -355,7 +348,7 @@ export class InspectionDocumentDeliveryService {
          : `Se adjunta el acta sellada e inmutable ${row.actCode}.`;
      const sent = await this.smtp.send({
        to:row.recipientEmail,subject:`DH Inspección · ${label}`,text,attachment,
-      }, senderUserId);
+      });
      await this.dataSource.query(`
        UPDATE inspection_document_deliveries
        SET status='SENT',sent_at=CURRENT_TIMESTAMP,provider_message_id=$2,
@@ -147,10 +147,8 @@ function documentXml(input: ReportWordInput): string {
    paragraph('El bloque siguiente reproduce información proveniente del Acta sellada. Debe conservarse sin alterar su sentido ni sustituir los Hallazgos originales.'),
    labelValue('Resumen del Acta', text(snapshot.act.summary)),
    labelValue('Observaciones del Acta', text(snapshot.act.observations)),
-    labelValue('Representante de la empresa', text(snapshot.responsible.fullName)),
-    labelValue('DNI', text(snapshot.responsible.documentNumber)),
-    labelValue('Cargo / función', text(snapshot.responsible.position)),
-    labelValue('Email', text(snapshot.responsible.email)),
+    labelValue('Responsable de empresa', text(snapshot.responsible.fullName)),
+    labelValue('Cargo', text(snapshot.responsible.position)),
    paragraph('Inventario inspeccionado', 'Heading1'),
    inventoryRows.length
      ? table(['Código', 'Nombre', 'Tipo'], inventoryRows)
@@ -408,24 +408,30 @@ export class InspectionReportsService {
  }

  private contextFilter(column: 'operator_company_id' | 'operational_area_id', parameter: string): string {
-    // Reports are historical documents. Their Area/Company filters must use the
-    // parent Inspection snapshot, never the mutable/current Inventory context.
-    return `visit.${column} = ${parameter}::uuid`;
+    return `EXISTS (
+      SELECT 1
+      FROM inspection_act_assets context_filter_link
+      INNER JOIN assets context_filter_asset ON context_filter_asset.id = context_filter_link.asset_id
+      WHERE context_filter_link.act_id = act.id
+        AND context_filter_link.included = true
+        AND context_filter_asset.${column} = ${parameter}::uuid
+    )`;
  }

  private contextSelect(): string {
    return `
      SELECT
-        CASE WHEN company.id IS NULL THEN '[]'::jsonb ELSE JSONB_BUILD_ARRAY(
-          JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',company.name)
-        ) END AS companies,
-        CASE WHEN area.id IS NULL THEN '[]'::jsonb ELSE JSONB_BUILD_ARRAY(
-          JSONB_BUILD_OBJECT('id',area.id,'code',area.code,'name',area.name)
-        ) END AS areas
-      FROM inspection_visits context_visit
-      LEFT JOIN assets company ON company.id=context_visit.operator_company_id
-      LEFT JOIN assets area ON area.id=context_visit.operational_area_id
-      WHERE context_visit.id=act.visit_id
+        COALESCE(JSONB_AGG(DISTINCT JSONB_BUILD_OBJECT(
+          'id',company.id,'code',company.code,'name',company.name
+        )) FILTER (WHERE company.id IS NOT NULL),'[]'::jsonb) AS companies,
+        COALESCE(JSONB_AGG(DISTINCT JSONB_BUILD_OBJECT(
+          'id',area.id,'code',area.code,'name',area.name
+        )) FILTER (WHERE area.id IS NOT NULL),'[]'::jsonb) AS areas
+      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
    `;
  }

@@ -11,7 +11,7 @@ interface MailInput { to:string; subject:string; text:string; attachment:MailAtt
 interface Reply { code:number; text:string; }

 export interface EffectiveSmtpSettings {
-  source: 'USER' | 'DATABASE' | 'ENVIRONMENT';
+  source: 'DATABASE' | 'ENVIRONMENT';
  host: string;
  port: number;
  securityMode: SmtpSecurityMode;
@@ -47,10 +47,10 @@ export class SmtpDeliveryService {
    private readonly config:ConfigService,
  ){}

-  async configured(userId?:string):Promise<boolean>{return Boolean(await this.resolveSettings(userId));}
+  async configured():Promise<boolean>{return Boolean(await this.resolveSettings());}

-  async fromAddress(userId?:string):Promise<string|null>{
-    const settings=await this.resolveSettings(userId);
+  async fromAddress():Promise<string|null>{
+    const settings=await this.resolveSettings();
    if(!settings)return null;
    return settings.fromName?`${settings.fromName} <${settings.fromEmail}>`:settings.fromEmail;
  }
@@ -73,56 +73,6 @@ export class SmtpDeliveryService {
    }:{source:'NONE',enabled:false};
  }

-  async publicUserSettings(userId:string){
-    const [user]=await this.dataSource.query(`
-      SELECT email,first_name AS "firstName",last_name AS "lastName" FROM users WHERE id=$1
-    `,[userId]) as Array<{email:string;firstName:string;lastName:string}>;
-    if(!user)throw new Error('Usuario no encontrado');
-    const [row]=await this.dataSource.query(`
-      SELECT mode,host,port,security_mode AS "securityMode",username,
-        (password_enc IS NOT NULL) AS "hasPassword",from_name AS "fromName",
-        from_email AS "fromEmail",enabled,updated_at AS "updatedAt"
-      FROM user_smtp_settings WHERE user_id=$1
-    `,[userId]) as Array<Record<string,unknown>>;
-    return {
-      mode:row?.mode??'SYSTEM',email:user.email,generalConfigured:Boolean(await this.resolveSystemSettings()),
-      custom:row?{
-        host:row.host??'',port:row.port??587,securityMode:row.securityMode??'STARTTLS',
-        username:row.username??'',hasPassword:Boolean(row.hasPassword),
-        fromName:row.fromName??`${user.firstName} ${user.lastName}`,fromEmail:row.fromEmail??user.email,
-        enabled:row.enabled!==false,updatedAt:row.updatedAt??null,
-      }:null,
-    };
-  }
-
-  async saveUserSettings(userId:string,input:{
-    mode:'SYSTEM'|'CUSTOM';host?:string;port?:number;securityMode?:SmtpSecurityMode;
-    username?:string|null;password?:string|null;fromName?:string|null;enabled?:boolean;
-  }){
-    const [user]=await this.dataSource.query(`SELECT email,first_name AS "firstName",last_name AS "lastName" FROM users WHERE id=$1`,[userId]) as Array<{email:string;firstName:string;lastName:string}>;
-    if(!user?.email)throw new Error('El usuario debe tener un email configurado');
-    const [existing]=await this.dataSource.query(`SELECT password_enc AS "passwordEnc" FROM user_smtp_settings WHERE user_id=$1`,[userId]) as Array<{passwordEnc:string|null}>;
-    if(input.mode==='SYSTEM'){
-      await this.dataSource.query(`
-        INSERT INTO user_smtp_settings(user_id,mode,updated_by) VALUES($1,'SYSTEM',$1)
-        ON CONFLICT(user_id) DO UPDATE SET mode='SYSTEM',updated_by=$1,updated_at=CURRENT_TIMESTAMP
-      `,[userId]);
-      return this.publicUserSettings(userId);
-    }
-    if(!input.host||!input.port||!input.securityMode)throw new Error('La configuración SMTP propia está incompleta');
-    const passwordEnc=input.password===undefined?existing?.passwordEnc??null:input.password?this.encryptSecret(input.password):null;
-    const fromName=input.fromName?.trim()||`${user.firstName} ${user.lastName}`.trim();
-    await this.dataSource.query(`
-      INSERT INTO user_smtp_settings(user_id,mode,host,port,security_mode,username,password_enc,from_name,from_email,reply_to,enabled,updated_by)
-      VALUES($1,'CUSTOM',$2,$3,$4,$5,$6,$7,$8,$8,$9,$1)
-      ON CONFLICT(user_id) DO UPDATE SET mode='CUSTOM',host=EXCLUDED.host,port=EXCLUDED.port,
-        security_mode=EXCLUDED.security_mode,username=EXCLUDED.username,password_enc=EXCLUDED.password_enc,
-        from_name=EXCLUDED.from_name,from_email=EXCLUDED.from_email,reply_to=EXCLUDED.reply_to,
-        enabled=EXCLUDED.enabled,updated_by=$1,updated_at=CURRENT_TIMESTAMP
-    `,[userId,input.host,input.port,input.securityMode,input.username?.trim()||null,passwordEnc,fromName,user.email,input.enabled!==false]);
-    return this.publicUserSettings(userId);
-  }
-
  async saveSettings(input:{
    host:string;port:number;securityMode:SmtpSecurityMode;username?:string|null;
    password?:string|null;fromName:string;fromEmail:string;replyTo?:string|null;enabled:boolean;
@@ -146,8 +96,8 @@ export class SmtpDeliveryService {
    return this.publicSettings();
  }

-  async send(input:MailInput,userId?:string):Promise<{messageId:string}>{
-    const settings=await this.resolveSettings(userId);
+  async send(input:MailInput):Promise<{messageId:string}>{
+    const settings=await this.resolveSettings();
    if(!settings)throw new Error('SMTP no configurado');
    const {host,port,securityMode,userName,password}= {
      host:settings.host,port:settings.port,securityMode:settings.securityMode,
@@ -187,33 +137,7 @@ export class SmtpDeliveryService {
    return {messageId:match?.[1]??randomUUID()};
  }

-  private async resolveSettings(userId?:string):Promise<EffectiveSmtpSettings|null>{
-    if(userId){
-      const [row]=await this.dataSource.query(`
-        SELECT settings.mode,settings.host,settings.port,settings.security_mode AS "securityMode",
-          settings.username,settings.password_enc AS "passwordEnc",settings.from_name AS "fromName",
-          settings.enabled,user_account.email AS "userEmail"
-        FROM users user_account
-        LEFT JOIN user_smtp_settings settings ON settings.user_id=user_account.id
-        WHERE user_account.id=$1
-      `,[userId]) as Array<{
-        mode:'SYSTEM'|'CUSTOM'|null;host:string|null;port:number|null;securityMode:SmtpSecurityMode|null;
-        username:string|null;passwordEnc:string|null;fromName:string|null;enabled:boolean|null;userEmail:string;
-      }>;
-      if(row?.mode==='CUSTOM'&&row.enabled!==false&&row.host&&row.port&&row.securityMode&&row.userEmail){
-        return {
-          source:'USER',host:row.host,port:Number(row.port),securityMode:row.securityMode,
-          username:row.username,password:row.passwordEnc?this.decryptSecret(row.passwordEnc):'',
-          fromName:row.fromName,fromEmail:row.userEmail,replyTo:row.userEmail,
-        };
-      }
-      const general=await this.resolveSystemSettings();
-      return general&&row?.userEmail?{...general,replyTo:row.userEmail}:general;
-    }
-    return this.resolveSystemSettings();
-  }
-
-  private async resolveSystemSettings():Promise<EffectiveSmtpSettings|null>{
+  private async resolveSettings():Promise<EffectiveSmtpSettings|null>{
    const [row]=await this.dataSource.query(`
      SELECT host,port,security_mode AS "securityMode",username,password_enc AS "passwordEnc",
        from_name AS "fromName",from_email AS "fromEmail",reply_to AS "replyTo",enabled
@@ -66,6 +66,9 @@ interface LockedFindingRow {
  assetId: string;
  assetCode: string;
  assetName: string;
+  companyId: string | null;
+  companyCode: string | null;
+  companyName: string | null;
  areaId: string | null;
  areaCode: string | null;
  areaName: string | null;
@@ -73,12 +76,6 @@ interface LockedFindingRow {
  status: string;
 }

-interface PlannedOperatorRow {
-  companyId: string;
-  companyCode: string;
-  companyName: string;
-}
-
@Injectable()
 export class InspectionVerificationsService {
  constructor(
@@ -145,19 +142,8 @@ export class InspectionVerificationsService {
      INNER JOIN inspection_visits source_visit ON source_visit.id = act.visit_id
      INNER JOIN assets asset ON asset.id = finding.asset_id
      INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
+      LEFT JOIN assets company ON company.id = asset.operator_company_id
      LEFT JOIN assets area ON area.id = asset.operational_area_id
-      LEFT JOIN LATERAL (
-        SELECT operator_company.id,operator_company.code,operator_company.name
-        FROM area_company_relations relation
-        INNER JOIN assets operator_company ON operator_company.id=relation.company_id
-        WHERE relation.area_id=asset.operational_area_id
-          AND relation.relation_role='OPERATOR'
-          AND relation.valid_from <= CURRENT_TIMESTAMP
-          AND (relation.valid_until IS NULL OR relation.valid_until > CURRENT_TIMESTAMP)
-          AND operator_company.information_status<>'INACTIVE'
-        ORDER BY relation.valid_from DESC,relation.created_at DESC,relation.id DESC
-        LIMIT 1
-      ) company ON true
      ${activeVisitJoin}
    `;

@@ -509,11 +495,15 @@ export class InspectionVerificationsService {
          finding.next_control_on AS "nextControlOn",
          asset.code AS "assetCode",
          asset.name AS "assetName",
+          company.id AS "companyId",
+          company.code AS "companyCode",
+          company.name AS "companyName",
          area.id AS "areaId",
          area.code AS "areaCode",
          area.name AS "areaName"
        FROM inspection_findings finding
        INNER JOIN assets asset ON asset.id = finding.asset_id
+        LEFT JOIN assets company ON company.id = asset.operator_company_id
        LEFT JOIN assets area ON area.id = asset.operational_area_id
        WHERE finding.id = ANY($1::uuid[])
        FOR UPDATE OF finding
@@ -529,51 +519,25 @@ export class InspectionVerificationsService {
          message: `${invalid.code} necesita estar abierto y tener una fecha de control para planificar su verificación`,
        });
      }
-      const missingArea = rows.find((row) => !row.areaId);
-      if (missingArea) {
+      const missingContext = rows.find((row) => !row.companyId || !row.areaId);
+      if (missingContext) {
        throw new BadRequestException({
          code: 'VERIFICATION_CONTEXT_REQUIRED',
-          message: `${missingArea.code} necesita un Área física antes de planificar la visita`,
+          message: `${missingContext.code} necesita empresa y área operativa antes de planificar la visita`,
        });
      }
+      const companyId = rows[0]?.companyId;
      const areaId = rows[0]?.areaId;
-      if (!areaId) {
-        throw new BadRequestException({ code: 'VERIFICATION_CONTEXT_REQUIRED', message: 'Los hallazgos necesitan un Área física' });
+      if (!companyId || !areaId) {
+        throw new BadRequestException({ code: 'VERIFICATION_CONTEXT_REQUIRED', message: 'Los hallazgos necesitan empresa y área operativa' });
      }
-      if (rows.some((row) => row.areaId !== areaId)) {
+      if (rows.some((row) => row.companyId !== companyId || row.areaId !== areaId)) {
        throw new BadRequestException({
          code: 'VERIFICATION_CONTEXT_MIXED',
-          message: 'Seleccioná hallazgos de una misma Área para crear una visita de verificación',
+          message: 'Seleccioná hallazgos de una misma empresa y área para crear una visita de verificación',
        });
      }

-      // A verification visit is a new operational act. Its operator is therefore
-      // the Company valid for the Area at the planned visit date, never the
-      // historical compatibility snapshot stored on the Inventory.
-      const [operator] = await manager.query(`
-        SELECT
-          company.id AS "companyId",
-          company.code AS "companyCode",
-          company.name AS "companyName"
-        FROM area_company_relations relation
-        INNER JOIN assets company ON company.id=relation.company_id
-        WHERE relation.area_id=$1::uuid
-          AND relation.relation_role='OPERATOR'
-          AND relation.valid_from <= $2::timestamptz
-          AND (relation.valid_until IS NULL OR relation.valid_until > $2::timestamptz)
-          AND company.information_status<>'INACTIVE'
-        ORDER BY relation.valid_from DESC,relation.created_at DESC,relation.id DESC
-        LIMIT 1
-        FOR SHARE OF relation
-      `, [areaId, plannedStartAt]) as PlannedOperatorRow[];
-      if (!operator) {
-        throw new ConflictException({
-          code: 'VERIFICATION_OPERATOR_NOT_ACTIVE',
-          message: 'El Área no tiene una Operadora vigente para la fecha prevista de la verificación',
-        });
-      }
-      const companyId = operator.companyId;
-
      const activeLinks = await manager.query(`
        SELECT verification_link.finding_id AS "findingId", visit.code
        FROM inspection_finding_verification_visits verification_link
@@ -588,7 +552,7 @@ export class InspectionVerificationsService {
        });
      }

-      const companyName = operator.companyName;
+      const companyName = rows[0]?.companyName ?? 'Empresa';
      const areaName = rows[0]?.areaName ?? 'Área';
      const code = await nextInspectionVisitCode(manager, plannedStartAt);
      const findingCodes = rows.map((row) => row.code).join(', ');
@@ -673,7 +637,6 @@ export class InspectionVerificationsService {
          areaId,
          findingIds,
          assetIds,
-          operatorSource: 'area_company_relations',
        },
      }, manager);

@@ -684,7 +647,7 @@ export class InspectionVerificationsService {
          status: visit.status,
          plannedStartAt: visit.plannedStartAt,
        },
-        company: { id: companyId, code: operator.companyCode, name: companyName },
+        company: { id: companyId, code: rows[0]?.companyCode ?? '', name: companyName },
        area: { id: areaId, code: rows[0]?.areaCode ?? '', name: areaName },
        findingCount: findingIds.length,
        assetCount: assetIds.length,
@@ -1,18 +1,9 @@
-import { IsISO8601, IsOptional, IsUUID } from 'class-validator';
+import { IsISO8601, IsUUID } from 'class-validator';

 export class CreateInspectionVisitDto {
  @IsUUID('4')
  operationalAreaId!: string;

-  /**
-   * Yacimiento concreto de la Inspección. Se mantiene opcional sólo para no
-   * romper clientes Android anteriores, que todavía abren una Inspección a
-   * nivel Área; la WEB F6.1 siempre lo envía.
-   */
-  @IsOptional()
-  @IsUUID('4')
-  scopeAssetId?: string;
-
  @IsUUID('4')
  operatorCompanyId!: string;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
admin	9f582be25e	chore(android): publish F6 APK artifact identity	2026-09-09 11:12:21 -03:00
admin	712cb167d3	fix(f6): separate technical and finding permissions	2026-09-09 11:09:29 -03:00
admin	3ea6ea772e	feat(f6): show exact classification findings in asset dossier	2026-09-09 11:06:14 -03:00
admin	4ae339cc5c	test(f6): advance Android installable cut contract	2026-09-09 11:04:38 -03:00
admin	560734c0b8	test(f6): advance health metadata contract	2026-09-09 11:04:21 -03:00
admin	a3f642d13f	chore(android): bump F6 debug version	2026-09-09 10:58:20 -03:00
admin	17fb0d2d15	chore(f6): bump WEB package version	2026-09-09 10:58:01 -03:00
admin	0e64007996	chore(f6): bump API package version	2026-09-09 10:57:47 -03:00
admin	709f43c1e9	chore(f6): publish API phase metadata	2026-09-09 10:57:30 -03:00
admin	ab5ce42d47	test(f6): lock definitive inventory and mobile contracts	2026-09-09 10:48:50 -03:00
admin	3f71323555	test(f6): retire one-to-one family expectation	2026-09-09 10:47:53 -03:00
admin	f3b72ecfc3	feat(android): browse field inventory as strict hierarchy	2026-09-09 10:43:53 -03:00
admin	5c5e5de26b	fix(f6): gate mobile findings by area ancestry and temporal operator	2026-09-09 10:42:03 -03:00
admin	792b115449	fix(f6): resolve field findings by technical classification	2026-09-09 10:41:17 -03:00
admin	46cb5e0eb9	fix(f6): allow atomic field classification handoff	2026-09-09 10:40:57 -03:00
admin	8708c9c93f	feat(f6): agregar datos técnicos por clasificación a la ficha	2026-09-09 09:34:55 -03:00
admin	2186810be3	feat(f6): agregar API de valores técnicos por objeto	2026-09-09 09:34:25 -03:00
admin	052384bfe0	feat(f6): registrar servicio de valores técnicos	2026-09-09 09:33:56 -03:00
admin	a758c9528a	feat(f6): exponer valores técnicos por objeto	2026-09-09 09:33:39 -03:00
admin	5023685043	feat(f6): persistir y validar valores técnicos del Inventario	2026-09-09 09:33:28 -03:00
admin	d05ea8405a	feat(f6): agregar DTO de valores técnicos por objeto	2026-09-09 09:33:02 -03:00
admin	dc0e1d9762	feat(f6): filtrar subinstalaciones por compatibilidad múltiple	2026-09-09 09:27:14 -03:00
admin	3f662b86ea	feat(f6): mostrar compatibilidades múltiples en catálogo	2026-09-09 09:26:32 -03:00
admin	636be088e8	feat(f6): consolidar configuración técnica por clasificación	2026-09-09 09:25:57 -03:00
admin	96738bfdcb	feat(f6): consumir compatibilidades y campos técnicos de familias	2026-09-09 09:24:06 -03:00
admin	0b074923be	feat(f6): aplicar compatibilidad múltiple al alta de Inventarios	2026-09-09 09:23:32 -03:00
admin	e181dea4cb	feat(f6): exponer campos técnicos por clasificación	2026-09-09 09:22:31 -03:00
admin	76163a5ebb	feat(f6): administrar compatibilidades y campos técnicos por familia	2026-09-09 09:22:13 -03:00
admin	74516ede1e	feat(f6): agregar DTOs de campos técnicos por clasificación	2026-09-09 09:20:59 -03:00
admin	9f09aca30f	feat(f6): aceptar compatibilidades múltiples por clasificación	2026-09-09 09:18:33 -03:00
admin	169aab5cd3	feat(f6): solidificar compatibilidades y campos técnicos por clasificación	2026-09-09 09:18:16 -03:00