F3.2 Android: permitir preparar Actas de verificación sin Hallazgos nuevos

F3.2 Android: permitir Actas READY paralelas y delegar cierre al servidor
F3.2 Android: corregir Card clickeable de mensajes
2026-09-07 16:50:17 -03:00 · 2026-09-07 16:43:24 -03:00 · 2026-09-07 16:35:37 -03:00 · 2026-09-07 16:34:33 -03:00 · 2026-09-07 16:26:48 -03:00 · 2026-09-07 16:26:32 -03:00
101 changed files with 11832 additions and 410 deletions
@@ -0,0 +1,64 @@
+name: Android APK
+# F3.2: genera la APK debug verificable antes de promover la integración multi-Acta.
+
+on:
+  push:
+    branches:
+      - 'feature/f2-2*'
+      - 'feature/f2-3*'
+      - 'feature/f2-4*'
+      - 'feature/f3-1*'
+      - 'feature/f3-2*'
+    paths:
+      - 'android-app/**'
+      - '.github/workflows/android.yml'
+  pull_request:
+    paths:
+      - 'android-app/**'
+      - 'api-v3/src/auth/**'
+      - '.github/workflows/android.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build-debug-apk:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Java 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '17'
+
+      - name: Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Android API 36
+        run: sdkmanager 'platforms;android-36' 'build-tools;36.0.0'
+
+      - name: Gradle 8.13
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: '8.13'
+
+      - name: Assemble debug
+        working-directory: android-app
+        run: gradle --no-daemon :app:assembleDebug
+
+      - name: Unit tests
+        working-directory: android-app
+        run: gradle --no-daemon :app:testDebugUnitTest
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: DH-Inspeccion-F3.2-0.12.0-debug
+          path: android-app/app/build/outputs/apk/debug/app-debug.apk
+          if-no-files-found: error
+          retention-days: 14
@@ -47,6 +47,8 @@ jobs:
          cache-dependency-path: web-v2/package-lock.json
      - run: npm ci
      - run: npm run typecheck
+      - name: F3.1 WEB contract
+        run: bash ../scripts/check-f3-1-web-contract.sh
      - run: npm run build

  contract:
@@ -62,5 +64,15 @@ jobs:
          done < <(find scripts -type f -name '*.sh' -print0)
      - name: Validate Compose
        run: docker compose --env-file .env.example config >/dev/null
+      - name: VPS-equivalent isolated API preflight
+        run: |
+          set -Eeuo pipefail
+          image="dhv2-api:ci-vps-preflight-${GITHUB_SHA::12}"
+          docker build --target builder -t "$image" api-v3
+          docker run --rm \
+            -v "$PWD/api-v3/test:/app/test:ro" \
+            -v "$PWD/api-v3/tsconfig.test.json:/app/tsconfig.test.json:ro" \
+            "$image" npm test
+          docker image rm "$image" >/dev/null 2>&1 || true
      - name: Build production images
        run: docker compose --env-file .env.example build api migrate web
@@ -0,0 +1,136 @@
+name: F2.2 Integration CI
+
+on:
+  push:
+    branches:
+      - 'feature/f2-2*'
+    paths:
+      - 'api-v3/**'
+      - 'web-v2/**'
+      - 'scripts/**'
+      - 'docker-compose.yml'
+      - '.github/workflows/f2-2-ci.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  api:
+    name: API · typecheck, tests, build
+    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
+      - run: npm ci
+      - run: npm run typecheck
+      - run: npm test
+      - run: npm run build
+
+  migrations:
+    name: DB · migrations on PostgreSQL 16/PostGIS
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgis/postgis:16-3.4
+        env:
+          POSTGRES_USER: dhv2_owner
+          POSTGRES_PASSWORD: owner_test_password
+          POSTGRES_DB: dhv2_ci
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd "pg_isready -U dhv2_owner -d dhv2_ci"
+          --health-interval 5s
+          --health-timeout 5s
+          --health-retries 20
+    env:
+      DB_HOST: 127.0.0.1
+      DB_PORT: 5432
+      DB_NAME: dhv2_ci
+      DB_MIGRATION_USER: dhv2_owner
+      DB_MIGRATION_PASSWORD: owner_test_password
+      DB_APP_USER: dhv2_app
+    defaults:
+      run:
+        working-directory: api-v3
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: api-v3/package-lock.json
+      - name: PostgreSQL client
+        run: |
+          command -v psql >/dev/null || {
+            sudo apt-get update
+            sudo apt-get install -y postgresql-client
+          }
+      - name: Prepare roles and extensions
+        env:
+          PGPASSWORD: owner_test_password
+        run: |
+          psql -v ON_ERROR_STOP=1 -h 127.0.0.1 -U dhv2_owner -d dhv2_ci <<'SQL'
+          CREATE EXTENSION IF NOT EXISTS postgis;
+          CREATE EXTENSION IF NOT EXISTS pgcrypto;
+          DO $$
+          BEGIN
+            IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname='dhv2_app') THEN
+              CREATE ROLE dhv2_app LOGIN PASSWORD 'app_test_password';
+            END IF;
+          END
+          $$;
+          GRANT CONNECT ON DATABASE dhv2_ci TO dhv2_app;
+          GRANT USAGE ON SCHEMA public TO dhv2_app;
+
+          -- This reset was a one-time late production operation. It is marked as
+          -- executed on the clean CI database so the historical schema can be
+          -- constructed chronologically without running that production-only wipe.
+          CREATE TABLE IF NOT EXISTS typeorm_migrations (
+            id SERIAL PRIMARY KEY,
+            timestamp bigint NOT NULL,
+            name varchar NOT NULL
+          );
+          INSERT INTO typeorm_migrations (timestamp,name)
+          VALUES (1788652800000,'ResetProductionOperationalData1788652800000');
+          SQL
+      - run: npm ci
+      - run: npm run build
+      - name: Run every pending migration
+        run: npm run migration:run
+      - name: Assert no pending migrations
+        run: |
+          npm run migration:show | tee /tmp/migrations.txt
+          grep -Fq 'Pending migrations: no' /tmp/migrations.txt
+      - name: Assert F2.2.1 reference import
+        env:
+          PGPASSWORD: owner_test_password
+        run: |
+          test "$(psql -At -h 127.0.0.1 -U dhv2_owner -d dhv2_ci -c "SELECT count(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE a.data_origin='IMPORT' AND a.source_name='Tablas de yacimiento(1).xlsx' AND lower(t.code)='yacimiento'")" = "230"
+          test "$(psql -At -h 127.0.0.1 -U dhv2_owner -d dhv2_ci -c "SELECT count(*) FROM assets WHERE (operational_area_id IS NULL) <> (operator_company_id IS NULL)")" = "0"
+          test "$(psql -At -h 127.0.0.1 -U dhv2_owner -d dhv2_ci -c "SELECT count(*) FROM source_documents WHERE document_number IN ('DH-F221-TERRITORIO','DH-F221-APP')")" = "2"
+
+  web:
+    name: WEB · typecheck, build
+    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
+      - run: npm ci
+      - run: npm run typecheck
+      - run: npm run build
@@ -0,0 +1,62 @@
+name: F2.3 Field Finding CI
+
+on:
+  push:
+    branches:
+      - 'feature/f2-3*'
+    paths:
+      - 'api-v3/**'
+      - '.github/workflows/f2-3-ci.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  api:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    defaults:
+      run:
+        working-directory: api-v3
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Node 24
+        uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: api-v3/package-lock.json
+      - name: Install
+        run: npm ci
+      - name: Typecheck
+        run: npm run typecheck 2>&1 | tee typecheck.log
+      - name: Upload TypeScript diagnostic
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: f2-3-typecheck-diagnostic
+          path: api-v3/typecheck.log
+          if-no-files-found: warn
+          retention-days: 3
+      - name: Tests
+        run: npm test 2>&1 | tee test.log
+      - name: Upload test diagnostic
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: f2-3-test-diagnostic
+          path: api-v3/test.log
+          if-no-files-found: warn
+          retention-days: 3
+      - name: Build
+        run: npm run build 2>&1 | tee build.log
+      - name: Upload build diagnostic
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: f2-3-build-diagnostic
+          path: api-v3/build.log
+          if-no-files-found: warn
+          retention-days: 3
@@ -0,0 +1,205 @@
+name: F3.1 Inventory CI
+
+on:
+  push:
+    branches:
+      - 'feature/f3-1*'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  api:
+    runs-on: ubuntu-latest
+    timeout-minutes: 25
+    defaults:
+      run:
+        working-directory: api-v3
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: api-v3/package-lock.json
+      - run: npm ci
+      - name: Typecheck
+        run: npm run typecheck 2>&1 | tee typecheck.log
+      - name: Tests
+        run: npm test 2>&1 | tee test.log
+      - name: Build
+        run: npm run build 2>&1 | tee build.log
+      - name: Diagnostics
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: f3-1-api-diagnostics
+          path: |
+            api-v3/typecheck.log
+            api-v3/test.log
+            api-v3/build.log
+          if-no-files-found: warn
+          retention-days: 3
+
+  migrations:
+    name: DB · F3.1 on PostgreSQL 16/PostGIS
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    services:
+      postgres:
+        image: postgis/postgis:16-3.4
+        env:
+          POSTGRES_USER: dhv2_owner
+          POSTGRES_PASSWORD: owner_test_password
+          POSTGRES_DB: dhv2_ci
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd "pg_isready -U dhv2_owner -d dhv2_ci"
+          --health-interval 5s
+          --health-timeout 5s
+          --health-retries 20
+    env:
+      DB_HOST: 127.0.0.1
+      DB_PORT: 5432
+      DB_NAME: dhv2_ci
+      DB_MIGRATION_USER: dhv2_owner
+      DB_MIGRATION_PASSWORD: owner_test_password
+      DB_APP_USER: dhv2_app
+    defaults:
+      run:
+        working-directory: api-v3
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: api-v3/package-lock.json
+      - name: PostgreSQL client
+        run: |
+          command -v psql >/dev/null || {
+            sudo apt-get update
+            sudo apt-get install -y postgresql-client
+          }
+      - name: Prepare roles and extensions
+        env:
+          PGPASSWORD: owner_test_password
+        run: |
+          psql -v ON_ERROR_STOP=1 -h 127.0.0.1 -U dhv2_owner -d dhv2_ci <<'SQL'
+          CREATE EXTENSION IF NOT EXISTS postgis;
+          CREATE EXTENSION IF NOT EXISTS pgcrypto;
+          DO $$
+          BEGIN
+            IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname='dhv2_app') THEN
+              CREATE ROLE dhv2_app LOGIN PASSWORD 'app_test_password';
+            END IF;
+          END
+          $$;
+          GRANT CONNECT ON DATABASE dhv2_ci TO dhv2_app;
+          GRANT USAGE ON SCHEMA public TO dhv2_app;
+
+          CREATE TABLE IF NOT EXISTS typeorm_migrations (
+            id SERIAL PRIMARY KEY,
+            timestamp bigint NOT NULL,
+            name varchar NOT NULL
+          );
+          INSERT INTO typeorm_migrations (timestamp,name)
+          VALUES (1788652800000,'ResetProductionOperationalData1788652800000');
+          SQL
+      - run: npm ci
+      - run: npm run build
+      - name: Run every pending migration
+        run: npm run migration:run
+      - name: Assert no pending migrations
+        run: |
+          npm run migration:show | tee /tmp/migrations.txt
+          grep -Fq 'Pending migrations: no' /tmp/migrations.txt
+      - name: Assert F3.1 structure, merges and Inspector profile
+        env:
+          PGPASSWORD: owner_test_password
+        run: |
+          set -Eeuo pipefail
+
+          query() {
+            psql -At -v ON_ERROR_STOP=1 \
+              -h 127.0.0.1 \
+              -U dhv2_owner \
+              -d dhv2_ci \
+              -c "$1"
+          }
+
+          assert_eq() {
+            local expected="$1"
+            local sql="$2"
+            local actual
+            actual="$(query "$sql")"
+            if [ "$actual" != "$expected" ]; then
+              echo "ASSERT FAILED"
+              echo "SQL: $sql"
+              echo "Expected: $expected"
+              echo "Actual:   $actual"
+              exit 1
+            fi
+          }
+
+          assert_eq 15 "SELECT count(*) FROM inventory_families WHERE level='INSTALLATION' AND is_active=true"
+          assert_eq 124 "SELECT count(*) FROM inventory_families WHERE level='SUBINSTALLATION' AND is_active=true"
+          assert_eq 16 "SELECT count(*) FROM inventory_families WHERE source_reference LIKE 'SYSTEM:F3.1:OTHER%'"
+          assert_eq 1 "SELECT count(*) FROM finding_categories WHERE lower(code)='app26r2' AND is_active=true"
+          assert_eq 1 "SELECT count(*) FROM finding_categories WHERE lower(code)='app26' AND is_active=false"
+
+          assert_eq 1 "SELECT count(*) FROM information_schema.tables WHERE table_name='asset_merges'"
+          assert_eq 1 "SELECT count(*) FROM pg_trigger WHERE tgname='trg_asset_merges_append_only' AND NOT tgisinternal"
+          assert_eq 1 "SELECT count(*) FROM information_schema.tables WHERE table_name='finding_catalog_item_merges'"
+          assert_eq 1 "SELECT count(*) FROM pg_trigger WHERE tgname='trg_finding_catalog_item_merges_append_only' AND NOT tgisinternal"
+
+          assert_eq 4 "SELECT count(*) FROM information_schema.columns WHERE table_name='users' AND column_name IN ('dni','phone','job_title','employee_number')"
+          assert_eq 2 "SELECT count(*) FROM pg_trigger WHERE tgname IN ('trg_user_roles_inspector_email','trg_users_inspector_email') AND NOT tgisinternal"
+          assert_eq 1 "SELECT count(*) FROM information_schema.columns WHERE table_name='inspection_document_deliveries' AND column_name='recipient_user_id'"
+          assert_eq 1 "SELECT count(*) FROM pg_constraint WHERE conname='chk_inspection_document_deliveries_recipient_kind' AND pg_get_constraintdef(oid) LIKE '%INSPECTOR%'"
+          assert_eq 1 "SELECT count(*) FROM pg_constraint WHERE conname='fk_inspection_document_deliveries_recipient_user'"
+
+          assert_eq 230 "SELECT count(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE a.data_origin='IMPORT' AND a.source_name='Tablas de yacimiento(1).xlsx' AND lower(t.code)='yacimiento'"
+          assert_eq 0 "SELECT count(*) FROM assets WHERE (operational_area_id IS NULL) <> (operator_company_id IS NULL)"
+
+  web:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    defaults:
+      run:
+        working-directory: web-v2
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: web-v2/package-lock.json
+      - run: npm ci
+      - name: Typecheck
+        run: npm run typecheck 2>&1 | tee typecheck.log
+      - name: Build
+        run: npm run build 2>&1 | tee build.log
+      - name: Diagnostics
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: f3-1-web-diagnostics
+          path: |
+            web-v2/typecheck.log
+            web-v2/build.log
+          if-no-files-found: warn
+          retention-days: 3
+
+  docker:
+    needs: [api, web, migrations]
+    runs-on: ubuntu-latest
+    timeout-minutes: 25
+    steps:
+      - uses: actions/checkout@v4
+      - name: Validate Compose
+        run: docker compose --env-file .env.example config >/dev/null
+      - name: Build production images
+        run: docker compose --env-file .env.example build api migrate web
@@ -0,0 +1,80 @@
+name: F3.2 Multi-Acta CI
+
+on:
+  push:
+    branches:
+      - 'feature/f3-2*'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  api:
+    name: API · F3.2
+    runs-on: ubuntu-latest
+    timeout-minutes: 25
+    defaults:
+      run:
+        working-directory: api-v3
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: api-v3/package-lock.json
+      - run: npm ci
+      - name: Typecheck
+        run: npm run typecheck
+      - name: Tests
+        run: npm test
+      - name: Build
+        run: npm run build
+
+  web:
+    name: WEB · regression
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    defaults:
+      run:
+        working-directory: web-v2
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: web-v2/package-lock.json
+      - run: npm ci
+      - run: npm run typecheck
+      - name: F3.1 structural WEB contract
+        run: bash ../scripts/check-f3-1-web-contract.sh
+      - run: npm run build
+
+  deploy-preflight:
+    name: VPS-equivalent preflight / Docker
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    needs: [api, web]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Validate shell scripts
+        run: |
+          while IFS= read -r -d '' script; do
+            bash -n "$script"
+          done < <(find scripts -type f -name '*.sh' -print0)
+      - name: Validate Compose
+        run: docker compose --env-file .env.example config >/dev/null
+      - name: VPS-equivalent isolated API tests
+        run: |
+          set -Eeuo pipefail
+          image="dhv2-api:f3-2-preflight-${GITHUB_SHA::12}"
+          docker build --target builder -t "$image" api-v3
+          docker run --rm \
+            -v "$PWD/api-v3/test:/app/test:ro" \
+            -v "$PWD/api-v3/tsconfig.test.json:/app/tsconfig.test.json:ro" \
+            "$image" npm test
+          docker image rm "$image" >/dev/null 2>&1 || true
+      - name: Build production images
+        run: docker compose --env-file .env.example build api migrate web
@@ -1,35 +1,10 @@
-# DH Inspección V2 · D5.6.2
-
-Hotfix de mantenimiento de Fase D para accesos Android y contrato de regresión de cierre.
-
 # DH Inspección V2

-Versión: **0.19.5-1**  
-Fase: **D5.5.1 · Corrección de staging de planificación**
+Repositorio del sistema DH Inspección V2.

-D5.5.1 conserva íntegramente D5.5 y corrige únicamente el contrato de pruebas de staging. D5.5 consolida la preparación de visitas desde oficina antes del trabajo de campo. La visita queda anclada explícitamente a Área y Organización operadora, y el sistema genera un checklist auditable con antecedentes, respuestas vencidas, controles vencidos y próximos controles.
+## Estructura

-## Alcance D5.5
-
- selección web Área → Organización operadora vigente;
- fecha y equipo inspector dentro del plan;
- checklist automático versionado y append-only;
- respuestas de empresa vencidas y controles de verificación vencidos;
- próximos controles dentro de 30 días de la fecha planificada;
- antecedentes históricos del mismo contexto;
- incorporación automática de registros accionables;
- alta manual de registros preventivos del mismo Área/Operadora;
- exclusiones sólo mediante motivo auditable;
- reincorporación sin borrar la exclusión histórica;
- visitas de verificación integradas al mismo contrato de planificación;
- cambio de contexto o fecha invalida el checklist hasta regeneración explícita;
- inicio de visita exclusivamente desde APK mediante la política móvil ya existente.
-
-## Migración
-
-`1789063200000-phase-d5-5-web-planning-checklist.ts`  
-`PhaseD55WebPlanningChecklist1789063200000`
-
-## Despliegue
-
-El despliegue debe partir exactamente de API/WEB **0.19.4-1** y ejecutar `scripts/deploy-phase-d5-5.sh`. Antes de modificar producción, el script compila API y web en staging y exige **252 tests** aprobados.
+- `api-v3/`: API v3.
+- `web-v2/`: aplicación web.
+- `scripts/`: utilidades operativas y de despliegue.
+- `docs/`: documentación técnica.
@@ -0,0 +1,80 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
+}
+
+android {
+    namespace = "com.korexlabs.dhinspeccion"
+    compileSdk = 36
+
+    defaultConfig {
+        applicationId = "com.korexlabs.dhinspeccion"
+        minSdk = 26
+        targetSdk = 36
+        versionCode = 19
+        versionName = "0.12.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
+        buildConfigField("String", "API_BASE_URL", "\"https://dhv2.korexlabs.com/api/v3/\"")
+    }
+
+    buildTypes {
+        debug {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
+        }
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+            // La firma de release NO se redefine aquí. Se conservará la clave histórica.
+        }
+    }
+
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions.jvmTarget = "17"
+
+    packaging.resources.excludes += "/META-INF/{AL2.0,LGPL2.1}"
+}
+
+dependencies {
+    val composeBom = platform("androidx.compose:compose-bom:2025.08.01")
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+
+    implementation("androidx.core:core-ktx:1.17.0")
+    implementation("androidx.activity:activity-compose:1.10.1")
+    implementation("androidx.fragment:fragment-ktx:1.8.9")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.2")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2")
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.material:material-icons-extended")
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    implementation("androidx.biometric:biometric:1.1.0")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
+    implementation("com.squareup.retrofit2:retrofit:2.11.0")
+    implementation("com.squareup.retrofit2:converter-moshi:2.11.0")
+    implementation("com.squareup.moshi:moshi-kotlin:1.15.2")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation("com.google.android.gms:play-services-location:21.3.0")
+    implementation("androidx.exifinterface:exifinterface:1.4.1")
+
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.2.1")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
+}
@@ -0,0 +1 @@
+# DH Inspección V2. Las reglas se ampliarán cuando se habilite minificación de release.
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <application
+        android:allowBackup="false"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.DHInspeccion"
+        android:usesCleartextTraffic="false">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.files"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+    </application>
+</manifest>
@@ -0,0 +1,19 @@
+package com.korexlabs.dhinspeccion
+
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.korexlabs.dhinspeccion.ui.DhRoot
+
+class MainActivity : FragmentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContent {
+            val model: MainViewModel = viewModel()
+            DhRoot(model, this@MainActivity)
+        }
+    }
+}
@@ -0,0 +1,631 @@
+package com.korexlabs.dhinspeccion
+
+import android.app.Application
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import com.korexlabs.dhinspeccion.data.CreateFieldFindingRequest
+import com.korexlabs.dhinspeccion.data.CreateFieldInventoryRequest
+import com.korexlabs.dhinspeccion.data.DhRepository
+import com.korexlabs.dhinspeccion.data.FieldAssetDetail
+import com.korexlabs.dhinspeccion.data.FieldFindingEvidence
+import com.korexlabs.dhinspeccion.data.FieldFindingItem
+import com.korexlabs.dhinspeccion.data.FieldFindingOptionsResponse
+import com.korexlabs.dhinspeccion.data.FieldFindingsRepository
+import com.korexlabs.dhinspeccion.data.FieldInventoryItem
+import com.korexlabs.dhinspeccion.data.FieldType
+import com.korexlabs.dhinspeccion.data.MobileActClosure
+import com.korexlabs.dhinspeccion.data.MobileActDetail
+import com.korexlabs.dhinspeccion.data.MobileActSummary
+import com.korexlabs.dhinspeccion.data.MobileActsRepository
+import com.korexlabs.dhinspeccion.data.MobileResponsibleRequest
+import com.korexlabs.dhinspeccion.data.StoredSession
+import com.korexlabs.dhinspeccion.data.VisitDetail
+import com.korexlabs.dhinspeccion.data.VisitSummary
+import kotlinx.coroutines.launch
+import java.io.File
+import java.time.Instant
+
+class MainViewModel(application: Application) : AndroidViewModel(application) {
+    private val repository = DhRepository(application)
+    private val findingsRepository = FieldFindingsRepository(application)
+    private val actsRepository = MobileActsRepository(application)
+
+    var session: StoredSession? by mutableStateOf(repository.currentSession())
+        private set
+    var busy by mutableStateOf(false)
+        private set
+    var error: String? by mutableStateOf(null)
+        private set
+    var notice: String? by mutableStateOf(null)
+        private set
+
+    var visits: List<VisitSummary> by mutableStateOf(emptyList())
+        private set
+    var visit: VisitDetail? by mutableStateOf(null)
+        private set
+
+    var inventory: List<FieldInventoryItem> by mutableStateOf(emptyList())
+        private set
+    var fieldTypes: List<FieldType> by mutableStateOf(emptyList())
+        private set
+    var selectedFieldAsset: FieldAssetDetail? by mutableStateOf(null)
+        private set
+
+    var acts: List<MobileActSummary> by mutableStateOf(emptyList())
+        private set
+    var selectedAct: MobileActDetail? by mutableStateOf(null)
+        private set
+    var actClosure: MobileActClosure? by mutableStateOf(null)
+        private set
+
+    var fieldFindingOptions: FieldFindingOptionsResponse? by mutableStateOf(null)
+        private set
+    var lastCreatedFinding: FieldFindingItem? by mutableStateOf(null)
+        private set
+    var fieldFindingEvidence: Map<String, List<FieldFindingEvidence>> by mutableStateOf(emptyMap())
+        private set
+
+    init {
+        if (session != null) loadVisits()
+    }
+
+    fun clearMessages() {
+        error = null
+        notice = null
+    }
+
+    fun login(identifier: String, password: String) {
+        if (identifier.isBlank() || password.isBlank()) {
+            error = "Ingresá usuario y contraseña."
+            return
+        }
+        launchBusy {
+            session = repository.login(identifier, password)
+            notice = "Sesión iniciada."
+            loadVisitsInternal()
+        }
+    }
+
+    fun logout() {
+        viewModelScope.launch {
+            runCatching { repository.logout() }
+            session = null
+            visits = emptyList()
+            visit = null
+            inventory = emptyList()
+            fieldTypes = emptyList()
+            selectedFieldAsset = null
+            clearActState()
+            clearFindingState()
+        }
+    }
+
+    fun loadVisits() = launchBusy { loadVisitsInternal() }
+
+    private suspend fun loadVisitsInternal() {
+        visits = repository.visits().data
+    }
+
+    fun openVisit(id: String) = launchBusy {
+        visit = repository.visit(id)
+        inventory = emptyList()
+        fieldTypes = emptyList()
+        selectedFieldAsset = null
+        clearFindingState()
+        loadActsInternal(id, selectDraft = true)
+    }
+
+    fun closeVisitView() {
+        visit = null
+        inventory = emptyList()
+        fieldTypes = emptyList()
+        selectedFieldAsset = null
+        clearActState()
+        clearFindingState()
+        loadVisits()
+    }
+
+    fun startVisit() {
+        val id = visit?.id ?: return
+        launchBusy {
+            visit = repository.startVisit(id)
+            notice = "Inspección iniciada."
+            loadActsInternal(id, selectDraft = true)
+            loadVisitsInternal()
+        }
+    }
+
+    fun reloadActs() {
+        val visitId = visit?.id ?: return
+        launchBusy { loadActsInternal(visitId, selectDraft = selectedAct == null) }
+    }
+
+    fun selectAct(actId: String) {
+        launchBusy {
+            selectedAct = actsRepository.get(actId)
+            actClosure = actsRepository.closure(actId)
+            clearFindingState()
+        }
+    }
+
+    fun createActForSelectedInventory() {
+        val currentVisit = visit ?: return
+        val asset = selectedFieldAsset?.asset
+        if (currentVisit.status != "IN_PROGRESS") {
+            error = "La inspección debe estar en curso para crear un Acta."
+            return
+        }
+        if (asset == null) {
+            error = "Seleccioná primero una Instalación o Subinstalación para iniciar el Acta."
+            return
+        }
+        if (acts.any { it.status == "DRAFT" }) {
+            error = "Ya existe un Acta en borrador. Cerrala o cancelala antes de crear la siguiente."
+            return
+        }
+        launchBusy {
+            val created = actsRepository.create(currentVisit.id, asset.id, currentVisit.code)
+            selectedAct = created
+            actClosure = actsRepository.closure(created.id)
+            loadActsInternal(currentVisit.id, selectDraft = false)
+            notice = "${created.code} creada. Los Hallazgos nuevos quedarán vinculados explícitamente a esta Acta."
+            if (selectedFieldAsset?.capture?.readyForFinding == true) {
+                loadFindingOptionsInternal(currentVisit.id, asset.id, created.id)
+            }
+        }
+    }
+
+    fun searchInventory(search: String, parentId: String? = null) {
+        val id = visit?.id ?: return
+        launchBusy {
+            inventory = repository.fieldInventory(id, search, parentId).data
+        }
+    }
+
+    fun loadFieldTypes(parentId: String? = null) {
+        val id = visit?.id ?: return
+        launchBusy {
+            fieldTypes = repository.fieldTypes(id, parentId).data
+        }
+    }
+
+    fun selectExisting(item: FieldInventoryItem) {
+        val visitId = visit?.id ?: return
+        launchBusy {
+            selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
+            notice = "Inventario agregado a la inspección."
+            inventory = repository.fieldInventory(visitId, null, null).data
+            val draft = selectedDraftAct()
+            if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
+                selectedAct = actsRepository.ensureAsset(draft.id, item.id)
+                loadActsInternal(visitId, selectDraft = false)
+                loadFindingOptionsInternal(visitId, item.id, draft.id)
+            } else if (selectedFieldAsset?.capture?.readyForFinding == true) {
+                notice = "Inventario listo. Creá o seleccioná un Acta antes de registrar Hallazgos."
+            }
+        }
+    }
+
+    fun createFieldAsset(
+        type: FieldType,
+        parentId: String?,
+        familyId: String?,
+        name: String,
+        commonName: String?,
+        attributes: Map<String, Any?>,
+        latitude: Double,
+        longitude: Double,
+        accuracyM: Double?,
+    ) {
+        val visitId = visit?.id ?: return
+        if (visit?.status != "IN_PROGRESS") {
+            error = "La inspección debe estar en curso para dar de alta Inventario."
+            return
+        }
+        if (type.familyRequired && familyId == null) {
+            error = "Elegí una familia técnica o la opción Otro / no catalogado."
+            return
+        }
+        launchBusy {
+            val request = CreateFieldInventoryRequest(
+                typeId = type.id,
+                parentId = parentId,
+                familyId = familyId,
+                name = name.trim(),
+                commonName = commonName?.trim()?.takeIf { it.isNotBlank() },
+                attributes = attributes,
+                deviceLatitude = latitude,
+                deviceLongitude = longitude,
+                deviceAccuracyM = accuracyM,
+                deviceCapturedAt = Instant.now().toString(),
+            )
+            selectedFieldAsset = repository.createFieldAsset(visitId, request)
+            notice = "Inventario creado con GPS. Falta la fotografía obligatoria. Si ya existía, podés fusionarlo antes de continuar."
+            inventory = repository.fieldInventory(visitId, null, null).data
+        }
+    }
+
+    fun mergeCreatedFieldAsset(canonicalAssetId: String, reason: String) {
+        val visitId = visit?.id ?: return
+        val source = selectedFieldAsset?.asset ?: return
+        if (canonicalAssetId.isBlank()) {
+            error = "Elegí el registro existente que se conservará."
+            return
+        }
+        if (reason.trim().length < 8) {
+            error = "Explicá brevemente por qué se trata de un duplicado."
+            return
+        }
+        launchBusy {
+            val result = repository.mergeFieldAsset(
+                visitId = visitId,
+                assetId = source.id,
+                canonicalAssetId = canonicalAssetId,
+                reason = reason,
+            )
+            selectedFieldAsset = repository.selectFieldAsset(visitId, result.canonical.id)
+            notice = "Fusión registrada. Se conserva ${result.canonical.code} y la historia de ${result.source.code} permanece trazable."
+            inventory = repository.fieldInventory(visitId, null, null).data
+            val draft = selectedDraftAct()
+            if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
+                selectedAct = actsRepository.ensureAsset(draft.id, result.canonical.id)
+                loadActsInternal(visitId, selectDraft = false)
+                loadFindingOptionsInternal(visitId, result.canonical.id, draft.id)
+            }
+        }
+    }
+
+    fun uploadFieldPhoto(
+        file: File,
+        latitude: Double,
+        longitude: Double,
+        accuracyM: Double?,
+    ) {
+        val visitId = visit?.id ?: return
+        val asset = selectedFieldAsset?.asset ?: return
+        launchBusy {
+            val response = repository.uploadFieldPhoto(
+                visitId = visitId,
+                assetId = asset.id,
+                file = file,
+                latitude = latitude,
+                longitude = longitude,
+                accuracyM = accuracyM,
+            )
+            selectedFieldAsset = selectedFieldAsset?.copy(capture = response.capture)
+            notice = if (response.capture.readyForFinding) {
+                "Captura completa: GPS y fotografía registrados."
+            } else {
+                "Fotografía registrada."
+            }
+            inventory = repository.fieldInventory(visitId, null, null).data
+            val draft = selectedDraftAct()
+            if (response.capture.readyForFinding && draft != null) {
+                selectedAct = actsRepository.ensureAsset(draft.id, asset.id)
+                loadActsInternal(visitId, selectDraft = false)
+                loadFindingOptionsInternal(visitId, asset.id, draft.id)
+            } else if (response.capture.readyForFinding) {
+                notice = "Inventario listo. Creá o seleccioná un Acta antes de registrar Hallazgos."
+            }
+        }
+    }
+
+    fun openFindingForSelected() {
+        val visitId = visit?.id ?: return
+        val assetId = selectedFieldAsset?.asset?.id ?: return
+        val draft = selectedDraftAct()
+        if (draft == null) {
+            error = "Creá o seleccioná el Acta en borrador antes de registrar Hallazgos."
+            return
+        }
+        launchBusy {
+            selectedAct = actsRepository.ensureAsset(draft.id, assetId)
+            loadActsInternal(visitId, selectDraft = false)
+            loadFindingOptionsInternal(visitId, assetId, draft.id)
+        }
+    }
+
+    fun createFieldFinding(
+        catalogItemId: String?,
+        customTitle: String?,
+        customLegalBasis: String?,
+        description: String,
+        severity: Int?,
+        correctionDueOn: String?,
+    ) {
+        val visitId = visit?.id ?: return
+        val assetId = selectedFieldAsset?.asset?.id ?: return
+        val actId = selectedDraftAct()?.id
+        if (actId == null) {
+            error = "No hay un Acta en borrador seleccionada."
+            return
+        }
+        if (description.isBlank()) {
+            error = "Describí el Hallazgo antes de guardarlo."
+            return
+        }
+        if (catalogItemId == null && customTitle.isNullOrBlank()) {
+            error = "Para OTROS, indicá un título para el Hallazgo."
+            return
+        }
+        if (severity != null && severity !in 1..10) {
+            error = "La gravedad debe estar entre 1 y 10."
+            return
+        }
+        launchBusy {
+            selectedAct = actsRepository.ensureAsset(actId, assetId)
+            val response = findingsRepository.create(
+                visitId,
+                assetId,
+                CreateFieldFindingRequest(
+                    actId = actId,
+                    catalogItemId = catalogItemId,
+                    customTitle = customTitle?.trim()?.takeIf { it.isNotBlank() },
+                    customLegalBasis = customLegalBasis?.trim()?.takeIf { it.isNotBlank() },
+                    description = description.trim(),
+                    severity = severity,
+                    correctionDueOn = correctionDueOn?.trim()?.takeIf { it.isNotBlank() },
+                ),
+            )
+            lastCreatedFinding = response.finding
+            notice = "Hallazgo ${response.finding.code} registrado en ${response.act.code}. Podés agregar evidencia fotográfica."
+            loadFindingOptionsInternal(visitId, assetId, actId, keepLastCreated = true)
+            loadActsInternal(visitId, selectDraft = false)
+        }
+    }
+
+    fun uploadFindingPhoto(
+        findingId: String,
+        file: File,
+        latitude: Double,
+        longitude: Double,
+        accuracyM: Double?,
+        title: String? = null,
+        description: String? = null,
+    ) {
+        launchBusy {
+            findingsRepository.uploadObservationPhoto(
+                findingId = findingId,
+                file = file,
+                latitude = latitude,
+                longitude = longitude,
+                accuracyM = accuracyM,
+                title = title,
+                description = description,
+            )
+            loadEvidenceInternal(findingId)
+            notice = "Evidencia fotográfica registrada con GPS."
+        }
+    }
+
+    fun reloadFindingEvidence(findingId: String) {
+        launchBusy { loadEvidenceInternal(findingId) }
+    }
+
+    fun setCompanyResponsiblePresent(
+        fullName: String,
+        documentType: String,
+        documentNumber: String,
+        position: String,
+        email: String?,
+        phone: String?,
+    ) {
+        val actId = selectedAct?.id ?: return
+        if (fullName.isBlank() || documentNumber.isBlank() || position.isBlank()) {
+            error = "Completá nombre, documento y cargo del responsable de la empresa."
+            return
+        }
+        launchBusy {
+            actClosure = actsRepository.setResponsible(
+                actId,
+                MobileResponsibleRequest(
+                    attendanceStatus = "PRESENT",
+                    fullName = fullName.trim(),
+                    documentType = documentType,
+                    documentNumber = documentNumber.trim(),
+                    position = position.trim(),
+                    email = email?.trim()?.takeIf { it.isNotBlank() },
+                    phone = phone?.trim()?.takeIf { it.isNotBlank() },
+                ),
+            )
+            notice = "Responsable de empresa registrado para el Acta."
+        }
+    }
+
+    fun setCompanyResponsibleAbsent(reason: String) {
+        val actId = selectedAct?.id ?: return
+        if (reason.trim().length < 10) {
+            error = "Indicá un motivo de ausencia de al menos 10 caracteres."
+            return
+        }
+        launchBusy {
+            actClosure = actsRepository.setResponsible(
+                actId,
+                MobileResponsibleRequest(
+                    attendanceStatus = "ABSENT",
+                    absenceReason = reason.trim(),
+                ),
+            )
+            notice = "Ausencia del responsable registrada."
+        }
+    }
+
+    fun prepareSelectedAct() {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.prepare(actId)
+            refreshSelectedActInternal(actId)
+            notice = "Acta preparada. Su contenido quedó congelado para las firmas."
+        }
+    }
+
+    fun reopenSelectedAct() {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.reopen(actId)
+            refreshSelectedActInternal(actId)
+            notice = "Acta reabierta. Podés corregirla antes de volver a preparar."
+        }
+    }
+
+    fun signSelectedActAsInspector(
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+    ) {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.signInspector(actId, png, latitude, longitude, accuracyM)
+            notice = "Firma del inspector incorporada al Acta."
+        }
+    }
+
+    fun signSelectedActAsCompany(
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+        manifestation: String,
+        statement: String?,
+    ) {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.signCompany(
+                actId, png, latitude, longitude, accuracyM, manifestation, statement,
+            )
+            notice = if (manifestation == "DISSENT") {
+                "Firma de empresa registrada con disidencia."
+            } else {
+                "Firma de empresa registrada."
+            }
+        }
+    }
+
+    fun recordCompanyOutcome(status: String, reason: String) {
+        val actId = selectedAct?.id ?: return
+        if (reason.trim().length < 10) {
+            error = "Indicá un motivo de al menos 10 caracteres."
+            return
+        }
+        launchBusy {
+            actClosure = actsRepository.companyOutcome(actId, status, reason)
+            notice = if (status == "ABSENT") "Ausencia de empresa asentada." else "Negativa a firmar asentada."
+        }
+    }
+
+    fun closeSelectedAct() {
+        val currentVisit = visit ?: return
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.closeAct(actId)
+            refreshSelectedActInternal(actId)
+            loadActsInternal(currentVisit.id, selectDraft = false)
+            clearFindingState()
+            notice = "${selectedAct?.code ?: "Acta"} cerrada e inmutable. Podés crear otra Acta o finalizar la inspección."
+        }
+    }
+
+    fun closeInspection() {
+        val visitId = visit?.id ?: return
+        launchBusy {
+            visit = actsRepository.closeVisit(visitId)
+            loadVisitsInternal()
+            notice = "Inspección cerrada. Las Actas y documentos quedan disponibles para oficina."
+        }
+    }
+
+    fun clearFindingFlow() {
+        fieldFindingOptions = null
+        lastCreatedFinding = null
+        fieldFindingEvidence = emptyMap()
+        error = null
+    }
+
+    fun clearSelectedFieldAsset() {
+        selectedFieldAsset = null
+        clearFindingState()
+    }
+
+    private fun selectedDraftAct(): MobileActDetail? =
+        selectedAct?.takeIf { it.status == "DRAFT" }
+            ?: acts.firstOrNull { it.status == "DRAFT" }?.let { summary ->
+                selectedAct?.takeIf { it.id == summary.id && it.status == "DRAFT" }
+            }
+
+    private suspend fun loadActsInternal(visitId: String, selectDraft: Boolean) {
+        acts = actsRepository.list(visitId).data
+        val currentId = selectedAct?.id
+        val current = currentId?.let { id -> acts.firstOrNull { it.id == id } }
+        val target = when {
+            current != null -> current.id
+            selectDraft -> acts.firstOrNull { it.status == "DRAFT" }?.id
+            else -> null
+        }
+        if (target != null) {
+            selectedAct = actsRepository.get(target)
+            actClosure = actsRepository.closure(target)
+        } else if (current == null) {
+            selectedAct = null
+            actClosure = null
+        }
+    }
+
+    private suspend fun refreshSelectedActInternal(actId: String) {
+        selectedAct = actsRepository.get(actId)
+        actClosure = actsRepository.closure(actId)
+        visit?.id?.let { loadActsInternal(it, selectDraft = false) }
+    }
+
+    private suspend fun loadFindingOptionsInternal(
+        visitId: String,
+        assetId: String,
+        actId: String,
+        keepLastCreated: Boolean = false,
+    ) {
+        val options = findingsRepository.options(visitId, assetId, actId)
+        fieldFindingOptions = options
+        if (!keepLastCreated) lastCreatedFinding = null
+        val loaded = linkedMapOf<String, List<FieldFindingEvidence>>()
+        for (finding in options.findings) {
+            loaded[finding.id] = findingsRepository.evidence(finding.id).data
+        }
+        fieldFindingEvidence = loaded
+    }
+
+    private suspend fun loadEvidenceInternal(findingId: String) {
+        fieldFindingEvidence = fieldFindingEvidence + (
+            findingId to findingsRepository.evidence(findingId).data
+        )
+    }
+
+    private fun clearActState() {
+        acts = emptyList()
+        selectedAct = null
+        actClosure = null
+    }
+
+    private fun clearFindingState() {
+        fieldFindingOptions = null
+        lastCreatedFinding = null
+        fieldFindingEvidence = emptyMap()
+    }
+
+    private fun launchBusy(block: suspend () -> Unit) {
+        viewModelScope.launch {
+            busy = true
+            error = null
+            try {
+                block()
+            } catch (throwable: Throwable) {
+                error = DhRepository.humanError(throwable)
+                if (repository.currentSession() == null) session = null
+            } finally {
+                busy = false
+            }
+        }
+    }
+}
@@ -0,0 +1,580 @@
+package com.korexlabs.dhinspeccion.data
+
+import android.content.Context
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyProperties
+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
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+import retrofit2.HttpException
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.Part
+import retrofit2.http.Path
+import retrofit2.http.Query
+import java.io.File
+import java.security.KeyStore
+import java.time.Instant
+import java.util.UUID
+import javax.crypto.Cipher
+import javax.crypto.KeyGenerator
+import javax.crypto.SecretKey
+import javax.crypto.spec.GCMParameterSpec
+
+// ---------- Auth ----------
+
+data class LoginRequest(
+    val identifier: String,
+    val password: String,
+    val deviceLabel: String = "DH Android",
+)
+
+data class RefreshRequest(val refreshToken: String)
+
+data class MobileUser(
+    val id: String,
+    val username: String,
+    val firstName: String? = null,
+    val lastName: String? = null,
+    val email: String? = null,
+    val mustChangePassword: Boolean = false,
+    val roles: List<String> = emptyList(),
+    val permissions: List<String> = emptyList(),
+)
+
+data class MobileSessionResponse(
+    val user: MobileUser,
+    val accessToken: String,
+    val refreshToken: String,
+    val accessExpiresInSeconds: Long,
+)
+
+data class StoredSession(
+    val userId: String,
+    val username: String,
+    val displayName: String,
+    val accessToken: String,
+    val refreshToken: String,
+)
+
+// ---------- Inspections ----------
+
+data class AssetSummary(
+    val id: String,
+    val code: String,
+    val name: String,
+    val typeName: String? = null,
+)
+
+data class PersonSummary(
+    val id: String,
+    val username: String? = null,
+    val firstName: String? = null,
+    val lastName: String? = null,
+)
+
+data class VisitSummary(
+    val id: String,
+    val code: String,
+    val title: String? = null,
+    val objective: String? = null,
+    val status: String,
+    val scopeAsset: AssetSummary? = null,
+    val operationalArea: AssetSummary? = null,
+    val operatorCompany: AssetSummary? = null,
+    val leadInspector: PersonSummary? = null,
+    val plannedStartAt: String? = null,
+    val actualStartedAt: String? = null,
+    val actualClosedAt: String? = null,
+    val instructions: String? = null,
+    val checklistGeneration: Int = 0,
+    val assetCount: Int = 0,
+    val memberCount: Int = 0,
+)
+
+data class VisitMeta(
+    val page: Int,
+    val pageSize: Int,
+    val total: Int,
+    val totalPages: Int,
+)
+
+data class VisitListResponse(val data: List<VisitSummary>, val meta: VisitMeta)
+
+data class PlannedAsset(
+    val id: String,
+    val code: String,
+    val name: String,
+    val typeName: String? = null,
+    val included: Boolean = true,
+    val planningSource: String? = null,
+    val exclusionReason: String? = null,
+)
+
+data class ChecklistItem(
+    val id: String,
+    val findingId: String? = null,
+    val findingCode: String? = null,
+    val findingTitle: String? = null,
+    val findingStatus: String? = null,
+    val severity: Int? = null,
+    val itemKind: String? = null,
+    val referenceOn: String? = null,
+    val asset: AssetSummary? = null,
+    val assetIncluded: Boolean = true,
+)
+
+data class ChecklistSummary(
+    val generation: Int = 0,
+    val stale: Boolean = false,
+    val antecedents: Int = 0,
+    val companyOverdue: Int = 0,
+    val verificationOverdue: Int = 0,
+    val upcomingControls: Int = 0,
+    val actionableAssets: Int = 0,
+    val excludedAssets: Int = 0,
+    val items: List<ChecklistItem> = emptyList(),
+)
+
+data class VisitDetail(
+    val id: String,
+    val code: String,
+    val title: String? = null,
+    val objective: String? = null,
+    val status: String,
+    val operationalArea: AssetSummary? = null,
+    val operatorCompany: AssetSummary? = null,
+    val leadInspector: PersonSummary? = null,
+    val plannedStartAt: String? = null,
+    val actualStartedAt: String? = null,
+    val actualClosedAt: String? = null,
+    val instructions: String? = null,
+    val assets: List<AssetSummary> = emptyList(),
+    val planningAssets: List<PlannedAsset> = emptyList(),
+    val team: List<PersonSummary> = emptyList(),
+    val checklist: ChecklistSummary = ChecklistSummary(),
+)
+
+// ---------- Field inventory ----------
+
+data class FieldContext(
+    val visitId: String? = null,
+    val visitCode: String? = null,
+    val areaId: String? = null,
+    val areaCode: String? = null,
+    val areaName: String? = null,
+    val companyId: String? = null,
+    val companyCode: String? = null,
+    val companyName: String? = null,
+)
+
+data class FieldInventoryItem(
+    val id: String,
+    val code: String,
+    val name: String,
+    val commonName: String? = null,
+    val informationStatus: String? = null,
+    val dataOrigin: String? = null,
+    val type: AssetSummary? = null,
+    val parent: AssetSummary? = null,
+    val selectedInInspection: Boolean = false,
+    val captureRequired: Boolean = false,
+    val hasGeometry: Boolean = false,
+    val fieldPhotoCount: Int = 0,
+    val readyForFinding: Boolean = true,
+)
+
+data class FieldInventoryListResponse(
+    val context: FieldContext,
+    val data: List<FieldInventoryItem>,
+)
+
+data class FieldAttributeDefinition(
+    val id: String,
+    val code: String,
+    val name: String,
+    val dataType: String,
+    val isRequired: Boolean = false,
+    val unit: String? = null,
+    val options: Any? = null,
+    val sortOrder: Int = 0,
+)
+
+data class FieldInventoryFamily(
+    val id: String,
+    val code: String,
+    val name: String,
+    val level: String,
+    val informationLabels: List<String> = emptyList(),
+    val sourceReference: String? = null,
+    val isOther: Boolean = false,
+)
+
+data class FieldType(
+    val id: String,
+    val code: String,
+    val name: String,
+    val description: String? = null,
+    val structuralKind: String? = null,
+    val families: List<FieldInventoryFamily> = emptyList(),
+    val familyRequired: Boolean = false,
+    val attributes: List<FieldAttributeDefinition> = emptyList(),
+)
+
+data class FieldTypeResponse(
+    val context: FieldContext,
+    val parent: AssetSummary,
+    val data: List<FieldType>,
+)
+
+data class CaptureStatus(
+    val captureRequired: Boolean = false,
+    val hasGeometry: Boolean = false,
+    val creationGpsCaptured: Boolean = false,
+    val fieldPhotoCount: Int = 0,
+    val readyForFinding: Boolean = true,
+)
+
+data class FieldAssetDetail(
+    val context: FieldContext? = null,
+    val asset: FieldInventoryItem,
+    val selectedInInspection: Boolean = true,
+    val capture: CaptureStatus = CaptureStatus(),
+)
+
+data class CreateFieldInventoryRequest(
+    val typeId: String,
+    val parentId: String? = null,
+    val familyId: String? = null,
+    val code: String? = null,
+    val name: String,
+    val commonName: String? = null,
+    val description: String? = null,
+    val discoveryNotes: String? = null,
+    val attributes: Map<String, Any?>,
+    val deviceLatitude: Double,
+    val deviceLongitude: Double,
+    val deviceAccuracyM: Double? = null,
+    val deviceCapturedAt: String,
+    val deviceLabel: String = "DH Android",
+)
+
+data class FieldPhotoResponse(
+    val capture: CaptureStatus,
+)
+
+data class MergeFieldInventoryRequest(
+    val canonicalAssetId: String,
+    val reason: String,
+)
+
+data class FieldInventoryMergeResult(
+    val source: AssetSummary,
+    val canonical: AssetSummary,
+    val sourceVersionNumber: Int,
+    val reparentedChildIds: List<String> = emptyList(),
+    val historyPolicy: String,
+)
+
+interface DhApi {
+    @POST("auth/mobile/login")
+    suspend fun login(@Body request: LoginRequest): MobileSessionResponse
+
+    @POST("auth/mobile/refresh")
+    suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
+
+    @POST("auth/mobile/logout")
+    suspend fun logout(@Header("Authorization") authorization: String): Map<String, Any?>
+
+    @GET("inspection-visits")
+    suspend fun visits(
+        @Header("Authorization") authorization: String,
+        @Query("inspectorId") inspectorId: String,
+        @Query("pageSize") pageSize: Int = 100,
+    ): VisitListResponse
+
+    @GET("inspection-visits/{id}")
+    suspend fun visit(
+        @Header("Authorization") authorization: String,
+        @Path("id") id: String,
+    ): VisitDetail
+
+    @POST("inspection-visits/{id}/start")
+    suspend fun startVisit(
+        @Header("Authorization") authorization: String,
+        @Path("id") id: String,
+    ): VisitDetail
+
+    @GET("inspection-visits/{visitId}/field-inventory")
+    suspend fun fieldInventory(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Query("search") search: String? = null,
+        @Query("parentId") parentId: String? = null,
+        @Query("limit") limit: Int = 80,
+    ): FieldInventoryListResponse
+
+    @GET("inspection-visits/{visitId}/field-inventory/types")
+    suspend fun fieldTypes(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Query("parentId") parentId: String? = null,
+    ): FieldTypeResponse
+
+    @POST("inspection-visits/{visitId}/field-inventory/{assetId}/select")
+    suspend fun selectFieldAsset(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Path("assetId") assetId: String,
+    ): FieldAssetDetail
+
+    @POST("inspection-visits/{visitId}/field-inventory")
+    suspend fun createFieldAsset(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Body request: CreateFieldInventoryRequest,
+    ): FieldAssetDetail
+
+    @POST("inspection-visits/{visitId}/field-inventory/{assetId}/merge")
+    suspend fun mergeFieldAsset(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Path("assetId") assetId: String,
+        @Body request: MergeFieldInventoryRequest,
+    ): FieldInventoryMergeResult
+
+    @Multipart
+    @POST("inspection-visits/{visitId}/field-inventory/{assetId}/photos")
+    suspend fun uploadFieldPhoto(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Path("assetId") assetId: String,
+        @Part file: MultipartBody.Part,
+        @Part("deviceLatitude") latitude: okhttp3.RequestBody,
+        @Part("deviceLongitude") longitude: okhttp3.RequestBody,
+        @Part("deviceAccuracyM") accuracy: okhttp3.RequestBody?,
+        @Part("deviceCapturedAt") capturedAt: okhttp3.RequestBody,
+        @Part("deviceLabel") deviceLabel: okhttp3.RequestBody,
+        @Part("exifLatitude") exifLatitude: okhttp3.RequestBody?,
+        @Part("exifLongitude") exifLongitude: okhttp3.RequestBody?,
+        @Part("exifCapturedAt") exifCapturedAt: okhttp3.RequestBody?,
+    ): FieldPhotoResponse
+}
+
+class SecureSessionStore(context: Context) {
+    private val prefs = context.getSharedPreferences("dh_v2_mobile_session", Context.MODE_PRIVATE)
+    private val alias = "dh_v2_mobile_session_key"
+
+    fun load(): StoredSession? {
+        val encoded = prefs.getString("payload", null) ?: return null
+        return runCatching {
+            val parts = encoded.split('.', limit = 2)
+            require(parts.size == 2)
+            val iv = Base64.decode(parts[0], Base64.NO_WRAP)
+            val encrypted = Base64.decode(parts[1], Base64.NO_WRAP)
+            val cipher = Cipher.getInstance("AES/GCM/NoPadding")
+            cipher.init(Cipher.DECRYPT_MODE, key(), GCMParameterSpec(128, iv))
+            val json = JSONObject(String(cipher.doFinal(encrypted), Charsets.UTF_8))
+            StoredSession(
+                userId = json.getString("userId"),
+                username = json.getString("username"),
+                displayName = json.optString("displayName", json.getString("username")),
+                accessToken = json.getString("accessToken"),
+                refreshToken = json.getString("refreshToken"),
+            )
+        }.getOrElse {
+            clear()
+            null
+        }
+    }
+
+    fun save(response: MobileSessionResponse): StoredSession {
+        val displayName = listOfNotNull(response.user.firstName, response.user.lastName)
+            .joinToString(" ").trim().ifBlank { response.user.username }
+        val stored = StoredSession(
+            userId = response.user.id,
+            username = response.user.username,
+            displayName = displayName,
+            accessToken = response.accessToken,
+            refreshToken = response.refreshToken,
+        )
+        val json = JSONObject()
+            .put("userId", stored.userId)
+            .put("username", stored.username)
+            .put("displayName", stored.displayName)
+            .put("accessToken", stored.accessToken)
+            .put("refreshToken", stored.refreshToken)
+            .toString()
+        val cipher = Cipher.getInstance("AES/GCM/NoPadding")
+        cipher.init(Cipher.ENCRYPT_MODE, key())
+        val encrypted = cipher.doFinal(json.toByteArray(Charsets.UTF_8))
+        val payload = Base64.encodeToString(cipher.iv, Base64.NO_WRAP) + "." +
+            Base64.encodeToString(encrypted, Base64.NO_WRAP)
+        prefs.edit().putString("payload", payload).apply()
+        return stored
+    }
+
+    fun clear() {
+        prefs.edit().clear().apply()
+    }
+
+    private fun key(): SecretKey {
+        val keyStore = KeyStore.getInstance("AndroidKeyStore").apply { load(null) }
+        (keyStore.getKey(alias, null) as? SecretKey)?.let { return it }
+        val generator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, "AndroidKeyStore")
+        generator.init(
+            KeyGenParameterSpec.Builder(
+                alias,
+                KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT,
+            )
+                .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
+                .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+                .setRandomizedEncryptionRequired(true)
+                .build(),
+        )
+        return generator.generateKey()
+    }
+}
+
+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)
+        .client(OkHttpClient.Builder().build())
+        .addConverterFactory(MoshiConverterFactory.create(moshi))
+        .build()
+        .create(DhApi::class.java)
+
+    fun currentSession(): StoredSession? = store.load()
+
+    suspend fun login(identifier: String, password: String): StoredSession =
+        store.save(api.login(LoginRequest(identifier.trim(), password)))
+
+    suspend fun logout() {
+        val session = store.load()
+        if (session != null) runCatching { api.logout("Bearer ${session.accessToken}") }
+        store.clear()
+    }
+
+    suspend fun visits(): VisitListResponse = authorized { session ->
+        api.visits("Bearer ${session.accessToken}", session.userId)
+    }
+
+    suspend fun visit(id: String): VisitDetail = authorized { session ->
+        api.visit("Bearer ${session.accessToken}", id)
+    }
+
+    suspend fun startVisit(id: String): VisitDetail = authorized { session ->
+        api.startVisit("Bearer ${session.accessToken}", id)
+    }
+
+    suspend fun fieldInventory(visitId: String, search: String?, parentId: String? = null) = authorized { session ->
+        api.fieldInventory("Bearer ${session.accessToken}", visitId, search?.takeIf { it.isNotBlank() }, parentId)
+    }
+
+    suspend fun fieldTypes(visitId: String, parentId: String?) = authorized { session ->
+        api.fieldTypes("Bearer ${session.accessToken}", visitId, parentId)
+    }
+
+    suspend fun selectFieldAsset(visitId: String, assetId: String) = authorized { session ->
+        api.selectFieldAsset("Bearer ${session.accessToken}", visitId, assetId)
+    }
+
+    suspend fun createFieldAsset(visitId: String, request: CreateFieldInventoryRequest) = authorized { session ->
+        api.createFieldAsset("Bearer ${session.accessToken}", visitId, request)
+    }
+
+    suspend fun mergeFieldAsset(
+        visitId: String,
+        assetId: String,
+        canonicalAssetId: String,
+        reason: String,
+    ): FieldInventoryMergeResult = authorized { session ->
+        api.mergeFieldAsset(
+            "Bearer ${session.accessToken}",
+            visitId,
+            assetId,
+            MergeFieldInventoryRequest(canonicalAssetId, reason.trim()),
+        )
+    }
+
+    suspend fun uploadFieldPhoto(
+        visitId: String,
+        assetId: String,
+        file: File,
+        latitude: Double,
+        longitude: Double,
+        accuracyM: Double?,
+        capturedAt: String = Instant.now().toString(),
+    ): FieldPhotoResponse = authorized { session ->
+        val text = "text/plain".toMediaType()
+        val body = file.asRequestBody("image/jpeg".toMediaType())
+        val part = MultipartBody.Part.createFormData("file", file.name, body)
+        api.uploadFieldPhoto(
+            authorization = "Bearer ${session.accessToken}",
+            visitId = visitId,
+            assetId = assetId,
+            file = part,
+            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 = latitude.toString().toRequestBody(text),
+            exifLongitude = longitude.toString().toRequestBody(text),
+            exifCapturedAt = capturedAt.toRequestBody(text),
+        )
+    }
+
+    private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
+        var session = store.load() ?: throw IllegalStateException("Sesión no iniciada")
+        try {
+            return block(session)
+        } catch (error: HttpException) {
+            if (error.code() != 401) throw error
+        }
+        session = refresh(session.refreshToken)
+        return block(session)
+    }
+
+    private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock {
+        val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada")
+        if (latest.refreshToken != previousRefreshToken) return@withLock latest
+        try {
+            store.save(api.refresh(RefreshRequest(previousRefreshToken)))
+        } catch (error: Throwable) {
+            store.clear()
+            throw error
+        }
+    }
+
+    companion object {
+        fun humanError(error: Throwable): String {
+            if (error is HttpException) {
+                val body = runCatching { error.response()?.errorBody()?.string() }.getOrNull()
+                val message = runCatching { JSONObject(body.orEmpty()).optString("message") }.getOrNull()
+                if (!message.isNullOrBlank()) return message
+                return "Error HTTP ${error.code()}"
+            }
+            return error.message ?: "Ocurrió un error inesperado"
+        }
+
+        fun newOperationId(): String = UUID.randomUUID().toString()
+    }
+}
@@ -0,0 +1,258 @@
+package com.korexlabs.dhinspeccion.data
+
+import android.content.Context
+import com.korexlabs.dhinspeccion.BuildConfig
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import retrofit2.HttpException
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.Part
+import retrofit2.http.Path
+import retrofit2.http.Query
+import java.io.File
+import java.time.Instant
+
+data class FieldFindingAct(
+    val id: String,
+    val code: String,
+    val status: String,
+)
+
+data class FieldFindingCatalogItem(
+    val id: String,
+    val categoryId: String,
+    val code: String,
+    val sourceNumber: Int,
+    val title: String,
+    val legalBasis: String? = null,
+    val glossary: String? = null,
+    val suggestedSeverity: Int? = null,
+    val revision: Int = 1,
+    val categoryName: String? = null,
+)
+
+data class FieldFindingOther(
+    val enabled: Boolean = true,
+    val code: String = "OTHER",
+    val label: String = "OTROS",
+    val help: String? = null,
+)
+
+data class FieldFindingCatalog(
+    val typeConfigured: Boolean = false,
+    val configurationReason: String? = null,
+    val items: List<FieldFindingCatalogItem> = emptyList(),
+    val other: FieldFindingOther = FieldFindingOther(),
+)
+
+data class FieldFindingItem(
+    val id: String,
+    val actId: String,
+    val assetId: String,
+    val catalogItemId: String? = null,
+    val findingNumber: Int,
+    val code: String,
+    val status: String,
+    val title: String,
+    val description: String,
+    val severity: Int? = null,
+    val suggestedSeverity: Int? = null,
+    val correctionDueOn: String? = null,
+)
+
+data class FieldFindingEvidence(
+    val id: String,
+    val findingId: String,
+    val kind: String,
+    val purpose: String,
+    val originalName: String,
+    val mimeType: String,
+    val sizeBytes: Long,
+    val sha256: String,
+    val title: String? = null,
+    val description: String? = null,
+    val capturedAt: String? = null,
+    val latitude: Double? = null,
+    val longitude: Double? = null,
+    val accuracyM: Double? = null,
+    val deviceLabel: String? = null,
+    val source: String,
+    val createdAt: String,
+)
+
+data class FieldFindingEvidenceListResponse(
+    val data: List<FieldFindingEvidence> = emptyList(),
+)
+
+data class FieldFindingOptionsResponse(
+    val act: FieldFindingAct,
+    val capture: CaptureStatus = CaptureStatus(),
+    val assetIncludedInAct: Boolean = true,
+    val catalog: FieldFindingCatalog,
+    val findings: List<FieldFindingItem> = emptyList(),
+    val canAddAnother: Boolean = true,
+    val actSelectionMode: String = "EXPLICIT",
+)
+
+data class CreateFieldFindingRequest(
+    val actId: String,
+    val catalogItemId: String? = null,
+    val customTitle: String? = null,
+    val customLegalBasis: String? = null,
+    val description: String,
+    val severity: Int? = null,
+    val correctionDueOn: String? = null,
+)
+
+data class FieldFindingCreateResponse(
+    val act: FieldFindingAct,
+    val capture: CaptureStatus = CaptureStatus(),
+    val finding: FieldFindingItem,
+    val canAddAnother: Boolean = true,
+    val actSelectionMode: String = "EXPLICIT",
+)
+
+private interface FieldFindingsApi {
+    @GET("inspection-visits/{visitId}/field-findings/{assetId}/options")
+    suspend fun options(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Path("assetId") assetId: String,
+        @Query("actId") actId: String,
+    ): FieldFindingOptionsResponse
+
+    @POST("inspection-visits/{visitId}/field-findings/{assetId}")
+    suspend fun create(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Path("assetId") assetId: String,
+        @Body request: CreateFieldFindingRequest,
+    ): FieldFindingCreateResponse
+
+    @GET("inspection-findings/{findingId}/evidence")
+    suspend fun evidence(
+        @Header("Authorization") authorization: String,
+        @Path("findingId") findingId: String,
+    ): FieldFindingEvidenceListResponse
+
+    @Multipart
+    @POST("inspection-findings/{findingId}/evidence")
+    suspend fun uploadEvidence(
+        @Header("Authorization") authorization: String,
+        @Path("findingId") findingId: String,
+        @Part file: MultipartBody.Part,
+        @Part("kind") kind: RequestBody,
+        @Part("purpose") purpose: RequestBody,
+        @Part("title") title: RequestBody?,
+        @Part("description") description: RequestBody?,
+        @Part("capturedAt") capturedAt: RequestBody,
+        @Part("latitude") latitude: RequestBody,
+        @Part("longitude") longitude: RequestBody,
+        @Part("accuracyM") accuracyM: RequestBody?,
+        @Part("deviceLabel") deviceLabel: RequestBody,
+    ): FieldFindingEvidence
+
+    @POST("auth/mobile/refresh")
+    suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
+}
+
+/**
+ * Cliente de campo para Hallazgos y sus evidencias append-only.
+ * F3.2 exige que la APK identifique explícitamente el Acta activa.
+ */
+class FieldFindingsRepository(context: Context) {
+    private val store = SecureSessionStore(context.applicationContext)
+    private val refreshMutex = Mutex()
+    private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
+    private val api: FieldFindingsApi = Retrofit.Builder()
+        .baseUrl(BuildConfig.API_BASE_URL)
+        .client(OkHttpClient.Builder().build())
+        .addConverterFactory(MoshiConverterFactory.create(moshi))
+        .build()
+        .create(FieldFindingsApi::class.java)
+
+    suspend fun options(visitId: String, assetId: String, actId: String): FieldFindingOptionsResponse =
+        authorized { session ->
+            api.options("Bearer ${session.accessToken}", visitId, assetId, actId)
+        }
+
+    suspend fun create(
+        visitId: String,
+        assetId: String,
+        request: CreateFieldFindingRequest,
+    ): FieldFindingCreateResponse = authorized { session ->
+        api.create("Bearer ${session.accessToken}", visitId, assetId, request)
+    }
+
+    suspend fun evidence(findingId: String): FieldFindingEvidenceListResponse = authorized { session ->
+        api.evidence("Bearer ${session.accessToken}", findingId)
+    }
+
+    suspend fun uploadObservationPhoto(
+        findingId: String,
+        file: File,
+        latitude: Double,
+        longitude: Double,
+        accuracyM: Double?,
+        title: String? = null,
+        description: String? = null,
+        capturedAt: String = Instant.now().toString(),
+    ): FieldFindingEvidence = authorized { session ->
+        val text = "text/plain".toMediaType()
+        val part = MultipartBody.Part.createFormData(
+            "file",
+            file.name,
+            file.asRequestBody("image/jpeg".toMediaType()),
+        )
+        api.uploadEvidence(
+            authorization = "Bearer ${session.accessToken}",
+            findingId = findingId,
+            file = part,
+            kind = "PHOTO".toRequestBody(text),
+            purpose = "OBSERVATION".toRequestBody(text),
+            title = title?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
+            description = description?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
+            capturedAt = capturedAt.toRequestBody(text),
+            latitude = latitude.toString().toRequestBody(text),
+            longitude = longitude.toString().toRequestBody(text),
+            accuracyM = accuracyM?.toString()?.toRequestBody(text),
+            deviceLabel = "DH Android".toRequestBody(text),
+        )
+    }
+
+    private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
+        var session = store.load() ?: throw IllegalStateException("Sesión no iniciada")
+        try {
+            return block(session)
+        } catch (error: HttpException) {
+            if (error.code() != 401) throw error
+        }
+        session = refresh(session.refreshToken)
+        return block(session)
+    }
+
+    private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock {
+        val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada")
+        if (latest.refreshToken != previousRefreshToken) return@withLock latest
+        try {
+            store.save(api.refresh(RefreshRequest(previousRefreshToken)))
+        } catch (error: Throwable) {
+            store.clear()
+            throw error
+        }
+    }
+}
@@ -0,0 +1,447 @@
+package com.korexlabs.dhinspeccion.data
+
+import android.content.Context
+import com.korexlabs.dhinspeccion.BuildConfig
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import retrofit2.HttpException
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Multipart
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+import retrofit2.http.PUT
+import retrofit2.http.Part
+import retrofit2.http.Path
+import retrofit2.http.Query
+import java.io.File
+import java.time.Instant
+
+data class MobileActSummary(
+    val id: String,
+    val visitId: String,
+    val code: String,
+    val status: String,
+    val occurredAt: String,
+    val title: String,
+    val summary: String,
+    val observations: String? = null,
+    val currentVersion: Int = 0,
+    val closedAt: String? = null,
+    val closureSha256: String? = null,
+    val assetCount: Int = 0,
+    val findingCount: Int = 0,
+)
+
+data class MobileActDetail(
+    val id: String,
+    val visitId: String,
+    val code: String,
+    val status: String,
+    val occurredAt: String,
+    val title: String,
+    val summary: String,
+    val observations: String? = null,
+    val currentVersion: Int = 0,
+    val closedAt: String? = null,
+    val closureSha256: String? = null,
+    val assetCount: Int = 0,
+    val findingCount: Int = 0,
+    val assets: List<AssetSummary> = emptyList(),
+)
+
+data class MobileActListMeta(
+    val page: Int = 1,
+    val pageSize: Int = 100,
+    val total: Int = 0,
+    val totalPages: Int = 0,
+)
+
+data class MobileActListResponse(
+    val data: List<MobileActSummary> = emptyList(),
+    val meta: MobileActListMeta = MobileActListMeta(),
+)
+
+data class CreateMobileActRequest(
+    val occurredAt: String,
+    val title: String,
+    val summary: String,
+    val observations: String? = null,
+    val assetIds: List<String>,
+)
+
+data class UpdateMobileActRequest(
+    val assetIds: List<String>,
+)
+
+data class MobileResponsibleRequest(
+    val attendanceStatus: String,
+    val fullName: String? = null,
+    val documentType: String? = null,
+    val documentNumber: String? = null,
+    val position: String? = null,
+    val email: String? = null,
+    val phone: String? = null,
+    val absenceReason: String? = null,
+)
+
+data class MobileResponsible(
+    val actId: String,
+    val attendanceStatus: String,
+    val fullName: String? = null,
+    val documentType: String? = null,
+    val documentNumber: String? = null,
+    val position: String? = null,
+    val email: String? = null,
+    val phone: String? = null,
+    val absenceReason: String? = null,
+)
+
+data class MobileActClosureHeader(
+    val id: String,
+    val code: String,
+    val status: String,
+    val visitId: String,
+    val currentVersion: Int = 0,
+    val closedAt: String? = null,
+    val closureSha256: String? = null,
+)
+
+data class MobileVisitClosureHeader(
+    val id: String,
+    val code: String,
+    val status: String,
+    val actualClosedAt: String? = null,
+)
+
+data class MobileSignature(
+    val id: String,
+    val signerType: String,
+    val signerUserId: String? = null,
+    val signerName: String,
+    val status: String,
+    val reason: String? = null,
+    val companyManifestation: String? = null,
+    val companyStatement: String? = null,
+    val signedAt: String? = null,
+    val imageSha256: String? = null,
+)
+
+data class MobileClosureRecord(
+    val schemaVersion: String,
+    val preparedSha256: String,
+    val preparedAt: String,
+    val finalSha256: String? = null,
+    val deviceClosedAt: String? = null,
+    val serverClosedAt: String? = null,
+    val uploadMode: String? = null,
+    val isCurrent: Boolean = true,
+)
+
+data class MobileClosureConsents(
+    val version: String = "",
+    val inspector: String = "",
+    val company: String = "",
+)
+
+data class MobileActClosure(
+    val act: MobileActClosureHeader,
+    val visit: MobileVisitClosureHeader,
+    val responsible: MobileResponsible? = null,
+    val closure: MobileClosureRecord? = null,
+    val signatures: List<MobileSignature> = emptyList(),
+    val consents: MobileClosureConsents = MobileClosureConsents(),
+)
+
+data class MobileCompanyOutcomeRequest(
+    val status: String,
+    val reason: String,
+)
+
+data class MobileCloseActRequest(
+    val clientClosedAt: String = Instant.now().toString(),
+    val uploadMode: String = "ONLINE",
+)
+
+data class MobileCloseVisitRequest(
+    val clientClosedAt: String = Instant.now().toString(),
+)
+
+private interface MobileActsApi {
+    @GET("inspection-visits/{visitId}/acts")
+    suspend fun listActs(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Query("pageSize") pageSize: Int = 100,
+    ): MobileActListResponse
+
+    @GET("inspection-acts/{actId}")
+    suspend fun act(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+    ): MobileActDetail
+
+    @POST("inspection-visits/{visitId}/acts")
+    suspend fun createAct(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Body request: CreateMobileActRequest,
+    ): MobileActDetail
+
+    @PATCH("inspection-acts/{actId}")
+    suspend fun updateAct(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Body request: UpdateMobileActRequest,
+    ): MobileActDetail
+
+    @GET("inspection-acts/{actId}/closure")
+    suspend fun closure(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+    ): MobileActClosure
+
+    @PUT("inspection-acts/{actId}/responsible")
+    suspend fun responsible(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Body request: MobileResponsibleRequest,
+    ): MobileActClosure
+
+    @POST("inspection-acts/{actId}/ready")
+    suspend fun ready(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+    ): MobileActClosure
+
+    @POST("inspection-acts/{actId}/reopen")
+    suspend fun reopen(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+    ): MobileActClosure
+
+    @Multipart
+    @POST("inspection-acts/{actId}/signatures/inspector")
+    suspend fun signInspector(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Part file: MultipartBody.Part,
+        @Part("consentAccepted") consentAccepted: RequestBody,
+        @Part("clientSignedAt") clientSignedAt: RequestBody,
+        @Part("latitude") latitude: RequestBody?,
+        @Part("longitude") longitude: RequestBody?,
+        @Part("accuracyM") accuracyM: RequestBody?,
+        @Part("deviceLabel") deviceLabel: RequestBody,
+    ): MobileActClosure
+
+    @Multipart
+    @POST("inspection-acts/{actId}/signatures/company")
+    suspend fun signCompany(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Part file: MultipartBody.Part,
+        @Part("consentAccepted") consentAccepted: RequestBody,
+        @Part("clientSignedAt") clientSignedAt: RequestBody,
+        @Part("latitude") latitude: RequestBody?,
+        @Part("longitude") longitude: RequestBody?,
+        @Part("accuracyM") accuracyM: RequestBody?,
+        @Part("deviceLabel") deviceLabel: RequestBody,
+        @Part("manifestation") manifestation: RequestBody?,
+        @Part("statement") statement: RequestBody?,
+    ): MobileActClosure
+
+    @POST("inspection-acts/{actId}/company-outcome")
+    suspend fun companyOutcome(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Body request: MobileCompanyOutcomeRequest,
+    ): MobileActClosure
+
+    @POST("inspection-acts/{actId}/close")
+    suspend fun closeAct(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Body request: MobileCloseActRequest,
+    ): MobileActClosure
+
+    @POST("inspection-visits/{visitId}/close")
+    suspend fun closeVisit(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Body request: MobileCloseVisitRequest,
+    ): VisitDetail
+
+    @POST("auth/mobile/refresh")
+    suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
+}
+
+class MobileActsRepository(context: Context) {
+    private val store = SecureSessionStore(context.applicationContext)
+    private val refreshMutex = Mutex()
+    private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
+    private val api: MobileActsApi = Retrofit.Builder()
+        .baseUrl(BuildConfig.API_BASE_URL)
+        .client(OkHttpClient.Builder().build())
+        .addConverterFactory(MoshiConverterFactory.create(moshi))
+        .build()
+        .create(MobileActsApi::class.java)
+
+    suspend fun list(visitId: String): MobileActListResponse = authorized { session ->
+        api.listActs("Bearer ${session.accessToken}", visitId)
+    }
+
+    suspend fun get(actId: String): MobileActDetail = authorized { session ->
+        api.act("Bearer ${session.accessToken}", actId)
+    }
+
+    suspend fun create(visitId: String, assetId: String, visitCode: String): MobileActDetail = authorized { session ->
+        api.createAct(
+            "Bearer ${session.accessToken}",
+            visitId,
+            CreateMobileActRequest(
+                occurredAt = Instant.now().toString(),
+                title = "Acta de inspección $visitCode",
+                summary = "Acta de inspección en curso. Los Hallazgos y observaciones se incorporan de forma trazable durante la visita.",
+                assetIds = listOf(assetId),
+            ),
+        )
+    }
+
+    suspend fun ensureAsset(actId: String, assetId: String): MobileActDetail {
+        val detail = get(actId)
+        if (detail.assets.any { it.id == assetId }) return detail
+        val ids = (detail.assets.map { it.id } + assetId).distinct()
+        return authorized { session ->
+            api.updateAct("Bearer ${session.accessToken}", actId, UpdateMobileActRequest(ids))
+        }
+    }
+
+    suspend fun closure(actId: String): MobileActClosure = authorized { session ->
+        api.closure("Bearer ${session.accessToken}", actId)
+    }
+
+    suspend fun setResponsible(actId: String, request: MobileResponsibleRequest): MobileActClosure = authorized { session ->
+        api.responsible("Bearer ${session.accessToken}", actId, request)
+    }
+
+    suspend fun prepare(actId: String): MobileActClosure = authorized { session ->
+        api.ready("Bearer ${session.accessToken}", actId)
+    }
+
+    suspend fun reopen(actId: String): MobileActClosure = authorized { session ->
+        api.reopen("Bearer ${session.accessToken}", actId)
+    }
+
+    suspend fun signInspector(
+        actId: String,
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+    ): MobileActClosure = signature(actId, png, latitude, longitude, accuracyM, company = false)
+
+    suspend fun signCompany(
+        actId: String,
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+        manifestation: String = "CONFORMITY",
+        statement: String? = null,
+    ): MobileActClosure = signature(
+        actId = actId,
+        png = png,
+        latitude = latitude,
+        longitude = longitude,
+        accuracyM = accuracyM,
+        company = true,
+        manifestation = manifestation,
+        statement = statement,
+    )
+
+    suspend fun companyOutcome(actId: String, status: String, reason: String): MobileActClosure = authorized { session ->
+        api.companyOutcome(
+            "Bearer ${session.accessToken}",
+            actId,
+            MobileCompanyOutcomeRequest(status, reason.trim()),
+        )
+    }
+
+    suspend fun closeAct(actId: String): MobileActClosure = authorized { session ->
+        api.closeAct("Bearer ${session.accessToken}", actId, MobileCloseActRequest())
+    }
+
+    suspend fun closeVisit(visitId: String): VisitDetail = authorized { session ->
+        api.closeVisit("Bearer ${session.accessToken}", visitId, MobileCloseVisitRequest())
+    }
+
+    private suspend fun signature(
+        actId: String,
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+        company: Boolean,
+        manifestation: String? = null,
+        statement: String? = null,
+    ): MobileActClosure = authorized { session ->
+        val text = "text/plain".toMediaType()
+        val file = MultipartBody.Part.createFormData(
+            "file",
+            png.name,
+            png.asRequestBody("image/png".toMediaType()),
+        )
+        val consent = "true".toRequestBody(text)
+        val signedAt = Instant.now().toString().toRequestBody(text)
+        val device = "DH Android".toRequestBody(text)
+        val lat = latitude?.toString()?.toRequestBody(text)
+        val lon = longitude?.toString()?.toRequestBody(text)
+        val accuracy = accuracyM?.toString()?.toRequestBody(text)
+        if (company) {
+            api.signCompany(
+                "Bearer ${session.accessToken}", actId, file, consent, signedAt,
+                lat, lon, accuracy, device,
+                manifestation?.toRequestBody(text),
+                statement?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
+            )
+        } else {
+            api.signInspector(
+                "Bearer ${session.accessToken}", actId, file, consent, signedAt,
+                lat, lon, accuracy, device,
+            )
+        }
+    }
+
+    private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
+        var session = store.load() ?: throw IllegalStateException("Sesión no iniciada")
+        try {
+            return block(session)
+        } catch (error: HttpException) {
+            if (error.code() != 401) throw error
+        }
+        session = refresh(session.refreshToken)
+        return block(session)
+    }
+
+    private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock {
+        val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada")
+        if (latest.refreshToken != previousRefreshToken) return@withLock latest
+        try {
+            store.save(api.refresh(RefreshRequest(previousRefreshToken)))
+        } catch (error: Throwable) {
+            store.clear()
+            throw error
+        }
+    }
+}
@@ -0,0 +1,579 @@
+package com.korexlabs.dhinspeccion.ui
+
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Environment
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AssistChip
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+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.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.rememberCoroutineScope
+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.text.input.PasswordVisualTransformation
+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 com.korexlabs.dhinspeccion.data.VisitSummary
+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 GeoSnapshot(
+    val latitude: Double,
+    val longitude: Double,
+    val accuracyM: Double?,
+)
+
+@Composable
+fun DhApp(model: MainViewModel) {
+    MaterialTheme {
+        Surface(modifier = Modifier.fillMaxSize()) {
+            when {
+                model.session == null -> LoginScreen(model)
+                model.visit == null -> VisitsScreen(model)
+                else -> VisitRouter(model)
+            }
+        }
+    }
+}
+
+@Composable
+private fun MessageStrip(model: MainViewModel) {
+    val error = model.error
+    val notice = model.notice
+    if (error != null || notice != null) {
+        Card(
+            modifier = Modifier.fillMaxWidth().padding(bottom = 12.dp),
+            colors = CardDefaults.cardColors(
+                containerColor = if (error != null) MaterialTheme.colorScheme.errorContainer
+                else MaterialTheme.colorScheme.secondaryContainer,
+            ),
+            onClick = { model.clearMessages() },
+        ) {
+            Text(
+                text = error ?: notice.orEmpty(),
+                modifier = Modifier.padding(12.dp),
+            )
+        }
+    }
+}
+
+@Composable
+private fun LoginScreen(model: MainViewModel) {
+    var identifier by rememberSaveable { mutableStateOf("") }
+    var password by rememberSaveable { mutableStateOf("") }
+
+    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")
+            MessageStrip(model)
+            OutlinedTextField(
+                value = identifier,
+                onValueChange = { identifier = it },
+                label = { Text("Usuario o email") },
+                modifier = Modifier.fillMaxWidth(),
+                singleLine = true,
+            )
+            OutlinedTextField(
+                value = password,
+                onValueChange = { password = it },
+                label = { Text("Contraseña") },
+                modifier = Modifier.fillMaxWidth(),
+                singleLine = true,
+                visualTransformation = PasswordVisualTransformation(),
+            )
+            Button(
+                onClick = { model.login(identifier, password) },
+                modifier = Modifier.fillMaxWidth(),
+                enabled = !model.busy,
+            ) {
+                if (model.busy) CircularProgressIndicator(modifier = Modifier.width(20.dp).height(20.dp))
+                else Text("Ingresar")
+            }
+            Text(
+                "El acceso móvil está reservado a usuarios con rol Inspector.",
+                style = MaterialTheme.typography.bodySmall,
+            )
+        }
+    }
+}
+
+@Composable
+private fun VisitsScreen(model: MainViewModel) {
+    val session = model.session ?: return
+    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) { Text("Actualizar") }
+                Spacer(Modifier.width(8.dp))
+                OutlinedButton(onClick = { model.logout() }) { Text("Salir") }
+            }
+        }
+        Column(Modifier.padding(horizontal = 16.dp)) { MessageStrip(model) }
+        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.")
+            }
+        } else {
+            LazyColumn(
+                Modifier.fillMaxSize().padding(horizontal = 16.dp),
+                verticalArrangement = Arrangement.spacedBy(10.dp),
+            ) {
+                items(model.visits, key = { it.id }) { visit ->
+                    VisitCard(visit) { model.openVisit(visit.id) }
+                }
+                item { Spacer(Modifier.height(24.dp)) }
+            }
+        }
+    }
+}
+
+@Composable
+private fun VisitCard(visit: VisitSummary, onOpen: () -> Unit) {
+    Card(onClick = onOpen, modifier = Modifier.fillMaxWidth()) {
+        Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                Text(visit.code, fontWeight = FontWeight.Bold)
+                Text(visit.status)
+            }
+            Text(visit.operatorCompany?.name ?: "Operadora sin definir")
+            Text(visit.operationalArea?.name ?: "Área sin definir", style = MaterialTheme.typography.bodySmall)
+            visit.plannedStartAt?.let { Text("Prevista: ${shortDate(it)}", style = MaterialTheme.typography.bodySmall) }
+            Text("Inventario: ${visit.assetCount} · Equipo inspector: ${visit.memberCount}", style = MaterialTheme.typography.bodySmall)
+        }
+    }
+}
+
+@Composable
+private fun VisitRouter(model: MainViewModel) {
+    var inventoryMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
+    if (inventoryMode) {
+        FieldInventoryScreen(model) { inventoryMode = false }
+    } else {
+        VisitScreen(model) { inventoryMode = true }
+    }
+}
+
+@Composable
+private fun VisitScreen(model: MainViewModel, onInventory: () -> 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(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.instructions?.takeIf { it.isNotBlank() }?.let {
+            Card(Modifier.fillMaxWidth()) { Column(Modifier.padding(12.dp)) { Text("Instrucciones", fontWeight = FontWeight.Bold); Text(it) } }
+        }
+        MessageStrip(model)
+
+        if (visit.status == "PLANNED") {
+            Button(onClick = { model.startVisit() }, enabled = !model.busy, modifier = Modifier.fillMaxWidth()) {
+                Text("Iniciar inspección")
+            }
+        }
+        if (visit.status == "PLANNED" || visit.status == "IN_PROGRESS") {
+            OutlinedButton(onClick = onInventory, modifier = Modifier.fillMaxWidth()) { Text("Inventario de campo") }
+        }
+
+        ChecklistCard(visit)
+
+        Text("Inventario planificado", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+        if (visit.planningAssets.isEmpty()) 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 ChecklistCard(visit: VisitDetail) {
+    val checklist = visit.checklist
+    Card(Modifier.fillMaxWidth()) {
+        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+            Text("Checklist de antecedentes", 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)
+            checklist.items.take(10).forEach { item ->
+                HorizontalDivider()
+                Text(item.findingTitle ?: item.findingCode ?: "Hallazgo", fontWeight = FontWeight.SemiBold)
+                Text("${item.asset?.name.orEmpty()} · Gravedad ${item.severity ?: "s/d"}", style = MaterialTheme.typography.bodySmall)
+            }
+        }
+    }
+}
+
+@Composable
+private fun FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    val visit = model.visit ?: return
+    var search by rememberSaveable { mutableStateOf("") }
+    var showCreate by rememberSaveable { mutableStateOf(false) }
+    var parentId by rememberSaveable { mutableStateOf<String?>(null) }
+    var parentLabel by rememberSaveable { mutableStateOf("Área de la inspección") }
+    var name by rememberSaveable { mutableStateOf("") }
+    var commonName by rememberSaveable { mutableStateOf("") }
+    var selectedTypeId by rememberSaveable { mutableStateOf<String?>(null) }
+    val attributeValues = remember { mutableStateMapOf<String, String>() }
+
+    LaunchedEffect(visit.id) {
+        model.searchInventory("")
+        model.loadFieldTypes(null)
+    }
+    LaunchedEffect(model.fieldTypes) {
+        if (model.fieldTypes.none { it.id == selectedTypeId }) {
+            selectedTypeId = model.fieldTypes.firstOrNull()?.id
+            attributeValues.clear()
+        }
+    }
+
+    val selectedType = model.fieldTypes.firstOrNull { it.id == selectedTypeId }
+
+    val createWithLocation: () -> Unit = {
+        val type = selectedType
+        if (type != null) {
+            scope.launch {
+                runCatching { currentGeo(context) }
+                    .onSuccess { geo ->
+                        val values = buildAttributes(type, attributeValues)
+                        model.createFieldAsset(type, parentId, name, commonName, values, geo.latitude, geo.longitude, geo.accuracyM)
+                    }
+            }
+        }
+    }
+    val locationPermissionLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
+        val allowed = result[Manifest.permission.ACCESS_FINE_LOCATION] == true || result[Manifest.permission.ACCESS_COARSE_LOCATION] == true
+        if (allowed) createWithLocation()
+    }
+
+    var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
+    var pendingPhotoGeo by remember { mutableStateOf<GeoSnapshot?>(null) }
+    val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+        val file = pendingPhotoFile
+        val geo = pendingPhotoGeo
+        if (success && file != null && geo != null) {
+            runCatching { writeExif(file, geo) }
+            model.uploadFieldPhoto(file, geo.latitude, geo.longitude, geo.accuracyM)
+        }
+        pendingPhotoFile = null
+        pendingPhotoGeo = null
+    }
+    val beginPhoto: () -> Unit = {
+        scope.launch {
+            runCatching { currentGeo(context) }.onSuccess { geo ->
+                val (file, uri) = newPhoto(context)
+                pendingPhotoFile = file
+                pendingPhotoGeo = geo
+                takePicture.launch(uri)
+            }
+        }
+    }
+    val photoPermissionLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
+        val camera = result[Manifest.permission.CAMERA] == true || hasPermission(context, Manifest.permission.CAMERA)
+        val location = result[Manifest.permission.ACCESS_FINE_LOCATION] == true || result[Manifest.permission.ACCESS_COARSE_LOCATION] == true || hasLocation(context)
+        if (camera && location) beginPhoto()
+    }
+
+    Column(Modifier.fillMaxSize().padding(top = 28.dp)) {
+        Row(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp), horizontalArrangement = Arrangement.SpaceBetween) {
+            OutlinedButton(onClick = onBack) { Text("Volver") }
+            Text("Inventario de campo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+        }
+        Column(Modifier.padding(horizontal = 16.dp)) { MessageStrip(model) }
+
+        val selectedCapture = model.selectedFieldAsset
+        if (selectedCapture != null) {
+            CaptureCard(
+                detailName = selectedCapture.asset.name,
+                captureRequired = selectedCapture.capture.captureRequired,
+                gps = selectedCapture.capture.creationGpsCaptured,
+                photos = selectedCapture.capture.fieldPhotoCount,
+                ready = selectedCapture.capture.readyForFinding,
+                onPhoto = {
+                    val permissions = arrayOf(Manifest.permission.CAMERA, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION)
+                    if (hasPermission(context, Manifest.permission.CAMERA) && hasLocation(context)) beginPhoto()
+                    else photoPermissionLauncher.launch(permissions)
+                },
+                onClose = { model.clearSelectedFieldAsset() },
+            )
+        }
+
+        Row(Modifier.fillMaxWidth().padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically) {
+            OutlinedTextField(
+                value = search,
+                onValueChange = { search = it },
+                label = { Text("Buscar por nombre, código o atributo") },
+                modifier = Modifier.weight(1f),
+                singleLine = true,
+            )
+            Spacer(Modifier.width(8.dp))
+            Button(onClick = { model.searchInventory(search) }, enabled = !model.busy) { Text("Buscar") }
+        }
+        if (visit.status == "IN_PROGRESS") {
+            Row(Modifier.fillMaxWidth().padding(16.dp), horizontalArrangement = Arrangement.SpaceBetween) {
+                Text("Alta en campo", fontWeight = FontWeight.Bold)
+                OutlinedButton(onClick = {
+                    showCreate = !showCreate
+                    if (showCreate) model.loadFieldTypes(parentId)
+                }) { Text(if (showCreate) "Ocultar" else "Crear nuevo") }
+            }
+        }
+
+        if (showCreate && visit.status == "IN_PROGRESS") {
+            Column(
+                Modifier.fillMaxWidth().padding(horizontal = 16.dp).verticalScroll(rememberScrollState()).weight(1f, fill = false),
+                verticalArrangement = Arrangement.spacedBy(10.dp),
+            ) {
+                Text("Padre: $parentLabel", style = MaterialTheme.typography.bodySmall)
+                if (parentId != null) {
+                    OutlinedButton(onClick = {
+                        parentId = null
+                        parentLabel = "Área de la inspección"
+                        model.loadFieldTypes(null)
+                    }) { Text("Volver al Área") }
+                }
+                if (model.fieldTypes.isEmpty()) Text("No hay tipos habilitados debajo de este padre.")
+                LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                    items(model.fieldTypes, key = { it.id }) { type ->
+                        AssistChip(
+                            onClick = { selectedTypeId = type.id; attributeValues.clear() },
+                            label = { Text(if (type.id == selectedTypeId) "✓ ${type.name}" else type.name) },
+                        )
+                    }
+                }
+                OutlinedTextField(name, { name = it }, label = { Text("Nombre o código identificable *") }, modifier = Modifier.fillMaxWidth())
+                OutlinedTextField(commonName, { commonName = it }, label = { Text("Nombre común") }, 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 requiredReady = selectedType?.attributes?.filter { it.isRequired }?.all { attributeValues[it.code].orEmpty().isNotBlank() } ?: false
+                Button(
+                    onClick = {
+                        if (hasLocation(context)) createWithLocation()
+                        else locationPermissionLauncher.launch(arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION))
+                    },
+                    enabled = selectedType != null && name.isNotBlank() && requiredReady && !model.busy,
+                    modifier = Modifier.fillMaxWidth(),
+                ) { Text("Capturar GPS y crear") }
+                HorizontalDivider()
+            }
+        }
+
+        Text("Resultados", modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), fontWeight = FontWeight.Bold)
+        LazyColumn(
+            Modifier.fillMaxSize().padding(horizontal = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            items(model.inventory, key = { it.id }) { item ->
+                InventoryCard(
+                    item = item,
+                    canModify = visit.status == "IN_PROGRESS",
+                    onSelect = { model.selectExisting(item) },
+                    onUseParent = {
+                        parentId = item.id
+                        parentLabel = "${item.name} (${item.code})"
+                        showCreate = true
+                        selectedTypeId = null
+                        model.loadFieldTypes(item.id)
+                    },
+                )
+            }
+            item { Spacer(Modifier.height(30.dp)) }
+        }
+    }
+}
+
+@Composable
+private fun CaptureCard(
+    detailName: String,
+    captureRequired: Boolean,
+    gps: Boolean,
+    photos: Int,
+    ready: Boolean,
+    onPhoto: () -> Unit,
+    onClose: () -> Unit,
+) {
+    Card(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) {
+        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                Text(detailName, fontWeight = FontWeight.Bold)
+                OutlinedButton(onClick = onClose) { Text("Cerrar") }
+            }
+            Text("GPS de alta: ${if (gps) "OK" else "pendiente"} · Fotos: $photos")
+            if (captureRequired && !ready) {
+                Text("El Hallazgo permanece bloqueado hasta completar GPS + foto.", color = MaterialTheme.colorScheme.error)
+                Button(onClick = onPhoto, modifier = Modifier.fillMaxWidth()) { Text("Tomar foto obligatoria") }
+            } else if (ready) {
+                Text("Captura completa · habilitado para Hallazgos", color = MaterialTheme.colorScheme.primary)
+            }
+        }
+    }
+}
+
+@Composable
+private fun InventoryCard(item: FieldInventoryItem, canModify: Boolean, onSelect: () -> Unit, onUseParent: () -> Unit) {
+    Card(Modifier.fillMaxWidth()) {
+        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
+            Text(item.name, fontWeight = FontWeight.SemiBold)
+            Text("${item.code} · ${item.type?.name.orEmpty()}", style = MaterialTheme.typography.bodySmall)
+            item.commonName?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
+            Text(
+                if (item.readyForFinding) "Listo" else "Captura incompleta: GPS/foto pendiente",
+                color = if (item.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
+                style = MaterialTheme.typography.bodySmall,
+            )
+            if (canModify) {
+                Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                    OutlinedButton(onClick = onSelect) { Text(if (item.selectedInInspection) "Abrir" else "Seleccionar") }
+                    OutlinedButton(onClick = onUseParent) { Text("Crear hijo") }
+                }
+            }
+        }
+    }
+}
+
+private fun buildAttributes(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 coerceAttribute(definition, raw)
+    }.toMap()
+
+private fun coerceAttribute(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 hasPermission(context: Context, permission: String): Boolean =
+    ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
+
+private fun hasLocation(context: Context): Boolean =
+    hasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) || hasPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
+
+private suspend fun currentGeo(context: Context): GeoSnapshot = suspendCancellableCoroutine { continuation ->
+    if (!hasLocation(context)) {
+        continuation.resumeWithException(SecurityException("Se necesita permiso de ubicación."))
+        return@suspendCancellableCoroutine
+    }
+    val source = CancellationTokenSource()
+    val client = LocationServices.getFusedLocationProviderClient(context)
+    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+            else continuation.resume(GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
+    continuation.invokeOnCancellation { source.cancel() }
+}
+
+private fun newPhoto(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_${System.currentTimeMillis()}_", ".jpg", directory)
+    val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
+    return file to uri
+}
+
+private fun writeExif(file: File, geo: GeoSnapshot) {
+    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 shortDate(value: String): String = value.replace('T', ' ').take(16)
@@ -0,0 +1,762 @@
+package com.korexlabs.dhinspeccion.ui
+
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Environment
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AssistChip
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import androidx.exifinterface.media.ExifInterface
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.location.Priority
+import com.google.android.gms.tasks.CancellationTokenSource
+import com.korexlabs.dhinspeccion.MainViewModel
+import com.korexlabs.dhinspeccion.data.FieldAttributeDefinition
+import com.korexlabs.dhinspeccion.data.FieldInventoryItem
+import com.korexlabs.dhinspeccion.data.FieldType
+import com.korexlabs.dhinspeccion.data.VisitDetail
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import java.io.File
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+private data class F3GeoSnapshot(
+    val latitude: Double,
+    val longitude: Double,
+    val accuracyM: Double?,
+)
+
+@Composable
+fun F3VisitRoot(model: MainViewModel) {
+    var inventoryMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
+    var actsMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
+    when {
+        actsMode -> MobileActsScreen(
+            model = model,
+            onBack = { actsMode = false },
+            onGoInventory = {
+                actsMode = false
+                inventoryMode = true
+            },
+        )
+        inventoryMode -> F3FieldInventoryScreen(model, onBack = { inventoryMode = false })
+        else -> F3VisitOverview(
+            model = model,
+            onInventory = { inventoryMode = true },
+            onActs = { actsMode = true },
+        )
+    }
+}
+
+@Composable
+private fun F3VisitOverview(
+    model: MainViewModel,
+    onInventory: () -> Unit,
+    onActs: () -> Unit,
+) {
+    val visit = model.visit ?: return
+    Column(
+        Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .padding(top = 28.dp, start = 16.dp, end = 16.dp, bottom = 30.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Row(
+            Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedButton(onClick = { model.closeVisitView() }) { Text("Volver") }
+            Text(statusLabel(visit.status), fontWeight = FontWeight.Bold)
+        }
+        Text(visit.code, style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
+        Text("${visit.operatorCompany?.name ?: "Sin operadora"} · ${visit.operationalArea?.name ?: "Sin área"}")
+        visit.plannedStartAt?.let {
+            Text("Planificada: ${f3ShortDate(it)}", style = MaterialTheme.typography.bodySmall)
+        }
+        visit.instructions?.takeIf { it.isNotBlank() }?.let {
+            Card(Modifier.fillMaxWidth()) {
+                Column(Modifier.padding(12.dp)) {
+                    Text("Instrucciones", fontWeight = FontWeight.Bold)
+                    Text(it)
+                }
+            }
+        }
+        F3MessageStrip(model)
+
+        if (visit.status == "PLANNED") {
+            Card(
+                Modifier.fillMaxWidth(),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
+            ) {
+                Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text("La inspección todavía no comenzó", fontWeight = FontWeight.Bold)
+                    Text("Iniciarla registra fecha/hora real y tu usuario como actor de campo.")
+                    Button(
+                        onClick = { model.startVisit() },
+                        enabled = !model.busy,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { Text(if (model.busy) "Iniciando…" else "Iniciar inspección") }
+                }
+            }
+        }
+
+        if (visit.status == "IN_PROGRESS") {
+            Button(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
+                Text("Abrir Inventario de campo")
+            }
+            OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
+                val open = model.acts.count { it.status == "DRAFT" || it.status == "READY" }
+                Text("Actas de la inspección · ${model.acts.size}${if (open > 0) " · $open abiertas" else ""}")
+            }
+        } else if (visit.status == "CLOSED") {
+            OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
+                Text("Ver Actas · ${model.acts.size}")
+            }
+        } else if (visit.status == "PLANNED") {
+            Text(
+                "Primero iniciá la inspección para habilitar altas, fotografías, Actas y Hallazgos.",
+                style = MaterialTheme.typography.bodySmall,
+            )
+        }
+
+        F3ChecklistCard(visit)
+
+        Text("Inventario planificado", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+        if (visit.planningAssets.none { it.included }) {
+            Text("Sin elementos planificados.")
+        }
+        visit.planningAssets.filter { it.included }.forEach { asset ->
+            Card(Modifier.fillMaxWidth()) {
+                Column(Modifier.padding(10.dp)) {
+                    Text(asset.name, fontWeight = FontWeight.SemiBold)
+                    Text("${asset.code} · ${asset.typeName.orEmpty()}", style = MaterialTheme.typography.bodySmall)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun F3ChecklistCard(visit: VisitDetail) {
+    val checklist = visit.checklist
+    Card(Modifier.fillMaxWidth()) {
+        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+            Text("Antecedentes antes de salir", fontWeight = FontWeight.Bold)
+            Text("Vencidos empresa: ${checklist.companyOverdue} · Verificaciones vencidas: ${checklist.verificationOverdue}")
+            Text("Antecedentes: ${checklist.antecedents} · Próximos controles: ${checklist.upcomingControls}")
+            if (checklist.stale) {
+                Text("El checklist requiere revisión/actualización.", color = MaterialTheme.colorScheme.error)
+            }
+        }
+    }
+}
+
+@Composable
+private fun F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    val visit = model.visit ?: return
+
+    var search by rememberSaveable(visit.id) { mutableStateOf("") }
+    var showCreate by rememberSaveable(visit.id) { mutableStateOf(false) }
+    var parentId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
+    var parentLabel by rememberSaveable(visit.id) { mutableStateOf("Área de la inspección") }
+    var name by rememberSaveable(visit.id) { mutableStateOf("") }
+    var commonName by rememberSaveable(visit.id) { mutableStateOf("") }
+    var selectedTypeId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
+    var selectedFamilyId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
+    val attributeValues = remember { mutableStateMapOf<String, String>() }
+
+    var mergeSearch by rememberSaveable(visit.id) { mutableStateOf("") }
+    var mergeCandidateId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
+    var mergeReason by rememberSaveable(visit.id) { mutableStateOf("") }
+
+    LaunchedEffect(visit.id) {
+        model.searchInventory("")
+        model.loadFieldTypes(null)
+    }
+    LaunchedEffect(model.fieldTypes) {
+        if (model.fieldTypes.none { it.id == selectedTypeId }) {
+            selectedTypeId = model.fieldTypes.firstOrNull()?.id
+            selectedFamilyId = null
+            attributeValues.clear()
+        }
+    }
+
+    val selectedType = model.fieldTypes.firstOrNull { it.id == selectedTypeId }
+    val selectedFamily = selectedType?.families?.firstOrNull { it.id == selectedFamilyId }
+
+    fun resetCreateForm() {
+        name = ""
+        commonName = ""
+        selectedFamilyId = null
+        attributeValues.clear()
+    }
+
+    val createWithLocation: () -> Unit = {
+        val type = selectedType
+        if (type != null) {
+            scope.launch {
+                runCatching { currentF3Geo(context) }
+                    .onSuccess { geo ->
+                        model.createFieldAsset(
+                            type = type,
+                            parentId = parentId,
+                            familyId = selectedFamilyId,
+                            name = name,
+                            commonName = commonName,
+                            attributes = buildF3Attributes(type, attributeValues),
+                            latitude = geo.latitude,
+                            longitude = geo.longitude,
+                            accuracyM = geo.accuracyM,
+                        )
+                    }
+            }
+        }
+    }
+    val locationPermissionLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions(),
+    ) { result ->
+        val allowed = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
+            result[Manifest.permission.ACCESS_COARSE_LOCATION] == true
+        if (allowed) createWithLocation()
+    }
+
+    var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
+    var pendingPhotoGeo by remember { mutableStateOf<F3GeoSnapshot?>(null) }
+    val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+        val file = pendingPhotoFile
+        val geo = pendingPhotoGeo
+        if (success && file != null && geo != null) {
+            runCatching { writeF3Exif(file, geo) }
+            model.uploadFieldPhoto(file, geo.latitude, geo.longitude, geo.accuracyM)
+        }
+        pendingPhotoFile = null
+        pendingPhotoGeo = null
+    }
+    val beginPhoto: () -> Unit = {
+        scope.launch {
+            runCatching { currentF3Geo(context) }.onSuccess { geo ->
+                val (file, uri) = newF3Photo(context)
+                pendingPhotoFile = file
+                pendingPhotoGeo = geo
+                takePicture.launch(uri)
+            }
+        }
+    }
+    val photoPermissionLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions(),
+    ) { result ->
+        val camera = result[Manifest.permission.CAMERA] == true || f3HasPermission(context, Manifest.permission.CAMERA)
+        val location = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
+            result[Manifest.permission.ACCESS_COARSE_LOCATION] == true || f3HasLocation(context)
+        if (camera && location) beginPhoto()
+    }
+
+    val selectedCapture = model.selectedFieldAsset
+    val mergeSource = selectedCapture?.takeIf {
+        it.capture.captureRequired &&
+            it.asset.type?.let { type -> f3TypeCode(type) in setOf("instalacion", "subinstalacion") } == true
+    }
+    val mergeCandidates = remember(model.inventory, mergeSource) {
+        if (mergeSource == null) emptyList() else model.inventory.filter { candidate ->
+            candidate.id != mergeSource.asset.id &&
+                candidate.informationStatus != "INACTIVE" &&
+                candidate.type?.id == mergeSource.asset.type?.id &&
+                candidate.parent?.id == mergeSource.asset.parent?.id &&
+                !candidate.captureRequired
+        }
+    }
+
+    Column(Modifier.fillMaxSize().padding(top = 28.dp)) {
+        Row(
+            Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedButton(onClick = onBack) { Text("Volver") }
+            Column(horizontalAlignment = Alignment.End) {
+                Text("Inventario de campo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+                Text("Área → Yacimiento → Instalación → Subinstalación", style = MaterialTheme.typography.bodySmall)
+            }
+        }
+        Column(Modifier.padding(horizontal = 16.dp)) { F3MessageStrip(model) }
+
+        if (selectedCapture != null) {
+            F3CaptureCard(
+                detailName = selectedCapture.asset.name,
+                captureRequired = selectedCapture.capture.captureRequired,
+                gps = selectedCapture.capture.creationGpsCaptured,
+                photos = selectedCapture.capture.fieldPhotoCount,
+                ready = selectedCapture.capture.readyForFinding,
+                onPhoto = {
+                    val permissions = arrayOf(
+                        Manifest.permission.CAMERA,
+                        Manifest.permission.ACCESS_FINE_LOCATION,
+                        Manifest.permission.ACCESS_COARSE_LOCATION,
+                    )
+                    if (f3HasPermission(context, Manifest.permission.CAMERA) && f3HasLocation(context)) beginPhoto()
+                    else photoPermissionLauncher.launch(permissions)
+                },
+                onClose = { model.clearSelectedFieldAsset() },
+            )
+        }
+
+        if (mergeSource != null) {
+            Card(
+                Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer),
+            ) {
+                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text("¿Lo acabás de crear y ya existía?", fontWeight = FontWeight.Bold)
+                    Text(
+                        "Podés fusionar esta alta de campo con el registro existente. La ficha nueva no se borra: queda como alias histórico con fecha, inspector e inspección.",
+                        style = MaterialTheme.typography.bodySmall,
+                    )
+                    Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+                        OutlinedTextField(
+                            value = mergeSearch,
+                            onValueChange = { mergeSearch = it },
+                            label = { Text("Buscar posible duplicado") },
+                            modifier = Modifier.weight(1f),
+                            singleLine = true,
+                        )
+                        Spacer(Modifier.width(8.dp))
+                        OutlinedButton(onClick = {
+                            mergeCandidateId = null
+                            model.searchInventory(mergeSearch, mergeSource.asset.parent?.id)
+                        }) { Text("Buscar") }
+                    }
+                    if (mergeCandidates.isEmpty()) {
+                        Text("No hay coincidencias compatibles en esta búsqueda.", style = MaterialTheme.typography.bodySmall)
+                    } else {
+                        mergeCandidates.take(8).forEach { candidate ->
+                            AssistChip(
+                                onClick = { mergeCandidateId = candidate.id },
+                                label = {
+                                    Text(
+                                        if (mergeCandidateId == candidate.id) "✓ ${candidate.code} · ${candidate.name}"
+                                        else "${candidate.code} · ${candidate.name}",
+                                    )
+                                },
+                            )
+                        }
+                    }
+                    OutlinedTextField(
+                        value = mergeReason,
+                        onValueChange = { mergeReason = it },
+                        label = { Text("Motivo de la fusión") },
+                        minLines = 2,
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                    Button(
+                        onClick = {
+                            val target = mergeCandidateId ?: return@Button
+                            model.mergeCreatedFieldAsset(target, mergeReason)
+                        },
+                        enabled = mergeCandidateId != null && mergeReason.trim().length >= 8 && !model.busy,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { Text("Fusionar y conservar el registro existente") }
+                }
+            }
+        }
+
+        Row(
+            Modifier.fillMaxWidth().padding(horizontal = 16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedTextField(
+                value = search,
+                onValueChange = { search = it },
+                label = { Text("Buscar por nombre o código") },
+                modifier = Modifier.weight(1f),
+                singleLine = true,
+            )
+            Spacer(Modifier.width(8.dp))
+            Button(onClick = { model.searchInventory(search) }, enabled = !model.busy) { Text("Buscar") }
+        }
+
+        Row(
+            Modifier.fillMaxWidth().padding(16.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Column {
+                Text("Alta en campo", fontWeight = FontWeight.Bold)
+                Text("Padre: $parentLabel", style = MaterialTheme.typography.bodySmall)
+            }
+            OutlinedButton(onClick = {
+                showCreate = !showCreate
+                if (showCreate) model.loadFieldTypes(parentId)
+            }) { Text(if (showCreate) "Ocultar" else "Agregar") }
+        }
+
+        if (showCreate) {
+            Column(
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp)
+                    .verticalScroll(rememberScrollState())
+                    .weight(1f, fill = false),
+                verticalArrangement = Arrangement.spacedBy(10.dp),
+            ) {
+                if (parentId != null) {
+                    OutlinedButton(onClick = {
+                        parentId = null
+                        parentLabel = "Área de la inspección"
+                        resetCreateForm()
+                        selectedTypeId = null
+                        model.loadFieldTypes(null)
+                    }) { Text("Volver al Área") }
+                }
+
+                if (model.fieldTypes.isEmpty()) {
+                    Text("Este nivel no admite más hijos estructurales.")
+                } else {
+                    Text("Vas a crear", style = MaterialTheme.typography.bodySmall)
+                    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        items(model.fieldTypes, key = { it.id }) { type ->
+                            AssistChip(
+                                onClick = {
+                                    selectedTypeId = type.id
+                                    selectedFamilyId = null
+                                    attributeValues.clear()
+                                },
+                                label = { Text(if (type.id == selectedTypeId) "✓ ${type.name}" else type.name) },
+                            )
+                        }
+                    }
+                }
+
+                if (selectedType?.familyRequired == true) {
+                    Text("Familia técnica", fontWeight = FontWeight.Bold)
+                    Text(
+                        "Elegí la que corresponda al Excel. Si no existe, usá Otro / no catalogado; nunca quedás bloqueado.",
+                        style = MaterialTheme.typography.bodySmall,
+                    )
+                    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        items(selectedType.families, key = { it.id }) { family ->
+                            AssistChip(
+                                onClick = { selectedFamilyId = family.id },
+                                label = {
+                                    val prefix = when {
+                                        selectedFamilyId == family.id -> "✓ "
+                                        family.isOther -> "+ "
+                                        else -> ""
+                                    }
+                                    Text(prefix + family.name)
+                                },
+                            )
+                        }
+                    }
+                    selectedFamily?.let { family ->
+                        if (family.isOther) {
+                            Text(
+                                "Se registrará como familia no catalogada para revisión posterior en oficina.",
+                                color = MaterialTheme.colorScheme.secondary,
+                                style = MaterialTheme.typography.bodySmall,
+                            )
+                        }
+                        if (family.informationLabels.isNotEmpty()) {
+                            Text(
+                                "Información esperada: ${family.informationLabels.joinToString(" · ")}",
+                                style = MaterialTheme.typography.bodySmall,
+                            )
+                        }
+                    }
+                }
+
+                OutlinedTextField(
+                    value = name,
+                    onValueChange = { name = it },
+                    label = { Text("Nombre identificable *") },
+                    modifier = Modifier.fillMaxWidth(),
+                )
+                OutlinedTextField(
+                    value = commonName,
+                    onValueChange = { commonName = it },
+                    label = { Text("Nombre habitual") },
+                    modifier = Modifier.fillMaxWidth(),
+                )
+
+                selectedType?.attributes?.forEach { definition ->
+                    OutlinedTextField(
+                        value = attributeValues[definition.code].orEmpty(),
+                        onValueChange = { attributeValues[definition.code] = it },
+                        label = { Text(definition.name + if (definition.isRequired) " *" else "") },
+                        supportingText = {
+                            val details = listOfNotNull(definition.unit, definition.options?.toString()).joinToString(" · ")
+                            if (details.isNotBlank()) Text(details)
+                        },
+                        keyboardOptions = KeyboardOptions(
+                            keyboardType = if (
+                                definition.dataType.uppercase() in setOf("NUMBER", "DECIMAL", "INTEGER", "FLOAT")
+                            ) KeyboardType.Decimal else KeyboardType.Text,
+                        ),
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                }
+
+                val attributesReady = selectedType?.attributes
+                    ?.filter { it.isRequired }
+                    ?.all { attributeValues[it.code].orEmpty().isNotBlank() }
+                    ?: false
+                val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
+                Button(
+                    onClick = {
+                        if (f3HasLocation(context)) createWithLocation()
+                        else locationPermissionLauncher.launch(
+                            arrayOf(
+                                Manifest.permission.ACCESS_FINE_LOCATION,
+                                Manifest.permission.ACCESS_COARSE_LOCATION,
+                            ),
+                        )
+                    },
+                    enabled = selectedType != null && name.isNotBlank() && attributesReady && familyReady && !model.busy,
+                    modifier = Modifier.fillMaxWidth(),
+                ) { Text("Capturar GPS y crear") }
+                HorizontalDivider()
+            }
+        }
+
+        Text("Estructura disponible", modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), fontWeight = FontWeight.Bold)
+        LazyColumn(
+            Modifier.fillMaxSize().padding(horizontal = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            items(model.inventory, key = { it.id }) { item ->
+                F3InventoryCard(
+                    item = item,
+                    onInspect = { model.selectExisting(item) },
+                    onUseParent = {
+                        parentId = item.id
+                        parentLabel = "${item.name} (${item.code})"
+                        showCreate = true
+                        selectedTypeId = null
+                        resetCreateForm()
+                        model.loadFieldTypes(item.id)
+                    },
+                )
+            }
+            item { Spacer(Modifier.height(30.dp)) }
+        }
+    }
+}
+
+@Composable
+private fun F3CaptureCard(
+    detailName: String,
+    captureRequired: Boolean,
+    gps: Boolean,
+    photos: Int,
+    ready: Boolean,
+    onPhoto: () -> Unit,
+    onClose: () -> Unit,
+) {
+    Card(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp)) {
+        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                Text(detailName, fontWeight = FontWeight.Bold)
+                OutlinedButton(onClick = onClose) { Text("Cerrar") }
+            }
+            if (captureRequired) {
+                Text("GPS de alta: ${if (gps) "OK" else "pendiente"} · Fotos: $photos")
+                if (!ready) {
+                    Text("Antes de registrar Hallazgos, completá GPS + foto.", color = MaterialTheme.colorScheme.error)
+                    Button(onClick = onPhoto, modifier = Modifier.fillMaxWidth()) { Text("Tomar foto obligatoria") }
+                } else {
+                    Text("Captura completa · listo para Hallazgos", color = MaterialTheme.colorScheme.primary)
+                }
+            } else {
+                Text("Registro existente seleccionado.", style = MaterialTheme.typography.bodySmall)
+            }
+        }
+    }
+}
+
+@Composable
+private fun F3InventoryCard(
+    item: FieldInventoryItem,
+    onInspect: () -> Unit,
+    onUseParent: () -> Unit,
+) {
+    val typeCode = item.type?.let(::f3TypeCode).orEmpty()
+    val canHaveFinding = typeCode in setOf("instalacion", "subinstalacion")
+    val canHaveChild = typeCode in setOf("yacimiento", "instalacion")
+    val childLabel = if (typeCode == "yacimiento") "Agregar instalación aquí" else "Agregar subinstalación aquí"
+
+    Card(Modifier.fillMaxWidth()) {
+        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                Text(item.name, fontWeight = FontWeight.SemiBold)
+                Text(structureLabel(typeCode), style = MaterialTheme.typography.bodySmall)
+            }
+            Text(item.code, style = MaterialTheme.typography.bodySmall)
+            item.commonName?.takeIf { it.isNotBlank() }?.let {
+                Text(it, style = MaterialTheme.typography.bodySmall)
+            }
+            if (canHaveFinding) {
+                Text(
+                    if (item.readyForFinding) "Disponible para Hallazgos" else "GPS/foto pendiente",
+                    color = if (item.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
+                    style = MaterialTheme.typography.bodySmall,
+                )
+                OutlinedButton(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
+                    Text(if (item.selectedInInspection) "Abrir Hallazgos" else "Usar en esta inspección")
+                }
+            }
+            if (canHaveChild) {
+                OutlinedButton(onClick = onUseParent, modifier = Modifier.fillMaxWidth()) { Text(childLabel) }
+            }
+        }
+    }
+}
+
+@Composable
+private fun F3MessageStrip(model: MainViewModel) {
+    val error = model.error
+    val notice = model.notice
+    if (error != null || notice != null) {
+        Card(
+            modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp),
+            colors = CardDefaults.cardColors(
+                containerColor = if (error != null) MaterialTheme.colorScheme.errorContainer
+                else MaterialTheme.colorScheme.secondaryContainer,
+            ),
+            onClick = { model.clearMessages() },
+        ) {
+            Text(error ?: notice.orEmpty(), Modifier.padding(12.dp))
+        }
+    }
+}
+
+private fun f3TypeCode(summary: com.korexlabs.dhinspeccion.data.AssetSummary): String =
+    (summary.typeName ?: summary.name).trim().lowercase()
+        .replace('ó', 'o').replace('í', 'i').replace('á', 'a').replace('é', 'e').replace('ú', 'u')
+
+private fun structureLabel(typeCode: String): String = when (typeCode) {
+    "area" -> "Área"
+    "yacimiento" -> "Yacimiento"
+    "instalacion" -> "Instalación"
+    "subinstalacion" -> "Subinstalación"
+    else -> typeCode.ifBlank { "Inventario" }
+}
+
+private fun statusLabel(status: String): String = when (status) {
+    "PLANNED" -> "Planificada"
+    "IN_PROGRESS" -> "En curso"
+    "CLOSED" -> "Cerrada"
+    "CANCELLED" -> "Cancelada"
+    else -> status
+}
+
+private fun buildF3Attributes(type: FieldType, values: Map<String, String>): Map<String, Any?> =
+    type.attributes.mapNotNull { definition ->
+        val raw = values[definition.code]?.trim().orEmpty()
+        if (raw.isBlank()) return@mapNotNull null
+        definition.code to coerceF3Attribute(definition, raw)
+    }.toMap()
+
+private fun coerceF3Attribute(definition: FieldAttributeDefinition, raw: String): Any = when (definition.dataType.uppercase()) {
+    "INTEGER", "INT" -> raw.toLongOrNull() ?: raw
+    "NUMBER", "DECIMAL", "FLOAT", "DOUBLE" -> raw.replace(',', '.').toDoubleOrNull() ?: raw
+    "BOOLEAN", "BOOL" -> raw.lowercase() in setOf("true", "1", "si", "sí", "yes")
+    else -> raw
+}
+
+private fun f3HasPermission(context: Context, permission: String): Boolean =
+    ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
+
+private fun f3HasLocation(context: Context): Boolean =
+    f3HasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ||
+        f3HasPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
+
+private suspend fun currentF3Geo(context: Context): F3GeoSnapshot = suspendCancellableCoroutine { continuation ->
+    if (!f3HasLocation(context)) {
+        continuation.resumeWithException(SecurityException("Se necesita permiso de ubicación."))
+        return@suspendCancellableCoroutine
+    }
+    val source = CancellationTokenSource()
+    val client = LocationServices.getFusedLocationProviderClient(context)
+    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) {
+                continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+            } else {
+                continuation.resume(F3GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+            }
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
+    continuation.invokeOnCancellation { source.cancel() }
+}
+
+private fun newF3Photo(context: Context): Pair<File, Uri> {
+    val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
+        ?: throw IllegalStateException("No se pudo acceder al almacenamiento de fotografías.")
+    directory.mkdirs()
+    val file = File.createTempFile("DH_F3_${System.currentTimeMillis()}_", ".jpg", directory)
+    val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
+    return file to uri
+}
+
+private fun writeF3Exif(file: File, geo: F3GeoSnapshot) {
+    val now = Instant.now()
+    val exif = ExifInterface(file)
+    exif.setLatLong(geo.latitude, geo.longitude)
+    val formatter = DateTimeFormatter.ofPattern("yyyy:MM:dd HH:mm:ss").withZone(ZoneId.systemDefault())
+    exif.setAttribute(ExifInterface.TAG_DATETIME_ORIGINAL, formatter.format(now))
+    exif.setAttribute(ExifInterface.TAG_DATETIME_DIGITIZED, formatter.format(now))
+    exif.saveAttributes()
+}
+
+private fun f3ShortDate(value: String): String = value.replace('T', ' ').take(16)
@@ -0,0 +1,421 @@
+package com.korexlabs.dhinspeccion.ui
+
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Environment
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import androidx.exifinterface.media.ExifInterface
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.location.Priority
+import com.google.android.gms.tasks.CancellationTokenSource
+import com.korexlabs.dhinspeccion.MainViewModel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import java.io.File
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+private data class FindingGeoSnapshot(
+    val latitude: Double,
+    val longitude: Double,
+    val accuracyM: Double?,
+)
+
+@Composable
+fun FieldFindingScreen(model: MainViewModel) {
+    val options = model.fieldFindingOptions ?: return
+    val asset = model.selectedFieldAsset?.asset ?: return
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    var search by rememberSaveable(asset.id) { mutableStateOf("") }
+    var selectedCatalogId by rememberSaveable(asset.id) { mutableStateOf<String?>(null) }
+    var other by rememberSaveable(asset.id) { mutableStateOf(false) }
+    var customTitle by rememberSaveable(asset.id) { mutableStateOf("") }
+    var customLegalBasis by rememberSaveable(asset.id) { mutableStateOf("") }
+    var description by rememberSaveable(asset.id) { mutableStateOf("") }
+    var severityText by rememberSaveable(asset.id) { mutableStateOf("") }
+    var correctionDueOn by rememberSaveable(asset.id) { mutableStateOf("") }
+
+    var requestedFindingId by remember { mutableStateOf<String?>(null) }
+    var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
+    var pendingPhotoGeo by remember { mutableStateOf<FindingGeoSnapshot?>(null) }
+    var pendingPhotoFindingId by remember { mutableStateOf<String?>(null) }
+
+    val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+        val file = pendingPhotoFile
+        val geo = pendingPhotoGeo
+        val findingId = pendingPhotoFindingId
+        if (success && file != null && geo != null && findingId != null) {
+            runCatching { writeFindingExif(file, geo) }
+            model.uploadFindingPhoto(
+                findingId = findingId,
+                file = file,
+                latitude = geo.latitude,
+                longitude = geo.longitude,
+                accuracyM = geo.accuracyM,
+                title = "Evidencia fotográfica de campo",
+            )
+        }
+        pendingPhotoFile = null
+        pendingPhotoGeo = null
+        pendingPhotoFindingId = null
+    }
+
+    fun beginPhoto(findingId: String) {
+        scope.launch {
+            runCatching { currentFindingGeo(context) }
+                .onSuccess { geo ->
+                    val (file, uri) = newFindingPhoto(context)
+                    pendingPhotoFile = file
+                    pendingPhotoGeo = geo
+                    pendingPhotoFindingId = findingId
+                    takePicture.launch(uri)
+                }
+        }
+    }
+
+    val photoPermissionLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions(),
+    ) { result ->
+        val camera = result[Manifest.permission.CAMERA] == true || findingHasPermission(context, Manifest.permission.CAMERA)
+        val location = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
+            result[Manifest.permission.ACCESS_COARSE_LOCATION] == true || findingHasLocation(context)
+        val findingId = requestedFindingId
+        requestedFindingId = null
+        if (camera && location && findingId != null) beginPhoto(findingId)
+    }
+
+    fun requestPhoto(findingId: String) {
+        requestedFindingId = findingId
+        if (findingHasPermission(context, Manifest.permission.CAMERA) && findingHasLocation(context)) {
+            requestedFindingId = null
+            beginPhoto(findingId)
+        } else {
+            photoPermissionLauncher.launch(
+                arrayOf(
+                    Manifest.permission.CAMERA,
+                    Manifest.permission.ACCESS_FINE_LOCATION,
+                    Manifest.permission.ACCESS_COARSE_LOCATION,
+                ),
+            )
+        }
+    }
+
+    val selected = options.catalog.items.firstOrNull { it.id == selectedCatalogId }
+    val filtered = options.catalog.items.filter {
+        search.isBlank() ||
+            it.title.contains(search, ignoreCase = true) ||
+            it.code.contains(search, ignoreCase = true) ||
+            it.categoryName.orEmpty().contains(search, ignoreCase = true)
+    }
+
+    LaunchedEffect(selectedCatalogId, other) {
+        if (!other && selected != null && severityText.isBlank() && selected.suggestedSeverity != null) {
+            severityText = selected.suggestedSeverity.toString()
+        }
+    }
+    LaunchedEffect(model.lastCreatedFinding?.id) {
+        if (model.lastCreatedFinding != null) {
+            selectedCatalogId = null
+            other = false
+            customTitle = ""
+            customLegalBasis = ""
+            description = ""
+            severityText = ""
+            correctionDueOn = ""
+            search = ""
+        }
+    }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .padding(top = 30.dp, start = 16.dp, end = 16.dp, bottom = 36.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+            OutlinedButton(onClick = { model.clearFindingFlow() }, enabled = !model.busy) {
+                Text("Volver")
+            }
+            Text("Hallazgo de campo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+        }
+
+        Card(Modifier.fillMaxWidth()) {
+            Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
+                Text(asset.name, fontWeight = FontWeight.Bold)
+                Text("${asset.code} · Acta ${options.act.code}", style = MaterialTheme.typography.bodySmall)
+                Text(
+                    "GPS + foto del Inventario: ${if (options.capture.readyForFinding) "OK" else "pendiente"}",
+                    color = if (options.capture.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
+                    style = MaterialTheme.typography.bodySmall,
+                )
+            }
+        }
+
+        model.error?.let {
+            Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer)) {
+                Text(it, Modifier.padding(12.dp))
+            }
+        }
+        model.notice?.let {
+            Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer)) {
+                Text(it, Modifier.padding(12.dp))
+            }
+        }
+
+        if (options.findings.isNotEmpty()) {
+            Text("Hallazgos registrados en este Inventario", fontWeight = FontWeight.Bold)
+            options.findings.forEach { finding ->
+                val evidence = model.fieldFindingEvidence[finding.id].orEmpty()
+                Card(Modifier.fillMaxWidth()) {
+                    Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+                        Text("${finding.code} · ${finding.title}", fontWeight = FontWeight.SemiBold)
+                        Text("Gravedad: ${finding.severity ?: "s/d"} · ${finding.status}", style = MaterialTheme.typography.bodySmall)
+                        Text(
+                            "Evidencias: ${evidence.size} · Fotos: ${evidence.count { it.kind == "PHOTO" }}",
+                            style = MaterialTheme.typography.bodySmall,
+                        )
+                        evidence.take(3).forEach { item ->
+                            Text(
+                                "• ${item.title ?: item.originalName}${item.capturedAt?.let { " · ${shortFindingDate(it)}" }.orEmpty()}",
+                                style = MaterialTheme.typography.bodySmall,
+                            )
+                        }
+                        Button(
+                            onClick = { requestPhoto(finding.id) },
+                            enabled = !model.busy,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) {
+                            Text("Tomar foto con GPS")
+                        }
+                    }
+                }
+            }
+            HorizontalDivider()
+        }
+
+        Text("1. Elegí el tipo de Hallazgo", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+        if (!options.catalog.typeConfigured) {
+            Text(
+                options.catalog.configurationReason
+                    ?: "Este tipo de Inventario todavía no tiene un catálogo contextual configurado. Podés usar OTROS.",
+                color = MaterialTheme.colorScheme.secondary,
+            )
+        }
+        OutlinedTextField(
+            value = search,
+            onValueChange = { search = it },
+            label = { Text("Buscar en catálogo") },
+            modifier = Modifier.fillMaxWidth(),
+            singleLine = true,
+        )
+
+        filtered.forEach { item ->
+            val chosen = !other && selectedCatalogId == item.id
+            Card(
+                modifier = Modifier.fillMaxWidth().clickable {
+                    selectedCatalogId = item.id
+                    other = false
+                    severityText = item.suggestedSeverity?.toString().orEmpty()
+                },
+                colors = if (chosen) {
+                    CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer)
+                } else {
+                    CardDefaults.cardColors()
+                },
+            ) {
+                Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) {
+                    Text(if (chosen) "✓ ${item.title}" else item.title, fontWeight = FontWeight.SemiBold)
+                    Text(
+                        listOfNotNull(item.categoryName, item.code, item.suggestedSeverity?.let { "Gravedad sugerida $it" })
+                            .joinToString(" · "),
+                        style = MaterialTheme.typography.bodySmall,
+                    )
+                }
+            }
+        }
+
+        OutlinedButton(
+            onClick = {
+                other = true
+                selectedCatalogId = null
+                severityText = ""
+            },
+            modifier = Modifier.fillMaxWidth(),
+        ) {
+            Text(if (other) "✓ OTROS · Hallazgo no catalogado" else "OTROS · No está en el catálogo")
+        }
+        if (other) {
+            options.catalog.other.help?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
+            OutlinedTextField(
+                value = customTitle,
+                onValueChange = { customTitle = it },
+                label = { Text("Título del nuevo Hallazgo *") },
+                modifier = Modifier.fillMaxWidth(),
+            )
+            OutlinedTextField(
+                value = customLegalBasis,
+                onValueChange = { customLegalBasis = it },
+                label = { Text("Base legal / normativa (opcional)") },
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+
+        Text("2. Describí lo observado", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+        selected?.let {
+            Card(Modifier.fillMaxWidth()) {
+                Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) {
+                    Text(it.title, fontWeight = FontWeight.SemiBold)
+                    it.legalBasis?.takeIf(String::isNotBlank)?.let { basis -> Text(basis, style = MaterialTheme.typography.bodySmall) }
+                    it.glossary?.takeIf(String::isNotBlank)?.let { glossary -> Text(glossary, style = MaterialTheme.typography.bodySmall) }
+                }
+            }
+        }
+        OutlinedTextField(
+            value = description,
+            onValueChange = { description = it },
+            label = { Text("Descripción del Hallazgo *") },
+            modifier = Modifier.fillMaxWidth(),
+            minLines = 3,
+        )
+        OutlinedTextField(
+            value = severityText,
+            onValueChange = { value -> severityText = value.filter(Char::isDigit).take(2) },
+            label = { Text("Gravedad 1 a 10") },
+            modifier = Modifier.fillMaxWidth(),
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+            singleLine = true,
+        )
+        OutlinedTextField(
+            value = correctionDueOn,
+            onValueChange = { correctionDueOn = it },
+            label = { Text("Fecha de corrección AAAA-MM-DD (opcional)") },
+            modifier = Modifier.fillMaxWidth(),
+            singleLine = true,
+        )
+
+        val severity = severityText.toIntOrNull()
+        val choiceReady = selectedCatalogId != null || (other && customTitle.isNotBlank())
+        Button(
+            onClick = {
+                model.createFieldFinding(
+                    catalogItemId = if (other) null else selectedCatalogId,
+                    customTitle = if (other) customTitle else null,
+                    customLegalBasis = if (other) customLegalBasis else null,
+                    description = description,
+                    severity = severity,
+                    correctionDueOn = correctionDueOn,
+                )
+            },
+            enabled = choiceReady && description.isNotBlank() && (severity == null || severity in 1..10) && !model.busy,
+            modifier = Modifier.fillMaxWidth(),
+        ) {
+            Text(if (model.busy) "Guardando…" else "Guardar Hallazgo")
+        }
+
+        model.lastCreatedFinding?.let { finding ->
+            Card(
+                Modifier.fillMaxWidth(),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
+            ) {
+                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+                    Text("Hallazgo registrado", fontWeight = FontWeight.Bold)
+                    Text("${finding.code} · ${finding.title}")
+                    Button(
+                        onClick = { requestPhoto(finding.id) },
+                        enabled = !model.busy,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Text("Tomar foto con GPS")
+                    }
+                    Text("También podés registrar otro Hallazgo sobre el mismo Inventario.", style = MaterialTheme.typography.bodySmall)
+                }
+            }
+        }
+    }
+}
+
+private fun findingHasPermission(context: Context, permission: String): Boolean =
+    ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
+
+private fun findingHasLocation(context: Context): Boolean =
+    findingHasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ||
+        findingHasPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
+
+private suspend fun currentFindingGeo(context: Context): FindingGeoSnapshot = suspendCancellableCoroutine { continuation ->
+    if (!findingHasLocation(context)) {
+        continuation.resumeWithException(SecurityException("Se necesita permiso de ubicación."))
+        return@suspendCancellableCoroutine
+    }
+    val source = CancellationTokenSource()
+    val client = LocationServices.getFusedLocationProviderClient(context)
+    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+            else continuation.resume(FindingGeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
+    continuation.invokeOnCancellation { source.cancel() }
+}
+
+private fun newFindingPhoto(context: Context): Pair<File, Uri> {
+    val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
+        ?: throw IllegalStateException("No se pudo acceder al almacenamiento de fotografías.")
+    directory.mkdirs()
+    val file = File.createTempFile("DH_HALLAZGO_${System.currentTimeMillis()}_", ".jpg", directory)
+    val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
+    return file to uri
+}
+
+private fun writeFindingExif(file: File, geo: FindingGeoSnapshot) {
+    val now = Instant.now()
+    val exif = ExifInterface(file)
+    exif.setLatLong(geo.latitude, geo.longitude)
+    val formatter = DateTimeFormatter.ofPattern("yyyy:MM:dd HH:mm:ss").withZone(ZoneId.systemDefault())
+    exif.setAttribute(ExifInterface.TAG_DATETIME_ORIGINAL, formatter.format(now))
+    exif.setAttribute(ExifInterface.TAG_DATETIME_DIGITIZED, formatter.format(now))
+    exif.saveAttributes()
+}
+
+private fun shortFindingDate(value: String): String = value.replace('T', ' ').take(16)
@@ -0,0 +1,30 @@
+package com.korexlabs.dhinspeccion.ui
+
+import com.korexlabs.dhinspeccion.MainViewModel
+import com.korexlabs.dhinspeccion.data.FieldType
+
+/**
+ * Compatibilidad transitoria con la pantalla F2.x que queda compilada pero ya no
+ * será la ruta activa en F3.1. El flujo nuevo siempre envía familyId cuando el
+ * nivel estructural lo requiere.
+ */
+fun MainViewModel.createFieldAsset(
+    type: FieldType,
+    parentId: String?,
+    name: String,
+    commonName: String?,
+    attributes: Map<String, Any?>,
+    latitude: Double,
+    longitude: Double,
+    accuracyM: Double?,
+) = createFieldAsset(
+    type = type,
+    parentId = parentId,
+    familyId = null,
+    name = name,
+    commonName = commonName,
+    attributes = attributes,
+    latitude = latitude,
+    longitude = longitude,
+    accuracyM = accuracyM,
+)
@@ -0,0 +1,208 @@
+package com.korexlabs.dhinspeccion.ui
+
+import android.content.Context
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+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.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Visibility
+import androidx.compose.material.icons.filled.VisibilityOff
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+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.remember
+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.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.FragmentActivity
+import com.korexlabs.dhinspeccion.MainViewModel
+
+private const val BIOMETRIC_PREFS = "dh_v2_biometric"
+private const val BIOMETRIC_ENABLED = "enabled"
+
+private fun biometricAvailable(context: Context): Boolean =
+    BiometricManager.from(context).canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_STRONG) ==
+        BiometricManager.BIOMETRIC_SUCCESS
+
+private fun biometricEnabled(context: Context): Boolean =
+    context.getSharedPreferences(BIOMETRIC_PREFS, Context.MODE_PRIVATE)
+        .getBoolean(BIOMETRIC_ENABLED, false)
+
+private fun setBiometricEnabled(context: Context, enabled: Boolean) {
+    context.getSharedPreferences(BIOMETRIC_PREFS, Context.MODE_PRIVATE)
+        .edit().putBoolean(BIOMETRIC_ENABLED, enabled).apply()
+}
+
+@Composable
+fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
+    val context = LocalContext.current
+    val capable = remember { biometricAvailable(context) }
+    var unlocked by rememberSaveable { mutableStateOf(false) }
+    var passwordLoginInFlight by rememberSaveable { mutableStateOf(false) }
+    var enabled by remember { mutableStateOf(biometricEnabled(context)) }
+
+    LaunchedEffect(model.session) {
+        if (model.session != null && passwordLoginInFlight) {
+            if (capable) {
+                setBiometricEnabled(context, true)
+                enabled = true
+            }
+            unlocked = true
+            passwordLoginInFlight = false
+        }
+        if (model.session == null) unlocked = false
+    }
+
+    MaterialTheme {
+        Surface(Modifier.fillMaxSize()) {
+            when {
+                model.session == null -> EnhancedLoginScreen(model) {
+                    passwordLoginInFlight = true
+                }
+                enabled && capable && !unlocked -> BiometricUnlockScreen(
+                    activity = activity,
+                    displayName = model.session?.displayName.orEmpty(),
+                    onAuthenticated = { unlocked = true },
+                    onUsePassword = {
+                        setBiometricEnabled(context, false)
+                        enabled = false
+                        model.logout()
+                    },
+                )
+                model.fieldFindingOptions != null -> FieldFindingScreen(model)
+                model.visit != null -> F3VisitRoot(model)
+                else -> DhApp(model)
+            }
+        }
+    }
+}
+
+@Composable
+private fun EnhancedLoginScreen(model: MainViewModel, onPasswordLogin: () -> Unit) {
+    var identifier by rememberSaveable { mutableStateOf("") }
+    var password by rememberSaveable { mutableStateOf("") }
+    var passwordVisible by rememberSaveable { mutableStateOf(false) }
+
+    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) }
+            model.notice?.let { Text(it, color = MaterialTheme.colorScheme.primary) }
+            OutlinedTextField(
+                value = identifier,
+                onValueChange = { identifier = it },
+                label = { Text("Usuario o email") },
+                modifier = Modifier.fillMaxWidth(),
+                singleLine = true,
+            )
+            OutlinedTextField(
+                value = password,
+                onValueChange = { password = it },
+                label = { Text("Contraseña") },
+                modifier = Modifier.fillMaxWidth(),
+                singleLine = true,
+                visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
+                trailingIcon = {
+                    IconButton(onClick = { passwordVisible = !passwordVisible }) {
+                        Icon(
+                            imageVector = if (passwordVisible) Icons.Filled.VisibilityOff else Icons.Filled.Visibility,
+                            contentDescription = if (passwordVisible) "Ocultar contraseña" else "Mostrar contraseña",
+                        )
+                    }
+                },
+            )
+            Button(
+                onClick = {
+                    onPasswordLogin()
+                    model.login(identifier, password)
+                },
+                modifier = Modifier.fillMaxWidth(),
+                enabled = !model.busy,
+            ) { Text(if (model.busy) "Ingresando…" else "Ingresar") }
+            Text(
+                "Después del primer ingreso correcto, si la tablet tiene una huella fuerte configurada, se habilita el acceso biométrico. La contraseña no se almacena.",
+                style = MaterialTheme.typography.bodySmall,
+            )
+        }
+    }
+}
+
+@Composable
+private fun BiometricUnlockScreen(
+    activity: FragmentActivity,
+    displayName: String,
+    onAuthenticated: () -> Unit,
+    onUsePassword: () -> Unit,
+) {
+    var error by rememberSaveable { mutableStateOf<String?>(null) }
+
+    fun authenticate() {
+        val executor = ContextCompat.getMainExecutor(activity)
+        val prompt = BiometricPrompt(
+            activity,
+            executor,
+            object : BiometricPrompt.AuthenticationCallback() {
+                override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+                    super.onAuthenticationSucceeded(result)
+                    error = null
+                    onAuthenticated()
+                }
+
+                override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+                    super.onAuthenticationError(errorCode, errString)
+                    error = errString.toString()
+                }
+
+                override fun onAuthenticationFailed() {
+                    super.onAuthenticationFailed()
+                    error = "Huella no reconocida."
+                }
+            },
+        )
+        val info = BiometricPrompt.PromptInfo.Builder()
+            .setTitle("Ingresar a DH Inspección")
+            .setSubtitle(if (displayName.isBlank()) "Validá tu identidad" else "Hola, $displayName")
+            .setNegativeButtonText("Usar contraseña")
+            .setAllowedAuthenticators(BiometricManager.Authenticators.BIOMETRIC_STRONG)
+            .build()
+        prompt.authenticate(info)
+    }
+
+    LaunchedEffect(Unit) { authenticate() }
+
+    Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
+        Column(
+            Modifier.fillMaxWidth(),
+            verticalArrangement = Arrangement.spacedBy(14.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
+            Text("Ingresá con tu huella")
+            error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
+            Button(onClick = { authenticate() }, modifier = Modifier.fillMaxWidth()) { Text("Usar huella") }
+            OutlinedButton(onClick = onUsePassword, modifier = Modifier.fillMaxWidth()) { Text("Ingresar con contraseña") }
+        }
+    }
+}
@@ -0,0 +1,425 @@
+package com.korexlabs.dhinspeccion.ui
+
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AssistChip
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.location.Priority
+import com.google.android.gms.tasks.CancellationTokenSource
+import com.korexlabs.dhinspeccion.MainViewModel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import java.io.File
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+private data class ActSignatureGeo(
+    val latitude: Double,
+    val longitude: Double,
+    val accuracyM: Double?,
+)
+
+@Composable
+fun MobileActsScreen(
+    model: MainViewModel,
+    onBack: () -> Unit,
+    onGoInventory: () -> Unit,
+) {
+    val visit = model.visit ?: return
+    val selected = model.selectedAct
+    val closure = model.actClosure
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+    var attendance by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.attendanceStatus ?: "PRESENT")
+    }
+    var fullName by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.fullName.orEmpty())
+    }
+    var documentType by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.documentType ?: "DNI")
+    }
+    var documentNumber by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.documentNumber.orEmpty())
+    }
+    var position by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.position.orEmpty())
+    }
+    var email by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.email.orEmpty())
+    }
+    var phone by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.phone.orEmpty())
+    }
+    var absenceReason by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.absenceReason.orEmpty())
+    }
+    var refusalReason by rememberSaveable(selected?.id) { mutableStateOf("") }
+    var manifestation by rememberSaveable(selected?.id) { mutableStateOf("CONFORMITY") }
+    var dissentStatement by rememberSaveable(selected?.id) { mutableStateOf("") }
+
+    LaunchedEffect(visit.id) { model.reloadActs() }
+
+    fun signWithGeo(file: File, company: Boolean) {
+        scope.launch {
+            val geo = runCatching { currentActSignatureGeo(context) }.getOrNull()
+            if (company) {
+                model.signSelectedActAsCompany(
+                    png = file,
+                    latitude = geo?.latitude,
+                    longitude = geo?.longitude,
+                    accuracyM = geo?.accuracyM,
+                    manifestation = manifestation,
+                    statement = dissentStatement.takeIf { manifestation == "DISSENT" },
+                )
+            } else {
+                model.signSelectedActAsInspector(
+                    png = file,
+                    latitude = geo?.latitude,
+                    longitude = geo?.longitude,
+                    accuracyM = geo?.accuracyM,
+                )
+            }
+        }
+    }
+
+    Column(
+        Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .padding(top = 28.dp, start = 16.dp, end = 16.dp, bottom = 36.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+            OutlinedButton(onClick = onBack, enabled = !model.busy) { Text("Volver") }
+            Text("Actas", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+        }
+        Text("${visit.code} · ${visit.operatorCompany?.name.orEmpty()}")
+        F32ActMessage(model)
+
+        Card(Modifier.fillMaxWidth()) {
+            Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                Text("Actas de esta inspección", fontWeight = FontWeight.Bold)
+                if (model.acts.isEmpty()) {
+                    Text("Todavía no hay Actas. La primera se inicia sobre una Instalación/Subinstalación seleccionada.")
+                }
+                model.acts.forEach { act ->
+                    val active = selected?.id == act.id
+                    OutlinedButton(
+                        onClick = { model.selectAct(act.id) },
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Text(
+                            (if (active) "✓ " else "") +
+                                "${act.code} · ${actStatusLabel(act.status)} · ${act.findingCount} Hallazgo${if (act.findingCount == 1) "" else "s"}",
+                        )
+                    }
+                }
+            }
+        }
+
+        val hasDraftAct = model.acts.any { it.status == "DRAFT" }
+        if (visit.status == "IN_PROGRESS" && !hasDraftAct) {
+            Card(
+                Modifier.fillMaxWidth(),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
+            ) {
+                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text("Nueva Acta", fontWeight = FontWeight.Bold)
+                    if (model.acts.any { it.status == "READY" }) {
+                        Text(
+                            "Puede existir una nueva Acta en borrador aunque haya Actas preparadas pendientes de firma de empresa. Sólo se permite un borrador a la vez.",
+                            style = MaterialTheme.typography.bodySmall,
+                        )
+                    }
+                    val selectedInventory = model.selectedFieldAsset?.asset
+                    if (selectedInventory == null) {
+                        Text("Primero elegí una Instalación o Subinstalación desde Inventario de campo. Ese registro será el primer elemento del Acta.")
+                        Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) {
+                            Text("Ir a Inventario y elegir")
+                        }
+                    } else {
+                        Text("Inventario inicial: ${selectedInventory.name} · ${selectedInventory.code}")
+                        Button(
+                            onClick = { model.createActForSelectedInventory() },
+                            enabled = !model.busy,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Crear nueva Acta") }
+                    }
+                }
+            }
+        }
+
+        if (selected != null) {
+            HorizontalDivider()
+            Card(Modifier.fillMaxWidth()) {
+                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
+                    Text(selected.code, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Text(actStatusLabel(selected.status))
+                    Text("${selected.findingCount} Hallazgo${if (selected.findingCount == 1) "" else "s"} · ${selected.assetCount} elemento${if (selected.assetCount == 1) "" else "s"} de Inventario")
+                    Text(selected.summary, style = MaterialTheme.typography.bodySmall)
+                    selected.closureSha256?.let { Text("Hash final: $it", style = MaterialTheme.typography.bodySmall) }
+                }
+            }
+
+            when (selected.status) {
+                "DRAFT" -> {
+                    Text("1. Responsable de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        AssistChip(onClick = { attendance = "PRESENT" }, label = { Text(if (attendance == "PRESENT") "✓ Presente" else "Presente") })
+                        AssistChip(onClick = { attendance = "ABSENT" }, label = { Text(if (attendance == "ABSENT") "✓ Ausente" else "Ausente") })
+                    }
+                    if (attendance == "PRESENT") {
+                        OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombre y apellido *") }, modifier = Modifier.fillMaxWidth())
+                        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+                            listOf("DNI", "CUIL", "PASSPORT", "OTHER").forEach { kind ->
+                                AssistChip(onClick = { documentType = kind }, label = { Text(if (documentType == kind) "✓ $kind" else kind) })
+                            }
+                        }
+                        OutlinedTextField(documentNumber, { documentNumber = it }, label = { Text("Documento *") }, modifier = Modifier.fillMaxWidth())
+                        OutlinedTextField(position, { position = it }, label = { Text("Cargo *") }, modifier = Modifier.fillMaxWidth())
+                        OutlinedTextField(email, { email = it }, label = { Text("Email") }, modifier = Modifier.fillMaxWidth())
+                        OutlinedTextField(phone, { phone = it }, label = { Text("Teléfono") }, modifier = Modifier.fillMaxWidth())
+                        Button(
+                            onClick = {
+                                model.setCompanyResponsiblePresent(fullName, documentType, documentNumber, position, email, phone)
+                            },
+                            enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank(),
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Guardar responsable") }
+                    } else {
+                        OutlinedTextField(
+                            absenceReason,
+                            { absenceReason = it },
+                            label = { Text("Motivo de ausencia *") },
+                            minLines = 2,
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                        Button(
+                            onClick = { model.setCompanyResponsibleAbsent(absenceReason) },
+                            enabled = !model.busy && absenceReason.trim().length >= 10,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Guardar ausencia") }
+                    }
+
+                    HorizontalDivider()
+                    Text("2. Hallazgos / verificaciones", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Text("Los Hallazgos se cargan desde Inventario y quedan vinculados a ${selected.code} de forma explícita. Un Acta de verificación puede prepararse sin Hallazgos nuevos si la verificación ya fue registrada.")
+                    Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) { Text("Ir a Inventario / Hallazgos") }
+
+                    HorizontalDivider()
+                    Text("3. Preparar Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Text("Al preparar, el contenido se congela y se calcula su hash. El servidor exige al menos un Hallazgo o una verificación registrada.")
+                    Button(
+                        onClick = { model.prepareSelectedAct() },
+                        enabled = !model.busy && closure?.responsible != null,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { Text("Preparar Acta para firmas") }
+                }
+
+                "READY" -> {
+                    val signatures = closure?.signatures.orEmpty()
+                    val inspectorSigned = signatures.any { it.signerType == "INSPECTOR" && it.status == "SIGNED" }
+                    val companyOutcome = signatures.firstOrNull { it.signerType == "COMPANY_RESPONSIBLE" }
+
+                    Text("Acta preparada", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    closure?.closure?.preparedSha256?.let { Text("Hash preparado: $it", style = MaterialTheme.typography.bodySmall) }
+                    if (signatures.isEmpty()) {
+                        OutlinedButton(onClick = { model.reopenSelectedAct() }, enabled = !model.busy, modifier = Modifier.fillMaxWidth()) {
+                            Text("Volver a borrador")
+                        }
+                    }
+
+                    HorizontalDivider()
+                    Text("Firma del inspector", fontWeight = FontWeight.Bold)
+                    if (inspectorSigned) {
+                        Text("✓ Firma del inspector registrada", color = MaterialTheme.colorScheme.primary)
+                    } else {
+                        Text(closure?.consents?.inspector.orEmpty(), style = MaterialTheme.typography.bodySmall)
+                        SignaturePad(
+                            label = "Firmá como inspector/a",
+                            enabled = !model.busy,
+                            onCaptured = { file -> signWithGeo(file, company = false) },
+                        )
+                    }
+
+                    HorizontalDivider()
+                    Text("Recepción de la empresa", fontWeight = FontWeight.Bold)
+                    if (companyOutcome != null) {
+                        val detail = when (companyOutcome.status) {
+                            "SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma registrada"
+                            "REFUSED" -> "Negativa a firmar"
+                            "ABSENT" -> "Responsable ausente"
+                            else -> companyOutcome.status
+                        }
+                        Text("✓ $detail", color = MaterialTheme.colorScheme.primary)
+                        companyOutcome.reason?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
+                        companyOutcome.companyStatement?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
+                    } else if (closure?.responsible?.attendanceStatus == "ABSENT") {
+                        Text("El responsable fue registrado como ausente.")
+                        Button(
+                            onClick = {
+                                model.recordCompanyOutcome(
+                                    "ABSENT",
+                                    closure.responsible.absenceReason ?: "Responsable de empresa ausente durante la inspección",
+                                )
+                            },
+                            enabled = !model.busy && inspectorSigned,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Asentar ausencia en el Acta") }
+                    } else {
+                        Text(closure?.consents?.company.orEmpty(), style = MaterialTheme.typography.bodySmall)
+                        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                            AssistChip(onClick = { manifestation = "CONFORMITY" }, label = { Text(if (manifestation == "CONFORMITY") "✓ Conforme" else "Conforme") })
+                            AssistChip(onClick = { manifestation = "DISSENT" }, label = { Text(if (manifestation == "DISSENT") "✓ En disidencia" else "En disidencia") })
+                        }
+                        if (manifestation == "DISSENT") {
+                            OutlinedTextField(
+                                dissentStatement,
+                                { dissentStatement = it },
+                                label = { Text("Manifestación de disidencia *") },
+                                minLines = 2,
+                                modifier = Modifier.fillMaxWidth(),
+                            )
+                        }
+                        SignaturePad(
+                            label = "Firma del responsable de empresa",
+                            enabled = !model.busy && inspectorSigned && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
+                            onCaptured = { file -> signWithGeo(file, company = true) },
+                        )
+                        Text("Si la persona presente se niega a firmar, asentá el motivo en lugar de dibujar una firma.", style = MaterialTheme.typography.bodySmall)
+                        OutlinedTextField(
+                            refusalReason,
+                            { refusalReason = it },
+                            label = { Text("Motivo de negativa") },
+                            minLines = 2,
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                        OutlinedButton(
+                            onClick = { model.recordCompanyOutcome("REFUSED", refusalReason) },
+                            enabled = !model.busy && inspectorSigned && refusalReason.trim().length >= 10,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Registrar negativa a firmar") }
+                    }
+
+                    HorizontalDivider()
+                    if (inspectorSigned && companyOutcome != null) {
+                        Button(
+                            onClick = { model.closeSelectedAct() },
+                            enabled = !model.busy,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Cerrar Acta definitivamente") }
+                    } else if (inspectorSigned) {
+                        Text(
+                            "La inspección puede finalizar con la firma de empresa pendiente; el Acta permanecerá preparada hasta registrar firma, negativa o ausencia.",
+                            style = MaterialTheme.typography.bodySmall,
+                        )
+                    }
+                }
+
+                "CLOSED" -> {
+                    Card(
+                        Modifier.fillMaxWidth(),
+                        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
+                    ) {
+                        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
+                            Text("Acta cerrada e inmutable", fontWeight = FontWeight.Bold)
+                            Text("El PDF, informe Word y entregas documentales se generan desde este cierre.")
+                            closure?.closure?.finalSha256?.let { Text("SHA-256: $it", style = MaterialTheme.typography.bodySmall) }
+                        }
+                    }
+                }
+
+                "CANCELLED" -> Text("Esta Acta fue cancelada y permanece sólo como antecedente.")
+            }
+        }
+
+        if (visit.status == "IN_PROGRESS" && model.acts.isNotEmpty()) {
+            HorizontalDivider()
+            val drafts = model.acts.count { it.status == "DRAFT" }
+            Text("Finalizar inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+            Text(
+                "No puede quedar ninguna Acta en borrador. Al cerrar, el servidor verifica que cada Acta preparada tenga firma de inspector; si falta alguna, indicará cuál debe completarse.",
+            )
+            Button(
+                onClick = { model.closeInspection() },
+                enabled = !model.busy && drafts == 0,
+                modifier = Modifier.fillMaxWidth(),
+            ) { Text("Cerrar inspección y salir de la empresa") }
+        }
+    }
+}
+
+@Composable
+private fun F32ActMessage(model: MainViewModel) {
+    val text = model.error ?: model.notice ?: return
+    Card(
+        modifier = Modifier.fillMaxWidth(),
+        colors = CardDefaults.cardColors(
+            containerColor = if (model.error != null) MaterialTheme.colorScheme.errorContainer
+            else MaterialTheme.colorScheme.secondaryContainer,
+        ),
+        onClick = { model.clearMessages() },
+    ) {
+        Text(text, Modifier.padding(12.dp))
+    }
+}
+
+private fun actStatusLabel(status: String): String = when (status) {
+    "DRAFT" -> "Borrador"
+    "READY" -> "Preparada para firmas"
+    "CLOSED" -> "Cerrada"
+    "CANCELLED" -> "Cancelada"
+    else -> status
+}
+
+private fun hasActLocation(context: Context): Boolean =
+    ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
+        ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
+
+private suspend fun currentActSignatureGeo(context: Context): ActSignatureGeo = suspendCancellableCoroutine { continuation ->
+    if (!hasActLocation(context)) {
+        continuation.resumeWithException(SecurityException("Ubicación no autorizada"))
+        return@suspendCancellableCoroutine
+    }
+    val source = CancellationTokenSource()
+    LocationServices.getFusedLocationProviderClient(context)
+        .getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) continuation.resumeWithException(IllegalStateException("Ubicación no disponible"))
+            else continuation.resume(ActSignatureGeo(location.latitude, location.longitude, location.accuracy.toDouble()))
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
+    continuation.invokeOnCancellation { source.cancel() }
+}
@@ -0,0 +1,137 @@
+package com.korexlabs.dhinspeccion.ui
+
+import android.graphics.Bitmap
+import android.graphics.Canvas as AndroidCanvas
+import android.graphics.Color as AndroidColor
+import android.graphics.Paint
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.detectDragGestures
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
+import java.io.File
+import java.io.FileOutputStream
+
+@Composable
+fun SignaturePad(
+    label: String,
+    enabled: Boolean = true,
+    onCaptured: (File) -> Unit,
+) {
+    val context = LocalContext.current
+    val strokes = remember { mutableStateListOf<List<Offset>>() }
+    var currentStroke by remember { mutableStateOf<List<Offset>>(emptyList()) }
+    var canvasSize by remember { mutableStateOf(IntSize.Zero) }
+
+    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+        Text(label, fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold)
+        Text(
+            "Firmá dentro del recuadro. La imagen se guarda como PNG y se incorpora al hash del Acta.",
+            style = MaterialTheme.typography.bodySmall,
+        )
+        Canvas(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(190.dp)
+                .background(Color.White)
+                .onSizeChanged { canvasSize = it }
+                .pointerInput(enabled) {
+                    if (!enabled) return@pointerInput
+                    detectDragGestures(
+                        onDragStart = { position -> currentStroke = listOf(position) },
+                        onDrag = { change, _ ->
+                            change.consume()
+                            currentStroke = currentStroke + change.position
+                        },
+                        onDragEnd = {
+                            if (currentStroke.size > 1) strokes.add(currentStroke)
+                            currentStroke = emptyList()
+                        },
+                        onDragCancel = { currentStroke = emptyList() },
+                    )
+                },
+        ) {
+            val all = strokes + listOf(currentStroke)
+            all.forEach { stroke ->
+                stroke.zipWithNext().forEach { (start, end) ->
+                    drawLine(
+                        color = Color.Black,
+                        start = start,
+                        end = end,
+                        strokeWidth = 4.dp.toPx(),
+                        cap = StrokeCap.Round,
+                    )
+                }
+            }
+        }
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            OutlinedButton(
+                onClick = { strokes.clear(); currentStroke = emptyList() },
+                enabled = enabled && (strokes.isNotEmpty() || currentStroke.isNotEmpty()),
+                modifier = Modifier.weight(1f),
+            ) { Text("Limpiar") }
+            Button(
+                onClick = {
+                    val width = canvasSize.width.coerceAtLeast(1)
+                    val height = canvasSize.height.coerceAtLeast(1)
+                    val targetWidth = 1000
+                    val targetHeight = 400
+                    val scaleX = targetWidth.toFloat() / width.toFloat()
+                    val scaleY = targetHeight.toFloat() / height.toFloat()
+                    val bitmap = Bitmap.createBitmap(targetWidth, targetHeight, Bitmap.Config.ARGB_8888)
+                    val native = AndroidCanvas(bitmap)
+                    native.drawColor(AndroidColor.WHITE)
+                    val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+                        color = AndroidColor.BLACK
+                        strokeWidth = 7f
+                        strokeCap = Paint.Cap.ROUND
+                        strokeJoin = Paint.Join.ROUND
+                        style = Paint.Style.STROKE
+                    }
+                    strokes.forEach { stroke ->
+                        stroke.zipWithNext().forEach { (start, end) ->
+                            native.drawLine(
+                                start.x * scaleX,
+                                start.y * scaleY,
+                                end.x * scaleX,
+                                end.y * scaleY,
+                                paint,
+                            )
+                        }
+                    }
+                    val file = File.createTempFile("DH_FIRMA_", ".png", context.cacheDir)
+                    FileOutputStream(file).use { stream ->
+                        check(bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream))
+                    }
+                    bitmap.recycle()
+                    onCaptured(file)
+                },
+                enabled = enabled && strokes.isNotEmpty(),
+                modifier = Modifier.weight(1f),
+            ) { Text("Usar firma") }
+        }
+    }
+}
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">DH Inspección</string>
+</resources>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.DHInspeccion" parent="android:style/Theme.Material.Light.NoActionBar">
+        <item name="android:fontFamily">sans</item>
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:colorAccent">#1B5E20</item>
+        <item name="android:navigationBarColor">#FFFFFF</item>
+        <item name="android:statusBarColor">#FFFFFF</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-files-path name="inspection_photos" path="Pictures/" />
+</paths>
@@ -0,0 +1,5 @@
+plugins {
+    id("com.android.application") version "8.13.2" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" apply false
+}
@@ -0,0 +1,4 @@
+org.gradle.jvmargs=-Xmx3g -Dfile.encoding=UTF-8
+android.useAndroidX=true
+kotlin.code.style=official
+android.nonTransitiveRClass=true
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "DHInspeccion"
+include(":app")
@@ -1,6 +1,6 @@
 {
  "name": "dhv2-api",
-  "version": "0.21.0-1",
+  "version": "0.25.0-1",
  "private": true,
  "license": "UNLICENSED",
  "scripts": {
@@ -9,11 +9,10 @@
    "start:dev": "nest start --watch",
    "typecheck": "tsc --noEmit",
    "test": "tsc -p tsconfig.test.json --noEmit && node --import tsx --test test/**/*.test.ts",
-    "migration:run": "node dist/database/migration-cli.js run && node dist/cli/fresh-start-reset.js --preview",
+    "migration:run": "node dist/database/migration-cli.js run",
    "migration:show": "node dist/database/migration-cli.js show",
    "migration:revert": "node dist/database/migration-cli.js revert",
    "bootstrap:admin": "node dist/cli/bootstrap-admin.js",
-    "maintenance:fresh-start": "node dist/cli/fresh-start-reset.js",
    "dev:seed:mendoza-demo": "node dist/cli/dev-seed-mendoza-demo.js"
  },
  "dependencies": {
@@ -12,6 +12,9 @@ import {
  MinLength,
 } from 'class-validator';

+const optionalText = ({ value }: { value: unknown }) =>
+  typeof value === 'string' && value.trim() ? value.trim() : null;
+
 export class CreateUserDto {
  @Transform(({ value }) =>
    typeof value === 'string' ? value.trim().toLowerCase() : value,
@@ -23,13 +26,38 @@ export class CreateUserDto {
  username!: string;

  @Transform(({ value }) =>
-    typeof value === 'string' ? value.trim().toLowerCase() : value,
+    typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : null,
  )
  @IsOptional()
  @IsEmail()
  @MaxLength(320)
  email?: string | null;

+  @Transform(({ value }) =>
+    typeof value === 'string' && value.trim() ? value.replace(/\D/g, '') : null,
+  )
+  @IsOptional()
+  @Matches(/^\d{7,11}$/)
+  dni?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(40)
+  phone?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(160)
+  jobTitle?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(80)
+  employeeNumber?: string | null;
+
  @IsString()
  @MinLength(12)
  @MaxLength(128)
@@ -8,6 +8,9 @@ import {
  MinLength,
 } from 'class-validator';

+const optionalText = ({ value }: { value: unknown }) =>
+  typeof value === 'string' && value.trim() ? value.trim() : null;
+
 export class UpdateUserDto {
  @Transform(({ value }) =>
    typeof value === 'string' ? value.trim().toLowerCase() : value,
@@ -20,13 +23,38 @@ export class UpdateUserDto {
  username?: string;

  @Transform(({ value }) =>
-    typeof value === 'string' ? value.trim().toLowerCase() : value,
+    typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : null,
  )
  @IsOptional()
  @IsEmail()
  @MaxLength(320)
  email?: string | null;

+  @Transform(({ value }) =>
+    typeof value === 'string' && value.trim() ? value.replace(/\D/g, '') : null,
+  )
+  @IsOptional()
+  @Matches(/^\d{7,11}$/)
+  dni?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(40)
+  phone?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(160)
+  jobTitle?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(80)
+  employeeNumber?: string | null;
+
  @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
  @IsOptional()
  @IsString()
@@ -41,6 +41,10 @@ export interface AdministrativeUserView {
  id: string;
  username: string;
  email: string | null;
+  dni: string | null;
+  phone: string | null;
+  jobTitle: string | null;
+  employeeNumber: string | null;
  firstName: string;
  lastName: string;
  status: UserStatus;
@@ -72,6 +76,13 @@ function roleSelectionInvalid(): BadRequestException {
  });
 }

+function inspectorEmailRequired(): BadRequestException {
+  return new BadRequestException({
+    code: 'INSPECTOR_EMAIL_REQUIRED',
+    message: 'Los usuarios con rol Inspector deben tener un email válido para recibir la documentación de sus inspecciones',
+  });
+}
+
@Injectable()
 export class UsersService {
  constructor(
@@ -96,6 +107,10 @@ export class UsersService {
          OR user_account.email ILIKE $${parameters.length}
          OR user_account.first_name ILIKE $${parameters.length}
          OR user_account.last_name ILIKE $${parameters.length}
+          OR user_account.dni ILIKE $${parameters.length}
+          OR user_account.phone ILIKE $${parameters.length}
+          OR user_account.job_title ILIKE $${parameters.length}
+          OR user_account.employee_number ILIKE $${parameters.length}
        )
      `);
    }
@@ -115,6 +130,10 @@ export class UsersService {
          user_account.id,
          user_account.username,
          user_account.email,
+          user_account.dni,
+          user_account.phone,
+          user_account.job_title AS "jobTitle",
+          user_account.employee_number AS "employeeNumber",
          user_account.first_name AS "firstName",
          user_account.last_name AS "lastName",
          user_account.status,
@@ -176,9 +195,14 @@ export class UsersService {
    try {
      return await this.dataSource.transaction(async (manager) => {
        const roles = await this.resolveRoles(manager, dto.roleIds);
+        this.assertInspectorHasEmail(roles, dto.email ?? null);
        const user = manager.getRepository(User).create({
          username: dto.username.trim().toLowerCase(),
          email: dto.email?.trim().toLowerCase() || null,
+          dni: dto.dni ?? null,
+          phone: dto.phone ?? null,
+          jobTitle: dto.jobTitle ?? null,
+          employeeNumber: dto.employeeNumber ?? null,
          passwordHash,
          firstName: dto.firstName.trim(),
          lastName: dto.lastName.trim(),
@@ -227,6 +251,10 @@ export class UsersService {
    if (
      dto.username === undefined &&
      dto.email === undefined &&
+      dto.dni === undefined &&
+      dto.phone === undefined &&
+      dto.jobTitle === undefined &&
+      dto.employeeNumber === undefined &&
      dto.firstName === undefined &&
      dto.lastName === undefined
    ) {
@@ -240,6 +268,9 @@ export class UsersService {
      return await this.dataSource.transaction(async (manager) => {
        const user = await this.lockUser(manager, id);
        const before = await this.loadUserView(manager, id);
+        if (dto.email !== undefined && !dto.email && before.roles.some((role) => role.code === 'inspector')) {
+          throw inspectorEmailRequired();
+        }

        if (dto.username !== undefined) {
          user.username = dto.username.trim().toLowerCase();
@@ -247,6 +278,10 @@ export class UsersService {
        if (dto.email !== undefined) {
          user.email = dto.email?.trim().toLowerCase() || null;
        }
+        if (dto.dni !== undefined) user.dni = dto.dni ?? null;
+        if (dto.phone !== undefined) user.phone = dto.phone ?? null;
+        if (dto.jobTitle !== undefined) user.jobTitle = dto.jobTitle ?? null;
+        if (dto.employeeNumber !== undefined) user.employeeNumber = dto.employeeNumber ?? null;
        if (dto.firstName !== undefined) user.firstName = dto.firstName.trim();
        if (dto.lastName !== undefined) user.lastName = dto.lastName.trim();
        user.updatedBy = principal.userId;
@@ -379,6 +414,7 @@ export class UsersService {
      await this.lockUser(manager, id);
      const roles = await this.resolveRoles(manager, dto.roleIds);
      const before = await this.loadUserView(manager, id);
+      this.assertInspectorHasEmail(roles, before.email);
      const beforeIds = before.roles.map((role) => role.id).sort();
      const afterIds = roles.map((role) => role.id).sort();
      if (beforeIds.join(',') === afterIds.join(',')) return before;
@@ -417,6 +453,12 @@ export class UsersService {
    return roles;
  }

+  private assertInspectorHasEmail(roles: Role[], email: string | null | undefined): void {
+    if (roles.some((role) => role.code === 'inspector') && !email?.trim()) {
+      throw inspectorEmailRequired();
+    }
+  }
+
  private async insertUserRoles(
    manager: EntityManager,
    userId: string,
@@ -455,6 +497,10 @@ export class UsersService {
          user_account.id,
          user_account.username,
          user_account.email,
+          user_account.dni,
+          user_account.phone,
+          user_account.job_title AS "jobTitle",
+          user_account.employee_number AS "employeeNumber",
          user_account.first_name AS "firstName",
          user_account.last_name AS "lastName",
          user_account.status,
@@ -491,7 +537,7 @@ export class UsersService {
  private userConflict(): ConflictException {
    return new ConflictException({
      code: 'USER_ALREADY_EXISTS',
-      message: 'El usuario o email ya está registrado',
+      message: 'El usuario, email o DNI ya está registrado',
    });
  }
 }
@@ -22,12 +22,23 @@ import { AssetOperationalRelationsService } from './asset-operational-relations.
 import { AssetRegistryController } from './asset-registry.controller';
 import { AssetRegistryService } from './asset-registry.service';
 import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/field-discovery-inspection-link.service';
+import { InventoryStructureController } from './inventory-structure.controller';
+import { InventoryStructureService } from './inventory-structure.service';
+import { InventoryFamilyCatalogController } from './inventory-family-catalog.controller';
+import { InventoryFamilyCatalogService } from './inventory-family-catalog.service';
+import { FieldInventoryMergeController, InventoryMergeController } from './inventory-merge.controller';
+import { InventoryMergeService } from './inventory-merge.service';
+import { MergedInventoryDossierService } from './merged-inventory-dossier.service';

@Module({
  imports: [AuditModule],
  controllers: [
    AssetTypesController,
    AssetsController,
+    InventoryStructureController,
+    InventoryFamilyCatalogController,
+    InventoryMergeController,
+    FieldInventoryMergeController,
    AssetGeometriesController,
    MapAssetsController,
    AssetHistoryController,
@@ -40,6 +51,10 @@ import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/fi
  providers: [
    AssetTypesService,
    AssetsService,
+    InventoryStructureService,
+    InventoryFamilyCatalogService,
+    InventoryMergeService,
+    MergedInventoryDossierService,
    AssetGeometriesService,
    AssetHistoryService,
    AssetMediaService,
@@ -52,6 +67,8 @@ import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/fi
  exports: [
    AssetHistoryService,
    AssetsService,
+    InventoryMergeService,
+    MergedInventoryDossierService,
    AssetGeometriesService,
    AssetMediaService,
    FieldDiscoveryInspectionLinkService,
@@ -16,6 +16,7 @@ import type {
  RequestWithContext,
 } from '../common/http/request-context';
 import { AssetsService } from './assets.service';
+import { MergedInventoryDossierService } from './merged-inventory-dossier.service';
 import { ChangeAssetStatusDto } from './dto/change-asset-status.dto';
 import { ChangeAssetOperationalStatusDto } from './dto/change-asset-operational-status.dto';
 import { CreateAssetDto } from './dto/create-asset.dto';
@@ -31,7 +32,10 @@ import { ChangeAssetContextDto } from './dto/change-asset-context.dto';

@Controller('assets')
 export class AssetsController {
-  constructor(private readonly assets: AssetsService) {}
+  constructor(
+    private readonly assets: AssetsService,
+    private readonly mergedDossier: MergedInventoryDossierService,
+  ) {}

  @Get()
  @RequirePermissions('assets.read')
@@ -131,8 +135,8 @@ export class AssetsController {
    'inspection_evidence.read',
    'inspection_communications.read',
  )
-  dossier(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
-    return this.assets.dossier(id);
+  dossier(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string): Promise<unknown> {
+    return this.mergedDossier.dossier(id);
  }

  @Get(':id/context-history')
@@ -42,6 +42,10 @@ export class CreateAssetDto {
  @IsUUID('4')
  parentId?: string | null;

+  @IsOptional()
+  @IsUUID('4')
+  inventoryFamilyId?: string | null;
+
  @IsOptional()
  @IsUUID('4')
  operationalAreaId?: string | null;
@@ -0,0 +1,56 @@
+import { Transform } from 'class-transformer';
+import {
+  IsIn,
+  IsOptional,
+  IsString,
+  IsUUID,
+  Matches,
+  MaxLength,
+  MinLength,
+} from 'class-validator';
+
+export const INVENTORY_STRUCTURE_KINDS = [
+  'AREA',
+  'YACIMIENTO',
+  'INSTALACION',
+  'SUBINSTALACION',
+] as const;
+export type InventoryStructureKind = typeof INVENTORY_STRUCTURE_KINDS[number];
+
+export class CreateInventoryStructureDto {
+  @IsIn(INVENTORY_STRUCTURE_KINDS)
+  kind!: InventoryStructureKind;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim().toUpperCase() : null)
+  @IsString()
+  @MaxLength(120)
+  @Matches(/^[A-Z0-9][A-Z0-9._/-]*$/)
+  code?: string | null;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(1)
+  @MaxLength(200)
+  name!: string;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
+  @IsString()
+  @MaxLength(200)
+  commonName?: string | null;
+
+  @IsOptional()
+  @IsUUID('4')
+  parentId?: string | null;
+
+  @IsOptional()
+  @IsUUID('4')
+  familyId?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
+  @IsString()
+  @MaxLength(4000)
+  description?: string | null;
+}
@@ -0,0 +1,13 @@
+import { Transform } from 'class-transformer';
+import { IsString, IsUUID, MaxLength, MinLength } from 'class-validator';
+
+export class MergeInventoryAssetDto {
+  @IsUUID('4')
+  canonicalAssetId!: string;
+
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
+  @IsString()
+  @MinLength(8)
+  @MaxLength(2000)
+  reason!: string;
+}
@@ -0,0 +1,14 @@
+import { Controller, Get, Param, ParseUUIDPipe } from '@nestjs/common';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import { InventoryFamilyCatalogService } from './inventory-family-catalog.service';
+
+@Controller('inventory-families')
+export class InventoryFamilyCatalogController {
+  constructor(private readonly families: InventoryFamilyCatalogService) {}
+
+  @Get(':familyId/findings')
+  @RequirePermissions('assets.read')
+  findings(@Param('familyId', new ParseUUIDPipe({ version: '4' })) familyId: string) {
+    return this.families.findings(familyId);
+  }
+}
@@ -0,0 +1,39 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+
+@Injectable()
+export class InventoryFamilyCatalogService {
+  constructor(private readonly dataSource: DataSource) {}
+
+  async findings(familyId: string) {
+    const [family] = await this.dataSource.query(`
+      SELECT id,code,name,level,information_labels AS "informationLabels"
+      FROM inventory_families
+      WHERE id=$1::uuid AND is_active=true
+    `, [familyId]) as Array<{
+      id: string;
+      code: string;
+      name: string;
+      level: string;
+      informationLabels: string[];
+    }>;
+    if (!family) {
+      throw new NotFoundException({
+        code: 'INVENTORY_FAMILY_NOT_FOUND',
+        message: 'La familia técnica no existe',
+      });
+    }
+    const items = await this.dataSource.query(`
+      SELECT item.id,item.code,item.source_number AS "sourceNumber",item.title,
+        item.legal_basis AS "legalBasis",item.glossary,item.suggested_severity AS "suggestedSeverity",
+        category.id AS "categoryId",category.code AS "categoryCode",category.name AS "categoryName"
+      FROM finding_catalog_item_inventory_families mapping
+      JOIN finding_catalog_items item ON item.id=mapping.catalog_item_id
+      JOIN finding_categories category ON category.id=item.category_id
+      WHERE mapping.inventory_family_id=$1::uuid
+        AND item.is_active=true AND category.is_active=true
+      ORDER BY category.sort_order,item.source_number,item.title
+    `, [familyId]);
+    return { family, items, count: items.length };
+  }
+}
@@ -0,0 +1,53 @@
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+  Req,
+} from '@nestjs/common';
+import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { MergeInventoryAssetDto } from './dto/merge-inventory-asset.dto';
+import { InventoryMergeService } from './inventory-merge.service';
+
+@Controller('assets')
+export class InventoryMergeController {
+  constructor(private readonly merges: InventoryMergeService) {}
+
+  @Get(':id/merge-status')
+  @RequirePermissions('assets.read')
+  status(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
+    return this.merges.status(id);
+  }
+
+  @Post(':id/merge')
+  @RequirePermissions('assets.update')
+  merge(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+    @Body() dto: MergeInventoryAssetDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.merges.merge(id, dto, principal, request);
+  }
+}
+
+@Controller('inspection-visits/:visitId/field-inventory')
+export class FieldInventoryMergeController {
+  constructor(private readonly merges: InventoryMergeService) {}
+
+  @Post(':assetId/merge')
+  @RequirePermissions('assets.create', 'inspections.execute')
+  mergeFieldDiscovery(
+    @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
+    @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
+    @Body() dto: MergeInventoryAssetDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.merges.mergeFromVisit(visitId, assetId, dto, principal, request);
+  }
+}
@@ -0,0 +1,432 @@
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { DataSource, EntityManager } from 'typeorm';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import {
+  AssetVersionChangeType,
+  AuditAction,
+} from '../database/entities';
+import { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy';
+import type { MergeInventoryAssetDto } from './dto/merge-inventory-asset.dto';
+import { AssetHistoryService } from './asset-history.service';
+
+type MergeableAssetRow = {
+  id: string;
+  code: string;
+  name: string;
+  typeCode: string;
+  parentId: string | null;
+  operationalAreaId: string | null;
+  operatorCompanyId: string | null;
+  inventoryFamilyId: string | null;
+  informationStatus: string;
+};
+
+type MergeRow = {
+  id: string;
+  sourceAssetId: string;
+  canonicalAssetId: string;
+  reason: string;
+  mergedAt: Date;
+  mergedBy: string | null;
+  source: string;
+  requestId: string | null;
+};
+
+const MERGEABLE_TYPES = new Set(['instalacion', 'subinstalacion']);
+
+@Injectable()
+export class InventoryMergeService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+    private readonly history: AssetHistoryService,
+  ) {}
+
+  async status(assetId: string) {
+    const requested = await this.loadAsset(this.dataSource.manager, assetId, false);
+    const canonicalId = await this.resolveCanonicalId(this.dataSource.manager, assetId);
+    const canonical = canonicalId === assetId
+      ? requested
+      : await this.loadAsset(this.dataSource.manager, canonicalId, false);
+    const chain = await this.mergeChain(assetId);
+    const aliases = await this.aliasesFor(canonicalId);
+    return {
+      requested,
+      isMerged: canonicalId !== assetId,
+      canonical,
+      chain,
+      aliases,
+    };
+  }
+
+  async merge(
+    sourceAssetId: string,
+    dto: MergeInventoryAssetDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction((manager) =>
+      this.mergeInTransaction(manager, sourceAssetId, dto, principal, request),
+    );
+  }
+
+  async mergeFromVisit(
+    visitId: string,
+    sourceAssetId: string,
+    dto: MergeInventoryAssetDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    assertMobileInspector(principal);
+    const [gate] = (await this.dataSource.query(`
+      SELECT
+        visit.status,
+        EXISTS (
+          SELECT 1 FROM inspection_visit_members member
+          WHERE member.visit_id=visit.id
+            AND member.user_id=$3::uuid
+            AND member.included=true
+        ) OR visit.lead_inspector_user_id=$3::uuid AS assigned,
+        EXISTS (
+          SELECT 1 FROM asset_field_discoveries discovery
+          WHERE discovery.visit_id=visit.id
+            AND discovery.asset_id=$2::uuid
+        ) AS "createdInVisit"
+      FROM inspection_visits visit
+      WHERE visit.id=$1::uuid
+    `, [visitId, sourceAssetId, principal.userId])) as Array<{
+      status: string;
+      assigned: boolean;
+      createdInVisit: boolean;
+    }>;
+    if (!gate) throw new NotFoundException({ code: 'INSPECTION_VISIT_NOT_FOUND', message: 'Inspección no encontrada' });
+    if (gate.status !== 'IN_PROGRESS') throw new ConflictException({
+      code: 'FIELD_MERGE_VISIT_NOT_IN_PROGRESS',
+      message: 'Sólo se puede conciliar Inventario mientras la inspección está en curso',
+    });
+    if (!gate.assigned) throw new ConflictException({
+      code: 'FIELD_MERGE_INSPECTOR_NOT_ASSIGNED',
+      message: 'El inspector no está asignado a esta inspección',
+    });
+    if (!gate.createdInVisit) throw new ConflictException({
+      code: 'FIELD_MERGE_SOURCE_MUST_BE_DISCOVERY',
+      message: 'Desde la APK sólo se puede fusionar un alta nacida en esta inspección',
+    });
+    return this.merge(sourceAssetId, dto, principal, request);
+  }
+
+  private async mergeInTransaction(
+    manager: EntityManager,
+    sourceAssetId: string,
+    dto: MergeInventoryAssetDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    const existing = await this.currentMerge(manager, sourceAssetId);
+    if (existing) throw new ConflictException({
+      code: 'INVENTORY_ALREADY_MERGED',
+      message: 'Este registro ya fue fusionado',
+      canonicalAssetId: existing.canonicalAssetId,
+    });
+
+    const canonicalAssetId = await this.resolveCanonicalId(manager, dto.canonicalAssetId);
+    if (canonicalAssetId === sourceAssetId) throw new BadRequestException({
+      code: 'INVENTORY_MERGE_CYCLE',
+      message: 'La fusión generaría un ciclo entre registros',
+    });
+
+    const ids = [sourceAssetId, canonicalAssetId].sort();
+    const locked = (await manager.query(`
+      SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
+        asset.parent_id AS "parentId",
+        asset.operational_area_id AS "operationalAreaId",
+        asset.operator_company_id AS "operatorCompanyId",
+        asset.inventory_family_id AS "inventoryFamilyId",
+        asset.information_status AS "informationStatus"
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      WHERE asset.id=ANY($1::uuid[])
+      ORDER BY asset.id
+      FOR UPDATE OF asset
+    `, [ids])) as MergeableAssetRow[];
+    const source = locked.find((row) => row.id === sourceAssetId);
+    const canonical = locked.find((row) => row.id === canonicalAssetId);
+    if (!source || !canonical) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
+
+    this.validatePair(source, canonical);
+    const sourceParentCanonical = source.parentId
+      ? await this.resolveCanonicalId(manager, source.parentId)
+      : null;
+    const targetParentCanonical = canonical.parentId
+      ? await this.resolveCanonicalId(manager, canonical.parentId)
+      : null;
+    if (sourceParentCanonical !== targetParentCanonical) throw new BadRequestException({
+      code: 'INVENTORY_MERGE_PARENT_MISMATCH',
+      message: 'Los duplicados deben pertenecer al mismo padre estructural (considerando fusiones previas)',
+    });
+
+    if (source.typeCode.toLowerCase() === 'instalacion') {
+      const invalidChildren = await manager.query(`
+        SELECT child.id,child.code,child.name
+        FROM assets child
+        WHERE child.parent_id=$1::uuid
+          AND child.information_status<>'INACTIVE'
+          AND (
+            child.inventory_family_id IS NULL
+            OR $2::uuid IS NULL
+            OR NOT EXISTS (
+              SELECT 1 FROM inventory_family_parent_rules rule
+              WHERE rule.child_family_id=child.inventory_family_id
+                AND rule.parent_family_id=$2::uuid
+            )
+          )
+        ORDER BY child.name,child.code
+        LIMIT 20
+      `, [source.id, canonical.inventoryFamilyId]) as Array<{ id: string; code: string; name: string }>;
+      if (invalidChildren.length > 0) throw new ConflictException({
+        code: 'INVENTORY_MERGE_CHILD_FAMILY_CONFLICT',
+        message: 'Hay Subinstalaciones que no son compatibles con la familia de la Instalación canónica',
+        data: invalidChildren,
+      });
+    }
+
+    const [sourceSnapshot, canonicalSnapshot] = await Promise.all([
+      this.snapshot(manager, source.id),
+      this.snapshot(manager, canonical.id),
+    ]);
+    const sourceLabel = principal.transport === 'bearer' ? 'ANDROID' : 'WEB';
+    const [mergeRecord] = (await manager.query(`
+      INSERT INTO asset_merges (
+        source_asset_id,canonical_asset_id,reason,merged_by,source,request_id,
+        source_snapshot,canonical_snapshot
+      ) VALUES ($1::uuid,$2::uuid,$3::text,$4::uuid,$5::varchar,$6::varchar,$7::jsonb,$8::jsonb)
+      RETURNING id,source_asset_id AS "sourceAssetId",canonical_asset_id AS "canonicalAssetId",
+        reason,merged_at AS "mergedAt",merged_by AS "mergedBy",source,request_id AS "requestId"
+    `, [
+      source.id,
+      canonical.id,
+      dto.reason,
+      principal.userId,
+      sourceLabel,
+      request.requestId,
+      sourceSnapshot,
+      canonicalSnapshot,
+    ])) as MergeRow[];
+
+    const children = (await manager.query(`
+      SELECT id FROM assets
+      WHERE parent_id=$1::uuid AND information_status<>'INACTIVE'
+      ORDER BY id FOR UPDATE
+    `, [source.id])) as Array<{ id: string }>;
+    const reparentedChildIds: string[] = [];
+    for (const child of children) {
+      await manager.query(`
+        UPDATE asset_context_history
+        SET valid_until=CURRENT_TIMESTAMP,
+            end_reason=$2::text,
+            ended_by=$3::uuid,
+            ended_at=CURRENT_TIMESTAMP
+        WHERE asset_id=$1::uuid AND valid_until IS NULL
+      `, [child.id, `Reparentado por fusión cronológica ${source.code} → ${canonical.code}`, principal.userId]);
+      await manager.query(`
+        UPDATE assets
+        SET parent_id=$2::uuid,updated_by=$3::uuid,updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1::uuid
+      `, [child.id, canonical.id, principal.userId]);
+      const versionNumber = await this.history.capture(
+        manager,
+        child.id,
+        AssetVersionChangeType.UPDATED,
+        principal,
+        request,
+      );
+      await manager.query(`
+        INSERT INTO asset_context_history (
+          asset_id,parent_id,operational_area_id,operator_company_id,valid_from,
+          change_reason,asset_version_number,source,request_id,created_by
+        )
+        SELECT id,parent_id,operational_area_id,operator_company_id,CURRENT_TIMESTAMP,
+          $2::text,$3::integer,$4::varchar,$5::varchar,$6::uuid
+        FROM assets WHERE id=$1::uuid
+      `, [
+        child.id,
+        `Reparentado por fusión cronológica ${source.code} → ${canonical.code}`,
+        versionNumber,
+        sourceLabel,
+        request.requestId,
+        principal.userId,
+      ]);
+      reparentedChildIds.push(child.id);
+    }
+
+    await manager.query(`
+      UPDATE assets
+      SET information_status='INACTIVE',updated_by=$2::uuid,updated_at=CURRENT_TIMESTAMP
+      WHERE id=$1::uuid
+    `, [source.id, principal.userId]);
+    const sourceVersionNumber = await this.history.capture(
+      manager,
+      source.id,
+      AssetVersionChangeType.STATUS_CHANGED,
+      principal,
+      request,
+    );
+
+    const result = {
+      merge: mergeRecord,
+      source: { id: source.id, code: source.code, name: source.name },
+      canonical: { id: canonical.id, code: canonical.code, name: canonical.name },
+      sourceVersionNumber,
+      reparentedChildIds,
+      historyPolicy: 'HISTORICAL_REFERENCES_PRESERVED',
+    };
+    await this.audit.record({
+      ...administrationAuditContext(principal, request),
+      action: AuditAction.ASSET_UPDATED,
+      entityType: 'asset_merge',
+      entityId: mergeRecord.id,
+      beforeData: sourceSnapshot,
+      afterData: canonicalSnapshot,
+      metadata: {
+        operation: 'CHRONOLOGICAL_MERGE',
+        sourceAssetId: source.id,
+        canonicalAssetId: canonical.id,
+        reason: dto.reason,
+        sourceVersionNumber,
+        reparentedChildIds,
+        historicalReferencesRewritten: false,
+      },
+    }, manager);
+    return result;
+  }
+
+  private validatePair(source: MergeableAssetRow, canonical: MergeableAssetRow): void {
+    const sourceType = source.typeCode.toLowerCase();
+    const targetType = canonical.typeCode.toLowerCase();
+    if (!MERGEABLE_TYPES.has(sourceType) || sourceType !== targetType) throw new BadRequestException({
+      code: 'INVENTORY_MERGE_TYPE_INVALID',
+      message: 'Sólo se pueden fusionar Instalaciones entre sí o Subinstalaciones entre sí',
+    });
+    if (source.informationStatus === 'INACTIVE') throw new ConflictException({
+      code: 'INVENTORY_MERGE_SOURCE_INACTIVE',
+      message: 'El registro de origen ya está inactivo',
+    });
+    if (canonical.informationStatus === 'INACTIVE') throw new ConflictException({
+      code: 'INVENTORY_MERGE_CANONICAL_INACTIVE',
+      message: 'El registro canónico no puede estar inactivo',
+    });
+    if (!source.operationalAreaId || !source.operatorCompanyId
+      || source.operationalAreaId !== canonical.operationalAreaId
+      || source.operatorCompanyId !== canonical.operatorCompanyId) {
+      throw new BadRequestException({
+        code: 'INVENTORY_MERGE_CONTEXT_MISMATCH',
+        message: 'Los registros deben pertenecer a la misma Área y Operadora',
+      });
+    }
+  }
+
+  private async loadAsset(manager: EntityManager, id: string, lock: boolean): Promise<MergeableAssetRow> {
+    const lockSql = lock ? 'FOR UPDATE OF asset' : '';
+    const rows = (await manager.query(`
+      SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
+        asset.parent_id AS "parentId",
+        asset.operational_area_id AS "operationalAreaId",
+        asset.operator_company_id AS "operatorCompanyId",
+        asset.inventory_family_id AS "inventoryFamilyId",
+        asset.information_status AS "informationStatus"
+      FROM assets asset JOIN asset_types type ON type.id=asset.asset_type_id
+      WHERE asset.id=$1::uuid ${lockSql}
+    `, [id])) as MergeableAssetRow[];
+    if (!rows[0]) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
+    return rows[0];
+  }
+
+  private async currentMerge(manager: EntityManager, sourceAssetId: string): Promise<MergeRow | null> {
+    const rows = (await manager.query(`
+      SELECT id,source_asset_id AS "sourceAssetId",canonical_asset_id AS "canonicalAssetId",
+        reason,merged_at AS "mergedAt",merged_by AS "mergedBy",source,request_id AS "requestId"
+      FROM asset_merges WHERE source_asset_id=$1::uuid
+    `, [sourceAssetId])) as MergeRow[];
+    return rows[0] ?? null;
+  }
+
+  private async resolveCanonicalId(manager: EntityManager, assetId: string): Promise<string> {
+    const rows = (await manager.query(`
+      WITH RECURSIVE chain AS (
+        SELECT source_asset_id,canonical_asset_id,1 AS depth
+        FROM asset_merges WHERE source_asset_id=$1::uuid
+        UNION ALL
+        SELECT merge_record.source_asset_id,merge_record.canonical_asset_id,chain.depth+1
+        FROM asset_merges merge_record
+        JOIN chain ON merge_record.source_asset_id=chain.canonical_asset_id
+        WHERE chain.depth<32
+      )
+      SELECT canonical_asset_id AS id FROM chain ORDER BY depth DESC LIMIT 1
+    `, [assetId])) as Array<{ id: string }>;
+    return rows[0]?.id ?? assetId;
+  }
+
+  private async mergeChain(assetId: string): Promise<MergeRow[]> {
+    return (await this.dataSource.query(`
+      WITH RECURSIVE chain AS (
+        SELECT id,source_asset_id,canonical_asset_id,reason,merged_at,merged_by,source,request_id,1 AS depth
+        FROM asset_merges WHERE source_asset_id=$1::uuid
+        UNION ALL
+        SELECT merge_record.id,merge_record.source_asset_id,merge_record.canonical_asset_id,
+          merge_record.reason,merge_record.merged_at,merge_record.merged_by,merge_record.source,merge_record.request_id,
+          chain.depth+1
+        FROM asset_merges merge_record
+        JOIN chain ON merge_record.source_asset_id=chain.canonical_asset_id
+        WHERE chain.depth<32
+      )
+      SELECT id,source_asset_id AS "sourceAssetId",canonical_asset_id AS "canonicalAssetId",
+        reason,merged_at AS "mergedAt",merged_by AS "mergedBy",source,request_id AS "requestId"
+      FROM chain ORDER BY depth
+    `, [assetId])) as MergeRow[];
+  }
+
+  private async aliasesFor(canonicalAssetId: string) {
+    return this.dataSource.query(`
+      WITH RECURSIVE aliases AS (
+        SELECT source_asset_id,canonical_asset_id,reason,merged_at,1 AS depth
+        FROM asset_merges WHERE canonical_asset_id=$1::uuid
+        UNION ALL
+        SELECT merge_record.source_asset_id,merge_record.canonical_asset_id,
+          merge_record.reason,merge_record.merged_at,aliases.depth+1
+        FROM asset_merges merge_record
+        JOIN aliases ON merge_record.canonical_asset_id=aliases.source_asset_id
+        WHERE aliases.depth<32
+      )
+      SELECT alias.source_asset_id AS id,asset.code,asset.name,alias.reason,
+        alias.merged_at AS "mergedAt",alias.depth
+      FROM aliases alias
+      JOIN assets asset ON asset.id=alias.source_asset_id
+      ORDER BY alias.merged_at,alias.depth
+    `, [canonicalAssetId]);
+  }
+
+  private async snapshot(manager: EntityManager, assetId: string): Promise<Record<string, unknown>> {
+    const rows = (await manager.query(`
+      SELECT TO_JSONB(asset) || JSONB_BUILD_OBJECT(
+        'typeCode',type.code,
+        'typeName',type.name,
+        'inventoryFamily',CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',family.id,'code',family.code,'name',family.name,'level',family.level
+        ) END
+      ) AS snapshot
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
+      WHERE asset.id=$1::uuid
+    `, [assetId])) as Array<{ snapshot: Record<string, unknown> }>;
+    if (!rows[0]) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
+    return rows[0].snapshot;
+  }
+}
@@ -0,0 +1,36 @@
+import { Body, Controller, Get, Param, Post, Query, Req } from '@nestjs/common';
+import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { CreateInventoryStructureDto } from './dto/create-inventory-structure.dto';
+import { InventoryStructureService } from './inventory-structure.service';
+
+@Controller('inventory-structure')
+export class InventoryStructureController {
+  constructor(private readonly inventoryStructure: InventoryStructureService) {}
+
+  @Get()
+  @RequirePermissions('assets.read')
+  options() {
+    return this.inventoryStructure.options();
+  }
+
+  @Get('parents/:kind')
+  @RequirePermissions('assets.read')
+  parents(
+    @Param('kind') kind: string,
+    @Query('search') search?: string,
+  ) {
+    return this.inventoryStructure.parents(kind, search);
+  }
+
+  @Post()
+  @RequirePermissions('assets.create')
+  create(
+    @Body() dto: CreateInventoryStructureDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.inventoryStructure.create(dto, principal, request);
+  }
+}
@@ -0,0 +1,372 @@
+import { randomUUID } from 'node:crypto';
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { DataSource, EntityManager } from 'typeorm';
+import { administrationAuditContext, isUniqueViolation } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import {
+  AssetDataOrigin,
+  AssetInformationStatus,
+  AssetOperationalStatus,
+  AssetVersionChangeType,
+  AuditAction,
+} from '../database/entities';
+import type { CreateInventoryStructureDto, InventoryStructureKind } from './dto/create-inventory-structure.dto';
+import { AssetHistoryService } from './asset-history.service';
+
+type StructureTypeRow = { id: string; code: string; name: string };
+type FamilyRow = {
+  id: string;
+  code: string;
+  name: string;
+  level: 'INSTALLATION' | 'SUBINSTALLATION';
+  legacyTypeCode: string | null;
+  informationLabels: string[];
+  parentFamilyId: string | null;
+  parentFamilyCode: string | null;
+  parentFamilyName: string | null;
+};
+type ParentRow = {
+  id: string;
+  code: string;
+  name: string;
+  typeCode: string;
+  operationalAreaId: string | null;
+  operatorCompanyId: string | null;
+  inventoryFamilyId: string | null;
+};
+
+const TYPE_CODE_BY_KIND: Record<InventoryStructureKind, string> = {
+  AREA: 'area',
+  YACIMIENTO: 'yacimiento',
+  INSTALACION: 'instalacion',
+  SUBINSTALACION: 'subinstalacion',
+};
+const PARENT_TYPE_BY_KIND: Record<InventoryStructureKind, string | null> = {
+  AREA: null,
+  YACIMIENTO: 'area',
+  INSTALACION: 'yacimiento',
+  SUBINSTALACION: 'instalacion',
+};
+const FAMILY_LEVEL_BY_KIND: Partial<Record<InventoryStructureKind, FamilyRow['level']>> = {
+  INSTALACION: 'INSTALLATION',
+  SUBINSTALACION: 'SUBINSTALLATION',
+};
+
+@Injectable()
+export class InventoryStructureService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+    private readonly history: AssetHistoryService,
+  ) {}
+
+  async options() {
+    const types = (await this.dataSource.query(`
+      SELECT id,code,name
+      FROM asset_types
+      WHERE lower(code) IN ('area','yacimiento','instalacion','subinstalacion')
+        AND is_active=true
+      ORDER BY CASE lower(code)
+        WHEN 'area' THEN 1 WHEN 'yacimiento' THEN 2
+        WHEN 'instalacion' THEN 3 WHEN 'subinstalacion' THEN 4 ELSE 9 END
+    `)) as StructureTypeRow[];
+    if (types.length !== 4) {
+      throw new ConflictException({
+        code: 'INVENTORY_STRUCTURE_TYPES_INCOMPLETE',
+        message: 'La estructura del Inventario todavía no está completamente configurada',
+      });
+    }
+    const families = (await this.dataSource.query(`
+      SELECT family.id,family.code,family.name,family.level,
+        family.legacy_type_code AS "legacyTypeCode",
+        family.information_labels AS "informationLabels",
+        parent.id AS "parentFamilyId",parent.code AS "parentFamilyCode",parent.name AS "parentFamilyName"
+      FROM inventory_families family
+      LEFT JOIN inventory_family_parent_rules rule ON rule.child_family_id=family.id
+      LEFT JOIN inventory_families parent ON parent.id=rule.parent_family_id
+      WHERE family.is_active=true
+      ORDER BY family.level,family.name,family.code
+    `)) as FamilyRow[];
+    return {
+      levels: [
+        { kind: 'AREA', label: 'Área', type: types.find((item) => item.code.toLowerCase()==='area'), parentKind: null, requiresFamily: false },
+        { kind: 'YACIMIENTO', label: 'Yacimiento', type: types.find((item) => item.code.toLowerCase()==='yacimiento'), parentKind: 'AREA', requiresFamily: false },
+        { kind: 'INSTALACION', label: 'Instalación', type: types.find((item) => item.code.toLowerCase()==='instalacion'), parentKind: 'YACIMIENTO', requiresFamily: true },
+        { kind: 'SUBINSTALACION', label: 'Subinstalación', type: types.find((item) => item.code.toLowerCase()==='subinstalacion'), parentKind: 'INSTALACION', requiresFamily: true },
+      ],
+      installationFamilies: families.filter((item) => item.level==='INSTALLATION'),
+      subinstallationFamilies: families.filter((item) => item.level==='SUBINSTALLATION'),
+    };
+  }
+
+  async parents(kindValue: string, search?: string) {
+    const kind = kindValue.toUpperCase() as InventoryStructureKind;
+    if (!(kind in PARENT_TYPE_BY_KIND) || kind === 'AREA') {
+      throw new BadRequestException({
+        code: 'INVENTORY_STRUCTURE_PARENT_KIND_INVALID',
+        message: 'El nivel indicado no requiere un registro padre',
+      });
+    }
+    const expectedType = PARENT_TYPE_BY_KIND[kind];
+    const parameters: unknown[] = [expectedType];
+    let searchSql = '';
+    if (search?.trim()) {
+      parameters.push(`%${search.trim()}%`);
+      searchSql = `AND (asset.code ILIKE $2 OR asset.name ILIKE $2 OR COALESCE(asset.common_name,'') ILIKE $2)`;
+    }
+    const rows = await this.dataSource.query(`
+      SELECT
+        asset.id,asset.code,asset.name,asset.common_name AS "commonName",
+        JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
+        CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',family.id,'code',family.code,'name',family.name,'level',family.level,
+          'informationLabels',family.information_labels
+        ) END AS "inventoryFamily",
+        CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',parent.id,'code',parent.code,'name',parent.name
+        ) END AS parent
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
+      LEFT JOIN assets parent ON parent.id=asset.parent_id
+      WHERE lower(type.code)=lower($1::text)
+        AND asset.information_status<>'INACTIVE'
+        ${searchSql}
+      ORDER BY asset.name,asset.code
+      LIMIT 80
+    `, parameters);
+    return { data: rows };
+  }
+
+  async create(
+    dto: CreateInventoryStructureDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    try {
+      return await this.dataSource.transaction(async (manager) => {
+        const type = await this.requireStructureType(manager, dto.kind);
+        const parent = await this.requireParent(manager, dto.kind, dto.parentId ?? null);
+        const family = await this.requireFamily(manager, dto.kind, dto.familyId ?? null, parent);
+        const code = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
+        const operationalAreaId = parent?.operationalAreaId ?? null;
+        const operatorCompanyId = parent?.operatorCompanyId ?? null;
+
+        const inserted = (await manager.query(`
+          INSERT INTO assets (
+            asset_type_id,parent_id,operational_area_id,operator_company_id,inventory_family_id,
+            code,name,common_name,description,information_status,operational_status,
+            data_origin,source_name,source_reference,source_notes,created_by,updated_by,provenance_updated_by
+          ) VALUES (
+            $1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,
+            $6::varchar,$7::varchar,$8::varchar,$9::text,$10::asset_information_status,$11::asset_operational_status,
+            $12::varchar,$13::varchar,$14::varchar,$15::text,$16::uuid,$16::uuid,$16::uuid
+          ) RETURNING id
+        `, [
+          type.id,
+          parent?.id ?? null,
+          operationalAreaId,
+          operatorCompanyId,
+          family?.id ?? null,
+          code,
+          dto.name,
+          dto.commonName ?? null,
+          dto.description ?? null,
+          AssetInformationStatus.DRAFT,
+          AssetOperationalStatus.UNKNOWN,
+          AssetDataOrigin.MANUAL,
+          'Inventario estructural F3.1',
+          `inventory-structure:${dto.kind.toLowerCase()}`,
+          family ? `Familia técnica: ${family.code} · ${family.name}` : null,
+          principal.userId,
+        ])) as Array<{ id: string }>;
+        const id = inserted[0]?.id;
+        if (!id) throw new Error('No se pudo crear el registro estructural');
+
+        const versionNumber = await this.history.capture(
+          manager,
+          id,
+          AssetVersionChangeType.CREATED,
+          principal,
+          request,
+        );
+        await manager.query(`
+          INSERT INTO asset_context_history (
+            asset_id,parent_id,operational_area_id,operator_company_id,valid_from,
+            change_reason,asset_version_number,source,request_id,created_by
+          ) VALUES ($1,$2,$3,$4,CURRENT_TIMESTAMP,$5,$6,'WEB',$7,$8)
+        `, [
+          id,
+          parent?.id ?? null,
+          operationalAreaId,
+          operatorCompanyId,
+          'Alta guiada de Inventario estructural F3.1',
+          versionNumber,
+          request.requestId,
+          principal.userId,
+        ]);
+        const created = await this.loadView(manager, id);
+        await this.audit.record({
+          ...administrationAuditContext(principal, request),
+          action: AuditAction.ASSET_CREATED,
+          entityType: 'asset',
+          entityId: id,
+          afterData: created as unknown as Record<string, unknown>,
+          metadata: {
+            versionNumber,
+            inventoryStructureKind: dto.kind,
+            inventoryFamilyId: family?.id ?? null,
+            inventoryFamilyCode: family?.code ?? null,
+          },
+        }, manager);
+        return created;
+      });
+    } catch (error) {
+      if (isUniqueViolation(error)) {
+        throw new ConflictException({
+          code: 'ASSET_CODE_ALREADY_EXISTS',
+          message: 'Ya existe un registro de Inventario con ese código',
+        });
+      }
+      throw error;
+    }
+  }
+
+  private async requireStructureType(manager: EntityManager, kind: InventoryStructureKind): Promise<StructureTypeRow> {
+    const rows = (await manager.query(`
+      SELECT id,code,name FROM asset_types
+      WHERE lower(code)=lower($1::text) AND is_active=true LIMIT 1
+    `, [TYPE_CODE_BY_KIND[kind]])) as StructureTypeRow[];
+    if (!rows[0]) {
+      throw new ConflictException({
+        code: 'INVENTORY_STRUCTURE_TYPE_NOT_CONFIGURED',
+        message: `El nivel ${kind} no está configurado`,
+      });
+    }
+    return rows[0];
+  }
+
+  private async requireParent(
+    manager: EntityManager,
+    kind: InventoryStructureKind,
+    parentId: string | null,
+  ): Promise<ParentRow | null> {
+    const expectedType = PARENT_TYPE_BY_KIND[kind];
+    if (!expectedType) {
+      if (parentId) {
+        throw new BadRequestException({
+          code: 'INVENTORY_AREA_MUST_BE_ROOT',
+          message: 'Un Área se crea como registro raíz y no puede tener padre',
+        });
+      }
+      return null;
+    }
+    if (!parentId) {
+      throw new BadRequestException({
+        code: 'INVENTORY_STRUCTURE_PARENT_REQUIRED',
+        message: `Para crear ${kind.toLowerCase()} primero tenés que elegir su ${expectedType}`,
+      });
+    }
+    const rows = (await manager.query(`
+      SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
+        asset.operational_area_id AS "operationalAreaId",
+        asset.operator_company_id AS "operatorCompanyId",
+        asset.inventory_family_id AS "inventoryFamilyId"
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
+      FOR KEY SHARE
+    `, [parentId])) as ParentRow[];
+    const parent = rows[0];
+    if (!parent) throw new NotFoundException({ code: 'INVENTORY_STRUCTURE_PARENT_NOT_FOUND', message: 'El registro padre no existe' });
+    if (parent.typeCode.toLowerCase() !== expectedType) {
+      throw new BadRequestException({
+        code: 'INVENTORY_STRUCTURE_PARENT_INVALID',
+        message: 'La jerarquía requerida es Área → Yacimiento → Instalación → Subinstalación',
+      });
+    }
+    return parent;
+  }
+
+  private async requireFamily(
+    manager: EntityManager,
+    kind: InventoryStructureKind,
+    familyId: string | null,
+    parent: ParentRow | null,
+  ): Promise<FamilyRow | null> {
+    const expectedLevel = FAMILY_LEVEL_BY_KIND[kind];
+    if (!expectedLevel) {
+      if (familyId) throw new BadRequestException({
+        code: 'INVENTORY_STRUCTURE_FAMILY_NOT_ALLOWED',
+        message: 'Área y Yacimiento no llevan familia técnica',
+      });
+      return null;
+    }
+    if (!familyId) throw new BadRequestException({
+      code: 'INVENTORY_STRUCTURE_FAMILY_REQUIRED',
+      message: `Elegí la familia técnica de la ${kind.toLowerCase()}`,
+    });
+    const rows = (await manager.query(`
+      SELECT family.id,family.code,family.name,family.level,
+        family.legacy_type_code AS "legacyTypeCode",
+        family.information_labels AS "informationLabels",
+        parent.id AS "parentFamilyId",parent.code AS "parentFamilyCode",parent.name AS "parentFamilyName"
+      FROM inventory_families family
+      LEFT JOIN inventory_family_parent_rules rule ON rule.child_family_id=family.id
+      LEFT JOIN inventory_families parent ON parent.id=rule.parent_family_id
+      WHERE family.id=$1::uuid AND family.is_active=true
+      LIMIT 1
+    `, [familyId])) as FamilyRow[];
+    const family = rows[0];
+    if (!family) throw new NotFoundException({ code: 'INVENTORY_FAMILY_NOT_FOUND', message: 'La familia técnica no existe' });
+    if (family.level !== expectedLevel) throw new BadRequestException({
+      code: 'INVENTORY_FAMILY_LEVEL_INVALID',
+      message: 'La familia técnica no corresponde al nivel seleccionado',
+    });
+    if (kind === 'SUBINSTALACION' && family.parentFamilyId !== parent?.inventoryFamilyId) {
+      throw new BadRequestException({
+        code: 'INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID',
+        message: 'La Subinstalación elegida no pertenece a la familia de la Instalación seleccionada',
+      });
+    }
+    return family;
+  }
+
+  private generatedCode(kind: InventoryStructureKind, name: string): string {
+    const prefix = kind === 'YACIMIENTO' ? 'YAC' : kind === 'INSTALACION' ? 'INST' : kind === 'SUBINSTALACION' ? 'SUB' : 'AREA';
+    const readable = name
+      .normalize('NFD')
+      .replace(/[\u0300-\u036f]/g, '')
+      .toUpperCase()
+      .replace(/[^A-Z0-9]+/g, '-')
+      .replace(/^-+|-+$/g, '')
+      .slice(0, 48) || 'REGISTRO';
+    return `${prefix}-${readable}-${randomUUID().slice(0, 8).toUpperCase()}`.slice(0, 120);
+  }
+
+  private async loadView(manager: EntityManager, id: string) {
+    const rows = await manager.query(`
+      SELECT asset.id,asset.code,asset.name,asset.common_name AS "commonName",asset.description,
+        asset.information_status AS "informationStatus",asset.operational_status AS "operationalStatus",
+        JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
+        CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) END AS parent,
+        CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',family.id,'code',family.code,'name',family.name,'level',family.level,
+          'informationLabels',family.information_labels
+        ) END AS "inventoryFamily",
+        asset.created_at AS "createdAt",asset.updated_at AS "updatedAt"
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      LEFT JOIN assets parent ON parent.id=asset.parent_id
+      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
+      WHERE asset.id=$1::uuid
+    `, [id]);
+    return rows[0];
+  }
+}
@@ -0,0 +1,164 @@
+import { Injectable } from '@nestjs/common';
+import { AssetsService } from './assets.service';
+import { InventoryMergeService } from './inventory-merge.service';
+
+type LooseRecord = Record<string, any>;
+
+function dedupeById<T extends LooseRecord>(items: T[]): T[] {
+  const seen = new Set<string>();
+  const result: T[] = [];
+  for (const item of items) {
+    const id = String(item.id ?? '');
+    if (!id || seen.has(id)) continue;
+    seen.add(id);
+    result.push(item);
+  }
+  return result;
+}
+
+function sortDesc(items: LooseRecord[], fieldCandidates: string[]): LooseRecord[] {
+  return [...items].sort((a, b) => {
+    const first = fieldCandidates.map((field) => b[field]).find(Boolean) ?? 0;
+    const second = fieldCandidates.map((field) => a[field]).find(Boolean) ?? 0;
+    return new Date(String(first)).getTime() - new Date(String(second)).getTime();
+  });
+}
+
+@Injectable()
+export class MergedInventoryDossierService {
+  constructor(
+    private readonly assets: AssetsService,
+    private readonly merges: InventoryMergeService,
+  ) {}
+
+  async dossier(requestedAssetId: string): Promise<Record<string, unknown>> {
+    const mergeStatus = await this.merges.status(requestedAssetId) as LooseRecord;
+    const canonical = mergeStatus.canonical as LooseRecord;
+    const requested = mergeStatus.requested as LooseRecord;
+    const aliases = (mergeStatus.aliases ?? []) as LooseRecord[];
+    const inventoryIds = [canonical.id, ...aliases.map((alias) => alias.id)]
+      .filter(Boolean)
+      .map(String)
+      .filter((value, index, all) => all.indexOf(value) === index);
+
+    const dossiers = await Promise.all(inventoryIds.map(async (assetId) => {
+      const dossier = await this.assets.dossier(assetId) as LooseRecord;
+      const identity = dossier.asset as LooseRecord;
+      return { assetId, identity, dossier };
+    }));
+
+    const enrich = (entry: LooseRecord, identity: LooseRecord): LooseRecord => ({
+      ...entry,
+      historicalInventory: {
+        id: identity.id,
+        code: identity.code,
+        name: identity.name,
+        commonName: identity.commonName ?? null,
+        isCanonical: identity.id === canonical.id,
+      },
+    });
+
+    const collect = (key: string): LooseRecord[] => dedupeById(
+      dossiers.flatMap(({ identity, dossier }) =>
+        ((dossier[key] ?? []) as LooseRecord[]).map((entry) => enrich(entry, identity)),
+      ),
+    );
+
+    const visits = sortDesc(collect('visits'), ['actualStartedAt', 'plannedStartAt', 'createdAt']);
+    const acts = sortDesc(collect('acts'), ['occurredAt', 'createdAt']);
+    const findings = sortDesc(collect('findings'), ['createdAt', 'updatedAt']);
+    const evidence = sortDesc(collect('evidence'), ['capturedAt', 'createdAt']);
+    const communications = sortDesc(collect('communications'), ['occurredAt', 'createdAt']);
+    const verificationResults = sortDesc(collect('verificationResults'), ['verifiedAt', 'resultRecordedAt']);
+    const documents = sortDesc(collect('documents'), ['documentDate', 'linkedAt']);
+    const inspectionReports = sortDesc(collect('inspectionReports'), ['generatedAt']);
+    const media = sortDesc(collect('media'), ['capturedAt', 'createdAt']);
+    const versions = sortDesc(collect('versions'), ['occurredAt']);
+
+    const timelineSource: LooseRecord[] = dossiers.flatMap(({ identity, dossier }) =>
+      ((dossier.timeline ?? []) as LooseRecord[]).map((event): LooseRecord => ({
+        ...event,
+        meta: {
+          ...(event.meta ?? {}),
+          historicalInventory: {
+            id: identity.id,
+            code: identity.code,
+            name: identity.name,
+            isCanonical: identity.id === canonical.id,
+          },
+        },
+      })),
+    );
+    const timeline: LooseRecord[] = dedupeById<LooseRecord>(timelineSource);
+
+    for (const alias of aliases) {
+      timeline.push({
+        id: `merge:${String(alias.id)}:${String(alias.mergedAt)}`,
+        kind: 'MERGE',
+        occurredAt: alias.mergedAt,
+        title: `Inventario fusionado · ${String(alias.code)}`,
+        description: alias.reason,
+        meta: {
+          sourceAssetId: alias.id,
+          sourceCode: alias.code,
+          sourceName: alias.name,
+          canonicalAssetId: canonical.id,
+          canonicalCode: canonical.code,
+          canonicalName: canonical.name,
+          historyPreserved: true,
+        },
+      });
+    }
+    timeline.sort((a, b) => new Date(String(b.occurredAt ?? 0)).getTime() - new Date(String(a.occurredAt ?? 0)).getTime());
+
+    const reports = documents.filter((document) => document.documentType === 'TECHNICAL_REPORT');
+    const openFindings = findings.filter((finding) => finding.status === 'OPEN').length;
+    const closedFindings = findings.filter((finding) => finding.status === 'CLOSED').length;
+
+    return {
+      asset: {
+        id: canonical.id,
+        code: canonical.code,
+        name: canonical.name,
+        commonName: dossiers.find((item) => item.assetId === canonical.id)?.identity?.commonName ?? null,
+      },
+      requestedAsset: {
+        id: requested.id,
+        code: requested.code,
+        name: requested.name,
+      },
+      merge: {
+        requestedWasMerged: requested.id !== canonical.id,
+        canonicalAssetId: canonical.id,
+        aliases,
+        chain: mergeStatus.chain ?? [],
+        aggregatedInventoryIds: inventoryIds,
+        historyPolicy: 'CHRONOLOGICAL_AGGREGATION_WITH_ORIGINAL_IDENTITY',
+      },
+      counters: {
+        inspections: visits.length,
+        acts: acts.length,
+        findings: findings.length,
+        verifications: verificationResults.length,
+        openFindings,
+        closedFindings,
+        evidence: evidence.length,
+        documents: documents.length + media.filter((item) => item.kind === 'DOCUMENT').length,
+        photos: evidence.filter((item) => item.kind === 'PHOTO').length + media.filter((item) => item.kind === 'PHOTO').length,
+        reports: reports.length + inspectionReports.length,
+      },
+      visits,
+      acts,
+      findings,
+      evidence,
+      communications,
+      verificationResults,
+      documents,
+      inspectionReports,
+      reports,
+      media,
+      versions,
+      timeline: timeline.slice(0, 1000),
+    };
+  }
+}
@@ -5,6 +5,8 @@ import { AuthorizationModule } from '../authorization/authorization.module';
 import { PhaseADataModule } from '../core-data/phase-a-data.module';
 import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
+import { MobileAuthController } from './mobile-auth.controller';
+import { MobileAuthService } from './mobile-auth.service';
 import { AccessTokenGuard } from './guards/access-token.guard';
 import { CsrfGuard } from './guards/csrf.guard';
 import { AuthConfigService } from '../common/config/auth-config.service';
@@ -18,6 +20,7 @@ const providers = [
  PasswordService,
  TokenService,
  AuthService,
+  MobileAuthService,
  AccessTokenGuard,
  CsrfGuard,
 ];
@@ -29,7 +32,7 @@ const providers = [
    AuditModule,
    AuthorizationModule,
  ],
-  controllers: [AuthController],
+  controllers: [AuthController, MobileAuthController],
  providers,
  exports: [
    AuthConfigService,
@@ -0,0 +1,8 @@
+import { IsString, MaxLength, MinLength } from 'class-validator';
+
+export class MobileRefreshDto {
+  @IsString()
+  @MinLength(32)
+  @MaxLength(256)
+  refreshToken!: string;
+}
@@ -0,0 +1,56 @@
+import {
+  Body,
+  Controller,
+  HttpCode,
+  Post,
+  Req,
+} from '@nestjs/common';
+import { Throttle } from '@nestjs/throttler';
+import type {
+  AuthPrincipal,
+  RequestWithContext,
+} from '../common/http/request-context';
+import { CurrentAuth } from './decorators/current-auth.decorator';
+import { Public } from './decorators/public.decorator';
+import { SkipCsrf } from './decorators/skip-csrf.decorator';
+import { LoginDto } from './dto/login.dto';
+import { MobileRefreshDto } from './dto/mobile-refresh.dto';
+import { MobileAuthService } from './mobile-auth.service';
+
+@Controller('auth/mobile')
+export class MobileAuthController {
+  constructor(private readonly mobileAuth: MobileAuthService) {}
+
+  @Post('login')
+  @HttpCode(200)
+  @Public()
+  @SkipCsrf()
+  @Throttle({ default: { limit: 5, ttl: 60_000, blockDuration: 60_000 } })
+  login(
+    @Body() dto: LoginDto,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.mobileAuth.login(dto, request);
+  }
+
+  @Post('refresh')
+  @HttpCode(200)
+  @Public()
+  @SkipCsrf()
+  @Throttle({ default: { limit: 20, ttl: 60_000 } })
+  refresh(
+    @Body() dto: MobileRefreshDto,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.mobileAuth.refresh(dto.refreshToken, request);
+  }
+
+  @Post('logout')
+  @HttpCode(200)
+  logout(
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.mobileAuth.logout(principal, request);
+  }
+}
@@ -0,0 +1,386 @@
+import { isIP } from 'node:net';
+import {
+  ForbiddenException,
+  Injectable,
+  UnauthorizedException,
+} from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import { AuditService } from '../audit/audit.service';
+import type {
+  AuthPrincipal,
+  RequestWithContext,
+} from '../common/http/request-context';
+import { AuthSessionsRepository } from '../core-data/repositories/auth-sessions.repository';
+import { RolesRepository } from '../core-data/repositories/roles.repository';
+import { UsersRepository } from '../core-data/repositories/users.repository';
+import {
+  AuditAction,
+  AuditSource,
+  AuthSession,
+  User,
+  UserStatus,
+} from '../database/entities';
+import type { LoginDto } from './dto/login.dto';
+import { PasswordService } from './services/password.service';
+import {
+  IssuedRefreshToken,
+  TokenService,
+} from './services/token.service';
+
+interface RequestMetadata {
+  ip: string | null;
+  userAgent: string | null;
+}
+
+interface SuccessfulAuthentication {
+  user: User;
+  accessToken: string;
+  refreshToken: IssuedRefreshToken;
+}
+
+type LoginOutcome = SuccessfulAuthentication | null;
+type RefreshOutcome =
+  | ({ kind: 'ok' } & SuccessfulAuthentication)
+  | { kind: 'reuse' }
+  | { kind: 'invalid' };
+
+function invalidCredentials(): UnauthorizedException {
+  return new UnauthorizedException({
+    code: 'INVALID_CREDENTIALS',
+    message: 'Credenciales inválidas',
+  });
+}
+
+function invalidSession(): UnauthorizedException {
+  return new UnauthorizedException({
+    code: 'INVALID_SESSION',
+    message: 'Sesión móvil inválida o vencida',
+  });
+}
+
+function inspectorRequired(): ForbiddenException {
+  return new ForbiddenException({
+    code: 'INSPECTION_INSPECTOR_ROLE_REQUIRED',
+    message: 'Sólo un usuario con rol inspector puede ingresar a la aplicación móvil',
+  });
+}
+
+function requestMetadata(request: RequestWithContext): RequestMetadata {
+  const candidateIp = request.ip || request.socket.remoteAddress || '';
+  const ip = isIP(candidateIp) ? candidateIp : null;
+  const rawUserAgent = request.header('user-agent')?.trim();
+  return {
+    ip,
+    userAgent: rawUserAgent ? rawUserAgent.slice(0, 2048) : null,
+  };
+}
+
+@Injectable()
+export class MobileAuthService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly users: UsersRepository,
+    private readonly sessions: AuthSessionsRepository,
+    private readonly roles: RolesRepository,
+    private readonly passwords: PasswordService,
+    private readonly tokens: TokenService,
+    private readonly audit: AuditService,
+  ) {}
+
+  async login(dto: LoginDto, request: RequestWithContext) {
+    const identifier = dto.identifier.trim().toLowerCase();
+    const candidate = await this.users.findForAuthentication(identifier);
+    const metadata = requestMetadata(request);
+
+    if (!candidate) {
+      await this.passwords.verifyUnknown(dto.password);
+      await this.audit.record({
+        action: AuditAction.AUTH_LOGIN_FAILED,
+        requestId: request.requestId,
+        source: AuditSource.ANDROID,
+        ...metadata,
+        metadata: { identifier, reason: 'UNKNOWN_IDENTIFIER' },
+      });
+      throw invalidCredentials();
+    }
+
+    const outcome = await this.dataSource.transaction<LoginOutcome>(
+      async (manager) => {
+        const user = await manager
+          .getRepository(User)
+          .createQueryBuilder('user')
+          .addSelect('user.passwordHash')
+          .where('user.id = :id', { id: candidate.id })
+          .setLock('pessimistic_write')
+          .getOne();
+        if (!user) return null;
+
+        const now = new Date();
+        const passwordMatches = await this.passwords.verify(
+          user.passwordHash,
+          dto.password,
+        );
+        const locked = Boolean(user.lockedUntil && user.lockedUntil > now);
+        const active = user.status === UserStatus.ACTIVE;
+
+        if (!passwordMatches || locked || !active) {
+          if (!passwordMatches && active && !locked) {
+            await manager.query(
+              `
+                UPDATE users
+                SET
+                  failed_login_attempts = failed_login_attempts + 1,
+                  locked_until = CASE
+                    WHEN failed_login_attempts + 1 >= $2
+                      THEN CURRENT_TIMESTAMP + ($3 * INTERVAL '1 second')
+                    ELSE locked_until
+                  END,
+                  updated_at = CURRENT_TIMESTAMP
+                WHERE id = $1
+              `,
+              [
+                user.id,
+                this.tokens.maxLoginAttempts,
+                this.tokens.lockoutSeconds,
+              ],
+            );
+          }
+
+          await this.audit.record(
+            {
+              actorUserId: user.id,
+              actorUsername: user.username,
+              action: AuditAction.AUTH_LOGIN_FAILED,
+              entityType: 'user',
+              entityId: user.id,
+              requestId: request.requestId,
+              source: AuditSource.ANDROID,
+              ...metadata,
+              metadata: {
+                reason: !active
+                  ? 'INACTIVE_USER'
+                  : locked
+                    ? 'LOCKED_USER'
+                    : 'INVALID_PASSWORD',
+              },
+            },
+            manager,
+          );
+          return null;
+        }
+
+        if (this.passwords.needsRehash(user.passwordHash)) {
+          user.passwordHash = await this.passwords.hash(dto.password);
+        }
+        user.failedLoginAttempts = 0;
+        user.lockedUntil = null;
+        user.lastLoginAt = now;
+        await manager.getRepository(User).save(user);
+
+        const refreshToken = this.tokens.issueRefreshToken();
+        const session = manager.getRepository(AuthSession).create({
+          id: refreshToken.sessionId,
+          userId: user.id,
+          refreshTokenHash: refreshToken.tokenHash,
+          expiresAt: this.tokens.refreshExpiresAt(now),
+          lastUsedAt: now,
+          revokedAt: null,
+          replacedBySessionId: null,
+          ip: metadata.ip,
+          userAgent: metadata.userAgent,
+          deviceLabel: dto.deviceLabel?.trim() || 'DH Android',
+        });
+        await manager.getRepository(AuthSession).save(session);
+
+        const accessToken = await this.tokens.issueAccessToken({
+          userId: user.id,
+          sessionId: session.id,
+          username: user.username,
+        });
+
+        await this.audit.record(
+          {
+            actorUserId: user.id,
+            actorUsername: user.username,
+            action: AuditAction.AUTH_LOGIN_SUCCESS,
+            entityType: 'auth_session',
+            entityId: session.id,
+            requestId: request.requestId,
+            source: AuditSource.ANDROID,
+            ...metadata,
+            metadata: { deviceLabel: session.deviceLabel },
+          },
+          manager,
+        );
+
+        return { user, accessToken, refreshToken };
+      },
+    );
+
+    if (!outcome) throw invalidCredentials();
+    return this.complete(outcome);
+  }
+
+  async refresh(rawToken: string, request: RequestWithContext) {
+    const parsed = this.tokens.parseRefreshToken(rawToken);
+    if (!parsed) throw invalidSession();
+
+    const metadata = requestMetadata(request);
+    const outcome = await this.dataSource.transaction<RefreshOutcome>(
+      async (manager) => {
+        const session = await manager
+          .getRepository(AuthSession)
+          .createQueryBuilder('session')
+          .addSelect('session.refreshTokenHash')
+          .where('session.id = :id', { id: parsed.sessionId })
+          .setLock('pessimistic_write')
+          .getOne();
+
+        if (
+          !session ||
+          !this.tokens.verifyRefreshToken(rawToken, session.refreshTokenHash)
+        ) {
+          return { kind: 'invalid' };
+        }
+
+        const user = await manager.getRepository(User).findOne({
+          where: { id: session.userId },
+        });
+
+        if (session.revokedAt) {
+          await this.sessions.revokeSessionFamily(session.id, manager);
+          await this.audit.record(
+            {
+              actorUserId: user?.id ?? null,
+              actorUsername: user?.username ?? null,
+              action: AuditAction.AUTH_REFRESH_REUSE_DETECTED,
+              entityType: 'auth_session',
+              entityId: session.id,
+              requestId: request.requestId,
+              source: AuditSource.ANDROID,
+              ...metadata,
+            },
+            manager,
+          );
+          return { kind: 'reuse' };
+        }
+
+        const now = new Date();
+        if (!user || user.status !== UserStatus.ACTIVE || session.expiresAt <= now) {
+          session.revokedAt = now;
+          session.lastUsedAt = now;
+          await manager.getRepository(AuthSession).save(session);
+          if (user?.status === UserStatus.INACTIVE) {
+            await this.sessions.revokeUserSessions(user.id, undefined, manager);
+          }
+          return { kind: 'invalid' };
+        }
+
+        const refreshToken = this.tokens.issueRefreshToken();
+        const replacement = manager.getRepository(AuthSession).create({
+          id: refreshToken.sessionId,
+          userId: user.id,
+          refreshTokenHash: refreshToken.tokenHash,
+          expiresAt: this.tokens.refreshExpiresAt(now),
+          lastUsedAt: now,
+          revokedAt: null,
+          replacedBySessionId: null,
+          ip: metadata.ip,
+          userAgent: metadata.userAgent,
+          deviceLabel: session.deviceLabel,
+        });
+        await manager.getRepository(AuthSession).save(replacement);
+
+        session.revokedAt = now;
+        session.lastUsedAt = now;
+        session.replacedBySessionId = replacement.id;
+        await manager.getRepository(AuthSession).save(session);
+
+        const accessToken = await this.tokens.issueAccessToken({
+          userId: user.id,
+          sessionId: replacement.id,
+          username: user.username,
+        });
+
+        await this.audit.record(
+          {
+            actorUserId: user.id,
+            actorUsername: user.username,
+            action: AuditAction.AUTH_REFRESH,
+            entityType: 'auth_session',
+            entityId: replacement.id,
+            requestId: request.requestId,
+            source: AuditSource.ANDROID,
+            ...metadata,
+            metadata: { replacedSessionId: session.id },
+          },
+          manager,
+        );
+
+        return { kind: 'ok', user, accessToken, refreshToken };
+      },
+    );
+
+    if (outcome.kind !== 'ok') throw invalidSession();
+    return this.complete(outcome);
+  }
+
+  async logout(
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    const metadata = requestMetadata(request);
+    await this.dataSource.transaction(async (manager) => {
+      await this.sessions.revokeSession(
+        principal.sessionId,
+        principal.userId,
+        manager,
+      );
+      await this.audit.record(
+        {
+          actorUserId: principal.userId,
+          actorUsername: principal.username,
+          action: AuditAction.AUTH_LOGOUT,
+          entityType: 'auth_session',
+          entityId: principal.sessionId,
+          requestId: request.requestId,
+          source: AuditSource.ANDROID,
+          ...metadata,
+        },
+        manager,
+      );
+    });
+    return { status: 'ok' };
+  }
+
+  private async complete(authentication: SuccessfulAuthentication) {
+    const [roleCodes, permissionCodes] = await Promise.all([
+      this.roles.findRoleCodesForUser(authentication.user.id),
+      this.roles.findPermissionCodesForUser(authentication.user.id),
+    ]);
+
+    if (!roleCodes.includes('inspector')) {
+      await this.sessions.revokeSession(
+        authentication.refreshToken.sessionId,
+        authentication.user.id,
+      );
+      throw inspectorRequired();
+    }
+
+    return {
+      user: {
+        id: authentication.user.id,
+        username: authentication.user.username,
+        firstName: authentication.user.firstName,
+        lastName: authentication.user.lastName,
+        email: authentication.user.email,
+        mustChangePassword: authentication.user.mustChangePassword,
+        roles: roleCodes,
+        permissions: permissionCodes,
+      },
+      accessToken: authentication.accessToken,
+      refreshToken: authentication.refreshToken.token,
+      accessExpiresInSeconds: this.tokens.accessTokenTtlSeconds,
+    };
+  }
+}
@@ -1,247 +0,0 @@
-import 'reflect-metadata';
-
-import { promises as fs } from 'node:fs';
-import { migrationDataSource } from '../database/data-source';
-
-const APPLY_TOKEN = 'DHV2-FRESH-START-20260905';
-
-const PRESERVED_TABLES = new Set([
-  'typeorm_migrations',
-  'spatial_ref_sys',
-  'users',
-  'user_roles',
-  'roles',
-  'role_permissions',
-  'permissions',
-  'asset_types',
-  'asset_type_parent_rules',
-  'asset_attribute_definitions',
-  'finding_categories',
-  'finding_catalog_items',
-  'finding_catalog_item_asset_types',
-  'finding_catalog_asset_type_profiles',
-]);
-
-type AdminRow = {
-  id: string;
-  username: string;
-  email: string | null;
-  status: string;
-};
-
-type TableRow = { table_name: string };
-type CountRow = { count: string | number };
-
-function quoteIdentifier(value: string): string {
-  return `"${value.replaceAll('"', '""')}"`;
-}
-
-function requestedMode(): 'preview' | 'apply' {
-  const args = process.argv.slice(2);
-  if (args.length === 1 && args[0] === '--preview') return 'preview';
-  if (args.length === 2 && args[0] === '--apply' && args[1] === APPLY_TOKEN) {
-    return 'apply';
-  }
-  throw new Error(
-    `Uso inválido. Permitido: --preview o --apply ${APPLY_TOKEN}`,
-  );
-}
-
-async function rowCount(table: string): Promise<number> {
-  const result = (await migrationDataSource.query(
-    `SELECT COUNT(*)::bigint AS count FROM public.${quoteIdentifier(table)}`,
-  )) as CountRow[];
-  return Number(result[0]?.count ?? 0);
-}
-
-async function clearMediaStorage(): Promise<void> {
-  const root = process.env.ASSET_MEDIA_ROOT;
-  if (!root) {
-    process.stdout.write('MEDIA: ASSET_MEDIA_ROOT no configurado; no se tocaron archivos.\n');
-    return;
-  }
-
-  try {
-    const entries = await fs.readdir(root, { withFileTypes: true });
-    for (const entry of entries) {
-      await fs.rm(`${root}/${entry.name}`, { recursive: true, force: true });
-    }
-    await fs.mkdir(`${root}/imports`, { recursive: true });
-    process.stdout.write(`MEDIA: almacenamiento limpiado en ${root}\n`);
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    process.stdout.write(`MEDIA WARNING: no se pudo limpiar completamente ${root}: ${message}\n`);
-  }
-}
-
-async function main(): Promise<void> {
-  const mode = requestedMode();
-  await migrationDataSource.initialize();
-
-  try {
-    await migrationDataSource.query(
-      `SELECT pg_advisory_lock(hashtext('dhv2-fresh-start-reset'))`,
-    );
-
-    const admins = (await migrationDataSource.query(`
-      SELECT DISTINCT user_row.id, user_row.username, user_row.email, user_row.status
-      FROM users user_row
-      INNER JOIN user_roles user_role ON user_role.user_id = user_row.id
-      INNER JOIN roles role ON role.id = user_role.role_id
-      WHERE role.code = 'admin'
-      ORDER BY user_row.username
-    `)) as AdminRow[];
-
-    if (admins.length !== 1) {
-      throw new Error(
-        `Se esperaba exactamente 1 usuario con rol admin y se encontraron ${admins.length}. Limpieza abortada.`,
-      );
-    }
-
-    const admin = admins[0];
-    const tables = (await migrationDataSource.query(`
-      SELECT table_name
-      FROM information_schema.tables
-      WHERE table_schema = 'public'
-        AND table_type = 'BASE TABLE'
-      ORDER BY table_name
-    `)) as TableRow[];
-
-    const existingTables = tables.map((row) => row.table_name);
-    const tablesToClear = existingTables.filter(
-      (table) => !PRESERVED_TABLES.has(table),
-    );
-    const tablesToPreserve = existingTables.filter((table) =>
-      PRESERVED_TABLES.has(table),
-    );
-
-    process.stdout.write('\n============================================================\n');
-    process.stdout.write(` DH V2 · FRESH START · ${mode.toUpperCase()}\n`);
-    process.stdout.write('============================================================\n');
-    process.stdout.write(
-      `ADMIN PRESERVADO: ${admin.username} · ${admin.email ?? 'sin email'} · ${admin.id}\n`,
-    );
-
-    process.stdout.write('\n========== TABLAS ESTRUCTURALES CONSERVADAS ==========\n');
-    for (const table of tablesToPreserve) {
-      process.stdout.write(`KEEP  ${table.padEnd(46)} ${await rowCount(table)}\n`);
-    }
-
-    process.stdout.write('\n========== DATOS A ELIMINAR ==========\n');
-    let rowsToDelete = 0;
-    for (const table of tablesToClear) {
-      const count = await rowCount(table);
-      rowsToDelete += count;
-      process.stdout.write(`CLEAR ${table.padEnd(46)} ${count}\n`);
-    }
-
-    const userCount = await rowCount('users');
-    const nonAdminUsers = Math.max(0, userCount - 1);
-    process.stdout.write(`CLEAR ${'users (excepto admin)'.padEnd(46)} ${nonAdminUsers}\n`);
-    rowsToDelete += nonAdminUsers;
-    process.stdout.write(`TOTAL FILAS OPERATIVAS/USUARIOS A RETIRAR: ${rowsToDelete}\n`);
-
-    if (mode === 'preview') {
-      process.stdout.write('\nPREVIEW_OK: no se modificó ningún dato.\n');
-      return;
-    }
-
-    await migrationDataSource.transaction(async (manager) => {
-      await manager.query(`SET LOCAL session_replication_role = replica`);
-
-      for (const table of tablesToClear) {
-        await manager.query(`DELETE FROM public.${quoteIdentifier(table)}`);
-      }
-
-      await manager.query(
-        `DELETE FROM user_roles WHERE user_id <> $1::uuid`,
-        [admin.id],
-      );
-      await manager.query(
-        `
-          DELETE FROM user_roles user_role
-          USING roles role
-          WHERE user_role.user_id = $1::uuid
-            AND role.id = user_role.role_id
-            AND role.code <> 'admin'
-        `,
-        [admin.id],
-      );
-      await manager.query(`DELETE FROM users WHERE id <> $1::uuid`, [admin.id]);
-      await manager.query(
-        `
-          UPDATE users
-          SET status = 'ACTIVE',
-              failed_login_attempts = 0,
-              locked_until = NULL,
-              created_by = CASE WHEN created_by = $1::uuid THEN created_by ELSE NULL END,
-              updated_by = $1::uuid,
-              updated_at = CURRENT_TIMESTAMP
-          WHERE id = $1::uuid
-        `,
-        [admin.id],
-      );
-      await manager.query(
-        `
-          UPDATE user_roles user_role
-          SET assigned_by = $1::uuid
-          FROM roles role
-          WHERE user_role.user_id = $1::uuid
-            AND role.id = user_role.role_id
-            AND role.code = 'admin'
-        `,
-        [admin.id],
-      );
-    });
-
-    const usersAfter = await rowCount('users');
-    if (usersAfter !== 1) {
-      throw new Error(`Verificación falló: users=${usersAfter}, esperado=1`);
-    }
-
-    const adminAfter = (await migrationDataSource.query(
-      `
-        SELECT COUNT(DISTINCT user_row.id)::integer AS count
-        FROM users user_row
-        INNER JOIN user_roles user_role ON user_role.user_id = user_row.id
-        INNER JOIN roles role ON role.id = user_role.role_id
-        WHERE role.code = 'admin'
-      `,
-    )) as CountRow[];
-    if (Number(adminAfter[0]?.count ?? 0) !== 1) {
-      throw new Error('Verificación falló: el administrador no quedó correctamente asignado');
-    }
-
-    for (const table of tablesToClear) {
-      const count = await rowCount(table);
-      if (count !== 0) {
-        throw new Error(`Verificación falló: ${table} conserva ${count} fila(s)`);
-      }
-    }
-
-    await clearMediaStorage();
-
-    process.stdout.write('\n========== VERIFICACIÓN FRESH START ==========\n');
-    process.stdout.write(`Usuarios: 1 (${admin.username})\n`);
-    process.stdout.write('Datos operativos/importados: 0\n');
-    process.stdout.write('Roles/permisos/tipos/catálogos estructurales: conservados\n');
-    process.stdout.write('FRESH_START_OK\n');
-  } finally {
-    if (migrationDataSource.isInitialized) {
-      try {
-        await migrationDataSource.query(
-          `SELECT pg_advisory_unlock(hashtext('dhv2-fresh-start-reset'))`,
-        );
-      } catch {
-        // La conexión se destruirá de todas formas.
-      }
-      await migrationDataSource.destroy();
-    }
-  }
-}
-
-main().catch((error: unknown) => {
-  const message = error instanceof Error ? error.message : String(error);
-  process.stderr.write(`FRESH_START_ERROR: ${message}\n`);
-  process.exitCode = 1;
-});
@@ -33,6 +33,7 @@ export enum AssetDataOrigin {
@Index('idx_assets_parent_id', ['parentId'])
@Index('idx_assets_operational_area_id', ['operationalAreaId'])
@Index('idx_assets_operator_company_id', ['operatorCompanyId'])
+@Index('idx_assets_inventory_family_id', ['inventoryFamilyId'])
@Index('idx_assets_information_status', ['informationStatus'])
@Index('idx_assets_operational_status', ['operationalStatus'])
@Index('idx_assets_data_origin', ['dataOrigin'])
@@ -53,6 +54,9 @@ export class Asset extends TimestampedEntity {
  @Column({ name: 'operator_company_id', type: 'uuid', nullable: true })
  operatorCompanyId!: string | null;

+  @Column({ name: 'inventory_family_id', type: 'uuid', nullable: true })
+  inventoryFamilyId!: string | null;
+
  @Column({ type: 'varchar', length: 120 })
  code!: string;

@@ -19,6 +19,18 @@ export class User extends TimestampedEntity {
  @Column({ type: 'varchar', length: 320, nullable: true })
  email!: string | null;

+  @Column({ type: 'varchar', length: 32, nullable: true })
+  dni!: string | null;
+
+  @Column({ type: 'varchar', length: 40, nullable: true })
+  phone!: string | null;
+
+  @Column({ name: 'job_title', type: 'varchar', length: 160, nullable: true })
+  jobTitle!: string | null;
+
+  @Column({ name: 'employee_number', type: 'varchar', length: 80, nullable: true })
+  employeeNumber!: string | null;
+
  @Column({ name: 'password_hash', type: 'text', select: false })
  passwordHash!: string;

@@ -0,0 +1,173 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * One-time production reset requested before the first clean Android rollout.
+ *
+ * Keeps only structural product configuration plus the single `admin` account.
+ * Operational/business data is removed. Recovery is intentionally performed
+ * from the deploy PRE backup, not through a synthetic down migration.
+ */
+export class ResetProductionOperationalData1788652800000 implements MigrationInterface {
+  name = 'ResetProductionOperationalData1788652800000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const adminRows: Array<{ id: string; username: string }> = await queryRunner.query(`
+      SELECT id, username
+      FROM users
+      WHERE lower(trim(username)) = 'admin'
+      ORDER BY id
+    `);
+
+    if (adminRows.length !== 1) {
+      throw new Error(
+        `Production reset aborted: expected exactly one username admin, found ${adminRows.length}`,
+      );
+    }
+
+    const adminId = adminRows[0].id;
+
+    const structuralTables = [
+      'roles',
+      'permissions',
+      'role_permissions',
+      'asset_types',
+      'asset_attribute_definitions',
+      'asset_type_parent_rules',
+      'finding_categories',
+      'finding_catalog_items',
+      'finding_catalog_item_asset_types',
+      'finding_catalog_asset_type_profiles',
+    ];
+
+    // Snapshot structural row counts so TRUNCATE ... CASCADE can never silently
+    // remove product configuration while still leaving operational tables empty.
+    const structuralCounts = new Map<string, string>();
+    for (const table of structuralTables) {
+      const safeTable = `"${table.replace(/"/g, '""')}"`;
+      const rows: Array<{ total: string }> = await queryRunner.query(
+        `SELECT count(*)::text AS total FROM ${safeTable}`,
+      );
+      structuralCounts.set(table, rows[0]?.total ?? '0');
+    }
+
+    const adminRolesBefore: Array<{ total: string }> = await queryRunner.query(
+      `SELECT count(*)::text AS total FROM user_roles WHERE user_id = $1`,
+      [adminId],
+    );
+    const adminRoleCount = adminRolesBefore[0]?.total ?? '0';
+    if (adminRoleCount === '0') {
+      throw new Error('Production reset aborted: admin has no assigned role');
+    }
+
+    // Product configuration that must survive a clean operational start.
+    const preservedTables = new Set([
+      'typeorm_migrations',
+      'users',
+      'user_roles',
+      ...structuralTables,
+    ]);
+
+    const tableRows: Array<{ table_name: string }> = await queryRunner.query(`
+      SELECT table_name
+      FROM information_schema.tables
+      WHERE table_schema = 'public'
+        AND table_type = 'BASE TABLE'
+      ORDER BY table_name
+    `);
+
+    const operationalTables = tableRows
+      .map((row) => row.table_name)
+      .filter((table) => !preservedTables.has(table));
+
+    if (operationalTables.length > 0) {
+      const quoted = operationalTables
+        .map((table) => `"${table.replace(/"/g, '""')}"`)
+        .join(', ');
+      await queryRunner.query(`TRUNCATE TABLE ${quoted} RESTART IDENTITY CASCADE`);
+    }
+
+    // Remove every user except the explicitly validated administrator.
+    // user_roles for removed users follow their FK cascade.
+    await queryRunner.query(`DELETE FROM users WHERE id <> $1`, [adminId]);
+
+    // A reset must invalidate every prior login token, including admin's.
+    // auth_sessions is operational and was truncated above; admin simply logs in again.
+    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: Array<{ total: string; admins: string }> = await queryRunner.query(`
+      SELECT
+        count(*)::text AS total,
+        count(*) FILTER (WHERE lower(trim(username)) = 'admin')::text AS admins
+      FROM users
+    `);
+
+    if (finalUsers[0]?.total !== '1' || finalUsers[0]?.admins !== '1') {
+      throw new Error('Production reset verification failed: users table is not admin-only');
+    }
+
+    const finalAdminRoles: Array<{ total: string; foreign_users: string }> = 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],
+    );
+
+    if (
+      finalAdminRoles[0]?.total !== adminRoleCount ||
+      finalAdminRoles[0]?.foreign_users !== '0'
+    ) {
+      throw new Error('Production reset verification failed: admin role assignments changed');
+    }
+
+    // Assert every structural table kept exactly the same number of rows.
+    for (const table of structuralTables) {
+      const safeTable = `"${table.replace(/"/g, '""')}"`;
+      const rows: Array<{ total: string }> = await queryRunner.query(
+        `SELECT count(*)::text AS total FROM ${safeTable}`,
+      );
+      const before = structuralCounts.get(table) ?? '0';
+      if (rows[0]?.total !== before) {
+        throw new Error(
+          `Production reset verification failed: structural table ${table} changed (${before} -> ${rows[0]?.total ?? 'unknown'})`,
+        );
+      }
+    }
+
+    // Assert that every operational table is empty. This makes the migration
+    // fail atomically if a table was repopulated during the reset transaction.
+    for (const table of operationalTables) {
+      const safeTable = `"${table.replace(/"/g, '""')}"`;
+      const rows: Array<{ total: string }> = await queryRunner.query(
+        `SELECT count(*)::text AS total FROM ${safeTable}`,
+      );
+      if (rows[0]?.total !== '0') {
+        throw new Error(`Production reset verification failed: ${table} is not empty`);
+      }
+    }
+
+    // Keep a concise server-side record in the migration log for deploy diagnostics.
+    // eslint-disable-next-line no-console
+    console.log(
+      `[production-reset] kept admin=${adminRows[0].username} (${adminId}); preserved ${structuralTables.length} structural tables; cleared ${operationalTables.length} operational tables`,
+    );
+  }
+
+  public async down(): Promise<void> {
+    throw new Error(
+      'ResetProductionOperationalData is irreversible by migration; restore the deploy PRE database backup instead.',
+    );
+  }
+}
@@ -0,0 +1,50 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF221BaseOperationalTypes1789754300000 implements MigrationInterface {
+  name = 'PhaseF221BaseOperationalTypes1789754300000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      UPDATE asset_types
+      SET operational_role='AREA', can_be_root=true, is_active=true, updated_at=CURRENT_TIMESTAMP
+      WHERE lower(code)='area'
+    `);
+    await queryRunner.query(`
+      INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role)
+      SELECT 'area','Área',
+        'Área hidrocarburífera administrada como ancla territorial.',
+        true,true,'AREA'
+      WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE operational_role='AREA')
+        AND NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)='area')
+    `);
+
+    await queryRunner.query(`
+      UPDATE asset_types
+      SET operational_role='COMPANY', can_be_root=true, is_active=true, updated_at=CURRENT_TIMESTAMP
+      WHERE lower(code) IN ('empresa','organizacion')
+    `);
+    await queryRunner.query(`
+      INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role)
+      SELECT 'empresa','Organización',
+        'Entidad jurídica u organización administrada. Su rol operativo se registra mediante relaciones históricas.',
+        true,true,'COMPANY'
+      WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE operational_role='COMPANY')
+        AND NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)='empresa')
+    `);
+
+    const rows = (await queryRunner.query(`
+      SELECT
+        count(*) FILTER (WHERE operational_role='AREA')::text AS areas,
+        count(*) FILTER (WHERE operational_role='COMPANY')::text AS companies
+      FROM asset_types
+    `)) as Array<{ areas: string; companies: string }>;
+
+    if (Number(rows[0]?.areas ?? 0) < 1 || Number(rows[0]?.companies ?? 0) < 1) {
+      throw new Error('F2.2.1 could not guarantee AREA and COMPANY asset types');
+    }
+  }
+
+  public async down(): Promise<void> {
+    throw new Error('F2.2.1 base operational types are structural and are not removed automatically');
+  }
+}
@@ -0,0 +1,28 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF221LongReferenceLabels1789754350000 implements MigrationInterface {
+  name = 'PhaseF221LongReferenceLabels1789754350000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // La matriz APLICACION APP contiene denominaciones técnicas descriptivas que
+    // legítimamente superan el límite histórico de 160 caracteres. No se recorta
+    // información de la fuente: ampliamos sólo columnas descriptivas.
+    await queryRunner.query(`ALTER TABLE asset_types ALTER COLUMN name TYPE varchar(500)`);
+    await queryRunner.query(`ALTER TABLE asset_attribute_definitions ALTER COLUMN name TYPE varchar(500)`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    const rows = (await queryRunner.query(`
+      SELECT
+        coalesce(max(length(name)),0)::integer AS max_type_name,
+        (SELECT coalesce(max(length(name)),0)::integer FROM asset_attribute_definitions) AS max_attribute_name
+      FROM asset_types
+    `)) as Array<{ max_type_name: number; max_attribute_name: number }>;
+
+    if ((rows[0]?.max_type_name ?? 0) > 160 || (rows[0]?.max_attribute_name ?? 0) > 160) {
+      throw new Error('F2.2.1 no puede reducir etiquetas a 160 caracteres sin pérdida de información');
+    }
+    await queryRunner.query(`ALTER TABLE asset_types ALTER COLUMN name TYPE varchar(160)`);
+    await queryRunner.query(`ALTER TABLE asset_attribute_definitions ALTER COLUMN name TYPE varchar(160)`);
+  }
+}
@@ -0,0 +1,615 @@
+import { createHash } from 'node:crypto';
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { loadF221ExcelSource } from '../../reference-data/f2-2-1-excel-source';
+
+function slug(value: string, max = 70): string {
+  const normalized = value
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, '_')
+    .replace(/^_+|_+$/g, '');
+  return (normalized || 'item').slice(0, max);
+}
+
+function stableCode(prefix: string, ...parts: string[]): string {
+  const hash = createHash('sha1').update(parts.join('|')).digest('hex').slice(0, 8).toUpperCase();
+  const readable = slug(parts[0] ?? 'item', 72).toUpperCase();
+  return `${prefix}-${readable}-${hash}`.slice(0, 120);
+}
+
+function legalRightType(value: string): string {
+  const normalized = slug(value);
+  if (normalized.includes('explot')) return 'EXPLOITATION_CONCESSION';
+  if (normalized.includes('explor')) return 'EXPLORATION_PERMIT';
+  if (normalized.includes('transport')) return 'TRANSPORT_CONCESSION';
+  return 'OTHER';
+}
+
+const groupTargets: Record<string, string[]> = {
+  tanques: ['tanque'],
+  separadores: ['separador'],
+  bomba_zona_de_bombas: ['bomba'],
+  calderas: ['caldera'],
+  drenaje: ['drenaje'],
+  antorcha: ['antorcha'],
+  colectores: ['colector'],
+  sist_electrico_iluminacion: ['sistema_electrico_iluminacion'],
+  defensa_contra_incendios: ['defensa_contra_incendios'],
+  cargadero_y_descargadero_de_camiones: ['cargadero_descargadero'],
+  filtros: ['filtro'],
+  eq_flotacion: ['equipo_flotacion'],
+  baterias_y_plantas: ['bateria', 'planta'],
+  fwko_tratadores_calentadores: ['fwo', 'fwko', 'calentador', 'tratador_termico'],
+  bombeo_mecanico: ['bombeo_mecanico'],
+  bombeo_electreosumergible: ['bombeo_electreosumergible'],
+  bombeo_cavidad_progresiva_pcp: ['bombeo_cavidad_progresiva_pcp'],
+  pozos_surgentes_prod_gas: ['pozos_surgentes_prod_gas'],
+  pozos_inyectores_agua: ['pozos_inyectores_agua'],
+};
+
+const referenceAliases: Record<string, string> = {
+  tanque: 'tanque',
+  tanques: 'tanque',
+  separador: 'separador',
+  separadores: 'separador',
+  bombas: 'bomba',
+  bomba: 'bomba',
+  fwo: 'fwo',
+  fwko: 'fwko',
+  calentador: 'calentador',
+  piletas: 'drenaje',
+  pileta: 'drenaje',
+  cargadero_descargadero: 'cargadero_descargadero',
+  generador: 'generador',
+};
+
+type IdRow = { id: string };
+type CountRow = { total: string };
+
+async function assetIdByCode(queryRunner: QueryRunner, code: string): Promise<string | null> {
+  const rows = (await queryRunner.query(
+    `SELECT id FROM assets WHERE lower(code)=lower($1::text) LIMIT 1`,
+    [code],
+  )) as IdRow[];
+  return rows[0]?.id ?? null;
+}
+
+async function assetTypeIdByCode(queryRunner: QueryRunner, code: string): Promise<string | null> {
+  const rows = (await queryRunner.query(
+    `SELECT id FROM asset_types WHERE lower(code)=lower($1::text) LIMIT 1`,
+    [code],
+  )) as IdRow[];
+  return rows[0]?.id ?? null;
+}
+
+export class PhaseF221ReferenceExcelData1789754400000 implements MigrationInterface {
+  name = 'PhaseF221ReferenceExcelData1789754400000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const source = loadF221ExcelSource();
+
+    await queryRunner.query(`
+      INSERT INTO source_documents (document_type,document_number,title,issuer,notes)
+      SELECT 'SPREADSHEET','DH-F221-TERRITORIO','Tablas de yacimiento(1).xlsx','Dirección de Hidrocarburos',
+        'Fuente F2.2.1: maestro territorial y operativo. Hoja normalizada cr26e_tabla1.'
+      WHERE NOT EXISTS (
+        SELECT 1 FROM source_documents
+        WHERE document_number='DH-F221-TERRITORIO' AND issuer='Dirección de Hidrocarburos'
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO source_documents (document_type,document_number,title,issuer,notes)
+      SELECT 'SPREADSHEET','DH-F221-APP','APLICACION APP(1).xlsx','Dirección de Hidrocarburos',
+        'Fuente F2.2.1: matriz de jerarquía, información y catálogo contextual de hallazgos. Hojas Hoja1 y Hoja2.'
+      WHERE NOT EXISTS (
+        SELECT 1 FROM source_documents
+        WHERE document_number='DH-F221-APP' AND issuer='Dirección de Hidrocarburos'
+      )
+    `);
+
+    const territoryDocuments = (await queryRunner.query(
+      `SELECT id FROM source_documents
+       WHERE document_number='DH-F221-TERRITORIO' AND issuer='Dirección de Hidrocarburos' LIMIT 1`,
+    )) as IdRow[];
+    const appDocuments = (await queryRunner.query(
+      `SELECT id FROM source_documents
+       WHERE document_number='DH-F221-APP' AND issuer='Dirección de Hidrocarburos' LIMIT 1`,
+    )) as IdRow[];
+    const territoryDocumentId = territoryDocuments[0]?.id;
+    const appDocumentId = appDocuments[0]?.id;
+    if (!territoryDocumentId || !appDocumentId) {
+      throw new Error('F2.2.1 source documents could not be resolved');
+    }
+
+    await queryRunner.query(
+      `UPDATE asset_types SET can_be_root=true WHERE operational_role IN ('AREA','COMPANY')`,
+    );
+    await queryRunner.query(`
+      INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role)
+      SELECT 'yacimiento','Yacimiento',
+        'Yacimiento físico/operativo perteneciente a un Área. Su operadora se determina por contexto histórico.',
+        false,true,'GENERIC'
+      WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)='yacimiento')
+    `);
+    await queryRunner.query(`
+      INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id)
+      SELECT child.id,parent.id
+      FROM asset_types child CROSS JOIN asset_types parent
+      WHERE lower(child.code)='yacimiento' AND parent.operational_role='AREA'
+      ON CONFLICT DO NOTHING
+    `);
+    await queryRunner.query(`
+      INSERT INTO asset_attribute_definitions
+        (asset_type_id,code,name,data_type,is_required,is_active,sort_order)
+      SELECT type.id,definition.code,definition.name,'TEXT',false,true,definition.sort_order
+      FROM asset_types type
+      CROSS JOIN (VALUES
+        ('departamento_fuente','Departamento informado por la fuente',10),
+        ('tipo_concesion_fuente','Tipo de concesión informado por la fuente',20)
+      ) definition(code,name,sort_order)
+      WHERE lower(type.code)='yacimiento'
+      ON CONFLICT DO NOTHING
+    `);
+    await queryRunner.query(`
+      INSERT INTO asset_attribute_definitions
+        (asset_type_id,code,name,data_type,is_required,is_active,sort_order)
+      SELECT type.id,'tipo_concesion_fuente','Tipo de concesión informado por la fuente',
+        'TEXT',false,true,40
+      FROM asset_types type
+      WHERE type.operational_role='AREA'
+      ON CONFLICT DO NOTHING
+    `);
+
+    const areaCache = new Map<string, string>();
+    const companyCache = new Map<string, string>();
+    const seenRights = new Set<string>();
+
+    for (const row of source.territory) {
+      const areaKey = row.area.trim().toLocaleLowerCase('es');
+      let areaId = areaCache.get(areaKey) ?? null;
+      if (!areaId) {
+        const areaCode = stableCode('AREA', row.area);
+        areaId = await assetIdByCode(queryRunner, areaCode);
+        if (!areaId) {
+          const inserted = (await queryRunner.query(
+            `INSERT INTO assets (
+               asset_type_id,parent_id,code,name,description,information_status,operational_status,
+               data_origin,source_name,source_reference,source_notes,current_version
+             )
+             SELECT type.id,NULL,$1::varchar,$2::varchar,$3::text,
+               'VALIDATED','IN_SERVICE','IMPORT',$4::varchar,$5::varchar,$6::text,0
+             FROM asset_types type
+             WHERE type.operational_role='AREA'
+             LIMIT 1
+             RETURNING id`,
+            [
+              areaCode,
+              row.area,
+              `Área importada desde Tablas de yacimiento. Departamento: ${row.department}.`,
+              'Tablas de yacimiento(1).xlsx',
+              `cr26e_tabla1|AREA|${row.area}`,
+              `Departamento=${row.department}; TipoConcesion=${row.concessionType}`,
+            ],
+          )) as IdRow[];
+          areaId = inserted[0]?.id ?? null;
+        }
+        if (!areaId) throw new Error(`Could not resolve area ${row.area}`);
+        areaCache.set(areaKey, areaId);
+
+        await queryRunner.query(
+          `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes)
+           VALUES ($1::uuid,$2::uuid,'SOURCE','Importación F2.2.1 · cr26e_tabla1')
+           ON CONFLICT DO NOTHING`,
+          [areaId, territoryDocumentId],
+        );
+      }
+
+      for (const [definitionCode, value] of [
+        ['departamento', row.department],
+        ['tipo_concesion_fuente', row.concessionType],
+      ] as const) {
+        await queryRunner.query(
+          `INSERT INTO asset_attribute_values (asset_id,definition_id,value)
+           SELECT $1::uuid,definition.id,to_jsonb($3::text)
+           FROM asset_attribute_definitions definition
+           JOIN asset_types type ON type.id=definition.asset_type_id
+           WHERE type.operational_role='AREA'
+             AND lower(definition.code)=lower($2::text)
+           ON CONFLICT (asset_id,definition_id)
+           DO UPDATE SET value=EXCLUDED.value,updated_at=CURRENT_TIMESTAMP`,
+          [areaId, definitionCode, value],
+        );
+      }
+
+      const noOperator = slug(row.operator) === 'sin_empresa_operadora';
+      let companyId: string | null = null;
+      if (!noOperator) {
+        const companyKey = row.operator.trim().toLocaleLowerCase('es');
+        companyId = companyCache.get(companyKey) ?? null;
+        if (!companyId) {
+          const companyCode = stableCode('ORG', row.operator);
+          companyId = await assetIdByCode(queryRunner, companyCode);
+          if (!companyId) {
+            const inserted = (await queryRunner.query(
+              `INSERT INTO assets (
+                 asset_type_id,parent_id,code,name,description,information_status,operational_status,
+                 data_origin,source_name,source_reference,source_notes,current_version
+               )
+               SELECT type.id,NULL,$1::varchar,$2::varchar,
+                 'Organización operadora importada desde Tablas de yacimiento.',
+                 'VALIDATED','IN_SERVICE','IMPORT',$3::varchar,$4::varchar,
+                 'Empresa/Operadora informada por la fuente',0
+               FROM asset_types type
+               WHERE type.operational_role='COMPANY'
+               LIMIT 1
+               RETURNING id`,
+              [
+                companyCode,
+                row.operator,
+                'Tablas de yacimiento(1).xlsx',
+                `cr26e_tabla1|OPERADORA|${row.operator}`,
+              ],
+            )) as IdRow[];
+            companyId = inserted[0]?.id ?? null;
+          }
+          if (!companyId) throw new Error(`Could not resolve operator ${row.operator}`);
+          companyCache.set(companyKey, companyId);
+
+          await queryRunner.query(
+            `INSERT INTO organization_profiles (asset_id,organization_kind,legal_name)
+             SELECT $1::uuid,
+               CASE WHEN lower($2::text) LIKE 'ute %' OR lower($2::text) LIKE 'ute(%'
+                 THEN 'UTE'::organization_kind ELSE 'COMPANY'::organization_kind END,
+               $2::varchar
+             WHERE NOT EXISTS (SELECT 1 FROM organization_profiles WHERE asset_id=$1::uuid)`,
+            [companyId, row.operator],
+          );
+          await queryRunner.query(
+            `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes)
+             VALUES ($1::uuid,$2::uuid,'SOURCE','Importación F2.2.1 · cr26e_tabla1')
+             ON CONFLICT DO NOTHING`,
+            [companyId, territoryDocumentId],
+          );
+        }
+
+        await queryRunner.query(
+          `INSERT INTO area_company_relations
+             (area_id,company_id,relation_role,valid_from,start_reason,source_document_id)
+           SELECT $1::uuid,$2::uuid,'OPERATOR',CURRENT_TIMESTAMP,
+             'Importado desde Tablas de yacimiento(1).xlsx',$3::uuid
+           WHERE NOT EXISTS (
+             SELECT 1 FROM area_company_relations
+             WHERE area_id=$1::uuid AND company_id=$2::uuid
+               AND relation_role='OPERATOR' AND valid_until IS NULL
+           )`,
+          [areaId, companyId, territoryDocumentId],
+        );
+      }
+
+      const fieldCode = stableCode('YAC', row.field, row.area);
+      let fieldId = await assetIdByCode(queryRunner, fieldCode);
+      if (!fieldId) {
+        // The operational context is intentionally all-or-nothing. A source row
+        // that explicitly says "Sin Empresa Operadora" stays physically under
+        // its Área but receives no fabricated operator and no half context.
+        const operationalAreaId = companyId ? areaId : null;
+        const inserted = (await queryRunner.query(
+          `INSERT INTO assets (
+             asset_type_id,parent_id,operational_area_id,operator_company_id,code,name,description,
+             information_status,operational_status,data_origin,source_name,source_reference,
+             source_notes,current_version
+           )
+           SELECT type.id,$1::uuid,$2::uuid,$3::uuid,$4::varchar,$5::varchar,$6::text,
+             'VALIDATED','IN_SERVICE','IMPORT',$7::varchar,$8::varchar,$9::text,0
+           FROM asset_types type
+           WHERE lower(type.code)='yacimiento'
+           LIMIT 1
+           RETURNING id`,
+          [
+            areaId,
+            operationalAreaId,
+            companyId,
+            fieldCode,
+            row.field,
+            `Yacimiento del Área ${row.area}.`,
+            'Tablas de yacimiento(1).xlsx',
+            `cr26e_tabla1|YACIMIENTO|${row.field}|AREA|${row.area}`,
+            `Departamento=${row.department}; TipoConcesion=${row.concessionType}; OperadoraFuente=${row.operator}`,
+          ],
+        )) as IdRow[];
+        fieldId = inserted[0]?.id ?? null;
+      }
+      if (!fieldId) throw new Error(`Could not resolve field ${row.field} / ${row.area}`);
+
+      await queryRunner.query(
+        `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes)
+         VALUES ($1::uuid,$2::uuid,'SOURCE','Importación F2.2.1 · cr26e_tabla1')
+         ON CONFLICT DO NOTHING`,
+        [fieldId, territoryDocumentId],
+      );
+      for (const [definitionCode, value] of [
+        ['departamento_fuente', row.department],
+        ['tipo_concesion_fuente', row.concessionType],
+      ] as const) {
+        await queryRunner.query(
+          `INSERT INTO asset_attribute_values (asset_id,definition_id,value)
+           SELECT $1::uuid,definition.id,to_jsonb($3::text)
+           FROM asset_attribute_definitions definition
+           JOIN asset_types type ON type.id=definition.asset_type_id
+           WHERE lower(type.code)='yacimiento'
+             AND lower(definition.code)=lower($2::text)
+           ON CONFLICT (asset_id,definition_id)
+           DO UPDATE SET value=EXCLUDED.value,updated_at=CURRENT_TIMESTAMP`,
+          [fieldId, definitionCode, value],
+        );
+      }
+
+      const rightName = `Tipo informado: ${row.concessionType}`;
+      const rightKey = `${areaId}|${slug(row.concessionType)}`;
+      if (!seenRights.has(rightKey)) {
+        seenRights.add(rightKey);
+        const existing = (await queryRunner.query(
+          `SELECT id FROM area_legal_rights
+           WHERE area_id=$1::uuid AND lower(name)=lower($2::text)
+             AND source_document_id=$3::uuid LIMIT 1`,
+          [areaId, rightName, territoryDocumentId],
+        )) as IdRow[];
+        if (!existing[0]?.id) {
+          await queryRunner.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::varchar,'ACTIVE',$4::uuid,$5::text)`,
+            [
+              areaId,
+              legalRightType(row.concessionType),
+              rightName,
+              territoryDocumentId,
+              `Importado desde cr26e_tabla1. Departamento: ${row.department}.`,
+            ],
+          );
+        }
+      }
+    }
+
+    const topLevelTypes = new Set(source.types.map((entry) => entry.code));
+    for (const pair of source.parentPairs) topLevelTypes.delete(pair.child);
+
+    const allTypeDefinitions = new Map(source.types.map((entry) => [entry.code, entry.name]));
+    for (const targets of Object.values(groupTargets)) {
+      for (const target of targets) {
+        if (!allTypeDefinitions.has(target)) {
+          allTypeDefinitions.set(target, target.replaceAll('_', ' '));
+        }
+      }
+    }
+
+    for (const [typeCode, typeName] of allTypeDefinitions) {
+      if (!(await assetTypeIdByCode(queryRunner, typeCode))) {
+        await queryRunner.query(
+          `INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role)
+           VALUES ($1::varchar,$2::varchar,
+             'Tipo incorporado desde APLICACION APP(1).xlsx · F2.2.1',false,true,'GENERIC')`,
+          [typeCode, typeName],
+        );
+      }
+      await queryRunner.query(
+        `INSERT INTO finding_catalog_asset_type_profiles (asset_type_id,reason)
+         SELECT id,'Aplicabilidad inicial importada desde APLICACION APP(1).xlsx'
+         FROM asset_types WHERE lower(code)=lower($1::text)
+         ON CONFLICT (asset_type_id) DO NOTHING`,
+        [typeCode],
+      );
+    }
+
+    for (const typeCode of topLevelTypes) {
+      await queryRunner.query(
+        `INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id)
+         SELECT child.id,parent.id FROM asset_types child CROSS JOIN asset_types parent
+         WHERE lower(child.code)=lower($1::text) AND lower(parent.code)='yacimiento'
+         ON CONFLICT DO NOTHING`,
+        [typeCode],
+      );
+    }
+    for (const pair of source.parentPairs) {
+      if (pair.child === pair.parent) continue;
+      await queryRunner.query(
+        `INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id)
+         SELECT child.id,parent.id FROM asset_types child CROSS JOIN asset_types parent
+         WHERE lower(child.code)=lower($1::text) AND lower(parent.code)=lower($2::text)
+         ON CONFLICT DO NOTHING`,
+        [pair.child, pair.parent],
+      );
+    }
+    for (const targets of Object.values(groupTargets)) {
+      for (const typeCode of targets) {
+        await queryRunner.query(
+          `INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id)
+           SELECT child.id,parent.id FROM asset_types child CROSS JOIN asset_types parent
+           WHERE lower(child.code)=lower($1::text) AND lower(parent.code)='yacimiento'
+           ON CONFLICT DO NOTHING`,
+          [typeCode],
+        );
+      }
+    }
+
+    for (const entry of source.attributes) {
+      let sortOrder = 100;
+      for (const label of entry.labels) {
+        const attributeCode = slug(label, 72);
+        const typeId = await assetTypeIdByCode(queryRunner, entry.type);
+        if (!typeId) continue;
+        const existing = (await queryRunner.query(
+          `SELECT id FROM asset_attribute_definitions
+           WHERE asset_type_id=$1::uuid AND lower(code)=lower($2::text) LIMIT 1`,
+          [typeId, attributeCode],
+        )) as IdRow[];
+        if (!existing[0]?.id) {
+          await queryRunner.query(
+            `INSERT INTO asset_attribute_definitions
+               (asset_type_id,code,name,data_type,is_required,is_active,sort_order)
+             VALUES ($1::uuid,$2::varchar,$3::varchar,'TEXT',false,true,$4::integer)`,
+            [typeId, attributeCode, label, sortOrder],
+          );
+        }
+        sortOrder += 10;
+      }
+    }
+
+    await queryRunner.query(`
+      INSERT INTO finding_categories (code,name,sort_order,is_active)
+      SELECT 'APP26','Aplicación APP 2026',260,true
+      WHERE NOT EXISTS (SELECT 1 FROM finding_categories WHERE lower(code)='app26')
+    `);
+    const categoryRows = (await queryRunner.query(
+      `SELECT id FROM finding_categories WHERE lower(code)='app26' LIMIT 1`,
+    )) as IdRow[];
+    const categoryId = categoryRows[0]?.id;
+    if (!categoryId) throw new Error('Could not resolve APP26 finding category');
+
+    const titlesByType = new Map<string, Set<string>>();
+    const addTitle = (typeCode: string, title: string): void => {
+      const cleanTitle = title.trim();
+      if (!cleanTitle || /^idem\b/i.test(cleanTitle)) return;
+      const set = titlesByType.get(typeCode) ?? new Set<string>();
+      set.add(cleanTitle);
+      titlesByType.set(typeCode, set);
+    };
+
+    for (const entry of source.directFindings) {
+      for (const title of entry.titles) addTitle(entry.type, title);
+    }
+    for (const group of source.groups) {
+      const targets = groupTargets[slug(group.name)] ?? [slug(group.name)];
+      for (const target of targets) {
+        for (const item of group.items) addTitle(target, item.title);
+      }
+    }
+    for (let pass = 0; pass < 3; pass += 1) {
+      for (const entry of source.idemRefs) {
+        for (const rawReference of entry.refs) {
+          const reference = referenceAliases[slug(rawReference)] ?? slug(rawReference);
+          for (const title of titlesByType.get(reference) ?? []) addTitle(entry.type, title);
+        }
+      }
+    }
+
+    const allTitles = [
+      ...new Set([...titlesByType.values()].flatMap((titles) => [...titles])),
+    ].sort((a, b) => a.localeCompare(b, 'es'));
+
+    const itemIdByTitle = new Map<string, string>();
+    let sourceNumber = 1;
+    for (const title of allTitles) {
+      const itemCode = `APP26-${createHash('sha1').update(title).digest('hex').slice(0, 12).toUpperCase()}`;
+      let itemRows = (await queryRunner.query(
+        `SELECT id FROM finding_catalog_items WHERE lower(code)=lower($1::text) LIMIT 1`,
+        [itemCode],
+      )) as IdRow[];
+      if (!itemRows[0]?.id) {
+        itemRows = (await queryRunner.query(
+          `INSERT INTO finding_catalog_items
+             (category_id,code,source_number,title,import_note,revision,is_active)
+           VALUES ($1::uuid,$2::varchar,$3::integer,$4::varchar,
+             'Importado desde APLICACION APP(1).xlsx · F2.2.1',1,true)
+           RETURNING id`,
+          [categoryId, itemCode, sourceNumber, title],
+        )) as IdRow[];
+      }
+      const itemId = itemRows[0]?.id;
+      if (itemId) {
+        itemIdByTitle.set(title, itemId);
+        await queryRunner.query(
+          `INSERT INTO finding_catalog_item_versions
+             (item_id,revision,snapshot,actor_username)
+           SELECT item.id,item.revision,
+             jsonb_build_object(
+               'id',item.id,'categoryId',category.id,'categoryCode',category.code,
+               'categoryName',category.name,'code',item.code,'sourceNumber',item.source_number,
+               'title',item.title,'legalBasis',item.legal_basis,'glossary',item.glossary,
+               'importNote',item.import_note,'revision',item.revision,'isActive',item.is_active
+             ),
+             'migration:F2.2.1'
+           FROM finding_catalog_items item
+           JOIN finding_categories category ON category.id=item.category_id
+           WHERE item.id=$1::uuid
+             AND NOT EXISTS (
+               SELECT 1 FROM finding_catalog_item_versions version
+               WHERE version.item_id=item.id AND version.revision=item.revision
+             )`,
+          [itemId],
+        );
+      }
+      sourceNumber += 1;
+    }
+
+    for (const [typeCode, titles] of titlesByType) {
+      const assetTypeId = await assetTypeIdByCode(queryRunner, typeCode);
+      if (!assetTypeId) continue;
+      for (const title of titles) {
+        const catalogItemId = itemIdByTitle.get(title);
+        if (!catalogItemId) continue;
+        await queryRunner.query(
+          `INSERT INTO finding_catalog_item_asset_types (catalog_item_id,asset_type_id)
+           VALUES ($1::uuid,$2::uuid) ON CONFLICT DO NOTHING`,
+          [catalogItemId, assetTypeId],
+        );
+      }
+    }
+
+    await queryRunner.query(
+      `INSERT INTO asset_source_documents (asset_id,document_id,relation_type,notes)
+       SELECT asset.id,$1::uuid,'MENTIONS',
+         'El tipo/hallazgo del elemento se definió con la matriz APLICACION APP(1).xlsx'
+       FROM assets asset
+       JOIN asset_types type ON type.id=asset.asset_type_id
+       WHERE lower(type.code)='yacimiento'
+       ON CONFLICT DO NOTHING`,
+      [appDocumentId],
+    );
+
+    const importedYacimientos = (await queryRunner.query(
+      `SELECT count(*)::text AS total
+       FROM assets asset JOIN asset_types type ON type.id=asset.asset_type_id
+       WHERE asset.data_origin='IMPORT'
+         AND asset.source_name='Tablas de yacimiento(1).xlsx'
+         AND lower(type.code)='yacimiento'`,
+    )) as CountRow[];
+    if (Number(importedYacimientos[0]?.total ?? 0) !== source.territory.length) {
+      throw new Error(
+        `F2.2.1 verification failed: expected ${source.territory.length} imported yacimientos, found ${importedYacimientos[0]?.total ?? '0'}`,
+      );
+    }
+
+    const importedCatalog = (await queryRunner.query(
+      `SELECT count(*)::text AS total
+       FROM finding_catalog_items item
+       JOIN finding_categories category ON category.id=item.category_id
+       WHERE lower(category.code)='app26'`,
+    )) as CountRow[];
+    if (Number(importedCatalog[0]?.total ?? 0) !== allTitles.length) {
+      throw new Error(
+        `F2.2.1 verification failed: expected ${allTitles.length} APP26 findings, found ${importedCatalog[0]?.total ?? '0'}`,
+      );
+    }
+
+    const halfContexts = (await queryRunner.query(
+      `SELECT count(*)::text AS total FROM assets
+       WHERE (operational_area_id IS NULL) <> (operator_company_id IS NULL)`,
+    )) as CountRow[];
+    if (Number(halfContexts[0]?.total ?? 0) !== 0) {
+      throw new Error('F2.2.1 verification failed: an imported asset has an incomplete operational context');
+    }
+
+    // eslint-disable-next-line no-console
+    console.log(
+      `[F2.2.1] imported territory=${source.territory.length}; yacimientos=${importedYacimientos[0]?.total}; catalog=${importedCatalog[0]?.total}; halfContexts=0`,
+    );
+  }
+
+  public async down(): Promise<void> {
+    throw new Error(
+      'F2.2.1 contiene maestros territoriales y catálogo de referencia; no se revierte destructivamente. Restaurar backup PRE si fuera necesario.',
+    );
+  }
+}
@@ -0,0 +1,57 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF221ReferenceBaselines1789758000000 implements MigrationInterface {
+  name = 'PhaseF221ReferenceBaselines1789758000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      INSERT INTO asset_versions (
+        asset_id,version_number,change_type,changed_fields,snapshot,source
+      )
+      SELECT
+        asset.id,
+        1,
+        'BASELINE',
+        ARRAY['assetTypeId','parentId','operationalAreaId','operatorCompanyId','code','name','informationStatus','operationalStatus','dataOrigin','sourceName','sourceReference'],
+        jsonb_build_object(
+          'id',asset.id,
+          'assetTypeId',asset.asset_type_id,
+          'parentId',asset.parent_id,
+          'operationalAreaId',asset.operational_area_id,
+          'operatorCompanyId',asset.operator_company_id,
+          'code',asset.code,
+          'name',asset.name,
+          'commonName',asset.common_name,
+          'description',asset.description,
+          'informationStatus',asset.information_status,
+          'operationalStatus',asset.operational_status,
+          'dataOrigin',asset.data_origin,
+          'sourceName',asset.source_name,
+          'sourceReference',asset.source_reference,
+          'sourceNotes',asset.source_notes
+        ),
+        'SYSTEM'
+      FROM assets asset
+      WHERE asset.data_origin='IMPORT'
+        AND asset.source_name='Tablas de yacimiento(1).xlsx'
+        AND NOT EXISTS (
+          SELECT 1 FROM asset_versions version
+          WHERE version.asset_id=asset.id AND version.version_number=1
+        )
+    `);
+    await queryRunner.query(`
+      UPDATE assets asset
+      SET current_version=GREATEST(asset.current_version,1),updated_at=CURRENT_TIMESTAMP
+      WHERE asset.data_origin='IMPORT'
+        AND asset.source_name='Tablas de yacimiento(1).xlsx'
+        AND EXISTS (
+          SELECT 1 FROM asset_versions version
+          WHERE version.asset_id=asset.id AND version.version_number=1
+        )
+    `);
+  }
+
+  public async down(): Promise<void> {
+    throw new Error('F2.2.1 no elimina baselines históricos del maestro importado. Restaurar backup PRE si fuera necesario.');
+  }
+}
@@ -0,0 +1,359 @@
+import { createHash } from 'node:crypto';
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import {
+  F31_FINDING_GROUPS,
+  F31_INSTALLATION_FAMILIES,
+  F31_SUBINSTALLATION_FAMILIES,
+  F31_UNIVERSAL_FINDINGS,
+} from '../../reference-data/f3-1-inventory-excel';
+
+function quoteIdentifier(identifier: string): string {
+  return `"${identifier.replaceAll('"', '""')}"`;
+}
+
+function findingKey(value: string): string {
+  return value
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, ' ')
+    .trim()
+    .replace(/\s+/g, ' ');
+}
+
+function findingCode(title: string): string {
+  return `APP26R2-${createHash('sha1').update(findingKey(title)).digest('hex').slice(0, 12).toUpperCase()}`;
+}
+
+type IdRow = { id: string };
+type CountRow = { total: string };
+
+export class PhaseF31InventoryStructureCatalog1789844400000 implements MigrationInterface {
+  name = 'PhaseF31InventoryStructureCatalog1789844400000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      INSERT INTO source_documents (document_type,document_number,title,issuer,notes)
+      SELECT 'SPREADSHEET','DH-F31-APP','APLICACION APP(2).xlsx','Dirección de Hidrocarburos',
+        'F3.1: revisión estructural. Hoja1 define Instalaciones/Subinstalaciones; Hoja2 define catálogo contextual.'
+      WHERE NOT EXISTS (
+        SELECT 1 FROM source_documents
+        WHERE document_number='DH-F31-APP' AND issuer='Dirección de Hidrocarburos'
+      )
+    `);
+
+    await queryRunner.query(`
+      INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role)
+      SELECT 'subinstalacion','Subinstalación',
+        'Unidad física subordinada a una Instalación. Su familia técnica determina el catálogo contextual de Hallazgos.',
+        false,true,'GENERIC'
+      WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)='subinstalacion')
+    `);
+    await queryRunner.query(`
+      INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id)
+      SELECT child.id,parent.id
+      FROM asset_types child CROSS JOIN asset_types parent
+      WHERE lower(child.code)='subinstalacion' AND lower(parent.code)='instalacion'
+      ON CONFLICT DO NOTHING
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE inventory_families (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        code varchar(120) NOT NULL UNIQUE,
+        name varchar(240) NOT NULL,
+        level varchar(24) NOT NULL,
+        legacy_type_code varchar(120),
+        information_labels jsonb NOT NULL DEFAULT '[]'::jsonb,
+        source_reference varchar(240),
+        is_active boolean NOT NULL DEFAULT true,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_inventory_families_level CHECK (level IN ('INSTALLATION','SUBINSTALLATION')),
+        CONSTRAINT chk_inventory_families_information_labels CHECK (jsonb_typeof(information_labels)='array')
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inventory_families_level_active
+      ON inventory_families(level,is_active,name)
+    `);
+    await queryRunner.query(`
+      CREATE TABLE inventory_family_parent_rules (
+        child_family_id uuid PRIMARY KEY,
+        parent_family_id uuid NOT NULL,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT fk_inventory_family_parent_child FOREIGN KEY (child_family_id)
+          REFERENCES inventory_families(id) ON DELETE CASCADE,
+        CONSTRAINT fk_inventory_family_parent_parent FOREIGN KEY (parent_family_id)
+          REFERENCES inventory_families(id) ON DELETE CASCADE,
+        CONSTRAINT chk_inventory_family_parent_distinct CHECK (child_family_id <> parent_family_id)
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inventory_family_parent_parent
+      ON inventory_family_parent_rules(parent_family_id,child_family_id)
+    `);
+    await queryRunner.query(`
+      ALTER TABLE assets ADD COLUMN inventory_family_id uuid
+    `);
+    await queryRunner.query(`
+      ALTER TABLE assets ADD CONSTRAINT fk_assets_inventory_family
+      FOREIGN KEY (inventory_family_id) REFERENCES inventory_families(id) ON DELETE RESTRICT
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_assets_inventory_family ON assets(inventory_family_id)
+    `);
+    await queryRunner.query(`
+      CREATE TABLE finding_catalog_item_inventory_families (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        catalog_item_id uuid NOT NULL,
+        inventory_family_id uuid NOT NULL,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT uq_finding_catalog_item_inventory_family UNIQUE (catalog_item_id,inventory_family_id),
+        CONSTRAINT fk_finding_catalog_family_item FOREIGN KEY (catalog_item_id)
+          REFERENCES finding_catalog_items(id) ON DELETE CASCADE,
+        CONSTRAINT fk_finding_catalog_family_family FOREIGN KEY (inventory_family_id)
+          REFERENCES inventory_families(id) ON DELETE CASCADE
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_finding_catalog_family_family
+      ON finding_catalog_item_inventory_families(inventory_family_id,catalog_item_id)
+    `);
+
+    for (const family of F31_INSTALLATION_FAMILIES) {
+      await queryRunner.query(`
+        INSERT INTO inventory_families
+          (code,name,level,legacy_type_code,information_labels,source_reference,is_active)
+        VALUES ($1,$2,'INSTALLATION',$3,'[]'::jsonb,$4,true)
+        ON CONFLICT (code) DO UPDATE SET
+          name=EXCLUDED.name,
+          legacy_type_code=EXCLUDED.legacy_type_code,
+          source_reference=EXCLUDED.source_reference,
+          is_active=true,
+          updated_at=CURRENT_TIMESTAMP
+      `, [family.code, family.name, family.legacyTypeCode, `APLICACION APP(2).xlsx|Hoja1|fila:${family.sourceRow}`]);
+    }
+    for (const family of F31_SUBINSTALLATION_FAMILIES) {
+      await queryRunner.query(`
+        INSERT INTO inventory_families
+          (code,name,level,legacy_type_code,information_labels,source_reference,is_active)
+        VALUES ($1,$2,'SUBINSTALLATION',$3,$4::jsonb,$5,true)
+        ON CONFLICT (code) DO UPDATE SET
+          name=EXCLUDED.name,
+          legacy_type_code=EXCLUDED.legacy_type_code,
+          information_labels=EXCLUDED.information_labels,
+          source_reference=EXCLUDED.source_reference,
+          is_active=true,
+          updated_at=CURRENT_TIMESTAMP
+      `, [
+        family.code,
+        family.name,
+        family.legacyTypeCode,
+        JSON.stringify(family.informationLabels),
+        `APLICACION APP(2).xlsx|Hoja1|fila:${family.sourceRow}`,
+      ]);
+      await queryRunner.query(`
+        INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
+        SELECT child.id,parent.id
+        FROM inventory_families child CROSS JOIN inventory_families parent
+        WHERE child.code=$1 AND parent.code=$2
+        ON CONFLICT (child_family_id) DO UPDATE SET parent_family_id=EXCLUDED.parent_family_id
+      `, [family.code, family.parentCode]);
+    }
+
+    await queryRunner.query(`
+      UPDATE finding_categories SET is_active=false, updated_at=CURRENT_TIMESTAMP
+      WHERE lower(code)='app26'
+    `);
+    await queryRunner.query(`
+      INSERT INTO finding_categories(code,name,sort_order,is_active)
+      SELECT 'APP26R2','Aplicación APP 2026 · revisión estructural',261,true
+      WHERE NOT EXISTS (SELECT 1 FROM finding_categories WHERE lower(code)='app26r2')
+    `);
+    await queryRunner.query(`
+      UPDATE finding_categories
+      SET name='Aplicación APP 2026 · revisión estructural', sort_order=261,
+          is_active=true, updated_at=CURRENT_TIMESTAMP
+      WHERE lower(code)='app26r2'
+    `);
+    const categoryRows = (await queryRunner.query(
+      `SELECT id FROM finding_categories WHERE lower(code)='app26r2' LIMIT 1`,
+    )) as IdRow[];
+    const categoryId = categoryRows[0]?.id;
+    if (!categoryId) throw new Error('F3.1 could not resolve APP26R2 category');
+
+    const groupByKey = new Map(F31_FINDING_GROUPS.map((group) => [group.key, group]));
+    const titlesByFamily = new Map<string, Map<string,string>>();
+    const addFamilyTitle = (familyCode: string, title: string): void => {
+      const clean = title.trim();
+      if (!clean || /^idem\b/i.test(clean) || clean.toUpperCase()==='HALLAZGOS') return;
+      const key = findingKey(clean);
+      const map = titlesByFamily.get(familyCode) ?? new Map<string,string>();
+      if (!map.has(key)) map.set(key, clean);
+      titlesByFamily.set(familyCode, map);
+    };
+    const seedFamily = (family: { code: string; groupKeys: string[]; directFindings: string[] }): void => {
+      for (const title of F31_UNIVERSAL_FINDINGS) addFamilyTitle(family.code, title);
+      for (const groupKey of family.groupKeys) {
+        const group = groupByKey.get(groupKey);
+        if (!group) throw new Error(`F3.1 missing finding group ${groupKey}`);
+        for (const title of group.items) addFamilyTitle(family.code, title);
+      }
+      for (const title of family.directFindings) addFamilyTitle(family.code, title);
+    };
+    for (const family of F31_INSTALLATION_FAMILIES) seedFamily(family);
+    for (const family of F31_SUBINSTALLATION_FAMILIES) seedFamily(family);
+
+    const allTitles = new Map<string,string>();
+    for (const titles of titlesByFamily.values()) {
+      for (const [key,title] of titles) if (!allTitles.has(key)) allTitles.set(key,title);
+    }
+    const orderedTitles = [...allTitles.entries()].sort((a,b) => a[1].localeCompare(b[1],'es'));
+    const itemIdByKey = new Map<string,string>();
+    let sourceNumber = 1;
+    for (const [key,title] of orderedTitles) {
+      const code = findingCode(title);
+      let rows = (await queryRunner.query(
+        `SELECT id FROM finding_catalog_items WHERE lower(code)=lower($1::text) LIMIT 1`,
+        [code],
+      )) as IdRow[];
+      if (!rows[0]?.id) {
+        rows = (await queryRunner.query(`
+          INSERT INTO finding_catalog_items
+            (category_id,code,source_number,title,import_note,revision,is_active)
+          VALUES ($1::uuid,$2::varchar,$3::integer,$4::varchar,$5::text,1,true)
+          RETURNING id
+        `, [
+          categoryId,
+          code,
+          sourceNumber,
+          title,
+          'APLICACION APP(2).xlsx · F3.1 · catálogo estructural revisado',
+        ])) as IdRow[];
+      } else {
+        await queryRunner.query(`
+          UPDATE finding_catalog_items SET
+            category_id=$2::uuid,source_number=$3::integer,title=$4::varchar,
+            import_note=$5::text,is_active=true,updated_at=CURRENT_TIMESTAMP
+          WHERE id=$1::uuid
+        `, [rows[0].id, categoryId, sourceNumber, title, 'APLICACION APP(2).xlsx · F3.1 · catálogo estructural revisado']);
+      }
+      const itemId = rows[0]?.id;
+      if (!itemId) throw new Error(`F3.1 could not create catalog item ${title}`);
+      itemIdByKey.set(key,itemId);
+      await queryRunner.query(`
+        INSERT INTO finding_catalog_item_versions(item_id,revision,snapshot,actor_username)
+        SELECT item.id,item.revision,
+          jsonb_build_object(
+            'id',item.id,'categoryId',category.id,'categoryCode',category.code,
+            'categoryName',category.name,'code',item.code,'sourceNumber',item.source_number,
+            'title',item.title,'legalBasis',item.legal_basis,'glossary',item.glossary,
+            'importNote',item.import_note,'revision',item.revision,'isActive',item.is_active
+          ),'migration:F3.1'
+        FROM finding_catalog_items item
+        JOIN finding_categories category ON category.id=item.category_id
+        WHERE item.id=$1::uuid
+          AND NOT EXISTS (
+            SELECT 1 FROM finding_catalog_item_versions version
+            WHERE version.item_id=item.id AND version.revision=item.revision
+          )
+      `, [itemId]);
+      sourceNumber += 1;
+    }
+
+    await queryRunner.query(`DELETE FROM finding_catalog_item_inventory_families`);
+    const familyMeta = [
+      ...F31_INSTALLATION_FAMILIES,
+      ...F31_SUBINSTALLATION_FAMILIES,
+    ];
+    for (const family of familyMeta) {
+      const familyRows = (await queryRunner.query(
+        `SELECT id FROM inventory_families WHERE code=$1 LIMIT 1`,
+        [family.code],
+      )) as IdRow[];
+      const familyId = familyRows[0]?.id;
+      if (!familyId) throw new Error(`F3.1 missing inventory family ${family.code}`);
+      const titles = titlesByFamily.get(family.code) ?? new Map<string,string>();
+      for (const key of titles.keys()) {
+        const itemId = itemIdByKey.get(key);
+        if (!itemId) continue;
+        await queryRunner.query(`
+          INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id)
+          VALUES ($1::uuid,$2::uuid) ON CONFLICT DO NOTHING
+        `, [itemId,familyId]);
+      }
+
+      const legacyRows = (await queryRunner.query(
+        `SELECT id FROM asset_types WHERE lower(code)=lower($1::text) LIMIT 1`,
+        [family.legacyTypeCode],
+      )) as IdRow[];
+      const legacyTypeId = legacyRows[0]?.id;
+      if (legacyTypeId) {
+        await queryRunner.query(`
+          INSERT INTO finding_catalog_asset_type_profiles(asset_type_id,reason)
+          VALUES ($1::uuid,'F3.1: compatibilidad con activos técnicos históricos usando catálogo APP26R2')
+          ON CONFLICT (asset_type_id) DO UPDATE SET
+            reason=EXCLUDED.reason,updated_at=CURRENT_TIMESTAMP
+        `, [legacyTypeId]);
+        for (const key of titles.keys()) {
+          const itemId = itemIdByKey.get(key);
+          if (!itemId) continue;
+          await queryRunner.query(`
+            INSERT INTO finding_catalog_item_asset_types(catalog_item_id,asset_type_id)
+            VALUES ($1::uuid,$2::uuid) ON CONFLICT DO NOTHING
+          `, [itemId,legacyTypeId]);
+        }
+      }
+    }
+
+    await queryRunner.query(`
+      INSERT INTO finding_catalog_asset_type_profiles(asset_type_id,reason)
+      SELECT id,'F3.1: las altas estructurales usan familia técnica contextual; sin familia no se sugiere catálogo.'
+      FROM asset_types WHERE lower(code) IN ('instalacion','subinstalacion')
+      ON CONFLICT (asset_type_id) DO UPDATE SET
+        reason=EXCLUDED.reason,updated_at=CURRENT_TIMESTAMP
+    `);
+
+    const appRole = process.env.DB_APP_USER;
+    if (!appRole) throw new Error('Missing required environment variable: DB_APP_USER');
+    const roleRows = (await queryRunner.query('SELECT 1 FROM pg_roles WHERE rolname=$1',[appRole])) as unknown[];
+    if (roleRows.length !== 1) throw new Error('Configured DB_APP_USER does not exist');
+    const applicationRole = quoteIdentifier(appRole);
+    await queryRunner.query(`GRANT SELECT ON TABLE inventory_families TO ${applicationRole}`);
+    await queryRunner.query(`GRANT SELECT ON TABLE inventory_family_parent_rules TO ${applicationRole}`);
+    await queryRunner.query(`GRANT SELECT ON TABLE finding_catalog_item_inventory_families TO ${applicationRole}`);
+
+    const familyCounts = (await queryRunner.query(`
+      SELECT
+        COUNT(*) FILTER (WHERE level='INSTALLATION')::text AS installations,
+        COUNT(*) FILTER (WHERE level='SUBINSTALLATION')::text AS subinstallations
+      FROM inventory_families WHERE is_active=true
+    `)) as Array<{ installations: string; subinstallations: string }>;
+    if (Number(familyCounts[0]?.installations ?? 0) !== F31_INSTALLATION_FAMILIES.length) {
+      throw new Error('F3.1 verification failed: installation-family count mismatch');
+    }
+    if (Number(familyCounts[0]?.subinstallations ?? 0) !== F31_SUBINSTALLATION_FAMILIES.length) {
+      throw new Error('F3.1 verification failed: subinstallation-family count mismatch');
+    }
+    const catalogCounts = (await queryRunner.query(`
+      SELECT COUNT(*)::text AS total
+      FROM finding_catalog_items item
+      JOIN finding_categories category ON category.id=item.category_id
+      WHERE lower(category.code)='app26r2' AND item.is_active=true
+    `)) as CountRow[];
+    if (Number(catalogCounts[0]?.total ?? 0) !== orderedTitles.length) {
+      throw new Error('F3.1 verification failed: APP26R2 catalog count mismatch');
+    }
+    // eslint-disable-next-line no-console
+    console.log(
+      `[F3.1] families=${F31_INSTALLATION_FAMILIES.length}+${F31_SUBINSTALLATION_FAMILIES.length}; groups=${F31_FINDING_GROUPS.length}; catalog=${orderedTitles.length}`,
+    );
+  }
+
+  public async down(): Promise<void> {
+    throw new Error(
+      'F3.1 recarga catálogo y agrega familias estructurales; no se revierte destructivamente. Restaurar backup PRE si fuera necesario.',
+    );
+  }
+}
@@ -0,0 +1,107 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF31FamilyCatalogSync1789844500000 implements MigrationInterface {
+  name = 'PhaseF31FamilyCatalogSync1789844500000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION sync_asset_inventory_family_catalog()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        DELETE FROM finding_catalog_asset_overrides
+        WHERE asset_id=NEW.id
+          AND reason LIKE 'F3.1 familia técnica:%';
+
+        IF NEW.inventory_family_id IS NOT NULL THEN
+          INSERT INTO finding_catalog_asset_overrides (
+            asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
+          )
+          SELECT
+            NEW.id,mapping.catalog_item_id,true,
+            'F3.1 familia técnica: catálogo contextual automático',
+            NEW.created_by,NEW.updated_by
+          FROM finding_catalog_item_inventory_families mapping
+          WHERE mapping.inventory_family_id=NEW.inventory_family_id
+          ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
+            is_enabled=true,
+            reason='F3.1 familia técnica: catálogo contextual automático',
+            updated_by=NEW.updated_by,
+            updated_at=CURRENT_TIMESTAMP;
+        END IF;
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_assets_inventory_family_catalog
+      AFTER INSERT OR UPDATE OF inventory_family_id ON assets
+      FOR EACH ROW EXECUTE FUNCTION sync_asset_inventory_family_catalog()
+    `);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION sync_inventory_family_mapping_assets()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        IF TG_OP='DELETE' THEN
+          DELETE FROM finding_catalog_asset_overrides override_record
+          USING assets asset
+          WHERE override_record.asset_id=asset.id
+            AND asset.inventory_family_id=OLD.inventory_family_id
+            AND override_record.catalog_item_id=OLD.catalog_item_id
+            AND override_record.reason LIKE 'F3.1 familia técnica:%';
+          RETURN OLD;
+        END IF;
+
+        INSERT INTO finding_catalog_asset_overrides (
+          asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
+        )
+        SELECT
+          asset.id,NEW.catalog_item_id,true,
+          'F3.1 familia técnica: catálogo contextual automático',
+          asset.created_by,asset.updated_by
+        FROM assets asset
+        WHERE asset.inventory_family_id=NEW.inventory_family_id
+        ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
+          is_enabled=true,
+          reason='F3.1 familia técnica: catálogo contextual automático',
+          updated_at=CURRENT_TIMESTAMP;
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_inventory_family_mapping_assets
+      AFTER INSERT OR DELETE ON finding_catalog_item_inventory_families
+      FOR EACH ROW EXECUTE FUNCTION sync_inventory_family_mapping_assets()
+    `);
+
+    await queryRunner.query(`
+      INSERT INTO finding_catalog_asset_overrides (
+        asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
+      )
+      SELECT
+        asset.id,mapping.catalog_item_id,true,
+        'F3.1 familia técnica: catálogo contextual automático',
+        asset.created_by,asset.updated_by
+      FROM assets asset
+      JOIN finding_catalog_item_inventory_families mapping
+        ON mapping.inventory_family_id=asset.inventory_family_id
+      WHERE asset.inventory_family_id IS NOT NULL
+      ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
+        is_enabled=true,
+        reason='F3.1 familia técnica: catálogo contextual automático',
+        updated_at=CURRENT_TIMESTAMP
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_inventory_family_mapping_assets ON finding_catalog_item_inventory_families');
+    await queryRunner.query('DROP FUNCTION IF EXISTS sync_inventory_family_mapping_assets()');
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_assets_inventory_family_catalog ON assets');
+    await queryRunner.query('DROP FUNCTION IF EXISTS sync_asset_inventory_family_catalog()');
+  }
+}
@@ -0,0 +1,48 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF31AssetChronologicalMerge1789844600000 implements MigrationInterface {
+  name = 'PhaseF31AssetChronologicalMerge1789844600000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE asset_merges (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        source_asset_id uuid NOT NULL REFERENCES assets(id) ON DELETE RESTRICT,
+        canonical_asset_id uuid NOT NULL REFERENCES assets(id) ON DELETE RESTRICT,
+        reason text NOT NULL,
+        merged_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        merged_by uuid NULL REFERENCES users(id) ON DELETE SET NULL,
+        source varchar(32) NOT NULL,
+        request_id varchar(128) NULL,
+        source_snapshot jsonb NOT NULL,
+        canonical_snapshot jsonb NOT NULL,
+        CONSTRAINT chk_asset_merges_distinct CHECK (source_asset_id <> canonical_asset_id),
+        CONSTRAINT uq_asset_merges_source UNIQUE (source_asset_id)
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX idx_asset_merges_canonical ON asset_merges(canonical_asset_id)`);
+    await queryRunner.query(`CREATE INDEX idx_asset_merges_merged_at ON asset_merges(merged_at)`);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION protect_asset_merges_append_only()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        RAISE EXCEPTION 'asset_merges es append-only; una fusión no puede editarse ni borrarse';
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_asset_merges_append_only
+      BEFORE UPDATE OR DELETE ON asset_merges
+      FOR EACH ROW EXECUTE FUNCTION protect_asset_merges_append_only()
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_asset_merges_append_only ON asset_merges');
+    await queryRunner.query('DROP FUNCTION IF EXISTS protect_asset_merges_append_only()');
+    await queryRunner.query('DROP TABLE IF EXISTS asset_merges');
+  }
+}
@@ -0,0 +1,77 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF31UserProfile1789844700000 implements MigrationInterface {
+  name = 'PhaseF31UserProfile1789844700000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE users ADD COLUMN dni varchar(32) NULL`);
+    await queryRunner.query(`ALTER TABLE users ADD COLUMN phone varchar(40) NULL`);
+    await queryRunner.query(`ALTER TABLE users ADD COLUMN job_title varchar(160) NULL`);
+    await queryRunner.query(`ALTER TABLE users ADD COLUMN employee_number varchar(80) NULL`);
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX uq_users_dni_not_null
+      ON users(dni) WHERE dni IS NOT NULL
+    `);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION enforce_inspector_email_on_role()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      DECLARE selected_role_code varchar(80);
+      DECLARE selected_email varchar(320);
+      BEGIN
+        SELECT code INTO selected_role_code FROM roles WHERE id=NEW.role_id;
+        IF selected_role_code='inspector' THEN
+          SELECT email INTO selected_email FROM users WHERE id=NEW.user_id;
+          IF selected_email IS NULL OR btrim(selected_email)='' THEN
+            RAISE EXCEPTION 'INSPECTOR_EMAIL_REQUIRED';
+          END IF;
+        END IF;
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_user_roles_inspector_email
+      BEFORE INSERT OR UPDATE ON user_roles
+      FOR EACH ROW EXECUTE FUNCTION enforce_inspector_email_on_role()
+    `);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION prevent_inspector_email_removal()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        IF (NEW.email IS NULL OR btrim(NEW.email)='') AND EXISTS (
+          SELECT 1
+          FROM user_roles user_role
+          JOIN roles role ON role.id=user_role.role_id
+          WHERE user_role.user_id=NEW.id AND role.code='inspector'
+        ) THEN
+          RAISE EXCEPTION 'INSPECTOR_EMAIL_REQUIRED';
+        END IF;
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_users_inspector_email
+      BEFORE UPDATE OF email ON users
+      FOR EACH ROW EXECUTE FUNCTION prevent_inspector_email_removal()
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_users_inspector_email ON users');
+    await queryRunner.query('DROP FUNCTION IF EXISTS prevent_inspector_email_removal()');
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_user_roles_inspector_email ON user_roles');
+    await queryRunner.query('DROP FUNCTION IF EXISTS enforce_inspector_email_on_role()');
+    await queryRunner.query('DROP INDEX IF EXISTS uq_users_dni_not_null');
+    await queryRunner.query('ALTER TABLE users DROP COLUMN IF EXISTS employee_number');
+    await queryRunner.query('ALTER TABLE users DROP COLUMN IF EXISTS job_title');
+    await queryRunner.query('ALTER TABLE users DROP COLUMN IF EXISTS phone');
+    await queryRunner.query('ALTER TABLE users DROP COLUMN IF EXISTS dni');
+  }
+}
@@ -0,0 +1,102 @@
+import { createHash } from 'node:crypto';
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import {
+  F31_INSTALLATION_FAMILIES,
+  F31_UNIVERSAL_FINDINGS,
+} from '../../reference-data/f3-1-inventory-excel';
+
+const INSTALLATION_OTHER_CODE = 'F31-INST-OTRO';
+
+function subOtherCode(parentCode: string): string {
+  return `F31-SUB-OTRO-${createHash('sha1').update(parentCode).digest('hex').slice(0, 12).toUpperCase()}`;
+}
+
+export class PhaseF31OtherInventoryFamilies1789844800000 implements MigrationInterface {
+  name = 'PhaseF31OtherInventoryFamilies1789844800000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      INSERT INTO inventory_families(
+        code,name,level,legacy_type_code,information_labels,source_reference,is_active
+      ) VALUES ($1::varchar,'Otro / no catalogado','INSTALLATION',NULL,'[]'::jsonb,
+        'SYSTEM:F3.1:OTHER',true)
+      ON CONFLICT (code) DO UPDATE SET
+        name=EXCLUDED.name,is_active=true,updated_at=CURRENT_TIMESTAMP
+    `, [INSTALLATION_OTHER_CODE]);
+
+    for (const parent of F31_INSTALLATION_FAMILIES) {
+      const code = subOtherCode(parent.code);
+      await queryRunner.query(`
+        INSERT INTO inventory_families(
+          code,name,level,legacy_type_code,information_labels,source_reference,is_active
+        ) VALUES ($1::varchar,'Otro / no catalogado','SUBINSTALLATION',NULL,'[]'::jsonb,
+          $2::varchar,true)
+        ON CONFLICT (code) DO UPDATE SET
+          name=EXCLUDED.name,is_active=true,updated_at=CURRENT_TIMESTAMP
+      `, [code, `SYSTEM:F3.1:OTHER:${parent.code}`]);
+      await queryRunner.query(`
+        INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
+        SELECT child.id,parent.id
+        FROM inventory_families child
+        JOIN inventory_families parent ON parent.code=$2::varchar
+        WHERE child.code=$1::varchar
+        ON CONFLICT (child_family_id) DO UPDATE
+        SET parent_family_id=EXCLUDED.parent_family_id
+      `, [code, parent.code]);
+    }
+
+    // Si la Instalación misma es "Otro", también necesita una opción "Otro" hija.
+    const rootSubOther = subOtherCode(INSTALLATION_OTHER_CODE);
+    await queryRunner.query(`
+      INSERT INTO inventory_families(
+        code,name,level,legacy_type_code,information_labels,source_reference,is_active
+      ) VALUES ($1::varchar,'Otro / no catalogado','SUBINSTALLATION',NULL,'[]'::jsonb,
+        'SYSTEM:F3.1:OTHER:F31-INST-OTRO',true)
+      ON CONFLICT (code) DO UPDATE SET
+        name=EXCLUDED.name,is_active=true,updated_at=CURRENT_TIMESTAMP
+    `, [rootSubOther]);
+    await queryRunner.query(`
+      INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
+      SELECT child.id,parent.id
+      FROM inventory_families child
+      JOIN inventory_families parent ON parent.code=$2::varchar
+      WHERE child.code=$1::varchar
+      ON CONFLICT (child_family_id) DO UPDATE
+      SET parent_family_id=EXCLUDED.parent_family_id
+    `, [rootSubOther, INSTALLATION_OTHER_CODE]);
+
+    const otherCodes = [
+      INSTALLATION_OTHER_CODE,
+      ...F31_INSTALLATION_FAMILIES.map((parent) => subOtherCode(parent.code)),
+      rootSubOther,
+    ];
+    for (const familyCode of otherCodes) {
+      for (const title of F31_UNIVERSAL_FINDINGS) {
+        await queryRunner.query(`
+          INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id)
+          SELECT item.id,family.id
+          FROM finding_catalog_items item
+          JOIN finding_categories category ON category.id=item.category_id
+          CROSS JOIN inventory_families family
+          WHERE lower(category.code)='app26r2'
+            AND lower(btrim(item.title))=lower(btrim($2::text))
+            AND family.code=$1::varchar
+          ON CONFLICT (catalog_item_id,inventory_family_id) DO NOTHING
+        `, [familyCode, title]);
+      }
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    const codes = [
+      INSTALLATION_OTHER_CODE,
+      ...F31_INSTALLATION_FAMILIES.map((parent) => subOtherCode(parent.code)),
+      subOtherCode(INSTALLATION_OTHER_CODE),
+    ];
+    await queryRunner.query(`
+      DELETE FROM inventory_families
+      WHERE code=ANY($1::varchar[])
+        AND NOT EXISTS (SELECT 1 FROM assets asset WHERE asset.inventory_family_id=inventory_families.id)
+    `, [codes]);
+  }
+}
@@ -0,0 +1,46 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF31FindingCatalogMerge1789844900000 implements MigrationInterface {
+  name = 'PhaseF31FindingCatalogMerge1789844900000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE finding_catalog_item_merges (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        source_item_id uuid NOT NULL REFERENCES finding_catalog_items(id) ON DELETE RESTRICT,
+        canonical_item_id uuid NOT NULL REFERENCES finding_catalog_items(id) ON DELETE RESTRICT,
+        reason text NOT NULL,
+        merged_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        merged_by uuid NULL REFERENCES users(id) ON DELETE SET NULL,
+        request_id varchar(128) NULL,
+        source_snapshot jsonb NOT NULL,
+        canonical_snapshot jsonb NOT NULL,
+        CONSTRAINT chk_finding_catalog_item_merges_distinct CHECK (source_item_id <> canonical_item_id),
+        CONSTRAINT uq_finding_catalog_item_merges_source UNIQUE (source_item_id)
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX idx_finding_catalog_item_merges_canonical ON finding_catalog_item_merges(canonical_item_id)`);
+    await queryRunner.query(`CREATE INDEX idx_finding_catalog_item_merges_at ON finding_catalog_item_merges(merged_at)`);
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION protect_finding_catalog_item_merges_append_only()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        RAISE EXCEPTION 'finding_catalog_item_merges es append-only; una fusión de catálogo no puede editarse ni borrarse';
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_finding_catalog_item_merges_append_only
+      BEFORE UPDATE OR DELETE ON finding_catalog_item_merges
+      FOR EACH ROW EXECUTE FUNCTION protect_finding_catalog_item_merges_append_only()
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_finding_catalog_item_merges_append_only ON finding_catalog_item_merges');
+    await queryRunner.query('DROP FUNCTION IF EXISTS protect_finding_catalog_item_merges_append_only()');
+    await queryRunner.query('DROP TABLE IF EXISTS finding_catalog_item_merges');
+  }
+}
@@ -0,0 +1,56 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF31InspectorDocumentDelivery1789845000000 implements MigrationInterface {
+  name = 'PhaseF31InspectorDocumentDelivery1789845000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      ADD COLUMN recipient_user_id uuid NULL
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      ADD CONSTRAINT fk_inspection_document_deliveries_recipient_user
+      FOREIGN KEY (recipient_user_id) REFERENCES users(id) ON DELETE SET NULL
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      DROP CONSTRAINT chk_inspection_document_deliveries_recipient_kind
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      ADD CONSTRAINT chk_inspection_document_deliveries_recipient_kind
+      CHECK (recipient_kind IN ('COMPANY','OFFICE','DIRECTOR','INSPECTOR'))
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inspection_document_deliveries_recipient_user
+      ON inspection_document_deliveries(recipient_user_id)
+      WHERE recipient_user_id IS NOT NULL
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      DELETE FROM inspection_document_deliveries
+      WHERE recipient_kind='INSPECTOR'
+    `);
+    await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_document_deliveries_recipient_user`);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      DROP CONSTRAINT chk_inspection_document_deliveries_recipient_kind
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      ADD CONSTRAINT chk_inspection_document_deliveries_recipient_kind
+      CHECK (recipient_kind IN ('COMPANY','OFFICE','DIRECTOR'))
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      DROP CONSTRAINT IF EXISTS fk_inspection_document_deliveries_recipient_user
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      DROP COLUMN IF EXISTS recipient_user_id
+    `);
+  }
+}
@@ -0,0 +1,13 @@
+import { Transform } from 'class-transformer';
+import { IsString, IsUUID, MaxLength, MinLength } from 'class-validator';
+
+export class MergeFindingCatalogItemDto {
+  @IsUUID('4')
+  canonicalItemId!: string;
+
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
+  @IsString()
+  @MinLength(8)
+  @MaxLength(2000)
+  reason!: string;
+}
@@ -0,0 +1,97 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import type { ListFindingCatalogQueryDto } from './dto/list-finding-catalog-query.dto';
+import { FindingCatalogService } from './finding-catalog.service';
+
+@Injectable()
+export class F3FindingCatalogResolverService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly legacyCatalog: FindingCatalogService,
+  ) {}
+
+  async listApplicableForAsset(assetId: string, query: ListFindingCatalogQueryDto) {
+    const [asset] = await this.dataSource.query(`
+      SELECT asset.id,asset.code,asset.name,
+        asset.inventory_family_id AS "familyId",
+        family.code AS "familyCode",family.name AS "familyName",family.level AS "familyLevel"
+      FROM assets asset
+      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
+      WHERE asset.id=$1::uuid
+    `, [assetId]) as Array<{
+      id: string;
+      code: string;
+      name: string;
+      familyId: string | null;
+      familyCode: string | null;
+      familyName: string | null;
+      familyLevel: string | null;
+    }>;
+    if (!asset) {
+      throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
+    }
+    if (!asset.familyId) return this.legacyCatalog.listApplicableForAsset(assetId, query);
+
+    const filters = [
+      'mapping.inventory_family_id=$1::uuid',
+      'item.is_active=true',
+      'category.is_active=true',
+      'merge_record.source_item_id IS NULL',
+    ];
+    const params: unknown[] = [asset.familyId];
+    if (query.categoryId) {
+      params.push(query.categoryId);
+      filters.push(`category.id=$${params.length}::uuid`);
+    }
+    if (query.search?.trim()) {
+      params.push(`%${query.search.trim()}%`);
+      const token = `$${params.length}`;
+      filters.push(`(item.title ILIKE ${token} OR COALESCE(item.legal_basis,'') ILIKE ${token} OR COALESCE(item.glossary,'') ILIKE ${token})`);
+    }
+
+    const where = filters.join(' AND ');
+    const [categories, items] = await Promise.all([
+      this.dataSource.query(`
+        SELECT DISTINCT category.id,category.code,category.name,category.sort_order AS "sortOrder"
+        FROM finding_catalog_item_inventory_families mapping
+        JOIN finding_catalog_items item ON item.id=mapping.catalog_item_id
+        JOIN finding_categories category ON category.id=item.category_id
+        LEFT JOIN finding_catalog_item_merges merge_record ON merge_record.source_item_id=item.id
+        WHERE ${where}
+        ORDER BY category.sort_order,category.name,category.id
+      `, params),
+      this.dataSource.query(`
+        SELECT item.id,item.category_id AS "categoryId",item.code,
+          item.source_number AS "sourceNumber",item.title,item.legal_basis AS "legalBasis",
+          item.glossary,item.suggested_severity AS "suggestedSeverity",item.revision,
+          category.name AS "categoryName"
+        FROM finding_catalog_item_inventory_families mapping
+        JOIN finding_catalog_items item ON item.id=mapping.catalog_item_id
+        JOIN finding_categories category ON category.id=item.category_id
+        LEFT JOIN finding_catalog_item_merges merge_record ON merge_record.source_item_id=item.id
+        WHERE ${where}
+        ORDER BY category.sort_order,item.source_number,item.code
+      `, params),
+    ]);
+
+    return {
+      asset: { id: asset.id, code: asset.code, name: asset.name },
+      inventoryFamily: {
+        id: asset.familyId,
+        code: asset.familyCode,
+        name: asset.familyName,
+        level: asset.familyLevel,
+      },
+      typeConfigured: true,
+      configurationReason: `F3.1 · Catálogo del Excel asociado a ${asset.familyName ?? 'la familia técnica'}`,
+      categories,
+      items,
+      other: {
+        enabled: true,
+        code: 'OTHER',
+        label: 'OTROS',
+        help: 'Usalo cuando el hallazgo no exista en la familia técnica. Se enviará una propuesta a revisión de oficina.',
+      },
+    };
+  }
+}
@@ -0,0 +1,268 @@
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { DataSource, EntityManager } from 'typeorm';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { AuditAction } from '../database/entities';
+import type { MergeFindingCatalogItemDto } from './dto/merge-finding-catalog-item.dto';
+
+type CatalogItemRow = {
+  id: string;
+  categoryId: string;
+  categoryCode: string;
+  categoryName: string;
+  code: string;
+  sourceNumber: number;
+  title: string;
+  legalBasis: string | null;
+  glossary: string | null;
+  importNote: string | null;
+  suggestedSeverity: number | null;
+  revision: number;
+  isActive: boolean;
+};
+
+@Injectable()
+export class FindingCatalogMergeService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+  ) {}
+
+  async status(itemId: string) {
+    const requested = await this.load(this.dataSource.manager, itemId, false);
+    const canonicalId = await this.resolveCanonicalId(this.dataSource.manager, itemId);
+    const canonical = canonicalId === itemId
+      ? requested
+      : await this.load(this.dataSource.manager, canonicalId, false);
+    const aliases = await this.dataSource.query(`
+      WITH RECURSIVE aliases AS (
+        SELECT source_item_id,canonical_item_id,reason,merged_at,1 AS depth
+        FROM finding_catalog_item_merges WHERE canonical_item_id=$1::uuid
+        UNION ALL
+        SELECT merge_record.source_item_id,merge_record.canonical_item_id,
+          merge_record.reason,merge_record.merged_at,aliases.depth+1
+        FROM finding_catalog_item_merges merge_record
+        JOIN aliases ON merge_record.canonical_item_id=aliases.source_item_id
+        WHERE aliases.depth<32
+      )
+      SELECT alias.source_item_id AS id,item.code,item.title,alias.reason,
+        alias.merged_at AS "mergedAt",alias.depth
+      FROM aliases alias
+      JOIN finding_catalog_items item ON item.id=alias.source_item_id
+      ORDER BY alias.merged_at,alias.depth
+    `, [canonicalId]);
+    return {
+      requested,
+      isMerged: canonicalId !== itemId,
+      canonical,
+      aliases,
+    };
+  }
+
+  async merge(
+    sourceItemId: string,
+    dto: MergeFindingCatalogItemDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction(async (manager) => {
+      const existing = await manager.query(`
+        SELECT canonical_item_id AS "canonicalItemId"
+        FROM finding_catalog_item_merges WHERE source_item_id=$1::uuid
+      `, [sourceItemId]) as Array<{ canonicalItemId: string }>;
+      if (existing[0]) {
+        throw new ConflictException({
+          code: 'FINDING_CATALOG_ALREADY_MERGED',
+          message: 'Este Hallazgo de catálogo ya fue fusionado',
+          canonicalItemId: existing[0].canonicalItemId,
+        });
+      }
+
+      const canonicalItemId = await this.resolveCanonicalId(manager, dto.canonicalItemId);
+      if (canonicalItemId === sourceItemId) {
+        throw new BadRequestException({
+          code: 'FINDING_CATALOG_MERGE_CYCLE',
+          message: 'La fusión generaría un ciclo en el catálogo',
+        });
+      }
+
+      const ids = [sourceItemId, canonicalItemId].sort();
+      const rows = await manager.query(`
+        SELECT item.id,item.category_id AS "categoryId",category.code AS "categoryCode",
+          category.name AS "categoryName",item.code,item.source_number AS "sourceNumber",
+          item.title,item.legal_basis AS "legalBasis",item.glossary,item.import_note AS "importNote",
+          item.suggested_severity AS "suggestedSeverity",item.revision,item.is_active AS "isActive"
+        FROM finding_catalog_items item
+        JOIN finding_categories category ON category.id=item.category_id
+        WHERE item.id=ANY($1::uuid[])
+        ORDER BY item.id
+        FOR UPDATE OF item
+      `, [ids]) as CatalogItemRow[];
+      const source = rows.find((item) => item.id === sourceItemId);
+      const canonical = rows.find((item) => item.id === canonicalItemId);
+      if (!source || !canonical) throw new NotFoundException({
+        code: 'FINDING_CATALOG_ITEM_NOT_FOUND',
+        message: 'Hallazgo de catálogo no encontrado',
+      });
+      if (!source.isActive) throw new ConflictException({
+        code: 'FINDING_CATALOG_MERGE_SOURCE_INACTIVE',
+        message: 'El Hallazgo de origen ya está inactivo',
+      });
+      if (!canonical.isActive) throw new ConflictException({
+        code: 'FINDING_CATALOG_MERGE_CANONICAL_INACTIVE',
+        message: 'El Hallazgo canónico debe estar activo',
+      });
+
+      const sourceSnapshot = this.snapshot(source);
+      const canonicalSnapshot = this.snapshot(canonical);
+
+      // La aplicabilidad futura pasa al canónico; los Hallazgos emitidos nunca se reescriben.
+      await manager.query(`
+        INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id)
+        SELECT $2::uuid,inventory_family_id
+        FROM finding_catalog_item_inventory_families
+        WHERE catalog_item_id=$1::uuid
+        ON CONFLICT (catalog_item_id,inventory_family_id) DO NOTHING
+      `, [source.id, canonical.id]);
+      await manager.query(`
+        INSERT INTO finding_catalog_item_asset_types(catalog_item_id,asset_type_id,created_by)
+        SELECT $2::uuid,asset_type_id,$3::uuid
+        FROM finding_catalog_item_asset_types
+        WHERE catalog_item_id=$1::uuid
+        ON CONFLICT (catalog_item_id,asset_type_id) DO NOTHING
+      `, [source.id, canonical.id, principal.userId]);
+      await manager.query(`
+        INSERT INTO finding_catalog_asset_overrides(
+          asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
+        )
+        SELECT asset_id,$2::uuid,is_enabled,
+          'F3.1 merge catálogo: ' || COALESCE(reason,''),$3::uuid,$3::uuid
+        FROM finding_catalog_asset_overrides source_override
+        WHERE source_override.catalog_item_id=$1::uuid
+          AND NOT EXISTS (
+            SELECT 1 FROM finding_catalog_asset_overrides target_override
+            WHERE target_override.asset_id=source_override.asset_id
+              AND target_override.catalog_item_id=$2::uuid
+          )
+      `, [source.id, canonical.id, principal.userId]);
+
+      const [mergeRecord] = await manager.query(`
+        INSERT INTO finding_catalog_item_merges(
+          source_item_id,canonical_item_id,reason,merged_by,request_id,
+          source_snapshot,canonical_snapshot
+        ) VALUES ($1::uuid,$2::uuid,$3::text,$4::uuid,$5::varchar,$6::jsonb,$7::jsonb)
+        RETURNING id,source_item_id AS "sourceItemId",canonical_item_id AS "canonicalItemId",
+          reason,merged_at AS "mergedAt",merged_by AS "mergedBy",request_id AS "requestId"
+      `, [
+        source.id,
+        canonical.id,
+        dto.reason,
+        principal.userId,
+        request.requestId,
+        sourceSnapshot,
+        canonicalSnapshot,
+      ]) as Array<Record<string, unknown>>;
+
+      await manager.query(`
+        UPDATE finding_catalog_items
+        SET is_active=false,revision=revision+1,updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1::uuid
+      `, [source.id]);
+      const updatedSource = await this.load(manager, source.id, false);
+      await manager.query(`
+        INSERT INTO finding_catalog_item_versions(
+          item_id,revision,snapshot,actor_user_id,actor_username
+        ) VALUES ($1::uuid,$2::integer,$3::jsonb,$4::uuid,$5::varchar)
+      `, [
+        updatedSource.id,
+        updatedSource.revision,
+        this.snapshot(updatedSource),
+        principal.userId,
+        principal.username,
+      ]);
+
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: AuditAction.FINDING_CATALOG_ITEM_UPDATED,
+        entityType: 'finding_catalog_item_merge',
+        entityId: String(mergeRecord.id),
+        beforeData: sourceSnapshot,
+        afterData: canonicalSnapshot,
+        metadata: {
+          operation: 'CHRONOLOGICAL_CATALOG_MERGE',
+          sourceItemId: source.id,
+          canonicalItemId: canonical.id,
+          reason: dto.reason,
+          historicalFindingsRewritten: false,
+          historicalProposalsRewritten: false,
+          futureApplicabilityMovedToCanonical: true,
+        },
+      }, manager);
+
+      return {
+        merge: mergeRecord,
+        source: updatedSource,
+        canonical,
+        historyPolicy: 'EMITTED_FINDINGS_PRESERVED',
+      };
+    });
+  }
+
+  private async resolveCanonicalId(manager: EntityManager, itemId: string): Promise<string> {
+    const rows = await manager.query(`
+      WITH RECURSIVE chain AS (
+        SELECT source_item_id,canonical_item_id,1 AS depth
+        FROM finding_catalog_item_merges WHERE source_item_id=$1::uuid
+        UNION ALL
+        SELECT merge_record.source_item_id,merge_record.canonical_item_id,chain.depth+1
+        FROM finding_catalog_item_merges merge_record
+        JOIN chain ON merge_record.source_item_id=chain.canonical_item_id
+        WHERE chain.depth<32
+      )
+      SELECT canonical_item_id AS id FROM chain ORDER BY depth DESC LIMIT 1
+    `, [itemId]) as Array<{ id: string }>;
+    return rows[0]?.id ?? itemId;
+  }
+
+  private async load(manager: EntityManager, itemId: string, lock: boolean): Promise<CatalogItemRow> {
+    const lockSql = lock ? 'FOR UPDATE OF item' : '';
+    const rows = await manager.query(`
+      SELECT item.id,item.category_id AS "categoryId",category.code AS "categoryCode",
+        category.name AS "categoryName",item.code,item.source_number AS "sourceNumber",
+        item.title,item.legal_basis AS "legalBasis",item.glossary,item.import_note AS "importNote",
+        item.suggested_severity AS "suggestedSeverity",item.revision,item.is_active AS "isActive"
+      FROM finding_catalog_items item
+      JOIN finding_categories category ON category.id=item.category_id
+      WHERE item.id=$1::uuid ${lockSql}
+    `, [itemId]) as CatalogItemRow[];
+    if (!rows[0]) throw new NotFoundException({
+      code: 'FINDING_CATALOG_ITEM_NOT_FOUND',
+      message: 'Hallazgo de catálogo no encontrado',
+    });
+    return rows[0];
+  }
+
+  private snapshot(item: CatalogItemRow): Record<string, unknown> {
+    return {
+      id: item.id,
+      categoryId: item.categoryId,
+      categoryCode: item.categoryCode,
+      categoryName: item.categoryName,
+      code: item.code,
+      sourceNumber: item.sourceNumber,
+      title: item.title,
+      legalBasis: item.legalBasis,
+      glossary: item.glossary,
+      importNote: item.importNote,
+      suggestedSeverity: item.suggestedSeverity,
+      revision: item.revision,
+      isActive: item.isActive,
+    };
+  }
+}
@@ -6,15 +6,22 @@ import { CreateFindingCatalogItemDto } from './dto/create-finding-catalog-item.d
 import { CreateFindingCategoryDto } from './dto/create-finding-category.dto';
 import { ListFindingCatalogProposalsQueryDto } from './dto/list-finding-catalog-proposals-query.dto';
 import { ListFindingCatalogQueryDto } from './dto/list-finding-catalog-query.dto';
+import { MergeFindingCatalogItemDto } from './dto/merge-finding-catalog-item.dto';
 import { ReplaceFindingCatalogSelectionDto } from './dto/replace-finding-catalog-selection.dto';
 import { ReviewFindingCatalogProposalDto } from './dto/review-finding-catalog-proposal.dto';
 import { UpdateFindingCatalogItemDto } from './dto/update-finding-catalog-item.dto';
 import { UpdateFindingCategoryDto } from './dto/update-finding-category.dto';
+import { F3FindingCatalogResolverService } from './f3-finding-catalog-resolver.service';
+import { FindingCatalogMergeService } from './finding-catalog-merge.service';
 import { FindingCatalogService } from './finding-catalog.service';

@Controller('finding-catalog')
 export class FindingCatalogController {
-  constructor(private readonly catalog: FindingCatalogService) {}
+  constructor(
+    private readonly catalog: FindingCatalogService,
+    private readonly applicableCatalog: F3FindingCatalogResolverService,
+    private readonly catalogMerges: FindingCatalogMergeService,
+  ) {}

  @Get()
  @RequirePermissions('finding_catalog.read')
@@ -27,8 +34,8 @@ export class FindingCatalogController {
  applicable(
    @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
    @Query() query: ListFindingCatalogQueryDto,
-  ) {
-    return this.catalog.listApplicableForAsset(assetId, query);
+  ): Promise<unknown> {
+    return this.applicableCatalog.listApplicableForAsset(assetId, query);
  }

  @Get('admin')
@@ -123,6 +130,25 @@ export class FindingCatalogController {
    return this.catalog.createItem(dto, principal, request);
  }

+  @Get('items/:id/merge-status')
+  @RequirePermissions('finding_catalog.manage')
+  mergeStatus(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+  ): Promise<unknown> {
+    return this.catalogMerges.status(id);
+  }
+
+  @Post('items/:id/merge')
+  @RequirePermissions('finding_catalog.manage')
+  mergeItem(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+    @Body() dto: MergeFindingCatalogItemDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ): Promise<unknown> {
+    return this.catalogMerges.merge(id, dto, principal, request);
+  }
+
  @Patch('items/:id')
  @RequirePermissions('finding_catalog.manage')
  updateItem(
@@ -1,7 +1,9 @@
 import { Module } from '@nestjs/common';
 import { AuditModule } from '../audit/audit.module';
 import { FindingCatalogController } from './finding-catalog.controller';
+import { FindingCatalogMergeService } from './finding-catalog-merge.service';
 import { FindingCatalogService } from './finding-catalog.service';
+import { F3FindingCatalogResolverService } from './f3-finding-catalog-resolver.service';
 import {
  InspectionActFindingsController,
  InspectionFindingsController,
@@ -26,8 +28,16 @@ import { InspectionEvidenceService } from './inspection-evidence.service';
  ],
  providers: [
    FindingCatalogService,
+    F3FindingCatalogResolverService,
+    FindingCatalogMergeService,
    InspectionFindingsService,
    InspectionEvidenceService,
  ],
+  exports: [
+    FindingCatalogService,
+    F3FindingCatalogResolverService,
+    FindingCatalogMergeService,
+    InspectionFindingsService,
+  ],
 })
 export class InspectionFindingsModule {}
@@ -1,40 +1,470 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
-import { DataSource } from 'typeorm';
 import { ConfigService } from '@nestjs/config';
+import { DataSource } from 'typeorm';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { AuditAction, AuditSource } from '../database/entities';
+import type { UpdateDocumentDeliverySettingsDto } from './dto/update-document-delivery-settings.dto';
 import { InspectionActPdfService } from './inspection-act-pdf.service';
 import { InspectionReportWordService } from './inspection-report-word.service';
 import { SmtpDeliveryService } from './smtp-delivery.service';
-import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
-import { AuditService } from '../audit/audit.service';
-import { administrationAuditContext } from '../administration/common/administration-audit';
-import { AuditAction, AuditSource } from '../database/entities';
-import type { UpdateDocumentDeliverySettingsDto } from './dto/update-document-delivery-settings.dto';

-export interface DeliveryRow { id:string; actId:string; reportId:string|null; documentKind:'ACT_PDF'|'REPORT_WORD'; recipientKind:'COMPANY'|'OFFICE'|'DIRECTOR'; recipientAssetId:string|null; recipientEmail:string|null; status:string; attempts:number; actCode:string; reportCode:string|null; }
+export type DeliveryRecipientKind = 'COMPANY' | 'OFFICE' | 'DIRECTOR' | 'INSPECTOR';
+
+export interface DeliveryRow {
+  id: string;
+  actId: string;
+  reportId: string | null;
+  documentKind: 'ACT_PDF' | 'REPORT_WORD';
+  recipientKind: DeliveryRecipientKind;
+  recipientAssetId: string | null;
+  recipientUserId: string | null;
+  recipientEmail: string | null;
+  status: string;
+  attempts: number;
+  actCode: string;
+  reportCode: string | null;
+}

@Injectable()
 export class InspectionDocumentDeliveryService {
-  constructor(private readonly dataSource:DataSource, private readonly pdf:InspectionActPdfService, private readonly word:InspectionReportWordService, private readonly smtp:SmtpDeliveryService, private readonly audit:AuditService, private readonly config:ConfigService){}
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly pdf: InspectionActPdfService,
+    private readonly word: InspectionReportWordService,
+    private readonly smtp: SmtpDeliveryService,
+    private readonly audit: AuditService,
+    private readonly config: ConfigService,
+  ) {}

-  async settings(){ const [row]=await this.dataSource.query(`SELECT office_email AS "officeEmail",director_email AS "directorEmail",updated_at AS "updatedAt" FROM institutional_delivery_settings WHERE id=1`) as Array<{officeEmail:string|null;directorEmail:string|null;updatedAt:Date}>; return {...row,smtpConfigured:this.smtp.configured(),mailFrom:this.config.get<string>('MAIL_FROM')??null}; }
-  async updateSettings(dto:UpdateDocumentDeliverySettingsDto,principal:AuthPrincipal,request:RequestWithContext){ const before=await this.settings(); await this.dataSource.query(`UPDATE institutional_delivery_settings SET office_email=$1,director_email=$2,updated_by=$3,updated_at=CURRENT_TIMESTAMP WHERE id=1`,[dto.officeEmail??null,dto.directorEmail??null,principal.userId]); const after=await this.settings(); await this.audit.record({...administrationAuditContext(principal,request),action:AuditAction.DOCUMENT_DELIVERY_SETTINGS_UPDATED,entityType:'institutional_delivery_settings',entityId:'1',beforeData:before,afterData:after}); return after; }
-  async list(){ const data=await this.dataSource.query(`SELECT d.id,d.act_id AS "actId",d.report_id AS "reportId",d.document_kind AS "documentKind",d.recipient_kind AS "recipientKind",d.recipient_asset_id AS "recipientAssetId",d.recipient_email AS "recipientEmail",d.status,d.attempts,d.last_attempt_at AS "lastAttemptAt",d.sent_at AS "sentAt",d.provider_message_id AS "providerMessageId",d.last_error AS "lastError",d.created_at AS "createdAt",a.code AS "actCode",r.code AS "reportCode",recipient.name AS "recipientAssetName" FROM inspection_document_deliveries d JOIN inspection_acts a ON a.id=d.act_id LEFT JOIN inspection_reports r ON r.id=d.report_id LEFT JOIN assets recipient ON recipient.id=d.recipient_asset_id ORDER BY d.created_at DESC LIMIT 200`); return {data}; }
-
-  async dispatchForAct(actId:string):Promise<void>{ await this.pdf.ensure(actId).catch(()=>undefined); const [report]=await this.dataSource.query(`SELECT id FROM inspection_reports WHERE act_id=$1`,[actId]) as Array<{id:string}>; if(report)await this.word.ensure(report.id); await this.ensureRows(actId,report?.id??null); const rows=await this.rowsForAct(actId); for(const row of rows)await this.attempt(row).catch(()=>undefined); }
-  async retry(id:string,principal:AuthPrincipal,request:RequestWithContext):Promise<DeliveryRow>{ const row=await this.load(id); await this.audit.record({...administrationAuditContext(principal,request),action:AuditAction.DOCUMENT_DELIVERY_RETRY_REQUESTED,entityType:'inspection_document_delivery',entityId:id,metadata:{actId:row.actId,documentKind:row.documentKind,recipientKind:row.recipientKind}}); await this.refreshRecipient(row); await this.attempt(await this.load(id)); return this.load(id); }
-  async retryPending(principal:AuthPrincipal,request:RequestWithContext){ const rows=await this.dataSource.query(`SELECT id FROM inspection_document_deliveries WHERE status<>'SENT' ORDER BY created_at ASC LIMIT 100`) as Array<{id:string}>; for(const item of rows)await this.retry(item.id,principal,request).catch(()=>undefined); return {processed:rows.length}; }
-
-  private async ensureRows(actId:string,reportId:string|null){ const [settings]=await this.dataSource.query(`SELECT office_email AS "officeEmail",director_email AS "directorEmail" FROM institutional_delivery_settings WHERE id=1`) as Array<{officeEmail:string|null;directorEmail:string|null}>; const companies=await this.dataSource.query(`SELECT DISTINCT company.id,profile.notification_email AS email FROM inspection_act_assets link JOIN assets asset ON asset.id=link.asset_id JOIN asset_types asset_type ON asset_type.id=asset.asset_type_id JOIN assets company ON company.id=COALESCE(asset.operator_company_id,CASE WHEN asset_type.operational_role='COMPANY' THEN asset.id END) LEFT JOIN organization_profiles profile ON profile.asset_id=company.id WHERE link.act_id=$1 AND link.included=true`,[actId]) as Array<{id:string;email:string|null}>;
-    for(const company of companies)await this.upsertRow(actId,reportId,'ACT_PDF','COMPANY',company.id,company.email);
-    await this.upsertRow(actId,reportId,'ACT_PDF','OFFICE',null,settings?.officeEmail??null);
-    if(reportId)await this.upsertRow(actId,reportId,'REPORT_WORD','DIRECTOR',null,settings?.directorEmail??null);
+  async settings() {
+    const [row] = await this.dataSource.query(`
+      SELECT
+        office_email AS "officeEmail",
+        director_email AS "directorEmail",
+        updated_at AS "updatedAt"
+      FROM institutional_delivery_settings
+      WHERE id=1
+    `) as Array<{
+      officeEmail: string | null;
+      directorEmail: string | null;
+      updatedAt: Date;
+    }>;
+    return {
+      ...row,
+      smtpConfigured: this.smtp.configured(),
+      mailFrom: this.config.get<string>('MAIL_FROM') ?? null,
+    };
  }
-  private async upsertRow(actId:string,reportId:string|null,documentKind:string,recipientKind:string,recipientAssetId:string|null,recipientEmail:string|null){ await this.dataSource.query(`INSERT INTO inspection_document_deliveries (act_id,report_id,document_kind,recipient_kind,recipient_asset_id,recipient_key,recipient_email,status) VALUES ($1,$2,$3,$4,$5,COALESCE($5::uuid,'00000000-0000-0000-0000-000000000000'::uuid),$6,$7) ON CONFLICT (act_id,document_kind,recipient_kind,recipient_key) DO UPDATE SET report_id=COALESCE(EXCLUDED.report_id,inspection_document_deliveries.report_id),recipient_email=COALESCE(inspection_document_deliveries.recipient_email,EXCLUDED.recipient_email),updated_at=CURRENT_TIMESTAMP`,[actId,reportId,documentKind,recipientKind,recipientAssetId,recipientEmail,recipientEmail?'PENDING':'WAITING_RECIPIENT']); }
-  private async rowsForAct(actId:string){ return this.dataSource.query(`SELECT d.id,d.act_id AS "actId",d.report_id AS "reportId",d.document_kind AS "documentKind",d.recipient_kind AS "recipientKind",d.recipient_asset_id AS "recipientAssetId",d.recipient_email AS "recipientEmail",d.status,d.attempts,a.code AS "actCode",r.code AS "reportCode" FROM inspection_document_deliveries d JOIN inspection_acts a ON a.id=d.act_id LEFT JOIN inspection_reports r ON r.id=d.report_id WHERE d.act_id=$1 ORDER BY d.created_at`,[actId]) as Promise<DeliveryRow[]>; }
-  private async load(id:string){ const [row]=await this.dataSource.query(`SELECT d.id,d.act_id AS "actId",d.report_id AS "reportId",d.document_kind AS "documentKind",d.recipient_kind AS "recipientKind",d.recipient_asset_id AS "recipientAssetId",d.recipient_email AS "recipientEmail",d.status,d.attempts,a.code AS "actCode",r.code AS "reportCode" FROM inspection_document_deliveries d JOIN inspection_acts a ON a.id=d.act_id LEFT JOIN inspection_reports r ON r.id=d.report_id WHERE d.id=$1`,[id]) as DeliveryRow[]; if(!row)throw new NotFoundException({code:'DOCUMENT_DELIVERY_NOT_FOUND',message:'Entrega documental no encontrada'}); return row; }
-  private async refreshRecipient(row:DeliveryRow){ let email:string|null=null; if(row.recipientKind==='COMPANY'&&row.recipientAssetId){ const [company]=await this.dataSource.query(`SELECT notification_email AS email FROM organization_profiles WHERE asset_id=$1`,[row.recipientAssetId]) as Array<{email:string|null}>; email=company?.email??null; } else { const [settings]=await this.dataSource.query(`SELECT office_email AS "officeEmail",director_email AS "directorEmail" FROM institutional_delivery_settings WHERE id=1`) as Array<{officeEmail:string|null;directorEmail:string|null}>; email=row.recipientKind==='OFFICE'?settings?.officeEmail??null:settings?.directorEmail??null; } await this.dataSource.query(`UPDATE inspection_document_deliveries SET recipient_email=$2,status=CASE WHEN $2::text IS NULL THEN 'WAITING_RECIPIENT' ELSE 'PENDING' END,last_error=NULL,updated_at=CURRENT_TIMESTAMP WHERE id=$1 AND status<>'SENT'`,[row.id,email]); }
-  private async attempt(row:DeliveryRow){ if(row.status==='SENT')return; if(!row.recipientEmail){await this.setStatus(row.id,'WAITING_RECIPIENT','Destinatario no configurado');return;} if(!this.smtp.configured()){await this.setStatus(row.id,'WAITING_TRANSPORT','SMTP no configurado');return;} let attachment:{filename:string;mimeType:string;content:Buffer}; try{ if(row.documentKind==='ACT_PDF'){await this.pdf.ensure(row.actId); const file=await this.pdf.content(row.actId); attachment={filename:file.originalName,mimeType:file.mimeType,content:file.buffer};}else{if(!row.reportId)throw new Error('Informe no vinculado'); await this.word.ensure(row.reportId); const file=await this.word.content(row.reportId); const {readFile}=await import('node:fs/promises'); attachment={filename:file.originalName,mimeType:file.mimeType,content:await readFile(file.filePath)};}}catch(error){await this.setStatus(row.id,'WAITING_ARTIFACT',error instanceof Error?error.message:'Documento no disponible');return;}
-    await this.dataSource.query(`UPDATE inspection_document_deliveries SET attempts=attempts+1,last_attempt_at=CURRENT_TIMESTAMP,status='PENDING',last_error=NULL,updated_at=CURRENT_TIMESTAMP WHERE id=$1`,[row.id]); try{ const label=row.documentKind==='ACT_PDF'?`Acta ${row.actCode}`:`Informe ${row.reportCode??''}`; const sent=await this.smtp.send({to:row.recipientEmail,subject:`DH Inspección · ${label}`,text:row.documentKind==='ACT_PDF'?`Se adjunta el acta cerrada e inmutable ${row.actCode}.`:`Se adjunta el informe Word automático ${row.reportCode??''} para revisión del Director de Hidrocarburos.`,attachment}); await this.dataSource.query(`UPDATE inspection_document_deliveries SET status='SENT',sent_at=CURRENT_TIMESTAMP,provider_message_id=$2,last_error=NULL,updated_at=CURRENT_TIMESTAMP WHERE id=$1`,[row.id,sent.messageId]); await this.audit.record({action:AuditAction.DOCUMENT_DELIVERY_SENT,entityType:'inspection_document_delivery',entityId:row.id,source:AuditSource.SYSTEM,actorUserId:null,actorUsername:null,requestId:null,ip:null,userAgent:null,beforeData:null,afterData:{recipientKind:row.recipientKind,documentKind:row.documentKind,status:'SENT'},metadata:{actId:row.actId,reportId:row.reportId}}); }catch(error){await this.setStatus(row.id,'FAILED',error instanceof Error?error.message:'Error de entrega');}
+
+  async updateSettings(
+    dto: UpdateDocumentDeliverySettingsDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    const before = await this.settings();
+    await this.dataSource.query(`
+      UPDATE institutional_delivery_settings
+      SET office_email=$1,director_email=$2,updated_by=$3,updated_at=CURRENT_TIMESTAMP
+      WHERE id=1
+    `, [dto.officeEmail ?? null, dto.directorEmail ?? null, principal.userId]);
+    const after = await this.settings();
+    await this.audit.record({
+      ...administrationAuditContext(principal, request),
+      action: AuditAction.DOCUMENT_DELIVERY_SETTINGS_UPDATED,
+      entityType: 'institutional_delivery_settings',
+      entityId: '1',
+      beforeData: before,
+      afterData: after,
+    });
+    return after;
+  }
+
+  async list() {
+    const data = await this.dataSource.query(`
+      SELECT
+        d.id,
+        d.act_id AS "actId",
+        d.report_id AS "reportId",
+        d.document_kind AS "documentKind",
+        d.recipient_kind AS "recipientKind",
+        d.recipient_asset_id AS "recipientAssetId",
+        d.recipient_user_id AS "recipientUserId",
+        d.recipient_email AS "recipientEmail",
+        d.status,
+        d.attempts,
+        d.last_attempt_at AS "lastAttemptAt",
+        d.sent_at AS "sentAt",
+        d.provider_message_id AS "providerMessageId",
+        d.last_error AS "lastError",
+        d.created_at AS "createdAt",
+        a.code AS "actCode",
+        r.code AS "reportCode",
+        recipient.name AS "recipientAssetName",
+        CASE
+          WHEN recipient_user.id IS NULL THEN NULL
+          ELSE btrim(concat_ws(' ', recipient_user.first_name, recipient_user.last_name))
+        END AS "recipientUserName"
+      FROM inspection_document_deliveries d
+      JOIN inspection_acts a ON a.id=d.act_id
+      LEFT JOIN inspection_reports r ON r.id=d.report_id
+      LEFT JOIN assets recipient ON recipient.id=d.recipient_asset_id
+      LEFT JOIN users recipient_user ON recipient_user.id=d.recipient_user_id
+      ORDER BY d.created_at DESC
+      LIMIT 200
+    `);
+    return { data };
+  }
+
+  async dispatchForAct(actId: string): Promise<void> {
+    await this.pdf.ensure(actId).catch(() => undefined);
+    const [report] = await this.dataSource.query(
+      `SELECT id FROM inspection_reports WHERE act_id=$1`,
+      [actId],
+    ) as Array<{ id: string }>;
+    if (report) await this.word.ensure(report.id);
+    await this.ensureRows(actId, report?.id ?? null);
+    const rows = await this.rowsForAct(actId);
+    for (const row of rows) await this.attempt(row).catch(() => undefined);
+  }
+
+  async retry(
+    id: string,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ): Promise<DeliveryRow> {
+    const row = await this.load(id);
+    await this.audit.record({
+      ...administrationAuditContext(principal, request),
+      action: AuditAction.DOCUMENT_DELIVERY_RETRY_REQUESTED,
+      entityType: 'inspection_document_delivery',
+      entityId: id,
+      metadata: {
+        actId: row.actId,
+        documentKind: row.documentKind,
+        recipientKind: row.recipientKind,
+        recipientUserId: row.recipientUserId,
+      },
+    });
+    await this.refreshRecipient(row);
+    await this.attempt(await this.load(id));
+    return this.load(id);
+  }
+
+  async retryPending(principal: AuthPrincipal, request: RequestWithContext) {
+    const rows = await this.dataSource.query(`
+      SELECT id
+      FROM inspection_document_deliveries
+      WHERE status<>'SENT'
+      ORDER BY created_at ASC
+      LIMIT 100
+    `) as Array<{ id: string }>;
+    for (const item of rows) await this.retry(item.id, principal, request).catch(() => undefined);
+    return { processed: rows.length };
+  }
+
+  private async ensureRows(actId: string, reportId: string | null) {
+    const [settings] = await this.dataSource.query(`
+      SELECT office_email AS "officeEmail",director_email AS "directorEmail"
+      FROM institutional_delivery_settings
+      WHERE id=1
+    `) as Array<{ officeEmail: string | null; directorEmail: string | null }>;
+
+    const companies = await this.dataSource.query(`
+      SELECT DISTINCT company.id,profile.notification_email AS email
+      FROM inspection_act_assets link
+      JOIN assets asset ON asset.id=link.asset_id
+      JOIN asset_types asset_type ON asset_type.id=asset.asset_type_id
+      JOIN assets company ON company.id=COALESCE(
+        asset.operator_company_id,
+        CASE WHEN asset_type.operational_role='COMPANY' THEN asset.id END
+      )
+      LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
+      WHERE link.act_id=$1 AND link.included=true
+    `, [actId]) as Array<{ id: string; email: string | null }>;
+
+    const [inspector] = await this.dataSource.query(`
+      SELECT
+        inspector.id,
+        inspector.email
+      FROM inspection_acts act
+      JOIN inspection_visits visit ON visit.id=act.visit_id
+      JOIN users inspector ON inspector.id=visit.lead_inspector_user_id
+      WHERE act.id=$1
+    `, [actId]) as Array<{ id: string; email: string | null }>;
+
+    for (const company of companies) {
+      await this.upsertRow({
+        actId,
+        reportId,
+        documentKind: 'ACT_PDF',
+        recipientKind: 'COMPANY',
+        recipientAssetId: company.id,
+        recipientUserId: null,
+        recipientKey: company.id,
+        recipientEmail: company.email,
+      });
+    }
+
+    await this.upsertRow({
+      actId,
+      reportId,
+      documentKind: 'ACT_PDF',
+      recipientKind: 'OFFICE',
+      recipientAssetId: null,
+      recipientUserId: null,
+      recipientKey: '00000000-0000-0000-0000-000000000000',
+      recipientEmail: settings?.officeEmail ?? null,
+    });
+
+    if (inspector) {
+      await this.upsertRow({
+        actId,
+        reportId,
+        documentKind: 'ACT_PDF',
+        recipientKind: 'INSPECTOR',
+        recipientAssetId: null,
+        recipientUserId: inspector.id,
+        recipientKey: inspector.id,
+        recipientEmail: inspector.email,
+      });
+    }
+
+    if (reportId) {
+      await this.upsertRow({
+        actId,
+        reportId,
+        documentKind: 'REPORT_WORD',
+        recipientKind: 'DIRECTOR',
+        recipientAssetId: null,
+        recipientUserId: null,
+        recipientKey: '00000000-0000-0000-0000-000000000000',
+        recipientEmail: settings?.directorEmail ?? null,
+      });
+    }
+  }
+
+  private async upsertRow(input: {
+    actId: string;
+    reportId: string | null;
+    documentKind: 'ACT_PDF' | 'REPORT_WORD';
+    recipientKind: DeliveryRecipientKind;
+    recipientAssetId: string | null;
+    recipientUserId: string | null;
+    recipientKey: string;
+    recipientEmail: string | null;
+  }) {
+    const initialStatus = input.recipientEmail ? 'PENDING' : 'WAITING_RECIPIENT';
+    await this.dataSource.query(`
+      INSERT INTO inspection_document_deliveries (
+        act_id,report_id,document_kind,recipient_kind,
+        recipient_asset_id,recipient_user_id,recipient_key,recipient_email,status
+      ) VALUES ($1,$2,$3,$4,$5,$6,$7::uuid,$8,$9)
+      ON CONFLICT (act_id,document_kind,recipient_kind,recipient_key) DO UPDATE SET
+        report_id=COALESCE(EXCLUDED.report_id,inspection_document_deliveries.report_id),
+        recipient_asset_id=COALESCE(EXCLUDED.recipient_asset_id,inspection_document_deliveries.recipient_asset_id),
+        recipient_user_id=COALESCE(EXCLUDED.recipient_user_id,inspection_document_deliveries.recipient_user_id),
+        recipient_email=CASE
+          WHEN inspection_document_deliveries.status='SENT' THEN inspection_document_deliveries.recipient_email
+          ELSE EXCLUDED.recipient_email
+        END,
+        status=CASE
+          WHEN inspection_document_deliveries.status='SENT' THEN 'SENT'
+          WHEN EXCLUDED.recipient_email IS NULL THEN 'WAITING_RECIPIENT'
+          ELSE inspection_document_deliveries.status
+        END,
+        updated_at=CURRENT_TIMESTAMP
+    `, [
+      input.actId,
+      input.reportId,
+      input.documentKind,
+      input.recipientKind,
+      input.recipientAssetId,
+      input.recipientUserId,
+      input.recipientKey,
+      input.recipientEmail,
+      initialStatus,
+    ]);
+  }
+
+  private async rowsForAct(actId: string): Promise<DeliveryRow[]> {
+    return this.dataSource.query(`
+      SELECT
+        d.id,d.act_id AS "actId",d.report_id AS "reportId",
+        d.document_kind AS "documentKind",d.recipient_kind AS "recipientKind",
+        d.recipient_asset_id AS "recipientAssetId",d.recipient_user_id AS "recipientUserId",
+        d.recipient_email AS "recipientEmail",d.status,d.attempts,
+        a.code AS "actCode",r.code AS "reportCode"
+      FROM inspection_document_deliveries d
+      JOIN inspection_acts a ON a.id=d.act_id
+      LEFT JOIN inspection_reports r ON r.id=d.report_id
+      WHERE d.act_id=$1
+      ORDER BY d.created_at
+    `, [actId]) as Promise<DeliveryRow[]>;
+  }
+
+  private async load(id: string): Promise<DeliveryRow> {
+    const [row] = await this.dataSource.query(`
+      SELECT
+        d.id,d.act_id AS "actId",d.report_id AS "reportId",
+        d.document_kind AS "documentKind",d.recipient_kind AS "recipientKind",
+        d.recipient_asset_id AS "recipientAssetId",d.recipient_user_id AS "recipientUserId",
+        d.recipient_email AS "recipientEmail",d.status,d.attempts,
+        a.code AS "actCode",r.code AS "reportCode"
+      FROM inspection_document_deliveries d
+      JOIN inspection_acts a ON a.id=d.act_id
+      LEFT JOIN inspection_reports r ON r.id=d.report_id
+      WHERE d.id=$1
+    `, [id]) as DeliveryRow[];
+    if (!row) {
+      throw new NotFoundException({
+        code: 'DOCUMENT_DELIVERY_NOT_FOUND',
+        message: 'Entrega documental no encontrada',
+      });
+    }
+    return row;
+  }
+
+  private async refreshRecipient(row: DeliveryRow) {
+    let email: string | null = null;
+    if (row.recipientKind === 'COMPANY' && row.recipientAssetId) {
+      const [company] = await this.dataSource.query(`
+        SELECT notification_email AS email
+        FROM organization_profiles
+        WHERE asset_id=$1
+      `, [row.recipientAssetId]) as Array<{ email: string | null }>;
+      email = company?.email ?? null;
+    } else if (row.recipientKind === 'INSPECTOR' && row.recipientUserId) {
+      const [inspector] = await this.dataSource.query(`
+        SELECT email
+        FROM users
+        WHERE id=$1 AND is_active=true
+      `, [row.recipientUserId]) as Array<{ email: string | null }>;
+      email = inspector?.email ?? null;
+    } else {
+      const [settings] = await this.dataSource.query(`
+        SELECT office_email AS "officeEmail",director_email AS "directorEmail"
+        FROM institutional_delivery_settings
+        WHERE id=1
+      `) as Array<{ officeEmail: string | null; directorEmail: string | null }>;
+      email = row.recipientKind === 'OFFICE'
+        ? settings?.officeEmail ?? null
+        : settings?.directorEmail ?? null;
+    }
+
+    await this.dataSource.query(`
+      UPDATE inspection_document_deliveries
+      SET recipient_email=$2,
+          status=CASE WHEN $2::text IS NULL THEN 'WAITING_RECIPIENT' ELSE 'PENDING' END,
+          last_error=NULL,
+          updated_at=CURRENT_TIMESTAMP
+      WHERE id=$1 AND status<>'SENT'
+    `, [row.id, email]);
+  }
+
+  private async attempt(row: DeliveryRow) {
+    if (row.status === 'SENT') return;
+    if (!row.recipientEmail) {
+      await this.setStatus(row.id, 'WAITING_RECIPIENT', 'Destinatario no configurado');
+      return;
+    }
+    if (!this.smtp.configured()) {
+      await this.setStatus(row.id, 'WAITING_TRANSPORT', 'SMTP no configurado');
+      return;
+    }
+
+    let attachment: { filename: string; mimeType: string; content: Buffer };
+    try {
+      if (row.documentKind === 'ACT_PDF') {
+        await this.pdf.ensure(row.actId);
+        const file = await this.pdf.content(row.actId);
+        attachment = {
+          filename: file.originalName,
+          mimeType: file.mimeType,
+          content: file.buffer,
+        };
+      } else {
+        if (!row.reportId) throw new Error('Informe no vinculado');
+        await this.word.ensure(row.reportId);
+        const file = await this.word.content(row.reportId);
+        const { readFile } = await import('node:fs/promises');
+        attachment = {
+          filename: file.originalName,
+          mimeType: file.mimeType,
+          content: await readFile(file.filePath),
+        };
+      }
+    } catch (error) {
+      await this.setStatus(
+        row.id,
+        'WAITING_ARTIFACT',
+        error instanceof Error ? error.message : 'Documento no disponible',
+      );
+      return;
+    }
+
+    await this.dataSource.query(`
+      UPDATE inspection_document_deliveries
+      SET attempts=attempts+1,last_attempt_at=CURRENT_TIMESTAMP,status='PENDING',
+          last_error=NULL,updated_at=CURRENT_TIMESTAMP
+      WHERE id=$1
+    `, [row.id]);
+
+    try {
+      const label = row.documentKind === 'ACT_PDF'
+        ? `Acta ${row.actCode}`
+        : `Informe ${row.reportCode ?? ''}`;
+      const text = row.documentKind === 'REPORT_WORD'
+        ? `Se adjunta el informe Word automático ${row.reportCode ?? ''} para revisión del Director de Hidrocarburos.`
+        : row.recipientKind === 'INSPECTOR'
+          ? `Se adjunta copia del acta cerrada e inmutable ${row.actCode} correspondiente a tu inspección.`
+          : `Se adjunta el acta cerrada e inmutable ${row.actCode}.`;
+      const sent = await this.smtp.send({
+        to: row.recipientEmail,
+        subject: `DH Inspección · ${label}`,
+        text,
+        attachment,
+      });
+      await this.dataSource.query(`
+        UPDATE inspection_document_deliveries
+        SET status='SENT',sent_at=CURRENT_TIMESTAMP,provider_message_id=$2,
+            last_error=NULL,updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1
+      `, [row.id, sent.messageId]);
+      await this.audit.record({
+        action: AuditAction.DOCUMENT_DELIVERY_SENT,
+        entityType: 'inspection_document_delivery',
+        entityId: row.id,
+        source: AuditSource.SYSTEM,
+        actorUserId: null,
+        actorUsername: null,
+        requestId: null,
+        ip: null,
+        userAgent: null,
+        beforeData: null,
+        afterData: {
+          recipientKind: row.recipientKind,
+          recipientUserId: row.recipientUserId,
+          documentKind: row.documentKind,
+          status: 'SENT',
+        },
+        metadata: { actId: row.actId, reportId: row.reportId },
+      });
+    } catch (error) {
+      await this.setStatus(
+        row.id,
+        'FAILED',
+        error instanceof Error ? error.message : 'Error de entrega',
+      );
+    }
+  }
+
+  private async setStatus(id: string, status: string, error: string) {
+    await this.dataSource.query(`
+      UPDATE inspection_document_deliveries
+      SET status=$2,last_error=$3,updated_at=CURRENT_TIMESTAMP
+      WHERE id=$1
+    `, [id, status, error.slice(0, 500)]);
  }
-  private async setStatus(id:string,status:string,error:string){await this.dataSource.query(`UPDATE inspection_document_deliveries SET status=$2,last_error=$3,updated_at=CURRENT_TIMESTAMP WHERE id=$1`,[id,status,error.slice(0,500)]);}
 }
@@ -0,0 +1,63 @@
+import { Transform, Type } from 'class-transformer';
+import {
+  IsInt,
+  IsOptional,
+  IsString,
+  IsUUID,
+  Matches,
+  Max,
+  MaxLength,
+  Min,
+  MinLength,
+  ValidateIf,
+} from 'class-validator';
+
+const optionalText = ({ value }: { value: unknown }) =>
+  typeof value === 'string' && value.trim() ? value.trim() : null;
+
+/**
+ * Hallazgo capturado desde la APK sobre un Inventario ya seleccionado.
+ * El assetId se toma de la URL para evitar inconsistencias entre pantalla y payload.
+ * `actId` queda opcional sólo para compatibilidad con Android 0.11.0; F3.2 siempre lo envía.
+ */
+export class CreateFieldFindingDto {
+  @IsOptional()
+  @IsUUID('4')
+  actId?: string;
+
+  @IsOptional()
+  @Transform(optionalText)
+  @IsUUID('4')
+  catalogItemId?: string | null;
+
+  @ValidateIf((value: CreateFieldFindingDto) => !value.catalogItemId)
+  @Transform(optionalText)
+  @IsString()
+  @MinLength(1)
+  @MaxLength(500)
+  customTitle?: string | null;
+
+  @IsOptional()
+  @Transform(optionalText)
+  @IsString()
+  @MaxLength(12000)
+  customLegalBasis?: string | null;
+
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
+  @IsString()
+  @MinLength(1)
+  @MaxLength(20000)
+  description!: string;
+
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  @Max(10)
+  severity?: number;
+
+  @IsOptional()
+  @Transform(optionalText)
+  @Matches(/^\d{4}-\d{2}-\d{2}$/)
+  correctionDueOn?: string | null;
+}
@@ -21,6 +21,10 @@ export class CreateFieldInventoryDto {
  @IsUUID('4')
  parentId?: string;

+  @IsOptional()
+  @IsUUID('4')
+  familyId?: string;
+
  @IsOptional()
  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim().toUpperCase() : undefined)
  @IsString()
@@ -0,0 +1,12 @@
+import { IsOptional, IsUUID } from 'class-validator';
+
+/**
+ * Selección explícita del Acta activa desde la APK.
+ * `actId` queda opcional sólo durante la transición desde Android 0.11.0;
+ * F3.2 móvil siempre lo informa.
+ */
+export class FieldFindingActQueryDto {
+  @IsOptional()
+  @IsUUID('4')
+  actId?: string;
+}
@@ -0,0 +1,220 @@
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+} from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AssetHistoryService } from '../asset-master/asset-history.service';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { AssetVersionChangeType, AuditAction } from '../database/entities';
+import type { CreateFieldInventoryDto } from './dto/create-field-inventory.dto';
+import { FieldInventoryService } from './field-inventory.service';
+
+type FamilyRow = {
+  id: string;
+  code: string;
+  name: string;
+  level: 'INSTALLATION' | 'SUBINSTALLATION';
+  informationLabels: string[];
+  sourceReference: string | null;
+  isOther: boolean;
+};
+
+type ParentRow = {
+  id: string;
+  typeCode: string;
+  inventoryFamilyId: string | null;
+};
+
+type FieldTypesBase = {
+  context: {
+    area: { id: string; code: string; name: string };
+    operatorCompany: { id: string; code: string; name: string };
+    inspection: { id: string; code: string; status: string };
+  };
+  parent: { id: string; code: string; name: string };
+  data: Array<Record<string, unknown> & { id: string; code: string; name: string }>;
+};
+
+const STRUCTURAL_CHILD: Record<string, string | undefined> = {
+  area: 'yacimiento',
+  yacimiento: 'instalacion',
+  instalacion: 'subinstalacion',
+};
+
+@Injectable()
+export class F3FieldInventoryStructureService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly fieldInventory: FieldInventoryService,
+    private readonly history: AssetHistoryService,
+    private readonly audit: AuditService,
+  ) {}
+
+  async types(
+    visitId: string,
+    parentId: string | undefined,
+    principal: AuthPrincipal,
+  ) {
+    const base = await this.fieldInventory.types(visitId, parentId, principal) as unknown as FieldTypesBase;
+    const effectiveParentId = parentId ?? base.context.area.id;
+    const parent = await this.parent(effectiveParentId);
+    const expectedTypeCode = STRUCTURAL_CHILD[parent.typeCode.toLowerCase()];
+    const data = expectedTypeCode
+      ? base.data.filter((type) => type.code.toLowerCase() === expectedTypeCode)
+      : [];
+    const families = await this.familiesFor(parent, expectedTypeCode);
+
+    return {
+      ...base,
+      data: data.map((type) => ({
+        ...type,
+        structuralKind: type.code.toUpperCase(),
+        families,
+        familyRequired: type.code.toLowerCase() === 'instalacion' || type.code.toLowerCase() === 'subinstalacion',
+      })),
+    };
+  }
+
+  async create(
+    visitId: string,
+    dto: CreateFieldInventoryDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    const options = await this.types(visitId, dto.parentId, principal);
+    const selectedType = options.data.find((type) => type.id === dto.typeId);
+    if (!selectedType) {
+      throw new BadRequestException({
+        code: 'FIELD_INVENTORY_STRUCTURE_TYPE_INVALID',
+        message: 'El tipo elegido no corresponde al siguiente nivel estructural permitido',
+      });
+    }
+
+    const typeCode = String(selectedType.code).toLowerCase();
+    const familyRequired = typeCode === 'instalacion' || typeCode === 'subinstalacion';
+    const families = (selectedType.families ?? []) as FamilyRow[];
+    if (familyRequired && !dto.familyId) {
+      throw new BadRequestException({
+        code: 'FIELD_INVENTORY_FAMILY_REQUIRED',
+        message: 'Elegí la familia técnica o la opción Otro / no catalogado',
+      });
+    }
+    if (!familyRequired && dto.familyId) {
+      throw new BadRequestException({
+        code: 'FIELD_INVENTORY_FAMILY_NOT_ALLOWED',
+        message: 'Este nivel estructural no utiliza familia técnica',
+      });
+    }
+    const family = dto.familyId
+      ? families.find((item) => item.id === dto.familyId)
+      : null;
+    if (dto.familyId && !family) {
+      throw new BadRequestException({
+        code: 'FIELD_INVENTORY_FAMILY_INVALID',
+        message: 'La familia técnica no es válida para el padre seleccionado',
+      });
+    }
+
+    const created = await this.fieldInventory.create(visitId, dto, principal, request) as {
+      asset: { id: string; code: string; name: string };
+      [key: string]: unknown;
+    };
+    if (!family) return created;
+
+    await this.dataSource.transaction(async (manager) => {
+      const [current] = await manager.query(`
+        SELECT inventory_family_id AS "inventoryFamilyId"
+        FROM assets WHERE id=$1::uuid FOR UPDATE
+      `, [created.asset.id]) as Array<{ inventoryFamilyId: string | null }>;
+      if (!current) throw new ConflictException({
+        code: 'FIELD_INVENTORY_CREATED_ASSET_MISSING',
+        message: 'No se pudo clasificar el Inventario recién creado',
+      });
+      if (current.inventoryFamilyId === family.id) return;
+
+      await manager.query(`
+        UPDATE assets
+        SET inventory_family_id=$2::uuid,updated_by=$3::uuid,updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1::uuid
+      `, [created.asset.id, family.id, principal.userId]);
+      const versionNumber = await this.history.capture(
+        manager,
+        created.asset.id,
+        AssetVersionChangeType.UPDATED,
+        principal,
+        request,
+      );
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: AuditAction.ASSET_UPDATED,
+        entityType: 'asset',
+        entityId: created.asset.id,
+        beforeData: { inventoryFamilyId: current.inventoryFamilyId },
+        afterData: {
+          inventoryFamilyId: family.id,
+          inventoryFamilyCode: family.code,
+          inventoryFamilyName: family.name,
+        },
+        metadata: {
+          operation: 'FIELD_INVENTORY_FAMILY_ASSIGNED',
+          visitId,
+          versionNumber,
+          isOtherFamily: family.isOther,
+        },
+      }, manager);
+    });
+
+    return this.fieldInventory.detail(visitId, created.asset.id, principal);
+  }
+
+  private async parent(parentId: string): Promise<ParentRow> {
+    const rows = await this.dataSource.query(`
+      SELECT asset.id,type.code AS "typeCode",asset.inventory_family_id AS "inventoryFamilyId"
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
+    `, [parentId]) as ParentRow[];
+    if (!rows[0]) throw new BadRequestException({
+      code: 'FIELD_INVENTORY_PARENT_NOT_AVAILABLE',
+      message: 'El padre estructural elegido no está disponible',
+    });
+    return rows[0];
+  }
+
+  private async familiesFor(parent: ParentRow, expectedTypeCode: string | undefined): Promise<FamilyRow[]> {
+    if (expectedTypeCode === 'instalacion') {
+      return this.dataSource.query(`
+        SELECT id,code,name,level,information_labels AS "informationLabels",
+          source_reference AS "sourceReference",
+          (source_reference LIKE 'SYSTEM:F3.1:OTHER%') AS "isOther"
+        FROM inventory_families
+        WHERE level='INSTALLATION' AND is_active=true
+        ORDER BY (source_reference LIKE 'SYSTEM:F3.1:OTHER%') ASC,name,code
+      `) as Promise<FamilyRow[]>;
+    }
+    if (expectedTypeCode === 'subinstalacion') {
+      if (!parent.inventoryFamilyId) {
+        throw new ConflictException({
+          code: 'FIELD_INVENTORY_PARENT_FAMILY_REQUIRED',
+          message: 'La Instalación debe tener una familia técnica antes de agregar Subinstalaciones',
+        });
+      }
+      return this.dataSource.query(`
+        SELECT family.id,family.code,family.name,family.level,
+          family.information_labels AS "informationLabels",
+          family.source_reference AS "sourceReference",
+          (family.source_reference LIKE 'SYSTEM:F3.1:OTHER%') AS "isOther"
+        FROM inventory_family_parent_rules rule
+        JOIN inventory_families family ON family.id=rule.child_family_id
+        WHERE rule.parent_family_id=$1::uuid
+          AND family.level='SUBINSTALLATION'
+          AND family.is_active=true
+        ORDER BY (family.source_reference LIKE 'SYSTEM:F3.1:OTHER%') ASC,family.name,family.code
+      `, [parent.inventoryFamilyId]) as Promise<FamilyRow[]>;
+    }
+    return [];
+  }
+}
@@ -0,0 +1,55 @@
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+  Query,
+  Req,
+} from '@nestjs/common';
+import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { CreateFieldFindingDto } from './dto/create-field-finding.dto';
+import { FieldFindingActQueryDto } from './dto/field-finding-act-query.dto';
+import { FieldFindingsService } from './field-findings.service';
+
+@Controller('inspection-visits/:visitId/field-findings')
+export class FieldFindingsController {
+  constructor(private readonly fieldFindings: FieldFindingsService) {}
+
+  @Get(':assetId/options')
+  @RequirePermissions('inspection_findings.create', 'inspections.execute')
+  options(
+    @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
+    @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
+    @Query() query: FieldFindingActQueryDto,
+    @CurrentAuth() principal: AuthPrincipal,
+  ): Promise<unknown> {
+    return this.fieldFindings.options(visitId, assetId, query.actId, principal);
+  }
+
+  @Get(':assetId')
+  @RequirePermissions('inspection_findings.read', 'inspections.execute')
+  list(
+    @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
+    @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
+    @Query() query: FieldFindingActQueryDto,
+    @CurrentAuth() principal: AuthPrincipal,
+  ): Promise<unknown> {
+    return this.fieldFindings.list(visitId, assetId, query.actId, principal);
+  }
+
+  @Post(':assetId')
+  @RequirePermissions('inspection_findings.create', 'inspections.execute')
+  create(
+    @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
+    @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
+    @Body() dto: CreateFieldFindingDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ): Promise<unknown> {
+    return this.fieldFindings.create(visitId, assetId, dto, principal, request);
+  }
+}
@@ -0,0 +1,352 @@
+import { BadRequestException, ConflictException, Injectable, NotFoundException } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import type { CreateInspectionFindingDto } from '../inspection-findings/dto/create-inspection-finding.dto';
+import { F3FindingCatalogResolverService } from '../inspection-findings/f3-finding-catalog-resolver.service';
+import { InspectionFindingsService } from '../inspection-findings/inspection-findings.service';
+import { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy';
+import type { CreateFieldFindingDto } from './dto/create-field-finding.dto';
+
+interface DraftActRow {
+  id: string;
+  code: string;
+  status: string;
+}
+
+interface FieldFindingGate {
+  context: {
+    inspection: { id: string; code: string; status: string };
+    area: { id: string; code: string; name: string };
+    operatorCompany: { id: string; code: string; name: string };
+  };
+  capture: {
+    captureRequired: boolean;
+    hasGeometry: boolean;
+    creationGpsCaptured: boolean;
+    fieldPhotoCount: number;
+    readyForFinding: boolean;
+  };
+}
+
+@Injectable()
+export class FieldFindingsService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly catalog: F3FindingCatalogResolverService,
+    private readonly findings: InspectionFindingsService,
+  ) {}
+
+  async options(
+    visitId: string,
+    assetId: string,
+    actId: string | undefined,
+    principal: AuthPrincipal,
+  ) {
+    const gate = await this.requireGate(visitId, assetId, principal);
+    const act = await this.requireDraftAct(visitId, actId);
+    const assetIncludedInAct = await this.actContainsAsset(act.id, assetId);
+    const [catalog, findings] = await Promise.all([
+      this.catalog.listApplicableForAsset(assetId, {}),
+      this.findings.listForAct(act.id),
+    ]);
+
+    return {
+      context: gate.context,
+      act,
+      capture: gate.capture,
+      assetIncludedInAct,
+      catalog,
+      findings: findings.data.filter((finding) => finding.assetId === assetId),
+      canAddAnother: assetIncludedInAct,
+      actSelectionMode: actId ? 'EXPLICIT' : 'LEGACY_SINGLE_DRAFT',
+    };
+  }
+
+  async list(
+    visitId: string,
+    assetId: string,
+    actId: string | undefined,
+    principal: AuthPrincipal,
+  ) {
+    const gate = await this.requireGate(visitId, assetId, principal);
+    const act = await this.requireDraftAct(visitId, actId);
+    const findings = await this.findings.listForAct(act.id);
+    return {
+      context: gate.context,
+      act,
+      capture: gate.capture,
+      assetIncludedInAct: await this.actContainsAsset(act.id, assetId),
+      data: findings.data.filter((finding) => finding.assetId === assetId),
+      actSelectionMode: actId ? 'EXPLICIT' : 'LEGACY_SINGLE_DRAFT',
+    };
+  }
+
+  async create(
+    visitId: string,
+    assetId: string,
+    dto: CreateFieldFindingDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    const gate = await this.requireGate(visitId, assetId, principal);
+    const act = await this.requireDraftAct(visitId, dto.actId);
+    if (!await this.actContainsAsset(act.id, assetId)) {
+      throw new ConflictException({
+        code: 'FIELD_FINDING_ASSET_NOT_IN_ACT',
+        message: 'Agregá este Inventario al Acta seleccionada antes de registrar el Hallazgo',
+        actId: act.id,
+        assetId,
+      });
+    }
+    const payload: CreateInspectionFindingDto = {
+      assetId,
+      catalogItemId: dto.catalogItemId ?? null,
+      customTitle: dto.customTitle ?? null,
+      customLegalBasis: dto.customLegalBasis ?? null,
+      description: dto.description,
+      severity: dto.severity,
+      correctionDueOn: dto.correctionDueOn ?? null,
+    };
+    const finding = await this.findings.create(act.id, payload, principal, request);
+    return {
+      context: gate.context,
+      act,
+      capture: gate.capture,
+      finding,
+      canAddAnother: true,
+      actSelectionMode: dto.actId ? 'EXPLICIT' : 'LEGACY_SINGLE_DRAFT',
+    };
+  }
+
+  private async requireGate(
+    visitId: string,
+    assetId: string,
+    principal: AuthPrincipal,
+  ): Promise<FieldFindingGate> {
+    assertMobileInspector(principal);
+    const [row] = await this.dataSource.query(`
+      SELECT
+        visit.id AS "visitId",
+        visit.code AS "visitCode",
+        visit.status AS "visitStatus",
+        visit.operational_area_id AS "areaId",
+        area.code AS "areaCode",
+        area.name AS "areaName",
+        visit.operator_company_id AS "companyId",
+        company.code AS "companyCode",
+        company.name AS "companyName",
+        asset.id AS "assetId",
+        asset_type.code AS "assetTypeCode",
+        asset.inventory_family_id AS "inventoryFamilyId",
+        asset.operational_area_id AS "assetAreaId",
+        asset.operator_company_id AS "assetCompanyId",
+        EXISTS (
+          SELECT 1
+          FROM inspection_visit_members member
+          WHERE member.visit_id = visit.id
+            AND member.user_id = $3::uuid
+            AND member.included = true
+        ) OR visit.lead_inspector_user_id = $3::uuid AS assigned,
+        EXISTS (
+          SELECT 1
+          FROM inspection_visit_assets link
+          WHERE link.visit_id = visit.id
+            AND link.asset_id = asset.id
+            AND link.included = true
+        ) AS selected,
+        EXISTS (
+          SELECT 1
+          FROM asset_field_discoveries discovery
+          WHERE discovery.visit_id = visit.id
+            AND discovery.asset_id = asset.id
+        ) AS "captureRequired",
+        EXISTS (
+          SELECT 1
+          FROM asset_geometries geometry
+          WHERE geometry.asset_id = asset.id
+        ) AS "hasGeometry",
+        EXISTS (
+          SELECT 1
+          FROM asset_field_capture_events event
+          WHERE event.visit_id = visit.id
+            AND event.asset_id = asset.id
+            AND event.event_type = 'CREATED'
+        ) AS "creationGpsCaptured",
+        (
+          SELECT COUNT(*)::integer
+          FROM asset_field_capture_events event
+          WHERE event.visit_id = visit.id
+            AND event.asset_id = asset.id
+            AND event.event_type = 'PHOTO'
+        ) AS "fieldPhotoCount"
+      FROM inspection_visits visit
+      LEFT JOIN assets area ON area.id = visit.operational_area_id
+      LEFT JOIN assets company ON company.id = visit.operator_company_id
+      LEFT JOIN assets asset ON asset.id = $2::uuid
+        AND asset.information_status <> 'INACTIVE'
+      LEFT JOIN asset_types asset_type ON asset_type.id=asset.asset_type_id
+      WHERE visit.id = $1::uuid
+    `, [visitId, assetId, principal.userId]) as Array<{
+      visitId: string;
+      visitCode: string;
+      visitStatus: string;
+      areaId: string | null;
+      areaCode: string | null;
+      areaName: string | null;
+      companyId: string | null;
+      companyCode: string | null;
+      companyName: string | null;
+      assetId: string | null;
+      assetTypeCode: string | null;
+      inventoryFamilyId: string | null;
+      assetAreaId: string | null;
+      assetCompanyId: string | null;
+      assigned: boolean;
+      selected: boolean;
+      captureRequired: boolean;
+      hasGeometry: boolean;
+      creationGpsCaptured: boolean;
+      fieldPhotoCount: number;
+    }>;
+
+    if (!row) {
+      throw new NotFoundException({ code: 'INSPECTION_VISIT_NOT_FOUND', message: 'Inspección no encontrada' });
+    }
+    if (row.visitStatus !== 'IN_PROGRESS') {
+      throw new ConflictException({
+        code: 'FIELD_FINDING_VISIT_NOT_IN_PROGRESS',
+        message: 'Los Hallazgos sólo pueden registrarse cuando la inspección está en curso',
+      });
+    }
+    if (!row.assigned) {
+      throw new ConflictException({
+        code: 'FIELD_FINDING_INSPECTOR_NOT_ASSIGNED',
+        message: 'El inspector no está asignado a esta inspección',
+      });
+    }
+    if (!row.areaId || !row.companyId || !row.areaCode || !row.areaName || !row.companyCode || !row.companyName) {
+      throw new ConflictException({
+        code: 'FIELD_FINDING_CONTEXT_REQUIRED',
+        message: 'La inspección no tiene Área y Operadora definidas',
+      });
+    }
+    if (!row.assetId) {
+      throw new NotFoundException({
+        code: 'FIELD_FINDING_INVENTORY_NOT_FOUND',
+        message: 'Registro de Inventario no encontrado',
+      });
+    }
+    if (!['instalacion', 'subinstalacion'].includes(String(row.assetTypeCode).toLowerCase())) {
+      throw new BadRequestException({
+        code: 'FIELD_FINDING_TECHNICAL_LEVEL_REQUIRED',
+        message: 'Los Hallazgos se registran sobre una Instalación o Subinstalación, no sobre Área/Yacimiento',
+      });
+    }
+    if (!row.inventoryFamilyId) {
+      throw new ConflictException({
+        code: 'FIELD_FINDING_FAMILY_REQUIRED',
+        message: 'La Instalación/Subinstalación debe tener una familia técnica u Otro antes de registrar Hallazgos',
+      });
+    }
+    if (row.assetAreaId !== row.areaId || row.assetCompanyId !== row.companyId) {
+      throw new BadRequestException({
+        code: 'FIELD_FINDING_INVENTORY_OUTSIDE_CONTEXT',
+        message: 'El Inventario no pertenece al Área y Operadora de esta inspección',
+      });
+    }
+    if (!row.selected) {
+      throw new ConflictException({
+        code: 'FIELD_FINDING_INVENTORY_NOT_SELECTED',
+        message: 'Seleccioná el Inventario dentro de la inspección antes de registrar un Hallazgo',
+      });
+    }
+
+    const captureRequired = Boolean(row.captureRequired);
+    const hasGeometry = Boolean(row.hasGeometry);
+    const creationGpsCaptured = Boolean(row.creationGpsCaptured);
+    const fieldPhotoCount = Number(row.fieldPhotoCount ?? 0);
+    const readyForFinding = !captureRequired || (
+      hasGeometry && creationGpsCaptured && fieldPhotoCount > 0
+    );
+    if (!readyForFinding) {
+      throw new ConflictException({
+        code: 'FIELD_FINDING_CAPTURE_REQUIRED',
+        message: 'Antes del Hallazgo, el Inventario creado en campo debe tener GPS y al menos una foto',
+        capture: { captureRequired, hasGeometry, creationGpsCaptured, fieldPhotoCount },
+      });
+    }
+
+    return {
+      context: {
+        inspection: { id: row.visitId, code: row.visitCode, status: row.visitStatus },
+        area: { id: row.areaId, code: row.areaCode, name: row.areaName },
+        operatorCompany: { id: row.companyId, code: row.companyCode, name: row.companyName },
+      },
+      capture: {
+        captureRequired,
+        hasGeometry,
+        creationGpsCaptured,
+        fieldPhotoCount,
+        readyForFinding,
+      },
+    };
+  }
+
+  private async actContainsAsset(actId: string, assetId: string): Promise<boolean> {
+    const [row] = await this.dataSource.query(`
+      SELECT EXISTS (
+        SELECT 1 FROM inspection_act_assets
+        WHERE act_id=$1::uuid AND asset_id=$2::uuid AND included=true
+      ) AS included
+    `, [actId, assetId]) as Array<{ included: boolean }>;
+    return Boolean(row?.included);
+  }
+
+  private async requireDraftAct(visitId: string, requestedActId?: string): Promise<DraftActRow> {
+    if (requestedActId) {
+      const [act] = await this.dataSource.query(`
+        SELECT id,code,status
+        FROM inspection_acts
+        WHERE id=$1::uuid AND visit_id=$2::uuid
+      `, [requestedActId, visitId]) as DraftActRow[];
+      if (!act) {
+        throw new NotFoundException({
+          code: 'FIELD_FINDING_ACT_NOT_FOUND',
+          message: 'El Acta seleccionada no pertenece a esta inspección',
+        });
+      }
+      if (act.status !== 'DRAFT') {
+        throw new ConflictException({
+          code: 'FIELD_FINDING_ACT_NOT_DRAFT',
+          message: 'Los Hallazgos nuevos sólo pueden agregarse a un Acta en borrador',
+          actId: act.id,
+          actStatus: act.status,
+        });
+      }
+      return act;
+    }
+
+    const rows = await this.dataSource.query(`
+      SELECT id, code, status
+      FROM inspection_acts
+      WHERE visit_id = $1::uuid
+        AND status = 'DRAFT'
+      ORDER BY created_at DESC, id DESC
+      LIMIT 2
+    `, [visitId]) as DraftActRow[];
+
+    if (rows.length === 0) {
+      throw new ConflictException({
+        code: 'FIELD_FINDING_DRAFT_ACT_REQUIRED',
+        message: 'La inspección no tiene un Acta borrador abierta para registrar Hallazgos',
+      });
+    }
+    if (rows.length > 1) {
+      throw new ConflictException({
+        code: 'FIELD_FINDING_MULTIPLE_DRAFT_ACTS',
+        message: 'La inspección tiene más de un Acta borrador. Debe resolverse antes de continuar',
+      });
+    }
+    return rows[0];
+  }
+}
@@ -18,11 +18,15 @@ import type { AuthPrincipal, RequestWithContext } from '../common/http/request-c
 import { CreateFieldInventoryDto } from './dto/create-field-inventory.dto';
 import { ListFieldInventoryQueryDto } from './dto/list-field-inventory-query.dto';
 import { UploadFieldInventoryPhotoDto } from './dto/upload-field-inventory-photo.dto';
+import { F3FieldInventoryStructureService } from './f3-field-inventory-structure.service';
 import { FieldInventoryService } from './field-inventory.service';

@Controller('inspection-visits/:visitId/field-inventory')
 export class FieldInventoryController {
-  constructor(private readonly fieldInventory: FieldInventoryService) {}
+  constructor(
+    private readonly fieldInventory: FieldInventoryService,
+    private readonly structure: F3FieldInventoryStructureService,
+  ) {}

  @Get()
  @RequirePermissions('assets.read', 'inspections.execute')
@@ -40,8 +44,8 @@ export class FieldInventoryController {
    @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
    @Query() query: ListFieldInventoryQueryDto,
    @CurrentAuth() principal: AuthPrincipal,
-  ) {
-    return this.fieldInventory.types(visitId, query.parentId, principal);
+  ): Promise<unknown> {
+    return this.structure.types(visitId, query.parentId, principal);
  }

  @Get(':assetId')
@@ -71,8 +75,8 @@ export class FieldInventoryController {
    @Body() dto: CreateFieldInventoryDto,
    @CurrentAuth() principal: AuthPrincipal,
    @Req() request: RequestWithContext,
-  ) {
-    return this.fieldInventory.create(visitId, dto, principal, request);
+  ): Promise<unknown> {
+    return this.structure.create(visitId, dto, principal, request);
  }

  @Post(':assetId/photos')
@@ -1,14 +1,23 @@
 import { Module } from '@nestjs/common';
 import { AssetMasterModule } from '../asset-master/asset-master.module';
 import { AuditModule } from '../audit/audit.module';
+import { InspectionFindingsModule } from '../inspection-findings/inspection-findings.module';
+import { F3FieldInventoryStructureService } from './f3-field-inventory-structure.service';
+import { FieldFindingsController } from './field-findings.controller';
+import { FieldFindingsService } from './field-findings.service';
 import { FieldInventoryController } from './field-inventory.controller';
 import { FieldInventoryService } from './field-inventory.service';
 import { InspectionVisitsController } from './inspection-visits.controller';
 import { InspectionVisitsService } from './inspection-visits.service';

@Module({
-  imports: [AuditModule, AssetMasterModule],
-  controllers: [InspectionVisitsController, FieldInventoryController],
-  providers: [InspectionVisitsService, FieldInventoryService],
+  imports: [AuditModule, AssetMasterModule, InspectionFindingsModule],
+  controllers: [InspectionVisitsController, FieldInventoryController, FieldFindingsController],
+  providers: [
+    InspectionVisitsService,
+    FieldInventoryService,
+    F3FieldInventoryStructureService,
+    FieldFindingsService,
+  ],
 })
 export class InspectionVisitsModule {}
@@ -1,2 +1,2 @@
-export const API_VERSION = '0.21.0-1';
-export const API_PHASE = 'F2.1';
+export const API_VERSION = '0.25.0-1';
+export const API_PHASE = 'F3.2';
@@ -0,0 +1,49 @@
+import assert from 'node:assert/strict';
+import { test } from 'node:test';
+import { loadF221ExcelSource } from '../src/reference-data/f2-2-1-excel-source';
+
+const source = loadF221ExcelSource();
+
+test('F2.2.1 preserves every normalized territorial source row', () => {
+  assert.equal(source.territory.length, 230);
+  assert.equal(new Set(source.territory.map((row) => row.field)).size, 220);
+  assert.equal(new Set(source.territory.map((row) => `${row.field.toLowerCase()}|${row.area.toLowerCase()}`)).size, 230);
+});
+
+test('F2.2.1 does not collapse repeated field names across different operational contexts', () => {
+  const byName = new Map<string, Set<string>>();
+  for (const row of source.territory) {
+    const key = row.field.toLowerCase();
+    const contexts = byName.get(key) ?? new Set<string>();
+    contexts.add(`${row.area}|${row.operator}`);
+    byName.set(key, contexts);
+  }
+  assert.ok([...byName.values()].some((contexts) => contexts.size > 1));
+});
+
+test('F2.2.1 keeps the APP matrix as configuration rather than physical inventory rows', () => {
+  assert.equal(source.types.length, 113);
+  assert.equal(source.parentPairs.length, 119);
+  assert.equal(source.attributes.length, 44);
+  assert.equal(source.idemRefs.length, 25);
+  assert.ok(source.types.some((entry) => entry.code === 'tanque'));
+  assert.ok(source.types.some((entry) => entry.code === 'bateria'));
+});
+
+test('F2.2.1 keeps IDEM as inheritance metadata, never as a catalog title', () => {
+  const directTitles = source.directFindings.flatMap((entry) => entry.titles);
+  assert.equal(directTitles.some((title) => /^idem\b/i.test(title.trim())), false);
+  assert.ok(source.idemRefs.some((entry) => entry.type === 'tanque'));
+});
+
+test('F2.2.1 imports the grouped Hallazgo catalog supplied in Hoja2', () => {
+  assert.equal(source.groups.length, 19);
+  assert.equal(source.groups.reduce((total, group) => total + group.items.length, 0), 171);
+  const tanks = source.groups.find((group) => group.name.trim().toUpperCase() === 'TANQUES');
+  assert.ok(tanks);
+  assert.ok(tanks.items.some((item) => /ESTADO DEL TANQUE/i.test(item.title)));
+});
+
+test('F2.2.1 preserves rows explicitly reporting no operator without fabricating an organization in source data', () => {
+  assert.ok(source.territory.some((row) => row.operator.toLowerCase().includes('sin empresa operadora')));
+});
@@ -0,0 +1,54 @@
+import 'reflect-metadata';
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { readFileSync } from 'node:fs';
+
+const migration = readFileSync(
+  'src/database/migrations/1789844600000-phase-f3-1-asset-chronological-merge.ts',
+  'utf8',
+);
+const service = readFileSync('src/asset-master/inventory-merge.service.ts', 'utf8');
+const controller = readFileSync('src/asset-master/inventory-merge.controller.ts', 'utf8');
+
+test('F3.1 registra cada fusión como evento append-only con snapshots', () => {
+  assert.match(migration, /CREATE TABLE asset_merges/);
+  assert.match(migration, /source_snapshot jsonb NOT NULL/);
+  assert.match(migration, /canonical_snapshot jsonb NOT NULL/);
+  assert.match(migration, /UNIQUE \(source_asset_id\)/);
+  assert.match(migration, /BEFORE UPDATE OR DELETE ON asset_merges/);
+  assert.match(migration, /append-only/);
+});
+
+test('F3.1 sólo permite fusionar Instalaciones o Subinstalaciones compatibles', () => {
+  assert.match(service, /MERGEABLE_TYPES = new Set\(\['instalacion', 'subinstalacion'\]\)/);
+  assert.match(service, /INVENTORY_MERGE_TYPE_INVALID/);
+  assert.match(service, /INVENTORY_MERGE_CONTEXT_MISMATCH/);
+  assert.match(service, /INVENTORY_MERGE_PARENT_MISMATCH/);
+  assert.match(service, /INVENTORY_MERGE_CHILD_FAMILY_CONFLICT/);
+});
+
+test('F3.1 preserva referencias históricas y sólo reubica hijos actuales', () => {
+  assert.match(service, /historyPolicy: 'HISTORICAL_REFERENCES_PRESERVED'/);
+  assert.match(service, /historicalReferencesRewritten: false/);
+  assert.doesNotMatch(service, /UPDATE\s+inspection_findings/i);
+  assert.doesNotMatch(service, /UPDATE\s+inspection_act_assets/i);
+  assert.doesNotMatch(service, /UPDATE\s+inspection_visit_assets/i);
+  assert.match(service, /Reparentado por fusión cronológica/);
+  assert.match(service, /AssetVersionChangeType\.UPDATED/);
+});
+
+test('F3.1 expone estado/merge en WEB y conciliación de alta nacida en la inspección para APK', () => {
+  assert.match(controller, /:id\/merge-status/);
+  assert.match(controller, /:id\/merge/);
+  assert.match(controller, /:assetId\/merge/);
+  assert.match(controller, /assets\.create/);
+  assert.match(controller, /inspections\.execute/);
+  assert.match(service, /FIELD_MERGE_SOURCE_MUST_BE_DISCOVERY/);
+  assert.match(service, /assertMobileInspector\(principal\)/);
+});
+
+test('F3.1 resuelve cadenas de merge hacia un canónico final y detecta ciclos', () => {
+  assert.match(service, /WITH RECURSIVE chain/);
+  assert.match(service, /INVENTORY_MERGE_CYCLE/);
+  assert.match(service, /aliasesFor/);
+});
@@ -0,0 +1,54 @@
+import 'reflect-metadata';
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { readFileSync } from 'node:fs';
+import {
+  F31_FINDING_GROUPS,
+  F31_INSTALLATION_FAMILIES,
+  F31_SUBINSTALLATION_FAMILIES,
+  F31_UNIVERSAL_FINDINGS,
+} from '../../src/reference-data/f3-1-inventory-excel';
+
+test('F3.1 conserva exactamente la estructura interpretada del Excel entregado', () => {
+  assert.equal(F31_FINDING_GROUPS.length, 19);
+  assert.equal(F31_INSTALLATION_FAMILIES.length, 14);
+  assert.equal(F31_SUBINSTALLATION_FAMILIES.length, 109);
+  assert.deepEqual(F31_UNIVERSAL_FINDINGS, [
+    'ORDEN Y LIMPIEZA',
+    'CARTELERIA PREVENTIVA / INFORMATIVA',
+    'EXTINTORES',
+  ]);
+});
+
+test('F3.1 mantiene cada Subinstalación ligada a una familia de Instalación válida', () => {
+  const installationCodes = new Set(F31_INSTALLATION_FAMILIES.map((item) => item.code));
+  for (const subinstallation of F31_SUBINSTALLATION_FAMILIES) {
+    assert.equal(installationCodes.has(subinstallation.parentCode), true, subinstallation.code);
+    assert.equal(subinstallation.level, 'SUBINSTALLATION');
+  }
+});
+
+test('F3.1 retira APP26 como catálogo activo sin borrar los Hallazgos históricos', () => {
+  const migration = readFileSync('src/database/migrations/1789844400000-phase-f3-1-inventory-structure-catalog.ts', 'utf8');
+  assert.match(migration, /UPDATE finding_categories SET is_active=false/);
+  assert.match(migration, /lower\(code\)='app26'/);
+  assert.match(migration, /APP26R2/);
+  assert.doesNotMatch(migration, /DELETE FROM finding_catalog_items/);
+  assert.doesNotMatch(migration, /DELETE FROM inspection_findings/);
+});
+
+test('F3.1 materializa familia técnica separada del tipo estructural', () => {
+  const migration = readFileSync('src/database/migrations/1789844400000-phase-f3-1-inventory-structure-catalog.ts', 'utf8');
+  assert.match(migration, /CREATE TABLE inventory_families/);
+  assert.match(migration, /ADD COLUMN inventory_family_id uuid/);
+  assert.match(migration, /finding_catalog_item_inventory_families/);
+  assert.match(migration, /'subinstalacion','Subinstalación'/);
+});
+
+test('F3.1 fuerza Área → Yacimiento → Instalación → Subinstalación en servidor', () => {
+  const service = readFileSync('src/asset-master/inventory-structure.service.ts', 'utf8');
+  assert.match(service, /YACIMIENTO: 'area'/);
+  assert.match(service, /INSTALACION: 'yacimiento'/);
+  assert.match(service, /SUBINSTALACION: 'instalacion'/);
+  assert.match(service, /INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID/);
+});
@@ -0,0 +1,51 @@
+import 'reflect-metadata';
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { readFileSync } from 'node:fs';
+
+const userMigration = readFileSync(
+  'src/database/migrations/1789844700000-phase-f3-1-user-profile.ts',
+  'utf8',
+);
+const usersService = readFileSync('src/administration/users/users.service.ts', 'utf8');
+const dossier = readFileSync('src/asset-master/merged-inventory-dossier.service.ts', 'utf8');
+const otherMigration = readFileSync(
+  'src/database/migrations/1789844800000-phase-f3-1-other-inventory-families.ts',
+  'utf8',
+);
+
+test('F3.1 amplía el perfil personal y protege email del Inspector también en DB', () => {
+  assert.match(userMigration, /ADD COLUMN dni/);
+  assert.match(userMigration, /ADD COLUMN phone/);
+  assert.match(userMigration, /ADD COLUMN job_title/);
+  assert.match(userMigration, /ADD COLUMN employee_number/);
+  assert.match(userMigration, /uq_users_dni_not_null/);
+  assert.match(userMigration, /INSPECTOR_EMAIL_REQUIRED/);
+  assert.match(userMigration, /trg_user_roles_inspector_email/);
+  assert.match(userMigration, /trg_users_inspector_email/);
+});
+
+test('F3.1 exige email al crear o asignar el rol Inspector', () => {
+  assert.match(usersService, /assertInspectorHasEmail\(roles, dto\.email/);
+  assert.match(usersService, /assertInspectorHasEmail\(roles, before\.email\)/);
+  assert.match(usersService, /Los usuarios con rol Inspector deben tener un email válido/);
+  assert.match(usersService, /dto\.email !== undefined && !dto\.email && before\.roles\.some/);
+});
+
+test('F3.1 dossier canónico agrega alias sin borrar identidad histórica', () => {
+  assert.match(dossier, /inventoryIds = \[canonical\.id, \.\.\.aliases\.map/);
+  assert.match(dossier, /Promise\.all\(inventoryIds\.map/);
+  assert.match(dossier, /historicalInventory/);
+  assert.match(dossier, /kind: 'MERGE'/);
+  assert.match(dossier, /CHRONOLOGICAL_AGGREGATION_WITH_ORIGINAL_IDENTITY/);
+  assert.match(dossier, /requestedWasMerged/);
+});
+
+test('F3.1 crea familias Otro válidas y asociadas a controles universales', () => {
+  assert.match(otherMigration, /F31-INST-OTRO/);
+  assert.match(otherMigration, /Otro \/ no catalogado/);
+  assert.match(otherMigration, /SUBINSTALLATION/);
+  assert.match(otherMigration, /inventory_family_parent_rules/);
+  assert.match(otherMigration, /F31_UNIVERSAL_FINDINGS/);
+  assert.match(otherMigration, /finding_catalog_item_inventory_families/);
+});
@@ -0,0 +1,42 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import test from 'node:test';
+
+const read = (path: string) => readFileSync(path, 'utf8');
+
+test('F3.2 mantiene múltiples Actas con un solo borrador simultáneo por inspección', () => {
+  const migration = read('src/database/migrations/1789495200000-phase-f1-1-multi-act-inspections.ts');
+  assert.match(migration, /DROP CONSTRAINT IF EXISTS uq_inspection_acts_visit/);
+  assert.match(migration, /CREATE UNIQUE INDEX uq_inspection_acts_one_draft_per_visit/);
+  assert.match(migration, /WHERE status = 'DRAFT'/);
+});
+
+test('F3.2 permite seleccionar el Acta explícitamente al trabajar Hallazgos desde la APK', () => {
+  const controller = read('src/inspection-visits/field-findings.controller.ts');
+  const service = read('src/inspection-visits/field-findings.service.ts');
+  const dto = read('src/inspection-visits/dto/create-field-finding.dto.ts');
+  assert.match(controller, /FieldFindingActQueryDto/);
+  assert.match(controller, /query\.actId/);
+  assert.match(dto, /actId\?: string/);
+  assert.match(service, /actSelectionMode: actId \? 'EXPLICIT' : 'LEGACY_SINGLE_DRAFT'/);
+  assert.match(service, /WHERE id=\$1::uuid AND visit_id=\$2::uuid/);
+  assert.match(service, /FIELD_FINDING_ACT_NOT_DRAFT/);
+  assert.match(service, /FIELD_FINDING_ASSET_NOT_IN_ACT/);
+});
+
+test('F3.2 conserva el cierre documental inmutable de cada Acta', () => {
+  const closing = read('src/inspection-closing/inspection-closing.service.ts');
+  assert.match(closing, /INSPECTION_ACT_INSPECTOR_SIGNATURE_REQUIRED/);
+  assert.match(closing, /INSPECTION_ACT_COMPANY_OUTCOME_REQUIRED/);
+  assert.match(closing, /finalSha256 = sha256CanonicalJson\(finalSnapshot\)/);
+  assert.match(closing, /status = 'CLOSED'/);
+  assert.match(closing, /ensureFrozenReport/);
+  assert.match(closing, /ensureWordForAct/);
+});
+
+test('F3.2 cierra la inspección sólo cuando no quedan borradores ni Actas sin firma de inspector', () => {
+  const visits = read('src/inspection-visits/inspection-visits.service.ts');
+  assert.match(visits, /INSPECTION_VISIT_DRAFT_ACTS_PENDING/);
+  assert.match(visits, /INSPECTION_VISIT_INSPECTOR_SIGNATURE_PENDING/);
+  assert.match(visits, /actsMayCompleteCompanySignatureLater: true/);
+});
@@ -0,0 +1,67 @@
+import 'reflect-metadata';
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { readFileSync } from 'node:fs';
+import { plainToInstance } from 'class-transformer';
+import { validate } from 'class-validator';
+import { REQUIRED_PERMISSIONS_KEY } from '../../src/authorization/decorators/require-permissions.decorator';
+import { CreateFieldFindingDto } from '../../src/inspection-visits/dto/create-field-finding.dto';
+import { FieldFindingsController } from '../../src/inspection-visits/field-findings.controller';
+
+function permissions(method: string): string[] {
+  const controller = FieldFindingsController.prototype;
+  const handler = controller[method as keyof typeof controller];
+  return Reflect.getMetadata(REQUIRED_PERMISSIONS_KEY, handler) as string[];
+}
+
+test('F2.3 mantiene los Hallazgos de campo bajo ejecución móvil y permisos explícitos', () => {
+  assert.deepEqual(permissions('options'), ['inspection_findings.create', 'inspections.execute']);
+  assert.deepEqual(permissions('list'), ['inspection_findings.read', 'inspections.execute']);
+  assert.deepEqual(permissions('create'), ['inspection_findings.create', 'inspections.execute']);
+});
+
+test('F2.3 exige descripción y título cuando el inspector usa OTROS', async () => {
+  const dto = plainToInstance(CreateFieldFindingDto, {
+    description: '',
+    catalogItemId: null,
+    customTitle: '',
+  });
+  const errors = await validate(dto);
+  const properties = new Set(errors.map((error) => error.property));
+  assert.equal(properties.has('description'), true);
+  assert.equal(properties.has('customTitle'), true);
+});
+
+test('F2.3 vuelve a validar contexto, selección y GPS+foto en servidor antes del Hallazgo', () => {
+  const source = readFileSync('src/inspection-visits/field-findings.service.ts', 'utf8');
+  assert.match(source, /assertMobileInspector\(principal\)/);
+  assert.match(source, /row\.visitStatus !== 'IN_PROGRESS'/);
+  assert.match(source, /FIELD_FINDING_INSPECTOR_NOT_ASSIGNED/);
+  assert.match(source, /FIELD_FINDING_INVENTORY_OUTSIDE_CONTEXT/);
+  assert.match(source, /FIELD_FINDING_INVENTORY_NOT_SELECTED/);
+  assert.match(source, /hasGeometry && creationGpsCaptured && fieldPhotoCount > 0/);
+  assert.match(source, /FIELD_FINDING_CAPTURE_REQUIRED/);
+});
+
+test('F2.3 resuelve exactamente el Acta DRAFT actual y no vuelve a la regla de un Acta por inspección', () => {
+  const source = readFileSync('src/inspection-visits/field-findings.service.ts', 'utf8');
+  assert.match(source, /FROM inspection_acts/);
+  assert.match(source, /status = 'DRAFT'/);
+  assert.match(source, /LIMIT 2/);
+  assert.match(source, /FIELD_FINDING_DRAFT_ACT_REQUIRED/);
+  assert.match(source, /FIELD_FINDING_MULTIPLE_DRAFT_ACTS/);
+});
+
+test('F2.3 reutiliza catálogo contextual y creación canónica, conserva OTROS y permite varios Hallazgos', () => {
+  const fieldSource = readFileSync('src/inspection-visits/field-findings.service.ts', 'utf8');
+  const catalogSource = readFileSync('src/inspection-findings/finding-catalog.service.ts', 'utf8');
+  const findingSource = readFileSync('src/inspection-findings/inspection-findings.service.ts', 'utf8');
+
+  assert.match(fieldSource, /this\.catalog\.listApplicableForAsset\(assetId, \{\}\)/);
+  assert.match(fieldSource, /this\.findings\.create\(act\.id, payload, principal, request\)/);
+  assert.match(fieldSource, /canAddAnother: true/);
+  assert.match(catalogSource, /code: 'OTHER'/);
+  assert.match(catalogSource, /label: 'OTROS'/);
+  assert.match(findingSource, /finding_catalog_proposals/);
+  assert.match(findingSource, /PENDING/);
+});
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+LAYOUT="$ROOT/web-v2/src/layout/AppLayout.tsx"
+APP="$ROOT/web-v2/src/app/App.tsx"
+PAGE="$ROOT/web-v2/src/pages/InventoryCreatePage.tsx"
+
+for file in "$LAYOUT" "$APP" "$PAGE"; do
+  test -f "$file" || {
+    echo "F3.1 WEB contract: falta $file"
+    exit 1
+  }
+done
+
+if grep -Fq "label: 'Relevamientos'" "$LAYOUT"; then
+  echo "F3.1 WEB contract: Relevamientos no debe volver al menú principal"
+  exit 1
+fi
+
+grep -Fq 'path="/relevamiento/*"' "$APP"
+grep -Fq 'Navigate to="/inventarios" replace' "$APP"
+grep -Fq 'path="/inventarios/nuevo"' "$APP"
+grep -Fq 'InventoryCreatePage' "$APP"
+
+for kind in AREA YACIMIENTO INSTALACION SUBINSTALACION; do
+  grep -Fq "kind: '$kind'" "$PAGE"
+done
+
+if grep -Fq "kind: 'EQUIPO'" "$PAGE"; then
+  echo "F3.1 WEB contract: el alta guiada no debe restaurar EQUIPO como quinto nivel estructural"
+  exit 1
+fi
+
+grep -Fq 'getInventoryFamilyFindings' "$PAGE"
+
+echo 'F3.1 WEB contract: OK'
@@ -14,13 +14,11 @@ import { UserDetailPage } from '../pages/UserDetailPage';
 import { UsersPage } from '../pages/UsersPage';
 import { AssetsPage } from '../pages/AssetsPage';
 import { AssetEditorPage } from '../pages/AssetEditorPage';
+import { InventoryCreatePage } from '../pages/InventoryCreatePage';
 import { FieldDiscoveriesPage } from '../pages/FieldDiscoveriesPage';
 import { AssetTypesPage } from '../pages/AssetTypesPage';
 import { HistoryPage } from '../pages/HistoryPage';
 import { TemporalAssetsPage } from '../pages/TemporalAssetsPage';
-import { SurveyCampaignsPage } from '../pages/SurveyCampaignsPage';
-import { SurveyCampaignEditorPage } from '../pages/SurveyCampaignEditorPage';
-import { SurveyExecutionPage } from '../pages/SurveyExecutionPage';
 import { InspectionVisitsPage } from '../pages/InspectionVisitsPage';
 import { InspectionVisitEditorPage } from '../pages/InspectionVisitEditorPage';
 import { InspectionActEditorPage } from '../pages/InspectionActEditorPage';
@@ -37,8 +35,8 @@ import { ActAdministrationDetailPage } from '../pages/ActAdministrationDetailPag
 import { FieldBriefingsPage } from '../pages/FieldBriefingsPage';

 const MapPage = lazy(() => import('../pages/MapPage').then((module) => ({ default: module.MapPage })));
-
 const DocumentDeliveryPage = lazy(() => import('../pages/DocumentDeliveryPage').then((module) => ({ default: module.DocumentDeliveryPage })));
+
 export function App() {
  return <Suspense fallback={<div className="loading-block"><span className="spinner" />Cargando módulo…</div>}><Routes>
    <Route path="/login" element={<LoginPage />} />
@@ -55,14 +53,10 @@ export function App() {
        </Route>
        <Route element={<PermissionRoute permission="assets.change_status" />}><Route path="/inventarios/revision-campo" element={<FieldDiscoveriesPage />} /></Route>
        <Route element={<PermissionRoute permission="asset_imports.read" />}><Route path="/importaciones" element={<AssetImportsPage />} /></Route>
-        <Route element={<PermissionRoute permission="assets.create" />}><Route path="/inventarios/nuevo" element={<AssetEditorPage />} /><Route path="/activos/nuevo" element={<Navigate to="/inventarios/nuevo" replace />} /></Route>
+        <Route element={<PermissionRoute permission="assets.create" />}><Route path="/inventarios/nuevo" element={<InventoryCreatePage />} /><Route path="/activos/nuevo" element={<Navigate to="/inventarios/nuevo" replace />} /></Route>
        <Route path="/planificacion" element={<Navigate to="/inspecciones?status=PLANNED" replace />} />
-        <Route element={<PermissionRoute permission="surveys.read" />}>
-          <Route path="/relevamiento" element={<SurveyCampaignsPage />} />
-          <Route path="/relevamiento/:id" element={<SurveyCampaignEditorPage />} />
-        </Route>
-        <Route element={<PermissionRoute permission="surveys.read_reports" />}><Route path="/relevamiento/objetivos/:targetId" element={<SurveyExecutionPage />} /></Route>
-        <Route element={<PermissionRoute permission="surveys.manage" />}><Route path="/relevamiento/nuevo" element={<SurveyCampaignEditorPage />} /></Route>
+        <Route path="/relevamiento" element={<Navigate to="/inventarios" replace />} />
+        <Route path="/relevamiento/*" element={<Navigate to="/inventarios" replace />} />
        <Route element={<PermissionRoute permission="inspections.read" />}>
          <Route path="/inspecciones" element={<InspectionVisitsPage />} />
          <Route path="/inspecciones/:id" element={<InspectionVisitEditorPage />} />
@@ -1,7 +1,7 @@
 export type IconName =
  | 'home' | 'map' | 'layers' | 'calendar' | 'clipboard' | 'alert'
  | 'history' | 'users' | 'shield' | 'audit' | 'logout' | 'menu'
-  | 'plus' | 'search' | 'edit' | 'chevron' | 'check' | 'key' | 'upload';
+  | 'plus' | 'search' | 'edit' | 'chevron' | 'check' | 'key' | 'upload' | 'mail';

 export function Icon({ name, size = 18 }: { name: IconName; size?: number }) {
  const paths: Record<IconName, React.ReactNode> = {
@@ -24,6 +24,7 @@ export function Icon({ name, size = 18 }: { name: IconName; size?: number }) {
    check: <path d="m5 12 4 4L19 6"/>,
    key: <><circle cx="8" cy="15" r="4"/><path d="m11 12 9-9M15 8l3 3M17 6l2 2"/></>,
    upload: <><path d="M12 16V4"/><path d="m7 9 5-5 5 5"/><path d="M5 20h14"/></>,
+    mail: <><rect x="3" y="5" width="18" height="14" rx="2"/><path d="m3 7 9 6 9-6"/></>,
  };
  return (
    <svg className="icon" width={size} height={size} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.8" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
@@ -1,2 +1,2 @@
-export const APP_VERSION = '0.20.0-4';
-export const APP_PHASE = 'Fase F1.4 · Briefing contextual antes de salir';
+export const APP_VERSION = '0.21.0-1';
+export const APP_PHASE = 'Fase F3.1 · Inventario estructural y catálogo contextual';
@@ -1,12 +1,32 @@
 import { useEffect, useMemo, useState } from 'react';
 import { Link } from 'react-router';
+import { useAuth } from '../../auth/AuthContext';
 import { Alert, EmptyState, LoadingBlock, errorMessage } from '../../components/Feedback';
 import { Icon } from '../../components/Icon';
 import { formatDate, formatDateOnly } from '../../lib/format';
-import { getAssetDossier } from '../../lib/api';
-import type { AssetDossier, AssetDossierTimelineEvent } from '../../lib/api';
+import { getAsset, getAssetDossier } from '../../lib/api';
+import type { AssetDetail, AssetDossier, AssetDossierTimelineEvent, AssetListItem } from '../../lib/api';
+import {
+  getInventoryMergeStatus,
+  mergeInventoryAsset,
+  searchInventoryMergeCandidates,
+} from '../../lib/inventoryMergeApi';
+import type { InventoryMergeStatus } from '../../lib/inventoryMergeApi';

 type View = 'timeline' | 'findings' | 'documents';
+type ExtendedTimelineEvent = Omit<AssetDossierTimelineEvent, 'kind'> & {
+  kind: AssetDossierTimelineEvent['kind'] | 'MERGE';
+};
+type ExtendedDossier = Omit<AssetDossier, 'timeline'> & {
+  timeline: ExtendedTimelineEvent[];
+  requestedAsset?: { id: string; code: string; name: string };
+  merge?: {
+    requestedWasMerged: boolean;
+    canonicalAssetId: string;
+    aliases: Array<{ id: string; code: string; name: string; reason: string; mergedAt: string; depth: number }>;
+    historyPolicy: string;
+  };
+};

 function findingStatusLabel(status: string) {
  if (status === 'OPEN') return 'Abierto';
@@ -28,48 +48,118 @@ function actStatusLabel(status: string) {
  return labels[status] ?? status;
 }

-function timelineLabel(event: AssetDossierTimelineEvent) {
-  const labels: Record<AssetDossierTimelineEvent['kind'], string> = {
+function timelineLabel(event: ExtendedTimelineEvent) {
+  const labels: Record<string, string> = {
    INVENTORY_CHANGE: 'Inventario', INSPECTION: 'Inspección', ACT: 'Acta', FINDING: 'Hallazgo', FINDING_CLOSED: 'Cierre',
-    COMMUNICATION: 'Seguimiento', PHOTO: 'Fotografía', DOCUMENT: 'Documento', REPORT: 'Informe', SOURCE_DOCUMENT: 'Documento fuente', VERIFICATION: 'Verificación',
+    COMMUNICATION: 'Seguimiento', PHOTO: 'Fotografía', DOCUMENT: 'Documento', REPORT: 'Informe', SOURCE_DOCUMENT: 'Documento fuente', VERIFICATION: 'Verificación', MERGE: 'Fusión',
  };
-  return labels[event.kind];
+  return labels[event.kind] ?? event.kind;
 }

-function timelineIcon(event: AssetDossierTimelineEvent) {
+function timelineIcon(event: ExtendedTimelineEvent) {
  if (event.kind === 'FINDING' || event.kind === 'FINDING_CLOSED') return 'alert' as const;
  if (event.kind === 'INSPECTION' || event.kind === 'VERIFICATION') return 'calendar' as const;
-  if (event.kind === 'INVENTORY_CHANGE') return 'history' as const;
+  if (event.kind === 'INVENTORY_CHANGE' || event.kind === 'MERGE') return 'history' as const;
  return 'clipboard' as const;
 }

 export function AssetDossierPanel({ assetId }: { assetId: string }) {
-  const [dossier, setDossier] = useState<AssetDossier | null>(null);
+  const { hasPermission } = useAuth();
+  const [dossier, setDossier] = useState<ExtendedDossier | null>(null);
+  const [asset, setAsset] = useState<AssetDetail | null>(null);
+  const [mergeStatus, setMergeStatus] = useState<InventoryMergeStatus | null>(null);
  const [view, setView] = useState<View>('timeline');
  const [loading, setLoading] = useState(true);
  const [error, setError] = useState('');
+  const [showMerge, setShowMerge] = useState(false);
+  const [mergeSearch, setMergeSearch] = useState('');
+  const [candidates, setCandidates] = useState<AssetListItem[]>([]);
+  const [canonicalId, setCanonicalId] = useState('');
+  const [mergeReason, setMergeReason] = useState('');
+  const [merging, setMerging] = useState(false);

-  useEffect(() => {
+  const load = () => {
    setLoading(true);
    setError('');
-    getAssetDossier(assetId)
-      .then(setDossier)
+    Promise.all([
+      getAssetDossier(assetId),
+      getAsset(assetId),
+      getInventoryMergeStatus(assetId),
+    ])
+      .then(([loadedDossier, loadedAsset, loadedMerge]) => {
+        setDossier(loadedDossier as ExtendedDossier);
+        setAsset(loadedAsset);
+        setMergeStatus(loadedMerge);
+      })
      .catch((requestError) => setError(errorMessage(requestError)))
      .finally(() => setLoading(false));
-  }, [assetId]);
+  };
+
+  useEffect(() => { load(); }, [assetId]);
+
+  const mergeable = Boolean(
+    asset &&
+    ['instalacion', 'subinstalacion'].includes(asset.type.code.toLowerCase()) &&
+    !mergeStatus?.isMerged &&
+    hasPermission('assets.update'),
+  );
+
+  useEffect(() => {
+    if (!showMerge || !mergeable || !asset) {
+      setCandidates([]);
+      return;
+    }
+    const timer = window.setTimeout(() => {
+      searchInventoryMergeCandidates(asset, mergeSearch)
+        .then(setCandidates)
+        .catch((requestError) => setError(errorMessage(requestError)));
+    }, 220);
+    return () => window.clearTimeout(timer);
+  }, [showMerge, mergeable, asset, mergeSearch]);

  const pendingVerification = useMemo(() => dossier?.findings.filter((finding) => finding.status === 'OPEN' && finding.companyResponseReceivedOn && finding.nextControlOn).length ?? 0, [dossier]);

+  const executeMerge = async () => {
+    if (!asset || !canonicalId || mergeReason.trim().length < 8) return;
+    const target = candidates.find((candidate) => candidate.id === canonicalId);
+    if (!target) return;
+    const accepted = window.confirm(
+      `¿Fusionar ${asset.code} · ${asset.name} en ${target.code} · ${target.name}?\n\n` +
+      'El registro actual quedará inactivo y trazable. Las referencias históricas NO se reescriben. Esta fusión queda registrada como evento cronológico permanente.',
+    );
+    if (!accepted) return;
+    setMerging(true);
+    setError('');
+    try {
+      const result = await mergeInventoryAsset(asset.id, canonicalId, mergeReason.trim());
+      window.location.assign(`/inventarios/${result.canonical.id}?tab=dossier`);
+    } catch (requestError) {
+      setError(errorMessage(requestError));
+      setMerging(false);
+    }
+  };
+
  if (loading) return <div className="panel"><LoadingBlock label="Armando expediente técnico…" /></div>;
  if (!dossier) return <Alert>{error || 'No se pudo cargar el expediente.'}</Alert>;

  return <div className="asset-dossier-stack">
    {error && <Alert>{error}</Alert>}

+    {mergeStatus?.isMerged && <article className="panel">
+      <div className="temporal-notice">
+        <Icon name="history" />
+        <p><strong>Registro fusionado.</strong> {mergeStatus.requested.code} · {mergeStatus.requested.name} conserva su historia, pero el registro vigente es <Link to={`/inventarios/${mergeStatus.canonical.id}?tab=dossier`}><strong>{mergeStatus.canonical.code} · {mergeStatus.canonical.name}</strong></Link>.</p>
+      </div>
+    </article>}
+
    <article className="panel dossier-overview">
      <div className="panel-heading">
        <div><span className="eyebrow">EXPEDIENTE TÉCNICO</span><h2>{dossier.asset.name}</h2><p className="section-copy">{dossier.asset.code}{dossier.asset.commonName ? ` · Nombre habitual: ${dossier.asset.commonName}` : ''} · Inspecciones, actas, hallazgos, respuestas, evidencias, documentos y cambios reunidos en un solo lugar.</p></div>
      </div>
+      {dossier.merge && dossier.merge.aliases.length > 0 && <div className="temporal-notice">
+        <Icon name="history" />
+        <p><strong>Expediente cronológico unificado:</strong> incluye {dossier.merge.aliases.length} registro{dossier.merge.aliases.length === 1 ? '' : 's'} fusionado{dossier.merge.aliases.length === 1 ? '' : 's'}. Cada evento mantiene visible la identidad de Inventario que tenía al momento de ocurrir.</p>
+      </div>}
      <div className="dossier-metrics">
        <div><small>Inspecciones</small><strong>{dossier.counters.inspections}</strong></div>
        <div><small>Actas</small><strong>{dossier.counters.acts}</strong></div>
@@ -82,6 +172,20 @@ export function AssetDossierPanel({ assetId }: { assetId: string }) {
      {pendingVerification > 0 && <div className="temporal-notice"><Icon name="calendar" /><p><strong>{pendingVerification} hallazgo{pendingVerification === 1 ? '' : 's'} con verificación programada.</strong> Las fechas operativas pueden utilizarse para planificar próximos controles.</p></div>}
    </article>

+    {mergeable && <article className="panel">
+      <div className="panel-heading">
+        <div><span className="eyebrow">CONCILIACIÓN</span><h2>¿Este registro está duplicado?</h2><p className="section-copy">Fusioná únicamente cuando ambas fichas representen la misma {asset?.type.name.toLowerCase()}. La historia anterior se conserva.</p></div>
+        <button type="button" className="button secondary" onClick={() => setShowMerge((current) => !current)}><Icon name="history" />{showMerge ? 'Cancelar fusión' : 'Fusionar duplicado'}</button>
+      </div>
+      {showMerge && <div className="form-section">
+        <label className="field"><span>Buscar registro canónico</span><input value={mergeSearch} onChange={(event) => { setMergeSearch(event.target.value); setCanonicalId(''); }} placeholder="Nombre o código…" /></label>
+        <label className="field"><span>Conservar como registro oficial</span><select value={canonicalId} onChange={(event) => setCanonicalId(event.target.value)}><option value="">Seleccionar registro…</option>{candidates.map((candidate) => <option key={candidate.id} value={candidate.id}>{candidate.code} · {candidate.name}</option>)}</select><small>Se muestran registros activos del mismo tipo, padre, Área y Operadora.</small></label>
+        <label className="field"><span>Motivo de la fusión <em>obligatorio</em></span><textarea rows={3} minLength={8} maxLength={2000} value={mergeReason} onChange={(event) => setMergeReason(event.target.value)} placeholder="Ej.: alta de campo duplicada; se confirmó que corresponde a la instalación existente…" /></label>
+        <Alert type="info">La fusión no cambia Actas ni Hallazgos históricos. Los hijos actuales se reubican al canónico con una nueva versión y el registro duplicado queda inactivo, nunca eliminado.</Alert>
+        <div className="form-actions"><button type="button" className="button primary" disabled={!canonicalId || mergeReason.trim().length < 8 || merging} onClick={executeMerge}>{merging ? 'Fusionando…' : 'Confirmar fusión cronológica'}</button></div>
+      </div>}
+    </article>}
+
    <nav className="dossier-subtabs" aria-label="Vistas del expediente">
      <button type="button" className={view === 'timeline' ? 'active' : ''} onClick={() => setView('timeline')}>Cronología</button>
      <button type="button" className={view === 'findings' ? 'active' : ''} onClick={() => setView('findings')}>Inspecciones y hallazgos</button>
@@ -91,14 +195,18 @@ export function AssetDossierPanel({ assetId }: { assetId: string }) {
    {view === 'timeline' && <article className="panel">
      <div className="panel-heading"><div><span className="eyebrow">CRONOLOGÍA</span><h2>Línea de tiempo</h2><p className="section-copy">Cada evento conserva su origen y enlaza con el registro que lo generó cuando corresponde.</p></div><span className="count-pill">{dossier.timeline.length}</span></div>
      {dossier.timeline.length === 0 ? <EmptyState title="Sin actividad histórica" text="Los eventos aparecerán a medida que el elemento sea inspeccionado o actualizado." /> : <div className="dossier-timeline">
-        {dossier.timeline.map((event) => <div className="dossier-timeline-item" key={event.id}>
-          <span className="dossier-timeline-icon"><Icon name={timelineIcon(event)} size={16} /></span>
-          <div className="dossier-timeline-body">
-            <div className="dossier-timeline-head"><span>{timelineLabel(event)}</span><time>{formatDate(event.occurredAt)}</time></div>
-            {event.href ? <Link to={event.href}><strong>{event.title}</strong></Link> : <strong>{event.title}</strong>}
-            {event.description && <p>{event.description}</p>}
-          </div>
-        </div>)}
+        {dossier.timeline.map((event) => {
+          const historicalInventory = (event.meta?.historicalInventory ?? null) as { id?: string; code?: string; name?: string; isCanonical?: boolean } | null;
+          return <div className="dossier-timeline-item" key={event.id}>
+            <span className="dossier-timeline-icon"><Icon name={timelineIcon(event)} size={16} /></span>
+            <div className="dossier-timeline-body">
+              <div className="dossier-timeline-head"><span>{timelineLabel(event)}</span><time>{formatDate(event.occurredAt)}</time></div>
+              {event.href ? <Link to={event.href}><strong>{event.title}</strong></Link> : <strong>{event.title}</strong>}
+              {event.description && <p>{event.description}</p>}
+              {historicalInventory && !historicalInventory.isCanonical && <small className="block-muted">Registrado originalmente en {historicalInventory.code} · {historicalInventory.name}</small>}
+            </div>
+          </div>;
+        })}
      </div>}
    </article>}

@@ -1,10 +1,11 @@
 import { SearchableSelect } from '../../components/SearchableSelect';
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { Link } from 'react-router';
 import { Alert, EmptyState, LoadingBlock, errorMessage } from '../../components/Feedback';
 import { Icon } from '../../components/Icon';
 import { listFindingCatalogProposals, reviewFindingCatalogProposal } from '../../lib/api';
 import type { FindingAdminCatalog, FindingCatalogProposal } from '../../lib/api';
+import { mergeFindingCatalogItem } from '../../lib/findingCatalogMerge';

 export function FindingCatalogProposalsPanel({ catalog }: { catalog: FindingAdminCatalog }) {
  const [items, setItems] = useState<FindingCatalogProposal[]>([]);
@@ -14,6 +15,20 @@ export function FindingCatalogProposalsPanel({ catalog }: { catalog: FindingAdmi
  const [error, setError] = useState('');
  const [success, setSuccess] = useState('');

+  const [mergeSourceId, setMergeSourceId] = useState('');
+  const [mergeCanonicalId, setMergeCanonicalId] = useState('');
+  const [mergeReason, setMergeReason] = useState('');
+  const [mergeBusy, setMergeBusy] = useState(false);
+  const [mergeError, setMergeError] = useState('');
+  const [mergeSuccess, setMergeSuccess] = useState('');
+
+  const activeCatalogItems = useMemo(
+    () => catalog.items.filter((item) => item.isActive && item.categoryActive),
+    [catalog.items],
+  );
+  const mergeSource = catalog.items.find((item) => item.id === mergeSourceId) ?? null;
+  const mergeCanonical = catalog.items.find((item) => item.id === mergeCanonicalId) ?? null;
+
  const load = () => listFindingCatalogProposals({ status: 'PENDING' }).then(setItems);
  useEffect(() => { load().catch((requestError) => setError(errorMessage(requestError))).finally(() => setLoading(false)); }, []);

@@ -38,11 +53,86 @@ export function FindingCatalogProposalsPanel({ catalog }: { catalog: FindingAdmi
    }
  };

-  if (loading) return <div className="panel"><LoadingBlock label="Cargando propuestas OTROS…" /></div>;
+  const mergeCatalog = async () => {
+    setMergeError(''); setMergeSuccess('');
+    if (!mergeSourceId || !mergeCanonicalId) {
+      setMergeError('Seleccioná el registro duplicado y el registro canónico.');
+      return;
+    }
+    if (mergeSourceId === mergeCanonicalId) {
+      setMergeError('El duplicado y el canónico deben ser registros distintos.');
+      return;
+    }
+    if (mergeReason.trim().length < 8) {
+      setMergeError('Indicá un motivo de al menos 8 caracteres para que la conciliación quede auditada.');
+      return;
+    }
+    const sourceLabel = mergeSource ? `${mergeSource.title} (${mergeSource.code})` : 'el duplicado';
+    const canonicalLabel = mergeCanonical ? `${mergeCanonical.title} (${mergeCanonical.code})` : 'el canónico';
+    if (!window.confirm(`¿Fusionar ${sourceLabel} dentro de ${canonicalLabel}?\n\nLos Hallazgos históricos conservarán su referencia original. El duplicado dejará de ofrecerse para inspecciones futuras.`)) return;

-  return <section className="panel finding-proposals-panel">
-    <div className="panel-heading"><div><span className="eyebrow">PROPUESTAS DESDE CAMPO</span><h2>Hallazgos cargados como OTROS</h2><p className="section-copy">El hallazgo original queda intacto. Esta bandeja sirve para decidir si conviene sumar esa opción al catálogo para inspecciones futuras.</p></div><span className="count-pill">{items.length} pendientes</span></div>
-    {error && <Alert>{error}</Alert>}{success && <Alert type="success">{success}</Alert>}
-    {items.length === 0 ? <EmptyState title="Sin propuestas pendientes" text="Los nuevos hallazgos cargados como OTROS aparecerán acá." /> : <div className="finding-proposal-list">{items.map((proposal) => <article className="finding-proposal-card" key={proposal.id}><div><span className="eyebrow">{proposal.assetTypeName} · {proposal.assetCode}</span><h3>{proposal.proposedTitle}</h3><p>{proposal.description}</p><small><Link to={`/hallazgos/${proposal.findingId}`}>{proposal.findingCode}</Link> · {proposal.assetName}{proposal.proposedSeverity ? ` · gravedad ${proposal.proposedSeverity}/10` : ''}</small></div><div className="finding-proposal-actions"><label className="field"><span>Coincide con</span><SearchableSelect value={matches[proposal.id] ?? ''} onChange={(event) => setMatches((current) => ({ ...current, [proposal.id]: event.target.value }))}><option value="">Seleccionar tipo existente…</option>{catalog.items.filter((item) => item.isActive && item.categoryActive).map((item) => <option value={item.id} key={item.id}>{item.title} · {item.code}</option>)}</SearchableSelect></label><div className="form-actions"><button type="button" className="button secondary" disabled={busyId === proposal.id} onClick={() => review(proposal, 'REJECT')}>Descartar</button><button type="button" className="button primary" disabled={busyId === proposal.id || !matches[proposal.id]} onClick={() => review(proposal, 'MATCH')}><Icon name="check" />Vincular</button></div><small>Si todavía no existe una opción adecuada, creala en el catálogo y luego vinculá esta propuesta.</small></div></article>)}</div>}
-  </section>;
+    setMergeBusy(true);
+    try {
+      await mergeFindingCatalogItem(mergeSourceId, {
+        canonicalItemId: mergeCanonicalId,
+        reason: mergeReason.trim(),
+      });
+      setMergeSuccess('Fusión registrada. El historial emitido quedó intacto y la aplicabilidad futura pasó al registro canónico.');
+      setMergeSourceId('');
+      setMergeCanonicalId('');
+      setMergeReason('');
+      window.setTimeout(() => window.location.reload(), 900);
+    } catch (requestError) {
+      setMergeError(errorMessage(requestError));
+    } finally {
+      setMergeBusy(false);
+    }
+  };
+
+  return <>
+    <section className="panel finding-proposals-panel">
+      <div className="panel-heading"><div><span className="eyebrow">PROPUESTAS DESDE CAMPO</span><h2>Hallazgos cargados como OTROS</h2><p className="section-copy">El hallazgo original queda intacto. Esta bandeja sirve para decidir si conviene sumar esa opción al catálogo para inspecciones futuras.</p></div><span className="count-pill">{items.length} pendientes</span></div>
+      {error && <Alert>{error}</Alert>}{success && <Alert type="success">{success}</Alert>}
+      {loading ? <LoadingBlock label="Cargando propuestas OTROS…" /> : items.length === 0 ? <EmptyState title="Sin propuestas pendientes" text="Los nuevos hallazgos cargados como OTROS aparecerán acá." /> : <div className="finding-proposal-list">{items.map((proposal) => <article className="finding-proposal-card" key={proposal.id}><div><span className="eyebrow">{proposal.assetTypeName} · {proposal.assetCode}</span><h3>{proposal.proposedTitle}</h3><p>{proposal.description}</p><small><Link to={`/hallazgos/${proposal.findingId}`}>{proposal.findingCode}</Link> · {proposal.assetName}{proposal.proposedSeverity ? ` · gravedad ${proposal.proposedSeverity}/10` : ''}</small></div><div className="finding-proposal-actions"><label className="field"><span>Coincide con</span><SearchableSelect value={matches[proposal.id] ?? ''} onChange={(event) => setMatches((current) => ({ ...current, [proposal.id]: event.target.value }))}><option value="">Seleccionar tipo existente…</option>{activeCatalogItems.map((item) => <option value={item.id} key={item.id}>{item.title} · {item.code}</option>)}</SearchableSelect></label><div className="form-actions"><button type="button" className="button secondary" disabled={busyId === proposal.id} onClick={() => review(proposal, 'REJECT')}>Descartar</button><button type="button" className="button primary" disabled={busyId === proposal.id || !matches[proposal.id]} onClick={() => review(proposal, 'MATCH')}><Icon name="check" />Vincular</button></div><small>Si todavía no existe una opción adecuada, creala en el catálogo y luego vinculá esta propuesta.</small></div></article>)}</div>}
+    </section>
+
+    <section className="panel finding-proposals-panel">
+      <div className="panel-heading">
+        <div>
+          <span className="eyebrow">CONCILIACIÓN DE CATÁLOGO</span>
+          <h2>Fusionar Hallazgos duplicados</h2>
+          <p className="section-copy">Usá esta operación cuando dos opciones del catálogo representan el mismo control. El duplicado se desactiva para el futuro, pero los Hallazgos y Actas ya emitidos conservan exactamente la referencia con la que nacieron.</p>
+        </div>
+        <span className="count-pill">append-only</span>
+      </div>
+      {mergeError && <Alert>{mergeError}</Alert>}{mergeSuccess && <Alert type="success">{mergeSuccess}</Alert>}
+      <div className="form-grid">
+        <label className="field">
+          <span>Duplicado a retirar</span>
+          <SearchableSelect value={mergeSourceId} onChange={(event) => { setMergeSourceId(event.target.value); if (event.target.value === mergeCanonicalId) setMergeCanonicalId(''); }}>
+            <option value="">Seleccionar duplicado…</option>
+            {activeCatalogItems.map((item) => <option key={item.id} value={item.id}>{item.categoryName} · {item.title} · {item.code}</option>)}
+          </SearchableSelect>
+          {mergeSource && <small>Uso histórico: {mergeSource.usageCount} hallazgo{mergeSource.usageCount === 1 ? '' : 's'} · revisión {mergeSource.revision}</small>}
+        </label>
+        <label className="field">
+          <span>Registro canónico que continuará vigente</span>
+          <SearchableSelect value={mergeCanonicalId} onChange={(event) => setMergeCanonicalId(event.target.value)} disabled={!mergeSourceId}>
+            <option value="">Seleccionar canónico…</option>
+            {activeCatalogItems.filter((item) => item.id !== mergeSourceId).map((item) => <option key={item.id} value={item.id}>{item.categoryName} · {item.title} · {item.code}</option>)}
+          </SearchableSelect>
+          {mergeCanonical && <small>Uso histórico: {mergeCanonical.usageCount} hallazgo{mergeCanonical.usageCount === 1 ? '' : 's'} · revisión {mergeCanonical.revision}</small>}
+        </label>
+      </div>
+      <label className="field">
+        <span>Motivo de la fusión</span>
+        <textarea rows={3} maxLength={2000} value={mergeReason} onChange={(event) => setMergeReason(event.target.value)} placeholder="Ej.: duplicado detectado al normalizar el catálogo del Apéndice 26…" />
+        <small>Obligatorio. Queda guardado en el evento de conciliación y no puede modificarse después.</small>
+      </label>
+      <div className="catalog-policy-note"><Icon name="shield" /><span><strong>Política histórica.</strong> Esta acción no reescribe inspection_findings ni propuestas ya resueltas. Sólo consolida la aplicabilidad para inspecciones futuras.</span></div>
+      <div className="form-actions">
+        <button type="button" className="button primary" disabled={mergeBusy || !mergeSourceId || !mergeCanonicalId || mergeReason.trim().length < 8} onClick={mergeCatalog}><Icon name="check" />{mergeBusy ? 'Fusionando…' : 'Fusionar y conservar historial'}</button>
+      </div>
+    </section>
+  </>;
 }
@@ -33,7 +33,6 @@ const master: NavItem[] = [
  { to: '/inventarios', label: 'Inventarios', icon: 'layers', permission: 'assets.read' },
  { to: '/mapa', label: 'Mapa', icon: 'map', permission: 'assets.read' },
  { to: '/importaciones', label: 'Importaciones', icon: 'upload', permission: 'asset_imports.read' },
-  { to: '/relevamiento', label: 'Relevamientos', icon: 'clipboard', permission: 'surveys.read' },
 ];

 const administration: NavItem[] = [
@@ -0,0 +1,62 @@
+import { apiRequest } from './api';
+
+export interface FindingCatalogMergeItem {
+  id: string;
+  categoryId: string;
+  categoryCode: string;
+  categoryName: string;
+  code: string;
+  sourceNumber: number;
+  title: string;
+  legalBasis: string | null;
+  glossary: string | null;
+  importNote: string | null;
+  suggestedSeverity: number | null;
+  revision: number;
+  isActive: boolean;
+}
+
+export interface FindingCatalogMergeAlias {
+  id: string;
+  code: string;
+  title: string;
+  reason: string;
+  mergedAt: string;
+  depth: number;
+}
+
+export interface FindingCatalogMergeStatus {
+  requested: FindingCatalogMergeItem;
+  isMerged: boolean;
+  canonical: FindingCatalogMergeItem;
+  aliases: FindingCatalogMergeAlias[];
+}
+
+export interface FindingCatalogMergeResult {
+  merge: {
+    id: string;
+    sourceItemId: string;
+    canonicalItemId: string;
+    reason: string;
+    mergedAt: string;
+    mergedBy: string;
+    requestId: string;
+  };
+  source: FindingCatalogMergeItem;
+  canonical: FindingCatalogMergeItem;
+  historyPolicy: 'EMITTED_FINDINGS_PRESERVED';
+}
+
+export function getFindingCatalogMergeStatus(itemId: string) {
+  return apiRequest<FindingCatalogMergeStatus>(`/finding-catalog/items/${itemId}/merge-status`);
+}
+
+export function mergeFindingCatalogItem(
+  sourceItemId: string,
+  input: { canonicalItemId: string; reason: string },
+) {
+  return apiRequest<FindingCatalogMergeResult>(`/finding-catalog/items/${sourceItemId}/merge`, {
+    method: 'POST',
+    body: JSON.stringify(input),
+  });
+}
@@ -0,0 +1,86 @@
+import { apiRequest, listAssets } from './api';
+import type { AssetDetail, AssetListItem } from './api';
+
+export interface InventoryMergeAlias {
+  id: string;
+  code: string;
+  name: string;
+  reason: string;
+  mergedAt: string;
+  depth: number;
+}
+
+export interface InventoryMergeStatus {
+  requested: {
+    id: string;
+    code: string;
+    name: string;
+    typeCode: string;
+  };
+  isMerged: boolean;
+  canonical: {
+    id: string;
+    code: string;
+    name: string;
+    typeCode: string;
+  };
+  chain: Array<{
+    id: string;
+    sourceAssetId: string;
+    canonicalAssetId: string;
+    reason: string;
+    mergedAt: string;
+    mergedBy: string | null;
+    source: string;
+  }>;
+  aliases: InventoryMergeAlias[];
+}
+
+export interface InventoryMergeResult {
+  merge: {
+    id: string;
+    sourceAssetId: string;
+    canonicalAssetId: string;
+    reason: string;
+    mergedAt: string;
+  };
+  source: { id: string; code: string; name: string };
+  canonical: { id: string; code: string; name: string };
+  sourceVersionNumber: number;
+  reparentedChildIds: string[];
+  historyPolicy: 'HISTORICAL_REFERENCES_PRESERVED';
+}
+
+export function getInventoryMergeStatus(assetId: string) {
+  return apiRequest<InventoryMergeStatus>(`/assets/${assetId}/merge-status`);
+}
+
+export function mergeInventoryAsset(
+  sourceAssetId: string,
+  canonicalAssetId: string,
+  reason: string,
+) {
+  return apiRequest<InventoryMergeResult>(`/assets/${sourceAssetId}/merge`, {
+    method: 'POST',
+    body: JSON.stringify({ canonicalAssetId, reason }),
+  });
+}
+
+export async function searchInventoryMergeCandidates(
+  source: AssetDetail,
+  search = '',
+): Promise<AssetListItem[]> {
+  if (!source.parent?.id || !source.operationalArea?.id || !source.operatorCompany?.id) return [];
+  const page = await listAssets({
+    page: 1,
+    pageSize: 80,
+    search: search.trim() || undefined,
+    typeId: source.type.id,
+    parentId: source.parent.id,
+    operationalAreaId: source.operationalArea.id,
+    operatorCompanyId: source.operatorCompany.id,
+  });
+  return page.data.filter((candidate) =>
+    candidate.id !== source.id && candidate.informationStatus !== 'INACTIVE',
+  );
+}
@@ -0,0 +1,121 @@
+import { apiRequest } from './api';
+
+export type InventoryStructureKind = 'AREA' | 'YACIMIENTO' | 'INSTALACION' | 'SUBINSTALACION';
+
+export interface InventoryFamily {
+  id: string;
+  code: string;
+  name: string;
+  level: 'INSTALLATION' | 'SUBINSTALLATION';
+  legacyTypeCode: string | null;
+  informationLabels: string[];
+  parentFamilyId: string | null;
+  parentFamilyCode: string | null;
+  parentFamilyName: string | null;
+}
+
+export interface InventoryStructureLevel {
+  kind: InventoryStructureKind;
+  label: string;
+  type: { id: string; code: string; name: string };
+  parentKind: InventoryStructureKind | null;
+  requiresFamily: boolean;
+}
+
+export interface InventoryStructureOptions {
+  levels: InventoryStructureLevel[];
+  installationFamilies: InventoryFamily[];
+  subinstallationFamilies: InventoryFamily[];
+}
+
+export interface InventoryStructureParent {
+  id: string;
+  code: string;
+  name: string;
+  commonName: string | null;
+  type: { id: string; code: string; name: string };
+  inventoryFamily: null | {
+    id: string;
+    code: string;
+    name: string;
+    level: 'INSTALLATION' | 'SUBINSTALLATION';
+    informationLabels: string[];
+  };
+  parent: null | { id: string; code: string; name: string };
+}
+
+export interface InventoryFamilyFinding {
+  id: string;
+  code: string;
+  sourceNumber: number;
+  title: string;
+  legalBasis: string | null;
+  glossary: string | null;
+  suggestedSeverity: number | null;
+  categoryId: string;
+  categoryCode: string;
+  categoryName: string;
+}
+
+export interface InventoryFamilyFindings {
+  family: {
+    id: string;
+    code: string;
+    name: string;
+    level: string;
+    informationLabels: string[];
+  };
+  items: InventoryFamilyFinding[];
+  count: number;
+}
+
+export interface CreatedInventoryStructure {
+  id: string;
+  code: string;
+  name: string;
+  commonName: string | null;
+  description: string | null;
+  informationStatus: string;
+  operationalStatus: string;
+  type: { id: string; code: string; name: string };
+  parent: null | { id: string; code: string; name: string };
+  inventoryFamily: null | {
+    id: string;
+    code: string;
+    name: string;
+    level: string;
+    informationLabels: string[];
+  };
+}
+
+export function getInventoryStructureOptions() {
+  return apiRequest<InventoryStructureOptions>('/inventory-structure');
+}
+
+export async function listInventoryStructureParents(kind: InventoryStructureKind, search = '') {
+  const query = new URLSearchParams();
+  if (search.trim()) query.set('search', search.trim());
+  const suffix = query.size ? `?${query}` : '';
+  return (await apiRequest<{ data: InventoryStructureParent[] }>(
+    `/inventory-structure/parents/${kind}${suffix}`,
+  )).data;
+}
+
+export function getInventoryFamilyFindings(familyId: string) {
+  return apiRequest<InventoryFamilyFindings>(`/inventory-families/${familyId}/findings`);
+}
+
+export function createInventoryStructure(input: {
+  kind: InventoryStructureKind;
+  code?: string | null;
+  name: string;
+  commonName?: string | null;
+  parentId?: string | null;
+  familyId?: string | null;
+  description?: string | null;
+}) {
+  return apiRequest<CreatedInventoryStructure>('/inventory-structure', {
+    method: 'POST',
+    body: JSON.stringify(input),
+  });
+}
@@ -0,0 +1,47 @@
+import { apiRequest } from './api';
+import type { AdministrativeUser } from './api';
+
+export interface AdministrativeUserProfile extends AdministrativeUser {
+  dni: string | null;
+  phone: string | null;
+  jobTitle: string | null;
+  employeeNumber: string | null;
+}
+
+export interface UserProfileInput {
+  username?: string;
+  email?: string | null;
+  dni?: string | null;
+  phone?: string | null;
+  jobTitle?: string | null;
+  employeeNumber?: string | null;
+  firstName?: string;
+  lastName?: string;
+}
+
+export interface CreateUserProfileInput extends UserProfileInput {
+  username: string;
+  firstName: string;
+  lastName: string;
+  password: string;
+  mustChangePassword: boolean;
+  roleIds: string[];
+}
+
+export function getUserProfile(id: string) {
+  return apiRequest<AdministrativeUserProfile>(`/users/${id}`);
+}
+
+export function createUserProfile(input: CreateUserProfileInput) {
+  return apiRequest<AdministrativeUserProfile>('/users', {
+    method: 'POST',
+    body: JSON.stringify(input),
+  });
+}
+
+export function updateUserProfile(id: string, input: UserProfileInput) {
+  return apiRequest<AdministrativeUserProfile>(`/users/${id}`, {
+    method: 'PATCH',
+    body: JSON.stringify(input),
+  });
+}
@@ -1,16 +1,144 @@
 import { FormEvent, useEffect, useState } from 'react';
+import { useAuth } from '../auth/AuthContext';
 import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
 import { Icon } from '../components/Icon';
-import { getDocumentDeliverySettings, listDocumentDeliveries, retryDocumentDelivery, retryPendingDocumentDeliveries, updateDocumentDeliverySettings } from '../lib/api';
+import {
+  getDocumentDeliverySettings,
+  listDocumentDeliveries,
+  retryDocumentDelivery,
+  retryPendingDocumentDeliveries,
+  updateDocumentDeliverySettings,
+} from '../lib/api';
 import type { DocumentDeliveryItem, DocumentDeliverySettings } from '../lib/api';
-import { useAuth } from '../auth/AuthContext';

-const statusLabel:Record<DocumentDeliveryItem['status'],string>={PENDING:'Pendiente',WAITING_RECIPIENT:'Falta destinatario',WAITING_TRANSPORT:'SMTP sin configurar',WAITING_ARTIFACT:'Documento pendiente',SENT:'Enviado',FAILED:'Error'};
-export function DocumentDeliveryPage(){ const {hasPermission}=useAuth(); const canManage=hasPermission('document_delivery.manage'); const [settings,setSettings]=useState<DocumentDeliverySettings|null>(null); const [items,setItems]=useState<DocumentDeliveryItem[]>([]); const [officeEmail,setOfficeEmail]=useState(''); const [directorEmail,setDirectorEmail]=useState(''); const [loading,setLoading]=useState(true); const [saving,setSaving]=useState(false); const [error,setError]=useState(''); const [success,setSuccess]=useState('');
-  const load=async()=>{const [s,o]=await Promise.all([getDocumentDeliverySettings(),listDocumentDeliveries()]);setSettings(s);setOfficeEmail(s.officeEmail??'');setDirectorEmail(s.directorEmail??'');setItems(o.data);}; useEffect(()=>{load().catch(e=>setError(errorMessage(e))).finally(()=>setLoading(false));},[]);
-  const save=async(e:FormEvent)=>{e.preventDefault();setSaving(true);setError('');setSuccess('');try{const s=await updateDocumentDeliverySettings({officeEmail:officeEmail||null,directorEmail:directorEmail||null});setSettings(s);setSuccess('Destinatarios institucionales actualizados');}catch(err){setError(errorMessage(err));}finally{setSaving(false);}};
-  const retryAll=async()=>{setSaving(true);setError('');setSuccess('');try{const r=await retryPendingDocumentDeliveries();await load();setSuccess(`Se procesaron ${r.processed} entrega/s pendientes.`);}catch(err){setError(errorMessage(err));}finally{setSaving(false);}};
-  if(loading)return <LoadingBlock label="Cargando entrega documental…"/>; return <section className="narrow-section"><div className="page-heading"><div><span className="eyebrow">DOCUMENTOS</span><h1>Entrega documental</h1><p>Configurá los destinatarios institucionales y controlá el envío automático de Actas e Informes.</p></div>{canManage&&<button className="button secondary" onClick={retryAll} disabled={saving}><Icon name="history"/>Reintentar pendientes</button>}</div>{error&&<Alert>{error}</Alert>}{success&&<Alert type="success">{success}</Alert>}
-    <form className="panel form-panel" onSubmit={save}><div className="form-section"><div><h2>Destinatarios institucionales</h2><p className="section-copy">El email de cada empresa se configura dentro de su ficha de Inventario. Las credenciales SMTP permanecen fuera de la base de datos.</p></div><div className="form-grid"><label className="field"><span>Email de oficina</span><input type="email" value={officeEmail} onChange={e=>setOfficeEmail(e.target.value)} disabled={!canManage}/></label><label className="field"><span>Email del Director de Hidrocarburos</span><input type="email" value={directorEmail} onChange={e=>setDirectorEmail(e.target.value)} disabled={!canManage}/></label></div><div className="temporal-notice"><Icon name={settings?.smtpConfigured?'check':'alert'}/><p><strong>{settings?.smtpConfigured?'Servidor de correo configurado':'Servidor de correo pendiente'}</strong>{settings?.mailFrom?` · Remitente ${settings.mailFrom}`:' · Falta configurar SMTP_HOST y MAIL_FROM en el servidor.'}</p></div>{canManage&&<div className="form-actions"><button className="button primary" disabled={saving}><Icon name="check"/>{saving?'Guardando…':'Guardar destinatarios'}</button></div>}</div></form>
-    <div className="panel"><div className="panel-heading"><div><span className="eyebrow">TRAZABILIDAD</span><h2>Últimas entregas</h2></div><span>{items.length}</span></div>{items.length===0?<div className="inline-empty">Todavía no existen entregas documentales.</div>:<div className="table-wrap"><table><thead><tr><th>Documento</th><th>Destino</th><th>Estado</th><th>Intentos</th><th></th></tr></thead><tbody>{items.map(item=><tr key={item.id}><td><strong>{item.documentKind==='ACT_PDF'?item.actCode:item.reportCode}</strong><small className="block-muted">{item.documentKind==='ACT_PDF'?'Acta PDF':'Informe Word'}</small></td><td>{item.recipientAssetName??(item.recipientKind==='COMPANY'?'Empresa sin identificar':item.recipientKind==='OFFICE'?'Oficina':'Director')}<small className="block-muted">{item.recipientEmail??'Sin email configurado'}</small></td><td><span className={`status-badge ${item.status==='SENT'?'active':item.status==='FAILED'?'inactive':'pending'}`}>{statusLabel[item.status]}</span>{item.lastError&&<small className="block-muted">{item.lastError}</small>}</td><td>{item.attempts}</td><td>{canManage&&item.status!=='SENT'&&<button className="button text" type="button" disabled={saving} onClick={async()=>{setSaving(true);try{await retryDocumentDelivery(item.id);await load();}catch(err){setError(errorMessage(err));}finally{setSaving(false);}}}>Reintentar</button>}</td></tr>)}</tbody></table></div>}</div>
-  </section>; }
+const statusLabel: Record<DocumentDeliveryItem['status'], string> = {
+  PENDING: 'Pendiente',
+  WAITING_RECIPIENT: 'Falta destinatario',
+  WAITING_TRANSPORT: 'SMTP sin configurar',
+  WAITING_ARTIFACT: 'Documento pendiente',
+  SENT: 'Enviado',
+  FAILED: 'Error',
+};
+
+type DeliveryWithInspector = DocumentDeliveryItem & {
+  recipientUserId?: string | null;
+  recipientUserName?: string | null;
+};
+
+function recipientLabel(item: DeliveryWithInspector): string {
+  if (item.recipientAssetName) return item.recipientAssetName;
+  if (item.recipientUserName) return item.recipientUserName;
+  const kind = String(item.recipientKind);
+  if (kind === 'COMPANY') return 'Empresa sin identificar';
+  if (kind === 'OFFICE') return 'Oficina';
+  if (kind === 'INSPECTOR') return 'Inspector responsable';
+  return 'Director';
+}
+
+export function DocumentDeliveryPage() {
+  const { hasPermission } = useAuth();
+  const canManage = hasPermission('document_delivery.manage');
+  const [settings, setSettings] = useState<DocumentDeliverySettings | null>(null);
+  const [items, setItems] = useState<DocumentDeliveryItem[]>([]);
+  const [officeEmail, setOfficeEmail] = useState('');
+  const [directorEmail, setDirectorEmail] = useState('');
+  const [loading, setLoading] = useState(true);
+  const [saving, setSaving] = useState(false);
+  const [error, setError] = useState('');
+  const [success, setSuccess] = useState('');
+
+  const load = async () => {
+    const [currentSettings, outbox] = await Promise.all([
+      getDocumentDeliverySettings(),
+      listDocumentDeliveries(),
+    ]);
+    setSettings(currentSettings);
+    setOfficeEmail(currentSettings.officeEmail ?? '');
+    setDirectorEmail(currentSettings.directorEmail ?? '');
+    setItems(outbox.data);
+  };
+
+  useEffect(() => {
+    load().catch((requestError) => setError(errorMessage(requestError))).finally(() => setLoading(false));
+  }, []);
+
+  const save = async (event: FormEvent) => {
+    event.preventDefault();
+    setSaving(true);
+    setError('');
+    setSuccess('');
+    try {
+      const currentSettings = await updateDocumentDeliverySettings({
+        officeEmail: officeEmail || null,
+        directorEmail: directorEmail || null,
+      });
+      setSettings(currentSettings);
+      setSuccess('Destinatarios institucionales actualizados');
+    } catch (requestError) {
+      setError(errorMessage(requestError));
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  const retryAll = async () => {
+    setSaving(true);
+    setError('');
+    setSuccess('');
+    try {
+      const result = await retryPendingDocumentDeliveries();
+      await load();
+      setSuccess(`Se procesaron ${result.processed} entrega/s pendientes.`);
+    } catch (requestError) {
+      setError(errorMessage(requestError));
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  if (loading) return <LoadingBlock label="Cargando entrega documental…" />;
+
+  return <section className="narrow-section">
+    <div className="page-heading">
+      <div>
+        <span className="eyebrow">DOCUMENTOS</span>
+        <h1>Entrega documental</h1>
+        <p>Configurá los destinatarios institucionales y controlá el envío automático de Actas e Informes.</p>
+      </div>
+      {canManage && <button className="button secondary" onClick={retryAll} disabled={saving}><Icon name="history" />Reintentar pendientes</button>}
+    </div>
+    {error && <Alert>{error}</Alert>}
+    {success && <Alert type="success">{success}</Alert>}
+
+    <form className="panel form-panel" onSubmit={save}>
+      <div className="form-section">
+        <div>
+          <h2>Destinatarios institucionales</h2>
+          <p className="section-copy">El email de cada empresa se configura dentro de su ficha de Inventario. El Inspector responsable usa automáticamente el email declarado en su Usuario. Las credenciales SMTP permanecen fuera de la base de datos.</p>
+        </div>
+        <div className="form-grid">
+          <label className="field"><span>Email de oficina</span><input type="email" value={officeEmail} onChange={(event) => setOfficeEmail(event.target.value)} disabled={!canManage} /></label>
+          <label className="field"><span>Email del Director de Hidrocarburos</span><input type="email" value={directorEmail} onChange={(event) => setDirectorEmail(event.target.value)} disabled={!canManage} /></label>
+        </div>
+        <div className="temporal-notice"><Icon name={settings?.smtpConfigured ? 'check' : 'alert'} /><p><strong>{settings?.smtpConfigured ? 'Servidor de correo configurado' : 'Servidor de correo pendiente'}</strong>{settings?.mailFrom ? ` · Remitente ${settings.mailFrom}` : ' · Falta configurar SMTP_HOST y MAIL_FROM en el servidor.'}</p></div>
+        {canManage && <div className="form-actions"><button className="button primary" disabled={saving}><Icon name="check" />{saving ? 'Guardando…' : 'Guardar destinatarios'}</button></div>}
+      </div>
+    </form>
+
+    <div className="panel">
+      <div className="panel-heading"><div><span className="eyebrow">TRAZABILIDAD</span><h2>Últimas entregas</h2></div><span>{items.length}</span></div>
+      {items.length === 0
+        ? <div className="inline-empty">Todavía no existen entregas documentales.</div>
+        : <div className="table-wrap"><table><thead><tr><th>Documento</th><th>Destino</th><th>Estado</th><th>Intentos</th><th></th></tr></thead><tbody>{items.map((baseItem) => {
+          const item = baseItem as DeliveryWithInspector;
+          return <tr key={item.id}>
+            <td><strong>{item.documentKind === 'ACT_PDF' ? item.actCode : item.reportCode}</strong><small className="block-muted">{item.documentKind === 'ACT_PDF' ? 'Acta PDF' : 'Informe Word'}</small></td>
+            <td>{recipientLabel(item)}<small className="block-muted">{item.recipientEmail ?? 'Sin email configurado'}</small></td>
+            <td><span className={`status-badge ${item.status === 'SENT' ? 'active' : item.status === 'FAILED' ? 'inactive' : 'pending'}`}>{statusLabel[item.status]}</span>{item.lastError && <small className="block-muted">{item.lastError}</small>}</td>
+            <td>{item.attempts}</td>
+            <td>{canManage && item.status !== 'SENT' && <button className="button text" type="button" disabled={saving} onClick={async () => { setSaving(true); try { await retryDocumentDelivery(item.id); await load(); } catch (requestError) { setError(errorMessage(requestError)); } finally { setSaving(false); } }}>Reintentar</button>}</td>
+          </tr>;
+        })}</tbody></table></div>}
+    </div>
+  </section>;
+}
@@ -0,0 +1,269 @@
+import { useEffect, useMemo, useState } from 'react';
+import type { FormEvent } from 'react';
+import { Link, useNavigate, useSearchParams } from 'react-router';
+import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
+import { Icon } from '../components/Icon';
+import { getAsset } from '../lib/api';
+import {
+  createInventoryStructure,
+  getInventoryFamilyFindings,
+  getInventoryStructureOptions,
+  listInventoryStructureParents,
+} from '../lib/inventoryStructureApi';
+import type {
+  InventoryFamily,
+  InventoryFamilyFindings,
+  InventoryStructureKind,
+  InventoryStructureOptions,
+  InventoryStructureParent,
+} from '../lib/inventoryStructureApi';
+
+const KINDS: Array<{ kind: InventoryStructureKind; label: string; help: string; step: number }> = [
+  { kind: 'AREA', label: 'Área', help: 'Nivel territorial raíz.', step: 1 },
+  { kind: 'YACIMIENTO', label: 'Yacimiento', help: 'Debe pertenecer a un Área.', step: 2 },
+  { kind: 'INSTALACION', label: 'Instalación', help: 'Debe pertenecer a un Yacimiento.', step: 3 },
+  { kind: 'SUBINSTALACION', label: 'Subinstalación', help: 'Debe pertenecer a una Instalación.', step: 4 },
+];
+
+const childKindByParentType: Record<string, InventoryStructureKind | undefined> = {
+  area: 'YACIMIENTO',
+  yacimiento: 'INSTALACION',
+  instalacion: 'SUBINSTALACION',
+};
+
+function kindLabel(kind: InventoryStructureKind): string {
+  return KINDS.find((item) => item.kind === kind)?.label ?? kind;
+}
+
+export function InventoryCreatePage() {
+  const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+  const contextParentId = searchParams.get('parentId');
+  const [options, setOptions] = useState<InventoryStructureOptions | null>(null);
+  const [kind, setKind] = useState<InventoryStructureKind>('AREA');
+  const [parents, setParents] = useState<InventoryStructureParent[]>([]);
+  const [parentSearch, setParentSearch] = useState('');
+  const [parentId, setParentId] = useState('');
+  const [familyId, setFamilyId] = useState('');
+  const [familyFindings, setFamilyFindings] = useState<InventoryFamilyFindings | null>(null);
+  const [code, setCode] = useState('');
+  const [name, setName] = useState('');
+  const [commonName, setCommonName] = useState('');
+  const [description, setDescription] = useState('');
+  const [loading, setLoading] = useState(true);
+  const [saving, setSaving] = useState(false);
+  const [error, setError] = useState('');
+
+  useEffect(() => {
+    getInventoryStructureOptions()
+      .then(async (loaded) => {
+        setOptions(loaded);
+        if (contextParentId) {
+          const parent = await getAsset(contextParentId);
+          const inferred = childKindByParentType[parent.type.code.toLowerCase()];
+          if (inferred) {
+            setKind(inferred);
+            setParentId(parent.id);
+          }
+        }
+      })
+      .catch((requestError) => setError(errorMessage(requestError)))
+      .finally(() => setLoading(false));
+  }, [contextParentId]);
+
+  useEffect(() => {
+    if (kind === 'AREA') {
+      setParents([]);
+      setParentId('');
+      return;
+    }
+    const timer = window.setTimeout(() => {
+      listInventoryStructureParents(kind, parentSearch)
+        .then((loaded) => {
+          setParents(loaded);
+          if (contextParentId && loaded.some((item) => item.id === contextParentId)) {
+            setParentId(contextParentId);
+          }
+        })
+        .catch((requestError) => setError(errorMessage(requestError)));
+    }, 180);
+    return () => window.clearTimeout(timer);
+  }, [kind, parentSearch, contextParentId]);
+
+  const selectedParent = parents.find((item) => item.id === parentId) ?? null;
+  const families = useMemo(() => {
+    if (!options) return [] as InventoryFamily[];
+    if (kind === 'INSTALACION') return options.installationFamilies;
+    if (kind === 'SUBINSTALACION') {
+      const parentFamilyId = selectedParent?.inventoryFamily?.id;
+      return parentFamilyId
+        ? options.subinstallationFamilies.filter((item) => item.parentFamilyId === parentFamilyId)
+        : [];
+    }
+    return [];
+  }, [options, kind, selectedParent]);
+  const selectedFamily = families.find((item) => item.id === familyId) ?? null;
+
+  useEffect(() => {
+    if (!familyId) {
+      setFamilyFindings(null);
+      return;
+    }
+    getInventoryFamilyFindings(familyId)
+      .then(setFamilyFindings)
+      .catch((requestError) => setError(errorMessage(requestError)));
+  }, [familyId]);
+
+  useEffect(() => {
+    if (kind !== 'INSTALACION' && kind !== 'SUBINSTALACION') setFamilyId('');
+    if (kind === 'SUBINSTALACION' && familyId && !families.some((item) => item.id === familyId)) setFamilyId('');
+  }, [kind, familyId, families]);
+
+  const chooseKind = (next: InventoryStructureKind) => {
+    setKind(next);
+    setParentId('');
+    setParentSearch('');
+    setFamilyId('');
+    setFamilyFindings(null);
+    setError('');
+  };
+
+  const save = async (event: FormEvent) => {
+    event.preventDefault();
+    const requiresParent = kind !== 'AREA';
+    const requiresFamily = kind === 'INSTALACION' || kind === 'SUBINSTALACION';
+    if (requiresParent && !parentId) {
+      setError(`Seleccioná el ${kind === 'YACIMIENTO' ? 'Área' : kind === 'INSTALACION' ? 'Yacimiento' : 'Instalación'} padre.`);
+      return;
+    }
+    if (requiresFamily && !familyId) {
+      setError(`Seleccioná la familia de ${kindLabel(kind).toLowerCase()}.`);
+      return;
+    }
+    setSaving(true);
+    setError('');
+    try {
+      const created = await createInventoryStructure({
+        kind,
+        code: code.trim() || null,
+        name: name.trim(),
+        commonName: commonName.trim() || null,
+        parentId: parentId || null,
+        familyId: familyId || null,
+        description: description.trim() || null,
+      });
+      navigate(`/inventarios/${created.id}`, { replace: true });
+    } catch (requestError) {
+      setError(errorMessage(requestError));
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  if (loading) return <LoadingBlock label="Preparando alta de Inventario…" />;
+
+  const parentLabel = kind === 'YACIMIENTO' ? 'Área' : kind === 'INSTALACION' ? 'Yacimiento' : 'Instalación';
+  const currentStep = KINDS.find((item) => item.kind === kind)?.step ?? 1;
+
+  return <section className="narrow-section asset-detail-page">
+    <nav className="breadcrumb asset-detail-breadcrumb" aria-label="Ruta del inventario">
+      <Link to="/inventarios">Inventarios</Link><span>›</span><strong>Nuevo registro</strong>
+    </nav>
+
+    <div className="page-heading asset-editor-heading">
+      <div>
+        <span className="eyebrow">INVENTARIO</span>
+        <h1>Agregar a la estructura</h1>
+        <p>La estructura oficial es Área → Yacimiento → Instalación → Subinstalación. Elegí el nivel y el sistema te guía con los vínculos válidos.</p>
+      </div>
+    </div>
+
+    {error && <Alert>{error}</Alert>}
+
+    <div className="panel" style={{ marginBottom: 18 }}>
+      <div className="form-section">
+        <div><h2>1. ¿Qué querés crear?</h2><p className="section-copy">Sólo se pueden crear los cuatro niveles estructurales definidos para DH.</p></div>
+        <div style={{ display: 'grid', gridTemplateColumns: 'repeat(4, minmax(0, 1fr))', gap: 10 }}>
+          {KINDS.map((item) => <button
+            key={item.kind}
+            type="button"
+            className={`button ${kind === item.kind ? 'primary' : 'secondary'}`}
+            onClick={() => chooseKind(item.kind)}
+            style={{ minHeight: 76, display: 'flex', flexDirection: 'column', alignItems: 'flex-start', justifyContent: 'center', gap: 3 }}
+          >
+            <strong>{item.step}. {item.label}</strong>
+            <small>{item.help}</small>
+          </button>)}
+        </div>
+        <div className="temporal-notice" style={{ marginTop: 12 }}>
+          <Icon name="layers" />
+          <p><strong>Ruta:</strong> {KINDS.slice(0, currentStep).map((item) => item.label).join(' → ')}</p>
+        </div>
+      </div>
+    </div>
+
+    <form className="panel form-panel" onSubmit={save}>
+      {kind !== 'AREA' && <div className="form-section">
+        <div><h2>2. Ubicación en la estructura</h2><p className="section-copy">Primero elegí el {parentLabel} al que pertenece este registro.</p></div>
+        <label className="field">
+          <span>Buscar {parentLabel.toLowerCase()}</span>
+          <input value={parentSearch} onChange={(event) => setParentSearch(event.target.value)} placeholder={`Buscar por nombre o código de ${parentLabel.toLowerCase()}…`} />
+        </label>
+        <label className="field">
+          <span>{parentLabel} padre <em>obligatorio</em></span>
+          <select value={parentId} onChange={(event) => { setParentId(event.target.value); setFamilyId(''); }} required>
+            <option value="">Seleccionar {parentLabel.toLowerCase()}…</option>
+            {parents.map((parent) => <option key={parent.id} value={parent.id}>{parent.name} · {parent.code}{parent.inventoryFamily ? ` · ${parent.inventoryFamily.name}` : ''}</option>)}
+          </select>
+          <small>No se permiten saltos de nivel ni padres incompatibles.</small>
+        </label>
+      </div>}
+
+      {(kind === 'INSTALACION' || kind === 'SUBINSTALACION') && <div className="form-section">
+        <div><h2>3. Familia técnica</h2><p className="section-copy">La familia no crea otro nivel. Sirve para aplicar exactamente los Hallazgos del Excel que corresponden.</p></div>
+        {kind === 'SUBINSTALACION' && !selectedParent?.inventoryFamily ? <Alert>La Instalación seleccionada todavía no tiene una familia técnica F3.1. Revisala antes de crear una Subinstalación.</Alert> : <label className="field">
+          <span>Familia de {kindLabel(kind).toLowerCase()} <em>obligatorio</em></span>
+          <select value={familyId} onChange={(event) => setFamilyId(event.target.value)} required>
+            <option value="">Seleccionar familia…</option>
+            {families.map((family) => <option key={family.id} value={family.id}>{family.name}</option>)}
+          </select>
+          {kind === 'SUBINSTALACION' && selectedParent?.inventoryFamily && <small>Se muestran sólo las subinstalaciones válidas para {selectedParent.inventoryFamily.name}.</small>}
+        </label>}
+
+        {selectedFamily && <div className="context-create-banner" style={{ alignItems: 'flex-start' }}>
+          <Icon name="alert" />
+          <div style={{ flex: 1 }}>
+            <strong>Hallazgos asociados automáticamente</strong>
+            <span>{familyFindings ? `${familyFindings.count} controles del Excel para ${selectedFamily.name}` : 'Cargando catálogo asociado…'}</span>
+            {familyFindings && familyFindings.items.length > 0 && <ul style={{ margin: '8px 0 0', paddingLeft: 18 }}>
+              {familyFindings.items.slice(0, 7).map((item) => <li key={item.id}>{item.title}</li>)}
+              {familyFindings.items.length > 7 && <li><strong>+ {familyFindings.items.length - 7} hallazgos más</strong></li>}
+            </ul>}
+          </div>
+        </div>}
+
+        {selectedFamily && selectedFamily.informationLabels.length > 0 && <div className="temporal-notice">
+          <Icon name="clipboard" />
+          <p><strong>Información técnica esperada:</strong> {selectedFamily.informationLabels.join(' · ')}</p>
+        </div>}
+      </div>}
+
+      <div className="form-section">
+        <div><h2>{kind === 'AREA' ? '2' : kind === 'YACIMIENTO' ? '3' : '4'}. Identificación</h2><p className="section-copy">Usá el nombre real de campo. El código DH puede generarse automáticamente.</p></div>
+        <div className="form-grid">
+          <label className="field"><span>Nombre <em>obligatorio</em></span><input value={name} onChange={(event) => setName(event.target.value)} required maxLength={200} placeholder={`Nombre de ${kindLabel(kind).toLowerCase()}`} /></label>
+          <label className="field"><span>Código DH <em>opcional</em></span><input value={code} onChange={(event) => setCode(event.target.value.toUpperCase())} maxLength={120} pattern="[A-Z0-9][A-Z0-9._/-]*" placeholder="Dejar vacío para generar automáticamente" /><small>Si no lo informás, DH genera un código único.</small></label>
+          <label className="field"><span>Nombre habitual / sobrenombre <em>opcional</em></span><input value={commonName} onChange={(event) => setCommonName(event.target.value)} maxLength={200} placeholder="Nombre usado por los inspectores en campo" /></label>
+        </div>
+        <label className="field"><span>Descripción <em>opcional</em></span><textarea value={description} onChange={(event) => setDescription(event.target.value)} rows={2} maxLength={4000} /></label>
+      </div>
+
+      <div className="form-actions">
+        <Link className="button secondary" to="/inventarios">Cancelar</Link>
+        <button className="button primary" disabled={saving || !name.trim() || (kind !== 'AREA' && !parentId) || ((kind === 'INSTALACION' || kind === 'SUBINSTALACION') && !familyId)}>
+          <Icon name="check" />{saving ? 'Creando…' : `Crear ${kindLabel(kind)}`}
+        </button>
+      </div>
+    </form>
+  </section>;
+}
@@ -1,10 +1,11 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import type { FormEvent } from 'react';
 import { Link, useNavigate } from 'react-router';
 import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
 import { Icon } from '../components/Icon';
-import { createUser, listRoles } from '../lib/api';
+import { listRoles } from '../lib/api';
 import type { AdministrativeRole } from '../lib/api';
+import { createUserProfile } from '../lib/userProfileApi';

 export function NewUserPage() {
  const navigate = useNavigate();
@@ -18,17 +19,30 @@ export function NewUserPage() {
    listRoles().then(setRoles).catch((requestError) => setError(errorMessage(requestError))).finally(() => setLoading(false));
  }, []);

+  const inspectorSelected = useMemo(
+    () => roles.some((role) => role.code === 'inspector' && roleIds.includes(role.id)),
+    [roles, roleIds],
+  );
  const toggleRole = (id: string) => setRoleIds((current) => current.includes(id) ? current.filter((value) => value !== id) : [...current, id]);

  const submit = async (event: FormEvent<HTMLFormElement>) => {
    event.preventDefault();
    setError('');
-    setSubmitting(true);
    const data = new FormData(event.currentTarget);
+    const email = String(data.get('email') ?? '').trim();
+    if (inspectorSelected && !email) {
+      setError('El email es obligatorio para usuarios con rol Inspector porque allí recibirán la documentación de sus inspecciones.');
+      return;
+    }
+    setSubmitting(true);
    try {
-      const created = await createUser({
+      const created = await createUserProfile({
        username: String(data.get('username')),
-        email: String(data.get('email') ?? '') || undefined,
+        email: email || null,
+        dni: String(data.get('dni') ?? '').trim() || null,
+        phone: String(data.get('phone') ?? '').trim() || null,
+        jobTitle: String(data.get('jobTitle') ?? '').trim() || null,
+        employeeNumber: String(data.get('employeeNumber') ?? '').trim() || null,
        firstName: String(data.get('firstName')),
        lastName: String(data.get('lastName')),
        password: String(data.get('password')),
@@ -45,10 +59,30 @@ export function NewUserPage() {

  return <section className="narrow-section">
    <div className="breadcrumb"><Link to="/admin/users">Usuarios</Link><span>/</span><strong>Nuevo usuario</strong></div>
-    <div className="page-heading"><div><span className="eyebrow">NUEVO ACCESO</span><h1>Crear usuario</h1><p>La contraseña inicial puede obligarse a cambiar en el primer ingreso.</p></div></div>
+    <div className="page-heading"><div><span className="eyebrow">NUEVO ACCESO</span><h1>Crear usuario</h1><p>Además del acceso, registrá los datos personales que identifican al agente y permiten las comunicaciones oficiales.</p></div></div>
    {error && <Alert>{error}</Alert>}
    {loading ? <LoadingBlock /> : <form className="panel form-panel" onSubmit={submit}>
-      <div className="form-section"><h2>Datos personales</h2><div className="form-grid"><label className="field"><span>Nombre</span><input name="firstName" required maxLength={120} /></label><label className="field"><span>Apellido</span><input name="lastName" required maxLength={120} /></label><label className="field"><span>Usuario</span><input name="username" required minLength={3} maxLength={80} pattern="[a-zA-Z][a-zA-Z0-9._-]+" /></label><label className="field"><span>Email <em>opcional</em></span><input name="email" type="email" maxLength={320} /></label></div></div>
+      <div className="form-section">
+        <div><h2>Datos personales</h2><p className="section-copy">Nombre y apellido identifican al agente. DNI, contacto y función quedan asociados a su historial operativo.</p></div>
+        <div className="form-grid">
+          <label className="field"><span>Nombre <em>obligatorio</em></span><input name="firstName" required maxLength={120} /></label>
+          <label className="field"><span>Apellido <em>obligatorio</em></span><input name="lastName" required maxLength={120} /></label>
+          <label className="field"><span>DNI</span><input name="dni" inputMode="numeric" maxLength={15} placeholder="Sin puntos" /></label>
+          <label className="field"><span>Teléfono</span><input name="phone" type="tel" maxLength={40} placeholder="Ej.: +54 261 ..." /></label>
+          <label className="field"><span>Cargo / función</span><input name="jobTitle" maxLength={160} placeholder="Ej.: Inspector de Hidrocarburos" /></label>
+          <label className="field"><span>Legajo / matrícula</span><input name="employeeNumber" maxLength={80} /></label>
+        </div>
+      </div>
+
+      <div className="form-section">
+        <div><h2>Acceso y contacto</h2><p className="section-copy">El email del Inspector se utiliza también como destinatario de la documentación al cerrar la inspección.</p></div>
+        <div className="form-grid">
+          <label className="field"><span>Usuario <em>obligatorio</em></span><input name="username" required minLength={3} maxLength={80} pattern="[a-zA-Z][a-zA-Z0-9._-]+" /></label>
+          <label className="field"><span>Email {inspectorSelected ? <em>obligatorio para Inspector</em> : <em>recomendado</em>}</span><input name="email" type="email" maxLength={320} required={inspectorSelected} /></label>
+        </div>
+        {inspectorSelected && <div className="temporal-notice"><Icon name="mail" /><p><strong>Inspector:</strong> este email recibirá copia de las Actas/Informe correspondientes al cierre de la inspección.</p></div>}
+      </div>
+
      <div className="form-section"><h2>Seguridad</h2><label className="field"><span>Contraseña temporal</span><input name="password" type="password" minLength={12} maxLength={128} required autoComplete="new-password" /><small>Mínimo 12 caracteres.</small></label><label className="check-row"><input name="mustChangePassword" type="checkbox" defaultChecked /><span><strong>Exigir cambio de contraseña</strong><small>El usuario no podrá acceder a otros módulos hasta actualizarla.</small></span></label></div>
      <div className="form-section"><h2>Roles</h2><div className="choice-grid">{roles.map((role) => <label className={`choice-card ${roleIds.includes(role.id) ? 'selected' : ''}`} key={role.id}><input type="checkbox" checked={roleIds.includes(role.id)} onChange={() => toggleRole(role.id)} /><span><strong>{role.name}</strong><small>{role.description}</small></span><Icon name="check" /></label>)}</div></div>
      <div className="form-actions"><Link className="button secondary" to="/admin/users">Cancelar</Link><button className="button primary" disabled={submitting}>{submitting ? 'Creando…' : 'Crear usuario'}</button></div>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
admin	03a3a66c51	F3.2 Android: permitir preparar Actas de verificación sin Hallazgos nuevos	2026-09-07 16:50:17 -03:00
admin	2d4e8ae2a7	F3.2 Android: permitir Actas READY paralelas y delegar cierre al servidor	2026-09-07 16:43:24 -03:00
admin	3e5dfb78a2	F3.2 Android: corregir Card clickeable de mensajes	2026-09-07 16:35:37 -03:00
admin	ecf6f71c58	F3.2 Android: corregir API de PointerInput en firma	2026-09-07 16:34:33 -03:00
admin	bd0f22969c	F3.2 API: restaurar manifiesto exacto de producción	2026-09-07 16:26:48 -03:00
admin	5f3987747d	F3.2 API: conservar dependencias y cambiar sólo versión	2026-09-07 16:26:32 -03:00
admin	a208788488	F3.2: agregar CI de integración multi-Acta	2026-09-07 16:25:23 -03:00
admin	2e5183cc3c	F3.2 API: actualizar versión de paquete	2026-09-07 16:24:57 -03:00
admin	80ce9ced0f	F3.2 API: versionar integración multi-Acta móvil	2026-09-07 16:24:42 -03:00
admin	d49fb81bcf	F3.2 Android: activar CI y artefacto 0.12.0	2026-09-07 16:24:31 -03:00
admin	9e50967089	F3.2 Android: versionar APK 0.12.0	2026-09-07 16:24:16 -03:00
admin	a1450da51e	F3.2 Android: integrar Actas en la navegación de inspección	2026-09-07 16:23:10 -03:00
admin	97a774c264	F3.2 Android: implementar gestión y cierre secuencial de Actas	2026-09-07 16:20:08 -03:00
admin	c9f1434462	F3.2 Android: agregar pad manuscrito PNG para firmas	2026-09-07 16:18:28 -03:00
admin	d14cf737c0	F3.2 Android: incorporar estado multi-Acta y cierre	2026-09-07 16:16:09 -03:00
admin	9f60e671d2	F3.2 Android: agregar cliente de Actas y cierre	2026-09-07 16:14:43 -03:00
admin	28f6fb3684	F3.2 Android: enviar Acta explícita en Hallazgos	2026-09-07 16:13:52 -03:00
admin	d7184ed537	F3.2: fijar contrato multi-Acta móvil y cierre secuencial	2026-09-07 16:13:22 -03:00
admin	203443d9c6	F3.2: resolver Hallazgos contra Acta explícita	2026-09-07 16:12:03 -03:00
admin	45ca6a783e	F3.2: recibir Acta explícita en Hallazgos de campo	2026-09-07 16:11:20 -03:00
admin	d3bfdeac67	F3.2: permitir Acta explícita al crear Hallazgo de campo	2026-09-07 16:11:05 -03:00
admin	9479ae6d1a	F3.2: agregar selección explícita de Acta en Hallazgos de campo	2026-09-07 16:10:49 -03:00
admin	4ca65c6a89	F3.1 hotfix · aislar preflight API del WEB (#19 ) Separa el contrato visual F3.1 del test API y agrega a CI el mismo preflight Docker aislado que ejecuta el VPS antes de producción.	2026-09-07 15:53:27 -03:00
admin	3495b33157	CI: replicar preflight API aislado del deploy VPS	2026-09-07 15:48:40 -03:00
admin	115a6a2ed8	F3.1 hotfix: ejecutar contrato visual dentro del job WEB	2026-09-07 15:47:30 -03:00
admin	4796581532	F3.1 hotfix: mover contrato visual a CI WEB	2026-09-07 15:47:16 -03:00
admin	1d3979fda3	F3.1 hotfix: aislar tests API del filesystem WEB	2026-09-07 15:47:02 -03:00
admin	72e75fab2f	F3.1 · Inventario estructural, catálogo contextual y conciliación cronológica (#18 ) Integra F3.1 con jerarquía estructural de Inventario, familias técnicas/Otro, catálogo contextual, merges append-only, perfil de Inspector, entrega documental al Inspector y APK Android 0.11.0. Todas las barreras API/WEB/DB/Docker/Android quedaron verdes antes del merge.	2026-09-07 15:39:26 -03:00
admin	29d541a274	F3.1 Android: disparar build final 0.11.0	2026-09-07 15:29:44 -03:00
admin	d9a23c4c80	F3.1 Android: ejecutar validación final de APK 0.11.0	2026-09-07 15:29:13 -03:00
admin	f2cb276785	F3.1 CI: validar entrega documental al Inspector	2026-09-07 15:26:14 -03:00
admin	37e4b840d9	F3.1 WEB: mostrar entregas documentales al Inspector	2026-09-07 15:25:40 -03:00
admin	463734f5b0	F3.1: enviar copia del Acta al Inspector responsable	2026-09-07 15:24:27 -03:00
admin	f334f2baaa	F3.1: agregar Inspector al outbox documental	2026-09-07 15:23:28 -03:00
admin	e689ab57ec	F3.1 CI: usar nombres reales del merge de catálogo	2026-09-07 15:20:20 -03:00
admin	e54fa4503a	F3.1 WEB: administrar merge cronológico de Hallazgos de catálogo	2026-09-07 15:15:58 -03:00
admin	810ac860c7	F3.1 WEB: cliente para conciliación del catálogo de Hallazgos	2026-09-07 15:15:19 -03:00
admin	a4b5bdd3a9	F3.1 CI: corregir asserts PostgreSQL y cubrir merge de catálogo	2026-09-07 15:12:52 -03:00
admin	a02a2dc4a8	F3.1: corregir contrato de contexto móvil estructural	2026-09-07 14:46:48 -03:00
admin	9455254e6a	F3.1: estabilizar tipos del dossier fusionado	2026-09-07 14:46:04 -03:00
admin	7329cee080	F3.1 APK: usar catálogo familiar y limitar Hallazgos a niveles técnicos	2026-09-07 14:44:30 -03:00
admin	76b688ac82	F3.1: usar familia técnica y exponer merge de catálogo	2026-09-07 14:43:43 -03:00
admin	5fc239c664	F3.1: registrar resolver y merge del catálogo	2026-09-07 14:43:14 -03:00
admin	6f335ab482	F3.1: implementar merge cronológico del catálogo	2026-09-07 14:42:50 -03:00
admin	a521d0fec7	F3.1: resolver Hallazgos por familia técnica	2026-09-07 14:42:09 -03:00
admin	48b6962d93	F3.1: agregar DTO de merge de Hallazgos de catálogo	2026-09-07 14:41:47 -03:00
admin	aa26dc2227	F3.1: agregar merge auditable del catálogo de Hallazgos	2026-09-07 14:41:34 -03:00
admin	0e14157a44	F3.1 CI: compilar APK estructural 0.11.0	2026-09-07 14:39:03 -03:00
admin	2acc3e095b	F3.1 Android: versionar APK 0.11.0	2026-09-07 14:38:47 -03:00
admin	9d5da0522d	F3.1 Android: activar flujo estructural dentro de la inspección	2026-09-07 14:37:59 -03:00
admin	e443031bda	F3.1 Android: crear flujo estructural intuitivo de inspección	2026-09-07 14:37:30 -03:00
admin	3dba89f55a	F3.1 Android: mantener compatibilidad durante reemplazo de Inventario	2026-09-07 14:35:58 -03:00
admin	dcc2e56b3e	F3.1 Android: clasificar y conciliar altas de campo	2026-09-07 14:31:47 -03:00
admin	51a2789bbd	F3.1 Android: agregar familias y merge de Inventario	2026-09-07 14:30:52 -03:00
admin	1212a21ea3	F3.1 APK: usar alta estructural y familia contextual	2026-09-07 14:29:23 -03:00
admin	e296f18ed1	F3.1 APK: registrar flujo estructural de campo	2026-09-07 14:29:02 -03:00
admin	782b0150c5	F3.1 APK: alinear alta de campo con estructura y familias	2026-09-07 14:28:39 -03:00
admin	f92611eaa1	F3.1 APK: incluir familia técnica en alta de campo	2026-09-07 14:27:45 -03:00
admin	e7a3faa912	F3.1: probar perfil, dossier y alta Otro	2026-09-07 14:26:05 -03:00
admin	3478c98f11	F3.1 CI: validar migraciones en PostgreSQL real	2026-09-07 14:25:47 -03:00
admin	9e58a5fa9e	F3.1: agregar Otro para Instalación y Subinstalación	2026-09-07 14:24:51 -03:00
admin	bd71e74df6	F3.1 WEB: gestionar merge desde el expediente	2026-09-07 14:23:37 -03:00
admin	636431f936	F3.1 WEB: agregar contrato de merge cronológico	2026-09-07 14:22:28 -03:00
admin	dafb57d706	F3.1: servir dossier cronológico agregado	2026-09-07 14:20:47 -03:00
admin	a450665a6d	F3.1: registrar dossier unificado por merge	2026-09-07 14:20:22 -03:00
admin	9645d29ad8	F3.1: unificar dossier cronológico tras merges	2026-09-07 14:19:54 -03:00
admin	f5b8ae38e3	F3.1 WEB: editar perfil personal completo del Inspector	2026-09-07 14:16:46 -03:00
admin	b996a979d6	F3.1 WEB: agregar icono de email	2026-09-07 14:15:58 -03:00
admin	ebc4c303e4	F3.1 WEB: ampliar alta de usuarios e Inspector	2026-09-07 14:15:23 -03:00
admin	5d066d1819	F3.1 WEB: agregar contrato de perfil personal	2026-09-07 14:14:50 -03:00
admin	ff5cf080e7	F3.1: persistir perfil personal y exigir email al Inspector	2026-09-07 14:13:43 -03:00
admin	4e2c7f85ef	F3.1: ampliar edición del perfil de usuario	2026-09-07 14:12:09 -03:00
admin	9ece0c1100	F3.1: ampliar alta administrativa de usuario	2026-09-07 14:11:47 -03:00
admin	066b387f2b	F3.1: agregar datos personales al usuario	2026-09-07 14:11:21 -03:00
admin	a3fbc17cb3	F3.1: ampliar perfil personal del inspector	2026-09-07 14:10:53 -03:00
admin	fd94200fc5	F3.1: probar merge cronológico sin pérdida de historia	2026-09-07 14:09:24 -03:00
admin	8896e8d183	F3.1: registrar merge cronológico de Inventario	2026-09-07 14:08:55 -03:00
admin	516b310c48	F3.1: exponer merge cronológico en plataforma y APK	2026-09-07 14:08:38 -03:00
admin	08291acc8d	F3.1: implementar merge cronológico de Inventario	2026-09-07 14:08:22 -03:00
admin	7d041dd3b2	F3.1: agregar DTO de fusión de Inventario	2026-09-07 14:07:01 -03:00
admin	34dcd68482	F3.1: agregar merge cronológico de Inventario	2026-09-07 14:06:47 -03:00
admin	a76da6787c	F3.1: corregir build Docker de alta estructural	2026-09-07 14:01:14 -03:00
admin	3ce85d8d2e	F3.1 CI: validar Inventario estructural y catálogo	2026-09-07 10:23:20 -03:00
admin	e5b522b667	F3.1: versionar WEB 0.21.0-1	2026-09-07 10:22:36 -03:00
admin	31fc355e98	F3.1: alinear versión de paquete API	2026-09-07 10:22:26 -03:00
admin	af6ccfee4c	F3.1: versionar API 0.24.0-1	2026-09-07 10:22:11 -03:00
admin	8582274643	F3.1: probar estructura de Inventario y catálogo revisado	2026-09-07 10:22:02 -03:00
admin	6102740647	F3.1: permitir consulta contextual desde Inventario	2026-09-07 10:21:12 -03:00
admin	dec8908bbe	F3.1 WEB: activar alta guiada y retirar rutas de Relevamientos	2026-09-07 10:20:45 -03:00
admin	4902e97b51	F3.1 WEB: retirar Relevamientos de navegación activa	2026-09-07 10:20:14 -03:00
admin	d5bd5777f1	F3.1 WEB: crear alta guiada de Inventario	2026-09-07 10:19:40 -03:00
admin	f34d6fe521	F3.1 WEB: agregar cliente de Inventario estructural	2026-09-07 10:18:19 -03:00
admin	5d2fec0f25	F3.1: integrar catálogo por familia técnica	2026-09-07 10:18:00 -03:00
admin	0f94a20298	F3.1: exponer Hallazgos por familia técnica	2026-09-07 10:17:34 -03:00
admin	f3af297a71	F3.1: consultar Hallazgos asociados por familia	2026-09-07 10:17:19 -03:00
admin	765d48f694	F3.1: exponer padres válidos para cada nivel	2026-09-07 10:16:07 -03:00
admin	0f2885c562	F3.1: listar padres válidos para alta guiada	2026-09-07 10:15:47 -03:00
admin	ab3e699926	F3.1: limitar cambio de Asset a familia técnica	2026-09-07 10:13:01 -03:00
admin	90c049a3c6	F3.1: sincronizar catálogo por familia técnica	2026-09-07 10:10:14 -03:00
admin	63528b1eff	F3.1: integrar Inventario estructural	2026-09-07 10:09:17 -03:00
admin	344699ac75	F3.1: exponer alta guiada de Inventario	2026-09-07 10:08:59 -03:00
admin	620e6f07c4	F3.1: crear servicio guiado de Inventario estructural	2026-09-07 10:08:47 -03:00
admin	14d9467c0e	F3.1: definir alta guiada de estructura de Inventario	2026-09-07 10:07:46 -03:00
admin	4f1e24ef83	F3.1: aceptar familia técnica en altas de Inventario	2026-09-07 10:06:53 -03:00
admin	c4796adb39	F3.1: asociar Inventario con familia técnica	2026-09-07 10:06:27 -03:00
admin	f387645ff9	F3.1: migrar Inventario estructural y recargar catálogo	2026-09-07 10:06:03 -03:00
admin	da2598c03d	F3.1: registrar estructura y catálogo desde Excel revisado	2026-09-07 10:01:57 -03:00
admin	bdaccb66d0	F2.4 CI: compilar APK 0.10.3	2026-09-07 08:51:33 -03:00
admin	f5f6afe797	F2.4 Android: versionar APK 0.10.3	2026-09-07 08:51:16 -03:00
admin	c524d2ade6	F2.4 Android: capturar foto GPS por Hallazgo	2026-09-07 08:50:46 -03:00
admin	a2ed3cf091	F2.4 Android: gestionar evidencias por Hallazgo	2026-09-07 08:49:30 -03:00
admin	c4c6dd6c24	F2.4 Android: agregar evidencias fotográficas al Hallazgo	2026-09-07 08:48:36 -03:00
admin	cb69cea3a9	F2.3: alinear versión de paquete API	2026-09-07 08:40:50 -03:00
admin	721a189b4c	F2.3: versionar API 0.23.0-1	2026-09-07 08:40:20 -03:00
admin	6895edce20	F2.3: probar contrato de Hallazgos desde Inventario	2026-09-07 08:39:59 -03:00
admin	97f5fbdd9e	F2.3 CI: conservar diagnóstico de build	2026-09-07 08:38:17 -03:00
admin	1a89024117	F2.3: estabilizar declaraciones públicas del controller	2026-09-07 08:37:59 -03:00
admin	f9fd66d913	F2.3 CI: conservar diagnóstico de tests	2026-09-07 08:36:30 -03:00
admin	2143b9454f	F2.3 CI: conservar diagnóstico de TypeScript	2026-09-07 08:35:22 -03:00
admin	d765f7d65e	F2.3: preservar validación runtime del DTO móvil	2026-09-07 08:34:03 -03:00
admin	c5dde72b7f	F2.3 CI: validar API y contrato de Hallazgos de campo	2026-09-07 08:32:07 -03:00
admin	3988918023	F2.3 CI: compilar APK 0.10.2	2026-09-07 08:31:51 -03:00
admin	acb2488025	F2.3 Android: versionar APK 0.10.2	2026-09-07 08:31:33 -03:00
admin	a49171fe31	F2.3 Android: enrutar Hallazgo después del desbloqueo	2026-09-07 08:31:11 -03:00
admin	1f5040f3c5	F2.3 Android: crear pantalla de Hallazgo desde Inventario	2026-09-07 08:30:39 -03:00
admin	958a4d134d	F2.3 Android: integrar flujo de Hallazgos al ViewModel	2026-09-07 08:29:52 -03:00
admin	e7dd2a7284	F2.3 Android: agregar contrato móvil de Hallazgos	2026-09-07 08:29:13 -03:00
admin	dd4199cd91	F2.3: integrar Hallazgos de campo en visitas	2026-09-07 08:26:51 -03:00
admin	299a637901	F2.3: exportar catálogo y servicio de Hallazgos	2026-09-07 08:26:40 -03:00
admin	1334611ebc	F2.3: reforzar puerta servidor para Hallazgos de campo	2026-09-07 08:26:28 -03:00
admin	f82de44ded	F2.3: exponer hallazgos de campo por Inventario	2026-09-07 08:25:28 -03:00
admin	dd8ea8539b	F2.3: crear servicio de hallazgos desde Inventario	2026-09-07 08:25:14 -03:00
admin	1c5efa8806	F2.3: agregar DTO de hallazgo de campo	2026-09-07 08:24:54 -03:00
admin	29c1abf907	fix: preservar etiquetas técnicas extensas del Excel	2026-09-06 22:48:01 -03:00
admin	7b5050e08e	fix: garantizar tipos base Área y Organización	2026-09-06 22:44:30 -03:00
admin	5c0b8ed786	ci: corregir sintaxis del smoke de migraciones	2026-09-06 22:43:02 -03:00
admin	ba4752a700	ci: ejecutar migraciones F2.2.1 sobre PostgreSQL real	2026-09-06 22:41:40 -03:00
admin	cf3327a4da	fix: endurecer migración F2.2.1 contra PostgreSQL real	2026-09-06 22:41:03 -03:00
admin	e09930d411	F2.2.1: crear baseline temporal del maestro importado	2026-09-06 21:32:19 -03:00
admin	012703336a	ci: validar integración F2.2.1	2026-09-06 21:31:00 -03:00
admin	5f5c790301	ci: validar Android F2.2.1	2026-09-06 21:30:50 -03:00
admin	6ed0ce4731	F2.2.1: identificar health de API	2026-09-06 21:30:31 -03:00
admin	f78781ed9a	F2.2.1: versionar API 0.22.1-1	2026-09-06 21:30:25 -03:00
admin	60ecfff794	test: validar normalización de planillas F2.2.1	2026-09-06 21:30:03 -03:00
admin	3db62aad77	F2.2.1: importar maestros y catálogo desde planillas oficiales	2026-09-06 21:29:46 -03:00
admin	83efd2cac2	F2.2.1: versionar fuente normalizada de planillas	2026-09-06 21:28:05 -03:00
admin	e5b7d72951	android: usar puerta de acceso biométrica	2026-09-06 21:25:21 -03:00
admin	f9cc561098	android: agregar ojo y desbloqueo biométrico	2026-09-06 21:25:13 -03:00
admin	7673afcc4f	android: agregar biometría y visibilidad de contraseña	2026-09-06 21:24:49 -03:00
admin	30a06f17f3	F2.2: identificar health de API	2026-09-06 16:55:38 -03:00
admin	f8da455241	F2.2: versionar API 0.22.0-1	2026-09-06 16:55:32 -03:00
admin	0103422473	android: corregir token de cancelación GPS	2026-09-06 16:49:16 -03:00
admin	cd42e55b7b	ci: validar backend y web en rama F2.2	2026-09-06 16:42:32 -03:00
admin	205b97f16b	ci: compilar APK Android F2.2	2026-09-06 16:41:48 -03:00
admin	118e41c938	android: implementar flujo inspector y alta de Inventario	2026-09-06 16:41:07 -03:00
admin	00ac09f358	android: agregar actividad principal Compose	2026-09-06 16:39:22 -03:00
admin	199129847e	android: agregar estado y operaciones de campo	2026-09-06 16:38:52 -03:00
admin	216a813f50	android: implementar contrato API y sesión cifrada	2026-09-06 16:38:21 -03:00
admin	ad79fb589d	android: agregar tema base	2026-09-06 16:37:08 -03:00
admin	0b2c7f0216	android: agregar recursos de texto	2026-09-06 16:37:01 -03:00
admin	2a7bf54ce1	android: configurar almacenamiento de fotos	2026-09-06 16:36:54 -03:00
admin	692e6119cc	android: declarar permisos y FileProvider	2026-09-06 16:36:48 -03:00
admin	b3d6ae1326	android: agregar reglas base	2026-09-06 16:36:40 -03:00
admin	0d181b37a0	android: configurar aplicación DH Inspección	2026-09-06 16:36:32 -03:00
admin	db3d87727e	android: fijar propiedades de build	2026-09-06 16:36:18 -03:00
admin	5b708e433f	android: configurar AGP y Kotlin	2026-09-06 16:36:13 -03:00
admin	3d101e239c	android: iniciar proyecto nativo F2.2	2026-09-06 16:36:04 -03:00
admin	3a0c37b2a7	F2.2: integrar autenticación móvil segura F2.2: contrato seguro de autenticación Android	2026-09-06 16:33:48 -03:00
admin	4c01cf6ffe	fix: alinear health con API 0.21.0-2	2026-09-05 22:27:29 -03:00
admin	26ec07864a	docs: conservar README	2026-09-05 22:21:47 -03:00
admin	65cb28299d	docs: mantener README estable	2026-09-05 22:21:39 -03:00
admin	f2f9ccaa72	docs: no-op README	2026-09-05 22:21:34 -03:00
admin	c7fd1f8583	docs: estabilizar README	2026-09-05 22:21:28 -03:00
admin	c50360e732	docs: simplificar README	2026-09-05 22:21:21 -03:00
admin	387357b96c	docs: restaurar README operativo	2026-09-05 22:21:13 -03:00
admin	eb47a3d66f	docs: registrar política operativa de reset seguro	2026-09-05 22:21:04 -03:00
admin	66333fb5dd	ops: blindar reset preservando configuración estructural	2026-09-05 22:17:45 -03:00
admin	06f809b4c8	ops: versionar API 0.21.0-2 para reset limpio	2026-09-05 22:15:10 -03:00
admin	343c889250	ops: preparar reset limpio de datos operativos	2026-09-05 22:12:18 -03:00
admin	4fb1c502c8	F2.2: registrar autenticación móvil	2026-09-05 20:20:56 -03:00
admin	d895812235	F2.2: exponer endpoints de autenticación Android	2026-09-05 20:20:47 -03:00
admin	f680764373	F2.2: implementar autenticación Bearer Android	2026-09-05 20:20:40 -03:00
admin	acc17bf291	F2.2: agregar DTO de refresh móvil	2026-09-05 20:20:16 -03:00
admin	1b57dcc850	maintenance: retirar diagnóstico Android temporal	2026-09-05 20:12:53 -03:00
admin	77d750992d	maintenance: localizar fuente Android en VPS Diagnóstico temporal de solo lectura para localizar fuentes/artefactos Android en el VPS y publicar el resultado en deploy-status.	2026-09-05 20:11:19 -03:00
admin	b30cc1a294	maintenance: corregir diagnóstico Android de solo lectura	2026-09-05 20:07:58 -03:00
admin	a7a6680cf8	maintenance: descubrir fuente Android en VPS sin modificar datos	2026-09-05 20:07:40 -03:00
admin	44570ad457	maintenance: retirar fresh-start temporal Restaura migration:run y deploy-github estándar y elimina la herramienta fresh-start luego de la limpieza exitosa.	2026-09-05 20:04:46 -03:00
admin	8caed06362	maintenance: retirar herramienta destructiva temporal	2026-09-05 20:01:48 -03:00
admin	e3db3d6cd7	maintenance: restaurar deploy estándar tras fresh-start	2026-09-05 20:01:37 -03:00
admin	fb7b29cd94	maintenance: retirar hook de fresh-start	2026-09-05 20:01:08 -03:00
admin	0a11a452b5	maintenance: ejecutar fresh-start definitivo Fresh-start único: backup integral de DB/source/media, limpieza de datos operativos y usuarios no-admin, reset de configuración editable, vaciado de archivos y verificación final.	2026-09-05 19:57:49 -03:00
admin	1d661e2e48	maintenance: respaldar y vaciar volumen de archivos en fresh-start	2026-09-05 19:54:48 -03:00
admin	2ee956665f	maintenance: armar ejecución definitiva del fresh-start	2026-09-05 19:54:11 -03:00
admin	0d5db42c77	maintenance: cerrar whitelist del fresh-start Ajusta el preview para limpiar también Departamentos importados, conservar sólo estructura sembrada y reiniciar configuración institucional editable. Reactiva FK antes de eliminar usuarios.	2026-09-05 19:50:46 -03:00
admin	21127b8cff	maintenance: limpiar departamentos importados y resetear configuración editable	2026-09-05 19:47:42 -03:00
admin	50a9dc5183	maintenance: preservar configuración estructural y reforzar FK	2026-09-05 19:46:35 -03:00
admin	a69df1d2d6	maintenance: preview seguro de limpieza integral Agrega un fresh-start protegido y ejecuta únicamente el modo preview durante el paso de migraciones para inventariar la base real antes de borrar datos.	2026-09-05 19:41:46 -03:00
				`@@ -0,0 +1 @@`
				`# DH Inspección V2. Las reglas se ampliarán cuando se habilite minificación de release.`