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

android-app/app/build.gradle.kts

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

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

@@ -9,8 +9,8 @@
 
     <application
         android:allowBackup="false"
-        android:icon="@drawable/ic_mendoza_launcher_exact"
-        android:roundIcon="@drawable/ic_mendoza_launcher_exact"
+        android:icon="@drawable/ic_mendoza_launcher"
+        android:roundIcon="@drawable/ic_mendoza_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.DHInspeccion"

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

@@ -115,7 +115,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun openVisit(id: String) = launchBusy {
         visit = repository.visit(id)
         inventory = emptyList()
-        inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
+        inventoryParentId = visit?.operationalArea?.id
         fieldTypes = emptyList()
         selectedFieldAsset = null
         clearFindingState()
@@ -137,7 +137,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         val id = visit?.id ?: return
         launchBusy {
             visit = repository.startVisit(id)
-            inventoryParentId = visit?.scopeAsset?.id ?: visit?.operationalArea?.id
+            inventoryParentId = visit?.operationalArea?.id
             notice = "Inspección iniciada."
             loadActsInternal(id, selectDraft = true)
             loadVisitsInternal()
@@ -197,7 +197,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun searchInventory(search: String, parentId: String? = null) {
         val currentVisit = visit ?: return
         launchBusy {
-            val effectiveParentId = parentId ?: inventoryParentId ?: currentVisit.scopeAsset?.id ?: currentVisit.operationalArea?.id
+            val effectiveParentId = parentId ?: inventoryParentId ?: currentVisit.operationalArea?.id
             inventory = repository.fieldInventory(currentVisit.id, search, effectiveParentId).data
         }
     }
@@ -205,7 +205,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun loadFieldTypes(parentId: String? = null) {
         val currentVisit = visit ?: return
         launchBusy {
-            val effectiveParentId = parentId ?: currentVisit.scopeAsset?.id ?: currentVisit.operationalArea?.id
+            val effectiveParentId = parentId ?: currentVisit.operationalArea?.id
             inventoryParentId = effectiveParentId
             fieldTypes = repository.fieldTypes(currentVisit.id, parentId).data
             inventory = repository.fieldInventory(currentVisit.id, null, effectiveParentId).data
@@ -213,7 +213,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     private suspend fun reloadCurrentInventory(visitId: String) {
-        val effectiveParentId = inventoryParentId ?: visit?.scopeAsset?.id ?: visit?.operationalArea?.id
+        val effectiveParentId = inventoryParentId ?: visit?.operationalArea?.id
         inventory = repository.fieldInventory(visitId, null, effectiveParentId).data
     }
 

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

@@ -154,7 +154,6 @@ data class VisitDetail(
     val code: String,
     val objective: String? = null,
     val status: String,
-    val scopeAsset: AssetSummary? = null,
     val operationalArea: AssetSummary? = null,
     val operatorCompany: AssetSummary? = null,
     val leadInspector: PersonSummary? = null,

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(24, BuildConfig.VERSION_CODE)
-        assertEquals("0.15.2-debug", BuildConfig.VERSION_NAME)
+        assertEquals(23, BuildConfig.VERSION_CODE)
+        assertEquals("0.15.1-debug", BuildConfig.VERSION_NAME)
     }
 
     @Test

api-v3/src/inspection-visits/field-findings.service.ts

@@ -129,7 +129,6 @@ export class FieldFindingsService {
         visit.id AS "visitId",
         visit.code AS "visitCode",
         visit.status AS "visitStatus",
-        COALESCE(visit.scope_asset_id, visit.operational_area_id) AS "scopeAssetId",
         visit.operational_area_id AS "areaId",
         area.code AS "areaCode",
         area.name AS "areaName",
@@ -140,7 +139,8 @@ export class FieldFindingsService {
         asset_type.code AS "assetTypeCode",
         asset.inventory_family_id AS "inventoryFamilyId",
         (
-          asset.id=COALESCE(visit.scope_asset_id, visit.operational_area_id)
+          asset.operational_area_id=visit.operational_area_id
+          OR asset.id=visit.operational_area_id
           OR EXISTS (
             WITH RECURSIVE ancestors AS (
               SELECT id,parent_id FROM assets WHERE id=asset.parent_id
@@ -148,11 +148,9 @@ export class FieldFindingsService {
               SELECT parent.id,parent.parent_id
               FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
             )
-            SELECT 1 FROM ancestors
-            WHERE id=COALESCE(visit.scope_asset_id, visit.operational_area_id)
-            LIMIT 1
+            SELECT 1 FROM ancestors WHERE id=visit.operational_area_id LIMIT 1
           )
-        ) AS "insideScope",
+        ) AS "insideArea",
         EXISTS (
           SELECT 1
           FROM area_company_relations relation
@@ -215,7 +213,6 @@ export class FieldFindingsService {
       visitId: string;
       visitCode: string;
       visitStatus: string;
-      scopeAssetId: string | null;
       areaId: string | null;
       areaCode: string | null;
       areaName: string | null;
@@ -225,7 +222,7 @@ export class FieldFindingsService {
       assetId: string | null;
       assetTypeCode: string | null;
       inventoryFamilyId: string | null;
-      insideScope: boolean;
+      insideArea: boolean;
       operatorRelationValid: boolean;
       assigned: boolean;
       selected: boolean;
@@ -281,10 +278,10 @@ export class FieldFindingsService {
         message: 'La Instalación/Subinstalación debe tener una clasificación técnica antes de registrar Hallazgos',
       });
     }
-    if (!row.insideScope) {
+    if (!row.insideArea) {
       throw new BadRequestException({
         code: 'FIELD_FINDING_INVENTORY_OUTSIDE_CONTEXT',
-        message: 'El Inventario no pertenece al Yacimiento definido como alcance de esta inspección',
+        message: 'El Inventario no pertenece al Área de esta inspección',
       });
     }
     if (!row.selected) {

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

@@ -23,7 +23,6 @@ interface MobileVisitContext {
   code: string;
   status: string;
   areaId: string;
-  scopeAssetId: string;
   areaCode: string;
   areaName: string;
   companyId: string;
@@ -81,12 +80,12 @@ export class FieldInventoryService {
     const context = await this.requireVisitContext(visitId, principal, false);
     if (query.parentId) await this.requireParentInContext(query.parentId, context);
 
-    // Empresa is visit context, never physical ownership. Search stays inside the frozen Yacimiento scope.
-    const args: unknown[] = [context.scopeAssetId, visitId];
+    // Empresa is visit context, never physical ownership. Search by Area ancestry.
+    const args: unknown[] = [context.areaId, visitId];
     const conditions = [
       "asset.information_status <> 'INACTIVE'",
       `(
-        asset.id = $1::uuid
+        asset.operational_area_id = $1::uuid
         OR EXISTS (
           WITH RECURSIVE ancestors AS (
             SELECT id,parent_id FROM assets WHERE id=asset.parent_id
@@ -199,7 +198,7 @@ export class FieldInventoryService {
     principal: AuthPrincipal,
   ) {
     const context = await this.requireVisitContext(visitId, principal, false);
-    const effectiveParentId = parentId ?? context.scopeAssetId;
+    const effectiveParentId = parentId ?? context.areaId;
     const parent = await this.requireParentInContext(effectiveParentId, context);
 
     const data = await this.dataSource.query(`
@@ -273,7 +272,7 @@ export class FieldInventoryService {
     request: RequestWithContext,
   ) {
     const context = await this.requireVisitContext(visitId, principal, true);
-    const parentId = dto.parentId ?? context.scopeAssetId;
+    const parentId = dto.parentId ?? context.areaId;
     await this.requireParentInContext(parentId, context);
 
     const capturedAt = new Date(dto.deviceCapturedAt);
@@ -413,7 +412,6 @@ export class FieldInventoryService {
         visit.id,
         visit.code,
         visit.status,
-        COALESCE(visit.scope_asset_id, visit.operational_area_id) AS "scopeAssetId",
         visit.operational_area_id AS "areaId",
         area.code AS "areaCode",
         area.name AS "areaName",
@@ -487,7 +485,6 @@ export class FieldInventoryService {
   private publicContext(context: MobileVisitContext) {
     return {
       inspection: { id: context.id, code: context.code, status: context.status },
-      scopeAssetId: context.scopeAssetId,
       area: { id: context.areaId, code: context.areaCode, name: context.areaName },
       operatorCompany: {
         id: context.companyId,
@@ -506,6 +503,7 @@ export class FieldInventoryService {
         asset.asset_type_id AS "typeId",
         (
           asset.id=$2::uuid
+          OR asset.operational_area_id=$2::uuid
           OR EXISTS (
             WITH RECURSIVE ancestors AS (
               SELECT id,parent_id FROM assets WHERE id=asset.parent_id
@@ -514,16 +512,16 @@ export class FieldInventoryService {
               FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
             ) SELECT 1 FROM ancestors WHERE id=$2::uuid LIMIT 1
           )
-        ) AS "insideScope"
+        ) AS "insideArea"
       FROM assets asset
       WHERE asset.id = $1::uuid
         AND asset.information_status <> 'INACTIVE'
-    `, [parentId, context.scopeAssetId])) as Array<{
+    `, [parentId, context.areaId])) as Array<{
       id: string;
       code: string;
       name: string;
       typeId: string;
-      insideScope: boolean;
+      insideArea: boolean;
     }>;
 
     if (!parent) {
@@ -532,10 +530,10 @@ export class FieldInventoryService {
         message: 'La ubicación padre no existe',
       });
     }
-    if (!parent.insideScope) {
+    if (!parent.insideArea) {
       throw new BadRequestException({
         code: 'FIELD_INVENTORY_PARENT_OUTSIDE_CONTEXT',
-        message: 'La ubicación padre no pertenece al Yacimiento definido como alcance de la inspección',
+        message: 'La ubicación padre no pertenece al Área de la inspección',
       });
     }
     return parent;
@@ -547,7 +545,7 @@ export class FieldInventoryService {
         asset.id,
         (asset.is_inventory_instance=true OR lower(type.code)='yacimiento') AS "eligibleTarget",
         (
-          asset.id=$2::uuid
+          asset.operational_area_id=$2::uuid
           OR EXISTS (
             WITH RECURSIVE ancestors AS (
               SELECT id,parent_id FROM assets WHERE id=asset.parent_id
@@ -556,15 +554,15 @@ export class FieldInventoryService {
               FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
             ) SELECT 1 FROM ancestors WHERE id=$2::uuid LIMIT 1
           )
-        ) AS "insideScope"
+        ) AS "insideArea"
       FROM assets asset
       JOIN asset_types type ON type.id=asset.asset_type_id
       WHERE asset.id = $1::uuid
         AND asset.information_status <> 'INACTIVE'
-    `, [assetId, context.scopeAssetId])) as Array<{
+    `, [assetId, context.areaId])) as Array<{
       id: string;
       eligibleTarget: boolean;
-      insideScope: boolean;
+      insideArea: boolean;
     }>;
 
     if (!asset) {
@@ -573,10 +571,10 @@ export class FieldInventoryService {
         message: 'Registro de Inventario no encontrado',
       });
     }
-    if (!asset.insideScope) {
+    if (!asset.insideArea) {
       throw new BadRequestException({
         code: 'FIELD_INVENTORY_OUTSIDE_CONTEXT',
-        message: 'El registro no pertenece al Yacimiento definido como alcance de esta inspección',
+        message: 'El registro no pertenece al Área de esta inspección',
       });
     }
     if (!asset.eligibleTarget) {

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

@@ -167,49 +167,6 @@ export class InspectionPlanningCreateService {
           ORDER BY finding.created_at,finding.id
         `, [visit.id, dto.operationalAreaId, scopeAssetId, plannedStartAt.toISOString().slice(0, 10)]);
 
-        stage = 'checklist:assets';
-        await manager.query(`
-          INSERT INTO inspection_visit_assets (
-            visit_id, asset_id, included, planning_source, added_by
-          )
-          SELECT DISTINCT $1::uuid, item.asset_id, true, 'AUTOMATIC', $2::uuid
-          FROM inspection_visit_checklist_items item
-          WHERE item.visit_id=$1::uuid
-            AND item.generation_number=1
-            AND item.item_kind IN ('COMPANY_OVERDUE','VERIFICATION_OVERDUE','UPCOMING_CONTROL')
-          ON CONFLICT (visit_id,asset_id) DO UPDATE SET
-            included=true,
-            planning_source=CASE
-              WHEN inspection_visit_assets.planning_source='VERIFICATION' THEN 'VERIFICATION'
-              ELSE 'AUTOMATIC'
-            END,
-            exclusion_reason=NULL,
-            excluded_by=NULL,
-            excluded_at=NULL,
-            added_by=EXCLUDED.added_by,
-            updated_at=CURRENT_TIMESTAMP
-        `, [visit.id, principal.userId]);
-
-        stage = 'checklist:asset-events';
-        await manager.query(`
-          INSERT INTO inspection_visit_asset_events (
-            visit_id, asset_id, event_type, reason, actor_user_id, metadata
-          )
-          SELECT DISTINCT
-            $1::uuid, item.asset_id, 'AUTO_INCLUDED', NULL, $2::uuid,
-            jsonb_build_object('generation',1,'source','F6.1_CREATE')
-          FROM inspection_visit_checklist_items item
-          WHERE item.visit_id=$1::uuid
-            AND item.generation_number=1
-            AND item.item_kind IN ('COMPANY_OVERDUE','VERIFICATION_OVERDUE','UPCOMING_CONTROL')
-            AND NOT EXISTS (
-              SELECT 1 FROM inspection_visit_asset_events event
-              WHERE event.visit_id=$1::uuid
-                AND event.asset_id=item.asset_id
-                AND event.event_type='AUTO_INCLUDED'
-            )
-        `, [visit.id, principal.userId]);
-
         stage = 'audit:record';
         await this.audit.record({
           ...administrationAuditContext(principal, request),

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

@@ -62,35 +62,6 @@ export class InspectionPlanningHierarchyService {
     return { data };
   }
 
-  async operatorsForArea(
-    areaId: string,
-    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',
-      });
-    }
-    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
-        AND company.information_status<>'INACTIVE'
-      ORDER BY company.name, company.code
-    `, [areaId, effectiveAt]) as InspectionPlanningHierarchyItem[];
-    return { data };
-  }
-
   private async requireType(id: string, typeCode: string, message: string): Promise<void> {
     const [row] = await this.dataSource.query(`
       SELECT 1
@@ -106,4 +77,4 @@ export class InspectionPlanningHierarchyService {
       throw new BadRequestException({ code: 'INSPECTION_PLANNING_HIERARCHY_INVALID', message });
     }
   }
-}
+}

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

@@ -82,9 +82,8 @@ export class InspectionVisitsController {
   @RequirePermissions('inspections.read')
   planningOperators(
     @Param('areaId', new ParseUUIDPipe({ version: '4' })) areaId: string,
-    @Query('at') at?: string,
   ) {
-    return this.planningHierarchy.operatorsForArea(areaId, at);
+    return this.visits.listPlanningOperators(areaId);
   }
 
   @Get('mobile/planning-context/areas')

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

@@ -23,7 +23,6 @@ import type { ReplaceInspectionVisitAssetsDto } from './dto/replace-inspection-v
 import type { ReplaceInspectionVisitTeamDto } from './dto/replace-inspection-visit-team.dto';
 import type { UpdateInspectionVisitDto } from './dto/update-inspection-visit.dto';
 import { nextInspectionVisitCode } from './inspection-visit-code';
-import { validateInspectionPlanningScope } from './inspection-planning-scope';
 
 export interface InspectionPerson {
   id: string;
@@ -313,7 +312,7 @@ export class InspectionVisitsService {
         }
         const operationalAreaId = dto.operationalAreaId;
         const operatorCompanyId = dto.operatorCompanyId;
-        await this.validatePlanningContext(manager, operationalAreaId, operatorCompanyId, plannedStartAt);
+        await this.validatePlanningContext(manager, operationalAreaId, operatorCompanyId);
         await this.requireAsset(manager, operationalAreaId);
         await this.requireInspectors(manager, [dto.leadInspectorUserId]);
         const code = await nextInspectionVisitCode(manager, plannedStartAt);
@@ -383,24 +382,29 @@ export class InspectionVisitsService {
           ? visit.operatorCompanyId
           : dto.operatorCompanyId;
         const contextTouched = dto.operationalAreaId !== undefined || dto.operatorCompanyId !== undefined;
-        const nextScope = dto.scopeAssetId === undefined ? visit.scopeAssetId : dto.scopeAssetId;
-        await this.validatePlanningContext(manager, nextAreaId, nextCompanyId, nextStart);
+        const nextScope = contextTouched
+          ? nextAreaId
+          : dto.scopeAssetId === undefined
+            ? visit.scopeAssetId
+            : dto.scopeAssetId;
+        await this.validatePlanningContext(manager, nextAreaId, nextCompanyId);
         await this.requireAsset(manager, nextScope);
-        if (nextAreaId && nextScope) {
-          await validateInspectionPlanningScope(manager, nextAreaId, nextScope);
+        if (contextTouched && nextAreaId && nextCompanyId) {
+          await this.assertCurrentAssetsMatchContext(manager, id, nextAreaId, nextCompanyId);
+        } else if (dto.scopeAssetId !== undefined) {
           await this.assertCurrentAssetsInScope(manager, id, nextScope);
         }
         if (dto.objective !== undefined) visit.objective = dto.objective;
         if (contextTouched) {
           visit.operationalAreaId = nextAreaId;
           visit.operatorCompanyId = nextCompanyId;
-        }
-        if (dto.scopeAssetId !== undefined) {
+          visit.scopeAssetId = nextAreaId;
+        } else if (dto.scopeAssetId !== undefined) {
           visit.scopeAssetId = dto.scopeAssetId;
         }
         if (dto.plannedStartAt !== undefined) visit.plannedStartAt = nextStart;
         if (dto.instructions !== undefined) visit.instructions = dto.instructions;
-        if (contextTouched || dto.scopeAssetId !== undefined || dto.plannedStartAt !== undefined) visit.checklistGeneratedAt = null;
+        if (contextTouched || dto.plannedStartAt !== undefined) visit.checklistGeneratedAt = null;
         visit.updatedBy = principal.userId;
         await manager.getRepository(InspectionVisit).save(visit);
         const updated = await this.loadView(manager, id);
@@ -459,10 +463,11 @@ export class InspectionVisitsService {
             message: 'Seleccioná Área y Operadora antes de agregar registros preventivos',
           });
         }
-        await this.assertAssetsInScope(
+        await this.assertAssetsMatchContext(
           manager,
           additions,
-          visit.scopeAssetId ?? visit.operationalAreaId,
+          visit.operationalAreaId,
+          visit.operatorCompanyId,
         );
         for (const assetId of additions) {
           await manager.query(`
@@ -624,10 +629,11 @@ export class InspectionVisitsService {
       if (!visit.operationalAreaId || !visit.operatorCompanyId) {
         throw new BadRequestException({ code: 'INSPECTION_CONTEXT_REQUIRED', message: 'La visita no tiene Área y Operadora definidas' });
       }
-      await this.assertAssetsInScope(
+      await this.assertAssetsMatchContext(
         manager,
         [assetId],
-        visit.scopeAssetId ?? visit.operationalAreaId,
+        visit.operationalAreaId,
+        visit.operatorCompanyId,
       );
       await manager.query(`
         UPDATE inspection_visit_assets
@@ -914,7 +920,6 @@ export class InspectionVisitsService {
     manager: EntityManager,
     operationalAreaId: string | null,
     operatorCompanyId: string | null,
-    effectiveAt: Date | null = null,
   ): Promise<void> {
     if (!operationalAreaId && !operatorCompanyId) return;
     if (!operationalAreaId || !operatorCompanyId) {
@@ -933,8 +938,8 @@ export class InspectionVisitsService {
           WHERE relation.area_id = area.id
             AND relation.company_id = company.id
             AND relation.relation_role = 'OPERATOR'
-            AND relation.valid_from <= $3::timestamptz
-            AND (relation.valid_until IS NULL OR relation.valid_until > $3::timestamptz)
+            AND relation.valid_from <= CURRENT_TIMESTAMP
+            AND (relation.valid_until IS NULL OR relation.valid_until > CURRENT_TIMESTAMP)
         ) AS "activeOperatorRelation"
       FROM assets area
       INNER JOIN asset_types area_type ON area_type.id = area.asset_type_id
@@ -946,7 +951,7 @@ export class InspectionVisitsService {
         AND company_type.operational_role = 'COMPANY'
         AND area.information_status <> 'INACTIVE'
         AND company.information_status <> 'INACTIVE'
-    `, [operationalAreaId, operatorCompanyId, effectiveAt ?? new Date()])) as Array<{
+    `, [operationalAreaId, operatorCompanyId])) as Array<{
       areaId: string;
       companyId: string;
       activeOperatorRelation: boolean;
@@ -965,6 +970,44 @@ export class InspectionVisitsService {
     }
   }
 
+  private async assertAssetsMatchContext(
+    manager: EntityManager,
+    assetIds: string[],
+    operationalAreaId: string,
+    operatorCompanyId: string,
+  ): Promise<void> {
+    if (assetIds.length === 0) return;
+    const [row] = (await manager.query(`
+      SELECT COUNT(*)::integer AS outside
+      FROM assets asset
+      WHERE asset.id = ANY($1::uuid[])
+        AND (
+          asset.operational_area_id IS DISTINCT FROM $2::uuid
+          OR asset.operator_company_id IS DISTINCT FROM $3::uuid
+        )
+    `, [assetIds, operationalAreaId, operatorCompanyId])) as Array<{ outside: number }>;
+    if (Number(row?.outside ?? 0) > 0) {
+      throw new BadRequestException({
+        code: 'INSPECTION_ASSET_OUTSIDE_OPERATIONAL_CONTEXT',
+        message: 'Uno o más registros no pertenecen al Área y Operadora de la visita',
+      });
+    }
+  }
+
+  private async assertCurrentAssetsMatchContext(
+    manager: EntityManager,
+    visitId: string,
+    operationalAreaId: string,
+    operatorCompanyId: string,
+  ): Promise<void> {
+    await this.assertAssetsMatchContext(
+      manager,
+      await this.activeAssetIds(manager, visitId),
+      operationalAreaId,
+      operatorCompanyId,
+    );
+  }
+
   private async appendAssetEvent(
     manager: EntityManager,
     visitId: string,
@@ -998,7 +1041,7 @@ export class InspectionVisitsService {
         message: 'Indicá la fecha prevista antes de generar el checklist',
       });
     }
-    await this.validatePlanningContext(manager, visit.operationalAreaId, visit.operatorCompanyId, visit.plannedStartAt);
+    await this.validatePlanningContext(manager, visit.operationalAreaId, visit.operatorCompanyId);
     const generation = visit.checklistGeneration + 1;
     await manager.query(`
       INSERT INTO inspection_visit_checklist_items (
@@ -1063,25 +1106,14 @@ export class InspectionVisitsService {
       FROM inspection_findings finding
       INNER JOIN assets asset ON asset.id = finding.asset_id
       WHERE asset.operational_area_id = $3
+        AND asset.operator_company_id = $4
         AND finding.status <> 'VOIDED'
-        AND (
-          asset.id=$4::uuid
-          OR EXISTS (
-            WITH RECURSIVE ancestors AS (
-              SELECT id,parent_id FROM assets WHERE id=asset.parent_id
-              UNION ALL
-              SELECT parent.id,parent.parent_id
-              FROM assets parent JOIN ancestors child ON parent.id=child.parent_id
-            )
-            SELECT 1 FROM ancestors WHERE id=$4::uuid LIMIT 1
-          )
-        )
       ORDER BY finding.created_at, finding.id
     `, [
       visit.id,
       generation,
       visit.operationalAreaId,
-      visit.scopeAssetId ?? visit.operationalAreaId,
+      visit.operatorCompanyId,
       visit.plannedStartAt.toISOString().slice(0, 10),
     ]);
 
@@ -1263,12 +1295,7 @@ export class InspectionVisitsService {
         message: 'Seleccioná Área y Organización operadora antes de confirmar la planificación',
       });
     }
-    await this.validatePlanningContext(
-      manager,
-      visit.operationalAreaId,
-      visit.operatorCompanyId,
-      visit.plannedStartAt,
-    );
+    await this.validatePlanningContext(manager, visit.operationalAreaId, visit.operatorCompanyId);
     if (!visit.scopeAssetId) {
       throw new BadRequestException({
         code: 'INSPECTION_SCOPE_REQUIRED',
@@ -1323,10 +1350,13 @@ export class InspectionVisitsService {
         message: 'El equipo debe incluir al inspector responsable',
       });
     }
-    // F6.1: Inventory membership is physical (Yacimiento scope).
-    // Company is temporal Area context and must never be reconstructed from
-    // assets.operator_company_id, which is only a creation/historical snapshot.
     await this.assertCurrentAssetsInScope(manager, visit.id, visit.scopeAssetId);
+    await this.assertCurrentAssetsMatchContext(
+      manager,
+      visit.id,
+      visit.operationalAreaId,
+      visit.operatorCompanyId,
+    );
   }
 
   private async activeAssetIds(manager: EntityManager, visitId: string): Promise<string[]> {

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

@@ -10,8 +10,8 @@ function mountedRepoFile(path: string): string {
 test('F6.1 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 = 24/);
-  assert.match(gradle, /versionName = "0\.15\.2"/);
+  assert.match(gradle, /versionCode = 23/);
+  assert.match(gradle, /versionName = "0\.15\.1"/);
   assert.match(gradle, /https:\/\/dhv2\.korexlabs\.com\/api\/v3\//);
   assert.match(gradle, /applicationIdSuffix = "\.debug"/);
 });
@@ -25,4 +25,4 @@ test('F5/F6.1 field inventory exposes Other families as reviewable choices to An
   assert.match(service, /F5:SYSTEM:OTHER:%/);
   assert.match(service, /AS "isOther"/);
   assert.match(service, /isOtherFamily: family\.isOther/);
-});
+});

api-v3/test/unit/f5-inventory-authoritative-contract.test.ts

@@ -113,7 +113,7 @@ test('F5 technical catalog is exactly final_modelov2 and resolves internal IDEM
   );
 });
 
-test('F5/F6.1 source contracts keep Empresa out of physical ownership and preserve sealed documents on merge', () => {
+test('F5 source contracts keep Empresa out of physical ownership and preserve sealed documents on merge', () => {
   const mergeSource = readFileSync('src/asset-master/inventory-merge.service.ts', 'utf8');
   const fieldSource = readFileSync('src/inspection-visits/field-inventory.service.ts', 'utf8');
   const contextMigration = readFileSync('src/database/migrations/1790087250000-f5-operational-context-compatibility.ts', 'utf8');
@@ -129,8 +129,7 @@ test('F5/F6.1 source contracts keep Empresa out of physical ownership and preser
   assert.doesNotMatch(mergeSource, /source\.operatorCompanyId\s*!==\s*canonical\.operatorCompanyId/);
   assert.doesNotMatch(mergeSource, /misma Área y Operadora/);
 
-  assert.match(fieldSource, /Yacimiento definido como alcance de esta inspección/);
-  assert.match(fieldSource, /scopeAssetId/);
+  assert.match(fieldSource, /Área de esta inspección/);
   assert.match(fieldSource, /area_company_relations/);
   assert.doesNotMatch(fieldSource, /asset\.operator_company_id\s*=\s*\$2::uuid/);
 

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

@@ -1,72 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import { resolve } from 'node:path';
-import test from 'node:test';
-
-const api = (path: string) => readFileSync(resolve(process.cwd(), path), 'utf8');
-const web = (path: string) => readFileSync(resolve(process.cwd(), '..', 'web-v2', path), 'utf8');
-
-test('F6.1 field Inventory is bounded by the frozen Yacimiento scope', () => {
-  const source = api('src/inspection-visits/field-inventory.service.ts');
-
-  assert.match(source, /COALESCE\(visit\.scope_asset_id, visit\.operational_area_id\) AS "scopeAssetId"/);
-  assert.match(source, /const effectiveParentId = parentId \?\? context\.scopeAssetId/);
-  assert.match(source, /const parentId = dto\.parentId \?\? context\.scopeAssetId/);
-  assert.match(source, /\[parentId, context\.scopeAssetId\]/);
-  assert.match(source, /\[assetId, context\.scopeAssetId\]/);
-  assert.match(source, /AS "insideScope"/);
-  assert.doesNotMatch(source, /insideArea/);
-});
-
-test('F6.1 field Findings reject Inventory outside the frozen Yacimiento scope', () => {
-  const source = api('src/inspection-visits/field-findings.service.ts');
-
-  assert.match(source, /COALESCE\(visit\.scope_asset_id, visit\.operational_area_id\) AS "scopeAssetId"/);
-  assert.match(source, /AS "insideScope"/);
-  assert.match(source, /if \(!row\.insideScope\)/);
-  assert.match(source, /Yacimiento definido como alcance/);
-  assert.doesNotMatch(source, /AS "insideArea"/);
-});
-
-test('F6.1 planning preserves Yacimiento and never validates Inventory ownership from Company snapshot', () => {
-  const source = api('src/inspection-visits/inspection-visits.service.ts');
-
-  assert.match(source, /const nextScope = dto\.scopeAssetId === undefined \? visit\.scopeAssetId : dto\.scopeAssetId/);
-  assert.match(source, /validateInspectionPlanningScope\(manager, nextAreaId, nextScope\)/);
-  assert.match(source, /visit\.scopeAssetId \?\? visit\.operationalAreaId/);
-  assert.match(source, /visit\.plannedStartAt,/);
-  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', () => {
-  const source = api('src/inspection-visits/inspection-planning-create.service.ts');
-
-  assert.match(source, /INSERT INTO inspection_visit_assets/);
-  assert.match(source, /COMPANY_OVERDUE','VERIFICATION_OVERDUE','UPCOMING_CONTROL/);
-  assert.match(source, /'AUTO_INCLUDED'/);
-});
-
-test('F6.1 operator choices are resolved at the planned timestamp', () => {
-  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(controller, /@Query\('at'\) at\?: string/);
-  assert.match(createPage, /operators\?at=\$\{at\}/);
-  assert.match(createPage, /\[areaId, plannedStartAt\]/);
-});
-
-test('F6.1 WEB keeps Area and Yacimiento as separate concepts when editing', () => {
-  const source = web('src/pages/InspectionVisitEditorF4Page.tsx');
-
-  assert.doesNotMatch(source, /<span>Área \/ Yacimiento<\/span>/);
-  assert.match(source, /<span>Área<\/span>/);
-  assert.match(source, /<span>Yacimiento<\/span>/);
-  assert.match(source, /scopeAssetId: visit\?\.scopeAsset\?\.id \?\? null/);
-});

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

@@ -1,44 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import { resolve } from 'node:path';
-import test from 'node:test';
-
-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', () => {
-  const page = source('../web-v2/src/pages/InspectionVisitCreateF61Page.tsx');
-  const hierarchy = source('src/inspection-visits/inspection-planning-hierarchy.service.ts');
-
-  assert.match(page, /function currentLocalDateTime\(\)/);
-  assert.match(page, /useState\(currentLocalDateTime\)/);
-  assert.match(page, /areas\/\$\{areaId\}\/operators\?at=\$\{at\}/);
-  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/);
-});
-
-test('F6.1 WEB cancellation requires an explicit audited reason and is available while in progress', () => {
-  const editor = source('../web-v2/src/pages/InspectionVisitEditorF4Page.tsx');
-  const controller = source('src/inspection-visits/inspection-visits.controller.ts');
-  const dto = source('src/inspection-visits/dto/cancel-inspection-visit.dto.ts');
-  const lifecycle = source('src/inspection-visits/inspection-visit-lifecycle.service.ts');
-
-  assert.doesNotMatch(editor, /window\.prompt\('Indicá el motivo de cancelación/);
-  assert.match(editor, /showCancelForm/);
-  assert.match(editor, /cancelReason/);
-  assert.match(editor, /<textarea/);
-  assert.match(editor, /cancelReason\.trim\(\)\.length < 10/);
-  assert.match(editor, /maxLength=\{500\}/);
-  assert.match(editor, /'DRAFT', 'PLANNED', 'IN_PROGRESS'/);
-  assert.match(editor, /Confirmar cancelación/);
-  assert.match(controller, /@Post\(':id\/cancel'\)/);
-  assert.match(dto, /@MinLength\(10\)/);
-  assert.match(dto, /@MaxLength\(4000\)/);
-  assert.match(lifecycle, /\[InspectionVisitStatus\.DRAFT, InspectionVisitStatus\.PLANNED, InspectionVisitStatus\.IN_PROGRESS\]\.includes\(visit\.status\)/);
-  assert.match(lifecycle, /INSPECTION_WITH_SEALED_ACT_CANNOT_CANCEL/);
-});

api-v3/test/unit/f6-solid-inventory-contract.test.ts

@@ -59,12 +59,11 @@ test('F6 field findings resolve by exact technical classification and keep OTROS
   assert.match(resolver, /label: 'OTROS'/);
 });
 
-test('F6.1 mobile finding gate uses Yacimiento scope and temporal Area operator relation instead of Inventory company ownership', () => {
+test('F6 mobile finding gate uses Area ancestry and temporal operator relation instead of copying company ownership onto each object', () => {
   const fieldFindings = source('src/inspection-visits/field-findings.service.ts');
 
   assert.match(fieldFindings, /WITH RECURSIVE ancestors/);
-  assert.match(fieldFindings, /COALESCE\(visit\.scope_asset_id, visit\.operational_area_id\)/);
-  assert.match(fieldFindings, /AS "insideScope"/);
+  assert.match(fieldFindings, /WHERE id=visit\.operational_area_id/);
   assert.match(fieldFindings, /FROM area_company_relations relation/);
   assert.match(fieldFindings, /relation\.relation_role='OPERATOR'/);
   assert.doesNotMatch(fieldFindings, /asset\.operator_company_id=visit\.operator_company_id/);
@@ -80,15 +79,12 @@ test('F6 field-created technical Inventory may be provisional only until the sel
   assert.match(fieldFindings, /FIELD_FINDING_FAMILY_REQUIRED/);
 });
 
-test('F6.1 Android roots search and reload at the Inspection Yacimiento with legacy Area fallback', () => {
-  const model = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/DhMobile.kt');
+test('F6 Android keeps search and reloads scoped to the current physical parent', () => {
   const viewModel = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt');
   const screen = source('../android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/F3VisitRoot.kt');
 
-  assert.match(model, /data class VisitDetail[\s\S]*val scopeAsset: AssetSummary\? = null/);
   assert.match(viewModel, /var inventoryParentId: String\? by mutableStateOf\(null\)/);
-  assert.match(viewModel, /currentVisit\.scopeAsset\?\.id \?: currentVisit\.operationalArea\?\.id/);
-  assert.match(viewModel, /visit\?\.scopeAsset\?\.id \?: visit\?\.operationalArea\?\.id/);
+  assert.match(viewModel, /effectiveParentId = parentId \?: inventoryParentId \?: currentVisit\.operationalArea\?\.id/);
   assert.match(viewModel, /repository\.fieldInventory\(currentVisit\.id, null, effectiveParentId\)/);
   assert.match(screen, /model\.loadFieldTypes\(item\.id\)/);
 });

web-v2/src/pages/InspectionVisitCreateF61Page.tsx

@@ -49,12 +49,6 @@ function inspectorName(person: Inspector): string {
   return `${person.firstName} ${person.lastName}`.trim() || person.username;
 }
 
-function currentLocalDateTime(): string {
-  const now = new Date();
-  const local = new Date(now.getTime() - now.getTimezoneOffset() * 60_000);
-  return local.toISOString().slice(0, 16);
-}
-
 export function InspectionVisitCreateF61Page() {
   const navigate = useNavigate();
   const [departments, setDepartments] = useState<Option[]>([]);
@@ -67,9 +61,8 @@ export function InspectionVisitCreateF61Page() {
   const [yacimientoId, setYacimientoId] = useState('');
   const [operatorId, setOperatorId] = useState('');
   const [inspectorId, setInspectorId] = useState('');
-  const [plannedStartAt, setPlannedStartAt] = useState(currentLocalDateTime);
+  const [plannedStartAt, setPlannedStartAt] = useState('');
   const [loading, setLoading] = useState(true);
-  const [loadingOperators, setLoadingOperators] = useState(false);
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState('');
 
@@ -105,28 +98,18 @@ export function InspectionVisitCreateF61Page() {
     setYacimientos([]);
     setOperators([]);
     if (!areaId) return;
-    requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/yacimientos`)
-      .then((response) => setYacimientos(response.data))
-      .catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));
+    Promise.all([
+      requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/yacimientos`),
+      requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/operators`),
+    ]).then(([yacimientoResponse, operatorResponse]) => {
+      setYacimientos(yacimientoResponse.data);
+      setOperators(operatorResponse.data);
+      if (operatorResponse.data.length === 1 && operatorResponse.data[0]) {
+        setOperatorId(operatorResponse.data[0].id);
+      }
+    }).catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)));
   }, [areaId]);
 
-  useEffect(() => {
-    setOperatorId('');
-    setOperators([]);
-    if (!areaId || !plannedStartAt) return;
-    const parsedStart = new Date(plannedStartAt);
-    if (Number.isNaN(parsedStart.getTime())) return;
-    const at = encodeURIComponent(parsedStart.toISOString());
-    setLoadingOperators(true);
-    requestJson<{ data: Option[] }>(`/inspection-visits/planning-context/areas/${areaId}/operators?at=${at}`)
-      .then((response) => {
-        setOperators(response.data);
-        if (response.data.length === 1 && response.data[0]) setOperatorId(response.data[0].id);
-      })
-      .catch((cause) => setError(cause instanceof Error ? cause.message : String(cause)))
-      .finally(() => setLoadingOperators(false));
-  }, [areaId, plannedStartAt]);
-
   const submit = async (event: FormEvent) => {
     event.preventDefault();
     setError('');
@@ -210,11 +193,10 @@ export function InspectionVisitCreateF61Page() {
 
         <label className="field">
           <span>Operadora del Área</span>
-          <SearchableSelect value={operatorId} onChange={(event) => setOperatorId(event.target.value)} searchPlaceholder="Buscar Operadora…" required disabled={!areaId || !plannedStartAt || loadingOperators || operators.length === 0}>
-            <option value="">{loadingOperators ? 'Cargando Operadora…' : operators.length === 0 && areaId && plannedStartAt ? 'Sin Operadora vigente para esa fecha' : 'Seleccionar Operadora…'}</option>
+          <SearchableSelect value={operatorId} onChange={(event) => setOperatorId(event.target.value)} searchPlaceholder="Buscar Operadora…" required disabled={!areaId || operators.length === 0}>
+            <option value="">{operators.length === 0 && areaId ? 'Sin Operadora vigente' : 'Seleccionar Operadora…'}</option>
             {operators.map((operator) => <option key={operator.id} value={operator.id}>{operator.name}</option>)}
           </SearchableSelect>
-          <small className="muted">Se obtiene de la relación vigente del Área para la fecha y hora de inicio.</small>
         </label>
 
         <label className="field">
@@ -232,7 +214,7 @@ export function InspectionVisitCreateF61Page() {
       </div>
 
       {areaId && yacimientos.length === 0 && <Alert>Esta Área no tiene Yacimientos cargados. No se puede planificar una Inspección hasta corregir su jerarquía.</Alert>}
-      {areaId && plannedStartAt && !loadingOperators && operators.length === 0 && <Alert>Esta Área no tiene una Operadora vigente para la fecha seleccionada. Podés consultar el Inventario, pero no planificar una Inspección operativa hasta definir esa relación.</Alert>}
+      {areaId && operators.length === 0 && <Alert>Esta Área no tiene una Operadora vigente. Podés consultar el Inventario, pero no planificar una Inspección operativa hasta definir esa relación.</Alert>}
 
       <div className="form-actions">
         <Link className="button secondary" to="/inspecciones">Volver</Link>

web-v2/src/pages/InspectionVisitEditorF4Page.tsx

@@ -109,8 +109,6 @@ export function InspectionVisitEditorF4Page() {
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState('');
   const [success, setSuccess] = useState('');
-  const [showCancelForm, setShowCancelForm] = useState(false);
-  const [cancelReason, setCancelReason] = useState('');
 
   const applyVisit = (value: InspectionVisit, syncForm = true) => {
     setVisit(value);
@@ -209,7 +207,6 @@ export function InspectionVisitEditorF4Page() {
       } else if (id) {
         applyVisit(await updateInspectionVisit(id, {
           objective: form.objective.trim() || null,
-          scopeAssetId: visit?.scopeAsset?.id ?? null,
           operationalAreaId: form.operationalAreaId || null,
           operatorCompanyId: form.operatorCompanyId || null,
           plannedStartAt,
@@ -289,7 +286,7 @@ export function InspectionVisitEditorF4Page() {
     finally { setBusy(false); }
   };
 
-  const lifecycleAction = async (action: 'PLAN' | 'UNPLAN') => {
+  const lifecycleAction = async (action: 'PLAN' | 'UNPLAN' | 'CANCEL') => {
     if (!id) return;
     setBusy(true); setError(''); setSuccess('');
     try {
@@ -297,38 +294,23 @@ export function InspectionVisitEditorF4Page() {
       if (action === 'PLAN') {
         updated = await planInspectionVisit(id);
         setSuccess('Inspección planificada. Ya puede iniciarse desde la APK.');
-      } else {
+      } else if (action === 'UNPLAN') {
         updated = await unplanInspectionVisit(id);
         setSuccess('La Inspección volvió a borrador para corregir la planificación.');
+      } else {
+        const reason = window.prompt('Indicá el motivo de cancelación (mínimo 10 caracteres):')?.trim() ?? '';
+        if (reason.length < 10) {
+          if (reason) setError('El motivo debe tener al menos 10 caracteres.');
+          return;
+        }
+        updated = await cancelInspectionVisit(id, reason);
+        setSuccess('Inspección cancelada con motivo auditado.');
       }
       applyVisit(updated);
     } catch (requestError) { setError(errorMessage(requestError)); }
     finally { setBusy(false); }
   };
 
-  const cancelCurrentVisit = async (event: FormEvent) => {
-    event.preventDefault();
-    if (!id) return;
-    const reason = cancelReason.trim();
-    if (reason.length < 10) {
-      setError('El motivo de cancelación debe tener al menos 10 caracteres.');
-      return;
-    }
-    if (reason.length > 500) {
-      setError('El motivo de cancelación no puede superar los 500 caracteres.');
-      return;
-    }
-    setBusy(true); setError(''); setSuccess('');
-    try {
-      const updated = await cancelInspectionVisit(id, reason);
-      applyVisit(updated);
-      setCancelReason('');
-      setShowCancelForm(false);
-      setSuccess('Inspección cancelada. El motivo quedó registrado y auditado.');
-    } catch (requestError) { setError(errorMessage(requestError)); }
-    finally { setBusy(false); }
-  };
-
   if (loading) return <LoadingBlock label="Cargando inspección…" />;
 
   return <section className="survey-editor inspection-editor">
@@ -343,8 +325,7 @@ export function InspectionVisitEditorF4Page() {
       <div className="panel-heading"><div><span className="eyebrow">{isNew ? 'CREACIÓN RÁPIDA' : 'PLANIFICACIÓN'}</span><h2>Contexto y fecha de inicio</h2><p className="section-copy">No existe título independiente ni fecha de fin planificada. El cierre real se registra al terminar el trabajo de campo.</p></div>{visit && <small className="muted">Actualizado {formatDate(visit.updatedAt)}</small>}</div>
       {visit && <div className="inspection-generated-code"><small>Identificador institucional</small><strong>{visit.code}</strong></div>}
       <div className="form-grid">
-        <label className="field"><span>Área</span><SearchableSelect searchPlaceholder="Buscar Área…" value={form.operationalAreaId} onChange={(event) => { context.setAreaId(event.target.value); setForm((current) => ({ ...current, operationalAreaId: event.target.value, operatorCompanyId: '' })); }} required disabled={!canManage || !planningEditable}><option value="">Seleccionar Área…</option>{areas.map((area) => <option key={area.id} value={area.id}>{area.name} · {area.code}</option>)}</SearchableSelect></label>
-        {!isNew && <label className="field"><span>Yacimiento</span><input value={visit?.scopeAsset?.name ?? 'Sin Yacimiento'} readOnly aria-readonly="true" /></label>}
+        <label className="field"><span>Área / Yacimiento</span><SearchableSelect searchPlaceholder="Buscar Área…" value={form.operationalAreaId} onChange={(event) => { context.setAreaId(event.target.value); setForm((current) => ({ ...current, operationalAreaId: event.target.value, operatorCompanyId: '' })); }} required disabled={!canManage || !planningEditable}><option value="">Seleccionar Área…</option>{areas.map((area) => <option key={area.id} value={area.id}>{area.name} · {area.code}</option>)}</SearchableSelect></label>
         <label className="field"><span>Operadora</span><SearchableSelect searchPlaceholder="Buscar Operadora…" value={form.operatorCompanyId} onChange={(event) => { context.setCompanyId(event.target.value); setForm((current) => ({ ...current, operatorCompanyId: event.target.value })); }} required disabled={!canManage || !planningEditable || !form.operationalAreaId}><option value="">Seleccionar Operadora…</option>{operators.map((operator) => <option key={operator.id} value={operator.id}>{operator.name} · {operator.code}</option>)}</SearchableSelect></label>
         <label className="field"><span>Fecha y hora de inicio</span><input type="datetime-local" value={form.plannedStartAt} onChange={(event) => setForm((current) => ({ ...current, plannedStartAt: event.target.value }))} required disabled={!canManage || !planningEditable} /></label>
         {isNew && <label className="field"><span>Inspector responsable</span><SearchableSelect searchPlaceholder="Buscar Inspector…" value={leadInspectorId} onChange={(event) => setLeadInspectorId(event.target.value)} required disabled={!canAssign}><option value="">Seleccionar Inspector…</option>{assignees.map((person) => <option key={person.id} value={person.id}>{personName(person)} · {person.username}</option>)}</SearchableSelect></label>}
@@ -370,9 +351,7 @@ export function InspectionVisitEditorF4Page() {
 
     {visit && <InspectionActsPanel visit={visit} />}
 
-    {visit && <article className="panel survey-status-actions"><div><strong>Flujo de la Inspección</strong><p>La oficina planifica. El inicio y cierre operativo se realizan desde la APK. Una Inspección no puede cerrarse hasta que todas sus Actas estén selladas.</p></div><div className="form-actions">{canManage && visit.status === 'DRAFT' && <button type="button" className="button primary" disabled={busy} onClick={() => void lifecycleAction('PLAN')}>Confirmar planificación</button>}{canManage && visit.status === 'PLANNED' && <button type="button" className="button secondary" disabled={busy} onClick={() => void lifecycleAction('UNPLAN')}>Volver a borrador</button>}{canManage && ['DRAFT', 'PLANNED', 'IN_PROGRESS'].includes(visit.status) && <button type="button" className="button danger-outline" disabled={busy} onClick={() => { setError(''); setSuccess(''); setShowCancelForm(true); }}>Cancelar inspección</button>}</div></article>}
-
-    {visit && showCancelForm && ['DRAFT', 'PLANNED', 'IN_PROGRESS'].includes(visit.status) && <form className="panel form-panel" onSubmit={cancelCurrentVisit}><div className="panel-heading"><div><span className="eyebrow">CANCELACIÓN</span><h2>Cancelar inspección</h2><p className="section-copy">La cancelación es definitiva y queda auditada. No se permite si la Inspección ya tiene un Acta sellada.</p></div></div><label className="field"><span>Motivo de cancelación</span><textarea value={cancelReason} onChange={(event) => setCancelReason(event.target.value)} minLength={10} maxLength={500} rows={4} placeholder="Explicá el motivo de la cancelación…" required /><small className="muted">{cancelReason.trim().length}/500 · mínimo 10 caracteres</small></label><div className="form-actions"><button type="button" className="button secondary" disabled={busy} onClick={() => { setShowCancelForm(false); setCancelReason(''); }}>Volver</button><button type="submit" className="button danger-outline" disabled={busy || cancelReason.trim().length < 10 || cancelReason.trim().length > 500}>{busy ? 'Cancelando…' : 'Confirmar cancelación'}</button></div></form>}
+    {visit && <article className="panel survey-status-actions"><div><strong>Flujo de la Inspección</strong><p>La oficina planifica. El inicio y cierre operativo se realizan desde la APK. Una Inspección no puede cerrarse hasta que todas sus Actas estén selladas.</p></div><div className="form-actions">{canManage && visit.status === 'DRAFT' && <button type="button" className="button primary" disabled={busy} onClick={() => void lifecycleAction('PLAN')}>Confirmar planificación</button>}{canManage && visit.status === 'PLANNED' && <button type="button" className="button secondary" disabled={busy} onClick={() => void lifecycleAction('UNPLAN')}>Volver a borrador</button>}{canManage && ['DRAFT', 'PLANNED'].includes(visit.status) && <button type="button" className="button danger-outline" disabled={busy} onClick={() => void lifecycleAction('CANCEL')}>Cancelar</button>}</div></article>}
 
     {visit?.status === 'PLANNED' && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Planificación lista.</strong> El Inspector asignado debe iniciar la Inspección desde la APK.</p></div>}
     {visit?.status === 'IN_PROGRESS' && <div className="temporal-notice"><Icon name="clipboard" /><p><strong>Inspección en curso.</strong> Actas, Hallazgos, firmas y cierre se registran desde la APK.</p></div>}