test(android): align API contract with 0.17.0 field APK

feat: modelo autoritativo de Inventarios desde SQL definitivos

.github/workflows/ci.yml

@@ -116,9 +116,10 @@ jobs:
 
           docker compose --env-file .env.example --profile tools run --rm migrate
 
-          # F5.1 performs the historical clean start. F6.1 then seeds only the
-          # presentation territory approved by DH: 7 Departamentos, 64 Áreas,
-          # 230 Yacimientos and 12 real Empresas.
+          # The completed chain must end in the exact authoritative SQL model:
+          # 7 Departamentos, 64 Áreas, 230 Yacimientos, 13 Empresas, 2 Tipos de
+          # concesión, 14/109 technical families, 181 Hallazgos and their exact
+          # 48 + 880 contextual mappings.
           docker compose --env-file .env.example exec -T db \
             psql -v ON_ERROR_STOP=1 -U dhv2_owner -d dhv2 <<'SQL'
           DO $$
@@ -127,13 +128,23 @@ jobs:
             domain_assets integer;
             audits integer;
             applicability integer;
-            territory_sources integer;
-            presentation_sources integer;
+            legacy_territory_sources integer;
+            legacy_presentation_sources integer;
+            authoritative_sources integer;
             source_installations integer;
             source_subinstallations integer;
             source_findings integer;
+            concession_types integer;
+            departments integer;
+            areas integer;
+            yacimientos integer;
+            companies integer;
+            invalid_yacimientos integer;
             department_types integer;
             area_department_rules integer;
+            yacimiento_area_rules integer;
+            installation_yacimiento_rules integer;
+            subinstallation_installation_rules integer;
           BEGIN
             SELECT COUNT(*) INTO f5_migrations
             FROM typeorm_migrations
@@ -150,49 +161,86 @@ jobs:
             END IF;
 
             SELECT COUNT(*) INTO domain_assets FROM assets;
-            IF domain_assets <> 313 THEN
-              RAISE EXCEPTION 'F6.1 presentation preload must contain 313 Assets, got %', domain_assets;
+            IF domain_assets <> 314 THEN
+              RAISE EXCEPTION 'Authoritative model must contain 314 Assets, got %', domain_assets;
             END IF;
 
             SELECT COUNT(*) INTO audits FROM audit_events;
             IF audits <> 0 THEN
-              RAISE EXCEPTION 'F6.1 presentation preload must start with 0 audit events, got %', audits;
+              RAISE EXCEPTION 'Clean authoritative rehearsal must start with 0 audit events, got %', audits;
             END IF;
 
             SELECT COUNT(*) INTO applicability FROM finding_catalog_item_inventory_families;
-            IF applicability <> 0 THEN
-              RAISE EXCEPTION 'Clean migration rehearsal must contain 0 finding applicability links, got %', applicability;
+            IF applicability <> 928 THEN
+              RAISE EXCEPTION 'Authoritative model must contain 928 finding applicability links, got %', applicability;
             END IF;
 
-            SELECT COUNT(*) INTO territory_sources
+            SELECT COUNT(*) INTO legacy_territory_sources
             FROM source_documents
             WHERE document_number='DH-F5-TERRITORY';
-            IF territory_sources <> 0 THEN
-              RAISE EXCEPTION 'F5.1 must remove the old territory source preload, got % rows', territory_sources;
+            IF legacy_territory_sources <> 0 THEN
+              RAISE EXCEPTION 'Authoritative model must remove the old F5 territory source, got % rows', legacy_territory_sources;
             END IF;
 
-            SELECT COUNT(*) INTO presentation_sources
+            SELECT COUNT(*) INTO legacy_presentation_sources
             FROM source_documents
             WHERE document_number='DH-F6.1-PRESENTATION-TERRITORY-20260909';
-            IF presentation_sources <> 1 THEN
-              RAISE EXCEPTION 'F6.1 must contain exactly one presentation territory source, got %', presentation_sources;
+            IF legacy_presentation_sources <> 0 THEN
+              RAISE EXCEPTION 'Authoritative model must remove the F6.1 presentation source, got % rows', legacy_presentation_sources;
+            END IF;
+
+            SELECT COUNT(*) INTO authoritative_sources
+            FROM source_documents
+            WHERE document_number IN ('DH-AUTH-TERRITORY-20260911','DH-AUTH-INVENTORY-20260911');
+            IF authoritative_sources <> 2 THEN
+              RAISE EXCEPTION 'Authoritative model must contain its two SQL source documents, got %', authoritative_sources;
             END IF;
 
             SELECT COUNT(*) FILTER (WHERE level='INSTALLATION'),
                    COUNT(*) FILTER (WHERE level='SUBINSTALLATION')
             INTO source_installations,source_subinstallations
             FROM inventory_families
-            WHERE is_active=true AND source_reference LIKE 'F5:final_modelov2.xlsx%';
+            WHERE is_active=true AND source_reference LIKE 'modelo_relacional:%';
             IF source_installations <> 14 OR source_subinstallations <> 109 THEN
-              RAISE EXCEPTION 'F6.1 must preserve technical family masters: installations %, subinstallations %', source_installations,source_subinstallations;
+              RAISE EXCEPTION 'Authoritative technical families must be 14 installations and 109 subinstallations, got % and %', source_installations,source_subinstallations;
             END IF;
 
             SELECT COUNT(*) INTO source_findings
             FROM finding_catalog_items item
             JOIN finding_categories category ON category.id=item.category_id
-            WHERE lower(category.code)='f5model' AND item.is_active=true;
-            IF source_findings <> 177 THEN
-              RAISE EXCEPTION 'F6.1 must preserve finding master catalog, got %', source_findings;
+            WHERE lower(category.code)='authmodel' AND item.is_active=true;
+            IF source_findings <> 181 THEN
+              RAISE EXCEPTION 'Authoritative finding catalog must contain 181 items, got %', source_findings;
+            END IF;
+
+            SELECT COUNT(*) INTO concession_types FROM concession_types WHERE is_active=true;
+            IF concession_types <> 2 THEN
+              RAISE EXCEPTION 'Authoritative model must contain 2 concession types, got %', concession_types;
+            END IF;
+
+            SELECT COUNT(*) FILTER (WHERE lower(type.code)='departamento'),
+                   COUNT(*) FILTER (WHERE lower(type.code)='area'),
+                   COUNT(*) FILTER (WHERE lower(type.code)='yacimiento'),
+                   COUNT(*) FILTER (WHERE type.operational_role='COMPANY')
+            INTO departments,areas,yacimientos,companies
+            FROM assets asset
+            JOIN asset_types type ON type.id=asset.asset_type_id;
+            IF departments <> 7 OR areas <> 64 OR yacimientos <> 230 OR companies <> 13 THEN
+              RAISE EXCEPTION 'Authoritative territory mismatch: departments %, areas %, yacimientos %, companies %', departments,areas,yacimientos,companies;
+            END IF;
+
+            SELECT COUNT(*) INTO invalid_yacimientos
+            FROM assets yacimiento
+            JOIN asset_types type ON type.id=yacimiento.asset_type_id
+            JOIN assets area ON area.id=yacimiento.parent_id
+            WHERE lower(type.code)='yacimiento'
+              AND (
+                yacimiento.operational_area_id IS DISTINCT FROM area.id
+                OR yacimiento.operator_company_id IS NULL
+                OR yacimiento.concession_type_id IS NULL
+              );
+            IF invalid_yacimientos <> 0 THEN
+              RAISE EXCEPTION 'Authoritative model contains % invalid Yacimiento relationships', invalid_yacimientos;
             END IF;
 
             SELECT COUNT(*) INTO department_types
@@ -210,16 +258,43 @@ jobs:
             IF area_department_rules <> 1 THEN
               RAISE EXCEPTION 'Expected Area → Departamento canonical rule, got %', area_department_rules;
             END IF;
+
+            SELECT COUNT(*) INTO yacimiento_area_rules
+            FROM asset_type_parent_rules rule
+            JOIN asset_types child ON child.id=rule.child_type_id
+            JOIN asset_types parent ON parent.id=rule.parent_type_id
+            WHERE lower(child.code)='yacimiento' AND lower(parent.code)='area';
+            IF yacimiento_area_rules <> 1 THEN
+              RAISE EXCEPTION 'Expected Yacimiento → Área canonical rule, got %', yacimiento_area_rules;
+            END IF;
+
+            SELECT COUNT(*) INTO installation_yacimiento_rules
+            FROM asset_type_parent_rules rule
+            JOIN asset_types child ON child.id=rule.child_type_id
+            JOIN asset_types parent ON parent.id=rule.parent_type_id
+            WHERE lower(child.code)='instalacion' AND lower(parent.code)='yacimiento';
+            IF installation_yacimiento_rules <> 1 THEN
+              RAISE EXCEPTION 'Expected Instalación → Yacimiento canonical rule, got %', installation_yacimiento_rules;
+            END IF;
+
+            SELECT COUNT(*) INTO subinstallation_installation_rules
+            FROM asset_type_parent_rules rule
+            JOIN asset_types child ON child.id=rule.child_type_id
+            JOIN asset_types parent ON parent.id=rule.parent_type_id
+            WHERE lower(child.code)='subinstalacion' AND lower(parent.code)='instalacion';
+            IF subinstallation_installation_rules <> 1 THEN
+              RAISE EXCEPTION 'Expected Subinstalación → Instalación canonical rule, got %', subinstallation_installation_rules;
+            END IF;
           END $$;
           SQL
 
-          # Both destructive cuts are intentionally one-way: production rollback is
-          # the PRE database backup, not migration:revert. Prove the completed chain
-          # is idempotent and has no pending migration on a second run.
+          # Destructive cuts are intentionally one-way: production rollback is
+          # the PRE database backup, not migration:revert. Prove the completed
+          # chain is idempotent and has no pending migration on a second run.
           rerun_log="$(mktemp)"
           docker compose --env-file .env.example --profile tools run --rm migrate 2>&1 | tee "$rerun_log"
           grep -Eq 'No pending migrations|Applied migrations: 0' "$rerun_log" || {
-            echo "ERROR: F6.1 migration chain is not idempotent." >&2
+            echo "ERROR: authoritative migration chain is not idempotent." >&2
             cat "$rerun_log" >&2
             exit 1
           }

android-app/RELEASE.md

@@ -1,10 +1,10 @@
-# DH Inspección Android · release F6.1
+# DH Inspección Android · release Campo Dinámico 0.17.0
 
 ## Candidata vigente
 
-- Fase funcional: **F6.1**.
-- `versionName`: **0.15.1**.
-- `versionCode`: **23**.
+- Fase funcional: **Campo Dinámico / alta rápida de Inventario**.
+- `versionName`: **0.17.0**.
+- `versionCode`: **26**.
 - Application ID release: `com.korexlabs.dhinspeccion`.
 - Application ID debug/QA: `com.korexlabs.dhinspeccion.debug`.
 - API: `https://dhv2.korexlabs.com/api/v3/`.
@@ -12,6 +12,18 @@
 
 La variante debug es independiente de la app productiva y puede instalarse para QA/presentación sin sobrescribir una instalación release histórica.
 
+## Novedades de campo 0.17.0
+
+La pantalla de una Inspección incorpora un acceso destacado a **Modo campo rápido**. La carga de una Subinstalación se resuelve como flujo guiado:
+
+1. elegir la **Instalación padre** dentro del Yacimiento de la Inspección;
+2. buscar y seleccionar la **clasificación técnica** compatible, identificar el elemento y completar únicamente los datos dinámicos que correspondan;
+3. tocar **Guardar y tomar foto**: la APK captura GPS y abre la cámara automáticamente.
+
+Se mantienen las reglas de integridad existentes: la fotografía sigue siendo obligatoria antes de habilitar Hallazgos, el alta queda ligada al contexto de la Inspección, se conserva la posibilidad de buscar Inventario existente y el mecanismo de fusión de duplicados continúa disponible para altas de campo.
+
+La búsqueda de clasificación técnica está preparada para catálogos extensos de Subinstalaciones sin obligar al inspector a recorrer una fila horizontal completa.
+
 ## Barrera obligatoria
 
 Todo cambio Android o de API que pueda afectar al cliente móvil debe pasar `Android CI / RC`:
@@ -44,5 +56,5 @@ Antes de distribuir una APK productiva:
 - todas las barreras de CI del SHA exacto deben estar verdes;
 - comprobar certificado/huella de firma contra la versión histórica;
 - realizar actualización sobre al menos una tablet con la versión productiva anterior;
-- ejecutar smoke funcional contra el entorno objetivo: login, lista de inspecciones, inicio, inventario, alta de campo, foto/GPS, Acta, Hallazgo y cierre;
+- ejecutar smoke funcional contra el entorno objetivo: login, lista de inspecciones, inicio, alta rápida de Subinstalación, GPS/foto, búsqueda de Inventario existente, Acta, Hallazgo y cierre;
 - registrar el SHA Git y SHA-256 de la APK distribuida.

android-app/app/build.gradle.kts

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

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

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

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

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

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

@@ -0,0 +1,26 @@
+package com.korexlabs.dhinspeccion
+
+import java.io.File
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class DynamicFieldFlowContractTest {
+    private val source = File("src/main/java/com/korexlabs/dhinspeccion/ui/DynamicVisitRoot.kt").readText()
+
+    @Test
+    fun fastSubinstallationFlowKeepsParentClassificationAndCaptureSteps() {
+        assertTrue(source.contains("Elegí la Instalación padre"))
+        assertTrue(source.contains("Clasificación técnica *"))
+        assertTrue(source.contains("Guardar y tomar foto"))
+        assertTrue(source.contains("model.loadFieldTypes(item.id)"))
+        assertTrue(source.contains("parentId = item.id"))
+    }
+
+    @Test
+    fun fieldCaptureStillRequiresGpsAndPhotoBeforeFindings() {
+        assertTrue(source.contains("La foto sigue siendo obligatoria antes de crear Hallazgos"))
+        assertTrue(source.contains("creationGpsCaptured"))
+        assertTrue(source.contains("fieldPhotoCount == 0"))
+        assertTrue(source.contains("model.uploadFieldPhoto"))
+    }
+}

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

@@ -8,8 +8,8 @@ class ReleaseMetadataTest {
     @Test
     fun debugBuildKeepsSeparateApplicationIdentity() {
         assertEquals("com.korexlabs.dhinspeccion.debug", BuildConfig.APPLICATION_ID)
-        assertEquals(25, BuildConfig.VERSION_CODE)
-        assertEquals("0.16.0-debug", BuildConfig.VERSION_NAME)
+        assertEquals(26, BuildConfig.VERSION_CODE)
+        assertEquals("0.17.0-debug", BuildConfig.VERSION_NAME)
     }
 
     @Test

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

@@ -54,6 +54,10 @@ export class CreateAssetDto {
   @IsUUID('4')
   operatorCompanyId?: string | null;
 
+  @IsOptional()
+  @IsUUID('4')
+  concessionTypeId?: string | null;
+
   @IsOptional()
   @Transform(({ value }) =>
     typeof value === 'string' && value.trim() ? value.trim() : null,

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

@@ -11,6 +11,7 @@ import {
 
 // Invariante de dominio: Empresa es un maestro independiente. La jerarquía física
 // se expresa sólo como Departamento → Área → Yacimiento → Instalación → Subinstalación.
+// La Empresa y el Tipo de concesión se relacionan directamente con el Yacimiento.
 export const INVENTORY_STRUCTURE_KINDS = [
   'EMPRESA',
   'DEPARTAMENTO',
@@ -52,6 +53,14 @@ export class CreateInventoryStructureDto {
   @IsUUID('4')
   familyId?: string | null;
 
+  @IsOptional()
+  @IsUUID('4')
+  operatorCompanyId?: string | null;
+
+  @IsOptional()
+  @IsUUID('4')
+  concessionTypeId?: string | null;
+
   @IsOptional()
   @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
   @IsString()

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

@@ -48,14 +48,14 @@ export class UpdateAssetDto {
   @IsUUID('4')
   operationalAreaId?: string | null;
 
-  /**
-   * Snapshot histórico/de compatibilidad. La Operadora vigente pertenece a la
-   * relación temporal Área↔Empresa y no puede editarse como propiedad física.
-   */
   @IsOptional()
-  @IsEmpty({ message: 'La Operadora se administra en la relación temporal del Área, no en el Inventario' })
+  @IsEmpty({ message: 'La Empresa relacionada se administra en el Yacimiento, no desde la edición genérica del Inventario' })
   operatorCompanyId?: string | null;
 
+  @IsOptional()
+  @IsEmpty({ message: 'El Tipo de concesión se administra en el Yacimiento, no desde la edición genérica del Inventario' })
+  concessionTypeId?: string | null;
+
   @IsOptional()
   @Transform(({ value }) =>
     typeof value === 'string' && value.trim() ? value.trim() : null,

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

@@ -20,6 +20,7 @@ import type { CreateInventoryStructureDto, InventoryStructureKind } from './dto/
 import { AssetHistoryService } from './asset-history.service';
 
 type StructureTypeRow = { id: string; code: string; name: string };
+type SimpleOptionRow = { id: string; code: string; name: string };
 type FamilyParent = { id: string; code: string; name: string };
 type FamilyRow = {
   id: string;
@@ -37,9 +38,17 @@ type ParentRow = {
   name: string;
   typeCode: string;
   inventoryFamilyId: string | null;
+  operationalAreaId: string | null;
+  operatorCompanyId: string | null;
 };
 type IdRow = { id: string };
 
+type YacimientoContext = {
+  companyId: string;
+  concessionTypeId: string;
+  concessionName: string;
+};
+
 const TYPE_CODE_BY_KIND: Record<Exclude<InventoryStructureKind, 'EMPRESA'>, string> = {
   DEPARTAMENTO: 'departamento',
   AREA: 'area',
@@ -114,6 +123,21 @@ export class InventoryStructureService {
       ORDER BY family.level,family.name,family.code
     `)) as FamilyRow[];
 
+    const companies = (await this.dataSource.query(`
+      SELECT asset.id,asset.code,COALESCE(profile.legal_name,asset.name) AS name
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id AND type.operational_role='COMPANY' AND type.is_active=true
+      LEFT JOIN organization_profiles profile ON profile.asset_id=asset.id
+      WHERE asset.information_status<>'INACTIVE'
+      ORDER BY COALESCE(profile.legal_name,asset.name),asset.code
+    `)) as SimpleOptionRow[];
+    const concessionTypes = (await this.dataSource.query(`
+      SELECT id,code,name
+      FROM concession_types
+      WHERE is_active=true
+      ORDER BY CASE lower(name) WHEN 'explotación' THEN 1 WHEN 'exploración' THEN 2 ELSE 9 END,name,code
+    `)) as SimpleOptionRow[];
+
     return {
       independentMasters: [
         { kind: 'EMPRESA', label: 'Empresa', type: company, parentKind: null, requiresFamily: false },
@@ -125,6 +149,8 @@ export class InventoryStructureService {
         { kind: 'INSTALACION', label: 'Instalación', type: instalacion, parentKind: 'YACIMIENTO', requiresFamily: true },
         { kind: 'SUBINSTALACION', label: 'Subinstalación', type: subinstalacion, parentKind: 'INSTALACION', requiresFamily: true },
       ],
+      companies,
+      concessionTypes,
       installationFamilies: families.filter((item) => item.level==='INSTALLATION'),
       subinstallationFamilies: families.filter((item) => item.level==='SUBINSTALLATION'),
     };
@@ -179,25 +205,43 @@ export class InventoryStructureService {
         const type = await this.requireStructureType(manager, dto.kind);
         const parent = await this.requireParent(manager, dto.kind, dto.parentId ?? null);
         const family = await this.requireFamily(manager, dto.kind, dto.familyId ?? null, parent);
+        const yacimientoContext = await this.requireYacimientoContext(manager, dto);
         const generatedCode = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
         const operationalAreaId = parent && ['YACIMIENTO','INSTALACION','SUBINSTALACION'].includes(dto.kind)
           ? await this.resolveAreaId(manager, parent)
           : null;
+        const operatorCompanyId = dto.kind === 'YACIMIENTO'
+          ? yacimientoContext?.companyId ?? null
+          : dto.kind === 'INSTALACION' || dto.kind === 'SUBINSTALACION'
+            ? parent?.operatorCompanyId ?? null
+            : null;
+        const concessionTypeId = dto.kind === 'YACIMIENTO'
+          ? yacimientoContext?.concessionTypeId ?? null
+          : null;
+
+        if ((dto.kind === 'INSTALACION' || dto.kind === 'SUBINSTALACION') && !operatorCompanyId) {
+          throw new ConflictException({
+            code: 'INVENTORY_YACIMIENTO_COMPANY_MISSING',
+            message: 'El Yacimiento de origen no tiene una Empresa relacionada válida',
+          });
+        }
 
         const inserted = (await manager.query(`
           INSERT INTO assets (
-            asset_type_id,parent_id,operational_area_id,operator_company_id,inventory_family_id,
+            asset_type_id,parent_id,operational_area_id,operator_company_id,concession_type_id,inventory_family_id,
             code,name,common_name,description,information_status,operational_status,
             data_origin,source_name,source_reference,source_notes,created_by,updated_by,provenance_updated_by
           ) VALUES (
-            $1::uuid,$2::uuid,$3::uuid,NULL,$4::uuid,
-            $5::varchar,$6::varchar,$7::varchar,$8::text,$9::asset_information_status,$10::asset_operational_status,
-            $11::varchar,$12::varchar,$13::varchar,$14::text,$15::uuid,$15::uuid,$15::uuid
+            $1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,$6::uuid,
+            $7::varchar,$8::varchar,$9::varchar,$10::text,$11::asset_information_status,$12::asset_operational_status,
+            $13::varchar,$14::varchar,$15::varchar,$16::text,$17::uuid,$17::uuid,$17::uuid
           ) RETURNING id
         `, [
           type.id,
           parent?.id ?? null,
           operationalAreaId,
+          operatorCompanyId,
+          concessionTypeId,
           family?.id ?? null,
           generatedCode,
           dto.name,
@@ -206,9 +250,13 @@ export class InventoryStructureService {
           AssetInformationStatus.DRAFT,
           AssetOperationalStatus.UNKNOWN,
           AssetDataOrigin.MANUAL,
-          dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas F6' : 'Estructura manual de Inventario F6',
+          dto.kind === 'EMPRESA' ? 'Maestro manual de Empresas' : 'Estructura manual de Inventario',
           dto.kind === 'EMPRESA' ? 'inventory-master:empresa' : `inventory-structure:${dto.kind.toLowerCase()}`,
-          family ? `Clasificación técnica: ${family.code} · ${family.name}` : null,
+          family
+            ? `Clasificación técnica: ${family.code} · ${family.name}`
+            : yacimientoContext
+              ? `Tipo de concesión: ${yacimientoContext.concessionName}`
+              : null,
           principal.userId,
         ])) as Array<{ id: string }>;
         const id = inserted[0]?.id;
@@ -221,6 +269,15 @@ export class InventoryStructureService {
             ON CONFLICT (asset_id) DO UPDATE SET legal_name=EXCLUDED.legal_name,updated_by=EXCLUDED.updated_by,updated_at=CURRENT_TIMESTAMP
           `,[id,dto.name,principal.userId]);
         }
+        if (dto.kind === 'YACIMIENTO' && operationalAreaId && operatorCompanyId && concessionTypeId) {
+          await this.ensureCompatibilityProjection(
+            manager,
+            operationalAreaId,
+            operatorCompanyId,
+            concessionTypeId,
+            yacimientoContext?.concessionName ?? 'Concesión',
+          );
+        }
 
         const versionNumber = await this.history.capture(
           manager,id,AssetVersionChangeType.CREATED,principal,request,
@@ -229,10 +286,14 @@ export class InventoryStructureService {
           INSERT INTO asset_context_history (
             asset_id,parent_id,operational_area_id,operator_company_id,valid_from,
             change_reason,asset_version_number,source,request_id,created_by
-          ) VALUES ($1,$2,$3,NULL,CURRENT_TIMESTAMP,$4,$5,'WEB',$6,$7)
+          ) VALUES ($1,$2,$3,$4,CURRENT_TIMESTAMP,$5,$6,'WEB',$7,$8)
         `, [
-          id,parent?.id ?? null,operationalAreaId,
-          dto.kind === 'EMPRESA' ? 'Alta manual de Empresa independiente F6' : 'Alta manual de estructura de Inventario F6',
+          id,parent?.id ?? null,operationalAreaId,operatorCompanyId,
+          dto.kind === 'YACIMIENTO'
+            ? 'Alta manual de Yacimiento con Área, Empresa y Tipo de concesión'
+            : dto.kind === 'EMPRESA'
+              ? 'Alta manual de Empresa independiente'
+              : 'Alta manual de estructura de Inventario',
           versionNumber,request.requestId,principal.userId,
         ]);
         const created = await this.loadView(manager, id);
@@ -244,7 +305,8 @@ export class InventoryStructureService {
           metadata: {
             versionNumber,inventoryStructureKind: dto.kind,
             inventoryFamilyId: family?.id ?? null,inventoryFamilyCode: family?.code ?? null,
-            operatorOwnership: false,
+            operatorCompanyId,
+            concessionTypeId,
           },
         }, manager);
         return created;
@@ -290,7 +352,9 @@ export class InventoryStructureService {
     });
     const rows = (await manager.query(`
       SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
-        asset.inventory_family_id AS "inventoryFamilyId"
+        asset.inventory_family_id AS "inventoryFamilyId",
+        asset.operational_area_id AS "operationalAreaId",
+        asset.operator_company_id AS "operatorCompanyId"
       FROM assets asset
       JOIN asset_types type ON type.id=asset.asset_type_id
       WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
@@ -305,8 +369,65 @@ export class InventoryStructureService {
     return parent;
   }
 
+  private async requireYacimientoContext(
+    manager: EntityManager,
+    dto: CreateInventoryStructureDto,
+  ): Promise<YacimientoContext | null> {
+    if (dto.kind !== 'YACIMIENTO') {
+      if (dto.operatorCompanyId || dto.concessionTypeId) {
+        throw new BadRequestException({
+          code: 'INVENTORY_YACIMIENTO_CONTEXT_NOT_ALLOWED',
+          message: 'Empresa relacionada y Tipo de concesión sólo corresponden al Yacimiento',
+        });
+      }
+      return null;
+    }
+    if (!dto.operatorCompanyId) {
+      throw new BadRequestException({
+        code: 'INVENTORY_YACIMIENTO_COMPANY_REQUIRED',
+        message: 'Seleccioná la Empresa relacionada del Yacimiento',
+      });
+    }
+    if (!dto.concessionTypeId) {
+      throw new BadRequestException({
+        code: 'INVENTORY_YACIMIENTO_CONCESSION_REQUIRED',
+        message: 'Seleccioná el Tipo de concesión del Yacimiento',
+      });
+    }
+    const companyRows = (await manager.query(`
+      SELECT asset.id
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      WHERE asset.id=$1::uuid
+        AND type.operational_role='COMPANY'
+        AND type.is_active=true
+        AND asset.information_status<>'INACTIVE'
+      FOR KEY SHARE
+    `,[dto.operatorCompanyId])) as IdRow[];
+    if (!companyRows[0]) throw new BadRequestException({
+      code: 'INVENTORY_YACIMIENTO_COMPANY_INVALID',
+      message: 'La Empresa relacionada seleccionada no es válida',
+    });
+    const concessionRows = (await manager.query(`
+      SELECT id,name
+      FROM concession_types
+      WHERE id=$1::uuid AND is_active=true
+      FOR KEY SHARE
+    `,[dto.concessionTypeId])) as Array<{id:string;name:string}>;
+    if (!concessionRows[0]) throw new BadRequestException({
+      code: 'INVENTORY_YACIMIENTO_CONCESSION_INVALID',
+      message: 'El Tipo de concesión seleccionado no es válido',
+    });
+    return {
+      companyId: dto.operatorCompanyId,
+      concessionTypeId: dto.concessionTypeId,
+      concessionName: concessionRows[0].name,
+    };
+  }
+
   private async resolveAreaId(manager: EntityManager,parent: ParentRow):Promise<string> {
     if (parent.typeCode.toLowerCase()==='area') return parent.id;
+    if (parent.operationalAreaId) return parent.operationalAreaId;
     const rows = (await manager.query(`
       WITH RECURSIVE lineage AS (
         SELECT asset.id,asset.parent_id,asset.asset_type_id FROM assets asset WHERE asset.id=$1::uuid
@@ -381,6 +502,40 @@ export class InventoryStructureService {
     return family;
   }
 
+  private async ensureCompatibilityProjection(
+    manager: EntityManager,
+    areaId: string,
+    companyId: string,
+    concessionTypeId: string,
+    concessionName: string,
+  ): Promise<void> {
+    const companyProjection = await manager.query(`
+      SELECT id FROM area_company_relations
+      WHERE area_id=$1::uuid AND company_id=$2::uuid AND relation_role='OPERATOR' AND valid_to IS NULL
+      LIMIT 1
+    `,[areaId,companyId]);
+    if (!companyProjection[0]) {
+      await manager.query(`
+        INSERT INTO area_company_relations(area_id,company_id,relation_role,valid_from,start_reason)
+        VALUES($1::uuid,$2::uuid,'OPERATOR',CURRENT_TIMESTAMP,'Proyección derivada de Yacimiento')
+      `,[areaId,companyId]);
+    }
+    const rightType = concessionName.toLocaleLowerCase('es-AR').includes('explor')
+      ? 'EXPLORATION_PERMIT'
+      : 'EXPLOITATION_CONCESSION';
+    const rightProjection = await manager.query(`
+      SELECT id FROM area_legal_rights
+      WHERE area_id=$1::uuid AND right_type=$2::area_legal_right_type AND status='ACTIVE'
+      LIMIT 1
+    `,[areaId,rightType]);
+    if (!rightProjection[0]) {
+      await manager.query(`
+        INSERT INTO area_legal_rights(area_id,right_type,name,status,notes)
+        VALUES($1::uuid,$2::area_legal_right_type,$3,'ACTIVE',$4)
+      `,[areaId,rightType,`${concessionName} · proyección de Yacimiento`,`Tipo de concesión canónico: ${concessionTypeId}`]);
+    }
+  }
+
   private generatedCode(kind: InventoryStructureKind, name: string): string {
     const prefix = kind === 'EMPRESA' ? 'EMP'
       : kind === 'DEPARTAMENTO' ? 'DEP'
@@ -400,6 +555,8 @@ export class InventoryStructureService {
         JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
         CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) END AS parent,
         CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',area.id,'code',area.code,'name',area.name) END AS "operationalArea",
+        CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',company.id,'code',company.code,'name',COALESCE(profile.legal_name,company.name)) END AS "operatorCompany",
+        CASE WHEN concession.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',concession.id,'code',concession.code,'name',concession.name) END AS "concessionType",
         CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
           'id',family.id,'code',family.code,'name',family.name,'level',family.level,
           'informationLabels',family.information_labels
@@ -409,6 +566,9 @@ export class InventoryStructureService {
       JOIN asset_types type ON type.id=asset.asset_type_id
       LEFT JOIN assets parent ON parent.id=asset.parent_id
       LEFT JOIN assets area ON area.id=asset.operational_area_id
+      LEFT JOIN assets company ON company.id=asset.operator_company_id
+      LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
+      LEFT JOIN concession_types concession ON concession.id=asset.concession_type_id
       LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
       WHERE asset.id=$1::uuid
     `, [id]);

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

@@ -33,6 +33,7 @@ export enum AssetDataOrigin {
 @Index('idx_assets_parent_id', ['parentId'])
 @Index('idx_assets_operational_area_id', ['operationalAreaId'])
 @Index('idx_assets_operator_company_id', ['operatorCompanyId'])
+@Index('idx_assets_concession_type_id', ['concessionTypeId'])
 @Index('idx_assets_inventory_family_id', ['inventoryFamilyId'])
 @Index('idx_assets_information_status', ['informationStatus'])
 @Index('idx_assets_operational_status', ['operationalStatus'])
@@ -54,6 +55,9 @@ export class Asset extends TimestampedEntity {
   @Column({ name: 'operator_company_id', type: 'uuid', nullable: true })
   operatorCompanyId!: string | null;
 
+  @Column({ name: 'concession_type_id', type: 'uuid', nullable: true })
+  concessionTypeId!: string | null;
+
   @Column({ name: 'inventory_family_id', type: 'uuid', nullable: true })
   inventoryFamilyId!: string | null;
 

api-v3/src/database/migrations/1790103000000-full-live-data-reset.ts

@@ -0,0 +1,173 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * One-time full live-data reset requested before loading the definitive source files.
+ *
+ * The database is left with only the single `admin` user and the minimum product
+ * scaffolding required to keep authentication/authorization and the core asset
+ * model functional. Every business, operational, imported, catalog, history,
+ * document, inspection and tenant/company row is removed.
+ *
+ * Fresh migration replays/CI do not have the live `admin` account at this point,
+ * so this migration intentionally no-ops there.
+ */
+export class FullLiveDataReset1790103000000 implements MigrationInterface {
+  name = 'FullLiveDataReset1790103000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const adminRows = (await queryRunner.query(`
+      SELECT id, username
+      FROM users
+      WHERE lower(btrim(username))='admin'
+      ORDER BY id
+    `)) as Array<{ id: string; username: string }>;
+
+    if (adminRows.length === 0) {
+      // eslint-disable-next-line no-console
+      console.log('[full-live-reset] skipped: no live admin account on migration replay');
+      return;
+    }
+
+    if (adminRows.length !== 1) {
+      throw new Error(
+        `Full live reset aborted: expected exactly one username admin, found ${adminRows.length}`,
+      );
+    }
+
+    const adminId = adminRows[0].id;
+
+    // These are product/schema scaffolding, not customer/business data.
+    // Everything else in public is disposable live data for this reset.
+    const structuralTables = [
+      'roles',
+      'permissions',
+      'role_permissions',
+      'asset_types',
+      'asset_attribute_definitions',
+      'asset_type_parent_rules',
+    ] as const;
+
+    const preservedTables = new Set<string>([
+      'typeorm_migrations',
+      'users',
+      'user_roles',
+      ...structuralTables,
+    ]);
+
+    const structuralCounts = new Map<string, string>();
+    for (const table of structuralTables) {
+      const safeTable = `"${table.replace(/"/g, '""')}"`;
+      const rows = (await queryRunner.query(
+        `SELECT count(*)::text AS total FROM ${safeTable}`,
+      )) as Array<{ total: string }>;
+      structuralCounts.set(table, rows[0]?.total ?? '0');
+    }
+
+    const adminRolesBefore = (await queryRunner.query(
+      `SELECT count(*)::text AS total FROM user_roles WHERE user_id=$1`,
+      [adminId],
+    )) as Array<{ total: string }>;
+    const adminRoleCount = adminRolesBefore[0]?.total ?? '0';
+    if (adminRoleCount === '0') {
+      throw new Error('Full live reset aborted: admin has no assigned role');
+    }
+
+    const tableRows = (await queryRunner.query(`
+      SELECT table_name
+      FROM information_schema.tables
+      WHERE table_schema='public'
+        AND table_type='BASE TABLE'
+      ORDER BY table_name
+    `)) as Array<{ table_name: string }>;
+
+    const disposableTables = tableRows
+      .map((row) => row.table_name)
+      .filter((table) => !preservedTables.has(table));
+
+    if (disposableTables.length > 0) {
+      const quoted = disposableTables
+        .map((table) => `"${table.replace(/"/g, '""')}"`)
+        .join(', ');
+      await queryRunner.query(`TRUNCATE TABLE ${quoted} RESTART IDENTITY CASCADE`);
+    }
+
+    // Keep only the owner's administrator account. user_roles for other users
+    // are removed through their FK cascade.
+    await queryRunner.query(`DELETE FROM users WHERE id<>$1`, [adminId]);
+
+    // Invalidate any previous login state and unlock the preserved account.
+    await queryRunner.query(
+      `
+      UPDATE users
+      SET failed_login_attempts=0,
+          locked_until=NULL,
+          last_login_at=NULL,
+          updated_at=CURRENT_TIMESTAMP
+      WHERE id=$1
+      `,
+      [adminId],
+    );
+
+    const finalUsers = (await queryRunner.query(`
+      SELECT
+        count(*)::text AS total,
+        count(*) FILTER (WHERE lower(btrim(username))='admin')::text AS admins
+      FROM users
+    `)) as Array<{ total: string; admins: string }>;
+
+    if (finalUsers[0]?.total !== '1' || finalUsers[0]?.admins !== '1') {
+      throw new Error('Full live reset verification failed: users table is not admin-only');
+    }
+
+    const finalAdminRoles = (await queryRunner.query(
+      `
+      SELECT
+        count(*) FILTER (WHERE user_id=$1)::text AS total,
+        count(*) FILTER (WHERE user_id<>$1)::text AS foreign_users
+      FROM user_roles
+      `,
+      [adminId],
+    )) as Array<{ total: string; foreign_users: string }>;
+
+    if (
+      finalAdminRoles[0]?.total !== adminRoleCount ||
+      finalAdminRoles[0]?.foreign_users !== '0'
+    ) {
+      throw new Error('Full live reset verification failed: admin role assignments changed');
+    }
+
+    for (const table of structuralTables) {
+      const safeTable = `"${table.replace(/"/g, '""')}"`;
+      const rows = (await queryRunner.query(
+        `SELECT count(*)::text AS total FROM ${safeTable}`,
+      )) as Array<{ total: string }>;
+      const before = structuralCounts.get(table) ?? '0';
+      if (rows[0]?.total !== before) {
+        throw new Error(
+          `Full live reset verification failed: structural table ${table} changed (${before} -> ${rows[0]?.total ?? 'unknown'})`,
+        );
+      }
+    }
+
+    for (const table of disposableTables) {
+      const safeTable = `"${table.replace(/"/g, '""')}"`;
+      const rows = (await queryRunner.query(
+        `SELECT count(*)::text AS total FROM ${safeTable}`,
+      )) as Array<{ total: string }>;
+      if (rows[0]?.total !== '0') {
+        throw new Error(`Full live reset verification failed: ${table} is not empty`);
+      }
+    }
+
+    // eslint-disable-next-line no-console
+    console.log(
+      `[full-live-reset] kept admin=${adminRows[0].username} (${adminId}); preserved ${structuralTables.length} product tables; cleared ${disposableTables.length} data tables`,
+    );
+  }
+
+  public async down(): Promise<void> {
+    throw new Error(
+      'FullLiveDataReset is intentionally destructive; restore the automatic deploy PRE database backup instead.',
+    );
+  }
+}

api-v3/src/database/migrations/1790106600000-authoritative-inventory-relationships.ts

@@ -0,0 +1,380 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { AUTHORITATIVE_INVENTORY_MODEL as SOURCE } from '../../reference-data/authoritative-inventory-model';
+
+type IdRow = { id: string };
+
+const TERRITORY_DOC = 'DH-AUTH-TERRITORY-20260911';
+const INVENTORY_DOC = 'DH-AUTH-INVENTORY-20260911';
+const FINDING_CATEGORY_CODE = 'AUTHMODEL';
+
+function sourceCode(prefix: string, id: number): string {
+  return `${prefix}-${String(id).padStart(4, '0')}`;
+}
+
+export class AuthoritativeInventoryRelationships1790106600000 implements MigrationInterface {
+  name = 'AuthoritativeInventoryRelationships1790106600000';
+
+  public async up(q: QueryRunner): Promise<void> {
+    this.assertSource();
+
+    const companyType = await this.type(q, `SELECT id FROM asset_types WHERE operational_role='COMPANY' AND is_active=true ORDER BY (lower(code)='empresa') DESC, created_at LIMIT 1`);
+    const departmentType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='departamento' AND is_active=true LIMIT 1`);
+    const areaType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='area' AND operational_role='AREA' AND is_active=true LIMIT 1`);
+    const fieldType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='yacimiento' AND is_active=true LIMIT 1`);
+    const installationType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='instalacion' AND is_active=true LIMIT 1`);
+    const subinstallationType = await this.type(q, `SELECT id FROM asset_types WHERE lower(code)='subinstalacion' AND is_active=true LIMIT 1`);
+
+    await q.query(`
+      CREATE TABLE IF NOT EXISTS concession_types (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        code varchar(80) NOT NULL UNIQUE,
+        name varchar(120) NOT NULL UNIQUE,
+        is_active boolean NOT NULL DEFAULT true,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_concession_types_name CHECK (length(btrim(name)) >= 3)
+      )
+    `);
+    await q.query(`ALTER TABLE assets ADD COLUMN IF NOT EXISTS concession_type_id uuid`);
+    await q.query(`
+      DO $$ BEGIN
+        IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname='fk_assets_concession_type') THEN
+          ALTER TABLE assets ADD CONSTRAINT fk_assets_concession_type
+            FOREIGN KEY (concession_type_id) REFERENCES concession_types(id) ON DELETE RESTRICT;
+        END IF;
+      END $$
+    `);
+    await q.query(`CREATE INDEX IF NOT EXISTS idx_assets_concession_type_id ON assets(concession_type_id)`);
+    await q.query(`
+      DO $$ BEGIN
+        IF EXISTS (SELECT 1 FROM pg_roles WHERE rolname='dhv2_app') THEN
+          GRANT SELECT ON concession_types TO dhv2_app;
+        END IF;
+      END $$
+    `);
+
+    await q.query(`DELETE FROM asset_type_parent_rules WHERE child_type_id IN ($1::uuid,$2::uuid,$3::uuid,$4::uuid)`, [areaType, fieldType, installationType, subinstallationType]);
+    await q.query(`
+      INSERT INTO asset_type_parent_rules(child_type_id,parent_type_id) VALUES
+        ($1::uuid,$2::uuid),($3::uuid,$1::uuid),($4::uuid,$3::uuid),($5::uuid,$4::uuid)
+      ON CONFLICT DO NOTHING
+    `, [areaType, departmentType, fieldType, installationType, subinstallationType]);
+    await q.query(`UPDATE asset_types SET can_be_root=true,updated_at=CURRENT_TIMESTAMP WHERE id IN ($1::uuid,$2::uuid)`, [companyType, departmentType]);
+    await q.query(`UPDATE asset_types SET can_be_root=false,updated_at=CURRENT_TIMESTAMP WHERE id IN ($1::uuid,$2::uuid,$3::uuid,$4::uuid)`, [areaType, fieldType, installationType, subinstallationType]);
+    await q.query(`UPDATE asset_types SET description='Área territorial. Sólo posee Nombre y pertenece obligatoriamente a un Departamento.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [areaType]);
+    await q.query(`UPDATE asset_types SET description='Yacimiento. Pertenece a un Área y define directamente Tipo de concesión y Empresa relacionada.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [fieldType]);
+    await q.query(`UPDATE asset_types SET description='Instalación física. Pertenece obligatoriamente a un Yacimiento y utiliza una clasificación técnica.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [installationType]);
+    await q.query(`UPDATE asset_types SET description='Subinstalación física. Pertenece obligatoriamente a una Instalación y utiliza una clasificación técnica compatible.',updated_at=CURRENT_TIMESTAMP WHERE id=$1::uuid`, [subinstallationType]);
+
+    await q.query(`DELETE FROM asset_attribute_definitions WHERE asset_type_id IN ($1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,$6::uuid)`, [companyType, departmentType, areaType, fieldType, installationType, subinstallationType]);
+    await this.insertCommonAttributes(q, installationType, [
+      ['campo_marca','Marca',10],
+      ['tipo_instalacion','Tipo de instalación',20],
+      ['campo_modelo','Modelo',30],
+      ['campo_capacidad','Capacidad',40],
+      ['campo_numero_serie','Número de serie',50],
+      ['campo_funcion','Función',60],
+    ]);
+    await this.insertCommonAttributes(q, subinstallationType, [
+      ['campo_marca','Marca',10],
+      ['campo_modelo','Modelo',20],
+      ['campo_capacidad','Capacidad',30],
+      ['campo_numero_serie','Número de serie',40],
+      ['campo_funcion','Función',50],
+    ]);
+
+    await q.query(`
+      DO $$ DECLARE trigger_name text; BEGIN
+        FOR trigger_name IN
+          SELECT trigger_row.tgname
+          FROM pg_trigger trigger_row
+          JOIN pg_proc function_row ON function_row.oid=trigger_row.tgfoid
+          WHERE trigger_row.tgrelid='assets'::regclass
+            AND NOT trigger_row.tgisinternal
+            AND function_row.proname='enforce_asset_operational_context'
+        LOOP
+          EXECUTE format('DROP TRIGGER %I ON assets',trigger_name);
+        END LOOP;
+      END $$
+    `);
+    await q.query(`DROP FUNCTION IF EXISTS enforce_asset_operational_context()`);
+
+    await q.query(`
+      CREATE OR REPLACE FUNCTION enforce_authoritative_inventory_relationships()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      DECLARE
+        kind text;
+        asset_role asset_type_operational_role;
+        parent_kind text;
+        parent_area uuid;
+        parent_company uuid;
+        parent_family uuid;
+        company_role asset_type_operational_role;
+        family_level text;
+      BEGIN
+        SELECT lower(code),operational_role INTO kind,asset_role FROM asset_types WHERE id=NEW.asset_type_id;
+        IF kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='asset type does not exist'; END IF;
+
+        IF asset_role='COMPANY'::asset_type_operational_role THEN
+          IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Empresa no admite padre'; END IF;
+          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
+          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
+          RETURN NEW;
+        ELSIF kind='departamento' THEN
+          IF NEW.parent_id IS NOT NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Departamento no admite padre'; END IF;
+          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
+          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
+          RETURN NEW;
+        END IF;
+
+        IF NEW.parent_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El nivel requiere un padre estructural'; END IF;
+        SELECT lower(parent_type.code), parent.operational_area_id, parent.operator_company_id, parent.inventory_family_id
+          INTO parent_kind,parent_area,parent_company,parent_family
+        FROM assets parent JOIN asset_types parent_type ON parent_type.id=parent.asset_type_id
+        WHERE parent.id=NEW.parent_id AND parent.information_status<>'INACTIVE';
+        IF parent_kind IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El padre estructural no existe o está inactivo'; END IF;
+
+        IF kind='area' THEN
+          IF parent_kind<>'departamento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Área debe pertenecer a un Departamento'; END IF;
+          NEW.operational_area_id:=NULL; NEW.operator_company_id:=NULL; NEW.concession_type_id:=NULL;
+          NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
+        ELSIF kind='yacimiento' THEN
+          IF parent_kind<>'area' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento debe pertenecer a un Área'; END IF;
+          IF NEW.operator_company_id IS NULL THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere Empresa relacionada'; END IF;
+          SELECT type.operational_role INTO company_role FROM assets company JOIN asset_types type ON type.id=company.asset_type_id
+            WHERE company.id=NEW.operator_company_id AND company.information_status<>'INACTIVE' AND type.is_active=true;
+          IF company_role IS DISTINCT FROM 'COMPANY'::asset_type_operational_role THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='La Empresa relacionada del Yacimiento no es válida'; END IF;
+          IF NEW.concession_type_id IS NULL OR NOT EXISTS(SELECT 1 FROM concession_types c WHERE c.id=NEW.concession_type_id AND c.is_active=true) THEN
+            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Yacimiento requiere un Tipo de concesión válido';
+          END IF;
+          IF NEW.operational_area_id IS NOT NULL AND NEW.operational_area_id<>NEW.parent_id THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Área operativa del Yacimiento debe coincidir con su Área padre'; END IF;
+          NEW.operational_area_id:=NEW.parent_id; NEW.inventory_family_id:=NULL; NEW.is_inventory_instance:=false;
+        ELSIF kind='instalacion' THEN
+          IF parent_kind<>'yacimiento' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Instalación debe pertenecer a un Yacimiento'; END IF;
+          SELECT level::text INTO family_level FROM inventory_families WHERE id=NEW.inventory_family_id AND is_active=true;
+          IF family_level IS DISTINCT FROM 'INSTALLATION' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Instalación requiere un Tipo de instalación válido'; END IF;
+          NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
+        ELSIF kind='subinstalacion' THEN
+          IF parent_kind<>'instalacion' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación debe pertenecer a una Instalación'; END IF;
+          SELECT level::text INTO family_level FROM inventory_families WHERE id=NEW.inventory_family_id AND is_active=true;
+          IF family_level IS DISTINCT FROM 'SUBINSTALLATION' THEN RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='Subinstalación requiere un Tipo de subinstalación válido'; END IF;
+          IF NOT EXISTS(SELECT 1 FROM inventory_family_parent_rules rule WHERE rule.child_family_id=NEW.inventory_family_id AND rule.parent_family_id=parent_family) THEN
+            RAISE EXCEPTION USING ERRCODE='23514',MESSAGE='El Tipo de subinstalación no es compatible con el Tipo de instalación padre';
+          END IF;
+          NEW.operational_area_id:=parent_area; NEW.operator_company_id:=parent_company; NEW.concession_type_id:=NULL; NEW.is_inventory_instance:=true;
+        END IF;
+        RETURN NEW;
+      END $$
+    `);
+    await q.query(`DROP TRIGGER IF EXISTS trg_assets_authoritative_inventory_relationships ON assets`);
+    await q.query(`
+      CREATE TRIGGER trg_assets_authoritative_inventory_relationships
+      BEFORE INSERT OR UPDATE OF asset_type_id,parent_id,operational_area_id,operator_company_id,inventory_family_id,concession_type_id
+      ON assets FOR EACH ROW EXECUTE FUNCTION enforce_authoritative_inventory_relationships()
+    `);
+
+    await q.query(`TRUNCATE TABLE assets CASCADE`);
+    await q.query(`TRUNCATE TABLE source_documents CASCADE`);
+    await q.query(`TRUNCATE TABLE inventory_families CASCADE`);
+    await q.query(`TRUNCATE TABLE finding_categories CASCADE`);
+    await q.query(`TRUNCATE TABLE concession_types CASCADE`);
+
+    const [territoryDoc] = (await q.query(`
+      INSERT INTO source_documents(document_type,document_number,title,issuer,external_reference,notes)
+      VALUES('SPREADSHEET',$1,$2,'Dirección de Hidrocarburos',$3,$4) RETURNING id
+    `, [TERRITORY_DOC,'modelo_yacimientos.sql','sha256:6a1d96bc8af7e755dd0e2fd9faf08335625b9c76865208c3b8413d868aa5eb1a','Modelo relacional exacto de Departamentos, Áreas, Yacimientos, Empresas y Tipo de concesión.'])) as IdRow[];
+    const [inventoryDoc] = (await q.query(`
+      INSERT INTO source_documents(document_type,document_number,title,issuer,external_reference,notes)
+      VALUES('SPREADSHEET',$1,$2,'Dirección de Hidrocarburos',$3,$4) RETURNING id
+    `, [INVENTORY_DOC,'modelo_relacional instalaciones y sub.sql','sha256:fb513f3909e78db298361a8a6998ca77026748f9b03cbab44c77b884ca862b49','Modelo relacional exacto de tipos de Instalación/Subinstalación y sus Hallazgos.'])) as IdRow[];
+    if(!territoryDoc?.id || !inventoryDoc?.id) throw new Error('Authoritative source documents could not be created');
+
+    const concessionIds=new Map<number,string>();
+    for(const row of SOURCE.concessionTypes){
+      const [created]=(await q.query(`INSERT INTO concession_types(code,name,is_active) VALUES($1,$2,true) RETURNING id`,[sourceCode('CONC',row.id),row.nombre])) as IdRow[];
+      if(!created?.id)throw new Error(`Could not create concession ${row.nombre}`); concessionIds.set(row.id,created.id);
+    }
+
+    await this.seedFamiliesAndFindings(q);
+
+    const companyIds=new Map<number,string>();
+    for(const row of SOURCE.companies){
+      const id=await this.asset(q,companyType,null,null,null,null,sourceCode('ORG',row.id),row.nombre,'modelo_yacimientos.sql',`empresas:${row.id}`);
+      companyIds.set(row.id,id);
+      await q.query(`INSERT INTO organization_profiles(asset_id,organization_kind,legal_name) VALUES($1::uuid,$2::organization_kind,$3)`,[id,row.nombre.toUpperCase().startsWith('UTE (')?'UTE':'COMPANY',row.nombre]);
+      await this.link(q,id,territoryDoc.id,`Empresa · source id ${row.id}`);
+    }
+    const departmentIds=new Map<number,string>();
+    for(const row of SOURCE.departments){
+      const id=await this.asset(q,departmentType,null,null,null,null,sourceCode('DEP',row.id),row.nombre,'modelo_yacimientos.sql',`departamentos:${row.id}`);
+      departmentIds.set(row.id,id); await this.link(q,id,territoryDoc.id,`Departamento · source id ${row.id}`);
+    }
+    const areaIds=new Map<number,string>();
+    for(const row of SOURCE.areas){
+      const parent=departmentIds.get(row.departamento_id); if(!parent)throw new Error(`Missing source Departamento ${row.departamento_id}`);
+      const id=await this.asset(q,areaType,parent,null,null,null,sourceCode('AREA',row.id),row.nombre,'modelo_yacimientos.sql',`areas:${row.id}`);
+      areaIds.set(row.id,id); await this.link(q,id,territoryDoc.id,`Área · source id ${row.id}`);
+    }
+    for(const row of SOURCE.fields){
+      const area=areaIds.get(row.area_id); const company=companyIds.get(row.empresa_id); const concession=concessionIds.get(row.tipo_concesion_id);
+      if(!area||!company||!concession)throw new Error(`Incomplete source relations for Yacimiento ${row.id}`);
+      const id=await this.asset(q,fieldType,area,area,company,concession,sourceCode('YAC',row.id),row.nombre,'modelo_yacimientos.sql',`yacimientos:${row.id}`);
+      await this.link(q,id,territoryDoc.id,`Yacimiento · source id ${row.id}`);
+    }
+
+    await q.query(`TRUNCATE TABLE area_company_relations CASCADE`);
+    await q.query(`TRUNCATE TABLE area_legal_rights CASCADE`);
+    const projectedPairs=new Set<string>();
+    const projectedRights=new Set<string>();
+    for(const row of SOURCE.fields){
+      const area=areaIds.get(row.area_id)!; const company=companyIds.get(row.empresa_id)!; const concession=concessionIds.get(row.tipo_concesion_id)!;
+      const pair=`${area}|${company}`;
+      if(!projectedPairs.has(pair)){
+        projectedPairs.add(pair);
+        await q.query(`INSERT INTO area_company_relations(area_id,company_id,relation_role,source_document_id,valid_from,start_reason)
+          VALUES($1::uuid,$2::uuid,'OPERATOR',$3::uuid,CURRENT_TIMESTAMP,$4)`,[area,company,territoryDoc.id,'Derivado automáticamente de Yacimientos del modelo autoritativo']);
+      }
+      const rightKey=`${area}|${concession}`;
+      if(!projectedRights.has(rightKey)){
+        projectedRights.add(rightKey);
+        const concessionRow=SOURCE.concessionTypes.find((item)=>item.id===row.tipo_concesion_id)!;
+        await q.query(`INSERT INTO area_legal_rights(area_id,right_type,name,status,source_document_id,notes)
+          VALUES($1::uuid,$2::area_legal_right_type,$3,'ACTIVE',$4::uuid,$5)`,[
+          area,concessionRow.nombre==='Exploración'?'EXPLORATION_PERMIT':'EXPLOITATION_CONCESSION',
+          `${concessionRow.nombre} · proyección del Yacimiento`,territoryDoc.id,'Compatibilidad derivada; el Tipo de concesión canónico está en Yacimiento.']);
+      }
+    }
+
+    await this.installFamilyFindingSync(q);
+    await this.verify(q);
+  }
+
+  public async down():Promise<void>{
+    throw new Error('Authoritative inventory model is a deliberate clean-load migration; restore the deploy PRE database backup.');
+  }
+
+  private assertSource():void{
+    if(SOURCE.departments.length!==7||SOURCE.companies.length!==13||SOURCE.concessionTypes.length!==2||SOURCE.areas.length!==64||SOURCE.fields.length!==230)
+      throw new Error('Authoritative territory source cardinality mismatch');
+    if(SOURCE.installationFamilies.length!==14||SOURCE.subinstallationFamilies.length!==109||SOURCE.findings.length!==181||SOURCE.installationFindings.length!==48||SOURCE.subinstallationFindings.length!==880)
+      throw new Error('Authoritative inventory source cardinality mismatch');
+    for(const area of SOURCE.areas) if(!SOURCE.departments.some((d)=>d.id===area.departamento_id)) throw new Error(`Area ${area.id} has no source Departamento`);
+    for(const field of SOURCE.fields){
+      if(!SOURCE.areas.some((a)=>a.id===field.area_id)||!SOURCE.companies.some((c)=>c.id===field.empresa_id)||!SOURCE.concessionTypes.some((c)=>c.id===field.tipo_concesion_id))
+        throw new Error(`Yacimiento ${field.id} has invalid source relationship`);
+    }
+  }
+
+  private async insertCommonAttributes(q:QueryRunner,typeId:string,rows:Array<[string,string,number]>):Promise<void>{
+    for(const [code,name,sortOrder] of rows) await q.query(`
+      INSERT INTO asset_attribute_definitions(asset_type_id,code,name,data_type,is_required,is_active,unit,options,sort_order)
+      VALUES($1::uuid,$2,$3,'TEXT'::asset_attribute_data_type,false,true,NULL,NULL,$4)
+    `,[typeId,code,name,sortOrder]);
+  }
+
+  private async seedFamiliesAndFindings(q:QueryRunner):Promise<void>{
+    const installationIds=new Map<number,string>();
+    for(const row of SOURCE.installationFamilies){
+      const [created]=(await q.query(`INSERT INTO inventory_families(code,name,level,information_labels,source_reference,is_active)
+        VALUES($1,$2,'INSTALLATION','[]'::jsonb,$3,true) RETURNING id`,[sourceCode('AUTH-I',row.id),row.nombre,`modelo_relacional:instalaciones:${row.id}`])) as IdRow[];
+      if(!created?.id)throw new Error(`Could not create Instalación family ${row.id}`); installationIds.set(row.id,created.id);
+    }
+    const subIds=new Map<number,string>();
+    for(const row of SOURCE.subinstallationFamilies){
+      const [created]=(await q.query(`INSERT INTO inventory_families(code,name,level,information_labels,source_reference,is_active)
+        VALUES($1,$2,'SUBINSTALLATION','[]'::jsonb,$3,true) RETURNING id`,[sourceCode('AUTH-S',row.id),row.nombre,`modelo_relacional:subinstalaciones:${row.id}`])) as IdRow[];
+      const parent=installationIds.get(row.instalacion_id); if(!created?.id||!parent)throw new Error(`Invalid Subinstalación family ${row.id}`);
+      subIds.set(row.id,created.id);
+      await q.query(`INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id) VALUES($1::uuid,$2::uuid)`,[created.id,parent]);
+    }
+
+    const [category]=(await q.query(`INSERT INTO finding_categories(code,name,sort_order,is_active) VALUES($1,$2,300,true) RETURNING id`,[FINDING_CATEGORY_CODE,'DH · Hallazgos del modelo autoritativo'])) as IdRow[];
+    if(!category?.id)throw new Error('Could not create authoritative finding category');
+    const findingIds=new Map<number,string>();
+    for(const row of SOURCE.findings){
+      const [created]=(await q.query(`INSERT INTO finding_catalog_items(category_id,code,source_number,title,import_note,revision,is_active)
+        VALUES($1::uuid,$2,$3,$4,$5,1,true) RETURNING id`,[category.id,sourceCode('AUTH-H',row.id),row.id,row.nombre,'modelo_relacional instalaciones y sub.sql'])) as IdRow[];
+      if(!created?.id)throw new Error(`Could not create Hallazgo ${row.id}`); findingIds.set(row.id,created.id);
+      await q.query(`INSERT INTO finding_catalog_item_versions(item_id,revision,snapshot,actor_username)
+        SELECT item.id,item.revision,jsonb_build_object('id',item.id,'categoryId',item.category_id,'code',item.code,'sourceNumber',item.source_number,'title',item.title,'revision',item.revision,'isActive',item.is_active),'migration:AUTHORITATIVE'
+        FROM finding_catalog_items item WHERE item.id=$1::uuid`,[created.id]);
+    }
+    for(const mapping of SOURCE.installationFindings){
+      const family=installationIds.get(mapping.instalacion_id); const finding=findingIds.get(mapping.hallazgo_id);
+      if(!family||!finding)throw new Error('Invalid installation finding mapping');
+      await q.query(`INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id) VALUES($1::uuid,$2::uuid)`,[finding,family]);
+    }
+    for(const mapping of SOURCE.subinstallationFindings){
+      const family=subIds.get(mapping.subinstalacion_id); const finding=findingIds.get(mapping.hallazgo_id);
+      if(!family||!finding)throw new Error('Invalid subinstallation finding mapping');
+      await q.query(`INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id) VALUES($1::uuid,$2::uuid)`,[finding,family]);
+    }
+  }
+
+  private async installFamilyFindingSync(q:QueryRunner):Promise<void>{
+    await q.query(`
+      CREATE OR REPLACE FUNCTION sync_asset_inventory_family_catalog()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      BEGIN
+        DELETE FROM finding_catalog_asset_overrides WHERE asset_id=NEW.id AND reason LIKE 'AUTHORITATIVE familia técnica:%';
+        IF NEW.inventory_family_id IS NOT NULL THEN
+          INSERT INTO finding_catalog_asset_overrides(asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by)
+          SELECT NEW.id,m.catalog_item_id,true,'AUTHORITATIVE familia técnica: catálogo contextual automático',NEW.created_by,NEW.updated_by
+          FROM finding_catalog_item_inventory_families m WHERE m.inventory_family_id=NEW.inventory_family_id
+          ON CONFLICT(asset_id,catalog_item_id) DO UPDATE SET is_enabled=true,reason='AUTHORITATIVE familia técnica: catálogo contextual automático',updated_by=NEW.updated_by,updated_at=CURRENT_TIMESTAMP;
+        END IF;
+        RETURN NEW;
+      END $$
+    `);
+    await q.query(`
+      CREATE OR REPLACE FUNCTION sync_inventory_family_mapping_assets()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      BEGIN
+        IF TG_OP='DELETE' THEN
+          DELETE FROM finding_catalog_asset_overrides o USING assets a
+          WHERE o.asset_id=a.id AND a.inventory_family_id=OLD.inventory_family_id AND o.catalog_item_id=OLD.catalog_item_id AND o.reason LIKE 'AUTHORITATIVE familia técnica:%';
+          RETURN OLD;
+        END IF;
+        INSERT INTO finding_catalog_asset_overrides(asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by)
+        SELECT a.id,NEW.catalog_item_id,true,'AUTHORITATIVE familia técnica: catálogo contextual automático',a.created_by,a.updated_by
+        FROM assets a WHERE a.inventory_family_id=NEW.inventory_family_id
+        ON CONFLICT(asset_id,catalog_item_id) DO UPDATE SET is_enabled=true,reason='AUTHORITATIVE familia técnica: catálogo contextual automático',updated_at=CURRENT_TIMESTAMP;
+        RETURN NEW;
+      END $$
+    `);
+  }
+
+  private async asset(q:QueryRunner,typeId:string,parentId:string|null,areaId:string|null,companyId:string|null,concessionId:string|null,
+    code:string,name:string,sourceName:string,sourceReference:string):Promise<string>{
+    const [row]=(await q.query(`INSERT INTO assets(asset_type_id,parent_id,operational_area_id,operator_company_id,concession_type_id,inventory_family_id,
+      code,name,information_status,operational_status,data_origin,source_name,source_reference,is_inventory_instance)
+      VALUES($1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,NULL,$6,$7,'VALIDATED','UNKNOWN','PROVIDED_DOCUMENT',$8,$9,false) RETURNING id`,
+      [typeId,parentId,areaId,companyId,concessionId,code,name,sourceName,sourceReference])) as IdRow[];
+    if(!row?.id)throw new Error(`Could not seed ${code}`); return row.id;
+  }
+
+  private async link(q:QueryRunner,assetId:string,documentId:string,notes:string):Promise<void>{
+    await q.query(`INSERT INTO asset_source_documents(asset_id,document_id,relation_type,notes) VALUES($1::uuid,$2::uuid,'SOURCE',$3)`,[assetId,documentId,notes]);
+  }
+
+  private async type(q:QueryRunner,sql:string):Promise<string>{
+    const rows=(await q.query(sql)) as IdRow[]; if(!rows[0]?.id)throw new Error(`Missing canonical asset type: ${sql}`); return rows[0].id;
+  }
+
+  private async verify(q:QueryRunner):Promise<void>{
+    const [row]=await q.query(`SELECT
+      (SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE t.operational_role='COMPANY')::integer companies,
+      (SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE lower(t.code)='departamento')::integer departments,
+      (SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE lower(t.code)='area')::integer areas,
+      (SELECT COUNT(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE lower(t.code)='yacimiento')::integer fields,
+      (SELECT COUNT(*) FROM concession_types)::integer concessions,
+      (SELECT COUNT(*) FROM inventory_families WHERE level='INSTALLATION')::integer installation_families,
+      (SELECT COUNT(*) FROM inventory_families WHERE level='SUBINSTALLATION')::integer subinstallation_families,
+      (SELECT COUNT(*) FROM finding_catalog_items)::integer findings,
+      (SELECT COUNT(*) FROM finding_catalog_item_inventory_families m JOIN inventory_families f ON f.id=m.inventory_family_id WHERE f.level='INSTALLATION')::integer installation_mappings,
+      (SELECT COUNT(*) FROM finding_catalog_item_inventory_families m JOIN inventory_families f ON f.id=m.inventory_family_id WHERE f.level='SUBINSTALLATION')::integer subinstallation_mappings,
+      (SELECT COUNT(*) FROM assets y JOIN asset_types t ON t.id=y.asset_type_id JOIN assets a ON a.id=y.parent_id WHERE lower(t.code)='yacimiento' AND (y.operational_area_id IS DISTINCT FROM a.id OR y.operator_company_id IS NULL OR y.concession_type_id IS NULL))::integer invalid_fields`);
+    const expected:Record<string,number>={companies:13,departments:7,areas:64,fields:230,concessions:2,installation_families:14,subinstallation_families:109,findings:181,installation_mappings:48,subinstallation_mappings:880,invalid_fields:0};
+    for(const [key,value] of Object.entries(expected)) if(Number(row?.[key]??-1)!==value)throw new Error(`Authoritative inventory verification failed: ${key}=${row?.[key]} expected=${value}`);
+  }
+}

api-v3/src/inspection-visits/inspection-planning-create.service.ts

@@ -10,9 +10,9 @@ import { validateInspectionPlanningScope } from './inspection-planning-scope';
 import { InspectionVisitsService } from './inspection-visits.service';
 
 /**
- * Creación WEB F6.1. Separa explícitamente ubicación territorial y alcance:
- * Departamento → Área → Yacimiento. La Operadora no es un padre físico; se
- * valida contra la relación temporal vigente del Área para la fecha planificada.
+ * Creación WEB. La ubicación territorial es Departamento → Área → Yacimiento.
+ * Empresa y Tipo de concesión pertenecen directamente al Yacimiento; por eso
+ * la Operadora elegida debe coincidir con el Yacimiento seleccionado.
  */
 @Injectable()
 export class InspectionPlanningCreateService {
@@ -52,27 +52,27 @@ export class InspectionPlanningCreateService {
 
         stage = 'operator:validate';
         const [context] = await manager.query(`
-          SELECT relation.id
-          FROM area_company_relations relation
-          INNER JOIN assets area ON area.id=relation.area_id
-          INNER JOIN asset_types area_type ON area_type.id=area.asset_type_id
-          INNER JOIN assets company ON company.id=relation.company_id
+          SELECT yacimiento.id
+          FROM assets yacimiento
+          INNER JOIN asset_types yacimiento_type ON yacimiento_type.id=yacimiento.asset_type_id
+          INNER JOIN assets company ON company.id=yacimiento.operator_company_id
           INNER JOIN asset_types company_type ON company_type.id=company.asset_type_id
-          WHERE relation.area_id=$1::uuid
-            AND relation.company_id=$2::uuid
-            AND relation.relation_role='OPERATOR'
-            AND relation.valid_from <= $3::timestamptz
-            AND (relation.valid_until IS NULL OR relation.valid_until > $3::timestamptz)
-            AND area_type.operational_role='AREA'
+          WHERE yacimiento.id=$1::uuid
+            AND yacimiento.parent_id=$2::uuid
+            AND yacimiento.operator_company_id=$3::uuid
+            AND lower(yacimiento_type.code)='yacimiento'
+            AND yacimiento_type.is_active=true
+            AND yacimiento.information_status<>'INACTIVE'
+            AND yacimiento.concession_type_id IS NOT NULL
             AND company_type.operational_role='COMPANY'
-            AND area.information_status<>'INACTIVE'
+            AND company_type.is_active=true
             AND company.information_status<>'INACTIVE'
           LIMIT 1
-        `, [dto.operationalAreaId, dto.operatorCompanyId, plannedStartAt]) as Array<{ id: string }>;
+        `, [scopeAssetId, dto.operationalAreaId, dto.operatorCompanyId]) as Array<{ id: string }>;
         if (!context) {
           throw new BadRequestException({
-            code: 'INSPECTION_OPERATOR_NOT_ACTIVE_IN_AREA',
-            message: 'La Operadora seleccionada no está vigente para el Área en la fecha de la Inspección',
+            code: 'INSPECTION_OPERATOR_NOT_RELATED_TO_YACIMIENTO',
+            message: 'La Empresa seleccionada no es la Empresa relacionada con el Yacimiento',
           });
         }
 
@@ -129,8 +129,6 @@ export class InspectionPlanningCreateService {
           VALUES ($1::uuid,$2::uuid,true,$3::uuid)
         `, [visit.id, dto.leadInspectorUserId, principal.userId]);
 
-        // El checklist sigue el alcance físico del Yacimiento. No usa
-        // assets.operator_company_id, que en F6 es sólo snapshot histórico.
         stage = 'checklist:insert';
         await manager.query(`
           INSERT INTO inspection_visit_checklist_items (
@@ -197,7 +195,7 @@ export class InspectionPlanningCreateService {
           )
           SELECT DISTINCT
             $1::uuid, item.asset_id, 'AUTO_INCLUDED', NULL, $2::uuid,
-            jsonb_build_object('generation',1,'source','F6.1_CREATE')
+            jsonb_build_object('generation',1,'source','AUTHORITATIVE_CREATE')
           FROM inspection_visit_checklist_items item
           WHERE item.visit_id=$1::uuid
             AND item.generation_number=1
@@ -224,6 +222,7 @@ export class InspectionPlanningCreateService {
             operationalAreaId: dto.operationalAreaId,
             scopeAssetId,
             operatorCompanyId: dto.operatorCompanyId,
+            operatorSource: 'YACIMIENTO',
             plannedStartAt: plannedStartAt.toISOString(),
             leadInspectorUserId: dto.leadInspectorUserId,
           },
@@ -243,7 +242,7 @@ export class InspectionPlanningCreateService {
       const technical = error instanceof Error
         ? `${error.name}: ${error.message}${error.stack ? `\n${error.stack}` : ''}`
         : String(error);
-      this.logger.error(`F6.1 inspection create failed at ${stage}: ${technical}`);
+      this.logger.error(`inspection create failed at ${stage}: ${technical}`);
       throw error;
     }
   }

api-v3/src/inspection-visits/inspection-planning-hierarchy.service.ts

@@ -67,27 +67,34 @@ export class InspectionPlanningHierarchyService {
     at?: string,
   ): Promise<{ data: InspectionPlanningHierarchyItem[] }> {
     await this.requireType(areaId, 'area', 'El Área seleccionada no es válida');
-    const effectiveAt = at ? new Date(at) : new Date();
-    if (!Number.isFinite(effectiveAt.getTime())) {
-      throw new BadRequestException({
-        code: 'INSPECTION_PLANNING_DATE_INVALID',
-        message: 'La fecha de planificación no es válida',
-      });
+    if (at) {
+      const effectiveAt = new Date(at);
+      if (!Number.isFinite(effectiveAt.getTime())) {
+        throw new BadRequestException({
+          code: 'INSPECTION_PLANNING_DATE_INVALID',
+          message: 'La fecha de planificación no es válida',
+        });
+      }
     }
+    // Modelo autoritativo: la Empresa pertenece al Yacimiento. Para mantener el
+    // selector de planificación por Área, se proyectan las Empresas de todos los
+    // Yacimientos activos que pertenecen a esa Área.
     const data = await this.dataSource.query(`
-      SELECT DISTINCT company.id, company.code, company.name
-      FROM area_company_relations relation
-      INNER JOIN assets company ON company.id=relation.company_id
-      INNER JOIN asset_types type ON type.id=company.asset_type_id
-      WHERE relation.area_id=$1::uuid
-        AND relation.relation_role='OPERATOR'
-        AND relation.valid_from <= $2::timestamptz
-        AND (relation.valid_until IS NULL OR relation.valid_until > $2::timestamptz)
-        AND type.operational_role='COMPANY'
-        AND type.is_active=true
+      SELECT DISTINCT company.id, company.code, COALESCE(profile.legal_name,company.name) AS name
+      FROM assets yacimiento
+      INNER JOIN asset_types yacimiento_type ON yacimiento_type.id=yacimiento.asset_type_id
+      INNER JOIN assets company ON company.id=yacimiento.operator_company_id
+      INNER JOIN asset_types company_type ON company_type.id=company.asset_type_id
+      LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
+      WHERE yacimiento.parent_id=$1::uuid
+        AND lower(yacimiento_type.code)='yacimiento'
+        AND yacimiento_type.is_active=true
+        AND yacimiento.information_status<>'INACTIVE'
+        AND company_type.operational_role='COMPANY'
+        AND company_type.is_active=true
         AND company.information_status<>'INACTIVE'
-      ORDER BY company.name, company.code
-    `, [areaId, effectiveAt]) as InspectionPlanningHierarchyItem[];
+      ORDER BY name, company.code
+    `, [areaId]) as InspectionPlanningHierarchyItem[];
     return { data };
   }
 
@@ -106,4 +113,4 @@ export class InspectionPlanningHierarchyService {
       throw new BadRequestException({ code: 'INSPECTION_PLANNING_HIERARCHY_INVALID', message });
     }
   }
-}
+}

api-v3/src/reference-data/authoritative-inventory-model.payload-1.ts

@@ -0,0 +1 @@
+export default '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';

api-v3/src/reference-data/authoritative-inventory-model.payload-2.ts

@@ -0,0 +1 @@
+export default 'yOu7ZyquZFi3k+Hjy2pzcSQpmqebz8cHBZJ3iu35nrJrkCqmh0x1Yroi+pUA9zi/zw/pvg9kUIEsnYFemMGgWtKz/CXNeiFamjz6sM9SBtWyilO5QQ9EJaxPpxodDcNcmCfputeTOnXc8rzcHtd5r1V19TWIPRC5FrHuRnXF9fS4VZ3viFo18ZJ9NdTaFVHRpuxoDI9k1Gx7IFqDgbYKUATFH0m19r2wNScSHck/kHYlvXCZ1nauO0Rex1S83VDMKmP6nRx0a1C5SUBCVYlgs4oLLVI85yHrIZCb5CFZ61zCztj1YP7NMdkeN/1QvQbUmoZ1Rq7oGHkQa3Iw+2EGWsx/wuoqxR768uW6ud95Eqt9kr7LbjFATOxBV1RZ/35K1tmDqNEUx9zNwki3xjA1LtJt+ilb04H6/XDWb7JKtbu29qY7qqt/hYjM3OINisjQP/EtuDrfe4M4fqwzvJj7Iu0/n9dZuLrP4evXkI6OcPOY7O6FE/ZPeyHVvXt4fC4q7wPKBpprBjKg1e0QUStPNsI0qduTnUGZ7nQmCz29r1QxdgXW5RSOT/+Vf+2F6lRu6F6JIpFsrxq/nVH19ztkRNYRkVcs/5t8WzEhOhbfeW0Vgl0BfU2J7WWlxLYrZuXMvCC/kWzdbQ9IpbzktTpQcwx3xLVU3Hm+T3oxSKksEXppXCS/ijUti4L6INtqaGybrHNNQrwrauUS1O3p1m0PRFeLaPyrGf6r2QeX63GLY7QSJuyI7OmRa9ZXR1hfD9tbZgM9btWO61gtqx5Te9qqdg/ZfZ+SeEspMqnffpM3VhsJzEnI7ByypvKuK759Fr9q1XRFb7jaJ0M63U4axz1z80/G7VaDYTl1H/B0Wy5R9nO7WuDbKhvemRuHvYD9usWxEYGG9OOuEv3vjh1UHzpSbjvK2F43mXAHLZchZWy/GxOVghTprqQMGXQsg2f6q5SisFwrIM6gm0ArxSjiygqdoeEu3dIBrcBanbINllKMIhUVFdd/hPNyqIblOs+gRGSOu11mDCv2VGfISqgz3CQPtYBkZ9DKqVcubqXArDOof/aKbC/oALl922MCrs1vn1a7F7Baa/nluK2rtMM6pZAspfKkdidYQba7BVS5Xb8cLMM53fYe7oAZTsftuKqa4q9kk2zqN7scjjyyhMxrN4fIYd33gvTaEsedEX0dYs1m7QwbtFzY7oGtKyCpOzCdUS38lrg8jddxGnZ+GgXb76bMSi2J0qpFBg26HaCeRvHCu/xj2gvUbboE3weUV+Mue8JS00LuoCO7PG09ulHcHMizPx7TXuj+2Vv9quXTGTyoXtaN9kR7l6nGq1u9+Mza7usN0COjO7RVb1PQD5Bpe+z1grR1kPWTuDuwU7tjVweFAoevp6ZSeSJ3YpAx7Y73NfmZRg0ybscTXqk9qfdxkJE7Op9KDUqhCeKe8S6rSGu3onHLb7xXIIzIz1n1JlxX/EB7FW66SQ6V+svOwPV7Bc83GLNDP+R6Cq8MH/RDrR9rel+5M7BzBrgmzl3B63YlHRrXSc8VrsdRZsnukPVcYdWHuz9uS9WbZfmv/YD9aqAj3KieYWfEQIdYs1c7wrJ6yUoB208G2MCqoWrvG3XGZVXPgiShem28M6hdAR0mn5OekI4Wsj+33Erf3U15++6QbLP9Jsl7YXMNtqbLQWdcr5YUnhF65QJuZ1S/tSawM2SgheyrC0qdStEtSSzrKO+1hTOlMEXuwSRjVlw0y24DZZpk5mhDZ/rXatywY9cgy67U14oU6dfKBc+OkE597y6cn+xzryd1K3mc70Wrg30fRLUHWdm1eSRKL/qAehVhXaTrl7vi4upHskl1l+06zuLXm3bJAtYtjs6U+pBaF4na7tix3QMbnO0YJj930E3ZlJIRpaGY3KFl0LFdCWvsNyajWh1RbW07MhmRdUQ8161MxrU74rrnmpnJwE5HYK7rela0t9uuRQ/Wb9cHVtW62yz9tU+Klyn1I1InyuHu+LUh1dtxgqChlfi3r4JSTHKbiFYt42O6O3zTQvzhnZltyYDZCP8u314lD9mmqcv/RbiM5nGobbI+Ww61Lfxny1DbQn81iS/DS2MUDpfaxvnLeThZzKbzZaRtlj+T/l0xcKTHU4Jcy2ttR/x5NJsu4uV0Hk8bmuJPf54u9K3wh+HoMpqH+j748+jSGE4n9BpGPBlGk8tYhlFWaBROlqFxGRkRkUfXoaltAfZKNpuO4nE0F3jEvf3xYxsDy9+LZkm17vbD6Sga0vvLTD1HvwwnP6wimdXt1OVCTEeyIACjrsUXHcKRLB7AqNlqNH76j4ksNcCoaBTdhpdTWabOjVpEs3BO9HPjIr4KF/FwatyQDP1M7yk9sN8Z5DaaL+OhBBGgEMv5CUMR43NjL6bji9AYCqGLr1ay2FnIwIubpSL57SMuowUJ8c/hOKY5p0ahePHt1HhzuZqNoh/fKurRA46keRKPRtO3iiK1AxJkHF7Nw+txqHTD77KIxng1WsbRMpyFC6UvPjL9LBzRyIUxpZ3gmva/8PtoofTIP6vI4fw6pP1o+oEW5uU/lGb554bPYjF3sQvR3kKqN4zlN2iRw/GUFl0o0ZDWgeT4Tam7JJhvldb57Rih+ArLxWqxjKcTPUzbhkaLSFp4KW9pLeJZ3WiYRv5Y8x7IHIScjrpb9alcaNiQzkB1HIfGLf53PCZOKl3ygWFCq8LhzVTplA89prrFswAaVl16ewANq27ytgUNq+7yNjs/7GV7VZrknxtx9fup0hX/HK1GUu0WmbiZLo1pPFJ64Z+jL3YWpQH++Qc6u4XYLZLwoqxK4/vzE64uQ2HMLKVpnBYROO1U4SxWut2fZf88XJanZDQfy2ekoxEAu3H9HPs8dYPmOQ40rKoKjnt+2DAaXdJhQTv21Wi6DIe0YSq97M+NHcWTqBxLenu5GorB4r/C61VpYs6np39VOtyfg9QdIEpb+3ODr+LRci4ZyE7QsmTT+bzYq6Y/xjSV4G2o';

api-v3/src/reference-data/authoritative-inventory-model.payload-3.ts

@@ -0,0 +1 @@
+export default '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';

api-v3/src/reference-data/authoritative-inventory-model.payload-4.ts

@@ -0,0 +1 @@
+export default 'yUcRMjmcTgBT37B4nq7FkVMEZE7HK6n4vvgCjr4V8Szb5Ifc1PcTFi270pwOLjpu6N+Oe1F5muxMfafg8ujPny0NQ4hVKh/nahfgeXqf7Q9lv6qH01BT39T3hjyp8OdrubJWbc9byLPxup0VFnZaBpfEWZk8iDut+g68bYM3+TqpPFvlq8rr3KBFp+NYNHgzYnrr3ZaM8+RjsiMLLXkko/tQvOZHGpTmcpxkcA4p+k1F+ngy+Ion+2KkfzwqVrXaRfciv0vvE7Oh/W0RjSvmkZZFjdPmRVV5viPz6LdfEuJ9LjFeDaOK76eLZTP1PWWX4tYFWSmb8qa1vhHs8MWrKaKFD8XpZuqbuJLQpofSkSmETMb01faDu7tkXX75paF96lEAFKu6y++Oa5XT6ud4t+sNGcmFwVUsvfjrIMBNfdfTS+E9PaR6IVKCIxfp7qHoD/tQN4LV3qQL0pmUaBfrRHKF1E6jRSBXPFz8Esc19d1Db8WXzU7y/okc0vK7Eaa+Mehyl2z3n/Ldg8pqJVRyVQSLD8mj8DjWGfmBxdu/OHCiCWK6zsnl28rT+DobR4x8sWSKiPkJRrjOB3l4oAgbbZS70nH5uFH3HzWsktCfQgHUdTdy45N4CVPffHO2yw+S4/4oNo+98fD0j88kk5K8KiGX2+wUnS9iA0J1C4Pd1DfNvAkv4lG8PJ3kM7KAp/PrcBIvxlNjSsZPLEzGy+lwNRbZmoJKjoM6akRlEi2NZ0Q6octKo1lZwHcORi3ZWUVk2d7El/Onv6xGZH+9QNLZq31CU98QMxyF83FoLKYTOUWvtrY80VSsA7VP5WI6G52MwPORNLUN5YvBeLKRWsYqsZtT5eurBXGqozP1fSQlclHNoZgOal9I4Z4sjEk0jBbhXLk+okZlnmN7ixWxT6yyFOFVYjANUUC1+aLk8wxX4eUpBXeqyZaztGpvRe2wyjLowm2Lm9XSuJz+Xl4EX2cIm/ouhvPolqaOX2tVRHA6JHdezhcqERt9TL+8fFMOJU+lkr1UIjkNAHq/WWabEum5nNJiGqVMm/q2gfpgpqlvBni1Em7OQkRIo5lwisv/pKFlvt3Ud/ir+CU1r0Rt3hcOSb9KVBFWWSnXn5T4TyHbhVtUSKTYYcgFJOmYrYo1K95qcRXekr6LhXgjNpGw2EPGRYmJmIN4Yep785FxPJ5NS5rFyWAumS/49zqpqe+/95wyemesLopsE2nhO/IUSNVisX8JZ+Un4zW8M55O4sI1NaJitxM7pny/Y9C8okJ7Th5cGf6frWSGK1GoS/J/nrNfND/NF81vQ+0wpeg8Gt6UCU2RNqeBs5tiTN2hVrvjdV0FLaBi8MVj2jSHQvi1wRm16d1pF9TeN1EiVGFxnWdRcvtqTg7981b9kv581hF6dEnSlUBVnS+FtLwssbpZcXUTmtGEYjlKgZOHGG9eZZF2hhlJymntpFNTiXsVFe/PR+sLTPTjcLRayIkNteHcyQqRbZ8PvxZ34z9sMjJ/JBtDiYE9JNunf7zYM4/kcDw8/U1YHftPyed8J2whYXhsjT0Z/sVN3cIdkewcJSRGhmAqenkRTLI9JhtT3wVOBGXnalBW7ej2vP8335FUImNSduaUKpIpz2TuXrKPCyHK1R3Z8/Rpppk4ViYizWR8oGcrkvNLlTeKfIzCZ8U9sVTsfpcrZSpZBC7i6Sw+5UjL56SdZTwTyTwyX2RFULuexZWjUAmQSWv0mkzW3hGVKyleflPuRv0iaL/e569XjwE61kDHKnQ2SOeAdC5Ix0E6D6TzQboApLMGKKGFEqIssVCeWChTLJQrFsoWC+WLhTLGQjnDUM4wlDMM5Qxr4owNapUNapUNapUNapUNapUNapUNapWNapWNapWNapWNapWNapWNapWNapWNapWNapWNapWNapWNapWNapWNapUDapUDapUDapUDapUDapUDapUDapWDapWDapWDapWDapWDapWDapWDapWDapWDapWDapWDapWDapWDapWDapULapULapULapULapULapULapULapWLapWLapWLapWLapWLapWLapWLapWLapWLapWLapWLapWLapWLapWLahUHtYqDWsVBreKgVnFQqzioVRzUKo5qFUe1iqNaxVGt4qhWcVSrOKpVHNUqjmoVR7WKo1rFUa3iqFZxVKs89GWqhMxBCV2UkKOEHkroo4ToW9sDlNBCCZtY6KOc8VHO+ChnfJQzPsoZH+WMj3LGRznjo5zxUc4EKGcClDMBypkA5UyAciZAOROgnAlQzgQoZwKUM6KSCGNNjdK2YUoHpnRhSg5TejBlEyctC14lC14lC14lC14lC14lC14lC14lOH5ao2xeJQavEoNXicGrxOBVYvAqwfGwGmXzKtnwKtnwKtnwKtnwKtnwKsHxjRpl8yo58Co58Co58Co58Co58CrB/mqNsnmVXHiVXHiVXHiVXHiVXHiVYP+jRtm8ShxeJQ6vEodXicOrxOFVgh2bGqUNUzoDmNKCKRlMacOUDkzpwpSN3Kza0Y4HU/owZYBSuo08CtCghAVb3TVKtzFDOoBTzQN09hpl8+wWmrS34Mkt1JGoUboMprRhSgemdGFK+N1dD6ZsXKVa3UeAUvIBTGnBlI08QjPzDE3NMzQ3z9DkPEOz8wxNzzM0P8/gBD2DM/QMTtEzOEfP4CQ9g7P0DE7TMzhPz+BEPYM9Ewan6hmcq2dwsp7B2XqGpusZmq9naMKeoRl7hqbsGZqzZ2jSnsFZewan7Rmct2dw4p7BmXsGp+4ZnLtncPKewdl7Bru3DM7fMziBz+AMPoNT+AzN4TM0ic/QLD5D0/gMzeMzNJHP0Ew+g1P5DM7lMziZz+BsPoPT+QzO5zM4oc/gjD6DU/oMjpEwOKnP4Kw+g9P6DM7rMzSxz9DMPkNT+wzN7TM0uc/Q7D5D0/sMzu8zOMHP4Aw/g1P8DM7xMzjJz+AsP4PT/AzO8zM40MbgTD+DU/0MzvUzONnP';

api-v3/src/reference-data/authoritative-inventory-model.payload-5.ts

@@ -0,0 +1 @@
+export default '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';

api-v3/src/reference-data/authoritative-inventory-model.ts

@@ -0,0 +1,41 @@
+import { inflateSync } from 'node:zlib';
+import payload1 from './authoritative-inventory-model.payload-1';
+import payload2 from './authoritative-inventory-model.payload-2';
+import payload3 from './authoritative-inventory-model.payload-3';
+import payload4 from './authoritative-inventory-model.payload-4';
+import payload5 from './authoritative-inventory-model.payload-5';
+
+export const AUTHORITATIVE_INVENTORY_MODEL_SOURCES = {
+  territory: {
+    file: 'modelo_yacimientos.sql',
+    sha256: '6a1d96bc8af7e755dd0e2fd9faf08335625b9c76865208c3b8413d868aa5eb1a',
+  },
+  inventory: {
+    file: 'modelo_relacional instalaciones y sub.sql',
+    sha256: 'fb513f3909e78db298361a8a6998ca77026748f9b03cbab44c77b884ca862b49',
+  },
+} as const;
+
+export type AuthoritativeInventoryModel = {
+  departments: Array<{ id: number; nombre: string }>;
+  companies: Array<{ id: number; nombre: string }>;
+  concessionTypes: Array<{ id: number; nombre: string }>;
+  areas: Array<{ id: number; departamento_id: number; nombre: string }>;
+  fields: Array<{
+    id: number;
+    nombre: string;
+    area_id: number;
+    empresa_id: number;
+    tipo_concesion_id: number;
+  }>;
+  installationFamilies: Array<{ id: number; nombre: string }>;
+  subinstallationFamilies: Array<{ id: number; instalacion_id: number; nombre: string }>;
+  findings: Array<{ id: number; nombre: string }>;
+  subinstallationFindings: Array<{ subinstalacion_id: number; hallazgo_id: number }>;
+  installationFindings: Array<{ instalacion_id: number; hallazgo_id: number }>;
+};
+
+const payload = payload1 + payload2 + payload3 + payload4 + payload5;
+
+export const AUTHORITATIVE_INVENTORY_MODEL: AuthoritativeInventoryModel =
+  JSON.parse(inflateSync(Buffer.from(payload, 'base64')).toString('utf8')) as AuthoritativeInventoryModel;

api-v3/test/unit/authoritative-inventory-model.test.ts

@@ -0,0 +1,50 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import {
+  AUTHORITATIVE_INVENTORY_MODEL as model,
+  AUTHORITATIVE_INVENTORY_MODEL_SOURCES as sources,
+} from '../../src/reference-data/authoritative-inventory-model';
+
+test('authoritative SQL sources keep their exact cardinalities', () => {
+  assert.equal(sources.territory.file, 'modelo_yacimientos.sql');
+  assert.equal(sources.territory.sha256, '6a1d96bc8af7e755dd0e2fd9faf08335625b9c76865208c3b8413d868aa5eb1a');
+  assert.equal(sources.inventory.file, 'modelo_relacional instalaciones y sub.sql');
+  assert.equal(sources.inventory.sha256, 'fb513f3909e78db298361a8a6998ca77026748f9b03cbab44c77b884ca862b49');
+  assert.equal(model.departments.length, 7);
+  assert.equal(model.companies.length, 13);
+  assert.equal(model.concessionTypes.length, 2);
+  assert.equal(model.areas.length, 64);
+  assert.equal(model.fields.length, 230);
+  assert.equal(model.installationFamilies.length, 14);
+  assert.equal(model.subinstallationFamilies.length, 109);
+  assert.equal(model.findings.length, 181);
+  assert.equal(model.installationFindings.length, 48);
+  assert.equal(model.subinstallationFindings.length, 880);
+});
+
+test('Area belongs only to Departamento while Yacimiento owns Area Empresa and concession', () => {
+  for (const area of model.areas) {
+    assert.ok(model.departments.some((department) => department.id === area.departamento_id));
+    assert.deepEqual(Object.keys(area).sort(), ['departamento_id', 'id', 'nombre']);
+  }
+  for (const field of model.fields) {
+    assert.ok(model.areas.some((area) => area.id === field.area_id));
+    assert.ok(model.companies.some((company) => company.id === field.empresa_id));
+    assert.ok(model.concessionTypes.some((type) => type.id === field.tipo_concesion_id));
+    assert.deepEqual(Object.keys(field).sort(), ['area_id', 'empresa_id', 'id', 'nombre', 'tipo_concesion_id']);
+  }
+});
+
+test('Subinstalación classifications belong to one installation classification and every mapping resolves', () => {
+  for (const subinstallation of model.subinstallationFamilies) {
+    assert.ok(model.installationFamilies.some((installation) => installation.id === subinstallation.instalacion_id));
+  }
+  for (const mapping of model.installationFindings) {
+    assert.ok(model.installationFamilies.some((installation) => installation.id === mapping.instalacion_id));
+    assert.ok(model.findings.some((finding) => finding.id === mapping.hallazgo_id));
+  }
+  for (const mapping of model.subinstallationFindings) {
+    assert.ok(model.subinstallationFamilies.some((subinstallation) => subinstallation.id === mapping.subinstalacion_id));
+    assert.ok(model.findings.some((finding) => finding.id === mapping.hallazgo_id));
+  }
+});

api-v3/test/unit/f5-1-clean-manual-inventory-contract.test.ts

@@ -32,15 +32,17 @@ test('F5.1 canonical hierarchy starts at Departamento and Area is no longer root
   assert.match(migration, /SET can_be_root=false/);
 });
 
-test('F5.1 manual creation permits Area context without requiring an operator', () => {
-  const migration = source('src/database/migrations/1790087400000-f5-1-clean-manual-inventory.ts');
+test('Authoritative manual creation keeps Area physical and stores Company plus concession on Yacimiento', () => {
   const structure = source('src/asset-master/inventory-structure.service.ts');
+  const dto = source('src/asset-master/dto/create-inventory-structure.dto.ts');
 
-  assert.match(migration, /DROP CONSTRAINT IF EXISTS chk_asset_context_history_context_pair/);
-  assert.match(migration, /CHECK \(operator_company_id IS NULL OR operational_area_id IS NOT NULL\)/);
-  assert.match(structure, /operator_company_id,inventory_family_id/);
+  assert.match(structure, /operator_company_id,concession_type_id,inventory_family_id/);
+  assert.match(structure, /dto\.kind === 'YACIMIENTO'/);
+  assert.match(structure, /INVENTORY_YACIMIENTO_COMPANY_REQUIRED/);
+  assert.match(structure, /INVENTORY_YACIMIENTO_CONCESSION_REQUIRED/);
   assert.match(structure, /asset_context_history/);
-  assert.match(structure, /operational_area_id,operator_company_id/);
+  assert.match(dto, /operatorCompanyId\?: string \| null/);
+  assert.match(dto, /concessionTypeId\?: string \| null/);
 });
 
 test('F5.1 Inventory browser exposes every canonical level instead of filtering by is_inventory_instance', () => {
@@ -64,23 +66,27 @@ test('F5.1 Finding Catalog defaults to associated findings and exposes all items
   assert.match(panel, /Esta clasificación todavía no tiene Hallazgos asociados/);
 });
 
-test('F5.1/F6 Configuration manages findings inline and filters Subinstallations by compatible Installation classifications', () => {
-  const configPage = source('../web-v2/src/pages/AssetTypesPage.tsx');
+test('Authoritative Configuration presents exact physical relationships and technical families', () => {
+  const configPage = source('../web-v2/src/pages/AuthoritativeInventoryConfigPage.tsx');
 
-  assert.match(configPage, /replaceInventoryFamilyFindings/);
-  assert.match(configPage, /Agregar o quitar/);
-  assert.match(configPage, /familyFindingIds/);
-  assert.match(configPage, /selectedInstallationFamilyId/);
-  assert.match(configPage, /family\.parentFamilyIds\.includes\(selectedInstallationFamilyId\)/);
-  assert.match(configPage, /Filtrar por tipo de Instalación/);
+  assert.match(configPage, /El Área sólo tiene Nombre y pertenece obligatoriamente a un Departamento/);
+  assert.match(configPage, /Tipo de concesión/);
+  assert.match(configPage, /Empresa relacionada/);
+  assert.match(configPage, /Yacimiento → Instalación/);
+  assert.match(configPage, /Instalación → Subinstalación/);
+  assert.match(configPage, /installationFamilies\.map/);
+  assert.match(configPage, /subinstallationFamilies\.map/);
+  assert.match(configPage, /Hallazgos asociados/);
 });
 
-test('F5.1 Web creation and configuration expose Departamento as the physical root', () => {
+test('Authoritative Web creation exposes Departamento as root and Yacimiento as operational owner', () => {
   const createPage = source('../web-v2/src/pages/InventoryCreatePage.tsx');
-  const configPage = source('../web-v2/src/pages/AssetTypesPage.tsx');
+  const configPage = source('../web-v2/src/pages/AuthoritativeInventoryConfigPage.tsx');
   assert.match(createPage, /kind: 'DEPARTAMENTO'/);
   assert.match(createPage, /AREA:'Departamento'/);
+  assert.match(createPage, /Empresa relacionada/);
+  assert.match(createPage, /Tipo de concesión/);
   assert.match(createPage, /Datos opcionales/);
   assert.match(configPage, /<strong>Departamento<\/strong>/);
-  assert.match(configPage, /familyId=\$\{familyEditor\.id\}/);
+  assert.match(configPage, /<strong>Yacimiento<\/strong>/);
 });

api-v3/test/unit/f5-android-test-cut.test.ts

@@ -10,8 +10,8 @@ function mountedRepoFile(path: string): string {
 test('F6.3 Android test cut targets production API and has a distinct installable debug version', () => {
   const gradle = mountedRepoFile('android-app/app/build.gradle.kts');
 
-  assert.match(gradle, /versionCode = 25/);
-  assert.match(gradle, /versionName = "0\.16\.0"/);
+  assert.match(gradle, /versionCode = 26/);
+  assert.match(gradle, /versionName = "0\.17\.0"/);
   assert.match(gradle, /https:\/\/dhv2\.korexlabs\.com\/api\/v3\//);
   assert.match(gradle, /applicationIdSuffix = "\.debug"/);
 });

api-v3/test/unit/f6-1-inspection-planning-hierarchy.test.ts

@@ -26,7 +26,7 @@ test('F6.1 inspection planning exposes Departamento → Área → Yacimiento exp
   assert.doesNotMatch(createPage, /Área \/ Yacimiento/);
 });
 
-test('F6.1 WEB creation freezes Area and uses the selected Yacimiento as physical scope', () => {
+test('Authoritative WEB creation freezes Area and validates Company against selected Yacimiento', () => {
   const dto = source('src/inspection-visits/dto/create-inspection-visit.dto.ts');
   const scope = source('src/inspection-visits/inspection-planning-scope.ts');
   const create = source('src/inspection-visits/inspection-planning-create.service.ts');
@@ -37,15 +37,18 @@ test('F6.1 WEB creation freezes Area and uses the selected Yacimiento as physica
   assert.match(scope, /lower\(type\.code\)='yacimiento'/);
   assert.match(create, /scopeAssetId,/);
   assert.match(create, /operationalAreaId: dto\.operationalAreaId/);
-  assert.match(create, /relation\.relation_role='OPERATOR'/);
-  assert.match(create, /relation\.valid_from <= \$3::timestamptz/);
+  assert.match(create, /yacimiento\.operator_company_id=\$3::uuid/);
+  assert.match(create, /yacimiento\.concession_type_id IS NOT NULL/);
+  assert.match(create, /INSPECTION_OPERATOR_NOT_RELATED_TO_YACIMIENTO/);
   assert.match(createPage, /scopeAssetId: yacimientoId/);
 });
 
-test('F6.1 WEB inspection creation does not use Inventory operator snapshots', () => {
+test('Authoritative WEB inspection creation uses Yacimiento context and not descendant Inventory snapshots', () => {
   const create = source('src/inspection-visits/inspection-planning-create.service.ts');
 
-  assert.match(create, /area_company_relations relation/);
+  assert.match(create, /yacimiento\.operator_company_id/);
+  assert.match(create, /operatorSource: 'YACIMIENTO'/);
+  assert.doesNotMatch(create, /area_company_relations relation/);
   assert.doesNotMatch(create, /inventory\.operator_company_id/);
   assert.doesNotMatch(create, /asset\.operator_company_id/);
 });

api-v3/test/unit/f6-1-inspection-yacimiento-scope-review.test.ts

@@ -28,7 +28,7 @@ test('F6.1 field Findings reject Inventory outside the frozen Yacimiento scope',
   assert.doesNotMatch(source, /AS "insideArea"/);
 });
 
-test('F6.1 planning preserves Yacimiento and never validates Inventory ownership from Company snapshot', () => {
+test('F6.1 planning preserves Yacimiento and never validates descendant Inventory ownership', () => {
   const source = api('src/inspection-visits/inspection-visits.service.ts');
 
   assert.match(source, /const nextScope = dto\.scopeAssetId === undefined \? visit\.scopeAssetId : dto\.scopeAssetId/);
@@ -38,7 +38,6 @@ test('F6.1 planning preserves Yacimiento and never validates Inventory ownership
   assert.doesNotMatch(source, /visit\.scopeAssetId = nextAreaId/);
   assert.doesNotMatch(source, /assertAssetsMatchContext/);
   assert.doesNotMatch(source, /assertCurrentAssetsMatchContext/);
-  assert.doesNotMatch(source, /asset\.operator_company_id IS DISTINCT FROM/);
 });
 
 test('F6.1 creation selects actionable checklist Inventory automatically', () => {
@@ -49,14 +48,17 @@ test('F6.1 creation selects actionable checklist Inventory automatically', () =>
   assert.match(source, /'AUTO_INCLUDED'/);
 });
 
-test('F6.1 operator choices are resolved at the planned timestamp', () => {
+test('Authoritative operator choices are projected from Yacimientos of the selected Area', () => {
   const hierarchy = api('src/inspection-visits/inspection-planning-hierarchy.service.ts');
   const controller = api('src/inspection-visits/inspection-visits.controller.ts');
   const createPage = web('src/pages/InspectionVisitCreateF61Page.tsx');
 
   assert.match(hierarchy, /operatorsForArea\([\s\S]*at\?: string/);
-  assert.match(hierarchy, /relation\.valid_from <= \$2::timestamptz/);
-  assert.match(hierarchy, /relation\.valid_until > \$2::timestamptz/);
+  assert.match(hierarchy, /FROM assets yacimiento/);
+  assert.match(hierarchy, /yacimiento\.parent_id=\$1::uuid/);
+  assert.match(hierarchy, /yacimiento\.operator_company_id/);
+  assert.match(hierarchy, /SELECT DISTINCT company\.id/);
+  assert.doesNotMatch(hierarchy, /FROM area_company_relations relation/);
   assert.match(controller, /@Query\('at'\) at\?: string/);
   assert.match(createPage, /operators\?at=\$\{at\}/);
   assert.match(createPage, /\[areaId, plannedStartAt\]/);

api-v3/test/unit/f6-1-operational-context-consistency.test.ts

@@ -7,24 +7,24 @@ function source(path: string): string {
   return readFileSync(resolve(process.cwd(), path), 'utf8');
 }
 
-test('F6.1 preserves Inventory operator snapshots and changes operator only through Area relations', () => {
-  const relations = source('src/asset-master/asset-operational-relations.service.ts');
-  const migration = source('src/database/migrations/1790087250000-f5-operational-context-compatibility.ts');
+test('Authoritative model stores Company on Yacimiento and propagates it to physical descendants', () => {
+  const migration = source('src/database/migrations/1790106600000-authoritative-inventory-relationships.ts');
+  const structure = source('src/asset-master/inventory-structure.service.ts');
 
-  assert.match(migration, /Runtime ownership and search MUST NOT depend on it/);
-  assert.match(migration, /La Empresa se cambia en la relación temporal del Área, no en el Inventario/);
-  assert.match(relations, /operatorSnapshotPreserved:true/);
-  assert.doesNotMatch(relations, /UPDATE assets asset[\s\S]*SET operator_company_id=/);
+  assert.match(migration, /Yacimiento requiere Empresa relacionada/);
+  assert.match(migration, /NEW\.operational_area_id:=NEW\.parent_id/);
+  assert.match(migration, /NEW\.operator_company_id:=parent_company/);
+  assert.match(structure, /dto\.kind === 'YACIMIENTO'/);
+  assert.match(structure, /parent\?\.operatorCompanyId/);
+  assert.match(structure, /ensureCompatibilityProjection/);
 });
 
-test('F6.1 blocks operator mutation through generic Inventory edit DTOs', () => {
+test('Authoritative Yacimiento relationships cannot be mutated through generic Inventory edits', () => {
   const updateDto = source('src/asset-master/dto/update-asset.dto.ts');
-  const contextDto = source('src/asset-master/dto/change-asset-context.dto.ts');
 
-  for (const dto of [updateDto, contextDto]) {
-    assert.match(dto, /@IsEmpty/);
-    assert.match(dto, /La Operadora se administra en la relación temporal del Área, no en el Inventario/);
-  }
+  assert.match(updateDto, /@IsEmpty/);
+  assert.match(updateDto, /La Empresa relacionada se administra en el Yacimiento/);
+  assert.match(updateDto, /El Tipo de concesión se administra en el Yacimiento/);
 });
 
 test('F6.1 rejects legacy Inventory searches that filter by operator snapshot', () => {
@@ -34,28 +34,25 @@ test('F6.1 rejects legacy Inventory searches that filter by operator snapshot',
   for (const dto of [listDto, treeDto]) {
     assert.match(dto, /operatorCompanyId\?: string/);
     assert.match(dto, /@IsEmpty/);
-    assert.match(dto, /Filtrá la Operadora mediante la relación temporal del Área/);
   }
 });
 
-test('F6.1 resolves temporal Inventory operator from Area relation history', () => {
+test('Compatibility Area relation history remains available for legacy temporal queries', () => {
   const temporal = source('src/asset-master/asset-temporal.service.ts');
+  const migration = source('src/database/migrations/1790106600000-authoritative-inventory-relationships.ts');
 
   assert.match(temporal, /FROM area_company_relations relation/);
-  assert.match(temporal, /relation\.valid_from <= \$2/);
-  assert.match(temporal, /relation\.valid_until IS NULL OR relation\.valid_until > \$2/);
-  assert.match(temporal, /operator_company\.id=operator_relation\.company_id/);
-  assert.doesNotMatch(temporal, /operator_company\.id=history\.operator_company_id/);
+  assert.match(migration, /Derivado automáticamente de Yacimientos del modelo autoritativo/);
+  assert.match(migration, /TRUNCATE TABLE area_company_relations CASCADE/);
 });
 
-test('F6.1 verification planning uses Area relation truth instead of Inventory operator snapshot', () => {
+test('F6.1 verification planning can consume the Area compatibility projection', () => {
   const verification = source('src/inspection-verifications/inspection-verifications.service.ts');
+  const migration = source('src/database/migrations/1790106600000-authoritative-inventory-relationships.ts');
 
   assert.match(verification, /FROM area_company_relations relation/);
-  assert.match(verification, /relation\.valid_from <= \$2::timestamptz/);
   assert.match(verification, /VERIFICATION_OPERATOR_NOT_ACTIVE/);
-  assert.match(verification, /operatorSource: 'area_company_relations'/);
-  assert.doesNotMatch(verification, /company\.id = asset\.operator_company_id/);
+  assert.match(migration, /relation_role,source_document_id,valid_from,start_reason/);
 });
 
 test('F6.1 historical operational lists read Company and Area from the parent Inspection', () => {
@@ -68,11 +65,9 @@ test('F6.1 historical operational lists read Company and Area from the parent In
   assert.doesNotMatch(acts, /context_asset\.operator_company_id/);
   assert.match(findings, /company\.id = visit\.operator_company_id/);
   assert.match(findings, /area\.id = visit\.operational_area_id/);
-  assert.doesNotMatch(findings, /company\.id = asset\.operator_company_id/);
   assert.match(reports, /visit\.\$\{column\} = \$\{parameter\}::uuid/);
   assert.match(reports, /company\.id=context_visit\.operator_company_id/);
   assert.match(reports, /area\.id=context_visit\.operational_area_id/);
-  assert.doesNotMatch(reports, /context_asset\.operator_company_id/);
 });
 
 test('F6.1 WEB Inventory searches use physical scope and never the operator snapshot filter', () => {
@@ -85,26 +80,22 @@ test('F6.1 WEB Inventory searches use physical scope and never the operator snap
   assert.match(inspectionEditor, /listInspectionPreventiveCandidates\(id, assetSearch\)/);
   assert.match(preventiveApi, /inspection-visits\/\$\{visitId\}\/preventive-candidates/);
   assert.match(preventiveService, /COALESCE\(visit\.scope_asset_id, visit\.operational_area_id\) AS "scopeAssetId"/);
-  assert.doesNotMatch(preventiveService, /asset\.operator_company_id/);
   assert.doesNotMatch(inspectionEditor, /listAssets\(\{[\s\S]{0,300}operatorCompanyId:/);
 
   for (const page of [fieldDiscoveries, inventoryMerge]) {
     assert.match(page, /listAssets\(\{[\s\S]{0,300}operationalAreaId:/);
     assert.doesNotMatch(page, /listAssets\(\{[\s\S]{0,300}operatorCompanyId:/);
   }
-  assert.doesNotMatch(inventoryMerge, /source\.operatorCompany/);
 });
 
-test('F6.1 WEB derives the creation snapshot from the active Area operator and removes it from Inventory edits', () => {
-  const editor = source('../web-v2/src/pages/AssetEditorPage.tsx');
-  const contextPanel = source('../web-v2/src/features/assets/AssetContextHistoryPanel.tsx');
+test('WEB creation captures Company and concession only while creating a Yacimiento', () => {
+  const page = source('../web-v2/src/pages/InventoryCreatePage.tsx');
+  const structure = source('src/asset-master/inventory-structure.service.ts');
 
-  assert.match(editor, /createAsset\(\{[\s\S]*operatorCompanyId: operatorCompanyId \|\| null/);
-  assert.doesNotMatch(editor, /updateAsset\(id, \{[^}]*operatorCompanyId/);
-  assert.doesNotMatch(editor, /parent\.operatorCompany/);
-  assert.match(editor, /listCompaniesForArea\(operationalAreaId\)\.then\(\(loadedCompanies\)/);
-  assert.match(editor, /loadedCompanies\.length === 1 \? \(loadedCompanies\[0\]\?\.id \?\? ''\) : ''/);
-  assert.match(editor, /Snapshot histórico de alta/);
-  assert.match(contextPanel, /Cambiar contexto físico/);
-  assert.doesNotMatch(contextPanel, /operatorCompanyId:/);
+  assert.match(page, /requiresYacimientoContext = kind === 'YACIMIENTO'/);
+  assert.match(page, /Empresa relacionada/);
+  assert.match(page, /Tipo de concesión/);
+  assert.match(page, /operatorCompanyId:operatorCompanyId \|\| null/);
+  assert.match(page, /concessionTypeId:concessionTypeId \|\| null/);
+  assert.match(structure, /Empresa, Departamento, Área y Yacimiento no llevan clasificación técnica/);
 });

api-v3/test/unit/f6-1-operator-cancellation-ux.test.ts

@@ -7,7 +7,7 @@ function source(path: string): string {
   return readFileSync(resolve(process.cwd(), path), 'utf8');
 }
 
-test('F6.1 planning preloads the local start time and resolves the Area operator immediately', () => {
+test('F6.1 planning preloads the local start time and resolves Companies projected by Yacimientos', () => {
   const page = source('../web-v2/src/pages/InspectionVisitCreateF61Page.tsx');
   const hierarchy = source('src/inspection-visits/inspection-planning-hierarchy.service.ts');
 
@@ -17,9 +17,9 @@ test('F6.1 planning preloads the local start time and resolves the Area operator
   assert.match(page, /response\.data\.length === 1/);
   assert.match(page, /setOperatorId\(response\.data\[0\]\.id\)/);
   assert.match(page, /Sin Operadora vigente para esa fecha/);
-  assert.match(hierarchy, /relation\.relation_role='OPERATOR'/);
-  assert.match(hierarchy, /relation\.valid_from <= \$2::timestamptz/);
-  assert.match(hierarchy, /relation\.valid_until IS NULL OR relation\.valid_until > \$2::timestamptz/);
+  assert.match(hierarchy, /FROM assets yacimiento/);
+  assert.match(hierarchy, /yacimiento\.operator_company_id/);
+  assert.match(hierarchy, /SELECT DISTINCT company\.id/);
 });
 
 test('F6.1 WEB cancellation requires an explicit audited reason and is available while in progress', () => {

web-v2/src/app/App.tsx

@@ -17,7 +17,7 @@ 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 { AuthoritativeInventoryConfigPage } from '../pages/AuthoritativeInventoryConfigPage';
 import { HistoryPage } from '../pages/HistoryPage';
 import { TemporalAssetsPage } from '../pages/TemporalAssetsPage';
 import { InspectionVisitsPage } from '../pages/InspectionVisitsPage';
@@ -79,7 +79,7 @@ export function App() {
         <Route element={<PermissionRoute permission="users.create" />}><Route path="/admin/users/new" element={<NewUserPage />} /></Route>
         <Route element={<PermissionRoute permission="roles.read" />}><Route path="/admin/roles" element={<RolesPage />} /></Route>
         <Route element={<PermissionRoute permission="audit.read" />}><Route path="/admin/audit" element={<AuditPage />} /></Route>
-        <Route element={<PermissionRoute permission="asset_types.read" />}><Route path="/admin/asset-types" element={<AssetTypesPage />} /></Route>
+        <Route element={<PermissionRoute permission="asset_types.read" />}><Route path="/admin/asset-types" element={<AuthoritativeInventoryConfigPage />} /></Route>
         <Route element={<PermissionRoute permission="finding_catalog.manage" />}><Route path="/admin/finding-catalog" element={<FindingCatalogPage />} /></Route>
         <Route element={<PermissionRoute permission="document_delivery.read" />}><Route path="/admin/document-delivery" element={<DocumentDeliveryPage />} /></Route>
         <Route path="/sin-acceso" element={<AccessDeniedPage />} />

web-v2/src/lib/inventoryStructureApi.ts

@@ -21,7 +21,15 @@ export interface InventoryTechnicalValues {
   values:Record<string,unknown>;
 }
 export interface InventoryStructureLevel { kind:InventoryStructureKind; label:string; type:{id:string;code:string;name:string}; parentKind:InventoryStructureKind|null; requiresFamily:boolean; }
-export interface InventoryStructureOptions { independentMasters:InventoryStructureLevel[]; levels:InventoryStructureLevel[]; installationFamilies:InventoryFamily[]; subinstallationFamilies:InventoryFamily[]; }
+export interface InventoryStructureOption { id:string; code:string; name:string; }
+export interface InventoryStructureOptions {
+  independentMasters:InventoryStructureLevel[];
+  levels:InventoryStructureLevel[];
+  companies:InventoryStructureOption[];
+  concessionTypes:InventoryStructureOption[];
+  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[]};
@@ -35,6 +43,8 @@ export interface InventoryFamilyFindings { family:InventoryFamily; items:Invento
 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}; operationalArea?:null|{id:string;code:string;name:string};
+  operatorCompany?:null|{id:string;code:string;name:string};
+  concessionType?:null|{id:string;code:string;name:string};
   inventoryFamily:null|{id:string;code:string;name:string;level:string;informationLabels:string[]};
 }
 
@@ -53,4 +63,4 @@ export function updateInventoryFamily(familyId:string,input:{name?:string;parent
 export function createInventoryFamilyAttribute(familyId:string,input:{code:string;name:string;dataType:InventoryFamilyAttributeDataType;isRequired?:boolean;unit?:string|null;options?:string[];sortOrder?:number}){return apiRequest<InventoryFamilyAttribute>(`/inventory-families/${familyId}/attributes`,{method:'POST',body:JSON.stringify(input)});}
 export function updateInventoryFamilyAttribute(familyId:string,attributeId:string,input:{name?:string;dataType?:InventoryFamilyAttributeDataType;isRequired?:boolean;isActive?:boolean;unit?:string|null;options?:string[]|null;sortOrder?:number}){return apiRequest<InventoryFamilyAttribute>(`/inventory-families/${familyId}/attributes/${attributeId}`,{method:'PATCH',body:JSON.stringify(input)});}
 export function replaceInventoryFamilyFindings(familyId:string,input:{itemIds:string[];reason:string}){return apiRequest<InventoryFamilyFindings>(`/inventory-families/${familyId}/findings`,{method:'PUT',body:JSON.stringify(input)});}
-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)});}
+export function createInventoryStructure(input:{kind:InventoryStructureKind;code?:string|null;name:string;commonName?:string|null;parentId?:string|null;familyId?:string|null;operatorCompanyId?:string|null;concessionTypeId?:string|null;description?:string|null}){return apiRequest<CreatedInventoryStructure>('/inventory-structure',{method:'POST',body:JSON.stringify(input)});}

web-v2/src/pages/AuthoritativeInventoryConfigPage.tsx

@@ -0,0 +1,203 @@
+import { useEffect, useMemo, useState } from 'react';
+import { Link } from 'react-router';
+import { Alert, LoadingBlock, errorMessage } from '../components/Feedback';
+import { Icon } from '../components/Icon';
+import { getFindingCatalogAdmin, listAssetTypes } from '../lib/api';
+import type { AssetType, FindingAdminCatalog } from '../lib/api';
+import { listInventoryFamiliesAdmin } from '../lib/inventoryStructureApi';
+import type { InventoryFamily } from '../lib/inventoryStructureApi';
+
+type CanonicalKind = 'EMPRESA' | 'DEPARTAMENTO' | 'AREA' | 'YACIMIENTO' | 'INSTALACION' | 'SUBINSTALACION';
+
+type StructuralField = {
+  label: string;
+  detail: string;
+  required?: boolean;
+  relation?: boolean;
+};
+
+const LEVELS: Array<{ kind: CanonicalKind; label: string; description: string; fields: StructuralField[] }> = [
+  {
+    kind: 'EMPRESA',
+    label: 'Empresa',
+    description: 'Maestro independiente. La Empresa se relaciona directamente con uno o más Yacimientos.',
+    fields: [{ label: 'Nombre', detail: 'Nombre de la Empresa / Operadora.', required: true }],
+  },
+  {
+    kind: 'DEPARTAMENTO',
+    label: 'Departamento',
+    description: 'Raíz territorial. No depende de ningún otro nivel.',
+    fields: [{ label: 'Nombre', detail: 'Nombre del Departamento.', required: true }],
+  },
+  {
+    kind: 'AREA',
+    label: 'Área',
+    description: 'El Área sólo tiene Nombre y pertenece obligatoriamente a un Departamento.',
+    fields: [
+      { label: 'Departamento', detail: 'Relación obligatoria Departamento → Área.', required: true, relation: true },
+      { label: 'Nombre', detail: 'Nombre del Área.', required: true },
+    ],
+  },
+  {
+    kind: 'YACIMIENTO',
+    label: 'Yacimiento',
+    description: 'El Yacimiento concentra el contexto operativo: Área, Tipo de concesión y Empresa relacionada.',
+    fields: [
+      { label: 'Área', detail: 'Relación obligatoria Área → Yacimiento.', required: true, relation: true },
+      { label: 'Tipo de concesión', detail: 'Explotación o Exploración, según la fuente.', required: true, relation: true },
+      { label: 'Empresa relacionada', detail: 'Empresa / Operadora asociada directamente al Yacimiento.', required: true, relation: true },
+      { label: 'Nombre', detail: 'Nombre del Yacimiento. Puede repetirse en otra Área.', required: true },
+    ],
+  },
+  {
+    kind: 'INSTALACION',
+    label: 'Instalación',
+    description: 'Cada Instalación pertenece a un Yacimiento y posee una clasificación técnica.',
+    fields: [
+      { label: 'Yacimiento', detail: 'Relación obligatoria Yacimiento → Instalación.', required: true, relation: true },
+      { label: 'Tipo de instalación', detail: 'Clasificación técnica tomada del modelo de Instalaciones.', required: true, relation: true },
+    ],
+  },
+  {
+    kind: 'SUBINSTALACION',
+    label: 'Subinstalación',
+    description: 'Cada Subinstalación pertenece a una Instalación y usa una clasificación compatible con ella.',
+    fields: [
+      { label: 'Instalación', detail: 'Relación obligatoria Instalación → Subinstalación.', required: true, relation: true },
+      { label: 'Tipo de subinstalación', detail: 'Clasificación técnica compatible con el Tipo de instalación padre.', required: true, relation: true },
+    ],
+  },
+];
+
+const EMPTY_CATALOG: FindingAdminCatalog = { categories: [], items: [] };
+
+function canonicalType(types: AssetType[], kind: CanonicalKind): AssetType | null {
+  if (kind === 'EMPRESA') return types.find((type) => type.operationalRole === 'COMPANY' && type.isActive) ?? null;
+  if (kind === 'AREA') return types.find((type) => type.operationalRole === 'AREA' && type.isActive) ?? null;
+  return types.find((type) => type.code.toLowerCase() === kind.toLowerCase() && type.isActive) ?? null;
+}
+
+export function AuthoritativeInventoryConfigPage() {
+  const [types, setTypes] = useState<AssetType[]>([]);
+  const [families, setFamilies] = useState<InventoryFamily[]>([]);
+  const [catalog, setCatalog] = useState<FindingAdminCatalog>(EMPTY_CATALOG);
+  const [selectedKind, setSelectedKind] = useState<CanonicalKind>('AREA');
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState('');
+
+  useEffect(() => {
+    Promise.all([listAssetTypes(), listInventoryFamiliesAdmin(), getFindingCatalogAdmin()])
+      .then(([loadedTypes, loadedFamilies, loadedCatalog]) => {
+        setTypes(loadedTypes);
+        setFamilies(loadedFamilies);
+        setCatalog(loadedCatalog);
+      })
+      .catch((requestError) => setError(errorMessage(requestError)))
+      .finally(() => setLoading(false));
+  }, []);
+
+  const level = LEVELS.find((item) => item.kind === selectedKind) ?? LEVELS[0]!;
+  const selectedType = canonicalType(types, selectedKind);
+  const commonAttributes = useMemo(() => {
+    const attributes = selectedType?.attributes.filter((attribute) => attribute.isActive) ?? [];
+    return selectedKind === 'INSTALACION'
+      ? attributes.filter((attribute) => attribute.code !== 'tipo_instalacion')
+      : attributes;
+  }, [selectedKind, selectedType]);
+  const installationFamilies = families.filter((family) => family.level === 'INSTALLATION' && family.isActive !== false);
+  const subinstallationFamilies = families.filter((family) => family.level === 'SUBINSTALLATION' && family.isActive !== false);
+  const activeFindings = catalog.items.filter((item) => item.isActive).length;
+
+  if (loading) return <LoadingBlock label="Cargando configuración de Inventarios…" />;
+
+  return <section className="inventory-config-page">
+    <div className="page-heading">
+      <div>
+        <span className="eyebrow">ADMINISTRACIÓN · MODELO AUTORITATIVO</span>
+        <h1>Configuración de Inventarios</h1>
+        <p>Relaciones fijas cargadas desde los SQL definitivos. Los vínculos estructurales no son campos de texto editables.</p>
+      </div>
+      <Link className="button primary" to="/inventarios/nuevo"><Icon name="plus" />Agregar registro</Link>
+    </div>
+    {error && <Alert>{error}</Alert>}
+
+    <article className="panel" style={{ marginBottom: 18 }}>
+      <div className="panel-heading">
+        <div>
+          <span className="eyebrow">ESTRUCTURA FÍSICA</span>
+          <h2>Jerarquía obligatoria</h2>
+          <p className="section-copy">Empresa es un maestro independiente y se asocia al Yacimiento. El árbol físico queda separado y sin ambigüedades.</p>
+        </div>
+      </div>
+      <div className="asset-browser-levels" aria-label="Jerarquía de Inventarios">
+        <div><span>1</span><strong>Departamento</strong><small>raíz</small></div><i>›</i>
+        <div><span>2</span><strong>Área</strong><small>Departamento</small></div><i>›</i>
+        <div><span>3</span><strong>Yacimiento</strong><small>Área + Empresa + concesión</small></div><i>›</i>
+        <div><span>4</span><strong>Instalación</strong><small>Yacimiento</small></div><i>›</i>
+        <div><span>5</span><strong>Subinstalación</strong><small>Instalación</small></div>
+      </div>
+      <div className="temporal-notice" style={{ marginTop: 14 }}>
+        <Icon name="users" />
+        <p><strong>Empresa:</strong> ya no pertenece al Área. La relación canónica es <strong>Yacimiento → Empresa relacionada</strong>.</p>
+      </div>
+    </article>
+
+    <article className="panel" style={{ marginBottom: 18 }}>
+      <div className="panel-heading">
+        <div>
+          <span className="eyebrow">INFORMACIÓN ESTRUCTURAL</span>
+          <h2>{level.label}</h2>
+          <p className="section-copy">{level.description}</p>
+        </div>
+        <span className="tag">Modelo SQL</span>
+      </div>
+      <div className="quick-view-row" style={{ marginBottom: 18 }}>
+        {LEVELS.map((item) => <button type="button" key={item.kind} className={selectedKind === item.kind ? 'active' : ''} onClick={() => setSelectedKind(item.kind)}>{item.label}</button>)}
+      </div>
+
+      <div className="attribute-list">
+        {level.fields.map((field, index) => <div className="attribute-card" key={field.label}>
+          <span className="attribute-order">{index + 1}</span>
+          <span>
+            <strong>{field.label}</strong>
+            <small>{field.detail}</small>
+          </span>
+          <span className="attribute-flags">
+            {field.relation && <span className="tag">Relación</span>}
+            {field.required && <span className="tag">Obligatorio</span>}
+          </span>
+        </div>)}
+        {commonAttributes.map((attribute, index) => <div className="attribute-card" key={attribute.id}>
+          <span className="attribute-order">{level.fields.length + index + 1}</span>
+          <span>
+            <strong>{attribute.name}</strong>
+            <small>{attribute.code} · Campo común del nivel</small>
+          </span>
+          <span className="attribute-flags">{attribute.isRequired && <span className="tag">Obligatorio</span>}</span>
+        </div>)}
+      </div>
+    </article>
+
+    <div className="dashboard-grid" style={{ alignItems: 'start' }}>
+      <article className="panel">
+        <div className="panel-heading"><div><span className="eyebrow">MODELO TÉCNICO</span><h2>Tipos de Instalación</h2><p className="section-copy">{installationFamilies.length} clasificaciones exactas del SQL.</p></div></div>
+        <div className="attribute-list" style={{ maxHeight: 520, overflow: 'auto' }}>
+          {installationFamilies.map((family) => <div className="attribute-card" key={family.id}><span className="asset-symbol"><Icon name="layers" size={16} /></span><span><strong>{family.name}</strong><small>{family.findingCount ?? 0} Hallazgos asociados</small></span><span className="tag">{family.code}</span></div>)}
+        </div>
+      </article>
+      <article className="panel">
+        <div className="panel-heading"><div><span className="eyebrow">MODELO TÉCNICO</span><h2>Tipos de Subinstalación</h2><p className="section-copy">{subinstallationFamilies.length} clasificaciones, cada una vinculada a su Tipo de instalación.</p></div></div>
+        <div className="attribute-list" style={{ maxHeight: 520, overflow: 'auto' }}>
+          {subinstallationFamilies.map((family) => <div className="attribute-card" key={family.id}><span className="asset-symbol"><Icon name="layers" size={16} /></span><span><strong>{family.name}</strong><small>{family.parentFamilies.map((parent) => parent.name).join(' · ') || 'Sin padre'} · {family.findingCount ?? 0} Hallazgos</small></span></div>)}
+        </div>
+      </article>
+    </div>
+
+    <article className="panel" style={{ marginTop: 18 }}>
+      <div className="panel-heading">
+        <div><span className="eyebrow">HALLAZGOS</span><h2>Catálogo contextual</h2><p className="section-copy">{activeFindings} Hallazgos cargados con sus relaciones exactas a Instalaciones y Subinstalaciones.</p></div>
+        <Link className="button secondary" to="/admin/finding-catalog">Abrir catálogo <Icon name="chevron" /></Link>
+      </div>
+    </article>
+  </section>;
+}

web-v2/src/pages/InventoryCreatePage.tsx

@@ -44,6 +44,8 @@ export function InventoryCreatePage() {
   const [parentSearch, setParentSearch] = useState('');
   const [parentId, setParentId] = useState('');
   const [familyId, setFamilyId] = useState('');
+  const [operatorCompanyId, setOperatorCompanyId] = useState('');
+  const [concessionTypeId, setConcessionTypeId] = useState('');
   const [familyFindings, setFamilyFindings] = useState<InventoryFamilyFindings | null>(null);
   const [name, setName] = useState('');
   const [code, setCode] = useState('');
@@ -66,6 +68,7 @@ export function InventoryCreatePage() {
 
   const requiresParent = Boolean(parentLabelByKind[kind]);
   const requiresFamily = kind === 'INSTALACION' || kind === 'SUBINSTALACION';
+  const requiresYacimientoContext = kind === 'YACIMIENTO';
   const parentLabel = parentLabelByKind[kind] ?? '';
 
   useEffect(() => {
@@ -99,18 +102,25 @@ export function InventoryCreatePage() {
     if (!requiresFamily) setFamilyId('');
     if (kind==='SUBINSTALACION' && familyId && !families.some((item)=>item.id===familyId)) setFamilyId('');
   },[kind,requiresFamily,families,familyId]);
+  useEffect(() => {
+    if (!requiresYacimientoContext) { setOperatorCompanyId(''); setConcessionTypeId(''); }
+  },[requiresYacimientoContext]);
 
   const changeKind=(next:InventoryStructureKind) => {
-    setKind(next); setParentId(''); setParentSearch(''); setFamilyId(''); setFamilyFindings(null); setError('');
+    setKind(next); setParentId(''); setParentSearch(''); setFamilyId(''); setFamilyFindings(null);
+    setOperatorCompanyId(''); setConcessionTypeId(''); setError('');
   };
   const save=async(event:FormEvent) => {
     event.preventDefault();
     if (requiresParent && !parentId) { setError(`Seleccioná ${parentLabel}.`); return; }
+    if (requiresYacimientoContext && !operatorCompanyId) { setError('Seleccioná la Empresa relacionada del Yacimiento.'); return; }
+    if (requiresYacimientoContext && !concessionTypeId) { setError('Seleccioná el Tipo de concesión del Yacimiento.'); return; }
     if (requiresFamily && !familyId) { setError(`Seleccioná el tipo de ${kindLabel(kind).toLowerCase()}.`); return; }
     setSaving(true); setError('');
     try {
       const created=await createInventoryStructure({
         kind,name:name.trim(),parentId:parentId || null,familyId:familyId || null,
+        operatorCompanyId:operatorCompanyId || null,concessionTypeId:concessionTypeId || null,
         code:code.trim() || null,commonName:commonName.trim() || null,description:description.trim() || null,
       });
       navigate(`/inventarios/${created.id}`,{replace:true});
@@ -121,14 +131,15 @@ export function InventoryCreatePage() {
   if (loading) return <LoadingBlock label="Preparando alta…" />;
   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">CARGA MANUAL</span><h1>Nuevo registro</h1><p>Para crear sólo necesitás ubicación, clasificación cuando corresponda y nombre. DH genera el código automáticamente.</p></div></div>
+    <div className="page-heading asset-editor-heading"><div><span className="eyebrow">CARGA MANUAL</span><h1>Nuevo registro</h1><p>Modelo fijo: Departamento → Área → Yacimiento → Instalación → Subinstalación. La Empresa y el Tipo de concesión pertenecen al Yacimiento.</p></div></div>
     {error && <Alert>{error}</Alert>}
     <form className="panel form-panel" onSubmit={save}>
-      <div className="form-section"><div><h2>1. ¿Qué querés crear?</h2><p className="section-copy">Departamento → Área → Yacimiento → Instalación → Subinstalación. Empresa queda fuera del árbol físico.</p></div><label className="field"><span>Tipo</span><select value={kind} onChange={(event)=>changeKind(event.target.value as InventoryStructureKind)}>{KINDS.map((item)=><option key={item.kind} value={item.kind}>{item.label}</option>)}</select></label></div>
+      <div className="form-section"><div><h2>1. ¿Qué querés crear?</h2><p className="section-copy">Área sólo depende de Departamento. Yacimiento define Área, Empresa relacionada y Tipo de concesión.</p></div><label className="field"><span>Tipo</span><select value={kind} onChange={(event)=>changeKind(event.target.value as InventoryStructureKind)}>{KINDS.map((item)=><option key={item.kind} value={item.kind}>{item.label}</option>)}</select></label></div>
       {requiresParent && <div className="form-section"><div><h2>2. Ubicación</h2><p className="section-copy">Elegí el {parentLabel.toLowerCase()} concreto.</p></div><label className="field"><span>Buscar {parentLabel.toLowerCase()}</span><input value={parentSearch} onChange={(event)=>setParentSearch(event.target.value)} placeholder={`Buscar ${parentLabel.toLowerCase()}…`} /></label><label className="field"><span>{parentLabel} <em>obligatorio</em></span><select value={parentId} onChange={(event)=>{setParentId(event.target.value);setFamilyId('');}} required><option value="">Seleccionar…</option>{parents.map((parent)=><option key={parent.id} value={parent.id}>{parent.name} · {parent.code}</option>)}</select></label></div>}
-      {requiresFamily && <div className="form-section"><div><h2>3. Clasificación técnica</h2><p className="section-copy">Define los datos técnicos y Hallazgos aplicables. En Subinstalaciones sólo aparecen clasificaciones compatibles con la Instalación elegida.</p></div>{kind==='SUBINSTALACION' && !selectedParent?.inventoryFamily ? <Alert>La Instalación elegida todavía no tiene clasificación técnica.</Alert> : <label className="field"><span>Tipo de {kindLabel(kind).toLowerCase()} <em>obligatorio</em></span><select value={familyId} onChange={(event)=>setFamilyId(event.target.value)} required><option value="">Seleccionar…</option>{families.map((family)=><option key={family.id} value={family.id}>{family.name}</option>)}</select></label>}{kind==='SUBINSTALACION' && selectedParent?.inventoryFamily && families.length===0 && <Alert>No hay tipos de Subinstalación compatibles con {selectedParent.inventoryFamily.name}. Configuralos primero en Configuración de Inventarios.</Alert>}{selectedFamily && <div className="context-create-banner"><Icon name="alert" /><div><strong>{selectedFamily.name}</strong><span>{familyFindings ? `${familyFindings.count} Hallazgo${familyFindings.count===1?'':'s'} asociado${familyFindings.count===1?'':'s'}` : 'Cargando Hallazgos asociados…'}</span>{familyFindings && familyFindings.items.length>0 && <ul style={{margin:'8px 0 0',paddingLeft:18}}>{familyFindings.items.slice(0,6).map((item)=><li key={item.id}>{item.title}</li>)}{familyFindings.items.length>6 && <li>+ {familyFindings.items.length-6} más</li>}</ul>}</div></div>}</div>}
-      <div className="form-section"><div><h2>{requiresFamily ? '4' : requiresParent ? '3' : '2'}. Nombre</h2><p className="section-copy">Los datos técnicos se completan después, en la ficha del elemento.</p></div><label className="field"><span>Nombre <em>obligatorio</em></span><input autoFocus value={name} onChange={(event)=>setName(event.target.value)} required maxLength={200} placeholder={`Nombre de ${kindLabel(kind).toLowerCase()}`} /></label><details style={{marginTop:12}}><summary style={{cursor:'pointer',fontWeight:700}}>Datos opcionales</summary><div style={{marginTop:14}}><div className="form-grid"><label className="field"><span>Código DH</span><input value={code} onChange={(event)=>setCode(event.target.value.toUpperCase())} maxLength={120} pattern="[A-Z0-9][A-Z0-9._/-]*" placeholder="Dejalo vacío para generar automáticamente" /></label><label className="field"><span>Nombre habitual</span><input value={commonName} onChange={(event)=>setCommonName(event.target.value)} maxLength={200} /></label></div><label className="field"><span>Descripción</span><textarea value={description} onChange={(event)=>setDescription(event.target.value)} rows={2} maxLength={4000} /></label></div></details></div>
-      <div className="form-actions"><Link className="button secondary" to="/inventarios">Cancelar</Link><button className="button primary" disabled={saving || !name.trim() || (requiresParent && !parentId) || (requiresFamily && !familyId)}><Icon name="check" />{saving?'Creando…':`Crear ${kindLabel(kind)}`}</button></div>
+      {requiresYacimientoContext && <div className="form-section"><div><h2>3. Contexto del Yacimiento</h2><p className="section-copy">Estas relaciones pertenecen directamente al Yacimiento y no al Área.</p></div><div className="form-grid"><label className="field"><span>Empresa relacionada <em>obligatorio</em></span><select value={operatorCompanyId} onChange={(event)=>setOperatorCompanyId(event.target.value)} required><option value="">Seleccionar…</option>{options?.companies.map((company)=><option key={company.id} value={company.id}>{company.name}</option>)}</select></label><label className="field"><span>Tipo de concesión <em>obligatorio</em></span><select value={concessionTypeId} onChange={(event)=>setConcessionTypeId(event.target.value)} required><option value="">Seleccionar…</option>{options?.concessionTypes.map((type)=><option key={type.id} value={type.id}>{type.name}</option>)}</select></label></div></div>}
+      {requiresFamily && <div className="form-section"><div><h2>3. Clasificación técnica</h2><p className="section-copy">Define los datos técnicos y Hallazgos aplicables. En Subinstalaciones sólo aparecen clasificaciones compatibles con la Instalación elegida.</p></div>{kind==='SUBINSTALACION' && !selectedParent?.inventoryFamily ? <Alert>La Instalación elegida todavía no tiene clasificación técnica.</Alert> : <label className="field"><span>Tipo de {kindLabel(kind).toLowerCase()} <em>obligatorio</em></span><select value={familyId} onChange={(event)=>setFamilyId(event.target.value)} required><option value="">Seleccionar…</option>{families.map((family)=><option key={family.id} value={family.id}>{family.name}</option>)}</select></label>}{kind==='SUBINSTALACION' && selectedParent?.inventoryFamily && families.length===0 && <Alert>No hay tipos de Subinstalación compatibles con {selectedParent.inventoryFamily.name}.</Alert>}{selectedFamily && <div className="context-create-banner"><Icon name="alert" /><div><strong>{selectedFamily.name}</strong><span>{familyFindings ? `${familyFindings.count} Hallazgo${familyFindings.count===1?'':'s'} asociado${familyFindings.count===1?'':'s'}` : 'Cargando Hallazgos asociados…'}</span>{familyFindings && familyFindings.items.length>0 && <ul style={{margin:'8px 0 0',paddingLeft:18}}>{familyFindings.items.slice(0,6).map((item)=><li key={item.id}>{item.title}</li>)}{familyFindings.items.length>6 && <li>+ {familyFindings.items.length-6} más</li>}</ul>}</div></div>}</div>}
+      <div className="form-section"><div><h2>{requiresYacimientoContext ? '4' : requiresFamily ? '4' : requiresParent ? '3' : '2'}. Nombre</h2><p className="section-copy">El nombre es el dato propio principal de este nivel. Los datos técnicos se completan después, cuando corresponda.</p></div><label className="field"><span>Nombre <em>obligatorio</em></span><input autoFocus value={name} onChange={(event)=>setName(event.target.value)} required maxLength={200} placeholder={`Nombre de ${kindLabel(kind).toLowerCase()}`} /></label><details style={{marginTop:12}}><summary style={{cursor:'pointer',fontWeight:700}}>Datos opcionales</summary><div style={{marginTop:14}}><div className="form-grid"><label className="field"><span>Código DH</span><input value={code} onChange={(event)=>setCode(event.target.value.toUpperCase())} maxLength={120} pattern="[A-Z0-9][A-Z0-9._/-]*" placeholder="Dejalo vacío para generar automáticamente" /></label><label className="field"><span>Nombre habitual</span><input value={commonName} onChange={(event)=>setCommonName(event.target.value)} maxLength={200} /></label></div><label className="field"><span>Descripción</span><textarea value={description} onChange={(event)=>setDescription(event.target.value)} rows={2} maxLength={4000} /></label></div></details></div>
+      <div className="form-actions"><Link className="button secondary" to="/inventarios">Cancelar</Link><button className="button primary" disabled={saving || !name.trim() || (requiresParent && !parentId) || (requiresYacimientoContext && (!operatorCompanyId || !concessionTypeId)) || (requiresFamily && !familyId)}><Icon name="check" />{saving?'Creando…':`Crear ${kindLabel(kind)}`}</button></div>
     </form>
   </section>;
 }