diff --git a/.gitignore b/.gitignore
index ca2a5b7af..316f08dc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,22 @@ coverage/
 \#*\#
 .\#*
 docker-compose.override.yml
+
+# cypress e2e artifacts
+e2e/**/cypress/videos/
+e2e/**/cypress/screenshots/
+e2e/**/cypress/downloads/
+
+# e2e launcher state (ports of the running stack)
+e2e/freight/.e2e-ports.json
+
+# local run scripts (contain personal DB credentials — never commit)
+run-passenger-local.sh
+run-passenger-web.sh
+
+# generated test output
+e2e-ui-report/
+test-results/
+playwright-report/
+blob-report/
+RUNNING_LOCALLY.md
diff --git a/apps/edr-freight-api/src/app.module.ts b/apps/edr-freight-api/src/app.module.ts
index 3ca5f6cb1..9270dd0a1 100644
--- a/apps/edr-freight-api/src/app.module.ts
+++ b/apps/edr-freight-api/src/app.module.ts
@@ -12,7 +12,7 @@ import {
   ensurePostgresSchemas,
   APPLICATION_SEARCH_PATH,
 } from "./config/ensure-postgres-schemas";
-import { IamModule, DataSeeder } from "@tria-plc/iamapi-common";
+import { IamModule } from "@tria-plc/iamapi-common";
 import { SharedAuthModule } from "@tria-plc/api-common/modules/auth/shared-auth.module";
 
 import appConfig from "./config/app.config";
@@ -77,8 +77,8 @@ import { ApprovedFirstLastMileDemoBookingsSeeder } from "./seed/approved-first-l
 import { PaidImportExportMileDemoSeeder } from "./seed/paid-import-export-mile-demo.seeder";
 //New Trains, Wagons, Container and Cargo management modules
 import { TrainsModule } from "./modules/trains/trains.module";
-import { VerifaydaModule } from './modules/verifayda/verifayda.module';
-import { FleetHistoryModule } from './modules/fleet-history/fleet-history.module';
+import { VerifaydaModule } from "./modules/verifayda/verifayda.module";
+import { FleetHistoryModule } from "./modules/fleet-history/fleet-history.module";
 import { WagonsModule } from "./modules/wagons/wagons.module";
 import { ContainersModule } from "./modules/container-management/containers.module";
 import { CargoesModule } from "./modules/cargoes/cargoes.module";
@@ -104,7 +104,13 @@ import { LoggerMiddleware } from "./logger.middleware";
   imports: [
     ConfigModule.forRoot({
       isGlobal: true,
-      load: [appConfig, databaseConfig, telebirrConfig, rabbitmqConfig, faydaConfig],
+      load: [
+        appConfig,
+        databaseConfig,
+        telebirrConfig,
+        rabbitmqConfig,
+        faydaConfig,
+      ],
     }),
     ScheduleModule.forRoot(),
     EventEmitterModule.forRoot(),
@@ -223,7 +229,7 @@ import { LoggerMiddleware } from "./logger.middleware";
 })
 export class AppModule implements OnApplicationBootstrap {
   constructor(
-    private readonly seeder: DataSeeder,
+    // private readonly seeder: DataSeeder,
     private readonly edrOrgSeeder: EdrOrgSeeder,
     private readonly freightPositionsSeeder: FreightPositionsSeeder,
     private readonly fileUploadSettingsSeeder: FileUploadSettingsSeeder,
@@ -258,7 +264,7 @@ export class AppModule implements OnApplicationBootstrap {
     //   freightPositionsSeeder        → seeds Position + PositionPermission rows
     //                                   (depends on edrOrgSeeder, must run after)
     await this.freightPermissionKeyMigrationSeeder.run();
-    await this.seeder.run();
+    // await this.seeder.run();
     await this.edrOrgSeeder.run();
     await this.freightPositionsSeeder.run();
 
diff --git a/apps/edr-freight-api/src/common/booking-guards.ts b/apps/edr-freight-api/src/common/booking-guards.ts
index 9769a7f18..a412bf990 100644
--- a/apps/edr-freight-api/src/common/booking-guards.ts
+++ b/apps/edr-freight-api/src/common/booking-guards.ts
@@ -14,6 +14,13 @@ export const BookingStaff = (permission: string | string[]) =>
     ),
   );
 
+/**
+ * Read-only reference data (yard dropdowns, search filters): any signed-in
+ * staff. Menu/page visibility stays permission-gated in the frontend — this
+ * only lets forms populate their lookups.
+ */
+export const StaffReference = () => applyDecorators(UseGuards(JwtGuard));
+
 export const BookingView = () => BookingStaff(FREIGHT_PERMS.bookings.view);
 
 export const TrainSchedulingView = () =>
@@ -22,9 +29,22 @@ export const TrainSchedulingView = () =>
 export const TrainSchedulingManage = () =>
   BookingStaff(FREIGHT_PERMS.trainScheduling.manage);
 
-export const FleetView = () => BookingStaff(FREIGHT_PERMS.fleet.view);
+/**
+ * Fleet guards take an optional granular per-resource key (locomotives:create,
+ * wagons:delete, …). The legacy coarse fleet:view / fleet:manage keys remain
+ * valid as a one-of fallback so existing role grants keep working.
+ */
+export const FleetView = (granular?: string) =>
+  BookingStaff(
+    granular ? [granular, FREIGHT_PERMS.fleet.view] : FREIGHT_PERMS.fleet.view,
+  );
 
-export const FleetManage = () => BookingStaff(FREIGHT_PERMS.fleet.manage);
+export const FleetManage = (granular?: string) =>
+  BookingStaff(
+    granular
+      ? [granular, FREIGHT_PERMS.fleet.manage]
+      : FREIGHT_PERMS.fleet.manage,
+  );
 
 /** Requester creates a wagon-transfer request (count-only, no wagon picks). */
 export const WagonTransferRequest = () =>
diff --git a/apps/edr-freight-api/src/common/freight-permission.util.spec.ts b/apps/edr-freight-api/src/common/freight-permission.util.spec.ts
new file mode 100644
index 000000000..d0d01535a
--- /dev/null
+++ b/apps/edr-freight-api/src/common/freight-permission.util.spec.ts
@@ -0,0 +1,51 @@
+import {
+  assertCanApproveContractStep,
+  canEditContractStep,
+} from './freight-permission.util';
+import { FREIGHT_PERMS } from '../seed/freight-permissions.registry';
+
+// The document-edit gate (canEditContractStep) must be STRICT: only the approver
+// whose turn it is may edit. This is the fix for a previous approver keeping the
+// "Edit contract articles" button after acting, because the approve gate lets
+// through anyone holding any contract-approve permission.
+describe('canEditContractStep (strict per-step edit gate)', () => {
+  const director = {
+    employee: { position: { positionType: { key: '-marketing-director-' } } },
+  };
+  // A line staff who already approved their own step but still holds a
+  // contract-approve permission — the exact actor that leaked edit rights.
+  const officerWithApprovePerm = {
+    employee: {
+      position: {
+        positionType: { key: '-marketing-officer-' },
+        permissions: [{ key: FREIGHT_PERMS.contracts.approveLineStaff }],
+      },
+    },
+  };
+  const superAdmin = { roles: [{ key: 'super_admin' }] };
+
+  it('lets the step’s own approver edit', () => {
+    expect(canEditContractStep(director, '-marketing-director-')).toBe(true);
+  });
+
+  it('lets an approval admin edit any step', () => {
+    expect(canEditContractStep(superAdmin, '-marketing-director-')).toBe(true);
+  });
+
+  it('does NOT let a different approver edit just because they hold an approve permission', () => {
+    expect(canEditContractStep(officerWithApprovePerm, '-marketing-director-')).toBe(
+      false,
+    );
+  });
+
+  it('stays intentionally stricter than the approve gate (which keeps the blanket fallback)', () => {
+    // The approve gate passes the officer via the any-permission blanket…
+    expect(() =>
+      assertCanApproveContractStep(officerWithApprovePerm, '-marketing-director-'),
+    ).not.toThrow();
+    // …but the edit gate does not — that divergence IS the fix.
+    expect(canEditContractStep(officerWithApprovePerm, '-marketing-director-')).toBe(
+      false,
+    );
+  });
+});
diff --git a/apps/edr-freight-api/src/common/freight-permission.util.ts b/apps/edr-freight-api/src/common/freight-permission.util.ts
index ced6e3c46..429c910d3 100644
--- a/apps/edr-freight-api/src/common/freight-permission.util.ts
+++ b/apps/edr-freight-api/src/common/freight-permission.util.ts
@@ -201,6 +201,34 @@ export function assertCanApproveContractStep(
   );
 }
 
+/**
+ * Strict "is it exactly this caller's turn?" test — mirrors the backoffice
+ * `canApproveContractStep`. Same passes as {@link assertCanApproveContractStep}
+ * EXCEPT the blanket "holds any contract-approve permission" fallback is
+ * dropped: a line-staff holding `approveLineStaff` must NOT read as the director
+ * for a director step. Used to gate contract-document editing so approval hands
+ * edit rights to the NEXT approver only — a previous approver who already acted
+ * (but still holds an approve permission) loses the edit button, as required.
+ *
+ * (Kept separate from the approve/reject gate, which keeps the blanket fallback
+ * so delegates whose token omits a position type can still action their step.)
+ */
+export function canEditContractStep(
+  user: TCurrentUser | MeLikeUser | null | undefined,
+  requiredRole: string,
+): boolean {
+  if (isFreightApprovalAdmin(user)) return true;
+
+  const positionTypes = collectPositionTypeKeys(user);
+  if (positionTypes.includes(requiredRole)) return true;
+
+  const aliases = LEGACY_ROLE_POSITION_TYPES[requiredRole] ?? [];
+  if (aliases.some((alias) => positionTypes.includes(alias))) return true;
+
+  const legacyPermission = CONTRACT_APPROVE_ROLE_PERMISSION[requiredRole];
+  return Boolean(legacyPermission && hasFreightPermission(user, legacyPermission));
+}
+
 export function assertCanApproveBookingStep(
   user: TCurrentUser | MeLikeUser | null | undefined,
   requiredRole: string,
diff --git a/apps/edr-freight-api/src/common/mile-financials.util.ts b/apps/edr-freight-api/src/common/mile-financials.util.ts
new file mode 100644
index 000000000..2f5288048
--- /dev/null
+++ b/apps/edr-freight-api/src/common/mile-financials.util.ts
@@ -0,0 +1,61 @@
+import { DataSource } from 'typeorm';
+
+type MileRecord = {
+  bookingId?: string | null;
+  advancedPayment?: number | string | null;
+  booking?: {
+    cargoTotalWeightVgm?: number | string | null;
+    bookingContainers?: Array<{
+      units?: Array<{ vgmTons?: number | string | null }> | null;
+    }> | null;
+  } | null;
+};
+
+/**
+ * Display enrichment for first/last-mile lists (Assign Vehicle modal etc.):
+ *  - Advance payment: mile records are created with advanced_payment 0 — the
+ *    real advance is the FIRST_MILE/LAST_MILE line the customer already paid
+ *    on the booking invoice.
+ *  - Cargo tons: container bookings often carry tonnage on the per-unit VGMs
+ *    while cargo_total_weight_vgm stays 0 — fall back to the summed units.
+ * Fills both in-memory on the loaded records; nothing is persisted.
+ */
+export async function attachMileFinancials(
+  dataSource: DataSource,
+  records: MileRecord[],
+  chargeType: 'FIRST_MILE' | 'LAST_MILE',
+): Promise<void> {
+  for (const r of records) {
+    const b = r.booking;
+    if (!b || Number(b.cargoTotalWeightVgm) > 0) continue;
+    const unitTons = (b.bookingContainers ?? []).reduce(
+      (sum, bc) =>
+        sum + (bc.units ?? []).reduce((s, u) => s + (Number(u.vgmTons) || 0), 0),
+      0,
+    );
+    if (unitTons > 0) b.cargoTotalWeightVgm = Number(unitTons.toFixed(3));
+  }
+
+  const needAdvance = records.filter(
+    (r) => r.bookingId && !(Number(r.advancedPayment) > 0),
+  );
+  if (!needAdvance.length) return;
+
+  const rows: Array<{ bookingId: string; amount: string }> = await dataSource.query(
+    `SELECT i.source_id AS "bookingId", SUM(il.amount) AS amount
+       FROM freight.invoice_lines il
+       JOIN freight.invoices i ON i.id = il.invoice_id AND i.deleted_at IS NULL
+      WHERE i.source = 'booking'
+        AND i.status = 'PAID'
+        AND i.source_id = ANY($1::text[])
+        AND il.charge_type = $2
+        AND il.deleted_at IS NULL
+      GROUP BY i.source_id`,
+    [needAdvance.map((r) => r.bookingId), chargeType],
+  );
+  const byBooking = new Map(rows.map((r) => [r.bookingId, Number(r.amount)]));
+  for (const r of needAdvance) {
+    const paid = byBooking.get(r.bookingId as string);
+    if (paid) r.advancedPayment = paid;
+  }
+}
diff --git a/apps/edr-freight-api/src/contracts/contract-rate-schedule.builder.ts b/apps/edr-freight-api/src/contracts/contract-rate-schedule.builder.ts
index af9b9428c..48eadb6c7 100644
--- a/apps/edr-freight-api/src/contracts/contract-rate-schedule.builder.ts
+++ b/apps/edr-freight-api/src/contracts/contract-rate-schedule.builder.ts
@@ -59,7 +59,7 @@ const TRIGGER_ROUTE_LABELS: Partial<Record<Rate['trigger'], string>> = {
   REEFER: 'Reefer (refrigerated) surcharge',
   WITH_RETURN: 'Empty-container return service',
   SHIPPING_LINE: 'Shipping line handling',
-  CONSOLIDATION: 'Container consolidation (extra document)',
+  CONSOLIDATION: 'Penalty (container consolidation)',
   LASHING: 'Cargo lashing and securing',
   CANCELLATION: 'Booking cancellation fee',
   DEMURRAGE: 'Demurrage / wagon detention',
diff --git a/apps/edr-freight-api/src/main.ts b/apps/edr-freight-api/src/main.ts
index 0fa1056dd..5b027448c 100644
--- a/apps/edr-freight-api/src/main.ts
+++ b/apps/edr-freight-api/src/main.ts
@@ -33,6 +33,13 @@ async function bootstrap() {
       "delegator-position-id",
       "current-project-id",
       "current-position-id",
+      // x-prefixed variants sent by the user-management / record-management
+      // frontend modules (same values, different naming convention)
+      "x-organization-unit-id",
+      "x-delegator-id",
+      "x-delegator-position-id",
+      "x-current-project-id",
+      "x-current-position-id",
     ],
     exposedHeaders: ["Content-Disposition"],
     maxAge: 86400, // cache preflight for 24h to cut chatter in dev
diff --git a/apps/edr-freight-api/src/migrations/2450000000000-DropActiveProfileTypeFromExternalProfiles.ts b/apps/edr-freight-api/src/migrations/2450000000000-DropActiveProfileTypeFromExternalProfiles.ts
new file mode 100644
index 000000000..d8119930f
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2450000000000-DropActiveProfileTypeFromExternalProfiles.ts
@@ -0,0 +1,45 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Drop the `active_profile_type` "active mode" column. A booking/contract now
+ * resolves its company_profile from the trade direction at creation time (with
+ * a forwarder passing an explicit companyProfileId), so no per-user active mode
+ * is stored. `onboarding_step` / `onboarding_completed` are unaffected.
+ */
+export class DropActiveProfileTypeFromExternalProfiles2450000000000
+  implements MigrationInterface
+{
+  name = 'DropActiveProfileTypeFromExternalProfiles2450000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.external_profiles
+        DROP COLUMN IF EXISTS active_profile_type;
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.external_profiles
+        ADD COLUMN IF NOT EXISTS active_profile_type varchar(32);
+    `);
+    // Rebuild the mode the same way the original column was backfilled:
+    // importer first, then exporter, then whichever profile the company has.
+    await queryRunner.query(`
+      UPDATE freight.external_profiles ep
+        SET active_profile_type = cp.type
+        FROM (
+          SELECT DISTINCT ON (company_id) company_id, type
+            FROM freight.company_profiles
+            ORDER BY company_id,
+              CASE type
+                WHEN 'importer' THEN 0
+                WHEN 'exporter' THEN 1
+                ELSE 2
+              END
+        ) cp
+        WHERE ep.company_id = cp.company_id
+          AND ep.active_profile_type IS NULL;
+    `);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2460000000000-AddCacBankPaymentMethod.ts b/apps/edr-freight-api/src/migrations/2460000000000-AddCacBankPaymentMethod.ts
new file mode 100644
index 000000000..e6cfe70c3
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2460000000000-AddCacBankPaymentMethod.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddCacBankPaymentMethod2460000000000 implements MigrationInterface {
+    name = "AddCacBankPaymentMethod2460000000000";
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        // The entity + frontend already list 'cac-bank' as a valid method, but the
+        // DB enum was never extended. Filtering payments by 'cac-bank' cast the
+        // literal to the enum and errored (invalid input value for enum). EDRFREIGHT-301.
+        await queryRunner.query(`ALTER TYPE freight.payments_method_enum ADD VALUE IF NOT EXISTS 'cac-bank';`);
+    }
+
+    public async down(_queryRunner: QueryRunner): Promise<void> {
+        // PostgreSQL does not support removing enum values directly.
+        // To roll back, recreate the type without the added value and update the column.
+    }
+}
diff --git a/apps/edr-freight-api/src/migrations/2470000000000-AddAcquisitionItemName.ts b/apps/edr-freight-api/src/migrations/2470000000000-AddAcquisitionItemName.ts
new file mode 100644
index 000000000..fadacda69
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2470000000000-AddAcquisitionItemName.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Acquisitions describe WHAT was acquired (vehicle, parts, equipment…) — the
+ * vehicle link is optional and only for acquisitions that ARE a fleet vehicle.
+ */
+export class AddAcquisitionItemName2470000000000 implements MigrationInterface {
+  name = 'AddAcquisitionItemName2470000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.asset_acquisitions
+        ADD COLUMN IF NOT EXISTS item_name varchar(200)
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.asset_acquisitions
+        DROP COLUMN IF EXISTS item_name
+    `);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2480000000000-AddMaintenanceDueNotifiedAt.ts b/apps/edr-freight-api/src/migrations/2480000000000-AddMaintenanceDueNotifiedAt.ts
new file mode 100644
index 000000000..61431c5bc
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2480000000000-AddMaintenanceDueNotifiedAt.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Dedup stamp for the km/date-due maintenance alert — without it the daily
+ * cron would re-notify every day a schedule stays due.
+ */
+export class AddMaintenanceDueNotifiedAt2480000000000 implements MigrationInterface {
+  name = 'AddMaintenanceDueNotifiedAt2480000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.maintenance_schedules
+        ADD COLUMN IF NOT EXISTS due_notified_at timestamptz NULL
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.maintenance_schedules DROP COLUMN IF EXISTS due_notified_at
+    `);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2800000000000-AddMaintenanceIntervals.ts b/apps/edr-freight-api/src/migrations/2800000000000-AddMaintenanceIntervals.ts
new file mode 100644
index 000000000..f4f125eaf
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2800000000000-AddMaintenanceIntervals.ts
@@ -0,0 +1,40 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * KM-based maintenance scheduling: per-vehicle service intervals (by km
+ * and/or days) driving the maintenance due engine. Raw schema-qualified SQL —
+ * the builder API resolved bare table names against the default schema and
+ * failed on boot ("Table maintenance_intervals does not exist").
+ */
+export class AddMaintenanceIntervals2800000000000 implements MigrationInterface {
+  name = 'AddMaintenanceIntervals2800000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS freight.maintenance_intervals (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        vehicle_id uuid NOT NULL REFERENCES freight.vehicles(id) ON DELETE CASCADE,
+        maintenance_type varchar NOT NULL,
+        interval_km numeric(14,2),
+        interval_days integer,
+        description text,
+        is_active boolean NOT NULL DEFAULT true,
+        created_at timestamptz NOT NULL DEFAULT now(),
+        updated_at timestamptz NOT NULL DEFAULT now(),
+        deleted_at timestamptz
+      );
+    `);
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS "IDX_maintenance_intervals_vehicle_type"
+      ON freight.maintenance_intervals (vehicle_id, maintenance_type);
+    `);
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX IF NOT EXISTS "UQ_maintenance_intervals_vehicle_type"
+      ON freight.maintenance_intervals (vehicle_id, maintenance_type);
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS freight.maintenance_intervals;`);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2800000000001-AddSignatureToHandover.ts b/apps/edr-freight-api/src/migrations/2800000000001-AddSignatureToHandover.ts
new file mode 100644
index 000000000..679846484
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2800000000001-AddSignatureToHandover.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Persist the signer's saved-signature image on the handover record, so the
+ * signed handover document can render the actual signature (not just the
+ * typed name) — parity with the booking-contract signing flow.
+ */
+export class AddSignatureToHandover2800000000001 implements MigrationInterface {
+  name = 'AddSignatureToHandover2800000000001';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE freight.booking_handovers ADD COLUMN IF NOT EXISTS signature_image_url text;`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE freight.booking_handovers DROP COLUMN IF EXISTS signature_image_url;`,
+    );
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2810000000000-AddMaintenanceServiceItem.ts b/apps/edr-freight-api/src/migrations/2810000000000-AddMaintenanceServiceItem.ts
new file mode 100644
index 000000000..983aa6e64
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2810000000000-AddMaintenanceServiceItem.ts
@@ -0,0 +1,47 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Named service items for KM-based maintenance ("oil change", "tires", …).
+ * The coarse maintenance_type enum (PREVENTIVE/…) allowed only one interval
+ * per type per vehicle, so oil and tire intervals could not coexist. Interval
+ * identity becomes (vehicle, maintenance_type, service_item); schedules carry
+ * the item so completion re-finds the right interval for auto-scheduling.
+ */
+export class AddMaintenanceServiceItem2810000000000 implements MigrationInterface {
+  name = 'AddMaintenanceServiceItem2810000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE freight.maintenance_intervals ADD COLUMN IF NOT EXISTS service_item varchar(120);`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE freight.maintenance_schedules ADD COLUMN IF NOT EXISTS service_item varchar(120);`,
+    );
+    // Re-key interval uniqueness on (vehicle, type, item). COALESCE folds the
+    // item-less legacy rows into one slot; soft-deleted rows are ignored.
+    await queryRunner.query(
+      `DROP INDEX IF EXISTS freight."UQ_maintenance_intervals_vehicle_type";`,
+    );
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX IF NOT EXISTS "UQ_maintenance_intervals_vehicle_type_item"
+      ON freight.maintenance_intervals (vehicle_id, maintenance_type, COALESCE(service_item, ''))
+      WHERE deleted_at IS NULL;
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX IF EXISTS freight."UQ_maintenance_intervals_vehicle_type_item";`,
+    );
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX IF NOT EXISTS "UQ_maintenance_intervals_vehicle_type"
+      ON freight.maintenance_intervals (vehicle_id, maintenance_type);
+    `);
+    await queryRunner.query(
+      `ALTER TABLE freight.maintenance_schedules DROP COLUMN IF EXISTS service_item;`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE freight.maintenance_intervals DROP COLUMN IF EXISTS service_item;`,
+    );
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2820000000000-CustomsClearanceRouteScope.ts b/apps/edr-freight-api/src/migrations/2820000000000-CustomsClearanceRouteScope.ts
new file mode 100644
index 000000000..17902ff0d
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2820000000000-CustomsClearanceRouteScope.ts
@@ -0,0 +1,67 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Scope the customs clearance service fee to a direction + route.
+ *
+ * The fee was a single global flat rate; the business sells it per lane —
+ * "import clearance, Djibouti → Adama, 300 USD". CUSTOMS_CLEARANCE rates now
+ * carry trade_direction + the yard pair, and contract pricing matches on them
+ * strictly (no route-less fallback).
+ *
+ * Existing route-less clearance rates cannot be backfilled (no way to know
+ * which lane each was meant for) — retired exactly like the base-freight
+ * retirement in AddRateYardScope: SUPERSEDED + soft-deleted, kept for
+ * snapshot history.
+ */
+export class CustomsClearanceRouteScope2820000000000 implements MigrationInterface {
+  name = 'CustomsClearanceRouteScope2820000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      UPDATE freight.rates
+      SET status = 'SUPERSEDED',
+          deleted_at = now(),
+          updated_at = now()
+      WHERE deleted_at IS NULL
+        AND rate_type = 'CUSTOMS_CLEARANCE'
+        AND (origin_yard_id IS NULL OR destination_yard_id IS NULL);
+    `);
+
+    await queryRunner.query(
+      `ALTER TABLE freight.rates DROP CONSTRAINT IF EXISTS "CK_rates_yard_scope";`,
+    );
+    await queryRunner.query(`
+      ALTER TABLE freight.rates
+        ADD CONSTRAINT "CK_rates_yard_scope" CHECK (
+          deleted_at IS NOT NULL
+          OR status = 'SUPERSEDED'
+          OR CASE
+               WHEN ("trigger" = 'ALWAYS' AND applies_to IN ('BULK', 'CONTAINER', 'INTERCITY'))
+                 OR "trigger" = 'CUSTOMS_CLEARANCE'
+                 THEN origin_yard_id IS NOT NULL AND destination_yard_id IS NOT NULL
+               ELSE origin_yard_id IS NULL AND destination_yard_id IS NULL
+             END
+        );
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Retired rates stay retired (their lanes were never recorded); down only
+    // restores the pre-customs constraint shape.
+    await queryRunner.query(
+      `ALTER TABLE freight.rates DROP CONSTRAINT IF EXISTS "CK_rates_yard_scope";`,
+    );
+    await queryRunner.query(`
+      ALTER TABLE freight.rates
+        ADD CONSTRAINT "CK_rates_yard_scope" CHECK (
+          deleted_at IS NOT NULL
+          OR status = 'SUPERSEDED'
+          OR CASE
+               WHEN "trigger" = 'ALWAYS' AND applies_to IN ('BULK', 'CONTAINER', 'INTERCITY')
+                 THEN origin_yard_id IS NOT NULL AND destination_yard_id IS NOT NULL
+               ELSE origin_yard_id IS NULL AND destination_yard_id IS NULL
+             END
+        );
+    `);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2830000000000-ReturnSurchargeRouteScope.ts b/apps/edr-freight-api/src/migrations/2830000000000-ReturnSurchargeRouteScope.ts
new file mode 100644
index 000000000..26c512cfc
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2830000000000-ReturnSurchargeRouteScope.ts
@@ -0,0 +1,64 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Scope the empty-container return surcharge to a direction + route +
+ * container type, like base freight (import-only for now — the box only goes
+ * back to the port on imports).
+ *
+ * Existing route-less RETURN_SURCHARGE rates cannot be backfilled — retired
+ * (SUPERSEDED + soft-deleted) exactly like base freight and customs clearance
+ * were, kept readable for snapshot history. Route-scoped replacements must be
+ * re-entered; a booking that asks for return with no matching rate hard-blocks.
+ */
+export class ReturnSurchargeRouteScope2830000000000 implements MigrationInterface {
+  name = 'ReturnSurchargeRouteScope2830000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      UPDATE freight.rates
+      SET status = 'SUPERSEDED',
+          deleted_at = now(),
+          updated_at = now()
+      WHERE deleted_at IS NULL
+        AND rate_type = 'RETURN_SURCHARGE'
+        AND (origin_yard_id IS NULL OR destination_yard_id IS NULL);
+    `);
+
+    await queryRunner.query(
+      `ALTER TABLE freight.rates DROP CONSTRAINT IF EXISTS "CK_rates_yard_scope";`,
+    );
+    await queryRunner.query(`
+      ALTER TABLE freight.rates
+        ADD CONSTRAINT "CK_rates_yard_scope" CHECK (
+          deleted_at IS NOT NULL
+          OR status = 'SUPERSEDED'
+          OR CASE
+               WHEN ("trigger" = 'ALWAYS' AND applies_to IN ('BULK', 'CONTAINER', 'INTERCITY'))
+                 OR "trigger" IN ('CUSTOMS_CLEARANCE', 'WITH_RETURN')
+                 THEN origin_yard_id IS NOT NULL AND destination_yard_id IS NOT NULL
+               ELSE origin_yard_id IS NULL AND destination_yard_id IS NULL
+             END
+        );
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Retired rates stay retired; down only restores the customs-era shape.
+    await queryRunner.query(
+      `ALTER TABLE freight.rates DROP CONSTRAINT IF EXISTS "CK_rates_yard_scope";`,
+    );
+    await queryRunner.query(`
+      ALTER TABLE freight.rates
+        ADD CONSTRAINT "CK_rates_yard_scope" CHECK (
+          deleted_at IS NOT NULL
+          OR status = 'SUPERSEDED'
+          OR CASE
+               WHEN ("trigger" = 'ALWAYS' AND applies_to IN ('BULK', 'CONTAINER', 'INTERCITY'))
+                 OR "trigger" = 'CUSTOMS_CLEARANCE'
+                 THEN origin_yard_id IS NOT NULL AND destination_yard_id IS NOT NULL
+               ELSE origin_yard_id IS NULL AND destination_yard_id IS NULL
+             END
+        );
+    `);
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2860000000000-DropClearanceFeePrepay.ts b/apps/edr-freight-api/src/migrations/2860000000000-DropClearanceFeePrepay.ts
new file mode 100644
index 000000000..9fd854b94
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2860000000000-DropClearanceFeePrepay.ts
@@ -0,0 +1,58 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * The customs clearance service fee is no longer prepaid via its own
+ * `clearance`-source invoice — it is billed as a CUSTOMS_CLEARANCE line on the
+ * booking invoice, together with the freight (see BookingPricingService).
+ *
+ * - Contracts/bookings parked at the payment gate move straight to the
+ *   document step (the gate no longer exists — nothing could ever pay them).
+ * - Open (unpaid) clearance invoices are expired; PAID ones stay as history.
+ *   NOTE: a ONE_TIME customs contract that already PAID its prepaid fee but
+ *   has not booked yet will be billed the fee again on its booking invoice —
+ *   accepted for dev data; reverses the old AddClearanceFeePayment migration.
+ * - clearance_fee_paid_at columns are dropped from contracts and bookings.
+ */
+export class DropClearanceFeePrepay2860000000000 implements MigrationInterface {
+  name = 'DropClearanceFeePrepay2860000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      UPDATE freight.contracts
+      SET status = 'AWAITING_CLEARANCE_DOCUMENTS', updated_at = now()
+      WHERE status = 'AWAITING_CLEARANCE_PAYMENT';
+    `);
+    await queryRunner.query(`
+      UPDATE freight.contracts
+      SET clearance_status = 'AWAITING_DOCUMENTS', updated_at = now()
+      WHERE clearance_status = 'AWAITING_PAYMENT';
+    `);
+    await queryRunner.query(`
+      UPDATE freight.bookings
+      SET status = 'AWAITING_DOCUMENTS', updated_at = now()
+      WHERE status = 'AWAITING_CLEARANCE_PAYMENT';
+    `);
+    await queryRunner.query(`
+      UPDATE freight.invoices
+      SET status = 'EXPIRED', updated_at = now()
+      WHERE source = 'clearance'
+        AND status IN ('DRAFT', 'ISSUED', 'PENDING', 'PARTIALLY_PAID', 'OVERDUE');
+    `);
+    await queryRunner.query(
+      `ALTER TABLE freight.contracts DROP COLUMN IF EXISTS clearance_fee_paid_at;`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE freight.bookings DROP COLUMN IF EXISTS clearance_fee_paid_at;`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Moved rows and expired invoices stay — only the columns come back.
+    await queryRunner.query(
+      `ALTER TABLE freight.contracts ADD COLUMN IF NOT EXISTS clearance_fee_paid_at timestamptz;`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE freight.bookings ADD COLUMN IF NOT EXISTS clearance_fee_paid_at timestamptz;`,
+    );
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2870000000000-CustomsClearancePerKind.ts b/apps/edr-freight-api/src/migrations/2870000000000-CustomsClearancePerKind.ts
new file mode 100644
index 000000000..be01e7825
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2870000000000-CustomsClearancePerKind.ts
@@ -0,0 +1,31 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Customs clearance fees are now sold per cargo kind: container fees name a
+ * container type (billed PER_CONTAINER / PER_WAGON), bulk fees carry no type
+ * (billed PER_TON / PER_WAGON). The old one-FLAT-fee-per-route shape cannot be
+ * mapped to a kind — retired (SUPERSEDED + soft-deleted) exactly like the
+ * base-freight and return-surcharge reshapes, kept readable for snapshot
+ * history. Per-kind replacements must be re-entered; a customs contract or
+ * booking without a matching fee hard-blocks. Contracts that already froze a
+ * FLAT snapshot keep billing it (legacy honoured at booking pricing).
+ */
+export class CustomsClearancePerKind2870000000000 implements MigrationInterface {
+  name = 'CustomsClearancePerKind2870000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      UPDATE freight.rates
+      SET status = 'SUPERSEDED',
+          deleted_at = now(),
+          updated_at = now()
+      WHERE deleted_at IS NULL
+        AND rate_type = 'CUSTOMS_CLEARANCE'
+        AND rate_unit = 'FLAT';
+    `);
+  }
+
+  public async down(): Promise<void> {
+    // Retired rates stay retired — re-enter per-kind rates instead.
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2880000000000-LashingPerKind.ts b/apps/edr-freight-api/src/migrations/2880000000000-LashingPerKind.ts
new file mode 100644
index 000000000..9d311c60f
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2880000000000-LashingPerKind.ts
@@ -0,0 +1,31 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Lashing is now sold per cargo kind, like the customs clearance fee:
+ * container rates name a container type (PER_CONTAINER / PER_WAGON), bulk
+ * rates carry no type (PER_TON / PER_WAGON). The old flat-per-booking shape
+ * cannot be mapped to a kind — retired (SUPERSEDED + soft-deleted), kept
+ * readable for snapshot history. Per-kind replacements must be re-entered;
+ * an unconfigured lashing rate simply bills nothing (lenient, like
+ * hazard/reefer). Matched on trigger, not rate_type — CONSOLIDATION rates
+ * share the LASHING rate_type and must survive.
+ */
+export class LashingPerKind2880000000000 implements MigrationInterface {
+  name = 'LashingPerKind2880000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      UPDATE freight.rates
+      SET status = 'SUPERSEDED',
+          deleted_at = now(),
+          updated_at = now()
+      WHERE deleted_at IS NULL
+        AND "trigger" = 'LASHING'
+        AND rate_unit = 'FLAT';
+    `);
+  }
+
+  public async down(): Promise<void> {
+    // Retired rates stay retired — re-enter per-kind rates instead.
+  }
+}
diff --git a/apps/edr-freight-api/src/migrations/2890000000000-LashingBulkOnlyPerDirection.ts b/apps/edr-freight-api/src/migrations/2890000000000-LashingBulkOnlyPerDirection.ts
new file mode 100644
index 000000000..8904c6194
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/2890000000000-LashingBulkOnlyPerDirection.ts
@@ -0,0 +1,30 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Lashing is now BULK-only and sold per trade direction (IMPORT / EXPORT),
+ * optionally narrowed to one leaf commodity. Rates that no longer fit —
+ * container-scoped, or carrying no direction — cannot be mapped and are
+ * retired (SUPERSEDED + soft-deleted), kept readable for snapshot history.
+ * Matched on trigger, not rate_type (CONSOLIDATION shares rate_type LASHING).
+ */
+export class LashingBulkOnlyPerDirection2890000000000 implements MigrationInterface {
+  name = 'LashingBulkOnlyPerDirection2890000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      UPDATE freight.rates
+      SET status = 'SUPERSEDED',
+          deleted_at = now(),
+          updated_at = now()
+      WHERE deleted_at IS NULL
+        AND "trigger" = 'LASHING'
+        AND (container_type_id IS NOT NULL
+             OR trade_direction IS NULL
+             OR trade_direction NOT IN ('IMPORT', 'EXPORT'));
+    `);
+  }
+
+  public async down(): Promise<void> {
+    // Retired rates stay retired — re-enter per-direction bulk rates instead.
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/auth/customer-reset.service.ts b/apps/edr-freight-api/src/modules/auth/customer-reset.service.ts
index 91ddaf1a9..4eb6ecc31 100644
--- a/apps/edr-freight-api/src/modules/auth/customer-reset.service.ts
+++ b/apps/edr-freight-api/src/modules/auth/customer-reset.service.ts
@@ -12,6 +12,7 @@ import {
   RESET_LINK_TTL_MS,
 } from "./forgot-password.service";
 import { maskOtpTarget } from "./mask-target.util";
+import { isDomesticPhone } from "../otp/otp.service";
 
 /** The account a staff-triggered reset would land on. */
 export interface CustomerResetTarget {
@@ -19,6 +20,12 @@ export interface CustomerResetTarget {
   name: string;
   email: string | null;
   phone: string | null;
+  /**
+   * Whether the SMS gateway (domestic-only) can reach `phone`. `null` when
+   * there is no phone. The backoffice uses this to disable the SMS channel for
+   * foreign numbers instead of sending a link that will never arrive.
+   */
+  phoneIsDomestic: boolean | null;
 }
 
 export interface SentResetLink {
@@ -58,6 +65,9 @@ export class CustomerResetService {
       name: `${profile.firstName} ${profile.lastName}`.trim(),
       email: user.email ?? null,
       phone: user.phoneNumber ?? null,
+      phoneIsDomestic: user.phoneNumber
+        ? isDomesticPhone(user.phoneNumber)
+        : null,
     };
   }
 
@@ -80,6 +90,17 @@ export class CustomerResetService {
     const target = this.forgotPasswordService.targetFor(user, channel);
     if (!target) return null;
 
+    // A foreign number is unreachable by the domestic-only SMS gateway — treat
+    // it like a missing phone rather than reporting "link sent" for a message
+    // that will never arrive. The backoffice disables the channel up front via
+    // `phoneIsDomestic`; this guards direct API calls.
+    if (channel === "phone" && target.phone && !isDomesticPhone(target.phone)) {
+      this.logger.warn(
+        `Staff reset via SMS refused for user ${userId} — non-domestic phone`,
+      );
+      return null;
+    }
+
     // Mint first, send second: a failed send leaves an unused ticket that simply
     // expires, whereas sending a link before the ticket exists would hand the
     // customer a URL that is dead on arrival.
diff --git a/apps/edr-freight-api/src/modules/auth/freight-me.service.ts b/apps/edr-freight-api/src/modules/auth/freight-me.service.ts
index 50c90213b..006b482f4 100644
--- a/apps/edr-freight-api/src/modules/auth/freight-me.service.ts
+++ b/apps/edr-freight-api/src/modules/auth/freight-me.service.ts
@@ -1,5 +1,7 @@
 import { Injectable } from '@nestjs/common';
+import { InjectDataSource } from '@nestjs/typeorm';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
+import { DataSource } from 'typeorm';
 
 import {
   collectPermissionKeys,
@@ -9,7 +11,35 @@ import { PERMISSIONS_CATALOG } from '../../seed/freight-permissions.registry';
 
 @Injectable()
 export class FreightMeService {
-  getEnrichedProfile(user: TCurrentUser) {
+  constructor(@InjectDataSource() private readonly dataSource: DataSource) {}
+
+  /**
+   * The JWT session snapshot has no position TYPE, but the backoffice needs it
+   * (GL sub-positions are identified by type key). Resolved live from IAM.
+   */
+  private async lookupPositionType(
+    positionId: string | undefined,
+  ): Promise<{ key: string; name: unknown } | null> {
+    if (!positionId) return null;
+    try {
+      const rows: { key: string; name: unknown }[] = await this.dataSource.query(
+        `SELECT pt.key, pt.name
+           FROM iam.positions p
+           JOIN iam.position_types pt ON pt.id = p.position_type_id
+          WHERE p.id = $1`,
+        [positionId],
+      );
+      return rows[0] ?? null;
+    } catch {
+      return null; // iam schema unreachable — degrade to the old payload shape
+    }
+  }
+
+  async getEnrichedProfile(user: TCurrentUser) {
+    const positionType = await this.lookupPositionType(
+      user.employee?.position?.id,
+    );
+
     const employee = user.employee
       ? [
           {
@@ -27,6 +57,7 @@ export class FreightMeService {
                     isDelegate: user.employee.position.isDelegate,
                     parentPositionId: user.employee.position.parentPositionId,
                     permissions: user.employee.position.permissions ?? [],
+                    positionType,
                   },
                 ]
               : [],
diff --git a/apps/edr-freight-api/src/modules/backoffice/dto/create-organization-user.dto.ts b/apps/edr-freight-api/src/modules/backoffice/dto/create-organization-user.dto.ts
index cf324a501..cc7507dd6 100644
--- a/apps/edr-freight-api/src/modules/backoffice/dto/create-organization-user.dto.ts
+++ b/apps/edr-freight-api/src/modules/backoffice/dto/create-organization-user.dto.ts
@@ -1,5 +1,6 @@
 import { ApiProperty } from "@nestjs/swagger";
-import { IsBoolean, IsEmail, IsObject, IsOptional, IsString, MinLength } from "class-validator";
+import { Type } from "class-transformer";
+import { IsBoolean, IsEmail, IsOptional, IsString, MinLength, ValidateNested } from "class-validator";
 
 class CreateOrganizationUserNameDto {
   @ApiProperty()
@@ -29,7 +30,8 @@ export class CreateOrganizationUserDto {
   phoneNumber?: string;
 
   @ApiProperty({ type: CreateOrganizationUserNameDto })
-  @IsObject()
+  @ValidateNested()
+  @Type(() => CreateOrganizationUserNameDto)
   name!: CreateOrganizationUserNameDto;
 
   @ApiProperty({ required: false, default: false })
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts b/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts
index 3d8222d63..82bb1144e 100644
--- a/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-invoice.service.ts
@@ -16,7 +16,6 @@ import {
   InvoiceLineInput,
 } from "../billing/billing.service";
 import { Invoice } from "../billing/entities/invoice.entity";
-import { CLEARANCE_BOOKING_INVOICE_TYPE } from "../contracts/clearance-fee.service";
 import { FirstMileService } from "../first-mile/first-mile.service";
 import { BookingBatchService } from "../train-scheduling/booking-batch.service";
 import { PriceLineItemDto } from "./dto/generate-price-response.dto";
@@ -121,8 +120,7 @@ export class BookingInvoiceService {
   }
 
   /**
-   * Expire the booking's currently-open invoices (freight PREPAID and the
-   * per-shipment clearance fee) when the booking is
+   * Expire the booking's currently-open freight (PREPAID) invoice when the booking is
    * cancelled or rejected — the counterpart to the pay-window-expiry path
    * (which also calls {@link BillingService.expirePayable}). Stops a terminated
    * booking from leaving a payable invoice open. No-op when the booking has no
@@ -133,15 +131,6 @@ export class BookingInvoiceService {
     bookingId: string,
     manager?: EntityManager,
   ): Promise<Invoice | null> {
-    // The per-shipment clearance fee (GENERAL contracts) bills this same booking
-    // id under its own source/type — retire it alongside the freight invoice, or
-    // a cancelled shipment keeps a payable clearance invoice open.
-    await this.billing.expirePayable(
-      Freight.InvoiceSource.Clearance,
-      bookingId,
-      CLEARANCE_BOOKING_INVOICE_TYPE,
-      manager,
-    );
     return this.billing.expirePayable(
       Freight.InvoiceSource.Booking,
       bookingId,
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.spec.ts b/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.spec.ts
index 3f4f64186..667abe842 100644
--- a/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.spec.ts
@@ -56,6 +56,7 @@ describe('BookingPricingService — domestic corridor', () => {
       ratesService as never,
       exchangeService as never,
       { validate20ftPairing: jest.fn().mockResolvedValue([]) } as never,
+      {} as never,
     );
   });
 
@@ -163,11 +164,12 @@ describe('BookingPricingService — domestic corridor', () => {
         computeBaseRailLinesWithRates: (
           b: Booking,
           input: { containers: [] },
-        ) => Promise<{ lineItems: Array<{ amount: number }> }>;
+        ) => Promise<{ lineItems: Array<{ amount: number }>; blocked: string[] }>;
       }
     ).computeBaseRailLinesWithRates(booking, { containers: [] });
 
     expect(result.lineItems).toHaveLength(0);
+    expect(result.blocked).toHaveLength(1);
   });
 
   it('does not price containers off a rate configured for a different leg', async () => {
@@ -197,4 +199,277 @@ describe('BookingPricingService — domestic corridor', () => {
 
     expect(result.lineItems).toHaveLength(0);
   });
+
+  // A mixed booking where only one container size has a configured rate must
+  // hard-block, not silently carry the unconfigured size for free.
+  it('blocks the unconfigured container size and prices the configured one', async () => {
+    const fortyOnly: Rate = {
+      ...intercityContainerUsd,
+      id: 'rate-ct-40-only',
+      containerTypeId: 'ct-40',
+    } as Rate;
+    ratesService.findLiveRates.mockResolvedValue([fortyOnly]);
+
+    const booking = {
+      id: 'b-5',
+      freightType: 'CONTAINER',
+      tradeDirection: 'DOMESTIC',
+      paymentCurrency: 'USD',
+      originYardId: MOJO,
+      destinationYardId: DIRE,
+      bookingContainers: [],
+    } as unknown as Booking;
+
+    const result = await (
+      service as unknown as {
+        computeBaseRailLinesWithRates: (
+          b: Booking,
+          input: {
+            containers: Array<{ containerTypeId: string; quantity: number }>;
+          },
+        ) => Promise<{ lineItems: Array<{ code: string }>; blocked: string[] }>;
+      }
+    ).computeBaseRailLinesWithRates(booking, {
+      containers: [
+        { containerTypeId: 'ct-40', quantity: 2 },
+        { containerTypeId: 'ct-20', quantity: 3 },
+      ],
+    });
+
+    expect(result.lineItems).toHaveLength(1);
+    expect(result.blocked).toHaveLength(1);
+    expect(result.blocked[0]).toContain('rate is configured');
+  });
+});
+
+describe('BookingPricingService — customs clearance fee billed on the booking price', () => {
+  const DJ = 'yard-dj';
+
+  const containerFee20: Rate = {
+    id: 'rate-cc-20',
+    rateType: 'CUSTOMS_CLEARANCE',
+    trigger: 'CUSTOMS_CLEARANCE',
+    currency: 'USD',
+    rateValue: 100,
+    rateUnit: 'PER_CONTAINER',
+    status: 'LIVE',
+    containerTypeId: 'ct-20',
+    tradeDirection: 'IMPORT',
+    originYardId: DJ,
+    destinationYardId: DIRE,
+  } as Rate;
+
+  const bulkFeePerTon: Rate = {
+    ...containerFee20,
+    id: 'rate-cc-bulk',
+    rateValue: 5,
+    rateUnit: 'PER_TON',
+    containerTypeId: null,
+  } as Rate;
+
+  const emptyEval = {
+    priorityScore: 0,
+    appliedModifiers: [],
+    containerWeightResults: [],
+    warnings: [],
+    hardBlocked: [],
+    requiresDirectorApproval: false,
+  };
+
+  const makeService = (opts: {
+    snapshots?: unknown[];
+    liveRates?: Rate[];
+    wagonCapacity?: number;
+  }) =>
+    new BookingPricingService(
+      {
+        calculateWagonCount: jest.fn().mockResolvedValue(0),
+        findContractRateSnapshots: jest.fn().mockResolvedValue(opts.snapshots ?? []),
+      } as never,
+      { evaluate: jest.fn().mockResolvedValue(emptyEval) } as never,
+      {
+        findById: jest.fn(async (id: string) => ({
+          id,
+          sizeFt: id === 'ct-40' ? 40 : 20,
+          isReefer: false,
+          code: id === 'ct-40' ? 'C40' : 'C20',
+        })),
+      } as never,
+      { findLiveRates: jest.fn().mockResolvedValue(opts.liveRates ?? []) } as never,
+      { getRate: jest.fn().mockResolvedValue(MOCK_CBE_RATE) } as never,
+      { validate20ftPairing: jest.fn().mockResolvedValue([]) } as never,
+      {
+        findById: jest.fn().mockResolvedValue({
+          wagonTypes:
+            opts.wagonCapacity !== undefined
+              ? [{ capacityTons: opts.wagonCapacity }]
+              : [],
+        }),
+      } as never,
+    );
+
+  const containerBooking = (overrides: Record<string, unknown> = {}) =>
+    ({
+      id: 'b-cc',
+      freightType: 'CONTAINER',
+      tradeDirection: 'IMPORT',
+      paymentCurrency: 'USD',
+      customsClearingEnabled: true,
+      originYardId: DJ,
+      destinationYardId: DIRE,
+      bookingContainers: [
+        { containerTypeId: 'ct-20', quantity: 4, vgmPerUnitTons: 10, wagonsRequired: 2 },
+      ],
+      ...overrides,
+    }) as unknown as Booking;
+
+  const bulkBooking = (overrides: Record<string, unknown> = {}) =>
+    ({
+      id: 'b-cc-bulk',
+      freightType: 'BULK',
+      tradeDirection: 'IMPORT',
+      paymentCurrency: 'USD',
+      customsClearingEnabled: true,
+      cargoTypeId: 'cargo-1',
+      cargoTotalWeightVgm: 120,
+      originYardId: DJ,
+      destinationYardId: DIRE,
+      bookingContainers: [],
+      ...overrides,
+    }) as unknown as Booking;
+
+  it('bills a container booking per box at its own container type fee', async () => {
+    const service = makeService({ liveRates: [containerFee20] });
+    const result = await service.computePriceForBooking(containerBooking());
+
+    const line = result.lineItems.find((l) => l.code === 'CUSTOMS_CLEARANCE_20FT');
+    expect(line).toBeDefined();
+    expect(line!.unit).toBe('PER_CONTAINER');
+    expect(line!.quantity).toBe(4);
+    expect(line!.amount).toBe(400);
+  });
+
+  it('bills a PER_WAGON container fee on the wagons the boxes occupy (two 20ft share one)', async () => {
+    const service = makeService({
+      liveRates: [{ ...containerFee20, rateUnit: 'PER_WAGON' } as Rate],
+    });
+    const result = await service.computePriceForBooking(containerBooking());
+
+    const line = result.lineItems.find((l) => l.code === 'CUSTOMS_CLEARANCE_20FT');
+    expect(line!.unit).toBe('PER_WAGON');
+    expect(line!.quantity).toBe(2);
+    expect(line!.amount).toBe(200);
+  });
+
+  it('hard-blocks a container type with no fee configured (never free clearance)', async () => {
+    const service = makeService({ liveRates: [bulkFeePerTon] });
+    const result = await service.computePriceForBooking(containerBooking());
+
+    expect(result.lineItems.some((l) => l.code.startsWith('CUSTOMS_CLEARANCE'))).toBe(false);
+    expect(result.hardBlocked.some((m) => m.includes('customs clearance'))).toBe(true);
+  });
+
+  it('bills a bulk booking per ton at the route bulk fee', async () => {
+    const service = makeService({ liveRates: [bulkFeePerTon] });
+    const result = await service.computePriceForBooking(bulkBooking());
+
+    const line = result.lineItems.find((l) => l.code === 'CUSTOMS_CLEARANCE');
+    expect(line!.unit).toBe('PER_TON');
+    expect(line!.quantity).toBe(120);
+    expect(line!.amount).toBe(600);
+  });
+
+  it('the fee scoped to the booking commodity wins over the catch-all', async () => {
+    const service = makeService({
+      liveRates: [
+        { ...bulkFeePerTon, id: 'rate-cc-catchall', rateValue: 5 } as Rate,
+        {
+          ...bulkFeePerTon,
+          id: 'rate-cc-sugar',
+          rateValue: 9,
+          cargoTypeId: 'cargo-1',
+        } as Rate,
+      ],
+    });
+    const result = await service.computePriceForBooking(bulkBooking());
+
+    const line = result.lineItems.find((l) => l.code === 'CUSTOMS_CLEARANCE');
+    expect(line!.unitAmount).toBe(9); // commodity rate, not the 5 USD catch-all
+    expect(line!.amount).toBe(1080);
+  });
+
+  it('bills a PER_WAGON bulk fee on ceil(tons ÷ wagon capacity)', async () => {
+    const service = makeService({
+      liveRates: [{ ...bulkFeePerTon, rateUnit: 'PER_WAGON', rateValue: 50 } as Rate],
+      wagonCapacity: 60,
+    });
+    const result = await service.computePriceForBooking(bulkBooking());
+
+    const line = result.lineItems.find((l) => l.code === 'CUSTOMS_CLEARANCE');
+    expect(line!.unit).toBe('PER_WAGON');
+    expect(line!.quantity).toBe(2); // 120 t ÷ 60 t per wagon
+    expect(line!.amount).toBe(100);
+  });
+
+  it('blocks a PER_WAGON bulk fee when no wagon capacity is configured', async () => {
+    const service = makeService({
+      liveRates: [{ ...bulkFeePerTon, rateUnit: 'PER_WAGON' } as Rate],
+    });
+    const result = await service.computePriceForBooking(bulkBooking());
+
+    expect(result.hardBlocked.some((m) => m.includes('wagon'))).toBe(true);
+  });
+
+  it('prefers the contract frozen per-size snapshot over the live rate', async () => {
+    const service = makeService({
+      liveRates: [containerFee20],
+      snapshots: [
+        {
+          rateCode: 'CUSTOMS_CLEARANCE_20FT',
+          unitPrice: 80,
+          currency: 'USD',
+          unitOfMeasure: 'per_container',
+          isClearance: true,
+        },
+      ],
+    });
+    const result = await service.computePriceForBooking(
+      containerBooking({ contractId: 'c-1' }),
+    );
+
+    const line = result.lineItems.find((l) => l.code === 'CUSTOMS_CLEARANCE_20FT');
+    expect(line!.amount).toBe(320); // 4 × frozen 80, not live 100
+  });
+
+  it('honours a legacy FLAT snapshot once for the whole container booking', async () => {
+    const service = makeService({
+      liveRates: [],
+      snapshots: [
+        {
+          rateCode: 'CUSTOMS_CLEARANCE',
+          unitPrice: 500,
+          currency: 'USD',
+          unitOfMeasure: 'flat',
+          isClearance: true,
+        },
+      ],
+    });
+    const result = await service.computePriceForBooking(
+      containerBooking({ contractId: 'c-legacy' }),
+    );
+
+    const line = result.lineItems.find((l) => l.code === 'CUSTOMS_CLEARANCE');
+    expect(line!.unit).toBe('FLAT');
+    expect(line!.amount).toBe(500);
+    expect(result.hardBlocked.some((m) => m.includes('customs clearance'))).toBe(false);
+  });
+
+  it('adds no fee line when customs clearing is disabled', async () => {
+    const service = makeService({ liveRates: [containerFee20] });
+    const result = await service.computePriceForBooking(
+      containerBooking({ customsClearingEnabled: false }),
+    );
+
+    expect(result.lineItems.some((l) => l.code.startsWith('CUSTOMS_CLEARANCE'))).toBe(false);
+  });
 });
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.ts b/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.ts
index a42d23859..89825e100 100644
--- a/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-pricing.service.ts
@@ -1,5 +1,6 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 
+import { CargoTypesService } from '../rule-engine/services/cargo-types.service';
 import { ContainerTypesService } from '../rule-engine/services/container-types.service';
 import { RatesService } from '../rule-engine/services/rates.service';
 import { Rate } from '../rule-engine/entities/rate.entity';
@@ -10,7 +11,10 @@ import {
   BookingEvaluationInput,
   RuleEngineService,
 } from '../rule-engine/rule-engine.service';
-import { containersPerWagonForSize } from '../rule-engine/container-type.util';
+import {
+  containersPerWagonForSize,
+  wagonsPerUnitForSize,
+} from '../rule-engine/container-type.util';
 import { BookingsRepository } from './bookings.repository';
 import { wagonRemainder } from './consolidation.service';
 import { GeneratePriceResponseDto, PriceLineItemDto } from './dto/generate-price-response.dto';
@@ -76,6 +80,7 @@ export class BookingPricingService {
     private readonly ratesService: RatesService,
     private readonly exchangeService: ExchangeService,
     private readonly containerValidationService: ContainerValidationService,
+    private readonly cargoTypesService: CargoTypesService,
   ) {}
 
   async generatePrice(bookingId: string): Promise<GeneratePriceResponseDto> {
@@ -137,8 +142,12 @@ export class BookingPricingService {
     const lineItems: PriceLineItemDto[] = [];
     let total = 0;
 
-    const { lineItems: baseLines, usedRates: baseRates, warnings: baseWarnings } =
-      await this.computeBaseRailLinesWithRates(booking, evalInput, frozenRates);
+    const {
+      lineItems: baseLines,
+      usedRates: baseRates,
+      warnings: baseWarnings,
+      blocked: baseBlocked,
+    } = await this.computeBaseRailLinesWithRates(booking, evalInput, frozenRates);
     for (const line of baseLines) {
       lineItems.push(line);
       total += line.amount;
@@ -161,8 +170,16 @@ export class BookingPricingService {
       const usdAmount = mod.calculatedAmount;
 
       const rate = rateById.get(mod.rateId);
-      const unit = rate?.rateUnit ?? 'FLAT';
-      const unitUsd = rate ? Number(rate.rateValue) : usdAmount;
+      // Derived/route-matched charges (import overweight, empty-container
+      // return) carry their own unit price + billing unit — bill and display
+      // those, not whatever the referenced rate row says.
+      const isDerived = mod.unitPriceUsd != null;
+      const unit = mod.billingUnit ?? rate?.rateUnit ?? 'FLAT';
+      const unitUsd = isDerived
+        ? Number(mod.unitPriceUsd)
+        : rate
+          ? Number(rate.rateValue)
+          : usdAmount;
       // Per-unit count: FLAT and PER_INVOICE are billed once (qty 1); an
       // explicit trigger (e.g. overweight tons) wins when present; otherwise
       // derive from total ÷ unit price (the live unit price — a count, not a
@@ -178,11 +195,11 @@ export class BookingPricingService {
 
       // H15: bill the frozen contract surcharge rate (already in the booking
       // currency) when this code has a snapshot; else keep the live amount.
-      const frozen = this.frozenRateByCode(
-        frozenRates,
-        mod.surchargeCode,
-        paymentCurrency,
-      );
+      // Derived charges skip the snapshot — import overweight prices off the
+      // route's container freight, never a frozen OVERWEIGHT_PER_TON value.
+      const frozen = isDerived
+        ? null
+        : this.frozenRateByCode(frozenRates, mod.surchargeCode, paymentCurrency);
       const unitAmount = frozen
         ? Number(frozen.unitPrice)
         : isEtbBooking
@@ -211,6 +228,23 @@ export class BookingPricingService {
       if (rate) usedRatesMap.set(rate.id, rate);
     }
 
+    // Customs clearance service fee (Path B) — billed HERE, on the booking
+    // invoice with the freight; no separate prepaid clearance invoice. Sold per
+    // cargo kind: container bookings bill each container type's own fee (per
+    // box or per wagon), bulk bookings the route's bulk fee (per ton or per
+    // wagon). Frozen contract snapshots win over live rates; a customs booking
+    // with nothing configured hard-blocks — clearance never ships for free.
+    const clearanceBlocked: string[] = [];
+    if (booking.customsClearingEnabled) {
+      const clearance = await this.customsClearanceLines(booking, frozenRates, liveRates);
+      for (const line of clearance.lineItems) {
+        lineItems.push(line);
+        total += line.amount;
+      }
+      for (const rate of clearance.usedRates) usedRatesMap.set(rate.id, rate);
+      clearanceBlocked.push(...clearance.blocked);
+    }
+
     // Overweight detail for the customer: map the engine's per-line results back
     // to the booking's container lines (same order) for code + weights. maxAllowed
     // is derived from the line total minus the excess the engine computed.
@@ -248,7 +282,7 @@ export class BookingPricingService {
       appliedModifiers: ruleResult.appliedModifiers,
       priorityScore: ruleResult.priorityScore,
       warnings: [...ruleResult.warnings, ...baseWarnings],
-      hardBlocked: ruleResult.hardBlocked,
+      hardBlocked: [...ruleResult.hardBlocked, ...baseBlocked, ...clearanceBlocked],
       overweightLines,
     };
   }
@@ -309,6 +343,8 @@ export class BookingPricingService {
               hazardousQuantity: Number(bc.hazardousQuantity ?? 0),
               reeferQuantity: Number(bc.reeferQuantity ?? 0),
               returnQuantity: Number(bc.returnQuantity ?? 0),
+              // Wagon share per box — a PER_WAGON empty-return rate bills on it.
+              wagonsPerUnit: wagonsPerUnitForSize(ct.sizeFt),
             },
             perWagon: containersPerWagonForSize(ct.sizeFt),
             quantity: qty,
@@ -326,6 +362,13 @@ export class BookingPricingService {
             ),
           )
         : 0;
+    // Bulk wagon estimate for PER_WAGON kind-scoped surcharges (lashing).
+    // Deliberately NOT totalWagons — that would shift wagon-count priority
+    // scoring for bulk bookings.
+    const bulkWagons =
+      booking.freightType === 'BULK'
+        ? ((await this.bulkWagonCount(booking)) ?? 0)
+        : 0;
 
     // Consolidation is system-managed: the CONSOLIDATION surcharge fires whenever
     // a container type leaves a wagon partially filled. Aggregate by type first —
@@ -365,6 +408,8 @@ export class BookingPricingService {
       isGovernment: booking.isGovernment,
       allowConsolidation,
       shippingLineId: booking.shippingLineId,
+      originYardId: booking.originYardId,
+      destinationYardId: booking.destinationYardId,
       totalWagons,
       // Bulk tonnage scales PER_TON surcharges (e.g. the bulk reefer surcharge).
       // Container freight carries 0 here — its surcharges scale by container count.
@@ -372,6 +417,7 @@ export class BookingPricingService {
         booking.freightType === 'BULK'
           ? Number(booking.cargoTotalWeightVgm ?? 0)
           : 0,
+      bulkWagons,
       containers,
     };
   }
@@ -454,7 +500,12 @@ export class BookingPricingService {
     booking: Booking,
     evalInput: BookingEvaluationInput,
     frozenRates: Map<string, ContractRateSnapshot> | null = null,
-  ): Promise<{ lineItems: PriceLineItemDto[]; usedRates: Rate[]; warnings: string[] }> {
+  ): Promise<{
+    lineItems: PriceLineItemDto[];
+    usedRates: Rate[];
+    warnings: string[];
+    blocked: string[];
+  }> {
     const liveRates = await this.ratesService.findLiveRates();
     const paymentCurrency = booking.paymentCurrency;
     const isEtbBooking = paymentCurrency === 'ETB';
@@ -477,6 +528,7 @@ export class BookingPricingService {
     const lines: PriceLineItemDto[] = [];
     const usedRatesMap = new Map<string, Rate>();
     const warnings: string[] = [];
+    const blocked: string[] = [];
     const wagonCount = await this.resolveWagonCount(booking);
 
     for (const container of evalInput.containers) {
@@ -500,11 +552,14 @@ export class BookingPricingService {
       const label = await this.containerTypeLabel(container.containerTypeId);
       if (!rate && !frozen) {
         // Never price this line off another container type's (or another
-        // route's) rate — an unpriced line with a warning is recoverable; a
-        // silently mischarged one is not.
-        warnings.push(
+        // route's) rate, and never let an unpriced line through: a booking
+        // that ships a container type nobody configured a rate for would be
+        // carried for free. Hard-block instead — the customer drops the line
+        // or EDR configures the rate.
+        blocked.push(
           `No ${rateType} rate is configured for ${label} on this route — ` +
-            'the line was not priced.',
+            `the booking cannot be priced. Remove the ${label} line or ask EDR ` +
+            'to configure its rate for this origin → destination.',
         );
         continue;
       }
@@ -587,10 +642,18 @@ export class BookingPricingService {
           quantity: this.effectiveUnitQuantity(fallback.rateUnit, quantity, wagonCount),
           currency: paymentCurrency,
         });
+      } else if (isBulk) {
+        // Same rule as container lines: bulk freight with no rate on this leg
+        // must not proceed unpriced.
+        blocked.push(
+          `No ${rateType} rate is configured for this route — the booking ` +
+            'cannot be priced. Ask EDR to configure the rate for this ' +
+            'origin → destination.',
+        );
       }
     }
 
-    return { lineItems: lines, usedRates: [...usedRatesMap.values()], warnings };
+    return { lineItems: lines, usedRates: [...usedRatesMap.values()], warnings, blocked };
   }
 
   /**
@@ -863,6 +926,191 @@ export class BookingPricingService {
     return this.frozenRateByCode(frozenRates, `CONTAINER_${sizeFt}FT`, bookingCurrency);
   }
 
+  /**
+   * Customs clearance service fee lines for a customs booking (Path B), billed
+   * with the freight. Container bookings bill each container line at its own
+   * container type's fee — PER_CONTAINER × boxes or PER_WAGON × the wagons the
+   * line occupies (two 20ft share one). Bulk bookings bill the route's type-less
+   * fee — PER_TON × tonnage or PER_WAGON × wagons the bulk occupies. Frozen
+   * contract snapshots (CUSTOMS_CLEARANCE_20FT / _40FT / CUSTOMS_CLEARANCE)
+   * win over live rates; contracts frozen before the per-kind model carry one
+   * FLAT CUSTOMS_CLEARANCE snapshot, honoured once for the whole booking.
+   */
+  private async customsClearanceLines(
+    booking: Booking,
+    frozenRates: Map<string, ContractRateSnapshot> | null,
+    liveRates: Rate[],
+  ): Promise<{ lineItems: PriceLineItemDto[]; usedRates: Rate[]; blocked: string[] }> {
+    const lineItems: PriceLineItemDto[] = [];
+    const usedRates: Rate[] = [];
+    const blocked: string[] = [];
+    const currency = booking.paymentCurrency;
+    const isEtb = currency === 'ETB';
+    const usdToEtb = isEtb ? await this.exchangeService.getRate('USD', 'ETB') : 1;
+    const convert = (usd: number): number => (isEtb ? Math.round(usd * usdToEtb) : usd);
+
+    const onLeg = liveRates.filter(
+      (r) =>
+        r.rateType === 'CUSTOMS_CLEARANCE' &&
+        r.currency === 'USD' &&
+        r.tradeDirection === booking.tradeDirection &&
+        r.originYardId === booking.originYardId &&
+        r.destinationYardId === booking.destinationYardId,
+    );
+    const missingRateMessage = (scope: string): string =>
+      `No customs clearance service fee is configured for ${scope} on this ` +
+      'origin → destination. Ask EDR to configure the CUSTOMS_CLEARANCE rate for this route.';
+
+    if (booking.freightType === 'CONTAINER') {
+      // Legacy short-circuit: an old contract froze one flat fee — bill it once.
+      const hasPerSizeSnapshot =
+        frozenRates?.has('CUSTOMS_CLEARANCE_20FT') ||
+        frozenRates?.has('CUSTOMS_CLEARANCE_40FT');
+      const legacyFlat = this.frozenRateByCode(frozenRates, 'CUSTOMS_CLEARANCE', currency);
+      if (legacyFlat && !hasPerSizeSnapshot) {
+        const amount = Number(legacyFlat.unitPrice);
+        if (amount > 0) {
+          lineItems.push({
+            code: 'CUSTOMS_CLEARANCE',
+            description: 'Customs clearance service',
+            amount,
+            unitAmount: amount,
+            unit: 'FLAT',
+            quantity: 1,
+            currency,
+          });
+        }
+        return { lineItems, usedRates, blocked };
+      }
+
+      for (const bc of booking.bookingContainers ?? []) {
+        if (!bc.containerTypeId) continue;
+        const qty = Number(bc.quantity || 0);
+        if (!(qty > 0)) continue;
+        let sizeFt = 0;
+        try {
+          sizeFt =
+            Number((await this.containerTypesService.findById(bc.containerTypeId)).sizeFt) || 0;
+        } catch {
+          // unknown type — falls through to the live per-type lookup below
+        }
+        const frozen = sizeFt
+          ? this.frozenRateByCode(frozenRates, `CUSTOMS_CLEARANCE_${sizeFt}FT`, currency)
+          : null;
+        const live = onLeg.find((r) => r.containerTypeId === bc.containerTypeId);
+        if (!frozen && !live) {
+          blocked.push(missingRateMessage(`${sizeFt || '?'}ft containers`));
+          continue;
+        }
+        const unit = frozen
+          ? this.rateUnitFromSnapshot(frozen.unitOfMeasure)
+          : live!.rateUnit;
+        const unitAmount = frozen
+          ? Number(frozen.unitPrice)
+          : convert(Number(live!.rateValue));
+        const billedQty =
+          unit === 'PER_WAGON' ? Math.ceil(qty * wagonsPerUnitForSize(sizeFt)) : qty;
+        const amount = unit === 'FLAT' ? unitAmount : unitAmount * billedQty;
+        if (!(amount > 0)) continue;
+        lineItems.push({
+          code: sizeFt ? `CUSTOMS_CLEARANCE_${sizeFt}FT` : 'CUSTOMS_CLEARANCE',
+          description: `Customs clearance service${sizeFt ? ` (${sizeFt}ft)` : ''}`,
+          amount,
+          unitAmount,
+          unit,
+          quantity: unit === 'FLAT' ? 1 : billedQty,
+          currency,
+        });
+        if (live && !frozen) usedRates.push(live);
+      }
+      return { lineItems, usedRates, blocked };
+    }
+
+    // Bulk — one fee for the whole booking. The bulk snapshot and the legacy
+    // flat snapshot share the CUSTOMS_CLEARANCE code; both are the agreed fee.
+    // Live lookup: the rate scoped to the booking's commodity wins; a
+    // commodity-less rate (legacy) is the catch-all fallback.
+    const frozen = this.frozenRateByCode(frozenRates, 'CUSTOMS_CLEARANCE', currency);
+    const live =
+      (booking.cargoTypeId
+        ? onLeg.find(
+            (r) => !r.containerTypeId && r.cargoTypeId === booking.cargoTypeId,
+          )
+        : undefined) ?? onLeg.find((r) => !r.containerTypeId && !r.cargoTypeId);
+    if (!frozen && !live) {
+      blocked.push(missingRateMessage('bulk cargo'));
+      return { lineItems, usedRates, blocked };
+    }
+    const unit = frozen ? this.rateUnitFromSnapshot(frozen.unitOfMeasure) : live!.rateUnit;
+    const unitAmount = frozen ? Number(frozen.unitPrice) : convert(Number(live!.rateValue));
+    let billedQty = 1;
+    if (unit === 'PER_TON') {
+      billedQty = Math.max(0, Number(booking.cargoTotalWeightVgm ?? 0));
+    } else if (unit === 'PER_WAGON') {
+      const wagons = await this.bulkWagonCount(booking);
+      if (wagons == null) {
+        blocked.push(
+          'The bulk customs clearance fee is per wagon, but this cargo type has ' +
+            'no wagon type with a capacity configured — the wagon count cannot ' +
+            'be derived. Ask EDR to configure the cargo type’s wagon types.',
+        );
+        return { lineItems, usedRates, blocked };
+      }
+      billedQty = wagons;
+    }
+    const amount = unit === 'FLAT' ? unitAmount : unitAmount * billedQty;
+    if (amount > 0) {
+      lineItems.push({
+        code: 'CUSTOMS_CLEARANCE',
+        description: 'Customs clearance service (bulk)',
+        amount,
+        unitAmount,
+        unit,
+        quantity: unit === 'FLAT' ? 1 : billedQty,
+        currency,
+      });
+      if (live && !frozen) usedRates.push(live);
+    }
+    return { lineItems, usedRates, blocked };
+  }
+
+  /** Snapshot unit-of-measure → the rate unit the billing math applies. */
+  private rateUnitFromSnapshot(unitOfMeasure: string): string {
+    switch (unitOfMeasure) {
+      case 'per_wagon':
+        return 'PER_WAGON';
+      case 'per_ton':
+        return 'PER_TON';
+      case 'per_container':
+        return 'PER_CONTAINER';
+      default:
+        return 'FLAT';
+    }
+  }
+
+  /**
+   * Wagons a bulk booking occupies — ceil(tons ÷ rated capacity), using the
+   * largest-capacity wagon type its cargo type allows. Null when the chain is
+   * unconfigured (no cargo type, no wagon types, no capacity).
+   * ponytail: pricing-time estimate off the biggest allowed wagon; scheduling
+   * may stock a smaller type and use more wagons.
+   */
+  private async bulkWagonCount(booking: Booking): Promise<number | null> {
+    const tons = Number(booking.cargoTotalWeightVgm ?? 0);
+    if (!(tons > 0) || !booking.cargoTypeId) return null;
+    try {
+      const cargo = await this.cargoTypesService.findById(booking.cargoTypeId);
+      const capacity = Math.max(
+        0,
+        ...(cargo.wagonTypes ?? []).map((w) => Number(w.capacityTons) || 0),
+      );
+      if (!(capacity > 0)) return null;
+      return Math.max(1, Math.ceil(tons / capacity));
+    } catch {
+      return null;
+    }
+  }
+
   private lineItemsSignature(items: PriceLineItemDto[]): string {
     return JSON.stringify(
       [...items]
diff --git a/apps/edr-freight-api/src/modules/bookings/booking-transition.service.ts b/apps/edr-freight-api/src/modules/bookings/booking-transition.service.ts
index 1896034cc..ec6e466b2 100644
--- a/apps/edr-freight-api/src/modules/bookings/booking-transition.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-transition.service.ts
@@ -7,6 +7,7 @@ import {
   Logger,
   Optional,
 } from "@nestjs/common";
+import { OnEvent } from "@nestjs/event-emitter";
 
 import { BookingBatchService } from '../train-scheduling/booking-batch.service';
 import { eatDay } from '../train-scheduling/batch-window.util';
@@ -349,6 +350,22 @@ export class BookingTransitionService {
     return fresh;
   }
 
+  /**
+   * Import EDR last-mile: every handover signed + every truck departed ⇒ the
+   * warehouses module delivered the goods and asks the booking to complete.
+   * Best-effort — a booking already COMPLETED (or not yet in transit) just logs.
+   */
+  @OnEvent('import.handover.completed')
+  async onImportHandoverCompleted(payload: { bookingId: string }): Promise<void> {
+    try {
+      await this.complete(payload.bookingId);
+    } catch (err) {
+      this.logger.log(
+        `Booking ${payload.bookingId} not auto-completed on handover sign: ${(err as Error).message}`,
+      );
+    }
+  }
+
   async complete(bookingId: string): Promise<Booking> {
     const booking = await this.bookingsService.findById(bookingId);
     assertBookingStatus(booking, ["IN_TRANSIT", "ARRIVED"]);
@@ -588,11 +605,6 @@ export class BookingTransitionService {
     files: Express.Multer.File[],
   ): Promise<Booking> {
     const booking = await this.bookingsService.findById(bookingId);
-    if (booking.status === "AWAITING_CLEARANCE_PAYMENT") {
-      throw new ConflictException(
-        "The customs clearance service fee for this shipment has not been paid yet — pay it from the portal to unlock document upload.",
-      );
-    }
     assertBookingStatus(booking, [
       "AWAITING_DOCUMENTS",
       "DOCUMENTS_UNDER_REVIEW",
diff --git a/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts b/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
index bc8c80982..c292a0395 100644
--- a/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
@@ -252,8 +252,11 @@ export class BookingsController {
     return this.bookingsService.findAll(filter, companyId);
   }
 
+  // Powers the customer-detail bookings tab, so `customers:view` reaches it too
+  // — otherwise a staffer granted only the customer permission gets a page whose
+  // tabs 403 individually.
   @Get("by-company/:companyId/customer-view")
-  @BookingView()
+  @BookingStaff([FREIGHT_PERMS.customers.view, FREIGHT_PERMS.bookings.view])
   @ApiOperation({
     summary: "List bookings for a company (customer-view shape, backoffice)",
   })
@@ -436,18 +439,26 @@ export class BookingsController {
   }
 
   @Get(':id/customer-truck-assignment/freight-order')
-  @ApiOperation({ summary: 'Download duplicate freight order copies for customer truck assignment' })
+  @ApiOperation({
+    summary:
+      'Download freight order copies. The 2 gate copies always print; ?copies=1,2,8 adds waybill-style copies (catalog indexes 1-8).',
+  })
   async customerTruckFreightOrder(
     @Param('id', ParseUUIDPipe) id: string,
     @CurrentUser() user: TCurrentUser,
     @Res() res: Response,
+    @Query('copies') copies?: string,
   ) {
     const booking = await this.bookingsService.findById(id);
     if (!hasFreightPermission(user, FREIGHT_PERMS.bookings.view)) {
       await this.bookingsService.assertCustomerCanAccessBooking(user?.id, booking);
     }
+    const extraCopyIndexes = (copies ?? '')
+      .split(',')
+      .map((n) => Number(n.trim()))
+      .filter((n) => Number.isInteger(n) && n >= 1 && n <= 8);
     const { filename, buffer } =
-      await this.bookingsService.customerTruckFreightOrderCopies(id);
+      await this.bookingsService.customerTruckFreightOrderCopies(id, extraCopyIndexes);
     res.setHeader('Content-Type', 'application/pdf');
     res.setHeader('Content-Disposition', `attachment; filename="${filename}"`);
     res.send(buffer);
@@ -480,6 +491,20 @@ export class BookingsController {
     return this.customerTruckService.addTruck(id, dto);
   }
 
+  @Post(':id/customer-trucks/bulk')
+  @ApiOperation({ summary: 'Bulk add customer trucks from array payload (Excel parsed)' })
+  async bulkAddCustomerTrucks(
+    @Param('id', ParseUUIDPipe) id: string,
+    @Body() payload: { trucks: AddCustomerTruckDto[] },
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    const booking = await this.bookingsService.findById(id);
+    if (!hasFreightPermission(user, FREIGHT_PERMS.bookings.view)) {
+      await this.bookingsService.assertCustomerCanAccessBooking(user?.id, booking);
+    }
+    return this.customerTruckService.addBulkTrucks(id, payload.trucks);
+  }
+
   @Patch(':id/customer-trucks/:assignmentId')
   @ApiOperation({ summary: 'Edit a not-yet-arrived customer truck (plate/driver/type + containers)' })
   async updateCustomerTruck(
diff --git a/apps/edr-freight-api/src/modules/bookings/bookings.service.ts b/apps/edr-freight-api/src/modules/bookings/bookings.service.ts
index d9dd53f94..d40433f4e 100644
--- a/apps/edr-freight-api/src/modules/bookings/bookings.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/bookings.service.ts
@@ -12,7 +12,6 @@ import { Freight, SchedulingStatus } from '@edr/types';
 import { insertWithGeneratedReference } from '@edr/api-common';
 // import { CustomersService } from '../customers/customers.service';
 import { CompaniesService } from '../companies/companies.service';
-import { ProfileType } from '../companies/entities/company-profile.entity';
 import { CompanyKind, CompanyStatus } from '../companies/entities/company.entity';
 import { TrainSchedulingService } from '../train-scheduling/train-scheduling.service';
 import { eatDay } from '../train-scheduling/batch-window.util';
@@ -143,8 +142,21 @@ export class BookingsService {
     return this.findById(bookingId);
   }
 
+  /** Selectable freight-order copies (rail-waybill style). Indexes 1-8. */
+  static readonly FREIGHT_ORDER_EXTRA_COPIES = [
+    'Original 1 (for Issuing Carrier)',
+    'Original 2 (for Consignee)',
+    'Original 3 (for Shipper)',
+    'Copy 4 (Delivery Receipt)',
+    'Copy 5 (Extra Copy)',
+    'Copy 6 (Extra Copy)',
+    'Copy 7 (Extra Copy)',
+    'Copy 8 (for Agent)',
+  ] as const;
+
   async customerTruckFreightOrderCopies(
     bookingId: string,
+    extraCopyIndexes: number[] = [],
   ): Promise<{ filename: string; buffer: Buffer }> {
     const booking = await this.findById(bookingId);
     if (!booking.customerTruckAssignedAt) {
@@ -172,7 +184,12 @@ export class BookingsService {
       [bookingId],
     );
 
-    const html = this.buildCustomerTruckFreightOrderHtml(booking, trucks);
+    // The 2 gate copies are ALWAYS printed; the waybill-style copies are
+    // whatever the customer ticked (indexes into the fixed catalog).
+    const extraCopies = [...new Set(extraCopyIndexes)]
+      .map((i) => BookingsService.FREIGHT_ORDER_EXTRA_COPIES[i - 1])
+      .filter(Boolean);
+    const html = this.buildCustomerTruckFreightOrderHtml(booking, trucks, extraCopies);
     // Chromium when available; otherwise the styled tabular fallback (never the
     // generic text dump — the freight order is an outward-facing gate document).
     const buffer = await this.pdfRender.htmlToPdfBuffer(html, {
@@ -269,6 +286,7 @@ export class BookingsService {
       arrivedAt: string | null;
       containers: string | null;
     }>,
+    extraCopies: string[] = [],
   ): string {
     const esc = (v: unknown) => this.escapeHtml(String(v ?? '-'));
     const assignedAt = booking.customerTruckAssignedAt
@@ -387,6 +405,7 @@ export class BookingsService {
         <body>
           ${copy('Copy 1: Port Operations Copy')}
           ${copy('Copy 2: Gate Security & Carrier Copy')}
+          ${extraCopies.map((label) => copy(label)).join('')}
         </body>
       </html>`;
   }
@@ -423,6 +442,8 @@ export class BookingsService {
     isReefer?: boolean;
     isGovernment?: boolean;
     shippingLineId?: string | null;
+    originYardId?: string | null;
+    destinationYardId?: string | null;
     bulkTons?: number;
     containers: CreateBookingContainerDto[];
   }): Promise<BookingEvaluationInput> {
@@ -468,6 +489,8 @@ export class BookingsService {
       isGovernment: dto.isGovernment ?? false,
       allowConsolidation,
       shippingLineId: dto.shippingLineId,
+      originYardId: dto.originYardId ?? null,
+      destinationYardId: dto.destinationYardId ?? null,
       totalWagons,
       bulkTons: dto.freightType === 'BULK' ? Number(dto.bulkTons ?? 0) : 0,
       containers,
@@ -635,12 +658,9 @@ export class BookingsService {
         );
       }
       const { company } = await this.companiesService.getCompanyInfoByUserId(userId);
-      // A customer can only book once their company has been approved.
-      if (company.status !== CompanyStatus.Active) {
-        throw new ForbiddenException(
-          "Your company is awaiting approval — you can't create bookings yet.",
-        );
-      }
+      // A customer can only book once their company has been approved; the
+      // helper names the real status (suspended/blacklisted) when it isn't.
+      this.companiesService.assertCompanyActiveFor(company, 'bookings');
       companyId = company.id;
     }
 
@@ -746,21 +766,13 @@ export class BookingsService {
         );
       companyProfileId = profile.id;
     } else if (companyId) {
-      let fallbackType: ProfileType | null = null;
-      if (userId) {
-        try {
-          const { profile } =
-            await this.companiesService.getCompanyInfoByUserId(userId);
-          fallbackType = profile.activeProfileType ?? null;
-        } catch {
-          // No profile (e.g. staff creating on behalf) — fall back to mapping.
-        }
-      }
+      // No explicit profile pin: resolve from the booking's trade direction
+      // (import→importer, export→exporter; otherwise the first profile). A
+      // forwarder booking sends dto.companyProfileId and takes the branch above.
       companyProfileId =
         await this.companiesService.resolveCompanyProfileIdForBooking(
           companyId,
           tradeDirection,
-          fallbackType,
         );
 
       // A customer booking under their own account may only do so once the
@@ -800,6 +812,8 @@ export class BookingsService {
       isReefer: dto.isReefer,
       isGovernment,
       shippingLineId: dto.shippingLineId,
+      originYardId: dto.originYardId,
+      destinationYardId: dto.destinationYardId,
       bulkTons: dto.cargoTotalWeightVgm,
       containers,
     });
@@ -1010,6 +1024,8 @@ export class BookingsService {
       isHazardous: dto.isHazardous ?? existing.isHazardous,
       isReefer: dto.isReefer ?? existing.isReefer,
       shippingLineId: dto.shippingLineId ?? existing.shippingLineId ?? undefined,
+      originYardId: dto.originYardId ?? existing.originYardId,
+      destinationYardId: dto.destinationYardId ?? existing.destinationYardId,
       bulkTons: dto.cargoTotalWeightVgm ?? Number(existing.cargoTotalWeightVgm ?? 0),
       containers,
     });
@@ -1068,9 +1084,6 @@ export class BookingsService {
         await this.companiesService.resolveCompanyProfileIdForBooking(
           existing.companyId,
           tradeDirection,
-          existing.companyProfileId
-            ? undefined
-            : (existing.companyProfile?.type as ProfileType | undefined),
         );
     }
     if (dto.scheduledDate) updates.scheduledDate = new Date(dto.scheduledDate);
@@ -1228,9 +1241,9 @@ export class BookingsService {
 
   /**
    * Batched version of the findById flag: marks each page item whose booking
-   * has a generated-but-unsigned SELF_HAUL handover, so list rows (portal
-   * dashboard) can show "Approve delivery" for exactly the generated→signed
-   * window. One query for the whole page.
+   * has a generated-but-unsigned handover (self-haul or EDR last-mile), so list
+   * rows (portal dashboard) can show "Approve delivery" for exactly the
+   * generated→signed window. One query for the whole page.
    */
   private async attachHandoverFlags(bookings: Booking[]): Promise<void> {
     const ids = bookings.map((b) => b.id);
@@ -1239,8 +1252,7 @@ export class BookingsService {
       `SELECT DISTINCT booking_id AS "bookingId"
          FROM freight.booking_handovers
         WHERE booking_id = ANY($1::uuid[])
-          AND signed_at IS NULL AND deleted_at IS NULL
-          AND mile_type = 'SELF_HAUL'`,
+          AND signed_at IS NULL AND deleted_at IS NULL`,
       [ids],
     );
     const pending = new Set(rows.map((r) => r.bookingId));
@@ -1392,15 +1404,6 @@ export class BookingsService {
     }
   }
 
-  /**
-   * Resolve the active company_profile id a customer's bookings should be
-   * scoped to (importer/exporter mode). Null when not onboarded — callers fall
-   * back to company-level scoping.
-   */
-  async resolveActiveCompanyProfileId(userId: string): Promise<string | null> {
-    return this.companiesService.resolveActiveCompanyProfileId(userId);
-  }
-
   /**
    * Authorize a customer's access to a single booking. Staff are scoped at the
    * controller (they pass `isStaff`); for a customer, the booking must belong
@@ -1583,14 +1586,12 @@ export class BookingsService {
         schedule?.status ?? null;
     }
 
-    // A generated-but-unsigned SELF_HAUL handover means the customer must approve
-    // delivery from the portal (booking-based, one per booking). EDR last-mile
-    // handovers are per delivering truck and signed by the receiver at the door,
-    // so they never surface the portal "Approve delivery" action.
+    // A generated-but-unsigned handover means the customer must approve delivery
+    // from the portal. Self-haul: booking-based, one per booking. EDR last-mile:
+    // per delivering truck (generated on truck exit), signed one by one.
     const [pendingHandover] = await this.dataSource.query(
       `SELECT 1 FROM freight.booking_handovers
         WHERE booking_id = $1 AND signed_at IS NULL AND deleted_at IS NULL
-          AND mile_type = 'SELF_HAUL'
         LIMIT 1`,
       [id],
     );
diff --git a/apps/edr-freight-api/src/modules/bookings/customer-truck.service.ts b/apps/edr-freight-api/src/modules/bookings/customer-truck.service.ts
index eb4699008..4ca578f0b 100644
--- a/apps/edr-freight-api/src/modules/bookings/customer-truck.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/customer-truck.service.ts
@@ -576,4 +576,35 @@ export class CustomerTruckService {
   }
 
   /** Contract container sizes (e.g. "20ft" / "40ft") for the given container numbers. */
+
+  async addBulkTrucks(
+    bookingId: string,
+    dtos: AddCustomerTruckDto[],
+  ): Promise<{
+    success: number;
+    failed: number;
+    errors: Array<{ row: number; truck: string; reason: string }>;
+  }> {
+    const errors: Array<{ row: number; truck: string; reason: string }> = [];
+    let successCount = 0;
+
+    for (let i = 0; i < dtos.length; i++) {
+      try {
+        await this.addTruck(bookingId, dtos[i]);
+        successCount++;
+      } catch (err: any) {
+        errors.push({
+          row: i + 2, // Row 1 is header
+          truck: dtos[i].truckPlateNumber,
+          reason: err.message || 'Unknown error',
+        });
+      }
+    }
+
+    return {
+      success: successCount,
+      failed: errors.length,
+      errors,
+    };
+  }
 }
diff --git a/apps/edr-freight-api/src/modules/bookings/dto/bulk-customer-truck.dto.ts b/apps/edr-freight-api/src/modules/bookings/dto/bulk-customer-truck.dto.ts
new file mode 100644
index 000000000..5e03c7bc4
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/bookings/dto/bulk-customer-truck.dto.ts
@@ -0,0 +1,48 @@
+import { IsString, IsNotEmpty, IsIn, IsArray, ArrayMaxSize, ArrayUnique, Matches, IsOptional } from 'class-validator';
+import { CUSTOMER_TRUCK_TYPES } from './customer-truck-assignment.dto';
+
+export class BulkCustomerTruckRow {
+  @IsString()
+  @IsNotEmpty()
+  truckPlateNumber!: string;
+
+  @IsString()
+  @IsNotEmpty()
+  driverName!: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @IsIn(CUSTOMER_TRUCK_TYPES)
+  truckType!: string;
+
+  @IsOptional()
+  @IsArray()
+  @ArrayMaxSize(2)
+  @ArrayUnique()
+  @Matches(/^[A-Z]{4}\d{7}$/, {
+    each: true,
+    message: 'each container must be ISO format (e.g. ABCD1234567)',
+  })
+  containerNumbers?: (string | null)[];
+}
+
+export class BulkCustomerTrucksDto {
+  @IsArray()
+  @ArrayMaxSize(100)
+  trucks!: BulkCustomerTruckRow[];
+}
+
+export interface BulkTruckUploadResult {
+  success: number;
+  failed: number;
+  errors: Array<{
+    row: number;
+    truck: string;
+    reason: string;
+  }>;
+  created: Array<{
+    truckPlateNumber: string;
+    driverName: string;
+    containers: number;
+  }>;
+}
diff --git a/apps/edr-freight-api/src/modules/bookings/entities/booking.entity.ts b/apps/edr-freight-api/src/modules/bookings/entities/booking.entity.ts
index 2aa3ee8c2..821b9c9f6 100644
--- a/apps/edr-freight-api/src/modules/bookings/entities/booking.entity.ts
+++ b/apps/edr-freight-api/src/modules/bookings/entities/booking.entity.ts
@@ -45,7 +45,6 @@ export const BOOKING_STATUSES = [
   'CONTRACT_ACTIVE',
   'CONTRACT_CLOSED',
   // Post counter-sign document-clearance gate (GL workflow).
-  'AWAITING_CLEARANCE_PAYMENT', // clearance fee invoiced, unpaid — docs locked
   'AWAITING_DOCUMENTS',
   'DOCUMENTS_UNDER_REVIEW',
   'CLEARANCE_READY',
@@ -521,10 +520,6 @@ export class Booking extends BaseEntity {
   @Column({ name: 'clearance_current_phase', type: 'varchar', length: 40, nullable: true })
   clearanceCurrentPhase?: string | null;
 
-  /** When the prepaid customs clearance service fee settled (GENERAL + customs). */
-  @Column({ name: 'clearance_fee_paid_at', type: 'timestamptz', nullable: true })
-  clearanceFeePaidAt?: Date | null;
-
   @Column({ name: 'duty_required', type: 'boolean', nullable: true })
   dutyRequired?: boolean | null;
 
diff --git a/apps/edr-freight-api/src/modules/cargoes/cargoes.controller.ts b/apps/edr-freight-api/src/modules/cargoes/cargoes.controller.ts
index 7f3f06ec2..ac3adb7e8 100644
--- a/apps/edr-freight-api/src/modules/cargoes/cargoes.controller.ts
+++ b/apps/edr-freight-api/src/modules/cargoes/cargoes.controller.ts
@@ -11,6 +11,7 @@ import {
 } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { FleetManage, FleetView } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { CreateCargoDto } from './dto/create-cargo.dto';
 import { UpdateCargoDto } from './dto/update-cargo.dto';
 import { LoadCargoDto } from './dto/load-cargo.dto';
@@ -19,12 +20,12 @@ import { CargoesService } from './cargoes.service';
 
 @ApiTags('cargoes')
 @Controller('cargoes')
-@FleetView()
+@FleetView(FREIGHT_PERMS.cargoes.view)
 export class CargoesController {
   constructor(private readonly cargoesService: CargoesService) {}
 
   @Post()
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.cargoes.create)
   @ApiOperation({ summary: 'Create a new cargo' })
   create(@Body() dto: CreateCargoDto) {
     return this.cargoesService.create(dto);
@@ -43,35 +44,35 @@ export class CargoesController {
   }
 
   @Patch(':id')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.cargoes.update)
   @ApiOperation({ summary: 'Update a cargo' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateCargoDto) {
     return this.cargoesService.update(id, dto);
   }
 
   @Delete(':id')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.cargoes.delete)
   @ApiOperation({ summary: 'Delete a cargo' })
   remove(@Param('id', ParseUUIDPipe) id: string) {
     return this.cargoesService.remove(id);
   }
 
   @Post(':id/load')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.cargoes.update)
   @ApiOperation({ summary: 'Load cargo into a container' })
   load(@Param('id', ParseUUIDPipe) id: string, @Body() dto: LoadCargoDto) {
     return this.cargoesService.loadCargo(id, dto);
   }
 
   @Post(':id/unload')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.cargoes.update)
   @ApiOperation({ summary: 'Unload cargo from container' })
   unload(@Param('id', ParseUUIDPipe) id: string) {
     return this.cargoesService.unloadCargo(id);
   }
 
   @Post(':id/deliver')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.cargoes.update)
   @ApiOperation({ summary: 'Mark cargo as delivered' })
   deliver(@Param('id', ParseUUIDPipe) id: string, @Body() dto?: DeliverCargoDto) {
     return this.cargoesService.deliverCargo(id, dto);
diff --git a/apps/edr-freight-api/src/modules/companies/companies.controller.ts b/apps/edr-freight-api/src/modules/companies/companies.controller.ts
index 6111bd32a..8e3be4d1a 100644
--- a/apps/edr-freight-api/src/modules/companies/companies.controller.ts
+++ b/apps/edr-freight-api/src/modules/companies/companies.controller.ts
@@ -11,13 +11,22 @@ import {
   HttpCode,
   HttpStatus,
   UseInterceptors,
+  UseGuards,
   UploadedFiles,
   BadRequestException,
+  NotFoundException,
 } from "@nestjs/common";
 import { AnyFilesInterceptor } from "@nestjs/platform-express";
 import { ApiOperation, ApiTags, ApiConsumes } from "@nestjs/swagger";
 import { CurrentUser } from "@edr/api-common";
-import { FreightAdmin } from "../../common/booking-guards";
+import type { TCurrentUser } from "@tria-plc/api-common/modules/auth/types/current-user.type";
+import { JwtGuard } from "@tria-plc/api-common/modules/auth/services/jwt.guard";
+import { BookingStaff } from "../../common/booking-guards";
+import {
+  assertFreightPermission,
+  hasFreightPermission,
+} from "../../common/freight-permission.util";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import { FilesService } from "../files/files.service";
 import { CompaniesService } from "./companies.service";
 import { CreateCompanyDto } from "./dto/create-company.dto";
@@ -26,7 +35,6 @@ import { CreateExternalProfileDto } from "./dto/create-external-profile.dto";
 import { CreateCompanyWithProfileDto } from "./dto/create-company-with-profile.dto";
 import { AddCompanyProfilesDto } from "./dto/add-company-profiles.dto";
 import { CreateCompanyProfileDto } from "./dto/create-company-profile.dto";
-import { SetActiveModeDto } from "./dto/set-active-mode.dto";
 import { SetOnboardingStepDto } from "./dto/set-onboarding-step.dto";
 import { StartOnboardingDto } from "./dto/start-onboarding.dto";
 import { DashboardQueryDto } from "./dto/dashboard-query.dto";
@@ -60,6 +68,23 @@ interface CurrentIamUser {
   phoneNumber?: string;
 }
 
+/**
+ * Which permission a status write needs. Approving/reactivating is a different
+ * authority from suspending, but both arrive on the same route with the target
+ * in the BODY — a route-level guard can't tell them apart, so the handlers
+ * assert against this map instead.
+ *
+ * Keyed by string so it serves both `CompanyStatus` and `ProfileStatus`
+ * (a superset: it adds `rejected`).
+ */
+const STATUS_PERM: Record<string, string> = {
+  active: FREIGHT_PERMS.customers.verify,
+  pending: FREIGHT_PERMS.customers.verify,
+  rejected: FREIGHT_PERMS.customers.verify,
+  suspended: FREIGHT_PERMS.customers.deactivate,
+  blacklisted: FREIGHT_PERMS.customers.deactivate,
+};
+
 @ApiTags("Companies")
 @Controller("companies")
 export class CompaniesController {
@@ -353,21 +378,6 @@ export class CompaniesController {
     return this.companiesService.removePoaDelegationLetter(user.id, fileId);
   }
 
-  @Patch("active-mode")
-  @ApiOperation({
-    summary: "Switch the current user's active operational mode (importer/exporter)",
-  })
-  async setActiveMode(
-    @CurrentUser() user: CurrentIamUser,
-    @Body() dto: SetActiveModeDto,
-  ): Promise<CompanyInfoResponseDto> {
-    const { profile, company } = await this.companiesService.setActiveMode(
-      user.id,
-      dto.type,
-    );
-    return new CompanyInfoResponseDto(profile, company);
-  }
-
   @Patch("onboarding-step")
   @ApiOperation({ summary: "Persist the user's current onboarding wizard step" })
   @HttpCode(HttpStatus.NO_CONTENT)
@@ -426,7 +436,7 @@ export class CompaniesController {
 
   // Used by backoffice
   @Post()
-  @FreightAdmin()
+  @BookingStaff(FREIGHT_PERMS.customers.create)
   @ApiOperation({
     summary:
       "Create a new company (customer, freight_forwarder, dj_freight_forwarder, transporter)",
@@ -437,12 +447,14 @@ export class CompaniesController {
   }
 
   @Get("stats")
+  @BookingStaff(FREIGHT_PERMS.customers.view)
   @ApiOperation({ summary: "Company counts by status (KPI strip)" })
   async getStats(): Promise<CompanyStatsResponseDto> {
     return this.companiesService.getCompanyStats();
   }
 
   @Get()
+  @BookingStaff(FREIGHT_PERMS.customers.view)
   @ApiOperation({ summary: "List companies (paginated, filterable)" })
   async findAll(
     @Query() query: ListCompaniesQueryDto,
@@ -452,6 +464,7 @@ export class CompaniesController {
   }
 
   @Get(":id")
+  @BookingStaff(FREIGHT_PERMS.customers.view)
   @ApiOperation({ summary: "Get company by ID" })
   async findById(
     @Param("id", ParseUUIDPipe) id: string,
@@ -462,30 +475,77 @@ export class CompaniesController {
     return dto;
   }
 
+  /**
+   * Edits fields AND carries `status`, so it spans two authorities. The route
+   * guard is one-of (a status-only caller must get in); the asserts below are
+   * what actually authorize: touching `status` needs the permission
+   * {@link STATUS_PERM} maps it to, touching anything else needs
+   * `customers:update`. Both checks are required — without the second, a
+   * caller holding only `customers:deactivate` could rename the company.
+   */
   @Patch(":id")
-  @FreightAdmin()
+  @BookingStaff([
+    FREIGHT_PERMS.customers.update,
+    FREIGHT_PERMS.customers.verify,
+    FREIGHT_PERMS.customers.deactivate,
+  ])
   @ApiOperation({ summary: "Update a company" })
   async update(
     @Param("id", ParseUUIDPipe) id: string,
     @Body() dto: UpdateCompanyDto,
+    @CurrentUser() user: TCurrentUser,
   ): Promise<ResponseCompanyDto> {
+    const { status, ...fields } = dto;
+    if (status) assertFreightPermission(user, STATUS_PERM[status]);
+    if (Object.keys(fields).length > 0) {
+      assertFreightPermission(user, FREIGHT_PERMS.customers.update);
+    }
     const company = await this.companiesService.updateCompany(id, dto);
     return new ResponseCompanyDto(company);
   }
 
   @Delete(":id")
-  @FreightAdmin()
+  @BookingStaff(FREIGHT_PERMS.customers.deactivate)
   @ApiOperation({ summary: "Soft-delete a company" })
   @HttpCode(HttpStatus.NO_CONTENT)
   async remove(@Param("id", ParseUUIDPipe) id: string): Promise<void> {
     await this.companiesService.deleteCompany(id);
   }
 
+  /**
+   * Dual-audience: staff read any customer's documents, and the portal reads
+   * its OWN during onboarding (`companiesService.getDocuments`). So the route
+   * is authenticated-only and the split happens here — same shape as
+   * `GET /contracts/:id`. Gating it on a staff permission alone would 403 every
+   * customer on their own documents.
+   *
+   * The staff arm is one-of because two pages consume it: the customer detail
+   * page (`customers:view`) and the contract-request detail page, whose route
+   * is gated on `contracts:view` — a contract reviewer without the customer
+   * permission still needs the applicant's documents.
+   */
   @Get(":companyId/documents")
+  @UseGuards(JwtGuard)
   @ApiOperation({ summary: "List documents uploaded for a company" })
   async listDocuments(
     @Param("companyId", ParseUUIDPipe) companyId: string,
+    @CurrentUser() user: TCurrentUser,
   ) {
+    const isStaff = [
+      FREIGHT_PERMS.customers.view,
+      FREIGHT_PERMS.contracts.view,
+      FREIGHT_PERMS.bookings.view,
+    ].some((p) => hasFreightPermission(user, p));
+
+    if (!isStaff) {
+      const { company } = await this.companiesService.getCompanyInfoByUserId(
+        user.id,
+      );
+      // Hidden as NotFound rather than Forbidden so company ids can't be probed.
+      if (company.id !== companyId) {
+        throw new NotFoundException(`Company ${companyId} not found`);
+      }
+    }
     const files = await this.filesService.findByResource(companyId, "companies");
     return Promise.all(
       files.map(async (f) => ({
@@ -506,7 +566,7 @@ export class CompaniesController {
   }
 
   @Post("documents/:fileId/request-change")
-  @FreightAdmin()
+  @BookingStaff(FREIGHT_PERMS.customers.verify)
   @ApiOperation({
     summary: "Ask the customer to correct one uploaded document",
     description:
@@ -548,14 +608,23 @@ export class CompaniesController {
     return this.companiesService.uploadCompanyDocuments(companyId, files, user.id);
   }
 
+  /**
+   * Approve / reject / suspend / blacklist all arrive here with the target in
+   * the body, so authorization is per-status via {@link STATUS_PERM} rather
+   * than on the route (the guard is only the one-of gate).
+   */
   @Patch("company-profiles/:profileId/status")
-  @FreightAdmin()
+  @BookingStaff([
+    FREIGHT_PERMS.customers.verify,
+    FREIGHT_PERMS.customers.deactivate,
+  ])
   @ApiOperation({ summary: "Update a company profile's approval status" })
   async updateCompanyProfileStatus(
-    @CurrentUser() user: CurrentIamUser,
+    @CurrentUser() user: TCurrentUser,
     @Param("profileId", ParseUUIDPipe) profileId: string,
     @Body() dto: UpdateCompanyProfileStatusDto,
   ): Promise<ResponseCompanyProfileDto> {
+    assertFreightPermission(user, STATUS_PERM[dto.status]);
     const profile = await this.companiesService.setCompanyProfileStatus(
       profileId,
       dto.status,
@@ -566,7 +635,7 @@ export class CompaniesController {
   }
 
   @Get(":companyId/change-requests")
-  @FreightAdmin()
+  @BookingStaff(FREIGHT_PERMS.customers.view)
   @ApiOperation({ summary: "List a company's profile change requests" })
   async listChangeRequests(
     @Param("companyId", ParseUUIDPipe) companyId: string,
@@ -576,7 +645,7 @@ export class CompaniesController {
   }
 
   @Post("change-requests/:id/approve")
-  @FreightAdmin()
+  @BookingStaff(FREIGHT_PERMS.customers.verify)
   @ApiOperation({
     summary: "Approve a pending profile change request (applies the changes)",
   })
@@ -592,7 +661,7 @@ export class CompaniesController {
   }
 
   @Post("change-requests/:id/reject")
-  @FreightAdmin()
+  @BookingStaff(FREIGHT_PERMS.customers.verify)
   @ApiOperation({
     summary: "Reject a pending profile change request with a note",
   })
@@ -610,7 +679,7 @@ export class CompaniesController {
   }
 
   @Post(":companyId/profiles")
-  @FreightAdmin()
+  @BookingStaff(FREIGHT_PERMS.customers.update)
   @ApiOperation({ summary: "Add a profile (employee) to a company" })
   async createProfile(
     @Param("companyId", ParseUUIDPipe) companyId: string,
@@ -624,6 +693,7 @@ export class CompaniesController {
   }
 
   @Get(":companyId/profiles")
+  @BookingStaff(FREIGHT_PERMS.customers.view)
   @ApiOperation({ summary: "List profiles for a company" })
   async listProfiles(
     @Param("companyId", ParseUUIDPipe) companyId: string,
@@ -634,6 +704,7 @@ export class CompaniesController {
   }
 
   @Get("profile/user/:userId")
+  @BookingStaff(FREIGHT_PERMS.customers.view)
   @ApiOperation({ summary: "Get profile by IAM user ID" })
   async findProfileByUser(
     @Param("userId", ParseUUIDPipe) userId: string,
diff --git a/apps/edr-freight-api/src/modules/companies/companies.repository.ts b/apps/edr-freight-api/src/modules/companies/companies.repository.ts
index 3ac12b11a..db8db0d2e 100644
--- a/apps/edr-freight-api/src/modules/companies/companies.repository.ts
+++ b/apps/edr-freight-api/src/modules/companies/companies.repository.ts
@@ -41,6 +41,18 @@ export class CompaniesRepository extends BaseRepository<Company> {
       AND ccr.deleted_at IS NULL
   )`;
 
+  /**
+   * The `sortBy = 'review'` queue ordering: whatever marketing must act on
+   * floats to the top. Tier 0 — submitted applications awaiting first approval
+   * (drafts excluded: nothing to review yet). Tier 1 — approved customers with
+   * a pending change request. Tier 2 — everyone else, drafts included.
+   */
+  private static readonly REVIEW_TIER_SQL = `(CASE
+    WHEN company.status = 'pending' AND NOT ${CompaniesRepository.DRAFT_SQL} THEN 0
+    WHEN ${CompaniesRepository.PENDING_CHANGE_REQUEST_SQL} THEN 1
+    ELSE 2
+  END)`;
+
   constructor(
     @InjectRepository(Company)
     repo: Repository<Company>,
@@ -80,8 +92,8 @@ export class CompaniesRepository extends BaseRepository<Company> {
       status,
       onboardingCompleted,
       hasPendingChangeRequest,
-      sortBy = 'name',
-      sortOrder = 'ASC',
+      sortBy = 'review',
+      sortOrder = 'DESC',
     } = query;
 
     const qb = this.repository
@@ -137,8 +149,18 @@ export class CompaniesRepository extends BaseRepository<Company> {
     }
 
     // sortBy is whitelisted by @IsIn on the DTO, so it is safe to interpolate.
+    if (sortBy === 'review') {
+      // Queue ordering: actionable tiers first, newest first within each. The
+      // tier is selected under an alias because skip/take pagination with
+      // joins re-derives the ORDER BY in a subquery — a raw expression there
+      // breaks, a selected alias survives.
+      qb.addSelect(CompaniesRepository.REVIEW_TIER_SQL, 'review_tier')
+        .orderBy('review_tier', 'ASC')
+        .addOrderBy('company.createdAt', 'DESC');
+    } else {
+      qb.orderBy(`company.${sortBy}`, sortOrder);
+    }
     const [items, total] = await qb
-      .orderBy(`company.${sortBy}`, sortOrder)
       // Names are not unique and createdAt can tie on bulk imports; the id
       // tiebreaker keeps paging stable instead of dropping/repeating rows.
       .addOrderBy('company.id', 'ASC')
diff --git a/apps/edr-freight-api/src/modules/companies/companies.service.ts b/apps/edr-freight-api/src/modules/companies/companies.service.ts
index df0e14998..3867bef3a 100644
--- a/apps/edr-freight-api/src/modules/companies/companies.service.ts
+++ b/apps/edr-freight-api/src/modules/companies/companies.service.ts
@@ -201,18 +201,6 @@ export class CompaniesService {
       attributes: dto.attributes ?? null,
     });
 
-    // Default active mode from the chosen role(s): importer wins when both are
-    // picked, otherwise the first allowed type chosen.
-    const allowedTypes = this.getProfileTypeForCompanyType(company.type);
-    const chosenTypes = (dto.companyProfiles ?? [])
-      .map((p) => p.type)
-      .filter((t) => allowedTypes.includes(t));
-    const activeProfileType =
-      chosenTypes.find((t) => t === ProfileType.importer) ??
-      chosenTypes[0] ??
-      allowedTypes[0] ??
-      null;
-
     const profile = await this.profilesRepo.create({
       userId: identity.userId,
       companyId: company.id,
@@ -220,7 +208,6 @@ export class CompaniesService {
       lastName: identity.lastName,
       jobTitle: dto.jobTitle ?? null,
       isPrimaryContact: dto.isPrimaryContact ?? true,
-      activeProfileType,
       onboardingStep: "company",
     });
 
@@ -293,11 +280,6 @@ export class CompaniesService {
 
     const allowedTypes = this.getProfileTypeForCompanyType(companyType);
     const chosenTypes = roles.filter((t) => allowedTypes.includes(t));
-    const activeProfileType =
-      chosenTypes.find((t) => t === ProfileType.importer) ??
-      chosenTypes[0] ??
-      allowedTypes[0] ??
-      null;
 
     const company = await this.companiesRepo.create({
       name: identity.firstName
@@ -316,7 +298,6 @@ export class CompaniesService {
       firstName: identity.firstName,
       lastName: identity.lastName,
       isPrimaryContact: true,
-      activeProfileType,
       onboardingStep: "company",
       onboardingCompleted: false,
     });
@@ -1090,6 +1071,23 @@ export class CompaniesService {
     if (!existing)
       throw new NotFoundException(`Company profile ${profileId} not found`);
 
+    // Suspension and reactivation must carry a staff explanation — the customer
+    // sees it, so "why" can never be left blank. Reactivation is the
+    // active-write that leaves Suspended; a first approval stays note-free.
+    const reactivating =
+      status === ProfileStatus.Active &&
+      existing.status === ProfileStatus.Suspended;
+    if (
+      (status === ProfileStatus.Suspended || reactivating) &&
+      !note?.trim()
+    ) {
+      throw new BadRequestException(
+        status === ProfileStatus.Suspended
+          ? "A message explaining the suspension is required — the customer will see it."
+          : "A message explaining the reactivation is required — the customer will see it.",
+      );
+    }
+
     // A self-registered company is only reviewable once its owner submits the
     // onboarding wizard (markOnboardingComplete) — until then its profiles are
     // half-filled drafts and approving one would mint a reference against an
@@ -1176,9 +1174,13 @@ export class CompaniesService {
       );
     }
 
-    // Track the review outcome. Rejection keeps the note so the customer knows
-    // why; approval clears it. Any decision stamps the reviewer + time.
-    if (status === ProfileStatus.Rejected) {
+    // Track the review outcome. Rejection and suspension keep the note so the
+    // customer knows why; approval/reactivation clears it. Any decision stamps
+    // the reviewer + time.
+    if (
+      status === ProfileStatus.Rejected ||
+      status === ProfileStatus.Suspended
+    ) {
       patch.reviewNote = note ?? null;
     } else if (status === ProfileStatus.Active) {
       patch.reviewNote = null;
@@ -1192,23 +1194,50 @@ export class CompaniesService {
     if (!updated)
       throw new NotFoundException(`Company profile ${existing.id} not found`);
 
-    // Approving any profile promotes a pending company to active, so the
-    // customer can start working as soon as their first profile is cleared.
-    if (status === ProfileStatus.Active) {
+    // Every reviewed transition that changes what the customer can do is told
+    // to them, carrying the staff message so they know why. Approval has no
+    // message (the note is cleared); the others require one.
+    const change =
+      status === ProfileStatus.Suspended
+        ? "suspended"
+        : status === ProfileStatus.Rejected
+          ? "rejected"
+          : status === ProfileStatus.Active
+            ? existing.status === ProfileStatus.Suspended
+              ? "reactivated"
+              : "approved"
+            : null;
+    if (change) {
       const company = await this.companiesRepo.findById(updated.companyId);
-      if (company && company.status === CompanyStatus.Pending) {
-        await this.companiesRepo.update(updated.companyId, {
-          status: CompanyStatus.Active,
-        });
+      if (company) {
+        this.companyNotifier.profileStatusChanged(
+          company,
+          updated.type,
+          change,
+          note ?? "",
+        );
+        // The first approved role promotes a pending company to active — a
+        // bigger event (the account itself goes live), so tell them that too.
+        if (
+          status === ProfileStatus.Active &&
+          company.status === CompanyStatus.Pending
+        ) {
+          await this.companiesRepo.update(updated.companyId, {
+            status: CompanyStatus.Active,
+          });
+          this.companyNotifier.companyApproved(company);
+        }
       }
     }
     return updated;
   }
 
   /**
-   * Customer reapplies for a rejected operational role (after fixing whatever the
-   * reviewer flagged, e.g. re-uploading a license): flip it back to Pending and
-   * clear the rejection note so it re-enters the approval queue.
+   * Customer reapplies for a rejected or suspended operational role (after
+   * fixing whatever the reviewer flagged, e.g. re-uploading a license): flip it
+   * back to Pending and clear the review note so it re-enters the approval
+   * queue. Suspension is a staff lockout, so resubmitting is an appeal — the
+   * backoffice still has to approve before the role goes live again.
    */
   async reapplyCompanyProfile(
     userId: string,
@@ -1223,9 +1252,12 @@ export class CompaniesService {
     if (!target || target.companyId !== companyId) {
       throw new NotFoundException(`Company profile ${profileId} not found`);
     }
-    if (target.status !== ProfileStatus.Rejected) {
+    if (
+      target.status !== ProfileStatus.Rejected &&
+      target.status !== ProfileStatus.Suspended
+    ) {
       throw new BadRequestException(
-        "Only a rejected role can be resubmitted for approval",
+        "Only a rejected or suspended role can be resubmitted for approval",
       );
     }
 
@@ -1349,10 +1381,9 @@ export class CompaniesService {
 
   /**
    * Create a single operational profile for the current user's company. The new
-   * role starts Pending, so it deliberately does NOT become the active mode:
-   * switching onto an unapproved profile would strip the user of `canBook` and
-   * block them from creating contracts under the role they already had approved.
-   * Callers switch explicitly via {@link setActiveMode} once the role is Active.
+   * role starts Pending and carries no reference until a backoffice reviewer
+   * approves it; a booking/contract resolves its profile from the trade
+   * direction at creation time, so no "active mode" is stored.
    */
   async createCompanyProfileForUser(
     userId: string,
@@ -1387,40 +1418,6 @@ export class CompaniesService {
     return created;
   }
 
-  /**
-   * Switch the user's active operational mode. The target profile must already
-   * exist — clients create it first via createCompanyProfileForUser.
-   */
-  async setActiveMode(
-    userId: string,
-    type: ProfileType,
-  ): Promise<{ profile: ExternalProfile; company: Company }> {
-    const profile = await this.profilesRepo.findByUserId(userId);
-    if (!profile)
-      throw new NotFoundException(`Profile for user ${userId} not found`);
-
-    const companyId = profile.company?.id ?? profile.companyId;
-    const company = await this.findCompanyById(companyId);
-
-    const allowedTypes = this.getProfileTypeForCompanyType(company.type);
-    if (!allowedTypes.includes(type)) {
-      throw new BadRequestException(
-        `Profile type "${type}" is not allowed for company type "${company.type}"`,
-      );
-    }
-
-    const existing = await this.companyProfilesRepo.findByType(companyId, type);
-    if (!existing) {
-      throw new ConflictException(
-        `No ${type} profile exists yet — create it before switching`,
-      );
-    }
-
-    await this.profilesRepo.update(profile.id, { activeProfileType: type });
-
-    return this.getCompanyInfoByUserId(userId);
-  }
-
   async setOnboardingStep(userId: string, step: string): Promise<void> {
     const profile = await this.profilesRepo.findByUserId(userId);
     if (!profile)
@@ -1611,21 +1608,68 @@ export class CompaniesService {
   }
 
   /**
-   * Block a customer from booking under a profile that isn't approved yet.
-   * Called from the booking-create path for self-service bookings; staff- and
-   * government-initiated bookings bypass this. No-op when the profile can't be
-   * found (defensive — resolution is best-effort upstream).
+   * Block a self-service action when the company account isn't active, naming
+   * the actual status — a suspended customer told "awaiting approval" has no
+   * idea what happened or who to call.
+   */
+  assertCompanyActiveFor(company: Company, action: string): void {
+    if (company.status === CompanyStatus.Active) return;
+    switch (company.status) {
+      case CompanyStatus.Suspended:
+        throw new ForbiddenException(
+          `Your company account is suspended — you can't create ${action} right now. ` +
+            `Please contact EDR support for details.`,
+        );
+      case CompanyStatus.Blacklisted:
+        throw new ForbiddenException(
+          `Your company account is blacklisted — you can't create ${action}. ` +
+            `Please contact EDR support.`,
+        );
+      default:
+        throw new ForbiddenException(
+          `Your company is awaiting approval — you can't create ${action} yet.`,
+        );
+    }
+  }
+
+  /**
+   * Block a customer from booking under a profile that isn't approved yet — or
+   * that a reviewer has since suspended. Called from the booking/contract
+   * create path for self-service actions; staff- and government-initiated ones
+   * bypass this. No-op when the profile can't be found (defensive — resolution
+   * is best-effort upstream). The message names the profile's real status:
+   * suspension in particular is per-role, so the customer must learn which
+   * operation is blocked (their other roles still work).
    */
   async assertCompanyProfileApprovedForBooking(
     companyProfileId: string,
   ): Promise<void> {
     const profile = await this.companyProfilesRepo.findById(companyProfileId);
     if (!profile) return;
-    if (profile.status !== ProfileStatus.Active) {
-      const role = profile.type.replace(/_/g, " ");
-      throw new ForbiddenException(
-        `Your ${role} profile is awaiting approval. You'll be able to create bookings once it has been approved.`,
-      );
+    if (profile.status === ProfileStatus.Active) return;
+
+    const role = profile.type.replace(/_/g, " ");
+    switch (profile.status) {
+      case ProfileStatus.Suspended:
+        throw new ForbiddenException(
+          `Your ${role} role is suspended${
+            profile.reviewNote ? ` — ${profile.reviewNote}` : ""
+          }. Your other roles are unaffected. Please contact EDR support to resolve this.`,
+        );
+      case ProfileStatus.Blacklisted:
+        throw new ForbiddenException(
+          `Your ${role} role is blacklisted. Please contact EDR support.`,
+        );
+      case ProfileStatus.Rejected:
+        throw new ForbiddenException(
+          `Your ${role} role was rejected${
+            profile.reviewNote ? ` — ${profile.reviewNote}` : ""
+          }. Amend and resubmit it from your settings page.`,
+        );
+      default:
+        throw new ForbiddenException(
+          `Your ${role} profile is awaiting approval. You'll be able to proceed once it has been approved.`,
+        );
     }
   }
 
@@ -2244,15 +2288,14 @@ export class CompaniesService {
   /**
    * Resolve which company_profile a new booking belongs to, from the company
    * and the booking's trade direction. IMPORT → importer profile, EXPORT →
-   * exporter profile; for DOMESTIC or a forwarder/single-profile company (or
-   * when the natural profile doesn't exist) it falls back to the user's active
-   * profile, then the company's first profile. Returns null when the company
-   * has no profiles at all.
+   * exporter profile; for DOMESTIC (or when the natural profile doesn't exist,
+   * e.g. a freight forwarder) it falls back to the company's first profile.
+   * Callers that need a specific role (a forwarder) pass an explicit
+   * companyProfileId instead. Returns null when the company has no profiles.
    */
   async resolveCompanyProfileIdForBooking(
     companyId: string,
     tradeDirection: string,
-    fallbackType?: ProfileType | null,
   ): Promise<string | null> {
     const profiles = await this.companyProfilesRepo.findByCompanyId(companyId);
     if (profiles.length === 0) return null;
@@ -2264,30 +2307,12 @@ export class CompaniesService {
           ? ProfileType.exporter
           : null;
 
-    const byType = (type?: ProfileType | null) =>
-      type ? profiles.find((p) => p.type === type) : undefined;
-
-    const match = byType(naturalType) ?? byType(fallbackType) ?? profiles[0];
+    const match =
+      (naturalType && profiles.find((p) => p.type === naturalType)) ??
+      profiles[0];
     return match?.id ?? null;
   }
 
-  /**
-   * Resolve the company_profile a customer's data should be scoped to, from
-   * their persisted active mode. Returns null when nothing can be resolved
-   * (not onboarded yet) so callers can fall back to company-level scoping.
-   */
-  async resolveActiveCompanyProfileId(userId: string): Promise<string | null> {
-    try {
-      const { profile, company } = await this.getCompanyInfoByUserId(userId);
-      const type = profile.activeProfileType;
-      if (!type) return null;
-      const match = company.companyProfiles?.find((p) => p.type === type);
-      return match?.id ?? null;
-    } catch {
-      return null;
-    }
-  }
-
   async fetchETradeData(tin: string) {
     const { businessInfo, companyInfo } =
       await this.etradeService.resolveCompanyData(tin);
diff --git a/apps/edr-freight-api/src/modules/companies/company-notifier.service.ts b/apps/edr-freight-api/src/modules/companies/company-notifier.service.ts
index f71a67976..66f88e9f8 100644
--- a/apps/edr-freight-api/src/modules/companies/company-notifier.service.ts
+++ b/apps/edr-freight-api/src/modules/companies/company-notifier.service.ts
@@ -59,23 +59,106 @@ export class CompanyNotifierService {
     }
   }
 
+  /** SMS + email + in-app account-status item to the company contact. */
+  private notifyAccount(
+    company: Company,
+    title: string,
+    body: string,
+    link = "/settings",
+  ): void {
+    void this.notifyContact(company, `${title}. ${body}`);
+    void this.inbox.notify({
+      recipients: { companyId: company.id },
+      audience: NotificationAudience.PORTAL,
+      type: NotificationType.ACCOUNT_STATUS,
+      title,
+      body,
+      link,
+      data: { companyId: company.id, status: company.status },
+      priority: NotificationPriority.HIGH,
+    });
+  }
+
   /**
-   * Tell the customer their account was suspended or blacklisted. Called only on
-   * a real transition into one of those statuses; other status writes are silent.
+   * Tell the customer their account changed status. Fires on the transitions
+   * that change what they can do: suspended/blacklisted (locked out) and
+   * reactivated (back to Active from a lockout). Silent otherwise.
    */
   statusChanged(company: Company, previous: CompanyStatus): void {
     const status = company.status;
     if (status === previous) return;
+
+    if (status === CompanyStatus.Active && PUNITIVE_STATUSES.includes(previous)) {
+      this.logger.log(`ACCOUNT_REACTIVATED — ${company.id}`);
+      this.notifyAccount(
+        company,
+        "Account reactivated",
+        "Your company account has been reactivated. " +
+          "You can submit new contracts and bookings again.",
+      );
+      return;
+    }
+
     if (!PUNITIVE_STATUSES.includes(status)) return;
 
     const label = status === CompanyStatus.Suspended ? "suspended" : "blacklisted";
-    const title = `Account ${label}`;
-    const body =
-      `Your company account has been ${label}. ` +
-      `You will not be able to submit new contracts or bookings. ` +
-      `Please contact EDR support for assistance.`;
-
     this.logger.log(`ACCOUNT_${label.toUpperCase()} — ${company.id}`);
+    this.notifyAccount(
+      company,
+      `Account ${label}`,
+      `Your company account has been ${label}. ` +
+        `You will not be able to submit new contracts or bookings. ` +
+        `Please contact EDR support for assistance.`,
+    );
+  }
+
+  /**
+   * Tell the customer their company account was approved and is now live — the
+   * first operational role clearing review promotes a pending company to Active.
+   */
+  companyApproved(company: Company): void {
+    this.logger.log(`ACCOUNT_APPROVED — ${company.id}`);
+    this.notifyAccount(
+      company,
+      "Account approved",
+      "Your company account has been approved and is now active. " +
+        "You can start submitting bookings and contracts.",
+      "/dashboard",
+    );
+  }
+
+  /**
+   * Tell the customer one of their operational roles changed review status —
+   * approved, rejected, suspended, or reactivated — quoting the staff message
+   * when one was given (rejection/suspension/reactivation require one; approval
+   * carries none).
+   */
+  profileStatusChanged(
+    company: Company,
+    profileType: string,
+    change: "approved" | "rejected" | "suspended" | "reactivated",
+    staffMessage: string,
+  ): void {
+    const title = `${profileType} role ${change}`;
+    const consequence: Record<typeof change, string> = {
+      approved: "You can now operate under this role.",
+      rejected:
+        "You will not be able to operate under this role. Amend the required " +
+        "documents and resubmit it for approval from your settings page.",
+      suspended:
+        "You will not be able to operate under this role until it is " +
+        "reactivated; your other roles are unaffected.",
+      reactivated: "You can operate under this role again.",
+    };
+    const message = staffMessage.trim();
+    const body =
+      `Your company's ${profileType} role has been ${change}. ` +
+      `${consequence[change]}` +
+      (message ? ` Message from EDR staff: ${message}` : "");
+
+    this.logger.log(
+      `PROFILE_${change.toUpperCase()} — ${company.id} / ${profileType}`,
+    );
     void this.notifyContact(company, `${title}. ${body}`);
     void this.inbox.notify({
       recipients: { companyId: company.id },
@@ -84,7 +167,7 @@ export class CompanyNotifierService {
       title,
       body,
       link: "/settings",
-      data: { companyId: company.id, status },
+      data: { companyId: company.id, profileType, change, staffMessage: message },
       priority: NotificationPriority.HIGH,
     });
   }
diff --git a/apps/edr-freight-api/src/modules/companies/dto/company-info-response.dto.ts b/apps/edr-freight-api/src/modules/companies/dto/company-info-response.dto.ts
index 9a4fb330a..2634e0943 100644
--- a/apps/edr-freight-api/src/modules/companies/dto/company-info-response.dto.ts
+++ b/apps/edr-freight-api/src/modules/companies/dto/company-info-response.dto.ts
@@ -24,7 +24,7 @@ export class CompanyInfoResponseDto {
     company: Company,
     changeRequest?: CompanyChangeRequest | null,
   ) {
-    this.profile = new ResponseExternalProfileDto(profile, company);
+    this.profile = new ResponseExternalProfileDto(profile);
     this.company = new ResponseCompanyDto(company);
 
     const open =
diff --git a/apps/edr-freight-api/src/modules/companies/dto/list-companies-query.dto.ts b/apps/edr-freight-api/src/modules/companies/dto/list-companies-query.dto.ts
index 8d4910ded..ffb600e36 100644
--- a/apps/edr-freight-api/src/modules/companies/dto/list-companies-query.dto.ts
+++ b/apps/edr-freight-api/src/modules/companies/dto/list-companies-query.dto.ts
@@ -60,15 +60,19 @@ export class ListCompaniesQueryDto {
   hasPendingChangeRequest?: boolean;
 
   @ApiPropertyOptional({
-    enum: ["name", "createdAt", "updatedAt"],
-    default: "name",
-    description: "Column to order by. Defaults to name for backwards compatibility.",
+    enum: ["review", "name", "createdAt", "updatedAt"],
+    default: "review",
+    description:
+      "Column to order by. The default `review` is a review-queue ordering: " +
+      "companies awaiting first approval, then those with a pending change " +
+      "request, then everyone else — newest first within each group. The " +
+      "other values are plain column sorts.",
   })
   @IsOptional()
-  @IsIn(["name", "createdAt", "updatedAt"])
-  sortBy?: "name" | "createdAt" | "updatedAt";
+  @IsIn(["review", "name", "createdAt", "updatedAt"])
+  sortBy?: "review" | "name" | "createdAt" | "updatedAt";
 
-  @ApiPropertyOptional({ enum: ["ASC", "DESC"], default: "ASC" })
+  @ApiPropertyOptional({ enum: ["ASC", "DESC"], default: "DESC" })
   @IsOptional()
   @Transform(({ value }: { value: unknown }) => String(value).toUpperCase())
   @IsIn(["ASC", "DESC"])
diff --git a/apps/edr-freight-api/src/modules/companies/dto/response-external-profile.dto.ts b/apps/edr-freight-api/src/modules/companies/dto/response-external-profile.dto.ts
index 256641074..916bb940d 100644
--- a/apps/edr-freight-api/src/modules/companies/dto/response-external-profile.dto.ts
+++ b/apps/edr-freight-api/src/modules/companies/dto/response-external-profile.dto.ts
@@ -1,8 +1,6 @@
-import { Company } from '../entities/company.entity';
 import {
   ExternalProfile,
 } from '../entities/external-profile.entity';
-import { ProfileType } from '../entities/company-profile.entity';
 
 export class ResponseExternalProfileDto {
   id: string;
@@ -13,20 +11,12 @@ export class ResponseExternalProfileDto {
   nationalId?: string | null;
   jobTitle?: string | null;
   isPrimaryContact: boolean;
-  /** The active operational mode (importer/exporter/forwarder). */
-  activeProfileType?: ProfileType | null;
-  /**
-   * The id of the company_profile matching activeProfileType, resolved
-   * server-side so the client never re-derives it. Null until a company
-   * (with profiles) is loaded and a matching profile exists.
-   */
-  activeCompanyProfileId?: string | null;
   onboardingStep?: string | null;
   onboardingCompleted: boolean;
   createdAt: Date;
   updatedAt: Date;
 
-  constructor(profile: ExternalProfile, company?: Company) {
+  constructor(profile: ExternalProfile) {
     this.id = profile.id;
     this.userId = profile.userId;
     this.companyId = profile.companyId;
@@ -35,13 +25,8 @@ export class ResponseExternalProfileDto {
     this.nationalId = profile.nationalId;
     this.jobTitle = profile.jobTitle;
     this.isPrimaryContact = profile.isPrimaryContact;
-    this.activeProfileType = profile.activeProfileType ?? null;
     this.onboardingStep = profile.onboardingStep ?? null;
     this.onboardingCompleted = profile.onboardingCompleted ?? false;
-    this.activeCompanyProfileId =
-      company?.companyProfiles?.find(
-        (p) => p.type === profile.activeProfileType,
-      )?.id ?? null;
     this.createdAt = profile.createdAt;
     this.updatedAt = profile.updatedAt;
   }
diff --git a/apps/edr-freight-api/src/modules/companies/dto/set-active-mode.dto.ts b/apps/edr-freight-api/src/modules/companies/dto/set-active-mode.dto.ts
deleted file mode 100644
index ac8f57a93..000000000
--- a/apps/edr-freight-api/src/modules/companies/dto/set-active-mode.dto.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { IsEnum } from 'class-validator';
-import { ProfileType } from '../entities/company-profile.entity';
-
-export class SetActiveModeDto {
-  @IsEnum(ProfileType)
-  type!: ProfileType;
-}
diff --git a/apps/edr-freight-api/src/modules/companies/entities/external-profile.entity.ts b/apps/edr-freight-api/src/modules/companies/entities/external-profile.entity.ts
index 93e499b5e..84f644091 100644
--- a/apps/edr-freight-api/src/modules/companies/entities/external-profile.entity.ts
+++ b/apps/edr-freight-api/src/modules/companies/entities/external-profile.entity.ts
@@ -1,7 +1,6 @@
 import { BaseEntity } from '@edr/api-common';
 import { Column, Entity, Index, ManyToOne, JoinColumn } from 'typeorm';
 import { Company } from './company.entity';
-import { ProfileType } from './company-profile.entity';
 
 @Entity({ schema: 'freight', name: 'external_profiles' })
 @Index(['userId'])
@@ -32,21 +31,6 @@ export class ExternalProfile extends BaseEntity {
   @Column({ name: 'is_primary_contact', type: 'boolean', default: false })
   isPrimaryContact!: boolean;
 
-  /**
-   * The operational profile the user is currently "in" (importer vs exporter,
-   * or the single forwarder profile). Drives header switching and scopes the
-   * customer's bookings / dashboard to that company_profile. Nullable for
-   * users who haven't picked a role yet.
-   */
-  @Column({
-    name: 'active_profile_type',
-    type: 'varchar',
-    length: 32,
-    nullable: true,
-    enum: ProfileType,
-  })
-  activeProfileType?: ProfileType | null;
-
   /** Coarse resume point for the onboarding wizard (e.g. 'role', 'company', 'documents', 'done'). */
   @Column({
     name: 'onboarding_step',
diff --git a/apps/edr-freight-api/src/modules/consignments/consignments.controller.ts b/apps/edr-freight-api/src/modules/consignments/consignments.controller.ts
index b107e8935..579b9ee26 100644
--- a/apps/edr-freight-api/src/modules/consignments/consignments.controller.ts
+++ b/apps/edr-freight-api/src/modules/consignments/consignments.controller.ts
@@ -10,18 +10,19 @@ import {
 import { ApiOperation, ApiTags } from "@nestjs/swagger";
 
 import { FleetManage, FleetView } from "../../common/booking-guards";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import { ConsignmentsService } from "./consignments.service";
 import { CreateConsignmentDto } from "./dto/create-consignment.dto";
 import { FilterConsignmentDto } from "./dto/filter-consignment.dto";
 
 @ApiTags("consignments")
 @Controller("consignments")
-@FleetView()
+@FleetView(FREIGHT_PERMS.consignments.view)
 export class ConsignmentsController {
   constructor(private readonly consignmentsService: ConsignmentsService) {}
 
   @Post()
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.consignments.create)
   @ApiOperation({ summary: "Create a new consignment" })
   create(@Body() dto: CreateConsignmentDto) {
     return this.consignmentsService.create(dto);
diff --git a/apps/edr-freight-api/src/modules/container-management/containers.controller.ts b/apps/edr-freight-api/src/modules/container-management/containers.controller.ts
index 1a0cdb14f..0a5e6bb0f 100644
--- a/apps/edr-freight-api/src/modules/container-management/containers.controller.ts
+++ b/apps/edr-freight-api/src/modules/container-management/containers.controller.ts
@@ -11,6 +11,7 @@ import {
 } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { FleetManage, FleetView } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { CreateContainerDto } from './dto/create-container.dto';
 import { UpdateContainerDto } from './dto/update-container.dto';
 import { AssignContainerToWagonDto } from './dto/assign-container-to-wagon.dto';
@@ -18,12 +19,12 @@ import { ContainersService } from './containers.service';
 
 @ApiTags('containers')
 @Controller('containers')
-@FleetView()
+@FleetView(FREIGHT_PERMS.containers.view)
 export class ContainersController {
   constructor(private readonly containersService: ContainersService) {}
 
   @Post()
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.containers.create)
   @ApiOperation({ summary: 'Create a new container' })
   create(@Body() dto: CreateContainerDto) {
     return this.containersService.create(dto);
@@ -42,28 +43,28 @@ export class ContainersController {
   }
 
   @Patch(':id')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.containers.update)
   @ApiOperation({ summary: 'Update a container' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateContainerDto) {
     return this.containersService.update(id, dto);
   }
 
   @Delete(':id')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.containers.delete)
   @ApiOperation({ summary: 'Delete a container' })
   remove(@Param('id', ParseUUIDPipe) id: string) {
     return this.containersService.remove(id);
   }
 
   @Post(':id/assign-wagon')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.containers.update)
   @ApiOperation({ summary: 'Assign container to a wagon' })
   assignToWagon(@Param('id', ParseUUIDPipe) id: string, @Body() dto: AssignContainerToWagonDto) {
     return this.containersService.assignToWagon(id, dto);
   }
 
   @Post(':id/unassign-wagon')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.containers.update)
   @ApiOperation({ summary: 'Unassign container from wagon' })
   unassignFromWagon(@Param('id', ParseUUIDPipe) id: string) {
     return this.containersService.unassignFromWagon(id);
diff --git a/apps/edr-freight-api/src/modules/contracts/clearance-fee.service.ts b/apps/edr-freight-api/src/modules/contracts/clearance-fee.service.ts
deleted file mode 100644
index 8de7aed87..000000000
--- a/apps/edr-freight-api/src/modules/contracts/clearance-fee.service.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import { Injectable, Logger, UnprocessableEntityException } from '@nestjs/common';
-import { OnEvent } from '@nestjs/event-emitter';
-import { Freight } from '@edr/types';
-
-import { BillingService, InvoiceEventPayload } from '../billing/billing.service';
-import { Invoice } from '../billing/entities/invoice.entity';
-import { BookingsRepository } from '../bookings/bookings.repository';
-import { Booking } from '../bookings/entities/booking.entity';
-import { ContractPricingBreakdown } from './contract-pricing.service';
-import { ContractNotifierService } from './contract-notifier.service';
-import { ContractsRepository } from './contracts.repository';
-import { Contract } from './entities/contract.entity';
-
-/** Invoice `type` for the contract-level fee (Path B ONE_TIME, after counter-sign). */
-export const CLEARANCE_CONTRACT_INVOICE_TYPE = 'CLEARANCE_CONTRACT';
-/** Invoice `type` for the per-shipment fee (Path B GENERAL, at shipment request). */
-export const CLEARANCE_BOOKING_INVOICE_TYPE = 'CLEARANCE_BOOKING';
-
-/**
- * The prepaid customs clearance service fee (Path B) — the GL service charge,
- * separate from both freight (booking invoice) and duty/tax (paid offline).
- * Issued as its own `clearance`-source invoice and paid BEFORE the clearance
- * document step opens and before GL touches the file:
- *  - ONE_TIME: once per contract, at staff counter-sign
- *    (AWAITING_CLEARANCE_PAYMENT → paid → AWAITING_CLEARANCE_DOCUMENTS);
- *  - GENERAL: once per shipment request, on the initiated booking instance
- *    (booking AWAITING_CLEARANCE_PAYMENT → paid → AWAITING_DOCUMENTS).
- * The fee amount is the frozen CUSTOMS_CLEARANCE contract rate snapshot, so
- * customers pay what their contract shows, not the live rate of the day.
- */
-@Injectable()
-export class ClearanceFeeService {
-  private readonly logger = new Logger(ClearanceFeeService.name);
-
-  constructor(
-    private readonly billing: BillingService,
-    private readonly contractsRepository: ContractsRepository,
-    private readonly bookingsRepository: BookingsRepository,
-    private readonly notifier: ContractNotifierService,
-  ) {}
-
-  /** The frozen flat fee for a contract; falls back to the pricing breakdown. */
-  private async feeAmountOrNull(
-    contract: Contract,
-  ): Promise<{ amount: number; currency: string } | null> {
-    const snapshots = await this.contractsRepository.findRateSnapshots(contract.id);
-    const snapshot = snapshots.find(
-      (s) => s.isClearance || s.rateCode === 'CUSTOMS_CLEARANCE',
-    );
-    if (snapshot && Number(snapshot.unitPrice) > 0) {
-      return { amount: Number(snapshot.unitPrice), currency: snapshot.currency };
-    }
-    const breakdown = contract.pricingBreakdown as ContractPricingBreakdown | null;
-    const line = breakdown?.lineItems?.find((l) => l.code === 'CUSTOMS_CLEARANCE');
-    if (line && Number(line.unitPrice) > 0) {
-      return { amount: Number(line.unitPrice), currency: breakdown!.currency };
-    }
-    return null;
-  }
-
-  private async feeAmount(
-    contract: Contract,
-  ): Promise<{ amount: number; currency: string }> {
-    const fee = await this.feeAmountOrNull(contract);
-    if (!fee) {
-      throw new UnprocessableEntityException(
-        `Contract ${contract.reference} has no frozen customs clearance fee — regenerate its price with a live CUSTOMS_CLEARANCE rate.`,
-      );
-    }
-    return fee;
-  }
-
-  /**
-   * Whether the payment gate applies. Skipped for government/unlinked
-   * contracts (no company to bill — invoices require one, same rule the
-   * booking invoice applies) and for legacy customs contracts frozen before
-   * the fee existed (no CUSTOMS_CLEARANCE snapshot to bill from) — both keep
-   * the pre-fee flow instead of dead-ending.
-   */
-  async gateApplies(contract: Contract): Promise<boolean> {
-    // Customs disabled → the prepay gate genuinely does not apply.
-    if (!contract.customsClearingEnabled) return false;
-    // No company to bill (government / unlinked) → the gate cannot raise an
-    // invoice, so it stays out of the flow (same rule the booking invoice uses).
-    if (!contract.companyId) return false;
-    // M26: customs IS enabled and billable. A missing frozen fee line must NOT
-    // silently waive the gate — that ships clearance for free. Hard-fail exactly
-    // as price generation does when no CUSTOMS_CLEARANCE rate is configured, so a
-    // missing fee blocks counter-sign / shipment instead of bypassing payment.
-    if ((await this.feeAmountOrNull(contract)) === null) {
-      throw new UnprocessableEntityException(
-        'No customs clearance service fee is configured. Ask the rates team to set a live CUSTOMS_CLEARANCE rate before submitting customs contracts.',
-      );
-    }
-    return true;
-  }
-
-  /** Issue (idempotently) the ONE_TIME contract-level fee invoice. */
-  async issueForContract(contract: Contract): Promise<Invoice> {
-    const existing = await this.billing.findPayable(
-      Freight.InvoiceSource.Clearance,
-      contract.id,
-      CLEARANCE_CONTRACT_INVOICE_TYPE,
-    );
-    if (existing) return existing;
-
-    const { amount, currency } = await this.feeAmount(contract);
-    const invoice = await this.billing.generateInvoice({
-      source: Freight.InvoiceSource.Clearance,
-      sourceId: contract.id,
-      type: CLEARANCE_CONTRACT_INVOICE_TYPE,
-      companyId: contract.companyId!,
-      companyProfileId: contract.companyProfileId!,
-      currency,
-      lines: [
-        {
-          chargeType: 'CUSTOMS_CLEARANCE',
-          description: `Customs clearance service fee — contract ${contract.reference}`,
-          quantity: 1,
-          unitRate: amount,
-          amount,
-          currency,
-        },
-      ],
-      status: Freight.InvoiceStatus.Pending,
-    });
-    this.notifier.clearanceFeeDue(contract, amount, currency);
-    return invoice;
-  }
-
-  /** Issue (idempotently) the GENERAL per-shipment fee invoice on the booking. */
-  async issueForBooking(booking: Booking, contract: Contract): Promise<Invoice> {
-    const existing = await this.billing.findPayable(
-      Freight.InvoiceSource.Clearance,
-      booking.id,
-      CLEARANCE_BOOKING_INVOICE_TYPE,
-    );
-    if (existing) return existing;
-
-    const { amount, currency } = await this.feeAmount(contract);
-    const invoice = await this.billing.generateInvoice({
-      source: Freight.InvoiceSource.Clearance,
-      sourceId: booking.id,
-      type: CLEARANCE_BOOKING_INVOICE_TYPE,
-      companyId: booking.companyId ?? contract.companyId!,
-      companyProfileId: booking.companyProfileId ?? contract.companyProfileId!,
-      currency,
-      lines: [
-        {
-          chargeType: 'CUSTOMS_CLEARANCE',
-          description: `Customs clearance service fee — shipment ${booking.reference}`,
-          quantity: 1,
-          unitRate: amount,
-          amount,
-          currency,
-        },
-      ],
-      status: Freight.InvoiceStatus.Pending,
-    });
-    this.notifier.clearanceFeeDue(contract, amount, currency, booking.reference);
-    return invoice;
-  }
-
-  /**
-   * Retire (idempotently) the unpaid contract-level fee invoice when the
-   * contract reaches a terminal state — a dead contract must not leave a
-   * payable clearance invoice open for the customer to settle. No-op when the
-   * fee was already paid or never invoiced (mirrors the booking cancel path,
-   * {@link BillingService.expirePayable}).
-   */
-  async expireForContract(contractId: string): Promise<Invoice | null> {
-    return this.billing.expirePayable(
-      Freight.InvoiceSource.Clearance,
-      contractId,
-      CLEARANCE_CONTRACT_INVOICE_TYPE,
-    );
-  }
-
-  /**
-   * Settlement branch point for `clearance`-source invoices: unlock the
-   * document-upload step the fee was gating. Idempotent — a replayed event on
-   * an already-advanced contract/booking is a no-op.
-   */
-  @OnEvent('clearance.invoice.paid')
-  async onClearanceInvoicePaid(payload: InvoiceEventPayload): Promise<void> {
-    this.logger.log(
-      `clearance.invoice.paid (${payload.type}) for ${payload.sourceId} from ${payload.invoiceId}`,
-    );
-    switch (payload.type) {
-      case CLEARANCE_CONTRACT_INVOICE_TYPE:
-        await this.advanceContract(payload.sourceId);
-        break;
-      case CLEARANCE_BOOKING_INVOICE_TYPE:
-        await this.advanceBooking(payload.sourceId);
-        break;
-      default:
-        this.logger.warn(
-          `Unhandled clearance invoice type "${payload.type}" paid (${payload.invoiceId})`,
-        );
-    }
-  }
-
-  private async advanceContract(contractId: string): Promise<void> {
-    const contract = await this.contractsRepository.findById(contractId);
-    if (!contract) {
-      this.logger.warn(`Cannot advance unknown contract ${contractId} on clearance fee payment.`);
-      return;
-    }
-    if (contract.status !== 'AWAITING_CLEARANCE_PAYMENT') return;
-
-    await this.contractsRepository.update(contractId, {
-      status: 'AWAITING_CLEARANCE_DOCUMENTS',
-      clearanceStatus: 'AWAITING_DOCUMENTS',
-      clearanceFeePaidAt: new Date(),
-    } as never);
-    const updated = await this.contractsRepository.findByIdWithRelations(contractId);
-    if (updated) this.notifier.clearanceFeePaid(updated);
-  }
-
-  private async advanceBooking(bookingId: string): Promise<void> {
-    const booking = await this.bookingsRepository.findById(bookingId);
-    if (!booking) {
-      this.logger.warn(`Cannot advance unknown booking ${bookingId} on clearance fee payment.`);
-      return;
-    }
-    if (booking.status !== 'AWAITING_CLEARANCE_PAYMENT') return;
-
-    await this.bookingsRepository.update(bookingId, {
-      status: 'AWAITING_DOCUMENTS',
-      clearanceFeePaidAt: new Date(),
-    } as never);
-    if (booking.contractId) {
-      const contract = await this.contractsRepository.findByIdWithRelations(
-        booking.contractId,
-      );
-      if (contract) this.notifier.clearanceFeePaid(contract, booking.reference);
-    }
-  }
-}
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-booking.completion.spec.ts b/apps/edr-freight-api/src/modules/contracts/contract-booking.completion.spec.ts
index 7f0aaabea..563f056d2 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-booking.completion.spec.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-booking.completion.spec.ts
@@ -26,7 +26,6 @@ describe('ContractBookingService — quantity-cap completion', () => {
       {} as never, // milestoneService
       {} as never, // workflowService
       {} as never, // invoiceService
-      {} as never, // clearanceFeeService
       { createdToStaff: jest.fn() } as never, // bookingNotifier
       {} as never, // dataSource
       {} as never, // trainSchedulingService
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-booking.consolidation.spec.ts b/apps/edr-freight-api/src/modules/contracts/contract-booking.consolidation.spec.ts
index 68c02fa7d..bb74f062c 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-booking.consolidation.spec.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-booking.consolidation.spec.ts
@@ -57,7 +57,6 @@ describe('ContractBookingService — drawdown consolidation gate', () => {
       milestoneService as never,
       {} as never, // workflowService
       invoiceService as never,
-      {} as never, // clearanceFeeService
       { createdToStaff: jest.fn() } as never, // bookingNotifier
       {} as never, // dataSource
       {} as never, // trainSchedulingService
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-booking.service.ts b/apps/edr-freight-api/src/modules/contracts/contract-booking.service.ts
index df930d805..8e102e5a1 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-booking.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-booking.service.ts
@@ -38,7 +38,6 @@ import { hasFreightPermission } from '../../common/freight-permission.util';
 import { Contract } from './entities/contract.entity';
 import { ContractRoute } from './entities/contract-route.entity';
 import { ContractsRepository } from './contracts.repository';
-import { ClearanceFeeService } from './clearance-fee.service';
 import { ClearanceMilestoneService } from './clearance-milestone.service';
 import { ClearanceWorkflowService } from './clearance-workflow.service';
 import {
@@ -97,7 +96,6 @@ export class ContractBookingService {
     private readonly milestoneService: ClearanceMilestoneService,
     private readonly workflowService: ClearanceWorkflowService,
     private readonly invoiceService: BookingInvoiceService,
-    private readonly clearanceFeeService: ClearanceFeeService,
     private readonly bookingNotifier: BookingLifecycleNotifierService,
     private readonly dataSource: DataSource,
     @Inject(forwardRef(() => TrainSchedulingService))
@@ -289,6 +287,7 @@ export class ContractBookingService {
       tradeDirection: contract.tradeDirection,
       freightType,
       cargoTypeId: this.resolveCargoTypeId(contract, dto),
+      cargoFreeText: dto.cargoFreeText?.trim() || null,
       isHazardous: this.resolveShipmentHandlingFlag(contract, dto, 'hazardousQuantity'),
       isReefer: this.resolveShipmentHandlingFlag(contract, dto, 'reeferQuantity'),
       cargoTotalWeightVgm: this.resolveBulkTons(dto),
@@ -320,6 +319,12 @@ export class ContractBookingService {
           await this.applyWeightResults(loaded);
         }
         const computed = await this.bookingPricingService.computePriceForBooking(loaded);
+        // A partially-priced booking (e.g. 40ft has a rate, 20ft has none) has
+        // a positive total, so the zero-price gate below misses it — enforce
+        // the pricing hard blocks first. The catch below rolls everything back.
+        if (computed.hardBlocked.length > 0) {
+          throw new BadRequestException(computed.hardBlocked.join('; '));
+        }
         // Reject a zero-price booking outright. A total of 0 means no contract rate
         // matched the route/container (or the rate is unset), so the booking is not
         // valid to ship or invoice. The catch below rolls back the row + its lines.
@@ -530,11 +535,8 @@ export class ContractBookingService {
 
     const route = await this.resolveRoute(contract, opts.contractRouteId);
 
-    // Prepay gate: each shipment request owes its own flat clearance service
-    // fee before the document step opens (the paid event advances the booking
-    // to AWAITING_DOCUMENTS). Government/unlinked contracts skip the gate.
-    const feeGate = await this.clearanceFeeService.gateApplies(contract);
-
+    // No prepay gate: the clearance service fee is billed on the booking
+    // invoice at completion, so the document step opens immediately.
     const booking = await insertWithGeneratedReference(
       () => this.generateReference(),
       (reference) =>
@@ -544,7 +546,7 @@ export class ContractBookingService {
           companyProfileId: contract.companyProfileId ?? null,
           isGovernment: contract.isGovernment,
           governmentInstitution: contract.governmentInstitution ?? null,
-          status: feeGate ? 'AWAITING_CLEARANCE_PAYMENT' : 'AWAITING_DOCUMENTS',
+          status: 'AWAITING_DOCUMENTS',
           bookingType: 'ONE_TIME',
           contractId: contract.id,
           contractRouteId: route?.id ?? null,
@@ -583,10 +585,6 @@ export class ContractBookingService {
       contract.tradeDirection,
     );
 
-    if (feeGate) {
-      await this.clearanceFeeService.issueForBooking(booking, contract);
-    }
-
     const created =
       (await this.bookingsRepository.findByIdWithFiles(booking.id)) ?? booking;
     this.bookingNotifier.createdToStaff(created);
@@ -732,6 +730,7 @@ export class ContractBookingService {
       }
       await this.bookingsRepository.update(booking.id, {
         cargoTypeId: this.resolveCargoTypeId(contract, dto),
+        cargoFreeText: dto.cargoFreeText?.trim() || null,
         cargoTotalWeightVgm: this.resolveBulkTons(dto),
         equipmentReturn: this.resolveShipmentEquipmentReturn(contract, dto),
       } as never);
@@ -744,15 +743,20 @@ export class ContractBookingService {
         const computed = await this.bookingPricingService.computePriceForBooking(loaded);
         // A zero price means no contract rate matches — roll the cargo back so
         // the instance stays CLEARANCE_READY and can be completed again once
-        // the contract rates are fixed (the clearance work is not lost).
-        if (!(computed.totalAmount > 0)) {
+        // the contract rates are fixed (the clearance work is not lost). A
+        // pricing hard block (e.g. one of two container sizes has no rate)
+        // rolls back the same way: a partially-priced total is positive but
+        // the booking must not proceed.
+        if (!(computed.totalAmount > 0) || computed.hardBlocked.length > 0) {
           await this.bookingsRepository.deleteContainers(booking.id);
           await this.bookingsRepository.update(booking.id, {
             cargoTotalWeightVgm: 0,
           } as never);
           throw new BadRequestException(
-            'Booking price came out as 0 — no contract rate matches this ' +
-              'route/cargo. Set the contract rate and try again.',
+            computed.hardBlocked.length > 0
+              ? computed.hardBlocked.join('; ')
+              : 'Booking price came out as 0 — no contract rate matches this ' +
+                'route/cargo. Set the contract rate and try again.',
           );
         }
         await this.bookingsRepository.update(booking.id, {
@@ -1785,6 +1789,10 @@ export class ContractBookingService {
     // pricing service derives wagon counts from the in-memory lines.
     const route = await this.resolveRoute(contract, dto.contractRouteId);
     const previewBooking = Object.assign(new Booking(), {
+      // contractId makes the preview price off the contract's frozen rate
+      // snapshots exactly like the persisted booking will — without it the
+      // preview total is 0 on a leg with no live rate and the form blocks.
+      contractId: contract.id,
       freightType: contract.freightType,
       tradeDirection: contract.tradeDirection,
       paymentCurrency: contract.paymentCurrency,
@@ -1892,7 +1900,10 @@ export class ContractBookingService {
       overweightSurchargeAmount,
       currency: computed.currency,
       pairingErrors,
-      capacityErrors: [...scopeErrors, ...capacityErrors],
+      // Pricing hard blocks (missing rate for a container size / requested
+      // service) ride the capacity-errors channel so the form hard-blocks in
+      // the preview instead of failing at the create call.
+      capacityErrors: [...scopeErrors, ...capacityErrors, ...computed.hardBlocked],
       containerClashErrors,
       spaceErrors,
       lineItems: computed.lineItems,
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-clearance.service.ts b/apps/edr-freight-api/src/modules/contracts/contract-clearance.service.ts
index 029952f45..d76391f42 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-clearance.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-clearance.service.ts
@@ -499,11 +499,6 @@ export class ContractClearanceService {
     files: Express.Multer.File[],
   ): Promise<Contract> {
     const contract = await this.contractsService.findById(contractId);
-    if (contract.status === 'AWAITING_CLEARANCE_PAYMENT') {
-      throw new ConflictException(
-        'The customs clearance service fee has not been paid yet — pay it from the portal to unlock document upload.',
-      );
-    }
     if (
       contract.status !== 'AWAITING_CLEARANCE_DOCUMENTS' &&
       contract.status !== 'CLEARANCE_UNDER_REVIEW'
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-notifier.service.ts b/apps/edr-freight-api/src/modules/contracts/contract-notifier.service.ts
index ac4fe2a0f..fd81083fc 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-notifier.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-notifier.service.ts
@@ -178,26 +178,6 @@ export class ContractNotifierService {
     });
   }
 
-  /** Clearance service fee invoiced — customer must pay before document upload. */
-  clearanceFeeDue(c: Contract, amount: number, currency: string, shipmentRef?: string): void {
-    const scope = shipmentRef ? `shipment ${shipmentRef} under contract ${c.reference}` : `contract ${c.reference}`;
-    const msg =
-      `A customs clearance service fee of ${amount} ${currency} is due for ${scope}. ` +
-      `Please pay from the portal to unlock the clearance document upload.`;
-    void this.notifyContact(c, msg, 'CLEARANCE FEE DUE');
-    this.inApp(c, 'Clearance fee due', msg);
-  }
-
-  /** Clearance service fee settled — document upload is now open. */
-  clearanceFeePaid(c: Contract, shipmentRef?: string): void {
-    const scope = shipmentRef ? `shipment ${shipmentRef} under contract ${c.reference}` : `contract ${c.reference}`;
-    const msg =
-      `Your customs clearance service fee for ${scope} has been received. ` +
-      `You can now upload the clearance documents from the portal.`;
-    void this.notifyContact(c, msg, 'CLEARANCE FEE PAID');
-    this.inApp(c, 'Clearance fee paid', msg);
-  }
-
   // ── Clearance milestones needing customer action ──────────────────────────
 
   /** GL advised duty & tax on the contract cycle — customer pays + uploads slip. */
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-pricing.service.ts b/apps/edr-freight-api/src/modules/contracts/contract-pricing.service.ts
index 235e1051f..149643441 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-pricing.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-pricing.service.ts
@@ -10,7 +10,7 @@ import { Contract } from './entities/contract.entity';
 export interface ContractUnitRateLineItem {
   code: string;
   label: string;
-  unit: 'per_container' | 'per_ton' | 'per_item' | 'per_km' | 'flat';
+  unit: 'per_container' | 'per_wagon' | 'per_ton' | 'per_item' | 'per_km' | 'flat';
   unitPrice: number;
   containerSize?: string | null;
   conditionalOn?: string | null;
@@ -37,8 +37,9 @@ function toContractUnit(rateUnit: string): ContractUnitRateLineItem['unit'] {
       return 'per_ton';
     case 'PER_KM':
       return 'per_km';
-    case 'PER_CONTAINER':
     case 'PER_WAGON':
+      return 'per_wagon';
+    case 'PER_CONTAINER':
       return 'per_container';
     default:
       return 'flat';
@@ -188,49 +189,165 @@ export class ContractPricingService {
         });
       }
     }
+    // Lashing / cargo securing — BULK only, shown when the contract's commodity
+    // needs lashing (cargoType.hasLashing). The commodity-scoped rate for the
+    // contract's direction wins over the commodity-wide catch-all; billed at
+    // booking on the live rate (per ton / per wagon), this line is display.
+    if (contract.freightType === 'BULK') {
+      const scope = (contract.cargoScope ?? []).find((c) => c.cargoTypeId);
+      if (scope?.cargoType?.hasLashing) {
+        const onDirection = liveRates.filter(
+          (r) =>
+            r.trigger === 'LASHING' &&
+            r.currency === 'USD' &&
+            !r.containerTypeId &&
+            r.tradeDirection === contract.tradeDirection,
+        );
+        const lashing =
+          onDirection.find((r) => r.cargoTypeId === scope.cargoTypeId) ??
+          onDirection.find((r) => !r.cargoTypeId);
+        if (lashing && Number(lashing.rateValue) > 0) {
+          lineItems.push({
+            code: 'LASHING',
+            label: `Lashing / cargo securing (${scope.cargoType.cargoTypeName})`,
+            unit: toContractUnit(lashing.rateUnit),
+            unitPrice: convert(Number(lashing.rateValue)),
+            cargoTypeCode: scope.cargoType.code ?? null,
+            conditionalOn: 'has_lashing',
+          });
+        }
+      }
+    }
+
     // Empty-container return service — container contracts only, toggled on the
     // contract like hazard/reefer. Billed at booking per WITH_RETURN container.
     if (
       contract.freightType === 'CONTAINER' &&
       contract.equipmentReturn === 'WITH_RETURN'
     ) {
-      const withReturn = liveRates.find(
-        (r) => r.rateType === 'RETURN_SURCHARGE' && r.currency === 'USD',
-      );
-      if (withReturn && Number(withReturn.rateValue) > 0) {
-        lineItems.push({
-          code: 'RETURN_SURCHARGE',
-          label: 'Empty container return',
-          unit: toContractUnit(withReturn.rateUnit),
-          unitPrice: convert(Number(withReturn.rateValue)),
-          conditionalOn: 'with_return',
+      // Return is sold per direction + route + container type (import-only) —
+      // one display line per contract size that has a configured rate. A size
+      // with no rate shows nothing here and hard-blocks at booking time.
+      // ponytail: bookings bill the live route rate, not a frozen snapshot.
+      const route = [...(contract.routes ?? [])].sort(
+        (a, b) => a.sortOrder - b.sortOrder,
+      )[0];
+      const onLeg = route
+        ? liveRates.filter(
+            (r) =>
+              r.rateType === 'RETURN_SURCHARGE' &&
+              r.currency === 'USD' &&
+              r.tradeDirection === contract.tradeDirection &&
+              r.originYardId === route.originYardId &&
+              r.destinationYardId === route.destinationYardId,
+          )
+        : [];
+      if (onLeg.length > 0) {
+        const sizes = (contract.cargoScope ?? [])
+          .map((c) => c.containerSize)
+          .filter((s): s is string => !!s);
+        const { items: containerTypes } = await this.containerTypesService.findAll({
+          isActive: true,
+          pageSize: 100,
         });
+        for (const size of sizes) {
+          const sizeFt = size === '40ft' ? 40 : 20;
+          const matchedIds = new Set(
+            containerTypes.filter((ct) => ct.sizeFt === sizeFt).map((ct) => ct.id),
+          );
+          const rate =
+            onLeg.find((r) => r.containerTypeId && matchedIds.has(r.containerTypeId)) ??
+            onLeg.find((r) => !r.containerTypeId);
+          if (!rate || Number(rate.rateValue) <= 0) continue;
+          lineItems.push({
+            code: 'RETURN_SURCHARGE',
+            label: `Empty container return (${size})`,
+            unit: toContractUnit(rate.rateUnit),
+            unitPrice: convert(Number(rate.rateValue)),
+            containerSize: size,
+            conditionalOn: 'with_return',
+          });
+        }
       }
     }
 
-    // Customs clearance service fee (Path B) — a FLAT prepaid fee, shown on the
-    // contract and billed via its own clearance invoice: after counter-sign for
-    // ONE_TIME, per shipment request for GENERAL. Excluded from booking totals.
-    // A customs contract may not proceed without a configured live rate.
+    // Customs clearance service fee (Path B) — billed on the booking invoice
+    // together with the freight. Sold per direction + route + cargo kind:
+    // container contracts freeze one fee line per contract size (each size's
+    // own container-type rate), bulk contracts freeze the route's bulk fee.
+    // A customs contract may not proceed without the fee(s) configured.
     if (contract.customsClearingEnabled) {
-      const clearance = liveRates.find(
-        (r) => r.rateType === 'CUSTOMS_CLEARANCE' && r.currency === 'USD',
-      );
-      if (!clearance || Number(clearance.rateValue) <= 0) {
-        throw new UnprocessableEntityException(
-          'No customs clearance service fee is configured. Ask the rates team to set a live CUSTOMS_CLEARANCE rate before submitting customs contracts.',
-        );
+      // Strict, no route-less fallback.
+      // ponytail: multi-route contracts bill the first lane's fee; per-lane fees need per-route snapshots.
+      const route = [...(contract.routes ?? [])].sort(
+        (a, b) => a.sortOrder - b.sortOrder,
+      )[0];
+      const onLeg = route
+        ? liveRates.filter(
+            (r) =>
+              r.rateType === 'CUSTOMS_CLEARANCE' &&
+              r.currency === 'USD' &&
+              r.tradeDirection === contract.tradeDirection &&
+              r.originYardId === route.originYardId &&
+              r.destinationYardId === route.destinationYardId,
+          )
+        : [];
+      if (contract.freightType === 'CONTAINER') {
+        const sizes = (contract.cargoScope ?? [])
+          .map((c) => c.containerSize)
+          .filter((s): s is string => !!s);
+        const { items: containerTypes } = await this.containerTypesService.findAll({
+          isActive: true,
+          pageSize: 100,
+        });
+        for (const size of sizes) {
+          const sizeFt = size === '40ft' ? 40 : 20;
+          const matchedIds = new Set(
+            containerTypes.filter((ct) => ct.sizeFt === sizeFt).map((ct) => ct.id),
+          );
+          const rate = onLeg.find(
+            (r) => r.containerTypeId && matchedIds.has(r.containerTypeId),
+          );
+          if (!rate || Number(rate.rateValue) <= 0) {
+            throw new UnprocessableEntityException(
+              `No customs clearance service fee is configured for ${size} containers on this direction and route. Ask the rates team to set a live CUSTOMS_CLEARANCE rate for this container type and origin → destination.`,
+            );
+          }
+          lineItems.push({
+            // Distinct code per size so the frozen snapshots don't collide —
+            // booking pricing looks each size up by CUSTOMS_CLEARANCE_<FT>FT.
+            code: `CUSTOMS_CLEARANCE_${sizeFt}FT`,
+            label: `Customs clearance service (${size})`,
+            unit: toContractUnit(rate.rateUnit),
+            unitPrice: convert(Number(rate.rateValue)),
+            containerSize: size,
+            isClearance: true,
+          });
+        }
+      } else {
+        // Bulk fee — the rate scoped to the contract's commodity wins; a
+        // commodity-less rate (legacy) is the catch-all fallback.
+        const scope = (contract.cargoScope ?? []).find((c) => c.cargoTypeId);
+        const rate =
+          (scope?.cargoTypeId
+            ? onLeg.find(
+                (r) => !r.containerTypeId && r.cargoTypeId === scope.cargoTypeId,
+              )
+            : undefined) ?? onLeg.find((r) => !r.containerTypeId && !r.cargoTypeId);
+        if (!rate || Number(rate.rateValue) <= 0) {
+          throw new UnprocessableEntityException(
+            'No bulk customs clearance service fee is configured for this cargo type on this direction and route. Ask the rates team to set a live bulk CUSTOMS_CLEARANCE rate for this commodity and origin → destination.',
+          );
+        }
+        lineItems.push({
+          code: 'CUSTOMS_CLEARANCE',
+          label: `Customs clearance service (${scope?.cargoType?.cargoTypeName ?? 'bulk'})`,
+          unit: toContractUnit(rate.rateUnit),
+          unitPrice: convert(Number(rate.rateValue)),
+          cargoTypeCode: scope?.cargoType?.code ?? null,
+          isClearance: true,
+        });
       }
-      lineItems.push({
-        code: 'CUSTOMS_CLEARANCE',
-        label:
-          contract.contractKind === 'GENERAL'
-            ? 'Customs clearance service fee (per shipment request, prepaid)'
-            : 'Customs clearance service fee (prepaid)',
-        unit: toContractUnit(clearance.rateUnit),
-        unitPrice: convert(Number(clearance.rateValue)),
-        isClearance: true,
-      });
     }
 
     return {
diff --git a/apps/edr-freight-api/src/modules/contracts/contract-transition.service.ts b/apps/edr-freight-api/src/modules/contracts/contract-transition.service.ts
index ba4fe442f..54158c383 100644
--- a/apps/edr-freight-api/src/modules/contracts/contract-transition.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contract-transition.service.ts
@@ -18,7 +18,15 @@ import { ContractPdfService } from '../../contracts/contract-pdf.service';
 import { ContractViewModel } from '../../contracts/contract-view-model.builder';
 import { MinioService } from '../minio/minio.service';
 import { FileRecord } from '../files/entities/file.entity';
-import { assertCanApproveContractStep } from '../../common/freight-permission.util';
+import {
+  assertCanApproveContractStep,
+  assertFreightPermission,
+  canEditContractStep,
+} from '../../common/freight-permission.util';
+import {
+  FREIGHT_PERMS,
+  forFreightType,
+} from '../../seed/freight-permissions.registry';
 import { ContractDocumentHistoryService } from './contract-document-history.service';
 import { ApprovalRulesService } from '../rule-engine/services/approval-rules.service';
 import { CargoTypesService } from '../rule-engine/services/cargo-types.service';
@@ -28,7 +36,6 @@ import { SignaturesService } from '../signatures/signatures.service';
 import { OtpService } from '../otp/otp.service';
 import { ContractTemplatesService } from '../contract-templates/contract-templates.service';
 import { ContractPricingService } from './contract-pricing.service';
-import { ClearanceFeeService } from './clearance-fee.service';
 import { ContractNotifierService } from './contract-notifier.service';
 import { ClearanceMilestoneService } from './clearance-milestone.service';
 import { ContractsRepository } from './contracts.repository';
@@ -154,7 +161,6 @@ export class ContractTransitionService {
     private readonly otpService: OtpService,
     private readonly notifier: ContractNotifierService,
     private readonly contractTemplates: ContractTemplatesService,
-    private readonly clearanceFeeService: ClearanceFeeService,
     @InjectDataSource()
     private readonly dataSource: DataSource,
   ) {}
@@ -236,8 +242,15 @@ export class ContractTransitionService {
     actorId: string,
     validityDays: number,
     documentSnapshot?: ContractDocumentSnapshotInput | null,
+    user?: TCurrentUser | null,
   ): Promise<Contract> {
     const contract = await this.contractsService.findById(contractId);
+    // The route guard passes on either arm; the contract's freight type decides
+    // which one is actually required (accept bulk ≠ accept container).
+    assertFreightPermission(
+      user,
+      forFreightType(FREIGHT_PERMS.contracts.staffAccept, contract.freightType),
+    );
     assertContractStatus(contract, ['SUBMITTED']);
 
     if (!Number.isInteger(validityDays) || validityDays < 1) {
@@ -431,12 +444,11 @@ export class ContractTransitionService {
     if (!next) return false;
     if (!user) return false;
 
-    try {
-      assertCanApproveContractStep(user, next.requiredRole);
-      return true;
-    } catch {
-      return false;
-    }
+    // Strict match: ONLY the approver whose turn it is (the next pending step's
+    // role) may edit. Using the looser approve gate here let any approver who
+    // held a contract-approve permission keep the edit button after acting —
+    // approval must hand edit rights to the next approver, not share them.
+    return canEditContractStep(user, next.requiredRole);
   }
 
   /** The role that currently holds editing rights, for UI messaging. */
@@ -533,8 +545,13 @@ export class ContractTransitionService {
     contractId: string,
     note: string,
     actorId: string,
+    user?: TCurrentUser | null,
   ): Promise<Contract> {
     const contract = await this.contractsService.findById(contractId);
+    assertFreightPermission(
+      user,
+      forFreightType(FREIGHT_PERMS.contracts.requestChanges, contract.freightType),
+    );
     assertContractStatus(contract, ['SUBMITTED']);
 
     await this.contractsRepository.createReviewNote(
@@ -552,8 +569,17 @@ export class ContractTransitionService {
     return updated;
   }
 
-  async reject(contractId: string, reason: string, actorId: string): Promise<Contract> {
+  async reject(
+    contractId: string,
+    reason: string,
+    actorId: string,
+    user?: TCurrentUser | null,
+  ): Promise<Contract> {
     const contract = await this.contractsService.findById(contractId);
+    assertFreightPermission(
+      user,
+      forFreightType(FREIGHT_PERMS.contracts.reject, contract.freightType),
+    );
     assertContractStatus(contract, ['SUBMITTED', 'PENDING_APPROVAL']);
 
     await this.contractsRepository.createReviewNote(
@@ -563,10 +589,6 @@ export class ContractTransitionService {
       actorId,
       'STAFF',
     );
-    // Stop the open-invoice leak: a rejected contract must not leave a payable
-    // clearance fee invoice open. Mirror the booking cancel path (billing.expirePayable).
-    await this.clearanceFeeService.expireForContract(contractId);
-
     await this.contractsRepository.update(contractId, {
       status: 'REJECTED',
     } as never);
@@ -626,10 +648,6 @@ export class ContractTransitionService {
       'STAFF',
     );
 
-    // Stop the open-invoice leak: a rejected contract must not leave a payable
-    // clearance fee invoice open. Mirror the booking cancel path (billing.expirePayable).
-    await this.clearanceFeeService.expireForContract(contractId);
-
     await this.contractsRepository.update(contractId, {
       status: 'REJECTED',
     } as never);
@@ -641,9 +659,9 @@ export class ContractTransitionService {
   /**
    * Internal send-back branch of rejectStep: return the contract to an earlier,
    * already-approved stage of the chain instead of rejecting it outright.
-   * Deliberately NOT the terminal path: no clearance-fee expiry (the contract
-   * is still alive) and no customer-facing REJECTION note — the trail is a
-   * staff note plus a backoffice inbox ping.
+   * Deliberately NOT the terminal path: the contract is still alive and there
+   * is no customer-facing REJECTION note — the trail is a staff note plus a
+   * backoffice inbox ping.
    */
   private async sendBackToStep(
     contract: Contract,
@@ -1141,17 +1159,11 @@ export class ContractTransitionService {
       const cycleNumber = (contract.clearanceCycleNumber ?? 0) + 1;
       const cycle = await this.contractsRepository.openCycle(contractId, cycleNumber);
       await this.milestoneService.seedPreBookingMilestones(contract, cycle.id);
-      // Path B prepay gate: the customs clearance service fee is invoiced here
-      // and must settle before the document step opens (the paid event advances
-      // to AWAITING_CLEARANCE_DOCUMENTS). Path A (self-clearance) has no GL fee.
-      if (await this.clearanceFeeService.gateApplies(contract)) {
-        await this.clearanceFeeService.issueForContract(contract);
-        updates.status = 'AWAITING_CLEARANCE_PAYMENT';
-        updates.clearanceStatus = 'AWAITING_PAYMENT';
-      } else {
-        updates.status = 'AWAITING_CLEARANCE_DOCUMENTS';
-        updates.clearanceStatus = 'AWAITING_DOCUMENTS';
-      }
+      // No prepay gate: the customs clearance service fee (Path B) is billed on
+      // the booking invoice together with the freight, so the document step
+      // opens immediately.
+      updates.status = 'AWAITING_CLEARANCE_DOCUMENTS';
+      updates.clearanceStatus = 'AWAITING_DOCUMENTS';
       updates.clearanceCycleNumber = cycleNumber;
     } else {
       // No contract-level clearance gate — DOMESTIC, or any GENERAL contract
diff --git a/apps/edr-freight-api/src/modules/contracts/contracts.controller.ts b/apps/edr-freight-api/src/modules/contracts/contracts.controller.ts
index 6ca4473cd..ba80cc035 100644
--- a/apps/edr-freight-api/src/modules/contracts/contracts.controller.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contracts.controller.ts
@@ -34,7 +34,11 @@ import {
 import { actorLabel } from '../warehouses/current-actor.util';
 import { BookingStaff } from '../../common/booking-guards';
 import { ContractDocumentHistoryService } from './contract-document-history.service';
-import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
+import {
+  FREIGHT_PERMS,
+  bothFreightTypes,
+  forFreightType,
+} from '../../seed/freight-permissions.registry';
 import {
   assertFreightPermission,
   hasFreightPermission,
@@ -184,7 +188,10 @@ export class ContractsController {
     @CurrentUser() user: TCurrentUser,
   ) {
     if (dto.isGovernment) {
-      assertFreightPermission(user, FREIGHT_PERMS.contracts.staffAccept);
+      assertFreightPermission(
+        user,
+        forFreightType(FREIGHT_PERMS.contracts.staffAccept, dto.freightType),
+      );
     }
     return this.contractsService.create(dto, files ?? [], user?.id);
   }
@@ -196,7 +203,10 @@ export class ContractsController {
     @CurrentUser() user: TCurrentUser,
   ) {
     // Staff see every contract; customers are force-scoped to their own company.
-    if (hasFreightPermission(user, FREIGHT_PERMS.bookings.view)) {
+    if (
+      hasFreightPermission(user, FREIGHT_PERMS.bookings.view) ||
+      hasFreightPermission(user, FREIGHT_PERMS.contracts.view)
+    ) {
       return this.contractsService.findAll(filter);
     }
     const userId = user?.id;
@@ -273,7 +283,8 @@ export class ContractsController {
     if (
       !hasFreightPermission(user, FREIGHT_PERMS.bookings.view) &&
       !hasFreightPermission(user, FREIGHT_PERMS.bookings.clearanceView) &&
-      !hasFreightPermission(user, FREIGHT_PERMS.bookings.reviewDocuments)
+      !hasFreightPermission(user, FREIGHT_PERMS.bookings.reviewDocuments) &&
+      !hasFreightPermission(user, FREIGHT_PERMS.contracts.view)
     ) {
       await this.contractsService.assertCustomerCanAccessContract(user?.id, contract);
     }
@@ -333,23 +344,32 @@ export class ContractsController {
   }
 
   @Post(':id/staff/accept')
-  @BookingStaff(FREIGHT_PERMS.contracts.staffAccept)
+  // One-of guard; the service then requires the arm matching the contract's freight type.
+  @BookingStaff(bothFreightTypes(FREIGHT_PERMS.contracts.staffAccept))
   @ApiOperation({ summary: 'Staff accept → set validity window + start approval chain' })
   staffAccept(
     @Param('id', ParseUUIDPipe) id: string,
     @Body() dto: AcceptContractDto,
-    @CurrentUser() user: AuthUserPayload,
+    @CurrentUser() user: TCurrentUser,
   ) {
     return this.transitionService.staffAccept(
       id,
       resolveAuthUserId(user),
       dto.validityDays,
       dto.documentSnapshot,
+      user,
     );
   }
 
+  // Readable by anyone who may view the contract: the draft carries
+  // `editableByMe`, and the approval chain's approvers (identified by position
+  // type, not by staff_accept) must be able to fetch it to learn it is their
+  // turn. Gating this on staff_accept hid the edit dialog from every approver.
   @Get(':id/document/draft')
-  @BookingStaff(FREIGHT_PERMS.contracts.staffAccept)
+  @BookingStaff([
+    FREIGHT_PERMS.contracts.view,
+    ...bothFreightTypes(FREIGHT_PERMS.contracts.staffAccept),
+  ])
   @ApiOperation({
     summary:
       'Editable contract-document draft (this contract\'s snapshot, or the live template) for the accept/edit dialog',
@@ -372,8 +392,15 @@ export class ContractsController {
     return this.documentHistory.list(id);
   }
 
+  // Coarse gate only. WHO may actually edit is turn-based, not a static
+  // permission, so `updateContractDocument` -> `assertDocumentEditable` is the
+  // real boundary: it admits only the approver whose step is currently pending
+  // (edit rights hand off down the chain on each approval).
   @Put(':id/document/articles')
-  @BookingStaff(FREIGHT_PERMS.contracts.staffAccept)
+  @BookingStaff([
+    FREIGHT_PERMS.contracts.view,
+    ...bothFreightTypes(FREIGHT_PERMS.contracts.staffAccept),
+  ])
   @ApiOperation({
     summary:
       'Edit this contract\'s document articles only (per-contract; never touches the six shared templates)',
@@ -392,29 +419,35 @@ export class ContractsController {
   }
 
   @Post(':id/staff/request-changes')
-  @BookingStaff(FREIGHT_PERMS.contracts.requestChanges)
+  @BookingStaff(bothFreightTypes(FREIGHT_PERMS.contracts.requestChanges))
   @ApiOperation({ summary: 'Staff return contract for customer updates' })
   requestChanges(
     @Param('id', ParseUUIDPipe) id: string,
     @Body() dto: RequestChangesDto,
-    @CurrentUser() user: AuthUserPayload,
+    @CurrentUser() user: TCurrentUser,
   ) {
     return this.transitionService.requestChanges(
       id,
       dto.note,
       resolveAuthUserId(user),
+      user,
     );
   }
 
   @Post(':id/staff/reject')
-  @BookingStaff(FREIGHT_PERMS.contracts.reject)
+  @BookingStaff(bothFreightTypes(FREIGHT_PERMS.contracts.reject))
   @ApiOperation({ summary: 'Staff reject contract' })
   reject(
     @Param('id', ParseUUIDPipe) id: string,
     @Body() dto: RejectContractDto,
-    @CurrentUser() user: AuthUserPayload,
+    @CurrentUser() user: TCurrentUser,
   ) {
-    return this.transitionService.reject(id, dto.reason, resolveAuthUserId(user));
+    return this.transitionService.reject(
+      id,
+      dto.reason,
+      resolveAuthUserId(user),
+      user,
+    );
   }
 
   @Post(':id/approval-steps/:stepId/approve')
@@ -475,7 +508,10 @@ export class ContractsController {
     @CurrentUser() user: TCurrentUser,
   ) {
     const contract = await this.contractsService.findById(id);
-    if (!hasFreightPermission(user, FREIGHT_PERMS.bookings.view)) {
+    if (
+      !hasFreightPermission(user, FREIGHT_PERMS.bookings.view) &&
+      !hasFreightPermission(user, FREIGHT_PERMS.contracts.view)
+    ) {
       await this.contractsService.assertCustomerCanAccessContract(user?.id, contract);
     }
     const { view, html, signatures } =
@@ -510,7 +546,10 @@ export class ContractsController {
     @Res() res: Response,
   ): Promise<void> {
     const contract = await this.contractsService.findById(id);
-    if (!hasFreightPermission(user, FREIGHT_PERMS.bookings.view)) {
+    if (
+      !hasFreightPermission(user, FREIGHT_PERMS.bookings.view) &&
+      !hasFreightPermission(user, FREIGHT_PERMS.contracts.view)
+    ) {
       await this.contractsService.assertCustomerCanAccessContract(user?.id, contract);
     }
     const { stream, record } = await this.transitionService.streamContractPdf(id);
@@ -566,9 +605,12 @@ export class ContractsController {
     @CurrentUser() user: TCurrentUser,
   ) {
     // H12(c): a customer may only renew a contract their company owns. Staff
-    // with bookings.view bypass, mirroring getContractView/downloadContractDocument.
+    // with bookings.view/contracts.view bypass, mirroring getContractView/downloadContractDocument.
     const contract = await this.contractsService.findById(id);
-    if (!hasFreightPermission(user, FREIGHT_PERMS.bookings.view)) {
+    if (
+      !hasFreightPermission(user, FREIGHT_PERMS.bookings.view) &&
+      !hasFreightPermission(user, FREIGHT_PERMS.contracts.view)
+    ) {
       await this.contractsService.assertCustomerCanAccessContract(user?.id, contract);
     }
     return this.transitionService.renew(id, resolveAuthUserId(user));
@@ -592,9 +634,12 @@ export class ContractsController {
     @UploadedFiles() files: Express.Multer.File[],
   ) {
     // H12(c): only the owning company's customer may upload clearance docs.
-    // Staff with bookings.view bypass, mirroring the other contract handlers.
+    // Staff with bookings.view/contracts.view bypass, mirroring the other contract handlers.
     const contract = await this.contractsService.findById(id);
-    if (!hasFreightPermission(user, FREIGHT_PERMS.bookings.view)) {
+    if (
+      !hasFreightPermission(user, FREIGHT_PERMS.bookings.view) &&
+      !hasFreightPermission(user, FREIGHT_PERMS.contracts.view)
+    ) {
       await this.contractsService.assertCustomerCanAccessContract(user?.id, contract);
     }
     return this.clearanceService.uploadDocuments(id, files ?? []);
diff --git a/apps/edr-freight-api/src/modules/contracts/contracts.module.ts b/apps/edr-freight-api/src/modules/contracts/contracts.module.ts
index 050417a45..bb12648a4 100644
--- a/apps/edr-freight-api/src/modules/contracts/contracts.module.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contracts.module.ts
@@ -22,7 +22,6 @@ import { ContractsController } from './contracts.controller';
 import { ContractsService } from './contracts.service';
 import { ContractsRepository } from './contracts.repository';
 import { ContractPricingService } from './contract-pricing.service';
-import { ClearanceFeeService } from './clearance-fee.service';
 import { ContractNotifierService } from './contract-notifier.service';
 import { ContractTransitionService } from './contract-transition.service';
 import { ContractClearanceService } from './contract-clearance.service';
@@ -107,7 +106,6 @@ import { ContractDocumentViewModelBuilder } from '../../contracts/contract-docum
     ContractsService,
     ContractsRepository,
     ContractPricingService,
-    ClearanceFeeService,
     ContractNotifierService,
     ContractTransitionService,
     ContractDocumentHistoryService,
diff --git a/apps/edr-freight-api/src/modules/contracts/contracts.service.ts b/apps/edr-freight-api/src/modules/contracts/contracts.service.ts
index a675adf39..65f0637f0 100644
--- a/apps/edr-freight-api/src/modules/contracts/contracts.service.ts
+++ b/apps/edr-freight-api/src/modules/contracts/contracts.service.ts
@@ -12,8 +12,6 @@ import { YardCountry } from '@edr/types';
 
 import { deriveTradeDirection } from '../../common/derive-trade-direction.util';
 import { CompaniesService } from '../companies/companies.service';
-import { ProfileType } from '../companies/entities/company-profile.entity';
-import { CompanyStatus } from '../companies/entities/company.entity';
 import { ServiceType } from '../rule-engine/entities/service-type.entity';
 import { Yard } from '../rule-engine/entities/yard.entity';
 import { FilesService } from '../files/files.service';
@@ -181,11 +179,7 @@ export class ContractsService {
         );
       }
       const { company } = await this.companiesService.getCompanyInfoByUserId(userId);
-      if (company.status !== CompanyStatus.Active) {
-        throw new ForbiddenException(
-          "Your company is awaiting approval — you can't create contracts yet.",
-        );
-      }
+      this.companiesService.assertCompanyActiveFor(company, 'contracts');
       companyId = company.id;
     }
 
@@ -193,31 +187,31 @@ export class ContractsService {
     this.assertRouteShape(dto.contractKind, dto.routes);
     await this.assertRoutesMatchDirection(dto.tradeDirection, dto.routes);
 
-    // Stamp the operational profile (importer/exporter) for portal scoping.
+    // Stamp the operational profile for portal scoping. A forwarder contract
+    // pins its profile explicitly (trade direction can't tell it apart from a
+    // direct import/export); everything else resolves from the trade direction.
     let companyProfileId: string | null = null;
     if (!isGovernment && companyId) {
-      let fallbackType: ProfileType | null = null;
-      if (userId) {
-        try {
-          const { profile } =
-            await this.companiesService.getCompanyInfoByUserId(userId);
-          fallbackType = profile.activeProfileType ?? null;
-        } catch {
-          // No profile (e.g. staff creating on behalf) — fall back to mapping.
-        }
-      }
-      companyProfileId =
-        await this.companiesService.resolveCompanyProfileIdForBooking(
-          companyId,
-          dto.tradeDirection,
-          fallbackType,
-        );
+      if (dto.companyProfileId) {
+        const profile =
+          await this.companiesService.getActiveCompanyProfileForBooking(
+            companyId,
+            dto.companyProfileId,
+          );
+        companyProfileId = profile.id;
+      } else {
+        companyProfileId =
+          await this.companiesService.resolveCompanyProfileIdForBooking(
+            companyId,
+            dto.tradeDirection,
+          );
 
-      const customerSelfBooking = !dto.companyId && !!userId;
-      if (customerSelfBooking && companyProfileId) {
-        await this.companiesService.assertCompanyProfileApprovedForBooking(
-          companyProfileId,
-        );
+        const customerSelfBooking = !dto.companyId && !!userId;
+        if (customerSelfBooking && companyProfileId) {
+          await this.companiesService.assertCompanyProfileApprovedForBooking(
+            companyProfileId,
+          );
+        }
       }
     }
 
diff --git a/apps/edr-freight-api/src/modules/contracts/dto/create-booking-under-contract.dto.ts b/apps/edr-freight-api/src/modules/contracts/dto/create-booking-under-contract.dto.ts
index 3b5a30ca0..93a0e9e76 100644
--- a/apps/edr-freight-api/src/modules/contracts/dto/create-booking-under-contract.dto.ts
+++ b/apps/edr-freight-api/src/modules/contracts/dto/create-booking-under-contract.dto.ts
@@ -182,6 +182,13 @@ export class CreateBookingUnderContractDto {
   @Type(() => CreateBulkLineDto)
   bulkLines?: CreateBulkLineDto[];
 
+  @ApiPropertyOptional({
+    description: 'What the containers carry — captured per booking (container freight).',
+  })
+  @IsOptional()
+  @IsString()
+  cargoFreeText?: string;
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsString()
diff --git a/apps/edr-freight-api/src/modules/contracts/dto/create-contract.dto.ts b/apps/edr-freight-api/src/modules/contracts/dto/create-contract.dto.ts
index 688e0b4c7..fb4f40654 100644
--- a/apps/edr-freight-api/src/modules/contracts/dto/create-contract.dto.ts
+++ b/apps/edr-freight-api/src/modules/contracts/dto/create-contract.dto.ts
@@ -124,6 +124,16 @@ export class CreateContractDto {
   @IsUUID()
   companyId?: string;
 
+  @ApiPropertyOptional({
+    format: 'uuid',
+    description:
+      'Explicit company profile to stamp the contract to (a forwarder contract); ' +
+      'commercial contracts otherwise auto-resolve from trade direction.',
+  })
+  @IsOptional()
+  @IsUUID()
+  companyProfileId?: string;
+
   @ApiProperty({ enum: CONTRACT_KINDS, description: 'ONE_TIME | GENERAL' })
   @IsIn([...CONTRACT_KINDS])
   contractKind!: string;
diff --git a/apps/edr-freight-api/src/modules/contracts/entities/clearance-incident.entity.ts b/apps/edr-freight-api/src/modules/contracts/entities/clearance-incident.entity.ts
index 6d2afce3c..2ece44f12 100644
--- a/apps/edr-freight-api/src/modules/contracts/entities/clearance-incident.entity.ts
+++ b/apps/edr-freight-api/src/modules/contracts/entities/clearance-incident.entity.ts
@@ -13,6 +13,7 @@ export const INCIDENT_TYPES = [
   'CONTAINER_OPENED',
   'CONTAINER_DAMAGED',
   'FLUID_LEAKING',
+  'OTHER',
 ] as const;
 export type IncidentType = (typeof INCIDENT_TYPES)[number];
 
diff --git a/apps/edr-freight-api/src/modules/contracts/entities/contract-rate-snapshot.entity.ts b/apps/edr-freight-api/src/modules/contracts/entities/contract-rate-snapshot.entity.ts
index 52fcd437f..244a2816d 100644
--- a/apps/edr-freight-api/src/modules/contracts/entities/contract-rate-snapshot.entity.ts
+++ b/apps/edr-freight-api/src/modules/contracts/entities/contract-rate-snapshot.entity.ts
@@ -46,8 +46,8 @@ export class ContractRateSnapshot extends BaseEntity {
   conditionalOn?: string | null;
 
   /**
-   * Customs clearance service fee line — billed up front via a clearance
-   * invoice, excluded from shipment booking totals.
+   * Customs clearance service fee line — billed on the booking invoice
+   * together with the freight (no separate prepaid clearance invoice).
    */
   @Column({ name: 'is_clearance', type: 'boolean', default: false })
   isClearance!: boolean;
diff --git a/apps/edr-freight-api/src/modules/contracts/entities/contract.entity.ts b/apps/edr-freight-api/src/modules/contracts/entities/contract.entity.ts
index 4838d3f52..b8635199d 100644
--- a/apps/edr-freight-api/src/modules/contracts/entities/contract.entity.ts
+++ b/apps/edr-freight-api/src/modules/contracts/entities/contract.entity.ts
@@ -25,7 +25,6 @@ export const CONTRACT_STATUSES = [
   'SIGNED_CUSTOMER',
   'FULLY_EXECUTED',
   'CONTRACT_ACTIVE',
-  'AWAITING_CLEARANCE_PAYMENT', // Path B — clearance fee invoiced, unpaid
   'AWAITING_CLEARANCE_DOCUMENTS',
   'CLEARANCE_UNDER_REVIEW',
   'CLEARANCE_READY_FOR_BOOKING',
@@ -85,7 +84,6 @@ export type ContractKindValue = (typeof CONTRACT_KINDS)[number];
 
 export const CONTRACT_CLEARANCE_STATUSES = [
   'NOT_APPLICABLE',
-  'AWAITING_PAYMENT', // Path B — clearance service fee must be paid first
   'AWAITING_DOCUMENTS',
   'DOCUMENTS_UNDER_REVIEW',
   'CLEARANCE_READY_FOR_BOOKING', // Path B — GL may create the booking
@@ -217,10 +215,6 @@ export class Contract extends BaseEntity {
   @Column({ name: 'clearance_cycle_number', type: 'int', default: 0 })
   clearanceCycleNumber!: number;
 
-  /** When the prepaid customs clearance service fee settled (Path B ONE_TIME). */
-  @Column({ name: 'clearance_fee_paid_at', type: 'timestamptz', nullable: true })
-  clearanceFeePaidAt?: Date | null;
-
   @Column({ name: 'pricing_breakdown', type: 'jsonb', nullable: true })
   pricingBreakdown?: Record<string, unknown> | null;
 
diff --git a/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts b/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts
index 0143f0796..948853e22 100644
--- a/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts
+++ b/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts
@@ -2,6 +2,7 @@ import { BadRequestException, Injectable, Logger, NotFoundException } from '@nes
 import { FindOptionsWhere, In, IsNull, Not } from 'typeorm';
 import { InjectDataSource } from '@nestjs/typeorm';
 import { DataSource } from 'typeorm';
+import { attachMileFinancials } from '../../common/mile-financials.util';
 import { VehicleAvailability } from '../vehicles/entities/vehicle.entity';
 import { BookingsRepository } from "../bookings/bookings.repository";
 import { DriversService } from "../drivers/drivers.service";
@@ -66,6 +67,7 @@ export class FirstMileService {
     for (const r of records) {
       (r as FirstMile & { invoice?: unknown }).invoice = byId.get(r.id) ?? null;
     }
+    await attachMileFinancials(this.dataSource, records, 'FIRST_MILE');
   }
 
   /** Resolve a vehicle's driver + human labels, for stamping mile events onto
diff --git a/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.controller.ts b/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.controller.ts
index 03797f3b7..61a13744e 100644
--- a/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.controller.ts
+++ b/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.controller.ts
@@ -54,11 +54,4 @@ export class InterchangeDocumentsController {
   dispute(@Param('id', ParseUUIDPipe) id: string, @Body() dto: DisputeInterchangeDocumentDto) {
     return this.service.dispute(id, dto);
   }
-
-  @Patch(':id/cancel')
-  @BookingStaff(FREIGHT_PERMS.interchangeDocuments.cancel)
-  @ApiOperation({ summary: 'Cancel a draft/generated interchange document' })
-  cancel(@Param('id', ParseUUIDPipe) id: string) {
-    return this.service.cancel(id);
-  }
 }
diff --git a/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.service.ts b/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.service.ts
index f91e942c0..e5fb5dc4d 100644
--- a/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.service.ts
+++ b/apps/edr-freight-api/src/modules/interchange-documents/interchange-documents.service.ts
@@ -203,11 +203,12 @@ export class InterchangeDocumentsService {
 
   async dispute(id: string, dto: DisputeInterchangeDocumentDto): Promise<InterchangeDocument> {
     const document = await this.findOne(id);
-    // A dispute can only be raised on a live handover — a GENERATED or already
-    // ACKNOWLEDGED document. CANCELLED and already-DISPUTED are terminal here.
-    if (!['GENERATED', 'ACKNOWLEDGED'].includes(document.status)) {
+    // A dispute can only be raised BEFORE the handover is acknowledged — an
+    // acknowledged document is settled. DISPUTED itself is terminal and
+    // read-only: the registered dispute cannot be re-raised or overwritten.
+    if (document.status !== 'GENERATED') {
       throw new BadRequestException(
-        `Interchange document in ${document.status} status cannot be disputed (must be GENERATED or ACKNOWLEDGED)`,
+        `Interchange document in ${document.status} status cannot be disputed (must be GENERATED — an acknowledged handover is settled, a registered dispute is read-only)`,
       );
     }
     await this.dataSource.getRepository(InterchangeDocument).update(id, {
@@ -217,15 +218,6 @@ export class InterchangeDocumentsService {
     return this.findOne(id);
   }
 
-  async cancel(id: string): Promise<InterchangeDocument> {
-    const document = await this.findOne(id);
-    if (!['DRAFT', 'GENERATED'].includes(document.status)) {
-      throw new BadRequestException(`Interchange document ${document.status} cannot be cancelled`);
-    }
-    await this.dataSource.getRepository(InterchangeDocument).update(id, { status: 'CANCELLED' });
-    return this.findOne(id);
-  }
-
   private async getScheduleSnapshot(scheduleId: string): Promise<ScheduleSnapshot> {
     const [schedule] = await this.dataSource.query(
       `SELECT ts.id,
diff --git a/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts b/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
index 43887d468..601e03aec 100644
--- a/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
+++ b/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
@@ -12,6 +12,7 @@ import {
   SELF_HAUL_CONFLICT_MESSAGE,
   usesEdrMileService,
 } from '../../common/mile-haulage.util';
+import { attachMileFinancials } from '../../common/mile-financials.util';
 import {
   assertBulkTonnageRemains,
   assertTruckCountWithinContainers,
@@ -88,6 +89,7 @@ export class LastMileService {
     for (const r of records) {
       (r as LastMile & { invoice?: unknown }).invoice = byId.get(r.id) ?? null;
     }
+    await attachMileFinancials(this.dataSource, records, 'LAST_MILE');
   }
 
   /** Resolve a vehicle's driver + human labels, for stamping mile events onto
diff --git a/apps/edr-freight-api/src/modules/locomotives/locomotives.controller.ts b/apps/edr-freight-api/src/modules/locomotives/locomotives.controller.ts
index c907af717..77d8b0df2 100644
--- a/apps/edr-freight-api/src/modules/locomotives/locomotives.controller.ts
+++ b/apps/edr-freight-api/src/modules/locomotives/locomotives.controller.ts
@@ -1,7 +1,8 @@
 import { Body, Controller, Get, Param, ParseUUIDPipe, Patch, Post, Query } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 
-import { FleetManage, FleetView } from '../../common/booking-guards';
+import { FleetManage, StaffReference } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { CreateLocomotiveDto } from './dto/create-locomotive.dto';
 import { FilterLocomotivesDto } from './dto/filter-locomotives.dto';
 import { UpdateLocomotiveDto } from './dto/update-locomotive.dto';
@@ -9,39 +10,43 @@ import { LocomotivesService } from './locomotives.service';
 
 @ApiTags('locomotives')
 @ApiBearerAuth()
+// No class-level guard: reads are login-only reference data (any staff can
+// fetch a locomotive for a cross-flow view without the fleet:view that drives
+// the Fleet sidebar). Every mutation carries its own @FleetManage().
 @Controller('locomotives')
-@FleetView()
 export class LocomotivesController {
   constructor(private readonly locomotivesService: LocomotivesService) {}
 
   @Get()
+  @StaffReference()
   @ApiOperation({ summary: 'List locomotives' })
   findAll(@Query() filter: FilterLocomotivesDto) {
     return this.locomotivesService.findAll(filter);
   }
 
   @Get(':id')
+  @StaffReference()
   @ApiOperation({ summary: 'Get a locomotive by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.locomotivesService.findById(id);
   }
 
   @Post()
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.locomotives.create)
   @ApiOperation({ summary: 'Create a locomotive' })
   create(@Body() dto: CreateLocomotiveDto) {
     return this.locomotivesService.create(dto);
   }
 
   @Patch(':id')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.locomotives.update)
   @ApiOperation({ summary: 'Update a locomotive' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateLocomotiveDto) {
     return this.locomotivesService.update(id, dto);
   }
 
   @Post(':id/decommission')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.locomotives.delete)
   @ApiOperation({ summary: 'Decommission a locomotive' })
   decommission(@Param('id', ParseUUIDPipe) id: string) {
     return this.locomotivesService.decommission(id);
diff --git a/apps/edr-freight-api/src/modules/maintenance/dto/create-maintenance.dto.ts b/apps/edr-freight-api/src/modules/maintenance/dto/create-maintenance.dto.ts
index d3e70acff..129262ef0 100644
--- a/apps/edr-freight-api/src/modules/maintenance/dto/create-maintenance.dto.ts
+++ b/apps/edr-freight-api/src/modules/maintenance/dto/create-maintenance.dto.ts
@@ -8,6 +8,11 @@ export class CreateMaintenanceScheduleDto {
   @IsEnum(MaintenanceType)
   maintenanceType!: MaintenanceType;
 
+  /** What is serviced — matched against the interval for auto-scheduling. */
+  @IsOptional()
+  @IsString()
+  serviceItem?: string;
+
   @IsString()
   description!: string;
 
@@ -81,7 +86,37 @@ export class UpdateMaintenanceScheduleDto {
   @IsNumber()
   actualCost?: number;
 
+  /** Odometer at completion — drives KM-based auto-scheduling of the next service. */
+  @IsOptional()
+  @IsNumber()
+  odometerReading?: number;
+
   @IsOptional()
   @IsString()
   notes?: string;
 }
+
+export class UpsertMaintenanceIntervalDto {
+  @IsUUID()
+  vehicleId!: string;
+
+  @IsEnum(MaintenanceType)
+  maintenanceType!: MaintenanceType;
+
+  /** What is serviced — "oil change", "tires", … Distinguishes intervals of the same type. */
+  @IsOptional()
+  @IsString()
+  serviceItem?: string;
+
+  @IsOptional()
+  @IsNumber()
+  intervalKm?: number;
+
+  @IsOptional()
+  @IsNumber()
+  intervalDays?: number;
+
+  @IsOptional()
+  @IsString()
+  description?: string;
+}
diff --git a/apps/edr-freight-api/src/modules/maintenance/entities/maintenance-interval.entity.ts b/apps/edr-freight-api/src/modules/maintenance/entities/maintenance-interval.entity.ts
new file mode 100644
index 000000000..640c3e26e
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/maintenance/entities/maintenance-interval.entity.ts
@@ -0,0 +1,46 @@
+import { BaseEntity } from '@edr/api-common';
+import { Entity, Column, ManyToOne, JoinColumn, Index } from 'typeorm';
+import { Vehicle } from '../../vehicles/entities/vehicle.entity';
+import { MaintenanceType } from './maintenance-schedule.entity';
+
+/**
+ * Maintenance interval configuration. Defines how often a vehicle needs a
+ * given service. Identity is (vehicle, maintenanceType, serviceItem) — a
+ * vehicle carries several intervals of the same coarse type with different
+ * items (oil every 10k km, tires every 50k km, both PREVENTIVE). Uniqueness
+ * is enforced by a COALESCE expression index in the migration (nullable
+ * service_item), not a TypeORM @Unique.
+ */
+@Entity({ name: 'maintenance_intervals', schema: 'freight' })
+@Index(['vehicleId', 'maintenanceType'])
+export class MaintenanceInterval extends BaseEntity {
+  @Column({ name: 'vehicle_id', type: 'uuid' })
+  vehicleId!: string;
+
+  @ManyToOne(() => Vehicle, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'vehicle_id' })
+  vehicle!: Vehicle;
+
+  @Column({ name: 'maintenance_type', type: 'varchar' })
+  maintenanceType!: MaintenanceType;
+
+  /** What is serviced — "oil change", "tires", … Null = generic for the type. */
+  @Column({ name: 'service_item', type: 'varchar', length: 120, nullable: true })
+  serviceItem?: string | null;
+
+  /** Maintenance interval in kilometers. E.g., 10000 for oil changes every 10k km. */
+  @Column({ name: 'interval_km', type: 'numeric', precision: 14, scale: 2, nullable: true })
+  intervalKm?: number | null;
+
+  /** Maintenance interval in days. E.g., 365 for annual inspection. */
+  @Column({ name: 'interval_days', type: 'integer', nullable: true })
+  intervalDays?: number | null;
+
+  /** Human-readable description. E.g., "Oil and filter change". */
+  @Column({ name: 'description', type: 'text', nullable: true })
+  description?: string | null;
+
+  /** Is this interval active? Can be disabled without deleting historical data. */
+  @Column({ name: 'is_active', type: 'boolean', default: true })
+  isActive!: boolean;
+}
diff --git a/apps/edr-freight-api/src/modules/maintenance/entities/maintenance-schedule.entity.ts b/apps/edr-freight-api/src/modules/maintenance/entities/maintenance-schedule.entity.ts
index a4d4d60a0..5a0cc074a 100644
--- a/apps/edr-freight-api/src/modules/maintenance/entities/maintenance-schedule.entity.ts
+++ b/apps/edr-freight-api/src/modules/maintenance/entities/maintenance-schedule.entity.ts
@@ -30,6 +30,10 @@ export class MaintenanceSchedule extends BaseEntity {
   @Column({ name: 'maintenance_type', type: 'varchar' })
   maintenanceType!: MaintenanceType;
 
+  /** What is serviced — matches the interval's service_item for auto-scheduling. */
+  @Column({ name: 'service_item', type: 'varchar', length: 120, nullable: true })
+  serviceItem?: string | null;
+
   @Column({ name: 'description' })
   description!: string;
 
@@ -62,4 +66,8 @@ export class MaintenanceSchedule extends BaseEntity {
 
   @Column({ name: 'next_due_date', type: 'timestamptz', nullable: true })
   nextDueDate?: Date;
+
+  /** Stamped once the km/date-due alert has fired, so the daily check doesn't repeat it. */
+  @Column({ name: 'due_notified_at', type: 'timestamptz', nullable: true })
+  dueNotifiedAt?: Date;
 }
diff --git a/apps/edr-freight-api/src/modules/maintenance/maintenance-auto-next.spec.ts b/apps/edr-freight-api/src/modules/maintenance/maintenance-auto-next.spec.ts
new file mode 100644
index 000000000..1b020455c
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/maintenance/maintenance-auto-next.spec.ts
@@ -0,0 +1,99 @@
+import { MaintenanceService } from './maintenance.service';
+import { MaintenanceStatus } from './entities/maintenance-schedule.entity';
+
+/**
+ * KM-based auto-scheduling: completing a maintenance with an odometer reading
+ * creates the next SCHEDULED item at completedKm + intervalKm, matched on the
+ * schedule's (type, serviceItem) interval. Re-completing must not duplicate.
+ */
+function makeService(opts: {
+  before: Record<string, unknown> | null;
+  after: Record<string, unknown> | null;
+  interval: Record<string, unknown> | null;
+}) {
+  const saved: Array<Record<string, unknown>> = [];
+  const service = Object.create(MaintenanceService.prototype) as Record<string, unknown>;
+  service.scheduleRepository = {
+    findOneBy: jest
+      .fn()
+      .mockResolvedValueOnce(opts.before)
+      .mockResolvedValueOnce(opts.after),
+    update: jest.fn(),
+    create: jest.fn((v: Record<string, unknown>) => v),
+    save: jest.fn(async (v: Record<string, unknown>) => {
+      saved.push(v);
+      return v;
+    }),
+  };
+  service.intervalRepository = {
+    getByVehicleAndType: jest.fn().mockResolvedValue(opts.interval),
+  };
+  service.dataSource = {
+    getRepository: jest.fn().mockReturnValue({ update: jest.fn() }),
+  };
+  service.logger = { error: jest.fn() };
+  return { service: service as unknown as MaintenanceService, saved };
+}
+
+const base = {
+  id: 's-1',
+  vehicleId: 'v-1',
+  maintenanceType: 'PREVENTIVE',
+  serviceItem: 'oil change',
+  description: 'Oil and filter',
+};
+
+describe('MaintenanceService auto-next scheduling', () => {
+  it('completing at 50,000 km with a 10,000 km interval schedules the next at 60,000', async () => {
+    const { service, saved } = makeService({
+      before: { ...base, status: MaintenanceStatus.SCHEDULED },
+      after: { ...base, status: MaintenanceStatus.COMPLETED, odometerReading: 50000 },
+      interval: { serviceItem: 'oil change', intervalKm: '10000.00', intervalDays: null, description: 'Oil and filter' },
+    });
+
+    await service.updateMaintenanceSchedule('s-1', {
+      status: MaintenanceStatus.COMPLETED,
+      odometerReading: 50000,
+    });
+
+    expect(saved).toHaveLength(1);
+    expect(saved[0]).toMatchObject({
+      vehicleId: 'v-1',
+      serviceItem: 'oil change',
+      nextDueKm: 60000,
+      status: MaintenanceStatus.SCHEDULED,
+    });
+  });
+
+  it('re-completing an already COMPLETED schedule does not duplicate the next one', async () => {
+    const { service, saved } = makeService({
+      before: { ...base, status: MaintenanceStatus.COMPLETED, odometerReading: 50000 },
+      after: { ...base, status: MaintenanceStatus.COMPLETED, odometerReading: 50000 },
+      interval: { serviceItem: 'oil change', intervalKm: '10000.00', intervalDays: null },
+    });
+
+    await service.updateMaintenanceSchedule('s-1', {
+      status: MaintenanceStatus.COMPLETED,
+      odometerReading: 50000,
+    });
+
+    expect(saved).toHaveLength(0);
+  });
+
+  it('a km + days interval produces ONE next schedule carrying both thresholds', async () => {
+    const { service, saved } = makeService({
+      before: { ...base, status: MaintenanceStatus.IN_PROGRESS },
+      after: { ...base, status: MaintenanceStatus.COMPLETED, odometerReading: 20000 },
+      interval: { serviceItem: 'oil change', intervalKm: '10000.00', intervalDays: 180 },
+    });
+
+    await service.updateMaintenanceSchedule('s-1', {
+      status: MaintenanceStatus.COMPLETED,
+      odometerReading: 20000,
+    });
+
+    expect(saved).toHaveLength(1);
+    expect(saved[0].nextDueKm).toBe(30000);
+    expect(saved[0].nextDueDate).toBeInstanceOf(Date);
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/maintenance/maintenance-due-alert.spec.ts b/apps/edr-freight-api/src/modules/maintenance/maintenance-due-alert.spec.ts
new file mode 100644
index 000000000..7aac5e863
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/maintenance/maintenance-due-alert.spec.ts
@@ -0,0 +1,76 @@
+import { NotificationAudience } from '@edr/types';
+
+import { MaintenanceService } from './maintenance.service';
+
+/**
+ * The daily due-alert: a SCHEDULED item that crossed its km or date threshold
+ * gets one BACKOFFICE notification, then is stamped so it isn't repeated.
+ */
+function makeService(due: Array<Record<string, unknown>>) {
+  const update = jest.fn();
+  const notify = jest.fn();
+  const service = Object.create(MaintenanceService.prototype) as Record<string, unknown>;
+  service.maintenanceRepository = { getUnnotifiedDue: jest.fn().mockResolvedValue(due) };
+  service.scheduleRepository = { update };
+  service.inbox = { notify };
+  service.logger = { error: jest.fn() };
+  return { service: service as unknown as MaintenanceService, update, notify };
+}
+
+describe('MaintenanceService.sendDueAlerts', () => {
+  it('reports the km reason when the km threshold was crossed', async () => {
+    const { service, notify, update } = makeService([
+      {
+        id: 'sched-1',
+        vehicleId: 'v-1',
+        plateNumber: 'ET-9875',
+        maintenanceType: 'PREVENTIVE',
+        description: 'Oil change',
+        nextDueKm: 50000,
+        nextDueDate: null,
+        currentKm: 50200,
+      },
+    ]);
+
+    await service.sendDueAlerts();
+
+    expect(notify).toHaveBeenCalledWith(
+      expect.objectContaining({
+        audience: NotificationAudience.BACKOFFICE,
+        title: 'Maintenance due — ET-9875',
+        body: expect.stringContaining('driven 50200 km (due at 50000 km)'),
+      }),
+    );
+    expect(update).toHaveBeenCalledWith('sched-1', { dueNotifiedAt: expect.any(Date) });
+  });
+
+  it('reports the date reason when only the due date has passed', async () => {
+    const { service, notify } = makeService([
+      {
+        id: 'sched-2',
+        vehicleId: 'v-2',
+        plateNumber: 'AA-8642',
+        maintenanceType: 'INSPECTION',
+        description: 'Annual inspection',
+        nextDueKm: null,
+        nextDueDate: new Date('2026-01-01'),
+        currentKm: 1000,
+      },
+    ]);
+
+    await service.sendDueAlerts();
+
+    expect(notify).toHaveBeenCalledWith(
+      expect.objectContaining({ body: expect.stringContaining('due 1/1/2026') }),
+    );
+  });
+
+  it('does nothing when nothing is due', async () => {
+    const { service, notify, update } = makeService([]);
+
+    await service.sendDueAlerts();
+
+    expect(notify).not.toHaveBeenCalled();
+    expect(update).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/maintenance/maintenance-interval.repository.ts b/apps/edr-freight-api/src/modules/maintenance/maintenance-interval.repository.ts
new file mode 100644
index 000000000..d884cdf55
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/maintenance/maintenance-interval.repository.ts
@@ -0,0 +1,83 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { BaseRepository } from '@edr/api-common';
+import { IsNull, Repository } from 'typeorm';
+import { MaintenanceInterval } from './entities/maintenance-interval.entity';
+import { MaintenanceType } from './entities/maintenance-schedule.entity';
+
+@Injectable()
+export class MaintenanceIntervalRepository extends BaseRepository<MaintenanceInterval> {
+  constructor(
+    @InjectRepository(MaintenanceInterval)
+    private readonly intervalRepository: Repository<MaintenanceInterval>,
+  ) {
+    super(intervalRepository);
+  }
+
+  /**
+   * Resolve the interval for a completed service. Prefers the exact
+   * (type, serviceItem) match; a completion without an item falls back to the
+   * type's item-less interval only, so "oil" completions never consume the
+   * "tires" interval.
+   */
+  async getByVehicleAndType(
+    vehicleId: string,
+    maintenanceType: MaintenanceType,
+    serviceItem?: string | null,
+  ): Promise<MaintenanceInterval | null> {
+    return this.intervalRepository.findOne({
+      where: {
+        vehicleId,
+        maintenanceType,
+        isActive: true,
+        serviceItem: serviceItem?.trim() ? serviceItem.trim() : IsNull(),
+      },
+    });
+  }
+
+  async getActiveIntervals(vehicleId: string): Promise<MaintenanceInterval[]> {
+    return this.intervalRepository.find({
+      where: { vehicleId, isActive: true },
+      order: { maintenanceType: 'ASC', serviceItem: 'ASC' },
+    });
+  }
+
+  async upsertInterval(
+    vehicleId: string,
+    maintenanceType: MaintenanceType,
+    serviceItem?: string | null,
+    intervalKm?: number | null,
+    intervalDays?: number | null,
+    description?: string | null,
+  ): Promise<MaintenanceInterval> {
+    const item = serviceItem?.trim() || null;
+    const existing = await this.getByVehicleAndType(vehicleId, maintenanceType, item);
+
+    if (existing) {
+      await this.intervalRepository.update(existing.id, {
+        intervalKm: intervalKm ?? existing.intervalKm,
+        intervalDays: intervalDays ?? existing.intervalDays,
+        description: description ?? existing.description,
+      });
+      const updated = await this.intervalRepository.findOneBy({ id: existing.id });
+      return updated!;
+    }
+
+    return this.intervalRepository.save(
+      this.intervalRepository.create({
+        vehicleId,
+        maintenanceType,
+        serviceItem: item,
+        intervalKm,
+        intervalDays,
+        description,
+        isActive: true,
+      }),
+    );
+  }
+
+  /** Soft-disable: history keeps pointing at it, auto-scheduling stops. */
+  async deactivate(id: string): Promise<void> {
+    await this.intervalRepository.update(id, { isActive: false });
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/maintenance/maintenance.controller.ts b/apps/edr-freight-api/src/modules/maintenance/maintenance.controller.ts
index 4ad8026f2..32e5dfba6 100644
--- a/apps/edr-freight-api/src/modules/maintenance/maintenance.controller.ts
+++ b/apps/edr-freight-api/src/modules/maintenance/maintenance.controller.ts
@@ -4,7 +4,12 @@ import { BookingStaff } from '../../common/booking-guards';
 import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { MaintenanceService } from './maintenance.service';
 import { MaintenanceDepthService } from './maintenance-depth.service';
-import { CreateMaintenanceScheduleDto, CreateMaintenanceCostDto, UpdateMaintenanceScheduleDto } from './dto/create-maintenance.dto';
+import {
+  CreateMaintenanceScheduleDto,
+  CreateMaintenanceCostDto,
+  UpdateMaintenanceScheduleDto,
+  UpsertMaintenanceIntervalDto,
+} from './dto/create-maintenance.dto';
 import {
   CreateWorkOrderDto,
   UpdateWorkOrderDto,
@@ -44,6 +49,34 @@ export class MaintenanceController {
     return this.maintenanceService.updateMaintenanceSchedule(id, dto);
   }
 
+  @Get('due-board')
+  @BookingStaff([FREIGHT_PERMS.maintenance.view, FREIGHT_PERMS.fleetDashboard.view])
+  @ApiOperation({ summary: 'Fleet-wide next-due maintenance board (by date and km)' })
+  async getDueBoard() {
+    return this.maintenanceService.getDueBoard();
+  }
+
+  @Post('intervals')
+  @BookingStaff(FREIGHT_PERMS.maintenance.create)
+  @ApiOperation({ summary: 'Define/adjust a service interval (e.g. oil change every 10,000 km)' })
+  async upsertInterval(@Body() dto: UpsertMaintenanceIntervalDto) {
+    return this.maintenanceService.upsertInterval(dto);
+  }
+
+  @Get('intervals/:vehicleId')
+  @BookingStaff(FREIGHT_PERMS.maintenance.view)
+  @ApiOperation({ summary: "A vehicle's active service intervals" })
+  async getIntervals(@Param('vehicleId') vehicleId: string) {
+    return this.maintenanceService.getIntervals(vehicleId);
+  }
+
+  @Delete('intervals/:id')
+  @BookingStaff(FREIGHT_PERMS.maintenance.delete)
+  @ApiOperation({ summary: 'Deactivate a service interval (stops auto-scheduling)' })
+  async deactivateInterval(@Param('id') id: string) {
+    return this.maintenanceService.deactivateInterval(id);
+  }
+
   @Get('upcoming/:vehicleId')
   @BookingStaff(FREIGHT_PERMS.maintenance.view)
   @ApiOperation({ summary: 'Get upcoming maintenance' })
diff --git a/apps/edr-freight-api/src/modules/maintenance/maintenance.module.ts b/apps/edr-freight-api/src/modules/maintenance/maintenance.module.ts
index 8f4fe1d0b..b64b77bae 100644
--- a/apps/edr-freight-api/src/modules/maintenance/maintenance.module.ts
+++ b/apps/edr-freight-api/src/modules/maintenance/maintenance.module.ts
@@ -2,25 +2,37 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { MaintenanceSchedule } from './entities/maintenance-schedule.entity';
 import { MaintenanceCost } from './entities/maintenance-cost.entity';
+import { MaintenanceInterval } from './entities/maintenance-interval.entity';
 import { WorkOrder } from './entities/work-order.entity';
 import { Part } from './entities/part.entity';
 import { Warranty } from './entities/warranty.entity';
 import { MaintenanceService } from './maintenance.service';
 import { MaintenanceDepthService } from './maintenance-depth.service';
 import { MaintenanceRepository } from './maintenance.repository';
+import { MaintenanceIntervalRepository } from './maintenance-interval.repository';
 import { WorkOrderRepository } from './work-order.repository';
 import { PartRepository } from './part.repository';
 import { WarrantyRepository } from './warranty.repository';
 import { MaintenanceController } from './maintenance.controller';
+import { NotificationInboxModule } from '../notification-inbox/notification-inbox.module';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([MaintenanceSchedule, MaintenanceCost, WorkOrder, Part, Warranty]),
+    TypeOrmModule.forFeature([
+      MaintenanceSchedule,
+      MaintenanceCost,
+      MaintenanceInterval,
+      WorkOrder,
+      Part,
+      Warranty,
+    ]),
+    NotificationInboxModule,
   ],
   providers: [
     MaintenanceService,
     MaintenanceDepthService,
     MaintenanceRepository,
+    MaintenanceIntervalRepository,
     WorkOrderRepository,
     PartRepository,
     WarrantyRepository,
diff --git a/apps/edr-freight-api/src/modules/maintenance/maintenance.repository.ts b/apps/edr-freight-api/src/modules/maintenance/maintenance.repository.ts
index 9e8cf972e..b417e72cf 100644
--- a/apps/edr-freight-api/src/modules/maintenance/maintenance.repository.ts
+++ b/apps/edr-freight-api/src/modules/maintenance/maintenance.repository.ts
@@ -47,4 +47,109 @@ export class MaintenanceRepository extends BaseRepository<MaintenanceSchedule> {
       .getRawOne();
     return result?.total || 0;
   }
+
+  /**
+   * Fleet-wide "next due" board: one row per vehicle with a SCHEDULED
+   * maintenance item, driven by time AND km — whichever is soonest. Current km
+   * is the vehicle's latest fuel-up odometer reading (how mileage is actually
+   * captured today), falling back to vehicle.actual_distance_km when the
+   * vehicle has no fuel purchase on file yet.
+   */
+  async getDueBoard(): Promise<
+    Array<{
+      scheduleId: string;
+      vehicleId: string;
+      plateNumber: string;
+      maintenanceType: string;
+      serviceItem: string | null;
+      description: string;
+      scheduledDate: Date;
+      nextDueDate: Date | null;
+      nextDueKm: number | null;
+      currentKm: number | null;
+      kmRemaining: number | null;
+      daysRemaining: number | null;
+      overdue: boolean;
+    }>
+  > {
+    // Every SCHEDULED item, not one per vehicle — a truck legitimately holds
+    // several (oil vs tires intervals differ).
+    return this.scheduleRepository.manager.query(`
+      SELECT
+        s.id AS "scheduleId",
+        s.vehicle_id AS "vehicleId",
+        v.plate_number AS "plateNumber",
+        s.maintenance_type AS "maintenanceType",
+        s.service_item AS "serviceItem",
+        s.description,
+        s.scheduled_date AS "scheduledDate",
+        s.next_due_date AS "nextDueDate",
+        s.next_due_km AS "nextDueKm",
+        COALESCE(fp.max_odometer, v.actual_distance_km) AS "currentKm",
+        CASE WHEN s.next_due_km IS NOT NULL
+          THEN s.next_due_km - COALESCE(fp.max_odometer, v.actual_distance_km, 0)
+          ELSE NULL END AS "kmRemaining",
+        CASE WHEN s.next_due_date IS NOT NULL
+          THEN EXTRACT(DAY FROM s.next_due_date - now())
+          ELSE NULL END AS "daysRemaining",
+        (
+          (s.next_due_date IS NOT NULL AND s.next_due_date <= now())
+          OR (s.next_due_km IS NOT NULL
+              AND COALESCE(fp.max_odometer, v.actual_distance_km, 0) >= s.next_due_km)
+        ) AS overdue
+      FROM freight.maintenance_schedules s
+      JOIN freight.vehicles v ON v.id = s.vehicle_id AND v.deleted_at IS NULL
+      LEFT JOIN LATERAL (
+        SELECT MAX(odometer_reading) AS max_odometer
+        FROM freight.fuel_purchases fp2
+        WHERE fp2.vehicle_id = s.vehicle_id
+      ) fp ON true
+      WHERE s.status = 'SCHEDULED' AND s.deleted_at IS NULL
+      ORDER BY s.vehicle_id, s.scheduled_date ASC
+    `);
+  }
+
+  /**
+   * SCHEDULED items that have crossed their km or date due-point and have not
+   * yet been notified. Backs the daily km/date maintenance alert.
+   */
+  async getUnnotifiedDue(): Promise<
+    Array<{
+      id: string;
+      vehicleId: string;
+      plateNumber: string;
+      maintenanceType: string;
+      description: string;
+      nextDueKm: number | null;
+      nextDueDate: Date | null;
+      currentKm: number | null;
+    }>
+  > {
+    return this.scheduleRepository.manager.query(`
+      SELECT
+        s.id,
+        s.vehicle_id AS "vehicleId",
+        v.plate_number AS "plateNumber",
+        s.maintenance_type AS "maintenanceType",
+        s.description,
+        s.next_due_km AS "nextDueKm",
+        s.next_due_date AS "nextDueDate",
+        COALESCE(fp.max_odometer, v.actual_distance_km) AS "currentKm"
+      FROM freight.maintenance_schedules s
+      JOIN freight.vehicles v ON v.id = s.vehicle_id AND v.deleted_at IS NULL
+      LEFT JOIN LATERAL (
+        SELECT MAX(odometer_reading) AS max_odometer
+        FROM freight.fuel_purchases fp2
+        WHERE fp2.vehicle_id = s.vehicle_id
+      ) fp ON true
+      WHERE s.status = 'SCHEDULED'
+        AND s.deleted_at IS NULL
+        AND s.due_notified_at IS NULL
+        AND (
+          (s.next_due_date IS NOT NULL AND s.next_due_date <= now())
+          OR (s.next_due_km IS NOT NULL
+              AND COALESCE(fp.max_odometer, v.actual_distance_km, 0) >= s.next_due_km)
+        )
+    `);
+  }
 }
diff --git a/apps/edr-freight-api/src/modules/maintenance/maintenance.service.ts b/apps/edr-freight-api/src/modules/maintenance/maintenance.service.ts
index 8ef4800b6..dd9da55a8 100644
--- a/apps/edr-freight-api/src/modules/maintenance/maintenance.service.ts
+++ b/apps/edr-freight-api/src/modules/maintenance/maintenance.service.ts
@@ -1,16 +1,28 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
+import { Cron, CronExpression } from '@nestjs/schedule';
+import { NotificationAudience, NotificationType } from '@edr/types';
 import { DataSource, Repository } from 'typeorm';
 import { MaintenanceRepository } from './maintenance.repository';
-import { MaintenanceSchedule, MaintenanceStatus } from './entities/maintenance-schedule.entity';
+import { MaintenanceIntervalRepository } from './maintenance-interval.repository';
+import { MaintenanceSchedule, MaintenanceStatus, MaintenanceType } from './entities/maintenance-schedule.entity';
 import { MaintenanceCost } from './entities/maintenance-cost.entity';
 import { Vehicle, VehicleAvailability, VehicleStatus } from '../vehicles/entities/vehicle.entity';
-import { CreateMaintenanceScheduleDto, CreateMaintenanceCostDto, UpdateMaintenanceScheduleDto } from './dto/create-maintenance.dto';
+import {
+  CreateMaintenanceScheduleDto,
+  CreateMaintenanceCostDto,
+  UpdateMaintenanceScheduleDto,
+  UpsertMaintenanceIntervalDto,
+} from './dto/create-maintenance.dto';
+import { NotificationInboxService } from '../notification-inbox/notification-inbox.service';
 
 @Injectable()
 export class MaintenanceService {
+  private readonly logger = new Logger(MaintenanceService.name);
+
   constructor(
     private readonly maintenanceRepository: MaintenanceRepository,
+    private readonly intervalRepository: MaintenanceIntervalRepository,
     @InjectRepository(MaintenanceSchedule)
     private readonly scheduleRepository: Repository<MaintenanceSchedule>,
     @InjectRepository(MaintenanceCost)
@@ -18,8 +30,44 @@ export class MaintenanceService {
     // Vehicle isn't registered in this module's TypeOrmModule.forFeature, so we
     // reach it through the global DataSource rather than @InjectRepository.
     private readonly dataSource: DataSource,
+    private readonly inbox: NotificationInboxService,
   ) {}
 
+  /** Fleet-wide next-due board — see MaintenanceRepository.getDueBoard. */
+  async getDueBoard() {
+    return this.maintenanceRepository.getDueBoard();
+  }
+
+  /**
+   * Daily check: a vehicle's driven km (latest fuel-up odometer reading, since
+   * that's the only place mileage is actually recorded) or its due date has
+   * reached a SCHEDULED item's threshold → alert backoffice once.
+   */
+  @Cron(CronExpression.EVERY_DAY_AT_7AM, { name: 'maintenance-due-alert' })
+  async sendDueAlerts(): Promise<void> {
+    try {
+      const due = await this.maintenanceRepository.getUnnotifiedDue();
+      for (const item of due) {
+        const reason =
+          item.nextDueKm != null && (item.currentKm ?? 0) >= item.nextDueKm
+            ? `driven ${item.currentKm} km (due at ${item.nextDueKm} km)`
+            : `due ${new Date(item.nextDueDate as Date).toLocaleDateString()}`;
+        await this.inbox.notify({
+          recipients: { allBackoffice: true },
+          audience: NotificationAudience.BACKOFFICE,
+          type: NotificationType.GENERIC,
+          title: `Maintenance due — ${item.plateNumber}`,
+          body: `${item.plateNumber} (${item.maintenanceType}) is due for maintenance — ${reason}. ${item.description}`,
+          link: `/dashboard/maintenance?vehicleId=${item.vehicleId}`,
+          data: { vehicleId: item.vehicleId, scheduleId: item.id, action: 'MAINTENANCE_DUE' },
+        });
+        await this.scheduleRepository.update(item.id, { dueNotifiedAt: new Date() });
+      }
+    } catch (err) {
+      this.logger.error(`sendDueAlerts failed: ${(err as Error).message}`, (err as Error).stack);
+    }
+  }
+
   /**
    * Reflect a maintenance schedule's lifecycle on the target vehicle. A vehicle
    * under maintenance is taken out of service (MAINTENANCE + BUSY); once the
@@ -64,6 +112,10 @@ export class MaintenanceService {
     id: string,
     dto: UpdateMaintenanceScheduleDto,
   ): Promise<MaintenanceSchedule> {
+    // Status BEFORE the write: completing an already-COMPLETED schedule again
+    // must not auto-create a second "next" schedule.
+    const before = await this.scheduleRepository.findOneBy({ id });
+
     await this.scheduleRepository.update(id, {
       ...dto,
       completedDate: dto.completedDate ? new Date(dto.completedDate) : undefined,
@@ -78,6 +130,15 @@ export class MaintenanceService {
       ) {
         // Maintenance finished/aborted → vehicle back in service.
         await this.setVehicleMaintenanceState(updated.vehicleId, false);
+
+        // First transition into COMPLETED with an odometer → auto-schedule next.
+        if (
+          dto.status === MaintenanceStatus.COMPLETED &&
+          before?.status !== MaintenanceStatus.COMPLETED &&
+          updated.odometerReading != null
+        ) {
+          await this.scheduleNextMaintenance(updated);
+        }
       } else if (dto.status === MaintenanceStatus.IN_PROGRESS) {
         // Maintenance started → keep the vehicle out of service.
         await this.setVehicleMaintenanceState(updated.vehicleId, true);
@@ -87,6 +148,83 @@ export class MaintenanceService {
     return updated!;
   }
 
+  /** Define/adjust how often a vehicle needs a service ("oil change every 10,000 km"). */
+  async upsertInterval(dto: UpsertMaintenanceIntervalDto) {
+    return this.intervalRepository.upsertInterval(
+      dto.vehicleId,
+      dto.maintenanceType,
+      dto.serviceItem ?? null,
+      dto.intervalKm ?? null,
+      dto.intervalDays ?? null,
+      dto.description ?? null,
+    );
+  }
+
+  async getIntervals(vehicleId: string) {
+    return this.intervalRepository.getActiveIntervals(vehicleId);
+  }
+
+  async deactivateInterval(id: string): Promise<{ id: string; deactivated: boolean }> {
+    await this.intervalRepository.deactivate(id);
+    return { id, deactivated: true };
+  }
+
+  /**
+   * Auto-schedule the next service after a completion: matched on the
+   * completed schedule's (type, serviceItem) interval; one SCHEDULED row
+   * carrying BOTH thresholds when the interval defines km and days —
+   * whichever is crossed first makes it due.
+   */
+  private async scheduleNextMaintenance(completed: MaintenanceSchedule): Promise<void> {
+    try {
+      const interval = await this.intervalRepository.getByVehicleAndType(
+        completed.vehicleId,
+        completed.maintenanceType as MaintenanceType,
+        completed.serviceItem,
+      );
+
+      if (!interval) return; // No interval defined, skip auto-scheduling
+
+      const now = new Date();
+      const completedKm = Number(completed.odometerReading ?? 0);
+      const intervalKm = Number(interval.intervalKm ?? 0);
+      const intervalDays = Number(interval.intervalDays ?? 0);
+      if (intervalKm <= 0 && intervalDays <= 0) return;
+
+      const nextDueKm = intervalKm > 0 ? completedKm + intervalKm : undefined;
+      const nextDueDate =
+        intervalDays > 0
+          ? new Date(now.getTime() + intervalDays * 24 * 60 * 60 * 1000)
+          : undefined;
+
+      const label = interval.serviceItem ? `${interval.serviceItem}: ` : '';
+      const due = [
+        nextDueKm != null ? `${nextDueKm} km` : null,
+        nextDueDate != null ? nextDueDate.toISOString().slice(0, 10) : null,
+      ]
+        .filter(Boolean)
+        .join(' / ');
+
+      await this.scheduleRepository.save(
+        this.scheduleRepository.create({
+          vehicleId: completed.vehicleId,
+          maintenanceType: completed.maintenanceType,
+          serviceItem: completed.serviceItem ?? interval.serviceItem ?? null,
+          description: `${label}${interval.description || completed.description} (next due: ${due})`,
+          scheduledDate: now,
+          nextDueKm,
+          nextDueDate,
+          status: MaintenanceStatus.SCHEDULED,
+        }),
+      );
+    } catch (err) {
+      this.logger.error(
+        `Failed to schedule next maintenance for vehicle ${completed.vehicleId}: ${(err as Error).message}`,
+        (err as Error).stack,
+      );
+    }
+  }
+
   async getUpcomingMaintenance(vehicleId: string) {
     return this.maintenanceRepository.getUpcomingMaintenance(vehicleId);
   }
diff --git a/apps/edr-freight-api/src/modules/otp/otp.controller.spec.ts b/apps/edr-freight-api/src/modules/otp/otp.controller.spec.ts
index cac5fdba0..3aefe7cdb 100644
--- a/apps/edr-freight-api/src/modules/otp/otp.controller.spec.ts
+++ b/apps/edr-freight-api/src/modules/otp/otp.controller.spec.ts
@@ -1,5 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { OtpController } from './otp.controller';
+import { OtpService } from './otp.service';
 
 describe('OtpController', () => {
   let controller: OtpController;
@@ -7,6 +8,9 @@ describe('OtpController', () => {
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [OtpController],
+      providers: [
+        { provide: OtpService, useValue: { send: jest.fn(), verify: jest.fn() } },
+      ],
     }).compile();
 
     controller = module.get<OtpController>(OtpController);
diff --git a/apps/edr-freight-api/src/modules/otp/otp.service.spec.ts b/apps/edr-freight-api/src/modules/otp/otp.service.spec.ts
index 0494b48b6..00f8d107a 100644
--- a/apps/edr-freight-api/src/modules/otp/otp.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/otp/otp.service.spec.ts
@@ -1,33 +1,46 @@
-import { OtpService, normalizeOtpTarget } from './otp.service';
+import { OtpService, isDomesticPhone, normalizeOtpTarget } from "./otp.service";
 
-describe('normalizeOtpTarget', () => {
-  it('canonicalises Ethiopian forms to one E.164 key', () => {
-    const forms = ['+251986680099', '251986680099', '0986680099', '+251 98 668 0099'];
+describe("normalizeOtpTarget", () => {
+  it("canonicalises Ethiopian forms to one E.164 key", () => {
+    const forms = [
+      "+251986680099",
+      "251986680099",
+      "0986680099",
+      "+251 98 668 0099",
+    ];
     const keys = forms.map((phone) => normalizeOtpTarget({ phone }).phone);
-    expect(new Set(keys)).toEqual(new Set(['+251986680099']));
+    expect(new Set(keys)).toEqual(new Set(["+251986680099"]));
   });
 
-  it('maps local 07… mobile to +2517…', () => {
-    expect(normalizeOtpTarget({ phone: '0712345678' }).phone).toBe('+251712345678');
-  });
-
-  it('canonicalises email case and surrounding whitespace to one key', () => {
-    const forms = ['a@b.com', 'A@B.com', '  a@B.COM  ', 'A@b.COM'];
+  it("canonicalises email case and surrounding whitespace to one key", () => {
+    const forms = ["a@b.com", "A@B.com", "  a@B.COM  ", "A@b.COM"];
     const keys = forms.map((email) => normalizeOtpTarget({ email }).email);
-    expect(new Set(keys)).toEqual(new Set(['a@b.com']));
+    expect(new Set(keys)).toEqual(new Set(["a@b.com"]));
   });
 
-  it('keeps an already-normalised email stable (idempotent)', () => {
-    const once = normalizeOtpTarget({ email: ' User@Example.COM ' }).email!;
+  it("keeps an already-normalised email stable (idempotent)", () => {
+    const once = normalizeOtpTarget({ email: " User@Example.COM " }).email!;
     expect(normalizeOtpTarget({ email: once }).email).toBe(once);
   });
 
-  it('keeps an already-normalised number stable (idempotent)', () => {
-    const once = normalizeOtpTarget({ phone: '0986680099' }).phone!;
+  it("keeps an already-normalised number stable (idempotent)", () => {
+    const once = normalizeOtpTarget({ phone: "0986680099" }).phone!;
     expect(normalizeOtpTarget({ phone: once }).phone).toBe(once);
   });
 });
 
+describe("isDomesticPhone", () => {
+  it.each(["+251986680099", "0986680099", "251986680099"])(
+    "accepts Ethiopian mobile form %s",
+    (phone) => expect(isDomesticPhone(phone)).toBe(true),
+  );
+
+  it.each(["+14155550123", "+447911123456", "0712345678", "+2519866", "12345"])(
+    "rejects non-domestic or malformed %s",
+    (phone) => expect(isDomesticPhone(phone)).toBe(false),
+  );
+});
+
 interface FakeRow {
   id: string;
   phone?: string;
@@ -51,7 +64,8 @@ function makeService(
   let nextId = 1;
 
   const matches = (row: FakeRow, t: { phone?: string; email?: string }) =>
-    (!!t.email && row.email === t.email) || (!!t.phone && row.phone === t.phone);
+    (!!t.email && row.email === t.email) ||
+    (!!t.phone && row.phone === t.phone);
 
   const repo = {
     findByTarget: jest.fn(
@@ -89,30 +103,30 @@ function makeService(
   return { service, sms, email, rows: () => rows };
 }
 
-describe('OtpService — send/verify agree across phone formats', () => {
-  it('verifies a code sent to +251… when verify is called with 09…', async () => {
+describe("OtpService — send/verify agree across phone formats", () => {
+  it("verifies a code sent to +251… when verify is called with 09…", async () => {
     const { service, rows } = makeService();
-    await service.sendOtp({ phone: '+251986680099' });
+    await service.sendOtp({ phone: "+251986680099" });
 
     await expect(
-      service.verifyOtpForAction({ phone: '0986680099' }, rows()[0]!.otp),
+      service.verifyOtpForAction({ phone: "0986680099" }, rows()[0]!.otp),
     ).resolves.toEqual({ success: true });
   });
 
-  it('verifies a code sent to User@X.com when verify is called with user@x.com', async () => {
+  it("verifies a code sent to User@X.com when verify is called with user@x.com", async () => {
     const { service, rows } = makeService();
-    await service.sendOtp({ email: '  User@Example.COM ' });
+    await service.sendOtp({ email: "  User@Example.COM " });
 
     await expect(
-      service.verifyOtpForAction({ email: 'user@example.com' }, rows()[0]!.otp),
+      service.verifyOtpForAction({ email: "user@example.com" }, rows()[0]!.otp),
     ).resolves.toEqual({ success: true });
   });
 });
 
-describe('OtpService — dual-channel send', () => {
-  const both = { phone: '0986680099', email: 'User@Example.COM' };
+describe("OtpService — dual-channel send", () => {
+  const both = { phone: "0986680099", email: "User@Example.COM" };
 
-  it('sends ONE code to both transports', async () => {
+  it("sends ONE code to both transports", async () => {
     const { service, sms, email, rows } = makeService();
     await service.sendOtp(both);
 
@@ -122,72 +136,95 @@ describe('OtpService — dual-channel send', () => {
     // Same secret on both messages — the user types whichever arrives first.
     expect(sms.sendSms).toHaveBeenCalledWith(
       expect.objectContaining({
-        to: '+251986680099',
+        to: "+251986680099",
         message: expect.stringContaining(otp),
       }),
     );
     expect(email.sendEmail).toHaveBeenCalledWith(
       expect.objectContaining({
-        to: 'user@example.com',
+        to: "user@example.com",
         text: expect.stringContaining(otp),
       }),
     );
     // One row, both channels canonicalised.
     expect(rows()).toHaveLength(1);
     expect(rows()[0]).toMatchObject({
-      phone: '+251986680099',
-      email: 'user@example.com',
+      phone: "+251986680099",
+      email: "user@example.com",
     });
   });
 
   it.each([
-    ['phone alone', { phone: '0986680099' }],
-    ['email alone', { email: 'user@example.com' }],
-    ['both', both],
-  ])('verifies a dual-channel code when quoted back by %s', async (_label, target) => {
-    const { service, rows } = makeService();
-    await service.sendOtp(both);
+    ["phone alone", { phone: "0986680099" }],
+    ["email alone", { email: "user@example.com" }],
+    ["both", both],
+  ])(
+    "verifies a dual-channel code when quoted back by %s",
+    async (_label, target) => {
+      const { service, rows } = makeService();
+      await service.sendOtp(both);
 
-    await expect(
-      service.verifyOtpForAction(target, rows()[0]!.otp),
-    ).resolves.toEqual({ success: true });
-  });
+      await expect(
+        service.verifyOtpForAction(target, rows()[0]!.otp),
+      ).resolves.toEqual({ success: true });
+    },
+  );
 
-  it('consuming the code via one channel kills the other', async () => {
+  it("consuming the code via one channel kills the other", async () => {
     const { service, rows } = makeService();
     await service.sendOtp(both);
     const otp = rows()[0]!.otp;
 
-    await service.verifyOtpForAction({ email: 'user@example.com' }, otp);
+    await service.verifyOtpForAction({ email: "user@example.com" }, otp);
 
     // Single-use is per-code, not per-channel: the phone half must be dead too.
     await expect(
-      service.verifyOtpForAction({ phone: '0986680099' }, otp),
+      service.verifyOtpForAction({ phone: "0986680099" }, otp),
     ).rejects.toThrow(/No verification code was requested/);
   });
 
-  it('replaces an overlapping single-channel row instead of colliding with it', async () => {
+  it("replaces an overlapping single-channel row instead of colliding with it", async () => {
     const { service, rows } = makeService();
     // A pending signup code on the phone only, then a dual-channel send.
-    await service.sendOtp({ phone: '0986680099' });
+    await service.sendOtp({ phone: "0986680099" });
     await service.sendOtp(both);
 
     expect(rows()).toHaveLength(1);
-    expect(rows()[0]).toMatchObject({ email: 'user@example.com' });
+    expect(rows()[0]).toMatchObject({ email: "user@example.com" });
   });
 
-  it('degrades to one channel when the account has only one contact', async () => {
+  it("degrades to one channel when the account has only one contact", async () => {
     const { service, sms, email } = makeService();
-    await service.sendOtp({ phone: '0986680099' });
+    await service.sendOtp({ phone: "0986680099" });
 
     expect(sms.sendSms).toHaveBeenCalledTimes(1);
     expect(email.sendEmail).not.toHaveBeenCalled();
   });
 
-  it('still succeeds when one transport throws', async () => {
+  it("skips SMS for a foreign number when email is available", async () => {
+    const { service, sms, email, rows } = makeService();
+    await service.sendOtp({ phone: "+14155550123", email: "user@example.com" });
+
+    // The gateway is domestic-only — email is the delivery route, but the
+    // foreign phone stays on the row so verify still matches either channel.
+    expect(sms.sendSms).not.toHaveBeenCalled();
+    expect(email.sendEmail).toHaveBeenCalledTimes(1);
+    await expect(
+      service.verifyOtpForAction({ phone: "+14155550123" }, rows()[0]!.otp),
+    ).resolves.toEqual({ success: true });
+  });
+
+  it("still attempts SMS for a foreign number when it is the only channel", async () => {
+    const { service, sms } = makeService();
+    await service.sendOtp({ phone: "+14155550123" });
+
+    expect(sms.sendSms).toHaveBeenCalledTimes(1);
+  });
+
+  it("still succeeds when one transport throws", async () => {
     const { service, rows } = makeService({
       sms: async () => {
-        throw new Error('broker down');
+        throw new Error("broker down");
       },
     });
 
@@ -197,24 +234,24 @@ describe('OtpService — dual-channel send', () => {
     });
     // The code is live and verifiable on the channel that worked.
     await expect(
-      service.verifyOtpForAction({ email: 'user@example.com' }, rows()[0]!.otp),
+      service.verifyOtpForAction({ email: "user@example.com" }, rows()[0]!.otp),
     ).resolves.toEqual({ success: true });
   });
 
-  it('fails the request when every transport throws', async () => {
+  it("fails the request when every transport throws", async () => {
     const { service } = makeService({
       sms: async () => {
-        throw new Error('broker down');
+        throw new Error("broker down");
       },
       email: async () => {
-        throw new Error('broker down');
+        throw new Error("broker down");
       },
     });
 
-    await expect(service.sendOtp(both)).rejects.toThrow('Failed to send OTP');
+    await expect(service.sendOtp(both)).rejects.toThrow("Failed to send OTP");
   });
 
-  it('shares one brute-force budget across both channels', async () => {
+  it("shares one brute-force budget across both channels", async () => {
     const { service, rows } = makeService();
     await service.sendOtp(both);
     const otp = rows()[0]!.otp;
@@ -222,17 +259,17 @@ describe('OtpService — dual-channel send', () => {
     // Alternating channels must not hand the attacker two independent budgets:
     // 5 wrong guesses in total burn the code regardless of how they are split.
     for (const target of [
-      { phone: '0986680099' },
-      { email: 'user@example.com' },
-      { phone: '0986680099' },
-      { email: 'user@example.com' },
+      { phone: "0986680099" },
+      { email: "user@example.com" },
+      { phone: "0986680099" },
+      { email: "user@example.com" },
     ]) {
-      await expect(service.verifyOtpForAction(target, '000000')).rejects.toThrow(
-        'Invalid verification code',
-      );
+      await expect(
+        service.verifyOtpForAction(target, "000000"),
+      ).rejects.toThrow("Invalid verification code");
     }
     await expect(
-      service.verifyOtpForAction({ email: 'user@example.com' }, '000000'),
+      service.verifyOtpForAction({ email: "user@example.com" }, "000000"),
     ).rejects.toThrow(/Too many incorrect attempts/);
 
     // Burned: even the correct code no longer works.
diff --git a/apps/edr-freight-api/src/modules/otp/otp.service.ts b/apps/edr-freight-api/src/modules/otp/otp.service.ts
index e19323067..557548b00 100644
--- a/apps/edr-freight-api/src/modules/otp/otp.service.ts
+++ b/apps/edr-freight-api/src/modules/otp/otp.service.ts
@@ -36,9 +36,9 @@ function channelsOf(target: OtpTarget): Array<"email" | "sms"> {
  */
 function normalizePhone(rawPhone: string): string {
   const raw = rawPhone.trim();
-  const digits = raw.replace(/[^\d+]/g, '');
-  if (digits.startsWith('+')) return digits;
-  const bare = digits.replace(/^0+/, '');
+  const digits = raw.replace(/[^\d+]/g, "");
+  if (digits.startsWith("+")) return digits;
+  const bare = digits.replace(/^0+/, "");
   if (/^251\d{9}$/.test(digits)) return `+${digits}`;
   if (/^9\d{8}$|^7\d{8}$/.test(bare)) return `+251${bare}`;
   // Unknown shape (foreign number, already-clean intl without +) — prefix + if
@@ -46,6 +46,16 @@ function normalizePhone(rawPhone: string): string {
   return digits.length >= 11 ? `+${digits}` : raw;
 }
 
+/**
+ * Whether a phone is an Ethiopian mobile the SMS gateway can actually reach —
+ * the carrier integration is domestic-only, so a send to anything else is
+ * queued and silently lost. Callers use this to fall back to email instead of
+ * pretending an SMS is on its way.
+ */
+export function isDomesticPhone(rawPhone: string): boolean {
+  return /^\+2519\d{8}$/.test(normalizePhone(rawPhone));
+}
+
 /**
  * Canonicalise every channel present on the target. Each field is normalised
  * independently — a dual-channel target must end up with both halves in their
@@ -143,6 +153,20 @@ export class OtpService {
       // /otp/verify routes (a NestJS ThrottlerGuard / @Throttle) — none exists
       // in the codebase yet.
 
+      // A foreign number is unreachable by the domestic-only SMS gateway; when
+      // email is also on the target, go email-only rather than queueing an SMS
+      // that will never arrive. With no email the SMS attempt stays — it is the
+      // only route there is.
+      const smsPhone =
+        target.phone && (!target.email || isDomesticPhone(target.phone))
+          ? target.phone
+          : null;
+      if (target.phone && !smsPhone) {
+        this.logger.warn(
+          `otp.dispatch.sms-skipped target=${label} — non-domestic phone, delivering via email only`,
+        );
+      }
+
       // Fan out to every channel the target has, independently: one transport
       // being down must not suppress the other, which is the whole point of
       // sending to both. Each helper swallows its own failure so a rejected
@@ -150,16 +174,14 @@ export class OtpService {
       const outcomes = (
         await Promise.all([
           target.email ? this.dispatchEmail(target.email, otp) : null,
-          target.phone ? this.dispatchSms(target.phone, otp) : null,
+          smsPhone ? this.dispatchSms(smsPhone, otp) : null,
         ])
       ).filter((outcome): outcome is DispatchOutcome => outcome !== null);
 
       for (const outcome of outcomes) {
         this.logger.log(
-          `otp.dispatch channel=${outcome.channel} target=${label} queued=${
-            outcome.queued
-          } latencyMs=${Date.now() - startedAt}${
-            outcome.error ? ` error=${outcome.error}` : ""
+          `otp.dispatch channel=${outcome.channel} target=${label} queued=${outcome.queued
+          } latencyMs=${Date.now() - startedAt}${outcome.error ? ` error=${outcome.error}` : ""
           }`,
         );
       }
@@ -183,8 +205,7 @@ export class OtpService {
         // user who never receives a code — indistinguishable from carrier loss,
         // and the misleading success response makes it look like our side worked.
         this.logger.error(
-          `otp.dispatch.dropped channels=${channels.join("+")} target=${label} rabbitmqEnabled=${
-            process.env.RABBITMQ_ENABLED ?? "unset"
+          `otp.dispatch.dropped channels=${channels.join("+")} target=${label} rabbitmqEnabled=${process.env.RABBITMQ_ENABLED ?? "unset"
           } — no transport reported hand-off; no code will arrive for this send`,
         );
       }
@@ -209,8 +230,7 @@ export class OtpService {
       // Log the real cause (DB/SMS/email failure) with its stack so a deployed
       // "Failed to send OTP" 400 is diagnosable from the API logs, not opaque.
       this.logger.error(
-        `otp.dispatch.failed channels=${channels.join("+")} target=${label} latencyMs=${
-          Date.now() - startedAt
+        `otp.dispatch.failed channels=${channels.join("+")} target=${label} latencyMs=${Date.now() - startedAt
         }: ${error instanceof Error ? error.message : String(error)}`,
         error instanceof Error ? error.stack : undefined,
       );
@@ -270,9 +290,7 @@ export class OtpService {
    * address while printing the credential next to it would buy nothing.
    */
   private targetLabel(target: OtpTarget): string {
-    return (
-      [target.email, target.phone].filter(Boolean).join("+") || "unknown"
-    );
+    return [target.email, target.phone].filter(Boolean).join("+") || "unknown";
   }
 
   /**
@@ -288,9 +306,8 @@ export class OtpService {
   ) {
     const line = `otp.verify channels=${channelsOf(target).join(
       "+",
-    )} target=${this.targetLabel(target)} mode=${mode} result=${result}${
-      detail ? ` ${detail}` : ""
-    }`;
+    )} target=${this.targetLabel(target)} mode=${mode} result=${result}${detail ? ` ${detail}` : ""
+      }`;
     if (result === "ok") this.logger.log(line);
     else this.logger.warn(line);
   }
@@ -439,7 +456,12 @@ export class OtpService {
       await this.otpRepository.deleteOtp(otpData);
       this.actionAttempts.delete(key);
 
-      this.logVerify(target, "action", "expired", `ageMs=${ageMs} ttlMs=${ttlMs}`);
+      this.logVerify(
+        target,
+        "action",
+        "expired",
+        `ageMs=${ageMs} ttlMs=${ttlMs}`,
+      );
       throw new BadRequestException(
         "Verification code has expired. Request a new one.",
       );
diff --git a/apps/edr-freight-api/src/modules/payment/payment.controller.ts b/apps/edr-freight-api/src/modules/payment/payment.controller.ts
index 50856c3d7..2ae62d4f3 100644
--- a/apps/edr-freight-api/src/modules/payment/payment.controller.ts
+++ b/apps/edr-freight-api/src/modules/payment/payment.controller.ts
@@ -16,7 +16,8 @@ import {
 } from "@nestjs/swagger";
 import { Response } from "express";
 import { Public } from "@edr/api-common";
-import { BookingView } from "../../common/booking-guards";
+import { BookingStaff, BookingView } from "../../common/booking-guards";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import { PaymentService } from "./payment.service";
 import { IntentStatusDto } from "./payments.dto";
 
@@ -25,7 +26,9 @@ import { IntentStatusDto } from "./payments.dto";
 export class PaymentController {
     constructor(private readonly paymentService: PaymentService) { }
 
+    // Customer-detail payments tab — same one-of rule as the bookings tab.
     @Get("by-company/:companyId/customer-view")
+    @BookingStaff([FREIGHT_PERMS.customers.view, FREIGHT_PERMS.payments.view])
     @ApiOperation({ summary: "List payments for a company (customer-view shape, backoffice)" })
     findByCompanyCustomerView(
         @Param("companyId", ParseUUIDPipe) companyId: string,
diff --git a/apps/edr-freight-api/src/modules/procurement/dto/procurement.dto.ts b/apps/edr-freight-api/src/modules/procurement/dto/procurement.dto.ts
index 943d79296..cfab53a5d 100644
--- a/apps/edr-freight-api/src/modules/procurement/dto/procurement.dto.ts
+++ b/apps/edr-freight-api/src/modules/procurement/dto/procurement.dto.ts
@@ -7,6 +7,7 @@ import {
   IsOptional,
   IsEnum,
   IsBoolean,
+  MinLength,
 } from 'class-validator';
 import { VendorType } from '../entities/vendor.entity';
 import { AcquisitionType, AcquisitionStatus } from '../entities/asset-acquisition.entity';
@@ -72,6 +73,11 @@ export class UpdateVendorDto {
 }
 
 export class CreateAcquisitionDto {
+  /** WHAT was acquired — required so an acquisition can't be saved empty. */
+  @IsString()
+  @MinLength(2)
+  itemName!: string;
+
   @IsOptional()
   @IsUUID()
   vehicleId?: string;
@@ -120,6 +126,11 @@ export class CreateAcquisitionDto {
 }
 
 export class UpdateAcquisitionDto {
+  @IsOptional()
+  @IsString()
+  @MinLength(2)
+  itemName?: string;
+
   @IsOptional()
   @IsUUID()
   vehicleId?: string;
diff --git a/apps/edr-freight-api/src/modules/procurement/entities/asset-acquisition.entity.ts b/apps/edr-freight-api/src/modules/procurement/entities/asset-acquisition.entity.ts
index d4f781c15..e1a9f4ff5 100644
--- a/apps/edr-freight-api/src/modules/procurement/entities/asset-acquisition.entity.ts
+++ b/apps/edr-freight-api/src/modules/procurement/entities/asset-acquisition.entity.ts
@@ -18,6 +18,12 @@ export enum AcquisitionStatus {
 @Entity({ name: 'asset_acquisitions', schema: 'freight' })
 @Index(['vehicleId', 'acquisitionDate'])
 export class AssetAcquisition extends BaseEntity {
+  /** WHAT was acquired (vehicle, parts, equipment…) — the asset itself. */
+  @Column({ name: 'item_name', type: 'varchar', length: 200, nullable: true })
+  itemName?: string;
+
+  /** Optional link — only when the acquisition IS a fleet vehicle. Parts and
+   *  general procurement stay unlinked so reports don't misattribute them. */
   @Column({ name: 'vehicle_id', type: 'uuid', nullable: true })
   vehicleId?: string;
 
diff --git a/apps/edr-freight-api/src/modules/procurement/procurement.acquisition-guard.spec.ts b/apps/edr-freight-api/src/modules/procurement/procurement.acquisition-guard.spec.ts
new file mode 100644
index 000000000..8004d9d9e
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/procurement/procurement.acquisition-guard.spec.ts
@@ -0,0 +1,50 @@
+import { BadRequestException } from '@nestjs/common';
+
+import { ProcurementService } from './procurement.service';
+import { AcquisitionType } from './entities/asset-acquisition.entity';
+
+// PURCHASE acquisitions must not carry lease terms; LEASE/RENTAL may.
+describe('ProcurementService acquisition lease-field guard', () => {
+  const repo = {
+    createAcquisition: jest.fn(async (dto) => dto),
+    findAcquisitionById: jest.fn(async () => ({ acquisitionType: AcquisitionType.PURCHASE })),
+    updateAcquisition: jest.fn(async (_id, dto) => dto),
+  };
+  const svc = new ProcurementService(repo as never);
+
+  it('rejects a PURCHASE with lease dates', async () => {
+    await expect(
+      svc.createAcquisition({
+        itemName: 'Brake pads',
+        acquisitionType: AcquisitionType.PURCHASE,
+        acquisitionDate: '2026-07-22',
+        leaseStart: '2026-07-01',
+      } as never),
+    ).rejects.toThrow(BadRequestException);
+  });
+
+  it('accepts a LEASE with lease dates and a plain PURCHASE', async () => {
+    await expect(
+      svc.createAcquisition({
+        itemName: 'Rented crane',
+        acquisitionType: AcquisitionType.LEASE,
+        acquisitionDate: '2026-07-22',
+        leaseStart: '2026-07-01',
+        leaseEnd: '2027-07-01',
+      } as never),
+    ).resolves.toBeDefined();
+    await expect(
+      svc.createAcquisition({
+        itemName: 'Brake pads',
+        acquisitionType: AcquisitionType.PURCHASE,
+        acquisitionDate: '2026-07-22',
+      } as never),
+    ).resolves.toBeDefined();
+  });
+
+  it('rejects adding lease terms to an acquisition that is a PURCHASE', async () => {
+    await expect(
+      svc.updateAcquisition('a1', { monthlyPayment: 500 } as never),
+    ).rejects.toThrow(BadRequestException);
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/procurement/procurement.service.ts b/apps/edr-freight-api/src/modules/procurement/procurement.service.ts
index e799d5ff9..7095a6a09 100644
--- a/apps/edr-freight-api/src/modules/procurement/procurement.service.ts
+++ b/apps/edr-freight-api/src/modules/procurement/procurement.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import { ProcurementRepository } from './procurement.repository';
 import { Vendor } from './entities/vendor.entity';
-import { AssetAcquisition } from './entities/asset-acquisition.entity';
+import { AcquisitionType, AssetAcquisition } from './entities/asset-acquisition.entity';
 import { AssetDisposal } from './entities/asset-disposal.entity';
 import {
   CreateVendorDto,
@@ -51,7 +51,23 @@ export class ProcurementService {
   }
 
   // ---- Acquisitions ----
+  /** Lease terms only make sense on LEASE / RENTAL — a PURCHASE must not carry them. */
+  private assertLeaseFieldsValid(dto: {
+    acquisitionType?: string;
+    leaseStart?: string;
+    leaseEnd?: string;
+    monthlyPayment?: number;
+  }): void {
+    if (dto.acquisitionType !== AcquisitionType.PURCHASE) return;
+    if (dto.leaseStart || dto.leaseEnd || dto.monthlyPayment != null) {
+      throw new BadRequestException(
+        'Lease start/end and monthly payment are not valid for a PURCHASE acquisition',
+      );
+    }
+  }
+
   async createAcquisition(dto: CreateAcquisitionDto): Promise<AssetAcquisition> {
+    this.assertLeaseFieldsValid(dto);
     return this.procurementRepository.createAcquisition(dto);
   }
 
@@ -64,6 +80,20 @@ export class ProcurementService {
   }
 
   async updateAcquisition(id: string, dto: UpdateAcquisitionDto): Promise<AssetAcquisition | null> {
+    // Validate against the resulting record, not just the patch — switching an
+    // acquisition to PURCHASE must also shed any stored lease terms.
+    const existing = await this.procurementRepository.findAcquisitionById(id);
+    if (existing) {
+      const next = { ...existing, ...dto };
+      if (next.acquisitionType === AcquisitionType.PURCHASE) {
+        this.assertLeaseFieldsValid({
+          acquisitionType: next.acquisitionType,
+          leaseStart: dto.leaseStart,
+          leaseEnd: dto.leaseEnd,
+          monthlyPayment: dto.monthlyPayment,
+        });
+      }
+    }
     return this.procurementRepository.updateAcquisition(id, dto);
   }
 
diff --git a/apps/edr-freight-api/src/modules/routes/routes.controller.ts b/apps/edr-freight-api/src/modules/routes/routes.controller.ts
index 8c25d67b3..cf2314156 100644
--- a/apps/edr-freight-api/src/modules/routes/routes.controller.ts
+++ b/apps/edr-freight-api/src/modules/routes/routes.controller.ts
@@ -2,6 +2,7 @@ import { Body, Controller, Delete, Get, Param, ParseUUIDPipe, Patch, Post, Query
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 
 import { FleetManage, FleetView } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { CreateRouteDto } from './dto/create-route.dto';
 import { FilterRoutesDto } from './dto/filter-routes.dto';
 import { UpdateRouteDto } from './dto/update-route.dto';
@@ -10,7 +11,7 @@ import { RoutesService } from './routes.service';
 @ApiTags('routes')
 @ApiBearerAuth()
 @Controller('routes')
-@FleetView()
+@FleetView(FREIGHT_PERMS.routes.view)
 export class RoutesController {
   constructor(private readonly routesService: RoutesService) {}
 
@@ -27,21 +28,21 @@ export class RoutesController {
   }
 
   @Post()
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.routes.create)
   @ApiOperation({ summary: 'Create route' })
   create(@Body() dto: CreateRouteDto) {
     return this.routesService.create(dto);
   }
 
   @Patch(':id')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.routes.update)
   @ApiOperation({ summary: 'Update route' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateRouteDto) {
     return this.routesService.update(id, dto);
   }
 
   @Delete(':id')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.routes.delete)
   @ApiOperation({ summary: 'Deactivate route' })
   remove(@Param('id', ParseUUIDPipe) id: string) {
     return this.routesService.deactivate(id);
diff --git a/apps/edr-freight-api/src/modules/rule-engine/controllers/cargo-types.controller.ts b/apps/edr-freight-api/src/modules/rule-engine/controllers/cargo-types.controller.ts
index 421e49165..3b1bf6ce1 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/controllers/cargo-types.controller.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/controllers/cargo-types.controller.ts
@@ -3,7 +3,8 @@ import {
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
+import { RuleEngineManage } from '../../../common/rule-engine-guards';
+import { StaffReference } from '../../../common/booking-guards';
 import { CreateCargoTypeDto } from '../dto/create-cargo-type.dto';
 import { ListCargoTypesQueryDto } from '../dto/list-rule-engine-query.dto';
 import { MoveOrderDto } from '../dto/move-order.dto';
@@ -18,7 +19,7 @@ export class CargoTypesController {
   constructor(private readonly service: CargoTypesService) {}
 
   @Get()
-  @RuleEngineView('cargo-types')
+  @StaffReference()
   @ApiOperation({ summary: 'List cargo types' })
   findAll(@Query() query: ListCargoTypesQueryDto) {
     return this.service.findAll(query);
@@ -41,7 +42,7 @@ export class CargoTypesController {
   }
 
   @Get(':id')
-  @RuleEngineView('cargo-types')
+  @StaffReference()
   @ApiOperation({ summary: 'Get a cargo type by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
diff --git a/apps/edr-freight-api/src/modules/rule-engine/controllers/container-types.controller.ts b/apps/edr-freight-api/src/modules/rule-engine/controllers/container-types.controller.ts
index 3c1c27c7c..9ae96af9b 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/controllers/container-types.controller.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/controllers/container-types.controller.ts
@@ -3,7 +3,8 @@ import {
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
+import { RuleEngineManage } from '../../../common/rule-engine-guards';
+import { StaffReference } from '../../../common/booking-guards';
 import { CreateContainerTypeDto } from '../dto/create-container-type.dto';
 import { ListContainerTypesQueryDto } from '../dto/list-rule-engine-query.dto';
 import { MoveOrderDto } from '../dto/move-order.dto';
@@ -18,7 +19,7 @@ export class ContainerTypesController {
   constructor(private readonly service: ContainerTypesService) {}
 
   @Get()
-  @RuleEngineView('container-types')
+  @StaffReference()
   @ApiOperation({ summary: 'List container types' })
   findAll(@Query() query: ListContainerTypesQueryDto) {
     return this.service.findAll(query);
@@ -41,7 +42,7 @@ export class ContainerTypesController {
   }
 
   @Get(':id')
-  @RuleEngineView('container-types')
+  @StaffReference()
   @ApiOperation({ summary: 'Get a container type by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
diff --git a/apps/edr-freight-api/src/modules/rule-engine/controllers/service-types.controller.ts b/apps/edr-freight-api/src/modules/rule-engine/controllers/service-types.controller.ts
index c36d4fd79..85d76b326 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/controllers/service-types.controller.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/controllers/service-types.controller.ts
@@ -2,7 +2,8 @@ import {
   Body, Controller, Delete, Get, HttpCode, HttpStatus,
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
-import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
+import { RuleEngineManage } from '../../../common/rule-engine-guards';
+import { StaffReference } from '../../../common/booking-guards';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateServiceTypeDto } from '../dto/create-service-type.dto';
 import { ListServiceTypesQueryDto } from '../dto/list-rule-engine-query.dto';
@@ -18,7 +19,7 @@ export class ServiceTypesController {
   constructor(private readonly service: ServiceTypesService) {}
 
   @Get()
-  @RuleEngineView('service-types')
+  @StaffReference()
   @ApiOperation({ summary: 'List service types' })
   findAll(@Query() query: ListServiceTypesQueryDto) {
     return this.service.findAll(query);
@@ -41,7 +42,7 @@ export class ServiceTypesController {
   }
 
   @Get(':id')
-  @RuleEngineView('service-types')
+  @StaffReference()
   @ApiOperation({ summary: 'Get a service type by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
diff --git a/apps/edr-freight-api/src/modules/rule-engine/controllers/shipping-lines.controller.ts b/apps/edr-freight-api/src/modules/rule-engine/controllers/shipping-lines.controller.ts
index baec6b785..f078624eb 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/controllers/shipping-lines.controller.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/controllers/shipping-lines.controller.ts
@@ -2,7 +2,8 @@ import {
   Body, Controller, Delete, Get, HttpCode, HttpStatus,
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
-import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
+import { RuleEngineManage } from '../../../common/rule-engine-guards';
+import { StaffReference } from '../../../common/booking-guards';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateShippingLineDto } from '../dto/create-shipping-line.dto';
 import { ListRuleEngineQueryDto } from '../dto/list-rule-engine-query.dto';
@@ -16,14 +17,14 @@ export class ShippingLinesController {
   constructor(private readonly service: ShippingLinesService) {}
 
   @Get()
-  @RuleEngineView('shipping-lines')
+  @StaffReference()
   @ApiOperation({ summary: 'List shipping lines' })
   findAll(@Query() query: ListRuleEngineQueryDto) {
     return this.service.findAll(query);
   }
 
   @Get(':id')
-  @RuleEngineView('shipping-lines')
+  @StaffReference()
   @ApiOperation({ summary: 'Get a shipping line by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
diff --git a/apps/edr-freight-api/src/modules/rule-engine/controllers/yard-distances.controller.ts b/apps/edr-freight-api/src/modules/rule-engine/controllers/yard-distances.controller.ts
index c43e7e4e0..b0ba2c8d5 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/controllers/yard-distances.controller.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/controllers/yard-distances.controller.ts
@@ -12,7 +12,8 @@ import {
   Query,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
+import { RuleEngineManage } from '../../../common/rule-engine-guards';
+import { StaffReference } from '../../../common/booking-guards';
 import { CreateYardDistanceDto } from '../dto/create-yard-distance.dto';
 import { ListYardDistancesQueryDto } from '../dto/list-rule-engine-query.dto';
 import { UpdateYardDistanceDto } from '../dto/update-yard-distance.dto';
@@ -25,14 +26,14 @@ export class YardDistancesController {
   constructor(private readonly service: YardDistancesService) {}
 
   @Get()
-  @RuleEngineView('yard-distances')
+  @StaffReference()
   @ApiOperation({ summary: 'List yard distances' })
   findAll(@Query() query: ListYardDistancesQueryDto) {
     return this.service.findAll(query);
   }
 
   @Get(':id')
-  @RuleEngineView('yard-distances')
+  @StaffReference()
   @ApiOperation({ summary: 'Get a yard distance by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
diff --git a/apps/edr-freight-api/src/modules/rule-engine/controllers/yards.controller.ts b/apps/edr-freight-api/src/modules/rule-engine/controllers/yards.controller.ts
index 40b2764bf..b8f88b6b3 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/controllers/yards.controller.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/controllers/yards.controller.ts
@@ -2,7 +2,8 @@ import {
   Body, Controller, Delete, Get, HttpCode, HttpStatus,
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
-import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
+import { RuleEngineManage } from '../../../common/rule-engine-guards';
+import { StaffReference } from '../../../common/booking-guards';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateYardDto } from '../dto/create-yard.dto';
 import { ListYardsQueryDto } from '../dto/list-rule-engine-query.dto';
@@ -18,7 +19,9 @@ export class YardsController {
   constructor(private readonly service: YardsService) {}
 
   @Get()
-  @RuleEngineView('yards')
+  // Reference read: every staff form/search needs the yard list (origin /
+  // destination pickers), so login is the only requirement.
+  @StaffReference()
   @ApiOperation({ summary: 'List yards' })
   findAll(@Query() query: ListYardsQueryDto) {
     return this.service.findAll(query);
@@ -41,7 +44,7 @@ export class YardsController {
   }
 
   @Get(':id')
-  @RuleEngineView('yards')
+  @StaffReference()
   @ApiOperation({ summary: 'Get a yard by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
diff --git a/apps/edr-freight-api/src/modules/rule-engine/dto/create-rate.dto.ts b/apps/edr-freight-api/src/modules/rule-engine/dto/create-rate.dto.ts
index 41971bbf1..4f9d06870 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/dto/create-rate.dto.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/dto/create-rate.dto.ts
@@ -10,6 +10,7 @@ import {
 const TRADE_DIRECTIONS = ['IMPORT', 'EXPORT', 'BOTH'] as const;
 const CURRENCIES = ['USD'] as const;
 export const INTERCITY_KINDS = ['CONTAINER', 'BULK'] as const;
+export const CARGO_KINDS = ['CONTAINER', 'BULK'] as const;
 
 export class CreateRateDto {
   @ApiProperty({ enum: RATE_APPLIES_TO, description: 'Friendly category the rate applies to' })
@@ -47,6 +48,15 @@ export class CreateRateDto {
   @IsIn([...INTERCITY_KINDS])
   intercityKind?: string;
 
+  @ApiPropertyOptional({
+    enum: CARGO_KINDS,
+    description:
+      'Whether a customs clearance rate covers containers or bulk. Required when trigger = CUSTOMS_CLEARANCE. Not stored — container fees carry a containerTypeId, bulk fees none.',
+  })
+  @IsOptional()
+  @IsIn([...CARGO_KINDS])
+  cargoKind?: string;
+
   @ApiPropertyOptional({
     description:
       'FK to yards.id — origin of the leg this rate prices. Required for base freight (bulk/container/intercity), rejected for surcharges and first/last mile.',
diff --git a/apps/edr-freight-api/src/modules/rule-engine/dto/list-rule-engine-query.dto.ts b/apps/edr-freight-api/src/modules/rule-engine/dto/list-rule-engine-query.dto.ts
index 30241ddaa..d22bd84a7 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/dto/list-rule-engine-query.dto.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/dto/list-rule-engine-query.dto.ts
@@ -125,6 +125,22 @@ export class ListRatesQueryDto extends PaginationQueryDto {
   @IsString()
   @MaxLength(50)
   rateType?: string;
+
+  @ApiPropertyOptional({
+    description: 'Filter by rate category — comma-separated appliesTo values (e.g. "CONTAINER" or "FIRST_MILE,LAST_MILE").',
+  })
+  @IsOptional()
+  @IsString()
+  @MaxLength(100)
+  appliesTo?: string;
+
+  @ApiPropertyOptional({
+    description: 'Filter by surcharge trigger — comma-separated trigger values (e.g. "CUSTOMS_CLEARANCE" or "HAZARDOUS,REEFER").',
+  })
+  @IsOptional()
+  @IsString()
+  @MaxLength(200)
+  trigger?: string;
 }
 
 export class ListWeightLimitRulesQueryDto extends PaginationQueryDto {
diff --git a/apps/edr-freight-api/src/modules/rule-engine/entities/rate-unit.util.ts b/apps/edr-freight-api/src/modules/rule-engine/entities/rate-unit.util.ts
index 78e2eb724..3519a0c06 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/entities/rate-unit.util.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/entities/rate-unit.util.ts
@@ -13,6 +13,8 @@ import type { RateAppliesTo, RateTrigger, RateUnit } from './rate.entity';
 export function allowedRateUnits(input: {
   appliesTo: RateAppliesTo;
   trigger: RateTrigger;
+  /** CUSTOMS_CLEARANCE only: which cargo kind the fee covers. */
+  cargoKind?: 'CONTAINER' | 'BULK' | null;
 }): RateUnit[] {
   const { appliesTo, trigger } = input;
 
@@ -29,16 +31,20 @@ export function allowedRateUnits(input: {
       case 'DEMURRAGE':
         return ['PER_CONTAINER', 'PER_TON'];
       case 'WITH_RETURN':
-        // Container-only empty-return service — bills per returned container.
-        return ['PER_CONTAINER', 'FLAT'];
+        // Container-only empty-return service — per returned container, per
+        // wagon the empties ride back on, or a flat fee.
+        return ['PER_CONTAINER', 'PER_WAGON', 'FLAT'];
       case 'CANCELLATION':
         return ['FLAT', 'PER_INVOICE'];
       case 'CUSTOMS_CLEARANCE':
-        // Flat per clearance (ONE_TIME contract) / per shipment request (GENERAL).
-        return ['FLAT'];
+        // Sold per cargo kind: container fees bill per box or per wagon, bulk
+        // fees per ton or per wagon. Billed on the booking invoice.
+        return input.cargoKind === 'BULK'
+          ? ['PER_TON', 'PER_WAGON']
+          : ['PER_CONTAINER', 'PER_WAGON'];
       case 'LASHING':
-        // Flat cargo-securing fee, billed once per booking.
-        return ['FLAT'];
+        // Bulk-only cargo securing — per ton or per wagon.
+        return ['PER_TON', 'PER_WAGON'];
       case 'CONSOLIDATION':
         return ['PER_CONTAINER', 'FLAT'];
       case 'SHIPPING_LINE':
@@ -74,6 +80,7 @@ export function defaultRateUnit(input: { appliesTo: RateAppliesTo; trigger: Rate
 export function isRateUnitAllowed(input: {
   appliesTo: RateAppliesTo;
   trigger: RateTrigger;
+  cargoKind?: 'CONTAINER' | 'BULK' | null;
   unit: RateUnit;
 }): boolean {
   return allowedRateUnits(input).includes(input.unit);
diff --git a/apps/edr-freight-api/src/modules/rule-engine/repositories/rates.repository.ts b/apps/edr-freight-api/src/modules/rule-engine/repositories/rates.repository.ts
index 48a948784..bdec72e46 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/repositories/rates.repository.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/repositories/rates.repository.ts
@@ -117,6 +117,21 @@ export class RatesRepository implements IRatesRepository {
     if (query.rateType) {
       qb.andWhere('rate.rateType = :rateType', { rateType: query.rateType });
     }
+    // Category tabs on the admin page: comma-separated appliesTo / trigger
+    // lists, ANDed together (e.g. appliesTo=OTHER + trigger=CUSTOMS_CLEARANCE).
+    const csv = (v?: string) =>
+      (v ?? '')
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean);
+    const appliesTo = csv(query.appliesTo);
+    if (appliesTo.length > 0) {
+      qb.andWhere('rate.appliesTo IN (:...appliesTo)', { appliesTo });
+    }
+    const triggers = csv(query.trigger);
+    if (triggers.length > 0) {
+      qb.andWhere('rate.trigger IN (:...triggers)', { triggers });
+    }
     if (query.search) {
       qb.andWhere(
         '(rate.rateType ILIKE :search OR rate.status ILIKE :search OR rate.rateUnit ILIKE :search OR rate.currency ILIKE :search)',
diff --git a/apps/edr-freight-api/src/modules/rule-engine/rule-engine.service.spec.ts b/apps/edr-freight-api/src/modules/rule-engine/rule-engine.service.spec.ts
new file mode 100644
index 000000000..a736d4b05
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/rule-engine/rule-engine.service.spec.ts
@@ -0,0 +1,424 @@
+import { RuleEngineService } from './rule-engine.service';
+import type { BookingEvaluationInput } from './rule-engine.service';
+import type { Rate } from './entities/rate.entity';
+
+describe('RuleEngineService — requested service without a configured surcharge rate', () => {
+  const hazardRate: Rate = {
+    id: 'rate-hazard',
+    rateType: 'HAZARD_SURCHARGE',
+    trigger: 'HAZARDOUS',
+    rateValue: 50,
+    rateUnit: 'PER_CONTAINER',
+    currency: 'USD',
+    status: 'LIVE',
+    containerTypeId: null,
+    cargoTypeId: null,
+  } as Rate;
+
+  let ratesRepo: { findLiveRates: jest.Mock };
+  let service: RuleEngineService;
+
+  beforeEach(() => {
+    ratesRepo = { findLiveRates: jest.fn().mockResolvedValue([]) };
+    service = new RuleEngineService(
+      { findById: jest.fn().mockResolvedValue(null) } as never, // cargoTypes
+      { findById: jest.fn().mockResolvedValue(null) } as never, // serviceTypes
+      { findActiveByContainerTypeId: jest.fn().mockResolvedValue([]) } as never, // weightLimits
+      { findAllActive: jest.fn().mockResolvedValue([]) } as never, // priorityConfigs
+      ratesRepo as never,
+      { findById: jest.fn().mockResolvedValue(null) } as never, // shippingLines
+      {} as never, // dataSource (unused by evaluate)
+    );
+  });
+
+  const input = (overrides: Partial<BookingEvaluationInput>): BookingEvaluationInput => ({
+    serviceTypeId: 'svc-1',
+    paymentCurrency: 'USD',
+    tradeDirection: 'IMPORT',
+    isHazardous: false,
+    totalWagons: 1,
+    containers: [],
+    ...overrides,
+  });
+
+  it('hard-blocks a hazardous booking when no HAZARDOUS surcharge rate is LIVE', async () => {
+    const result = await service.evaluate(input({ isHazardous: true }));
+    expect(result.hardBlocked).toHaveLength(1);
+    expect(result.hardBlocked[0]).toContain('hazardous');
+  });
+
+  it('passes a hazardous booking when a HAZARDOUS surcharge rate is LIVE', async () => {
+    ratesRepo.findLiveRates.mockResolvedValue([hazardRate]);
+    const result = await service.evaluate(input({ isHazardous: true }));
+    expect(result.hardBlocked).toHaveLength(0);
+  });
+
+  it('does not block a non-hazardous booking when no surcharge rates exist', async () => {
+    const result = await service.evaluate(input({}));
+    expect(result.hardBlocked).toHaveLength(0);
+  });
+
+  it('hard-blocks on per-container opt-in counts even without the booking-level flag', async () => {
+    const result = await service.evaluate(
+      input({
+        containers: [
+          {
+            containerTypeId: 'ct-20',
+            quantity: 2,
+            vgmPerUnitTons: 10,
+            totalVgmTons: 20,
+            reeferQuantity: 1,
+          },
+        ],
+      }),
+    );
+    expect(result.hardBlocked).toHaveLength(1);
+    expect(result.hardBlocked[0]).toContain('reefer');
+  });
+});
+
+describe('RuleEngineService — overweight surcharge by trade direction', () => {
+  const baseImportRate: Rate = {
+    id: 'rate-import-20',
+    rateType: 'CONTAINER_IMPORT',
+    trigger: 'ALWAYS',
+    rateValue: 1000,
+    rateUnit: 'PER_CONTAINER',
+    currency: 'USD',
+    status: 'LIVE',
+    containerTypeId: 'ct-20',
+    cargoTypeId: null,
+    originYardId: 'yard-dj',
+    destinationYardId: 'yard-adama',
+  } as Rate;
+
+  const configuredOverweight: Rate = {
+    id: 'rate-ow',
+    rateType: 'OVERWEIGHT_PER_TON',
+    trigger: 'OVERWEIGHT',
+    rateValue: 10,
+    rateUnit: 'PER_TON',
+    currency: 'USD',
+    status: 'LIVE',
+    containerTypeId: null,
+    cargoTypeId: null,
+  } as Rate;
+
+  let service: RuleEngineService;
+
+  beforeEach(() => {
+    service = new RuleEngineService(
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      {
+        findActiveByContainerTypeId: jest
+          .fn()
+          .mockResolvedValue([{ id: 'wlr-20', maxVgmTons: 20, maxCapacityTons: null }]),
+      } as never,
+      { findAllActive: jest.fn().mockResolvedValue([]) } as never,
+      {
+        findLiveRates: jest.fn().mockResolvedValue([baseImportRate, configuredOverweight]),
+      } as never,
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      {} as never,
+    );
+  });
+
+  // One 20ft at 25 t against a 20 t limit → 5 t excess.
+  const overweightInput = (tradeDirection: string): BookingEvaluationInput => ({
+    serviceTypeId: 'svc-1',
+    paymentCurrency: 'USD',
+    tradeDirection,
+    isHazardous: false,
+    totalWagons: 1,
+    originYardId: 'yard-dj',
+    destinationYardId: 'yard-adama',
+    containers: [
+      { containerTypeId: 'ct-20', quantity: 1, vgmPerUnitTons: 25, totalVgmTons: 25 },
+    ],
+  });
+
+  it('IMPORT derives the per-ton price from base freight ÷ (2 × limit), not the configured rate', async () => {
+    const result = await service.evaluate(overweightInput('IMPORT'));
+    const ow = result.appliedModifiers.filter((m) => m.surchargeCode === 'OVERWEIGHT_PER_TON');
+    expect(ow).toHaveLength(1);
+    // 1000 / (2 × 20) = 25 USD/t on 5 excess tons.
+    expect(ow[0].unitPriceUsd).toBe(25);
+    expect(ow[0].calculatedAmount).toBe(125);
+    expect(ow[0].triggerValue).toBe(5);
+    expect(ow[0].rateId).toBe(baseImportRate.id);
+  });
+
+  it('EXPORT keeps billing the configured OVERWEIGHT rate', async () => {
+    const result = await service.evaluate(overweightInput('EXPORT'));
+    const ow = result.appliedModifiers.filter((m) => m.surchargeCode === 'OVERWEIGHT_PER_TON');
+    expect(ow).toHaveLength(1);
+    expect(ow[0].rateId).toBe(configuredOverweight.id);
+    // 5 excess tons × the configured 10 USD/t.
+    expect(ow[0].calculatedAmount).toBe(50);
+    expect(ow[0].unitPriceUsd).toBeUndefined();
+  });
+
+  it('IMPORT without a route-matching base rate bills no overweight (base freight blocks anyway)', async () => {
+    const result = await service.evaluate({
+      ...overweightInput('IMPORT'),
+      destinationYardId: 'yard-elsewhere',
+    });
+    const ow = result.appliedModifiers.filter((m) => m.surchargeCode === 'OVERWEIGHT_PER_TON');
+    expect(ow).toHaveLength(0);
+  });
+});
+
+describe('RuleEngineService — empty-container return per route + container type', () => {
+  const returnRate20: Rate = {
+    id: 'rate-return-20',
+    rateType: 'RETURN_SURCHARGE',
+    trigger: 'WITH_RETURN',
+    rateValue: 20,
+    rateUnit: 'PER_CONTAINER',
+    currency: 'USD',
+    status: 'LIVE',
+    containerTypeId: 'ct-20',
+    cargoTypeId: null,
+    tradeDirection: 'IMPORT',
+    originYardId: 'yard-dj',
+    destinationYardId: 'yard-adama',
+  } as Rate;
+
+  let service: RuleEngineService;
+
+  beforeEach(() => {
+    service = new RuleEngineService(
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      {
+        findActiveByContainerTypeId: jest
+          .fn()
+          .mockResolvedValue([{ id: 'wlr-20', maxVgmTons: 20, maxCapacityTons: null }]),
+      } as never,
+      { findAllActive: jest.fn().mockResolvedValue([]) } as never,
+      { findLiveRates: jest.fn().mockResolvedValue([returnRate20]) } as never,
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      {} as never,
+    );
+  });
+
+  const returnInput = (overrides: Partial<BookingEvaluationInput>): BookingEvaluationInput => ({
+    serviceTypeId: 'svc-1',
+    paymentCurrency: 'USD',
+    tradeDirection: 'IMPORT',
+    isHazardous: false,
+    totalWagons: 1,
+    originYardId: 'yard-dj',
+    destinationYardId: 'yard-adama',
+    containers: [
+      {
+        containerTypeId: 'ct-20',
+        quantity: 4,
+        vgmPerUnitTons: 10,
+        totalVgmTons: 40,
+        returnQuantity: 2,
+      },
+    ],
+    ...overrides,
+  });
+
+  it('bills the route + type matched rate on the opted-in count', async () => {
+    const result = await service.evaluate(returnInput({}));
+    const ret = result.appliedModifiers.filter((m) => m.surchargeCode === 'RETURN_SURCHARGE');
+    expect(result.hardBlocked).toHaveLength(0);
+    expect(ret).toHaveLength(1);
+    expect(ret[0].rateId).toBe(returnRate20.id);
+    expect(ret[0].triggerValue).toBe(2);
+    expect(ret[0].calculatedAmount).toBe(40);
+    expect(ret[0].billingUnit).toBe('PER_CONTAINER');
+  });
+
+  it('hard-blocks when the booking route has no matching return rate', async () => {
+    const result = await service.evaluate(
+      returnInput({ destinationYardId: 'yard-elsewhere' }),
+    );
+    expect(result.hardBlocked.some((m) => m.includes('return'))).toBe(true);
+    expect(
+      result.appliedModifiers.filter((m) => m.surchargeCode === 'RETURN_SURCHARGE'),
+    ).toHaveLength(0);
+  });
+
+  it('hard-blocks an EXPORT booking asking for return (rates are import-only)', async () => {
+    const result = await service.evaluate(returnInput({ tradeDirection: 'EXPORT' }));
+    expect(result.hardBlocked.some((m) => m.includes('return'))).toBe(true);
+  });
+
+  it('PER_WAGON bills the wagons the empties ride back on, not the boxes', async () => {
+    // Same service, but the return rate is sold per wagon: 4× 20ft return =
+    // 2 wagons (two 20ft share a wagon) × 20 USD, not 4 × 20.
+    service = new RuleEngineService(
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      {
+        findActiveByContainerTypeId: jest
+          .fn()
+          .mockResolvedValue([{ id: 'wlr-20', maxVgmTons: 20, maxCapacityTons: null }]),
+      } as never,
+      { findAllActive: jest.fn().mockResolvedValue([]) } as never,
+      {
+        findLiveRates: jest
+          .fn()
+          .mockResolvedValue([{ ...returnRate20, rateUnit: 'PER_WAGON' } as Rate]),
+      } as never,
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      {} as never,
+    );
+
+    const result = await service.evaluate(
+      returnInput({
+        containers: [
+          {
+            containerTypeId: 'ct-20',
+            quantity: 4,
+            vgmPerUnitTons: 10,
+            totalVgmTons: 40,
+            returnQuantity: 4,
+            wagonsPerUnit: 0.5,
+          },
+        ],
+      }),
+    );
+
+    const ret = result.appliedModifiers.filter((m) => m.surchargeCode === 'RETURN_SURCHARGE');
+    expect(ret).toHaveLength(1);
+    expect(ret[0].triggerValue).toBe(2);
+    expect(ret[0].calculatedAmount).toBe(40);
+    expect(ret[0].billingUnit).toBe('PER_WAGON');
+  });
+
+  it('legacy booking-level flag bills every container at its type rate', async () => {
+    const result = await service.evaluate(
+      returnInput({
+        withReturn: true,
+        containers: [
+          { containerTypeId: 'ct-20', quantity: 4, vgmPerUnitTons: 10, totalVgmTons: 40 },
+        ],
+      }),
+    );
+    const ret = result.appliedModifiers.filter((m) => m.surchargeCode === 'RETURN_SURCHARGE');
+    expect(ret).toHaveLength(1);
+    expect(ret[0].triggerValue).toBe(4);
+    expect(ret[0].calculatedAmount).toBe(80);
+  });
+});
+
+describe('RuleEngineService — lashing (bulk-only, per direction + commodity)', () => {
+  const lashingBulkImport: Rate = {
+    id: 'rate-lash-bulk',
+    rateType: 'LASHING',
+    trigger: 'LASHING',
+    rateValue: 2,
+    rateUnit: 'PER_TON',
+    currency: 'USD',
+    status: 'LIVE',
+    containerTypeId: null,
+    cargoTypeId: null,
+    tradeDirection: 'IMPORT',
+    originYardId: null,
+    destinationYardId: null,
+  } as Rate;
+
+  const buildService = (rates: Rate[]): RuleEngineService =>
+    new RuleEngineService(
+      {
+        findById: jest
+          .fn()
+          .mockResolvedValue({ hasLashing: true, requiresDirectorApproval: false }),
+      } as never,
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      { findActiveByContainerTypeId: jest.fn().mockResolvedValue([]) } as never,
+      { findAllActive: jest.fn().mockResolvedValue([]) } as never,
+      { findLiveRates: jest.fn().mockResolvedValue(rates) } as never,
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      {} as never,
+    );
+
+  const bulkInput = (overrides: Partial<BookingEvaluationInput> = {}): BookingEvaluationInput => ({
+    serviceTypeId: 'svc-1',
+    paymentCurrency: 'USD',
+    tradeDirection: 'IMPORT',
+    isHazardous: false,
+    cargoTypeId: 'cargo-sugar',
+    totalWagons: 0,
+    bulkTons: 100,
+    bulkWagons: 3,
+    containers: [],
+    ...overrides,
+  });
+
+  const lashingMods = (result: Awaited<ReturnType<RuleEngineService['evaluate']>>) =>
+    result.appliedModifiers.filter((m) => m.surchargeCode === 'LASHING');
+
+  it('bulk lashing bills per ton on the direction-matched rate', async () => {
+    const result = await buildService([lashingBulkImport]).evaluate(bulkInput());
+    const mods = lashingMods(result);
+    expect(mods).toHaveLength(1);
+    expect(mods[0].triggerValue).toBe(100);
+    expect(mods[0].calculatedAmount).toBe(200);
+    expect(mods[0].billingUnit).toBe('PER_TON');
+  });
+
+  it('a rate for the other direction never bills', async () => {
+    const result = await buildService([
+      { ...lashingBulkImport, tradeDirection: 'EXPORT' } as Rate,
+    ]).evaluate(bulkInput());
+    expect(lashingMods(result)).toHaveLength(0);
+  });
+
+  it('PER_WAGON bulk lashing bills the wagons the bulk occupies', async () => {
+    const result = await buildService([
+      { ...lashingBulkImport, rateUnit: 'PER_WAGON', rateValue: 25 } as Rate,
+    ]).evaluate(bulkInput());
+    const mods = lashingMods(result);
+    expect(mods[0].triggerValue).toBe(3);
+    expect(mods[0].calculatedAmount).toBe(75);
+  });
+
+  it('the commodity-scoped rate wins over the commodity-wide catch-all', async () => {
+    const result = await buildService([
+      lashingBulkImport,
+      { ...lashingBulkImport, id: 'rate-lash-sugar', rateValue: 7, cargoTypeId: 'cargo-sugar' } as Rate,
+    ]).evaluate(bulkInput());
+    const mods = lashingMods(result);
+    expect(mods).toHaveLength(1);
+    expect(mods[0].unitPriceUsd).toBe(7);
+    expect(mods[0].calculatedAmount).toBe(700);
+  });
+
+  it('container bookings never incur lashing (bulk-only service)', async () => {
+    const result = await buildService([lashingBulkImport]).evaluate(
+      bulkInput({
+        cargoTypeId: null,
+        hasLashing: true,
+        containers: [
+          { containerTypeId: 'ct-20', quantity: 4, vgmPerUnitTons: 10, totalVgmTons: 40 },
+        ],
+      }),
+    );
+    expect(lashingMods(result)).toHaveLength(0);
+  });
+
+  it('no lashing charge when the cargo does not need lashing', async () => {
+    const service = new RuleEngineService(
+      {
+        findById: jest
+          .fn()
+          .mockResolvedValue({ hasLashing: false, requiresDirectorApproval: false }),
+      } as never,
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      { findActiveByContainerTypeId: jest.fn().mockResolvedValue([]) } as never,
+      { findAllActive: jest.fn().mockResolvedValue([]) } as never,
+      { findLiveRates: jest.fn().mockResolvedValue([lashingBulkImport]) } as never,
+      { findById: jest.fn().mockResolvedValue(null) } as never,
+      {} as never,
+    );
+    const result = await service.evaluate(bulkInput());
+    expect(lashingMods(result)).toHaveLength(0);
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/rule-engine/rule-engine.service.ts b/apps/edr-freight-api/src/modules/rule-engine/rule-engine.service.ts
index 9d7aa6ba9..3ad97bb53 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/rule-engine.service.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/rule-engine.service.ts
@@ -28,6 +28,10 @@ import {
 } from './interfaces/shipping-lines.repository.interface';
 import { GOVERNMENT_PRIORITY_BONUS } from './government-priority.constants';
 
+// Coerce defensively: a flag may arrive as the string "true"/"false" (e.g.
+// from multipart form-data) and a non-empty "false" string is truthy.
+const truthy = (v: unknown): boolean => v === true || v === 'true';
+
 export interface BookingContainerEvalInput {
   containerTypeId: string;
   quantity: number;
@@ -44,6 +48,12 @@ export interface BookingContainerEvalInput {
   hazardousQuantity?: number;
   reeferQuantity?: number;
   returnQuantity?: number;
+  /**
+   * Wagon fraction one container of this line occupies (40ft = 1, 20ft = 0.5).
+   * Lets a PER_WAGON empty-return rate bill the wagons the returned empties
+   * ride back on. Missing ⇒ one wagon per container.
+   */
+  wagonsPerUnit?: number;
 }
 
 export interface BookingEvaluationInput {
@@ -63,6 +73,12 @@ export interface BookingEvaluationInput {
   isGovernment?: boolean;
   allowConsolidation?: boolean;
   shippingLineId?: string | null;
+  /**
+   * The booking's rail leg. Import overweight derives its per-ton price from
+   * this route's own container freight rate, so the engine needs the yards.
+   */
+  originYardId?: string | null;
+  destinationYardId?: string | null;
   /**
    * Booking's cargo type needs EDR-provided lashing/securing (cargoType
    * hasLashing = true). Fires the flat LASHING surcharge. Resolved by the
@@ -76,6 +92,12 @@ export interface BookingEvaluationInput {
    * container freight, which is scaled by container count instead.
    */
   bulkTons?: number;
+  /**
+   * Wagons a BULK booking occupies (ceil(tons ÷ wagon capacity)), resolved by
+   * the pricing service. Scales PER_WAGON kind-scoped surcharges (lashing);
+   * 0/undefined when unknown — those charges then bill nothing.
+   */
+  bulkWagons?: number;
   containers: BookingContainerEvalInput[];
 }
 
@@ -87,6 +109,15 @@ export interface AppliedCargoModifier {
   triggerValue: number | null;
   calculatedAmount: number;
   currency: string;
+  /**
+   * Effective per-unit USD price when it differs from the rate row's own value
+   * — set by derived charges (import overweight: base freight ÷ 2×limit) so
+   * the breakdown shows the real per-ton figure, not the base container price.
+   * Any modifier carrying it also bypasses frozen contract snapshots.
+   */
+  unitPriceUsd?: number | null;
+  /** Display unit for a unitPriceUsd modifier (e.g. PER_TON for overweight). */
+  billingUnit?: string;
 }
 
 export interface ContainerWeightResult {
@@ -161,12 +192,16 @@ export class RuleEngineService {
       ...(await this.capacityViolations(input.containers, input.tradeDirection)),
     );
 
+    // Per-container-line weight limit (maxVgmTons), index-aligned with
+    // containerWeightResults — the derived import overweight divides by it.
+    const lineMaxVgmTons: Array<number | null> = [];
     for (const container of input.containers) {
       const rules = await this.weightLimitRulesRepo.findActiveByContainerTypeId(
         container.containerTypeId,
         input.tradeDirection,
       );
       const rule = rules[0];
+      lineMaxVgmTons.push(rule ? Number(rule.maxVgmTons) : null);
       let isOverweight = container.isOverweight ?? false;
       let excess = container.overweightExcessTons ?? null;
 
@@ -245,7 +280,53 @@ export class RuleEngineService {
       liveRates.filter((r) => r.trigger && r.trigger !== 'ALWAYS'),
     );
 
+    // A handling service the booking asks for (booking-level flag OR any
+    // per-container opt-in count) with no LIVE surcharge rate configured is a
+    // hard block — pricing would otherwise ship the service for free. System-
+    // derived charges (consolidation, overweight, shipping line, lashing) stay
+    // exempt: the customer never opted into those, so they must not block.
+    const requestedServices: Array<{
+      trigger: RateTrigger;
+      wanted: boolean;
+      label: string;
+    }> = [
+      {
+        trigger: 'HAZARDOUS',
+        wanted:
+          truthy(input.isHazardous) ||
+          input.containers.some((c) => Number(c.hazardousQuantity ?? 0) > 0),
+        label: 'hazardous cargo',
+      },
+      {
+        trigger: 'REEFER',
+        wanted:
+          hasReefer ||
+          input.containers.some((c) => Number(c.reeferQuantity ?? 0) > 0),
+        label: 'refrigerated (reefer) cargo',
+      },
+    ];
+    for (const svc of requestedServices) {
+      if (svc.wanted && !surchargeRates.some((r) => r.trigger === svc.trigger)) {
+        hardBlocked.push(
+          `No ${svc.label} surcharge rate is configured — the booking cannot ` +
+            `be priced with this service. Remove the ${svc.label} option or ` +
+            'ask EDR to configure its rate.',
+        );
+      }
+    }
+
     for (const rate of surchargeRates) {
+      // Import overweight never bills the configured rate — its per-ton price
+      // derives from the route's base container freight (see below).
+      if (rate.trigger === 'OVERWEIGHT' && input.tradeDirection === 'IMPORT') {
+        continue;
+      }
+      // Empty-container return is sold per route + container type — billed by
+      // the route-matched block below, never by this route-agnostic loop.
+      if (rate.trigger === 'WITH_RETURN') continue;
+      // Lashing is sold per cargo kind + container type — billed by the
+      // kind-aware block below, never by this generic loop.
+      if (rate.trigger === 'LASHING') continue;
       const triggered = this.matchesTrigger(rate.trigger, {
         isHazardous: input.isHazardous,
         hasReefer,
@@ -338,6 +419,25 @@ export class RuleEngineService {
       });
     }
 
+    if (input.tradeDirection === 'IMPORT') {
+      appliedModifiers.push(
+        ...this.derivedImportOverweight(
+          input,
+          containerWeightResults,
+          lineMaxVgmTons,
+          liveRates,
+        ),
+      );
+    }
+
+    const withReturn = this.withReturnCharges(input, liveRates);
+    appliedModifiers.push(...withReturn.modifiers);
+    hardBlocked.push(...withReturn.blocked);
+
+    if (hasLashing) {
+      appliedModifiers.push(...this.lashingCharges(input, liveRates));
+    }
+
     return {
       priorityScore,
       appliedModifiers,
@@ -348,6 +448,186 @@ export class RuleEngineService {
     };
   }
 
+  /**
+   * Import overweight — derived, never configured. Each overweight container
+   * line bills its excess tons at (its own base import freight on the booking's
+   * route) ÷ (2 × its weight limit): 20ft at 1000 USD with a 20 t limit →
+   * 25 USD per excess ton. Export keeps the configured OVERWEIGHT rate.
+   * Note: derives from the LIVE route rate even for frozen-rate contract
+   * bookings — the frozen snapshot has no route-scoped container price to
+   * divide.
+   */
+  private derivedImportOverweight(
+    input: BookingEvaluationInput,
+    weightResults: ContainerWeightResult[],
+    lineMaxVgmTons: Array<number | null>,
+    liveRates: Rate[],
+  ): AppliedCargoModifier[] {
+    const modifiers: AppliedCargoModifier[] = [];
+    if (!input.originYardId || !input.destinationYardId) return modifiers;
+
+    for (let i = 0; i < weightResults.length; i++) {
+      const wr = weightResults[i];
+      const excess = Number(wr?.overweightExcessTons ?? 0);
+      const maxVgm = Number(lineMaxVgmTons[i] ?? 0);
+      if (!wr?.isOverweight || !(excess > 0) || !(maxVgm > 0)) continue;
+
+      // Same precedence as base freight pricing: the rate scoped to this
+      // container type wins over the route's catch-all rate.
+      const onLeg = liveRates.filter(
+        (r) =>
+          r.rateType === 'CONTAINER_IMPORT' &&
+          r.currency === 'USD' &&
+          r.originYardId === input.originYardId &&
+          r.destinationYardId === input.destinationYardId,
+      );
+      const base =
+        onLeg.find((r) => r.containerTypeId === wr.containerTypeId) ??
+        onLeg.find((r) => !r.containerTypeId);
+      // No base rate → the base-freight line hard-blocks this booking anyway.
+      if (!base) continue;
+
+      const perTon = Number(base.rateValue) / (2 * maxVgm);
+      const amount = excess * perTon;
+      if (!(amount > 0)) continue;
+
+      modifiers.push({
+        rateId: base.id,
+        surchargeCode: 'OVERWEIGHT_PER_TON',
+        triggerValue: excess,
+        calculatedAmount: amount,
+        currency: base.currency,
+        unitPriceUsd: perTon,
+        billingUnit: 'PER_TON',
+      });
+    }
+    return modifiers;
+  }
+
+  /**
+   * Empty-container return — sold per direction + route + container type, like
+   * base freight. Each container line that opted in (returnQuantity, or every
+   * container when only the legacy booking-level flag is set) bills the
+   * route-matched WITH_RETURN rate for its own container type; a line with no
+   * matching rate hard-blocks the booking instead of shipping the service for
+   * free. Rates are import-only for now, so an export booking that asks for
+   * return blocks too.
+   * ponytail: bills the LIVE route rate, not a frozen contract snapshot — one
+   * RETURN_SURCHARGE snapshot code can't hold per-size route prices.
+   */
+  private withReturnCharges(
+    input: BookingEvaluationInput,
+    liveRates: Rate[],
+  ): { modifiers: AppliedCargoModifier[]; blocked: string[] } {
+    const modifiers: AppliedCargoModifier[] = [];
+    const blocked: string[] = [];
+    const bookingLevel = truthy(input.withReturn);
+    const wanted =
+      bookingLevel || input.containers.some((c) => Number(c.returnQuantity ?? 0) > 0);
+    if (!wanted) return { modifiers, blocked };
+
+    const onLeg = liveRates.filter(
+      (r) =>
+        r.trigger === 'WITH_RETURN' &&
+        r.currency === 'USD' &&
+        r.tradeDirection === input.tradeDirection &&
+        r.originYardId === input.originYardId &&
+        r.destinationYardId === input.destinationYardId,
+    );
+
+    for (const container of input.containers) {
+      const qty =
+        Number(container.returnQuantity ?? 0) > 0
+          ? Number(container.returnQuantity)
+          : bookingLevel
+            ? Number(container.quantity || 0)
+            : 0;
+      if (!(qty > 0)) continue;
+
+      const rate =
+        onLeg.find((r) => r.containerTypeId === container.containerTypeId) ??
+        onLeg.find((r) => !r.containerTypeId);
+      if (!rate) {
+        blocked.push(
+          'No empty-container return rate is configured for this container ' +
+            'type on this route (return is import-only) — remove the return ' +
+            'option or ask EDR to configure its rate for this origin → destination.',
+        );
+        continue;
+      }
+
+      const rateValue = Number(rate.rateValue);
+      // PER_WAGON bills the wagons the returned empties occupy (two 20ft share
+      // one wagon), PER_CONTAINER the boxes themselves, FLAT once per line.
+      const billed =
+        rate.rateUnit === 'PER_WAGON'
+          ? Math.ceil(qty * (container.wagonsPerUnit ?? 1))
+          : qty;
+      const amount = rate.rateUnit === 'FLAT' ? rateValue : billed * rateValue;
+      if (!(amount > 0)) continue;
+      modifiers.push({
+        rateId: rate.id,
+        surchargeCode: this.surchargeCode(rate),
+        triggerValue: rate.rateUnit === 'FLAT' ? qty : billed,
+        calculatedAmount: amount,
+        currency: rate.currency,
+        unitPriceUsd: rateValue,
+        billingUnit: rate.rateUnit,
+      });
+    }
+
+    // Same block deduplicated — several lines missing the rate is one problem.
+    return { modifiers, blocked: [...new Set(blocked)] };
+  }
+
+  /**
+   * Cargo securing / lashing — BULK only, sold per trade direction, optionally
+   * narrowed to one leaf commodity (the commodity-scoped rate wins over the
+   * commodity-wide catch-all). Bills PER_TON × tonnage or PER_WAGON × the
+   * wagons the bulk occupies. Container bookings never incur lashing, and an
+   * unconfigured rate simply bills nothing — same leniency as hazard/reefer.
+   */
+  private lashingCharges(
+    input: BookingEvaluationInput,
+    liveRates: Rate[],
+  ): AppliedCargoModifier[] {
+    const modifiers: AppliedCargoModifier[] = [];
+    if (input.containers.length > 0) return modifiers; // bulk-only service
+
+    const onDirection = liveRates.filter(
+      (r) =>
+        r.trigger === 'LASHING' &&
+        r.currency === 'USD' &&
+        !r.containerTypeId &&
+        r.tradeDirection === input.tradeDirection,
+    );
+    const rate =
+      (input.cargoTypeId
+        ? onDirection.find((r) => r.cargoTypeId === input.cargoTypeId)
+        : undefined) ?? onDirection.find((r) => !r.cargoTypeId);
+    if (!rate) return modifiers;
+
+    const billedQty =
+      rate.rateUnit === 'PER_TON'
+        ? Math.max(0, Number(input.bulkTons ?? 0))
+        : rate.rateUnit === 'PER_WAGON'
+          ? Math.max(0, Number(input.bulkWagons ?? 0))
+          : 1;
+    const rateValue = Number(rate.rateValue);
+    const amount = rate.rateUnit === 'FLAT' ? rateValue : billedQty * rateValue;
+    if (!(amount > 0)) return modifiers;
+    modifiers.push({
+      rateId: rate.id,
+      surchargeCode: this.surchargeCode(rate),
+      triggerValue: rate.rateUnit === 'FLAT' ? 1 : billedQty,
+      calculatedAmount: amount,
+      currency: rate.currency,
+      unitPriceUsd: rateValue,
+      billingUnit: rate.rateUnit,
+    });
+    return modifiers;
+  }
+
   /**
    * Messages for container lines whose total weight exceeds the hard capacity
    * ceiling (weight_limit_rules.max_capacity_tons). Non-empty ⇒ the booking
@@ -438,9 +718,6 @@ export class RuleEngineService {
       hasLashing: boolean;
     },
   ): boolean {
-    // Coerce defensively: a flag may arrive as the string "true"/"false" (e.g.
-    // from multipart form-data) and a non-empty "false" string is truthy.
-    const truthy = (v: unknown): boolean => v === true || v === 'true';
     switch (trigger) {
       case 'HAZARDOUS':
         return truthy(state.isHazardous);
diff --git a/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.spec.ts b/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.spec.ts
index 6c3adce66..be7c8984c 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.spec.ts
@@ -101,6 +101,23 @@ describe('RateChangeRequestsService', () => {
       expect(request.payload).toEqual({ rateValue: 200 });
     });
 
+    it('carries a re-routed leg — a yard-only edit is a real change', async () => {
+      const { service } = build({
+        rate: liveRate({ originYardId: 'yard-a', destinationYardId: 'yard-b' }),
+      });
+
+      const request = await service.submit({
+        rateId: 'rate-1',
+        update: {
+          rateValue: 100,
+          originYardId: 'yard-a',
+          destinationYardId: 'yard-c',
+        },
+      });
+
+      expect(request.payload).toEqual({ destinationYardId: 'yard-c' });
+    });
+
     it('rejects a no-op — 100 posted against a live 100.0000 is not a change', async () => {
       const { service } = build();
       await expect(
diff --git a/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.ts b/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.ts
index 357c67f95..36c55dad3 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/services/rate-change-requests.service.ts
@@ -33,6 +33,10 @@ const DIFFABLE_FIELDS = [
   'tradeDirection',
   'containerTypeId',
   'cargoTypeId',
+  // The leg a route-scoped rate prices. Missing here, a re-routed LIVE rate
+  // diffed to nothing and the submit was refused as "nothing changed".
+  'originYardId',
+  'destinationYardId',
 ] as const;
 
 /**
diff --git a/apps/edr-freight-api/src/modules/rule-engine/services/rates.service.ts b/apps/edr-freight-api/src/modules/rule-engine/services/rates.service.ts
index 488865f38..700d6366c 100644
--- a/apps/edr-freight-api/src/modules/rule-engine/services/rates.service.ts
+++ b/apps/edr-freight-api/src/modules/rule-engine/services/rates.service.ts
@@ -69,18 +69,19 @@ export class RatesService {
     appliesTo: Rate['appliesTo'],
     trigger: Rate['trigger'],
     requestedUnit: Rate['rateUnit'] | undefined,
+    cargoKind?: 'CONTAINER' | 'BULK' | null,
   ): Rate['rateUnit'] {
     // Overweight is per-ton, full stop — the admin form hides the unit field
     // for it and omits rateUnit from the payload entirely.
     if (trigger === 'OVERWEIGHT') return 'PER_TON';
 
-    const allowed = allowedRateUnits({ appliesTo, trigger });
+    const allowed = allowedRateUnits({ appliesTo, trigger, cargoKind });
     if (!requestedUnit) {
       throw new BadRequestException(
         `Pick a rate unit for this rate. Allowed: ${allowed.join(', ')}.`,
       );
     }
-    if (!isRateUnitAllowed({ appliesTo, trigger, unit: requestedUnit })) {
+    if (!isRateUnitAllowed({ appliesTo, trigger, cargoKind, unit: requestedUnit })) {
       throw new BadRequestException(
         `Rate unit "${requestedUnit}" is not valid for this rate. Allowed: ${allowed.join(', ')}.`,
       );
@@ -93,6 +94,19 @@ export class RatesService {
     return trigger === 'ALWAYS' && BASE_FREIGHT_CATEGORIES.includes(appliesTo);
   }
 
+  /**
+   * Rates sold per direction + route. Base freight always; customs clearance
+   * and empty-container return are the surcharges that are too — their fee
+   * depends on the lane (and, for returns, the container type).
+   */
+  private isRouteScoped(appliesTo: Rate['appliesTo'], trigger: Rate['trigger']): boolean {
+    return (
+      this.isBaseFreight(appliesTo, trigger) ||
+      trigger === 'CUSTOMS_CLEARANCE' ||
+      trigger === 'WITH_RETURN'
+    );
+  }
+
   /**
    * Which country each end of the leg must sit in, given what the rate is for.
    * The railway only sells three shapes: import lands at the Djibouti ports and
@@ -126,7 +140,7 @@ export class RatesService {
     destinationYardId?: string | null;
   }): Promise<YardScope> {
     const { appliesTo, trigger, tradeDirection } = input;
-    if (!this.isBaseFreight(appliesTo, trigger)) {
+    if (!this.isRouteScoped(appliesTo, trigger)) {
       return { originYardId: null, destinationYardId: null };
     }
 
@@ -134,7 +148,7 @@ export class RatesService {
     const destinationYardId = input.destinationYardId ?? null;
     if (!originYardId || !destinationYardId) {
       throw new BadRequestException(
-        'Base freight rates are priced per leg — pick both an origin and a destination yard.',
+        'This rate is priced per leg — pick both an origin and a destination yard.',
       );
     }
     if (originYardId === destinationYardId) {
@@ -174,11 +188,76 @@ export class RatesService {
     trigger: Rate['trigger'];
     tradeDirection: string | null;
     intercityKind: string | null;
+    cargoKind: string | null;
     containerTypeId: string | null;
     cargoTypeId: string | null;
   }): void {
-    const { appliesTo, trigger, tradeDirection, intercityKind } = input;
+    const { appliesTo, trigger, tradeDirection, intercityKind, cargoKind } = input;
     const { containerTypeId, cargoTypeId } = input;
+    if (trigger === 'CUSTOMS_CLEARANCE') {
+      if (tradeDirection !== 'IMPORT' && tradeDirection !== 'EXPORT') {
+        throw new BadRequestException(
+          'A customs clearance rate must say whether it covers IMPORT or EXPORT.',
+        );
+      }
+      // Sold per cargo kind: a container fee names the container type it covers
+      // (20ft and 40ft price differently); a bulk fee carries no type at all —
+      // that absence is what marks it as the bulk fee.
+      if (cargoKind !== 'CONTAINER' && cargoKind !== 'BULK') {
+        throw new BadRequestException(
+          'A customs clearance rate must say whether it covers containers or bulk.',
+        );
+      }
+      if (cargoKind === 'CONTAINER' && !containerTypeId) {
+        throw new BadRequestException(
+          'A container customs clearance rate must name the container type it covers.',
+        );
+      }
+      if (cargoKind === 'BULK' && containerTypeId) {
+        throw new BadRequestException(
+          'A bulk customs clearance rate cannot be scoped to a container type.',
+        );
+      }
+      // The bulk customs fee names the commodity it covers (sugar and
+      // fertilizer clear differently).
+      if (cargoKind === 'BULK' && !cargoTypeId) {
+        throw new BadRequestException(
+          'A bulk customs clearance rate must name the bulk cargo type it covers.',
+        );
+      }
+      if (cargoKind === 'CONTAINER' && cargoTypeId) {
+        throw new BadRequestException(
+          'A container customs clearance rate cannot be scoped to a bulk cargo type.',
+        );
+      }
+      return;
+    }
+    if (trigger === 'LASHING') {
+      // Bulk-only cargo securing, sold per direction. May narrow to one leaf
+      // commodity (specific wins over the commodity-wide catch-all).
+      if (tradeDirection !== 'IMPORT' && tradeDirection !== 'EXPORT') {
+        throw new BadRequestException(
+          'A lashing rate must say whether it covers IMPORT or EXPORT.',
+        );
+      }
+      if (containerTypeId) {
+        throw new BadRequestException(
+          'Lashing is bulk-only — it cannot be scoped to a container type.',
+        );
+      }
+      return;
+    }
+    if (trigger === 'WITH_RETURN') {
+      // Returning the empty box only exists on imports (the box goes back to
+      // the port) — export return rates are rejected until the business sells
+      // that.
+      if (tradeDirection !== 'IMPORT') {
+        throw new BadRequestException(
+          'An empty container return rate is import-only for now.',
+        );
+      }
+      return;
+    }
     if (!this.isBaseFreight(appliesTo, trigger)) return;
 
     if (appliesTo === 'INTERCITY') {
@@ -247,13 +326,35 @@ export class RatesService {
     const trigger = dto.trigger as Rate['trigger'];
     // Surcharges (trigger ≠ ALWAYS) carry no direction/scope — clear them so
     // the engine never accidentally narrows a surcharge by container/direction.
+    // Exceptions: customs clearance and empty-container return keep direction +
+    // container type — both are sold per lane (and per container type).
     const isSurcharge = trigger !== 'ALWAYS';
-    const containerTypeId = isSurcharge ? null : (dto.containerTypeId ?? null);
-    const cargoTypeId = isSurcharge ? null : (dto.cargoTypeId ?? null);
+    const cargoKind =
+      trigger === 'CUSTOMS_CLEARANCE'
+        ? ((dto.cargoKind as 'CONTAINER' | 'BULK' | undefined) ?? null)
+        : null;
+    const containerTypeId =
+      trigger === 'WITH_RETURN' ||
+      (trigger === 'CUSTOMS_CLEARANCE' && cargoKind === 'CONTAINER')
+        ? (dto.containerTypeId ?? null)
+        : isSurcharge
+          ? null
+          : (dto.containerTypeId ?? null);
+    const cargoTypeId =
+      (trigger === 'CUSTOMS_CLEARANCE' && cargoKind === 'BULK') ||
+      trigger === 'LASHING'
+        ? (dto.cargoTypeId ?? null)
+        : isSurcharge
+          ? null
+          : (dto.cargoTypeId ?? null);
     // Intercity never leaves Ethiopia, so it has no trade direction to store —
     // its yard pair already says where it runs.
     const tradeDirection =
-      isSurcharge || appliesTo === 'INTERCITY' ? null : (dto.tradeDirection ?? null);
+      trigger === 'CUSTOMS_CLEARANCE' || trigger === 'WITH_RETURN' || trigger === 'LASHING'
+        ? (dto.tradeDirection ?? null)
+        : isSurcharge || appliesTo === 'INTERCITY'
+          ? null
+          : (dto.tradeDirection ?? null);
 
     const intercityKind = dto.intercityKind ?? null;
     this.assertScopeCoherent({
@@ -261,6 +362,7 @@ export class RatesService {
       trigger,
       tradeDirection,
       intercityKind,
+      cargoKind,
       containerTypeId,
       cargoTypeId,
     });
@@ -282,6 +384,7 @@ export class RatesService {
       appliesTo,
       trigger,
       dto.rateUnit as Rate['rateUnit'] | undefined,
+      cargoKind,
     );
 
     await this.assertNoDuplicatePattern({
@@ -376,22 +479,42 @@ export class RatesService {
     if (dto.appliesTo) updates.appliesTo = appliesTo;
     if (dto.trigger) updates.trigger = trigger;
 
-    const containerTypeId = isSurcharge
+    // A patch that leaves the cargo kind unsaid keeps the one the rate already
+    // has — read back off its container scope (container fees carry the type).
+    const cargoKind =
+      trigger !== 'CUSTOMS_CLEARANCE'
+        ? null
+        : ((dto.cargoKind as 'CONTAINER' | 'BULK' | undefined) ??
+          (existing.containerTypeId ? 'CONTAINER' : 'BULK'));
+
+    const keepsContainerType =
+      !isSurcharge ||
+      trigger === 'WITH_RETURN' ||
+      (trigger === 'CUSTOMS_CLEARANCE' && cargoKind === 'CONTAINER');
+    const containerTypeId = !keepsContainerType
       ? null
       : dto.containerTypeId !== undefined
         ? dto.containerTypeId
         : existing.containerTypeId;
-    const cargoTypeId = isSurcharge
+    const keepsCargoType =
+      !isSurcharge ||
+      (trigger === 'CUSTOMS_CLEARANCE' && cargoKind === 'BULK') ||
+      trigger === 'LASHING';
+    const cargoTypeId = !keepsCargoType
       ? null
       : dto.cargoTypeId !== undefined
         ? dto.cargoTypeId
         : existing.cargoTypeId;
     const tradeDirection =
-      isSurcharge || appliesTo === 'INTERCITY'
-        ? null
-        : dto.tradeDirection !== undefined
+      trigger === 'CUSTOMS_CLEARANCE' || trigger === 'WITH_RETURN' || trigger === 'LASHING'
+        ? dto.tradeDirection !== undefined
           ? dto.tradeDirection
-          : existing.tradeDirection;
+          : existing.tradeDirection
+        : isSurcharge || appliesTo === 'INTERCITY'
+          ? null
+          : dto.tradeDirection !== undefined
+            ? dto.tradeDirection
+            : existing.tradeDirection;
 
     updates.containerTypeId = containerTypeId ?? null;
     updates.cargoTypeId = cargoTypeId ?? null;
@@ -407,6 +530,7 @@ export class RatesService {
       trigger,
       tradeDirection: updates.tradeDirection,
       intercityKind,
+      cargoKind,
       containerTypeId: updates.containerTypeId,
       cargoTypeId: updates.cargoTypeId,
     });
@@ -438,7 +562,7 @@ export class RatesService {
     // Re-validate the unit against the (possibly changed) shape; overweight is
     // forced to PER_TON.
     const requestedUnit = (dto.rateUnit as Rate['rateUnit']) ?? existing.rateUnit;
-    updates.rateUnit = this.resolveRateUnit(appliesTo, trigger, requestedUnit);
+    updates.rateUnit = this.resolveRateUnit(appliesTo, trigger, requestedUnit, cargoKind);
 
     // Guard the pattern uniqueness for the new identity, ignoring this row.
     await this.assertNoDuplicatePattern({
diff --git a/apps/edr-freight-api/src/modules/train-schedules/train-schedules.repository.ts b/apps/edr-freight-api/src/modules/train-schedules/train-schedules.repository.ts
index 08b906e84..294fb93f1 100644
--- a/apps/edr-freight-api/src/modules/train-schedules/train-schedules.repository.ts
+++ b/apps/edr-freight-api/src/modules/train-schedules/train-schedules.repository.ts
@@ -50,8 +50,11 @@ export class TrainSchedulesRepository extends BaseRepository<TrainSchedule> {
             company: true,
             originYard: true,
             destinationYard: true,
-            bookingContainers: { containerType: true },
-            cargoType: true,
+            // wagonTypes feed grossBookingWeightTons the REAL tare of the
+            // wagon type the booking rides — without them it falls back to
+            // default tares and the workspace gross drifts from the validator.
+            bookingContainers: { containerType: { wagonTypes: true } },
+            cargoType: { wagonTypes: true },
           },
         },
       },
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.spec.ts
index fc97f772b..b308a5921 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.spec.ts
@@ -570,6 +570,104 @@ describe('BookingBatchService — PAID reconcile', () => {
     });
   });
 
+  describe('expireLeftoverExportDay — export day sweep', () => {
+    const exportSchedule = {
+      id: scheduleId,
+      direction: 'EXPORT',
+      originStationId: 'yard-origin',
+      destinationStationId: 'yard-dest',
+      scheduledDepartureDate: new Date('2026-06-20T06:00:00.000Z'),
+      windowPhase: 'DONE',
+      bookingWindowStatus: 'CLOSED',
+    };
+    let unacceptedSpy: jest.SpyInstance;
+    let poolSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+      unacceptedSpy = jest
+        .spyOn(service, 'expireUnacceptedForRouteDay')
+        .mockResolvedValue(undefined);
+      poolSpy = jest.spyOn(service, 'expireLeftoverDayPool').mockResolvedValue(0);
+    });
+
+    it('ignores non-export schedules', async () => {
+      trainSchedulesRepository.findById.mockResolvedValue({
+        ...exportSchedule,
+        direction: 'IMPORT',
+      });
+
+      await service.expireLeftoverExportDay(scheduleId);
+
+      expect(unacceptedSpy).not.toHaveBeenCalled();
+      expect(poolSpy).not.toHaveBeenCalled();
+    });
+
+    it('defers while another export train on the day can still take bookings', async () => {
+      trainSchedulesRepository.findById.mockResolvedValue(exportSchedule);
+      trainSchedulesRepository.findAll.mockResolvedValue([
+        exportSchedule,
+        {
+          ...exportSchedule,
+          id: 'sched-2',
+          windowPhase: 'OPEN',
+          bookingWindowStatus: 'OPEN',
+        },
+      ]);
+
+      await service.expireLeftoverExportDay(scheduleId);
+
+      expect(unacceptedSpy).not.toHaveBeenCalled();
+      expect(poolSpy).not.toHaveBeenCalled();
+    });
+
+    it('defers while a FULL train still has live pay windows', async () => {
+      trainSchedulesRepository.findById.mockResolvedValue(exportSchedule);
+      trainSchedulesRepository.findAll.mockResolvedValue([
+        exportSchedule,
+        {
+          ...exportSchedule,
+          id: 'sched-2',
+          windowPhase: 'OPEN',
+          bookingWindowStatus: 'FULL',
+        },
+      ]);
+      bookingsRepository.findReservedForSchedule.mockResolvedValue([
+        {
+          paymentStatus: 'PENDING',
+          status: 'AWAITING_PAYMENT',
+          paymentDeadline: new Date(Date.now() + 60_000),
+        },
+      ]);
+
+      await service.expireLeftoverExportDay(scheduleId);
+
+      expect(unacceptedSpy).not.toHaveBeenCalled();
+      expect(poolSpy).not.toHaveBeenCalled();
+    });
+
+    it('sweeps un-accepted + waiting bookings once every train on the day is shut', async () => {
+      trainSchedulesRepository.findById.mockResolvedValue(exportSchedule);
+      trainSchedulesRepository.findAll.mockResolvedValue([
+        exportSchedule,
+        {
+          ...exportSchedule,
+          id: 'sched-2',
+          windowPhase: 'OPEN',
+          bookingWindowStatus: 'FULL',
+        },
+      ]);
+
+      await service.expireLeftoverExportDay(scheduleId);
+
+      expect(unacceptedSpy).toHaveBeenCalledWith({
+        originYardId: 'yard-origin',
+        destinationYardId: 'yard-dest',
+        day: '2026-06-20',
+      });
+      expect(poolSpy).toHaveBeenCalledWith(scheduleId);
+    });
+  });
+
   describe('maybeOfferPartial — split-eligibility gate', () => {
     const importGeneral = {
       id: 'b1',
@@ -817,6 +915,122 @@ describe('BookingBatchService — PAID reconcile', () => {
       );
     });
   });
+
+  describe('acceptIntercity — export pay window expires at window close', () => {
+    const exportScheduleId = 'export-train';
+    // Window closes in 30 minutes; the configured pay window is 60 minutes.
+    const closesAt = new Date(Date.now() + 30 * 60_000);
+
+    const waiting = {
+      id: 'ic-1',
+      reference: 'IC-1',
+      isGovernment: false,
+      status: 'FULLY_EXECUTED',
+      trainScheduleId: null,
+      freightType: 'CONTAINER',
+      cargoTotalWeightVgm: 10,
+      bookingContainers: [],
+    } as unknown as Booking;
+
+    let scheduleRepo: { findOne: jest.Mock };
+    let bookingRepo: { findOne: jest.Mock; update: jest.Mock; find: jest.Mock };
+
+    beforeEach(() => {
+      bookingRepo = dataSource.getRepository();
+      bookingRepo.findOne.mockResolvedValue(waiting);
+      scheduleRepo = { findOne: jest.fn() };
+      // reserve() reads the target schedule to clamp export deadlines — route
+      // TrainSchedule reads to their own repo, everything else stays as before.
+      dataSource.getRepository.mockImplementation((entity?: { name?: string }) =>
+        entity?.name === 'TrainSchedule' ? scheduleRepo : bookingRepo,
+      );
+    });
+
+    it('clamps the intercity pay deadline to the export window close', async () => {
+      scheduleRepo.findOne.mockResolvedValue({
+        id: exportScheduleId,
+        direction: 'EXPORT',
+        windowClosesAt: closesAt,
+        scheduledDepartureDate: new Date(closesAt.getTime() + 2 * 3_600_000),
+      });
+
+      await service.acceptIntercity(waiting, exportScheduleId);
+
+      expect(bookingsRepository.update).toHaveBeenCalledWith(
+        'ic-1',
+        expect.objectContaining({
+          status: 'SELECTED_FOR_BATCH',
+          paymentDeadline: closesAt,
+        }),
+      );
+      expect(notifier.payNow).toHaveBeenCalledTimes(1);
+    });
+
+    it('keeps the plain payment window on import trains', async () => {
+      scheduleRepo.findOne.mockResolvedValue({
+        id: 'import-train',
+        direction: 'IMPORT',
+        windowClosesAt: closesAt,
+      });
+
+      await service.acceptIntercity(waiting, 'import-train');
+
+      const deadline = (
+        bookingsRepository.update.mock.calls[0][1] as { paymentDeadline: Date }
+      ).paymentDeadline;
+      // 60-minute pay window runs past the 30-minutes-out close: no clamp.
+      expect(deadline.getTime()).toBeGreaterThan(closesAt.getTime());
+    });
+
+    it('rejects an accept after the export window closed — no pay window opens', async () => {
+      scheduleRepo.findOne.mockResolvedValue({
+        id: exportScheduleId,
+        direction: 'EXPORT',
+        windowClosesAt: new Date(Date.now() - 60_000),
+      });
+
+      await expect(
+        service.acceptIntercity(waiting, exportScheduleId),
+      ).rejects.toThrow(/window has closed/);
+      expect(bookingsRepository.update).not.toHaveBeenCalled();
+      expect(notifier.payNow).not.toHaveBeenCalled();
+    });
+
+    it('expires an unpaid export ride-along at close and frees the train', async () => {
+      const lapsed = {
+        ...(waiting as unknown as Record<string, unknown>),
+        status: 'SELECTED_FOR_BATCH',
+        trainScheduleId: exportScheduleId,
+        paymentDeadline: new Date(Date.now() - 1_000),
+        originYardId: 'yard-a',
+        destinationYardId: 'yard-b',
+        priorityScore: 0,
+        wagonsRequired: 1,
+      } as unknown as Booking;
+      bookingsRepository.findReservedForSchedule
+        .mockResolvedValueOnce([lapsed])
+        .mockResolvedValue([]);
+      bookingsRepository.findBatchPoolByCorridorDay.mockResolvedValue([]);
+      // expire()'s paid-guard re-reads the booking fresh — still unpaid.
+      bookingRepo.findOne.mockResolvedValue(lapsed);
+      trainSchedulesRepository.findById.mockResolvedValue({
+        id: exportScheduleId,
+        bookingWindowStatus: 'CLOSED',
+        windowPhase: 'DONE',
+        scheduledDepartureDate: new Date(Date.now() + 3_600_000),
+        originStationId: 'yard-a',
+        destinationStationId: 'yard-b',
+      });
+
+      await service.settleDueReservations(exportScheduleId);
+
+      expect(notifier.expired).toHaveBeenCalledTimes(1);
+      expect(bookingsRepository.update).toHaveBeenCalledWith(
+        'ic-1',
+        expect.objectContaining({ status: 'EXPIRED', trainScheduleId: null }),
+      );
+    });
+  });
 });
 
 describe('BookingBatchService — wagonsFor', () => {
@@ -973,6 +1187,7 @@ describe('BookingBatchService — built-train wagon capacity', () => {
     reserved: Booking[];
     maxWagons?: number;
     routeStops?: string[];
+    yardCountries?: Record<string, string>;
   }) => {
     const schedule = {
       id: scheduleId,
@@ -1004,10 +1219,21 @@ describe('BookingBatchService — built-train wagon capacity', () => {
       find: jest.fn().mockResolvedValue([]),
       update: jest.fn().mockResolvedValue(undefined),
     };
+    const yardRepo = {
+      find: jest
+        .fn()
+        .mockResolvedValue(
+          Object.entries(opts.yardCountries ?? {}).map(([id, country]) => ({
+            id,
+            country,
+          })),
+        ),
+    };
     const dataSource = {
       getRepository: jest.fn((entity: { name?: string }) => {
         if (entity?.name === 'Wagon') return wagonRepo;
         if (entity?.name === 'RouteMilestone') return milestoneRepo;
+        if (entity?.name === 'Yard') return yardRepo;
         return genericRepo;
       }),
       transaction: jest.fn(),
@@ -1050,11 +1276,11 @@ describe('BookingBatchService — built-train wagon capacity', () => {
     await expect(service.isScheduleFull(scheduleId)).resolves.toBe(false);
   });
 
-  it('is FULL when sub-leg bookings hold every physical wagon of a milestone route', async () => {
-    // Regression: 50 wagons sold Negad→Mojo on a Doraleh→…→Dire Dawa corridor
-    // left the pass-through edges reading "free" in the per-edge budget, so the
-    // full train's window cycled OPEN forever and the day pool never expired.
-    // A wagon is committed for the whole trip — leg-free edges are not capacity.
+  it('is NOT full when only a middle leg is sold and other edges run free (domestic route)', async () => {
+    // Leg-aware allocation (planWagonsWithStock legs) made mid-leg wagons real
+    // capacity on the edges they don't ride: a domestic corridor with cargo
+    // only on m1→m2 still boards bookings on the free first/last edges, so the
+    // window must stay open for them.
     const { service } = buildService({
       physicalWagons: 2,
       routeStops: ['yard-a', 'yard-m1', 'yard-m2', 'yard-b'],
@@ -1063,9 +1289,48 @@ describe('BookingBatchService — built-train wagon capacity', () => {
         reservedBooking('b2', { origin: 'yard-m1', dest: 'yard-m2' }),
       ],
     });
+    await expect(service.isScheduleFull(scheduleId)).resolves.toBe(false);
+  });
+
+  it('is FULL for the trade direction once the border edge is sold out, even with home legs free', async () => {
+    // Export b→c holds every wagon of the border crossing: no further export
+    // can board anywhere (they all must ride that edge), so the window closes —
+    // while intercity keeps booking the free a→b leg through the per-leg budget.
+    const { service } = buildService({
+      physicalWagons: 2,
+      routeStops: ['yard-a', 'yard-b', 'yard-dj'],
+      yardCountries: {
+        'yard-a': 'ETHIOPIA',
+        'yard-b': 'ETHIOPIA',
+        'yard-dj': 'DJIBOUTI',
+      },
+      reserved: [
+        reservedBooking('b1', { origin: 'yard-b', dest: 'yard-dj' }),
+        reservedBooking('b2', { origin: 'yard-b', dest: 'yard-dj' }),
+      ],
+    });
     await expect(service.isScheduleFull(scheduleId)).resolves.toBe(true);
   });
 
+  it('is NOT full while the border edge still has room, even with a home leg sold out', async () => {
+    // Intercity rode a→b on both wagons; the border edge b→dj is still free,
+    // so exports can still board — the window stays open.
+    const { service } = buildService({
+      physicalWagons: 2,
+      routeStops: ['yard-a', 'yard-b', 'yard-dj'],
+      yardCountries: {
+        'yard-a': 'ETHIOPIA',
+        'yard-b': 'ETHIOPIA',
+        'yard-dj': 'DJIBOUTI',
+      },
+      reserved: [
+        reservedBooking('b1', { origin: 'yard-a', dest: 'yard-b' }),
+        reservedBooking('b2', { origin: 'yard-a', dest: 'yard-b' }),
+      ],
+    });
+    await expect(service.isScheduleFull(scheduleId)).resolves.toBe(false);
+  });
+
   it('reports over-allocation when the consist is trimmed below committed bookings', async () => {
     const { service } = buildService({
       physicalWagons: 1,
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.ts
index 415b5df97..591812880 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.ts
@@ -24,9 +24,9 @@ import {
 import { Booking } from '../bookings/entities/booking.entity';
 import { BookingsRepository } from '../bookings/bookings.repository';
 import { BookingPricingService } from '../bookings/booking-pricing.service';
-import { Locomotive } from '../locomotives/entities/locomotive.entity';
 import { formatRouteLabel } from '../routes/entities/route.entity';
 import { RouteMilestone } from '../routes/entities/route-milestone.entity';
+import { Yard } from '../rule-engine/entities/yard.entity';
 import { TrainSchedule } from '../train-schedules/entities/train-schedule.entity';
 import { TrainScheduleBooking } from '../train-schedules/entities/train-schedule-booking.entity';
 import { TrainSchedulesRepository } from '../train-schedules/train-schedules.repository';
@@ -60,11 +60,14 @@ import {
   DEFAULT_WAGONS_PER_BOOKING,
 } from "./booking-batch.constants";
 import {
+  LocomotiveLimits,
   WagonTypeDimensions,
+  bookingCargoTons,
   bookingGrossWeightTons,
   deriveTrainCapacityFromLocomotive,
   sizePartialOfferWagons,
   trainHardCaps,
+  trainSetLocomotiveLimits,
   wagonTypeDimensionsFromEntity,
 } from './train-capacity.util';
 import { WagonType } from '../wagon-types/entities/wagon-type.entity';
@@ -570,6 +573,10 @@ export class BookingBatchService implements OnModuleInit {
     );
     if (schedule && (await this.isTrainFull(schedule))) {
       await this.setWindow(booking.trainScheduleId, "FULL");
+      // This payment may have been the last live pay window on a now-full
+      // export day — the settle that normally re-runs the sweep finds nothing
+      // left to settle, so trigger it here.
+      void this.expireLeftoverExportDay(booking.trainScheduleId);
     }
 
     const result = await this.trainSchedulingService.tryAutoWagonAllocation(
@@ -673,7 +680,7 @@ export class BookingBatchService implements OnModuleInit {
       const schedule = await this.trainSchedulesRepository.findByIdWithFullGraph(
         candidate.id,
       );
-      const locomotive = schedule?.trainSet?.locomotive;
+      const locomotive = trainSetLocomotiveLimits(schedule?.trainSet);
       if (!schedule || !locomotive) continue;
       const limits = await this.capacityLimits(locomotive);
       const budget = await this.remainingBudget(schedule, limits, wagonDims);
@@ -821,7 +828,7 @@ export class BookingBatchService implements OnModuleInit {
       const schedule = await this.trainSchedulesRepository.findByIdWithFullGraph(
         candidate.id,
       );
-      const locomotive = schedule?.trainSet?.locomotive;
+      const locomotive = trainSetLocomotiveLimits(schedule?.trainSet);
       if (!schedule || !locomotive) continue;
       const limits = await this.capacityLimits(locomotive);
       const budget = await this.remainingBudget(schedule, limits, wagonDims);
@@ -891,7 +898,7 @@ export class BookingBatchService implements OnModuleInit {
       const schedule = await this.trainSchedulesRepository.findByIdWithFullGraph(
         candidate.id,
       );
-      const locomotive = schedule?.trainSet?.locomotive;
+      const locomotive = trainSetLocomotiveLimits(schedule?.trainSet);
       if (!schedule || !locomotive) continue;
       const limits = await this.capacityLimits(locomotive);
       const budget = await this.remainingBudget(schedule, limits, wagonDims);
@@ -933,7 +940,7 @@ export class BookingBatchService implements OnModuleInit {
     const schedule = await this.trainSchedulesRepository.findByIdWithFullGraph(
       target.scheduleId,
     );
-    const locomotive = schedule?.trainSet?.locomotive;
+    const locomotive = trainSetLocomotiveLimits(schedule?.trainSet);
     if (!schedule || !locomotive) return false;
     const wagonDims = await this.loadWagonDims();
     const limits = await this.capacityLimits(locomotive);
@@ -1030,7 +1037,7 @@ export class BookingBatchService implements OnModuleInit {
       }
       const schedule =
         await this.trainSchedulesRepository.findByIdWithFullGraph(scheduleId);
-      const locomotive = schedule?.trainSet?.locomotive;
+      const locomotive = trainSetLocomotiveLimits(schedule?.trainSet);
       if (!schedule || !locomotive) {
         throw new ConflictException(
           "Export train is no longer available for reservation",
@@ -1347,7 +1354,7 @@ export class BookingBatchService implements OnModuleInit {
       };
     });
 
-    const loco = s.trainSet?.locomotive ?? null;
+    const loco = trainSetLocomotiveLimits(s.trainSet);
 
     // The board renders ONE booking window — the schedule's own frozen window
     // (windowOpensAt/windowClosesAt + phase deadlines returned below). Bookings
@@ -1407,10 +1414,12 @@ export class BookingBatchService implements OnModuleInit {
           trainName: s.trainSet.train.trainName ?? null,
         }
         : null,
+      // Identity from the primary (legacy) locomotive; limit figures from the
+      // whole set's effective minimum — what the fill engine actually spends.
       locomotive: loco
         ? {
-          code: loco.code,
-          name: loco.name ?? null,
+          code: s.trainSet?.locomotive?.code ?? '',
+          name: s.trainSet?.locomotive?.name ?? null,
           maxPullWeightTons: Number(loco.maxPullWeightTons),
           maxTrainLengthMeters: Number(loco.maxTrainLengthMeters),
         }
@@ -1460,7 +1469,7 @@ export class BookingBatchService implements OnModuleInit {
       weightTons: number;
       lengthMeters: number;
     }>,
-    loco: Locomotive | null,
+    loco: LocomotiveLimits | null,
     maxWagons: number | null,
   ): BatchBoardSchedule["capacity"] {
     const allocated = items.filter((i) => i.state === "ALLOCATED");
@@ -1495,7 +1504,7 @@ export class BookingBatchService implements OnModuleInit {
     s: TrainSchedule,
     items: BatchBoardBooking[],
   ): BatchBoardSchedule {
-    const loco = s.trainSet?.locomotive ?? null;
+    const loco = trainSetLocomotiveLimits(s.trainSet);
 
     return {
       scheduleId: s.id,
@@ -1527,10 +1536,12 @@ export class BookingBatchService implements OnModuleInit {
           trainName: s.trainSet.train.trainName ?? null,
         }
         : null,
+      // Identity from the primary (legacy) locomotive; limit figures from the
+      // whole set's effective minimum — what the fill engine actually spends.
       locomotive: loco
         ? {
-          code: loco.code,
-          name: loco.name ?? null,
+          code: s.trainSet?.locomotive?.code ?? '',
+          name: s.trainSet?.locomotive?.name ?? null,
           maxPullWeightTons: Number(loco.maxPullWeightTons),
           maxTrainLengthMeters: Number(loco.maxTrainLengthMeters),
         }
@@ -1596,7 +1607,7 @@ export class BookingBatchService implements OnModuleInit {
     const schedule =
       await this.trainSchedulesRepository.findByIdWithFullGraph(scheduleId);
     if (!schedule || !this.isFillable(schedule)) return 0;
-    const locomotive = schedule.trainSet?.locomotive;
+    const locomotive = trainSetLocomotiveLimits(schedule.trainSet);
     if (!schedule.trainSetId || !locomotive) {
       this.logger.warn(
         `Schedule ${scheduleId} has no locomotive/train set — skipped.`,
@@ -1823,7 +1834,7 @@ export class BookingBatchService implements OnModuleInit {
     for (const id of scheduleIds) {
       const schedule =
         await this.trainSchedulesRepository.findByIdWithFullGraph(id);
-      const locomotive = schedule?.trainSet?.locomotive;
+      const locomotive = trainSetLocomotiveLimits(schedule?.trainSet);
       if (!schedule || !schedule.trainSetId || !locomotive) {
         this.logger.warn(
           `Schedule ${id} has no locomotive/train set — skipped.`,
@@ -2254,6 +2265,11 @@ export class BookingBatchService implements OnModuleInit {
           `— payment phase extended for them`,
       );
     }
+    // The settle may have resolved the last pay window on a full export day
+    // (paid → allocated, and the top-up found nothing else that fits) — sweep
+    // the date's leftover bookings. Self-guarded: no-op for import/domestic
+    // and while any train on the day can still take bookings.
+    await this.expireLeftoverExportDay(scheduleId);
     // Emitted here (not in settleDueReservations/settleBatch, which both wrap
     // this) so one settle produces one push, after every allocation/expiry/
     // top-up extension for this schedule has been persisted.
@@ -2350,6 +2366,9 @@ export class BookingBatchService implements OnModuleInit {
     );
     if (schedule && (await this.isTrainFull(schedule))) {
       await this.setWindow(booking.trainScheduleId, "FULL");
+      // Same as the webhook path: a staff mark-paid can settle the last live
+      // pay window on a now-full export day — sweep the date's leftovers.
+      void this.expireLeftoverExportDay(booking.trainScheduleId);
     }
     void this.triggerWagonAllocation(booking.trainScheduleId!);
     this.notifyBoardChanged(booking.trainScheduleId, "booking_marked_paid");
@@ -2457,17 +2476,17 @@ export class BookingBatchService implements OnModuleInit {
   } | null> {
     const schedule =
       await this.trainSchedulesRepository.findByIdWithFullGraph(scheduleId);
-    const locomotive = schedule?.trainSet?.locomotive;
+    const locomotive = trainSetLocomotiveLimits(schedule?.trainSet);
     if (!schedule || !locomotive) return null;
     const wagonDims = await this.loadWagonDims();
     const limits = await this.capacityLimits(locomotive);
-    // Built trains: collapse to a single train-wide pool so the freed capacity of
-    // a booking that alights mid-corridor is NOT re-offered on the pass-through
-    // leg (see remainingBudget). Keeps intercity accept consistent with the
-    // train-wide isTrainFull / committedWagons finalize signal.
-    const budget = await this.remainingBudget(schedule, limits, wagonDims, {
-      collapseForBuiltTrain: true,
-    });
+    // Built trains use the leg-aware corridor budget too: the wagon planner
+    // consumes stock PER EDGE (planWagonsWithStock legs), so a consist wagon
+    // that runs empty Gelan→Adama genuinely can carry an intercity booking
+    // there before its export cargo boards at Adama. A train full on one leg
+    // still accepts ride-alongs on its empty legs — that is the whole point
+    // of the ride-along flow.
+    const budget = await this.remainingBudget(schedule, limits, wagonDims);
     return { budget, needFor: (booking) => this.needFor(booking, wagonDims) };
   }
 
@@ -2526,7 +2545,26 @@ export class BookingBatchService implements OnModuleInit {
       return;
     }
     const now = new Date();
-    const deadline = new Date(now.getTime() + (await this.paymentWindowMs()));
+    let deadline = new Date(now.getTime() + (await this.paymentWindowMs()));
+    // EXPORT parity: pay windows on an export train never outlive its booking
+    // window — export bookings expire at close, so anything reserved onto the
+    // same train (FCFS export or an intercity ride-along) must too. Import
+    // keeps the plain payment window; its cycles re-fill after settle.
+    const targetSchedule = await this.dataSource
+      .getRepository(TrainSchedule)
+      .findOne({ where: { id: scheduleId } });
+    if (targetSchedule?.direction === "EXPORT") {
+      const cutoff =
+        targetSchedule.windowClosesAt ?? targetSchedule.scheduledDepartureDate;
+      if (cutoff && cutoff.getTime() <= now.getTime()) {
+        throw new BadRequestException(
+          "Export booking window has closed — cannot open a pay window on this train",
+        );
+      }
+      if (cutoff && cutoff.getTime() < deadline.getTime()) {
+        deadline = new Date(cutoff);
+      }
+    }
     await this.bookingsRepository.update(booking.id, {
       trainScheduleId: scheduleId,
       status: "SELECTED_FOR_BATCH",
@@ -2822,6 +2860,60 @@ export class BookingBatchService implements OnModuleInit {
     return leftovers.length;
   }
 
+  /**
+   * EXPORT counterpart of the conclude-time sweep. Export has no batch cycle,
+   * so nothing ever concluded its day: bookings still waiting when the trains
+   * filled up or the window closed stayed pending forever. Once every export
+   * train on this route-day is shut — window DONE, or FULL with no pay window
+   * still live that could lapse and free space — the date is dead: expire the
+   * un-accepted bookings staff can no longer accept AND the ready
+   * (FULLY_EXECUTED) bookings that never got a reservation (consolidation
+   * waiters). Runs at export window close and whenever an export train's
+   * fullness settles.
+   */
+  async expireLeftoverExportDay(scheduleId: string): Promise<void> {
+    const schedule = await this.trainSchedulesRepository.findById(scheduleId);
+    if (schedule?.direction !== "EXPORT" || !schedule.scheduledDepartureDate) {
+      return;
+    }
+    const day = eatDay(schedule.scheduledDepartureDate);
+    const trains = (
+      await this.trainSchedulesRepository.findAll({
+        where: [
+          {
+            originStationId: schedule.originStationId,
+            destinationStationId: schedule.destinationStationId,
+            status: TrainScheduleStatusEnum.Draft,
+          },
+          {
+            originStationId: schedule.originStationId,
+            destinationStationId: schedule.destinationStationId,
+            status: TrainScheduleStatusEnum.Scheduled,
+          },
+        ],
+      })
+    ).filter(
+      (s) =>
+        s.scheduledDepartureDate != null &&
+        eatDay(s.scheduledDepartureDate) === day,
+    );
+    for (const s of trains) {
+      // Any train still taking bookings keeps the date alive.
+      if (s.windowPhase !== "DONE" && s.bookingWindowStatus !== "FULL") return;
+      // A FULL train whose reservations are still inside their pay windows can
+      // reopen when one lapses unpaid — defer; the settle re-runs this sweep.
+      if (s.windowPhase !== "DONE" && (await this.hasLiveReservations(s.id))) {
+        return;
+      }
+    }
+    await this.expireUnacceptedForRouteDay({
+      originYardId: schedule.originStationId,
+      destinationYardId: schedule.destinationStationId,
+      day,
+    });
+    await this.expireLeftoverDayPool(scheduleId);
+  }
+
   /**
    * Union of stop yards across the day's fillable schedules on this corridor —
    * the same pool scope fillRouteDay uses, so full-route AND sub-corridor bookings
@@ -3029,8 +3121,7 @@ export class BookingBatchService implements OnModuleInit {
     const containers = (b: Booking): number =>
       (b.bookingContainers ?? []).reduce((sum, c) => sum + Number(c.quantity ?? 0), 0);
     const totalContainers = containers(primary) + containers(partner);
-    const cargoTons =
-      Number(primary.cargoTotalWeightVgm ?? 0) + Number(partner.cargoTotalWeightVgm ?? 0);
+    const cargoTons = bookingCargoTons(primary) + bookingCargoTons(partner);
 
     // Consolidation shares TEU slots, never rated payload: the pair still needs
     // enough wagons to carry its combined cargo, so the weight axis bounds the
@@ -3137,7 +3228,7 @@ export class BookingBatchService implements OnModuleInit {
     const byLength = containerWagonsForLines(booking.bookingContainers ?? []);
 
     const capacityTons = this.dimsFor(booking, wagonDims).capacityTons;
-    const cargoTons = Number(booking.cargoTotalWeightVgm ?? 0);
+    const cargoTons = bookingCargoTons(booking);
     const byWeight =
       cargoTons > 0 && capacityTons > 0 ? Math.ceil(cargoTons / capacityTons) : 0;
 
@@ -3158,7 +3249,7 @@ export class BookingBatchService implements OnModuleInit {
     return {
       wagons,
       weightTons: bookingGrossWeightTons(
-        Number(booking.cargoTotalWeightVgm ?? 0),
+        bookingCargoTons(booking),
         wagons,
         dims.tareWeightTons,
       ),
@@ -3185,7 +3276,7 @@ export class BookingBatchService implements OnModuleInit {
    * caps deliberately do not apply here (a mis-set global row once capped
    * every train at 14m and no export booking could board).
    */
-  private async capacityLimits(locomotive: Locomotive): Promise<TrainLimits> {
+  private async capacityLimits(locomotive: LocomotiveLimits): Promise<TrainLimits> {
     const wagonTypes = await this.loadWagonTypeDimensions();
     const derived = deriveTrainCapacityFromLocomotive(
       {
@@ -3219,7 +3310,7 @@ export class BookingBatchService implements OnModuleInit {
    */
   private async syncScheduleMaxWagons(
     schedule: TrainSchedule,
-    locomotive: Locomotive,
+    locomotive: LocomotiveLimits,
   ): Promise<void> {
     const physicalWagons = await this.builtTrainWagonCount(schedule);
     const maxWagons =
@@ -3398,7 +3489,6 @@ export class BookingBatchService implements OnModuleInit {
     schedule: TrainSchedule,
     limits: TrainLimits,
     wagonDims: WagonDims,
-    opts?: { collapseForBuiltTrain?: boolean },
   ): Promise<CorridorBudget> {
     const physicalWagons = await this.builtTrainWagonCount(schedule);
     if (physicalWagons != null) {
@@ -3411,21 +3501,10 @@ export class BookingBatchService implements OnModuleInit {
         tolerance: { weightTons: 0, lengthMeters: 0 },
       };
     }
-    // A built train's wagons are coupled for the WHOLE trip, and the allocator
-    // commits each booking to a wagon for the entire route — it never reloads a
-    // wagon at a mid-corridor alight yard. So a built train has no leg concept:
-    // its capacity is one train-wide pool, exactly as isTrainFull /
-    // committedWagons already count it. When a caller opts in, collapse the
-    // corridor to a single whole-route edge so every booking (full-route OR
-    // mid-corridor) draws from that one pool — a train full of import-to-DireDawa
-    // then correctly shows NO room for a DireDawa->Addis intercity booking on the
-    // leg it merely passes through, instead of over-promising the freed slots.
-    // Locomotive-derived schedules keep the leg-aware multi-edge corridor: their
-    // abstract slot/weight/length budget genuinely frees past an alight yard.
-    const stops =
-      physicalWagons != null && opts?.collapseForBuiltTrain
-        ? [schedule.originStationId, schedule.destinationStationId]
-        : await this.stopsForSchedule(schedule);
+    // Built trains keep the leg-aware multi-edge corridor too: the wagon
+    // planner consumes stock per edge (planWagonsWithStock legs), so a consist
+    // wagon serves disjoint legs — capacity freed past an alight yard is real.
+    const stops = await this.stopsForSchedule(schedule);
     const budget = new CorridorBudget(stops, limits.base, limits.tolerance);
     const allocated = (schedule.scheduleBookings ?? [])
       .map((sb) => sb.booking)
@@ -3532,14 +3611,14 @@ export class BookingBatchService implements OnModuleInit {
   }
 
   /**
-   * Built train: FULL when every physical wagon slot is taken — the consist is
-   * the capacity, weight/length were settled at build time.
-   * No built train: FULL on ANY capacity axis — out of wagon slots, or out of
-   * pull weight / train length for even one more loaded wagon. The old
-   * slot-only check let a weight-bound train (PW2: weight binds at 37 wagons =
-   * 3522.4T of 3500+90T, slots bind at 44) cycle its booking window forever
-   * instead of finalizing — 7 phantom slots kept it "not full" while nothing
-   * could board.
+   * FULL is DIRECTIONAL: the schedule's trade direction is full when the
+   * border-crossing edge (which every export/import must ride) can't take one
+   * more minimal wagon on any axis — slots for built trains (the consist is
+   * the capacity, weight/length settled at build), all three axes otherwise
+   * (PW2: weight binds at 37 wagons = 3522.4T of 3500+90T, slots bind at 44).
+   * Home-side legs may still run empty; intercity ride-alongs keep filling
+   * them via the per-leg budget and never consult this flag. Domestic routes
+   * (no border) are full only when every edge is closed.
    */
   async isScheduleFull(scheduleId: string): Promise<boolean> {
     const schedule =
@@ -3590,48 +3669,69 @@ export class BookingBatchService implements OnModuleInit {
 
   /** See {@link isScheduleFull} — same check for callers that already hold the full graph. */
   private async isTrainFull(schedule: TrainSchedule): Promise<boolean> {
-    // Built train: the physical consist is the only capacity axis, and a wagon
-    // is committed to its booking for the WHOLE trip — wagon allocation has no
-    // leg concept, so a wagon hauling Negad→Mojo cargo can never be re-sold for
-    // the Doraleh→Negad edge it merely passes through. Count commitments
-    // train-wide, not per corridor edge: the per-edge budget read "free slots"
-    // on pass-through legs of a sold-out consist, so the window of a full train
-    // cycled OPEN forever instead of concluding DONE (and the day pool's
-    // leftover bookings were never expired).
-    const physicalWagons = await this.builtTrainWagonCount(schedule);
-    if (physicalWagons != null) {
-      return (await this.committedWagons(schedule)) >= physicalWagons;
-    }
-    if ((await this.remainingWagons(schedule)) <= 0) return true;
-    const locomotive = schedule.trainSet?.locomotive;
-    if (!locomotive) return false; // no weight/length limits to bind against
+    // "Full" means full FOR THE TRAIN'S TRADE DIRECTION. Every export and
+    // every import must cross the ET↔DJ border edge, so once that edge can't
+    // take one more minimal wagon the booking window may close — even while
+    // home-side legs still run empty. Intercity ride-alongs never consult this
+    // flag; they keep booking the free legs through the per-leg budget.
+    // A single-country (domestic) corridor has no mandatory edge, so it is
+    // full only when EVERY edge is closed on some axis.
     const wagonDims = await this.loadWagonDims();
-    const limits = await this.capacityLimits(locomotive);
+    const physicalWagons = await this.builtTrainWagonCount(schedule);
+    let limits: TrainLimits;
+    if (physicalWagons != null) {
+      // The consist is the capacity; weight/length were settled at build time.
+      // remainingBudget swaps in the physical wagon count per edge itself.
+      limits = {
+        base: {
+          wagons: physicalWagons,
+          weightTons: Number.POSITIVE_INFINITY,
+          lengthMeters: Number.POSITIVE_INFINITY,
+        },
+        tolerance: { weightTons: 0, lengthMeters: 0 },
+      };
+    } else {
+      const locomotive = trainSetLocomotiveLimits(schedule.trainSet);
+      // No loco, no built train: only the slot axis exists to bind against.
+      if (!locomotive) return (await this.remainingWagons(schedule)) <= 0;
+      limits = await this.capacityLimits(locomotive);
+    }
     const budget = await this.remainingBudget(schedule, limits, wagonDims);
-    return budget.isExhausted(this.minPerWagonNeed(wagonDims));
+    const minNeed = this.minPerWagonNeed(wagonDims);
+    const border = await this.borderLeg(budget.stops);
+    if (border) {
+      return !budget.fits(
+        {
+          wagons: 1,
+          weightTons: minNeed.grossWeightTons,
+          lengthMeters: minNeed.lengthMeters,
+        },
+        border,
+      );
+    }
+    return budget.isExhausted(minNeed);
   }
 
   /**
-   * Wagons the schedule's allocated + reserved bookings occupy train-wide,
-   * regardless of which corridor leg each rides. Deduped by booking id — a
-   * booking mid-settle can momentarily be both linked and reserved.
+   * The corridor's single border-crossing edge (last home-country stop → first
+   * far-country stop), or null when every stop is in one country. This is the
+   * edge every EXPORT and IMPORT booking must ride, whichever sub-corridor it
+   * books — which makes it the train's directional fullness gauge.
    */
-  private async committedWagons(schedule: TrainSchedule): Promise<number> {
-    const wagonDims = await this.loadWagonDims();
-    const allocated = (schedule.scheduleBookings ?? [])
-      .map((sb) => sb.booking)
-      .filter((b): b is Booking => Boolean(b));
-    const reserved = await this.bookingsRepository.findReservedForSchedule(
-      schedule.id,
-    );
-    const byId = new Map(
-      [...allocated, ...reserved].map((b) => [b.id, b] as const),
-    );
-    let total = 0;
-    for (const booking of byId.values()) {
-      total += this.wagonsFor(booking, wagonDims);
-    }
-    return total;
+  private async borderLeg(stops: string[]): Promise<CorridorLeg | null> {
+    if (stops.length < 2) return null;
+    const yards = await this.dataSource
+      .getRepository(Yard)
+      .find({ where: { id: In(stops) } });
+    const countryOf = new Map(yards.map((y) => [y.id, y.country]));
+    const first = countryOf.get(stops[0]);
+    if (!first) return null;
+    const crossIdx = stops.findIndex((id) => {
+      const country = countryOf.get(id);
+      return country != null && country !== first;
+    });
+    if (crossIdx <= 0) return null;
+    return { fromEdge: crossIdx - 1, toEdge: crossIdx };
   }
 
   /**
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.spec.ts
index 9393c520f..abd07c129 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.spec.ts
@@ -20,6 +20,7 @@ describe('BookingWindowService — window state machine', () => {
     hasLiveReservations: jest.Mock;
     refreshWindowStatus: jest.Mock;
     expireLeftoverDayPool: jest.Mock;
+    expireLeftoverExportDay: jest.Mock;
     fillFromWaitingList: jest.Mock;
   };
   let trainSchedulesRepository: { findById: jest.Mock; findAll: jest.Mock };
@@ -75,6 +76,7 @@ describe('BookingWindowService — window state machine', () => {
       hasLiveReservations: jest.fn().mockResolvedValue(false),
       refreshWindowStatus: jest.fn().mockResolvedValue(undefined),
       expireLeftoverDayPool: jest.fn().mockResolvedValue(0),
+      expireLeftoverExportDay: jest.fn().mockResolvedValue(undefined),
       // No waiting booking fits by default, so conclude proceeds to reopen/DONE.
       fillFromWaitingList: jest.fn().mockResolvedValue(0),
     };
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.ts
index 02c5fb993..3b9bb25d3 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.ts
@@ -229,6 +229,11 @@ export class BookingWindowService implements OnModuleInit {
         await this.bookingBatchService.setWindow(schedule.id, 'CLOSED');
         schedule.bookingWindowStatus = 'CLOSED';
       }
+      // Export has no conclude step: this close is the last moment the day's
+      // bookings could have boarded. Once every train on the route-day is
+      // shut, expire what is still waiting for this date (the sweep defers
+      // while a sibling train stays open).
+      await this.bookingBatchService.expireLeftoverExportDay(schedule.id);
       return true;
     }
     return false;
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/dto/move-wagon-load.dto.ts b/apps/edr-freight-api/src/modules/train-scheduling/dto/move-wagon-load.dto.ts
new file mode 100644
index 000000000..a93a8afc6
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/train-scheduling/dto/move-wagon-load.dto.ts
@@ -0,0 +1,11 @@
+import { IsUUID } from 'class-validator';
+
+export class MoveWagonLoadDto {
+  /**
+   * Where the source wagon's whole load goes: a train-set wagon slot (empty →
+   * move, loaded → swap the two loads) or an empty consist-only physical wagon
+   * of the built train (→ the slot repins onto it).
+   */
+  @IsUUID()
+  targetWagonId!: string;
+}
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/fleet-plan.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/fleet-plan.util.ts
index 4d408689b..cacffaba4 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/fleet-plan.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/fleet-plan.util.ts
@@ -1,3 +1,4 @@
+import { bookingCargoTons } from './train-capacity.util';
 import type { Booking } from '../bookings/entities/booking.entity';
 import type { WagonType } from '../wagon-types/entities/wagon-type.entity';
 import {
@@ -187,5 +188,5 @@ export function summarizeFleetWarnings(
 }
 
 export function totalAssignedWeight(bookings: Booking[]): number {
-  return roundTons(bookings.reduce((sum, b) => sum + Number(b.cargoTotalWeightVgm ?? 0), 0));
+  return roundTons(bookings.reduce((sum, b) => sum + bookingCargoTons(b), 0));
 }
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/intercity.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/intercity.service.ts
index b35650e16..293fc8801 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/intercity.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/intercity.service.ts
@@ -146,10 +146,8 @@ export class IntercityService {
       remaining: capacity?.budget.maxRemaining() ?? null,
       candidates: waiting.map((booking) => {
         const need = capacity?.needFor(booking) ?? null;
-        // legForYards, not legOf: on a built train the budget is a single
-        // whole-route edge (see intercityCapacity), so a mid-corridor booking
-        // must draw from that one pool via the whole-route fallback. On a
-        // locomotive-derived schedule it still resolves to the booking's own leg.
+        // legForYards: the booking draws only from ITS OWN leg's edges, with a
+        // whole-route fallback when its yards aren't on the budget's stop list.
         const leg = capacity?.budget.legForYards(
           booking.originYardId,
           booking.destinationYardId,
@@ -215,11 +213,8 @@ export class IntercityService {
         continue;
       }
       const need = capacity.needFor(booking);
-      // legForYards, not legOf: a built train's budget is a single whole-route
-      // pool (mid-corridor wagons are committed for the whole trip and never
-      // reloaded), so the booking draws from that pool via the whole-route
-      // fallback; a locomotive-derived schedule still gets the booking's own
-      // leg, so it can still board a train that is full only on other legs.
+      // legForYards: charge only the edges this booking rides, so it can still
+      // board a train that is full only on other legs.
       const leg = budget.legForYards(booking.originYardId, booking.destinationYardId);
       if (!budget.fits(need, leg)) {
         rejected.push({
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.spec.ts
index dd9234bdb..8342eae47 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.spec.ts
@@ -7,6 +7,7 @@ import {
   grossWagonWeightTons,
   minLocomotiveLimits,
   sizePartialOfferWagons,
+  trainSetLocomotiveLimits,
 } from './train-capacity.util';
 
 describe('train-capacity.util', () => {
@@ -205,6 +206,37 @@ describe('train-capacity.util', () => {
     expect(limits?.overageToleranceTons).toBe(20);
   });
 
+  it('ignores unconfigured (null) tolerances instead of zeroing the set (S-2026-00024)', () => {
+    // LOCO-019 had 90T tolerance, LOCO-020 had none configured: the set must
+    // keep the 90, not collapse to 0 and reject 3547.6T on a 3500T train.
+    const limits = minLocomotiveLimits([
+      { maxPullWeightTons: 3500, maxTrainLengthMeters: 760, overageToleranceTons: 90 },
+      { maxPullWeightTons: 3500, maxTrainLengthMeters: 760, overageToleranceTons: null },
+    ]);
+    expect(limits?.overageToleranceTons).toBe(90);
+    // All unconfigured → no tolerance.
+    const none = minLocomotiveLimits([
+      { maxPullWeightTons: 3500, maxTrainLengthMeters: 760 },
+    ]);
+    expect(none?.overageToleranceTons).toBe(0);
+  });
+
+  it('trainSetLocomotiveLimits prefers link rows and falls back to the legacy single loco', () => {
+    const l1 = { maxPullWeightTons: 3500, maxTrainLengthMeters: 760, overageToleranceTons: 90 };
+    const l2 = { maxPullWeightTons: 3600, maxTrainLengthMeters: 700, overageToleranceTons: null };
+    expect(
+      trainSetLocomotiveLimits({ locomotive: null, locomotives: [{ locomotive: l1 }, { locomotive: l2 }] }),
+    ).toEqual({
+      maxPullWeightTons: 3500,
+      maxTrainLengthMeters: 700,
+      overageToleranceTons: 90,
+      overageToleranceMeters: 0,
+    });
+    expect(trainSetLocomotiveLimits({ locomotive: l1 })?.maxPullWeightTons).toBe(3500);
+    expect(trainSetLocomotiveLimits(null)).toBeNull();
+    expect(trainSetLocomotiveLimits({ locomotive: null, locomotives: [] })).toBeNull();
+  });
+
   describe('sizePartialOfferWagons', () => {
     it('sizes a bulk split by the WEIGHT axis when the pull limit binds, not wagon slots', () => {
       // The 3500T-train scenario: two 1000T bookings boarded gross (each 15 PW2
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.ts
index 463ae7ea8..b4b3a64de 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-capacity.util.ts
@@ -86,6 +86,27 @@ function num(value: unknown, fallback = 0): number {
   return Number.isFinite(n) ? n : fallback;
 }
 
+/**
+ * Cargo tons of a booking: the stored VGM total when present, else the sum of
+ * its container lines (quantity × VGM per unit). The portal's container flow
+ * stores per-line VGM and leaves `cargoTotalWeightVgm` at 0 — reading the
+ * total alone made every such booking weigh only its tare.
+ */
+export function bookingCargoTons(booking: {
+  cargoTotalWeightVgm?: number | string | null;
+  bookingContainers?: Array<{
+    quantity?: number | null;
+    vgmPerUnitTons?: number | string | null;
+  }> | null;
+}): number {
+  const total = num(booking.cargoTotalWeightVgm);
+  if (total > 0) return total;
+  return (booking.bookingContainers ?? []).reduce(
+    (sum, line) => sum + num(line.quantity) * num(line.vgmPerUnitTons),
+    0,
+  );
+}
+
 /** Gross weight of one loaded wagon: it hauls itself plus its cargo. */
 export function grossWagonWeightTons(slot: Pick<ConsistSlot, 'tareWeightTons' | 'cargoTons'>): number {
   return num(slot.tareWeightTons) + num(slot.cargoTons);
@@ -253,12 +274,41 @@ export function minLocomotiveLimits(
     maxTrainLengthMeters: Math.min(
       ...locomotives.map((l) => num(l.maxTrainLengthMeters, Infinity) || Infinity),
     ),
-    // Weakest locomotive's tolerance governs the set, same as its caps.
-    overageToleranceTons: Math.min(...locomotives.map((l) => num(l.overageToleranceTons))),
-    overageToleranceMeters: Math.min(...locomotives.map((l) => num(l.overageToleranceMeters))),
+    // Weakest CONFIGURED tolerance governs the set — a locomotive with no
+    // tolerance set has no opinion, it does not zero out the others.
+    overageToleranceTons: minConfigured(locomotives.map((l) => l.overageToleranceTons)),
+    overageToleranceMeters: minConfigured(locomotives.map((l) => l.overageToleranceMeters)),
   };
 }
 
+function minConfigured(values: Array<number | null | undefined>): number {
+  const configured = values.filter((v) => v != null).map((v) => num(v));
+  return configured.length ? Math.min(...configured) : 0;
+}
+
+/**
+ * Effective limits for a whole train set: min across its linked locomotives,
+ * falling back to the legacy single `locomotive` column for sets created
+ * before multi-loco support. Null when the set has no locomotive at all.
+ */
+export function trainSetLocomotiveLimits(
+  trainSet?: {
+    locomotive?: LocomotiveLimits | null;
+    locomotives?: Array<{ locomotive?: LocomotiveLimits | null }> | null;
+  } | null,
+): LocomotiveLimits | null {
+  if (!trainSet) return null;
+  const linked = (trainSet.locomotives ?? [])
+    .map((link) => link.locomotive)
+    .filter((l): l is LocomotiveLimits => Boolean(l));
+  const pool = linked.length
+    ? linked
+    : trainSet.locomotive
+      ? [trainSet.locomotive]
+      : [];
+  return minLocomotiveLimits(pool);
+}
+
 /** Per-booking train length from wagon count and freight-specific wagon type length. */
 export function bookingTrainLengthMeters(
   freightType: string | null | undefined,
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.controller.ts b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.controller.ts
index 3e142f778..b1f79733e 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.controller.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.controller.ts
@@ -28,6 +28,7 @@ import { GetEligibleBookingsDto } from "./dto/get-eligible-bookings.dto";
 import { GetEligibleBulkBookingsDto } from "./dto/get-eligible-bulk-bookings.dto";
 import { GetEligibleContainerBookingsDto } from "./dto/get-eligible-container-bookings.dto";
 import { PinWagonsDto } from "./dto/pin-wagons.dto";
+import { MoveWagonLoadDto } from "./dto/move-wagon-load.dto";
 import { UpdateContainerItemDto } from "./dto/update-container-item.dto";
 import { UpdateImportLoadingStatusDto } from "./dto/update-import-loading-status.dto";
 import { PreviewBulkTrainScheduleDto } from "./dto/preview-bulk-train-schedule.dto";
@@ -374,6 +375,20 @@ export class TrainSchedulingController {
     return this.trainSchedulingService.updateContainerItem(id, itemId, dto);
   }
 
+  @Post("schedules/:id/wagons/:wagonId/move-load")
+  @TrainSchedulingManage()
+  @ApiOperation({
+    summary:
+      "Move a wagon's whole load to another wagon (empty → move/repin, loaded → swap loads)",
+  })
+  moveWagonLoad(
+    @Param("id", ParseUUIDPipe) id: string,
+    @Param("wagonId", ParseUUIDPipe) wagonId: string,
+    @Body() dto: MoveWagonLoadDto,
+  ) {
+    return this.trainSchedulingService.moveWagonLoad(id, wagonId, dto);
+  }
+
   @Get("schedules/:id/unassigned-bookings")
   @TrainSchedulingView()
   @ApiOperation({ summary: "Get unassigned bookings for a schedule" })
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts
index af1a9eb45..6757a6e21 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.spec.ts
@@ -80,7 +80,12 @@ const makeBooking = (
 
 describe('TrainSchedulingService', () => {
   let service: TrainSchedulingService;
-  let dataSource: { getRepository: jest.Mock; transaction: jest.Mock; query: jest.Mock };
+  let dataSource: {
+    getRepository: jest.Mock;
+    transaction: jest.Mock;
+    query: jest.Mock;
+    manager: { getRepository: jest.Mock };
+  };
   let bookingsRepository: Record<string, jest.Mock>;
   let locomotivesRepository: { findById: jest.Mock; findAll: jest.Mock };
   let wagonTypesRepository: { findAll: jest.Mock };
@@ -91,11 +96,23 @@ describe('TrainSchedulingService', () => {
   let wagonAllocationBulkLoadsRepository: Record<string, jest.Mock>;
 
   beforeEach(() => {
+    // findGroupSiblings runs a query builder off dataSource.manager; default it
+    // to "no sibling schedules" so isolated unit tests don't need to wire it.
+    const emptySiblingQb = {
+      where: jest.fn().mockReturnThis(),
+      andWhere: jest.fn().mockReturnThis(),
+      getMany: jest.fn().mockResolvedValue([]),
+    };
     dataSource = {
       getRepository: jest.fn(),
       transaction: jest.fn(),
       // Raw-SQL helper lookups (e.g. builtTrainIdOfSchedule) default to "no rows".
       query: jest.fn().mockResolvedValue([]),
+      manager: {
+        getRepository: jest.fn(() => ({
+          createQueryBuilder: jest.fn(() => emptySiblingQb),
+        })),
+      },
     };
     bookingsRepository = {
       findEligibleForScheduling: jest.fn(),
@@ -110,9 +127,11 @@ describe('TrainSchedulingService', () => {
       findByIdWithFullGraph: jest.fn(),
       findAll: jest.fn(),
       updateStatus: jest.fn(),
+      maxReferenceSequence: jest.fn().mockResolvedValue(0),
     };
     trainScheduleBookingsRepository = {
       findByBookingIds: jest.fn(),
+      findByScheduleId: jest.fn().mockResolvedValue([]),
       createMany: jest.fn(),
       deleteByScheduleAndBooking: jest.fn(),
     };
@@ -327,7 +346,11 @@ describe('TrainSchedulingService', () => {
   });
 
   it('allows preview when bookings are already on the target schedule', async () => {
-    const bookings = [makeBooking('b1', 'BKG-CONT-001', 500, 20, '40FT', 20)];
+    // A booking already pinned to the target schedule is exempt from the
+    // corridor/day/status gates — mark it so on the entity, matching the link row.
+    const bookings = [
+      { ...makeBooking('b1', 'BKG-CONT-001', 500, 20, '40FT', 20), trainScheduleId: 'sched-target' },
+    ];
 
     wagonTypesRepository.findAll.mockResolvedValue([nw5]);
     bookingsRepository.findByIdsForScheduling.mockResolvedValue(bookings);
@@ -354,7 +377,10 @@ describe('TrainSchedulingService', () => {
     expect(result.valid).toBe(true);
   });
 
-  it('allows preview when selected bookings are on different schedule dates', async () => {
+  it('flags a booking scheduled for a different day than the train departure', async () => {
+    // The old cross-booking "must share the same schedule date" rule is gone;
+    // the live rule is that every booking must match the departure day. b2
+    // departs a day later, so it's the one flagged.
     const bookings = [
       makeBooking('b1', 'BKG-CONT-001', 500, 20, '40FT', 20, '2026-06-20T08:00:00.000Z'),
       makeBooking('b2', 'BKG-CONT-002', 300, 10, '20FT', 10, '2026-06-21T14:00:00.000Z'),
@@ -375,7 +401,8 @@ describe('TrainSchedulingService', () => {
     expect(result.violations).not.toContain(
       'Selected bookings must share the same schedule date',
     );
-    expect(result.valid).toBe(true);
+    expect(result.violations.some((v) => v.includes('different day'))).toBe(true);
+    expect(result.valid).toBe(false);
   });
 
   it('rejects bookings that are not in schedulable status', async () => {
@@ -408,6 +435,8 @@ describe('TrainSchedulingService', () => {
       originYardId: 'yard-origin',
       destinationYardId: 'yard-destination',
       isActive: true,
+      status: 'AVAILABLE',
+      direction: 'IMPORT',
     };
 
     const locomotive2 = { ...locomotive, id: 'loc-2', code: 'LOC-002' };
@@ -421,6 +450,12 @@ describe('TrainSchedulingService', () => {
     const trainScheduleRepo = {
       create: jest.fn().mockImplementation((value) => value),
       save: jest.fn().mockResolvedValue({ id: 'schedule-1' }),
+      // findGroupWindowAnchor looks for same-day sibling schedules; none here.
+      createQueryBuilder: jest.fn(() => ({
+        where: jest.fn().mockReturnThis(),
+        andWhere: jest.fn().mockReturnThis(),
+        getMany: jest.fn().mockResolvedValue([]),
+      })),
     };
     const trainSetRepo = {
       create: jest.fn().mockImplementation((value) => value),
@@ -464,19 +499,21 @@ describe('TrainSchedulingService', () => {
       callback(manager),
     );
 
+    // Departure must clear the import lead window (≥ importWindowLeadDays ahead
+    // of now), so use a comfortably-future date rather than a hardcoded one.
+    const futureDeparture = new Date(Date.now() + 10 * 24 * 60 * 60 * 1000).toISOString();
     const result = await service.createContainerTrainSchedule({
       routeId: 'route-1',
-      scheduleDate: '2026-06-20T08:00:00.000Z',
+      scheduleDate: futureDeparture,
       locomotiveIds: ['loc-1', 'loc-2'],
     });
 
     expect(trainSetRepo.save).toHaveBeenCalled();
     expect(trainScheduleRepo.save).toHaveBeenCalled();
     expect(trainSetLocomotiveRepo.save).toHaveBeenCalled();
-    expect(lockedLocomotiveRepo.update).toHaveBeenCalledWith(
-      { id: expect.objectContaining({ _type: 'in', _value: ['loc-1', 'loc-2'] }) },
-      { status: 'ASSIGNED' },
-    );
+    // Advance scheduling locks locomotives but does NOT flip them to ASSIGNED —
+    // one locomotive may sit on several future schedules.
+    expect(lockedLocomotiveRepo.update).not.toHaveBeenCalled();
     expect(result.id).toBe('schedule-1');
   });
 
@@ -492,7 +529,7 @@ describe('TrainSchedulingService', () => {
       destinationYardId: 'yard-destination',
       status: 'PAID',
       bookingContainers: [],
-      cargoType: { code: 'COFFEE' },
+      cargoType: { id: 'cargo-coffee', code: 'COFFEE', wagonTypes: [cw3] },
     };
 
     wagonTypesRepository.findAll.mockImplementation(async ({ where }: { where?: { code?: string } }) => {
@@ -511,7 +548,9 @@ describe('TrainSchedulingService', () => {
     });
 
     expect(result.valid).toBe(true);
-    expect(result.summary.wagonType).toBe('MIXED');
+    // Mixed freight now labels the summary by the concrete wagon type codes it uses.
+    expect(result.summary.wagonType).toContain('NW5');
+    expect(result.summary.wagonType).toContain('CW3');
     expect(result.wagonPlan.length).toBeGreaterThan(2);
     expect(result.containerUnits).toHaveLength(2);
   });
@@ -536,9 +575,11 @@ describe('TrainSchedulingService', () => {
   });
 
   it('rejects create when the locked locomotive is no longer available', async () => {
+    // Advance scheduling only hard-blocks OUT_OF_SERVICE locomotives; other
+    // non-AVAILABLE states (e.g. ASSIGNED) downgrade to a warning.
     const manager = {
       getRepository: jest.fn(() => ({
-        findOne: jest.fn().mockResolvedValue({ ...locomotive, status: 'ASSIGNED' }),
+        findOne: jest.fn().mockResolvedValue({ ...locomotive, status: 'OUT_OF_SERVICE' }),
       })),
     };
 
@@ -551,6 +592,8 @@ describe('TrainSchedulingService', () => {
             originYardId: 'yard-origin',
             destinationYardId: 'yard-destination',
             isActive: true,
+            status: 'AVAILABLE',
+            direction: 'IMPORT',
           }),
         };
       }
@@ -907,7 +950,7 @@ describe('TrainSchedulingService', () => {
   });
 
   describe('getAvailableLocomotivesForRoute', () => {
-    it('returns locomotives at the route origin yard', async () => {
+    it('returns every in-service locomotive, annotated with origin-yard presence', async () => {
       const routeId = 'route-export';
       const originYardId = 'yard-addis';
       const routeRepo = {
@@ -915,6 +958,7 @@ describe('TrainSchedulingService', () => {
           id: routeId,
           name: 'Addis → Djibouti',
           isActive: true,
+          status: 'AVAILABLE',
           originYardId,
           originYard: { country: 'Ethiopia' },
           destinationYard: { country: 'Djibouti' },
@@ -924,21 +968,21 @@ describe('TrainSchedulingService', () => {
         if ((entity as { name?: string })?.name === 'Route') return routeRepo;
         return { findOne: jest.fn(), update: jest.fn() };
       });
+      // Advance-scheduling picker: nothing is filtered by yard — every in-service
+      // locomotive is returned and annotated with whether it's at the origin yet.
       locomotivesRepository.findAll.mockResolvedValue([
         { id: 'l2', code: 'EXP', status: 'AVAILABLE', currentYardId: originYardId },
+        { id: 'l3', code: 'FAR', status: 'ASSIGNED', currentYardId: 'yard-elsewhere' },
       ]);
 
       const result = await service.getAvailableLocomotivesForRoute(routeId);
 
-      expect(locomotivesRepository.findAll).toHaveBeenCalledWith({
-        where: { status: 'AVAILABLE', currentYardId: originYardId },
-        order: { code: 'ASC' },
-      });
-      expect(result).toHaveLength(1);
-      expect(result[0].code).toBe('EXP');
+      expect(result).toHaveLength(2);
+      expect(result.find((l) => l.code === 'EXP')?.atOriginYard).toBe(true);
+      expect(result.find((l) => l.code === 'FAR')?.atOriginYard).toBe(false);
     });
 
-    it('returns all locomotives returned by the repository for domestic routes', async () => {
+    it('rejects intercity (domestic) routes — intercity scheduling is not offered', async () => {
       const routeId = 'route-domestic';
       const originYardId = 'yard-addis';
       const routeRepo = {
@@ -946,6 +990,7 @@ describe('TrainSchedulingService', () => {
           id: routeId,
           name: 'Addis → Dire Dawa',
           isActive: true,
+          status: 'AVAILABLE',
           originYardId,
           originYard: { country: 'Ethiopia' },
           destinationYard: { country: 'Ethiopia' },
@@ -955,14 +1000,10 @@ describe('TrainSchedulingService', () => {
         if ((entity as { name?: string })?.name === 'Route') return routeRepo;
         return { findOne: jest.fn(), update: jest.fn() };
       });
-      locomotivesRepository.findAll.mockResolvedValue([
-        { id: 'l1', code: 'IMP', status: 'AVAILABLE', currentYardId: originYardId },
-        { id: 'l2', code: 'EXP', status: 'AVAILABLE', currentYardId: originYardId },
-      ]);
 
-      const result = await service.getAvailableLocomotivesForRoute(routeId);
-
-      expect(result).toHaveLength(2);
+      await expect(
+        service.getAvailableLocomotivesForRoute(routeId),
+      ).rejects.toBeInstanceOf(BadRequestException);
     });
   });
 
@@ -1081,4 +1122,172 @@ describe('TrainSchedulingService', () => {
       expect(html).not.toContain('EMPTY');
     });
   });
+
+  describe('moveWagonLoad — staff rearrange', () => {
+    const containerType = {
+      code: 'NX70',
+      supportedLoadTypes: ['CONTAINER'],
+      supportsContainer: true,
+    };
+    let slotA: Record<string, unknown>;
+    let slotB: Record<string, unknown>;
+    let allocsByWagon: Record<string, Array<Record<string, unknown>>>;
+    let allocRepo: { find: jest.Mock; update: jest.Mock };
+    let slotRepo: { update: jest.Mock };
+    let wagonRepo: { findOne: jest.Mock };
+
+    const makeSchedule = (over: Record<string, unknown> = {}) => ({
+      id: 'sched-1',
+      status: 'SCHEDULED',
+      trainSetId: 'ts-1',
+      trainSet: { trainId: 'train-1', wagons: [slotA, slotB] },
+      ...over,
+    });
+
+    beforeEach(() => {
+      slotA = {
+        id: 'wA',
+        sequenceNo: 1,
+        capacityTons: 61,
+        lengthMeters: 14,
+        assignedWeightTons: 40,
+        status: 'RESERVED',
+        boardYardId: 'yard-1',
+        alightYardId: null,
+        wagonType: containerType,
+      };
+      slotB = {
+        id: 'wB',
+        sequenceNo: 2,
+        capacityTons: 61,
+        lengthMeters: 14,
+        assignedWeightTons: 25,
+        status: 'RESERVED',
+        boardYardId: null,
+        alightYardId: null,
+        wagonType: containerType,
+      };
+      allocsByWagon = {
+        // 20ft pair (two allocations sharing wagon A) — must travel together.
+        wA: [
+          { id: 'alloc-a1', trainSetWagonId: 'wA', bookingId: 'b1', allocatedWeightTons: 20, loadType: 'CONTAINER' },
+          { id: 'alloc-a2', trainSetWagonId: 'wA', bookingId: 'b2', allocatedWeightTons: 20, loadType: 'CONTAINER' },
+        ],
+        // one 40ft on wagon B.
+        wB: [
+          { id: 'alloc-b1', trainSetWagonId: 'wB', bookingId: 'b3', allocatedWeightTons: 25, loadType: 'CONTAINER' },
+        ],
+      };
+
+      trainSchedulesRepository.findByIdWithFullGraph.mockResolvedValue(makeSchedule());
+      allocRepo = {
+        find: jest.fn().mockImplementation(({ where }: { where: { trainSetWagonId: string } }) =>
+          Promise.resolve(allocsByWagon[where.trainSetWagonId] ?? []),
+        ),
+        update: jest.fn().mockResolvedValue(undefined),
+      };
+      slotRepo = { update: jest.fn().mockResolvedValue(undefined) };
+      wagonRepo = { findOne: jest.fn().mockResolvedValue(null) };
+      dataSource.getRepository.mockImplementation((entity: unknown) => {
+        if (entity === WagonBookingAllocation) return allocRepo;
+        if (entity === TrainSetWagon) return slotRepo;
+        if (entity === Wagon) return wagonRepo;
+        return { find: jest.fn().mockResolvedValue([]) };
+      });
+      dataSource.transaction.mockImplementation(
+        async (fn: (m: unknown) => Promise<void>) =>
+          fn({ getRepository: dataSource.getRepository }),
+      );
+      jest
+        .spyOn(
+          service as never as { getTrainScheduleById: (id: string) => Promise<unknown> },
+          'getTrainScheduleById' as never,
+        )
+        .mockResolvedValue({ id: 'sched-1' } as never);
+    });
+
+    it('rejects moves on a dispatched train', async () => {
+      trainSchedulesRepository.findByIdWithFullGraph.mockResolvedValue(
+        makeSchedule({ status: 'DISPATCHED' }),
+      );
+      await expect(
+        service.moveWagonLoad('sched-1', 'wA', { targetWagonId: 'wB' }),
+      ).rejects.toThrow(BadRequestException);
+      expect(dataSource.transaction).not.toHaveBeenCalled();
+    });
+
+    it('404s when the target is neither a slot nor a consist wagon of this train', async () => {
+      await expect(
+        service.moveWagonLoad('sched-1', 'wA', { targetWagonId: 'nope' }),
+      ).rejects.toThrow(/not part of this schedule/);
+    });
+
+    it('swaps two loaded wagons: every allocation crosses over, load fields swap', async () => {
+      await service.moveWagonLoad('sched-1', 'wA', { targetWagonId: 'wB' });
+
+      // The 20ft pair moved together onto wagon B…
+      expect(allocRepo.update).toHaveBeenCalledWith('alloc-a1', { trainSetWagonId: 'wB' });
+      expect(allocRepo.update).toHaveBeenCalledWith('alloc-a2', { trainSetWagonId: 'wB' });
+      // …and the 40ft came back to wagon A.
+      expect(allocRepo.update).toHaveBeenCalledWith('alloc-b1', { trainSetWagonId: 'wA' });
+      // Load-coupled slot fields follow their loads.
+      expect(slotRepo.update).toHaveBeenCalledWith('wB', {
+        assignedWeightTons: 40,
+        status: 'RESERVED',
+        boardYardId: 'yard-1',
+        alightYardId: null,
+      });
+      expect(slotRepo.update).toHaveBeenCalledWith('wA', {
+        assignedWeightTons: 25,
+        status: 'RESERVED',
+        boardYardId: null,
+        alightYardId: null,
+      });
+    });
+
+    it('repins the slot onto an empty consist-only wagon (the 404 case)', async () => {
+      wagonRepo.findOne.mockResolvedValue({
+        id: 'phys-9',
+        wagonTypeId: 'wt-1',
+        wagonNumber: 'WGN-9',
+        wagonType: { ...containerType, capacityTons: 70, lengthMeters: 14 },
+      });
+
+      await service.moveWagonLoad('sched-1', 'wA', { targetWagonId: 'phys-9' });
+
+      expect(wagonRepo.findOne).toHaveBeenCalledWith(
+        expect.objectContaining({ where: { id: 'phys-9', trainId: 'train-1' } }),
+      );
+      // Repin: wagon identity moves onto the slot; allocations stay put.
+      expect(slotRepo.update).toHaveBeenCalledWith('wA', {
+        physicalWagonId: 'phys-9',
+        wagonTypeId: 'wt-1',
+        capacityTons: 70,
+        lengthMeters: 14,
+      });
+      expect(allocRepo.update).not.toHaveBeenCalled();
+    });
+
+    it('rejects a bulk load onto a wagon whose type only supports containers', async () => {
+      allocsByWagon.wA = [
+        { id: 'alloc-bulk', trainSetWagonId: 'wA', bookingId: 'b9', allocatedWeightTons: 50, loadType: 'BULK' },
+      ];
+      allocsByWagon.wB = [];
+
+      await expect(
+        service.moveWagonLoad('sched-1', 'wA', { targetWagonId: 'wB' }),
+      ).rejects.toThrow(/cannot carry a bulk load/);
+    });
+
+    it('rejects when the incoming load exceeds the receiving wagon payload', async () => {
+      allocsByWagon.wA = [
+        { id: 'alloc-heavy', trainSetWagonId: 'wA', bookingId: 'b9', allocatedWeightTons: 70, loadType: 'CONTAINER' },
+      ];
+      allocsByWagon.wB = [];
+
+      await expect(
+        service.moveWagonLoad('sched-1', 'wA', { targetWagonId: 'wB' }),
+      ).rejects.toThrow(/over its/);
+    });
+  });
 });
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts
index 93d8bba56..03b293e4c 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts
@@ -77,6 +77,7 @@ import {
   TrainScheduleFreightType,
 } from './dto/list-train-schedules-query.dto';
 import { PinWagonsDto } from './dto/pin-wagons.dto';
+import { MoveWagonLoadDto } from './dto/move-wagon-load.dto';
 import { UpdateContainerItemDto } from './dto/update-container-item.dto';
 import { UpdateImportLoadingStatusDto } from './dto/update-import-loading-status.dto';
 import { PreviewBulkTrainScheduleDto } from './dto/preview-bulk-train-schedule.dto';
@@ -121,17 +122,21 @@ import {
   roundTons,
   sumWagonsRequired,
   type TrainLimitConfig,
+  maxEdgeConsistUsage,
   validateContainerPlacements,
-  validateMixedTrainLimits,
+  validateMixedTrainLimitsPerEdge,
   type ContainerPlacementInput,
   type WagonPlanSlot,
 } from './wagon-plan.util';
 import { deriveScheduleDirection } from './derive-schedule-direction.util';
 import { pickLowestFreeNumber, pickTrainNumberPool } from './train-number.util';
 import {
+  bookingCargoTons,
   deriveTrainCapacityFromLocomotive,
   minLocomotiveLimits,
+  trainSetLocomotiveLimits,
   wagonTypeDimensionsFromEntity,
+  LocomotiveLimits,
   WagonTypeDimensions,
 } from './train-capacity.util';
 import {
@@ -1538,8 +1543,21 @@ export class TrainSchedulingService {
       }
     }
 
+    // The rebuild below deletes EVERY schedule↔booking link row and recreates
+    // only what makes the new plan. Ride-along (intercity) bookings are linked
+    // OUTSIDE this flow — by acceptIntercity/allocate — and never appear in the
+    // workspace's picked ids, so planning from dto.bookingIds alone silently
+    // orphans them: PAID + SCHEDULED with no link and no wagon, invisible in
+    // every list. Every (re)assignment therefore re-plans the WHOLE train:
+    // the requested ids plus everything currently linked.
+    const linkedRows =
+      await this.trainScheduleBookingsRepository.findByScheduleId(scheduleId);
+    const allBookingIds = [
+      ...new Set([...dto.bookingIds, ...linkedRows.map((row) => row.bookingId)]),
+    ];
+
     const previewDto = {
-      bookingIds: dto.bookingIds,
+      bookingIds: allBookingIds,
       scheduleDate: schedule.scheduledDepartureDate.toISOString(),
       originStationId: schedule.originStationId,
       destinationStationId: schedule.destinationStationId,
@@ -1562,8 +1580,13 @@ export class TrainSchedulingService {
     // preview the wagon plan first, then lay containers into the plan's slots.
     // Without this the placement validator rejects container bookings outright
     // ("Container placements are required for container bookings").
+    // Callers hand-pick placements only for the bookings they know about; the
+    // union above may have folded in linked ride-alongs those placements never
+    // covered. Auto-fill whatever units are missing (all of them when no
+    // placements were sent at all) so the placement validator doesn't reject
+    // container bookings the caller couldn't have placed.
     let containerPlacements = dto.containerPlacements;
-    if (!containerPlacements?.length) {
+    {
       const preview = await this.validateBookingsForScheduling(
         previewDto,
         freightType ?? null,
@@ -1578,18 +1601,28 @@ export class TrainSchedulingService {
       );
       if (containerBookings.length) {
         const units = expandBookingContainerUnits(containerBookings);
-        const slots = getContainerSlotSequenceNos(preview.wagonPlan);
-        const generated = autoFillPlacements(units, slots);
-        const missing = findMissingContainerNumberIssues(units, generated);
-        if (missing.length) {
-          throw new BadRequestException({
-            message: `Booking validation failed: ${missing
-              .map((m) => m.issue)
-              .join('; ')}`,
-            violations: missing.map((m) => m.issue),
-          });
+        const providedKeys = new Set(
+          (containerPlacements ?? []).map(
+            (p) => `${p.bookingContainerId}:${p.unitIndex}`,
+          ),
+        );
+        const unplacedUnits = units.filter(
+          (u) => !providedKeys.has(`${u.bookingContainerId}:${u.unitIndex}`),
+        );
+        if (unplacedUnits.length) {
+          const slots = getContainerSlotSequenceNos(preview.wagonPlan);
+          const generated = autoFillPlacements(unplacedUnits, slots);
+          const missing = findMissingContainerNumberIssues(unplacedUnits, generated);
+          if (missing.length) {
+            throw new BadRequestException({
+              message: `Booking validation failed: ${missing
+                .map((m) => m.issue)
+                .join('; ')}`,
+              violations: missing.map((m) => m.issue),
+            });
+          }
+          containerPlacements = [...(containerPlacements ?? []), ...generated];
         }
-        containerPlacements = generated;
       }
     }
 
@@ -1632,8 +1665,10 @@ export class TrainSchedulingService {
     // NW5 free) — the caller saw HTTP 200 and a green toast over a no-op.
     // A stock shortage is a physical impossibility, so forceAssign cannot
     // override it either.
+    // Linked ride-alongs count as requested too: silently dropping one here is
+    // exactly the delete-and-recreate orphan this method must never produce.
     const plannedIds = new Set(validation.bookings.map((b) => b.id));
-    const droppedRequested = dto.bookingIds.filter((id) => !plannedIds.has(id));
+    const droppedRequested = allBookingIds.filter((id) => !plannedIds.has(id));
     if (droppedRequested.length) {
       const reasonById = new Map(
         validation.deferredBookings.map((d) => [d.id, `${d.reference}: ${d.reason}`]),
@@ -1675,25 +1710,36 @@ export class TrainSchedulingService {
           relations: { wagonType: true },
         })
       : null;
-    const planTareTons = consistWagons
+    const planTareTons = roundTons(
+      wagonPlan.reduce((sum, slot) => sum + Number(slot.tareWeightTons ?? 0), 0),
+    );
+    const consistTareTons = consistWagons
       ? roundTons(
           consistWagons.reduce(
             (sum, wagon) => sum + Number(wagon.wagonType?.tareWeightTons ?? 0),
             0,
           ),
         )
-      : roundTons(
-          wagonPlan.reduce((sum, slot) => sum + Number(slot.tareWeightTons ?? 0), 0),
-        );
-    const grossWeightTons = roundTons(totalWeightTons + planTareTons);
+      : planTareTons;
+    // The pull limit binds on the HEAVIEST LEG, not the whole-route sum —
+    // disjoint legs (intercity Gelan→Adama + export Adama→Doraleh) are never
+    // hauled at the same time. Coupled-but-unplanned wagons ride every edge,
+    // so their tare rides on top of the binding edge.
+    const emptyConsistTareTons = Math.max(0, consistTareTons - planTareTons);
+    const edgeUsage = maxEdgeConsistUsage(
+      wagonPlan,
+      await this.stopYardsForSchedule(schedule),
+    );
+    const grossWeightTons = roundTons(edgeUsage.grossWeightTons + emptyConsistTareTons);
     if (!dto.forceAssign && weightCapWithOverage < grossWeightTons) {
       throw new BadRequestException(
-        `Train set locomotives cannot pull ${grossWeightTons}T gross (${totalWeightTons}T cargo + ${planTareTons}T wagon tare)`,
+        `Train set locomotives cannot pull ${grossWeightTons}T gross on the heaviest leg (limit ${roundTons(weightCapWithOverage)}T incl. tolerance)`,
       );
     }
-    if (!dto.forceAssign && lengthCapWithOverage < totalLengthMeters) {
+    const maxEdgeLengthMeters = roundTons(edgeUsage.lengthMeters);
+    if (!dto.forceAssign && lengthCapWithOverage < maxEdgeLengthMeters) {
       throw new BadRequestException(
-        `Train set locomotives cannot support ${totalLengthMeters}m`,
+        `Train set locomotives cannot support ${maxEdgeLengthMeters}m`,
       );
     }
 
@@ -2780,13 +2826,12 @@ export class TrainSchedulingService {
           return [
             `<tr class="empty">
             ${wagonCells}
-            <td colspan="6">EMPTY — no cargo allocated</td>
+            <td colspan="4">EMPTY — no cargo allocated</td>
           </tr>`,
           ];
         }
         return allocations.map((allocation) => {
           const booking = allocation.booking ?? bookingById.get(allocation.bookingId);
-          const company = booking?.company as Record<string, unknown> | null | undefined;
           const cargoType = (booking as unknown as { cargoType?: { name?: string; code?: string } } | undefined)?.cargoType;
           const containerItems = allocation.containerItems ?? [];
           const firstContainer = containerItems[0];
@@ -2795,8 +2840,6 @@ export class TrainSchedulingService {
           const chassisNumbers = containerItems.map((item) => item.chassisNumber).filter(Boolean).join(', ');
           return `<tr>
             ${wagonCells}
-            <td>${esc(company?.name ?? company?.legalName ?? company?.tradeName ?? booking?.companyId)}</td>
-            <td>${esc(booking?.companyId)}</td>
             <td>${esc(cargoType?.name ?? cargoType?.code ?? allocation.loadType)}</td>
             <td>${esc(containerNumbers || firstContainer?.containerNumber)}</td>
             <td>${esc(chassisNumbers)}</td>
@@ -2878,8 +2921,6 @@ export class TrainSchedulingService {
         <th class="num">Equated Length</th>
         <th class="num">Tare Weight</th>
         <th class="num">Load Capacity</th>
-        <th>Customer Name</th>
-        <th>Customer ID</th>
         <th>Cargo Type</th>
         <th>Container No</th>
         <th>Chassis No</th>
@@ -2887,7 +2928,7 @@ export class TrainSchedulingService {
       </tr>
     </thead>
     <tbody>
-      ${rows || '<tr><td colspan="12">No wagons on this train set.</td></tr>'}
+      ${rows || '<tr><td colspan="10">No wagons on this train set.</td></tr>'}
     </tbody>
   </table>
 
@@ -3852,25 +3893,24 @@ export class TrainSchedulingService {
       );
     }
 
+    // Corridor-aware: a booking belongs on this train when its origin and
+    // destination lie on the schedule's stop list in order — sub-corridor
+    // bookings (Dire→Djibouti on an Addis→…→Djibouti train) are valid. The
+    // stop list is also what makes the wagon plan leg-aware below.
+    let stops = [dto.originStationId, dto.destinationStationId];
+    if (targetScheduleId) {
+      const target = await this.trainSchedulesRepository.findById(targetScheduleId);
+      if (target) stops = await this.stopYardsForSchedule(target);
+    }
     if (
-      await (async () => {
-        // Corridor-aware: a booking belongs on this train when its origin and
-        // destination lie on the schedule's stop list in order — sub-corridor
-        // bookings (Dire→Djibouti on an Addis→…→Djibouti train) are valid.
-        let stops = [dto.originStationId, dto.destinationStationId];
-        if (targetScheduleId) {
-          const target = await this.trainSchedulesRepository.findById(targetScheduleId);
-          if (target) stops = await this.stopYardsForSchedule(target);
+      bookings.some((b) => {
+        if (targetScheduleId && b.trainScheduleId === targetScheduleId) {
+          return false;
         }
-        return bookings.some((b) => {
-          if (targetScheduleId && b.trainScheduleId === targetScheduleId) {
-            return false;
-          }
-          const fromIdx = stops.indexOf(b.originYardId);
-          const toIdx = stops.indexOf(b.destinationYardId);
-          return fromIdx < 0 || toIdx < 0 || fromIdx >= toIdx;
-        });
-      })()
+        const fromIdx = stops.indexOf(b.originYardId);
+        const toIdx = stops.indexOf(b.destinationYardId);
+        return fromIdx < 0 || toIdx < 0 || fromIdx >= toIdx;
+      })
     ) {
       violations.push('Selected bookings must lie on the schedule route (origin before destination)');
     }
@@ -3956,7 +3996,22 @@ export class TrainSchedulingService {
       stock = { mode: 'YARD', remainingByTypeId, codesByTypeId };
     }
 
-    const planned = planWagonsWithStock({ bookings, allowed, stock });
+    // Leg-aware stock: each booking consumes wagons only on the edges it rides,
+    // so a ride-along on an empty leg never competes with cargo on a full one.
+    const legByBookingId = new Map(
+      bookings.flatMap((b) => {
+        const from = stops.indexOf(b.originYardId);
+        const to = stops.indexOf(b.destinationYardId);
+        return from >= 0 && to > from ? [[b.id, { from, to }] as const] : [];
+      }),
+    );
+    const planned = planWagonsWithStock({
+      bookings,
+      allowed,
+      stock,
+      legs: legByBookingId,
+      edgeCount: Math.max(1, stops.length - 1),
+    });
     violations.push(...planned.configIssues);
     const fittingBookings = planned.fitting;
     const deferredBookings: DeferredBookingRow[] = planned.deferred;
@@ -4018,10 +4073,11 @@ export class TrainSchedulingService {
       ).values(),
     ];
     pushLimit(
-      validateMixedTrainLimits(
+      validateMixedTrainLimitsPerEdge(
         wagonPlan,
         plannedWagonTypes.length ? plannedWagonTypes : [{ lengthMeters: 14 }],
         trainLimits,
+        stops,
       ),
     );
     if (requireContainerPlacements && resolvedMode !== 'BULK') {
@@ -4040,9 +4096,6 @@ export class TrainSchedulingService {
     }
 
     const totalWeightTons = totalAssignedWeight(fittingBookings);
-    // Every weight limit below (global max, loco pull) is a GROSS axis, so the
-    // figure spent against it must be gross too — cargo alone under-reports the
-    // train by the full consist tare and disagrees with the assign path.
     const totalTareTons = roundTons(
       wagonPlan.reduce((sum, w) => sum + (Number(w.tareWeightTons) || 0), 0),
     );
@@ -4050,12 +4103,13 @@ export class TrainSchedulingService {
     const totalLengthMeters = roundTons(
       wagonPlan.reduce((sum, w) => sum + w.lengthMeters, 0),
     );
-    if (grossWeightTons > trainLimits.maxWeightTons) {
-      const message = `Total gross weight ${grossWeightTons}T (${totalWeightTons}T cargo + ${totalTareTons}T wagon tare) exceeds max train weight ${trainLimits.maxWeightTons}T`;
-      if (!violations.includes(message) && !warnings.includes(message)) {
-        pushLimit([message]);
-      }
-    }
+    // Weight/length limits are enforced PER EDGE by validateMixedTrainLimitsPerEdge
+    // above — the whole-route totals here are informational (summary) only. The
+    // locomotive checks below also compare the heaviest single edge: a train is
+    // never heavier than its heaviest leg, so disjoint legs must not be summed.
+    const edgeUsage = maxEdgeConsistUsage(wagonPlan, stops);
+    const maxEdgeGrossTons = roundTons(edgeUsage.grossWeightTons);
+    const maxEdgeLengthMeters = roundTons(edgeUsage.lengthMeters);
 
     let assignedLocomotives: Locomotive[] = [];
     if (targetScheduleId) {
@@ -4078,9 +4132,9 @@ export class TrainSchedulingService {
       if (
         setLimits &&
         (setLimits.maxPullWeightTons + (Number(setLimits.overageToleranceTons) || 0) <
-          grossWeightTons ||
+          maxEdgeGrossTons ||
           setLimits.maxTrainLengthMeters + (Number(setLimits.overageToleranceMeters) || 0) <
-            totalLengthMeters)
+            maxEdgeLengthMeters)
       ) {
         pushLimit([
           'Assigned locomotives cannot support the total train weight and length',
@@ -4099,9 +4153,9 @@ export class TrainSchedulingService {
         !inServiceLocomotives.some(
           (l) =>
             Number(l.maxPullWeightTons) + (Number(l.overageToleranceTons) || 0) >=
-              grossWeightTons &&
+              maxEdgeGrossTons &&
             Number(l.maxTrainLengthMeters) + (Number(l.overageToleranceMeters) || 0) >=
-              totalLengthMeters,
+              maxEdgeLengthMeters,
         )
       ) {
         pushLimit(['No locomotive can support the total train weight and length']);
@@ -4160,10 +4214,7 @@ export class TrainSchedulingService {
       maxTrainLengthMeters?: number;
       maxWagonsPerTrain?: number;
     },
-    locomotive?: Pick<
-      Locomotive,
-      'maxPullWeightTons' | 'maxTrainLengthMeters' | 'overageToleranceTons' | 'overageToleranceMeters'
-    >,
+    locomotive?: LocomotiveLimits | null,
   ): Promise<Required<TrainLimitConfig>> {
     const row = await this.loadGlobalRulesRow();
     const configured = this.configService?.get<{
@@ -6471,7 +6522,7 @@ export class TrainSchedulingService {
     >,
     tareDims: Awaited<ReturnType<TrainSchedulingService['loadWagonTareDims']>>,
   ): number {
-    const cargo = Number(booking.cargoTotalWeightVgm ?? 0);
+    const cargo = bookingCargoTons(booking);
     const fallback =
       booking.freightType === 'BULK' ? tareDims.bulk : tareDims.container;
     // Same first-configured-type resolution the batch engine's dimsFor uses.
@@ -6810,12 +6861,45 @@ export class TrainSchedulingService {
           status: sb.booking?.status ?? null,
           schedulingStatus: sb.booking?.schedulingStatus ?? null,
           freightType: sb.booking?.freightType ?? null,
+          // Which leg of the corridor this booking rides — the workspace can't
+          // tell a ride-along (intercity) or sub-corridor booking from through
+          // cargo without it.
+          tradeDirection: sb.booking?.tradeDirection ?? null,
+          originYardId: sb.booking?.originYardId ?? null,
+          destinationYardId: sb.booking?.destinationYardId ?? null,
+          origin:
+            sb.booking?.originYard?.label ?? sb.booking?.originYard?.code ?? null,
+          destination:
+            sb.booking?.destinationYard?.label ??
+            sb.booking?.destinationYard?.code ??
+            null,
+          wagonsRequired:
+            sb.booking?.wagonsRequired != null
+              ? Number(sb.booking.wagonsRequired)
+              : null,
+          loadedAt: sb.booking?.loadedAt?.toISOString() ?? null,
+          arrivedAt: sb.booking?.arrivedAt?.toISOString() ?? null,
           // Loaded/unloaded is tracked on the schedule↔booking link, not the
           // booking itself — staff flip it per booking in the workspace before
           // dispatch. Defaults UNLOADED for links written before the column.
           loadingStatus: sb.loadingStatus ?? LoadingStatus.Unloaded,
           wagonAssigned: allocatedBookingIds.has(sb.booking?.id ?? sb.bookingId),
         })) ?? [],
+      // Ordered corridor stops (route milestones; falls back to the two
+      // endpoints) — lets the UI draw per-segment occupancy and label legs.
+      stops: this.mapScheduleStops(schedule),
+      // Gross ceiling the validator holds each leg to: the set's weakest
+      // locomotive pull limit plus its overage tolerance. Booking weightTons
+      // above are gross too, so the strip can sum them per leg against this.
+      maxGrossWeightTons: (() => {
+        const setLimits = trainSetLocomotiveLimits(schedule.trainSet);
+        return setLimits
+          ? roundTons(
+              Number(setLimits.maxPullWeightTons) +
+                (Number(setLimits.overageToleranceTons) || 0),
+            )
+          : null;
+      })(),
       // True when the wagon plan above is served from the frozen snapshot (schedule
       // is dispatched/arrived/cancelled) rather than the live joins — the UI can badge
       // it "historical" and skip re-pin affordances.
@@ -6824,6 +6908,42 @@ export class TrainSchedulingService {
     };
   }
 
+  /** Ordered corridor stops with labels, from the loaded route graph (no extra query). */
+  private mapScheduleStops(
+    schedule: TrainSchedule,
+  ): Array<{ yardId: string; label: string }> {
+    const milestones = [...(schedule.route?.milestones ?? [])].sort(
+      (a, b) => a.sequenceNo - b.sequenceNo,
+    );
+    const raw = milestones.length >= 2
+      ? milestones.map((m) => ({
+          yardId: m.yardId,
+          label: m.yard?.label ?? m.yard?.code ?? m.yardId,
+        }))
+      : [
+          {
+            yardId: schedule.originStationId,
+            label:
+              schedule.originStation?.label ??
+              schedule.originStation?.code ??
+              schedule.originStationId,
+          },
+          {
+            yardId: schedule.destinationStationId,
+            label:
+              schedule.destinationStation?.label ??
+              schedule.destinationStation?.code ??
+              schedule.destinationStationId,
+          },
+        ];
+    const seen = new Set<string>();
+    return raw.filter((stop) => {
+      if (!stop.yardId || seen.has(stop.yardId)) return false;
+      seen.add(stop.yardId);
+      return true;
+    });
+  }
+
   private isHoldActive(booking: Booking): boolean {
     if (!booking.holdExpiresAt) return false;
     return booking.holdExpiresAt.getTime() > Date.now();
@@ -6875,7 +6995,10 @@ export class TrainSchedulingService {
       originStationId: schedule.originStationId,
       destinationStationId: schedule.destinationStationId,
     };
-    const limits = await this.resolveTrainLimitConfig(undefined, schedule.trainSet.locomotive);
+    const limits = await this.resolveTrainLimitConfig(
+      undefined,
+      trainSetLocomotiveLimits(schedule.trainSet),
+    );
 
     const validation = await this.validateBookingsForScheduling(
       previewDto,
@@ -7001,7 +7124,7 @@ export class TrainSchedulingService {
     };
     const limits = await this.resolveTrainLimitConfig(
       undefined,
-      schedule.trainSet.locomotive,
+      trainSetLocomotiveLimits(schedule.trainSet),
     );
 
     let validation: Awaited<ReturnType<TrainSchedulingService['validateBookingsForScheduling']>>;
@@ -7232,6 +7355,171 @@ export class TrainSchedulingService {
     return { id: itemId, containerNumber: dto.containerNumber ?? null };
   }
 
+  /**
+   * Staff rearrange: relocate a wagon's ENTIRE load (all its allocations —
+   * a 40ft, a 20ft pair, or a bulk load) to another wagon of the same train.
+   * Whole-load moves keep every packing rule intact by construction (a valid
+   * load stays valid on any wagon whose type supports it), which is what lets
+   * a 20ft pair travel together and swap places with a 40ft, and lets bulk
+   * swap with containers.
+   *
+   * Three shapes, picked from the target:
+   * - target is an empty consist-only wagon (coupled on the built train, no
+   *   slot row): REPIN — the source slot simply points at that physical wagon
+   *   (type/capacity/length follow), and the wagon it left shows as empty.
+   * - target is an empty slot: allocations repoint to it and the load-coupled
+   *   slot fields (assigned weight, status, board/alight leg) move across.
+   * - target is a loaded slot: the two loads swap wagons the same way.
+   *
+   * Validated per direction: the receiving wagon's type must support the
+   * incoming load type, and the incoming cargo must fit its rated payload.
+   */
+  async moveWagonLoad(
+    scheduleId: string,
+    sourceWagonId: string,
+    dto: MoveWagonLoadDto,
+  ): Promise<any> {
+    const schedule = await this.trainSchedulesRepository.findByIdWithFullGraph(scheduleId);
+    if (!schedule) {
+      throw new NotFoundException(`Train schedule ${scheduleId} not found`);
+    }
+    if (['DISPATCHED', 'ARRIVED'].includes(schedule.status)) {
+      throw new BadRequestException('Cannot rearrange loads on a dispatched train');
+    }
+    if (sourceWagonId === dto.targetWagonId) {
+      return this.getTrainScheduleById(scheduleId);
+    }
+
+    const slots = schedule.trainSet?.wagons ?? [];
+    const source = slots.find((w) => w.id === sourceWagonId);
+    if (!source) {
+      throw new NotFoundException('Source wagon is not part of this schedule');
+    }
+
+    const allocRepo = this.dataSource.getRepository(WagonBookingAllocation);
+    const loadAllocations = (trainSetWagonId: string) =>
+      allocRepo.find({ where: { trainSetWagonId } });
+    const sourceAllocs = await loadAllocations(source.id);
+    if (!sourceAllocs.length) {
+      throw new BadRequestException('Source wagon has no load to move');
+    }
+
+    // Target: a slot of this train set, or an empty consist-only wagon of the
+    // built train (physical wagon with no slot row yet).
+    const targetSlot = slots.find((w) => w.id === dto.targetWagonId) ?? null;
+    const consistWagon = targetSlot
+      ? null
+      : schedule.trainSet?.trainId
+        ? await this.dataSource.getRepository(Wagon).findOne({
+            where: { id: dto.targetWagonId, trainId: schedule.trainSet.trainId },
+            relations: { wagonType: true },
+          })
+        : null;
+    if (!targetSlot && !consistWagon) {
+      throw new NotFoundException('Target wagon is not part of this schedule');
+    }
+    const targetAllocs = targetSlot ? await loadAllocations(targetSlot.id) : [];
+
+    const loadTypesOf = (allocs: WagonBookingAllocation[]) => [
+      ...new Set(allocs.map((a) => (a.loadType ?? 'CONTAINER').toUpperCase())),
+    ];
+    const cargoOf = (allocs: WagonBookingAllocation[]) =>
+      allocs.reduce((sum, a) => sum + Number(a.allocatedWeightTons || 0), 0);
+    const wagonLabel = (slot: { sequenceNo: number } | null, wagon: Wagon | null) =>
+      slot ? `#${slot.sequenceNo}` : (wagon?.wagonNumber ?? 'the target wagon');
+    const checkReceives = (
+      allocs: WagonBookingAllocation[],
+      label: string,
+      wagonType: { code?: string; supportedLoadTypes?: string[]; supportsContainer?: boolean } | null | undefined,
+      capacityTons: number,
+    ) => {
+      const incoming = loadTypesOf(allocs);
+      // Unknown type or no declared support list → staff decides; don't block.
+      if (wagonType) {
+        const supported = (wagonType.supportedLoadTypes ?? []).map((t) => t.toUpperCase());
+        for (const loadType of incoming) {
+          const ok =
+            supported.includes(loadType) ||
+            (loadType === 'CONTAINER' && wagonType.supportsContainer) ||
+            supported.length === 0;
+          if (!ok) {
+            throw new BadRequestException(
+              `Wagon ${label} (${wagonType.code ?? 'unknown type'}) cannot carry a ${loadType.toLowerCase()} load`,
+            );
+          }
+        }
+      }
+      const cargo = cargoOf(allocs);
+      if (capacityTons > 0 && cargo > capacityTons + 0.001) {
+        throw new BadRequestException(
+          `Wagon ${label} would carry ${roundTons(cargo)}T — over its ${roundTons(capacityTons)}T payload`,
+        );
+      }
+    };
+
+    // What the target must be able to receive…
+    checkReceives(
+      sourceAllocs,
+      wagonLabel(targetSlot, consistWagon),
+      targetSlot ? targetSlot.wagonType : consistWagon?.wagonType,
+      Number(targetSlot ? targetSlot.capacityTons : (consistWagon?.wagonType?.capacityTons ?? 0)),
+    );
+    // …and, on a swap, what comes back to the source.
+    if (targetAllocs.length) {
+      checkReceives(
+        targetAllocs,
+        `#${source.sequenceNo}`,
+        source.wagonType,
+        Number(source.capacityTons),
+      );
+    }
+
+    await this.dataSource.transaction(async (manager) => {
+      const slotRepo = manager.getRepository(TrainSetWagon);
+      const allocs = manager.getRepository(WagonBookingAllocation);
+
+      // Empty consist wagon: repin the loaded slot onto that physical wagon.
+      // Allocations and load fields stay put; only the wagon identity changes.
+      if (consistWagon) {
+        await slotRepo.update(source.id, {
+          physicalWagonId: consistWagon.id,
+          wagonTypeId: consistWagon.wagonTypeId,
+          capacityTons: roundTons(Number(consistWagon.wagonType?.capacityTons ?? source.capacityTons)),
+          lengthMeters: roundTons(Number(consistWagon.wagonType?.lengthMeters ?? source.lengthMeters)),
+        });
+        return;
+      }
+
+      const target = targetSlot as TrainSetWagon;
+      // Load-coupled slot fields travel with the load; wagon identity stays.
+      const loadFieldsOf = (slot: TrainSetWagon) => ({
+        assignedWeightTons: slot.assignedWeightTons,
+        status: slot.status,
+        boardYardId: slot.boardYardId ?? null,
+        alightYardId: slot.alightYardId ?? null,
+      });
+      const emptyLoadFields = {
+        assignedWeightTons: 0,
+        status: 'PLANNED',
+        boardYardId: null,
+        alightYardId: null,
+      };
+      const sourceLoadFields = loadFieldsOf(source);
+      const targetLoadFields = targetAllocs.length ? loadFieldsOf(target) : emptyLoadFields;
+
+      for (const alloc of sourceAllocs) {
+        await allocs.update(alloc.id, { trainSetWagonId: target.id });
+      }
+      for (const alloc of targetAllocs) {
+        await allocs.update(alloc.id, { trainSetWagonId: source.id });
+      }
+      await slotRepo.update(target.id, sourceLoadFields);
+      await slotRepo.update(source.id, targetLoadFields);
+    });
+
+    return this.getTrainScheduleById(scheduleId);
+  }
+
   async getUnassignedBookings(scheduleId: string): Promise<UnassignedBookingsResponse> {
     const schedule = await this.trainSchedulesRepository.findByIdWithFullGraph(scheduleId);
     if (!schedule) {
@@ -7380,7 +7668,7 @@ export class TrainSchedulingService {
     };
     const limits = await this.resolveTrainLimitConfig(
       undefined,
-      schedule.trainSet.locomotive,
+      trainSetLocomotiveLimits(schedule.trainSet),
     );
 
     let validation: Awaited<ReturnType<TrainSchedulingService['validateBookingsForScheduling']>>;
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.spec.ts
index 5870d3785..778dc70dd 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.spec.ts
@@ -187,3 +187,115 @@ describe('applyWagonOrderReversal', () => {
     expect(plan.map((s) => s.wagonTypeId)).toEqual(['wt-a', 'wt-b', 'wt-c']);
   });
 });
+
+describe('planWagonsWithStock — leg-aware stock (intercity ride-along)', () => {
+  const allowed = {
+    byContainerTypeId: new Map([['ct-1', [nw6]]]),
+    byCargoTypeId: new Map(),
+  };
+  // Corridor Gelan(0) → Adama(1) → Doraleh(2): edges 0 and 1.
+  const legs = (entries: Array<[string, { from: number; to: number }]>) =>
+    new Map(entries);
+
+  it('lets an intercity booking ride the empty leg of a train that is full on the other leg', () => {
+    // 1 wagon in stock. Export rides edge 1 only; intercity rides edge 0 only.
+    const result = planWagonsWithStock({
+      bookings: [
+        containerBooking('EXPORT-1', 1, 1),
+        containerBooking('INTERCITY-1', 1, 1),
+      ],
+      allowed,
+      stock: {
+        mode: 'TRAIN',
+        remainingByTypeId: new Map([[nw6.id, 1]]),
+        codesByTypeId: new Map([[nw6.id, nw6.code]]),
+      },
+      legs: legs([
+        ['EXPORT-1', { from: 1, to: 2 }],
+        ['INTERCITY-1', { from: 0, to: 1 }],
+      ]),
+      edgeCount: 2,
+    });
+
+    expect(result.deferred).toHaveLength(0);
+    expect(result.fitting.map((b) => b.id).sort()).toEqual([
+      'EXPORT-1',
+      'INTERCITY-1',
+    ]);
+    // Two slots planned, but both drawn from the single physical wagon.
+    expect(result.plan).toHaveLength(2);
+  });
+
+  it('still defers when the legs overlap and stock is exhausted', () => {
+    const result = planWagonsWithStock({
+      bookings: [
+        containerBooking('EXPORT-1', 1, 1),
+        containerBooking('INTERCITY-1', 1, 1),
+      ],
+      allowed,
+      stock: {
+        mode: 'TRAIN',
+        remainingByTypeId: new Map([[nw6.id, 1]]),
+        codesByTypeId: new Map([[nw6.id, nw6.code]]),
+      },
+      legs: legs([
+        // Both ride edge 0 — they compete for the one wagon.
+        ['EXPORT-1', { from: 0, to: 2 }],
+        ['INTERCITY-1', { from: 0, to: 1 }],
+      ]),
+      edgeCount: 2,
+    });
+
+    expect(result.fitting.map((b) => b.id)).toEqual(['EXPORT-1']);
+    expect(result.deferred).toHaveLength(1);
+    expect(result.deferred[0]!.reference).toBe('INTERCITY-1');
+    expect(result.deferred[0]!.reason).toContain('Train has no free NW6 wagon left');
+  });
+
+  it('never packs bookings with different legs into the same wagon slot', () => {
+    // Two 20ft units with room to share one wagon by TEU — but disjoint legs
+    // must open separate slots (each with its own leg), not one mixed slot.
+    const result = planWagonsWithStock({
+      bookings: [
+        containerBooking('EXPORT-1', 1, 1),
+        containerBooking('INTERCITY-1', 1, 1),
+      ],
+      allowed,
+      stock: {
+        mode: 'TRAIN',
+        remainingByTypeId: new Map([[nw6.id, 2]]),
+        codesByTypeId: new Map([[nw6.id, nw6.code]]),
+      },
+      legs: legs([
+        ['EXPORT-1', { from: 1, to: 2 }],
+        ['INTERCITY-1', { from: 0, to: 1 }],
+      ]),
+      edgeCount: 2,
+    });
+
+    expect(result.plan).toHaveLength(2);
+    const bookingsPerSlot = result.plan.map((s) =>
+      [...new Set(s.allocations.map((a) => a.bookingId))].sort(),
+    );
+    expect(bookingsPerSlot).toEqual([['EXPORT-1'], ['INTERCITY-1']]);
+  });
+
+  it('behaves exactly like the whole-route planner when no legs are given', () => {
+    const result = planWagonsWithStock({
+      bookings: [
+        containerBooking('EXPORT-1', 1, 1),
+        containerBooking('INTERCITY-1', 1, 1),
+      ],
+      allowed,
+      stock: {
+        mode: 'TRAIN',
+        remainingByTypeId: new Map([[nw6.id, 1]]),
+        codesByTypeId: new Map([[nw6.id, nw6.code]]),
+      },
+    });
+
+    // One wagon, two 20ft bookings: they TEU-share the single slot (legacy).
+    expect(result.deferred).toHaveLength(0);
+    expect(result.plan).toHaveLength(1);
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.ts
index 6a3c1c49f..699d7a432 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan-flex.util.ts
@@ -58,8 +58,18 @@ type OpenSlot = {
   /** Kind purity: a bulk wagon carries ONE cargo type at a time. */
   cargoTypeId: string | null;
   freeCapacityTons: number;
+  /**
+   * Corridor leg this slot rides (`"from-to"` stop indexes). Bookings only
+   * share a slot when their legs are identical — mixing corridors in one slot
+   * would degrade it to a whole-route slot (see stampSlotLegs) and silently
+   * re-occupy edges the cargo never rides.
+   */
+  legKey: string;
 };
 
+/** Stop-index range a booking occupies: edges `from..to-1` of the corridor. */
+export type BookingLeg = { from: number; to: number };
+
 type PlacementProblem = {
   kind: 'config' | 'stock';
   message: string;
@@ -87,7 +97,7 @@ const slotFromWagonType = (wagonType: WagonType, kind: SlotLoadType): WagonPlanS
 const shortageFor = (
   booking: Booking,
   candidates: WagonType[],
-  remaining: Map<string, number>,
+  availableOf: (wagonTypeId: string) => number,
 ): BookingWagonShortage => {
   const wagonsNeeded =
     booking.freightType === 'BULK'
@@ -100,7 +110,7 @@ const shortageFor = (
         )
       : Math.max(1, containerWagonsForLines(booking.bookingContainers ?? []));
   const wagonsAvailable = candidates.reduce(
-    (sum, wt) => sum + (remaining.get(wt.id) ?? 0),
+    (sum, wt) => sum + availableOf(wt.id),
     0,
   );
   return {
@@ -140,14 +150,53 @@ export function planWagonsWithStock(params: {
   bookings: Booking[];
   allowed: AllowedWagonTypeMap;
   stock: WagonStock;
+  /**
+   * Leg-aware stock: booking id → the stop-index range it rides. When given
+   * (with `edgeCount`), a wagon type's stock is consumed PER CORRIDOR EDGE, so
+   * the same physical wagon can serve an intercity booking on Gelan→Adama and
+   * an export booking on Adama→Doraleh — disjoint legs never compete for
+   * stock. Omitted → one edge, byte-identical to the old whole-route behavior.
+   */
+  legs?: Map<string, BookingLeg>;
+  edgeCount?: number;
 }): FlexPlanResult {
-  const { bookings, allowed, stock } = params;
-  const remaining = new Map(stock.remainingByTypeId);
+  const { bookings, allowed, stock, legs } = params;
+  const edgeCount = Math.max(1, params.edgeCount ?? 1);
   const openSlots: OpenSlot[] = [];
   const fitting: Booking[] = [];
   const deferred: DeferredBookingRow[] = [];
   const configIssues = new Set<string>();
 
+  const legFor = (booking: Booking): BookingLeg => {
+    const leg = legs?.get(booking.id);
+    if (!leg || leg.from < 0 || leg.to > edgeCount || leg.from >= leg.to) {
+      return { from: 0, to: edgeCount };
+    }
+    return leg;
+  };
+  const legKeyOf = (leg: BookingLeg) => `${leg.from}-${leg.to}`;
+
+  // Wagons of a type in use per corridor edge. A type is available for a leg
+  // when its busiest edge WITHIN that leg still has stock spare — the max over
+  // edges is the number of physical wagons the type needs simultaneously.
+  const usedPerEdge = new Map<string, number[]>();
+  const usedRow = (wagonTypeId: string): number[] => {
+    let row = usedPerEdge.get(wagonTypeId);
+    if (!row) {
+      row = new Array<number>(edgeCount).fill(0);
+      usedPerEdge.set(wagonTypeId, row);
+    }
+    return row;
+  };
+  const availableFor = (wagonTypeId: string, leg: BookingLeg): number => {
+    const total = stock.remainingByTypeId.get(wagonTypeId) ?? 0;
+    const row = usedPerEdge.get(wagonTypeId);
+    if (!row) return total;
+    let busiest = 0;
+    for (let e = leg.from; e < leg.to; e += 1) busiest = Math.max(busiest, row[e] ?? 0);
+    return total - busiest;
+  };
+
   const noStockMessage = (candidates: WagonType[]): string => {
     const codes = candidates.map((wt) => wt.code).join('/');
     return stock.mode === 'TRAIN'
@@ -155,13 +204,14 @@ export function planWagonsWithStock(params: {
       : `No available ${codes} wagon at the yard`;
   };
 
-  /** Open a new wagon of one of the candidate types, consuming stock. */
+  /** Open a new wagon of one of the candidate types, consuming stock on the leg's edges. */
   const openSlot = (
     candidates: WagonType[],
     kind: SlotLoadType,
     cargoTypeId: string | null,
+    leg: BookingLeg,
   ): OpenSlot | PlacementProblem => {
-    const inStock = candidates.filter((wt) => (remaining.get(wt.id) ?? 0) > 0);
+    const inStock = candidates.filter((wt) => availableFor(wt.id, leg) > 0);
     if (!inStock.length) {
       return { kind: 'stock', message: noStockMessage(candidates), candidates };
     }
@@ -170,22 +220,26 @@ export function planWagonsWithStock(params: {
     const chosen = [...inStock].sort((a, b) =>
       kind === 'BULK'
         ? Number(b.capacityTons) - Number(a.capacityTons) ||
-          (remaining.get(b.id) ?? 0) - (remaining.get(a.id) ?? 0)
-        : (remaining.get(b.id) ?? 0) - (remaining.get(a.id) ?? 0),
+          availableFor(b.id, leg) - availableFor(a.id, leg)
+        : availableFor(b.id, leg) - availableFor(a.id, leg),
     )[0];
-    remaining.set(chosen.id, (remaining.get(chosen.id) ?? 0) - 1);
+    const row = usedRow(chosen.id);
+    for (let e = leg.from; e < leg.to; e += 1) row[e] = (row[e] ?? 0) + 1;
     const open: OpenSlot = {
       slot: slotFromWagonType(chosen, kind),
       teuUsed: 0,
       kind,
       cargoTypeId,
       freeCapacityTons: Number(chosen.capacityTons),
+      legKey: legKeyOf(leg),
     };
     openSlots.push(open);
     return open;
   };
 
   const tryPlaceBooking = (booking: Booking): PlacementProblem | null => {
+    const leg = legFor(booking);
+    const legKey = legKeyOf(leg);
     if (booking.freightType === 'CONTAINER') {
       const units = expandBookingContainerUnits([booking]);
       if (!units.length) {
@@ -209,11 +263,12 @@ export function planWagonsWithStock(params: {
         let target = openSlots.find(
           (open) =>
             open.kind === 'CONTAINER' &&
+            open.legKey === legKey &&
             allowedIds.has(open.slot.wagonTypeId) &&
             open.teuUsed + teu <= MAX_TEU_SLOTS_PER_WAGON,
         );
         if (!target) {
-          const openedSlot = openSlot(candidates, 'CONTAINER', null);
+          const openedSlot = openSlot(candidates, 'CONTAINER', null, leg);
           if ('message' in openedSlot) return openedSlot;
           target = openedSlot;
         }
@@ -246,6 +301,7 @@ export function planWagonsWithStock(params: {
     for (const open of openSlots) {
       if (remainingWeight <= 0) break;
       if (open.kind !== 'BULK') continue;
+      if (open.legKey !== legKey) continue;
       if (open.cargoTypeId !== cargoTypeId) continue;
       if (!allowedIds.has(open.slot.wagonTypeId)) continue;
       if (open.freeCapacityTons <= 0) continue;
@@ -263,7 +319,7 @@ export function planWagonsWithStock(params: {
     }
 
     while (remainingWeight > 0 || !placedAnywhere) {
-      const openedSlot = openSlot(candidates, 'BULK', cargoTypeId);
+      const openedSlot = openSlot(candidates, 'BULK', cargoTypeId, leg);
       if ('message' in openedSlot) return openedSlot;
       const take = roundTons(Math.min(openedSlot.freeCapacityTons, remainingWeight));
       addAllocation(
@@ -282,7 +338,9 @@ export function planWagonsWithStock(params: {
 
   for (const booking of sortBookingsForScheduling(bookings)) {
     // Snapshot so a booking that doesn't fully fit leaves no half-placed wagons.
-    const remainingSnapshot = new Map(remaining);
+    const usedSnapshot = new Map(
+      [...usedPerEdge.entries()].map(([typeId, row]) => [typeId, [...row]]),
+    );
     const slotCountSnapshot = openSlots.length;
     const slotStateSnapshot = openSlots.map((open) => ({
       teuUsed: open.teuUsed,
@@ -299,8 +357,8 @@ export function planWagonsWithStock(params: {
     }
 
     // Roll back this booking's partial placements.
-    remaining.clear();
-    for (const [key, value] of remainingSnapshot) remaining.set(key, value);
+    usedPerEdge.clear();
+    for (const [key, value] of usedSnapshot) usedPerEdge.set(key, value);
     openSlots.length = slotCountSnapshot;
     openSlots.forEach((open, index) => {
       const snap = slotStateSnapshot[index];
@@ -315,11 +373,14 @@ export function planWagonsWithStock(params: {
     });
 
     if (problem.kind === 'config') configIssues.add(problem.message);
-    // remaining is rolled back here, so the shortage counts the stock this
+    // Usage is rolled back here, so the shortage counts the stock this
     // booking actually saw — not what its own partial placement consumed.
+    const bookingLeg = legFor(booking);
     const shortage =
       problem.kind === 'stock' && problem.candidates?.length
-        ? shortageFor(booking, problem.candidates, remaining)
+        ? shortageFor(booking, problem.candidates, (wagonTypeId) =>
+            Math.max(0, availableFor(wagonTypeId, bookingLeg)),
+          )
         : null;
     deferred.push({
       id: booking.id,
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.spec.ts b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.spec.ts
index c3d48f286..a7d430b91 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.spec.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.spec.ts
@@ -9,6 +9,7 @@ import {
   containerWagonsForLines,
   expandBookingContainerUnits,
   expandContainerItems,
+  maxEdgeConsistUsage,
   roundTons,
   sumWagonsRequired,
   validate20ftContainerRules,
@@ -279,3 +280,54 @@ describe('containerWagonsForLines — TEU-aware, ceil booking total once', () =>
     expect(containerWagonsForLines([])).toBe(0);
   });
 });
+
+describe('maxEdgeConsistUsage — the binding edge, not the whole-route sum', () => {
+  const slot = (
+    tare: number,
+    cargo: number,
+    length: number,
+    board?: string | null,
+    alight?: string | null,
+  ) =>
+    ({
+      tareWeightTons: tare,
+      assignedWeightTons: cargo,
+      lengthMeters: length,
+      boardYardId: board ?? null,
+      alightYardId: alight ?? null,
+    }) as never;
+
+  const stops = ['a', 'b', 'c'];
+
+  it('does not sum disjoint legs: intercity a→b + export b→c', () => {
+    const plan = [
+      slot(24, 65, 14, null, 'b'), // intercity, rides a→b only
+      slot(24, 65, 14, 'b', null), // export, rides b→c only
+    ];
+    // Each edge carries one slot: 89T gross / 14m — never 178T.
+    expect(maxEdgeConsistUsage(plan, stops)).toEqual({
+      grossWeightTons: 89,
+      lengthMeters: 14,
+    });
+  });
+
+  it('sums overlapping legs on their shared edge (the S-2026-00024 shape)', () => {
+    // 20 intercity a→b wagons + 20 export a→c wagons, 23.94T tare, 64.75T cargo:
+    // shared edge a→b carries all 40 slots = 3547.6T gross.
+    const plan = [
+      ...Array.from({ length: 20 }, () => slot(23.94, 64.75, 14, null, 'b')),
+      ...Array.from({ length: 20 }, () => slot(23.94, 64.75, 14, null, null)),
+    ];
+    const usage = maxEdgeConsistUsage(plan, stops);
+    expect(usage.grossWeightTons).toBeCloseTo(3547.6, 1);
+    expect(usage.lengthMeters).toBe(560);
+  });
+
+  it('degrades to whole-train totals on a two-stop route', () => {
+    const plan = [slot(24, 65, 14), slot(24, 65, 14)];
+    expect(maxEdgeConsistUsage(plan, ['a', 'b'])).toEqual({
+      grossWeightTons: 178,
+      lengthMeters: 28,
+    });
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.ts b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.ts
index bb5ce890c..84a2dc1f5 100644
--- a/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.ts
+++ b/apps/edr-freight-api/src/modules/train-scheduling/wagon-plan.util.ts
@@ -525,6 +525,80 @@ export function validateMixedTrainLimits(
   );
 }
 
+/**
+ * Leg-aware limit check: with a real stop list, a slot only counts on the
+ * edges it actually rides (boardYardId→alightYardId; null = the schedule's
+ * own endpoint). Each edge is validated as its own consist, so an intercity
+ * wagon on Gelan→Adama never counts against a train that is full only on
+ * Adama→Doraleh. Two stops (or fewer) degrade to the whole-train check.
+ */
+export function validateMixedTrainLimitsPerEdge(
+  wagonPlan: WagonPlanSlot[],
+  wagonTypes: Array<Pick<WagonType, 'lengthMeters'>>,
+  limits: TrainLimitConfig | undefined,
+  stops: string[],
+): string[] {
+  if (stops.length <= 2) return validateMixedTrainLimits(wagonPlan, wagonTypes, limits);
+  const spans = slotSpans(wagonPlan, stops);
+  const violations = new Set<string>();
+  for (let edge = 0; edge < stops.length - 1; edge += 1) {
+    const active = wagonPlan.filter(
+      (_, i) => spans[i].from <= edge && edge < spans[i].to,
+    );
+    if (!active.length) continue;
+    for (const violation of validateMixedTrainLimits(active, wagonTypes, limits)) {
+      violations.add(violation);
+    }
+  }
+  return [...violations];
+}
+
+/** Per-slot stop-index spans; a yard missing from the stop list keeps the slot on the whole route. */
+function slotSpans(
+  wagonPlan: WagonPlanSlot[],
+  stops: string[],
+): Array<{ from: number; to: number }> {
+  const lastIdx = stops.length - 1;
+  return wagonPlan.map((slot) => {
+    const from = slot.boardYardId ? stops.indexOf(slot.boardYardId) : 0;
+    const to = slot.alightYardId ? stops.indexOf(slot.alightYardId) : lastIdx;
+    return { from: from >= 0 ? from : 0, to: to > 0 ? to : lastIdx };
+  });
+}
+
+/**
+ * The corridor's binding edge: gross tons (tare + assigned cargo) and length
+ * summed over only the slots riding each edge, maxed across edges. This is the
+ * figure a locomotive pull/length limit must be compared against — a train is
+ * never heavier than its heaviest single leg, so summing disjoint legs
+ * (intercity Gelan→Adama + export Adama→Doraleh) over-reports the train.
+ * Two stops or fewer degrade to the whole-train totals.
+ */
+export function maxEdgeConsistUsage(
+  wagonPlan: WagonPlanSlot[],
+  stops: string[],
+): { grossWeightTons: number; lengthMeters: number } {
+  const totals = (slots: WagonPlanSlot[]) => ({
+    grossWeightTons: slots.reduce(
+      (sum, w) =>
+        sum + Number(w.tareWeightTons ?? 0) + Number(w.assignedWeightTons ?? 0),
+      0,
+    ),
+    lengthMeters: slots.reduce((sum, w) => sum + Number(w.lengthMeters ?? 0), 0),
+  });
+  if (stops.length <= 2) return totals(wagonPlan);
+  const spans = slotSpans(wagonPlan, stops);
+  const usage = { grossWeightTons: 0, lengthMeters: 0 };
+  for (let edge = 0; edge < stops.length - 1; edge += 1) {
+    const active = totals(
+      wagonPlan.filter((_, i) => spans[i].from <= edge && edge < spans[i].to),
+    );
+    usage.grossWeightTons = Math.max(usage.grossWeightTons, active.grossWeightTons);
+    usage.lengthMeters = Math.max(usage.lengthMeters, active.lengthMeters);
+  }
+  return usage;
+}
+
 export function validate20ftContainerRules(
   units: ContainerUnitRow[],
   placements: ContainerPlacementInput[],
diff --git a/apps/edr-freight-api/src/modules/trains/train-builder.controller.ts b/apps/edr-freight-api/src/modules/trains/train-builder.controller.ts
index babf11ef1..19d631fbc 100644
--- a/apps/edr-freight-api/src/modules/trains/train-builder.controller.ts
+++ b/apps/edr-freight-api/src/modules/trains/train-builder.controller.ts
@@ -15,6 +15,7 @@ import {
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 
 import { FleetManage, FleetView } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { AssignTrainWagonsDto } from './dto/assign-train-wagons.dto';
 import { BuildTrainDto } from './dto/build-train.dto';
 import { ListBuiltTrainsQueryDto } from './dto/list-built-trains-query.dto';
@@ -27,12 +28,12 @@ import { TrainBuilderService } from './train-builder.service';
 @ApiTags('train-builder')
 @ApiBearerAuth()
 @Controller('train-builder')
-@FleetView()
+@FleetView(FREIGHT_PERMS.trains.view)
 export class TrainBuilderController {
   constructor(private readonly trainBuilderService: TrainBuilderService) {}
 
   @Post()
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.create)
   @ApiOperation({ summary: 'Build a train: code + yard + 2+ locomotives (+ optional wagons)' })
   build(@Body() dto: BuildTrainDto) {
     return this.trainBuilderService.buildTrain(dto);
@@ -60,7 +61,7 @@ export class TrainBuilderController {
   }
 
   @Put(':id/locomotives')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.update)
   @ApiOperation({ summary: 'Replace the locomotive set (minimum 2, same yard)' })
   setLocomotives(
     @Param('id', ParseUUIDPipe) id: string,
@@ -70,7 +71,7 @@ export class TrainBuilderController {
   }
 
   @Patch(':id/details')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.update)
   @ApiOperation({
     summary: "Edit the train's name and fixed import/export run numbers",
   })
@@ -82,7 +83,7 @@ export class TrainBuilderController {
   }
 
   @Patch(':id/yard')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.update)
   @ApiOperation({
     summary: 'Relocate the train — its locomotives and wagons move to the new yard with it',
   })
@@ -91,14 +92,14 @@ export class TrainBuilderController {
   }
 
   @Post(':id/wagons')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.assignWagons)
   @ApiOperation({ summary: "Append AVAILABLE wagons from the train's yard to the consist" })
   assignWagons(@Param('id', ParseUUIDPipe) id: string, @Body() dto: AssignTrainWagonsDto) {
     return this.trainBuilderService.assignWagons(id, dto);
   }
 
   @Delete(':id/wagons/:wagonId')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.assignWagons)
   @ApiOperation({ summary: 'Detach one wagon from the consist' })
   removeWagon(
     @Param('id', ParseUUIDPipe) id: string,
@@ -108,7 +109,7 @@ export class TrainBuilderController {
   }
 
   @Post(':id/wagons/:wagonId/maintenance')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.assignWagons)
   @ApiOperation({ summary: 'Detach one wagon and move it to MAINTENANCE status' })
   sendWagonToMaintenance(
     @Param('id', ParseUUIDPipe) id: string,
@@ -118,14 +119,14 @@ export class TrainBuilderController {
   }
 
   @Post(':id/reorder-wagons')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.assignWagons)
   @ApiOperation({ summary: 'Persist a drag-reorder of the full consist' })
   reorderWagons(@Param('id', ParseUUIDPipe) id: string, @Body() dto: ReorderTrainWagonsDto) {
     return this.trainBuilderService.reorderWagons(id, dto);
   }
 
   @Post(':id/deactivate')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.update)
   @ApiOperation({
     summary: 'Deactivate the train (park it) — only allowed with no active schedule',
   })
@@ -134,14 +135,14 @@ export class TrainBuilderController {
   }
 
   @Post(':id/activate')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.update)
   @ApiOperation({ summary: 'Reactivate a deactivated train back to AVAILABLE' })
   activate(@Param('id', ParseUUIDPipe) id: string) {
     return this.trainBuilderService.activate(id);
   }
 
   @Delete(':id')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.delete)
   @HttpCode(HttpStatus.NO_CONTENT)
   @ApiOperation({ summary: 'Disband the train (release wagons and locomotives)' })
   disband(@Param('id', ParseUUIDPipe) id: string) {
diff --git a/apps/edr-freight-api/src/modules/trains/trains.controller.ts b/apps/edr-freight-api/src/modules/trains/trains.controller.ts
index 0217bc161..173a738fa 100644
--- a/apps/edr-freight-api/src/modules/trains/trains.controller.ts
+++ b/apps/edr-freight-api/src/modules/trains/trains.controller.ts
@@ -12,18 +12,19 @@ import {
 import { ApiOperation, ApiTags } from "@nestjs/swagger";
 
 import { FleetManage, FleetView } from "../../common/booking-guards";
+import { FREIGHT_PERMS } from "../../seed/freight-permissions.registry";
 import { CreateTrainDto } from "./dto/create-train.dto";
 import { UpdateTrainDto } from "./dto/update-train.dto";
 import { TrainsService } from "./trains.service";
 
 @ApiTags("trains")
 @Controller("trains")
-@FleetView()
+@FleetView(FREIGHT_PERMS.trains.view)
 export class TrainsController {
   constructor(private readonly trainsService: TrainsService) {}
 
   @Post()
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.create)
   @ApiOperation({ summary: "Register a new train" })
   create(@Body() dto: CreateTrainDto) {
     return this.trainsService.create(dto);
@@ -42,14 +43,14 @@ export class TrainsController {
   }
 
   @Patch(":id")
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.update)
   @ApiOperation({ summary: "Update a train" })
   update(@Param("id", ParseUUIDPipe) id: string, @Body() dto: UpdateTrainDto) {
     return this.trainsService.update(id, dto);
   }
 
   @Delete(":id")
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.delete)
   @ApiOperation({ summary: "Delete a train" })
   remove(@Param("id", ParseUUIDPipe) id: string) {
     return this.trainsService.remove(id);
diff --git a/apps/edr-freight-api/src/modules/vehicles/vehicles.driver-guard.spec.ts b/apps/edr-freight-api/src/modules/vehicles/vehicles.driver-guard.spec.ts
new file mode 100644
index 000000000..cb810abaf
--- /dev/null
+++ b/apps/edr-freight-api/src/modules/vehicles/vehicles.driver-guard.spec.ts
@@ -0,0 +1,44 @@
+import { ConflictException } from '@nestjs/common';
+
+import { VehiclesService } from './vehicles.service';
+
+// One driver ⇒ one truck: create/update must refuse a driver already assigned
+// to another (non-deleted) vehicle until they are detached.
+describe('VehiclesService driver assignment guard', () => {
+  const otherTruck = { id: 'v2', plateNumber: '3-11111', assignedDriverId: 'd1' };
+
+  const makeService = (findOne: jest.Mock) =>
+    new VehiclesService(
+      { findOne, create: jest.fn((x) => x), save: jest.fn(async (x) => x) } as any,
+      { record: jest.fn() } as any,
+    );
+
+  it('rejects create when the driver is on another truck', async () => {
+    // First findOne = plate uniqueness (null), second = driver holder.
+    const findOne = jest.fn().mockResolvedValueOnce(null).mockResolvedValueOnce(otherTruck);
+    const svc = makeService(findOne);
+    await expect(
+      svc.create({ plateNumber: '3-22222', vehicleType: 'TRUCK', assignedDriverId: 'd1' } as any),
+    ).rejects.toThrow(ConflictException);
+  });
+
+  it('rejects update when reassigning a driver still attached elsewhere', async () => {
+    const findOne = jest
+      .fn()
+      .mockResolvedValueOnce({ id: 'v1', plateNumber: '3-22222', assignedDriverId: null }) // findById
+      .mockResolvedValueOnce(otherTruck); // driver holder
+    const svc = makeService(findOne);
+    await expect(svc.update('v1', { assignedDriverId: 'd1' } as any)).rejects.toThrow(
+      ConflictException,
+    );
+  });
+
+  it('allows update that keeps the same driver on the same truck', async () => {
+    const findOne = jest
+      .fn()
+      .mockResolvedValueOnce({ id: 'v1', plateNumber: '3-22222', assignedDriverId: 'd1' });
+    const svc = makeService(findOne);
+    await expect(svc.update('v1', { assignedDriverId: 'd1' } as any)).resolves.toBeDefined();
+    expect(findOne).toHaveBeenCalledTimes(1); // guard skipped — no holder lookup
+  });
+});
diff --git a/apps/edr-freight-api/src/modules/vehicles/vehicles.service.ts b/apps/edr-freight-api/src/modules/vehicles/vehicles.service.ts
index 25260e86f..98d38cbce 100644
--- a/apps/edr-freight-api/src/modules/vehicles/vehicles.service.ts
+++ b/apps/edr-freight-api/src/modules/vehicles/vehicles.service.ts
@@ -20,6 +20,25 @@ export class VehiclesService {
     private readonly history: FleetHistoryService,
   ) {}
 
+  /**
+   * A driver holds one truck at a time — reassignment requires detaching them
+   * from their current truck first.
+   * ponytail: app-level guard only (race window); add a partial unique index on
+   * assigned_driver_id if concurrent fleet edits ever become real.
+   */
+  private async assertDriverUnassigned(driverId: string, exceptVehicleId?: string): Promise<void> {
+    const holder = await this.vehicleRepo.findOne({
+      where: exceptVehicleId
+        ? { assignedDriverId: driverId, id: Not(exceptVehicleId) }
+        : { assignedDriverId: driverId },
+    });
+    if (holder) {
+      throw new ConflictException(
+        `This driver is already assigned to truck ${holder.plateNumber ?? holder.code ?? holder.id} — detach the driver from that truck first`,
+      );
+    }
+  }
+
   async create(dto: CreateVehicleDto): Promise<Vehicle> {
     const existing = await this.vehicleRepo.findOne({
       where: { plateNumber: dto.plateNumber },
@@ -31,6 +50,10 @@ export class VehiclesService {
       );
     }
 
+    if (dto.assignedDriverId) {
+      await this.assertDriverUnassigned(dto.assignedDriverId);
+    }
+
     const registrationNumber = `REG-${dto.vehicleType}-${Date.now()}`;
     const vehicle = this.vehicleRepo.create({
       ...dto,
@@ -121,6 +144,10 @@ export class VehiclesService {
       }
     }
 
+    if (dto.assignedDriverId && dto.assignedDriverId !== vehicle.assignedDriverId) {
+      await this.assertDriverUnassigned(dto.assignedDriverId, id);
+    }
+
     const prev = {
       assignedDriverId: vehicle.assignedDriverId,
       assignedDriverName: vehicle.assignedDriverName,
diff --git a/apps/edr-freight-api/src/modules/wagons/wagon-transfer-requests.controller.ts b/apps/edr-freight-api/src/modules/wagons/wagon-transfer-requests.controller.ts
index d6925b71b..b00e4a64f 100644
--- a/apps/edr-freight-api/src/modules/wagons/wagon-transfer-requests.controller.ts
+++ b/apps/edr-freight-api/src/modules/wagons/wagon-transfer-requests.controller.ts
@@ -19,6 +19,7 @@ import {
   WagonTransferHistoryAll,
   WagonTransferRequest,
 } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { BulkFulfillTransferRequestsDto } from './dto/bulk-fulfill-transfer-requests.dto';
 import { CreateTransferRequestDto } from './dto/create-transfer-request.dto';
 import { FulfillTransferRequestDto } from './dto/fulfill-transfer-request.dto';
@@ -31,7 +32,7 @@ import { WagonTransferRequestsService } from './wagon-transfer-requests.service'
  */
 @ApiTags('wagon-transfer-requests')
 @Controller('wagon-transfer-requests')
-@FleetView()
+@FleetView(FREIGHT_PERMS.wagons.view)
 export class WagonTransferRequestsController {
   constructor(private readonly service: WagonTransferRequestsService) {}
 
@@ -110,7 +111,7 @@ export class WagonTransferRequestsController {
   }
 
   @Post(':id/cancel')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.wagons.transferRequest)
   @ApiOperation({ summary: 'Withdraw a pending transfer request' })
   cancel(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.cancelRequest(id);
diff --git a/apps/edr-freight-api/src/modules/wagons/wagons.controller.ts b/apps/edr-freight-api/src/modules/wagons/wagons.controller.ts
index 556907cde..2ef7f00a5 100644
--- a/apps/edr-freight-api/src/modules/wagons/wagons.controller.ts
+++ b/apps/edr-freight-api/src/modules/wagons/wagons.controller.ts
@@ -12,7 +12,8 @@ import {
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CurrentUser } from '@edr/api-common';
 import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/current-user.type';
-import { FleetManage, FleetView } from '../../common/booking-guards';
+import { FleetManage, FleetView, StaffReference } from '../../common/booking-guards';
+import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { CreateWagonDto } from './dto/create-wagon.dto';
 import { ListWagonsQueryDto } from './dto/list-wagons-query.dto';
 import { UpdateWagonDto } from './dto/update-wagon.dto';
@@ -23,31 +24,36 @@ import { BulkSetWagonStatusDto } from './dto/bulk-set-wagon-status.dto';
 import { WagonsService } from './wagons.service';
 
 @ApiTags('wagons')
+// No class-level guard: reads (list, by-id, movements) are login-only reference
+// data — any staff can fetch wagon data for a cross-flow view without the
+// fleet:view that drives the Fleet sidebar. Every mutation has its @FleetManage().
 @Controller('wagons')
-@FleetView()
 export class WagonsController {
   constructor(private readonly wagonsService: WagonsService) {}
 
   @Post()
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.wagons.create)
   @ApiOperation({ summary: 'Create a new wagon' })
   create(@Body() dto: CreateWagonDto) {
     return this.wagonsService.create(dto);
   }
 
   @Get()
+  @StaffReference()
   @ApiOperation({ summary: 'List all wagons' })
   findAll(@Query() query: ListWagonsQueryDto) {
     return this.wagonsService.findAll(query);
   }
 
   @Get(':id')
+  @StaffReference()
   @ApiOperation({ summary: 'Get a wagon by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.wagonsService.findById(id);
   }
 
   @Get(':id/movements')
+  @StaffReference()
   @ApiOperation({
     summary: "Wagon movement ledger (loaded legs, empty repositions, manual moves), newest first",
   })
@@ -56,42 +62,42 @@ export class WagonsController {
   }
 
   @Patch(':id')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.wagons.update)
   @ApiOperation({ summary: 'Update a wagon' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateWagonDto) {
     return this.wagonsService.update(id, dto);
   }
 
   @Delete(':id')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.wagons.delete)
   @ApiOperation({ summary: 'Delete a wagon' })
   remove(@Param('id', ParseUUIDPipe) id: string) {
     return this.wagonsService.remove(id);
   }
 
   @Post(':id/assign-train')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.assignWagons)
   @ApiOperation({ summary: 'Assign wagon to a train' })
   assignToTrain(@Param('id', ParseUUIDPipe) id: string, @Body() dto: AssignWagonToTrainDto) {
     return this.wagonsService.assignToTrain(id, dto);
   }
 
   @Post(':id/unassign-train')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.assignWagons)
   @ApiOperation({ summary: 'Unassign wagon from train' })
   unassignFromTrain(@Param('id', ParseUUIDPipe) id: string) {
     return this.wagonsService.unassignFromTrain(id);
   }
 
   @Post('bulk-transfer')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.wagons.update)
   @ApiOperation({ summary: 'Transfer multiple wagons to a destination yard' })
   bulkTransfer(@Body() dto: BulkTransferWagonsDto, @CurrentUser() user: TCurrentUser) {
     return this.wagonsService.bulkTransfer(dto, user?.id);
   }
 
   @Post('bulk-status')
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.wagons.update)
   @ApiOperation({ summary: 'Set the status of multiple wagons' })
   bulkSetStatus(@Body() dto: BulkSetWagonStatusDto) {
     return this.wagonsService.bulkSetStatus(dto);
@@ -100,12 +106,12 @@ export class WagonsController {
 
 // Separate controller for train‑specific reorder (registered in module)
 @Controller('trains/:trainId/reorder-wagons')
-@FleetView()
+@FleetView(FREIGHT_PERMS.trains.view)
 export class TrainWagonsReorderController {
   constructor(private readonly wagonsService: WagonsService) {}
 
   @Post()
-  @FleetManage()
+  @FleetManage(FREIGHT_PERMS.trains.assignWagons)
   @ApiOperation({ summary: 'Reorder wagons of a train' })
   reorder(@Param('trainId', ParseUUIDPipe) trainId: string, @Body() dto: ReorderWagonsDto) {
     return this.wagonsService.reorderWagons(trainId, dto);
diff --git a/apps/edr-freight-api/src/modules/warehouses/entities/booking-handover.entity.ts b/apps/edr-freight-api/src/modules/warehouses/entities/booking-handover.entity.ts
index c90fb5a16..85f66b74f 100644
--- a/apps/edr-freight-api/src/modules/warehouses/entities/booking-handover.entity.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/entities/booking-handover.entity.ts
@@ -52,4 +52,8 @@ export class BookingHandover extends BaseEntity {
   /** EDR last-mile: when the goods were delivered to the customer. */
   @Column({ name: 'delivered_at', type: 'timestamptz', nullable: true })
   deliveredAt?: Date | null;
+
+  /** URL to the signer's saved signature image, if available at sign time. */
+  @Column({ name: 'signature_image_url', type: 'text', nullable: true })
+  signatureImageUrl?: string | null;
 }
diff --git a/apps/edr-freight-api/src/modules/warehouses/handover.service.ts b/apps/edr-freight-api/src/modules/warehouses/handover.service.ts
index 81f83a57a..d7bb881cd 100644
--- a/apps/edr-freight-api/src/modules/warehouses/handover.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/handover.service.ts
@@ -287,6 +287,7 @@ export class HandoverService {
     handoverId: string,
     userId?: string | null,
     signerName?: string | null,
+    signatureImageUrl?: string | null,
   ): Promise<BookingHandover> {
     const repo = this.dataSource.getRepository(BookingHandover);
     const handover = await repo.findOne({ where: { id: handoverId } });
@@ -297,6 +298,7 @@ export class HandoverService {
     handover.signedAt = new Date();
     handover.signedByUserId = userId ?? null;
     handover.signerName = signerName?.trim() || null;
+    handover.signatureImageUrl = signatureImageUrl ?? null;
     return repo.save(handover);
   }
 
@@ -305,6 +307,7 @@ export class HandoverService {
     bookingId: string,
     userId?: string | null,
     signerName?: string | null,
+    signatureImageUrl?: string | null,
   ): Promise<void> {
     await this.dataSource
       .getRepository(BookingHandover)
@@ -314,6 +317,7 @@ export class HandoverService {
           signedAt: new Date(),
           signedByUserId: userId ?? null,
           signerName: signerName?.trim() || null,
+          signatureImageUrl: signatureImageUrl ?? null,
         },
       );
   }
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.controller.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.controller.ts
index 2373cb6d8..0174ef3e9 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.controller.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.controller.ts
@@ -486,6 +486,21 @@ export class WarehouseInventoryController {
     return this.handoverService.list(bookingId);
   }
 
+  @Post('handovers/:handoverId/sign')
+  @ApiOperation({ summary: 'Customer signs one handover (EDR last-mile: one signature per truck)' })
+  signHandover(
+    @Param('handoverId', ParseUUIDPipe) handoverId: string,
+    @Body() dto: ApproveDeliveryDto,
+    @Request() req: { user?: { id?: string; sub?: string } },
+    @CurrentUser() user: TCurrentUser,
+  ) {
+    return this.inventoryService.signHandover(
+      handoverId,
+      user?.id ?? req.user?.id ?? req.user?.sub,
+      dto.signerName,
+    );
+  }
+
   @Post('bookings/:bookingId/request-handover-signature')
   @ApiOperation({ summary: 'Ask the customer to sign the handover (creates one if none, then notifies)' })
   requestHandoverSignature(@Param('bookingId', ParseUUIDPipe) bookingId: string) {
@@ -513,9 +528,16 @@ export class WarehouseInventoryController {
   }
 
   @Get('bookings/:bookingId/handover-document')
-  @ApiOperation({ summary: 'View import goods handover document PDF (resolved by booking)' })
-  async bookingHandoverDocument(@Param('bookingId', ParseUUIDPipe) bookingId: string, @Res() res: Response) {
-    const { filename, buffer } = await this.inventoryService.handoverDocumentForBooking(bookingId);
+  @ApiOperation({ summary: 'View import goods handover document PDF (resolved by booking; ?handoverId= for the per-truck variant)' })
+  async bookingHandoverDocument(
+    @Param('bookingId', ParseUUIDPipe) bookingId: string,
+    @Res() res: Response,
+    @Query('handoverId') handoverId?: string,
+  ) {
+    const { filename, buffer } = await this.inventoryService.handoverDocumentForBooking(
+      bookingId,
+      handoverId || undefined,
+    );
     res.setHeader('Content-Type', 'application/pdf');
     res.setHeader('Content-Disposition', `inline; filename="${filename}"`);
     res.setHeader('Content-Length', buffer.length);
@@ -534,6 +556,12 @@ export class WarehouseInventoryController {
     return this.inventoryService.bookingContainerWeights(bookingId);
   }
 
+  @Get('bookings/:bookingId/location')
+  @ApiOperation({ summary: "Warehouse location of a booking's inventory (customer portal)" })
+  bookingLocation(@Param('bookingId', ParseUUIDPipe) bookingId: string) {
+    return this.inventoryService.bookingLocation(bookingId);
+  }
+
   @Post(':id/deliver')
   @BookingStaff(FREIGHT_PERMS.warehouseInventory.deliver)
   @ApiOperation({ summary: 'Deliver import goods to the customer + capture proof of delivery' })
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
index c45764bbd..582face93 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-inventory.service.ts
@@ -1,4 +1,5 @@
 import { BadRequestException, Injectable, Logger, NotFoundException } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Cron, CronExpression } from '@nestjs/schedule';
 import {
   Between,
@@ -25,6 +26,7 @@ import { CargoType } from '../rule-engine/entities/cargo-type.entity';
 import { InterchangeDocumentsService } from '../interchange-documents/interchange-documents.service';
 import type { InterchangeDocument } from '../interchange-documents/entities/interchange-document.entity';
 import { LastMileService } from '../last-mile/last-mile.service';
+import { UpdateLastMileDto } from '../last-mile/dto/update-last-mile.dto';
 import { NotificationsService } from '../notifications/notifications.service';
 import { sendCompanyChannels } from '../notifications/notify-company.util';
 import {
@@ -409,6 +411,7 @@ export class WarehouseInventoryService {
     private readonly signatures: SignaturesService,
     private readonly handover: HandoverService,
     private readonly inbox: NotificationInboxService,
+    private readonly events: EventEmitter2,
   ) {}
 
   /**
@@ -1027,6 +1030,28 @@ export class WarehouseInventoryService {
     return this.findAll({ ...filter, status: 'READY_FOR_LOADING' });
   }
 
+  /**
+   * Warehouse location rows for one booking, trimmed for the customer portal:
+   * no staff guard on the route, so only location fields leave the API —
+   * never notes, fees or inspection internals.
+   */
+  async bookingLocation(bookingId: string) {
+    const items = await this.inventoryRepository.findAll({
+      where: { bookingId },
+      relations: { warehouse: true, yard: true, zone: true },
+      order: { createdAt: 'DESC' },
+    });
+    return items.map((i) => ({
+      id: i.id,
+      bookingId: i.bookingId,
+      status: i.status,
+      arrivedAt: i.arrivedAt ?? null,
+      warehouse: i.warehouse ? { id: i.warehouse.id, name: i.warehouse.name, code: i.warehouse.code } : null,
+      yard: i.yard ? { id: i.yard.id, name: i.yard.name, code: i.yard.code } : null,
+      zone: i.zone ? { id: i.zone.id, name: i.zone.name, code: i.zone.code } : null,
+    }));
+  }
+
   async findById(id: string): Promise<WarehouseInventory> {
     const item = await this.inventoryRepository.findById(id, {
       relations: { warehouse: { facility: true }, yard: true, zone: true },
@@ -1553,6 +1578,14 @@ export class WarehouseInventoryService {
           notes: `Bulk received (${dto.direction})`,
           truckEntrance,
         });
+
+        // Validate capacity before saving
+        const weight = Number(booking.weight) || 0;
+        const containerCount = booking.freightType === 'CONTAINER' ? containerQuantity : 0;
+        this.assertCapacity('Warehouse', warehouse, weight, 0, containerCount);
+        this.assertCapacity('Yard', yard, weight, 0, containerCount);
+        this.assertCapacity('Zone', zone, weight, 0, containerCount);
+
         const saved = await manager.getRepository(WarehouseInventory).save(
           manager.getRepository(WarehouseInventory).create({
             warehouseId: dto.warehouseId,
@@ -1560,7 +1593,7 @@ export class WarehouseInventoryService {
             zoneId: dto.zoneId,
             bookingId,
             quantity: booking.freightType === 'CONTAINER' ? containerQuantity : 1,
-            weight: Number(booking.weight) || 0,
+            weight,
             grnNumber,
             status: 'RECEIVED',
             arrivedAt: now,
@@ -1568,6 +1601,9 @@ export class WarehouseInventoryService {
           }),
         );
 
+        // Update warehouse/yard/zone capacity counters
+        await this.applyCapacityDelta(manager, dto, weight, 0, containerCount);
+
         // Receiving the booking flags every container unit as received into the
         // port (self-haul export: the delivering truck's goods are now in) so
         // staff can raise the per-container GRN over what's received.
@@ -2468,27 +2504,37 @@ export class WarehouseInventoryService {
     });
 
     if (result.unloadedCount > 0) {
-      let document = await this.interchangeDocuments.generateFromSchedule({
-        scheduleId,
-        direction: 'EXPORT',
-        handoverLocation: schedule.destinationName ?? 'Djibouti Port',
-        handoverFrom: 'EDR',
-        handoverTo: 'Djibouti Port Operator',
-        portOperatorName: 'Doraleh Multipurpose Port',
-        generatedBy: performedBy ?? 'EDR Operations',
-        remarks: 'Generated after export unloading at Djibouti Port; signed by EDR and Djibouti Port Operator.',
-      });
-      if (document.status !== 'ACKNOWLEDGED') {
-        document = await this.interchangeDocuments.acknowledge(document.id, {
-          acknowledgedBy: 'Djibouti Port Operator',
-          remarks: 'Auto acknowledged after Djibouti export unloading.',
+      // Best-effort: the unload is already committed — a paperwork failure must
+      // not fail the response (it did once: items unloaded, request 500'd, and
+      // the document only appeared after a manual retry days later). The doc
+      // backfills on any retry since already-unloaded items count as unloaded.
+      try {
+        let document = await this.interchangeDocuments.generateFromSchedule({
+          scheduleId,
+          direction: 'EXPORT',
+          handoverLocation: schedule.destinationName ?? 'Djibouti Port',
+          handoverFrom: 'EDR',
+          handoverTo: 'Djibouti Port Operator',
+          portOperatorName: 'Doraleh Multipurpose Port',
+          generatedBy: performedBy ?? 'EDR Operations',
+          remarks: 'Generated after export unloading at Djibouti Port; signed by EDR and Djibouti Port Operator.',
         });
+        if (document.status !== 'ACKNOWLEDGED') {
+          document = await this.interchangeDocuments.acknowledge(document.id, {
+            acknowledgedBy: 'Djibouti Port Operator',
+            remarks: 'Auto acknowledged after Djibouti export unloading.',
+          });
+        }
+        result.interchangeDocument = {
+          id: document.id,
+          documentNo: document.documentNo,
+          status: document.status,
+        };
+      } catch (err) {
+        this.logger.warn(
+          `Export interchange document generation failed for schedule ${scheduleId}: ${(err as Error).message} — rerun the Djibouti unloading to regenerate it`,
+        );
       }
-      result.interchangeDocument = {
-        id: document.id,
-        documentNo: document.documentNo,
-        status: document.status,
-      };
     }
 
     return result;
@@ -2986,6 +3032,29 @@ export class WarehouseInventoryService {
           );
         }
 
+        // A truck leaves with the containers ASSIGNED to it — never another
+        // truck's. Enforced whenever the truck has an assigned load on file
+        // (customer self-haul or EDR last-mile).
+        if (dto.containerNumber && dto.truckPlateNumber?.trim()) {
+          const selectedNumbers = dto.containerNumber
+            .split(/[,;\n]+/)
+            .map((n) => n.trim().toUpperCase())
+            .filter(Boolean);
+          const assigned = await this.truckAssignedContainers(
+            item.bookingId,
+            dto.truckPlateNumber.trim(),
+          );
+          if (assigned.length && selectedNumbers.length) {
+            const foreign = selectedNumbers.filter((n) => !assigned.includes(n));
+            if (foreign.length) {
+              throw new BadRequestException(
+                `Container${foreign.length > 1 ? 's' : ''} ${foreign.join(', ')} ` +
+                  `not assigned to truck ${dto.truckPlateNumber.trim()} — each truck may only carry out its own assigned containers`,
+              );
+            }
+          }
+        }
+
         // Authoritative weight match: the truck's net (gross − tare) must equal the
         // total VGM cargo weight of the containers selected as loaded on it.
         // Skipped when the operator chose not to weigh (containers only).
@@ -3148,7 +3217,7 @@ export class WarehouseInventoryService {
         // EDR last-mile: this truck is leaving — record its exit and the load it
         // actually took. net_weight_tons drives the bulk drawdown (booking VGM
         // minus everything already hauled away).
-        await manager.query(
+        const [edrDeparted] = (await manager.query(
           `UPDATE freight.last_mile_vehicle_assignments va
               SET departed_at = COALESCE($3::timestamptz, NOW()),
                   arrived_at = COALESCE(va.arrived_at, NOW()),
@@ -3162,7 +3231,8 @@ export class WarehouseInventoryService {
               AND v.id = va.vehicle_id
               AND (UPPER(v.power_plate_no) = UPPER($2) OR UPPER(v.plate_number) = UPPER($2))
               AND va.departed_at IS NULL
-              AND va.deleted_at IS NULL`,
+              AND va.deleted_at IS NULL
+            RETURNING va.id`,
           [
             item.bookingId,
             dto.truckPlateNumber.trim(),
@@ -3170,7 +3240,31 @@ export class WarehouseInventoryService {
             grossTons,
             netTons,
           ],
-        );
+        )) as [Array<{ id: string }>, unknown];
+        // EDR last-mile: the handover is generated the moment the truck exits
+        // (with its exit paper) — one per truck — and the customer is asked to
+        // sign it from the portal. Booking-level fallback when the plate matched
+        // no live assignment (e.g. exit re-recorded) but the booking is EDR-hauled.
+        for (const row of edrDeparted) {
+          await this.handover.ensureForDepartedEdrTruck(
+            item.bookingId,
+            { truckPlate: dto.truckPlateNumber.trim(), edrAssignmentId: row.id },
+            manager,
+          );
+        }
+        if (!edrDeparted.length) {
+          const [lm]: Array<{ id: string }> = await manager.query(
+            `SELECT id FROM freight.last_mile WHERE booking_id = $1 AND deleted_at IS NULL LIMIT 1`,
+            [item.bookingId],
+          );
+          if (lm) {
+            await this.handover.ensureForDepartedEdrTruck(
+              item.bookingId,
+              { truckPlate: dto.truckPlateNumber.trim() },
+              manager,
+            );
+          }
+        }
         // Customer self-haul: the same exit record on the customer's own truck.
         // Without it a self-haul bulk booking never draws down — hauled tonnage
         // summed to zero and the booking could take unlimited trucks. Matched by
@@ -3220,11 +3314,43 @@ export class WarehouseInventoryService {
     // the transaction and fire-and-forget: notifying must never fail the exit.
     if (isTruckLeaving && item.bookingId) {
       void this.notifyTruckDeparture(item.bookingId, dto.truckPlateNumber?.trim() ?? null, netTons);
+    } else if (item.bookingId) {
+      // Gate-in: same single-path hook for the arrival side (self-haul + EDR).
+      void this.notifyTruckArrival(item.bookingId, dto.truckPlateNumber?.trim() ?? null);
     }
 
     return this.findById(id);
   }
 
+  /** Best-effort truck-arrival notification (gate-in), mirror of the departure one. */
+  private async notifyTruckArrival(bookingId: string, plateNumber: string | null): Promise<void> {
+    try {
+      const [booking]: Array<{ companyId: string | null; reference: string | null }> =
+        await this.dataSource.query(
+          `SELECT company_id AS "companyId", reference
+             FROM freight.bookings
+            WHERE id = $1 AND deleted_at IS NULL`,
+          [bookingId],
+        );
+      if (!booking?.companyId) return;
+      const ref = booking.reference ?? bookingId;
+      const truck = plateNumber ? `Truck ${plateNumber}` : 'A truck';
+      const body = `${truck} has arrived at the warehouse for booking ${ref}.`;
+      await this.inbox.notify({
+        recipients: { companyId: booking.companyId },
+        audience: NotificationAudience.PORTAL,
+        type: NotificationType.BOOKING_STATUS,
+        title: 'Truck arrived at the warehouse',
+        body,
+        link: `/bookings/${bookingId}`,
+        data: { bookingId, plateNumber, action: 'TRUCK_ARRIVED' },
+      });
+      await sendCompanyChannels(this.dataSource, this.notifications, booking.companyId, body);
+    } catch (err) {
+      this.logger.warn(`Truck-arrival notify failed for ${bookingId}: ${(err as Error).message}`);
+    }
+  }
+
   /**
    * Best-effort truck-departure notification to the booking's company across
    * every channel: in-app (portal inbox) + SMS + email. Never throws — a missing
@@ -3265,6 +3391,17 @@ export class WarehouseInventoryService {
     }
   }
 
+  /**
+   * customer_truck_assignments.gross_weight_kg holds TONNES for gate-out
+   * recorded exits but real KG for legacy departTruck rows. Exit papers always
+   * print tonnes — normalise on read.
+   */
+  // ponytail: >1000 heuristic (no truck hauls 1000+ t, no weighbridge reads <1000 kg);
+  // migrate the column to tonnes if it ever bites.
+  private grossAsTons(value: number): number {
+    return value > 1000 ? Math.round(value) / 1000 : value;
+  }
+
   async releaseDocument(id: string): Promise<{ filename: string; buffer: Buffer }> {
     const [row] = await this.dataSource.query(
       `SELECT inv.id,
@@ -3324,7 +3461,40 @@ export class WarehouseInventoryService {
       grossWeightKg: string | number | null;
       departedAt: string | null;
     } | null = null;
-    if (row?.tradeDirection === 'IMPORT' && row?.containerNumber && row?.bookingId) {
+    // The exit-inspection note written at gate-out names the truck doing THIS
+    // exit — resolve by its plate first. The item's own container may not be on
+    // the departing truck at all (trucks pick containers freely per trip).
+    const notePlates = [...String(row?.notes ?? '').matchAll(/Truck Plate:\s*(\S+)/gi)];
+    const exitPlate = notePlates.length ? notePlates[notePlates.length - 1][1] : null;
+    if (row?.tradeDirection === 'IMPORT' && row?.bookingId && exitPlate) {
+      const [truckRow] = await this.dataSource.query(
+        `SELECT a.plate_number AS "plateNumber",
+                a.driver_name AS "driverName",
+                a.truck_type AS "truckType",
+                a.gross_weight_kg AS "grossWeightKg",
+                a.departed_at AS "departedAt",
+                string_agg(DISTINCT c.container_number, ', ' ORDER BY c.container_number) AS "containerNumbers",
+                COALESCE((
+                  SELECT SUM(bcu.vgm_tons)
+                    FROM freight.customer_truck_containers cc
+                    JOIN freight.booking_container_units bcu
+                      ON bcu.container_number = cc.container_number AND bcu.deleted_at IS NULL
+                    JOIN freight.booking_container bc
+                      ON bc.id = bcu.booking_container_id AND bc.deleted_at IS NULL
+                     AND bc.booking_id = a.booking_id
+                   WHERE cc.assignment_id = a.id AND cc.deleted_at IS NULL
+                ), 0) AS "truckWeightTons"
+           FROM freight.customer_truck_assignments a
+           LEFT JOIN freight.customer_truck_containers c
+             ON c.assignment_id = a.id AND c.deleted_at IS NULL
+          WHERE a.booking_id = $1 AND UPPER(a.plate_number) = UPPER($2) AND a.deleted_at IS NULL
+          GROUP BY a.id, a.plate_number, a.driver_name, a.truck_type, a.gross_weight_kg, a.departed_at
+          LIMIT 1`,
+        [row.bookingId, exitPlate],
+      );
+      truck = truckRow ?? null;
+    }
+    if (!truck && row?.tradeDirection === 'IMPORT' && row?.containerNumber && row?.bookingId) {
       const [truckRow] = await this.dataSource.query(
         `SELECT a.plate_number AS "plateNumber",
                 a.driver_name AS "driverName",
@@ -3354,6 +3524,26 @@ export class WarehouseInventoryService {
       );
       truck = truckRow ?? null;
     }
+    // Bulk self-haul (no container to match) or an unmatched container: the exit
+    // paper is still PER TRUCK — use the latest departed customer truck and its
+    // weighed gross, never the booking's declared total.
+    if (!truck && row?.tradeDirection === 'IMPORT' && row?.bookingId) {
+      const [truckRow] = await this.dataSource.query(
+        `SELECT a.plate_number AS "plateNumber",
+                a.driver_name AS "driverName",
+                a.truck_type AS "truckType",
+                a.gross_weight_kg AS "grossWeightKg",
+                a.departed_at AS "departedAt",
+                NULL AS "containerNumbers",
+                a.net_weight_tons AS "truckWeightTons"
+           FROM freight.customer_truck_assignments a
+          WHERE a.booking_id = $1 AND a.deleted_at IS NULL AND a.departed_at IS NOT NULL
+          ORDER BY a.departed_at DESC
+          LIMIT 1`,
+        [row.bookingId],
+      );
+      truck = truckRow ?? null;
+    }
 
     const bookingReference = row?.bookingReference || 'N/A';
     const reference =
@@ -3368,7 +3558,9 @@ export class WarehouseInventoryService {
       customerName: row?.customerName ?? null,
       freightType: row?.freightType ?? null,
       tradeDirection: row?.tradeDirection ?? null,
-      containerNumber: row?.containerNumber ?? null,
+      // Per-truck exit: list every container leaving on THIS truck, not just
+      // the inventory item's own container.
+      containerNumber: truck?.containerNumbers ?? row?.containerNumber ?? null,
       cargoDescription: row?.cargoDescription ?? null,
       quantity: Number(row?.quantity ?? 0),
       weight: Number(row?.weight ?? 0),
@@ -3382,12 +3574,12 @@ export class WarehouseInventoryService {
       truckDriverName: truck?.driverName ?? null,
       truckType: truck?.truckType ?? null,
       truckGateOut: truck?.departedAt ?? null,
-      // Prefer the weighed gross captured on departure; fall back to the summed
-      // container VGM when the truck hasn't been weighed yet.
-      truckWeightKg: truck
-        ? Number(truck.grossWeightKg ?? 0) > 0
-          ? Number(truck.grossWeightKg)
-          : Number(truck.truckWeightTons ?? 0) * 1000
+      // Per-truck load in tonnes: the summed VGM of the containers on this truck
+      // (recorded net for bulk); the weighed gross only as fallback.
+      truckWeightTons: truck
+        ? Number(truck.truckWeightTons ?? 0) > 0
+          ? Number(truck.truckWeightTons)
+          : this.grossAsTons(Number(truck.grossWeightKg ?? 0))
         : null,
     });
 
@@ -3505,6 +3697,32 @@ export class WarehouseInventoryService {
     }));
   }
 
+  /**
+   * Container numbers assigned to a truck (by plate) on this booking, from both
+   * haulage paths: customer self-haul (customer_truck_containers) and EDR
+   * last-mile (last_mile_vehicle_containers / legacy scalar). Uppercased.
+   */
+  private async truckAssignedContainers(bookingId: string, plate: string): Promise<string[]> {
+    const rows: Array<{ cn: string | null }> = await this.dataSource.query(
+      `SELECT UPPER(cc.container_number) AS cn
+         FROM freight.customer_truck_assignments a
+         JOIN freight.customer_truck_containers cc
+           ON cc.assignment_id = a.id AND cc.deleted_at IS NULL
+        WHERE a.booking_id = $1 AND UPPER(a.plate_number) = UPPER($2) AND a.deleted_at IS NULL
+       UNION
+       SELECT UPPER(COALESCE(vc.container_number, va.container_number)) AS cn
+         FROM freight.last_mile_vehicle_assignments va
+         JOIN freight.last_mile l ON l.id = va.last_mile_id AND l.deleted_at IS NULL
+         LEFT JOIN freight.last_mile_vehicle_containers vc
+           ON vc.assignment_id = va.id AND vc.deleted_at IS NULL
+         JOIN freight.vehicles v ON v.id = va.vehicle_id
+        WHERE l.booking_id = $1 AND va.deleted_at IS NULL
+          AND (UPPER(v.power_plate_no) = UPPER($2) OR UPPER(v.plate_number) = UPPER($2))`,
+      [bookingId, plate],
+    );
+    return rows.map((r) => r.cn).filter((n): n is string => Boolean(n));
+  }
+
   /**
    * The booking's containers with their VGM cargo weight (tonnes), keyed by
    * container number. Drives the truck-leaving exit weighing: the selected
@@ -3560,10 +3778,17 @@ export class WarehouseInventoryService {
     );
     if (inv?.id) await this.invoices.assertClearanceAllowed(inv.id);
 
-    const containers: Array<{ containerNumber: string; goods: string | null }> =
+    const containers: Array<{ containerNumber: string; goods: string | null; vgmTons: string | null }> =
       await this.dataSource.query(
         `SELECT c.container_number AS "containerNumber",
-                COALESCE(ct.cargo_type_name, b.cargo_free_text) AS goods
+                COALESCE(ct.cargo_type_name, b.cargo_free_text) AS goods,
+                (SELECT SUM(u.vgm_tons)
+                   FROM freight.booking_container_units u
+                   JOIN freight.booking_container bc
+                     ON bc.id = u.booking_container_id AND bc.deleted_at IS NULL
+                  WHERE u.container_number = c.container_number
+                    AND bc.booking_id = c.booking_id
+                    AND u.deleted_at IS NULL) AS "vgmTons"
            FROM freight.customer_truck_containers c
            JOIN freight.bookings b ON b.id = c.booking_id
            LEFT JOIN freight.cargo_types ct ON ct.id = b.cargo_type_id
@@ -3572,6 +3797,9 @@ export class WarehouseInventoryService {
         [assignmentId],
       );
 
+    // Truck load in tonnes: summed container VGM; the weighed gross only as
+    // fallback (bulk trucks carry no containers).
+    const vgmSum = containers.reduce((s, c) => s + (Number(c.vgmTons) || 0), 0);
     const html = this.buildTruckExitPaperHtml({
       reference: `REL-${String(truck.bookingReference).replace(/^BK-?/i, '')}-${truck.plateNumber}`,
       bookingReference: truck.bookingReference,
@@ -3579,7 +3807,7 @@ export class WarehouseInventoryService {
       plateNumber: truck.plateNumber,
       driverName: truck.driverName,
       truckType: truck.truckType,
-      grossWeightKg: Number(truck.grossWeightKg ?? 0),
+      grossWeightKg: vgmSum > 0 ? vgmSum : this.grossAsTons(Number(truck.grossWeightKg ?? 0)),
       gateOut: truck.departedAt,
       containers,
     });
@@ -3869,10 +4097,11 @@ export class WarehouseInventoryService {
     await this.invoices.assertClearanceAllowed(item.id);
 
     const approvedAt = new Date();
+    const signatureImageUrl = signature?.signatureImageUrl ?? null;
     const approval = {
       approvedAt: approvedAt.toISOString(),
       signerDisplayName: name,
-      signatureImageUrl: signature?.signatureImageUrl ?? null,
+      signatureImageUrl,
       userId,
     };
     const existingNotes = this.stripCustomerDeliveryApproval(item.notes);
@@ -3896,7 +4125,7 @@ export class WarehouseInventoryService {
 
     // Sign the structured handover record(s) for this booking (self-haul: before
     // the truck leaves). Kept alongside the legacy approval note.
-    await this.handover.signForBooking(bookingId, userId, name);
+    await this.handover.signForBooking(bookingId, userId, name, signatureImageUrl);
 
     return {
       bookingId,
@@ -3906,8 +4135,215 @@ export class WarehouseInventoryService {
     };
   }
 
-  /** Handover PDF resolved by booking (for the portal, which only has bookingId). */
-  async handoverDocumentForBooking(bookingId: string): Promise<{ filename: string; buffer: Buffer }> {
+  /**
+   * Customer signs ONE handover from the portal (EDR last-mile: one per truck).
+   * When the last one is signed — and every EDR truck has left the warehouse —
+   * the delivery completes automatically: inventory + cargo delivered, last-mile
+   * leg DELIVERED (trucks freed), booking completed ("shipment delivered").
+   */
+  async signHandover(
+    handoverId: string,
+    userId?: string,
+    signerName?: string,
+  ): Promise<{
+    handoverId: string;
+    bookingId: string;
+    signedAt: string | null;
+    signerDisplayName: string;
+    allSigned: boolean;
+  }> {
+    if (!userId) {
+      throw new BadRequestException('Authentication is required to sign the handover');
+    }
+    const name = signerName?.trim();
+    if (!name) {
+      throw new BadRequestException('Please enter your full name to sign the handover');
+    }
+
+    const signature = await this.signatures.getForUser(userId).catch(() => null);
+
+    const [h]: Array<{
+      bookingId: string;
+      reference: string;
+      truckPlate: string | null;
+      mileType: string;
+      edrAssignmentId: string | null;
+    }> = await this.dataSource.query(
+      `SELECT booking_id AS "bookingId", reference, truck_plate AS "truckPlate",
+              mile_type AS "mileType", edr_assignment_id AS "edrAssignmentId"
+         FROM freight.booking_handovers
+        WHERE id = $1 AND deleted_at IS NULL`,
+      [handoverId],
+    );
+    if (!h) throw new NotFoundException(`Handover ${handoverId} not found`);
+    // Self-haul stays a single booking-level signature via approve-delivery,
+    // which also enforces inspection-passed + truck-arrived. Per-truck signing
+    // is an EDR last-mile flow only.
+    if (h.mileType !== 'EDR_LAST_MILE') {
+      throw new BadRequestException(
+        'This handover is signed through Approve delivery, not per truck',
+      );
+    }
+
+    // Same gate as approve-delivery: storage/demurrage must be settled first.
+    const [inv]: Array<{ id: string; warehouseId: string | null }> = await this.dataSource.query(
+      `SELECT id, warehouse_id AS "warehouseId" FROM freight.warehouse_inventory
+        WHERE booking_id = $1 AND deleted_at IS NULL
+        ORDER BY updated_at DESC NULLS LAST, created_at DESC LIMIT 1`,
+      [h.bookingId],
+    );
+    if (inv) await this.invoices.assertClearanceAllowed(inv.id);
+
+    const signed = await this.handover.sign(handoverId, userId, name, signature?.signatureImageUrl ?? null);
+    const allSigned = await this.handover.isFullySigned(h.bookingId);
+
+    if (inv) {
+      await this.activityLog.record({
+        activityType: 'INVENTORY_RELEASED',
+        inventoryId: inv.id,
+        warehouseId: inv.warehouseId,
+        description: `Customer signed handover ${h.reference}${h.truckPlate ? ` (truck ${h.truckPlate})` : ''} as ${name}`,
+        performedBy: name,
+      });
+    }
+
+    // EDR last-mile delivers PER TRUCK: this signature confirms receipt of the
+    // goods THIS truck carried, so only its containers become DELIVERED now.
+    // (Self-haul keeps the single booking-level handover + manual Deliver.)
+    if (h.mileType === 'EDR_LAST_MILE') {
+      try {
+        await this.deliverEdrTruckContainers(h, name);
+      } catch (err) {
+        this.logger.warn(
+          `Per-truck auto-deliver after handover sign failed for ${h.bookingId}: ${(err as Error).message}`,
+        );
+      }
+    }
+
+    if (allSigned) {
+      void this.completeEdrDeliveryIfReady(h.bookingId, name).catch((err: Error) =>
+        this.logger.warn(`Auto-complete after handover sign failed for ${h.bookingId}: ${err.message}`),
+      );
+    }
+
+    return {
+      handoverId,
+      bookingId: h.bookingId,
+      signedAt: signed.signedAt ? new Date(signed.signedAt).toISOString() : null,
+      signerDisplayName: name,
+      allSigned,
+    };
+  }
+
+  /**
+   * EDR last-mile auto-completion: once every handover is signed and every EDR
+   * truck has departed, deliver the remaining inventory, mark the last-mile leg
+   * DELIVERED and complete the booking. Self-haul bookings keep their manual
+   * Deliver flow (no last_mile record ⇒ no-op).
+   */
+  private async completeEdrDeliveryIfReady(bookingId: string, signerName: string): Promise<void> {
+    const [lm]: Array<{ id: string; status: string }> = await this.dataSource.query(
+      `SELECT id, status FROM freight.last_mile
+        WHERE booking_id = $1 AND deleted_at IS NULL LIMIT 1`,
+      [bookingId],
+    );
+    if (!lm) return;
+
+    const [pending]: Array<{ notDeparted: string }> = await this.dataSource.query(
+      `SELECT COUNT(*) FILTER (WHERE va.departed_at IS NULL) AS "notDeparted"
+         FROM freight.last_mile_vehicle_assignments va
+         JOIN freight.last_mile l ON l.id = va.last_mile_id AND l.deleted_at IS NULL
+        WHERE l.booking_id = $1 AND va.deleted_at IS NULL`,
+      [bookingId],
+    );
+    if (Number(pending?.notDeparted ?? 0) > 0) return;
+    if (!(await this.handover.isFullySigned(bookingId))) return;
+
+    const items: Array<{ id: string }> = await this.dataSource.query(
+      `SELECT id FROM freight.warehouse_inventory
+        WHERE booking_id = $1 AND status = 'READY_FOR_PICKUP' AND deleted_at IS NULL`,
+      [bookingId],
+    );
+    for (const it of items) {
+      try {
+        await this.deliver(it.id, {
+          receiverName: signerName,
+          remarks: 'Auto-delivered on customer handover signature',
+          performedBy: signerName,
+        } as DeliverInventoryDto);
+      } catch (err) {
+        this.logger.warn(`Auto-deliver of inventory ${it.id} failed: ${(err as Error).message}`);
+      }
+    }
+
+    if (lm.status !== 'DELIVERED') {
+      try {
+        await this.lastMileService.update(lm.id, { status: 'DELIVERED' } as UpdateLastMileDto);
+      } catch (err) {
+        this.logger.warn(`Auto-deliver of last-mile ${lm.id} failed: ${(err as Error).message}`);
+      }
+    }
+
+    // Booking → COMPLETED ("shipment delivered" notification) — owned by the
+    // bookings module; evented to avoid a warehouses→bookings service dependency.
+    this.events.emit('import.handover.completed', { bookingId });
+  }
+
+  /**
+   * EDR last-mile per-truck delivery: the customer signed THIS truck's handover,
+   * so only the container items that truck carried become DELIVERED. Bulk cargo
+   * (no container rows) is delivered by completeEdrDeliveryIfReady once every
+   * truck is signed off.
+   */
+  private async deliverEdrTruckContainers(
+    h: { bookingId: string; edrAssignmentId: string | null; truckPlate: string | null },
+    signerName: string,
+  ): Promise<void> {
+    if (!h.edrAssignmentId && !h.truckPlate) return;
+    const items: Array<{ id: string }> = await this.dataSource.query(
+      `SELECT DISTINCT inv.id
+         FROM freight.last_mile_vehicle_assignments va
+         JOIN freight.last_mile l ON l.id = va.last_mile_id AND l.deleted_at IS NULL
+         LEFT JOIN freight.last_mile_vehicle_containers vc
+           ON vc.assignment_id = va.id AND vc.deleted_at IS NULL
+         LEFT JOIN freight.vehicles v ON v.id = va.vehicle_id
+         JOIN freight.containers c
+           ON c.container_number = COALESCE(vc.container_number, va.container_number)
+          AND c.deleted_at IS NULL
+         JOIN freight.warehouse_inventory inv
+           ON inv.container_id = c.id AND inv.booking_id = l.booking_id AND inv.deleted_at IS NULL
+        WHERE l.booking_id = $1
+          AND va.deleted_at IS NULL
+          AND inv.status = 'READY_FOR_PICKUP'
+          AND (va.id = $2::uuid
+               OR ($2::uuid IS NULL
+                   AND (UPPER(v.power_plate_no) = UPPER($3) OR UPPER(v.plate_number) = UPPER($3))))`,
+      [h.bookingId, h.edrAssignmentId, h.truckPlate ?? ''],
+    );
+    for (const it of items) {
+      try {
+        await this.deliver(it.id, {
+          receiverName: signerName,
+          remarks: `Auto-delivered on customer handover signature${h.truckPlate ? ` (truck ${h.truckPlate})` : ''}`,
+          performedBy: signerName,
+        } as DeliverInventoryDto);
+      } catch (err) {
+        this.logger.warn(
+          `Per-truck auto-deliver of inventory ${it.id} failed: ${(err as Error).message}`,
+        );
+      }
+    }
+  }
+
+  /**
+   * Handover PDF resolved by booking (for the portal, which only has bookingId).
+   * With `handoverId` the document is rendered for that specific handover — the
+   * per-truck EDR last-mile variant (truck plate + that truck's signature state).
+   */
+  async handoverDocumentForBooking(
+    bookingId: string,
+    handoverId?: string,
+  ): Promise<{ filename: string; buffer: Buffer }> {
     const [inv]: Array<{ id: string }> = await this.dataSource.query(
       `SELECT id FROM freight.warehouse_inventory
         WHERE booking_id = $1 AND deleted_at IS NULL
@@ -3918,7 +4354,29 @@ export class WarehouseInventoryService {
     if (!inv) {
       throw new NotFoundException(`No warehouse inventory found for booking ${bookingId}`);
     }
-    return this.handoverDocument(inv.id);
+    if (!handoverId) return this.handoverDocument(inv.id);
+
+    const [h]: Array<{
+      reference: string;
+      truckPlate: string | null;
+      signedAt: string | null;
+      signerName: string | null;
+    }> = await this.dataSource.query(
+      `SELECT reference, truck_plate AS "truckPlate",
+              signed_at AS "signedAt", signer_name AS "signerName"
+         FROM freight.booking_handovers
+        WHERE id = $1 AND booking_id = $2 AND deleted_at IS NULL`,
+      [handoverId, bookingId],
+    );
+    if (!h) {
+      throw new NotFoundException(`Handover ${handoverId} not found for booking ${bookingId}`);
+    }
+    return this.handoverDocument(inv.id, {
+      reference: h.reference,
+      truckPlate: h.truckPlate,
+      signedAt: h.signedAt ? new Date(h.signedAt) : null,
+      signerName: h.signerName,
+    });
   }
 
   /** Resolve the primary warehouse-inventory item for a booking (most recent). */
@@ -3946,7 +4404,15 @@ export class WarehouseInventoryService {
     return this.releaseDocument(await this.primaryInventoryIdForBooking(bookingId));
   }
 
-  async handoverDocument(id: string): Promise<{ filename: string; buffer: Buffer }> {
+  async handoverDocument(
+    id: string,
+    perTruck?: {
+      reference: string;
+      truckPlate: string | null;
+      signedAt: Date | null;
+      signerName: string | null;
+    },
+  ): Promise<{ filename: string; buffer: Buffer }> {
     const [row] = await this.dataSource.query(
       `SELECT inv.id,
               inv.booking_id AS "bookingId",
@@ -4033,12 +4499,14 @@ export class WarehouseInventoryService {
 
     const bookingReference = row.bookingReference || row.bookingId || 'N/A';
     const reference =
+      perTruck?.reference ||
       this.extractHandoverDocumentLine(row.notes, 'Handover Reference') ||
       `HND-${String(bookingReference).replace(/[^a-zA-Z0-9_-]+/g, '-')}`;
     const generatedAtValue = this.extractHandoverDocumentLine(row.notes, 'Generated At');
     const generatedAt = generatedAtValue ? new Date(generatedAtValue) : new Date();
     const handedOverAt = Number.isNaN(generatedAt.getTime()) ? new Date() : generatedAt;
-    if (!generatedAtValue) {
+    // Per-truck renders must not stamp their reference into the shared item notes.
+    if (!generatedAtValue && !perTruck) {
       await this.inventoryRepository.update(id, {
         notes: this.replaceHandoverDocumentNote(row.notes, this.buildHandoverDocumentNote(reference, handedOverAt)),
       });
@@ -4072,7 +4540,16 @@ export class WarehouseInventoryService {
       releaseDate: row.releaseDate ? new Date(row.releaseDate) : null,
       trainSchedule: row.trainSchedule ?? null,
       lastMileDeliveryAddress: row.lastMileDeliveryAddress ?? null,
-      customerApproval: this.extractCustomerDeliveryApproval(row.notes),
+      truckPlate: perTruck?.truckPlate ?? null,
+      customerApproval: perTruck
+        ? perTruck.signedAt
+          ? {
+              approvedAt: perTruck.signedAt.toISOString(),
+              signerDisplayName: perTruck.signerName ?? '-',
+              signatureImageUrl: null,
+            }
+          : null
+        : this.extractCustomerDeliveryApproval(row.notes),
     });
 
     return {
@@ -4131,6 +4608,42 @@ export class WarehouseInventoryService {
           );
         }
       }
+      // EDR last-mile delivers per truck: a container item only needs the truck
+      // CARRYING IT to have left; bulk (no container) waits for every truck.
+      if (item.containerId) {
+        const [own]: Array<{ pending: string }> = await this.dataSource.query(
+          `SELECT COUNT(*) FILTER (WHERE va.departed_at IS NULL) AS pending
+             FROM freight.last_mile_vehicle_assignments va
+             JOIN freight.last_mile l ON l.id = va.last_mile_id AND l.deleted_at IS NULL
+             LEFT JOIN freight.last_mile_vehicle_containers vc
+               ON vc.assignment_id = va.id AND vc.deleted_at IS NULL
+             JOIN freight.containers c ON c.id = $2 AND c.deleted_at IS NULL
+            WHERE l.booking_id = $1 AND va.deleted_at IS NULL
+              AND COALESCE(vc.container_number, va.container_number) = c.container_number`,
+          [item.bookingId, item.containerId],
+        );
+        if (Number(own?.pending ?? 0) > 0) {
+          throw new BadRequestException(
+            'Deliver is available only after the EDR truck carrying this container has left',
+          );
+        }
+      } else {
+        const [lm]: Array<{ total: string; left: string }> = await this.dataSource.query(
+          `SELECT COUNT(*) AS total,
+                  COUNT(*) FILTER (WHERE va.departed_at IS NOT NULL) AS "left"
+             FROM freight.last_mile_vehicle_assignments va
+             JOIN freight.last_mile l ON l.id = va.last_mile_id AND l.deleted_at IS NULL
+            WHERE l.booking_id = $1 AND va.deleted_at IS NULL`,
+          [item.bookingId],
+        );
+        const lmTotal = Number(lm?.total ?? 0);
+        const lmLeft = Number(lm?.left ?? 0);
+        if (lmTotal > 0 && lmLeft < lmTotal) {
+          throw new BadRequestException(
+            `Deliver is available only after every assigned EDR truck has left (${lmLeft} of ${lmTotal} so far)`,
+          );
+        }
+      }
     }
 
     const receiverName = dto.receiverName.trim();
@@ -4225,6 +4738,12 @@ export class WarehouseInventoryService {
       }
     });
 
+    // "Approve delivery" nudge: on Deliver the customer is reminded to sign any
+    // handover still unsigned (per truck for EDR last-mile). Fire-and-forget.
+    if (item.bookingId) {
+      void this.handover.notifyUnsignedForBooking(item.bookingId).catch(() => undefined);
+    }
+
     return this.findById(id);
   }
 
@@ -4798,7 +5317,7 @@ export class WarehouseInventoryService {
     truckDriverName?: string | null;
     truckType?: string | null;
     truckGateOut?: string | null;
-    truckWeightKg?: number | null;
+    truckWeightTons?: number | null;
   }): string {
     const esc = (value: unknown) =>
       String(value ?? '-')
@@ -4825,8 +5344,8 @@ export class WarehouseInventoryService {
       ['Quantity', data.quantity],
       [
         data.truckPlateNumber ? 'Gross Weight (Loaded on Truck)' : 'Declared Weight',
-        `${(data.truckPlateNumber && data.truckWeightKg
-          ? data.truckWeightKg
+        `${(data.truckPlateNumber && data.truckWeightTons
+          ? data.truckWeightTons
           : data.weight
         ).toLocaleString()} t`,
       ],
@@ -4952,10 +5471,11 @@ export class WarehouseInventoryService {
     releaseDate: Date | null;
     trainSchedule: string | null;
     lastMileDeliveryAddress: string | null;
+    truckPlate?: string | null;
     customerApproval: {
       approvedAt: string;
       signerDisplayName: string;
-      signatureImageUrl: string;
+      signatureImageUrl: string | null;
     } | null;
   }): string {
     const esc = (value: unknown) =>
@@ -5001,6 +5521,7 @@ export class WarehouseInventoryService {
       ['Release Order', data.releaseOrderReference],
       ['Release Date', fmt(data.releaseDate)],
       ['Last-mile Delivery Address', data.lastMileDeliveryAddress],
+      ...(data.truckPlate ? [['Delivering Truck Plate', data.truckPlate]] : []),
     ];
     const approval = data.customerApproval;
 
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-yards.controller.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-yards.controller.ts
index fdfbc36be..5f4205815 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-yards.controller.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-yards.controller.ts
@@ -1,7 +1,7 @@
 import { Body, Controller, Get, Param, ParseUUIDPipe, Patch, Post } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 
-import { BookingStaff } from '../../common/booking-guards';
+import { BookingStaff, StaffReference } from '../../common/booking-guards';
 import { FREIGHT_PERMS } from '../../seed/freight-permissions.registry';
 import { CreateWarehouseZoneDto } from './dto/create-warehouse-zone.dto';
 import { UpdateWarehouseYardDto } from './dto/update-warehouse-yard.dto';
@@ -10,8 +10,9 @@ import { WarehouseZonesService } from './warehouse-zones.service';
 
 @ApiTags('warehouse-yards')
 @ApiBearerAuth()
+// No class-level guard: the two reference GETs are open to any signed-in
+// staff (StaffReference), every other route carries its own permission.
 @Controller('warehouse-yards')
-@BookingStaff(FREIGHT_PERMS.warehouseYards.view)
 export class WarehouseYardsController {
   constructor(
     private readonly yardsService: WarehouseYardsService,
@@ -19,12 +20,14 @@ export class WarehouseYardsController {
   ) {}
 
   @Get()
+  @StaffReference()
   @ApiOperation({ summary: 'List all warehouse yards' })
   findAll() {
     return this.yardsService.findAll();
   }
 
   @Get(':id')
+  @StaffReference()
   @ApiOperation({ summary: 'Get warehouse yard by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.yardsService.findById(id);
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-yards.service.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-yards.service.ts
index 3279e9092..5b5e2b227 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-yards.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-yards.service.ts
@@ -1,4 +1,4 @@
-import { ConflictException, Injectable, NotFoundException } from '@nestjs/common';
+import { BadRequestException, ConflictException, Injectable, NotFoundException } from '@nestjs/common';
 
 import { CreateWarehouseYardDto } from './dto/create-warehouse-yard.dto';
 import { UpdateWarehouseYardDto } from './dto/update-warehouse-yard.dto';
@@ -44,6 +44,7 @@ export class WarehouseYardsService {
     // Ensure the parent warehouse exists.
     await this.warehousesService.findById(warehouseId);
     await this.assertCodeUnique(warehouseId, dto.code.trim());
+    await this.assertCapacityWithinWarehouse(warehouseId, dto.capacityWeight ?? null, dto.capacityContainers ?? null);
 
     return this.yardsRepository.create({
       warehouseId,
@@ -69,14 +70,22 @@ export class WarehouseYardsService {
       await this.assertCodeUnique(existing.warehouseId, dto.code.trim(), id);
     }
 
+    const newCapacityWeight = dto.capacityWeight ?? existing.capacityWeight ?? null;
+    const newCapacityContainers = dto.capacityContainers ?? existing.capacityContainers ?? null;
+
+    // Validate updated capacity doesn't exceed warehouse limits
+    if (newCapacityWeight !== (existing.capacityWeight ?? null) || newCapacityContainers !== (existing.capacityContainers ?? null)) {
+      await this.assertCapacityWithinWarehouse(existing.warehouseId, newCapacityWeight, newCapacityContainers, id);
+    }
+
     const status = dto.status ?? existing.status;
 
     const updated = await this.yardsRepository.update(id, {
       name: dto.name?.trim() ?? existing.name,
       code: dto.code?.trim() ?? existing.code,
       type: dto.type ?? existing.type,
-      capacityWeight: dto.capacityWeight ?? existing.capacityWeight,
-      capacityContainers: dto.capacityContainers ?? existing.capacityContainers,
+      capacityWeight: newCapacityWeight,
+      capacityContainers: newCapacityContainers,
       maxWeight: dto.maxWeight ?? existing.maxWeight,
       maxVolume: dto.maxVolume ?? existing.maxVolume,
       status,
@@ -97,4 +106,39 @@ export class WarehouseYardsService {
       throw new ConflictException(`Yard code ${code} already exists in this warehouse`);
     }
   }
+
+  private async assertCapacityWithinWarehouse(
+    warehouseId: string,
+    newCapacityWeight: number | null,
+    newCapacityContainers: number | null,
+    excludeYardId?: string,
+  ): Promise<void> {
+    const warehouse = await this.warehousesService.findById(warehouseId);
+    const yards = await this.findByWarehouse(warehouseId);
+
+    // Sum existing yard capacities, excluding the yard being updated if provided
+    const otherYards = excludeYardId ? yards.filter((y) => y.id !== excludeYardId) : yards;
+    const totalExistingWeight = otherYards.reduce((sum, y) => sum + (y.capacityWeight ?? 0), 0);
+    const totalExistingContainers = otherYards.reduce((sum, y) => sum + (y.capacityContainers ?? 0), 0);
+
+    // Check weight capacity
+    if (newCapacityWeight !== null && warehouse.capacityWeight != null) {
+      const totalWeight = totalExistingWeight + newCapacityWeight;
+      if (totalWeight > warehouse.capacityWeight) {
+        throw new BadRequestException(
+          `Total yard weight capacity (${totalWeight}t) exceeds warehouse limit (${warehouse.capacityWeight}t)`,
+        );
+      }
+    }
+
+    // Check container capacity
+    if (newCapacityContainers !== null && warehouse.capacityContainers != null) {
+      const totalContainers = totalExistingContainers + newCapacityContainers;
+      if (totalContainers > warehouse.capacityContainers) {
+        throw new BadRequestException(
+          `Total yard container capacity (${totalContainers}) exceeds warehouse limit (${warehouse.capacityContainers})`,
+        );
+      }
+    }
+  }
 }
diff --git a/apps/edr-freight-api/src/modules/warehouses/warehouse-zones.service.ts b/apps/edr-freight-api/src/modules/warehouses/warehouse-zones.service.ts
index b4ae2e0de..367a5a75e 100644
--- a/apps/edr-freight-api/src/modules/warehouses/warehouse-zones.service.ts
+++ b/apps/edr-freight-api/src/modules/warehouses/warehouse-zones.service.ts
@@ -1,4 +1,4 @@
-import { ConflictException, Injectable, NotFoundException } from '@nestjs/common';
+import { BadRequestException, ConflictException, Injectable, NotFoundException } from '@nestjs/common';
 
 import { CreateWarehouseZoneDto } from './dto/create-warehouse-zone.dto';
 import { UpdateWarehouseZoneDto } from './dto/update-warehouse-zone.dto';
@@ -43,6 +43,7 @@ export class WarehouseZonesService {
     // Ensure the parent yard exists.
     await this.yardsService.findById(yardId);
     await this.assertCodeUnique(yardId, dto.code.trim());
+    await this.assertCapacityWithinYard(yardId, dto.capacityWeight ?? null, dto.capacityContainers ?? null);
 
     return this.zonesRepository.create({
       yardId,
@@ -68,14 +69,22 @@ export class WarehouseZonesService {
       await this.assertCodeUnique(existing.yardId, dto.code.trim(), id);
     }
 
+    const newCapacityWeight = dto.capacityWeight ?? existing.capacityWeight ?? null;
+    const newCapacityContainers = dto.capacityContainers ?? existing.capacityContainers ?? null;
+
+    // Validate updated capacity doesn't exceed yard limits
+    if (newCapacityWeight !== (existing.capacityWeight ?? null) || newCapacityContainers !== (existing.capacityContainers ?? null)) {
+      await this.assertCapacityWithinYard(existing.yardId, newCapacityWeight, newCapacityContainers, id);
+    }
+
     const status = dto.status ?? existing.status;
 
     const updated = await this.zonesRepository.update(id, {
       name: dto.name?.trim() ?? existing.name,
       code: dto.code?.trim() ?? existing.code,
       type: dto.type ?? existing.type,
-      capacityWeight: dto.capacityWeight ?? existing.capacityWeight,
-      capacityContainers: dto.capacityContainers ?? existing.capacityContainers,
+      capacityWeight: newCapacityWeight,
+      capacityContainers: newCapacityContainers,
       maxWeight: dto.maxWeight ?? existing.maxWeight,
       maxVolume: dto.maxVolume ?? existing.maxVolume,
       status,
@@ -96,4 +105,39 @@ export class WarehouseZonesService {
       throw new ConflictException(`Zone code ${code} already exists in this yard`);
     }
   }
+
+  private async assertCapacityWithinYard(
+    yardId: string,
+    newCapacityWeight: number | null,
+    newCapacityContainers: number | null,
+    excludeZoneId?: string,
+  ): Promise<void> {
+    const yard = await this.yardsService.findById(yardId);
+    const zones = await this.findByYard(yardId);
+
+    // Sum existing zone capacities, excluding the zone being updated if provided
+    const otherZones = excludeZoneId ? zones.filter((z) => z.id !== excludeZoneId) : zones;
+    const totalExistingWeight = otherZones.reduce((sum, z) => sum + (z.capacityWeight ?? 0), 0);
+    const totalExistingContainers = otherZones.reduce((sum, z) => sum + (z.capacityContainers ?? 0), 0);
+
+    // Check weight capacity
+    if (newCapacityWeight !== null && yard.capacityWeight != null) {
+      const totalWeight = totalExistingWeight + newCapacityWeight;
+      if (totalWeight > yard.capacityWeight) {
+        throw new BadRequestException(
+          `Total zone weight capacity (${totalWeight}t) exceeds yard limit (${yard.capacityWeight}t)`,
+        );
+      }
+    }
+
+    // Check container capacity
+    if (newCapacityContainers !== null && yard.capacityContainers != null) {
+      const totalContainers = totalExistingContainers + newCapacityContainers;
+      if (totalContainers > yard.capacityContainers) {
+        throw new BadRequestException(
+          `Total zone container capacity (${totalContainers}) exceeds yard limit (${yard.capacityContainers})`,
+        );
+      }
+    }
+  }
 }
diff --git a/apps/edr-freight-api/src/seed/edr-freight.seed.ts b/apps/edr-freight-api/src/seed/edr-freight.seed.ts
index e6ea89fbe..7ebcfb89c 100644
--- a/apps/edr-freight-api/src/seed/edr-freight.seed.ts
+++ b/apps/edr-freight-api/src/seed/edr-freight.seed.ts
@@ -304,4 +304,6 @@ export const EDR_FREIGHT_POSITIONS: FreightSeedPosition[] = [
   { key: "djibouti_gl", name: { en: "Djibouti GL" }, rank: 3, permissionKeys: [...POSITION_PERMISSION_PRESETS.djiboutiGl] },
   { key: "marketer", name: { en: "Marketer" }, rank: 4, permissionKeys: [...POSITION_PERMISSION_PRESETS.marketer] },
   { key: "operation", name: { en: "Operation" }, rank: 4, permissionKeys: [...POSITION_PERMISSION_PRESETS.operation] },
+  { key: "operations_chief", name: { en: "Operations Chief" }, rank: 2, permissionKeys: [...POSITION_PERMISSION_PRESETS.operationsChief] },
+  { key: "dispatcher", name: { en: "Dispatcher" }, rank: 4, permissionKeys: [...POSITION_PERMISSION_PRESETS.dispatcher] },
 ];
diff --git a/apps/edr-freight-api/src/seed/freight-permissions.registry.ts b/apps/edr-freight-api/src/seed/freight-permissions.registry.ts
index 396ac95db..9871f6980 100644
--- a/apps/edr-freight-api/src/seed/freight-permissions.registry.ts
+++ b/apps/edr-freight-api/src/seed/freight-permissions.registry.ts
@@ -70,9 +70,15 @@ export const BOOKING_PERMISSIONS: FreightPermissionSeed[] = [
  */
 export const CONTRACT_PERMISSIONS: FreightPermissionSeed[] = [
   perm('a3000001-0001-4000-8000-000000000001', 'edr_freight_app:contracts:view', 'View contracts'),
-  perm('a3000001-0001-4000-8000-000000000002', 'edr_freight_app:contracts:staff_accept', 'Accept contract intake'),
-  perm('a3000001-0001-4000-8000-000000000003', 'edr_freight_app:contracts:request_changes', 'Request contract changes'),
-  perm('a3000001-0001-4000-8000-000000000004', 'edr_freight_app:contracts:reject', 'Reject contract'),
+  // Intake actions are split per freight type (bulk vs container) — fresh ids
+  // because the seeder upserts ON CONFLICT (key); reusing the old ids with new
+  // keys would PK-collide with the legacy staff_accept/request_changes/reject rows.
+  perm('a3000001-0001-4000-8000-000000000011', 'edr_freight_app:contracts:staff_accept:bulk', 'Accept bulk contract intake'),
+  perm('a3000001-0001-4000-8000-000000000012', 'edr_freight_app:contracts:staff_accept:container', 'Accept container contract intake'),
+  perm('a3000001-0001-4000-8000-000000000013', 'edr_freight_app:contracts:request_changes:bulk', 'Request bulk contract changes'),
+  perm('a3000001-0001-4000-8000-000000000014', 'edr_freight_app:contracts:request_changes:container', 'Request container contract changes'),
+  perm('a3000001-0001-4000-8000-000000000015', 'edr_freight_app:contracts:reject:bulk', 'Reject bulk contract'),
+  perm('a3000001-0001-4000-8000-000000000016', 'edr_freight_app:contracts:reject:container', 'Reject container contract'),
   perm('a3000001-0001-4000-8000-000000000005', 'edr_freight_app:contracts:approve_line_staff', 'Approve contract as line staff'),
   perm('a3000001-0001-4000-8000-000000000006', 'edr_freight_app:contracts:approve_director', 'Approve contract as director'),
   perm('a3000001-0001-4000-8000-000000000007', 'edr_freight_app:contracts:approve_ceo', 'Approve contract as CEO'),
@@ -212,6 +218,10 @@ export const FLEET_RAIL_PERMISSIONS: FreightPermissionSeed[] = [
   perm('e1f00001-0001-4000-8000-000000000002', 'edr_freight_app:cargoes:create', 'Create cargo'),
   perm('e1f00001-0001-4000-8000-000000000003', 'edr_freight_app:cargoes:update', 'Update cargo'),
   perm('e1f00001-0001-4000-8000-000000000004', 'edr_freight_app:cargoes:delete', 'Delete cargo'),
+  // NB: id prefixes must stay hex — 'e1g…' once crashed the boot seeder
+  // (postgres: invalid input syntax for type uuid).
+  perm('e1900001-0001-4000-8000-000000000001', 'edr_freight_app:consignments:view', 'View consignments'),
+  perm('e1900001-0001-4000-8000-000000000002', 'edr_freight_app:consignments:create', 'Create consignment'),
 ];
 
 // G. Fleet — road & telemetry
@@ -302,8 +312,6 @@ export const SCHEDULING_EXTRA_PERMISSIONS: FreightPermissionSeed[] = [
 
 // L. Administration & settings (split from the coarse admin umbrella)
 export const CONFIG_SETTINGS_PERMISSIONS: FreightPermissionSeed[] = [
-  perm('b3a00001-0001-4000-8000-000000000001', 'edr_freight_app:config:contract_validity:view', 'View contract validity periods'),
-  perm('b3a00001-0001-4000-8000-000000000002', 'edr_freight_app:config:contract_validity:manage', 'Manage contract validity periods'),
   perm('b4a00001-0001-4000-8000-000000000001', 'edr_freight_app:settings:file_upload:view', 'View file-upload settings'),
   perm('b4a00001-0001-4000-8000-000000000002', 'edr_freight_app:settings:file_upload:manage', 'Manage file-upload settings'),
   perm('b4b00001-0001-4000-8000-000000000001', 'edr_freight_app:settings:dropdown:view', 'View dropdown settings'),
@@ -371,9 +379,18 @@ export const FREIGHT_PERMS = {
   },
   contracts: {
     view: 'edr_freight_app:contracts:view',
-    staffAccept: 'edr_freight_app:contracts:staff_accept',
-    requestChanges: 'edr_freight_app:contracts:request_changes',
-    reject: 'edr_freight_app:contracts:reject',
+    staffAccept: {
+      bulk: 'edr_freight_app:contracts:staff_accept:bulk',
+      container: 'edr_freight_app:contracts:staff_accept:container',
+    },
+    requestChanges: {
+      bulk: 'edr_freight_app:contracts:request_changes:bulk',
+      container: 'edr_freight_app:contracts:request_changes:container',
+    },
+    reject: {
+      bulk: 'edr_freight_app:contracts:reject:bulk',
+      container: 'edr_freight_app:contracts:reject:container',
+    },
     approveLineStaff: 'edr_freight_app:contracts:approve_line_staff',
     approveDirector: 'edr_freight_app:contracts:approve_director',
     approveCeo: 'edr_freight_app:contracts:approve_ceo',
@@ -495,6 +512,10 @@ export const FREIGHT_PERMS = {
     update: 'edr_freight_app:cargoes:update',
     delete: 'edr_freight_app:cargoes:delete',
   },
+  consignments: {
+    view: 'edr_freight_app:consignments:view',
+    create: 'edr_freight_app:consignments:create',
+  },
   vehicles: {
     view: 'edr_freight_app:vehicles:view',
     create: 'edr_freight_app:vehicles:create',
@@ -594,12 +615,6 @@ export const FREIGHT_PERMS = {
     cancel: 'edr_freight_app:warehouse_fee_invoices:cancel',
     pay: 'edr_freight_app:warehouse_fee_invoices:pay',
   },
-  config: {
-    contractValidity: {
-      view: 'edr_freight_app:config:contract_validity:view',
-      manage: 'edr_freight_app:config:contract_validity:manage',
-    },
-  },
   settings: {
     fileUpload: {
       view: 'edr_freight_app:settings:file_upload:view',
@@ -661,9 +676,56 @@ export const FREIGHT_PERMS = {
   },
 } as const;
 
+/** Both arms of a freight-type-split permission (for one-of route guards). */
+export const bothFreightTypes = (p: { bulk: string; container: string }): string[] => [
+  p.bulk,
+  p.container,
+];
+
+/** The arm of a freight-type-split permission matching a contract's freightType. */
+export const forFreightType = (
+  p: { bulk: string; container: string },
+  freightType: string,
+): string => (freightType === 'BULK' ? p.bulk : p.container);
+
 const allRuleEngineViewKeys = () =>
   RULE_ENGINE_RESOURCE_SLUGS.map((s) => FREIGHT_PERMS.ruleEngine.view(s));
 
+/**
+ * Granular equivalents of the legacy fleet:view + fleet:manage pair.
+ * Deliberately excludes the wagon-transfer keys — those were always separate
+ * grants (requester vs OCC vs admin history), not part of fleet:manage.
+ */
+const FLEET_GRANULAR_KEYS: string[] = [
+  FREIGHT_PERMS.locomotives.view,
+  FREIGHT_PERMS.locomotives.create,
+  FREIGHT_PERMS.locomotives.update,
+  FREIGHT_PERMS.locomotives.delete,
+  FREIGHT_PERMS.wagons.view,
+  FREIGHT_PERMS.wagons.create,
+  FREIGHT_PERMS.wagons.update,
+  FREIGHT_PERMS.wagons.delete,
+  FREIGHT_PERMS.trains.view,
+  FREIGHT_PERMS.trains.create,
+  FREIGHT_PERMS.trains.update,
+  FREIGHT_PERMS.trains.delete,
+  FREIGHT_PERMS.trains.assignWagons,
+  FREIGHT_PERMS.routes.view,
+  FREIGHT_PERMS.routes.create,
+  FREIGHT_PERMS.routes.update,
+  FREIGHT_PERMS.routes.delete,
+  FREIGHT_PERMS.containers.view,
+  FREIGHT_PERMS.containers.create,
+  FREIGHT_PERMS.containers.update,
+  FREIGHT_PERMS.containers.delete,
+  FREIGHT_PERMS.cargoes.view,
+  FREIGHT_PERMS.cargoes.create,
+  FREIGHT_PERMS.cargoes.update,
+  FREIGHT_PERMS.cargoes.delete,
+  FREIGHT_PERMS.consignments.view,
+  FREIGHT_PERMS.consignments.create,
+];
+
 export const ROLE_PERMISSION_PRESETS = {
   // Marketing / line staff: drives a booking from intake through line-staff
   // approval and contract generation/signing — i.e. until the contract is ready
@@ -677,9 +739,9 @@ export const ROLE_PERMISSION_PRESETS = {
     FREIGHT_PERMS.bookings.rejectApproval,
     FREIGHT_PERMS.bookings.cancel,
     FREIGHT_PERMS.contracts.view,
-    FREIGHT_PERMS.contracts.staffAccept,
-    FREIGHT_PERMS.contracts.requestChanges,
-    FREIGHT_PERMS.contracts.reject,
+    ...bothFreightTypes(FREIGHT_PERMS.contracts.staffAccept),
+    ...bothFreightTypes(FREIGHT_PERMS.contracts.requestChanges),
+    ...bothFreightTypes(FREIGHT_PERMS.contracts.reject),
     FREIGHT_PERMS.contracts.approveLineStaff,
     ...allRuleEngineViewKeys(),
   ],
@@ -692,6 +754,7 @@ export const ROLE_PERMISSION_PRESETS = {
     FREIGHT_PERMS.trainScheduling.manage,
     FREIGHT_PERMS.fleet.view,
     FREIGHT_PERMS.fleet.manage,
+    ...FLEET_GRANULAR_KEYS,
     // Path A (no customs): Operations reviews the customer's self-clearance docs
     // — on the contract for ONE_TIME contracts, and PER BOOKING for GENERAL
     // contracts (booking-level document review → finalize → CLEARANCE_READY).
@@ -768,9 +831,9 @@ export const ROLE_PERMISSION_PRESETS = {
     FREIGHT_PERMS.bookings.reviewDocuments,
     FREIGHT_PERMS.bookings.finalizeClearance,
     FREIGHT_PERMS.contracts.view,
-    FREIGHT_PERMS.contracts.staffAccept,
-    FREIGHT_PERMS.contracts.requestChanges,
-    FREIGHT_PERMS.contracts.reject,
+    ...bothFreightTypes(FREIGHT_PERMS.contracts.staffAccept),
+    ...bothFreightTypes(FREIGHT_PERMS.contracts.requestChanges),
+    ...bothFreightTypes(FREIGHT_PERMS.contracts.reject),
     FREIGHT_PERMS.contracts.approveLineStaff,
     FREIGHT_PERMS.contracts.generateContract,
     FREIGHT_PERMS.contracts.signStaff,
@@ -804,6 +867,48 @@ export const POSITION_PERMISSION_PRESETS = {
     ...ROLE_PERMISSION_PRESETS.operationsOfficer,
     FREIGHT_PERMS.allocation.manage,
   ]),
+  // Operations Chief: full operational authority — the entire freight
+  // permission catalog (all CRUD across bookings, contracts, scheduling,
+  // fleet, warehouse, mile, finance, settings, staff).
+  operationsChief: dedupe([...BOOKING_RULE_ENGINE_PERMISSION_KEYS]),
+  // Dispatcher: full CRUD on warehouse management (incl. import/export/intercity
+  // inventory flows) and fleet management, plus truck dispatch on the mile legs
+  // and operational context. The ONE carve-out: allocation & fee rules stay
+  // VIEW-ONLY — a dispatcher never creates/updates/deletes those rules.
+  dispatcher: dedupe([
+    // Warehouse management — full CRUD.
+    FREIGHT_PERMS.warehouseDashboard.view,
+    ...Object.values(FREIGHT_PERMS.warehouses),
+    ...Object.values(FREIGHT_PERMS.warehouseYards),
+    ...Object.values(FREIGHT_PERMS.warehouseZones),
+    ...Object.values(FREIGHT_PERMS.warehouseInventory),
+    ...Object.values(FREIGHT_PERMS.warehouseInspectionReports),
+    ...Object.values(FREIGHT_PERMS.interchangeDocuments),
+    ...Object.values(FREIGHT_PERMS.warehouseFeeInvoices),
+    // View-only on the rules that govern allocation and fees.
+    FREIGHT_PERMS.warehouseAllocationRules.view,
+    FREIGHT_PERMS.warehouseFeeRules.view,
+    // Fleet management — full CRUD.
+    ...Object.values(FREIGHT_PERMS.fleet),
+    FREIGHT_PERMS.fleetDashboard.view,
+    ...Object.values(FREIGHT_PERMS.fleetReports),
+    ...Object.values(FREIGHT_PERMS.vehicles),
+    ...Object.values(FREIGHT_PERMS.drivers),
+    ...Object.values(FREIGHT_PERMS.tracking),
+    ...Object.values(FREIGHT_PERMS.fuel),
+    ...Object.values(FREIGHT_PERMS.maintenance),
+    ...Object.values(FREIGHT_PERMS.locomotives),
+    ...Object.values(FREIGHT_PERMS.wagons),
+    ...Object.values(FREIGHT_PERMS.trains),
+    ...Object.values(FREIGHT_PERMS.routes),
+    ...Object.values(FREIGHT_PERMS.containers),
+    ...Object.values(FREIGHT_PERMS.cargoes),
+    // Truck dispatch on the EDR mile legs + operational context.
+    ...Object.values(FREIGHT_PERMS.firstMile),
+    ...Object.values(FREIGHT_PERMS.lastMile),
+    FREIGHT_PERMS.trainScheduling.view,
+    FREIGHT_PERMS.bookings.operations,
+  ]),
 } as const;
 
 /** Derive the module bucket from the resource segment of a permission key. */
diff --git a/apps/edr-freight-api/src/seed/pricing-data.seeder.ts b/apps/edr-freight-api/src/seed/pricing-data.seeder.ts
index 072c559c6..7bbf2b0cb 100644
--- a/apps/edr-freight-api/src/seed/pricing-data.seeder.ts
+++ b/apps/edr-freight-api/src/seed/pricing-data.seeder.ts
@@ -416,9 +416,11 @@ private async seedWeightLimits(wlRepo: any, ctRepo: any): Promise<void> {
       { appliesTo: "OTHER", trigger: "WITH_RETURN", rateType: "RETURN_SURCHARGE", rateValue: 20, rateUnit: "PER_CONTAINER" },
       { appliesTo: "OTHER", trigger: "SHIPPING_LINE", rateType: "DOUBLE_HANDLING", rateValue: 100, rateUnit: "PER_CONTAINER" },
       { appliesTo: "OTHER", trigger: "CONSOLIDATION", rateType: "LASHING", rateValue: 50, rateUnit: "PER_CONTAINER" },
-      // Cargo-securing / lashing — flat fee, billed once per booking whose
-      // cargo type has hasLashing = true.
-      { appliesTo: "OTHER", trigger: "LASHING", rateType: "LASHING", rateValue: 40, rateUnit: "FLAT" },
+      // Cargo-securing / lashing — bulk-only, fires when the cargo type has
+      // hasLashing. Sold per direction; commodity-wide catch-alls seeded here,
+      // commodity-specific rates are configured by the rates team.
+      { appliesTo: "OTHER", trigger: "LASHING", rateType: "LASHING", tradeDirection: "IMPORT", rateValue: 40, rateUnit: "PER_TON" },
+      { appliesTo: "OTHER", trigger: "LASHING", rateType: "LASHING", tradeDirection: "EXPORT", rateValue: 40, rateUnit: "PER_TON" },
       // ── First/last-mile road haulage (per km) — drives the mile invoices ──
       { appliesTo: "OTHER", trigger: "ALWAYS", rateType: "FIRST_MILE", rateValue: 20, rateUnit: "PER_KM" },
       { appliesTo: "OTHER", trigger: "ALWAYS", rateType: "LAST_MILE", rateValue: 25, rateUnit: "PER_KM" },
diff --git a/apps/edr-freight-web/backoffice/src/App.tsx b/apps/edr-freight-web/backoffice/src/App.tsx
index 86f5bf6e6..bb4d024c8 100644
--- a/apps/edr-freight-web/backoffice/src/App.tsx
+++ b/apps/edr-freight-web/backoffice/src/App.tsx
@@ -146,11 +146,13 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
         label: "Overview",
         href: "/dashboard/overview",
         icon: <LayoutDashboard />,
+        permission: FREIGHT_PERMS.overview.view,
       },
       {
         label: "Customers",
         href: "/dashboard/customers",
         icon: <Building2 />,
+        permission: FREIGHT_PERMS.customers.view,
       },
       {
         label: "Contracts",
@@ -162,6 +164,7 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
         label: "Bookings",
         href: "/dashboard/booking-requests",
         icon: <FileText />,
+        permission: FREIGHT_PERMS.bookings.view,
       },
       // Operations hub: clearance-document review for contracts WITHOUT
       // customs clearing (contract-level for one-time, per-booking for general).
@@ -187,6 +190,7 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
         label: "Support",
         href: "/dashboard/support",
         icon: <LifeBuoy />,
+        permission: FREIGHT_PERMS.support.view,
       },
       ...demoItems,
     ],
@@ -267,19 +271,19 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
             label: "Routes",
             href: "/dashboard/routes",
             icon: <Network />,
-            permission: FREIGHT_PERMS.fleet.view,
+            permission: [FREIGHT_PERMS.routes.view, FREIGHT_PERMS.fleet.view],
           },
           {
             label: "Locomotives",
             href: "/dashboard/locomotives",
             icon: <Train />,
-            permission: FREIGHT_PERMS.fleet.view,
+            permission: [FREIGHT_PERMS.locomotives.view, FREIGHT_PERMS.fleet.view],
           },
           {
             label: "Train Builder",
             href: "/dashboard/train-builder",
             icon: <Hammer />,
-            permission: FREIGHT_PERMS.fleet.view,
+            permission: [FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view],
           },
 
           // {
@@ -291,7 +295,7 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
             label: "Wagons",
             href: "/dashboard/wagons",
             icon: <Truck />,
-            permission: FREIGHT_PERMS.fleet.view,
+            permission: [FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.fleet.view],
           },
           {
             label: "Vehicles",
@@ -375,31 +379,37 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
         label: "Imports",
         href: "/dashboard/import-warehouse",
         icon: <PackageOpen />,
+        permission: FREIGHT_PERMS.warehouseInventory.view,
         children: [
           {
             label: "Import Overview",
             href: "/dashboard/import-warehouse",
             icon: <PackageOpen />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
           {
             label: "Arrival Queue",
             href: "/dashboard/arrival-queue",
             icon: <PackageOpen />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
           {
             label: "Dispatch Queue",
             href: "/dashboard/dispatch-queue",
             icon: <Send />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
           {
             label: "Terminal Inventory",
             href: "/dashboard/warehouse-inventory?direction=IMPORT",
             icon: <Package />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
           {
             label: "Inventory Inquiry",
             href: "/dashboard/inventory-inquiry",
             icon: <Boxes />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
         ],
       },
@@ -407,41 +417,49 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
         label: "Exports",
         href: "/dashboard/export-warehouse",
         icon: <Truck />,
+        permission: FREIGHT_PERMS.warehouseInventory.view,
         children: [
           {
             label: "Export Overview",
             href: "/dashboard/export-warehouse",
             icon: <Truck />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
           {
             label: "Loading Queue",
             href: "/dashboard/loading-queue",
             icon: <Truck />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
           {
             label: "Loaded Inventory",
             href: "/dashboard/loaded-inventory",
             icon: <PackageCheck />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
           {
             label: "Dispatch Queue",
             href: "/dashboard/dispatch-queue",
             icon: <Send />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
           {
             label: "Djibouti Unloading",
             href: "/dashboard/export-djibouti-unloading",
             icon: <PackageOpen />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
           {
             label: "Interchange Documents",
             href: "/dashboard/interchange-documents",
             icon: <FileText />,
+            permission: FREIGHT_PERMS.interchangeDocuments.view,
           },
           {
             label: "Terminal Inventory",
             href: "/dashboard/warehouse-inventory?direction=EXPORT",
             icon: <Package />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
         ],
       },
@@ -449,11 +467,13 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
         label: "Intercity",
         href: "/dashboard/intercity",
         icon: <TrainFront />,
+        permission: FREIGHT_PERMS.trainScheduling.view,
         children: [
           {
             label: "Intercity Cargo",
             href: "/dashboard/intercity",
             icon: <TrainFront />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
         ],
       },
@@ -465,6 +485,7 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
             label: "Warehouse Dashboard",
             href: "/dashboard/warehouse-dashboard",
             icon: <LayoutDashboard />,
+            permission: FREIGHT_PERMS.warehouseDashboard.view,
           },
           {
             // Yard-wide, not per-direction: the gate sees import and export
@@ -472,21 +493,28 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
             label: "Trucks on Site",
             href: "/dashboard/trucks-on-site",
             icon: <Truck />,
+            permission: FREIGHT_PERMS.warehouseInventory.view,
           },
           {
             label: "Warehouses",
             href: "/dashboard/warehouses",
             icon: <Container />,
+            permission: FREIGHT_PERMS.warehouses.view,
           },
           {
             label: "Allocation & Fees",
             href: "/dashboard/warehouse-rules",
             icon: <SlidersHorizontal />,
+            permission: [
+              FREIGHT_PERMS.warehouseAllocationRules.view,
+              FREIGHT_PERMS.warehouseFeeRules.view,
+            ],
           },
           {
             label: "Fee Invoices",
             href: "/dashboard/warehouse-fee-invoices",
             icon: <Wallet />,
+            permission: FREIGHT_PERMS.warehouseFeeInvoices.view,
           },
         ],
       },
@@ -520,13 +548,10 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
         icon: <Boxes />,
         children: [
           ...getCategorySidebarChildren("configuration"),
-          {
-            label: "Contract validity",
-            href: "/dashboard/configuration/contract-validity-periods",
-          },
           {
             label: "Train scheduling rules",
             href: "/dashboard/configuration/train-scheduling-rules",
+            permission: FREIGHT_PERMS.trainScheduling.rulesManage,
           },
         ],
       },
@@ -541,6 +566,12 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
         label: "Staff",
         href: "/user-management",
         icon: <Users />,
+        permission: [
+          FREIGHT_PERMS.admin,
+          FREIGHT_PERMS.staff.roles.view,
+          FREIGHT_PERMS.staff.employeeRegistration.view,
+          FREIGHT_PERMS.staff.roleAssignment.view,
+        ],
       },
     ],
   },
@@ -550,6 +581,16 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
 const ET_CLEARANCE_HREF = "/dashboard/contracts/clearance";
 const DJ_CLEARANCE_HREF = "/dashboard/gl-djibouti/clearance";
 
+// Routes a GL officer may reach beyond their clearance hub. Path B booking is
+// part of their job (create/rebook under a cleared contract, then view that
+// booking's clearance), but those routes live outside the clearance prefix —
+// without this allowlist the single-prefix lock bounces them out of their own
+// workflow. Matched against location.pathname (no query string).
+const GL_WORKFLOW_PATH_PATTERNS: RegExp[] = [
+  /^\/dashboard\/contracts\/[^/]+\/create-booking(\/|$)/,
+  /^\/dashboard\/bookings\/[^/]+\/clearance(\/|$)/,
+];
+
 const isEtClearanceItem = (item: SidebarItem): boolean =>
   item.href === ET_CLEARANCE_HREF;
 const isDjClearanceItem = (item: SidebarItem): boolean =>
@@ -585,21 +626,34 @@ const filterSidebarByPermission = (
     return keys.some((key) => hasFreightPermission(user, key));
   };
 
-  const itemAllowed = (item: SidebarItem): boolean => {
-    // GL positions are locked to their single clearance page.
-    if (etGl) return isEtClearanceItem(item);
-    if (djGl) return isDjClearanceItem(item);
-
-    // Everyone else: hide the GL-only clearance pages entirely.
-    if (isClearanceItem(item)) return false;
-
-    return permissionAllowed(item);
-  };
+  // Recursive: children are filtered first; a group (item with children) stays
+  // only while it still has visible children — so parents without their own
+  // permission key never leak a whole subtree the user cannot open.
+  const filterItems = (items: SidebarItem[]): SidebarItem[] =>
+    items
+      .map((item) =>
+        item.children
+          ? { ...item, children: filterItems(item.children) }
+          : item,
+      )
+      .filter((item) => {
+        if (etGl || djGl) {
+          // GL positions are locked to their single clearance page (parents
+          // survive only as the path to that page).
+          const isTarget = etGl ? isEtClearanceItem : isDjClearanceItem;
+          return isTarget(item) || (item.children?.length ?? 0) > 0;
+        }
+        // Everyone else: hide the GL-only clearance pages entirely.
+        if (isClearanceItem(item)) return false;
+        if (!permissionAllowed(item)) return false;
+        if (item.children) return item.children.length > 0;
+        return true;
+      });
 
   return sections
     .map((section) => ({
       ...section,
-      items: section.items.filter(itemAllowed),
+      items: filterItems(section.items),
     }))
     .filter((section) => section.items.length > 0);
 };
@@ -672,7 +726,11 @@ const DashboardShell = () => {
     document.title = activeLabel ? `${activeLabel} | ${APP_TITLE}` : APP_TITLE;
   }, [location.pathname, sidebarSections]);
 
-  if (glClearanceHome && !location.pathname.startsWith(glClearanceHome)) {
+  if (
+    glClearanceHome &&
+    !location.pathname.startsWith(glClearanceHome) &&
+    !GL_WORKFLOW_PATH_PATTERNS.some((re) => re.test(location.pathname))
+  ) {
     return <Navigate to={glClearanceHome} replace />;
   }
 
@@ -708,7 +766,7 @@ const App = () => {
         <Route path="/forgot-password" element={<ForgotPasswordPage />} />
         {/* <Route path="/um/*" element={<UserManagementHostPage />} /> */}
         <Route path="um/set-password" element={<SetPassword />} />
-        <Route path="/callback" element={<FaydaCallbackPage />} />
+        <Route path="/fayda/callback" element={<FaydaCallbackPage />} />
         <Route path="*" element={<Navigate to="/auth" replace />} />
       </Routes>
     );
@@ -744,8 +802,22 @@ const App = () => {
           }
         />
         <Route path="support" element={<SupportInboxPage />} />
-        <Route path="customers" element={<CustomersPage />} />
-        <Route path="customers/:id" element={<CustomerDetailPage />} />
+        <Route
+          path="customers"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.customers.view}>
+              <CustomersPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="customers/:id"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.customers.view}>
+              <CustomerDetailPage />
+            </RequirePermission>
+          }
+        />
         <Route
           path="invoices"
           element={
@@ -1055,7 +1127,7 @@ const App = () => {
         <Route
           path="routes"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.routes.view, FREIGHT_PERMS.fleet.view]}>
               <RoutesPage />
             </RequirePermission>
           }
@@ -1063,7 +1135,7 @@ const App = () => {
         <Route
           path="locomotives"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.locomotives.view, FREIGHT_PERMS.fleet.view]}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1071,7 +1143,7 @@ const App = () => {
         <Route
           path="trains"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1079,7 +1151,7 @@ const App = () => {
         <Route
           path="trains/:id"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
               <TrainDetailPage />
             </RequirePermission>
           }
@@ -1087,7 +1159,7 @@ const App = () => {
         <Route
           path="train-builder"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
               <TrainBuilderListPage />
             </RequirePermission>
           }
@@ -1095,7 +1167,7 @@ const App = () => {
         <Route
           path="train-builder/:id"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
               <TrainBuilderDetailPage />
             </RequirePermission>
           }
@@ -1103,7 +1175,7 @@ const App = () => {
         <Route
           path="wagons"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.fleet.view]}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1111,7 +1183,7 @@ const App = () => {
         <Route
           path="containers"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.containers.view, FREIGHT_PERMS.fleet.view]}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1119,7 +1191,7 @@ const App = () => {
         <Route
           path="cargoes"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.cargoes.view, FREIGHT_PERMS.fleet.view]}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1205,7 +1277,7 @@ const App = () => {
         <Route
           path="routes"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.routes.view, FREIGHT_PERMS.fleet.view]}>
               <RoutesPage />
             </RequirePermission>
           }
@@ -1293,7 +1365,7 @@ const App = () => {
         <Route
           path="locomotives"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.locomotives.view, FREIGHT_PERMS.fleet.view]}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1301,7 +1373,7 @@ const App = () => {
         <Route
           path="trains"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1309,7 +1381,7 @@ const App = () => {
         <Route
           path="trains/:id"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
               <TrainDetailPage />
             </RequirePermission>
           }
@@ -1317,7 +1389,7 @@ const App = () => {
         <Route
           path="train-builder"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
               <TrainBuilderListPage />
             </RequirePermission>
           }
@@ -1325,7 +1397,7 @@ const App = () => {
         <Route
           path="train-builder/:id"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.trains.view, FREIGHT_PERMS.fleet.view]}>
               <TrainBuilderDetailPage />
             </RequirePermission>
           }
@@ -1333,7 +1405,7 @@ const App = () => {
         <Route
           path="wagons"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.wagons.view, FREIGHT_PERMS.fleet.view]}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1341,7 +1413,7 @@ const App = () => {
         <Route
           path="containers"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.containers.view, FREIGHT_PERMS.fleet.view]}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1349,7 +1421,7 @@ const App = () => {
         <Route
           path="cargoes"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.fleet.view}>
+            <RequirePermission permission={[FREIGHT_PERMS.cargoes.view, FREIGHT_PERMS.fleet.view]}>
               <FleetResourcePage />
             </RequirePermission>
           }
@@ -1416,14 +1488,14 @@ const App = () => {
             </RequirePermission>
           }
         />
-        <Route
+        {/* <Route
           path="configuration/contract-validity-periods"
           element={
             <RequirePermission permission={FREIGHT_PERMS.admin}>
               <ContractValidityPeriodsPage />
             </RequirePermission>
           }
-        />
+        /> */}
         <Route path="configuration/cargo-types" element={<CargoTypesPage />} />
         <Route
           path="configuration/cargo-types/:id"
diff --git a/apps/edr-freight-web/backoffice/src/auth/types.ts b/apps/edr-freight-web/backoffice/src/auth/types.ts
index 2dac243b4..a361c2abc 100644
--- a/apps/edr-freight-web/backoffice/src/auth/types.ts
+++ b/apps/edr-freight-web/backoffice/src/auth/types.ts
@@ -23,6 +23,7 @@ interface AuthEmployeePosition {
   permissions?: AuthPermission[];
   /** Some IAM payloads nest the position record instead of flattening its key. */
   position?: { id?: string; key?: string; name?: LocaleText };
+  positionType?: { id?: string; key?: string; name?: LocaleText } | null;
 }
 
 interface AuthEmployeeRecord {
diff --git a/apps/edr-freight-web/backoffice/src/components/cargoes/DeliverCargoDialog.tsx b/apps/edr-freight-web/backoffice/src/components/cargoes/DeliverCargoDialog.tsx
index 546bd0def..6591ffa7c 100644
--- a/apps/edr-freight-web/backoffice/src/components/cargoes/DeliverCargoDialog.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/cargoes/DeliverCargoDialog.tsx
@@ -9,6 +9,7 @@ import { Textarea } from '@/components/ui/textarea';
 import { useMutation } from '@tanstack/react-query';
 import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
+import { isBackdated, nowLocalDateTimeInput } from '@/lib/no-backdate';
 
 /**
  * Customer Pickup + Proof of Delivery capture for a LOADED cargo.
@@ -27,6 +28,10 @@ export function DeliverCargoDialog({ cargoId, onSuccess }: { cargoId: string; on
       toast({ title: 'Receiver name is required', variant: 'destructive' });
       return;
     }
+    if (isBackdated(pickupDate)) {
+      toast({ title: 'Pickup date cannot be in the past', variant: 'destructive' });
+      return;
+    }
     try {
       await deliver.mutateAsync({
         id: cargoId,
@@ -75,6 +80,7 @@ export function DeliverCargoDialog({ cargoId, onSuccess }: { cargoId: string; on
             <Label>Pickup date</Label>
             <Input
               type="datetime-local"
+              min={nowLocalDateTimeInput()}
               value={pickupDate}
               onChange={(e) => setPickupDate(e.target.value)}
             />
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/ContractActionsToolbar.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/ContractActionsToolbar.tsx
index 7896da730..cc2bfb0fb 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/ContractActionsToolbar.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/ContractActionsToolbar.tsx
@@ -14,6 +14,8 @@ import {
 } from "lucide-react";
 import type { Freight } from "@edr/types";
 
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 import { api } from "@/services/api";
 import { contractsService } from "@/services/contracts.service";
 import { SectionCard } from "@/components/bookings/detail/SectionCard";
@@ -48,8 +50,19 @@ export function ContractActionsToolbar({
   onReviewClearance,
 }: ContractActionsToolbarProps) {
   const navigate = useNavigate();
+  const { user } = useAuth();
   const { status } = contract;
 
+  // Intake permissions are split per freight type: an accept:bulk holder must
+  // not see the accept button on a container contract (API enforces the same).
+  const arm = contract.freightType === "BULK" ? "bulk" : "container";
+  const mayAccept = hasPermission(user, FREIGHT_PERMS.contracts.staffAccept[arm]);
+  const mayRequestChanges = hasPermission(
+    user,
+    FREIGHT_PERMS.contracts.requestChanges[arm],
+  );
+  const mayReject = hasPermission(user, FREIGHT_PERMS.contracts.reject[arm]);
+
   const [editorOpen, setEditorOpen] = useState(false);
   const [editorMode, setEditorMode] = useState<"accept" | "edit">("accept");
   const [previewOpen, setPreviewOpen] = useState(false);
@@ -97,7 +110,8 @@ export function ContractActionsToolbar({
     );
   }
 
-  const canAccept = status === "SUBMITTED";
+  const canAccept =
+    status === "SUBMITTED" && (mayAccept || mayRequestChanges || mayReject);
   // The document stays editable for the whole approval chain, but only by the
   // approver whose turn it is. The server resolves that against the caller's
   // position type; the client cannot derive it.
@@ -126,35 +140,41 @@ export function ContractActionsToolbar({
 
         {canAccept && (
           <>
-            <Button
-              fullWidth
-              color="edr-green"
-              leftSection={<Check size={16} />}
-              onClick={() => {
-                setEditorMode("accept");
-                setEditorOpen(true);
-              }}
-            >
-              Accept for approval
-            </Button>
-            <Button
-              fullWidth
-              variant="light"
-              color="orange"
-              leftSection={<MessageSquareWarning size={16} />}
-              onClick={() => setChangesOpen(true)}
-            >
-              Request changes
-            </Button>
-            <Button
-              fullWidth
-              variant="light"
-              color="red"
-              leftSection={<XCircle size={16} />}
-              onClick={() => setRejectOpen(true)}
-            >
-              Reject contract
-            </Button>
+            {mayAccept && (
+              <Button
+                fullWidth
+                color="edr-green"
+                leftSection={<Check size={16} />}
+                onClick={() => {
+                  setEditorMode("accept");
+                  setEditorOpen(true);
+                }}
+              >
+                Accept for approval
+              </Button>
+            )}
+            {mayRequestChanges && (
+              <Button
+                fullWidth
+                variant="light"
+                color="orange"
+                leftSection={<MessageSquareWarning size={16} />}
+                onClick={() => setChangesOpen(true)}
+              >
+                Request changes
+              </Button>
+            )}
+            {mayReject && (
+              <Button
+                fullWidth
+                variant="light"
+                color="red"
+                leftSection={<XCircle size={16} />}
+                onClick={() => setRejectOpen(true)}
+              >
+                Reject contract
+              </Button>
+            )}
           </>
         )}
 
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/ContractApprovalStepsCard.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/ContractApprovalStepsCard.tsx
index dcdfe6e39..25f877de3 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/ContractApprovalStepsCard.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/ContractApprovalStepsCard.tsx
@@ -16,6 +16,8 @@ import type { Freight } from "@edr/types";
 import { formatContractApprovalProgress } from "@/features/contracts/contract-approval-progress";
 import { SectionCard } from "@/components/bookings/detail/SectionCard";
 import type { useContractMutations } from "@/hooks/contracts/useContracts";
+import { useAuth } from "@/auth/useAuth";
+import { canApproveContractStep } from "@/lib/permissions";
 
 type Mutations = ReturnType<typeof useContractMutations>;
 
@@ -29,6 +31,7 @@ export function ContractApprovalStepsCard({
   contract,
   mutations,
 }: ContractApprovalStepsCardProps) {
+  const { user } = useAuth();
   const [confirmOpen, setConfirmOpen] = useState(false);
   const [pendingStep, setPendingStep] =
     useState<Freight.IContractApprovalStep | null>(null);
@@ -166,6 +169,10 @@ export function ContractApprovalStepsCard({
                 key={step.id}
                 step={step}
                 isNext={actionable && nextPending?.id === step.id}
+                // Buttons show only to the step's actual approver (matching
+                // position type): a chief step never offers Approve/Reject to a
+                // marketing officer. Everyone still sees the "next" highlight.
+                canAct={canApproveContractStep(user, step.requiredRole)}
                 isPending={
                   mutations.approveStep.isPending ||
                   mutations.rejectStep.isPending
@@ -306,12 +313,14 @@ export function ContractApprovalStepsCard({
 function StepRow({
   step,
   isNext,
+  canAct,
   isPending,
   onApprove,
   onReject,
 }: {
   step: Freight.IContractApprovalStep;
   isNext: boolean;
+  canAct: boolean;
   isPending: boolean;
   onApprove: () => void;
   onReject: () => void;
@@ -372,8 +381,11 @@ function StepRow({
           )}
         </Box>
       </Group>
-      <Group gap="xs" wrap="nowrap" style={{ flexShrink: 0 }}>
-        {isNext && step.status === "PENDING" && (
+      {/* One element type per row: action buttons on the active step (they
+          already imply "pending & actionable"), a status badge otherwise.
+          Mixing compact buttons + a badge here made them read as misaligned. */}
+      <Group gap="xs" wrap="nowrap" align="center" style={{ flexShrink: 0 }}>
+        {isNext && canAct && step.status === "PENDING" ? (
           <>
             <Button
               size="compact-sm"
@@ -395,16 +407,17 @@ function StepRow({
               Reject
             </Button>
           </>
+        ) : (
+          <Badge
+            variant="light"
+            color={statusColor}
+            size="sm"
+            radius="sm"
+            tt="uppercase"
+          >
+            {step.status}
+          </Badge>
         )}
-        <Badge
-          variant="light"
-          color={statusColor}
-          size="sm"
-          radius="sm"
-          tt="uppercase"
-        >
-          {step.status}
-        </Badge>
       </Group>
     </Group>
   );
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/GlCreateBookingForm.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/GlCreateBookingForm.tsx
index bc9521dd3..fe04fba99 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/GlCreateBookingForm.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/GlCreateBookingForm.tsx
@@ -269,6 +269,8 @@ export default function GlCreateBookingForm() {
   const [scheduledDate, setScheduledDate] = useState("");
   const [contractRouteId, setContractRouteId] = useState<string | null>(null);
   const [notes, setNotes] = useState("");
+  // What the containers carry — captured per booking (moved off the contract).
+  const [cargoDescription, setCargoDescription] = useState("");
   const [containerLines, setContainerLines] = useState<ContainerLineDraft[]>([]);
   const [bulk, setBulk] = useState<BulkDraft>({
     cargoWeightTons: "",
@@ -459,6 +461,10 @@ export default function GlCreateBookingForm() {
       );
     };
     setPrefilled(true);
+    // Rebook carries the expired booking's cargo description forward.
+    if (copyFromBooking.cargoFreeText) {
+      setCargoDescription(copyFromBooking.cargoFreeText);
+    }
     setContainerLines(
       lines.map((c) => {
         const qty = Math.max(1, c.quantity);
@@ -705,14 +711,23 @@ export default function GlCreateBookingForm() {
 
   const lineErrors = useMemo<LineErrors[]>(() => {
     if (!isContainer || !contract) return [];
-    return containerLines.map((line) => {
+    // A line can be 0 (the contract covers both sizes; a booking may only need
+    // one) but the booking as a whole needs at least one container — anchor
+    // that error on the first line's quantity so it renders in the field.
+    const totalQty = containerLines.reduce(
+      (sum, l) => sum + Math.max(0, Number(l.quantity) || 0),
+      0,
+    );
+    return containerLines.map((line, idx) => {
       const errs: LineErrors = {};
       const qty = Number(line.quantity || 0);
       if (line.quantity.trim() === "") {
         errs.quantity = "Quantity is required.";
-      } else if (Number.isNaN(qty) || qty < 1) {
-        errs.quantity = "At least 1.";
-      } else if (line.units.length < qty) {
+      } else if (Number.isNaN(qty) || qty < 0) {
+        errs.quantity = "Enter 0 or more.";
+      } else if (idx === 0 && totalQty < 1) {
+        errs.quantity = "Book at least one container (either size).";
+      } else if (qty >= 1 && line.units.length < qty) {
         errs.units = `Enter details for all ${qty} container(s).`;
       }
       if (contract.isHazardous) {
@@ -789,6 +804,11 @@ export default function GlCreateBookingForm() {
   const routeError =
     multiRoute && !contractRouteId ? "Select a route." : undefined;
 
+  const cargoDescriptionError =
+    isContainer && !cargoDescription.trim()
+      ? "Describe the cargo carried in the containers."
+      : undefined;
+
   const cargoValid = isContainer
     ? lineErrors.every(
         (e) =>
@@ -800,7 +820,8 @@ export default function GlCreateBookingForm() {
       ) &&
       unitErrors.every((line) =>
         line.every((e) => !e.containerNumber && !e.vgmTons),
-      )
+      ) &&
+      !cargoDescriptionError
     : !bulkErrors.quantity && !bulkErrors.hazardous && !bulkErrors.reefer;
 
   const formValid = cargoValid && !hasOdd20ft && !dateError && !routeError;
@@ -827,6 +848,8 @@ export default function GlCreateBookingForm() {
     };
 
     if (isContainer) {
+      // What the containers carry — captured per booking, not on the contract.
+      if (cargoDescription.trim()) payload.cargoFreeText = cargoDescription.trim();
       payload.containers = containerLines
         .filter((l) => Number(l.quantity) >= 1)
         .map((l) => ({
@@ -1245,6 +1268,19 @@ export default function GlCreateBookingForm() {
               )}
               {remainderNotice}
               <ContractCapacityNotice contractId={contract.id} isContainer />
+              <Textarea
+                label="Cargo description *"
+                description="What do the containers carry on this shipment?"
+                placeholder="e.g. Electronics, garments, machinery spare parts…"
+                value={cargoDescription}
+                onChange={(e) => setCargoDescription(e.currentTarget.value)}
+                error={showErrors ? cargoDescriptionError : undefined}
+                radius={10}
+                autosize
+                minRows={2}
+                maxRows={4}
+                styles={fieldStyles}
+              />
               {containerLines.length === 0 ? (
                 <Text fz="sm" c="dimmed">
                   This contract has no container sizes in scope.
@@ -1264,7 +1300,7 @@ export default function GlCreateBookingForm() {
                         type="number"
                         onKeyDown={blockNegative}
                         label="Quantity *"
-                        min={1}
+                        min={0}
                         value={line.quantity}
                         error={
                           showErrors
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/gl-actions/IncidentReportCard.tsx b/apps/edr-freight-web/backoffice/src/components/contracts/gl-actions/IncidentReportCard.tsx
index 35a75d66c..088f65ba9 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/gl-actions/IncidentReportCard.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/gl-actions/IncidentReportCard.tsx
@@ -23,6 +23,7 @@ const INCIDENT_OPTIONS: { value: Freight.IncidentType; label: string }[] = [
   { value: "CONTAINER_OPENED", label: "Container opened" },
   { value: "CONTAINER_DAMAGED", label: "Container damaged" },
   { value: "FLUID_LEAKING", label: "Fluid leaking" },
+  { value: "OTHER", label: "Other" },
 ];
 
 const LABEL: Record<Freight.IncidentType, string> = {
@@ -30,6 +31,7 @@ const LABEL: Record<Freight.IncidentType, string> = {
   CONTAINER_OPENED: "Container opened",
   CONTAINER_DAMAGED: "Container damaged",
   FLUID_LEAKING: "Fluid leaking",
+  OTHER: "Other",
 };
 
 export function IncidentReportCard({ bookingId }: { bookingId: string }) {
diff --git a/apps/edr-freight-web/backoffice/src/components/contracts/gl-booking-form/total.ts b/apps/edr-freight-web/backoffice/src/components/contracts/gl-booking-form/total.ts
index 8c3e6f071..2b84d9483 100644
--- a/apps/edr-freight-web/backoffice/src/components/contracts/gl-booking-form/total.ts
+++ b/apps/edr-freight-web/backoffice/src/components/contracts/gl-booking-form/total.ts
@@ -65,8 +65,12 @@ export function computeGlShipmentTotal(
           (i) =>
             i.containerSize === line.containerSize &&
             i.unit === "per_container" &&
-            !i.conditionalOn,
-        ) ?? rateFor((i) => i.containerSize === line.containerSize);
+            !i.conditionalOn &&
+            !i.isClearance,
+        ) ??
+        rateFor(
+          (i) => i.containerSize === line.containerSize && !i.isClearance,
+        );
       if (rate) {
         lines.push({
           label: rate.label,
@@ -123,7 +127,12 @@ export function computeGlShipmentTotal(
   } else {
     const qty = q.bulkQuantity;
     const rate =
-      rateFor((i) => i.unit === "per_ton" || i.unit === "per_item") ?? items[0];
+      rateFor(
+        (i) =>
+          (i.unit === "per_ton" || i.unit === "per_item") &&
+          !i.isClearance &&
+          !i.conditionalOn,
+      ) ?? items[0];
     if (rate && qty > 0) {
       lines.push({
         label: rate.label,
@@ -159,6 +168,53 @@ export function computeGlShipmentTotal(
     }
   }
 
+  // Lashing / cargo securing — bulk-only, applies whenever the contract shows
+  // it (the commodity needs lashing). Per-ton scales by tonnage; per-wagon
+  // depends on the wagon capacity the train stocks — shown at real pricing.
+  const lashing = items.find((i) => i.conditionalOn === "has_lashing");
+  if (lashing && lashing.unit === "per_ton") {
+    const tons = q.bulkQuantity;
+    if (tons > 0) {
+      lines.push({
+        label: lashing.label,
+        unitPrice: lashing.unitPrice,
+        unit: lashing.unit,
+        quantity: tons,
+        amount: lashing.unitPrice * tons,
+      });
+    }
+  }
+
+  // Customs clearance service fee — billed on the booking invoice with the
+  // freight. Container fees estimate per size (per box, or per wagon: two 20ft
+  // share one); bulk per-ton scales by tonnage. Bulk per-wagon fees depend on
+  // the wagon capacity the train stocks — shown at real pricing, not estimated.
+  for (const cl of items.filter((i) => i.isClearance)) {
+    let qty = 0;
+    if (q.isContainer) {
+      const boxes = q.containers
+        .filter((c) => c.containerSize === cl.containerSize)
+        .reduce((s, c) => s + Number(c.quantity || 0), 0);
+      qty =
+        cl.unit === "per_wagon"
+          ? Math.ceil(boxes * (cl.containerSize === "40ft" ? 1 : 0.5))
+          : boxes;
+    } else if (cl.unit === "per_ton") {
+      qty = q.bulkQuantity;
+    } else if (cl.unit === "flat") {
+      qty = 1;
+    }
+    if (qty > 0) {
+      lines.push({
+        label: cl.label,
+        unitPrice: cl.unitPrice,
+        unit: cl.unit,
+        quantity: qty,
+        amount: cl.unitPrice * qty,
+      });
+    }
+  }
+
   const total = lines.reduce((s, l) => s + l.amount, 0);
   return { currency, lines, total };
 }
@@ -167,6 +223,7 @@ export function computeGlShipmentTotal(
 export function formatRateUnit(unit: Freight.ContractRateUnit | string): string {
   const map: Record<string, string> = {
     per_container: "container",
+    per_wagon: "wagon",
     per_ton: "ton",
     per_item: "item",
     per_km: "km",
diff --git a/apps/edr-freight-web/backoffice/src/components/customers/ChangeRequestReview.tsx b/apps/edr-freight-web/backoffice/src/components/customers/ChangeRequestReview.tsx
index c7893659b..ff99be149 100644
--- a/apps/edr-freight-web/backoffice/src/components/customers/ChangeRequestReview.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/customers/ChangeRequestReview.tsx
@@ -23,6 +23,8 @@ import {
 import { useState } from "react";
 import { useFileViewer } from "@edr/ui-common";
 
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 import { fetchViewableFile } from "@/services/files.service";
 import { api } from "@/services/api";
 import type { Company, CompanyChangeRequest } from "@/types/customer";
@@ -128,6 +130,8 @@ function DiffRow({
  * (with note) actions, plus a short history of past decisions.
  */
 export function ChangeRequestReview({ company }: { company: Company }) {
+  const { user } = useAuth();
+  const canReview = hasPermission(user, FREIGHT_PERMS.customers.verify);
   const query = useQuery(
     api.customers.changeRequests.queryOptions({ input: { id: company.id } }),
   );
@@ -323,25 +327,30 @@ export function ChangeRequestReview({ company }: { company: Company }) {
               </Stack>
             )}
 
-            <Group justify="flex-end" gap="sm">
-              <Button
-                variant="light"
-                color="red"
-                onClick={() => {
-                  setRejectId(pending.id);
-                  setNote("");
-                }}
-              >
-                Reject
-              </Button>
-              <Button
-                color="edr-green"
-                loading={approve.isPending}
-                onClick={() => approve.mutate({ id: pending.id })}
-              >
-                Approve changes
-              </Button>
-            </Group>
+            {/* Reviewing the diff is `customers:view`; deciding on it is
+                `customers:verify`. Without it the request stays readable but
+                un-actionable. */}
+            {canReview && (
+              <Group justify="flex-end" gap="sm">
+                <Button
+                  variant="light"
+                  color="red"
+                  onClick={() => {
+                    setRejectId(pending.id);
+                    setNote("");
+                  }}
+                >
+                  Reject
+                </Button>
+                <Button
+                  color="edr-green"
+                  loading={approve.isPending}
+                  onClick={() => approve.mutate({ id: pending.id })}
+                >
+                  Approve changes
+                </Button>
+              </Group>
+            )}
           </Stack>
         </Card>
       )}
diff --git a/apps/edr-freight-web/backoffice/src/components/customers/ResetPasswordAction.tsx b/apps/edr-freight-web/backoffice/src/components/customers/ResetPasswordAction.tsx
index 2175d4d7b..f0e9b266a 100644
--- a/apps/edr-freight-web/backoffice/src/components/customers/ResetPasswordAction.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/customers/ResetPasswordAction.tsx
@@ -61,8 +61,11 @@ export default function ResetPasswordAction({
 
   if (!allowed) return null;
 
+  // SMS is domestic-only: a foreign number counts as unavailable, same as a
+  // missing one, so staff can't send a link that will never arrive.
+  const phoneUsable = !!target?.phone && target.phoneIsDomestic !== false;
   const channelMissing =
-    !!target && (channel === "email" ? !target.email : !target.phone);
+    !!target && (channel === "email" ? !target.email : !phoneUsable);
 
   return (
     <>
@@ -106,9 +109,13 @@ export default function ResetPasswordAction({
                   <Radio
                     value="phone"
                     label="SMS"
-                    disabled={!target.phone}
+                    disabled={!phoneUsable}
                     description={
-                      target.phone ?? "No phone number on this account"
+                      !target.phone
+                        ? "No phone number on this account"
+                        : target.phoneIsDomestic === false
+                          ? `${target.phone} — foreign number, SMS unavailable; use email`
+                          : target.phone
                     }
                   />
                   <Radio
diff --git a/apps/edr-freight-web/backoffice/src/components/customers/badges.tsx b/apps/edr-freight-web/backoffice/src/components/customers/badges.tsx
index 6cb6759e7..112026ca6 100644
--- a/apps/edr-freight-web/backoffice/src/components/customers/badges.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/customers/badges.tsx
@@ -11,6 +11,8 @@ import {
 } from "@mantine/core";
 import { useMutation } from "@tanstack/react-query";
 import { useState } from "react";
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 import { api } from "@/services/api";
 
 import type {
@@ -286,6 +288,19 @@ export function InvoiceStatusBadge({
  * regardless (setCompanyProfileStatus). Suspend/blacklist/reinstate stay live so
  * an already-active profile is still managable.
  */
+/**
+ * Which permission each status write needs. Mirrors `STATUS_PERM` in the API's
+ * `companies.controller.ts` — approving is a different authority from
+ * suspending, and both go through the same endpoint. Keep the two in step.
+ */
+const STATUS_PERM: Record<ProfileStatus, string> = {
+  active: FREIGHT_PERMS.customers.verify,
+  pending: FREIGHT_PERMS.customers.verify,
+  rejected: FREIGHT_PERMS.customers.verify,
+  suspended: FREIGHT_PERMS.customers.deactivate,
+  blacklisted: FREIGHT_PERMS.customers.deactivate,
+};
+
 export function ProfileApprovalActions({
   profileId,
   status,
@@ -295,37 +310,89 @@ export function ProfileApprovalActions({
   status: ProfileStatus;
   locked?: boolean;
 }) {
+  const { user } = useAuth();
+  /** The API rejects these anyway — hide rather than offer a button that 403s. */
+  const canSet = (next: ProfileStatus) =>
+    hasPermission(user, STATUS_PERM[next]);
   const { mutate, isPending } = useMutation(
     api.customers.setProfileStatus.mutationOptions(),
   );
-  const [rejectOpen, setRejectOpen] = useState(false);
+  const [decision, setDecision] = useState<
+    "reject" | "suspend" | "reactivate" | null
+  >(null);
   const [note, setNote] = useState("");
 
   const act = (next: ProfileStatus) => mutate({ profileId, status: next });
 
-  const confirmReject = () => {
+  // Decisions the customer must be given a reason for. Reject/suspend/reactivate
+  // all capture a required message through the same modal; the API refuses
+  // suspend/reactivate without one.
+  const DECISIONS = {
+    reject: {
+      title: "Reject profile",
+      intro:
+        "Tell the customer what needs fixing. They'll see this note and can " +
+        "amend and resubmit the role for approval.",
+      label: "Reason for rejection",
+      placeholder: "e.g. The uploaded business license is expired.",
+      confirmLabel: "Reject profile",
+      color: "red",
+      status: "rejected" as ProfileStatus,
+    },
+    suspend: {
+      title: "Suspend role",
+      intro:
+        "Explain why this role is being suspended. The customer will see this " +
+        "message and cannot operate under the role until it is reactivated.",
+      label: "Reason for suspension",
+      placeholder: "e.g. Outstanding invoices unpaid for over 90 days.",
+      confirmLabel: "Suspend role",
+      color: "orange",
+      status: "suspended" as ProfileStatus,
+    },
+    reactivate: {
+      title: "Reactivate role",
+      intro:
+        "Explain why this role is being reactivated. The customer will see " +
+        "this message and can operate under the role again.",
+      label: "Reactivation message",
+      placeholder: "e.g. Outstanding payments have been settled.",
+      confirmLabel: "Reactivate role",
+      color: "edr-green",
+      status: "active" as ProfileStatus,
+    },
+  } as const;
+
+  const openDecision = (kind: keyof typeof DECISIONS) => {
+    setNote("");
+    setDecision(kind);
+  };
+
+  const active = decision ? DECISIONS[decision] : null;
+
+  const confirmDecision = () => {
+    if (!active) return;
     mutate(
-      { profileId, status: "rejected", note: note.trim() },
-      { onSuccess: () => setRejectOpen(false) },
+      { profileId, status: active.status, note: note.trim() },
+      { onSuccess: () => setDecision(null) },
     );
   };
 
-  const rejectModal = (
+  const decisionModal = active && (
     <Modal
-      opened={rejectOpen}
-      onClose={() => setRejectOpen(false)}
-      title="Reject profile"
+      opened
+      onClose={() => setDecision(null)}
+      title={active.title}
       centered
       radius="lg"
     >
       <Stack gap="md">
         <Text size="sm" c="dimmed">
-          Tell the customer what needs fixing. They'll see this note and can
-          amend and resubmit the role for approval.
+          {active.intro}
         </Text>
         <Textarea
-          label="Reason for rejection"
-          placeholder="e.g. The uploaded business license is expired."
+          label={active.label}
+          placeholder={active.placeholder}
           autosize
           minRows={3}
           value={note}
@@ -335,18 +402,18 @@ export function ProfileApprovalActions({
         <Group justify="flex-end" gap="sm">
           <Button
             variant="default"
-            onClick={() => setRejectOpen(false)}
+            onClick={() => setDecision(null)}
             disabled={isPending}
           >
             Cancel
           </Button>
           <Button
-            color="red"
+            color={active.color}
             loading={isPending}
             disabled={note.trim().length === 0}
-            onClick={confirmReject}
+            onClick={confirmDecision}
           >
-            Reject profile
+            {active.confirmLabel}
           </Button>
         </Group>
       </Stack>
@@ -366,35 +433,41 @@ export function ProfileApprovalActions({
   }
 
   if (status === "pending") {
+    if (!canSet("active") && !canSet("rejected")) return null;
     return (
       <>
-        {rejectModal}
+        {decisionModal}
         <Group gap={6} wrap="nowrap">
-          <Button
-            size="xs"
-            variant="light"
-            color="edr-green"
-            radius="md"
-            loading={isPending}
-            onClick={() => act("active")}
-          >
-            Approve
-          </Button>
-          <Button
-            size="xs"
-            variant="light"
-            color="red"
-            radius="md"
-            onClick={() => setRejectOpen(true)}
-          >
-            Reject
-          </Button>
+          {canSet("active") && (
+            <Button
+              size="xs"
+              variant="light"
+              color="edr-green"
+              radius="md"
+              loading={isPending}
+              onClick={() => act("active")}
+            >
+              Approve
+            </Button>
+          )}
+          {canSet("rejected") && (
+            <Button
+              size="xs"
+              variant="light"
+              color="red"
+              radius="md"
+              onClick={() => openDecision("reject")}
+            >
+              Reject
+            </Button>
+          )}
         </Group>
       </>
     );
   }
 
   if (status === "rejected") {
+    if (!canSet("active")) return null;
     return (
       <Button
         size="xs"
@@ -410,48 +483,59 @@ export function ProfileApprovalActions({
   }
 
   if (status === "active") {
+    if (!canSet("suspended")) return null;
     return (
-      <Button
-        size="xs"
-        variant="light"
-        color="orange"
-        radius="md"
-        loading={isPending}
-        onClick={() => act("suspended")}
-      >
-        Suspend
-      </Button>
+      <>
+        {decisionModal}
+        <Button
+          size="xs"
+          variant="light"
+          color="orange"
+          radius="md"
+          loading={isPending}
+          onClick={() => openDecision("suspend")}
+        >
+          Suspend
+        </Button>
+      </>
     );
   }
 
   if (status === "suspended") {
+    if (!canSet("active") && !canSet("blacklisted")) return null;
     return (
       <Group gap={6} wrap="nowrap">
-        <Button
-          size="xs"
-          variant="light"
-          color="edr-green"
-          radius="md"
-          loading={isPending}
-          onClick={() => act("active")}
-        >
-          Reactivate
-        </Button>
-        <Button
-          size="xs"
-          variant="light"
-          color="red"
-          radius="md"
-          loading={isPending}
-          onClick={() => act("blacklisted")}
-        >
-          Blacklist
-        </Button>
+        {decisionModal}
+        {canSet("active") && (
+          <Button
+            size="xs"
+            variant="light"
+            color="edr-green"
+            radius="md"
+            loading={isPending}
+            onClick={() => openDecision("reactivate")}
+          >
+            Reactivate
+          </Button>
+        )}
+        {canSet("blacklisted") && (
+          <Button
+            size="xs"
+            variant="light"
+            color="red"
+            radius="md"
+            loading={isPending}
+            onClick={() => act("blacklisted")}
+          >
+            Blacklist
+          </Button>
+        )}
       </Group>
     );
   }
 
   if (status === "blacklisted") {
+    if (!canSet("pending")) return null;
     return (
       <Button
         size="xs"
diff --git a/apps/edr-freight-web/backoffice/src/components/fleet/FleetCardGrid.tsx b/apps/edr-freight-web/backoffice/src/components/fleet/FleetCardGrid.tsx
index b2eef655f..1f8ab3f9f 100644
--- a/apps/edr-freight-web/backoffice/src/components/fleet/FleetCardGrid.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/fleet/FleetCardGrid.tsx
@@ -19,8 +19,9 @@ export interface FleetCardGridProps {
   pageCount: number;
   totalCount: number;
   onPaginationChange: OnChangeFn<PaginationState>;
-  onEdit: (record: FleetRecord) => void;
-  onRemove: (record: FleetRecord) => void;
+  /** Omit to hide the action (caller lacks the update/delete permission). */
+  onEdit?: (record: FleetRecord) => void;
+  onRemove?: (record: FleetRecord) => void;
 }
 
 const FleetCardGrid = ({
diff --git a/apps/edr-freight-web/backoffice/src/components/fleet/FleetRecordActions.tsx b/apps/edr-freight-web/backoffice/src/components/fleet/FleetRecordActions.tsx
index 887b235c4..6d9978f2c 100644
--- a/apps/edr-freight-web/backoffice/src/components/fleet/FleetRecordActions.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/fleet/FleetRecordActions.tsx
@@ -8,8 +8,9 @@ import type { FleetRecord } from "@/services/fleet/fleet.service";
 export interface FleetRecordActionsProps {
   record: FleetRecord;
   config: FleetResourceConfig;
-  onEdit: (record: FleetRecord) => void;
-  onRemove: (record: FleetRecord) => void;
+  /** Omit to hide the action (caller lacks the update/delete permission). */
+  onEdit?: (record: FleetRecord) => void;
+  onRemove?: (record: FleetRecord) => void;
   onAssignDriver?: (record: FleetRecord) => void;
   onHistory?: (record: FleetRecord) => void;
   onViewDetail?: (record: FleetRecord) => void;
@@ -42,6 +43,17 @@ const FleetRecordActions = ({
     navigate(config.detailPath.replace(":id", String(record.id)));
   };
 
+  if (
+    !onEdit &&
+    !onRemove &&
+    !showDetail &&
+    !showViewDetail &&
+    !showHistory &&
+    !(isVehicle && onAssignDriver)
+  ) {
+    return null;
+  }
+
   if (layout === "compact") {
     return (
       <Menu position="bottom-end" withinPortal shadow="md">
@@ -61,12 +73,14 @@ const FleetRecordActions = ({
               Assign Driver
             </MenuItem>
           ) : null}
-          <MenuItem
-            onClick={() => onEdit(record)}
-            leftSection={<Edit2 size={14} strokeWidth={2} />}
-          >
-            Edit
-          </MenuItem>
+          {onEdit ? (
+            <MenuItem
+              onClick={() => onEdit(record)}
+              leftSection={<Edit2 size={14} strokeWidth={2} />}
+            >
+              Edit
+            </MenuItem>
+          ) : null}
           {showViewDetail ? (
             <MenuItem
               onClick={() => onViewDetail?.(record)}
@@ -91,13 +105,15 @@ const FleetRecordActions = ({
               View details
             </MenuItem>
           ) : null}
-          <MenuItem
-            color="red"
-            onClick={() => onRemove(record)}
-            leftSection={<Trash2 size={14} strokeWidth={2} />}
-          >
-            {removeLabel}
-          </MenuItem>
+          {onRemove ? (
+            <MenuItem
+              color="red"
+              onClick={() => onRemove(record)}
+              leftSection={<Trash2 size={14} strokeWidth={2} />}
+            >
+              {removeLabel}
+            </MenuItem>
+          ) : null}
         </Menu.Dropdown>
       </Menu>
     );
@@ -121,12 +137,14 @@ const FleetRecordActions = ({
             Assign Driver
           </MenuItem>
         ) : null}
-        <MenuItem
-          onClick={() => onEdit(record)}
-          leftSection={<Edit2 size={14} strokeWidth={2} />}
-        >
-          Edit
-        </MenuItem>
+        {onEdit ? (
+          <MenuItem
+            onClick={() => onEdit(record)}
+            leftSection={<Edit2 size={14} strokeWidth={2} />}
+          >
+            Edit
+          </MenuItem>
+        ) : null}
         {showViewDetail ? (
           <MenuItem
             onClick={() => onViewDetail?.(record)}
@@ -143,13 +161,15 @@ const FleetRecordActions = ({
             View details
           </MenuItem>
         ) : null}
-        <MenuItem
-          color="red"
-          onClick={() => onRemove(record)}
-          leftSection={<Trash2 size={14} strokeWidth={2} />}
-        >
-          {removeLabel}
-        </MenuItem>
+        {onRemove ? (
+          <MenuItem
+            color="red"
+            onClick={() => onRemove(record)}
+            leftSection={<Trash2 size={14} strokeWidth={2} />}
+          >
+            {removeLabel}
+          </MenuItem>
+        ) : null}
       </Menu.Dropdown>
     </Menu>
   );
diff --git a/apps/edr-freight-web/backoffice/src/components/operations/TruckDetentionModal.tsx b/apps/edr-freight-web/backoffice/src/components/operations/TruckDetentionModal.tsx
index 2088db32d..c9748d80a 100644
--- a/apps/edr-freight-web/backoffice/src/components/operations/TruckDetentionModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/operations/TruckDetentionModal.tsx
@@ -18,6 +18,7 @@ import { useEffect, useState } from 'react';
 
 import { QUERY_KEYS } from '@/constants/QUERY_KEYS';
 import { useToast } from '@/hooks/use-toast';
+import { isBackdated } from '@/lib/no-backdate';
 import { lastMileService, type LastMileRecord } from '@/services/last-mile.service';
 
 interface TruckDetentionModalProps {
@@ -111,6 +112,7 @@ export function TruckDetentionModal({ opened, onClose, record }: TruckDetentionM
             description="Detention clock start"
             value={arrived}
             onChange={(v) => setArrived(v ? new Date(v) : null)}
+            minDate={new Date()}
             clearable
           />
           <DateTimePicker
@@ -118,11 +120,26 @@ export function TruckDetentionModal({ opened, onClose, record }: TruckDetentionM
             description="Clock end (blank = still out)"
             value={delivered}
             onChange={(v) => setDelivered(v ? new Date(v) : null)}
+            minDate={new Date()}
             clearable
           />
         </Group>
         <Group justify="flex-end">
-          <Button variant="light" loading={saveTimes.isPending} onClick={() => saveTimes.mutate()}>
+          <Button
+            variant="light"
+            loading={saveTimes.isPending}
+            onClick={() => {
+              // No backdating: detention times are recorded as they happen.
+              if (isBackdated(arrived) || isBackdated(delivered)) {
+                toast({
+                  variant: 'destructive',
+                  title: 'Detention times cannot be in the past',
+                });
+                return;
+              }
+              saveTimes.mutate();
+            }}
+          >
             Save times
           </Button>
         </Group>
diff --git a/apps/edr-freight-web/backoffice/src/components/overview/OverviewQuickLinks.tsx b/apps/edr-freight-web/backoffice/src/components/overview/OverviewQuickLinks.tsx
index d1598403b..4bc98e671 100644
--- a/apps/edr-freight-web/backoffice/src/components/overview/OverviewQuickLinks.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/overview/OverviewQuickLinks.tsx
@@ -2,41 +2,59 @@ import { useNavigate } from "react-router-dom";
 import { ArrowRight, FileText, Train, Users } from "lucide-react";
 import { Card, Group, SimpleGrid, Stack, Text, ThemeIcon } from "@mantine/core";
 
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
+
 const links = [
   {
     title: "Booking requests",
     description: "Review and action incoming freight bookings",
     href: "/dashboard/booking-requests",
     icon: FileText,
+    permission: [FREIGHT_PERMS.bookings.view],
   },
   {
     title: "Train scheduling v2",
     description: "Full allocation workflow — assign, pin wagons, finalize",
     href: "/dashboard/operations/train-scheduling-v2",
     icon: Train,
+    permission: [FREIGHT_PERMS.trainScheduling.view],
   },
   {
     title: "Trains",
     description: "Manage train master data and fleet status",
     href: "/dashboard/trains",
     icon: Train,
+    permission: [FREIGHT_PERMS.fleet.view, FREIGHT_PERMS.trains.view],
   },
   {
     title: "User management",
     description: "Employees, roles, and permissions",
     href: "/user-management",
     icon: Users,
+    permission: [
+      FREIGHT_PERMS.admin,
+      FREIGHT_PERMS.staff.roles.view,
+      FREIGHT_PERMS.staff.employeeRegistration.view,
+      FREIGHT_PERMS.staff.roleAssignment.view,
+    ],
   },
 ];
 
 export function OverviewQuickLinks() {
   const navigate = useNavigate();
+  const { user } = useAuth();
+
+  const visible = links.filter((link) =>
+    link.permission.some((key) => hasPermission(user, key)),
+  );
+  if (!visible.length) return null;
 
   return (
     <Stack gap="md" h="100%">
       <Text fw={600}>Quick links</Text>
       <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="sm">
-        {links.map((link) => {
+        {visible.map((link) => {
           const Icon = link.icon;
           return (
             <Card
diff --git a/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx b/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx
index 1c9d94825..cd56ad79d 100644
--- a/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/ruleEngine/RuleEngineFormDialog.tsx
@@ -209,6 +209,13 @@ const RuleEngineFormDialog = ({
         next.containerTypeId = "";
         next.cargoTypeId = "";
       }
+      // Cargo kind (customs / lashing) decides both the container-type scope
+      // and the legal units (container → per box/wagon, bulk → per ton/wagon).
+      if (name === "cargoKind") {
+        next.containerTypeId = "";
+        next.cargoTypeId = "";
+        next.rateUnit = "";
+      }
       return next;
     });
   };
@@ -333,6 +340,10 @@ const RuleEngineFormDialog = ({
           value={resolveSelectValue(field, values)}
           onChange={(v) => setField(field.name, v === RULE_ENGINE_SELECT_NONE ? "" : v)}
           disabled={selectOptionsLoading}
+          // Native required blocks submit while a mandatory select is empty —
+          // without it the form posts and the API 400s (e.g. a container
+          // customs/lashing rate with no container type picked).
+          required={field.required}
           data={options
             .filter((opt) => opt.value !== "")
             .map((opt) => ({
diff --git a/apps/edr-freight-web/backoffice/src/components/trainScheduling/IntercityRideAlongPanel.tsx b/apps/edr-freight-web/backoffice/src/components/trainScheduling/IntercityRideAlongPanel.tsx
index e4512e42a..1f872d1bb 100644
--- a/apps/edr-freight-web/backoffice/src/components/trainScheduling/IntercityRideAlongPanel.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/trainScheduling/IntercityRideAlongPanel.tsx
@@ -97,6 +97,15 @@ function CorridorCell({ row }: { row: IntercityBookingRow }) {
  * confirmed manually when the train is physically at the booking's origin /
  * destination yard (the server validates against recorded checkpoints).
  */
+/** Plain-language journey states for the accepted ride-along table. */
+const INTERCITY_STATUS_META: Record<string, { label: string; color: string }> = {
+  SELECTED_FOR_BATCH: { label: "Awaiting payment", color: "yellow" },
+  APPROVED: { label: "Ready to load (gov)", color: "edr-green" },
+  PAID: { label: "Paid — ready to load", color: "edr-green" },
+  IN_TRANSIT: { label: "Loaded — in transit", color: "indigo" },
+  COMPLETED: { label: "Delivered", color: "teal" },
+};
+
 export function IntercityRideAlongPanel({
   scheduleId,
   direction,
@@ -115,10 +124,20 @@ export function IntercityRideAlongPanel({
     }),
   );
 
-  const invalidate = () =>
-    queryClient.invalidateQueries({
+  // Accepting/loading/unloading a ride-along changes the schedule's booking
+  // list, the yard worklists AND this panel — refresh all three so the
+  // workspace board and yard-work tables never show a stale picture.
+  const invalidate = () => {
+    void queryClient.invalidateQueries({
       queryKey: api.trainScheduling.intercityCandidates.queryKey({ scheduleId }),
     });
+    void queryClient.invalidateQueries({
+      queryKey: api.trainScheduling.yardWork.queryKey({ scheduleId }),
+    });
+    void queryClient.invalidateQueries({
+      queryKey: api.trainScheduling.scheduleDetail.queryKey({ id: scheduleId }),
+    });
+  };
 
   const accept = useMutation(
     api.trainScheduling.acceptIntercityBookings.mutationOptions({
@@ -330,8 +349,14 @@ export function IntercityRideAlongPanel({
                         <CorridorCell row={row} />
                       </Table.Td>
                       <Table.Td>
-                        <Badge size="sm" variant="light">
-                          {row.status}
+                        <Badge
+                          size="sm"
+                          variant="light"
+                          color={
+                            INTERCITY_STATUS_META[row.status ?? ""]?.color ?? "gray"
+                          }
+                        >
+                          {INTERCITY_STATUS_META[row.status ?? ""]?.label ?? row.status}
                         </Badge>
                       </Table.Td>
                       <Table.Td>
diff --git a/apps/edr-freight-web/backoffice/src/components/trainScheduling/ScheduleWorkspacePanel.tsx b/apps/edr-freight-web/backoffice/src/components/trainScheduling/ScheduleWorkspacePanel.tsx
index c7fc49b18..02475214e 100644
--- a/apps/edr-freight-web/backoffice/src/components/trainScheduling/ScheduleWorkspacePanel.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/trainScheduling/ScheduleWorkspacePanel.tsx
@@ -584,6 +584,15 @@ export function ScheduleWorkspacePanel({
                 customer={b.customer}
                 weightTons={b.weightTons}
                 status={b.status}
+                intercity={b.tradeDirection === "DOMESTIC"}
+                leg={
+                  b.origin &&
+                  b.destination &&
+                  (b.originYardId !== schedule.originStation?.id ||
+                    b.destinationYardId !== schedule.destinationStation?.id)
+                    ? `${b.origin} → ${b.destination}`
+                    : null
+                }
                 loadingStatus={b.wagonAssigned ? b.loadingStatus ?? "UNLOADED" : undefined}
                 right={
                   canManage ? (
@@ -840,6 +849,8 @@ function BookingCard({
   status,
   loadingStatus,
   waitingForWagon,
+  intercity,
+  leg,
   right,
 }: {
   reference: string;
@@ -849,6 +860,10 @@ function BookingCard({
   loadingStatus?: "LOADED" | "UNLOADED";
   /** Paid, but no wagon of the required type was free — waiting for one. */
   waitingForWagon?: boolean;
+  /** DOMESTIC ride-along riding only part of this train's corridor. */
+  intercity?: boolean;
+  /** "Origin → Destination" when the booking rides a sub-corridor leg. */
+  leg?: string | null;
   right?: React.ReactNode;
 }) {
   return (
@@ -874,6 +889,16 @@ function BookingCard({
               {reference}
             </Text>
             {status ? <BookingStatusBadge status={status} /> : null}
+            {intercity ? (
+              <Tooltip
+                label="Intercity ride-along — rides only its own leg of this train's corridor"
+                withArrow
+              >
+                <Badge size="sm" radius="sm" variant="filled" color="indigo">
+                  Intercity
+                </Badge>
+              </Tooltip>
+            ) : null}
             {waitingForWagon ? (
               <Tooltip
                 label="Paid, but no wagon of the required type was free. Free a wagon or assign it to a same-day train that has one."
@@ -907,6 +932,11 @@ function BookingCard({
                 </Text>
               </Group>
             ) : null}
+            {leg ? (
+              <Text size="xs" c="indigo.7" fw={600} style={{ whiteSpace: "nowrap" }}>
+                {leg}
+              </Text>
+            ) : null}
           </Group>
         </Stack>
         {right ? <Box style={{ flexShrink: 0 }}>{right}</Box> : null}
diff --git a/apps/edr-freight-web/backoffice/src/components/trainScheduling/WagonPlanGrid.tsx b/apps/edr-freight-web/backoffice/src/components/trainScheduling/WagonPlanGrid.tsx
index e5b63ea24..73297884d 100644
--- a/apps/edr-freight-web/backoffice/src/components/trainScheduling/WagonPlanGrid.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/trainScheduling/WagonPlanGrid.tsx
@@ -2,7 +2,10 @@ import { Badge, Card, Group, Progress, SimpleGrid, Stack, Text, ThemeIcon } from
 import { Box, Package } from "lucide-react";
 import type { TrainScheduleWagonAllocation, WagonPlanRow } from "@/types/trainScheduling";
 
-type WagonSlot = (WagonPlanRow & { physicalWagonNumber?: string | null }) | {
+type WagonSlot = (WagonPlanRow & {
+  physicalWagonNumber?: string | null;
+  tareWeightTons?: number | null;
+}) | {
   sequenceNo: number;
   capacityTons: number;
   assignedWeightTons: number;
diff --git a/apps/edr-freight-web/backoffice/src/components/trainScheduling/YardWorkPanel.tsx b/apps/edr-freight-web/backoffice/src/components/trainScheduling/YardWorkPanel.tsx
index 76ccdfde2..4c649edf8 100644
--- a/apps/edr-freight-web/backoffice/src/components/trainScheduling/YardWorkPanel.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/trainScheduling/YardWorkPanel.tsx
@@ -201,10 +201,19 @@ export function YardWorkPanel({ scheduleId }: { scheduleId: string }) {
     }),
   );
 
-  const invalidate = () =>
-    queryClient.invalidateQueries({
+  // Loading/unloading changes booking status on the schedule detail and the
+  // intercity panel too — refresh all three so no surface shows a stale state.
+  const invalidate = () => {
+    void queryClient.invalidateQueries({
       queryKey: api.trainScheduling.yardWork.queryKey({ scheduleId }),
     });
+    void queryClient.invalidateQueries({
+      queryKey: api.trainScheduling.intercityCandidates.queryKey({ scheduleId }),
+    });
+    void queryClient.invalidateQueries({
+      queryKey: api.trainScheduling.scheduleDetail.queryKey({ id: scheduleId }),
+    });
+  };
 
   const load = useMutation(
     api.trainScheduling.loadScheduleBooking.mutationOptions({
diff --git a/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/InteractiveTrainConsist.tsx b/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/InteractiveTrainConsist.tsx
index 8ac374c1a..1e1bb706e 100644
--- a/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/InteractiveTrainConsist.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/InteractiveTrainConsist.tsx
@@ -1,3 +1,4 @@
+import { useState } from "react";
 import { Badge, Box, Group, HoverCard, Stack, Text } from "@mantine/core";
 import {
   Building2,
@@ -14,6 +15,13 @@ import { freightBrand } from "@/theme/freight-brand";
 type Wagon = NonNullable<TrainScheduleDetail["trainSet"]>["wagons"][number];
 type Locomotive = NonNullable<TrainScheduleDetail["trainSet"]>["locomotive"];
 
+export interface WagonLoadMove {
+  sourceWagonId: string;
+  targetWagonId: string;
+}
+
+type DragState = { sourceWagonId: string } | null;
+
 interface InteractiveTrainConsistProps {
   wagons: Wagon[];
   locomotive: Locomotive | null | undefined;
@@ -23,8 +31,16 @@ interface InteractiveTrainConsistProps {
   onSelectWagon: (wagon: Wagon) => void;
   /** Booking id to highlight across the train (e.g. selected in the side panel). */
   highlightBookingId?: string | null;
+  /** Wagon loads become draggable: drop on an empty wagon to move, a loaded one to swap. */
+  canRearrange?: boolean;
+  onMoveLoad?: (move: WagonLoadMove) => void;
 }
 
+const wagonItems = (wagon: Wagon) =>
+  (wagon.allocations ?? [])
+    .flatMap((a) => a.containerItems ?? [])
+    .sort((a, b) => (a.positionOnWagon ?? 99) - (b.positionOnWagon ?? 99));
+
 const CONTAINER_GRADIENTS = [
   "linear-gradient(180deg, var(--mantine-color-cyan-5), var(--mantine-color-cyan-7))",
   "linear-gradient(180deg, var(--mantine-color-blue-5), var(--mantine-color-blue-7))",
@@ -151,16 +167,27 @@ function WagonCar({
   selected,
   highlighted,
   onSelect,
+  drag,
+  onDragChange,
+  onMoveLoad,
+  canRearrange,
 }: {
   wagon: Wagon;
   company: string | null;
   selected: boolean;
   highlighted: boolean;
   onSelect: () => void;
+  drag: DragState;
+  onDragChange: (drag: DragState) => void;
+  onMoveLoad?: (move: WagonLoadMove) => void;
+  canRearrange: boolean;
 }) {
+  const [dropHover, setDropHover] = useState(false);
   const allocation = wagon.allocations?.[0];
   const isEmpty = !allocation;
-  const isBulk = (allocation?.loadType ?? "").toUpperCase().includes("BULK");
+  const isBulk = (wagon.allocations ?? []).some((a) =>
+    (a.loadType ?? "").toUpperCase().includes("BULK"),
+  );
   // GROSS on both sides: cargo + tare vs rated payload + tare.
   const tare = wagon.tareWeightTons ?? 0;
   const assigned =
@@ -170,10 +197,20 @@ function WagonCar({
   const accent = isEmpty ? "gray" : isBulk ? "orange" : "cyan";
   const accentVar = `var(--mantine-color-${accent}-6)`;
 
-  const containerNumbers = (allocation?.containerItems ?? []).map(
-    (c) => c.containerNumber?.trim() || "—",
-  );
-  const blocks = containerNumbers.slice(0, 2);
+  const items = wagonItems(wagon);
+  const blocks = items.slice(0, 2);
+  const containerNumbers = items.map((c) => c.containerNumber?.trim() || "—");
+
+  // The whole load drags as one unit (a 20ft pair never splits). Any OTHER
+  // wagon is a drop target: empty → move (a consist-only wagon repins), loaded
+  // → the two loads swap. The API validates wagon type + payload weight.
+  const draggable = canRearrange && !isEmpty;
+  const beingDragged = drag?.sourceWagonId === wagon.id;
+  const dropEligible = Boolean(drag && !beingDragged);
+  const endDrag = () => {
+    onDragChange(null);
+    setDropHover(false);
+  };
 
   const ringColor = selected
     ? freightBrand.primary
@@ -189,6 +226,21 @@ function WagonCar({
           style={{ width: 120, flexShrink: 0, cursor: "pointer" }}
         >
           <Box
+            onDragOver={(e) => {
+              if (dropEligible) {
+                e.preventDefault();
+                e.dataTransfer.dropEffect = "move";
+                setDropHover(true);
+              }
+            }}
+            onDragLeave={() => setDropHover(false)}
+            onDrop={(e) => {
+              if (dropEligible && drag) {
+                e.preventDefault();
+                onMoveLoad?.({ sourceWagonId: drag.sourceWagonId, targetWagonId: wagon.id });
+              }
+              endDrag();
+            }}
             style={{
               position: "relative",
               height: 70,
@@ -205,10 +257,16 @@ function WagonCar({
                   : isEmpty
                     ? "none"
                     : "0 3px 10px rgba(15,41,27,0.08)",
+              outline: dropHover
+                ? "2px solid var(--mantine-color-cyan-6)"
+                : dropEligible
+                  ? "2px dashed var(--mantine-color-cyan-4)"
+                  : "none",
+              outlineOffset: 2,
               overflow: "hidden",
               display: "flex",
               flexDirection: "column",
-              transition: "box-shadow 120ms ease",
+              transition: "box-shadow 120ms ease, outline-color 120ms ease",
             }}
           >
             {/* top accent strip */}
@@ -243,8 +301,27 @@ function WagonCar({
               )}
             </Group>
 
-            {/* body */}
-            <Box style={{ flex: 1, padding: "3px 7px", display: "flex", alignItems: "center" }}>
+            {/* body — the cargo area is the drag handle for the wagon's whole load */}
+            <Box
+              draggable={draggable}
+              onDragStart={(e) => {
+                e.stopPropagation();
+                e.dataTransfer.effectAllowed = "move";
+                // Firefox needs data set for the drag to start.
+                e.dataTransfer.setData("text/plain", wagon.id);
+                onDragChange({ sourceWagonId: wagon.id });
+              }}
+              onDragEnd={endDrag}
+              style={{
+                flex: 1,
+                padding: "3px 7px",
+                display: "flex",
+                alignItems: "center",
+                cursor: draggable ? "grab" : undefined,
+                opacity: beingDragged ? 0.35 : 1,
+                transition: "opacity 120ms ease",
+              }}
+            >
               {isEmpty ? (
                 <Text size="9px" c="dimmed" ta="center" style={{ width: "100%" }}>
                   Available
@@ -274,28 +351,30 @@ function WagonCar({
                 </Stack>
               ) : (
                 <Group gap={3} justify="center" wrap="nowrap" style={{ width: "100%" }}>
-                  {(blocks.length ? blocks : ["—"]).map((cn, i) => (
-                    <Box
-                      key={i}
-                      style={{
-                        flex: 1,
-                        minWidth: 0,
-                        height: 26,
-                        borderRadius: 4,
-                        background: CONTAINER_GRADIENTS[i % CONTAINER_GRADIENTS.length],
-                        border: `1px solid ${CONTAINER_BORDERS[i % CONTAINER_BORDERS.length]}`,
-                        boxShadow: "inset 0 1px 0 rgba(255,255,255,0.3)",
-                        display: "flex",
-                        alignItems: "center",
-                        justifyContent: "center",
-                        padding: "0 2px",
-                      }}
-                    >
-                      <Text size="8px" fw={700} c="white" truncate style={{ maxWidth: "100%" }}>
-                        {cn}
-                      </Text>
-                    </Box>
-                  ))}
+                  {(blocks.length ? blocks.map((c) => c.containerNumber?.trim() || "—") : ["—"]).map(
+                    (cn, i) => (
+                      <Box
+                        key={i}
+                        style={{
+                          flex: 1,
+                          minWidth: 0,
+                          height: 26,
+                          borderRadius: 4,
+                          background: CONTAINER_GRADIENTS[i % CONTAINER_GRADIENTS.length],
+                          border: `1px solid ${CONTAINER_BORDERS[i % CONTAINER_BORDERS.length]}`,
+                          boxShadow: "inset 0 1px 0 rgba(255,255,255,0.3)",
+                          display: "flex",
+                          alignItems: "center",
+                          justifyContent: "center",
+                          padding: "0 2px",
+                        }}
+                      >
+                        <Text size="8px" fw={700} c="white" truncate style={{ maxWidth: "100%" }}>
+                          {cn}
+                        </Text>
+                      </Box>
+                    ),
+                  )}
                 </Group>
               )}
             </Box>
@@ -447,7 +526,10 @@ export const InteractiveTrainConsist = ({
   selectedWagonId,
   onSelectWagon,
   highlightBookingId,
+  canRearrange = false,
+  onMoveLoad,
 }: InteractiveTrainConsistProps) => {
+  const [drag, setDrag] = useState<DragState>(null);
   return (
     <Box
       style={{
@@ -477,6 +559,10 @@ export const InteractiveTrainConsist = ({
                   selected={selectedWagonId === wagon.id}
                   highlighted={Boolean(highlightBookingId && bookingId === highlightBookingId)}
                   onSelect={() => onSelectWagon(wagon)}
+                  drag={drag}
+                  onDragChange={setDrag}
+                  onMoveLoad={onMoveLoad}
+                  canRearrange={canRearrange}
                 />
               </Group>
             );
diff --git a/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/TrainConsistView.tsx b/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/TrainConsistView.tsx
index e5b12fe1c..5dd55680b 100644
--- a/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/TrainConsistView.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/TrainConsistView.tsx
@@ -1,13 +1,15 @@
 import { useMemo, useState } from "react";
 import { Badge, Box, Group, Paper, Stack, Text, ThemeIcon } from "@mantine/core";
-import { MousePointerClick, TrainFront } from "lucide-react";
+import { isAxiosError } from "axios";
+import { Hand, MousePointerClick, TrainFront } from "lucide-react";
 import type { TrainScheduleDetail } from "@/types/trainScheduling";
 import { TrainStatsBar } from "./TrainStatsBar";
 import { WagonCard } from "./WagonCard";
-import { InteractiveTrainConsist } from "./InteractiveTrainConsist";
+import { InteractiveTrainConsist, type WagonLoadMove } from "./InteractiveTrainConsist";
 import { RemoveBookingModal } from "./RemoveBookingModal";
 import { useMutation } from "@tanstack/react-query";
 import { api } from "@/services/api";
+import { useToast } from "@/hooks/use-toast";
 import { freightBrand } from "@/theme/freight-brand";
 
 type Wagon = NonNullable<TrainScheduleDetail["trainSet"]>["wagons"][number];
@@ -47,6 +49,7 @@ export const TrainConsistView = ({
 }: TrainConsistViewProps) => {
   const [selectedWagonId, setSelectedWagonId] = useState<string | null>(null);
   const [removeModalOpen, setRemoveModalOpen] = useState(false);
+  const { toast } = useToast();
 
   const unassignMutation = useMutation(
     api.trainScheduling.unassignBooking.mutationOptions(),
@@ -54,9 +57,38 @@ export const TrainConsistView = ({
   const removeWagonMutation = useMutation(
     api.trainScheduling.removeWagonSlot.mutationOptions(),
   );
+  const moveLoadMutation = useMutation(
+    api.trainScheduling.moveWagonLoad.mutationOptions(),
+  );
 
   const trainSet = scheduleDetail.trainSet;
   const wagons = trainSet?.wagons ?? [];
+  const canRearrange = !["DISPATCHED", "ARRIVED"].includes(scheduleDetail.status);
+
+  const handleMoveLoad = async (move: WagonLoadMove) => {
+    if (moveLoadMutation.isPending) return;
+    const targetLoaded =
+      (wagons.find((w) => w.id === move.targetWagonId)?.allocations?.length ?? 0) > 0;
+    try {
+      await moveLoadMutation.mutateAsync({
+        scheduleId,
+        wagonId: move.sourceWagonId,
+        targetWagonId: move.targetWagonId,
+      });
+      toast({ title: targetLoaded ? "Wagon loads swapped" : "Load moved" });
+    } catch (error) {
+      const message = isAxiosError(error)
+        ? ((error.response?.data as { message?: string | string[] } | undefined)?.message ?? null)
+        : null;
+      toast({
+        title: "Could not move the load",
+        description: Array.isArray(message)
+          ? message.join(", ")
+          : (message ?? "The move was rejected — check the wagon's type and payload."),
+        variant: "destructive",
+      });
+    }
+  };
 
   // Join company/customer name from schedule bookings by booking id.
   const companyByBooking = useMemo(() => {
@@ -152,13 +184,21 @@ export const TrainConsistView = ({
             </div>
           </Group>
           <Group gap="md" wrap="nowrap" visibleFrom="sm">
+            {canRearrange ? (
+              <Group gap={5} wrap="nowrap">
+                <Hand size={12} color="var(--mantine-color-cyan-7)" />
+                <Text size="xs" c="dimmed">
+                  Drag a wagon's cargo onto an empty wagon to move it — onto a loaded one to swap
+                </Text>
+              </Group>
+            ) : null}
             <LegendDot color="cyan" label="Container" />
             <LegendDot color="orange" label="Bulk" />
             <LegendDot color="gray" label="Empty" dashed />
           </Group>
         </Group>
 
-        <Box p="md">
+        <Box p="md" style={{ opacity: moveLoadMutation.isPending ? 0.6 : 1 }}>
           <InteractiveTrainConsist
             wagons={wagons}
             locomotive={trainSet?.locomotive}
@@ -166,6 +206,8 @@ export const TrainConsistView = ({
             selectedWagonId={selectedWagonId}
             onSelectWagon={(w) => setSelectedWagonId((prev) => (prev === w.id ? null : w.id))}
             highlightBookingId={highlightBookingId}
+            canRearrange={canRearrange && !moveLoadMutation.isPending}
+            onMoveLoad={(move) => void handleMoveLoad(move)}
           />
         </Box>
       </Paper>
@@ -178,7 +220,7 @@ export const TrainConsistView = ({
               Editing wagon #{selectedWagon.sequenceNo}
             </Badge>
             <Text size="xs" c="dimmed">
-              Update container numbers or remove the booking
+              Update container numbers, move containers to another wagon, or remove the booking
             </Text>
           </Group>
           <WagonCard
@@ -192,6 +234,8 @@ export const TrainConsistView = ({
             scheduleStatus={scheduleDetail.status}
             onRemoveBooking={handleRemoveBooking}
             onRemoveWagon={handleRemoveWagon}
+            wagons={wagons}
+            onMoveLoad={canRearrange ? (move) => void handleMoveLoad(move) : undefined}
           />
         </Box>
       ) : wagons.length ? (
@@ -209,7 +253,8 @@ export const TrainConsistView = ({
               <MousePointerClick size={13} />
             </ThemeIcon>
             <Text size="xs" c="dimmed">
-              Click a wagon in the train to edit container numbers or remove its booking.
+              Click a wagon to edit its containers — or drag a container between wagons to
+              rearrange the load.
             </Text>
           </Group>
         </Paper>
diff --git a/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/WagonCard.tsx b/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/WagonCard.tsx
index 915cfa629..d1d1e8d0b 100644
--- a/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/WagonCard.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/trainScheduling/compositionEditor/WagonCard.tsx
@@ -1,5 +1,17 @@
-import { Badge, Box, Button, Card, Group, Progress, Stack, Text, ThemeIcon } from "@mantine/core";
 import {
+  Badge,
+  Box,
+  Button,
+  Card,
+  Group,
+  Menu,
+  Progress,
+  Stack,
+  Text,
+  ThemeIcon,
+} from "@mantine/core";
+import {
+  ArrowLeftRight,
   Building2,
   Container as ContainerIcon,
   Fuel,
@@ -10,6 +22,7 @@ import {
 } from "lucide-react";
 import type { TrainScheduleDetail } from "@/types/trainScheduling";
 import { ContainerNumberInput } from "./ContainerNumberInput";
+import type { WagonLoadMove } from "./InteractiveTrainConsist";
 import { freightBrand } from "@/theme/freight-brand";
 
 type Wagon = NonNullable<TrainScheduleDetail["trainSet"]>["wagons"][number];
@@ -21,8 +34,16 @@ interface WagonCardProps {
   scheduleStatus?: string;
   onRemoveBooking: (wagon: Wagon) => void;
   onRemoveWagon: (wagonId: string) => void;
+  /** All wagons of the consist — targets for the move-load menu. */
+  wagons?: Wagon[];
+  onMoveLoad?: (move: WagonLoadMove) => void;
 }
 
+const itemAllocCount = (w: Wagon) => w.allocations?.length ?? 0;
+
+const isBulkWagon = (w: Wagon) =>
+  (w.allocations ?? []).some((a) => (a.loadType ?? "").toUpperCase().includes("BULK"));
+
 export const WagonCard = ({
   wagon,
   company,
@@ -30,6 +51,8 @@ export const WagonCard = ({
   scheduleStatus,
   onRemoveBooking,
   onRemoveWagon,
+  wagons,
+  onMoveLoad,
 }: WagonCardProps) => {
   const isDispatched = scheduleStatus === "DISPATCHED";
   const allocation = wagon.allocations?.[0];
@@ -153,16 +176,62 @@ export const WagonCard = ({
             </Box>
 
             {!isDispatched ? (
-              <Button
-                variant="light"
-                color="red"
-                size="xs"
-                leftSection={<X size={14} />}
-                onClick={() => onRemoveBooking(wagon)}
-                fullWidth
-              >
-                Remove booking
-              </Button>
+              <Group gap="xs" grow>
+                {onMoveLoad ? (
+                  <Menu shadow="md" width={240} position="bottom" withinPortal>
+                    <Menu.Target>
+                      <Button
+                        variant="light"
+                        color="cyan"
+                        size="xs"
+                        leftSection={<ArrowLeftRight size={14} />}
+                      >
+                        Move load
+                      </Button>
+                    </Menu.Target>
+                    <Menu.Dropdown>
+                      <Menu.Label>Move this wagon's load to</Menu.Label>
+                      {(wagons ?? [])
+                        .filter((w) => w.id !== wagon.id)
+                        .sort((a, b) => itemAllocCount(a) - itemAllocCount(b))
+                        .map((w) => {
+                          const loaded = itemAllocCount(w) > 0;
+                          return (
+                            <Menu.Item
+                              key={w.id}
+                              onClick={() =>
+                                onMoveLoad({ sourceWagonId: wagon.id, targetWagonId: w.id })
+                              }
+                            >
+                              <Group gap={6} wrap="nowrap" justify="space-between">
+                                <Text size="xs" fw={600} truncate>
+                                  #{w.sequenceNo} ·{" "}
+                                  {w.physicalWagonNumber ?? w.wagonType?.code ?? "Wagon"}
+                                </Text>
+                                <Badge
+                                  size="xs"
+                                  variant="light"
+                                  color={loaded ? (isBulkWagon(w) ? "orange" : "cyan") : "gray"}
+                                >
+                                  {loaded ? "swap" : "empty"}
+                                </Badge>
+                              </Group>
+                            </Menu.Item>
+                          );
+                        })}
+                    </Menu.Dropdown>
+                  </Menu>
+                ) : null}
+                <Button
+                  variant="light"
+                  color="red"
+                  size="xs"
+                  leftSection={<X size={14} />}
+                  onClick={() => onRemoveBooking(wagon)}
+                >
+                  Remove booking
+                </Button>
+              </Group>
             ) : null}
           </>
         ) : (
diff --git a/apps/edr-freight-web/backoffice/src/components/trainScheduling/scheduleVisuals.tsx b/apps/edr-freight-web/backoffice/src/components/trainScheduling/scheduleVisuals.tsx
index a495a5529..37f09dfd8 100644
--- a/apps/edr-freight-web/backoffice/src/components/trainScheduling/scheduleVisuals.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/trainScheduling/scheduleVisuals.tsx
@@ -280,3 +280,164 @@ export function RouteCorridor({
     </Group>
   );
 }
+
+/** Minimal booking shape the occupancy strip needs from TrainScheduleDetail. */
+export type SegmentStripBooking = {
+  originYardId?: string | null;
+  destinationYardId?: string | null;
+  tradeDirection?: string | null;
+  wagonsRequired?: number | null;
+  /** GROSS tons (cargo + tare of the booking's wagons), as the API sends it. */
+  weightTons?: number | null;
+};
+
+/**
+ * Per-segment wagon occupancy along the corridor: which legs are full and
+ * which still run empty. Through cargo (unknown/off-route yards) occupies the
+ * whole corridor; a ride-along counts only on its own leg — this is what makes
+ * "export full Adama→Doraleh, intercity riding Gelan→Adama" legible at a
+ * glance instead of two disconnected booking lists.
+ */
+export function SegmentOccupancyStrip({
+  stops,
+  bookings,
+  maxWagons,
+  maxGrossTons,
+}: {
+  stops: Array<{ yardId: string; label: string }>;
+  bookings: SegmentStripBooking[];
+  maxWagons?: number | null;
+  /** Loco pull ceiling incl. tolerance — per-leg gross is measured against it. */
+  maxGrossTons?: number | null;
+}) {
+  if (stops.length < 2) return null;
+  const lastIdx = stops.length - 1;
+  const indexOf = new Map(stops.map((s, i) => [s.yardId, i]));
+
+  const segments = stops.slice(0, -1).map((stop, edge) => {
+    let cargo = 0;
+    let intercity = 0;
+    let grossTons = 0;
+    for (const b of bookings) {
+      const from = (b.originYardId ? indexOf.get(b.originYardId) : undefined) ?? 0;
+      const to =
+        (b.destinationYardId ? indexOf.get(b.destinationYardId) : undefined) ??
+        lastIdx;
+      const rides = from <= edge && edge < (to > from ? to : lastIdx);
+      if (!rides) continue;
+      const wagons = Number(b.wagonsRequired) || 1;
+      if (b.tradeDirection === "DOMESTIC") intercity += wagons;
+      else cargo += wagons;
+      grossTons += Number(b.weightTons) || 0;
+    }
+    return {
+      from: stop,
+      to: stops[edge + 1],
+      cargo,
+      intercity,
+      grossTons: Math.round(grossTons * 10) / 10,
+    };
+  });
+
+  const cap = Number(maxWagons) || null;
+
+  return (
+    <Group gap={0} wrap="nowrap" align="stretch" style={{ overflowX: "auto", paddingBottom: 4 }}>
+      {segments.map((seg, i) => {
+        const used = seg.cargo + seg.intercity;
+        const pct = cap ? Math.min(100, Math.round((used / cap) * 100)) : null;
+        const full = cap != null && used >= cap;
+        return (
+          <Group key={seg.from.yardId} gap={0} wrap="nowrap" align="stretch">
+            <Stack gap={2} align="center" justify="flex-end" style={{ minWidth: 0 }}>
+              <Box
+                w={9}
+                h={9}
+                style={{
+                  borderRadius: 999,
+                  border: `2px solid ${freightBrand.primary}`,
+                  background: i === 0 ? "white" : freightBrand.primary,
+                }}
+              />
+              <Text size="xs" fw={600} style={{ whiteSpace: "nowrap" }}>
+                {seg.from.label}
+              </Text>
+            </Stack>
+            <Stack gap={3} px={10} pb={16} justify="flex-end" style={{ minWidth: 130 }}>
+              <Text size="xs" ta="center" fw={600} c={full ? "orange.8" : "dimmed"}>
+                {used}
+                {cap ? `/${cap}` : ""} wagons
+                {full ? " · full" : ""}
+              </Text>
+              <Box
+                style={{
+                  height: 6,
+                  borderRadius: 999,
+                  background: "var(--mantine-color-gray-2)",
+                  overflow: "hidden",
+                  display: "flex",
+                }}
+              >
+                {cap ? (
+                  <>
+                    <Box
+                      style={{
+                        width: `${Math.min(100, (seg.cargo / cap) * 100)}%`,
+                        background: freightBrand.primary,
+                      }}
+                    />
+                    <Box
+                      style={{
+                        width: `${Math.min(100, (seg.intercity / cap) * 100)}%`,
+                        background: "var(--mantine-color-indigo-6)",
+                      }}
+                    />
+                  </>
+                ) : (
+                  <Box style={{ width: pct ? `${pct}%` : 0 }} />
+                )}
+              </Box>
+              <Text size="xs" ta="center" c="dimmed" style={{ whiteSpace: "nowrap" }}>
+                {seg.cargo} cargo
+                {seg.intercity > 0 ? (
+                  <Text span size="xs" fw={700} c="indigo.7">
+                    {" "}
+                    · {seg.intercity} intercity
+                  </Text>
+                ) : null}
+              </Text>
+              {seg.grossTons > 0 ? (
+                <Text
+                  size="xs"
+                  ta="center"
+                  fw={600}
+                  c={
+                    maxGrossTons != null && seg.grossTons > maxGrossTons
+                      ? "red.7"
+                      : "dimmed"
+                  }
+                  style={{ whiteSpace: "nowrap" }}
+                >
+                  {seg.grossTons}
+                  {maxGrossTons != null ? ` / ${maxGrossTons}` : ""} T gross
+                </Text>
+              ) : null}
+            </Stack>
+            {i === segments.length - 1 ? (
+              <Stack gap={2} align="center" justify="flex-end" style={{ minWidth: 0 }}>
+                <Box
+                  w={9}
+                  h={9}
+                  style={{ borderRadius: 999, background: freightBrand.primary }}
+                />
+                <Text size="xs" fw={600} style={{ whiteSpace: "nowrap" }}>
+                  {seg.to.label}
+                </Text>
+              </Stack>
+            ) : null}
+          </Group>
+        );
+      })}
+    </Group>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx b/apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx
index fcced78d9..7633e4dcd 100644
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx
@@ -6,6 +6,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 
 import { api } from '@/services/api';
 import { useToast } from '@/hooks/use-toast';
+import { isBackdated, nowLocalDateTimeInput } from '@/lib/no-backdate';
 import { warehouseService } from '@/services/warehouse.service';
 import type { WarehouseInventoryItem } from '@/types/warehouse';
 import { extractErrorMessage } from './options';
@@ -204,6 +205,7 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
             label: `Last-mile · ${truckPrefill.truckPlateNumber}`,
             trailerPlate: truckPrefill.trailerPlateNumber ?? '',
             driverName: truckPrefill.driverName ?? '',
+            driverLicense: truckPrefill.driverLicense ?? '',
             driverPhone: truckPrefill.driverPhone ?? '',
             truckType: truckPrefill.truckType ?? '',
             containerNumbers: splitContainerNumbers(truckPrefill.containerNumber),
@@ -217,6 +219,7 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
       label: `Customer · ${t.plateNumber} — ${t.driverName}`,
       trailerPlate: '',
       driverName: t.driverName,
+      driverLicense: '',
       driverPhone: '',
       truckType: t.truckType,
       containerNumbers: (t.containers ?? []).map((c) => c.containerNumber).filter(Boolean),
@@ -230,6 +233,7 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
         label: `Last-mile · ${t.truckPlateNumber ?? ''}${t.driverName ? ` — ${t.driverName}` : ''}`,
         trailerPlate: t.trailerPlateNumber ?? '',
         driverName: t.driverName ?? '',
+        driverLicense: t.driverLicense ?? '',
         driverPhone: t.driverPhone ?? '',
         truckType: t.truckType ?? '',
         containerNumbers: splitContainerNumbers(t.containerNumber),
@@ -280,6 +284,11 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
   // way. A walk-in truck (typed plate, no assignment) stays editable at arrival.
   const isTruckIdentityLocked = isEntranceLocked || Boolean(selectedOption);
   const isDriverNameLocked = isEntranceLocked || Boolean(selectedOption?.driverName);
+  // The freight order's truck details are the customer's / fleet's record — the
+  // gate may FILL blanks (walk-in license, phone) but never edit shown values.
+  const isTrailerLocked = isEntranceLocked || Boolean(selectedOption?.trailerPlate);
+  const isDriverLicenseLocked = isEntranceLocked || Boolean(selectedOption?.driverLicense);
+  const isDriverPhoneLocked = isEntranceLocked || Boolean(selectedOption?.driverPhone);
   const referenceLocked = Boolean(item?.releaseOrderReference) || savedBlocks.length > 0;
 
   /** Load a truck into the form: its saved block if any, else its assignment. */
@@ -292,7 +301,7 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
     setTruckPlateNumber(plate);
     setTrailerPlateNumber(block?.trailerPlateNumber || option?.trailerPlate || '');
     setDriverName(block?.driverName || option?.driverName || '');
-    setDriverLicense(block?.driverLicense || '');
+    setDriverLicense(block?.driverLicense || option?.driverLicense || '');
     setDriverPhone(block?.driverPhone || option?.driverPhone || '');
     setTruckType(block?.truckType || option?.truckType || '');
     const loaded = block
@@ -378,6 +387,9 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
   const containerWeightByNumber = new Map(
     containerWeights.map((c) => [c.containerNumber.toUpperCase(), Number(c.weightTons) || 0]),
   );
+  // A truck may only carry out its OWN assigned containers — when the selected
+  // truck has an assigned load, other trucks' containers are not offered.
+  const assignedLoad = (selectedOption?.containerNumbers ?? []).map((n) => n.toUpperCase());
   // Mantine Selects throw on duplicate option values — legacy bookings can carry
   // the same container number on two lines, so dedupe defensively.
   const containerSelectData = [
@@ -390,7 +402,12 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
         },
       ]),
     ).values(),
-  ];
+  ].filter(
+    (option) =>
+      assignedLoad.length === 0 ||
+      assignedLoad.includes(option.value.toUpperCase()) ||
+      containerNumbers.some((n) => n.trim().toUpperCase() === option.value.toUpperCase()),
+  );
   const selectedContainerNumbers = containerNumbers.map((n) => n.trim()).filter(Boolean);
   const selectedCargoWeight = Number(
     selectedContainerNumbers
@@ -432,6 +449,12 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
       });
       return;
     }
+    // No backdating: gate times are recorded as they happen. The locked
+    // entrance (exit step) keeps its original past gate-in untouched.
+    if (!isEntranceLocked && isBackdated(gateInTime)) {
+      toast({ variant: 'destructive', title: 'Gate in time cannot be in the past' });
+      return;
+    }
     if (isExitStep && (!gateOutTime || (!skipWeighing && grossWeight === ''))) {
       toast({
         variant: 'destructive',
@@ -439,6 +462,10 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
       });
       return;
     }
+    if (isExitStep && isBackdated(gateOutTime)) {
+      toast({ variant: 'destructive', title: 'Gate out time cannot be in the past' });
+      return;
+    }
     if (isExitStep && hasContainerWeights && selectedContainerNumbers.length === 0) {
       toast({ variant: 'destructive', title: 'Select the containers loaded on this truck' });
       return;
@@ -592,15 +619,15 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
             label="Trailer plate number"
             value={trailerPlateNumber}
             onChange={(e) => setTrailerPlateNumber(e.currentTarget.value)}
-            readOnly={isEntranceLocked}
+            readOnly={isTrailerLocked}
           />
         </Group>
         <Group grow>
           <TextInput label="Driver name" required value={driverName} onChange={(e) => setDriverName(e.currentTarget.value)} readOnly={isDriverNameLocked} />
-          <TextInput label="Driver license" value={driverLicense} onChange={(e) => setDriverLicense(e.currentTarget.value)} readOnly={isEntranceLocked} />
+          <TextInput label="Driver license" value={driverLicense} onChange={(e) => setDriverLicense(e.currentTarget.value)} readOnly={isDriverLicenseLocked} />
         </Group>
         <Group grow>
-          <TextInput label="Driver phone" value={driverPhone} onChange={(e) => setDriverPhone(e.currentTarget.value)} readOnly={isEntranceLocked} />
+          <TextInput label="Driver phone" value={driverPhone} onChange={(e) => setDriverPhone(e.currentTarget.value)} readOnly={isDriverPhoneLocked} />
           <TextInput label="Truck type" value={truckType} onChange={(e) => setTruckType(e.currentTarget.value)} readOnly={isTruckIdentityLocked} />
         </Group>
         <Group grow align="flex-start">
@@ -638,7 +665,7 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
               </SimpleGrid>
             </Stack>
           )}
-          <TextInput label="Gate in time" type="datetime-local" value={gateInTime} onChange={(e) => setGateInTime(e.currentTarget.value)} readOnly={isEntranceLocked} />
+          <TextInput label="Gate in time" type="datetime-local" min={isEntranceLocked ? undefined : nowLocalDateTimeInput()} value={gateInTime} onChange={(e) => setGateInTime(e.currentTarget.value)} readOnly={isEntranceLocked} />
         </Group>
         {hasContainerWeights && (
           <Group gap="md" align="center">
@@ -671,7 +698,7 @@ export function ReleaseOrderModal({ opened, onClose, item, truckPrefill }: Relea
           <Text size="sm" c={weightMismatch ? 'red' : 'dimmed'}>
             Computed net: <b>{computedNetWeight == null ? '-' : `${computedNetWeight.toLocaleString()} t`}</b>
           </Text>
-          <TextInput label="Gate out time" type="datetime-local" value={gateOutTime} onChange={(e) => setGateOutTime(e.currentTarget.value)} disabled={!isExitStep || hasTruckLeft} />
+          <TextInput label="Gate out time" type="datetime-local" min={nowLocalDateTimeInput()} value={gateOutTime} onChange={(e) => setGateOutTime(e.currentTarget.value)} disabled={!isExitStep || hasTruckLeft} />
         </Group>
         {weightMismatch && (
           <Alert icon={<Scale size={16} />} color="red" variant="light">
diff --git a/apps/edr-freight-web/backoffice/src/constants/QUERY_KEYS.ts b/apps/edr-freight-web/backoffice/src/constants/QUERY_KEYS.ts
index 2f65e110e..c57a607d5 100644
--- a/apps/edr-freight-web/backoffice/src/constants/QUERY_KEYS.ts
+++ b/apps/edr-freight-web/backoffice/src/constants/QUERY_KEYS.ts
@@ -199,6 +199,7 @@ export const QUERY_KEYS = {
 
   MAINTENANCE: {
     ROOT: ["maintenance"] as const,
+    dueBoard: () => ["maintenance", "due-board"] as const,
     schedules: (vehicleId?: string) =>
       ["maintenance", "schedules", vehicleId ?? "all"] as const,
     upcoming: (vehicleId?: string) =>
@@ -207,6 +208,8 @@ export const QUERY_KEYS = {
       ["maintenance", "history", vehicleId ?? "all"] as const,
     stats: (vehicleId?: string) =>
       ["maintenance", "stats", vehicleId ?? "all"] as const,
+    intervals: (vehicleId?: string) =>
+      ["maintenance", "intervals", vehicleId ?? "all"] as const,
   },
 
   FINANCIAL_REPORTS: {
diff --git a/apps/edr-freight-web/backoffice/src/constants/URLS.ts b/apps/edr-freight-web/backoffice/src/constants/URLS.ts
index ce89774d5..ade491a7b 100644
--- a/apps/edr-freight-web/backoffice/src/constants/URLS.ts
+++ b/apps/edr-freight-web/backoffice/src/constants/URLS.ts
@@ -399,6 +399,8 @@ export const URL_CONSTANTS = {
       `/train-scheduling/schedules/${scheduleId}/wagons/${wagonId}`,
     UPDATE_CONTAINER_ITEM: (scheduleId: string, itemId: string) =>
       `/train-scheduling/schedules/${scheduleId}/container-items/${itemId}`,
+    MOVE_WAGON_LOAD: (scheduleId: string, wagonId: string) =>
+      `/train-scheduling/schedules/${scheduleId}/wagons/${wagonId}/move-load`,
     UNASSIGNED_BOOKINGS: (scheduleId: string) =>
       `/train-scheduling/schedules/${scheduleId}/unassigned-bookings`,
     COMPOSITION_REMOVALS: (scheduleId: string) =>
diff --git a/apps/edr-freight-web/backoffice/src/features/bookings/booking-status.config.ts b/apps/edr-freight-web/backoffice/src/features/bookings/booking-status.config.ts
index e5961240f..07dbae7ce 100644
--- a/apps/edr-freight-web/backoffice/src/features/bookings/booking-status.config.ts
+++ b/apps/edr-freight-web/backoffice/src/features/bookings/booking-status.config.ts
@@ -286,7 +286,6 @@ export const BOOKING_LIST_TABS = [
     key: "clearance",
     label: "Clearance",
     statuses: [
-      "AWAITING_CLEARANCE_PAYMENT",
       "AWAITING_DOCUMENTS",
       "DOCUMENTS_UNDER_REVIEW",
       "CLEARANCE_READY",
diff --git a/apps/edr-freight-web/backoffice/src/features/contracts/contract-status.config.ts b/apps/edr-freight-web/backoffice/src/features/contracts/contract-status.config.ts
index cf1f04c90..2277d702b 100644
--- a/apps/edr-freight-web/backoffice/src/features/contracts/contract-status.config.ts
+++ b/apps/edr-freight-web/backoffice/src/features/contracts/contract-status.config.ts
@@ -51,10 +51,6 @@ export const CONTRACT_STATUS_STYLES: Record<string, StatusStyle> = {
     label: "Active",
     color: "bg-[color:var(--freight-brand-muted)] text-[color:var(--freight-brand)] border-[color:var(--freight-brand-border)]",
   },
-  AWAITING_CLEARANCE_PAYMENT: {
-    label: "Clearance Fee Due",
-    color: "bg-orange-50 text-orange-700 border-orange-200",
-  },
   AWAITING_CLEARANCE_DOCUMENTS: {
     label: "Awaiting Documents",
     color: "bg-amber-50 text-amber-700 border-amber-200",
@@ -122,7 +118,6 @@ export const CONTRACT_STATUS_COLOR: Record<string, string> = {
   SIGNED_CUSTOMER: "cyan",
   FULLY_EXECUTED: "indigo",
   CONTRACT_ACTIVE: "edr-green",
-  AWAITING_CLEARANCE_PAYMENT: "orange",
   AWAITING_CLEARANCE_DOCUMENTS: "yellow",
   CLEARANCE_UNDER_REVIEW: "yellow",
   CLEARANCE_READY_FOR_BOOKING: "edr-green",
@@ -212,13 +207,6 @@ export const CONTRACT_STATUS_META: Record<string, StatusMeta> = {
     color: "text-[color:var(--freight-brand)]",
     stage: 3,
   },
-  AWAITING_CLEARANCE_PAYMENT: {
-    title: "Clearance Fee Due",
-    description:
-      "Customer must pay the prepaid clearance service fee before uploading documents.",
-    color: "text-orange-600",
-    stage: 3,
-  },
   AWAITING_CLEARANCE_DOCUMENTS: {
     title: "Awaiting Documents",
     description: "Customer is uploading pre-booking clearance documents.",
diff --git a/apps/edr-freight-web/backoffice/src/hooks/useInterchangeDocuments.ts b/apps/edr-freight-web/backoffice/src/hooks/useInterchangeDocuments.ts
index 67cf70f24..ba1f10b73 100644
--- a/apps/edr-freight-web/backoffice/src/hooks/useInterchangeDocuments.ts
+++ b/apps/edr-freight-web/backoffice/src/hooks/useInterchangeDocuments.ts
@@ -67,10 +67,3 @@ export function useDisputeInterchangeDocument() {
   });
 }
 
-export function useCancelInterchangeDocument() {
-  const onSuccess = useInterchangeInvalidation();
-  return useMutation({
-    mutationFn: (id: string) => interchangeDocumentsService.cancel(id),
-    onSuccess,
-  });
-}
diff --git a/apps/edr-freight-web/backoffice/src/layout/components/TenantConfig.ts b/apps/edr-freight-web/backoffice/src/layout/components/TenantConfig.ts
index 758e2a75a..f8fd1f47d 100644
--- a/apps/edr-freight-web/backoffice/src/layout/components/TenantConfig.ts
+++ b/apps/edr-freight-web/backoffice/src/layout/components/TenantConfig.ts
@@ -88,8 +88,8 @@ export const resolveModuleConfig = (config: TenantConfig): ModuleConfig => ({
 });
 
 const defaultConfig: TenantConfig = {
-  appName: "Smart Office",
-  organizationName: "Smart Office",
+  appName: "EDR Freight",
+  organizationName: "Ethio-Djibouti Railways",
   canUseAttachmentFromDMS: false,
   logo: "/assets/TriaTradinglogo.png",
   primaryColor: "#1b354d",
@@ -116,8 +116,8 @@ const defaultConfig: TenantConfig = {
 
 const tenantConfigs: Record<string, TenantConfig> = {
   localhost: {
-    appName: "Smart Office",
-    organizationName: "Addis Ababa City Administration",
+    appName: "EDR Freight",
+    organizationName: "Ethio-Djibouti Railways",
     logo: "",
     primaryColor: "#0EA371",
     moduleConfig: {
diff --git a/apps/edr-freight-web/backoffice/src/lib/canApproveContractStep.test.ts b/apps/edr-freight-web/backoffice/src/lib/canApproveContractStep.test.ts
new file mode 100644
index 000000000..ab0f9c3c5
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/lib/canApproveContractStep.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it } from "vitest";
+
+import type { AuthUser } from "@/auth/types";
+import { canApproveContractStep } from "./permissions";
+
+const withPositionType = (typeKey: string): AuthUser => ({
+  employee: [{ positions: [{ positionType: { key: typeKey } }] }],
+});
+
+const withRole = (roleKey: string): AuthUser => ({ roles: [{ key: roleKey }] });
+
+const withPermission = (permKey: string): AuthUser => ({
+  permissionKeys: [permKey],
+});
+
+describe("canApproveContractStep", () => {
+  it("shows to the matching position type only", () => {
+    const chief = withPositionType("-marketing-chief");
+    expect(canApproveContractStep(chief, "-marketing-chief")).toBe(true);
+    // a marketing officer must NOT see the chief step's buttons
+    expect(canApproveContractStep(chief, "-marketing-director-")).toBe(false);
+  });
+
+  it("lets super/org admins action any step", () => {
+    expect(canApproveContractStep(withRole("super_admin"), "anything")).toBe(
+      true,
+    );
+    expect(
+      canApproveContractStep(withRole("organization_admin"), "-marketing-chief"),
+    ).toBe(true);
+  });
+
+  it("resolves legacy chain roles via their position-type aliases", () => {
+    const director = withPositionType("operation-director");
+    expect(canApproveContractStep(director, "DIRECTOR")).toBe(true);
+    expect(canApproveContractStep(director, "CEO")).toBe(false);
+  });
+
+  it("honours the role's own legacy approve permission", () => {
+    const staff = withPermission(
+      "edr_freight_app:contracts:approve_director",
+    );
+    expect(canApproveContractStep(staff, "DIRECTOR")).toBe(true);
+  });
+
+  it("does NOT show to holders of an unrelated approve permission", () => {
+    // the dropped blanket fallback: a line-staff approver is not a chief
+    const lineStaff = withPermission(
+      "edr_freight_app:contracts:approve_line_staff",
+    );
+    expect(canApproveContractStep(lineStaff, "-marketing-chief")).toBe(false);
+  });
+
+  it("returns false without a user or role", () => {
+    expect(canApproveContractStep(null, "-marketing-chief")).toBe(false);
+    expect(canApproveContractStep(withPositionType("x"), null)).toBe(false);
+  });
+});
diff --git a/apps/edr-freight-web/backoffice/src/lib/no-backdate.ts b/apps/edr-freight-web/backoffice/src/lib/no-backdate.ts
new file mode 100644
index 000000000..0ce0541ee
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/lib/no-backdate.ts
@@ -0,0 +1,20 @@
+/**
+ * Backdating guard for operational time entries (gate in/out, mile truck
+ * times, delivery pickups): times must be recorded as they happen, never
+ * dated back. A one-hour grace covers real-world lag (weighbridge queue,
+ * operator finishing the form after the event).
+ */
+export const BACKDATE_GRACE_MS = 60 * 60 * 1000;
+
+/** Local-time "YYYY-MM-DDTHH:mm" for a datetime-local input's `min`. */
+export const nowLocalDateTimeInput = (): string =>
+  new Date(Date.now() - new Date().getTimezoneOffset() * 60_000)
+    .toISOString()
+    .slice(0, 16);
+
+/** True when the value is more than the grace period in the past. */
+export const isBackdated = (value: string | Date | null | undefined): boolean => {
+  if (!value) return false;
+  const t = value instanceof Date ? value.getTime() : new Date(value).getTime();
+  return Number.isFinite(t) && t < Date.now() - BACKDATE_GRACE_MS;
+};
diff --git a/apps/edr-freight-web/backoffice/src/lib/permissions.ts b/apps/edr-freight-web/backoffice/src/lib/permissions.ts
index 98f998bc0..5505a4145 100644
--- a/apps/edr-freight-web/backoffice/src/lib/permissions.ts
+++ b/apps/edr-freight-web/backoffice/src/lib/permissions.ts
@@ -2,6 +2,12 @@ import type { AuthUser } from "@/auth/types";
 import type { RuleEngineResourceSlug } from "@/types/rule-engine";
 
 export const FREIGHT_PERMS = {
+  overview: {
+    view: "edr_freight_app:overview:view",
+  },
+  support: {
+    view: "edr_freight_app:support:view",
+  },
   bookings: {
     view: "edr_freight_app:bookings:view",
     create: "edr_freight_app:bookings:create",
@@ -23,9 +29,19 @@ export const FREIGHT_PERMS = {
   },
   contracts: {
     view: "edr_freight_app:contracts:view",
-    staffAccept: "edr_freight_app:contracts:staff_accept",
-    requestChanges: "edr_freight_app:contracts:request_changes",
-    reject: "edr_freight_app:contracts:reject",
+    // Intake actions are split per freight type — mirror of the API registry.
+    staffAccept: {
+      bulk: "edr_freight_app:contracts:staff_accept:bulk",
+      container: "edr_freight_app:contracts:staff_accept:container",
+    },
+    requestChanges: {
+      bulk: "edr_freight_app:contracts:request_changes:bulk",
+      container: "edr_freight_app:contracts:request_changes:container",
+    },
+    reject: {
+      bulk: "edr_freight_app:contracts:reject:bulk",
+      container: "edr_freight_app:contracts:reject:container",
+    },
     approveLineStaff: "edr_freight_app:contracts:approve_line_staff",
     approveDirector: "edr_freight_app:contracts:approve_director",
     approveCeo: "edr_freight_app:contracts:approve_ceo",
@@ -234,12 +250,6 @@ export const FREIGHT_PERMS = {
     cancel: "edr_freight_app:warehouse_fee_invoices:cancel",
     pay: "edr_freight_app:warehouse_fee_invoices:pay",
   },
-  config: {
-    contractValidity: {
-      view: "edr_freight_app:config:contract_validity:view",
-      manage: "edr_freight_app:config:contract_validity:manage",
-    },
-  },
   settings: {
     fileUpload: {
       view: "edr_freight_app:settings:file_upload:view",
@@ -353,12 +363,38 @@ export const POSITION_KEYS = {
   djiboutiGl: "djibouti_gl",
 } as const;
 
+/** Position-type keys held by the user (e.g. "djibouti-gl-officer"). */
+export function getPositionTypeKeys(
+  user: AuthUser | null | undefined,
+): string[] {
+  if (!user) return [];
+  const keys = new Set<string>();
+  for (const emp of user.employee ?? []) {
+    for (const pos of emp.positions ?? []) {
+      if (pos.positionType?.key) keys.add(pos.positionType.key);
+    }
+  }
+  return [...keys];
+}
+
+// GL staff are identified by the root position key (department heads) OR by
+// their position-type key (sub-positions: director/chief/officer) — both
+// forms get the clearance-only locked view.
+const ET_GL_TYPE_PREFIX = "commercial-global-logistics-(et)";
+const DJ_GL_TYPE_PREFIX = "djibouti-gl";
+
 export function isEthiopianGl(user: AuthUser | null | undefined): boolean {
-  return hasPosition(user, POSITION_KEYS.ethiopianGl);
+  return (
+    hasPosition(user, POSITION_KEYS.ethiopianGl) ||
+    getPositionTypeKeys(user).some((k) => k.startsWith(ET_GL_TYPE_PREFIX))
+  );
 }
 
 export function isDjiboutiGl(user: AuthUser | null | undefined): boolean {
-  return hasPosition(user, POSITION_KEYS.djiboutiGl);
+  return (
+    hasPosition(user, POSITION_KEYS.djiboutiGl) ||
+    getPositionTypeKeys(user).some((k) => k.startsWith(DJ_GL_TYPE_PREFIX))
+  );
 }
 
 export function isSuperAdmin(user: AuthUser | null | undefined): boolean {
@@ -388,6 +424,53 @@ export function hasPermission(
   return getPermissionKeys(user).includes(key);
 }
 
+// Legacy chain roles predate position types; map each to the position types
+// that stand in for it. Mirror of the API's LEGACY_ROLE_POSITION_TYPES so the
+// button visibility matches what the approve/reject endpoint will accept.
+const LEGACY_ROLE_POSITION_TYPES: Record<string, string[]> = {
+  LINE_STAFF: ["employee", "teamLeader", "officeHead", "recordOfficer"],
+  DIRECTOR: ["director", "operation-director"],
+  CEO: ["chief", "deputy"],
+};
+
+const CONTRACT_APPROVE_ROLE_PERMISSION: Record<string, string> = {
+  LINE_STAFF: FREIGHT_PERMS.contracts.approveLineStaff,
+  DIRECTOR: FREIGHT_PERMS.contracts.approveDirector,
+  CEO: FREIGHT_PERMS.contracts.approveCeo,
+};
+
+/**
+ * Can this user action a contract approval step requiring `requiredRole`?
+ *
+ * `requiredRole` is an `iam.position_types.key` (the role vocabulary approval
+ * chains are configured in), or a legacy LINE_STAFF/DIRECTOR/CEO string. Used
+ * to show Approve/Reject only to the step's actual approver — a chief step
+ * shows only to a chief, a marketing-officer step only to that officer.
+ *
+ * Deliberately STRICTER than the API's `assertCanApproveContractStep`, which
+ * also lets through anyone holding any contract-approve permission (a fallback
+ * for delegates whose token omits the position type). That blanket is what made
+ * every approver see the button, so it is dropped here: the visibility rule is
+ * admin OR the matching position type (direct / legacy alias) OR the role's own
+ * legacy approve permission. The server still guards the mutation.
+ */
+export function canApproveContractStep(
+  user: AuthUser | null | undefined,
+  requiredRole: string | null | undefined,
+): boolean {
+  if (!user || !requiredRole) return false;
+  if (isFreightApprovalAdmin(user)) return true;
+
+  const positionTypes = getPositionTypeKeys(user);
+  if (positionTypes.includes(requiredRole)) return true;
+
+  const aliases = LEGACY_ROLE_POSITION_TYPES[requiredRole] ?? [];
+  if (aliases.some((alias) => positionTypes.includes(alias))) return true;
+
+  const legacyPermission = CONTRACT_APPROVE_ROLE_PERMISSION[requiredRole];
+  return Boolean(legacyPermission && hasPermission(user, legacyPermission));
+}
+
 export function canAccessBookings(user: AuthUser | null | undefined): boolean {
   return hasPermission(user, FREIGHT_PERMS.bookings.view);
 }
@@ -434,6 +517,31 @@ export function canViewFleet(user: AuthUser | null | undefined): boolean {
   return hasPermission(user, FREIGHT_PERMS.fleet.view);
 }
 
+export type FleetCrudResource =
+  | "locomotives"
+  | "wagons"
+  | "trains"
+  | "routes"
+  | "containers"
+  | "cargoes"
+  | "vehicles"
+  | "drivers";
+
+/**
+ * Per-resource fleet CRUD check. The legacy coarse fleet:manage key still
+ * grants every action (mirrors the API's one-of guard fallback).
+ */
+export function canFleetAction(
+  user: AuthUser | null | undefined,
+  resource: FleetCrudResource,
+  action: "create" | "update" | "delete",
+): boolean {
+  return (
+    hasPermission(user, FREIGHT_PERMS[resource][action]) ||
+    hasPermission(user, FREIGHT_PERMS.fleet.manage)
+  );
+}
+
 export function isFreightAdmin(user: AuthUser | null | undefined): boolean {
   return hasPermission(user, FREIGHT_PERMS.admin);
 }
diff --git a/apps/edr-freight-web/backoffice/src/lib/utils.ts b/apps/edr-freight-web/backoffice/src/lib/utils.ts
index a5ef19350..54bb0325d 100644
--- a/apps/edr-freight-web/backoffice/src/lib/utils.ts
+++ b/apps/edr-freight-web/backoffice/src/lib/utils.ts
@@ -4,3 +4,17 @@ import { twMerge } from "tailwind-merge";
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
 }
+
+/** Human label for a trade direction — DOMESTIC reads "Intercity" everywhere. */
+export function directionLabel(direction?: string | null): string {
+  switch (direction) {
+    case "IMPORT":
+      return "Import";
+    case "EXPORT":
+      return "Export";
+    case "DOMESTIC":
+      return "Intercity";
+    default:
+      return direction || "—";
+  }
+}
diff --git a/apps/edr-freight-web/backoffice/src/locales/am/translation.json b/apps/edr-freight-web/backoffice/src/locales/am/translation.json
index a37525807..99c1e0329 100644
--- a/apps/edr-freight-web/backoffice/src/locales/am/translation.json
+++ b/apps/edr-freight-web/backoffice/src/locales/am/translation.json
@@ -2039,6 +2039,7 @@
     "setting": "ቅንብሮች",
     "loadingAdmins": "አስተዳዳሪዎችን በመጫን ላይ...",
     "errorLoadingAdmins": "የአስተዳዳሪ መረጃን ማጫን ላይ ስህተት ተፈጥሯል",
+    "errorLoadingUnits": "ክፍሎችን ማጫን ላይ ስህተት ተፈጥሯል",
     "retry": "ደግመው ይሞክሩ",
     "assignAdmin": "አስተዳዳሪ መመደብ",
     "addAdmin": "አስተዳዳሪ ያክሉ",
@@ -2585,7 +2586,6 @@
     "archiveDepartment": "የስራ መደብ መጠርያ አርክብ አድርግ",
     "deleteDepartment": "የስራ መደብ መጠርያ ሰርዝ",
     "deleteConfirm": "የስራ መደብ መጠርያ ይሰርዝ?",
-    "delete": "ሰርዝ",
     "deleteFailed": "የስራ መደብ መጠርያ ሰረዝ ወደ ተሳክቶ",
     "cannotDeleteWithEmployees": "ተመድቦ ካለበት ሰራተኞች ጋር የስራ መደብ መጠርያ መሰረዝ አይቻልም",
     "reassignEmployeesFirst": "እባክዎ ሁሉንም ሰራተኞች በዚህ ክፍል ውስጥ ዳግም ይሰጧቸው ወይም ያስወግዱ።",
@@ -2652,6 +2652,18 @@
     "selectApplicationToLoadPermissions": "ፍቃዶቹን ለማስገንዘብ አፕሊኬሽኑን ይምረጡ",
     "copyPermissionsHint": "የነበረ የቦታ አይነት ይምረጡ፤ ፍቃዶቹ አስቀድመው ይሞላሉ፣ ከታች ማስተካከል ይችላሉ።",
     "copyPermissionsFailed": "ፍቃዶችን መቅዳት አልተቻለም",
+    "selectOrganizationToCopy": "መቅዳት የሚችሏቸውን የቦታ ዓይነቶች ለማየት መጀመሪያ ድርጅት ይምረጡ",
+    "cannotClearAllPermissions": "ተቀምጧል። ፍቃዶቹ አልተቀየሩም — ይህ የቦታ ዓይነት ቢያንስ አንድ ፍቃድ ሊኖረው ይገባል።",
+    "permissionsSelected": "{{count}} ተመርጠዋል",
+    "positionTypeCreated": "የቦታ ዓይነት ተፈጥሯል",
+    "positionTypeUpdated": "የቦታ ዓይነት ተሻሽሏል",
+    "positionTypeDeleted": "የቦታ ዓይነት ተሰርዟል",
+    "positionTypeMigrated": "የቦታ ዓይነት ዝውውር ተሻሽሏል",
+    "positionTypeNotFound": "የቦታ ዓይነት አልተገኘም",
+    "permissionsAssignFailed": "የቦታ ዓይነቱ ተቀምጧል፣ ነገር ግን ፍቃዶቹን መመደብ አልተቻለም። እንደገና ለመሞከር ደግመው ይክፈቱት።",
+    "failedToLoadPermissions": "ፍቃዶችን መጫን አልተቻለም",
+    "failedToLoadPositionTypes": "የቦታ ዓይነቶችን መጫን አልተቻለም",
+    "exportFailed": "የቦታ ዓይነት ቁልፎችን መላክ አልተቻለም",
     "perFailed": "ፍቃድ መፍጠር አልተቻለም",
     "perSuccess": "የፍቃድ አይነት ተፈጠረና ፍቃዶች ተመደቡ",
     "updatePerSuccess": "ፍቃድ በትክክል ተዘምኗል",
@@ -3117,7 +3129,7 @@
     "referenceNumberStyles": "የማጣቀሻ ቁጥር ስታይሎች",
     "other": "ሌላ",
     "styleCategories": "የስታይል ምድቦች",
-    "styleEditor": "ስታይል አርታኢ",
+    "styleEditor": "የስታይል አርታዒ",
     "livePreview": "የቀጥታ ቅድመ-እይታ",
     "fontsHint": "አማራጭ የቅርጸ-ቁምፊ ሪሶርስ ይምረጡ።",
     "fontResource": "የቅርጸ-ቁምፊ ፋይል",
@@ -3209,11 +3221,9 @@
     "previewLanguage": "የቅድመ-እይታ ቋንቋ",
     "amharic": "አማርኛ",
     "english": "እንግሊዝኛ",
-    "styleCategories": "የስታይል ምድቦች",
     "categoryHint": "ለማርትዕ ክፍል ይምረጡ",
     "expandSidebar": "የጎን ማውጫን ዘርጋ",
     "collapseSidebar": "የጎን ማውጫን ጠቅልል",
-    "styleEditor": "የስታይል አርታዒ",
     "headerFooterSelection": "ራስጌ እና ግርጌ",
     "noSettings": "ምንም የስታይል ቅንብሮች የሉም",
     "visible": "የሚታይ",
@@ -7393,5 +7403,100 @@
     "department": "ዲፓርትመንት",
     "unit": "ክፍል",
     "notAvailable": "ያልዋቀረ"
+  },
+  "orgAdmins": {
+    "title": "የድርጅት አስተዳዳሪዎች",
+    "subtitle": "አስተዳዳሪዎቹን ለማየት እና ለማስተዳደር ድርጅት ይምረጡ።",
+    "tableName": "የድርጅት አስተዳዳሪዎች",
+    "selectOrg": "ድርጅት ይምረጡ",
+    "searchOrgs": "ድርጅቶችን ይፈልጉ...",
+    "noOrgsFound": "ምንም ድርጅት አልተገኘም።",
+    "adminsCount": "{{count}} አስተዳዳሪ",
+    "adminsCount_other": "{{count}} አስተዳዳሪዎች",
+    "noAdmins": "አስተዳዳሪ የለም",
+    "activeEmployees": "{{count}} ንቁ ሰራተኞች",
+    "selectOrgPrompt": "አስተዳዳሪዎቹን ለማስተዳደር ድርጅት ይምረጡ",
+    "selectOrgPromptHint": "ከላይ ያለውን መምረጫ ተጠቅመው ድርጅት ይፈልጉ እና ይምረጡ።",
+    "noAdminsHint": "{{name}} እስካሁን አስተዳዳሪ የለውም። አዲስ አስተዳዳሪ ይጋብዙ ወይም ነባር ሰራተኛ ይመድቡ።",
+    "assignExisting": "ነባር ሰራተኛ ይመድቡ",
+    "roleOrgAdmin": "የድርጅት አስተዳዳሪ",
+    "roleUnitAdmin": "የክፍል አስተዳዳሪ",
+    "statusInvited": "የተጋበዘ",
+    "statusActive": "ንቁ",
+    "statusInactive": "ንቁ ያልሆነ",
+    "columns": {
+      "name": "ስም",
+      "email": "ኢሜይል",
+      "phone": "ስልክ",
+      "role": "ሚና",
+      "status": "ሁኔታ",
+      "addedOn": "የተጨመረበት ቀን",
+      "actions": "እርምጃዎች"
+    },
+    "actions": {
+      "edit": "መገለጫ ያስተካክሉ",
+      "resend": "ግብዣ እንደገና ይላኩ",
+      "activate": "መለያ ያንቁ",
+      "deactivate": "መለያ ያቦዝኑ",
+      "remove": "አስተዳዳሪ ያስወግዱ"
+    },
+    "form": {
+      "nameEn": "ስም (እንግሊዝኛ)",
+      "nameAm": "ስም (አማርኛ)",
+      "username": "የተጠቃሚ ስም",
+      "email": "ኢሜይል",
+      "phoneNumber": "ስልክ ቁጥር",
+      "unit": "ክፍል",
+      "selectUnit": "ክፍል ይምረጡ",
+      "loadingUnits": "ክፍሎች በመጫን ላይ...",
+      "noUnit": "ምንም — የድርጅት አስተዳዳሪ",
+      "unitRequired": "ክፍል ያስፈልጋል"
+    },
+    "edit": {
+      "title": "የአስተዳዳሪ መገለጫ ያስተካክሉ",
+      "description": "የዚህን አስተዳዳሪ የመገለጫ ዝርዝሮች ያዘምኑ።",
+      "submit": "ለውጦችን ያስቀምጡ"
+    },
+    "assign": {
+      "title": "ነባር ሰራተኛ ይመድቡ",
+      "description": "የዚህን ድርጅት ሰራተኛ ወደ አስተዳዳሪነት ያሳድጉ።",
+      "searchUsers": "ሰራተኞችን በስም ወይም በኢሜይል ይፈልጉ...",
+      "noUsersFound": "ምንም ሰራተኛ አልተገኘም።",
+      "alreadyAdmin": "አስቀድሞ አስተዳዳሪ ነው",
+      "submit": "እንደ አስተዳዳሪ ይመድቡ",
+      "loadError": "ሰራተኞችን መጫን አልተሳካም።",
+      "users": "ተጠቃሚዎች"
+    },
+    "confirmRemove": {
+      "title": "አስተዳዳሪ ይወገድ?",
+      "description": "ይህ የ{{name}}ን የአስተዳዳሪነት ሚና ከ{{org}} ያስወግዳል። የተጠቃሚው መለያ ራሱ ይቀራል።",
+      "removing": "በማስወገድ ላይ..."
+    },
+    "confirmToggle": {
+      "activateTitle": "መለያ ይንቃ?",
+      "deactivateTitle": "መለያ ይቦዝን?",
+      "description": "ይህ የ{{name}}ን የመለያ ሁኔታ በመላው ስርዓቱ ላይ ይቀይራል፣ ለዚህ ድርጅት ብቻ አይደለም።"
+    },
+    "toasts": {
+      "assigned": "አስተዳዳሪ በተሳካ ሁኔታ ተመድቧል!",
+      "removed": "አስተዳዳሪ በተሳካ ሁኔታ ተወግዷል!",
+      "resent": "ግብዣው እንደገና ተልኳል!",
+      "activated": "መለያው ነቅቷል!",
+      "deactivated": "መለያው ቦዝኗል!",
+      "profileUpdated": "መገለጫው ተዘምኗል!",
+      "resending": "ግብዣ በመላክ ላይ...",
+      "missingContact": "ይህ አስተዳዳሪ ኢሜይል ወይም ስልክ ቁጥር የለውም።",
+      "added": "አስተዳዳሪ በተሳካ ሁኔታ ተጨምሯል!"
+    },
+    "loadError": "አስተዳዳሪዎችን መጫን አልተሳካም።",
+    "pickerError": "ድርጅቶችን መጫን አልተሳካም።",
+    "addAdmin": "አስተዳዳሪ ጨምር",
+    "add": {
+      "title": "አስተዳዳሪ ጨምር",
+      "description": "የተጠቃሚ መለያ ይፍጠሩ እና በዚህ ድርጅት ውስጥ የአስተዳዳሪ መዳረሻ ይስጡ።",
+      "submit": "አስተዳዳሪ ጨምር",
+      "inviteNote": "ተጠቃሚው ይፈጠራል እና የይለፍ ቃሉን እንዲያዘጋጅ የኤስኤምኤስ ግብዣ ይደርሰዋል።",
+      "noUnitsOrgAdmin": "ይህ ድርጅት ክፍሎች የሉትም — አስተዳዳሪው እንደ የድርጅት አስተዳዳሪ ይጨመራል።"
+    }
   }
 }
diff --git a/apps/edr-freight-web/backoffice/src/locales/en/translation.json b/apps/edr-freight-web/backoffice/src/locales/en/translation.json
index 8cf8582b7..f1357c2bf 100644
--- a/apps/edr-freight-web/backoffice/src/locales/en/translation.json
+++ b/apps/edr-freight-web/backoffice/src/locales/en/translation.json
@@ -2057,6 +2057,7 @@
     "setting": "Setting",
     "loadingAdmins": "Loading admins...",
     "errorLoadingAdmins": "Error loading admin data",
+    "errorLoadingUnits": "Error loading units",
     "retry": "Retry",
     "assignAdmin": "Assign Admin",
     "addAdmin": "Add Admin",
@@ -2760,6 +2761,18 @@
     "selectApplicationToLoadPermissions": "Select an application to load its permissions",
     "copyPermissionsHint": "Pick an existing position type to pre-fill its permissions, then edit below.",
     "copyPermissionsFailed": "Failed to copy permissions",
+    "selectOrganizationToCopy": "Select an organization to see the position types you can copy from",
+    "cannotClearAllPermissions": "Saved. Permissions were left unchanged — this position type must keep at least one permission.",
+    "permissionsSelected": "{{count}} selected",
+    "positionTypeCreated": "Position type created",
+    "positionTypeUpdated": "Position type updated",
+    "positionTypeDeleted": "Position type deleted",
+    "positionTypeMigrated": "Position type migration updated",
+    "positionTypeNotFound": "Position type not found",
+    "permissionsAssignFailed": "Position type saved, but assigning its permissions failed. Reopen it to try again.",
+    "failedToLoadPermissions": "Failed to load permissions",
+    "failedToLoadPositionTypes": "Failed to load position types",
+    "exportFailed": "Failed to export position type keys",
     "perFailed": "Failed To Create Permission",
     "perSuccess": "Permission type created and permissions assigned",
     "updatePerSuccess": "Permission updated successfully",
@@ -7391,5 +7404,100 @@
     "department": "Department",
     "unit": "Unit",
     "notAvailable": "Not Available"
+  },
+  "orgAdmins": {
+    "title": "Organization Admins",
+    "subtitle": "Pick an organization to view and manage its administrators.",
+    "tableName": "Organization Admins",
+    "selectOrg": "Select an organization",
+    "searchOrgs": "Search organizations...",
+    "noOrgsFound": "No organizations found.",
+    "adminsCount": "{{count}} admin",
+    "adminsCount_other": "{{count}} admins",
+    "noAdmins": "No admins",
+    "activeEmployees": "{{count}} active employees",
+    "selectOrgPrompt": "Select an organization to manage its admins",
+    "selectOrgPromptHint": "Use the selector above to search and pick an organization.",
+    "noAdminsHint": "{{name}} has no administrators yet. Invite a new admin or assign an existing employee.",
+    "assignExisting": "Assign Existing",
+    "roleOrgAdmin": "Org Admin",
+    "roleUnitAdmin": "Unit Admin",
+    "statusInvited": "Invited",
+    "statusActive": "Active",
+    "statusInactive": "Inactive",
+    "columns": {
+      "name": "Name",
+      "email": "Email",
+      "phone": "Phone",
+      "role": "Role",
+      "status": "Status",
+      "addedOn": "Added On",
+      "actions": "Actions"
+    },
+    "actions": {
+      "edit": "Edit Profile",
+      "resend": "Resend Invite",
+      "activate": "Activate Account",
+      "deactivate": "Deactivate Account",
+      "remove": "Remove Admin"
+    },
+    "form": {
+      "nameEn": "Name (English)",
+      "nameAm": "Name (Amharic)",
+      "username": "Username",
+      "email": "Email",
+      "phoneNumber": "Phone Number",
+      "unit": "Unit",
+      "selectUnit": "Select a unit",
+      "loadingUnits": "Loading units...",
+      "noUnit": "None — organization admin",
+      "unitRequired": "Unit is required"
+    },
+    "edit": {
+      "title": "Edit Admin Profile",
+      "description": "Update this administrator's profile details.",
+      "submit": "Save Changes"
+    },
+    "assign": {
+      "title": "Assign Existing Employee",
+      "description": "Promote an employee of this organization to administrator.",
+      "searchUsers": "Search employees by name or email...",
+      "noUsersFound": "No employees found.",
+      "alreadyAdmin": "Already admin",
+      "submit": "Assign as Admin",
+      "loadError": "Failed to load employees.",
+      "users": "Users"
+    },
+    "confirmRemove": {
+      "title": "Remove Admin?",
+      "description": "This removes the admin role of {{name}} for {{org}}. The user account itself is kept.",
+      "removing": "Removing..."
+    },
+    "confirmToggle": {
+      "activateTitle": "Activate Account?",
+      "deactivateTitle": "Deactivate Account?",
+      "description": "This changes the account status of {{name}} across the whole platform, not just for this organization."
+    },
+    "toasts": {
+      "assigned": "Admin assigned successfully!",
+      "removed": "Admin removed successfully!",
+      "resent": "Invitation re-sent successfully!",
+      "activated": "Account activated successfully!",
+      "deactivated": "Account deactivated successfully!",
+      "profileUpdated": "Profile updated successfully!",
+      "resending": "Sending invite...",
+      "missingContact": "This admin has no email or phone number on file.",
+      "added": "Admin added successfully!"
+    },
+    "loadError": "Failed to load admins.",
+    "pickerError": "Failed to load organizations.",
+    "addAdmin": "Add Admin",
+    "add": {
+      "title": "Add Admin",
+      "description": "Create a user account and grant admin access in this organization.",
+      "submit": "Add Admin",
+      "inviteNote": "The user is created and receives an SMS invitation to set their password.",
+      "noUnitsOrgAdmin": "This organization has no units — the admin will be added as an organization admin."
+    }
   }
 }
diff --git a/apps/edr-freight-web/backoffice/src/locales/fr/translation.json b/apps/edr-freight-web/backoffice/src/locales/fr/translation.json
index 7f3d4e679..bd5e17fae 100644
--- a/apps/edr-freight-web/backoffice/src/locales/fr/translation.json
+++ b/apps/edr-freight-web/backoffice/src/locales/fr/translation.json
@@ -1525,6 +1525,7 @@
     "setting": "Paramètre",
     "loadingAdmins": "Chargement des administrateurs...",
     "errorLoadingAdmins": "Erreur lors du chargement des données administrateur",
+    "errorLoadingUnits": "Erreur lors du chargement des unités",
     "retry": "Réessayer",
     "assignAdmin": "Assigner un administrateur",
     "addAdmin": "Ajouter un administrateur",
@@ -1886,6 +1887,18 @@
     "selectApplicationToLoadPermissions": "Sélectionner une application pour charger ses autorisations",
     "copyPermissionsHint": "Choisissez un type de poste existant pour préremplir ses autorisations, puis modifiez ci-dessous.",
     "copyPermissionsFailed": "Échec de la copie des autorisations",
+    "selectOrganizationToCopy": "Sélectionnez une organisation pour voir les types de poste que vous pouvez copier",
+    "cannotClearAllPermissions": "Enregistré. Les autorisations n'ont pas été modifiées — ce type de poste doit conserver au moins une autorisation.",
+    "permissionsSelected": "{{count}} sélectionné(s)",
+    "positionTypeCreated": "Type de poste créé",
+    "positionTypeUpdated": "Type de poste mis à jour",
+    "positionTypeDeleted": "Type de poste supprimé",
+    "positionTypeMigrated": "Migration du type de poste mise à jour",
+    "positionTypeNotFound": "Type de poste introuvable",
+    "permissionsAssignFailed": "Type de poste enregistré, mais l'attribution de ses autorisations a échoué. Rouvrez-le pour réessayer.",
+    "failedToLoadPermissions": "Échec du chargement des autorisations",
+    "failedToLoadPositionTypes": "Échec du chargement des types de poste",
+    "exportFailed": "Échec de l'exportation des clés de type de poste",
     "perFailed": "Échec de la création de l’autorisation",
     "perSuccess": "Type d’autorisation créé et autorisations assignées",
     "updatePerSuccess": "Autorisation mise à jour avec succès",
diff --git a/apps/edr-freight-web/backoffice/src/main.tsx b/apps/edr-freight-web/backoffice/src/main.tsx
index eacd05459..aad3bbb89 100644
--- a/apps/edr-freight-web/backoffice/src/main.tsx
+++ b/apps/edr-freight-web/backoffice/src/main.tsx
@@ -11,6 +11,7 @@ import "../index.css";
 import "@edr/ui-common/theme.css";
 
 import { Toaster } from "react-hot-toast";
+import { Toaster as SonnerToaster } from "./shared/common/ui/sonner";
 
 // Initialize i18next before first paint so the detected/persisted language
 // applies immediately (the vendored IAM UI also imports this via @/i18n).
@@ -70,6 +71,9 @@ createRoot(rootElement).render(
                   message (suppressed on warehouse / mile / onboarding pages). */}
               <ApiErrorModal />
               <Toaster position="top-right" />
+              {/* sonner toasts (used across super-admin & user-management)
+                  rendered nowhere without this mount */}
+              <SonnerToaster position="top-right" richColors />
             </AuthProvider>
           </BrowserRouter>
         </StrictMode>
diff --git a/apps/edr-freight-web/backoffice/src/pages/DashboardPage.tsx b/apps/edr-freight-web/backoffice/src/pages/DashboardPage.tsx
index 701400310..2df952af8 100644
--- a/apps/edr-freight-web/backoffice/src/pages/DashboardPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/DashboardPage.tsx
@@ -67,7 +67,8 @@ const DashboardPage = () => {
               refetch();
               refetchAdmins();
             }}
-            className="bg-primary hover:bg-primary/90 text-primary-foreground">
+            className="bg-primary hover:bg-primary/90 text-primary-foreground"
+          >
             <Loader2 className="mr-2 h-4 w-4 animate-spin" />
             {t("organization.retry")}
           </Button>
@@ -140,7 +141,8 @@ const DashboardPage = () => {
             <Link to="/organizations">
               <Button
                 variant="link"
-                className="text-primary dark:text-primary-400 text-sm px-0">
+                className="text-primary dark:text-primary-400 text-sm px-0"
+              >
                 {t("organization.viewMore")}
               </Button>
             </Link>
diff --git a/apps/edr-freight-web/backoffice/src/pages/OrganizationAdminsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/OrganizationAdminsPage.tsx
index 6fce0ec39..0503baad8 100644
--- a/apps/edr-freight-web/backoffice/src/pages/OrganizationAdminsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/OrganizationAdminsPage.tsx
@@ -1,7 +1,7 @@
-import OrganizationsAdmins from "@/super-admin/components/organizationAdmins/OrganizationAdmins";
+import OrgAdminsPage from "@/super-admin/components/org-admins/OrgAdminsPage";
 
 const OrganizationAdminsPage = () => {
-  return <OrganizationsAdmins />;
+  return <OrgAdminsPage />;
 };
 
 export default OrganizationAdminsPage;
diff --git a/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestDetailPage.tsx
index 01e2368bd..fbd851d73 100644
--- a/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/bookings/BookingRequestDetailPage.tsx
@@ -6,7 +6,6 @@ import {
   LayoutGrid,
   Milestone,
   Package,
-  ShieldCheck,
 } from "lucide-react";
 import {
   Container,
@@ -36,7 +35,6 @@ import {
   BookingCompanyCard,
   BookingContractSummaryCard,
   BookingContainerUnitsCard,
-  ClearanceReviewSection,
   BookingDocumentsPanel,
   ContractOrdersPanel,
 } from "@/components/bookings/detail";
@@ -129,13 +127,9 @@ export default function BookingRequestDetailPage() {
 
   const row = toBookingListRow(booking);
   const statusMeta = getStatusMeta(booking.status);
-  // Non-customs clearance is reviewed here by Marketing in its own tab; customs
-  // bookings are handled in the Global Logistics clearance queue instead.
-  const showClearanceTab =
-    !booking.customsClearingEnabled &&
-    ["AWAITING_DOCUMENTS", "DOCUMENTS_UNDER_REVIEW", "CLEARANCE_READY"].includes(
-      booking.status,
-    );
+  // Clearance review + finalize now lives solely on the Operations "Clearance
+  // Documents" hub (/dashboard/contracts/clearance-documents → detail page), so
+  // no clearance tab is embedded here anymore.
   // A general contract drives an "Orders" tab: each drawdown order spawns a
   // child booking that staff manage (clearance/approval) independently.
   const isGeneralContract = booking.bookingType === "GENERAL_CONTRACT";
@@ -143,13 +137,11 @@ export default function BookingRequestDetailPage() {
   // customs-workflow, invoice or notice files — so the tab bar always renders.
   const requestedTab = searchParams.get("tab");
   const activeTab =
-    requestedTab === "clearance" && showClearanceTab
-      ? "clearance"
-      : requestedTab === "orders" && isGeneralContract
-        ? "orders"
-        : requestedTab === "documents"
-          ? "documents"
-          : "overview";
+    requestedTab === "orders" && isGeneralContract
+      ? "orders"
+      : requestedTab === "documents"
+        ? "documents"
+        : "overview";
   const setActiveTab = (tab: string | null) => {
     const next = new URLSearchParams(searchParams);
     if (tab && tab !== "overview") next.set("tab", tab);
@@ -209,14 +201,6 @@ export default function BookingRequestDetailPage() {
                       Orders
                     </Tabs.Tab>
                   )}
-                  {showClearanceTab && (
-                    <Tabs.Tab
-                      value="clearance"
-                      leftSection={<ShieldCheck size={16} />}
-                    >
-                      Customer clearance
-                    </Tabs.Tab>
-                  )}
                   <Tabs.Tab
                     value="documents"
                     leftSection={<FolderOpen size={16} />}
@@ -236,14 +220,6 @@ export default function BookingRequestDetailPage() {
                     />
                   </Tabs.Panel>
                 )}
-                {showClearanceTab && (
-                  <Tabs.Panel value="clearance">
-                    <ClearanceReviewSection
-                      bookingId={booking.id}
-                      onChanged={() => refetch()}
-                    />
-                  </Tabs.Panel>
-                )}
                 <Tabs.Panel value="documents">
                   <BookingDocumentsPanel bookingId={booking.id} />
                 </Tabs.Panel>
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/ClearanceDocumentsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/ClearanceDocumentsPage.tsx
index 945d142df..a4ae9f880 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ClearanceDocumentsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ClearanceDocumentsPage.tsx
@@ -1,3 +1,4 @@
+import { directionLabel } from "@/lib/utils";
 import {
   ActionIcon,
   Box,
@@ -137,9 +138,14 @@ export default function ClearanceDocumentsPage() {
   const generalQuery = useQuery({
     queryKey: ["clearance-documents", "general", bookingStatuses, page, search],
     queryFn: () =>
+      // Per-booking self-clearance instances are drawdowns under GENERAL
+      // non-customs contracts: they carry bookingType=ONE_TIME (each shipment
+      // is one-time) with contractKind=GENERAL, so filtering on
+      // bookingType=GENERAL_CONTRACT returned nothing. customsClearingEnabled
+      // =false + the three per-booking clearance statuses already isolate
+      // exactly this worklist — the same set the old booking-request tab showed.
       bookingsService.list({
         statuses: bookingStatuses,
-        bookingType: "GENERAL_CONTRACT",
         customsClearingEnabled: "false",
         page,
         pageSize: PAGE_SIZE,
@@ -199,7 +205,7 @@ export default function ClearanceDocumentsPage() {
                   variant="outline"
                   className="h-5 border-border/50 bg-background/50 px-1.5 text-[10px] font-medium uppercase backdrop-blur-sm"
                 >
-                  {c.tradeDirection}
+                  {directionLabel(c.tradeDirection)}
                 </Badge>
                 <Badge
                   variant="secondary"
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceDetailPage.tsx
index 63dbb5d0b..1ed7d71ec 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceDetailPage.tsx
@@ -1,3 +1,4 @@
+import { directionLabel } from "@/lib/utils";
 import { useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { useLocation, useParams } from "react-router-dom";
@@ -92,6 +93,11 @@ export default function ContractClearanceDetailPage() {
   }, [clearance]);
 
   const reference = contract?.reference ?? "Clearance";
+  // Path A (non-customs) → Operations reviews & finalizes; Path B (customs) → GL.
+  // This page serves BOTH hubs (Ops "Clearance Documents" + GL "Document
+  // Clearance"), so the reviewer is decided by the contract, not the hub — a
+  // hardcoded value routes non-customs finalize to the GL endpoint and 409s.
+  const selfClear = !contract?.customsClearingEnabled;
   const phasedCustoms =
     contract?.contractKind === "ONE_TIME" && Boolean(contract.customsClearingEnabled);
   const docsPhaseComplete =
@@ -337,7 +343,7 @@ export default function ContractClearanceDetailPage() {
                 <ContractClearanceReviewSection
                   contractId={id!}
                   hideSummary
-                  selfClear={false}
+                  selfClear={selfClear}
                   readOnly={reviewReadOnly}
                   approvalsLocked={phasedCustoms && docReviewLocked}
                   queriesLocked={queriesLocked}
@@ -468,7 +474,7 @@ function ClearanceHero({
                 color={direction === "IMPORT" ? "edr-green" : "gray"}
                 radius="sm"
               >
-                {direction}
+                {directionLabel(direction)}
               </Badge>
               {customs ? (
                 <Badge
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceListPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceListPage.tsx
index 328736f3d..86aea96ee 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceListPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractClearanceListPage.tsx
@@ -1,3 +1,4 @@
+import { directionLabel } from "@/lib/utils";
 import {
   Fragment,
   useCallback,
@@ -180,7 +181,7 @@ function CustomsBadge({ customs }: { customs: boolean }) {
 function DirectionIcon({ direction }: { direction: string }) {
   const isImport = direction === "IMPORT";
   const Icon = isImport ? Truck : ShipWheel;
-  const label = isImport ? "Import" : direction === "EXPORT" ? "Export" : "—";
+  const label = directionLabel(direction);
   return (
     <Tooltip label={label} withArrow>
       <ThemeIcon
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestDetailPage.tsx
index 0929700ba..0d26a1334 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestDetailPage.tsx
@@ -1,3 +1,4 @@
+import { directionLabel } from "@/lib/utils";
 import { useNavigate, useParams, useSearchParams } from "react-router-dom";
 import { useQuery } from "@tanstack/react-query";
 import {
@@ -18,7 +19,6 @@ import {
   Receipt,
   RefreshCw,
   Route as RouteIcon,
-  ShieldCheck,
   Snowflake,
   Users,
 } from "lucide-react";
@@ -50,7 +50,6 @@ import { ContractStatusBadge } from "@/components/contracts/ContractStatusBadge"
 import { ContractWorkflowStepper } from "@/components/contracts/ContractWorkflowStepper";
 import { ContractActionsToolbar } from "@/components/contracts/ContractActionsToolbar";
 import { ContractApprovalStepsCard } from "@/components/contracts/ContractApprovalStepsCard";
-import { ContractClearanceReviewSection } from "@/components/contracts/ContractClearanceReviewSection";
 import { ClearanceWorkflowFilesPanel } from "@/components/contracts/ClearanceWorkflowFilesPanel";
 import { ContractRevisionTimeline } from "@/components/contracts/ContractRevisionTimeline";
 import {
@@ -73,15 +72,14 @@ import {
 import type { CustomerDocument } from "@/types/customer";
 import type { Freight } from "@edr/types";
 
-// Clearance phase — staff can still ACT (approve / query / finalize).
+// Clearance phase — actionable (docs approve / query / finalize on the hub).
 const CLEARANCE_ACTIVE_STATUSES = [
   "AWAITING_CLEARANCE_DOCUMENTS",
   "CLEARANCE_UNDER_REVIEW",
   "CLEARANCE_READY_FOR_BOOKING",
 ];
 
-// Clearance is done — the tab stays visible but READ-ONLY so staff/customer can
-// see which documents were approved, by whom, and when.
+// Clearance is done — its documents are still worth loading (read-only record).
 const CLEARANCE_DONE_STATUSES = [
   "ACTIVE_SHIPMENT_IN_PROGRESS",
   "FULLY_EXECUTED",
@@ -90,7 +88,9 @@ const CLEARANCE_DONE_STATUSES = [
   "EXPIRED",
 ];
 
-// Show the Clearance Review tab in either phase (active or done).
+// Contract is in (or past) its clearance phase — load the clearance view so the
+// Documents tab can show customs workflow files, and surface the "Review
+// clearance" deep-link to the Operations hub.
 const CLEARANCE_REVIEW_STATUSES = [
   ...CLEARANCE_ACTIVE_STATUSES,
   ...CLEARANCE_DONE_STATUSES,
@@ -150,13 +150,13 @@ export default function ContractRequestDetailPage() {
     }
   };
 
-  const showClearanceTabQuery = Boolean(
+  const hasClearancePhase = Boolean(
     contract && CLEARANCE_REVIEW_STATUSES.includes(contract.status),
   );
   const { data: clearanceView } = useQuery({
     queryKey: QUERY_KEYS.CONTRACTS.clearance(id ?? ""),
     queryFn: () => contractsService.getClearance(id!),
-    enabled: Boolean(id) && showClearanceTabQuery,
+    enabled: Boolean(id) && hasClearancePhase,
   });
 
   // Customer profile documents (national ID, TIN, import/business license) for
@@ -269,18 +269,10 @@ export default function ContractRequestDetailPage() {
     contract.status === "APPROVED_PENDING_SIGNATURE" ||
     contract.status === "REJECTED";
 
-  const showClearanceTab = CLEARANCE_REVIEW_STATUSES.includes(contract.status);
-  const phasedCustoms =
-    contract.contractKind === "ONE_TIME" && Boolean(contract.customsClearingEnabled);
-  const docsPhaseComplete =
-    clearanceView?.milestones?.some(
-      (m) => m.milestoneCode === "DOCUMENTS_APPROVED" && m.status === "COMPLETED",
-    ) ?? false;
-  const clearanceApprovalsLocked = phasedCustoms && docsPhaseComplete;
-  // Once clearance is finalized the tab is informational only — no approve/query.
-  const clearanceReadOnly = CLEARANCE_DONE_STATUSES.includes(contract.status);
-  // Path A (no customs) → Operations reviews; Path B (customs) → GL reviews.
-  const selfClear = !contract.customsClearingEnabled;
+  // Clearance review + finalize now lives solely on the Operations "Clearance
+  // Documents" hub. The Staff-actions "Review clearance" button deep-links there
+  // while the contract is in a clearance-review status — no embedded tab here.
+  const inClearanceReview = CLEARANCE_REVIEW_STATUSES.includes(contract.status);
   const files = contract.files ?? [];
   const contractPdf = files.find((f) => f.code === "contract");
   // Signature files (code `signature_<role>`) are baked into the contract PDF —
@@ -302,9 +294,7 @@ export default function ContractRequestDetailPage() {
       ? "documents"
       : requestedTab === "customer"
         ? "customer"
-        : requestedTab === "clearance" && showClearanceTab
-          ? "clearance"
-          : "details";
+        : "details";
 
   const customerLabel = contract.isGovernment
     ? (contract.governmentInstitution ?? "Government")
@@ -484,39 +474,13 @@ export default function ContractRequestDetailPage() {
             <Tabs.Tab value="customer" leftSection={<Users size={16} />}>
               Customer
             </Tabs.Tab>
-            {showClearanceTab && (
-              <Tabs.Tab
-                value="clearance"
-                leftSection={<ShieldCheck size={16} />}
-              >
-                Clearance Review
-              </Tabs.Tab>
-            )}
           </Tabs.List>
         </Tabs>
 
         <Grid gap="lg">
           {/* LEFT — primary content */}
           <Grid.Col span={{ base: 12, lg: 8 }}>
-            {currentTab === "clearance" ? (
-              <Stack gap="lg">
-                <ContractClearanceReviewSection
-                  contractId={id!}
-                  selfClear={selfClear}
-                  readOnly={clearanceReadOnly}
-                  phasedCustoms={phasedCustoms}
-                  approvalsLocked={clearanceApprovalsLocked}
-                  onChanged={() => refetch()}
-                />
-                {(clearanceView?.workflowFiles?.length ?? 0) > 0 ? (
-                  <ClearanceWorkflowFilesPanel
-                    files={clearanceView!.workflowFiles!}
-                    onView={view}
-                    onDownload={(f) => void handleDownloadFile({ id: f.id, name: f.name } as never)}
-                  />
-                ) : null}
-              </Stack>
-            ) : currentTab === "documents" ? (
+            {currentTab === "documents" ? (
               <Stack gap="lg">
                 <ContractDocumentsCard
                   files={contractDocuments}
@@ -597,7 +561,7 @@ export default function ContractRequestDetailPage() {
               <SectionCard icon={Package} title="Cargo scope">
                 <Group gap="sm" mb="md">
                   <Badge variant="light" color="gray" radius="sm" tt="uppercase">
-                    {contract.tradeDirection}
+                    {directionLabel(contract.tradeDirection)}
                   </Badge>
                   <Badge variant="light" color="gray" radius="sm" tt="uppercase">
                     {contract.freightType}
@@ -726,7 +690,12 @@ export default function ContractRequestDetailPage() {
                   contract={contract}
                   mutations={mutations}
                   onReviewClearance={
-                    showClearanceTab ? () => setTab("clearance") : undefined
+                    inClearanceReview
+                      ? () =>
+                          navigate(
+                            `/dashboard/contracts/clearance-documents/${contract.id}`,
+                          )
+                      : undefined
                   }
                 />
                 {showApprovalCard && (
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestsPage.tsx
index 1752aa7c0..7687b62f0 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/ContractRequestsPage.tsx
@@ -1,3 +1,4 @@
+import { directionLabel } from "@/lib/utils";
 import {
   ActionIcon,
   Box,
@@ -299,7 +300,7 @@ export default function ContractRequestsPage() {
                 variant="outline"
                 className="h-5 border-border/50 bg-background/50 px-1.5 text-[10px] font-medium uppercase backdrop-blur-sm"
               >
-                {c.tradeDirection}
+                {directionLabel(c.tradeDirection)}
               </Badge>
               <Badge
                 variant="secondary"
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/GlClearanceDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/GlClearanceDetailPage.tsx
index f68d6562b..108e4f461 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/GlClearanceDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/GlClearanceDetailPage.tsx
@@ -1,3 +1,4 @@
+import { directionLabel } from "@/lib/utils";
 import { useState } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { useParams } from "react-router-dom";
@@ -16,6 +17,7 @@ import {
 } from "@mantine/core";
 import {
   AlertCircle,
+  AlertTriangle,
   ClipboardList,
   FileText,
   Upload,
@@ -36,6 +38,8 @@ import {
   type GlClearanceUploadKind,
 } from "@/components/contracts/GlClearanceUploadModal";
 import { PhasedClearanceActionPanel } from "@/components/contracts/PhasedClearanceActionPanel";
+import { SectionCard } from "@/components/bookings/detail/SectionCard";
+import { IncidentReportCard } from "@/components/contracts/gl-actions/IncidentReportCard";
 import { findWorkflowFile } from "@/components/contracts/PhasedUploadedFileRow";
 import { useFileViewer } from "@/hooks/useFileViewer";
 import { useBookingMilestones } from "@/hooks/contracts/useContracts";
@@ -146,6 +150,9 @@ export default function GlClearanceDetailPage() {
     "vesselDepartureDate" in data.clearance
       ? (data.clearance.vesselDepartureDate ?? null)
       : null;
+  // Incident reporting attaches to a booking; a contract-level clearance can
+  // only report against its linked booking once one exists.
+  const incidentBookingId = data.kind === "booking" ? id : linkedBookingId;
 
   // The shipment booking instance backing this clearance (per-booking GENERAL
   // customs). Bare until GL completes it: no cargo, no price.
@@ -173,7 +180,7 @@ export default function GlClearanceDetailPage() {
           ]}
           meta={
             <Badge variant="light" color={isImport ? "edr-green" : "gray"} radius="sm">
-              {data.tradeDirection}
+              {directionLabel(data.tradeDirection)}
             </Badge>
           }
           action={
@@ -220,6 +227,11 @@ export default function GlClearanceDetailPage() {
             >
               Customs documents (all steps)
             </Tabs.Tab>
+            {incidentBookingId ? (
+              <Tabs.Tab value="incidents" leftSection={<AlertTriangle size={14} />}>
+                Incidents
+              </Tabs.Tab>
+            ) : null}
           </Tabs.List>
 
           <Tabs.Panel value="workflow">
@@ -309,6 +321,19 @@ export default function GlClearanceDetailPage() {
               </Box>
             )}
           </Tabs.Panel>
+
+          {incidentBookingId ? (
+            <Tabs.Panel value="incidents">
+              <SectionCard icon={AlertTriangle} title="Incident reports" accent="edr-green">
+                <Stack gap="sm">
+                  <Text size="sm" c="dimmed">
+                    Log container or seal issues discovered during clearance handling.
+                  </Text>
+                  <IncidentReportCard bookingId={incidentBookingId} />
+                </Stack>
+              </SectionCard>
+            </Tabs.Panel>
+          ) : null}
         </Tabs>
       </Stack>
 
diff --git a/apps/edr-freight-web/backoffice/src/pages/contracts/GlDjiboutiClearanceListPage.tsx b/apps/edr-freight-web/backoffice/src/pages/contracts/GlDjiboutiClearanceListPage.tsx
index a43a6ff55..c5c424e9a 100644
--- a/apps/edr-freight-web/backoffice/src/pages/contracts/GlDjiboutiClearanceListPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/contracts/GlDjiboutiClearanceListPage.tsx
@@ -1,3 +1,4 @@
+import { directionLabel } from "@/lib/utils";
 import { useCallback, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import {
@@ -249,7 +250,7 @@ function toContractRow(c: Freight.IContract): ContractRow {
 function DirectionIcon({ direction }: { direction: string }) {
   const isImport = direction === "IMPORT";
   const Icon = isImport ? Truck : ShipWheel;
-  const label = isImport ? "Import" : direction === "EXPORT" ? "Export" : "—";
+  const label = directionLabel(direction);
   return (
     <Tooltip label={label} withArrow>
       <ThemeIcon
diff --git a/apps/edr-freight-web/backoffice/src/pages/customers/CustomerDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/customers/CustomerDetailPage.tsx
index 79e2f3b6e..35488b94f 100644
--- a/apps/edr-freight-web/backoffice/src/pages/customers/CustomerDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/customers/CustomerDetailPage.tsx
@@ -56,6 +56,8 @@ import {
   humanize,
 } from "@/components/customers";
 import { KpiStrip, PageContainer, PageHeader } from "@/components/page";
+import { useAuth } from "@/auth/useAuth";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 import {
   downloadBookingFile,
   fetchViewableFile,
@@ -108,6 +110,7 @@ export default function CustomerDetailPage() {
   const { id } = useParams<{ id: string }>();
   const navigate = useNavigate();
   const { view, viewer } = useFileViewer();
+  const { user } = useAuth();
 
   const { data: company, isLoading } = useQuery(
     api.customers.getById.queryOptions({
@@ -180,6 +183,11 @@ export default function CustomerDetailPage() {
   // API's rule exactly, so no button is offered that the server would reject.
   const stillOnboarding = company ? isOnboardingDraft(company) : false;
   const canReview = company ? hasSubmittedOnboarding(company) : true;
+  // Workflow gate (above) AND authority: asking the customer to correct a
+  // document is a `customers:verify` action, so a view-only reviewer reads the
+  // documents but is not offered the request-change control.
+  const canRequestDocChange =
+    canReview && hasPermission(user, FREIGHT_PERMS.customers.verify);
 
   /** Document the reviewer is asking the customer to correct; null = closed. */
   const [changeRequestDoc, setChangeRequestDoc] =
@@ -446,7 +454,7 @@ export default function CustomerDetailPage() {
             >
               <Download size={16} />
             </ActionIcon>
-            {canReview && (
+            {canRequestDocChange && (
               <ActionIcon
                 component="button"
                 type="button"
@@ -468,7 +476,7 @@ export default function CustomerDetailPage() {
         ),
       },
     ],
-    [view, canReview],
+    [view, canRequestDocChange],
   );
 
   const paymentColumns: ColumnDef<CustomerPayment>[] = useMemo(
diff --git a/apps/edr-freight-web/backoffice/src/pages/customers/CustomersPage.tsx b/apps/edr-freight-web/backoffice/src/pages/customers/CustomersPage.tsx
index d70e6d040..4c63dc09e 100644
--- a/apps/edr-freight-web/backoffice/src/pages/customers/CustomersPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/customers/CustomersPage.tsx
@@ -81,6 +81,10 @@ const VIEW_FILTERS: Record<
 };
 
 const SORT_OPTIONS = [
+  // Queue ordering: awaiting first approval → pending profile changes → the
+  // rest, newest first within each group. The default, so whatever marketing
+  // must act on is always on top of the list.
+  { value: "review:DESC", label: "Needs review first" },
   { value: "createdAt:DESC", label: "Newest first" },
   { value: "createdAt:ASC", label: "Oldest first" },
   { value: "name:ASC", label: "Name (A–Z)" },
@@ -93,11 +97,11 @@ export default function CustomersPage() {
   const [query, setQuery] = useState("");
   const [debouncedQuery] = useDebouncedValue(query, 300);
   const [view, setView] = useState<CustomerView>("all");
-  const [sort, setSort] = useState<string>("createdAt:DESC");
+  const [sort, setSort] = useState<string>("review:DESC");
 
   const filter = useMemo(() => {
     const [sortBy, sortOrder] = sort.split(":") as [
-      "name" | "createdAt" | "updatedAt",
+      "review" | "name" | "createdAt" | "updatedAt",
       "ASC" | "DESC",
     ];
     return {
diff --git a/apps/edr-freight-web/backoffice/src/pages/dashboard/OverviewPage.tsx b/apps/edr-freight-web/backoffice/src/pages/dashboard/OverviewPage.tsx
index 0813460f7..c7606641e 100644
--- a/apps/edr-freight-web/backoffice/src/pages/dashboard/OverviewPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/dashboard/OverviewPage.tsx
@@ -20,12 +20,14 @@ import {
 } from "@mantine/core";
 import { useQueryClient } from "@tanstack/react-query";
 
+import { useAuth } from "@/auth/useAuth";
 import { OverviewPageHeader } from "@/components/overview/OverviewPageHeader";
 import { OverviewQuickLinks } from "@/components/overview/OverviewQuickLinks";
 import { OverviewTabContent } from "@/components/overview/OverviewTabContent";
 import "@/components/overview/overview.css";
 import { QUERY_KEYS } from "@/constants/QUERY_KEYS";
 import { useOverview } from "@/hooks/useOverview";
+import { FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 import type { OverviewRange, OverviewTabKey } from "@/types/overview";
 
 const TAB_ITEMS: Array<{
@@ -40,6 +42,8 @@ const TAB_ITEMS: Array<{
     | "customers"
     | "staff";
   metricKey: string;
+  /** Any of these keys grants the tab. */
+  permission: string[];
 }> = [
   {
     value: "bookings",
@@ -47,6 +51,7 @@ const TAB_ITEMS: Array<{
     icon: FileText,
     kpiKey: "bookings",
     metricKey: "totalActive",
+    permission: [FREIGHT_PERMS.bookings.view],
   },
   {
     value: "contracts",
@@ -54,6 +59,7 @@ const TAB_ITEMS: Array<{
     icon: FileSignature,
     kpiKey: "contracts",
     metricKey: "totalActive",
+    permission: [FREIGHT_PERMS.contracts.view],
   },
   {
     value: "billing",
@@ -61,6 +67,7 @@ const TAB_ITEMS: Array<{
     icon: Banknote,
     kpiKey: "billing",
     metricKey: "successfulPaymentsMtd",
+    permission: [FREIGHT_PERMS.bookings.view, FREIGHT_PERMS.payments.view],
   },
   {
     value: "operations",
@@ -68,6 +75,12 @@ const TAB_ITEMS: Array<{
     icon: Train,
     kpiKey: "operations",
     metricKey: "trainsActive",
+    permission: [
+      FREIGHT_PERMS.trainScheduling.view,
+      FREIGHT_PERMS.warehouseInventory.view,
+      FREIGHT_PERMS.firstMile.view,
+      FREIGHT_PERMS.lastMile.view,
+    ],
   },
   {
     value: "customers",
@@ -75,6 +88,7 @@ const TAB_ITEMS: Array<{
     icon: Users,
     kpiKey: "customers",
     metricKey: "totalCustomers",
+    permission: [FREIGHT_PERMS.customers.view],
   },
   {
     value: "staff",
@@ -82,6 +96,12 @@ const TAB_ITEMS: Array<{
     icon: UserCheck,
     kpiKey: "staff",
     metricKey: "activeEmployees",
+    permission: [
+      FREIGHT_PERMS.admin,
+      FREIGHT_PERMS.staff.roles.view,
+      FREIGHT_PERMS.staff.employeeRegistration.view,
+      FREIGHT_PERMS.staff.roleAssignment.view,
+    ],
   },
 ];
 
@@ -98,7 +118,19 @@ const OverviewPage = () => {
   const [range, setRange] = useState<OverviewRange>("30d");
   const [activeTab, setActiveTab] = useState<OverviewTabKey>("bookings");
   const queryClient = useQueryClient();
-  const { data: summary, isLoading, isError, refetch, isFetching } = useOverview(range);
+  const { user } = useAuth();
+  const { data: summary, isLoading, isError, error, refetch, isFetching } = useOverview(range);
+
+  // Permission-scoped view: only tabs the user may see; a restricted role
+  // (e.g. operations) gets a summary 403 — that is not a connection problem.
+  const visibleTabs = TAB_ITEMS.filter((tab) =>
+    tab.permission.some((key) => hasPermission(user, key)),
+  );
+  const currentTab = visibleTabs.some((t) => t.value === activeTab)
+    ? activeTab
+    : visibleTabs[0]?.value;
+  const accessDenied =
+    (error as { response?: { status?: number } } | null)?.response?.status === 403;
 
   const handleRefresh = () => {
     void refetch();
@@ -126,7 +158,7 @@ const OverviewPage = () => {
           />
         )}
 
-        {isError && (
+        {isError && !accessDenied && (
           <Alert
             icon={<AlertCircle size={16} />}
             color="red"
@@ -142,48 +174,52 @@ const OverviewPage = () => {
           </Alert>
         )}
 
-        <Tabs
-          value={activeTab}
-          onChange={(value) => setActiveTab((value as OverviewTabKey) ?? "bookings")}
-          variant="pills"
-          color="edr-green"
-          keepMounted={false}
-          classNames={{ list: "ov-tablist", tab: "ov-tab" }}
-        >
-          <Tabs.List>
-            {TAB_ITEMS.map((tab) => {
-              const Icon = tab.icon;
-              const isActive = activeTab === tab.value;
-              return (
-                <Tabs.Tab
-                  key={tab.value}
-                  value={tab.value}
-                  leftSection={<Icon size={17} />}
-                  rightSection={
-                    summary ? (
-                      <Badge
-                        size="sm"
-                        radius="sm"
-                        variant={isActive ? "white" : "light"}
-                        color={isActive ? "edr-green" : "gray"}
-                      >
-                        {getTabBadge(tab)}
-                      </Badge>
-                    ) : undefined
-                  }
-                >
-                  {tab.label}
-                </Tabs.Tab>
-              );
-            })}
-          </Tabs.List>
+        {visibleTabs.length > 0 && (
+          <Tabs
+            value={currentTab}
+            onChange={(value) =>
+              setActiveTab((value as OverviewTabKey) ?? visibleTabs[0].value)
+            }
+            variant="pills"
+            color="edr-green"
+            keepMounted={false}
+            classNames={{ list: "ov-tablist", tab: "ov-tab" }}
+          >
+            <Tabs.List>
+              {visibleTabs.map((tab) => {
+                const Icon = tab.icon;
+                const isActive = currentTab === tab.value;
+                return (
+                  <Tabs.Tab
+                    key={tab.value}
+                    value={tab.value}
+                    leftSection={<Icon size={17} />}
+                    rightSection={
+                      summary ? (
+                        <Badge
+                          size="sm"
+                          radius="sm"
+                          variant={isActive ? "white" : "light"}
+                          color={isActive ? "edr-green" : "gray"}
+                        >
+                          {getTabBadge(tab)}
+                        </Badge>
+                      ) : undefined
+                    }
+                  >
+                    {tab.label}
+                  </Tabs.Tab>
+                );
+              })}
+            </Tabs.List>
 
-          {TAB_ITEMS.map((tab) => (
-            <Tabs.Panel key={tab.value} value={tab.value} pt="lg">
-              <OverviewTabContent tab={tab.value} range={range} />
-            </Tabs.Panel>
-          ))}
-        </Tabs>
+            {visibleTabs.map((tab) => (
+              <Tabs.Panel key={tab.value} value={tab.value} pt="lg">
+                <OverviewTabContent tab={tab.value} range={range} />
+              </Tabs.Panel>
+            ))}
+          </Tabs>
+        )}
 
         <Paper p="lg" radius="lg" withBorder>
           <OverviewQuickLinks />
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
index 95dff563a..63a722550 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
@@ -3,6 +3,8 @@ import { Box, Button, Card, Container, Group, Modal, Select, Stack, Text, Title
 import { useMutation, useQuery } from "@tanstack/react-query";
 
 import { api } from "@/services/api";
+import { useAuth } from "@/auth/useAuth";
+import { canFleetAction } from "@/lib/permissions";
 import Breadcrumbs from "@/components/ui/Breadcrumbs";
 import { Inbox, Plus, Warehouse } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
@@ -37,6 +39,10 @@ const FleetResourcePage = () => {
   const slug = getFleetSlugFromPath(location.pathname) ?? DEFAULT_SLUG;
   const config = getFleetResource(slug);
   const { toast } = useToast();
+  const { user } = useAuth();
+  const canCreate = canFleetAction(user, slug, "create");
+  const canUpdate = canFleetAction(user, slug, "update");
+  const canDelete = canFleetAction(user, slug, "delete");
 
   const { pagination, setPagination } = usePagination({ pageSize: 10 });
   const [search, setSearch] = useState("");
@@ -278,12 +284,16 @@ const FleetResourcePage = () => {
             record={row.original}
             config={config}
             layout="compact"
-            onEdit={(record) => {
-              setEditing(record);
-              setFormOpen(true);
-            }}
-            onRemove={setRemoveTarget}
-            onAssignDriver={setAssigningDriver}
+            onEdit={
+              canUpdate
+                ? (record) => {
+                    setEditing(record);
+                    setFormOpen(true);
+                  }
+                : undefined
+            }
+            onRemove={canDelete ? setRemoveTarget : undefined}
+            onAssignDriver={canUpdate ? setAssigningDriver : undefined}
             onHistory={setHistoryTarget}
           />
         </div>
@@ -291,7 +301,7 @@ const FleetResourcePage = () => {
     });
 
     return base;
-  }, [config, dynamicOptions.yards]);
+  }, [config, dynamicOptions.yards, canUpdate, canDelete]);
 
   const tableStatus = isLoading ? "loading" : isError ? "error" : "success";
 
@@ -390,15 +400,17 @@ const FleetResourcePage = () => {
           <Group gap="sm">
             {slug === "wagons" ? (
               <>
-                <Button
-                  variant="light"
-                  color="edr-green"
-                  leftSection={<Warehouse size={16} />}
-                  styles={{ label: { fontWeight: 500 } }}
-                  onClick={() => setWagonWorkspaceOpen(true)}
-                >
-                  Yard Workspace
-                </Button>
+                {canUpdate ? (
+                  <Button
+                    variant="light"
+                    color="edr-green"
+                    leftSection={<Warehouse size={16} />}
+                    styles={{ label: { fontWeight: 500 } }}
+                    onClick={() => setWagonWorkspaceOpen(true)}
+                  >
+                    Yard Workspace
+                  </Button>
+                ) : null}
                 <Button
                   variant="light"
                   color="grape"
@@ -410,12 +422,14 @@ const FleetResourcePage = () => {
                 </Button>
               </>
             ) : null}
-            <Button leftSection={<Plus size={16} />} styles={{ label: { fontWeight: 500 } }} onClick={() => {
-              setEditing(null);
-              setFormOpen(true);
-            }}>
-              {config.addLabel}
-            </Button>
+            {canCreate ? (
+              <Button leftSection={<Plus size={16} />} styles={{ label: { fontWeight: 500 } }} onClick={() => {
+                setEditing(null);
+                setFormOpen(true);
+              }}>
+                {config.addLabel}
+              </Button>
+            ) : null}
           </Group>
         </Group>
 
@@ -529,11 +543,15 @@ const FleetResourcePage = () => {
               pageCount={pageCount}
               totalCount={filteredRows.length}
               onPaginationChange={setPagination}
-              onEdit={(record) => {
-                setEditing(record);
-                setFormOpen(true);
-              }}
-              onRemove={setRemoveTarget}
+              onEdit={
+                canUpdate
+                  ? (record) => {
+                      setEditing(record);
+                      setFormOpen(true);
+                    }
+                  : undefined
+              }
+              onRemove={canDelete ? setRemoveTarget : undefined}
             />
           )}
         </Stack>
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/MaintenancePage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/MaintenancePage.tsx
index 3aa2506b5..12f5181d6 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/MaintenancePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/MaintenancePage.tsx
@@ -14,8 +14,10 @@ import {
   Text,
   Title,
   Container,
+  ActionIcon,
+  Tooltip,
 } from '@mantine/core';
-import { Plus } from 'lucide-react';
+import { CheckCircle2, Plus, Trash2 } from 'lucide-react';
 import Breadcrumbs from '@/components/ui/Breadcrumbs';
 import { useToast } from '@/hooks/use-toast';
 import { QUERY_KEYS } from '@/constants/QUERY_KEYS';
@@ -26,6 +28,7 @@ interface MaintenanceSchedule {
   id: string;
   vehicleId: string;
   maintenanceType: string;
+  serviceItem?: string | null;
   description: string;
   scheduledDate: string;
   completedDate?: string;
@@ -35,8 +38,36 @@ interface MaintenanceSchedule {
   serviceProvider?: string;
 }
 
+interface DueBoardRow {
+  scheduleId: string;
+  vehicleId: string;
+  plateNumber: string;
+  maintenanceType: string;
+  serviceItem: string | null;
+  description: string;
+  scheduledDate: string;
+  nextDueDate: string | null;
+  nextDueKm: number | null;
+  currentKm: number | null;
+  kmRemaining: number | null;
+  daysRemaining: number | null;
+  overdue: boolean;
+}
+
+interface MaintenanceInterval {
+  id: string;
+  vehicleId: string;
+  maintenanceType: string;
+  serviceItem: string | null;
+  intervalKm: number | null;
+  intervalDays: number | null;
+  description: string | null;
+  isActive: boolean;
+}
+
 const emptyForm = {
   maintenanceType: 'PREVENTIVE',
+  serviceItem: '',
   description: '',
   scheduledDate: new Date().toISOString().split('T')[0],
   estimatedCost: 0,
@@ -44,12 +75,34 @@ const emptyForm = {
   notes: '',
 };
 
+const emptyIntervalForm = {
+  maintenanceType: 'PREVENTIVE',
+  serviceItem: '',
+  intervalKm: '' as number | '',
+  intervalDays: '' as number | '',
+  description: '',
+};
+
 export function MaintenancePage() {
   const { toast } = useToast();
   const queryClient = useQueryClient();
   const [selectedVehicle, setSelectedVehicle] = useState<string | null>(null);
   const [openScheduleModal, setOpenScheduleModal] = useState(false);
   const [formData, setFormData] = useState(emptyForm);
+  const [intervalForm, setIntervalForm] = useState(emptyIntervalForm);
+  const [completeTarget, setCompleteTarget] = useState<MaintenanceSchedule | null>(null);
+  const [completeOdometer, setCompleteOdometer] = useState<number | ''>('');
+  const [completeCost, setCompleteCost] = useState<number | ''>('');
+
+  // Maintenance is driven by time AND km, not a picked-then-scheduled action —
+  // this is the fleet-wide board of what's actually due, by date or mileage.
+  const { data: dueBoard, isLoading: dueLoading } = useQuery({
+    queryKey: QUERY_KEYS.MAINTENANCE.dueBoard(),
+    queryFn: async () => {
+      const res = await api.get('/maintenance/due-board');
+      return (res.data || []) as DueBoardRow[];
+    },
+  });
 
   const { data: vehiclesData } = useQuery({
     queryKey: QUERY_KEYS.VEHICLES.list(),
@@ -69,7 +122,32 @@ export function MaintenancePage() {
     enabled: !!selectedVehicle,
   });
 
+  const { data: intervals } = useQuery({
+    queryKey: QUERY_KEYS.MAINTENANCE.intervals(selectedVehicle || ''),
+    queryFn: async () => {
+      if (!selectedVehicle) return [];
+      const res = await api.get(`/maintenance/intervals/${selectedVehicle}`);
+      return (res.data || []) as MaintenanceInterval[];
+    },
+    enabled: !!selectedVehicle,
+  });
+
   const upcomingList: MaintenanceSchedule[] = Array.isArray(upcoming) ? upcoming : [];
+  const intervalList: MaintenanceInterval[] = Array.isArray(intervals) ? intervals : [];
+
+  const invalidateVehicle = () => {
+    void queryClient.invalidateQueries({ queryKey: QUERY_KEYS.MAINTENANCE.ROOT });
+  };
+
+  const onError = (err: unknown) => {
+    toast({
+      title: 'Error',
+      description:
+        (err as { response?: { data?: { message?: string } } })?.response?.data?.message ??
+        'Failed',
+      variant: 'destructive',
+    });
+  };
 
   const scheduleMutation = useMutation({
     mutationFn: async () => {
@@ -77,24 +155,79 @@ export function MaintenancePage() {
       const res = await api.post('/maintenance/schedules', {
         vehicleId: selectedVehicle,
         ...formData,
+        serviceItem: formData.serviceItem.trim() || undefined,
       });
       return res.data;
     },
     onSuccess: () => {
       toast({ title: 'Maintenance scheduled' });
-      queryClient.invalidateQueries({
-        queryKey: QUERY_KEYS.MAINTENANCE.upcoming(selectedVehicle || ''),
-      });
+      invalidateVehicle();
       setOpenScheduleModal(false);
       setFormData(emptyForm);
     },
-    onError: (err: any) => {
-      toast({
-        title: 'Error',
-        description: err?.response?.data?.message ?? 'Failed',
-        variant: 'destructive',
+    onError,
+  });
+
+  // Interval upsert: "oil change every 10,000 km" — drives the auto-scheduling
+  // of the next service when a maintenance completes with an odometer reading.
+  const intervalMutation = useMutation({
+    mutationFn: async () => {
+      if (!selectedVehicle) return;
+      const res = await api.post('/maintenance/intervals', {
+        vehicleId: selectedVehicle,
+        maintenanceType: intervalForm.maintenanceType,
+        serviceItem: intervalForm.serviceItem.trim() || undefined,
+        intervalKm: intervalForm.intervalKm === '' ? undefined : Number(intervalForm.intervalKm),
+        intervalDays:
+          intervalForm.intervalDays === '' ? undefined : Number(intervalForm.intervalDays),
+        description: intervalForm.description.trim() || undefined,
       });
+      return res.data;
     },
+    onSuccess: () => {
+      toast({ title: 'Interval saved' });
+      invalidateVehicle();
+      setIntervalForm(emptyIntervalForm);
+    },
+    onError,
+  });
+
+  const deactivateIntervalMutation = useMutation({
+    mutationFn: async (id: string) => api.delete(`/maintenance/intervals/${id}`),
+    onSuccess: () => {
+      toast({ title: 'Interval deactivated' });
+      invalidateVehicle();
+    },
+    onError,
+  });
+
+  // Completion with odometer: the reading is what advances KM-based
+  // scheduling — the API auto-creates the next SCHEDULED item from it.
+  const completeMutation = useMutation({
+    mutationFn: async () => {
+      if (!completeTarget) return;
+      const res = await api.patch(`/maintenance/schedules/${completeTarget.id}`, {
+        status: 'COMPLETED',
+        completedDate: new Date().toISOString(),
+        odometerReading: completeOdometer === '' ? undefined : Number(completeOdometer),
+        actualCost: completeCost === '' ? undefined : Number(completeCost),
+      });
+      return res.data;
+    },
+    onSuccess: () => {
+      toast({
+        title: 'Maintenance completed',
+        description:
+          completeOdometer === ''
+            ? 'No odometer recorded — next service was NOT auto-scheduled.'
+            : 'Next service auto-scheduled from the recorded odometer.',
+      });
+      invalidateVehicle();
+      setCompleteTarget(null);
+      setCompleteOdometer('');
+      setCompleteCost('');
+    },
+    onError,
   });
 
   const vehicleOptions =
@@ -132,6 +265,64 @@ export function MaintenancePage() {
       </Group>
 
       <Stack gap="md">
+        <Card withBorder>
+          <Card.Section p="md" withBorder>
+            <Text fw={500}>Due Board — by date and driven km</Text>
+          </Card.Section>
+          <Card.Section p="md">
+            {dueLoading ? (
+              <Text>Loading…</Text>
+            ) : dueBoard && dueBoard.length > 0 ? (
+              <Table striped highlightOnHover>
+                <Table.Thead>
+                  <Table.Tr>
+                    <Table.Th>Vehicle</Table.Th>
+                    <Table.Th>Type</Table.Th>
+                    <Table.Th>Service Item</Table.Th>
+                    <Table.Th>Next Due Date</Table.Th>
+                    <Table.Th>Next Due Km</Table.Th>
+                    <Table.Th>Current Km</Table.Th>
+                    <Table.Th>Remaining</Table.Th>
+                    <Table.Th>Status</Table.Th>
+                  </Table.Tr>
+                </Table.Thead>
+                <Table.Tbody>
+                  {dueBoard.map((row) => (
+                    <Table.Tr
+                      key={row.scheduleId}
+                      onClick={() => setSelectedVehicle(row.vehicleId)}
+                      style={{ cursor: 'pointer' }}
+                    >
+                      <Table.Td>{row.plateNumber}</Table.Td>
+                      <Table.Td>{row.maintenanceType}</Table.Td>
+                      <Table.Td>{row.serviceItem ?? '—'}</Table.Td>
+                      <Table.Td>
+                        {row.nextDueDate ? new Date(row.nextDueDate).toLocaleDateString() : '—'}
+                      </Table.Td>
+                      <Table.Td>{row.nextDueKm ?? '—'}</Table.Td>
+                      <Table.Td>{row.currentKm ?? '—'}</Table.Td>
+                      <Table.Td>
+                        {row.kmRemaining != null
+                          ? `${row.kmRemaining} km`
+                          : row.daysRemaining != null
+                            ? `${row.daysRemaining} d`
+                            : '—'}
+                      </Table.Td>
+                      <Table.Td>
+                        <Badge color={row.overdue ? 'edr-red' : 'edr-blue'}>
+                          {row.overdue ? 'OVERDUE' : 'SCHEDULED'}
+                        </Badge>
+                      </Table.Td>
+                    </Table.Tr>
+                  ))}
+                </Table.Tbody>
+              </Table>
+            ) : (
+              <Text c="dimmed">Nothing scheduled fleet-wide</Text>
+            )}
+          </Card.Section>
+        </Card>
+
         <Card withBorder padding="md">
           <Select
             label="Select Vehicle"
@@ -150,50 +341,179 @@ export function MaintenancePage() {
             </Text>
           </Card>
         ) : (
-          <Card withBorder>
-            <Card.Section p="md" withBorder>
-              <Text fw={500}>Upcoming Maintenance</Text>
-            </Card.Section>
-            <Card.Section p="md">
-              {isLoading ? (
-                <Text>Loading...</Text>
-              ) : upcomingList.length > 0 ? (
-                <Table striped highlightOnHover>
-                  <Table.Thead>
-                    <Table.Tr>
-                      <Table.Th>Type</Table.Th>
-                      <Table.Th>Description</Table.Th>
-                      <Table.Th>Scheduled</Table.Th>
-                      <Table.Th>Est. Cost</Table.Th>
-                      <Table.Th>Status</Table.Th>
-                    </Table.Tr>
-                  </Table.Thead>
-                  <Table.Tbody>
-                    {upcomingList.map((m) => (
-                      <Table.Tr key={m.id}>
-                        <Table.Td>{m.maintenanceType}</Table.Td>
-                        <Table.Td>{m.description}</Table.Td>
-                        <Table.Td>{new Date(m.scheduledDate).toLocaleDateString()}</Table.Td>
-                        <Table.Td>
-                          {m.estimatedCost != null
-                            ? `ETB ${Number(m.estimatedCost).toLocaleString('en-US', {
-                                minimumFractionDigits: 2,
-                                maximumFractionDigits: 2,
-                              })}`
-                            : '—'}
-                        </Table.Td>
-                        <Table.Td>
-                          <Badge color={statusColor(m.status)}>{m.status}</Badge>
-                        </Table.Td>
+          <>
+            <Card withBorder>
+              <Card.Section p="md" withBorder>
+                <Text fw={500}>Service Intervals — drives auto-scheduling</Text>
+                <Text size="xs" c="dimmed">
+                  e.g. oil change every 10,000 km. On completion with an odometer reading, the
+                  next service is scheduled automatically at reading + interval.
+                </Text>
+              </Card.Section>
+              <Card.Section p="md">
+                <Stack gap="sm">
+                  {intervalList.length > 0 && (
+                    <Table striped>
+                      <Table.Thead>
+                        <Table.Tr>
+                          <Table.Th>Type</Table.Th>
+                          <Table.Th>Service Item</Table.Th>
+                          <Table.Th>Every (km)</Table.Th>
+                          <Table.Th>Every (days)</Table.Th>
+                          <Table.Th>Description</Table.Th>
+                          <Table.Th />
+                        </Table.Tr>
+                      </Table.Thead>
+                      <Table.Tbody>
+                        {intervalList.map((i) => (
+                          <Table.Tr key={i.id}>
+                            <Table.Td>{i.maintenanceType}</Table.Td>
+                            <Table.Td>{i.serviceItem ?? '—'}</Table.Td>
+                            <Table.Td>{i.intervalKm ?? '—'}</Table.Td>
+                            <Table.Td>{i.intervalDays ?? '—'}</Table.Td>
+                            <Table.Td>{i.description ?? '—'}</Table.Td>
+                            <Table.Td>
+                              <Tooltip label="Deactivate — stops auto-scheduling">
+                                <ActionIcon
+                                  variant="subtle"
+                                  color="red"
+                                  onClick={() => deactivateIntervalMutation.mutate(i.id)}
+                                >
+                                  <Trash2 size={15} />
+                                </ActionIcon>
+                              </Tooltip>
+                            </Table.Td>
+                          </Table.Tr>
+                        ))}
+                      </Table.Tbody>
+                    </Table>
+                  )}
+                  <Group align="flex-end" gap="sm" wrap="wrap">
+                    <Select
+                      label="Type"
+                      w={150}
+                      data={['PREVENTIVE', 'CORRECTIVE', 'INSPECTION', 'REPAIR']}
+                      value={intervalForm.maintenanceType}
+                      onChange={(v) =>
+                        setIntervalForm({ ...intervalForm, maintenanceType: v || 'PREVENTIVE' })
+                      }
+                    />
+                    <TextInput
+                      label="Service item"
+                      placeholder="e.g. oil change"
+                      w={170}
+                      value={intervalForm.serviceItem}
+                      onChange={(e) =>
+                        setIntervalForm({ ...intervalForm, serviceItem: e.currentTarget.value })
+                      }
+                    />
+                    <NumberInput
+                      label="Every (km)"
+                      min={0}
+                      w={130}
+                      value={intervalForm.intervalKm}
+                      onChange={(v) =>
+                        setIntervalForm({ ...intervalForm, intervalKm: v === '' ? '' : Number(v) })
+                      }
+                    />
+                    <NumberInput
+                      label="Every (days)"
+                      min={0}
+                      w={130}
+                      value={intervalForm.intervalDays}
+                      onChange={(v) =>
+                        setIntervalForm({
+                          ...intervalForm,
+                          intervalDays: v === '' ? '' : Number(v),
+                        })
+                      }
+                    />
+                    <TextInput
+                      label="Description"
+                      placeholder="Oil and filter change"
+                      style={{ flex: 1, minWidth: 160 }}
+                      value={intervalForm.description}
+                      onChange={(e) =>
+                        setIntervalForm({ ...intervalForm, description: e.currentTarget.value })
+                      }
+                    />
+                    <Button
+                      color="edr-green"
+                      leftSection={<Plus size={14} />}
+                      loading={intervalMutation.isPending}
+                      disabled={
+                        intervalForm.intervalKm === '' && intervalForm.intervalDays === ''
+                      }
+                      onClick={() => intervalMutation.mutate()}
+                    >
+                      Save interval
+                    </Button>
+                  </Group>
+                </Stack>
+              </Card.Section>
+            </Card>
+
+            <Card withBorder>
+              <Card.Section p="md" withBorder>
+                <Text fw={500}>Upcoming Maintenance</Text>
+              </Card.Section>
+              <Card.Section p="md">
+                {isLoading ? (
+                  <Text>Loading...</Text>
+                ) : upcomingList.length > 0 ? (
+                  <Table striped highlightOnHover>
+                    <Table.Thead>
+                      <Table.Tr>
+                        <Table.Th>Type</Table.Th>
+                        <Table.Th>Service Item</Table.Th>
+                        <Table.Th>Description</Table.Th>
+                        <Table.Th>Scheduled</Table.Th>
+                        <Table.Th>Est. Cost</Table.Th>
+                        <Table.Th>Status</Table.Th>
+                        <Table.Th />
                       </Table.Tr>
-                    ))}
-                  </Table.Tbody>
-                </Table>
-              ) : (
-                <Text c="dimmed">No upcoming maintenance</Text>
-              )}
-            </Card.Section>
-          </Card>
+                    </Table.Thead>
+                    <Table.Tbody>
+                      {upcomingList.map((m) => (
+                        <Table.Tr key={m.id}>
+                          <Table.Td>{m.maintenanceType}</Table.Td>
+                          <Table.Td>{m.serviceItem ?? '—'}</Table.Td>
+                          <Table.Td>{m.description}</Table.Td>
+                          <Table.Td>{new Date(m.scheduledDate).toLocaleDateString()}</Table.Td>
+                          <Table.Td>
+                            {m.estimatedCost != null
+                              ? `ETB ${Number(m.estimatedCost).toLocaleString('en-US', {
+                                  minimumFractionDigits: 2,
+                                  maximumFractionDigits: 2,
+                                })}`
+                              : '—'}
+                          </Table.Td>
+                          <Table.Td>
+                            <Badge color={statusColor(m.status)}>{m.status}</Badge>
+                          </Table.Td>
+                          <Table.Td>
+                            {(m.status === 'SCHEDULED' || m.status === 'IN_PROGRESS') && (
+                              <Button
+                                size="compact-xs"
+                                variant="light"
+                                color="edr-green"
+                                leftSection={<CheckCircle2 size={13} />}
+                                onClick={() => setCompleteTarget(m)}
+                              >
+                                Complete
+                              </Button>
+                            )}
+                          </Table.Td>
+                        </Table.Tr>
+                      ))}
+                    </Table.Tbody>
+                  </Table>
+                ) : (
+                  <Text c="dimmed">No upcoming maintenance</Text>
+                )}
+              </Card.Section>
+            </Card>
+          </>
         )}
       </Stack>
 
@@ -210,6 +530,12 @@ export function MaintenancePage() {
             value={formData.maintenanceType}
             onChange={(v) => setFormData({ ...formData, maintenanceType: v || 'PREVENTIVE' })}
           />
+          <TextInput
+            label="Service item"
+            placeholder="e.g. oil change — links this schedule to its interval"
+            value={formData.serviceItem}
+            onChange={(e) => setFormData({ ...formData, serviceItem: e.currentTarget.value })}
+          />
           <TextInput
             label="Description"
             placeholder="What needs to be done?"
@@ -254,6 +580,49 @@ export function MaintenancePage() {
           </Group>
         </Stack>
       </Modal>
+
+      <Modal
+        opened={completeTarget != null}
+        onClose={() => setCompleteTarget(null)}
+        title={`Complete maintenance${completeTarget?.serviceItem ? ` — ${completeTarget.serviceItem}` : ''}`}
+        size="md"
+      >
+        <Stack gap="md">
+          <Text size="sm" c="dimmed">
+            Record the odometer at completion — the next service is auto-scheduled at reading +
+            interval (e.g. completed at 50,000 km with a 10,000 km interval ⇒ next due at 60,000
+            km).
+          </Text>
+          <NumberInput
+            label="Odometer reading (km)"
+            placeholder="e.g. 50000"
+            min={0}
+            required
+            value={completeOdometer}
+            onChange={(v) => setCompleteOdometer(v === '' ? '' : Number(v))}
+          />
+          <NumberInput
+            label="Actual cost (ETB)"
+            min={0}
+            value={completeCost}
+            onChange={(v) => setCompleteCost(v === '' ? '' : Number(v))}
+          />
+          <Group justify="flex-end">
+            <Button variant="light" onClick={() => setCompleteTarget(null)}>
+              Cancel
+            </Button>
+            <Button
+              color="edr-green"
+              leftSection={<CheckCircle2 size={15} />}
+              loading={completeMutation.isPending}
+              disabled={completeOdometer === ''}
+              onClick={() => completeMutation.mutate()}
+            >
+              Complete & schedule next
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
     </Container>
   );
 }
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/ProcurementPage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/ProcurementPage.tsx
index 0c6bbabf0..584e3e13b 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/ProcurementPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/ProcurementPage.tsx
@@ -61,6 +61,7 @@ const clean = <T extends Record<string, unknown>>(obj: T): Partial<T> =>
   ) as Partial<T>;
 
 const emptyAcquisition = {
+  itemName: "",
   vehicleId: "",
   vendorId: "",
   acquisitionType: "PURCHASE" as AcquisitionType,
@@ -239,6 +240,7 @@ export default function ProcurementPage() {
             <Table striped highlightOnHover>
               <Table.Thead>
                 <Table.Tr>
+                  <Table.Th>Item / Asset</Table.Th>
                   <Table.Th>Vehicle</Table.Th>
                   <Table.Th>Type</Table.Th>
                   <Table.Th>Date</Table.Th>
@@ -249,7 +251,7 @@ export default function ProcurementPage() {
               <Table.Tbody>
                 {loadingAcquisitions ? (
                   <Table.Tr>
-                    <Table.Td colSpan={5}>
+                    <Table.Td colSpan={6}>
                       <Group justify="center" py="md">
                         <Loader size="sm" />
                       </Group>
@@ -257,7 +259,7 @@ export default function ProcurementPage() {
                   </Table.Tr>
                 ) : acquisitions.length === 0 ? (
                   <Table.Tr>
-                    <Table.Td colSpan={5}>
+                    <Table.Td colSpan={6}>
                       <Text c="dimmed" ta="center" py="md">
                         No acquisitions recorded yet.
                       </Text>
@@ -266,6 +268,7 @@ export default function ProcurementPage() {
                 ) : null}
                 {acquisitions.map((a: AssetAcquisition) => (
                   <Table.Tr key={a.id}>
+                    <Table.Td>{a.itemName || "—"}</Table.Td>
                     <Table.Td>{vehicleLabel(a.vehicle, a.vehicleId)}</Table.Td>
                     <Table.Td>
                       <Badge size="sm" color={typeBadgeColor(a.acquisitionType)}>
@@ -411,31 +414,51 @@ export default function ProcurementPage() {
         size="lg"
       >
         <Stack gap="md">
+          <TextInput
+            label="Item / Asset"
+            placeholder="What was acquired — e.g. brake pads, tyres, truck 3-15288"
+            value={acqForm.itemName}
+            onChange={(e) => setAcqForm({ ...acqForm, itemName: e.currentTarget.value })}
+            required
+          />
           <Select
-            label="Vehicle"
-            placeholder="Select vehicle"
+            label="Related vehicle (optional)"
+            description="Only when the acquisition is a fleet vehicle itself — parts and general procurement stay unlinked."
+            placeholder="Not tied to a vehicle"
             data={vehicleOptions}
             value={acqForm.vehicleId}
             onChange={(val) => setAcqForm({ ...acqForm, vehicleId: val || "" })}
             searchable
             clearable
           />
-          <Select
-            label="Vendor"
-            placeholder="Select vendor"
-            data={vendorOptions}
-            value={acqForm.vendorId}
-            onChange={(val) => setAcqForm({ ...acqForm, vendorId: val || "" })}
-            searchable
-            clearable
-          />
+          <Group gap="xs" align="flex-end" wrap="nowrap">
+            <Select
+              style={{ flex: 1 }}
+              label="Vendor"
+              placeholder="Select vendor"
+              data={vendorOptions}
+              value={acqForm.vendorId}
+              onChange={(val) => setAcqForm({ ...acqForm, vendorId: val || "" })}
+              searchable
+              clearable
+            />
+            <Button variant="light" size="sm" onClick={() => setVendorModalOpen(true)}>
+              Register vendor
+            </Button>
+          </Group>
           <Select
             label="Acquisition Type"
             data={ACQUISITION_TYPES}
             value={acqForm.acquisitionType}
-            onChange={(val) =>
-              setAcqForm({ ...acqForm, acquisitionType: (val as AcquisitionType) || "PURCHASE" })
-            }
+            onChange={(val) => {
+              const acquisitionType = (val as AcquisitionType) || "PURCHASE";
+              // Lease terms are invalid on a purchase — drop them on switch.
+              setAcqForm(
+                acquisitionType === "PURCHASE"
+                  ? { ...acqForm, acquisitionType, leaseStart: "", leaseEnd: "", monthlyPayment: undefined }
+                  : { ...acqForm, acquisitionType },
+              );
+            }}
             required
           />
           <TextInput
@@ -471,28 +494,32 @@ export default function ProcurementPage() {
             decimalScale={2}
             min={0}
           />
-          <TextInput
-            label="Lease Start"
-            type="date"
-            value={acqForm.leaseStart}
-            onChange={(e) => setAcqForm({ ...acqForm, leaseStart: e.currentTarget.value })}
-          />
-          <TextInput
-            label="Lease End"
-            type="date"
-            value={acqForm.leaseEnd}
-            onChange={(e) => setAcqForm({ ...acqForm, leaseEnd: e.currentTarget.value })}
-          />
-          <NumberInput
-            label="Monthly Payment"
-            placeholder="0.00"
-            value={acqForm.monthlyPayment}
-            onChange={(val) =>
-              setAcqForm({ ...acqForm, monthlyPayment: val as number | undefined })
-            }
-            decimalScale={2}
-            min={0}
-          />
+          {acqForm.acquisitionType !== "PURCHASE" && (
+            <>
+              <TextInput
+                label="Lease Start"
+                type="date"
+                value={acqForm.leaseStart}
+                onChange={(e) => setAcqForm({ ...acqForm, leaseStart: e.currentTarget.value })}
+              />
+              <TextInput
+                label="Lease End"
+                type="date"
+                value={acqForm.leaseEnd}
+                onChange={(e) => setAcqForm({ ...acqForm, leaseEnd: e.currentTarget.value })}
+              />
+              <NumberInput
+                label="Monthly Payment"
+                placeholder="0.00"
+                value={acqForm.monthlyPayment}
+                onChange={(val) =>
+                  setAcqForm({ ...acqForm, monthlyPayment: val as number | undefined })
+                }
+                decimalScale={2}
+                min={0}
+              />
+            </>
+          )}
           <Select
             label="Status"
             data={ACQUISITION_STATUSES}
@@ -514,7 +541,7 @@ export default function ProcurementPage() {
             <Button
               onClick={() => createAcquisition.mutate()}
               loading={createAcquisition.isPending}
-              disabled={!acqForm.acquisitionDate}
+              disabled={!acqForm.acquisitionDate || acqForm.itemName.trim().length < 2}
             >
               Save Acquisition
             </Button>
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/RoutesPage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/RoutesPage.tsx
index 3ea10df7d..d4a26133f 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/RoutesPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/RoutesPage.tsx
@@ -36,6 +36,8 @@ import RuleEngineListFooter from "@/components/ruleEngine/RuleEngineListFooter";
 import { ruleEngineTable } from "@/components/ruleEngine/ruleEngineStyles";
 import { api } from "@/services/api";
 import { ruleEngineService } from "@/services/ruleEngine/ruleEngine.service";
+import { useAuth } from "@/auth/useAuth";
+import { canFleetAction } from "@/lib/permissions";
 import { useToast } from "@/hooks/use-toast";
 import {
   formatRouteLabel,
@@ -160,6 +162,10 @@ export default function RoutesPage() {
   const { viewMode, setViewMode } = useFleetViewMode("routes");
   const { pagination, setPagination } = usePagination({ pageSize: 10 });
   const { toast } = useToast();
+  const { user } = useAuth();
+  const canCreate = canFleetAction(user, "routes", "create");
+  const canUpdate = canFleetAction(user, "routes", "update");
+  const canDelete = canFleetAction(user, "routes", "delete");
 
   const routesQuery = useQuery(api.routes.list.queryOptions());
   const yardsQuery = useQuery(api.routes.yards.queryOptions());
@@ -441,26 +447,30 @@ export default function RoutesPage() {
                 <Eye size={16} />
               </ActionIcon>
             </Tooltip>
-            <Tooltip label="Edit">
-              <ActionIcon variant="subtle" color="gray" onClick={() => openEdit(row.original)}>
-                <Edit size={16} />
-              </ActionIcon>
-            </Tooltip>
-            <Tooltip label="Mark stop working">
-              <ActionIcon
-                variant="subtle"
-                color="red"
-                disabled={row.original.status === "STOP_WORKING" || deactivateMutation.isPending}
-                onClick={() => handleDeactivate(row.original)}
-              >
-                <Trash2 size={16} />
-              </ActionIcon>
-            </Tooltip>
+            {canUpdate ? (
+              <Tooltip label="Edit">
+                <ActionIcon variant="subtle" color="gray" onClick={() => openEdit(row.original)}>
+                  <Edit size={16} />
+                </ActionIcon>
+              </Tooltip>
+            ) : null}
+            {canDelete ? (
+              <Tooltip label="Mark stop working">
+                <ActionIcon
+                  variant="subtle"
+                  color="red"
+                  disabled={row.original.status === "STOP_WORKING" || deactivateMutation.isPending}
+                  onClick={() => handleDeactivate(row.original)}
+                >
+                  <Trash2 size={16} />
+                </ActionIcon>
+              </Tooltip>
+            ) : null}
           </Group>
         ),
       },
     ];
-  }, [deactivateMutation.isPending]);
+  }, [deactivateMutation.isPending, canUpdate, canDelete]);
 
   return (
     <PageContainer>
@@ -468,9 +478,11 @@ export default function RoutesPage() {
         title="Routes"
         subtitle="Define rail corridors, segment distances, and operational status for train scheduling."
         action={
-          <Button leftSection={<Plus size={18} />} onClick={openCreate}>
-            Add route
-          </Button>
+          canCreate ? (
+            <Button leftSection={<Plus size={18} />} onClick={openCreate}>
+              Add route
+            </Button>
+          ) : undefined
         }
       />
 
@@ -555,9 +567,11 @@ export default function RoutesPage() {
                           <Button variant="light" size="compact-sm" onClick={() => setViewing(route)}>
                             View
                           </Button>
-                          <Button variant="light" size="compact-sm" onClick={() => openEdit(route)}>
-                            Edit
-                          </Button>
+                          {canUpdate ? (
+                            <Button variant="light" size="compact-sm" onClick={() => openEdit(route)}>
+                              Edit
+                            </Button>
+                          ) : null}
                         </Group>
                       </Stack>
                     </Card>
diff --git a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
index 69812182f..f30330d96 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/FirstMilePage.tsx
@@ -936,6 +936,12 @@ const FirstMilePage = () => {
   };
 
   const openBulkAssign = () => {
+    // A single selection has full booking context (details, container list) —
+    // use the richer single-record flow instead of the blank bulk form.
+    if (selectedIds.length === 1) {
+      openAssign(selectedIds[0]);
+      return;
+    }
     setBulkMode(true);
     setActiveId(null);
     setVehicleRows([{ vehicleId: null, containerNumber: "" }]);
diff --git a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
index 3f96edd2f..a8edab7ae 100644
--- a/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/operations/LastMilePage.tsx
@@ -1066,6 +1066,12 @@ const LastMilePage = () => {
   };
 
   const openBulkAssign = () => {
+    // A single selection has full booking context (details, container list) —
+    // use the richer single-record flow instead of the blank bulk form.
+    if (selectedIds.length === 1) {
+      openAssign(selectedIds[0]);
+      return;
+    }
     setBulkMode(true);
     setActiveId(null);
     setVehicleRows([{ vehicleId: null, containerNumbers: [] }]);
diff --git a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RateApprovalsSection.tsx b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RateApprovalsSection.tsx
index 6156762a0..a61376158 100644
--- a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RateApprovalsSection.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RateApprovalsSection.tsx
@@ -25,6 +25,8 @@ const FIELD_LABELS: Record<string, string> = {
   tradeDirection: "Direction",
   containerTypeId: "Container type",
   cargoTypeId: "Cargo type",
+  originYardId: "Origin yard",
+  destinationYardId: "Destination yard",
 };
 
 const fmtDateTime = (iso: string) =>
@@ -36,12 +38,20 @@ const fmtDateTime = (iso: string) =>
     hour12: false,
   });
 
-const fmtValue = (field: string, value: unknown): string => {
+const fmtValue = (
+  field: string,
+  value: unknown,
+  labels?: Record<string, string>,
+): string => {
   if (value === null || value === undefined || value === "") return "—";
   if (field === "rateValue") {
     const num = Number(value);
     return Number.isNaN(num) ? String(value) : num.toLocaleString();
   }
+  // Yard ids are unreadable — an approver decides on the route, not a UUID.
+  if (field === "originYardId" || field === "destinationYardId") {
+    return labels?.[String(value)] ?? String(value);
+  }
   return String(value).replace(/_/g, " ");
 };
 
@@ -77,6 +87,8 @@ interface RateApprovalsSectionProps {
   canDecide: boolean;
   approve: Decide;
   reject: Decide;
+  /** yardId → label, so a re-routed rate reads as yards, not UUIDs. */
+  yardLabels?: Record<string, string>;
 }
 
 /**
@@ -89,6 +101,7 @@ const RateApprovalsSection = ({
   canDecide,
   approve,
   reject,
+  yardLabels,
 }: RateApprovalsSectionProps) => {
   const [openId, setOpenId] = useState<string | null>(null);
   const [notes, setNotes] = useState<Record<string, string>>({});
@@ -212,11 +225,11 @@ const RateApprovalsSection = ({
                         {FIELD_LABELS[field] ?? field}
                       </Text>
                       <Text size="sm" c="dimmed" td="line-through">
-                        {fmtValue(field, r.previousValues[field])}
+                        {fmtValue(field, r.previousValues[field], yardLabels)}
                       </Text>
                       <ArrowRight size={13} />
                       <Text size="sm" fw={600}>
-                        {fmtValue(field, r.payload[field])}
+                        {fmtValue(field, r.payload[field], yardLabels)}
                       </Text>
                     </Group>
                   ))}
diff --git a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RuleEngineResourcePage.tsx b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RuleEngineResourcePage.tsx
index 3057f9c11..536f04ba7 100644
--- a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RuleEngineResourcePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/RuleEngineResourcePage.tsx
@@ -13,6 +13,7 @@ import {
     Loader,
     Modal,
     Stack,
+    Tabs,
     Text,
     Tooltip,
 } from "@mantine/core";
@@ -94,7 +95,14 @@ const yardOptionsForLegEnd = (
   let country: string | undefined;
   if (appliesTo === "INTERCITY") {
     country = "Ethiopia";
-  } else if (appliesTo === "CONTAINER" || appliesTo === "BULK") {
+  } else if (
+    appliesTo === "CONTAINER" ||
+    appliesTo === "BULK" ||
+    // Customs clearance + empty-container return are sold per direction +
+    // route, so their yard dropdowns narrow exactly like base freight.
+    (appliesTo === "OTHER" &&
+      ["CUSTOMS_CLEARANCE", "WITH_RETURN"].includes(String(values.trigger ?? "")))
+  ) {
     const direction = String(values.tradeDirection ?? "");
     // Direction is what decides the countries, so offer nothing until it is set
     // rather than defaulting to one and letting it read as a real choice.
@@ -124,6 +132,10 @@ const RuleEngineResourcePage = () => {
 
   const { pagination, setPagination } = usePagination({ pageSize: 10 });
   const [search, setSearch] = useState("");
+  // Category tabs (rates page): the active tab's filters go to the backend.
+  const [activeTab, setActiveTab] = useState<string>(
+    config?.listTabs?.[0]?.key ?? "",
+  );
   const [formOpen, setFormOpen] = useState(false);
   const [editing, setEditing] = useState<RuleEngineRecord | null>(null);
   const [deleteTarget, setDeleteTarget] = useState<RuleEngineRecord | null>(
@@ -153,10 +165,13 @@ const RuleEngineResourcePage = () => {
           sortOrder: "ASC" as const,
         }
         : {}),
+      ...(config?.listTabs?.find((t) => t.key === activeTab)?.filters ?? {}),
     }),
     [
       config?.orderConfig,
       config?.supportsSearch,
+      config?.listTabs,
+      activeTab,
       search,
       pagination.pageIndex,
       pagination.pageSize,
@@ -166,7 +181,8 @@ const RuleEngineResourcePage = () => {
   useEffect(() => {
     setPagination((prev) => ({ pageIndex: 0, pageSize: prev.pageSize }));
     setSearch("");
-  }, [config?.slug, setPagination]);
+    setActiveTab(config?.listTabs?.[0]?.key ?? "");
+  }, [config?.slug, config?.listTabs, setPagination]);
 
   const { data, isLoading, isError, error } = useRuleEngineList(
     config?.slug ?? DEFAULT_CONFIGURATION_SLUG,
@@ -253,6 +269,10 @@ const RuleEngineResourcePage = () => {
   );
   const { data: yardOptions, isLoading: yardOptionsLoading } =
     useYardOptions(usesYardField);
+  const yardLabelById = useMemo(
+    () => Object.fromEntries((yardOptions ?? []).map((y) => [y.value, y.label])),
+    [yardOptions],
+  );
   const usesApprovalRoleField = Boolean(
     config?.formFields.some(
       (f) => f.name === "requiredRole" || f.name === "blocksRole",
@@ -645,6 +665,7 @@ const RuleEngineResourcePage = () => {
           canDecide={canApproveRates}
           approve={rateChangeWorkflow.approve}
           reject={rateChangeWorkflow.reject}
+          yardLabels={yardLabelById}
         />
       ) : null}
 
@@ -685,6 +706,25 @@ const RuleEngineResourcePage = () => {
 
       <Card p={0}>
         <Stack gap={0}>
+          {config.listTabs && (
+            <Tabs
+              value={activeTab}
+              onChange={(v) => {
+                setActiveTab(v ?? config.listTabs![0].key);
+                setPagination({ pageIndex: 0, pageSize: pagination.pageSize });
+              }}
+              px="md"
+              pt="sm"
+            >
+              <Tabs.List>
+                {config.listTabs.map((tab) => (
+                  <Tabs.Tab key={tab.key} value={tab.key}>
+                    {tab.label}
+                  </Tabs.Tab>
+                ))}
+              </Tabs.List>
+            </Tabs>
+          )}
           <Box px="md" pt="md" pb="sm" w="100%">
             <RuleEngineToolbar
               search={search}
diff --git a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts
index 7a2d18aee..44c28a9e9 100644
--- a/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts
+++ b/apps/edr-freight-web/backoffice/src/pages/ruleEngine/config/resources.ts
@@ -1,4 +1,5 @@
 import type { SidebarItem } from "@/components/layout/types";
+import { ruleEngineViewKey } from "@/lib/permissions";
 import type { RuleEngineResourceSlug } from "@/types/rule-engine";
 
 export type RuleEngineNavCategory = "configuration" | "rules";
@@ -83,6 +84,17 @@ export interface RuleEngineOrderConfig {
   label: string;
 }
 
+/**
+ * A category tab above a resource list. The active tab's `filters` are sent to
+ * the list endpoint verbatim, so filtering happens server-side (values may be
+ * comma-separated lists, e.g. appliesTo: "FIRST_MILE,LAST_MILE").
+ */
+export interface RuleEngineListTab {
+  key: string;
+  label: string;
+  filters: { appliesTo?: string; trigger?: string };
+}
+
 export interface RuleEngineResourceConfig {
   slug: RuleEngineResourceSlug;
   label: string;
@@ -93,6 +105,8 @@ export interface RuleEngineResourceConfig {
   formFields: FormFieldDef[];
   supportsSearch?: boolean;
   orderConfig?: RuleEngineOrderConfig;
+  /** Server-filtered category tabs rendered above the list (rates page). */
+  listTabs?: RuleEngineListTab[];
   /** Primary line on card view (inferred from columns when omitted). */
   cardTitleKey?: string;
   /** Secondary line under title on card view (inferred when omitted). */
@@ -147,16 +161,21 @@ const RATE_APPLIES_TO = [
 /** Surcharge triggers — only relevant when Applies to = Other. */
 const RATE_TRIGGERS = [
   { label: "Hazardous cargo", value: "HAZARDOUS" },
-  { label: "Overweight (per excess ton)", value: "OVERWEIGHT" },
+  {
+    label: "Overweight (export only — import derives from container price)",
+    value: "OVERWEIGHT",
+  },
   { label: "Reefer cargo", value: "REEFER" },
-  { label: "Empty container return", value: "WITH_RETURN" },
+  {
+    label: "Empty container return (import, per route + container type)",
+    value: "WITH_RETURN",
+  },
   { label: "Shipping line mapped", value: "SHIPPING_LINE" },
-  { label: "Consolidation", value: "CONSOLIDATION" },
-  { label: "Lashing (flat, per booking)", value: "LASHING" },
+  { label: "Penalty", value: "CONSOLIDATION" },
+  { label: "Lashing (bulk, per cargo type)", value: "LASHING" },
   { label: "Cancellation", value: "CANCELLATION" },
-  { label: "Demurrage", value: "DEMURRAGE" },
   { label: "Shipping line extra fee (PIL)", value: "PIL_EXTRA_FEE" },
-  { label: "Customs clearance service fee (prepaid)", value: "CUSTOMS_CLEARANCE" },
+  { label: "Customs clearance service fee (billed with the booking)", value: "CUSTOMS_CLEARANCE" },
 ];
 
 /**
@@ -174,6 +193,15 @@ const INTERCITY_KINDS = [
 const isBaseFreightRate = (values: Record<string, unknown>) =>
   ["BULK", "CONTAINER", "INTERCITY"].includes(String(values.appliesTo ?? ""));
 
+/**
+ * Rates priced per leg: base rail freight, plus the customs clearance fee and
+ * the empty-container return surcharge (sold per route + container type).
+ */
+const isRouteScopedRate = (values: Record<string, unknown>) =>
+  isBaseFreightRate(values) ||
+  (String(values.appliesTo ?? "") === "OTHER" &&
+    ["CUSTOMS_CLEARANCE", "WITH_RETURN"].includes(String(values.trigger ?? "")));
+
 const unitOption = (value: string) => ({ label: value.replace(/_/g, " "), value });
 
 /**
@@ -182,7 +210,11 @@ const unitOption = (value: string) => ({ label: value.replace(/_/g, " "), value
  * bill per container, bulk per ton, overweight always per excess ton, etc. Kept
  * in sync with apps/edr-freight-api/.../entities/rate-unit.util.ts.
  */
-const allowedRateUnits = (appliesTo: string, trigger: string): string[] => {
+const allowedRateUnits = (
+  appliesTo: string,
+  trigger: string,
+  cargoKind = "",
+): string[] => {
   if (appliesTo === "OTHER") {
     switch (trigger) {
       case "OVERWEIGHT":
@@ -192,16 +224,18 @@ const allowedRateUnits = (appliesTo: string, trigger: string): string[] => {
       case "DEMURRAGE":
         return ["PER_CONTAINER", "PER_TON"];
       case "WITH_RETURN":
-        // Container-only service — bills per returned container.
-        return ["PER_CONTAINER", "FLAT"];
+        // Container-only service — per returned container, per wagon, or flat.
+        return ["PER_CONTAINER", "PER_WAGON", "FLAT"];
       case "CANCELLATION":
         return ["FLAT", "PER_INVOICE"];
       case "CUSTOMS_CLEARANCE":
-        // Flat per clearance (ONE_TIME) / per shipment request (GENERAL).
-        return ["FLAT"];
+        // Per cargo kind: container fees per box/wagon, bulk per ton/wagon.
+        return cargoKind === "BULK"
+          ? ["PER_TON", "PER_WAGON"]
+          : ["PER_CONTAINER", "PER_WAGON"];
       case "LASHING":
-        // Flat cargo-securing fee, billed once per booking.
-        return ["FLAT"];
+        // Bulk-only cargo securing — per ton or per wagon.
+        return ["PER_TON", "PER_WAGON"];
       case "CONSOLIDATION":
       case "SHIPPING_LINE":
       case "PIL_EXTRA_FEE":
@@ -229,7 +263,11 @@ const rateUnitOptions = (values: Record<string, unknown>) => {
   const appliesTo = String(values.appliesTo ?? "");
   const trigger = appliesTo === "OTHER" ? String(values.trigger ?? "") : "ALWAYS";
   if (!appliesTo) return [];
-  return allowedRateUnits(appliesTo, trigger).map(unitOption);
+  return allowedRateUnits(
+    appliesTo,
+    trigger,
+    String(values.cargoKind ?? ""),
+  ).map(unitOption);
 };
 
 const CURRENCIES = [
@@ -603,6 +641,37 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
     subtitle: "Freight rates and approval workflow",
     searchPlaceholder: "Search rates by type or status...",
     supportsSearch: true,
+    // Category tabs — each filters server-side by appliesTo / trigger.
+    listTabs: [
+      { key: "all", label: "All", filters: {} },
+      { key: "container", label: "Container", filters: { appliesTo: "CONTAINER" } },
+      { key: "bulk", label: "Bulk", filters: { appliesTo: "BULK" } },
+      { key: "intercity", label: "Intercity", filters: { appliesTo: "INTERCITY" } },
+      {
+        key: "trucking",
+        label: "First / Last mile",
+        filters: { appliesTo: "FIRST_MILE,LAST_MILE" },
+      },
+      {
+        key: "customs",
+        label: "Customs clearance",
+        filters: { trigger: "CUSTOMS_CLEARANCE" },
+      },
+      {
+        key: "return",
+        label: "Container return",
+        filters: { trigger: "WITH_RETURN" },
+      },
+      {
+        key: "surcharges",
+        label: "Surcharges",
+        filters: {
+          appliesTo: "OTHER",
+          trigger:
+            "HAZARDOUS,OVERWEIGHT,REEFER,SHIPPING_LINE,CONSOLIDATION,LASHING,CANCELLATION,PIL_EXTRA_FEE",
+        },
+      },
+    ],
     columns: [
       { id: "appliesTo", header: "Applies to", accessorKey: "appliesTo", format: "code" },
       { id: "trigger", header: "Trigger", accessorKey: "trigger" },
@@ -639,14 +708,80 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         placeholder: "What makes this surcharge apply?",
         showWhen: { field: "appliesTo", equals: ["OTHER"] },
       },
-      // ── Trade direction — Bulk & Container only (intercity is domestic) ───
+      // ── Trade direction — Bulk & Container base freight, plus the route-
+      // scoped surcharges (customs clearance; empty-container return, which is
+      // import-only for now so export is not offered) ────────────────────────
       {
         name: "tradeDirection",
         label: "Trade direction",
         type: "select",
         required: true,
-        options: TRADE_DIRECTIONS.filter((d) => d.value !== "BOTH"),
-        showWhen: { field: "appliesTo", equals: ["BULK", "CONTAINER"] },
+        optionsFromValues: (v: Record<string, unknown>) =>
+          String(v.trigger ?? "") === "WITH_RETURN" &&
+          String(v.appliesTo ?? "") === "OTHER"
+            ? TRADE_DIRECTIONS.filter((d) => d.value === "IMPORT")
+            : TRADE_DIRECTIONS.filter((d) => d.value !== "BOTH"),
+        showIf: (v) =>
+          ["BULK", "CONTAINER"].includes(String(v.appliesTo ?? "")) ||
+          (String(v.appliesTo ?? "") === "OTHER" &&
+            ["CUSTOMS_CLEARANCE", "WITH_RETURN", "LASHING"].includes(
+              String(v.trigger ?? ""),
+            )),
+      },
+      // ── Cargo kind — customs clearance is priced separately for containers
+      // (one rate per container type) and bulk ───────────────────────────────
+      {
+        name: "cargoKind",
+        label: "Cargo kind",
+        type: "select",
+        required: true,
+        options: INTERCITY_KINDS,
+        placeholder: "Is this fee for containers or bulk?",
+        description:
+          "Container fees bill per box or wagon (one rate per container type); bulk fees bill per ton or wagon.",
+        showIf: (v) =>
+          v.appliesTo === "OTHER" && v.trigger === "CUSTOMS_CLEARANCE",
+        // Not a stored column: a container fee carries its containerTypeId, a
+        // bulk fee carries none.
+        getInitialValue: (record) =>
+          record.containerTypeId ? "CONTAINER" : "BULK",
+      },
+      // ── Container type — a container fee names the type it covers ─────────
+      {
+        name: "containerTypeId",
+        label: "Container type",
+        type: "select",
+        required: true,
+        placeholder: "Which container type this fee covers",
+        showIf: (v) =>
+          v.appliesTo === "OTHER" &&
+          v.trigger === "CUSTOMS_CLEARANCE" &&
+          v.cargoKind === "CONTAINER",
+      },
+      // ── Bulk cargo type — the bulk customs fee names its commodity ────────
+      {
+        name: "cargoTypeId",
+        label: "Bulk cargo type",
+        type: "select",
+        required: true,
+        placeholder: "Which bulk commodity this fee covers",
+        showIf: (v) =>
+          v.appliesTo === "OTHER" &&
+          v.trigger === "CUSTOMS_CLEARANCE" &&
+          v.cargoKind === "BULK",
+      },
+      // ── Bulk cargo type — lashing is bulk-only; may narrow to one leaf
+      // commodity (specific wins over the commodity-wide catch-all) ──────────
+      {
+        name: "cargoTypeId",
+        label: "Bulk cargo type",
+        type: "select",
+        optional: true,
+        placeholder: "All lashing commodities (optional)",
+        description:
+          "Leave empty to cover every lashing commodity; a commodity-specific rate wins over the catch-all.",
+        showIf: (v) =>
+          v.appliesTo === "OTHER" && v.trigger === "LASHING",
       },
       // ── Cargo kind — Intercity only (import/export get it from appliesTo) ─
       {
@@ -663,7 +798,8 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         getInitialValue: (record) =>
           record.rateType === "INTERCITY_BULK" ? "BULK" : "CONTAINER",
       },
-      // ── Container type — Container freight, and container-kind intercity ──
+      // ── Container type — Container freight, container-kind intercity, and
+      // the empty-container return surcharge (20ft vs 40ft price differently) ─
       {
         name: "containerTypeId",
         label: "Container type",
@@ -672,7 +808,8 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         placeholder: "Select container type (optional)",
         showIf: (v) =>
           v.appliesTo === "CONTAINER" ||
-          (v.appliesTo === "INTERCITY" && v.intercityKind === "CONTAINER"),
+          (v.appliesTo === "INTERCITY" && v.intercityKind === "CONTAINER") ||
+          (v.appliesTo === "OTHER" && v.trigger === "WITH_RETURN"),
       },
       // ── Bulk cargo (leaf commodity) — Bulk freight, and bulk-kind intercity ─
       {
@@ -695,7 +832,7 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         type: "select",
         required: true,
         placeholder: "Where the leg starts",
-        showIf: isBaseFreightRate,
+        showIf: isRouteScopedRate,
       },
       {
         name: "destinationYardId",
@@ -703,7 +840,7 @@ export const RULE_ENGINE_RESOURCES: RuleEngineResourceConfig[] = [
         type: "select",
         required: true,
         placeholder: "Where the leg ends",
-        showIf: isBaseFreightRate,
+        showIf: isRouteScopedRate,
       },
       { name: "rateValue", label: "Rate value", type: "number", required: true, suffix: "USD" },
       // Unit choices are driven by the rate shape (appliesTo + trigger). Overweight
@@ -787,6 +924,7 @@ export const getCategorySidebarChildren = (
   RULE_ENGINE_RESOURCES.filter((r) => r.category === category).map((r) => ({
     label: r.label,
     href: ruleEngineResourcePath(r.slug),
+    permission: ruleEngineViewKey(r.slug),
   }));
 
 export const DEFAULT_CONFIGURATION_SLUG: RuleEngineResourceSlug = "cargo-types";
diff --git a/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderDetailPage.tsx
index 3841bc989..f9e4555ae 100644
--- a/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderDetailPage.tsx
@@ -45,6 +45,8 @@ import {
 import { TrainCompositionDiagram } from "@/components/trainScheduling/TrainCompositionDiagram";
 import { KpiStrip, PageContainer, PageHeader } from "@/components/page";
 import { api } from "@/services/api";
+import { useAuth } from "@/auth/useAuth";
+import { canFleetAction, FREIGHT_PERMS, hasPermission } from "@/lib/permissions";
 import { useToast } from "@/hooks/use-toast";
 
 const parseError = (error: unknown, fallback: string) => {
@@ -76,6 +78,12 @@ export default function TrainBuilderDetailPage() {
   const [yardModalOpen, setYardModalOpen] = useState(false);
   const [disbandOpen, setDisbandOpen] = useState(false);
   const [deactivateOpen, setDeactivateOpen] = useState(false);
+  const { user } = useAuth();
+  const canUpdate = canFleetAction(user, "trains", "update");
+  const canDelete = canFleetAction(user, "trains", "delete");
+  const canAssign =
+    hasPermission(user, FREIGHT_PERMS.trains.assignWagons) ||
+    hasPermission(user, FREIGHT_PERMS.fleet.manage);
 
   const compositionQuery = useQuery(
     api.trainBuilder.composition.queryOptions({ input: { id }, enabled: Boolean(id) }),
@@ -162,59 +170,67 @@ export default function TrainBuilderDetailPage() {
           </Group>
         }
         action={
-          <Menu position="bottom-end" withinPortal shadow="md" width={220}>
-            <Menu.Target>
-              <Button variant="default" rightSection={<MoreHorizontal size={16} />}>
-                Actions
-              </Button>
-            </Menu.Target>
-            <Menu.Dropdown>
-              <Menu.Item
-                leftSection={<Replace size={15} />}
-                disabled={!composition.editable}
-                onClick={() => setLocoModalOpen(true)}
-              >
-                Change locomotives
-              </Menu.Item>
-              <Menu.Item
-                leftSection={<MapPin size={15} />}
-                disabled={!composition.editable}
-                onClick={() => setYardModalOpen(true)}
-              >
-                Change yard
-              </Menu.Item>
-              {composition.status === "DEACTIVATED" ? (
-                <Menu.Item
-                  leftSection={<Power size={15} />}
-                  disabled={blockingLocomotives.length > 0}
-                  onClick={() =>
-                    void withToast(async () => {
-                      await activate.mutateAsync(composition.id);
-                      toast({ title: `Train ${composition.code} reactivated` });
-                    }, "Could not reactivate train")
-                  }
-                >
-                  Reactivate train
-                </Menu.Item>
-              ) : (
-                <Menu.Item
-                  leftSection={<PowerOff size={15} />}
-                  disabled={composition.activeSchedules.length > 0}
-                  onClick={() => setDeactivateOpen(true)}
-                >
-                  Deactivate train
-                </Menu.Item>
-              )}
-              <Menu.Item
-                color="red"
-                leftSection={<Trash2 size={15} />}
-                disabled={composition.activeSchedules.length > 0}
-                onClick={() => setDisbandOpen(true)}
-              >
-                Disband train
-              </Menu.Item>
-            </Menu.Dropdown>
-          </Menu>
+          canUpdate || canDelete ? (
+            <Menu position="bottom-end" withinPortal shadow="md" width={220}>
+              <Menu.Target>
+                <Button variant="default" rightSection={<MoreHorizontal size={16} />}>
+                  Actions
+                </Button>
+              </Menu.Target>
+              <Menu.Dropdown>
+                {canUpdate ? (
+                  <>
+                    <Menu.Item
+                      leftSection={<Replace size={15} />}
+                      disabled={!composition.editable}
+                      onClick={() => setLocoModalOpen(true)}
+                    >
+                      Change locomotives
+                    </Menu.Item>
+                    <Menu.Item
+                      leftSection={<MapPin size={15} />}
+                      disabled={!composition.editable}
+                      onClick={() => setYardModalOpen(true)}
+                    >
+                      Change yard
+                    </Menu.Item>
+                    {composition.status === "DEACTIVATED" ? (
+                      <Menu.Item
+                        leftSection={<Power size={15} />}
+                        disabled={blockingLocomotives.length > 0}
+                        onClick={() =>
+                          void withToast(async () => {
+                            await activate.mutateAsync(composition.id);
+                            toast({ title: `Train ${composition.code} reactivated` });
+                          }, "Could not reactivate train")
+                        }
+                      >
+                        Reactivate train
+                      </Menu.Item>
+                    ) : (
+                      <Menu.Item
+                        leftSection={<PowerOff size={15} />}
+                        disabled={composition.activeSchedules.length > 0}
+                        onClick={() => setDeactivateOpen(true)}
+                      >
+                        Deactivate train
+                      </Menu.Item>
+                    )}
+                  </>
+                ) : null}
+                {canDelete ? (
+                  <Menu.Item
+                    color="red"
+                    leftSection={<Trash2 size={15} />}
+                    disabled={composition.activeSchedules.length > 0}
+                    onClick={() => setDisbandOpen(true)}
+                  >
+                    Disband train
+                  </Menu.Item>
+                ) : null}
+              </Menu.Dropdown>
+            </Menu>
+          ) : undefined
         }
       />
 
@@ -259,16 +275,18 @@ export default function TrainBuilderDetailPage() {
               .
             </Text>
             <Group gap="xs">
-              <Button
-                size="compact-sm"
-                variant="light"
-                color="red"
-                leftSection={<Replace size={14} />}
-                disabled={!composition.editable}
-                onClick={() => setLocoModalOpen(true)}
-              >
-                Detach & replace locomotives
-              </Button>
+              {canUpdate ? (
+                <Button
+                  size="compact-sm"
+                  variant="light"
+                  color="red"
+                  leftSection={<Replace size={14} />}
+                  disabled={!composition.editable}
+                  onClick={() => setLocoModalOpen(true)}
+                >
+                  Detach & replace locomotives
+                </Button>
+              ) : null}
               <Button
                 size="compact-sm"
                 variant="subtle"
@@ -330,7 +348,7 @@ export default function TrainBuilderDetailPage() {
       </Stack>
 
       <Grid gap="lg" align="stretch">
-        {composition.editable ? (
+        {composition.editable && canAssign ? (
           <Grid.Col span={{ base: 12, md: 5 }}>
             <Card h="100%">
               <Stack gap="sm">
@@ -355,7 +373,7 @@ export default function TrainBuilderDetailPage() {
             </Card>
           </Grid.Col>
         ) : null}
-        <Grid.Col span={{ base: 12, md: composition.editable ? 7 : 12 }}>
+        <Grid.Col span={{ base: 12, md: composition.editable && canAssign ? 7 : 12 }}>
           <Card h="100%">
             <Stack gap="sm">
               <Text fw={600}>Wagon order</Text>
@@ -364,7 +382,7 @@ export default function TrainBuilderDetailPage() {
               </Text>
               <ConsistWagonList
                 wagons={composition.wagons}
-                editable={composition.editable}
+                editable={composition.editable && canAssign}
                 busy={busy}
                 onReorder={(wagonIds) =>
                   void withToast(
diff --git a/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderListPage.tsx b/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderListPage.tsx
index c980d55b6..9265306cf 100644
--- a/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderListPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/trainBuilder/TrainBuilderListPage.tsx
@@ -35,6 +35,8 @@ import {
   trainStatusLabel,
 } from "@/components/trainBuilder/trainStatus";
 import { api } from "@/services/api";
+import { useAuth } from "@/auth/useAuth";
+import { canFleetAction } from "@/lib/permissions";
 import type {
   BuiltTrainListFilters,
   BuiltTrainStatus,
@@ -54,6 +56,9 @@ export default function TrainBuilderListPage() {
   const [yardFilter, setYardFilter] = useState("ALL");
   const [buildOpen, setBuildOpen] = useState(false);
   const [editTarget, setEditTarget] = useState<BuiltTrainSummary | null>(null);
+  const { user } = useAuth();
+  const canCreate = canFleetAction(user, "trains", "create");
+  const canUpdate = canFleetAction(user, "trains", "update");
 
   const resetPage = useCallback(() => {
     setPagination((prev) =>
@@ -240,24 +245,25 @@ export default function TrainBuilderListPage() {
         id: "actions",
         header: "",
         meta: { headerClassName, cellClassName },
-        cell: ({ row }) => (
-          <ActionIcon
-            variant="subtle"
-            color="gray"
-            aria-label={`Edit train ${row.original.code}`}
-            title="Edit name & train numbers"
-            onClick={(e) => {
-              // Row click navigates to the detail page — keep the edit local.
-              e.stopPropagation();
-              setEditTarget(row.original);
-            }}
-          >
-            <Pencil size={15} />
-          </ActionIcon>
-        ),
+        cell: ({ row }) =>
+          canUpdate ? (
+            <ActionIcon
+              variant="subtle"
+              color="gray"
+              aria-label={`Edit train ${row.original.code}`}
+              title="Edit name & train numbers"
+              onClick={(e) => {
+                // Row click navigates to the detail page — keep the edit local.
+                e.stopPropagation();
+                setEditTarget(row.original);
+              }}
+            >
+              <Pencil size={15} />
+            </ActionIcon>
+          ) : null,
       },
     ];
-  }, []);
+  }, [canUpdate]);
 
   const tableStatus = trainsQuery.isLoading
     ? "loading"
@@ -271,9 +277,11 @@ export default function TrainBuilderListPage() {
         title="Train Builder"
         subtitle="Assemble coded trains from locomotives and wagons in a yard, ready to schedule as a unit."
         action={
-          <Button leftSection={<Hammer size={18} />} onClick={() => setBuildOpen(true)}>
-            Build train
-          </Button>
+          canCreate ? (
+            <Button leftSection={<Hammer size={18} />} onClick={() => setBuildOpen(true)}>
+              Build train
+            </Button>
+          ) : undefined
         }
       />
 
diff --git a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchScheduleDetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchScheduleDetailPage.tsx
index 58d027c8c..1e3735961 100644
--- a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchScheduleDetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchScheduleDetailPage.tsx
@@ -866,7 +866,7 @@ export default function BatchScheduleDetailPage() {
                 >
                   Refresh
                 </Button>
-                {data.train && ["DRAFT", "SCHEDULED"].includes(data.status) ? (
+                {/* {data.train && ["DRAFT", "SCHEDULED"].includes(data.status) ? (
                   <Button
                     variant="light"
                     color="edr-green"
@@ -876,7 +876,7 @@ export default function BatchScheduleDetailPage() {
                   >
                     Adjust consist
                   </Button>
-                ) : null}
+                ) : null} */}
                 {data.windowPhase === "DOC_REVIEW" ? (
                   <Button
                     color="yellow"
diff --git a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2DetailPage.tsx b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2DetailPage.tsx
index 2d7e69cc1..137b3944f 100644
--- a/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2DetailPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2DetailPage.tsx
@@ -59,6 +59,7 @@ import { ScheduleWorkspacePanel } from "@/components/trainScheduling/ScheduleWor
 import { FreightTypeBadge } from "@/components/trainScheduling/ScheduleStatusBadge";
 import {
   RouteCorridor,
+  SegmentOccupancyStrip,
   StatusPill,
   scheduleBrand,
 } from "@/components/trainScheduling/scheduleVisuals";
@@ -388,12 +389,22 @@ export default function TrainScheduleV2DetailPage() {
   const unloadedCount = dispatchBookings.filter(
     (b) => b.wagonAssigned && (b.loadingStatus ?? "UNLOADED") !== "LOADED",
   ).length;
+  // Intercity ride-alongs load through the journey flow (Load at their origin
+  // yard), not the workspace toggle — dispatching before that leaves paid cargo
+  // stranded on the platform while its train departs.
+  const intercityNotLoadedCount = dispatchBookings.filter(
+    (b) =>
+      b.tradeDirection === "DOMESTIC" &&
+      !b.loadedAt &&
+      !["IN_TRANSIT", "COMPLETED"].includes(b.status ?? ""),
+  ).length;
   // Import-Djibouti trains are HARD-blocked from dispatch until loading is
   // confirmed in the workspace — surface it as a blocker, not just a warning.
   const loadingBlocksDispatch =
     schedule.requiresLoadingConfirmation === true &&
     schedule.loadingConfirmed !== true;
-  const hasDispatchWarnings = unassignedCount > 0 || unloadedCount > 0;
+  const hasDispatchWarnings =
+    unassignedCount > 0 || unloadedCount > 0 || intercityNotLoadedCount > 0;
 
   const finalizeStep = hasContainerStep ? 3 : 2;
   const canModifyBookings = canEditBookings && !["DISPATCHED", "ARRIVED"].includes(schedule.status);
@@ -916,17 +927,29 @@ export default function TrainScheduleV2DetailPage() {
                     </Text>
                   ) : null}
                 </Group>
-                <Box maw={340}>
-                  <RouteCorridor
-                    origin={
-                      schedule.originStation?.label ?? schedule.originStation?.code
-                    }
-                    destination={
-                      schedule.destinationStation?.label ??
-                      schedule.destinationStation?.code
-                    }
+                {(schedule.stops?.length ?? 0) >= 3 ||
+                (schedule.bookings ?? []).some(
+                  (b) => b.tradeDirection === "DOMESTIC",
+                ) ? (
+                  <SegmentOccupancyStrip
+                    stops={schedule.stops ?? []}
+                    bookings={schedule.bookings ?? []}
+                    maxWagons={schedule.maxWagons}
+                    maxGrossTons={schedule.maxGrossWeightTons}
                   />
-                </Box>
+                ) : (
+                  <Box maw={340}>
+                    <RouteCorridor
+                      origin={
+                        schedule.originStation?.label ?? schedule.originStation?.code
+                      }
+                      destination={
+                        schedule.destinationStation?.label ??
+                        schedule.destinationStation?.code
+                      }
+                    />
+                  </Box>
+                )}
                 <Group gap="sm" align="center">
                   <FreightTypeBadge freightType={schedule.freightType} />
                   <StatusPill status={schedule.status} />
@@ -1059,6 +1082,14 @@ export default function TrainScheduleV2DetailPage() {
           {
             label: "Bookings",
             value: schedule.bookings?.length ?? 0,
+            hint: (() => {
+              const intercity = (schedule.bookings ?? []).filter(
+                (b) => b.tradeDirection === "DOMESTIC",
+              ).length;
+              return intercity > 0
+                ? `${intercity} intercity ride-along${intercity === 1 ? "" : "s"}`
+                : undefined;
+            })(),
             icon: Package,
           },
           {
@@ -1282,6 +1313,16 @@ export default function TrainScheduleV2DetailPage() {
                     unloaded
                   </List.Item>
                 ) : null}
+                {intercityNotLoadedCount > 0 ? (
+                  <List.Item>
+                    <Text span fw={700}>
+                      {intercityNotLoadedCount}
+                    </Text>{" "}
+                    intercity ride-along{intercityNotLoadedCount === 1 ? "" : "s"} not
+                    loaded yet — load them from the Workspace tab (Yard work) before
+                    the train leaves their origin yard
+                  </List.Item>
+                ) : null}
               </List>
               <Text size="xs" c="dimmed" mt={6}>
                 You can still dispatch — confirm to proceed.
diff --git a/apps/edr-freight-web/backoffice/src/pages/warehouses/InterchangeDocumentsPage.tsx b/apps/edr-freight-web/backoffice/src/pages/warehouses/InterchangeDocumentsPage.tsx
index 4bd647106..04fe38970 100644
--- a/apps/edr-freight-web/backoffice/src/pages/warehouses/InterchangeDocumentsPage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/warehouses/InterchangeDocumentsPage.tsx
@@ -12,7 +12,7 @@ import {
   Text,
   TextInput,
 } from '@mantine/core';
-import { CheckCircle2, Download, Eye, FileText, Printer, Search, XCircle } from 'lucide-react';
+import { CheckCircle2, Download, Eye, FileText, Printer, Search } from 'lucide-react';
 import type { ReactNode } from 'react';
 
 import { DataTable, type ColumnDef } from '@edr/ui-common';
@@ -21,7 +21,6 @@ import { PageContainer, PageHeader } from '@/components/page';
 import { VisualEmptyState, formatDate, formatNumber } from '@/components/warehouses';
 import {
   useAcknowledgeInterchangeDocument,
-  useCancelInterchangeDocument,
   useDisputeInterchangeDocument,
   useInterchangeDocument,
   useInterchangeDocuments,
@@ -66,7 +65,7 @@ const buildPrintableInterchangeHtml = (document: InterchangeDocument) => {
       (item, index) => `
         <tr>
           <td>${index + 1}</td>
-          <td>${escapeHtml(item.bookingReference ?? item.bookingId?.slice(0, 8))}</td>
+          <td>${escapeHtml(item.bookingReference)}</td>
           <td>${escapeHtml(item.itemType)}</td>
           <td>${escapeHtml(item.containerNumber)}</td>
           <td>${escapeHtml(item.sealNumber)}</td>
@@ -118,7 +117,6 @@ const buildPrintableInterchangeHtml = (document: InterchangeDocument) => {
   <div class="grid">
     <div class="field"><div class="label">Direction</div><div class="value">${escapeHtml(document.direction)}</div></div>
     <div class="field"><div class="label">Train No</div><div class="value">${escapeHtml(document.trainNo)}</div></div>
-    <div class="field"><div class="label">Schedule</div><div class="value">${escapeHtml(document.scheduleId)}</div></div>
     <div class="field"><div class="label">Handover Location</div><div class="value">${escapeHtml(document.handoverLocation)}</div></div>
     <div class="field"><div class="label">Handover From</div><div class="value">${escapeHtml(document.handoverFrom)}</div></div>
     <div class="field"><div class="label">Handover To</div><div class="value">${escapeHtml(document.handoverTo)}</div></div>
@@ -191,7 +189,6 @@ function InterchangeDocumentDetail({ id }: { id: string }) {
       <SimpleGrid cols={{ base: 1, sm: 2, lg: 4 }}>
         <DetailField label="Document No" value={document.documentNo} />
         <DetailField label="Direction" value={document.direction} />
-        <DetailField label="Schedule" value={document.scheduleId?.slice(0, 8)} />
         <DetailField label="Train No" value={document.trainNo} />
         <DetailField label="Handover Location" value={document.handoverLocation} />
         <DetailField label="Handover From" value={document.handoverFrom} />
@@ -232,7 +229,7 @@ function InterchangeDocumentDetail({ id }: { id: string }) {
           <Table.Tbody>
             {items.map((item) => (
               <Table.Tr key={item.id}>
-                <Table.Td>{item.bookingReference ?? item.bookingId?.slice(0, 8) ?? '-'}</Table.Td>
+                <Table.Td>{item.bookingReference ?? '-'}</Table.Td>
                 <Table.Td>{item.itemType}</Table.Td>
                 <Table.Td>{item.containerNumber ?? '-'}</Table.Td>
                 <Table.Td>{item.sealNumber ?? '-'}</Table.Td>
@@ -268,7 +265,6 @@ export default function InterchangeDocumentsPage() {
   const { data: documents = [], isLoading } = useInterchangeDocuments(filter);
   const acknowledge = useAcknowledgeInterchangeDocument();
   const dispute = useDisputeInterchangeDocument();
-  const cancel = useCancelInterchangeDocument();
 
   const getPrintableDocument = async (interchangeDocument: InterchangeDocument) => {
     if (interchangeDocument.items?.length) return interchangeDocument;
@@ -336,19 +332,7 @@ export default function InterchangeDocumentsPage() {
       ),
     },
     { id: 'direction', header: 'Direction', cell: ({ row }) => row.original.direction },
-    {
-      id: 'train',
-      header: 'Train No / Schedule',
-      cell: ({ row }) => (
-        <Stack gap={0}>
-          <Text size="sm">{row.original.trainNo ?? '-'}</Text>
-          <Text size="xs" c="dimmed">
-            {row.original.scheduleId?.slice(0, 8) ?? '-'}
-          </Text>
-        </Stack>
-      ),
-    },
-    { id: 'route', header: 'Route', cell: ({ row }) => row.original.routeId?.slice(0, 8) ?? '-' },
+    { id: 'train', header: 'Train No', cell: ({ row }) => row.original.trainNo ?? '-' },
     { id: 'handoverLocation', header: 'Handover Location', cell: ({ row }) => row.original.handoverLocation },
     { id: 'handoverFrom', header: 'Handover From', cell: ({ row }) => row.original.handoverFrom },
     { id: 'handoverTo', header: 'Handover To', cell: ({ row }) => row.original.handoverTo },
@@ -390,7 +374,7 @@ export default function InterchangeDocumentsPage() {
             >
               View
             </Button>
-            {doc.status !== 'ACKNOWLEDGED' && doc.status !== 'CANCELLED' ? (
+            {doc.status === 'GENERATED' ? (
               <Button
                 size="compact-xs"
                 color="green"
@@ -423,7 +407,9 @@ export default function InterchangeDocumentsPage() {
                 </Button>
               </>
             ) : null}
-            {doc.status !== 'CANCELLED' ? (
+            {/* Disputes are raised BEFORE acknowledgement; a registered dispute
+                (DISPUTED) is read-only — its row offers View only. */}
+            {doc.status === 'GENERATED' ? (
               <Button
                 size="compact-xs"
                 color="orange"
@@ -434,17 +420,6 @@ export default function InterchangeDocumentsPage() {
                 Dispute
               </Button>
             ) : null}
-            {doc.status === 'DRAFT' || doc.status === 'GENERATED' ? (
-              <Button
-                size="compact-xs"
-                color="red"
-                variant="light"
-                leftSection={<XCircle size={14} />}
-                onClick={() => run(() => cancel.mutateAsync(doc.id), 'Interchange document cancelled')}
-              >
-                Cancel
-              </Button>
-            ) : null}
           </Group>
         );
       },
diff --git a/apps/edr-freight-web/backoffice/src/performance-management/services/api/metabaseService.ts b/apps/edr-freight-web/backoffice/src/performance-management/services/api/metabaseService.ts
index 34e4212fb..2b5636ce2 100644
--- a/apps/edr-freight-web/backoffice/src/performance-management/services/api/metabaseService.ts
+++ b/apps/edr-freight-web/backoffice/src/performance-management/services/api/metabaseService.ts
@@ -49,7 +49,7 @@ export interface GetIframeUrlRequest {
 
 // Create a dedicated axios instance for Metabase API
 const metabaseAxios = axios.create({
-  baseURL: getEnvUrl("VITE_CHRONICLE_URL"),
+  baseURL: getEnvUrl("VITE_CHRONICLE_URL", false),
 });
 
 // Add auth token interceptor
diff --git a/apps/edr-freight-web/backoffice/src/record-management/components/common/Header.tsx b/apps/edr-freight-web/backoffice/src/record-management/components/common/Header.tsx
deleted file mode 100644
index 901001c93..000000000
--- a/apps/edr-freight-web/backoffice/src/record-management/components/common/Header.tsx
+++ /dev/null
@@ -1,413 +0,0 @@
-import React, { useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { NavLink, useLocation } from "react-router-dom";
-import { cn } from "@/shared/lib/utils";
-import {
-  LayoutGrid,
-  Upload,
-  Download,
-  CheckSquare,
-  UserCheck,
-  FileText,
-  LucideIcon,
-  Settings,
-  Handshake,
-  BellRing,
-  BarChart3,
-} from "lucide-react";
-import { useUserDetail } from "../hooks/useUserDetail";
-import { useAuthUser } from "@/shared/hooks/useAuthUser";
-import Cookies from "js-cookie";
-import { useDelegations } from "../hooks/useDelegations";
-import Top from "./Top";
-
-import { useReport } from "../hooks/useReport";
-import { hasApprovalPermission } from "@/record-management/routes/routes";
-import { useReportByHooks } from "../hooks/useReportByHooks";
-import { useMyCollaborations } from "../hooks/useMyCollaborations";
-
-interface HeaderProps {
-  onToggleSidebar?: () => void;
-}
-
-export interface INavTabs {
-  icon: LucideIcon;
-  isVissible?: boolean;
-  label?: string;
-  title?: string;
-  href?: string;
-  url?: string;
-  isActive?: boolean;
-  count?: boolean;
-  isPrimary?: boolean;
-  countBadge?: number;
-  isUrgent?: boolean;
-}
-
-const Header: React.FC<HeaderProps> = ({ onToggleSidebar }) => {
-  const baseParams = {
-    skip: 0,
-    take: 10,
-    orderBy: "employeePosition.createdAt:DESC",
-  };
-  const { t } = useTranslation();
-  const location = useLocation();
-  const { hasDelegated } = useDelegations(baseParams);
-  const { userDetails, selectedPositionPermissionKeys, selectedPosition } =
-    useAuthUser();
-  const { permissionKeys } = useUserDetail(userDetails);
-  const useParentCounts =
-    permissionKeys.includes("can:viewParentPositionRecord") &&
-    new URLSearchParams(location.search).get("view") === "parent";
-  const currentPosition = Cookies.get("current-position-id");
-  const canViewApprovalTab = hasApprovalPermission(
-    selectedPositionPermissionKeys,
-  );
-
-  // Reuse the auth layer's already-normalized active position instead of
-  // re-deriving it here. useAuthUser resolves it by matching BOTH `id` and
-  // `employeePositionId` (and honors the delegated-position cookie), so a
-  // delegate's position is found and `isDelegate` is reliable. The previous
-  // local lookup matched `pos.id === selectedPositionId` only — but
-  // `selectedPositionId` is normalized to `employeePositionId`, so the find
-  // returned undefined and `!undefined` left every tab visible for delegates.
-  const canViewDelegationTab = !selectedPosition?.isDelegate;
-  const userRoles =
-    userDetails?.roles?.map((r: { key: string }) => r.key) || [];
-  const showUserManagementShortcut =
-    userRoles.includes("admin") ||
-    userRoles.includes("unit_admin") ||
-    userRoles.includes("super_admin");
-
-  const {
-    dashboard,
-    ROdashboard,
-    TotalDraftExternal,
-    TotalDraftInternal,
-    TotalDraftCC,
-    ROTotalDraftIncoming,
-    ROPending,
-    TotalUrgentDraftInternal,
-    TotalUrgentDraftExternal,
-    ROPendingUrgent,
-  } = useReport("");
-  const { breakdownCounts } = useReportByHooks({
-    isSecretary: useParentCounts,
-  });
-  const { data: draftCollaborations } = useMyCollaborations({
-    skip: 0,
-    take: 1,
-    signStatus: "draft",
-  });
-  const collaborationDraftCount =
-    draftCollaborations?.count ?? dashboard?.collaborationCount?.draft ?? 0;
-  const incomingHref = useParentCounts
-    ? "/record-management/userIncoming?view=parent"
-    : "/record-management/userIncoming";
-
-  const navigationTabs = useMemo(
-    (): INavTabs[] => [
-      {
-        icon: LayoutGrid,
-        label: t("header.navigation.dashboard"),
-        href: "/record-management/dashboard",
-        isActive: location.pathname.includes("/record-management/dashboard"),
-        isPrimary: true,
-        // Delegates see only Outgoing, Incoming, Approval — hide Dashboard.
-        isVissible: canViewDelegationTab,
-      },
-      {
-        icon: BarChart3,
-        label: "Reports",
-        href: "/record-management/sector-reports",
-        isActive: location.pathname.startsWith(
-          "/record-management/sector-reports",
-        ),
-        isPrimary: false,
-        isVissible: false,
-      },
-      {
-        icon: Upload,
-        label: t("header.navigation.outgoing"),
-        href: "/record-management/userRecords",
-        isActive:
-          location.pathname.startsWith("/record-management/userRecords") &&
-          new URLSearchParams(location.search).get("from") !== "collaborations",
-        isPrimary: true,
-        isVissible: true,
-      },
-      {
-        icon: Download,
-        label: t("header.navigation.incoming"),
-        href: incomingHref,
-        isActive:
-          location.pathname.startsWith("/record-management/userIncoming") ||
-          location.pathname.startsWith(
-            "/record-management/viewIncoming/incoming/",
-          ) ||
-          location.pathname.startsWith(
-            "/record-management/viewIncoming/internal",
-          ) ||
-          location.pathname.startsWith("/record-management/viewIncoming/cc"),
-        isPrimary: true,
-        isVissible: true,
-        countBadge:
-          breakdownCounts.external +
-          breakdownCounts.externalSmart +
-          breakdownCounts.internal +
-          breakdownCounts.ccUnseen +
-          breakdownCounts.forYourReference,
-        isUrgent: TotalUrgentDraftInternal > 0 || TotalUrgentDraftExternal > 0,
-      },
-      {
-        icon: CheckSquare,
-        label: t("header.navigation.approval"),
-        href: "/record-management/approval",
-        isActive:
-          location.pathname.startsWith("/record-management/approval") ||
-          location.pathname.startsWith("/record-management/viewApproval"),
-        isPrimary: false,
-        isVissible: canViewApprovalTab,
-        countBadge: breakdownCounts?.approval || 0,
-        isUrgent:
-          (dashboard?.activeApprovalCount?.myUrgentWorkflowCount || 0) > 0,
-      },
-      {
-        icon: UserCheck,
-        label: t("header.navigation.delegation"),
-        href: "/record-management/delegation",
-        isActive: location.pathname.startsWith("/record-management/delegation"),
-        isPrimary: false,
-        isVissible: canViewDelegationTab,
-      },
-      {
-        icon: Handshake,
-        label: t("header.navigation.collaborations"),
-        href: "/record-management/collaborations",
-        isActive:
-          location.pathname.startsWith("/record-management/collaborations") ||
-          new URLSearchParams(location.search).get("from") === "collaborations",
-        isPrimary: false,
-        isVissible: canViewDelegationTab,
-        countBadge: collaborationDraftCount,
-      },
-      {
-        icon: Settings,
-        label: t("header.navigation.settings"),
-        href: "/record-management/uploadTeeterandSignature",
-        isActive: location.pathname.startsWith(
-          "/record-management/uploadTeeterandSignature",
-        ),
-        isPrimary: false,
-        isVissible: canViewDelegationTab,
-      },
-    ],
-    [
-      t,
-      location.pathname,
-      location.search,
-      TotalDraftCC,
-      TotalDraftInternal,
-      TotalDraftExternal,
-      TotalUrgentDraftInternal,
-      TotalUrgentDraftExternal,
-      canViewApprovalTab,
-      canViewDelegationTab,
-      useParentCounts,
-      incomingHref,
-      breakdownCounts.approval,
-      breakdownCounts.ccUnseen,
-      breakdownCounts.external,
-      breakdownCounts.externalSmart,
-      breakdownCounts.forYourReference,
-      breakdownCounts.internal,
-      dashboard?.activeApprovalCount?.myNotUrgentWorkflowsCount,
-      dashboard?.activeApprovalCount?.myUrgentWorkflowCount,
-      collaborationDraftCount,
-    ],
-  );
-
-  const recordOfficerNavs = useMemo(
-    (): INavTabs[] => [
-      {
-        icon: LayoutGrid,
-        label: t("header.navigation.dashboard"),
-        href: "/record-management/dashboard",
-        isActive: location.pathname.includes("/dashboard"),
-        isVissible: true,
-      },
-      {
-        icon: Upload,
-        label: t("header.navigation.outgoing"),
-        href: "/record-management/recordOfficer/outgoing",
-        isActive:
-          location.pathname.startsWith(
-            "/record-management/recordOfficer/outgoing",
-          ) ||
-          location.pathname.includes("/record-management/view/") ||
-          location.pathname.includes("/record-management/outgoingview/"),
-        isVissible: true,
-      },
-      {
-        icon: Download,
-        label: t("header.navigation.incoming"),
-        href: "/record-management/recordOfficer/incoming",
-        isActive:
-          location.pathname.startsWith(
-            "/record-management/recordOfficer/incoming",
-          ) ||
-          location.pathname.includes("/record-management/viewIncoming/") ||
-          location.pathname.includes("/record-management/recordViewIncoming/"),
-        isVissible: true,
-        countBadge: ROTotalDraftIncoming,
-      },
-      {
-        icon: FileText,
-        label: t("header.navigation.pending"),
-        href: "/record-management/pending",
-        isActive:
-          location.pathname.startsWith("/record-management/pending") ||
-          location.pathname.includes("/record-management/viewPending/"),
-        isVissible: true,
-        countBadge: ROPending,
-        isUrgent: ROPendingUrgent > 0,
-      },
-    ],
-    [t, location.pathname, ROTotalDraftIncoming, ROPending, ROPendingUrgent],
-  );
-
-  const activeNavigationTabs = useMemo(() => {
-    if (permissionKeys.includes("can:dispatchRecords")) {
-      return recordOfficerNavs;
-    }
-    return navigationTabs.filter((tab) => tab.isVissible);
-  }, [permissionKeys, navigationTabs, recordOfficerNavs]);
-
-  // const { user } = useAuth();
-  // console.log("User Info:", user);
-  // const organizationId =
-  //   user?.employee && user.employee.length > 0
-  //     ? user.employee[0].unitId
-  //     : undefined;
-
-  // const unitId = organizationId;
-  return (
-    <div className="flex flex-col">
-      <Top
-        onToggleSidebar={onToggleSidebar}
-        showUserManagementShortcut={showUserManagementShortcut}
-      />
-
-      {/* Navigation Tabs */}
-      {currentPosition ? (
-        <div className="fixed top-16 left-0 right-0 z-30 bg-white dark:bg-gray-900 border-b dark:border-gray-800 overflow-hidden pt-1 pb-1 px-2 sm:pt-1.5 sm:pb-1.5 sm:px-4 md:px-8">
-          {/* Mobile layout: Simple horizontal scrollable (up to sm) */}
-          <div className="sm:hidden">
-            <div className="flex items-center overflow-x-auto scrollbar-none">
-              {activeNavigationTabs.map((tab, index) => (
-                <NavLink
-                  key={`${tab.href}-${index}`}
-                  to={tab.href || "#"}
-                  className={({ isActive }) =>
-                    cn(
-                      "flex items-center gap-1 px-3 py-2 mr-2 text-xs font-medium transition-colors whitespace-nowrap relative",
-                      isActive
-                        ? "text-primary-800 dark:text-white border-b-2 border-primary-600 dark:border-primary-400"
-                        : "text-gray-700 dark:text-gray-300 hover:text-primary-800 dark:hover:text-white",
-                    )
-                  }
-                >
-                  <tab.icon className="h-4 w-4 flex-shrink-0" />
-                  <span className="max-w-[80px] truncate">{tab.label}</span>
-
-                  {/* Count Badge - positioned on tab */}
-                  {typeof tab?.countBadge === "number" &&
-                    tab.countBadge > 0 && (
-                      <span className="bg-red-500 text-white text-[10px] font-bold rounded-full px-1.5 py-0.5 ml-1">
-                        {tab.countBadge > 99 ? "99+" : tab.countBadge}
-                      </span>
-                    )}
-
-                  {/* Urgent Bell - positioned on tab */}
-                  {typeof tab?.isUrgent === "boolean" && tab.isUrgent && (
-                    <span className="relative flex h-3 w-3 ml-1">
-                      <span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-400 opacity-75"></span>
-                      <span className="relative inline-flex rounded-full h-3 w-3 bg-red-500"></span>
-                    </span>
-                  )}
-
-                  {/* Live indicator for Delegation */}
-                  {hasDelegated &&
-                    (tab.label?.toLowerCase() === "delegation" ||
-                      tab.label?.toLowerCase() === "ዉክልና") && (
-                      <span className="absolute -top-1 -right-1 flex h-2 w-2">
-                        <span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-500 opacity-75"></span>
-                        <span className="relative inline-flex rounded-full h-2 w-2 bg-red-500"></span>
-                      </span>
-                    )}
-                </NavLink>
-              ))}
-            </div>
-          </div>
-
-          {/* Desktop layout: All tabs in one row (sm and up) */}
-          <div className="hidden sm:flex overflow-x-auto scrollbar-none w-full bg-gray-200 dark:bg-gray-800 rounded-md py-1.5">
-            <div className="flex w-full mx-1.5 gap-1.5">
-              {activeNavigationTabs.map((tab, index) => (
-                <NavLink
-                  key={`${tab.href}-${index}`}
-                  to={tab.href || "#"}
-                  className={() =>
-                    cn(
-                      "flex items-center justify-center px-2.5 py-2.5 rounded-sm text-sm whitespace-nowrap flex-1 font-Urbanist relative",
-                      tab.isActive
-                        ? "bg-primary-50 dark:bg-primary-900/40 text-primary-800 dark:text-white font-medium"
-                        : "text-gray-700 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-700",
-                    )
-                  }
-                >
-                  <tab.icon className="h-4 w-4 mr-1.5 flex-shrink-0" />
-                  <span className="flex items-center gap-1.5">
-                    {tab.label}
-
-                    {/* Count Badge (inline) */}
-                    {typeof tab?.countBadge === "number" &&
-                      tab.countBadge > 0 && (
-                        <span className="bg-red-500 text-white text-xs font-semibold rounded-full px-1.5 py-0.5">
-                          {tab.countBadge > 99 ? "99+" : tab.countBadge}
-                        </span>
-                      )}
-
-                    {/* Urgent Bell (pulsing) */}
-                    {typeof tab?.isUrgent === "boolean" && tab.isUrgent && (
-                      <span className="relative flex h-4 w-4">
-                        {/* Pulse effect */}
-                        <span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-400 opacity-75"></span>
-                        {/* Bell icon */}
-                        <span className="relative inline-flex items-center justify-center">
-                          <BellRing className="h-4 w-4 text-red-500" />
-                        </span>
-                      </span>
-                    )}
-                  </span>
-
-                  {/* Live indicator for Delegation */}
-                  {hasDelegated &&
-                    (tab.label?.toLowerCase() === "delegation" ||
-                      tab.label?.toLowerCase() === "ዉክልና") && (
-                      <span className="relative -top-0.5 -right-0.5 flex h-2 w-2">
-                        <span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-500 opacity-75"></span>
-                        <span className="relative inline-flex rounded-full h-2 w-2 bg-red-500"></span>
-                      </span>
-                    )}
-                </NavLink>
-              ))}
-            </div>
-          </div>
-        </div>
-      ) : null}
-    </div>
-  );
-};
-
-export default Header;
diff --git a/apps/edr-freight-web/backoffice/src/record-management/components/common/NavigationHeader/Profile.tsx b/apps/edr-freight-web/backoffice/src/record-management/components/common/NavigationHeader/Profile.tsx
deleted file mode 100644
index 6d128954a..000000000
--- a/apps/edr-freight-web/backoffice/src/record-management/components/common/NavigationHeader/Profile.tsx
+++ /dev/null
@@ -1,1049 +0,0 @@
-import React, { useEffect, useState } from "react";
-import {
-  Card,
-  CardContent,
-  CardHeader,
-  CardTitle,
-} from "@/shared/common/ui/card";
-import { Badge } from "@/shared/common/ui/badge";
-import {
-  ChevronLeft,
-  Mail,
-  User,
-  Briefcase,
-  Key,
-  CheckCircle2,
-  Shield,
-  Lock,
-  CircleUser,
-  Star,
-  ShieldCheck,
-  Clock,
-  UserPen,
-  ShieldOff,
-  IdCard,
-  Settings,
-  Building,
-  Users,
-  FileText,
-  ChevronDown,
-  LogOut,
-  Monitor,
-} from "lucide-react";
-import { Button } from "@/shared/common/ui/button";
-import { NavLink, useNavigate } from "react-router-dom";
-import { useAuthUser } from "../../../hooks/useAuthUser";
-import { useTranslation } from "react-i18next";
-import { motion } from "framer-motion";
-import { useLocalizedName } from "@/shared/common/localizedName";
-import Top from "../Top";
-import { Label } from "@/shared/common/ui/label";
-import { Switch } from "@/shared/common/ui/switch";
-import { useSessions } from "@/shared/hooks/useSession";
-import { useQueryClient } from "@tanstack/react-query";
-import Loader from "@/record-management/components/Loader/loader";
-
-// Define TypeScript interfaces for the props
-interface PositionDetailItemProps {
-  icon: React.ReactNode;
-  label: string;
-  value: string;
-}
-
-interface InfoBoxProps {
-  icon: React.ReactNode;
-  label: string;
-  value: string;
-  color?: "blue" | "purple" | "green" | "gray";
-  fullWidth?: boolean;
-  amharic?: boolean;
-  capitalize?: boolean;
-}
-
-interface ProfileInfoItemProps {
-  icon: React.ReactNode;
-  label: string;
-  value: string;
-  capitalize?: boolean;
-}
-
-interface SecurityItemProps {
-  title: string;
-  description: string;
-  action: React.ReactNode;
-  status?: "secure" | "warning" | "inactive";
-
-  twoFactorStatus?: "on" | "off";
-}
-
-interface ActivityItemProps {
-  icon: React.ReactNode;
-  title: string;
-  time: string;
-  type: "success" | "info" | "warning";
-}
-
-const ProfilePage = () => {
-  const navigate = useNavigate();
-  const { t } = useTranslation();
-  const queryClient = useQueryClient();
-
-  const {
-    userDetails,
-    isLoading,
-    isError,
-    refetch,
-    logout,
-    setTwoFactorAuth,
-    twoFactorData,
-    editTwoFA,
-    isLoadingStatus,
-  } = useAuthUser();
-  const userRoles = userDetails?.roles?.map((r: { key: string }) => r.key) || [];
-  const showUserManagementShortcut =
-    userRoles.includes("admin") ||
-    userRoles.includes("unit_admin") ||
-    userRoles.includes("super_admin");
-  const localizedName = useLocalizedName();
-  const [isSessionsExpanded, setIsSessionsExpanded] = useState(false);
-  const [twoFactor, setTwoFactor] = useState(false);
-  const [permissionsExpanded, setPermissionsExpanded] = useState(false);
-  const PERMISSIONS_INITIAL_SHOW = 4;
-  useEffect(() => {
-    if (!userDetails) return;
-    if (twoFactorData?.[0]) {
-      setTwoFactor(twoFactorData?.[0].isMFARequired);
-    }
-  }, [twoFactorData, userDetails]);
-
-  const {
-    data: sessionsQuery,
-    deleteSession,
-    deleteAllSessions,
-  } = useSessions({
-    skip: 0,
-    take: 10,
-    orderBy: "CreatedAt:DESC",
-  });
-  const userSessions = sessionsQuery?.sessions || [];
-  const handleLogoutSession = (sessionId: string) => {
-    deleteSession(sessionId);
-    queryClient.invalidateQueries({ queryKey: ["my-sessions"] });
-  };
-  const handleLogoutAllSessions = () => {
-    const otherSessions = userSessions.filter((s) => s.id);
-
-    if (otherSessions.length > 0) {
-      deleteAllSessions({ sessionIds: otherSessions.map((s) => s.id) });
-      queryClient.invalidateQueries({ queryKey: ["my-sessions"] });
-    }
-  };
-  const handleFactorAuthentication = () => {
-    if (isLoading || isLoadingStatus) return; // prevent duplicate clicks
-    if (!userDetails) return;
-
-    const item = twoFactorData?.[0];
-    const hasExistingRecord = !!item?.id;
-    if (!hasExistingRecord) {
-      // ✅ POST only if no record exists at all
-      setTwoFactorAuth({ isMFARequired: true });
-    } else {
-      //  Toggle using PUT/edit if a record already exists
-      const newStatus = !twoFactor;
-      editTwoFA({ id: item.id, isEnabled: newStatus });
-    }
-  };
-
-  const handleLogout = () => {
-    logout();
-  };
-
-  if (isLoading) {
-    return <Loader label={t("profile.loading")} />;
-  }
-
-  if (isError || !userDetails) {
-    return (
-      <div className="min-h-screen bg-white dark:bg-gray-900 flex items-center justify-center">
-        <motion.div
-          initial={{ scale: 0.9 }}
-          animate={{ scale: 1 }}
-          className="text-center space-y-4"
-        >
-          <div className="text-red-500">
-            <motion.div
-              animate={{ x: [-5, 5, -5] }}
-              transition={{ repeat: Infinity, duration: 1.5 }}
-            >
-              <CircleUser className="w-12 h-12 mx-auto" />
-            </motion.div>
-            <p className="mt-2 text-gray-700 dark:text-gray-300">
-              {t("profile.error")}
-            </p>
-          </div>
-          <motion.div whileHover={{ scale: 1.05 }} whileTap={{ scale: 0.95 }}>
-            <Button
-              onClick={() => refetch()}
-              className="mt-4 bg-primary hover:bg-primary-700 text-white"
-            >
-              {t("profile.tryAgain")}
-            </Button>
-          </motion.div>
-        </motion.div>
-      </div>
-    );
-  }
-
-  const employeeData = userDetails.employee?.[0] || {};
-  const position = employeeData.positions?.[0] || {};
-  const positionIsDeletation = employeeData.positions.filter(
-    (item: any) => item.isDelegate
-  );
-  const positionHasDeletation = employeeData.positions.filter(
-    (item: any) => item.hasDelegated
-  );
-  // Animation variants
-  const container = {
-    hidden: { opacity: 0 },
-    show: {
-      opacity: 1,
-      transition: {
-        staggerChildren: 0.1,
-      },
-    },
-  };
-
-  const item = {
-    hidden: { opacity: 0, y: 20 },
-    show: { opacity: 1, y: 0 },
-  };
-
-  // New reusable components for the improved layout
-  const PositionDetailItem: React.FC<PositionDetailItemProps> = ({
-    icon,
-    label,
-    value,
-  }) => (
-    <motion.div
-      whileHover={{ x: 4 }}
-      className="flex items-center gap-3 p-3 rounded-xl bg-gray-50 dark:bg-gray-700 border border-gray-200 dark:border-gray-600"
-    >
-      <div className="p-2 rounded-lg bg-primary-100 dark:bg-primary-900 text-primary-600 dark:text-primary-400">
-        {icon}
-      </div>
-      <div className="flex-1 min-w-0">
-        <p className="text-xs text-gray-500 dark:text-gray-400 whitespace-normal break-words">
-          {label}
-        </p>
-        <p
-          className="text-sm font-medium text-gray-800 dark:text-gray-200 break-words"
-          title={value}
-        >
-          {value}
-        </p>
-      </div>
-    </motion.div>
-  );
-
-  const InfoBox: React.FC<InfoBoxProps> = ({
-    icon,
-    label,
-    value,
-    color = "gray",
-    fullWidth = false,
-    amharic = false,
-    capitalize = false,
-  }) => (
-    <motion.div
-      whileHover={{ scale: 1.02 }}
-      className={`p-3 rounded-xl border ${
-        color === "blue"
-          ? "bg-primary/10 dark:bg-primary/20 border-primary/30 dark:border-primary/40"
-          : color === "purple"
-          ? "bg-purple-50 dark:bg-purple-900/20 border-purple-200 dark:border-purple-800"
-          : color === "green"
-          ? "bg-primary-50 dark:bg-primary-900/20 border-primary-200 dark:border-primary-800"
-          : "bg-gray-50 dark:bg-gray-700 border-gray-200 dark:border-gray-600"
-      } ${fullWidth ? "col-span-2" : ""}`}
-    >
-      <div className="flex items-center gap-2 mb-2">
-        <div
-          className={`p-1 rounded-lg ${
-            color === "blue"
-              ? "bg-primary/15 dark:bg-primary/25 text-primary dark:text-primary-300"
-              : color === "purple"
-              ? "bg-purple-100 dark:bg-purple-900 text-purple-600 dark:text-purple-400"
-              : color === "green"
-              ? "bg-primary-100 dark:bg-primary-900 text-primary-600 dark:text-primary-400"
-              : "bg-gray-100 dark:bg-gray-600 text-gray-600 dark:text-gray-300"
-          }`}
-        >
-          {icon}
-        </div>
-        <p className="text-xs font-medium text-gray-500 dark:text-gray-400">
-          {label}
-        </p>
-      </div>
-      <p
-        className={`text-sm font-semibold text-gray-800 dark:text-gray-200 truncate ${
-          amharic ? "font-amharic" : ""
-        } ${capitalize ? "capitalize" : ""}`}
-        title={value}
-      >
-        {value || "Not specified"}
-      </p>
-    </motion.div>
-  );
-
-  // Reusable Component: ProfileInfoItem
-  const ProfileInfoItem: React.FC<ProfileInfoItemProps> = ({
-    icon,
-    label,
-    value,
-    capitalize = false,
-  }) => (
-    <motion.div
-      whileHover={{ x: 4 }}
-      className="flex items-center gap-3 p-3 rounded-2xl bg-gray-50 dark:bg-gray-700 border border-gray-200 dark:border-gray-600 transition-all duration-200"
-    >
-      <div className="p-2 rounded-xl bg-primary-100 dark:bg-primary-900 text-primary-600 dark:text-primary-400">
-        {icon}
-      </div>
-      <div className="flex-1 min-w-0">
-        <p className="text-xs text-gray-500 dark:text-gray-400">{label}</p>
-        <p
-          className={`font-medium text-gray-800 dark:text-gray-200 text-sm truncate ${
-            capitalize ? "capitalize" : ""
-          }`}
-        >
-          {value}
-        </p>
-      </div>
-    </motion.div>
-  );
-
-  // Reusable Component: SecurityItem
-  const SecurityItem: React.FC<SecurityItemProps> = ({
-    title,
-    description,
-    status,
-    action,
-    twoFactorStatus,
-  }) => (
-    <motion.div
-      whileHover={{ x: 4 }}
-      className="flex items-center justify-between p-4 rounded-2xl bg-gray-50 dark:bg-gray-700 border border-gray-200 dark:border-gray-600"
-    >
-      <div className="flex items-center gap-3">
-        <div
-          className={`w-3 h-3 rounded-full ${
-            status === "secure"
-              ? "bg-primary-500"
-              : status === "warning"
-              ? "bg-yellow-500"
-              : "bg-gray-400 dark:bg-gray-500"
-          }`}
-        ></div>
-        <div>
-          <p className="font-medium text-gray-800 dark:text-gray-200">
-            {title}
-          </p>
-          <p className="text-sm text-gray-500 dark:text-gray-400">
-            {description}
-          </p>
-        </div>
-      </div>
-      {action}
-    </motion.div>
-  );
-
-  // Reusable Component: ActivityItem
-  const ActivityItem: React.FC<ActivityItemProps> = ({
-    icon,
-    title,
-    time,
-    type,
-  }) => (
-    <motion.div
-      whileHover={{ x: 4 }}
-      className="flex items-start gap-3 p-3 rounded-2xl bg-gray-50 dark:bg-gray-700 border border-gray-200 dark:border-gray-600"
-    >
-      <div
-        className={`p-2 rounded-full ${
-          type === "success"
-            ? "bg-primary-100 dark:bg-primary-900 text-primary-600 dark:text-primary-400"
-            : type === "info"
-            ? "bg-primary/15 dark:bg-primary/25 text-primary dark:text-primary-300"
-            : "bg-yellow-100 dark:bg-yellow-900 text-yellow-600 dark:text-yellow-400"
-        }`}
-      >
-        {icon}
-      </div>
-      <div className="flex-1">
-        <p className="text-sm font-medium text-gray-800 dark:text-gray-200">{title}</p>
-        <p className="text-xs text-gray-500 dark:text-gray-400">{time}</p>
-      </div>
-    </motion.div>
-  );
-
-  return (
-    <div className="min-h-screen bg-gradient-to-br from-slate-50 to-primary-50 dark:from-gray-900 dark:to-gray-800 p-4 sm:p-6 lg:p-8">
-      <Top showUserManagementShortcut={showUserManagementShortcut} />
-      <div className="max-w-7xl mx-auto">
-        {/* Enhanced Header */}
-        <motion.div
-          initial={{ opacity: 0, y: -20 }}
-          animate={{ opacity: 1, y: 0 }}
-          className="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 mb-8 mt-6"
-        >
-          <div className="flex items-center gap-4">
-            <motion.div whileHover={{ x: -3 }} whileTap={{ scale: 0.95 }}>
-              <Button
-                onClick={() => navigate(-1)}
-                className="flex items-center gap-2 px-4 py-2 rounded-xl border border-primary-200 dark:border-primary-700 bg-white dark:bg-gray-800 text-primary-800 dark:text-primary-300 hover:bg-primary-50 dark:hover:bg-gray-700 hover:border-primary-300 dark:hover:border-primary-600 transition-all duration-200 shadow-sm hover:shadow-md"
-              >
-                <ChevronLeft className="w-5 h-5" />
-                {t("common.back")}
-              </Button>
-            </motion.div>
-
-            <div className="hidden sm:block w-px h-6 bg-primary-200 dark:bg-primary-700"></div>
-
-            <motion.div
-              initial={{ opacity: 0, x: -10 }}
-              animate={{ opacity: 1, x: 0 }}
-              transition={{ delay: 0.1 }}
-              className="hidden sm:block"
-            ></motion.div>
-          </div>
-
-          {/* User Quick Stats */}
-          <motion.div
-            initial={{ opacity: 0, y: 10 }}
-            animate={{ opacity: 1, y: 0 }}
-            transition={{ delay: 0.2 }}
-            className="flex items-center gap-3 bg-white/80 dark:bg-gray-800/80 backdrop-blur-sm rounded-2xl p-3 border border-primary-200 dark:border-primary-700 shadow-sm"
-          >
-            <div className="flex items-center gap-2">
-              <div className="w-2 h-2 bg-primary-500 rounded-full animate-pulse"></div>
-              <span className="text-sm font-medium text-primary-800 dark:text-primary-300">
-                Online
-              </span>
-            </div>
-            <div className="w-px h-4 bg-primary-200 dark:bg-primary-700"></div>
-            <Badge className="bg-primary-100 dark:bg-primary-900 text-primary-800 dark:text-primary-300 border-primary-200 dark:border-primary-700">
-              {t(`profile.userTypes.${userDetails.userType}`)}
-            </Badge>
-          </motion.div>
-        </motion.div>
-
-        {/* Main Content Grid - Reorganized */}
-        <motion.div
-          variants={container}
-          initial="hidden"
-          animate="show"
-          className="grid grid-cols-1 xl:grid-cols-10 gap-6 lg:gap-8"
-        >
-          {/* Left Sidebar - Profile & Account Status */}
-          <div className="xl:col-span-4 space-y-6 lg:space-y-8">
-            {/* Enhanced Profile Card */}
-            <motion.div variants={item}>
-              <Card className="border-0 rounded-3xl overflow-hidden shadow-xl bg-white dark:bg-gray-800 hover:shadow-2xl transition-all duration-500 group">
-                {/* Profile Header with Gradient */}
-                <div className="relative bg-gradient-to-br from-primary-500 via-primary-600 to-primary-600 h-32 overflow-hidden">
-                  <div className="absolute inset-0 bg-grid-white/10"></div>
-                  <div className="absolute top-4 right-4">
-                    <Badge className="bg-white/20 backdrop-blur-sm text-white border-0">
-                      {userDetails.status === "accepted"
-                        ? "Verified"
-                        : "Pending"}
-                    </Badge>
-                  </div>
-
-                  {/* Profile Avatar */}
-                  <div className="absolute -bottom-6 left-1/2 transform -translate-x-1/2">
-                    <motion.div
-                      whileHover={{ scale: 1.05, rotate: 2 }}
-                      className="relative h-24 w-24 rounded-full border-4 border-white dark:border-gray-800 bg-white dark:bg-gray-800 shadow-2xl group-hover:shadow-3xl transition-all duration-300"
-                    >
-                      <div className="absolute inset-0 bg-gradient-to-br from-primary-400 to-primary-500 rounded-full flex items-center justify-center">
-                        <CircleUser className="w-10 h-10 text-white" />
-                      </div>
-                      <div className="absolute bottom-1 right-1 w-4 h-4 bg-primary-400 border-2 border-white rounded-full"></div>
-                    </motion.div>
-                  </div>
-                </div>
-
-                <CardContent className="pt-14 pb-6 px-6">
-                  {/* User Info */}
-                  <div className="text-center mb-6">
-                    <motion.h2
-                      whileHover={{ scale: 1.02 }}
-                      className="text-xl font-bold text-gray-800 dark:text-gray-100 mb-2 truncate"
-                      title={
-                        localizedName(userDetails.name) || t("profile.noName")
-                      }
-                    >
-                      {localizedName(userDetails.name) || t("profile.noName")}
-                    </motion.h2>
-                    <div className="flex items-center justify-center gap-2 text-gray-600 dark:text-gray-400">
-                      <User className="w-4 h-4" />
-                      <span className="text-sm">@{userDetails.username}</span>
-                    </div>
-                  </div>
-
-                  {/* Status Indicators */}
-                  <div className="grid grid-cols-2 gap-3 mb-6">
-                    <motion.div
-                      whileHover={{ scale: 1.05 }}
-                      className="text-center p-3 rounded-2xl bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800"
-                    >
-                      <div className="text-lg font-bold text-primary dark:text-primary-300">
-                        {positionIsDeletation ? "Yes" : "No"}
-                      </div>
-                      <div className="text-xs text-blue-800 dark:text-blue-300">Delegate</div>
-                    </motion.div>
-                    <motion.div
-                      whileHover={{ scale: 1.05 }}
-                      className="text-center p-3 rounded-2xl bg-purple-50 dark:bg-purple-900/20 border border-purple-200 dark:border-purple-800"
-                    >
-                      <div className="text-lg font-bold text-purple-600 dark:text-purple-400">
-                        {position.permissions?.length || 0}
-                      </div>
-                      <div className="text-xs text-purple-800 dark:text-purple-300">Permissions</div>
-                    </motion.div>
-                  </div>
-
-                  {/* Profile Details */}
-                  <div className="space-y-4">
-                    <ProfileInfoItem
-                      icon={<Mail className="w-4 h-4" />}
-                      label={t("profile.email")}
-                      value={userDetails.email}
-                    />
-                    <ProfileInfoItem
-                      icon={<Briefcase className="w-4 h-4" />}
-                      label={t("profile.userType")}
-                      value={t(`profile.userTypes.${userDetails.userType}`)}
-                      capitalize
-                    />
-                    <ProfileInfoItem
-                      icon={<CheckCircle2 className="w-4 h-4" />}
-                      label={t("profile.passwordSet")}
-                      value={
-                        userDetails.hasSetPassword
-                          ? t("common.yes")
-                          : t("common.no")
-                      }
-                    />
-                  </div>
-
-                  {/* Action Buttons */}
-                  <div className="grid grid-cols-2 gap-3 mt-6">
-                    <NavLink to="/update-profile">
-                      <Button className="w-full bg-primary-600 hover:bg-primary-700 text-white rounded-xl py-2 transition-all duration-200">
-                        <UserPen className="w-4 h-4 mr-2" />
-                        Edit
-                      </Button>
-                    </NavLink>
-                    <NavLink to="/change-password">
-                      <Button
-                        variant="outline"
-                        className="w-full border-primary-300 dark:border-primary-700 text-primary-700 dark:text-primary-300 hover:bg-primary-50 dark:hover:bg-gray-700 rounded-xl py-2"
-                      >
-                        <Lock className="w-4 h-4 mr-2" />
-                        Security
-                      </Button>
-                    </NavLink>
-                  </div>
-                </CardContent>
-              </Card>
-            </motion.div>
-
-            {/* Account Status Card */}
-            <motion.div variants={item}>
-              <Card className="border-0 rounded-3xl shadow-lg bg-gradient-to-br from-white to-primary-50 dark:from-gray-800 dark:to-gray-900 border border-primary-200 dark:border-primary-800">
-                <CardHeader className="pb-4">
-                  <CardTitle className="flex items-center gap-2 text-lg text-gray-800 dark:text-gray-100">
-                    <ShieldCheck className="w-5 h-5 text-primary-600" />
-                    Account Status
-                  </CardTitle>
-                </CardHeader>
-                <CardContent className="space-y-4">
-                  {/* Verification Status */}
-                  <div className="flex items-center justify-between p-3 rounded-2xl bg-white dark:bg-gray-700 border border-primary-200 dark:border-primary-800 shadow-sm">
-                    <div className="flex items-center gap-3">
-                      <div
-                        className={`p-2 rounded-xl ${
-                          userDetails.status === "accepted"
-                            ? "bg-primary-100 dark:bg-primary-900 text-primary-600 dark:text-primary-400"
-                            : "bg-amber-100 dark:bg-amber-900 text-amber-600 dark:text-amber-400"
-                        }`}
-                      >
-                        {userDetails.status === "accepted" ? (
-                          <CheckCircle2 className="w-4 h-4" />
-                        ) : (
-                          <Clock className="w-4 h-4" />
-                        )}
-                      </div>
-                      <div>
-                        <p className="text-sm font-medium text-gray-800 dark:text-gray-200">
-                          Account Status
-                        </p>
-                        <p className="text-xs text-gray-500 dark:text-gray-400">
-                          {userDetails.status === "accepted"
-                            ? "Verified and active"
-                            : "Pending approval"}
-                        </p>
-                      </div>
-                    </div>
-                    <Badge
-                      className={
-                        userDetails.status === "accepted"
-                          ? "bg-primary-100 dark:bg-primary-900 text-primary-800 dark:text-primary-300 border-primary-200 dark:border-primary-700"
-                          : "bg-amber-100 dark:bg-amber-900 text-amber-800 dark:text-amber-300 border-amber-200 dark:border-amber-700"
-                      }
-                    >
-                      {userDetails.status === "accepted" ? "Active" : "Pending"}
-                    </Badge>
-                  </div>
-
-                  {/* Password Status */}
-                  <div className="flex items-center justify-between p-3 rounded-2xl bg-white dark:bg-gray-700 border border-primary-200 dark:border-primary-800 shadow-sm">
-                    <div className="flex items-center gap-3">
-                      <div
-                        className={`p-2 rounded-xl ${
-                          userDetails.hasSetPassword
-                            ? "bg-primary-100 dark:bg-primary-900 text-primary-600 dark:text-primary-400"
-                            : "bg-red-100 dark:bg-red-900 text-red-600 dark:text-red-400"
-                        }`}
-                      >
-                        <Lock className="w-4 h-4" />
-                      </div>
-                      <div>
-                        <p className="text-sm font-medium text-gray-800 dark:text-gray-200">
-                          Password
-                        </p>
-                        <p className="text-xs text-gray-500 dark:text-gray-400">
-                          {userDetails.hasSetPassword
-                            ? "Secured with password"
-                            : "No password set"}
-                        </p>
-                      </div>
-                    </div>
-                    <Badge
-                      className={
-                        userDetails.hasSetPassword
-                          ? "bg-primary-100 dark:bg-primary-900 text-primary-800 dark:text-primary-300 border-primary-200 dark:border-primary-700"
-                          : "bg-red-100 dark:bg-red-900 text-red-800 dark:text-red-300 border-red-200 dark:border-red-700"
-                      }
-                    >
-                      {userDetails.hasSetPassword ? "Set" : "Not Set"}
-                    </Badge>
-                  </div>
-
-                  {/* Quick Action */}
-                  <div className="pt-2">
-                    <NavLink to="/update-profile">
-                      <Button
-                        variant="outline"
-                        className="w-full border-primary-300 dark:border-primary-700 text-primary-700 dark:text-primary-300 hover:bg-primary-50 dark:hover:bg-gray-700 rounded-xl py-2 transition-all duration-200"
-                      >
-                        <Settings className="w-4 h-4 mr-2" />
-                        Manage Account Settings
-                      </Button>
-                    </NavLink>
-                  </div>
-                </CardContent>
-              </Card>
-            </motion.div>
-          </div>
-
-          {/* Right Column - Main Content */}
-          <div className="xl:col-span-6 space-y-6 lg:space-y-8">
-            <motion.div variants={item}>
-              <Card className="border-0 rounded-3xl shadow-xl bg-white dark:bg-gray-800">
-                <CardHeader className="bg-gradient-to-r from-primary-600 to-primary-600 border-b-0 pb-6 pt-6">
-                  <CardTitle className="flex items-center gap-3 text-lg text-white">
-                    <div className="p-2 bg-white/20 rounded-xl backdrop-blur-sm">
-                      <Users className="w-5 h-5" />
-                    </div>
-                    <div>
-                      Employee Information
-                      <p className="text-primary-100 text-xs font-normal mt-1">
-                        Personal & organizational details
-                      </p>
-                    </div>
-                  </CardTitle>
-                </CardHeader>
-                <CardContent className="p-6">
-                  <div className="space-y-4">
-                    {/* Basic Info */}
-                    <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-                      <InfoBox
-                        icon={<IdCard className="w-4 h-4" />}
-                        label="Employee ID"
-                        value={employeeData?.id || "Not specified"}
-                        color="blue"
-                      />
-                      <InfoBox
-                        icon={<Building className="w-4 h-4" />}
-                        label="Organization ID"
-                        value={employeeData?.organizationId || "Not specified"}
-                        color="purple"
-                      />
-                      <InfoBox
-                        icon={<User className="w-4 h-4" />}
-                        label="User Type"
-                        value={userDetails.userType}
-                        color="green"
-                        capitalize
-                      />
-                    </div>
-
-                    {/* Names */}
-                    <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-                      <InfoBox
-                        icon={<FileText className="w-4 h-4" />}
-                        label="English Name"
-                        value={employeeData?.name?.en || "Not specified"}
-                        fullWidth
-                      />
-                      <InfoBox
-                        icon={<FileText className="w-4 h-4" />}
-                        label="Amharic Name"
-                        value={employeeData?.name?.am || "Not specified"}
-                        fullWidth
-                        amharic
-                      />
-                    </div>
-
-                    {/* Position Summary */}
-                    {userDetails.employee[0]?.positions?.[0] && (
-                      <div className="p-4 rounded-2xl bg-gradient-to-br from-gray-50 to-white dark:from-gray-700 dark:to-gray-800 border border-gray-200 dark:border-gray-600">
-                        <h4 className="font-semibold text-gray-800 dark:text-gray-200 mb-3 flex items-center gap-2">
-                          <Briefcase className="w-4 h-4 text-primary-600 dark:text-primary-400" />
-                          Current Position
-                        </h4>
-                        <div className="grid grid-cols-2 gap-4">
-                          <div>
-                            <p className="text-xs text-gray-500 dark:text-gray-400">
-                              Position
-                            </p>
-                            <p className="text-sm font-medium text-gray-800 dark:text-gray-200">
-                              {userDetails.employee[0].positions[0].name?.en ||
-                                "Not specified"}
-                            </p>
-                          </div>
-                          <div>
-                            <p className="text-xs text-gray-500 dark:text-gray-400">
-                              Delegation
-                            </p>
-                            <Badge
-                              className={
-                                positionHasDeletation.length
-                                  ? "bg-primary-100 dark:bg-primary-900 text-primary-800 dark:text-primary-300 border-primary-200 dark:border-primary-700"
-                                  : "bg-gray-100 dark:bg-gray-700 text-gray-800 dark:text-gray-300 border-gray-200 dark:border-gray-600"
-                              }
-                            >
-                              {positionHasDeletation.length ? "Active" : "None"}
-                            </Badge>
-                          </div>
-                        </div>
-                      </div>
-                    )}
-                  </div>
-                </CardContent>
-              </Card>
-            </motion.div>
-            {/* Top Row: Position Details & Security */}
-            <div className="grid grid-cols-1 lg:grid-cols-2 gap-6 lg:gap-8">
-              {/* Position Details */}
-              <motion.div variants={item} className="lg:col-span-1">
-                <Card className="border-0 rounded-3xl shadow-xl bg-white dark:bg-gray-800 h-full">
-                  <CardHeader className="bg-gradient-to-r from-primary-600 to-primary-600 border-b-0 pb-6 pt-6">
-                    <CardTitle className="flex items-center gap-3 text-lg text-white">
-                      <div className="p-2 bg-white/20 rounded-xl backdrop-blur-sm">
-                        <Briefcase className="w-5 h-5" />
-                      </div>
-                      <div>
-                        {t("profile.positionDetails")}
-                        <p className="text-primary-100 text-xs font-normal mt-1">
-                          Your current role
-                        </p>
-                      </div>
-                    </CardTitle>
-                  </CardHeader>
-                  <CardContent className="p-6">
-                    <div className="space-y-4">
-                      <PositionDetailItem
-                        icon={<User className="w-4 h-4" />}
-                        label={t("profile.positionName")}
-                        value={localizedName(position.name) || t("common.na")}
-                      />
-                      <PositionDetailItem
-                        icon={<Key className="w-4 h-4" />}
-                        label={t("profile.positionKey")}
-                        value={position.key || t("common.na")}
-                      />
-                      <PositionDetailItem
-                        icon={<IdCard className="w-4 h-4" />}
-                        label={t("profile.employeeId")}
-                        value={employeeData.id || t("common.na")}
-                      />
-                    </div>
-                  </CardContent>
-                </Card>
-              </motion.div>
-
-              {/* Security Card */}
-              <motion.div variants={item} className="lg:col-span-1">
-                <Card className="border-0 rounded-3xl shadow-xl bg-white dark:bg-gray-800 h-full">
-                  <CardHeader className="bg-gradient-to-r from-primary-600 to-primary-600 border-b-0 pb-6 pt-6">
-                    <CardTitle className="flex items-center gap-3 text-lg text-white">
-                      <div className="p-2 bg-white/20 rounded-xl backdrop-blur-sm">
-                        <Lock className="w-5 h-5" />
-                      </div>
-                      <div>
-                        {t("profile.accountSecurity")}
-                        <p className="text-primary-100 text-xs font-normal mt-1">
-                          Account safety
-                        </p>
-                      </div>
-                    </CardTitle>
-                  </CardHeader>
-                  <CardContent className="p-6">
-                    <div className="space-y-4">
-                      <SecurityItem
-                        title={t("profile.password")}
-                        description={
-                          userDetails.hasSetPassword
-                            ? t("profile.passwordSetStatus")
-                            : t("profile.passwordNotSetStatus")
-                        }
-                        status={
-                          userDetails.hasSetPassword ? "secure" : "warning"
-                        }
-                        action={
-                          <NavLink to="/change-password">
-                            <Button
-                              size="sm"
-                              className="bg-primary-600 hover:bg-primary-700 text-white rounded-lg"
-                            >
-                              {t("profile.changePassword")}
-                            </Button>
-                          </NavLink>
-                        }
-                      />
-                      <SecurityItem
-                        title="Two-Factor Authentication"
-                        description="Add an extra layer of security"
-                        twoFactorStatus={twoFactor ? "on" : "off"}
-                        action={
-                          <div className="flex items-center gap-2">
-                            <Label
-                              htmlFor="two-factor"
-                              className="text-sm text-gray-700 dark:text-gray-300"
-                            >
-                              {twoFactor ? "Enabled" : "Disabled"}
-                            </Label>
-                            <Switch
-                              id="two-factor"
-                              checked={twoFactor}
-                              disabled={isLoading}
-                              onCheckedChange={handleFactorAuthentication}
-                            />
-                          </div>
-                        }
-                      />
-                      <div className="mt-4 space-y-3">
-                        <div className="flex items-center justify-between p-4 rounded-2xl bg-gray-50 dark:bg-gray-700 border border-gray-200 dark:border-gray-600">
-                          <div className="flex items-center gap-2">
-                            <Monitor className="w-4 h-4 text-gray-600 dark:text-gray-400" />
-                            <span className="font-medium text-gray-900 dark:text-gray-100">
-                              {t("profile.sessions")}
-                            </span>
-                            {userSessions.length > 0 && (
-                              <span className="bg-primary-100 dark:bg-primary-900 text-primary-800 dark:text-primary-300 text-xs px-2 py-0.5 rounded-full">
-                                {userSessions.length} active
-                              </span>
-                            )}
-                          </div>
-                          <Button
-                            variant="outline"
-                            size="sm"
-                            onClick={() =>
-                              setIsSessionsExpanded(!isSessionsExpanded)
-                            }
-                            className="flex items-center gap-1"
-                          >
-                            {isSessionsExpanded ? "Hide" : "Show"}
-                            <ChevronDown
-                              className={`w-4 h-4 transition-transform ${
-                                isSessionsExpanded ? "rotate-180" : ""
-                              }`}
-                            />
-                          </Button>
-                        </div>
-
-                        {/* Expandable Sessions Content */}
-                        {isSessionsExpanded && (
-                          <motion.div
-                            initial={{ opacity: 0, height: 0 }}
-                            animate={{ opacity: 1, height: "auto" }}
-                            exit={{ opacity: 0, height: 0 }}
-                            className="border border-gray-200 dark:border-gray-600 rounded-xl bg-gray-50/50 dark:bg-gray-800/50 overflow-hidden"
-                          >
-                            <div className="p-4 space-y-3">
-                              {userSessions.length === 0 ? (
-                                <div className="text-center py-4 text-gray-500 dark:text-gray-400">
-                                  <Monitor className="w-8 h-8 mx-auto mb-2 text-gray-300 dark:text-gray-600" />
-                                  <p className="text-sm">No active sessions</p>
-                                </div>
-                              ) : (
-                                <>
-                                  {userSessions.map((session) => (
-                                    <div
-                                      key={session.id}
-                                      className="flex items-center justify-between p-3 bg-white dark:bg-gray-700 rounded-lg border border-gray-200 dark:border-gray-600"
-                                    >
-                                      <div className="flex items-center gap-3 flex-1">
-                                        <div className="p-2 bg-primary-100 dark:bg-primary-900 text-primary-700 dark:text-primary-400 rounded-lg">
-                                          <Monitor className="w-4 h-4" />
-                                        </div>
-                                        <div className="flex-1 min-w-0">
-                                          <p className="text-sm font-medium text-gray-900 dark:text-gray-100 truncate">
-                                            Device: {session.device}
-                                          </p>
-                                          <p className="text-xs text-gray-600 dark:text-gray-400 truncate">
-                                            Email: {session.email}
-                                          </p>
-                                          <p className="text-xs text-gray-500 dark:text-gray-400 mt-1">
-                                            Created:{" "}
-                                            {new Date(
-                                              session.createdAt
-                                            ).toLocaleString()}
-                                          </p>
-                                        </div>
-                                      </div>
-                                      <Button
-                                        variant="ghost"
-                                        size="sm"
-                                        className="p-1 hover:bg-red-50 hover:text-red-600 transition-colors"
-                                        onClick={() =>
-                                          handleLogoutSession(session.id)
-                                        }
-                                        title="Logout this session"
-                                      >
-                                        <LogOut className="w-4 h-4" />
-                                      </Button>
-                                    </div>
-                                  ))}
-
-                                  <Button
-                                    variant="outline"
-                                    size="sm"
-                                    className="w-full text-red-600 border-red-200 hover:bg-red-50 hover:text-red-700 mt-2"
-                                    onClick={handleLogoutAllSessions}
-                                  >
-                                    <LogOut className="w-4 h-4 mr-2" />
-                                    Logout All Other Sessions
-                                  </Button>
-                                </>
-                              )}
-                            </div>
-                          </motion.div>
-                        )}
-                      </div>
-                    </div>
-                  </CardContent>
-                </Card>
-              </motion.div>
-            </div>
-
-            {/* Middle Row: Permissions */}
-            <motion.div variants={item}>
-              <Card className="border-0 rounded-3xl shadow-xl bg-white dark:bg-gray-800 overflow-hidden">
-                <CardHeader className="bg-gradient-to-r from-primary-600 to-primary-600 border-b-0 pb-6 pt-6">
-                  <CardTitle className="flex items-center gap-3 text-lg text-white">
-                    <div className="p-2 bg-white/20 rounded-xl backdrop-blur-sm">
-                      <Shield className="w-5 h-5" />
-                    </div>
-                    <div>
-                      {t("profile.permissions")}
-                      <p className="text-primary-100 text-xs font-normal mt-1">
-                        Access rights and privileges
-                      </p>
-                    </div>
-                  </CardTitle>
-                </CardHeader>
-                <CardContent className="p-6">
-                  {position.permissions?.length > 0 ? (
-                    <motion.div
-                      layout
-                      className="grid grid-cols-1 sm:grid-cols-2 gap-3"
-                      initial={{ opacity: 0 }}
-                      animate={{ opacity: 1 }}
-                      transition={{ staggerChildren: 0.05 }}
-                    >
-                      {(permissionsExpanded ? position.permissions : position.permissions.slice(0, PERMISSIONS_INITIAL_SHOW)).map((perm: any, index: number) => (
-                        <motion.div
-                          key={perm.id}
-                          initial={{ opacity: 0, scale: 0.9 }}
-                          animate={{ opacity: 1, scale: 1 }}
-                          transition={{ delay: index * 0.05 }}
-                          whileHover={{ scale: 1.03, y: -2 }}
-                          className="flex items-center gap-3 p-3 rounded-2xl bg-gradient-to-r from-primary-50 to-primary-50 dark:from-primary-900/30 dark:to-primary-900/30 border border-primary-200 dark:border-primary-800 hover:shadow-md transition-all duration-200"
-                        >
-                          <div className="p-2 rounded-xl bg-gradient-to-br from-primary-500 to-primary-600 dark:from-primary-400 dark:to-primary-500 shadow-sm">
-                            <Star className="w-3.5 h-3.5 text-white" />
-                          </div>
-                          <span className="text-sm font-medium text-primary-900 dark:text-primary-100 truncate">
-                            {perm.key}
-                          </span>
-                        </motion.div>
-                      ))}
-                      {position.permissions.length > PERMISSIONS_INITIAL_SHOW && (
-                        <Button
-                          variant="outline"
-                          className="col-span-1 sm:col-span-2 flex items-center justify-center gap-2 border-primary-300 dark:border-primary-700 text-primary-700 dark:text-primary-300 hover:bg-primary-50 dark:hover:bg-primary-900/30"
-                          onClick={() => setPermissionsExpanded(!permissionsExpanded)}
-                        >
-                          {permissionsExpanded ? (
-                            <>
-                              <ChevronDown className="w-4 h-4 rotate-180" />
-                              Show Less
-                            </>
-                          ) : (
-                            <>
-                              <ChevronDown className="w-4 h-4" />
-                              Show {position.permissions.length - PERMISSIONS_INITIAL_SHOW} More ({position.permissions.length} total)
-                            </>
-                          )}
-                        </Button>
-                      )}
-                    </motion.div>
-                  ) : (
-                    <div className="text-center py-8">
-                      <div className="w-16 h-16 bg-gray-100 dark:bg-gray-700 rounded-2xl flex items-center justify-center mx-auto mb-4">
-                        <ShieldOff className="w-7 h-7 text-gray-400 dark:text-gray-500" />
-                      </div>
-                      <p className="text-gray-600 dark:text-gray-300 font-medium">
-                        {t("profile.noPermissions")}
-                      </p>
-                      <p className="text-gray-400 dark:text-gray-500 text-sm mt-1">
-                        No special access rights assigned
-                      </p>
-                    </div>
-                  )}
-                </CardContent>
-              </Card>
-            </motion.div>
-          </div>
-        </motion.div>
-      </div>
-    </div>
-  );
-};
-
-export default ProfilePage;
diff --git a/apps/edr-freight-web/backoffice/src/record-management/components/common/Top.tsx b/apps/edr-freight-web/backoffice/src/record-management/components/common/Top.tsx
index 507e7da74..82e716d66 100644
--- a/apps/edr-freight-web/backoffice/src/record-management/components/common/Top.tsx
+++ b/apps/edr-freight-web/backoffice/src/record-management/components/common/Top.tsx
@@ -17,7 +17,6 @@ import {
   ClipboardList,
   Clock,
   FileText,
-  Home,
   Languages,
   Key,
   LogOut,
@@ -104,9 +103,9 @@ const Top: React.FC<HeaderProps> = ({
   const activePositionName =
     currentLanguage === "am"
       ? userDetails?.employee?.[0]?.positions?.[0]?.name?.am ||
-        userDetails?.employee?.[0]?.positions?.[0]?.name?.en
+      userDetails?.employee?.[0]?.positions?.[0]?.name?.en
       : userDetails?.employee?.[0]?.positions?.[0]?.name?.en ||
-        userDetails?.employee?.[0]?.positions?.[0]?.name?.am;
+      userDetails?.employee?.[0]?.positions?.[0]?.name?.am;
 
   const normalizedUserType = userDetails?.userType?.trim().toLowerCase() || "";
   const userTypeLabel =
@@ -114,8 +113,8 @@ const Top: React.FC<HeaderProps> = ({
       ? t("header.user")
       : normalizedUserType
         ? normalizedUserType
-            .replace(/[_-]/g, " ")
-            .replace(/\b\w/g, (char) => char.toUpperCase())
+          .replace(/[_-]/g, " ")
+          .replace(/\b\w/g, (char) => char.toUpperCase())
         : "";
 
   const roleLabel =
@@ -123,8 +122,8 @@ const Top: React.FC<HeaderProps> = ({
     userTypeLabel ||
     (normalizedUserType
       ? userDetails?.roles?.[0]?.key
-          ?.replace(/[:_]/g, " ")
-          .replace(/\b\w/g, (char) => char.toUpperCase())
+        ?.replace(/[:_]/g, " ")
+        .replace(/\b\w/g, (char) => char.toUpperCase())
       : "");
 
   const { permissionKeys } = useUserDetail(userDetails as MeDto);
@@ -159,57 +158,57 @@ const Top: React.FC<HeaderProps> = ({
     },
     ...(moduleConfig.recordManagement
       ? [
-          {
-            id: "recordManagement",
-            label: t("nav.Record Management", "Record Management"),
-            path: "/record-management/dashboard",
-          },
-        ]
+        {
+          id: "recordManagement",
+          label: t("nav.Record Management", "Record Management"),
+          path: "/record-management/dashboard",
+        },
+      ]
       : []),
     ...(moduleConfig.performance
       ? [
-          {
-            id: "performanceManagement",
-            label: t("nav.PerformanceManagement", "Performance Management"),
-            path: "/performance-management/plan-years",
-          },
-        ]
+        {
+          id: "performanceManagement",
+          label: t("nav.PerformanceManagement", "Performance Management"),
+          path: "/performance-management/plan-years",
+        },
+      ]
       : []),
     ...(moduleConfig.objective
       ? [
-          {
-            id: "objectiveManagement",
-            label: t("nav.objectiveManagement", "Objective Management"),
-            path: "/objective-management/plan-years",
-          },
-        ]
+        {
+          id: "objectiveManagement",
+          label: t("nav.objectiveManagement", "Objective Management"),
+          path: "/objective-management/plan-years",
+        },
+      ]
       : []),
     ...(moduleConfig.dms
       ? [
-          {
-            id: "documentManagement",
-            label: t("nav.DocumentManagement", "Document Management"),
-            path: "/dms/dashboard",
-          },
-        ]
+        {
+          id: "documentManagement",
+          label: t("nav.DocumentManagement", "Document Management"),
+          path: "/dms/dashboard",
+        },
+      ]
       : []),
     ...(isOrgAdmin && moduleConfig.siteManagement
       ? [
-          {
-            id: "orgAdmin",
-            label: t("nav.admin", "Admin"),
-            path: "/user-management/user_management-dashboard",
-          },
-        ]
+        {
+          id: "orgAdmin",
+          label: t("nav.admin", "Admin"),
+          path: "/user-management/user_management-dashboard",
+        },
+      ]
       : []),
     ...(isSuperAdmin
       ? [
-          {
-            id: "superAdmin",
-            label: t("OrganizationAdmin", "Super Admin"),
-            path: "/user-management/dashboard",
-          },
-        ]
+        {
+          id: "superAdmin",
+          label: t("OrganizationAdmin", "Super Admin"),
+          path: "/user-management/dashboard",
+        },
+      ]
       : []),
   ];
 
@@ -256,10 +255,28 @@ const Top: React.FC<HeaderProps> = ({
   };
 
   return (
-    <div className="flex h-24 flex-col">
-      <header className="fixed left-0 right-0 top-0 z-40 h-16 border-b border-primary-100/70 bg-white/90 shadow-sm backdrop-blur-md dark:border-gray-800 dark:bg-gray-900/90">
-        <div className="flex h-full items-center justify-between px-2 sm:px-4 md:px-6">
-          <div className="flex min-w-0 flex-1 items-center gap-2 md:gap-3">
+    <header className="sticky top-0 z-40 h-14 shrink-0 border-b border-primary-100/70 bg-white/90 shadow-sm backdrop-blur-md dark:border-gray-800 dark:bg-gray-900/90">
+      <div className="flex h-full items-center justify-between px-2 sm:px-4 md:px-6">
+        <div className="flex min-w-0 flex-1 items-center gap-2 md:gap-3">
+          {onToggleSidebar ? (
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button
+                  variant="ghost"
+                  size="icon"
+                  onClick={onToggleSidebar}
+                  className="h-9 w-9 flex-shrink-0 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary-50 hover:text-primary-700 hover:ring-primary-200 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary-900/20 dark:hover:text-primary-300 dark:hover:ring-primary-700/40"
+                  aria-label="Toggle sidebar"
+                  title="Toggle sidebar"
+                >
+                  <FiMenu className="h-5 w-5" />
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent side="bottom" sideOffset={6}>
+                Toggle sidebar
+              </TooltipContent>
+            </Tooltip>
+          ) : (
             <DropdownMenu>
               <Tooltip>
                 <TooltipTrigger asChild>
@@ -320,191 +337,183 @@ const Top: React.FC<HeaderProps> = ({
                   ))}
               </DropdownMenuContent>
             </DropdownMenu>
+          )}
 
-            <div className="hidden min-w-0 flex-1 sm:block sm:max-w-[34vw] lg:max-w-[41vw] xl:max-w-[48vw]">
-              <DynamicBreadcrumb />
-            </div>
-
-            {showUserManagementShortcut && (
-              <Button
-                variant="ghost"
-                size="sm"
-                className="flex h-9 w-9 sm:w-auto items-center justify-center sm:justify-start gap-1.5 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary-50 hover:text-primary-700 hover:ring-primary-200 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary-900/20 dark:hover:text-primary-300 dark:hover:ring-primary-700/40 px-0 sm:px-3"
-                onClick={() => navigate("/user-management")}
-              >
-                <User className="h-4 w-4 shrink-0 text-primary-500" />
-                <span className="hidden sm:inline text-xs font-semibold">
-                  {t("dashboard.userManagement", "User Management")}
-                </span>
-              </Button>
-            )}
+          <div className="hidden min-w-0 flex-1 sm:block sm:max-w-[34vw] lg:max-w-[41vw] xl:max-w-[48vw]">
+            <DynamicBreadcrumb />
           </div>
 
-          <div className="flex max-w-[56vw] flex-shrink-0 items-center space-x-1.5 sm:max-w-none sm:space-x-2.5">
+          {showUserManagementShortcut && (
+            <Button
+              variant="ghost"
+              size="sm"
+              className="flex h-9 w-9 sm:w-auto items-center justify-center sm:justify-start gap-1.5 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary-50 hover:text-primary-700 hover:ring-primary-200 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary-900/20 dark:hover:text-primary-300 dark:hover:ring-primary-700/40 px-0 sm:px-3"
+              onClick={() => navigate("/user-management")}
+            >
+              <User className="h-4 w-4 shrink-0 text-primary-500" />
+              <span className="hidden sm:inline text-xs font-semibold">
+                {t("dashboard.userManagement", "User Management")}
+              </span>
+            </Button>
+          )}
+        </div>
+
+        <div className="flex max-w-[56vw] flex-shrink-0 items-center space-x-1.5 sm:max-w-none sm:space-x-2.5">
+          <Button
+            variant="ghost"
+            size="icon"
+            className="h-9 w-9 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary-50 hover:text-primary-700 hover:ring-primary-200 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary-900/20 dark:hover:text-primary-300 dark:hover:ring-primary-700/40 sm:h-10 sm:w-10"
+            aria-label={isDarkMode ? "Light mode" : "Dark mode"}
+            onClick={toggleDarkMode}
+            title={isDarkMode ? "Switch to light mode" : "Switch to dark mode"}
+          >
+            {isDarkMode ? (
+              <Sun className="h-4 w-4 text-yellow-500" />
+            ) : (
+              <Moon className="h-4 w-4 text-gray-700 dark:text-gray-300" />
+            )}
+          </Button>
+
+          {canActivateUsers && (
+            <div className="relative">
+              <Button
+                variant="ghost"
+                size="icon"
+                className="relative h-9 w-9 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary-50 hover:text-primary-700 hover:ring-primary-200 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary-900/20 dark:hover:text-primary-300 dark:hover:ring-primary-700/40 sm:h-10 sm:w-10"
+                aria-label={t("header.notifications")}
+                onClick={() => setPendingUsers((prev) => !prev)}
+              >
+                <ClipboardList className="h-4 w-4" />
+              </Button>
+
+              {pendingUsersCount > 0 && (
+                <span className="absolute -right-1.5 -top-1.5 rounded-full bg-yellow-500 px-1.5 py-0.5 text-[10px] font-bold text-white shadow">
+                  {pendingUsersCount > 99 ? "99+" : pendingUsersCount}
+                </span>
+              )}
+
+              {openPendingUsers && (
+                <div
+                  ref={pendingUsersRef}
+                  className="fixed left-3 right-3 top-16 z-50 mt-2 max-h-[calc(100dvh-5rem)] overflow-y-auto rounded-2xl bg-white p-3 shadow-2xl ring-1 ring-black/5 dark:bg-gray-900 dark:ring-white/10 sm:absolute sm:left-auto sm:right-0 sm:top-auto sm:max-h-96 sm:w-80 sm:p-4"
+                >
+                  <UserApprovalDropdown />
+                </div>
+              )}
+            </div>
+          )}
+
+          <div className="relative" ref={dropdownRef}>
             <Button
               variant="ghost"
               size="icon"
-              className="h-9 w-9 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary-50 hover:text-primary-700 hover:ring-primary-200 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary-900/20 dark:hover:text-primary-300 dark:hover:ring-primary-700/40 sm:h-10 sm:w-10"
-              aria-label={isDarkMode ? "Light mode" : "Dark mode"}
-              onClick={toggleDarkMode}
-              title={
-                isDarkMode ? "Switch to light mode" : "Switch to dark mode"
+              className={cn(
+                "relative h-9 w-9 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary-50 hover:text-primary-700 hover:ring-primary-200 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary-900/20 dark:hover:text-primary-300 dark:hover:ring-primary-700/40 sm:h-10 sm:w-10",
+                openNotifications &&
+                "bg-primary-50 text-primary-700 ring-primary-300 dark:bg-primary-900/30 dark:text-primary-300 dark:ring-primary-700/60",
+              )}
+              aria-label={t("header.notifications")}
+              onClick={() =>
+                setOpenNotifications((prev) => {
+                  const next = !prev;
+                  if (next) refresh();
+                  return next;
+                })
               }
             >
-              {isDarkMode ? (
-                <Sun className="h-4 w-4 text-yellow-500" />
-              ) : (
-                <Moon className="h-4 w-4 text-gray-700 dark:text-gray-300" />
+              <FiBell
+                className={cn(
+                  "h-4 w-4 transition-colors",
+                  openNotifications &&
+                  "fill-primary-100 text-primary-700 dark:fill-primary-900/40 dark:text-primary-300",
+                )}
+              />
+              {unseenCount > 0 && (
+                <span className="absolute -right-1.5 -top-1.5 min-w-[18px] rounded-full bg-red-500 px-1.5 py-0.5 text-center text-[10px] font-bold text-white shadow">
+                  {unseenCount > 99 ? "99+" : unseenCount}
+                </span>
               )}
             </Button>
 
-            {canActivateUsers && (
-              <div className="relative">
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  className="relative h-9 w-9 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary-50 hover:text-primary-700 hover:ring-primary-200 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary-900/20 dark:hover:text-primary-300 dark:hover:ring-primary-700/40 sm:h-10 sm:w-10"
-                  aria-label={t("header.notifications")}
-                  onClick={() => setPendingUsers((prev) => !prev)}
-                >
-                  <ClipboardList className="h-4 w-4" />
-                </Button>
-
-                {pendingUsersCount > 0 && (
-                  <span className="absolute -right-1.5 -top-1.5 rounded-full bg-yellow-500 px-1.5 py-0.5 text-[10px] font-bold text-white shadow">
-                    {pendingUsersCount > 99 ? "99+" : pendingUsersCount}
-                  </span>
-                )}
-
-                {openPendingUsers && (
-                  <div
-                    ref={pendingUsersRef}
-                    className="fixed left-3 right-3 top-16 z-50 mt-2 max-h-[calc(100dvh-5rem)] overflow-y-auto rounded-2xl bg-white p-3 shadow-2xl ring-1 ring-black/5 dark:bg-gray-900 dark:ring-white/10 sm:absolute sm:left-auto sm:right-0 sm:top-auto sm:max-h-96 sm:w-80 sm:p-4"
-                  >
-                    <UserApprovalDropdown />
-                  </div>
-                )}
+            {openNotifications && (
+              <div className="fixed left-3 right-3 top-16 z-50 mt-2 max-h-[calc(100dvh-5rem)] overflow-hidden rounded-2xl bg-white shadow-2xl ring-1 ring-black/5 dark:bg-gray-900 dark:ring-white/10 sm:absolute sm:left-auto sm:right-0 sm:top-auto sm:w-[24rem]">
+                <NotificationList />
               </div>
             )}
+          </div>
 
-            <div className="relative" ref={dropdownRef}>
-              <Button
-                variant="ghost"
-                size="icon"
-                className={cn(
-                  "relative h-9 w-9 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary-50 hover:text-primary-700 hover:ring-primary-200 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary-900/20 dark:hover:text-primary-300 dark:hover:ring-primary-700/40 sm:h-10 sm:w-10",
-                  openNotifications &&
-                    "bg-primary-50 text-primary-700 ring-primary-300 dark:bg-primary-900/30 dark:text-primary-300 dark:ring-primary-700/60",
-                )}
-                aria-label={t("header.notifications")}
-                onClick={() =>
-                  setOpenNotifications((prev) => {
-                    const next = !prev;
-                    if (next) refresh();
-                    return next;
-                  })
-                }
-              >
-                <FiBell
+          {/* Reminders */}
+          <div className="relative" ref={remindersRef}>
+            <Button
+              variant="ghost"
+              size="icon"
+              className="relative h-9 w-9 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary/10 hover:text-primary hover:ring-primary/30 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary/20 dark:hover:text-primary-300 dark:hover:ring-primary/40 sm:h-10 sm:w-10"
+              aria-label="Reminders"
+              onClick={() => setOpenReminders((prev) => !prev)}
+            >
+              <Clock className="h-4 w-4" />
+              {pendingCount > 0 && (
+                <span className="absolute -right-1.5 -top-1.5 min-w-[18px] rounded-full bg-primary px-1.5 py-0.5 text-center text-[10px] font-bold text-primary-foreground shadow">
+                  {pendingCount > 99 ? "99+" : pendingCount}
+                </span>
+              )}
+            </Button>
+            {openReminders && (
+              <div className="fixed left-3 right-3 top-16 z-50 mt-2 max-h-[calc(100dvh-5rem)] overflow-hidden rounded-2xl bg-white shadow-2xl ring-1 ring-black/5 dark:bg-gray-900 dark:ring-white/10 sm:absolute sm:left-auto sm:right-0 sm:top-auto sm:w-[24rem]">
+                <ReminderList />
+              </div>
+            )}
+          </div>
+
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button variant="ghost" size="sm">
+                <Languages className="h-4 w-4 text-primary-500" />
+                <span className="hidden sm:inline text-xs">
+                  {getUiLanguageShortLabel(currentLanguage, t)}
+                </span>
+                <ChevronDown className="hidden h-3.5 w-3.5 text-gray-400 sm:block" />
+              </Button>
+            </DropdownMenuTrigger>
+
+            <DropdownMenuContent
+              className="w-52 rounded-xl bg-white p-2 shadow-xl ring-1 ring-black/5 dark:bg-gray-900 dark:ring-white/10"
+              align="end"
+              forceMount
+            >
+              {UI_LANGUAGE_OPTIONS.map((lang) => (
+                <DropdownMenuItem
+                  key={lang.value}
+                  onClick={() => changeLanguage(lang.value)}
                   className={cn(
-                    "h-4 w-4 transition-colors",
-                    openNotifications &&
-                      "fill-primary-100 text-primary-700 dark:fill-primary-900/40 dark:text-primary-300",
+                    "flex cursor-pointer items-center justify-between rounded-lg px-3 py-2.5 text-sm text-gray-700 transition-colors hover:bg-primary-50 dark:text-gray-200 dark:hover:bg-primary-900/30",
+                    currentLanguage === lang.value &&
+                    "bg-primary-100 text-primary-800 dark:bg-primary-800/50 dark:text-white",
                   )}
-                />
-                {unseenCount > 0 && (
-                  <span className="absolute -right-1.5 -top-1.5 min-w-[18px] rounded-full bg-red-500 px-1.5 py-0.5 text-center text-[10px] font-bold text-white shadow">
-                    {unseenCount > 99 ? "99+" : unseenCount}
-                  </span>
-                )}
-              </Button>
+                >
+                  <div className="flex items-center gap-2">
+                    <span className="inline-flex h-6 w-6 items-center justify-center rounded-md bg-gray-100 text-[11px] font-bold text-gray-600 dark:bg-gray-700 dark:text-gray-200">
+                      {getUiLanguageShortLabel(lang.value, t)}
+                    </span>
+                    <span>{getUiLanguageLabel(lang.value, t)}</span>
+                  </div>
+                  {currentLanguage === lang.value && (
+                    <Check className="h-4 w-4 text-primary-600 dark:text-primary-400" />
+                  )}
+                </DropdownMenuItem>
+              ))}
+            </DropdownMenuContent>
+          </DropdownMenu>
 
-              {openNotifications && (
-                <div className="fixed left-3 right-3 top-16 z-50 mt-2 max-h-[calc(100dvh-5rem)] overflow-hidden rounded-2xl bg-white shadow-2xl ring-1 ring-black/5 dark:bg-gray-900 dark:ring-white/10 sm:absolute sm:left-auto sm:right-0 sm:top-auto sm:w-[24rem]">
-                  <NotificationList />
-                </div>
-              )}
-            </div>
-
-            {/* Reminders */}
-            <div className="relative" ref={remindersRef}>
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
               <Button
                 variant="ghost"
-                size="icon"
-                className="relative h-9 w-9 rounded-xl bg-white/90 text-gray-600 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary/10 hover:text-primary hover:ring-primary/30 dark:bg-gray-800/90 dark:text-gray-300 dark:ring-white/10 dark:hover:bg-primary/20 dark:hover:text-primary-300 dark:hover:ring-primary/40 sm:h-10 sm:w-10"
-                aria-label="Reminders"
-                onClick={() => setOpenReminders((prev) => !prev)}
+                className="group h-9 w-9 items-center justify-center rounded-xl bg-gradient-to-r from-white to-primary-50/80 p-0 text-gray-700 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:from-primary-50 hover:to-primary-100 hover:ring-primary-200 dark:from-gray-900 dark:to-gray-800 dark:text-gray-200 dark:ring-white/10 dark:hover:from-gray-800 dark:hover:to-primary-900/20 dark:hover:ring-primary-700/40 sm:h-10 sm:w-auto sm:max-w-[170px] sm:justify-start sm:gap-2 sm:rounded-2xl sm:px-1.5 sm:pr-2 md:max-w-[200px]"
+                aria-label={t("header.userMenu")}
               >
-                <Clock className="h-4 w-4" />
-                {pendingCount > 0 && (
-                  <span className="absolute -right-1.5 -top-1.5 min-w-[18px] rounded-full bg-primary px-1.5 py-0.5 text-center text-[10px] font-bold text-primary-foreground shadow">
-                    {pendingCount > 99 ? "99+" : pendingCount}
-                  </span>
-                )}
-              </Button>
-              {openReminders && (
-                <div className="fixed left-3 right-3 top-16 z-50 mt-2 max-h-[calc(100dvh-5rem)] overflow-hidden rounded-2xl bg-white shadow-2xl ring-1 ring-black/5 dark:bg-gray-900 dark:ring-white/10 sm:absolute sm:left-auto sm:right-0 sm:top-auto sm:w-[24rem]">
-                  <ReminderList />
-                </div>
-              )}
-            </div>
-
-            <DropdownMenu>
-              <DropdownMenuTrigger asChild>
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  className="h-9 w-9 justify-center rounded-xl bg-white/90 px-0 text-xs font-semibold text-gray-700 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:bg-primary-50 hover:text-primary-700 hover:ring-primary-200 dark:bg-gray-800/90 dark:text-gray-200 dark:ring-white/10 dark:hover:bg-primary-900/20 dark:hover:text-primary-300 dark:hover:ring-primary-700/40 sm:h-10 sm:w-auto sm:gap-2 sm:px-3"
-                >
-                  <Languages className="h-4 w-4 text-primary-500" />
-                  <span className="hidden md:inline">
-                    {getUiLanguageLabel(currentLanguage, t)}
-                  </span>
-                  <span className="hidden sm:inline md:hidden">
-                    {getUiLanguageShortLabel(currentLanguage, t)}
-                  </span>
-                  <ChevronDown className="hidden h-3.5 w-3.5 text-gray-400 sm:block" />
-                </Button>
-              </DropdownMenuTrigger>
-
-              <DropdownMenuContent
-                className="w-52 rounded-xl bg-white p-2 shadow-xl ring-1 ring-black/5 dark:bg-gray-900 dark:ring-white/10"
-                align="end"
-                forceMount
-              >
-                {UI_LANGUAGE_OPTIONS.map((lang) => (
-                  <DropdownMenuItem
-                    key={lang.value}
-                    onClick={() => changeLanguage(lang.value)}
-                    className={cn(
-                      "flex cursor-pointer items-center justify-between rounded-lg px-3 py-2.5 text-sm text-gray-700 transition-colors hover:bg-primary-50 dark:text-gray-200 dark:hover:bg-primary-900/30",
-                      currentLanguage === lang.value &&
-                        "bg-primary-100 text-primary-800 dark:bg-primary-800/50 dark:text-white",
-                    )}
-                  >
-                    <div className="flex items-center gap-2">
-                      <span className="inline-flex h-6 w-6 items-center justify-center rounded-md bg-gray-100 text-[11px] font-bold text-gray-600 dark:bg-gray-700 dark:text-gray-200">
-                        {getUiLanguageShortLabel(lang.value, t)}
-                      </span>
-                      <span>{getUiLanguageLabel(lang.value, t)}</span>
-                    </div>
-                    {currentLanguage === lang.value && (
-                      <Check className="h-4 w-4 text-primary-600 dark:text-primary-400" />
-                    )}
-                  </DropdownMenuItem>
-                ))}
-              </DropdownMenuContent>
-            </DropdownMenu>
-
-            <DropdownMenu>
-              <DropdownMenuTrigger asChild>
-                <Button
-                  variant="ghost"
-                  className="group h-9 w-9 items-center justify-center rounded-xl bg-gradient-to-r from-white to-primary-50/80 p-0 text-gray-700 shadow-sm ring-1 ring-inset ring-black/5 transition-colors hover:from-primary-50 hover:to-primary-100 hover:ring-primary-200 dark:from-gray-900 dark:to-gray-800 dark:text-gray-200 dark:ring-white/10 dark:hover:from-gray-800 dark:hover:to-primary-900/20 dark:hover:ring-primary-700/40 sm:h-10 sm:w-auto sm:max-w-[170px] sm:justify-start sm:gap-2 sm:rounded-2xl sm:px-1.5 sm:pr-2 md:max-w-[200px]"
-                  aria-label={t("header.userMenu")}
-                >
-                  <div
-                    className="
+                <div
+                  className="
     flex h-8 w-8 sm:h-9 sm:w-9
     items-center justify-center
     rounded-full
@@ -517,93 +526,92 @@ const Top: React.FC<HeaderProps> = ({
     ring-2 ring-white dark:ring-gray-900
     shrink-0
   "
-                  >
-                    {initials.toUpperCase()}
-                  </div>
-                  <div className="hidden min-w-0 flex-col items-start text-left lg:flex">
-                    <span className="max-w-[118px] truncate text-xs font-semibold leading-none">
-                      {fullName}
-                    </span>
-                    <span className="max-w-[118px] truncate pt-1 text-[10px] font-medium leading-none text-gray-500 dark:text-gray-400">
-                      {roleLabel}
-                    </span>
-                  </div>
-                  <ChevronDown className="hidden h-4 w-4 text-gray-400 transition group-hover:text-primary-600 dark:group-hover:text-primary-300 sm:block" />
-                </Button>
-              </DropdownMenuTrigger>
-
-              <DropdownMenuContent
-                className="w-64 rounded-xl bg-white p-2 shadow-xl ring-1 ring-black/5 dark:bg-gray-900 dark:ring-white/10"
-                align="end"
-              >
-                <div className="mb-1 rounded-lg bg-gradient-to-r from-primary-500 to-primary-600 p-3 text-white">
-                  <p className="truncate text-sm font-semibold">{fullName}</p>
-                  <p className="truncate pt-1 text-xs text-white/90">
-                    {roleLabel}
-                  </p>
+                >
+                  {initials.toUpperCase()}
                 </div>
+                <div className="hidden min-w-0 flex-col items-start text-left lg:flex">
+                  <span className="max-w-[118px] truncate text-xs font-semibold leading-none">
+                    {fullName}
+                  </span>
+                  <span className="max-w-[118px] truncate pt-1 text-[10px] font-medium leading-none text-gray-500 dark:text-gray-400">
+                    {roleLabel}
+                  </span>
+                </div>
+                <ChevronDown className="hidden h-4 w-4 text-gray-400 transition group-hover:text-primary-600 dark:group-hover:text-primary-300 sm:block" />
+              </Button>
+            </DropdownMenuTrigger>
 
+            <DropdownMenuContent
+              className="w-64 rounded-xl bg-white p-2 shadow-xl ring-1 ring-black/5 dark:bg-gray-900 dark:ring-white/10"
+              align="end"
+            >
+              <div className="mb-1 rounded-lg bg-gradient-to-r from-primary-500 to-primary-600 p-3 text-white">
+                <p className="truncate text-sm font-semibold">{fullName}</p>
+                <p className="truncate pt-1 text-xs text-white/90">
+                  {roleLabel}
+                </p>
+              </div>
+
+              <DropdownMenuItem
+                className="flex cursor-pointer items-center rounded-lg px-3 py-2.5 text-sm text-gray-700 transition-colors hover:bg-primary-50 dark:text-gray-200 dark:hover:bg-primary-900/20"
+                onClick={() => navigate("/profile")}
+              >
+                <User className="mr-2.5 h-4 w-4 text-primary-600 dark:text-primary-400" />
+                <span>{t("header.viewProfile")}</span>
+              </DropdownMenuItem>
+
+              <DropdownMenuItem
+                className="flex cursor-pointer items-center rounded-lg px-3 py-2.5 text-sm text-gray-700 transition-colors hover:bg-primary-50 dark:text-gray-200 dark:hover:bg-primary-900/20"
+                onClick={() => navigate("/update-profile")}
+              >
+                <UserPen className="mr-2.5 h-4 w-4 text-primary-600 dark:text-primary-400" />
+                <span>{t("header.editProfile")}</span>
+              </DropdownMenuItem>
+
+              <DropdownMenuItem
+                className="flex cursor-pointer items-center rounded-lg px-3 py-2.5 text-sm text-gray-700 transition-colors hover:bg-primary-50 dark:text-gray-200 dark:hover:bg-primary-900/20"
+                onClick={() => navigate("/change-password")}
+              >
+                <Key className="mr-2.5 h-4 w-4 text-primary-600 dark:text-primary-400" />
+                <span>{t("header.changePassword")}</span>
+              </DropdownMenuItem>
+
+              {showRecordManagementShortcut && (
                 <DropdownMenuItem
                   className="flex cursor-pointer items-center rounded-lg px-3 py-2.5 text-sm text-gray-700 transition-colors hover:bg-primary-50 dark:text-gray-200 dark:hover:bg-primary-900/20"
-                  onClick={() => navigate("/profile")}
+                  onClick={() => navigate("/record-management/dashboard")}
                 >
-                  <User className="mr-2.5 h-4 w-4 text-primary-600 dark:text-primary-400" />
-                  <span>{t("header.viewProfile")}</span>
+                  <FileText className="mr-2.5 h-4 w-4 text-primary-600 dark:text-primary-400" />
+                  <span>{t("nav.Record Management")}</span>
                 </DropdownMenuItem>
+              )}
 
+              {showUserManagementShortcut && (
                 <DropdownMenuItem
                   className="flex cursor-pointer items-center rounded-lg px-3 py-2.5 text-sm text-gray-700 transition-colors hover:bg-primary-50 dark:text-gray-200 dark:hover:bg-primary-900/20"
-                  onClick={() => navigate("/update-profile")}
+                  onClick={() => navigate("/user-management")}
                 >
-                  <UserPen className="mr-2.5 h-4 w-4 text-primary-600 dark:text-primary-400" />
-                  <span>{t("header.editProfile")}</span>
+                  <UsersRound className="mr-2.5 h-4 w-4 text-primary-600 dark:text-primary-400" />
+                  <span>
+                    {t("dashboard.userManagement", "User Management")}
+                  </span>
                 </DropdownMenuItem>
+              )}
 
-                <DropdownMenuItem
-                  className="flex cursor-pointer items-center rounded-lg px-3 py-2.5 text-sm text-gray-700 transition-colors hover:bg-primary-50 dark:text-gray-200 dark:hover:bg-primary-900/20"
-                  onClick={() => navigate("/change-password")}
-                >
-                  <Key className="mr-2.5 h-4 w-4 text-primary-600 dark:text-primary-400" />
-                  <span>{t("header.changePassword")}</span>
-                </DropdownMenuItem>
+              <DropdownMenuSeparator className="my-1 h-px bg-gray-200 dark:bg-gray-700" />
 
-                {showRecordManagementShortcut && (
-                  <DropdownMenuItem
-                    className="flex cursor-pointer items-center rounded-lg px-3 py-2.5 text-sm text-gray-700 transition-colors hover:bg-primary-50 dark:text-gray-200 dark:hover:bg-primary-900/20"
-                    onClick={() => navigate("/record-management/dashboard")}
-                  >
-                    <FileText className="mr-2.5 h-4 w-4 text-primary-600 dark:text-primary-400" />
-                    <span>{t("nav.Record Management")}</span>
-                  </DropdownMenuItem>
-                )}
-
-                {showUserManagementShortcut && (
-                  <DropdownMenuItem
-                    className="flex cursor-pointer items-center rounded-lg px-3 py-2.5 text-sm text-gray-700 transition-colors hover:bg-primary-50 dark:text-gray-200 dark:hover:bg-primary-900/20"
-                    onClick={() => navigate("/user-management")}
-                  >
-                    <UsersRound className="mr-2.5 h-4 w-4 text-primary-600 dark:text-primary-400" />
-                    <span>
-                      {t("dashboard.userManagement", "User Management")}
-                    </span>
-                  </DropdownMenuItem>
-                )}
-
-                <DropdownMenuSeparator className="my-1 h-px bg-gray-200 dark:bg-gray-700" />
-
-                <DropdownMenuItem
-                  className="flex cursor-pointer items-center rounded-lg px-3 py-2.5 text-sm text-red-600 transition-colors hover:bg-red-50 dark:hover:bg-red-950/30"
-                  onClick={handleLogout}
-                >
-                  <LogOut className="mr-2.5 h-4 w-4" />
-                  <span>{t("header.signOut")}</span>
-                </DropdownMenuItem>
-              </DropdownMenuContent>
-            </DropdownMenu>
-          </div>
+              <DropdownMenuItem
+                className="flex cursor-pointer items-center rounded-lg px-3 py-2.5 text-sm text-red-600 transition-colors hover:bg-red-50 dark:hover:bg-red-950/30"
+                onClick={handleLogout}
+              >
+                <LogOut className="mr-2.5 h-4 w-4" />
+                <span>{t("header.signOut")}</span>
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
         </div>
-      </header>
-    </div>
+      </div>
+    </header>
   );
 };
 
diff --git a/apps/edr-freight-web/backoffice/src/services/api.ts b/apps/edr-freight-web/backoffice/src/services/api.ts
index 911dde587..71005f6a1 100644
--- a/apps/edr-freight-web/backoffice/src/services/api.ts
+++ b/apps/edr-freight-web/backoffice/src/services/api.ts
@@ -814,6 +814,20 @@ export const api = {
       undefined,
       () => [QUERY_KEYS.TRAIN_SCHEDULING.ROOT],
     ),
+
+    moveWagonLoad: endpoint<
+      { scheduleId: string; wagonId: string; targetWagonId: string },
+      TrainScheduleDetail
+    >(
+      "train-scheduling",
+      "move-wagon-load",
+      ({ scheduleId, wagonId, targetWagonId }) =>
+        trainSchedulingService.moveWagonLoad(scheduleId, wagonId, {
+          targetWagonId,
+        }),
+      undefined,
+      () => [QUERY_KEYS.TRAIN_SCHEDULING.ROOT],
+    ),
   },
 
   warehouses: {
diff --git a/apps/edr-freight-web/backoffice/src/services/interchange-documents.service.ts b/apps/edr-freight-web/backoffice/src/services/interchange-documents.service.ts
index 6e2fd3474..0996b053d 100644
--- a/apps/edr-freight-web/backoffice/src/services/interchange-documents.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/interchange-documents.service.ts
@@ -28,6 +28,4 @@ export const interchangeDocumentsService = {
     apiClient.patch<InterchangeDocument>(URL_CONSTANTS.INTERCHANGE_DOCUMENTS.ACKNOWLEDGE(id), payload),
   dispute: (id: string, payload: { remarks: string }) =>
     apiClient.patch<InterchangeDocument>(URL_CONSTANTS.INTERCHANGE_DOCUMENTS.DISPUTE(id), payload),
-  cancel: (id: string) =>
-    apiClient.patch<InterchangeDocument>(URL_CONSTANTS.INTERCHANGE_DOCUMENTS.CANCEL(id), {}),
 };
diff --git a/apps/edr-freight-web/backoffice/src/services/procurement.service.ts b/apps/edr-freight-web/backoffice/src/services/procurement.service.ts
index 684dcd37f..8113db7f3 100644
--- a/apps/edr-freight-web/backoffice/src/services/procurement.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/procurement.service.ts
@@ -20,6 +20,7 @@ export interface Vendor {
 
 export interface AssetAcquisition {
   id: string;
+  itemName?: string | null;
   vehicleId?: string | null;
   vendorId?: string | null;
   acquisitionType: AcquisitionType;
diff --git a/apps/edr-freight-web/backoffice/src/services/ruleEngine/ruleEngine.service.ts b/apps/edr-freight-web/backoffice/src/services/ruleEngine/ruleEngine.service.ts
index a1e36ce0a..4e646e426 100644
--- a/apps/edr-freight-web/backoffice/src/services/ruleEngine/ruleEngine.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/ruleEngine/ruleEngine.service.ts
@@ -17,6 +17,9 @@ export interface RuleEngineListParams {
   sortBy?: string;
   sortOrder?: "ASC" | "DESC";
   requiresDirectorApproval?: boolean;
+  /** Rates category tabs — comma-separated appliesTo / trigger filters. */
+  appliesTo?: string;
+  trigger?: string;
 }
 
 export interface RuleEngineReorderPayload {
@@ -205,6 +208,8 @@ export const ruleEngineService = {
         sortBy: params?.sortBy,
         sortOrder: params?.sortOrder,
         requiresDirectorApproval: params?.requiresDirectorApproval,
+        appliesTo: params?.appliesTo,
+        trigger: params?.trigger,
       },
     });
     return normalizeList<T>(response.data, page, pageSize);
diff --git a/apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts b/apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts
index 1eb43a048..5f9071eb8 100644
--- a/apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts
@@ -757,6 +757,18 @@ export const trainSchedulingService = {
     return unwrap(response.data);
   },
 
+  moveWagonLoad: async (
+    scheduleId: string,
+    wagonId: string,
+    payload: { targetWagonId: string },
+  ): Promise<TrainScheduleDetail> => {
+    const response = await client.post<TrainScheduleDetail>(
+      URL_CONSTANTS.TRAIN_SCHEDULING.MOVE_WAGON_LOAD(scheduleId, wagonId),
+      payload,
+    );
+    return unwrap(response.data);
+  },
+
   getUnassignedBookings: async (
     scheduleId: string,
   ): Promise<UnassignedBookingsResponse> => {
diff --git a/apps/edr-freight-web/backoffice/src/shared/config/app.config.ts b/apps/edr-freight-web/backoffice/src/shared/config/app.config.ts
index 335eb4539..becf016ba 100644
--- a/apps/edr-freight-web/backoffice/src/shared/config/app.config.ts
+++ b/apps/edr-freight-web/backoffice/src/shared/config/app.config.ts
@@ -9,5 +9,3 @@ function normalizeBaseUrl(url: string) {
 export const AUDITLOG_API_URL: string = normalizeBaseUrl(
   getEnvUrl("VITE_AUDITLOG_API_URL", false),
 );
-
-if (!AUDITLOG_API_URL) console.warn("Missing VITE_AUDITLOG_API_URL");
diff --git a/apps/edr-freight-web/backoffice/src/shared/services/chronicleInstance.ts b/apps/edr-freight-web/backoffice/src/shared/services/chronicleInstance.ts
index 740b95990..773619dea 100644
--- a/apps/edr-freight-web/backoffice/src/shared/services/chronicleInstance.ts
+++ b/apps/edr-freight-web/backoffice/src/shared/services/chronicleInstance.ts
@@ -9,18 +9,12 @@ import {
 } from "../utils/authPersistence";
 import { handleSessionExpiry } from "./sessionExpiry";
 
-if (!import.meta.env.VITE_CHRONICLE_URL) {
-  console.warn("Missing VITE_CHRONICLE_URL — chronicle axios instance has no base URL");
-}
-
+// Chronicle/audit-log backend is optional in this deployment — no warning
+// when unset; the module's screens are simply non-functional without it.
 const chronicleBaseUrl =
   getEnvUrl("VITE_CHRONICLE_URL", false) ||
   getEnvUrl("VITE_AUDITLOG_API_URL", false);
 
-if (!chronicleBaseUrl) {
-  console.warn("Missing VITE_CHRONICLE_URL and VITE_AUDITLOG_API_URL");
-}
-
 const chronicleInstance = axios.create({
   baseURL: chronicleBaseUrl,
 });
diff --git a/apps/edr-freight-web/backoffice/src/shared/services/organizationsService.ts b/apps/edr-freight-web/backoffice/src/shared/services/organizationsService.ts
index 3a560a08d..f0bd42337 100644
--- a/apps/edr-freight-web/backoffice/src/shared/services/organizationsService.ts
+++ b/apps/edr-freight-web/backoffice/src/shared/services/organizationsService.ts
@@ -37,7 +37,7 @@ export enum FilterEnum {
 }
 
 export const getOrganizations = async (
-  params?: OrgQueryParams
+  params?: OrgQueryParams,
 ): Promise<AxiosResponse> => {
   return axiosInstance.get("/organizations/filter", {
     ...{ headers: withHeaders() },
@@ -45,29 +45,27 @@ export const getOrganizations = async (
   });
 };
 
-export const getMyAdminOrganizations = async (): Promise<AxiosResponse> => {
-  //my-admin-organizations
-  return axiosInstance.get("/organizations/with-admin-flag", {
-    headers: withHeaders(),
-  });
-};
 export const getOrganizationsWithAdminFlag = async (
-  params?: OrgQueryParams
+  params?: OrgQueryParams,
 ): Promise<AxiosResponse> => {
   return axiosInstance.get("/organizations/with-admin-flag", {
     ...{ headers: withHeaders() },
-    params,
+    params: {
+      take: 100,
+      ...params,
+    },
   });
 };
+export const getMyAdminOrganizations = getOrganizationsWithAdminFlag;
 
 export const getOrganizationById = async (
-  id: string | number
+  id: string | number,
 ): Promise<AxiosResponse> => {
   return axiosInstance.get(`/organizations/${id}`, { headers: withHeaders() });
 };
 
 export const getChildren = async (
-  id: string | number
+  id: string | number,
 ): Promise<AxiosResponse> => {
   return axiosInstance.get(`/organizations/${id}/children`, {
     headers: withHeaders(),
@@ -76,7 +74,7 @@ export const getChildren = async (
 
 export const getEmployeesUnderOrg = async (
   id: string | number,
-  params?: OrgQueryParams
+  params?: OrgQueryParams,
 ): Promise<AxiosResponse> => {
   return axiosInstance.get(`/organizations/current/${id}/employees`, {
     headers: withHeaders(),
@@ -89,7 +87,7 @@ export const getEmployeesUnderOrg = async (
 };
 
 export const getEmployeeCountByOrgId = async (
-  id: string | number
+  id: string | number,
 ): Promise<AxiosResponse> => {
   // Try the endpoint from your curl example
   return axiosInstance.get(`/organizations/${id}/employees/count`, {
@@ -98,13 +96,13 @@ export const getEmployeeCountByOrgId = async (
 };
 
 export const createOrganization = async (
-  data: OrganizationPayload
+  data: OrganizationPayload,
 ): Promise<AxiosResponse> => {
   return axiosInstance.post("/organizations", data, { headers: withHeaders() });
 };
 
 export const activateOrganization = async (
-  id: string | number
+  id: string | number,
 ): Promise<AxiosResponse> => {
   return axiosInstance.patch(`/organizations/${id}/activate`, null, {
     headers: withHeaders(),
@@ -112,7 +110,7 @@ export const activateOrganization = async (
 };
 
 export const deActivateOrganization = async (
-  id: string | number
+  id: string | number,
 ): Promise<AxiosResponse> => {
   return axiosInstance.patch(`/organizations/${id}/debar`, null, {
     headers: withHeaders(),
@@ -121,7 +119,7 @@ export const deActivateOrganization = async (
 
 export const updateOrganization = async (
   id: string | number,
-  data: OrganizationPayload
+  data: OrganizationPayload,
 ): Promise<AxiosResponse> => {
   return axiosInstance.put(`/organizations/${id}`, data, {
     headers: withHeaders(),
@@ -129,7 +127,7 @@ export const updateOrganization = async (
 };
 
 export const deleteOrganization = async (
-  id: string | number
+  id: string | number,
 ): Promise<AxiosResponse> => {
   return axiosInstance.delete(`/organizations/${id}`, {
     headers: withHeaders(),
@@ -137,7 +135,7 @@ export const deleteOrganization = async (
 };
 
 export const softDeleteOrganization = async (
-  id: string | number
+  id: string | number,
 ): Promise<AxiosResponse> => {
   return axiosInstance.delete(`/organizations/${id}/soft`, {
     headers: withHeaders(),
@@ -149,7 +147,7 @@ export const softDeleteOrganization = async (
 //   GET   /organizations/archived
 //   PATCH /organizations/{id}/restore
 export const getArchivedOrganizations = async (
-  params?: OrgQueryParams
+  params?: OrgQueryParams,
 ): Promise<AxiosResponse> => {
   return axiosInstance.get(`/organizations/archived`, {
     headers: withHeaders(),
@@ -158,7 +156,7 @@ export const getArchivedOrganizations = async (
 };
 
 export const restoreOrganization = async (
-  id: string | number
+  id: string | number,
 ): Promise<AxiosResponse> => {
   return axiosInstance.patch(`/organizations/${id}/restore`, null, {
     headers: withHeaders(),
@@ -171,20 +169,20 @@ export const getDocumentRequirements = async (): Promise<AxiosResponse> => {
   });
 };
 export const getDocumentRequirementsById = async (
-  id: string
+  id: string,
 ): Promise<AxiosResponse> => {
   return axiosInstance.get(`/documentary-requirements/${id}`, {
     headers: withHeaders(),
   });
 };
 export const getDocumentRequirementsByFilter = async (
-  filter: FilterEnum
+  filter: FilterEnum,
 ): Promise<AxiosResponse> => {
   return axiosInstance.get(`/documentary-requirements/${filter}/type`);
 };
 
 export const postDocumentRequirements = async (
-  data: DocumentRequirementDto
+  data: DocumentRequirementDto,
 ): Promise<AxiosResponse> => {
   return axiosInstance.post(`/documentary-requirements`, data, {
     headers: withHeaders(),
@@ -193,7 +191,7 @@ export const postDocumentRequirements = async (
 
 export const giveResponse = async (
   id: string,
-  data: ResponseActionDto
+  data: ResponseActionDto,
 ): Promise<AxiosResponse> => {
   return axiosInstance.post(`user-documents/${id}/response`, data, {
     headers: withHeaders(),
@@ -202,7 +200,7 @@ export const giveResponse = async (
 
 export const getArchivedUserId = async (
   unitId: string,
-  params?: OrgQueryParams
+  params?: OrgQueryParams,
 ): Promise<AxiosResponse> => {
   return axiosInstance.get(`/employees/archived/${unitId}/with-unit`, {
     headers: withHeaders(),
diff --git a/apps/edr-freight-web/backoffice/src/shared/services/recordAxiosInstance.ts b/apps/edr-freight-web/backoffice/src/shared/services/recordAxiosInstance.ts
index d1f476c0c..38c770031 100644
--- a/apps/edr-freight-web/backoffice/src/shared/services/recordAxiosInstance.ts
+++ b/apps/edr-freight-web/backoffice/src/shared/services/recordAxiosInstance.ts
@@ -8,14 +8,10 @@ import {
 } from "../utils/authPersistence";
 import { handleSessionExpiry } from "./sessionExpiry";
 
-if (!import.meta.env.VITE_RECORD_API_URL) {
-  console.warn(
-    "Missing VITE_RECORD_API_URL — record axios instance has no base URL",
-  );
-}
-
+// Record backend is optional in this deployment — no warning when unset; the
+// module's screens are simply non-functional without it.
 const recordAxiosInstance = axios.create({
-  baseURL: getEnvUrl("VITE_RECORD_API_URL"),
+  baseURL: getEnvUrl("VITE_RECORD_API_URL", false),
 });
 
 // Attach auth token and CSRF defence header to every request
diff --git a/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/AdminFormModal.tsx b/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/AdminFormModal.tsx
new file mode 100644
index 000000000..44211f6c3
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/AdminFormModal.tsx
@@ -0,0 +1,383 @@
+import { useEffect } from "react";
+import { z } from "zod";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { t } from "i18next";
+import { useTranslation } from "react-i18next";
+import { Loader2 } from "lucide-react";
+import { Button } from "@/shared/common/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/shared/common/ui/dialog";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@/shared/common/ui/form";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/shared/common/ui/select";
+import { Input } from "@/shared/common/ui/input";
+import { useLocalizedName } from "@/shared/common/localizedName";
+import { useUnit } from "@/user-management/hooks/useUnit";
+import { useOrganizations } from "@/super-admin/hooks/useOrganizations";
+import { OrgAdminUser } from "@/super-admin/hooks/useOrgAdmins";
+
+const adminSchema = z.object({
+  name: z.object({
+    en: z.string().min(1, t("organization.englishNameRequired")),
+    am: z.string().min(1, t("organization.amharicNameRequired")),
+  }),
+  username: z.string().min(3, t("organization.usernameMinLength")),
+  email: z.string().email(t("organization.invalidEmail")),
+  phoneNumber: z
+    .string()
+    .regex(/^(\+251|0)?9\d{8}$/, t("organization.invalidPhoneNumber")),
+  organizationId: z.string().min(1, t("organization.organizationRequired")),
+  /** required when the org has units (unit admin); empty only when the org
+   *  has no units → org admin. Enforced at submit, not in the schema. */
+  unitId: z.string().optional(),
+});
+
+export type AdminFormValues = z.infer<typeof adminSchema>;
+
+const EMPTY_VALUES: AdminFormValues = {
+  name: { en: "", am: "" },
+  username: "",
+  email: "",
+  phoneNumber: "",
+  organizationId: "",
+  unitId: "",
+};
+
+const RequiredMark = () => <span className="text-red-500"> *</span>;
+
+interface AdminFormModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  /** null → add a new admin; set → edit this admin's profile */
+  admin: OrgAdminUser | null;
+  /** org whose units feed the unit-admin scope picker */
+  organizationId?: string;
+  /** server-side error from the last submit, shown inline */
+  apiError: string | null;
+  onSubmit: (values: AdminFormValues) => void;
+  isSubmitting: boolean;
+}
+
+/** Add-admin (org or unit scope) / edit-admin-profile modal (one form). */
+export default function AdminFormModal({
+  isOpen,
+  onClose,
+  admin,
+  organizationId,
+  apiError,
+  onSubmit,
+  isSubmitting,
+}: AdminFormModalProps) {
+  const { t } = useTranslation();
+  const localizedName = useLocalizedName();
+  const isEdit = !!admin;
+
+  const form = useForm<AdminFormValues>({
+    resolver: zodResolver(adminSchema),
+    defaultValues: EMPTY_VALUES,
+  });
+
+  const { organizationsResponse } = useOrganizations("Org", { take: 3000 });
+  const activeOrgs = (organizationsResponse?.items ?? []).filter(
+    (org) => org.status === "Active",
+  );
+
+  const selectedOrgId = form.watch("organizationId");
+  const { data: unitsResponse, isLoading: isLoadingUnits } =
+    useUnit().getList(
+      selectedOrgId || "",
+      { take: 300, skip: 0 },
+      isOpen && !isEdit,
+    );
+  const units = unitsResponse?.data?.items ?? [];
+
+  useEffect(() => {
+    if (isOpen) {
+      form.reset(
+        admin
+          ? {
+              ...EMPTY_VALUES,
+              name: {
+                en: admin.name?.en ?? "",
+                am: admin.name?.am ?? "",
+              },
+              username: admin.username ?? "",
+              email: admin.email ?? "",
+              phoneNumber: admin.phoneNumber ?? "",
+            }
+          : { ...EMPTY_VALUES, organizationId: organizationId ?? "" },
+      );
+    }
+  }, [isOpen, admin, organizationId, form]);
+
+  // an org with units gets a unit admin — unit is mandatory then; only a
+  // unit-less org falls through to an org admin
+  const submit = form.handleSubmit((values) => {
+    if (!isEdit && units.length > 0 && !values.unitId) {
+      form.setError("unitId", {
+        message: t("orgAdmins.form.unitRequired"),
+      });
+      return;
+    }
+    onSubmit(values);
+  });
+
+  const handleClose = () => {
+    if (isSubmitting) return;
+    onClose();
+  };
+
+  return (
+    <Dialog open={isOpen} onOpenChange={(open) => !open && handleClose()}>
+      <DialogContent className="sm:max-w-[520px]">
+        <DialogHeader>
+          <DialogTitle>
+            {isEdit ? t("orgAdmins.edit.title") : t("orgAdmins.add.title")}
+          </DialogTitle>
+          <DialogDescription>
+            {isEdit
+              ? t("orgAdmins.edit.description")
+              : t("orgAdmins.add.description")}
+          </DialogDescription>
+        </DialogHeader>
+
+        <Form {...form}>
+          <form onSubmit={submit} className="space-y-4">
+            <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+              <FormField
+                control={form.control}
+                name="name.en"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      {t("orgAdmins.form.nameEn")}
+                      <RequiredMark />
+                    </FormLabel>
+                    <FormControl>
+                      <Input
+                        placeholder={t("organization.enterEnglishName")}
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={form.control}
+                name="name.am"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      {t("orgAdmins.form.nameAm")}
+                      <RequiredMark />
+                    </FormLabel>
+                    <FormControl>
+                      <Input
+                        placeholder={t("organization.enterAmharicName")}
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+            <FormField
+              control={form.control}
+              name="username"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    {t("orgAdmins.form.username")}
+                    <RequiredMark />
+                  </FormLabel>
+                  <FormControl>
+                    <Input
+                      placeholder={t("organization.enterUsername")}
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="email"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    {t("orgAdmins.form.email")}
+                    <RequiredMark />
+                  </FormLabel>
+                  <FormControl>
+                    <Input
+                      type="email"
+                      placeholder={t("organization.emailExample")}
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="phoneNumber"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    {t("orgAdmins.form.phoneNumber")}
+                    <RequiredMark />
+                  </FormLabel>
+                  <FormControl>
+                    <Input
+                      type="tel"
+                      placeholder={t("organization.phoneNumberExample")}
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            {!isEdit && (
+              <>
+                <FormField
+                  control={form.control}
+                  name="organizationId"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>
+                        {t("organization.organization")}
+                        <RequiredMark />
+                      </FormLabel>
+                      <Select
+                        value={field.value}
+                        onValueChange={(value) => {
+                          field.onChange(value);
+                          form.setValue("unitId", ""); // reset unit when org changes
+                        }}
+                      >
+                        <FormControl>
+                          <SelectTrigger>
+                            <SelectValue
+                              placeholder={t(
+                                "organization.selectOrganization",
+                              )}
+                            />
+                          </SelectTrigger>
+                        </FormControl>
+                        <SelectContent>
+                          {activeOrgs.map((org) => (
+                            <SelectItem key={org.id} value={org.id}>
+                              {localizedName(org.name)}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                {(isLoadingUnits || units.length > 0 || !selectedOrgId) && (
+                  <FormField
+                    control={form.control}
+                    name="unitId"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>
+                          {t("orgAdmins.form.unit")}
+                          <RequiredMark />
+                        </FormLabel>
+                        <Select
+                          value={field.value}
+                          onValueChange={field.onChange}
+                          disabled={!selectedOrgId || isLoadingUnits}
+                        >
+                          <FormControl>
+                            <SelectTrigger>
+                              <SelectValue
+                                placeholder={
+                                  isLoadingUnits
+                                    ? t("orgAdmins.form.loadingUnits")
+                                    : t("orgAdmins.form.selectUnit")
+                                }
+                              />
+                            </SelectTrigger>
+                          </FormControl>
+                          <SelectContent>
+                            {units.map((unit: any) => (
+                              <SelectItem key={unit.id} value={unit.id}>
+                                {localizedName(unit.name)}
+                              </SelectItem>
+                            ))}
+                          </SelectContent>
+                        </Select>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+                )}
+                <p className="text-xs text-muted-foreground">
+                  {!isLoadingUnits && selectedOrgId && units.length === 0
+                    ? t("orgAdmins.add.noUnitsOrgAdmin")
+                    : t("orgAdmins.add.inviteNote")}
+                </p>
+              </>
+            )}
+
+            {apiError && (
+              <div className="rounded-md border border-red-300 bg-red-50 px-3 py-2 text-sm text-red-800 dark:border-red-800 dark:bg-red-950 dark:text-red-300">
+                {apiError}
+              </div>
+            )}
+
+            <DialogFooter>
+              <Button
+                type="button"
+                variant="outline"
+                onClick={handleClose}
+                disabled={isSubmitting}
+              >
+                {t("common.cancel")}
+              </Button>
+              <Button
+                type="submit"
+                disabled={isSubmitting || (!isEdit && isLoadingUnits)}
+              >
+                {isSubmitting && (
+                  <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                )}
+                {isEdit
+                  ? t("orgAdmins.edit.submit")
+                  : t("orgAdmins.add.submit")}
+              </Button>
+            </DialogFooter>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/AssignExistingAdminModal.tsx b/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/AssignExistingAdminModal.tsx
new file mode 100644
index 000000000..870d75486
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/AssignExistingAdminModal.tsx
@@ -0,0 +1,334 @@
+import { useEffect, useMemo, useState } from "react";
+import { Check, Loader2, UserPlus } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import { Button } from "@/shared/common/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/shared/common/ui/dialog";
+import { Input } from "@/shared/common/ui/input";
+import { Label } from "@/shared/common/ui/label";
+import { ScrollArea } from "@/shared/common/ui/scroll-area";
+import { Badge } from "@/shared/common/ui/badge";
+import { cn } from "@/super-admin/lib/utils";
+import { useLocalizedName } from "@/shared/common/localizedName";
+import { useEmployees } from "@/user-management/hooks/useEmployees";
+import { useUnit } from "@/user-management/hooks/useUnit";
+import { useOrganizations } from "@/super-admin/hooks/useOrganizations";
+
+interface AssignExistingAdminModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  /** org preselected in the panel (the page's current org) */
+  organizationId: string;
+  /** user ids that are already admins of the page's org — shown disabled */
+  existingAdminIds: string[];
+  /** server-side error from the last assign attempt, shown inline */
+  apiError: string | null;
+  /** unitId set → grant unit-admin of that unit instead of org-admin */
+  onAssign: (userId: string, organizationId: string, unitId?: string) => void;
+  isAssigning: boolean;
+}
+
+/**
+ * Promote an existing employee to admin. Three panels like the old
+ * AssignAdminDialog: pick an org (page org preselected), pick a unit (or
+ * none → org admin), then pick a user — unit selection also filters the
+ * employee list to that unit.
+ */
+export default function AssignExistingAdminModal({
+  isOpen,
+  onClose,
+  organizationId,
+  existingAdminIds,
+  apiError,
+  onAssign,
+  isAssigning,
+}: AssignExistingAdminModalProps) {
+  const { t } = useTranslation();
+  const localizedName = useLocalizedName();
+  const [selectedUserId, setSelectedUserId] = useState("");
+  const [search, setSearch] = useState("");
+  const [orgId, setOrgId] = useState(organizationId);
+  // "" → org admin (all org users listed); set → unit admin of that unit
+  const [unitId, setUnitId] = useState("");
+
+  const { organizationsResponse, isLoading: isLoadingOrgs } = useOrganizations(
+    "Org",
+    { take: 300 },
+  );
+  const orgs = organizationsResponse?.items ?? [];
+
+  const { data: unitsResponse, isLoading: isLoadingUnits } =
+    useUnit().getList(orgId, { take: 300, skip: 0 }, isOpen);
+  const units = unitsResponse?.data?.items ?? [];
+
+  const {
+    employeesResponseByOrg,
+    isLoadingEmployeesByOrg,
+    isErrorEmployeesByOrg,
+    refetchEmployeesByOrg,
+  } = useEmployees({
+    organizationId: isOpen ? orgId : undefined,
+    unitId: unitId || undefined,
+    params: { take: 3000, skip: 0 },
+  });
+
+  const filteredEmployees = useMemo(() => {
+    const query = search.trim().toLowerCase();
+    const employees = employeesResponseByOrg?.items ?? [];
+    if (!query) return employees;
+    return employees.filter((employee: any) => {
+      const name = localizedName(employee.user?.name).toLowerCase();
+      const email = employee.user?.email?.toLowerCase() ?? "";
+      return name.includes(query) || email.includes(query);
+    });
+  }, [employeesResponseByOrg, localizedName, search]);
+
+  const selectOrg = (id: string) => {
+    setOrgId(id);
+    setUnitId("");
+    setSelectedUserId("");
+  };
+
+  const selectUnit = (id: string) => {
+    setUnitId(id);
+    setSelectedUserId("");
+  };
+
+  const handleClose = () => {
+    if (isAssigning) return;
+    setSelectedUserId("");
+    setSearch("");
+    setOrgId(organizationId);
+    setUnitId("");
+    onClose();
+  };
+
+  // already-admin info only covers the page's org
+  const knownAdminIds = orgId === organizationId ? existingAdminIds : [];
+
+  useEffect(() => {
+    if (isOpen) {
+      setOrgId(organizationId);
+      setUnitId("");
+      setSelectedUserId("");
+      setSearch("");
+    }
+  }, [isOpen, organizationId]);
+
+  return (
+    <Dialog open={isOpen} onOpenChange={(open) => !open && handleClose()}>
+      <DialogContent className="sm:max-w-[960px]">
+        <DialogHeader>
+          <DialogTitle>{t("orgAdmins.assign.title")}</DialogTitle>
+          <DialogDescription>
+            {t("orgAdmins.assign.description")}
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="grid grid-cols-1 gap-4 sm:grid-cols-3">
+          {/* Step 1: organization (page org preselected) */}
+          <div className="space-y-2">
+            <Label className="text-sm font-semibold">
+              {t("organization.organizations")}
+            </Label>
+            {isLoadingOrgs ? (
+              <div className="flex h-[320px] items-center justify-center">
+                <Loader2 className="h-6 w-6 animate-spin text-primary" />
+              </div>
+            ) : (
+              <ScrollArea className="h-[320px] rounded-md border border-gray-200 p-2 dark:border-gray-700">
+                <div className="space-y-1">
+                  {orgs.map((org) => (
+                    <button
+                      key={org.id}
+                      type="button"
+                      onClick={() => selectOrg(org.id)}
+                      className={cn(
+                        "flex w-full items-center justify-between rounded-md px-3 py-2 text-left text-sm transition-colors",
+                        orgId === org.id
+                          ? "bg-emerald-100 text-emerald-800 dark:bg-emerald-900/40 dark:text-emerald-300"
+                          : "text-gray-700 hover:bg-emerald-50 dark:text-gray-300 dark:hover:bg-emerald-900/20",
+                      )}
+                    >
+                      <span className="truncate">
+                        {localizedName(org.name)}
+                      </span>
+                      {orgId === org.id && (
+                        <Check className="ml-2 h-4 w-4 shrink-0" />
+                      )}
+                    </button>
+                  ))}
+                </div>
+              </ScrollArea>
+            )}
+          </div>
+
+          {/* Step 2: unit (or none → org admin) */}
+          <div className="space-y-2">
+            <Label className="text-sm font-semibold">
+              {t("orgAdmins.form.unit")}
+            </Label>
+            {isLoadingUnits ? (
+              <div className="flex h-[320px] items-center justify-center">
+                <Loader2 className="h-6 w-6 animate-spin text-primary" />
+              </div>
+            ) : (
+              <ScrollArea className="h-[320px] rounded-md border border-gray-200 p-2 dark:border-gray-700">
+                <div className="space-y-1">
+                  <button
+                    type="button"
+                    onClick={() => selectUnit("")}
+                    className={cn(
+                      "flex w-full items-center justify-between rounded-md px-3 py-2 text-left text-sm transition-colors",
+                      !unitId
+                        ? "bg-emerald-100 text-emerald-800 dark:bg-emerald-900/40 dark:text-emerald-300"
+                        : "text-gray-700 hover:bg-emerald-50 dark:text-gray-300 dark:hover:bg-emerald-900/20",
+                    )}
+                  >
+                    <span>{t("orgAdmins.form.noUnit")}</span>
+                    {!unitId && <Check className="ml-2 h-4 w-4 shrink-0" />}
+                  </button>
+                  {units.map((unit: any) => (
+                    <button
+                      key={unit.id}
+                      type="button"
+                      onClick={() => selectUnit(unit.id)}
+                      className={cn(
+                        "flex w-full items-center justify-between rounded-md px-3 py-2 text-left text-sm transition-colors",
+                        unitId === unit.id
+                          ? "bg-emerald-100 text-emerald-800 dark:bg-emerald-900/40 dark:text-emerald-300"
+                          : "text-gray-700 hover:bg-emerald-50 dark:text-gray-300 dark:hover:bg-emerald-900/20",
+                      )}
+                    >
+                      <span className="truncate">
+                        {localizedName(unit.name)}
+                      </span>
+                      {unitId === unit.id && (
+                        <Check className="ml-2 h-4 w-4 shrink-0" />
+                      )}
+                    </button>
+                  ))}
+                </div>
+              </ScrollArea>
+            )}
+          </div>
+
+          {/* Step 3: user */}
+          <div className="space-y-2">
+            <Label className="text-sm font-semibold">
+              {t("orgAdmins.assign.users")}
+            </Label>
+            <Input
+              value={search}
+              onChange={(event) => setSearch(event.target.value)}
+              placeholder={t("orgAdmins.assign.searchUsers")}
+            />
+            {isLoadingEmployeesByOrg ? (
+              <div className="flex h-[272px] items-center justify-center">
+                <Loader2 className="h-6 w-6 animate-spin text-primary" />
+              </div>
+            ) : isErrorEmployeesByOrg ? (
+              <div className="flex h-[272px] flex-col items-center justify-center gap-2 text-sm text-red-600 dark:text-red-400">
+                {t("orgAdmins.assign.loadError")}
+                <Button
+                  variant="outline"
+                  size="sm"
+                  onClick={() => refetchEmployeesByOrg()}
+                >
+                  {t("common.retry")}
+                </Button>
+              </div>
+            ) : (
+              <ScrollArea className="h-[272px] rounded-md border border-gray-200 p-2 dark:border-gray-700">
+                <div className="space-y-1">
+                  {filteredEmployees.map((employee: any) => {
+                    const userId = employee.user?.id;
+                    if (!userId) return null;
+                    const isAlreadyAdmin = knownAdminIds.includes(userId);
+                    return (
+                      <button
+                        key={userId}
+                        type="button"
+                        disabled={isAlreadyAdmin}
+                        onClick={() => setSelectedUserId(userId)}
+                        className={cn(
+                          "flex w-full items-center justify-between rounded-md px-3 py-2 text-left text-sm transition-colors",
+                          isAlreadyAdmin
+                            ? "cursor-not-allowed opacity-50"
+                            : selectedUserId === userId
+                              ? "bg-emerald-100 text-emerald-800 dark:bg-emerald-900/40 dark:text-emerald-300"
+                              : "text-gray-700 hover:bg-emerald-50 dark:text-gray-300 dark:hover:bg-emerald-900/20",
+                        )}
+                      >
+                        <div className="min-w-0 flex-1">
+                          <p className="truncate font-medium">
+                            {localizedName(employee.user?.name) ||
+                              employee.user?.email}
+                          </p>
+                          <p className="truncate text-xs text-gray-500 dark:text-gray-400">
+                            {employee.user?.email}
+                          </p>
+                        </div>
+                        {isAlreadyAdmin ? (
+                          <Badge variant="outline" className="ml-2 shrink-0">
+                            {t("orgAdmins.assign.alreadyAdmin")}
+                          </Badge>
+                        ) : (
+                          selectedUserId === userId && (
+                            <Check className="ml-2 h-4 w-4 shrink-0" />
+                          )
+                        )}
+                      </button>
+                    );
+                  })}
+                  {filteredEmployees.length === 0 && (
+                    <p className="mt-2 text-center text-sm text-gray-500 dark:text-gray-400">
+                      {t("orgAdmins.assign.noUsersFound")}
+                    </p>
+                  )}
+                </div>
+              </ScrollArea>
+            )}
+          </div>
+        </div>
+
+        {apiError && (
+          <div className="rounded-md border border-red-300 bg-red-50 px-3 py-2 text-sm text-red-800 dark:border-red-800 dark:bg-red-950 dark:text-red-300">
+            {apiError}
+          </div>
+        )}
+
+        <DialogFooter>
+          <Button
+            type="button"
+            variant="outline"
+            onClick={handleClose}
+            disabled={isAssigning}
+          >
+            {t("common.cancel")}
+          </Button>
+          <Button
+            type="button"
+            disabled={isAssigning || !selectedUserId || !orgId}
+            onClick={() =>
+              onAssign(selectedUserId, orgId, unitId || undefined)
+            }
+          >
+            {isAssigning ? (
+              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+            ) : (
+              <UserPlus className="mr-2 h-4 w-4" />
+            )}
+            {t("orgAdmins.assign.submit")}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/OrgAdminsColumnDefn.tsx b/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/OrgAdminsColumnDefn.tsx
new file mode 100644
index 000000000..97c3bfbc6
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/OrgAdminsColumnDefn.tsx
@@ -0,0 +1,228 @@
+import { ColumnDef } from "@tanstack/react-table";
+import {
+  ArrowUpDown,
+  MoreHorizontal,
+  Pencil,
+  Send,
+  Trash2,
+  UserCheck,
+  UserX,
+} from "lucide-react";
+import { t } from "i18next";
+import { Button } from "@/shared/common/ui/button";
+import { Badge } from "@/shared/common/ui/badge";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from "@/shared/common/ui/dropdown-menu";
+import { OrgAdminUser } from "@/super-admin/hooks/useOrgAdmins";
+
+export const ORG_ADMIN_ROLE_KEY = "organization_admin";
+export const UNIT_ADMIN_ROLE_KEY = "unit_admin";
+
+export interface AdminRoleInfo {
+  isOrgAdmin: boolean;
+  isUnitAdmin: boolean;
+  unitId?: string;
+}
+
+/**
+ * all-admins/:id returns users who are org admins of the org OR unit admins of
+ * one of its units; userRoles carries every role of the user, so match the org
+ * explicitly for the org-admin grant.
+ */
+// ponytail: unit relation isn't loaded, so a unit_admin grant from another org
+// can't be told apart — acceptable, the server only returns admins of this org.
+export function getAdminRoleInfo(
+  admin: OrgAdminUser,
+  selectedOrgId: string,
+): AdminRoleInfo {
+  const roles = admin.userRoles ?? [];
+  const isOrgAdmin = roles.some(
+    (r) =>
+      r.role?.key === ORG_ADMIN_ROLE_KEY &&
+      r.organizationId === selectedOrgId,
+  );
+  const unitRole = roles.find(
+    (r) => r.role?.key === UNIT_ADMIN_ROLE_KEY && r.unitId,
+  );
+  return {
+    isOrgAdmin,
+    isUnitAdmin: !!unitRole,
+    unitId: unitRole?.unitId ?? undefined,
+  };
+}
+
+interface ColumnCallbacks {
+  selectedOrgId: string;
+  localizedName: (name?: { am?: string; en?: string }) => string;
+  onEdit: (admin: OrgAdminUser) => void;
+  onResend: (admin: OrgAdminUser) => void;
+  onToggleActive: (admin: OrgAdminUser) => void;
+  onRemove: (admin: OrgAdminUser, roleInfo: AdminRoleInfo) => void;
+}
+
+export function getOrgAdminsColumnDefn({
+  selectedOrgId,
+  localizedName,
+  onEdit,
+  onResend,
+  onToggleActive,
+  onRemove,
+}: ColumnCallbacks): ColumnDef<OrgAdminUser>[] {
+  return [
+    {
+      id: "name",
+      accessorFn: (row) => localizedName(row.name),
+      header: ({ column }) => (
+        <Button
+          variant="ghost"
+          className="px-0 hover:bg-transparent"
+          onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+        >
+          {t("orgAdmins.columns.name")}
+          <ArrowUpDown className="ml-2 h-4 w-4" />
+        </Button>
+      ),
+      cell: ({ row }) => (
+        <div>
+          <p className="font-medium text-slate-800 dark:text-slate-100">
+            {localizedName(row.original.name) || "—"}
+          </p>
+          <p className="text-xs text-muted-foreground">
+            {row.original.username}
+          </p>
+        </div>
+      ),
+    },
+    {
+      id: "email",
+      accessorFn: (row) => row.email ?? "",
+      header: () => t("orgAdmins.columns.email"),
+      cell: ({ row }) => (
+        <span className="text-sm">{row.original.email || "—"}</span>
+      ),
+    },
+    {
+      id: "phoneNumber",
+      accessorFn: (row) => row.phoneNumber ?? "",
+      header: () => t("orgAdmins.columns.phone"),
+      cell: ({ row }) => (
+        <span className="text-sm">{row.original.phoneNumber || "—"}</span>
+      ),
+    },
+    {
+      id: "role",
+      header: () => t("orgAdmins.columns.role"),
+      cell: ({ row }) => {
+        const info = getAdminRoleInfo(row.original, selectedOrgId);
+        return (
+          <div className="flex flex-wrap gap-1">
+            {info.isOrgAdmin && (
+              <Badge className="bg-indigo-100 text-indigo-700 hover:bg-indigo-100 dark:bg-indigo-950 dark:text-indigo-300">
+                {t("orgAdmins.roleOrgAdmin")}
+              </Badge>
+            )}
+            {info.isUnitAdmin && (
+              <Badge className="bg-sky-100 text-sky-700 hover:bg-sky-100 dark:bg-sky-950 dark:text-sky-300">
+                {t("orgAdmins.roleUnitAdmin")}
+              </Badge>
+            )}
+          </div>
+        );
+      },
+    },
+    {
+      id: "status",
+      accessorFn: (row) =>
+        !row.hasSetPassword
+          ? "invited"
+          : row.isActive
+            ? "active"
+            : "inactive",
+      header: () => t("orgAdmins.columns.status"),
+      cell: ({ row }) => {
+        const admin = row.original;
+        if (!admin.hasSetPassword) {
+          return (
+            <Badge className="bg-amber-100 text-amber-700 hover:bg-amber-100 dark:bg-amber-950 dark:text-amber-300">
+              {t("orgAdmins.statusInvited")}
+            </Badge>
+          );
+        }
+        return admin.isActive ? (
+          <Badge className="bg-emerald-100 text-emerald-700 hover:bg-emerald-100 dark:bg-emerald-950 dark:text-emerald-300">
+            {t("orgAdmins.statusActive")}
+          </Badge>
+        ) : (
+          <Badge className="bg-slate-200 text-slate-600 hover:bg-slate-200 dark:bg-slate-800 dark:text-slate-300">
+            {t("orgAdmins.statusInactive")}
+          </Badge>
+        );
+      },
+    },
+    {
+      id: "createdAt",
+      accessorFn: (row) => row.createdAt ?? "",
+      header: () => t("orgAdmins.columns.addedOn"),
+      cell: ({ row }) =>
+        row.original.createdAt
+          ? new Date(row.original.createdAt).toLocaleDateString()
+          : "—",
+    },
+    {
+      id: "actions",
+      header: () => t("orgAdmins.columns.actions"),
+      enableHiding: false,
+      cell: ({ row }) => {
+        const admin = row.original;
+        const roleInfo = getAdminRoleInfo(admin, selectedOrgId);
+        return (
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button variant="ghost" className="h-8 w-8 p-0">
+                <MoreHorizontal className="h-4 w-4" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+              <DropdownMenuItem onClick={() => onEdit(admin)}>
+                <Pencil className="mr-2 h-4 w-4" />
+                {t("orgAdmins.actions.edit")}
+              </DropdownMenuItem>
+              {!admin.hasSetPassword && (
+                <DropdownMenuItem onClick={() => onResend(admin)}>
+                  <Send className="mr-2 h-4 w-4" />
+                  {t("orgAdmins.actions.resend")}
+                </DropdownMenuItem>
+              )}
+              <DropdownMenuItem onClick={() => onToggleActive(admin)}>
+                {admin.isActive ? (
+                  <>
+                    <UserX className="mr-2 h-4 w-4" />
+                    {t("orgAdmins.actions.deactivate")}
+                  </>
+                ) : (
+                  <>
+                    <UserCheck className="mr-2 h-4 w-4" />
+                    {t("orgAdmins.actions.activate")}
+                  </>
+                )}
+              </DropdownMenuItem>
+              <DropdownMenuSeparator />
+              <DropdownMenuItem
+                className="text-red-600 focus:text-red-600"
+                onClick={() => onRemove(admin, roleInfo)}
+              >
+                <Trash2 className="mr-2 h-4 w-4" />
+                {t("orgAdmins.actions.remove")}
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        );
+      },
+    },
+  ];
+}
diff --git a/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/OrgAdminsPage.tsx b/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/OrgAdminsPage.tsx
new file mode 100644
index 000000000..d5844a603
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/OrgAdminsPage.tsx
@@ -0,0 +1,430 @@
+import { useEffect, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { toast } from "sonner";
+import { Building2, Loader2, Plus, UserPlus, Users2 } from "lucide-react";
+import { Button } from "@/shared/common/ui/button";
+import {
+  Card,
+  CardContent,
+  CardHeader,
+  CardTitle,
+} from "@/shared/common/ui/card";
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from "@/shared/common/ui/alert-dialog";
+import { Badge } from "@/shared/common/ui/badge";
+import { AdvancedTable } from "@/shared/common/ui/table/AdvancedTable";
+import { useLocalizedName } from "@/shared/common/localizedName";
+import { OrganizationDto } from "@/shared/dto/organization/organizationDto";
+import {
+  OrgAdminUser,
+  useOrgAdmins,
+} from "@/super-admin/hooks/useOrgAdmins";
+import { OrgPicker } from "./OrgPicker";
+import {
+  AdminRoleInfo,
+  getOrgAdminsColumnDefn,
+} from "./OrgAdminsColumnDefn";
+import AdminFormModal, { AdminFormValues } from "./AdminFormModal";
+import AssignExistingAdminModal from "./AssignExistingAdminModal";
+
+interface RemoveTarget {
+  admin: OrgAdminUser;
+  roleInfo: AdminRoleInfo;
+}
+
+export default function OrgAdminsPage() {
+  const { t } = useTranslation();
+  const localizedName = useLocalizedName();
+
+  const [selectedOrg, setSelectedOrg] = useState<OrganizationDto | null>(null);
+  const [pageIndex, setPageIndex] = useState(0);
+  const [pageSize, setPageSize] = useState(10);
+
+  // modals & confirms
+  const [formOpen, setFormOpen] = useState(false);
+  const [editAdmin, setEditAdmin] = useState<OrgAdminUser | null>(null);
+  const [assignOpen, setAssignOpen] = useState(false);
+  const [removeTarget, setRemoveTarget] = useState<RemoveTarget | null>(null);
+  const [toggleTarget, setToggleTarget] = useState<OrgAdminUser | null>(null);
+
+  const {
+    adminsResponse,
+    isLoading,
+    isError,
+    refetch,
+    addAdmin,
+    isAdding,
+    assignAdmin,
+    isAssigning,
+    removeAdmin,
+    isRemoving,
+    resendInvite,
+    toggleActive,
+    isToggling,
+    updateAdminProfile,
+    isUpdatingProfile,
+    formError,
+    assignError,
+    removeError,
+    toggleError,
+    clearErrors,
+  } = useOrgAdmins(selectedOrg?.id, {
+    take: pageSize,
+    skip: pageIndex * pageSize,
+  });
+
+  useEffect(() => {
+    setPageIndex(0);
+  }, [selectedOrg?.id, pageSize]);
+
+  const admins = adminsResponse?.items ?? [];
+  const adminCount = adminsResponse?.count ?? 0;
+  const existingAdminIds = useMemo(
+    () => admins.map((admin) => admin.id),
+    [admins],
+  );
+
+  const handleFormSubmit = (values: AdminFormValues) => {
+    if (!selectedOrg) return;
+    const person = {
+      name: values.name,
+      username: values.username,
+      email: values.email,
+      phoneNumber: values.phoneNumber,
+    };
+    if (editAdmin) {
+      updateAdminProfile(
+        { id: editAdmin.id, payload: person },
+        {
+          onSuccess: () => {
+            setFormOpen(false);
+            setEditAdmin(null);
+          },
+        },
+      );
+    } else {
+      addAdmin(
+        {
+          organizationId: values.organizationId,
+          unitId: values.unitId || undefined,
+          ...person,
+        },
+        { onSuccess: () => setFormOpen(false) },
+      );
+    }
+  };
+
+  const handleAssign = (
+    userId: string,
+    organizationId: string,
+    unitId?: string,
+  ) => {
+    assignAdmin(
+      { organizationId, userId, unitId },
+      { onSuccess: () => setAssignOpen(false) },
+    );
+  };
+
+  const handleRemoveConfirm = () => {
+    if (!removeTarget || !selectedOrg) return;
+    const { admin, roleInfo } = removeTarget;
+    removeAdmin(
+      // unit-admin-only rows go through the unit endpoint; everything else
+      // defaults to org removal so a role anomaly never sends unitId: undefined
+      !roleInfo.isOrgAdmin && roleInfo.unitId
+        ? { userId: admin.id, unitId: roleInfo.unitId }
+        : { userId: admin.id, organizationId: selectedOrg.id },
+      { onSuccess: () => setRemoveTarget(null) },
+    );
+  };
+
+  const handleResend = (admin: OrgAdminUser) => {
+    if (!admin.email || !admin.phoneNumber) {
+      toast.error(t("orgAdmins.toasts.missingContact"));
+      return;
+    }
+    const toastId = toast.loading(t("orgAdmins.toasts.resending"));
+    resendInvite(
+      { email: admin.email, phoneNumber: admin.phoneNumber },
+      { onSettled: () => toast.dismiss(toastId) },
+    );
+  };
+
+  const handleToggleConfirm = () => {
+    if (!toggleTarget) return;
+    toggleActive(
+      { id: toggleTarget.id, activate: !toggleTarget.isActive },
+      { onSuccess: () => setToggleTarget(null) },
+    );
+  };
+
+  const columns = useMemo(
+    () =>
+      getOrgAdminsColumnDefn({
+        selectedOrgId: selectedOrg?.id ?? "",
+        localizedName: localizedName as (name?: {
+          am?: string;
+          en?: string;
+        }) => string,
+        onEdit: (admin) => {
+          setEditAdmin(admin);
+          setFormOpen(true);
+        },
+        onResend: handleResend,
+        onToggleActive: setToggleTarget,
+        onRemove: (admin, roleInfo) => setRemoveTarget({ admin, roleInfo }),
+      }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [selectedOrg?.id],
+  );
+
+  return (
+    <div className="p-6 space-y-6">
+      <Card className="shadow-none border-none bg-transparent px-0">
+        <CardHeader className="px-0 space-y-1">
+          <CardTitle className="text-2xl font-bold text-slate-800 dark:text-slate-100">
+            {t("orgAdmins.title")}
+          </CardTitle>
+          <p className="text-sm text-muted-foreground">
+            {t("orgAdmins.subtitle")}
+          </p>
+        </CardHeader>
+        <CardContent className="px-0 space-y-4">
+          {/* Org selector + summary */}
+          <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+            <OrgPicker value={selectedOrg} onChange={setSelectedOrg} />
+            {selectedOrg && (
+              <div className="flex flex-wrap items-center gap-2">
+                <Badge
+                  variant="outline"
+                  className="gap-1 border-indigo-300 bg-indigo-50 text-indigo-700 dark:border-indigo-800 dark:bg-indigo-950 dark:text-indigo-300"
+                >
+                  <Users2 className="h-3.5 w-3.5" />
+                  {t("orgAdmins.adminsCount", { count: adminCount })}
+                </Badge>
+                {selectedOrg.activeEmployeeCount !== undefined && (
+                  <Badge variant="outline" className="gap-1">
+                    {t("orgAdmins.activeEmployees", {
+                      count: selectedOrg.activeEmployeeCount,
+                    })}
+                  </Badge>
+                )}
+                <Badge
+                  variant="outline"
+                  className={
+                    selectedOrg.status === "Active"
+                      ? "border-emerald-300 bg-emerald-50 text-emerald-700 dark:border-emerald-800 dark:bg-emerald-950 dark:text-emerald-300"
+                      : "border-amber-300 bg-amber-50 text-amber-700 dark:border-amber-800 dark:bg-amber-950 dark:text-amber-300"
+                  }
+                >
+                  {selectedOrg.status}
+                </Badge>
+              </div>
+            )}
+          </div>
+
+          {!selectedOrg ? (
+            <div className="flex h-64 flex-col items-center justify-center gap-3 rounded-lg border border-dashed border-gray-300 dark:border-gray-700">
+              <Building2 className="h-10 w-10 text-muted-foreground" />
+              <p className="font-medium text-slate-700 dark:text-slate-200">
+                {t("orgAdmins.selectOrgPrompt")}
+              </p>
+              <p className="text-sm text-muted-foreground">
+                {t("orgAdmins.selectOrgPromptHint")}
+              </p>
+            </div>
+          ) : (
+            <>
+              {isError && (
+                <div className="flex items-center justify-between gap-3 rounded-md border border-red-300 bg-red-50 px-4 py-3 text-sm text-red-800 dark:border-red-800 dark:bg-red-950 dark:text-red-300">
+                  {t("orgAdmins.loadError")}
+                  <Button variant="outline" size="sm" onClick={() => refetch()}>
+                    {t("common.retry")}
+                  </Button>
+                </div>
+              )}
+              {!isLoading && !isError && adminCount === 0 && (
+                <div className="rounded-md border border-amber-300 bg-amber-50 px-4 py-3 text-sm text-amber-800 dark:border-amber-800 dark:bg-amber-950 dark:text-amber-300">
+                  {t("orgAdmins.noAdminsHint", {
+                    name: localizedName(selectedOrg.name),
+                  })}
+                </div>
+              )}
+              <AdvancedTable
+                columns={columns}
+                data={admins}
+                tableName={t("orgAdmins.tableName")}
+                toolBarPosition="right"
+                itemCount={adminCount}
+                pageIndex={pageIndex}
+                pageSize={pageSize}
+                onPageChange={setPageIndex}
+                onPageSizeChange={setPageSize}
+                nextFunction={() => setPageIndex(pageIndex + 1)}
+                prevFunction={() => setPageIndex(Math.max(pageIndex - 1, 0))}
+                refresh={refetch}
+                isLoading={isLoading}
+                extraToolbar={
+                  <div className="flex gap-2">
+                    <Button
+                      variant="outline"
+                      onClick={() => setAssignOpen(true)}
+                    >
+                      <UserPlus className="mr-2 h-4 w-4" />
+                      {t("orgAdmins.assignExisting")}
+                    </Button>
+                    <Button
+                      onClick={() => {
+                        setEditAdmin(null);
+                        setFormOpen(true);
+                      }}
+                    >
+                      <Plus className="mr-2 h-4 w-4" />
+                      {t("orgAdmins.addAdmin")}
+                    </Button>
+                  </div>
+                }
+              />
+            </>
+          )}
+        </CardContent>
+      </Card>
+
+      {/* Add / Edit modal */}
+      <AdminFormModal
+        isOpen={formOpen}
+        onClose={() => {
+          setFormOpen(false);
+          setEditAdmin(null);
+          clearErrors();
+        }}
+        admin={editAdmin}
+        organizationId={selectedOrg?.id}
+        apiError={formError}
+        onSubmit={handleFormSubmit}
+        isSubmitting={isAdding || isUpdatingProfile}
+      />
+
+      {/* Assign existing employee modal */}
+      {selectedOrg && (
+        <AssignExistingAdminModal
+          isOpen={assignOpen}
+          onClose={() => {
+            setAssignOpen(false);
+            clearErrors();
+          }}
+          organizationId={selectedOrg.id}
+          existingAdminIds={existingAdminIds}
+          apiError={assignError}
+          onAssign={handleAssign}
+          isAssigning={isAssigning}
+        />
+      )}
+
+      {/* Remove admin confirm */}
+      <AlertDialog
+        open={!!removeTarget}
+        onOpenChange={(open) => {
+          if (!open) {
+            setRemoveTarget(null);
+            clearErrors();
+          }
+        }}
+      >
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle className="text-lg font-bold text-red-600">
+              {t("orgAdmins.confirmRemove.title")}
+            </AlertDialogTitle>
+            <AlertDialogDescription>
+              {t("orgAdmins.confirmRemove.description", {
+                name:
+                  localizedName(removeTarget?.admin.name) ||
+                  removeTarget?.admin.email,
+                org: localizedName(selectedOrg?.name),
+              })}
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          {removeError && (
+            <div className="rounded-md border border-red-300 bg-red-50 px-3 py-2 text-sm text-red-800 dark:border-red-800 dark:bg-red-950 dark:text-red-300">
+              {removeError}
+            </div>
+          )}
+          <AlertDialogFooter>
+            <AlertDialogCancel disabled={isRemoving}>
+              {t("common.cancel")}
+            </AlertDialogCancel>
+            <AlertDialogAction
+              disabled={isRemoving}
+              onClick={handleRemoveConfirm}
+              className="bg-red-600 hover:bg-red-700 text-white"
+            >
+              {isRemoving
+                ? t("orgAdmins.confirmRemove.removing")
+                : t("orgAdmins.actions.remove")}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+
+      {/* Activate / Deactivate confirm */}
+      <AlertDialog
+        open={!!toggleTarget}
+        onOpenChange={(open) => {
+          if (!open) {
+            setToggleTarget(null);
+            clearErrors();
+          }
+        }}
+      >
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle className="text-lg font-bold">
+              {toggleTarget?.isActive
+                ? t("orgAdmins.confirmToggle.deactivateTitle")
+                : t("orgAdmins.confirmToggle.activateTitle")}
+            </AlertDialogTitle>
+            <AlertDialogDescription>
+              {t("orgAdmins.confirmToggle.description", {
+                name:
+                  localizedName(toggleTarget?.name) || toggleTarget?.email,
+              })}
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          {toggleError && (
+            <div className="rounded-md border border-red-300 bg-red-50 px-3 py-2 text-sm text-red-800 dark:border-red-800 dark:bg-red-950 dark:text-red-300">
+              {toggleError}
+            </div>
+          )}
+          <AlertDialogFooter>
+            <AlertDialogCancel disabled={isToggling}>
+              {t("common.cancel")}
+            </AlertDialogCancel>
+            <AlertDialogAction
+              disabled={isToggling}
+              onClick={handleToggleConfirm}
+              className={
+                toggleTarget?.isActive
+                  ? "bg-amber-600 hover:bg-amber-700 text-white"
+                  : "bg-emerald-600 hover:bg-emerald-700 text-white"
+              }
+            >
+              {isToggling && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+              {toggleTarget?.isActive
+                ? t("orgAdmins.actions.deactivate")
+                : t("orgAdmins.actions.activate")}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+    </div>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/OrgPicker.tsx b/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/OrgPicker.tsx
new file mode 100644
index 000000000..cc32d4a5d
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/super-admin/components/org-admins/OrgPicker.tsx
@@ -0,0 +1,163 @@
+import { useEffect, useState } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { useDebouncedValue } from "@mantine/hooks";
+import { Building2, Check, ChevronsUpDown, Loader2 } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import { Button } from "@/shared/common/ui/button";
+import { Badge } from "@/shared/common/ui/badge";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/shared/common/ui/popover";
+import {
+  Command,
+  CommandEmpty,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from "@/shared/common/ui/command";
+import { cn } from "@/super-admin/lib/utils";
+import { useLocalizedName } from "@/shared/common/localizedName";
+import { getOrganizationsWithAdminFlag } from "@/shared/services/organizationsService";
+import { OrganizationDto } from "@/shared/dto/organization/organizationDto";
+import { ORG_PICKER_KEY } from "@/super-admin/hooks/useOrgAdmins";
+
+interface OrgPickerProps {
+  value: OrganizationDto | null;
+  onChange: (org: OrganizationDto) => void;
+}
+
+/** Searchable organization combobox — server-side name search, shows admin counts. */
+export function OrgPicker({ value, onChange }: OrgPickerProps) {
+  const { t } = useTranslation();
+  const localizedName = useLocalizedName();
+  const [open, setOpen] = useState(false);
+  const [search, setSearch] = useState("");
+  const [debouncedSearch] = useDebouncedValue(search, 300);
+
+  const {
+    data: orgsResponse,
+    isLoading,
+    isError,
+    refetch,
+  } = useQuery({
+    queryKey: [ORG_PICKER_KEY, debouncedSearch],
+    queryFn: async () => {
+      const { data } = await getOrganizationsWithAdminFlag({
+        take: 50,
+        skip: 0,
+        name: debouncedSearch || undefined,
+      });
+      return {
+        count: (data?.count ?? 0) as number,
+        items: (data?.items ?? []) as OrganizationDto[],
+      };
+    },
+    staleTime: 5 * 60 * 1000,
+    retry: false,
+  });
+
+  const orgs = orgsResponse?.items ?? [];
+
+  // default to the first org that already has admins (initial load only,
+  // never while the user is searching)
+  useEffect(() => {
+    if (value || debouncedSearch || !orgs.length) return;
+    const firstWithAdmins = orgs.find((org) => (org.adminsCount ?? 0) > 0);
+    if (firstWithAdmins) onChange(firstWithAdmins);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [orgsResponse]);
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <Button
+          variant="outline"
+          role="combobox"
+          aria-expanded={open}
+          className="w-full sm:w-[360px] justify-between font-normal"
+        >
+          <span className="flex items-center gap-2 truncate">
+            <Building2 className="h-4 w-4 shrink-0 text-muted-foreground" />
+            {value ? (
+              <span className="truncate">{localizedName(value.name)}</span>
+            ) : (
+              <span className="text-muted-foreground">
+                {t("orgAdmins.selectOrg")}
+              </span>
+            )}
+          </span>
+          <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent className="w-[360px] p-0" align="start">
+        <Command shouldFilter={false}>
+          <CommandInput
+            placeholder={t("orgAdmins.searchOrgs")}
+            value={search}
+            onValueChange={setSearch}
+          />
+          <CommandList>
+            {isLoading ? (
+              <div className="flex items-center justify-center py-6">
+                <Loader2 className="h-5 w-5 animate-spin text-primary" />
+              </div>
+            ) : isError ? (
+              <div className="flex flex-col items-center gap-2 py-6 text-sm text-red-600 dark:text-red-400">
+                {t("orgAdmins.pickerError")}
+                <Button variant="outline" size="sm" onClick={() => refetch()}>
+                  {t("common.retry")}
+                </Button>
+              </div>
+            ) : (
+              <>
+                <CommandEmpty>{t("orgAdmins.noOrgsFound")}</CommandEmpty>
+                {orgs.map((org) => (
+                  <CommandItem
+                    key={org.id}
+                    value={org.id}
+                    onSelect={() => {
+                      onChange(org);
+                      setOpen(false);
+                    }}
+                    className="flex items-center justify-between gap-2"
+                  >
+                    <span className="flex items-center gap-2 truncate">
+                      <Check
+                        className={cn(
+                          "h-4 w-4 shrink-0",
+                          value?.id === org.id ? "opacity-100" : "opacity-0",
+                        )}
+                      />
+                      <span className="truncate">
+                        {localizedName(org.name)}
+                      </span>
+                    </span>
+                    {(org.adminsCount ?? 0) > 0 ? (
+                      <Badge
+                        variant="outline"
+                        className="shrink-0 border-emerald-300 bg-emerald-50 text-emerald-700 dark:border-emerald-800 dark:bg-emerald-950 dark:text-emerald-300"
+                      >
+                        {t("orgAdmins.adminsCount", {
+                          count: org.adminsCount ?? 0,
+                        })}
+                      </Badge>
+                    ) : (
+                      <Badge
+                        variant="outline"
+                        className="shrink-0 border-amber-300 bg-amber-50 text-amber-700 dark:border-amber-800 dark:bg-amber-950 dark:text-amber-300"
+                      >
+                        {t("orgAdmins.noAdmins")}
+                      </Badge>
+                    )}
+                  </CommandItem>
+                ))}
+              </>
+            )}
+          </CommandList>
+        </Command>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/AssignOrgAdminDialog.tsx b/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/AssignOrgAdminDialog.tsx
deleted file mode 100644
index 2ac9ef71d..000000000
--- a/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/AssignOrgAdminDialog.tsx
+++ /dev/null
@@ -1,277 +0,0 @@
-import { FormEvent, useMemo, useState } from "react";
-import { useQueryClient } from "@tanstack/react-query";
-import { Check, Loader2 } from "lucide-react";
-import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
-
-import { Button } from "@/shared/common/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/shared/common/ui/dialog";
-import { Input } from "@/shared/common/ui/input";
-import { Label } from "@/shared/common/ui/label";
-import { ScrollArea } from "@/shared/common/ui/scroll-area";
-import { useLocalizedName } from "@/shared/common/localizedName";
-import { cn } from "@/super-admin/lib/utils";
-import { useOrganizations } from "@/super-admin/hooks/useOrganizations";
-import {
-  assignOrgAdminRole,
-  RemoveOrAssignOrgAdminPayload,
-} from "@/super-admin/services/api/userRoleService";
-import { useEmployees } from "@/user-management/hooks/useEmployees";
-
-interface AssignOrgAdminDialogProps {
-  isOpen: boolean;
-  onClose: () => void;
-  onSuccess: () => void;
-}
-
-export function AssignOrgAdminDialog({
-  isOpen,
-  onClose,
-  onSuccess,
-}: AssignOrgAdminDialogProps) {
-  const queryClient = useQueryClient();
-  const { t } = useTranslation();
-  const localizedName = useLocalizedName();
-  const [selectedOrg, setSelectedOrg] = useState("");
-  const [selectedUser, setSelectedUser] = useState("");
-  const [search, setSearch] = useState("");
-  const [isAssigning, setIsAssigning] = useState(false);
-
-  const { organizationsResponse, isLoading: isLoadingOrgs } = useOrganizations(
-    "Org",
-    { take: 300 }
-  );
-
-  const {
-    employeesResponseByOrg,
-    isLoadingEmployeesByOrg: isLoadingEmployees,
-  } = useEmployees({
-    organizationId: selectedOrg || undefined,
-    params: { take: 3000, skip: 0 },
-  });
-
-  const filteredEmployees = useMemo(() => {
-    const query = search.trim().toLowerCase();
-    const employees = employeesResponseByOrg?.items ?? [];
-
-    if (!query) return employees;
-
-    return employees.filter((employee) => {
-      const name = localizedName(employee.user.name).toLowerCase();
-      const email = employee.user.email?.toLowerCase() ?? "";
-
-      return name.includes(query) || email.includes(query);
-    });
-  }, [employeesResponseByOrg, localizedName, search]);
-
-  const resetForm = () => {
-    setSelectedOrg("");
-    setSelectedUser("");
-    setSearch("");
-  };
-
-  const handleClose = () => {
-    if (isAssigning) return;
-    resetForm();
-    onClose();
-  };
-
-  const handleOrganizationChange = (organizationId: string) => {
-    setSelectedOrg(organizationId);
-    setSelectedUser("");
-    setSearch("");
-  };
-
-  const handleSubmit = async (event: FormEvent<HTMLFormElement>) => {
-    event.preventDefault();
-
-    if (!selectedOrg || !selectedUser) {
-      toast.error(t("organization.allFieldsRequired", "All fields are required"));
-      return;
-    }
-
-    const payload: RemoveOrAssignOrgAdminPayload = {
-      organizationId: selectedOrg,
-      userId: selectedUser,
-    };
-
-    setIsAssigning(true);
-
-    try {
-      await assignOrgAdminRole(payload);
-      await queryClient.invalidateQueries({
-        queryKey: ["organizationAdmins"],
-      });
-      resetForm();
-      onClose();
-      onSuccess();
-    } catch (error: any) {
-      toast.error(t("organization.userAssignFailed"), {
-        description: error?.response?.data?.message,
-      });
-    } finally {
-      setIsAssigning(false);
-    }
-  };
-
-  return (
-    <Dialog
-      open={isOpen}
-      onOpenChange={(open) => {
-        if (!open) handleClose();
-      }}
-    >
-      <DialogContent className="sm:max-w-[750px]">
-        <DialogHeader>
-          <DialogTitle>
-            {t(
-              "organization.assignAdminToOrganization",
-              "Assign admin to organization"
-            )}
-          </DialogTitle>
-          <DialogDescription>
-            {t(
-              "organization.assignOrgAdminInstructions",
-              "Select an organization and a user to assign as its administrator."
-            )}
-          </DialogDescription>
-        </DialogHeader>
-
-        <form onSubmit={handleSubmit} className="space-y-6">
-          <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
-            <div className="space-y-2">
-              <Label className="text-sm font-semibold">
-                {t("organization.organizations")}{" "}
-                <span className="text-red-500">*</span>
-              </Label>
-              {isLoadingOrgs ? (
-                <div className="flex h-[350px] items-center justify-center">
-                  <Loader2 className="h-6 w-6 animate-spin text-primary" />
-                </div>
-              ) : (
-                <ScrollArea className="h-[350px] rounded-md border border-gray-200 p-2 dark:border-gray-700">
-                  <div className="space-y-1">
-                    {organizationsResponse?.items?.map((organization) => (
-                      <button
-                        key={organization.id}
-                        type="button"
-                        onClick={() =>
-                          handleOrganizationChange(organization.id)
-                        }
-                        className={cn(
-                          "flex w-full items-center justify-between rounded-md px-3 py-2 text-left text-sm transition-colors",
-                          selectedOrg === organization.id
-                            ? "bg-green-200 text-green-800 dark:bg-green-900/40 dark:text-green-300"
-                            : "text-gray-700 hover:bg-green-100 dark:text-gray-300 dark:hover:bg-green-900/30"
-                        )}
-                      >
-                        <span>{localizedName(organization.name)}</span>
-                        {selectedOrg === organization.id && (
-                          <Check className="h-4 w-4" />
-                        )}
-                      </button>
-                    ))}
-                  </div>
-                </ScrollArea>
-              )}
-            </div>
-
-            <div className="space-y-2">
-              <Label className="text-sm font-semibold">
-                {t("organization.users")}{" "}
-                <span className="text-red-500">*</span>
-              </Label>
-              {!selectedOrg ? (
-                <div className="flex h-[350px] items-center justify-center rounded-md border border-gray-200 p-4 text-gray-500 dark:border-gray-700 dark:text-gray-400">
-                  <p className="text-center text-sm">
-                    {t("organization.selectOrganizationFirst")}
-                  </p>
-                </div>
-              ) : isLoadingEmployees ? (
-                <div className="flex h-[350px] items-center justify-center">
-                  <Loader2 className="h-6 w-6 animate-spin text-primary" />
-                </div>
-              ) : (
-                <div className="space-y-2">
-                  <Input
-                    value={search}
-                    onChange={(event) => setSearch(event.target.value)}
-                    placeholder={t(
-                      "organization.searchOrganizationUsers",
-                      "Search organization users"
-                    )}
-                  />
-                  <ScrollArea className="h-[308px] rounded-md border border-gray-200 p-2 dark:border-gray-700">
-                    <div className="space-y-1">
-                      {filteredEmployees.map((employee) => (
-                        <button
-                          key={employee.user.id}
-                          type="button"
-                          onClick={() => setSelectedUser(employee.user.id)}
-                          className={cn(
-                            "flex w-full items-center justify-between rounded-md px-3 py-2 text-left text-sm transition-colors",
-                            selectedUser === employee.user.id
-                              ? "bg-purple-200 text-purple-800 dark:bg-purple-900/40 dark:text-purple-300"
-                              : "text-gray-700 hover:bg-purple-100 dark:text-gray-300 dark:hover:bg-purple-900/30"
-                          )}
-                        >
-                          <div className="min-w-0 flex-1">
-                            <p className="truncate font-medium">
-                              {localizedName(employee.user.name) ||
-                                employee.user.email}
-                            </p>
-                            <p className="truncate text-xs text-gray-500 dark:text-gray-400">
-                              {employee.user.email}
-                            </p>
-                          </div>
-                          {selectedUser === employee.user.id && (
-                            <Check className="ml-2 h-4 w-4 shrink-0" />
-                          )}
-                        </button>
-                      ))}
-                      {filteredEmployees.length === 0 && (
-                        <p className="mt-2 text-center text-sm text-gray-500 dark:text-gray-400">
-                          {t("organization.noUsersFound")}
-                        </p>
-                      )}
-                    </div>
-                  </ScrollArea>
-                </div>
-              )}
-            </div>
-          </div>
-
-          <DialogFooter>
-            <Button
-              type="button"
-              variant="outline"
-              onClick={handleClose}
-              disabled={isAssigning}
-            >
-              {t("common.Cancel")}
-            </Button>
-            <Button
-              type="submit"
-              disabled={isAssigning || !selectedOrg || !selectedUser}
-              className="bg-green-600 hover:bg-green-700"
-            >
-              {isAssigning && (
-                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-              )}
-              {isAssigning
-                ? t("organization.assigning")
-                : t("organization.assignUser")}
-            </Button>
-          </DialogFooter>
-        </form>
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/OrganizationAdmins.tsx b/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/OrganizationAdmins.tsx
deleted file mode 100644
index 81fcaff80..000000000
--- a/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/OrganizationAdmins.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import { useState } from "react";
-import { Button } from "@/shared/common/ui/button";
-import { Link } from "react-router-dom";
-import { Plus, Loader2, UserPlus } from "lucide-react";
-import {
-  Card,
-  CardContent,
-  CardHeader,
-  CardTitle,
-} from "../../../shared/common/ui/card";
-import { toast } from "sonner";
-import { AdvancedTable } from "../../../shared/common/ui/table/AdvancedTable";
-import { OrganizationAdminsColumnDefn } from "./OrganizationAdminsColumnDefn";
-import { useOrganizations } from "@/super-admin/hooks/useOrganizations";
-import { AssignOrgAdminDialog } from "./AssignOrgAdminDialog";
-import { useTranslation } from "react-i18next";
-import { useLocalizedName } from "@/shared/common/localizedName";
-
-export default function OrganizationAdmins() {
-  const [pageIndex, setPageIndex] = useState(0); // starts at 0
-  const pageSize = 10;
-  const { t } = useTranslation();
-  const localizedName = useLocalizedName();
-  const [isAssignDialogOpen, setIsAssignDialogOpen] = useState(false);
-  const [searchTerm, setSearchTerm] = useState("");
-  const { organizationsAdminsResponse, isLoading, isError, refetch } =
-    useOrganizations("Admin", {
-      take: pageSize,
-      skip: pageIndex * pageSize,
-      orderBy: "createdAt",
-      order: "createdAt:Desc",
-      name: searchTerm || undefined,
-    });
-
-  const handlePageChange = (newPage: number) => {
-    setPageIndex(newPage);
-  };
-
-  const handleSearchChange = (term: string) => {
-    setSearchTerm(term);
-    setPageIndex(0); // Reset to first page when search term changes
-  };
-
-  const handleRefresh = () => {
-    refetch();
-  };
-
-  if (isLoading) {
-    return (
-      <div className="p-6 flex items-center justify-center h-64">
-        <div className="flex flex-col items-center gap-2">
-          <Loader2 className="h-8 w-8 animate-spin text-primary" />
-          <div className="text-sm text-muted-foreground">
-            {t("organization.loadingAdmins")}
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  if (isError) {
-    return (
-      <div className="p-6 flex items-center justify-center h-64">
-        <div className="flex flex-col items-center gap-4">
-          <div className="text-red-500 font-medium">
-            {t("organization.errorLoadingAdmins")}
-          </div>
-          <Button variant="outline" onClick={() => refetch()}>
-            {t("organization.retry")}
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <>
-      <div className="p-6 space-y-6 dark:bg-gray-900">
-        <Card className="col-span-2 shadow-none border-none bg-transparent dark:bg-transparent px-0">
-          <CardHeader className="flex flex-row justify-between items-center px-0">
-            <CardTitle className="text-xl font-semibold dark:text-white">
-              {t("organization.organizationAdmins")}
-            </CardTitle>
-          </CardHeader>
-          <CardContent className="px-0 dark:bg-transparent">
-            <AdvancedTable
-              columns={OrganizationAdminsColumnDefn(
-                localizedName as (name?: { am?: string; en?: string }) => string
-              )}
-              data={organizationsAdminsResponse?.items || []}
-              tableName="Organization Admins"
-              toolBarPosition="right"
-              refresh={handleRefresh}
-              onGlobalFilterChange={handleSearchChange}
-              disableClientFiltering={true}
-              extraToolbar={
-                <div className="flex gap-2">
-                  <Button
-                    onClick={() => setIsAssignDialogOpen(true)}
-                    className="bg-[#4A6CF7] hover:bg-[#3a5ad4] text-white px-5 py-2 rounded-md text-sm font-medium shadow-md"
-                  >
-                    <UserPlus className="w-4 h-4 mr-2" />
-                    {t("organization.assignAdmin")}
-                  </Button>
-                  <Link to="/user-management/add_admin">
-                    <Button className="px-5 py-2 rounded-md text-sm font-medium shadow-md">
-                      <Plus className="w-4 h-4 mr-2" />
-                      {t("organization.addAdmin")}
-                    </Button>
-                  </Link>
-                </div>
-              }
-              itemCount={organizationsAdminsResponse?.count || 0}
-              pageIndex={pageIndex}
-              onPageChange={handlePageChange}
-              nextFunction={() => handlePageChange(pageIndex + 1)}
-              prevFunction={() => handlePageChange(Math.max(pageIndex - 1, 0))}
-            />
-          </CardContent>
-        </Card>
-      </div>
-
-      {/* Assign Admin Dialog */}
-      <AssignOrgAdminDialog
-        isOpen={isAssignDialogOpen}
-        onClose={() => setIsAssignDialogOpen(false)}
-        onSuccess={() => {
-          refetch();
-          toast.success(t("organization.adminAssignedSuccess"));
-        }}
-      />
-    </>
-  );
-}
diff --git a/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/OrganizationAdminsActions.tsx b/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/OrganizationAdminsActions.tsx
deleted file mode 100644
index 812b0cb29..000000000
--- a/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/OrganizationAdminsActions.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import React from "react";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "../../../shared/common/ui/dropdown-menu";
-import { Edit, MoreHorizontal, Trash, UserCheck, UserX } from "lucide-react";
-import { Button } from "../../../shared/common/ui/button";
-import { Link } from "react-router-dom";
-import { OrganizationAdmin } from "@/super-admin/services/api/organizationAdminService";
-import { toast } from "sonner";
-
-interface OrganizationAdminsActionsProps {
-  rowData: OrganizationAdmin;
-}
-const OrganizationAdminsActions: React.FC<OrganizationAdminsActionsProps> = ({
-  rowData,
-}) => {
-  const handleDeleteClick = () => {
-    toast.warning("Delete functionality not implemented yet");
-  };
-
-  const handleStatusChange = (status: string) => {
-    toast.info(`Admin status change to ${status} not implemented yet`);
-  };
-
-  return (
-    <DropdownMenu>
-      <DropdownMenuTrigger asChild>
-        <Button variant="ghost" className="h-8 w-8 p-0">
-          <span className="sr-only">Open menu</span>
-          <MoreHorizontal className="h-4 w-4" />
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent align="end">
-        <DropdownMenuLabel>Actions</DropdownMenuLabel>
-        <DropdownMenuSeparator />
-        <DropdownMenuItem asChild>
-          <Link
-            to={`/add_admin?id=${rowData.id}`}
-            className="flex items-center w-full"
-          >
-            <Edit className="mr-2 h-4 w-4" />
-            Edit
-          </Link>
-        </DropdownMenuItem>
-        {rowData.status !== "active" && (
-          <DropdownMenuItem
-            onClick={() => handleStatusChange("active")}
-            className="flex items-center"
-          >
-            <UserCheck className="mr-2 h-4 w-4" />
-            Activate
-          </DropdownMenuItem>
-        )}
-        {rowData.status === "active" && (
-          <DropdownMenuItem
-            onClick={() => handleStatusChange("inactive")}
-            className="flex items-center"
-          >
-            <UserX className="mr-2 h-4 w-4" />
-            Deactivate
-          </DropdownMenuItem>
-        )}
-        <DropdownMenuItem
-          onClick={() => handleDeleteClick()}
-          className="flex items-center"
-        >
-          <Trash className="mr-2 h-4 w-4" />
-          Delete
-        </DropdownMenuItem>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-};
-
-export default OrganizationAdminsActions;
diff --git a/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/OrganizationAdminsColumnDefn.tsx b/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/OrganizationAdminsColumnDefn.tsx
deleted file mode 100644
index 4a1e4d33f..000000000
--- a/apps/edr-freight-web/backoffice/src/super-admin/components/organizationAdmins/OrganizationAdminsColumnDefn.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { ColumnDef } from "@tanstack/react-table";
-import { Button } from "../../../shared/common/ui/button";
-import { ArrowUpDown, Eye } from "lucide-react";
-import { OrganizationAdminsDto } from "@/shared/dto/organization/organizationDto";
-import { StatusCell } from "./StatusCell";
-import { t } from "i18next";
-import { useLocalizedName } from "@/shared/common/localizedName";
-import { Link } from "react-router-dom";
-import OrganizationAdminsActions from "./OrganizationAdminsActions";
-
-export const OrganizationAdminsColumnDefn = (
-  localizedName: (name?: { am?: string; en?: string }) => string,
-): ColumnDef<OrganizationAdminsDto>[] => {
-  return [
-    {
-      accessorKey: "name",
-      header: ({ column }) => {
-        return (
-          <Button
-            variant="ghost"
-            onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
-            className="p-0 hover:bg-transparent text-gray-700 dark:text-gray-300"
-            style={{
-              padding: 0,
-            }}
-          >
-            {t("organization.name")}
-            <ArrowUpDown className="p-0 h-4 w-4" />
-          </Button>
-        );
-      },
-      cell: ({ row }) => (
-        <div className="font-medium">{localizedName(row.original.name)}</div>
-      ),
-    },
-    {
-      accessorKey: "status",
-      header: ({ column }) => (
-        <Button
-          variant="ghost"
-          onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
-          className="p-0 hover:bg-transparent text-gray-700 dark:text-gray-300"
-          style={{
-            padding: 0,
-          }}
-        >
-          {t("dashboard.Status")}
-          <ArrowUpDown className="h-4 w-4" />
-        </Button>
-      ),
-      cell: ({ row }) => {
-        const id = row.original.id;
-        return (
-          <StatusCell
-            id={id}
-            // isAssigned={row.original.isAssigned}
-            adminsCount={row.original.adminsCount}
-          />
-        );
-      },
-    },
-    {
-      accessorKey: "actions",
-      header: t("organization.actions") || "Actions",
-      cell: ({ row }) => (
-        <div className="flex gap-2">
-          <Link to={`/super-admin/organizations/${row.original.id}`}>
-            <Button variant="ghost" size="sm">
-              <Eye className="h-4 w-4" />
-            </Button>
-          </Link>
-          <OrganizationAdminsActions rowData={row.original as any} />
-        </div>
-      ),
-    },
-  ];
-};
diff --git a/apps/edr-freight-web/backoffice/src/super-admin/hooks/useOrgAdmins.ts b/apps/edr-freight-web/backoffice/src/super-admin/hooks/useOrgAdmins.ts
new file mode 100644
index 000000000..57c5cddc2
--- /dev/null
+++ b/apps/edr-freight-web/backoffice/src/super-admin/hooks/useOrgAdmins.ts
@@ -0,0 +1,259 @@
+import { useState } from "react";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { toast } from "sonner";
+import { useTranslation } from "react-i18next";
+import { useErrorHandler } from "@/shared/hooks/useErrorHandler";
+import {
+  assignOrganizationAdmin,
+  assignUnitAdmin,
+  fetchAllUnitAdminById,
+} from "@/super-admin/services/api/organizationAdminService";
+import {
+  assignOrgAdminRole,
+  assignUnitAdminRole,
+  removeOrgAdminRole,
+  removeUnitAdminRole,
+} from "@/super-admin/services/api/userRoleService";
+import {
+  activateUser,
+  deactivateUser,
+} from "@/super-admin/services/api/userService";
+import { resendVerificationCode } from "@/shared/services/authService";
+import {
+  updateProfile,
+  UpdateProfilePayload,
+} from "@/user-management/services/api/employeePositionsService";
+
+export interface OrgAdminUserRole {
+  id: string;
+  organizationId?: string | null;
+  unitId?: string | null;
+  role?: { key?: string } | null;
+}
+
+/** User row returned by GET /organizations/all-admins/:id (userRoles.role relation included). */
+export interface OrgAdminUser {
+  id: string;
+  name?: { am?: string; en?: string };
+  username?: string;
+  email?: string;
+  phoneNumber?: string;
+  isActive: boolean;
+  hasSetPassword: boolean;
+  status?: string;
+  createdAt?: string;
+  userRoles?: OrgAdminUserRole[];
+}
+
+export const ORG_ADMINS_KEY = "orgAdmins";
+export const ORG_PICKER_KEY = "orgAdminsOrgPicker";
+
+export interface RemoveAdminInput {
+  userId: string;
+  /** set for org-admin removal */
+  organizationId?: string;
+  /** set for unit-admin removal (wins over organizationId) */
+  unitId?: string;
+}
+
+export interface AddAdminInput {
+  organizationId: string;
+  /** set → create as unit admin of this unit instead of org admin */
+  unitId?: string;
+  name: { am: string; en: string };
+  username: string;
+  email: string;
+  phoneNumber: string;
+}
+
+export const useOrgAdmins = (
+  orgId?: string,
+  params?: { take?: number; skip?: number },
+) => {
+  const queryClient = useQueryClient();
+  const { t } = useTranslation();
+  const { handleError, getErrorMessage } = useErrorHandler(t);
+
+  // dialog mutations surface their API errors inline, not via toast
+  const [formError, setFormError] = useState<string | null>(null);
+  const [assignError, setAssignError] = useState<string | null>(null);
+  const [removeError, setRemoveError] = useState<string | null>(null);
+  const [toggleError, setToggleError] = useState<string | null>(null);
+
+  const inlineError =
+    (set: (message: string | null) => void) => async (err: unknown) => {
+      console.error(err);
+      set(await getErrorMessage(err));
+    };
+
+  const clearErrors = () => {
+    setFormError(null);
+    setAssignError(null);
+    setRemoveError(null);
+    setToggleError(null);
+  };
+
+  const {
+    data: adminsResponse,
+    isLoading,
+    isError,
+    refetch,
+  } = useQuery({
+    queryKey: [ORG_ADMINS_KEY, orgId, params],
+    queryFn: async () => {
+      const { data } = await fetchAllUnitAdminById(orgId as string, params);
+      return {
+        count: (data?.count ?? 0) as number,
+        items: (data?.items ?? []) as OrgAdminUser[],
+      };
+    },
+    enabled: !!orgId,
+    staleTime: 5 * 60 * 1000,
+    retry: false,
+  });
+
+  const invalidate = () => {
+    queryClient.invalidateQueries({ queryKey: [ORG_ADMINS_KEY] });
+    // picker + org tables show adminsCount — keep them fresh
+    queryClient.invalidateQueries({ queryKey: [ORG_PICKER_KEY] });
+    queryClient.invalidateQueries({ queryKey: ["organizations"] });
+    queryClient.invalidateQueries({ queryKey: ["organizationAdmins"] });
+  };
+
+  const { mutate: addAdmin, isPending: isAdding } = useMutation({
+    mutationFn: async ({
+      organizationId,
+      unitId,
+      ...person
+    }: AddAdminInput) => {
+      // both iam invite endpoints create the user (employee + role +
+      // SET_PASSWORD OTP in one tx); unitId decides the admin scope
+      const { data } = unitId
+        ? await assignUnitAdmin({ unitId, ...person })
+        : await assignOrganizationAdmin({ organizationId, ...person });
+      return data;
+    },
+    onMutate: () => setFormError(null),
+    onSuccess: () => {
+      toast.success(t("orgAdmins.toasts.added"));
+      invalidate();
+    },
+    onError: inlineError(setFormError),
+  });
+
+  const { mutate: assignAdmin, isPending: isAssigning } = useMutation({
+    mutationFn: async ({
+      organizationId,
+      userId,
+      unitId,
+    }: {
+      organizationId: string;
+      userId: string;
+      /** set → grant unit-admin of this unit instead of org-admin */
+      unitId?: string;
+    }) => {
+      const { data } = unitId
+        ? await assignUnitAdminRole({ unitId, userId })
+        : await assignOrgAdminRole({ organizationId, userId });
+      return data;
+    },
+    onMutate: () => setAssignError(null),
+    onSuccess: () => {
+      toast.success(t("orgAdmins.toasts.assigned"));
+      invalidate();
+    },
+    onError: inlineError(setAssignError),
+  });
+
+  const { mutate: removeAdmin, isPending: isRemoving } = useMutation({
+    mutationFn: async ({ userId, organizationId, unitId }: RemoveAdminInput) => {
+      const { data } = unitId
+        ? await removeUnitAdminRole({ unitId, userId })
+        : await removeOrgAdminRole({
+            organizationId: organizationId as string,
+            userId,
+          });
+      return data;
+    },
+    onMutate: () => setRemoveError(null),
+    onSuccess: () => {
+      toast.success(t("orgAdmins.toasts.removed"));
+      invalidate();
+    },
+    onError: inlineError(setRemoveError),
+  });
+
+  const { mutate: resendInvite, isPending: isResending } = useMutation({
+    mutationFn: async (payload: { email: string; phoneNumber: string }) => {
+      const { data } = await resendVerificationCode(payload);
+      return data;
+    },
+    onSuccess: () => {
+      toast.success(t("orgAdmins.toasts.resent"));
+    },
+    onError: handleError,
+  });
+
+  const { mutate: toggleActive, isPending: isToggling } = useMutation({
+    mutationFn: async ({ id, activate }: { id: string; activate: boolean }) => {
+      const { data } = activate
+        ? await activateUser(id)
+        : await deactivateUser(id);
+      return data;
+    },
+    onMutate: () => setToggleError(null),
+    onSuccess: (_data, variables) => {
+      toast.success(
+        variables.activate
+          ? t("orgAdmins.toasts.activated")
+          : t("orgAdmins.toasts.deactivated"),
+      );
+      invalidate();
+    },
+    onError: inlineError(setToggleError),
+  });
+
+  const { mutate: updateAdminProfile, isPending: isUpdatingProfile } =
+    useMutation({
+      mutationFn: async ({
+        id,
+        payload,
+      }: {
+        id: string;
+        payload: UpdateProfilePayload;
+      }) => {
+        const { data } = await updateProfile(payload, id);
+        return data;
+      },
+      onMutate: () => setFormError(null),
+      onSuccess: () => {
+        toast.success(t("orgAdmins.toasts.profileUpdated"));
+        invalidate();
+      },
+      onError: inlineError(setFormError),
+    });
+
+  return {
+    adminsResponse,
+    isLoading,
+    isError,
+    refetch,
+    addAdmin,
+    isAdding,
+    assignAdmin,
+    isAssigning,
+    removeAdmin,
+    isRemoving,
+    resendInvite,
+    isResending,
+    toggleActive,
+    isToggling,
+    updateAdminProfile,
+    isUpdatingProfile,
+    formError,
+    assignError,
+    removeError,
+    toggleError,
+    clearErrors,
+  };
+};
diff --git a/apps/edr-freight-web/backoffice/src/types/booking.ts b/apps/edr-freight-web/backoffice/src/types/booking.ts
index a0c4ca7ad..8a6edbdee 100644
--- a/apps/edr-freight-web/backoffice/src/types/booking.ts
+++ b/apps/edr-freight-web/backoffice/src/types/booking.ts
@@ -28,7 +28,6 @@ export const BOOKING_STATUSES = [
   "CONTRACT_ACTIVE",
   "CONTRACT_CLOSED",
   // Post counter-sign document-clearance gate.
-  "AWAITING_CLEARANCE_PAYMENT",
   "AWAITING_DOCUMENTS",
   "DOCUMENTS_UNDER_REVIEW",
   "CLEARANCE_READY",
@@ -169,6 +168,8 @@ export interface BookingDetail {
   contractType: string;
   freightType: "CONTAINER" | "BULK";
   tradeDirection: string;
+  /** What the containers carry / bulk commodity label — entered at booking time. */
+  cargoFreeText?: string | null;
   cargoTotalWeightVgm: number;
   isHazardous: boolean;
   consolidationPartnerId?: string | null;
diff --git a/apps/edr-freight-web/backoffice/src/types/customer.ts b/apps/edr-freight-web/backoffice/src/types/customer.ts
index 419e93d25..d95084851 100644
--- a/apps/edr-freight-web/backoffice/src/types/customer.ts
+++ b/apps/edr-freight-web/backoffice/src/types/customer.ts
@@ -131,6 +131,8 @@ export interface CustomerResetTarget {
   name: string;
   email: string | null;
   phone: string | null;
+  /** SMS gateway is domestic-only; `false` means SMS can't reach this phone. `null` = no phone. */
+  phoneIsDomestic: boolean | null;
 }
 
 /** Mirrors backend `Company` (+ its `companyProfiles`). */
@@ -207,7 +209,8 @@ export interface CompanyListFilter {
    * already `active`, so `status` alone can never surface them.
    */
   hasPendingChangeRequest?: boolean;
-  sortBy?: "name" | "createdAt" | "updatedAt";
+  /** `review` = queue ordering: awaiting first approval → pending changes → rest, newest first within each. */
+  sortBy?: "review" | "name" | "createdAt" | "updatedAt";
   sortOrder?: "ASC" | "DESC";
 }
 
diff --git a/apps/edr-freight-web/backoffice/src/types/trainScheduling.ts b/apps/edr-freight-web/backoffice/src/types/trainScheduling.ts
index 99cc613a1..4c4f9e5d6 100644
--- a/apps/edr-freight-web/backoffice/src/types/trainScheduling.ts
+++ b/apps/edr-freight-web/backoffice/src/types/trainScheduling.ts
@@ -626,9 +626,22 @@ export interface TrainScheduleDetail {
     status: string | null;
     schedulingStatus?: SchedulingStatus | null;
     freightType?: FreightType | string | null;
+    /** DOMESTIC = intercity ride-along; rides only its own leg below. */
+    tradeDirection?: string | null;
+    originYardId?: string | null;
+    destinationYardId?: string | null;
+    origin?: string | null;
+    destination?: string | null;
+    wagonsRequired?: number | null;
+    loadedAt?: string | null;
+    arrivedAt?: string | null;
     loadingStatus?: "LOADED" | "UNLOADED";
     wagonAssigned?: boolean;
   }>;
+  /** Ordered corridor stops (route milestones) — for per-segment occupancy. */
+  stops?: Array<{ yardId: string; label: string }>;
+  /** Loco pull ceiling incl. overage tolerance — per-leg gross is held to it. */
+  maxGrossWeightTons?: number | null;
   warnings?: string[];
 }
 
diff --git a/apps/edr-freight-web/backoffice/src/user-management/AppMenuTabs.tsx b/apps/edr-freight-web/backoffice/src/user-management/AppMenuTabs.tsx
index fb523fc06..127806334 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/AppMenuTabs.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/AppMenuTabs.tsx
@@ -1,4 +1,4 @@
-import { NavLink } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 import {
   Archive,
   BarChart,
@@ -8,28 +8,48 @@ import {
   FileText,
   Globe,
   Settings,
-  ShieldAlert,
   Users2,
   UsersRound,
 } from "lucide-react";
-import { useAuth } from "@/shared/context/AuthContext";
-import { usePermissions } from "@/shared/context/PermissionContext";
-
 import { useTranslation } from "react-i18next";
 
+import { useAuth } from "@/shared/context/AuthContext";
+import {
+  SidebarGroup,
+  SidebarGroupContent,
+  SidebarGroupLabel,
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  useSidebar,
+} from "@/shared/common/ui/sidebar";
+
 export interface MenuItem {
   label: string;
   href: string;
   icon: React.ReactNode;
   roles?: string[];
-  permissions?: string[];
-  isPrimary?: boolean;
-  displayLabel?: string;
-  children?: MenuItem[];
+  /** Sidebar section this item is bucketed under. */
+  group: string;
 }
 
+// Section render order; groups with no role-visible items are skipped.
+const GROUP_ORDER = [
+  "Overview",
+  "Organizations",
+  "Content",
+  "Records",
+  "Configuration",
+  "Archive",
+  "System",
+];
+
 export const AppMenuTabs = () => {
   const { user } = useAuth();
+  const { pathname } = useLocation();
+  const { setOpenMobile } = useSidebar();
+  const { t } = useTranslation();
+
   const userRoles = user?.roles.map((role) => role.key) || [];
 
   const menuItems: MenuItem[] = [
@@ -38,282 +58,193 @@ export const AppMenuTabs = () => {
       href: "/user-management/dashboard",
       icon: <BarChart className="h-4 w-4" />,
       roles: ["super_admin"],
-      isPrimary: true,
+      group: "Overview",
     },
     {
       label: "organizations",
       href: "/user-management/organizations",
       icon: <Building2 className="h-4 w-4" />,
       roles: ["super_admin"],
-      isPrimary: true,
+      group: "Organizations",
     },
-
     {
-      label: "organizationAdmins", // Shortened for mobile
-      displayLabel: "organizationAdmins", // Full label for desktop
+      label: "organizationAdmins",
       href: "/user-management/organization_admins",
       icon: <Users2 className="h-4 w-4" />,
       roles: ["super_admin"],
-      isPrimary: true,
+      group: "Organizations",
     },
     {
-      label: "externalUsers", // Shortened for mobile
-      displayLabel: "externalUsers", // Full label for desktop
+      label: "externalUsers",
       href: "/user-management/external_users",
       icon: <Users2 className="h-4 w-4" />,
       roles: ["super_admin"],
-      isPrimary: true,
+      group: "Organizations",
     },
     {
       label: "dashboard",
       href: "/user-management/user_management-dashboard",
       icon: <BarChart className="h-4 w-4" />,
       roles: ["admin", "organization_admin", "unit_admin"],
-      isPrimary: true,
+      group: "Overview",
     },
     {
       label: "userManagement",
       href: "/user-management/user_management",
       icon: <UsersRound className="h-4 w-4" />,
       roles: ["admin", "organization_admin", "unit_admin"],
-      isPrimary: true,
+      group: "Overview",
     },
-    // {
-    //   label: "userPositionApproval",
-    //   href: "/user-management/user-position-approval",
-    //   icon: <UsersRound className="h-4 w-4" />,
-    //   roles: ["admin", "organization_admin", "unit_admin"],
-    //   permissions: ["can:activateEmployee"],
-    //   isPrimary: true,
-    // },
-    // {
-    //   label: "All Records",
-    //   displayLabel: "All Records",
-    //   href: "/user-management/all-records",
-    //   icon: <FileText className="h-4 w-4" />,
-    //   roles: ["admin", "organization_admin", "unit_admin"],
-    //   permissions: ["can:canViewAllRecords"],
-    //   isPrimary: true,
-    // },
     {
-      label: "contentManagement", // Shortened for mobile
-      displayLabel: "contentManagement", // Full label for desktop
+      label: "contentManagement",
       href: "/user-management/content-management",
       icon: <FileText className="h-4 w-4" />,
       roles: ["admin", "organization_admin", "unit_admin"],
-      isPrimary: true,
+      group: "Content",
     },
     {
       label: "webManagement",
-      displayLabel: "webManagement",
       href: "/user-management/web-management",
       icon: <Globe className="h-4 w-4" />,
       roles: ["admin", "organization_admin", "unit_admin"],
-      isPrimary: true,
-    },
-    {
-      label: "Position",
-      displayLabel: "positionTypes",
-      href: "/user-management/position-management",
-      icon: <FileText className="h-4 w-4" />,
-      roles: ["admin", "organization_admin", "unit_admin", "super_admin"],
-      isPrimary: true,
-    },
-    {
-      label: "migratedRecords",
-      displayLabel: "migratedRecords",
-      href: "/user-management/migrated-records-management",
-      icon: <FileText className="h-4 w-4" />,
-      roles: ["super_admin"],
-      isPrimary: true,
-    },
-    {
-      label: "settings",
-      displayLabel: "settings",
-      href: "/user-management/organization-settings",
-      icon: <Settings className="h-4 w-4" />,
-      roles: ["admin", "organization_admin", "unit_admin"],
-      isPrimary: true,
+      group: "Content",
     },
     {
       label: "Bulk",
-      displayLabel: "bulkUpload",
       href: "/user-management/bulk-upload",
       icon: <FileText className="h-4 w-4" />,
       roles: ["admin", "organization_admin", "unit_admin"],
-      isPrimary: true,
+      group: "Content",
     },
     {
-      label: "Archive Users",
-      displayLabel: "Archive Users",
-      href: "/user-management/archive-users",
-      icon: <Archive className="h-4 w-4" />,
-      roles: ["super_admin"],
-      isPrimary: true,
-    },
-    {
-      label: "Archived Organizations",
-      displayLabel: "Archived Organizations",
-      href: "/user-management/archived-organizations",
-      icon: <Archive className="h-4 w-4" />,
-      roles: ["super_admin"],
-      isPrimary: true,
-    },
-    {
-      label: "Archive Users",
-      displayLabel: "Archive Users",
-      href: "/user-management/archives",
-      icon: <Archive className="h-4 w-4" />,
-      roles: ["admin", "organization_admin", "unit_admin"],
-      isPrimary: true,
-    },
-    {
-      label: "Archived Units & Positions",
-      displayLabel: "Archived Units & Positions",
-      href: "/user-management/archived",
-      icon: <Archive className="h-4 w-4" />,
-      roles: ["admin", "organization_admin", "unit_admin"],
-      isPrimary: true,
-    },
-    {
-      label: "Sector Reports",
-      displayLabel: "Sector Reports",
-      href: "/user-management/sector-reports",
-      icon: <ChartAreaIcon className="h-5 w-5" />,
-      roles: ["unit_admin", "admin", "organization_admin"],
-      isPrimary: true,
-    },
-    {
-      label: "activityLog",
-      href: "/user-management/activity_log",
-      icon: <ClipboardList className="h-4 w-4" />,
-      roles: ["super_admin"],
-      isPrimary: false,
-    },
-    {
-      label: "setting",
-      href: "/user-management/settings",
-      icon: <Settings className="h-4 w-4" />,
-      roles: ["super_admin"],
-      isPrimary: false,
-    },
-    {
-      label: "Letter Template",
-      href: "/user-management/templates",
+      label: "Position",
+      href: "/user-management/position-management",
       icon: <FileText className="h-4 w-4" />,
-      roles: ["super_admin"],
-      isPrimary: false,
+      roles: ["admin", "organization_admin", "unit_admin", "super_admin"],
+      group: "Configuration",
+    },
+    {
+      label: "settings",
+      href: "/user-management/organization-settings",
+      icon: <Settings className="h-4 w-4" />,
+      roles: ["admin", "organization_admin", "unit_admin"],
+      group: "Configuration",
     },
     {
       label: "Add Site",
       href: "/user-management/add-site",
       icon: <Globe className="h-4 w-4" />,
       roles: ["super_admin"],
-      isPrimary: true,
+      group: "Configuration",
+    },
+    {
+      label: "migratedRecords",
+      href: "/user-management/migrated-records-management",
+      icon: <FileText className="h-4 w-4" />,
+      roles: ["super_admin"],
+      group: "Records",
+    },
+    {
+      label: "Sector Reports",
+      href: "/user-management/sector-reports",
+      icon: <ChartAreaIcon className="h-4 w-4" />,
+      roles: ["unit_admin", "admin", "organization_admin"],
+      group: "Records",
+    },
+    {
+      label: "Archive Users",
+      href: "/user-management/archive-users",
+      icon: <Archive className="h-4 w-4" />,
+      roles: ["super_admin"],
+      group: "Archive",
+    },
+    {
+      label: "Archived Organizations",
+      href: "/user-management/archived-organizations",
+      icon: <Archive className="h-4 w-4" />,
+      roles: ["super_admin"],
+      group: "Archive",
+    },
+    {
+      label: "Archive Users",
+      href: "/user-management/archives",
+      icon: <Archive className="h-4 w-4" />,
+      roles: ["admin", "organization_admin", "unit_admin"],
+      group: "Archive",
+    },
+    {
+      label: "Archived Units & Positions",
+      href: "/user-management/archived",
+      icon: <Archive className="h-4 w-4" />,
+      roles: ["admin", "organization_admin", "unit_admin"],
+      group: "Archive",
+    },
+    {
+      label: "activityLog",
+      href: "/user-management/activity_log",
+      icon: <ClipboardList className="h-4 w-4" />,
+      roles: ["super_admin"],
+      group: "System",
+    },
+    {
+      label: "setting",
+      href: "/user-management/settings",
+      icon: <Settings className="h-4 w-4" />,
+      roles: ["super_admin"],
+      group: "System",
+    },
+    {
+      label: "Letter Template",
+      href: "/user-management/templates",
+      icon: <FileText className="h-4 w-4" />,
+      roles: ["super_admin"],
+      group: "System",
     },
-
-    // {
-    //   label: "branding.title",
-    //   href: "/user-management/web-management/Branding/Branding",
-    //   icon: <ShieldAlert className="h-4 w-4" />,
-    //   roles: ["super_admin"],
-    //   isPrimary: true,
-    // },
   ];
 
-  const { permissions } = usePermissions();
-  const { t } = useTranslation();
   const filteredMenu = menuItems.filter((item) =>
-    item?.roles?.some((r) => userRoles.includes(r)),
-  );
-  const primaryMenuItems = filteredMenu.filter(
-    (item) => item.isPrimary !== false,
-  );
-  const secondaryMenuItems = filteredMenu.filter(
-    (item) => item.isPrimary === false,
+    item.roles?.some((r) => userRoles.includes(r)),
   );
 
+  const isActive = (href: string) =>
+    pathname === href || pathname.startsWith(`${href}/`);
+
   return (
-    // Sticky (not fixed) so it stays in flow: content below never needs a
-    // magic offset matching this bar's responsive height. top-16 keeps it
-    // pinned just below the fixed 64px <Top> header while scrolling.
-    // -mt-8 cancels the excess of <Top>'s in-flow h-24 wrapper over its 64px
-    // fixed header, so the bar sits flush under the header with no jump.
-    // shrink-0 is load-bearing: as a flex item with overflow-hidden this bar
-    // would otherwise be flex-squashed to zero height when the page overflows.
-    <div className="sticky top-16 -mt-8 z-30 shrink-0 bg-white dark:bg-gray-900 border-b dark:border-gray-800 overflow-hidden flex flex-col">
-      {/* Mobile View - Two separate rows */}
-      <div className="md:hidden flex flex-col pt-5 pb-3 px-4 space-y-3 mt-2">
-        {/* Primary items row */}
-        <div className="flex items-center overflow-x-auto scrollbar-none">
-          {primaryMenuItems.map((item) => (
-            <NavLink
-              key={item.href}
-              to={item.href}
-              className={({ isActive }) =>
-                `flex items-center gap-1 px-3 py-2.5 mr-2 text-xs font-medium transition-colors whitespace-nowrap ${
-                  isActive
-                    ? "text-primary dark:text-primary-400 border-b-2 border-primary dark:border-primary-400"
-                    : "text-slate-700 dark:text-gray-300 hover:text-primary dark:hover:text-primary-400"
-                }`
-              }
-            >
-              {item.icon}
-              <span className="max-w-[80px] truncate">
-                {t(`organization.${item.label}`, item.label)}
-              </span>
-            </NavLink>
-          ))}
-        </div>
+    <>
+      {GROUP_ORDER.map((group) => {
+        const items = filteredMenu.filter((item) => item.group === group);
+        if (items.length === 0) return null;
 
-        {/* Secondary items row (if any) */}
-        {secondaryMenuItems.length > 0 && (
-          <div className="flex items-center overflow-x-auto scrollbar-none border-t dark:border-gray-800 pt-3">
-            {secondaryMenuItems.map((item) => (
-              <NavLink
-                key={item.href}
-                to={item.href}
-                className={({ isActive }) =>
-                  `flex items-center gap-1 px-3 py-2.5 mr-2 text-xs font-medium transition-colors whitespace-nowrap ${
-                    isActive
-                      ? "text-primary dark:text-primary-400 border-b-2 border-primary dark:border-primary-400"
-                      : "text-slate-700 dark:text-gray-300 hover:text-primary dark:hover:text-primary-400"
-                  }`
-                }
-              >
-                {item.icon}
-                <span className="max-w-[80px] truncate">
-                  {t(`organization.${item.label}`, item.label)}
-                </span>
-              </NavLink>
-            ))}
-          </div>
-        )}
-      </div>
-
-      {/* Desktop View - Single row with all items */}
-      <div className="hidden md:flex pt-5 pb-3 px-8 mt-1">
-        <div className="flex items-center gap-2 overflow-x-auto scrollbar-none">
-          {filteredMenu.map((item) => (
-            <NavLink
-              key={item.href}
-              to={item.href}
-              className={({ isActive }) =>
-                `flex items-center gap-2 px-4 py-3 text-sm font-medium transition-colors whitespace-nowrap ${
-                  isActive
-                    ? "text-primary dark:text-primary-400 border-b-2 border-primary dark:border-primary-400"
-                    : "text-slate-700 dark:text-gray-300 hover:text-primary dark:hover:text-primary-400"
-                }`
-              }
-            >
-              {item.icon}
-              <span className="max-w-full truncate">
-                {t(`organization.${item.label}`, item.label)}
-              </span>
-            </NavLink>
-          ))}
-        </div>
-      </div>
-    </div>
+        return (
+          <SidebarGroup key={group} className="pb-0">
+            <SidebarGroupLabel>{group}</SidebarGroupLabel>
+            <SidebarGroupContent>
+              <SidebarMenu>
+                {items.map((item) => {
+                  const label = t(`organization.${item.label}`, item.label);
+                  return (
+                    <SidebarMenuItem key={item.href}>
+                      <SidebarMenuButton
+                        asChild
+                        isActive={isActive(item.href)}
+                        tooltip={label}
+                      >
+                        <Link
+                          to={item.href}
+                          onClick={() => setOpenMobile(false)}
+                        >
+                          {item.icon}
+                          <span>{label}</span>
+                        </Link>
+                      </SidebarMenuButton>
+                    </SidebarMenuItem>
+                  );
+                })}
+              </SidebarMenu>
+            </SidebarGroupContent>
+          </SidebarGroup>
+        );
+      })}
+    </>
   );
 };
diff --git a/apps/edr-freight-web/backoffice/src/user-management/Applayout.tsx b/apps/edr-freight-web/backoffice/src/user-management/Applayout.tsx
index 3b33519b6..ade96250d 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/Applayout.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/Applayout.tsx
@@ -1,43 +1,92 @@
-import { useLocation } from "react-router-dom";
-import { Outlet } from "react-router-dom";
-import { AppMenuTabs } from "./AppMenuTabs";
-import { useSidebar } from "@/shared/common/ui/sidebar";
-import Top from "@/record-management/components/common/Top";
-import { useAuth } from "@/shared/context/AuthContext";
-
-export const AppLayout = () => {
-  const { pathname } = useLocation();
-  const isAuthPage = pathname === "/";
-  const { toggleSidebar } = useSidebar();
-  const { user } = useAuth();
-  
-  const userRoles = user?.roles?.map((role) => role.key) || [];
-  const isSuperAdmin = userRoles.includes("super_admin");
-  
-  // html/body/#root are `overflow: hidden` (index.css) — the host chrome
-  // scrolls inside FreightDashboardLayout. This subtree renders its own
-  // full-page layout instead, so it must be its own scroll container or
-  // nothing scrolls. Top/AppMenuTabs are `fixed`, unaffected by the scroller.
-  if (isAuthPage) {
-    return (
-      <div className="h-dvh w-full overflow-y-auto bg-gray-50">
-        <Outlet />
-      </div>
-    );
-  }
-
-  return (
-    // <Top> renders its own in-flow h-24 wrapper around the fixed 64px header,
-    // so flow already clears the header — no extra top padding here.
-    // AppMenuTabs is sticky and in flow, so content starts right below it.
-    <div className="w-full h-dvh overflow-y-auto flex flex-col bg-background text-foreground">
-      <Top onToggleSidebar={toggleSidebar} showRecordManagementShortcut={!isSuperAdmin} />
-      <AppMenuTabs />
-      <div className="px-2 pb-2 pt-4 sm:px-4 sm:pb-4 sm:pt-6 flex-1">
-        <div className="w-full overflow-x-auto">
-          <Outlet />
-        </div>
-      </div>
-    </div>
-  );
-};
+import { Link, Outlet, useLocation } from "react-router-dom";
+import { ArrowLeft } from "lucide-react";
+import { AppMenuTabs } from "./AppMenuTabs";
+import {
+  Sidebar,
+  SidebarContent,
+  SidebarHeader,
+  SidebarInset,
+  SidebarRail,
+  useSidebar,
+} from "@/shared/common/ui/sidebar";
+import Top from "@/record-management/components/common/Top";
+import { useAuth } from "@/shared/context/AuthContext";
+
+export const AppLayout = () => {
+  const { pathname } = useLocation();
+  const isAuthPage = pathname === "/";
+  const { toggleSidebar } = useSidebar();
+  const { user } = useAuth();
+
+  const userRoles = user?.roles?.map((role) => role.key) || [];
+  const isSuperAdmin = userRoles.includes("super_admin");
+
+  // Standalone full-page scroll container for the auth screen — the host
+  // chrome is `overflow: hidden`, so this subtree must scroll itself.
+  if (isAuthPage) {
+    return (
+      <div className="h-dvh w-full overflow-y-auto bg-gray-50">
+        <Outlet />
+      </div>
+    );
+  }
+
+  return (
+    <>
+      {/* Full-height sidebar owning the left column (back-to-home + brand at the
+          top). <Top> lives inside <SidebarInset>, to the right of the sidebar,
+          and is `sticky` — so it never overlaps the sidebar and re-flows when
+          the sidebar collapses to its icon rail. Top's burger (onToggleSidebar)
+          drives collapse on desktop and the Sheet drawer on mobile. */}
+      <Sidebar collapsible="icon">
+        <SidebarHeader className="gap-1 border-b border-sidebar-border">
+          <Link
+            to="/dashboard/overview"
+            className="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-muted-foreground transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
+          >
+            <ArrowLeft className="size-4 shrink-0" />
+            <span className="group-data-[collapsible=icon]:hidden">
+              Back to home
+            </span>
+          </Link>
+          <Link
+            to="/user-management"
+            className="flex items-center gap-2 px-1 py-2.5"
+          >
+            <img
+              src="/assets/logo.svg"
+              alt="EDR"
+              className="size-7 shrink-0 object-contain"
+            />
+            <div className="flex flex-col group-data-[collapsible=icon]:hidden">
+              <span className="text-sm font-semibold leading-tight text-sidebar-foreground">
+                User Management
+              </span>
+              <span className="text-[10px] font-medium text-muted-foreground">
+                EDR Freight
+              </span>
+            </div>
+          </Link>
+        </SidebarHeader>
+        <SidebarContent className="pb-10">
+          <AppMenuTabs />
+        </SidebarContent>
+        <SidebarRail />
+      </Sidebar>
+
+      {/* Internal scroll container: the sidebar stays fixed and full-height
+          while this column scrolls beneath the sticky <Top> bar. */}
+      <SidebarInset className="h-svh min-w-0 overflow-y-auto">
+        <Top
+          onToggleSidebar={toggleSidebar}
+          showRecordManagementShortcut={!isSuperAdmin}
+        />
+        <div className="flex-1 pb-2 sm:px-4 sm:pb-4 ">
+          <div className="w-full overflow-x-auto">
+            <Outlet />
+          </div>
+        </div>
+      </SidebarInset>
+    </>
+  );
+};
diff --git a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/ActionsColumn.tsx b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/ActionsColumn.tsx
deleted file mode 100644
index e7613d2e3..000000000
--- a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/ActionsColumn.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { useState } from "react";
-import { useNavigate } from "react-router-dom";
-import { Button } from "@/shared/common/ui/button";
-import {
-  AlertDialog,
-  AlertDialogTrigger,
-  AlertDialogContent,
-  AlertDialogHeader,
-  AlertDialogFooter,
-  AlertDialogTitle,
-  AlertDialogDescription,
-  AlertDialogCancel,
-  AlertDialogAction,
-} from "@/shared/common/ui/alert-dialog";
-import { usePositionTypes } from "@/user-management/hooks/usePositionTypes";
-import { PositionTypeDto } from "@/user-management/dto/positions/positionType";
-import { t } from "i18next";
-
-type ActionsColumnProps = {
-  row: PositionTypeDto;
-};
-
-const ActionsColumn: React.FC<ActionsColumnProps> = ({ row }) => {
-  const navigate = useNavigate();
-  const [openDialog, setOpenDialog] = useState(false);
-  const [deletingId, setDeletingId] = useState<string | null>(null);
-
-  const { deletePositionType } = usePositionTypes({ id: "" });
-
-  const handleDeleteClick = (id: string) => {
-    setDeletingId(id);
-    setOpenDialog(true);
-  };
-
-  const handleDeleteConfirm = async () => {
-    if (!deletingId) return;
-    await deletePositionType.mutateAsync(deletingId);
-    setOpenDialog(false);
-    setDeletingId(null);
-  };
-
-  return (
-    <div className="flex items-center gap-2">
-      <Button
-        variant="outline"
-        onClick={() =>
-          navigate(`/user-management/position-management/edit/${row.id}`)
-        }
-      >
-        {t("common.Edit")}
-      </Button>
-
-      <AlertDialog open={openDialog} onOpenChange={setOpenDialog}>
-        <AlertDialogTrigger asChild>
-          <Button
-            variant="destructive"
-            onClick={() => handleDeleteClick(row.id)}
-          >
-            {t("userRecord.Delete")}
-          </Button>
-        </AlertDialogTrigger>
-
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>{t("contentManagement.delMsg")}</AlertDialogTitle>
-            <AlertDialogDescription>
-              {t("contentManagement.delMsg2")}
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel
-              onClick={() => {
-                setOpenDialog(false);
-                setDeletingId(null);
-              }}
-            >
-              {t("common.Cancel")}
-            </AlertDialogCancel>
-            <AlertDialogAction
-              onClick={handleDeleteConfirm}
-              disabled={deletePositionType.isPending}
-            >
-              {deletePositionType.isPending
-                ? t("organization.deleting")
-                : t("organization.delete")}
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    </div>
-  );
-};
-
-export default ActionsColumn;
diff --git a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/CreatePositionForm.tsx b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/CreatePositionForm.tsx
index 8c06bf50e..f8fc0cfdd 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/CreatePositionForm.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/CreatePositionForm.tsx
@@ -1,455 +1,529 @@
-import { useForm } from "react-hook-form";
-import { z } from "zod";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { Input } from "@/shared/common/ui/input";
-import { Button } from "@/shared/common/ui/button";
-import {
-  Form,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormControl,
-  FormMessage,
-} from "@/shared/common/ui/form";
-import { toast } from "sonner";
-import { usePositionTypes } from "@/user-management/hooks/usePositionTypes";
-import { positionTypePermissionService } from "@/user-management/services/api/positionTypePermissionService";
-import { useNavigate } from "react-router-dom";
-import { t } from "i18next";
-import { useAuth } from "@/shared/context/AuthContext";
-import { useUnit } from "@/user-management/hooks/useUnit";
-import { useEffect, useMemo, useRef, useState } from "react";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/shared/common/ui/select";
-import { SingleSelect } from "@/shared/common/ui/single-select";
-import { UnitDto } from "@/user-management/dto/unit/unitDto";
-import { PositionTypeDto } from "@/user-management/dto/positions/positionType";
-import { useLocalizedName } from "@/shared/common/localizedName";
-import { useOrganizations } from "@/super-admin/hooks/useOrganizations";
-import { OrganizationDto } from "@/shared/dto/organization/organizationDto";
-import i18n from "@/i18n";
-import { PermissionSearch } from "./PermissionSearch";
-import { useApplications } from "@/user-management/hooks/useApplications";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-
-const formSchema = z.object({
-  nameAm: z.string().min(2),
-  nameEn: z.string().min(2),
-  permissions: z.array(z.string()),
-});
-
-type FormValues = z.infer<typeof formSchema>;
-
-export interface CreatePositionFormProps {
-  mode?: "create" | "edit";
-  positionTypeId?: string;
-  initialValues?: {
-    nameAm: string;
-    nameEn: string;
-    unitId: string;
-    key?: string;
-  };
-  onSuccess?: () => void;
-  onCancel?: () => void;
-}
-
-export const CreatePositionForm = ({
-  mode = "create",
-  positionTypeId,
-  initialValues,
-  onSuccess,
-  onCancel,
-}: CreatePositionFormProps = {}) => {
-  const navigate = useNavigate();
-  const {
-    createPositionType,
-    updatePositionType,
-    positionTypes,
-    isLoading: isLoadingPositionTypes,
-  } = usePositionTypes();
-  const { user } = useAuth();
-  const { getList, getById } = useUnit();
-  const localizedName = useLocalizedName();
-  const userOrganizationId =
-    user?.employee && user.employee.length > 0
-      ? user.employee[0].organizationId
-      : undefined;
-  const [selectedOrganizationId, setSelectedOrganizationId] = useState<string>(
-    userOrganizationId ?? "",
-  );
-  const [selectedUnitId, setSelectedUnitId] = useState<string>(
-    initialValues?.unitId ?? "",
-  );
-  const [selectedApplicationId, setSelectedApplicationId] =
-    useState<string>("");
-  const [copyFromPositionId, setCopyFromPositionId] = useState<string>("");
-  const [isCopying, setIsCopying] = useState(false);
-  const [isLoadingEditData, setIsLoadingEditData] = useState(mode === "edit");
-  const hasLoadedEditData = useRef(false);
-  const lang = i18n.language;
-  const { applications, isLoading: isLoadingApplications } = useApplications();
-  const queryClient = useQueryClient();
-
-  const { organizationsResponse, isLoading: isLoadingOrgs } = useOrganizations(
-    "Org",
-    { take: 3000 },
-  );
-
-  const { data: unitsResponse, isLoading: isLoadingUnits } = getList(
-    selectedOrganizationId,
-    { take: 3000, skip: 0 },
-  );
-
-  const organizationOptions = useMemo(
-    () =>
-      (organizationsResponse?.items ?? []).map((org: OrganizationDto) => ({
-        value: org.id,
-        label: localizedName(org.name) || org.id,
-      })),
-    [organizationsResponse, localizedName],
-  );
-
-  const unitOptions = useMemo(
-    () =>
-      (unitsResponse?.data?.items ?? []).map((unit: UnitDto) => ({
-        value: unit.id,
-        label: localizedName(unit.name) || unit.id,
-      })),
-    [unitsResponse, localizedName],
-  );
-
-  const {
-    data: editUnitResponse,
-    isSuccess: isUnitSuccess,
-    isError: isUnitError,
-  } = getById(initialValues?.unitId ?? "");
-
-  const {
-    data: permissionsResponse,
-    isSuccess: isPermissionsSuccess,
-    isError: isPermissionsError,
-  } = useQuery({
-    queryKey: ["position-type-permissions", positionTypeId],
-    queryFn: () =>
-      positionTypePermissionService.getPermissionsByPositionTypeId(
-        positionTypeId!,
-      ),
-    enabled: mode === "edit" && !!positionTypeId,
-  });
-  // Reset the selected unit when the organization changes so a unit from a
-  // different org can't be submitted by mistake.
-  useEffect(() => {
-    if (mode === "edit") return;
-    setSelectedUnitId("");
-  }, [selectedOrganizationId, mode]);
-
-  const form = useForm<FormValues>({
-    resolver: zodResolver(formSchema),
-    defaultValues: {
-      nameAm: initialValues?.nameAm ?? "",
-      nameEn: initialValues?.nameEn ?? "",
-      permissions: [],
-    },
-  });
-
-  useEffect(() => {
-    if (mode !== "edit" || !initialValues || !positionTypeId) return;
-    if (hasLoadedEditData.current) return;
-
-    const isUnitDone = !initialValues.unitId || isUnitSuccess || isUnitError;
-    const isPermissionsDone = isPermissionsSuccess || isPermissionsError;
-
-    if (isUnitDone && isPermissionsDone) {
-      hasLoadedEditData.current = true;
-
-      const unit = editUnitResponse?.data;
-      if (unit) {
-        setSelectedOrganizationId(unit.organizationId);
-        setSelectedUnitId(unit.id);
-      } else if (initialValues.unitId) {
-        setSelectedUnitId(initialValues.unitId);
-      }
-
-      const ids = permissionsResponse?.data?.items?.map((p) => p.id) ?? [];
-      form.reset({
-        nameAm: initialValues.nameAm,
-        nameEn: initialValues.nameEn,
-        permissions: ids,
-      });
-
-      setIsLoadingEditData(false);
-    }
-  }, [
-    mode,
-    initialValues,
-    positionTypeId,
-    isUnitSuccess,
-    isUnitError,
-    isPermissionsSuccess,
-    isPermissionsError,
-    editUnitResponse,
-    permissionsResponse,
-    form,
-  ]);
-
-  const handlePermissionChange = (permissionId: string, checked: boolean) => {
-    const currentPermissions = form.getValues("permissions");
-    if (checked) {
-      form.setValue("permissions", [...currentPermissions, permissionId]);
-    } else {
-      form.setValue(
-        "permissions",
-        currentPermissions.filter((id) => id !== permissionId),
-      );
-    }
-  };
-
-  const handleCopyFrom = async (positionTypeId: string) => {
-    setCopyFromPositionId(positionTypeId);
-    if (!positionTypeId) {
-      form.setValue("permissions", []);
-      return;
-    }
-    setIsCopying(true);
-    try {
-      const response =
-        await positionTypePermissionService.getPermissionsByPositionTypeId(
-          positionTypeId,
-        );
-      const ids = response.data.items?.map((p) => p.id) ?? [];
-      form.setValue("permissions", ids);
-    } catch {
-      toast.error(t("contentManagement.copyPermissionsFailed"));
-    } finally {
-      setIsCopying(false);
-    }
-  };
-
-  const onSubmit = async (values: FormValues) => {
-    try {
-      if (!selectedUnitId) {
-        toast.error(t("organization.selectUnit"));
-        return;
-      }
-
-      const payload = {
-        name: {
-          am: values.nameAm,
-          en: values.nameEn,
-        },
-        key: values.nameEn.toLowerCase().replace(/\s+/g, "-"),
-        unitId: selectedUnitId,
-      };
-
-      let targetId = positionTypeId;
-
-      if (mode === "edit" && positionTypeId) {
-        await updatePositionType.mutateAsync({
-          id: positionTypeId,
-          data: payload,
-        });
-      } else {
-        const response = await createPositionType.mutateAsync(payload);
-        targetId = response.data.id;
-      }
-
-      if (targetId && values.permissions.length > 0) {
-        await positionTypePermissionService.assignPermissionsToPositionType({
-          firstId: targetId,
-          secondIds: values.permissions,
-        });
-      }
-
-      queryClient.invalidateQueries({
-        queryKey: ["position-type"],
-      });
-      queryClient.invalidateQueries({ queryKey: ["position-types"] });
-      queryClient.invalidateQueries({
-        queryKey: ["position-type-permissions"],
-      });
-      toast.success(t("contentManagement.permissionSuccess"));
-
-      if (onSuccess) {
-        onSuccess();
-      } else {
-        navigate("/user-management/position-management");
-      }
-    } catch {
-      toast.error(t("contentManagement.permissionSuccess"));
-    }
-  };
-
-  if (isLoadingEditData) {
-    return (
-      <div className="py-8 text-center text-muted-foreground">
-        {t("common.loading")}
-      </div>
-    );
-  }
-
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
-        <FormField
-          control={form.control}
-          name="nameEn"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>{t("contentManagement.englishName")}</FormLabel>
-              <FormControl>
-                <Input {...field} placeholder="e.g. HR Coordinator" />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-
-        <FormField
-          control={form.control}
-          name="nameAm"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>{t("contentManagement.amharicName")}</FormLabel>
-              <FormControl>
-                <Input {...field} placeholder="e.g. ሰብል አያት" />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-
-        {/* ✅ Organization (searchable, all orgs) */}
-        <div className="mb-4 w-full">
-          <label className="block text-sm font-medium text-gray-700 mb-1">
-            {t("organization.organization") || "Organization"}
-          </label>
-          <SingleSelect
-            options={organizationOptions}
-            value={selectedOrganizationId}
-            onValueChange={setSelectedOrganizationId}
-            placeholder={
-              isLoadingOrgs
-                ? t("common.loading")
-                : t("organization.selectOrganization") ||
-                  "Select an organization"
-            }
-          />
-        </div>
-
-        {/* ✅ Unit Selector — searchable, scoped to picked org */}
-        <div className="mb-4 w-full">
-          <label className="block text-sm font-medium text-gray-700 mb-1">
-            {t("organization.selectUnit")}
-          </label>
-          <SingleSelect
-            options={unitOptions}
-            value={selectedUnitId}
-            onValueChange={setSelectedUnitId}
-            placeholder={
-              !selectedOrganizationId
-                ? t("organization.selectOrganizationFirst") ||
-                  "Select an organization first"
-                : isLoadingUnits
-                  ? t("common.loading")
-                  : t("organization.selectUnit")
-            }
-          />
-        </div>
-
-        <div className="mb-4 w-1/2">
-          <label className="block text-sm font-medium text-gray-700">
-            {t("contentManagement.selectApplication")}
-          </label>
-          <Select
-            value={selectedApplicationId}
-            onValueChange={(value) => setSelectedApplicationId(value)}
-            disabled={isLoadingApplications}>
-            <SelectTrigger className="mt-1 block w-full border-gray-300 rounded-md shadow-sm">
-              <SelectValue placeholder="Select an Application" />
-            </SelectTrigger>
-            <SelectContent className="max-h-60 overflow-y-auto">
-              {applications?.map((app) => (
-                <SelectItem key={app.id} value={app.id}>
-                  {lang === "en" ? app.name.en : app.name.am}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-        </div>
-
-        <div className="space-y-2">
-          <label className="block text-sm font-medium text-gray-700">
-            {t("contentManagement.copyPermissionsFrom")}
-          </label>
-          <Select
-            value={copyFromPositionId}
-            onValueChange={handleCopyFrom}
-            disabled={isLoadingPositionTypes || isCopying}>
-            <SelectTrigger className="w-full">
-              <SelectValue
-                placeholder={
-                  isCopying
-                    ? t("common.loading")
-                    : t("contentManagement.selectPositionToCopy")
-                }
-              />
-            </SelectTrigger>
-            <SelectContent className="max-h-60 overflow-y-auto">
-              {positionTypes.map((p: PositionTypeDto) => (
-                <SelectItem key={p.id} value={p.id}>
-                  {localizedName(p.name)}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-          <p className="text-xs text-muted-foreground">
-            {t("contentManagement.copyPermissionsHint")}
-          </p>
-        </div>
-
-        <FormField
-          control={form.control}
-          name="permissions"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>{t("contentManagement.permission")}</FormLabel>
-              <PermissionSearch
-                selectedPermissions={field.value}
-                onPermissionChange={handlePermissionChange}
-                applicationId={selectedApplicationId}
-              />
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-
-        <div className="flex justify-end gap-4">
-          <Button
-            type="button"
-            variant="outline"
-            onClick={() => {
-              if (onCancel) {
-                onCancel();
-              } else {
-                window.history.back();
-              }
-            }}>
-            {t("common.Cancel")}
-          </Button>
-          <Button
-            type="submit"
-            disabled={
-              createPositionType.isPending || updatePositionType.isPending
-            }>
-            {mode === "edit" ? t("delegation.update") : t("delegation.save")}
-          </Button>
-        </div>
-      </form>
-    </Form>
-  );
-};
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Input } from "@/shared/common/ui/input";
+import { Button } from "@/shared/common/ui/button";
+import {
+  Form,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormControl,
+  FormMessage,
+} from "@/shared/common/ui/form";
+import { toast } from "sonner";
+import {
+  invalidatePositionTypeQueries,
+  usePositionTypes,
+} from "@/user-management/hooks/usePositionTypes";
+import { positionTypePermissionService } from "@/user-management/services/api/positionTypePermissionService";
+import { useNavigate } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+import { useAuth } from "@/shared/context/AuthContext";
+import { useUnit } from "@/user-management/hooks/useUnit";
+import { useEffect, useMemo, useRef, useState } from "react";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/shared/common/ui/select";
+import { SingleSelect } from "@/shared/common/ui/single-select";
+import { UnitDto } from "@/user-management/dto/unit/unitDto";
+import { PositionTypeDto } from "@/user-management/dto/positions/positionType";
+import { useLocalizedName } from "@/shared/common/localizedName";
+import { useOrganizations } from "@/super-admin/hooks/useOrganizations";
+import { OrganizationDto } from "@/shared/dto/organization/organizationDto";
+import { useErrorHandler } from "@/shared/hooks/useErrorHandler";
+import { PermissionSearch } from "./PermissionSearch";
+import { useApplications } from "@/user-management/hooks/useApplications";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+
+export interface CreatePositionFormProps {
+  mode?: "create" | "edit";
+  positionTypeId?: string;
+  initialValues?: {
+    nameAm: string;
+    nameEn: string;
+    unitId: string;
+    key?: string;
+  };
+  onSuccess?: () => void;
+  onCancel?: () => void;
+}
+
+export const CreatePositionForm = ({
+  mode = "create",
+  positionTypeId,
+  initialValues,
+  onSuccess,
+  onCancel,
+}: CreatePositionFormProps = {}) => {
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+  const { handleError } = useErrorHandler(t);
+  const {
+    createPositionType,
+    updatePositionType,
+    positionTypes,
+    isLoading: isLoadingPositionTypes,
+    isError: isErrorPositionTypes,
+  } = usePositionTypes();
+  const { user } = useAuth();
+  const { getList, getById } = useUnit();
+  const localizedName = useLocalizedName();
+  const userOrganizationId =
+    user?.employee && user.employee.length > 0
+      ? user.employee[0].organizationId
+      : undefined;
+  const [selectedApplicationId, setSelectedApplicationId] =
+    useState<string>("");
+  const [copyFromPositionId, setCopyFromPositionId] = useState<string>("");
+  const [isCopying, setIsCopying] = useState(false);
+  const [isLoadingEditData, setIsLoadingEditData] = useState(mode === "edit");
+  const hasLoadedEditData = useRef(false);
+  // Permissions the position type had when the form opened. Needed because the
+  // API cannot represent "no permissions" (see onSubmit).
+  const loadedPermissionCount = useRef(0);
+  const { applications, isLoading: isLoadingApplications } = useApplications();
+  const queryClient = useQueryClient();
+
+  const formSchema = useMemo(
+    () =>
+      z.object({
+        nameEn: z.string().trim().min(2, t("organization.englishNameRequired")),
+        nameAm: z.string().trim().min(2, t("organization.amharicNameRequired")),
+        organizationId: z.string().min(1, t("organization.organizationRequired")),
+        unitId: z.string().min(1, t("contentManagement.unitRequired")),
+        permissions: z.array(z.string()),
+      }),
+    [t],
+  );
+
+  type FormValues = z.infer<typeof formSchema>;
+
+  const form = useForm<FormValues>({
+    resolver: zodResolver(formSchema),
+    defaultValues: {
+      nameAm: initialValues?.nameAm ?? "",
+      nameEn: initialValues?.nameEn ?? "",
+      organizationId: userOrganizationId ?? "",
+      unitId: initialValues?.unitId ?? "",
+      permissions: [],
+    },
+  });
+
+  const selectedOrganizationId = form.watch("organizationId");
+
+  const { organizationsResponse, isLoading: isLoadingOrgs } = useOrganizations(
+    "Org",
+    { take: 3000 },
+  );
+
+  const { data: unitsResponse, isLoading: isLoadingUnits } = getList(
+    selectedOrganizationId,
+    { take: 3000, skip: 0 },
+  );
+
+  const organizationOptions = useMemo(
+    () =>
+      (organizationsResponse?.items ?? []).map((org: OrganizationDto) => ({
+        value: org.id,
+        label: localizedName(org.name) || org.id,
+      })),
+    [organizationsResponse, localizedName],
+  );
+
+  const unitOptions = useMemo(
+    () =>
+      (unitsResponse?.data?.items ?? []).map((unit: UnitDto) => ({
+        value: unit.id,
+        label: localizedName(unit.name) || unit.id,
+      })),
+    [unitsResponse, localizedName],
+  );
+
+  const {
+    data: editUnitResponse,
+    isSuccess: isUnitSuccess,
+    isError: isUnitError,
+  } = getById(initialValues?.unitId ?? "");
+
+  const {
+    data: permissionsResponse,
+    isSuccess: isPermissionsSuccess,
+    isError: isPermissionsError,
+  } = useQuery({
+    queryKey: ["position-type-permissions", positionTypeId],
+    queryFn: () =>
+      positionTypePermissionService.getPermissionsByPositionTypeId(
+        positionTypeId!,
+      ),
+    enabled: mode === "edit" && !!positionTypeId,
+  });
+
+  // A position type belongs to a unit, and a unit to an organization — IAM has
+  // no organizationId on the type itself and no organization-scoped route, so
+  // the picked org narrows the list through its units. isSystem types are the
+  // shared "commons" and stay available to every organization.
+  const orgUnitIds = useMemo(
+    () =>
+      new Set(
+        (unitsResponse?.data?.items ?? []).map((unit: UnitDto) => unit.id),
+      ),
+    [unitsResponse],
+  );
+
+  const copyFromOptions = useMemo(() => {
+    if (!selectedOrganizationId) return [];
+    return positionTypes.filter(
+      (type: PositionTypeDto) =>
+        type.id !== positionTypeId &&
+        (type.isSystem || (!!type.unitId && orgUnitIds.has(type.unitId))),
+    );
+  }, [positionTypes, orgUnitIds, selectedOrganizationId, positionTypeId]);
+
+  // Reset the selected unit when the organization changes so a unit from a
+  // different org can't be submitted by mistake. The copy source is cleared
+  // too — it is scoped to the old organization.
+  useEffect(() => {
+    if (mode === "edit") return;
+    form.setValue("unitId", "");
+    setCopyFromPositionId("");
+  }, [selectedOrganizationId, mode, form]);
+
+  useEffect(() => {
+    if (mode !== "edit" || !initialValues || !positionTypeId) return;
+    if (hasLoadedEditData.current) return;
+
+    const isUnitDone = !initialValues.unitId || isUnitSuccess || isUnitError;
+    const isPermissionsDone = isPermissionsSuccess || isPermissionsError;
+
+    if (isUnitDone && isPermissionsDone) {
+      hasLoadedEditData.current = true;
+
+      const unit = editUnitResponse?.data;
+      const ids = permissionsResponse?.data?.items?.map((p) => p.id) ?? [];
+      loadedPermissionCount.current = ids.length;
+
+      form.reset({
+        nameAm: initialValues.nameAm,
+        nameEn: initialValues.nameEn,
+        organizationId: unit?.organizationId ?? userOrganizationId ?? "",
+        unitId: unit?.id ?? initialValues.unitId ?? "",
+        permissions: ids,
+      });
+
+      setIsLoadingEditData(false);
+    }
+  }, [
+    mode,
+    initialValues,
+    positionTypeId,
+    isUnitSuccess,
+    isUnitError,
+    isPermissionsSuccess,
+    isPermissionsError,
+    editUnitResponse,
+    permissionsResponse,
+    userOrganizationId,
+    form,
+  ]);
+
+  const handlePermissionChange = (permissionId: string, checked: boolean) => {
+    const currentPermissions = form.getValues("permissions");
+    form.setValue(
+      "permissions",
+      checked
+        ? [...currentPermissions, permissionId]
+        : currentPermissions.filter((id) => id !== permissionId),
+    );
+  };
+
+  const handleCopyFrom = async (sourcePositionTypeId: string) => {
+    setCopyFromPositionId(sourcePositionTypeId);
+    setIsCopying(true);
+    try {
+      const response =
+        await positionTypePermissionService.getPermissionsByPositionTypeId(
+          sourcePositionTypeId,
+        );
+      const ids = response.data.items?.map((p) => p.id) ?? [];
+      form.setValue("permissions", ids);
+    } catch (error) {
+      handleError(error);
+      toast.error(t("contentManagement.copyPermissionsFailed"));
+    } finally {
+      setIsCopying(false);
+    }
+  };
+
+  const onSubmit = async (values: FormValues) => {
+    const payload = {
+      name: { am: values.nameAm, en: values.nameEn },
+      key: values.nameEn.toLowerCase().replace(/\s+/g, "-"),
+      unitId: values.unitId,
+    };
+
+    // Save the position type first. If this fails nothing else runs, and the
+    // mutation's own onError surfaces the reason (403 for built-in types,
+    // conflict on the globally-unique key, ...).
+    let targetId = positionTypeId;
+    try {
+      if (mode === "edit" && positionTypeId) {
+        await updatePositionType.mutateAsync({
+          id: positionTypeId,
+          data: payload,
+        });
+      } else {
+        const response = await createPositionType.mutateAsync(payload);
+        targetId = response.data.id;
+      }
+    } catch {
+      return; // already reported by the mutation's onError
+    }
+
+    // assign-seconds-for-first replaces the whole set, but an empty secondIds
+    // fails server-side — so "unassign everything" is not expressible. Keep the
+    // save and tell the user their permissions were left alone.
+    const mustClearAll =
+      values.permissions.length === 0 && loadedPermissionCount.current > 0;
+
+    if (targetId && values.permissions.length > 0) {
+      try {
+        await positionTypePermissionService.assignPermissionsToPositionType({
+          firstId: targetId,
+          secondIds: values.permissions,
+        });
+      } catch (error) {
+        handleError(error);
+        invalidatePositionTypeQueries(queryClient);
+        toast.error(t("contentManagement.permissionsAssignFailed"));
+        return;
+      }
+    }
+
+    invalidatePositionTypeQueries(queryClient);
+    queryClient.invalidateQueries({ queryKey: ["position-type-permissions"] });
+
+    if (mustClearAll) {
+      toast.warning(t("contentManagement.cannotClearAllPermissions"));
+    } else {
+      toast.success(t("contentManagement.permissionSuccess"));
+    }
+
+    if (onSuccess) {
+      onSuccess();
+    } else {
+      navigate("/user-management/position-management");
+    }
+  };
+
+  if (isLoadingEditData) {
+    return (
+      <div className="py-8 text-center text-muted-foreground">
+        {t("common.loading")}
+      </div>
+    );
+  }
+
+  const selectedPermissionCount = form.watch("permissions").length;
+  // form.formState.isSubmitting stays true for the whole async handler, so it
+  // also covers the permission-assignment call that follows the save.
+  const isBusy = form.formState.isSubmitting || isCopying;
+
+  const copyFromPlaceholder = !selectedOrganizationId
+    ? t("contentManagement.selectOrganizationToCopy")
+    : isCopying || isLoadingPositionTypes || isLoadingUnits
+      ? t("common.loading")
+      : isErrorPositionTypes
+        ? t("contentManagement.failedToLoadPositionTypes")
+        : t("contentManagement.selectPositionToCopy");
+
+  return (
+    <Form {...form}>
+      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+        <FormField
+          control={form.control}
+          name="nameEn"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>{t("contentManagement.englishName")}</FormLabel>
+              <FormControl>
+                <Input {...field} placeholder="e.g. HR Coordinator" />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <FormField
+          control={form.control}
+          name="nameAm"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>{t("contentManagement.amharicName")}</FormLabel>
+              <FormControl>
+                <Input {...field} placeholder="e.g. ሰብል አያት" />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        {/* Organization (searchable, all orgs) */}
+        <FormField
+          control={form.control}
+          name="organizationId"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>{t("organization.organization")}</FormLabel>
+              <SingleSelect
+                options={organizationOptions}
+                value={field.value}
+                onValueChange={field.onChange}
+                placeholder={
+                  isLoadingOrgs
+                    ? t("common.loading")
+                    : t("organization.selectOrganization")
+                }
+              />
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        {/* Unit Selector — searchable, scoped to picked org */}
+        <FormField
+          control={form.control}
+          name="unitId"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>{t("organization.selectUnit")}</FormLabel>
+              <SingleSelect
+                options={unitOptions}
+                value={field.value}
+                onValueChange={field.onChange}
+                placeholder={
+                  !selectedOrganizationId
+                    ? t("organization.selectOrganizationFirst")
+                    : isLoadingUnits
+                      ? t("common.loading")
+                      : t("organization.selectUnit")
+                }
+              />
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <div className="mb-4 w-1/2">
+          <label className="block text-sm font-medium text-gray-700">
+            {t("contentManagement.selectApplication")}
+          </label>
+          <Select
+            value={selectedApplicationId}
+            onValueChange={setSelectedApplicationId}
+            disabled={isLoadingApplications}>
+            <SelectTrigger className="mt-1 block w-full border-gray-300 rounded-md shadow-sm">
+              <SelectValue
+                placeholder={
+                  isLoadingApplications
+                    ? t("common.loading")
+                    : t("contentManagement.selectApplication")
+                }
+              />
+            </SelectTrigger>
+            <SelectContent className="max-h-60 overflow-y-auto">
+              {applications?.map((app) => (
+                <SelectItem key={app.id} value={app.id}>
+                  {localizedName(app.name)}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+
+        <div className="space-y-2">
+          <label className="block text-sm font-medium text-gray-700">
+            {t("contentManagement.copyPermissionsFrom")}
+          </label>
+          <Select
+            value={copyFromPositionId}
+            onValueChange={handleCopyFrom}
+            disabled={
+              !selectedOrganizationId ||
+              isLoadingPositionTypes ||
+              isLoadingUnits ||
+              isCopying
+            }>
+            <SelectTrigger className="w-full">
+              <SelectValue placeholder={copyFromPlaceholder} />
+            </SelectTrigger>
+            <SelectContent className="max-h-60 overflow-y-auto">
+              {copyFromOptions.map((p: PositionTypeDto) => (
+                <SelectItem key={p.id} value={p.id}>
+                  {localizedName(p.name)}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+          <p className="text-xs text-muted-foreground">
+            {t("contentManagement.copyPermissionsHint")}
+          </p>
+        </div>
+
+        <FormField
+          control={form.control}
+          name="permissions"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>
+                {t("contentManagement.permission")}
+                {selectedPermissionCount > 0 && (
+                  <span className="ml-2 font-normal text-muted-foreground">
+                    (
+                    {t("contentManagement.permissionsSelected", {
+                      count: selectedPermissionCount,
+                    })}
+                    )
+                  </span>
+                )}
+              </FormLabel>
+              <PermissionSearch
+                selectedPermissions={field.value}
+                onPermissionChange={handlePermissionChange}
+                applicationId={selectedApplicationId}
+              />
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <div className="flex justify-end gap-4">
+          <Button
+            type="button"
+            variant="outline"
+            disabled={isBusy}
+            onClick={() => {
+              if (onCancel) {
+                onCancel();
+              } else {
+                window.history.back();
+              }
+            }}>
+            {t("common.Cancel")}
+          </Button>
+          <Button type="submit" disabled={isBusy}>
+            {form.formState.isSubmitting
+              ? t("common.saving")
+              : mode === "edit"
+                ? t("delegation.update")
+                : t("delegation.save")}
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+};
diff --git a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/EditPositionForm.tsx b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/EditPositionForm.tsx
index e69a6eedb..befe2f7d8 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/EditPositionForm.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/EditPositionForm.tsx
@@ -1,160 +1,193 @@
-import { useEffect, useState } from "react";
-import { Button } from "@/shared/common/ui/button";
-import { Input } from "@/shared/common/ui/input";
-import { Label } from "@/shared/common/ui/label";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/shared/common/ui/select";
-import { useNavigate } from "react-router-dom";
-
-import { useUnit } from "@/user-management/hooks/useUnit";
-import { useAuth } from "@/shared/context/AuthContext";
-import { positionTypePermissionService } from "@/user-management/services/api/positionTypePermissionService";
-import { usePositionTypes } from "@/user-management/hooks/usePositionTypes";
-import { useApplications } from "@/user-management/hooks/useApplications";
-import { PermissionSearch } from "./PermissionSearch";
-import { PermissionDto } from "@/user-management/dto/permissions/permissonDto";
-import { useLocalizedName } from "@/shared/common/localizedName";
-import { UnitDto } from "@/user-management/dto/unit/unitDto";
-import { t } from "i18next";
-
-export const EditPositionForm = ({ id }: { id: string }) => {
-  const navigate = useNavigate();
-  const { user } = useAuth();
-  const { getList } = useUnit();
-  const localizedName = useLocalizedName();
-
-  const { positionType, isLoadingSingle } = usePositionTypes({ id });
-
-  const organizationId =
-    user?.employee && user.employee.length > 0
-      ? user.employee[0].organizationId
-      : undefined;
-
-  const { applications, isLoading: isLoadingApplications } = useApplications();
-
-  const { data: unitsResponse } = getList(organizationId || "", {
-    take: 300,
-    skip: 0,
-  });
-
-  const [selectedApplicationId, setSelectedApplicationId] =
-    useState<string>("");
-  const [assignedPermissions, setAssignedPermissions] = useState<
-    PermissionDto[]
-  >([]);
-  const [isLoadingPermissions, setIsLoadingPermissions] = useState(false);
-
-  useEffect(() => {
-    const load = async () => {
-      if (!positionType) return;
-      setIsLoadingPermissions(true);
-      try {
-        const assigned =
-          await positionTypePermissionService.getPermissionsByPositionTypeId(
-            positionType.id,
-          );
-        setAssignedPermissions(assigned.data.items ?? []);
-      } finally {
-        setIsLoadingPermissions(false);
-      }
-    };
-    load();
-  }, [positionType]);
-
-  if (isLoadingSingle) return <p>Loading...</p>;
-  if (!positionType) return null;
-
-  const unit = unitsResponse?.data?.items?.find(
-    (u: UnitDto) => u.id === positionType.unitId,
-  );
-  const unitName = unit ? unit.name.en || unit.name.am : positionType.unitId;
-
-  return (
-    <div className="space-y-6">
-      <div className="space-y-2">
-        <Label>{t("contentManagement.englishName")}</Label>
-        <Input value={positionType.name.en} disabled readOnly />
-      </div>
-
-      <div className="space-y-2">
-        <Label>{t("contentManagement.amharicName")}</Label>
-        <Input value={positionType.name.am} disabled readOnly />
-      </div>
-
-      <div className="space-y-2">
-        <Label>Key</Label>
-        <Input value={positionType.key} disabled readOnly />
-      </div>
-
-      <div className="space-y-2">
-        <Label>{t("contentManagement.selectApplication")}</Label>
-        <Select
-          value={selectedApplicationId}
-          onValueChange={(value) => setSelectedApplicationId(value)}
-          disabled={isLoadingApplications}
-        >
-          <SelectTrigger className="mt-1 block w-full border-gray-300 rounded-md shadow-sm">
-            <SelectValue placeholder="Select an Application" />
-          </SelectTrigger>
-          <SelectContent className="max-h-60 overflow-y-auto">
-            {applications?.map((app: any) => (
-              <SelectItem key={app.id} value={app.id}>
-                {localizedName(app.name)}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-      </div>
-
-      <div className="space-y-2">
-        <Label>{t("contentManagement.permission")}</Label>
-        {selectedApplicationId ? (
-          <PermissionSearch
-            selectedPermissions={assignedPermissions.map((perm) => perm.id)}
-            onPermissionChange={() => {
-              // view-only mode in edit form
-            }}
-            applicationId={selectedApplicationId}
-            disabled
-          />
-        ) : (
-          <div className="border rounded-md p-4 bg-background max-h-96 overflow-y-auto">
-            {isLoadingPermissions ? (
-              <div className="text-center py-4 text-gray-500">Loading...</div>
-            ) : assignedPermissions.length === 0 ? (
-              <div className="text-center py-4 text-gray-500">
-                {t("contentManagement.noPermissionsAvailable")}
-              </div>
-            ) : (
-              <ul className="grid grid-cols-1 md:grid-cols-2 gap-2">
-                {assignedPermissions.map((perm) => (
-                  <li
-                    key={perm.id}
-                    className="capitalize text-sm py-1 px-2 rounded bg-muted/40"
-                  >
-                    {localizedName(perm.name)}
-                  </li>
-                ))}
-              </ul>
-            )}
-          </div>
-        )}
-      </div>
-
-      <div className="flex justify-end">
-        <Button
-          type="button"
-          variant="outline"
-          onClick={() => navigate("/user-management/position-management")}
-        >
-          {t("common.Back")}
-        </Button>
-      </div>
-    </div>
-  );
-};
+import { useState } from "react";
+import { Button } from "@/shared/common/ui/button";
+import { Input } from "@/shared/common/ui/input";
+import { Label } from "@/shared/common/ui/label";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/shared/common/ui/select";
+import { useNavigate } from "react-router-dom";
+import { useQuery } from "@tanstack/react-query";
+
+import { useUnit } from "@/user-management/hooks/useUnit";
+import { useAuth } from "@/shared/context/AuthContext";
+import { positionTypePermissionService } from "@/user-management/services/api/positionTypePermissionService";
+import { usePositionTypes } from "@/user-management/hooks/usePositionTypes";
+import { useApplications } from "@/user-management/hooks/useApplications";
+import { PermissionSearch } from "./PermissionSearch";
+import { useLocalizedName } from "@/shared/common/localizedName";
+import { UnitDto } from "@/user-management/dto/unit/unitDto";
+import { t } from "i18next";
+
+export const EditPositionForm = ({ id }: { id: string }) => {
+  const navigate = useNavigate();
+  const { user } = useAuth();
+  const { getList } = useUnit();
+  const localizedName = useLocalizedName();
+
+  const { positionType, isLoadingSingle, isErrorSingle } = usePositionTypes({
+    id,
+  });
+
+  const organizationId =
+    user?.employee && user.employee.length > 0
+      ? user.employee[0].organizationId
+      : undefined;
+
+  const { applications, isLoading: isLoadingApplications } = useApplications();
+
+  const { data: unitsResponse } = getList(organizationId || "", {
+    take: 300,
+    skip: 0,
+  });
+
+  const [selectedApplicationId, setSelectedApplicationId] =
+    useState<string>("");
+
+  // Shares the cache key CreatePositionForm writes under, so editing a position
+  // type's permissions refreshes this view too.
+  const {
+    data: assignedResponse,
+    isLoading: isLoadingPermissions,
+    isError: isErrorPermissions,
+  } = useQuery({
+    queryKey: ["position-type-permissions", id],
+    queryFn: () =>
+      positionTypePermissionService.getPermissionsByPositionTypeId(id),
+    enabled: !!id,
+  });
+
+  const assignedPermissions = assignedResponse?.data?.items ?? [];
+
+  if (isLoadingSingle) {
+    return (
+      <p className="py-8 text-center text-muted-foreground">
+        {t("common.loading")}
+      </p>
+    );
+  }
+
+  if (isErrorSingle || !positionType) {
+    return (
+      <div className="space-y-4">
+        <p className="py-8 text-center text-red-500">
+          {t("contentManagement.positionTypeNotFound")}
+        </p>
+        <div className="flex justify-end">
+          <Button
+            type="button"
+            variant="outline"
+            onClick={() => navigate("/user-management/position-management")}>
+            {t("common.Back")}
+          </Button>
+        </div>
+      </div>
+    );
+  }
+
+  const unit = unitsResponse?.data?.items?.find(
+    (u: UnitDto) => u.id === positionType.unitId,
+  );
+  const unitName = unit ? unit.name.en || unit.name.am : positionType.unitId;
+
+  return (
+    <div className="space-y-6">
+      <div className="space-y-2">
+        <Label>{t("contentManagement.englishName")}</Label>
+        <Input value={positionType.name.en} disabled readOnly />
+      </div>
+
+      <div className="space-y-2">
+        <Label>{t("contentManagement.amharicName")}</Label>
+        <Input value={positionType.name.am} disabled readOnly />
+      </div>
+
+      <div className="space-y-2">
+        <Label>{t("contentManagement.key")}</Label>
+        <Input value={positionType.key} disabled readOnly />
+      </div>
+
+      <div className="space-y-2">
+        <Label>{t("organization.selectUnit")}</Label>
+        <Input value={unitName ?? ""} disabled readOnly />
+      </div>
+
+      <div className="space-y-2">
+        <Label>{t("contentManagement.selectApplication")}</Label>
+        <Select
+          value={selectedApplicationId}
+          onValueChange={setSelectedApplicationId}
+          disabled={isLoadingApplications}>
+          <SelectTrigger className="mt-1 block w-full border-gray-300 rounded-md shadow-sm">
+            <SelectValue
+              placeholder={
+                isLoadingApplications
+                  ? t("common.loading")
+                  : t("contentManagement.selectApplication")
+              }
+            />
+          </SelectTrigger>
+          <SelectContent className="max-h-60 overflow-y-auto">
+            {applications?.map((app) => (
+              <SelectItem key={app.id} value={app.id}>
+                {localizedName(app.name)}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
+      </div>
+
+      <div className="space-y-2">
+        <Label>{t("contentManagement.permission")}</Label>
+        {selectedApplicationId ? (
+          <PermissionSearch
+            selectedPermissions={assignedPermissions.map((perm) => perm.id)}
+            onPermissionChange={() => {
+              // view-only mode in edit form
+            }}
+            applicationId={selectedApplicationId}
+            disabled
+          />
+        ) : (
+          <div className="border rounded-md p-4 bg-background max-h-96 overflow-y-auto">
+            {isLoadingPermissions ? (
+              <div className="text-center py-4 text-gray-500">
+                {t("common.loading")}
+              </div>
+            ) : isErrorPermissions ? (
+              <div className="text-center py-4 text-red-500">
+                {t("contentManagement.failedToLoadPermissions")}
+              </div>
+            ) : assignedPermissions.length === 0 ? (
+              <div className="text-center py-4 text-gray-500">
+                {t("contentManagement.noPermissionsAvailable")}
+              </div>
+            ) : (
+              <ul className="grid grid-cols-1 md:grid-cols-2 gap-2">
+                {assignedPermissions.map((perm) => (
+                  <li
+                    key={perm.id}
+                    className="capitalize text-sm py-1 px-2 rounded bg-muted/40">
+                    {localizedName(perm.name)}
+                  </li>
+                ))}
+              </ul>
+            )}
+          </div>
+        )}
+      </div>
+
+      <div className="flex justify-end">
+        <Button
+          type="button"
+          variant="outline"
+          onClick={() => navigate("/user-management/position-management")}>
+          {t("common.Back")}
+        </Button>
+      </div>
+    </div>
+  );
+};
diff --git a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PermissionSearch.tsx b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PermissionSearch.tsx
index bfc645fc7..8d853a3b0 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PermissionSearch.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PermissionSearch.tsx
@@ -1,152 +1,120 @@
-import React, { useState, useEffect, useMemo, useRef } from "react";
-import { Input } from "@/shared/common/ui/input";
-import { Checkbox } from "@/shared/common/ui/checkbox";
-import { usePermissionManager } from "@/user-management/hooks/usePermissionManager";
-import { PermissionDto } from "@/user-management/dto/permissions/permissonDto";
-import { useLocalizedName } from "@/shared/common/localizedName";
-import { t } from "i18next";
-import { Search, Loader2 } from "lucide-react";
-
-interface PermissionSearchProps {
-  selectedPermissions: string[];
-  onPermissionChange: (permissionId: string, checked: boolean) => void;
-  applicationId?: string;
-  disabled?: boolean;
-}
-
-const INITIAL_TAKE = 50; // Initial number of items to fetch
-
-export const PermissionSearch: React.FC<PermissionSearchProps> = ({
-  selectedPermissions,
-  onPermissionChange,
-  applicationId,
-  disabled = false,
-}) => {
-  const [searchTerm, setSearchTerm] = useState("");
-  const [debouncedSearchTerm, setDebouncedSearchTerm] = useState("");
-  const [take, setTake] = useState(INITIAL_TAKE); // Start with 50
-  const hasSetTotalCount = useRef(false); // Track if we've set the total count
-
-  const scrollContainerRef = useRef<HTMLDivElement>(null);
-
-  const localizedName = useLocalizedName();
-
-  /** ------------------ 1. Debounce Search ------------------ */
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      setDebouncedSearchTerm(searchTerm);
-      setTake(INITIAL_TAKE); // Reset to 50
-      hasSetTotalCount.current = false; // Reset the flag
-    }, 300);
-
-    return () => clearTimeout(timer);
-  }, [searchTerm]);
-
-  /** ------------------ 2. Fetch Permissions ------------------ */
-  const { permissions, isPermissionsLoading } = usePermissionManager({
-    params: applicationId
-      ? {
-          take,
-          skip: 0, // Always skip 0, we fetch everything at once
-          search: debouncedSearchTerm || undefined,
-          applicationId,
-        }
-      : undefined,
-  });
-
-  /** ------------------ 3. Update take to total count after first fetch ------------------ */
-  useEffect(() => {
-    if (
-      permissions?.count &&
-      !hasSetTotalCount.current &&
-      take !== permissions.count
-    ) {
-      hasSetTotalCount.current = true;
-      setTake(permissions.count); // Fetch all items
-    }
-  }, [permissions?.count, take]);
-
-  /** ------------------ 4. Client-side Filtering (Optional) ------------------ */
-  const filteredPermissions = useMemo(() => {
-    if (!permissions?.items?.length) return [];
-    if (!searchTerm.trim()) return permissions.items;
-
-    return permissions.items.filter((perm: PermissionDto) => {
-      const name = localizedName(perm.name).toLowerCase();
-      const key = perm.key.toLowerCase();
-      const search = searchTerm.toLowerCase();
-      return name.includes(search) || key.includes(search);
-    });
-  }, [permissions?.items, searchTerm, localizedName]);
-
-  /** ------------------ Render ------------------ */
-  return (
-    <div className="space-y-4">
-      {/* Search Input */}
-      <div className="relative">
-        <Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 h-4 w-4" />
-        <Input
-          placeholder={t("contentManagement.searchPermissions")}
-          value={searchTerm}
-          onChange={(e) => setSearchTerm(e.target.value)}
-          className="pl-10"
-        />
-      </div>
-
-      {/* Permission List Container */}
-      {!applicationId ? (
-        <div className="max-h-96 overflow-y-auto border rounded-md p-4 bg-background text-center text-gray-500">
-          {t("contentManagement.selectApplicationToLoadPermissions") ||
-            "Select an application to load permissions."}
-        </div>
-      ) : isPermissionsLoading ? (
-        <div className="flex justify-center py-10">
-          <Loader2 className="h-8 w-8 animate-spin text-gray-400" />
-        </div>
-      ) : (
-        <div
-          ref={scrollContainerRef}
-          className="max-h-96 overflow-y-auto border rounded-md p-4 bg-background"
-        >
-          {filteredPermissions.length === 0 ? (
-            <div className="text-center py-4 text-gray-500">
-              {searchTerm
-                ? t("contentManagement.noPermissionsFound")
-                : t("contentManagement.noPermissionsAvailable")}
-            </div>
-          ) : (
-            <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-              {filteredPermissions.map((perm: PermissionDto) => (
-                <div
-                  key={perm.id}
-                  className="flex flex-row items-start space-x-3 space-y-0"
-                >
-                  <Checkbox
-                    checked={selectedPermissions.includes(perm.id)}
-                    disabled={disabled}
-                    onCheckedChange={(checked) => {
-                      if (!disabled) onPermissionChange(perm.id, !!checked);
-                    }}
-                  />
-                  <label className="capitalize cursor-pointer font-normal text-sm">
-                    {localizedName(perm.name)}
-                  </label>
-                </div>
-              ))}
-            </div>
-          )}
-        </div>
-      )}
-
-      {/* Footer Info */}
-      {filteredPermissions.length > 0 && (
-        <div className="text-xs text-muted-foreground px-1">
-          {t("contentManagement.showingPermissions", {
-            count: filteredPermissions.length,
-            total: permissions?.count || 0,
-          })}
-        </div>
-      )}
-    </div>
-  );
-};
+import React, { useState, useEffect } from "react";
+import { Input } from "@/shared/common/ui/input";
+import { Checkbox } from "@/shared/common/ui/checkbox";
+import { usePermissionManager } from "@/user-management/hooks/usePermissionManager";
+import { PermissionDto } from "@/user-management/dto/permissions/permissonDto";
+import { useLocalizedName } from "@/shared/common/localizedName";
+import { t } from "i18next";
+import { Search, Loader2 } from "lucide-react";
+
+interface PermissionSearchProps {
+  selectedPermissions: string[];
+  onPermissionChange: (permissionId: string, checked: boolean) => void;
+  applicationId?: string;
+  disabled?: boolean;
+}
+
+// One request per application. This used to fetch 50, read `count` off the
+// response and immediately refetch with take = count — two round trips on every
+// mount for the same list.
+const TAKE = 1000;
+
+export const PermissionSearch: React.FC<PermissionSearchProps> = ({
+  selectedPermissions,
+  onPermissionChange,
+  applicationId,
+  disabled = false,
+}) => {
+  const [searchTerm, setSearchTerm] = useState("");
+  const [debouncedSearchTerm, setDebouncedSearchTerm] = useState("");
+
+  const localizedName = useLocalizedName();
+
+  /** ------------------ 1. Debounce Search ------------------ */
+  useEffect(() => {
+    const timer = setTimeout(() => setDebouncedSearchTerm(searchTerm), 300);
+    return () => clearTimeout(timer);
+  }, [searchTerm]);
+
+  /** ------------------ 2. Fetch Permissions ------------------ */
+  // The API does the filtering. Filtering the result again on the *undebounced*
+  // term used to blank the list for 300ms on every keystroke.
+  const { permissions, isPermissionsLoading } = usePermissionManager({
+    params: applicationId
+      ? {
+          take: TAKE,
+          skip: 0,
+          search: debouncedSearchTerm || undefined,
+          applicationId,
+        }
+      : undefined,
+  });
+
+  const items = permissions?.items ?? [];
+
+  /** ------------------ Render ------------------ */
+  return (
+    <div className="space-y-4">
+      {/* Search Input */}
+      <div className="relative">
+        <Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 h-4 w-4" />
+        <Input
+          placeholder={t("contentManagement.searchPermissions")}
+          value={searchTerm}
+          onChange={(e) => setSearchTerm(e.target.value)}
+          className="pl-10"
+        />
+      </div>
+
+      {/* Permission List Container */}
+      {!applicationId ? (
+        <div className="max-h-96 overflow-y-auto border rounded-md p-4 bg-background text-center text-gray-500">
+          {t("contentManagement.selectApplicationToLoadPermissions")}
+        </div>
+      ) : isPermissionsLoading ? (
+        <div className="flex justify-center py-10">
+          <Loader2 className="h-8 w-8 animate-spin text-gray-400" />
+        </div>
+      ) : (
+        <div className="max-h-96 overflow-y-auto border rounded-md p-4 bg-background">
+          {items.length === 0 ? (
+            <div className="text-center py-4 text-gray-500">
+              {debouncedSearchTerm
+                ? t("contentManagement.noPermissionsFound")
+                : t("contentManagement.noPermissionsAvailable")}
+            </div>
+          ) : (
+            <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+              {items.map((perm: PermissionDto) => (
+                <div
+                  key={perm.id}
+                  className="flex flex-row items-start space-x-3 space-y-0">
+                  <Checkbox
+                    checked={selectedPermissions.includes(perm.id)}
+                    disabled={disabled}
+                    onCheckedChange={(checked) => {
+                      if (!disabled) onPermissionChange(perm.id, !!checked);
+                    }}
+                  />
+                  <label className="capitalize cursor-pointer font-normal text-sm">
+                    {localizedName(perm.name)}
+                  </label>
+                </div>
+              ))}
+            </div>
+          )}
+        </div>
+      )}
+
+      {/* Footer Info */}
+      {items.length > 0 && (
+        <div className="text-xs text-muted-foreground px-1">
+          {t("contentManagement.showingPermissions", {
+            count: items.length,
+            total: permissions?.count || 0,
+          })}
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionLists.tsx b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionLists.tsx
index 9af344caf..142b97f83 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionLists.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionLists.tsx
@@ -1,276 +1,253 @@
-import { useEffect, useState, useMemo } from "react";
-import { Button } from "@/shared/common/ui/button";
-import { AdvancedTable } from "@/shared/common/ui/table/AdvancedTable";
-
-import { Link } from "react-router-dom";
-import { Plus } from "lucide-react";
-import {
-  Card,
-  CardContent,
-  CardHeader,
-  CardTitle,
-} from "@/shared/common/ui/card";
-import { usePositionTypes } from "@/user-management/hooks/usePositionTypes";
-import { createPositionTypeColumns } from "./PositionTypeColumnDefn";
-import { positionTypeService } from "@/user-management/services/api/positionTypesService";
-import { t } from "i18next";
-import { useUnit } from "@/user-management/hooks/useUnit";
-import { useAuth } from "@/shared/context/AuthContext";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/shared/common/ui/select";
-import { UnitDto } from "@/user-management/dto/unit/unitDto";
-import { usePositionTypeConfiguration } from "@/user-management/hooks/usePostionType";
-
-export default function PositionManagement() {
-  const [pageIndex, setPageIndex] = useState(0);
-  const pageSize = 10;
-  const [isExporting, setIsExporting] = useState<boolean>(false);
-  const [searchTerm, setSearchTerm] = useState("");
-  const { createConfiguration } = usePositionTypeConfiguration();
-
-  const { user } = useAuth();
-
-  const { getAccessibleList } = useUnit();
-
-  const organizationId = user?.employee?.[0]?.organizationId;
-
-  const { data: unitsResponse } = getAccessibleList(organizationId ?? "", {
-    take: 300,
-    skip: 0,
-  });
-
-  // Add state for selected unitId
-  // Default: if super_admin => "All", otherwise wait for units
-  const [selectedUnitId, setSelectedUnitId] = useState<string>("All");
-
-  useEffect(() => {
-    // If there’s no selectedUnitId yet, default to first unit (if any), otherwise keep "All"
-    if (!selectedUnitId) {
-      if (unitsResponse?.data?.items?.length) {
-        setSelectedUnitId(unitsResponse.data.items[0].id);
-      } else {
-        setSelectedUnitId("All");
-      }
-    }
-  }, [unitsResponse, selectedUnitId]);
-
-  // Reset to first page whenever the search term or unit changes so users
-  // land on the first page of matches instead of an empty later page.
-  useEffect(() => {
-    setPageIndex(0);
-  }, [searchTerm, selectedUnitId]);
-
-  const handlePageChange = (newPage: number) => {
-    setPageIndex(newPage);
-  };
-  const {
-    positionTypeResponse,
-    isLoading,
-    positionTypeByUnitId,
-    refetch,
-    refetchPosition,
-  } = usePositionTypes({
-    params: {
-      take: 1000,
-      skip: 0,
-      orderBy: "updatedAt:DESC",
-    },
-    unitId: selectedUnitId === "All" ? undefined : selectedUnitId,
-  });
-
-  // Fetch position types without unitId for migration options
-  const {
-    positionTypeResponse: globalPositionTypes,
-    refetch: refetchGlobalPositionTypes,
-  } = usePositionTypes({
-    params: {
-      take: 1000, // Get all global position types
-      skip: 0,
-      orderBy: "updatedAt:DESC",
-    },
-    unitId: undefined, // Explicitly fetch position types without unitId
-  });
-
-  // Create a combined refetch function for the onDelete callback
-  const handlePositionTypeDeleted = async () => {
-    await Promise.all([
-      selectedUnitId === "All" ? refetch() : refetchPosition(),
-      refetchGlobalPositionTypes(),
-    ]);
-  };
-  const handleToggle = async (
-    positionTypeId: string,
-    checked: boolean,
-    field: "canReceiveRecord" | "canAssignRecord" | "canCreateBankRecord",
-  ) => {
-    if (!selectedUnitId || selectedUnitId === "All") return;
-
-    await createConfiguration({
-      positionTypeId,
-      timeframe: "yearly",
-      organizationId: organizationId!,
-      canReceiveRecord: field === "canReceiveRecord" ? checked : false,
-      canAssignRecord: field === "canAssignRecord" ? checked : false,
-      canCreateBankRecord: field === "canCreateBankRecord" ? checked : false,
-    });
-
-    await handlePositionTypeDeleted();
-  };
-
-  // Create columns with positionTypeResponse
-  const columns = useMemo(
-    () =>
-      createPositionTypeColumns(
-        selectedUnitId === "All" ? positionTypeResponse : positionTypeByUnitId,
-        globalPositionTypes,
-        handlePositionTypeDeleted,
-        handlePositionTypeDeleted,
-        handleToggle, // ← pass toggle handler
-        selectedUnitId === "All", // ← isGlobal: hide toggle when "All"
-      ),
-    [
-      selectedUnitId,
-      positionTypeResponse,
-      positionTypeByUnitId,
-      globalPositionTypes,
-    ],
-  );
-  const allItems = useMemo(
-    () =>
-      (selectedUnitId === "All"
-        ? positionTypeResponse?.items
-        : positionTypeByUnitId?.items) || [],
-    [selectedUnitId, positionTypeResponse?.items, positionTypeByUnitId?.items],
-  );
-
-  const filteredItems = useMemo(() => {
-    const trimmed = searchTerm.trim().toLowerCase();
-    if (!trimmed) return allItems;
-    return allItems.filter((item: any) => {
-      const en = (item?.name?.en || "").toLowerCase();
-      const am = (item?.name?.am || "").toLowerCase();
-      const key = (item?.key || "").toLowerCase();
-      return (
-        en.includes(trimmed) || am.includes(trimmed) || key.includes(trimmed)
-      );
-    });
-  }, [allItems, searchTerm]);
-
-  const paginatedItems = useMemo(() => {
-    const start = pageIndex * pageSize;
-    return filteredItems.slice(start, start + pageSize);
-  }, [filteredItems, pageIndex, pageSize]);
-
-  if (isLoading) {
-    return <div>{t("contentManagement.addUser")}</div>;
-  }
-
-  const exportTypes = () => {
-    setIsExporting(true);
-    positionTypeService
-      .getAll({
-        take: 3000,
-      })
-      .then((allPositionKeys) => {
-        // Get the position type keys
-        const positionTypeKeys = allPositionKeys.data?.items?.map((p) => p.key);
-
-        if (positionTypeKeys && positionTypeKeys.length > 0) {
-          // Convert the array of keys into a string, with each key on a new line
-          const fileContent = positionTypeKeys.join("\n");
-
-          // Create a Blob from the string content
-          const blob = new Blob([fileContent], { type: "text/plain" });
-
-          // Create a link element to trigger the download
-          const link = document.createElement("a");
-
-          // Create an object URL for the Blob
-          link.href = URL.createObjectURL(blob);
-
-          // Set the download attribute with a file name
-          link.download = "position_keys.txt";
-
-          // Programmatically trigger a click on the link to start the download
-          link.click();
-
-          // Clean up by revoking the object URL
-          URL.revokeObjectURL(link.href);
-        } else {
-          console.error("No position type keys found.");
-        }
-        setIsExporting(false);
-      });
-  };
-
-  return (
-    <div className="p-6 space-y-6">
-      <Card className="col-span-2 shadow-none border-none bg-transparent px-0">
-        <CardHeader className="flex flex-row justify-between items-center px-0">
-          <CardTitle className="text-xl font-semibold ">
-            {t("contentManagement.permissionType")}
-          </CardTitle>
-          <Button onClick={exportTypes}>
-            {isExporting
-              ? t("contentManagement.exporting")
-              : t("contentManagement.exportTypes")}
-          </Button>
-        </CardHeader>
-        {unitsResponse?.data?.items?.length > 0 && (
-          <div className="mb-4 w-1/2">
-            <label className="block text-sm font-medium text-gray-700">
-              Select Unit
-            </label>
-            <Select
-              value={selectedUnitId}
-              onValueChange={(value) => setSelectedUnitId(value)}
-            >
-              <SelectTrigger className="mt-1 block w-full border-gray-300 rounded-md shadow-sm focus:ring-primary-500 focus:border-primary-500 sm:text-sm [&>span]:truncate">
-                <SelectValue placeholder="Select a Unit" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem key="all" value="All">
-                  All
-                </SelectItem>
-                {unitsResponse?.data.items.map((unit: UnitDto) => (
-                  <SelectItem key={unit.id} value={unit.id}>
-                    <span className="block truncate max-w-70">
-                      {unit.name.en || unit.name.am}
-                    </span>
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-        )}
-        <CardContent className="px-0">
-          <AdvancedTable
-            columns={columns}
-            data={paginatedItems}
-            tableName="Positions"
-            toolBarPosition="right"
-            itemCount={filteredItems.length}
-            onGlobalFilterChange={setSearchTerm}
-            extraToolbar={
-              <Link to="/user-management/position-management/new">
-                <Button className="px-5 py-2 rounded-md text-sm font-medium shadow-md">
-                  <Plus className="w-4 h-4 mr-2" />
-                  {t("contentManagement.newPermission")}
-                </Button>
-              </Link>
-            }
-            pageIndex={pageIndex}
-            onPageChange={handlePageChange}
-            nextFunction={() => handlePageChange(pageIndex + 1)}
-            prevFunction={() => handlePageChange(Math.max(pageIndex - 1, 0))}
-          />
-        </CardContent>
-      </Card>
-    </div>
-  );
-}
+import { useEffect, useState, useMemo, useCallback } from "react";
+import { Button } from "@/shared/common/ui/button";
+import { AdvancedTable } from "@/shared/common/ui/table/AdvancedTable";
+
+import { Link } from "react-router-dom";
+import { Plus } from "lucide-react";
+import {
+  Card,
+  CardContent,
+  CardHeader,
+  CardTitle,
+} from "@/shared/common/ui/card";
+import { usePositionTypes } from "@/user-management/hooks/usePositionTypes";
+import { createPositionTypeColumns } from "./PositionTypeColumnDefn";
+import { positionTypeService } from "@/user-management/services/api/positionTypesService";
+import { t } from "i18next";
+import { toast } from "sonner";
+import { useUnit } from "@/user-management/hooks/useUnit";
+import { useAuth } from "@/shared/context/AuthContext";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/shared/common/ui/select";
+import { UnitDto } from "@/user-management/dto/unit/unitDto";
+import { PositionTypeDto } from "@/user-management/dto/positions/positionType";
+
+export default function PositionManagement() {
+  const [pageIndex, setPageIndex] = useState(0);
+  const pageSize = 10;
+  const [isExporting, setIsExporting] = useState<boolean>(false);
+  const [searchTerm, setSearchTerm] = useState("");
+
+  const { user } = useAuth();
+
+  const { getAccessibleList } = useUnit();
+
+  const organizationId = user?.employee?.[0]?.organizationId;
+
+  const { data: unitsResponse, isError: isUnitsError } = getAccessibleList(
+    organizationId ?? "",
+    {
+      take: 300,
+      skip: 0,
+    },
+  );
+
+  // Add state for selected unitId
+  // Default: if super_admin => "All", otherwise wait for units
+  const [selectedUnitId, setSelectedUnitId] = useState<string>("All");
+
+  useEffect(() => {
+    // If there’s no selectedUnitId yet, default to first unit (if any), otherwise keep "All"
+    if (!selectedUnitId) {
+      if (unitsResponse?.data?.items?.length) {
+        setSelectedUnitId(unitsResponse.data.items[0].id);
+      } else {
+        setSelectedUnitId("All");
+      }
+    }
+  }, [unitsResponse, selectedUnitId]);
+
+  // Reset to first page whenever the search term or unit changes so users
+  // land on the first page of matches instead of an empty later page.
+  useEffect(() => {
+    setPageIndex(0);
+  }, [searchTerm, selectedUnitId]);
+
+  const handlePageChange = (newPage: number) => {
+    setPageIndex(newPage);
+  };
+
+  const showingAllUnits = selectedUnitId === "All";
+
+  const {
+    positionTypeResponse,
+    isLoading,
+    isError,
+    positionTypeByUnitId,
+    isLoadingPosition,
+    isErrorPosition,
+    refetch,
+    refetchPosition,
+  } = usePositionTypes({
+    params: {
+      take: 1000,
+      skip: 0,
+      orderBy: "updatedAt:DESC",
+    },
+    unitId: showingAllUnits ? undefined : selectedUnitId,
+  });
+
+  // Refresh whichever list is on screen. `positionTypeResponse` is the
+  // unscoped fetch, so it doubles as the migration-target source — no second
+  // usePositionTypes() call needed (its cache key ignores unitId, so a second
+  // call returned the very same query).
+  const handlePositionTypeChanged = useCallback(async () => {
+    await (showingAllUnits ? refetch() : refetchPosition());
+  }, [showingAllUnits, refetch, refetchPosition]);
+
+  const columns = useMemo(
+    () =>
+      createPositionTypeColumns(
+        positionTypeResponse,
+        handlePositionTypeChanged,
+        handlePositionTypeChanged,
+      ),
+    [positionTypeResponse, handlePositionTypeChanged],
+  );
+
+  const allItems = useMemo(
+    () =>
+      (showingAllUnits
+        ? positionTypeResponse?.items
+        : positionTypeByUnitId?.items) || [],
+    [showingAllUnits, positionTypeResponse?.items, positionTypeByUnitId?.items],
+  );
+
+  const filteredItems = useMemo(() => {
+    const trimmed = searchTerm.trim().toLowerCase();
+    if (!trimmed) return allItems;
+    return allItems.filter((item: PositionTypeDto) => {
+      const en = (item?.name?.en || "").toLowerCase();
+      const am = (item?.name?.am || "").toLowerCase();
+      const key = (item?.key || "").toLowerCase();
+      return (
+        en.includes(trimmed) || am.includes(trimmed) || key.includes(trimmed)
+      );
+    });
+  }, [allItems, searchTerm]);
+
+  const paginatedItems = useMemo(() => {
+    const start = pageIndex * pageSize;
+    return filteredItems.slice(start, start + pageSize);
+  }, [filteredItems, pageIndex, pageSize]);
+
+  // Track whichever query is actually feeding the table — picking a unit used
+  // to leave the previous unit's rows on screen with no loading state.
+  const isLoadingList = showingAllUnits ? isLoading : isLoadingPosition;
+  const isErrorList = showingAllUnits ? isError : isErrorPosition;
+
+  const exportTypes = () => {
+    setIsExporting(true);
+    positionTypeService
+      .getAll({ take: 3000 })
+      .then((allPositionKeys) => {
+        const positionTypeKeys = allPositionKeys.data?.items?.map((p) => p.key);
+
+        if (!positionTypeKeys?.length) {
+          toast.error(t("contentManagement.exportFailed"));
+          return;
+        }
+
+        // One key per line, downloaded as a plain text file.
+        const blob = new Blob([positionTypeKeys.join("\n")], {
+          type: "text/plain",
+        });
+        const link = document.createElement("a");
+        link.href = URL.createObjectURL(blob);
+        link.download = "position_keys.txt";
+        link.click();
+        URL.revokeObjectURL(link.href);
+      })
+      .catch(() => {
+        toast.error(t("contentManagement.exportFailed"));
+      })
+      .finally(() => {
+        setIsExporting(false);
+      });
+  };
+
+  return (
+    <div className="p-6 space-y-6">
+      <Card className="py-0 col-span-2 shadow-none border-none bg-transparent px-0">
+        <CardHeader className="flex flex-row justify-between items-center px-0">
+          <CardTitle className="text-xl font-semibold ">
+            {t("contentManagement.permissionType")}
+          </CardTitle>
+          <Button onClick={exportTypes} disabled={isExporting}>
+            {isExporting
+              ? t("contentManagement.exporting")
+              : t("contentManagement.exportTypes")}
+          </Button>
+        </CardHeader>
+        {!!unitsResponse?.data?.items?.length && (
+          <div className="mb-4 w-1/2">
+            <label className="block text-sm font-medium text-gray-700">
+              {t("organization.selectUnit")}
+            </label>
+            <Select
+              value={selectedUnitId}
+              onValueChange={(value) => setSelectedUnitId(value)}>
+              <SelectTrigger className="mt-1 block w-full border-gray-300 rounded-md shadow-sm focus:ring-primary-500 focus:border-primary-500 sm:text-sm [&>span]:truncate">
+                <SelectValue placeholder={t("organization.selectUnit")} />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem key="all" value="All">
+                  {t("common.all")}
+                </SelectItem>
+                {unitsResponse.data.items.map((unit: UnitDto) => (
+                  <SelectItem key={unit.id} value={unit.id}>
+                    <span className="block truncate max-w-70">
+                      {unit.name.en || unit.name.am}
+                    </span>
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
+        )}
+        {isUnitsError && (
+          <p className="mb-4 text-sm text-red-500">
+            {t("organization.errorLoadingUnits")}
+          </p>
+        )}
+        <CardContent className="px-0">
+          {isLoadingList ? (
+            <div className="py-10 text-center text-muted-foreground">
+              {t("common.loading")}
+            </div>
+          ) : isErrorList ? (
+            <div className="py-10 text-center text-red-500">
+              {t("contentManagement.failedToLoadPositionTypes")}
+            </div>
+          ) : (
+            <AdvancedTable
+              columns={columns}
+              data={paginatedItems}
+              tableName="Positions"
+              toolBarPosition="right"
+              itemCount={filteredItems.length}
+              onGlobalFilterChange={setSearchTerm}
+              extraToolbar={
+                <Link to="/user-management/position-management/new">
+                  <Button className="px-5 py-2 rounded-md text-sm font-medium shadow-md">
+                    <Plus className="w-4 h-4 mr-2" />
+                    {t("contentManagement.newPermission")}
+                  </Button>
+                </Link>
+              }
+              pageIndex={pageIndex}
+              onPageChange={handlePageChange}
+              nextFunction={() => handlePageChange(pageIndex + 1)}
+              prevFunction={() => handlePageChange(Math.max(pageIndex - 1, 0))}
+            />
+          )}
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionTypeActions.tsx b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionTypeActions.tsx
index 32613a0ea..1a2b829d6 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionTypeActions.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionTypeActions.tsx
@@ -1,393 +1,251 @@
-import { useState } from "react";
-import { useNavigate } from "react-router-dom";
-import { PositionTypeDto } from "@/user-management/dto/positions/positionType";
-
-import {
-  DropdownMenu,
-  DropdownMenuTrigger,
-  DropdownMenuContent,
-  DropdownMenuLabel,
-  DropdownMenuItem,
-} from "@/shared/common/ui/dropdown-menu";
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from "@/shared/common/ui/alert-dialog";
-
-import { Button } from "@/shared/common/ui/button";
-import { MoreVertical, Edit, Eye, Trash2, Pencil } from "lucide-react";
-import { t } from "i18next";
-import PositionTypeMigrationModal from "./PostionTypeMigration";
-import { CreatePositionForm } from "./CreatePositionForm";
-import { toast } from "sonner";
-import { useLocalizedName } from "@/shared/common/localizedName";
-import { positionTypeService } from "@/user-management/services/api/positionTypesService";
-import { useErrorHandler } from "@/shared/hooks/useErrorHandler";
-import { usePositionTypeConfiguration } from "@/user-management/hooks/usePostionType";
-import { Switch } from "@/shared/common/ui/switch";
-import { PositionTypeConfigurationDto } from "@/user-management/services/api/positionTypeConfigurationService";
-import { useQueryClient } from "@tanstack/react-query";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from "@/shared/common/ui/dialog";
-
-interface PositionTypeResponse {
-  items: PositionTypeDto[];
-  count: number;
-}
-
-type ActionsCellProps = {
-  row: PositionTypeDto | PositionTypeConfigurationDto;
-  globalPositionTypes?: PositionTypeResponse;
-  onDelete?: () => void | Promise<void>;
-  onEdit?: () => void | Promise<void>;
-  onToggle?: (
-    positionTypeId: string,
-    checked: boolean,
-    field: "canReceiveRecord" | "canAssignRecord" | "canCreateBankRecord",
-  ) => void | Promise<void>;
-  isGlobal?: boolean; // true when viewing "All" units — hide toggle
-};
-
-const PositionTypeActionsCell: React.FC<ActionsCellProps> = ({
-  row,
-  globalPositionTypes,
-  onDelete,
-  onEdit,
-  onToggle,
-  isGlobal = false,
-}) => {
-  const navigate = useNavigate();
-  const [dropdownOpen, setDropdownOpen] = useState(false);
-  const [showMigrateDialog, setShowMigrateDialog] = useState(false);
-  const [showEditDialog, setShowEditDialog] = useState(false);
-  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-  const [isDeleting, setIsDeleting] = useState(false);
-  const localizedName = useLocalizedName();
-  const { handleError } = useErrorHandler(t);
-  const queryClient = useQueryClient();
-  // Use row.id as the positionTypeId for the configuration lookup
-
-  const {
-    configurations,
-    isLoadingConfigurations,
-    updateConfiguration,
-    isUpdatingConfiguration,
-  } = usePositionTypeConfiguration(
-    row?.id ?? null, // 👈 pass row.id as unitId
-  );
-
-  const configItem = configurations[0];
-  const isCanReceiveRecord = configItem?.canReceiveRecord ?? false;
-  const isCanAssignRecord = configItem?.canAssignRecord ?? false;
-  const isCanCreateBankRecord = configItem?.canCreateBankRecord ?? false;
-
-  const invalidateConfig = () => {
-    queryClient.invalidateQueries({
-      queryKey: ["positionTypeConfigurations", row.id],
-    });
-    queryClient.invalidateQueries({
-      queryKey: ["positionTypeConfiguration", row.id],
-    });
-  };
-
-  // Create position type options from globalPositionTypes - only those WITHOUT unitId
-  const positionTypeOptions =
-    globalPositionTypes?.items
-      .filter((item) => !item.unitId)
-      .map((item) => ({
-        label: localizedName(item.name),
-        value: item.id,
-      })) || [];
-
-  // Only show migrate/delete actions if current row has a unitId
-  const canBeModified = !!row.unitId;
-
-  const handleView = () => {
-    navigate(`/user-management/position-management/edit/${row.id}`);
-  };
-
-  const handleMigrate = (e: Event) => {
-    e.preventDefault();
-    setDropdownOpen(false);
-    setShowMigrateDialog(true);
-  };
-
-  const handleEdit = (e: Event) => {
-    e.preventDefault();
-    setDropdownOpen(false);
-    setShowEditDialog(true);
-  };
-
-  const handleDelete = async () => {
-    try {
-      setIsDeleting(true);
-      await positionTypeService.delete(row.id);
-      toast.success(t("common.DeletedSuccessfully"));
-      setShowDeleteDialog(false);
-      if (onDelete) {
-        await onDelete();
-      }
-    } catch (error) {
-      handleError(error);
-      toast.error(t("common.FailedToDelete"));
-    } finally {
-      setIsDeleting(false);
-    }
-  };
-
-  const handleToggleChange = async (checked: boolean) => {
-    if (isGlobal) return;
-    try {
-      if (configItem?.id) {
-        await updateConfiguration({
-          id: configItem.id,
-          payload: {
-            organizationId: configItem.organizationId,
-            positionTypeId: configItem.positionTypeId,
-            timeframe: configItem.timeframe,
-            canReceiveRecord: checked,
-          },
-        });
-      } else {
-        await onToggle?.(row.id, checked, "canReceiveRecord");
-      }
-      toast.success(t("incomingRecord.UpdatedSuccessfully"));
-      invalidateConfig();
-    } catch (error) {
-      handleError(error);
-      toast.error(t("incomingRecord.FailedToUpdate"));
-    }
-  };
-
-  const handleAssignToggleChange = async (checked: boolean) => {
-    if (isGlobal) return;
-    try {
-      if (configItem?.id) {
-        await updateConfiguration({
-          id: configItem.id,
-          payload: {
-            organizationId: configItem.organizationId,
-            positionTypeId: configItem.positionTypeId,
-            timeframe: configItem.timeframe,
-            canAssignRecord: checked,
-          },
-        });
-      } else {
-        await onToggle?.(row.id, checked, "canAssignRecord");
-      }
-      toast.success(t("incomingRecord.UpdatedSuccessfully"));
-      invalidateConfig();
-    } catch (error) {
-      handleError(error);
-      toast.error(t("incomingRecord.FailedToUpdate"));
-    }
-  };
-
-  const handleCreateBankRecordToggleChange = async (checked: boolean) => {
-    if (isGlobal) return;
-    try {
-      if (configItem?.id) {
-        await updateConfiguration({
-          id: configItem.id,
-          payload: {
-            organizationId: configItem.organizationId,
-            positionTypeId: configItem.positionTypeId,
-            timeframe: configItem.timeframe,
-            canCreateBankRecord: checked,
-          },
-        });
-      } else {
-        await onToggle?.(row.id, checked, "canCreateBankRecord");
-      }
-      toast.success(t("incomingRecord.UpdatedSuccessfully"));
-      invalidateConfig();
-    } catch (error) {
-      handleError(error);
-      toast.error(t("incomingRecord.FailedToUpdate"));
-    }
-  };
-  const rowName = "name" in row ? row.name : { am: "", en: "" };
-  const isPositionType = "name" in row && "key" in row;
-
-  return (
-    <>
-      <DropdownMenu open={dropdownOpen} onOpenChange={setDropdownOpen}>
-        <DropdownMenuTrigger asChild>
-          <Button variant="ghost" className="h-8 w-8 p-0">
-            <MoreVertical className="h-4 w-4" />
-            <span className="sr-only">Open actions menu</span>
-          </Button>
-        </DropdownMenuTrigger>
-
-        <DropdownMenuContent
-          align="end"
-          onInteractOutside={(e) => {
-            const target = e.target as HTMLElement;
-            if (!target.closest('[role="dialog"]')) {
-              setDropdownOpen(false);
-            }
-          }}>
-          <DropdownMenuLabel>Actions</DropdownMenuLabel>
-
-          {canBeModified && (
-            <DropdownMenuItem
-              onSelect={handleMigrate}
-              className="cursor-pointer hover:!text-primary-700 !bg-transparent !transition-colors duration-200">
-              <Edit className="mr-2 h-4 w-4 group-hover:text-white transition-colors duration-200" />
-              <span> {t("common.Migrate")}</span>
-            </DropdownMenuItem>
-          )}
-
-          {canBeModified && isPositionType && (
-            <DropdownMenuItem
-              onSelect={handleEdit}
-              className="cursor-pointer hover:!text-primary-700 !bg-transparent !transition-colors duration-200">
-              <Pencil className="mr-2 h-4 w-4 group-hover:text-white transition-colors duration-200" />
-              <span>{t("common.Edit")}</span>
-            </DropdownMenuItem>
-          )}
-
-          <DropdownMenuItem
-            onSelect={handleView}
-            className="cursor-pointer hover:!text-primary-700 !bg-transparent !transition-colors duration-200">
-            <Eye className="mr-2 h-4 w-4 group-hover:text-white transition-colors duration-200" />
-            <span>{t("common.View")}</span>
-          </DropdownMenuItem>
-
-          {canBeModified && (
-            <DropdownMenuItem
-              onSelect={() => {
-                setDropdownOpen(false);
-                setShowDeleteDialog(true);
-              }}
-              className="cursor-pointer hover:!text-red-500 !bg-transparent !transition-colors duration-200">
-              <Trash2 className="mr-2 h-4 w-4 group-hover:text-white transition-colors duration-200" />
-              <span>{t("common.Delete")}</span>
-            </DropdownMenuItem>
-          )}
-
-          {/* Toggle moved here from ToggleCell */}
-          {!isGlobal && (
-            <div className="px-2 py-2 border-t mt-1">
-              <div className="flex items-center justify-between">
-                <span className="text-sm">
-                  {t("contentManagement.CanReceiveRecord")}
-                </span>
-                <Switch
-                  checked={isCanReceiveRecord}
-                  disabled={isLoadingConfigurations || isUpdatingConfiguration}
-                  onCheckedChange={handleToggleChange}
-                />
-              </div>
-            </div>
-          )}
-          {!isGlobal && (
-            <div className="px-2 py-2 border-t mt-1">
-              <div className="flex items-center justify-between">
-                <span className="text-sm">
-                  {t("contentManagement.CanAssignRecord")}
-                </span>
-                <Switch
-                  checked={isCanAssignRecord}
-                  disabled={isLoadingConfigurations || isUpdatingConfiguration}
-                  onCheckedChange={handleAssignToggleChange}
-                />
-              </div>
-            </div>
-          )}
-          {!isGlobal && (
-            <div className="px-2 py-2 border-t mt-1">
-              <div className="flex items-center justify-between gap-4">
-                <span className="text-sm">
-                  {t("contentManagement.CanCreateBankRecord")}
-                </span>
-                <Switch
-                  checked={isCanCreateBankRecord}
-                  disabled={isLoadingConfigurations || isUpdatingConfiguration}
-                  onCheckedChange={handleCreateBankRecordToggleChange}
-                />
-              </div>
-            </div>
-          )}
-        </DropdownMenuContent>
-      </DropdownMenu>
-
-      {showMigrateDialog && (
-        <PositionTypeMigrationModal
-          isOpen={showMigrateDialog}
-          onClose={() => {
-            setShowMigrateDialog(false);
-          }}
-          toId={row.id}
-          toName={localizedName(rowName)}
-          positionTypeOptions={positionTypeOptions}
-        />
-      )}
-
-      <Dialog open={showEditDialog} onOpenChange={setShowEditDialog}>
-        <DialogContent className="sm:max-w-3xl max-h-[90vh] flex flex-col p-6">
-          <DialogHeader className="pb-4">
-            <DialogTitle>{t("common.Edit")}</DialogTitle>
-          </DialogHeader>
-          <div className="flex-1 overflow-y-auto pr-2 min-h-0">
-            {isPositionType && showEditDialog && (
-              <CreatePositionForm
-                key={row.id + "-edit"}
-                mode="edit"
-                positionTypeId={row.id}
-                initialValues={{
-                  nameAm: row.name.am,
-                  nameEn: row.name.en,
-                  unitId: row.unitId,
-                  key: row.key,
-                }}
-                onSuccess={async () => {
-                  setShowEditDialog(false);
-                  if (onEdit) {
-                    await onEdit();
-                  }
-                }}
-                onCancel={() => setShowEditDialog(false)}
-              />
-            )}
-          </div>
-        </DialogContent>
-      </Dialog>
-
-      <AlertDialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>{t("common.ConfirmDelete")}</AlertDialogTitle>
-            <AlertDialogDescription>
-              {t("common.DeleteConfirmationMessage", {
-                defaultValue: `Are you sure you want to delete "${localizedName(rowName)}"? This action cannot be undone.`,
-              })}
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel>{t("common.Cancel")}</AlertDialogCancel>
-            <AlertDialogAction
-              onClick={handleDelete}
-              disabled={isDeleting}
-              className="bg-red-500 hover:bg-red-600">
-              {isDeleting ? t("common.Deleting") : t("common.Delete")}
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    </>
-  );
-};
-
-export default PositionTypeActionsCell;
+import { useState } from "react";
+import { useNavigate } from "react-router-dom";
+import { PositionTypeDto } from "@/user-management/dto/positions/positionType";
+
+import {
+  DropdownMenu,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuLabel,
+  DropdownMenuItem,
+} from "@/shared/common/ui/dropdown-menu";
+
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from "@/shared/common/ui/alert-dialog";
+
+import { Button } from "@/shared/common/ui/button";
+import { MoreVertical, Edit, Eye, Trash2, Pencil } from "lucide-react";
+import { t } from "i18next";
+import PositionTypeMigrationModal from "./PostionTypeMigration";
+import { CreatePositionForm } from "./CreatePositionForm";
+import { useLocalizedName } from "@/shared/common/localizedName";
+import { usePositionTypes } from "@/user-management/hooks/usePositionTypes";
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+} from "@/shared/common/ui/dialog";
+
+interface PositionTypeResponse {
+  items: PositionTypeDto[];
+  count: number;
+}
+
+type ActionsCellProps = {
+  row: PositionTypeDto;
+  globalPositionTypes?: PositionTypeResponse;
+  onDelete?: () => void | Promise<void>;
+  onEdit?: () => void | Promise<void>;
+};
+
+/*
+ * TODO(record-toggles): this menu used to carry CanReceiveRecord /
+ * CanAssignRecord / CanCreateBankRecord switches. They never worked. IAM's
+ * PositionTypeConfiguration entity only has { id, organizationId,
+ * positionTypeId, timeframe } — verified against every local build (0.7.4
+ * through 0.7.12) and the live swagger. canAssignRecord and
+ * canCreateBankRecord do not exist anywhere in the IAM package, and the global
+ * ValidationPipe runs with forbidNonWhitelisted, so every write 400'd. The
+ * reads were broken too: the list route filters on organizationId (the repo is
+ * built as TExtraCrudRepository(repo, "organizationId")) while the UI passed a
+ * positionTypeId, so it always came back empty.
+ *
+ * The flag that does exist is PositionConfiguration.canReceiveRecord, keyed by
+ * positionId — a per-position setting served by /api/position-configurations,
+ * not a per-position-type one. Restoring this needs either that endpoint and a
+ * position-level UI, or new columns on PositionTypeConfiguration in IAM.
+ */
+const PositionTypeActionsCell: React.FC<ActionsCellProps> = ({
+  row,
+  globalPositionTypes,
+  onDelete,
+  onEdit,
+}) => {
+  const navigate = useNavigate();
+  const [dropdownOpen, setDropdownOpen] = useState(false);
+  const [showMigrateDialog, setShowMigrateDialog] = useState(false);
+  const [showEditDialog, setShowEditDialog] = useState(false);
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+  const localizedName = useLocalizedName();
+  const { deletePositionType } = usePositionTypes();
+
+  // Create position type options from globalPositionTypes - only those WITHOUT unitId
+  const positionTypeOptions =
+    globalPositionTypes?.items
+      .filter((item) => !item.unitId)
+      .map((item) => ({
+        label: localizedName(item.name),
+        value: item.id,
+      })) || [];
+
+  // Only show migrate/delete actions if current row has a unitId
+  const canBeModified = !!row.unitId;
+
+  const handleView = () => {
+    navigate(`/user-management/position-management/edit/${row.id}`);
+  };
+
+  const handleMigrate = (e: Event) => {
+    e.preventDefault();
+    setDropdownOpen(false);
+    setShowMigrateDialog(true);
+  };
+
+  const handleEdit = (e: Event) => {
+    e.preventDefault();
+    setDropdownOpen(false);
+    setShowEditDialog(true);
+  };
+
+  // Goes through the mutation rather than the service directly, so the cache is
+  // invalidated and IAM's 403 for built-in types reaches the user.
+  const handleDelete = async () => {
+    try {
+      await deletePositionType.mutateAsync(row.id);
+      setShowDeleteDialog(false);
+      await onDelete?.();
+    } catch {
+      // reported by the mutation's onError
+    }
+  };
+
+  return (
+    <>
+      <DropdownMenu open={dropdownOpen} onOpenChange={setDropdownOpen}>
+        <DropdownMenuTrigger asChild>
+          <Button variant="ghost" className="h-8 w-8 p-0">
+            <MoreVertical className="h-4 w-4" />
+            <span className="sr-only">Open actions menu</span>
+          </Button>
+        </DropdownMenuTrigger>
+
+        <DropdownMenuContent
+          align="end"
+          onInteractOutside={(e) => {
+            const target = e.target as HTMLElement;
+            if (!target.closest('[role="dialog"]')) {
+              setDropdownOpen(false);
+            }
+          }}>
+          <DropdownMenuLabel>{t("userRecord.Actions")}</DropdownMenuLabel>
+
+          {canBeModified && (
+            <DropdownMenuItem
+              onSelect={handleMigrate}
+              className="cursor-pointer hover:!text-primary-700 !bg-transparent !transition-colors duration-200">
+              <Edit className="mr-2 h-4 w-4 group-hover:text-white transition-colors duration-200" />
+              <span> {t("common.Migrate")}</span>
+            </DropdownMenuItem>
+          )}
+
+          {canBeModified && (
+            <DropdownMenuItem
+              onSelect={handleEdit}
+              className="cursor-pointer hover:!text-primary-700 !bg-transparent !transition-colors duration-200">
+              <Pencil className="mr-2 h-4 w-4 group-hover:text-white transition-colors duration-200" />
+              <span>{t("common.Edit")}</span>
+            </DropdownMenuItem>
+          )}
+
+          <DropdownMenuItem
+            onSelect={handleView}
+            className="cursor-pointer hover:!text-primary-700 !bg-transparent !transition-colors duration-200">
+            <Eye className="mr-2 h-4 w-4 group-hover:text-white transition-colors duration-200" />
+            <span>{t("common.View")}</span>
+          </DropdownMenuItem>
+
+          {canBeModified && (
+            <DropdownMenuItem
+              onSelect={() => {
+                setDropdownOpen(false);
+                setShowDeleteDialog(true);
+              }}
+              className="cursor-pointer hover:!text-red-500 !bg-transparent !transition-colors duration-200">
+              <Trash2 className="mr-2 h-4 w-4 group-hover:text-white transition-colors duration-200" />
+              <span>{t("common.Delete")}</span>
+            </DropdownMenuItem>
+          )}
+        </DropdownMenuContent>
+      </DropdownMenu>
+
+      {showMigrateDialog && (
+        <PositionTypeMigrationModal
+          isOpen={showMigrateDialog}
+          onClose={() => {
+            setShowMigrateDialog(false);
+          }}
+          toId={row.id}
+          toName={localizedName(row.name)}
+          positionTypeOptions={positionTypeOptions}
+        />
+      )}
+
+      <Dialog open={showEditDialog} onOpenChange={setShowEditDialog}>
+        <DialogContent className="sm:max-w-3xl max-h-[90vh] flex flex-col p-6">
+          <DialogHeader className="pb-4">
+            <DialogTitle>{t("common.Edit")}</DialogTitle>
+          </DialogHeader>
+          <div className="flex-1 overflow-y-auto pr-2 min-h-0">
+            {showEditDialog && (
+              <CreatePositionForm
+                key={row.id + "-edit"}
+                mode="edit"
+                positionTypeId={row.id}
+                initialValues={{
+                  nameAm: row.name.am,
+                  nameEn: row.name.en,
+                  unitId: row.unitId ?? "",
+                  key: row.key,
+                }}
+                onSuccess={async () => {
+                  setShowEditDialog(false);
+                  if (onEdit) {
+                    await onEdit();
+                  }
+                }}
+                onCancel={() => setShowEditDialog(false)}
+              />
+            )}
+          </div>
+        </DialogContent>
+      </Dialog>
+
+      <AlertDialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle>{t("common.ConfirmDelete")}</AlertDialogTitle>
+            <AlertDialogDescription>
+              {t("common.DeleteConfirmationMessage", {
+                name: localizedName(row.name),
+              })}
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel disabled={deletePositionType.isPending}>
+              {t("common.Cancel")}
+            </AlertDialogCancel>
+            <AlertDialogAction
+              onClick={handleDelete}
+              disabled={deletePositionType.isPending}
+              className="bg-red-500 hover:bg-red-600">
+              {deletePositionType.isPending
+                ? t("common.Deleting")
+                : t("common.Delete")}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+    </>
+  );
+};
+
+export default PositionTypeActionsCell;
diff --git a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionTypeColumnDefn.tsx b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionTypeColumnDefn.tsx
index d5fcb509e..bcd73ae3f 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionTypeColumnDefn.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/components/position-management/PositionTypeColumnDefn.tsx
@@ -16,16 +16,9 @@ const NameCell = ({ name }: { name: PositionTypeDto["name"] }) => {
 };
 
 export const createPositionTypeColumns = (
-  _positionTypeResponse?: PositionTypeResponse,
   globalPositionTypes?: PositionTypeResponse,
   onDelete?: () => void | Promise<void>,
   onEdit?: () => void | Promise<void>,
-  onToggle?: (
-    positionTypeId: string,
-    checked: boolean,
-    field: "canReceiveRecord" | "canAssignRecord" | "canCreateBankRecord",
-  ) => void | Promise<void>,
-  isGlobal?: boolean,
 ): ColumnDef<PositionTypeDto>[] => [
   {
     accessorKey: "name",
@@ -64,8 +57,6 @@ export const createPositionTypeColumns = (
         globalPositionTypes={globalPositionTypes}
         onDelete={onDelete}
         onEdit={onEdit}
-        onToggle={onToggle}
-        isGlobal={isGlobal}
       />
     ),
   },
diff --git a/apps/edr-freight-web/backoffice/src/user-management/dto/positions/positionType.ts b/apps/edr-freight-web/backoffice/src/user-management/dto/positions/positionType.ts
index 3f76be9f7..c2e79844f 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/dto/positions/positionType.ts
+++ b/apps/edr-freight-web/backoffice/src/user-management/dto/positions/positionType.ts
@@ -5,10 +5,14 @@ export interface PositionTypeDto {
     en: string;
   };
   key: string;
-  unitId: string;
-  canReceiveRecord: boolean;
-  canCreateBankRecord?: boolean;
-  canAssignRecord: boolean;
+  /**
+   * Null for the built-in ("common") types, which `isSystem` marks and which
+   * every unit can use. IAM has no organizationId on a position type — the
+   * owning organization is only reachable via unit -> organizationId.
+   */
+  unitId: string | null;
+  /** Built-in type. IAM rejects update/delete on these with a 403. */
+  isSystem?: boolean;
   createdAt: string;
   updatedAt: string;
 }
diff --git a/apps/edr-freight-web/backoffice/src/user-management/hooks/usePositionTypes.ts b/apps/edr-freight-web/backoffice/src/user-management/hooks/usePositionTypes.ts
index a62ef26d6..8f102532d 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/hooks/usePositionTypes.ts
+++ b/apps/edr-freight-web/backoffice/src/user-management/hooks/usePositionTypes.ts
@@ -1,4 +1,9 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import {
+  QueryClient,
+  useMutation,
+  useQuery,
+  useQueryClient,
+} from "@tanstack/react-query";
 import {
   CreatePositionTypePayload,
   PositionRequest,
@@ -23,10 +28,22 @@ interface positionParams {
 interface UsePositionTypeManagerProps {
   id?: string;
   unitId?: string;
-  organizationId?: string;
   params?: positionParams; // 👈 we expected query params to be passed like this
 }
 
+/**
+ * Every cache key this hook writes under. React Query matches key prefixes
+ * element by element, so `["position-type"]` does NOT reach
+ * `["position-types-common", ...]` — each root has to be listed. Anything that
+ * mutates a position type should call this rather than hand-picking keys, or
+ * the department pickers (which read the "-common" queries) go stale.
+ */
+export const invalidatePositionTypeQueries = (queryClient: QueryClient) => {
+  ["position-types", "position-type", "position-types-common"].forEach(
+    (root) => queryClient.invalidateQueries({ queryKey: [root] }),
+  );
+};
+
 export const usePositionTypes = ({
   id,
   params = {
@@ -35,11 +52,11 @@ export const usePositionTypes = ({
     orderBy: "createdAt:Desc",
   },
   unitId,
-  organizationId,
 }: UsePositionTypeManagerProps = {}) => {
   const queryClient = useQueryClient();
   const { t } = useTranslation();
   const { handleError } = useErrorHandler(t);
+  const invalidateAll = () => invalidatePositionTypeQueries(queryClient);
   const { data, isLoading, isError, refetch } = useQuery({
     queryKey: ["position-types", params],
     queryFn: () => positionTypeService.getAll(params).then((res) => res.data),
@@ -70,38 +87,6 @@ export const usePositionTypes = ({
     enabled: !!unitId,
   });
 
-  // Position types by organization ID
-  const {
-    data: positionTypeByOrgId,
-    isLoading: isLoadingOrgPosition,
-    isError: isErrorOrgPosition,
-    refetch: refetchOrgPosition,
-  } = useQuery<PositionTypesListResponse | undefined>({
-    queryKey: ["position-type-org", organizationId, params],
-    queryFn: async () => {
-      if (!organizationId) return undefined;
-      const res = await positionTypeService.getByOrganizationId(organizationId, params);
-      return res.data as PositionTypesListResponse | undefined;
-    },
-    enabled: !!organizationId,
-  });
-
-  // Common types with organization ID (includes both org-specific and common types)
-  const {
-    data: commonPositionTypesByOrgId,
-    isLoading: isLoadingCommonOrgTypes,
-    isError: isErrorCommonOrgTypes,
-    refetch: refetchCommonOrgTypes,
-  } = useQuery<PositionTypesListResponse | undefined>({
-    queryKey: ["position-types-common-org", organizationId, params],
-    queryFn: async () => {
-      if (!organizationId) return undefined;
-      const res = await positionTypeService.getCommonTypesByOrganizationId(organizationId, params);
-      return res.data as PositionTypesListResponse | undefined;
-    },
-    enabled: !!organizationId,
-  });
-
   // Common types with unit ID (includes both unit-specific and common types)
   const {
     data: commonPositionTypes,
@@ -123,15 +108,16 @@ export const usePositionTypes = ({
     mutationFn: (payload: CreatePositionTypePayload) =>
       positionTypeService.create(payload),
     onSuccess: () => {
-      toast.success("Position type created");
-      queryClient.invalidateQueries({ queryKey: ["position-types"] });
+      toast.success(t("contentManagement.positionTypeCreated"));
+      invalidateAll();
     },
     onError: (error) => {
       handleError(error);
     },
   });
 
-  // Update
+  // Update. IAM answers 403 `position_type_not_allowed_to_update` for built-in
+  // (isSystem) types, so the error has to reach the user.
   const updatePositionType = useMutation({
     mutationFn: ({
       id,
@@ -141,11 +127,12 @@ export const usePositionTypes = ({
       data: UpdatePositionTypePayload;
     }) => positionTypeService.update(id, data),
     onSuccess: () => {
-      toast.success("Position type updated");
-      queryClient.invalidateQueries({ queryKey: ["position-types"] });
-      queryClient.invalidateQueries({ queryKey: ["position-type", id] });
+      toast.success(t("contentManagement.positionTypeUpdated"));
+      invalidateAll();
+    },
+    onError: (error) => {
+      handleError(error);
     },
-    onError: () => {},
   });
 
   //update positon from to
@@ -153,30 +140,32 @@ export const usePositionTypes = ({
     mutationFn: ({ toId, fromId }: { toId: string; fromId: string }) =>
       positionTypeService.updateFromto(toId, fromId),
     onSuccess: () => {
-      toast.success("Position type migration updated");
-      queryClient.invalidateQueries({ queryKey: ["position-types-to"] });
-      queryClient.invalidateQueries({ queryKey: ["position-type", id] });
+      toast.success(t("contentManagement.positionTypeMigrated"));
+      invalidateAll();
+    },
+    onError: (error) => {
+      handleError(error);
     },
-    onError: () => {},
   });
   //update all postions
   const migratePositionsByPositions = useMutation({
     mutationFn: ({ id, data }: { id: string; data: PositionRequest }) =>
       positionTypeService.updateByPostion(id, data),
     onSuccess: () => {
-      toast.success("Position type migration updated");
-      queryClient.invalidateQueries({ queryKey: ["position-types-migration"] });
-      queryClient.invalidateQueries({ queryKey: ["position-type", id] });
+      toast.success(t("contentManagement.positionTypeMigrated"));
+      invalidateAll();
+    },
+    onError: (error) => {
+      handleError(error);
     },
-    onError: () => {},
   });
 
-  // Delete
+  // Delete. Also 403s for built-in types.
   const deletePositionType = useMutation({
     mutationFn: (id: string) => positionTypeService.delete(id),
     onSuccess: () => {
-      toast.success("Position type deleted");
-      queryClient.invalidateQueries({ queryKey: ["position-types"] });
+      toast.success(t("contentManagement.positionTypeDeleted"));
+      invalidateAll();
     },
     onError: (error) => {
       handleError(error);
@@ -205,16 +194,6 @@ export const usePositionTypes = ({
     refetchPosition,
     isErrorPosition,
     isLoadingPosition,
-    // organization-based position types
-    positionTypeByOrgId,
-    refetchOrgPosition,
-    isErrorOrgPosition,
-    isLoadingOrgPosition,
-    // common types with organization ID
-    commonPositionTypesByOrgId,
-    refetchCommonOrgTypes,
-    isErrorCommonOrgTypes,
-    isLoadingCommonOrgTypes,
     // common types with unit ID
     commonPositionTypes: commonPositionTypes?.items ?? [],
     isLoadingCommonTypes,
diff --git a/apps/edr-freight-web/backoffice/src/user-management/pages/position-management/index.tsx b/apps/edr-freight-web/backoffice/src/user-management/pages/position-management/index.tsx
index 57d7a1898..a052caa11 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/pages/position-management/index.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/pages/position-management/index.tsx
@@ -1,13 +1,7 @@
 import PositionManagement from "@/user-management/components/position-management/PositionLists";
-import { t } from "i18next";
 
 const PositionManagementPage = () => {
-  return (
-    <div className="p-6">
-      <h2 className="text-2xl font-bold mb-4">{t("contentManagement.permissionManagement")}</h2>
-      <PositionManagement />
-    </div>
-  );
+  return <PositionManagement />;
 };
 
 export default PositionManagementPage;
diff --git a/apps/edr-freight-web/backoffice/src/user-management/services/api/positionService.ts b/apps/edr-freight-web/backoffice/src/user-management/services/api/positionService.ts
index 9e7e4c1d4..84782b38f 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/services/api/positionService.ts
+++ b/apps/edr-freight-web/backoffice/src/user-management/services/api/positionService.ts
@@ -21,7 +21,7 @@ export interface PositionPayload {
   organizationId: string;
   parentPositionId?: string;
   projectId?: string;
-  positionTypeId: string;
+  positionTypeId?: string;
 }
 export interface PositionQueryParams {
   orderBy?: string;
diff --git a/apps/edr-freight-web/backoffice/src/user-management/services/api/positionTypesService.ts b/apps/edr-freight-web/backoffice/src/user-management/services/api/positionTypesService.ts
index b3ac43ecd..450009fa7 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/services/api/positionTypesService.ts
+++ b/apps/edr-freight-web/backoffice/src/user-management/services/api/positionTypesService.ts
@@ -40,38 +40,25 @@ export const positionTypeService = {
   getById: (id: string): Promise<AxiosResponse<PositionTypeDto>> =>
     axiosInstance.get(`/position-types/${id}`, { headers: withHeaders() }),
 
+  // Types owned by one unit. IAM has no organization-scoped route — position
+  // types carry a unitId only, so scoping to an org means filtering by that
+  // org's units client-side.
   getByUnitId: (
-    id: string,
+    unitId: string,
     params?: Params,
   ): Promise<AxiosResponse<PositionTypesListResponse>> =>
-    axiosInstance.get(`/position-types/list/${id}`, {
-      headers: withHeaders(),
-      params,
-    }),
-
-  getByOrganizationId: (
-    id: string,
-    params?: Params,
-  ): Promise<AxiosResponse<PositionTypesListResponse>> =>
-    axiosInstance.get(`/position-types/list/${id}`, {
-      headers: withHeaders(),
-      params,
-    }),
-
-  getCommonTypesByOrganizationId: (
-    id: string,
-    params?: Params,
-  ): Promise<AxiosResponse<PositionTypesListResponse>> =>
-    axiosInstance.get(`/position-types/list-with-commons/${id}`, {
+    axiosInstance.get(`/position-types/list/${unitId}`, {
       headers: withHeaders(),
       params,
     }),
 
+  // WHERE isSystem = true OR unitId = :unitId — "commons" means the built-in
+  // types, not the ones with a null unitId.
   getCommonTypesById: (
-    id: string,
+    unitId: string,
     params: Params,
   ): Promise<AxiosResponse<PositionTypesListResponse>> =>
-    axiosInstance.get(`/position-types/list-with-commons/${id}`, {
+    axiosInstance.get(`/position-types/list-with-commons/${unitId}`, {
       headers: withHeaders(),
       params,
     }),
diff --git a/apps/edr-freight-web/backoffice/src/user-management/userManagement/forms/AddDepartmentForm.tsx b/apps/edr-freight-web/backoffice/src/user-management/userManagement/forms/AddDepartmentForm.tsx
index d16745327..872a82c9d 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/userManagement/forms/AddDepartmentForm.tsx
+++ b/apps/edr-freight-web/backoffice/src/user-management/userManagement/forms/AddDepartmentForm.tsx
@@ -48,8 +48,6 @@ export function AddDepartmentForm({
     if (!nameAm.trim())
       newErrors.nameAm = t("organization.amharicNameRequired");
     if (!key.trim()) newErrors.key = t("contentManagement.keyRequired");
-    if (!positionTypeId)
-      newErrors.positionTypeId = t("contentManagement.selectPosType");
 
     setErrors(newErrors);
     return Object.keys(newErrors).length === 0;
@@ -71,7 +69,7 @@ export function AddDepartmentForm({
       key: key.trim().toLowerCase().replace(/\s+/g, "-"),
       unitId,
       organizationId,
-      positionTypeId,
+      ...(positionTypeId ? { positionTypeId } : {}),
     };
 
     createPosition({
@@ -90,12 +88,11 @@ export function AddDepartmentForm({
   return (
     <form onSubmit={handleSubmit} className="space-y-4">
       <div className="space-y-2">
-        <Label htmlFor="positionType">{t("organization.positionTypes")}</Label>
+        <Label htmlFor="positionType">
+          {t("organization.positionTypes")} ({t("common.optional")})
+        </Label>
         <Select
-          onValueChange={(value) => {
-            setPositionTypeId(value);
-            setErrors((prev) => ({ ...prev, positionTypeId: "" }));
-          }}
+          onValueChange={setPositionTypeId}
           value={positionTypeId}
           disabled={isLoadingTypes}
         >
@@ -110,9 +107,6 @@ export function AddDepartmentForm({
             ))}
           </SelectContent>
         </Select>
-        {errors.positionTypeId && (
-          <p className="text-red-500 text-sm">{errors.positionTypeId}</p>
-        )}
       </div>
 
       <div className="space-y-2">
diff --git a/apps/edr-freight-web/backoffice/src/user-management/web-Management/TemplateSettingValues/services/templateSettingValueService.ts b/apps/edr-freight-web/backoffice/src/user-management/web-Management/TemplateSettingValues/services/templateSettingValueService.ts
index 78719b412..fbb3c7739 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/web-Management/TemplateSettingValues/services/templateSettingValueService.ts
+++ b/apps/edr-freight-web/backoffice/src/user-management/web-Management/TemplateSettingValues/services/templateSettingValueService.ts
@@ -8,7 +8,7 @@ import Cookies from "js-cookie";
 import { getEnvUrl } from "@/shared/config/env";
 
 const TENANT_ID = "adf98293-41ba-4bda-bdb4-70e30a70c1b7";
-const API_URL = getEnvUrl("VITE_RECORD_API_URL");
+const API_URL = getEnvUrl("VITE_RECORD_API_URL", false);
 
 const apiInstance = axios.create({
   baseURL: API_URL,
diff --git a/apps/edr-freight-web/backoffice/src/user-management/web-Management/services/templateService.ts b/apps/edr-freight-web/backoffice/src/user-management/web-Management/services/templateService.ts
index fdaa54197..35d4ed036 100644
--- a/apps/edr-freight-web/backoffice/src/user-management/web-Management/services/templateService.ts
+++ b/apps/edr-freight-web/backoffice/src/user-management/web-Management/services/templateService.ts
@@ -11,7 +11,7 @@ import Cookies from "js-cookie";
 import { getEnvUrl } from "@/shared/config/env";
 
 const TENANT_ID = "adf98293-41ba-4bda-bdb4-70e30a70c1b7";
-const API_URL = getEnvUrl("VITE_RECORD_API_URL");
+const API_URL = getEnvUrl("VITE_RECORD_API_URL", false);
 
 // Create axios instance for template API
 const apiInstance = axios.create({
diff --git a/apps/edr-freight-web/portal/src/App.tsx b/apps/edr-freight-web/portal/src/App.tsx
index 8bd7cc74f..72674363c 100644
--- a/apps/edr-freight-web/portal/src/App.tsx
+++ b/apps/edr-freight-web/portal/src/App.tsx
@@ -220,8 +220,14 @@ const sidebarItems: SidebarItem[] = [
 const App = () => {
   const navigate = useNavigate();
   const location = useLocation();
-  const { user, company, companyType, createProfile, isAuthenticated } =
-    useAuth();
+  const {
+    user,
+    company,
+    companyType,
+    createProfile,
+    reapplyProfile,
+    isAuthenticated,
+  } = useAuth();
 
   // Attribute replays and exceptions to the signed-in user (id/org only).
   useIdentify(user, company);
@@ -290,6 +296,7 @@ const App = () => {
                 companyProfiles={companyProfiles}
                 companyType={companyType}
                 onCreateProfile={createProfile}
+                onReapplyProfile={reapplyProfile}
               >
                 <OnboardingGate />
               </AppLayout>
diff --git a/apps/edr-freight-web/portal/src/components/AppLayout.tsx b/apps/edr-freight-web/portal/src/components/AppLayout.tsx
index 35641f9fc..411c00ce0 100644
--- a/apps/edr-freight-web/portal/src/components/AppLayout.tsx
+++ b/apps/edr-freight-web/portal/src/components/AppLayout.tsx
@@ -1,6 +1,8 @@
 import {
+  Alert,
   AppShell,
   Avatar,
+  Badge,
   Box,
   Button,
   Divider,
@@ -19,12 +21,14 @@ import {
 } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
 import {
+  Ban,
   ChevronDown,
   FileSignature,
   LogOut,
   Menu as MenuIcon,
   Moon,
   Plus,
+  RefreshCw,
   Search,
   Settings,
   Sun,
@@ -59,7 +63,13 @@ export interface AppLayoutProps {
   userName?: string;
   userEmail?: string;
   /** Operational profiles for the company — surfaced as reference chips in the account menu. */
-  companyProfiles?: { type: string; reference: string; status?: string }[];
+  companyProfiles?: {
+    id?: string;
+    type: string;
+    reference: string;
+    status?: string;
+    reviewNote?: string | null;
+  }[];
   /** Company type (e.g. "customer", "forwarder") — gates the "Add service" control. */
   companyType?: string | null;
   /** Create a new service profile of the given type (with business license). */
@@ -67,6 +77,11 @@ export interface AppLayoutProps {
     type: ServiceType,
     licenseFiles: File[],
   ) => Promise<SwitchResult> | void;
+  /** Resubmit a rejected service for approval, optionally replacing its license. */
+  onReapplyProfile?: (
+    profileId: string,
+    licenseFiles: File[],
+  ) => Promise<SwitchResult> | void;
   children: ReactNode;
 }
 
@@ -145,6 +160,7 @@ export function AppLayout({
   companyProfiles = [],
   companyType,
   onCreateProfile,
+  onReapplyProfile,
   children,
 }: AppLayoutProps) {
   const [mobileOpen, { toggle: toggleMobile }] = useDisclosure();
@@ -178,42 +194,86 @@ export function AppLayout({
   const profileExists = (type: ServiceType) =>
     companyProfiles.some((p) => p.type === type);
   const addableServices = CUSTOMER_SERVICES.filter((t) => !profileExists(t));
-  const canAddService = isCustomer && addableServices.length > 0;
+  // Rejected services can't be re-added (they exist), so they'd otherwise be
+  // invisible here — surface them for resubmission alongside addable ones.
+  const rejectedServices = isCustomer
+    ? companyProfiles.filter(
+        (p) =>
+          p.status === "rejected" &&
+          p.id &&
+          CUSTOMER_SERVICES.includes(p.type as ServiceType),
+      )
+    : [];
+  // Suspended services are also hidden by default (the profile exists) — surface
+  // them so the customer can appeal by resubmitting a fresh business license.
+  const suspendedServices = isCustomer
+    ? companyProfiles.filter(
+        (p) =>
+          p.status === "suspended" &&
+          p.id &&
+          CUSTOMER_SERVICES.includes(p.type as ServiceType),
+      )
+    : [];
+  const canManageServices =
+    isCustomer &&
+    (addableServices.length > 0 ||
+      rejectedServices.length > 0 ||
+      suspendedServices.length > 0);
 
   const [switching, setSwitching] = useState(false);
   const [createOpen, setCreateOpen] = useState(false);
   const [createTarget, setCreateTarget] = useState<ServiceType>("importer");
+  // Non-null while resubmitting a rejected/suspended service; null while creating a new one.
+  const [reapplyId, setReapplyId] = useState<string | null>(null);
+  // Status of the profile being resubmitted ("rejected" | "suspended") — drives
+  // the modal copy; null for a brand-new profile.
+  const [reapplyStatus, setReapplyStatus] = useState<string | null>(null);
+  // Reason the profile was suspended/rejected, surfaced in the modal.
+  const [reapplyNote, setReapplyNote] = useState<string | null>(null);
   const [licenseFiles, setLicenseFiles] = useState<File[]>([]);
   const [createError, setCreateError] = useState<string | null>(null);
 
-  const handleAddService = (type: ServiceType) => {
-    // Collect a business license, then create the profile.
+  const openServiceModal = (
+    type: ServiceType,
+    profile?: { id?: string; status?: string; reviewNote?: string | null },
+  ) => {
     setCreateTarget(type);
+    setReapplyId(profile?.id ?? null);
+    setReapplyStatus(profile?.status ?? null);
+    setReapplyNote(profile?.reviewNote ?? null);
     setLicenseFiles([]);
     setCreateError(null);
     setCreateOpen(true);
   };
 
+  const handleAddService = (type: ServiceType) => openServiceModal(type);
+
   const handleCreateConfirm = async () => {
-    if (licenseFiles.length === 0) {
+    const isReapply = reapplyId !== null;
+    // A new profile needs its license up front; a resubmit may reuse the old one.
+    if (!isReapply && licenseFiles.length === 0) {
       setCreateError("Please upload at least one business license file.");
       return;
     }
     setSwitching(true);
     setCreateError(null);
     try {
-      const res = await onCreateProfile?.(createTarget, licenseFiles);
+      const res = isReapply
+        ? await onReapplyProfile?.(reapplyId, licenseFiles)
+        : await onCreateProfile?.(createTarget, licenseFiles);
       if (res && !res.success) {
-        setCreateError(res.error?.message ?? "Failed to create profile");
+        setCreateError(res.error?.message ?? "Failed to submit service");
         return;
       }
       setCreateOpen(false);
+      setReapplyId(null);
     } finally {
       setSwitching(false);
     }
   };
 
   const serviceLabel = (m: ServiceType) => PROFILE_TYPE_LABELS[m] ?? m;
+  const isSuspendedAppeal = reapplyStatus === "suspended";
 
   const isItemActive = (item: SidebarItem) =>
     activePath === item.href.toLowerCase() ||
@@ -287,10 +347,10 @@ export function AppLayout({
 
           {/* Right: switch + search + bell + avatar */}
           <Group gap={10} wrap="nowrap" align="center">
-            {/* Add a service (customer companies that don't yet have all three) */}
-            {canAddService && (
+            {/* Add a service, or resubmit a rejected one (customer companies) */}
+            {canManageServices && (
               <Menu
-                width={220}
+                width={240}
                 position="bottom-end"
                 withinPortal
                 shadow="md"
@@ -313,16 +373,62 @@ export function AppLayout({
                   </Button>
                 </Menu.Target>
                 <Menu.Dropdown>
-                  <Menu.Label>Add a service</Menu.Label>
-                  {addableServices.map((type) => (
-                    <Menu.Item
-                      key={type}
-                      onClick={() => handleAddService(type)}
-                      leftSection={<Plus size={15} strokeWidth={1.8} />}
-                    >
-                      {serviceLabel(type)}
-                    </Menu.Item>
-                  ))}
+                  {addableServices.length > 0 && (
+                    <>
+                      <Menu.Label>Add a service</Menu.Label>
+                      {addableServices.map((type) => (
+                        <Menu.Item
+                          key={type}
+                          onClick={() => handleAddService(type)}
+                          leftSection={<Plus size={15} strokeWidth={1.8} />}
+                        >
+                          {serviceLabel(type)}
+                        </Menu.Item>
+                      ))}
+                    </>
+                  )}
+                  {rejectedServices.length > 0 && (
+                    <>
+                      {addableServices.length > 0 && <Menu.Divider />}
+                      <Menu.Label>Rejected — resubmit</Menu.Label>
+                      {rejectedServices.map((p) => (
+                        <Menu.Item
+                          key={p.id}
+                          color="red"
+                          onClick={() =>
+                            openServiceModal(p.type as ServiceType, p)
+                          }
+                          leftSection={<RefreshCw size={15} strokeWidth={1.8} />}
+                        >
+                          {serviceLabel(p.type as ServiceType)}
+                        </Menu.Item>
+                      ))}
+                    </>
+                  )}
+                  {suspendedServices.length > 0 && (
+                    <>
+                      {(addableServices.length > 0 ||
+                        rejectedServices.length > 0) && <Menu.Divider />}
+                      <Menu.Label>Suspended — appeal</Menu.Label>
+                      {suspendedServices.map((p) => (
+                        <Menu.Item
+                          key={p.id}
+                          color="orange"
+                          onClick={() =>
+                            openServiceModal(p.type as ServiceType, p)
+                          }
+                          leftSection={<Ban size={15} strokeWidth={1.8} />}
+                          rightSection={
+                            <Badge size="xs" color="orange" variant="light">
+                              Suspended
+                            </Badge>
+                          }
+                        >
+                          {serviceLabel(p.type as ServiceType)}
+                        </Menu.Item>
+                      ))}
+                    </>
+                  )}
                 </Menu.Dropdown>
               </Menu>
             )}
@@ -790,18 +896,42 @@ export function AppLayout({
       <Modal
         opened={createOpen}
         onClose={() => (switching ? undefined : setCreateOpen(false))}
-        title={`Set up your ${serviceLabel(createTarget)} profile`}
+        title={
+          isSuspendedAppeal
+            ? `Appeal suspension — ${serviceLabel(createTarget)}`
+            : reapplyId
+              ? `Resubmit your ${serviceLabel(createTarget)} service`
+              : `Set up your ${serviceLabel(createTarget)} profile`
+        }
         centered
         radius="lg"
       >
         <Stack gap="md">
           <Text size="sm" c="dimmed">
-            You don't have a {serviceLabel(createTarget).toLowerCase()} profile
-            yet. Add your business license to create one and switch to{" "}
-            {serviceLabel(createTarget).toLowerCase()}.
+            {isSuspendedAppeal
+              ? `Your ${serviceLabel(
+                  createTarget,
+                ).toLowerCase()} service is currently suspended. Replace the business license if needed and resubmit — this sends your appeal back to EDR for review.`
+              : reapplyId
+                ? `Your ${serviceLabel(
+                    createTarget,
+                  ).toLowerCase()} service was rejected. Replace the business license if needed, then resubmit for approval.`
+                : `You don't have a ${serviceLabel(
+                    createTarget,
+                  ).toLowerCase()} profile yet. Add your business license to create one — it goes to EDR for approval before you can operate under it.`}
           </Text>
+          {isSuspendedAppeal && reapplyNote && (
+            <Alert
+              color="orange"
+              variant="light"
+              icon={<Ban size={16} />}
+              title="Reason for suspension"
+            >
+              {reapplyNote}
+            </Alert>
+          )}
           <FileInput
-            label="Business license"
+            label={reapplyId ? "Business license (optional)" : "Business license"}
             multiple
             clearable
             accept="application/pdf,image/png,image/jpeg"
@@ -824,7 +954,11 @@ export function AppLayout({
               onClick={handleCreateConfirm}
               loading={switching}
             >
-              Create &amp; switch
+              {isSuspendedAppeal
+                ? "Submit appeal"
+                : reapplyId
+                  ? "Resubmit"
+                  : "Create"}
             </Button>
           </Group>
         </Stack>
diff --git a/apps/edr-freight-web/portal/src/components/NewBookingButton.tsx b/apps/edr-freight-web/portal/src/components/NewBookingButton.tsx
index cb0e2e726..79109ce2c 100644
--- a/apps/edr-freight-web/portal/src/components/NewBookingButton.tsx
+++ b/apps/edr-freight-web/portal/src/components/NewBookingButton.tsx
@@ -11,22 +11,21 @@ interface NewBookingButtonProps {
 
 /**
  * New-booking entry point that respects approval status: a customer can only
- * create bookings under a profile once the backoffice has approved it. While the
- * active profile is pending the button is disabled with an explanation, so the
- * gate is communicated rather than silently failing at submit time.
+ * create bookings once the backoffice has approved at least one operational
+ * role. While every role is still pending the button is disabled with an
+ * explanation, so the gate is communicated rather than failing at submit time.
  */
 export function NewBookingButton({
   label = "New booking",
   size,
   mt,
 }: NewBookingButtonProps) {
-  const { canBook, activeProfileStatus } = useAuth();
+  const { canBook, hasPendingProfile } = useAuth();
 
   if (!canBook) {
-    const message =
-      activeProfileStatus === "pending"
-        ? "Your profile is awaiting approval. You'll be able to create bookings as soon as it's approved."
-        : "Bookings aren't available for this profile yet.";
+    const message = hasPendingProfile
+      ? "Your role is awaiting approval. You'll be able to create bookings as soon as it's approved."
+      : "Bookings aren't available until one of your roles is approved.";
     return (
       <Tooltip label={message} multiline w={250} withArrow position="bottom-end">
         <Box mt={mt}>
diff --git a/apps/edr-freight-web/portal/src/components/customer-actions/ContractCustomerAction.tsx b/apps/edr-freight-web/portal/src/components/customer-actions/ContractCustomerAction.tsx
index 019f83143..86c37585c 100644
--- a/apps/edr-freight-web/portal/src/components/customer-actions/ContractCustomerAction.tsx
+++ b/apps/edr-freight-web/portal/src/components/customer-actions/ContractCustomerAction.tsx
@@ -14,7 +14,6 @@ import { useNavigate } from "react-router-dom";
 
 import type { Freight } from "@edr/types";
 
-import { PayClearanceFeeButton } from "@/pages/bookings/payments/PayClearanceFeeButton";
 import { PayNowButton } from "@/pages/bookings/payments/PayNowButton";
 import { api } from "@/services/api";
 import { ContractClearanceAction } from "./ContractClearanceAction";
@@ -70,17 +69,6 @@ export function ContractCustomerAction({
     );
   }
 
-  if (action.type === "pay-clearance") {
-    return (
-      <PayClearanceFeeButton
-        sourceId={action.contractId}
-        currency={contract.paymentCurrency}
-        label={action.label}
-        size={size}
-      />
-    );
-  }
-
   if (action.type === "initiate") {
     return (
       <InitiateBookingButton
diff --git a/apps/edr-freight-web/portal/src/components/customer-actions/deriveContractCustomerAction.ts b/apps/edr-freight-web/portal/src/components/customer-actions/deriveContractCustomerAction.ts
index 0e80057eb..ddd64d3e8 100644
--- a/apps/edr-freight-web/portal/src/components/customer-actions/deriveContractCustomerAction.ts
+++ b/apps/edr-freight-web/portal/src/components/customer-actions/deriveContractCustomerAction.ts
@@ -80,14 +80,6 @@ export type ContractCustomerAction =
       label: string;
       primary: boolean;
       icon: LucideIcon;
-    }
-  | {
-      /** Prepaid customs clearance service fee (contract-level, ONE_TIME Path B). */
-      type: "pay-clearance";
-      contractId: string;
-      label: string;
-      primary: boolean;
-      icon: LucideIcon;
     };
 
 function findPayableBookingForContract(
@@ -145,17 +137,6 @@ export function deriveContractCustomerAction(
     };
   }
 
-  // Prepaid clearance service fee gate — must settle before document upload.
-  if (contract.status === "AWAITING_CLEARANCE_PAYMENT") {
-    return {
-      type: "pay-clearance",
-      contractId: id,
-      label: "Pay clearance fee",
-      primary: true,
-      icon: CreditCard,
-    };
-  }
-
   const payable = findPayableBookingForContract(id, bookings);
   if (payable) {
     return {
diff --git a/apps/edr-freight-web/portal/src/constants/URLS.ts b/apps/edr-freight-web/portal/src/constants/URLS.ts
index 090502a3a..451b58390 100644
--- a/apps/edr-freight-web/portal/src/constants/URLS.ts
+++ b/apps/edr-freight-web/portal/src/constants/URLS.ts
@@ -99,7 +99,6 @@ export const URL_CONSTANTS = {
     PROFILE: "/api/companies/profile",
     COMPANY_PROFILES: "/api/companies/company-profiles",
     COMPANY_PROFILE: "/api/companies/company-profile",
-    ACTIVE_MODE: "/api/companies/active-mode",
     ONBOARDING_START: "/api/companies/onboarding/start",
     ONBOARDING_STEP: "/api/companies/onboarding-step",
     ONBOARDING_COMPLETE: "/api/companies/onboarding/complete",
diff --git a/apps/edr-freight-web/portal/src/hooks/useAuth.ts b/apps/edr-freight-web/portal/src/hooks/useAuth.ts
index be5cd4d7c..3573750a9 100644
--- a/apps/edr-freight-web/portal/src/hooks/useAuth.ts
+++ b/apps/edr-freight-web/portal/src/hooks/useAuth.ts
@@ -158,11 +158,7 @@ const useAuth = () => {
     }
   };
 
-  // Active-mode (importer/exporter) state, sourced from the persisted profile.
   const companyInfo = isAuthenticated ? (companyQuery.data ?? null) : null;
-  const activeProfileType = companyInfo?.profile?.activeProfileType ?? null;
-  const activeCompanyProfileId =
-    companyInfo?.profile?.activeCompanyProfileId ?? null;
   const companyType = companyInfo?.company?.type ?? null;
   const companyStatus = companyInfo?.company?.status ?? null;
   // A company can create bookings only once an admin has approved it (active).
@@ -171,14 +167,13 @@ const useAuth = () => {
     companyInfo?.profile?.onboardingCompleted ?? false;
   const onboardingStep = companyInfo?.profile?.onboardingStep ?? null;
 
-  // Booking is gated on backoffice approval of the active operational profile:
-  // a customer can only book under a profile once its status is "active".
-  const activeProfile =
-    companyInfo?.company?.companyProfiles?.find(
-      (p) => p.id === activeCompanyProfileId,
-    ) ?? null;
-  const activeProfileStatus = activeProfile?.status ?? null;
-  const canBook = activeProfileStatus === "active";
+  // A booking/contract stamps its operational profile from the trade direction
+  // at creation time, so there's no "active mode": the customer can create work
+  // as long as they have at least one backoffice-approved operational role.
+  const companyProfiles = companyInfo?.company?.companyProfiles ?? [];
+  const hasActiveProfile = companyProfiles.some((p) => p.status === "active");
+  const hasPendingProfile = companyProfiles.some((p) => p.status === "pending");
+  const canBook = hasActiveProfile;
 
   // Profile-edit review: while a change request is pending the customer is
   // locked out of editing and of creating new contracts/bookings; a rejected
@@ -188,7 +183,7 @@ const useAuth = () => {
   const reviewNote = review?.note ?? null;
   const isUnderReview = reviewStatus === "pending";
 
-  /** Refetch everything scoped to the active operational profile. */
+  /** Refetch company info, dashboard, and bookings after a profile change. */
   const invalidateScopedData = async () => {
     await Promise.all([
       queryClient.invalidateQueries({
@@ -201,16 +196,6 @@ const useAuth = () => {
     ]);
   };
 
-  const switchMode = async (type: ProfileTypeValue): Promise<Result<void>> => {
-    try {
-      await api.companies.setActiveMode.call({ type });
-      await invalidateScopedData();
-      return { success: true, data: undefined };
-    } catch (err) {
-      return { success: false, error: extractApiError(err) };
-    }
-  };
-
   /**
    * Add an operational role. The new role starts pending review, so the active
    * mode is left untouched — the user keeps working under their approved role.
@@ -231,11 +216,18 @@ const useAuth = () => {
     }
   };
 
-  /** Resubmit a rejected operational role for approval, then refresh. */
+  /**
+   * Resubmit a rejected operational role for approval — optionally replacing its
+   * business license first (the common reason a role is rejected) — then refresh.
+   */
   const reapplyProfile = async (
     profileId: string,
+    licenseFiles: File[] = [],
   ): Promise<Result<void>> => {
     try {
+      if (licenseFiles.length > 0) {
+        await companiesService.uploadProfileLicense(profileId, licenseFiles);
+      }
       await api.companies.reapplyProfile.call({ profileId });
       await invalidateScopedData();
       return { success: true, data: undefined };
@@ -269,10 +261,9 @@ const useAuth = () => {
     user: isAuthenticated ? (authQuery.data ?? null) : null,
     company: isAuthenticated ? (companyQuery.data ?? null) : null,
     customer: isAuthenticated ? (companyQuery.data ?? null) : null,
-    activeProfileType,
-    activeCompanyProfileId,
-    activeProfileStatus,
     canBook,
+    hasActiveProfile,
+    hasPendingProfile,
     companyType,
     companyStatus,
     isCompanyApproved,
@@ -281,7 +272,6 @@ const useAuth = () => {
     isUnderReview,
     onboardingCompleted,
     onboardingStep,
-    switchMode,
     createProfile,
     reapplyProfile,
     login,
diff --git a/apps/edr-freight-web/portal/src/lib/posthog.ts b/apps/edr-freight-web/portal/src/lib/posthog.ts
index 59599fbb6..3f1fde723 100644
--- a/apps/edr-freight-web/portal/src/lib/posthog.ts
+++ b/apps/edr-freight-web/portal/src/lib/posthog.ts
@@ -106,7 +106,6 @@ export function captureApiError(error: unknown): void {
 /** Company context, as returned by `useAuth().company`. */
 interface IdentifyCompany {
   company?: { id?: string; type?: string | null; status?: string | null } | null;
-  profile?: { activeProfileType?: string | null } | null;
 }
 
 /**
@@ -136,7 +135,6 @@ export function useIdentify(
       company_id: company?.company?.id,
       company_type: company?.company?.type,
       company_status: company?.company?.status,
-      active_profile_type: company?.profile?.activeProfileType,
     });
   }, [
     user?.id,
@@ -146,6 +144,5 @@ export function useIdentify(
     company?.company?.id,
     company?.company?.type,
     company?.company?.status,
-    company?.profile?.activeProfileType,
   ]);
 }
diff --git a/apps/edr-freight-web/portal/src/pages/MyPortalPage/actions.ts b/apps/edr-freight-web/portal/src/pages/MyPortalPage/actions.ts
index 1f9603c04..de4b387b1 100644
--- a/apps/edr-freight-web/portal/src/pages/MyPortalPage/actions.ts
+++ b/apps/edr-freight-web/portal/src/pages/MyPortalPage/actions.ts
@@ -6,7 +6,7 @@ import { contractNeedsClearanceAction } from "@/components/customer-actions/deri
 export interface ActionItem {
   id: string;
   /** What the customer must do — drives the icon, label and modal. */
-  kind: "clearance" | "duty" | "sign" | "book" | "pay" | "clearance-fee";
+  kind: "clearance" | "duty" | "sign" | "book" | "pay";
   /** The contract/booking reference for display. */
   reference: string;
   /** Short human description of the action. */
@@ -40,18 +40,6 @@ export function deriveActionItems(
       });
       continue;
     }
-    // Prepaid clearance service fee (Path B) — blocks the document step.
-    if (c.status === "AWAITING_CLEARANCE_PAYMENT") {
-      items.push({
-        id: `clearance-fee-${c.id}`,
-        kind: "clearance-fee",
-        reference: c.reference,
-        description: "Clearance service fee due — pay to unlock document upload",
-        targetId: c.id,
-        urgent: true,
-      });
-      continue;
-    }
     const clr = contractNeedsClearanceAction(c);
     if (clr.show) {
       items.push({
@@ -82,19 +70,6 @@ export function deriveActionItems(
   }
 
   for (const b of bookings) {
-    // Per-shipment clearance service fee (GENERAL + customs shipment request).
-    if (b.status === "AWAITING_CLEARANCE_PAYMENT") {
-      items.push({
-        id: `clearance-fee-${b.id}`,
-        kind: "clearance-fee",
-        reference: b.reference,
-        description:
-          "Clearance service fee due for this shipment — pay to unlock document upload",
-        targetId: b.id,
-        urgent: true,
-      });
-      continue;
-    }
     const isGeneral = b.bookingType === "GENERAL_CONTRACT";
     const canPay =
       b.paymentStatus !== "PAID" &&
diff --git a/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/ActionNeededSection.tsx b/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/ActionNeededSection.tsx
index 3828ed20b..9e3fd13ec 100644
--- a/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/ActionNeededSection.tsx
+++ b/apps/edr-freight-web/portal/src/pages/MyPortalPage/components/ActionNeededSection.tsx
@@ -39,7 +39,6 @@ const KIND_META: Record<
   sign: { icon: FileSignature, label: "Sign", color: "blue" },
   book: { icon: PackagePlus, label: "Book", color: "violet" },
   pay: { icon: CreditCard, label: "Payment", color: "orange" },
-  "clearance-fee": { icon: CreditCard, label: "Clearance fee", color: "orange" },
 };
 
 export interface ActionNeededSectionProps {
@@ -138,14 +137,10 @@ export function ActionNeededSection({
 
   // Billing is invoice-centric — resolve the booking's currently payable
   // invoice before paying it (mirrors ReadonlyBookingView).
-  // A "pay" item settles the booking invoice; a "clearance-fee" item settles the
-  // prepaid clearance-fee invoice (source `clearance`, keyed by contract or
-  // booking id depending on where the gate sits).
-  const payItemSource = payItem?.kind === "clearance-fee" ? "clearance" : "booking";
   const { data: payItemInvoices = [] } = useQuery({
-    queryKey: [`${payItemSource}-invoices`, payItem?.targetId],
+    queryKey: ["booking-invoices", payItem?.targetId],
     queryFn: () =>
-      invoicesService.listForSource(payItemSource, payItem!.targetId),
+      invoicesService.listForSource("booking", payItem!.targetId),
     enabled: payItem !== null,
   });
   const payableInvoiceId = payItemInvoices.find((inv) =>
@@ -188,7 +183,6 @@ export function ActionNeededSection({
         navigate(`/contracts/${item.targetId}`);
         break;
       case "pay":
-      case "clearance-fee":
         setPayItem(item);
         break;
       case "sign":
@@ -284,9 +278,7 @@ export function ActionNeededSection({
               >
                 {item.kind === "pay"
                   ? "Pay now"
-                  : item.kind === "clearance-fee"
-                    ? "Pay clearance fee"
-                    : item.kind === "duty"
+                  : item.kind === "duty"
                     ? "Pay duty & upload slip"
                     : item.kind === "sign"
                       ? "Sign"
diff --git a/apps/edr-freight-web/portal/src/pages/MyPortalPage/constants.ts b/apps/edr-freight-web/portal/src/pages/MyPortalPage/constants.ts
index b67b11315..7be5a0aed 100644
--- a/apps/edr-freight-web/portal/src/pages/MyPortalPage/constants.ts
+++ b/apps/edr-freight-web/portal/src/pages/MyPortalPage/constants.ts
@@ -165,19 +165,6 @@ export const STATUS_CONFIG: Record<string, StageConfig> = {
     badgeDot: "edr-green.5",
     action: { label: "View", kind: "outline" },
   },
-  AWAITING_CLEARANCE_PAYMENT: {
-    stage: 3,
-    icon: Wallet,
-    iconColor: "edr-amber-text",
-    tile: "edr-amber-soft",
-    hint: "Clearance service fee due · pay to unlock document upload",
-    step: "edr-accent",
-    badgeLabel: "Clearance fee due",
-    badgeBg: "edr-amber-soft",
-    badgeText: "edr-amber-text",
-    badgeDot: "edr-accent",
-    action: { label: "Pay clearance fee", kind: "amber", icon: ArrowRight },
-  },
   AWAITING_DOCUMENTS: {
     stage: 3,
     icon: FileUp,
diff --git a/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx b/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx
index 00b9c3043..755691607 100644
--- a/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/SettingsPage.tsx
@@ -2,12 +2,15 @@ import { api } from "@/services/api";
 import type { ProfileResponse } from "@/types/profile";
 import {
   Alert,
+  Anchor,
   Badge,
   Box,
+  Button,
   Card,
   Center,
   Container,
   Fieldset,
+  FileButton,
   Group,
   Loader,
   Stack,
@@ -16,7 +19,7 @@ import {
   ThemeIcon,
   Title,
 } from "@mantine/core";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import {
   AlertCircle,
   AlertTriangle,
@@ -25,13 +28,20 @@ import {
   Building2,
   Clock,
   FileCheck,
+  FileText,
   Globe,
+  Layers,
+  RefreshCw,
   ShieldCheck,
+  UploadCloud,
   User,
   UserCheck,
   UserCog,
 } from "lucide-react";
-import { useCallback, useEffect } from "react";
+import { companiesService } from "@/services/companies.service";
+import { fetchViewableFile } from "@/services/files.service";
+import { useFileViewer } from "@edr/ui-common";
+import { useCallback, useEffect, useState } from "react";
 import { useSearchParams } from "react-router-dom";
 import useAuth from "@/hooks/useAuth";
 import { rolesForCompanyType } from "./settings/companyRoles";
@@ -42,13 +52,16 @@ import TabDocuments from "./settings/TabDocuments";
 import TabGeneralManager from "./settings/TabGeneralManager";
 import TabPowerOfAttorney from "./settings/TabPowerOfAttorney";
 
-type SettingsTab = "account" | "company" | "contact" | "gm" | "poa" | "documents";
+type SettingsTab =
+  | "account"
+  | "company"
+  | "contact"
+  | "gm"
+  | "poa"
+  | "documents";
 
 /** A section is "incomplete" when its required fields aren't filled in yet. */
-function tabIncomplete(
-  tabId: SettingsTab,
-  profile: ProfileResponse,
-): boolean {
+function tabIncomplete(tabId: SettingsTab, profile: ProfileResponse): boolean {
   switch (tabId) {
     case "company":
       return (
@@ -66,8 +79,8 @@ function tabIncomplete(
         !profile.generalManagerPhone
       );
     case "account":
-      // Account fields live on the IAM user, not the company profile, and are
-      // always populated (signup requires them) — nothing to nag about here.
+    // Account fields live on the IAM user, not the company profile, and are
+    // always populated (signup requires them) — nothing to nag about here.
     case "poa":
     case "documents":
       return false;
@@ -343,6 +356,7 @@ export default function SettingsPage() {
             <Fieldset disabled={locked} variant="unstyled" p={0}>
               <TabCompanyProfile mode="edit" profile={profile} />
             </Fieldset>
+            <OperationalServicesCard profile={profile} />
           </Tabs.Panel>
           <Tabs.Panel value="contact">
             <Fieldset disabled={locked} variant="unstyled" p={0}>
@@ -369,3 +383,203 @@ export default function SettingsPage() {
     </Container>
   );
 }
+
+const ROLE_LABELS: Record<string, string> = {
+  importer: "Importer",
+  exporter: "Exporter",
+  freight_forwarder: "Freight Forwarder",
+  dj_freight_forwarder: "DJ Freight Forwarder",
+  transporter: "Transporter",
+};
+
+const ROLE_STATUS: Record<string, { color: string; label: string }> = {
+  active: { color: "edr-green", label: "Approved" },
+  pending: { color: "yellow", label: "Awaiting approval" },
+  rejected: { color: "red", label: "Rejected" },
+  suspended: { color: "orange", label: "Suspended" },
+  blacklisted: { color: "red", label: "Blocked" },
+};
+
+/**
+ * Lists the company's operational services with approval status, and lets the
+ * customer resubmit a rejected one — replacing its license first if the reviewer
+ * flagged the document.
+ */
+function OperationalServicesCard({ profile }: { profile: ProfileResponse }) {
+  const queryClient = useQueryClient();
+  const { view, viewer } = useFileViewer();
+  const roles = profile.companyProfiles;
+
+  const refresh = () =>
+    Promise.all([
+      queryClient.invalidateQueries({
+        queryKey: api.companies.getProfile.queryKey(),
+      }),
+      queryClient.invalidateQueries({
+        queryKey: api.companies.getInfo.queryKey(),
+      }),
+    ]);
+
+  // Resubmit: upload any freshly-picked license files first, then flip the role
+  // back to pending so it re-enters the approval queue.
+  const resubmit = useMutation({
+    mutationFn: async (args: { profileId: string; files: File[] }) => {
+      if (args.files.length > 0) {
+        await companiesService.uploadProfileLicense(args.profileId, args.files);
+      }
+      await api.companies.reapplyProfile.call({ profileId: args.profileId });
+    },
+    onSuccess: refresh,
+  });
+
+  if (roles.length === 0) return null;
+
+  return (
+    <>
+      <Card padding="lg" radius="lg" mt="lg">
+      <Group gap="sm" mb="md">
+        <Layers size={20} />
+        <Title order={3}>Operational Services</Title>
+      </Group>
+      <Stack gap="sm">
+        {roles.map((r) => {
+          const status = ROLE_STATUS[r.status] ?? {
+            color: "gray",
+            label: r.status,
+          };
+          return (
+            <Group
+              key={r.id}
+              justify="space-between"
+              align="flex-start"
+              wrap="nowrap"
+              py="xs"
+              style={{
+                borderTop: "1px solid var(--mantine-color-edr-border-0)",
+              }}
+            >
+              <Stack gap={4}>
+                <Group gap="xs">
+                  <Text fw={600}>{ROLE_LABELS[r.type] ?? r.type}</Text>
+                  <Badge color={status.color} variant="light" radius="sm">
+                    {status.label}
+                  </Badge>
+                  {r.reference && (
+                    <Text size="xs" c="dimmed" ff="monospace">
+                      {r.reference}
+                    </Text>
+                  )}
+                </Group>
+                {(r.status === "rejected" || r.status === "suspended") &&
+                  r.reviewNote && (
+                    <Text
+                      size="sm"
+                      c={r.status === "suspended" ? "orange.7" : "red.7"}
+                    >
+                      <strong>
+                        {r.status === "suspended"
+                          ? "Suspension reason:"
+                          : "Reviewer note:"}
+                      </strong>{" "}
+                      {r.reviewNote}
+                    </Text>
+                  )}
+
+                {r.licenseFiles.length === 0 ? (
+                  <Text size="xs" c="edr-muted">
+                    No license document
+                  </Text>
+                ) : (
+                  <Stack gap={4}>
+                    {r.licenseFiles.map((f) => (
+                      <Group key={f.id} gap="xs" wrap="nowrap">
+                        <FileText
+                          size={14}
+                          className="text-edr-muted"
+                          style={{ flexShrink: 0 }}
+                        />
+                        <Anchor
+                          component="button"
+                          type="button"
+                          size="xs"
+                          lineClamp={1}
+                          onClick={() =>
+                            void fetchViewableFile(f.id, f.name).then(view)
+                          }
+                        >
+                          {f.name}
+                        </Anchor>
+                        {f.status !== "live" && (
+                          <Badge
+                            size="xs"
+                            radius="sm"
+                            variant="light"
+                            color={
+                              f.status === "pending_remove" ? "red" : "yellow"
+                            }
+                          >
+                            {f.status === "pending_remove"
+                              ? "Removal pending"
+                              : "Pending"}
+                          </Badge>
+                        )}
+                      </Group>
+                    ))}
+                  </Stack>
+                )}
+              </Stack>
+
+              {r.status === "rejected" && (
+                <ResubmitService
+                  pending={resubmit.isPending}
+                  onResubmit={(files) =>
+                    resubmit.mutate({ profileId: r.id, files })
+                  }
+                />
+              )}
+            </Group>
+          );
+        })}
+      </Stack>
+      </Card>
+      {viewer}
+    </>
+  );
+}
+
+/** Rejected-role actions: optionally replace the license, then resubmit. */
+function ResubmitService({
+  pending,
+  onResubmit,
+}: {
+  pending: boolean;
+  onResubmit: (files: File[]) => void;
+}) {
+  const [files, setFiles] = useState<File[]>([]);
+
+  return (
+    <Group gap="xs" wrap="nowrap">
+      <FileButton onChange={setFiles} accept="application/pdf,image/*" multiple>
+        {(props) => (
+          <Button
+            {...props}
+            size="xs"
+            variant="light"
+            leftSection={<UploadCloud size={14} />}
+          >
+            {files.length > 0 ? `${files.length} file(s)` : "Replace license"}
+          </Button>
+        )}
+      </FileButton>
+      <Button
+        size="xs"
+        color="edr-green"
+        leftSection={<RefreshCw size={14} />}
+        loading={pending}
+        onClick={() => onResubmit(files)}
+      >
+        Resubmit
+      </Button>
+    </Group>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ReadonlyBookingView.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ReadonlyBookingView.tsx
index fc701b924..ce4a2dbea 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ReadonlyBookingView.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/ReadonlyBookingView.tsx
@@ -1,4 +1,4 @@
-import { Group, Paper, Tabs, Text } from "@mantine/core";
+import { Group, Tabs } from "@mantine/core";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { CreditCard, FileText, LayoutGrid } from "lucide-react";
 import { useState } from "react";
@@ -12,7 +12,6 @@ import { isPayable } from "@/pages/billing/invoice-ui";
 import type { Freight } from "@edr/types";
 
 import { ApproveDeliveryButton } from "../delivery/ApproveDeliveryButton";
-import { PayClearanceFeeButton } from "../payments/PayClearanceFeeButton";
 import { ActivityCard } from "./components/ActivityCard";
 import { ClearanceCard } from "./components/ClearanceCard";
 import { DocumentsTab } from "./components/DocumentsTab";
@@ -34,6 +33,7 @@ import { HeaderButton, PageHeader } from "./components/PageHeader";
 import { PaymentMethodModal } from "./components/PaymentMethodModal";
 import { ScheduleCard } from "./components/ScheduleCard";
 import { WarehousePaymentsSection } from "./components/WarehousePaymentsSection";
+import { WarehouseLocationCard } from "./components/WarehouseLocationCard";
 import { ShipmentDetailsCard } from "./components/ShipmentDetailsCard";
 import { ShipmentTrackingCard } from "./components/ShipmentTrackingCard";
 import { StatusHero } from "./components/StatusHero";
@@ -142,8 +142,6 @@ export function ReadonlyBookingView({
   const isCustoms = Boolean(booking.customsClearingEnabled);
   const canSelfRebook = !isCustoms;
   const isPendingConsolidation = status === "PENDING_CONSOLIDATION";
-  // Prepaid clearance service fee gate — document upload stays locked until paid.
-  const isAwaitingClearanceFee = status === "AWAITING_CLEARANCE_PAYMENT";
   const isClearance = [
     "AWAITING_DOCUMENTS",
     "DOCUMENTS_UNDER_REVIEW",
@@ -242,28 +240,6 @@ export function ReadonlyBookingView({
           <div className="flex flex-col gap-6">
             <ContractCard booking={booking} />
 
-            {isAwaitingClearanceFee && (
-              <Paper withBorder radius="lg" p="lg" style={{ borderColor: "#FDE68A", background: "#FFFBEB" }}>
-                <Group justify="space-between" align="center" wrap="wrap" gap="md">
-                  <div>
-                    <Text fw={700} fz={15} c="#92400E">
-                      Customs clearance service fee due
-                    </Text>
-                    <Text fz={13} c="#B45309" mt={4}>
-                      Pay the clearance service fee to unlock the clearance
-                      document upload. Global Logistics starts working on your
-                      shipment once the fee is settled.
-                    </Text>
-                  </div>
-                  <PayClearanceFeeButton
-                    sourceId={booking.id}
-                    currency={booking.paymentCurrency}
-                    size="md"
-                  />
-                </Group>
-              </Paper>
-            )}
-
             {isClearance && <ClearanceCard booking={booking} />}
 
             <BodyGrid
@@ -273,6 +249,8 @@ export function ReadonlyBookingView({
 
                   <ContainersCard booking={booking} />
 
+                  <WarehouseLocationCard bookingId={booking.id} />
+
                   <ContractInfoCard booking={booking} />
 
                   <ShipmentTrackingCard bookingId={booking.id} />
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/BookingPaymentPanel.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/BookingPaymentPanel.tsx
index 81f727b29..1cb46d156 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/BookingPaymentPanel.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/BookingPaymentPanel.tsx
@@ -211,10 +211,6 @@ export function BookingPaymentPanel({
     queryKey: ["booking-invoices", booking.id],
     queryFn: () => invoicesService.listForSource("booking", booking.id),
   });
-  // The invoice worth a prominent "Download" — the first issued one, else any.
-  const primary =
-    invoices.find((inv) => inv.status !== "DRAFT") ?? invoices[0];
-  const primaryPaid = primary ? Number(primary.paidAmount) > 0 : false;
 
   const downloadInvoice = async (inv: PortalInvoice) => {
     try {
@@ -380,50 +376,67 @@ export function BookingPaymentPanel({
                 </Box>
                 <Group gap={8} wrap="nowrap">
                   <InvoiceStatusBadge status={inv.status} />
-                  <ActionIcon
-                    variant="subtle"
-                    color="gray"
-                    aria-label="Download invoice"
-                    onClick={() => downloadInvoice(inv)}
-                  >
-                    <Download size={16} />
-                  </ActionIcon>
+                  {invoices.length > 1 && (
+                    <>
+                      <ActionIcon
+                        variant="subtle"
+                        color="gray"
+                        aria-label="Download invoice"
+                        onClick={() => downloadInvoice(inv)}
+                      >
+                        <Download size={16} />
+                      </ActionIcon>
+                      {Number(inv.paidAmount) > 0 && (
+                        <ActionIcon
+                          variant="subtle"
+                          color="gray"
+                          aria-label="Download receipt"
+                          onClick={() => downloadReceipt(inv)}
+                        >
+                          <Receipt size={16} />
+                        </ActionIcon>
+                      )}
+                    </>
+                  )}
                 </Group>
               </Group>
             ))}
           </Stack>
-        </>
-      )}
 
-      {primary && (
-        <Button
-          fullWidth
-          mt={16}
-          variant="default"
-          radius={10}
-          leftSection={<FileText size={17} color="#475569" />}
-          onClick={() => downloadInvoice(primary)}
-          styles={{
-            root: { height: 46 },
-            label: { fontSize: 13.5, fontWeight: 700, color: "#10202F" },
-          }}
-        >
-          Download invoice
-        </Button>
-      )}
-      {primary && primaryPaid && (
-        <Button
-          fullWidth
-          mt={8}
-          variant="subtle"
-          color="gray"
-          radius={10}
-          leftSection={<Receipt size={17} />}
-          onClick={() => downloadReceipt(primary)}
-          styles={{ root: { height: 42 }, label: { fontSize: 13, fontWeight: 700 } }}
-        >
-          Download receipt
-        </Button>
+          {/* Single invoice: a prominent download instead of a lone row icon. */}
+          {invoices.length === 1 && (
+            <>
+              <Button
+                fullWidth
+                mt={16}
+                variant="default"
+                radius={10}
+                leftSection={<FileText size={17} color="#475569" />}
+                onClick={() => downloadInvoice(invoices[0])}
+                styles={{
+                  root: { height: 46 },
+                  label: { fontSize: 13.5, fontWeight: 700, color: "#10202F" },
+                }}
+              >
+                Download invoice
+              </Button>
+              {Number(invoices[0].paidAmount) > 0 && (
+                <Button
+                  fullWidth
+                  mt={8}
+                  variant="subtle"
+                  color="gray"
+                  radius={10}
+                  leftSection={<Receipt size={17} />}
+                  onClick={() => downloadReceipt(invoices[0])}
+                  styles={{ root: { height: 42 }, label: { fontSize: 13, fontWeight: 700 } }}
+                >
+                  Download receipt
+                </Button>
+              )}
+            </>
+          )}
+        </>
       )}
     </SectionCard>
   );
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/BulkTruckUploadModal.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/BulkTruckUploadModal.tsx
new file mode 100644
index 000000000..5f1f8a51e
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/BulkTruckUploadModal.tsx
@@ -0,0 +1,183 @@
+import { useState } from "react";
+import { Alert, Button, Group, Modal, Stack, Table, Text, FileInput, Badge } from "@mantine/core";
+import { Upload, Download, AlertCircle, CheckCircle, AlertTriangle } from "lucide-react";
+import { useMutation } from "@tanstack/react-query";
+
+import { client } from "@/utils/api";
+import { generateTruckAssignmentTemplate, parseTruckAssignmentFile } from "@/utils/truck-assignment-template";
+
+interface BulkTruckUploadModalProps {
+  opened: boolean;
+  onClose: () => void;
+  bookingId: string;
+  onSuccess?: () => void;
+}
+
+export function BulkTruckUploadModal({
+  opened,
+  onClose,
+  bookingId,
+  onSuccess,
+}: BulkTruckUploadModalProps) {
+  const [file, setFile] = useState<File | null>(null);
+  const [parsed, setParsed] = useState<
+    Array<{
+      truckPlateNumber: string;
+      driverName: string;
+      truckType: string;
+      containerNumbers?: string[];
+    }>
+  >([]);
+  const [parseError, setParseError] = useState<string | null>(null);
+
+  const uploadMutation = useMutation({
+    mutationFn: async () => {
+      const { data } = await client.post(`/bookings/${bookingId}/customer-trucks/bulk`, {
+        trucks: parsed,
+      });
+      return data;
+    },
+    onSuccess: () => {
+      onSuccess?.();
+      setFile(null);
+      setParsed([]);
+      onClose();
+    },
+  });
+
+  const handleFileSelect = async (selectedFile: File | null) => {
+    if (!selectedFile) {
+      setFile(null);
+      setParsed([]);
+      setParseError(null);
+      return;
+    }
+
+    try {
+      setParseError(null);
+      const trucks = await parseTruckAssignmentFile(selectedFile);
+      setFile(selectedFile);
+      setParsed(trucks);
+    } catch (err: any) {
+      setParseError(err.message || "Failed to parse Excel file");
+      setFile(null);
+      setParsed([]);
+    }
+  };
+
+  const handleDownloadTemplate = () => {
+    generateTruckAssignmentTemplate("truck-assignments.xlsx");
+  };
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={onClose}
+      title="Bulk Upload Truck Assignments"
+      size="lg"
+      centered
+    >
+      <Stack gap="lg">
+        <Alert icon={<AlertCircle size={16} />} color="blue">
+          Download template, fill with truck data, upload Excel file to bulk-create truck assignments.
+        </Alert>
+
+        <Group>
+          <Button
+            leftSection={<Download size={16} />}
+            variant="light"
+            onClick={handleDownloadTemplate}
+          >
+            Download Template
+          </Button>
+        </Group>
+
+        <FileInput
+          label="Select Excel File"
+          placeholder="Choose .xlsx file"
+          accept=".xlsx,.xls"
+          value={file}
+          onChange={handleFileSelect}
+          leftSection={<Upload size={14} />}
+        />
+
+        {parseError && (
+          <Alert icon={<AlertTriangle size={16} />} color="red" title="Parse Error">
+            {parseError}
+          </Alert>
+        )}
+
+        {parsed.length > 0 && (
+          <>
+            <div>
+              <Text fw={600} mb="xs">
+                Preview ({parsed.length} trucks)
+              </Text>
+              <Table striped highlightOnHover verticalSpacing="xs">
+                <Table.Thead>
+                  <Table.Tr>
+                    <Table.Th>Plate Number</Table.Th>
+                    <Table.Th>Driver Name</Table.Th>
+                    <Table.Th>Truck Type</Table.Th>
+                    <Table.Th>Containers</Table.Th>
+                  </Table.Tr>
+                </Table.Thead>
+                <Table.Tbody>
+                  {parsed.map((truck, idx) => (
+                    <Table.Tr key={idx}>
+                      <Table.Td>
+                        <Text size="sm">{truck.truckPlateNumber}</Text>
+                      </Table.Td>
+                      <Table.Td>
+                        <Text size="sm">{truck.driverName}</Text>
+                      </Table.Td>
+                      <Table.Td>
+                        <Text size="sm">{truck.truckType}</Text>
+                      </Table.Td>
+                      <Table.Td>
+                        {truck.containerNumbers?.length ? (
+                          <Group gap="xs">
+                            {truck.containerNumbers.map((c) => (
+                              <Badge key={c} size="sm">
+                                {c}
+                              </Badge>
+                            ))}
+                          </Group>
+                        ) : (
+                          <Text size="sm" c="dimmed">
+                            —
+                          </Text>
+                        )}
+                      </Table.Td>
+                    </Table.Tr>
+                  ))}
+                </Table.Tbody>
+              </Table>
+            </div>
+
+            <Group justify="space-between">
+              <Text size="sm" c="dimmed">
+                Ready to upload {parsed.length} truck(s)
+              </Text>
+              <Button
+                loading={uploadMutation.isPending}
+                onClick={() => uploadMutation.mutate()}
+                leftSection={<CheckCircle size={16} />}
+              >
+                Upload Trucks
+              </Button>
+            </Group>
+          </>
+        )}
+
+        {uploadMutation.isError && (
+          <Alert icon={<AlertTriangle size={16} />} color="red">
+            {uploadMutation.error instanceof Error
+              ? uploadMutation.error.message
+              : "Upload failed"}
+          </Alert>
+        )}
+      </Stack>
+    </Modal>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/CustomerTruckAssignmentCard.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/CustomerTruckAssignmentCard.tsx
index 7c9cbeb0e..5f143b28c 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/CustomerTruckAssignmentCard.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/CustomerTruckAssignmentCard.tsx
@@ -3,6 +3,7 @@ import {
   Alert,
   Badge,
   Button,
+  Checkbox,
   Divider,
   Group,
   Loader,
@@ -15,7 +16,7 @@ import {
 } from "@mantine/core";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import type { Freight } from "@edr/types";
-import { CheckCircle2, Clock, Download, Pencil, Plus, Trash2, Truck } from "lucide-react";
+import { CheckCircle2, Clock, Download, Pencil, Plus, Trash2, Truck, Upload } from "lucide-react";
 import { useState } from "react";
 import toast from "react-hot-toast";
 
@@ -23,9 +24,24 @@ import { api } from "@/services/api";
 import { customerTrucksService } from "@/services/customer-trucks.service";
 
 import { CardTitle, SectionCard } from "./layout";
+import { BulkTruckUploadModal } from "./BulkTruckUploadModal";
+import { generateTruckAssignmentTemplate } from "@/utils/truck-assignment-template";
 
 const TRUCK_TYPES = ["Flatbed", "Container Chassis", "Lowboy", "Box Truck", "Tipper"];
 
+// Waybill-style selectable copies (indexes 1-8 in the API catalog). The 2 gate
+// copies (Port Operations, Gate Security & Carrier) are always printed.
+const FREIGHT_ORDER_COPIES = [
+  { index: 1, label: "Original 1 (for Issuing Carrier)" },
+  { index: 2, label: "Original 2 (for Consignee)" },
+  { index: 3, label: "Original 3 (for Shipper)" },
+  { index: 4, label: "Copy 4 (Delivery Receipt)" },
+  { index: 5, label: "Copy 5 (Extra Copy)" },
+  { index: 6, label: "Copy 6 (Extra Copy)" },
+  { index: 7, label: "Copy 7 (Extra Copy)" },
+  { index: 8, label: "Copy 8 (for Agent)" },
+];
+
 const downloadBlob = (blob: Blob, filename: string) => {
   const url = URL.createObjectURL(blob);
   const link = document.createElement("a");
@@ -65,6 +81,7 @@ export function CustomerTruckAssignmentCard({
   const [containers, setContainers] = useState<string[]>([]);
   const [editingId, setEditingId] = useState<string | null>(null);
   const [error, setError] = useState<string | null>(null);
+  const [bulkModalOpen, setBulkModalOpen] = useState(false);
 
   // Container numbers on the booking that aren't already loaded onto a truck.
   const assignedNumbers = new Set(
@@ -136,8 +153,11 @@ export function CustomerTruckAssignmentCard({
   });
 
   const downloadMutation = useMutation(api.bookings.downloadCustomerTruckFreightOrder.mutationOptions());
+  const [selectedCopies, setSelectedCopies] = useState<number[]>(
+    FREIGHT_ORDER_COPIES.map((c) => c.index),
+  );
   const downloadFreightOrder = async () => {
-    const blob = await downloadMutation.mutateAsync({ id: booking.id });
+    const blob = await downloadMutation.mutateAsync({ id: booking.id, copies: selectedCopies });
     downloadBlob(blob, `freight-order-${booking.reference}.pdf`);
   };
 
@@ -163,6 +183,24 @@ export function CustomerTruckAssignmentCard({
             <CardTitle>External Truck Assignment</CardTitle>
           </Group>
           <Group gap={12}>
+            <Group gap="sm">
+              <Button
+                size="xs"
+                variant="default"
+                leftSection={<Download size={14} />}
+                onClick={() => generateTruckAssignmentTemplate("truck-assignments.xlsx")}
+              >
+                Download Template
+              </Button>
+              <Button
+                size="xs"
+                variant="light"
+                leftSection={<Upload size={14} />}
+                onClick={() => setBulkModalOpen(true)}
+              >
+                Bulk Upload
+              </Button>
+            </Group>
             {pendingAssignmentCount > 0 && (
               <Text size="sm" fw={600} c="#b45309">
                 {pendingAssignmentCount} container{pendingAssignmentCount !== 1 ? "s" : ""} pending assignment
@@ -312,19 +350,64 @@ export function CustomerTruckAssignmentCard({
         )}
 
         {trucks.length > 0 && (
-          <Group justify="flex-end">
-            <Button
-              variant="light"
-              leftSection={<Download size={16} />}
-              color="edr-green"
-              onClick={downloadFreightOrder}
-              loading={downloadMutation.isPending}
-            >
-              Generate Freight Order Copies
-            </Button>
-          </Group>
+          <Stack gap="xs">
+            <Text fz="13px" fw={600}>Copies</Text>
+            <Group gap="xs">
+              <Button
+                size="compact-xs"
+                variant="default"
+                onClick={() => setSelectedCopies(FREIGHT_ORDER_COPIES.map((c) => c.index))}
+              >
+                8 copies
+              </Button>
+              <Button size="compact-xs" variant="default" onClick={() => setSelectedCopies([])}>
+                clear selection
+              </Button>
+            </Group>
+            <SimpleGrid cols={2} spacing={6} verticalSpacing={6}>
+              {FREIGHT_ORDER_COPIES.map((c) => (
+                <Checkbox
+                  key={c.index}
+                  size="xs"
+                  label={c.label}
+                  checked={selectedCopies.includes(c.index)}
+                  onChange={(e) =>
+                    setSelectedCopies((prev) =>
+                      e.currentTarget.checked
+                        ? [...prev, c.index].sort((a, b) => a - b)
+                        : prev.filter((i) => i !== c.index),
+                    )
+                  }
+                />
+              ))}
+            </SimpleGrid>
+            <Group justify="space-between" align="center">
+              <Text fz="11.5px" c="#9AA8B5">
+                Port Operations and Gate Security copies are always included.
+              </Text>
+              <Button
+                variant="light"
+                leftSection={<Download size={16} />}
+                color="edr-green"
+                onClick={downloadFreightOrder}
+                loading={downloadMutation.isPending}
+              >
+                Generate Freight Order Copies
+              </Button>
+            </Group>
+          </Stack>
         )}
       </Stack>
+
+      <BulkTruckUploadModal
+        opened={bulkModalOpen}
+        onClose={() => setBulkModalOpen(false)}
+        bookingId={booking.id}
+        onSuccess={() => {
+          queryClient.invalidateQueries({ queryKey: trucksKey });
+          onAssigned();
+        }}
+      />
     </SectionCard>
   );
 }
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/DocumentsTab.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/DocumentsTab.tsx
index 8934a0a60..e43bb43b9 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/DocumentsTab.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/DocumentsTab.tsx
@@ -15,6 +15,7 @@ import { isViewable } from "@edr/ui-common";
 
 import { api } from "@/services/api";
 import { fetchViewableFile, downloadStoredFile } from "@/services/files.service";
+import { warehouseService } from "@/services/warehouse.service";
 import { useFileViewer } from "@/hooks/useFileViewer";
 import { BookingActionModal } from "@/pages/bookings/clearance/BookingActionModal";
 import { getBookingNextAction } from "@/pages/bookings/clearance/bookingNextAction";
@@ -241,6 +242,11 @@ export function DocumentsTab({ booking }: { booking: Freight.IBooking }) {
     }),
   );
 
+  const { data: handovers = [] } = useQuery({
+    queryKey: ["bookingHandovers", booking.id],
+    queryFn: () => warehouseService.bookingHandovers(booking.id),
+  });
+
   const customerDocs = useMemo(
     () => (clearance?.documents ?? []).filter((d) => d.uploadedBy === "customer"),
     [clearance],
@@ -486,6 +492,69 @@ export function DocumentsTab({ booking }: { booking: Freight.IBooking }) {
         </SectionCard>
       )}
 
+      {/* ── 4. Handover signatures ──────────────────────────────────────── */}
+      {handovers.length > 0 && (
+        <SectionCard>
+          <CardTitle>Handover signatures</CardTitle>
+          <Text fz="12.5px" c="dimmed" mt={4} mb="sm">
+            Records of goods handover and customer signatures.
+          </Text>
+          <Stack gap={0}>
+            {handovers.map((h, i) => (
+              <Box
+                key={h.id}
+                px="md"
+                py="sm"
+                style={{
+                  borderBottom:
+                    i !== handovers.length - 1
+                      ? `1px solid ${BORDER}`
+                      : "none",
+                }}
+              >
+                <Group justify="space-between" align="flex-start">
+                  <Box>
+                    <Text fw={500} fz="14px">
+                      {h.reference}
+                    </Text>
+                    <Text fz="12.5px" c="dimmed" mt={2}>
+                      {h.mileType === "SELF_HAUL"
+                        ? "Customer truck delivery"
+                        : `EDR delivery${h.truckPlate ? ` (${h.truckPlate})` : ""}`}
+                    </Text>
+                    {h.signedAt && (
+                      <Text fz="12.5px" c="dimmed" mt={1}>
+                        Signed by {h.signerName || "Unknown"} on{" "}
+                        {new Date(h.signedAt).toLocaleDateString()}
+                      </Text>
+                    )}
+                  </Box>
+                  <Pill
+                    tone={h.signedAt ? "green" : "blue"}
+                    label={h.signedAt ? "Signed" : "Pending signature"}
+                  />
+                </Group>
+                {h.signedAt && h.signatureImageUrl && (
+                  <Box mt="sm">
+                    <img
+                      src={h.signatureImageUrl}
+                      alt="Signature"
+                      style={{
+                        maxHeight: "60px",
+                        maxWidth: "200px",
+                        border: `1px solid ${BORDER}`,
+                        borderRadius: "4px",
+                        padding: "4px",
+                      }}
+                    />
+                  </Box>
+                )}
+              </Box>
+            ))}
+          </Stack>
+        </SectionCard>
+      )}
+
       {/* ── Warehouse documents (one-click bundle) ──────────────────────── */}
       <SectionCard>
         <CardTitle>Warehouse documents</CardTitle>
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/JourneyWizard.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/JourneyWizard.tsx
index 6eabb83ad..5e0114c93 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/JourneyWizard.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/JourneyWizard.tsx
@@ -51,17 +51,10 @@ export function buildJourneySteps(
   if (isCustoms && milestones.length > 0) {
     const sorted = [...milestones].sort((a, b) => a.sortOrder - b.sortOrder);
     const firstPendingId = sorted.find((m) => m.status === "PENDING")?.id;
-    const feeActive = status === "AWAITING_CLEARANCE_PAYMENT";
     const delivered = ["COMPLETED", "DELIVERED"].includes(status);
 
     const steps: JourneyStep[] = [
       { key: "booked", label: "Booking initiated", state: "done" },
-      {
-        key: "fee",
-        label: "Clearance fee paid",
-        state: feeActive ? "active" : "done",
-        owner: "CUST",
-      },
       ...sorted.map<JourneyStep>((m) => ({
         key: m.id,
         label: m.milestoneLabel,
@@ -71,7 +64,7 @@ export function buildJourneySteps(
             ? "done"
             : m.status === "SKIPPED"
               ? "skipped"
-              : !feeActive && m.id === firstPendingId
+              : m.id === firstPendingId
                 ? "active"
                 : "idle",
       })),
@@ -79,7 +72,7 @@ export function buildJourneySteps(
     ];
     // Every known milestone is done but the booking hasn't closed yet — the
     // delivery step is what's in progress.
-    if (!feeActive && !firstPendingId && !delivered) {
+    if (!firstPendingId && !delivered) {
       steps[steps.length - 1].state = "active";
     }
     return steps;
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WarehouseLocationCard.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WarehouseLocationCard.tsx
new file mode 100644
index 000000000..799059451
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WarehouseLocationCard.tsx
@@ -0,0 +1,71 @@
+import { Group, Paper, Stack, Text, Divider } from "@mantine/core";
+import { useQuery } from "@tanstack/react-query";
+import { Warehouse as WarehouseIcon } from "lucide-react";
+
+import { warehouseService } from "@/services/warehouse.service";
+
+interface WarehouseLocationCardProps {
+  bookingId: string;
+}
+
+function Row({ label, value }: { label: string; value: React.ReactNode }) {
+  return (
+    <Group justify="space-between" wrap="nowrap">
+      <Text size="sm" c="dimmed">
+        {label}
+      </Text>
+      <Text size="sm" fw={500} ta="right">
+        {value}
+      </Text>
+    </Group>
+  );
+}
+
+export function WarehouseLocationCard({ bookingId }: WarehouseLocationCardProps) {
+  const { data, isLoading } = useQuery({
+    queryKey: ["warehouse-inventory", "booking-location", bookingId],
+    queryFn: () => warehouseService.bookingLocation(bookingId),
+  });
+
+  const items = data ?? [];
+  const latest = items[0];
+
+  return (
+    <Paper withBorder radius="md" p="lg">
+      <Stack gap="md">
+        <Group gap="xs">
+          <WarehouseIcon size={18} />
+          <Text fw={700}>Warehouse Location</Text>
+        </Group>
+
+        <Divider />
+
+        {isLoading ? (
+          <Text size="sm" c="dimmed">
+            Loading…
+          </Text>
+        ) : !latest ? (
+          <Text size="sm" c="dimmed">
+            Your cargo will appear here once it arrives at the warehouse.
+          </Text>
+        ) : (
+          <Stack gap="xs">
+            <Row
+              label="Warehouse"
+              value={latest.warehouse ? `${latest.warehouse.name} (${latest.warehouse.code})` : "—"}
+            />
+            <Row
+              label="Yard"
+              value={latest.yard ? `${latest.yard.name} (${latest.yard.code})` : "—"}
+            />
+            <Row
+              label="Zone"
+              value={latest.zone ? `${latest.zone.name} (${latest.zone.code})` : "—"}
+            />
+            <Row label="Arrived At" value={latest.arrivedAt ? new Date(latest.arrivedAt).toLocaleString() : "—"} />
+          </Stack>
+        )}
+      </Stack>
+    </Paper>
+  );
+}
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WarehousePaymentsSection.tsx b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WarehousePaymentsSection.tsx
index acd4dbb25..927f1dbfb 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WarehousePaymentsSection.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/BookingDetailPage/components/WarehousePaymentsSection.tsx
@@ -1,6 +1,6 @@
 import { ActionIcon, Box, Button, Group, Stack, Text } from "@mantine/core";
 import { useMutation, useQuery } from "@tanstack/react-query";
-import { CreditCard, Download, Receipt } from "lucide-react";
+import { CreditCard, Download, FileText, Receipt } from "lucide-react";
 import { useState } from "react";
 import toast from "react-hot-toast";
 
@@ -184,23 +184,27 @@ export function WarehousePaymentsSection({ bookingId }: { bookingId: string }) {
                     Pay
                   </Button>
                 )}
-                <ActionIcon
-                  variant="subtle"
-                  color="gray"
-                  aria-label="Download invoice"
-                  onClick={() => download(inv)}
-                >
-                  <Download size={16} />
-                </ActionIcon>
-                {Number(inv.paidAmount) > 0 && (
-                  <ActionIcon
-                    variant="subtle"
-                    color="gray"
-                    aria-label="Download receipt"
-                    onClick={() => downloadReceipt(inv)}
-                  >
-                    <Receipt size={16} />
-                  </ActionIcon>
+                {invoices.length > 1 && (
+                  <>
+                    <ActionIcon
+                      variant="subtle"
+                      color="gray"
+                      aria-label="Download invoice"
+                      onClick={() => download(inv)}
+                    >
+                      <Download size={16} />
+                    </ActionIcon>
+                    {Number(inv.paidAmount) > 0 && (
+                      <ActionIcon
+                        variant="subtle"
+                        color="gray"
+                        aria-label="Download receipt"
+                        onClick={() => downloadReceipt(inv)}
+                      >
+                        <Receipt size={16} />
+                      </ActionIcon>
+                    )}
+                  </>
                 )}
               </Group>
             </Group>
@@ -208,6 +212,40 @@ export function WarehousePaymentsSection({ bookingId }: { bookingId: string }) {
         })}
       </Stack>
 
+      {/* Single invoice: a prominent download instead of a lone row icon. */}
+      {invoices.length === 1 && (
+        <>
+          <Button
+            fullWidth
+            mt="md"
+            variant="default"
+            radius={10}
+            leftSection={<FileText size={17} color="#475569" />}
+            onClick={() => download(invoices[0])}
+            styles={{
+              root: { height: 46 },
+              label: { fontSize: 13.5, fontWeight: 700, color: "#10202F" },
+            }}
+          >
+            Download invoice
+          </Button>
+          {Number(invoices[0].paidAmount) > 0 && (
+            <Button
+              fullWidth
+              mt={8}
+              variant="subtle"
+              color="gray"
+              radius={10}
+              leftSection={<Receipt size={17} />}
+              onClick={() => downloadReceipt(invoices[0])}
+              styles={{ root: { height: 42 }, label: { fontSize: 13, fontWeight: 700 } }}
+            >
+              Download receipt
+            </Button>
+          )}
+        </>
+      )}
+
       <PaymentMethodModal
         opened={payInvoice !== null}
         onClose={closePayModal}
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/NewBookingPage.tsx b/apps/edr-freight-web/portal/src/pages/bookings/NewBookingPage.tsx
index d3808c8ce..700967b68 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/NewBookingPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/NewBookingPage.tsx
@@ -38,6 +38,7 @@ import {
   bookingFormSchema,
   getRouteDirection,
   initialBookingFormValues,
+  isForwarderOperation,
   operationToProfileType,
   operationToTradeDirection,
   stepFields,
@@ -384,25 +385,23 @@ export default function NewBookingPage() {
     [profileTypes],
   );
 
-  // Stamp the booking to the right operational profile. Import/Export (and their
-  // "as FF" variants) switch the active mode so the matching onboarding documents
-  // are attached; Intercity uses whatever profile is already active.
-  const handleOperationSelect = (op: OperationType) => {
-    if (op === "intercity") return;
-    const target = operationToProfileType(op, profileTypes);
-    if (auth.activeProfileType !== target) {
-      void auth.switchMode(target as never);
-    }
-  };
-
-  // Onboarding documents for the active profile — shown read-only in the
-  // Documents step and attached to the booking on submit by the backend.
-  const onboardingDocs = useMemo(() => {
+  // The company_profile this booking belongs to, derived from the selected
+  // operation: import→importer, export→exporter, and the "as FF" variants →
+  // freight_forwarder. A forwarder booking is pinned explicitly on submit
+  // (companyProfileId) because trade direction alone can't distinguish it.
+  const selectedProfile = useMemo(() => {
     const profiles = auth.company?.company?.companyProfiles ?? [];
-    const active =
-      profiles.find((p) => p.id === auth.activeCompanyProfileId) ?? profiles[0];
-    return active?.licenseFiles ?? [];
-  }, [auth.company, auth.activeCompanyProfileId]);
+    if (!operationType) return profiles[0] ?? null;
+    const targetType = operationToProfileType(operationType, profileTypes);
+    return profiles.find((p) => p.type === targetType) ?? profiles[0] ?? null;
+  }, [auth.company, operationType, profileTypes]);
+
+  // Onboarding documents for the resolved profile — shown read-only in the
+  // Documents step and attached to the booking on submit by the backend.
+  const onboardingDocs = useMemo(
+    () => selectedProfile?.licenseFiles ?? [],
+    [selectedProfile],
+  );
 
   const [pricingData, setPricingData] = useState<GeneratePriceResponse | null>(
     null,
@@ -483,7 +482,16 @@ export default function NewBookingPage() {
       (s) => s.id === data.serviceTypeId,
     )!;
 
+    // Pin the profile only for a forwarder booking — trade direction resolves
+    // importer/exporter on its own, but can't tell a forwarder apart.
+    const forwarderProfileId =
+      data.operationType &&
+      isForwarderOperation(data.operationType, profileTypes)
+        ? selectedProfile?.id
+        : undefined;
+
     return {
+      ...(forwarderProfileId ? { companyProfileId: forwarderProfileId } : {}),
       bookingType: isContract
         ? Freight.BookingType.GeneralContract
         : Freight.BookingType.OneTime,
@@ -711,7 +719,6 @@ export default function NewBookingPage() {
             <Step0OperationType
               form={form}
               allowedOperations={allowedOperations}
-              onSelect={handleOperationSelect}
             />
           )}
           {step === 1 && (
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/clearance/BookingActionButton.tsx b/apps/edr-freight-web/portal/src/pages/bookings/clearance/BookingActionButton.tsx
index f6df38e9b..ec9b8c509 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/clearance/BookingActionButton.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/clearance/BookingActionButton.tsx
@@ -3,7 +3,6 @@ import { useDisclosure } from "@mantine/hooks";
 import {
   AlertCircle,
   ArrowRight,
-  CreditCard,
   PackagePlus,
   PencilLine,
   Upload,
@@ -12,7 +11,6 @@ import { useNavigate } from "react-router-dom";
 
 import type { Freight } from "@edr/types";
 
-import { PayClearanceFeeButton } from "@/pages/bookings/payments/PayClearanceFeeButton";
 import { ResubmitBookingModal } from "@/pages/bookings/resubmit/ResubmitBookingModal";
 
 import { BookingActionModal } from "./BookingActionModal";
@@ -25,7 +23,6 @@ const ICON_BY_KIND: Record<
   BookingActionKind,
   typeof Upload
 > = {
-  PAY_CLEARANCE: CreditCard,
   UPLOAD_DOCUMENTS: Upload,
   FIX_DOCUMENTS: AlertCircle,
   SCHEDULE_OPERATION: ArrowRight,
@@ -59,19 +56,6 @@ export function BookingActionButton({
 
   if (!isChangesRequested && !action) return null;
 
-  // The prepaid clearance service fee has its own payment flow (method modal +
-  // provider redirect) — delegate to the self-contained pay button.
-  if (action?.kind === "PAY_CLEARANCE") {
-    return (
-      <PayClearanceFeeButton
-        sourceId={booking.id}
-        currency={booking.paymentCurrency}
-        label={action.label}
-        size={size}
-      />
-    );
-  }
-
   const Icon = action ? ICON_BY_KIND[action.kind] : PencilLine;
   const label = action ? action.label : "Update & resubmit";
   // BOOK navigates to the booking form (cargo + day + window check) — the
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/clearance/bookingNextAction.ts b/apps/edr-freight-web/portal/src/pages/bookings/clearance/bookingNextAction.ts
index 2bdd976a9..1ebb047a6 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/clearance/bookingNextAction.ts
+++ b/apps/edr-freight-web/portal/src/pages/bookings/clearance/bookingNextAction.ts
@@ -7,7 +7,6 @@ import type { Freight } from "@edr/types";
  * to operation.
  */
 export type BookingActionKind =
-  | "PAY_CLEARANCE" // AWAITING_CLEARANCE_PAYMENT — pay the prepaid clearance service fee
   | "UPLOAD_DOCUMENTS" // AWAITING_DOCUMENTS — upload the required clearance docs
   | "FIX_DOCUMENTS" // DOCUMENTS_UNDER_REVIEW — some docs queried, re-upload them
   | "SCHEDULE_OPERATION" // CLEARANCE_READY (legacy with cargo) — pick a day and proceed
@@ -24,11 +23,6 @@ export interface BookingNextAction {
 }
 
 const ACTION_BY_STATUS: Record<string, BookingNextAction> = {
-  AWAITING_CLEARANCE_PAYMENT: {
-    kind: "PAY_CLEARANCE",
-    label: "Pay clearance fee",
-    title: "Pay the clearance service fee",
-  },
   AWAITING_DOCUMENTS: {
     kind: "UPLOAD_DOCUMENTS",
     label: "Upload documents",
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/delivery/ApproveDeliveryModal.tsx b/apps/edr-freight-web/portal/src/pages/bookings/delivery/ApproveDeliveryModal.tsx
index 90e95369f..9be64aad4 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/delivery/ApproveDeliveryModal.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/delivery/ApproveDeliveryModal.tsx
@@ -1,4 +1,15 @@
-import { Alert, Button, Group, Loader, Modal, Stack, Text, TextInput } from "@mantine/core";
+import {
+  Alert,
+  Badge,
+  Button,
+  Group,
+  Loader,
+  Modal,
+  Stack,
+  Text,
+  TextInput,
+  UnstyledButton,
+} from "@mantine/core";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { CheckCircle2, Info } from "lucide-react";
 import { useEffect, useState } from "react";
@@ -36,7 +47,10 @@ const downloadBlob = (blob: Blob, filename: string) => {
 
 /**
  * Approve-delivery flow: open the handover document for the customer to review,
- * then apply their saved signature (approve) and hand back the signed PDF.
+ * then sign it with their typed full name (saved signature applied when present).
+ * Self-haul: one booking-level handover, signed once. EDR last-mile: one
+ * handover per delivering truck — the customer signs each; when the last one is
+ * signed the delivery completes automatically.
  */
 export function ApproveDeliveryModal({
   bookingId,
@@ -48,15 +62,33 @@ export function ApproveDeliveryModal({
   const queryClient = useQueryClient();
   const [pdfUrl, setPdfUrl] = useState<string | null>(null);
   const [signerName, setSignerName] = useState("");
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+
+  const { data: handovers } = useQuery({
+    queryKey: ["booking-handovers", bookingId],
+    queryFn: () => bookingsService.listBookingHandovers(bookingId),
+    enabled: opened && Boolean(bookingId),
+    staleTime: 0,
+  });
+
+  // Per-truck mode: any EDR last-mile handover means one signature per truck.
+  const edrMode = (handovers ?? []).some((h) => h.mileType === "EDR_LAST_MILE");
+  const unsigned = (handovers ?? []).filter((h) => !h.signedAt);
+  const selected =
+    (handovers ?? []).find((h) => h.id === selectedId && !h.signedAt) ?? unsigned[0] ?? null;
 
   const {
     data: docBlob,
     isLoading,
     isError,
   } = useQuery({
-    queryKey: ["booking-handover-doc", bookingId],
-    queryFn: () => bookingsService.downloadBookingHandoverDocument(bookingId),
-    enabled: opened && Boolean(bookingId),
+    queryKey: ["booking-handover-doc", bookingId, edrMode ? selected?.id : "booking"],
+    queryFn: () =>
+      bookingsService.downloadBookingHandoverDocument(
+        bookingId,
+        edrMode ? selected?.id : undefined,
+      ),
+    enabled: opened && Boolean(bookingId) && (!edrMode || Boolean(selected)),
     staleTime: 0,
   });
 
@@ -70,10 +102,32 @@ export function ApproveDeliveryModal({
     return () => URL.revokeObjectURL(url);
   }, [docBlob]);
 
+  const invalidateBooking = () =>
+    Promise.all([
+      queryClient.invalidateQueries({
+        queryKey: api.bookings.get.queryKey({ id: bookingId }),
+      }),
+      queryClient.invalidateQueries({ queryKey: api.bookings.list.queryKey() }),
+      queryClient.invalidateQueries({ queryKey: ["companies", "getDashboard"] }),
+    ]);
+
+  const onSignError = (error: unknown) => {
+    const message = errorMessage(error);
+    toast.error(message);
+    if (message.toLowerCase().includes("save your signature")) {
+      onClose();
+      navigate("/signature");
+    } else if (/demurrage|storage|warehouse invoice|fully paid/i.test(message)) {
+      onClose();
+      navigate("/billing");
+    }
+  };
+
   const handoverMutation = useMutation(
     api.bookings.downloadHandoverDocument.mutationOptions(),
   );
 
+  // Booking-level (self-haul) approval — signs every handover at once.
   const approve = useMutation({
     ...api.bookings.approveDelivery.mutationOptions(),
     onSuccess: async (result) => {
@@ -87,30 +141,35 @@ export function ApproveDeliveryModal({
         toast.success("Delivery approved and handover signed");
         toast.error("Signed handover document could not be downloaded");
       }
-      await Promise.all([
-        queryClient.invalidateQueries({
-          queryKey: api.bookings.get.queryKey({ id: bookingId }),
-        }),
-        queryClient.invalidateQueries({ queryKey: api.bookings.list.queryKey() }),
-        queryClient.invalidateQueries({ queryKey: ["companies", "getDashboard"] }),
-      ]);
+      await invalidateBooking();
       onApproved?.();
       onClose();
     },
-    onError: (error) => {
-      const message = errorMessage(error);
-      toast.error(message);
-      if (message.toLowerCase().includes("save your signature")) {
-        onClose();
-        navigate("/signature");
-      } else if (/demurrage|storage|warehouse invoice|fully paid/i.test(message)) {
-        onClose();
-        navigate("/billing");
-      }
-    },
+    onError: onSignError,
   });
 
-  const busy = approve.isPending || handoverMutation.isPending;
+  // Per-truck (EDR last-mile) signature — one handover at a time.
+  const signOne = useMutation({
+    mutationFn: ({ handoverId, name }: { handoverId: string; name: string }) =>
+      bookingsService.signHandover(handoverId, name),
+    onSuccess: async (result) => {
+      await queryClient.invalidateQueries({
+        queryKey: ["booking-handovers", bookingId],
+      });
+      setSelectedId(null);
+      if (result.allSigned) {
+        toast.success("All handovers signed — delivery confirmed");
+        await invalidateBooking();
+        onApproved?.();
+        onClose();
+      } else {
+        toast.success("Handover signed — please sign the remaining truck(s)");
+      }
+    },
+    onError: onSignError,
+  });
+
+  const busy = approve.isPending || handoverMutation.isPending || signOne.isPending;
 
   return (
     <Modal
@@ -123,12 +182,42 @@ export function ApproveDeliveryModal({
       <Stack gap="md">
         <Alert color="blue" variant="light" icon={<Info size={16} />}>
           <Text size="sm">
-            Review the handover document below, then type your full name to sign and
-            confirm you received the goods. Your saved signature is applied automatically
-            if you have one.
+            {edrMode
+              ? "Your goods were delivered by EDR truck(s). Review and sign the handover for each truck to confirm you received the goods — delivery completes once every truck is signed."
+              : "Review the handover document below, then type your full name to sign and confirm you received the goods. Your saved signature is applied automatically if you have one."}
           </Text>
         </Alert>
 
+        {edrMode && (handovers?.length ?? 0) > 0 && (
+          <Stack gap={4}>
+            {handovers!.map((h) => (
+              <UnstyledButton
+                key={h.id}
+                onClick={() => !h.signedAt && setSelectedId(h.id)}
+                style={{
+                  padding: "8px 12px",
+                  borderRadius: 8,
+                  border:
+                    selected?.id === h.id
+                      ? "1px solid var(--mantine-color-edr-green-6)"
+                      : "1px solid var(--mantine-color-gray-3)",
+                  cursor: h.signedAt ? "default" : "pointer",
+                }}
+              >
+                <Group justify="space-between" wrap="nowrap">
+                  <Text size="sm" fw={600}>
+                    {h.truckPlate ? `Truck ${h.truckPlate}` : "Booking handover"} —{" "}
+                    {h.reference}
+                  </Text>
+                  <Badge color={h.signedAt ? "green" : "yellow"} variant="light">
+                    {h.signedAt ? `Signed${h.signerName ? ` — ${h.signerName}` : ""}` : "Awaiting signature"}
+                  </Badge>
+                </Group>
+              </UnstyledButton>
+            ))}
+          </Stack>
+        )}
+
         {isLoading ? (
           <Group justify="center" py="xl">
             <Loader size="sm" />
@@ -170,10 +259,21 @@ export function ApproveDeliveryModal({
             color="edr-green"
             leftSection={<CheckCircle2 size={16} />}
             loading={busy}
-            disabled={isLoading || isError || !signerName.trim()}
-            onClick={() => approve.mutate({ id: bookingId, signerName: signerName.trim() })}
+            disabled={
+              isLoading ||
+              isError ||
+              !signerName.trim() ||
+              (edrMode && !selected)
+            }
+            onClick={() =>
+              edrMode && selected
+                ? signOne.mutate({ handoverId: selected.id, name: signerName.trim() })
+                : approve.mutate({ id: bookingId, signerName: signerName.trim() })
+            }
           >
-            Approve &amp; sign delivery
+            {edrMode && selected?.truckPlate
+              ? `Sign for truck ${selected.truckPlate}`
+              : "Approve & sign delivery"}
           </Button>
         </Group>
       </Stack>
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step-documents.tsx b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step-documents.tsx
index 880efb846..de105bf21 100644
--- a/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step-documents.tsx
+++ b/apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step-documents.tsx
@@ -7,6 +7,7 @@ import { type UseFormReturn } from "react-hook-form";
 import useAuth from "@/hooks/useAuth";
 import { api } from "@/services/api";
 import {
+  operationToProfileType,
   type BookingDocuments,
   type BookingFormInputValues,
   type BookingFormValues,
@@ -58,11 +59,20 @@ export function StepDocuments({ form }: { form: BookingForm }) {
     }),
   );
 
-  // Documents already on file from onboarding (read-only reference).
+  // Documents already on file from onboarding (read-only reference), for the
+  // profile this booking's operation resolves to (importer/exporter/forwarder).
   const onboardingDocs = (() => {
     const profiles = auth.company?.company?.companyProfiles ?? [];
+    const operationType = form.watch("operationType");
+    const targetType = operationType
+      ? operationToProfileType(
+          operationType,
+          profiles.map((p) => p.type),
+        )
+      : null;
     const active =
-      profiles.find((p) => p.id === auth.activeCompanyProfileId) ?? profiles[0];
+      (targetType ? profiles.find((p) => p.type === targetType) : undefined) ??
+      profiles[0];
     return active?.licenseFiles ?? [];
   })();
 
diff --git a/apps/edr-freight-web/portal/src/pages/bookings/payments/PayClearanceFeeButton.tsx b/apps/edr-freight-web/portal/src/pages/bookings/payments/PayClearanceFeeButton.tsx
deleted file mode 100644
index 54a7e7d9d..000000000
--- a/apps/edr-freight-web/portal/src/pages/bookings/payments/PayClearanceFeeButton.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import { Button, type ButtonProps } from "@mantine/core";
-import { useMutation, useQuery } from "@tanstack/react-query";
-import { CreditCard } from "lucide-react";
-import { useState } from "react";
-
-import { ModalSafeWrapper } from "@/components/customer-actions/ModalSafeWrapper";
-import { isPayable } from "@/pages/billing/invoice-ui";
-import { api } from "@/services/api";
-import { invoicesService } from "@/services/invoices.service";
-import {
-  paymentsService,
-  type PaymentMethod,
-} from "@/services/payments.service";
-import { PaymentMethodModal } from "../BookingDetailPage/components/PaymentMethodModal";
-
-/**
- * Payment flow for the prepaid customs clearance service fee. The fee is its
- * own `clearance`-source invoice — sourceId is the contract id (ONE_TIME,
- * contract status AWAITING_CLEARANCE_PAYMENT) or the booking id (GENERAL
- * shipment request, booking status AWAITING_CLEARANCE_PAYMENT). Paying it
- * unlocks the clearance document upload; same modal + provider redirect as
- * booking payment.
- */
-export function useClearanceFeePayment(sourceId: string) {
-  const [modalOpen, setModalOpen] = useState(false);
-
-  const { data: invoices = [] } = useQuery({
-    queryKey: ["clearance-invoices", sourceId],
-    queryFn: () => invoicesService.listForSource("clearance", sourceId),
-    enabled: Boolean(sourceId),
-  });
-  const payableInvoice = invoices.find((inv) => isPayable(inv.status)) ?? null;
-
-  const mutation = useMutation({
-    mutationFn: (method: PaymentMethod) => {
-      if (!payableInvoice) {
-        throw new Error(
-          "No payable clearance-fee invoice found yet. Please refresh or contact support.",
-        );
-      }
-      return api.invoices.pay.call({
-        id: payableInvoice.id,
-        payload: { method, platform: "web" },
-      });
-    },
-    onSuccess: (data, method) => {
-      const redirectUrl =
-        data?.clientAction?.type === "REDIRECT" && data.clientAction.url
-          ? data.clientAction.url
-          : paymentsService.checkoutUrlForInvoice({
-              invoiceId: payableInvoice!.id,
-              method,
-            });
-      window.location.href = redirectUrl;
-    },
-  });
-
-  const close = () => {
-    if (!mutation.isPending) {
-      setModalOpen(false);
-      mutation.reset();
-    }
-  };
-
-  return {
-    invoice: payableInvoice,
-    modalOpen,
-    open: () => setModalOpen(true),
-    close,
-    processing: mutation.isPending,
-    error: mutation.isError
-      ? mutation.error instanceof Error
-        ? mutation.error.message
-        : "Could not start payment. Please try again."
-      : null,
-    confirm: (method: PaymentMethod) => mutation.mutate(method),
-  };
-}
-
-interface PayClearanceFeeButtonProps {
-  /** Contract id (ONE_TIME) or booking id (GENERAL shipment) the fee bills. */
-  sourceId: string;
-  /** Fallback currency while the invoice is loading. */
-  currency?: string;
-  label?: string;
-  size?: ButtonProps["size"];
-  fullWidth?: boolean;
-}
-
-/** Self-contained "Pay clearance fee" action — modal in place, no navigation. */
-export function PayClearanceFeeButton({
-  sourceId,
-  currency,
-  label = "Pay clearance fee",
-  size = "xs",
-  fullWidth,
-}: PayClearanceFeeButtonProps) {
-  const pay = useClearanceFeePayment(sourceId);
-
-  return (
-    <ModalSafeWrapper>
-      <Button
-        size={size}
-        radius="md"
-        fw={700}
-        fz={13}
-        color="edr-green"
-        fullWidth={fullWidth}
-        leftSection={<CreditCard size={14} />}
-        onClick={(e) => {
-          e.stopPropagation();
-          pay.open();
-        }}
-      >
-        {label}
-      </Button>
-
-      <PaymentMethodModal
-        opened={pay.modalOpen}
-        onClose={pay.close}
-        amountLabel={
-          pay.invoice
-            ? `${Number(
-                pay.invoice.balanceAmount ?? pay.invoice.totalAmount,
-              ).toLocaleString()} ${pay.invoice.currency}`
-            : undefined
-        }
-        currency={pay.invoice?.currency ?? currency}
-        processing={pay.processing}
-        error={pay.error}
-        onConfirm={pay.confirm}
-      />
-    </ModalSafeWrapper>
-  );
-}
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/ContractDetailPage.tsx b/apps/edr-freight-web/portal/src/pages/contracts/ContractDetailPage.tsx
index f6c3098a0..fe9209c1d 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/ContractDetailPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/ContractDetailPage.tsx
@@ -72,7 +72,6 @@ import { ContractClearancePanel } from "./ContractClearancePanel";
 import { ContractClearanceWorkflowBanner } from "./ContractClearanceWorkflowBanner";
 import { ClearanceUploadedDocumentsPanel } from "@/components/contracts/ClearanceUploadedDocumentsPanel";
 import { InitiateBookingButton } from "@/components/customer-actions/ContractCustomerAction";
-import { PayClearanceFeeButton } from "@/pages/bookings/payments/PayClearanceFeeButton";
 import { formatRateUnit } from "./new-contract-form/unit-rates";
 import { getContractBookingAction } from "./contract-booking-action";
 import { closedWindowMessage, hasOpenWindow } from "./booking-window";
@@ -438,9 +437,6 @@ export default function ContractDetailPage() {
   // clearance is finalized.
   const canUploadClearance =
     CLEARANCE_UPLOAD_STATUSES.includes(contract.status) && !clearanceFinalized;
-  // Prepaid clearance service fee gate (Path B) — the document step stays
-  // locked until the fee invoice settles.
-  const awaitingClearanceFee = contract.status === "AWAITING_CLEARANCE_PAYMENT";
 
   return (
     <Box style={{ padding: "28px 32px 40px" }}>
@@ -574,13 +570,6 @@ export default function ContractDetailPage() {
                 Global Logistics is creating your booking
               </Badge>
             )}
-            {awaitingClearanceFee && (
-              <PayClearanceFeeButton
-                sourceId={contract.id}
-                currency={contract.paymentCurrency}
-                size="md"
-              />
-            )}
             {canUploadClearance && (
               <Button
                 color="edr-green"
@@ -935,8 +924,8 @@ export default function ContractDetailPage() {
                     )}
                     {item.isClearance && (
                       <Text fz={12} c="orange.7" fw={600}>
-                        Paid in advance, before clearance — excluded from
-                        shipment invoices
+                        Customs service fee — billed on your shipment booking
+                        invoice together with the freight
                       </Text>
                     )}
                   </Box>
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/NewContractPage.tsx b/apps/edr-freight-web/portal/src/pages/contracts/NewContractPage.tsx
index 0b95f7181..27a1c242f 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/NewContractPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/NewContractPage.tsx
@@ -19,6 +19,7 @@ import {
   Title,
 } from "@mantine/core";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { isAxiosError } from "axios";
 import {
   AlertCircle,
   Check,
@@ -38,6 +39,7 @@ import {
 } from "react-router-dom";
 import useAuth from "@/hooks/useAuth";
 import {
+  CONTAINER_SIZES,
   CONTRACT_STEPS,
   ContractFormInputValues,
   contractFormSchema,
@@ -49,6 +51,7 @@ import {
 } from "./new-contract-form/schema";
 import {
   getRouteDirection,
+  isForwarderOperation,
   operationToProfileType,
   operationToTradeDirection,
 } from "./new-contract-form/helpers";
@@ -124,6 +127,30 @@ export default function NewContractPage({
     );
   }
 
+  // A suspended/blacklisted account must be told its real status — falling
+  // through to the wizard here only to fail at submit read as "pending" before.
+  if (
+    !auth.isPending &&
+    (auth.companyStatus === "suspended" || auth.companyStatus === "blacklisted")
+  ) {
+    return (
+      <GateNotice
+        title={
+          auth.companyStatus === "suspended"
+            ? "Account Suspended"
+            : "Account Blacklisted"
+        }
+        body={
+          auth.companyStatus === "suspended"
+            ? "Your company account has been suspended by EDR staff, so new contracts are disabled. Please contact EDR support for details."
+            : "Your company account has been blacklisted, so new contracts are disabled. Please contact EDR support."
+        }
+        actionLabel="Back to Contracts"
+        onAction={() => navigate("/contracts")}
+      />
+    );
+  }
+
   // Profile changes pending review lock out new contract creation too.
   if (!auth.isPending && auth.isUnderReview) {
     return (
@@ -192,6 +219,12 @@ export default function NewContractPage({
     },
   });
 
+  // 422 from generate-price = a required rate isn't configured for the chosen
+  // route — the customer can't fix it, so it's surfaced as a blocking modal.
+  const rateNotConfigured =
+    isAxiosError(persistAndPriceMutation.error) &&
+    persistAndPriceMutation.error.response?.status === 422;
+
   const confirmMutation = useMutation({
     mutationFn: async () => {
       if (!priceContractId) throw new Error("No contract to confirm");
@@ -349,13 +382,19 @@ export default function NewContractPage({
   // badges. Intercity rides any customer profile, so always "approved".
   const operationStatus = useMemo(
     () =>
-      (op: OperationType): "approved" | "pending" | "rejected" | "missing" => {
+      (
+        op: OperationType,
+      ): "approved" | "pending" | "rejected" | "suspended" | "missing" => {
         if (op === "intercity") return "approved";
         const target = operationToProfileType(op, profileTypes);
         const status = profileStatusByType.get(target);
         if (!status) return "missing";
         if (status === "active") return "approved";
         if (status === "rejected") return "rejected";
+        // Suspension is per-role: the customer keeps working under their other
+        // roles, so this operation must say "suspended", not "pending".
+        if (status === "suspended" || status === "blacklisted")
+          return "suspended";
         return "pending";
       },
     [profileStatusByType, profileTypes],
@@ -411,7 +450,9 @@ export default function NewContractPage({
     mutationFn: async (profileId: string) => {
       const res = await auth.reapplyProfile(profileId);
       if (!res.success) {
-        throw new Error(res.error?.message ?? "Failed to resubmit for approval");
+        throw new Error(
+          res.error?.message ?? "Failed to resubmit for approval",
+        );
       }
     },
     onSuccess: () => setPendingApprovalProfile(null),
@@ -439,10 +480,8 @@ export default function NewContractPage({
       form.setValue("operationType", undefined as never, { shouldDirty: true });
       return;
     }
-    // Case 1 — approved: proceed, switching the active profile if needed.
-    if (auth.activeProfileType !== target) {
-      void auth.switchMode(target as never);
-    }
+    // Case 1 — approved: proceed. The profile is resolved from the operation at
+    // submit time (a forwarder operation pins it explicitly), so nothing to set.
   };
 
   const handleCreateProfileConfirm = () => {
@@ -506,22 +545,22 @@ export default function NewContractPage({
     const isContainer = data.cargoType === "container";
     const isGeneral = data.contractKind === "general_contract";
 
-    // Cargo scope rows — no quantities (doc §5.4). Container: one row per enabled
-    // size; bulk: a single commodity row. Both GENERAL and ONE_TIME are uncapped
-    // (quantityCap omitted → NULL): the customer books repeatedly against a
-    // GENERAL contract until its validity expires.
+    // Cargo scope rows — no quantities (doc §5.4). Container: ALWAYS both sizes
+    // (rates quoted for both; per-booking quantities can zero a size out) and no
+    // description — that moved to booking time. Bulk: a single commodity row.
+    // Both GENERAL and ONE_TIME are uncapped (quantityCap omitted → NULL): the
+    // customer books repeatedly against a GENERAL contract until its validity
+    // expires.
     const cargoScope: Freight.CreateContractCargoScopeDto[] = isContainer
-      ? data.enabledContainerSizes.map((size) => ({
-          containerSize: size,
-          // Required cargo description — what the containers carry.
-          cargoFreeText: data.cargoFreeText.trim() || undefined,
-        }))
+      ? CONTAINER_SIZES.map((size) => ({
+        containerSize: size,
+      }))
       : [
-          {
-            cargoTypeId: data.cargoTypePath?.[1] || undefined,
-            cargoFreeText: data.cargoFreeText || undefined,
-          },
-        ];
+        {
+          cargoTypeId: data.cargoTypePath?.[1] || undefined,
+          cargoFreeText: data.cargoFreeText || undefined,
+        },
+      ];
 
     // Route — a single origin→destination lane, general contracts included.
     const routes: Freight.CreateContractRouteInputDto[] = [
@@ -532,7 +571,20 @@ export default function NewContractPage({
       },
     ];
 
+    // Pin the profile only for a forwarder contract (trade direction can't tell
+    // a forwarder apart from a direct import/export).
+    const forwarderProfileId =
+      data.operationType &&
+        isForwarderOperation(data.operationType, profileTypes)
+        ? (auth.company?.company?.companyProfiles ?? []).find(
+          (p) =>
+            p.type ===
+            operationToProfileType(data.operationType!, profileTypes),
+        )?.id
+        : undefined;
+
     return {
+      ...(forwarderProfileId ? { companyProfileId: forwarderProfileId } : {}),
       contractKind: isGeneral
         ? Freight.ContractKind.General
         : Freight.ContractKind.OneTime,
@@ -547,11 +599,11 @@ export default function NewContractPage({
       // booking time, but only on contracts created WITH_RETURN.
       ...(isContainer
         ? {
-            equipmentReturn:
-              data.equipmentReturn === "with_return"
-                ? "WITH_RETURN"
-                : "WITHOUT_RETURN",
-          }
+          equipmentReturn:
+            data.equipmentReturn === "with_return"
+              ? "WITH_RETURN"
+              : "WITHOUT_RETURN",
+        }
         : {}),
       isHazardous: data.isHazardous,
       // Reefer is a contract-level flag for both container and bulk.
@@ -580,7 +632,8 @@ export default function NewContractPage({
         ? { customsClearingEnabled: true }
         : {
           customsClearingEnabled: false,
-          customsClearingAgent: data.customsClearingAgent?.trim() || undefined,
+          customsClearingAgent:
+            data.customsClearingAgent?.trim() || undefined,
         }),
       cargoScope,
       routes,
@@ -695,10 +748,7 @@ export default function NewContractPage({
                   <Text size="sm" fw={600}>
                     What the reviewer asked for:
                   </Text>
-                  <Text
-                    size="sm"
-                    style={{ whiteSpace: "pre-wrap" }}
-                  >
+                  <Text size="sm" style={{ whiteSpace: "pre-wrap" }}>
                     {editContract.latestChangeRequestNote}
                   </Text>
                   <Text size="sm" c="dimmed" mt={2}>
@@ -716,7 +766,7 @@ export default function NewContractPage({
             <StepIndicator step={step} steps={visibleSteps} />
           </Box>
 
-          {persistAndPriceMutation.isError && (
+          {persistAndPriceMutation.isError && !rateNotConfigured && (
             <Alert
               color="red"
               icon={<AlertCircle size={16} />}
@@ -734,6 +784,28 @@ export default function NewContractPage({
             </Alert>
           )}
 
+          {/* Pricing not configured (422) — a rate is missing on the chosen
+              route, nothing the customer can fix. Block with a modal. */}
+          <Modal
+            opened={rateNotConfigured}
+            onClose={() => persistAndPriceMutation.reset()}
+            title="Contract creation unavailable"
+            centered
+          >
+            <Stack gap="sm">
+              <Text size="sm">
+                You can&apos;t create a contract right now — pricing hasn&apos;t
+                been configured for the selected route yet. Please contact
+                support for assistance.
+              </Text>
+              <Group justify="flex-end">
+                <Button onClick={() => persistAndPriceMutation.reset()}>
+                  OK
+                </Button>
+              </Group>
+            </Stack>
+          </Modal>
+
           {/* Step 0 — Setup: operation, contract, service, currency, miles. */}
           {step === 0 && (
             <StepCard>
@@ -921,8 +993,8 @@ export default function NewContractPage({
                       )}
                       {item.isClearance && (
                         <Text size="xs" c="orange.7" fw={600}>
-                          Paid in advance, before clearance — not part of your
-                          shipment booking invoice
+                          Customs service fee — billed on your shipment booking
+                          invoice together with the freight
                         </Text>
                       )}
                     </Box>
@@ -1166,6 +1238,8 @@ export default function NewContractPage({
           ? profileByType.get(pendingApprovalProfile)
           : undefined;
         const isRejected = target?.status === "rejected";
+        const isSuspended =
+          target?.status === "suspended" || target?.status === "blacklisted";
         const label = pendingApprovalProfile
           ? (PROFILE_TYPE_LABELS[pendingApprovalProfile] ??
             pendingApprovalProfile)
@@ -1174,12 +1248,42 @@ export default function NewContractPage({
           <Modal
             opened={pendingApprovalProfile !== null}
             onClose={() => setPendingApprovalProfile(null)}
-            title={isRejected ? "Profile not approved" : "Awaiting approval"}
+            title={
+              isRejected
+                ? "Profile not approved"
+                : isSuspended
+                  ? "Role suspended"
+                  : "Awaiting approval"
+            }
             centered
             radius="lg"
           >
             <Stack gap="md">
-              {isRejected ? (
+              {isSuspended ? (
+                <>
+                  <Text size="sm" c="dimmed">
+                    Your {label} role has been suspended by EDR staff, so you
+                    can&apos;t start a contract under it. Your other roles are
+                    unaffected. Contact EDR support to resolve this.
+                  </Text>
+                  {target?.reviewNote && (
+                    <Alert color="orange" variant="light" radius="md">
+                      <Text size="sm">
+                        <strong>Message from EDR staff:</strong>{" "}
+                        {target.reviewNote}
+                      </Text>
+                    </Alert>
+                  )}
+                  <Group justify="flex-end" gap="sm">
+                    <Button
+                      color="edr-green"
+                      onClick={() => setPendingApprovalProfile(null)}
+                    >
+                      OK
+                    </Button>
+                  </Group>
+                </>
+              ) : isRejected ? (
                 <>
                   <Text size="sm" c="dimmed">
                     Your {label} profile was not approved. Fix the issue below
@@ -1215,7 +1319,8 @@ export default function NewContractPage({
                 <>
                   <Text size="sm" c="dimmed">
                     Your {label} profile was submitted and is under staff
-                    review. You can start a contract under it once it's approved.
+                    review. You can start a contract under it once it's
+                    approved.
                   </Text>
                   <Group justify="flex-end" gap="sm">
                     <Button
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/NewShipmentPage.tsx b/apps/edr-freight-web/portal/src/pages/contracts/NewShipmentPage.tsx
index f367f4e15..86987dbe8 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/NewShipmentPage.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/NewShipmentPage.tsx
@@ -346,6 +346,10 @@ function NewShipmentBookingForm({
       // Equipment return is a container concern — bulk keeps the contract default.
       ...(isContainer
         ? {
+            // What the containers carry — captured per booking, not on the contract.
+            ...(values.cargoDescription?.trim()
+              ? { cargoFreeText: values.cargoDescription.trim() }
+              : {}),
             containers: values.containers
               .filter((l) => Number(l.quantity) >= 1)
               .map((l) => ({
@@ -1295,6 +1299,26 @@ function CargoStep({
           )}
           {remainderNotice}
           <ContractCapacityNotice contractId={contract.id} isContainer />
+          <Controller
+            name="cargoDescription"
+            control={form.control}
+            render={({ field, fieldState }) => (
+              <Textarea
+                label="Cargo description *"
+                description="What do the containers carry on this shipment?"
+                placeholder="e.g. Electronics, garments, machinery spare parts…"
+                value={field.value ?? ""}
+                onChange={(e) => field.onChange(e.currentTarget.value)}
+                onBlur={field.onBlur}
+                error={fieldState.error?.message}
+                radius={10}
+                autosize
+                minRows={2}
+                maxRows={4}
+                styles={fieldStyles}
+              />
+            )}
+          />
           {lines.map((line, index) => (
             <ContainerLineEditor
               key={line.containerSize}
@@ -1648,7 +1672,7 @@ function ContainerLineEditor({
               type="number"
               onKeyDown={blockNegative}
               label="Quantity *"
-              min={1}
+              min={0}
               error={fieldState.error?.message}
               radius={10}
               styles={fieldStyles}
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/contract-ui.tsx b/apps/edr-freight-web/portal/src/pages/contracts/contract-ui.tsx
index ee67237f5..7028943df 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/contract-ui.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/contract-ui.tsx
@@ -125,10 +125,6 @@ export const CONTRACT_STATUS_CONFIG: Record<
   FULLY_EXECUTED: { label: "Fully Executed", ...TONE.success },
   CONTRACT_ACTIVE: { label: "Active", ...TONE.success },
   // ── Path B pre-booking clearance (contract-level) ──
-  AWAITING_CLEARANCE_PAYMENT: {
-    label: "Clearance Fee Due",
-    ...TONE.warning,
-  },
   AWAITING_CLEARANCE_DOCUMENTS: {
     label: "Upload Clearance Docs",
     ...TONE.warning,
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/contractToForm.ts b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/contractToForm.ts
index db9706e0c..38a7b3463 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/contractToForm.ts
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/contractToForm.ts
@@ -58,12 +58,9 @@ export function contractToFormValues(
 
   const scope = contract.cargoScope ?? [];
 
-  // Container scope: one row per enabled size, with per-size caps for GENERAL.
-  const enabledContainerSizes = isContainer
-    ? scope
-        .map((s) => s.containerSize)
-        .filter((s): s is string => Boolean(s))
-    : [];
+  // Container scope: contracts now always cover both sizes — force both even
+  // for older single-size drafts so resubmitting upgrades them.
+  const enabledContainerSizes = isContainer ? ["20ft", "40ft"] : [];
   const containerSizeCaps: Record<string, number> = {};
   if (isContainer && isGeneral) {
     for (const s of scope) {
@@ -119,10 +116,9 @@ export function contractToFormValues(
       enabledContainerSizes as ContractFormInputValues["enabledContainerSizes"],
     containerSizeCaps,
     cargoTypePath,
-    // Bulk: the commodity free-text; container: the required cargo
-    // description (stored on every size row — read the first).
-    cargoFreeText:
-      (isContainer ? scope[0]?.cargoFreeText : bulkRow?.cargoFreeText) ?? "",
+    // Bulk commodity free-text only — the container cargo description is
+    // captured per booking now, not on the contract.
+    cargoFreeText: (isContainer ? "" : bulkRow?.cargoFreeText) ?? "",
     bulkQuantityCap:
       isGeneral && bulkRow?.quantityCap != null ? bulkRow.quantityCap : 0,
     isHazardous: contract.isHazardous,
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/schema.ts b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/schema.ts
index c026b7b13..d20719c24 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/schema.ts
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/schema.ts
@@ -160,8 +160,9 @@ export const contractFormSchema = z
 
     // ── Cargo SCOPE (no quantities) ──
     cargoType: z.enum(["container", "bulk"], "Select a cargo type."),
-    // Container scope: the enabled sizes (min 1). Each becomes a
-    // contract_cargo_scope row.
+    // Container scope: ALWAYS both sizes — the contract covers 20ft and 40ft
+    // (both rates shown); the customer picks quantities per booking, where a
+    // size can be 0. No picker in the UI; kept for review display/prefill.
     enabledContainerSizes: z.array(z.enum(CONTAINER_SIZES)).default([]),
     // GENERAL only: per-size container quantity cap (total bookable over the
     // validity window). Keyed by size; must be > 0 for every enabled size
@@ -222,24 +223,8 @@ export const contractFormSchema = z
         message: "Intercity contracts are priced in ETB.",
       });
     }
-    if (data.cargoType === "container") {
-      // Container scope: at least one enabled size.
-      if (data.enabledContainerSizes.length === 0) {
-        ctx.addIssue({
-          code: "custom",
-          path: ["enabledContainerSizes"],
-          message: "Enable at least one container size.",
-        });
-      }
-      // Containerized cargo must say WHAT is inside — required description.
-      if (!data.cargoFreeText.trim()) {
-        ctx.addIssue({
-          code: "custom",
-          path: ["cargoFreeText"],
-          message: "Describe the cargo carried in the containers.",
-        });
-      }
-    }
+    // Container scope needs no validation: both sizes are always in scope and
+    // the cargo description moved to booking time.
     if (data.cargoType === "bulk") {
       // Bulk scope: a commodity is required.
       if (!data.cargoTypePath[0]) {
@@ -280,7 +265,7 @@ export const initialContractFormValues: DeepPartial<ContractFormValues> = {
   customsClearingAgent: "",
 
   cargoType: "container",
-  enabledContainerSizes: [],
+  enabledContainerSizes: [...CONTAINER_SIZES],
   containerSizeCaps: {},
   cargoTypePath: [],
   cargoFreeText: "",
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step-documents.tsx b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step-documents.tsx
index 86b6f61a2..de4b2bd66 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step-documents.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step-documents.tsx
@@ -12,6 +12,7 @@ import {
   type ContractFormInputValues,
   type ContractFormValues,
 } from "./schema";
+import { operationToProfileType } from "./helpers";
 import { StepCard, StepHeader } from "./shared";
 
 type ContractForm = UseFormReturn<
@@ -73,8 +74,16 @@ export function StepDocuments({
 
   const onboardingDocs = (() => {
     const profiles = auth.company?.company?.companyProfiles ?? [];
+    const operationType = form.watch("operationType");
+    const targetType = operationType
+      ? operationToProfileType(
+          operationType,
+          profiles.map((p) => p.type),
+        )
+      : null;
     const active =
-      profiles.find((p) => p.id === auth.activeCompanyProfileId) ?? profiles[0];
+      (targetType ? profiles.find((p) => p.type === targetType) : undefined) ??
+      profiles[0];
     return active?.licenseFiles ?? [];
   })();
 
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step1-contract-type.tsx b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step1-contract-type.tsx
index 2bacf8074..9e46e566f 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step1-contract-type.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step1-contract-type.tsx
@@ -45,7 +45,7 @@ export function Step1ContractType({
   /** Approval state of the profile each operation maps to (for the badges). */
   operationStatus?: (
     op: OperationType,
-  ) => "approved" | "pending" | "rejected" | "missing";
+  ) => "approved" | "pending" | "rejected" | "suspended" | "missing";
 }) {
   const contractType = form.watch("contractType");
 
@@ -152,10 +152,11 @@ export function Step1ContractType({
       contract.freightType === "BULK" ? "bulk" : "container",
     );
     const scope = contract.cargoScope ?? [];
-    const sizes = scope
-      .map((s) => s.containerSize)
-      .filter((s): s is "20ft" | "40ft" => s === "20ft" || s === "40ft");
-    if (sizes.length > 0) form.setValue("enabledContainerSizes", sizes);
+    // Contracts always cover both sizes now — even when renewing an older
+    // single-size contract.
+    if (contract.freightType !== "BULK") {
+      form.setValue("enabledContainerSizes", ["20ft", "40ft"]);
+    }
     const bulkScope = scope.find((s) => s.cargoTypeId);
     if (bulkScope?.cargoTypeId) {
       // Find the parent group for this commodity so the cascader prefills.
@@ -229,6 +230,11 @@ export function Step1ContractType({
                         Rejected
                       </Badge>
                     )}
+                    {status === "suspended" && (
+                      <Badge size="xs" color="orange" variant="light" radius="sm">
+                        Suspended
+                      </Badge>
+                    )}
                     {status === "missing" && (
                       <Badge size="xs" color="gray" variant="light" radius="sm">
                         Add license
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step3-cargo-scope.tsx b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step3-cargo-scope.tsx
index 15b2ac4b7..68b0d79c9 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step3-cargo-scope.tsx
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/step3-cargo-scope.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef } from "react";
 import { Controller, type UseFormReturn } from "react-hook-form";
-import { Check, Container, Flame, RotateCcw, Snowflake } from "lucide-react";
+import { Container, Flame, RotateCcw, Snowflake } from "lucide-react";
 import {
   Box,
   Group,
@@ -9,33 +9,15 @@ import {
   Stack,
   Switch,
   Text,
-  Textarea,
-  UnstyledButton,
 } from "@mantine/core";
 import type { Freight } from "@edr/types";
 import {
+  CONTAINER_SIZES,
   ContractFormInputValues,
   type ContractFormValues,
 } from "./schema";
 import { fieldStyles, SelectField, StepLabel } from "./shared";
 
-const CONTAINER_SIZE_OPTIONS: Array<{
-  value: "20ft" | "40ft";
-  label: string;
-  description: string;
-}> = [
-  {
-    value: "20ft",
-    label: "20ft Container",
-    description: "Standard twenty-foot unit (TEU)",
-  },
-  {
-    value: "40ft",
-    label: "40ft Container",
-    description: "Standard forty-foot unit (FEU)",
-  },
-];
-
 const CARGO_TYPE_OPTIONS = [
   { value: "container", label: "Containerized (20ft / 40ft)" },
   { value: "bulk", label: "General / Bulk cargo" },
@@ -128,11 +110,17 @@ export function Step3CargoScope({
               onChange={(v) => {
                 if (!v) return;
                 field.onChange(v);
-                // cargoFreeText is shared (bulk commodity label / container
-                // description) — clear it so text never carries across types.
+                // cargoFreeText is the bulk commodity label — clear it so text
+                // never carries across types (container description is captured
+                // at booking time now).
                 form.setValue("cargoFreeText", "", { shouldDirty: true });
                 if (v === "container") {
                   form.setValue("cargoTypePath", [], { shouldDirty: true });
+                  // Contracts always cover BOTH sizes; quantities are chosen per
+                  // booking (a size can be 0 there).
+                  form.setValue("enabledContainerSizes", [...CONTAINER_SIZES], {
+                    shouldDirty: true,
+                  });
                 } else {
                   form.setValue("enabledContainerSizes", [], {
                     shouldDirty: true,
@@ -152,74 +140,47 @@ export function Step3CargoScope({
 
       </div>
 
-      {/* Container scope: enabled sizes as tick-cards — tap to toggle, one or
-          both can be in scope. Clearer than a multi-select for two options. */}
+      {/* Container scope: the contract always covers BOTH sizes and quotes both
+          rates. Quantities (a size can be 0) and the cargo description are
+          captured at booking time. */}
       {cargoType === "container" && (
-        <Controller
-          name="enabledContainerSizes"
-          control={form.control}
-          render={({ field, fieldState }) => {
-            const selected = (field.value ?? []) as ("20ft" | "40ft")[];
-            const toggle = (size: "20ft" | "40ft") => {
-              field.onChange(
-                selected.includes(size)
-                  ? selected.filter((s) => s !== size)
-                  : [...selected, size],
-              );
-              field.onBlur();
-            };
-            return (
-              <Box>
-                <StepLabel>Container sizes in scope *</StepLabel>
-                <Text fz={12} c="#6B7C8E" mt={2}>
-                  Tick every size this contract should cover — you can select
-                  both.
-                </Text>
-                <div className="mt-3 grid gap-3 sm:grid-cols-2">
-                  {CONTAINER_SIZE_OPTIONS.map((opt) => (
-                    <SizeCard
-                      key={opt.value}
-                      label={opt.label}
-                      description={opt.description}
-                      checked={selected.includes(opt.value)}
-                      hasError={Boolean(fieldState.error)}
-                      onToggle={() => toggle(opt.value)}
-                    />
-                  ))}
-                </div>
-                {fieldState.error?.message && (
-                  <Text fz={12} c="red.7" mt={6}>
-                    {fieldState.error.message}
-                  </Text>
-                )}
-              </Box>
-            );
+        <Group
+          gap={13}
+          align="center"
+          wrap="nowrap"
+          px={16}
+          py={13}
+          style={{
+            borderRadius: 14,
+            border: "1.5px solid #CDEBDD",
+            background: "#F6FBF8",
           }}
-        />
-      )}
-
-      {/* Container scope: required description of what the containers carry. */}
-      {cargoType === "container" && (
-        <Controller
-          name="cargoFreeText"
-          control={form.control}
-          render={({ field, fieldState }) => (
-            <Textarea
-              label="Cargo description *"
-              description="What will the containers carry under this contract?"
-              placeholder="e.g. Electronics, garments, machinery spare parts…"
-              value={field.value ?? ""}
-              onChange={(e) => field.onChange(e.currentTarget.value)}
-              onBlur={field.onBlur}
-              error={fieldState.error?.message}
-              radius={10}
-              autosize
-              minRows={2}
-              maxRows={4}
-              styles={fieldStyles}
-            />
-          )}
-        />
+        >
+          <Box
+            style={{
+              width: 38,
+              height: 38,
+              borderRadius: 11,
+              flexShrink: 0,
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+              background: "#EAF6EC",
+              color: "#1E7B34",
+            }}
+          >
+            <Container size={18} />
+          </Box>
+          <Box>
+            <Text fz={14} fw={700} c="#10202F">
+              20ft &amp; 40ft containers covered
+            </Text>
+            <Text fz={12} c="#6B7C8E" style={{ lineHeight: 1.4 }}>
+              This contract quotes rates for both sizes. You choose the
+              quantities on each booking — either size can be 0.
+            </Text>
+          </Box>
+        </Group>
       )}
 
       {/* Bulk scope: a single commodity (cargo type path). No tonnage. */}
@@ -330,85 +291,6 @@ export function Step3CargoScope({
   );
 }
 
-/** Checkbox-style card for one container size. Whole card toggles. */
-function SizeCard({
-  label,
-  description,
-  checked,
-  hasError,
-  onToggle,
-}: {
-  label: string;
-  description: string;
-  checked: boolean;
-  hasError: boolean;
-  onToggle: () => void;
-}) {
-  return (
-    <UnstyledButton
-      role="checkbox"
-      aria-checked={checked}
-      aria-label={label}
-      onClick={onToggle}
-      px={16}
-      py={13}
-      style={{
-        borderRadius: 14,
-        border: `1.5px solid ${
-          checked ? "#0A6F4D" : hasError ? "#E8B4AC" : "#E6ECF2"
-        }`,
-        background: checked ? "#F6FBF8" : "#fff",
-        transition: "all 150ms ease",
-        width: "100%",
-      }}
-    >
-      <Group gap={13} align="center" wrap="nowrap">
-        <Box
-          style={{
-            width: 22,
-            height: 22,
-            borderRadius: 7,
-            flexShrink: 0,
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center",
-            border: `1.5px solid ${checked ? "#0A6F4D" : "#C7D2DC"}`,
-            background: checked ? "#0A6F4D" : "#fff",
-            color: "#fff",
-            transition: "all 150ms ease",
-          }}
-        >
-          {checked && <Check size={14} strokeWidth={3} />}
-        </Box>
-        <Box
-          style={{
-            width: 38,
-            height: 38,
-            borderRadius: 11,
-            flexShrink: 0,
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center",
-            background: checked ? "#EAF6EC" : "#F1F5F8",
-            color: checked ? "#1E7B34" : "#6B7C8E",
-            transition: "all 150ms ease",
-          }}
-        >
-          <Container size={18} />
-        </Box>
-        <Box style={{ textAlign: "left" }}>
-          <Text fz={14} fw={700} c="#10202F">
-            {label}
-          </Text>
-          <Text fz={12} c="#6B7C8E" style={{ lineHeight: 1.4 }}>
-            {description}
-          </Text>
-        </Box>
-      </Group>
-    </UnstyledButton>
-  );
-}
-
 function ToggleRow({
   icon,
   iconBg,
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/unit-rates.ts b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/unit-rates.ts
index 439f4eeff..f37c90a62 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/unit-rates.ts
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-contract-form/unit-rates.ts
@@ -4,6 +4,7 @@ import type { Freight } from "@edr/types";
 export function formatRateUnit(unit: Freight.ContractRateUnit | string): string {
   const map: Record<string, string> = {
     per_container: "container",
+    per_wagon: "wagon",
     per_ton: "ton",
     per_item: "item",
     per_km: "km",
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/schema.ts b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/schema.ts
index 9c7efb8e3..bbff2183f 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/schema.ts
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/schema.ts
@@ -57,10 +57,13 @@ const containerUnitSchema = z.object({
 
 const containerLineSchema = z.object({
   containerSize: z.enum(["20ft", "40ft"]),
+  // 0 is allowed: the contract covers both sizes, so a booking that only needs
+  // one size zeroes the other line out. At least one line must be ≥ 1
+  // (enforced in the superRefine).
   quantity: z
     .string()
     .refine((v) => v.trim().length > 0, "Quantity is required.")
-    .refine((v) => !Number.isNaN(Number(v)) && Number(v) >= 1, "At least 1."),
+    .refine((v) => !Number.isNaN(Number(v)) && Number(v) >= 0, "Enter 0 or more."),
   hazardousQuantity: z.string().default("0"),
   reeferQuantity: z.string().default("0"),
   returnQuantity: z.string().default("0"),
@@ -74,6 +77,8 @@ const shipmentFormBase = z.object({
   // unloading. Seeded from the contract's equipment return; bulk ignores it.
   withReturn: z.boolean().default(false),
   containers: z.array(containerLineSchema).default([]),
+  // What the containers carry — captured per booking (moved off the contract).
+  cargoDescription: z.string().default(""),
   cargoWeightTons: z.string().default(""),
   itemCount: z.string().default(""),
   bulkHazardousQuantity: z.string().default("0"),
@@ -92,6 +97,28 @@ export function createShipmentFormSchema(ctx: ShipmentValidationContext) {
     }
 
     if (ctx.isContainer) {
+      // Containerized cargo must say WHAT is inside — required per booking.
+      if (!data.cargoDescription.trim()) {
+        refineCtx.addIssue({
+          code: "custom",
+          path: ["cargoDescription"],
+          message: "Describe the cargo carried in the containers.",
+        });
+      }
+      // Both sizes are always in contract scope and a line can be 0 — but the
+      // booking as a whole needs at least one container. Anchor the error on
+      // the first line's quantity so it renders in the field.
+      const totalQty = data.containers.reduce(
+        (sum, l) => sum + Math.max(0, Number(l.quantity) || 0),
+        0,
+      );
+      if (data.containers.length > 0 && totalQty < 1) {
+        refineCtx.addIssue({
+          code: "custom",
+          path: ["containers", 0, "quantity"],
+          message: "Book at least one container (either size).",
+        });
+      }
       // Container numbers must be unique within this shipment (front-end only —
       // the DB column is intentionally not unique). Duplicates block submit and
       // price generation since both run through this same schema validation.
@@ -243,6 +270,7 @@ export const initialShipmentFormValues: DeepPartial<ShipmentFormValues> = {
   scheduledDate: "",
   withReturn: false,
   containers: [],
+  cargoDescription: "",
   cargoWeightTons: "",
   itemCount: "",
   bulkHazardousQuantity: "0",
@@ -257,6 +285,7 @@ export const shipmentStepFields: Record<
   0: ["contractRouteId"],
   1: [
     "containers",
+    "cargoDescription",
     "cargoWeightTons",
     "itemCount",
     "bulkHazardousQuantity",
diff --git a/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/total.ts b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/total.ts
index d0ed44629..b4055bb1c 100644
--- a/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/total.ts
+++ b/apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/total.ts
@@ -48,8 +48,12 @@ export function computeShipmentTotal(
           (i) =>
             i.containerSize === line.containerSize &&
             i.unit === "per_container" &&
-            !i.conditionalOn,
-        ) ?? rateFor((i) => i.containerSize === line.containerSize);
+            !i.conditionalOn &&
+            !i.isClearance,
+        ) ??
+        rateFor(
+          (i) => i.containerSize === line.containerSize && !i.isClearance,
+        );
       if (rate) {
         lines.push({
           label: rate.label,
@@ -106,7 +110,12 @@ export function computeShipmentTotal(
   } else {
     const qty = Number(values.cargoWeightTons || values.itemCount || 0);
     const rate =
-      rateFor((i) => i.unit === "per_ton" || i.unit === "per_item") ?? items[0];
+      rateFor(
+        (i) =>
+          (i.unit === "per_ton" || i.unit === "per_item") &&
+          !i.isClearance &&
+          !i.conditionalOn,
+      ) ?? items[0];
     if (rate && qty > 0) {
       lines.push({
         label: rate.label,
@@ -144,6 +153,53 @@ export function computeShipmentTotal(
     }
   }
 
+  // Lashing / cargo securing — bulk-only, applies whenever the contract shows
+  // it (the commodity needs lashing). Per-ton scales by tonnage; per-wagon
+  // depends on the wagon capacity the train stocks — shown at real pricing.
+  const lashing = items.find((i) => i.conditionalOn === "has_lashing");
+  if (lashing && lashing.unit === "per_ton") {
+    const tons = Number(values.cargoWeightTons || 0);
+    if (tons > 0) {
+      lines.push({
+        label: lashing.label,
+        unitPrice: lashing.unitPrice,
+        unit: lashing.unit,
+        quantity: tons,
+        amount: lashing.unitPrice * tons,
+      });
+    }
+  }
+
+  // Customs clearance service fee — billed on the booking invoice with the
+  // freight. Container fees estimate per size (per box, or per wagon: two 20ft
+  // share one); bulk per-ton scales by tonnage. Bulk per-wagon fees depend on
+  // the wagon capacity the train stocks — shown at real pricing, not estimated.
+  for (const cl of items.filter((i) => i.isClearance)) {
+    let qty = 0;
+    if (isContainer) {
+      const boxes = (values.containers ?? [])
+        .filter((c) => c.containerSize === cl.containerSize)
+        .reduce((s, c) => s + Number(c.quantity || 0), 0);
+      qty =
+        cl.unit === "per_wagon"
+          ? Math.ceil(boxes * (cl.containerSize === "40ft" ? 1 : 0.5))
+          : boxes;
+    } else if (cl.unit === "per_ton") {
+      qty = Number(values.cargoWeightTons || 0);
+    } else if (cl.unit === "flat") {
+      qty = 1;
+    }
+    if (qty > 0) {
+      lines.push({
+        label: cl.label,
+        unitPrice: cl.unitPrice,
+        unit: cl.unit,
+        quantity: qty,
+        amount: cl.unitPrice * qty,
+      });
+    }
+  }
+
   const total = lines.reduce((s, l) => s + l.amount, 0);
   return { currency, lines, total };
 }
diff --git a/apps/edr-freight-web/portal/src/pages/settings/CompanyRolesCard.tsx b/apps/edr-freight-web/portal/src/pages/settings/CompanyRolesCard.tsx
index fc0407d5e..974af456e 100644
--- a/apps/edr-freight-web/portal/src/pages/settings/CompanyRolesCard.tsx
+++ b/apps/edr-freight-web/portal/src/pages/settings/CompanyRolesCard.tsx
@@ -1,6 +1,6 @@
 import { useMemo, useState } from "react";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { Building2, CheckCircle2, Save, XCircle } from "lucide-react";
+import { Building2, CheckCircle2, RefreshCw, Save, XCircle } from "lucide-react";
 import {
   Button,
   Card,
@@ -87,6 +87,22 @@ export default function CompanyRolesCard({ profile }: CompanyRolesCardProps) {
     },
   });
 
+  // Resubmit a rejected role for review. Flips it back to Pending server-side
+  // and pings the backoffice, so the fix-and-resubmit loop can happen entirely
+  // from settings instead of only from the contract page's rejection banner.
+  const reapplyMutation = useMutation({
+    mutationFn: (profileId: string) =>
+      api.companies.reapplyProfile.call({ profileId }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({
+        queryKey: api.companies.getProfile.queryKey(),
+      });
+      queryClient.invalidateQueries({
+        queryKey: api.companies.getInfo.queryKey(),
+      });
+    },
+  });
+
   const handleSave = () => {
     if (selected.size === 0) return;
     mutation.mutate(Array.from(selected));
@@ -113,6 +129,7 @@ export default function CompanyRolesCard({ profile }: CompanyRolesCardProps) {
           {options.map((opt) => {
             const existing = profileByType.get(opt.type);
             const view = existing ? roleStatusView(existing) : undefined;
+            const rejected = existing?.status === "rejected";
             return (
               <RoleCard
                 key={opt.type}
@@ -124,6 +141,28 @@ export default function CompanyRolesCard({ profile }: CompanyRolesCardProps) {
                 approved={view?.approved}
                 lockedNote={view?.note}
                 lockedNoteColor={view?.color}
+                detail={
+                  (rejected || existing?.status === "suspended") &&
+                  existing?.reviewNote
+                    ? `Reviewer note: ${existing.reviewNote}`
+                    : undefined
+                }
+                action={
+                  rejected ? (
+                    <Button
+                      size="xs"
+                      variant="light"
+                      leftSection={<RefreshCw size={14} />}
+                      loading={
+                        reapplyMutation.isPending &&
+                        reapplyMutation.variables === existing.id
+                      }
+                      onClick={() => reapplyMutation.mutate(existing.id)}
+                    >
+                      Resubmit for approval
+                    </Button>
+                  ) : undefined
+                }
                 onClick={() => toggle(opt.type)}
               />
             );
diff --git a/apps/edr-freight-web/portal/src/pages/settings/RoleCard.tsx b/apps/edr-freight-web/portal/src/pages/settings/RoleCard.tsx
index 0a6b98dc4..0061d3318 100644
--- a/apps/edr-freight-web/portal/src/pages/settings/RoleCard.tsx
+++ b/apps/edr-freight-web/portal/src/pages/settings/RoleCard.tsx
@@ -18,6 +18,14 @@ export interface RoleCardProps {
   lockedNote?: string;
   /** Mantine color for {@link lockedNote}; matches the role's status. */
   lockedNoteColor?: string;
+  /** Extra muted line under {@link lockedNote}, e.g. the reviewer's note. */
+  detail?: string;
+  /**
+   * Interactive content (e.g. a resubmit button) rendered inside the card.
+   * Only honoured on a locked card — the interactive variant is itself a
+   * button, and buttons cannot nest.
+   */
+  action?: React.ReactNode;
   onClick?: () => void;
 }
 
@@ -35,54 +43,70 @@ export default function RoleCard({
   approved = false,
   lockedNote,
   lockedNoteColor = "edr-green",
+  detail,
+  action,
   onClick,
 }: RoleCardProps) {
   const highlighted = selected || approved;
 
-  return (
-    <UnstyledButton
-      type="button"
-      onClick={locked ? undefined : onClick}
-      className={`group block rounded-lg border! p-5! text-left transition-all duration-200 ${
-        highlighted
-          ? "border-[var(--mantine-color-edr-green-5)]! bg-edr-soft!"
-          : "border-edr-border! bg-edr-card!"
-      } ${
-        locked
-          ? "cursor-default"
-          : "hover:-translate-y-0.5 hover:border-[var(--mantine-color-edr-green-5)]! hover:bg-edr-soft"
-      }`}
-    >
-      <Group gap="md" wrap="nowrap" align="start">
-        <ThemeIcon
-          size={56}
-          radius="lg"
-          variant={highlighted ? "filled" : "light"}
-          color="edr-green"
-          className="shrink-0"
-        >
-          {icon}
-        </ThemeIcon>
-        <Box className="min-w-0 flex-1">
-          <Text fw={700} c="edr-text" fz={15}>
-            {label}
+  const className = `group block rounded-lg border! p-5! text-left transition-all duration-200 ${
+    highlighted
+      ? "border-[var(--mantine-color-edr-green-5)]! bg-edr-soft!"
+      : "border-edr-border! bg-edr-card!"
+  } ${
+    locked
+      ? "cursor-default"
+      : "hover:-translate-y-0.5 hover:border-[var(--mantine-color-edr-green-5)]! hover:bg-edr-soft"
+  }`;
+
+  const content = (
+    <Group gap="md" wrap="nowrap" align="start">
+      <ThemeIcon
+        size={56}
+        radius="lg"
+        variant={highlighted ? "filled" : "light"}
+        color="edr-green"
+        className="shrink-0"
+      >
+        {icon}
+      </ThemeIcon>
+      <Box className="min-w-0 flex-1">
+        <Text fw={700} c="edr-text" fz={15}>
+          {label}
+        </Text>
+        <Text size="xs" c="edr-muted" mt={4} lh={1.5}>
+          {description}
+        </Text>
+        {lockedNote && (
+          <Text size="xs" c={lockedNoteColor} mt={6} fw={600}>
+            {lockedNote}
           </Text>
-          <Text size="xs" c="edr-muted" mt={4} lh={1.5}>
-            {description}
-          </Text>
-          {lockedNote && (
-            <Text size="xs" c={lockedNoteColor} mt={6} fw={600}>
-              {lockedNote}
-            </Text>
-          )}
-        </Box>
-        {highlighted && (
-          <Check
-            size={18}
-            className="shrink-0 text-[var(--mantine-color-edr-green-6)]"
-          />
         )}
-      </Group>
+        {locked && detail && (
+          <Text size="xs" c="edr-muted" mt={4} lh={1.5}>
+            {detail}
+          </Text>
+        )}
+        {locked && action && <Box mt="sm">{action}</Box>}
+      </Box>
+      {highlighted && (
+        <Check
+          size={18}
+          className="shrink-0 text-[var(--mantine-color-edr-green-6)]"
+        />
+      )}
+    </Group>
+  );
+
+  // A locked card is display-only, so it renders as a plain box — which also
+  // lets `action` hold real buttons without nesting them inside a button.
+  if (locked) {
+    return <Box className={className}>{content}</Box>;
+  }
+
+  return (
+    <UnstyledButton type="button" onClick={onClick} className={className}>
+      {content}
     </UnstyledButton>
   );
 }
diff --git a/apps/edr-freight-web/portal/src/services/api.ts b/apps/edr-freight-web/portal/src/services/api.ts
index ce13fad55..6fd1bd479 100644
--- a/apps/edr-freight-web/portal/src/services/api.ts
+++ b/apps/edr-freight-web/portal/src/services/api.ts
@@ -240,12 +240,6 @@ export const api = {
       CompanyInfoResponse
     >("companies", "startOnboarding", companiesService.startOnboarding),
 
-    setActiveMode: endpoint<{ type: ProfileTypeValue }, CompanyInfoResponse>(
-      "companies",
-      "setActiveMode",
-      companiesService.setActiveMode,
-    ),
-
     setOnboardingStep: endpoint<{ step: string }, void>(
       "companies",
       "setOnboardingStep",
@@ -314,10 +308,10 @@ export const api = {
       bookingsService.assignCustomerTruck(id, payload),
     ),
 
-    downloadCustomerTruckFreightOrder: endpoint<{ id: string }, Blob>(
+    downloadCustomerTruckFreightOrder: endpoint<{ id: string; copies?: number[] }, Blob>(
       "bookings",
       "downloadCustomerTruckFreightOrder",
-      ({ id }) => bookingsService.downloadCustomerTruckFreightOrder(id),
+      ({ id, copies }) => bookingsService.downloadCustomerTruckFreightOrder(id, copies),
     ),
 
     downloadHandoverDocument: endpoint<{ inventoryId: string }, Blob>(
diff --git a/apps/edr-freight-web/portal/src/services/bookings.service.ts b/apps/edr-freight-web/portal/src/services/bookings.service.ts
index 51e87c024..58f3b330b 100644
--- a/apps/edr-freight-web/portal/src/services/bookings.service.ts
+++ b/apps/edr-freight-web/portal/src/services/bookings.service.ts
@@ -137,6 +137,26 @@ export interface ApproveDeliveryResponse {
   signerDisplayName: string;
 }
 
+/** One import handover record — booking-level or per truck (EDR last-mile). */
+export interface BookingHandoverRecord {
+  id: string;
+  reference: string;
+  truckPlate: string | null;
+  mileType: "SELF_HAUL" | "EDR_LAST_MILE";
+  generatedAt: string;
+  signedAt: string | null;
+  signerName: string | null;
+  deliveredAt: string | null;
+}
+
+export interface SignHandoverResponse {
+  handoverId: string;
+  bookingId: string;
+  signedAt: string | null;
+  signerDisplayName: string;
+  allSigned: boolean;
+}
+
 export interface CustomerTruckAssignmentPayload {
   truckPlateNumber: string;
   driverName: string;
@@ -192,10 +212,10 @@ export const bookingsService = {
     );
     return data.data;
   },
-  downloadCustomerTruckFreightOrder: async (id: string): Promise<Blob> => {
+  downloadCustomerTruckFreightOrder: async (id: string, copies?: number[]): Promise<Blob> => {
     const { data } = await client.get(
       `/api/bookings/${id}/customer-truck-assignment/freight-order`,
-      { responseType: "blob" },
+      { responseType: "blob", params: copies?.length ? { copies: copies.join(",") } : undefined },
     );
     return data;
   },
@@ -206,13 +226,36 @@ export const bookingsService = {
     );
     return data;
   },
-  downloadBookingHandoverDocument: async (bookingId: string): Promise<Blob> => {
+  downloadBookingHandoverDocument: async (
+    bookingId: string,
+    handoverId?: string,
+  ): Promise<Blob> => {
     const { data } = await client.get(
       `/api/warehouse-inventory/bookings/${bookingId}/handover-document`,
-      { responseType: "blob" },
+      { responseType: "blob", params: handoverId ? { handoverId } : undefined },
     );
     return data;
   },
+
+  listBookingHandovers: async (
+    bookingId: string,
+  ): Promise<BookingHandoverRecord[]> => {
+    const { data } = await client.get(
+      `/api/warehouse-inventory/bookings/${bookingId}/handovers`,
+    );
+    return data.data ?? data;
+  },
+
+  signHandover: async (
+    handoverId: string,
+    signerName: string,
+  ): Promise<SignHandoverResponse> => {
+    const { data } = await client.post(
+      `/api/warehouse-inventory/handovers/${handoverId}/sign`,
+      { signerName },
+    );
+    return data.data ?? data;
+  },
   downloadBookingGrnDocument: async (bookingId: string): Promise<Blob> => {
     const { data } = await client.get(
       `/api/warehouse-inventory/bookings/${bookingId}/grn-document`,
diff --git a/apps/edr-freight-web/portal/src/services/companies.service.ts b/apps/edr-freight-web/portal/src/services/companies.service.ts
index 190a806a8..6b8a8be0f 100644
--- a/apps/edr-freight-web/portal/src/services/companies.service.ts
+++ b/apps/edr-freight-web/portal/src/services/companies.service.ts
@@ -45,10 +45,6 @@ export interface ExternalProfileResponse {
   nationalId: string | null;
   jobTitle: string | null;
   isPrimaryContact: boolean;
-  /** The active operational mode (importer/exporter/forwarder). */
-  activeProfileType: ProfileTypeValue | null;
-  /** Id of the company_profile matching activeProfileType (server-resolved). */
-  activeCompanyProfileId: string | null;
   onboardingStep: string | null;
   onboardingCompleted: boolean;
   createdAt: string;
@@ -323,17 +319,6 @@ export const companiesService = {
     return unwrap(response.data);
   },
 
-  /** Switch the active operational mode (target profile must already exist). */
-  setActiveMode: async (payload: {
-    type: ProfileTypeValue;
-  }): Promise<CompanyInfoResponse> => {
-    const response = await client.patch<ApiResponse<CompanyInfoResponse>>(
-      URL_CONSTANTS.COMPANIES_API.ACTIVE_MODE,
-      payload,
-    );
-    return unwrap(response.data);
-  },
-
   setOnboardingStep: async (payload: { step: string }): Promise<void> => {
     await client.patch(URL_CONSTANTS.COMPANIES_API.ONBOARDING_STEP, payload);
   },
diff --git a/apps/edr-freight-web/portal/src/services/warehouse.service.ts b/apps/edr-freight-web/portal/src/services/warehouse.service.ts
new file mode 100644
index 000000000..990077147
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/services/warehouse.service.ts
@@ -0,0 +1,83 @@
+import { client } from "@/utils/api";
+
+export interface InventoryFilter {
+  bookingId?: string;
+}
+
+export interface WarehouseInventoryItem {
+  id: string;
+  bookingId: string | null;
+  warehouseId: string;
+  yardId: string;
+  zoneId: string;
+  status: string;
+  arrivedAt: string | null;
+  warehouse?: {
+    id: string;
+    name: string;
+    code: string;
+  } | null;
+  yard?: {
+    id: string;
+    name: string;
+    code: string;
+  } | null;
+  zone?: {
+    id: string;
+    name: string;
+    code: string;
+  } | null;
+}
+
+export interface BookingScheduleView {
+  schedule: {
+    status: string;
+    scheduledDepartureDate: string | null;
+    scheduledArrivalDate: string | null;
+  } | null;
+  wagon?: {
+    wagonNumber: string | null;
+    sequenceNo: number | null;
+  } | null;
+}
+
+export interface BookingHandover {
+  id: string;
+  bookingId: string;
+  truckAssignmentId?: string | null;
+  edrAssignmentId?: string | null;
+  truckPlate?: string | null;
+  mileType: 'SELF_HAUL' | 'EDR_LAST_MILE';
+  reference: string;
+  generatedAt: string;
+  signedAt?: string | null;
+  signerName?: string | null;
+  signedByUserId?: string | null;
+  signatureImageUrl?: string | null;
+  deliveredAt?: string | null;
+}
+
+export const warehouseService = {
+  listInventory: async (filter?: InventoryFilter): Promise<WarehouseInventoryItem[]> => {
+    const { data } = await client.get("/warehouse-inventory", {
+      params: filter,
+    });
+    return data?.data ?? data ?? [];
+  },
+
+  /** Customer-safe location endpoint — the plain list is staff-only (403 for portal users). */
+  bookingLocation: async (bookingId: string): Promise<WarehouseInventoryItem[]> => {
+    const { data } = await client.get(`/warehouse-inventory/bookings/${bookingId}/location`);
+    return data?.data ?? data ?? [];
+  },
+
+  bookingSchedule: async (bookingId: string): Promise<BookingScheduleView> => {
+    const { data } = await client.get(`/warehouse-inventory/booking-schedule/${bookingId}`);
+    return data?.data ?? data ?? { schedule: null, wagon: null };
+  },
+
+  bookingHandovers: async (bookingId: string): Promise<BookingHandover[]> => {
+    const { data } = await client.get(`/warehouse-inventory/bookings/${bookingId}/handovers`);
+    return data?.data ?? data ?? [];
+  },
+};
diff --git a/apps/edr-freight-web/portal/src/utils/truck-assignment-template.ts b/apps/edr-freight-web/portal/src/utils/truck-assignment-template.ts
new file mode 100644
index 000000000..7a0fef1cc
--- /dev/null
+++ b/apps/edr-freight-web/portal/src/utils/truck-assignment-template.ts
@@ -0,0 +1,108 @@
+import * as XLSX from 'xlsx';
+
+export function generateTruckAssignmentTemplate(filename = 'truck-assignments.xlsx'): void {
+  const data = [
+    {
+      'Truck Plate Number': '3-12345/67890',
+      'Driver Name': 'John Doe',
+      'Truck Type': 'Flatbed',
+      'Container 1': 'MAEU1234567',
+      'Container 2': 'HLXU7654321',
+    },
+    {
+      'Truck Plate Number': '3-98765/43210',
+      'Driver Name': 'Jane Smith',
+      'Truck Type': 'Flatbed',
+      'Container 1': 'COSCO1111111',
+      'Container 2': '',
+    },
+  ];
+
+  const instructions = [
+    ['TRUCK ASSIGNMENT BULK UPLOAD - INSTRUCTIONS'],
+    [],
+    ['Column', 'Required', 'Notes'],
+    ['Truck Plate Number', 'Yes', 'Format: 3-XXXXX/XXXXX (Ethiopian plate format)'],
+    ['Driver Name', 'Yes', 'Full name of truck driver'],
+    ['Truck Type', 'Yes', 'e.g., Flatbed, Lowbed, Tanker, Trailer, etc.'],
+    ['Container 1', 'Yes*', '*Required for EXPORT. Leave empty for IMPORT bulk cargo.'],
+    ['Container 2', 'No', 'Optional. ISO format: e.g., MAEU1234567. Max 2 containers per truck.'],
+    [],
+    ['CONTAINER RULES'],
+    ['- A 40ft container fills one truck (max 1 per truck)'],
+    ['- Two 20ft containers fit on one truck (max 2 per truck)'],
+    ['- No size mixing on same truck'],
+    ['- Containers must be from the booking'],
+    [],
+    ['Example Data Below →'],
+  ];
+
+  const wb = XLSX.utils.book_new();
+
+  // Instructions sheet
+  const wsInstructions = XLSX.utils.aoa_to_sheet(instructions);
+  wsInstructions['!cols'] = [{ wch: 30 }, { wch: 12 }, { wch: 50 }];
+  XLSX.utils.book_append_sheet(wb, wsInstructions, 'Instructions');
+
+  // Data template sheet
+  const wsData = XLSX.utils.json_to_sheet(data, {
+    header: ['Truck Plate Number', 'Driver Name', 'Truck Type', 'Container 1', 'Container 2'],
+  });
+  wsData['!cols'] = [{ wch: 20 }, { wch: 20 }, { wch: 15 }, { wch: 18 }, { wch: 18 }];
+  XLSX.utils.book_append_sheet(wb, wsData, 'Trucks');
+
+  XLSX.writeFile(wb, filename);
+}
+
+export function parseTruckAssignmentFile(
+  file: File,
+): Promise<
+  Array<{
+    truckPlateNumber: string;
+    driverName: string;
+    truckType: string;
+    containerNumbers?: string[];
+  }>
+> {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+
+    reader.onload = (e) => {
+      try {
+        const data = e.target?.result as ArrayBuffer;
+        const wb = XLSX.read(data, { type: 'array' });
+        const wsData = wb.Sheets['Trucks'] || Object.values(wb.Sheets)[0];
+
+        if (!wsData) {
+          reject(new Error('No data sheet found in Excel file'));
+          return;
+        }
+
+        const jsonData = XLSX.utils.sheet_to_json(wsData) as Array<Record<string, any>>;
+
+        const trucks = jsonData.map((row) => {
+          const containers = [
+            row['Container 1'],
+            row['Container 2'],
+          ]
+            .filter((c) => c && c.trim())
+            .map((c) => c.trim().toUpperCase());
+
+          return {
+            truckPlateNumber: row['Truck Plate Number']?.trim() || '',
+            driverName: row['Driver Name']?.trim() || '',
+            truckType: row['Truck Type']?.trim() || '',
+            containerNumbers: containers.length > 0 ? containers : undefined,
+          };
+        });
+
+        resolve(trucks);
+      } catch (error) {
+        reject(error);
+      }
+    };
+
+    reader.onerror = () => reject(new Error('Failed to read file'));
+    reader.readAsArrayBuffer(file);
+  });
+}
diff --git a/apps/edr-passenger-api/.env.test.example b/apps/edr-passenger-api/.env.test.example
new file mode 100644
index 000000000..b937d7061
--- /dev/null
+++ b/apps/edr-passenger-api/.env.test.example
@@ -0,0 +1,57 @@
+# E2E harness env — points at the hermetic test Postgres (e2e/docker-compose.yml, port 5544).
+# Loaded by test/setup/load-env.ts before the Nest AppModule boots. NEVER points at a real DB.
+NODE_ENV=test
+PORT=4099
+
+# Prisma — passenger schema in the test edr_database
+DATABASE_URL=postgresql://edr:edr_secret@localhost:5544/edr_database?schema=passenger
+
+# TypeORM / IAM — shared iam schema, same test DB
+DATABASE_HOST=localhost
+DATABASE_PORT=5544
+DATABASE_NAME=edr_database
+DATABASE_USER=edr
+DATABASE_PASSWORD=edr_secret
+DATABASE_SCHEMA=iam
+
+# Brokers / external systems OFF for a hermetic boot
+RABBITMQ_ENABLED=false
+RABBITMQ_URL=amqp://localhost:5672
+EMAIL_QUEUE=email_queue
+SMS_QUEUE=sms_queue
+PAYMENT_RABBITMQ_URL=amqp://edr:edr_secret@localhost:5672/payment
+PAYMENT_EVENTS_PREFETCH=10
+IAM_ENABLED=false
+FAYDA_ENABLED=false
+
+# MinIO — client is constructed at boot but never contacted in tests
+MINIO_ENDPOINT=localhost
+MINIO_PORT=9000
+MINIO_USE_SSL=false
+MINIO_ACCESS_KEY=minioadmin
+MINIO_SECRET_KEY=minioadmin
+MINIO_BUCKET=edr-test
+
+CORS_ORIGINS=http://localhost:5174,http://localhost:5184
+FE_BASE_URL=http://localhost:5184
+INVITATION_EXPIRY_DATE=30
+
+# JWT / IAM token contract — fixed test secrets (min 32 chars). Let tests mint IAM tokens.
+JWT_SECRET=test-jwt-secret-000000000000000000000000
+JWT_EXPIRES_IN=7d
+JWT_ACCESS_TOKEN_SECRET=test-access-secret-0000000000000000000000
+JWT_ACCESS_TOKEN_EXPIRES=1h
+JWT_REFRESH_TOKEN_SECRET=test-refresh-secret-000000000000000000000
+JWT_REFRESH_TOKEN_EXPIRES=7d
+
+DEFAULT_LOCALE=en
+SUPPORTED_LOCALES=en,am,fr,om
+SESSION_INACTIVITY_MINUTES=30
+
+# Payment providers — WALLET is fully internal; others unused in the API-level suite
+PAYMENT_PROVIDERS_ENABLED=TELEBIRR,CBE_BIRR,EBIRR,CARD,WALLET,WAAFI
+
+# Staff/org seeding off — the harness builds its own deterministic fixtures
+SEED_EDR_PASSENGER_ORG=false
+SEED_PASSENGER_STAFF=false
+DEFAULT_PASSWORD=Test@1234
diff --git a/apps/edr-passenger-api/.gitignore b/apps/edr-passenger-api/.gitignore
new file mode 100644
index 000000000..d25344817
--- /dev/null
+++ b/apps/edr-passenger-api/.gitignore
@@ -0,0 +1,6 @@
+
+# E2E HTML report output
+e2e-report/
+
+# Track the E2E env TEMPLATE (real .env.test stays ignored)
+!.env.test.example
diff --git a/apps/edr-passenger-api/package.json b/apps/edr-passenger-api/package.json
index a9ee85156..c4587e98a 100644
--- a/apps/edr-passenger-api/package.json
+++ b/apps/edr-passenger-api/package.json
@@ -10,6 +10,11 @@
     "lint": "eslint src",
     "test": "jest",
     "test:e2e": "jest --config ./test/jest-e2e.json",
+    "test:e2e:report": "jest --config ./test/jest-e2e.json; open e2e-report/index.html",
+    "test:e2e:all": "bash ../../e2e/run.sh",
+    "test:e2e:db:up": "docker compose -f ../../e2e/docker-compose.yml up -d",
+    "test:e2e:db:down": "docker compose -f ../../e2e/docker-compose.yml down",
+    "test:e2e:prepare": "bash ../../e2e/prepare.sh",
     "type-check": "tsc --noEmit",
     "iam:migrate": "node --env-file=.env scripts/run-iam-migrations.cjs",
     "iam:seed-dev-user": "node --env-file=.env scripts/seed-iam-dev-user.cjs",
@@ -78,6 +83,7 @@
     "@types/supertest": "^6.0.2",
     "@types/uuid": "^9.0.0",
     "jest": "^29.7.0",
+    "jest-html-reporters": "^3.1.7",
     "prisma": "^6.19.3",
     "supertest": "^7.0.0",
     "ts-jest": "^29.1.1",
diff --git a/apps/edr-passenger-api/prisma/migrations/20260723000001_add_route_stop_travel_minutes/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260723000001_add_route_stop_travel_minutes/migration.sql
new file mode 100644
index 000000000..59ae79426
--- /dev/null
+++ b/apps/edr-passenger-api/prisma/migrations/20260723000001_add_route_stop_travel_minutes/migration.sql
@@ -0,0 +1,9 @@
+-- Adds RouteStop.travelMinutesToStop: admin-configured travel time (minutes) from the
+-- previous stop, used to compute each stop's estimated arrival time (replacing/augmenting
+-- distance-proportional interpolation). Nullable — falls back to distance interpolation
+-- when unset.
+-- Uses IF NOT EXISTS following the pattern established in
+-- 20260719000002_repair_route_checkin_minutes, after this same table had two migrations
+-- checked in as empty "applied directly" placeholders that never reached the deployed DB.
+
+ALTER TABLE passenger."RouteStop" ADD COLUMN IF NOT EXISTS "travelMinutesToStop" INTEGER;
diff --git a/apps/edr-passenger-api/prisma/schema.prisma b/apps/edr-passenger-api/prisma/schema.prisma
index db46df025..de086e465 100644
--- a/apps/edr-passenger-api/prisma/schema.prisma
+++ b/apps/edr-passenger-api/prisma/schema.prisma
@@ -1078,6 +1078,7 @@ model RouteStop {
   sequence             Int
   distanceKm           Float?
   checkinMinutesBefore Int?
+  travelMinutesToStop  Int?
   plannedArrivalTime   DateTime?
   plannedDepartureTime DateTime?
   createdAt            DateTime @default(now())
diff --git a/apps/edr-passenger-api/src/common/utils/checkin-cutoff.utils.ts b/apps/edr-passenger-api/src/common/utils/checkin-cutoff.utils.ts
new file mode 100644
index 000000000..36c0f872c
--- /dev/null
+++ b/apps/edr-passenger-api/src/common/utils/checkin-cutoff.utils.ts
@@ -0,0 +1,43 @@
+/**
+ * Resolves the booking/check-in cutoff for one boarding stop.
+ *
+ * Priority for checkinMinutes: RouteStop.checkinMinutesBefore → Route.checkinMinutesBefore → 30.
+ *
+ * Anchor (segmentTime): plannedDepartureAt ?? plannedArrivalAt ?? schedule.departureAt.
+ *   - For the origin stop: plannedDepartureAt = schedule.departureAt (no arrival).
+ *   - For intermediate stops: plannedDepartureAt = plannedArrivalAt + dwell (checkinMinutesBefore).
+ *     cutoffAt = departureAt − checkinMinutesBefore = arrivalAt, so booking closes the
+ *     moment the train reaches the stop — independent of how long ago it left the origin.
+ *
+ * Single source of truth — SeatsService.holdSeats and SearchService.buildScheduleResult both
+ * apply it; GuestBookingService.createGuestBooking also applies it per boarding stop.
+ */
+export interface CheckinCutoff {
+  /** The stop's planned departure time (or arrival / schedule departure as fallback). */
+  segmentTime: Date;
+  /** Minutes before segmentTime that booking/holding closes. */
+  checkinMinutes: number;
+  /** The moment booking/holding closes for this stop. */
+  cutoffAt: Date;
+}
+
+export function resolveCheckinCutoff(
+  schedule: {
+    departureAt: Date;
+    route?: {
+      checkinMinutesBefore?: number | null;
+      stops?: Array<{ stationId: string; checkinMinutesBefore: number | null }>;
+    } | null;
+  },
+  stopTime: { plannedArrivalAt?: Date | null; plannedDepartureAt?: Date | null } | null | undefined,
+  stationId: string | null | undefined,
+): CheckinCutoff {
+  const segmentTime = stopTime?.plannedDepartureAt ?? stopTime?.plannedArrivalAt ?? schedule.departureAt;
+  const routeStop = stationId ? schedule.route?.stops?.find((s) => s.stationId === stationId) : undefined;
+  const checkinMinutes = routeStop?.checkinMinutesBefore ?? schedule.route?.checkinMinutesBefore ?? 30;
+  return {
+    segmentTime,
+    checkinMinutes,
+    cutoffAt: new Date(segmentTime.getTime() - checkinMinutes * 60_000),
+  };
+}
diff --git a/apps/edr-passenger-api/src/common/utils/schedule-times.utils.ts b/apps/edr-passenger-api/src/common/utils/schedule-times.utils.ts
new file mode 100644
index 000000000..59d5f1d7e
--- /dev/null
+++ b/apps/edr-passenger-api/src/common/utils/schedule-times.utils.ts
@@ -0,0 +1,76 @@
+import { Logger } from '@nestjs/common';
+
+const logger = new Logger('ScheduleTimesUtils');
+
+export type StopForTiming = {
+  sequence: number;
+  distanceKm: number | null;
+  travelMinutesToStop: number | null;
+  checkinMinutesBefore: number | null;
+};
+
+export type PlannedStopTime = {
+  sequence: number;
+  plannedArrivalAt: string | undefined;
+  plannedDepartureAt: string | undefined;
+};
+
+/**
+ * Computes each stop's planned arrival/departure time by walking the route in sequence order.
+ *
+ * Model per intermediate stop:
+ *   arrival  = departureCursor + travelMinutesToStop  (falls back to distance interpolation)
+ *   departure = arrival + checkinMinutesBefore          (dwell time; 0 if null)
+ *   next-stop travel starts from this departure, not from arrival.
+ *
+ * This means booking for stop B closes at B.departureAt − checkinMinutesBefore = B.arrivalAt,
+ * i.e. the train must not yet have arrived at the stop for a booking to succeed.
+ *
+ * The last stop is always locked to arr so schedule.arrivalAt stays authoritative.
+ */
+export function computePlannedStopTimes(
+  route: { id: string; stops: StopForTiming[] },
+  dep: Date,
+  arr: Date,
+): PlannedStopTime[] {
+  const totalDuration = arr.getTime() - dep.getTime();
+  const totalDistance = route.stops[route.stops.length - 1].distanceKm || 0;
+
+  // cursor tracks the DEPARTURE time from the most-recently processed stop.
+  let departureCursor = dep;
+
+  return route.stops.map((stop, index) => {
+    if (index === 0) {
+      // Origin: train starts here, no arrival.
+      departureCursor = dep;
+      return { sequence: stop.sequence, plannedArrivalAt: undefined, plannedDepartureAt: dep.toISOString() };
+    }
+
+    if (index === route.stops.length - 1) {
+      // Final destination: arrival is authoritative; no departure.
+      return { sequence: stop.sequence, plannedArrivalAt: arr.toISOString(), plannedDepartureAt: undefined };
+    }
+
+    // Intermediate stop: compute arrival from the previous stop's departure.
+    let arrivalAt: Date;
+    if (stop.travelMinutesToStop != null) {
+      arrivalAt = new Date(departureCursor.getTime() + stop.travelMinutesToStop * 60_000);
+    } else {
+      const stopDistance = stop.distanceKm || 0;
+      const progress = totalDistance > 0 ? stopDistance / totalDistance : index / (route.stops.length - 1);
+      arrivalAt = new Date(dep.getTime() + totalDuration * progress);
+      logger.warn(`Route ${route.id} stop seq ${stop.sequence} missing travelMinutesToStop; falling back to distance interpolation`);
+    }
+
+    // Dwell at this stop = checkinMinutesBefore (the boarding window).
+    const dwell = stop.checkinMinutesBefore ?? 0;
+    const departureAt = new Date(arrivalAt.getTime() + dwell * 60_000);
+    departureCursor = departureAt;
+
+    return {
+      sequence: stop.sequence,
+      plannedArrivalAt: arrivalAt.toISOString(),
+      plannedDepartureAt: departureAt.toISOString(),
+    };
+  });
+}
diff --git a/apps/edr-passenger-api/src/common/utils/segment-resolver.utils.ts b/apps/edr-passenger-api/src/common/utils/segment-resolver.utils.ts
new file mode 100644
index 000000000..2fcc6581b
--- /dev/null
+++ b/apps/edr-passenger-api/src/common/utils/segment-resolver.utils.ts
@@ -0,0 +1,37 @@
+/**
+ * Resolves a booking's actual boarding/alighting station AND time for one leg from
+ * originStationId/destinationStationId (set when the booking covers only part of a
+ * longer multi-stop schedule, e.g. train runs A→D but the passenger booked B→D), via
+ * the schedule's stopTimes — falling back to the schedule's own full-route
+ * station/time when there's no segment override (older records, or a booking that
+ * covers the whole run).
+ *
+ * Single source of truth for this resolution — station-only lookups used to be
+ * duplicated ad hoc across bookings/tickets/notifications while the departureAt/
+ * arrivalAt kept being read straight off the schedule (the train's full-route span),
+ * which showed the wrong boarding/alighting time for any stop-based booking.
+ */
+export interface ResolvedSegment {
+  origin: any;
+  destination: any;
+  departureAt: any;
+  arrivalAt: any;
+}
+
+export function resolveBookingSegment(
+  schedule: any,
+  originStationId: string | null | undefined,
+  destinationStationId: string | null | undefined,
+): ResolvedSegment {
+  const stopTimes: any[] = schedule?.stopTimes ?? [];
+  const findStop = (stationId: string | null | undefined) =>
+    stationId && stopTimes.length > 0 ? stopTimes.find((st: any) => st.stationId === stationId) : undefined;
+  const originStop = findStop(originStationId);
+  const destStop = findStop(destinationStationId);
+  return {
+    origin: originStop?.station ?? schedule?.originStation ?? null,
+    destination: destStop?.station ?? schedule?.destinationStation ?? null,
+    departureAt: originStop?.plannedDepartureAt ?? schedule?.departureAt ?? null,
+    arrivalAt: destStop?.plannedArrivalAt ?? schedule?.arrivalAt ?? null,
+  };
+}
diff --git a/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts b/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts
index 8b37f9841..98a54528b 100644
--- a/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts
+++ b/apps/edr-passenger-api/src/modules/bookings/bookings.service.ts
@@ -14,6 +14,7 @@ import { Currency, PassengerCategory, IdDocumentType } from '@prisma/client';
 import { resolveCurrencyFromNationality } from '../fare-engine/fare-engine.dto';
 import { DeleteOperationException } from '../../common/exceptions/delete-operation.exception';
 import { AuditService } from '../../common/audit.service';
+import { resolveBookingSegment } from '../../common/utils/segment-resolver.utils';
 
 function generateRef(): string {
   const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
@@ -140,7 +141,7 @@ export class BookingsService {
         take: pageSize,
         orderBy: { createdAt: 'desc' },
         include: {
-          schedule: { include: { originStation: true, destinationStation: true, train: true } },
+          schedule: { include: { originStation: true, destinationStation: true, train: true, stopTimes: { include: { station: true } } } },
           paymentIntent: true,
           seats: { include: { seat: true } },
           priceTier: { select: { priceMinor: true } },
@@ -148,31 +149,34 @@ export class BookingsService {
       }),
       this.prisma.booking.count({ where }),
     ]);
-    
+
     return {
-      items: items.map(booking => ({
-        id: booking.id,
-        bookingRef: booking.bookingRef,
-        status: booking.status,
-        totalMinor: booking.displayTotalMinor ?? resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
-        currency: booking.displayCurrency,
-        displayCurrency: booking.displayCurrency,
-        displayTotalMinor: booking.displayTotalMinor,
-        adultCount: booking.adultCount,
-        childCount: booking.childCount,
-        bookingType: booking.bookingType,
-        returnLegStatus: (booking as any).returnLegStatus ?? null,
-        createdAt: booking.createdAt,
-        schedule: {
-          train: booking.schedule.train,
-          originStation: booking.schedule.originStation,
-          destinationStation: booking.schedule.destinationStation,
-          departureAt: booking.schedule.departureAt,
-          arrivalAt: booking.schedule.arrivalAt,
-        },
-        paymentIntent: booking.paymentIntent,
-        seatCount: booking.seats.length,
-      })),
+      items: items.map(booking => {
+        const segment = resolveBookingSegment((booking as any).schedule, (booking as any).originStationId, (booking as any).destinationStationId);
+        return {
+          id: booking.id,
+          bookingRef: booking.bookingRef,
+          status: booking.status,
+          totalMinor: booking.displayTotalMinor ?? resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
+          currency: booking.displayCurrency,
+          displayCurrency: booking.displayCurrency,
+          displayTotalMinor: booking.displayTotalMinor,
+          adultCount: booking.adultCount,
+          childCount: booking.childCount,
+          bookingType: booking.bookingType,
+          returnLegStatus: (booking as any).returnLegStatus ?? null,
+          createdAt: booking.createdAt,
+          schedule: {
+            train: booking.schedule.train,
+            originStation: segment.origin,
+            destinationStation: segment.destination,
+            departureAt: segment.departureAt,
+            arrivalAt: segment.arrivalAt,
+          },
+          paymentIntent: booking.paymentIntent,
+          seatCount: booking.seats.length,
+        };
+      }),
       meta: {
         page,
         pageSize,
@@ -270,7 +274,7 @@ export class BookingsService {
         take: pageSize,
         orderBy: { createdAt: 'desc' },
         include: {
-          schedule: { include: { originStation: true, destinationStation: true, train: true } },
+          schedule: { include: { originStation: true, destinationStation: true, train: true, stopTimes: { include: { station: true } } } },
           paymentIntent: { select: { method: true, status: true, amountMinor: true, currency: true } },
           seats: { select: { id: true } },
           priceTier: { select: { priceMinor: true } },
@@ -294,7 +298,9 @@ export class BookingsService {
       this.prisma.packageBooking.count({ where: pkgWhere }),
     ]);
 
-    const mappedBookings = items.map(booking => ({
+    const mappedBookings = items.map(booking => {
+      const segment = resolveBookingSegment((booking as any).schedule, (booking as any).originStationId, (booking as any).destinationStationId);
+      return {
       id: booking.id,
       bookingRef: booking.bookingRef,
       status: booking.status,
@@ -309,14 +315,15 @@ export class BookingsService {
       createdAt: booking.createdAt,
       schedule: {
         train: booking.schedule.train,
-        originStation: booking.schedule.originStation,
-        destinationStation: booking.schedule.destinationStation,
-        departureAt: booking.schedule.departureAt,
-        arrivalAt: booking.schedule.arrivalAt,
+        originStation: segment.origin,
+        destinationStation: segment.destination,
+        departureAt: segment.departureAt,
+        arrivalAt: segment.arrivalAt,
       },
       payment: booking.paymentIntent ?? undefined,
       seatCount: booking.seats.length,
-    }));
+      };
+    });
 
     const mappedPkg = pkgItems.map((b: any) => ({
       id: b.id,
@@ -397,7 +404,7 @@ export class BookingsService {
         take: pageSize,
         orderBy: { createdAt: 'desc' },
         include: {
-          schedule: { include: { originStation: true, destinationStation: true, train: true } },
+          schedule: { include: { originStation: true, destinationStation: true, train: true, stopTimes: { include: { station: true } } } },
           paymentIntent: true,
           seats: { include: { seat: true } },
           priceTier: { select: { priceMinor: true } },
@@ -405,9 +412,11 @@ export class BookingsService {
       }),
       this.prisma.booking.count({ where }),
     ]);
-    
+
     return {
-      items: items.map(booking => ({
+      items: items.map(booking => {
+        const segment = resolveBookingSegment((booking as any).schedule, (booking as any).originStationId, (booking as any).destinationStationId);
+        return {
         id: booking.id,
         bookingRef: booking.bookingRef,
         status: booking.status,
@@ -422,14 +431,15 @@ export class BookingsService {
         createdAt: booking.createdAt,
         schedule: {
           train: booking.schedule.train,
-          originStation: booking.schedule.originStation,
-          destinationStation: booking.schedule.destinationStation,
-          departureAt: booking.schedule.departureAt,
-          arrivalAt: booking.schedule.arrivalAt,
+          originStation: segment.origin,
+          destinationStation: segment.destination,
+          departureAt: segment.departureAt,
+          arrivalAt: segment.arrivalAt,
         },
         paymentIntent: booking.paymentIntent,
         seatCount: booking.seats.length,
-      })),
+        };
+      }),
       meta: {
         page,
         pageSize,
@@ -532,7 +542,7 @@ export class BookingsService {
           orderBy: { createdAt: 'desc' },
           include: {
             passenger: { select: { id: true, iamUserId: true } },
-            schedule: { include: { originStation: true, destinationStation: true, train: true } },
+            schedule: { include: { originStation: true, destinationStation: true, train: true, stopTimes: { include: { station: true } } } },
             paymentIntent: true,
             seats: { include: { seat: true } },
             priceTier: { select: { priceMinor: true } },
@@ -554,9 +564,10 @@ export class BookingsService {
         const iam = booking.passenger?.iamUserId ? iamMap.get(booking.passenger.iamUserId) : undefined;
         const passengerDetails = booking.seats.map((s: any) => ({ name: s.passengerName, category: s.passengerCategory }));
         const uniquePassengers = Array.from(new Map(passengerDetails.map((p: any) => [p.name, p])).values());
+        const segment = booking.schedule ? resolveBookingSegment(booking.schedule, booking.originStationId, booking.destinationStationId) : null;
         return {
           id: booking.id, bookingRef: booking.bookingRef, status: booking.status,
-          totalMinor: booking.displayTotalMinor ?? resolvePackageRoundTripTotal(booking, booking.priceTier?.priceMinor, booking.adultCount, booking.childCount), 
+          totalMinor: booking.displayTotalMinor ?? resolvePackageRoundTripTotal(booking, booking.priceTier?.priceMinor, booking.adultCount, booking.childCount),
           currency: booking.displayCurrency,
           displayCurrency: booking.displayCurrency, displayTotalMinor: booking.displayTotalMinor,
           contactEmail: booking.contactEmail, contactPhone: booking.contactPhone,
@@ -567,11 +578,11 @@ export class BookingsService {
           passenger: iam ? { fullName: iam.name?.en ?? iam.name?.am ?? null, email: iam.email, phone: iam.phone_number } : null,
           passengerNames: [...new Set(booking.seats.map((s: any) => s.passengerName))],
           passengers: uniquePassengers,
-          schedule: booking.schedule ? {
+          schedule: segment ? {
             train: booking.schedule.train,
-            originStation: booking.schedule.originStation,
-            destinationStation: booking.schedule.destinationStation,
-            departureAt: booking.schedule.departureAt,
+            originStation: segment.origin,
+            destinationStation: segment.destination,
+            departureAt: segment.departureAt,
           } : null,
           paymentIntent: booking.paymentIntent,
           seatCount: booking.seats.length,
@@ -715,16 +726,15 @@ export class BookingsService {
           verifaydaVerified: s.verifaydaVerified,
           seat: s.seat ? { seatNumber: s.seat.seatNumber, coach: { number: s.seat.coach?.number ?? null } } : null,
         })),
-        schedule: {
-          train: booking.schedule.train,
-          originStation: (booking as any).originStationId
-            ? ((booking.schedule as any).stopTimes?.find((s: any) => s.stationId === (booking as any).originStationId)?.station ?? booking.schedule.originStation)
-            : booking.schedule.originStation,
-          destinationStation: (booking as any).destinationStationId
-            ? ((booking.schedule as any).stopTimes?.find((s: any) => s.stationId === (booking as any).destinationStationId)?.station ?? booking.schedule.destinationStation)
-            : booking.schedule.destinationStation,
-          departureAt: booking.schedule.departureAt,
-        },
+        schedule: (() => {
+          const segment = resolveBookingSegment(booking.schedule, (booking as any).originStationId, (booking as any).destinationStationId);
+          return {
+            train: booking.schedule.train,
+            originStation: segment.origin,
+            destinationStation: segment.destination,
+            departureAt: segment.departureAt,
+          };
+        })(),
         paymentIntent: booking.paymentIntent,
         seatCount: booking.seats.length,
       };
@@ -865,6 +875,9 @@ export class BookingsService {
     const allFaresProvided = seatedPassengers.length > 0 && seatedPassengers.every(p => p.seatFareMinor != null);
     let resolvedTotalMinor: number;
     let displayTotalMinor: number;
+    // True when the total came from a client-summed subtotal (per-seat sum or reviewedTotalMinor),
+    // which the portal computes UNDISCOUNTED — the promo must still be applied to it (H-13).
+    let usedClientSubtotal = false;
 
     if (allFaresProvided && !dto.packageId) {
       // Server has every passenger's berth fare — sum is the authoritative display total.
@@ -872,6 +885,7 @@ export class BookingsService {
       resolvedTotalMinor = displayCurrency !== Currency.ETB
         ? await this.currencyService.convertAmount(displayTotalMinor, displayCurrency, Currency.ETB)
         : displayTotalMinor;
+      usedClientSubtotal = true;
       if (dto.reviewedTotalMinor != null && dto.reviewedTotalMinor !== displayTotalMinor) {
         this.logger.warn(`createOneWayBooking: reviewedTotalMinor=${dto.reviewedTotalMinor} ignored — using server-computed sum=${displayTotalMinor}`);
       }
@@ -893,13 +907,35 @@ export class BookingsService {
       resolvedTotalMinor = displayCurrency !== Currency.ETB
         ? await this.currencyService.convertAmount(dto.reviewedTotalMinor, displayCurrency, Currency.ETB)
         : dto.reviewedTotalMinor;
+      usedClientSubtotal = true;
     } else {
       resolvedTotalMinor = fareCalculation.totalMinor;
       displayTotalMinor = displayCurrency !== Currency.ETB
         ? await this.currencyService.convertAmount(resolvedTotalMinor, Currency.ETB, displayCurrency)
         : resolvedTotalMinor;
     }
-    this.logger.log(`createOneWayBooking: resolvedTotalMinor=${resolvedTotalMinor} displayTotalMinor=${displayTotalMinor} displayCurrency=${displayCurrency} (reviewedTotalMinor=${dto.reviewedTotalMinor} allFaresProvided=${allFaresProvided} fareEngine=${fareCalculation.totalMinor})`);
+
+    // H-13 fix: the portal sums UNDISCOUNTED per-passenger fares into the total it sends, silently
+    // dropping the promo the fare engine recognized (the discount lives only in the fare-breakdown).
+    // When the total came from that client subtotal, apply the authoritative promo discount so the
+    // customer is charged the discounted price. No-op when no promo applies (discountMinor === 0).
+    // The fallback branch above already books fareCalculation.totalMinor (discount included), so it is
+    // excluded via usedClientSubtotal to avoid double-subtracting.
+    if (usedClientSubtotal && fareCalculation.discountMinor > 0) {
+      resolvedTotalMinor = Math.max(0, resolvedTotalMinor - fareCalculation.discountMinor);
+      const discountDisplayMinor = displayCurrency !== Currency.ETB
+        ? await this.currencyService.convertAmount(fareCalculation.discountMinor, Currency.ETB, displayCurrency)
+        : fareCalculation.discountMinor;
+      displayTotalMinor = Math.max(0, displayTotalMinor - discountDisplayMinor);
+    }
+    this.logger.log(`createOneWayBooking: resolvedTotalMinor=${resolvedTotalMinor} displayTotalMinor=${displayTotalMinor} displayCurrency=${displayCurrency} (reviewedTotalMinor=${dto.reviewedTotalMinor} allFaresProvided=${allFaresProvided} discountMinor=${fareCalculation.discountMinor} fareEngine=${fareCalculation.totalMinor})`);
+
+    // C-1 guard: never charge less than the server-recomputed authoritative fare. resolvedTotalMinor
+    // is the ETB charge basis; fareCalculation.totalMinor is the authoritative ETB fare (already net
+    // of promo/loyalty/free-child). A client that forges seatFareMinor / reviewedTotalMinor below it
+    // is rejected. Floor (not equality) so legitimate berth surcharges — which only raise the total —
+    // still pass; the tolerance absorbs FX-conversion rounding.
+    this.assertTotalNotUnderAuthoritative(resolvedTotalMinor, fareCalculation.totalMinor, 'createOneWayBooking');
 
     const booking = await this.prisma.booking.create({
       data: {
@@ -911,7 +947,9 @@ export class BookingsService {
         status: 'PENDING_PAYMENT',
         bookingType: 'ONE_WAY',
         totalMinor: resolvedTotalMinor,
-        currency: displayCurrency,
+        // Charge basis is ETB (resolvedTotalMinor). The passenger's currency and amount live in
+        // displayCurrency/displayTotalMinor — keep currency coherent with totalMinor's units.
+        currency: Currency.ETB,
         adultCount,
         childCount,
         displayCurrency,
@@ -1030,6 +1068,9 @@ export class BookingsService {
       loyaltyMinor = (dto.loyaltyRedemptionPoints ?? 0) * 10;
       totalMinor = Math.max(0, combinedBaseFareMinor - discountMinor - loyaltyMinor);
     }
+    // C-1 guard: authoritative ETB fare for both legs, captured before the client-driven branches
+    // below may overwrite totalMinor with a per-seat sum or reviewedTotalMinor.
+    const authoritativeTotalMinor = totalMinor;
     const taxesMinor = 0;
 
     const displayCurrency = dto.displayCurrency || resolveCurrencyFromNationality(passengersData[0]?.nationality);
@@ -1095,6 +1136,9 @@ export class BookingsService {
         : dto.reviewedTotalMinor;
     }
 
+    // C-1 guard: never charge less than the server-recomputed authoritative round-trip fare.
+    this.assertTotalNotUnderAuthoritative(totalMinor, authoritativeTotalMinor, 'createRoundTripBooking');
+
     const booking = await this.prisma.booking.create({
       data: {
         bookingRef: generateRef(),
@@ -1105,7 +1149,7 @@ export class BookingsService {
         status: 'PENDING_PAYMENT',
         bookingType: 'ROUND_TRIP',
         totalMinor,
-        currency: displayCurrency,
+        currency: Currency.ETB, // ETB charge basis; passenger currency in displayCurrency/displayTotalMinor
         adultCount,
         childCount,
         displayCurrency,
@@ -1298,7 +1342,7 @@ export class BookingsService {
         status: 'PENDING_PAYMENT',
         bookingType: 'TRANSIT',
         totalMinor,
-        currency: displayCurrency,
+        currency: Currency.ETB, // ETB charge basis; passenger currency in displayCurrency/displayTotalMinor
         adultCount,
         childCount,
         displayCurrency,
@@ -1508,7 +1552,7 @@ export class BookingsService {
         destinationStationId: dto.leg2DestinationStationId,
         status: 'PENDING_PAYMENT',
         bookingType: 'ROUND_TRIP_TRANSIT',
-        totalMinor, currency: displayCurrency, adultCount, childCount, displayCurrency, displayTotalMinor,
+        totalMinor, currency: Currency.ETB, adultCount, childCount, displayCurrency, displayTotalMinor, // ETB charge basis; passenger currency in displayCurrency/displayTotalMinor
         // Outbound transit leg-2
         leg2ScheduleId: dto.leg2ScheduleId,
         leg2OriginStationId: dto.transitStationId,
@@ -1677,6 +1721,21 @@ export class BookingsService {
     };
   }
 
+  /**
+   * C-1 protection: reject a booking whose ETB charge basis is below the server-recomputed
+   * authoritative fare. A floor (not equality) so legitimate berth surcharges — which only raise
+   * the total — still pass; a 1% tolerance absorbs FX-conversion rounding. A forged seatFareMinor /
+   * reviewedTotalMinor that lowers the charge (e.g. to 1 or 0) is refused with a 400 and nothing is
+   * persisted.
+   */
+  private assertTotalNotUnderAuthoritative(resolvedTotalMinor: number, authoritativeMinor: number, context: string): void {
+    const tolerance = Math.max(1, Math.round(authoritativeMinor * 0.01));
+    if (resolvedTotalMinor < authoritativeMinor - tolerance) {
+      this.logger.warn(`${context}: rejecting booking — resolvedTotalMinor=${resolvedTotalMinor} below authoritative fare=${authoritativeMinor}`);
+      throw new BadRequestException('Booking total does not match the authoritative fare');
+    }
+  }
+
   private async calculateFare(
     scheduleId: string,
     seatClassId: string,
@@ -1801,35 +1860,6 @@ export class BookingsService {
     );
   }
 
-  // Resolves the passenger's actual boarding/alighting stations AND times for one leg
-  // from originStationId/destinationStationId (set when the booking covers only part of
-  // a longer multi-stop schedule, e.g. train runs A→D but the passenger booked B→D) via
-  // the schedule's stopTimes, falling back to the schedule's own full-route endpoints/
-  // times when there's no segment override (older records, or a booking that covers the
-  // whole run). Station resolution mirrors notifications.service.ts's
-  // resolveSegmentStations (already applied to SMS/email); the departureAt/arrivalAt
-  // resolution mirrors search.service.ts's leg construction (originStop.plannedDepartureAt
-  // / destStop.plannedArrivalAt) — this brings the booking API (voucher, detail page,
-  // confirmation) to the same behavior search results already have, instead of always
-  // showing the train's full-route span.
-  private resolveSegmentStations(
-    schedule: any,
-    originStationId: string | null | undefined,
-    destinationStationId: string | null | undefined,
-  ): { origin: any; destination: any; departureAt: any; arrivalAt: any } {
-    const stopTimes: any[] = schedule?.stopTimes ?? [];
-    const findStop = (stationId: string | null | undefined) =>
-      stationId && stopTimes.length > 0 ? stopTimes.find((st: any) => st.stationId === stationId) : undefined;
-    const originStop = findStop(originStationId);
-    const destStop = findStop(destinationStationId);
-    return {
-      origin: originStop?.station ?? schedule?.originStation ?? null,
-      destination: destStop?.station ?? schedule?.destinationStation ?? null,
-      departureAt: originStop?.plannedDepartureAt ?? schedule?.departureAt ?? null,
-      arrivalAt: destStop?.plannedArrivalAt ?? schedule?.arrivalAt ?? null,
-    };
-  }
-
   async getByRef(bookingRefOrId: string) {
     const isUuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(bookingRefOrId);
     const booking = await this.prisma.booking.findUnique({
@@ -1938,13 +1968,13 @@ export class BookingsService {
       if (refreshed) Object.assign(booking, refreshed);
     }
 
-    const outboundSegment = this.resolveSegmentStations(
+    const outboundSegment = resolveBookingSegment(
       (booking as any).schedule,
       (booking as any).originStationId,
       (booking as any).destinationStationId,
     );
     const returnSegment = (booking as any).returnSchedule
-      ? this.resolveSegmentStations(
+      ? resolveBookingSegment(
           (booking as any).returnSchedule,
           (booking as any).returnOriginStationId,
           (booking as any).returnDestinationStationId,
diff --git a/apps/edr-passenger-api/src/modules/bookings/guest-booking.service.ts b/apps/edr-passenger-api/src/modules/bookings/guest-booking.service.ts
index af5321e2d..3e2a225e6 100644
--- a/apps/edr-passenger-api/src/modules/bookings/guest-booking.service.ts
+++ b/apps/edr-passenger-api/src/modules/bookings/guest-booking.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, BadRequestException, NotFoundException } from '@nestjs/common';
+import { Injectable, BadRequestException, NotFoundException, Logger } from '@nestjs/common';
 import { PrismaService } from '../../common/prisma.service';
 import { SeatsService } from '../seats/seats.service';
 import { VerifaydaService } from '../verifayda/verifayda.service';
@@ -8,9 +8,22 @@ import { FareEngineService } from '../fare-engine/fare-engine.service';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { CreateGuestBookingDto, SavedPassengerProfileDto } from './guest-booking.dto';
 import { Currency, PassengerCategory, IdDocumentType } from '@prisma/client';
+import { resolveCheckinCutoff } from '../../common/utils/checkin-cutoff.utils';
 
-/** Booking cutoff: reject new bookings within this many ms of departure. */
-const BOOKING_CUTOFF_MS = 30 * 60 * 1000;
+/**
+ * Throws if the given boarding stop's own configurable check-in cutoff (route/stop
+ * checkinMinutesBefore, same mechanism the seat hold and search results already enforce) has
+ * passed. Must be checked against the actual boarding stop, not the schedule's origin — a
+ * downstream stop's cutoff is independent of how long ago the train left its origin.
+ */
+function assertWithinCheckinCutoff(schedule: any, stopTime: any, stationId: string | null | undefined): void {
+  const { cutoffAt, checkinMinutes } = resolveCheckinCutoff(schedule, stopTime, stationId);
+  if (Date.now() >= cutoffAt.getTime()) {
+    throw new BadRequestException(
+      `Bookings are not accepted within ${checkinMinutes} minute${checkinMinutes !== 1 ? 's' : ''} of departure`,
+    );
+  }
+}
 
 function generateRef(): string {
   const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
@@ -42,6 +55,8 @@ function calculateAge(dateOfBirth: Date): number {
 
 @Injectable()
 export class GuestBookingService {
+  private readonly logger = new Logger(GuestBookingService.name);
+
   constructor(
     private prisma: PrismaService,
     private seatsService: SeatsService,
@@ -52,6 +67,21 @@ export class GuestBookingService {
     private eventEmitter: EventEmitter2,
   ) { }
 
+  /**
+   * C-1 protection (guest path): reject a booking whose ETB charge basis is below the
+   * server-recomputed authoritative fare. A floor (not equality) so legitimate berth surcharges —
+   * which only raise the total — still pass; a 1% tolerance absorbs FX-conversion rounding. A forged
+   * seatFareMinor / reviewedTotalMinor that lowers the charge (e.g. to 0) is refused with a 400 and
+   * nothing is persisted.
+   */
+  private assertTotalNotUnderAuthoritative(resolvedTotalMinor: number, authoritativeMinor: number, context: string): void {
+    const tolerance = Math.max(1, Math.round(authoritativeMinor * 0.01));
+    if (resolvedTotalMinor < authoritativeMinor - tolerance) {
+      this.logger.warn(`${context}: rejecting booking — resolvedTotalMinor=${resolvedTotalMinor} below authoritative fare=${authoritativeMinor}`);
+      throw new BadRequestException('Booking total does not match the authoritative fare');
+    }
+  }
+
   async createGuestBooking(dto: CreateGuestBookingDto, req?: any) {
     // Enrich passengers with phone/email from SavedPassengerProfile when not supplied inline.
     // The portal calls /passengers/save-details before booking but doesn't re-send contact
@@ -90,20 +120,22 @@ export class GuestBookingService {
         originStation: true,
         destinationStation: true,
         stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } },
+        route: { include: { stops: true } },
       },
     });
     if (!schedule) throw new NotFoundException('Schedule not found');
 
-    if (Date.now() >= schedule.departureAt.getTime() - BOOKING_CUTOFF_MS) {
-      throw new BadRequestException('Bookings are not accepted within 30 minutes of departure');
-    }
-
     const originStop = schedule.stopTimes.find(s => s.stationId === dto.originStationId)
       ?? (schedule.stopTimes.length === 0 ? { stationId: schedule.originStationId, sequence: 0, station: schedule.originStation } : undefined);
     const destStop = schedule.stopTimes.find(s => s.stationId === dto.destinationStationId)
       ?? (schedule.stopTimes.length === 0 ? { stationId: schedule.destinationStationId, sequence: 1, station: schedule.destinationStation } : undefined);
     if (!originStop || !destStop) throw new NotFoundException('Origin or destination not found');
 
+    // Cut off relative to the passenger's actual boarding stop, using the same
+    // configurable per-stop/route checkinMinutesBefore that already gated the seat hold
+    // and the search result — not a separate, hardcoded 30 minutes off the train's origin.
+    assertWithinCheckinCutoff(schedule, originStop, dto.originStationId);
+
     const segmentRoute = `${originStop.station.code}-${destStop.station.code}`;
     const fullRoute = `${schedule.originStation.code}-${schedule.destinationStation.code}`;
 
@@ -250,6 +282,9 @@ export class GuestBookingService {
       ? await this.currencyService.convertAmount(displayTotalMinor, displayCurrency, Currency.ETB)
       : displayTotalMinor;
 
+    // C-1 guard: never charge less than the server-recomputed authoritative ETB fare (net of promo).
+    this.assertTotalNotUnderAuthoritative(resolvedTotalMinor, Math.max(0, totalBaseFareMinor - discountMinor), 'createGuestBooking');
+
     // Resolve or create the guest Passenger record
     const firstPassenger = passengersData[0];
     const { guestPassengerId, iamUserId, createdAccount } = await this.resolveGuestPassenger(dto, firstPassenger, req);
@@ -284,7 +319,9 @@ export class GuestBookingService {
         destinationStationId: dto.destinationStationId,
         status: 'PENDING_PAYMENT',
         totalMinor: resolvedTotalMinor,
-        currency: displayCurrency,
+        // Charge basis is ETB (resolvedTotalMinor). The passenger's currency and amount live in
+        // displayCurrency/displayTotalMinor — keep currency coherent with totalMinor's units.
+        currency: Currency.ETB,
         adultCount,
         childCount,
         displayCurrency,
@@ -369,7 +406,7 @@ export class GuestBookingService {
     const [outboundSchedule, returnSchedule] = await Promise.all([
       this.prisma.trainSchedule.findUnique({
         where: { id: dto.scheduleId },
-        include: { originStation: true, destinationStation: true, stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } } },
+        include: { originStation: true, destinationStation: true, stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } }, route: { include: { stops: true } } },
       }),
       this.prisma.trainSchedule.findUnique({
         where: { id: dto.returnScheduleId },
@@ -379,10 +416,6 @@ export class GuestBookingService {
     if (!outboundSchedule) throw new NotFoundException('Outbound schedule not found');
     if (!returnSchedule) throw new NotFoundException('Return schedule not found');
 
-    if (Date.now() >= outboundSchedule.departureAt.getTime() - BOOKING_CUTOFF_MS) {
-      throw new BadRequestException('Bookings are not accepted within 30 minutes of departure');
-    }
-
     const synth = (sched: any, stationId: string, seq: number) => {
       const station = sched.originStationId === stationId ? sched.originStation : sched.destinationStation;
       return { stationId, sequence: seq, station };
@@ -396,6 +429,10 @@ export class GuestBookingService {
     if (!outboundOriginStop || !outboundDestStop) throw new NotFoundException('Outbound origin or destination not found on schedule');
     if (!returnOriginStop || !returnDestStop) throw new NotFoundException('Return origin or destination not found on schedule');
 
+    // Cut off relative to the passenger's actual boarding stop, using the same configurable
+    // per-stop/route checkinMinutesBefore that already gated the seat hold and search result.
+    assertWithinCheckinCutoff(outboundSchedule, outboundOriginStop, dto.originStationId);
+
     const outboundSegmentRoute = `${outboundOriginStop.station.code}-${outboundDestStop.station.code}`;
     const outboundFullRoute = `${outboundSchedule.originStation.code}-${outboundSchedule.destinationStation.code}`;
     const returnSegmentRoute = `${returnOriginStop.station.code}-${returnDestStop.station.code}`;
@@ -485,6 +522,9 @@ export class GuestBookingService {
 
     const taxesMinor = 0;
     let totalMinor = Math.max(0, combinedBaseFareMinor - discountMinor);
+    // C-1 guard: authoritative ETB fare for both legs, captured before the client-driven branches
+    // below may overwrite totalMinor with a per-seat sum or reviewedTotalMinor.
+    const authoritativeTotalMinor = totalMinor;
 
     const displayCurrency = dto.displayCurrency || Currency.ETB;
     let displayTotalMinor = displayCurrency !== Currency.ETB
@@ -540,6 +580,9 @@ export class GuestBookingService {
         : displayTotalMinor;
     }
 
+    // C-1 guard: never charge less than the server-recomputed authoritative round-trip fare.
+    this.assertTotalNotUnderAuthoritative(totalMinor, authoritativeTotalMinor, 'createGuestRoundTripBooking');
+
     // Create or resolve guest passenger (same as one-way)
     const { guestPassengerId, iamUserId, createdAccount } = await this.resolveGuestPassenger(dto, passengersData[0], req);
 
@@ -557,7 +600,7 @@ export class GuestBookingService {
         status: 'PENDING_PAYMENT',
         bookingType: 'ROUND_TRIP',
         totalMinor,
-        currency: displayCurrency,
+        currency: Currency.ETB, // ETB charge basis; passenger currency in displayCurrency/displayTotalMinor
         adultCount,
         childCount,
         displayCurrency,
@@ -662,7 +705,7 @@ export class GuestBookingService {
     const [leg1Schedule, leg2Schedule] = await Promise.all([
       this.prisma.trainSchedule.findUnique({
         where: { id: dto.scheduleId },
-        include: { originStation: true, destinationStation: true, stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } } },
+        include: { originStation: true, destinationStation: true, stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } }, route: { include: { stops: true } } },
       }),
       this.prisma.trainSchedule.findUnique({
         where: { id: dto.leg2ScheduleId },
@@ -672,10 +715,6 @@ export class GuestBookingService {
     if (!leg1Schedule) throw new NotFoundException('Leg-1 schedule not found');
     if (!leg2Schedule) throw new NotFoundException('Leg-2 schedule not found');
 
-    if (Date.now() >= leg1Schedule.departureAt.getTime() - BOOKING_CUTOFF_MS) {
-      throw new BadRequestException('Bookings are not accepted within 30 minutes of departure');
-    }
-
     const leg1OriginStop = leg1Schedule.stopTimes.find(s => s.stationId === dto.originStationId);
     const leg1DestStop = leg1Schedule.stopTimes.find(s => s.stationId === dto.transitStationId);
     const leg2OriginStop = leg2Schedule.stopTimes.find(s => s.stationId === dto.transitStationId);
@@ -683,6 +722,10 @@ export class GuestBookingService {
     if (!leg1OriginStop || !leg1DestStop) throw new NotFoundException('Leg-1 origin or transit station not found on schedule');
     if (!leg2OriginStop || !leg2DestStop) throw new NotFoundException('Transit or leg-2 destination not found on leg-2 schedule');
 
+    // Cut off relative to the passenger's actual boarding stop, using the same configurable
+    // per-stop/route checkinMinutesBefore that already gated the seat hold and search result.
+    assertWithinCheckinCutoff(leg1Schedule, leg1OriginStop, dto.originStationId);
+
     // Process passengers (verify identity once)
     const passengersData: any[] = [];
     let adultCount = 0, childCount = 0;
@@ -761,7 +804,7 @@ export class GuestBookingService {
         status: 'PENDING_PAYMENT',
         bookingType: 'TRANSIT',
         totalMinor,
-        currency: displayCurrency,
+        currency: Currency.ETB, // ETB charge basis; passenger currency in displayCurrency/displayTotalMinor
         adultCount,
         childCount,
         displayCurrency,
@@ -866,7 +909,7 @@ export class GuestBookingService {
     if (!retL2Hold || retL2Hold.expiresAt < now) throw new BadRequestException('Return leg-2 hold expired');
 
     const [obL1Sched, obL2Sched, retL1Sched, retL2Sched] = await Promise.all([
-      this.prisma.trainSchedule.findUnique({ where: { id: dto.scheduleId }, include: { originStation: true, destinationStation: true, stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } } } }),
+      this.prisma.trainSchedule.findUnique({ where: { id: dto.scheduleId }, include: { originStation: true, destinationStation: true, stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } }, route: { include: { stops: true } } } }),
       this.prisma.trainSchedule.findUnique({ where: { id: dto.leg2ScheduleId }, include: { originStation: true, destinationStation: true, stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } } } }),
       this.prisma.trainSchedule.findUnique({ where: { id: dto.returnScheduleId }, include: { originStation: true, destinationStation: true, stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } } } }),
       this.prisma.trainSchedule.findUnique({ where: { id: dto.returnLeg2ScheduleId }, include: { originStation: true, destinationStation: true, stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } } } }),
@@ -876,10 +919,6 @@ export class GuestBookingService {
     if (!retL1Sched) throw new NotFoundException('Return leg-1 schedule not found');
     if (!retL2Sched) throw new NotFoundException('Return leg-2 schedule not found');
 
-    if (Date.now() >= obL1Sched.departureAt.getTime() - BOOKING_CUTOFF_MS) {
-      throw new BadRequestException('Bookings are not accepted within 30 minutes of departure');
-    }
-
     const obL1Origin = obL1Sched.stopTimes.find(s => s.stationId === dto.originStationId);
     const obL1Dest = obL1Sched.stopTimes.find(s => s.stationId === dto.transitStationId);
     const obL2Origin = obL2Sched.stopTimes.find(s => s.stationId === dto.transitStationId);
@@ -893,6 +932,10 @@ export class GuestBookingService {
     if (!retL1Origin || !retL1Dest) throw new NotFoundException('Return leg-1: origin or transit stop not found');
     if (!retL2Origin || !retL2Dest) throw new NotFoundException('Return leg-2: transit or destination stop not found');
 
+    // Cut off relative to the passenger's actual boarding stop, using the same configurable
+    // per-stop/route checkinMinutesBefore that already gated the seat hold and search result.
+    assertWithinCheckinCutoff(obL1Sched, obL1Origin, dto.originStationId);
+
     // Process passengers (verify once)
     const passengersData: any[] = [];
     let adultCount = 0, childCount = 0;
@@ -977,7 +1020,7 @@ export class GuestBookingService {
         destinationStationId: dto.returnLeg2DestinationStationId,
         status: 'PENDING_PAYMENT',
         bookingType: 'ROUND_TRIP_TRANSIT',
-        totalMinor, currency: displayCurrency, adultCount, childCount, displayCurrency, displayTotalMinor,
+        totalMinor, currency: Currency.ETB, adultCount, childCount, displayCurrency, displayTotalMinor, // ETB charge basis; passenger currency in displayCurrency/displayTotalMinor
         leg2ScheduleId: dto.leg2ScheduleId,
         leg2OriginStationId: dto.transitStationId,
         leg2DestinationStationId: dto.leg2DestinationStationId,
diff --git a/apps/edr-passenger-api/src/modules/currency/currency.service.ts b/apps/edr-passenger-api/src/modules/currency/currency.service.ts
index 95ecc2cd7..ae4ca7503 100644
--- a/apps/edr-passenger-api/src/modules/currency/currency.service.ts
+++ b/apps/edr-passenger-api/src/modules/currency/currency.service.ts
@@ -140,10 +140,14 @@ export class CurrencyService {
     });
 
     if (!exchangeRate) {
-      this.logger.warn(
-        `No exchange rate found for ${fromCurrency} to ${toCurrency}, using 1.0`,
+      // H-2: fail closed. Never price at parity (1.0) when a required rate is absent — a silent 1.0
+      // substitution underprices international fares ~100×. Reject the quote/booking instead.
+      this.logger.error(
+        `No exchange rate configured for ${fromCurrency}->${toCurrency}; refusing to price at parity`,
+      );
+      throw new BadRequestException(
+        `No exchange rate configured for ${fromCurrency}->${toCurrency}`,
       );
-      return 1.0;
     }
 
     const ageMs = Date.now() - exchangeRate.effectiveDate.getTime();
diff --git a/apps/edr-passenger-api/src/modules/fare-engine/currency.controller.ts b/apps/edr-passenger-api/src/modules/fare-engine/currency.controller.ts
index 5a33dcc31..ee096dbc4 100644
--- a/apps/edr-passenger-api/src/modules/fare-engine/currency.controller.ts
+++ b/apps/edr-passenger-api/src/modules/fare-engine/currency.controller.ts
@@ -23,6 +23,8 @@ export class CurrencyController {
   }
 
   @Put()
+  @PassengerAdmin()
+  @ApiBearerAuth('IAM-auth')
   @ApiOperation({ summary: 'Upsert an exchange rate for today' })
   @ApiResponse({ status: 200, description: 'Rate created or updated for today\'s effective date' })
   upsert(@Body() dto: UpsertExchangeRateDto) {
@@ -30,6 +32,8 @@ export class CurrencyController {
   }
 
   @Patch(':id')
+  @PassengerAdmin()
+  @ApiBearerAuth('IAM-auth')
   @ApiOperation({ summary: 'Update an exchange rate by ID' })
   @ApiParam({ name: 'id', description: 'CurrencyExchangeRate UUID' })
   @ApiResponse({ status: 200, description: 'Rate updated' })
diff --git a/apps/edr-passenger-api/src/modules/fare-engine/fare-engine.service.ts b/apps/edr-passenger-api/src/modules/fare-engine/fare-engine.service.ts
index fd3d75401..69b0266ed 100644
--- a/apps/edr-passenger-api/src/modules/fare-engine/fare-engine.service.ts
+++ b/apps/edr-passenger-api/src/modules/fare-engine/fare-engine.service.ts
@@ -23,8 +23,11 @@ export class FareEngineService {
 
     if (!originStop) throw new BadRequestException('Origin station not found on this route');
     if (!destStop)   throw new BadRequestException('Destination station not found on this route');
-    if (originStop.sequence >= destStop.sequence)
-      throw new BadRequestException('Origin must come before destination in the route sequence');
+    // Origin and destination must be distinct stops, but EITHER direction is valid: a round-trip
+    // return leg traverses the same route high→low (e.g. C→A), so we price the segment by its
+    // absolute distance rather than rejecting the reverse order.
+    if (originStop.sequence === destStop.sequence)
+      throw new BadRequestException('Origin and destination must be different stops on this route');
 
     const seatClass = await this.prisma.seatClass.findUnique({ where: { id: dto.seatClassId } });
     if (!seatClass) throw new NotFoundException('Seat class not found');
@@ -43,8 +46,8 @@ export class FareEngineService {
       },
     }) ?? seatClass;
 
-    const totalDistanceKm = destStop.distanceKm! - originStop.distanceKm!;
-    if (totalDistanceKm < 0 || isNaN(totalDistanceKm))
+    const totalDistanceKm = Math.abs(destStop.distanceKm! - originStop.distanceKm!);
+    if (totalDistanceKm <= 0 || isNaN(totalDistanceKm))
       throw new BadRequestException('Invalid distance calculation - check route stop distances');
 
     const now = new Date();
diff --git a/apps/edr-passenger-api/src/modules/notifications/notifications.service.ts b/apps/edr-passenger-api/src/modules/notifications/notifications.service.ts
index a1678d131..12f549e9f 100644
--- a/apps/edr-passenger-api/src/modules/notifications/notifications.service.ts
+++ b/apps/edr-passenger-api/src/modules/notifications/notifications.service.ts
@@ -7,6 +7,7 @@ import { PushAdapter, NotificationChannel } from './notification.adapters';
 import { EmailClientService } from './email-client.service';
 import { SmsClientService } from './sms-client.service';
 import { CreateTemplateDto, UpdateTemplateDto } from './notifications.dto';
+import { resolveBookingSegment } from '../../common/utils/segment-resolver.utils';
 
 export type NotificationChannelType = 'EMAIL' | 'SMS' | 'PUSH' | 'IN_APP';
 
@@ -353,27 +354,6 @@ export class NotificationsService {
     }
   }
 
-  /**
-   * Resolves the user's actual boarding/alighting stations from the booking's originStationId /
-   * destinationStationId via stopTimes, falling back to the schedule's full-route endpoints when
-   * the booking has no segment override (e.g. older records or packages).
-   */
-  private resolveSegmentStations(booking: any): { originStation: any; destinationStation: any } {
-    const s = booking?.schedule ?? {};
-    const stopTimes: any[] = s.stopTimes ?? [];
-    const findStation = (stationId: string | null | undefined, fallback: any) => {
-      if (stationId && stopTimes.length > 0) {
-        const stop = stopTimes.find((st: any) => st.stationId === stationId);
-        if (stop?.station) return stop.station;
-      }
-      return fallback ?? null;
-    };
-    return {
-      originStation: findStation(booking?.originStationId, s.originStation),
-      destinationStation: findStation(booking?.destinationStationId, s.destinationStation),
-    };
-  }
-
   /**
    * Builds the interpolation context for the `booking.created` template. `trainSeatLines` is a
    * pre-joined block of one "Train/Seat: …" line per booked seat (multi-passenger bookings get
@@ -400,17 +380,17 @@ export class NotificationsService {
     // Lead passenger (leg-1 seat). Booking has no contactName; the traveller name lives on the seat.
     const passengerName = seats[0]?.passengerName ?? 'Passenger';
     const payLink = `${process.env.PORTAL_URL ?? 'http://localhost:5174'}/booking/detail?ref=${ref}`;
-    const { originStation: originSt, destinationStation: destSt } = this.resolveSegmentStations(booking);
+    const segment = resolveBookingSegment(s, booking?.originStationId, booking?.destinationStationId);
 
     return {
       passengerName,
       bookingRef: ref,
-      origin: originSt?.name ?? '',
-      destination: destSt?.name ?? '',
+      origin: segment.origin?.name ?? '',
+      destination: segment.destination?.name ?? '',
       trainSeatLines,
-      travelDate: fmtDate(s.departureAt),
-      departureTime: fmtTime(s.departureAt),
-      arrivalTime: fmtTime(s.arrivalAt),
+      travelDate: fmtDate(segment.departureAt),
+      departureTime: fmtTime(segment.departureAt),
+      arrivalTime: fmtTime(segment.arrivalAt),
       payLink,
     };
   }
@@ -509,12 +489,12 @@ export class NotificationsService {
 
   private buildTicketEmailText(booking: any, amount: string, currency: string, url: string): string {
     const s = booking.schedule ?? {};
-    const dep = s.departureAt ? new Date(s.departureAt).toLocaleString('en-GB') : 'TBD';
+    const segment = resolveBookingSegment(s, booking?.originStationId, booking?.destinationStationId);
+    const dep = segment.departureAt ? new Date(segment.departureAt).toLocaleString('en-GB') : 'TBD';
     const passengers = (booking.seats ?? []).map((bs: any) => bs.passengerName).filter(Boolean).join(', ');
-    const { originStation: originSt, destinationStation: destSt } = this.resolveSegmentStations(booking);
     return [
       `Booking ${booking.bookingRef} confirmed.`,
-      `${originSt?.name ?? ''} -> ${destSt?.name ?? ''}`,
+      `${segment.origin?.name ?? ''} -> ${segment.destination?.name ?? ''}`,
       `Train: ${s.train?.name ?? s.train?.number ?? ''}`,
       `Departs: ${dep}`,
       passengers ? `Passengers: ${passengers}` : '',
@@ -527,7 +507,9 @@ export class NotificationsService {
     const s = booking.schedule ?? {};
     const fmt = (d: any) =>
       d ? new Date(d).toLocaleString('en-GB', { dateStyle: 'medium', timeStyle: 'short' }) : 'TBD';
-    const { originStation: originSt, destinationStation: destSt } = this.resolveSegmentStations(booking);
+    const segment = resolveBookingSegment(s, booking?.originStationId, booking?.destinationStationId);
+    const originSt = segment.origin;
+    const destSt = segment.destination;
     const seatRows = (booking.seats ?? [])
       .map((bs: any) => {
         const coach = bs.seat?.coach?.number ?? '-';
@@ -568,11 +550,11 @@ export class NotificationsService {
           </tr>
           <tr>
             <td style="padding:8px 0;color:#666;">Departs</td>
-            <td style="padding:8px 0;text-align:right;">${fmt(s.departureAt)}</td>
+            <td style="padding:8px 0;text-align:right;">${fmt(segment.departureAt)}</td>
           </tr>
           <tr>
             <td style="padding:8px 0;color:#666;">Arrives</td>
-            <td style="padding:8px 0;text-align:right;">${fmt(s.arrivalAt)}</td>
+            <td style="padding:8px 0;text-align:right;">${fmt(segment.arrivalAt)}</td>
           </tr>
         </table>
 
@@ -636,12 +618,12 @@ export class NotificationsService {
     const fmt = (d: any) =>
       d ? new Date(d).toLocaleString('en-GB', { dateStyle: 'medium', timeStyle: 'short' }) : 'TBD';
     const legLabel = leg ? ` (${leg.replace(/_/g, ' ')})` : '';
-    const { originStation: originSt, destinationStation: destSt } = this.resolveSegmentStations(booking);
-    const origin = originSt?.name ?? '';
-    const dest = destSt?.name ?? '';
+    const segment = resolveBookingSegment(s, booking?.originStationId, booking?.destinationStationId);
+    const origin = segment.origin?.name ?? '';
+    const dest = segment.destination?.name ?? '';
     const train = s.train?.name ?? s.train?.number ?? '';
-    const dep = fmt(s.departureAt);
-    const arr = fmt(s.arrivalAt);
+    const dep = fmt(segment.departureAt);
+    const arr = fmt(segment.arrivalAt);
 
     const seats: { name: string; coach: string; seat: string; cls: string }[] = (booking.seats ?? []).map((bs: any) => ({
       name:  bs.passengerName ?? '',
diff --git a/apps/edr-passenger-api/src/modules/payments/payment-client.service.ts b/apps/edr-passenger-api/src/modules/payments/payment-client.service.ts
index 84ca92c02..1ca92e304 100644
--- a/apps/edr-passenger-api/src/modules/payments/payment-client.service.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payment-client.service.ts
@@ -1,6 +1,7 @@
 import {
   BadGatewayException,
   BadRequestException,
+  ConflictException,
   Injectable,
   Logger,
 } from "@nestjs/common";
@@ -154,11 +155,16 @@ export class PaymentClientService {
     } catch (err) {
       if (err instanceof AxiosError && err.response) {
         // 4xx/5xx from the payment service: propagate 404 to callers that handle it;
-        // everything else is a gateway-level failure from the client's perspective.
+        // 409 = a legitimate conflict (e.g. another provider's payment is already in
+        // flight for this booking) — surface its message as-is rather than masking it as
+        // a gateway failure; everything else is a genuine gateway-level failure.
         if (err.response.status === 404) throw err;
         const detail =
           (err.response.data as { message?: string | string[] })?.message ??
           err.message;
+        if (err.response.status === 409) {
+          throw new ConflictException(detail);
+        }
         this.logger.error(
           `payment service ${method} ${path} → ${err.response.status}: ${detail}`,
         );
diff --git a/apps/edr-passenger-api/src/modules/payments/payments.service.ts b/apps/edr-passenger-api/src/modules/payments/payments.service.ts
index bee599ba4..a0f516628 100644
--- a/apps/edr-passenger-api/src/modules/payments/payments.service.ts
+++ b/apps/edr-passenger-api/src/modules/payments/payments.service.ts
@@ -1072,6 +1072,19 @@ export class PaymentsService {
       return { processed: false, reason: "booking-not-found" };
     }
 
+    // C-4 guard: a settlement must cover what the passenger was quoted. Compare the provider-settled
+    // amount against the booking's display-currency total (the amount the customer agreed to pay);
+    // a short payment must NOT confirm the booking. Amount-only — the display↔charge currency
+    // divergence is tracked separately under the USD/DJF findings. The 1% tolerance absorbs rounding.
+    const expectedMinor = booking.displayTotalMinor ?? booking.totalMinor;
+    const shortPayTolerance = Math.max(1, Math.round(expectedMinor * 0.01));
+    if (event.amountMinor < expectedMinor - shortPayTolerance) {
+      this.logger.error(
+        `mark-paid: short payment for booking ${booking.id} — settled ${event.amountMinor} ${event.currency} < expected ${expectedMinor} ${booking.displayCurrency}; not confirming`,
+      );
+      return { processed: false, reason: "amount-mismatch" };
+    }
+
     // Local intent row is a projection during the strangler migration: reuse it when the
     // legacy initiate path created one, otherwise materialize it from the event.
     let intent = await this.prisma.paymentIntent.findUnique({
diff --git a/apps/edr-passenger-api/src/modules/promos/promos.dto.ts b/apps/edr-passenger-api/src/modules/promos/promos.dto.ts
index 759fe371e..2d0ad7a08 100644
--- a/apps/edr-passenger-api/src/modules/promos/promos.dto.ts
+++ b/apps/edr-passenger-api/src/modules/promos/promos.dto.ts
@@ -1,4 +1,4 @@
-import { IsString, IsOptional, IsInt, IsBoolean } from 'class-validator';
+import { IsString, IsOptional, IsInt, IsBoolean, Min, Max } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 
 export class CreatePromotionDto {
@@ -15,14 +15,17 @@ export class CreatePromotionDto {
   @IsString()
   subtitle?: string;
 
-  @ApiPropertyOptional({ example: 15 })
+  @ApiPropertyOptional({ example: 15, description: 'Percentage discount, bounded 0..100' })
   @IsOptional()
   @IsInt()
+  @Min(0)
+  @Max(100)
   percentOff?: number;
 
   @ApiPropertyOptional({ example: 5000 })
   @IsOptional()
   @IsInt()
+  @Min(0)
   amountOffMinor?: number;
 
   @ApiProperty({ example: '2026-12-31T23:59:59Z' })
diff --git a/apps/edr-passenger-api/src/modules/reports/reports.service.ts b/apps/edr-passenger-api/src/modules/reports/reports.service.ts
index 7889c67a1..1aef00185 100644
--- a/apps/edr-passenger-api/src/modules/reports/reports.service.ts
+++ b/apps/edr-passenger-api/src/modules/reports/reports.service.ts
@@ -599,32 +599,31 @@ export class ReportsService {
     sortBy?: string;
     search?: string;
   }) {
-    // Load exchange rates once — we need DJF→ETB (and any other non-ETB currencies).
-    // Keep only the most-recent rate per pair (rates are ordered desc by effectiveDate).
+    // Load all exchange rates once — we need conversions in both directions.
     const rateRows = await this.prisma.currencyExchangeRate.findMany({
-      where: { toCurrency: 'ETB' as any },
       orderBy: { effectiveDate: 'desc' },
     });
-    const rateToEtb = new Map<string, number>();
+    // Most-recent rate for each fromCurrency→toCurrency pair
+    const rateMap = new Map<string, number>();
     for (const r of rateRows) {
-      if (!rateToEtb.has(r.fromCurrency)) {
-        rateToEtb.set(r.fromCurrency, Number(r.rate));
-      }
+      const key = `${r.fromCurrency}→${r.toCurrency}`;
+      if (!rateMap.has(key)) rateMap.set(key, Number(r.rate));
     }
 
-    // Convert any minor amount to its ETB equivalent using stored exchange rates.
-    // b.totalMinor is the booking's canonical ETB amount (always stored in ETB),
-    // so callers should pass that directly rather than converting displayTotalMinor.
-    const toEtbMinor = (minor: number, currency: string): number => {
-      if (currency === 'ETB') return minor;
-      const rate = rateToEtb.get(currency);
-      // If no rate is on file fall back to the raw value (avoids silently hiding
-      // cross-currency bookings, at the cost of an approximate comparison).
-      return rate ? Math.round(minor * rate) : minor;
+    // Convert minor amount from one currency to another.
+    const convertMinor = (minor: number, from: string, to: string): number => {
+      if (from === to) return minor;
+      const direct = rateMap.get(`${from}→${to}`);
+      if (direct) return Math.round(minor * direct);
+      // Try via ETB as pivot
+      const toEtb = rateMap.get(`${from}→ETB`);
+      const fromEtb = rateMap.get(`ETB→${to}`);
+      if (toEtb && fromEtb) return Math.round(minor * toEtb * fromEtb);
+      return minor; // fallback: no rate on file
     };
 
     if (params.search?.trim()) {
-      return this.getDiscrepancyForRef(params.search.trim(), toEtbMinor);
+      return this.getDiscrepancyForRef(params.search.trim(), convertMinor);
     }
 
     const dateFilter: Record<string, Date> = {};
@@ -679,20 +678,18 @@ export class ReportsService {
       .map(b => {
         const pi = b.paymentIntent!;
 
-        // Display amounts shown to the passenger (may be in DJF).
+        // Display amounts shown to the passenger (may be in DJF/USD).
         const actualMinor = b.displayTotalMinor ?? b.totalMinor;
         const actualCurrency = (b.displayCurrency as string | null) ?? b.currency;
 
         const paidMinor = pi.amountMinor;
         const paidCurrency = pi.currency;
 
-        // b.totalMinor is always in ETB minor. pi.amountMinor is the charge MAJOR amount
-        // (the gateway receives major units — displayMinorToChargeMajor divides by 100 before
-        // sending). Multiply by 100 to convert back to minor before the ETB comparison.
-        const owedEtb = b.totalMinor;
-        const paidEtb = toEtbMinor(paidMinor * 100, paidCurrency);
-        const balanceMinor = owedEtb - paidEtb;
-        const balanceCurrency = 'ETB';
+        // Balance in the booking's display currency:
+        // convert paid (major units from gateway) to display currency minor, then subtract.
+        const paidInDisplayMinor = convertMinor(paidMinor * 100, paidCurrency, actualCurrency);
+        const balanceMinor = actualMinor - paidInDisplayMinor;
+        const balanceCurrency = actualCurrency;
 
         const firstSeat = b.seats[0];
         const passengers = this.buildSeatPassengers(b.seats, actualCurrency);
@@ -731,7 +728,7 @@ export class ReportsService {
 
   private async getDiscrepancyForRef(
     search: string,
-    toEtbMinor: (minor: number, currency: string) => number,
+    convertMinor: (minor: number, from: string, to: string) => number,
   ) {
     let bookingId: string | null = null;
     const byPnr = await this.prisma.booking.findUnique({
@@ -797,10 +794,9 @@ export class ReportsService {
     const paidMinor = pi?.amountMinor ?? 0;
     const paidCurrency = pi?.currency ?? b.currency;
 
-    const owedEtb = b.totalMinor;
-    const paidEtb = toEtbMinor(paidMinor * 100, paidCurrency);
-    const balanceMinor = owedEtb - paidEtb;
-    const balanceCurrency = 'ETB';
+    const paidInDisplayMinor = convertMinor(paidMinor * 100, paidCurrency, actualCurrency);
+    const balanceMinor = actualMinor - paidInDisplayMinor;
+    const balanceCurrency = actualCurrency;
 
     const firstSeat = b.seats[0];
     const passengers = this.buildSeatPassengers(b.seats, actualCurrency);
diff --git a/apps/edr-passenger-api/src/modules/schedules/routes.controller.ts b/apps/edr-passenger-api/src/modules/schedules/routes.controller.ts
index d468bba7c..5e3237e93 100644
--- a/apps/edr-passenger-api/src/modules/schedules/routes.controller.ts
+++ b/apps/edr-passenger-api/src/modules/schedules/routes.controller.ts
@@ -42,7 +42,7 @@ Route stops carry distanceKm for fare-by-distance calculations.`,
 
   @Patch(':id')
   @PassengerStaff([PASSENGER_PERMS.routes.manage, PASSENGER_PERMS.admin]) @ApiBearerAuth('IAM-auth')
-  @ApiOperation({ summary: 'Update route metadata (name, description, active flag, effectiveUntil)' })
+  @ApiOperation({ summary: 'Update route metadata (name, description, active flag, effectiveFrom, effectiveUntil)' })
   @ApiParam({ name: 'id', description: 'Route UUID' })
   @ApiResponse({ status: 200, description: 'Route updated' })
   @ApiResponse({ status: 404, description: 'Route not found' })
diff --git a/apps/edr-passenger-api/src/modules/schedules/routes.dto.ts b/apps/edr-passenger-api/src/modules/schedules/routes.dto.ts
index f2db36e7c..1036138c9 100644
--- a/apps/edr-passenger-api/src/modules/schedules/routes.dto.ts
+++ b/apps/edr-passenger-api/src/modules/schedules/routes.dto.ts
@@ -5,8 +5,9 @@ import { Type } from 'class-transformer';
 export class RouteStopInputDto {
   @ApiProperty({ example: 'station-uuid', description: 'Station UUID' }) @IsString() stationId: string;
   @ApiProperty({ example: 1, description: 'Stop order (1 = origin, ascending)' }) @IsInt() @Min(1) sequence: number;
-  @ApiPropertyOptional({ example: 120.5, description: 'Distance in km from previous stop' }) @IsOptional() @IsNumber() distanceKm?: number;
+  @ApiPropertyOptional({ example: 120.5, description: 'Cumulative distance in km from the route origin (not from the previous stop)' }) @IsOptional() @IsNumber() distanceKm?: number;
   @ApiPropertyOptional({ example: 45, description: 'Override check-in cutoff (minutes) for this stop. Falls back to route-level checkinMinutesBefore if omitted.' }) @IsOptional() @IsInt() @Min(1) checkinMinutesBefore?: number;
+  @ApiPropertyOptional({ example: 40, description: 'Travel time in minutes from the previous stop, used to estimate this stop\'s arrival time. Ignored for sequence 1 (origin, no predecessor). Falls back to distance-proportional interpolation if omitted.' }) @IsOptional() @IsInt() @Min(1) travelMinutesToStop?: number;
 }
 
 export class CreateRouteDto {
@@ -14,8 +15,9 @@ export class CreateRouteDto {
   @ApiProperty({ example: 'Addis Ababa – Djibouti' }) @IsString() name: string;
   @ApiPropertyOptional({ example: 'Main corridor via Dire Dawa' }) @IsOptional() @IsString() description?: string;
   @ApiProperty({ example: '2026-01-01T00:00:00Z', description: 'Date from which this route is effective' }) @IsDateString() effectiveFrom: string;
-  @ApiPropertyOptional({ example: '2027-12-31T23:59:59Z' }) @IsOptional() @IsDateString() effectiveUntil?: string;
+  @ApiPropertyOptional({ example: '2027-12-31T23:59:59Z' }) @IsOptional() @IsDateString() effectiveUntil?: string | null;
   @ApiPropertyOptional({ example: true, description: 'Whether the route is active (defaults to true)' }) @IsOptional() @IsBoolean() active?: boolean;
+  @ApiPropertyOptional({ example: 30, description: 'Minutes before departure to close check-in for this route (defaults to 30 if omitted)' }) @IsOptional() @IsInt() @Min(1) checkinMinutesBefore?: number;
   @ApiProperty({
     type: [RouteStopInputDto],
     description: 'Ordered stops for this route. Sequence 1 = origin, last sequence = destination.',
@@ -35,15 +37,17 @@ export class CreateRouteDto {
 export class AddRouteStopDto {
   @ApiProperty({ example: 'station-uuid' }) @IsString() stationId: string;
   @ApiProperty({ example: 3 }) @IsInt() @Min(1) sequence: number;
-  @ApiPropertyOptional({ example: 75.5 }) @IsOptional() @IsNumber() distanceKm?: number;
+  @ApiPropertyOptional({ example: 75.5, description: 'Cumulative distance in km from the route origin (not from the previous stop)' }) @IsOptional() @IsNumber() distanceKm?: number;
   @ApiPropertyOptional({ example: 45, description: 'Override check-in cutoff (minutes) for this stop. Falls back to route-level checkinMinutesBefore if omitted.' }) @IsOptional() @IsInt() @Min(1) checkinMinutesBefore?: number;
+  @ApiPropertyOptional({ example: 40, description: 'Travel time in minutes from the previous stop, used to estimate this stop\'s arrival time. Falls back to distance-proportional interpolation if omitted.' }) @IsOptional() @IsInt() @Min(1) travelMinutesToStop?: number;
 }
 
 export class UpdateRouteDto {
   @ApiPropertyOptional({ example: 'Addis Ababa – Djibouti Express' }) @IsOptional() @IsString() name?: string;
   @ApiPropertyOptional() @IsOptional() @IsString() description?: string;
   @ApiPropertyOptional({ example: true }) @IsOptional() @IsBoolean() active?: boolean;
-  @ApiPropertyOptional({ example: '2027-12-31T23:59:59Z' }) @IsOptional() @IsDateString() effectiveUntil?: string;
+  @ApiPropertyOptional({ example: '2026-01-01T00:00:00Z', description: 'Date from which this route is effective' }) @IsOptional() @IsDateString() effectiveFrom?: string;
+  @ApiPropertyOptional({ example: '2027-12-31T23:59:59Z', description: 'Send null to clear (open-ended route)' }) @IsOptional() @IsDateString() effectiveUntil?: string | null;
   @ApiPropertyOptional({ example: 30, description: 'Minutes before departure to close check-in for this route' }) @IsOptional() @IsInt() @Min(1) checkinMinutesBefore?: number;
   @ApiPropertyOptional({ type: [RouteStopInputDto] }) @IsOptional() @IsArray() @ValidateNested({ each: true }) @Type(() => RouteStopInputDto) stops?: RouteStopInputDto[];
 }
diff --git a/apps/edr-passenger-api/src/modules/schedules/routes.service.ts b/apps/edr-passenger-api/src/modules/schedules/routes.service.ts
index 58e647180..56ff8ddfe 100644
--- a/apps/edr-passenger-api/src/modules/schedules/routes.service.ts
+++ b/apps/edr-passenger-api/src/modules/schedules/routes.service.ts
@@ -3,6 +3,8 @@ import { PrismaService } from '../../common/prisma.service';
 import { CreateRouteDto, AddRouteStopDto, UpdateRouteDto, SetRouteCoachTemplateDto } from './routes.dto';
 import { DeleteOperationException } from '../../common/exceptions/delete-operation.exception';
 import { AuditService } from '../../common/audit.service';
+import { parseEthiopianTime } from '../../common/utils/timezone.utils';
+import { computePlannedStopTimes } from '../../common/utils/schedule-times.utils';
 
 @Injectable()
 export class RoutesService {
@@ -10,6 +12,33 @@ export class RoutesService {
 
   // ── Route CRUD ─────────────────────────────────────────────────────────────
 
+  /**
+   * distanceKm is CUMULATIVE distance from the route origin, not distance from the previous
+   * stop (that's what travelMinutesToStop is for) — fare pricing computes a segment's distance
+   * as destStop.distanceKm - originStop.distanceKm, so a route with equal or decreasing values
+   * across stops silently produces zero/negative segment distances, which the fare engine
+   * rejects (caught and swallowed by search into a bare "N/A" instead of a visible error). Catch
+   * the mistake here instead, with a message that names the exact stops involved.
+   */
+  private validateStopDistances(stops: { sequence: number; stationId: string; distanceKm?: number | null }[]): void {
+    const sorted = [...stops].sort((a, b) => a.sequence - b.sequence);
+    let prevDistance = sorted[0]?.distanceKm ?? 0;
+    for (let i = 1; i < sorted.length; i++) {
+      const stop = sorted[i];
+      if (stop.distanceKm == null) {
+        throw new BadRequestException(
+          `Stop ${stop.sequence} is missing distanceKm (cumulative distance in km from the route origin). This is required for fare pricing.`,
+        );
+      }
+      if (stop.distanceKm <= prevDistance) {
+        throw new BadRequestException(
+          `Stop ${stop.sequence}'s distanceKm (${stop.distanceKm}) must be greater than stop ${sorted[i - 1].sequence}'s distanceKm (${prevDistance}) — distanceKm is cumulative distance from the route origin, not distance from the previous stop. Equal or decreasing values make fare pricing between these stops fail silently.`,
+        );
+      }
+      prevDistance = stop.distanceKm;
+    }
+  }
+
   async createRoute(dto: CreateRouteDto) {
     const existing = await this.prisma.route.findUnique({ where: { code: dto.code } });
     if (existing) throw new ConflictException(`Route code "${dto.code}" already exists`);
@@ -19,6 +48,8 @@ export class RoutesService {
     const seqs = dto.stops.map(s => s.sequence);
     if (new Set(seqs).size !== seqs.length) throw new ConflictException('Duplicate sequence numbers in stop list');
 
+    this.validateStopDistances(dto.stops);
+
     const stationIds = [...new Set(dto.stops.map(s => s.stationId))];
     const stations = await this.prisma.station.findMany({ where: { id: { in: stationIds } } });
     if (stations.length !== stationIds.length) throw new BadRequestException('One or more station IDs not found');
@@ -29,14 +60,16 @@ export class RoutesService {
         name: dto.name,
         description: dto.description,
         active: dto.active ?? true,
-        effectiveFrom: new Date(dto.effectiveFrom),
-        effectiveUntil: dto.effectiveUntil ? new Date(dto.effectiveUntil) : null,
+        ...(dto.checkinMinutesBefore != null ? { checkinMinutesBefore: dto.checkinMinutesBefore } : {}),
+        effectiveFrom: parseEthiopianTime(dto.effectiveFrom),
+        effectiveUntil: dto.effectiveUntil ? parseEthiopianTime(dto.effectiveUntil) : null,
         stops: {
           create: dto.stops.map(s => ({
             stationId: s.stationId,
             sequence: s.sequence,
             distanceKm: s.distanceKm != null ? parseFloat(String(s.distanceKm)) : null,
             checkinMinutesBefore: s.checkinMinutesBefore ?? null,
+            travelMinutesToStop: s.travelMinutesToStop ?? null,
           })),
         },
       },
@@ -86,13 +119,20 @@ export class RoutesService {
     const route = await this.prisma.route.findUnique({ where: { id } });
     if (!route) throw new NotFoundException('Route not found');
 
+    if (dto.stops && dto.stops.length >= 2) this.validateStopDistances(dto.stops);
+
     await this.prisma.route.update({
       where: { id },
       data: {
         name: dto.name,
         description: dto.description,
         active: dto.active,
-        effectiveUntil: dto.effectiveUntil ? new Date(dto.effectiveUntil) : undefined,
+        ...(dto.effectiveFrom ? { effectiveFrom: parseEthiopianTime(dto.effectiveFrom) } : {}),
+        // effectiveUntil is nullable (open-ended route) — distinguish "field not sent" (leave
+        // untouched) from "explicitly cleared" (null → set to null), not just truthy/falsy.
+        ...(dto.effectiveUntil !== undefined
+          ? { effectiveUntil: dto.effectiveUntil ? parseEthiopianTime(dto.effectiveUntil) : null }
+          : {}),
         ...(dto.checkinMinutesBefore != null ? { checkinMinutesBefore: dto.checkinMinutesBefore } : {}),
       },
     });
@@ -106,8 +146,23 @@ export class RoutesService {
           sequence: s.sequence,
           distanceKm: s.distanceKm != null ? parseFloat(String(s.distanceKm)) : null,
           checkinMinutesBefore: s.checkinMinutesBefore ?? null,
+          travelMinutesToStop: s.travelMinutesToStop ?? null,
         })),
       });
+
+      // Propagate new stop timing to all future schedules on this route so that
+      // per-stop check-in cutoffs reflect the updated travelMinutesToStop values.
+      const futureSchedules = await this.prisma.trainSchedule.findMany({
+        where: { routeId: id, status: { in: ['SCHEDULED', 'BOARDING'] }, departureAt: { gt: new Date() } },
+        select: { id: true, departureAt: true, arrivalAt: true },
+      });
+      const stopsForTiming = dto.stops
+        .map(s => ({ sequence: s.sequence, distanceKm: s.distanceKm ?? null, travelMinutesToStop: s.travelMinutesToStop ?? null, checkinMinutesBefore: s.checkinMinutesBefore ?? null }))
+        .sort((a, b) => a.sequence - b.sequence);
+      for (const sched of futureSchedules) {
+        const times = computePlannedStopTimes({ id, stops: stopsForTiming }, new Date(sched.departureAt), new Date(sched.arrivalAt));
+        await this.applyRouteToSchedule(id, sched.id, Object.fromEntries(times.map(t => [t.sequence, t])));
+      }
     }
 
     await this.auditService.log({ action: 'UPDATE', entityType: 'Route', entityId: id, newData: { name: dto.name, active: dto.active } });
@@ -218,6 +273,9 @@ export class RoutesService {
     });
     if (existing) throw new ConflictException(`Sequence ${dto.sequence} already exists on this route`);
 
+    const otherStops = await this.prisma.routeStop.findMany({ where: { routeId } });
+    this.validateStopDistances([...otherStops, { sequence: dto.sequence, stationId: dto.stationId, distanceKm: dto.distanceKm }]);
+
     return this.prisma.routeStop.create({
       data: {
         routeId,
@@ -225,6 +283,7 @@ export class RoutesService {
         sequence: dto.sequence,
         distanceKm: dto.distanceKm != null ? parseFloat(String(dto.distanceKm)) : null,
         checkinMinutesBefore: dto.checkinMinutesBefore ?? null,
+        travelMinutesToStop: dto.travelMinutesToStop ?? null,
       },
     });
   }
diff --git a/apps/edr-passenger-api/src/modules/schedules/schedules.controller.ts b/apps/edr-passenger-api/src/modules/schedules/schedules.controller.ts
index b11ac3098..8cee1e94f 100644
--- a/apps/edr-passenger-api/src/modules/schedules/schedules.controller.ts
+++ b/apps/edr-passenger-api/src/modules/schedules/schedules.controller.ts
@@ -154,6 +154,12 @@ export class SchedulesController {
   @ApiQuery({ name: 'cascade', required: false, type: Boolean })
   deleteSchedule(@Param('id') id: string, @Query('cascade') cascade?: string) { return this.service.deleteSchedule(id, cascade === 'true'); }
 
+  @Post(':id/recalculate-stops')
+  @PassengerStaff([PASSENGER_PERMS.schedules.manage, PASSENGER_PERMS.admin]) @ApiBearerAuth('IAM-auth')
+  @ApiOperation({ summary: 'Recompute TripStopTime records from current route travelMinutesToStop values' })
+  @ApiParam({ name: 'id', description: 'TrainSchedule UUID' })
+  recalculateStops(@Param('id') id: string) { return this.service.recalculateStopTimes(id); }
+
   @Get(':id/stops')
   @IsPublic()
   @ApiOperation({ summary: 'List all stops for a schedule' })
diff --git a/apps/edr-passenger-api/src/modules/schedules/schedules.dto.ts b/apps/edr-passenger-api/src/modules/schedules/schedules.dto.ts
index 675168cf9..49dec1d96 100644
--- a/apps/edr-passenger-api/src/modules/schedules/schedules.dto.ts
+++ b/apps/edr-passenger-api/src/modules/schedules/schedules.dto.ts
@@ -52,6 +52,10 @@ export class CreateScheduleDto {
   })
   @IsOptional() @IsArray() @ValidateNested({ each: true }) @Type(() => PlannedStopTimeDto)
   plannedTimes?: PlannedStopTimeDto[];
+
+  @ApiPropertyOptional({ type: [String], description: 'Coach UUIDs to assign, in consist order. Overrides the route coach template if provided. A schedule must end up with at least one coach.' })
+  @IsOptional() @IsArray() @IsString({ each: true })
+  coachIds?: string[];
 }
 
 export class UpdateScheduleDto {
diff --git a/apps/edr-passenger-api/src/modules/schedules/schedules.service.ts b/apps/edr-passenger-api/src/modules/schedules/schedules.service.ts
index 7cca548aa..d6dfda6ec 100644
--- a/apps/edr-passenger-api/src/modules/schedules/schedules.service.ts
+++ b/apps/edr-passenger-api/src/modules/schedules/schedules.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, NotFoundException, BadRequestException } from '@nestjs/common';
+import { Injectable, Logger, NotFoundException, BadRequestException } from '@nestjs/common';
 import { PrismaService } from '../../common/prisma.service';
 import { RoutesService } from './routes.service';
 import { FareEngineService } from '../fare-engine/fare-engine.service';
@@ -6,9 +6,12 @@ import { CreateScheduleDto, UpdateScheduleDto, CreateFareRuleDto, UpdateSchedule
 import { DeleteOperationException } from '../../common/exceptions/delete-operation.exception';
 import { parseEthiopianTime, startOfDayEAT, startOfNextDayEAT } from '../../common/utils/timezone.utils';
 import { AuditService } from '../../common/audit.service';
+import { computePlannedStopTimes } from '../../common/utils/schedule-times.utils';
 
 @Injectable()
 export class SchedulesService {
+  private readonly logger = new Logger(SchedulesService.name);
+
   constructor(
     private prisma: PrismaService,
     private routesService: RoutesService,
@@ -43,20 +46,14 @@ export class SchedulesService {
           departureAt: departureAt.toISOString(),
           arrivalAt: arrivalAt.toISOString(),
           plannedTimes: dto.plannedTimes || [],
+          coachIds: dto.coachIds,
         };
 
+        // createSchedule applies coachIds if given, else auto-applies the route coach template,
+        // and rejects the day outright (caught below) if it would end up with zero coaches.
         const schedule = await this.createSchedule(createDto);
         scheduleIds.push(schedule.id);
 
-        // createSchedule already auto-applies the route coach template;
-        // only override if explicit coachIds are provided
-        if (dto.coachIds && dto.coachIds.length > 0) {
-          await this.assignCoaches(
-            schedule.id,
-            dto.coachIds.map((coachId, idx) => ({ coachId, positionNumber: idx + 1 })),
-          );
-        }
-
         scheduleCount++;
       } catch (error) {
         errors.push(`Failed to create schedule for ${currentDate.toISOString()}: ${error instanceof Error ? error.message : String(error)}`);
@@ -103,6 +100,8 @@ export class SchedulesService {
     const dep = parseEthiopianTime(dto.departureAt);
     const arr = parseEthiopianTime(dto.arrivalAt);
     if (arr <= dep) throw new BadRequestException('arrivalAt must be after departureAt');
+    // M-4: a new schedule cannot depart in the past — the backoffice form does not enforce this.
+    if (dep.getTime() < Date.now()) throw new BadRequestException('departureAt must be in the future');
 
     const [train, route] = await Promise.all([
       this.prisma.train.findUnique({ where: { id: dto.trainId } }),
@@ -133,26 +132,7 @@ export class SchedulesService {
 
     let plannedTimes = dto.plannedTimes;
     if (!plannedTimes || plannedTimes.length === 0) {
-      const totalDuration = arr.getTime() - dep.getTime();
-      const totalDistance = route.stops[route.stops.length - 1].distanceKm || 0;
-
-      plannedTimes = route.stops.map((stop, index) => {
-        let stopTime: Date;
-        if (index === 0) {
-          stopTime = dep;
-        } else if (index === route.stops.length - 1) {
-          stopTime = arr;
-        } else {
-          const stopDistance = stop.distanceKm || 0;
-          const progress = totalDistance > 0 ? stopDistance / totalDistance : index / (route.stops.length - 1);
-          stopTime = new Date(dep.getTime() + totalDuration * progress);
-        }
-        return {
-          sequence: stop.sequence,
-          plannedArrivalAt: index === 0 ? undefined : stopTime.toISOString(),
-          plannedDepartureAt: index === route.stops.length - 1 ? undefined : stopTime.toISOString(),
-        };
-      });
+      plannedTimes = computePlannedStopTimes(route, dep, arr);
     }
 
     const providedSeqs = new Set((plannedTimes ?? []).map(t => t.sequence));
@@ -181,15 +161,34 @@ export class SchedulesService {
     const plannedTimesMap = Object.fromEntries(plannedTimes.map(t => [t.sequence, t]));
     await this.routesService.applyRouteToSchedule(dto.routeId, schedule.id, plannedTimesMap);
 
-    // Auto-apply route coach template if one is defined
-    const coachTemplates = await this.prisma.routeCoachTemplate.findMany({
-      where: { routeId: dto.routeId },
-      orderBy: { positionNumber: 'asc' },
-    });
-    if (coachTemplates.length > 0) {
+    // Explicit coachIds (from the schedule form's Coaches step) override the route's coach
+    // template; otherwise auto-apply the template if one is defined.
+    if (dto.coachIds && dto.coachIds.length > 0) {
       await this.assignCoaches(
         schedule.id,
-        coachTemplates.map(t => ({ coachId: t.coachId, positionNumber: t.positionNumber })),
+        dto.coachIds.map((coachId, idx) => ({ coachId, positionNumber: idx + 1 })),
+      );
+    } else {
+      const coachTemplates = await this.prisma.routeCoachTemplate.findMany({
+        where: { routeId: dto.routeId },
+        orderBy: { positionNumber: 'asc' },
+      });
+      if (coachTemplates.length > 0) {
+        await this.assignCoaches(
+          schedule.id,
+          coachTemplates.map(t => ({ coachId: t.coachId, positionNumber: t.positionNumber })),
+        );
+      }
+    }
+
+    // A schedule with zero coaches has zero seats and is silently invisible to search (and
+    // unbookable) with no indication why — block creation instead of leaving a dead schedule.
+    const assignedCoachCount = await this.prisma.coachAssignment.count({ where: { scheduleId: schedule.id } });
+    if (assignedCoachCount === 0) {
+      await this.prisma.tripStopTime.deleteMany({ where: { scheduleId: schedule.id } });
+      await this.prisma.trainSchedule.delete({ where: { id: schedule.id } });
+      throw new BadRequestException(
+        'A schedule must have at least one coach assigned to be bookable. Add coaches in the Coaches step, or set a Route Coach Template on this route so new schedules auto-assign coaches.',
       );
     }
 
@@ -304,26 +303,7 @@ export class SchedulesService {
 
     let plannedTimes = dto.plannedTimes;
     if (!plannedTimes || plannedTimes.length === 0) {
-      const totalDuration = arr.getTime() - dep.getTime();
-      const totalDistance = route.stops[route.stops.length - 1].distanceKm || 0;
-
-      plannedTimes = route.stops.map((stop, index) => {
-        let stopTime: Date;
-        if (index === 0) {
-          stopTime = dep;
-        } else if (index === route.stops.length - 1) {
-          stopTime = arr;
-        } else {
-          const stopDistance = stop.distanceKm || 0;
-          const progress = totalDistance > 0 ? stopDistance / totalDistance : index / (route.stops.length - 1);
-          stopTime = new Date(dep.getTime() + totalDuration * progress);
-        }
-        return {
-          sequence: stop.sequence,
-          plannedArrivalAt: index === 0 ? undefined : stopTime.toISOString(),
-          plannedDepartureAt: index === route.stops.length - 1 ? undefined : stopTime.toISOString(),
-        };
-      });
+      plannedTimes = computePlannedStopTimes(route, dep, arr);
     }
 
     const plannedTimesMap = Object.fromEntries(plannedTimes.map(t => [t.sequence, t]));
@@ -617,6 +597,24 @@ export class SchedulesService {
     return { synced, errors };
   }
 
+  async recalculateStopTimes(scheduleId: string) {
+    const schedule = await this.prisma.trainSchedule.findUnique({
+      where: { id: scheduleId },
+      include: { route: { include: { stops: { orderBy: { sequence: 'asc' } } } } },
+    });
+    if (!schedule) throw new NotFoundException('Schedule not found');
+    if (!schedule.routeId || !schedule.route) throw new BadRequestException('Schedule has no associated route');
+
+    const plannedTimes = computePlannedStopTimes(
+      schedule.route,
+      new Date(schedule.departureAt),
+      new Date(schedule.arrivalAt),
+    );
+    const plannedTimesMap = Object.fromEntries(plannedTimes.map(t => [t.sequence, t]));
+    await this.routesService.applyRouteToSchedule(schedule.routeId, scheduleId, plannedTimesMap);
+    return { recalculated: true, scheduleId, stopCount: plannedTimes.length };
+  }
+
   async assignCoaches(scheduleId: string, coaches: Array<{ coachId: string; positionNumber: number }>) {
     const schedule = await this.prisma.trainSchedule.findUnique({ where: { id: scheduleId } });
     if (!schedule) throw new NotFoundException('Schedule not found');
@@ -653,11 +651,14 @@ export class SchedulesService {
     if (!schedule) throw new NotFoundException('Schedule not found');
 
     const updateData: any = {};
+    let dep: Date | undefined;
+    let arr: Date | undefined;
 
     if (dto.departureAt || dto.arrivalAt) {
-      const dep = dto.departureAt ? parseEthiopianTime(dto.departureAt) : new Date(schedule.departureAt);
-      const arr = dto.arrivalAt ? parseEthiopianTime(dto.arrivalAt) : new Date(schedule.arrivalAt);
+      dep = dto.departureAt ? parseEthiopianTime(dto.departureAt) : new Date(schedule.departureAt);
+      arr = dto.arrivalAt ? parseEthiopianTime(dto.arrivalAt) : new Date(schedule.arrivalAt);
       if (arr <= dep) throw new BadRequestException('Arrival time must be after departure time');
+      if (dep.getTime() < Date.now()) throw new BadRequestException('departureAt must be in the future');
       updateData.departureAt = dep;
       updateData.arrivalAt = arr;
       updateData.durationMinutes = Math.round((arr.getTime() - dep.getTime()) / 60_000);
@@ -670,6 +671,22 @@ export class SchedulesService {
       await this.prisma.trainSchedule.update({ where: { id }, data: updateData });
     }
 
+    // departureAt/arrivalAt changed — the per-stop TripStopTime rows were computed against the
+    // OLD times and are now stale (same interpolation createSchedule/updateSchedule use). Left
+    // unfixed, check-in cutoff enforcement and search silently keep using outdated per-stop
+    // arrival/departure estimates for every intermediate stop.
+    if (dep && arr && schedule.routeId) {
+      const route = await this.prisma.route.findUnique({
+        where: { id: schedule.routeId },
+        include: { stops: { orderBy: { sequence: 'asc' } } },
+      });
+      if (route && route.stops.length >= 2) {
+        const plannedTimes = computePlannedStopTimes(route, dep, arr);
+        const plannedTimesMap = Object.fromEntries(plannedTimes.map(t => [t.sequence, t]));
+        await this.routesService.applyRouteToSchedule(schedule.routeId, id, plannedTimesMap);
+      }
+    }
+
     if (dto.coaches !== undefined) {
       if (dto.coaches.length > 0) {
         await this.assignCoaches(id, dto.coaches);
diff --git a/apps/edr-passenger-api/src/modules/search/search.service.ts b/apps/edr-passenger-api/src/modules/search/search.service.ts
index 6ed657975..0c905acdd 100644
--- a/apps/edr-passenger-api/src/modules/search/search.service.ts
+++ b/apps/edr-passenger-api/src/modules/search/search.service.ts
@@ -10,7 +10,8 @@ import { CurrencyService } from "../currency/currency.service";
 import { FareEngineService } from "../fare-engine/fare-engine.service";
 import { SegmentsService } from "../segments/segments.service";
 import { resolveCurrencyFromNationality } from "../fare-engine/fare-engine.dto";
-import { Currency } from "@prisma/client";
+import { resolveCheckinCutoff } from "../../common/utils/checkin-cutoff.utils";
+import { Currency, Prisma } from "@prisma/client";
 
 const POINTS_TO_MINOR = 10;
 
@@ -220,12 +221,18 @@ export class SearchService {
     const totalPassengers = adultCount + (childCount ?? 0);
     const NEEDED = 3;
 
-    const baseWhere = {
-      status: "SCHEDULED",
+    // Include BOARDING alongside SCHEDULED: BOARDING is just an operational display status the
+    // schedule-level cron sets on a fixed 30-min-before-departure timer (see tasks.service.ts) —
+    // it does NOT mean booking is closed. The actual booking cutoff is per-stop and configurable
+    // (RouteStop/Route.checkinMinutesBefore), enforced below by buildScheduleResult's own live
+    // check against each stop's estimated arrival/departure. Excluding BOARDING here would
+    // silently impose a hidden, non-configurable 30-minute cutoff on top of that.
+    const baseWhere: Prisma.TrainScheduleWhereInput = {
+      status: { in: ["SCHEDULED", "BOARDING", "EN_ROUTE"] },
       isPackageOnly: false,
       stopTimes: { some: { stationId: originStationId } },
       coachAssignments: { some: {} },
-    } as const;
+    };
 
     // Fetch candidates before and after in parallel; take more than needed to
     // account for routes that don't serve the destination or have no availability.
@@ -300,23 +307,21 @@ export class SearchService {
     const nextDay = new Date(
       `${String(y)}-${String(m).padStart(2, "0")}-${String(d + 1).padStart(2, "0")}T00:00:00+03:00`,
     );
-    const now = new Date();
     const totalPassengers = adultCount + (childCount ?? 0);
 
-    // Use now as the lower bound for today so we don't fetch schedules that have
-    // already fully departed. The per-segment cutoff check in buildScheduleResult
-    // handles the exact check using each stop's own plannedDepartureAt.
-    const isToday =
-      now.getFullYear() === y &&
-      now.getMonth() === m - 1 &&
-      now.getDate() === d;
-    const earliest = isToday ? now : date;
-
+    // Match on the schedule's own departure DATE only — do NOT use `now` as a lower bound here.
+    // A schedule whose origin has already departed (EN_ROUTE) can still have a later stop (e.g.
+    // Lebu, Adama) whose own cutoff hasn't passed; using the overall departureAt as a floor would
+    // wrongly exclude the whole schedule for those still-bookable downstream segments. The
+    // per-segment cutoff check in buildScheduleResult is the sole authority for whether THIS
+    // specific origin stop is still bookable, using each stop's own estimated arrival/departure.
     const schedules = await this.prisma.trainSchedule.findMany({
       where: {
-        status: "SCHEDULED",
+        // EN_ROUTE/BOARDING included alongside SCHEDULED — these are operational display
+        // statuses, not booking-closed signals (see comment on searchAlternatives' baseWhere).
+        status: { in: ["SCHEDULED", "BOARDING", "EN_ROUTE"] },
         isPackageOnly: false,
-        departureAt: { gte: earliest, lt: nextDay },
+        departureAt: { gte: date, lt: nextDay },
         stopTimes: { some: { stationId: originStationId } },
         coachAssignments: { some: {} },
       },
@@ -368,7 +373,8 @@ export class SearchService {
     const [leg1Schedules, allCandidates] = await Promise.all([
       this.prisma.trainSchedule.findMany({
         where: {
-          status: "SCHEDULED",
+          // BOARDING included alongside SCHEDULED — see comment on searchAlternatives' baseWhere.
+          status: { in: ["SCHEDULED", "BOARDING", "EN_ROUTE"] },
           isPackageOnly: false,
           departureAt: { gte: dayStart, lt: dayEnd },
           stopTimes: { some: { stationId: originStationId } },
@@ -378,7 +384,7 @@ export class SearchService {
       }),
       this.prisma.trainSchedule.findMany({
         where: {
-          status: "SCHEDULED",
+          status: { in: ["SCHEDULED", "BOARDING", "EN_ROUTE"] },
           isPackageOnly: false,
           departureAt: { gte: dayStart, lt: leg2WindowEnd },
           coachAssignments: { some: {} },
@@ -547,24 +553,13 @@ export class SearchService {
     if (!originStop || !destStop || originStop.sequence >= destStop.sequence)
       return null;
 
-    // Segment-level cutoff: use the origin stop's planned departure, not the
+    // Segment-level cutoff: use the origin stop's own estimated arrival time, not the
     // schedule's overall departureAt (which is station A's time). This lets
-    // B→D remain bookable even after A→D closes.
-    // Cutoff resolution: stop-level override → route default → 30 min fallback.
-    const now = new Date();
-    const segmentDepartureAt =
-      originStop.plannedDepartureAt ?? schedule.departureAt;
-    const routeStop = schedule.route?.stops?.find(
-      (s) => s.stationId === originStationId,
-    );
-    const checkinMinutes =
-      routeStop?.checkinMinutesBefore ??
-      schedule.route?.checkinMinutesBefore ??
-      30;
-    if (
-      segmentDepartureAt.getTime() - now.getTime() <=
-      checkinMinutes * 60 * 1000
-    )
+    // B→D remain bookable even after A→D closes. Stop-level checkinMinutesBefore override →
+    // route default → 30 min fallback — same resolution GuestBookingService applies at
+    // booking-creation time, so a segment shown as bookable here stays bookable through
+    // checkout instead of being rejected against a different, hardcoded cutoff.
+    if (Date.now() >= resolveCheckinCutoff(schedule, originStop, originStationId).cutoffAt.getTime())
       return null;
 
     // Collect all valid seat IDs upfront for a single batch availability check
@@ -676,8 +671,11 @@ export class SearchService {
       nationality,
       availabilityByClass,
     );
-    const legDepartureAt = schedule.departureAt;
-    const legArrivalAt = schedule.arrivalAt;
+    // Use the selected stop's own planned time, not the schedule's full-route span —
+    // for stop-based (mid-route) boarding/alighting these differ from the train's
+    // overall origin departure / final destination arrival.
+    const legDepartureAt = originStop.plannedDepartureAt ?? schedule.departureAt;
+    const legArrivalAt = destStop.plannedArrivalAt ?? schedule.arrivalAt;
 
     const displayCurrency =
       faresByClass[0]?.displayCurrency ??
diff --git a/apps/edr-passenger-api/src/modules/seat-classes/seat-classes.dto.ts b/apps/edr-passenger-api/src/modules/seat-classes/seat-classes.dto.ts
index 1ea743aa6..853076006 100644
--- a/apps/edr-passenger-api/src/modules/seat-classes/seat-classes.dto.ts
+++ b/apps/edr-passenger-api/src/modules/seat-classes/seat-classes.dto.ts
@@ -1,4 +1,4 @@
-import { IsString, IsInt, IsBoolean, IsOptional, IsIn } from 'class-validator';
+import { IsString, IsInt, IsBoolean, IsOptional, IsIn, Min } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional, PartialType } from '@nestjs/swagger';
 
 export class CreateSeatClassDto {
@@ -27,11 +27,13 @@ export class CreateSeatClassDto {
 
   @ApiProperty({ example: 3000, description: 'Per-km rate in minor units (tariff decimal × 100000)' })
   @IsInt()
+  @Min(0)
   basePrice: number;
 
   @ApiPropertyOptional({ example: 1200, description: 'Flat insurance fee in minor units' })
   @IsOptional()
   @IsInt()
+  @Min(0)
   insuranceFeeMinor?: number;
 
   @ApiPropertyOptional({ example: true })
diff --git a/apps/edr-passenger-api/src/modules/seats/seats.service.ts b/apps/edr-passenger-api/src/modules/seats/seats.service.ts
index bd73c10f5..79773a712 100644
--- a/apps/edr-passenger-api/src/modules/seats/seats.service.ts
+++ b/apps/edr-passenger-api/src/modules/seats/seats.service.ts
@@ -281,7 +281,7 @@ export class SeatsService {
       }),
       this.prisma.tripStopTime.findFirst({
         where: { scheduleId: dto.scheduleId, stationId: dto.originStationId },
-        select: { plannedDepartureAt: true },
+        select: { plannedArrivalAt: true, plannedDepartureAt: true },
       }),
       this.prisma.routeStop.findFirst({
         where: {
@@ -295,7 +295,10 @@ export class SeatsService {
 
     // Stop-level override wins; falls back to route-level; then to 30 min.
     const checkinMinutes = originRouteStop?.checkinMinutesBefore ?? schedule.route?.checkinMinutesBefore ?? 30;
-    const segmentDepartureAt = originStopTime?.plannedDepartureAt ?? schedule.departureAt;
+    // Departure basis: plannedDepartureAt = arrival + dwell. For the origin there is no
+    // arrival so plannedDepartureAt = schedule.departureAt. cutoffAt = departure - dwell = arrival,
+    // so holding closes the moment the train reaches the boarding stop.
+    const segmentDepartureAt = originStopTime?.plannedDepartureAt ?? originStopTime?.plannedArrivalAt ?? schedule.departureAt;
     const msUntilDeparture = segmentDepartureAt.getTime() - Date.now();
     if (msUntilDeparture <= checkinMinutes * 60 * 1000) {
       throw new BadRequestException(
diff --git a/apps/edr-passenger-api/src/modules/system-config/system-config.controller.ts b/apps/edr-passenger-api/src/modules/system-config/system-config.controller.ts
index 0114c03f9..6d2c15eb2 100644
--- a/apps/edr-passenger-api/src/modules/system-config/system-config.controller.ts
+++ b/apps/edr-passenger-api/src/modules/system-config/system-config.controller.ts
@@ -1,6 +1,7 @@
 import { Body, Controller, Get, Patch, SetMetadata, UseGuards } from '@nestjs/common';
 import { ApiTags, ApiBearerAuth, ApiOperation } from '@nestjs/swagger';
 import { SystemConfigService } from './system-config.service';
+import { UpdateSystemConfigDto } from './system-config.dto';
 import { IamGuard } from '../../common/iam-adapter';
 import { Roles } from '../../common/roles.decorator';
 
@@ -31,7 +32,12 @@ export class SystemConfigController {
   @UseGuards(IamGuard)
   @Roles('ADMIN')
   @ApiOperation({ summary: 'Update system config (admin)' })
-  update(@Body() body: Record<string, string>) {
-    return this.service.updateMany(body);
+  update(@Body() dto: UpdateSystemConfigDto) {
+    // The DTO validates/coerces each known key to a positive integer; persist back as strings.
+    const entries: Record<string, string> = {};
+    for (const [key, value] of Object.entries(dto)) {
+      if (value !== undefined) entries[key] = String(value);
+    }
+    return this.service.updateMany(entries);
   }
 }
diff --git a/apps/edr-passenger-api/src/modules/system-config/system-config.dto.ts b/apps/edr-passenger-api/src/modules/system-config/system-config.dto.ts
new file mode 100644
index 000000000..5c1cd9679
--- /dev/null
+++ b/apps/edr-passenger-api/src/modules/system-config/system-config.dto.ts
@@ -0,0 +1,48 @@
+import { IsInt, IsOptional, Min, Max } from 'class-validator';
+import { Type } from 'class-transformer';
+import { ApiPropertyOptional } from '@nestjs/swagger';
+
+/**
+ * Whitelisted, typed body for `PATCH /config`. Config is persisted as string key/values, but every
+ * known key is a positive integer (durations, hour windows, throttle limits/TTLs). Values arrive as
+ * strings from the backoffice form; `@Type(() => Number)` coerces them so the numeric/range checks
+ * apply (M-3 — the endpoint previously stored any raw string, e.g. `seat_hold_duration_minutes: -1`).
+ * Unknown keys are stripped by the global whitelisting ValidationPipe.
+ */
+export class UpdateSystemConfigDto {
+  @ApiPropertyOptional({ example: 5, description: 'Seat-hold duration in minutes (1..60)' })
+  @IsOptional() @Type(() => Number) @IsInt() @Min(1) @Max(60)
+  seat_hold_duration_minutes?: number;
+
+  @ApiPropertyOptional({ example: 2 })
+  @IsOptional() @Type(() => Number) @IsInt() @Min(0)
+  hold_cutoff_hours_before_departure?: number;
+
+  @ApiPropertyOptional({ example: 4 })
+  @IsOptional() @Type(() => Number) @IsInt() @Min(0)
+  boarding_window_hours_before_departure?: number;
+
+  @ApiPropertyOptional({ example: 5 })
+  @IsOptional() @Type(() => Number) @IsInt() @Min(1)
+  throttle_auth_limit?: number;
+
+  @ApiPropertyOptional({ example: 60000 })
+  @IsOptional() @Type(() => Number) @IsInt() @Min(1)
+  throttle_auth_ttl_ms?: number;
+
+  @ApiPropertyOptional({ example: 20 })
+  @IsOptional() @Type(() => Number) @IsInt() @Min(1)
+  throttle_strict_limit?: number;
+
+  @ApiPropertyOptional({ example: 60000 })
+  @IsOptional() @Type(() => Number) @IsInt() @Min(1)
+  throttle_strict_ttl_ms?: number;
+
+  @ApiPropertyOptional({ example: 100 })
+  @IsOptional() @Type(() => Number) @IsInt() @Min(1)
+  throttle_default_limit?: number;
+
+  @ApiPropertyOptional({ example: 60000 })
+  @IsOptional() @Type(() => Number) @IsInt() @Min(1)
+  throttle_default_ttl_ms?: number;
+}
diff --git a/apps/edr-passenger-api/src/modules/tasks/tasks.service.ts b/apps/edr-passenger-api/src/modules/tasks/tasks.service.ts
index 4767c7eba..99d6b4d4e 100644
--- a/apps/edr-passenger-api/src/modules/tasks/tasks.service.ts
+++ b/apps/edr-passenger-api/src/modules/tasks/tasks.service.ts
@@ -81,17 +81,23 @@ export class TasksService {
       byRoute.get(stop.routeId)!.push(stop.stationId);
     }
 
+    // Arrival basis: each stop's own estimated arrival time, not its departure. The first
+    // stop of a route has no arrival (nothing to arrive at), so it falls back to its
+    // departure — expressed below as COALESCE(plannedArrivalAt, plannedDepartureAt).
     let reopenedCount = 0;
     let checkinClosedCount = 0;
     for (const [mins, byRoute] of byMins) {
       const cutoffAt = new Date(now.getTime() + mins * 60 * 1000);
       for (const [routeId, stationIds] of byRoute) {
         // Revert first: if the cutoff was reduced, stops that were prematurely closed
-        // should reopen (departure is still beyond the new cutoff window).
+        // should reopen (arrival is still beyond the new cutoff window).
         const reverted = await this.prisma.tripStopTime.updateMany({
           where: {
             status: 'CHECKIN_CLOSED',
-            plannedDepartureAt: { gt: cutoffAt },
+            OR: [
+              { plannedArrivalAt: { gt: cutoffAt } },
+              { AND: [{ plannedArrivalAt: null }, { plannedDepartureAt: { gt: cutoffAt } }] },
+            ],
             stationId: { in: stationIds },
             schedule: { routeId },
           },
@@ -103,7 +109,10 @@ export class TasksService {
         const closed = await this.prisma.tripStopTime.updateMany({
           where: {
             status: 'OPEN',
-            plannedDepartureAt: { lte: cutoffAt },
+            OR: [
+              { plannedArrivalAt: { lte: cutoffAt } },
+              { AND: [{ plannedArrivalAt: null }, { plannedDepartureAt: { lte: cutoffAt } }] },
+            ],
             stationId: { in: stationIds },
             schedule: { routeId },
           },
@@ -169,8 +178,8 @@ export class TasksService {
           include: {
             originStation:      { select: { name: true } },
             destinationStation: { select: { name: true } },
-            stopTimes:          { select: { stationId: true, plannedDepartureAt: true } },
-            route:              { select: { checkinMinutesBefore: true } },
+            stopTimes:          { select: { stationId: true, plannedArrivalAt: true, plannedDepartureAt: true } },
+            route:              { select: { checkinMinutesBefore: true, stops: { select: { stationId: true, checkinMinutesBefore: true } } } },
           },
         },
       },
@@ -179,12 +188,17 @@ export class TasksService {
     for (const booking of bookings) {
       try {
         const createdAt = booking.createdAt as Date;
-        // Use the booking's origin-segment departure and the route's own check-in window.
+        // Use the booking's origin-segment estimated arrival (falling back to its departure
+        // for the first stop) and that stop's own check-in window (falling back to the route
+        // default), same resolution as holdSeats/search.
         const originStop = (booking.schedule as any).stopTimes?.find(
           (s: any) => s.stationId === (booking as any).originStationId,
         );
-        const dep            = (originStop?.plannedDepartureAt ?? booking.schedule.departureAt) as Date;
-        const checkinMinutes = (booking.schedule as any).route?.checkinMinutesBefore ?? 30;
+        const dep = (originStop?.plannedArrivalAt ?? originStop?.plannedDepartureAt ?? booking.schedule.departureAt) as Date;
+        const originRouteStop = (booking.schedule as any).route?.stops?.find(
+          (s: any) => s.stationId === (booking as any).originStationId,
+        );
+        const checkinMinutes = originRouteStop?.checkinMinutesBefore ?? (booking.schedule as any).route?.checkinMinutesBefore ?? 30;
         if (dep <= now) continue; // segment has already departed; cancel job handles clean-up
         const paymentDeadline = computePaymentDeadline(createdAt, dep, checkinMinutes);
         const totalWindowMs   = paymentDeadline.getTime() - createdAt.getTime();
@@ -230,13 +244,28 @@ export class TasksService {
 
   // ── Cancel bookings whose payment deadline has passed ─────────────────────
   private async cancelExpiredPendingBookings(now: Date) {
-    const twoHoursAgo     = new Date(now.getTime() - MAX_PAYMENT_HOURS * 60 * 60 * 1000);
-    const departureCutoff = new Date(now.getTime() + CUTOFF_MINUTES * 60 * 1000);
+    const twoHoursAgo = new Date(now.getTime() - MAX_PAYMENT_HOURS * 60 * 60 * 1000);
 
-    // payment_deadline = MIN(createdAt + 2h, departureAt - 30min)
+    // The departure pre-filter below is a query-scoping optimization only — the real
+    // deadline check happens per-row further down. It must be widened to the largest
+    // configured checkinMinutes across all routes/stops, or a booking on a route with a
+    // cutoff bigger than the CUTOFF_MINUTES default would never even be fetched here,
+    // silently never getting auto-cancelled.
+    const [maxRouteCutoff, maxStopCutoff] = await Promise.all([
+      this.prisma.route.aggregate({ _max: { checkinMinutesBefore: true } }),
+      this.prisma.routeStop.aggregate({ _max: { checkinMinutesBefore: true } }),
+    ]);
+    const effectiveMaxCutoffMinutes = Math.max(
+      CUTOFF_MINUTES,
+      maxRouteCutoff._max.checkinMinutesBefore ?? 0,
+      maxStopCutoff._max.checkinMinutesBefore ?? 0,
+    );
+    const departureCutoff = new Date(now.getTime() + effectiveMaxCutoffMinutes * 60 * 1000);
+
+    // payment_deadline = MIN(createdAt + 2h, segment_arrival - checkinMinutes)
     // Deadline is reached when either branch of the MIN is in the past:
-    //   (a) createdAt ≤ now - 2h        →  2-hour max window elapsed
-    //   (b) departureAt ≤ now + 30min   →  departure within 30 min
+    //   (a) createdAt ≤ now - 2h                    →  2-hour max window elapsed
+    //   (b) departureAt ≤ now + effectiveMaxCutoff   →  within the widest possible cutoff window
     const expiredBookings = await this.prisma.booking.findMany({
       where: {
         status: 'PENDING_PAYMENT',
@@ -250,8 +279,8 @@ export class TasksService {
           include: {
             originStation:      { select: { name: true } },
             destinationStation: { select: { name: true } },
-            stopTimes:          { select: { stationId: true, plannedDepartureAt: true } },
-            route:              { select: { checkinMinutesBefore: true } },
+            stopTimes:          { select: { stationId: true, plannedArrivalAt: true, plannedDepartureAt: true } },
+            route:              { select: { checkinMinutesBefore: true, stops: { select: { stationId: true, checkinMinutesBefore: true } } } },
           },
         },
         paymentIntent: { select: { method: true } },
@@ -264,14 +293,19 @@ export class TasksService {
     for (const booking of expiredBookings) {
       try {
         // Re-verify exact deadline to avoid racing with a concurrent payment confirmation.
-        // Use the booking's origin-segment departure for the deadline so that a B→C booking
-        // on an A→B→C→D schedule gets the correct payment window anchored to B, not A.
+        // Use the booking's origin-segment estimated arrival (falling back to its departure
+        // for the first stop) and that stop's own check-in window, so a B→C booking on an
+        // A→B→C→D schedule gets the correct payment window anchored to B, not A.
         const createdAt  = booking.createdAt as Date;
         const originStop = (booking.schedule as any).stopTimes?.find(
           (s: any) => s.stationId === (booking as any).originStationId,
         );
-        const dep             = (originStop?.plannedDepartureAt ?? booking.schedule.departureAt) as Date;
-        const paymentDeadline = computePaymentDeadline(createdAt, dep);
+        const dep = (originStop?.plannedArrivalAt ?? originStop?.plannedDepartureAt ?? booking.schedule.departureAt) as Date;
+        const originRouteStop = (booking.schedule as any).route?.stops?.find(
+          (s: any) => s.stationId === (booking as any).originStationId,
+        );
+        const checkinMinutes = originRouteStop?.checkinMinutesBefore ?? (booking.schedule as any).route?.checkinMinutesBefore ?? CUTOFF_MINUTES;
+        const paymentDeadline = computePaymentDeadline(createdAt, dep, checkinMinutes);
         if (now < paymentDeadline) continue;
 
         // 1a. Release held seats (Journey rows are the occupancy source of truth once paid)
diff --git a/apps/edr-passenger-api/src/modules/tickets/tickets.controller.ts b/apps/edr-passenger-api/src/modules/tickets/tickets.controller.ts
index 4ecaeb267..869a8578a 100644
--- a/apps/edr-passenger-api/src/modules/tickets/tickets.controller.ts
+++ b/apps/edr-passenger-api/src/modules/tickets/tickets.controller.ts
@@ -14,10 +14,11 @@ export class TicketsController {
   @ApiBearerAuth('IAM-auth')
   @ApiOperation({
     summary: 'Generate tickets for all confirmed bookings that are missing them',
-    description: 'Finds every CONFIRMED booking with no ticket rows and attempts to generate tickets for each. Returns a summary of processed/generated/failed counts.',
+    description: 'Finds every CONFIRMED booking with no ticket rows and attempts to generate tickets for each. Returns a summary of processed/generated/failed/remaining counts. Call repeatedly until remaining=0.',
   })
-  generateMissing() {
-    return this.service.generateMissing();
+  @ApiQuery({ name: 'limit', required: false, description: 'Max bookings to process per call (default 10)' })
+  generateMissing(@Query('limit') limit?: string) {
+    return this.service.generateMissing(limit ? parseInt(limit, 10) : 10);
   }
 
   @Post('smart-assign/:bookingId')
diff --git a/apps/edr-passenger-api/src/modules/tickets/tickets.service.ts b/apps/edr-passenger-api/src/modules/tickets/tickets.service.ts
index e6f3b0781..6cd94ec6c 100644
--- a/apps/edr-passenger-api/src/modules/tickets/tickets.service.ts
+++ b/apps/edr-passenger-api/src/modules/tickets/tickets.service.ts
@@ -5,6 +5,7 @@ import { PrismaService } from '../../common/prisma.service';
 import { NotificationsService } from '../notifications/notifications.service';
 import { SystemConfigService, CONFIG_KEYS } from '../system-config/system-config.service';
 import { AuditService } from '../../common/audit.service';
+import { resolveBookingSegment } from '../../common/utils/segment-resolver.utils';
 import * as QRCode from 'qrcode';
 
 interface OfflineValidation {
@@ -129,6 +130,7 @@ export class TicketsService {
           : { fullName: 'Guest', email: guestEmail, phone: guestPhone };
         
         
+        const segment = resolveBookingSegment(t.booking?.schedule, t.booking?.originStationId, t.booking?.destinationStationId);
         return {
           id: t.id,
           ticketNumber: t.barcodePayload,
@@ -152,20 +154,14 @@ export class TicketsService {
             contactPhone: t.booking?.contactPhone,
             returnSchedule: t.booking?.returnSchedule ?? null,
             seats: t.booking?.seats ?? [],
-            originStation: (() => {
-              const id = t.booking?.originStationId;
-              if (!id) return t.booking?.schedule?.originStation ?? null;
-              const stop = t.booking?.schedule?.stopTimes?.find((st: any) => st.stationId === id);
-              return stop?.station ?? t.booking?.schedule?.originStation ?? null;
-            })(),
-            destinationStation: (() => {
-              const id = t.booking?.destinationStationId;
-              if (!id) return t.booking?.schedule?.destinationStation ?? null;
-              const stop = t.booking?.schedule?.stopTimes?.find((st: any) => st.stationId === id);
-              return stop?.station ?? t.booking?.schedule?.destinationStation ?? null;
-            })(),
+            originStation: segment.origin,
+            destinationStation: segment.destination,
           },
-          schedule: t.booking?.schedule,
+          schedule: t.booking?.schedule ? {
+            ...t.booking.schedule,
+            departureAt: segment.departureAt,
+            arrivalAt: segment.arrivalAt,
+          } : null,
           seat: t.seat ? {
             id: t.seat.id,
             seatNumber: t.seat.seatNumber,
@@ -643,11 +639,14 @@ export class TicketsService {
         throw new NotFoundException('No ticket found for this booking');
       }
 
-      // Check if ticket date matches today
+      // Check if ticket date matches today. Boarding window is relative to the
+      // passenger's actual boarding stop, not the train's origin — for a mid-route
+      // boarding these differ.
       const today = new Date();
-      
-      if ((booking as any).schedule?.departureAt) {
-        const departureTime = new Date((booking as any).schedule.departureAt);
+      const boardingSegment = resolveBookingSegment((booking as any).schedule, (booking as any).originStationId, (booking as any).destinationStationId);
+
+      if (boardingSegment.departureAt) {
+        const departureTime = new Date(boardingSegment.departureAt);
         const boardingWindowHours = await this.systemConfig.getNumber(CONFIG_KEYS.BOARDING_WINDOW_HOURS_BEFORE_DEPARTURE);
         const boardingOpenTime = new Date(departureTime.getTime() - boardingWindowHours * 60 * 60 * 1000);
 
@@ -673,18 +672,6 @@ export class TicketsService {
       // Send notifications after successful boarding
       await this.sendBoardingNotifications(booking, ticket, result.leg || 'OUTBOUND');
 
-      // Resolve user-selected segment rather than the full schedule route
-      const _schedStops = (booking as any).schedule?.stopTimes ?? [];
-      const _resolveStation = (id: string | null | undefined, fallback: any) => {
-        if (id) {
-          const found = _schedStops.find((st: any) => st.stationId === id)?.station;
-          if (found) return found;
-        }
-        return fallback;
-      };
-      const boardingOrigin = _resolveStation((booking as any).originStationId, (booking as any).schedule?.originStation);
-      const boardingDest = _resolveStation((booking as any).destinationStationId, (booking as any).schedule?.destinationStation);
-
       return {
         success: true,
         message: `Passenger boarded successfully (${result.leg || 'OUTBOUND'} leg)`,
@@ -693,11 +680,11 @@ export class TicketsService {
           ticketNumber: ticket.barcodePayload,
           bookingRef: booking.bookingRef,
           passengerName: seatInfo?.passengerName || ticket.passengerName || 'N/A',
-          route: `${boardingOrigin?.name || 'N/A'} → ${boardingDest?.name || 'N/A'}`,
+          route: `${boardingSegment.origin?.name || 'N/A'} → ${boardingSegment.destination?.name || 'N/A'}`,
           seat: seatNumber,
           coach: coachNumber,
           trainName: (booking as any).schedule?.train?.name || (booking as any).schedule?.train?.number || 'N/A',
-          departureTime: (booking as any).schedule?.departureAt,
+          departureTime: boardingSegment.departureAt,
           boardedAt: result.validatedAt,
           leg: result.leg || 'OUTBOUND',
           bookingType: booking.bookingType,
@@ -905,15 +892,21 @@ export class TicketsService {
     };
   }
 
-  async generateMissing(): Promise<{ processed: number; generated: number; failed: number; details: any[] }> {
-    const confirmedWithNoTickets = await this.prisma.booking.findMany({
-      where: {
-        status: 'CONFIRMED',
-        tickets: { none: {} },
-        paymentIntent: { status: 'SUCCEEDED' },
-      },
-      select: { id: true, bookingRef: true },
-    });
+  async generateMissing(limit = 10): Promise<{ processed: number; generated: number; failed: number; remaining: number; details: any[] }> {
+    const missingWhere = {
+      status: 'CONFIRMED' as const,
+      tickets: { none: {} },
+      paymentIntent: { status: 'SUCCEEDED' as const },
+    };
+
+    const [confirmedWithNoTickets, totalRemaining] = await Promise.all([
+      this.prisma.booking.findMany({
+        where: missingWhere,
+        select: { id: true, bookingRef: true },
+        take: limit,
+      }),
+      this.prisma.booking.count({ where: missingWhere }),
+    ]);
 
     const details: any[] = [];
     let generated = 0;
@@ -930,7 +923,13 @@ export class TicketsService {
       }
     }
 
-    return { processed: confirmedWithNoTickets.length, generated, failed, details };
+    return {
+      processed: confirmedWithNoTickets.length,
+      generated,
+      failed,
+      remaining: Math.max(0, totalRemaining - confirmedWithNoTickets.length),
+      details,
+    };
   }
 
   async delete(id: string) {
diff --git a/apps/edr-passenger-api/test/auth-gaps.e2e-spec.ts b/apps/edr-passenger-api/test/auth-gaps.e2e-spec.ts
new file mode 100644
index 000000000..b05495296
--- /dev/null
+++ b/apps/edr-passenger-api/test/auth-gaps.e2e-spec.ts
@@ -0,0 +1,34 @@
+/**
+ * Auth/authorization gaps (matrix Suite J), via route guard metadata — no boot needed.
+ *
+ *   C-8 🔴 The exchange-rate write routes (PUT upsert, PATCH update) carry no METHOD-LEVEL guard, so
+ *          they get only the global JwtGuard (authentication) and NOT @PassengerAdmin (authorization)
+ *          — unlike DELETE, which is admin-gated. Net effect (verified live in
+ *          e2e-ui .../pb-config-propagation.spec.ts BC-11): anonymous → 401, but ANY authenticated
+ *          user incl. a passenger → 200 rewrites live FX. fare-engine/currency.controller.ts:25,32,42
+ *
+ * NOTE: this metadata check proves the missing ADMIN guard, NOT "unauthenticated" — a global
+ * APP_GUARD=JwtGuard (SharedAuthModule) still requires a valid token. The earlier "unauthenticated
+ * FX write" reading was a false positive corrected by the live BC-11 test.
+ */
+import "reflect-metadata";
+import { CurrencyController } from "../src/modules/fare-engine/currency.controller";
+
+const GUARDS_METADATA = "__guards__";
+function guardsOn(handler: unknown): unknown[] {
+  return (Reflect.getMetadata(GUARDS_METADATA, handler as object) as unknown[]) ?? [];
+}
+
+describe("Auth gaps (Suite J)", () => {
+  it("C-8 🔴 PUT upsert exchange-rate has NO admin guard (only the global JwtGuard applies)", () => {
+    expect(guardsOn(CurrencyController.prototype.upsert)).toHaveLength(0);
+  });
+
+  it("C-8 🔴 PATCH update exchange-rate has NO admin guard (only the global JwtGuard applies)", () => {
+    expect(guardsOn(CurrencyController.prototype.update)).toHaveLength(0);
+  });
+
+  it("C-8 control: DELETE exchange-rate IS admin-gated — proving writes should be too", () => {
+    expect(guardsOn(CurrencyController.prototype.remove).length).toBeGreaterThan(0);
+  });
+});
diff --git a/apps/edr-passenger-api/test/authed-booking-passengerid.e2e-spec.ts b/apps/edr-passenger-api/test/authed-booking-passengerid.e2e-spec.ts
new file mode 100644
index 000000000..ff4a59944
--- /dev/null
+++ b/apps/edr-passenger-api/test/authed-booking-passengerid.e2e-spec.ts
@@ -0,0 +1,122 @@
+/**
+ * C-9-UI 🔴 Authenticated POST /bookings is broken: the controller overrides passengerId with the
+ * JWT user id (`bookings.controller.ts:528-532`, "never trust the request body"), but the service
+ * only resolves an iamUserId → Passenger when it is NON-UUID (`bookings.service.ts:773`). Real IAM
+ * ids are UUIDs, and registration creates `Passenger.id ≠ iamUserId` (`passenger-auth.service.ts:225`),
+ * so `booking.create` uses the iamUserId directly as passengerId → foreign-key violation.
+ *
+ * This reproduces the controller's behavior by calling BookingsService.create with passengerId set to
+ * a UUID iamUserId (not the Passenger.id), exactly as the authed controller does. It also shows the
+ * CONTROL: passing the real Passenger.id succeeds — proving the resolution gap, not a fixture problem.
+ */
+import { BookingsService } from "../src/modules/bookings/bookings.service";
+import { getTestPrisma, disconnectTestPrisma } from "./setup/prisma";
+import { truncateAllPassenger, seedCore, IDS } from "./fixtures/seed-core";
+
+function asyncStub(): any {
+  return new Proxy({}, { get: () => async () => undefined });
+}
+
+let seq = 0;
+async function buildBookableGraph(prisma: any, passengerId: string, iamUserId: string) {
+  const passenger = await prisma.passenger.create({ data: { id: passengerId, iamUserId } });
+  const train = await prisma.train.create({ data: { number: `AB-${++seq}`, name: "T" } });
+  const schedule = await prisma.trainSchedule.create({
+    data: {
+      trainId: train.id,
+      routeId: IDS.route,
+      originStationId: IDS.stationA,
+      destinationStationId: IDS.stationB,
+      departureAt: new Date(Date.now() + 86_400_000),
+      arrivalAt: new Date(Date.now() + 90_000_000),
+      durationMinutes: 60,
+    },
+  });
+  await prisma.tripStopTime.createMany({
+    data: [
+      { scheduleId: schedule.id, stationId: IDS.stationA, sequence: 1 },
+      { scheduleId: schedule.id, stationId: IDS.stationB, sequence: 2 },
+    ],
+  });
+  const coach = await prisma.coach.create({ data: { coachTypeId: IDS.coachType, number: `AB-${seq}` } });
+  const seat = await prisma.seat.create({ data: { coachId: coach.id, seatNumber: "1A", row: 1, col: "1" } });
+  await prisma.fareRule.create({
+    data: { tripId: schedule.id, seatClassId: IDS.seatClassLocal, baseFareMinor: 30_000, currency: "ETB", validFrom: new Date("2020-01-01") },
+  });
+  const hold = await prisma.seatHold.create({
+    data: { scheduleId: schedule.id, seatIds: [seat.id], passengerId, expiresAt: new Date(Date.now() + 3_600_000) },
+  });
+  return { schedule, seat, hold };
+}
+
+function dtoFor(passengerId: string, schedule: any, hold: any, seat: any) {
+  return {
+    passengerId, // the controller passes req.user.id here (the iamUserId)
+    scheduleId: schedule.id,
+    holdId: hold.id,
+    originStationId: IDS.stationA,
+    destinationStationId: IDS.stationB,
+    seatClassId: IDS.seatClassLocal,
+    bookingType: "ONE_WAY",
+    passengers: [
+      {
+        seatId: seat.id,
+        passengerName: "Auth User",
+        dateOfBirth: new Date("1990-01-01"),
+        idDocumentType: "PASSPORT",
+        passportNumber: "P1",
+        passportCountry: "ET",
+        nationality: "Ethiopian",
+        seatFareMinor: 30_000,
+      },
+    ],
+  };
+}
+
+describe("Authenticated booking passengerId resolution (regression)", () => {
+  const prisma = getTestPrisma();
+  let bookings: BookingsService;
+
+  beforeAll(() => {
+    bookings = new BookingsService(
+      prisma as any,
+      { query: async () => [] } as any, // dataSource (resolveIamContact raw SQL → [])
+      asyncStub(), // seatsService
+      { emit: () => true } as any,
+      asyncStub(), // verifaydaService (PASSPORT skips)
+      asyncStub(), // currencyService (ETB skips)
+      asyncStub(), // fareEngine (FareRule short-circuits)
+      asyncStub(), // auditService
+    );
+  });
+  beforeEach(async () => {
+    await truncateAllPassenger(prisma);
+    await seedCore(prisma);
+  });
+  afterAll(async () => {
+    await disconnectTestPrisma();
+  });
+
+  it("🔴 create() with a UUID iamUserId (as the authed controller passes) FAILS the passenger FK", async () => {
+    const passengerId = "aaaaaaaa-0000-4000-8000-000000000001"; // real Passenger.id
+    const iamUserId = "bbbbbbbb-0000-4000-8000-000000000002"; // UUID iamUserId ≠ Passenger.id
+    const { schedule, hold, seat } = await buildBookableGraph(prisma, passengerId, iamUserId);
+
+    // The controller calls service.create({ ...dto, passengerId: req.user.id }) — i.e. the iamUserId.
+    await expect(
+      bookings.create(dtoFor(iamUserId, schedule, hold, seat) as any),
+    ).rejects.toThrow(); // Prisma P2003 on Booking_passengerId_fkey
+
+    expect(await prisma.booking.count()).toBe(0);
+  });
+
+  it("control: create() with the real Passenger.id succeeds — proving the gap is the id, not the fixture", async () => {
+    const passengerId = "aaaaaaaa-0000-4000-8000-000000000003";
+    const iamUserId = "bbbbbbbb-0000-4000-8000-000000000004";
+    const { schedule, hold, seat } = await buildBookableGraph(prisma, passengerId, iamUserId);
+
+    const booking: any = await bookings.create(dtoFor(passengerId, schedule, hold, seat) as any);
+    expect(booking.id).toBeTruthy();
+    expect(booking.passengerId).toBe(passengerId);
+  });
+});
diff --git a/apps/edr-passenger-api/test/checkin-cutoff.e2e-spec.ts b/apps/edr-passenger-api/test/checkin-cutoff.e2e-spec.ts
new file mode 100644
index 000000000..93c0386b6
--- /dev/null
+++ b/apps/edr-passenger-api/test/checkin-cutoff.e2e-spec.ts
@@ -0,0 +1,204 @@
+/**
+ * Per-station check-in cutoff — proves booking closure is now based on each stop's own
+ * ESTIMATED ARRIVAL time (computed from RouteStop.travelMinutesToStop), not the schedule's
+ * overall departure. The regression this guards: before this change, all stops effectively
+ * shared one cutoff basis, so a later station could be wrongly blocked (or an earlier one
+ * wrongly left open) together with the rest of the route.
+ *
+ * Uses the slim harness (SchedulesService, real Nest DI) for schedule creation — this exercises
+ * the actual cumulative travel-time interpolation in SchedulesService.createSchedule. SeatsService
+ * and TasksService are NOT in the slim harness's DOMAIN_MODULES (they pull in NotificationsModule
+ * → RabbitMQ, which the slim harness deliberately avoids — see test/setup/slim-app.ts), so they're
+ * instantiated directly with a real Prisma + stubbed collaborators, mirroring the Tier-2 pattern in
+ * money-integrity.e2e-spec.ts.
+ */
+import { SchedulesService } from "../src/modules/schedules/schedules.service";
+import { SeatsService } from "../src/modules/seats/seats.service";
+import { TasksService } from "../src/modules/tasks/tasks.service";
+import { SystemConfigService } from "../src/modules/system-config/system-config.service";
+import { createServiceHarness, ServiceHarness } from "./setup/slim-app";
+import { IDS, DISTANCE, resetAndSeedCore } from "./fixtures/seed-core";
+
+/** A Proxy whose every property is an async no-op — satisfies unused collaborator method calls. */
+function asyncStub(): any {
+  return new Proxy({}, { get: () => async () => undefined });
+}
+
+/** Creates a fresh Train + TrainSchedule on the seed-core route via the real interpolation logic. */
+async function createTestSchedule(
+  harness: ServiceHarness,
+  schedules: SchedulesService,
+  opts: { trainNumber: string; departureAt: Date; arrivalAt: Date },
+) {
+  const train = await harness.prisma.train.create({
+    data: { number: opts.trainNumber, name: `Test ${opts.trainNumber}` },
+  });
+
+  // createSchedule now rejects a schedule with zero coaches (see schedules.service.ts's
+  // "must have at least one coach assigned" guard) — the coach has to exist and be passed
+  // via coachIds BEFORE creation, not attached afterward.
+  const coach = await harness.prisma.coach.create({
+    data: { coachTypeId: IDS.coachType, number: `${opts.trainNumber}-C1`, capacity: 4, sequence: 1, status: "ACTIVE" },
+  });
+  const seats = await Promise.all(
+    ["1A", "1B", "1C", "1D"].map((seatNumber, i) =>
+      harness.prisma.seat.create({
+        data: { coachId: coach.id, seatNumber, row: 1, col: seatNumber.slice(-1), isWindow: i === 0, isAisle: i === 1 },
+      }),
+    ),
+  );
+
+  const schedule = await schedules.createSchedule({
+    trainId: train.id,
+    routeId: IDS.route,
+    departureAt: opts.departureAt.toISOString(),
+    arrivalAt: opts.arrivalAt.toISOString(),
+    coachIds: [coach.id],
+  } as any);
+
+  return { schedule, seats };
+}
+
+describe("Check-in cutoff — arrival-time basis, per-station independence", () => {
+  let harness: ServiceHarness;
+  let schedulesService: SchedulesService;
+  let seatsService: SeatsService;
+  let tasksService: TasksService;
+
+  beforeAll(async () => {
+    harness = await createServiceHarness();
+    schedulesService = await harness.moduleRef.resolve(SchedulesService);
+    const systemConfig = new SystemConfigService(harness.prisma as any);
+    seatsService = new SeatsService(harness.prisma as any, asyncStub(), systemConfig, asyncStub(), asyncStub());
+    tasksService = new TasksService(harness.prisma as any, asyncStub(), asyncStub());
+  });
+
+  afterAll(async () => {
+    await harness?.close();
+  });
+
+  it("a later station remains independently bookable after an earlier station's cutoff has passed", async () => {
+    await resetAndSeedCore(harness.prisma);
+
+    // dep only 5 min out (createSchedule requires a future departureAt). Route-level default
+    // checkinMinutesBefore is 30 (schema default, unset here), so A's cutoff (dep - 30min) is
+    // already ~25 min in the past by the time this runs — but B, with a 60-min travel time from
+    // A, has an arrival far enough out (dep + 60min) that its own cutoff (arrival - 30min) is
+    // still ~35 min in the future.
+    const dep = new Date(Date.now() + 5 * 60_000);
+    const arr = new Date(dep.getTime() + 100 * 60_000); // A->B 60min + B->C 40min
+    await harness.prisma.routeStop.update({
+      where: { routeId_sequence: { routeId: IDS.route, sequence: 2 } },
+      data: { travelMinutesToStop: 60 },
+    });
+    await harness.prisma.routeStop.update({
+      where: { routeId_sequence: { routeId: IDS.route, sequence: 3 } },
+      data: { travelMinutesToStop: 40 },
+    });
+
+    const { schedule, seats } = await createTestSchedule(harness, schedulesService, {
+      trainNumber: `CUTOFF-A-${Date.now()}`,
+      departureAt: dep,
+      arrivalAt: arr,
+    });
+
+    await expect(
+      seatsService.holdSeats({
+        scheduleId: schedule.id,
+        originStationId: IDS.stationA,
+        destinationStationId: IDS.stationB,
+        passengers: [{ passengerId: "11111111-1111-4111-8111-111111111111", seatId: seats[0].id }],
+      } as any),
+    ).rejects.toThrow(/cannot be held within/i);
+
+    const held = await seatsService.holdSeats({
+      scheduleId: schedule.id,
+      originStationId: IDS.stationB,
+      destinationStationId: IDS.stationC,
+      passengers: [{ passengerId: "22222222-2222-4222-8222-222222222222", seatId: seats[1].id }],
+    } as any);
+    expect(held).toBeTruthy();
+  });
+
+  it("a stop-level checkinMinutesBefore override wins over the route-level default", async () => {
+    // Override B with a LARGE cutoff (90 min) — under the route default (30 min) this exact
+    // schedule's B segment would still be OPEN (see previous test), so a rejection here proves
+    // the stop-level override, not the default, is what's actually being applied.
+    await resetAndSeedCore(harness.prisma, { B: { checkinMinutesBefore: 90 } });
+    await harness.prisma.routeStop.update({
+      where: { routeId_sequence: { routeId: IDS.route, sequence: 2 } },
+      data: { travelMinutesToStop: 60 },
+    });
+
+    const dep = new Date(Date.now() + 5 * 60_000);
+    const arr = new Date(dep.getTime() + 100 * 60_000);
+    const { schedule, seats } = await createTestSchedule(harness, schedulesService, {
+      trainNumber: `CUTOFF-B-${Date.now()}`,
+      departureAt: dep,
+      arrivalAt: arr,
+    });
+
+    await expect(
+      seatsService.holdSeats({
+        scheduleId: schedule.id,
+        originStationId: IDS.stationB,
+        destinationStationId: IDS.stationC,
+        passengers: [{ passengerId: "33333333-3333-4333-8333-333333333333", seatId: seats[0].id }],
+      } as any),
+    ).rejects.toThrow(/cannot be held within 90 minute/i);
+  });
+
+  it("syncScheduleStatuses closes only the specific stops past their own arrival-based cutoff", async () => {
+    await resetAndSeedCore(harness.prisma);
+    await harness.prisma.routeStop.update({
+      where: { routeId_sequence: { routeId: IDS.route, sequence: 2 } },
+      data: { travelMinutesToStop: 60 },
+    });
+    await harness.prisma.routeStop.update({
+      where: { routeId_sequence: { routeId: IDS.route, sequence: 3 } },
+      data: { travelMinutesToStop: 40 },
+    });
+
+    const dep = new Date(Date.now() + 5 * 60_000);
+    const arr = new Date(dep.getTime() + 100 * 60_000);
+    const { schedule } = await createTestSchedule(harness, schedulesService, {
+      trainNumber: `CUTOFF-C-${Date.now()}`,
+      departureAt: dep,
+      arrivalAt: arr,
+    });
+
+    await tasksService.syncScheduleStatuses();
+
+    const stopTimes = await harness.prisma.tripStopTime.findMany({
+      where: { scheduleId: schedule.id },
+      orderBy: { sequence: "asc" },
+    });
+    const byStation = Object.fromEntries(stopTimes.map((s) => [s.stationId, s.status]));
+    expect(byStation[IDS.stationA]).toBe("CHECKIN_CLOSED");
+    expect(byStation[IDS.stationB]).toBe("OPEN");
+    expect(byStation[IDS.stationC]).toBe("OPEN");
+  });
+
+  it("a stop missing travelMinutesToStop falls back to distance interpolation without failing schedule creation", async () => {
+    await resetAndSeedCore(harness.prisma); // no travelMinutesToStop set on any stop
+
+    const dep = new Date(Date.now() + 60 * 60_000);
+    const arr = new Date(dep.getTime() + 240 * 60_000); // 4h, matches seed-ui's convention
+    const { schedule } = await createTestSchedule(harness, schedulesService, {
+      trainNumber: `CUTOFF-D-${Date.now()}`,
+      departureAt: dep,
+      arrivalAt: arr,
+    });
+
+    const stopTimes = await harness.prisma.tripStopTime.findMany({
+      where: { scheduleId: schedule.id },
+      orderBy: { sequence: "asc" },
+    });
+    const totalDuration = arr.getTime() - dep.getTime();
+    const bProgress = DISTANCE.B / DISTANCE.C;
+    const expectedBArrival = new Date(dep.getTime() + totalDuration * bProgress);
+
+    const bStop = stopTimes.find((s) => s.stationId === IDS.stationB)!;
+    expect(bStop.plannedArrivalAt?.getTime()).toBe(expectedBArrival.getTime());
+  });
+});
diff --git a/apps/edr-passenger-api/test/config-validation.e2e-spec.ts b/apps/edr-passenger-api/test/config-validation.e2e-spec.ts
new file mode 100644
index 000000000..d17f568a1
--- /dev/null
+++ b/apps/edr-passenger-api/test/config-validation.e2e-spec.ts
@@ -0,0 +1,74 @@
+/**
+ * Backoffice config validation suite (matrix Suite H). The global ValidationPipe in src/main.ts:56
+ * enforces exactly these class-validator DTOs, so validating the DTOs directly reproduces what a
+ * raw API call (bypassing the HTML-only frontend checks) would be allowed to submit.
+ *   H1 🔴 CreateFareRuleDto.baseFareMinor accepts NEGATIVE (no @Min) — while the sibling
+ *          CreateSegmentFareDto.baseFareMinor has @Min(0) (inconsistent).
+ *   H2 🔴 CreateSeatClassDto.basePrice accepts negative/zero (no @Min) — drives every distance fare.
+ *   H4 🔴 CreatePromotionDto.percentOff accepts 200 (no @Max(100)) → discount > subtotal.
+ *   H5 🔴 CreatePromotionDto.validUntil is @IsString (not @IsDateString) → accepts non-dates.
+ */
+import "reflect-metadata";
+import { plainToInstance } from "class-transformer";
+import { validate } from "class-validator";
+
+import { CreateFareRuleDto } from "../src/modules/schedules/schedules.dto";
+import { CreateSegmentFareDto } from "../src/modules/segments/segment-fare.dto";
+import { CreateSeatClassDto } from "../src/modules/seat-classes/seat-classes.dto";
+import { CreatePromotionDto } from "../src/modules/promos/promos.dto";
+
+/** Property names that produced a validation error. */
+async function erroredProps(dto: object): Promise<string[]> {
+  const errors = await validate(dto);
+  return errors.map((e) => e.property);
+}
+
+describe("Backoffice config validation (Suite H)", () => {
+  it("H1 🔴 CreateFareRuleDto accepts a NEGATIVE baseFareMinor (no @Min)", async () => {
+    const dto = plainToInstance(CreateFareRuleDto, {
+      seatClassId: "sc-1",
+      baseFareMinor: -100,
+      validFrom: "2026-01-01T00:00:00Z",
+    });
+    expect(await erroredProps(dto)).not.toContain("baseFareMinor");
+  });
+
+  it("H1 contrast: sibling CreateSegmentFareDto REJECTS negative baseFareMinor (@Min(0))", async () => {
+    const dto = plainToInstance(CreateSegmentFareDto, {
+      routeId: "rt-1",
+      originStopSequence: 1,
+      destinationStopSequence: 5,
+      seatClassId: "sc-1",
+      baseFareMinor: -100,
+    });
+    expect(await erroredProps(dto)).toContain("baseFareMinor");
+  });
+
+  it("H2 🔴 CreateSeatClassDto accepts a negative basePrice (no @Min)", async () => {
+    const dto = plainToInstance(CreateSeatClassDto, {
+      coachTypeId: "ct-1",
+      name: "Economy",
+      basePrice: -5000,
+    });
+    expect(await erroredProps(dto)).not.toContain("basePrice");
+  });
+
+  it("H4 🔴 CreatePromotionDto accepts percentOff = 200 (no @Max(100))", async () => {
+    const dto = plainToInstance(CreatePromotionDto, {
+      code: "OVER",
+      title: "Overshoot",
+      percentOff: 200,
+      validUntil: "2026-12-31T23:59:59Z",
+    });
+    expect(await erroredProps(dto)).not.toContain("percentOff");
+  });
+
+  it("H5 🔴 CreatePromotionDto.validUntil accepts a non-date string (@IsString, not @IsDateString)", async () => {
+    const dto = plainToInstance(CreatePromotionDto, {
+      code: "BADDATE",
+      title: "Bad date",
+      validUntil: "not-a-real-date",
+    });
+    expect(await erroredProps(dto)).not.toContain("validUntil");
+  });
+});
diff --git a/apps/edr-passenger-api/test/critical-repro.e2e-spec.ts b/apps/edr-passenger-api/test/critical-repro.e2e-spec.ts
new file mode 100644
index 000000000..83a7d8d6b
--- /dev/null
+++ b/apps/edr-passenger-api/test/critical-repro.e2e-spec.ts
@@ -0,0 +1,275 @@
+/**
+ * Executable reproducers for the highest-severity findings that were previously inspection-only.
+ * All Tier-2 (direct instantiation, real Prisma + stubbed collaborators).
+ *
+ *   C-1 🔴 BookingsService trusts client `reviewedTotalMinor`: a booking is stored with totalMinor=1
+ *          while the server fare engine computed ~30000.
+ *   C-4 🔴 finalizePaymentSuccess confirms a booking without comparing the paid amount: an intent for
+ *          1 minor confirms a 30000 booking.
+ *   C-6 🔴 Concurrent WALLET payments double-spend one balance (no row lock): a wallet funded for one
+ *          ticket pays for two.
+ */
+import { BookingsService } from "../src/modules/bookings/bookings.service";
+import { PaymentsService } from "../src/modules/payments/payments.service";
+import { FareEngineService } from "../src/modules/fare-engine/fare-engine.service";
+import { CurrencyService } from "../src/modules/currency/currency.service";
+import { getTestPrisma, disconnectTestPrisma } from "./setup/prisma";
+import { truncateAllPassenger, seedCore, IDS } from "./fixtures/seed-core";
+
+function asyncStub(): any {
+  return new Proxy({}, { get: () => async () => undefined });
+}
+
+/**
+ * Wraps a PrismaClient so that inside `$transaction(cb)`, every `walletAccount.update` waits until
+ * BOTH concurrent transactions have finished their `walletAccount.findUnique` (balance read). This
+ * deterministically forces the exact interleaving a real multi-request system permits, exposing the
+ * service's unlocked check-then-act (no SELECT … FOR UPDATE). Only scheduling is controlled — the
+ * service's own logic runs unmodified.
+ */
+function makeRaceWrappedPrisma(real: any, parties: number) {
+  let arrived = 0;
+  let release!: () => void;
+  const gate = new Promise<void>((r) => (release = r));
+  const signalRead = () => {
+    if (++arrived >= parties) release();
+  };
+
+  return new Proxy(real, {
+    get(target, prop, receiver) {
+      if (prop === "$transaction") {
+        return (cb: (tx: any) => unknown, opts?: unknown) =>
+          target.$transaction((tx: any) => {
+            const wrappedTx = new Proxy(tx, {
+              get(t, p) {
+                if (p === "walletAccount") {
+                  return {
+                    findUnique: async (args: unknown) => {
+                      const res = await t.walletAccount.findUnique(args);
+                      signalRead();
+                      return res;
+                    },
+                    update: async (args: unknown) => {
+                      await gate; // hold the write until both reads are done
+                      return t.walletAccount.update(args);
+                    },
+                  };
+                }
+                return t[p];
+              },
+            });
+            return cb(wrappedTx);
+          }, opts);
+      }
+      return Reflect.get(target, prop, receiver);
+    },
+  });
+}
+
+let seq = 0;
+async function makeSchedule(prisma: any) {
+  const train = await prisma.train.create({ data: { number: `CR-${++seq}`, name: "T" } });
+  return prisma.trainSchedule.create({
+    data: {
+      trainId: train.id,
+      routeId: IDS.route,
+      originStationId: IDS.stationA,
+      destinationStationId: IDS.stationB,
+      departureAt: new Date(Date.now() + 86_400_000),
+      arrivalAt: new Date(Date.now() + 90_000_000),
+      durationMinutes: 60,
+    },
+  });
+}
+
+describe("Critical reproducers (Tier-2)", () => {
+  const prisma = getTestPrisma();
+
+  beforeEach(async () => {
+    await truncateAllPassenger(prisma);
+    await seedCore(prisma);
+  });
+  afterAll(async () => {
+    await disconnectTestPrisma();
+  });
+
+  // ── C-1 ──────────────────────────────────────────────────────────────────
+  it("C-1 🔴 booking stores client reviewedTotalMinor=1 while the fare engine computed ~30000", async () => {
+    const passenger = await prisma.passenger.create({ data: {} });
+    const schedule = await makeSchedule(prisma);
+    // Stop times so origin/dest resolve on the schedule.
+    await prisma.tripStopTime.createMany({
+      data: [
+        { scheduleId: schedule.id, stationId: IDS.stationA, sequence: 1 },
+        { scheduleId: schedule.id, stationId: IDS.stationB, sequence: 2 },
+      ],
+    });
+    // Coach + seat for the passenger to occupy.
+    const coach = await prisma.coach.create({
+      data: { coachTypeId: IDS.coachType, number: `C-${seq}` },
+    });
+    const seat = await prisma.seat.create({
+      data: { coachId: coach.id, seatNumber: "1A", row: 1, col: "1" },
+    });
+    // A real server fare source (tripId match → highest priority): 30000 minor.
+    await prisma.fareRule.create({
+      data: {
+        tripId: schedule.id,
+        seatClassId: IDS.seatClassLocal,
+        baseFareMinor: 30_000,
+        currency: "ETB",
+        validFrom: new Date("2020-01-01"),
+      },
+    });
+    const hold = await prisma.seatHold.create({
+      data: {
+        scheduleId: schedule.id,
+        seatIds: [seat.id],
+        passengerId: passenger.id,
+        expiresAt: new Date(Date.now() + 3_600_000),
+      },
+    });
+
+    const bookings = new BookingsService(
+      prisma as any,
+      asyncStub(), // dataSource
+      asyncStub(), // seatsService (confirmSeats no-op)
+      { emit: () => true } as any, // eventEmitter
+      asyncStub(), // verifaydaService (PASSPORT path skips it anyway)
+      asyncStub(), // currencyService (ETB path skips it)
+      asyncStub(), // fareEngine (FareRule short-circuits before this)
+      asyncStub(), // auditService
+    );
+
+    const dto = {
+      passengerId: passenger.id,
+      scheduleId: schedule.id,
+      holdId: hold.id,
+      originStationId: IDS.stationA,
+      destinationStationId: IDS.stationB,
+      seatClassId: IDS.seatClassLocal,
+      bookingType: "ONE_WAY",
+      reviewedTotalMinor: 1, // the forged client total
+      passengers: [
+        {
+          seatId: seat.id,
+          passengerName: "Mallory Adult",
+          dateOfBirth: new Date("1990-01-01"),
+          idDocumentType: "PASSPORT",
+          passportNumber: "P123",
+          passportCountry: "ET",
+          nationality: "Ethiopian",
+          // NOTE: no seatFareMinor → not "allFaresProvided" → reviewedTotalMinor is trusted
+        },
+      ],
+    };
+
+    const result: any = await (bookings as any).createOneWayBooking(dto);
+
+    // The server engine computed the real fare…
+    expect(result.fareBreakdown.totalMinor).toBeGreaterThanOrEqual(30_000);
+    // …but the booking was stored at the client's forged 1 minor.
+    expect(result.totalMinor).toBe(1);
+    const stored = await prisma.booking.findUnique({ where: { id: result.id } });
+    expect(stored?.totalMinor).toBe(1);
+  });
+
+  // ── C-4 ──────────────────────────────────────────────────────────────────
+  it("C-4 🔴 finalizePaymentSuccess confirms a 30000 booking from an intent of 1 (no amount check)", async () => {
+    const passenger = await prisma.passenger.create({ data: {} });
+    const schedule = await makeSchedule(prisma);
+    const booking = await prisma.booking.create({
+      data: {
+        bookingRef: "PAY-0001",
+        passengerId: passenger.id,
+        scheduleId: schedule.id,
+        totalMinor: 30_000,
+        status: "PENDING_PAYMENT",
+      },
+    });
+    const intent = await prisma.paymentIntent.create({
+      data: {
+        bookingId: booking.id,
+        amountMinor: 1, // wildly short payment
+        method: "WALLET",
+        status: "PROCESSING",
+      },
+    });
+
+    const payments = new PaymentsService(
+      prisma as any,
+      { confirmSeats: async () => undefined } as any,
+      { generate: async () => undefined } as any, // must not throw (re-thrown otherwise)
+      { emit: () => true } as any,
+      asyncStub(), // paymentClient
+      asyncStub(), // currencyService (not used on this path)
+      asyncStub(), // auditService
+    );
+
+    await payments.finalizePaymentSuccess({ intentId: intent.id });
+
+    const after = await prisma.booking.findUnique({ where: { id: booking.id } });
+    // Confirmed despite intent.amountMinor (1) ≠ booking.totalMinor (30000).
+    expect(after?.status).toBe("CONFIRMED");
+  });
+
+  // ── C-6 ──────────────────────────────────────────────────────────────────
+  it("C-6 🔴 two concurrent WALLET payments double-spend a single-ticket balance", async () => {
+    const passenger = await prisma.passenger.create({ data: {} });
+    const schedule = await makeSchedule(prisma);
+    // Wallet funded for exactly ONE ticket.
+    await prisma.walletAccount.create({
+      data: { passengerId: passenger.id, balanceMinor: 30_000 },
+    });
+    const mkBooking = (ref: string) =>
+      prisma.booking.create({
+        data: {
+          bookingRef: ref,
+          passengerId: passenger.id,
+          scheduleId: schedule.id,
+          totalMinor: 30_000,
+          status: "PENDING_PAYMENT",
+        },
+      });
+    const b1 = await mkBooking("W-0001");
+    const b2 = await mkBooking("W-0002");
+
+    // Race-wrapped prisma forces both balance reads to complete before either debit writes.
+    const racePrisma = makeRaceWrappedPrisma(prisma, 2);
+    const payments = new PaymentsService(
+      racePrisma as any,
+      { confirmSeats: async () => undefined } as any,
+      { generate: async () => undefined } as any,
+      { emit: () => true } as any,
+      asyncStub(),
+      asyncStub(),
+      asyncStub(),
+    );
+
+    const [bk1, bk2] = await Promise.all([
+      prisma.booking.findUnique({ where: { id: b1.id }, include: { seats: true } }),
+      prisma.booking.findUnique({ where: { id: b2.id }, include: { seats: true } }),
+    ]);
+
+    const [r1, r2] = await Promise.allSettled([
+      (payments as any).initiateWalletPayment(bk1),
+      (payments as any).initiateWalletPayment(bk2),
+    ]);
+
+    const succeeded = await prisma.paymentIntent.count({
+      where: { bookingId: { in: [b1.id, b2.id] }, status: { in: ["SUCCEEDED", "PROCESSING"] } },
+    });
+    const debits = await prisma.walletLedgerEntry.count({ where: { type: "DEBIT" } });
+    const wallet = await prisma.walletAccount.findUnique({
+      where: { passengerId: passenger.id },
+    });
+
+    // Double-spend signature: two successful debits from a one-ticket balance, or a negative
+    // balance. A correctly-locked wallet allows exactly one.
+    const totalDebited = debits * 30_000;
+    const doubleSpent =
+      (succeeded === 2 && totalDebited > 30_000) || (wallet?.balanceMinor ?? 0) < 0;
+    expect(doubleSpent).toBe(true);
+    expect([r1.status, r2.status]).toEqual(["fulfilled", "fulfilled"]);
+  });
+});
diff --git a/apps/edr-passenger-api/test/fixtures/seed-core.ts b/apps/edr-passenger-api/test/fixtures/seed-core.ts
new file mode 100644
index 000000000..115df217f
--- /dev/null
+++ b/apps/edr-passenger-api/test/fixtures/seed-core.ts
@@ -0,0 +1,139 @@
+/**
+ * Deterministic core fixtures for the pricing E2E suites.
+ *
+ * The repo's `prisma/seed.ts` is entirely commented out (every step disabled), so the harness
+ * builds its own minimal, fully-controlled graph: coach type → seat classes → stations → route
+ * with distance-bearing stops → FX rates. Fixed UUIDs let specs reference entities directly.
+ *
+ * Uses a bare PrismaClient (not the Nest PrismaService) so it can run in jest globalSetup or
+ * inside a spec without booting the app. Reads DATABASE_URL from process.env (load-env sets it).
+ */
+import { PrismaClient } from "@prisma/client";
+
+export const IDS = {
+  coachType: "00000000-0000-4000-8000-000000000001",
+  seatClassLocal: "00000000-0000-4000-8000-000000000010",
+  seatClassIntl: "00000000-0000-4000-8000-000000000011",
+  stationA: "00000000-0000-4000-8000-000000000020",
+  stationB: "00000000-0000-4000-8000-000000000021",
+  stationC: "00000000-0000-4000-8000-000000000022",
+  route: "00000000-0000-4000-8000-000000000030",
+} as const;
+
+/** Route stop distances (km from origin). A=0, B=100, C=250 → A→B is 100km, A→C is 250km. */
+export const DISTANCE = { A: 0, B: 100, C: 250 } as const;
+
+/**
+ * Optional per-stop check-in-cutoff/travel-time overrides, keyed by station label (A/B/C).
+ * Lets a spec seed a distinct `checkinMinutesBefore` override and/or `travelMinutesToStop`
+ * per stop without changing the zero-arg call sites the other specs rely on.
+ */
+export interface RouteStopOverrides {
+  A?: { checkinMinutesBefore?: number; travelMinutesToStop?: number };
+  B?: { checkinMinutesBefore?: number; travelMinutesToStop?: number };
+  C?: { checkinMinutesBefore?: number; travelMinutesToStop?: number };
+}
+
+/**
+ * FX rate chosen so the seat-class distance formula (which multiplies an ETB/km rate by the
+ * USD→ETB rate — see fare-engine.service.ts:157) yields whole ETB-minor amounts. 100 makes the
+ * major→minor scaling line up; a realistic rate (e.g. 132) would visibly distort domestic fares,
+ * which is itself a finding the suites probe.
+ */
+export const USD_TO_ETB = 100;
+export const ETB_TO_DJF = 1.8;
+
+/** TRUNCATE every table in the `passenger` schema (except Prisma's migration bookkeeping). */
+export async function truncateAllPassenger(prisma: PrismaClient): Promise<void> {
+  const rows = await prisma.$queryRawUnsafe<Array<{ tablename: string }>>(
+    `SELECT tablename FROM pg_tables WHERE schemaname = 'passenger' AND tablename <> '_prisma_migrations'`,
+  );
+  if (rows.length === 0) return;
+  const list = rows.map((r) => `passenger."${r.tablename}"`).join(", ");
+  await prisma.$executeRawUnsafe(
+    `TRUNCATE ${list} RESTART IDENTITY CASCADE`,
+  );
+}
+
+/** Insert the deterministic core graph. Call after truncateAllPassenger. */
+export async function seedCore(prisma: PrismaClient, stopOverrides: RouteStopOverrides = {}): Promise<void> {
+  const past = new Date("2020-01-01T00:00:00.000Z");
+
+  await prisma.coachType.create({
+    data: {
+      id: IDS.coachType,
+      code: "STD",
+      name: "Standard Coach",
+      type: "passenger",
+    },
+  });
+
+  // LOCAL and INTERNATIONAL seat classes share the coach type + bedPosition (null = regular seat),
+  // which is exactly how fare-engine picks the nationality-matched class (findFirst on those keys).
+  await prisma.seatClass.createMany({
+    data: [
+      {
+        id: IDS.seatClassLocal,
+        coachTypeId: IDS.coachType,
+        name: "Local Standard",
+        nationalityType: "LOCAL",
+        bedPosition: null,
+        baseFareMinor: 300, // 3.00 ETB/km
+        premiumMinor: 0,
+        insuranceFeeMinor: 0,
+        isActive: true,
+      },
+      {
+        id: IDS.seatClassIntl,
+        coachTypeId: IDS.coachType,
+        name: "Intl Standard",
+        nationalityType: "INTERNATIONAL",
+        bedPosition: null,
+        baseFareMinor: 500, // 5.00 ETB/km
+        premiumMinor: 0,
+        insuranceFeeMinor: 0,
+        isActive: true,
+      },
+    ],
+  });
+
+  await prisma.station.createMany({
+    data: [
+      { id: IDS.stationA, code: "AAA", name: "Alpha", city: "Alpha City", sequence: 1 },
+      { id: IDS.stationB, code: "BBB", name: "Bravo", city: "Bravo City", sequence: 2 },
+      { id: IDS.stationC, code: "CCC", name: "Charlie", city: "Charlie City", sequence: 3 },
+    ],
+  });
+
+  await prisma.route.create({
+    data: {
+      id: IDS.route,
+      code: "RT-MAIN",
+      name: "Main Line",
+      effectiveFrom: past,
+      active: true,
+      stops: {
+        create: [
+          { stationId: IDS.stationA, sequence: 1, distanceKm: DISTANCE.A, ...stopOverrides.A },
+          { stationId: IDS.stationB, sequence: 2, distanceKm: DISTANCE.B, ...stopOverrides.B },
+          { stationId: IDS.stationC, sequence: 3, distanceKm: DISTANCE.C, ...stopOverrides.C },
+        ],
+      },
+    },
+  });
+
+  await prisma.currencyExchangeRate.createMany({
+    data: [
+      { fromCurrency: "USD", toCurrency: "ETB", rate: USD_TO_ETB, effectiveDate: new Date() },
+      { fromCurrency: "ETB", toCurrency: "USD", rate: 1 / USD_TO_ETB, effectiveDate: new Date() },
+      { fromCurrency: "ETB", toCurrency: "DJF", rate: ETB_TO_DJF, effectiveDate: new Date() },
+      { fromCurrency: "DJF", toCurrency: "ETB", rate: 1 / ETB_TO_DJF, effectiveDate: new Date() },
+    ],
+  });
+}
+
+/** Convenience: reset + seed in one call. */
+export async function resetAndSeedCore(prisma: PrismaClient, stopOverrides: RouteStopOverrides = {}): Promise<void> {
+  await truncateAllPassenger(prisma);
+  await seedCore(prisma, stopOverrides);
+}
diff --git a/apps/edr-passenger-api/test/fixtures/seed-passenger-session.ts b/apps/edr-passenger-api/test/fixtures/seed-passenger-session.ts
new file mode 100644
index 000000000..ed5e9ca36
--- /dev/null
+++ b/apps/edr-passenger-api/test/fixtures/seed-passenger-session.ts
@@ -0,0 +1,89 @@
+/**
+ * Seeds a passenger IAM user + session directly (no OTP flow) and mints an access token the portal
+ * accepts. The API JwtGuard verifies the JWT signature (JWT_ACCESS_TOKEN_SECRET) and looks up the
+ * session by its `id` claim; the portal then calls /auth/profile which needs a Passenger row linked
+ * by iamUserId. Returns { token, profile } for the Playwright passenger storageState.
+ *
+ * Run standalone to validate: `npx ts-node test/fixtures/seed-passenger-session.ts` (prints the
+ * token and the /auth/profile status via the running API on :4000).
+ */
+import { PrismaClient } from "@prisma/client";
+import { SignJWT } from "jose";
+import { UI_IDS } from "./seed-ui";
+
+export const PASSENGER_USER_ID = "11111111-0000-4000-8000-000000000001";
+export const PASSENGER_SESSION_ID = "11111111-0000-4000-8000-000000000002";
+const EMAIL = "test.passenger@edr.local";
+const USERNAME = "test_passenger";
+
+export async function seedPassengerSession(prisma: PrismaClient): Promise<{ token: string }> {
+  const secret = process.env.JWT_ACCESS_TOKEN_SECRET;
+  if (!secret) throw new Error("JWT_ACCESS_TOKEN_SECRET is required to mint the passenger token");
+
+  const userInfo = {
+    id: PASSENGER_USER_ID,
+    name: { en: "Test Passenger" },
+    email: EMAIL,
+    roles: [] as unknown[],
+    status: "accepted",
+    employee: [] as unknown[],
+    userType: "individual",
+    username: USERNAME,
+    permissions: [] as unknown[],
+  };
+  const expiry = new Date(Date.now() + 7 * 86400_000);
+
+  // iam.users (delete-then-insert so re-seeding is idempotent).
+  await prisma.$executeRawUnsafe(`DELETE FROM iam.sessions WHERE id = $1::uuid`, PASSENGER_SESSION_ID);
+  await prisma.$executeRawUnsafe(`DELETE FROM iam.users WHERE id = $1::uuid`, PASSENGER_USER_ID);
+  await prisma.$executeRawUnsafe(
+    `INSERT INTO iam.users (created_at, id, name, username, email, user_type, status, is_active, has_set_password, is_phone_number_verified, verified_by)
+     VALUES (now(), $1::uuid, $2::jsonb, $3, $4, 'individual', 'accepted', true, true, true, 'SYSTEM')`,
+    PASSENGER_USER_ID,
+    JSON.stringify(userInfo.name),
+    USERNAME,
+    EMAIL,
+  );
+  await prisma.$executeRawUnsafe(
+    `INSERT INTO iam.sessions (created_at, id, email, device, "userInfo", expiry_time, refresh_count, status, user_id)
+     VALUES (now(), $1::uuid, $2, 'e2e', $3::jsonb, $4, 0, 'ACTIVE', $5::uuid)`,
+    PASSENGER_SESSION_ID,
+    EMAIL,
+    JSON.stringify(userInfo),
+    expiry,
+    PASSENGER_USER_ID,
+  );
+
+  // Link the seeded Passenger row to this IAM user so /auth/profile resolves.
+  await prisma.passenger.update({
+    where: { id: UI_IDS.passenger },
+    data: { iamUserId: PASSENGER_USER_ID },
+  });
+
+  const token = await new SignJWT({ id: PASSENGER_SESSION_ID })
+    .setProtectedHeader({ alg: "HS256", typ: "JWT" })
+    .setIssuedAt()
+    .setExpirationTime("7d")
+    .sign(new TextEncoder().encode(secret));
+
+  return { token };
+}
+
+if (require.main === module) {
+  (async () => {
+    const prisma = new PrismaClient();
+    try {
+      const { token } = await seedPassengerSession(prisma);
+      const api = process.env.API_URL ?? "http://localhost:4000";
+      const res = await fetch(`${api}/auth/profile`, {
+        headers: { Authorization: `Bearer ${token}` },
+      });
+      // eslint-disable-next-line no-console
+      console.log(`[passenger-session] /auth/profile -> HTTP ${res.status}`);
+      // eslint-disable-next-line no-console
+      console.log((await res.text()).slice(0, 400));
+    } finally {
+      await prisma.$disconnect();
+    }
+  })();
+}
diff --git a/apps/edr-passenger-api/test/fixtures/seed-ui.ts b/apps/edr-passenger-api/test/fixtures/seed-ui.ts
new file mode 100644
index 000000000..96ea79e65
--- /dev/null
+++ b/apps/edr-passenger-api/test/fixtures/seed-ui.ts
@@ -0,0 +1,197 @@
+/**
+ * UI E2E seed — extends seed-core with a BOOKABLE trip + payment methods + promos so the portal
+ * search/booking flow and the backoffice config flow have real data to drive. Runnable standalone
+ * (`ts-node test/fixtures/seed-ui.ts`) or importable (`seedUi(prisma)`) from the Playwright
+ * global-setup. Reads DATABASE_URL from the environment (the UI stack points at the 5544 test DB).
+ *
+ * Searchability: a schedule shows in POST /search when it is SCHEDULED, not package-only, has a
+ * future departure on the searched date, operational coaches with AVAILABLE seats, and a resolvable
+ * fare (seat-class distance formula using the seeded route-stop distances + USD→ETB rate).
+ */
+import { PrismaClient } from "@prisma/client";
+import { IDS, resetAndSeedCore } from "./seed-core";
+
+export const UI_IDS = {
+  train: "00000000-0000-4000-8000-000000000100",
+  schedule: "00000000-0000-4000-8000-000000000101",
+  coach: "00000000-0000-4000-8000-000000000102",
+  // Passenger.id is set EQUAL to the IAM user id. The bookings controller overrides passengerId
+  // with the JWT user id (req.user.id), and the service only resolves iamUserId→passenger when it
+  // is NON-UUID — since IAM ids are UUIDs, it uses the id directly, so Passenger.id must equal it.
+  passenger: "11111111-0000-4000-8000-000000000001",
+  promoValid: "PROMO10",
+  promoExpired: "EXPIRED50",
+  // Return leg C→A on the same calendar date, for ROUND_TRIP scenarios (UA-6). The route stops are
+  // symmetric in distance (A=0, C=250) so the reverse leg prices identically to the outbound.
+  returnSchedule: "00000000-0000-4000-8000-000000000201",
+  returnCoach: "00000000-0000-4000-8000-000000000202",
+} as const;
+
+/** Days-from-now the sample trip departs (tests search on this calendar date, Addis TZ). */
+export const DEPART_IN_DAYS = 2;
+
+export function sampleDepartAt(): Date {
+  const d = new Date();
+  d.setUTCDate(d.getUTCDate() + DEPART_IN_DAYS);
+  d.setUTCHours(6, 0, 0, 0); // 06:00Z ~ 09:00 Addis — safely same calendar day either TZ
+  return d;
+}
+
+/** The date string a test passes to POST /search for the sample trip (YYYY-MM-DD). */
+export function sampleDepartDate(): string {
+  return sampleDepartAt().toISOString().slice(0, 10);
+}
+
+export async function seedUi(prisma: PrismaClient): Promise<void> {
+  await resetAndSeedCore(prisma);
+
+  // Give the two seed-core seat classes the exact names the portal review flow maps by.
+  await prisma.seatClass.update({
+    where: { id: IDS.seatClassLocal },
+    data: { name: "Economy Regular" },
+  });
+  await prisma.seatClass.update({
+    where: { id: IDS.seatClassIntl },
+    data: { name: "Economy Regular Intl" },
+  });
+
+  // Enabled payment methods — the portal pay page renders ONLY enabled PaymentMethod rows.
+  await prisma.paymentMethod.createMany({
+    data: [
+      { type: "WALLET", displayName: "Wallet", currency: "ETB", enabled: true, isDefault: true, sortOrder: 0 },
+      { type: "TELEBIRR", displayName: "telebirr", currency: "ETB", enabled: true, sortOrder: 1 },
+    ],
+  });
+
+  const departAt = sampleDepartAt();
+  const arriveAt = new Date(departAt.getTime() + 4 * 3600_000);
+
+  await prisma.train.create({
+    data: { id: UI_IDS.train, number: "UI-100", name: "UI Test Express" },
+  });
+
+  await prisma.trainSchedule.create({
+    data: {
+      id: UI_IDS.schedule,
+      trainId: UI_IDS.train,
+      routeId: IDS.route,
+      originStationId: IDS.stationA,
+      destinationStationId: IDS.stationC,
+      departureAt: departAt,
+      arrivalAt: arriveAt,
+      durationMinutes: 240,
+      status: "SCHEDULED",
+      stopsCount: 3,
+      isPackageOnly: false,
+    },
+  });
+
+  await prisma.tripStopTime.createMany({
+    data: [
+      { scheduleId: UI_IDS.schedule, stationId: IDS.stationA, sequence: 1, plannedDepartureAt: departAt, status: "OPEN" },
+      { scheduleId: UI_IDS.schedule, stationId: IDS.stationB, sequence: 2, plannedDepartureAt: new Date(departAt.getTime() + 2 * 3600_000), status: "OPEN" },
+      { scheduleId: UI_IDS.schedule, stationId: IDS.stationC, sequence: 3, plannedArrivalAt: arriveAt, status: "OPEN" },
+    ],
+  });
+
+  // Enough seats that a full suite run (many bookings share one seeded DB, seats are not released
+  // between specs) never exhausts availability: 12 rows × 4 cols = 48 seats.
+  const SEAT_ROWS = 12;
+  await prisma.coach.create({
+    data: { id: UI_IDS.coach, coachTypeId: IDS.coachType, number: "UI-C1", capacity: SEAT_ROWS * 4, sequence: 1, status: "ACTIVE" },
+  });
+  await prisma.coachAssignment.create({
+    data: { scheduleId: UI_IDS.schedule, coachId: UI_IDS.coach, positionNumber: 1, isOperational: true },
+  });
+  await prisma.seat.createMany({ data: buildSeats(UI_IDS.coach, SEAT_ROWS) });
+
+  // Logged-in passenger with a funded wallet + loyalty (used by the portal storageState + WALLET pay).
+  await prisma.passenger.create({ data: { id: UI_IDS.passenger } });
+  await prisma.walletAccount.create({
+    data: { passengerId: UI_IDS.passenger, balanceMinor: 100_000_000 },
+  });
+  await prisma.loyaltyAccount.create({
+    data: { passengerId: UI_IDS.passenger, pointsBalance: 500 },
+  });
+
+  // Promotions (schema field names, NOT the backoffice UI names). Unique exact codes.
+  await prisma.promotion.createMany({
+    data: [
+      { title: "10% off", code: UI_IDS.promoValid, percentOff: 10, validUntil: new Date(Date.now() + 30 * 86400_000), active: true },
+      { title: "Expired", code: UI_IDS.promoExpired, percentOff: 50, validUntil: new Date(Date.now() - 86400_000), active: true },
+    ],
+  });
+
+  // One baggage allowance (for excess-baggage flows later).
+  await prisma.baggageAllowance.create({
+    data: { seatClassId: IDS.seatClassLocal, maxWeightKg: 20, maxPiecesCount: 2, excessFeePerKg: 50 },
+  });
+
+  // ── Return leg (C→A) for ROUND_TRIP (UA-6) ──────────────────────────────────
+  // Same train, same day, departs after the outbound arrives. Distances are symmetric
+  // (A=0km … C=250km) so the reverse leg prices the same as the outbound.
+  const returnDepart = new Date(departAt.getTime() + 8 * 3600_000); // 8h after outbound departs
+  const returnArrive = new Date(returnDepart.getTime() + 4 * 3600_000);
+  await prisma.trainSchedule.create({
+    data: {
+      id: UI_IDS.returnSchedule,
+      trainId: UI_IDS.train,
+      routeId: IDS.route,
+      originStationId: IDS.stationC,
+      destinationStationId: IDS.stationA,
+      departureAt: returnDepart,
+      arrivalAt: returnArrive,
+      durationMinutes: 240,
+      status: "SCHEDULED",
+      stopsCount: 3,
+      isPackageOnly: false,
+    },
+  });
+  await prisma.tripStopTime.createMany({
+    data: [
+      { scheduleId: UI_IDS.returnSchedule, stationId: IDS.stationC, sequence: 1, plannedDepartureAt: returnDepart, status: "OPEN" },
+      { scheduleId: UI_IDS.returnSchedule, stationId: IDS.stationB, sequence: 2, plannedDepartureAt: new Date(returnDepart.getTime() + 2 * 3600_000), status: "OPEN" },
+      { scheduleId: UI_IDS.returnSchedule, stationId: IDS.stationA, sequence: 3, plannedArrivalAt: returnArrive, status: "OPEN" },
+    ],
+  });
+  await prisma.coach.create({
+    data: { id: UI_IDS.returnCoach, coachTypeId: IDS.coachType, number: "UI-C2", capacity: 48, sequence: 1, status: "ACTIVE" },
+  });
+  await prisma.coachAssignment.create({
+    data: { scheduleId: UI_IDS.returnSchedule, coachId: UI_IDS.returnCoach, positionNumber: 1, isOperational: true },
+  });
+  await prisma.seat.createMany({ data: buildSeats(UI_IDS.returnCoach, 12) });
+}
+
+/** Build `rows × 4` seats (cols A–D) for a coach. */
+function buildSeats(coachId: string, rows: number) {
+  const cols = ["A", "B", "C", "D"];
+  const seats: Array<{ coachId: string; seatNumber: string; row: number; col: string; isWindow: boolean; isAisle: boolean }> = [];
+  for (let row = 1; row <= rows; row++) {
+    for (const col of cols) {
+      seats.push({
+        coachId,
+        seatNumber: `${row}${col}`,
+        row,
+        col,
+        isWindow: col === "A" || col === "D",
+        isAisle: col === "B" || col === "C",
+      });
+    }
+  }
+  return seats;
+}
+
+// Standalone runner
+if (require.main === module) {
+  (async () => {
+    const prisma = new PrismaClient();
+    try {
+      await seedUi(prisma);
+      // eslint-disable-next-line no-console
+      console.log(`[seed-ui] done. Sample trip ${IDS.stationA}→${IDS.stationC} on ${sampleDepartDate()} (schedule ${UI_IDS.schedule}).`);
+    } finally {
+      await prisma.$disconnect();
+    }
+  })();
+}
diff --git a/apps/edr-passenger-api/test/jest-e2e.json b/apps/edr-passenger-api/test/jest-e2e.json
index 0f4a0d400..8817895fc 100644
--- a/apps/edr-passenger-api/test/jest-e2e.json
+++ b/apps/edr-passenger-api/test/jest-e2e.json
@@ -2,6 +2,34 @@
   "moduleFileExtensions": ["js", "json", "ts"],
   "rootDir": ".",
   "testRegex": ".e2e-spec.ts$",
-  "transform": { "^.+\\.(t|j)s$": "ts-jest" },
-  "testEnvironment": "node"
+  "testPathIgnorePatterns": [
+    "/node_modules/",
+    "test/app.e2e-spec.ts"
+  ],
+  "transform": {
+    "^.+\\.(t|j)s$": ["ts-jest", { "isolatedModules": true }]
+  },
+  "testEnvironment": "node",
+  "setupFiles": ["<rootDir>/setup/load-env.ts"],
+  "moduleNameMapper": {
+    "^file-type$": "<rootDir>/setup/stubs/file-type.ts",
+    "^@edr/types$": "<rootDir>/../../../packages/types/src/index.ts",
+    "^@edr/types/(.*)$": "<rootDir>/../../../packages/types/src/$1",
+    "^@/(.*)$": "<rootDir>/../src/$1"
+  },
+  "testTimeout": 60000,
+  "maxWorkers": 1,
+  "reporters": [
+    "default",
+    [
+      "jest-html-reporters",
+      {
+        "publicPath": "<rootDir>/../e2e-report",
+        "filename": "index.html",
+        "pageTitle": "EDR Passenger — Pricing/Config E2E Results",
+        "expand": true,
+        "hideIcon": false
+      }
+    ]
+  ]
 }
diff --git a/apps/edr-passenger-api/test/money-integrity.e2e-spec.ts b/apps/edr-passenger-api/test/money-integrity.e2e-spec.ts
new file mode 100644
index 000000000..02ca87863
--- /dev/null
+++ b/apps/edr-passenger-api/test/money-integrity.e2e-spec.ts
@@ -0,0 +1,175 @@
+/**
+ * Tier-2 money-integrity suite — services behind the IAM/RabbitMQ wall, instantiated directly with
+ * a real Prisma (test DB) + stubbed collaborators. Confirms critical findings:
+ *   F1/F2 🔴 WalletService.topUp credits any passenger's wallet with no ownership check and no
+ *            payment backing (free money).
+ *   G4/G5 🔴 BookingsService.cancel computes an 80% refund but NEVER disburses it — no PaymentRefund,
+ *            no wallet credit; the cancellation sits at refundStatus PENDING forever.
+ *   E1/E2 🔴 ExcessBaggageService.logCharge picks the OLDEST BaggageAllowance globally, ignoring the
+ *            booking's seat class, and computes fee = feePerKgMinor × excessWeightKg.
+ */
+import { WalletService } from "../src/modules/wallet/wallet.service";
+import { BookingsService } from "../src/modules/bookings/bookings.service";
+import { ExcessBaggageService } from "../src/modules/excess-baggage/excess-baggage.service";
+import { getTestPrisma, disconnectTestPrisma } from "./setup/prisma";
+import { truncateAllPassenger, seedCore, IDS } from "./fixtures/seed-core";
+
+/** A Proxy whose every property is an async no-op — satisfies unused collaborator method calls. */
+function asyncStub(): any {
+  return new Proxy(
+    {},
+    { get: () => async () => undefined },
+  );
+}
+
+describe("Money integrity (Tier-2 direct instantiation)", () => {
+  const prisma = getTestPrisma();
+
+  beforeEach(async () => {
+    await truncateAllPassenger(prisma);
+    await seedCore(prisma);
+  });
+
+  afterAll(async () => {
+    await disconnectTestPrisma();
+  });
+
+  // ── F1 / F2 ────────────────────────────────────────────────────────────────
+  it("F1/F2 🔴 topUp credits another passenger's wallet — no ownership check, no payment backing", async () => {
+    const victim = await prisma.passenger.create({ data: {} });
+    await prisma.walletAccount.create({
+      data: { passengerId: victim.id, balanceMinor: 0 },
+    });
+
+    const wallet = new WalletService(prisma as any);
+
+    // An attacker-controlled call: just pass the victim's id. Nothing checks caller identity,
+    // and no PaymentIntent/settlement backs the credit.
+    await wallet.topUp(victim.id, 1_000_000, "free money");
+
+    const after = await prisma.walletAccount.findUnique({
+      where: { passengerId: victim.id },
+    });
+    expect(after?.balanceMinor).toBe(1_000_000);
+
+    // The only ledger entry is a bare CREDIT — no linked payment.
+    const ledger = await prisma.walletLedgerEntry.findMany({
+      where: { walletId: after!.id },
+    });
+    expect(ledger).toHaveLength(1);
+    expect(ledger[0].type).toBe("CREDIT");
+    expect(ledger[0].relatedBookingId ?? null).toBeNull();
+  });
+
+  // ── G4 / G5 ────────────────────────────────────────────────────────────────
+  it("G4/G5 🔴 cancel() computes floor(total*0.8) refund but never disburses it (stuck PENDING)", async () => {
+    const passenger = await prisma.passenger.create({ data: {} });
+    // Give the passenger a wallet so we can prove NO refund lands in it.
+    const w = await prisma.walletAccount.create({
+      data: { passengerId: passenger.id, balanceMinor: 0 },
+    });
+    const schedule = await makeSchedule(prisma, passenger.id);
+
+    const booking = await prisma.booking.create({
+      data: {
+        bookingRef: "CXL-0001",
+        passengerId: passenger.id,
+        scheduleId: schedule.id,
+        totalMinor: 30_000,
+        displayCurrency: "ETB",
+        status: "CONFIRMED",
+      },
+    });
+
+    const bookings = new BookingsService(
+      prisma as any,
+      asyncStub(), // dataSource
+      asyncStub(), // seatsService
+      { emit: () => true } as any, // eventEmitter
+      asyncStub(), // verifaydaService
+      asyncStub(), // currencyService
+      asyncStub(), // fareEngine
+      asyncStub(), // auditService
+    );
+
+    const result: any = await bookings.cancel(booking.bookingRef, "test");
+
+    // Refund is COMPUTED as 80%:
+    expect(result.refundAmount).toBe(Math.floor(30_000 * 0.8) / 100); // 240.00
+
+    // …but recorded only as PENDING, and never actually paid out:
+    const cancellation = await prisma.bookingCancellation.findFirst({
+      where: { bookingId: booking.id },
+    });
+    expect(cancellation?.refundStatus).toBe("PENDING");
+
+    // No PaymentRefund row was created anywhere (isolated DB) and the wallet was NOT credited.
+    const refundCount = await prisma.paymentRefund.count();
+    expect(refundCount).toBe(0);
+    const walletAfter = await prisma.walletAccount.findUnique({ where: { id: w.id } });
+    expect(walletAfter?.balanceMinor).toBe(0);
+  });
+
+  // ── E1 / E2 ────────────────────────────────────────────────────────────────
+  it("E1/E2 🔴 excess-baggage uses the OLDEST allowance globally (ignores seat class); fee = rate×kg", async () => {
+    const passenger = await prisma.passenger.create({ data: {} });
+    const schedule = await makeSchedule(prisma, passenger.id);
+    const booking = await prisma.booking.create({
+      data: {
+        bookingRef: "BAG-0001",
+        passengerId: passenger.id,
+        scheduleId: schedule.id,
+        totalMinor: 30_000,
+        status: "CONFIRMED",
+      },
+    });
+
+    // Oldest allowance is for the LOCAL class (rate 50). A later one for INTL (rate 200) should win
+    // for an intl booking — but logCharge ignores seat class and takes the oldest row.
+    await prisma.baggageAllowance.create({
+      data: { seatClassId: IDS.seatClassLocal, maxWeightKg: 20, maxPiecesCount: 2, excessFeePerKg: 50 },
+    });
+    await prisma.baggageAllowance.create({
+      data: { seatClassId: IDS.seatClassIntl, maxWeightKg: 20, maxPiecesCount: 2, excessFeePerKg: 200 },
+    });
+
+    const service = new ExcessBaggageService(
+      prisma as any,
+      asyncStub(), // auditService
+      asyncStub(), // paymentClient
+      asyncStub(), // notifications
+      asyncStub(), // smsClient
+      asyncStub(), // emailClient
+    );
+
+    const charge: any = await service.logCharge({
+      bookingId: booking.id,
+      excessWeightKg: 10,
+      collectCash: true,
+    } as any);
+
+    // Used the oldest (LOCAL, 50) not any seat-class-matched rate; fee = 50 × 10.
+    expect(charge.feePerKgMinor).toBe(50);
+    expect(charge.totalMinor).toBe(50 * 10);
+  });
+});
+
+let trainSeq = 0;
+
+/** Minimal TrainSchedule (+train) so booking/cancel fixtures satisfy FKs. */
+async function makeSchedule(prisma: any, _passengerId: string) {
+  const train = await prisma.train.create({
+    data: { number: `T-${++trainSeq}`, name: "Test Train" },
+  });
+  return prisma.trainSchedule.create({
+    data: {
+      trainId: train.id,
+      routeId: IDS.route,
+      originStationId: IDS.stationA,
+      destinationStationId: IDS.stationB,
+      departureAt: new Date(Date.now() + 86_400_000),
+      arrivalAt: new Date(Date.now() + 90_000_000),
+      durationMinutes: 60,
+    },
+  });
+}
diff --git a/apps/edr-passenger-api/test/pricing-currency.e2e-spec.ts b/apps/edr-passenger-api/test/pricing-currency.e2e-spec.ts
new file mode 100644
index 000000000..2490366b8
--- /dev/null
+++ b/apps/edr-passenger-api/test/pricing-currency.e2e-spec.ts
@@ -0,0 +1,81 @@
+/**
+ * Currency / FX suite (matrix Suite C). Exercises CurrencyService directly.
+ *   C2 🔴 missing rate: getExchangeRate() silently returns 1.0 while getRateOrThrow() throws —
+ *         the display path degrades but the charge path errors on the SAME condition (divergence).
+ *   C3 🔴 a future-dated rate is applied immediately (no `effectiveDate <= now` filter).
+ *   C5 🔴 conversion routines disagree on units: displayMinorToChargeMajor / convertMinorToChargeMajor
+ *         return MAJOR units, convertEtbMinorToChargeMinor returns MINOR — a 100x unit landmine both
+ *         written into fields named `amountMinor` at their call sites.
+ */
+import { CurrencyService } from "../src/modules/currency/currency.service";
+import { createServiceHarness, ServiceHarness } from "./setup/slim-app";
+import { resetAndSeedCore, USD_TO_ETB } from "./fixtures/seed-core";
+
+describe("Pricing — CurrencyService (Suite C)", () => {
+  let harness: ServiceHarness;
+  let currency: CurrencyService;
+
+  beforeAll(async () => {
+    harness = await createServiceHarness();
+    currency = harness.moduleRef.get(CurrencyService);
+  });
+  afterAll(async () => {
+    await harness?.close();
+  });
+  beforeEach(async () => {
+    await resetAndSeedCore(harness.prisma);
+  });
+
+  it("C2 🔴 same DB state, 100x divergence: getExchangeRate → 1.0, getRateOrThrow → 100 (via inverse)", async () => {
+    // Remove only the DIRECT USD→ETB row; the inverse ETB→USD (0.01) from the fixture stays.
+    await harness.prisma.currencyExchangeRate.deleteMany({
+      where: { fromCurrency: "USD", toCurrency: "ETB" },
+    });
+
+    // Display/fare path (getExchangeRate) has NO inverse fallback → silently returns 1.0 (wrong).
+    await expect(currency.getExchangeRate("USD" as any, "ETB" as any)).resolves.toBe(1.0);
+
+    // Charge path (getRateOrThrow) DOES fall back to the inverse → 1 / 0.01 = 100 (correct).
+    await expect(
+      currency.getRateOrThrow("USD" as any, "ETB" as any),
+    ).resolves.toBe(USD_TO_ETB);
+    // → the display fare and the charged amount for the same trip differ by 100x.
+  });
+
+  it("C2b 🔴 truly-missing pair: getExchangeRate → 1.0 (silent), getRateOrThrow → throws", async () => {
+    await harness.prisma.currencyExchangeRate.deleteMany({
+      where: {
+        OR: [
+          { fromCurrency: "USD", toCurrency: "ETB" },
+          { fromCurrency: "ETB", toCurrency: "USD" },
+        ],
+      },
+    });
+    await expect(currency.getExchangeRate("USD" as any, "ETB" as any)).resolves.toBe(1.0);
+    await expect(
+      currency.getRateOrThrow("USD" as any, "ETB" as any),
+    ).rejects.toThrow(/No exchange rate/i);
+  });
+
+  it("C3 🔴 a future-dated rate is used right now (no effective-date gate)", async () => {
+    const future = new Date(Date.now() + 365 * 24 * 3600 * 1000);
+    await harness.prisma.currencyExchangeRate.create({
+      data: { fromCurrency: "ETB", toCurrency: "USD", rate: 999, effectiveDate: future },
+    });
+
+    // Correct behavior: ignore not-yet-effective rates. Actual: latest-by-date wins immediately.
+    const rate = await currency.getExchangeRate("ETB" as any, "USD" as any);
+    expect(rate).toBe(999);
+  });
+
+  it("C5 🔴 conversion routines return different UNITS for the same money (100x apart)", async () => {
+    // 100000 ETB minor = 1000.00 ETB. With ETB→USD = 1/100:
+    const asMajor = await currency.convertMinorToChargeMajor(100000, "ETB", "USD"); // → 10.00 (major)
+    const asMinor = await currency.convertEtbMinorToChargeMinor(100000, "USD"); // → 1000 (minor)
+
+    expect(asMajor).toBeCloseTo(1000 / USD_TO_ETB, 2); // 10.00
+    expect(asMinor).toBe(Math.round((100000 * 1) / USD_TO_ETB)); // 1000
+    // Same amount, but the two results differ by 100x — and both feed fields named `amountMinor`.
+    expect(asMinor).toBe(asMajor * 100);
+  });
+});
diff --git a/apps/edr-passenger-api/test/pricing-fare-engine.e2e-spec.ts b/apps/edr-passenger-api/test/pricing-fare-engine.e2e-spec.ts
new file mode 100644
index 000000000..c519d3856
--- /dev/null
+++ b/apps/edr-passenger-api/test/pricing-fare-engine.e2e-spec.ts
@@ -0,0 +1,131 @@
+/**
+ * Reference pricing suite — proves the slim harness boots and exercises FareEngineService directly.
+ * Also confirms two matrix findings against the running engine:
+ *   D1 — a promo with percentOff > 100 drives the total NEGATIVE (no clamp at 0).
+ *   C1 — a missing USD→ETB FX rate is silently substituted with 1.0 (fares collapse ~100x).
+ */
+import { FareEngineService } from "../src/modules/fare-engine/fare-engine.service";
+import {
+  createServiceHarness,
+  ServiceHarness,
+} from "./setup/slim-app";
+import {
+  IDS,
+  resetAndSeedCore,
+  DISTANCE,
+  USD_TO_ETB,
+} from "./fixtures/seed-core";
+
+describe("Pricing — FareEngineService (slim harness)", () => {
+  let harness: ServiceHarness;
+  let fareEngine: FareEngineService;
+
+  beforeAll(async () => {
+    harness = await createServiceHarness();
+    fareEngine = harness.moduleRef.get(FareEngineService);
+  });
+
+  afterAll(async () => {
+    await harness?.close();
+  });
+
+  beforeEach(async () => {
+    await resetAndSeedCore(harness.prisma);
+  });
+
+  // nationality 'Ethiopian' → LOCAL seat class (3.00 ETB/km) and ETB billing (rate 1).
+  const baseDto = () => ({
+    routeId: IDS.route,
+    originStationId: IDS.stationA,
+    destinationStationId: IDS.stationB,
+    seatClassId: IDS.seatClassLocal,
+    nationality: "Ethiopian",
+    adultCount: 1,
+    childCount: 0,
+  });
+
+  it("boots and computes a positive baseline fare (A→B, local, 1 adult)", async () => {
+    const result = await fareEngine.calculate(baseDto() as any);
+    // 100km × 3.00 ETB/km × 1 × USD_TO_ETB(100) = 30000 minor (see seat-class formula).
+    expect(result.totalMinor).toBeGreaterThan(0);
+    expect(result.totalMinor).toBe(DISTANCE.B * 3 * USD_TO_ETB);
+  });
+
+  it("D1 🔴 promo percentOff=150 produces a NEGATIVE total (no floor at 0)", async () => {
+    await harness.prisma.promotion.create({
+      data: {
+        title: "Overshoot",
+        code: "OVER150",
+        percentOff: 150,
+        validUntil: new Date(Date.now() + 86_400_000),
+        active: true,
+      },
+    });
+
+    const result = await fareEngine.calculate({
+      ...baseDto(),
+      promoCode: "OVER150",
+    } as any);
+
+    // Expected (correct) behavior: total clamped at >= 0. Actual: negative.
+    expect(result.totalMinor).toBeLessThan(0);
+  });
+
+  it("D2 🔴 fixed amountOffMinor larger than subtotal drives total NEGATIVE", async () => {
+    const base = await fareEngine.calculate(baseDto() as any); // 30000 minor
+    await harness.prisma.promotion.create({
+      data: {
+        title: "Huge fixed",
+        code: "FIXEDBIG",
+        amountOffMinor: base.totalMinor + 10_000,
+        validUntil: new Date(Date.now() + 86_400_000),
+        active: true,
+      },
+    });
+
+    const result = await fareEngine.calculate({
+      ...baseDto(),
+      promoCode: "FIXEDBIG",
+    } as any);
+    expect(result.totalMinor).toBeLessThan(0);
+  });
+
+  it("D4 🔴 promo with percentOff=0 is treated as FIXED (0 is falsy) and applies amountOffMinor", async () => {
+    // A promo intended as '0% off' but also carrying a stray fixed amount: the falsy check
+    // `promo.percentOff ? percent : amountOffMinor` wrongly applies the fixed discount.
+    await harness.prisma.promotion.create({
+      data: {
+        title: "Zero percent",
+        code: "ZERO0",
+        percentOff: 0,
+        amountOffMinor: 5000,
+        validUntil: new Date(Date.now() + 86_400_000),
+        active: true,
+      },
+    });
+
+    const base = await fareEngine.calculate(baseDto() as any);
+    const withPromo = await fareEngine.calculate({
+      ...baseDto(),
+      promoCode: "ZERO0",
+    } as any);
+
+    // A true 0% promo should not change the price; here it deducts the fixed 5000.
+    expect(withPromo.totalMinor).toBe(base.totalMinor - 5000);
+  });
+
+  it("C1 🔴 missing USD→ETB rate silently falls back to 1.0 (fare collapses ~100x)", async () => {
+    const withRate = await fareEngine.calculate(baseDto() as any);
+
+    // Remove the USD→ETB rate the seat-class formula multiplies by.
+    await harness.prisma.currencyExchangeRate.deleteMany({
+      where: { fromCurrency: "USD", toCurrency: "ETB" },
+    });
+
+    const withoutRate = await fareEngine.calculate(baseDto() as any);
+
+    // Correct behavior would be to reject/flag; instead the fare silently drops by the rate factor.
+    expect(withoutRate.totalMinor).toBe(withRate.totalMinor / USD_TO_ETB);
+    expect(withoutRate.totalMinor).toBeLessThan(withRate.totalMinor);
+  });
+});
diff --git a/apps/edr-passenger-api/test/setup/load-env.ts b/apps/edr-passenger-api/test/setup/load-env.ts
new file mode 100644
index 000000000..7b67969cd
--- /dev/null
+++ b/apps/edr-passenger-api/test/setup/load-env.ts
@@ -0,0 +1,39 @@
+/**
+ * Loads apps/edr-passenger-api/.env.test into process.env BEFORE the Nest AppModule boots.
+ * Registered as a jest `setupFile` (runs per test file, before the framework and before any
+ * `Test.createTestingModule`). Zero-dependency KEY=VALUE parser — dotenv is not a direct dep here.
+ * Existing process.env values win (so CI can override the DB URL without editing the file).
+ */
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+
+// Prefer a local (gitignored) .env.test; fall back to the tracked .env.test.example so a fresh
+// checkout of the branch runs the suites without a manual copy step.
+const localPath = join(__dirname, "..", "..", ".env.test");
+const examplePath = join(__dirname, "..", "..", ".env.test.example");
+const envPath = existsSync(localPath) ? localPath : examplePath;
+
+try {
+  const raw = readFileSync(envPath, "utf8");
+  for (const line of raw.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const eq = trimmed.indexOf("=");
+    if (eq === -1) continue;
+    const key = trimmed.slice(0, eq).trim();
+    let value = trimmed.slice(eq + 1).trim();
+    // strip surrounding quotes if present
+    if (
+      (value.startsWith('"') && value.endsWith('"')) ||
+      (value.startsWith("'") && value.endsWith("'"))
+    ) {
+      value = value.slice(1, -1);
+    }
+    if (process.env[key] === undefined) process.env[key] = value;
+  }
+} catch (err) {
+  // Surface loudly — a missing .env.test means every suite would boot against the wrong DB.
+  throw new Error(
+    `[load-env] could not read ${envPath}: ${(err as Error).message}`,
+  );
+}
diff --git a/apps/edr-passenger-api/test/setup/prisma.ts b/apps/edr-passenger-api/test/setup/prisma.ts
new file mode 100644
index 000000000..484b9e43d
--- /dev/null
+++ b/apps/edr-passenger-api/test/setup/prisma.ts
@@ -0,0 +1,26 @@
+/**
+ * Singleton PrismaClient against the hermetic test DB (DATABASE_URL from .env.test, loaded by
+ * setup/load-env.ts). Used by:
+ *   - the fixture seeder (fixtures/seed-core.ts), and
+ *   - "direct-instantiation" specs for services behind the IAM/RabbitMQ wall (BookingsService,
+ *     PaymentsService, WalletService, …) which cannot be booted through their Nest modules because
+ *     those transitively import the @tria-plc IAM stack (ESM-only `file-type`) / golevelup RabbitMQ.
+ *     Those specs `new TheService(prisma, ...mockedCollaborators)` and assert the money logic.
+ */
+import { PrismaClient } from "@prisma/client";
+
+let client: PrismaClient | undefined;
+
+export function getTestPrisma(): PrismaClient {
+  if (!client) {
+    client = new PrismaClient();
+  }
+  return client;
+}
+
+export async function disconnectTestPrisma(): Promise<void> {
+  if (client) {
+    await client.$disconnect();
+    client = undefined;
+  }
+}
diff --git a/apps/edr-passenger-api/test/setup/slim-app.ts b/apps/edr-passenger-api/test/setup/slim-app.ts
new file mode 100644
index 000000000..c497619b8
--- /dev/null
+++ b/apps/edr-passenger-api/test/setup/slim-app.ts
@@ -0,0 +1,145 @@
+/**
+ * Slim Nest test harness — boots ONLY the passenger domain modules needed for pricing/booking
+ * tests, deliberately excluding the IAM (TriaIamModule), SharedAuth, and MinIO stack from
+ * app.module.ts. Those drag in `@tria-plc/api-common`'s file-crud/minio chain which requires the
+ * ESM-only `file-type` package that jest's CommonJS resolver cannot load.
+ *
+ * Two entry points:
+ *   - createServiceHarness(): resolve services directly (FareEngineService, etc.) for unit/DB-level
+ *     assertions on the money math.
+ *   - createHttpHarness(): a full Nest HTTP app with the SAME global ValidationPipe as main.ts, so
+ *     controller/DTO/pipe behavior (client-trust, DTO validation) is exercised end-to-end over HTTP.
+ *
+ * The IAM JwtGuard is overridden with an always-allow stub so protected routes are reachable; auth
+ * *enforcement* findings (which guards are missing) are asserted separately via route metadata, not
+ * by booting the real guard.
+ */
+import { Global, INestApplication, Module, ValidationPipe } from "@nestjs/common";
+import { Test, TestingModule } from "@nestjs/testing";
+import { ConfigModule } from "@nestjs/config";
+import { EventEmitterModule } from "@nestjs/event-emitter";
+import { ScheduleModule } from "@nestjs/schedule";
+import { getDataSourceToken } from "@nestjs/typeorm";
+import { PrismaClient } from "@prisma/client";
+
+import { PrismaModule } from "../../src/common/prisma.module";
+import { PrismaService } from "../../src/common/prisma.service";
+import { SessionActivityInterceptor } from "../../src/common/interceptors/session-activity.interceptor";
+import { FareEngineModule } from "../../src/modules/fare-engine/fare-engine.module";
+import { CurrencyModule } from "../../src/modules/currency/currency.module";
+import { CurrenciesModule } from "../../src/modules/currencies/currencies.module";
+import { PromosModule } from "../../src/modules/promos/promos.module";
+import { SeatClassesModule } from "../../src/modules/seat-classes/seat-classes.module";
+import { StationsModule } from "../../src/modules/stations/stations.module";
+import { SchedulesModule } from "../../src/modules/schedules/schedules.module";
+import { SegmentsModule } from "../../src/modules/segments/segments.module";
+import { SystemConfigModule } from "../../src/modules/system-config/system-config.module";
+
+/**
+ * A stub TypeORM DataSource, provided globally so IAM-derived providers that reach the slim
+ * harness transitively (e.g. NotificationsService via ExcessBaggageModule) can instantiate.
+ * Pricing tests never trigger the code paths that actually use it.
+ */
+const fakeDataSource = {
+  query: async () => [],
+  transaction: async (cb: (m: unknown) => unknown) => cb({}),
+  getRepository: () => ({}),
+  createQueryRunner: () => ({
+    connect: async () => undefined,
+    startTransaction: async () => undefined,
+    commitTransaction: async () => undefined,
+    rollbackTransaction: async () => undefined,
+    release: async () => undefined,
+    manager: {},
+  }),
+};
+
+@Global()
+@Module({
+  providers: [{ provide: getDataSourceToken(), useValue: fakeDataSource }],
+  exports: [getDataSourceToken()],
+})
+class TestGlobalsModule {}
+
+/** Modules that are safe to import in isolation (verified free of the IAM/MinIO chain). */
+const DOMAIN_MODULES = [
+  FareEngineModule,
+  CurrencyModule,
+  CurrenciesModule,
+  PromosModule,
+  SeatClassesModule,
+  StationsModule,
+  SchedulesModule,
+  SegmentsModule,
+  SystemConfigModule,
+];
+// NOTE: ExcessBaggageModule/PaymentsModule/BookingsModule are intentionally excluded — they pull in
+// NotificationsModule → @golevelup RabbitMQ which connects at boot. Their suites instantiate the
+// service directly with mocked collaborators (see excess-baggage / booking-trust specs).
+
+async function buildModule(): Promise<TestingModule> {
+  return Test.createTestingModule({
+    imports: [
+      ConfigModule.forRoot({ isGlobal: true }),
+      EventEmitterModule.forRoot(),
+      ScheduleModule.forRoot(),
+      TestGlobalsModule,
+      PrismaModule,
+      ...DOMAIN_MODULES,
+    ],
+  })
+    // SessionActivityInterceptor needs the IAM TypeORM DataSource, which the slim harness
+    // deliberately omits. Replace it with a pass-through — it does not affect pricing logic.
+    .overrideProvider(SessionActivityInterceptor)
+    .useValue({ intercept: (_ctx: unknown, next: { handle: () => unknown }) => next.handle() })
+    .compile();
+}
+
+export interface ServiceHarness {
+  moduleRef: TestingModule;
+  prisma: PrismaClient;
+  close: () => Promise<void>;
+}
+
+/** Resolve services for direct method-level assertions. */
+export async function createServiceHarness(): Promise<ServiceHarness> {
+  const moduleRef = await buildModule();
+  const prisma = moduleRef.get(PrismaService) as unknown as PrismaClient;
+  return {
+    moduleRef,
+    prisma,
+    close: async () => {
+      await moduleRef.close();
+    },
+  };
+}
+
+export interface HttpHarness {
+  app: INestApplication;
+  moduleRef: TestingModule;
+  prisma: PrismaClient;
+  close: () => Promise<void>;
+}
+
+/** Boot a full HTTP app with the production ValidationPipe config from src/main.ts:56. */
+export async function createHttpHarness(): Promise<HttpHarness> {
+  const moduleRef = await buildModule();
+  const app = moduleRef.createNestApplication();
+  app.useGlobalPipes(
+    new ValidationPipe({
+      whitelist: true,
+      transform: true,
+      forbidUnknownValues: false,
+    }),
+  );
+  await app.init();
+  const prisma = moduleRef.get(PrismaService) as unknown as PrismaClient;
+  return {
+    app,
+    moduleRef,
+    prisma,
+    close: async () => {
+      await app.close();
+    },
+  };
+}
diff --git a/apps/edr-passenger-api/test/setup/stubs/file-type.ts b/apps/edr-passenger-api/test/setup/stubs/file-type.ts
new file mode 100644
index 000000000..77c308c9a
--- /dev/null
+++ b/apps/edr-passenger-api/test/setup/stubs/file-type.ts
@@ -0,0 +1,10 @@
+/**
+ * CommonJS stub for the ESM-only `file-type` package (v21). jest's CommonJS resolver cannot load
+ * the real one, and `@tria-plc/api-common`'s minio.service `require("file-type")` at import time,
+ * dragging the whole IAM stack down with it. minio.service only calls fileTypeFromBuffer when
+ * actually processing an upload — never during pricing/booking tests — so a stub is sufficient to
+ * let the full AppModule boot. Mapped via jest `moduleNameMapper` (^file-type$).
+ */
+export async function fileTypeFromBuffer(): Promise<undefined> {
+  return undefined;
+}
diff --git a/apps/edr-passenger-api/test/stop-based-booking-segment.e2e-spec.ts b/apps/edr-passenger-api/test/stop-based-booking-segment.e2e-spec.ts
new file mode 100644
index 000000000..dfcc298fd
--- /dev/null
+++ b/apps/edr-passenger-api/test/stop-based-booking-segment.e2e-spec.ts
@@ -0,0 +1,366 @@
+/**
+ * Stop-based (mid-route) booking — segment correctness suite.
+ *
+ * Regression coverage for three bugs reported against live stop-based bookings:
+ *
+ *   1. Search results (SearchService.buildScheduleResult) showed the train's overall
+ *      departure/arrival instead of the selected origin/destination stop's own time — e.g.
+ *      searching B→C on a A→B→C schedule showed A's departure time, not B's. Rooted in
+ *      resolving the boarding/alighting STATION correctly for a mid-route segment while still
+ *      reading TIME off the schedule's full-route span. Fixed via resolveBookingSegment() (also
+ *      used by BookingsService, TicketsService, NotificationsService) — see
+ *      src/common/utils/segment-resolver.utils.ts.
+ *   2. GuestBookingService's 30-minute booking cutoff was computed off the train's origin
+ *      departure regardless of where the passenger actually boards, so a schedule whose origin
+ *      had already departed >30min ago wrongly blocked booking a downstream segment that
+ *      hadn't closed yet.
+ *   3. Even after (2), GuestBookingService still enforced a hardcoded, non-configurable 30
+ *      minutes — ignoring RouteStop/Route.checkinMinutesBefore, the SAME configurable cutoff
+ *      that SeatsService.holdSeats and the search step already enforce. A passenger who passed
+ *      the earlier steps under a shorter (or longer) CONFIGURED cutoff could still be wrongly
+ *      rejected — or wrongly allowed — at /booking/review with "not accepted within 30 minutes
+ *      of departure". Fixed by having GuestBookingService use the same resolveCheckinCutoff()
+ *      utility as SeatsService.holdSeats and SearchService — see
+ *      src/common/utils/checkin-cutoff.utils.ts.
+ *
+ * Uses the slim harness (real Nest DI) for SchedulesService — this exercises the actual
+ * cumulative travel-time interpolation in SchedulesService.createSchedule, same as
+ * checkin-cutoff.e2e-spec.ts. SeatsService/SearchService/BookingsService/GuestBookingService
+ * are NOT in the slim harness's DOMAIN_MODULES (they pull in NotificationsModule → RabbitMQ),
+ * so they're instantiated directly with a real Prisma + stubbed collaborators, mirroring the
+ * Tier-2 pattern in money-integrity.e2e-spec.ts.
+ */
+import { IdDocumentType } from "@prisma/client";
+import { SchedulesService } from "../src/modules/schedules/schedules.service";
+import { SeatsService } from "../src/modules/seats/seats.service";
+import { SegmentsService } from "../src/modules/segments/segments.service";
+import { SearchService } from "../src/modules/search/search.service";
+import { CurrencyService } from "../src/modules/currency/currency.service";
+import { FareEngineService } from "../src/modules/fare-engine/fare-engine.service";
+import { SystemConfigService } from "../src/modules/system-config/system-config.service";
+import { BookingsService } from "../src/modules/bookings/bookings.service";
+import { GuestBookingService } from "../src/modules/bookings/guest-booking.service";
+import { createServiceHarness, ServiceHarness } from "./setup/slim-app";
+import { IDS, resetAndSeedCore } from "./fixtures/seed-core";
+
+/** A Proxy whose every property is an async no-op — satisfies unused collaborator method calls. */
+function asyncStub(): any {
+  return new Proxy({}, { get: () => async () => undefined });
+}
+
+/** Formats a Date as a YYYY-MM-DD string in the process's local timezone (EAT on this host —
+ * matches search.service.ts's "+03:00" date-matching window). */
+function localDateStr(d: Date): string {
+  const y = d.getFullYear();
+  const m = String(d.getMonth() + 1).padStart(2, "0");
+  const day = String(d.getDate()).padStart(2, "0");
+  return `${y}-${m}-${day}`;
+}
+
+describe("Stop-based booking — segment time & cutoff correctness", () => {
+  let harness: ServiceHarness;
+  let schedulesService: SchedulesService;
+  let seatsService: SeatsService;
+  let searchService: SearchService;
+  let bookingsService: BookingsService;
+  let guestBookingService: GuestBookingService;
+
+  beforeAll(async () => {
+    harness = await createServiceHarness();
+    schedulesService = await harness.moduleRef.resolve(SchedulesService);
+    const currencyService = harness.moduleRef.get(CurrencyService);
+    const fareEngine = harness.moduleRef.get(FareEngineService);
+    const segmentsService = new SegmentsService(harness.prisma as any);
+    const systemConfig = new SystemConfigService(harness.prisma as any);
+
+    searchService = new SearchService(harness.prisma as any, currencyService, fareEngine, segmentsService);
+    // holdSeats() itself never touches segmentsService (only getSeatMap/availability-map
+    // callers do), so stubbing it here is safe — mirrors checkin-cutoff.e2e-spec.ts.
+    seatsService = new SeatsService(harness.prisma as any, asyncStub(), systemConfig, asyncStub(), asyncStub());
+    bookingsService = new BookingsService(
+      harness.prisma as any,
+      asyncStub(), // dataSource
+      seatsService,
+      { emit: () => true } as any, // eventEmitter
+      asyncStub(), // verifaydaService
+      currencyService,
+      fareEngine,
+      asyncStub(), // auditService
+    );
+    guestBookingService = new GuestBookingService(
+      harness.prisma as any,
+      seatsService,
+      asyncStub(), // verifaydaService — never reached: test passengers use PASSPORT, not NATIONAL_ID
+      currencyService,
+      asyncStub(), // passengerAuthService — never reached: no createAccount in these DTOs
+      fareEngine,
+      { emit: () => true } as any, // eventEmitter
+    );
+  });
+
+  afterAll(async () => {
+    await harness?.close();
+  });
+
+  /** Creates a fresh Train + TrainSchedule on the seed-core route, coach assigned at creation
+   * (createSchedule now rejects a schedule with zero coaches). */
+  async function createTestSchedule(opts: { trainNumber: string; departureAt: Date; arrivalAt: Date }) {
+    const train = await harness.prisma.train.create({
+      data: { number: opts.trainNumber, name: `Test ${opts.trainNumber}` },
+    });
+    const coach = await harness.prisma.coach.create({
+      data: { coachTypeId: IDS.coachType, number: `${opts.trainNumber}-C1`, capacity: 4, sequence: 1, status: "ACTIVE" },
+    });
+    const seats = await Promise.all(
+      ["1A", "1B", "1C", "1D"].map((seatNumber, i) =>
+        harness.prisma.seat.create({
+          data: { coachId: coach.id, seatNumber, row: 1, col: seatNumber.slice(-1), isWindow: i === 0, isAisle: i === 1 },
+        }),
+      ),
+    );
+    const schedule = await schedulesService.createSchedule({
+      trainId: train.id,
+      routeId: IDS.route,
+      departureAt: opts.departureAt.toISOString(),
+      arrivalAt: opts.arrivalAt.toISOString(),
+      coachIds: [coach.id],
+    } as any);
+    return { schedule, seats };
+  }
+
+  function foreignPassenger(seatId: string) {
+    return {
+      seatId,
+      passengerName: "Test Passenger",
+      dateOfBirth: "1990-01-01",
+      idDocumentType: IdDocumentType.PASSPORT,
+      passportNumber: "X123456",
+      passportCountry: "Djibouti",
+      nationality: "Djiboutian",
+    };
+  }
+
+  describe("search results (SearchService.searchTrips)", () => {
+    it("shows the boarding stop's own departure time, not the schedule's full-route (station A) departure", async () => {
+      await resetAndSeedCore(harness.prisma);
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 2 } }, data: { travelMinutesToStop: 60 } });
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 3 } }, data: { travelMinutesToStop: 40 } });
+
+      const dep = new Date(Date.now() + 3 * 60 * 60_000); // A's departure, 3h out
+      const arr = new Date(dep.getTime() + 100 * 60_000); // C's arrival
+      const { schedule } = await createTestSchedule({ trainNumber: `SEG-DEP-${Date.now()}`, departureAt: dep, arrivalAt: arr });
+
+      const result: any = await searchService.searchTrips({
+        originStationId: IDS.stationB,
+        destinationStationId: IDS.stationC,
+        date: localDateStr(dep),
+        adultCount: 1,
+      } as any);
+
+      const found = result.outbound.find((o: any) => o.scheduleId === schedule.id);
+      expect(found).toBeTruthy();
+
+      const expectedBDeparture = new Date(dep.getTime() + 60 * 60_000);
+      expect(new Date(found.departureAt).getTime()).toBe(expectedBDeparture.getTime());
+      // Would equal A's departure (`dep`) under the old (buggy) schedule.departureAt fallback.
+      expect(new Date(found.departureAt).getTime()).not.toBe(dep.getTime());
+    });
+
+    it("shows the alighting stop's own arrival time, not the schedule's full-route (station C) arrival", async () => {
+      await resetAndSeedCore(harness.prisma);
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 2 } }, data: { travelMinutesToStop: 60 } });
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 3 } }, data: { travelMinutesToStop: 40 } });
+
+      const dep = new Date(Date.now() + 3 * 60 * 60_000);
+      const arr = new Date(dep.getTime() + 100 * 60_000); // C's arrival
+      const { schedule } = await createTestSchedule({ trainNumber: `SEG-ARR-${Date.now()}`, departureAt: dep, arrivalAt: arr });
+
+      const result: any = await searchService.searchTrips({
+        originStationId: IDS.stationA,
+        destinationStationId: IDS.stationB,
+        date: localDateStr(dep),
+        adultCount: 1,
+      } as any);
+
+      const found = result.outbound.find((o: any) => o.scheduleId === schedule.id);
+      expect(found).toBeTruthy();
+
+      const expectedBArrival = new Date(dep.getTime() + 60 * 60_000);
+      expect(new Date(found.arrivalAt).getTime()).toBe(expectedBArrival.getTime());
+      // Would equal C's arrival (`arr`) under the old (buggy) schedule.arrivalAt fallback.
+      expect(new Date(found.arrivalAt).getTime()).not.toBe(arr.getTime());
+    });
+  });
+
+  describe("guest booking cutoff (GuestBookingService.createGuestBooking)", () => {
+    it("does NOT block booking a downstream segment whose own boarding stop is still far out, even though the schedule's origin already departed", async () => {
+      await resetAndSeedCore(harness.prisma);
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 2 } }, data: { travelMinutesToStop: 150 } });
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 3 } }, data: { travelMinutesToStop: 40 } });
+
+      // A departs in 5min (already inside a naive 30-min-before-departure cutoff), but B — the
+      // passenger's actual boarding stop — is A+150min out (~2.5h), comfortably clear.
+      const dep = new Date(Date.now() + 5 * 60_000);
+      const arr = new Date(dep.getTime() + 190 * 60_000);
+      const { schedule, seats } = await createTestSchedule({ trainNumber: `CUTOFF-OK-${Date.now()}`, departureAt: dep, arrivalAt: arr });
+
+      const hold = await seatsService.holdSeats({
+        scheduleId: schedule.id,
+        originStationId: IDS.stationB,
+        destinationStationId: IDS.stationC,
+        passengers: [{ passengerId: "66666666-6666-4666-8666-666666666666", seatId: seats[0].id }],
+      } as any);
+
+      const booking: any = await guestBookingService.createGuestBooking({
+        scheduleId: schedule.id,
+        holdId: (hold as any).holdId,
+        originStationId: IDS.stationB,
+        destinationStationId: IDS.stationC,
+        seatClassId: IDS.seatClassLocal,
+        passengers: [foreignPassenger(seats[0].id)],
+      } as any);
+
+      expect(booking.bookingRef).toBeTruthy();
+      expect(booking.originStationId).toBe(IDS.stationB);
+      expect(booking.destinationStationId).toBe(IDS.stationC);
+    });
+
+    it("still blocks booking when the passenger's own boarding stop is itself within 30 minutes of its departure", async () => {
+      await resetAndSeedCore(harness.prisma);
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 2 } }, data: { travelMinutesToStop: 10 } });
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 3 } }, data: { travelMinutesToStop: 40 } });
+
+      // B departs at dep+10min (~15min from now) — inside the 30-min cutoff. Hold is created
+      // directly (bypassing SeatsService.holdSeats' own, separately-tested arrival-based
+      // cutoff — see checkin-cutoff.e2e-spec.ts) to isolate GuestBookingService's own check.
+      const dep = new Date(Date.now() + 5 * 60_000);
+      const arr = new Date(dep.getTime() + 50 * 60_000);
+      const { schedule, seats } = await createTestSchedule({ trainNumber: `CUTOFF-BLOCK-${Date.now()}`, departureAt: dep, arrivalAt: arr });
+
+      const hold = await harness.prisma.seatHold.create({
+        data: {
+          scheduleId: schedule.id,
+          seatIds: [seats[0].id],
+          passengerId: "77777777-7777-4777-8777-777777777777",
+          expiresAt: new Date(Date.now() + 10 * 60_000),
+        },
+      });
+
+      await expect(
+        guestBookingService.createGuestBooking({
+          scheduleId: schedule.id,
+          holdId: hold.id,
+          originStationId: IDS.stationB,
+          destinationStationId: IDS.stationC,
+          seatClassId: IDS.seatClassLocal,
+          passengers: [foreignPassenger(seats[0].id)],
+        } as any),
+      ).rejects.toThrow(/not accepted within 30 minutes/i);
+    });
+
+    it("honors a stop-level checkinMinutesBefore override SHORTER than 30 minutes — booking succeeds inside the old hardcoded window", async () => {
+      // Regression for the reported bug: /booking/review still rejected a booking with
+      // "not accepted within 30 minutes of departure" even after the passenger passed the
+      // earlier steps under a shorter CONFIGURED cutoff — because createGuestBooking used to
+      // enforce its own separate, hardcoded 30 minutes regardless of RouteStop/Route
+      // .checkinMinutesBefore. B's own configured cutoff here is 10 minutes.
+      await resetAndSeedCore(harness.prisma, { B: { checkinMinutesBefore: 10 } });
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 2 } }, data: { travelMinutesToStop: 20 } });
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 3 } }, data: { travelMinutesToStop: 40 } });
+
+      // B departs at dep+20min (~25min from now) — inside the OLD hardcoded 30-min cutoff,
+      // but outside B's own configured 10-min cutoff.
+      const dep = new Date(Date.now() + 5 * 60_000);
+      const arr = new Date(dep.getTime() + 60 * 60_000);
+      const { schedule, seats } = await createTestSchedule({ trainNumber: `CUTOFF-CFG-${Date.now()}`, departureAt: dep, arrivalAt: arr });
+
+      const hold = await seatsService.holdSeats({
+        scheduleId: schedule.id,
+        originStationId: IDS.stationB,
+        destinationStationId: IDS.stationC,
+        passengers: [{ passengerId: "88888888-8888-4888-8888-888888888888", seatId: seats[0].id }],
+      } as any);
+
+      const booking: any = await guestBookingService.createGuestBooking({
+        scheduleId: schedule.id,
+        holdId: (hold as any).holdId,
+        originStationId: IDS.stationB,
+        destinationStationId: IDS.stationC,
+        seatClassId: IDS.seatClassLocal,
+        passengers: [foreignPassenger(seats[0].id)],
+      } as any);
+
+      expect(booking.bookingRef).toBeTruthy();
+    });
+
+    it("honors a stop-level checkinMinutesBefore override LONGER than 30 minutes — still blocks past the old hardcoded window", async () => {
+      await resetAndSeedCore(harness.prisma, { B: { checkinMinutesBefore: 90 } });
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 2 } }, data: { travelMinutesToStop: 40 } });
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 3 } }, data: { travelMinutesToStop: 40 } });
+
+      // B departs at dep+40min (~45min from now) — outside the OLD hardcoded 30-min cutoff
+      // (would have wrongly been allowed), but inside B's own configured 90-min cutoff.
+      const dep = new Date(Date.now() + 5 * 60_000);
+      const arr = new Date(dep.getTime() + 80 * 60_000);
+      const { schedule, seats } = await createTestSchedule({ trainNumber: `CUTOFF-CFG2-${Date.now()}`, departureAt: dep, arrivalAt: arr });
+
+      const hold = await harness.prisma.seatHold.create({
+        data: {
+          scheduleId: schedule.id,
+          seatIds: [seats[0].id],
+          passengerId: "99999999-9999-4999-8999-999999999999",
+          expiresAt: new Date(Date.now() + 10 * 60_000),
+        },
+      });
+
+      await expect(
+        guestBookingService.createGuestBooking({
+          scheduleId: schedule.id,
+          holdId: hold.id,
+          originStationId: IDS.stationB,
+          destinationStationId: IDS.stationC,
+          seatClassId: IDS.seatClassLocal,
+          passengers: [foreignPassenger(seats[0].id)],
+        } as any),
+      ).rejects.toThrow(/not accepted within 90 minutes/i);
+    });
+  });
+
+  describe("booking detail & list segment resolution (BookingsService)", () => {
+    it("getByRef and findByPassengerId show the boarding stop's own time and station, not the schedule's full-route span", async () => {
+      await resetAndSeedCore(harness.prisma);
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 2 } }, data: { travelMinutesToStop: 60 } });
+      await harness.prisma.routeStop.update({ where: { routeId_sequence: { routeId: IDS.route, sequence: 3 } }, data: { travelMinutesToStop: 40 } });
+
+      const dep = new Date(Date.now() + 3 * 60 * 60_000);
+      const arr = new Date(dep.getTime() + 100 * 60_000);
+      const { schedule } = await createTestSchedule({ trainNumber: `SEG-DETAIL-${Date.now()}`, departureAt: dep, arrivalAt: arr });
+
+      const passenger = await harness.prisma.passenger.create({ data: {} });
+      const booking = await harness.prisma.booking.create({
+        data: {
+          bookingRef: `SEGDET${Date.now()}`,
+          passengerId: passenger.id,
+          scheduleId: schedule.id,
+          originStationId: IDS.stationB,
+          destinationStationId: IDS.stationC,
+          status: "CONFIRMED",
+          totalMinor: 10000,
+          displayCurrency: "ETB",
+        },
+      });
+
+      const expectedBDeparture = new Date(dep.getTime() + 60 * 60_000);
+
+      const detail: any = await bookingsService.getByRef(booking.bookingRef);
+      expect(new Date(detail.schedule.departureAt).getTime()).toBe(expectedBDeparture.getTime());
+      expect(detail.schedule.origin.id).toBe(IDS.stationB);
+      expect(detail.schedule.destination.id).toBe(IDS.stationC);
+
+      const list: any = await bookingsService.findByPassengerId(passenger.id);
+      expect(list.items).toHaveLength(1);
+      expect(new Date(list.items[0].schedule.departureAt).getTime()).toBe(expectedBDeparture.getTime());
+      expect(list.items[0].schedule.originStation.id).toBe(IDS.stationB);
+    });
+  });
+});
diff --git a/apps/edr-passenger-web/backoffice/src/app/routes/page.tsx b/apps/edr-passenger-web/backoffice/src/app/routes/page.tsx
index feca7e3b5..251d034b1 100644
--- a/apps/edr-passenger-web/backoffice/src/app/routes/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/routes/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { Plus, Edit, Trash2, X, Search, Train, Save, GripVertical } from 'lucide-react';
 import DataTable from '@/components/ui/DataTable';
@@ -10,6 +10,7 @@ import Modal from '@/components/ui/Modal';
 import ConfirmDialog from '@/components/ui/ConfirmDialog';
 import { routesApi } from '@/lib/api/routes';
 import { stationsApi, fleetApi, routeCoachTemplatesApi } from '@/lib/api';
+import { eatLocalToISO, isoToEATLocal } from '@/lib/timezone';
 
 interface RouteStop {
   stationId: string;
@@ -17,6 +18,7 @@ interface RouteStop {
   distanceKm?: number;
   distanceFromOrigin?: number;
   checkinMinutesBefore?: number;
+  travelMinutesToStop?: number;
 }
 
 type Tab = 'routes' | 'coaches';
@@ -175,8 +177,18 @@ export default function RoutesPage() {
   const [destinationDistance, setDestinationDistance] = useState<number | undefined>(undefined);
   const [originCheckinMinutes, setOriginCheckinMinutes] = useState<number | undefined>(undefined);
   const [destinationCheckinMinutes, setDestinationCheckinMinutes] = useState<number | undefined>(undefined);
+  const [destinationTravelMinutes, setDestinationTravelMinutes] = useState<number | undefined>(undefined);
   const [deleteConfirm, setDeleteConfirm] = useState<{ isOpen: boolean; route: any | null; error?: string; cascade?: boolean; cascadeChecked?: boolean }>({ isOpen: false, route: null });
   const [search, setSearch] = useState('');
+  const [error, setError] = useState<string | null>(null);
+  const errorBannerRef = useRef<HTMLDivElement>(null);
+
+  // The form scrolls internally (long stop lists push the error banner above the fold), so a
+  // submit failure can land silently off-screen with no visible indication anything went wrong.
+  // Scroll the banner into view whenever a new error appears.
+  useEffect(() => {
+    if (error) errorBannerRef.current?.scrollIntoView({ behavior: 'smooth', block: 'start' });
+  }, [error]);
   const queryClient = useQueryClient();
 
   const { data: routes, isLoading: routesLoading } = useQuery({
@@ -198,6 +210,11 @@ export default function RoutesPage() {
       queryClient.invalidateQueries({ queryKey: ['routes'] });
       setShowModal(false);
       setEditingRoute(null);
+      setError(null);
+    },
+    onError: (e: any) => {
+      const msg = e?.response?.data?.message || e?.message || 'Failed to create route';
+      setError(Array.isArray(msg) ? msg.join(' ') : msg);
     },
   });
 
@@ -207,6 +224,11 @@ export default function RoutesPage() {
       queryClient.invalidateQueries({ queryKey: ['routes'] });
       setShowModal(false);
       setEditingRoute(null);
+      setError(null);
+    },
+    onError: (e: any) => {
+      const msg = e?.response?.data?.message || e?.message || 'Failed to update route';
+      setError(Array.isArray(msg) ? msg.join(' ') : msg);
     },
   });
 
@@ -244,6 +266,8 @@ export default function RoutesPage() {
     const sortedMiddleStops = stops;
 
     // distanceKm = cumulative distance from origin (fare engine uses destStop.distanceKm - originStop.distanceKm)
+    // travelMinutesToStop = minutes of travel from the PREVIOUS stop, used to estimate this
+    // stop's arrival time. The origin (sequence 1) has no predecessor, so it gets none.
     const stopsArray = [
       { stationId: originStationId, sequence: 1, distanceKm: 0, checkinMinutesBefore: originCheckinMinutes ?? undefined },
       ...sortedMiddleStops.map((stop, idx) => ({
@@ -251,12 +275,14 @@ export default function RoutesPage() {
         sequence: idx + 2,
         distanceKm: stop.distanceFromOrigin || 0,
         checkinMinutesBefore: stop.checkinMinutesBefore ?? undefined,
+        travelMinutesToStop: stop.travelMinutesToStop ?? undefined,
       })),
       {
         stationId: destinationStationId,
         sequence: sortedMiddleStops.length + 2,
         distanceKm: destinationDistance || 0,
         checkinMinutesBefore: destinationCheckinMinutes ?? undefined,
+        travelMinutesToStop: destinationTravelMinutes ?? undefined,
       },
     ];
 
@@ -266,8 +292,10 @@ export default function RoutesPage() {
       name: formData.get('name') as string,
       description: formData.get('description') as string || undefined,
       active: !editingRoute ? (formData.get('active') !== 'false') : undefined,
-      effectiveFrom: formData.get('effectiveFrom') as string,
-      effectiveUntil: formData.get('effectiveUntil') as string || undefined,
+      effectiveFrom: eatLocalToISO(formData.get('effectiveFrom') as string),
+      // null (not undefined) so clearing the field on an edit explicitly clears effectiveUntil
+      // server-side, instead of being silently dropped as "no change".
+      effectiveUntil: formData.get('effectiveUntil') ? eatLocalToISO(formData.get('effectiveUntil') as string) : null,
       checkinMinutesBefore: checkinRaw ? parseInt(checkinRaw) : undefined,
       stops: stopsArray,
     };
@@ -280,7 +308,12 @@ export default function RoutesPage() {
   };
 
   const addStop = () => {
-    setStops([...stops, { stationId: '', sequence: stops.length + 1, distanceFromOrigin: 0 }]);
+    // distanceKm must be cumulative and strictly increasing (enforced server-side) — defaulting
+    // every new stop to 0 made each one collide with the previous, so simply clicking "Add
+    // Intermediate Stop" a few times and saving without hand-editing every distance always failed
+    // validation. Default each new stop's distance a step past whatever precedes it instead.
+    const lastDistance = stops.length > 0 ? (stops[stops.length - 1].distanceFromOrigin ?? 0) : 0;
+    setStops([...stops, { stationId: '', sequence: stops.length + 1, distanceFromOrigin: lastDistance + 10 }]);
   };
 
   const removeStop = (index: number) => {
@@ -390,14 +423,17 @@ export default function RoutesPage() {
         setDestinationStationId(destStop.stationId);
         setDestinationCheckinMinutes(destStop.checkinMinutesBefore ?? undefined);
         setDestinationDistance(destStop.distanceKm || 0);
+        setDestinationTravelMinutes(destStop.travelMinutesToStop ?? undefined);
         setStops(routeStops.slice(1, -1).map((s: any) => ({
           stationId: s.stationId,
           sequence:  s.sequence,
           distanceKm: s.distanceKm,
           distanceFromOrigin: s.distanceKm || 0,
           checkinMinutesBefore: s.checkinMinutesBefore ?? undefined,
+          travelMinutesToStop: s.travelMinutesToStop ?? undefined,
         })));
       }
+      setError(null);
       setShowModal(true);
     } finally {
       setEditLoading(false);
@@ -436,7 +472,9 @@ export default function RoutesPage() {
               setDestinationStationId('');
               setDestinationCheckinMinutes(undefined);
               setDestinationDistance(undefined);
+              setDestinationTravelMinutes(undefined);
               setStops([]);
+              setError(null);
               setShowModal(true);
             }}
           >
@@ -515,13 +553,20 @@ export default function RoutesPage() {
           setDestinationStationId('');
           setDestinationCheckinMinutes(undefined);
           setDestinationDistance(undefined);
+          setDestinationTravelMinutes(undefined);
           setStops([]);
           setSearch('');
+          setError(null);
         }}
         title={`${editingRoute ? 'Edit' : 'Add'} Route`}
         size="lg"
       >
         <form onSubmit={handleSubmit} className="space-y-4 max-h-[calc(100vh-200px)] overflow-y-auto">
+          {error && (
+            <div ref={errorBannerRef} className="bg-red-50 p-3 rounded-lg text-sm text-red-800">
+              {error}
+            </div>
+          )}
           {editingRoute && (
             <div className="rounded-lg bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 p-3 text-sm text-yellow-800 dark:text-yellow-200">
               <p className="font-semibold">⚠ Warning</p>
@@ -647,7 +692,7 @@ export default function RoutesPage() {
                 type="datetime-local"
                 name="effectiveFrom"
                 className="input"
-                defaultValue={editingRoute?.effectiveFrom ? new Date(editingRoute.effectiveFrom).toISOString().slice(0, 16) : new Date().toISOString().slice(0, 16)}
+                defaultValue={editingRoute?.effectiveFrom ? isoToEATLocal(editingRoute.effectiveFrom) : isoToEATLocal(new Date())}
                 required
               />
             </div>
@@ -657,7 +702,7 @@ export default function RoutesPage() {
                 type="datetime-local"
                 name="effectiveUntil"
                 className="input"
-                defaultValue={editingRoute?.effectiveUntil ? new Date(editingRoute.effectiveUntil).toISOString().slice(0, 16) : ''}
+                defaultValue={editingRoute?.effectiveUntil ? isoToEATLocal(editingRoute.effectiveUntil) : ''}
               />
             </div>
           </div>
@@ -665,7 +710,7 @@ export default function RoutesPage() {
           <div className="border-t pt-4">
             <div className="flex items-center justify-between mb-3">
               <label className="label mb-0">Route Stops</label>
-              <span className="text-xs text-muted-foreground">Drag to rearrange · <span className="font-medium">Cutoff min</span> overrides route check-in window per stop (leave blank to inherit)</span>
+              <span className="text-xs text-muted-foreground">Drag to rearrange · <span className="font-medium">Travel min</span> estimates arrival from the previous stop (falls back to distance if blank) · <span className="font-medium">Cutoff min</span> overrides route check-in window per stop (leave blank to inherit)</span>
             </div>
 
             <div className="space-y-2">
@@ -741,6 +786,17 @@ export default function RoutesPage() {
                       required
                     />
                   </div>
+                  <div className="w-28">
+                    <input
+                      type="number"
+                      className="input input-sm"
+                      placeholder="travel min"
+                      value={stop.travelMinutesToStop ?? ''}
+                      onChange={(e) => updateStop(index, 'travelMinutesToStop', e.target.value ? parseInt(e.target.value) : undefined)}
+                      min={1}
+                      title="Travel time in minutes from the previous stop, used to estimate this stop's arrival time"
+                    />
+                  </div>
                   <div className="w-28">
                     <input
                       type="number"
@@ -817,6 +873,19 @@ export default function RoutesPage() {
                     />
                   )}
                 </div>
+                <div className="w-28">
+                  {destinationStationId && (
+                    <input
+                      type="number"
+                      className="input input-sm"
+                      placeholder="travel min"
+                      value={destinationTravelMinutes ?? ''}
+                      onChange={(e) => setDestinationTravelMinutes(e.target.value ? parseInt(e.target.value) : undefined)}
+                      min={1}
+                      title="Travel time in minutes from the previous stop, used to estimate this stop's arrival time"
+                    />
+                  )}
+                </div>
               </div>
             </div>
           </div>
@@ -833,8 +902,10 @@ export default function RoutesPage() {
                 setDestinationStationId('');
                 setDestinationCheckinMinutes(undefined);
                 setDestinationDistance(undefined);
+                setDestinationTravelMinutes(undefined);
                 setStops([]);
                 setSearch('');
+                setError(null);
               }}
             >
               Cancel
diff --git a/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx b/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx
index 0f37825fb..17a31832a 100644
--- a/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { Plus, Loader2, Zap, Trash2, Edit, Search, X, GripVertical } from 'lucide-react';
+import { Plus, Loader2, Zap, Trash2, Edit, Search, X, GripVertical, RefreshCw } from 'lucide-react';
 import DataTable from '@/components/ui/DataTable';
 import ActionButton from '@/components/ui/ActionButton';
 import Modal from '@/components/ui/Modal';
@@ -12,6 +12,7 @@ import { routeCoachTemplatesApi } from '@/lib/api';
 import Pagination from '@/components/ui/Pagination';
 import { usePagination } from '@/lib/use-pagination';
 import { formatDateTime } from '@/lib/utils';
+import { eatLocalToISO, isoToEATLocal } from '@/lib/timezone';
 import DateTimePicker from '@/components/ui/DateTimePicker';
 
 interface Schedule {
@@ -60,8 +61,15 @@ export default function SchedulesPage() {
     { isOpen: false, item: null }
   );
   const [error, setError] = useState<string | null>(null);
+  const errorBannerRef = useRef<HTMLDivElement>(null);
   const queryClient = useQueryClient();
 
+  // These modals can scroll internally — a submit failure can land silently off-screen with no
+  // visible indication anything went wrong. Scroll the banner into view when a new error appears.
+  useEffect(() => {
+    if (error) errorBannerRef.current?.scrollIntoView({ behavior: 'smooth', block: 'start' });
+  }, [error]);
+
   const [bulkForm, setBulkForm] = useState({
     trainId: '',
     routeId: '',
@@ -167,7 +175,8 @@ export default function SchedulesPage() {
       setError(null);
     },
     onError: (err: any) => {
-      setError(err.response?.data?.message || 'Failed to generate schedules');
+      const msg = err.response?.data?.message || 'Failed to generate schedules';
+      setError(Array.isArray(msg) ? msg.join(' ') : msg);
     },
   });
 
@@ -181,7 +190,8 @@ export default function SchedulesPage() {
       setError(null);
     },
     onError: (err: any) => {
-      setError(err.response?.data?.message || 'Failed to create schedule');
+      const msg = err.response?.data?.message || 'Failed to create schedule';
+      setError(Array.isArray(msg) ? msg.join(' ') : msg);
     },
   });
 
@@ -195,7 +205,15 @@ export default function SchedulesPage() {
       setError(null);
     },
     onError: (err: any) => {
-      setError(err.response?.data?.message || 'Failed to update schedule');
+      const msg = err.response?.data?.message || 'Failed to update schedule';
+      setError(Array.isArray(msg) ? msg.join(' ') : msg);
+    },
+  });
+
+  const recalculateStopsMutation = useMutation({
+    mutationFn: (id: string) => apiClient.post(`/schedules/${id}/recalculate-stops`, {}),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['schedules'] });
     },
   });
 
@@ -229,20 +247,6 @@ export default function SchedulesPage() {
     },
   });
 
-  /** Parse a datetime-local string ("YYYY-MM-DDTHH:mm") as EAT (UTC+3) and return an ISO string. */
-  const eatLocalToISO = (local: string): string => {
-    if (!local) return '';
-    return new Date(local + ':00+03:00').toISOString();
-  };
-
-  /** Convert a UTC ISO string to a datetime-local value in EAT (UTC+3). */
-  const isoToEATLocal = (iso: string): string => {
-    if (!iso) return '';
-    const utcMs = new Date(iso).getTime();
-    const eatMs = utcMs + 3 * 60 * 60 * 1000;
-    return new Date(eatMs).toISOString().slice(0, 16);
-  };
-
   const handleBulkSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     setError(null);
@@ -685,7 +689,7 @@ export default function SchedulesPage() {
         size="xl"
       >
         <form onSubmit={handleAddSubmit} className="space-y-4">
-          {error && <div className="bg-red-50 p-3 rounded-lg text-sm text-red-800">{error}</div>}
+          {error && <div ref={errorBannerRef} className="bg-red-50 p-3 rounded-lg text-sm text-red-800">{error}</div>}
 
           <div className="grid grid-cols-2 gap-4">
             <div>
@@ -803,7 +807,7 @@ export default function SchedulesPage() {
       >
         <form onSubmit={handleBulkSubmit} className="space-y-4">
           {error && (
-            <div className="bg-red-50 p-3 rounded-lg text-sm text-red-800">
+            <div ref={errorBannerRef} className="bg-red-50 p-3 rounded-lg text-sm text-red-800">
               {error}
             </div>
           )}
@@ -1022,7 +1026,7 @@ export default function SchedulesPage() {
         {editingSchedule && (
           <form onSubmit={handleEditSubmit} className="space-y-4">
             {error && (
-              <div className="bg-red-50 p-3 rounded-lg text-sm text-red-800">
+              <div ref={errorBannerRef} className="bg-red-50 p-3 rounded-lg text-sm text-red-800">
                 {error}
               </div>
             )}
@@ -1133,6 +1137,15 @@ export default function SchedulesPage() {
               >
                 Cancel
               </ActionButton>
+              <ActionButton
+                type="button"
+                variant="secondary"
+                icon={RefreshCw}
+                loading={recalculateStopsMutation.isPending}
+                onClick={() => editingSchedule && recalculateStopsMutation.mutate(editingSchedule.id)}
+              >
+                Recalculate Stop Times
+              </ActionButton>
               <ActionButton type="submit" loading={updateScheduleMutation.isPending}>
                 Update Schedule
               </ActionButton>
diff --git a/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx b/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx
index bd12def01..8731a1eb4 100644
--- a/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx
+++ b/apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx
@@ -111,7 +111,22 @@ export default function TicketsPage() {
   });
 
   const generateMissingMutation = useMutation({
-    mutationFn: () => ticketsApi.generateMissing(),
+    mutationFn: async () => {
+      let totalGenerated = 0;
+      let totalFailed = 0;
+      let totalProcessed = 0;
+      let remaining = 1;
+
+      while (remaining > 0) {
+        const result: any = await ticketsApi.generateMissing(10);
+        totalGenerated += result.generated ?? 0;
+        totalFailed += result.failed ?? 0;
+        totalProcessed += result.processed ?? 0;
+        remaining = result.remaining ?? 0;
+      }
+
+      return { generated: totalGenerated, processed: totalProcessed, failed: totalFailed };
+    },
     onSuccess: (result: any) => {
       queryClient.invalidateQueries({ queryKey: ['tickets'] });
       queryClient.invalidateQueries({ queryKey: ['bookings-missing-tickets'] });
diff --git a/apps/edr-passenger-web/backoffice/src/lib/api/index.ts b/apps/edr-passenger-web/backoffice/src/lib/api/index.ts
index 0d35ed2d3..24d5f1b7f 100644
--- a/apps/edr-passenger-web/backoffice/src/lib/api/index.ts
+++ b/apps/edr-passenger-web/backoffice/src/lib/api/index.ts
@@ -224,7 +224,7 @@ export const ticketsApi = {
     return Array.isArray(response) ? { items: response } : response;
   },
   getById: (id: string) => apiClient.get<any>(`/tickets/${id}`),
-  generateMissing: () => apiClient.post<any>('/tickets/generate-missing', {}),
+  generateMissing: (limit = 10) => apiClient.post<any>(`/tickets/generate-missing?limit=${limit}`, {}),
   validate: (ticketId: string, data: any) => apiClient.post<any>(`/tickets/${ticketId}/validate`, data),
   scanAndBoard: (qrCodeOrRef: string, data: any) => apiClient.post<any>(`/tickets/scan-board/${encodeURIComponent(qrCodeOrRef)}`, data),
   regenerate: (ticketId: string) => apiClient.post<any>(`/tickets/${ticketId}/regenerate`),
diff --git a/apps/edr-passenger-web/backoffice/src/lib/timezone.ts b/apps/edr-passenger-web/backoffice/src/lib/timezone.ts
new file mode 100644
index 000000000..5c6097feb
--- /dev/null
+++ b/apps/edr-passenger-web/backoffice/src/lib/timezone.ts
@@ -0,0 +1,21 @@
+/**
+ * The backend always interprets bare datetime strings (no timezone suffix) as East African
+ * Time (EAT, UTC+3) and stores everything as UTC — see parseEthiopianTime() in
+ * apps/edr-passenger-api/src/common/utils/timezone.utils.ts. These mirror that on the frontend
+ * so `<input type="datetime-local">` fields round-trip correctly regardless of the browser's
+ * own local timezone.
+ */
+
+/** Parse a datetime-local string ("YYYY-MM-DDTHH:mm") as EAT (UTC+3) and return a UTC ISO string. */
+export function eatLocalToISO(local: string): string {
+  if (!local) return '';
+  return new Date(local + ':00+03:00').toISOString();
+}
+
+/** Convert a UTC ISO string/Date to a datetime-local value ("YYYY-MM-DDTHH:mm") in EAT (UTC+3). */
+export function isoToEATLocal(iso: string | Date): string {
+  if (!iso) return '';
+  const utcMs = new Date(iso).getTime();
+  const eatMs = utcMs + 3 * 60 * 60 * 1000;
+  return new Date(eatMs).toISOString().slice(0, 16);
+}
diff --git a/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx
index 4333e95e9..c03397fee 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/payment/page.tsx
@@ -596,6 +596,7 @@ export default function PaymentPage() {
                       return (
                         <button
                           key={method.id}
+                          data-testid={`pay-method-${method.type}`}
                           onClick={() => setSelectedMethod(method.type)}
                           disabled={isProcessing || !method.enabled}
                           className={`w-full p-4 rounded-xl border-2 transition-all text-left ${
diff --git a/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx
index 7f16682e0..2c7d37f0f 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/results/page.tsx
@@ -318,7 +318,7 @@ export default function ResultsPage() {
     );
     // Use displayAmountMinor (passenger's currency) so stored fare matches what the card showed.
     const minFare = coachType?.classes.length
-      ? Math.min(...coachType.classes.map((c) => c.baseFareMinor))
+      ? Math.min(...coachType.classes.map((c) => c.displayAmountMinor ?? c.baseFareMinor))
       : 0;
     const fareCurrency = displayCurrencyCode;
 
@@ -484,6 +484,7 @@ export default function ResultsPage() {
                   return (
                     <div
                       key={coachType.coachId}
+                      data-testid="coach-option"
                       role="button"
                       tabIndex={0}
                       onClick={selectThisCoach}
@@ -633,6 +634,7 @@ export default function ResultsPage() {
                         {isSelected && (
                           <button
                             type="button"
+                            data-testid="continue-passenger-details"
                             onClick={(e) => {
                               e.stopPropagation();
                               handleSelect(classModal, isOutbound);
@@ -829,6 +831,7 @@ export default function ResultsPage() {
                 </p>
               )}
               <button
+                data-testid="result-select-btn"
                 onClick={() =>
                   setClassModal({ ...schedule, isOutbound } as any)
                 }
diff --git a/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx
index 0af9d90bc..fa1a86524 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/seats/page.tsx
@@ -472,7 +472,13 @@ export default function SeatsPage() {
       // For package bookings both legs always use the same coach type — mirror the
       // switch to the inbound schedule so the auto-assign fetches the right seatmap.
       if (isPackageBooking && inboundSchedule) {
-        setInboundSchedule({ ...(inboundSchedule as any), ...updatedSchedule, id: inboundSchedule.id });
+        setInboundSchedule({
+          ...(inboundSchedule as any),
+          ...updatedSchedule,
+          id: inboundSchedule.id,
+          originStationId: (inboundSchedule as any).originStationId,
+          destinationStationId: (inboundSchedule as any).destinationStationId,
+        });
       }
     } else {
       setSelectedSchedule(updatedSchedule);
diff --git a/apps/edr-payment-api/src/modules/intents/intents.service.ts b/apps/edr-payment-api/src/modules/intents/intents.service.ts
index d54499108..c75edef1f 100644
--- a/apps/edr-payment-api/src/modules/intents/intents.service.ts
+++ b/apps/edr-payment-api/src/modules/intents/intents.service.ts
@@ -1,5 +1,6 @@
 import {
   BadRequestException,
+  ConflictException,
   Inject,
   Injectable,
   Logger,
@@ -108,9 +109,19 @@ export class IntentsService {
         // are retired so a fresh one opens below.
         const settled = await this.verifyThenReuseOrRetire(existing, request);
         if (settled) return this.toSnapshot(settled);
+      } else if (existing.provider !== request.provider) {
+        // PROCESSING/SUCCEEDED on a DIFFERENT provider than requested: money may already be
+        // in flight there. Must not silently hand back that other provider's clientAction
+        // (e.g. its redirect URL) as if it belonged to the newly requested provider — the
+        // caller has no way to tell the two apart (see InitiateResponseDto), so it would
+        // blindly redirect the payer to the wrong gateway's checkout page.
+        throw new ConflictException(
+          `A ${existing.provider} payment is already ${existing.status.toLowerCase()} for this ` +
+            `booking. Complete or wait for it to resolve before switching payment methods.`,
+        );
       } else {
-        // PROCESSING (money in flight) or SUCCEEDED (already paid): never reopen —
-        // return the existing intent so the caller adopts its outcome.
+        // Same provider, already PROCESSING/SUCCEEDED: never reopen — return the existing
+        // intent so the caller adopts its outcome.
         return this.toSnapshot(existing);
       }
     }
diff --git a/docker-compose.e2e.yaml b/docker-compose.e2e.yaml
new file mode 100644
index 000000000..b00402761
--- /dev/null
+++ b/docker-compose.e2e.yaml
@@ -0,0 +1,194 @@
+# EDR Freight — ephemeral Cypress e2e stack.
+# Fully isolated from dev: own ports, own throwaway Postgres (tmpfs — data
+# vanishes on `down`), seeded test users. Requires the same .npmrc as the main
+# docker-compose.yaml (GitHub Packages auth for @tria-plc).
+#
+# Preferred entrypoint: the launcher (auto-up + free-port picking):
+#   pnpm e2e:freight:run|open|ci|up|down   → e2e/freight/scripts/e2e.mjs
+#
+# Host ports are env-parameterized (E2E_*_PORT). Defaults below avoid the dev
+# stacks (5273/5283/3221 are taken by the second dev checkout in
+# ~/projects/nathnael/edr-platform); when a default is busy the launcher scans
+# upward for a free port and remembers the choice in e2e/freight/.e2e-ports.json
+# while the stack is up:
+#   freight-api   3101   portal 5373   backoffice 5383
+#   postgres      5533   minio  9310 (console 9311)
+name: edr-freight-e2e
+
+services:
+  postgres-freight-e2e:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_DB: edr_freight_e2e
+      POSTGRES_USER: edr_e2e
+      POSTGRES_PASSWORD: edr_e2e
+    tmpfs:
+      - /var/lib/postgresql/data
+    ports:
+      - "${E2E_DB_PORT:-5533}:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U edr_e2e -d edr_freight_e2e"]
+      interval: 2s
+      timeout: 3s
+      retries: 30
+
+  minio-e2e:
+    image: minio/minio:latest
+    command: server /data --console-address ":9001"
+    environment:
+      MINIO_ROOT_USER: e2e-minio
+      MINIO_ROOT_PASSWORD: e2e-minio-secret
+    tmpfs:
+      - /data
+    ports:
+      - "${E2E_MINIO_PORT:-9310}:9000"
+      - "${E2E_MINIO_CONSOLE_PORT:-9311}:9001"
+    healthcheck:
+      test: ["CMD", "mc", "ready", "local"]
+      interval: 5s
+      timeout: 5s
+      retries: 12
+
+  # tmpfs wipes MinIO on every restart — recreate the app bucket each boot.
+  minio-init-e2e:
+    image: minio/mc:latest
+    depends_on:
+      minio-e2e:
+        condition: service_healthy
+    entrypoint:
+      - /bin/sh
+      - -c
+      - mc alias set e2e http://minio-e2e:9000 e2e-minio e2e-minio-secret && mc mb --ignore-existing e2e/fhc
+    restart: "no"
+
+  freight-api-e2e:
+    build:
+      context: .
+      dockerfile: apps/edr-freight-api/Dockerfile
+      secrets:
+        - npmrc
+    depends_on:
+      postgres-freight-e2e:
+        condition: service_healthy
+      minio-e2e:
+        condition: service_healthy
+      minio-init-e2e:
+        condition: service_completed_successfully
+    environment:
+      PORT: "3001"
+      DB_HOST: postgres-freight-e2e
+      DB_PORT: "5432"
+      DB_USER: edr_e2e
+      DB_PASSWORD: edr_e2e
+      DB_NAME: edr_freight_e2e
+      # e2e-only secrets — never reuse outside this stack
+      JWT_SECRET: e2e-jwt-secret
+      JWT_ACCESS_TOKEN_SECRET: e2e-access-secret
+      JWT_REFRESH_TOKEN_SECRET: e2e-refresh-secret
+      JWT_EXPIRES_IN: 1d
+      JWT_ACCESS_TOKEN_EXPIRES: 1d
+      JWT_REFRESH_TOKEN_EXPIRES: 7d
+      SERVICE_AUTH_TOKEN: e2e-service-token
+      # Org/unit/position boot seeders (env-gated in app code). Test USERS are
+      # NOT seeded by the API — Cypress inserts them via
+      # e2e/freight/cypress/fixtures/seed-users.sql before specs run.
+      SEED_EDR_ORG: "true"
+      SUPER_ADMIN_EMAIL: superadmin@tria.com
+      SUPER_ADMIN_PHONE: "+251900000000"
+      # Object storage
+      MINIO_ENDPOINT: minio-e2e
+      MINIO_PORT: "9000"
+      MINIO_USE_SSL: "false"
+      MINIO_ACCESS_KEY: e2e-minio
+      MINIO_SECRET_KEY: e2e-minio-secret
+      MINIO_REGION: us-east-1
+      # External integrations off
+      RABBITMQ_ENABLED: "false"
+      FAYDA_ENABLED: "false"
+      # SMS strategy has no kill switch and defaults to a real dev endpoint —
+      # blackhole it so e2e never sends SMS (failures are logged, non-fatal).
+      OZIKING_SMS_URL: http://127.0.0.1:9/sms
+      FREIGHT_PORTAL_URL: http://localhost:${E2E_PORTAL_PORT:-5373}
+    ports:
+      - "${E2E_API_PORT:-3101}:3001"
+    healthcheck:
+      # Boot runs 240+ migrations + seeders on first start — generous start_period.
+      test:
+        [
+          "CMD",
+          "node",
+          "-e",
+          "fetch('http://localhost:3001/api/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))",
+        ]
+      interval: 5s
+      timeout: 5s
+      retries: 12
+      start_period: 180s
+
+  freight-portal-e2e:
+    build:
+      context: .
+      dockerfile: infrastructure/docker/Dockerfile.web
+      args:
+        TURBO_FILTER: "@edr/freight-portal"
+        APP_PATH: apps/edr-freight-web/portal
+        # Baked at build time: browser (host or host-networked cypress
+        # container) reaches the API through the published host port. A
+        # non-default API port therefore forces a web image rebuild.
+        VITE_API_URL: http://localhost:${E2E_API_PORT:-3101}
+        VITE_BASE_API_URL: http://localhost:${E2E_API_PORT:-3101}
+        VITE_USER_MANAGEMENT_BASE: /_um
+        VITE_GOOGLE_MAPS_API_KEY: ""
+        VITE_POSTHOG_KEY: ""
+        VITE_POSTHOG_HOST: ""
+      secrets:
+        - npmrc
+    ports:
+      - "${E2E_PORTAL_PORT:-5373}:80"
+
+  freight-backoffice-e2e:
+    build:
+      context: .
+      dockerfile: infrastructure/docker/Dockerfile.web
+      args:
+        TURBO_FILTER: "@edr/freight-backoffice"
+        APP_PATH: apps/edr-freight-web/backoffice
+        VITE_API_URL: http://localhost:${E2E_API_PORT:-3101}
+        VITE_BASE_API_URL: http://localhost:${E2E_API_PORT:-3101}
+        VITE_USER_MANAGEMENT_BASE: /_um
+        VITE_GOOGLE_MAPS_API_KEY: ""
+        VITE_POSTHOG_KEY: ""
+        VITE_POSTHOG_HOST: ""
+      secrets:
+        - npmrc
+    ports:
+      - "${E2E_BACKOFFICE_PORT:-5383}:80"
+
+  # Headless runner — opt-in via `--profile cypress`. host network so the
+  # in-container browser uses the exact same localhost URLs as `cypress open`
+  # on the host (Linux only; on macOS/Windows run Cypress from the host).
+  cypress:
+    # Keep in sync with the cypress version in e2e/freight/package.json.
+    image: cypress/included:${CYPRESS_VERSION:-15.18.1}
+    profiles: ["cypress"]
+    network_mode: host
+    depends_on:
+      freight-api-e2e:
+        condition: service_healthy
+    working_dir: /repo/e2e/freight
+    # NOTE: host network shares the abstract X-socket namespace with the host.
+    # Cypress spawns its Xvfb on :99 — run only ONE cypress container at a
+    # time, and don't run it on a host whose X server occupies :99.
+    entrypoint: ["cypress", "run", "--browser", "chrome"]
+    environment:
+      CI: "true"
+      E2E_DB_URL: postgres://edr_e2e:edr_e2e@localhost:${E2E_DB_PORT:-5533}/edr_freight_e2e
+      CYPRESS_BASE_URL: http://localhost:${E2E_BACKOFFICE_PORT:-5383}
+      CYPRESS_API_URL: http://localhost:${E2E_API_PORT:-3101}
+      CYPRESS_PORTAL_URL: http://localhost:${E2E_PORTAL_PORT:-5373}
+    volumes:
+      - .:/repo
+
+secrets:
+  npmrc:
+    file: .npmrc
diff --git a/docs/ISSUES.md b/docs/ISSUES.md
new file mode 100644
index 000000000..1fe3fb964
--- /dev/null
+++ b/docs/ISSUES.md
@@ -0,0 +1,463 @@
+# EDR Passenger Platform — Issues Report
+
+Findings from the pricing/backoffice E2E bug-hunt. **No product code was changed** — this is a
+report. The harness that reproduces the ✅ findings lives in `e2e/` + `apps/edr-passenger-api/test/`
+(`docs/e2e-test-matrix.md` is the full test matrix; `e2e/README.md` explains how to run it).
+
+**Verification legend**
+- ✅ **Verified by test** — a passing e2e test reproduces the defect (test name references the ID).
+- 🔎 **Confirmed by code inspection** — unambiguous from the source; not yet wrapped in a test
+  (usually because it lives behind the IAM/RabbitMQ boot wall or needs the running web apps).
+- ⚠️ **Suspected** — plausible from the source; needs runtime confirmation.
+
+**Severity**: how much money / trust is at risk, and how easily.
+
+Two structural facts frame everything:
+- There are **two fare systems**: `fare-engine` (live) and `configurable-fare` (fully built but
+  **never called** by the live path — `fare-engine.calculate` never reads `fare_configurations`).
+  All findings below concern the **live** `fare-engine` unless noted.
+- The domain seed (`prisma/seed.ts`) is **entirely disabled** (every step commented out).
+
+---
+
+## CRITICAL — money can be created, stolen, or set by the client
+
+### C-1 ✅ Booking total is client-controlled (server fare computed, then discarded)
+- **Where**: `bookings.service.ts:863-899` (one-way), `:1065-1095` (round-trip),
+  `guest-booking.service.ts:206-245,494-540`. Per-seat: `:840` `fareMinor = p.seatFareMinor ?? …`.
+- **Repro**: `POST /bookings` with `reviewedTotalMinor: 1` (or every passenger `seatFareMinor: 0`).
+- **Expected**: server recomputes the authoritative fare and rejects/overrides a mismatched client
+  amount. **Actual**: the client value is stored as `displayTotalMinor`; a mismatch is only
+  `logger.warn`-ed (`:873-874`), never rejected. A trip can be booked for 1 cent.
+- **Status**: ✅ verified — `critical-repro.e2e-spec.ts` (C-1): a one-way booking submitted with
+  `reviewedTotalMinor: 1` is stored with `totalMinor === 1` while `fareBreakdown.totalMinor` is
+  ≥ 30000. Matrix A1–A4.
+- **Fix**: recompute the fare server-side at booking creation and **reject** if the client-supplied
+  total differs beyond a rounding epsilon; never persist a client amount as the charge basis.
+- **Resolution (authenticated paths)** ✅ — `bookings.service.ts` now guards both `createOneWayBooking`
+  and `createRoundTripBooking` with `assertTotalNotUnderAuthoritative(resolvedTotalMinor,
+  fareCalculation.totalMinor)`: a booking whose ETB charge basis falls below the server-recomputed
+  authoritative fare (net of promo/loyalty/free-child) by more than a 1% FX-rounding tolerance is
+  rejected with `BadRequestException` and nothing is persisted. It's a **floor** (not equality) so
+  legitimate berth surcharges — which only raise the total — still pass. Proven by
+  `e2e-ui/specs/portal/ua13-forged-total.spec.ts` (now asserts a 4xx + no 1-minor booking; red before
+  the guard, green after).
+- **Resolution (guest paths)** ✅ — `guest-booking.service.ts` now applies the identical
+  `assertTotalNotUnderAuthoritative` floor guard to both the one-way and round-trip guest booking
+  creation paths (authoritative ETB fare captured before the client-driven per-seat/reviewed branches
+  overwrite the total). Proven by `e2e-ui/specs/guest/ua14-forged-seat-fare.spec.ts` (forged
+  `seatFareMinor=0` + `reviewedTotalMinor=0` now rejected with a 4xx and no 0-minor booking persisted;
+  red before the guard, green after). C-1 is now closed on all four booking-creation paths
+  (authenticated one-way/round-trip + guest one-way/round-trip).
+
+### C-2 ✅ Loyalty redemption is unbounded and never deducted (free discount)
+- **Where**: `bookings.service.ts:1705,1707` (and `:1028,:1249,:1451`); DTO `bookings.dto.ts:155`.
+  `loyaltyMinor = (loyaltyRedemptionPoints ?? 0) * 10` subtracted from the total.
+- **Repro**: `POST /bookings` with `loyaltyRedemptionPoints: 999999` on an account with 0 points.
+- **Expected**: validate against the account's real balance, cap it, and DEBIT the points.
+  **Actual**: no balance check, no ledger debit, no cap — the discount applies and the total can hit
+  0 (or negative). Points are only ever *awarded* (`payments.service.ts:1062`), never spent here.
+- **Status**: 🔎 (arithmetic path is explicit; the redemption-not-deducted contract is confirmed in
+  the Tier-2 reference). Matrix A5/F6.
+- **Fix**: load `LoyaltyAccount`, reject if `points > balance`, clamp to a max, and write a
+  `LoyaltyLedgerEntry` DEBIT inside the booking transaction.
+
+### C-3 ✅ Wallet top-up: no ownership check, no payment backing (free money)
+- **Where**: `wallet.service.ts:50-56`; controller `wallet.controller.ts:34-39`. Also
+  `GET /wallet/accounts` is `@IsPublic()` (`wallet.controller.ts:23-24`) → leaks all balances.
+- **Repro (verified)**: `money-integrity.e2e-spec.ts` → `topUp(victimId, 1_000_000)` credits the
+  victim's wallet with a bare CREDIT ledger entry and no linked payment.
+- **Expected**: top-up requires the caller to own the wallet AND a settled payment. **Actual**:
+  `topUp(passengerId, amount)` takes the id positionally, checks nothing, and credits unconditionally.
+- **Fix**: gate the controller on `caller == passengerId` (or admin), and only credit after a
+  confirmed `PaymentIntent`; make `GET /wallet/accounts` non-public.
+
+### C-4 ✅ Payment amount is never validated against the booking
+- **Where**: passenger side `payments.service.ts:809-848,910-939`; payment side
+  `intents.service.ts:541-548` (mismatch only `logger.error`, intent still SUCCEEDED). Webhook
+  handlers never set `confirmedAmountMinor` (e.g. `waafi-webhook.service.ts:63-69`).
+- **Repro**: ✅ verified — `critical-repro.e2e-spec.ts` (C-4): `finalizePaymentSuccess` on an intent
+  with `amountMinor: 1` sets a `totalMinor: 30000` booking to `CONFIRMED` — no amount comparison.
+- **Expected**: reject/hold on amount mismatch. **Actual**: any provider "success" confirms the
+  booking in full; short payments are undetectable. Matrix G1/G7.
+- **Fix**: compare provider-confirmed amount to the intent/booking total in `applyProviderResult`
+  and `finalizePaymentSuccess`; do not confirm on mismatch.
+- **Resolution (passenger side)** ✅ — `payments.service.ts` `handlePaymentEvent` (the consumer of
+  the payment service's `mark-paid` relay — the passenger-side settlement entry point) now compares
+  the provider-settled `event.amountMinor` against the booking's display-currency total
+  (`displayTotalMinor`, i.e. the amount the passenger was quoted) before materializing the intent or
+  finalizing. A short payment (below the expected amount beyond a 1% rounding tolerance) is refused
+  with `{ processed: false, reason: 'amount-mismatch' }` and the booking is left unconfirmed — no
+  ticket. Amount-only by design: the display↔charge-currency divergence for USD/DJF (UA-1b/2/3) is
+  tracked separately, so the guard compares against `displayTotalMinor` to stay correct for both ETB
+  and the currently-diverging currencies. Proven by `e2e-ui/specs/portal/ua15-telebirr-shortpay.spec.ts`
+  (forged `amountMinor:1` now leaves the booking unconfirmed; red before the guard, green after). The
+  **payment-side** `intents.service.ts` mismatch (`applyProviderResult`) lives in `edr-payment-api`
+  and is out of scope for the passenger-app fix.
+
+### C-5 🔎 A late webhook re-confirms an expired/cancelled booking
+- **Where**: `payments.service.ts:809-848` (`finalizePaymentSuccess` never reads `booking.status`);
+  expiry cron `bookings.service.ts:2123-2128` (hardcoded 20 min).
+- **Repro**: let a `PENDING_PAYMENT` booking expire (seats released), then deliver the payment
+  webhook.
+- **Expected**: reject payment for a cancelled/expired booking (and refund). **Actual**: the booking
+  is re-set `CONFIRMED` and tickets are re-issued for already-released seats. Matrix G2.
+- **Fix**: in `finalizePaymentSuccess`, refuse to confirm unless status is `PENDING_PAYMENT`; route
+  late successes to a refund/again-available flow.
+
+### C-6 ✅ Wallet debit has no row lock → concurrent double-spend
+- **Where**: `payments.service.ts:461-484` — `$transaction` reads balance, checks, debits, with no
+  `SELECT … FOR UPDATE` / pessimistic lock.
+- **Repro**: ✅ verified — `critical-repro.e2e-spec.ts` (C-6): two concurrent `initiateWalletPayment`
+  on a wallet funded for one ticket both succeed (two DEBITs, two confirmations). The test forces
+  the read-before-write interleaving with a barrier (only scheduling is controlled; the service
+  logic runs unmodified) — the missing lock is what makes that interleaving lose money.
+- **Expected**: one succeeds, one fails; balance never over-drawn. **Actual**: both reads see the
+  same balance, both pass the check → the wallet is double-spent. Matrix F4.
+- **Fix**: pessimistic lock the wallet row (or an atomic conditional `UPDATE … WHERE balance >= x`).
+
+### C-7 ✅ Refund is computed (80%) but never disbursed
+- **Where**: `bookings.service.ts:2017-2027` — `refundAmount = floor(total*0.8)`, writes
+  `BookingCancellation{ refundStatus:'PENDING' }`; the only `booking.cancelled` listener is a
+  notification (`notifications.service.ts:750`). No `PaymentRefund`, no wallet credit, no provider
+  refund anywhere.
+- **Repro (verified)**: `money-integrity.e2e-spec.ts` → cancel a CONFIRMED booking; `refundAmount`
+  returned, `refundStatus` PENDING, **zero** `PaymentRefund` rows, wallet unchanged.
+- **Fix**: implement disbursement (wallet credit or provider refund) and move `refundStatus`
+  through `PROCESSING → COMPLETED`; reconcile stuck PENDING rows.
+
+### C-8 ✅ Exchange-rate writes are missing the ADMIN check (any passenger can rewrite FX) — CORRECTED
+- **⚠️ Corrected by live testing** — the original claim (*unauthenticated* FX writes) was a **false
+  positive**: `@tria-plc/api-common`'s `SharedAuthModule` registers a **global `APP_GUARD` = JwtGuard**
+  (`shared-auth.module` `APP_GUARD`), so anonymous requests get **401**. The metadata-only J1 check
+  saw no *method-level* guard and wrongly concluded "unauthenticated". The real defect is
+  **authorization**, not authentication.
+- **Where**: `fare-engine/currency.controller.ts:25` (`PUT`), `:32` (`PATCH`) — authenticated but
+  **no `@PassengerAdmin`** (only `:42` DELETE has it).
+- **Repro (verified live)**: `e2e-ui/specs/propagation/pb-config-propagation.spec.ts` (BC-11) —
+  anon → **401**, but a **regular passenger token → 200** rewrites the live USD↔ETB rate.
+- **Expected**: FX writes are admin-only. **Actual**: any logged-in user (incl. a passenger) can
+  rewrite USD↔ETB↔DJF rates, which every international fare multiplies by
+  (`fare-engine.service.ts:132,157,195`). Needs a valid login (not anonymous), so **HIGH, not
+  CRITICAL** — but a single passenger can still distort all international pricing. Same class as C-9.
+- **Fix**: add `@PassengerAdmin()` (or `@PassengerStaff([currencies.manage])`) to `PUT`/`PATCH`.
+- **Resolution** ✅ — `fare-engine/currency.controller.ts` now decorates both `@Put()` and
+  `@Patch(':id')` with `@PassengerAdmin()` + `@ApiBearerAuth('IAM-auth')`, matching the existing
+  `@Delete` handler. `@PassengerAdmin()` is the repo's established guard decorator (`JwtGuard` +
+  `PassengerPermissionGuard(admin)`) — no new auth code, and no `@edr/auth` placeholder needed since
+  the permission infra already exists and the seeded staff admin carries the permission. The sibling
+  `/currencies` write surfaces (`currency.controller.ts`, `currencies.controller.ts`) were already
+  guarded, so `/fare-engine/exchange-rates` was the sole gap. Proven by
+  `e2e-ui/specs/propagation/pb-config-propagation.spec.ts` (BC-11): anon → 401, regular passenger PUT
+  and PATCH → **403**, staff admin → 200; red before the guard, green after.
+
+### C-9 ✅ `@Roles('ADMIN')` is dead everywhere (RolesGuard never wired) — verified live
+- **Where**: `common/roles.guard.ts` defines `RolesGuard` but it is never registered (no `APP_GUARD`,
+  no `@UseGuards(RolesGuard)`). The global `JwtGuard` (SharedAuthModule) does authN but NOT authZ, so
+  `@Roles(...)` is inert on: `configurable-fare.controller.ts:20,111,187` (fare configs + feature
+  toggle), `segments/segment-fare.controller.ts:15` (`/admin/segment-fares`),
+  `system-config.controller.ts:23,32` (`GET/PATCH /config`).
+- **Repro (verified live)**: a **regular passenger token** → `PATCH /config` (`@Roles('ADMIN')`) →
+  **HTTP 200** (wrote admin-only system config); `POST /admin/fare-configurations` → 400 (reached DTO
+  validation, i.e. it passed the role guard). So any authenticated user bypasses the ADMIN gate.
+- **Expected**: these are admin-only. **Actual**: any authenticated IAM user (incl. a passenger) can
+  CRUD fare configuration and system config. Matrix J2–J4.
+- **Fix**: register `RolesGuard` globally (or via `@UseGuards`) so `@Roles` is enforced, OR convert
+  these to the working `@PassengerAdmin()`/`@PassengerStaff()` guards used elsewhere.
+
+### C-10 ✅ Authenticated `POST /bookings` is BROKEN (passengerId resolution regression)
+- **Where**: `bookings.controller.ts:528-532` overrides `passengerId` with the JWT user id
+  (`req.user.id`, the iamUserId — "never trust the request body", added in commit `25fdf88a`).
+  `bookings.service.ts:773` resolves an iamUserId → Passenger ONLY when it is **non-UUID**. IAM user
+  ids are UUIDs, and registration creates `Passenger.id ≠ iamUserId` (`passenger-auth.service.ts:225`
+  — only `iamUserId` is set; `id` auto-generates). So the resolver never fires and `booking.create`
+  (`bookings.service.ts:905`) uses the iamUserId directly as `passengerId`.
+- **Repro**: ✅ verified two ways — (1) live browser: the full UI booking flow returns **HTTP 400
+  P2003** on `Booking_passengerId_fkey` for a logged-in passenger whose `Passenger.id ≠ iamUserId`
+  (the realistic case); (2) deterministic API test `test/authed-booking-passengerid.e2e-spec.ts` —
+  `create()` with a UUID iamUserId fails the FK, while `create()` with the real `Passenger.id`
+  succeeds (control). The UI suite only goes green because `seed-ui.ts` deliberately sets
+  `Passenger.id == iamUserId`.
+- **Expected**: every IAM-authenticated passenger can book. **Actual**: every authenticated
+  `POST /bookings` fails with a foreign-key error; only the guest path (`/bookings/guest`, which
+  creates a fresh passenger) works. This is a **regression** — before `25fdf88a`, the controller
+  used the frontend-supplied `passengerId` (the real `Passenger.id`), which worked.
+- **Fix**: resolve the passenger by iamUserId unconditionally (`passenger.findUnique({ where: {
+  iamUserId } })`) in the controller or service — drop the UUID-format gate at `bookings.service.ts:773`
+  — and pass the resolved `Passenger.id` to `booking.create`. (Keep the "don't trust the body"
+  intent; just translate the identity correctly.)
+- **⚠️ Confirm the deployment window**: verify whether `25fdf88a` is already in production. If so,
+  authenticated bookings are down platform-wide; if it's only on `dev`, this is a pre-release blocker.
+
+---
+
+## HIGH — pricing is wrong or exploitable
+
+### H-1 ✅ A promo can drive the total NEGATIVE (no clamp)
+- **Where**: `fare-engine.service.ts:185-192` — `total = subtotal - discount`, no `Math.max(0,…)`.
+  DTO gaps: `promos.dto.ts:20` (`percentOff` no `@Max(100)`), `:26` (`amountOffMinor` unbounded).
+- **Repro (verified)**: `pricing-fare-engine.e2e-spec.ts` → promo `percentOff:150` and a fixed
+  `amountOffMinor > subtotal` both yield a **negative** `totalMinor`.
+- **Fix**: clamp the total at 0; bound `percentOff` to `[0,100]` and `amountOffMinor` at the DTO.
+
+### H-2 ✅ Missing FX rate is silently substituted with 1.0
+- **Where**: `currency.service.ts:142-147` (`getExchangeRate` returns `1.0` + a `warn`).
+- **Repro (verified)**: `pricing-fare-engine.e2e-spec.ts` (C1) — deleting the USD→ETB rate collapses
+  the fare ~100×; `pricing-currency.e2e-spec.ts` (C2b) — silent 1.0 vs `getRateOrThrow` throwing.
+- **Fix**: fail closed (reject the quote/booking) when a required rate is absent; never price at
+  parity by default.
+- **Resolution** ✅ — `currency.service.ts` `getExchangeRate` no longer substitutes `1.0` on a missing
+  rate; it logs and throws `BadRequestException` (`No exchange rate configured for X->Y`), matching
+  `getRateOrThrow`. Fare pricing therefore fails closed: with the `USD→ETB` pair deleted the fare
+  engine (`fare-engine.service.ts:157`) throws, so the search returns **no priced class** for the
+  affected currency (the per-seat-class fare error is caught in `search.service.ts:1041`, so the trip
+  is listed without a fare rather than 500ing), and an authoritative `calculateFare` on the booking
+  path — which does not swallow the error — rejects the booking. No path prices at parity by default.
+  Proven by `e2e-ui/specs/propagation/pb-config-propagation.spec.ts` (PB-10): with the rate present the
+  USD search returns a priced fare; with it deleted the search returns an empty `faresByClass` instead
+  of a ~100×-collapsed fare (red before the fix, green after). Note: `getExchangeRate` still resolves
+  only the *direct* rate (no inverse/bridge) — unifying it with `getRateOrThrow` is the separate H-3
+  cleanup; failing closed here is strictly safer than the old silent 1.0.
+
+### H-3 ✅ Display path and charge path diverge on the same FX state (100×)
+- **Where**: `getExchangeRate` (`:131`, no inverse fallback) vs `getRateOrThrow` (`:81`, inverse +
+  bridge). The fare/display uses the former; the charge uses the latter.
+- **Repro (verified)**: `pricing-currency.e2e-spec.ts` (C2) — with only the inverse rate present,
+  `getExchangeRate(USD,ETB)=1.0` but `getRateOrThrow(USD,ETB)=100` → displayed fare and charged
+  amount differ 100×. Matrix C2/C5.
+- **Fix**: one shared conversion routine with one rounding rule and one fallback policy.
+- **Resolution (booking-record coherence, UA-1b/UA-2/UA-3w)** ✅ — the stored booking record no longer
+  mislabels its amount. Every `booking.create` path (`bookings.service.ts` one-way/round-trip/
+  transit/round-trip-transit + the guest equivalents) now stores `currency: Currency.ETB` (the actual
+  currency of `totalMinor`/the ETB charge basis) instead of the display currency. The passenger-facing
+  amount stays in `displayCurrency`/`displayTotalMinor` (Birr for Ethiopian, DJF for Djiboutian, USD
+  for Other), and every read endpoint already prefers those. The portal `results/page.tsx` on-select
+  now carries the passenger-currency fare (`displayAmountMinor`) forward, aligning with the seats
+  page's already-`displayAmountMinor` fare logic. Net effect (agreed model **A**): the passenger sees
+  and is charged in their own currency; the internal charge basis stays ETB (the unit every downstream
+  calc — wallet debit, loyalty, refund, gateway conversion — already assumes), now honestly labeled.
+  Proven by `e2e-ui/specs/portal/ua2-usd-booking.spec.ts` and `ua3-djf.spec.ts` (UA-3w): `currency`
+  is `ETB` while `displayCurrency`/`displayTotalMinor` carry USD/DJF — red before the fix
+  (`currency` was `USD`/`DJF`), green after; UA-1 (ETB) unchanged. The deeper H-3 (unify
+  `getExchangeRate`/`getRateOrThrow`) and H-4 (branded Minor/Major units) refactors remain open.
+
+### H-4 ✅ Conversion routines return different UNITS for the same money
+- **Where**: `displayMinorToChargeMajor`/`convertMinorToChargeMajor` return **major** units;
+  `convertEtbMinorToChargeMinor` returns **minor** (`currency.service.ts:27,61,35`);
+  `payments.service.ts:250-281` writes the major result into a field named `amountMinor`.
+- **Repro (verified)**: `pricing-currency.e2e-spec.ts` (C5) — same amount comes out 100× apart.
+- **Fix**: make the unit explicit in names/types (a `Minor`/`Major` branded type) and audit every
+  `amountMinor` assignment across the payment boundary.
+
+### H-5 ✅ A `percentOff: 0` promo wrongly applies a fixed discount
+- **Where**: `fare-engine.service.ts:185` — `promo.percentOff ? percent : amountOffMinor`; `0` is
+  falsy.
+- **Repro (verified)**: `pricing-fare-engine.e2e-spec.ts` (D4) — promo `{percentOff:0,
+  amountOffMinor:5000}` deducts 5000 instead of 0.
+- **Fix**: test `percentOff != null` rather than truthiness.
+
+### H-6 🔎 `insuranceFeeMinor` means two different things in the same column
+- **Where**: used as a **multiplier** (`/100`) in the seat-class/route paths
+  (`fare-engine.service.ts:130,154`) but as a **flat fee** in the segment/schedule paths (`:167`) and
+  in the schema comment (`schema.prisma:95`).
+- **Effect**: the same stored value produces different fares depending on which fare source wins.
+  Matrix B1.
+- **Fix**: split into two columns (`insuranceMultiplier` vs `insuranceFeeMinor`) or normalise usage.
+
+### H-7 🔎 Domestic ETB fares are multiplied by the USD→ETB rate
+- **Where**: seat-class/route formula `base = round(distanceKm × rate/100 × insurance × usdToEtbRate)`
+  (`fare-engine.service.ts:157-160`). For a LOCAL (ETB) fare this multiplies by USD→ETB.
+- **Effect**: fares only look right when USD→ETB happens to equal the major→minor factor (≈100). Set
+  a realistic rate (~132) and every domestic fare is ~30% off. Matrix B2. (The harness pins USD→ETB
+  = 100 precisely because the formula depends on it — itself the smell.)
+- **Fix**: don't apply a USD→ETB conversion to a domestic ETB base fare; separate unit scaling from
+  currency conversion.
+
+### H-8 🔎 Excess-baggage rate ignores the seat class ✅ (calc verified)
+- **Where**: `excess-baggage.service.ts:53` — `baggageAllowance.findFirst({ orderBy:{createdAt:'asc'}})`
+  (oldest global row, no `where`).
+- **Repro (verified)**: `money-integrity.e2e-spec.ts` (E1/E2) — with a LOCAL (rate 50) and an INTL
+  (rate 200) allowance, the charge uses 50 regardless; fee = `feePerKgMinor × excessWeightKg`.
+- **Fix**: look up the allowance by the booking's `seatClassId`.
+
+### H-9 🔎 Baggage/supplementary charges skip currency conversion & DJF rounding
+- **Where**: `excess-baggage.service.ts:166` and `supplementary-charges.service.ts:132` pass
+  `amountMinor / 100` (major units) with the raw currency and no per-currency rounding to
+  `paymentClient.initiate`.
+- **Effect**: wrong amount for DJF (0-decimal) and any non-ETB currency. Matrix E2/E-supp.
+- **Fix**: route these through the same `convert*ChargeMajor` rounding used for booking payments.
+
+### H-10 🔎 A future-dated FX rate is applied immediately ✅ (verified)
+- **Where**: `currency.service.ts:88-99,137-140` — `orderBy effectiveDate desc`, no
+  `effectiveDate <= now` filter.
+- **Repro (verified)**: `pricing-currency.e2e-spec.ts` (C3) — a rate dated one year out is used now.
+- **Fix**: filter `effectiveDate <= now()` in rate lookups (matching how fare rules already filter).
+
+### H-11 🔎 Inconsistent / non-deterministic fare-rule resolution
+- **Where**: `pickBestFareRule` has no effective-date tiebreak (`fare-engine.service.ts:298`); a
+  global (`tripId=null`) FareRule is matched then ignored (`:139`); segment/schedule lookups use
+  `findFirst` with no `orderBy` (`:84`), and `SegmentFareRule`'s unique key excludes `validFrom`
+  (`schema.prisma:1113`) so fares can't be versioned by date. Matrix B4/B5.
+- **Fix**: add deterministic ordering (effective-date desc) and include `validFrom` in the segment
+  uniqueness so dated versions are possible.
+
+### H-12 🔎 Divergent "free child" rules across quote / booking / package
+- **Where**: quote `fare-engine.service.ts:172` uses `min(child, adult)`; booking
+  `bookings.service.ts:1690` uses `child-1`; package `:1622` uses `min(child, adult)`; package RT
+  child fare `round(adult × 0.1)` float (`payments.service.ts:135,180`, `bookings.service.ts:34-40`).
+- **Effect**: the price shown at quote can differ from what the booking charges for multi-adult /
+  multi-child parties. Matrix B6/B7.
+- **Fix**: one shared fare function used by quote, booking, and payment.
+
+### H-13 ✅ A valid promo is silently dropped in the browser flow (customer overcharged)
+- **Where**: `GET /search/fare-breakdown` (`search.service.ts:940-970`) computes the discount into a
+  SEPARATE `discountMinor` / discounted `totalMinor`, but returns per-passenger `displayFareMinor`
+  **undiscounted**. The review page (`portal/src/app/booking/review/page.tsx:587`) reduces the
+  per-passenger fares and sends their sum as `reviewedTotalMinor` — i.e. the **undiscounted
+  subtotal** — ignoring `discountMinor`. Promo only enters via the `?promoCode=` URL param (no UI
+  input).
+- **Repro**: ✅ verified in-browser — `e2e-ui/specs/portal/ua8-promo-drop.spec.ts`: with a valid 10%
+  promo, the breakdown shows `discountMinor > 0` and `totalMinor < subtotalMinor`, yet the booking is
+  stored at the full `subtotalMinor`.
+- **Expected**: the discounted total is booked and charged. **Actual**: the customer is charged full
+  price despite a valid promo — a silent overcharge (and a broken promo feature). Matrix D / UA-8.
+- **Fix**: book the breakdown's discounted `totalMinor` (not the client-summed per-pax undiscounted
+  fares); or return discounted per-pax fares. Best combined with C-1 (server recomputes the
+  authoritative total, promo included, and rejects a client mismatch).
+- **Resolution (authed one-way)** ✅ — `bookings.service.ts` `createOneWayBooking` now applies the
+  authoritative promo discount server-side. The portal still forwards `promoCode` in the booking body,
+  so `calculateFare` already computes `discountMinor` — the total-resolution branches simply never
+  subtracted it. When the total comes from a client-summed subtotal (per-seat sum or
+  `reviewedTotalMinor`, both undiscounted), the code now subtracts `fareCalculation.discountMinor`
+  (converted to display currency for the display total) so the stored/charged `totalMinor` =
+  `subtotal − discount`. The engine-fallback branch already booked the discounted `totalMinor`, so it
+  is excluded (via a `usedClientSubtotal` flag) to avoid double-subtracting; no-op when no promo
+  applies (`discountMinor === 0`), so UA-11 (expired promo) and the non-promo specs are unaffected.
+  This composes with the C-1 floor guard: after the discount is applied the resolved total equals the
+  authoritative fare, so the guard passes. Proven by `e2e-ui/specs/portal/ua8-promo-drop.spec.ts`
+  (booking now stored at `subtotal − discount`; red before the fix, green after). The **round-trip**
+  and **guest** paths share the same latent frontend drop but have no UI spec yet — tracked for a
+  follow-up; the guest service additionally still overrides its discounted total with
+  `reviewedTotalMinor` (see the PROMO REALITY note in `docs/ui-e2e-test-matrix.md`).
+
+---
+
+## MEDIUM — backoffice config accepts invalid data / unsafe deletes
+
+### M-1 ✅ Negative fares accepted (missing `@Min`)
+- **Where**: `schedules.dto.ts:85,95` (`CreateFareRuleDto`/`CreateSegmentFareRuleDto.baseFareMinor`,
+  `@IsInt` only); `seat-classes.dto.ts:29` (`basePrice`). Sibling `segments/segment-fare.dto.ts:24`
+  *does* have `@Min(0)` — inconsistent.
+- **Repro (verified)**: `config-validation.e2e-spec.ts` (H1/H2) — negative values pass validation;
+  the guarded sibling rejects them.
+- **Fix**: add `@Min(0)` to every money DTO field.
+- **Resolution (seat-class base price)** ✅ — `seat-classes.dto.ts` `CreateSeatClassDto.basePrice` and
+  `insuranceFeeMinor` now carry `@Min(0)`; because `UpdateSeatClassDto extends PartialType(...)` the
+  constraint applies to `PATCH /seat-classes/:id` too. A negative `basePrice` is rejected with 400 at
+  the DTO layer (matching the backoffice form's `min=0`), so it never reaches the DB. Proven by
+  `e2e-ui/specs/propagation/pb-config-propagation.spec.ts` (BC-7): `basePrice:-500` → 400, a valid
+  write still succeeds (red before the `@Min`, green after). The other money DTOs named above
+  (`schedules.dto.ts` `CreateFareRuleDto`/`CreateSegmentFareRuleDto.baseFareMinor`) are not exercised
+  by a UI spec and remain a follow-up for full M-1 closure.
+
+### M-2 ✅ Promo bounds/date not validated
+- **Where**: `promos.dto.ts:20` (`percentOff` no `@Max(100)`/`@Min(0)`), `:29` (`validUntil`
+  `@IsString`, not `@IsDateString`).
+- **Repro (verified)**: `config-validation.e2e-spec.ts` (H4/H5) — `percentOff:200` and
+  `validUntil:"not-a-real-date"` both pass.
+- **Fix**: `@Min(0) @Max(100)` on `percentOff`; `@IsDateString()` on `validUntil`; add min-spend /
+  usage-limit / max-cap columns (all currently absent — `schema.prisma:785`).
+- **Resolution (percentOff bounds)** ✅ — `promos.dto.ts` `CreatePromotionDto.percentOff` now carries
+  `@Min(0) @Max(100)` and `amountOffMinor` carries `@Min(0)`, so `POST /promos` with `percentOff:200`
+  is rejected with 400 at the DTO layer while a valid ≤100% promo still saves. Proven by
+  `e2e-ui/specs/backoffice/config-validation.spec.ts` (BC-8): `percentOff:200` → 400, `percentOff:50`
+  → 201 (red before the bounds, green after). The `validUntil` `@IsDateString` tightening and the
+  missing min-spend/usage-limit/max-cap columns remain a follow-up (not exercised by BC-8).
+
+### M-3 🔎 `PATCH /config` accepts arbitrary unvalidated key/values
+- **Where**: `system-config.controller.ts:34` (no DTO) → `system-config.service.ts:56-59` stores a
+  raw `Record<string,string>`. Setting `seat_hold_duration_minutes = -1` or `"abc"` is persisted.
+  Matrix H7.
+- **Fix**: a whitelisted, typed DTO with per-key numeric/range validation.
+- **Resolution** ✅ — `system-config.dto.ts` adds `UpdateSystemConfigDto`, a whitelisted body listing
+  every known config key, each `@Type(() => Number) @IsInt() @Min(...)` (seat-hold bounded 1..60,
+  throttle limits/TTLs `@Min(1)`, hour windows `@Min(0)`). The controller now accepts the DTO (so the
+  global whitelisting ValidationPipe strips unknown keys and enforces the ranges) and persists the
+  validated values back as strings. `PATCH /config {seat_hold_duration_minutes:"-1"}` (or `"abc"`) is
+  rejected with 400; a sane value still stores. Proven by
+  `e2e-ui/specs/backoffice/config-validation.spec.ts` (BC-9): `-1` → 400, `15` → stored (red before
+  the DTO, green after).
+
+### M-4 🔎 Past-dated schedules accepted; train can be double-booked across routes
+- **Where**: `schedules.service.ts:105` only checks `arrivalAt > departureAt` (no "future" check);
+  `:124-132` blocks only same-train+same-route+same-day, so the same train can run two routes at
+  overlapping times. Matrix H3/H4.
+- **Fix**: reject past `departureAt`; widen the overlap check to the train across all routes.
+- **Resolution (past departure)** ✅ — `schedules.service.ts` `createSchedule` now rejects a
+  `departureAt` in the past (`dep.getTime() < Date.now()` → 400) alongside the existing
+  `arrivalAt > departureAt` check. Proven by `e2e-ui/specs/backoffice/config-validation.spec.ts`
+  (BC-10): a 2020 departure → 400 while a future schedule still creates (red before the guard, green
+  after). Scoped to creation (an admin may still need to edit metadata on an already-departed
+  schedule via `updateSchedule`). The cross-route train double-booking overlap widening remains a
+  follow-up (not exercised by BC-10).
+
+### M-5 🔎 Deletes ignore referencing bookings; one cascade is non-transactional
+- **Where**: station delete ignores bookings (`stations.service.ts:110-137`); seat-class delete
+  ignores bookings/`bookingSeat` (`seat-classes.service.ts:53-81`); `currencies.deleteCurrency`
+  wipes all rate rows for a pair with no dependency check (`currencies.service.ts:119-134`) → future
+  fares for that pair fall to the 1.0 fallback (H-2); schedule cascade delete is a deep multi-step
+  delete with **no transaction** (`schedules.service.ts:438-485`) → partial-delete on failure.
+  Matrix I3–I6.
+- **Fix**: referential guards before delete/disable; wrap the schedule cascade in a transaction.
+
+### M-6 🔎 Not atomic: booking create + seat confirm + tier increment
+- **Where**: `bookings.service.ts:883-926` — separate awaits, no wrapping transaction; seat-conflict
+  check-then-write race in `tickets.service.ts:357-372`. Matrix G8.
+- **Fix**: wrap the create/confirm/increment in a single transaction.
+
+---
+
+## LOW / UI
+
+### L-1 🔎 Portal shows DJF with 2 decimals but charges whole francs
+- **Where**: `portal/src/utils/format.ts:22-28` (`Intl.NumberFormat('en-US', … minimumFractionDigits:2)`
+  for every currency) vs charge rounding `currency.service.ts:9-13` (DJF = 0 decimals). Matrix C6/K3.
+- **Status**: needs the Playwright/UI suite (not yet run — see below).
+- **Fix**: format per `CHARGE_CURRENCY_DECIMALS`.
+
+### L-2 🔎 Portal reimplements fare math client-side (can diverge from the engine)
+- **Where**: `portal/src/utils/fare-utils.ts:50,67,93`; `portal/src/app/booking/review/page.tsx:160,
+  180-181,478-480` computes the displayed total / `reviewedTotalMinor`. Matrix K1/K2 + ties to C-1.
+- **Fix**: display only server-computed amounts; never submit a client-derived total.
+
+### L-3 🔎 Loyalty points accrued on ETB minor regardless of charge currency
+- **Where**: `payments.service.ts:1062,1067` — `floor(amountMinor/100)` on `booking.totalMinor`
+  (always ETB minor). Matrix F5.
+- **Fix**: accrue from the actual charged amount/currency.
+
+---
+
+## Not yet covered (honest gaps)
+
+- **Suite K (browser / Playwright)** — L-1 and L-2 (UI price rendering & client-side fare math) are
+  confirmed by source reading but **not** yet reproduced in a browser. Running them needs the portal
+  + backoffice Next.js apps up with a seeded search result. Scaffolding is the remaining step of the
+  "light Playwright" scope.
+- **C-1, C-4, C-6** are now reproduced (`critical-repro.e2e-spec.ts`). **C-5 (late-webhook
+  resurrection)** remains inspection-only — reproducing it end-to-end needs a booted payment-api +
+  webhook POSTs; the passenger-side gap (`finalizePaymentSuccess` ignores `booking.status`) is
+  directly readable.
+- **`configurable-fare`** module bugs (no rounding, `discounts: TODO`, no currency, no date/overlap
+  enforcement) are real but the module is **dormant**; only relevant if you plan to switch to it.
+
+---
+
+## Suggested priority order to fix
+
+1. **C-1, C-2, C-3, C-8, C-9** — anyone can set prices / mint wallet balance / rewrite FX / reach
+   admin config. These are actively exploitable.
+2. **C-4, C-5, C-6, C-7** — payment/refund integrity (short-pay confirms, late-webhook resurrection,
+   wallet race, refunds never paid).
+3. **H-2, H-3, H-4, H-7** — the FX/units foundation; several other bugs compound on top of it.
+4. **H-1, H-5, H-8..H-12, M-1, M-2** — pricing correctness + validation gaps.
+5. **M-3..M-6, L-1..L-3** — config safety and UI consistency.
diff --git a/docs/SOLUTIONS.md b/docs/SOLUTIONS.md
new file mode 100644
index 000000000..d6d1752dd
--- /dev/null
+++ b/docs/SOLUTIONS.md
@@ -0,0 +1,141 @@
+# EDR Passenger — Solutions
+
+Concrete fixes for the confirmed findings in `docs/ISSUES.md`. Ordered by priority. Each references
+the exact site and the intended change. Code sketches are illustrative, not drop-in patches.
+
+**Test coverage backing these:** 28 automated tests (25 API `jest` + 3 UI Playwright) reproduce the
+✅ findings. Fix a finding → its 🔴 test flips from "bug present" to failing; update the test to
+assert the corrected behavior.
+
+---
+
+## P0 — deploy blockers (money creation/theft, broken booking)
+
+### C-10 — Authenticated `POST /bookings` is broken
+`bookings.service.ts:773` resolve unconditionally; delete the UUID-format gate:
+```ts
+// BEFORE: resolves only when passengerId is NOT a UUID (never fires for real IAM ids)
+if (dto.passengerId && !dto.passengerId.match(/^[0-9a-f-]{36}$/i)) { … }
+// AFTER: always translate the authenticated identity → the Passenger.id
+if (dto.passengerId) {
+  const passenger = await this.prisma.passenger.findUnique({
+    where: { iamUserId: dto.passengerId }, select: { id: true },
+  });
+  if (passenger) dto = { ...dto, passengerId: passenger.id };
+  // else: leave as-is only if it already IS a Passenger.id (guest/admin paths)
+}
+```
+Keep the controller's "don't trust the body" intent (`bookings.controller.ts:528`) — it's correct to
+take identity from the JWT; the service just has to map iamUserId → Passenger.id. Regression test:
+`test/authed-booking-passengerid.e2e-spec.ts`.
+
+### C-1 — Booking total is client-controlled
+`bookings.service.ts:863-899`: stop trusting `reviewedTotalMinor`/`seatFareMinor`. Recompute the fare
+server-side and reject a mismatch:
+```ts
+const server = fareCalculation.totalMinor;
+if (dto.reviewedTotalMinor != null && Math.abs(dto.reviewedTotalMinor - server) > 1) {
+  throw new BadRequestException('Price changed — please review the updated fare');
+}
+resolvedTotalMinor = server; // never persist a client amount as the charge basis
+```
+Apply the same to `guest-booking.service.ts:206-245`.
+
+### C-2 — Loyalty redemption unbounded + never deducted
+`bookings.service.ts:1705` (and `:1028/:1249/:1451`): validate + debit inside the booking transaction:
+```ts
+const acct = await tx.loyaltyAccount.findUnique({ where: { passengerId } });
+const pts = Math.min(dto.loyaltyRedemptionPoints ?? 0, acct?.pointsBalance ?? 0, MAX_REDEEM);
+const loyaltyMinor = pts * POINTS_TO_MINOR;
+await tx.loyaltyLedgerEntry.create({ data: { accountId: acct.id, delta: -pts, reason: 'REDEEMED', balanceAfter: acct.pointsBalance - pts } });
+await tx.loyaltyAccount.update({ where: { id: acct.id }, data: { pointsBalance: { decrement: pts } } });
+```
+
+### C-3 — Wallet top-up: no ownership, no backing
+- `wallet.controller.ts:34`: enforce `req.user` owns `:passengerId` (or is admin) before top-up.
+- `wallet.service.ts:50`: only credit after a confirmed `PaymentIntent` (a top-up is a purchase).
+- `wallet.controller.ts:23-24`: remove `@IsPublic()` from `GET /wallet/accounts`.
+
+### C-4 — Payment amount never validated
+- `intents.service.ts:541-548`: on `confirmedAmountMinor !== intent.amountMinor`, do NOT mark
+  SUCCEEDED — set a `AMOUNT_MISMATCH` state and alert. Populate `confirmedAmountMinor` in each
+  webhook handler (e.g. `waafi-webhook.service.ts:63`).
+- `payments.service.ts:809` `finalizePaymentSuccess`: assert the settled amount equals
+  `booking.totalMinor` before confirming.
+
+### C-5 — Late webhook resurrects an expired/cancelled booking
+`payments.service.ts:809` `finalizePaymentSuccess`: refuse to confirm unless the booking is still
+`PENDING_PAYMENT`; route a late success to the refund/again-available flow:
+```ts
+if (booking.status !== 'PENDING_PAYMENT') { await this.refundLatePayment(intent); return { alreadyFinalized: true }; }
+```
+
+### C-6 — Wallet double-spend (no row lock)
+`payments.service.ts:461-484`: lock the row or use an atomic conditional update:
+```ts
+const res = await tx.$executeRaw`UPDATE passenger."WalletAccount"
+  SET "balanceMinor" = "balanceMinor" - ${total}
+  WHERE "passengerId" = ${booking.passengerId} AND "balanceMinor" >= ${total}`;
+if (res === 0) return { success: false }; // insufficient / lost the race
+```
+Regression test: `critical-repro.e2e-spec.ts` (C-6, barrier-forced interleave).
+
+### C-7 — Refund computed but never disbursed
+`bookings.service.ts:2017-2027`: on `booking.cancelled`, actually disburse — credit the wallet or call
+the provider refund — and drive `refundStatus PENDING → PROCESSING → COMPLETED`. Add a reconciliation
+sweep for stuck `PENDING` rows.
+
+### C-8 — Exchange-rate writes missing the ADMIN check (any passenger can write FX)
+`fare-engine/currency.controller.ts:25,32`: add `@PassengerAdmin()` (+ `@ApiBearerAuth`) to the `PUT`
+and `PATCH` handlers, matching the already-guarded `DELETE`. (Not unauthenticated — the global
+JwtGuard requires a token; the gap is the missing *authorization*. Verified live: passenger → 200.)
+
+### C-9 — `@Roles('ADMIN')` is dead
+Register the guard globally so `@Roles` is enforced:
+```ts
+// app.module.ts providers
+{ provide: APP_GUARD, useClass: RolesGuard }
+```
+…or convert `configurable-fare` / `segment-fare` / `system-config` controllers to the working
+`@PassengerAdmin()`/`@PassengerStaff()` guards.
+
+---
+
+## P1 — pricing correctness (HIGH)
+
+- **H-1 promo → negative total** (`fare-engine.service.ts:192`): `totalEtbMinor = Math.max(0, subtotal - discount)`; DTO `@Min(0) @Max(100)` on `percentOff`, `@Min(0)` on `amountOffMinor` (`promos.dto.ts:20,26`).
+- **H-2 missing FX → 1.0** (`currency.service.ts:142`): remove the silent `return 1.0` — throw / block the quote so it fails closed.
+- **H-3/H-4 FX divergence & unit confusion** (`currency.service.ts`): collapse the 4 routines into one `convert(fromMinor, from, to): {minor|major}` with one rounding + one fallback policy; give it a branded `Minor`/`Major` return type and audit every `amountMinor` assignment across the payment boundary.
+- **H-5 `percentOff:0` treated as FIXED** (`fare-engine.service.ts:185`): use `promo.percentOff != null ? … : promo.amountOffMinor`.
+- **H-6 `insuranceFeeMinor` dual meaning** (`fare-engine.service.ts:130,154,167`): split into `insuranceMultiplierBps` and `insuranceFeeMinor`; use one consistently.
+- **H-7 domestic ETB fare × USD→ETB rate** (`fare-engine.service.ts:157`): don't apply a currency conversion to a domestic base fare — separate the minor-unit scaling from FX.
+- **H-8 baggage ignores seat class** (`excess-baggage.service.ts:53`): `findFirst({ where: { seatClassId } })`.
+- **H-9 baggage/supp skip conversion + DJF rounding** (`excess-baggage.service.ts:166`, `supplementary-charges.service.ts:132`): route through `convertMinorToChargeMajor`.
+- **H-10 future-dated FX applied now** (`currency.service.ts:88,137`): add `effectiveDate: { lte: new Date() }` to the rate lookups.
+- **H-11 non-deterministic fare resolution** (`fare-engine.service.ts:84,298`): add `orderBy: { validFrom: 'desc' }`; include `validFrom` in `SegmentFareRule`'s unique key (`schema.prisma:1113`) to allow dated versions.
+- **H-12 divergent free-child rules** (`fare-engine.service.ts:172` vs `bookings.service.ts:1690` vs `:1622`): extract ONE `computeFare()` used by quote, booking, and payment.
+- **H-13 promo silently dropped → overcharge** (`review/page.tsx:587`, `search.service.ts:940-970`): book the breakdown's discounted `totalMinor`, not the client-summed undiscounted per-pax fares — or return discounted per-pax fares. Fold into the C-1 fix (server recomputes the authoritative total incl. promo).
+
+---
+
+## P2 — config validation & safety (MEDIUM) / UI (LOW)
+
+- **M-1 negative fares**: add `@Min(0)` to `baseFareMinor` (`schedules.dto.ts:85,95`) and `basePrice` (`seat-classes.dto.ts:29`).
+- **M-2 promo bounds/date**: `@Min(0) @Max(100)` on `percentOff`, `@IsDateString()` on `validUntil` (`promos.dto.ts`); add min-spend / usage-limit / max-cap columns.
+- **M-3 `PATCH /config` arbitrary**: replace the raw body with a whitelisted, typed DTO with per-key range checks (`system-config.controller.ts:34`).
+- **M-4 past-date / double-booked schedules** (`schedules.service.ts:105,124`): reject past `departureAt`; widen the overlap check to the train across all routes.
+- **M-5 deletes ignore references** (`stations`/`seat-classes`/`currencies`/`schedules` services): add referential guards before delete/disable; wrap the schedule cascade (`schedules.service.ts:438-485`) in a transaction.
+- **M-6 non-atomic booking write** (`bookings.service.ts:883-926`): wrap create + confirmSeats + tier increment in one `$transaction`.
+- **L-1 DJF shown with 2 decimals** (`portal/src/utils/format.ts:22`): format per `CHARGE_CURRENCY_DECIMALS` (DJF = 0).
+- **L-2 client-side fare math** (`portal/src/utils/fare-utils.ts`, `review/page.tsx`): render only server-computed amounts; never submit a client-derived total (ties to C-1).
+- **L-3 loyalty accrual currency** (`payments.service.ts:1062`): accrue from the actual charged amount/currency, not ETB minor.
+
+---
+
+## Suggested sequencing
+
+1. **C-10, C-3, C-8, C-9** — quickest high-impact (a few lines each): unblock authenticated booking, stop free wallet credit, guard FX writes, enforce roles.
+2. **C-1, C-2, C-4, C-5, C-6, C-7** — the money-integrity core (needs transactions + validation).
+3. **H-2, H-3, H-4, H-7** — the FX/units foundation others compound on.
+4. **H-1, H-5, H-8..H-12, M-1, M-2** — pricing correctness + validation.
+5. **M-3..M-6, L-1..L-3** — config safety + UI consistency.
diff --git a/docs/TESTING.md b/docs/TESTING.md
new file mode 100644
index 000000000..799143cac
--- /dev/null
+++ b/docs/TESTING.md
@@ -0,0 +1,137 @@
+# EDR Passenger — Testing Runbook
+
+How to run **everything**: the API bug-hunt harness and the UI (browser) harness, view the reports,
+run a single test, and troubleshoot. Both are hermetic (their own Postgres on 5544 — never prod).
+
+- **Findings:** `docs/ISSUES.md`  ·  **Fixes:** `docs/SOLUTIONS.md`
+- **Test plans:** `docs/e2e-test-matrix.md` (API) · `docs/ui-e2e-test-matrix.md` (UI)
+
+---
+
+## 0. Prerequisites (one time)
+
+- **Docker Desktop** running (the harness starts Postgres + RabbitMQ containers).
+- **Node ≥ 20**, **pnpm 11** (`corepack enable` if needed).
+- Install deps once: `pnpm install` (from repo root).
+
+That's it — no manual DB, env, or auth setup. The scripts handle migrations, seeding, and auth.
+
+---
+
+## 1. Run the API harness (fast — no browser)
+
+Covers pricing math, FX, wallet/refund/payment integrity, config validation, auth gaps, and the
+authenticated-booking regression. **25 tests.**
+
+```bash
+bash e2e/run.sh                 # infra + migrate + run + open HTML report
+#   or:  pnpm test:e2e:passenger
+```
+
+Flags: `bash e2e/run.sh --down` (tear DB down after) · `--no-open` (don't open the browser).
+
+Report → `apps/edr-passenger-api/e2e-report/index.html`.
+
+**Run a single API suite / test:**
+```bash
+cd apps/edr-passenger-api
+npx jest --config ./test/jest-e2e.json test/pricing-fare-engine.e2e-spec.ts
+npx jest --config ./test/jest-e2e.json -t "double-spend"     # by test name
+```
+(The test DB must be up — run `bash e2e/prepare.sh` once if you skipped `e2e/run.sh`.)
+
+---
+
+## 2. Run the UI harness (browser — Playwright)
+
+Covers the real portal booking flow (search → pay → confirm) with the price cross-check, plus
+backoffice auth. **One command boots the whole stack** (Postgres + RabbitMQ + passenger-api +
+portal + backoffice), seeds a bookable trip, mints passenger + staff auth, runs, and opens the report.
+
+```bash
+pnpm test:e2e:ui                # = bash e2e-ui/run.sh  (turnkey)
+```
+
+First run takes ~1–2 min (it builds `@edr/types` and boots the Next.js apps). If the stack is already
+running, it reuses it. Report → `e2e-ui-report/index.html`.
+
+**Run a subset / single UI test** (stack already up):
+```bash
+pnpm test:e2e:ui:only --project=portal            # just the portal booking tests
+pnpm test:e2e:ui:only --project=backoffice
+npx playwright test -c e2e-ui/playwright.config.ts ua1        # by file name
+```
+
+**Watch it run in a real browser** (headed) or step through it:
+```bash
+npx playwright test -c e2e-ui/playwright.config.ts --project=portal --headed
+npx playwright test -c e2e-ui/playwright.config.ts --project=portal --debug   # Playwright Inspector
+npx playwright show-report e2e-ui-report                       # open a past report
+npx playwright show-trace test-results/**/trace.zip            # trace of a failed run
+```
+
+Projects: `portal` (logged-in passenger), `guest` (no auth), `backoffice` (staff), `propagation`
+(Track B — staff writes config via API → passenger portal reads; 4 tests).
+
+---
+
+## 3. Run absolutely everything
+
+```bash
+bash e2e/run.sh --no-open       # API: 25 tests
+pnpm test:e2e:ui                # UI: 9 tests (boots the stack)
+```
+
+Or the standalone hermetic API DB only: `bash e2e/prepare.sh` then `pnpm --filter @edr/passenger-api test:e2e`.
+
+---
+
+## 4. What each harness contains
+
+| Harness | Location | What it proves |
+| --- | --- | --- |
+| API | `apps/edr-passenger-api/test/*.e2e-spec.ts` + `e2e/` | fare/FX math, promo/negative-total, wallet double-spend, refund-never-paid, FX-write authz gap, DTO validation gaps, **C-10 authed-booking FK regression** |
+| UI | `e2e-ui/` | **UA-1** booking money cross-check; **UA-13** 🔴 client-forged total (C-1); **UA-8** 🔴 promo dropped (H-13); **Track B** — fare change propagates live (PB-2), **C-8** passenger rewrites FX, **M-1** negative price accepted; smokes |
+
+A test name with **🔴** encodes buggy behavior — when it **passes**, the bug is present. After you
+apply a fix from `docs/SOLUTIONS.md`, flip that test to assert the corrected behavior.
+
+Seed for the UI flow: `apps/edr-passenger-api/test/fixtures/seed-ui.ts` (bookable Train/Schedule/
+Coach/Seats + WALLET/TELEBIRR payment methods + promos + funded wallet). Standalone:
+`DATABASE_URL=…5544 npx ts-node test/fixtures/seed-ui.ts`.
+
+---
+
+## 5. Teardown
+
+```bash
+docker compose -f e2e/docker-compose.yml down     # stops + wipes the test DB + RabbitMQ
+```
+The dev app processes (api/portal/backoffice) started by Playwright's `webServer` stop with the run;
+if you booted them manually, `lsof -ti :4000 :5174 :5184 | xargs kill`.
+
+---
+
+## 6. Troubleshooting
+
+| Symptom | Cause / fix |
+| --- | --- |
+| `Cannot find module '@edr/types'` on API boot | Types not built → `pnpm --filter @edr/types build` (the run scripts do this). |
+| API boot hangs on `AmqpConnection … ECONNREFUSED` | RabbitMQ not up → `docker compose -f e2e/docker-compose.yml up -d rabbitmq-e2e`. |
+| `EADDRINUSE :::4000` | A stale API instance is bound → `lsof -ti :4000 | xargs kill -9`, then re-run. |
+| Backoffice test redirects to `/login` | Staff storageState missing/expired → it's re-minted every run by `global-setup`; ensure `SEED_PASSENGER_STAFF=true` in `apps/edr-passenger-api/.env`. |
+| Portal booking 400 `Booking_passengerId_fkey` | **This is finding C-10** (real bug). The harness seeds `Passenger.id == iamUserId` to work around it — see `docs/ISSUES.md` C-10. |
+| Docker daemon not running | `open -a Docker`, wait ~15s, re-run. |
+| Ports differ | api 4000, portal 5174, backoffice 5184, payment 3003, Postgres 5544, RabbitMQ 5672. Override via `PORTAL_URL` / `BACKOFFICE_URL` / `API_URL` / `DATABASE_URL` env. |
+
+---
+
+## 7. Coverage status & what's next
+
+- **Done:** full hermetic harness, 34 green tests (25 API + 9 UI). UA-1 keystone + UA-8/UA-13 abuse
+  rows, Track B propagation (PB-2, C-8, M-1), both auth roles, `BookingFlow` page-object.
+- **Next (Track A):** more `bookOneAdult` variations — UA-2 (USD), UA-6 (round-trip); multi-passenger
+  free-child (UA-4/5) + gateway/DJF (UA-3) need helper extensions (per-pax form, forged webhook).
+- **Next (Track B):** PB-5 (disable station→gone), PB-10 (delete FX→1.0 fallback), config-mid-flight.
+
+See `docs/ui-e2e-test-matrix.md` for the full row-by-row plan.
diff --git a/docs/e2e-test-matrix.md b/docs/e2e-test-matrix.md
new file mode 100644
index 000000000..ee7c7ccc3
--- /dev/null
+++ b/docs/e2e-test-matrix.md
@@ -0,0 +1,174 @@
+# EDR Passenger Platform — E2E Test Matrix (Phase 1 deliverable)
+
+**Goal:** find real issues, prioritizing pricing integrity and backoffice configuration.
+**Status:** DRAFT for review. No tests written yet. Nothing runs against production.
+
+Two systems were discovered that shape everything below:
+
+- **Two parallel fare systems.** `fare-engine` (integer "minor" math) is the **live** pricing pipeline. `configurable-fare` (raw-SQL, `fare_configurations`) is fully built but **never called by the live path** (`fare-engine.calculate` never reads `fare_configurations`). *Assumption for this matrix: we target `fare-engine` as the system of record and treat `configurable-fare` as dormant (test only that it is not wired in).* ⚠️ **Confirm.**
+- **The domain seed is disabled.** Every step in `prisma/seed.ts main()` (~L894) is commented out — `pnpm prisma:seed` creates nothing. The harness must re-enable/call the seeders or build fixtures.
+
+Legend for **Predicted**: 🔴 = looks like a confirmed defect from static read (test will document/repro), 🟠 = suspicious, needs runtime verification, 🟢 = expected to pass (guard/happy-path).
+
+---
+
+## The master invariant (Suite A drives everything)
+
+For every booking flow, assert the chain is equal at every hop:
+
+```
+portal displayed price  ==  API fare-quote  ==  amount stored on booking (totalMinor/displayTotalMinor)
+                        ==  amount sent to payment-api (intent)  ==  amount actually charged (webhook)
+                        ==  amount used for loyalty accrual  ==  refund basis on cancel
+```
+
+Any inequality is a finding. The explorers show this chain is **broken by design** in several places (client-supplied totals, pay-time recompute+overwrite, four different currency-conversion routines).
+
+---
+
+## Suite A — Pricing integrity & client-trust (API-level, HIGHEST PRIORITY)
+
+| ID | Scenario | Expected | Targets (file:line) | Predicted |
+|----|----------|----------|---------------------|-----------|
+| A1 | Book with `reviewedTotalMinor: 1` on a real fare | Server rejects / overrides with computed fare | `bookings.service.ts:863-895` | 🔴 books for 1 |
+| A2 | Book with every `seatFareMinor: 0` | Reject / override | `bookings.service.ts:863` | 🔴 books for 0 |
+| A3 | Round-trip with forged `returnSeatFareMinor` | Reject / override | `bookings.service.ts:1065-1095` | 🔴 |
+| A4 | Guest booking with forged total | Reject / override | `guest-booking.service.ts:206-245,494-540` | 🔴 |
+| A5 | `loyaltyRedemptionPoints: 999999` on a 0-point account | Reject; no discount; no negative total | `bookings.service.ts:1028`; `bookings.dto.ts:155` | 🔴 total→0, no deduction |
+| A6 | Confirm displayed==stored==intent==charged for a clean one-way ETB booking | All equal | whole chain | 🟠 baseline |
+| A7 | Same cross-check for USD/DJF display currency | All equal, correct rounding | `payments.service.ts:250-267` | 🟠 DJF rounding suspect |
+| A8 | `initiatePayment` overwrites `booking.totalMinor` at pay time | Read path must not mutate order amount | `payments.service.ts:167-185,209-218` | 🔴 mutates DB on read |
+| A9 | Payment intent `amountMinor` field carries **major** units across service boundary | Consistent unit contract | `payments.service.ts:272-281` | 🟠 unit-confusion |
+
+## Suite B — Fare computation correctness (integration against fare-engine)
+
+| ID | Scenario | Expected | Targets | Predicted |
+|----|----------|----------|---------|-----------|
+| B1 | `insuranceFeeMinor` semantics: multiplier vs flat fee | One consistent meaning | `fare-engine.service.ts:130,154,167` vs schema:95 | 🔴 two meanings, same column |
+| B2 | Unit scale: `/100` in code vs "×100000" schema comment | Documented, consistent | `fare-engine.service.ts:129,153` vs schema:93 | 🟠 1000× ambiguity |
+| B3 | INTERNATIONAL 2× surcharge across all 4 fare sources | Applied consistently | `fare-engine.service.ts:120,141` (missing in route/seat-class) | 🔴 inconsistent |
+| B4 | Global (tripId=null) FareRule that wins priority | Used | `fare-engine.service.ts:139` | 🔴 matched then ignored |
+| B5 | Overlapping segment/schedule fare rules, no orderBy | Deterministic pick | `fare-engine.service.ts:84`; schema:1113 | 🔴 arbitrary DB order |
+| B6 | Free-child rule consistency: quote vs booking vs package | Same rule everywhere | `fare-engine.service.ts:172` vs `bookings.service.ts:1690` vs `:1622` | 🔴 3 divergent rules |
+| B7 | Package round-trip child fare `round(adult × 0.1)` float | Integer, single rule | `payments.service.ts:135,180`; `bookings.service.ts:34-40` | 🔴 float, 3rd rule |
+| B8 | Distance from nullable `distanceKm` float subtraction | Guarded, integer-safe | `fare-engine.service.ts:46` | 🟠 |
+
+## Suite C — Currency / FX
+
+| ID | Scenario | Expected | Targets | Predicted |
+|----|----------|----------|---------|-----------|
+| C1 | Missing USD→ETB rate row | Reject / block, not silent 1.0 | `currency.service.ts:142-147` | 🔴 prices at parity, display path only warns |
+| C2 | Missing rate: display path returns 1.0 but charge path throws | Same behavior both paths | `currency.service.ts:142-147` vs `:108` | 🔴 divergence |
+| C3 | Future-dated FX rate | Not applied until effective | `currency.service.ts:88-99,137` (no `<= now` filter) | 🔴 applies immediately |
+| C4 | Stale FX (>2 days) | Blocked or refreshed | `currency.service.ts:149-154` | 🟠 only warns, still used |
+| C5 | Four conversion routines produce same result for same inputs | Identical rounding | `fare-engine:196`, `currency:61,78`, `payments:733` | 🔴 divergent |
+| C6 | DJF (0-decimal) display vs charge rounding | Consistent whole-franc | `format.ts:22-28` vs `currency.service.ts:9-13` | 🔴 UI shows 2 decimals |
+
+## Suite D — Promos
+
+| ID | Scenario | Expected | Targets | Predicted |
+|----|----------|----------|---------|-----------|
+| D1 | `percentOff: 200` | Reject (max 100) / clamp total at 0 | `promos.dto.ts:20`; `fare-engine.service.ts:185-192` | 🔴 negative total |
+| D2 | `amountOffMinor` > subtotal | Clamp at 0 | `promos.dto.ts:26`; `fare-engine.service.ts:187,192` | 🔴 negative total |
+| D3 | Reuse one promo N times / across users | Usage-limit enforced | `bookings.service.ts:1023-1029`; no limits in schema | 🔴 unlimited |
+| D4 | `percentOff: 0` legit promo | Applies as 0%, not mislabeled FIXED | `fare-engine.service.ts:185`; `promos.service.ts:172` | 🟠 falsy bug |
+| D5 | `validUntil` as arbitrary string / past date | Reject invalid, no dead promo | `promos.dto.ts:29-30` (`@IsString`) | 🔴 accepts Invalid Date |
+| D6 | Promo min-spend / max-cap | Enforced | schema:785 (fields absent) | 🔴 none exist |
+
+## Suite E — Excess baggage & supplementary charges
+
+| ID | Scenario | Expected | Targets | Predicted |
+|----|----------|----------|---------|-----------|
+| E1 | Excess-baggage rate lookup by seat class | Uses booking's class allowance | `excess-baggage.service.ts:53` (oldest global row) | 🔴 wrong allowance |
+| E2 | Baggage/supp charge to payment: `/100` major units, DJF | Per-currency rounding, correct unit | `excess-baggage.service.ts:166`; `supplementary-charges.service.ts:132` | 🔴 no conversion/rounding |
+| E3 | Negative `maxWeightKg`/`maxPiecesCount` allowance | Reject | `excess-baggage.controller.ts:15-16` (no `@Min`) | 🔴 accepts negative |
+| E4 | `markPaid` stores `providerTxnId` | Persisted | `excess-baggage.service.ts:186` | 🟠 discarded |
+
+## Suite F — Wallet & loyalty
+
+| ID | Scenario | Expected | Targets | Predicted |
+|----|----------|----------|---------|-----------|
+| F1 | Top up another passenger's wallet with your JWT | 403 | `wallet.controller.ts:34-39` (no ownership check) | 🔴 credits freely |
+| F2 | Wallet top-up has payment backing | Backed by real payment | `wallet.service.ts:50-56` | 🔴 free money |
+| F3 | `GET /wallet/accounts` public | Auth required | `wallet.controller.ts:23-24` (`isPublic`) | 🔴 leaks balances |
+| F4 | Two concurrent WALLET bookings draining one balance | One fails, no negative | `payments.service.ts:461-484` (no row lock) | 🔴 double-spend |
+| F5 | Loyalty accrual on non-ETB charge | Points from actual charge currency | `payments.service.ts:1062,1067` | 🟠 uses ETB minor always |
+| F6 | Loyalty redemption deducts points / has balance | Deducted, capped | `bookings.service.ts:1028` | 🔴 never deducted (=A5) |
+
+## Suite G — Booking/payment lifecycle & webhooks
+
+| ID | Scenario | Expected | Targets | Predicted |
+|----|----------|----------|---------|-----------|
+| G1 | Webhook `confirmedAmount` < booking total (partial) | Not confirmed | `intents.service.ts:541-548` | 🔴 confirms, mismatch only logged |
+| G2 | Pay a booking >20 min after creation (expired/cancelled) | Reject | `payments.service.ts:809-848`; `bookings.service.ts:2123` | 🔴 re-confirms, re-issues tickets |
+| G3 | Duplicate webhook | Idempotent | `webhook-processor.service.ts:44-58` | 🟢 handled |
+| G4 | Cancel a CONFIRMED booking → refund disbursed | Refund paid to wallet/provider | `bookings.service.ts:2017-2027` | 🔴 stuck PENDING forever |
+| G5 | Refund amount `floor(total × 0.8)` flat | Correct tiered policy | `bookings.service.ts:2021` | 🟠 flat 80%, float |
+| G6 | Seat-hold TTL (config) vs pending-expiry cron (hardcoded 20m) | Consistent | `seats.service.ts:271` vs `bookings.service.ts:2123` | 🔴 mismatch |
+| G7 | Payment amount validated against booking anywhere | Validated | passenger-api + payment-api | 🔴 never |
+| G8 | Booking create + seat confirm + tier increment atomic | Single transaction | `bookings.service.ts:883-926` | 🟠 not atomic |
+| G9 | `forceConfirmPayment` admin-guarded | Admin only | `payments.service.ts:989` | 🟠 verify guard |
+
+## Suite H — Backoffice config validation gaps (API-level, direct-to-API bypassing UI)
+
+| ID | Scenario | Expected | Targets | Predicted |
+|----|----------|----------|---------|-----------|
+| H1 | Negative `baseFareMinor` fare rule | Reject | `schedules.dto.ts:85,95` (no `@Min`) | 🔴 accepts (sibling DTO has `@Min`) |
+| H2 | Negative/zero seat-class `basePrice` | Reject | `seat-classes.dto.ts:29` | 🔴 accepts |
+| H3 | Past `departureAt` schedule | Reject | `schedules.service.ts:105` | 🔴 accepts |
+| H4 | Same train, two routes, overlapping time (same day) | Reject double-booking | `schedules.service.ts:124-132` | 🔴 accepts |
+| H5 | Fare rule `validUntil` < `validFrom`; overlapping windows | Reject | `schedules.dto.ts`; no ordering/overlap check | 🔴 accepts |
+| H6 | Duplicate station `code` | Reject (P2002) | `stations.service.ts:57-61` | 🟠 no catch (verify schema unique) |
+| H7 | `PATCH /config` arbitrary key/value (e.g. `seat_hold_duration_minutes:-1`) | Validated | `system-config.controller.ts:34` (no DTO) | 🔴 stored raw |
+| H8 | Unsupported currency code (outside ETB/USD/DJF enum) | 400 not 500 | `currencies.dto.ts:5`; `currencies.service.ts:55` | 🟠 |
+| H9 | Station lat/lng out of ±90/±180 | Reject | `stations.dto.ts:9-10` | 🟠 |
+
+## Suite I — Config propagation & delete/disable semantics
+
+| ID | Scenario | Expected | Targets | Predicted |
+|----|----------|----------|---------|-----------|
+| I1 | Change exchange rate in backoffice → portal reflects it | Propagates (note 5-min staleTime) | `portal/useCurrencies.ts:20` | 🟠 up to 5 min stale |
+| I2 | Change a fare in backoffice → next search reflects it | Live (no server cache) | `fare-engine.service.ts:29,59` | 🟢 no cache |
+| I3 | Delete a station referenced by bookings | Blocked or safe | `stations.service.ts:110-137` (ignores bookings) | 🔴 orphan/FK risk |
+| I4 | Delete a seat-class referenced by bookings/bookingSeat | Blocked or safe | `seat-classes.service.ts:53-81` | 🔴 ignores bookings |
+| I5 | Schedule cascade delete fails midway | Transactional, no partial delete | `schedules.service.ts:438-485` | 🟠 non-transactional |
+| I6 | Delete currency with active fares/rates | Blocked | `currencies.service.ts:119-134` | 🔴 wipes rates → 1.0 fallback |
+| I7 | Config change mid-flight (edit/disable fare between quote and pay) | Defined behavior | booking freezes at create; pay never re-quotes | 🟠 client-trusted gap |
+
+## Suite J — Auth / authorization gaps
+
+| ID | Scenario | Expected | Targets | Predicted |
+|----|----------|----------|---------|-----------|
+| J1 | Unauthenticated `PUT/PATCH /fare-engine/exchange-rates` | 401 | `fare-engine/currency.controller.ts:25,32` (no guard) | 🔴 anyone rewrites FX |
+| J2 | Non-admin authenticated user CRUDs `/admin/fare-configurations` | 403 | `configurable-fare.controller.ts` (`@Roles` dead) | 🔴 RolesGuard never wired |
+| J3 | Non-admin CRUDs `/admin/segment-fares` | 403 | `segment-fare.controller.ts:15` | 🔴 |
+| J4 | Non-admin reads/writes `/config` | 403 | `system-config.controller.ts:23,32` | 🔴 |
+| J5 | Public exposure of `/search`, `/currencies`, `/wallet/accounts` | Intended-public only | `search.controller.ts`, `wallet.controller.ts:24` | 🟠 balances shouldn't be public |
+
+## Suite K — Browser E2E (Playwright, portal + backoffice)
+
+| ID | Scenario | Expected | Layer |
+|----|----------|----------|-------|
+| K1 | Portal: search → results price == API `displayAmountMinor` | UI math matches server | portal (`fare-utils.ts`, `results/page.tsx:609`) |
+| K2 | Portal: review page total == what booking stores == charged | No client-side divergence | portal (`review/page.tsx:160-181,478`) |
+| K3 | Portal: DJF fare rendered whole-franc, matches charge | Correct formatting | `format.ts:22-28` |
+| K4 | Backoffice: create fare → portal search shows new price | End-to-end propagation | backoffice→portal |
+| K5 | Backoffice: disable station → disappears from portal search | Honored | backoffice→portal |
+| K6 | Backoffice: create promo → apply in portal → correct discount, no negative | End-to-end | backoffice→portal |
+| K7 | Full happy-path booking (WALLET) through portal to ticket | Issued, amounts consistent | portal+api |
+
+---
+
+## Harness plan (Phase 2 preview)
+
+- **API tests (supertest):** reuse the `payments.e2e-spec.ts` fixture-builder pattern (full Prisma object graph + teardown). Most target endpoints are `isPublic`, so auth is cheap. Wire a real config (`test/jest-e2e.json` currently won't even pick up in-src `*.e2e-spec.ts`).
+- **Browser tests (Playwright):** greenfield — add runner + config. Portal has no server-side auth gate; backoffice needs `auth_token` cookie + localStorage seeded.
+- **Payments:** WALLET is fully offline-testable. Gateway flows driven by POSTing directly to `/webhooks/<provider>` on payment-api (Telebirr/CBE/eBirr have loose signature gating; Card/Waafi need valid HMAC). `SERVICE_AUTH_TOKEN` unset in dev = internal endpoints unguarded.
+- **Seed:** re-enable `prisma/seed.ts` steps or invoke seeder fns from a test bootstrap. Needs stations, routes+stops (distanceKm), schedules, seat classes, fare rules, FX rates, promos.
+- **DB:** ⚠️ doc drift — CLAUDE.md says `postgres-passenger:5434/edr_passenger`; actual `.env.example` says `localhost:5432/edr_database?schema=passenger`; no compose file provisions it. **Need target confirmed.**
+
+## Open decisions (blocking Phase 2)
+
+1. **Environment** — is there a dev/staging DB + running stack I should target, or should the harness stand up a local Postgres (Docker) + seed + run the APIs itself?
+2. **Fare system** — confirm `fare-engine` is the system of record and `configurable-fare` is dormant.
+3. **Emphasis** — API-level abuse/integration tests (fast, high signal, covers ~90% of the leads above) vs. also full browser Playwright E2E (Suite K, slower, needs both web apps running).
diff --git a/docs/ui-e2e-test-matrix.md b/docs/ui-e2e-test-matrix.md
new file mode 100644
index 000000000..7a2f2c816
--- /dev/null
+++ b/docs/ui-e2e-test-matrix.md
@@ -0,0 +1,259 @@
+# EDR Passenger Platform — Playwright UI E2E: Scenario Matrix + Phase 2 Harness Plan
+
+**Phase 1 synthesis (MAPPING ONLY).** Consolidates the four mapping passes (portal booking, backoffice config, API/network contracts, auth+seed gaps) plus the adversarial review into a reviewable plan. Ties every scenario to an existing finding in `docs/ISSUES.md` (C-/H-/M-/L-) and `docs/e2e-test-matrix.md` (Suites A–K). **No tests written, no code changed, stack not run.**
+
+Two framing facts inherited from Phase 1: (a) `fare-engine` is the live pricing pipeline; `configurable-fare` is dormant. (b) The domain seed (`prisma/seed.ts`) is disabled — the harness must build fixtures. Two blockers discovered this pass that flip several scenarios from "green/repro" to "invalid as written": **(1) the portal never applies promo discounts to the booked total** (§2 note), and **(2) both web apps have ZERO `data-testid`** (`grep -rn data-testid src` → 0 in both). Section 6 is the prerequisite testid checklist.
+
+Ports: portal 5174, backoffice 5184, passenger-api 4000 (bare paths, no `/v1` except IAM `/v1/auth/*`), payment-api 3003 (`/webhooks/*`). Test DB port 5544 (`.env.test`).
+
+---
+
+## 1. Master assertion recipe — capture price at every hop
+
+Each UI test drives the browser but asserts the **money chain** via (a) Playwright network interception (`page.route` / `page.waitForResponse`), (b) direct DB reads against the 5544 test DB (Prisma client or SQL), and (c) DOM text assertions on rendered price nodes. The master invariant (matrix "Suite A"), trimmed to links that actually have backing in the maps:
+
+```
+portal card price (displayAmountMinor)
+  ── [BREAK] on-select stored fare == Math.min(baseFareMinor)   (results/page.tsx:320) ──
+     == /search/fare-breakdown displayFareMinor
+     == review computedTotal (reviewedTotalMinor sent, review/page.tsx:587)
+     == Booking.totalMinor/displayTotalMinor
+     == PaymentIntent.amountMinor
+     == charged amount (WALLET debit OR gateway webhook)
+```
+
+> **Removed from the stated invariant (over-claimed):** `loyalty accrual` — no §1.2 DB read captures a `LoyaltyAccount.pointsBalance` increment and no green row asserts accrual vs price; and `refund basis` — there is **no refund endpoint anywhere in the API map** and no refund scenario. If a loyalty-accrual assertion is wanted, add a `LoyaltyAccount.pointsBalance` read to a green WALLET row (§1.2) and re-add only that link. Refund is out of scope until a refund surface is mapped (see §7).
+
+### 1.1 Network interception targets (exact method + path, in flow order)
+
+| Hop | Method + Path (passenger-api :4000) | Capture for assertion | Source |
+|---|---|---|---|
+| Fayda gate | `GET /config/fayda-status` (confirm prefix — see §5.2) | `enabled` — must be `false` to expose manual passenger form | system-config.controller.ts:12,16 |
+| Stations load | `GET /stations` | station list (search inventory) | portal search page.tsx:606 |
+| Search | `POST /search` | body `{originStationId,destinationStationId,date,adultCount,childCount,nationality,journeyType,returnDate?}`; resp `outbound[].coachTypes[].classes[].{displayAmountMinor,baseFareMinor}` | results/page.tsx:234; search.controller.ts:13 |
+| **On-select stored fare** | (client-side, no request) | `minFare = Math.min(...classes.map(c => c.baseFareMinor))` — **`baseFareMinor`, NOT the card's `displayAmountMinor`**; diverges for USD/DJF and flows downstream as `baseFareAdult` | results/page.tsx:320,821 |
+| Promo (URL-injected) | `POST /promos/validate` `{code}` — **note: no in-portal "apply promo" input**; promo enters via `?promoCode=` → `searchCriteria.promoCode` | discount echo (does NOT reach booked total, see §2) | results/page.tsx:142 |
+| Save passengers | `POST /passengers/save-details` | `{passengers[],userId,deviceId}` | passengers/page.tsx:1062 |
+| Seatmap | `GET /seats/seatmap/{scheduleId}?coachTypeId=&journeyDirection=` | seat fares (`displayAmountMinor??baseFareMinor`) | seats/page.tsx:352 |
+| Hold | `POST /seats/hold` `{scheduleId,origin,dest,journeyDirection,passengers:[{passengerId,seatId}]}` | resp `{holdId,expiresAt}` — **capture `expiresAt`** for PB-9 | seats/page.tsx:617; seats.controller.ts:164 |
+| Fare breakdown | `GET /search/fare-breakdown?scheduleId=&...&passengers=<JSON>&displayCurrency=[&promoCode]` | resp per-pax `{fareMinor,displayFareMinor,isFree}` (**undiscounted**) + separate top-level `discountMinor`/`totalMinor` (**ignored by portal**) | review/page.tsx:550,559,574; search.service.ts:906-975 |
+| Create booking | `POST /bookings` (auth) **or** `POST /bookings/guest` | body `reviewedTotalMinor` (undiscounted per-pax sum), per-pax `seatFareMinor`; resp `{bookingId/pnr,totalMinor}` | review/page.tsx:209,394,457; bookings.controller.ts:364/181 |
+| Booking amount | `GET /payments/booking-amount?bookingId=&currency=` | resp `{amount (MAJOR, plain /100), currency}` — portal ×100; currency is driven by the **PaymentMethod.currency**, not the booking | payment/page.tsx:68,73 |
+| Initiate | `POST /payments/initiate` `{bookingId,method,paymentMethodId,payerAccount?,platform}` | resp `clientAction{type,url}` **and `merchantOrderId`** (required to key the forged webhook) | payment/page.tsx:123,149; payments.controller.ts:108 |
+| Confirm (CAC) | `POST /payments/{bookingId}/confirm` `{otp}` | — | payment/page.tsx:174 |
+| Poll intent | `GET /payments/intents/{bookingId}` | status transitions | confirmation/page.tsx:125 |
+| Ticket | `GET /bookings/{bookingId}` | `{status,totalMinor,payment:{amountMinor,currency},tickets[].barcodePayload}` | confirmation/page.tsx:105 |
+
+**Payment methods are DB-driven and must be seeded.** The portal renders only `PaymentMethod` rows where `enabled=true` (`payment/page.tsx:593`); `getSupportedPaymentMethods` returns enabled rows from the DB (`payments.controller.ts:273`). `seed-core.ts` seeds **none** → the pay page is empty and **every Track A row (WALLET included) hangs before paying**. See §5.4.
+
+**WALLET path** (fully offline, no payment-api/webhook): `POST /payments/initiate {method:"WALLET"}` short-circuits server-side to `finalizePaymentSuccess`, debiting `booking.totalMinor` directly (payments.service.ts:461-523). Best UI settlement path for green tests. **Note:** WALLET produces **no `edr_payment.payment_intent`** and **bypasses the charge-currency conversion** — so the DJF whole-franc rounding is not observable here (see UA-3/UA-17, §2).
+
+**Settlement injection for gateway tests** (no real gateway):
+- **Forge webhook** to payment-api :3003 — `POST /webhooks/telebirr` or `/webhooks/dmoney` (both `signatureValid=true` hardcoded) with `merch_order_id = <captured merchantOrderId>`, `trade_status=success`. Card/Waafi require valid HMAC — avoid. A TELEBIRR initiate returns `clientAction REDIRECT` and the portal does `window.location.href = url` (`payment/page.tsx:149`) → the test must `page.route`-abort that navigation to the non-existent gateway, forge the webhook, then drive to `/booking/confirmation`.
+- **Direct internal** — `POST /internal/payments/mark-paid` on :4000 with `{version:1,eventType:"payment.succeeded",service:"PASSENGER",referenceType:"BOOKING",referenceId:<bookingId>,...}`. `ServiceAuthGuard` returns true when `SERVICE_AUTH_TOKEN` unset (dev). Fastest deterministic settlement — but it will **not** reproduce a *late* webhook race (C-5, see UA-15) nor the charge-currency conversion (DJF, see UA-3).
+
+### 1.2 DB reads to assert (test DB 5544)
+
+- **passenger.Booking** (schema.prisma:510): `totalMinor`(:520), `currency`(:519), `displayCurrency`(:523), `displayTotalMinor`(:524), `status`(:518 → `"CONFIRMED"` on settle, payments.service.ts:846), `paidAt`(:550), `bookingType`, `returnLegStatus`.
+- **passenger.BookingSeat**: `fareMinor`, `displayCurrency`, `displayFareMinor` (:597-599).
+- **passenger.PaymentIntent** (:621): `amountMinor` **Float** (:624 — assert numeric, not int-exact), `currency`, `status`, `method`, `merchantOrderId`(unique), `paidAt`.
+- **edr_payment.payment_intent** (payment-api source of truth): `amount_minor`/`confirmed_amount_minor` **double precision** (migration 1782000000000). Assert as numeric. **Scope: gateway rows only (UA-15)** — WALLET creates no payment-api intent.
+- **WALLET extras**: `WalletLedgerEntry` DEBIT of `totalMinor` w/ `relatedBookingId`; `WalletAccount.balanceMinor` decremented; ticket row / `GET /tickets/{bookingRef}`.
+
+### 1.3 Currency-formatting assertion (the L-1 target)
+
+Portal renders every price through `formatFare(amountMinor, code)` = `` `${code} ${(amountMinor/100).toFixed(2)}` `` (fare-utils.ts:86) — **always /100, always 2 decimals**. So DJF renders `DJF 1234.56`. Whole-franc rounding lives on the **charge conversion** (`currency.service.ts:9-13`, `CHARGE_CURRENCY_DECIMALS`; `payments.service.ts:223-298`), which **WALLET short-circuits past**.
+- **ETB / USD**: assert DOM shows 2dp; assert `renderedMajor*100 == amountMinor`.
+- **DJF (WALLET)**: can only assert the **shape** mismatch — DOM shows 2dp (`DJF x.yy`) while `GET /payments/booking-amount` returns whole-franc-less major via plain `/100`. No settled 0-decimal `amount_minor` exists on this path.
+- **DJF (gateway / forged-telebirr)**: the real L-1 settle-side repro — assert DOM 2dp vs the charge-currency-converted, whole-franc `amount_minor`/`confirmed_amount_minor`. UA-3/UA-17 must route here to observe it.
+
+---
+
+## 2. TRACK A — Booking combinations matrix (pruned cross-product)
+
+Axes: booking type {one-way, round-trip} × pax mix {1A, 2A, 1A+1C-free, 1A+2C (1 free/1 paid), 2A+3C} × class/berth {Economy Regular, Economy Bed} × nationality/currency {Ethiopian→ETB / LOCAL, Djiboutian→DJF / LOCAL, Other→USD / INTERNATIONAL} × promo {none, %valid, expired} × payment {WALLET, forged-telebirr}. Pruned to meaningful, finding-bearing rows.
+
+> **PROMO REALITY (blocking correction).** `GET /search/fare-breakdown` returns **undiscounted per-pax `displayFareMinor`** and puts the discount only in *separate* top-level `discountMinor`/`totalMinor` (`search.service.ts:906-975`). The portal review page **ignores** that top-level total and client-reduces the per-pax fares (`review/page.tsx:587`), sending that **undiscounted** sum as `reviewedTotalMinor`. The (guest) booking service then **overrides its own discounted total with `reviewedTotalMinor` when `>0`** and clamps its fallback with `Math.max(0,…)` (`guest-booking.service.ts:240-244,487,536-537,744`). Consequences: **through the browser, a valid promo is silently dropped and `Booking.totalMinor` = full price**, and a negative total is **not reproducible via UI**. Promo enters only via `?promoCode=` URL param (no selector); lookup is `findUnique({where:{code}})` (`search.service.ts:941`) — seed codes must be unique and exact. Whether the **authed** `/bookings` path shares the same override+clamp is unverified (§7).
+
+| ID | Scenario | Key inputs | Price cross-check expectation | Finding tie-in |
+|---|---|---|---|---|
+| **UA-1** | One-way, 1 adult, Economy Regular, Ethiopian/ETB, WALLET, no promo | ETB LOCAL regular class | Baseline green: card price == fare-breakdown == reviewedTotalMinor == Booking.totalMinor == PaymentIntent.amountMinor == wallet DEBIT. All equal, 2dp. (Optionally assert `LoyaltyAccount.pointsBalance` accrual here if the accrual link is kept.) | matrix A6 (baseline) |
+| **UA-1b** | One-way, 1 adult, **Other/USD** — assert card `displayAmountMinor` vs internal `baseFareMinor` | nationality OTHER → USD; INTL class | ✅ FIXED — the card shows the USD fare (`displayAmountMinor`), the internal `baseFareMinor` is the ETB source it was converted from (rate apart, coherent). The portal now carries the USD value forward (`results/page.tsx` on-select uses `displayAmountMinor`, aligning with the already-USD seats-page logic). | div #1; H-3/H-4 |
+| **UA-2** | One-way, 1 adult, Other/USD, INTERNATIONAL Regular, WALLET | OTHER → displayCurrency USD | ✅ FIXED — money chain COHERENT: `displayCurrency=USD`/`displayTotalMinor` = what the passenger saw (=`reviewedTotalMinor`); `currency=ETB`/`totalMinor` = the ETB charge basis (=`displayTotalMinor × rate`). The prior `currency:USD`-on-an-ETB-amount mislabel is gone. | H-3/H-4, matrix B3 |
+| **UA-3** | One-way, 1 adult, **Djiboutian/DJF**, **forged-telebirr** | DJIBOUTIAN → DJF; gateway path | **DJF displayed 2dp (`DJF x.yy`) but charged whole-franc** — assert DOM-2dp vs settled `amount_minor` (0-decimal). Must be a **gateway** row (WALLET bypasses the charge conversion). | **L-1** ✅, matrix C6/K3 |
+| **UA-3w** | One-way, 1 adult, Djiboutian/DJF, WALLET (shape-only) | DJF, WALLET | Assert only the DOM-2dp vs `booking-amount`-major **shape** mismatch (no settle-side rounding on WALLET). | L-1 (partial) |
+| **UA-4** | One-way, **1A + 1 child ≤5yr (free)**, ETB, WALLET | childCount 1, DOB<5yr | Child shows "CHILD - FREE"; free child excluded from total; `fare-breakdown.isFree==true` agrees with client `fare-utils.isFirstChild` | **H-12**, matrix B6 |
+| **UA-5** | One-way, **1A + 2 children** (first free, second paid), ETB, WALLET | childCount 2 | Second child paid; client reduce (review:587) == breakdown sum; assert booking vs quote free-child count agree (quote uses min(child,adult); booking uses child-1) | **H-12**, matrix B6 |
+| **UA-6** | Round-trip, 1 adult, Economy Regular, ETB, WALLET | ROUND_TRIP, outbound+inbound holds | ✅ FIXED — the fare engine now prices the reverse (C→A) leg by absolute distance (was: threw "origin must come before destination", leaving the inbound leg with seats but no priced coach → unbookable). Full two-leg flow completes: 2 seats (one per leg), total = 2× the one-way fare. | div #6; matrix A3 |
+| **UA-7** | Round-trip, 2 adults, **Economy Bed / berth**, INTERNATIONAL/USD, WALLET | bed seat-class; berth seats (`bedPosition`) | Berth priced as separate class; `getSeatFare` bedPosition match (seats:433) == breakdown; INTL berth surcharge consistent | requires **berth seed** (§5); matrix B3 |
+| **UA-8** | One-way, 1 adult, ETB, **valid % promo via `?promoCode=`**, WALLET | valid `percentOff:10` in URL | ✅ FIXED — the browser still sends the undiscounted `reviewedTotalMinor`, but the authed `bookings.service` recomputes the authoritative fare and applies the promo, so `Booking.totalMinor` = `subtotal − discount`. | H-13 fixed & guarded; matrix D |
+| **UA-11** | One-way, 1 adult, ETB, **expired promo** (validUntil past, active:true) via URL, WALLET | expired code | Promo rejected/ignored; total unaffected; UI shows no discount (consistent with UA-8 drop). | matrix D5 |
+| **UA-13** | One-way, 1 adult, ETB, **client-forged low total** (intercept `POST /bookings`, rewrite `reviewedTotalMinor:1` + every `seatFareMinor:1`) | mutate body via `page.route` | ✅ FIXED — server recomputes the authoritative fare and REJECTS the underpayment (4xx); no booking persisted | **C-1** fixed & guarded, matrix A1 |
+| **UA-14** | One-way guest, forged per-pax `seatFareMinor:0` (+ `reviewedTotalMinor:0`) | intercept `/bookings/guest` | ✅ FIXED — server recomputes the authoritative fare and REJECTS the free-ride underpayment (4xx); no booking persisted | **C-1** fixed & guarded, matrix A2/A4 |
+| **UA-15** | One-way, 1 adult, ETB, **forged-telebirr short-pay** | booking total in the thousands; forge `/internal/payments/mark-paid` success with `amountMinor:1` | ✅ FIXED — the server compares the settled amount to the booking's display total and REFUSES a short payment; booking stays unconfirmed, no ticket | **C-4** fixed & guarded, matrix G1/G7 |
+| **UA-16** | Round-trip, 2A+3C, mixed, ETB, WALLET | max pax spread | Stress free-child + per-leg split + total reduce; every backed hop equal | H-12, div #6 |
+
+**Moved to the API-level harness (no valid browser path):**
+- **UA-9 / UA-10 / UA-17** — over-100% `percentOff:150`, fixed `amountOffMinor > subtotal`, DJF×promo negative total. Not reproducible via UI: `reviewedTotalMinor` is positive-undiscounted and the server clamps to 0 (`guest-booking.service.ts`). Keep as API-only for **H-1**.
+- **UA-12** — loyalty over-redeem (**C-2**). No browser path: `grep loyalty|redeem` across `portal/src/app/booking/**` + `booking-store.ts` → zero hits; `loyaltyRedemptionPoints` exists only on `POST /search/fare-quote`, which the portal never calls (it uses fare-breakdown, no loyalty param). Keep as API-only.
+
+> Payment method: default all rows to WALLET (deterministic, offline). UA-3 and UA-15 use forged-telebirr. Rows tagged ✅ have an existing API-level repro in `docs/ISSUES.md`; the UI test proves the defect surfaces through the real browser flow (closing the "Suite K not yet run" gap, ISSUES.md L285-290).
+
+---
+
+## 3. TRACK B — Config→portal propagation matrix
+
+Each row: change made in backoffice UI (:5184) → API write → portal read (:5174) → propagation + staleTime → predicted finding. Backoffice self-refreshes immediately (each mutation invalidates its own React-Query key). Staleness only bites the **portal**.
+
+| ID | Config change (backoffice UI) | Write endpoint | Portal read path | Propagation + staleTime | Predicted |
+|---|---|---|---|---|---|
+| **PB-1** | `/currencies` → edit ETB↔USD rate | `PATCH /currencies/{id}` `{rate}` | `GET /currencies` via useCurrencies.ts:19 | **staleTime 5min** — up to 5 min stale in portal | 🟠 matrix I1; ties H-2/H-3 |
+| **PB-2** | `/tariff-rates` Tab1 → edit seat-class base | `PATCH /seat-classes/{id}` `{basePrice}` (**field `basePrice`**) | next `POST /search` (staleTime:0) + `GET /search/fare-breakdown` | Live, no cache | 🟢 matrix I2/K4; **field-name split** (basePrice vs baseFareMinor) — verify which fare-engine reads (§7) |
+| **PB-3** | `/tariff-rates` Tab2/3 → route/segment fare override | `POST /schedules/routes/{routeId}/fare-rules` / `POST /schedules/segment-fares` | `POST /search` results | Live | 🟠 segment rule may not bite: engine matches `dto.nationality` or null; seeder writes 'LOCAL'/'INTERNATIONAL' → won't match (§5 note); matrix B5 / H-11 |
+| **PB-4** | `/stations` → add station | `POST /stations` | `GET /stations` (SearchWidget staleTime 60s; root prefetch raw fetch) | ≤60s stale in SearchWidget; prefetch uncached | 🟠 matrix K5 |
+| **PB-5** | `/stations` → **disable station** (isOperational=false) | `PATCH /stations/{id}` | `GET /stations` (portal passes **no operational filter**) | Only disappears if API omits non-operational server-side — **verify** (§7) | 🔴/🟠 matrix K5/I3 |
+| **PB-6** | `/classes` → create seat class | `POST /fleet/classes` `{baseFareMinor,...}` (**field `baseFareMinor`**, different endpoint than PB-2) | `POST /search` + seats page | Live (search staleTime:0) | 🟠 **two seat-class stores** (`/seat-classes` vs `/fleet/classes`) — confirm which live search reads (§7) |
+| **PB-7** | `/promos` (URL, nav commented) → create promo | `POST /promos` | `POST /promos/validate {code}` at results:142 | On demand | 🔴 **field-name mismatch**: UI sends `discountType/discountValue/isActive`; DTO expects `percentOff/amountOffMinor/active` → possibly inert promo. Verify; own finding. matrix K6 |
+| **PB-8** | `/schedules` → create schedule for search date | `POST /schedules` | `POST /search` | Live | 🟢 must satisfy all 9 searchability rules (§5); matrix I2 |
+| **PB-9** | `/settings` → change seat-hold TTL | `PATCH /config` (raw, no RQ, no invalidate) | **no portal read path** — config is ignored by the hold | Server-side runtime | 🔴 **reframed:** capture `expiresAt` from `POST /seats/hold` and assert it does **NOT** track the config value (hold uses a fixed TTL — reconcile 15-min `seats.service.ts:~272` vs the "20-min" claim). **G6** |
+| **PB-10** | `/currencies` → **delete** a rate pair | `DELETE /currencies/{id}` | `POST /search` (USD/Other) faresByClass | ✅ FIXED — `getExchangeRate` fails closed (throws) instead of substituting 1.0; the USD search returns NO priced class (no bogus ~100×-underpriced fare), and a booking would be rejected too | **M-5 / H-2** fixed & guarded, matrix I6 |
+
+**Deferred config surfaces (mapped, out of Phase 2 scope — stated so the matrix doesn't read as complete):** `/fare-management` (schedule-scoped `FareRule`, fare-source #3), `/pricing` (`/admin/segment-fares`, the dead-`@Roles` route), and `/routes` fare-rule CRUD beyond PB-3.
+
+---
+
+## 4. HIGH-VALUE bug-class scenarios (concrete steps)
+
+### 4A. Config-mid-flight (edit/disable between quote and pay) — matrix I7
+- **BC-1**: Portal: search → results → select → hold → `/booking/review` (fare frozen). Second (backoffice) context: `PATCH /seat-classes/{id}` to triple the base. Back in portal: **Confirm**. **Assert** booking created at the *frozen* review price (`reviewedTotalMinor`), not the new one — booking never re-quotes; payment never re-validates. (ties C-1/L-2)
+- **BC-2**: Same, but **disable the station** mid-flight (PB-5). Assert the in-flight booking still completes (no re-validation of station operational state).
+
+### 4B. Delete-referenced (M-5 / matrix I3–I6)
+- **BC-3**: Create a CONFIRMED booking (UA-1). Backoffice `/stations` → delete the origin station (accept cascade if FK 400 offered). **Assert** either a referential block OR an orphaned booking (`GET /bookings/{id}` resolves but station lookups break). `stations.service.ts:110-137` ignores bookings.
+- **BC-4**: `/classes` delete a seat-class referenced by a booking's `bookingSeat`. Assert orphan/FK behavior. matrix I4.
+- **BC-5**: `/currencies` delete the USD↔ETB pair with active INTL fares. Next portal INTL search → fare collapses ~100× (1.0 fallback). **H-2**, matrix I6.
+- **BC-3b** (new): `/routes` → delete a route referenced by a live schedule; assert orphaned schedule vs referential block. `routes.controller.ts`.
+- **BC-4b** (new): `/schedules` → cancel a schedule with a CONFIRMED booking; assert whether the booking is stranded. *(Both new rows may be explicitly deferred if Phase 2 scope is tight.)*
+
+### 4C. Staleness (matrix I1)
+- **BC-6**: Backoffice edit ETB↔USD rate. Immediately do a portal USD search → **assert** portal may show the OLD rate (useCurrencies staleTime 5×60×1000). **Then force a reload / navigation / window-focus** to trigger the refetch (React-Query `staleTime` does NOT auto-refetch on its own), and assert the new rate. Distinguishes the 5-min window from live search pricing.
+
+### 4D. Validation-via-UI vs direct-API (Suite H — direct-API bypass class; UI proves the client gaps)
+- **BC-7** ✅ FIXED: `PATCH /seat-classes` with `basePrice:-500` is now rejected with **400** — `CreateSeatClassDto.basePrice` (and `insuranceFeeMinor`) carry `@Min(0)`, applied to updates via `PartialType`. **M-1**, matrix H1/H2.
+- **BC-8** ✅ FIXED: `POST /promos` with `percentOff:200` is now rejected with **400** — `CreatePromotionDto.percentOff` carries `@Min(0) @Max(100)` (and `amountOffMinor` `@Min(0)`). A valid ≤100% promo still succeeds. **M-2**, matrix H4.
+- **BC-9** ✅ FIXED: `PATCH /config {seat_hold_duration_minutes:"-1"}` is now rejected with **400** — a whitelisted `UpdateSystemConfigDto` coerces each known key to a positive integer (`seat_hold_duration_minutes` bounded 1..60). A sane value still stores. **M-3**, matrix H7.
+- **BC-10** ✅ FIXED: `POST /schedules` with a past `departureAt` is now rejected with **400** — `schedules.service.createSchedule` guards `departureAt >= now` alongside the existing `arrival > departure` check. A future schedule still creates. **M-4**, matrix H3.
+- **BC-11** ✅ FIXED: `PUT/PATCH /fare-engine/exchange-rates` now carry `@PassengerAdmin()` (as DELETE already did). Anon → 401, regular passenger → **403 forbidden**, staff admin → 200. **C-8**, matrix J1.
+
+---
+
+## 5. PHASE 2 harness plan
+
+### 5.1 `playwright.config.ts` structure
+```
+e2e-ui/                       # new; sibling to existing e2e/ (API harness)
+  playwright.config.ts
+  global-setup.ts             # boot+await stack (VERIFAYDA_ENABLED=false), seed, mint storageStates
+  fixtures/
+    storage/passenger.json    # generated by global-setup
+    storage/staff.json        # generated by global-setup
+    seed-ui.ts                # domain fixtures (see 5.4)
+  specs/
+    portal/*.spec.ts          # Track A (UA-*), BC-1/2/6
+    backoffice/*.spec.ts      # Track B config CRUD
+    propagation/*.spec.ts     # BC-3..BC-11 cross-app
+```
+- **projects**: `portal` (baseURL `http://localhost:5174`, storageState `passenger.json`), `backoffice` (baseURL `http://localhost:5184`, storageState `staff.json`), plus a `guest` project (no storageState) for guest rows (UA-14). Pin `viewport` per project — portal desktop layout is `hidden md:block`; mobile diverges heavily. One shared **`globalSetup`**.
+- `webServer`: optionally let Playwright start portal+backoffice (`pnpm --filter @edr/passenger-portal dev` etc.); reuseExistingServer in local dev.
+
+### 5.2 global-setup
+1. Ensure Postgres :5544 up and migrated (`.env.test`, `JWT_ACCESS_TOKEN_SECRET=test-access-secret-0000…`).
+2. Boot passenger-api :4000 (**with `VERIFAYDA_ENABLED=false`** so the portal exposes the manual passenger form — otherwise Fayda defaults ON and every booking flow is blocked; the flag is `enabled = process.env.VERIFAYDA_ENABLED !== 'false'`, system-config.controller.ts:12,16) and payment-api :3003 (or assert reachable). Await `/health`-style ping. **Confirm which `fayda-status` prefix the portal hits** (`/config` vs `fare-engine.controller.ts:65`, which defaults `false`) so the right flag is set.
+3. Run `seed-core.ts` + new `seed-ui.ts` (§5.4).
+4. Mint the two storageStates (§5.3), write to `fixtures/storage/`.
+
+### 5.3 The two storageState fixtures (grounded in auth map)
+
+The passenger-API `JwtGuard` is **DB-backed against `iam.sessions`** — a fake JWT 401s. JWT payload is `{ id: <sessionId> }` (NOT userId); roles/permissions live in the session's `userInfo` jsonb.
+
+**Passenger storageState (portal :5174)** — no server gate, but `/auth/profile` runs on load and self-ejects on 401:
+1. Insert `iam.users` (individual, active).
+2. Insert `iam.sessions` (`status='ACTIVE'`, future expiry, `userInfo.roles=[]`).
+3. Insert Prisma `Passenger{iamUserId}` **+ `LoyaltyAccount` + `WalletAccount`(funded balanceMinor) + `UserPreferences`** — required or `getProfile` throws "Passenger not found" (passenger-auth.service.ts:262) and the portal logs out.
+4. Mint JWT `{id: sessionId}` with `JWT_ACCESS_TOKEN_SECRET`.
+5. Write storageState `localStorage` for origin :5174: `auth_token=<jwt>`, `auth_user=<profile JSON matching getProfile shape>`.
+6. *Simplest alternative*: drive real `POST /auth/login` once with a seeded passenger, snapshot localStorage.
+
+**Staff/admin storageState (backoffice :5184)** — server middleware requires the `auth_token` **cookie**; API staff calls require `userInfo.roles` carrying `super_admin`/`organization_admin` or the right permission keys:
+- **Path A (robust)**: set `SEED_EDR_PASSENGER_ORG=true` + `SEED_PASSENGER_STAFF=true`, boot API → seeds org `edr`, roles, users (`passenger.admin@edr.local` / `Test@1234`). Then `POST /v1/auth/login` → `GET /v1/auth/me`, snapshot `localStorage` (`auth_token`,`auth_user`,`auth_refresh_token`) **and** set `auth_token` cookie.
+- **Path B (fast)**: insert `iam.users`+`iam.sessions` with `userInfo.roles=[{key:'super_admin'}]`, mint JWT, write storageState localStorage + `auth_token` cookie for :5184, `auth_user` with `isSuperAdmin:true`. Config pages don't use `PermissionGuard` — only middleware cookie + API guards matter.
+- **Note:** the `auth_token` cookie is **host-scoped (`localhost`), not port-scoped**, so it is also sent to the portal origin. Harmless (portal reads localStorage, not this cookie) but relevant if a single shared browser context is reused across projects.
+
+### 5.4 Seed extensions (add to `seed-core.ts` or new `seed-ui.ts`)
+`seed-core.ts` today has CoachType×1, SeatClass×2 (LOCAL 300 / INTL 500, both regular), Station×3 (A/B/C), Route×1 + 3 RouteStop (0/100/250km), 4 FX rows. **No Train/Schedule/Coach/Seat/Passenger/PaymentMethod.** Add:
+- **PaymentMethod rows (BLOCKING — pay page is empty without them):** at minimum an **enabled `WALLET`** (currency ETB) and an **enabled `TELEBIRR`** (for UA-15). The method's `.currency` drives `booking-amount` and the displayed pay total (`payment/page.tsx:68`), so a DJF booking paid by an ETB wallet renders ETB on the pay page — relevant to UA-3/UA-3w.
+- **Bookable trip** (all 9 searchability rules): `Train`×1 → `TrainSchedule`(A→C, `status:'SCHEDULED'`, `isPackageOnly:false`, `departureAt = now+2d`, whole-day in Addis TZ, **>30min ahead**) → 3 `TripStopTime`(A/B/C seq 1/2/3, future `plannedDepartureAt`) → `Coach`×1(`status:'ACTIVE'`) → `CoachAssignment`(`isOperational:true`) → `Seat`×N (AVAILABLE, non-empty `seatNumber`, `bedPosition:null`). Fares resolve via `SEAT_CLASS_BASE_FARE` distance formula with the existing USD→ETB row — no fare-rule rows needed for the green path.
+- **Seat-class names (pin exactly):** the review flow builds a `seatClassName → seatClassId` map from `GET /seat-classes` (`review/page.tsx:277`) and fare-quote expects exact names `"Economy Regular"|"Economy Bed"` (search.dto.ts). Set `SeatClass.name` to the exact client strings, or those rows won't resolve. (The axis's "VIP Bed" has no seed/scenario — seed it or drop it from the axis; this matrix drops it.)
+- **Berth combos** (UA-7): LOCAL+INTL SeatClasses with `bedPosition IN ('UPPER','MIDDLE','LOWER')` + a bed `Coach` + `Seat`s with lowercase `bedPosition:'upper'|'middle'|'lower'`.
+- **Promotions** (UA-8/11): valid `percentOff:10`; expired (`validUntil` past, `active:true`). **Use schema field names `percentOff/amountOffMinor/active`** — NOT the backoffice UI field names. **Pin exact, unique `code` values** (lookup is `findUnique({where:{code}})`, search.service.ts:941); tests navigate with `?promoCode=<code>`. (Over-100% / over-subtotal promos belong to the API harness, not Track A.)
+- **BaggageAllowance** ×1 per seat class (for excess-baggage rows).
+- **Passenger satellite** for logged-in/WALLET: `Passenger{iamUserId}` + funded `WalletAccount(balanceMinor)` + `LoyaltyAccount`.
+- **Blocked-seat negative case**: one `SeatBlock` row.
+- **Segment override that actually bites** (PB-3): seed `SegmentFareRule` with `nationality:null` (engine matches `dto.nationality` string or null; 'LOCAL'/'INTERNATIONAL' rows won't match a real search).
+- FX: existing 4 rows suffice for ETB/USD/DJF via ETB pivot; add `USD↔DJF` only if a direct-path currency test needs it.
+
+### 5.5 Two smoke tests
+- **Portal smoke** (`guest` project): home → search (seeded A→C, date = Addis date of `departureAt`) → results shows ≥1 card with a price → `formatFare` renders `ETB N.NN`. Asserts stack+seed+search+Fayda-flag wired.
+- **Backoffice smoke** (`backoffice` project): staff storageState → `/currencies` loads list → open "Add Rate" modal. Asserts staff auth (cookie+localStorage+API token) all valid.
+
+### 5.6 pnpm scripts + turbo task
+- Root `package.json`: `"test:e2e:ui": "playwright test -c e2e-ui/playwright.config.ts"`.
+- turbo `test:e2e:ui` task `"cache": false`; global-setup owns boot/seed. Single command: `pnpm test:e2e:ui`.
+- Specs under `e2e-ui/specs/{portal,backoffice,propagation}`.
+
+---
+
+## 6. SELECTORS TO ADD — `data-testid` checklist (PREREQUISITE; both apps have 0 today)
+
+Without these, every locator hangs off role/text/`name=`/placeholder, which is brittle across the portal's mobile/desktop breakpoint split. Recommend adding these before authoring (out of scope this phase; flag for user approval). **Promo has no selector — it enters via `?promoCode=` URL param.**
+
+### Portal (`apps/edr-passenger-web/portal/src`)
+- **Search**: `search-trip-type-oneway`/`-roundtrip` (page.tsx:777/789), `search-origin-input` (:1234), `search-dest-input` (:1274), `search-swap` (:1261), `search-depart-date` (:1305), `search-return-date` (:1486), `search-pax-trigger` (:1334), `pax-adult-plus`/`-minus`, `pax-child-plus`/`-minus` (PassengerModal:319/330), `nationality-eth`/`-dji`/`-other` (:352), `search-submit` (:1362).
+- **Results**: `result-card` (per schedule), `result-card-price` (:821 — "starting from"), `result-select-btn` (:831), `coach-option` (:487), `coach-class-price` (:609), `continue-passenger-details` (:642), `modify-search` (:1282).
+- **Passengers**: `pax-name-{i}`, `pax-dob-btn` (:327), `pax-gender`, `pax-nationality`, `pax-phone`, `pax-passport`, `verify-fayda-btn`, `enter-manually-toggle` (:1003), `create-account-checkbox`, `passengers-continue`.
+- **DOB picker (`DobPickerModal` — required for UA-4/UA-5 free-child):** `dob-cal-etgc-toggle` (:346), `dob-manual-toggle` (:354), `dob-manual-day`/`-month`/`-year` inputs, `dob-day-cell-{n}`, `dob-confirm`.
+- **Seats**: `seat-cell-{label}` (SeatButton:119), `berth-cell-{label}` (BedCard:38), `passenger-tab-{i}`, `auto-assign-seats` (~:2006), `seats-continue` (~:1989), `fare-change-confirm` (CustomModal).
+- **Review**: `review-total` (:683 desktop / :1031 mobile), `review-pax-fare-{i}` (:662), `review-outbound-line`/`-return-line` (:670/674), `review-child-badge` (:657), `confirm-and-pay` (:694), `seat-hold-timer` (:719).
+- **Payment**: `pay-method-{type}` (:597), `pay-total` (:390 / :651 mobile), `pay-submit` (:406), `cac-phone-input` (:488), `cac-otp-input` (:531).
+- **Confirmation**: `confirmation-pnr` (:404), `confirmation-status` (:615), `confirmation-total-paid` (:631), `ticket-number-{i}` (:659), `download-voucher` (:794), `book-another` (:815).
+
+### Backoffice (`apps/edr-passenger-web/backoffice/src`)
+- **Login**: `login-email` (:165), `login-password` (:189), `login-submit` (:221).
+- **DataTable / dialogs (shared)**: `add-entity-btn` (ActionButton), `row-edit-{id}`, `row-delete-{id}`, `confirm-dialog-confirm`, `confirm-cascade-checkbox`, `modal-submit`.
+- **Tariff Rates** (`/tariff-rates`): `tab-seatclass`/`tab-route`/`tab-segment`/`tab-baggage`; RateModal fields already have `name=` (`name`, `baseFareMinor`, `insuranceFeeMinor`/`surchargeMinor`, `isActive`) — add `testid` on submit + modal.
+- **Currencies** (`/currencies`): controlled form (no `name=`) — add `currency-from`, `currency-to`, `currency-rate`, `currency-save`, `currency-edit-rate`.
+- **Classes** (`/classes`): FormData has `name=` (`coachTypeId,name,baseFareMinor,insuranceFeeMinor,isActive`) — add submit testid.
+- **Schedules** (`/schedules`): controlled `addForm`/`DateTimePicker` — add `schedule-train`, `schedule-route`, `schedule-departure`, `schedule-arrival`, `schedule-status`, `schedule-save`, `schedule-cancel-btn`.
+- **Stations** (`/stations`): FormData `name=` present — add submit testid.
+- **Settings** (`/settings`): real `id=` (`hold-duration`, `hold-cutoff`, `boarding-window`, throttle-*) — usable, but add `config-save` testid.
+- **Promos** (`/promos`, URL-only): FormData `name=` present — add submit + note field-name mismatch (PB-7).
+
+---
+
+## 7. OPEN QUESTIONS / RISKS (decide before Phase 2)
+
+1. **Valid IAM token for storageState** — Path A (real `/v1/auth/login` after enabling `SEED_EDR_PASSENGER_ORG` + `SEED_PASSENGER_STAFF`) vs Path B (direct `iam.sessions` insert with `userInfo.roles=[{key:'super_admin'}]` + self-signed JWT). **Recommend Path A for staff, Path B acceptable for passenger.** Confirm.
+2. **Seed `iam.sessions` vs dev bypass** — there is **no dev auth bypass** in the passenger-API `JwtGuard` (DB-backed, no env short-circuit). A session row is mandatory for any authenticated flow. Confirm we may write directly to `iam.sessions` in the test DB.
+3. **Target DB / stack** — doc drift: CLAUDE.md says `postgres-passenger:5434/edr_passenger`; `.env.example` says `localhost:5432/edr_database?schema=passenger`; `.env.test` uses `5544`; no compose file provisions it. **Confirm the harness stands up its own Postgres :5544 + boots both APIs, or targets an existing dev stack.**
+4. **Stack-startup reliability** — global-setup must boot passenger-api (:4000) + payment-api (:3003) + portal (:5174) + backoffice (:5184) + RabbitMQ (vhost `payment`), or route settlement through `/internal/payments/mark-paid` to avoid RabbitMQ. **Recommend the internal-endpoint path for green settlement determinism** — but note it will **not** reproduce a *late*-webhook race (C-5) nor the charge-currency conversion (DJF, UA-3), which both require a real forged-gateway webhook to :3003.
+5. **Gateway webhook signing** — Telebirr/dmoney accept forged payloads (`signatureValid=true` hardcoded); Card/Waafi require valid HMAC. UA-3/UA-15/gateway rows must use Telebirr/dmoney or the internal endpoint. Confirm we won't need real Card/Waafi HMAC in Phase 2.
+6. **Fayda flag & prefix** — global-setup must set `VERIFAYDA_ENABLED=false` (else the manual passenger form is hidden and every booking flow blocks). **Confirm which `fayda-status` route the portal reads** (`/config`, default-ON, vs `fare-engine.controller.ts:65`, default-OFF) so the correct flag is set.
+7. **Promo money-flow — does the authed path share the guest override+clamp?** The guest booking service overrides its discounted total with `reviewedTotalMinor` and clamps (`guest-booking.service.ts:240-244,487,536-537,744`), making promos inert and negative totals unreachable via UI. **Verify whether `bookings.service.ts` (authed `POST /bookings`) has the same override+clamp** before finalizing UA-8's "promo silently dropped" assertion for logged-in users.
+8. **`data-testid` addition** — Section 6 requires source edits to both web apps (including the `DobPickerModal` internals for child-fare rows). Approve adding testids (small, low-risk) vs authoring against fragile role/text selectors. **Strongly recommend adding testids first.**
+9. **Two field-name mismatches to verify at runtime** (each may be its own finding): (a) Promos UI sends `discountType/discountValue/isActive` but DTO expects `percentOff/amountOffMinor/active` → possibly inert promos (PB-7). (b) Seat-class base written as `basePrice` (Tariff Rates, PB-2) vs `baseFareMinor` (Classes page, PB-6), across two endpoints (`/seat-classes` vs `/fleet/classes`) — confirm which the live `fare-engine` reads before asserting PB-2/PB-6.
+10. **Portal station operational filter** (PB-5) — portal `GET /stations` passes no `operational` filter; whether a disabled station disappears depends on the server default. Verify before writing the disable-propagation assertion.
+11. **Currency-controller collision** — two `@Controller('currencies')` register the same base path (`currencies.controller.ts` + `currency.controller.ts`) with different guards/bodies; confirm which one the backoffice `/currencies` page hits before asserting PB-1/PB-10 write semantics.
+12. **Seat-hold TTL number** (PB-9) — the matrix draft said "20-min cron"; the seed map says `expiresAt = now + 15min` (`seats.service.ts:~272`). **Reconcile the actual fixed TTL** before asserting that the hold ignores the config value.
+13. **On-select fare divergence** (UA-1b) — confirm that the value stored on select is `Math.min(baseFareMinor)` (results:320) and not the card's `displayAmountMinor` (results:821), and pin which one downstream fare-breakdown reconciles against for non-ETB currencies.
+14. **Scope of Track A vs B** — Track A (UA-*) covers pricing integrity through the real browser (closes the Suite K gap); Track B/BC-* covers config propagation. Confirm both tracks are in Phase 2 scope, or prioritize Track A first (highest money-risk, most ✅ findings to surface in-browser).
+15. **Explicitly out-of-scope money surfaces (deferral, not omission):** loyalty redemption (C-2, no browser path), refunds (no endpoint mapped), over-100%/over-subtotal promo negative totals (H-1, API-only), transit / `ROUND_TRIP_TRANSIT` (needs a 2nd seeded route), package booking (`/packages`, `isPackageOnly` schedules, `packageTierPriceMinor × 2`), `/pay-balance/[token]` partial-payment / `returnLegStatus`, and config surfaces `/fare-management` + `/pricing`. Confirm these stay deferred so the matrix is not read as exhaustive.
\ No newline at end of file
diff --git a/e2e-ui-report/index.html b/e2e-ui-report/index.html
new file mode 100644
index 000000000..ba053244d
--- /dev/null
+++ b/e2e-ui-report/index.html
@@ -0,0 +1,90 @@
+
+
+<!DOCTYPE html>
+<html style='scrollbar-gutter: stable both-edges;'>
+  <head>
+    <meta charset='UTF-8'>
+    <meta name='color-scheme' content='dark light'>
+    <meta name='viewport' content='width=device-width, initial-scale=1.0'>
+    <title>Playwright Test Report</title>
+    <script type="module">(function(){const u=document.createElement("link").relList;if(u&&u.supports&&u.supports("modulepreload"))return;for(const r of document.querySelectorAll('link[rel="modulepreload"]'))f(r);new MutationObserver(r=>{for(const o of r)if(o.type==="childList")for(const h of o.addedNodes)h.tagName==="LINK"&&h.rel==="modulepreload"&&f(h)}).observe(document,{childList:!0,subtree:!0});function c(r){const o={};return r.integrity&&(o.integrity=r.integrity),r.referrerPolicy&&(o.referrerPolicy=r.referrerPolicy),r.crossOrigin==="use-credentials"?o.credentials="include":r.crossOrigin==="anonymous"?o.credentials="omit":o.credentials="same-origin",o}function f(r){if(r.ep)return;r.ep=!0;const o=c(r);fetch(r.href,o)}})();function EA(i){return i&&i.__esModule&&Object.prototype.hasOwnProperty.call(i,"default")?i.default:i}var Of={exports:{}},vi={};/**
+ * @license React
+ * react-jsx-runtime.production.js
+ *
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */var y1;function pA(){if(y1)return vi;y1=1;var i=Symbol.for("react.transitional.element"),u=Symbol.for("react.fragment");function c(f,r,o){var h=null;if(o!==void 0&&(h=""+o),r.key!==void 0&&(h=""+r.key),"key"in r){o={};for(var v in r)v!=="key"&&(o[v]=r[v])}else o=r;return r=o.ref,{$$typeof:i,type:f,key:h,ref:r!==void 0?r:null,props:o}}return vi.Fragment=u,vi.jsx=c,vi.jsxs=c,vi}var E1;function xA(){return E1||(E1=1,Of.exports=pA()),Of.exports}var m=xA();const bA=15,bt=0,En=1,SA=2,ye=-2,Ut=-3,p1=-4,pn=-5,Me=[0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535],w2=1440,TA=0,CA=4,OA=9,DA=5,RA=[96,7,256,0,8,80,0,8,16,84,8,115,82,7,31,0,8,112,0,8,48,0,9,192,80,7,10,0,8,96,0,8,32,0,9,160,0,8,0,0,8,128,0,8,64,0,9,224,80,7,6,0,8,88,0,8,24,0,9,144,83,7,59,0,8,120,0,8,56,0,9,208,81,7,17,0,8,104,0,8,40,0,9,176,0,8,8,0,8,136,0,8,72,0,9,240,80,7,4,0,8,84,0,8,20,85,8,227,83,7,43,0,8,116,0,8,52,0,9,200,81,7,13,0,8,100,0,8,36,0,9,168,0,8,4,0,8,132,0,8,68,0,9,232,80,7,8,0,8,92,0,8,28,0,9,152,84,7,83,0,8,124,0,8,60,0,9,216,82,7,23,0,8,108,0,8,44,0,9,184,0,8,12,0,8,140,0,8,76,0,9,248,80,7,3,0,8,82,0,8,18,85,8,163,83,7,35,0,8,114,0,8,50,0,9,196,81,7,11,0,8,98,0,8,34,0,9,164,0,8,2,0,8,130,0,8,66,0,9,228,80,7,7,0,8,90,0,8,26,0,9,148,84,7,67,0,8,122,0,8,58,0,9,212,82,7,19,0,8,106,0,8,42,0,9,180,0,8,10,0,8,138,0,8,74,0,9,244,80,7,5,0,8,86,0,8,22,192,8,0,83,7,51,0,8,118,0,8,54,0,9,204,81,7,15,0,8,102,0,8,38,0,9,172,0,8,6,0,8,134,0,8,70,0,9,236,80,7,9,0,8,94,0,8,30,0,9,156,84,7,99,0,8,126,0,8,62,0,9,220,82,7,27,0,8,110,0,8,46,0,9,188,0,8,14,0,8,142,0,8,78,0,9,252,96,7,256,0,8,81,0,8,17,85,8,131,82,7,31,0,8,113,0,8,49,0,9,194,80,7,10,0,8,97,0,8,33,0,9,162,0,8,1,0,8,129,0,8,65,0,9,226,80,7,6,0,8,89,0,8,25,0,9,146,83,7,59,0,8,121,0,8,57,0,9,210,81,7,17,0,8,105,0,8,41,0,9,178,0,8,9,0,8,137,0,8,73,0,9,242,80,7,4,0,8,85,0,8,21,80,8,258,83,7,43,0,8,117,0,8,53,0,9,202,81,7,13,0,8,101,0,8,37,0,9,170,0,8,5,0,8,133,0,8,69,0,9,234,80,7,8,0,8,93,0,8,29,0,9,154,84,7,83,0,8,125,0,8,61,0,9,218,82,7,23,0,8,109,0,8,45,0,9,186,0,8,13,0,8,141,0,8,77,0,9,250,80,7,3,0,8,83,0,8,19,85,8,195,83,7,35,0,8,115,0,8,51,0,9,198,81,7,11,0,8,99,0,8,35,0,9,166,0,8,3,0,8,131,0,8,67,0,9,230,80,7,7,0,8,91,0,8,27,0,9,150,84,7,67,0,8,123,0,8,59,0,9,214,82,7,19,0,8,107,0,8,43,0,9,182,0,8,11,0,8,139,0,8,75,0,9,246,80,7,5,0,8,87,0,8,23,192,8,0,83,7,51,0,8,119,0,8,55,0,9,206,81,7,15,0,8,103,0,8,39,0,9,174,0,8,7,0,8,135,0,8,71,0,9,238,80,7,9,0,8,95,0,8,31,0,9,158,84,7,99,0,8,127,0,8,63,0,9,222,82,7,27,0,8,111,0,8,47,0,9,190,0,8,15,0,8,143,0,8,79,0,9,254,96,7,256,0,8,80,0,8,16,84,8,115,82,7,31,0,8,112,0,8,48,0,9,193,80,7,10,0,8,96,0,8,32,0,9,161,0,8,0,0,8,128,0,8,64,0,9,225,80,7,6,0,8,88,0,8,24,0,9,145,83,7,59,0,8,120,0,8,56,0,9,209,81,7,17,0,8,104,0,8,40,0,9,177,0,8,8,0,8,136,0,8,72,0,9,241,80,7,4,0,8,84,0,8,20,85,8,227,83,7,43,0,8,116,0,8,52,0,9,201,81,7,13,0,8,100,0,8,36,0,9,169,0,8,4,0,8,132,0,8,68,0,9,233,80,7,8,0,8,92,0,8,28,0,9,153,84,7,83,0,8,124,0,8,60,0,9,217,82,7,23,0,8,108,0,8,44,0,9,185,0,8,12,0,8,140,0,8,76,0,9,249,80,7,3,0,8,82,0,8,18,85,8,163,83,7,35,0,8,114,0,8,50,0,9,197,81,7,11,0,8,98,0,8,34,0,9,165,0,8,2,0,8,130,0,8,66,0,9,229,80,7,7,0,8,90,0,8,26,0,9,149,84,7,67,0,8,122,0,8,58,0,9,213,82,7,19,0,8,106,0,8,42,0,9,181,0,8,10,0,8,138,0,8,74,0,9,245,80,7,5,0,8,86,0,8,22,192,8,0,83,7,51,0,8,118,0,8,54,0,9,205,81,7,15,0,8,102,0,8,38,0,9,173,0,8,6,0,8,134,0,8,70,0,9,237,80,7,9,0,8,94,0,8,30,0,9,157,84,7,99,0,8,126,0,8,62,0,9,221,82,7,27,0,8,110,0,8,46,0,9,189,0,8,14,0,8,142,0,8,78,0,9,253,96,7,256,0,8,81,0,8,17,85,8,131,82,7,31,0,8,113,0,8,49,0,9,195,80,7,10,0,8,97,0,8,33,0,9,163,0,8,1,0,8,129,0,8,65,0,9,227,80,7,6,0,8,89,0,8,25,0,9,147,83,7,59,0,8,121,0,8,57,0,9,211,81,7,17,0,8,105,0,8,41,0,9,179,0,8,9,0,8,137,0,8,73,0,9,243,80,7,4,0,8,85,0,8,21,80,8,258,83,7,43,0,8,117,0,8,53,0,9,203,81,7,13,0,8,101,0,8,37,0,9,171,0,8,5,0,8,133,0,8,69,0,9,235,80,7,8,0,8,93,0,8,29,0,9,155,84,7,83,0,8,125,0,8,61,0,9,219,82,7,23,0,8,109,0,8,45,0,9,187,0,8,13,0,8,141,0,8,77,0,9,251,80,7,3,0,8,83,0,8,19,85,8,195,83,7,35,0,8,115,0,8,51,0,9,199,81,7,11,0,8,99,0,8,35,0,9,167,0,8,3,0,8,131,0,8,67,0,9,231,80,7,7,0,8,91,0,8,27,0,9,151,84,7,67,0,8,123,0,8,59,0,9,215,82,7,19,0,8,107,0,8,43,0,9,183,0,8,11,0,8,139,0,8,75,0,9,247,80,7,5,0,8,87,0,8,23,192,8,0,83,7,51,0,8,119,0,8,55,0,9,207,81,7,15,0,8,103,0,8,39,0,9,175,0,8,7,0,8,135,0,8,71,0,9,239,80,7,9,0,8,95,0,8,31,0,9,159,84,7,99,0,8,127,0,8,63,0,9,223,82,7,27,0,8,111,0,8,47,0,9,191,0,8,15,0,8,143,0,8,79,0,9,255],wA=[80,5,1,87,5,257,83,5,17,91,5,4097,81,5,5,89,5,1025,85,5,65,93,5,16385,80,5,3,88,5,513,84,5,33,92,5,8193,82,5,9,90,5,2049,86,5,129,192,5,24577,80,5,2,87,5,385,83,5,25,91,5,6145,81,5,7,89,5,1537,85,5,97,93,5,24577,80,5,4,88,5,769,84,5,49,92,5,12289,82,5,13,90,5,3073,86,5,193,192,5,24577],MA=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],jA=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,112,112],NA=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577],HA=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],_n=15;function qf(){const i=this;let u,c,f,r,o,h;function v(A,x,T,D,X,q,p,E,b,R,N){let V,F,H,j,Y,z,I,k,nt,P,st,ut,M,_,$;P=0,Y=T;do f[A[x+P]]++,P++,Y--;while(Y!==0);if(f[0]==T)return p[0]=-1,E[0]=0,bt;for(k=E[0],z=1;z<=_n&&f[z]===0;z++);for(I=z,k<z&&(k=z),Y=_n;Y!==0&&f[Y]===0;Y--);for(H=Y,k>Y&&(k=Y),E[0]=k,_=1<<z;z<Y;z++,_<<=1)if((_-=f[z])<0)return Ut;if((_-=f[Y])<0)return Ut;for(f[Y]+=_,h[1]=z=0,P=1,M=2;--Y!==0;)h[M]=z+=f[P],M++,P++;Y=0,P=0;do(z=A[x+P])!==0&&(N[h[z]++]=Y),P++;while(++Y<T);for(T=h[H],h[0]=Y=0,P=0,j=-1,ut=-k,o[0]=0,st=0,$=0;I<=H;I++)for(V=f[I];V--!==0;){for(;I>ut+k;){if(j++,ut+=k,$=H-ut,$=$>k?k:$,(F=1<<(z=I-ut))>V+1&&(F-=V+1,M=I,z<$))for(;++z<$&&!((F<<=1)<=f[++M]);)F-=f[M];if($=1<<z,R[0]+$>w2)return Ut;o[j]=st=R[0],R[0]+=$,j!==0?(h[j]=Y,r[0]=z,r[1]=k,z=Y>>>ut-k,r[2]=st-o[j-1]-z,b.set(r,(o[j-1]+z)*3)):p[0]=st}for(r[1]=I-ut,P>=T?r[0]=192:N[P]<D?(r[0]=N[P]<256?0:96,r[2]=N[P++]):(r[0]=q[N[P]-D]+16+64,r[2]=X[N[P++]-D]),F=1<<I-ut,z=Y>>>ut;z<$;z+=F)b.set(r,(st+z)*3);for(z=1<<I-1;(Y&z)!==0;z>>>=1)Y^=z;for(Y^=z,nt=(1<<ut)-1;(Y&nt)!=h[j];)j--,ut-=k,nt=(1<<ut)-1}return _!==0&&H!=1?pn:bt}function y(A){let x;for(u||(u=[],c=[],f=new Int32Array(_n+1),r=[],o=new Int32Array(_n),h=new Int32Array(_n+1)),c.length<A&&(c=[]),x=0;x<A;x++)c[x]=0;for(x=0;x<_n+1;x++)f[x]=0;for(x=0;x<3;x++)r[x]=0;o.set(f.subarray(0,_n),0),h.set(f.subarray(0,_n+1),0)}i.inflate_trees_bits=function(A,x,T,D,X){let q;return y(19),u[0]=0,q=v(A,0,19,19,null,null,T,x,D,u,c),q==Ut?X.msg="oversubscribed dynamic bit lengths tree":(q==pn||x[0]===0)&&(X.msg="incomplete dynamic bit lengths tree",q=Ut),q},i.inflate_trees_dynamic=function(A,x,T,D,X,q,p,E,b){let R;return y(288),u[0]=0,R=v(T,0,A,257,MA,jA,q,D,E,u,c),R!=bt||D[0]===0?(R==Ut?b.msg="oversubscribed literal/length tree":R!=p1&&(b.msg="incomplete literal/length tree",R=Ut),R):(y(288),R=v(T,A,x,0,NA,HA,p,X,E,u,c),R!=bt||X[0]===0&&A>257?(R==Ut?b.msg="oversubscribed distance tree":R==pn?(b.msg="incomplete distance tree",R=Ut):R!=p1&&(b.msg="empty distance tree with lengths",R=Ut),R):bt)}}qf.inflate_trees_fixed=function(i,u,c,f){return i[0]=OA,u[0]=DA,c[0]=RA,f[0]=wA,bt};const Fu=0,x1=1,b1=2,S1=3,T1=4,C1=5,O1=6,Df=7,D1=8,Wu=9;function BA(){const i=this;let u,c=0,f,r=0,o=0,h=0,v=0,y=0,A=0,x=0,T,D=0,X,q=0;function p(E,b,R,N,V,F,H,j){let Y,z,I,k,nt,P,st,ut,M,_,$,ht,tt,C,L,W;st=j.next_in_index,ut=j.avail_in,nt=H.bitb,P=H.bitk,M=H.write,_=M<H.read?H.read-M-1:H.end-M,$=Me[E],ht=Me[b];do{for(;P<20;)ut--,nt|=(j.read_byte(st++)&255)<<P,P+=8;if(Y=nt&$,z=R,I=N,W=(I+Y)*3,(k=z[W])===0){nt>>=z[W+1],P-=z[W+1],H.win[M++]=z[W+2],_--;continue}do{if(nt>>=z[W+1],P-=z[W+1],(k&16)!==0){for(k&=15,tt=z[W+2]+(nt&Me[k]),nt>>=k,P-=k;P<15;)ut--,nt|=(j.read_byte(st++)&255)<<P,P+=8;Y=nt&ht,z=V,I=F,W=(I+Y)*3,k=z[W];do if(nt>>=z[W+1],P-=z[W+1],(k&16)!==0){for(k&=15;P<k;)ut--,nt|=(j.read_byte(st++)&255)<<P,P+=8;if(C=z[W+2]+(nt&Me[k]),nt>>=k,P-=k,_-=tt,M>=C)L=M-C,M-L>0&&2>M-L?(H.win[M++]=H.win[L++],H.win[M++]=H.win[L++],tt-=2):(H.win.set(H.win.subarray(L,L+2),M),M+=2,L+=2,tt-=2);else{L=M-C;do L+=H.end;while(L<0);if(k=H.end-L,tt>k){if(tt-=k,M-L>0&&k>M-L)do H.win[M++]=H.win[L++];while(--k!==0);else H.win.set(H.win.subarray(L,L+k),M),M+=k,L+=k,k=0;L=0}}if(M-L>0&&tt>M-L)do H.win[M++]=H.win[L++];while(--tt!==0);else H.win.set(H.win.subarray(L,L+tt),M),M+=tt,L+=tt,tt=0;break}else if((k&64)===0)Y+=z[W+2],Y+=nt&Me[k],W=(I+Y)*3,k=z[W];else return j.msg="invalid distance code",tt=j.avail_in-ut,tt=P>>3<tt?P>>3:tt,ut+=tt,st-=tt,P-=tt<<3,H.bitb=nt,H.bitk=P,j.avail_in=ut,j.total_in+=st-j.next_in_index,j.next_in_index=st,H.write=M,Ut;while(!0);break}if((k&64)===0){if(Y+=z[W+2],Y+=nt&Me[k],W=(I+Y)*3,(k=z[W])===0){nt>>=z[W+1],P-=z[W+1],H.win[M++]=z[W+2],_--;break}}else return(k&32)!==0?(tt=j.avail_in-ut,tt=P>>3<tt?P>>3:tt,ut+=tt,st-=tt,P-=tt<<3,H.bitb=nt,H.bitk=P,j.avail_in=ut,j.total_in+=st-j.next_in_index,j.next_in_index=st,H.write=M,En):(j.msg="invalid literal/length code",tt=j.avail_in-ut,tt=P>>3<tt?P>>3:tt,ut+=tt,st-=tt,P-=tt<<3,H.bitb=nt,H.bitk=P,j.avail_in=ut,j.total_in+=st-j.next_in_index,j.next_in_index=st,H.write=M,Ut)}while(!0)}while(_>=258&&ut>=10);return tt=j.avail_in-ut,tt=P>>3<tt?P>>3:tt,ut+=tt,st-=tt,P-=tt<<3,H.bitb=nt,H.bitk=P,j.avail_in=ut,j.total_in+=st-j.next_in_index,j.next_in_index=st,H.write=M,bt}i.init=function(E,b,R,N,V,F){u=Fu,A=E,x=b,T=R,D=N,X=V,q=F,f=null},i.proc=function(E,b,R){let N,V,F,H=0,j=0,Y=0,z,I,k,nt;for(Y=b.next_in_index,z=b.avail_in,H=E.bitb,j=E.bitk,I=E.write,k=I<E.read?E.read-I-1:E.end-I;;)switch(u){case Fu:if(k>=258&&z>=10&&(E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,R=p(A,x,T,D,X,q,E,b),Y=b.next_in_index,z=b.avail_in,H=E.bitb,j=E.bitk,I=E.write,k=I<E.read?E.read-I-1:E.end-I,R!=bt)){u=R==En?Df:Wu;break}o=A,f=T,r=D,u=x1;case x1:for(N=o;j<N;){if(z!==0)R=bt;else return E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R);z--,H|=(b.read_byte(Y++)&255)<<j,j+=8}if(V=(r+(H&Me[N]))*3,H>>>=f[V+1],j-=f[V+1],F=f[V],F===0){h=f[V+2],u=O1;break}if((F&16)!==0){v=F&15,c=f[V+2],u=b1;break}if((F&64)===0){o=F,r=V/3+f[V+2];break}if((F&32)!==0){u=Df;break}return u=Wu,b.msg="invalid literal/length code",R=Ut,E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R);case b1:for(N=v;j<N;){if(z!==0)R=bt;else return E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R);z--,H|=(b.read_byte(Y++)&255)<<j,j+=8}c+=H&Me[N],H>>=N,j-=N,o=x,f=X,r=q,u=S1;case S1:for(N=o;j<N;){if(z!==0)R=bt;else return E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R);z--,H|=(b.read_byte(Y++)&255)<<j,j+=8}if(V=(r+(H&Me[N]))*3,H>>=f[V+1],j-=f[V+1],F=f[V],(F&16)!==0){v=F&15,y=f[V+2],u=T1;break}if((F&64)===0){o=F,r=V/3+f[V+2];break}return u=Wu,b.msg="invalid distance code",R=Ut,E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R);case T1:for(N=v;j<N;){if(z!==0)R=bt;else return E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R);z--,H|=(b.read_byte(Y++)&255)<<j,j+=8}y+=H&Me[N],H>>=N,j-=N,u=C1;case C1:for(nt=I-y;nt<0;)nt+=E.end;for(;c!==0;){if(k===0&&(I==E.end&&E.read!==0&&(I=0,k=I<E.read?E.read-I-1:E.end-I),k===0&&(E.write=I,R=E.inflate_flush(b,R),I=E.write,k=I<E.read?E.read-I-1:E.end-I,I==E.end&&E.read!==0&&(I=0,k=I<E.read?E.read-I-1:E.end-I),k===0)))return E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R);E.win[I++]=E.win[nt++],k--,nt==E.end&&(nt=0),c--}u=Fu;break;case O1:if(k===0&&(I==E.end&&E.read!==0&&(I=0,k=I<E.read?E.read-I-1:E.end-I),k===0&&(E.write=I,R=E.inflate_flush(b,R),I=E.write,k=I<E.read?E.read-I-1:E.end-I,I==E.end&&E.read!==0&&(I=0,k=I<E.read?E.read-I-1:E.end-I),k===0)))return E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R);R=bt,E.win[I++]=h,k--,u=Fu;break;case Df:if(j>7&&(j-=8,z++,Y--),E.write=I,R=E.inflate_flush(b,R),I=E.write,k=I<E.read?E.read-I-1:E.end-I,E.read!=E.write)return E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R);u=D1;case D1:return R=En,E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R);case Wu:return R=Ut,E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R);default:return R=ye,E.bitb=H,E.bitk=j,b.avail_in=z,b.total_in+=Y-b.next_in_index,b.next_in_index=Y,E.write=I,E.inflate_flush(b,R)}},i.free=function(){}}const R1=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],ya=0,Rf=1,w1=2,M1=3,j1=4,N1=5,_u=6,Pu=7,H1=8,Cl=9;function UA(i,u){const c=this;let f=ya,r=0,o=0,h=0,v;const y=[0],A=[0],x=new BA;let T=0,D=new Int32Array(w2*3);const X=0,q=new qf;c.bitk=0,c.bitb=0,c.win=new Uint8Array(u),c.end=u,c.read=0,c.write=0,c.reset=function(p,E){E&&(E[0]=X),f==_u&&x.free(p),f=ya,c.bitk=0,c.bitb=0,c.read=c.write=0},c.reset(i,null),c.inflate_flush=function(p,E){let b,R,N;return R=p.next_out_index,N=c.read,b=(N<=c.write?c.write:c.end)-N,b>p.avail_out&&(b=p.avail_out),b!==0&&E==pn&&(E=bt),p.avail_out-=b,p.total_out+=b,p.next_out.set(c.win.subarray(N,N+b),R),R+=b,N+=b,N==c.end&&(N=0,c.write==c.end&&(c.write=0),b=c.write-N,b>p.avail_out&&(b=p.avail_out),b!==0&&E==pn&&(E=bt),p.avail_out-=b,p.total_out+=b,p.next_out.set(c.win.subarray(N,N+b),R),R+=b,N+=b),p.next_out_index=R,c.read=N,E},c.proc=function(p,E){let b,R,N,V,F,H,j,Y;for(V=p.next_in_index,F=p.avail_in,R=c.bitb,N=c.bitk,H=c.write,j=H<c.read?c.read-H-1:c.end-H;;){let z,I,k,nt,P,st,ut,M;switch(f){case ya:for(;N<3;){if(F!==0)E=bt;else return c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);F--,R|=(p.read_byte(V++)&255)<<N,N+=8}switch(b=R&7,T=b&1,b>>>1){case 0:R>>>=3,N-=3,b=N&7,R>>>=b,N-=b,f=Rf;break;case 1:z=[],I=[],k=[[]],nt=[[]],qf.inflate_trees_fixed(z,I,k,nt),x.init(z[0],I[0],k[0],0,nt[0],0),R>>>=3,N-=3,f=_u;break;case 2:R>>>=3,N-=3,f=M1;break;case 3:return R>>>=3,N-=3,f=Cl,p.msg="invalid block type",E=Ut,c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E)}break;case Rf:for(;N<32;){if(F!==0)E=bt;else return c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);F--,R|=(p.read_byte(V++)&255)<<N,N+=8}if((~R>>>16&65535)!=(R&65535))return f=Cl,p.msg="invalid stored block lengths",E=Ut,c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);r=R&65535,R=N=0,f=r!==0?w1:T!==0?Pu:ya;break;case w1:if(F===0||j===0&&(H==c.end&&c.read!==0&&(H=0,j=H<c.read?c.read-H-1:c.end-H),j===0&&(c.write=H,E=c.inflate_flush(p,E),H=c.write,j=H<c.read?c.read-H-1:c.end-H,H==c.end&&c.read!==0&&(H=0,j=H<c.read?c.read-H-1:c.end-H),j===0)))return c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);if(E=bt,b=r,b>F&&(b=F),b>j&&(b=j),c.win.set(p.read_buf(V,b),H),V+=b,F-=b,H+=b,j-=b,(r-=b)!==0)break;f=T!==0?Pu:ya;break;case M1:for(;N<14;){if(F!==0)E=bt;else return c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);F--,R|=(p.read_byte(V++)&255)<<N,N+=8}if(o=b=R&16383,(b&31)>29||(b>>5&31)>29)return f=Cl,p.msg="too many length or distance symbols",E=Ut,c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);if(b=258+(b&31)+(b>>5&31),!v||v.length<b)v=[];else for(Y=0;Y<b;Y++)v[Y]=0;R>>>=14,N-=14,h=0,f=j1;case j1:for(;h<4+(o>>>10);){for(;N<3;){if(F!==0)E=bt;else return c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);F--,R|=(p.read_byte(V++)&255)<<N,N+=8}v[R1[h++]]=R&7,R>>>=3,N-=3}for(;h<19;)v[R1[h++]]=0;if(y[0]=7,b=q.inflate_trees_bits(v,y,A,D,p),b!=bt)return E=b,E==Ut&&(v=null,f=Cl),c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);h=0,f=N1;case N1:for(;b=o,!(h>=258+(b&31)+(b>>5&31));){let _,$;for(b=y[0];N<b;){if(F!==0)E=bt;else return c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);F--,R|=(p.read_byte(V++)&255)<<N,N+=8}if(b=D[(A[0]+(R&Me[b]))*3+1],$=D[(A[0]+(R&Me[b]))*3+2],$<16)R>>>=b,N-=b,v[h++]=$;else{for(Y=$==18?7:$-14,_=$==18?11:3;N<b+Y;){if(F!==0)E=bt;else return c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);F--,R|=(p.read_byte(V++)&255)<<N,N+=8}if(R>>>=b,N-=b,_+=R&Me[Y],R>>>=Y,N-=Y,Y=h,b=o,Y+_>258+(b&31)+(b>>5&31)||$==16&&Y<1)return v=null,f=Cl,p.msg="invalid bit length repeat",E=Ut,c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);$=$==16?v[Y-1]:0;do v[Y++]=$;while(--_!==0);h=Y}}if(A[0]=-1,P=[],st=[],ut=[],M=[],P[0]=9,st[0]=6,b=o,b=q.inflate_trees_dynamic(257+(b&31),1+(b>>5&31),v,P,st,ut,M,D,p),b!=bt)return b==Ut&&(v=null,f=Cl),E=b,c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);x.init(P[0],st[0],D,ut[0],D,M[0]),f=_u;case _u:if(c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,(E=x.proc(c,p,E))!=En)return c.inflate_flush(p,E);if(E=bt,x.free(p),V=p.next_in_index,F=p.avail_in,R=c.bitb,N=c.bitk,H=c.write,j=H<c.read?c.read-H-1:c.end-H,T===0){f=ya;break}f=Pu;case Pu:if(c.write=H,E=c.inflate_flush(p,E),H=c.write,j=H<c.read?c.read-H-1:c.end-H,c.read!=c.write)return c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);f=H1;case H1:return E=En,c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);case Cl:return E=Ut,c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E);default:return E=ye,c.bitb=R,c.bitk=N,p.avail_in=F,p.total_in+=V-p.next_in_index,p.next_in_index=V,c.write=H,c.inflate_flush(p,E)}}},c.free=function(p){c.reset(p,null),c.win=null,D=null},c.set_dictionary=function(p,E,b){c.win.set(p.subarray(E,E+b),0),c.read=c.write=b},c.sync_point=function(){return f==Rf?1:0}}const QA=32,zA=8,YA=0,B1=1,U1=2,Q1=3,z1=4,Y1=5,wf=6,yi=7,L1=12,Pn=13,LA=[0,0,255,255];function GA(){const i=this;i.mode=0,i.method=0,i.was=[0],i.need=0,i.marker=0,i.wbits=0;function u(c){return!c||!c.istate?ye:(c.total_in=c.total_out=0,c.msg=null,c.istate.mode=yi,c.istate.blocks.reset(c,null),bt)}i.inflateEnd=function(c){return i.blocks&&i.blocks.free(c),i.blocks=null,bt},i.inflateInit=function(c,f){return c.msg=null,i.blocks=null,f<8||f>15?(i.inflateEnd(c),ye):(i.wbits=f,c.istate.blocks=new UA(c,1<<f),u(c),bt)},i.inflate=function(c,f){let r,o;if(!c||!c.istate||!c.next_in)return ye;const h=c.istate;for(f=f==CA?pn:bt,r=pn;;)switch(h.mode){case YA:if(c.avail_in===0)return r;if(r=f,c.avail_in--,c.total_in++,((h.method=c.read_byte(c.next_in_index++))&15)!=zA){h.mode=Pn,c.msg="unknown compression method",h.marker=5;break}if((h.method>>4)+8>h.wbits){h.mode=Pn,c.msg="invalid win size",h.marker=5;break}h.mode=B1;case B1:if(c.avail_in===0)return r;if(r=f,c.avail_in--,c.total_in++,o=c.read_byte(c.next_in_index++)&255,((h.method<<8)+o)%31!==0){h.mode=Pn,c.msg="incorrect header check",h.marker=5;break}if((o&QA)===0){h.mode=yi;break}h.mode=U1;case U1:if(c.avail_in===0)return r;r=f,c.avail_in--,c.total_in++,h.need=(c.read_byte(c.next_in_index++)&255)<<24&4278190080,h.mode=Q1;case Q1:if(c.avail_in===0)return r;r=f,c.avail_in--,c.total_in++,h.need+=(c.read_byte(c.next_in_index++)&255)<<16&16711680,h.mode=z1;case z1:if(c.avail_in===0)return r;r=f,c.avail_in--,c.total_in++,h.need+=(c.read_byte(c.next_in_index++)&255)<<8&65280,h.mode=Y1;case Y1:return c.avail_in===0?r:(r=f,c.avail_in--,c.total_in++,h.need+=c.read_byte(c.next_in_index++)&255,h.mode=wf,SA);case wf:return h.mode=Pn,c.msg="need dictionary",h.marker=0,ye;case yi:if(r=h.blocks.proc(c,r),r==Ut){h.mode=Pn,h.marker=0;break}if(r==bt&&(r=f),r!=En)return r;r=f,h.blocks.reset(c,h.was),h.mode=L1;case L1:return c.avail_in=0,En;case Pn:return Ut;default:return ye}},i.inflateSetDictionary=function(c,f,r){let o=0,h=r;if(!c||!c.istate||c.istate.mode!=wf)return ye;const v=c.istate;return h>=1<<v.wbits&&(h=(1<<v.wbits)-1,o=r-h),v.blocks.set_dictionary(f,o,h),v.mode=yi,bt},i.inflateSync=function(c){let f,r,o,h,v;if(!c||!c.istate)return ye;const y=c.istate;if(y.mode!=Pn&&(y.mode=Pn,y.marker=0),(f=c.avail_in)===0)return pn;for(r=c.next_in_index,o=y.marker;f!==0&&o<4;)c.read_byte(r)==LA[o]?o++:c.read_byte(r)!==0?o=0:o=4-o,r++,f--;return c.total_in+=r-c.next_in_index,c.next_in_index=r,c.avail_in=f,y.marker=o,o!=4?Ut:(h=c.total_in,v=c.total_out,u(c),c.total_in=h,c.total_out=v,y.mode=yi,bt)},i.inflateSyncPoint=function(c){return!c||!c.istate||!c.istate.blocks?ye:c.istate.blocks.sync_point()}}function M2(){}M2.prototype={inflateInit(i){const u=this;return u.istate=new GA,i||(i=bA),u.istate.inflateInit(u,i)},inflate(i){const u=this;return u.istate?u.istate.inflate(u,i):ye},inflateEnd(){const i=this;if(!i.istate)return ye;const u=i.istate.inflateEnd(i);return i.istate=null,u},inflateSync(){const i=this;return i.istate?i.istate.inflateSync(i):ye},inflateSetDictionary(i,u){const c=this;return c.istate?c.istate.inflateSetDictionary(c,i,u):ye},read_byte(i){return this.next_in[i]},read_buf(i,u){return this.next_in.subarray(i,i+u)}};function XA(i){const u=this,c=new M2,f=i&&i.chunkSize?Math.floor(i.chunkSize*2):128*1024,r=TA,o=new Uint8Array(f);let h=!1;c.inflateInit(),c.next_out=o,u.append=function(v,y){const A=[];let x,T,D=0,X=0,q=0;if(v.length!==0){c.next_in_index=0,c.next_in=v,c.avail_in=v.length;do{if(c.next_out_index=0,c.avail_out=f,c.avail_in===0&&!h&&(c.next_in_index=0,h=!0),x=c.inflate(r),h&&x===pn){if(c.avail_in!==0)throw new Error("inflating: bad input")}else if(x!==bt&&x!==En)throw new Error("inflating: "+c.msg);if((h||x===En)&&c.avail_in===v.length)throw new Error("inflating: bad input");c.next_out_index&&(c.next_out_index===f?A.push(new Uint8Array(o)):A.push(o.subarray(0,c.next_out_index))),q+=c.next_out_index,y&&c.next_in_index>0&&c.next_in_index!=D&&(y(c.next_in_index),D=c.next_in_index)}while(c.avail_in>0||c.avail_out===0);return A.length>1?(T=new Uint8Array(q),A.forEach(function(p){T.set(p,X),X+=p.length})):T=A[0]?new Uint8Array(A[0]):new Uint8Array,T}},u.flush=function(){c.inflateEnd()}}const Rl=4294967295,el=65535,VA=8,ZA=0,IA=99,qA=67324752,j2=134695760,KA=j2,G1=33639248,kA=101010256,X1=101075792,JA=117853008,Ea=22,Mf=20,jf=56,FA=12,WA=20,V1=4,_A=1,PA=39169,$A=10,t5=1,e5=21589,n5=28789,l5=25461,a5=6534,Z1=1,i5=6,I1=8,q1=2048,K1=16,u5=61440,c5=16384,s5=73,k1="/",Nf=30,f5=10,r5=14,o5=18,$t=void 0,al="undefined",Ri="function";class J1{constructor(u){return class extends TransformStream{constructor(c,f){const r=new u(f);super({transform(o,h){h.enqueue(r.append(o))},flush(o){const h=r.flush();h&&o.enqueue(h)}})}}}}const d5=64;let N2=2;try{typeof navigator!=al&&navigator.hardwareConcurrency&&(N2=navigator.hardwareConcurrency)}catch{}const h5={chunkSize:512*1024,maxWorkers:N2,terminateWorkerTimeout:5e3,useWebWorkers:!0,useCompressionStream:!0,workerScripts:$t,CompressionStreamNative:typeof CompressionStream!=al&&CompressionStream,DecompressionStreamNative:typeof DecompressionStream!=al&&DecompressionStream},nl=Object.assign({},h5);function m5(){return nl}function g5(i){return Math.max(i.chunkSize,d5)}function H2(i){const{baseURL:u,chunkSize:c,maxWorkers:f,terminateWorkerTimeout:r,useCompressionStream:o,useWebWorkers:h,Deflate:v,Inflate:y,CompressionStream:A,DecompressionStream:x,workerScripts:T}=i;if($n("baseURL",u),$n("chunkSize",c),$n("maxWorkers",f),$n("terminateWorkerTimeout",r),$n("useCompressionStream",o),$n("useWebWorkers",h),v&&(nl.CompressionStream=new J1(v)),y&&(nl.DecompressionStream=new J1(y)),$n("CompressionStream",A),$n("DecompressionStream",x),T!==$t){const{deflate:D,inflate:X}=T;if((D||X)&&(nl.workerScripts||(nl.workerScripts={})),D){if(!Array.isArray(D))throw new Error("workerScripts.deflate must be an array");nl.workerScripts.deflate=D}if(X){if(!Array.isArray(X))throw new Error("workerScripts.inflate must be an array");nl.workerScripts.inflate=X}}}function $n(i,u){u!==$t&&(nl[i]=u)}const B2=[];for(let i=0;i<256;i++){let u=i;for(let c=0;c<8;c++)u&1?u=u>>>1^3988292384:u=u>>>1;B2[i]=u}class ac{constructor(u){this.crc=u||-1}append(u){let c=this.crc|0;for(let f=0,r=u.length|0;f<r;f++)c=c>>>8^B2[(c^u[f])&255];this.crc=c}get(){return~this.crc}}class U2 extends TransformStream{constructor(){let u;const c=new ac;super({transform(f,r){c.append(f),r.enqueue(f)},flush(){const f=new Uint8Array(4);new DataView(f.buffer).setUint32(0,c.get()),u.value=f}}),u=this}}function A5(i){if(typeof TextEncoder==al){i=unescape(encodeURIComponent(i));const u=new Uint8Array(i.length);for(let c=0;c<u.length;c++)u[c]=i.charCodeAt(c);return u}else return new TextEncoder().encode(i)}const re={concat(i,u){if(i.length===0||u.length===0)return i.concat(u);const c=i[i.length-1],f=re.getPartial(c);return f===32?i.concat(u):re._shiftRight(u,f,c|0,i.slice(0,i.length-1))},bitLength(i){const u=i.length;if(u===0)return 0;const c=i[u-1];return(u-1)*32+re.getPartial(c)},clamp(i,u){if(i.length*32<u)return i;i=i.slice(0,Math.ceil(u/32));const c=i.length;return u=u&31,c>0&&u&&(i[c-1]=re.partial(u,i[c-1]&2147483648>>u-1,1)),i},partial(i,u,c){return i===32?u:(c?u|0:u<<32-i)+i*1099511627776},getPartial(i){return Math.round(i/1099511627776)||32},_shiftRight(i,u,c,f){for(f===void 0&&(f=[]);u>=32;u-=32)f.push(c),c=0;if(u===0)return f.concat(i);for(let h=0;h<i.length;h++)f.push(c|i[h]>>>u),c=i[h]<<32-u;const r=i.length?i[i.length-1]:0,o=re.getPartial(r);return f.push(re.partial(u+o&31,u+o>32?c:f.pop(),1)),f}},ic={bytes:{fromBits(i){const c=re.bitLength(i)/8,f=new Uint8Array(c);let r;for(let o=0;o<c;o++)(o&3)===0&&(r=i[o/4]),f[o]=r>>>24,r<<=8;return f},toBits(i){const u=[];let c,f=0;for(c=0;c<i.length;c++)f=f<<8|i[c],(c&3)===3&&(u.push(f),f=0);return c&3&&u.push(re.partial(8*(c&3),f)),u}}},Q2={};Q2.sha1=class{constructor(i){const u=this;u.blockSize=512,u._init=[1732584193,4023233417,2562383102,271733878,3285377520],u._key=[1518500249,1859775393,2400959708,3395469782],i?(u._h=i._h.slice(0),u._buffer=i._buffer.slice(0),u._length=i._length):u.reset()}reset(){const i=this;return i._h=i._init.slice(0),i._buffer=[],i._length=0,i}update(i){const u=this;typeof i=="string"&&(i=ic.utf8String.toBits(i));const c=u._buffer=re.concat(u._buffer,i),f=u._length,r=u._length=f+re.bitLength(i);if(r>9007199254740991)throw new Error("Cannot hash more than 2^53 - 1 bits");const o=new Uint32Array(c);let h=0;for(let v=u.blockSize+f-(u.blockSize+f&u.blockSize-1);v<=r;v+=u.blockSize)u._block(o.subarray(16*h,16*(h+1))),h+=1;return c.splice(0,16*h),u}finalize(){const i=this;let u=i._buffer;const c=i._h;u=re.concat(u,[re.partial(1,1)]);for(let f=u.length+2;f&15;f++)u.push(0);for(u.push(Math.floor(i._length/4294967296)),u.push(i._length|0);u.length;)i._block(u.splice(0,16));return i.reset(),c}_f(i,u,c,f){if(i<=19)return u&c|~u&f;if(i<=39)return u^c^f;if(i<=59)return u&c|u&f|c&f;if(i<=79)return u^c^f}_S(i,u){return u<<i|u>>>32-i}_block(i){const u=this,c=u._h,f=Array(80);for(let A=0;A<16;A++)f[A]=i[A];let r=c[0],o=c[1],h=c[2],v=c[3],y=c[4];for(let A=0;A<=79;A++){A>=16&&(f[A]=u._S(1,f[A-3]^f[A-8]^f[A-14]^f[A-16]));const x=u._S(5,r)+u._f(A,o,h,v)+y+f[A]+u._key[Math.floor(A/20)]|0;y=v,v=h,h=u._S(30,o),o=r,r=x}c[0]=c[0]+r|0,c[1]=c[1]+o|0,c[2]=c[2]+h|0,c[3]=c[3]+v|0,c[4]=c[4]+y|0}};const z2={};z2.aes=class{constructor(i){const u=this;u._tables=[[[],[],[],[],[]],[[],[],[],[],[]]],u._tables[0][0][0]||u._precompute();const c=u._tables[0][4],f=u._tables[1],r=i.length;let o,h,v,y=1;if(r!==4&&r!==6&&r!==8)throw new Error("invalid aes key size");for(u._key=[h=i.slice(0),v=[]],o=r;o<4*r+28;o++){let A=h[o-1];(o%r===0||r===8&&o%r===4)&&(A=c[A>>>24]<<24^c[A>>16&255]<<16^c[A>>8&255]<<8^c[A&255],o%r===0&&(A=A<<8^A>>>24^y<<24,y=y<<1^(y>>7)*283)),h[o]=h[o-r]^A}for(let A=0;o;A++,o--){const x=h[A&3?o:o-4];o<=4||A<4?v[A]=x:v[A]=f[0][c[x>>>24]]^f[1][c[x>>16&255]]^f[2][c[x>>8&255]]^f[3][c[x&255]]}}encrypt(i){return this._crypt(i,0)}decrypt(i){return this._crypt(i,1)}_precompute(){const i=this._tables[0],u=this._tables[1],c=i[4],f=u[4],r=[],o=[];let h,v,y,A;for(let x=0;x<256;x++)o[(r[x]=x<<1^(x>>7)*283)^x]=x;for(let x=h=0;!c[x];x^=v||1,h=o[h]||1){let T=h^h<<1^h<<2^h<<3^h<<4;T=T>>8^T&255^99,c[x]=T,f[T]=x,A=r[y=r[v=r[x]]];let D=A*16843009^y*65537^v*257^x*16843008,X=r[T]*257^T*16843008;for(let q=0;q<4;q++)i[q][x]=X=X<<24^X>>>8,u[q][T]=D=D<<24^D>>>8}for(let x=0;x<5;x++)i[x]=i[x].slice(0),u[x]=u[x].slice(0)}_crypt(i,u){if(i.length!==4)throw new Error("invalid aes block size");const c=this._key[u],f=c.length/4-2,r=[0,0,0,0],o=this._tables[u],h=o[0],v=o[1],y=o[2],A=o[3],x=o[4];let T=i[0]^c[0],D=i[u?3:1]^c[1],X=i[2]^c[2],q=i[u?1:3]^c[3],p=4,E,b,R;for(let N=0;N<f;N++)E=h[T>>>24]^v[D>>16&255]^y[X>>8&255]^A[q&255]^c[p],b=h[D>>>24]^v[X>>16&255]^y[q>>8&255]^A[T&255]^c[p+1],R=h[X>>>24]^v[q>>16&255]^y[T>>8&255]^A[D&255]^c[p+2],q=h[q>>>24]^v[T>>16&255]^y[D>>8&255]^A[X&255]^c[p+3],p+=4,T=E,D=b,X=R;for(let N=0;N<4;N++)r[u?3&-N:N]=x[T>>>24]<<24^x[D>>16&255]<<16^x[X>>8&255]<<8^x[q&255]^c[p++],E=T,T=D,D=X,X=q,q=E;return r}};const v5={getRandomValues(i){const u=new Uint32Array(i.buffer),c=f=>{let r=987654321;const o=4294967295;return function(){return r=36969*(r&65535)+(r>>16)&o,f=18e3*(f&65535)+(f>>16)&o,(((r<<16)+f&o)/4294967296+.5)*(Math.random()>.5?1:-1)}};for(let f=0,r;f<i.length;f+=4){const o=c((r||Math.random())*4294967296);r=o()*987654071,u[f/4]=o()*4294967296|0}return i}},Y2={};Y2.ctrGladman=class{constructor(i,u){this._prf=i,this._initIv=u,this._iv=u}reset(){this._iv=this._initIv}update(i){return this.calculate(this._prf,i,this._iv)}incWord(i){if((i>>24&255)===255){let u=i>>16&255,c=i>>8&255,f=i&255;u===255?(u=0,c===255?(c=0,f===255?f=0:++f):++c):++u,i=0,i+=u<<16,i+=c<<8,i+=f}else i+=1<<24;return i}incCounter(i){(i[0]=this.incWord(i[0]))===0&&(i[1]=this.incWord(i[1]))}calculate(i,u,c){let f;if(!(f=u.length))return[];const r=re.bitLength(u);for(let o=0;o<f;o+=4){this.incCounter(c);const h=i.encrypt(c);u[o]^=h[0],u[o+1]^=h[1],u[o+2]^=h[2],u[o+3]^=h[3]}return re.clamp(u,r)}};const wl={importKey(i){return new wl.hmacSha1(ic.bytes.toBits(i))},pbkdf2(i,u,c,f){if(c=c||1e4,f<0||c<0)throw new Error("invalid params to pbkdf2");const r=(f>>5)+1<<2;let o,h,v,y,A;const x=new ArrayBuffer(r),T=new DataView(x);let D=0;const X=re;for(u=ic.bytes.toBits(u),A=1;D<(r||1);A++){for(o=h=i.encrypt(X.concat(u,[A])),v=1;v<c;v++)for(h=i.encrypt(h),y=0;y<h.length;y++)o[y]^=h[y];for(v=0;D<(r||1)&&v<o.length;v++)T.setInt32(D,o[v]),D+=4}return x.slice(0,f/8)}};wl.hmacSha1=class{constructor(i){const u=this,c=u._hash=Q2.sha1,f=[[],[]];u._baseHash=[new c,new c];const r=u._baseHash[0].blockSize/32;i.length>r&&(i=new c().update(i).finalize());for(let o=0;o<r;o++)f[0][o]=i[o]^909522486,f[1][o]=i[o]^1549556828;u._baseHash[0].update(f[0]),u._baseHash[1].update(f[1]),u._resultHash=new c(u._baseHash[0])}reset(){const i=this;i._resultHash=new i._hash(i._baseHash[0]),i._updated=!1}update(i){const u=this;u._updated=!0,u._resultHash.update(i)}digest(){const i=this,u=i._resultHash.finalize(),c=new i._hash(i._baseHash[1]).update(u).finalize();return i.reset(),c}encrypt(i){if(this._updated)throw new Error("encrypt on already updated hmac called!");return this.update(i),this.digest(i)}};const y5=typeof crypto!=al&&typeof crypto.getRandomValues==Ri,lr="Invalid password",ar="Invalid signature",ir="zipjs-abort-check-password";function L2(i){return y5?crypto.getRandomValues(i):v5.getRandomValues(i)}const pa=16,E5="raw",G2={name:"PBKDF2"},p5={name:"HMAC"},x5="SHA-1",b5=Object.assign({hash:p5},G2),Kf=Object.assign({iterations:1e3,hash:{name:x5}},G2),S5=["deriveBits"],Si=[8,12,16],Ei=[16,24,32],tl=10,T5=[0,0,0,0],cc=typeof crypto!=al,wi=cc&&crypto.subtle,X2=cc&&typeof wi!=al,Pe=ic.bytes,C5=z2.aes,O5=Y2.ctrGladman,D5=wl.hmacSha1;let F1=cc&&X2&&typeof wi.importKey==Ri,W1=cc&&X2&&typeof wi.deriveBits==Ri;class R5 extends TransformStream{constructor({password:u,rawPassword:c,signed:f,encryptionStrength:r,checkPasswordOnly:o}){super({start(){Object.assign(this,{ready:new Promise(h=>this.resolveReady=h),password:I2(u,c),signed:f,strength:r-1,pending:new Uint8Array})},async transform(h,v){const y=this,{password:A,strength:x,resolveReady:T,ready:D}=y;A?(await M5(y,x,A,Xe(h,0,Si[x]+2)),h=Xe(h,Si[x]+2),o?v.error(new Error(ir)):T()):await D;const X=new Uint8Array(h.length-tl-(h.length-tl)%pa);v.enqueue(V2(y,h,X,0,tl,!0))},async flush(h){const{signed:v,ctr:y,hmac:A,pending:x,ready:T}=this;if(A&&y){await T;const D=Xe(x,0,x.length-tl),X=Xe(x,x.length-tl);let q=new Uint8Array;if(D.length){const p=Ci(Pe,D);A.update(p);const E=y.update(p);q=Ti(Pe,E)}if(v){const p=Xe(Ti(Pe,A.digest()),0,tl);for(let E=0;E<tl;E++)if(p[E]!=X[E])throw new Error(ar)}h.enqueue(q)}}})}}class w5 extends TransformStream{constructor({password:u,rawPassword:c,encryptionStrength:f}){let r;super({start(){Object.assign(this,{ready:new Promise(o=>this.resolveReady=o),password:I2(u,c),strength:f-1,pending:new Uint8Array})},async transform(o,h){const v=this,{password:y,strength:A,resolveReady:x,ready:T}=v;let D=new Uint8Array;y?(D=await j5(v,A,y),x()):await T;const X=new Uint8Array(D.length+o.length-o.length%pa);X.set(D,0),h.enqueue(V2(v,o,X,D.length,0))},async flush(o){const{ctr:h,hmac:v,pending:y,ready:A}=this;if(v&&h){await A;let x=new Uint8Array;if(y.length){const T=h.update(Ci(Pe,y));v.update(T),x=Ti(Pe,T)}r.signature=Ti(Pe,v.digest()).slice(0,tl),o.enqueue(ur(x,r.signature))}}}),r=this}}function V2(i,u,c,f,r,o){const{ctr:h,hmac:v,pending:y}=i,A=u.length-r;y.length&&(u=ur(y,u),c=B5(c,A-A%pa));let x;for(x=0;x<=A-pa;x+=pa){const T=Ci(Pe,Xe(u,x,x+pa));o&&v.update(T);const D=h.update(T);o||v.update(D),c.set(Ti(Pe,D),x+f)}return i.pending=Xe(u,x),c}async function M5(i,u,c,f){const r=await Z2(i,u,c,Xe(f,0,Si[u])),o=Xe(f,Si[u]);if(r[0]!=o[0]||r[1]!=o[1])throw new Error(lr)}async function j5(i,u,c){const f=L2(new Uint8Array(Si[u])),r=await Z2(i,u,c,f);return ur(f,r)}async function Z2(i,u,c,f){i.password=null;const r=await N5(E5,c,b5,!1,S5),o=await H5(Object.assign({salt:f},Kf),r,8*(Ei[u]*2+2)),h=new Uint8Array(o),v=Ci(Pe,Xe(h,0,Ei[u])),y=Ci(Pe,Xe(h,Ei[u],Ei[u]*2)),A=Xe(h,Ei[u]*2);return Object.assign(i,{keys:{key:v,authentication:y,passwordVerification:A},ctr:new O5(new C5(v),Array.from(T5)),hmac:new D5(y)}),A}async function N5(i,u,c,f,r){if(F1)try{return await wi.importKey(i,u,c,f,r)}catch{return F1=!1,wl.importKey(u)}else return wl.importKey(u)}async function H5(i,u,c){if(W1)try{return await wi.deriveBits(i,u,c)}catch{return W1=!1,wl.pbkdf2(u,i.salt,Kf.iterations,c)}else return wl.pbkdf2(u,i.salt,Kf.iterations,c)}function I2(i,u){return u===$t?A5(i):u}function ur(i,u){let c=i;return i.length+u.length&&(c=new Uint8Array(i.length+u.length),c.set(i,0),c.set(u,i.length)),c}function B5(i,u){if(u&&u>i.length){const c=i;i=new Uint8Array(u),i.set(c,0)}return i}function Xe(i,u,c){return i.subarray(u,c)}function Ti(i,u){return i.fromBits(u)}function Ci(i,u){return i.toBits(u)}const bi=12;class U5 extends TransformStream{constructor({password:u,passwordVerification:c,checkPasswordOnly:f}){super({start(){Object.assign(this,{password:u,passwordVerification:c}),q2(this,u)},transform(r,o){const h=this;if(h.password){const v=_1(h,r.subarray(0,bi));if(h.password=null,v.at(-1)!=h.passwordVerification)throw new Error(lr);r=r.subarray(bi)}f?o.error(new Error(ir)):o.enqueue(_1(h,r))}})}}class Q5 extends TransformStream{constructor({password:u,passwordVerification:c}){super({start(){Object.assign(this,{password:u,passwordVerification:c}),q2(this,u)},transform(f,r){const o=this;let h,v;if(o.password){o.password=null;const y=L2(new Uint8Array(bi));y[bi-1]=o.passwordVerification,h=new Uint8Array(f.length+y.length),h.set(P1(o,y),0),v=bi}else h=new Uint8Array(f.length),v=0;h.set(P1(o,f),v),r.enqueue(h)}})}}function _1(i,u){const c=new Uint8Array(u.length);for(let f=0;f<u.length;f++)c[f]=K2(i)^u[f],cr(i,c[f]);return c}function P1(i,u){const c=new Uint8Array(u.length);for(let f=0;f<u.length;f++)c[f]=K2(i)^u[f],cr(i,u[f]);return c}function q2(i,u){const c=[305419896,591751049,878082192];Object.assign(i,{keys:c,crcKey0:new ac(c[0]),crcKey2:new ac(c[2])});for(let f=0;f<u.length;f++)cr(i,u.charCodeAt(f))}function cr(i,u){let[c,f,r]=i.keys;i.crcKey0.append([u]),c=~i.crcKey0.get(),f=$1(Math.imul($1(f+k2(c)),134775813)+1),i.crcKey2.append([f>>>24]),r=~i.crcKey2.get(),i.keys=[c,f,r]}function K2(i){const u=i.keys[2]|2;return k2(Math.imul(u,u^1)>>>8)}function k2(i){return i&255}function $1(i){return i&4294967295}const sr="Invalid uncompressed size",t2="deflate-raw";class z5 extends TransformStream{constructor(u,{chunkSize:c,CompressionStream:f,CompressionStreamNative:r}){super({});const{compressed:o,encrypted:h,useCompressionStream:v,zipCrypto:y,signed:A,level:x}=u,T=this;let D,X,q=super.readable;(!h||y)&&A&&(D=new U2,q=xn(q,D)),o&&(q=F2(q,v,{level:x,chunkSize:c},r,f)),h&&(y?q=xn(q,new Q5(u)):(X=new w5(u),q=xn(q,X))),J2(T,q,()=>{let p;h&&!y&&(p=X.signature),(!h||y)&&A&&(p=new DataView(D.value.buffer).getUint32(0)),T.signature=p})}}class Y5 extends TransformStream{constructor(u,{chunkSize:c,DecompressionStream:f,DecompressionStreamNative:r}){super({});const{zipCrypto:o,encrypted:h,signed:v,signature:y,compressed:A,useCompressionStream:x}=u;let T,D,X=super.readable;h&&(o?X=xn(X,new U5(u)):(D=new R5(u),X=xn(X,D))),A&&(X=F2(X,x,{chunkSize:c},r,f)),(!h||o)&&v&&(T=new U2,X=xn(X,T)),J2(this,X,()=>{if((!h||o)&&v){const q=new DataView(T.value.buffer);if(y!=q.getUint32(0,!1))throw new Error(ar)}})}}function J2(i,u,c){u=xn(u,new TransformStream({flush:c})),Object.defineProperty(i,"readable",{get(){return u}})}function F2(i,u,c,f,r){try{const o=u&&f?f:r;i=xn(i,new o(t2,c))}catch(o){if(u)i=xn(i,new r(t2,c));else throw o}return i}function xn(i,u){return i.pipeThrough(u)}const L5="message",G5="start",X5="pull",e2="data",V5="ack",n2="close",Z5="deflate",W2="inflate";class I5 extends TransformStream{constructor(u,c){super({});const f=this,{codecType:r}=u;let o;r.startsWith(Z5)?o=z5:r.startsWith(W2)&&(o=Y5),f.outputSize=0;let h=0;const v=new o(u,c),y=super.readable,A=new TransformStream({transform(T,D){T&&T.length&&(h+=T.length,D.enqueue(T))},flush(){Object.assign(f,{inputSize:h})}}),x=new TransformStream({transform(T,D){if(T&&T.length&&(D.enqueue(T),f.outputSize+=T.length,u.outputSize&&f.outputSize>u.outputSize))throw new Error(sr)},flush(){const{signature:T}=v;Object.assign(f,{signature:T,inputSize:h})}});Object.defineProperty(f,"readable",{get(){return y.pipeThrough(A).pipeThrough(v).pipeThrough(x)}})}}class q5 extends TransformStream{constructor(u){let c;super({transform:f,flush(r){c&&c.length&&r.enqueue(c)}});function f(r,o){if(c){const h=new Uint8Array(c.length+r.length);h.set(c),h.set(r,c.length),r=h,c=null}r.length>u?(o.enqueue(r.slice(0,u)),f(r.slice(u),o)):c=r}}}let _2=typeof Worker!=al;class Hf{constructor(u,{readable:c,writable:f},{options:r,config:o,streamOptions:h,useWebWorkers:v,transferStreams:y,scripts:A},x){const{signal:T}=h;return Object.assign(u,{busy:!0,readable:c.pipeThrough(new q5(o.chunkSize)).pipeThrough(new K5(h),{signal:T}),writable:f,options:Object.assign({},r),scripts:A,transferStreams:y,terminate(){return new Promise(D=>{const{worker:X,busy:q}=u;X?(q?u.resolveTerminated=D:(X.terminate(),D()),u.interface=null):D()})},onTaskFinished(){const{resolveTerminated:D}=u;D&&(u.resolveTerminated=null,u.terminated=!0,u.worker.terminate(),D()),u.busy=!1,x(u)}}),(v&&_2?k5:P2)(u,o)}}class K5 extends TransformStream{constructor({onstart:u,onprogress:c,size:f,onend:r}){let o=0;super({async start(){u&&await Bf(u,f)},async transform(h,v){o+=h.length,c&&await Bf(c,o,f),v.enqueue(h)},async flush(){r&&await Bf(r,o)}})}}async function Bf(i,...u){try{await i(...u)}catch{}}function P2(i,u){return{run:()=>J5(i,u)}}function k5(i,u){const{baseURL:c,chunkSize:f}=u;if(!i.interface){let r;try{r=_5(i.scripts[0],c,i)}catch{return _2=!1,P2(i,u)}Object.assign(i,{worker:r,interface:{run:()=>F5(i,{chunkSize:f})}})}return i.interface}async function J5({options:i,readable:u,writable:c,onTaskFinished:f},r){let o;try{o=new I5(i,r),await u.pipeThrough(o).pipeTo(c,{preventClose:!0,preventAbort:!0});const{signature:h,inputSize:v,outputSize:y}=o;return{signature:h,inputSize:v,outputSize:y}}catch(h){throw o&&(h.outputSize=o.outputSize),h}finally{f()}}async function F5(i,u){let c,f;const r=new Promise((D,X)=>{c=D,f=X});Object.assign(i,{reader:null,writer:null,resolveResult:c,rejectResult:f,result:r});const{readable:o,options:h,scripts:v}=i,{writable:y,closed:A}=W5(i.writable),x=ec({type:G5,scripts:v.slice(1),options:h,config:u,readable:o,writable:y},i);x||Object.assign(i,{reader:o.getReader(),writer:y.getWriter()});const T=await r;return x||await y.getWriter().close(),await A,T}function W5(i){let u;const c=new Promise(r=>u=r);return{writable:new WritableStream({async write(r){const o=i.getWriter();await o.ready,await o.write(r),o.releaseLock()},close(){u()},abort(r){return i.getWriter().abort(r)}}),closed:c}}let l2=!0,a2=!0;function _5(i,u,c){const f={type:"module"};let r,o;typeof i==Ri&&(i=i());try{r=new URL(i,u)}catch{r=i}if(l2)try{o=new Worker(r)}catch{l2=!1,o=new Worker(r,f)}else o=new Worker(r,f);return o.addEventListener(L5,h=>P5(h,c)),o}function ec(i,{worker:u,writer:c,onTaskFinished:f,transferStreams:r}){try{const{value:o,readable:h,writable:v}=i,y=[];if(o&&(o.byteLength<o.buffer.byteLength?i.value=o.buffer.slice(0,o.byteLength):i.value=o.buffer,y.push(i.value)),r&&a2?(h&&y.push(h),v&&y.push(v)):i.readable=i.writable=null,y.length)try{return u.postMessage(i,y),!0}catch{a2=!1,i.readable=i.writable=null,u.postMessage(i)}else u.postMessage(i)}catch(o){throw c&&c.releaseLock(),f(),o}}async function P5({data:i},u){const{type:c,value:f,messageId:r,result:o,error:h}=i,{reader:v,writer:y,resolveResult:A,rejectResult:x,onTaskFinished:T}=u;try{if(h){const{message:X,stack:q,code:p,name:E,outputSize:b}=h,R=new Error(X);Object.assign(R,{stack:q,code:p,name:E,outputSize:b}),D(R)}else{if(c==X5){const{value:X,done:q}=await v.read();ec({type:e2,value:X,done:q,messageId:r},u)}c==e2&&(await y.ready,await y.write(new Uint8Array(f)),ec({type:V5,messageId:r},u)),c==n2&&D(null,o)}}catch(X){ec({type:n2,messageId:r},u),D(X)}function D(X,q){X?x(X):A(q),y&&y.releaseLock(),T()}}let Ol=[];const Uf=[];let i2=0;async function $5(i,u){const{options:c,config:f}=u,{transferStreams:r,useWebWorkers:o,useCompressionStream:h,codecType:v,compressed:y,signed:A,encrypted:x}=c,{workerScripts:T,maxWorkers:D}=f;u.transferStreams=r||r===$t;const X=!y&&!A&&!x&&!u.transferStreams;return u.useWebWorkers=!X&&(o||o===$t&&f.useWebWorkers),u.scripts=u.useWebWorkers&&T?T[v]:[],c.useCompressionStream=h||h===$t&&f.useCompressionStream,(await q()).run();async function q(){const E=Ol.find(b=>!b.busy);if(E)return u2(E),new Hf(E,i,u,p);if(Ol.length<D){const b={indexWorker:i2};return i2++,Ol.push(b),new Hf(b,i,u,p)}else return new Promise(b=>Uf.push({resolve:b,stream:i,workerOptions:u}))}function p(E){if(Uf.length){const[{resolve:b,stream:R,workerOptions:N}]=Uf.splice(0,1);b(new Hf(E,R,N,p))}else E.worker?(u2(E),t8(E,u)):Ol=Ol.filter(b=>b!=E)}}function t8(i,u){const{config:c}=u,{terminateWorkerTimeout:f}=c;Number.isFinite(f)&&f>=0&&(i.terminated?i.terminated=!1:i.terminateTimeout=setTimeout(async()=>{Ol=Ol.filter(r=>r!=i);try{await i.terminate()}catch{}},f))}function u2(i){const{terminateTimeout:u}=i;u&&(clearTimeout(u),i.terminateTimeout=null)}const $2="Writer iterator completed too soon",e8="Content-Type",n8=64*1024,th="writable";class fr{constructor(){this.size=0}init(){this.initialized=!0}}class sc extends fr{get readable(){const u=this,{chunkSize:c=n8}=u,f=new ReadableStream({start(){this.chunkOffset=0},async pull(r){const{offset:o=0,size:h,diskNumberStart:v}=f,{chunkOffset:y}=this,A=h===$t?c:Math.min(c,h-y),x=await _t(u,o+y,A,v);r.enqueue(x),y+c>h||h===$t&&!x.length&&A?r.close():this.chunkOffset+=c}});return f}}class l8 extends sc{constructor(u){super();let c=u.length;for(;u.charAt(c-1)=="=";)c--;const f=u.indexOf(",")+1;Object.assign(this,{dataURI:u,dataStart:f,size:Math.floor((c-f)*.75)})}readUint8Array(u,c){const{dataStart:f,dataURI:r}=this,o=new Uint8Array(c),h=Math.floor(u/3)*4,v=atob(r.substring(h+f,Math.ceil((u+c)/3)*4+f)),y=u-Math.floor(h/4)*3;let A=0;for(let x=y;x<y+c&&x<v.length;x++)o[x-y]=v.charCodeAt(x),A++;return A<o.length?o.subarray(0,A):o}}class eh extends sc{constructor(u){super(),Object.assign(this,{blob:u,size:u.size})}async readUint8Array(u,c){const f=this,r=u+c;let h=await(u||r<f.size?f.blob.slice(u,r):f.blob).arrayBuffer();return h.byteLength>c&&(h=h.slice(u,r)),new Uint8Array(h)}}class nh extends fr{constructor(u){super();const c=this,f=new TransformStream,r=[];u&&r.push([e8,u]),Object.defineProperty(c,th,{get(){return f.writable}}),c.blob=new Response(f.readable,{headers:r}).blob()}getData(){return this.blob}}class a8 extends nh{constructor(u){super(u),Object.assign(this,{encoding:u,utf8:!u||u.toLowerCase()=="utf-8"})}async getData(){const{encoding:u,utf8:c}=this,f=await super.getData();if(f.text&&c)return f.text();{const r=new FileReader;return new Promise((o,h)=>{Object.assign(r,{onload:({target:v})=>o(v.result),onerror:()=>h(r.error)}),r.readAsText(f,u)})}}}class lh extends sc{constructor(u){super(),this.readers=u}async init(){const u=this,{readers:c}=u;u.lastDiskNumber=0,u.lastDiskOffset=0,await Promise.all(c.map(async(f,r)=>{await f.init(),r!=c.length-1&&(u.lastDiskOffset+=f.size),u.size+=f.size})),super.init()}async readUint8Array(u,c,f=0){const r=this,{readers:o}=this;let h,v=f;v==-1&&(v=o.length-1);let y=u;for(;o[v]&&y>=o[v].size;)y-=o[v].size,v++;const A=o[v];if(A){const x=A.size;if(y+c<=x)h=await _t(A,y,c);else{const T=x-y;h=new Uint8Array(c);const D=await _t(A,y,T);h.set(D,0);const X=await r.readUint8Array(u+T,c-T,f);h.set(X,T),D.length+X.length<c&&(h=h.subarray(0,D.length+X.length))}}else h=new Uint8Array;return r.lastDiskNumber=Math.max(v,r.lastDiskNumber),h}}class kf extends fr{constructor(u,c=4294967295){super();const f=this;Object.assign(f,{diskNumber:0,diskOffset:0,size:0,maxSize:c,availableSize:c});let r,o,h;const v=new WritableStream({async write(x){const{availableSize:T}=f;if(h)x.length>=T?(await y(x.subarray(0,T)),await A(),f.diskOffset+=r.size,f.diskNumber++,h=null,await this.write(x.subarray(T))):await y(x);else{const{value:D,done:X}=await u.next();if(X&&!D)throw new Error($2);r=D,r.size=0,r.maxSize&&(f.maxSize=r.maxSize),f.availableSize=f.maxSize,await Oi(r),o=D.writable,h=o.getWriter(),await this.write(x)}},async close(){await h.ready,await A()}});Object.defineProperty(f,th,{get(){return v}});async function y(x){const T=x.length;T&&(await h.ready,await h.write(x),r.size+=T,f.size+=T,f.availableSize-=T)}async function A(){await h.close()}}}class ah{constructor(u){return Array.isArray(u)&&(u=new lh(u)),u instanceof ReadableStream&&(u={readable:u}),u}}class ih{constructor(u){return u.writable===$t&&typeof u.next==Ri&&(u=new kf(u)),u instanceof WritableStream&&(u={writable:u}),u.size===$t&&(u.size=0),u instanceof kf||Object.assign(u,{diskNumber:0,diskOffset:0,availableSize:1/0,maxSize:1/0}),u}}async function Oi(i,u){if(i.init&&!i.initialized)await i.init(u);else return Promise.resolve()}function _t(i,u,c,f){return i.readUint8Array(u,c,f)}const uh="\0☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼ !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~⌂ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ".split(""),i8=uh.length==256;function u8(i){if(i8){let u="";for(let c=0;c<i.length;c++)u+=uh[i[c]];return u}else return new TextDecoder().decode(i)}function nc(i,u){return u&&u.trim().toLowerCase()=="cp437"?u8(i):new TextDecoder(u).decode(i)}const ch="filename",sh="rawFilename",fh="comment",rh="rawComment",oh="uncompressedSize",dh="compressedSize",hh="offset",Jf="diskNumberStart",Ff="lastModDate",Wf="rawLastModDate",mh="lastAccessDate",c8="rawLastAccessDate",gh="creationDate",s8="rawCreationDate",f8="internalFileAttribute",r8="internalFileAttributes",o8="externalFileAttribute",d8="externalFileAttributes",h8="msDosCompatible",m8="zip64",g8="encrypted",A8="version",v8="versionMadeBy",y8="zipCrypto",E8="directory",p8="executable",x8="compressionMethod",b8="signature",S8="extraField",T8=[ch,sh,dh,oh,Ff,Wf,fh,rh,mh,gh,hh,Jf,Jf,f8,r8,o8,d8,h8,m8,g8,A8,v8,y8,E8,p8,x8,b8,S8,"bitFlag","filenameUTF8","commentUTF8","rawExtraField","extraFieldZip64","extraFieldUnicodePath","extraFieldUnicodeComment","extraFieldAES","extraFieldNTFS","extraFieldExtendedTimestamp"];class c2{constructor(u){T8.forEach(c=>this[c]=u[c])}}const C8="filenameEncoding",O8="commentEncoding",D8="decodeText",R8="extractPrependedData",w8="extractAppendedData",M8="password",j8="rawPassword",N8="passThrough",H8="signal",B8="checkPasswordOnly",U8="checkOverlappingEntryOnly",Q8="checkOverlappingEntry",z8="checkSignature",Y8="useWebWorkers",L8="useCompressionStream",G8="transferStreams",X8="preventClose",lc="File format is not recognized",Ah="End of central directory not found",vh="End of Zip64 central directory locator not found",yh="Central directory header not found",Eh="Local file header not found",ph="Zip64 extra field not found",xh="File contains encrypted entry",bh="Encryption method not supported",_f="Compression method not supported",Pf="Split zip file",Sh="Overlapping entry found",s2="utf-8",f2="cp437",V8=[[oh,Rl],[dh,Rl],[hh,Rl],[Jf,el]],Z8={[el]:{getValue:Bt,bytes:4},[Rl]:{getValue:ba,bytes:8}};class I8{constructor(u,c={}){Object.assign(this,{reader:new ah(u),options:c,config:m5(),readRanges:[]})}async*getEntriesGenerator(u={}){const c=this;let{reader:f}=c;const{config:r}=c;if(await Oi(f),(f.size===$t||!f.readUint8Array)&&(f=new eh(await new Response(f.readable).blob()),await Oi(f)),f.size<Ea)throw new Error(lc);f.chunkSize=g5(r);const o=await _8(f,kA,f.size,Ea,el*16);if(!o){const I=await _t(f,0,4),k=Yt(I);throw Bt(k)==j2?new Error(Pf):new Error(Ah)}const h=Yt(o);let v=Bt(h,12),y=Bt(h,16);const A=o.offset,x=Pt(h,20),T=A+Ea+x;let D=Pt(h,4);const X=f.lastDiskNumber||0;let q=Pt(h,6),p=Pt(h,8),E=0,b=0;if(y==Rl||v==Rl||p==el||q==el){const I=await _t(f,o.offset-Mf,Mf),k=Yt(I);if(Bt(k,0)==JA){y=ba(k,8);let nt=await _t(f,y,jf,-1),P=Yt(nt);const st=o.offset-Mf-jf;if(Bt(P,0)!=X1&&y!=st){const ut=y;y=st,y>ut&&(E=y-ut),nt=await _t(f,y,jf,-1),P=Yt(nt)}if(Bt(P,0)!=X1)throw new Error(vh);D==el&&(D=Bt(P,16)),q==el&&(q=Bt(P,20)),p==el&&(p=ba(P,32)),v==Rl&&(v=ba(P,40)),y-=v}}if(y>=f.size&&(E=f.size-y-v-Ea,y=f.size-v-Ea),X!=D)throw new Error(Pf);if(y<0)throw new Error(lc);let R=0,N=await _t(f,y,v,q),V=Yt(N);if(v){const I=o.offset-v;if(Bt(V,R)!=G1&&y!=I){const k=y;y=I,y>k&&(E+=y-k),N=await _t(f,y,v,q),V=Yt(N)}}const F=o.offset-y-(f.lastDiskOffset||0);if(v!=F&&F>=0&&(v=F,N=await _t(f,y,v,q),V=Yt(N)),y<0||y>=f.size)throw new Error(lc);const H=ie(c,u,C8),j=ie(c,u,O8);for(let I=0;I<p;I++){const k=new q8(f,r,c.options);if(Bt(V,R)!=G1)throw new Error(yh);Th(k,V,R+6);const nt=!!k.bitFlag.languageEncodingFlag,P=R+46,st=P+k.filenameLength,ut=st+k.extraFieldLength,M=Pt(V,R+4),_=M>>8==0,$=M>>8==3,ht=N.subarray(P,st),tt=Pt(V,R+32),C=ut+tt,L=N.subarray(ut,C),W=nt,et=nt,rt=Bt(V,R+38),ot=_&&(xa(V,R+38)&K1)==K1||$&&(rt>>16&u5)==c5||ht.length&&ht.at(-1)==k1.charCodeAt(0),gt=$&&(rt>>16&s5)!=0,Jt=Bt(V,R+42)+E;Object.assign(k,{versionMadeBy:M,msDosCompatible:_,compressedSize:0,uncompressedSize:0,commentLength:tt,directory:ot,offset:Jt,diskNumberStart:Pt(V,R+34),internalFileAttributes:Pt(V,R+36),externalFileAttributes:rt,rawFilename:ht,filenameUTF8:W,commentUTF8:et,rawExtraField:N.subarray(st,ut),executable:gt}),k.internalFileAttribute=k.internalFileAttributes,k.externalFileAttribute=k.externalFileAttributes;const Qt=ie(c,u,D8)||nc,Sn=W?s2:H||f2,ul=et?s2:j||f2;let Tn=Qt(ht,Sn);Tn===$t&&(Tn=nc(ht,Sn));let jl=Qt(L,ul);jl===$t&&(jl=nc(L,ul)),Object.assign(k,{rawComment:L,filename:Tn,comment:jl,directory:ot||Tn.endsWith(k1)}),b=Math.max(Jt,b),Ch(k,k,V,R+6),k.zipCrypto=k.encrypted&&!k.extraFieldAES;const Ee=new c2(k);Ee.getData=(Cn,Hl)=>k.getData(Cn,Ee,c.readRanges,Hl),Ee.arrayBuffer=async Cn=>{const Hl=new TransformStream,[ji]=await Promise.all([new Response(Hl.readable).arrayBuffer(),k.getData(Hl,Ee,c.readRanges,Cn)]);return ji},R=C;const{onprogress:Nl}=u;if(Nl)try{await Nl(I+1,p,new c2(k))}catch{}yield Ee}const Y=ie(c,u,R8),z=ie(c,u,w8);return Y&&(c.prependedData=b>0?await _t(f,0,b):new Uint8Array),c.comment=x?await _t(f,A+Ea,x):new Uint8Array,z&&(c.appendedData=T<f.size?await _t(f,T,f.size-T):new Uint8Array),!0}async getEntries(u={}){const c=[];for await(const f of this.getEntriesGenerator(u))c.push(f);return c}async close(){}}class q8{constructor(u,c,f){Object.assign(this,{reader:u,config:c,options:f})}async getData(u,c,f,r={}){const o=this,{reader:h,offset:v,diskNumberStart:y,extraFieldAES:A,extraFieldZip64:x,compressionMethod:T,config:D,bitFlag:X,signature:q,rawLastModDate:p,uncompressedSize:E,compressedSize:b}=o,{dataDescriptor:R}=X,N=c.localDirectory={},V=await _t(h,v,Nf,y),F=Yt(V);let H=ie(o,r,M8),j=ie(o,r,j8);const Y=ie(o,r,N8);if(H=H&&H.length&&H,j=j&&j.length&&j,A&&A.originalCompressionMethod!=IA)throw new Error(_f);if(T!=ZA&&T!=VA&&!Y)throw new Error(_f);if(Bt(F,0)!=qA)throw new Error(Eh);Th(N,F,4);const{extraFieldLength:z,filenameLength:I,lastAccessDate:k,creationDate:nt}=N;N.rawExtraField=z?await _t(h,v+Nf+I,z,y):new Uint8Array,Ch(o,N,F,4,!0),Object.assign(c,{lastAccessDate:k,creationDate:nt});const P=o.encrypted&&N.encrypted&&!Y,st=P&&!A;if(Y||(c.zipCrypto=st),P){if(!st&&A.strength===$t)throw new Error(bh);if(!H&&!j)throw new Error(xh)}const ut=v+Nf+I+z,M=b,_=h.readable;Object.assign(_,{diskNumberStart:y,offset:ut,size:M});const $=ie(o,r,H8),ht=ie(o,r,B8);let tt=ie(o,r,Q8);const C=ie(o,r,U8);C&&(tt=!0);const{onstart:L,onprogress:W,onend:et}=r,rt={options:{codecType:W2,password:H,rawPassword:j,zipCrypto:st,encryptionStrength:A&&A.strength,signed:ie(o,r,z8)&&!Y,passwordVerification:st&&(R?p>>>8&255:q>>>24&255),outputSize:E,signature:q,compressed:T!=0&&!Y,encrypted:o.encrypted&&!Y,useWebWorkers:ie(o,r,Y8),useCompressionStream:ie(o,r,L8),transferStreams:ie(o,r,G8),checkPasswordOnly:ht},config:D,streamOptions:{signal:$,size:M,onstart:L,onprogress:W,onend:et}};tt&&await W8({reader:h,fileEntry:c,offset:v,diskNumberStart:y,signature:q,compressedSize:b,uncompressedSize:E,dataOffset:ut,dataDescriptor:R||N.bitFlag.dataDescriptor,extraFieldZip64:x||N.extraFieldZip64,readRanges:f});let ot;try{if(!C){ht&&(u=new WritableStream),u=new ih(u),await Oi(u,Y?b:E),{writable:ot}=u;const{outputSize:gt}=await $5({readable:_,writable:ot},rt);if(u.size+=gt,gt!=(Y?b:E))throw new Error(sr)}}catch(gt){if(gt.outputSize!==$t&&(u.size+=gt.outputSize),!ht||gt.message!=ir)throw gt}finally{!ie(o,r,X8)&&ot&&!ot.locked&&await ot.getWriter().close()}return ht||C?$t:u.getData?u.getData():ot}}function Th(i,u,c){const f=i.rawBitFlag=Pt(u,c+2),r=(f&Z1)==Z1,o=Bt(u,c+6);Object.assign(i,{encrypted:r,version:Pt(u,c),bitFlag:{level:(f&i5)>>1,dataDescriptor:(f&I1)==I1,languageEncodingFlag:(f&q1)==q1},rawLastModDate:o,lastModDate:P8(o),filenameLength:Pt(u,c+22),extraFieldLength:Pt(u,c+24)})}function Ch(i,u,c,f,r){const{rawExtraField:o}=u,h=u.extraField=new Map,v=Yt(new Uint8Array(o));let y=0;try{for(;y<o.length;){const b=Pt(v,y),R=Pt(v,y+2);h.set(b,{type:b,data:o.slice(y+4,y+4+R)}),y+=4+R}}catch{}const A=Pt(c,f+4);Object.assign(u,{signature:Bt(c,f+f5),compressedSize:Bt(c,f+r5),uncompressedSize:Bt(c,f+o5)});const x=h.get(_A);x&&(K8(x,u),u.extraFieldZip64=x);const T=h.get(n5);T&&(r2(T,ch,sh,u,i),u.extraFieldUnicodePath=T);const D=h.get(l5);D&&(r2(D,fh,rh,u,i),u.extraFieldUnicodeComment=D);const X=h.get(PA);X?(k8(X,u,A),u.extraFieldAES=X):u.compressionMethod=A;const q=h.get($A);q&&(J8(q,u),u.extraFieldNTFS=q);const p=h.get(e5);p&&(F8(p,u,r),u.extraFieldExtendedTimestamp=p);const E=h.get(a5);E&&(u.extraFieldUSDZ=E)}function K8(i,u){u.zip64=!0;const c=Yt(i.data),f=V8.filter(([r,o])=>u[r]==o);for(let r=0,o=0;r<f.length;r++){const[h,v]=f[r];if(u[h]==v){const y=Z8[v];u[h]=i[h]=y.getValue(c,o),o+=y.bytes}else if(i[h])throw new Error(ph)}}function r2(i,u,c,f,r){const o=Yt(i.data),h=new ac;h.append(r[c]);const v=Yt(new Uint8Array(4));v.setUint32(0,h.get(),!0);const y=Bt(o,1);Object.assign(i,{version:xa(o,0),[u]:nc(i.data.subarray(5)),valid:!r.bitFlag.languageEncodingFlag&&y==Bt(v,0)}),i.valid&&(f[u]=i[u],f[u+"UTF8"]=!0)}function k8(i,u,c){const f=Yt(i.data),r=xa(f,4);Object.assign(i,{vendorVersion:xa(f,0),vendorId:xa(f,2),strength:r,originalCompressionMethod:c,compressionMethod:Pt(f,5)}),u.compressionMethod=i.compressionMethod}function J8(i,u){const c=Yt(i.data);let f=4,r;try{for(;f<i.data.length&&!r;){const o=Pt(c,f),h=Pt(c,f+2);o==t5&&(r=i.data.slice(f+4,f+4+h)),f+=4+h}}catch{}try{if(r&&r.length==24){const o=Yt(r),h=o.getBigUint64(0,!0),v=o.getBigUint64(8,!0),y=o.getBigUint64(16,!0);Object.assign(i,{rawLastModDate:h,rawLastAccessDate:v,rawCreationDate:y});const A=Qf(h),x=Qf(v),T=Qf(y),D={lastModDate:A,lastAccessDate:x,creationDate:T};Object.assign(i,D),Object.assign(u,D)}}catch{}}function F8(i,u,c){const f=Yt(i.data),r=xa(f,0),o=[],h=[];c?((r&1)==1&&(o.push(Ff),h.push(Wf)),(r&2)==2&&(o.push(mh),h.push(c8)),(r&4)==4&&(o.push(gh),h.push(s8))):i.data.length>=5&&(o.push(Ff),h.push(Wf));let v=1;o.forEach((y,A)=>{if(i.data.length>=v+4){const x=Bt(f,v);u[y]=i[y]=new Date(x*1e3);const T=h[A];i[T]=x}v+=4})}async function W8({reader:i,fileEntry:u,offset:c,diskNumberStart:f,signature:r,compressedSize:o,uncompressedSize:h,dataOffset:v,dataDescriptor:y,extraFieldZip64:A,readRanges:x}){let T=0;if(f)for(let q=0;q<f;q++){const p=i.readers[q];T+=p.size}let D=0;if(y&&(A?D=WA:D=FA),D){const q=await _t(i,v+o,D+V1,f);if(Bt(Yt(q),0)==KA){const E=Bt(Yt(q),4);let b,R;A?(b=ba(Yt(q),8),R=ba(Yt(q),16)):(b=Bt(Yt(q),8),R=Bt(Yt(q),12)),(u.encrypted&&!u.zipCrypto||E==r)&&b==o&&R==h&&(D+=V1)}}const X={start:T+c,end:T+v+o+D,fileEntry:u};for(const q of x)if(q.fileEntry!=u&&X.start>=q.start&&X.start<q.end){const p=new Error(Sh);throw p.overlappingEntry=q.fileEntry,p}x.push(X)}async function _8(i,u,c,f,r){const o=new Uint8Array(4),h=Yt(o);$8(h,0,u);const v=f+r;return await y(f)||await y(Math.min(v,c));async function y(A){const x=c-A,T=await _t(i,x,A);for(let D=T.length-f;D>=0;D--)if(T[D]==o[0]&&T[D+1]==o[1]&&T[D+2]==o[2]&&T[D+3]==o[3])return{offset:x+D,buffer:T.slice(D,D+f).buffer}}}function ie(i,u,c){return u[c]===$t?i.options[c]:u[c]}function P8(i){const u=(i&4294901760)>>16,c=i&65535;try{return new Date(1980+((u&65024)>>9),((u&480)>>5)-1,u&31,(c&63488)>>11,(c&2016)>>5,(c&31)*2,0)}catch{}}function Qf(i){return new Date(Number(i/BigInt(1e4)-BigInt(116444736e5)))}function xa(i,u){return i.getUint8(u)}function Pt(i,u){return i.getUint16(u,!0)}function Bt(i,u){return i.getUint32(u,!0)}function ba(i,u){return Number(i.getBigUint64(u,!0))}function $8(i,u,c){i.setUint32(u,c,!0)}function Yt(i){return new DataView(i.buffer)}H2({Inflate:XA});const t3=Object.freeze(Object.defineProperty({__proto__:null,BlobReader:eh,BlobWriter:nh,Data64URIReader:l8,ERR_BAD_FORMAT:lc,ERR_CENTRAL_DIRECTORY_NOT_FOUND:yh,ERR_ENCRYPTED:xh,ERR_EOCDR_LOCATOR_ZIP64_NOT_FOUND:vh,ERR_EOCDR_NOT_FOUND:Ah,ERR_EXTRAFIELD_ZIP64_NOT_FOUND:ph,ERR_INVALID_PASSWORD:lr,ERR_INVALID_SIGNATURE:ar,ERR_INVALID_UNCOMPRESSED_SIZE:sr,ERR_ITERATOR_COMPLETED_TOO_SOON:$2,ERR_LOCAL_FILE_HEADER_NOT_FOUND:Eh,ERR_OVERLAPPING_ENTRY:Sh,ERR_SPLIT_ZIP_FILE:Pf,ERR_UNSUPPORTED_COMPRESSION:_f,ERR_UNSUPPORTED_ENCRYPTION:bh,GenericReader:ah,GenericWriter:ih,Reader:sc,SplitDataReader:lh,SplitDataWriter:kf,TextWriter:a8,ZipReader:I8,configure:H2,initStream:Oi,readUint8Array:_t},Symbol.toStringTag,{value:"Module"}));var zf={exports:{}},dt={};/**
+ * @license React
+ * react.production.js
+ *
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */var o2;function e3(){if(o2)return dt;o2=1;var i=Symbol.for("react.transitional.element"),u=Symbol.for("react.portal"),c=Symbol.for("react.fragment"),f=Symbol.for("react.strict_mode"),r=Symbol.for("react.profiler"),o=Symbol.for("react.consumer"),h=Symbol.for("react.context"),v=Symbol.for("react.forward_ref"),y=Symbol.for("react.suspense"),A=Symbol.for("react.memo"),x=Symbol.for("react.lazy"),T=Symbol.for("react.activity"),D=Symbol.iterator;function X(C){return C===null||typeof C!="object"?null:(C=D&&C[D]||C["@@iterator"],typeof C=="function"?C:null)}var q={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},p=Object.assign,E={};function b(C,L,W){this.props=C,this.context=L,this.refs=E,this.updater=W||q}b.prototype.isReactComponent={},b.prototype.setState=function(C,L){if(typeof C!="object"&&typeof C!="function"&&C!=null)throw Error("takes an object of state variables to update or a function which returns an object of state variables.");this.updater.enqueueSetState(this,C,L,"setState")},b.prototype.forceUpdate=function(C){this.updater.enqueueForceUpdate(this,C,"forceUpdate")};function R(){}R.prototype=b.prototype;function N(C,L,W){this.props=C,this.context=L,this.refs=E,this.updater=W||q}var V=N.prototype=new R;V.constructor=N,p(V,b.prototype),V.isPureReactComponent=!0;var F=Array.isArray;function H(){}var j={H:null,A:null,T:null,S:null},Y=Object.prototype.hasOwnProperty;function z(C,L,W){var et=W.ref;return{$$typeof:i,type:C,key:L,ref:et!==void 0?et:null,props:W}}function I(C,L){return z(C.type,L,C.props)}function k(C){return typeof C=="object"&&C!==null&&C.$$typeof===i}function nt(C){var L={"=":"=0",":":"=2"};return"$"+C.replace(/[=:]/g,function(W){return L[W]})}var P=/\/+/g;function st(C,L){return typeof C=="object"&&C!==null&&C.key!=null?nt(""+C.key):L.toString(36)}function ut(C){switch(C.status){case"fulfilled":return C.value;case"rejected":throw C.reason;default:switch(typeof C.status=="string"?C.then(H,H):(C.status="pending",C.then(function(L){C.status==="pending"&&(C.status="fulfilled",C.value=L)},function(L){C.status==="pending"&&(C.status="rejected",C.reason=L)})),C.status){case"fulfilled":return C.value;case"rejected":throw C.reason}}throw C}function M(C,L,W,et,rt){var ot=typeof C;(ot==="undefined"||ot==="boolean")&&(C=null);var gt=!1;if(C===null)gt=!0;else switch(ot){case"bigint":case"string":case"number":gt=!0;break;case"object":switch(C.$$typeof){case i:case u:gt=!0;break;case x:return gt=C._init,M(gt(C._payload),L,W,et,rt)}}if(gt)return rt=rt(C),gt=et===""?"."+st(C,0):et,F(rt)?(W="",gt!=null&&(W=gt.replace(P,"$&/")+"/"),M(rt,L,W,"",function(Sn){return Sn})):rt!=null&&(k(rt)&&(rt=I(rt,W+(rt.key==null||C&&C.key===rt.key?"":(""+rt.key).replace(P,"$&/")+"/")+gt)),L.push(rt)),1;gt=0;var Jt=et===""?".":et+":";if(F(C))for(var Qt=0;Qt<C.length;Qt++)et=C[Qt],ot=Jt+st(et,Qt),gt+=M(et,L,W,ot,rt);else if(Qt=X(C),typeof Qt=="function")for(C=Qt.call(C),Qt=0;!(et=C.next()).done;)et=et.value,ot=Jt+st(et,Qt++),gt+=M(et,L,W,ot,rt);else if(ot==="object"){if(typeof C.then=="function")return M(ut(C),L,W,et,rt);throw L=String(C),Error("Objects are not valid as a React child (found: "+(L==="[object Object]"?"object with keys {"+Object.keys(C).join(", ")+"}":L)+"). If you meant to render a collection of children, use an array instead.")}return gt}function _(C,L,W){if(C==null)return C;var et=[],rt=0;return M(C,et,"","",function(ot){return L.call(W,ot,rt++)}),et}function $(C){if(C._status===-1){var L=C._result;L=L(),L.then(function(W){(C._status===0||C._status===-1)&&(C._status=1,C._result=W)},function(W){(C._status===0||C._status===-1)&&(C._status=2,C._result=W)}),C._status===-1&&(C._status=0,C._result=L)}if(C._status===1)return C._result.default;throw C._result}var ht=typeof reportError=="function"?reportError:function(C){if(typeof window=="object"&&typeof window.ErrorEvent=="function"){var L=new window.ErrorEvent("error",{bubbles:!0,cancelable:!0,message:typeof C=="object"&&C!==null&&typeof C.message=="string"?String(C.message):String(C),error:C});if(!window.dispatchEvent(L))return}else if(typeof process=="object"&&typeof process.emit=="function"){process.emit("uncaughtException",C);return}console.error(C)},tt={map:_,forEach:function(C,L,W){_(C,function(){L.apply(this,arguments)},W)},count:function(C){var L=0;return _(C,function(){L++}),L},toArray:function(C){return _(C,function(L){return L})||[]},only:function(C){if(!k(C))throw Error("React.Children.only expected to receive a single React element child.");return C}};return dt.Activity=T,dt.Children=tt,dt.Component=b,dt.Fragment=c,dt.Profiler=r,dt.PureComponent=N,dt.StrictMode=f,dt.Suspense=y,dt.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE=j,dt.__COMPILER_RUNTIME={__proto__:null,c:function(C){return j.H.useMemoCache(C)}},dt.cache=function(C){return function(){return C.apply(null,arguments)}},dt.cacheSignal=function(){return null},dt.cloneElement=function(C,L,W){if(C==null)throw Error("The argument must be a React element, but you passed "+C+".");var et=p({},C.props),rt=C.key;if(L!=null)for(ot in L.key!==void 0&&(rt=""+L.key),L)!Y.call(L,ot)||ot==="key"||ot==="__self"||ot==="__source"||ot==="ref"&&L.ref===void 0||(et[ot]=L[ot]);var ot=arguments.length-2;if(ot===1)et.children=W;else if(1<ot){for(var gt=Array(ot),Jt=0;Jt<ot;Jt++)gt[Jt]=arguments[Jt+2];et.children=gt}return z(C.type,rt,et)},dt.createContext=function(C){return C={$$typeof:h,_currentValue:C,_currentValue2:C,_threadCount:0,Provider:null,Consumer:null},C.Provider=C,C.Consumer={$$typeof:o,_context:C},C},dt.createElement=function(C,L,W){var et,rt={},ot=null;if(L!=null)for(et in L.key!==void 0&&(ot=""+L.key),L)Y.call(L,et)&&et!=="key"&&et!=="__self"&&et!=="__source"&&(rt[et]=L[et]);var gt=arguments.length-2;if(gt===1)rt.children=W;else if(1<gt){for(var Jt=Array(gt),Qt=0;Qt<gt;Qt++)Jt[Qt]=arguments[Qt+2];rt.children=Jt}if(C&&C.defaultProps)for(et in gt=C.defaultProps,gt)rt[et]===void 0&&(rt[et]=gt[et]);return z(C,ot,rt)},dt.createRef=function(){return{current:null}},dt.forwardRef=function(C){return{$$typeof:v,render:C}},dt.isValidElement=k,dt.lazy=function(C){return{$$typeof:x,_payload:{_status:-1,_result:C},_init:$}},dt.memo=function(C,L){return{$$typeof:A,type:C,compare:L===void 0?null:L}},dt.startTransition=function(C){var L=j.T,W={};j.T=W;try{var et=C(),rt=j.S;rt!==null&&rt(W,et),typeof et=="object"&&et!==null&&typeof et.then=="function"&&et.then(H,ht)}catch(ot){ht(ot)}finally{L!==null&&W.types!==null&&(L.types=W.types),j.T=L}},dt.unstable_useCacheRefresh=function(){return j.H.useCacheRefresh()},dt.use=function(C){return j.H.use(C)},dt.useActionState=function(C,L,W){return j.H.useActionState(C,L,W)},dt.useCallback=function(C,L){return j.H.useCallback(C,L)},dt.useContext=function(C){return j.H.useContext(C)},dt.useDebugValue=function(){},dt.useDeferredValue=function(C,L){return j.H.useDeferredValue(C,L)},dt.useEffect=function(C,L){return j.H.useEffect(C,L)},dt.useEffectEvent=function(C){return j.H.useEffectEvent(C)},dt.useId=function(){return j.H.useId()},dt.useImperativeHandle=function(C,L,W){return j.H.useImperativeHandle(C,L,W)},dt.useInsertionEffect=function(C,L){return j.H.useInsertionEffect(C,L)},dt.useLayoutEffect=function(C,L){return j.H.useLayoutEffect(C,L)},dt.useMemo=function(C,L){return j.H.useMemo(C,L)},dt.useOptimistic=function(C,L){return j.H.useOptimistic(C,L)},dt.useReducer=function(C,L,W){return j.H.useReducer(C,L,W)},dt.useRef=function(C){return j.H.useRef(C)},dt.useState=function(C){return j.H.useState(C)},dt.useSyncExternalStore=function(C,L,W){return j.H.useSyncExternalStore(C,L,W)},dt.useTransition=function(){return j.H.useTransition()},dt.version="19.2.1",dt}var d2;function rr(){return d2||(d2=1,zf.exports=e3()),zf.exports}var it=rr();const ue=EA(it);var Yf={exports:{}},pi={},Lf={exports:{}},Gf={};/**
+ * @license React
+ * scheduler.production.js
+ *
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */var h2;function n3(){return h2||(h2=1,(function(i){function u(M,_){var $=M.length;M.push(_);t:for(;0<$;){var ht=$-1>>>1,tt=M[ht];if(0<r(tt,_))M[ht]=_,M[$]=tt,$=ht;else break t}}function c(M){return M.length===0?null:M[0]}function f(M){if(M.length===0)return null;var _=M[0],$=M.pop();if($!==_){M[0]=$;t:for(var ht=0,tt=M.length,C=tt>>>1;ht<C;){var L=2*(ht+1)-1,W=M[L],et=L+1,rt=M[et];if(0>r(W,$))et<tt&&0>r(rt,W)?(M[ht]=rt,M[et]=$,ht=et):(M[ht]=W,M[L]=$,ht=L);else if(et<tt&&0>r(rt,$))M[ht]=rt,M[et]=$,ht=et;else break t}}return _}function r(M,_){var $=M.sortIndex-_.sortIndex;return $!==0?$:M.id-_.id}if(i.unstable_now=void 0,typeof performance=="object"&&typeof performance.now=="function"){var o=performance;i.unstable_now=function(){return o.now()}}else{var h=Date,v=h.now();i.unstable_now=function(){return h.now()-v}}var y=[],A=[],x=1,T=null,D=3,X=!1,q=!1,p=!1,E=!1,b=typeof setTimeout=="function"?setTimeout:null,R=typeof clearTimeout=="function"?clearTimeout:null,N=typeof setImmediate<"u"?setImmediate:null;function V(M){for(var _=c(A);_!==null;){if(_.callback===null)f(A);else if(_.startTime<=M)f(A),_.sortIndex=_.expirationTime,u(y,_);else break;_=c(A)}}function F(M){if(p=!1,V(M),!q)if(c(y)!==null)q=!0,H||(H=!0,nt());else{var _=c(A);_!==null&&ut(F,_.startTime-M)}}var H=!1,j=-1,Y=5,z=-1;function I(){return E?!0:!(i.unstable_now()-z<Y)}function k(){if(E=!1,H){var M=i.unstable_now();z=M;var _=!0;try{t:{q=!1,p&&(p=!1,R(j),j=-1),X=!0;var $=D;try{e:{for(V(M),T=c(y);T!==null&&!(T.expirationTime>M&&I());){var ht=T.callback;if(typeof ht=="function"){T.callback=null,D=T.priorityLevel;var tt=ht(T.expirationTime<=M);if(M=i.unstable_now(),typeof tt=="function"){T.callback=tt,V(M),_=!0;break e}T===c(y)&&f(y),V(M)}else f(y);T=c(y)}if(T!==null)_=!0;else{var C=c(A);C!==null&&ut(F,C.startTime-M),_=!1}}break t}finally{T=null,D=$,X=!1}_=void 0}}finally{_?nt():H=!1}}}var nt;if(typeof N=="function")nt=function(){N(k)};else if(typeof MessageChannel<"u"){var P=new MessageChannel,st=P.port2;P.port1.onmessage=k,nt=function(){st.postMessage(null)}}else nt=function(){b(k,0)};function ut(M,_){j=b(function(){M(i.unstable_now())},_)}i.unstable_IdlePriority=5,i.unstable_ImmediatePriority=1,i.unstable_LowPriority=4,i.unstable_NormalPriority=3,i.unstable_Profiling=null,i.unstable_UserBlockingPriority=2,i.unstable_cancelCallback=function(M){M.callback=null},i.unstable_forceFrameRate=function(M){0>M||125<M?console.error("forceFrameRate takes a positive int between 0 and 125, forcing frame rates higher than 125 fps is not supported"):Y=0<M?Math.floor(1e3/M):5},i.unstable_getCurrentPriorityLevel=function(){return D},i.unstable_next=function(M){switch(D){case 1:case 2:case 3:var _=3;break;default:_=D}var $=D;D=_;try{return M()}finally{D=$}},i.unstable_requestPaint=function(){E=!0},i.unstable_runWithPriority=function(M,_){switch(M){case 1:case 2:case 3:case 4:case 5:break;default:M=3}var $=D;D=M;try{return _()}finally{D=$}},i.unstable_scheduleCallback=function(M,_,$){var ht=i.unstable_now();switch(typeof $=="object"&&$!==null?($=$.delay,$=typeof $=="number"&&0<$?ht+$:ht):$=ht,M){case 1:var tt=-1;break;case 2:tt=250;break;case 5:tt=1073741823;break;case 4:tt=1e4;break;default:tt=5e3}return tt=$+tt,M={id:x++,callback:_,priorityLevel:M,startTime:$,expirationTime:tt,sortIndex:-1},$>ht?(M.sortIndex=$,u(A,M),c(y)===null&&M===c(A)&&(p?(R(j),j=-1):p=!0,ut(F,$-ht))):(M.sortIndex=tt,u(y,M),q||X||(q=!0,H||(H=!0,nt()))),M},i.unstable_shouldYield=I,i.unstable_wrapCallback=function(M){var _=D;return function(){var $=D;D=_;try{return M.apply(this,arguments)}finally{D=$}}}})(Gf)),Gf}var m2;function l3(){return m2||(m2=1,Lf.exports=n3()),Lf.exports}var Xf={exports:{}},ce={};/**
+ * @license React
+ * react-dom.production.js
+ *
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */var g2;function a3(){if(g2)return ce;g2=1;var i=rr();function u(y){var A="https://react.dev/errors/"+y;if(1<arguments.length){A+="?args[]="+encodeURIComponent(arguments[1]);for(var x=2;x<arguments.length;x++)A+="&args[]="+encodeURIComponent(arguments[x])}return"Minified React error #"+y+"; visit "+A+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}function c(){}var f={d:{f:c,r:function(){throw Error(u(522))},D:c,C:c,L:c,m:c,X:c,S:c,M:c},p:0,findDOMNode:null},r=Symbol.for("react.portal");function o(y,A,x){var T=3<arguments.length&&arguments[3]!==void 0?arguments[3]:null;return{$$typeof:r,key:T==null?null:""+T,children:y,containerInfo:A,implementation:x}}var h=i.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE;function v(y,A){if(y==="font")return"";if(typeof A=="string")return A==="use-credentials"?A:""}return ce.__DOM_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE=f,ce.createPortal=function(y,A){var x=2<arguments.length&&arguments[2]!==void 0?arguments[2]:null;if(!A||A.nodeType!==1&&A.nodeType!==9&&A.nodeType!==11)throw Error(u(299));return o(y,A,null,x)},ce.flushSync=function(y){var A=h.T,x=f.p;try{if(h.T=null,f.p=2,y)return y()}finally{h.T=A,f.p=x,f.d.f()}},ce.preconnect=function(y,A){typeof y=="string"&&(A?(A=A.crossOrigin,A=typeof A=="string"?A==="use-credentials"?A:"":void 0):A=null,f.d.C(y,A))},ce.prefetchDNS=function(y){typeof y=="string"&&f.d.D(y)},ce.preinit=function(y,A){if(typeof y=="string"&&A&&typeof A.as=="string"){var x=A.as,T=v(x,A.crossOrigin),D=typeof A.integrity=="string"?A.integrity:void 0,X=typeof A.fetchPriority=="string"?A.fetchPriority:void 0;x==="style"?f.d.S(y,typeof A.precedence=="string"?A.precedence:void 0,{crossOrigin:T,integrity:D,fetchPriority:X}):x==="script"&&f.d.X(y,{crossOrigin:T,integrity:D,fetchPriority:X,nonce:typeof A.nonce=="string"?A.nonce:void 0})}},ce.preinitModule=function(y,A){if(typeof y=="string")if(typeof A=="object"&&A!==null){if(A.as==null||A.as==="script"){var x=v(A.as,A.crossOrigin);f.d.M(y,{crossOrigin:x,integrity:typeof A.integrity=="string"?A.integrity:void 0,nonce:typeof A.nonce=="string"?A.nonce:void 0})}}else A==null&&f.d.M(y)},ce.preload=function(y,A){if(typeof y=="string"&&typeof A=="object"&&A!==null&&typeof A.as=="string"){var x=A.as,T=v(x,A.crossOrigin);f.d.L(y,x,{crossOrigin:T,integrity:typeof A.integrity=="string"?A.integrity:void 0,nonce:typeof A.nonce=="string"?A.nonce:void 0,type:typeof A.type=="string"?A.type:void 0,fetchPriority:typeof A.fetchPriority=="string"?A.fetchPriority:void 0,referrerPolicy:typeof A.referrerPolicy=="string"?A.referrerPolicy:void 0,imageSrcSet:typeof A.imageSrcSet=="string"?A.imageSrcSet:void 0,imageSizes:typeof A.imageSizes=="string"?A.imageSizes:void 0,media:typeof A.media=="string"?A.media:void 0})}},ce.preloadModule=function(y,A){if(typeof y=="string")if(A){var x=v(A.as,A.crossOrigin);f.d.m(y,{as:typeof A.as=="string"&&A.as!=="script"?A.as:void 0,crossOrigin:x,integrity:typeof A.integrity=="string"?A.integrity:void 0})}else f.d.m(y)},ce.requestFormReset=function(y){f.d.r(y)},ce.unstable_batchedUpdates=function(y,A){return y(A)},ce.useFormState=function(y,A,x){return h.H.useFormState(y,A,x)},ce.useFormStatus=function(){return h.H.useHostTransitionStatus()},ce.version="19.2.1",ce}var A2;function i3(){if(A2)return Xf.exports;A2=1;function i(){if(!(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>"u"||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!="function"))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(i)}catch(u){console.error(u)}}return i(),Xf.exports=a3(),Xf.exports}/**
+ * @license React
+ * react-dom-client.production.js
+ *
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */var v2;function u3(){if(v2)return pi;v2=1;var i=l3(),u=rr(),c=i3();function f(t){var e="https://react.dev/errors/"+t;if(1<arguments.length){e+="?args[]="+encodeURIComponent(arguments[1]);for(var n=2;n<arguments.length;n++)e+="&args[]="+encodeURIComponent(arguments[n])}return"Minified React error #"+t+"; visit "+e+" for the full message or use the non-minified dev environment for full errors and additional helpful warnings."}function r(t){return!(!t||t.nodeType!==1&&t.nodeType!==9&&t.nodeType!==11)}function o(t){var e=t,n=t;if(t.alternate)for(;e.return;)e=e.return;else{t=e;do e=t,(e.flags&4098)!==0&&(n=e.return),t=e.return;while(t)}return e.tag===3?n:null}function h(t){if(t.tag===13){var e=t.memoizedState;if(e===null&&(t=t.alternate,t!==null&&(e=t.memoizedState)),e!==null)return e.dehydrated}return null}function v(t){if(t.tag===31){var e=t.memoizedState;if(e===null&&(t=t.alternate,t!==null&&(e=t.memoizedState)),e!==null)return e.dehydrated}return null}function y(t){if(o(t)!==t)throw Error(f(188))}function A(t){var e=t.alternate;if(!e){if(e=o(t),e===null)throw Error(f(188));return e!==t?null:t}for(var n=t,l=e;;){var a=n.return;if(a===null)break;var s=a.alternate;if(s===null){if(l=a.return,l!==null){n=l;continue}break}if(a.child===s.child){for(s=a.child;s;){if(s===n)return y(a),t;if(s===l)return y(a),e;s=s.sibling}throw Error(f(188))}if(n.return!==l.return)n=a,l=s;else{for(var d=!1,g=a.child;g;){if(g===n){d=!0,n=a,l=s;break}if(g===l){d=!0,l=a,n=s;break}g=g.sibling}if(!d){for(g=s.child;g;){if(g===n){d=!0,n=s,l=a;break}if(g===l){d=!0,l=s,n=a;break}g=g.sibling}if(!d)throw Error(f(189))}}if(n.alternate!==l)throw Error(f(190))}if(n.tag!==3)throw Error(f(188));return n.stateNode.current===n?t:e}function x(t){var e=t.tag;if(e===5||e===26||e===27||e===6)return t;for(t=t.child;t!==null;){if(e=x(t),e!==null)return e;t=t.sibling}return null}var T=Object.assign,D=Symbol.for("react.element"),X=Symbol.for("react.transitional.element"),q=Symbol.for("react.portal"),p=Symbol.for("react.fragment"),E=Symbol.for("react.strict_mode"),b=Symbol.for("react.profiler"),R=Symbol.for("react.consumer"),N=Symbol.for("react.context"),V=Symbol.for("react.forward_ref"),F=Symbol.for("react.suspense"),H=Symbol.for("react.suspense_list"),j=Symbol.for("react.memo"),Y=Symbol.for("react.lazy"),z=Symbol.for("react.activity"),I=Symbol.for("react.memo_cache_sentinel"),k=Symbol.iterator;function nt(t){return t===null||typeof t!="object"?null:(t=k&&t[k]||t["@@iterator"],typeof t=="function"?t:null)}var P=Symbol.for("react.client.reference");function st(t){if(t==null)return null;if(typeof t=="function")return t.$$typeof===P?null:t.displayName||t.name||null;if(typeof t=="string")return t;switch(t){case p:return"Fragment";case b:return"Profiler";case E:return"StrictMode";case F:return"Suspense";case H:return"SuspenseList";case z:return"Activity"}if(typeof t=="object")switch(t.$$typeof){case q:return"Portal";case N:return t.displayName||"Context";case R:return(t._context.displayName||"Context")+".Consumer";case V:var e=t.render;return t=t.displayName,t||(t=e.displayName||e.name||"",t=t!==""?"ForwardRef("+t+")":"ForwardRef"),t;case j:return e=t.displayName||null,e!==null?e:st(t.type)||"Memo";case Y:e=t._payload,t=t._init;try{return st(t(e))}catch{}}return null}var ut=Array.isArray,M=u.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,_=c.__DOM_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,$={pending:!1,data:null,method:null,action:null},ht=[],tt=-1;function C(t){return{current:t}}function L(t){0>tt||(t.current=ht[tt],ht[tt]=null,tt--)}function W(t,e){tt++,ht[tt]=t.current,t.current=e}var et=C(null),rt=C(null),ot=C(null),gt=C(null);function Jt(t,e){switch(W(ot,e),W(rt,t),W(et,null),e.nodeType){case 9:case 11:t=(t=e.documentElement)&&(t=t.namespaceURI)?Xd(t):0;break;default:if(t=e.tagName,e=e.namespaceURI)e=Xd(e),t=Vd(e,t);else switch(t){case"svg":t=1;break;case"math":t=2;break;default:t=0}}L(et),W(et,t)}function Qt(){L(et),L(rt),L(ot)}function Sn(t){t.memoizedState!==null&&W(gt,t);var e=et.current,n=Vd(e,t.type);e!==n&&(W(rt,t),W(et,n))}function ul(t){rt.current===t&&(L(et),L(rt)),gt.current===t&&(L(gt),hi._currentValue=$)}var Tn,jl;function Ee(t){if(Tn===void 0)try{throw Error()}catch(n){var e=n.stack.trim().match(/\n( *(at )?)/);Tn=e&&e[1]||"",jl=-1<n.stack.indexOf(`
+    at`)?" (<anonymous>)":-1<n.stack.indexOf("@")?"@unknown:0:0":""}return`
+`+Tn+t+jl}var Nl=!1;function Cn(t,e){if(!t||Nl)return"";Nl=!0;var n=Error.prepareStackTrace;Error.prepareStackTrace=void 0;try{var l={DetermineComponentFrameRoot:function(){try{if(e){var J=function(){throw Error()};if(Object.defineProperty(J.prototype,"props",{set:function(){throw Error()}}),typeof Reflect=="object"&&Reflect.construct){try{Reflect.construct(J,[])}catch(G){var Q=G}Reflect.construct(t,[],J)}else{try{J.call()}catch(G){Q=G}t.call(J.prototype)}}else{try{throw Error()}catch(G){Q=G}(J=t())&&typeof J.catch=="function"&&J.catch(function(){})}}catch(G){if(G&&Q&&typeof G.stack=="string")return[G.stack,Q.stack]}return[null,null]}};l.DetermineComponentFrameRoot.displayName="DetermineComponentFrameRoot";var a=Object.getOwnPropertyDescriptor(l.DetermineComponentFrameRoot,"name");a&&a.configurable&&Object.defineProperty(l.DetermineComponentFrameRoot,"name",{value:"DetermineComponentFrameRoot"});var s=l.DetermineComponentFrameRoot(),d=s[0],g=s[1];if(d&&g){var S=d.split(`
+`),U=g.split(`
+`);for(a=l=0;l<S.length&&!S[l].includes("DetermineComponentFrameRoot");)l++;for(;a<U.length&&!U[a].includes("DetermineComponentFrameRoot");)a++;if(l===S.length||a===U.length)for(l=S.length-1,a=U.length-1;1<=l&&0<=a&&S[l]!==U[a];)a--;for(;1<=l&&0<=a;l--,a--)if(S[l]!==U[a]){if(l!==1||a!==1)do if(l--,a--,0>a||S[l]!==U[a]){var Z=`
+`+S[l].replace(" at new "," at ");return t.displayName&&Z.includes("<anonymous>")&&(Z=Z.replace("<anonymous>",t.displayName)),Z}while(1<=l&&0<=a);break}}}finally{Nl=!1,Error.prepareStackTrace=n}return(n=t?t.displayName||t.name:"")?Ee(n):""}function Hl(t,e){switch(t.tag){case 26:case 27:case 5:return Ee(t.type);case 16:return Ee("Lazy");case 13:return t.child!==e&&e!==null?Ee("Suspense Fallback"):Ee("Suspense");case 19:return Ee("SuspenseList");case 0:case 15:return Cn(t.type,!1);case 11:return Cn(t.type.render,!1);case 1:return Cn(t.type,!0);case 31:return Ee("Activity");default:return""}}function ji(t){try{var e="",n=null;do e+=Hl(t,n),n=t,t=t.return;while(t);return e}catch(l){return`
+Error generating stack: `+l.message+`
+`+l.stack}}var rc=Object.prototype.hasOwnProperty,oc=i.unstable_scheduleCallback,dc=i.unstable_cancelCallback,_h=i.unstable_shouldYield,Ph=i.unstable_requestPaint,pe=i.unstable_now,$h=i.unstable_getCurrentPriorityLevel,yr=i.unstable_ImmediatePriority,Er=i.unstable_UserBlockingPriority,Ni=i.unstable_NormalPriority,tm=i.unstable_LowPriority,pr=i.unstable_IdlePriority,em=i.log,nm=i.unstable_setDisableYieldValue,Ca=null,xe=null;function On(t){if(typeof em=="function"&&nm(t),xe&&typeof xe.setStrictMode=="function")try{xe.setStrictMode(Ca,t)}catch{}}var be=Math.clz32?Math.clz32:im,lm=Math.log,am=Math.LN2;function im(t){return t>>>=0,t===0?32:31-(lm(t)/am|0)|0}var Hi=256,Bi=262144,Ui=4194304;function cl(t){var e=t&42;if(e!==0)return e;switch(t&-t){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:return 64;case 128:return 128;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:return t&261888;case 262144:case 524288:case 1048576:case 2097152:return t&3932160;case 4194304:case 8388608:case 16777216:case 33554432:return t&62914560;case 67108864:return 67108864;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 0;default:return t}}function Qi(t,e,n){var l=t.pendingLanes;if(l===0)return 0;var a=0,s=t.suspendedLanes,d=t.pingedLanes;t=t.warmLanes;var g=l&134217727;return g!==0?(l=g&~s,l!==0?a=cl(l):(d&=g,d!==0?a=cl(d):n||(n=g&~t,n!==0&&(a=cl(n))))):(g=l&~s,g!==0?a=cl(g):d!==0?a=cl(d):n||(n=l&~t,n!==0&&(a=cl(n)))),a===0?0:e!==0&&e!==a&&(e&s)===0&&(s=a&-a,n=e&-e,s>=n||s===32&&(n&4194048)!==0)?e:a}function Oa(t,e){return(t.pendingLanes&~(t.suspendedLanes&~t.pingedLanes)&e)===0}function um(t,e){switch(t){case 1:case 2:case 4:case 8:case 64:return e+250;case 16:case 32:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return e+5e3;case 4194304:case 8388608:case 16777216:case 33554432:return-1;case 67108864:case 134217728:case 268435456:case 536870912:case 1073741824:return-1;default:return-1}}function xr(){var t=Ui;return Ui<<=1,(Ui&62914560)===0&&(Ui=4194304),t}function hc(t){for(var e=[],n=0;31>n;n++)e.push(t);return e}function Da(t,e){t.pendingLanes|=e,e!==268435456&&(t.suspendedLanes=0,t.pingedLanes=0,t.warmLanes=0)}function cm(t,e,n,l,a,s){var d=t.pendingLanes;t.pendingLanes=n,t.suspendedLanes=0,t.pingedLanes=0,t.warmLanes=0,t.expiredLanes&=n,t.entangledLanes&=n,t.errorRecoveryDisabledLanes&=n,t.shellSuspendCounter=0;var g=t.entanglements,S=t.expirationTimes,U=t.hiddenUpdates;for(n=d&~n;0<n;){var Z=31-be(n),J=1<<Z;g[Z]=0,S[Z]=-1;var Q=U[Z];if(Q!==null)for(U[Z]=null,Z=0;Z<Q.length;Z++){var G=Q[Z];G!==null&&(G.lane&=-536870913)}n&=~J}l!==0&&br(t,l,0),s!==0&&a===0&&t.tag!==0&&(t.suspendedLanes|=s&~(d&~e))}function br(t,e,n){t.pendingLanes|=e,t.suspendedLanes&=~e;var l=31-be(e);t.entangledLanes|=e,t.entanglements[l]=t.entanglements[l]|1073741824|n&261930}function Sr(t,e){var n=t.entangledLanes|=e;for(t=t.entanglements;n;){var l=31-be(n),a=1<<l;a&e|t[l]&e&&(t[l]|=e),n&=~a}}function Tr(t,e){var n=e&-e;return n=(n&42)!==0?1:mc(n),(n&(t.suspendedLanes|e))!==0?0:n}function mc(t){switch(t){case 2:t=1;break;case 8:t=4;break;case 32:t=16;break;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:case 4194304:case 8388608:case 16777216:case 33554432:t=128;break;case 268435456:t=134217728;break;default:t=0}return t}function gc(t){return t&=-t,2<t?8<t?(t&134217727)!==0?32:268435456:8:2}function Cr(){var t=_.p;return t!==0?t:(t=window.event,t===void 0?32:o1(t.type))}function Or(t,e){var n=_.p;try{return _.p=t,e()}finally{_.p=n}}var Dn=Math.random().toString(36).slice(2),te="__reactFiber$"+Dn,oe="__reactProps$"+Dn,Bl="__reactContainer$"+Dn,Ac="__reactEvents$"+Dn,sm="__reactListeners$"+Dn,fm="__reactHandles$"+Dn,Dr="__reactResources$"+Dn,Ra="__reactMarker$"+Dn;function vc(t){delete t[te],delete t[oe],delete t[Ac],delete t[sm],delete t[fm]}function Ul(t){var e=t[te];if(e)return e;for(var n=t.parentNode;n;){if(e=n[Bl]||n[te]){if(n=e.alternate,e.child!==null||n!==null&&n.child!==null)for(t=Fd(t);t!==null;){if(n=t[te])return n;t=Fd(t)}return e}t=n,n=t.parentNode}return null}function Ql(t){if(t=t[te]||t[Bl]){var e=t.tag;if(e===5||e===6||e===13||e===31||e===26||e===27||e===3)return t}return null}function wa(t){var e=t.tag;if(e===5||e===26||e===27||e===6)return t.stateNode;throw Error(f(33))}function zl(t){var e=t[Dr];return e||(e=t[Dr]={hoistableStyles:new Map,hoistableScripts:new Map}),e}function Ft(t){t[Ra]=!0}var Rr=new Set,wr={};function sl(t,e){Yl(t,e),Yl(t+"Capture",e)}function Yl(t,e){for(wr[t]=e,t=0;t<e.length;t++)Rr.add(e[t])}var rm=RegExp("^[:A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD][:A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD\\-.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*$"),Mr={},jr={};function om(t){return rc.call(jr,t)?!0:rc.call(Mr,t)?!1:rm.test(t)?jr[t]=!0:(Mr[t]=!0,!1)}function zi(t,e,n){if(om(e))if(n===null)t.removeAttribute(e);else{switch(typeof n){case"undefined":case"function":case"symbol":t.removeAttribute(e);return;case"boolean":var l=e.toLowerCase().slice(0,5);if(l!=="data-"&&l!=="aria-"){t.removeAttribute(e);return}}t.setAttribute(e,""+n)}}function Yi(t,e,n){if(n===null)t.removeAttribute(e);else{switch(typeof n){case"undefined":case"function":case"symbol":case"boolean":t.removeAttribute(e);return}t.setAttribute(e,""+n)}}function $e(t,e,n,l){if(l===null)t.removeAttribute(n);else{switch(typeof l){case"undefined":case"function":case"symbol":case"boolean":t.removeAttribute(n);return}t.setAttributeNS(e,n,""+l)}}function je(t){switch(typeof t){case"bigint":case"boolean":case"number":case"string":case"undefined":return t;case"object":return t;default:return""}}function Nr(t){var e=t.type;return(t=t.nodeName)&&t.toLowerCase()==="input"&&(e==="checkbox"||e==="radio")}function dm(t,e,n){var l=Object.getOwnPropertyDescriptor(t.constructor.prototype,e);if(!t.hasOwnProperty(e)&&typeof l<"u"&&typeof l.get=="function"&&typeof l.set=="function"){var a=l.get,s=l.set;return Object.defineProperty(t,e,{configurable:!0,get:function(){return a.call(this)},set:function(d){n=""+d,s.call(this,d)}}),Object.defineProperty(t,e,{enumerable:l.enumerable}),{getValue:function(){return n},setValue:function(d){n=""+d},stopTracking:function(){t._valueTracker=null,delete t[e]}}}}function yc(t){if(!t._valueTracker){var e=Nr(t)?"checked":"value";t._valueTracker=dm(t,e,""+t[e])}}function Hr(t){if(!t)return!1;var e=t._valueTracker;if(!e)return!0;var n=e.getValue(),l="";return t&&(l=Nr(t)?t.checked?"true":"false":t.value),t=l,t!==n?(e.setValue(t),!0):!1}function Li(t){if(t=t||(typeof document<"u"?document:void 0),typeof t>"u")return null;try{return t.activeElement||t.body}catch{return t.body}}var hm=/[\n"\\]/g;function Ne(t){return t.replace(hm,function(e){return"\\"+e.charCodeAt(0).toString(16)+" "})}function Ec(t,e,n,l,a,s,d,g){t.name="",d!=null&&typeof d!="function"&&typeof d!="symbol"&&typeof d!="boolean"?t.type=d:t.removeAttribute("type"),e!=null?d==="number"?(e===0&&t.value===""||t.value!=e)&&(t.value=""+je(e)):t.value!==""+je(e)&&(t.value=""+je(e)):d!=="submit"&&d!=="reset"||t.removeAttribute("value"),e!=null?pc(t,d,je(e)):n!=null?pc(t,d,je(n)):l!=null&&t.removeAttribute("value"),a==null&&s!=null&&(t.defaultChecked=!!s),a!=null&&(t.checked=a&&typeof a!="function"&&typeof a!="symbol"),g!=null&&typeof g!="function"&&typeof g!="symbol"&&typeof g!="boolean"?t.name=""+je(g):t.removeAttribute("name")}function Br(t,e,n,l,a,s,d,g){if(s!=null&&typeof s!="function"&&typeof s!="symbol"&&typeof s!="boolean"&&(t.type=s),e!=null||n!=null){if(!(s!=="submit"&&s!=="reset"||e!=null)){yc(t);return}n=n!=null?""+je(n):"",e=e!=null?""+je(e):n,g||e===t.value||(t.value=e),t.defaultValue=e}l=l??a,l=typeof l!="function"&&typeof l!="symbol"&&!!l,t.checked=g?t.checked:!!l,t.defaultChecked=!!l,d!=null&&typeof d!="function"&&typeof d!="symbol"&&typeof d!="boolean"&&(t.name=d),yc(t)}function pc(t,e,n){e==="number"&&Li(t.ownerDocument)===t||t.defaultValue===""+n||(t.defaultValue=""+n)}function Ll(t,e,n,l){if(t=t.options,e){e={};for(var a=0;a<n.length;a++)e["$"+n[a]]=!0;for(n=0;n<t.length;n++)a=e.hasOwnProperty("$"+t[n].value),t[n].selected!==a&&(t[n].selected=a),a&&l&&(t[n].defaultSelected=!0)}else{for(n=""+je(n),e=null,a=0;a<t.length;a++){if(t[a].value===n){t[a].selected=!0,l&&(t[a].defaultSelected=!0);return}e!==null||t[a].disabled||(e=t[a])}e!==null&&(e.selected=!0)}}function Ur(t,e,n){if(e!=null&&(e=""+je(e),e!==t.value&&(t.value=e),n==null)){t.defaultValue!==e&&(t.defaultValue=e);return}t.defaultValue=n!=null?""+je(n):""}function Qr(t,e,n,l){if(e==null){if(l!=null){if(n!=null)throw Error(f(92));if(ut(l)){if(1<l.length)throw Error(f(93));l=l[0]}n=l}n==null&&(n=""),e=n}n=je(e),t.defaultValue=n,l=t.textContent,l===n&&l!==""&&l!==null&&(t.value=l),yc(t)}function Gl(t,e){if(e){var n=t.firstChild;if(n&&n===t.lastChild&&n.nodeType===3){n.nodeValue=e;return}}t.textContent=e}var mm=new Set("animationIterationCount aspectRatio borderImageOutset borderImageSlice borderImageWidth boxFlex boxFlexGroup boxOrdinalGroup columnCount columns flex flexGrow flexPositive flexShrink flexNegative flexOrder gridArea gridRow gridRowEnd gridRowSpan gridRowStart gridColumn gridColumnEnd gridColumnSpan gridColumnStart fontWeight lineClamp lineHeight opacity order orphans scale tabSize widows zIndex zoom fillOpacity floodOpacity stopOpacity strokeDasharray strokeDashoffset strokeMiterlimit strokeOpacity strokeWidth MozAnimationIterationCount MozBoxFlex MozBoxFlexGroup MozLineClamp msAnimationIterationCount msFlex msZoom msFlexGrow msFlexNegative msFlexOrder msFlexPositive msFlexShrink msGridColumn msGridColumnSpan msGridRow msGridRowSpan WebkitAnimationIterationCount WebkitBoxFlex WebKitBoxFlexGroup WebkitBoxOrdinalGroup WebkitColumnCount WebkitColumns WebkitFlex WebkitFlexGrow WebkitFlexPositive WebkitFlexShrink WebkitLineClamp".split(" "));function zr(t,e,n){var l=e.indexOf("--")===0;n==null||typeof n=="boolean"||n===""?l?t.setProperty(e,""):e==="float"?t.cssFloat="":t[e]="":l?t.setProperty(e,n):typeof n!="number"||n===0||mm.has(e)?e==="float"?t.cssFloat=n:t[e]=(""+n).trim():t[e]=n+"px"}function Yr(t,e,n){if(e!=null&&typeof e!="object")throw Error(f(62));if(t=t.style,n!=null){for(var l in n)!n.hasOwnProperty(l)||e!=null&&e.hasOwnProperty(l)||(l.indexOf("--")===0?t.setProperty(l,""):l==="float"?t.cssFloat="":t[l]="");for(var a in e)l=e[a],e.hasOwnProperty(a)&&n[a]!==l&&zr(t,a,l)}else for(var s in e)e.hasOwnProperty(s)&&zr(t,s,e[s])}function xc(t){if(t.indexOf("-")===-1)return!1;switch(t){case"annotation-xml":case"color-profile":case"font-face":case"font-face-src":case"font-face-uri":case"font-face-format":case"font-face-name":case"missing-glyph":return!1;default:return!0}}var gm=new Map([["acceptCharset","accept-charset"],["htmlFor","for"],["httpEquiv","http-equiv"],["crossOrigin","crossorigin"],["accentHeight","accent-height"],["alignmentBaseline","alignment-baseline"],["arabicForm","arabic-form"],["baselineShift","baseline-shift"],["capHeight","cap-height"],["clipPath","clip-path"],["clipRule","clip-rule"],["colorInterpolation","color-interpolation"],["colorInterpolationFilters","color-interpolation-filters"],["colorProfile","color-profile"],["colorRendering","color-rendering"],["dominantBaseline","dominant-baseline"],["enableBackground","enable-background"],["fillOpacity","fill-opacity"],["fillRule","fill-rule"],["floodColor","flood-color"],["floodOpacity","flood-opacity"],["fontFamily","font-family"],["fontSize","font-size"],["fontSizeAdjust","font-size-adjust"],["fontStretch","font-stretch"],["fontStyle","font-style"],["fontVariant","font-variant"],["fontWeight","font-weight"],["glyphName","glyph-name"],["glyphOrientationHorizontal","glyph-orientation-horizontal"],["glyphOrientationVertical","glyph-orientation-vertical"],["horizAdvX","horiz-adv-x"],["horizOriginX","horiz-origin-x"],["imageRendering","image-rendering"],["letterSpacing","letter-spacing"],["lightingColor","lighting-color"],["markerEnd","marker-end"],["markerMid","marker-mid"],["markerStart","marker-start"],["overlinePosition","overline-position"],["overlineThickness","overline-thickness"],["paintOrder","paint-order"],["panose-1","panose-1"],["pointerEvents","pointer-events"],["renderingIntent","rendering-intent"],["shapeRendering","shape-rendering"],["stopColor","stop-color"],["stopOpacity","stop-opacity"],["strikethroughPosition","strikethrough-position"],["strikethroughThickness","strikethrough-thickness"],["strokeDasharray","stroke-dasharray"],["strokeDashoffset","stroke-dashoffset"],["strokeLinecap","stroke-linecap"],["strokeLinejoin","stroke-linejoin"],["strokeMiterlimit","stroke-miterlimit"],["strokeOpacity","stroke-opacity"],["strokeWidth","stroke-width"],["textAnchor","text-anchor"],["textDecoration","text-decoration"],["textRendering","text-rendering"],["transformOrigin","transform-origin"],["underlinePosition","underline-position"],["underlineThickness","underline-thickness"],["unicodeBidi","unicode-bidi"],["unicodeRange","unicode-range"],["unitsPerEm","units-per-em"],["vAlphabetic","v-alphabetic"],["vHanging","v-hanging"],["vIdeographic","v-ideographic"],["vMathematical","v-mathematical"],["vectorEffect","vector-effect"],["vertAdvY","vert-adv-y"],["vertOriginX","vert-origin-x"],["vertOriginY","vert-origin-y"],["wordSpacing","word-spacing"],["writingMode","writing-mode"],["xmlnsXlink","xmlns:xlink"],["xHeight","x-height"]]),Am=/^[\u0000-\u001F ]*j[\r\n\t]*a[\r\n\t]*v[\r\n\t]*a[\r\n\t]*s[\r\n\t]*c[\r\n\t]*r[\r\n\t]*i[\r\n\t]*p[\r\n\t]*t[\r\n\t]*:/i;function Gi(t){return Am.test(""+t)?"javascript:throw new Error('React has blocked a javascript: URL as a security precaution.')":t}function tn(){}var bc=null;function Sc(t){return t=t.target||t.srcElement||window,t.correspondingUseElement&&(t=t.correspondingUseElement),t.nodeType===3?t.parentNode:t}var Xl=null,Vl=null;function Lr(t){var e=Ql(t);if(e&&(t=e.stateNode)){var n=t[oe]||null;t:switch(t=e.stateNode,e.type){case"input":if(Ec(t,n.value,n.defaultValue,n.defaultValue,n.checked,n.defaultChecked,n.type,n.name),e=n.name,n.type==="radio"&&e!=null){for(n=t;n.parentNode;)n=n.parentNode;for(n=n.querySelectorAll('input[name="'+Ne(""+e)+'"][type="radio"]'),e=0;e<n.length;e++){var l=n[e];if(l!==t&&l.form===t.form){var a=l[oe]||null;if(!a)throw Error(f(90));Ec(l,a.value,a.defaultValue,a.defaultValue,a.checked,a.defaultChecked,a.type,a.name)}}for(e=0;e<n.length;e++)l=n[e],l.form===t.form&&Hr(l)}break t;case"textarea":Ur(t,n.value,n.defaultValue);break t;case"select":e=n.value,e!=null&&Ll(t,!!n.multiple,e,!1)}}}var Tc=!1;function Gr(t,e,n){if(Tc)return t(e,n);Tc=!0;try{var l=t(e);return l}finally{if(Tc=!1,(Xl!==null||Vl!==null)&&(Du(),Xl&&(e=Xl,t=Vl,Vl=Xl=null,Lr(e),t)))for(e=0;e<t.length;e++)Lr(t[e])}}function Ma(t,e){var n=t.stateNode;if(n===null)return null;var l=n[oe]||null;if(l===null)return null;n=l[e];t:switch(e){case"onClick":case"onClickCapture":case"onDoubleClick":case"onDoubleClickCapture":case"onMouseDown":case"onMouseDownCapture":case"onMouseMove":case"onMouseMoveCapture":case"onMouseUp":case"onMouseUpCapture":case"onMouseEnter":(l=!l.disabled)||(t=t.type,l=!(t==="button"||t==="input"||t==="select"||t==="textarea")),t=!l;break t;default:t=!1}if(t)return null;if(n&&typeof n!="function")throw Error(f(231,e,typeof n));return n}var en=!(typeof window>"u"||typeof window.document>"u"||typeof window.document.createElement>"u"),Cc=!1;if(en)try{var ja={};Object.defineProperty(ja,"passive",{get:function(){Cc=!0}}),window.addEventListener("test",ja,ja),window.removeEventListener("test",ja,ja)}catch{Cc=!1}var Rn=null,Oc=null,Xi=null;function Xr(){if(Xi)return Xi;var t,e=Oc,n=e.length,l,a="value"in Rn?Rn.value:Rn.textContent,s=a.length;for(t=0;t<n&&e[t]===a[t];t++);var d=n-t;for(l=1;l<=d&&e[n-l]===a[s-l];l++);return Xi=a.slice(t,1<l?1-l:void 0)}function Vi(t){var e=t.keyCode;return"charCode"in t?(t=t.charCode,t===0&&e===13&&(t=13)):t=e,t===10&&(t=13),32<=t||t===13?t:0}function Zi(){return!0}function Vr(){return!1}function de(t){function e(n,l,a,s,d){this._reactName=n,this._targetInst=a,this.type=l,this.nativeEvent=s,this.target=d,this.currentTarget=null;for(var g in t)t.hasOwnProperty(g)&&(n=t[g],this[g]=n?n(s):s[g]);return this.isDefaultPrevented=(s.defaultPrevented!=null?s.defaultPrevented:s.returnValue===!1)?Zi:Vr,this.isPropagationStopped=Vr,this}return T(e.prototype,{preventDefault:function(){this.defaultPrevented=!0;var n=this.nativeEvent;n&&(n.preventDefault?n.preventDefault():typeof n.returnValue!="unknown"&&(n.returnValue=!1),this.isDefaultPrevented=Zi)},stopPropagation:function(){var n=this.nativeEvent;n&&(n.stopPropagation?n.stopPropagation():typeof n.cancelBubble!="unknown"&&(n.cancelBubble=!0),this.isPropagationStopped=Zi)},persist:function(){},isPersistent:Zi}),e}var fl={eventPhase:0,bubbles:0,cancelable:0,timeStamp:function(t){return t.timeStamp||Date.now()},defaultPrevented:0,isTrusted:0},Ii=de(fl),Na=T({},fl,{view:0,detail:0}),vm=de(Na),Dc,Rc,Ha,qi=T({},Na,{screenX:0,screenY:0,clientX:0,clientY:0,pageX:0,pageY:0,ctrlKey:0,shiftKey:0,altKey:0,metaKey:0,getModifierState:Mc,button:0,buttons:0,relatedTarget:function(t){return t.relatedTarget===void 0?t.fromElement===t.srcElement?t.toElement:t.fromElement:t.relatedTarget},movementX:function(t){return"movementX"in t?t.movementX:(t!==Ha&&(Ha&&t.type==="mousemove"?(Dc=t.screenX-Ha.screenX,Rc=t.screenY-Ha.screenY):Rc=Dc=0,Ha=t),Dc)},movementY:function(t){return"movementY"in t?t.movementY:Rc}}),Zr=de(qi),ym=T({},qi,{dataTransfer:0}),Em=de(ym),pm=T({},Na,{relatedTarget:0}),wc=de(pm),xm=T({},fl,{animationName:0,elapsedTime:0,pseudoElement:0}),bm=de(xm),Sm=T({},fl,{clipboardData:function(t){return"clipboardData"in t?t.clipboardData:window.clipboardData}}),Tm=de(Sm),Cm=T({},fl,{data:0}),Ir=de(Cm),Om={Esc:"Escape",Spacebar:" ",Left:"ArrowLeft",Up:"ArrowUp",Right:"ArrowRight",Down:"ArrowDown",Del:"Delete",Win:"OS",Menu:"ContextMenu",Apps:"ContextMenu",Scroll:"ScrollLock",MozPrintableKey:"Unidentified"},Dm={8:"Backspace",9:"Tab",12:"Clear",13:"Enter",16:"Shift",17:"Control",18:"Alt",19:"Pause",20:"CapsLock",27:"Escape",32:" ",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",224:"Meta"},Rm={Alt:"altKey",Control:"ctrlKey",Meta:"metaKey",Shift:"shiftKey"};function wm(t){var e=this.nativeEvent;return e.getModifierState?e.getModifierState(t):(t=Rm[t])?!!e[t]:!1}function Mc(){return wm}var Mm=T({},Na,{key:function(t){if(t.key){var e=Om[t.key]||t.key;if(e!=="Unidentified")return e}return t.type==="keypress"?(t=Vi(t),t===13?"Enter":String.fromCharCode(t)):t.type==="keydown"||t.type==="keyup"?Dm[t.keyCode]||"Unidentified":""},code:0,location:0,ctrlKey:0,shiftKey:0,altKey:0,metaKey:0,repeat:0,locale:0,getModifierState:Mc,charCode:function(t){return t.type==="keypress"?Vi(t):0},keyCode:function(t){return t.type==="keydown"||t.type==="keyup"?t.keyCode:0},which:function(t){return t.type==="keypress"?Vi(t):t.type==="keydown"||t.type==="keyup"?t.keyCode:0}}),jm=de(Mm),Nm=T({},qi,{pointerId:0,width:0,height:0,pressure:0,tangentialPressure:0,tiltX:0,tiltY:0,twist:0,pointerType:0,isPrimary:0}),qr=de(Nm),Hm=T({},Na,{touches:0,targetTouches:0,changedTouches:0,altKey:0,metaKey:0,ctrlKey:0,shiftKey:0,getModifierState:Mc}),Bm=de(Hm),Um=T({},fl,{propertyName:0,elapsedTime:0,pseudoElement:0}),Qm=de(Um),zm=T({},qi,{deltaX:function(t){return"deltaX"in t?t.deltaX:"wheelDeltaX"in t?-t.wheelDeltaX:0},deltaY:function(t){return"deltaY"in t?t.deltaY:"wheelDeltaY"in t?-t.wheelDeltaY:"wheelDelta"in t?-t.wheelDelta:0},deltaZ:0,deltaMode:0}),Ym=de(zm),Lm=T({},fl,{newState:0,oldState:0}),Gm=de(Lm),Xm=[9,13,27,32],jc=en&&"CompositionEvent"in window,Ba=null;en&&"documentMode"in document&&(Ba=document.documentMode);var Vm=en&&"TextEvent"in window&&!Ba,Kr=en&&(!jc||Ba&&8<Ba&&11>=Ba),kr=" ",Jr=!1;function Fr(t,e){switch(t){case"keyup":return Xm.indexOf(e.keyCode)!==-1;case"keydown":return e.keyCode!==229;case"keypress":case"mousedown":case"focusout":return!0;default:return!1}}function Wr(t){return t=t.detail,typeof t=="object"&&"data"in t?t.data:null}var Zl=!1;function Zm(t,e){switch(t){case"compositionend":return Wr(e);case"keypress":return e.which!==32?null:(Jr=!0,kr);case"textInput":return t=e.data,t===kr&&Jr?null:t;default:return null}}function Im(t,e){if(Zl)return t==="compositionend"||!jc&&Fr(t,e)?(t=Xr(),Xi=Oc=Rn=null,Zl=!1,t):null;switch(t){case"paste":return null;case"keypress":if(!(e.ctrlKey||e.altKey||e.metaKey)||e.ctrlKey&&e.altKey){if(e.char&&1<e.char.length)return e.char;if(e.which)return String.fromCharCode(e.which)}return null;case"compositionend":return Kr&&e.locale!=="ko"?null:e.data;default:return null}}var qm={color:!0,date:!0,datetime:!0,"datetime-local":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};function _r(t){var e=t&&t.nodeName&&t.nodeName.toLowerCase();return e==="input"?!!qm[t.type]:e==="textarea"}function Pr(t,e,n,l){Xl?Vl?Vl.push(l):Vl=[l]:Xl=l,e=Bu(e,"onChange"),0<e.length&&(n=new Ii("onChange","change",null,n,l),t.push({event:n,listeners:e}))}var Ua=null,Qa=null;function Km(t){Ud(t,0)}function Ki(t){var e=wa(t);if(Hr(e))return t}function $r(t,e){if(t==="change")return e}var t0=!1;if(en){var Nc;if(en){var Hc="oninput"in document;if(!Hc){var e0=document.createElement("div");e0.setAttribute("oninput","return;"),Hc=typeof e0.oninput=="function"}Nc=Hc}else Nc=!1;t0=Nc&&(!document.documentMode||9<document.documentMode)}function n0(){Ua&&(Ua.detachEvent("onpropertychange",l0),Qa=Ua=null)}function l0(t){if(t.propertyName==="value"&&Ki(Qa)){var e=[];Pr(e,Qa,t,Sc(t)),Gr(Km,e)}}function km(t,e,n){t==="focusin"?(n0(),Ua=e,Qa=n,Ua.attachEvent("onpropertychange",l0)):t==="focusout"&&n0()}function Jm(t){if(t==="selectionchange"||t==="keyup"||t==="keydown")return Ki(Qa)}function Fm(t,e){if(t==="click")return Ki(e)}function Wm(t,e){if(t==="input"||t==="change")return Ki(e)}function _m(t,e){return t===e&&(t!==0||1/t===1/e)||t!==t&&e!==e}var Se=typeof Object.is=="function"?Object.is:_m;function za(t,e){if(Se(t,e))return!0;if(typeof t!="object"||t===null||typeof e!="object"||e===null)return!1;var n=Object.keys(t),l=Object.keys(e);if(n.length!==l.length)return!1;for(l=0;l<n.length;l++){var a=n[l];if(!rc.call(e,a)||!Se(t[a],e[a]))return!1}return!0}function a0(t){for(;t&&t.firstChild;)t=t.firstChild;return t}function i0(t,e){var n=a0(t);t=0;for(var l;n;){if(n.nodeType===3){if(l=t+n.textContent.length,t<=e&&l>=e)return{node:n,offset:e-t};t=l}t:{for(;n;){if(n.nextSibling){n=n.nextSibling;break t}n=n.parentNode}n=void 0}n=a0(n)}}function u0(t,e){return t&&e?t===e?!0:t&&t.nodeType===3?!1:e&&e.nodeType===3?u0(t,e.parentNode):"contains"in t?t.contains(e):t.compareDocumentPosition?!!(t.compareDocumentPosition(e)&16):!1:!1}function c0(t){t=t!=null&&t.ownerDocument!=null&&t.ownerDocument.defaultView!=null?t.ownerDocument.defaultView:window;for(var e=Li(t.document);e instanceof t.HTMLIFrameElement;){try{var n=typeof e.contentWindow.location.href=="string"}catch{n=!1}if(n)t=e.contentWindow;else break;e=Li(t.document)}return e}function Bc(t){var e=t&&t.nodeName&&t.nodeName.toLowerCase();return e&&(e==="input"&&(t.type==="text"||t.type==="search"||t.type==="tel"||t.type==="url"||t.type==="password")||e==="textarea"||t.contentEditable==="true")}var Pm=en&&"documentMode"in document&&11>=document.documentMode,Il=null,Uc=null,Ya=null,Qc=!1;function s0(t,e,n){var l=n.window===n?n.document:n.nodeType===9?n:n.ownerDocument;Qc||Il==null||Il!==Li(l)||(l=Il,"selectionStart"in l&&Bc(l)?l={start:l.selectionStart,end:l.selectionEnd}:(l=(l.ownerDocument&&l.ownerDocument.defaultView||window).getSelection(),l={anchorNode:l.anchorNode,anchorOffset:l.anchorOffset,focusNode:l.focusNode,focusOffset:l.focusOffset}),Ya&&za(Ya,l)||(Ya=l,l=Bu(Uc,"onSelect"),0<l.length&&(e=new Ii("onSelect","select",null,e,n),t.push({event:e,listeners:l}),e.target=Il)))}function rl(t,e){var n={};return n[t.toLowerCase()]=e.toLowerCase(),n["Webkit"+t]="webkit"+e,n["Moz"+t]="moz"+e,n}var ql={animationend:rl("Animation","AnimationEnd"),animationiteration:rl("Animation","AnimationIteration"),animationstart:rl("Animation","AnimationStart"),transitionrun:rl("Transition","TransitionRun"),transitionstart:rl("Transition","TransitionStart"),transitioncancel:rl("Transition","TransitionCancel"),transitionend:rl("Transition","TransitionEnd")},zc={},f0={};en&&(f0=document.createElement("div").style,"AnimationEvent"in window||(delete ql.animationend.animation,delete ql.animationiteration.animation,delete ql.animationstart.animation),"TransitionEvent"in window||delete ql.transitionend.transition);function ol(t){if(zc[t])return zc[t];if(!ql[t])return t;var e=ql[t],n;for(n in e)if(e.hasOwnProperty(n)&&n in f0)return zc[t]=e[n];return t}var r0=ol("animationend"),o0=ol("animationiteration"),d0=ol("animationstart"),$m=ol("transitionrun"),tg=ol("transitionstart"),eg=ol("transitioncancel"),h0=ol("transitionend"),m0=new Map,Yc="abort auxClick beforeToggle cancel canPlay canPlayThrough click close contextMenu copy cut drag dragEnd dragEnter dragExit dragLeave dragOver dragStart drop durationChange emptied encrypted ended error gotPointerCapture input invalid keyDown keyPress keyUp load loadedData loadedMetadata loadStart lostPointerCapture mouseDown mouseMove mouseOut mouseOver mouseUp paste pause play playing pointerCancel pointerDown pointerMove pointerOut pointerOver pointerUp progress rateChange reset resize seeked seeking stalled submit suspend timeUpdate touchCancel touchEnd touchStart volumeChange scroll toggle touchMove waiting wheel".split(" ");Yc.push("scrollEnd");function Ie(t,e){m0.set(t,e),sl(e,[t])}var ki=typeof reportError=="function"?reportError:function(t){if(typeof window=="object"&&typeof window.ErrorEvent=="function"){var e=new window.ErrorEvent("error",{bubbles:!0,cancelable:!0,message:typeof t=="object"&&t!==null&&typeof t.message=="string"?String(t.message):String(t),error:t});if(!window.dispatchEvent(e))return}else if(typeof process=="object"&&typeof process.emit=="function"){process.emit("uncaughtException",t);return}console.error(t)},He=[],Kl=0,Lc=0;function Ji(){for(var t=Kl,e=Lc=Kl=0;e<t;){var n=He[e];He[e++]=null;var l=He[e];He[e++]=null;var a=He[e];He[e++]=null;var s=He[e];if(He[e++]=null,l!==null&&a!==null){var d=l.pending;d===null?a.next=a:(a.next=d.next,d.next=a),l.pending=a}s!==0&&g0(n,a,s)}}function Fi(t,e,n,l){He[Kl++]=t,He[Kl++]=e,He[Kl++]=n,He[Kl++]=l,Lc|=l,t.lanes|=l,t=t.alternate,t!==null&&(t.lanes|=l)}function Gc(t,e,n,l){return Fi(t,e,n,l),Wi(t)}function dl(t,e){return Fi(t,null,null,e),Wi(t)}function g0(t,e,n){t.lanes|=n;var l=t.alternate;l!==null&&(l.lanes|=n);for(var a=!1,s=t.return;s!==null;)s.childLanes|=n,l=s.alternate,l!==null&&(l.childLanes|=n),s.tag===22&&(t=s.stateNode,t===null||t._visibility&1||(a=!0)),t=s,s=s.return;return t.tag===3?(s=t.stateNode,a&&e!==null&&(a=31-be(n),t=s.hiddenUpdates,l=t[a],l===null?t[a]=[e]:l.push(e),e.lane=n|536870912),s):null}function Wi(t){if(50<ui)throw ui=0,Fs=null,Error(f(185));for(var e=t.return;e!==null;)t=e,e=t.return;return t.tag===3?t.stateNode:null}var kl={};function ng(t,e,n,l){this.tag=t,this.key=n,this.sibling=this.child=this.return=this.stateNode=this.type=this.elementType=null,this.index=0,this.refCleanup=this.ref=null,this.pendingProps=e,this.dependencies=this.memoizedState=this.updateQueue=this.memoizedProps=null,this.mode=l,this.subtreeFlags=this.flags=0,this.deletions=null,this.childLanes=this.lanes=0,this.alternate=null}function Te(t,e,n,l){return new ng(t,e,n,l)}function Xc(t){return t=t.prototype,!(!t||!t.isReactComponent)}function nn(t,e){var n=t.alternate;return n===null?(n=Te(t.tag,e,t.key,t.mode),n.elementType=t.elementType,n.type=t.type,n.stateNode=t.stateNode,n.alternate=t,t.alternate=n):(n.pendingProps=e,n.type=t.type,n.flags=0,n.subtreeFlags=0,n.deletions=null),n.flags=t.flags&65011712,n.childLanes=t.childLanes,n.lanes=t.lanes,n.child=t.child,n.memoizedProps=t.memoizedProps,n.memoizedState=t.memoizedState,n.updateQueue=t.updateQueue,e=t.dependencies,n.dependencies=e===null?null:{lanes:e.lanes,firstContext:e.firstContext},n.sibling=t.sibling,n.index=t.index,n.ref=t.ref,n.refCleanup=t.refCleanup,n}function A0(t,e){t.flags&=65011714;var n=t.alternate;return n===null?(t.childLanes=0,t.lanes=e,t.child=null,t.subtreeFlags=0,t.memoizedProps=null,t.memoizedState=null,t.updateQueue=null,t.dependencies=null,t.stateNode=null):(t.childLanes=n.childLanes,t.lanes=n.lanes,t.child=n.child,t.subtreeFlags=0,t.deletions=null,t.memoizedProps=n.memoizedProps,t.memoizedState=n.memoizedState,t.updateQueue=n.updateQueue,t.type=n.type,e=n.dependencies,t.dependencies=e===null?null:{lanes:e.lanes,firstContext:e.firstContext}),t}function _i(t,e,n,l,a,s){var d=0;if(l=t,typeof t=="function")Xc(t)&&(d=1);else if(typeof t=="string")d=cA(t,n,et.current)?26:t==="html"||t==="head"||t==="body"?27:5;else t:switch(t){case z:return t=Te(31,n,e,a),t.elementType=z,t.lanes=s,t;case p:return hl(n.children,a,s,e);case E:d=8,a|=24;break;case b:return t=Te(12,n,e,a|2),t.elementType=b,t.lanes=s,t;case F:return t=Te(13,n,e,a),t.elementType=F,t.lanes=s,t;case H:return t=Te(19,n,e,a),t.elementType=H,t.lanes=s,t;default:if(typeof t=="object"&&t!==null)switch(t.$$typeof){case N:d=10;break t;case R:d=9;break t;case V:d=11;break t;case j:d=14;break t;case Y:d=16,l=null;break t}d=29,n=Error(f(130,t===null?"null":typeof t,"")),l=null}return e=Te(d,n,e,a),e.elementType=t,e.type=l,e.lanes=s,e}function hl(t,e,n,l){return t=Te(7,t,l,e),t.lanes=n,t}function Vc(t,e,n){return t=Te(6,t,null,e),t.lanes=n,t}function v0(t){var e=Te(18,null,null,0);return e.stateNode=t,e}function Zc(t,e,n){return e=Te(4,t.children!==null?t.children:[],t.key,e),e.lanes=n,e.stateNode={containerInfo:t.containerInfo,pendingChildren:null,implementation:t.implementation},e}var y0=new WeakMap;function Be(t,e){if(typeof t=="object"&&t!==null){var n=y0.get(t);return n!==void 0?n:(e={value:t,source:e,stack:ji(e)},y0.set(t,e),e)}return{value:t,source:e,stack:ji(e)}}var Jl=[],Fl=0,Pi=null,La=0,Ue=[],Qe=0,wn=null,Je=1,Fe="";function ln(t,e){Jl[Fl++]=La,Jl[Fl++]=Pi,Pi=t,La=e}function E0(t,e,n){Ue[Qe++]=Je,Ue[Qe++]=Fe,Ue[Qe++]=wn,wn=t;var l=Je;t=Fe;var a=32-be(l)-1;l&=~(1<<a),n+=1;var s=32-be(e)+a;if(30<s){var d=a-a%5;s=(l&(1<<d)-1).toString(32),l>>=d,a-=d,Je=1<<32-be(e)+a|n<<a|l,Fe=s+t}else Je=1<<s|n<<a|l,Fe=t}function Ic(t){t.return!==null&&(ln(t,1),E0(t,1,0))}function qc(t){for(;t===Pi;)Pi=Jl[--Fl],Jl[Fl]=null,La=Jl[--Fl],Jl[Fl]=null;for(;t===wn;)wn=Ue[--Qe],Ue[Qe]=null,Fe=Ue[--Qe],Ue[Qe]=null,Je=Ue[--Qe],Ue[Qe]=null}function p0(t,e){Ue[Qe++]=Je,Ue[Qe++]=Fe,Ue[Qe++]=wn,Je=e.id,Fe=e.overflow,wn=t}var ee=null,Nt=null,xt=!1,Mn=null,ze=!1,Kc=Error(f(519));function jn(t){var e=Error(f(418,1<arguments.length&&arguments[1]!==void 0&&arguments[1]?"text":"HTML",""));throw Ga(Be(e,t)),Kc}function x0(t){var e=t.stateNode,n=t.type,l=t.memoizedProps;switch(e[te]=t,e[oe]=l,n){case"dialog":yt("cancel",e),yt("close",e);break;case"iframe":case"object":case"embed":yt("load",e);break;case"video":case"audio":for(n=0;n<si.length;n++)yt(si[n],e);break;case"source":yt("error",e);break;case"img":case"image":case"link":yt("error",e),yt("load",e);break;case"details":yt("toggle",e);break;case"input":yt("invalid",e),Br(e,l.value,l.defaultValue,l.checked,l.defaultChecked,l.type,l.name,!0);break;case"select":yt("invalid",e);break;case"textarea":yt("invalid",e),Qr(e,l.value,l.defaultValue,l.children)}n=l.children,typeof n!="string"&&typeof n!="number"&&typeof n!="bigint"||e.textContent===""+n||l.suppressHydrationWarning===!0||Ld(e.textContent,n)?(l.popover!=null&&(yt("beforetoggle",e),yt("toggle",e)),l.onScroll!=null&&yt("scroll",e),l.onScrollEnd!=null&&yt("scrollend",e),l.onClick!=null&&(e.onclick=tn),e=!0):e=!1,e||jn(t,!0)}function b0(t){for(ee=t.return;ee;)switch(ee.tag){case 5:case 31:case 13:ze=!1;return;case 27:case 3:ze=!0;return;default:ee=ee.return}}function Wl(t){if(t!==ee)return!1;if(!xt)return b0(t),xt=!0,!1;var e=t.tag,n;if((n=e!==3&&e!==27)&&((n=e===5)&&(n=t.type,n=!(n!=="form"&&n!=="button")||of(t.type,t.memoizedProps)),n=!n),n&&Nt&&jn(t),b0(t),e===13){if(t=t.memoizedState,t=t!==null?t.dehydrated:null,!t)throw Error(f(317));Nt=Jd(t)}else if(e===31){if(t=t.memoizedState,t=t!==null?t.dehydrated:null,!t)throw Error(f(317));Nt=Jd(t)}else e===27?(e=Nt,qn(t.type)?(t=Af,Af=null,Nt=t):Nt=e):Nt=ee?Le(t.stateNode.nextSibling):null;return!0}function ml(){Nt=ee=null,xt=!1}function kc(){var t=Mn;return t!==null&&(Ae===null?Ae=t:Ae.push.apply(Ae,t),Mn=null),t}function Ga(t){Mn===null?Mn=[t]:Mn.push(t)}var Jc=C(null),gl=null,an=null;function Nn(t,e,n){W(Jc,e._currentValue),e._currentValue=n}function un(t){t._currentValue=Jc.current,L(Jc)}function Fc(t,e,n){for(;t!==null;){var l=t.alternate;if((t.childLanes&e)!==e?(t.childLanes|=e,l!==null&&(l.childLanes|=e)):l!==null&&(l.childLanes&e)!==e&&(l.childLanes|=e),t===n)break;t=t.return}}function Wc(t,e,n,l){var a=t.child;for(a!==null&&(a.return=t);a!==null;){var s=a.dependencies;if(s!==null){var d=a.child;s=s.firstContext;t:for(;s!==null;){var g=s;s=a;for(var S=0;S<e.length;S++)if(g.context===e[S]){s.lanes|=n,g=s.alternate,g!==null&&(g.lanes|=n),Fc(s.return,n,t),l||(d=null);break t}s=g.next}}else if(a.tag===18){if(d=a.return,d===null)throw Error(f(341));d.lanes|=n,s=d.alternate,s!==null&&(s.lanes|=n),Fc(d,n,t),d=null}else d=a.child;if(d!==null)d.return=a;else for(d=a;d!==null;){if(d===t){d=null;break}if(a=d.sibling,a!==null){a.return=d.return,d=a;break}d=d.return}a=d}}function _l(t,e,n,l){t=null;for(var a=e,s=!1;a!==null;){if(!s){if((a.flags&524288)!==0)s=!0;else if((a.flags&262144)!==0)break}if(a.tag===10){var d=a.alternate;if(d===null)throw Error(f(387));if(d=d.memoizedProps,d!==null){var g=a.type;Se(a.pendingProps.value,d.value)||(t!==null?t.push(g):t=[g])}}else if(a===gt.current){if(d=a.alternate,d===null)throw Error(f(387));d.memoizedState.memoizedState!==a.memoizedState.memoizedState&&(t!==null?t.push(hi):t=[hi])}a=a.return}t!==null&&Wc(e,t,n,l),e.flags|=262144}function $i(t){for(t=t.firstContext;t!==null;){if(!Se(t.context._currentValue,t.memoizedValue))return!0;t=t.next}return!1}function Al(t){gl=t,an=null,t=t.dependencies,t!==null&&(t.firstContext=null)}function ne(t){return S0(gl,t)}function tu(t,e){return gl===null&&Al(t),S0(t,e)}function S0(t,e){var n=e._currentValue;if(e={context:e,memoizedValue:n,next:null},an===null){if(t===null)throw Error(f(308));an=e,t.dependencies={lanes:0,firstContext:e},t.flags|=524288}else an=an.next=e;return n}var lg=typeof AbortController<"u"?AbortController:function(){var t=[],e=this.signal={aborted:!1,addEventListener:function(n,l){t.push(l)}};this.abort=function(){e.aborted=!0,t.forEach(function(n){return n()})}},ag=i.unstable_scheduleCallback,ig=i.unstable_NormalPriority,Zt={$$typeof:N,Consumer:null,Provider:null,_currentValue:null,_currentValue2:null,_threadCount:0};function _c(){return{controller:new lg,data:new Map,refCount:0}}function Xa(t){t.refCount--,t.refCount===0&&ag(ig,function(){t.controller.abort()})}var Va=null,Pc=0,Pl=0,$l=null;function ug(t,e){if(Va===null){var n=Va=[];Pc=0,Pl=ef(),$l={status:"pending",value:void 0,then:function(l){n.push(l)}}}return Pc++,e.then(T0,T0),e}function T0(){if(--Pc===0&&Va!==null){$l!==null&&($l.status="fulfilled");var t=Va;Va=null,Pl=0,$l=null;for(var e=0;e<t.length;e++)(0,t[e])()}}function cg(t,e){var n=[],l={status:"pending",value:null,reason:null,then:function(a){n.push(a)}};return t.then(function(){l.status="fulfilled",l.value=e;for(var a=0;a<n.length;a++)(0,n[a])(e)},function(a){for(l.status="rejected",l.reason=a,a=0;a<n.length;a++)(0,n[a])(void 0)}),l}var C0=M.S;M.S=function(t,e){fd=pe(),typeof e=="object"&&e!==null&&typeof e.then=="function"&&ug(t,e),C0!==null&&C0(t,e)};var vl=C(null);function $c(){var t=vl.current;return t!==null?t:jt.pooledCache}function eu(t,e){e===null?W(vl,vl.current):W(vl,e.pool)}function O0(){var t=$c();return t===null?null:{parent:Zt._currentValue,pool:t}}var ta=Error(f(460)),ts=Error(f(474)),nu=Error(f(542)),lu={then:function(){}};function D0(t){return t=t.status,t==="fulfilled"||t==="rejected"}function R0(t,e,n){switch(n=t[n],n===void 0?t.push(e):n!==e&&(e.then(tn,tn),e=n),e.status){case"fulfilled":return e.value;case"rejected":throw t=e.reason,M0(t),t;default:if(typeof e.status=="string")e.then(tn,tn);else{if(t=jt,t!==null&&100<t.shellSuspendCounter)throw Error(f(482));t=e,t.status="pending",t.then(function(l){if(e.status==="pending"){var a=e;a.status="fulfilled",a.value=l}},function(l){if(e.status==="pending"){var a=e;a.status="rejected",a.reason=l}})}switch(e.status){case"fulfilled":return e.value;case"rejected":throw t=e.reason,M0(t),t}throw El=e,ta}}function yl(t){try{var e=t._init;return e(t._payload)}catch(n){throw n!==null&&typeof n=="object"&&typeof n.then=="function"?(El=n,ta):n}}var El=null;function w0(){if(El===null)throw Error(f(459));var t=El;return El=null,t}function M0(t){if(t===ta||t===nu)throw Error(f(483))}var ea=null,Za=0;function au(t){var e=Za;return Za+=1,ea===null&&(ea=[]),R0(ea,t,e)}function Ia(t,e){e=e.props.ref,t.ref=e!==void 0?e:null}function iu(t,e){throw e.$$typeof===D?Error(f(525)):(t=Object.prototype.toString.call(e),Error(f(31,t==="[object Object]"?"object with keys {"+Object.keys(e).join(", ")+"}":t)))}function j0(t){function e(w,O){if(t){var B=w.deletions;B===null?(w.deletions=[O],w.flags|=16):B.push(O)}}function n(w,O){if(!t)return null;for(;O!==null;)e(w,O),O=O.sibling;return null}function l(w){for(var O=new Map;w!==null;)w.key!==null?O.set(w.key,w):O.set(w.index,w),w=w.sibling;return O}function a(w,O){return w=nn(w,O),w.index=0,w.sibling=null,w}function s(w,O,B){return w.index=B,t?(B=w.alternate,B!==null?(B=B.index,B<O?(w.flags|=67108866,O):B):(w.flags|=67108866,O)):(w.flags|=1048576,O)}function d(w){return t&&w.alternate===null&&(w.flags|=67108866),w}function g(w,O,B,K){return O===null||O.tag!==6?(O=Vc(B,w.mode,K),O.return=w,O):(O=a(O,B),O.return=w,O)}function S(w,O,B,K){var ct=B.type;return ct===p?Z(w,O,B.props.children,K,B.key):O!==null&&(O.elementType===ct||typeof ct=="object"&&ct!==null&&ct.$$typeof===Y&&yl(ct)===O.type)?(O=a(O,B.props),Ia(O,B),O.return=w,O):(O=_i(B.type,B.key,B.props,null,w.mode,K),Ia(O,B),O.return=w,O)}function U(w,O,B,K){return O===null||O.tag!==4||O.stateNode.containerInfo!==B.containerInfo||O.stateNode.implementation!==B.implementation?(O=Zc(B,w.mode,K),O.return=w,O):(O=a(O,B.children||[]),O.return=w,O)}function Z(w,O,B,K,ct){return O===null||O.tag!==7?(O=hl(B,w.mode,K,ct),O.return=w,O):(O=a(O,B),O.return=w,O)}function J(w,O,B){if(typeof O=="string"&&O!==""||typeof O=="number"||typeof O=="bigint")return O=Vc(""+O,w.mode,B),O.return=w,O;if(typeof O=="object"&&O!==null){switch(O.$$typeof){case X:return B=_i(O.type,O.key,O.props,null,w.mode,B),Ia(B,O),B.return=w,B;case q:return O=Zc(O,w.mode,B),O.return=w,O;case Y:return O=yl(O),J(w,O,B)}if(ut(O)||nt(O))return O=hl(O,w.mode,B,null),O.return=w,O;if(typeof O.then=="function")return J(w,au(O),B);if(O.$$typeof===N)return J(w,tu(w,O),B);iu(w,O)}return null}function Q(w,O,B,K){var ct=O!==null?O.key:null;if(typeof B=="string"&&B!==""||typeof B=="number"||typeof B=="bigint")return ct!==null?null:g(w,O,""+B,K);if(typeof B=="object"&&B!==null){switch(B.$$typeof){case X:return B.key===ct?S(w,O,B,K):null;case q:return B.key===ct?U(w,O,B,K):null;case Y:return B=yl(B),Q(w,O,B,K)}if(ut(B)||nt(B))return ct!==null?null:Z(w,O,B,K,null);if(typeof B.then=="function")return Q(w,O,au(B),K);if(B.$$typeof===N)return Q(w,O,tu(w,B),K);iu(w,B)}return null}function G(w,O,B,K,ct){if(typeof K=="string"&&K!==""||typeof K=="number"||typeof K=="bigint")return w=w.get(B)||null,g(O,w,""+K,ct);if(typeof K=="object"&&K!==null){switch(K.$$typeof){case X:return w=w.get(K.key===null?B:K.key)||null,S(O,w,K,ct);case q:return w=w.get(K.key===null?B:K.key)||null,U(O,w,K,ct);case Y:return K=yl(K),G(w,O,B,K,ct)}if(ut(K)||nt(K))return w=w.get(B)||null,Z(O,w,K,ct,null);if(typeof K.then=="function")return G(w,O,B,au(K),ct);if(K.$$typeof===N)return G(w,O,B,tu(O,K),ct);iu(O,K)}return null}function lt(w,O,B,K){for(var ct=null,St=null,at=O,At=O=0,pt=null;at!==null&&At<B.length;At++){at.index>At?(pt=at,at=null):pt=at.sibling;var Tt=Q(w,at,B[At],K);if(Tt===null){at===null&&(at=pt);break}t&&at&&Tt.alternate===null&&e(w,at),O=s(Tt,O,At),St===null?ct=Tt:St.sibling=Tt,St=Tt,at=pt}if(At===B.length)return n(w,at),xt&&ln(w,At),ct;if(at===null){for(;At<B.length;At++)at=J(w,B[At],K),at!==null&&(O=s(at,O,At),St===null?ct=at:St.sibling=at,St=at);return xt&&ln(w,At),ct}for(at=l(at);At<B.length;At++)pt=G(at,w,At,B[At],K),pt!==null&&(t&&pt.alternate!==null&&at.delete(pt.key===null?At:pt.key),O=s(pt,O,At),St===null?ct=pt:St.sibling=pt,St=pt);return t&&at.forEach(function(Wn){return e(w,Wn)}),xt&&ln(w,At),ct}function ft(w,O,B,K){if(B==null)throw Error(f(151));for(var ct=null,St=null,at=O,At=O=0,pt=null,Tt=B.next();at!==null&&!Tt.done;At++,Tt=B.next()){at.index>At?(pt=at,at=null):pt=at.sibling;var Wn=Q(w,at,Tt.value,K);if(Wn===null){at===null&&(at=pt);break}t&&at&&Wn.alternate===null&&e(w,at),O=s(Wn,O,At),St===null?ct=Wn:St.sibling=Wn,St=Wn,at=pt}if(Tt.done)return n(w,at),xt&&ln(w,At),ct;if(at===null){for(;!Tt.done;At++,Tt=B.next())Tt=J(w,Tt.value,K),Tt!==null&&(O=s(Tt,O,At),St===null?ct=Tt:St.sibling=Tt,St=Tt);return xt&&ln(w,At),ct}for(at=l(at);!Tt.done;At++,Tt=B.next())Tt=G(at,w,At,Tt.value,K),Tt!==null&&(t&&Tt.alternate!==null&&at.delete(Tt.key===null?At:Tt.key),O=s(Tt,O,At),St===null?ct=Tt:St.sibling=Tt,St=Tt);return t&&at.forEach(function(yA){return e(w,yA)}),xt&&ln(w,At),ct}function Mt(w,O,B,K){if(typeof B=="object"&&B!==null&&B.type===p&&B.key===null&&(B=B.props.children),typeof B=="object"&&B!==null){switch(B.$$typeof){case X:t:{for(var ct=B.key;O!==null;){if(O.key===ct){if(ct=B.type,ct===p){if(O.tag===7){n(w,O.sibling),K=a(O,B.props.children),K.return=w,w=K;break t}}else if(O.elementType===ct||typeof ct=="object"&&ct!==null&&ct.$$typeof===Y&&yl(ct)===O.type){n(w,O.sibling),K=a(O,B.props),Ia(K,B),K.return=w,w=K;break t}n(w,O);break}else e(w,O);O=O.sibling}B.type===p?(K=hl(B.props.children,w.mode,K,B.key),K.return=w,w=K):(K=_i(B.type,B.key,B.props,null,w.mode,K),Ia(K,B),K.return=w,w=K)}return d(w);case q:t:{for(ct=B.key;O!==null;){if(O.key===ct)if(O.tag===4&&O.stateNode.containerInfo===B.containerInfo&&O.stateNode.implementation===B.implementation){n(w,O.sibling),K=a(O,B.children||[]),K.return=w,w=K;break t}else{n(w,O);break}else e(w,O);O=O.sibling}K=Zc(B,w.mode,K),K.return=w,w=K}return d(w);case Y:return B=yl(B),Mt(w,O,B,K)}if(ut(B))return lt(w,O,B,K);if(nt(B)){if(ct=nt(B),typeof ct!="function")throw Error(f(150));return B=ct.call(B),ft(w,O,B,K)}if(typeof B.then=="function")return Mt(w,O,au(B),K);if(B.$$typeof===N)return Mt(w,O,tu(w,B),K);iu(w,B)}return typeof B=="string"&&B!==""||typeof B=="number"||typeof B=="bigint"?(B=""+B,O!==null&&O.tag===6?(n(w,O.sibling),K=a(O,B),K.return=w,w=K):(n(w,O),K=Vc(B,w.mode,K),K.return=w,w=K),d(w)):n(w,O)}return function(w,O,B,K){try{Za=0;var ct=Mt(w,O,B,K);return ea=null,ct}catch(at){if(at===ta||at===nu)throw at;var St=Te(29,at,null,w.mode);return St.lanes=K,St.return=w,St}finally{}}}var pl=j0(!0),N0=j0(!1),Hn=!1;function es(t){t.updateQueue={baseState:t.memoizedState,firstBaseUpdate:null,lastBaseUpdate:null,shared:{pending:null,lanes:0,hiddenCallbacks:null},callbacks:null}}function ns(t,e){t=t.updateQueue,e.updateQueue===t&&(e.updateQueue={baseState:t.baseState,firstBaseUpdate:t.firstBaseUpdate,lastBaseUpdate:t.lastBaseUpdate,shared:t.shared,callbacks:null})}function Bn(t){return{lane:t,tag:0,payload:null,callback:null,next:null}}function Un(t,e,n){var l=t.updateQueue;if(l===null)return null;if(l=l.shared,(Ct&2)!==0){var a=l.pending;return a===null?e.next=e:(e.next=a.next,a.next=e),l.pending=e,e=Wi(t),g0(t,null,n),e}return Fi(t,l,e,n),Wi(t)}function qa(t,e,n){if(e=e.updateQueue,e!==null&&(e=e.shared,(n&4194048)!==0)){var l=e.lanes;l&=t.pendingLanes,n|=l,e.lanes=n,Sr(t,n)}}function ls(t,e){var n=t.updateQueue,l=t.alternate;if(l!==null&&(l=l.updateQueue,n===l)){var a=null,s=null;if(n=n.firstBaseUpdate,n!==null){do{var d={lane:n.lane,tag:n.tag,payload:n.payload,callback:null,next:null};s===null?a=s=d:s=s.next=d,n=n.next}while(n!==null);s===null?a=s=e:s=s.next=e}else a=s=e;n={baseState:l.baseState,firstBaseUpdate:a,lastBaseUpdate:s,shared:l.shared,callbacks:l.callbacks},t.updateQueue=n;return}t=n.lastBaseUpdate,t===null?n.firstBaseUpdate=e:t.next=e,n.lastBaseUpdate=e}var as=!1;function Ka(){if(as){var t=$l;if(t!==null)throw t}}function ka(t,e,n,l){as=!1;var a=t.updateQueue;Hn=!1;var s=a.firstBaseUpdate,d=a.lastBaseUpdate,g=a.shared.pending;if(g!==null){a.shared.pending=null;var S=g,U=S.next;S.next=null,d===null?s=U:d.next=U,d=S;var Z=t.alternate;Z!==null&&(Z=Z.updateQueue,g=Z.lastBaseUpdate,g!==d&&(g===null?Z.firstBaseUpdate=U:g.next=U,Z.lastBaseUpdate=S))}if(s!==null){var J=a.baseState;d=0,Z=U=S=null,g=s;do{var Q=g.lane&-536870913,G=Q!==g.lane;if(G?(Et&Q)===Q:(l&Q)===Q){Q!==0&&Q===Pl&&(as=!0),Z!==null&&(Z=Z.next={lane:0,tag:g.tag,payload:g.payload,callback:null,next:null});t:{var lt=t,ft=g;Q=e;var Mt=n;switch(ft.tag){case 1:if(lt=ft.payload,typeof lt=="function"){J=lt.call(Mt,J,Q);break t}J=lt;break t;case 3:lt.flags=lt.flags&-65537|128;case 0:if(lt=ft.payload,Q=typeof lt=="function"?lt.call(Mt,J,Q):lt,Q==null)break t;J=T({},J,Q);break t;case 2:Hn=!0}}Q=g.callback,Q!==null&&(t.flags|=64,G&&(t.flags|=8192),G=a.callbacks,G===null?a.callbacks=[Q]:G.push(Q))}else G={lane:Q,tag:g.tag,payload:g.payload,callback:g.callback,next:null},Z===null?(U=Z=G,S=J):Z=Z.next=G,d|=Q;if(g=g.next,g===null){if(g=a.shared.pending,g===null)break;G=g,g=G.next,G.next=null,a.lastBaseUpdate=G,a.shared.pending=null}}while(!0);Z===null&&(S=J),a.baseState=S,a.firstBaseUpdate=U,a.lastBaseUpdate=Z,s===null&&(a.shared.lanes=0),Gn|=d,t.lanes=d,t.memoizedState=J}}function H0(t,e){if(typeof t!="function")throw Error(f(191,t));t.call(e)}function B0(t,e){var n=t.callbacks;if(n!==null)for(t.callbacks=null,t=0;t<n.length;t++)H0(n[t],e)}var na=C(null),uu=C(0);function U0(t,e){t=gn,W(uu,t),W(na,e),gn=t|e.baseLanes}function is(){W(uu,gn),W(na,na.current)}function us(){gn=uu.current,L(na),L(uu)}var Ce=C(null),Ye=null;function Qn(t){var e=t.alternate;W(Xt,Xt.current&1),W(Ce,t),Ye===null&&(e===null||na.current!==null||e.memoizedState!==null)&&(Ye=t)}function cs(t){W(Xt,Xt.current),W(Ce,t),Ye===null&&(Ye=t)}function Q0(t){t.tag===22?(W(Xt,Xt.current),W(Ce,t),Ye===null&&(Ye=t)):zn()}function zn(){W(Xt,Xt.current),W(Ce,Ce.current)}function Oe(t){L(Ce),Ye===t&&(Ye=null),L(Xt)}var Xt=C(0);function cu(t){for(var e=t;e!==null;){if(e.tag===13){var n=e.memoizedState;if(n!==null&&(n=n.dehydrated,n===null||mf(n)||gf(n)))return e}else if(e.tag===19&&(e.memoizedProps.revealOrder==="forwards"||e.memoizedProps.revealOrder==="backwards"||e.memoizedProps.revealOrder==="unstable_legacy-backwards"||e.memoizedProps.revealOrder==="together")){if((e.flags&128)!==0)return e}else if(e.child!==null){e.child.return=e,e=e.child;continue}if(e===t)break;for(;e.sibling===null;){if(e.return===null||e.return===t)return null;e=e.return}e.sibling.return=e.return,e=e.sibling}return null}var cn=0,mt=null,Rt=null,It=null,su=!1,la=!1,xl=!1,fu=0,Ja=0,aa=null,sg=0;function Lt(){throw Error(f(321))}function ss(t,e){if(e===null)return!1;for(var n=0;n<e.length&&n<t.length;n++)if(!Se(t[n],e[n]))return!1;return!0}function fs(t,e,n,l,a,s){return cn=s,mt=e,e.memoizedState=null,e.updateQueue=null,e.lanes=0,M.H=t===null||t.memoizedState===null?po:Ts,xl=!1,s=n(l,a),xl=!1,la&&(s=Y0(e,n,l,a)),z0(t),s}function z0(t){M.H=_a;var e=Rt!==null&&Rt.next!==null;if(cn=0,It=Rt=mt=null,su=!1,Ja=0,aa=null,e)throw Error(f(300));t===null||qt||(t=t.dependencies,t!==null&&$i(t)&&(qt=!0))}function Y0(t,e,n,l){mt=t;var a=0;do{if(la&&(aa=null),Ja=0,la=!1,25<=a)throw Error(f(301));if(a+=1,It=Rt=null,t.updateQueue!=null){var s=t.updateQueue;s.lastEffect=null,s.events=null,s.stores=null,s.memoCache!=null&&(s.memoCache.index=0)}M.H=xo,s=e(n,l)}while(la);return s}function fg(){var t=M.H,e=t.useState()[0];return e=typeof e.then=="function"?Fa(e):e,t=t.useState()[0],(Rt!==null?Rt.memoizedState:null)!==t&&(mt.flags|=1024),e}function rs(){var t=fu!==0;return fu=0,t}function os(t,e,n){e.updateQueue=t.updateQueue,e.flags&=-2053,t.lanes&=~n}function ds(t){if(su){for(t=t.memoizedState;t!==null;){var e=t.queue;e!==null&&(e.pending=null),t=t.next}su=!1}cn=0,It=Rt=mt=null,la=!1,Ja=fu=0,aa=null}function fe(){var t={memoizedState:null,baseState:null,baseQueue:null,queue:null,next:null};return It===null?mt.memoizedState=It=t:It=It.next=t,It}function Vt(){if(Rt===null){var t=mt.alternate;t=t!==null?t.memoizedState:null}else t=Rt.next;var e=It===null?mt.memoizedState:It.next;if(e!==null)It=e,Rt=t;else{if(t===null)throw mt.alternate===null?Error(f(467)):Error(f(310));Rt=t,t={memoizedState:Rt.memoizedState,baseState:Rt.baseState,baseQueue:Rt.baseQueue,queue:Rt.queue,next:null},It===null?mt.memoizedState=It=t:It=It.next=t}return It}function ru(){return{lastEffect:null,events:null,stores:null,memoCache:null}}function Fa(t){var e=Ja;return Ja+=1,aa===null&&(aa=[]),t=R0(aa,t,e),e=mt,(It===null?e.memoizedState:It.next)===null&&(e=e.alternate,M.H=e===null||e.memoizedState===null?po:Ts),t}function ou(t){if(t!==null&&typeof t=="object"){if(typeof t.then=="function")return Fa(t);if(t.$$typeof===N)return ne(t)}throw Error(f(438,String(t)))}function hs(t){var e=null,n=mt.updateQueue;if(n!==null&&(e=n.memoCache),e==null){var l=mt.alternate;l!==null&&(l=l.updateQueue,l!==null&&(l=l.memoCache,l!=null&&(e={data:l.data.map(function(a){return a.slice()}),index:0})))}if(e==null&&(e={data:[],index:0}),n===null&&(n=ru(),mt.updateQueue=n),n.memoCache=e,n=e.data[e.index],n===void 0)for(n=e.data[e.index]=Array(t),l=0;l<t;l++)n[l]=I;return e.index++,n}function sn(t,e){return typeof e=="function"?e(t):e}function du(t){var e=Vt();return ms(e,Rt,t)}function ms(t,e,n){var l=t.queue;if(l===null)throw Error(f(311));l.lastRenderedReducer=n;var a=t.baseQueue,s=l.pending;if(s!==null){if(a!==null){var d=a.next;a.next=s.next,s.next=d}e.baseQueue=a=s,l.pending=null}if(s=t.baseState,a===null)t.memoizedState=s;else{e=a.next;var g=d=null,S=null,U=e,Z=!1;do{var J=U.lane&-536870913;if(J!==U.lane?(Et&J)===J:(cn&J)===J){var Q=U.revertLane;if(Q===0)S!==null&&(S=S.next={lane:0,revertLane:0,gesture:null,action:U.action,hasEagerState:U.hasEagerState,eagerState:U.eagerState,next:null}),J===Pl&&(Z=!0);else if((cn&Q)===Q){U=U.next,Q===Pl&&(Z=!0);continue}else J={lane:0,revertLane:U.revertLane,gesture:null,action:U.action,hasEagerState:U.hasEagerState,eagerState:U.eagerState,next:null},S===null?(g=S=J,d=s):S=S.next=J,mt.lanes|=Q,Gn|=Q;J=U.action,xl&&n(s,J),s=U.hasEagerState?U.eagerState:n(s,J)}else Q={lane:J,revertLane:U.revertLane,gesture:U.gesture,action:U.action,hasEagerState:U.hasEagerState,eagerState:U.eagerState,next:null},S===null?(g=S=Q,d=s):S=S.next=Q,mt.lanes|=J,Gn|=J;U=U.next}while(U!==null&&U!==e);if(S===null?d=s:S.next=g,!Se(s,t.memoizedState)&&(qt=!0,Z&&(n=$l,n!==null)))throw n;t.memoizedState=s,t.baseState=d,t.baseQueue=S,l.lastRenderedState=s}return a===null&&(l.lanes=0),[t.memoizedState,l.dispatch]}function gs(t){var e=Vt(),n=e.queue;if(n===null)throw Error(f(311));n.lastRenderedReducer=t;var l=n.dispatch,a=n.pending,s=e.memoizedState;if(a!==null){n.pending=null;var d=a=a.next;do s=t(s,d.action),d=d.next;while(d!==a);Se(s,e.memoizedState)||(qt=!0),e.memoizedState=s,e.baseQueue===null&&(e.baseState=s),n.lastRenderedState=s}return[s,l]}function L0(t,e,n){var l=mt,a=Vt(),s=xt;if(s){if(n===void 0)throw Error(f(407));n=n()}else n=e();var d=!Se((Rt||a).memoizedState,n);if(d&&(a.memoizedState=n,qt=!0),a=a.queue,ys(V0.bind(null,l,a,t),[t]),a.getSnapshot!==e||d||It!==null&&It.memoizedState.tag&1){if(l.flags|=2048,ia(9,{destroy:void 0},X0.bind(null,l,a,n,e),null),jt===null)throw Error(f(349));s||(cn&127)!==0||G0(l,e,n)}return n}function G0(t,e,n){t.flags|=16384,t={getSnapshot:e,value:n},e=mt.updateQueue,e===null?(e=ru(),mt.updateQueue=e,e.stores=[t]):(n=e.stores,n===null?e.stores=[t]:n.push(t))}function X0(t,e,n,l){e.value=n,e.getSnapshot=l,Z0(e)&&I0(t)}function V0(t,e,n){return n(function(){Z0(e)&&I0(t)})}function Z0(t){var e=t.getSnapshot;t=t.value;try{var n=e();return!Se(t,n)}catch{return!0}}function I0(t){var e=dl(t,2);e!==null&&ve(e,t,2)}function As(t){var e=fe();if(typeof t=="function"){var n=t;if(t=n(),xl){On(!0);try{n()}finally{On(!1)}}}return e.memoizedState=e.baseState=t,e.queue={pending:null,lanes:0,dispatch:null,lastRenderedReducer:sn,lastRenderedState:t},e}function q0(t,e,n,l){return t.baseState=n,ms(t,Rt,typeof l=="function"?l:sn)}function rg(t,e,n,l,a){if(gu(t))throw Error(f(485));if(t=e.action,t!==null){var s={payload:a,action:t,next:null,isTransition:!0,status:"pending",value:null,reason:null,listeners:[],then:function(d){s.listeners.push(d)}};M.T!==null?n(!0):s.isTransition=!1,l(s),n=e.pending,n===null?(s.next=e.pending=s,K0(e,s)):(s.next=n.next,e.pending=n.next=s)}}function K0(t,e){var n=e.action,l=e.payload,a=t.state;if(e.isTransition){var s=M.T,d={};M.T=d;try{var g=n(a,l),S=M.S;S!==null&&S(d,g),k0(t,e,g)}catch(U){vs(t,e,U)}finally{s!==null&&d.types!==null&&(s.types=d.types),M.T=s}}else try{s=n(a,l),k0(t,e,s)}catch(U){vs(t,e,U)}}function k0(t,e,n){n!==null&&typeof n=="object"&&typeof n.then=="function"?n.then(function(l){J0(t,e,l)},function(l){return vs(t,e,l)}):J0(t,e,n)}function J0(t,e,n){e.status="fulfilled",e.value=n,F0(e),t.state=n,e=t.pending,e!==null&&(n=e.next,n===e?t.pending=null:(n=n.next,e.next=n,K0(t,n)))}function vs(t,e,n){var l=t.pending;if(t.pending=null,l!==null){l=l.next;do e.status="rejected",e.reason=n,F0(e),e=e.next;while(e!==l)}t.action=null}function F0(t){t=t.listeners;for(var e=0;e<t.length;e++)(0,t[e])()}function W0(t,e){return e}function _0(t,e){if(xt){var n=jt.formState;if(n!==null){t:{var l=mt;if(xt){if(Nt){e:{for(var a=Nt,s=ze;a.nodeType!==8;){if(!s){a=null;break e}if(a=Le(a.nextSibling),a===null){a=null;break e}}s=a.data,a=s==="F!"||s==="F"?a:null}if(a){Nt=Le(a.nextSibling),l=a.data==="F!";break t}}jn(l)}l=!1}l&&(e=n[0])}}return n=fe(),n.memoizedState=n.baseState=e,l={pending:null,lanes:0,dispatch:null,lastRenderedReducer:W0,lastRenderedState:e},n.queue=l,n=vo.bind(null,mt,l),l.dispatch=n,l=As(!1),s=Ss.bind(null,mt,!1,l.queue),l=fe(),a={state:e,dispatch:null,action:t,pending:null},l.queue=a,n=rg.bind(null,mt,a,s,n),a.dispatch=n,l.memoizedState=t,[e,n,!1]}function P0(t){var e=Vt();return $0(e,Rt,t)}function $0(t,e,n){if(e=ms(t,e,W0)[0],t=du(sn)[0],typeof e=="object"&&e!==null&&typeof e.then=="function")try{var l=Fa(e)}catch(d){throw d===ta?nu:d}else l=e;e=Vt();var a=e.queue,s=a.dispatch;return n!==e.memoizedState&&(mt.flags|=2048,ia(9,{destroy:void 0},og.bind(null,a,n),null)),[l,s,t]}function og(t,e){t.action=e}function to(t){var e=Vt(),n=Rt;if(n!==null)return $0(e,n,t);Vt(),e=e.memoizedState,n=Vt();var l=n.queue.dispatch;return n.memoizedState=t,[e,l,!1]}function ia(t,e,n,l){return t={tag:t,create:n,deps:l,inst:e,next:null},e=mt.updateQueue,e===null&&(e=ru(),mt.updateQueue=e),n=e.lastEffect,n===null?e.lastEffect=t.next=t:(l=n.next,n.next=t,t.next=l,e.lastEffect=t),t}function eo(){return Vt().memoizedState}function hu(t,e,n,l){var a=fe();mt.flags|=t,a.memoizedState=ia(1|e,{destroy:void 0},n,l===void 0?null:l)}function mu(t,e,n,l){var a=Vt();l=l===void 0?null:l;var s=a.memoizedState.inst;Rt!==null&&l!==null&&ss(l,Rt.memoizedState.deps)?a.memoizedState=ia(e,s,n,l):(mt.flags|=t,a.memoizedState=ia(1|e,s,n,l))}function no(t,e){hu(8390656,8,t,e)}function ys(t,e){mu(2048,8,t,e)}function dg(t){mt.flags|=4;var e=mt.updateQueue;if(e===null)e=ru(),mt.updateQueue=e,e.events=[t];else{var n=e.events;n===null?e.events=[t]:n.push(t)}}function lo(t){var e=Vt().memoizedState;return dg({ref:e,nextImpl:t}),function(){if((Ct&2)!==0)throw Error(f(440));return e.impl.apply(void 0,arguments)}}function ao(t,e){return mu(4,2,t,e)}function io(t,e){return mu(4,4,t,e)}function uo(t,e){if(typeof e=="function"){t=t();var n=e(t);return function(){typeof n=="function"?n():e(null)}}if(e!=null)return t=t(),e.current=t,function(){e.current=null}}function co(t,e,n){n=n!=null?n.concat([t]):null,mu(4,4,uo.bind(null,e,t),n)}function Es(){}function so(t,e){var n=Vt();e=e===void 0?null:e;var l=n.memoizedState;return e!==null&&ss(e,l[1])?l[0]:(n.memoizedState=[t,e],t)}function fo(t,e){var n=Vt();e=e===void 0?null:e;var l=n.memoizedState;if(e!==null&&ss(e,l[1]))return l[0];if(l=t(),xl){On(!0);try{t()}finally{On(!1)}}return n.memoizedState=[l,e],l}function ps(t,e,n){return n===void 0||(cn&1073741824)!==0&&(Et&261930)===0?t.memoizedState=e:(t.memoizedState=n,t=od(),mt.lanes|=t,Gn|=t,n)}function ro(t,e,n,l){return Se(n,e)?n:na.current!==null?(t=ps(t,n,l),Se(t,e)||(qt=!0),t):(cn&42)===0||(cn&1073741824)!==0&&(Et&261930)===0?(qt=!0,t.memoizedState=n):(t=od(),mt.lanes|=t,Gn|=t,e)}function oo(t,e,n,l,a){var s=_.p;_.p=s!==0&&8>s?s:8;var d=M.T,g={};M.T=g,Ss(t,!1,e,n);try{var S=a(),U=M.S;if(U!==null&&U(g,S),S!==null&&typeof S=="object"&&typeof S.then=="function"){var Z=cg(S,l);Wa(t,e,Z,we(t))}else Wa(t,e,l,we(t))}catch(J){Wa(t,e,{then:function(){},status:"rejected",reason:J},we())}finally{_.p=s,d!==null&&g.types!==null&&(d.types=g.types),M.T=d}}function hg(){}function xs(t,e,n,l){if(t.tag!==5)throw Error(f(476));var a=ho(t).queue;oo(t,a,e,$,n===null?hg:function(){return mo(t),n(l)})}function ho(t){var e=t.memoizedState;if(e!==null)return e;e={memoizedState:$,baseState:$,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:sn,lastRenderedState:$},next:null};var n={};return e.next={memoizedState:n,baseState:n,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:sn,lastRenderedState:n},next:null},t.memoizedState=e,t=t.alternate,t!==null&&(t.memoizedState=e),e}function mo(t){var e=ho(t);e.next===null&&(e=t.alternate.memoizedState),Wa(t,e.next.queue,{},we())}function bs(){return ne(hi)}function go(){return Vt().memoizedState}function Ao(){return Vt().memoizedState}function mg(t){for(var e=t.return;e!==null;){switch(e.tag){case 24:case 3:var n=we();t=Bn(n);var l=Un(e,t,n);l!==null&&(ve(l,e,n),qa(l,e,n)),e={cache:_c()},t.payload=e;return}e=e.return}}function gg(t,e,n){var l=we();n={lane:l,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null},gu(t)?yo(e,n):(n=Gc(t,e,n,l),n!==null&&(ve(n,t,l),Eo(n,e,l)))}function vo(t,e,n){var l=we();Wa(t,e,n,l)}function Wa(t,e,n,l){var a={lane:l,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null};if(gu(t))yo(e,a);else{var s=t.alternate;if(t.lanes===0&&(s===null||s.lanes===0)&&(s=e.lastRenderedReducer,s!==null))try{var d=e.lastRenderedState,g=s(d,n);if(a.hasEagerState=!0,a.eagerState=g,Se(g,d))return Fi(t,e,a,0),jt===null&&Ji(),!1}catch{}finally{}if(n=Gc(t,e,a,l),n!==null)return ve(n,t,l),Eo(n,e,l),!0}return!1}function Ss(t,e,n,l){if(l={lane:2,revertLane:ef(),gesture:null,action:l,hasEagerState:!1,eagerState:null,next:null},gu(t)){if(e)throw Error(f(479))}else e=Gc(t,n,l,2),e!==null&&ve(e,t,2)}function gu(t){var e=t.alternate;return t===mt||e!==null&&e===mt}function yo(t,e){la=su=!0;var n=t.pending;n===null?e.next=e:(e.next=n.next,n.next=e),t.pending=e}function Eo(t,e,n){if((n&4194048)!==0){var l=e.lanes;l&=t.pendingLanes,n|=l,e.lanes=n,Sr(t,n)}}var _a={readContext:ne,use:ou,useCallback:Lt,useContext:Lt,useEffect:Lt,useImperativeHandle:Lt,useLayoutEffect:Lt,useInsertionEffect:Lt,useMemo:Lt,useReducer:Lt,useRef:Lt,useState:Lt,useDebugValue:Lt,useDeferredValue:Lt,useTransition:Lt,useSyncExternalStore:Lt,useId:Lt,useHostTransitionStatus:Lt,useFormState:Lt,useActionState:Lt,useOptimistic:Lt,useMemoCache:Lt,useCacheRefresh:Lt};_a.useEffectEvent=Lt;var po={readContext:ne,use:ou,useCallback:function(t,e){return fe().memoizedState=[t,e===void 0?null:e],t},useContext:ne,useEffect:no,useImperativeHandle:function(t,e,n){n=n!=null?n.concat([t]):null,hu(4194308,4,uo.bind(null,e,t),n)},useLayoutEffect:function(t,e){return hu(4194308,4,t,e)},useInsertionEffect:function(t,e){hu(4,2,t,e)},useMemo:function(t,e){var n=fe();e=e===void 0?null:e;var l=t();if(xl){On(!0);try{t()}finally{On(!1)}}return n.memoizedState=[l,e],l},useReducer:function(t,e,n){var l=fe();if(n!==void 0){var a=n(e);if(xl){On(!0);try{n(e)}finally{On(!1)}}}else a=e;return l.memoizedState=l.baseState=a,t={pending:null,lanes:0,dispatch:null,lastRenderedReducer:t,lastRenderedState:a},l.queue=t,t=t.dispatch=gg.bind(null,mt,t),[l.memoizedState,t]},useRef:function(t){var e=fe();return t={current:t},e.memoizedState=t},useState:function(t){t=As(t);var e=t.queue,n=vo.bind(null,mt,e);return e.dispatch=n,[t.memoizedState,n]},useDebugValue:Es,useDeferredValue:function(t,e){var n=fe();return ps(n,t,e)},useTransition:function(){var t=As(!1);return t=oo.bind(null,mt,t.queue,!0,!1),fe().memoizedState=t,[!1,t]},useSyncExternalStore:function(t,e,n){var l=mt,a=fe();if(xt){if(n===void 0)throw Error(f(407));n=n()}else{if(n=e(),jt===null)throw Error(f(349));(Et&127)!==0||G0(l,e,n)}a.memoizedState=n;var s={value:n,getSnapshot:e};return a.queue=s,no(V0.bind(null,l,s,t),[t]),l.flags|=2048,ia(9,{destroy:void 0},X0.bind(null,l,s,n,e),null),n},useId:function(){var t=fe(),e=jt.identifierPrefix;if(xt){var n=Fe,l=Je;n=(l&~(1<<32-be(l)-1)).toString(32)+n,e="_"+e+"R_"+n,n=fu++,0<n&&(e+="H"+n.toString(32)),e+="_"}else n=sg++,e="_"+e+"r_"+n.toString(32)+"_";return t.memoizedState=e},useHostTransitionStatus:bs,useFormState:_0,useActionState:_0,useOptimistic:function(t){var e=fe();e.memoizedState=e.baseState=t;var n={pending:null,lanes:0,dispatch:null,lastRenderedReducer:null,lastRenderedState:null};return e.queue=n,e=Ss.bind(null,mt,!0,n),n.dispatch=e,[t,e]},useMemoCache:hs,useCacheRefresh:function(){return fe().memoizedState=mg.bind(null,mt)},useEffectEvent:function(t){var e=fe(),n={impl:t};return e.memoizedState=n,function(){if((Ct&2)!==0)throw Error(f(440));return n.impl.apply(void 0,arguments)}}},Ts={readContext:ne,use:ou,useCallback:so,useContext:ne,useEffect:ys,useImperativeHandle:co,useInsertionEffect:ao,useLayoutEffect:io,useMemo:fo,useReducer:du,useRef:eo,useState:function(){return du(sn)},useDebugValue:Es,useDeferredValue:function(t,e){var n=Vt();return ro(n,Rt.memoizedState,t,e)},useTransition:function(){var t=du(sn)[0],e=Vt().memoizedState;return[typeof t=="boolean"?t:Fa(t),e]},useSyncExternalStore:L0,useId:go,useHostTransitionStatus:bs,useFormState:P0,useActionState:P0,useOptimistic:function(t,e){var n=Vt();return q0(n,Rt,t,e)},useMemoCache:hs,useCacheRefresh:Ao};Ts.useEffectEvent=lo;var xo={readContext:ne,use:ou,useCallback:so,useContext:ne,useEffect:ys,useImperativeHandle:co,useInsertionEffect:ao,useLayoutEffect:io,useMemo:fo,useReducer:gs,useRef:eo,useState:function(){return gs(sn)},useDebugValue:Es,useDeferredValue:function(t,e){var n=Vt();return Rt===null?ps(n,t,e):ro(n,Rt.memoizedState,t,e)},useTransition:function(){var t=gs(sn)[0],e=Vt().memoizedState;return[typeof t=="boolean"?t:Fa(t),e]},useSyncExternalStore:L0,useId:go,useHostTransitionStatus:bs,useFormState:to,useActionState:to,useOptimistic:function(t,e){var n=Vt();return Rt!==null?q0(n,Rt,t,e):(n.baseState=t,[t,n.queue.dispatch])},useMemoCache:hs,useCacheRefresh:Ao};xo.useEffectEvent=lo;function Cs(t,e,n,l){e=t.memoizedState,n=n(l,e),n=n==null?e:T({},e,n),t.memoizedState=n,t.lanes===0&&(t.updateQueue.baseState=n)}var Os={enqueueSetState:function(t,e,n){t=t._reactInternals;var l=we(),a=Bn(l);a.payload=e,n!=null&&(a.callback=n),e=Un(t,a,l),e!==null&&(ve(e,t,l),qa(e,t,l))},enqueueReplaceState:function(t,e,n){t=t._reactInternals;var l=we(),a=Bn(l);a.tag=1,a.payload=e,n!=null&&(a.callback=n),e=Un(t,a,l),e!==null&&(ve(e,t,l),qa(e,t,l))},enqueueForceUpdate:function(t,e){t=t._reactInternals;var n=we(),l=Bn(n);l.tag=2,e!=null&&(l.callback=e),e=Un(t,l,n),e!==null&&(ve(e,t,n),qa(e,t,n))}};function bo(t,e,n,l,a,s,d){return t=t.stateNode,typeof t.shouldComponentUpdate=="function"?t.shouldComponentUpdate(l,s,d):e.prototype&&e.prototype.isPureReactComponent?!za(n,l)||!za(a,s):!0}function So(t,e,n,l){t=e.state,typeof e.componentWillReceiveProps=="function"&&e.componentWillReceiveProps(n,l),typeof e.UNSAFE_componentWillReceiveProps=="function"&&e.UNSAFE_componentWillReceiveProps(n,l),e.state!==t&&Os.enqueueReplaceState(e,e.state,null)}function bl(t,e){var n=e;if("ref"in e){n={};for(var l in e)l!=="ref"&&(n[l]=e[l])}if(t=t.defaultProps){n===e&&(n=T({},n));for(var a in t)n[a]===void 0&&(n[a]=t[a])}return n}function To(t){ki(t)}function Co(t){console.error(t)}function Oo(t){ki(t)}function Au(t,e){try{var n=t.onUncaughtError;n(e.value,{componentStack:e.stack})}catch(l){setTimeout(function(){throw l})}}function Do(t,e,n){try{var l=t.onCaughtError;l(n.value,{componentStack:n.stack,errorBoundary:e.tag===1?e.stateNode:null})}catch(a){setTimeout(function(){throw a})}}function Ds(t,e,n){return n=Bn(n),n.tag=3,n.payload={element:null},n.callback=function(){Au(t,e)},n}function Ro(t){return t=Bn(t),t.tag=3,t}function wo(t,e,n,l){var a=n.type.getDerivedStateFromError;if(typeof a=="function"){var s=l.value;t.payload=function(){return a(s)},t.callback=function(){Do(e,n,l)}}var d=n.stateNode;d!==null&&typeof d.componentDidCatch=="function"&&(t.callback=function(){Do(e,n,l),typeof a!="function"&&(Xn===null?Xn=new Set([this]):Xn.add(this));var g=l.stack;this.componentDidCatch(l.value,{componentStack:g!==null?g:""})})}function Ag(t,e,n,l,a){if(n.flags|=32768,l!==null&&typeof l=="object"&&typeof l.then=="function"){if(e=n.alternate,e!==null&&_l(e,n,a,!0),n=Ce.current,n!==null){switch(n.tag){case 31:case 13:return Ye===null?Ru():n.alternate===null&&Gt===0&&(Gt=3),n.flags&=-257,n.flags|=65536,n.lanes=a,l===lu?n.flags|=16384:(e=n.updateQueue,e===null?n.updateQueue=new Set([l]):e.add(l),Ps(t,l,a)),!1;case 22:return n.flags|=65536,l===lu?n.flags|=16384:(e=n.updateQueue,e===null?(e={transitions:null,markerInstances:null,retryQueue:new Set([l])},n.updateQueue=e):(n=e.retryQueue,n===null?e.retryQueue=new Set([l]):n.add(l)),Ps(t,l,a)),!1}throw Error(f(435,n.tag))}return Ps(t,l,a),Ru(),!1}if(xt)return e=Ce.current,e!==null?((e.flags&65536)===0&&(e.flags|=256),e.flags|=65536,e.lanes=a,l!==Kc&&(t=Error(f(422),{cause:l}),Ga(Be(t,n)))):(l!==Kc&&(e=Error(f(423),{cause:l}),Ga(Be(e,n))),t=t.current.alternate,t.flags|=65536,a&=-a,t.lanes|=a,l=Be(l,n),a=Ds(t.stateNode,l,a),ls(t,a),Gt!==4&&(Gt=2)),!1;var s=Error(f(520),{cause:l});if(s=Be(s,n),ii===null?ii=[s]:ii.push(s),Gt!==4&&(Gt=2),e===null)return!0;l=Be(l,n),n=e;do{switch(n.tag){case 3:return n.flags|=65536,t=a&-a,n.lanes|=t,t=Ds(n.stateNode,l,t),ls(n,t),!1;case 1:if(e=n.type,s=n.stateNode,(n.flags&128)===0&&(typeof e.getDerivedStateFromError=="function"||s!==null&&typeof s.componentDidCatch=="function"&&(Xn===null||!Xn.has(s))))return n.flags|=65536,a&=-a,n.lanes|=a,a=Ro(a),wo(a,t,n,l),ls(n,a),!1}n=n.return}while(n!==null);return!1}var Rs=Error(f(461)),qt=!1;function le(t,e,n,l){e.child=t===null?N0(e,null,n,l):pl(e,t.child,n,l)}function Mo(t,e,n,l,a){n=n.render;var s=e.ref;if("ref"in l){var d={};for(var g in l)g!=="ref"&&(d[g]=l[g])}else d=l;return Al(e),l=fs(t,e,n,d,s,a),g=rs(),t!==null&&!qt?(os(t,e,a),fn(t,e,a)):(xt&&g&&Ic(e),e.flags|=1,le(t,e,l,a),e.child)}function jo(t,e,n,l,a){if(t===null){var s=n.type;return typeof s=="function"&&!Xc(s)&&s.defaultProps===void 0&&n.compare===null?(e.tag=15,e.type=s,No(t,e,s,l,a)):(t=_i(n.type,null,l,e,e.mode,a),t.ref=e.ref,t.return=e,e.child=t)}if(s=t.child,!Qs(t,a)){var d=s.memoizedProps;if(n=n.compare,n=n!==null?n:za,n(d,l)&&t.ref===e.ref)return fn(t,e,a)}return e.flags|=1,t=nn(s,l),t.ref=e.ref,t.return=e,e.child=t}function No(t,e,n,l,a){if(t!==null){var s=t.memoizedProps;if(za(s,l)&&t.ref===e.ref)if(qt=!1,e.pendingProps=l=s,Qs(t,a))(t.flags&131072)!==0&&(qt=!0);else return e.lanes=t.lanes,fn(t,e,a)}return ws(t,e,n,l,a)}function Ho(t,e,n,l){var a=l.children,s=t!==null?t.memoizedState:null;if(t===null&&e.stateNode===null&&(e.stateNode={_visibility:1,_pendingMarkers:null,_retryCache:null,_transitions:null}),l.mode==="hidden"){if((e.flags&128)!==0){if(s=s!==null?s.baseLanes|n:n,t!==null){for(l=e.child=t.child,a=0;l!==null;)a=a|l.lanes|l.childLanes,l=l.sibling;l=a&~s}else l=0,e.child=null;return Bo(t,e,s,n,l)}if((n&536870912)!==0)e.memoizedState={baseLanes:0,cachePool:null},t!==null&&eu(e,s!==null?s.cachePool:null),s!==null?U0(e,s):is(),Q0(e);else return l=e.lanes=536870912,Bo(t,e,s!==null?s.baseLanes|n:n,n,l)}else s!==null?(eu(e,s.cachePool),U0(e,s),zn(),e.memoizedState=null):(t!==null&&eu(e,null),is(),zn());return le(t,e,a,n),e.child}function Pa(t,e){return t!==null&&t.tag===22||e.stateNode!==null||(e.stateNode={_visibility:1,_pendingMarkers:null,_retryCache:null,_transitions:null}),e.sibling}function Bo(t,e,n,l,a){var s=$c();return s=s===null?null:{parent:Zt._currentValue,pool:s},e.memoizedState={baseLanes:n,cachePool:s},t!==null&&eu(e,null),is(),Q0(e),t!==null&&_l(t,e,l,!0),e.childLanes=a,null}function vu(t,e){return e=Eu({mode:e.mode,children:e.children},t.mode),e.ref=t.ref,t.child=e,e.return=t,e}function Uo(t,e,n){return pl(e,t.child,null,n),t=vu(e,e.pendingProps),t.flags|=2,Oe(e),e.memoizedState=null,t}function vg(t,e,n){var l=e.pendingProps,a=(e.flags&128)!==0;if(e.flags&=-129,t===null){if(xt){if(l.mode==="hidden")return t=vu(e,l),e.lanes=536870912,Pa(null,t);if(cs(e),(t=Nt)?(t=kd(t,ze),t=t!==null&&t.data==="&"?t:null,t!==null&&(e.memoizedState={dehydrated:t,treeContext:wn!==null?{id:Je,overflow:Fe}:null,retryLane:536870912,hydrationErrors:null},n=v0(t),n.return=e,e.child=n,ee=e,Nt=null)):t=null,t===null)throw jn(e);return e.lanes=536870912,null}return vu(e,l)}var s=t.memoizedState;if(s!==null){var d=s.dehydrated;if(cs(e),a)if(e.flags&256)e.flags&=-257,e=Uo(t,e,n);else if(e.memoizedState!==null)e.child=t.child,e.flags|=128,e=null;else throw Error(f(558));else if(qt||_l(t,e,n,!1),a=(n&t.childLanes)!==0,qt||a){if(l=jt,l!==null&&(d=Tr(l,n),d!==0&&d!==s.retryLane))throw s.retryLane=d,dl(t,d),ve(l,t,d),Rs;Ru(),e=Uo(t,e,n)}else t=s.treeContext,Nt=Le(d.nextSibling),ee=e,xt=!0,Mn=null,ze=!1,t!==null&&p0(e,t),e=vu(e,l),e.flags|=4096;return e}return t=nn(t.child,{mode:l.mode,children:l.children}),t.ref=e.ref,e.child=t,t.return=e,t}function yu(t,e){var n=e.ref;if(n===null)t!==null&&t.ref!==null&&(e.flags|=4194816);else{if(typeof n!="function"&&typeof n!="object")throw Error(f(284));(t===null||t.ref!==n)&&(e.flags|=4194816)}}function ws(t,e,n,l,a){return Al(e),n=fs(t,e,n,l,void 0,a),l=rs(),t!==null&&!qt?(os(t,e,a),fn(t,e,a)):(xt&&l&&Ic(e),e.flags|=1,le(t,e,n,a),e.child)}function Qo(t,e,n,l,a,s){return Al(e),e.updateQueue=null,n=Y0(e,l,n,a),z0(t),l=rs(),t!==null&&!qt?(os(t,e,s),fn(t,e,s)):(xt&&l&&Ic(e),e.flags|=1,le(t,e,n,s),e.child)}function zo(t,e,n,l,a){if(Al(e),e.stateNode===null){var s=kl,d=n.contextType;typeof d=="object"&&d!==null&&(s=ne(d)),s=new n(l,s),e.memoizedState=s.state!==null&&s.state!==void 0?s.state:null,s.updater=Os,e.stateNode=s,s._reactInternals=e,s=e.stateNode,s.props=l,s.state=e.memoizedState,s.refs={},es(e),d=n.contextType,s.context=typeof d=="object"&&d!==null?ne(d):kl,s.state=e.memoizedState,d=n.getDerivedStateFromProps,typeof d=="function"&&(Cs(e,n,d,l),s.state=e.memoizedState),typeof n.getDerivedStateFromProps=="function"||typeof s.getSnapshotBeforeUpdate=="function"||typeof s.UNSAFE_componentWillMount!="function"&&typeof s.componentWillMount!="function"||(d=s.state,typeof s.componentWillMount=="function"&&s.componentWillMount(),typeof s.UNSAFE_componentWillMount=="function"&&s.UNSAFE_componentWillMount(),d!==s.state&&Os.enqueueReplaceState(s,s.state,null),ka(e,l,s,a),Ka(),s.state=e.memoizedState),typeof s.componentDidMount=="function"&&(e.flags|=4194308),l=!0}else if(t===null){s=e.stateNode;var g=e.memoizedProps,S=bl(n,g);s.props=S;var U=s.context,Z=n.contextType;d=kl,typeof Z=="object"&&Z!==null&&(d=ne(Z));var J=n.getDerivedStateFromProps;Z=typeof J=="function"||typeof s.getSnapshotBeforeUpdate=="function",g=e.pendingProps!==g,Z||typeof s.UNSAFE_componentWillReceiveProps!="function"&&typeof s.componentWillReceiveProps!="function"||(g||U!==d)&&So(e,s,l,d),Hn=!1;var Q=e.memoizedState;s.state=Q,ka(e,l,s,a),Ka(),U=e.memoizedState,g||Q!==U||Hn?(typeof J=="function"&&(Cs(e,n,J,l),U=e.memoizedState),(S=Hn||bo(e,n,S,l,Q,U,d))?(Z||typeof s.UNSAFE_componentWillMount!="function"&&typeof s.componentWillMount!="function"||(typeof s.componentWillMount=="function"&&s.componentWillMount(),typeof s.UNSAFE_componentWillMount=="function"&&s.UNSAFE_componentWillMount()),typeof s.componentDidMount=="function"&&(e.flags|=4194308)):(typeof s.componentDidMount=="function"&&(e.flags|=4194308),e.memoizedProps=l,e.memoizedState=U),s.props=l,s.state=U,s.context=d,l=S):(typeof s.componentDidMount=="function"&&(e.flags|=4194308),l=!1)}else{s=e.stateNode,ns(t,e),d=e.memoizedProps,Z=bl(n,d),s.props=Z,J=e.pendingProps,Q=s.context,U=n.contextType,S=kl,typeof U=="object"&&U!==null&&(S=ne(U)),g=n.getDerivedStateFromProps,(U=typeof g=="function"||typeof s.getSnapshotBeforeUpdate=="function")||typeof s.UNSAFE_componentWillReceiveProps!="function"&&typeof s.componentWillReceiveProps!="function"||(d!==J||Q!==S)&&So(e,s,l,S),Hn=!1,Q=e.memoizedState,s.state=Q,ka(e,l,s,a),Ka();var G=e.memoizedState;d!==J||Q!==G||Hn||t!==null&&t.dependencies!==null&&$i(t.dependencies)?(typeof g=="function"&&(Cs(e,n,g,l),G=e.memoizedState),(Z=Hn||bo(e,n,Z,l,Q,G,S)||t!==null&&t.dependencies!==null&&$i(t.dependencies))?(U||typeof s.UNSAFE_componentWillUpdate!="function"&&typeof s.componentWillUpdate!="function"||(typeof s.componentWillUpdate=="function"&&s.componentWillUpdate(l,G,S),typeof s.UNSAFE_componentWillUpdate=="function"&&s.UNSAFE_componentWillUpdate(l,G,S)),typeof s.componentDidUpdate=="function"&&(e.flags|=4),typeof s.getSnapshotBeforeUpdate=="function"&&(e.flags|=1024)):(typeof s.componentDidUpdate!="function"||d===t.memoizedProps&&Q===t.memoizedState||(e.flags|=4),typeof s.getSnapshotBeforeUpdate!="function"||d===t.memoizedProps&&Q===t.memoizedState||(e.flags|=1024),e.memoizedProps=l,e.memoizedState=G),s.props=l,s.state=G,s.context=S,l=Z):(typeof s.componentDidUpdate!="function"||d===t.memoizedProps&&Q===t.memoizedState||(e.flags|=4),typeof s.getSnapshotBeforeUpdate!="function"||d===t.memoizedProps&&Q===t.memoizedState||(e.flags|=1024),l=!1)}return s=l,yu(t,e),l=(e.flags&128)!==0,s||l?(s=e.stateNode,n=l&&typeof n.getDerivedStateFromError!="function"?null:s.render(),e.flags|=1,t!==null&&l?(e.child=pl(e,t.child,null,a),e.child=pl(e,null,n,a)):le(t,e,n,a),e.memoizedState=s.state,t=e.child):t=fn(t,e,a),t}function Yo(t,e,n,l){return ml(),e.flags|=256,le(t,e,n,l),e.child}var Ms={dehydrated:null,treeContext:null,retryLane:0,hydrationErrors:null};function js(t){return{baseLanes:t,cachePool:O0()}}function Ns(t,e,n){return t=t!==null?t.childLanes&~n:0,e&&(t|=Re),t}function Lo(t,e,n){var l=e.pendingProps,a=!1,s=(e.flags&128)!==0,d;if((d=s)||(d=t!==null&&t.memoizedState===null?!1:(Xt.current&2)!==0),d&&(a=!0,e.flags&=-129),d=(e.flags&32)!==0,e.flags&=-33,t===null){if(xt){if(a?Qn(e):zn(),(t=Nt)?(t=kd(t,ze),t=t!==null&&t.data!=="&"?t:null,t!==null&&(e.memoizedState={dehydrated:t,treeContext:wn!==null?{id:Je,overflow:Fe}:null,retryLane:536870912,hydrationErrors:null},n=v0(t),n.return=e,e.child=n,ee=e,Nt=null)):t=null,t===null)throw jn(e);return gf(t)?e.lanes=32:e.lanes=536870912,null}var g=l.children;return l=l.fallback,a?(zn(),a=e.mode,g=Eu({mode:"hidden",children:g},a),l=hl(l,a,n,null),g.return=e,l.return=e,g.sibling=l,e.child=g,l=e.child,l.memoizedState=js(n),l.childLanes=Ns(t,d,n),e.memoizedState=Ms,Pa(null,l)):(Qn(e),Hs(e,g))}var S=t.memoizedState;if(S!==null&&(g=S.dehydrated,g!==null)){if(s)e.flags&256?(Qn(e),e.flags&=-257,e=Bs(t,e,n)):e.memoizedState!==null?(zn(),e.child=t.child,e.flags|=128,e=null):(zn(),g=l.fallback,a=e.mode,l=Eu({mode:"visible",children:l.children},a),g=hl(g,a,n,null),g.flags|=2,l.return=e,g.return=e,l.sibling=g,e.child=l,pl(e,t.child,null,n),l=e.child,l.memoizedState=js(n),l.childLanes=Ns(t,d,n),e.memoizedState=Ms,e=Pa(null,l));else if(Qn(e),gf(g)){if(d=g.nextSibling&&g.nextSibling.dataset,d)var U=d.dgst;d=U,l=Error(f(419)),l.stack="",l.digest=d,Ga({value:l,source:null,stack:null}),e=Bs(t,e,n)}else if(qt||_l(t,e,n,!1),d=(n&t.childLanes)!==0,qt||d){if(d=jt,d!==null&&(l=Tr(d,n),l!==0&&l!==S.retryLane))throw S.retryLane=l,dl(t,l),ve(d,t,l),Rs;mf(g)||Ru(),e=Bs(t,e,n)}else mf(g)?(e.flags|=192,e.child=t.child,e=null):(t=S.treeContext,Nt=Le(g.nextSibling),ee=e,xt=!0,Mn=null,ze=!1,t!==null&&p0(e,t),e=Hs(e,l.children),e.flags|=4096);return e}return a?(zn(),g=l.fallback,a=e.mode,S=t.child,U=S.sibling,l=nn(S,{mode:"hidden",children:l.children}),l.subtreeFlags=S.subtreeFlags&65011712,U!==null?g=nn(U,g):(g=hl(g,a,n,null),g.flags|=2),g.return=e,l.return=e,l.sibling=g,e.child=l,Pa(null,l),l=e.child,g=t.child.memoizedState,g===null?g=js(n):(a=g.cachePool,a!==null?(S=Zt._currentValue,a=a.parent!==S?{parent:S,pool:S}:a):a=O0(),g={baseLanes:g.baseLanes|n,cachePool:a}),l.memoizedState=g,l.childLanes=Ns(t,d,n),e.memoizedState=Ms,Pa(t.child,l)):(Qn(e),n=t.child,t=n.sibling,n=nn(n,{mode:"visible",children:l.children}),n.return=e,n.sibling=null,t!==null&&(d=e.deletions,d===null?(e.deletions=[t],e.flags|=16):d.push(t)),e.child=n,e.memoizedState=null,n)}function Hs(t,e){return e=Eu({mode:"visible",children:e},t.mode),e.return=t,t.child=e}function Eu(t,e){return t=Te(22,t,null,e),t.lanes=0,t}function Bs(t,e,n){return pl(e,t.child,null,n),t=Hs(e,e.pendingProps.children),t.flags|=2,e.memoizedState=null,t}function Go(t,e,n){t.lanes|=e;var l=t.alternate;l!==null&&(l.lanes|=e),Fc(t.return,e,n)}function Us(t,e,n,l,a,s){var d=t.memoizedState;d===null?t.memoizedState={isBackwards:e,rendering:null,renderingStartTime:0,last:l,tail:n,tailMode:a,treeForkCount:s}:(d.isBackwards=e,d.rendering=null,d.renderingStartTime=0,d.last=l,d.tail=n,d.tailMode=a,d.treeForkCount=s)}function Xo(t,e,n){var l=e.pendingProps,a=l.revealOrder,s=l.tail;l=l.children;var d=Xt.current,g=(d&2)!==0;if(g?(d=d&1|2,e.flags|=128):d&=1,W(Xt,d),le(t,e,l,n),l=xt?La:0,!g&&t!==null&&(t.flags&128)!==0)t:for(t=e.child;t!==null;){if(t.tag===13)t.memoizedState!==null&&Go(t,n,e);else if(t.tag===19)Go(t,n,e);else if(t.child!==null){t.child.return=t,t=t.child;continue}if(t===e)break t;for(;t.sibling===null;){if(t.return===null||t.return===e)break t;t=t.return}t.sibling.return=t.return,t=t.sibling}switch(a){case"forwards":for(n=e.child,a=null;n!==null;)t=n.alternate,t!==null&&cu(t)===null&&(a=n),n=n.sibling;n=a,n===null?(a=e.child,e.child=null):(a=n.sibling,n.sibling=null),Us(e,!1,a,n,s,l);break;case"backwards":case"unstable_legacy-backwards":for(n=null,a=e.child,e.child=null;a!==null;){if(t=a.alternate,t!==null&&cu(t)===null){e.child=a;break}t=a.sibling,a.sibling=n,n=a,a=t}Us(e,!0,n,null,s,l);break;case"together":Us(e,!1,null,null,void 0,l);break;default:e.memoizedState=null}return e.child}function fn(t,e,n){if(t!==null&&(e.dependencies=t.dependencies),Gn|=e.lanes,(n&e.childLanes)===0)if(t!==null){if(_l(t,e,n,!1),(n&e.childLanes)===0)return null}else return null;if(t!==null&&e.child!==t.child)throw Error(f(153));if(e.child!==null){for(t=e.child,n=nn(t,t.pendingProps),e.child=n,n.return=e;t.sibling!==null;)t=t.sibling,n=n.sibling=nn(t,t.pendingProps),n.return=e;n.sibling=null}return e.child}function Qs(t,e){return(t.lanes&e)!==0?!0:(t=t.dependencies,!!(t!==null&&$i(t)))}function yg(t,e,n){switch(e.tag){case 3:Jt(e,e.stateNode.containerInfo),Nn(e,Zt,t.memoizedState.cache),ml();break;case 27:case 5:Sn(e);break;case 4:Jt(e,e.stateNode.containerInfo);break;case 10:Nn(e,e.type,e.memoizedProps.value);break;case 31:if(e.memoizedState!==null)return e.flags|=128,cs(e),null;break;case 13:var l=e.memoizedState;if(l!==null)return l.dehydrated!==null?(Qn(e),e.flags|=128,null):(n&e.child.childLanes)!==0?Lo(t,e,n):(Qn(e),t=fn(t,e,n),t!==null?t.sibling:null);Qn(e);break;case 19:var a=(t.flags&128)!==0;if(l=(n&e.childLanes)!==0,l||(_l(t,e,n,!1),l=(n&e.childLanes)!==0),a){if(l)return Xo(t,e,n);e.flags|=128}if(a=e.memoizedState,a!==null&&(a.rendering=null,a.tail=null,a.lastEffect=null),W(Xt,Xt.current),l)break;return null;case 22:return e.lanes=0,Ho(t,e,n,e.pendingProps);case 24:Nn(e,Zt,t.memoizedState.cache)}return fn(t,e,n)}function Vo(t,e,n){if(t!==null)if(t.memoizedProps!==e.pendingProps)qt=!0;else{if(!Qs(t,n)&&(e.flags&128)===0)return qt=!1,yg(t,e,n);qt=(t.flags&131072)!==0}else qt=!1,xt&&(e.flags&1048576)!==0&&E0(e,La,e.index);switch(e.lanes=0,e.tag){case 16:t:{var l=e.pendingProps;if(t=yl(e.elementType),e.type=t,typeof t=="function")Xc(t)?(l=bl(t,l),e.tag=1,e=zo(null,e,t,l,n)):(e.tag=0,e=ws(null,e,t,l,n));else{if(t!=null){var a=t.$$typeof;if(a===V){e.tag=11,e=Mo(null,e,t,l,n);break t}else if(a===j){e.tag=14,e=jo(null,e,t,l,n);break t}}throw e=st(t)||t,Error(f(306,e,""))}}return e;case 0:return ws(t,e,e.type,e.pendingProps,n);case 1:return l=e.type,a=bl(l,e.pendingProps),zo(t,e,l,a,n);case 3:t:{if(Jt(e,e.stateNode.containerInfo),t===null)throw Error(f(387));l=e.pendingProps;var s=e.memoizedState;a=s.element,ns(t,e),ka(e,l,null,n);var d=e.memoizedState;if(l=d.cache,Nn(e,Zt,l),l!==s.cache&&Wc(e,[Zt],n,!0),Ka(),l=d.element,s.isDehydrated)if(s={element:l,isDehydrated:!1,cache:d.cache},e.updateQueue.baseState=s,e.memoizedState=s,e.flags&256){e=Yo(t,e,l,n);break t}else if(l!==a){a=Be(Error(f(424)),e),Ga(a),e=Yo(t,e,l,n);break t}else{switch(t=e.stateNode.containerInfo,t.nodeType){case 9:t=t.body;break;default:t=t.nodeName==="HTML"?t.ownerDocument.body:t}for(Nt=Le(t.firstChild),ee=e,xt=!0,Mn=null,ze=!0,n=N0(e,null,l,n),e.child=n;n;)n.flags=n.flags&-3|4096,n=n.sibling}else{if(ml(),l===a){e=fn(t,e,n);break t}le(t,e,l,n)}e=e.child}return e;case 26:return yu(t,e),t===null?(n=$d(e.type,null,e.pendingProps,null))?e.memoizedState=n:xt||(n=e.type,t=e.pendingProps,l=Uu(ot.current).createElement(n),l[te]=e,l[oe]=t,ae(l,n,t),Ft(l),e.stateNode=l):e.memoizedState=$d(e.type,t.memoizedProps,e.pendingProps,t.memoizedState),null;case 27:return Sn(e),t===null&&xt&&(l=e.stateNode=Wd(e.type,e.pendingProps,ot.current),ee=e,ze=!0,a=Nt,qn(e.type)?(Af=a,Nt=Le(l.firstChild)):Nt=a),le(t,e,e.pendingProps.children,n),yu(t,e),t===null&&(e.flags|=4194304),e.child;case 5:return t===null&&xt&&((a=l=Nt)&&(l=Jg(l,e.type,e.pendingProps,ze),l!==null?(e.stateNode=l,ee=e,Nt=Le(l.firstChild),ze=!1,a=!0):a=!1),a||jn(e)),Sn(e),a=e.type,s=e.pendingProps,d=t!==null?t.memoizedProps:null,l=s.children,of(a,s)?l=null:d!==null&&of(a,d)&&(e.flags|=32),e.memoizedState!==null&&(a=fs(t,e,fg,null,null,n),hi._currentValue=a),yu(t,e),le(t,e,l,n),e.child;case 6:return t===null&&xt&&((t=n=Nt)&&(n=Fg(n,e.pendingProps,ze),n!==null?(e.stateNode=n,ee=e,Nt=null,t=!0):t=!1),t||jn(e)),null;case 13:return Lo(t,e,n);case 4:return Jt(e,e.stateNode.containerInfo),l=e.pendingProps,t===null?e.child=pl(e,null,l,n):le(t,e,l,n),e.child;case 11:return Mo(t,e,e.type,e.pendingProps,n);case 7:return le(t,e,e.pendingProps,n),e.child;case 8:return le(t,e,e.pendingProps.children,n),e.child;case 12:return le(t,e,e.pendingProps.children,n),e.child;case 10:return l=e.pendingProps,Nn(e,e.type,l.value),le(t,e,l.children,n),e.child;case 9:return a=e.type._context,l=e.pendingProps.children,Al(e),a=ne(a),l=l(a),e.flags|=1,le(t,e,l,n),e.child;case 14:return jo(t,e,e.type,e.pendingProps,n);case 15:return No(t,e,e.type,e.pendingProps,n);case 19:return Xo(t,e,n);case 31:return vg(t,e,n);case 22:return Ho(t,e,n,e.pendingProps);case 24:return Al(e),l=ne(Zt),t===null?(a=$c(),a===null&&(a=jt,s=_c(),a.pooledCache=s,s.refCount++,s!==null&&(a.pooledCacheLanes|=n),a=s),e.memoizedState={parent:l,cache:a},es(e),Nn(e,Zt,a)):((t.lanes&n)!==0&&(ns(t,e),ka(e,null,null,n),Ka()),a=t.memoizedState,s=e.memoizedState,a.parent!==l?(a={parent:l,cache:l},e.memoizedState=a,e.lanes===0&&(e.memoizedState=e.updateQueue.baseState=a),Nn(e,Zt,l)):(l=s.cache,Nn(e,Zt,l),l!==a.cache&&Wc(e,[Zt],n,!0))),le(t,e,e.pendingProps.children,n),e.child;case 29:throw e.pendingProps}throw Error(f(156,e.tag))}function rn(t){t.flags|=4}function zs(t,e,n,l,a){if((e=(t.mode&32)!==0)&&(e=!1),e){if(t.flags|=16777216,(a&335544128)===a)if(t.stateNode.complete)t.flags|=8192;else if(gd())t.flags|=8192;else throw El=lu,ts}else t.flags&=-16777217}function Zo(t,e){if(e.type!=="stylesheet"||(e.state.loading&4)!==0)t.flags&=-16777217;else if(t.flags|=16777216,!a1(e))if(gd())t.flags|=8192;else throw El=lu,ts}function pu(t,e){e!==null&&(t.flags|=4),t.flags&16384&&(e=t.tag!==22?xr():536870912,t.lanes|=e,fa|=e)}function $a(t,e){if(!xt)switch(t.tailMode){case"hidden":e=t.tail;for(var n=null;e!==null;)e.alternate!==null&&(n=e),e=e.sibling;n===null?t.tail=null:n.sibling=null;break;case"collapsed":n=t.tail;for(var l=null;n!==null;)n.alternate!==null&&(l=n),n=n.sibling;l===null?e||t.tail===null?t.tail=null:t.tail.sibling=null:l.sibling=null}}function Ht(t){var e=t.alternate!==null&&t.alternate.child===t.child,n=0,l=0;if(e)for(var a=t.child;a!==null;)n|=a.lanes|a.childLanes,l|=a.subtreeFlags&65011712,l|=a.flags&65011712,a.return=t,a=a.sibling;else for(a=t.child;a!==null;)n|=a.lanes|a.childLanes,l|=a.subtreeFlags,l|=a.flags,a.return=t,a=a.sibling;return t.subtreeFlags|=l,t.childLanes=n,e}function Eg(t,e,n){var l=e.pendingProps;switch(qc(e),e.tag){case 16:case 15:case 0:case 11:case 7:case 8:case 12:case 9:case 14:return Ht(e),null;case 1:return Ht(e),null;case 3:return n=e.stateNode,l=null,t!==null&&(l=t.memoizedState.cache),e.memoizedState.cache!==l&&(e.flags|=2048),un(Zt),Qt(),n.pendingContext&&(n.context=n.pendingContext,n.pendingContext=null),(t===null||t.child===null)&&(Wl(e)?rn(e):t===null||t.memoizedState.isDehydrated&&(e.flags&256)===0||(e.flags|=1024,kc())),Ht(e),null;case 26:var a=e.type,s=e.memoizedState;return t===null?(rn(e),s!==null?(Ht(e),Zo(e,s)):(Ht(e),zs(e,a,null,l,n))):s?s!==t.memoizedState?(rn(e),Ht(e),Zo(e,s)):(Ht(e),e.flags&=-16777217):(t=t.memoizedProps,t!==l&&rn(e),Ht(e),zs(e,a,t,l,n)),null;case 27:if(ul(e),n=ot.current,a=e.type,t!==null&&e.stateNode!=null)t.memoizedProps!==l&&rn(e);else{if(!l){if(e.stateNode===null)throw Error(f(166));return Ht(e),null}t=et.current,Wl(e)?x0(e):(t=Wd(a,l,n),e.stateNode=t,rn(e))}return Ht(e),null;case 5:if(ul(e),a=e.type,t!==null&&e.stateNode!=null)t.memoizedProps!==l&&rn(e);else{if(!l){if(e.stateNode===null)throw Error(f(166));return Ht(e),null}if(s=et.current,Wl(e))x0(e);else{var d=Uu(ot.current);switch(s){case 1:s=d.createElementNS("http://www.w3.org/2000/svg",a);break;case 2:s=d.createElementNS("http://www.w3.org/1998/Math/MathML",a);break;default:switch(a){case"svg":s=d.createElementNS("http://www.w3.org/2000/svg",a);break;case"math":s=d.createElementNS("http://www.w3.org/1998/Math/MathML",a);break;case"script":s=d.createElement("div"),s.innerHTML="<script><\/script>",s=s.removeChild(s.firstChild);break;case"select":s=typeof l.is=="string"?d.createElement("select",{is:l.is}):d.createElement("select"),l.multiple?s.multiple=!0:l.size&&(s.size=l.size);break;default:s=typeof l.is=="string"?d.createElement(a,{is:l.is}):d.createElement(a)}}s[te]=e,s[oe]=l;t:for(d=e.child;d!==null;){if(d.tag===5||d.tag===6)s.appendChild(d.stateNode);else if(d.tag!==4&&d.tag!==27&&d.child!==null){d.child.return=d,d=d.child;continue}if(d===e)break t;for(;d.sibling===null;){if(d.return===null||d.return===e)break t;d=d.return}d.sibling.return=d.return,d=d.sibling}e.stateNode=s;t:switch(ae(s,a,l),a){case"button":case"input":case"select":case"textarea":l=!!l.autoFocus;break t;case"img":l=!0;break t;default:l=!1}l&&rn(e)}}return Ht(e),zs(e,e.type,t===null?null:t.memoizedProps,e.pendingProps,n),null;case 6:if(t&&e.stateNode!=null)t.memoizedProps!==l&&rn(e);else{if(typeof l!="string"&&e.stateNode===null)throw Error(f(166));if(t=ot.current,Wl(e)){if(t=e.stateNode,n=e.memoizedProps,l=null,a=ee,a!==null)switch(a.tag){case 27:case 5:l=a.memoizedProps}t[te]=e,t=!!(t.nodeValue===n||l!==null&&l.suppressHydrationWarning===!0||Ld(t.nodeValue,n)),t||jn(e,!0)}else t=Uu(t).createTextNode(l),t[te]=e,e.stateNode=t}return Ht(e),null;case 31:if(n=e.memoizedState,t===null||t.memoizedState!==null){if(l=Wl(e),n!==null){if(t===null){if(!l)throw Error(f(318));if(t=e.memoizedState,t=t!==null?t.dehydrated:null,!t)throw Error(f(557));t[te]=e}else ml(),(e.flags&128)===0&&(e.memoizedState=null),e.flags|=4;Ht(e),t=!1}else n=kc(),t!==null&&t.memoizedState!==null&&(t.memoizedState.hydrationErrors=n),t=!0;if(!t)return e.flags&256?(Oe(e),e):(Oe(e),null);if((e.flags&128)!==0)throw Error(f(558))}return Ht(e),null;case 13:if(l=e.memoizedState,t===null||t.memoizedState!==null&&t.memoizedState.dehydrated!==null){if(a=Wl(e),l!==null&&l.dehydrated!==null){if(t===null){if(!a)throw Error(f(318));if(a=e.memoizedState,a=a!==null?a.dehydrated:null,!a)throw Error(f(317));a[te]=e}else ml(),(e.flags&128)===0&&(e.memoizedState=null),e.flags|=4;Ht(e),a=!1}else a=kc(),t!==null&&t.memoizedState!==null&&(t.memoizedState.hydrationErrors=a),a=!0;if(!a)return e.flags&256?(Oe(e),e):(Oe(e),null)}return Oe(e),(e.flags&128)!==0?(e.lanes=n,e):(n=l!==null,t=t!==null&&t.memoizedState!==null,n&&(l=e.child,a=null,l.alternate!==null&&l.alternate.memoizedState!==null&&l.alternate.memoizedState.cachePool!==null&&(a=l.alternate.memoizedState.cachePool.pool),s=null,l.memoizedState!==null&&l.memoizedState.cachePool!==null&&(s=l.memoizedState.cachePool.pool),s!==a&&(l.flags|=2048)),n!==t&&n&&(e.child.flags|=8192),pu(e,e.updateQueue),Ht(e),null);case 4:return Qt(),t===null&&uf(e.stateNode.containerInfo),Ht(e),null;case 10:return un(e.type),Ht(e),null;case 19:if(L(Xt),l=e.memoizedState,l===null)return Ht(e),null;if(a=(e.flags&128)!==0,s=l.rendering,s===null)if(a)$a(l,!1);else{if(Gt!==0||t!==null&&(t.flags&128)!==0)for(t=e.child;t!==null;){if(s=cu(t),s!==null){for(e.flags|=128,$a(l,!1),t=s.updateQueue,e.updateQueue=t,pu(e,t),e.subtreeFlags=0,t=n,n=e.child;n!==null;)A0(n,t),n=n.sibling;return W(Xt,Xt.current&1|2),xt&&ln(e,l.treeForkCount),e.child}t=t.sibling}l.tail!==null&&pe()>Cu&&(e.flags|=128,a=!0,$a(l,!1),e.lanes=4194304)}else{if(!a)if(t=cu(s),t!==null){if(e.flags|=128,a=!0,t=t.updateQueue,e.updateQueue=t,pu(e,t),$a(l,!0),l.tail===null&&l.tailMode==="hidden"&&!s.alternate&&!xt)return Ht(e),null}else 2*pe()-l.renderingStartTime>Cu&&n!==536870912&&(e.flags|=128,a=!0,$a(l,!1),e.lanes=4194304);l.isBackwards?(s.sibling=e.child,e.child=s):(t=l.last,t!==null?t.sibling=s:e.child=s,l.last=s)}return l.tail!==null?(t=l.tail,l.rendering=t,l.tail=t.sibling,l.renderingStartTime=pe(),t.sibling=null,n=Xt.current,W(Xt,a?n&1|2:n&1),xt&&ln(e,l.treeForkCount),t):(Ht(e),null);case 22:case 23:return Oe(e),us(),l=e.memoizedState!==null,t!==null?t.memoizedState!==null!==l&&(e.flags|=8192):l&&(e.flags|=8192),l?(n&536870912)!==0&&(e.flags&128)===0&&(Ht(e),e.subtreeFlags&6&&(e.flags|=8192)):Ht(e),n=e.updateQueue,n!==null&&pu(e,n.retryQueue),n=null,t!==null&&t.memoizedState!==null&&t.memoizedState.cachePool!==null&&(n=t.memoizedState.cachePool.pool),l=null,e.memoizedState!==null&&e.memoizedState.cachePool!==null&&(l=e.memoizedState.cachePool.pool),l!==n&&(e.flags|=2048),t!==null&&L(vl),null;case 24:return n=null,t!==null&&(n=t.memoizedState.cache),e.memoizedState.cache!==n&&(e.flags|=2048),un(Zt),Ht(e),null;case 25:return null;case 30:return null}throw Error(f(156,e.tag))}function pg(t,e){switch(qc(e),e.tag){case 1:return t=e.flags,t&65536?(e.flags=t&-65537|128,e):null;case 3:return un(Zt),Qt(),t=e.flags,(t&65536)!==0&&(t&128)===0?(e.flags=t&-65537|128,e):null;case 26:case 27:case 5:return ul(e),null;case 31:if(e.memoizedState!==null){if(Oe(e),e.alternate===null)throw Error(f(340));ml()}return t=e.flags,t&65536?(e.flags=t&-65537|128,e):null;case 13:if(Oe(e),t=e.memoizedState,t!==null&&t.dehydrated!==null){if(e.alternate===null)throw Error(f(340));ml()}return t=e.flags,t&65536?(e.flags=t&-65537|128,e):null;case 19:return L(Xt),null;case 4:return Qt(),null;case 10:return un(e.type),null;case 22:case 23:return Oe(e),us(),t!==null&&L(vl),t=e.flags,t&65536?(e.flags=t&-65537|128,e):null;case 24:return un(Zt),null;case 25:return null;default:return null}}function Io(t,e){switch(qc(e),e.tag){case 3:un(Zt),Qt();break;case 26:case 27:case 5:ul(e);break;case 4:Qt();break;case 31:e.memoizedState!==null&&Oe(e);break;case 13:Oe(e);break;case 19:L(Xt);break;case 10:un(e.type);break;case 22:case 23:Oe(e),us(),t!==null&&L(vl);break;case 24:un(Zt)}}function ti(t,e){try{var n=e.updateQueue,l=n!==null?n.lastEffect:null;if(l!==null){var a=l.next;n=a;do{if((n.tag&t)===t){l=void 0;var s=n.create,d=n.inst;l=s(),d.destroy=l}n=n.next}while(n!==a)}}catch(g){Dt(e,e.return,g)}}function Yn(t,e,n){try{var l=e.updateQueue,a=l!==null?l.lastEffect:null;if(a!==null){var s=a.next;l=s;do{if((l.tag&t)===t){var d=l.inst,g=d.destroy;if(g!==void 0){d.destroy=void 0,a=e;var S=n,U=g;try{U()}catch(Z){Dt(a,S,Z)}}}l=l.next}while(l!==s)}}catch(Z){Dt(e,e.return,Z)}}function qo(t){var e=t.updateQueue;if(e!==null){var n=t.stateNode;try{B0(e,n)}catch(l){Dt(t,t.return,l)}}}function Ko(t,e,n){n.props=bl(t.type,t.memoizedProps),n.state=t.memoizedState;try{n.componentWillUnmount()}catch(l){Dt(t,e,l)}}function ei(t,e){try{var n=t.ref;if(n!==null){switch(t.tag){case 26:case 27:case 5:var l=t.stateNode;break;case 30:l=t.stateNode;break;default:l=t.stateNode}typeof n=="function"?t.refCleanup=n(l):n.current=l}}catch(a){Dt(t,e,a)}}function We(t,e){var n=t.ref,l=t.refCleanup;if(n!==null)if(typeof l=="function")try{l()}catch(a){Dt(t,e,a)}finally{t.refCleanup=null,t=t.alternate,t!=null&&(t.refCleanup=null)}else if(typeof n=="function")try{n(null)}catch(a){Dt(t,e,a)}else n.current=null}function ko(t){var e=t.type,n=t.memoizedProps,l=t.stateNode;try{t:switch(e){case"button":case"input":case"select":case"textarea":n.autoFocus&&l.focus();break t;case"img":n.src?l.src=n.src:n.srcSet&&(l.srcset=n.srcSet)}}catch(a){Dt(t,t.return,a)}}function Ys(t,e,n){try{var l=t.stateNode;Vg(l,t.type,n,e),l[oe]=e}catch(a){Dt(t,t.return,a)}}function Jo(t){return t.tag===5||t.tag===3||t.tag===26||t.tag===27&&qn(t.type)||t.tag===4}function Ls(t){t:for(;;){for(;t.sibling===null;){if(t.return===null||Jo(t.return))return null;t=t.return}for(t.sibling.return=t.return,t=t.sibling;t.tag!==5&&t.tag!==6&&t.tag!==18;){if(t.tag===27&&qn(t.type)||t.flags&2||t.child===null||t.tag===4)continue t;t.child.return=t,t=t.child}if(!(t.flags&2))return t.stateNode}}function Gs(t,e,n){var l=t.tag;if(l===5||l===6)t=t.stateNode,e?(n.nodeType===9?n.body:n.nodeName==="HTML"?n.ownerDocument.body:n).insertBefore(t,e):(e=n.nodeType===9?n.body:n.nodeName==="HTML"?n.ownerDocument.body:n,e.appendChild(t),n=n._reactRootContainer,n!=null||e.onclick!==null||(e.onclick=tn));else if(l!==4&&(l===27&&qn(t.type)&&(n=t.stateNode,e=null),t=t.child,t!==null))for(Gs(t,e,n),t=t.sibling;t!==null;)Gs(t,e,n),t=t.sibling}function xu(t,e,n){var l=t.tag;if(l===5||l===6)t=t.stateNode,e?n.insertBefore(t,e):n.appendChild(t);else if(l!==4&&(l===27&&qn(t.type)&&(n=t.stateNode),t=t.child,t!==null))for(xu(t,e,n),t=t.sibling;t!==null;)xu(t,e,n),t=t.sibling}function Fo(t){var e=t.stateNode,n=t.memoizedProps;try{for(var l=t.type,a=e.attributes;a.length;)e.removeAttributeNode(a[0]);ae(e,l,n),e[te]=t,e[oe]=n}catch(s){Dt(t,t.return,s)}}var on=!1,Kt=!1,Xs=!1,Wo=typeof WeakSet=="function"?WeakSet:Set,Wt=null;function xg(t,e){if(t=t.containerInfo,ff=Vu,t=c0(t),Bc(t)){if("selectionStart"in t)var n={start:t.selectionStart,end:t.selectionEnd};else t:{n=(n=t.ownerDocument)&&n.defaultView||window;var l=n.getSelection&&n.getSelection();if(l&&l.rangeCount!==0){n=l.anchorNode;var a=l.anchorOffset,s=l.focusNode;l=l.focusOffset;try{n.nodeType,s.nodeType}catch{n=null;break t}var d=0,g=-1,S=-1,U=0,Z=0,J=t,Q=null;e:for(;;){for(var G;J!==n||a!==0&&J.nodeType!==3||(g=d+a),J!==s||l!==0&&J.nodeType!==3||(S=d+l),J.nodeType===3&&(d+=J.nodeValue.length),(G=J.firstChild)!==null;)Q=J,J=G;for(;;){if(J===t)break e;if(Q===n&&++U===a&&(g=d),Q===s&&++Z===l&&(S=d),(G=J.nextSibling)!==null)break;J=Q,Q=J.parentNode}J=G}n=g===-1||S===-1?null:{start:g,end:S}}else n=null}n=n||{start:0,end:0}}else n=null;for(rf={focusedElem:t,selectionRange:n},Vu=!1,Wt=e;Wt!==null;)if(e=Wt,t=e.child,(e.subtreeFlags&1028)!==0&&t!==null)t.return=e,Wt=t;else for(;Wt!==null;){switch(e=Wt,s=e.alternate,t=e.flags,e.tag){case 0:if((t&4)!==0&&(t=e.updateQueue,t=t!==null?t.events:null,t!==null))for(n=0;n<t.length;n++)a=t[n],a.ref.impl=a.nextImpl;break;case 11:case 15:break;case 1:if((t&1024)!==0&&s!==null){t=void 0,n=e,a=s.memoizedProps,s=s.memoizedState,l=n.stateNode;try{var lt=bl(n.type,a);t=l.getSnapshotBeforeUpdate(lt,s),l.__reactInternalSnapshotBeforeUpdate=t}catch(ft){Dt(n,n.return,ft)}}break;case 3:if((t&1024)!==0){if(t=e.stateNode.containerInfo,n=t.nodeType,n===9)hf(t);else if(n===1)switch(t.nodeName){case"HEAD":case"HTML":case"BODY":hf(t);break;default:t.textContent=""}}break;case 5:case 26:case 27:case 6:case 4:case 17:break;default:if((t&1024)!==0)throw Error(f(163))}if(t=e.sibling,t!==null){t.return=e.return,Wt=t;break}Wt=e.return}}function _o(t,e,n){var l=n.flags;switch(n.tag){case 0:case 11:case 15:hn(t,n),l&4&&ti(5,n);break;case 1:if(hn(t,n),l&4)if(t=n.stateNode,e===null)try{t.componentDidMount()}catch(d){Dt(n,n.return,d)}else{var a=bl(n.type,e.memoizedProps);e=e.memoizedState;try{t.componentDidUpdate(a,e,t.__reactInternalSnapshotBeforeUpdate)}catch(d){Dt(n,n.return,d)}}l&64&&qo(n),l&512&&ei(n,n.return);break;case 3:if(hn(t,n),l&64&&(t=n.updateQueue,t!==null)){if(e=null,n.child!==null)switch(n.child.tag){case 27:case 5:e=n.child.stateNode;break;case 1:e=n.child.stateNode}try{B0(t,e)}catch(d){Dt(n,n.return,d)}}break;case 27:e===null&&l&4&&Fo(n);case 26:case 5:hn(t,n),e===null&&l&4&&ko(n),l&512&&ei(n,n.return);break;case 12:hn(t,n);break;case 31:hn(t,n),l&4&&td(t,n);break;case 13:hn(t,n),l&4&&ed(t,n),l&64&&(t=n.memoizedState,t!==null&&(t=t.dehydrated,t!==null&&(n=Mg.bind(null,n),Wg(t,n))));break;case 22:if(l=n.memoizedState!==null||on,!l){e=e!==null&&e.memoizedState!==null||Kt,a=on;var s=Kt;on=l,(Kt=e)&&!s?mn(t,n,(n.subtreeFlags&8772)!==0):hn(t,n),on=a,Kt=s}break;case 30:break;default:hn(t,n)}}function Po(t){var e=t.alternate;e!==null&&(t.alternate=null,Po(e)),t.child=null,t.deletions=null,t.sibling=null,t.tag===5&&(e=t.stateNode,e!==null&&vc(e)),t.stateNode=null,t.return=null,t.dependencies=null,t.memoizedProps=null,t.memoizedState=null,t.pendingProps=null,t.stateNode=null,t.updateQueue=null}var zt=null,he=!1;function dn(t,e,n){for(n=n.child;n!==null;)$o(t,e,n),n=n.sibling}function $o(t,e,n){if(xe&&typeof xe.onCommitFiberUnmount=="function")try{xe.onCommitFiberUnmount(Ca,n)}catch{}switch(n.tag){case 26:Kt||We(n,e),dn(t,e,n),n.memoizedState?n.memoizedState.count--:n.stateNode&&(n=n.stateNode,n.parentNode.removeChild(n));break;case 27:Kt||We(n,e);var l=zt,a=he;qn(n.type)&&(zt=n.stateNode,he=!1),dn(t,e,n),ri(n.stateNode),zt=l,he=a;break;case 5:Kt||We(n,e);case 6:if(l=zt,a=he,zt=null,dn(t,e,n),zt=l,he=a,zt!==null)if(he)try{(zt.nodeType===9?zt.body:zt.nodeName==="HTML"?zt.ownerDocument.body:zt).removeChild(n.stateNode)}catch(s){Dt(n,e,s)}else try{zt.removeChild(n.stateNode)}catch(s){Dt(n,e,s)}break;case 18:zt!==null&&(he?(t=zt,qd(t.nodeType===9?t.body:t.nodeName==="HTML"?t.ownerDocument.body:t,n.stateNode),va(t)):qd(zt,n.stateNode));break;case 4:l=zt,a=he,zt=n.stateNode.containerInfo,he=!0,dn(t,e,n),zt=l,he=a;break;case 0:case 11:case 14:case 15:Yn(2,n,e),Kt||Yn(4,n,e),dn(t,e,n);break;case 1:Kt||(We(n,e),l=n.stateNode,typeof l.componentWillUnmount=="function"&&Ko(n,e,l)),dn(t,e,n);break;case 21:dn(t,e,n);break;case 22:Kt=(l=Kt)||n.memoizedState!==null,dn(t,e,n),Kt=l;break;default:dn(t,e,n)}}function td(t,e){if(e.memoizedState===null&&(t=e.alternate,t!==null&&(t=t.memoizedState,t!==null))){t=t.dehydrated;try{va(t)}catch(n){Dt(e,e.return,n)}}}function ed(t,e){if(e.memoizedState===null&&(t=e.alternate,t!==null&&(t=t.memoizedState,t!==null&&(t=t.dehydrated,t!==null))))try{va(t)}catch(n){Dt(e,e.return,n)}}function bg(t){switch(t.tag){case 31:case 13:case 19:var e=t.stateNode;return e===null&&(e=t.stateNode=new Wo),e;case 22:return t=t.stateNode,e=t._retryCache,e===null&&(e=t._retryCache=new Wo),e;default:throw Error(f(435,t.tag))}}function bu(t,e){var n=bg(t);e.forEach(function(l){if(!n.has(l)){n.add(l);var a=jg.bind(null,t,l);l.then(a,a)}})}function me(t,e){var n=e.deletions;if(n!==null)for(var l=0;l<n.length;l++){var a=n[l],s=t,d=e,g=d;t:for(;g!==null;){switch(g.tag){case 27:if(qn(g.type)){zt=g.stateNode,he=!1;break t}break;case 5:zt=g.stateNode,he=!1;break t;case 3:case 4:zt=g.stateNode.containerInfo,he=!0;break t}g=g.return}if(zt===null)throw Error(f(160));$o(s,d,a),zt=null,he=!1,s=a.alternate,s!==null&&(s.return=null),a.return=null}if(e.subtreeFlags&13886)for(e=e.child;e!==null;)nd(e,t),e=e.sibling}var qe=null;function nd(t,e){var n=t.alternate,l=t.flags;switch(t.tag){case 0:case 11:case 14:case 15:me(e,t),ge(t),l&4&&(Yn(3,t,t.return),ti(3,t),Yn(5,t,t.return));break;case 1:me(e,t),ge(t),l&512&&(Kt||n===null||We(n,n.return)),l&64&&on&&(t=t.updateQueue,t!==null&&(l=t.callbacks,l!==null&&(n=t.shared.hiddenCallbacks,t.shared.hiddenCallbacks=n===null?l:n.concat(l))));break;case 26:var a=qe;if(me(e,t),ge(t),l&512&&(Kt||n===null||We(n,n.return)),l&4){var s=n!==null?n.memoizedState:null;if(l=t.memoizedState,n===null)if(l===null)if(t.stateNode===null){t:{l=t.type,n=t.memoizedProps,a=a.ownerDocument||a;e:switch(l){case"title":s=a.getElementsByTagName("title")[0],(!s||s[Ra]||s[te]||s.namespaceURI==="http://www.w3.org/2000/svg"||s.hasAttribute("itemprop"))&&(s=a.createElement(l),a.head.insertBefore(s,a.querySelector("head > title"))),ae(s,l,n),s[te]=t,Ft(s),l=s;break t;case"link":var d=n1("link","href",a).get(l+(n.href||""));if(d){for(var g=0;g<d.length;g++)if(s=d[g],s.getAttribute("href")===(n.href==null||n.href===""?null:n.href)&&s.getAttribute("rel")===(n.rel==null?null:n.rel)&&s.getAttribute("title")===(n.title==null?null:n.title)&&s.getAttribute("crossorigin")===(n.crossOrigin==null?null:n.crossOrigin)){d.splice(g,1);break e}}s=a.createElement(l),ae(s,l,n),a.head.appendChild(s);break;case"meta":if(d=n1("meta","content",a).get(l+(n.content||""))){for(g=0;g<d.length;g++)if(s=d[g],s.getAttribute("content")===(n.content==null?null:""+n.content)&&s.getAttribute("name")===(n.name==null?null:n.name)&&s.getAttribute("property")===(n.property==null?null:n.property)&&s.getAttribute("http-equiv")===(n.httpEquiv==null?null:n.httpEquiv)&&s.getAttribute("charset")===(n.charSet==null?null:n.charSet)){d.splice(g,1);break e}}s=a.createElement(l),ae(s,l,n),a.head.appendChild(s);break;default:throw Error(f(468,l))}s[te]=t,Ft(s),l=s}t.stateNode=l}else l1(a,t.type,t.stateNode);else t.stateNode=e1(a,l,t.memoizedProps);else s!==l?(s===null?n.stateNode!==null&&(n=n.stateNode,n.parentNode.removeChild(n)):s.count--,l===null?l1(a,t.type,t.stateNode):e1(a,l,t.memoizedProps)):l===null&&t.stateNode!==null&&Ys(t,t.memoizedProps,n.memoizedProps)}break;case 27:me(e,t),ge(t),l&512&&(Kt||n===null||We(n,n.return)),n!==null&&l&4&&Ys(t,t.memoizedProps,n.memoizedProps);break;case 5:if(me(e,t),ge(t),l&512&&(Kt||n===null||We(n,n.return)),t.flags&32){a=t.stateNode;try{Gl(a,"")}catch(lt){Dt(t,t.return,lt)}}l&4&&t.stateNode!=null&&(a=t.memoizedProps,Ys(t,a,n!==null?n.memoizedProps:a)),l&1024&&(Xs=!0);break;case 6:if(me(e,t),ge(t),l&4){if(t.stateNode===null)throw Error(f(162));l=t.memoizedProps,n=t.stateNode;try{n.nodeValue=l}catch(lt){Dt(t,t.return,lt)}}break;case 3:if(Yu=null,a=qe,qe=Qu(e.containerInfo),me(e,t),qe=a,ge(t),l&4&&n!==null&&n.memoizedState.isDehydrated)try{va(e.containerInfo)}catch(lt){Dt(t,t.return,lt)}Xs&&(Xs=!1,ld(t));break;case 4:l=qe,qe=Qu(t.stateNode.containerInfo),me(e,t),ge(t),qe=l;break;case 12:me(e,t),ge(t);break;case 31:me(e,t),ge(t),l&4&&(l=t.updateQueue,l!==null&&(t.updateQueue=null,bu(t,l)));break;case 13:me(e,t),ge(t),t.child.flags&8192&&t.memoizedState!==null!=(n!==null&&n.memoizedState!==null)&&(Tu=pe()),l&4&&(l=t.updateQueue,l!==null&&(t.updateQueue=null,bu(t,l)));break;case 22:a=t.memoizedState!==null;var S=n!==null&&n.memoizedState!==null,U=on,Z=Kt;if(on=U||a,Kt=Z||S,me(e,t),Kt=Z,on=U,ge(t),l&8192)t:for(e=t.stateNode,e._visibility=a?e._visibility&-2:e._visibility|1,a&&(n===null||S||on||Kt||Sl(t)),n=null,e=t;;){if(e.tag===5||e.tag===26){if(n===null){S=n=e;try{if(s=S.stateNode,a)d=s.style,typeof d.setProperty=="function"?d.setProperty("display","none","important"):d.display="none";else{g=S.stateNode;var J=S.memoizedProps.style,Q=J!=null&&J.hasOwnProperty("display")?J.display:null;g.style.display=Q==null||typeof Q=="boolean"?"":(""+Q).trim()}}catch(lt){Dt(S,S.return,lt)}}}else if(e.tag===6){if(n===null){S=e;try{S.stateNode.nodeValue=a?"":S.memoizedProps}catch(lt){Dt(S,S.return,lt)}}}else if(e.tag===18){if(n===null){S=e;try{var G=S.stateNode;a?Kd(G,!0):Kd(S.stateNode,!1)}catch(lt){Dt(S,S.return,lt)}}}else if((e.tag!==22&&e.tag!==23||e.memoizedState===null||e===t)&&e.child!==null){e.child.return=e,e=e.child;continue}if(e===t)break t;for(;e.sibling===null;){if(e.return===null||e.return===t)break t;n===e&&(n=null),e=e.return}n===e&&(n=null),e.sibling.return=e.return,e=e.sibling}l&4&&(l=t.updateQueue,l!==null&&(n=l.retryQueue,n!==null&&(l.retryQueue=null,bu(t,n))));break;case 19:me(e,t),ge(t),l&4&&(l=t.updateQueue,l!==null&&(t.updateQueue=null,bu(t,l)));break;case 30:break;case 21:break;default:me(e,t),ge(t)}}function ge(t){var e=t.flags;if(e&2){try{for(var n,l=t.return;l!==null;){if(Jo(l)){n=l;break}l=l.return}if(n==null)throw Error(f(160));switch(n.tag){case 27:var a=n.stateNode,s=Ls(t);xu(t,s,a);break;case 5:var d=n.stateNode;n.flags&32&&(Gl(d,""),n.flags&=-33);var g=Ls(t);xu(t,g,d);break;case 3:case 4:var S=n.stateNode.containerInfo,U=Ls(t);Gs(t,U,S);break;default:throw Error(f(161))}}catch(Z){Dt(t,t.return,Z)}t.flags&=-3}e&4096&&(t.flags&=-4097)}function ld(t){if(t.subtreeFlags&1024)for(t=t.child;t!==null;){var e=t;ld(e),e.tag===5&&e.flags&1024&&e.stateNode.reset(),t=t.sibling}}function hn(t,e){if(e.subtreeFlags&8772)for(e=e.child;e!==null;)_o(t,e.alternate,e),e=e.sibling}function Sl(t){for(t=t.child;t!==null;){var e=t;switch(e.tag){case 0:case 11:case 14:case 15:Yn(4,e,e.return),Sl(e);break;case 1:We(e,e.return);var n=e.stateNode;typeof n.componentWillUnmount=="function"&&Ko(e,e.return,n),Sl(e);break;case 27:ri(e.stateNode);case 26:case 5:We(e,e.return),Sl(e);break;case 22:e.memoizedState===null&&Sl(e);break;case 30:Sl(e);break;default:Sl(e)}t=t.sibling}}function mn(t,e,n){for(n=n&&(e.subtreeFlags&8772)!==0,e=e.child;e!==null;){var l=e.alternate,a=t,s=e,d=s.flags;switch(s.tag){case 0:case 11:case 15:mn(a,s,n),ti(4,s);break;case 1:if(mn(a,s,n),l=s,a=l.stateNode,typeof a.componentDidMount=="function")try{a.componentDidMount()}catch(U){Dt(l,l.return,U)}if(l=s,a=l.updateQueue,a!==null){var g=l.stateNode;try{var S=a.shared.hiddenCallbacks;if(S!==null)for(a.shared.hiddenCallbacks=null,a=0;a<S.length;a++)H0(S[a],g)}catch(U){Dt(l,l.return,U)}}n&&d&64&&qo(s),ei(s,s.return);break;case 27:Fo(s);case 26:case 5:mn(a,s,n),n&&l===null&&d&4&&ko(s),ei(s,s.return);break;case 12:mn(a,s,n);break;case 31:mn(a,s,n),n&&d&4&&td(a,s);break;case 13:mn(a,s,n),n&&d&4&&ed(a,s);break;case 22:s.memoizedState===null&&mn(a,s,n),ei(s,s.return);break;case 30:break;default:mn(a,s,n)}e=e.sibling}}function Vs(t,e){var n=null;t!==null&&t.memoizedState!==null&&t.memoizedState.cachePool!==null&&(n=t.memoizedState.cachePool.pool),t=null,e.memoizedState!==null&&e.memoizedState.cachePool!==null&&(t=e.memoizedState.cachePool.pool),t!==n&&(t!=null&&t.refCount++,n!=null&&Xa(n))}function Zs(t,e){t=null,e.alternate!==null&&(t=e.alternate.memoizedState.cache),e=e.memoizedState.cache,e!==t&&(e.refCount++,t!=null&&Xa(t))}function Ke(t,e,n,l){if(e.subtreeFlags&10256)for(e=e.child;e!==null;)ad(t,e,n,l),e=e.sibling}function ad(t,e,n,l){var a=e.flags;switch(e.tag){case 0:case 11:case 15:Ke(t,e,n,l),a&2048&&ti(9,e);break;case 1:Ke(t,e,n,l);break;case 3:Ke(t,e,n,l),a&2048&&(t=null,e.alternate!==null&&(t=e.alternate.memoizedState.cache),e=e.memoizedState.cache,e!==t&&(e.refCount++,t!=null&&Xa(t)));break;case 12:if(a&2048){Ke(t,e,n,l),t=e.stateNode;try{var s=e.memoizedProps,d=s.id,g=s.onPostCommit;typeof g=="function"&&g(d,e.alternate===null?"mount":"update",t.passiveEffectDuration,-0)}catch(S){Dt(e,e.return,S)}}else Ke(t,e,n,l);break;case 31:Ke(t,e,n,l);break;case 13:Ke(t,e,n,l);break;case 23:break;case 22:s=e.stateNode,d=e.alternate,e.memoizedState!==null?s._visibility&2?Ke(t,e,n,l):ni(t,e):s._visibility&2?Ke(t,e,n,l):(s._visibility|=2,ua(t,e,n,l,(e.subtreeFlags&10256)!==0||!1)),a&2048&&Vs(d,e);break;case 24:Ke(t,e,n,l),a&2048&&Zs(e.alternate,e);break;default:Ke(t,e,n,l)}}function ua(t,e,n,l,a){for(a=a&&((e.subtreeFlags&10256)!==0||!1),e=e.child;e!==null;){var s=t,d=e,g=n,S=l,U=d.flags;switch(d.tag){case 0:case 11:case 15:ua(s,d,g,S,a),ti(8,d);break;case 23:break;case 22:var Z=d.stateNode;d.memoizedState!==null?Z._visibility&2?ua(s,d,g,S,a):ni(s,d):(Z._visibility|=2,ua(s,d,g,S,a)),a&&U&2048&&Vs(d.alternate,d);break;case 24:ua(s,d,g,S,a),a&&U&2048&&Zs(d.alternate,d);break;default:ua(s,d,g,S,a)}e=e.sibling}}function ni(t,e){if(e.subtreeFlags&10256)for(e=e.child;e!==null;){var n=t,l=e,a=l.flags;switch(l.tag){case 22:ni(n,l),a&2048&&Vs(l.alternate,l);break;case 24:ni(n,l),a&2048&&Zs(l.alternate,l);break;default:ni(n,l)}e=e.sibling}}var li=8192;function ca(t,e,n){if(t.subtreeFlags&li)for(t=t.child;t!==null;)id(t,e,n),t=t.sibling}function id(t,e,n){switch(t.tag){case 26:ca(t,e,n),t.flags&li&&t.memoizedState!==null&&sA(n,qe,t.memoizedState,t.memoizedProps);break;case 5:ca(t,e,n);break;case 3:case 4:var l=qe;qe=Qu(t.stateNode.containerInfo),ca(t,e,n),qe=l;break;case 22:t.memoizedState===null&&(l=t.alternate,l!==null&&l.memoizedState!==null?(l=li,li=16777216,ca(t,e,n),li=l):ca(t,e,n));break;default:ca(t,e,n)}}function ud(t){var e=t.alternate;if(e!==null&&(t=e.child,t!==null)){e.child=null;do e=t.sibling,t.sibling=null,t=e;while(t!==null)}}function ai(t){var e=t.deletions;if((t.flags&16)!==0){if(e!==null)for(var n=0;n<e.length;n++){var l=e[n];Wt=l,sd(l,t)}ud(t)}if(t.subtreeFlags&10256)for(t=t.child;t!==null;)cd(t),t=t.sibling}function cd(t){switch(t.tag){case 0:case 11:case 15:ai(t),t.flags&2048&&Yn(9,t,t.return);break;case 3:ai(t);break;case 12:ai(t);break;case 22:var e=t.stateNode;t.memoizedState!==null&&e._visibility&2&&(t.return===null||t.return.tag!==13)?(e._visibility&=-3,Su(t)):ai(t);break;default:ai(t)}}function Su(t){var e=t.deletions;if((t.flags&16)!==0){if(e!==null)for(var n=0;n<e.length;n++){var l=e[n];Wt=l,sd(l,t)}ud(t)}for(t=t.child;t!==null;){switch(e=t,e.tag){case 0:case 11:case 15:Yn(8,e,e.return),Su(e);break;case 22:n=e.stateNode,n._visibility&2&&(n._visibility&=-3,Su(e));break;default:Su(e)}t=t.sibling}}function sd(t,e){for(;Wt!==null;){var n=Wt;switch(n.tag){case 0:case 11:case 15:Yn(8,n,e);break;case 23:case 22:if(n.memoizedState!==null&&n.memoizedState.cachePool!==null){var l=n.memoizedState.cachePool.pool;l!=null&&l.refCount++}break;case 24:Xa(n.memoizedState.cache)}if(l=n.child,l!==null)l.return=n,Wt=l;else t:for(n=t;Wt!==null;){l=Wt;var a=l.sibling,s=l.return;if(Po(l),l===n){Wt=null;break t}if(a!==null){a.return=s,Wt=a;break t}Wt=s}}}var Sg={getCacheForType:function(t){var e=ne(Zt),n=e.data.get(t);return n===void 0&&(n=t(),e.data.set(t,n)),n},cacheSignal:function(){return ne(Zt).controller.signal}},Tg=typeof WeakMap=="function"?WeakMap:Map,Ct=0,jt=null,vt=null,Et=0,Ot=0,De=null,Ln=!1,sa=!1,Is=!1,gn=0,Gt=0,Gn=0,Tl=0,qs=0,Re=0,fa=0,ii=null,Ae=null,Ks=!1,Tu=0,fd=0,Cu=1/0,Ou=null,Xn=null,kt=0,Vn=null,ra=null,An=0,ks=0,Js=null,rd=null,ui=0,Fs=null;function we(){return(Ct&2)!==0&&Et!==0?Et&-Et:M.T!==null?ef():Cr()}function od(){if(Re===0)if((Et&536870912)===0||xt){var t=Bi;Bi<<=1,(Bi&3932160)===0&&(Bi=262144),Re=t}else Re=536870912;return t=Ce.current,t!==null&&(t.flags|=32),Re}function ve(t,e,n){(t===jt&&(Ot===2||Ot===9)||t.cancelPendingCommit!==null)&&(oa(t,0),Zn(t,Et,Re,!1)),Da(t,n),((Ct&2)===0||t!==jt)&&(t===jt&&((Ct&2)===0&&(Tl|=n),Gt===4&&Zn(t,Et,Re,!1)),_e(t))}function dd(t,e,n){if((Ct&6)!==0)throw Error(f(327));var l=!n&&(e&127)===0&&(e&t.expiredLanes)===0||Oa(t,e),a=l?Dg(t,e):_s(t,e,!0),s=l;do{if(a===0){sa&&!l&&Zn(t,e,0,!1);break}else{if(n=t.current.alternate,s&&!Cg(n)){a=_s(t,e,!1),s=!1;continue}if(a===2){if(s=e,t.errorRecoveryDisabledLanes&s)var d=0;else d=t.pendingLanes&-536870913,d=d!==0?d:d&536870912?536870912:0;if(d!==0){e=d;t:{var g=t;a=ii;var S=g.current.memoizedState.isDehydrated;if(S&&(oa(g,d).flags|=256),d=_s(g,d,!1),d!==2){if(Is&&!S){g.errorRecoveryDisabledLanes|=s,Tl|=s,a=4;break t}s=Ae,Ae=a,s!==null&&(Ae===null?Ae=s:Ae.push.apply(Ae,s))}a=d}if(s=!1,a!==2)continue}}if(a===1){oa(t,0),Zn(t,e,0,!0);break}t:{switch(l=t,s=a,s){case 0:case 1:throw Error(f(345));case 4:if((e&4194048)!==e)break;case 6:Zn(l,e,Re,!Ln);break t;case 2:Ae=null;break;case 3:case 5:break;default:throw Error(f(329))}if((e&62914560)===e&&(a=Tu+300-pe(),10<a)){if(Zn(l,e,Re,!Ln),Qi(l,0,!0)!==0)break t;An=e,l.timeoutHandle=Zd(hd.bind(null,l,n,Ae,Ou,Ks,e,Re,Tl,fa,Ln,s,"Throttled",-0,0),a);break t}hd(l,n,Ae,Ou,Ks,e,Re,Tl,fa,Ln,s,null,-0,0)}}break}while(!0);_e(t)}function hd(t,e,n,l,a,s,d,g,S,U,Z,J,Q,G){if(t.timeoutHandle=-1,J=e.subtreeFlags,J&8192||(J&16785408)===16785408){J={stylesheets:null,count:0,imgCount:0,imgBytes:0,suspenseyImages:[],waitingForImages:!0,waitingForViewTransition:!1,unsuspend:tn},id(e,s,J);var lt=(s&62914560)===s?Tu-pe():(s&4194048)===s?fd-pe():0;if(lt=fA(J,lt),lt!==null){An=s,t.cancelPendingCommit=lt(xd.bind(null,t,e,s,n,l,a,d,g,S,Z,J,null,Q,G)),Zn(t,s,d,!U);return}}xd(t,e,s,n,l,a,d,g,S)}function Cg(t){for(var e=t;;){var n=e.tag;if((n===0||n===11||n===15)&&e.flags&16384&&(n=e.updateQueue,n!==null&&(n=n.stores,n!==null)))for(var l=0;l<n.length;l++){var a=n[l],s=a.getSnapshot;a=a.value;try{if(!Se(s(),a))return!1}catch{return!1}}if(n=e.child,e.subtreeFlags&16384&&n!==null)n.return=e,e=n;else{if(e===t)break;for(;e.sibling===null;){if(e.return===null||e.return===t)return!0;e=e.return}e.sibling.return=e.return,e=e.sibling}}return!0}function Zn(t,e,n,l){e&=~qs,e&=~Tl,t.suspendedLanes|=e,t.pingedLanes&=~e,l&&(t.warmLanes|=e),l=t.expirationTimes;for(var a=e;0<a;){var s=31-be(a),d=1<<s;l[s]=-1,a&=~d}n!==0&&br(t,n,e)}function Du(){return(Ct&6)===0?(ci(0),!1):!0}function Ws(){if(vt!==null){if(Ot===0)var t=vt.return;else t=vt,an=gl=null,ds(t),ea=null,Za=0,t=vt;for(;t!==null;)Io(t.alternate,t),t=t.return;vt=null}}function oa(t,e){var n=t.timeoutHandle;n!==-1&&(t.timeoutHandle=-1,qg(n)),n=t.cancelPendingCommit,n!==null&&(t.cancelPendingCommit=null,n()),An=0,Ws(),jt=t,vt=n=nn(t.current,null),Et=e,Ot=0,De=null,Ln=!1,sa=Oa(t,e),Is=!1,fa=Re=qs=Tl=Gn=Gt=0,Ae=ii=null,Ks=!1,(e&8)!==0&&(e|=e&32);var l=t.entangledLanes;if(l!==0)for(t=t.entanglements,l&=e;0<l;){var a=31-be(l),s=1<<a;e|=t[a],l&=~s}return gn=e,Ji(),n}function md(t,e){mt=null,M.H=_a,e===ta||e===nu?(e=w0(),Ot=3):e===ts?(e=w0(),Ot=4):Ot=e===Rs?8:e!==null&&typeof e=="object"&&typeof e.then=="function"?6:1,De=e,vt===null&&(Gt=1,Au(t,Be(e,t.current)))}function gd(){var t=Ce.current;return t===null?!0:(Et&4194048)===Et?Ye===null:(Et&62914560)===Et||(Et&536870912)!==0?t===Ye:!1}function Ad(){var t=M.H;return M.H=_a,t===null?_a:t}function vd(){var t=M.A;return M.A=Sg,t}function Ru(){Gt=4,Ln||(Et&4194048)!==Et&&Ce.current!==null||(sa=!0),(Gn&134217727)===0&&(Tl&134217727)===0||jt===null||Zn(jt,Et,Re,!1)}function _s(t,e,n){var l=Ct;Ct|=2;var a=Ad(),s=vd();(jt!==t||Et!==e)&&(Ou=null,oa(t,e)),e=!1;var d=Gt;t:do try{if(Ot!==0&&vt!==null){var g=vt,S=De;switch(Ot){case 8:Ws(),d=6;break t;case 3:case 2:case 9:case 6:Ce.current===null&&(e=!0);var U=Ot;if(Ot=0,De=null,da(t,g,S,U),n&&sa){d=0;break t}break;default:U=Ot,Ot=0,De=null,da(t,g,S,U)}}Og(),d=Gt;break}catch(Z){md(t,Z)}while(!0);return e&&t.shellSuspendCounter++,an=gl=null,Ct=l,M.H=a,M.A=s,vt===null&&(jt=null,Et=0,Ji()),d}function Og(){for(;vt!==null;)yd(vt)}function Dg(t,e){var n=Ct;Ct|=2;var l=Ad(),a=vd();jt!==t||Et!==e?(Ou=null,Cu=pe()+500,oa(t,e)):sa=Oa(t,e);t:do try{if(Ot!==0&&vt!==null){e=vt;var s=De;e:switch(Ot){case 1:Ot=0,De=null,da(t,e,s,1);break;case 2:case 9:if(D0(s)){Ot=0,De=null,Ed(e);break}e=function(){Ot!==2&&Ot!==9||jt!==t||(Ot=7),_e(t)},s.then(e,e);break t;case 3:Ot=7;break t;case 4:Ot=5;break t;case 7:D0(s)?(Ot=0,De=null,Ed(e)):(Ot=0,De=null,da(t,e,s,7));break;case 5:var d=null;switch(vt.tag){case 26:d=vt.memoizedState;case 5:case 27:var g=vt;if(d?a1(d):g.stateNode.complete){Ot=0,De=null;var S=g.sibling;if(S!==null)vt=S;else{var U=g.return;U!==null?(vt=U,wu(U)):vt=null}break e}}Ot=0,De=null,da(t,e,s,5);break;case 6:Ot=0,De=null,da(t,e,s,6);break;case 8:Ws(),Gt=6;break t;default:throw Error(f(462))}}Rg();break}catch(Z){md(t,Z)}while(!0);return an=gl=null,M.H=l,M.A=a,Ct=n,vt!==null?0:(jt=null,Et=0,Ji(),Gt)}function Rg(){for(;vt!==null&&!_h();)yd(vt)}function yd(t){var e=Vo(t.alternate,t,gn);t.memoizedProps=t.pendingProps,e===null?wu(t):vt=e}function Ed(t){var e=t,n=e.alternate;switch(e.tag){case 15:case 0:e=Qo(n,e,e.pendingProps,e.type,void 0,Et);break;case 11:e=Qo(n,e,e.pendingProps,e.type.render,e.ref,Et);break;case 5:ds(e);default:Io(n,e),e=vt=A0(e,gn),e=Vo(n,e,gn)}t.memoizedProps=t.pendingProps,e===null?wu(t):vt=e}function da(t,e,n,l){an=gl=null,ds(e),ea=null,Za=0;var a=e.return;try{if(Ag(t,a,e,n,Et)){Gt=1,Au(t,Be(n,t.current)),vt=null;return}}catch(s){if(a!==null)throw vt=a,s;Gt=1,Au(t,Be(n,t.current)),vt=null;return}e.flags&32768?(xt||l===1?t=!0:sa||(Et&536870912)!==0?t=!1:(Ln=t=!0,(l===2||l===9||l===3||l===6)&&(l=Ce.current,l!==null&&l.tag===13&&(l.flags|=16384))),pd(e,t)):wu(e)}function wu(t){var e=t;do{if((e.flags&32768)!==0){pd(e,Ln);return}t=e.return;var n=Eg(e.alternate,e,gn);if(n!==null){vt=n;return}if(e=e.sibling,e!==null){vt=e;return}vt=e=t}while(e!==null);Gt===0&&(Gt=5)}function pd(t,e){do{var n=pg(t.alternate,t);if(n!==null){n.flags&=32767,vt=n;return}if(n=t.return,n!==null&&(n.flags|=32768,n.subtreeFlags=0,n.deletions=null),!e&&(t=t.sibling,t!==null)){vt=t;return}vt=t=n}while(t!==null);Gt=6,vt=null}function xd(t,e,n,l,a,s,d,g,S){t.cancelPendingCommit=null;do Mu();while(kt!==0);if((Ct&6)!==0)throw Error(f(327));if(e!==null){if(e===t.current)throw Error(f(177));if(s=e.lanes|e.childLanes,s|=Lc,cm(t,n,s,d,g,S),t===jt&&(vt=jt=null,Et=0),ra=e,Vn=t,An=n,ks=s,Js=a,rd=l,(e.subtreeFlags&10256)!==0||(e.flags&10256)!==0?(t.callbackNode=null,t.callbackPriority=0,Ng(Ni,function(){return Od(),null})):(t.callbackNode=null,t.callbackPriority=0),l=(e.flags&13878)!==0,(e.subtreeFlags&13878)!==0||l){l=M.T,M.T=null,a=_.p,_.p=2,d=Ct,Ct|=4;try{xg(t,e,n)}finally{Ct=d,_.p=a,M.T=l}}kt=1,bd(),Sd(),Td()}}function bd(){if(kt===1){kt=0;var t=Vn,e=ra,n=(e.flags&13878)!==0;if((e.subtreeFlags&13878)!==0||n){n=M.T,M.T=null;var l=_.p;_.p=2;var a=Ct;Ct|=4;try{nd(e,t);var s=rf,d=c0(t.containerInfo),g=s.focusedElem,S=s.selectionRange;if(d!==g&&g&&g.ownerDocument&&u0(g.ownerDocument.documentElement,g)){if(S!==null&&Bc(g)){var U=S.start,Z=S.end;if(Z===void 0&&(Z=U),"selectionStart"in g)g.selectionStart=U,g.selectionEnd=Math.min(Z,g.value.length);else{var J=g.ownerDocument||document,Q=J&&J.defaultView||window;if(Q.getSelection){var G=Q.getSelection(),lt=g.textContent.length,ft=Math.min(S.start,lt),Mt=S.end===void 0?ft:Math.min(S.end,lt);!G.extend&&ft>Mt&&(d=Mt,Mt=ft,ft=d);var w=i0(g,ft),O=i0(g,Mt);if(w&&O&&(G.rangeCount!==1||G.anchorNode!==w.node||G.anchorOffset!==w.offset||G.focusNode!==O.node||G.focusOffset!==O.offset)){var B=J.createRange();B.setStart(w.node,w.offset),G.removeAllRanges(),ft>Mt?(G.addRange(B),G.extend(O.node,O.offset)):(B.setEnd(O.node,O.offset),G.addRange(B))}}}}for(J=[],G=g;G=G.parentNode;)G.nodeType===1&&J.push({element:G,left:G.scrollLeft,top:G.scrollTop});for(typeof g.focus=="function"&&g.focus(),g=0;g<J.length;g++){var K=J[g];K.element.scrollLeft=K.left,K.element.scrollTop=K.top}}Vu=!!ff,rf=ff=null}finally{Ct=a,_.p=l,M.T=n}}t.current=e,kt=2}}function Sd(){if(kt===2){kt=0;var t=Vn,e=ra,n=(e.flags&8772)!==0;if((e.subtreeFlags&8772)!==0||n){n=M.T,M.T=null;var l=_.p;_.p=2;var a=Ct;Ct|=4;try{_o(t,e.alternate,e)}finally{Ct=a,_.p=l,M.T=n}}kt=3}}function Td(){if(kt===4||kt===3){kt=0,Ph();var t=Vn,e=ra,n=An,l=rd;(e.subtreeFlags&10256)!==0||(e.flags&10256)!==0?kt=5:(kt=0,ra=Vn=null,Cd(t,t.pendingLanes));var a=t.pendingLanes;if(a===0&&(Xn=null),gc(n),e=e.stateNode,xe&&typeof xe.onCommitFiberRoot=="function")try{xe.onCommitFiberRoot(Ca,e,void 0,(e.current.flags&128)===128)}catch{}if(l!==null){e=M.T,a=_.p,_.p=2,M.T=null;try{for(var s=t.onRecoverableError,d=0;d<l.length;d++){var g=l[d];s(g.value,{componentStack:g.stack})}}finally{M.T=e,_.p=a}}(An&3)!==0&&Mu(),_e(t),a=t.pendingLanes,(n&261930)!==0&&(a&42)!==0?t===Fs?ui++:(ui=0,Fs=t):ui=0,ci(0)}}function Cd(t,e){(t.pooledCacheLanes&=e)===0&&(e=t.pooledCache,e!=null&&(t.pooledCache=null,Xa(e)))}function Mu(){return bd(),Sd(),Td(),Od()}function Od(){if(kt!==5)return!1;var t=Vn,e=ks;ks=0;var n=gc(An),l=M.T,a=_.p;try{_.p=32>n?32:n,M.T=null,n=Js,Js=null;var s=Vn,d=An;if(kt=0,ra=Vn=null,An=0,(Ct&6)!==0)throw Error(f(331));var g=Ct;if(Ct|=4,cd(s.current),ad(s,s.current,d,n),Ct=g,ci(0,!1),xe&&typeof xe.onPostCommitFiberRoot=="function")try{xe.onPostCommitFiberRoot(Ca,s)}catch{}return!0}finally{_.p=a,M.T=l,Cd(t,e)}}function Dd(t,e,n){e=Be(n,e),e=Ds(t.stateNode,e,2),t=Un(t,e,2),t!==null&&(Da(t,2),_e(t))}function Dt(t,e,n){if(t.tag===3)Dd(t,t,n);else for(;e!==null;){if(e.tag===3){Dd(e,t,n);break}else if(e.tag===1){var l=e.stateNode;if(typeof e.type.getDerivedStateFromError=="function"||typeof l.componentDidCatch=="function"&&(Xn===null||!Xn.has(l))){t=Be(n,t),n=Ro(2),l=Un(e,n,2),l!==null&&(wo(n,l,e,t),Da(l,2),_e(l));break}}e=e.return}}function Ps(t,e,n){var l=t.pingCache;if(l===null){l=t.pingCache=new Tg;var a=new Set;l.set(e,a)}else a=l.get(e),a===void 0&&(a=new Set,l.set(e,a));a.has(n)||(Is=!0,a.add(n),t=wg.bind(null,t,e,n),e.then(t,t))}function wg(t,e,n){var l=t.pingCache;l!==null&&l.delete(e),t.pingedLanes|=t.suspendedLanes&n,t.warmLanes&=~n,jt===t&&(Et&n)===n&&(Gt===4||Gt===3&&(Et&62914560)===Et&&300>pe()-Tu?(Ct&2)===0&&oa(t,0):qs|=n,fa===Et&&(fa=0)),_e(t)}function Rd(t,e){e===0&&(e=xr()),t=dl(t,e),t!==null&&(Da(t,e),_e(t))}function Mg(t){var e=t.memoizedState,n=0;e!==null&&(n=e.retryLane),Rd(t,n)}function jg(t,e){var n=0;switch(t.tag){case 31:case 13:var l=t.stateNode,a=t.memoizedState;a!==null&&(n=a.retryLane);break;case 19:l=t.stateNode;break;case 22:l=t.stateNode._retryCache;break;default:throw Error(f(314))}l!==null&&l.delete(e),Rd(t,n)}function Ng(t,e){return oc(t,e)}var ju=null,ha=null,$s=!1,Nu=!1,tf=!1,In=0;function _e(t){t!==ha&&t.next===null&&(ha===null?ju=ha=t:ha=ha.next=t),Nu=!0,$s||($s=!0,Bg())}function ci(t,e){if(!tf&&Nu){tf=!0;do for(var n=!1,l=ju;l!==null;){if(t!==0){var a=l.pendingLanes;if(a===0)var s=0;else{var d=l.suspendedLanes,g=l.pingedLanes;s=(1<<31-be(42|t)+1)-1,s&=a&~(d&~g),s=s&201326741?s&201326741|1:s?s|2:0}s!==0&&(n=!0,Nd(l,s))}else s=Et,s=Qi(l,l===jt?s:0,l.cancelPendingCommit!==null||l.timeoutHandle!==-1),(s&3)===0||Oa(l,s)||(n=!0,Nd(l,s));l=l.next}while(n);tf=!1}}function Hg(){wd()}function wd(){Nu=$s=!1;var t=0;In!==0&&Ig()&&(t=In);for(var e=pe(),n=null,l=ju;l!==null;){var a=l.next,s=Md(l,e);s===0?(l.next=null,n===null?ju=a:n.next=a,a===null&&(ha=n)):(n=l,(t!==0||(s&3)!==0)&&(Nu=!0)),l=a}kt!==0&&kt!==5||ci(t),In!==0&&(In=0)}function Md(t,e){for(var n=t.suspendedLanes,l=t.pingedLanes,a=t.expirationTimes,s=t.pendingLanes&-62914561;0<s;){var d=31-be(s),g=1<<d,S=a[d];S===-1?((g&n)===0||(g&l)!==0)&&(a[d]=um(g,e)):S<=e&&(t.expiredLanes|=g),s&=~g}if(e=jt,n=Et,n=Qi(t,t===e?n:0,t.cancelPendingCommit!==null||t.timeoutHandle!==-1),l=t.callbackNode,n===0||t===e&&(Ot===2||Ot===9)||t.cancelPendingCommit!==null)return l!==null&&l!==null&&dc(l),t.callbackNode=null,t.callbackPriority=0;if((n&3)===0||Oa(t,n)){if(e=n&-n,e===t.callbackPriority)return e;switch(l!==null&&dc(l),gc(n)){case 2:case 8:n=Er;break;case 32:n=Ni;break;case 268435456:n=pr;break;default:n=Ni}return l=jd.bind(null,t),n=oc(n,l),t.callbackPriority=e,t.callbackNode=n,e}return l!==null&&l!==null&&dc(l),t.callbackPriority=2,t.callbackNode=null,2}function jd(t,e){if(kt!==0&&kt!==5)return t.callbackNode=null,t.callbackPriority=0,null;var n=t.callbackNode;if(Mu()&&t.callbackNode!==n)return null;var l=Et;return l=Qi(t,t===jt?l:0,t.cancelPendingCommit!==null||t.timeoutHandle!==-1),l===0?null:(dd(t,l,e),Md(t,pe()),t.callbackNode!=null&&t.callbackNode===n?jd.bind(null,t):null)}function Nd(t,e){if(Mu())return null;dd(t,e,!0)}function Bg(){Kg(function(){(Ct&6)!==0?oc(yr,Hg):wd()})}function ef(){if(In===0){var t=Pl;t===0&&(t=Hi,Hi<<=1,(Hi&261888)===0&&(Hi=256)),In=t}return In}function Hd(t){return t==null||typeof t=="symbol"||typeof t=="boolean"?null:typeof t=="function"?t:Gi(""+t)}function Bd(t,e){var n=e.ownerDocument.createElement("input");return n.name=e.name,n.value=e.value,t.id&&n.setAttribute("form",t.id),e.parentNode.insertBefore(n,e),t=new FormData(t),n.parentNode.removeChild(n),t}function Ug(t,e,n,l,a){if(e==="submit"&&n&&n.stateNode===a){var s=Hd((a[oe]||null).action),d=l.submitter;d&&(e=(e=d[oe]||null)?Hd(e.formAction):d.getAttribute("formAction"),e!==null&&(s=e,d=null));var g=new Ii("action","action",null,l,a);t.push({event:g,listeners:[{instance:null,listener:function(){if(l.defaultPrevented){if(In!==0){var S=d?Bd(a,d):new FormData(a);xs(n,{pending:!0,data:S,method:a.method,action:s},null,S)}}else typeof s=="function"&&(g.preventDefault(),S=d?Bd(a,d):new FormData(a),xs(n,{pending:!0,data:S,method:a.method,action:s},s,S))},currentTarget:a}]})}}for(var nf=0;nf<Yc.length;nf++){var lf=Yc[nf],Qg=lf.toLowerCase(),zg=lf[0].toUpperCase()+lf.slice(1);Ie(Qg,"on"+zg)}Ie(r0,"onAnimationEnd"),Ie(o0,"onAnimationIteration"),Ie(d0,"onAnimationStart"),Ie("dblclick","onDoubleClick"),Ie("focusin","onFocus"),Ie("focusout","onBlur"),Ie($m,"onTransitionRun"),Ie(tg,"onTransitionStart"),Ie(eg,"onTransitionCancel"),Ie(h0,"onTransitionEnd"),Yl("onMouseEnter",["mouseout","mouseover"]),Yl("onMouseLeave",["mouseout","mouseover"]),Yl("onPointerEnter",["pointerout","pointerover"]),Yl("onPointerLeave",["pointerout","pointerover"]),sl("onChange","change click focusin focusout input keydown keyup selectionchange".split(" ")),sl("onSelect","focusout contextmenu dragend focusin keydown keyup mousedown mouseup selectionchange".split(" ")),sl("onBeforeInput",["compositionend","keypress","textInput","paste"]),sl("onCompositionEnd","compositionend focusout keydown keypress keyup mousedown".split(" ")),sl("onCompositionStart","compositionstart focusout keydown keypress keyup mousedown".split(" ")),sl("onCompositionUpdate","compositionupdate focusout keydown keypress keyup mousedown".split(" "));var si="abort canplay canplaythrough durationchange emptied encrypted ended error loadeddata loadedmetadata loadstart pause play playing progress ratechange resize seeked seeking stalled suspend timeupdate volumechange waiting".split(" "),Yg=new Set("beforetoggle cancel close invalid load scroll scrollend toggle".split(" ").concat(si));function Ud(t,e){e=(e&4)!==0;for(var n=0;n<t.length;n++){var l=t[n],a=l.event;l=l.listeners;t:{var s=void 0;if(e)for(var d=l.length-1;0<=d;d--){var g=l[d],S=g.instance,U=g.currentTarget;if(g=g.listener,S!==s&&a.isPropagationStopped())break t;s=g,a.currentTarget=U;try{s(a)}catch(Z){ki(Z)}a.currentTarget=null,s=S}else for(d=0;d<l.length;d++){if(g=l[d],S=g.instance,U=g.currentTarget,g=g.listener,S!==s&&a.isPropagationStopped())break t;s=g,a.currentTarget=U;try{s(a)}catch(Z){ki(Z)}a.currentTarget=null,s=S}}}}function yt(t,e){var n=e[Ac];n===void 0&&(n=e[Ac]=new Set);var l=t+"__bubble";n.has(l)||(Qd(e,t,2,!1),n.add(l))}function af(t,e,n){var l=0;e&&(l|=4),Qd(n,t,l,e)}var Hu="_reactListening"+Math.random().toString(36).slice(2);function uf(t){if(!t[Hu]){t[Hu]=!0,Rr.forEach(function(n){n!=="selectionchange"&&(Yg.has(n)||af(n,!1,t),af(n,!0,t))});var e=t.nodeType===9?t:t.ownerDocument;e===null||e[Hu]||(e[Hu]=!0,af("selectionchange",!1,e))}}function Qd(t,e,n,l){switch(o1(e)){case 2:var a=dA;break;case 8:a=hA;break;default:a=xf}n=a.bind(null,e,n,t),a=void 0,!Cc||e!=="touchstart"&&e!=="touchmove"&&e!=="wheel"||(a=!0),l?a!==void 0?t.addEventListener(e,n,{capture:!0,passive:a}):t.addEventListener(e,n,!0):a!==void 0?t.addEventListener(e,n,{passive:a}):t.addEventListener(e,n,!1)}function cf(t,e,n,l,a){var s=l;if((e&1)===0&&(e&2)===0&&l!==null)t:for(;;){if(l===null)return;var d=l.tag;if(d===3||d===4){var g=l.stateNode.containerInfo;if(g===a)break;if(d===4)for(d=l.return;d!==null;){var S=d.tag;if((S===3||S===4)&&d.stateNode.containerInfo===a)return;d=d.return}for(;g!==null;){if(d=Ul(g),d===null)return;if(S=d.tag,S===5||S===6||S===26||S===27){l=s=d;continue t}g=g.parentNode}}l=l.return}Gr(function(){var U=s,Z=Sc(n),J=[];t:{var Q=m0.get(t);if(Q!==void 0){var G=Ii,lt=t;switch(t){case"keypress":if(Vi(n)===0)break t;case"keydown":case"keyup":G=jm;break;case"focusin":lt="focus",G=wc;break;case"focusout":lt="blur",G=wc;break;case"beforeblur":case"afterblur":G=wc;break;case"click":if(n.button===2)break t;case"auxclick":case"dblclick":case"mousedown":case"mousemove":case"mouseup":case"mouseout":case"mouseover":case"contextmenu":G=Zr;break;case"drag":case"dragend":case"dragenter":case"dragexit":case"dragleave":case"dragover":case"dragstart":case"drop":G=Em;break;case"touchcancel":case"touchend":case"touchmove":case"touchstart":G=Bm;break;case r0:case o0:case d0:G=bm;break;case h0:G=Qm;break;case"scroll":case"scrollend":G=vm;break;case"wheel":G=Ym;break;case"copy":case"cut":case"paste":G=Tm;break;case"gotpointercapture":case"lostpointercapture":case"pointercancel":case"pointerdown":case"pointermove":case"pointerout":case"pointerover":case"pointerup":G=qr;break;case"toggle":case"beforetoggle":G=Gm}var ft=(e&4)!==0,Mt=!ft&&(t==="scroll"||t==="scrollend"),w=ft?Q!==null?Q+"Capture":null:Q;ft=[];for(var O=U,B;O!==null;){var K=O;if(B=K.stateNode,K=K.tag,K!==5&&K!==26&&K!==27||B===null||w===null||(K=Ma(O,w),K!=null&&ft.push(fi(O,K,B))),Mt)break;O=O.return}0<ft.length&&(Q=new G(Q,lt,null,n,Z),J.push({event:Q,listeners:ft}))}}if((e&7)===0){t:{if(Q=t==="mouseover"||t==="pointerover",G=t==="mouseout"||t==="pointerout",Q&&n!==bc&&(lt=n.relatedTarget||n.fromElement)&&(Ul(lt)||lt[Bl]))break t;if((G||Q)&&(Q=Z.window===Z?Z:(Q=Z.ownerDocument)?Q.defaultView||Q.parentWindow:window,G?(lt=n.relatedTarget||n.toElement,G=U,lt=lt?Ul(lt):null,lt!==null&&(Mt=o(lt),ft=lt.tag,lt!==Mt||ft!==5&&ft!==27&&ft!==6)&&(lt=null)):(G=null,lt=U),G!==lt)){if(ft=Zr,K="onMouseLeave",w="onMouseEnter",O="mouse",(t==="pointerout"||t==="pointerover")&&(ft=qr,K="onPointerLeave",w="onPointerEnter",O="pointer"),Mt=G==null?Q:wa(G),B=lt==null?Q:wa(lt),Q=new ft(K,O+"leave",G,n,Z),Q.target=Mt,Q.relatedTarget=B,K=null,Ul(Z)===U&&(ft=new ft(w,O+"enter",lt,n,Z),ft.target=B,ft.relatedTarget=Mt,K=ft),Mt=K,G&&lt)e:{for(ft=Lg,w=G,O=lt,B=0,K=w;K;K=ft(K))B++;K=0;for(var ct=O;ct;ct=ft(ct))K++;for(;0<B-K;)w=ft(w),B--;for(;0<K-B;)O=ft(O),K--;for(;B--;){if(w===O||O!==null&&w===O.alternate){ft=w;break e}w=ft(w),O=ft(O)}ft=null}else ft=null;G!==null&&zd(J,Q,G,ft,!1),lt!==null&&Mt!==null&&zd(J,Mt,lt,ft,!0)}}t:{if(Q=U?wa(U):window,G=Q.nodeName&&Q.nodeName.toLowerCase(),G==="select"||G==="input"&&Q.type==="file")var St=$r;else if(_r(Q))if(t0)St=Wm;else{St=Jm;var at=km}else G=Q.nodeName,!G||G.toLowerCase()!=="input"||Q.type!=="checkbox"&&Q.type!=="radio"?U&&xc(U.elementType)&&(St=$r):St=Fm;if(St&&(St=St(t,U))){Pr(J,St,n,Z);break t}at&&at(t,Q,U),t==="focusout"&&U&&Q.type==="number"&&U.memoizedProps.value!=null&&pc(Q,"number",Q.value)}switch(at=U?wa(U):window,t){case"focusin":(_r(at)||at.contentEditable==="true")&&(Il=at,Uc=U,Ya=null);break;case"focusout":Ya=Uc=Il=null;break;case"mousedown":Qc=!0;break;case"contextmenu":case"mouseup":case"dragend":Qc=!1,s0(J,n,Z);break;case"selectionchange":if(Pm)break;case"keydown":case"keyup":s0(J,n,Z)}var At;if(jc)t:{switch(t){case"compositionstart":var pt="onCompositionStart";break t;case"compositionend":pt="onCompositionEnd";break t;case"compositionupdate":pt="onCompositionUpdate";break t}pt=void 0}else Zl?Fr(t,n)&&(pt="onCompositionEnd"):t==="keydown"&&n.keyCode===229&&(pt="onCompositionStart");pt&&(Kr&&n.locale!=="ko"&&(Zl||pt!=="onCompositionStart"?pt==="onCompositionEnd"&&Zl&&(At=Xr()):(Rn=Z,Oc="value"in Rn?Rn.value:Rn.textContent,Zl=!0)),at=Bu(U,pt),0<at.length&&(pt=new Ir(pt,t,null,n,Z),J.push({event:pt,listeners:at}),At?pt.data=At:(At=Wr(n),At!==null&&(pt.data=At)))),(At=Vm?Zm(t,n):Im(t,n))&&(pt=Bu(U,"onBeforeInput"),0<pt.length&&(at=new Ir("onBeforeInput","beforeinput",null,n,Z),J.push({event:at,listeners:pt}),at.data=At)),Ug(J,t,U,n,Z)}Ud(J,e)})}function fi(t,e,n){return{instance:t,listener:e,currentTarget:n}}function Bu(t,e){for(var n=e+"Capture",l=[];t!==null;){var a=t,s=a.stateNode;if(a=a.tag,a!==5&&a!==26&&a!==27||s===null||(a=Ma(t,n),a!=null&&l.unshift(fi(t,a,s)),a=Ma(t,e),a!=null&&l.push(fi(t,a,s))),t.tag===3)return l;t=t.return}return[]}function Lg(t){if(t===null)return null;do t=t.return;while(t&&t.tag!==5&&t.tag!==27);return t||null}function zd(t,e,n,l,a){for(var s=e._reactName,d=[];n!==null&&n!==l;){var g=n,S=g.alternate,U=g.stateNode;if(g=g.tag,S!==null&&S===l)break;g!==5&&g!==26&&g!==27||U===null||(S=U,a?(U=Ma(n,s),U!=null&&d.unshift(fi(n,U,S))):a||(U=Ma(n,s),U!=null&&d.push(fi(n,U,S)))),n=n.return}d.length!==0&&t.push({event:e,listeners:d})}var Gg=/\r\n?/g,Xg=/\u0000|\uFFFD/g;function Yd(t){return(typeof t=="string"?t:""+t).replace(Gg,`
+`).replace(Xg,"")}function Ld(t,e){return e=Yd(e),Yd(t)===e}function wt(t,e,n,l,a,s){switch(n){case"children":typeof l=="string"?e==="body"||e==="textarea"&&l===""||Gl(t,l):(typeof l=="number"||typeof l=="bigint")&&e!=="body"&&Gl(t,""+l);break;case"className":Yi(t,"class",l);break;case"tabIndex":Yi(t,"tabindex",l);break;case"dir":case"role":case"viewBox":case"width":case"height":Yi(t,n,l);break;case"style":Yr(t,l,s);break;case"data":if(e!=="object"){Yi(t,"data",l);break}case"src":case"href":if(l===""&&(e!=="a"||n!=="href")){t.removeAttribute(n);break}if(l==null||typeof l=="function"||typeof l=="symbol"||typeof l=="boolean"){t.removeAttribute(n);break}l=Gi(""+l),t.setAttribute(n,l);break;case"action":case"formAction":if(typeof l=="function"){t.setAttribute(n,"javascript:throw new Error('A React form was unexpectedly submitted. If you called form.submit() manually, consider using form.requestSubmit() instead. If you\\'re trying to use event.stopPropagation() in a submit event handler, consider also calling event.preventDefault().')");break}else typeof s=="function"&&(n==="formAction"?(e!=="input"&&wt(t,e,"name",a.name,a,null),wt(t,e,"formEncType",a.formEncType,a,null),wt(t,e,"formMethod",a.formMethod,a,null),wt(t,e,"formTarget",a.formTarget,a,null)):(wt(t,e,"encType",a.encType,a,null),wt(t,e,"method",a.method,a,null),wt(t,e,"target",a.target,a,null)));if(l==null||typeof l=="symbol"||typeof l=="boolean"){t.removeAttribute(n);break}l=Gi(""+l),t.setAttribute(n,l);break;case"onClick":l!=null&&(t.onclick=tn);break;case"onScroll":l!=null&&yt("scroll",t);break;case"onScrollEnd":l!=null&&yt("scrollend",t);break;case"dangerouslySetInnerHTML":if(l!=null){if(typeof l!="object"||!("__html"in l))throw Error(f(61));if(n=l.__html,n!=null){if(a.children!=null)throw Error(f(60));t.innerHTML=n}}break;case"multiple":t.multiple=l&&typeof l!="function"&&typeof l!="symbol";break;case"muted":t.muted=l&&typeof l!="function"&&typeof l!="symbol";break;case"suppressContentEditableWarning":case"suppressHydrationWarning":case"defaultValue":case"defaultChecked":case"innerHTML":case"ref":break;case"autoFocus":break;case"xlinkHref":if(l==null||typeof l=="function"||typeof l=="boolean"||typeof l=="symbol"){t.removeAttribute("xlink:href");break}n=Gi(""+l),t.setAttributeNS("http://www.w3.org/1999/xlink","xlink:href",n);break;case"contentEditable":case"spellCheck":case"draggable":case"value":case"autoReverse":case"externalResourcesRequired":case"focusable":case"preserveAlpha":l!=null&&typeof l!="function"&&typeof l!="symbol"?t.setAttribute(n,""+l):t.removeAttribute(n);break;case"inert":case"allowFullScreen":case"async":case"autoPlay":case"controls":case"default":case"defer":case"disabled":case"disablePictureInPicture":case"disableRemotePlayback":case"formNoValidate":case"hidden":case"loop":case"noModule":case"noValidate":case"open":case"playsInline":case"readOnly":case"required":case"reversed":case"scoped":case"seamless":case"itemScope":l&&typeof l!="function"&&typeof l!="symbol"?t.setAttribute(n,""):t.removeAttribute(n);break;case"capture":case"download":l===!0?t.setAttribute(n,""):l!==!1&&l!=null&&typeof l!="function"&&typeof l!="symbol"?t.setAttribute(n,l):t.removeAttribute(n);break;case"cols":case"rows":case"size":case"span":l!=null&&typeof l!="function"&&typeof l!="symbol"&&!isNaN(l)&&1<=l?t.setAttribute(n,l):t.removeAttribute(n);break;case"rowSpan":case"start":l==null||typeof l=="function"||typeof l=="symbol"||isNaN(l)?t.removeAttribute(n):t.setAttribute(n,l);break;case"popover":yt("beforetoggle",t),yt("toggle",t),zi(t,"popover",l);break;case"xlinkActuate":$e(t,"http://www.w3.org/1999/xlink","xlink:actuate",l);break;case"xlinkArcrole":$e(t,"http://www.w3.org/1999/xlink","xlink:arcrole",l);break;case"xlinkRole":$e(t,"http://www.w3.org/1999/xlink","xlink:role",l);break;case"xlinkShow":$e(t,"http://www.w3.org/1999/xlink","xlink:show",l);break;case"xlinkTitle":$e(t,"http://www.w3.org/1999/xlink","xlink:title",l);break;case"xlinkType":$e(t,"http://www.w3.org/1999/xlink","xlink:type",l);break;case"xmlBase":$e(t,"http://www.w3.org/XML/1998/namespace","xml:base",l);break;case"xmlLang":$e(t,"http://www.w3.org/XML/1998/namespace","xml:lang",l);break;case"xmlSpace":$e(t,"http://www.w3.org/XML/1998/namespace","xml:space",l);break;case"is":zi(t,"is",l);break;case"innerText":case"textContent":break;default:(!(2<n.length)||n[0]!=="o"&&n[0]!=="O"||n[1]!=="n"&&n[1]!=="N")&&(n=gm.get(n)||n,zi(t,n,l))}}function sf(t,e,n,l,a,s){switch(n){case"style":Yr(t,l,s);break;case"dangerouslySetInnerHTML":if(l!=null){if(typeof l!="object"||!("__html"in l))throw Error(f(61));if(n=l.__html,n!=null){if(a.children!=null)throw Error(f(60));t.innerHTML=n}}break;case"children":typeof l=="string"?Gl(t,l):(typeof l=="number"||typeof l=="bigint")&&Gl(t,""+l);break;case"onScroll":l!=null&&yt("scroll",t);break;case"onScrollEnd":l!=null&&yt("scrollend",t);break;case"onClick":l!=null&&(t.onclick=tn);break;case"suppressContentEditableWarning":case"suppressHydrationWarning":case"innerHTML":case"ref":break;case"innerText":case"textContent":break;default:if(!wr.hasOwnProperty(n))t:{if(n[0]==="o"&&n[1]==="n"&&(a=n.endsWith("Capture"),e=n.slice(2,a?n.length-7:void 0),s=t[oe]||null,s=s!=null?s[n]:null,typeof s=="function"&&t.removeEventListener(e,s,a),typeof l=="function")){typeof s!="function"&&s!==null&&(n in t?t[n]=null:t.hasAttribute(n)&&t.removeAttribute(n)),t.addEventListener(e,l,a);break t}n in t?t[n]=l:l===!0?t.setAttribute(n,""):zi(t,n,l)}}}function ae(t,e,n){switch(e){case"div":case"span":case"svg":case"path":case"a":case"g":case"p":case"li":break;case"img":yt("error",t),yt("load",t);var l=!1,a=!1,s;for(s in n)if(n.hasOwnProperty(s)){var d=n[s];if(d!=null)switch(s){case"src":l=!0;break;case"srcSet":a=!0;break;case"children":case"dangerouslySetInnerHTML":throw Error(f(137,e));default:wt(t,e,s,d,n,null)}}a&&wt(t,e,"srcSet",n.srcSet,n,null),l&&wt(t,e,"src",n.src,n,null);return;case"input":yt("invalid",t);var g=s=d=a=null,S=null,U=null;for(l in n)if(n.hasOwnProperty(l)){var Z=n[l];if(Z!=null)switch(l){case"name":a=Z;break;case"type":d=Z;break;case"checked":S=Z;break;case"defaultChecked":U=Z;break;case"value":s=Z;break;case"defaultValue":g=Z;break;case"children":case"dangerouslySetInnerHTML":if(Z!=null)throw Error(f(137,e));break;default:wt(t,e,l,Z,n,null)}}Br(t,s,g,S,U,d,a,!1);return;case"select":yt("invalid",t),l=d=s=null;for(a in n)if(n.hasOwnProperty(a)&&(g=n[a],g!=null))switch(a){case"value":s=g;break;case"defaultValue":d=g;break;case"multiple":l=g;default:wt(t,e,a,g,n,null)}e=s,n=d,t.multiple=!!l,e!=null?Ll(t,!!l,e,!1):n!=null&&Ll(t,!!l,n,!0);return;case"textarea":yt("invalid",t),s=a=l=null;for(d in n)if(n.hasOwnProperty(d)&&(g=n[d],g!=null))switch(d){case"value":l=g;break;case"defaultValue":a=g;break;case"children":s=g;break;case"dangerouslySetInnerHTML":if(g!=null)throw Error(f(91));break;default:wt(t,e,d,g,n,null)}Qr(t,l,a,s);return;case"option":for(S in n)if(n.hasOwnProperty(S)&&(l=n[S],l!=null))switch(S){case"selected":t.selected=l&&typeof l!="function"&&typeof l!="symbol";break;default:wt(t,e,S,l,n,null)}return;case"dialog":yt("beforetoggle",t),yt("toggle",t),yt("cancel",t),yt("close",t);break;case"iframe":case"object":yt("load",t);break;case"video":case"audio":for(l=0;l<si.length;l++)yt(si[l],t);break;case"image":yt("error",t),yt("load",t);break;case"details":yt("toggle",t);break;case"embed":case"source":case"link":yt("error",t),yt("load",t);case"area":case"base":case"br":case"col":case"hr":case"keygen":case"meta":case"param":case"track":case"wbr":case"menuitem":for(U in n)if(n.hasOwnProperty(U)&&(l=n[U],l!=null))switch(U){case"children":case"dangerouslySetInnerHTML":throw Error(f(137,e));default:wt(t,e,U,l,n,null)}return;default:if(xc(e)){for(Z in n)n.hasOwnProperty(Z)&&(l=n[Z],l!==void 0&&sf(t,e,Z,l,n,void 0));return}}for(g in n)n.hasOwnProperty(g)&&(l=n[g],l!=null&&wt(t,e,g,l,n,null))}function Vg(t,e,n,l){switch(e){case"div":case"span":case"svg":case"path":case"a":case"g":case"p":case"li":break;case"input":var a=null,s=null,d=null,g=null,S=null,U=null,Z=null;for(G in n){var J=n[G];if(n.hasOwnProperty(G)&&J!=null)switch(G){case"checked":break;case"value":break;case"defaultValue":S=J;default:l.hasOwnProperty(G)||wt(t,e,G,null,l,J)}}for(var Q in l){var G=l[Q];if(J=n[Q],l.hasOwnProperty(Q)&&(G!=null||J!=null))switch(Q){case"type":s=G;break;case"name":a=G;break;case"checked":U=G;break;case"defaultChecked":Z=G;break;case"value":d=G;break;case"defaultValue":g=G;break;case"children":case"dangerouslySetInnerHTML":if(G!=null)throw Error(f(137,e));break;default:G!==J&&wt(t,e,Q,G,l,J)}}Ec(t,d,g,S,U,Z,s,a);return;case"select":G=d=g=Q=null;for(s in n)if(S=n[s],n.hasOwnProperty(s)&&S!=null)switch(s){case"value":break;case"multiple":G=S;default:l.hasOwnProperty(s)||wt(t,e,s,null,l,S)}for(a in l)if(s=l[a],S=n[a],l.hasOwnProperty(a)&&(s!=null||S!=null))switch(a){case"value":Q=s;break;case"defaultValue":g=s;break;case"multiple":d=s;default:s!==S&&wt(t,e,a,s,l,S)}e=g,n=d,l=G,Q!=null?Ll(t,!!n,Q,!1):!!l!=!!n&&(e!=null?Ll(t,!!n,e,!0):Ll(t,!!n,n?[]:"",!1));return;case"textarea":G=Q=null;for(g in n)if(a=n[g],n.hasOwnProperty(g)&&a!=null&&!l.hasOwnProperty(g))switch(g){case"value":break;case"children":break;default:wt(t,e,g,null,l,a)}for(d in l)if(a=l[d],s=n[d],l.hasOwnProperty(d)&&(a!=null||s!=null))switch(d){case"value":Q=a;break;case"defaultValue":G=a;break;case"children":break;case"dangerouslySetInnerHTML":if(a!=null)throw Error(f(91));break;default:a!==s&&wt(t,e,d,a,l,s)}Ur(t,Q,G);return;case"option":for(var lt in n)if(Q=n[lt],n.hasOwnProperty(lt)&&Q!=null&&!l.hasOwnProperty(lt))switch(lt){case"selected":t.selected=!1;break;default:wt(t,e,lt,null,l,Q)}for(S in l)if(Q=l[S],G=n[S],l.hasOwnProperty(S)&&Q!==G&&(Q!=null||G!=null))switch(S){case"selected":t.selected=Q&&typeof Q!="function"&&typeof Q!="symbol";break;default:wt(t,e,S,Q,l,G)}return;case"img":case"link":case"area":case"base":case"br":case"col":case"embed":case"hr":case"keygen":case"meta":case"param":case"source":case"track":case"wbr":case"menuitem":for(var ft in n)Q=n[ft],n.hasOwnProperty(ft)&&Q!=null&&!l.hasOwnProperty(ft)&&wt(t,e,ft,null,l,Q);for(U in l)if(Q=l[U],G=n[U],l.hasOwnProperty(U)&&Q!==G&&(Q!=null||G!=null))switch(U){case"children":case"dangerouslySetInnerHTML":if(Q!=null)throw Error(f(137,e));break;default:wt(t,e,U,Q,l,G)}return;default:if(xc(e)){for(var Mt in n)Q=n[Mt],n.hasOwnProperty(Mt)&&Q!==void 0&&!l.hasOwnProperty(Mt)&&sf(t,e,Mt,void 0,l,Q);for(Z in l)Q=l[Z],G=n[Z],!l.hasOwnProperty(Z)||Q===G||Q===void 0&&G===void 0||sf(t,e,Z,Q,l,G);return}}for(var w in n)Q=n[w],n.hasOwnProperty(w)&&Q!=null&&!l.hasOwnProperty(w)&&wt(t,e,w,null,l,Q);for(J in l)Q=l[J],G=n[J],!l.hasOwnProperty(J)||Q===G||Q==null&&G==null||wt(t,e,J,Q,l,G)}function Gd(t){switch(t){case"css":case"script":case"font":case"img":case"image":case"input":case"link":return!0;default:return!1}}function Zg(){if(typeof performance.getEntriesByType=="function"){for(var t=0,e=0,n=performance.getEntriesByType("resource"),l=0;l<n.length;l++){var a=n[l],s=a.transferSize,d=a.initiatorType,g=a.duration;if(s&&g&&Gd(d)){for(d=0,g=a.responseEnd,l+=1;l<n.length;l++){var S=n[l],U=S.startTime;if(U>g)break;var Z=S.transferSize,J=S.initiatorType;Z&&Gd(J)&&(S=S.responseEnd,d+=Z*(S<g?1:(g-U)/(S-U)))}if(--l,e+=8*(s+d)/(a.duration/1e3),t++,10<t)break}}if(0<t)return e/t/1e6}return navigator.connection&&(t=navigator.connection.downlink,typeof t=="number")?t:5}var ff=null,rf=null;function Uu(t){return t.nodeType===9?t:t.ownerDocument}function Xd(t){switch(t){case"http://www.w3.org/2000/svg":return 1;case"http://www.w3.org/1998/Math/MathML":return 2;default:return 0}}function Vd(t,e){if(t===0)switch(e){case"svg":return 1;case"math":return 2;default:return 0}return t===1&&e==="foreignObject"?0:t}function of(t,e){return t==="textarea"||t==="noscript"||typeof e.children=="string"||typeof e.children=="number"||typeof e.children=="bigint"||typeof e.dangerouslySetInnerHTML=="object"&&e.dangerouslySetInnerHTML!==null&&e.dangerouslySetInnerHTML.__html!=null}var df=null;function Ig(){var t=window.event;return t&&t.type==="popstate"?t===df?!1:(df=t,!0):(df=null,!1)}var Zd=typeof setTimeout=="function"?setTimeout:void 0,qg=typeof clearTimeout=="function"?clearTimeout:void 0,Id=typeof Promise=="function"?Promise:void 0,Kg=typeof queueMicrotask=="function"?queueMicrotask:typeof Id<"u"?function(t){return Id.resolve(null).then(t).catch(kg)}:Zd;function kg(t){setTimeout(function(){throw t})}function qn(t){return t==="head"}function qd(t,e){var n=e,l=0;do{var a=n.nextSibling;if(t.removeChild(n),a&&a.nodeType===8)if(n=a.data,n==="/$"||n==="/&"){if(l===0){t.removeChild(a),va(e);return}l--}else if(n==="$"||n==="$?"||n==="$~"||n==="$!"||n==="&")l++;else if(n==="html")ri(t.ownerDocument.documentElement);else if(n==="head"){n=t.ownerDocument.head,ri(n);for(var s=n.firstChild;s;){var d=s.nextSibling,g=s.nodeName;s[Ra]||g==="SCRIPT"||g==="STYLE"||g==="LINK"&&s.rel.toLowerCase()==="stylesheet"||n.removeChild(s),s=d}}else n==="body"&&ri(t.ownerDocument.body);n=a}while(n);va(e)}function Kd(t,e){var n=t;t=0;do{var l=n.nextSibling;if(n.nodeType===1?e?(n._stashedDisplay=n.style.display,n.style.display="none"):(n.style.display=n._stashedDisplay||"",n.getAttribute("style")===""&&n.removeAttribute("style")):n.nodeType===3&&(e?(n._stashedText=n.nodeValue,n.nodeValue=""):n.nodeValue=n._stashedText||""),l&&l.nodeType===8)if(n=l.data,n==="/$"){if(t===0)break;t--}else n!=="$"&&n!=="$?"&&n!=="$~"&&n!=="$!"||t++;n=l}while(n)}function hf(t){var e=t.firstChild;for(e&&e.nodeType===10&&(e=e.nextSibling);e;){var n=e;switch(e=e.nextSibling,n.nodeName){case"HTML":case"HEAD":case"BODY":hf(n),vc(n);continue;case"SCRIPT":case"STYLE":continue;case"LINK":if(n.rel.toLowerCase()==="stylesheet")continue}t.removeChild(n)}}function Jg(t,e,n,l){for(;t.nodeType===1;){var a=n;if(t.nodeName.toLowerCase()!==e.toLowerCase()){if(!l&&(t.nodeName!=="INPUT"||t.type!=="hidden"))break}else if(l){if(!t[Ra])switch(e){case"meta":if(!t.hasAttribute("itemprop"))break;return t;case"link":if(s=t.getAttribute("rel"),s==="stylesheet"&&t.hasAttribute("data-precedence"))break;if(s!==a.rel||t.getAttribute("href")!==(a.href==null||a.href===""?null:a.href)||t.getAttribute("crossorigin")!==(a.crossOrigin==null?null:a.crossOrigin)||t.getAttribute("title")!==(a.title==null?null:a.title))break;return t;case"style":if(t.hasAttribute("data-precedence"))break;return t;case"script":if(s=t.getAttribute("src"),(s!==(a.src==null?null:a.src)||t.getAttribute("type")!==(a.type==null?null:a.type)||t.getAttribute("crossorigin")!==(a.crossOrigin==null?null:a.crossOrigin))&&s&&t.hasAttribute("async")&&!t.hasAttribute("itemprop"))break;return t;default:return t}}else if(e==="input"&&t.type==="hidden"){var s=a.name==null?null:""+a.name;if(a.type==="hidden"&&t.getAttribute("name")===s)return t}else return t;if(t=Le(t.nextSibling),t===null)break}return null}function Fg(t,e,n){if(e==="")return null;for(;t.nodeType!==3;)if((t.nodeType!==1||t.nodeName!=="INPUT"||t.type!=="hidden")&&!n||(t=Le(t.nextSibling),t===null))return null;return t}function kd(t,e){for(;t.nodeType!==8;)if((t.nodeType!==1||t.nodeName!=="INPUT"||t.type!=="hidden")&&!e||(t=Le(t.nextSibling),t===null))return null;return t}function mf(t){return t.data==="$?"||t.data==="$~"}function gf(t){return t.data==="$!"||t.data==="$?"&&t.ownerDocument.readyState!=="loading"}function Wg(t,e){var n=t.ownerDocument;if(t.data==="$~")t._reactRetry=e;else if(t.data!=="$?"||n.readyState!=="loading")e();else{var l=function(){e(),n.removeEventListener("DOMContentLoaded",l)};n.addEventListener("DOMContentLoaded",l),t._reactRetry=l}}function Le(t){for(;t!=null;t=t.nextSibling){var e=t.nodeType;if(e===1||e===3)break;if(e===8){if(e=t.data,e==="$"||e==="$!"||e==="$?"||e==="$~"||e==="&"||e==="F!"||e==="F")break;if(e==="/$"||e==="/&")return null}}return t}var Af=null;function Jd(t){t=t.nextSibling;for(var e=0;t;){if(t.nodeType===8){var n=t.data;if(n==="/$"||n==="/&"){if(e===0)return Le(t.nextSibling);e--}else n!=="$"&&n!=="$!"&&n!=="$?"&&n!=="$~"&&n!=="&"||e++}t=t.nextSibling}return null}function Fd(t){t=t.previousSibling;for(var e=0;t;){if(t.nodeType===8){var n=t.data;if(n==="$"||n==="$!"||n==="$?"||n==="$~"||n==="&"){if(e===0)return t;e--}else n!=="/$"&&n!=="/&"||e++}t=t.previousSibling}return null}function Wd(t,e,n){switch(e=Uu(n),t){case"html":if(t=e.documentElement,!t)throw Error(f(452));return t;case"head":if(t=e.head,!t)throw Error(f(453));return t;case"body":if(t=e.body,!t)throw Error(f(454));return t;default:throw Error(f(451))}}function ri(t){for(var e=t.attributes;e.length;)t.removeAttributeNode(e[0]);vc(t)}var Ge=new Map,_d=new Set;function Qu(t){return typeof t.getRootNode=="function"?t.getRootNode():t.nodeType===9?t:t.ownerDocument}var vn=_.d;_.d={f:_g,r:Pg,D:$g,C:tA,L:eA,m:nA,X:aA,S:lA,M:iA};function _g(){var t=vn.f(),e=Du();return t||e}function Pg(t){var e=Ql(t);e!==null&&e.tag===5&&e.type==="form"?mo(e):vn.r(t)}var ma=typeof document>"u"?null:document;function Pd(t,e,n){var l=ma;if(l&&typeof e=="string"&&e){var a=Ne(e);a='link[rel="'+t+'"][href="'+a+'"]',typeof n=="string"&&(a+='[crossorigin="'+n+'"]'),_d.has(a)||(_d.add(a),t={rel:t,crossOrigin:n,href:e},l.querySelector(a)===null&&(e=l.createElement("link"),ae(e,"link",t),Ft(e),l.head.appendChild(e)))}}function $g(t){vn.D(t),Pd("dns-prefetch",t,null)}function tA(t,e){vn.C(t,e),Pd("preconnect",t,e)}function eA(t,e,n){vn.L(t,e,n);var l=ma;if(l&&t&&e){var a='link[rel="preload"][as="'+Ne(e)+'"]';e==="image"&&n&&n.imageSrcSet?(a+='[imagesrcset="'+Ne(n.imageSrcSet)+'"]',typeof n.imageSizes=="string"&&(a+='[imagesizes="'+Ne(n.imageSizes)+'"]')):a+='[href="'+Ne(t)+'"]';var s=a;switch(e){case"style":s=ga(t);break;case"script":s=Aa(t)}Ge.has(s)||(t=T({rel:"preload",href:e==="image"&&n&&n.imageSrcSet?void 0:t,as:e},n),Ge.set(s,t),l.querySelector(a)!==null||e==="style"&&l.querySelector(oi(s))||e==="script"&&l.querySelector(di(s))||(e=l.createElement("link"),ae(e,"link",t),Ft(e),l.head.appendChild(e)))}}function nA(t,e){vn.m(t,e);var n=ma;if(n&&t){var l=e&&typeof e.as=="string"?e.as:"script",a='link[rel="modulepreload"][as="'+Ne(l)+'"][href="'+Ne(t)+'"]',s=a;switch(l){case"audioworklet":case"paintworklet":case"serviceworker":case"sharedworker":case"worker":case"script":s=Aa(t)}if(!Ge.has(s)&&(t=T({rel:"modulepreload",href:t},e),Ge.set(s,t),n.querySelector(a)===null)){switch(l){case"audioworklet":case"paintworklet":case"serviceworker":case"sharedworker":case"worker":case"script":if(n.querySelector(di(s)))return}l=n.createElement("link"),ae(l,"link",t),Ft(l),n.head.appendChild(l)}}}function lA(t,e,n){vn.S(t,e,n);var l=ma;if(l&&t){var a=zl(l).hoistableStyles,s=ga(t);e=e||"default";var d=a.get(s);if(!d){var g={loading:0,preload:null};if(d=l.querySelector(oi(s)))g.loading=5;else{t=T({rel:"stylesheet",href:t,"data-precedence":e},n),(n=Ge.get(s))&&vf(t,n);var S=d=l.createElement("link");Ft(S),ae(S,"link",t),S._p=new Promise(function(U,Z){S.onload=U,S.onerror=Z}),S.addEventListener("load",function(){g.loading|=1}),S.addEventListener("error",function(){g.loading|=2}),g.loading|=4,zu(d,e,l)}d={type:"stylesheet",instance:d,count:1,state:g},a.set(s,d)}}}function aA(t,e){vn.X(t,e);var n=ma;if(n&&t){var l=zl(n).hoistableScripts,a=Aa(t),s=l.get(a);s||(s=n.querySelector(di(a)),s||(t=T({src:t,async:!0},e),(e=Ge.get(a))&&yf(t,e),s=n.createElement("script"),Ft(s),ae(s,"link",t),n.head.appendChild(s)),s={type:"script",instance:s,count:1,state:null},l.set(a,s))}}function iA(t,e){vn.M(t,e);var n=ma;if(n&&t){var l=zl(n).hoistableScripts,a=Aa(t),s=l.get(a);s||(s=n.querySelector(di(a)),s||(t=T({src:t,async:!0,type:"module"},e),(e=Ge.get(a))&&yf(t,e),s=n.createElement("script"),Ft(s),ae(s,"link",t),n.head.appendChild(s)),s={type:"script",instance:s,count:1,state:null},l.set(a,s))}}function $d(t,e,n,l){var a=(a=ot.current)?Qu(a):null;if(!a)throw Error(f(446));switch(t){case"meta":case"title":return null;case"style":return typeof n.precedence=="string"&&typeof n.href=="string"?(e=ga(n.href),n=zl(a).hoistableStyles,l=n.get(e),l||(l={type:"style",instance:null,count:0,state:null},n.set(e,l)),l):{type:"void",instance:null,count:0,state:null};case"link":if(n.rel==="stylesheet"&&typeof n.href=="string"&&typeof n.precedence=="string"){t=ga(n.href);var s=zl(a).hoistableStyles,d=s.get(t);if(d||(a=a.ownerDocument||a,d={type:"stylesheet",instance:null,count:0,state:{loading:0,preload:null}},s.set(t,d),(s=a.querySelector(oi(t)))&&!s._p&&(d.instance=s,d.state.loading=5),Ge.has(t)||(n={rel:"preload",as:"style",href:n.href,crossOrigin:n.crossOrigin,integrity:n.integrity,media:n.media,hrefLang:n.hrefLang,referrerPolicy:n.referrerPolicy},Ge.set(t,n),s||uA(a,t,n,d.state))),e&&l===null)throw Error(f(528,""));return d}if(e&&l!==null)throw Error(f(529,""));return null;case"script":return e=n.async,n=n.src,typeof n=="string"&&e&&typeof e!="function"&&typeof e!="symbol"?(e=Aa(n),n=zl(a).hoistableScripts,l=n.get(e),l||(l={type:"script",instance:null,count:0,state:null},n.set(e,l)),l):{type:"void",instance:null,count:0,state:null};default:throw Error(f(444,t))}}function ga(t){return'href="'+Ne(t)+'"'}function oi(t){return'link[rel="stylesheet"]['+t+"]"}function t1(t){return T({},t,{"data-precedence":t.precedence,precedence:null})}function uA(t,e,n,l){t.querySelector('link[rel="preload"][as="style"]['+e+"]")?l.loading=1:(e=t.createElement("link"),l.preload=e,e.addEventListener("load",function(){return l.loading|=1}),e.addEventListener("error",function(){return l.loading|=2}),ae(e,"link",n),Ft(e),t.head.appendChild(e))}function Aa(t){return'[src="'+Ne(t)+'"]'}function di(t){return"script[async]"+t}function e1(t,e,n){if(e.count++,e.instance===null)switch(e.type){case"style":var l=t.querySelector('style[data-href~="'+Ne(n.href)+'"]');if(l)return e.instance=l,Ft(l),l;var a=T({},n,{"data-href":n.href,"data-precedence":n.precedence,href:null,precedence:null});return l=(t.ownerDocument||t).createElement("style"),Ft(l),ae(l,"style",a),zu(l,n.precedence,t),e.instance=l;case"stylesheet":a=ga(n.href);var s=t.querySelector(oi(a));if(s)return e.state.loading|=4,e.instance=s,Ft(s),s;l=t1(n),(a=Ge.get(a))&&vf(l,a),s=(t.ownerDocument||t).createElement("link"),Ft(s);var d=s;return d._p=new Promise(function(g,S){d.onload=g,d.onerror=S}),ae(s,"link",l),e.state.loading|=4,zu(s,n.precedence,t),e.instance=s;case"script":return s=Aa(n.src),(a=t.querySelector(di(s)))?(e.instance=a,Ft(a),a):(l=n,(a=Ge.get(s))&&(l=T({},n),yf(l,a)),t=t.ownerDocument||t,a=t.createElement("script"),Ft(a),ae(a,"link",l),t.head.appendChild(a),e.instance=a);case"void":return null;default:throw Error(f(443,e.type))}else e.type==="stylesheet"&&(e.state.loading&4)===0&&(l=e.instance,e.state.loading|=4,zu(l,n.precedence,t));return e.instance}function zu(t,e,n){for(var l=n.querySelectorAll('link[rel="stylesheet"][data-precedence],style[data-precedence]'),a=l.length?l[l.length-1]:null,s=a,d=0;d<l.length;d++){var g=l[d];if(g.dataset.precedence===e)s=g;else if(s!==a)break}s?s.parentNode.insertBefore(t,s.nextSibling):(e=n.nodeType===9?n.head:n,e.insertBefore(t,e.firstChild))}function vf(t,e){t.crossOrigin==null&&(t.crossOrigin=e.crossOrigin),t.referrerPolicy==null&&(t.referrerPolicy=e.referrerPolicy),t.title==null&&(t.title=e.title)}function yf(t,e){t.crossOrigin==null&&(t.crossOrigin=e.crossOrigin),t.referrerPolicy==null&&(t.referrerPolicy=e.referrerPolicy),t.integrity==null&&(t.integrity=e.integrity)}var Yu=null;function n1(t,e,n){if(Yu===null){var l=new Map,a=Yu=new Map;a.set(n,l)}else a=Yu,l=a.get(n),l||(l=new Map,a.set(n,l));if(l.has(t))return l;for(l.set(t,null),n=n.getElementsByTagName(t),a=0;a<n.length;a++){var s=n[a];if(!(s[Ra]||s[te]||t==="link"&&s.getAttribute("rel")==="stylesheet")&&s.namespaceURI!=="http://www.w3.org/2000/svg"){var d=s.getAttribute(e)||"";d=t+d;var g=l.get(d);g?g.push(s):l.set(d,[s])}}return l}function l1(t,e,n){t=t.ownerDocument||t,t.head.insertBefore(n,e==="title"?t.querySelector("head > title"):null)}function cA(t,e,n){if(n===1||e.itemProp!=null)return!1;switch(t){case"meta":case"title":return!0;case"style":if(typeof e.precedence!="string"||typeof e.href!="string"||e.href==="")break;return!0;case"link":if(typeof e.rel!="string"||typeof e.href!="string"||e.href===""||e.onLoad||e.onError)break;switch(e.rel){case"stylesheet":return t=e.disabled,typeof e.precedence=="string"&&t==null;default:return!0}case"script":if(e.async&&typeof e.async!="function"&&typeof e.async!="symbol"&&!e.onLoad&&!e.onError&&e.src&&typeof e.src=="string")return!0}return!1}function a1(t){return!(t.type==="stylesheet"&&(t.state.loading&3)===0)}function sA(t,e,n,l){if(n.type==="stylesheet"&&(typeof l.media!="string"||matchMedia(l.media).matches!==!1)&&(n.state.loading&4)===0){if(n.instance===null){var a=ga(l.href),s=e.querySelector(oi(a));if(s){e=s._p,e!==null&&typeof e=="object"&&typeof e.then=="function"&&(t.count++,t=Lu.bind(t),e.then(t,t)),n.state.loading|=4,n.instance=s,Ft(s);return}s=e.ownerDocument||e,l=t1(l),(a=Ge.get(a))&&vf(l,a),s=s.createElement("link"),Ft(s);var d=s;d._p=new Promise(function(g,S){d.onload=g,d.onerror=S}),ae(s,"link",l),n.instance=s}t.stylesheets===null&&(t.stylesheets=new Map),t.stylesheets.set(n,e),(e=n.state.preload)&&(n.state.loading&3)===0&&(t.count++,n=Lu.bind(t),e.addEventListener("load",n),e.addEventListener("error",n))}}var Ef=0;function fA(t,e){return t.stylesheets&&t.count===0&&Xu(t,t.stylesheets),0<t.count||0<t.imgCount?function(n){var l=setTimeout(function(){if(t.stylesheets&&Xu(t,t.stylesheets),t.unsuspend){var s=t.unsuspend;t.unsuspend=null,s()}},6e4+e);0<t.imgBytes&&Ef===0&&(Ef=62500*Zg());var a=setTimeout(function(){if(t.waitingForImages=!1,t.count===0&&(t.stylesheets&&Xu(t,t.stylesheets),t.unsuspend)){var s=t.unsuspend;t.unsuspend=null,s()}},(t.imgBytes>Ef?50:800)+e);return t.unsuspend=n,function(){t.unsuspend=null,clearTimeout(l),clearTimeout(a)}}:null}function Lu(){if(this.count--,this.count===0&&(this.imgCount===0||!this.waitingForImages)){if(this.stylesheets)Xu(this,this.stylesheets);else if(this.unsuspend){var t=this.unsuspend;this.unsuspend=null,t()}}}var Gu=null;function Xu(t,e){t.stylesheets=null,t.unsuspend!==null&&(t.count++,Gu=new Map,e.forEach(rA,t),Gu=null,Lu.call(t))}function rA(t,e){if(!(e.state.loading&4)){var n=Gu.get(t);if(n)var l=n.get(null);else{n=new Map,Gu.set(t,n);for(var a=t.querySelectorAll("link[data-precedence],style[data-precedence]"),s=0;s<a.length;s++){var d=a[s];(d.nodeName==="LINK"||d.getAttribute("media")!=="not all")&&(n.set(d.dataset.precedence,d),l=d)}l&&n.set(null,l)}a=e.instance,d=a.getAttribute("data-precedence"),s=n.get(d)||l,s===l&&n.set(null,a),n.set(d,a),this.count++,l=Lu.bind(this),a.addEventListener("load",l),a.addEventListener("error",l),s?s.parentNode.insertBefore(a,s.nextSibling):(t=t.nodeType===9?t.head:t,t.insertBefore(a,t.firstChild)),e.state.loading|=4}}var hi={$$typeof:N,Provider:null,Consumer:null,_currentValue:$,_currentValue2:$,_threadCount:0};function oA(t,e,n,l,a,s,d,g,S){this.tag=1,this.containerInfo=t,this.pingCache=this.current=this.pendingChildren=null,this.timeoutHandle=-1,this.callbackNode=this.next=this.pendingContext=this.context=this.cancelPendingCommit=null,this.callbackPriority=0,this.expirationTimes=hc(-1),this.entangledLanes=this.shellSuspendCounter=this.errorRecoveryDisabledLanes=this.expiredLanes=this.warmLanes=this.pingedLanes=this.suspendedLanes=this.pendingLanes=0,this.entanglements=hc(0),this.hiddenUpdates=hc(null),this.identifierPrefix=l,this.onUncaughtError=a,this.onCaughtError=s,this.onRecoverableError=d,this.pooledCache=null,this.pooledCacheLanes=0,this.formState=S,this.incompleteTransitions=new Map}function i1(t,e,n,l,a,s,d,g,S,U,Z,J){return t=new oA(t,e,n,d,S,U,Z,J,g),e=1,s===!0&&(e|=24),s=Te(3,null,null,e),t.current=s,s.stateNode=t,e=_c(),e.refCount++,t.pooledCache=e,e.refCount++,s.memoizedState={element:l,isDehydrated:n,cache:e},es(s),t}function u1(t){return t?(t=kl,t):kl}function c1(t,e,n,l,a,s){a=u1(a),l.context===null?l.context=a:l.pendingContext=a,l=Bn(e),l.payload={element:n},s=s===void 0?null:s,s!==null&&(l.callback=s),n=Un(t,l,e),n!==null&&(ve(n,t,e),qa(n,t,e))}function s1(t,e){if(t=t.memoizedState,t!==null&&t.dehydrated!==null){var n=t.retryLane;t.retryLane=n!==0&&n<e?n:e}}function pf(t,e){s1(t,e),(t=t.alternate)&&s1(t,e)}function f1(t){if(t.tag===13||t.tag===31){var e=dl(t,67108864);e!==null&&ve(e,t,67108864),pf(t,67108864)}}function r1(t){if(t.tag===13||t.tag===31){var e=we();e=mc(e);var n=dl(t,e);n!==null&&ve(n,t,e),pf(t,e)}}var Vu=!0;function dA(t,e,n,l){var a=M.T;M.T=null;var s=_.p;try{_.p=2,xf(t,e,n,l)}finally{_.p=s,M.T=a}}function hA(t,e,n,l){var a=M.T;M.T=null;var s=_.p;try{_.p=8,xf(t,e,n,l)}finally{_.p=s,M.T=a}}function xf(t,e,n,l){if(Vu){var a=bf(l);if(a===null)cf(t,e,l,Zu,n),d1(t,l);else if(gA(a,t,e,n,l))l.stopPropagation();else if(d1(t,l),e&4&&-1<mA.indexOf(t)){for(;a!==null;){var s=Ql(a);if(s!==null)switch(s.tag){case 3:if(s=s.stateNode,s.current.memoizedState.isDehydrated){var d=cl(s.pendingLanes);if(d!==0){var g=s;for(g.pendingLanes|=2,g.entangledLanes|=2;d;){var S=1<<31-be(d);g.entanglements[1]|=S,d&=~S}_e(s),(Ct&6)===0&&(Cu=pe()+500,ci(0))}}break;case 31:case 13:g=dl(s,2),g!==null&&ve(g,s,2),Du(),pf(s,2)}if(s=bf(l),s===null&&cf(t,e,l,Zu,n),s===a)break;a=s}a!==null&&l.stopPropagation()}else cf(t,e,l,null,n)}}function bf(t){return t=Sc(t),Sf(t)}var Zu=null;function Sf(t){if(Zu=null,t=Ul(t),t!==null){var e=o(t);if(e===null)t=null;else{var n=e.tag;if(n===13){if(t=h(e),t!==null)return t;t=null}else if(n===31){if(t=v(e),t!==null)return t;t=null}else if(n===3){if(e.stateNode.current.memoizedState.isDehydrated)return e.tag===3?e.stateNode.containerInfo:null;t=null}else e!==t&&(t=null)}}return Zu=t,null}function o1(t){switch(t){case"beforetoggle":case"cancel":case"click":case"close":case"contextmenu":case"copy":case"cut":case"auxclick":case"dblclick":case"dragend":case"dragstart":case"drop":case"focusin":case"focusout":case"input":case"invalid":case"keydown":case"keypress":case"keyup":case"mousedown":case"mouseup":case"paste":case"pause":case"play":case"pointercancel":case"pointerdown":case"pointerup":case"ratechange":case"reset":case"resize":case"seeked":case"submit":case"toggle":case"touchcancel":case"touchend":case"touchstart":case"volumechange":case"change":case"selectionchange":case"textInput":case"compositionstart":case"compositionend":case"compositionupdate":case"beforeblur":case"afterblur":case"beforeinput":case"blur":case"fullscreenchange":case"focus":case"hashchange":case"popstate":case"select":case"selectstart":return 2;case"drag":case"dragenter":case"dragexit":case"dragleave":case"dragover":case"mousemove":case"mouseout":case"mouseover":case"pointermove":case"pointerout":case"pointerover":case"scroll":case"touchmove":case"wheel":case"mouseenter":case"mouseleave":case"pointerenter":case"pointerleave":return 8;case"message":switch($h()){case yr:return 2;case Er:return 8;case Ni:case tm:return 32;case pr:return 268435456;default:return 32}default:return 32}}var Tf=!1,Kn=null,kn=null,Jn=null,mi=new Map,gi=new Map,Fn=[],mA="mousedown mouseup touchcancel touchend touchstart auxclick dblclick pointercancel pointerdown pointerup dragend dragstart drop compositionend compositionstart keydown keypress keyup input textInput copy cut paste click change contextmenu reset".split(" ");function d1(t,e){switch(t){case"focusin":case"focusout":Kn=null;break;case"dragenter":case"dragleave":kn=null;break;case"mouseover":case"mouseout":Jn=null;break;case"pointerover":case"pointerout":mi.delete(e.pointerId);break;case"gotpointercapture":case"lostpointercapture":gi.delete(e.pointerId)}}function Ai(t,e,n,l,a,s){return t===null||t.nativeEvent!==s?(t={blockedOn:e,domEventName:n,eventSystemFlags:l,nativeEvent:s,targetContainers:[a]},e!==null&&(e=Ql(e),e!==null&&f1(e)),t):(t.eventSystemFlags|=l,e=t.targetContainers,a!==null&&e.indexOf(a)===-1&&e.push(a),t)}function gA(t,e,n,l,a){switch(e){case"focusin":return Kn=Ai(Kn,t,e,n,l,a),!0;case"dragenter":return kn=Ai(kn,t,e,n,l,a),!0;case"mouseover":return Jn=Ai(Jn,t,e,n,l,a),!0;case"pointerover":var s=a.pointerId;return mi.set(s,Ai(mi.get(s)||null,t,e,n,l,a)),!0;case"gotpointercapture":return s=a.pointerId,gi.set(s,Ai(gi.get(s)||null,t,e,n,l,a)),!0}return!1}function h1(t){var e=Ul(t.target);if(e!==null){var n=o(e);if(n!==null){if(e=n.tag,e===13){if(e=h(n),e!==null){t.blockedOn=e,Or(t.priority,function(){r1(n)});return}}else if(e===31){if(e=v(n),e!==null){t.blockedOn=e,Or(t.priority,function(){r1(n)});return}}else if(e===3&&n.stateNode.current.memoizedState.isDehydrated){t.blockedOn=n.tag===3?n.stateNode.containerInfo:null;return}}}t.blockedOn=null}function Iu(t){if(t.blockedOn!==null)return!1;for(var e=t.targetContainers;0<e.length;){var n=bf(t.nativeEvent);if(n===null){n=t.nativeEvent;var l=new n.constructor(n.type,n);bc=l,n.target.dispatchEvent(l),bc=null}else return e=Ql(n),e!==null&&f1(e),t.blockedOn=n,!1;e.shift()}return!0}function m1(t,e,n){Iu(t)&&n.delete(e)}function AA(){Tf=!1,Kn!==null&&Iu(Kn)&&(Kn=null),kn!==null&&Iu(kn)&&(kn=null),Jn!==null&&Iu(Jn)&&(Jn=null),mi.forEach(m1),gi.forEach(m1)}function qu(t,e){t.blockedOn===e&&(t.blockedOn=null,Tf||(Tf=!0,i.unstable_scheduleCallback(i.unstable_NormalPriority,AA)))}var Ku=null;function g1(t){Ku!==t&&(Ku=t,i.unstable_scheduleCallback(i.unstable_NormalPriority,function(){Ku===t&&(Ku=null);for(var e=0;e<t.length;e+=3){var n=t[e],l=t[e+1],a=t[e+2];if(typeof l!="function"){if(Sf(l||n)===null)continue;break}var s=Ql(n);s!==null&&(t.splice(e,3),e-=3,xs(s,{pending:!0,data:a,method:n.method,action:l},l,a))}}))}function va(t){function e(S){return qu(S,t)}Kn!==null&&qu(Kn,t),kn!==null&&qu(kn,t),Jn!==null&&qu(Jn,t),mi.forEach(e),gi.forEach(e);for(var n=0;n<Fn.length;n++){var l=Fn[n];l.blockedOn===t&&(l.blockedOn=null)}for(;0<Fn.length&&(n=Fn[0],n.blockedOn===null);)h1(n),n.blockedOn===null&&Fn.shift();if(n=(t.ownerDocument||t).$$reactFormReplay,n!=null)for(l=0;l<n.length;l+=3){var a=n[l],s=n[l+1],d=a[oe]||null;if(typeof s=="function")d||g1(n);else if(d){var g=null;if(s&&s.hasAttribute("formAction")){if(a=s,d=s[oe]||null)g=d.formAction;else if(Sf(a)!==null)continue}else g=d.action;typeof g=="function"?n[l+1]=g:(n.splice(l,3),l-=3),g1(n)}}}function A1(){function t(s){s.canIntercept&&s.info==="react-transition"&&s.intercept({handler:function(){return new Promise(function(d){return a=d})},focusReset:"manual",scroll:"manual"})}function e(){a!==null&&(a(),a=null),l||setTimeout(n,20)}function n(){if(!l&&!navigation.transition){var s=navigation.currentEntry;s&&s.url!=null&&navigation.navigate(s.url,{state:s.getState(),info:"react-transition",history:"replace"})}}if(typeof navigation=="object"){var l=!1,a=null;return navigation.addEventListener("navigate",t),navigation.addEventListener("navigatesuccess",e),navigation.addEventListener("navigateerror",e),setTimeout(n,100),function(){l=!0,navigation.removeEventListener("navigate",t),navigation.removeEventListener("navigatesuccess",e),navigation.removeEventListener("navigateerror",e),a!==null&&(a(),a=null)}}}function Cf(t){this._internalRoot=t}ku.prototype.render=Cf.prototype.render=function(t){var e=this._internalRoot;if(e===null)throw Error(f(409));var n=e.current,l=we();c1(n,l,t,e,null,null)},ku.prototype.unmount=Cf.prototype.unmount=function(){var t=this._internalRoot;if(t!==null){this._internalRoot=null;var e=t.containerInfo;c1(t.current,2,null,t,null,null),Du(),e[Bl]=null}};function ku(t){this._internalRoot=t}ku.prototype.unstable_scheduleHydration=function(t){if(t){var e=Cr();t={blockedOn:null,target:t,priority:e};for(var n=0;n<Fn.length&&e!==0&&e<Fn[n].priority;n++);Fn.splice(n,0,t),n===0&&h1(t)}};var v1=u.version;if(v1!=="19.2.1")throw Error(f(527,v1,"19.2.1"));_.findDOMNode=function(t){var e=t._reactInternals;if(e===void 0)throw typeof t.render=="function"?Error(f(188)):(t=Object.keys(t).join(","),Error(f(268,t)));return t=A(e),t=t!==null?x(t):null,t=t===null?null:t.stateNode,t};var vA={bundleType:0,version:"19.2.1",rendererPackageName:"react-dom",currentDispatcherRef:M,reconcilerVersion:"19.2.1"};if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<"u"){var Ju=__REACT_DEVTOOLS_GLOBAL_HOOK__;if(!Ju.isDisabled&&Ju.supportsFiber)try{Ca=Ju.inject(vA),xe=Ju}catch{}}return pi.createRoot=function(t,e){if(!r(t))throw Error(f(299));var n=!1,l="",a=To,s=Co,d=Oo;return e!=null&&(e.unstable_strictMode===!0&&(n=!0),e.identifierPrefix!==void 0&&(l=e.identifierPrefix),e.onUncaughtError!==void 0&&(a=e.onUncaughtError),e.onCaughtError!==void 0&&(s=e.onCaughtError),e.onRecoverableError!==void 0&&(d=e.onRecoverableError)),e=i1(t,1,!1,null,null,n,l,null,a,s,d,A1),t[Bl]=e.current,uf(t),new Cf(e)},pi.hydrateRoot=function(t,e,n){if(!r(t))throw Error(f(299));var l=!1,a="",s=To,d=Co,g=Oo,S=null;return n!=null&&(n.unstable_strictMode===!0&&(l=!0),n.identifierPrefix!==void 0&&(a=n.identifierPrefix),n.onUncaughtError!==void 0&&(s=n.onUncaughtError),n.onCaughtError!==void 0&&(d=n.onCaughtError),n.onRecoverableError!==void 0&&(g=n.onRecoverableError),n.formState!==void 0&&(S=n.formState)),e=i1(t,1,!0,e,n??null,l,a,S,s,d,g,A1),e.context=u1(null),n=e.current,l=we(),l=mc(l),a=Bn(l),a.callback=null,Un(n,a,l),n=l,e.current.lanes=n,Da(e,n),_e(e),t[Bl]=e.current,uf(t),new ku(e)},pi.version="19.2.1",pi}var y2;function c3(){if(y2)return Yf.exports;y2=1;function i(){if(!(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>"u"||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!="function"))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(i)}catch(u){console.error(u)}}return i(),Yf.exports=u3(),Yf.exports}var s3=c3();class uc{constructor(){this.project=[],this.status=[],this.text=[],this.labels=[],this.annotations=[]}empty(){return this.project.length+this.status.length+this.text.length+this.labels.length+this.annotations.length===0}static parse(u){const c=uc.tokenize(u),f=new Set,r=new Set,o=[],h=new Set,v=new Set;for(let A of c){const x=A.startsWith("!");if(x&&(A=A.slice(1)),A.startsWith("p:")){f.add({name:A.slice(2),not:x});continue}if(A.startsWith("s:")){r.add({name:A.slice(2),not:x});continue}if(A.startsWith("@")){h.add({name:A,not:x});continue}if(A.startsWith("annot:")){v.add({name:A.slice(6),not:x});continue}o.push({name:A.toLowerCase(),not:x})}const y=new uc;return y.text=o,y.project=[...f],y.status=[...r],y.labels=[...h],y.annotations=[...v],y}static tokenize(u){const c=[];let f,r=[];for(let o=0;o<u.length;++o){const h=u[o];if(f&&h==="\\"&&u[o+1]===f){r.push(f),++o;continue}if(h==='"'||h==="'"){f===h?(c.push(r.join("").toLowerCase()),r=[],f=void 0):f?r.push(h):f=h;continue}if(f){r.push(h);continue}if(h===" "){r.length&&(c.push(r.join("").toLowerCase()),r=[]);continue}r.push(h)}return r.length&&c.push(r.join("").toLowerCase()),c}matches(u){const c=f3(u);if(this.project.length&&!!!this.project.find(r=>{const o=c.project.includes(r.name);return r.not?!o:o}))return!1;if(this.status.length){if(!!!this.status.find(r=>{const o=c.status.includes(r.name);return r.not?!o:o}))return!1}else if(c.status==="skipped")return!1;return!(this.text.length&&!this.text.every(r=>{if(c.text.includes(r.name))return!r.not;const[o,h,v]=r.name.split(":");return c.file.includes(o)&&c.line===h&&(v===void 0||c.column===v)?!r.not:!!r.not})||this.labels.length&&!this.labels.every(r=>{const o=c.labels.includes(r.name);return r.not?!o:o})||this.annotations.length&&!this.annotations.every(r=>{const o=c.annotations.some(h=>h.includes(r.name));return r.not?!o:o}))}}const E2=Symbol("searchValues");function f3(i){const u=i[E2];if(u)return u;let c="passed";i.outcome==="unexpected"&&(c="failed"),i.outcome==="flaky"&&(c="flaky"),i.outcome==="skipped"&&(c="skipped");const f={text:(c+" "+i.projectName+" "+i.tags.join(" ")+" "+i.location.file+" "+i.path.join(" ")+" "+i.title).toLowerCase(),project:i.projectName.toLowerCase(),status:c,file:i.location.file,line:String(i.location.line),column:String(i.location.column),labels:i.tags.map(r=>r.toLowerCase()),annotations:i.annotations.map(r=>r.type.toLowerCase()+"="+(r.description??"").toLowerCase())};return i[E2]=f,f}const r3=/("[^"]*"|"[^"]*$|\S+)/g;function Ml(i,u,c){const f=new URLSearchParams(i),o=[...(i.get("q")??"").matchAll(r3)].map(y=>{const A=y[0];return A.startsWith('"')&&A.endsWith('"')&&A.length>1?A.slice(1,A.length-1):A});if(c)return f.set("q",p2(o.includes(u)?o.filter(y=>y!==u):[...o,u])),"#?"+f;let h;u.startsWith("s:")&&(h="s:"),u.startsWith("p:")&&(h="p:"),u.startsWith("@")&&(h="@");const v=o.filter(y=>!y.startsWith(h));return v.push(u),f.set("q",p2(v)),"#?"+f}function p2(i){return i.map(u=>/\s/.test(u)?`"${u}"`:u).join(" ").trim()}const o3=()=>m.jsx("span",{className:"octicon",style:{width:16,height:16}}),Oh=()=>m.jsx("svg",{"aria-hidden":"true",height:"16",viewBox:"0 0 16 16",version:"1.1",width:"16","data-view-component":"true",className:"octicon subnav-search-icon",children:m.jsx("path",{fillRule:"evenodd",d:"M11.5 7a4.499 4.499 0 11-8.998 0A4.499 4.499 0 0111.5 7zm-.82 4.74a6 6 0 111.06-1.06l3.04 3.04a.75.75 0 11-1.06 1.06l-3.04-3.04z"})}),Mi=()=>m.jsx("svg",{"aria-hidden":"true",height:"16",viewBox:"0 0 16 16",version:"1.1",width:"16",className:"octicon color-fg-muted",children:m.jsx("path",{fillRule:"evenodd",d:"M12.78 6.22a.75.75 0 010 1.06l-4.25 4.25a.75.75 0 01-1.06 0L3.22 7.28a.75.75 0 011.06-1.06L8 9.94l3.72-3.72a.75.75 0 011.06 0z"})}),Sa=()=>m.jsx("svg",{"aria-hidden":"true",height:"16",viewBox:"0 0 16 16",version:"1.1",width:"16","data-view-component":"true",className:"octicon color-fg-muted",children:m.jsx("path",{fillRule:"evenodd",d:"M6.22 3.22a.75.75 0 011.06 0l4.25 4.25a.75.75 0 010 1.06l-4.25 4.25a.75.75 0 01-1.06-1.06L9.94 8 6.22 4.28a.75.75 0 010-1.06z"})}),Dh=()=>m.jsx("svg",{"aria-hidden":"true",height:"16",viewBox:"0 0 16 16",version:"1.1",width:"16","data-view-component":"true",className:"octicon color-text-warning",children:m.jsx("path",{fillRule:"evenodd",d:"M8.22 1.754a.25.25 0 00-.44 0L1.698 13.132a.25.25 0 00.22.368h12.164a.25.25 0 00.22-.368L8.22 1.754zm-1.763-.707c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0114.082 15H1.918a1.75 1.75 0 01-1.543-2.575L6.457 1.047zM9 11a1 1 0 11-2 0 1 1 0 012 0zm-.25-5.25a.75.75 0 00-1.5 0v2.5a.75.75 0 001.5 0v-2.5z"})}),Rh=()=>m.jsx("svg",{"aria-hidden":"true",height:"16",viewBox:"0 0 16 16",version:"1.1",width:"16","data-view-component":"true",className:"octicon color-fg-muted",children:m.jsx("path",{fillRule:"evenodd",d:"M3.5 1.75a.25.25 0 01.25-.25h3a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h2.086a.25.25 0 01.177.073l2.914 2.914a.25.25 0 01.073.177v8.586a.25.25 0 01-.25.25h-.5a.75.75 0 000 1.5h.5A1.75 1.75 0 0014 13.25V4.664c0-.464-.184-.909-.513-1.237L10.573.513A1.75 1.75 0 009.336 0H3.75A1.75 1.75 0 002 1.75v11.5c0 .649.353 1.214.874 1.515a.75.75 0 10.752-1.298.25.25 0 01-.126-.217V1.75zM8.75 3a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM6 5.25a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5A.75.75 0 016 5.25zm2 1.5A.75.75 0 018.75 6h.5a.75.75 0 010 1.5h-.5A.75.75 0 018 6.75zm-1.25.75a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM8 9.75A.75.75 0 018.75 9h.5a.75.75 0 010 1.5h-.5A.75.75 0 018 9.75zm-.75.75a1.75 1.75 0 00-1.75 1.75v3c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-3a1.75 1.75 0 00-1.75-1.75h-.5zM7 12.25a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v2.25H7v-2.25z"})}),d3=()=>m.jsx("svg",{"aria-hidden":"true",height:"16",viewBox:"0 0 16 16",version:"1.1",width:"16","data-view-component":"true",className:"octicon color-fg-muted indirect-attachment-indicator",children:m.jsx("path",{fillRule:"evenodd",d:"M3.5 1.75a.25.25 0 01.25-.25h3a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h2.086a.25.25 0 01.177.073l2.914 2.914a.25.25 0 01.073.177v8.586a.25.25 0 01-.25.25h-.5a.75.75 0 000 1.5h.5A1.75 1.75 0 0014 13.25V4.664c0-.464-.184-.909-.513-1.237L10.573.513A1.75 1.75 0 009.336 0H3.75A1.75 1.75 0 002 1.75v11.5c0 .649.353 1.214.874 1.515a.75.75 0 10.752-1.298.25.25 0 01-.126-.217V1.75zM8.75 3a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM6 5.25a.75.75 0 01.75-.75h.5a.75.75 0 010 1.5h-.5A.75.75 0 016 5.25zm2 1.5A.75.75 0 018.75 6h.5a.75.75 0 010 1.5h-.5A.75.75 0 018 6.75zm-1.25.75a.75.75 0 000 1.5h.5a.75.75 0 000-1.5h-.5zM8 9.75A.75.75 0 018.75 9h.5a.75.75 0 010 1.5h-.5A.75.75 0 018 9.75zm-.75.75a1.75 1.75 0 00-1.75 1.75v3c0 .414.336.75.75.75h2.5a.75.75 0 00.75-.75v-3a1.75 1.75 0 00-1.75-1.75h-.5zM7 12.25a.25.25 0 01.25-.25h.5a.25.25 0 01.25.25v2.25H7v-2.25z"})}),wh=()=>m.jsx("svg",{className:"octicon color-text-danger",viewBox:"0 0 16 16",version:"1.1",width:"16",height:"16","aria-hidden":"true",children:m.jsx("path",{fillRule:"evenodd",d:"M3.72 3.72a.75.75 0 011.06 0L8 6.94l3.22-3.22a.75.75 0 111.06 1.06L9.06 8l3.22 3.22a.75.75 0 11-1.06 1.06L8 9.06l-3.22 3.22a.75.75 0 01-1.06-1.06L6.94 8 3.72 4.78a.75.75 0 010-1.06z"})}),Mh=()=>m.jsx("svg",{"aria-hidden":"true",height:"16",viewBox:"0 0 16 16",version:"1.1",width:"16","data-view-component":"true",className:"octicon color-icon-success",children:m.jsx("path",{fillRule:"evenodd",d:"M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"})}),jh=()=>m.jsx("svg",{"aria-hidden":"true",height:"16",viewBox:"0 0 16 16",version:"1.1",width:"16","data-view-component":"true",className:"octicon octicon-clock color-text-danger",children:m.jsx("path",{fillRule:"evenodd",d:"M5.75.75A.75.75 0 016.5 0h3a.75.75 0 010 1.5h-.75v1l-.001.041a6.718 6.718 0 013.464 1.435l.007-.006.75-.75a.75.75 0 111.06 1.06l-.75.75-.006.007a6.75 6.75 0 11-10.548 0L2.72 5.03l-.75-.75a.75.75 0 011.06-1.06l.75.75.007.006A6.718 6.718 0 017.25 2.541a.756.756 0 010-.041v-1H6.5a.75.75 0 01-.75-.75zM8 14.5A5.25 5.25 0 108 4a5.25 5.25 0 000 10.5zm.389-6.7l1.33-1.33a.75.75 0 111.061 1.06L9.45 8.861A1.502 1.502 0 018 10.75a1.5 1.5 0 11.389-2.95z"})}),h3=()=>m.jsx("svg",{"aria-hidden":"true",viewBox:"0 0 16 16",width:"16",height:"16","data-view-component":"true",className:"octicon color-fg-muted",children:m.jsx("path",{d:"M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm9.78-2.22-5.5 5.5a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l5.5-5.5a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Z"})}),m3=()=>m.jsx("svg",{className:"octicon",viewBox:"0 0 48 48",version:"1.1",width:"20",height:"20","aria-hidden":"true",children:m.jsx("path",{xmlns:"http://www.w3.org/2000/svg",d:"M11.85 32H36.2l-7.35-9.95-6.55 8.7-4.6-6.45ZM7 40q-1.2 0-2.1-.9Q4 38.2 4 37V11q0-1.2.9-2.1Q5.8 8 7 8h34q1.2 0 2.1.9.9.9.9 2.1v26q0 1.2-.9 2.1-.9.9-2.1.9Zm0-29v26-26Zm34 26V11H7v26Z"})}),g3=()=>m.jsx("svg",{className:"octicon",viewBox:"0 0 48 48",version:"1.1",width:"20",height:"20","aria-hidden":"true",children:m.jsx("path",{xmlns:"http://www.w3.org/2000/svg",d:"m19.6 32.35 13-8.45-13-8.45ZM7 40q-1.2 0-2.1-.9Q4 38.2 4 37V11q0-1.2.9-2.1Q5.8 8 7 8h34q1.2 0 2.1.9.9.9.9 2.1v26q0 1.2-.9 2.1-.9.9-2.1.9Zm0-3h34V11H7v26Zm0 0V11v26Z"})}),A3=()=>m.jsx("svg",{className:"octicon",viewBox:"0 0 48 48",version:"1.1",width:"20",height:"20","aria-hidden":"true",children:m.jsx("path",{xmlns:"http://www.w3.org/2000/svg",d:"M7 37h9.35V11H7v26Zm12.35 0h9.3V11h-9.3v26Zm12.3 0H41V11h-9.35v26ZM7 40q-1.2 0-2.1-.9Q4 38.2 4 37V11q0-1.2.9-2.1Q5.8 8 7 8h34q1.2 0 2.1.9.9.9.9 2.1v26q0 1.2-.9 2.1-.9.9-2.1.9Z"})}),v3=()=>m.jsxs("svg",{className:"octicon",viewBox:"0 0 16 16",width:"16",height:"16","aria-hidden":"true",children:[m.jsx("path",{d:"M0 6.75C0 5.784.784 5 1.75 5h1.5a.75.75 0 0 1 0 1.5h-1.5a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-1.5a.75.75 0 0 1 1.5 0v1.5A1.75 1.75 0 0 1 9.25 16h-7.5A1.75 1.75 0 0 1 0 14.25Z"}),m.jsx("path",{d:"M5 1.75C5 .784 5.784 0 6.75 0h7.5C15.216 0 16 .784 16 1.75v7.5A1.75 1.75 0 0 1 14.25 11h-7.5A1.75 1.75 0 0 1 5 9.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"})]}),y3=()=>m.jsx("svg",{className:"octicon octicon-settings",viewBox:"0 0 16 16",width:"16",height:"16","aria-hidden":"true",children:m.jsx("path",{d:"M8 0a8.2 8.2 0 0 1 .701.031C9.444.095 9.99.645 10.16 1.29l.288 1.107c.018.066.079.158.212.224.231.114.454.243.668.386.123.082.233.09.299.071l1.103-.303c.644-.176 1.392.021 1.82.63.27.385.506.792.704 1.218.315.675.111 1.422-.364 1.891l-.814.806c-.049.048-.098.147-.088.294.016.257.016.515 0 .772-.01.147.038.246.088.294l.814.806c.475.469.679 1.216.364 1.891a7.977 7.977 0 0 1-.704 1.217c-.428.61-1.176.807-1.82.63l-1.102-.302c-.067-.019-.177-.011-.3.071a5.909 5.909 0 0 1-.668.386c-.133.066-.194.158-.211.224l-.29 1.106c-.168.646-.715 1.196-1.458 1.26a8.006 8.006 0 0 1-1.402 0c-.743-.064-1.289-.614-1.458-1.26l-.289-1.106c-.018-.066-.079-.158-.212-.224a5.738 5.738 0 0 1-.668-.386c-.123-.082-.233-.09-.299-.071l-1.103.303c-.644.176-1.392-.021-1.82-.63a8.12 8.12 0 0 1-.704-1.218c-.315-.675-.111-1.422.363-1.891l.815-.806c.05-.048.098-.147.088-.294a6.214 6.214 0 0 1 0-.772c.01-.147-.038-.246-.088-.294l-.815-.806C.635 6.045.431 5.298.746 4.623a7.92 7.92 0 0 1 .704-1.217c.428-.61 1.176-.807 1.82-.63l1.102.302c.067.019.177.011.3-.071.214-.143.437-.272.668-.386.133-.066.194-.158.211-.224l.29-1.106C6.009.645 6.556.095 7.299.03 7.53.01 7.764 0 8 0Zm-.571 1.525c-.036.003-.108.036-.137.146l-.289 1.105c-.147.561-.549.967-.998 1.189-.173.086-.34.183-.5.29-.417.278-.97.423-1.529.27l-1.103-.303c-.109-.03-.175.016-.195.045-.22.312-.412.644-.573.99-.014.031-.021.11.059.19l.815.806c.411.406.562.957.53 1.456a4.709 4.709 0 0 0 0 .582c.032.499-.119 1.05-.53 1.456l-.815.806c-.081.08-.073.159-.059.19.162.346.353.677.573.989.02.03.085.076.195.046l1.102-.303c.56-.153 1.113-.008 1.53.27.161.107.328.204.501.29.447.222.85.629.997 1.189l.289 1.105c.029.109.101.143.137.146a6.6 6.6 0 0 0 1.142 0c.036-.003.108-.036.137-.146l.289-1.105c.147-.561.549-.967.998-1.189.173-.086.34-.183.5-.29.417-.278.97-.423 1.529-.27l1.103.303c.109.029.175-.016.195-.045.22-.313.411-.644.573-.99.014-.031.021-.11-.059-.19l-.815-.806c-.411-.406-.562-.957-.53-1.456a4.709 4.709 0 0 0 0-.582c-.032-.499.119-1.05.53-1.456l.815-.806c.081-.08.073-.159.059-.19a6.464 6.464 0 0 0-.573-.989c-.02-.03-.085-.076-.195-.046l-1.102.303c-.56.153-1.113.008-1.53-.27a4.44 4.44 0 0 0-.501-.29c-.447-.222-.85-.629-.997-1.189l-.289-1.105c-.029-.11-.101-.143-.137-.146a6.6 6.6 0 0 0-1.142 0ZM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0ZM9.5 8a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 9.5 8Z"})}),Nh=({value:i})=>{const[u,c]=it.useState("copy"),f=it.useCallback(()=>{navigator.clipboard.writeText(i).then(()=>{c("check"),setTimeout(()=>{c("copy")},3e3)},()=>{c("cross")})},[i]),r=u==="check"?Mh():u==="cross"?wh():v3();return m.jsx("button",{className:"copy-icon",title:"Copy to clipboard","aria-label":"Copy to clipboard",onClick:f,children:r})},or=({children:i,value:u})=>m.jsxs("span",{className:"copy-value-container",children:[i,m.jsx("span",{className:"copy-button-container",children:m.jsx(Nh,{value:u})})]});function E3(i,u,c,f){const[r,o]=ue.useState(c);return ue.useEffect(()=>{let h=!1;return i().then(v=>{h||o(v)}),()=>{h=!0}},u),r}function Hh(){const i=ue.useRef(null),[u]=$f(i);return[u,i]}function $f(i){const[u,c]=ue.useState(new DOMRect(0,0,10,10)),f=ue.useCallback(()=>{const r=i==null?void 0:i.current;r&&c(r.getBoundingClientRect())},[i]);return ue.useLayoutEffect(()=>{const r=i==null?void 0:i.current;if(!r)return;f();const o=new ResizeObserver(f);return o.observe(r),window.addEventListener("resize",f),()=>{o.disconnect(),window.removeEventListener("resize",f)}},[f,i]),[u,f]}function Bh(i,u){u=Dl.getObject(i,u);const[c,f]=ue.useState(u),r=ue.useCallback(o=>{Dl.setObject(i,o)},[i,f]);return ue.useEffect(()=>{{const o=()=>f(Dl.getObject(i,u));return Dl.onChangeEmitter.addEventListener(i,o),()=>Dl.onChangeEmitter.removeEventListener(i,o)}},[u,i]),[c,r]}class p3{constructor(){this.onChangeEmitter=new EventTarget}getString(u,c){return localStorage[u]||c}setString(u,c){var f;localStorage[u]=c,this.onChangeEmitter.dispatchEvent(new Event(u)),(f=window.saveSettings)==null||f.call(window)}getObject(u,c){if(!localStorage[u])return c;try{return JSON.parse(localStorage[u])}catch{return c}}setObject(u,c){var f;localStorage[u]=JSON.stringify(c),this.onChangeEmitter.dispatchEvent(new Event(u)),(f=window.saveSettings)==null||f.call(window)}}const Dl=new p3;function Ze(...i){return i.filter(Boolean).join(" ")}const x2="\\u0000-\\u0020\\u007f-\\u009f",x3=new RegExp("(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\\/\\/|www\\.)[^\\s"+x2+'"]{2,}[^\\s'+x2+`"')}\\],:;.!?]`,"ug");function b3(){const[i,u]=ue.useState(!1),c=ue.useCallback(()=>{const f=[];return u(r=>(f.push(setTimeout(()=>u(!1),1e3)),r?(f.push(setTimeout(()=>u(!0),50)),!1):!0)),()=>f.forEach(clearTimeout)},[u]);return[i,c]}function Di(i){const u=[];let c=0,f;for(;(f=x3.exec(i))!==null;){const o=i.substring(c,f.index);o&&u.push(o);const h=f[0];u.push(S3(h)),c=f.index+h.length}const r=i.substring(c);return r&&u.push(r),u}function S3(i){let u=i;return u.startsWith("www.")&&(u="https://"+u),m.jsx("a",{href:u,target:"_blank",rel:"noopener noreferrer",children:i})}const T3=({summary:i,children:u,className:c,style:f})=>{const[r,o]=ue.useState(!1),h=v=>{o(v.currentTarget.open)};return m.jsxs("details",{style:f,className:c,onToggle:h,children:[m.jsxs("summary",{className:"expandable-summary",children:[r?Mi():Sa(),i]}),u]})};function C3(i){let u=0;for(let c=0;c<i.length;c++)u=i.charCodeAt(c)+((u<<8)-u);return Math.abs(u%6)}function Ve(i){if(!i)return i;try{const u=new URL(i,window.location.href);if(u.origin===window.location.origin){for(const[c,f]of new URLSearchParams(window.location.search))u.searchParams.set(c,f);return u.toString()}return i}catch{return i}}const Uh=({label:i,href:u,onClick:c,colorIndex:f,trimAtSymbolPrefix:r})=>{const o=m.jsx("span",{className:Ze("label","label-color-"+(f!==void 0?f:C3(i))),onClick:c?h=>c(h,i):void 0,children:r&&i.startsWith("@")?i.slice(1):i});return u?m.jsx("a",{className:"label-anchor",href:Ve(u),children:o}):o},Qh=({projectNames:i,activeProjectName:u,otherLabels:c,style:f})=>{const r=i.length>0&&!!u;return(r||c.length>0)&&m.jsxs("span",{className:"label-row",style:f,children:[r&&m.jsx(D3,{projectNames:i,projectName:u}),m.jsx(O3,{labels:c})]})},O3=({labels:i})=>{const u=se(),c=it.useCallback((f,r)=>{const o=new URLSearchParams(u);f.preventDefault(),o.has("testId")&&o.delete("speedboard"),o.delete("testId"),ll(Ml(o,r,f.metaKey||f.ctrlKey))},[u]);return m.jsx(m.Fragment,{children:i.map(f=>m.jsx(Uh,{label:f,trimAtSymbolPrefix:!0,onClick:c},f))})};function ll(i){window.history.pushState({},"",i);const u=new PopStateEvent("popstate");window.dispatchEvent(u)}const Vf=({predicate:i,children:u})=>i(se())?u:null,bn=({click:i,ctrlClick:u,children:c,...f})=>m.jsx("a",{...f,style:{textDecoration:"none",color:"var(--color-fg-default)",cursor:"pointer"},onClick:r=>{i&&(r.preventDefault(),ll(Ve((r.metaKey||r.ctrlKey)&&u||i)))},children:c}),dr=({className:i,...u})=>m.jsx(bn,{...u,className:Ze("link-badge",u.dim&&"link-badge-dim",i)}),D3=({projectNames:i,projectName:u})=>{const c=new URLSearchParams(se());return c.has("testId")&&c.delete("speedboard"),c.delete("testId"),m.jsx(bn,{click:Ml(c,`p:${u}`,!1),ctrlClick:Ml(c,`p:${u}`,!0),children:m.jsx(Uh,{label:u,colorIndex:i.indexOf(u)%6})})},$u=({attachment:i,result:u,href:c,linkName:f,openInNewTab:r})=>{const[o,h]=b3();hr("attachment-"+u.attachments.indexOf(i),h);const v=m.jsxs("span",{children:[i.contentType===M3?Dh():Rh(),i.path&&(r?m.jsx("a",{href:Ve(c||i.path),target:"_blank",rel:"noreferrer",children:f||i.name}):m.jsx("a",{href:Ve(c||i.path),download:w3(i),children:f||i.name})),!i.path&&(r?m.jsx("a",{href:URL.createObjectURL(new Blob([i.body],{type:i.contentType})),target:"_blank",rel:"noreferrer",onClick:y=>y.stopPropagation(),children:i.name}):m.jsx("span",{children:Di(i.name)}))]});return i.body?m.jsx(T3,{style:{lineHeight:"32px"},className:Ze(o&&"attachment-flash"),summary:v,children:m.jsxs("div",{className:"attachment-body",children:[m.jsx(Nh,{value:i.body}),Di(i.body)]})}):m.jsxs("div",{style:{lineHeight:"32px",whiteSpace:"nowrap",paddingLeft:4},className:Ze(o&&"attachment-flash"),children:[m.jsx("span",{style:{visibility:"hidden"},children:Sa()}),v]})},zh=({test:i,trailingSeparator:u,dim:c})=>{const f=i.results.map(r=>r.attachments.filter(o=>o.name==="trace")).filter(r=>r.length>0)[0];if(f)return m.jsxs(m.Fragment,{children:[m.jsxs(dr,{href:Ve(Lh(f)),title:"View Trace",className:"button trace-link",dim:c,children:[A3(),m.jsx("span",{children:"View Trace"})]}),u&&m.jsx("div",{className:"trace-link-separator",children:"|"})]})},Yh=it.createContext(new URLSearchParams(window.location.hash.slice(1)));function se(){return it.useContext(Yh)}const R3=({children:i})=>{const[u,c]=it.useState(new URLSearchParams(window.location.hash.slice(1)));return it.useEffect(()=>{const f=()=>c(new URLSearchParams(window.location.hash.slice(1)));return window.addEventListener("popstate",f),()=>window.removeEventListener("popstate",f)},[]),m.jsx(Yh.Provider,{value:u,children:i})};function w3(i){if(i.name.includes(".")||!i.path)return i.name;const u=i.path.indexOf(".");return u===-1?i.name:i.name+i.path.slice(u,i.path.length)}function Lh(i){return`trace/index.html?${i.map((u,c)=>`trace=${new URL(u.path,window.location.href)}`).join("&")}`}const M3="x-playwright/missing";function hr(i,u){const c=se(),f=j3(i);it.useEffect(()=>{if(f)return u()},[f,u,c])}function j3(i){const u=se().get("anchor");return u===null||typeof i>"u"?!1:typeof i=="string"?i===u:Array.isArray(i)?i.includes(u):i(u)}function xi({id:i,children:u}){const c=it.useRef(null),f=it.useCallback(()=>{var r;(r=c.current)==null||r.scrollIntoView({block:"start",inline:"start"})},[]);return hr(i,f),m.jsx("div",{ref:c,children:u})}function il({test:i,result:u,anchor:c},f){const r=new URLSearchParams(f);return i&&r.set("testId",i.testId),i&&u&&r.set("run",""+i.results.indexOf(u)),c&&r.set("anchor",c),"#?"+r}function fc(i){switch(i){case"failed":case"unexpected":return wh();case"passed":case"expected":return Mh();case"timedOut":return jh();case"flaky":return Dh();case"skipped":case"interrupted":return h3()}}const N3=({className:i,style:u,open:c,isModal:f,minWidth:r,verticalOffset:o,requestClose:h,anchor:v,dataTestId:y,children:A})=>{const x=it.useRef(null),[T,D]=it.useState(0),[X]=$f(x),[q,p]=$f(v),E=v?H3(X,q,o):void 0;return it.useEffect(()=>{const b=N=>{!x.current||!(N.target instanceof Node)||x.current.contains(N.target)||h==null||h()},R=N=>{N.key==="Escape"&&(h==null||h())};return c?(document.addEventListener("mousedown",b),document.addEventListener("keydown",R),()=>{document.removeEventListener("mousedown",b),document.removeEventListener("keydown",R)}):()=>{}},[c,h]),it.useLayoutEffect(()=>p(),[c,p]),it.useEffect(()=>{const b=()=>D(R=>R+1);return window.addEventListener("resize",b),()=>{window.removeEventListener("resize",b)}},[]),it.useLayoutEffect(()=>{x.current&&(c?f?x.current.showModal():x.current.show():x.current.close())},[c,f]),m.jsx("dialog",{ref:x,style:{position:"fixed",margin:E?0:void 0,zIndex:110,top:E==null?void 0:E.top,left:E==null?void 0:E.left,minWidth:r||0,...u},className:i,"data-testid":y,children:A})};function H3(i,u,c=4,f=4){let r=Math.max(f,u.left);r+i.width>window.innerWidth-f&&(r=window.innerWidth-i.width-f);let o=Math.max(0,u.bottom)+c;return o+i.height>window.innerHeight-c&&(Math.max(0,u.top)>i.height+c?o=Math.max(0,u.top)-i.height-c:o=window.innerHeight-c-i.height),{left:r,top:o}}const B3="system",Gh="theme",U3=[{label:"Dark mode",value:"dark-mode"},{label:"Light mode",value:"light-mode"},{label:"System",value:"system"}],Xh=window.matchMedia("(prefers-color-scheme: dark)");function Q3(){document.playwrightThemeInitialized||(document.playwrightThemeInitialized=!0,document.defaultView.addEventListener("focus",i=>{i.target.document.nodeType===Node.DOCUMENT_NODE&&document.body.classList.remove("inactive")},!1),document.defaultView.addEventListener("blur",i=>{document.body.classList.add("inactive")},!1),tr(er()),Xh.addEventListener("change",()=>{tr(er())}))}const z3=new Set;function tr(i){const u=Y3(),c=i==="system"?Xh.matches?"dark-mode":"light-mode":i;if(u!==c){u&&document.documentElement.classList.remove(u),document.documentElement.classList.add(c);for(const f of z3)f(c)}}function er(){return Dl.getString(Gh,B3)}function Y3(){return document.documentElement.classList.contains("dark-mode")?"dark-mode":document.documentElement.classList.contains("light-mode")?"light-mode":null}function L3(){const[i,u]=ue.useState(er());return ue.useEffect(()=>{Dl.setString(Gh,i),tr(i)},[i]),[i,u]}const mr=({title:i,leftSuperHeader:u,rightSuperHeader:c})=>m.jsxs("div",{className:"header-view",children:[m.jsxs("div",{className:"hbox header-superheader",children:[u,m.jsx("div",{style:{flex:"auto"}}),c]}),i&&m.jsx("div",{className:"header-title",children:Di(i)})]}),G3=({stats:i,filterText:u,setFilterText:c})=>{const f=se().get("q");return it.useEffect(()=>{c(f?`${f.trim()} `:"")},[f,c]),m.jsx(m.Fragment,{children:m.jsxs("div",{className:"pt-3",children:[m.jsx("div",{className:"header-view-status-container ml-2 pl-2 d-flex",children:m.jsx(X3,{stats:i})}),m.jsxs("form",{className:"subnav-search",onSubmit:r=>{r.preventDefault();const o=new URL(window.location.href),h=new URLSearchParams(o.hash.slice(1)),v=new FormData(r.target).get("q"),y=new URLSearchParams({q:v});h.has("speedboard")&&y.set("speedboard",""),y.toString()&&(o.hash="?"+y.toString()),ll(o)},children:[Oh(),m.jsx("input",{name:"q",spellCheck:!1,className:"form-control subnav-search-input input-contrast width-full","aria-label":"Search tests",placeholder:"Search tests",value:u,onChange:r=>{c(r.target.value)}})]})]})})},X3=({stats:i})=>{const u=se().has("speedboard");return m.jsxs("nav",{children:[m.jsxs(bn,{className:"subnav-item",href:"#?",children:[m.jsx("span",{className:"subnav-item-label",children:"All"}),m.jsx("span",{className:"d-inline counter",children:i.total-i.skipped})]}),m.jsx(tc,{token:"passed",count:i.expected}),m.jsx(tc,{token:"failed",count:i.unexpected}),m.jsx(tc,{token:"flaky",count:i.flaky}),m.jsx(tc,{token:"skipped",count:i.skipped}),m.jsx(bn,{className:"subnav-item",href:"#?speedboard",title:"Speedboard","aria-selected":u,children:jh()}),m.jsx(V3,{})]})},tc=({token:i,count:u})=>{const c=new URLSearchParams(se());c.delete("speedboard"),c.delete("testId");const f=`s:${i}`,r=Ml(c,f,!1),o=Ml(c,f,!0),h=i.charAt(0).toUpperCase()+i.slice(1);return m.jsxs(bn,{className:"subnav-item",href:r,click:r,ctrlClick:o,children:[u>0&&fc(i),m.jsx("span",{className:"subnav-item-label",children:h}),m.jsx("span",{className:"d-inline counter",children:u})]})},V3=()=>{const i=it.useRef(null),[u,c]=it.useState(!1),[f,r]=L3(),[o,h]=Bh("mergeFiles",!1);return m.jsxs(m.Fragment,{children:[m.jsx("div",{role:"button",ref:i,style:{cursor:"pointer"},className:"subnav-item",title:"Settings",onClick:v=>{c(!u),v.preventDefault()},onMouseDown:Z3,children:y3()}),m.jsxs(N3,{open:u,minWidth:150,verticalOffset:4,requestClose:()=>c(!1),anchor:i,dataTestId:"settings-dialog",children:[m.jsxs("label",{className:"header-setting-theme",children:["Theme:",m.jsx("select",{value:f,onChange:v=>r(v.target.value),children:U3.map(v=>m.jsx("option",{value:v.value,children:v.label},v.value))})]}),m.jsxs("label",{style:{cursor:"pointer",display:"flex",alignItems:"center",gap:4},children:[m.jsx("input",{type:"checkbox",checked:o,onChange:()=>h(!o)}),"Merge files"]})]})]})},Z3=i=>{i.stopPropagation(),i.preventDefault()},I3=({tabs:i,selectedTab:u,setSelectedTab:c})=>{const f=it.useId(),r=it.useRef(null),o=h=>{var x;const v=Array.from(((x=r.current)==null?void 0:x.querySelectorAll('[role="tab"]'))??[]),y=v.findIndex(T=>T===document.activeElement);if(y===-1)return;let A=y;if(h.key==="ArrowRight")A=(y+1)%v.length;else if(h.key==="ArrowLeft")A=(y-1+v.length)%v.length;else if(h.key==="Home")A=0;else if(h.key==="End")A=v.length-1;else return;h.preventDefault(),v[A].focus(),c(i[A].id)};return m.jsx("div",{className:"tabbed-pane",children:m.jsxs("div",{className:"vbox",children:[m.jsx("div",{className:"hbox",style:{flex:"none"},children:m.jsx("div",{className:"tabbed-pane-tab-strip",role:"tablist",onKeyDown:o,ref:r,children:i.map(h=>m.jsx("div",{className:Ze("tabbed-pane-tab-element",u===h.id&&"selected"),onClick:()=>c(h.id),id:`${f}-${h.id}`,role:"tab",tabIndex:u===h.id?0:-1,"aria-selected":u===h.id,children:m.jsx("div",{className:"tabbed-pane-tab-label",children:h.title})},h.id))})}),i.map(h=>{if(u===h.id)return m.jsx("div",{className:"tab-content",role:"tabpanel","aria-labelledby":`${f}-${h.id}`,children:h.render()},h.id)})]})})},gr=({header:i,footer:u,expanded:c,setExpanded:f,children:r,noInsets:o,body:h,dataTestId:v})=>{const y=it.useId();return m.jsxs("div",{className:"chip","data-testid":v,children:[m.jsxs("div",{role:"button","aria-expanded":!!c,"aria-controls":y,className:Ze("chip-header",f&&" expanded-"+c),onClick:()=>f==null?void 0:f(!c),title:typeof i=="string"?i:void 0,children:[f?c?m.jsx(Mi,{}):m.jsx(Sa,{}):m.jsx(o3,{}),i]}),(!f||c)&&m.jsxs("div",{id:y,role:"region",className:Ze("chip-body",o&&"chip-body-no-insets"),children:[r,h&&h(),u&&m.jsx("div",{className:"chip-footer",children:u})]})]})},ke=({header:i,initialExpanded:u,noInsets:c,children:f,body:r,dataTestId:o,revealOnAnchorId:h})=>{const[v,y]=it.useState(u??!0),A=it.useCallback(()=>y(!0),[]);return hr(h,A),m.jsx(gr,{header:i,expanded:v,setExpanded:y,noInsets:c,body:r,dataTestId:o,children:f})},q3=({title:i,loadChildren:u,onClick:c,expandByDefault:f,depth:r,style:o,flash:h})=>{const[v,y]=it.useState(f||!1);return it.useEffect(()=>{y(f||!1)},[f]),m.jsxs("div",{role:"treeitem",className:Ze("tree-item",h&&"yellow-flash"),style:o,children:[m.jsxs("div",{className:"tree-item-title",style:{paddingLeft:r*22+4},onClick:()=>{c==null||c(),y(!v)},children:[u&&!!v&&Mi(),u&&!v&&Sa(),!u&&m.jsx("span",{style:{visibility:"hidden"},children:Sa()}),i]}),v&&(u==null?void 0:u())]})};function Ta(i){if(i<0||!isFinite(i))return"-";if(i===0)return"0ms";if(i<1e3)return i.toFixed(0)+"ms";const u=i/1e3;if(u<60)return u.toFixed(1)+"s";const c=u/60;if(c<60)return c.toFixed(1)+"m";const f=c/60;return f<24?f.toFixed(1)+"h":(f/24).toFixed(1)+"d"}const K3="data:image/png;base64,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",k3=({cursor:i,onPaneMouseMove:u,onPaneMouseUp:c,onPaneDoubleClick:f})=>(ue.useEffect(()=>{const r=document.createElement("div");return r.style.position="fixed",r.style.top="0",r.style.right="0",r.style.bottom="0",r.style.left="0",r.style.zIndex="9999",r.style.cursor=i,document.body.appendChild(r),u&&r.addEventListener("mousemove",u),c&&r.addEventListener("mouseup",c),f&&document.body.addEventListener("dblclick",f),()=>{u&&r.removeEventListener("mousemove",u),c&&r.removeEventListener("mouseup",c),f&&document.body.removeEventListener("dblclick",f),document.body.removeChild(r)}},[i,u,c,f]),m.jsx(m.Fragment,{})),J3={position:"absolute",top:0,right:0,bottom:0,left:0},F3=({orientation:i,offsets:u,setOffsets:c,resizerColor:f,resizerWidth:r,minColumnWidth:o})=>{const h=o||0,[v,y]=ue.useState(null),[A,x]=Hh(),T={position:"absolute",right:i==="horizontal"?void 0:0,bottom:i==="horizontal"?0:void 0,width:i==="horizontal"?7:void 0,height:i==="horizontal"?void 0:7,borderTopWidth:i==="horizontal"?void 0:(7-r)/2,borderRightWidth:i==="horizontal"?(7-r)/2:void 0,borderBottomWidth:i==="horizontal"?void 0:(7-r)/2,borderLeftWidth:i==="horizontal"?(7-r)/2:void 0,borderColor:"transparent",borderStyle:"solid",cursor:i==="horizontal"?"ew-resize":"ns-resize"};return m.jsxs("div",{style:{position:"absolute",top:0,right:0,bottom:0,left:-(7-r)/2,zIndex:100,pointerEvents:"none"},ref:x,children:[!!v&&m.jsx(k3,{cursor:i==="horizontal"?"ew-resize":"ns-resize",onPaneMouseUp:()=>y(null),onPaneMouseMove:D=>{if(!D.buttons)y(null);else if(v){const X=i==="horizontal"?D.clientX-v.clientX:D.clientY-v.clientY,q=v.offset+X,p=v.index>0?u[v.index-1]:0,E=i==="horizontal"?A.width:A.height,b=Math.min(Math.max(p+h,q),E-h)-u[v.index];for(let R=v.index;R<u.length;++R)u[R]=u[R]+b;c([...u])}}}),u.map((D,X)=>m.jsx("div",{style:{...T,top:i==="horizontal"?0:D,left:i==="horizontal"?D:0,pointerEvents:"initial"},onMouseDown:q=>y({clientX:q.clientX,clientY:q.clientY,offset:D,index:X}),children:m.jsx("div",{style:{...J3,background:f}})},X))]})};async function Zf(i){const u=new Image;return i&&(u.src=i,await new Promise((c,f)=>{u.onload=c,u.onerror=c})),u}const nr={backgroundImage:`linear-gradient(45deg, #80808020 25%, transparent 25%),
+                    linear-gradient(-45deg, #80808020 25%, transparent 25%),
+                    linear-gradient(45deg, transparent 75%, #80808020 75%),
+                    linear-gradient(-45deg, transparent 75%, #80808020 75%)`,backgroundSize:"20px 20px",backgroundPosition:"0 0, 0 10px, 10px -10px, -10px 0px",boxShadow:`rgb(0 0 0 / 10%) 0px 1.8px 1.9px,
+              rgb(0 0 0 / 15%) 0px 6.1px 6.3px,
+              rgb(0 0 0 / 10%) 0px -2px 4px,
+              rgb(0 0 0 / 15%) 0px -6.1px 12px,
+              rgb(0 0 0 / 25%) 0px 6px 12px`},Vh=({diff:i,noTargetBlank:u,hideDetails:c})=>{const[f,r]=it.useState(i.diff?"diff":"actual"),[o,h]=it.useState(!1),[v,y]=it.useState(null),[A,x]=it.useState("Expected"),[T,D]=it.useState(null),[X,q]=it.useState(null),[p,E]=Hh();it.useEffect(()=>{(async()=>{var z,I,k,nt;y(await Zf((z=i.expected)==null?void 0:z.attachment.path)),x(((I=i.expected)==null?void 0:I.title)||"Expected"),D(await Zf((k=i.actual)==null?void 0:k.attachment.path)),q(await Zf((nt=i.diff)==null?void 0:nt.attachment.path))})()},[i]);const b=v&&T&&X,R=b?Math.max(v.naturalWidth,T.naturalWidth,200):500,N=b?Math.max(v.naturalHeight,T.naturalHeight,200):500,V=Math.min(1,(p.width-30)/R),F=Math.min(1,(p.width-50)/R/2),H=R*V,j=N*V,Y={flex:"none",margin:"0 10px",cursor:"pointer",userSelect:"none"};return m.jsx("div",{"data-testid":"test-result-image-mismatch",style:{display:"flex",flexDirection:"column",alignItems:"center",flex:"auto"},ref:E,children:b&&m.jsxs(m.Fragment,{children:[m.jsxs("div",{"data-testid":"test-result-image-mismatch-tabs",style:{display:"flex",margin:"10px 0 20px"},children:[i.diff&&m.jsx("div",{style:{...Y,fontWeight:f==="diff"?600:"initial"},onClick:()=>r("diff"),children:"Diff"}),m.jsx("div",{style:{...Y,fontWeight:f==="actual"?600:"initial"},onClick:()=>r("actual"),children:"Actual"}),m.jsx("div",{style:{...Y,fontWeight:f==="expected"?600:"initial"},onClick:()=>r("expected"),children:A}),m.jsx("div",{style:{...Y,fontWeight:f==="sxs"?600:"initial"},onClick:()=>r("sxs"),children:"Side by side"}),m.jsx("div",{style:{...Y,fontWeight:f==="slider"?600:"initial"},onClick:()=>r("slider"),children:"Slider"})]}),m.jsxs("div",{style:{display:"flex",justifyContent:"center",flex:"auto",minHeight:j+60},children:[i.diff&&f==="diff"&&m.jsx(yn,{image:X,alt:"Diff",hideSize:c,canvasWidth:H,canvasHeight:j,scale:V}),i.diff&&f==="actual"&&m.jsx(yn,{image:T,alt:"Actual",hideSize:c,canvasWidth:H,canvasHeight:j,scale:V}),i.diff&&f==="expected"&&m.jsx(yn,{image:v,alt:A,hideSize:c,canvasWidth:H,canvasHeight:j,scale:V}),i.diff&&f==="slider"&&m.jsx(W3,{expectedImage:v,actualImage:T,hideSize:c,canvasWidth:H,canvasHeight:j,scale:V,expectedTitle:A}),i.diff&&f==="sxs"&&m.jsxs("div",{style:{display:"flex"},children:[m.jsx(yn,{image:v,title:A,hideSize:c,canvasWidth:F*R,canvasHeight:F*N,scale:F}),m.jsx(yn,{image:o?X:T,title:o?"Diff":"Actual",onClick:()=>h(!o),hideSize:c,canvasWidth:F*R,canvasHeight:F*N,scale:F})]}),!i.diff&&f==="actual"&&m.jsx(yn,{image:T,title:"Actual",hideSize:c,canvasWidth:H,canvasHeight:j,scale:V}),!i.diff&&f==="expected"&&m.jsx(yn,{image:v,title:A,hideSize:c,canvasWidth:H,canvasHeight:j,scale:V}),!i.diff&&f==="sxs"&&m.jsxs("div",{style:{display:"flex"},children:[m.jsx(yn,{image:v,title:A,canvasWidth:F*R,canvasHeight:F*N,scale:F}),m.jsx(yn,{image:T,title:"Actual",canvasWidth:F*R,canvasHeight:F*N,scale:F})]})]}),!c&&m.jsxs("div",{style:{alignSelf:"start",lineHeight:"18px",marginLeft:"15px"},children:[m.jsx("div",{children:i.diff&&m.jsx("a",{target:"_blank",href:i.diff.attachment.path,rel:"noreferrer",children:i.diff.attachment.name})}),m.jsx("div",{children:m.jsx("a",{target:u?"":"_blank",href:i.actual.attachment.path,rel:"noreferrer",children:i.actual.attachment.name})}),m.jsx("div",{children:m.jsx("a",{target:u?"":"_blank",href:i.expected.attachment.path,rel:"noreferrer",children:i.expected.attachment.name})})]})]})})},W3=({expectedImage:i,actualImage:u,canvasWidth:c,canvasHeight:f,scale:r,expectedTitle:o,hideSize:h})=>{const v={position:"absolute",top:0,left:0},[y,A]=it.useState(c/2),x=i.naturalWidth===u.naturalWidth&&i.naturalHeight===u.naturalHeight;return m.jsxs("div",{style:{flex:"none",display:"flex",alignItems:"center",flexDirection:"column",userSelect:"none"},children:[!h&&m.jsxs("div",{style:{margin:5},children:[!x&&m.jsx("span",{style:{flex:"none",margin:"0 5px"},children:"Actual "}),!x&&m.jsx("span",{children:u.naturalWidth}),!x&&m.jsx("span",{style:{flex:"none",margin:"0 5px"},children:"x"}),!x&&m.jsx("span",{children:u.naturalHeight}),!x&&m.jsxs("span",{style:{flex:"none",margin:"0 5px 0 15px"},children:[o," "]}),m.jsx("span",{children:i.naturalWidth}),m.jsx("span",{style:{flex:"none",margin:"0 5px"},children:"x"}),m.jsx("span",{children:i.naturalHeight})]}),m.jsxs("div",{style:{position:"relative",width:c,height:f,margin:15,...nr},children:[m.jsx(F3,{orientation:"horizontal",offsets:[y],setOffsets:T=>A(T[0]),resizerColor:"#57606a80",resizerWidth:6}),m.jsx("img",{alt:o,style:{width:i.naturalWidth*r,height:i.naturalHeight*r},draggable:"false",src:i.src}),m.jsx("div",{style:{...v,bottom:0,overflow:"hidden",width:y,...nr},children:m.jsx("img",{alt:"Actual",style:{width:u.naturalWidth*r,height:u.naturalHeight*r},draggable:"false",src:u.src})})]})]})},yn=({image:i,title:u,alt:c,hideSize:f,canvasWidth:r,canvasHeight:o,scale:h,onClick:v})=>m.jsxs("div",{style:{flex:"none",display:"flex",alignItems:"center",flexDirection:"column"},children:[!f&&m.jsxs("div",{style:{margin:5},children:[u&&m.jsx("span",{style:{flex:"none",margin:"0 5px"},children:u}),m.jsx("span",{children:i.naturalWidth}),m.jsx("span",{style:{flex:"none",margin:"0 5px"},children:"x"}),m.jsx("span",{children:i.naturalHeight})]}),m.jsx("div",{style:{display:"flex",flex:"none",width:r,height:o,margin:15,...nr},children:m.jsx("img",{width:i.naturalWidth*h,height:i.naturalHeight*h,alt:u||c,style:{cursor:v?"pointer":"initial"},draggable:"false",src:i.src,onClick:v})})]});function _3(i,u){const c=/(\x1b\[(\d+(;\d+)*)m)|([^\x1b]+)/g,f=[];let r,o={},h=!1,v=u==null?void 0:u.fg,y=u==null?void 0:u.bg;for(;(r=c.exec(i))!==null;){const[,,A,,x]=r;if(A)for(const T of A.split(";")){const D=+T;switch(D){case 0:o={};break;case 1:o["font-weight"]="bold";break;case 2:o.opacity="0.8";break;case 3:o["font-style"]="italic";break;case 4:o["text-decoration"]="underline";break;case 7:h=!0;break;case 8:o.display="none";break;case 9:o["text-decoration"]="line-through";break;case 22:delete o["font-weight"],delete o["font-style"],delete o.opacity,delete o["text-decoration"];break;case 23:delete o["font-weight"],delete o["font-style"],delete o.opacity;break;case 24:delete o["text-decoration"];break;case 27:h=!1;break;case 30:case 31:case 32:case 33:case 34:case 35:case 36:case 37:v=b2[D-30];break;case 39:v=u==null?void 0:u.fg;break;case 40:case 41:case 42:case 43:case 44:case 45:case 46:case 47:y=b2[D-40];break;case 49:y=u==null?void 0:u.bg;break;case 53:o["text-decoration"]="overline";break;case 90:case 91:case 92:case 93:case 94:case 95:case 96:case 97:v=S2[D-90];break;case 100:case 101:case 102:case 103:case 104:case 105:case 106:case 107:y=S2[D-100];break}}else if(x){const T={...o},D=h?y:v;D!==void 0&&(T.color=D),h&&v&&(T["background-color"]=v),f.push(`<span style="${$3(T)}">${P3(x)}</span>`)}}return f.join("")}const b2={0:"var(--vscode-terminal-ansiBlack)",1:"var(--vscode-terminal-ansiRed)",2:"var(--vscode-terminal-ansiGreen)",3:"var(--vscode-terminal-ansiYellow)",4:"var(--vscode-terminal-ansiBlue)",5:"var(--vscode-terminal-ansiMagenta)",6:"var(--vscode-terminal-ansiCyan)",7:"var(--vscode-terminal-ansiWhite)"},S2={0:"var(--vscode-terminal-ansiBrightBlack)",1:"var(--vscode-terminal-ansiBrightRed)",2:"var(--vscode-terminal-ansiBrightGreen)",3:"var(--vscode-terminal-ansiBrightYellow)",4:"var(--vscode-terminal-ansiBrightBlue)",5:"var(--vscode-terminal-ansiBrightMagenta)",6:"var(--vscode-terminal-ansiBrightCyan)",7:"var(--vscode-terminal-ansiBrightWhite)"};function P3(i){return i.replace(/[&"<>]/g,u=>({"&":"&amp;",'"':"&quot;","<":"&lt;",">":"&gt;"})[u])}function $3(i){return Object.entries(i).map(([u,c])=>`${u}: ${c}`).join("; ")}const Ar=({code:i,children:u,testId:c})=>{const f=it.useMemo(()=>nv(i),[i]);return m.jsxs("div",{className:"test-error-container test-error-text","data-testid":c,children:[u,m.jsx("div",{className:"test-error-view",dangerouslySetInnerHTML:{__html:f||""}})]})},tv=({prompt:i})=>{const[u,c]=it.useState(!1);return m.jsx("button",{className:"button",style:{minWidth:100},onClick:async()=>{await navigator.clipboard.writeText(i),c(!0),setTimeout(()=>{c(!1)},3e3)},children:u?"Copied":"Copy prompt"})},ev=({diff:i})=>m.jsx("div",{"data-testid":"test-screenshot-error-view",className:"test-error-view",children:m.jsx(Vh,{diff:i,hideDetails:!0},"image-diff")});function nv(i){return _3(i||"",{bg:"var(--color-canvas-subtle)",fg:"var(--color-fg-default)"})}const Zh=({file:i,projectNames:u,isFileExpanded:c,setFileExpanded:f,footer:r})=>m.jsx(gr,{expanded:c?c(i.fileId):void 0,noInsets:!0,setExpanded:f?(o=>f(i.fileId,o)):void 0,header:m.jsx("span",{className:"chip-header-allow-selection",children:i.fileName}),footer:r,children:m.jsx(Ih,{tests:i.tests,projectNames:u})}),Ih=({tests:i,projectNames:u,runs:c,selectedTestId:f})=>{const r=se();return m.jsx("div",{role:"list",children:i.map((o,h)=>{const v=c==null?void 0:c[h],y=v!==void 0?o.results[v]:void 0,A=il({test:o,result:y},r),x=f===o.testId;return m.jsxs("div",{className:Ze("test-file-test","test-file-test-outcome-"+o.outcome,x&&"test-file-test-selected"),role:"listitem","aria-current":x,children:[m.jsxs("div",{className:"hbox",style:{alignItems:"flex-start"},children:[m.jsxs("div",{className:"hbox",children:[m.jsx("span",{className:"test-file-test-status-icon",children:fc(o.outcome)}),m.jsxs("span",{children:[m.jsx(bn,{href:A,title:[...o.path,o.title].join(" › "),children:m.jsx("span",{className:"test-file-title",children:[...o.path,o.title].join(" › ")})}),m.jsx(Qh,{style:{marginLeft:"6px"},projectNames:u,activeProjectName:o.projectName,otherLabels:o.tags})]})]}),m.jsx("span",{"data-testid":"test-duration",style:{minWidth:"50px",textAlign:"right"},children:Ta(o.duration)})]}),m.jsx("div",{className:"test-file-details-row",children:m.jsxs("div",{className:"test-file-details-row-items",children:[m.jsx(bn,{href:A,title:[...o.path,o.title].join(" › "),className:"test-file-path-link",children:m.jsxs("span",{className:"test-file-path",children:[o.location.file,":",o.location.line]})}),m.jsx(lv,{test:o}),m.jsx(av,{test:o}),m.jsx(zh,{test:o,dim:!0})]})})]},`test-${o.testId}`)})})};function lv({test:i}){const u=se();for(const c of i.results)for(const f of c.attachments)if(f.contentType.startsWith("image/")&&f.name.match(/-(expected|actual|diff)/))return m.jsx(dr,{href:il({test:i,result:c,anchor:`attachment-${c.attachments.indexOf(f)}`},u),title:"View images",dim:!0,children:m3()})}function av({test:i}){const u=se(),c=i.results.find(f=>f.attachments.some(r=>r.name==="video"));return c?m.jsx(dr,{href:il({test:i,result:c,anchor:"attachment-video"},u),title:"View video",dim:!0,children:g3()}):void 0}const iv=new RegExp("([\\u001B\\u009B][[\\]()#?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)|(?:(?:\\d{0,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~])))","g");function T2(i){return i.replace(iv,"")}function uv(i,u){var f;const c=new Map;for(const r of i){const o=r.name.match(/^(.*)-(expected|actual|diff|previous)(\.[^.]+)?$/);if(!o)continue;const[,h,v,y=""]=o,A=h+y;let x=c.get(A);x||(x={name:A,anchors:[`attachment-${h}`]},c.set(A,x)),x.anchors.push(`attachment-${u.attachments.indexOf(r)}`),v==="actual"&&(x.actual={attachment:r}),v==="expected"&&(x.expected={attachment:r,title:"Expected"}),v==="previous"&&(x.expected={attachment:r,title:"Previous"}),v==="diff"&&(x.diff={attachment:r})}for(const[r,o]of c)!o.actual||!o.expected?c.delete(r):(i.delete(o.actual.attachment),i.delete(o.expected.attachment),i.delete((f=o.diff)==null?void 0:f.attachment));return[...c.values()]}const cv=({report:i,test:u,result:c})=>{const{screenshots:f,videos:r,traces:o,otherAttachments:h,diffs:v,errors:y,otherAttachmentAnchors:A,screenshotAnchors:x,errorContext:T}=it.useMemo(()=>{const p=c.attachments.filter(z=>!z.name.startsWith("_")),E=new Set(p.filter(z=>z.contentType.startsWith("image/"))),b=[...E].map(z=>`attachment-${p.indexOf(z)}`),R=p.filter(z=>z.contentType.startsWith("video/")),N=p.filter(z=>z.name==="trace"),V=p.find(z=>z.name==="error-context"),F=new Set(p);[...E,...R,...N].forEach(z=>F.delete(z));const H=[...F].map(z=>`attachment-${p.indexOf(z)}`),j=uv(E,c),Y=c.errors.map(z=>z.message);return{screenshots:[...E],videos:R,traces:N,otherAttachments:F,diffs:j,errors:Y,otherAttachmentAnchors:H,screenshotAnchors:b,errorContext:V}},[c]),[D,X]=it.useState("");it.useEffect(()=>X(""),[c]);const q=E3(async()=>{var F;if((F=i.json().options)!=null&&F.noCopyPrompt||!T)return;let p=T.path?await fetch(T.path).then(H=>H.text()):T.body;if(!p)return;const E=c.attachments.find(H=>H.name==="stdout"),b=c.attachments.find(H=>H.name==="stderr"),R=E!=null&&E.body&&E.contentType==="text/plain"?E.body:void 0,N=b!=null&&b.body&&b.contentType==="text/plain"?b.body:void 0;R&&(p+=`
+
+# Stdout
+
+\`\`\`
+`+T2(R)+"\n```"),N&&(p+=`
+
+# Stderr
+
+\`\`\`
+`+T2(N)+"\n```");const V=i.json().metadata;return V!=null&&V.gitDiff&&(p+=`
+
+# Local changes
+
+\`\`\`diff
+`+V.gitDiff+"\n```"),p},[T,i,c],void 0);return m.jsxs("div",{className:"test-result",children:[!!y.length&&m.jsxs(ke,{header:"Errors",children:[q&&m.jsx("div",{style:{position:"absolute",right:"16px",padding:"10px",zIndex:1},children:m.jsx(tv,{prompt:q})}),y.map((p,E)=>{const b=sv(p,v);return m.jsxs(m.Fragment,{children:[m.jsx(Ar,{code:p},"test-result-error-message-"+E),b&&m.jsx(ev,{diff:b})]})})]}),!!c.steps.length&&m.jsxs(ke,{header:"Test Steps",children:[m.jsxs("form",{className:"subnav-search step-filter",onSubmit:p=>p.preventDefault(),children:[Oh(),m.jsx("input",{className:"form-control subnav-search-input input-contrast width-full",type:"search",spellCheck:!1,placeholder:"Filter steps","aria-label":"Filter steps",value:D,onChange:p=>X(p.target.value)})]}),c.steps.map((p,E)=>m.jsx(Jh,{step:p,result:c,test:u,depth:0,filterText:D},`step-${E}`))]}),v.map((p,E)=>m.jsx(xi,{id:p.anchors,children:m.jsx(ke,{dataTestId:"test-results-image-diff",header:`Image mismatch: ${p.name}`,revealOnAnchorId:p.anchors,children:m.jsx(Vh,{diff:p})})},`diff-${E}`)),!!f.length&&m.jsx(ke,{header:"Screenshots",revealOnAnchorId:x,children:f.map((p,E)=>m.jsxs(xi,{id:`attachment-${c.attachments.indexOf(p)}`,children:[m.jsx("a",{href:Ve(p.path),children:m.jsx("img",{className:"screenshot",src:Ve(p.path)})}),m.jsx($u,{attachment:p,result:c})]},`screenshot-${E}`))}),!!o.length&&m.jsx(xi,{id:"attachment-trace",children:m.jsx(ke,{header:"Traces",revealOnAnchorId:"attachment-trace",children:m.jsxs("div",{children:[m.jsx("a",{href:Ve(Lh(o)),children:m.jsx("img",{className:"screenshot",src:K3,style:{width:192,height:117,marginLeft:20}})}),o.map((p,E)=>m.jsx($u,{attachment:p,result:c,linkName:o.length===1?"trace":`trace-${E+1}`},`trace-${E}`))]})})}),!!r.length&&m.jsx(xi,{id:"attachment-video",children:m.jsx(ke,{header:"Videos",revealOnAnchorId:"attachment-video",children:r.map(p=>m.jsxs("div",{children:[m.jsx("video",{controls:!0,children:m.jsx("source",{src:Ve(p.path),type:p.contentType})}),m.jsx($u,{attachment:p,result:c})]},p.path))})}),!!h.size&&m.jsx(ke,{header:"Attachments",revealOnAnchorId:A,dataTestId:"attachments",children:[...h].map((p,E)=>m.jsx(xi,{id:`attachment-${c.attachments.indexOf(p)}`,children:m.jsx($u,{attachment:p,result:c,openInNewTab:p.contentType.startsWith("text/html")})},`attachment-link-${E}`))}),m.jsx(ke,{header:`Executed in Worker #${c.workerIndex}`,dataTestId:"worker-test-list",initialExpanded:!1,noInsets:!0,body:()=>{const p=fv(i).get(c.workerIndex)||{tests:[],runs:[]};return m.jsx(Ih,{tests:p.tests,runs:p.runs,projectNames:i.json().projectNames,selectedTestId:u.testId})}})]})};function sv(i,u){const c=i.split(`
+`)[0];if(!(!c.includes("toHaveScreenshot")&&!c.includes("toMatchSnapshot")))return u.find(f=>i.includes(f.name))}function qh(i,u){return i.title.toLowerCase().includes(u.toLowerCase())}function Kh(i,u){return i.steps.some(c=>qh(c,u)||Kh(c,u))}function kh(i){return i.steps.some(u=>u.attachments.length>0||kh(u))}const Jh=({test:i,step:u,result:c,depth:f,filterText:r})=>{const o=se();let h=!1,v=m.jsx("span",{children:u.title});if(r){const y=!!r&&qh(u,r),A=!!r&&Kh(u,r);if(!y&&!A)return null;if(h=A,y){const x=u.title.toLowerCase().split(r.toLowerCase()),T=[];let D=0;for(let X=0;X<x.length;X++)X&&(T.push(m.jsx("span",{className:"step-title-highlight",children:u.title.substring(D,D+r.length)},X)),D+=r.length),T.push(x[X]),D+=x[X].length;v=T}}return m.jsx(q3,{title:m.jsxs("div",{"aria-label":u.title,className:"step-title-container",children:[fc(u.error||u.duration===-1?"failed":u.skipped?"skipped":"passed"),m.jsxs("span",{className:"step-title-text",children:[v,u.count>1&&m.jsxs(m.Fragment,{children:[" ✕ ",m.jsx("span",{className:"test-result-counter",children:u.count})]}),u.location&&m.jsxs("span",{className:"test-result-path",children:["— ",u.location.file,":",u.location.line]})]}),m.jsx("span",{className:"step-spacer"}),u.attachments.length>0&&m.jsx("a",{className:"step-attachment-link",title:"reveal attachment",href:Ve(il({test:i,result:c,anchor:`attachment-${u.attachments[0]}`},o)),onClick:y=>{y.stopPropagation()},children:Rh()}),u.attachments.length===0&&kh(u)&&m.jsx("span",{className:"step-indirect-attachment-indicator",title:"contains attachment","aria-label":"contains attachment",children:d3()}),m.jsx("span",{className:"step-duration",children:Ta(u.duration)})]}),loadChildren:u.steps.length||u.snippet?()=>{const y=u.snippet?[m.jsx(Ar,{testId:"test-snippet",code:u.snippet},"line")]:[],A=u.steps.map((x,T)=>m.jsx(Jh,{step:x,depth:f+1,result:c,test:i,filterText:r},T));return y.concat(A)}:void 0,depth:f,expandByDefault:h})},C2=Symbol("workerLists");function fv(i){let u=i[C2];if(!u){const c=new Map;for(const f of i.json().files)for(const r of f.tests)for(let o=0;o<r.results.length;o++){let h=c.get(r.results[o].workerIndex);h||(h=[],c.set(r.results[o].workerIndex,h)),h.push({test:r,time:new Date(r.results[o].startTime).valueOf(),run:o})}u=new Map;for(const[f,r]of c)r.sort((o,h)=>o.time-h.time),u.set(f,{tests:r.map(o=>o.test),runs:r.map(o=>o.run)});i[C2]=u}return u}const rv=({report:i,test:u,run:c,next:f,prev:r})=>{const[o,h]=it.useState(c),v=se(),y=u.annotations.filter(A=>!A.type.startsWith("_"))??[];return D2(y,u.repeatEachIndex),m.jsxs(m.Fragment,{children:[m.jsx(mr,{title:u.title,leftSuperHeader:m.jsx("div",{className:"test-case-path",children:u.path.join(" › ")}),rightSuperHeader:m.jsxs(m.Fragment,{children:[m.jsx("div",{className:Ze(!r&&"hidden"),children:m.jsx(bn,{href:il({test:r},v),children:"« previous"})}),m.jsx("div",{style:{width:10}}),m.jsx("div",{className:Ze(!f&&"hidden"),children:m.jsx(bn,{href:il({test:f},v),children:"next »"})})]})}),m.jsxs("div",{className:"hbox",style:{lineHeight:"24px"},children:[m.jsx("div",{className:"test-case-location",children:m.jsxs(or,{value:`${u.location.file}:${u.location.line}`,children:[u.location.file,":",u.location.line]})}),m.jsx("div",{style:{flex:"auto"}}),m.jsx(zh,{test:u,trailingSeparator:!0}),m.jsx("div",{className:"test-case-duration",children:Ta(u.duration)})]}),m.jsx(Qh,{style:{marginLeft:"6px"},projectNames:i.json().projectNames,activeProjectName:u.projectName,otherLabels:u.tags}),u.results.length===0&&y.length!==0&&m.jsx(ke,{header:"Annotations",dataTestId:"test-case-annotations",children:y.map((A,x)=>m.jsx(O2,{annotation:A},x))}),m.jsx(I3,{tabs:u.results.map((A,x)=>({id:String(x),title:m.jsxs("div",{style:{display:"flex",alignItems:"center"},children:[fc(A.status)," ",ov(x),u.results.length>1&&m.jsx("span",{className:"test-case-run-duration",children:Ta(A.duration)})]}),render:()=>{const T=A.annotations.filter(D=>!D.type.startsWith("_"));return D2(T,u.repeatEachIndex),m.jsxs(m.Fragment,{children:[!!T.length&&m.jsx(ke,{header:"Annotations",dataTestId:"test-case-annotations",children:T.map((D,X)=>m.jsx(O2,{annotation:D},X))}),m.jsx(cv,{test:u,result:A,report:i})]})}}))||[],selectedTab:String(o),setSelectedTab:A=>h(+A)})]})};function O2({annotation:{type:i,description:u}}){return m.jsxs("div",{className:"test-case-annotation",children:[m.jsx("span",{style:{fontWeight:"bold"},children:i}),u&&m.jsxs(or,{value:u,children:[": ",Di(u)]})]})}function D2(i,u){u&&i.push({type:"repeatEachIndex",description:String(u)})}function ov(i){return i?`Retry #${i}`:"Run"}class dv extends it.Component{constructor(){super(...arguments),this.state={error:null,errorInfo:null}}componentDidCatch(u,c){this.setState({error:u,errorInfo:c})}render(){var u,c,f;return this.state.error||this.state.errorInfo?m.jsxs("div",{className:"metadata-view p-3",children:[m.jsx("p",{children:"An error was encountered when trying to render metadata."}),m.jsx("p",{children:m.jsxs("pre",{style:{overflow:"scroll"},children:[(u=this.state.error)==null?void 0:u.message,m.jsx("br",{}),(c=this.state.error)==null?void 0:c.stack,m.jsx("br",{}),(f=this.state.errorInfo)==null?void 0:f.componentStack]})})]}):this.props.children}}const hv=i=>m.jsx(dv,{children:m.jsx(mv,{metadata:i.metadata})}),mv=i=>{const u=i.metadata,c=se().has("show-metadata-other")?Object.entries(i.metadata).filter(([r])=>!Fh.has(r)):[];if(u.ci||u.gitCommit||c.length>0)return m.jsxs("div",{className:"metadata-view",children:[u.ci&&!u.gitCommit&&m.jsx(gv,{info:u.ci}),u.gitCommit&&m.jsx(Av,{ci:u.ci,commit:u.gitCommit}),c.length>0&&m.jsxs(m.Fragment,{children:[(u.gitCommit||u.ci)&&m.jsx("div",{className:"metadata-separator"}),m.jsx("div",{className:"metadata-section metadata-properties",role:"list",children:c.map(([r,o])=>{const h=typeof o!="object"||o===null||o===void 0?String(o):JSON.stringify(o),v=h.length>1e3?h.slice(0,1e3)+"…":h;return m.jsx("div",{className:"copyable-property",role:"listitem",children:m.jsxs(or,{value:h,children:[m.jsx("span",{style:{fontWeight:"bold"},title:r,children:r}),": ",m.jsx("span",{title:v,children:Di(v)})]})},r)})})]})]})},gv=({info:i})=>{const u=i.prTitle||`Commit ${i.commitHash}`,c=i.prHref||i.commitHref;return m.jsx("div",{className:"metadata-section",role:"list",children:m.jsx("div",{role:"listitem",children:m.jsx("a",{href:Ve(c),target:"_blank",rel:"noopener noreferrer",title:u,children:u})})})},Av=({ci:i,commit:u})=>{const c=(i==null?void 0:i.prTitle)||u.subject,f=(i==null?void 0:i.prHref)||(i==null?void 0:i.commitHref),r=` <${u.author.email}>`,o=`${u.author.name}${r}`,h=Intl.DateTimeFormat(void 0,{dateStyle:"medium"}).format(u.committer.time),v=Intl.DateTimeFormat(void 0,{dateStyle:"full",timeStyle:"long"}).format(u.committer.time);return m.jsxs("div",{className:"metadata-section",role:"list",children:[m.jsxs("div",{role:"listitem",children:[f&&m.jsx("a",{href:Ve(f),target:"_blank",rel:"noopener noreferrer",title:c,children:c}),!f&&m.jsx("span",{title:c,children:c})]}),m.jsxs("div",{role:"listitem",className:"hbox",children:[m.jsx("span",{className:"mr-1",children:o}),m.jsxs("span",{title:v,children:[" on ",h]})]})]})},Fh=new Set(["ci","gitCommit","gitDiff","actualWorkers"]),vv=i=>{const u=Object.entries(i).filter(([c])=>!Fh.has(c));return!i.ci&&!i.gitCommit&&!u.length},yv=({files:i,expandedFiles:u,setExpandedFiles:c,projectNames:f})=>{const r=it.useMemo(()=>{const o=[];let h=0;for(const v of i)h+=v.tests.length,o.push({file:v,defaultExpanded:h<200});return o},[i]);return m.jsx(m.Fragment,{children:r.length>0?r.map(({file:o,defaultExpanded:h})=>m.jsx(Zh,{file:o,projectNames:f,isFileExpanded:v=>{const y=u.get(v);return y===void 0?h:!!y},setFileExpanded:(v,y)=>{const A=new Map(u);A.set(v,y),c(A)}},`file-${o.fileId}`)):m.jsx("div",{className:"chip-header test-file-no-files",children:"No tests found"})})},R2=({report:i,filteredStats:u,metadataVisible:c,toggleMetadataVisible:f,errorsVisible:r,setErrorsVisible:o})=>{if(!i)return null;const h=i.projectNames.length===1&&!!i.projectNames[0],v=!h&&!u,y=!vv(i.metadata)&&m.jsxs("div",{className:Ze("metadata-toggle",!v&&"metadata-toggle-second-line"),role:"button",onClick:f,title:c?"Hide metadata":"Show metadata",children:[c?Mi():Sa(),"Metadata"]}),A=m.jsxs("div",{className:"test-file-header-info",children:[h&&m.jsxs("div",{"data-testid":"project-name",children:["Project: ",i.projectNames[0]]}),u&&m.jsxs("div",{"data-testid":"filtered-tests-count",children:["Filtered: ",u.total," ",!!u.total&&"("+Ta(u.duration)+")"]}),v&&y]}),x=m.jsxs(m.Fragment,{children:[m.jsx("div",{"data-testid":"overall-time",style:{marginRight:"10px"},children:i?new Date(i.startTime).toLocaleString():""}),m.jsxs("div",{"data-testid":"overall-duration",children:["Total time: ",Ta(i.duration??0)]})]});return m.jsxs(m.Fragment,{children:[m.jsx(mr,{title:i.options.title,leftSuperHeader:A,rightSuperHeader:x}),!v&&y,c&&m.jsx(hv,{metadata:i.metadata}),!!i.errors.length&&m.jsx(gr,{header:"Errors",dataTestId:"report-errors",expanded:r,setExpanded:o,children:i.errors.map((T,D)=>m.jsx(Ar,{code:T},"test-report-error-message-"+D))})]})},Wh=i=>{const u=Math.round(i/1e3),c=Math.floor(u/60),f=u%60;return c===0?`${f}s`:`${c}m ${f}s`},Ev=({entries:i})=>{const f=Math.max(...i.map(j=>j.label.length))*10,o={top:20,right:20,bottom:40,left:Math.min(800*.5,Math.max(50,f))},h=800-o.left-o.right,v=Math.min(...i.map(j=>j.startTime)),y=Math.max(...i.map(j=>j.startTime+j.duration));let A,x;const T=y-v;T<60*1e3?(A=10*1e3,x=!0):T<300*1e3?(A=30*1e3,x=!0):T<1800*1e3?(A=300*1e3,x=!1):(A=600*1e3,x=!1);const D=Math.ceil(v/A)*A,X=(j,Y)=>{const z=new Date(j).toLocaleTimeString(void 0,{hour:"2-digit",minute:"2-digit",second:x?"2-digit":void 0});if(Y)return z;if(z.endsWith(" AM")||z.endsWith(" PM"))return z.slice(0,-3)},p=(y-v)*1.1,E=Math.ceil(p/A)*A,b=h/E,R=20,N=8,V=i.length*(R+N),F=[];for(let j=D;j<=v+E;j+=A){const Y=j-v;F.push({x:Y*b,label:X(j,j===D)})}const H=V+o.top+o.bottom;return m.jsx("svg",{viewBox:`0 0 800 ${H}`,preserveAspectRatio:"xMidYMid meet",style:{width:"100%",height:"auto"},role:"img",children:m.jsxs("g",{transform:`translate(${o.left}, ${o.top})`,role:"presentation",children:[F.map(({x:j,label:Y},z)=>m.jsxs("g",{"aria-hidden":"true",children:[m.jsx("line",{x1:j,y1:0,x2:j,y2:V,stroke:"var(--color-border-muted)",strokeWidth:"1"}),m.jsx("text",{x:j,y:V+20,textAnchor:"middle",dominantBaseline:"middle",fontSize:"12",fill:"var(--color-fg-muted)",children:Y})]},z)),i.map((j,Y)=>{const z=j.startTime-v,I=j.duration*b,k=z*b,nt=Y*(R+N),P=["var(--color-scale-blue-2)","var(--color-scale-blue-3)","var(--color-scale-blue-4)"],st=P[Y%P.length];return m.jsxs("g",{role:"listitem","aria-label":j.tooltip,children:[m.jsx("rect",{className:"gantt-bar",x:k,y:nt,width:I,height:R,fill:st,rx:"2",children:m.jsx("title",{children:j.tooltip})}),m.jsx("text",{x:k+I+6,y:nt+R/2,dominantBaseline:"middle",fontSize:"12",fill:"var(--color-fg-muted)","aria-hidden":"true",children:Wh(j.duration)}),m.jsx("text",{x:-10,y:nt+R/2,textAnchor:"end",dominantBaseline:"middle",fontSize:"12",fill:"var(--color-fg-muted)","aria-hidden":"true",children:j.label})]},Y)}),m.jsx("line",{x1:0,y1:0,x2:0,y2:V,stroke:"var(--color-fg-muted)",strokeWidth:"1","aria-hidden":"true"}),m.jsx("line",{x1:0,y1:V,x2:h,y2:V,stroke:"var(--color-fg-muted)",strokeWidth:"1","aria-hidden":"true"})]})})};function pv({report:i,tests:u}){return m.jsxs(m.Fragment,{children:[m.jsx(bv,{report:i}),m.jsx(xv,{report:i,tests:u})]})}function xv({report:i,tests:u}){const[c,f]=ue.useState(50);return m.jsx(Zh,{file:{fileId:"slowest",fileName:"Slowest Tests",tests:u.slice(0,c),stats:null},projectNames:i.json().projectNames,footer:c<u.length?m.jsxs("button",{className:"link-badge fullwidth-link",style:{padding:"8px 5px"},onClick:()=>f(r=>r+50),children:[Mi(),"Show 50 more"]}):void 0})}function bv({report:i}){const u=i.json().machines;if(u.length===0)return null;const c=u.map(f=>{const r=f.tag.join(" "),o=new Date(f.startTime).toLocaleTimeString([],{hour:"2-digit",minute:"2-digit",second:"2-digit",timeZoneName:"short"});let h=`${r} started at ${o}, runs ${Wh(f.duration)}`;return f.shardIndex&&(h+=` (shard ${f.shardIndex})`),{label:r,tooltip:h,startTime:f.startTime,duration:f.duration,shardIndex:f.shardIndex??1}}).sort((f,r)=>f.label.localeCompare(r.label)||f.shardIndex-r.shardIndex);return m.jsx(ke,{header:"Timeline",children:m.jsx(Ev,{entries:c})})}const Sv=i=>!i.has("testId")&&!i.has("speedboard"),Tv=i=>i.has("testId"),Cv=i=>i.has("speedboard")&&!i.has("testId"),Ov=({report:i})=>{var H,j;const u=se(),[c,f]=it.useState(new Map),[r,o]=it.useState(u.get("q")||""),[h,v]=it.useState(!1),[y,A]=it.useState(!0),x=u.has("speedboard"),[T]=Bh("mergeFiles",!1),D=u.get("testId"),X=((H=u.get("q"))==null?void 0:H.toString())||"",q=X?"&q="+X:"",p=(j=i==null?void 0:i.json())==null?void 0:j.options.title,E=it.useMemo(()=>{const Y=new Map;for(const z of(i==null?void 0:i.json().files)||[])for(const I of z.tests)Y.set(I.testId,z.fileId);return Y},[i]),b=it.useMemo(()=>uc.parse(r),[r]),R=it.useMemo(()=>b.empty()?void 0:Rv((i==null?void 0:i.json().files)||[],b),[i,b]),N=it.useMemo(()=>x?jv(i,b):T?Mv(i,b):wv(i,b),[i,b,T,x]),{prev:V,next:F}=it.useMemo(()=>{const Y=N.tests.findIndex(k=>k.testId===D),z=Y>0?N.tests[Y-1]:void 0,I=Y<N.tests.length-1?N.tests[Y+1]:void 0;return{prev:z,next:I}},[D,N]);return it.useEffect(()=>{const Y=z=>{if(z.target instanceof HTMLInputElement||z.target instanceof HTMLTextAreaElement||z.shiftKey||z.ctrlKey||z.metaKey||z.altKey)return;const I=new URLSearchParams(u);switch(z.key){case"a":z.preventDefault(),ll("#?");break;case"p":z.preventDefault(),I.delete("testId"),I.delete("speedboard"),ll(Ml(I,"s:passed",!1));break;case"f":z.preventDefault(),I.delete("testId"),I.delete("speedboard"),ll(Ml(I,"s:failed",!1));break;case"ArrowLeft":V&&(z.preventDefault(),I.delete("testId"),ll(il({test:V},I)+q));break;case"ArrowRight":F&&(z.preventDefault(),I.delete("testId"),ll(il({test:F},I)+q));break}};return document.addEventListener("keydown",Y),()=>document.removeEventListener("keydown",Y)},[V,F,q,X,u]),it.useEffect(()=>{p?document.title=p:document.title="Playwright Test Report"},[p]),m.jsx("div",{className:"htmlreport vbox px-4 pb-4",children:m.jsxs("main",{children:[i&&m.jsx(G3,{stats:i.json().stats,filterText:r,setFilterText:o}),m.jsxs(Vf,{predicate:Sv,children:[m.jsx(R2,{report:i==null?void 0:i.json(),filteredStats:R,metadataVisible:h,toggleMetadataVisible:()=>v(Y=>!Y),errorsVisible:y,setErrorsVisible:A}),m.jsx(yv,{files:N.files,expandedFiles:c,setExpandedFiles:f,projectNames:(i==null?void 0:i.json().projectNames)||[]})]}),m.jsxs(Vf,{predicate:Cv,children:[m.jsx(R2,{report:i==null?void 0:i.json(),filteredStats:R,metadataVisible:h,toggleMetadataVisible:()=>v(Y=>!Y),errorsVisible:y,setErrorsVisible:A}),i&&m.jsx(pv,{report:i,tests:N.tests})]}),m.jsx(Vf,{predicate:Tv,children:i&&m.jsx(Dv,{report:i,next:F,prev:V,testId:D,testIdToFileIdMap:E})})]})})},Dv=({report:i,testIdToFileIdMap:u,next:c,prev:f,testId:r})=>{const[o,h]=it.useState("loading"),v=+(se().get("run")||"0");return it.useEffect(()=>{(async()=>{if(!r||typeof o=="object"&&r===o.testId)return;const y=u.get(r);if(!y){h("not-found");return}const A=await i.entry(`${y}.json`);h((A==null?void 0:A.tests.find(x=>x.testId===r))||"not-found")})()},[o,i,r,u]),o==="loading"?m.jsx("div",{className:"test-case-column"}):o==="not-found"?m.jsxs("div",{className:"test-case-column",children:[m.jsx(mr,{title:"Test not found"}),m.jsxs("div",{className:"test-case-location",children:["Test ID: ",r]})]}):m.jsx("div",{className:"test-case-column",children:m.jsx(rv,{report:i,next:c,prev:f,test:o,run:v})})};function Rv(i,u){const c={total:0,duration:0};for(const f of i){const r=f.tests.filter(o=>u.matches(o));c.total+=r.length;for(const o of r)c.duration+=o.duration}return c}function wv(i,u){const c={files:[],tests:[]};for(const f of(i==null?void 0:i.json().files)||[]){const r=f.tests.filter(o=>u.matches(o));r.length&&c.files.push({...f,tests:r}),c.tests.push(...r)}return c}function Mv(i,u){const c=[],f=new Map;for(const o of(i==null?void 0:i.json().files)||[]){const h=o.tests.filter(v=>u.matches(v));for(const v of h){const y=v.path[0]??"<anonymous>";let A=f.get(y);A||(A={fileId:y,fileName:y,tests:[],stats:{total:0,expected:0,unexpected:0,flaky:0,skipped:0,ok:!0}},f.set(y,A),c.push(A));const x={...v,path:v.path.slice(1)};A.tests.push(x)}}c.sort((o,h)=>o.fileName.localeCompare(h.fileName));const r={files:c,tests:[]};for(const o of c)r.tests.push(...o.tests);return r}function jv(i,u){const f=((i==null?void 0:i.json().files)||[]).flatMap(r=>r.tests).filter(r=>u.matches(r));return f.sort((r,o)=>o.duration-r.duration),{files:[],tests:f}}const Nv="data:image/svg+xml,%3csvg%20width='400'%20height='400'%20viewBox='0%200%20400%20400'%20fill='none'%20xmlns='http://www.w3.org/2000/svg'%3e%3cpath%20d='M136.444%20221.556C123.558%20225.213%20115.104%20231.625%20109.535%20238.032C114.869%20233.364%20122.014%20229.08%20131.652%20226.348C141.51%20223.554%20149.92%20223.574%20156.869%20224.915V219.481C150.941%20218.939%20144.145%20219.371%20136.444%20221.556ZM108.946%20175.876L61.0895%20188.484C61.0895%20188.484%2061.9617%20189.716%2063.5767%20191.36L104.153%20180.668C104.153%20180.668%20103.578%20188.077%2098.5847%20194.705C108.03%20187.559%20108.946%20175.876%20108.946%20175.876ZM149.005%20288.347C81.6582%20306.486%2046.0272%20228.438%2035.2396%20187.928C30.2556%20169.229%2028.0799%20155.067%2027.5%20145.928C27.4377%20144.979%2027.4665%20144.179%2027.5336%20143.446C24.04%20143.657%2022.3674%20145.473%2022.7077%20150.721C23.2876%20159.855%2025.4633%20174.016%2030.4473%20192.721C41.2301%20233.225%2076.8659%20311.273%20144.213%20293.134C158.872%20289.185%20169.885%20281.992%20178.152%20272.81C170.532%20279.692%20160.995%20285.112%20149.005%20288.347ZM161.661%20128.11V132.903H188.077C187.535%20131.206%20186.989%20129.677%20186.447%20128.11H161.661Z'%20fill='%232D4552'/%3e%3cpath%20d='M193.981%20167.584C205.861%20170.958%20212.144%20179.287%20215.465%20186.658L228.711%20190.42C228.711%20190.42%20226.904%20164.623%20203.57%20157.995C181.741%20151.793%20168.308%20170.124%20166.674%20172.496C173.024%20167.972%20182.297%20164.268%20193.981%20167.584ZM299.422%20186.777C277.573%20180.547%20264.145%20198.916%20262.535%20201.255C268.89%20196.736%20278.158%20193.031%20289.837%20196.362C301.698%20199.741%20307.976%20208.06%20311.307%20215.436L324.572%20219.212C324.572%20219.212%20322.736%20193.41%20299.422%20186.777ZM286.262%20254.795L176.072%20223.99C176.072%20223.99%20177.265%20230.038%20181.842%20237.869L274.617%20263.805C282.255%20259.386%20286.262%20254.795%20286.262%20254.795ZM209.867%20321.102C122.618%20297.71%20133.166%20186.543%20147.284%20133.865C153.097%20112.156%20159.073%2096.0203%20164.029%2085.204C161.072%2084.5953%20158.623%2086.1529%20156.203%2091.0746C150.941%20101.747%20144.212%20119.124%20137.7%20143.45C123.586%20196.127%20113.038%20307.29%20200.283%20330.682C241.406%20341.699%20273.442%20324.955%20297.323%20298.659C274.655%20319.19%20245.714%20330.701%20209.867%20321.102Z'%20fill='%232D4552'/%3e%3cpath%20d='M161.661%20262.296V239.863L99.3324%20257.537C99.3324%20257.537%20103.938%20230.777%20136.444%20221.556C146.302%20218.762%20154.713%20218.781%20161.661%20220.123V128.11H192.869C189.471%20117.61%20186.184%20109.526%20183.423%20103.909C178.856%2094.612%20174.174%20100.775%20163.545%20109.665C156.059%20115.919%20137.139%20129.261%20108.668%20136.933C80.1966%20144.61%2057.179%20142.574%2047.5752%20140.911C33.9601%20138.562%2026.8387%20135.572%2027.5049%20145.928C28.0847%20155.062%2030.2605%20169.224%2035.2445%20187.928C46.0272%20228.433%2081.663%20306.481%20149.01%20288.342C166.602%20283.602%20179.019%20274.233%20187.626%20262.291H161.661V262.296ZM61.0848%20188.484L108.946%20175.876C108.946%20175.876%20107.551%20194.288%2089.6087%20199.018C71.6614%20203.743%2061.0848%20188.484%2061.0848%20188.484Z'%20fill='%23E2574C'/%3e%3cpath%20d='M341.786%20129.174C329.345%20131.355%20299.498%20134.072%20262.612%20124.185C225.716%20114.304%20201.236%2097.0224%20191.537%2088.8994C177.788%2077.3834%20171.74%2069.3802%20165.788%2081.4857C160.526%2092.163%20153.797%20109.54%20147.284%20133.866C133.171%20186.543%20122.623%20297.706%20209.867%20321.098C297.093%20344.47%20343.53%20242.92%20357.644%20190.238C364.157%20165.917%20367.013%20147.5%20367.799%20135.625C368.695%20122.173%20359.455%20126.078%20341.786%20129.174ZM166.497%20172.756C166.497%20172.756%20180.246%20151.372%20203.565%20158C226.899%20164.628%20228.706%20190.425%20228.706%20190.425L166.497%20172.756ZM223.42%20268.713C182.403%20256.698%20176.077%20223.99%20176.077%20223.99L286.262%20254.796C286.262%20254.791%20264.021%20280.578%20223.42%20268.713ZM262.377%20201.495C262.377%20201.495%20276.107%20180.126%20299.422%20186.773C322.736%20193.411%20324.572%20219.208%20324.572%20219.208L262.377%20201.495Z'%20fill='%232EAD33'/%3e%3cpath%20d='M139.88%20246.04L99.3324%20257.532C99.3324%20257.532%20103.737%20232.44%20133.607%20222.496L110.647%20136.33L108.663%20136.933C80.1918%20144.611%2057.1742%20142.574%2047.5704%20140.911C33.9554%20138.563%2026.834%20135.572%2027.5001%20145.929C28.08%20155.063%2030.2557%20169.224%2035.2397%20187.929C46.0225%20228.433%2081.6583%20306.481%20149.005%20288.342L150.989%20287.719L139.88%20246.04ZM61.0848%20188.485L108.946%20175.876C108.946%20175.876%20107.551%20194.288%2089.6087%20199.018C71.6615%20203.743%2061.0848%20188.485%2061.0848%20188.485Z'%20fill='%23D65348'/%3e%3cpath%20d='M225.27%20269.163L223.415%20268.712C182.398%20256.698%20176.072%20223.99%20176.072%20223.99L232.89%20239.872L262.971%20124.281L262.607%20124.185C225.711%20114.304%20201.232%2097.0224%20191.532%2088.8994C177.783%2077.3834%20171.735%2069.3802%20165.783%2081.4857C160.526%2092.163%20153.797%20109.54%20147.284%20133.866C133.171%20186.543%20122.623%20297.706%20209.867%20321.097L211.655%20321.5L225.27%20269.163ZM166.497%20172.756C166.497%20172.756%20180.246%20151.372%20203.565%20158C226.899%20164.628%20228.706%20190.425%20228.706%20190.425L166.497%20172.756Z'%20fill='%231D8D22'/%3e%3cpath%20d='M141.946%20245.451L131.072%20248.537C133.641%20263.019%20138.169%20276.917%20145.276%20289.195C146.513%20288.922%20147.74%20288.687%20149%20288.342C152.302%20287.451%20155.364%20286.348%20158.312%20285.145C150.371%20273.361%20145.118%20259.789%20141.946%20245.451ZM137.7%20143.451C132.112%20164.307%20127.113%20194.326%20128.489%20224.436C130.952%20223.367%20133.554%20222.371%20136.444%20221.551L138.457%20221.101C136.003%20188.939%20141.308%20156.165%20147.284%20133.866C148.799%20128.225%20150.318%20122.978%20151.832%20118.085C149.393%20119.637%20146.767%20121.228%20143.776%20122.867C141.759%20129.093%20139.722%20135.898%20137.7%20143.451Z'%20fill='%23C04B41'/%3e%3c/svg%3e",If=t3,vr=document.createElement("link");vr.rel="shortcut icon";vr.href=Nv;document.head.appendChild(vr);const Hv=()=>{const[i,u]=it.useState();return it.useEffect(()=>{const c=new Bv;c.load().then(()=>{var f;(f=document.getElementById("playwrightReportBase64"))==null||f.remove(),u(c)})},[]),m.jsx(R3,{children:m.jsx(Ov,{report:i})})};window.onload=()=>{Q3(),s3.createRoot(document.querySelector("#root")).render(m.jsx(Hv,{}))};class Bv{constructor(){this._entries=new Map}async load(){const u=document.getElementById("playwrightReportBase64").content.textContent,c=new If.ZipReader(new If.Data64URIReader(u),{useWebWorkers:!1});for(const f of await c.getEntries())this._entries.set(f.filename,f);this._json=await this.entry("report.json")}json(){return this._json}async entry(u){const c=this._entries.get(u),f=new If.TextWriter;return await c.getData(f),JSON.parse(await f.getData())}}
+</script>
+    <style type='text/css'>:root{--color-canvas-default-transparent: rgba(255,255,255,0);--color-marketing-icon-primary: #218bff;--color-marketing-icon-secondary: #54aeff;--color-diff-blob-addition-num-text: #24292f;--color-diff-blob-addition-fg: #24292f;--color-diff-blob-addition-num-bg: #CCFFD8;--color-diff-blob-addition-line-bg: #E6FFEC;--color-diff-blob-addition-word-bg: #ABF2BC;--color-diff-blob-deletion-num-text: #24292f;--color-diff-blob-deletion-fg: #24292f;--color-diff-blob-deletion-num-bg: #FFD7D5;--color-diff-blob-deletion-line-bg: #FFEBE9;--color-diff-blob-deletion-word-bg: rgba(255,129,130,.4);--color-diff-blob-hunk-num-bg: rgba(84,174,255,.4);--color-diff-blob-expander-icon: #57606a;--color-diff-blob-selected-line-highlight-mix-blend-mode: multiply;--color-diffstat-deletion-border: rgba(27,31,36,.15);--color-diffstat-addition-border: rgba(27,31,36,.15);--color-diffstat-addition-bg: #2da44e;--color-search-keyword-hl: #fff8c5;--color-prettylights-syntax-comment: #6e7781;--color-prettylights-syntax-constant: #0550ae;--color-prettylights-syntax-entity: #8250df;--color-prettylights-syntax-storage-modifier-import: #24292f;--color-prettylights-syntax-entity-tag: #116329;--color-prettylights-syntax-keyword: #cf222e;--color-prettylights-syntax-string: #0a3069;--color-prettylights-syntax-variable: #953800;--color-prettylights-syntax-brackethighlighter-unmatched: #82071e;--color-prettylights-syntax-invalid-illegal-text: #f6f8fa;--color-prettylights-syntax-invalid-illegal-bg: #82071e;--color-prettylights-syntax-carriage-return-text: #f6f8fa;--color-prettylights-syntax-carriage-return-bg: #cf222e;--color-prettylights-syntax-string-regexp: #116329;--color-prettylights-syntax-markup-list: #3b2300;--color-prettylights-syntax-markup-heading: #0550ae;--color-prettylights-syntax-markup-italic: #24292f;--color-prettylights-syntax-markup-bold: #24292f;--color-prettylights-syntax-markup-deleted-text: #82071e;--color-prettylights-syntax-markup-deleted-bg: #FFEBE9;--color-prettylights-syntax-markup-inserted-text: #116329;--color-prettylights-syntax-markup-inserted-bg: #dafbe1;--color-prettylights-syntax-markup-changed-text: #953800;--color-prettylights-syntax-markup-changed-bg: #ffd8b5;--color-prettylights-syntax-markup-ignored-text: #eaeef2;--color-prettylights-syntax-markup-ignored-bg: #0550ae;--color-prettylights-syntax-meta-diff-range: #8250df;--color-prettylights-syntax-brackethighlighter-angle: #57606a;--color-prettylights-syntax-sublimelinter-gutter-mark: #8c959f;--color-prettylights-syntax-constant-other-reference-link: #0a3069;--color-codemirror-text: #24292f;--color-codemirror-bg: #ffffff;--color-codemirror-gutters-bg: #ffffff;--color-codemirror-guttermarker-text: #ffffff;--color-codemirror-guttermarker-subtle-text: #6e7781;--color-codemirror-linenumber-text: #57606a;--color-codemirror-cursor: #24292f;--color-codemirror-selection-bg: rgba(84,174,255,.4);--color-codemirror-activeline-bg: rgba(234,238,242,.5);--color-codemirror-matchingbracket-text: #24292f;--color-codemirror-lines-bg: #ffffff;--color-codemirror-syntax-comment: #24292f;--color-codemirror-syntax-constant: #0550ae;--color-codemirror-syntax-entity: #8250df;--color-codemirror-syntax-keyword: #cf222e;--color-codemirror-syntax-storage: #cf222e;--color-codemirror-syntax-string: #0a3069;--color-codemirror-syntax-support: #0550ae;--color-codemirror-syntax-variable: #953800;--color-checks-bg: #24292f;--color-checks-run-border-width: 0px;--color-checks-container-border-width: 0px;--color-checks-text-primary: #f6f8fa;--color-checks-text-secondary: #8c959f;--color-checks-text-link: #54aeff;--color-checks-btn-icon: #afb8c1;--color-checks-btn-hover-icon: #f6f8fa;--color-checks-btn-hover-bg: rgba(255,255,255,.125);--color-checks-input-text: #eaeef2;--color-checks-input-placeholder-text: #8c959f;--color-checks-input-focus-text: #8c959f;--color-checks-input-bg: #32383f;--color-checks-input-shadow: none;--color-checks-donut-error: #fa4549;--color-checks-donut-pending: #bf8700;--color-checks-donut-success: #2da44e;--color-checks-donut-neutral: #afb8c1;--color-checks-dropdown-text: #afb8c1;--color-checks-dropdown-bg: #32383f;--color-checks-dropdown-border: #424a53;--color-checks-dropdown-shadow: rgba(27,31,36,.3);--color-checks-dropdown-hover-text: #f6f8fa;--color-checks-dropdown-hover-bg: #424a53;--color-checks-dropdown-btn-hover-text: #f6f8fa;--color-checks-dropdown-btn-hover-bg: #32383f;--color-checks-scrollbar-thumb-bg: #57606a;--color-checks-header-label-text: #d0d7de;--color-checks-header-label-open-text: #f6f8fa;--color-checks-header-border: #32383f;--color-checks-header-icon: #8c959f;--color-checks-line-text: #d0d7de;--color-checks-line-num-text: rgba(140,149,159,.75);--color-checks-line-timestamp-text: #8c959f;--color-checks-line-hover-bg: #32383f;--color-checks-line-selected-bg: rgba(33,139,255,.15);--color-checks-line-selected-num-text: #54aeff;--color-checks-line-dt-fm-text: #24292f;--color-checks-line-dt-fm-bg: #9a6700;--color-checks-gate-bg: rgba(125,78,0,.15);--color-checks-gate-text: #d0d7de;--color-checks-gate-waiting-text: #afb8c1;--color-checks-step-header-open-bg: #32383f;--color-checks-step-error-text: #ff8182;--color-checks-step-warning-text: #d4a72c;--color-checks-logline-text: #8c959f;--color-checks-logline-num-text: rgba(140,149,159,.75);--color-checks-logline-debug-text: #c297ff;--color-checks-logline-error-text: #d0d7de;--color-checks-logline-error-num-text: #ff8182;--color-checks-logline-error-bg: rgba(164,14,38,.15);--color-checks-logline-warning-text: #d0d7de;--color-checks-logline-warning-num-text: #d4a72c;--color-checks-logline-warning-bg: rgba(125,78,0,.15);--color-checks-logline-command-text: #54aeff;--color-checks-logline-section-text: #4ac26b;--color-checks-ansi-black: #24292f;--color-checks-ansi-black-bright: #32383f;--color-checks-ansi-white: #d0d7de;--color-checks-ansi-white-bright: #d0d7de;--color-checks-ansi-gray: #8c959f;--color-checks-ansi-red: #ff8182;--color-checks-ansi-red-bright: #ffaba8;--color-checks-ansi-green: #4ac26b;--color-checks-ansi-green-bright: #6fdd8b;--color-checks-ansi-yellow: #d4a72c;--color-checks-ansi-yellow-bright: #eac54f;--color-checks-ansi-blue: #54aeff;--color-checks-ansi-blue-bright: #80ccff;--color-checks-ansi-magenta: #c297ff;--color-checks-ansi-magenta-bright: #d8b9ff;--color-checks-ansi-cyan: #76e3ea;--color-checks-ansi-cyan-bright: #b3f0ff;--color-project-header-bg: #24292f;--color-project-sidebar-bg: #ffffff;--color-project-gradient-in: #ffffff;--color-project-gradient-out: rgba(255,255,255,0);--color-mktg-success: rgba(36,146,67,1);--color-mktg-info: rgba(19,119,234,1);--color-mktg-bg-shade-gradient-top: rgba(27,31,36,.065);--color-mktg-bg-shade-gradient-bottom: rgba(27,31,36,0);--color-mktg-btn-bg-top: hsla(228,82%,66%,1);--color-mktg-btn-bg-bottom: #4969ed;--color-mktg-btn-bg-overlay-top: hsla(228,74%,59%,1);--color-mktg-btn-bg-overlay-bottom: #3355e0;--color-mktg-btn-text: #ffffff;--color-mktg-btn-primary-bg-top: hsla(137,56%,46%,1);--color-mktg-btn-primary-bg-bottom: #2ea44f;--color-mktg-btn-primary-bg-overlay-top: hsla(134,60%,38%,1);--color-mktg-btn-primary-bg-overlay-bottom: #22863a;--color-mktg-btn-primary-text: #ffffff;--color-mktg-btn-enterprise-bg-top: hsla(249,100%,72%,1);--color-mktg-btn-enterprise-bg-bottom: #6f57ff;--color-mktg-btn-enterprise-bg-overlay-top: hsla(248,65%,63%,1);--color-mktg-btn-enterprise-bg-overlay-bottom: #614eda;--color-mktg-btn-enterprise-text: #ffffff;--color-mktg-btn-outline-text: #4969ed;--color-mktg-btn-outline-border: rgba(73,105,237,.3);--color-mktg-btn-outline-hover-text: #3355e0;--color-mktg-btn-outline-hover-border: rgba(51,85,224,.5);--color-mktg-btn-outline-focus-border: #4969ed;--color-mktg-btn-outline-focus-border-inset: rgba(73,105,237,.5);--color-mktg-btn-dark-text: #ffffff;--color-mktg-btn-dark-border: rgba(255,255,255,.3);--color-mktg-btn-dark-hover-text: #ffffff;--color-mktg-btn-dark-hover-border: rgba(255,255,255,.5);--color-mktg-btn-dark-focus-border: #ffffff;--color-mktg-btn-dark-focus-border-inset: rgba(255,255,255,.5);--color-avatar-bg: #ffffff;--color-avatar-border: rgba(27,31,36,.15);--color-avatar-stack-fade: #afb8c1;--color-avatar-stack-fade-more: #d0d7de;--color-avatar-child-shadow: -2px -2px 0 rgba(255,255,255,.8);--color-topic-tag-border: rgba(0,0,0,0);--color-select-menu-backdrop-border: rgba(0,0,0,0);--color-select-menu-tap-highlight: rgba(175,184,193,.5);--color-select-menu-tap-focus-bg: #b6e3ff;--color-overlay-shadow: 0 1px 3px rgba(27,31,36,.12), 0 8px 24px rgba(66,74,83,.12);--color-header-text: rgba(255,255,255,.7);--color-header-bg: #24292f;--color-header-logo: #ffffff;--color-header-search-bg: #24292f;--color-header-search-border: #57606a;--color-sidenav-selected-bg: #ffffff;--color-menu-bg-active: rgba(0,0,0,0);--color-control-transparent-bg-hover: #818b981a;--color-input-disabled-bg: rgba(175,184,193,.2);--color-timeline-badge-bg: #eaeef2;--color-ansi-black: #24292f;--color-ansi-black-bright: #57606a;--color-ansi-white: #6e7781;--color-ansi-white-bright: #8c959f;--color-ansi-gray: #6e7781;--color-ansi-red: #cf222e;--color-ansi-red-bright: #a40e26;--color-ansi-green: #116329;--color-ansi-green-bright: #1a7f37;--color-ansi-yellow: #4d2d00;--color-ansi-yellow-bright: #633c01;--color-ansi-blue: #0969da;--color-ansi-blue-bright: #218bff;--color-ansi-magenta: #8250df;--color-ansi-magenta-bright: #a475f9;--color-ansi-cyan: #1b7c83;--color-ansi-cyan-bright: #3192aa;--color-btn-text: #24292f;--color-btn-bg: #f6f8fa;--color-btn-border: rgba(27,31,36,.15);--color-btn-shadow: 0 1px 0 rgba(27,31,36,.04);--color-btn-inset-shadow: inset 0 1px 0 rgba(255,255,255,.25);--color-btn-hover-bg: #f3f4f6;--color-btn-hover-border: rgba(27,31,36,.15);--color-btn-active-bg: hsla(220,14%,93%,1);--color-btn-active-border: rgba(27,31,36,.15);--color-btn-selected-bg: hsla(220,14%,94%,1);--color-btn-focus-bg: #f6f8fa;--color-btn-focus-border: rgba(27,31,36,.15);--color-btn-focus-shadow: 0 0 0 3px rgba(9,105,218,.3);--color-btn-shadow-active: inset 0 .15em .3em rgba(27,31,36,.15);--color-btn-shadow-input-focus: 0 0 0 .2em rgba(9,105,218,.3);--color-btn-counter-bg: rgba(27,31,36,.08);--color-btn-primary-text: #ffffff;--color-btn-primary-bg: #2da44e;--color-btn-primary-border: rgba(27,31,36,.15);--color-btn-primary-shadow: 0 1px 0 rgba(27,31,36,.1);--color-btn-primary-inset-shadow: inset 0 1px 0 rgba(255,255,255,.03);--color-btn-primary-hover-bg: #2c974b;--color-btn-primary-hover-border: rgba(27,31,36,.15);--color-btn-primary-selected-bg: hsla(137,55%,36%,1);--color-btn-primary-selected-shadow: inset 0 1px 0 rgba(0,45,17,.2);--color-btn-primary-disabled-text: rgba(255,255,255,.8);--color-btn-primary-disabled-bg: #94d3a2;--color-btn-primary-disabled-border: rgba(27,31,36,.15);--color-btn-primary-focus-bg: #2da44e;--color-btn-primary-focus-border: rgba(27,31,36,.15);--color-btn-primary-focus-shadow: 0 0 0 3px rgba(45,164,78,.4);--color-btn-primary-icon: rgba(255,255,255,.8);--color-btn-primary-counter-bg: rgba(255,255,255,.2);--color-btn-outline-text: #0969da;--color-btn-outline-hover-text: #ffffff;--color-btn-outline-hover-bg: #0969da;--color-btn-outline-hover-border: rgba(27,31,36,.15);--color-btn-outline-hover-shadow: 0 1px 0 rgba(27,31,36,.1);--color-btn-outline-hover-inset-shadow: inset 0 1px 0 rgba(255,255,255,.03);--color-btn-outline-hover-counter-bg: rgba(255,255,255,.2);--color-btn-outline-selected-text: #ffffff;--color-btn-outline-selected-bg: hsla(212,92%,42%,1);--color-btn-outline-selected-border: rgba(27,31,36,.15);--color-btn-outline-selected-shadow: inset 0 1px 0 rgba(0,33,85,.2);--color-btn-outline-disabled-text: rgba(9,105,218,.5);--color-btn-outline-disabled-bg: #f6f8fa;--color-btn-outline-disabled-counter-bg: rgba(9,105,218,.05);--color-btn-outline-focus-border: rgba(27,31,36,.15);--color-btn-outline-focus-shadow: 0 0 0 3px rgba(5,80,174,.4);--color-btn-outline-counter-bg: rgba(9,105,218,.1);--color-btn-danger-text: #cf222e;--color-btn-danger-hover-text: #ffffff;--color-btn-danger-hover-bg: #a40e26;--color-btn-danger-hover-border: rgba(27,31,36,.15);--color-btn-danger-hover-shadow: 0 1px 0 rgba(27,31,36,.1);--color-btn-danger-hover-inset-shadow: inset 0 1px 0 rgba(255,255,255,.03);--color-btn-danger-hover-counter-bg: rgba(255,255,255,.2);--color-btn-danger-selected-text: #ffffff;--color-btn-danger-selected-bg: hsla(356,72%,44%,1);--color-btn-danger-selected-border: rgba(27,31,36,.15);--color-btn-danger-selected-shadow: inset 0 1px 0 rgba(76,0,20,.2);--color-btn-danger-disabled-text: rgba(207,34,46,.5);--color-btn-danger-disabled-bg: #f6f8fa;--color-btn-danger-disabled-counter-bg: rgba(207,34,46,.05);--color-btn-danger-focus-border: rgba(27,31,36,.15);--color-btn-danger-focus-shadow: 0 0 0 3px rgba(164,14,38,.4);--color-btn-danger-counter-bg: rgba(207,34,46,.1);--color-btn-danger-icon: #cf222e;--color-btn-danger-hover-icon: #ffffff;--color-underlinenav-icon: #6e7781;--color-underlinenav-border-hover: rgba(175,184,193,.2);--color-fg-default: #24292f;--color-fg-muted: #57606a;--color-fg-subtle: #6e7781;--color-fg-on-emphasis: #ffffff;--color-canvas-default: #ffffff;--color-canvas-overlay: #ffffff;--color-canvas-inset: #f6f8fa;--color-canvas-subtle: #f6f8fa;--color-border-default: #d0d7de;--color-border-muted: hsla(210,18%,87%,1);--color-border-subtle: rgba(27,31,36,.15);--color-shadow-small: 0 1px 0 rgba(27,31,36,.04);--color-shadow-medium: 0 3px 6px rgba(140,149,159,.15);--color-shadow-large: 0 8px 24px rgba(140,149,159,.2);--color-shadow-extra-large: 0 12px 28px rgba(140,149,159,.3);--color-neutral-emphasis-plus: #24292f;--color-neutral-emphasis: #6e7781;--color-neutral-muted: rgba(175,184,193,.2);--color-neutral-subtle: rgba(234,238,242,.5);--color-accent-fg: #0969da;--color-accent-emphasis: #0969da;--color-accent-muted: rgba(84,174,255,.4);--color-accent-subtle: #ddf4ff;--color-success-fg: #1a7f37;--color-success-emphasis: #2da44e;--color-success-muted: rgba(74,194,107,.4);--color-success-subtle: #dafbe1;--color-attention-fg: #9a6700;--color-attention-emphasis: #bf8700;--color-attention-muted: rgba(212,167,44,.4);--color-attention-subtle: #fff8c5;--color-severe-fg: #bc4c00;--color-severe-emphasis: #bc4c00;--color-severe-muted: rgba(251,143,68,.4);--color-severe-subtle: #fff1e5;--color-danger-fg: #cf222e;--color-danger-emphasis: #cf222e;--color-danger-muted: rgba(255,129,130,.4);--color-danger-subtle: #FFEBE9;--color-done-fg: #8250df;--color-done-emphasis: #8250df;--color-done-muted: rgba(194,151,255,.4);--color-done-subtle: #fbefff;--color-sponsors-fg: #bf3989;--color-sponsors-emphasis: #bf3989;--color-sponsors-muted: rgba(255,128,200,.4);--color-sponsors-subtle: #ffeff7;--color-primer-canvas-backdrop: rgba(27,31,36,.5);--color-primer-canvas-sticky: rgba(255,255,255,.95);--color-primer-border-active: #FD8C73;--color-primer-border-contrast: rgba(27,31,36,.1);--color-primer-shadow-highlight: inset 0 1px 0 rgba(255,255,255,.25);--color-primer-shadow-inset: inset 0 1px 0 rgba(208,215,222,.2);--color-primer-shadow-focus: 0 0 0 3px rgba(9,105,218,.3);--color-scale-black: #1b1f24;--color-scale-white: #ffffff;--color-scale-gray-0: #f6f8fa;--color-scale-gray-1: #eaeef2;--color-scale-gray-2: #d0d7de;--color-scale-gray-3: #afb8c1;--color-scale-gray-4: #8c959f;--color-scale-gray-5: #6e7781;--color-scale-gray-6: #57606a;--color-scale-gray-7: #424a53;--color-scale-gray-8: #32383f;--color-scale-gray-9: #24292f;--color-scale-blue-0: #ddf4ff;--color-scale-blue-1: #b6e3ff;--color-scale-blue-2: #80ccff;--color-scale-blue-3: #54aeff;--color-scale-blue-4: #218bff;--color-scale-blue-5: #0969da;--color-scale-blue-6: #0550ae;--color-scale-blue-7: #033d8b;--color-scale-blue-8: #0a3069;--color-scale-blue-9: #002155;--color-scale-green-0: #dafbe1;--color-scale-green-1: #aceebb;--color-scale-green-2: #6fdd8b;--color-scale-green-3: #4ac26b;--color-scale-green-4: #2da44e;--color-scale-green-5: #1a7f37;--color-scale-green-6: #116329;--color-scale-green-7: #044f1e;--color-scale-green-8: #003d16;--color-scale-green-9: #002d11;--color-scale-yellow-0: #fff8c5;--color-scale-yellow-1: #fae17d;--color-scale-yellow-2: #eac54f;--color-scale-yellow-3: #d4a72c;--color-scale-yellow-4: #bf8700;--color-scale-yellow-5: #9a6700;--color-scale-yellow-6: #7d4e00;--color-scale-yellow-7: #633c01;--color-scale-yellow-8: #4d2d00;--color-scale-yellow-9: #3b2300;--color-scale-orange-0: #fff1e5;--color-scale-orange-1: #ffd8b5;--color-scale-orange-2: #ffb77c;--color-scale-orange-3: #fb8f44;--color-scale-orange-4: #e16f24;--color-scale-orange-5: #bc4c00;--color-scale-orange-6: #953800;--color-scale-orange-7: #762c00;--color-scale-orange-8: #5c2200;--color-scale-orange-9: #471700;--color-scale-red-0: #FFEBE9;--color-scale-red-1: #ffcecb;--color-scale-red-2: #ffaba8;--color-scale-red-3: #ff8182;--color-scale-red-4: #fa4549;--color-scale-red-5: #cf222e;--color-scale-red-6: #a40e26;--color-scale-red-7: #82071e;--color-scale-red-8: #660018;--color-scale-red-9: #4c0014;--color-scale-purple-0: #fbefff;--color-scale-purple-1: #ecd8ff;--color-scale-purple-2: #d8b9ff;--color-scale-purple-3: #c297ff;--color-scale-purple-4: #a475f9;--color-scale-purple-5: #8250df;--color-scale-purple-6: #6639ba;--color-scale-purple-7: #512a97;--color-scale-purple-8: #3e1f79;--color-scale-purple-9: #2e1461;--color-scale-pink-0: #ffeff7;--color-scale-pink-1: #ffd3eb;--color-scale-pink-2: #ffadda;--color-scale-pink-3: #ff80c8;--color-scale-pink-4: #e85aad;--color-scale-pink-5: #bf3989;--color-scale-pink-6: #99286e;--color-scale-pink-7: #772057;--color-scale-pink-8: #611347;--color-scale-pink-9: #4d0336;--color-scale-coral-0: #FFF0EB;--color-scale-coral-1: #FFD6CC;--color-scale-coral-2: #FFB4A1;--color-scale-coral-3: #FD8C73;--color-scale-coral-4: #EC6547;--color-scale-coral-5: #C4432B;--color-scale-coral-6: #9E2F1C;--color-scale-coral-7: #801F0F;--color-scale-coral-8: #691105;--color-scale-coral-9: #510901 }:root.dark-mode{color-scheme:dark;--color-canvas-default-transparent: rgba(13,17,23,0);--color-marketing-icon-primary: #79c0ff;--color-marketing-icon-secondary: #1f6feb;--color-diff-blob-addition-num-text: #c9d1d9;--color-diff-blob-addition-fg: #c9d1d9;--color-diff-blob-addition-num-bg: rgba(63,185,80,.3);--color-diff-blob-addition-line-bg: rgba(46,160,67,.15);--color-diff-blob-addition-word-bg: rgba(46,160,67,.4);--color-diff-blob-deletion-num-text: #c9d1d9;--color-diff-blob-deletion-fg: #c9d1d9;--color-diff-blob-deletion-num-bg: rgba(248,81,73,.3);--color-diff-blob-deletion-line-bg: rgba(248,81,73,.15);--color-diff-blob-deletion-word-bg: rgba(248,81,73,.4);--color-diff-blob-hunk-num-bg: rgba(56,139,253,.4);--color-diff-blob-expander-icon: #8b949e;--color-diff-blob-selected-line-highlight-mix-blend-mode: screen;--color-diffstat-deletion-border: rgba(240,246,252,.1);--color-diffstat-addition-border: rgba(240,246,252,.1);--color-diffstat-addition-bg: #3fb950;--color-search-keyword-hl: rgba(210,153,34,.4);--color-prettylights-syntax-comment: #8b949e;--color-prettylights-syntax-constant: #79c0ff;--color-prettylights-syntax-entity: #d2a8ff;--color-prettylights-syntax-storage-modifier-import: #c9d1d9;--color-prettylights-syntax-entity-tag: #7ee787;--color-prettylights-syntax-keyword: #ff7b72;--color-prettylights-syntax-string: #a5d6ff;--color-prettylights-syntax-variable: #ffa657;--color-prettylights-syntax-brackethighlighter-unmatched: #f85149;--color-prettylights-syntax-invalid-illegal-text: #f0f6fc;--color-prettylights-syntax-invalid-illegal-bg: #8e1519;--color-prettylights-syntax-carriage-return-text: #f0f6fc;--color-prettylights-syntax-carriage-return-bg: #b62324;--color-prettylights-syntax-string-regexp: #7ee787;--color-prettylights-syntax-markup-list: #f2cc60;--color-prettylights-syntax-markup-heading: #1f6feb;--color-prettylights-syntax-markup-italic: #c9d1d9;--color-prettylights-syntax-markup-bold: #c9d1d9;--color-prettylights-syntax-markup-deleted-text: #ffdcd7;--color-prettylights-syntax-markup-deleted-bg: #67060c;--color-prettylights-syntax-markup-inserted-text: #aff5b4;--color-prettylights-syntax-markup-inserted-bg: #033a16;--color-prettylights-syntax-markup-changed-text: #ffdfb6;--color-prettylights-syntax-markup-changed-bg: #5a1e02;--color-prettylights-syntax-markup-ignored-text: #c9d1d9;--color-prettylights-syntax-markup-ignored-bg: #1158c7;--color-prettylights-syntax-meta-diff-range: #d2a8ff;--color-prettylights-syntax-brackethighlighter-angle: #8b949e;--color-prettylights-syntax-sublimelinter-gutter-mark: #484f58;--color-prettylights-syntax-constant-other-reference-link: #a5d6ff;--color-codemirror-text: #c9d1d9;--color-codemirror-bg: #0d1117;--color-codemirror-gutters-bg: #0d1117;--color-codemirror-guttermarker-text: #0d1117;--color-codemirror-guttermarker-subtle-text: #484f58;--color-codemirror-linenumber-text: #8b949e;--color-codemirror-cursor: #c9d1d9;--color-codemirror-selection-bg: rgba(56,139,253,.4);--color-codemirror-activeline-bg: rgba(110,118,129,.1);--color-codemirror-matchingbracket-text: #c9d1d9;--color-codemirror-lines-bg: #0d1117;--color-codemirror-syntax-comment: #8b949e;--color-codemirror-syntax-constant: #79c0ff;--color-codemirror-syntax-entity: #d2a8ff;--color-codemirror-syntax-keyword: #ff7b72;--color-codemirror-syntax-storage: #ff7b72;--color-codemirror-syntax-string: #a5d6ff;--color-codemirror-syntax-support: #79c0ff;--color-codemirror-syntax-variable: #ffa657;--color-checks-bg: #010409;--color-checks-run-border-width: 1px;--color-checks-container-border-width: 1px;--color-checks-text-primary: #c9d1d9;--color-checks-text-secondary: #8b949e;--color-checks-text-link: #58a6ff;--color-checks-btn-icon: #8b949e;--color-checks-btn-hover-icon: #c9d1d9;--color-checks-btn-hover-bg: rgba(110,118,129,.1);--color-checks-input-text: #8b949e;--color-checks-input-placeholder-text: #484f58;--color-checks-input-focus-text: #c9d1d9;--color-checks-input-bg: #161b22;--color-checks-input-shadow: none;--color-checks-donut-error: #f85149;--color-checks-donut-pending: #d29922;--color-checks-donut-success: #2ea043;--color-checks-donut-neutral: #8b949e;--color-checks-dropdown-text: #c9d1d9;--color-checks-dropdown-bg: #161b22;--color-checks-dropdown-border: #30363d;--color-checks-dropdown-shadow: rgba(1,4,9,.3);--color-checks-dropdown-hover-text: #c9d1d9;--color-checks-dropdown-hover-bg: rgba(110,118,129,.1);--color-checks-dropdown-btn-hover-text: #c9d1d9;--color-checks-dropdown-btn-hover-bg: rgba(110,118,129,.1);--color-checks-scrollbar-thumb-bg: rgba(110,118,129,.4);--color-checks-header-label-text: #8b949e;--color-checks-header-label-open-text: #c9d1d9;--color-checks-header-border: #21262d;--color-checks-header-icon: #8b949e;--color-checks-line-text: #8b949e;--color-checks-line-num-text: #484f58;--color-checks-line-timestamp-text: #484f58;--color-checks-line-hover-bg: rgba(110,118,129,.1);--color-checks-line-selected-bg: rgba(56,139,253,.15);--color-checks-line-selected-num-text: #58a6ff;--color-checks-line-dt-fm-text: #f0f6fc;--color-checks-line-dt-fm-bg: #9e6a03;--color-checks-gate-bg: rgba(187,128,9,.15);--color-checks-gate-text: #8b949e;--color-checks-gate-waiting-text: #d29922;--color-checks-step-header-open-bg: #161b22;--color-checks-step-error-text: #f85149;--color-checks-step-warning-text: #d29922;--color-checks-logline-text: #8b949e;--color-checks-logline-num-text: #484f58;--color-checks-logline-debug-text: #a371f7;--color-checks-logline-error-text: #8b949e;--color-checks-logline-error-num-text: #484f58;--color-checks-logline-error-bg: rgba(248,81,73,.15);--color-checks-logline-warning-text: #8b949e;--color-checks-logline-warning-num-text: #d29922;--color-checks-logline-warning-bg: rgba(187,128,9,.15);--color-checks-logline-command-text: #58a6ff;--color-checks-logline-section-text: #3fb950;--color-checks-ansi-black: #0d1117;--color-checks-ansi-black-bright: #161b22;--color-checks-ansi-white: #b1bac4;--color-checks-ansi-white-bright: #b1bac4;--color-checks-ansi-gray: #6e7681;--color-checks-ansi-red: #ff7b72;--color-checks-ansi-red-bright: #ffa198;--color-checks-ansi-green: #3fb950;--color-checks-ansi-green-bright: #56d364;--color-checks-ansi-yellow: #d29922;--color-checks-ansi-yellow-bright: #e3b341;--color-checks-ansi-blue: #58a6ff;--color-checks-ansi-blue-bright: #79c0ff;--color-checks-ansi-magenta: #bc8cff;--color-checks-ansi-magenta-bright: #d2a8ff;--color-checks-ansi-cyan: #76e3ea;--color-checks-ansi-cyan-bright: #b3f0ff;--color-project-header-bg: #0d1117;--color-project-sidebar-bg: #161b22;--color-project-gradient-in: #161b22;--color-project-gradient-out: rgba(22,27,34,0);--color-mktg-success: rgba(41,147,61,1);--color-mktg-info: rgba(42,123,243,1);--color-mktg-bg-shade-gradient-top: rgba(1,4,9,.065);--color-mktg-bg-shade-gradient-bottom: rgba(1,4,9,0);--color-mktg-btn-bg-top: hsla(228,82%,66%,1);--color-mktg-btn-bg-bottom: #4969ed;--color-mktg-btn-bg-overlay-top: hsla(228,74%,59%,1);--color-mktg-btn-bg-overlay-bottom: #3355e0;--color-mktg-btn-text: #f0f6fc;--color-mktg-btn-primary-bg-top: hsla(137,56%,46%,1);--color-mktg-btn-primary-bg-bottom: #2ea44f;--color-mktg-btn-primary-bg-overlay-top: hsla(134,60%,38%,1);--color-mktg-btn-primary-bg-overlay-bottom: #22863a;--color-mktg-btn-primary-text: #f0f6fc;--color-mktg-btn-enterprise-bg-top: hsla(249,100%,72%,1);--color-mktg-btn-enterprise-bg-bottom: #6f57ff;--color-mktg-btn-enterprise-bg-overlay-top: hsla(248,65%,63%,1);--color-mktg-btn-enterprise-bg-overlay-bottom: #614eda;--color-mktg-btn-enterprise-text: #f0f6fc;--color-mktg-btn-outline-text: #f0f6fc;--color-mktg-btn-outline-border: rgba(240,246,252,.3);--color-mktg-btn-outline-hover-text: #f0f6fc;--color-mktg-btn-outline-hover-border: rgba(240,246,252,.5);--color-mktg-btn-outline-focus-border: #f0f6fc;--color-mktg-btn-outline-focus-border-inset: rgba(240,246,252,.5);--color-mktg-btn-dark-text: #f0f6fc;--color-mktg-btn-dark-border: rgba(240,246,252,.3);--color-mktg-btn-dark-hover-text: #f0f6fc;--color-mktg-btn-dark-hover-border: rgba(240,246,252,.5);--color-mktg-btn-dark-focus-border: #f0f6fc;--color-mktg-btn-dark-focus-border-inset: rgba(240,246,252,.5);--color-avatar-bg: rgba(240,246,252,.1);--color-avatar-border: rgba(240,246,252,.1);--color-avatar-stack-fade: #30363d;--color-avatar-stack-fade-more: #21262d;--color-avatar-child-shadow: -2px -2px 0 #0d1117;--color-topic-tag-border: rgba(0,0,0,0);--color-select-menu-backdrop-border: #484f58;--color-select-menu-tap-highlight: rgba(48,54,61,.5);--color-select-menu-tap-focus-bg: #0c2d6b;--color-overlay-shadow: 0 0 0 1px #30363d, 0 16px 32px rgba(1,4,9,.85);--color-header-text: rgba(240,246,252,.7);--color-header-bg: #161b22;--color-header-logo: #f0f6fc;--color-header-search-bg: #0d1117;--color-header-search-border: #30363d;--color-sidenav-selected-bg: #21262d;--color-menu-bg-active: #161b22;--color-control-transparent-bg-hover: #656c7633;--color-input-disabled-bg: rgba(110,118,129,0);--color-timeline-badge-bg: #21262d;--color-ansi-black: #484f58;--color-ansi-black-bright: #6e7681;--color-ansi-white: #b1bac4;--color-ansi-white-bright: #f0f6fc;--color-ansi-gray: #6e7681;--color-ansi-red: #ff7b72;--color-ansi-red-bright: #ffa198;--color-ansi-green: #3fb950;--color-ansi-green-bright: #56d364;--color-ansi-yellow: #d29922;--color-ansi-yellow-bright: #e3b341;--color-ansi-blue: #58a6ff;--color-ansi-blue-bright: #79c0ff;--color-ansi-magenta: #bc8cff;--color-ansi-magenta-bright: #d2a8ff;--color-ansi-cyan: #39c5cf;--color-ansi-cyan-bright: #56d4dd;--color-btn-text: #c9d1d9;--color-btn-bg: #21262d;--color-btn-border: rgba(240,246,252,.1);--color-btn-shadow: 0 0 transparent;--color-btn-inset-shadow: 0 0 transparent;--color-btn-hover-bg: #30363d;--color-btn-hover-border: #8b949e;--color-btn-active-bg: hsla(212,12%,18%,1);--color-btn-active-border: #6e7681;--color-btn-selected-bg: #161b22;--color-btn-focus-bg: #21262d;--color-btn-focus-border: #8b949e;--color-btn-focus-shadow: 0 0 0 3px rgba(139,148,158,.3);--color-btn-shadow-active: inset 0 .15em .3em rgba(1,4,9,.15);--color-btn-shadow-input-focus: 0 0 0 .2em rgba(31,111,235,.3);--color-btn-counter-bg: #30363d;--color-btn-primary-text: #ffffff;--color-btn-primary-bg: #238636;--color-btn-primary-border: rgba(240,246,252,.1);--color-btn-primary-shadow: 0 0 transparent;--color-btn-primary-inset-shadow: 0 0 transparent;--color-btn-primary-hover-bg: #2ea043;--color-btn-primary-hover-border: rgba(240,246,252,.1);--color-btn-primary-selected-bg: #238636;--color-btn-primary-selected-shadow: 0 0 transparent;--color-btn-primary-disabled-text: rgba(240,246,252,.5);--color-btn-primary-disabled-bg: rgba(35,134,54,.6);--color-btn-primary-disabled-border: rgba(240,246,252,.1);--color-btn-primary-focus-bg: #238636;--color-btn-primary-focus-border: rgba(240,246,252,.1);--color-btn-primary-focus-shadow: 0 0 0 3px rgba(46,164,79,.4);--color-btn-primary-icon: #f0f6fc;--color-btn-primary-counter-bg: rgba(240,246,252,.2);--color-btn-outline-text: #58a6ff;--color-btn-outline-hover-text: #58a6ff;--color-btn-outline-hover-bg: #30363d;--color-btn-outline-hover-border: rgba(240,246,252,.1);--color-btn-outline-hover-shadow: 0 1px 0 rgba(1,4,9,.1);--color-btn-outline-hover-inset-shadow: inset 0 1px 0 rgba(240,246,252,.03);--color-btn-outline-hover-counter-bg: rgba(240,246,252,.2);--color-btn-outline-selected-text: #f0f6fc;--color-btn-outline-selected-bg: #0d419d;--color-btn-outline-selected-border: rgba(240,246,252,.1);--color-btn-outline-selected-shadow: 0 0 transparent;--color-btn-outline-disabled-text: rgba(88,166,255,.5);--color-btn-outline-disabled-bg: #0d1117;--color-btn-outline-disabled-counter-bg: rgba(31,111,235,.05);--color-btn-outline-focus-border: rgba(240,246,252,.1);--color-btn-outline-focus-shadow: 0 0 0 3px rgba(17,88,199,.4);--color-btn-outline-counter-bg: rgba(31,111,235,.1);--color-btn-danger-text: #f85149;--color-btn-danger-hover-text: #f0f6fc;--color-btn-danger-hover-bg: #da3633;--color-btn-danger-hover-border: #f85149;--color-btn-danger-hover-shadow: 0 0 transparent;--color-btn-danger-hover-inset-shadow: 0 0 transparent;--color-btn-danger-hover-icon: #f0f6fc;--color-btn-danger-hover-counter-bg: rgba(255,255,255,.2);--color-btn-danger-selected-text: #ffffff;--color-btn-danger-selected-bg: #b62324;--color-btn-danger-selected-border: #ff7b72;--color-btn-danger-selected-shadow: 0 0 transparent;--color-btn-danger-disabled-text: rgba(248,81,73,.5);--color-btn-danger-disabled-bg: #0d1117;--color-btn-danger-disabled-counter-bg: rgba(218,54,51,.05);--color-btn-danger-focus-border: #f85149;--color-btn-danger-focus-shadow: 0 0 0 3px rgba(248,81,73,.4);--color-btn-danger-counter-bg: rgba(218,54,51,.1);--color-btn-danger-icon: #f85149;--color-underlinenav-icon: #484f58;--color-underlinenav-border-hover: rgba(110,118,129,.4);--color-fg-default: #c9d1d9;--color-fg-muted: #8b949e;--color-fg-subtle: #484f58;--color-fg-on-emphasis: #f0f6fc;--color-canvas-default: #0d1117;--color-canvas-overlay: #161b22;--color-canvas-inset: #010409;--color-canvas-subtle: #161b22;--color-border-default: #30363d;--color-border-muted: #21262d;--color-border-subtle: rgba(240,246,252,.1);--color-shadow-small: 0 0 transparent;--color-shadow-medium: 0 3px 6px #010409;--color-shadow-large: 0 8px 24px #010409;--color-shadow-extra-large: 0 12px 48px #010409;--color-neutral-emphasis-plus: #6e7681;--color-neutral-emphasis: #6e7681;--color-neutral-muted: rgba(110,118,129,.4);--color-neutral-subtle: rgba(110,118,129,.1);--color-accent-fg: #58a6ff;--color-accent-emphasis: #1f6feb;--color-accent-muted: rgba(56,139,253,.4);--color-accent-subtle: rgba(56,139,253,.15);--color-success-fg: #3fb950;--color-success-emphasis: #238636;--color-success-muted: rgba(46,160,67,.4);--color-success-subtle: rgba(46,160,67,.15);--color-attention-fg: #d29922;--color-attention-emphasis: #9e6a03;--color-attention-muted: rgba(187,128,9,.4);--color-attention-subtle: rgba(187,128,9,.15);--color-severe-fg: #db6d28;--color-severe-emphasis: #bd561d;--color-severe-muted: rgba(219,109,40,.4);--color-severe-subtle: rgba(219,109,40,.15);--color-danger-fg: #f85149;--color-danger-emphasis: #da3633;--color-danger-muted: rgba(248,81,73,.4);--color-danger-subtle: rgba(248,81,73,.15);--color-done-fg: #a371f7;--color-done-emphasis: #8957e5;--color-done-muted: rgba(163,113,247,.4);--color-done-subtle: rgba(163,113,247,.15);--color-sponsors-fg: #db61a2;--color-sponsors-emphasis: #bf4b8a;--color-sponsors-muted: rgba(219,97,162,.4);--color-sponsors-subtle: rgba(219,97,162,.15);--color-primer-canvas-backdrop: rgba(1,4,9,.8);--color-primer-canvas-sticky: rgba(13,17,23,.95);--color-primer-border-active: #F78166;--color-primer-border-contrast: rgba(240,246,252,.2);--color-primer-shadow-highlight: 0 0 transparent;--color-primer-shadow-inset: 0 0 transparent;--color-primer-shadow-focus: 0 0 0 3px #0c2d6b;--color-scale-black: #010409;--color-scale-white: #f0f6fc;--color-scale-gray-0: #f0f6fc;--color-scale-gray-1: #c9d1d9;--color-scale-gray-2: #b1bac4;--color-scale-gray-3: #8b949e;--color-scale-gray-4: #6e7681;--color-scale-gray-5: #484f58;--color-scale-gray-6: #30363d;--color-scale-gray-7: #21262d;--color-scale-gray-8: #161b22;--color-scale-gray-9: #0d1117;--color-scale-blue-0: #cae8ff;--color-scale-blue-1: #a5d6ff;--color-scale-blue-2: #79c0ff;--color-scale-blue-3: #58a6ff;--color-scale-blue-4: #388bfd;--color-scale-blue-5: #1f6feb;--color-scale-blue-6: #1158c7;--color-scale-blue-7: #0d419d;--color-scale-blue-8: #0c2d6b;--color-scale-blue-9: #051d4d;--color-scale-green-0: #aff5b4;--color-scale-green-1: #7ee787;--color-scale-green-2: #56d364;--color-scale-green-3: #3fb950;--color-scale-green-4: #2ea043;--color-scale-green-5: #238636;--color-scale-green-6: #196c2e;--color-scale-green-7: #0f5323;--color-scale-green-8: #033a16;--color-scale-green-9: #04260f;--color-scale-yellow-0: #f8e3a1;--color-scale-yellow-1: #f2cc60;--color-scale-yellow-2: #e3b341;--color-scale-yellow-3: #d29922;--color-scale-yellow-4: #bb8009;--color-scale-yellow-5: #9e6a03;--color-scale-yellow-6: #845306;--color-scale-yellow-7: #693e00;--color-scale-yellow-8: #4b2900;--color-scale-yellow-9: #341a00;--color-scale-orange-0: #ffdfb6;--color-scale-orange-1: #ffc680;--color-scale-orange-2: #ffa657;--color-scale-orange-3: #f0883e;--color-scale-orange-4: #db6d28;--color-scale-orange-5: #bd561d;--color-scale-orange-6: #9b4215;--color-scale-orange-7: #762d0a;--color-scale-orange-8: #5a1e02;--color-scale-orange-9: #3d1300;--color-scale-red-0: #ffdcd7;--color-scale-red-1: #ffc1ba;--color-scale-red-2: #ffa198;--color-scale-red-3: #ff7b72;--color-scale-red-4: #f85149;--color-scale-red-5: #da3633;--color-scale-red-6: #b62324;--color-scale-red-7: #8e1519;--color-scale-red-8: #67060c;--color-scale-red-9: #490202;--color-scale-purple-0: #eddeff;--color-scale-purple-1: #e2c5ff;--color-scale-purple-2: #d2a8ff;--color-scale-purple-3: #bc8cff;--color-scale-purple-4: #a371f7;--color-scale-purple-5: #8957e5;--color-scale-purple-6: #6e40c9;--color-scale-purple-7: #553098;--color-scale-purple-8: #3c1e70;--color-scale-purple-9: #271052;--color-scale-pink-0: #ffdaec;--color-scale-pink-1: #ffbedd;--color-scale-pink-2: #ff9bce;--color-scale-pink-3: #f778ba;--color-scale-pink-4: #db61a2;--color-scale-pink-5: #bf4b8a;--color-scale-pink-6: #9e3670;--color-scale-pink-7: #7d2457;--color-scale-pink-8: #5e103e;--color-scale-pink-9: #42062a;--color-scale-coral-0: #FFDDD2;--color-scale-coral-1: #FFC2B2;--color-scale-coral-2: #FFA28B;--color-scale-coral-3: #F78166;--color-scale-coral-4: #EA6045;--color-scale-coral-5: #CF462D;--color-scale-coral-6: #AC3220;--color-scale-coral-7: #872012;--color-scale-coral-8: #640D04;--color-scale-coral-9: #460701 }:root{--box-shadow: rgba(0, 0, 0, .133) 0px 1.6px 3.6px 0px, rgba(0, 0, 0, .11) 0px .3px .9px 0px;--box-shadow-thick: rgb(0 0 0 / 10%) 0px 1.8px 1.9px, rgb(0 0 0 / 15%) 0px 6.1px 6.3px, rgb(0 0 0 / 10%) 0px -2px 4px, rgb(0 0 0 / 15%) 0px -6.1px 12px, rgb(0 0 0 / 25%) 0px 6px 12px}*{box-sizing:border-box;min-width:0;min-height:0}svg{fill:currentColor}.vbox{display:flex;flex-direction:column;flex:auto;position:relative}.hbox{display:flex;flex:auto;position:relative}.hidden{visibility:hidden}.d-flex{display:flex!important}.d-inline{display:inline!important}.m-1{margin:4px}.m-2{margin:8px}.m-3{margin:16px}.m-4{margin:24px}.m-5{margin:32px}.mx-1{margin:0 4px}.mx-2{margin:0 8px}.mx-3{margin:0 16px}.mx-4{margin:0 24px}.mx-5{margin:0 32px}.my-1{margin:4px 0}.my-2{margin:8px 0}.my-3{margin:16px 0}.my-4{margin:24px 0}.my-5{margin:32px 0}.mt-1{margin-top:4px}.mt-2{margin-top:8px}.mt-3{margin-top:16px}.mt-4{margin-top:24px}.mt-5{margin-top:32px}.mr-1{margin-right:4px}.mr-2{margin-right:8px}.mr-3{margin-right:16px}.mr-4{margin-right:24px}.mr-5{margin-right:32px}.mb-1{margin-bottom:4px}.mb-2{margin-bottom:8px}.mb-3{margin-bottom:16px}.mb-4{margin-bottom:24px}.mb-5{margin-bottom:32px}.ml-1{margin-left:4px}.ml-2{margin-left:8px}.ml-3{margin-left:16px}.ml-4{margin-left:24px}.ml-5{margin-left:32px}.p-1{padding:4px}.p-2{padding:8px}.p-3{padding:16px}.p-4{padding:24px}.p-5{padding:32px}.px-1{padding:0 4px}.px-2{padding:0 8px}.px-3{padding:0 16px}.px-4{padding:0 24px}.px-5{padding:0 32px}.py-1{padding:4px 0}.py-2{padding:8px 0}.py-3{padding:16px 0}.py-4{padding:24px 0}.py-5{padding:32px 0}.pt-1{padding-top:4px}.pt-2{padding-top:8px}.pt-3{padding-top:16px}.pt-4{padding-top:24px}.pt-5{padding-top:32px}.pr-1{padding-right:4px}.pr-2{padding-right:8px}.pr-3{padding-right:16px}.pr-4{padding-right:24px}.pr-5{padding-right:32px}.pb-1{padding-bottom:4px}.pb-2{padding-bottom:8px}.pb-3{padding-bottom:16px}.pb-4{padding-bottom:24px}.pb-5{padding-bottom:32px}.pl-1{padding-left:4px}.pl-2{padding-left:8px}.pl-3{padding-left:16px}.pl-4{padding-left:24px}.pl-5{padding-left:32px}.no-wrap{white-space:nowrap!important}.float-left{float:left!important}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section{display:block}.form-control,.form-select{padding:5px 12px;font-size:14px;line-height:20px;color:var(--color-fg-default);vertical-align:middle;background-color:var(--color-canvas-default);background-repeat:no-repeat;background-position:right 8px center;border:1px solid var(--color-border-default);border-radius:6px;outline:none;box-shadow:var(--color-primer-shadow-inset)}.input-contrast{background-color:var(--color-canvas-inset)}.subnav-search{position:relative;flex:auto;display:flex}.subnav-search-input{flex:auto;padding-left:32px;color:var(--color-fg-muted)}.subnav-search-icon{position:absolute;top:9px;left:8px;display:block;color:var(--color-fg-muted);text-align:center;pointer-events:none}.subnav-search-context+.subnav-search{margin-left:-1px}.subnav-item{flex:none;position:relative;float:left;padding:5px 8px;font-weight:500;line-height:20px;color:var(--color-fg-default);border:1px solid var(--color-border-default);-webkit-user-select:none;user-select:none}.subnav-item:hover{background-color:var(--color-canvas-subtle)}.subnav-item[aria-selected=true]{background:var(--color-control-transparent-bg-hover)}.subnav-item:first-child{border-top-left-radius:6px;border-bottom-left-radius:6px}.subnav-item:last-child{border-top-right-radius:6px;border-bottom-right-radius:6px}.subnav-item+.subnav-item{margin-left:-1px}.subnav-item .octicon,.subnav-item-label{margin-right:8px}.counter{display:inline-block;min-width:20px;padding:0 6px;font-size:12px;font-weight:500;line-height:18px;color:var(--color-fg-default);text-align:center;background-color:var(--color-neutral-muted);border:1px solid transparent;border-radius:2em}.color-icon-success{color:var(--color-success-fg)!important}.color-text-danger{color:var(--color-danger-fg)!important}.color-text-warning{color:var(--color-checks-step-warning-text)!important}.color-fg-muted{color:var(--color-fg-muted)!important}.octicon{display:inline-block;overflow:visible!important;vertical-align:text-bottom;fill:currentColor;margin-right:7px;flex:none}.button{flex:none;height:24px;border:1px solid var(--color-btn-border);outline:none;color:var(--color-btn-text);background:var(--color-btn-bg);padding:4px;cursor:pointer;display:inline-flex;align-items:center;justify-content:center;border-radius:4px}.button:not(:disabled):hover{border-color:var(--color-btn-hover-border);background-color:var(--color-btn-hover-bg)}input[type=checkbox]{outline:var(--color-focus-border);height:24px}dialog{background-color:var(--color-canvas-subtle);border:1px solid var(--color-border-default);border-radius:6px;padding:6px}.subnav-item .octicon.octicon-settings{margin-right:0}.subnav-item .octicon.octicon-clock{margin-right:0;color:var(--color-fg-default)!important}@media only screen and (max-width: 600px){.subnav-item,.form-control{border-radius:0!important}.subnav-item{border:none}.subnav-search-input{border-left:0;border-right:0}}.header-view-status-container{float:right}.header-view{padding:12px 8px 0}.header-view div{flex-shrink:0;flex-wrap:wrap}.header-superheader{color:var(--color-fg-muted)}.header-title{flex:none;font-weight:400;font-size:32px;line-height:1.25}.header-setting-theme{display:grid;margin-left:22px}@media only screen and (max-width: 600px){.header-view{padding:0}.header-view div{flex-shrink:1}.header-view-status-container{float:none;margin:0 0 10px!important;overflow:hidden}.header-view-status-container .subnav-search-input{border-left:none;border-right:none}.header-title,.header-superheader{margin:0 8px}}.copy-icon{flex:none;height:24px;width:24px;border:none;outline:none;color:var(--color-fg-muted);background:transparent;padding:4px;cursor:pointer;display:inline-flex;align-items:center;justify-content:center;border-radius:4px}.copy-icon svg{margin:0}.copy-icon:not(:disabled):hover{background-color:var(--color-border-default)}.copy-button-container{visibility:hidden;display:inline-flex;margin-left:8px;vertical-align:bottom}.copy-value-container:hover .copy-button-container{visibility:visible}.attachment-body{white-space:pre-wrap;background-color:var(--color-canvas-subtle);margin-left:24px;line-height:normal;padding:8px;font-family:monospace;position:relative}.attachment-body .copy-icon{position:absolute;right:5px;top:5px}.attachment-flash{animation:attachmentflash-bg 2s}@keyframes attachmentflash-bg{0%{background:var(--color-attention-subtle)}to{background:transparent}}.link-badge{flex:none;background-color:transparent;border-color:transparent;-webkit-user-select:none;user-select:none}.link-badge-dim span{color:var(--color-fg-muted)}.link-badge:hover{cursor:pointer}.link-badge svg{fill:var(--color-fg-default)}.link-badge-dim svg{fill:var(--color-fg-muted)}.link-badge-dim:hover svg{fill:var(--color-fg-muted)}.fullwidth-link{width:100%;text-align:left}.fullwidth-link:hover{background-color:var(--color-canvas-subtle)}.trace-link{margin-right:3px}.trace-link-separator{color:var(--color-fg-muted);-webkit-user-select:none;user-select:none}.expandable-summary{cursor:pointer;list-style:none;white-space:nowrap;padding-left:4px}.label{display:inline-block;padding:0 8px;font-size:12px;font-weight:500;line-height:18px;border:1px solid transparent;border-radius:2em;background-color:var(--color-scale-gray-4);color:#fff;margin:0 10px;flex:none;font-weight:600;cursor:pointer}.label-anchor{text-decoration:none;color:var(--color-fg-default)}:root.light-mode .label-color-0{background-color:var(--color-scale-blue-0);color:var(--color-scale-blue-6);border:1px solid var(--color-scale-blue-4)}:root.light-mode .label-color-1{background-color:var(--color-scale-yellow-0);color:var(--color-scale-yellow-6);border:1px solid var(--color-scale-yellow-4)}:root.light-mode .label-color-2{background-color:var(--color-scale-purple-0);color:var(--color-scale-purple-6);border:1px solid var(--color-scale-purple-4)}:root.light-mode .label-color-3{background-color:var(--color-scale-pink-0);color:var(--color-scale-pink-6);border:1px solid var(--color-scale-pink-4)}:root.light-mode .label-color-4{background-color:var(--color-scale-coral-0);color:var(--color-scale-coral-6);border:1px solid var(--color-scale-coral-4)}:root.light-mode .label-color-5{background-color:var(--color-scale-orange-0);color:var(--color-scale-orange-6);border:1px solid var(--color-scale-orange-4)}:root.dark-mode .label-color-0{background-color:var(--color-scale-blue-9);color:var(--color-scale-blue-2);border:1px solid var(--color-scale-blue-4)}:root.dark-mode .label-color-1{background-color:var(--color-scale-yellow-9);color:var(--color-scale-yellow-2);border:1px solid var(--color-scale-yellow-4)}:root.dark-mode .label-color-2{background-color:var(--color-scale-purple-9);color:var(--color-scale-purple-2);border:1px solid var(--color-scale-purple-4)}:root.dark-mode .label-color-3{background-color:var(--color-scale-pink-9);color:var(--color-scale-pink-2);border:1px solid var(--color-scale-pink-4)}:root.dark-mode .label-color-4{background-color:var(--color-scale-coral-9);color:var(--color-scale-coral-2);border:1px solid var(--color-scale-coral-4)}:root.dark-mode .label-color-5{background-color:var(--color-scale-orange-9);color:var(--color-scale-orange-2);border:1px solid var(--color-scale-orange-4)}.label-row .label{margin:0}.label-row .label:not(:first-child){margin-left:6px}html,body{width:100%;height:100%;padding:0;margin:0;overscroll-behavior-x:none}body{overflow:auto;max-width:1024px;margin:0 auto;width:100%}.test-file-test:not(:first-child){border-top:1px solid var(--color-border-default)}@media only screen and (max-width: 600px){.htmlreport{padding:0!important}}.tabbed-pane{display:flex;flex:auto;overflow:hidden}.tabbed-pane-tab-strip{display:flex;align-items:center;padding-right:10px;flex:none;width:100%;z-index:2;font-size:14px;line-height:32px;color:var(--color-fg-default);height:48px;min-width:70px;box-shadow:inset 0 -1px 0 var(--color-border-muted)!important}.tabbed-pane-tab-strip:focus{outline:none}.tabbed-pane-tab-element{padding:4px 8px 0;margin-right:4px;cursor:pointer;display:flex;flex:none;align-items:center;justify-content:center;-webkit-user-select:none;user-select:none;border-bottom:2px solid transparent;outline:none;height:100%}.tabbed-pane-tab-label{max-width:250px;white-space:pre;overflow:hidden;text-overflow:ellipsis;display:inline-block;height:30px;padding:0 8px;border-radius:6px}.tabbed-pane-tab-label:hover{background-color:var(--color-control-transparent-bg-hover)}.tabbed-pane-tab-element.selected{border-bottom-color:#666;-webkit-text-stroke:.5px currentColor}.chip-header{border:1px solid var(--color-border-default);border-top-left-radius:6px;border-top-right-radius:6px;background-color:var(--color-canvas-subtle);padding:0 8px;border-bottom:none;margin-top:12px;font-weight:600;line-height:38px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-webkit-user-select:none;user-select:none}.chip-header-allow-selection{-webkit-user-select:text;user-select:text}.chip-header.expanded-false{border:1px solid var(--color-border-default);border-radius:6px}.chip-header.expanded-false,.chip-header.expanded-true{cursor:pointer}.chip-body{border:1px solid var(--color-border-default);border-bottom-left-radius:6px;border-bottom-right-radius:6px;padding:16px;margin-bottom:12px;overflow:hidden}.chip-body-no-insets{padding:0}.chip-footer{border-top:1px solid var(--color-border-default)}@media only screen and (max-width: 600px){.chip-header{border-radius:0;border-right:none;border-left:none}.chip-body{border-radius:0;border-right:none;border-left:none;padding:8px}.chip-body-no-insets{padding:0}}.test-case-column{border-radius:6px;margin-bottom:24px}.test-case-column .tab-element.selected{font-weight:600;border-bottom-color:var(--color-primer-border-active)}.test-case-column .tab-element{border:none;color:var(--color-fg-default);border-bottom:2px solid transparent}.test-case-column .tab-element:hover{color:var(--color-fg-default)}.test-case-location,.test-case-duration{flex:none;align-items:center;padding:0 8px 8px}.selected .test-case-run-duration{-webkit-text-stroke:0}.test-case-run-duration{color:var(--color-fg-muted);padding-left:8px}.header-view .test-case-path{flex:none;flex-shrink:1;align-items:center;padding-right:8px}.test-case-annotation{flex:none;align-items:center;padding:0 8px;line-height:24px;white-space:pre-wrap}@media only screen and (max-width: 600px){.test-case-column{border-radius:0!important;margin:0!important}}.tree-item{display:flex;flex-direction:column;overflow:hidden;min-width:0;line-height:38px}.tree-item-title{cursor:pointer;overflow:hidden;text-overflow:ellipsis;min-width:0;display:flex;align-items:center}.tree-item-body{min-height:18px}.yellow-flash{animation:yellowflash-bg 2s}@keyframes yellowflash-bg{0%{background:var(--color-attention-subtle)}to{background:transparent}}:root{--vscode-font-family: system-ui, "Ubuntu", "Droid Sans", sans-serif;--vscode-font-weight: normal;--vscode-font-size: 13px;--vscode-editor-font-family: "Droid Sans Mono", "monospace", monospace;--vscode-editor-font-weight: normal;--vscode-editor-font-size: 14px;--vscode-foreground: #616161;--vscode-disabledForeground: rgba(97, 97, 97, .5);--vscode-errorForeground: #a1260d;--vscode-descriptionForeground: #717171;--vscode-icon-foreground: #424242;--vscode-focusBorder: #0090f1;--vscode-textSeparator-foreground: rgba(0, 0, 0, .18);--vscode-textLink-foreground: #006ab1;--vscode-textLink-activeForeground: #006ab1;--vscode-textPreformat-foreground: #a31515;--vscode-textBlockQuote-background: rgba(127, 127, 127, .1);--vscode-textBlockQuote-border: rgba(0, 122, 204, .5);--vscode-textCodeBlock-background: rgba(220, 220, 220, .4);--vscode-widget-shadow: rgba(0, 0, 0, .16);--vscode-input-background: #ffffff;--vscode-input-foreground: #616161;--vscode-inputOption-activeBorder: #007acc;--vscode-inputOption-hoverBackground: rgba(184, 184, 184, .31);--vscode-inputOption-activeBackground: rgba(0, 144, 241, .2);--vscode-inputOption-activeForeground: #000000;--vscode-input-placeholderForeground: #767676;--vscode-inputValidation-infoBackground: #d6ecf2;--vscode-inputValidation-infoBorder: #007acc;--vscode-inputValidation-warningBackground: #f6f5d2;--vscode-inputValidation-warningBorder: #b89500;--vscode-inputValidation-errorBackground: #f2dede;--vscode-inputValidation-errorBorder: #be1100;--vscode-dropdown-background: #ffffff;--vscode-dropdown-border: #cecece;--vscode-checkbox-background: #ffffff;--vscode-checkbox-border: #cecece;--vscode-button-foreground: #ffffff;--vscode-button-separator: rgba(255, 255, 255, .4);--vscode-button-background: #007acc;--vscode-button-hoverBackground: #0062a3;--vscode-button-secondaryForeground: #ffffff;--vscode-button-secondaryBackground: #5f6a79;--vscode-button-secondaryHoverBackground: #4c5561;--vscode-badge-background: #c4c4c4;--vscode-badge-foreground: #333333;--vscode-scrollbar-shadow: #dddddd;--vscode-scrollbarSlider-background: rgba(100, 100, 100, .4);--vscode-scrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-scrollbarSlider-activeBackground: rgba(0, 0, 0, .6);--vscode-progressBar-background: #0e70c0;--vscode-editorError-foreground: #e51400;--vscode-editorWarning-foreground: #bf8803;--vscode-editorInfo-foreground: #1a85ff;--vscode-editorHint-foreground: #6c6c6c;--vscode-sash-hoverBorder: #0090f1;--vscode-editor-background: #ffffff;--vscode-editor-foreground: #000000;--vscode-editorStickyScroll-background: #ffffff;--vscode-editorStickyScrollHover-background: #f0f0f0;--vscode-editorWidget-background: #f3f3f3;--vscode-editorWidget-foreground: #616161;--vscode-editorWidget-border: #c8c8c8;--vscode-quickInput-background: #f3f3f3;--vscode-quickInput-foreground: #616161;--vscode-quickInputTitle-background: rgba(0, 0, 0, .06);--vscode-pickerGroup-foreground: #0066bf;--vscode-pickerGroup-border: #cccedb;--vscode-keybindingLabel-background: rgba(221, 221, 221, .4);--vscode-keybindingLabel-foreground: #555555;--vscode-keybindingLabel-border: rgba(204, 204, 204, .4);--vscode-keybindingLabel-bottomBorder: rgba(187, 187, 187, .4);--vscode-editor-selectionBackground: #add6ff;--vscode-editor-inactiveSelectionBackground: #e5ebf1;--vscode-editor-selectionHighlightBackground: rgba(173, 214, 255, .5);--vscode-editor-findMatchBackground: #a8ac94;--vscode-editor-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-editor-findRangeHighlightBackground: rgba(180, 180, 180, .3);--vscode-searchEditor-findMatchBackground: rgba(234, 92, 0, .22);--vscode-editor-hoverHighlightBackground: rgba(173, 214, 255, .15);--vscode-editorHoverWidget-background: #f3f3f3;--vscode-editorHoverWidget-foreground: #616161;--vscode-editorHoverWidget-border: #c8c8c8;--vscode-editorHoverWidget-statusBarBackground: #e7e7e7;--vscode-editorLink-activeForeground: #0000ff;--vscode-editorInlayHint-foreground: rgba(51, 51, 51, .8);--vscode-editorInlayHint-background: rgba(196, 196, 196, .3);--vscode-editorInlayHint-typeForeground: rgba(51, 51, 51, .8);--vscode-editorInlayHint-typeBackground: rgba(196, 196, 196, .3);--vscode-editorInlayHint-parameterForeground: rgba(51, 51, 51, .8);--vscode-editorInlayHint-parameterBackground: rgba(196, 196, 196, .3);--vscode-editorLightBulb-foreground: #ddb100;--vscode-editorLightBulbAutoFix-foreground: #007acc;--vscode-diffEditor-insertedTextBackground: rgba(156, 204, 44, .4);--vscode-diffEditor-removedTextBackground: rgba(255, 0, 0, .3);--vscode-diffEditor-insertedLineBackground: rgba(155, 185, 85, .2);--vscode-diffEditor-removedLineBackground: rgba(255, 0, 0, .2);--vscode-diffEditor-diagonalFill: rgba(34, 34, 34, .2);--vscode-list-focusOutline: #0090f1;--vscode-list-focusAndSelectionOutline: #90c2f9;--vscode-list-activeSelectionBackground: #0060c0;--vscode-list-activeSelectionForeground: #ffffff;--vscode-list-activeSelectionIconForeground: #ffffff;--vscode-list-inactiveSelectionBackground: #e4e6f1;--vscode-list-hoverBackground: #e8e8e8;--vscode-list-dropBackground: #d6ebff;--vscode-list-highlightForeground: #0066bf;--vscode-list-focusHighlightForeground: #bbe7ff;--vscode-list-invalidItemForeground: #b89500;--vscode-list-errorForeground: #b01011;--vscode-list-warningForeground: #855f00;--vscode-listFilterWidget-background: #f3f3f3;--vscode-listFilterWidget-outline: rgba(0, 0, 0, 0);--vscode-listFilterWidget-noMatchesOutline: #be1100;--vscode-listFilterWidget-shadow: rgba(0, 0, 0, .16);--vscode-list-filterMatchBackground: rgba(234, 92, 0, .33);--vscode-tree-indentGuidesStroke: #a9a9a9;--vscode-tree-tableColumnsBorder: rgba(97, 97, 97, .13);--vscode-tree-tableOddRowsBackground: rgba(97, 97, 97, .04);--vscode-list-deemphasizedForeground: #8e8e90;--vscode-quickInputList-focusForeground: #ffffff;--vscode-quickInputList-focusIconForeground: #ffffff;--vscode-quickInputList-focusBackground: #0060c0;--vscode-menu-foreground: #616161;--vscode-menu-background: #ffffff;--vscode-menu-selectionForeground: #ffffff;--vscode-menu-selectionBackground: #0060c0;--vscode-menu-separatorBackground: #d4d4d4;--vscode-toolbar-hoverBackground: rgba(184, 184, 184, .31);--vscode-toolbar-activeBackground: rgba(166, 166, 166, .31);--vscode-editor-snippetTabstopHighlightBackground: rgba(10, 50, 100, .2);--vscode-editor-snippetFinalTabstopHighlightBorder: rgba(10, 50, 100, .5);--vscode-breadcrumb-foreground: rgba(97, 97, 97, .8);--vscode-breadcrumb-background: #ffffff;--vscode-breadcrumb-focusForeground: #4e4e4e;--vscode-breadcrumb-activeSelectionForeground: #4e4e4e;--vscode-breadcrumbPicker-background: #f3f3f3;--vscode-merge-currentHeaderBackground: rgba(64, 200, 174, .5);--vscode-merge-currentContentBackground: rgba(64, 200, 174, .2);--vscode-merge-incomingHeaderBackground: rgba(64, 166, 255, .5);--vscode-merge-incomingContentBackground: rgba(64, 166, 255, .2);--vscode-merge-commonHeaderBackground: rgba(96, 96, 96, .4);--vscode-merge-commonContentBackground: rgba(96, 96, 96, .16);--vscode-editorOverviewRuler-currentContentForeground: rgba(64, 200, 174, .5);--vscode-editorOverviewRuler-incomingContentForeground: rgba(64, 166, 255, .5);--vscode-editorOverviewRuler-commonContentForeground: rgba(96, 96, 96, .4);--vscode-editorOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-editorOverviewRuler-selectionHighlightForeground: rgba(160, 160, 160, .8);--vscode-minimap-findMatchHighlight: #d18616;--vscode-minimap-selectionOccurrenceHighlight: #c9c9c9;--vscode-minimap-selectionHighlight: #add6ff;--vscode-minimap-errorHighlight: rgba(255, 18, 18, .7);--vscode-minimap-warningHighlight: #bf8803;--vscode-minimap-foregroundOpacity: #000000;--vscode-minimapSlider-background: rgba(100, 100, 100, .2);--vscode-minimapSlider-hoverBackground: rgba(100, 100, 100, .35);--vscode-minimapSlider-activeBackground: rgba(0, 0, 0, .3);--vscode-problemsErrorIcon-foreground: #e51400;--vscode-problemsWarningIcon-foreground: #bf8803;--vscode-problemsInfoIcon-foreground: #1a85ff;--vscode-charts-foreground: #616161;--vscode-charts-lines: rgba(97, 97, 97, .5);--vscode-charts-red: #e51400;--vscode-charts-blue: #1a85ff;--vscode-charts-yellow: #bf8803;--vscode-charts-orange: #d18616;--vscode-charts-green: #388a34;--vscode-charts-purple: #652d90;--vscode-editor-lineHighlightBorder: #eeeeee;--vscode-editor-rangeHighlightBackground: rgba(253, 255, 0, .2);--vscode-editor-symbolHighlightBackground: rgba(234, 92, 0, .33);--vscode-editorCursor-foreground: #000000;--vscode-editorWhitespace-foreground: rgba(51, 51, 51, .2);--vscode-editorIndentGuide-background: #d3d3d3;--vscode-editorIndentGuide-activeBackground: #939393;--vscode-editorLineNumber-foreground: #237893;--vscode-editorActiveLineNumber-foreground: #0b216f;--vscode-editorLineNumber-activeForeground: #0b216f;--vscode-editorRuler-foreground: #d3d3d3;--vscode-editorCodeLens-foreground: #919191;--vscode-editorBracketMatch-background: rgba(0, 100, 0, .1);--vscode-editorBracketMatch-border: #b9b9b9;--vscode-editorOverviewRuler-border: rgba(127, 127, 127, .3);--vscode-editorGutter-background: #ffffff;--vscode-editorUnnecessaryCode-opacity: rgba(0, 0, 0, .47);--vscode-editorGhostText-foreground: rgba(0, 0, 0, .47);--vscode-editorOverviewRuler-rangeHighlightForeground: rgba(0, 122, 204, .6);--vscode-editorOverviewRuler-errorForeground: rgba(255, 18, 18, .7);--vscode-editorOverviewRuler-warningForeground: #bf8803;--vscode-editorOverviewRuler-infoForeground: #1a85ff;--vscode-editorBracketHighlight-foreground1: #0431fa;--vscode-editorBracketHighlight-foreground2: #319331;--vscode-editorBracketHighlight-foreground3: #7b3814;--vscode-editorBracketHighlight-foreground4: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground5: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground6: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-unexpectedBracket\.foreground: rgba(255, 18, 18, .8);--vscode-editorBracketPairGuide-background1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background6: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground6: rgba(0, 0, 0, 0);--vscode-editorUnicodeHighlight-border: #cea33d;--vscode-editorUnicodeHighlight-background: rgba(206, 163, 61, .08);--vscode-symbolIcon-arrayForeground: #616161;--vscode-symbolIcon-booleanForeground: #616161;--vscode-symbolIcon-classForeground: #d67e00;--vscode-symbolIcon-colorForeground: #616161;--vscode-symbolIcon-constantForeground: #616161;--vscode-symbolIcon-constructorForeground: #652d90;--vscode-symbolIcon-enumeratorForeground: #d67e00;--vscode-symbolIcon-enumeratorMemberForeground: #007acc;--vscode-symbolIcon-eventForeground: #d67e00;--vscode-symbolIcon-fieldForeground: #007acc;--vscode-symbolIcon-fileForeground: #616161;--vscode-symbolIcon-folderForeground: #616161;--vscode-symbolIcon-functionForeground: #652d90;--vscode-symbolIcon-interfaceForeground: #007acc;--vscode-symbolIcon-keyForeground: #616161;--vscode-symbolIcon-keywordForeground: #616161;--vscode-symbolIcon-methodForeground: #652d90;--vscode-symbolIcon-moduleForeground: #616161;--vscode-symbolIcon-namespaceForeground: #616161;--vscode-symbolIcon-nullForeground: #616161;--vscode-symbolIcon-numberForeground: #616161;--vscode-symbolIcon-objectForeground: #616161;--vscode-symbolIcon-operatorForeground: #616161;--vscode-symbolIcon-packageForeground: #616161;--vscode-symbolIcon-propertyForeground: #616161;--vscode-symbolIcon-referenceForeground: #616161;--vscode-symbolIcon-snippetForeground: #616161;--vscode-symbolIcon-stringForeground: #616161;--vscode-symbolIcon-structForeground: #616161;--vscode-symbolIcon-textForeground: #616161;--vscode-symbolIcon-typeParameterForeground: #616161;--vscode-symbolIcon-unitForeground: #616161;--vscode-symbolIcon-variableForeground: #007acc;--vscode-editorHoverWidget-highlightForeground: #0066bf;--vscode-editorOverviewRuler-bracketMatchForeground: #a0a0a0;--vscode-editor-foldBackground: rgba(173, 214, 255, .3);--vscode-editorGutter-foldingControlForeground: #424242;--vscode-editor-linkedEditingBackground: rgba(255, 0, 0, .3);--vscode-editor-wordHighlightBackground: rgba(87, 87, 87, .25);--vscode-editor-wordHighlightStrongBackground: rgba(14, 99, 156, .25);--vscode-editorOverviewRuler-wordHighlightForeground: rgba(160, 160, 160, .8);--vscode-editorOverviewRuler-wordHighlightStrongForeground: rgba(192, 160, 192, .8);--vscode-peekViewTitle-background: rgba(26, 133, 255, .1);--vscode-peekViewTitleLabel-foreground: #000000;--vscode-peekViewTitleDescription-foreground: #616161;--vscode-peekView-border: #1a85ff;--vscode-peekViewResult-background: #f3f3f3;--vscode-peekViewResult-lineForeground: #646465;--vscode-peekViewResult-fileForeground: #1e1e1e;--vscode-peekViewResult-selectionBackground: rgba(51, 153, 255, .2);--vscode-peekViewResult-selectionForeground: #6c6c6c;--vscode-peekViewEditor-background: #f2f8fc;--vscode-peekViewEditorGutter-background: #f2f8fc;--vscode-peekViewResult-matchHighlightBackground: rgba(234, 92, 0, .3);--vscode-peekViewEditor-matchHighlightBackground: rgba(245, 216, 2, .87);--vscode-editorMarkerNavigationError-background: #e51400;--vscode-editorMarkerNavigationError-headerBackground: rgba(229, 20, 0, .1);--vscode-editorMarkerNavigationWarning-background: #bf8803;--vscode-editorMarkerNavigationWarning-headerBackground: rgba(191, 136, 3, .1);--vscode-editorMarkerNavigationInfo-background: #1a85ff;--vscode-editorMarkerNavigationInfo-headerBackground: rgba(26, 133, 255, .1);--vscode-editorMarkerNavigation-background: #ffffff;--vscode-editorSuggestWidget-background: #f3f3f3;--vscode-editorSuggestWidget-border: #c8c8c8;--vscode-editorSuggestWidget-foreground: #000000;--vscode-editorSuggestWidget-selectedForeground: #ffffff;--vscode-editorSuggestWidget-selectedIconForeground: #ffffff;--vscode-editorSuggestWidget-selectedBackground: #0060c0;--vscode-editorSuggestWidget-highlightForeground: #0066bf;--vscode-editorSuggestWidget-focusHighlightForeground: #bbe7ff;--vscode-editorSuggestWidgetStatus-foreground: rgba(0, 0, 0, .5);--vscode-tab-activeBackground: #ffffff;--vscode-tab-unfocusedActiveBackground: #ffffff;--vscode-tab-inactiveBackground: #ececec;--vscode-tab-unfocusedInactiveBackground: #ececec;--vscode-tab-activeForeground: #333333;--vscode-tab-inactiveForeground: rgba(51, 51, 51, .7);--vscode-tab-unfocusedActiveForeground: rgba(51, 51, 51, .7);--vscode-tab-unfocusedInactiveForeground: rgba(51, 51, 51, .35);--vscode-tab-border: #f3f3f3;--vscode-tab-lastPinnedBorder: rgba(97, 97, 97, .19);--vscode-tab-activeModifiedBorder: #33aaee;--vscode-tab-inactiveModifiedBorder: rgba(51, 170, 238, .5);--vscode-tab-unfocusedActiveModifiedBorder: rgba(51, 170, 238, .7);--vscode-tab-unfocusedInactiveModifiedBorder: rgba(51, 170, 238, .25);--vscode-editorPane-background: #ffffff;--vscode-editorGroupHeader-tabsBackground: #f3f3f3;--vscode-editorGroupHeader-noTabsBackground: #ffffff;--vscode-editorGroup-border: #e7e7e7;--vscode-editorGroup-dropBackground: rgba(38, 119, 203, .18);--vscode-editorGroup-dropIntoPromptForeground: #616161;--vscode-editorGroup-dropIntoPromptBackground: #f3f3f3;--vscode-sideBySideEditor-horizontalBorder: #e7e7e7;--vscode-sideBySideEditor-verticalBorder: #e7e7e7;--vscode-panel-background: #ffffff;--vscode-panel-border: rgba(128, 128, 128, .35);--vscode-panelTitle-activeForeground: #424242;--vscode-panelTitle-inactiveForeground: rgba(66, 66, 66, .75);--vscode-panelTitle-activeBorder: #424242;--vscode-panelInput-border: #dddddd;--vscode-panel-dropBorder: #424242;--vscode-panelSection-dropBackground: rgba(38, 119, 203, .18);--vscode-panelSectionHeader-background: rgba(128, 128, 128, .2);--vscode-panelSection-border: rgba(128, 128, 128, .35);--vscode-banner-background: #004386;--vscode-banner-foreground: #ffffff;--vscode-banner-iconForeground: #1a85ff;--vscode-statusBar-foreground: #ffffff;--vscode-statusBar-noFolderForeground: #ffffff;--vscode-statusBar-background: #007acc;--vscode-statusBar-noFolderBackground: #68217a;--vscode-statusBar-focusBorder: #ffffff;--vscode-statusBarItem-activeBackground: rgba(255, 255, 255, .18);--vscode-statusBarItem-focusBorder: #ffffff;--vscode-statusBarItem-hoverBackground: rgba(255, 255, 255, .12);--vscode-statusBarItem-compactHoverBackground: rgba(255, 255, 255, .2);--vscode-statusBarItem-prominentForeground: #ffffff;--vscode-statusBarItem-prominentBackground: rgba(0, 0, 0, .5);--vscode-statusBarItem-prominentHoverBackground: rgba(0, 0, 0, .3);--vscode-statusBarItem-errorBackground: #c72e0f;--vscode-statusBarItem-errorForeground: #ffffff;--vscode-statusBarItem-warningBackground: #725102;--vscode-statusBarItem-warningForeground: #ffffff;--vscode-activityBar-background: #2c2c2c;--vscode-activityBar-foreground: #ffffff;--vscode-activityBar-inactiveForeground: rgba(255, 255, 255, .4);--vscode-activityBar-activeBorder: #ffffff;--vscode-activityBar-dropBorder: #ffffff;--vscode-activityBarBadge-background: #007acc;--vscode-activityBarBadge-foreground: #ffffff;--vscode-statusBarItem-remoteBackground: #16825d;--vscode-statusBarItem-remoteForeground: #ffffff;--vscode-extensionBadge-remoteBackground: #007acc;--vscode-extensionBadge-remoteForeground: #ffffff;--vscode-sideBar-background: #f3f3f3;--vscode-sideBarTitle-foreground: #6f6f6f;--vscode-sideBar-dropBackground: rgba(38, 119, 203, .18);--vscode-sideBarSectionHeader-background: rgba(0, 0, 0, 0);--vscode-sideBarSectionHeader-border: rgba(97, 97, 97, .19);--vscode-titleBar-activeForeground: #333333;--vscode-titleBar-inactiveForeground: rgba(51, 51, 51, .6);--vscode-titleBar-activeBackground: #dddddd;--vscode-titleBar-inactiveBackground: rgba(221, 221, 221, .6);--vscode-menubar-selectionForeground: #333333;--vscode-menubar-selectionBackground: rgba(184, 184, 184, .31);--vscode-notifications-foreground: #616161;--vscode-notifications-background: #f3f3f3;--vscode-notificationLink-foreground: #006ab1;--vscode-notificationCenterHeader-background: #e7e7e7;--vscode-notifications-border: #e7e7e7;--vscode-notificationsErrorIcon-foreground: #e51400;--vscode-notificationsWarningIcon-foreground: #bf8803;--vscode-notificationsInfoIcon-foreground: #1a85ff;--vscode-commandCenter-foreground: #333333;--vscode-commandCenter-activeForeground: #333333;--vscode-commandCenter-activeBackground: rgba(184, 184, 184, .31);--vscode-commandCenter-border: rgba(128, 128, 128, .35);--vscode-editorCommentsWidget-resolvedBorder: rgba(97, 97, 97, .5);--vscode-editorCommentsWidget-unresolvedBorder: #1a85ff;--vscode-editorCommentsWidget-rangeBackground: rgba(26, 133, 255, .1);--vscode-editorCommentsWidget-rangeBorder: rgba(26, 133, 255, .4);--vscode-editorCommentsWidget-rangeActiveBackground: rgba(26, 133, 255, .1);--vscode-editorCommentsWidget-rangeActiveBorder: rgba(26, 133, 255, .4);--vscode-editorGutter-commentRangeForeground: #d5d8e9;--vscode-debugToolBar-background: #f3f3f3;--vscode-debugIcon-startForeground: #388a34;--vscode-editor-stackFrameHighlightBackground: rgba(255, 255, 102, .45);--vscode-editor-focusedStackFrameHighlightBackground: rgba(206, 231, 206, .45);--vscode-mergeEditor-change\.background: rgba(155, 185, 85, .2);--vscode-mergeEditor-change\.word\.background: rgba(156, 204, 44, .4);--vscode-mergeEditor-conflict\.unhandledUnfocused\.border: rgba(255, 166, 0, .48);--vscode-mergeEditor-conflict\.unhandledFocused\.border: #ffa600;--vscode-mergeEditor-conflict\.handledUnfocused\.border: rgba(134, 134, 134, .29);--vscode-mergeEditor-conflict\.handledFocused\.border: rgba(193, 193, 193, .8);--vscode-mergeEditor-conflict\.handled\.minimapOverViewRuler: rgba(173, 172, 168, .93);--vscode-mergeEditor-conflict\.unhandled\.minimapOverViewRuler: #fcba03;--vscode-mergeEditor-conflictingLines\.background: rgba(255, 234, 0, .28);--vscode-settings-headerForeground: #444444;--vscode-settings-modifiedItemIndicator: #66afe0;--vscode-settings-headerBorder: rgba(128, 128, 128, .35);--vscode-settings-sashBorder: rgba(128, 128, 128, .35);--vscode-settings-dropdownBackground: #ffffff;--vscode-settings-dropdownBorder: #cecece;--vscode-settings-dropdownListBorder: #c8c8c8;--vscode-settings-checkboxBackground: #ffffff;--vscode-settings-checkboxBorder: #cecece;--vscode-settings-textInputBackground: #ffffff;--vscode-settings-textInputForeground: #616161;--vscode-settings-textInputBorder: #cecece;--vscode-settings-numberInputBackground: #ffffff;--vscode-settings-numberInputForeground: #616161;--vscode-settings-numberInputBorder: #cecece;--vscode-settings-focusedRowBackground: rgba(232, 232, 232, .6);--vscode-settings-rowHoverBackground: rgba(232, 232, 232, .3);--vscode-settings-focusedRowBorder: rgba(0, 0, 0, .12);--vscode-terminal-foreground: #333333;--vscode-terminal-selectionBackground: #add6ff;--vscode-terminal-inactiveSelectionBackground: #e5ebf1;--vscode-terminalCommandDecoration-defaultBackground: rgba(0, 0, 0, .25);--vscode-terminalCommandDecoration-successBackground: #2090d3;--vscode-terminalCommandDecoration-errorBackground: #e51400;--vscode-terminalOverviewRuler-cursorForeground: rgba(160, 160, 160, .8);--vscode-terminal-border: rgba(128, 128, 128, .35);--vscode-terminal-findMatchBackground: #a8ac94;--vscode-terminal-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-terminalOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-terminal-dropBackground: rgba(38, 119, 203, .18);--vscode-testing-iconFailed: #f14c4c;--vscode-testing-iconErrored: #f14c4c;--vscode-testing-iconPassed: #73c991;--vscode-testing-runAction: #73c991;--vscode-testing-iconQueued: #cca700;--vscode-testing-iconUnset: #848484;--vscode-testing-iconSkipped: #848484;--vscode-testing-peekBorder: #e51400;--vscode-testing-peekHeaderBackground: rgba(229, 20, 0, .1);--vscode-testing-message\.error\.decorationForeground: #e51400;--vscode-testing-message\.error\.lineBackground: rgba(255, 0, 0, .2);--vscode-testing-message\.info\.decorationForeground: rgba(0, 0, 0, .5);--vscode-welcomePage-tileBackground: #f3f3f3;--vscode-welcomePage-tileHoverBackground: #dbdbdb;--vscode-welcomePage-tileShadow: rgba(0, 0, 0, .16);--vscode-welcomePage-progress\.background: #ffffff;--vscode-welcomePage-progress\.foreground: #006ab1;--vscode-debugExceptionWidget-border: #a31515;--vscode-debugExceptionWidget-background: #f1dfde;--vscode-ports-iconRunningProcessForeground: #369432;--vscode-statusBar-debuggingBackground: #cc6633;--vscode-statusBar-debuggingForeground: #ffffff;--vscode-editor-inlineValuesForeground: rgba(0, 0, 0, .5);--vscode-editor-inlineValuesBackground: rgba(255, 200, 0, .2);--vscode-editorGutter-modifiedBackground: #2090d3;--vscode-editorGutter-addedBackground: #48985d;--vscode-editorGutter-deletedBackground: #e51400;--vscode-minimapGutter-modifiedBackground: #2090d3;--vscode-minimapGutter-addedBackground: #48985d;--vscode-minimapGutter-deletedBackground: #e51400;--vscode-editorOverviewRuler-modifiedForeground: rgba(32, 144, 211, .6);--vscode-editorOverviewRuler-addedForeground: rgba(72, 152, 93, .6);--vscode-editorOverviewRuler-deletedForeground: rgba(229, 20, 0, .6);--vscode-debugIcon-breakpointForeground: #e51400;--vscode-debugIcon-breakpointDisabledForeground: #848484;--vscode-debugIcon-breakpointUnverifiedForeground: #848484;--vscode-debugIcon-breakpointCurrentStackframeForeground: #be8700;--vscode-debugIcon-breakpointStackframeForeground: #89d185;--vscode-notebook-cellBorderColor: #e8e8e8;--vscode-notebook-focusedEditorBorder: #0090f1;--vscode-notebookStatusSuccessIcon-foreground: #388a34;--vscode-notebookStatusErrorIcon-foreground: #a1260d;--vscode-notebookStatusRunningIcon-foreground: #616161;--vscode-notebook-cellToolbarSeparator: rgba(128, 128, 128, .35);--vscode-notebook-selectedCellBackground: rgba(200, 221, 241, .31);--vscode-notebook-selectedCellBorder: #e8e8e8;--vscode-notebook-focusedCellBorder: #0090f1;--vscode-notebook-inactiveFocusedCellBorder: #e8e8e8;--vscode-notebook-cellStatusBarItemHoverBackground: rgba(0, 0, 0, .08);--vscode-notebook-cellInsertionIndicator: #0090f1;--vscode-notebookScrollbarSlider-background: rgba(100, 100, 100, .4);--vscode-notebookScrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-notebookScrollbarSlider-activeBackground: rgba(0, 0, 0, .6);--vscode-notebook-symbolHighlightBackground: rgba(253, 255, 0, .2);--vscode-notebook-cellEditorBackground: #f3f3f3;--vscode-notebook-editorBackground: #ffffff;--vscode-keybindingTable-headerBackground: rgba(97, 97, 97, .04);--vscode-keybindingTable-rowsBackground: rgba(97, 97, 97, .04);--vscode-scm-providerBorder: #c8c8c8;--vscode-searchEditor-textInputBorder: #cecece;--vscode-debugTokenExpression-name: #9b46b0;--vscode-debugTokenExpression-value: rgba(108, 108, 108, .8);--vscode-debugTokenExpression-string: #a31515;--vscode-debugTokenExpression-boolean: #0000ff;--vscode-debugTokenExpression-number: #098658;--vscode-debugTokenExpression-error: #e51400;--vscode-debugView-exceptionLabelForeground: #ffffff;--vscode-debugView-exceptionLabelBackground: #a31515;--vscode-debugView-stateLabelForeground: #616161;--vscode-debugView-stateLabelBackground: rgba(136, 136, 136, .27);--vscode-debugView-valueChangedHighlight: #569cd6;--vscode-debugConsole-infoForeground: #1a85ff;--vscode-debugConsole-warningForeground: #bf8803;--vscode-debugConsole-errorForeground: #a1260d;--vscode-debugConsole-sourceForeground: #616161;--vscode-debugConsoleInputIcon-foreground: #616161;--vscode-debugIcon-pauseForeground: #007acc;--vscode-debugIcon-stopForeground: #a1260d;--vscode-debugIcon-disconnectForeground: #a1260d;--vscode-debugIcon-restartForeground: #388a34;--vscode-debugIcon-stepOverForeground: #007acc;--vscode-debugIcon-stepIntoForeground: #007acc;--vscode-debugIcon-stepOutForeground: #007acc;--vscode-debugIcon-continueForeground: #007acc;--vscode-debugIcon-stepBackForeground: #007acc;--vscode-extensionButton-prominentBackground: #007acc;--vscode-extensionButton-prominentForeground: #ffffff;--vscode-extensionButton-prominentHoverBackground: #0062a3;--vscode-extensionIcon-starForeground: #df6100;--vscode-extensionIcon-verifiedForeground: #006ab1;--vscode-extensionIcon-preReleaseForeground: #1d9271;--vscode-extensionIcon-sponsorForeground: #b51e78;--vscode-terminal-ansiBlack: #000000;--vscode-terminal-ansiRed: #cd3131;--vscode-terminal-ansiGreen: #00bc00;--vscode-terminal-ansiYellow: #949800;--vscode-terminal-ansiBlue: #0451a5;--vscode-terminal-ansiMagenta: #bc05bc;--vscode-terminal-ansiCyan: #0598bc;--vscode-terminal-ansiWhite: #555555;--vscode-terminal-ansiBrightBlack: #666666;--vscode-terminal-ansiBrightRed: #cd3131;--vscode-terminal-ansiBrightGreen: #14ce14;--vscode-terminal-ansiBrightYellow: #b5ba00;--vscode-terminal-ansiBrightBlue: #0451a5;--vscode-terminal-ansiBrightMagenta: #bc05bc;--vscode-terminal-ansiBrightCyan: #0598bc;--vscode-terminal-ansiBrightWhite: #a5a5a5;--vscode-interactive-activeCodeBorder: #1a85ff;--vscode-interactive-inactiveCodeBorder: #e4e6f1;--vscode-gitDecoration-addedResourceForeground: #587c0c;--vscode-gitDecoration-modifiedResourceForeground: #895503;--vscode-gitDecoration-deletedResourceForeground: #ad0707;--vscode-gitDecoration-renamedResourceForeground: #007100;--vscode-gitDecoration-untrackedResourceForeground: #007100;--vscode-gitDecoration-ignoredResourceForeground: #8e8e90;--vscode-gitDecoration-stageModifiedResourceForeground: #895503;--vscode-gitDecoration-stageDeletedResourceForeground: #ad0707;--vscode-gitDecoration-conflictingResourceForeground: #ad0707;--vscode-gitDecoration-submoduleResourceForeground: #1258a7}:root.light-mode{color-scheme:light}:root.dark-mode{color-scheme:dark;--vscode-font-family: system-ui, "Ubuntu", "Droid Sans", sans-serif;--vscode-font-weight: normal;--vscode-font-size: 13px;--vscode-editor-font-family: "Droid Sans Mono", "monospace", monospace;--vscode-editor-font-weight: normal;--vscode-editor-font-size: 14px;--vscode-foreground: #cccccc;--vscode-disabledForeground: rgba(204, 204, 204, .5);--vscode-errorForeground: #f48771;--vscode-descriptionForeground: rgba(204, 204, 204, .7);--vscode-icon-foreground: #c5c5c5;--vscode-focusBorder: #007fd4;--vscode-textSeparator-foreground: rgba(255, 255, 255, .18);--vscode-textLink-foreground: #3794ff;--vscode-textLink-activeForeground: #3794ff;--vscode-textPreformat-foreground: #d7ba7d;--vscode-textBlockQuote-background: rgba(127, 127, 127, .1);--vscode-textBlockQuote-border: rgba(0, 122, 204, .5);--vscode-textCodeBlock-background: rgba(10, 10, 10, .4);--vscode-widget-shadow: rgba(0, 0, 0, .36);--vscode-input-background: #3c3c3c;--vscode-input-foreground: #cccccc;--vscode-inputOption-activeBorder: #007acc;--vscode-inputOption-hoverBackground: rgba(90, 93, 94, .5);--vscode-inputOption-activeBackground: rgba(0, 127, 212, .4);--vscode-inputOption-activeForeground: #ffffff;--vscode-input-placeholderForeground: #a6a6a6;--vscode-inputValidation-infoBackground: #063b49;--vscode-inputValidation-infoBorder: #007acc;--vscode-inputValidation-warningBackground: #352a05;--vscode-inputValidation-warningBorder: #b89500;--vscode-inputValidation-errorBackground: #5a1d1d;--vscode-inputValidation-errorBorder: #be1100;--vscode-dropdown-background: #3c3c3c;--vscode-dropdown-foreground: #f0f0f0;--vscode-dropdown-border: #3c3c3c;--vscode-checkbox-background: #3c3c3c;--vscode-checkbox-foreground: #f0f0f0;--vscode-checkbox-border: #3c3c3c;--vscode-button-foreground: #ffffff;--vscode-button-separator: rgba(255, 255, 255, .4);--vscode-button-background: #0e639c;--vscode-button-hoverBackground: #1177bb;--vscode-button-secondaryForeground: #ffffff;--vscode-button-secondaryBackground: #3a3d41;--vscode-button-secondaryHoverBackground: #45494e;--vscode-badge-background: #4d4d4d;--vscode-badge-foreground: #ffffff;--vscode-scrollbar-shadow: #000000;--vscode-scrollbarSlider-background: rgba(121, 121, 121, .4);--vscode-scrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-scrollbarSlider-activeBackground: rgba(191, 191, 191, .4);--vscode-progressBar-background: #0e70c0;--vscode-editorError-foreground: #f14c4c;--vscode-editorWarning-foreground: #cca700;--vscode-editorInfo-foreground: #3794ff;--vscode-editorHint-foreground: rgba(238, 238, 238, .7);--vscode-sash-hoverBorder: #007fd4;--vscode-editor-background: #1e1e1e;--vscode-editor-foreground: #d4d4d4;--vscode-editorStickyScroll-background: #1e1e1e;--vscode-editorStickyScrollHover-background: #2a2d2e;--vscode-editorWidget-background: #252526;--vscode-editorWidget-foreground: #cccccc;--vscode-editorWidget-border: #454545;--vscode-quickInput-background: #252526;--vscode-quickInput-foreground: #cccccc;--vscode-quickInputTitle-background: rgba(255, 255, 255, .1);--vscode-pickerGroup-foreground: #3794ff;--vscode-pickerGroup-border: #3f3f46;--vscode-keybindingLabel-background: rgba(128, 128, 128, .17);--vscode-keybindingLabel-foreground: #cccccc;--vscode-keybindingLabel-border: rgba(51, 51, 51, .6);--vscode-keybindingLabel-bottomBorder: rgba(68, 68, 68, .6);--vscode-editor-selectionBackground: #264f78;--vscode-editor-inactiveSelectionBackground: #3a3d41;--vscode-editor-selectionHighlightBackground: rgba(173, 214, 255, .15);--vscode-editor-findMatchBackground: #515c6a;--vscode-editor-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-editor-findRangeHighlightBackground: rgba(58, 61, 65, .4);--vscode-searchEditor-findMatchBackground: rgba(234, 92, 0, .22);--vscode-editor-hoverHighlightBackground: rgba(38, 79, 120, .25);--vscode-editorHoverWidget-background: #252526;--vscode-editorHoverWidget-foreground: #cccccc;--vscode-editorHoverWidget-border: #454545;--vscode-editorHoverWidget-statusBarBackground: #2c2c2d;--vscode-editorLink-activeForeground: #4e94ce;--vscode-editorInlayHint-foreground: rgba(255, 255, 255, .8);--vscode-editorInlayHint-background: rgba(77, 77, 77, .6);--vscode-editorInlayHint-typeForeground: rgba(255, 255, 255, .8);--vscode-editorInlayHint-typeBackground: rgba(77, 77, 77, .6);--vscode-editorInlayHint-parameterForeground: rgba(255, 255, 255, .8);--vscode-editorInlayHint-parameterBackground: rgba(77, 77, 77, .6);--vscode-editorLightBulb-foreground: #ffcc00;--vscode-editorLightBulbAutoFix-foreground: #75beff;--vscode-diffEditor-insertedTextBackground: rgba(156, 204, 44, .2);--vscode-diffEditor-removedTextBackground: rgba(255, 0, 0, .4);--vscode-diffEditor-insertedLineBackground: rgba(155, 185, 85, .2);--vscode-diffEditor-removedLineBackground: rgba(255, 0, 0, .2);--vscode-diffEditor-diagonalFill: rgba(204, 204, 204, .2);--vscode-list-focusOutline: #007fd4;--vscode-list-activeSelectionBackground: #04395e;--vscode-list-activeSelectionForeground: #ffffff;--vscode-list-activeSelectionIconForeground: #ffffff;--vscode-list-inactiveSelectionBackground: #37373d;--vscode-list-hoverBackground: #2a2d2e;--vscode-list-dropBackground: #383b3d;--vscode-list-highlightForeground: #2aaaff;--vscode-list-focusHighlightForeground: #2aaaff;--vscode-list-invalidItemForeground: #b89500;--vscode-list-errorForeground: #f88070;--vscode-list-warningForeground: #cca700;--vscode-listFilterWidget-background: #252526;--vscode-listFilterWidget-outline: rgba(0, 0, 0, 0);--vscode-listFilterWidget-noMatchesOutline: #be1100;--vscode-listFilterWidget-shadow: rgba(0, 0, 0, .36);--vscode-list-filterMatchBackground: rgba(234, 92, 0, .33);--vscode-tree-indentGuidesStroke: #585858;--vscode-tree-tableColumnsBorder: rgba(204, 204, 204, .13);--vscode-tree-tableOddRowsBackground: rgba(204, 204, 204, .04);--vscode-list-deemphasizedForeground: #8c8c8c;--vscode-quickInputList-focusForeground: #ffffff;--vscode-quickInputList-focusIconForeground: #ffffff;--vscode-quickInputList-focusBackground: #04395e;--vscode-menu-foreground: #cccccc;--vscode-menu-background: #303031;--vscode-menu-selectionForeground: #ffffff;--vscode-menu-selectionBackground: #04395e;--vscode-menu-separatorBackground: #606060;--vscode-toolbar-hoverBackground: rgba(90, 93, 94, .31);--vscode-toolbar-activeBackground: rgba(99, 102, 103, .31);--vscode-editor-snippetTabstopHighlightBackground: rgba(124, 124, 124, .3);--vscode-editor-snippetFinalTabstopHighlightBorder: #525252;--vscode-breadcrumb-foreground: rgba(204, 204, 204, .8);--vscode-breadcrumb-background: #1e1e1e;--vscode-breadcrumb-focusForeground: #e0e0e0;--vscode-breadcrumb-activeSelectionForeground: #e0e0e0;--vscode-breadcrumbPicker-background: #252526;--vscode-merge-currentHeaderBackground: rgba(64, 200, 174, .5);--vscode-merge-currentContentBackground: rgba(64, 200, 174, .2);--vscode-merge-incomingHeaderBackground: rgba(64, 166, 255, .5);--vscode-merge-incomingContentBackground: rgba(64, 166, 255, .2);--vscode-merge-commonHeaderBackground: rgba(96, 96, 96, .4);--vscode-merge-commonContentBackground: rgba(96, 96, 96, .16);--vscode-editorOverviewRuler-currentContentForeground: rgba(64, 200, 174, .5);--vscode-editorOverviewRuler-incomingContentForeground: rgba(64, 166, 255, .5);--vscode-editorOverviewRuler-commonContentForeground: rgba(96, 96, 96, .4);--vscode-editorOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-editorOverviewRuler-selectionHighlightForeground: rgba(160, 160, 160, .8);--vscode-minimap-findMatchHighlight: #d18616;--vscode-minimap-selectionOccurrenceHighlight: #676767;--vscode-minimap-selectionHighlight: #264f78;--vscode-minimap-errorHighlight: rgba(255, 18, 18, .7);--vscode-minimap-warningHighlight: #cca700;--vscode-minimap-foregroundOpacity: #000000;--vscode-minimapSlider-background: rgba(121, 121, 121, .2);--vscode-minimapSlider-hoverBackground: rgba(100, 100, 100, .35);--vscode-minimapSlider-activeBackground: rgba(191, 191, 191, .2);--vscode-problemsErrorIcon-foreground: #f14c4c;--vscode-problemsWarningIcon-foreground: #cca700;--vscode-problemsInfoIcon-foreground: #3794ff;--vscode-charts-foreground: #cccccc;--vscode-charts-lines: rgba(204, 204, 204, .5);--vscode-charts-red: #f14c4c;--vscode-charts-blue: #3794ff;--vscode-charts-yellow: #cca700;--vscode-charts-orange: #d18616;--vscode-charts-green: #89d185;--vscode-charts-purple: #b180d7;--vscode-editor-lineHighlightBorder: #282828;--vscode-editor-rangeHighlightBackground: rgba(255, 255, 255, .04);--vscode-editor-symbolHighlightBackground: rgba(234, 92, 0, .33);--vscode-editorCursor-foreground: #aeafad;--vscode-editorWhitespace-foreground: rgba(227, 228, 226, .16);--vscode-editorIndentGuide-background: #404040;--vscode-editorIndentGuide-activeBackground: #707070;--vscode-editorLineNumber-foreground: #858585;--vscode-editorActiveLineNumber-foreground: #c6c6c6;--vscode-editorLineNumber-activeForeground: #c6c6c6;--vscode-editorRuler-foreground: #5a5a5a;--vscode-editorCodeLens-foreground: #999999;--vscode-editorBracketMatch-background: rgba(0, 100, 0, .1);--vscode-editorBracketMatch-border: #888888;--vscode-editorOverviewRuler-border: rgba(127, 127, 127, .3);--vscode-editorGutter-background: #1e1e1e;--vscode-editorUnnecessaryCode-opacity: rgba(0, 0, 0, .67);--vscode-editorGhostText-foreground: rgba(255, 255, 255, .34);--vscode-editorOverviewRuler-rangeHighlightForeground: rgba(0, 122, 204, .6);--vscode-editorOverviewRuler-errorForeground: rgba(255, 18, 18, .7);--vscode-editorOverviewRuler-warningForeground: #cca700;--vscode-editorOverviewRuler-infoForeground: #3794ff;--vscode-editorBracketHighlight-foreground1: #ffd700;--vscode-editorBracketHighlight-foreground2: #da70d6;--vscode-editorBracketHighlight-foreground3: #179fff;--vscode-editorBracketHighlight-foreground4: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground5: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-foreground6: rgba(0, 0, 0, 0);--vscode-editorBracketHighlight-unexpectedBracket\.foreground: rgba(255, 18, 18, .8);--vscode-editorBracketPairGuide-background1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-background6: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground1: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground2: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground3: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground4: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground5: rgba(0, 0, 0, 0);--vscode-editorBracketPairGuide-activeBackground6: rgba(0, 0, 0, 0);--vscode-editorUnicodeHighlight-border: #bd9b03;--vscode-editorUnicodeHighlight-background: rgba(189, 155, 3, .15);--vscode-symbolIcon-arrayForeground: #cccccc;--vscode-symbolIcon-booleanForeground: #cccccc;--vscode-symbolIcon-classForeground: #ee9d28;--vscode-symbolIcon-colorForeground: #cccccc;--vscode-symbolIcon-constantForeground: #cccccc;--vscode-symbolIcon-constructorForeground: #b180d7;--vscode-symbolIcon-enumeratorForeground: #ee9d28;--vscode-symbolIcon-enumeratorMemberForeground: #75beff;--vscode-symbolIcon-eventForeground: #ee9d28;--vscode-symbolIcon-fieldForeground: #75beff;--vscode-symbolIcon-fileForeground: #cccccc;--vscode-symbolIcon-folderForeground: #cccccc;--vscode-symbolIcon-functionForeground: #b180d7;--vscode-symbolIcon-interfaceForeground: #75beff;--vscode-symbolIcon-keyForeground: #cccccc;--vscode-symbolIcon-keywordForeground: #cccccc;--vscode-symbolIcon-methodForeground: #b180d7;--vscode-symbolIcon-moduleForeground: #cccccc;--vscode-symbolIcon-namespaceForeground: #cccccc;--vscode-symbolIcon-nullForeground: #cccccc;--vscode-symbolIcon-numberForeground: #cccccc;--vscode-symbolIcon-objectForeground: #cccccc;--vscode-symbolIcon-operatorForeground: #cccccc;--vscode-symbolIcon-packageForeground: #cccccc;--vscode-symbolIcon-propertyForeground: #cccccc;--vscode-symbolIcon-referenceForeground: #cccccc;--vscode-symbolIcon-snippetForeground: #cccccc;--vscode-symbolIcon-stringForeground: #cccccc;--vscode-symbolIcon-structForeground: #cccccc;--vscode-symbolIcon-textForeground: #cccccc;--vscode-symbolIcon-typeParameterForeground: #cccccc;--vscode-symbolIcon-unitForeground: #cccccc;--vscode-symbolIcon-variableForeground: #75beff;--vscode-editorHoverWidget-highlightForeground: #2aaaff;--vscode-editorOverviewRuler-bracketMatchForeground: #a0a0a0;--vscode-editor-foldBackground: rgba(38, 79, 120, .3);--vscode-editorGutter-foldingControlForeground: #c5c5c5;--vscode-editor-linkedEditingBackground: rgba(255, 0, 0, .3);--vscode-editor-wordHighlightBackground: rgba(87, 87, 87, .72);--vscode-editor-wordHighlightStrongBackground: rgba(0, 73, 114, .72);--vscode-editorOverviewRuler-wordHighlightForeground: rgba(160, 160, 160, .8);--vscode-editorOverviewRuler-wordHighlightStrongForeground: rgba(192, 160, 192, .8);--vscode-peekViewTitle-background: rgba(55, 148, 255, .1);--vscode-peekViewTitleLabel-foreground: #ffffff;--vscode-peekViewTitleDescription-foreground: rgba(204, 204, 204, .7);--vscode-peekView-border: #3794ff;--vscode-peekViewResult-background: #252526;--vscode-peekViewResult-lineForeground: #bbbbbb;--vscode-peekViewResult-fileForeground: #ffffff;--vscode-peekViewResult-selectionBackground: rgba(51, 153, 255, .2);--vscode-peekViewResult-selectionForeground: #ffffff;--vscode-peekViewEditor-background: #001f33;--vscode-peekViewEditorGutter-background: #001f33;--vscode-peekViewResult-matchHighlightBackground: rgba(234, 92, 0, .3);--vscode-peekViewEditor-matchHighlightBackground: rgba(255, 143, 0, .6);--vscode-editorMarkerNavigationError-background: #f14c4c;--vscode-editorMarkerNavigationError-headerBackground: rgba(241, 76, 76, .1);--vscode-editorMarkerNavigationWarning-background: #cca700;--vscode-editorMarkerNavigationWarning-headerBackground: rgba(204, 167, 0, .1);--vscode-editorMarkerNavigationInfo-background: #3794ff;--vscode-editorMarkerNavigationInfo-headerBackground: rgba(55, 148, 255, .1);--vscode-editorMarkerNavigation-background: #1e1e1e;--vscode-editorSuggestWidget-background: #252526;--vscode-editorSuggestWidget-border: #454545;--vscode-editorSuggestWidget-foreground: #d4d4d4;--vscode-editorSuggestWidget-selectedForeground: #ffffff;--vscode-editorSuggestWidget-selectedIconForeground: #ffffff;--vscode-editorSuggestWidget-selectedBackground: #04395e;--vscode-editorSuggestWidget-highlightForeground: #2aaaff;--vscode-editorSuggestWidget-focusHighlightForeground: #2aaaff;--vscode-editorSuggestWidgetStatus-foreground: rgba(212, 212, 212, .5);--vscode-tab-activeBackground: #1e1e1e;--vscode-tab-unfocusedActiveBackground: #1e1e1e;--vscode-tab-inactiveBackground: #2d2d2d;--vscode-tab-unfocusedInactiveBackground: #2d2d2d;--vscode-tab-activeForeground: #ffffff;--vscode-tab-inactiveForeground: rgba(255, 255, 255, .5);--vscode-tab-unfocusedActiveForeground: rgba(255, 255, 255, .5);--vscode-tab-unfocusedInactiveForeground: rgba(255, 255, 255, .25);--vscode-tab-border: #252526;--vscode-tab-lastPinnedBorder: rgba(204, 204, 204, .2);--vscode-tab-activeModifiedBorder: #3399cc;--vscode-tab-inactiveModifiedBorder: rgba(51, 153, 204, .5);--vscode-tab-unfocusedActiveModifiedBorder: rgba(51, 153, 204, .5);--vscode-tab-unfocusedInactiveModifiedBorder: rgba(51, 153, 204, .25);--vscode-editorPane-background: #1e1e1e;--vscode-editorGroupHeader-tabsBackground: #252526;--vscode-editorGroupHeader-noTabsBackground: #1e1e1e;--vscode-editorGroup-border: #444444;--vscode-editorGroup-dropBackground: rgba(83, 89, 93, .5);--vscode-editorGroup-dropIntoPromptForeground: #cccccc;--vscode-editorGroup-dropIntoPromptBackground: #252526;--vscode-sideBySideEditor-horizontalBorder: #444444;--vscode-sideBySideEditor-verticalBorder: #444444;--vscode-panel-background: #1e1e1e;--vscode-panel-border: rgba(128, 128, 128, .35);--vscode-panelTitle-activeForeground: #e7e7e7;--vscode-panelTitle-inactiveForeground: rgba(231, 231, 231, .6);--vscode-panelTitle-activeBorder: #e7e7e7;--vscode-panel-dropBorder: #e7e7e7;--vscode-panelSection-dropBackground: rgba(83, 89, 93, .5);--vscode-panelSectionHeader-background: rgba(128, 128, 128, .2);--vscode-panelSection-border: rgba(128, 128, 128, .35);--vscode-banner-background: #04395e;--vscode-banner-foreground: #ffffff;--vscode-banner-iconForeground: #3794ff;--vscode-statusBar-foreground: #ffffff;--vscode-statusBar-noFolderForeground: #ffffff;--vscode-statusBar-background: #007acc;--vscode-statusBar-noFolderBackground: #68217a;--vscode-statusBar-focusBorder: #ffffff;--vscode-statusBarItem-activeBackground: rgba(255, 255, 255, .18);--vscode-statusBarItem-focusBorder: #ffffff;--vscode-statusBarItem-hoverBackground: rgba(255, 255, 255, .12);--vscode-statusBarItem-compactHoverBackground: rgba(255, 255, 255, .2);--vscode-statusBarItem-prominentForeground: #ffffff;--vscode-statusBarItem-prominentBackground: rgba(0, 0, 0, .5);--vscode-statusBarItem-prominentHoverBackground: rgba(0, 0, 0, .3);--vscode-statusBarItem-errorBackground: #c72e0f;--vscode-statusBarItem-errorForeground: #ffffff;--vscode-statusBarItem-warningBackground: #7a6400;--vscode-statusBarItem-warningForeground: #ffffff;--vscode-activityBar-background: #333333;--vscode-activityBar-foreground: #ffffff;--vscode-activityBar-inactiveForeground: rgba(255, 255, 255, .4);--vscode-activityBar-activeBorder: #ffffff;--vscode-activityBar-dropBorder: #ffffff;--vscode-activityBarBadge-background: #007acc;--vscode-activityBarBadge-foreground: #ffffff;--vscode-statusBarItem-remoteBackground: #16825d;--vscode-statusBarItem-remoteForeground: #ffffff;--vscode-extensionBadge-remoteBackground: #007acc;--vscode-extensionBadge-remoteForeground: #ffffff;--vscode-sideBar-background: #252526;--vscode-sideBarTitle-foreground: #bbbbbb;--vscode-sideBar-dropBackground: rgba(83, 89, 93, .5);--vscode-sideBarSectionHeader-background: rgba(0, 0, 0, 0);--vscode-sideBarSectionHeader-border: rgba(204, 204, 204, .2);--vscode-titleBar-activeForeground: #cccccc;--vscode-titleBar-inactiveForeground: rgba(204, 204, 204, .6);--vscode-titleBar-activeBackground: #3c3c3c;--vscode-titleBar-inactiveBackground: rgba(60, 60, 60, .6);--vscode-menubar-selectionForeground: #cccccc;--vscode-menubar-selectionBackground: rgba(90, 93, 94, .31);--vscode-notifications-foreground: #cccccc;--vscode-notifications-background: #252526;--vscode-notificationLink-foreground: #3794ff;--vscode-notificationCenterHeader-background: #303031;--vscode-notifications-border: #303031;--vscode-notificationsErrorIcon-foreground: #f14c4c;--vscode-notificationsWarningIcon-foreground: #cca700;--vscode-notificationsInfoIcon-foreground: #3794ff;--vscode-commandCenter-foreground: #cccccc;--vscode-commandCenter-activeForeground: #cccccc;--vscode-commandCenter-activeBackground: rgba(90, 93, 94, .31);--vscode-commandCenter-border: rgba(128, 128, 128, .35);--vscode-editorCommentsWidget-resolvedBorder: rgba(204, 204, 204, .5);--vscode-editorCommentsWidget-unresolvedBorder: #3794ff;--vscode-editorCommentsWidget-rangeBackground: rgba(55, 148, 255, .1);--vscode-editorCommentsWidget-rangeBorder: rgba(55, 148, 255, .4);--vscode-editorCommentsWidget-rangeActiveBackground: rgba(55, 148, 255, .1);--vscode-editorCommentsWidget-rangeActiveBorder: rgba(55, 148, 255, .4);--vscode-editorGutter-commentRangeForeground: #37373d;--vscode-debugToolBar-background: #333333;--vscode-debugIcon-startForeground: #89d185;--vscode-editor-stackFrameHighlightBackground: rgba(255, 255, 0, .2);--vscode-editor-focusedStackFrameHighlightBackground: rgba(122, 189, 122, .3);--vscode-mergeEditor-change\.background: rgba(155, 185, 85, .2);--vscode-mergeEditor-change\.word\.background: rgba(156, 204, 44, .2);--vscode-mergeEditor-conflict\.unhandledUnfocused\.border: rgba(255, 166, 0, .48);--vscode-mergeEditor-conflict\.unhandledFocused\.border: #ffa600;--vscode-mergeEditor-conflict\.handledUnfocused\.border: rgba(134, 134, 134, .29);--vscode-mergeEditor-conflict\.handledFocused\.border: rgba(193, 193, 193, .8);--vscode-mergeEditor-conflict\.handled\.minimapOverViewRuler: rgba(173, 172, 168, .93);--vscode-mergeEditor-conflict\.unhandled\.minimapOverViewRuler: #fcba03;--vscode-mergeEditor-conflictingLines\.background: rgba(255, 234, 0, .28);--vscode-settings-headerForeground: #e7e7e7;--vscode-settings-modifiedItemIndicator: #0c7d9d;--vscode-settings-headerBorder: rgba(128, 128, 128, .35);--vscode-settings-sashBorder: rgba(128, 128, 128, .35);--vscode-settings-dropdownBackground: #3c3c3c;--vscode-settings-dropdownForeground: #f0f0f0;--vscode-settings-dropdownBorder: #3c3c3c;--vscode-settings-dropdownListBorder: #454545;--vscode-settings-checkboxBackground: #3c3c3c;--vscode-settings-checkboxForeground: #f0f0f0;--vscode-settings-checkboxBorder: #3c3c3c;--vscode-settings-textInputBackground: #3c3c3c;--vscode-settings-textInputForeground: #cccccc;--vscode-settings-numberInputBackground: #3c3c3c;--vscode-settings-numberInputForeground: #cccccc;--vscode-settings-focusedRowBackground: rgba(42, 45, 46, .6);--vscode-settings-rowHoverBackground: rgba(42, 45, 46, .3);--vscode-settings-focusedRowBorder: rgba(255, 255, 255, .12);--vscode-terminal-foreground: #cccccc;--vscode-terminal-selectionBackground: #264f78;--vscode-terminal-inactiveSelectionBackground: #3a3d41;--vscode-terminalCommandDecoration-defaultBackground: rgba(255, 255, 255, .25);--vscode-terminalCommandDecoration-successBackground: #1b81a8;--vscode-terminalCommandDecoration-errorBackground: #f14c4c;--vscode-terminalOverviewRuler-cursorForeground: rgba(160, 160, 160, .8);--vscode-terminal-border: rgba(128, 128, 128, .35);--vscode-terminal-findMatchBackground: #515c6a;--vscode-terminal-findMatchHighlightBackground: rgba(234, 92, 0, .33);--vscode-terminalOverviewRuler-findMatchForeground: rgba(209, 134, 22, .49);--vscode-terminal-dropBackground: rgba(83, 89, 93, .5);--vscode-testing-iconFailed: #f14c4c;--vscode-testing-iconErrored: #f14c4c;--vscode-testing-iconPassed: #73c991;--vscode-testing-runAction: #73c991;--vscode-testing-iconQueued: #cca700;--vscode-testing-iconUnset: #848484;--vscode-testing-iconSkipped: #848484;--vscode-testing-peekBorder: #f14c4c;--vscode-testing-peekHeaderBackground: rgba(241, 76, 76, .1);--vscode-testing-message\.error\.decorationForeground: #f14c4c;--vscode-testing-message\.error\.lineBackground: rgba(255, 0, 0, .2);--vscode-testing-message\.info\.decorationForeground: rgba(212, 212, 212, .5);--vscode-welcomePage-tileBackground: #252526;--vscode-welcomePage-tileHoverBackground: #2c2c2d;--vscode-welcomePage-tileShadow: rgba(0, 0, 0, .36);--vscode-welcomePage-progress\.background: #3c3c3c;--vscode-welcomePage-progress\.foreground: #3794ff;--vscode-debugExceptionWidget-border: #a31515;--vscode-debugExceptionWidget-background: #420b0d;--vscode-ports-iconRunningProcessForeground: #369432;--vscode-statusBar-debuggingBackground: #cc6633;--vscode-statusBar-debuggingForeground: #ffffff;--vscode-editor-inlineValuesForeground: rgba(255, 255, 255, .5);--vscode-editor-inlineValuesBackground: rgba(255, 200, 0, .2);--vscode-editorGutter-modifiedBackground: #1b81a8;--vscode-editorGutter-addedBackground: #487e02;--vscode-editorGutter-deletedBackground: #f14c4c;--vscode-minimapGutter-modifiedBackground: #1b81a8;--vscode-minimapGutter-addedBackground: #487e02;--vscode-minimapGutter-deletedBackground: #f14c4c;--vscode-editorOverviewRuler-modifiedForeground: rgba(27, 129, 168, .6);--vscode-editorOverviewRuler-addedForeground: rgba(72, 126, 2, .6);--vscode-editorOverviewRuler-deletedForeground: rgba(241, 76, 76, .6);--vscode-debugIcon-breakpointForeground: #e51400;--vscode-debugIcon-breakpointDisabledForeground: #848484;--vscode-debugIcon-breakpointUnverifiedForeground: #848484;--vscode-debugIcon-breakpointCurrentStackframeForeground: #ffcc00;--vscode-debugIcon-breakpointStackframeForeground: #89d185;--vscode-notebook-cellBorderColor: #37373d;--vscode-notebook-focusedEditorBorder: #007fd4;--vscode-notebookStatusSuccessIcon-foreground: #89d185;--vscode-notebookStatusErrorIcon-foreground: #f48771;--vscode-notebookStatusRunningIcon-foreground: #cccccc;--vscode-notebook-cellToolbarSeparator: rgba(128, 128, 128, .35);--vscode-notebook-selectedCellBackground: #37373d;--vscode-notebook-selectedCellBorder: #37373d;--vscode-notebook-focusedCellBorder: #007fd4;--vscode-notebook-inactiveFocusedCellBorder: #37373d;--vscode-notebook-cellStatusBarItemHoverBackground: rgba(255, 255, 255, .15);--vscode-notebook-cellInsertionIndicator: #007fd4;--vscode-notebookScrollbarSlider-background: rgba(121, 121, 121, .4);--vscode-notebookScrollbarSlider-hoverBackground: rgba(100, 100, 100, .7);--vscode-notebookScrollbarSlider-activeBackground: rgba(191, 191, 191, .4);--vscode-notebook-symbolHighlightBackground: rgba(255, 255, 255, .04);--vscode-notebook-cellEditorBackground: #252526;--vscode-notebook-editorBackground: #1e1e1e;--vscode-keybindingTable-headerBackground: rgba(204, 204, 204, .04);--vscode-keybindingTable-rowsBackground: rgba(204, 204, 204, .04);--vscode-scm-providerBorder: #454545;--vscode-debugTokenExpression-name: #c586c0;--vscode-debugTokenExpression-value: rgba(204, 204, 204, .6);--vscode-debugTokenExpression-string: #ce9178;--vscode-debugTokenExpression-boolean: #4e94ce;--vscode-debugTokenExpression-number: #b5cea8;--vscode-debugTokenExpression-error: #f48771;--vscode-debugView-exceptionLabelForeground: #cccccc;--vscode-debugView-exceptionLabelBackground: #6c2022;--vscode-debugView-stateLabelForeground: #cccccc;--vscode-debugView-stateLabelBackground: rgba(136, 136, 136, .27);--vscode-debugView-valueChangedHighlight: #569cd6;--vscode-debugConsole-infoForeground: #3794ff;--vscode-debugConsole-warningForeground: #cca700;--vscode-debugConsole-errorForeground: #f48771;--vscode-debugConsole-sourceForeground: #cccccc;--vscode-debugConsoleInputIcon-foreground: #cccccc;--vscode-debugIcon-pauseForeground: #75beff;--vscode-debugIcon-stopForeground: #f48771;--vscode-debugIcon-disconnectForeground: #f48771;--vscode-debugIcon-restartForeground: #89d185;--vscode-debugIcon-stepOverForeground: #75beff;--vscode-debugIcon-stepIntoForeground: #75beff;--vscode-debugIcon-stepOutForeground: #75beff;--vscode-debugIcon-continueForeground: #75beff;--vscode-debugIcon-stepBackForeground: #75beff;--vscode-extensionButton-prominentBackground: #0e639c;--vscode-extensionButton-prominentForeground: #ffffff;--vscode-extensionButton-prominentHoverBackground: #1177bb;--vscode-extensionIcon-starForeground: #ff8e00;--vscode-extensionIcon-verifiedForeground: #3794ff;--vscode-extensionIcon-preReleaseForeground: #1d9271;--vscode-extensionIcon-sponsorForeground: #d758b3;--vscode-terminal-ansiBlack: #000000;--vscode-terminal-ansiRed: #cd3131;--vscode-terminal-ansiGreen: #0dbc79;--vscode-terminal-ansiYellow: #e5e510;--vscode-terminal-ansiBlue: #2472c8;--vscode-terminal-ansiMagenta: #bc3fbc;--vscode-terminal-ansiCyan: #11a8cd;--vscode-terminal-ansiWhite: #e5e5e5;--vscode-terminal-ansiBrightBlack: #666666;--vscode-terminal-ansiBrightRed: #f14c4c;--vscode-terminal-ansiBrightGreen: #23d18b;--vscode-terminal-ansiBrightYellow: #f5f543;--vscode-terminal-ansiBrightBlue: #3b8eea;--vscode-terminal-ansiBrightMagenta: #d670d6;--vscode-terminal-ansiBrightCyan: #29b8db;--vscode-terminal-ansiBrightWhite: #e5e5e5;--vscode-interactive-activeCodeBorder: #3794ff;--vscode-interactive-inactiveCodeBorder: #37373d;--vscode-gitDecoration-addedResourceForeground: #81b88b;--vscode-gitDecoration-modifiedResourceForeground: #e2c08d;--vscode-gitDecoration-deletedResourceForeground: #c74e39;--vscode-gitDecoration-renamedResourceForeground: #73c991;--vscode-gitDecoration-untrackedResourceForeground: #73c991;--vscode-gitDecoration-ignoredResourceForeground: #8c8c8c;--vscode-gitDecoration-stageModifiedResourceForeground: #e2c08d;--vscode-gitDecoration-stageDeletedResourceForeground: #c74e39;--vscode-gitDecoration-conflictingResourceForeground: #e4676b;--vscode-gitDecoration-submoduleResourceForeground: #8db9e2}.test-error-container{position:relative;white-space:pre;flex:none;padding:0;background-color:var(--color-canvas-subtle);border-radius:6px;line-height:initial;margin-bottom:6px}.test-error-view{overflow:auto;padding:16px}.test-error-text{font-family:monospace}.test-result{flex:auto;display:flex;flex-direction:column;margin-bottom:24px}.test-result>div{flex:none}.test-result video,.test-result img.screenshot{flex:none;box-shadow:var(--box-shadow-thick);margin:24px auto;min-width:200px;max-width:80%}.test-result-path{padding:0 0 0 5px;color:var(--color-fg-muted)}.test-result-counter{border-radius:12px;color:var(--color-canvas-default);padding:2px 8px;line-height:normal}.step-title-container{display:flex;align-items:center;flex:auto;min-width:0}.step-title-container>*{flex-shrink:0}.step-title-text{flex-shrink:1;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;min-width:0}.step-title-highlight{background:var(--color-attention-subtle)}.step-spacer{flex:auto}.step-attachment-link{display:flex;flex:none;border-radius:4px;padding:4px}.step-attachment-link:hover{background-color:var(--color-neutral-muted)}.step-attachment-link .octicon{margin-right:0}.step-indirect-attachment-indicator{display:flex;flex:none;padding:4px;opacity:.5}.step-indirect-attachment-indicator .octicon{margin-right:0}.step-duration{flex:none;white-space:nowrap;margin-left:4px}:root.light-mode .test-result-counter{background:var(--color-scale-gray-5)}:root.dark-mode .test-result-counter{background:var(--color-scale-gray-3)}.step-filter{margin-bottom:8px}@media only screen and (max-width: 600px){.test-result{padding:0!important}}.test-file-test{line-height:32px;align-items:center;padding:2px 8px;overflow:hidden;text-overflow:ellipsis}.test-file-test-selected,.test-file-test:hover{background-color:var(--color-canvas-subtle)}.test-file-title{font-weight:600;font-size:16px}.test-file-details-row{padding:0 0 6px 8px;margin:0 0 0 15px;line-height:16px;font-weight:400;color:var(--color-fg-muted);display:flex;align-items:center}.test-file-details-row-items{display:flex;height:16px}.test-file-details-row-items>.link-badge{margin-top:-2px}.test-file-details-row-items>.trace-link{margin-top:-4px}.test-file-path{text-overflow:ellipsis;overflow:hidden;color:var(--color-fg-muted)}.test-file-path-link{margin-right:10px}.test-file-test-outcome-skipped{color:var(--color-fg-muted)}.test-file-test-status-icon{flex:none}.test-file-header-info{display:flex;align-items:center;gap:4px 8px;color:var(--color-fg-muted)}.test-file-header-br{flex-basis:100%;height:0}.test-file-no-files{margin-top:12px;color:var(--color-fg-muted);background-color:unset;font-weight:unset;border:1px solid var(--color-border-default);border-bottom-left-radius:6px;border-bottom-right-radius:6px}#root{color:var(--color-fg-default);font-size:14px;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji";-webkit-font-smoothing:antialiased}.metadata-toggle{cursor:pointer;-webkit-user-select:none;user-select:none;color:var(--color-fg-default)}.metadata-toggle-second-line{margin-top:8px;margin-left:8px}.metadata-view{border:1px solid var(--color-border-default);border-radius:6px;margin-top:12px}.metadata-view .metadata-section{margin:8px 10px 8px 32px}.metadata-view span:not(.copy-button-container),.metadata-view a{display:inline-block;line-height:24px}.metadata-properties{display:flex;flex-direction:column;align-items:normal;gap:8px}.metadata-properties>div{height:24px}.metadata-separator{height:1px;border-bottom:1px solid var(--color-border-default)}.metadata-view a{color:var(--color-fg-default)}.copyable-property{white-space:pre}.copyable-property>span{display:flex;align-items:center}.gantt-bar{transition:opacity .2s;cursor:pointer;outline:none}.gantt-bar:hover,.gantt-bar:focus{opacity:.8;stroke:var(--color-fg-default);stroke-width:2}
+</style>
+  </head>
+  <body>
+    <div id='root'></div>
+  </body>
+</html>
+<template id="playwrightReportBase64">data:application/zip;base64,UEsDBBQAAAgIAFx49VwTaftPZxAAAFZfAAAZAAAANjIyYTVhODI1ZDI5NmQ5MjllYjMuanNvbt1c/47bOJJ+FZ4QJDLWlvXDtixnPEGnk9w0kF9IOjfIRT0ztETb3JZJH0V3x+g0MH/dAxwW2DfYF9k3mSdZUKRsWZbbkm1ld68RpN22VSS/r1isKhZ5p41xhC5CbaD1bBt2Yd/uhrbXCz3bQyNHayafv4UzpA20OWUcRu0FtIx4jgKDx1pT4yjmsTb4cpe82impFbiuOep60AzG3ngMg07PM8XjmEdC9qezljUAlKDWLVyCn89ev355CUaUXmMyaYI5wwECAaNx3AqmKLgGUxqFMUAkBJyKX1pTmzP6ZxTwjc5qTS2iAeSYEm1wlwxm10AiTJA2sLpNLaDRYka0Qfe+qYULpp7uO/1eU4OEUJ68IwZ91dQ4nKhXdMEDmrSNvs5RwFHSKcin8mOG4kWkoMpLjTlk/BInD9um3WuZbsu2Li17YNoDs2s43d5/a0IEZ0ttYIoH0FyhrgB8jsaUIfATpddiNHslup6QuO6IbXWKxL7CX/mCIeBrI0ZvY8R8rYz0fmdTumV6RdJfwwUJpkCJLiW4lxfsrgVfNTXIOQymM0S4eiOgC8K1gdXU4ms8n6NQG4xhFKP7Sl9uFiESUMLRV14KkY6XQ6TrFgFyzhDkCCjJpeR2c3I7/zQ85nCCSoHR7dqbne5YD4AhxB4rtD4kDoXtZ4g5GFMG0A0iHPjCPswpiUsi6Lmbg+3Z9sOjLTCDhtEeS/LitjK1rXFEb7P20DattUG03fvdg2tqMRF/c22gAWCbJvgGAGi3wR9/+f2Pv/wOPiLIgiloA2UI1fv/+v98IoZjJcMJKIk5iJOhvKAEgWGinsYtxPwVZR8Uh7p4Rvx8A7t/fpGCbfUlnTXA8EfAjAWL9IaBSRAtQhTrvtaW7flaAzx+DJjB0P8sUMz1hjFDfEpDvQGGwyHwtffvPl76WlPL6tlbeIMnYhpxCnwt5bmtSHhGGZ5gMjTVTyv5ryP+66d/yh/bfByimGOSaFGZB+zHIeRouFJf5zFneH65nKPhu7cvf/357PNjGIpODK3HwRRHIUNkaD6WDcAI8+Xw5eVPF+/eX5y9LTUpeqb5vSZFxkuwOhUmRSejRSMYC/1RTHxikX4HMoNvAolOE6TgNEEKILhvPJXa000EQqF/UhMnlFOdznlszBmd0XMaIvAM/PboTjR3/3j15vDRHSIBDdGnDxfndDanBBGee7Bx/xsYJP2UzRVotFLi3tbsAEPVq/VkebqhmC8TJwn4GqfP0X8mpp5dTiEpQXXPsO3csmfWQ7RlZ6yfV55oK2suQhzPI7g8XzCGSLAEQ0AX/JmRf/vZM3D+6cOHl2/PP//6/POvb88uL969PXt9cfn5S0YtriTxljQb0tPUA8jC5zBGryBDbzChrGHkUNXNnRQWmiXLAd826DqPcHANJog/X14mjr7+RGpuK0YRCnhrxMmThjHGTFimUhTmljDLdmoh0eqaaxJ7/dIkWh0vQ+IcB9fnFErFjpckAHoc0DkagNeiW5SBb+A9nKDEiN8JDK2uqaCWE0F+H8BYfs/IYulrW2D62gpNIxDg62UZLPnzi+yktdFJaUM2ehaIUbfoXEBf1Kl9apJ9vpKGOF1rU0Mct1+ThmScnK5dXkPqYfgEnBylKEox7P2dIByTBWrNYRwjMkGsFSIOcRQfpia7pFVSGtfOBbb9unQmszT0ehV05iTknpyeE5oWpT9OIut+k/hV2EOkXyqA309q38qtFf09Uf/B6717mGNn9dJoZxEjFgO44LQ1puwWsiRDtaIgboKJcN5jMFvEHCToA187V1wJ25F87msG+AmSMELgdoqDKbpBDNxiEhtyeXbzfp+KQD59eK23fT8doe+39XXb3+CCT2UCrdFugjvA8QzRBR8Ax/zVNM3UrSzQA+UV9JP38RjkGlkLbhsiD6gnfUoimUYD3J1ABTwz5/FZvXrcBdvOuAtW+cXAtryNGfme0RmOkcFggPQvCXy2uYL1Yc7WlG3SZHUVTUYAeTDVdelt3DeahbRJ0mxro9VddvgDjZD+ZLTgnJInolUCZ2gA2kFeNdsY3JexxFuM9Tx3T3LqYMqcDGXmfVNDjFEmggzxewAi6aJJYzcAwkSKpDEKDZ+cwygCEZ0MfOIvTNMafbFnALSAIAeTSaKpBwCUyrJnG3KFZNUbEfnR6AYlBuIHKRcEEYzjoa/dtsaLKALjCH0FmKNZ3AoQ4YiBPy9ijsfL9M8JnLdsowvmX1tdMF+2HKMLRpPWnOEZZEswpTeIDdZvtD0TwIDjGzSIAxih1hfT8PpXQGQbW7dTzBEYUyKclBke0SgEjC4ETq2vEeAMkhgLeloCsngKQ3rbmoXpq7QJ2/S1H//4/W8/tOWYftwBRQtAztFsnqAsDaHoGiU7obPB3/+6wQuKkNAeAeAIgRsc41GEmgAROIpQCCAJQczF650iRTdSKTgGhPJ9T7RAkoYv3em1JtnmLC7xtdMMrNqwDh+UZX6/Ua3HdAtjIJyZYIpCMGZ0BvgUgRfv3jRXA8nK0EobcdvOmFBjPe99TSqzr+2f+YnRdbJypJNVZMgL7Lay2p0NATlzX7ygRhQmCHKRjRd/lMiluIbZ875LLsXuZYx0eYfZtrsKiSuV9LJ7265v5aV0r8ezIkK6WvfFkMtoLsE+Mer6E0zmC/5FaMhQbImkrRumId7ztasn+xdP1zBdM58d6dezeFp2NpnZLR/IKA3d5e1YK97EuC8EKilL+p3U0gHwNWUFxLw61M1ZhRwrxWDoBsHo+ObKch7iG0Pk4JJINeJINDmF8SX6ygeg/T5VAmD5/qgtGnrQoZAru4rVwAySBYyi5TdBhvSb6W1iaEpHxUKdcqmUXk261DvId65NV06vErsdbUtZiqvCXMe/ka70nVywbddlebyMtlRIzNrrMPQ/dGl/1nqD4/+ShOqb5CWCGskWmnpGqcSeBxoqm2tvhnfq4RLpE6kcjvnPWEY8s59LodbDpJNJoFrl90lWqEiIrMyCcrgheDCVpciwc7sbr3AUAV87EztuwPK1k/NgWfm6lZqIcA4kwgbfJDROIQljHEV6Uiwl3iuFcSefokox/U1qewGoj+7wvTERkTnztavfGob85rskFSqbl5/mTOzH5GtApkzX3O1sx1w3Uo4+O1dbUk/60XI6mZyyU4G98qTVzcup8shKiborS5+0EkCOJpQtVcHD2YtPry99Tdj05OP5lBKUzzeque1ZttPp9tx+dnZXXoxzdoGLagZf4yhKVKnCKutt7VPUpFIZj6xrVlCpw5CXrG0GaEFJ1DL6KsUdo0xKf4qCt1odMjkzgCh9AXQMRpjxabmMqWt4Tn61rqd+JanGPGTvyhSOl9z9Hi9IkiICgrQXdJRk/AfJxmcTBKtd8SYI6WgA7kA4AGQxGyH2FMzWL5fpS3CfKo/pZexTsC8FsxPu+ja2LHOr5ubhPkofPfXNN3tXNRtfIKuMYuXDP8esSbMs87AVrA7WT8vUaRc2yyrs2vsIBkjUtiOm+9qLF3KnNor0j5xhMtFDOjLCRk5t1AJndX0NbEl58uJFCRenb9huvmS7plDByoQKTvmC0tOTeSwH1RRC0W6XaPLNm6ImZzto7xWy/uZNOdb77ndxbLN1dJVIP56iYzE/iGanRJOfP3/+XNToctf89jyzkGshqBzb+UMINfmcViYIdSoEoSdg6njoq9p5xfhWVLXHOv0SUDLGbHacO7AhpYQGOGYut2fXpQKZSLZbZcKfgr5TsXH8kq+UQ8RSRTFIuboCTkURNVdJQkxJabadXNqirnr4bPrPLb+FZKv0n8iA6hHiAIMhMJ8CDH7IVEwZESITPn0K8J/+1FCcCuZXkVkSejQBbmYe+oLT3UKneAkpsatbjHs9xbhZfbGdLTu4c3tTdHDnzubRZVd9w+nm3cK6yq6cjItQpfSuVn5PRsWDZXVOvtj+mMNhfaNreflkc03OvJ3NLlXY0lfJJVlZPx5lTlJJPNL80da5qr2HpNpjyFBrxBC8DumtKJ/dIMTeUXeheHDTdrP7QGQRRdVXZlEBCmAc4wkBUjMqbcP1ja6dqwDod/ccaDx0re5lil69CjF7r7edDZIj/igGfEbCtKx1IzmUlJRdMjwfiAPeEYIkTf303IxaCADPJH5DIJkoM7sfxr1W473DnFu9fsaGrIelN56KgmG64COByNHG2jMcN7feW/vOwB6qMm7nIGNtuU5mv8/d8tJ22laGbjC6PcS4Wu6283WMefWMrpOPotya3KpOBmW7/P643XFyZ28/JPANgPJywR//+39AHBYFadux3k4K2Brf6VRuYm47G6chZUeOPVSrLHknrSdRC0ZGm2Ld99Vgn+m+/+zbo4aqWVeryiGnbKuGaqXXAaFu3Xw5RrcmdcusA70KXnxHLtfKY+psHU2oFHvVZ6iVZvS3le4DilfHVTN6+MB51Uu24NPlfnNhmUbH/D7llW72qKpVnj3X2gbkIgTDFRKQQwOH4nhq9p3VNyXr7sZ51NWH8hyqRGsvmZIgdysD8NDRlqVA7pvSoAS3nSdbjl1gBZeWmQ+ovZrYdA6LhsrzUB/QD8Y6YtE/1WJsmUavk2PEs2pajL3MnqlTYX55fQVEu53eaxQjziMUA3HEYwlixG4Qa8U4RE0gvOkpo4Qu4miZrNMxZxBPpknV/Or6hiwP8kSYl5anyYmMCeYYcnT0epoS55jrw0sPRGFKUeJ22oHDbq0oOB86h8uWfLIlYSxfblGkJ3WtosnO6gGZT8dMj2nJCeSYew94biFSz7lORb+zozsPLOxzuBQ1E4XremX3qUDYXt4to9PLXRjl1FPL6pjOQc7TKWk+OUcn9r0cMz3TIo/CG6mN+MghXwgXTBXmZo1Xw4iTT/Mqc8gCbm1fEmUnFZO1KEQmNVY+dnPM7iZGytKjcOWhpmkyx+ytmNm9dGdXinapXNiKLXctnk8RUekwzhaosdszLrFqO0Yvf41bdZ/4oTv8MnGMXSWflXGE2UZA8I6gpDRY7TRs3NMj6pFf8immcwyTuaWWwDfJlBWfprM29Y3U4W3lo7E1xdJL0xOE08m3a+7J5EY/K+mLbZpNcVXVlRAkcm8QE53lplljZ1ijnijJoFsng/0MgxWOkZQG9jDgHqZEMuLl3Nvqk2PrBouTQps9oeOUrwcVB3QSP7NXEF8YnHIYZS4e0oW7J1JOKLxcf7RPpbM42m5RO+rKpMtyzf1r85AxUhUqYo7G/xTAluNxg86N+YYJR4QbcCaG/O/OY/+w+XQiGo4Ctsp89LLthGiE+bP/JwR6hxF4LPBHIVqBOVVjkdM06VSrNnzt/N3bVxcf3rwUlXRH0+WYNdLlZAqM7QpbzseiXR3G/RxJfkTcn09Pno1F7Wqpy5yLEN8o0jj8qt4DyKzpBuXCQXYLL8I+j2hc+gZlyzH6bi4W+d4XKEPB9VkUgSml12U6nL9cu3oK+oH5dVBBBxBBq7onkeF4BsEQEHQL3id/nEdY3C2qZoRwYMR2m5GOW1fXKa5vTszVZYCNHaVEpPEoxHFACRGTUcydqkwlFwSp78lJLGAR5WPi1vatW963ZN9Sdo3YBQnRV21gCon0WhuIAOP+6v4fUEsDBBQAAAgIAFx49VzEXYBmxQ4AADVUAAAZAAAAYzU0MDAyYjU4NGQxNGRhNGQ2YzguanNvbtVc/W7buhV/FU4oUhmzZVGS5Y/OK9Kk3Q3QJkGa7i6rentliba5yKIvRSU1kgD3rz3AcJ+wTzJQpGxZlhPJsYrNKApHlg6p8zvfPOSdMsYBOvGVgeJ1LF03Rp2e5UPLdy3f9npKM/n91J0hZaDMCWVu0I5dCFvo2xxT5LfmlMyIFs2Rp7FIaSoMRSxSBp/vkm9bCbfGENojc9SF1tgbuahnW6bNH8cs4EN9OmxBOABuCORAIBkIeMRHAEcAT0LCr37//Q8wjoMAjF2a/DAi5Br5SlOZU/Iv5LG1qStNJSCeyzAJlcFd8molXyvAIVIG0G4qHgniWagMOg9NxY+pJNazOr2m4oYhYckVzoIvTYW5E/mNxMwjyVTQtznymJijy6biZ4qiOJCMy1ONmEvZJU4eNnTDbundlgEvoTHQjQE0tb5u/FPhJBhdKAOdP4DmEgPJzjdoTCgCPxFyzd/maYo9TnE1EaibRWTf4W8spgg4ikdChr4xRylDHerr1G1YRPyIIpchICmXogvX6Xb6K7pfmorLmOtNZyhk8oJH4pApAz76NZ7Pka8Mxm4QoYdKNzeL+DF3J6gcM7q5SVuFAEpmcLKliBrrRM0fwold2fazixkYEwrQDQoZcLg2zEkYleGgpembsHcff9sCG6Bp7bEAL2pzE4LDSWsckNus9hs6XKm/0X3Y/nJNJQr530wZKAAYug7uAQDtNvj+x+/f//gdfEQu9aagDaTay+v/+/+ckL8OTF7HI2HEQJS8yjEJERgm4qndupi9I/RCYqjyZ/jnHmz//CIIG/ImlTbA8K+AajEN1IaGQy+IfRSpjtIW4zlKAxwcAKpR9FuMIqY2tBliU+KrDTAcDoGjnJ99vHSUppKVs1P3Bk+4GjECHCXFuS1BeE0onuBwqMtPK/nP4v/10j/Fx9APfBQxHCZSVOYB48B3GRouxdc8YBTPLxdzNDw7ffv158OrA9fnkxjCA2+KA5+icKgfiAHcALPF8O3lTydn5yeHpweJbzoiPhq+/cf5ycXb445eUlGMvN01alKUzkpRoFVBUayMZI3ciMuUROcTDdQ7kGFIEwiONUHKsCZImQoeGq+ERHUSgi6XSSGdE8KISuYs0pZsBK/Bry/u+HAPGd6+uEMhjzY+XZwckdmchChkuQcbD7+CQTJPMVyBlEvBtjc0BgzlrFYK9GpNWN8mYQJwFEbeoL8l5p9eTt2wFNS2Ya9DrdcDNBegpUXslwcaZk2Ij6N54C6OYkpR6C3AEJCYvdbyl1+/BkefLi7enh5dfX1z9fX08PLk7PTw/cnl1eeMWHwRwENhSkSspXou9d+4EXrnUvQBh4Q2tBxXVX0rhIWmCprgfg2uowB712CC2JvFZRL4qi+F5LYiFCCPtUYsfNnQxphya7ULhNDo1QIi7OgrEO1eaRCh1c+AOMfe9RFxhWBHi9ADauSRORqA93xahIJ7cO5OUGLY7zgPYUeXrBaKIO4HbiTu07K8dJQNZjrKkpuax5mvlkWw5OcXMUm4NklhQ9Zm5vG3bpE5Z33RpJ4Sk+zzlSSk27FyoaNVT+ADO5nAp2OUl5B6EN4DJs8SFCkYxtOTCBkOY9Sau1GEwgmiLR8xFwfRbmKyjVoFoelohp7PNzo1yUzGNdh2BZnZC7h7h2ePpkXKj5nQelgHfpkKhSJW5YwvAarVzefrTyR8Ozv87m6RHbTTFCiOEI2AGzPSGhN661Kfh+NLDKImmPCIPgKzOGIgYT9wlCMJFjceye+OooGf3NAPELidYm+KbhAFtziMNOGfu/nAT6Ylny7eq23HSd/Qcdrqaux7N2bTljdF3nWj3QR3gOEZIjEbAFP/qut6GlcWCIIMC3rJdTwGuUFWhNsaL4ypyZyS9KbRAHd7kAGzk5eBbk1Bn5GJF2B5b2DA/ppKnlMywxHSqOsh9XPCPkNfsvVxzFaQrcMEOxImzXOZN1VVEW48NJqFsAnQDLg26jZDfEECpL4cxYyR8CUfNXRnaADaXl402xg8lDHFG4gZZk2AmRnA9PKAGUaGXdqKCY4iuOAoT7JBMNjM0hEWtQi0AowkQtYagRy0+1CeXs4rQsuuCYtMCRmWd4uG0ZEs+CJTW8PedHCV9eVJs7ZEQNjTh2Jei5iNUBCIWF99icN5zD5z0RjyYmg6uqZr/JqjfHlZRkM6Rr4ObfRqCleMbMmiUz5ckaK5zaTBJW78vU84V1KU1DsQMZehAXCUGxzhUYC4Qu1qy5aBxVIwKLpBbvD84cpi7uMbjWfaSTwaMMSHnLrRJfrGBqB9ngoBgI4zavOBHjWrKGSIAhmRgZkbxm4QLO45GEK/yW1iYSrEvh2jn6sU1yRL9k4OsjZZ2b9IbPemUFqKL4UZzf+RrFi5RaqeUVNybfQz0lKh/GKsYs0/qcL+rOQGR38XgKrr4CWEGknxXD4jReKJBxqyZmOsx3Dy4RJJkhAOU//xbsTWTDsXaNUTZ0EzUyaB5auhS64IFsGMQ9ndEDyasEowjFwN8x0OAuAoh7yuDqCj7B2Hbk6n6klSoWnuiIMB7gVnzEIMxjgI1KQngF8rxWIrn4amLP1VCHsBT1/c4QdtgkIfUUf58mtDE3eeJfUOMbz4NWdhPya3AVEXWUG3dRx9NUhJ9HLes54IGZpWpnBkVkCvPGh147KvYpEUos7S0CejeC5DE0IXcqXz8PjT+0tH4SY9+Xk+JSHK1xSkavehYVodu9vLKndlX5wzC4wvYzoKQ0EiSqWdrK2ZvdwaR00u1sz27ZRPgHflvEBtPT/zSnItI6+C3HOEScpPUe5WazwmNAPwNW9AxmCEKZuWq4rYmtnPrWpwe1CHUOj93QrUOo+7xBLXOA69xNpy0I7JKKnqDZLVjSbwlktfTeCT0QDcAX8Awng2QvQVmK2+LtKv4CEVHr2fsU/eU6WXreyur3oN9Y2F9cfnKEL0NDRfn13VilsBrRKCZeWzPxPWZG6gvpsHqwP1/SK1X8cGYeHUzgPXQ1MS+IiqjnJ8LJZjgkD9yCgOJ6pPRprfyImNdHCw4yhgg8rL4+NSIU43v45SU4AKM4mCWb6RbP9YPheCavIgUTdKDPnhQ9GQsy2o24Wgf/hQDvR8Gb6muDbbK1MJ9OdD9Fye7wSzWWLIq6urq6JBF9vUu9/XC7HmhMqhbZs/Bu1MDmpWyEH3gNTzWV/VzEvEN5KqJ6zTLx4Jx5jOnhcNrFEpIwH5KoRRlwhkEtlOFYXfB3z7QuP5Hl8KB0+lilKQcmurjPBGSSZLhJiEpdHu/6BF1mzxr1t+AcmQxT9e/1QDxAAGQ6C/Ahj8JdMUoQUonLDpK4D//OeGxJQjv0zMksyjCXAz89BnnK4VmsUupMRibjHf62m4y8qLYW7Ywa2Lm3yCW9c1n704bGs9I7843KmnE9MwMyFCle6aWvHdGxSPds6Y+Yba52wKsbV+T893RMGaVvSzxaUKC/qytiS6Z8ejzA4KwY+0fLSxn+LJzRFtvheuNaLIvfbJLW+RWwPE2NJuIXHopuNmV4HCOAiqe2be5AXcKMKTEAjJqLQIV4Biz6opI7MzfW39Cim7bW8Wg8Qbf+QvfBj6aefaWm2Ikjj0LymeD/iGxQC5YVr5sbsZseAMPBT8GwKBRBntfpzvtRrvLeYc2r2MDVm9ltp4xXsCScxGnCPPNtZdrWfmFb+uBteutZOxhl0zs9rX3YjSttpWim4wut3FuMLuZvD1HPPa1fr9XGNOrwvrsa5WhstG+dVxwzJze+4uEvYNgIxywfd//wfwTWIgHTtS20nfWuMH7cZLzK21tuNJTOS5m+mkJbfSbhLpMDLSFKmOI1/2teo4r+9fNGRbqvQqu+yuq5qqlfYDReJm1NTfbGX8gF0hireEu5YRk7XRfVwp96rPUEvJ6G0K3QWKllvSMnL4yJ60Sxqz6aKEuehpvW7nh2xH62a3o8Hy6HXhJkNOfDBccsJlroZ9vgUte2V5p0C9u7bnbPmj2GsmuPUkmAKg7kYF4LHu9QXn3L2UoIRvW5vXn+1gC7A0zLrQNHfLhsrjUB+jH811uNPfmzPua1DPIdK3akKkn1kyNSvoV78nGdFug58P379/ewkixFiAouTwjgWIEL1BtBVhHzUBj6anlIQkjoJF4qcjRl08mTKeri63bWdxEJs++mlzmlBkHGKGXYae7U9T4Ex9tT/hkSxMCkrUTiew2271gj1gc3fREk+2BBsrdFtwOenmvWg9KbGpGztVPk093YkhFMjUn9zEtcGRevZuSfjNLdN5xLHP3QVvmSj065XDpwJiJXDvm7klj0492/5N3dwpeNonzHvHaM+xl6mnW1nEdlcttREfmctiHoLJttys8WpoUfJrXmR2cOCGrulW3oHDmlpsTD1TGiufu5l6Z51H0tIjfxmhpmUyU7eXyGx33VlP0S5VC1ui1V2RZ1MUynIYozFqbI+Mn/bahqHBfG2rus+ucHBVLxMYVyhvZYtRdC0/4MUruehwB6TH+5BoKG9NTpW0CZaHZQzA+cXZh7Ov8sySNEiSOyZlsEZXWItwTU1YnWrhNiUUVY5+LqraAybVixrlMTEyC0Z2ldOE0sLGKeFHZyRPgTElM8CmaHlcGj+6RG6FXfYwUo1Xht+kheHGiutr17WUanJUBk96dAmG/iQSlQ2ikW9Cr46akY9/69QkI1OPMivspTQ3M8yVNaM4mi3TSW2MQ/9TiH+L0Rm9nFJyq96B2ymiiLcQYn8A6CrzBA/Ls26sgqxHY4S5QebIE65hG4ehJDXY5Sl6TRBmBMudzwOM/HKwC0STYmPOVR2OeSNSqfPnihCF3UzIsvt5awnpaifjVDv2rfQxeEUzgXbhIXtHAYlKH4NnGJpp25V2u+z9ODeXY30YBGBKyHWZCedPq6tesC+vv91dFusAjzLkOTeJroIhCNEtOE/+OAowPxtK2kbuMnkpVUvZoMrjcFYn3+TW3EB2bUTagheJAoYh12WuSlWBQ5QSKu8TwSPnEm8N4OdObpxTuUH7ltBrRE9CH31TBjqnSK6VAXfGD18e/gtQSwMEFAAACAgAXHj1XFLDPZP2DgAAnFIAABkAAABjMjUzYjAwYTQ0ODVkMDFjNzc2ZS5qc29u1Vzrbts4Fn6Vs0KRyhhb1tW3jqdI03YnQJsWabqLbpVpaYm2OZFJD0XFCdIA/bUPsBhg32BeZN+kT7KgJNuybMfyRd1Zo0hlWTokz/fx8JzDy53SJwE+9ZWO4pmO1dN1ZNstx9cNr9lsYKUa/36GRljpKGPGBQrqETKsWp/xAfZrggkUaOEYe5oIlaoicChCpfPxLr5aK7fWbJktw2/qPYRN20K21+635etEBLKk98c1w+pAiPk15sDxr9gTISDwAoKpSAsHjq8JnmD/QlbiNaGMdw1QT2pGRakqY87kWwtVV6pKwDwkCKNK5y5uWrFmBYRipWM0q4rHgmhElY5zX1X8iKeybMdpVRVEKRPxHamCy6oi0CC9YpHwWFwTfDPGnsC+rCISw+RnjsMoSBWXlxoKxMUFiV82dbNR05s107gwzI5udkxTs1rmPxQpQvBbpaPLF/A4xSBV5zPcZxzDz4xdydZsltiSEucVaRurpL4kNyLiGFzFY1TgG+EqRYS39UXhzsoqn3CMBIZU8i5y7fZc7mVVQUIgbzjCVKQ3PBZRoXRk067IeIx9pdNHQYjvt3q4ukofYzTAhZRh28Zipa3WA8qQYvcVWp4mdlXb3xER0Gcc8DWmAlzZGcaMhgU12Mo1trEJ9xUWQNPq/QS8sN5j7IrQQa0fsEm285u6Me/9ZvN+feOqSkjld6F0FABT1+ELANTr8O33r99+/wrvMOLeEOqQ9vr0/p//n0tlc4y4OR6joYAwbspzRjF0Y3pqE0TES8bPUwxV+Y78fIH1n18SwWb6kMor0P0JuBbxQK1ohHpB5ONQdZV6Up6rVODoCLjG8W8RDoVa0UZYDJmvVqDb7YKrvH3z7sJVqkqWZ2fomgxkNxIMXGWKcz0F4SnjZEBoV08/tfiPLf+0pl+Tj6kf+TgUhMYsKvKCeeQjgbsz+lpHgpPxxe0Yd9+cvfj09+MPR8iXlegaR96QBD7HtKsfJQWggIjb7ouLn0/fvD09PtutUzhNq6RO4cw7hWFv0SnsDIt6KJT8SZF4zwP1DjKNr0KinSpMlVOFqQLhvvIkYY8TC0SSfwkTB0wwlY1FqI05G7ET5mN4Cp8f3cni7o9mN7uP7jD1mI/fn5+esNGYUUxF7sXK/WfoxPVMilvB6JTEjaXeAd20VvPO8mSBmC9ijwBcRbBn+K+xqecXQ0QLQG1phtVchFovB2jDzFi/dnGgjay58Ek4DtDtScQ5pt4tdIFF4qmWv/30KZy8Pz9/cXby4dOzD5/Oji9O35wdvzq9+PAxQ4vLBHgjMRuJW6V6iPvPUIhfIo5jj7Ci5bSq6mshXGmWDAu+LMB1EhDvCgZYPLu9iH1c9XHC3FqIA+yJWk/QxxWtT7i0TIUgzLlbTacUDA3paU0xbLQKY2jY7QyGY+JdnTCU8Dq8pR6oocfGuAOvZLUYhy/wFg1wbMPvpAoNR081nfSD5HlAYfKcllWlqyzp0lVmytQ8qXu1KIAFP78klTQWKpmYkIWaebLVNTaWql9VqU0syb6/FUFMw865tps8up0ZkvFxHLM4Q8pB+ACY7EWUlBjm5kpQQWiEa2MUhpgOMK/5WCAShLvRZJ20rUjTcKxF0rTK8YsNJzMyNBpbcOYg4B4cngOalpQ/VizrfhH4WdRDE7dUKn4zqE3b/C6gmtlUxzZ+ndGYBjtRiHkIKBJMJlUmiPvS8Z5BEFZhIH33EEZRKCDWPrjKSYqVtB3x766iwc+I+gGGyZB4QywTQhNCQy0ZnZt5ty8NQN6fv1LrrjttoevW1XnZX1AkhjVviL2rSr0KdyDICLNIdMDSP+m6PvUqV/AgdQpa8X3Sh1whc8F1TWbA1LhOcSBTqcDdASjQsnIUMFoluXxmxl0wig8GptFe6JFvORuREGsceVj9GKvP1GdqfRizOWSLMBlOCpPmIeENVTXxNu4r1ZWwJaCZxkKp6+zwOQuw+rgXCcHoY1kqRSPcgbqXp2adwH0RS7yEmGUYjZIgszKQ6fdVBXPOuIwx5P8dCBIXLTF2HZAmEjD1sa+59AQFAQRs0HGpG+m60ftojgBqIMEhdBAzdQcFTWWZowW5UnJaGxn4seAaxwbix0QueAEKw66rTGr9KAigH+AbIAKPwpqHqcAcfo1CQfq3068DNK6ZmgPjm5oD49uapTnQG9TGnIwQv4Uhu8a8M79Rb+uAPEGucSf0UIBrH3Wt3boEmWysTYZEYOgzKp2UEemxwAfOIqmn2k0AgiMaEglPTaosHCKfTWojf3o1LcLUXeWnb1//+LGetOmnNaqoARICj8axlhNDKKvG6FrVmfCffy/gggMs2SMV2MNwTULSC3AVMEW9APuAqA+hkNdrRcpqTKWQECgTm96oQZxyLlzpOZNMfRQWeOwwDduuWbs3ytC/X6vmbZqgEKQz4w2xD33ORiCGGJ6/eV2dNSQrQylsxE0zY0K1eb93lYTMrrK558dG18rKSZysVYZ8hd1Orba9ICBn7lcPqAFDsQaFTMbLLwVSKbamG9Z3SaWYjYyRLu4wm6aTauIyzXmZjWXXd+uhdKPHMwMicbXuV6s8ieZi3cdGXX1M6DgSHyVDunJGZFq6pmvynqtcPt48eEpQcrGvYbbscgIZM5vLdIoHMilD13k7xgw32e5TqZUpSupdwtIOuEpqBWS/2tXNmYUcM2JwfI1RsH9xRTH3ybUmU3BxpBoILIscovAC34gO1N9OSQCG6/bqsqAHHYpkZE9jNRghGqEguP0iwUj8ZjaJDU3hqFjSycllxkviUmMn37k0rhyeEusdbSO1FJcrcx3/R1yx8hkUsxy33TDbGbZskZg152HoX9TE/sx5Q8K/JYCqi+DFgirxDFr6TkqJDS9U0myuuRjepS8XSJ8k5LD0/8Uw0nLai1ia5SBpZRKoRvFpkplWEhUZmQFld0PwYCorBcPMTW68JEEArnIsJ9zAcJWD49DIZy/KcbIMy9oRCBO+JKqxVoLQJ0GgxguD5L1COrbzKaqpTj8nbF+h1Ed35F4byMicu8rl54qWPPkmToUmxSe/5kzsu/gxSFKmc+zWlqPPCykGXzNnEksyiJadySlbW6BXHLSycTlUHjklkTOz9HEpHhJ4wPhtut7h+Pn7VxeuIm16/PN4yCjO5xvTvt02TMt2Gs1WtndvPRjn7IKQixlcReAgptIWo2yrmbPMJU1tWRmPzNG3oNRumk9QWwzQvIJay/A1EbcPmVL+rAreSnXIkp4BcuULsD70CBfDYhlTW2vlFyBaJYV8enu3uStdOl7J7Hc/onGKCCRoz1kvzvh34onPKnizWfEq+KzXgTvwO0CjUQ/zJzCaX95OL+F+Sh69nbFP3qYUzFp1lzexZehLS24ermPio09988XabZuNXyGrALHaZj4VrzfLYZah7zaClYH6YZE67MBmGCur9jZAHh6ywMdcdZXnz5OZ2iBQ3wlO6ED1WU/zKznapAOc4bgKLEl5/Px5ARfH0Uwrt464pGlzIxMpWMWXkx4ey30h2I4PKepmgSJfv15V5GgN6o2VoL9+XRD0nBNSllUwdwR9f4j21flOMFsFivzw4cOHVYXeruve7ba+EmspqBjaduP7oJ2JQa0tYtADILW/6rc18yniS0HVBuv0i8don/DRft7AgpQiDHByswplZfaMTCDrbNPhDwHfodDYf8RPySFDqVUhSLFlBYLJJdQizRESRguj3coN6WY54YSZzf41i88gmWn2TyZA1QALINAF/QkQ+DGzYEoLMB2I4RMgP/xQSTGVyM8CszjyqAKpZl76SKaThdbqIaTApO5qvZezFjfLF9NasoNrZzdlBddObO696srRLD03b2Q0yskgm1bGRdhm5V2p+B4MigdX1Vn5pfb7bA1zNLuRyyI4Tkkz+tnc0hYT+mlqKVlX3+9ltlEl6phmj5Y2VW3cIVXvI45rPY7Rlc8mcvHsAh7mmlUXKQzNabnZWSAaBcH2A7Nc/wkoDMmAQkKMrSbhJIg5z9xqlBSQNTJLXttbROyNxnIuKGnxO9ngY+pPF7UupIbiBWUXnIw70GMswIhOEz+NZoYWUoHHif66kCBRpHM/rPdSbfcaa240WhkTMm+WWnkilwuzSPSkRg5gq1v5YM5wytn9ZjTtnWy10bQys33NJSdtrWlNNrzvYluN5rLvtY91bWi6mXOqWo2SrKud0bJZfHbctK3cxtvzWH0dSJ1c+PbPf4HcKQrTskO1Hi9fq3ynLbmxubUXtkImFdl3R21qye3papJ0wMiwKVRdN23sU9V1n355VElXrKejyi5bbLeN1AqPA6voVpYTb2fGgcYWTrydDNepw2QvbUzYKvQqz1CnzGgtk+4ch7O9qhkeHmyzakNr5fclb28xCh/WYe22Xd+a7da/GGLgGAUgfal4WS2mA0LlmRSjcSSwLxcU9xEH1GPXGIxvX/+Qqk398HQ/Ko9n1B7YjWro+nxD6sZN8qkbLk3a1z9klXqcTULMpRn31pyIUo3XE8uH0+NU4g035y9evn/3AoiACRFDQGDf3Gjrkf7zwZvNrRVfYFeyAmOMrEUCLItMWKAahXDPgG8vCk776DuBRBQuMesNf/FbhALVlvwq1IXTN/58UNu79eQtcdhDvYW7r7OxiFc4DGPD4DyM2/S5gmiZ3w8tZze09tP+1potDNlsQ+MZm46KQPx44wXHIuIU+4mBoAyM2kjyavacfGiMeUhCgf0HrOtLFIS3fz4kM46QWTwgPqDGYgCaK5E99RNUY9WpG/FMsMw6PekZYlOHZ8xJOEJT6VqfUP9l7IPdwWSIOZZLN8TMcnTAgPul1OICpmdRUMyUtvW9t50Uh3S3hcYlKC7Go52FNpGboCqV9yCoMZ629NXyIBz35XR3saPOVig/myrY42iv7WHd7oSx4ieuraiJ7axq40nAwuIHrjW0tp1LiW9Ishz84DAkkT4OAhgydlWkwk7+VKTyOtpOCWGQg1h6ykrcq6ALFE/gbfzlJD77cNorpJGV4bo21YKaHsYyP3cll9eFhYg06bWPfBJ6jFLZ/2Q/2ha3eHtx+lwYj7VSSXL2SZ5vuHQe4pLsCeNXmJ9SH98oHV1KZFdKR/AI31/e/xdQSwMEFAAACAgAXHj1XKbSxDFqEAAAR3cAABkAAAA1MDYxYWY1YTBjYzA2YjYyNWJkNC5qc29u7V19b9s8kv8qXKFIZawti3rzS9dXpGm6T3BtEqTOLnpVn5aRaFsbWfRSdFOfY2D/ug9w2E/4fJIDRdqWZTuWHKvIoTGKwpElvsxvZjgznBGnSi8I8ZmvtBVbdyDq2Uj3PN25cQz7xreUavL7ORpipa2MCGUorI8RtGsMh/gmoLQWDwhlIzTR4hH2NBYrVYXhmMVK+/M0+ba18RpyepaNGk3TaJqWabZaXtPgjwcs5N1dH9eg3QYIJF3URijwQR8xfIcmIMaMhXiIIwZ8gmNwftEFHol6AR0CNsDghpDbIOoD9aRmVZSqMqLkH9hjKxNRqkpIPMQCEintaTLRApMMgwgrbehUFY+E42GktO1ZVfHHVDYIoaFbVQVFEWHJJU6RL1WFob78RsbMI8l48I8R9hj2+UARG4ifKY7HoaTjWrMxQ5R1g+RpQzecmt6oGbALjbZutA1Hazn6fym8DUYnSlvnD+CRxESS9w3uEYrBb4Tc8vnsbtHhLS5H0mxuavVd8IONKQau4pGI4R/MVXI13lxt3NrY+AnFiGEgW96rXWfZ7peqghhD3oCzkbzgkXHElDasKvFtMBphX2n3UBjjWaGbq5voMUJ9nIMYDU2HGUqbDxGDN/vYRsujxL5k+zsKGOgRCvB3LuMul4YRieKcFLSt1cnarR24b1AEmlbvCfDiulQntV5I7tLib+hwKf9GY7Z9clUljvjfTGkrABi6Du4BAPU6+OPf//rj3/8CHzGi3gDUgRR7ef3p/3MjPh2YTMcjUcxAnEzlLYkw6CTsqd2hgL0j9EpiqPJn+OcebP/8Lho25E0qrYDOfwCqjWmoVrQg8sKxj2PVVeqiP1epgKMjQDWK/znGMVMr2hCzAfHVCuh0OsBVLi8+dl2lqqT57Bx9D/iaAhgBrjLHuS5BeE1o0A+iji4/teQ/i//XnP8pPoZ+5OOYBVHCRXkeMI58xHBnwb7mEaPBqDsZ4c7F+enXvx9/OkI+H0QHHnmDIPQpjjr6kegAhQGbdE67v51dXJ4dn+cUCntVKBzdLEko7KVQQKuAUFgpLrpBMecficQ1DdUpSE2+CgR1qmBOnCqYExDMKq8E99hJg4jzn+DEPmFEJSMWayNKhuSE+Bi8Bt9eTHl3s6PFxc6LKY484uPrq7MTMhyRCEcs82Bl9g20k3GK7jZwtGRiZ006QEeOaiksr1YY8zQxCYCrMPIG/zVR9bQ7QFEuqB2x+i+h1ssBGhop7dfKDzRMqws/iEchmpyMKcWRNwEdQMbstZa9/Po1OLm+ujo9P/n09c2nr+fH3bOL8+P3Z91Pn1Ns8UUAD4XaEHaV6iHqv0Exfoco/hBEhFa0DFVVfSuEG9USNMH9ClwnYeDdgj5mbybdxOZVXwrOrcU4xB6r3bDoZUXrBZRrpn0ghEY50gptfQmi08wNIrRaKRBHgXd7QpBg7HgSeUCNPTLCbfCeD4tQcA8uUR8nSnzKaQhtXZJaCIK4H6BY3Kelaekqa8R0lQU1NY8TX82LYM7P72KQcGWQQoesjMzjs66RESf9pkHtYpP084U4pNE0M7atbpTEISkjxzbyc0g5CB8Ak0cximQMY/cgIhZEY1wboTjGUR/Tmo8ZCsJ4PzbZ1loBpmlqsJlxAyyrJJ5JLQ2OU4BnDgLuweE5oGqR/GMmbc1WgV+4PZGwSznhd4NqmDCzVsCyFvzGfpYddObuzjjGNAZozEitR+gdoj43vRcYxFXQ59Z7DIbjmIGE/MBVTiRYXHkkv7uKBn5DkR9icDcIvAH+jim4C6JYE+tzI2v4SRfk+uq9Wnfd+Qxdt64u+75HYzaoeQPs3VbqVTAFLBhiMmZtYOpfdV2f25UbGEGaBc3ketADmU6WDdc1HhNTkzElrkylAqYH4AHTMlZ5wNAb5fCAkbIXYP7VwICtFZG8pGQYxFijyMPq54R8hr4g68OYLSFbhQnaEibNQ8wbqKowN2aV6kbYBGgGXOl1myK+IiFWX96MGSPRS95rhIa4DepeljXrAZjlUcXriJWzfBvccFwApucHzDBS5NKWRHAVQQVX2UkGQWAz3Y7QqJtA24CRRMhaaSAD7SGEx8m4xrBZzrJoGKl4Mcy/LBqGLUnwRbq2hrO+wBWWl51qbYGA0KezzbQWNhuhIBS2vvoyiEZj9pmzRocHPue9a7rGr7nKl5d5JMS213ygZjlKDRrpkIWd31yRrLlNpcEFbnzeZ5wqc5TUKYgZYrgNXOV7EAc3IeYCta8uWxgWC8ag+DtG4eO7y4u5H3zXuKed2KMhw7zLAYq7+Adrg/rlnAkAdN2bOu/oQbWKI4YpkBYZGKJojMJwcs/BEPJN7hINU8D2te2MmVROTBiuyHgBd6ksXjk8S2xfTaHUFF82ejT/j3hlbbeLa4hSuKWV4pYC4RdjaWv+SRX6Z8k3Qfw3Aai6Cl7SUCUJlMtnJEvseKAiYzbGqg0nH87hJAnmMPWfv4y0NLOVkfuSAmlmKkwC80dDF1QRJIKpBWV/RfCgwyrBMDIxzHdBGAJXOeZxdQBd5fA4ZHblWiXhYO6JgwHuBWXMjRj0gjBUkwQAfi0Xia2sGzon6TfB7Bto+mIazLQ+jnxMXeXLt4om7rxI4h2ie/FrRsN+TG4DIi6yhG5rP/qyk1zoWbr1U1ZP00oFjswC6OUHrWxcDhUskkxkLxR90ouHGO4TOpG7msdvr993XYWr9OTn0YBEOBtTkKLdgoZp2U6jmRbuwmtxRi0wvmXpKgyHCSvlXmRbmgUzirkk495MJ+nkd4D3pbxAbdU/83JSLcWvornHMJPkn02+W6n2mJAMwPe3AemBm4CyQb6oCOeJTMaOWZLdpbf2C1Dr3O4SW1y9ceQl2paD9pbcJFG9drK7UQXeYuurCnxy0wZT4LdBNB7eYPoKDJdfJ/OvYDZnHr2V0k/ertDLVnKXF72G+trG+sNjFCb63DRfHV3RiNuGtvIwVjYnyNRLsj+gvt8KVgbqh0XqsAsbhBuHdhkiDw9I6GOqusrbt2I7JgzVj4wGUV/1yY3mVzJsIxc4aLsKWGvl5du3uUychpPZUd2RIrc3g6QcBTN/0tjhsXwsBMX4QaJu5Ojyw4dNXQ63oO5sBP3Dh3ygN8yfYtemc2UKgf54iB5L871gNnN0+enTp0+bOp1sE+9WS9+INW8oH9pN/aeYnDDlg5oFfNADIPV40hdV8xLxNadqh3b6XSbsP84aWGklFwc0MttuZQl8ypG1iwj8IeA7FBqPX/Elc3BXapMLkm9vlRGeKMlkiDAgUV60mzCj3Y2SNvbSwb9G/g0kQwb/ePxTDTEDAegA/RUIwF9SSRFaiKM+G7wCwZ//XJGYcuQXjlnieVRBUE099DmY7xWam5eQHJu5m+leTsJdml8Mc00Pbt3c5APcuq/56M3hltY0MwoDOiVl15gpE6FIdk2p+B4MigczZ8xsQu1jCkBaWquViSJAHZaUXZEOLhXY0JexJZE927tJVUsIeszDR2u1EzsLIeo9RHHthmJ065M7niK3AoixJd1C4tCY95veBYrGYVh8ZeZJXgDFcdCPgOCMQptwHMVWxh+zSvLInFReW6uAy+4468EgMeOPfMLHkT/PXFuJDVEyjvwuDUZtXqgYYhTNIz9OI8UWnIDHgn4dIJDII90P071U5b1FnUOnmdIhy2mplVc8J5CM2Q2nyGOVtalrTSurrC1YDss0rL2UNWyYqd2+xpqVtlW3Uvw9wHf7KFfYWDe+HqFeTajp2cB9s1HSkmilqGzk3x03LDNTX3eVkK+9KBL+43/+F/CCMDDvO1brSd5a5SdV3iXq1lqpeBIDeWzhnNTk1jybRC4YKW6KVdeVk32tuu7r+xcVmZYqV5V9KumKump514GE3YxsMkZJlWtWah1wCljxlliupcVkrWUfF/K9ylPUkjOa60x3heNFSVqKDx+oSevSMRtMcqmLZrbooCRl0UiXo8H86DXgOkHOfNBZUAIxpAU+L0FLX1ncKVBvrNScLX4UtWaCWjvBFAA11iIAD2WvTzjl7iUHJXTbmrz+6AV2A5aGXc4GndEw9/OG8uNQHqEf9HX4or8qV99ROEZsZxm/aWgwmzReTjjDTCf5m/lzGE2Z5F+vg7sBjsDH06u/nZ2cfj2+7v72tXvxn6fnIIjBOIoxq2jgCo9jnLyuIyT9PvZrQbSMX7yMASO3OAI9SobJTnX4kRHKQeJUNGWxwMJSHnSTuztpNLEkrHRjVhrpY3bG8FB1Ff7w16QvVykS/fxdjCOtPIaI3l7y95SsDEOuo9qIxEz99mJ6fHn29frq/awe8P2ZCIV1yVxxnTeQvOnkWzWTwpEYK67y0DM5lDHnoIxrbJRjIJsG3CsEXi6wZcK1V9jcXFRZDDDyMY3bqTm/BlNwPGYDQoP/TjBog29vMKKYghfTxW2zb2AG2mA6y/Vqg7T+yscwTsYLt51yNk1Maz+Nb1rGXOmkJ5eA+TIGby8+AB+PcOTHgESJuvHCgHs9MSMUV0UBGUDADyg3b5bLIRiiCYgIAx6idFIResdaD8/zdwpspfDDi4EpPYBF/BcxhocjJqLA8z/+AqDOTfI/iSJZTfaA/cUtPC68qi/+etpNwR7XIUQIGY5TMyzLrlk2hDVkNFo103ZMfON7NtaNXPzQyMZDSwqpm1aqJsPMH1o7KEkFRnNXSmgNmrKVVxRGH6/qiwXtX0wXZsissKaQfOIs7j60olgYgtKQycMD2UwJRy/HpjfTbycoYNOb1jxTPcneY4iNY+m8nlycvzu7+nDKt8xBFn3QAYyOsVgrFvXrOIzxBiuxK+il2vrO10cIEGVx8+xnCKqpmdkaBqOchKdnQX2qgmpqZiujrG29nO3uZ0HdX1Bb2dT6cnY5nuX06cppK5unYOslWVXPcrqnnFrruenw2fL9tQTV0izTyApqOYkFz4K6v6C2zMyCWlLyx7OgPl1BbWUzAWy9pEDns6DuKai2ZlmtZ0H9pQXV1iwHPpu+T11Q197+DsvJwHgW1KcrqK1s7cyzoD41QXU0q5l9ldmzj/prCaqj2fqaoD77qE9LUBuarpvZEoVnQf2lBJUfypI9p+RZUJ+coNpwraTgWVB/MUG1n6O+BxPU/U82MZuabtqPTSUvdsCbkX5tQ4GccijeJWesJCNTLcdRJFBPkXeXxMiqvUwnc3RF46p4iWNSajU/Sm8i3q++5di87Xg9UZBSiYNG/vK9R4FzcKLvQFzWbmRTx+fg8DTF/ADZzZ8MUKpI1izwCvJ0kez8SMfFUkSDeLiowtB6QeRfR8E/x/iCdgeU3KlTnoNOMX/zVuC3AV0WbIDZ4ogoZ0OxgCb0Z0WLCBNgrmrRnMIps/157V2m9OK4x9/Lk+vkxU1owfSb4vc/ajBpulWIEYqdeJj7BMhNI4FpMytdZkbi3CdAms317OUdxtvBTzJEHOvjMAQDQm7zDLiRUZ7Fy2uKyeZe9euAS6Y8+imRQ9ABEb4Dl8kfJ0l+9bzaiYsYry7U5qRQ5QlRy8OgMmXoYKWATsj5Cz+IPRJFXE65OBUFD1NKqLxPyDenFK824ceurh3Tutb2HaG3mJ5FPv6htHXeIrlV2tx4mn2Z/R9QSwMEFAAACAgAXHj1XNJA6lVvEgAAgLQAABkAAAA3ODNhOTE4MGIyMjU5MjcxZDIxNS5qc29u7V37cpvIm32VXiqVoB0J0c1NUlabcpxkx1W5VeLsVDZkZjC0JH5GtKZp4qgcV+WvfYCtPGGeZKuhkRCSbJCE48zgSs3Ykmia75z+LudrxKU08gN84kkDyeppTh/21DOEjD6yoIegIbWT9186UywNpBmhzAm6sQPNzsiZ+sG8M/U/K9EMuwqLpLbEcMQiafDhMvlt66gdXdccE0Jd73vWmYNUZIwQP9xnAT/Pu6MONAcAAceLAxaBX4AG3IkfeBSH4PvXb4BdkOULI4pxG5AQg5nje1JbmlHyL+yylUlLbSkgrsN8EkqDy+SiylxQ4IdYGkCjLbkkiKehNDCu2pIXUzESVFUTtSUnDAlLXuJX/7EtMWcsfiMxc0kyEfx5hl2Gkxk6bJK+TXHELzGx2dqwEXMoO/WTo5GKzI5qdRA8hWigooHWU2DP+B+Jj8HoXBqo/AA8E/YXpnyMR4Ri8Csh5/x6bhyxD/mIy5n0eptGfeZ/ZjHFwJZcEjL8mdlSqcG11cH1jYMfU+wwDMTIpcbVC+Oay3E/tiWHMcedTHHIxAsuiUMmDWBbis792Qx70mDkBBG+qvTh9iZ7zJwxLmUMpBcsrV1nDD5sqUFRYVDrNiyxq9l+c3wGRoQC/AmHDNh8NcxIGJW0oNVfvVijr11/tRs8gKJ0Ryl4UfeMkHM/HHdGAbnIL3+kwuX6R9bV9otrS1HI/2bSQAIAqSr4AgDodsH3b1+/f/sK3mKHuhPQBWLZi9fv/j875JcDk8txSRgxECWX8oS73WFCT+XC8dkzQt8IDGV+DP/5Arb//J4OjMSHZNoCw/8EVIlpILcUP3SD2MORbEvd9Hy21AL37wOqUPxXjCMmt5QpZhPiyS0wHA6BLb1+9fbUltpSnmcvnU/+mC8jRoAtZTh3BQiPCPXHfjhUxU8n+Y/O/9PL/kx/kHrfwxHzw4RFZQ5A9z2H4eGCvtp9Rv3Z6XyGh69ePv3jt6P399MYN0T3s4A21O6nJ3ACn82HT09/PXn1+uToZblF0VOLi6Jf06LIBUWoV1gUeo5FZ07E+SOQeEcD+RLkLr4tMoD2Itq3QWZAcNV6mLLHSAZ0OP9SJo4JIzKZsUiZUTIlx8TD4BH4894lP93V/cWLw3uXOHSJh9+9OTkm0xkJccgKB7au/gSDZJ7p6TYwWpDYXFsdYChmtVwsD1eI+TRJCYAtMfIY/1fi6unpxAlLQd0rQg3rARqinPfrlwca5t2F50ezwJkfx5Ti0J2DISAxe6QUX370CBy/e/Pm6cvj9388fv/Hy6PTk1cvj56fnL7/kKPFxxR4mLqNNK+SXYd6j50IP3MofuGHhLaUglVldSuEG90S1MCXFbiOA989B2PMHs9Pk/xWfpAytxPhALusc8bCBy1l5FPumUpBWEgCIOzVAiI01CWIZq80iFDv50Cc+e75MXFSYkfz0AVy5JIZHoDnfFqEgi/gtTPGiRO/5DaEhipMnS6E9PPAidLPKXlb2tKaMW1pYU3F5caXyyJY8uf3dJJwZZKpD1mZmcuvukNm3PSbJnUTTfLHV2JIv19IcjTzhuR2Z4bkkhwDlWdIPQgfAJO9iCKIgW6eRMj8MMadmRNFOBxj2vEwc/wg2o0m20arQJq+oplGtYJoZ87kQoNpVuDMQcA9ODwHdC2CP1oy1tUq8IuyJ0zzUm74m0HVYbE0rwdUBK3dEjtoZtVOHGEaASdmpDMi9MKhHs+8FxBEbTDmyXsEpnHEQGJ9YEvHAivuO5L3bUkBvzqhF2BwMfHdCf6EKbjww0hJw7NVzPtEBfLuzXO5a9vZFdp2V16e+4sTs0nHnWD3vNVtg0vA/CkmMRsATf1DVdUsrdzAA5EV9JLX/REonGQ5cFfh8peczCmpZFotcHkICvR7hXShpmCAUC5dgOWDAYL9lRX5mpKpH2GFOi6WPyTmQ+rCrNdjtoRsFSZoCJgU12HuRJbTbOOq1d4IWwoagitn3eaH35AAyw/OYsZI+ICfNXSmeAC6bpGaXR9clfHEejF8G2pNgGk5wNTygCGUM5eyNIItpVawpRvNkBpYy4+TOtRNoG3ASCCkrwxQgPYAi8fQ+8Vc26gJCzOHRfmoiJAhTPBRVLbIXI9vldfLjW5tgUDqT6822zpN2QgFQZrqyw/8cBazD5waQ657ZmdXVIW/ZksfH5RZIWYxV4GoV1MNhPKKhVE+WxHU3ObS4AI3ft0n3CoZSvIliJjD8ADY0ic/8s8CzBfUrr5skVcsiEHxJ+wE+5+uLOae/0nhhXaSjgYM81NOnOgUf2YD0H2dkQBA2z7r8hNd61ZxyDAFIiEDUyeMnSCYf+FgpOubXCQepkLqa5rmKp1uEMB35pK5U4CsjSuHp8T2aAqFp/i4saD5ibjSK/SjekiviS39HFsqqC9omWv+m5z6nyVv/Oi/U0DlVfCSgVqJTi6OEZS44YCWkGzQag4nDi5RI6Xk0NRbDyO6qhhqITWupxUEtZxKAsuLoQurpCaCuYCyuyO4tl4VYKCChPnMDwJgS0dcVgfQlg6OAyx0IGE9CS/UtB2BQOBLahptIwgjPwjkZAMAf62UjfViHZrZ9M+U7RuMeu/Sv1LGOPQwtaWPf7aU9JOvEr0jPX36bsHFvk0+BlJdZInd1vOoy5OUgw/dFnx6TjnSKsBXHrW6gTmUWiRYZCxcfXIW12F4TOhctDWPnrx7fmpL3Kknb88mJMRFVUEs7j5Emm6YVi+/vCtH44JjYLxnaUsMBwmXyoZZzimtyKl6GlVQy+VkRvkaeFfTp7CtlmhuSbPlCJsOtw+bBIE2lW+1pmTp0gC8ww3ICJz5lE1KCSOcFHphz45WTzEO1f5uErXKU6+0yTWKQzfxtxy0J+QsEfYGSX+jDdxF86sNPHI2AJfAG4Awnp5h+hBMl7/Os1/BVUYetZ9zUO5N6stWc9enX0N1rbV+/RzTLD3LzldnV1V02zBWGWIVu+KaWlMJCNXdQlgdqB8WqcNGNgg3Tu114Lh4QgIPU9mWnjxJGzJBIL9l1A/HskfOFK9VoI2IcNCwJbA2yoMnT0olOb1eoVaoSW+CuVpBK79t7PBY7gtBNT4I1FGJU754semU0y2omxtBf/GiHOh961aEofxumUqg7w/RvjbfCWatxCnfv3//ftNJ59uWd7+vbsSaD1QK7b6q384Sz1WhWoUq9ABI7W/6qm5eIL5WVd3gnX53STjy6XS/bGBllDIMKAoRqJ59kBDmKlmjyoI/BHyHQmP/iC/IwUupvaU/WEly6hd30lt1af5N/+i2+kfoh/QEEjIV76Bo+kd3vH/047hiFLlSk1jatI9qjyG921n2f6v2ESrTPqqKg3kreXvTPSrTPYIVu0f94o2YNaXcTfOoSKI70jxCB24eQUVVtduhVNM7OlDvqFw6tnvvCCpqsbTXUNM7anpH+/aOoKLqRjGhrymjb3pHJUl0t3pHUNH029lf2vSO7kzvCCqaoTW9o39I7wgqmlnUk5ve0T+pd8QZUNxMXNOOtaZ3lCfHQXpHqILeBBWteH9eXTcANK2j22odaT+mHQAVXS3sPDN7Rk2bGte6R5hSQvkXyvD/DzKjZeAMAL8hHnDpyVPs8NgJAhCQ8cAO7VhV4dkHNAWgA/in/XCcXP8dMTu/b/wMg4xRYrZoavM7PpuWWf0OUletpjGyDse2xsgx/5qqcvfVVMQBqrejgzaNkRKNEVSpMQIVHd0Sek1jpECiAzRGdtTBywXEfXRwXSuwCtX0NT+NDr4HBX9CHVw3zKIOXhOzGh28JIlq0ME3y2QldXDLRI0O/hPq4No+Orhl9m9nV32jg++tgyMVbca6tA5uWb1GB/9H6+BWcTdecw/FT6ODa5XkhR40Gx3876WD6z9KB1/jkqlrNfmNO6iD12P2Rgc/uA5e0UEirdHB1+G4XgcvdYNAVRyaGwTujg6uVdTBe9rt3Jbd6OBFEv04HbxcQNxHB+/pBd+Matqu0+jge1DwJ9TBe6ZerH+b7xJqdPAlRZACb2uzaKOD3xUdnIPeb/aD/0N0cKRA65a+OarRwe+kDo6y5+w2+8F/Qh1cryAvIAVBq9HB/146uPFjdPANXDLVmx7H/DfSwesxe6ODH1wHr+ggUbEkbnTwG3VwrYwOXhWHRge/Ozq4XkkHRwoq6uDNfvC/vQ5eLiDuroMjBRV18Lq+j67Rwfeg4E+ngyMFWcUGS6ODNzr4CkUMq6CD13XDQKOD3x0d3LitHcKNDn4HdHDjlr6bs9HB76oObhS/37OuBLPRwfPkWNfBqzyynBEQYYcJRcgnYVm0zaLUU5N6ifJaj1VeDEdC6+FylxxgBnwwBOpD4IP/ALlaM8DhmE0eAv+XX1oCU478ojBLKo828Nu5gz742SO4tc0hpMQz0jfbvY66YpUvSFvzgxfbnhnOJ7j1ceH7PnOdU6h4lyC06vEYSMulCFCvwKE68T0YFFvIIvDWCtrjAiv8CYcM2BLF0YyEEbalEpj11h7XqKK6Fn6ubVFeRkBCxHFJGDEwOntCQgyGiXlTe2QyfGbsN+LyZZkm0jpVYhrILcUP3SD2cCTbEjc/dSfdkUNx54xi59wjF6EttVYAQZkiXMBD4GBl583r+GEcBNUjsxMzApwo8schSJlRsfnU04rPttZrqshMawliv0LJbprrYlB6xW/5BR+F3rFYaivaECVx6J1SfzYAZ4QE2Akz5ce0crTgBjxK7TcEKRJlVvf1dq/VeW9x59Ds5XzI8rLk1kPQ7QISszNukb2dtaaYxScnQqOm9M7Sd3LW0NJyzR1rLUvb6lsp/uTji12cK7Su2YSwg3vVlF4xJPaMesR/pOesjMo/NQTpqZW7XfD929fv376CN4n5BkBkueD7//4feP3q7SnIzh3J3XGMI9YSR9T9L3G3up5b7mIiuVCw5vxLrdnUk+tZh1gEjBybItm2xcU+km370Zd7ra7CcMRkEVWSB6dQheK/+IfkljLFbEI87oKSFgM3nC219yrVSseBTXSD9cQBpOfigFkhi9fTcC0yJt3aq/aqz1ELZvTWSfcGR2AoZpzj4WrMf/p5xiVnW2LkMT6lMZvMS7gLXbFQYetZTfmzlcufESyPngXXDXLigeHCEg5zFN8Djx6tvLL4ZIq6lebJODGSvHizpSytdSOYKUDWmgKwNSrIM2fOLfdFMCixW6u2amgDlqgm/QRZ2m7VUHkc6jP0tbUOD/oHC8a60jcKiPS1mrxjP9cy1Sqsr35PGKLbBb8dPX/+9BREmLEAR2AUB8EcRJh+wrQT+R5uA55NTygJSRwF8yROR4w6/njCeLmaza6bx0FJ7NrPHtqVLmQ/9JnvMLx3PM2A01R18cFrqjBBlKibTcCW9oynfKPbiSc/mDnzTnpkJzVjhafQcJ4Upe+avmpNU9FOyqemQmHfdAFpKhJ/FyOpMAjfjlGwSKqJHjp+Cvi1LdO5JrDPnDnfMrExrldOnzYMdiPuhmL1ijsq6rntW1O1nZKnQ8J8cIwOnHtpqr7YXhnFAVMyH/GWOSzmKZh4XGHeebWUKHm3SJldArih9PrFZwpDrZ5veE6+cC8jRPnaTVONVRsJT4+9RYaayWSaai6Q2R6685GiW0oLW6BlLYdnExwKOYzRGLe2Z8YlonZPUZG1b048I5Q5QTd2oNkZOVM/mHem/mcl2fS1olTksuIq2lYuKaYrxQFXrkTH4RI4/DGK0QCgNnD5RlGKwwHQeCMiCYMvkmXLt6dmKzfLj6CVz9PoEuY0U5MTK2cLcNv6SwWOXiGhustwoNzuIK3CQ3P7eb3YoTylocmevcdOhJ85FL/wQ0LTvFZdtWwqHWHvlDAnSD4mTJyM8+9Au9HMq/ZGcH97F4NSffbOd+LLPxQPofWacOl/qB9NFwWgMvJD713o/xXjV/R0QsmFfAkuJphivunP9waALmtFcJXxH2kb6hSF7YuRqPEPgNDeRXtZhHJhAlUo9PIdlETn3oIPl+ITjF444TwPzQKUbQiZeYSSU4hOrMCmBCii5OMCbCF8H4345qxfCTmPdoEDWrmtK/mdMklUBjxpGpdF2qyE9DZ4VjfsZNPgvUb8me02E2j2N13kcUAiDMTIJcZFBqx0R9zWK9zVHA7H+igIwISQ81ITLmxKq56hlVx8O3UvAV966cJLlxoYghBfgNfJH8eBj0OWJc98DXFtWclsIKf9MnGH0Or6SVYLWJFP06V8z/Mjl4QhX4h8HVVFLbmXTHwuzaa5ifheCU9qS04YEpYYcJuBLwg9x/Qk9PBnaaDyEcm5NOApytXHq/8HUEsDBBQAAAgIAFx49VyWoB88MAUAAP8UAAAZAAAAODQyZmMxMWI3YmExNDFjYzI0NGYuanNvbs1Y7W7bNhR9FYIYDKlQZEmWY1uFFyRtshZYm6F1V2xV1tLStc1EJjWSSmI4/rsH2J890N5kTzKQUmLHdVIlaYrqh60P8lzynMOrK87xiGbwMsUR7obBKPH9YWdI/NBPkiAMR9gxz1+TKeAI51wokjUL4g+3CplupfQUxBhYAq7MIXGVxA5WIJXE0Ye5ObsReasdQCf1oDNst/ww7CVtf5vo7lRlOta73S1/GKF3b5+jhIgUyQk/k0hNwNwaEQEOSrgQkKhshhLOTkEoSNFI8KlpRpkCwUiG9gd7aEgkYAfngh9Doq5NBzs44wlRlDMczc106041owxw5AcOTnhWTBmO2gsHp4Wo0DqdtoMJY1yZG5qVIwcrMq7OeKESboYC5zkkClI9RqIm5WMBssgqLtdApSJCDajpG3jB9pbX2Qr8gR9EXhCFXTfY3v4dawQlZjjydAfIK1UqgvdgxAWgF5yf6Ll8GbGjEZfj6PY2oR7Qc1UIQDFOOFNwrmJcC7x3HTzcCP5MAFGAKuQ6uB1vDbezxD1yMFGKJJMpMFXdSHjBFI58B8sTmueQ4mhEMgmLOzV2NvGRkzHUIqPld68PutW9hQwN+1DQx2PivrS9J1ShERcIToEpFOu1kHMmazLYXvNqu+ffPtsHZoDWMgMEncXNU3SwZPpa4Qgj5AfoAukkacWPkO5i7CAiZyxB1ty4BC1s1P8RzWOGkN9CFwhpHKmQBCKSyXPOAPVNS/eMUHXAxZuKdEt3Qch0uen4w8CGVRtLmFjCLURm2S5lSVakIK0YN8toMbZRo4GEK+DPQlNgu1NQE55aNur3+yjGvxy+HcTYwau2eE1O6Vi7XnEU4+aQ8xPKxs0qUe5wQceU9b3q2DI/of7pXl6WR+A1UpCKMiN6nQ5BIyUK+lduazWUoPlglkP/8PX+x/e7vzVIqgfR9xvJhGapANb3GmUAklE16x8OXuy/ua9/e4/q3+2lf/2wvn/bRm37qZF+21wQbZ3SRGOuuFVJ805k1hytsBGhGB+qCYgYo4VdQnzusNJUnRWv8kKhPrLKMNXf0r+2eyw5s2x7x02JIjsuL9SQFyzdcT94R0+veWnfvHJRjBXfq5dWeuuyeI8pSuAtRWn59UXpoQvNWuAZ1srCwuKFclMq84zMnhVCAEtmtqsnrlPP2+cxvkmBzes88E27ZhMNqgxVgZtMhWiZuS4z0Uq6Iuoyp/3319/6udCr2fI9799/bAcxrhBBORFUzdCUyowMIXNvlu0n8w4UgwlhNRXsfksFVwrDVv1l9W3JNXIGq15JMnnpld2pHvEryrgo7bJCuOXV9syVbVp14/wMUpogupGe5gERUD6/ZRVf9voevdC6nxceoszXofuuGofrQa/jlVln82DQE+R73m0K11S29y2VDVeKv159Zb+aOF+D8Voil/q20cXN+vxKJR1mEGM0BrU3G8C5spr6BRPLJ34Qx27ba9ruiApd8d1Hynb4qFp2l1r27rBKVyuUQqavyDEXuky5gfSmId1V/ICeQ2oFlY7dlQqqUrMspK6oZHCG3sB4/zy3PhlWNa8/zC9DugLyjCT6pe7q8j/GuoUbY3vxyb6ivTREpZQ1r7++H3KU3ulVYRSdAi9UhALvo+d514v83ZECUXNfoud6fmvtwza8fV+i5nf4BuQvpJG7bQfU3x7ZNMdg445AxmX93ZGe64VrsMF3tyVw5GAQgouqnVREFVKvaSKl2S37bHftM+wzLk5AvGQpnOPI04j8BEdKFLA4WvwPUEsDBBQAAAgIAFx49VzOAPPfIRIAAAlrAAAZAAAAMzA2NTQwNzQyZjEzYjZjYzY5NWIuanNvbu1d+47ayJp/lW+9UWL2gPEFm0uGiTqd5ExLuW2ns0fZODNT2AX4xLg45aI7bKel+es8wGqk8wb7IudN8iSrcpXBGNPYgKNZaVHUAYPr8v2+e31VvlXGQYgvfGWgWLpjd/Ruxxwb1sjxPKdvj5Rm8v1rNMPKQJkTylDYXiCnRcki8luMBnMtnmNPY7HSVBiOWawMPt4m73Y22vI937F9wx7Z1giPeh7u9xG/PWAh7+b9WcsZwLoHGBHyOYYRYVMI8SSGb7/9DhSzBY34Z5jTwMN+E0iEIcaIwRxT/kUTGGEohCGY//wH/7Z1g5YwRhQrTWVOyV+xxzZmpjSVkHiIBSRSBrfJzEvMOgwirAyMblPxSLiYRcrAvmsq/oLKhnqW0WkqKIoIS65wCn1qKgxN5DuyYB5JhoG/zLHHsM/Hh9hUfE1xvAglXfOtxgxRdhUkN5u66bT0bss0rgxzoJuDTl/Tbf0/Fd4Eo0tloPMb8FxCJKn9FI8JxfATp7FSpkWHt5gZSK+o1RfBF7agGFzFIxHDX5irlGq8u9l4p7Dxc4oRwyBbLtVuL9dud93up6aCGEPedIYjJi94ZBExZWA0lfhzMJ9jXxmMURjju0o/bhbRY44muBQxDD1Haes+YvBmj220PkocSra/oIDBmFDA1zhi4HJhmJMoLknBjr05WUfX759tgfhrWnsswIvbXBEF0aQ1DslNVvhN3VhLv9m92z25phJH/DNTBgqAqevwFQDabfj2+2/ffv8N3mFEvSm0QUq9vP7H/+dGfDpGMh2PRDHjqph602dcKw8T9tRuUMBeEHopMVT5Pfz1FXa/fhYNm/JHKm3A8Eeg2oKGakMLIi9c+DhWXaUt+nOVBjx8CFSj+G8LHDO1oc0wmxJfbcBwOARXefvm3ZWrNJUsn71G18GEixEj4Copzm0JwhNCg0kQDXX5aiV/OvxPL/0oXqb+0McxC6KEi8rcYD70EcPDFftaD7l5uVrO8fDyzfvXz365urx4+xD5fBxD46E3DUKf4mioPxR9oDBgy+Hzq58u3ry9OHv9UNjFZ5ttHigtplGTtNhraTE6FaSlk2GvEYo5Y0mI3tNQvYUMSZogaNaElGRNSCkLd43Hgq3spEHEGVOw6IQwopI5i7U5JTNyTnwMT+DXB7e8u7uHq4vDB7c48oiP319enJPZnEQ4YrkbG3e/wiAZp+iugNUldztbYgNDOaq1FD3e4NjniasArsLIU/znxAbQqymKSkHdM/RNqGtSi4aZUYv98kAbWT3iB/E8RMvzBaU48pYwBLJgT7T85SdP4Pz95eXz1+cffnn64ZfXZ1cXb16fvby4+vAxwxafBPCG0CfC31I9RP2nKMYvEMWvgojQhpajqqrvhLBQXxkWfN2A6zwMvM8wwezp8irxjdVHgnNbMQ6xx1ojFj1qaOOAcpV1CIS9eoTVsPU1hk6vNIZGp5/BcB54n88JEnwdLyMP1NgjczyAl3xYhMJXeIsmOFHut5yEhq1LSgs5EL8HFIvfaVlSusoWLV1lRUzN47RXywJY8vWzGKSxMUihQjZG5vFZt8ick75oUPu4JHt/NQbpmzlPz7Jr4pCM82Ob5TmkHoRPgMlRjCIZw9w/iIgF0QK35iiOcTTBtOVjhoIwPoxNdrVWnmlsXTPNXKDkODXxTMYyOE4FnjkJuCeH54SqRfKPlbR1twn8vy8wXUJCKgiF4lQf/WsQjZK8RIw9oSXKAN3v5LRDTTj31jhb5V09w+5KWgr7IaeYBhLp3F0lP3lXSRHubTQgdMsQVAG4vEtLRqM2GvAj6PBk1c0g6aYKqhK1/gZbJZ0eoscKpP0euLVTuRUJX+QyME6nJsboZ4xGBbfiVLieDKsTiL5gHkf/Y/oStq5ZjpHLn9VlFxz9QF/ihGieAIkTeBBOCUv3B/QgemZegexJMB7MKcZhHsRpwD05PCf3IBzh4twphfnUSCS8ON1LYNrPJY0No55QwsyuolTJDBlOmkddxJjGgBaMtMaE3iDq85zeCoK4CROeFoxhtogZJNQHVzmXWPHoI/neVTT4CUV+iOFmGnhTfI0p3ARRrIn4vptPHMnc5vvLl2rbddMZum5bXff9FS3YtOVNsfe50W7CLbBghsmCDcDSf9F1Pc1LFfCBTCsI4xeMIdfJuuG2xtfe1GRMSY600YDbo3nA0HQjF04adj0mwDQzJsAobwJMY9MEvKVkFsRYo8jD6seEfKa+Iuv9mK0h24TJsCVMmoeYN1VVka+4azQLYROgmcZGr7v08CUJsfpotGCMRI94rxGa4QG0vTxrtgO426+JCxBzLKemPJ9pZSDT75oKppRQnqXk/w9S51UouwFwFQk48rGvudE5CkMIyWTgRu5C143RR3MG0AIOThBNEk49gEBpW+Zso13eshwNTx2T8BonCuIH0S54IYrjoavctMaLMIRxiL9AwPAsbnk4YpjCXxcxC8bL9OMEzVumZsP8S8uG+bJlaTaMJq05DWaILmFKrjEdrC+0+zogjwXXeBB7KMStj7rW730Cvo7ZupkGDMOYRNxJmQUjEvpiFRz7rS8hMIqiOODwtDjJ4inyyU1r5qfv0i5M3VV+/Pbb//zQFnP6cQcpWoAYw7N5QmWhCJGIoXaRzoR//mMDFxxizj2cgCMM10EcjELcBByhUYh9QJEPMePvdzbJh5G2EsQQEbbvjhYkq9mlB73mJFOfxSV+doqJrSd1g2LgZt+bYh/GlMyATTE8e/OquZpHtg2ltLozzYyy0dYS4ioCdlfZLyOJerKy7Qh3pEjlFWg4qd86Gw3kFGOx6QkJSijI+Io4/7B/2cI2NMPpf5dlC9PJqLPyrqVp2pISn+T6kulsO4mVjc5e32AFRPc+j0/EPQntZSYhiOYL9pFzyJCXJaS9a7rGr7nKpxKZJEMzurmFCMPs1RQcmtl1Q7u8yy85dJdfYKxw4/O+4FRJUVJvBZcOwFWkFuBydahDsHLOV4xB8TVG4fHdlcXcD641vtyVxHQhw7zLKYqv8Bc2gPbblAnAcN1Rm3d0r+kVNlBGNTBD0QKF4fIrB0N4mOQmUTSl40fOTvlUQ0285BzkZdbGK6dnid0uqSE1xaf7M41/fF7p5ZLYPbMubslkK40K2UpzHbD9i0xRrvkmiP9DAKpugpc01EjKWOQ9kiX23NCQK6fmZiAkby6RaBDMYenf34yYmq73vsuChJVJGxnlSxJWVBEkMjIG5XBFcG/SR4Jh5goJXgRhCK5yxotbwHCVk+Ng5PRvvyYcrANxMOGroIxViME4CEM1Kc7l10qRuJPP5aQk/VUwewFNH9wGd9qEh7DUVT792tDEL98kOUPRvfg2p2HfJT8DkVtcQ7ezH33dSTn0zO+EXieTfLUqoFcetLpxOVXCVTKRvVL0SS8eYnhC6FLWHJ49e//yylW4Sk++nk9JhPOJOSnafcO0OrbT7WWFu7ItzqkFxgsKXYXhMGGl0kbW1HQrx1J7SqcPZqmMQ2brFVjqMMoL1DbjM68k1TL8Kpo7hpkk/xTFbrX6Y0IygFefAhnDKKBsWi61yHkiF4hbZj1MofcPW+TRud8lCs3GiyhJEAEH7RkZJanxQVJj1ARvVYDWBJ+MBnAL/gCixWyE6WOYrd8u07dwlzKP3s/oJ29fBmYnuetbATL0rerW+8coXPTUNd8cXdW0dUFbZRirmy9a02tSN4Z+mAWrA/XTInVaw2YYhUN7GyIPT0noY16F8+yZWNIMQ/Udo0E0UX0y0vxGjm2kgTNsV4GtVh49e1bKxbG6/e/i4hiZQMEqv6Xj9FgeC0E1fpComyW6fPWqqMvZDtSdQtBfvSoHei8Hek0ZxmzBeiXQj4foWJofBLNVossPHz58KOp0uUu8+329EGveUDm0+/Z3cTmNTAxqVYhBT4DU8aSvquYl4ltB1R7t9LNHonFAZ8d5AxutlOCAjm5tcoBZl8BnAlm7isCfAr5ToXG8xZfMwUOpohCk3Po7I2L7tXB6AhKVRtvKLSHVlMY1s8m/bvkFJFMm/3j+Uw0xgwCGoD+GAH7IVBZpIY4mbPoYgj/9qSEx5civArMk8mhC0Mzc9DFI1wqtYhNSYk23mO71bHvJ8otpbenBnYubfIA71zWPLk8ytY6dMxmGU09IaloZF6FKiVqt+J4MinvLz6z8rrYjtmfbpuYYuZS/ode0cmxmk0sVFvRlbkmUmo9Hmb3Mgh5p+mhrZ/PebcptfgxFa0Qx+uyTG15mugGIuaPqQuKQbo7YWAWKFmFY3TLzSklAcRxMIhCcUWkRrgDFXqemfWZOpji0XyFkd5ztZJCY8Ts+4bPIT8s/N3JDSenVFQ3mA34ASYhRlGZ+nG6GLTgBzwT9hiCQKCPd99O9VuW9Q50bTi+jQ9bTUhuPeWEtWbBkE8WeZcEMs00x8oNokuU2eWrLesJ7GczSOk7n+/iC3WxFeYW9St20rLTdhrMxD+Z5iVdKL+DuYDO5xPkC4puAeVMcc7XOLwqStBINP0PzpL7Y6O6qLpcMJUm7wVFbtM2sR64Vy/5iosOYp7u5o26LfeQWnO+sniyt08/5lp2aFpb/XzvV9TpeO1VwJS3NtnL6xujUtIWl2znIlTS6VqYWobsVQ+70/Ci+DvDNIa6f0d0ODY9x/iytq+f2CRndmny/TobKZvnaHbNj5c7muUzINwAZg8O3v/838MNkIO07VttJcW3jO53akziDnY1DUcRAjj10R/qZnbTWTbqzGW6KVdeVk32iuu6Trw8acueJ9HkPOYWnaiKpghno5suLDLOm4uFOxg44FXIMHRFMyHius7XBqFJmqD5FLTmjt810lzhenVqT4cN7jq25ogs2XZZSF71efgtaPeh1syfWGOXR6xrbBLng+9VTSiCGtMDnp9Rkr6x+KVDvbhxLs/pSHEcjqLUXTAFQdys/ed8GtSWn3FfJQQnddu5PO4GB7fVyqt+0apLFrnVYrqY8DvUR+t5MDDf6JzPGHc3Ix/B9qx4v2exnCjqsCvLV761jrL+cvXz5/ApizFiIY+AbtZYQY3qNaSsOfNwE7k1PKYnIIg6XiZ2OGUXBZJrs6Fkd75bFQezr7Kels+mxEwELEMNH29MUOEtfb0G8J0ckGSVupwM47FS7gl3ec7RsiTtbgowVasEK+KRX05lClm4etC5j6WngLATI0vce9LJFkXp2Z0v4rfvj+iLDPkdLXtBVaNcru08FjZXAvW/nluM69ShsS7cOcp5OCfPJMTqx72Xp6X47caCFluqIdwyxRZw9C2WtvBpanHybZ5lDDLit6XauJNQ0arIXlp5J3JeP3Szd3qSR1PTYX3moaRLf0p0VMrtNd9ZStEtl6ldoddfNsymOZLKe0QVu7PaMS1jt7vb2l+pCWe5sazN7um351Jbcbi9MKd2IDXjiSi6H3q6O5eT7JdZnnnIBk3bwVSK3/OtUdFcneBpZR42ucRaumpqQOZXAXQIod0/mPKrqeJj5s5Vrw6NzmBNlbccoa3mgQTxbBSTaOIj891HwtwV+Q6+mlNyot3AzxRTzEtnAHwBdxy5wt4KjU+A3pz/kEEtYNnHeC9AmUHZRH0K9rZo/f/P6xcXlq+e84uqeAPQPBmtme6tZYZXyCKJXJ+Z+qARKzgnE6ejd3iXpnolJzApRYjYHkiTJdwgTz+MnAvUKRcusHK0kaJc49bPoJF3IIhOJjbkfD2mFsg1F+Abe4bTBGZqrapwYJd76pNHQ4uC/8LqH/yswWpmK7k6Fw4ZLEvkoGpZUcLvgM+4TpkqHPxcBUj2VVhIQ6yAzJUtZ2m14unrih8fPUUmWS2M0w3D27e+/n/ODoRmKPB7vy6XU9SNDxJM/gjh59EeyHCsf/5EcG86LL0B9fvW0kYT9clfa2ouoch50ubi/UEcng8x0UNQ1/BucQAaPP++7JORZz6T8Jq7DATiWsOVAFBgmS2A5LMR6f6mHpxThYHQLn8lS9WkhB0Bc7aElpR/iUjhJxyqa5HlI4tIPcbG7mpU//WVPyHnyh5EgjvVZGMKUkM9lBtzN1SRWz5WVk7qDituAs7M8nT1xV2AI3Kq9TT6chwF/oIEUEB4i88U9LSWBKg9xX5/XnqtRg431K+EOPfCD2CNRxCWVi1FV0JJDxeTvhIvKKcRLafkDk7YesLTV9g2hnzG9iHz8RRnovEXyWRnwEPHu093/AlBLAwQUAAAICABcePVc+Lz48zsEAACcEAAACwAAAHJlcG9ydC5qc29uxZfJjuM2EIZfheApQUSHuxZgDpNkDgNMJof0YIAEfaDIkq1YFgWK7gUNA3mIAHmgvEmeJKDsTvc0LDfiQ3wyF+uvRR+qSg94A9E4Ew2uHrCxcWu6zz6sIYy4YrsMj9GEeNVuAFcsL6QWSnChmMyw2wYTW9/jSknKxYLmRYabtoMRV78+TKv3DldYc26UKbhyvNSu5CXUAu//+dEkXTz4EE337dawxTiAXcQRZzjCGPdKaTWrRGye01qVhtqmbBpjpS5peryNXdL+9JawCvkeyK25R5/ffvjw7grV3q/bfpmhIbQWkA1+HIldgV2jle/ciKB3KPr0gzM8BP8b2PiFszjDnbeH+PfBzgXStX1Knsqw9d12k/K1e569QhQ6w6bvfZxOUtDXGY5meVj5bbR+sg13A9gIk1Mmrg7Xa1zFsIUMBxi33SFpJkZjVxvo40Hl2YvEnHJNaE44u2K8oryiaiGU/gVn+HZ6+e97B3e4orvr3f7RpPKAo0+hVyx78iRttv3Tlma46cz6flqN63YYDqePbu522TM4rJKU8loV0jHpjHTaFnNwMAJ3QxvAkSH4jT/NyjFh0jCma1HnTDa2NlBoKfQLVliFTI8OhtBkCFnvALUjape9T6d///4HarZdhxoTpovEE5yLynxYB3L0LDlSFZcmh4lFSfklyOFK1JQaKQvlKLN5rmGOHEEaH5bgyOTGK+Ac0SV5wQvmclob4FIYacumfAGOqNAI4QYCCpAYGJFBtmuhjwfjKMBNC7fgrpITP7a9D28Y+up7wr4+k5zZsA7g5HPgSHV5cDhfiOIS4CiqmWmUodZSXWuuaifnwFEkQgd1GwIZVz7EwdyfpueYODG6kcrkheCFkEKUpS34C3pUhQyaTJDBtA4tTYTUsEaIsYOUU+Q8jOjjT1fI+r5pwwbFFTx2soSRPBej00G+VoQY41ReHCa9KDW9AEx5IUzJClpzrkqeM8eZmoNJk8Zs2u6ebNq70xQdUyVSCqMZk7J0eW045ap5SZGuEEfGpSSib5BAdtV2LkA/dax4658OmgCQpbEIJdzOBGcmoNcGHkap5pcmRhQLVqgLEFNI3ljG6rw2TDJruZTNHDE12Y6OuPYGwhJ6C6epOaZMFIfcUchrJRI6VjFtXlBTV+jTzz8ga4JLJeh2nCpLOkrzTYasDwFs7O5T5bmBEMGhJvh9AWr7CKE3HXp39R2qzQhnsnQi1ANPfI6nPFeXpkkWC64vMT8LqpWkueQNE7W2VpeqnqFJk+C3vSMxtMNpkI6JEmedVo6pWoka6sJCWb4ASVfoycLUmdJkHFeog+U4laAAcRv6tN9/ebl9CRrBRDRASBcZmpKE3iD+15//frclEM8Daybq1yakQrCLNzVZLqj6v5ra9RfZTe495veIrfy5rfy/2sowhODDYyKHQ34fdhneGLtq+8n89e4fUEsBAj8DFAAACAgAXHj1XBNp+09nEAAAVl8AABkAAAAAAAAAAAAAALSBAAAAADYyMmE1YTgyNWQyOTZkOTI5ZWIzLmpzb25QSwECPwMUAAAICABcePVcxF2AZsUOAAA1VAAAGQAAAAAAAAAAAAAAtIGeEAAAYzU0MDAyYjU4NGQxNGRhNGQ2YzguanNvblBLAQI/AxQAAAgIAFx49VxSwz2T9g4AAJxSAAAZAAAAAAAAAAAAAAC0gZofAABjMjUzYjAwYTQ0ODVkMDFjNzc2ZS5qc29uUEsBAj8DFAAACAgAXHj1XKbSxDFqEAAAR3cAABkAAAAAAAAAAAAAALSBxy4AADUwNjFhZjVhMGNjMDZiNjI1YmQ0Lmpzb25QSwECPwMUAAAICABcePVc0kDqVW8SAACAtAAAGQAAAAAAAAAAAAAAtIFoPwAANzgzYTkxODBiMjI1OTI3MWQyMTUuanNvblBLAQI/AxQAAAgIAFx49VyWoB88MAUAAP8UAAAZAAAAAAAAAAAAAAC0gQ5SAAA4NDJmYzExYjdiYTE0MWNjMjQ0Zi5qc29uUEsBAj8DFAAACAgAXHj1XM4A898hEgAACWsAABkAAAAAAAAAAAAAALSBdVcAADMwNjU0MDc0MmYxM2I2Y2M2OTViLmpzb25QSwECPwMUAAAICABcePVc+Lz48zsEAACcEAAACwAAAAAAAAAAAAAAtIHNaQAAcmVwb3J0Lmpzb25QSwUGAAAAAAgACAAqAgAAMW4AAAAA</template>
\ No newline at end of file
diff --git a/e2e-ui/.gitignore b/e2e-ui/.gitignore
new file mode 100644
index 000000000..0eaeb7f29
--- /dev/null
+++ b/e2e-ui/.gitignore
@@ -0,0 +1,4 @@
+fixtures/storage/
+test-results/
+../e2e-ui-report/
+.last-run.json
diff --git a/e2e-ui/README.md b/e2e-ui/README.md
new file mode 100644
index 000000000..ffb705f10
--- /dev/null
+++ b/e2e-ui/README.md
@@ -0,0 +1,154 @@
+# EDR Passenger — Playwright UI E2E
+
+Browser E2E for the passenger platform. **Track A** = portal booking combinations; **Track B** =
+backoffice config → portal propagation. Scenario matrix: `docs/ui-e2e-test-matrix.md`.
+
+## Status
+
+**Track A + Track B implemented and green** — 27 passing specs, 1 documented skip (UA-7). Full suite
+runs deterministically in ~1.8 min (`workers:1`, one seeded DB shared serially). The whole booking
+flow is factored into `fixtures/booking-flow.ts` — `bookTrip(page, opts)` drives an arbitrary
+passenger mix, nationality, trip type, promo, and payment method end to end (search → select →
+passengers → seats → review → pay → confirmation), capturing the price at each hop; `bookOneAdult` is
+a thin back-compat wrapper.
+
+### Coverage vs `docs/ui-e2e-test-matrix.md`
+
+**Track A — booking combinations** (`specs/portal`, `specs/guest`):
+
+| ID | Spec | What it proves |
+|----|------|----------------|
+| UA-1 | `ua1` | one-way 1A ETB WALLET — full money chain equal, CONFIRMED |
+| UA-1b | `ua1b-usd-divergence` | ✅ USD card shows the USD fare, correctly converted from the internal ETB base (coherent) |
+| UA-2 | `ua2-usd-booking` | ✅ USD booking — passenger amount in USD (display), charge basis stored coherently in ETB (currency mislabel fixed) |
+| UA-3 | `ua3-djf` | DJF booking settles via forged gateway payment |
+| UA-3w | `ua3-djf` | ✅ DJF WALLET — passenger amount in DJF, charge basis stored coherently in ETB (mislabel fixed) |
+| UA-4 | `ua4-child-free` | first child <5 free → total = one adult fare, free child not seated |
+| UA-5 | `ua5-second-child-paid` | 1A+2C → second child pays full fare (2 seats) |
+| UA-6 | `ua6-round-trip` | ✅ round-trip books both legs — reverse-leg pricing fixed (abs distance); 2 seats, total = 2× one-way (M-4-adjacent) |
+| UA-8 | `ua8-promo-drop` | ✅ valid promo now applied server-side; booking stored at the discounted total (H-13 fixed & guarded) |
+| UA-11 | `ua11-expired-promo` | expired promo ignored → full fare booked |
+| UA-13 | `ua13-forged-total` | ✅ client-forged `reviewedTotalMinor=1` now REJECTED 4xx, nothing stored (C-1 fixed & guarded) |
+| UA-14 | `ua14-forged-seat-fare` | ✅ guest forged `seatFareMinor=0` now REJECTED 4xx, nothing stored (C-1 fixed & guarded) |
+| UA-15 | `ua15-telebirr-shortpay` | ✅ short-paid gateway settlement now REFUSED — booking stays unconfirmed (C-4 fixed & guarded) |
+| UA-16 | `ua16-family-mix` | 2A+3C → two children free, one paid (3 seats) |
+
+**Track B — config → portal propagation & validation gaps** (`specs/backoffice`, `specs/propagation`):
+
+| ID | Spec | What it proves |
+|----|------|----------------|
+| PB-1 | `pb-config-propagation` | FX-rate change propagates live to portal USD pricing |
+| PB-2 / PB-2b | `pb-config-propagation` | seat-class base-price change propagates live; `basePrice` field drives the fare |
+| PB-4 | `pb-config-propagation` | station added in backoffice appears in the portal station list |
+| PB-7 | `config-validation` | 🔴 promo created with backoffice UI field names is inert (field-name mismatch) |
+| PB-10 | `pb-config-propagation` | ✅ deleting an FX rate now FAILS CLOSED (no priced fare) instead of a silent 1.0 collapse (M-5/H-2 fixed & guarded) |
+| BC-7 | `pb-config-propagation` | ✅ negative seat-class base price now REJECTED (400, DTO `@Min(0)`) (M-1 fixed & guarded) |
+| BC-8 | `config-validation` | ✅ promo over 100% now REJECTED (400, DTO `@Max(100)`) (M-2 fixed & guarded) |
+| BC-9 | `config-validation` | ✅ negative seat-hold duration now REJECTED (400, whitelisted typed `/config` DTO) (M-3 fixed & guarded) |
+| BC-10 | `config-validation` | ✅ schedule with a past departure now REJECTED (400); future schedules still create (M-4 fixed & guarded) |
+| BC-11 | `pb-config-propagation` | ✅ non-admin passenger now FORBIDDEN (403) from FX writes; admin still allowed (C-8 fixed & guarded) |
+
+### Deferred (documented, not silently omitted)
+
+- **UA-7** (round-trip berth) — `specs/portal/ua7-berth.spec.ts` is `test.skip`: still needs a bed
+  CoachType seed. (Reverse-leg pricing is no longer a blocker — fixed under UA-6.)
+- **UA-9 / UA-10 / UA-12 / UA-17** — the matrix moves these to the API-level harness (over-100% /
+  over-subtotal promos, loyalty over-redeem, DJF×promo negative total): no reachable browser path
+  (server clamps `reviewedTotalMinor` ≥ 0; the portal never calls the loyalty/fare-quote path).
+- **PB-3/5/6/8/9, BC-1…BC-6** — additional config surfaces and delete-referenced/mid-flight/staleness
+  variations of the finding classes already covered above; the matrix marks several as deferrable.
+
+**Gateway settlement:** the real telebirr gateway is unreachable in the test env (`/payments/initiate`
+502s), so gateway rows (UA-3, UA-15) create the booking through the real browser flow and then inject
+settlement via `POST /internal/payments/mark-paid` — exactly the matrix's settlement-injection plan.
+
+Portal testids used: `result-select-btn`, `coach-option`, `continue-passenger-details`,
+`pay-method-{TYPE}`. Everything else (passengers form + DOB modal, seats auto-assign, review, payment)
+is driven via name/placeholder/role selectors — no further source edits were needed.
+
+**Seed note:** `Passenger.id` is set EQUAL to the IAM user id — see the comment in `seed-ui.ts`
+(`UI_IDS.passenger`) and the SUSPECTED FINDING below. Each coach seeds 48 seats so a full serial run
+never exhausts availability across specs.
+
+## Suspected finding (surfaced while building UA-1)
+
+`POST /bookings` (authenticated) overrides `passengerId` with the JWT user id
+(`bookings.controller.ts:528-532`, "never trust the request body"). The service only resolves an
+iamUserId → Passenger when it is **non-UUID** (`bookings.service.ts:773`). IAM user ids are UUIDs, so
+the resolver never fires and `booking.create` uses the iamUserId directly as `passengerId` → FK
+violation unless `Passenger.id == iamUserId`. This is why the seed aligns them. **Verify against a
+real IAM-authenticated booking** — if `req.user.id` is genuinely the iamUserId in production,
+authenticated portal bookings may be broken (guest path unaffected). Candidate for `docs/ISSUES.md`.
+
+## Prerequisites — the running stack
+
+The suite drives a live stack. `global-setup.ts` seeds + mints auth, but assumes the apps are
+already up. Bring them up once (leave running across test runs):
+
+```bash
+# 1. Infra: test Postgres (5544) + RabbitMQ (5672, payment vhost)
+bash e2e/prepare.sh              # postgres + migrations
+docker compose -f e2e/docker-compose.yml up -d rabbitmq-e2e
+
+# 2. Build the shared types package (nest build needs the dist)
+pnpm --filter @edr/types build
+
+# 3. passenger-api on :4000 against the 5544 DB, with org+staff seeding on
+#    (apps/edr-passenger-api/.env sets DATABASE_URL=…5544, PORT=4000,
+#     RABBITMQ_ENABLED=false, FAYDA_ENABLED=false, SEED_EDR_PASSENGER_ORG=true,
+#     SEED_PASSENGER_STAFF=true, DEFAULT_PASSWORD=Test@1234)
+( cd apps/edr-passenger-api && pnpm dev )        # background
+
+# 4. Web apps (each has .env.local → NEXT_PUBLIC_API_URL=http://localhost:4000)
+( cd apps/edr-passenger-web/portal && pnpm dev )      # :5174, background
+( cd apps/edr-passenger-web/backoffice && pnpm dev )  # :5184, background
+```
+
+> `playwright.config.ts` now declares a `webServer` block that auto-boots api/portal/backoffice and
+> **reuses** them if already running, so steps 3–4 are optional in local dev. Gateway rows settle via
+> the internal `mark-paid` endpoint, so `apps/edr-payment-api` (:3003) is **not** required.
+
+## Run
+
+One command (infra → build → boot → seed+auth → run → open report):
+
+```bash
+bash e2e-ui/run.sh                                  # all projects; args pass through to playwright
+bash e2e-ui/run.sh --headed                         # watch it in a real browser
+SLOWMO=500 bash e2e-ui/run.sh --headed              # slow every action by 500ms
+bash e2e-ui/run.sh --project=portal ua4             # one project / filter by title
+```
+
+Or, against an already-running stack:
+
+```bash
+pnpm test:e2e:ui                                    # all projects
+pnpm test:e2e:ui -- --project=guest --project=backoffice   # smoke only
+```
+
+HTML report → `e2e-ui-report/index.html`.
+
+## Layout
+
+```
+e2e-ui/
+  playwright.config.ts     projects: portal (passenger auth), guest (none),
+                           backoffice (staff auth), propagation (cross-app)
+  global-setup.ts          seeds test DB (seed-ui.ts) + mints staff.json via real /login
+  fixtures/
+    data.ts                station IDs, sample depart date, results deep-link helper
+    storage/staff.json      generated staff storageState (gitignored)
+  specs/{guest,portal,backoffice,propagation}/*.spec.ts
+```
+
+Seed lives with the API harness: `apps/edr-passenger-api/test/fixtures/seed-ui.ts` (extends
+`seed-core.ts` with a bookable Train/Schedule/Coach/Seats, enabled PaymentMethods WALLET+TELEBIRR,
+promos, funded wallet). Run standalone: `npx ts-node test/fixtures/seed-ui.ts`.
+
+## Auth model (grounded in the app)
+
+- **Portal (passenger)**: `localStorage.auth_token` only, no server gate. (passenger storageState is
+  a Phase 3 item — smoke uses the `guest` project.)
+- **Backoffice (staff)**: middleware requires the `auth_token` **cookie**; API guards check the
+  session's permissions. `global-setup` logs in as the seeded `passenger.admin@edr.local` through
+  the real `/login` UI and snapshots both. No hand-crafted tokens.
diff --git a/e2e-ui/fixtures/booking-flow.ts b/e2e-ui/fixtures/booking-flow.ts
new file mode 100644
index 000000000..5d1ab3988
--- /dev/null
+++ b/e2e-ui/fixtures/booking-flow.ts
@@ -0,0 +1,367 @@
+import { expect, type Locator, type Page, type Route } from "@playwright/test";
+import { API_URL, CURRENCY_BY_NATIONALITY, resultsUrl } from "./data";
+
+export type Nationality = "Ethiopian" | "Djiboutian" | "Other";
+
+export interface PaxSpec {
+  category: "ADULT" | "CHILD";
+  name: string;
+  gender: "Male" | "Female";
+  /** Date of birth. Adults: age 6–110. Children: age < 5 (to be free-eligible). */
+  dob: { d: number; m: number; y: number };
+  /** Adults only. */
+  phone?: string;
+  /** Non-Ethiopian adults only. */
+  passport?: { number: string; country: string; issue: string; expiry: string };
+}
+
+export interface TripOptions {
+  nationality?: Nationality;
+  tripType?: "ONE_WAY" | "ROUND_TRIP";
+  /** If `passengers` is omitted, N adults + M children are generated. */
+  adults?: number;
+  children?: number;
+  passengers?: PaxSpec[];
+  /** Promo code injected via the results URL (`?promoCode=`) — the portal has no promo input. */
+  promoCode?: string;
+  /** Mutate the outgoing POST /bookings(/guest) body (e.g. forge reviewedTotalMinor). */
+  mutateBookingBody?: (body: any) => any;
+  /**
+   * When the POST /bookings(/guest) is expected to be rejected (e.g. a forged total the server
+   * must refuse): don't assert a bookingId and return early with `bookingStatus` set, instead of
+   * driving on to payment. Lets a spec assert the server refused the booking.
+   */
+  tolerateBookingError?: boolean;
+  paymentMethod?: "WALLET" | "TELEBIRR";
+  /**
+   * For TELEBIRR: after initiate, abort the external gateway redirect and forge settlement via the
+   * internal mark-paid endpoint. `amountMinor` lets a test short-pay (settle for the wrong amount).
+   * Defaults to settling for the real booking total.
+   */
+  forgeSettlement?: { amountMinor?: number };
+}
+
+export interface BookingResult {
+  /** displayAmountMinor on the results card (what the passenger sees — passenger currency). */
+  cardDisplayMinor: number;
+  /** baseFareMinor on the results card (internal ETB fare; diverges from display for USD/DJF). */
+  cardBaseFareMinor: number;
+  /** The search response's displayCurrency (ETB/USD/DJF). */
+  displayCurrency: string;
+  /** reviewedTotalMinor the browser actually sent to POST /bookings. */
+  reviewedTotalMinor: number;
+  /** HTTP status the POST /bookings(/guest) returned (2xx on success, 4xx when the server rejects). */
+  bookingStatus: number;
+  bookingId: string;
+  /** Whether the flow used /bookings/guest. */
+  guest: boolean;
+  initiateStatus: number;
+  /** merchantOrderId returned by POST /payments/initiate (gateway methods). */
+  merchantOrderId?: string;
+  /** true once /booking/confirmation is reached. */
+  confirmed: boolean;
+  /** The GET /search/fare-breakdown payload seen on the review page (per-pax fares + discount). */
+  fareBreakdown: any;
+}
+
+const PHONE_BY_NATIONALITY: Record<Nationality, string> = {
+  Ethiopian: "912345678",
+  Djiboutian: "77123456",
+  Other: "14155552671",
+};
+
+const PASSPORT_COUNTRY: Record<Nationality, string> = {
+  Ethiopian: "",
+  Djiboutian: "Djibouti",
+  Other: "Canada",
+};
+
+/** Build a default passenger list: adults first, then children (matches form index → category). */
+export function makePassengers(adults: number, children: number, nationality: Nationality): PaxSpec[] {
+  const list: PaxSpec[] = [];
+  for (let i = 0; i < adults; i++) {
+    list.push({
+      category: "ADULT",
+      name: `Adult ${i + 1}`,
+      gender: i % 2 === 0 ? "Male" : "Female",
+      dob: { d: 15, m: 6, y: 1990 },
+      phone: PHONE_BY_NATIONALITY[nationality],
+      passport:
+        nationality === "Ethiopian"
+          ? undefined
+          : { number: "P1234567", country: PASSPORT_COUNTRY[nationality], issue: "2020-01-01", expiry: "2032-01-01" },
+    });
+  }
+  for (let j = 0; j < children; j++) {
+    // Age ~3 as of 2026 → strictly under 5, so isChild() and the free-child policy apply.
+    list.push({ category: "CHILD", name: `Child ${j + 1}`, gender: "Female", dob: { d: 10, m: 3, y: 2023 } });
+  }
+  return list;
+}
+
+/** Passenger card locator (scoped by the "Passenger N" heading; N is 1-based). */
+function card(page: Page, i: number): Locator {
+  return page.locator("div.card").filter({ hasText: new RegExp(`Passenger ${i + 1}\\b`) });
+}
+
+/** Open the DOB modal for a passenger card, enter the date manually, and confirm. */
+async function fillDob(page: Page, c: Locator, dob: { d: number; m: number; y: number }) {
+  await c.getByRole("button", { name: /select date of birth/i }).click();
+  await page.getByRole("button", { name: /enter manually/i }).click();
+  await page.getByPlaceholder("DD").fill(String(dob.d));
+  await page.getByPlaceholder("MM").fill(String(dob.m));
+  await page.getByPlaceholder("YYYY").fill(String(dob.y));
+  await page.getByRole("button", { name: /^confirm/i }).click();
+}
+
+/** Fill one passenger card (adult or child), revealing the manual form if it's gated. */
+async function fillPassenger(page: Page, i: number, spec: PaxSpec) {
+  const c = card(page, i);
+  const nameInput = page.locator(`input[name="passengers.${i}.name"]`);
+  // Adults may sit behind a Fayda gate that must be toggled open. Wait for whichever appears first —
+  // the name field (already expanded) or the reveal button — so we never toggle an open form closed.
+  const reveal = c.getByRole("button", { name: /enter details manually|skip for now/i }).first();
+  await Promise.race([
+    nameInput.waitFor({ state: "visible", timeout: 15_000 }).catch(() => {}),
+    reveal.waitFor({ state: "visible", timeout: 15_000 }).catch(() => {}),
+  ]);
+  if (!(await nameInput.isVisible().catch(() => false)) && (await reveal.isVisible().catch(() => false))) {
+    await reveal.click();
+  }
+  await nameInput.waitFor({ state: "visible", timeout: 15_000 });
+
+  await nameInput.fill(spec.name);
+  await page.locator(`select[name="passengers.${i}.gender"]`).selectOption(spec.gender);
+  if (spec.category === "ADULT" && spec.phone) {
+    await c.locator('input[type="tel"]').first().fill(spec.phone);
+  }
+  if (spec.passport) {
+    await page.locator(`input[name="passengers.${i}.passportNumber"]`).fill(spec.passport.number);
+    await page.locator(`select[name="passengers.${i}.passportCountry"]`).selectOption(spec.passport.country);
+    await page.locator(`input[name="passengers.${i}.passportIssueDate"]`).fill(spec.passport.issue);
+    await page.locator(`input[name="passengers.${i}.passportExpiryDate"]`).fill(spec.passport.expiry);
+  }
+  await fillDob(page, c, spec.dob);
+}
+
+/** Select a coach + continue, once for a one-way leg or twice for a round trip. */
+async function selectResultsAndContinue(page: Page, roundTrip: boolean) {
+  const pickCoach = async (scope: Locator | Page) => {
+    await (scope as Page).getByTestId("result-select-btn").first().click();
+    await page.getByTestId("coach-option").first().click();
+    await page.getByTestId("continue-passenger-details").first().click();
+  };
+  await pickCoach(page); // outbound (advances to the inbound step for a round trip)
+  if (roundTrip) {
+    // The inbound step re-renders result cards; scope to the inbound section if present.
+    const inbound = page.locator("#inbound-section");
+    const scope = (await inbound.count()) > 0 ? inbound : page;
+    await scope.getByTestId("result-select-btn").first().click();
+    await page.getByTestId("coach-option").first().click();
+    await page.getByTestId("continue-passenger-details").first().click();
+  }
+}
+
+/** Auto-assign seats (fills all passengers at once and auto-continues). Twice for a round trip. */
+async function assignSeatsAndContinue(page: Page, roundTrip: boolean) {
+  const autoAssign = () => page.getByRole("button", { name: /auto assign seats/i }).first().click();
+  await autoAssign(); // outbound
+  if (roundTrip) {
+    // After the outbound hold, the page switches to the return-seat map.
+    await page.getByRole("heading", { name: /return seats/i }).waitFor({ timeout: 20_000 });
+    await autoAssign(); // inbound
+  }
+  await page.waitForURL(/\/booking\/review/, { timeout: 30_000 });
+}
+
+/**
+ * Drives the real portal booking flow end to end for an arbitrary passenger mix, nationality,
+ * trip type, promo, and payment method. Captures the price at each hop for DB cross-checks.
+ * Runs as a guest when the page context has no auth token (the `guest` Playwright project).
+ */
+export async function bookTrip(page: Page, opts: TripOptions = {}): Promise<BookingResult> {
+  const nationality = opts.nationality ?? "Ethiopian";
+  const tripType = opts.tripType ?? "ONE_WAY";
+  const roundTrip = tripType === "ROUND_TRIP";
+  const passengers =
+    opts.passengers ?? makePassengers(opts.adults ?? 1, opts.children ?? 0, nationality);
+  const adults = passengers.filter((p) => p.category === "ADULT").length;
+  const children = passengers.filter((p) => p.category === "CHILD").length;
+
+  // Optional: forge the POST /bookings body before it leaves the browser.
+  if (opts.mutateBookingBody) {
+    await page.route(/\/bookings(\/guest)?(\?|$)/, async (route: Route) => {
+      if (route.request().method() !== "POST") return route.continue();
+      const body = route.request().postDataJSON();
+      await route.continue({ postData: JSON.stringify(opts.mutateBookingBody!(body)) });
+    });
+  }
+
+  // ── Search / results ────────────────────────────────────────────────────────
+  const searchDone = page.waitForResponse(
+    (r) => r.url().includes("/search") && r.request().method() === "POST",
+  );
+  const base = resultsUrl({ nationality, adults, children, tripType });
+  await page.goto(opts.promoCode ? `${base}&promoCode=${encodeURIComponent(opts.promoCode)}` : base);
+  const search = await searchDone;
+  const out = (await search.json())?.data?.outbound?.[0];
+  const cardCls = out?.faresByClass?.[0];
+  const cardBaseFareMinor = cardCls?.baseFareMinor;
+  const cardDisplayMinor = cardCls?.displayAmountMinor ?? cardBaseFareMinor;
+  const displayCurrency = out?.displayCurrency ?? CURRENCY_BY_NATIONALITY[nationality];
+  expect(cardBaseFareMinor).toBeGreaterThan(0);
+
+  await selectResultsAndContinue(page, roundTrip);
+  // Both authenticated users and guests may pass through the auth-check interstitial: authenticated
+  // users auto-forward to passengers, guests must click "Continue as guest". Handle whichever wins.
+  await page.waitForURL(/\/booking\/(passengers|auth-check)/, { timeout: 30_000 });
+  if (/\/booking\/auth-check/.test(page.url())) {
+    await Promise.race([
+      page.waitForURL(/\/booking\/passengers/, { timeout: 15_000 }).catch(() => {}),
+      page
+        .getByRole("button", { name: /continue as guest/i })
+        .click({ timeout: 15_000 })
+        .catch(() => {}),
+    ]);
+    await page.waitForURL(/\/booking\/passengers/, { timeout: 30_000 });
+  }
+
+  // ── Passenger form ────────────────────────────────────────────────────────────
+  for (let i = 0; i < passengers.length; i++) await fillPassenger(page, i, passengers[i]);
+  await page.getByRole("button", { name: /continue to seat selection/i }).click();
+  await page.waitForURL(/\/booking\/seats/, { timeout: 30_000 });
+
+  // ── Seats: auto-assign → hold → review ────────────────────────────────────────
+  const fbDone = page
+    .waitForResponse((r) => r.url().includes("/search/fare-breakdown"), { timeout: 25_000 })
+    .catch(() => null);
+  await assignSeatsAndContinue(page, roundTrip);
+  const fbRes = await fbDone;
+  const fbJson = fbRes ? await fbRes.json() : null;
+  const fareBreakdown = fbJson?.data ?? fbJson;
+
+  // ── Review: confirm → POST /bookings(/guest) ──────────────────────────────────
+  const bookingDone = page.waitForResponse(
+    (r) => /\/bookings(\/guest)?(\?|$)/.test(r.url()) && r.request().method() === "POST",
+  );
+  await page.getByRole("button", { name: /^confirm/i }).first().click();
+  const bookingRes = await bookingDone;
+  const bookingStatus = bookingRes.status();
+  const guest = bookingRes.url().includes("/bookings/guest");
+  const reviewedTotalMinor = bookingRes.request().postDataJSON()?.reviewedTotalMinor;
+
+  // Expected-rejection path: the server refused the booking (e.g. a forged total). Return early
+  // with the status so the caller can assert the refusal; there is no booking to drive to payment.
+  if (opts.tolerateBookingError && !bookingRes.ok()) {
+    return {
+      cardDisplayMinor,
+      cardBaseFareMinor,
+      displayCurrency,
+      reviewedTotalMinor,
+      bookingStatus,
+      bookingId: "",
+      guest,
+      initiateStatus: 0,
+      confirmed: false,
+      fareBreakdown,
+    };
+  }
+
+  const bookingData = (await bookingRes.json())?.data ?? {};
+  const bookingId = bookingData.id ?? bookingData.bookingId;
+  expect(bookingId).toBeTruthy();
+  await page.waitForURL(/\/booking\/(payment|confirmation)/, { timeout: 30_000 });
+
+  const result: BookingResult = {
+    cardDisplayMinor,
+    cardBaseFareMinor,
+    displayCurrency,
+    reviewedTotalMinor,
+    bookingStatus,
+    bookingId,
+    guest,
+    initiateStatus: 0,
+    confirmed: false,
+    fareBreakdown,
+  };
+
+  // A zero-total booking skips payment and lands straight on confirmation.
+  if (/\/booking\/confirmation/.test(page.url())) {
+    result.confirmed = true;
+    return result;
+  }
+
+  // ── Payment ─────────────────────────────────────────────────────────────────
+  const method = opts.paymentMethod ?? "WALLET";
+
+  if (method === "WALLET") {
+    // WALLET settles fully server-side, synchronously → straight to /booking/confirmation.
+    const initiateDone = page.waitForResponse(
+      (r) => r.url().includes("/payments/initiate") && r.request().method() === "POST",
+    );
+    await page.getByTestId("pay-method-WALLET").first().click();
+    await page.getByRole("button", { name: /^pay\b/i }).first().click();
+    result.initiateStatus = (await initiateDone).status();
+    result.confirmed = await page
+      .waitForURL(/\/booking\/confirmation/, { timeout: 25_000 })
+      .then(() => true)
+      .catch(() => false);
+    return result;
+  }
+
+  // Gateway (TELEBIRR): the real provider is unreachable in the test env (initiate 502s), so we do
+  // what the matrix prescribes — inject settlement. The booking is already created through the real
+  // browser flow and sits in PENDING_PAYMENT; we forge the payment.succeeded event to the internal
+  // mark-paid endpoint (ungated when SERVICE_AUTH_TOKEN is unset), then let the confirmation page's
+  // poll flip to CONFIRMED. `forgeSettlement.amountMinor` lets a test short-pay (settle wrong amount).
+  const amountMinor = opts.forgeSettlement?.amountMinor ?? reviewedTotalMinor;
+  // mark-paid sits behind the global JwtGuard (any valid token passes; ServiceAuthGuard is a no-op
+  // when SERVICE_AUTH_TOKEN is unset). Reuse the logged-in passenger's token from localStorage.
+  const authToken = await page.evaluate(() => localStorage.getItem("auth_token"));
+  const markPaid = await page.request.post(`${API_URL}/internal/payments/mark-paid`, {
+    headers: authToken ? { Authorization: `Bearer ${authToken}` } : {},
+    data: {
+      version: 1,
+      eventId: crypto.randomUUID(), // @IsUUID
+      eventType: "payment.succeeded",
+      occurredAt: new Date().toISOString(),
+      service: "PASSENGER",
+      intentId: crypto.randomUUID(), // @IsUUID
+      referenceType: "BOOKING",
+      referenceId: bookingId,
+      merchantOrderId: `e2e-${bookingId}`,
+      provider: "TELEBIRR",
+      amountMinor,
+      currency: "ETB",
+      providerTxnId: `e2e-txn-${bookingId}`,
+      paidAt: new Date().toISOString(),
+    },
+  });
+  result.initiateStatus = markPaid.status();
+  // mark-paid finalizes synchronously; confirm authoritatively via the booking status API (the
+  // confirmation page's DOM depends on the client store, which a direct navigation may not carry).
+  await page.goto("/booking/confirmation");
+  for (let attempt = 0; attempt < 10 && !result.confirmed; attempt++) {
+    const res = await page.request.get(`${API_URL}/bookings/${bookingId}`, {
+      headers: authToken ? { Authorization: `Bearer ${authToken}` } : {},
+    });
+    const status = ((await res.json().catch(() => ({})))?.data ?? {})?.status;
+    if (status === "CONFIRMED") result.confirmed = true;
+    else await page.waitForTimeout(500);
+  }
+  return result;
+}
+
+/** Back-compat wrapper: one-way single adult (used by the original UA-1/8/13 specs). */
+export interface BookingOptions {
+  nationality?: Nationality;
+  promoCode?: string;
+  mutateBookingBody?: (body: any) => any;
+  tolerateBookingError?: boolean;
+  paymentMethod?: "WALLET" | "TELEBIRR";
+}
+export async function bookOneAdult(page: Page, opts: BookingOptions = {}) {
+  const r = await bookTrip(page, { ...opts, adults: 1, children: 0, tripType: "ONE_WAY" });
+  // Preserve the original field name used by the existing specs.
+  return { ...r, cardFareMinor: r.cardBaseFareMinor };
+}
diff --git a/e2e-ui/fixtures/data.ts b/e2e-ui/fixtures/data.ts
new file mode 100644
index 000000000..2a2b99c3a
--- /dev/null
+++ b/e2e-ui/fixtures/data.ts
@@ -0,0 +1,92 @@
+/** Shared constants mirroring apps/edr-passenger-api/test/fixtures/{seed-core,seed-ui}.ts. */
+export const STATIONS = {
+  A: "00000000-0000-4000-8000-000000000020", // Alpha / AAA
+  B: "00000000-0000-4000-8000-000000000021", // Bravo / BBB
+  C: "00000000-0000-4000-8000-000000000022", // Charlie / CCC
+} as const;
+
+export const SCHEDULE_ID = "00000000-0000-4000-8000-000000000101";
+export const RETURN_SCHEDULE_ID = "00000000-0000-4000-8000-000000000201";
+export const SEAT_CLASS_LOCAL = "00000000-0000-4000-8000-000000000010";
+export const SEAT_CLASS_INTL = "00000000-0000-4000-8000-000000000011";
+export const COACH_TYPE_ID = "00000000-0000-4000-8000-000000000001";
+export const ROUTE_ID = "00000000-0000-4000-8000-000000000030";
+export const PROMO_VALID = "PROMO10";
+export const PROMO_EXPIRED = "EXPIRED50";
+
+export const API_URL = process.env.API_URL ?? "http://localhost:4000";
+
+/** Friendly nationality name → the enum the portal/search expects. */
+export const NATIONALITY_ENUM = {
+  Ethiopian: "ETHIOPIAN",
+  Djiboutian: "DJIBOUTIAN",
+  Other: "OTHER",
+} as const;
+export type Nationality = keyof typeof NATIONALITY_ENUM;
+
+/** Display currency the search returns per nationality (asserted by the currency specs). */
+export const CURRENCY_BY_NATIONALITY = {
+  Ethiopian: "ETB",
+  Djiboutian: "DJF",
+  Other: "USD",
+} as const;
+
+function tokenFrom(file: string): string {
+  const fs = require("node:fs") as typeof import("node:fs");
+  const path = require("node:path") as typeof import("node:path");
+  const raw = JSON.parse(fs.readFileSync(path.join(__dirname, "storage", file), "utf8"));
+  for (const origin of raw.origins ?? []) {
+    for (const item of origin.localStorage ?? []) {
+      if (item.name === "auth_token") return item.value as string;
+    }
+  }
+  throw new Error(`auth_token not found in ${file} — did global-setup run?`);
+}
+
+/** Staff/admin auth token minted by global-setup (backoffice storageState). */
+export function staffToken(): string {
+  return tokenFrom("staff.json");
+}
+
+/** Regular passenger (non-admin) auth token minted by global-setup (portal storageState). */
+export function passengerToken(): string {
+  return tokenFrom("passenger.json");
+}
+
+/** Must match seed-ui.sampleDepartAt(): now + 2 days at 06:00Z. */
+export function sampleDepartDate(): string {
+  const d = new Date();
+  d.setUTCDate(d.getUTCDate() + 2);
+  d.setUTCHours(6, 0, 0, 0);
+  return d.toISOString().slice(0, 10);
+}
+
+/**
+ * Deep-link to the results page (bypasses the search form, which cannot emit tripType/returnDate).
+ * `nationality` accepts the friendly name ("Ethiopian"|"Djiboutian"|"Other") and is emitted as the
+ * enum the results page expects. For a round trip, pass tripType "ROUND_TRIP" — returnDate defaults
+ * to the same calendar day (the seeded return leg departs 8h after the outbound).
+ */
+export function resultsUrl(opts?: {
+  adults?: number;
+  children?: number;
+  nationality?: string;
+  tripType?: "ONE_WAY" | "ROUND_TRIP";
+  returnDate?: string;
+}) {
+  const nat = opts?.nationality ?? "Ethiopian";
+  const enumNat = (NATIONALITY_ENUM as Record<string, string>)[nat] ?? nat.toUpperCase();
+  const p = new URLSearchParams({
+    origin: STATIONS.A,
+    destination: STATIONS.C,
+    date: sampleDepartDate(),
+    tripType: opts?.tripType ?? "ONE_WAY",
+    adults: String(opts?.adults ?? 1),
+    children: String(opts?.children ?? 0),
+    nationality: enumNat,
+  });
+  if ((opts?.tripType ?? "ONE_WAY") === "ROUND_TRIP") {
+    p.set("returnDate", opts?.returnDate ?? sampleDepartDate());
+  }
+  return `/booking/results?${p.toString()}`;
+}
diff --git a/e2e-ui/global-setup.ts b/e2e-ui/global-setup.ts
new file mode 100644
index 000000000..013518b1d
--- /dev/null
+++ b/e2e-ui/global-setup.ts
@@ -0,0 +1,74 @@
+import { chromium, type FullConfig } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { seedUi } from "../apps/edr-passenger-api/test/fixtures/seed-ui";
+import { seedPassengerSession } from "../apps/edr-passenger-api/test/fixtures/seed-passenger-session";
+
+/**
+ * Playwright global-setup for the UI E2E suite.
+ *  1. Seeds the 5544 test DB with the bookable trip + payment methods + promos (seed-ui.ts).
+ *  2. Mints a passenger IAM session + token → passenger.json storageState (localStorage).
+ *  3. Logs in as the seeded backoffice admin via the REAL /login UI → staff.json storageState.
+ *
+ * Assumes the stack is already running (api :4000, portal :5174, backoffice :5184).
+ */
+const STORAGE_DIR = path.join(__dirname, "fixtures", "storage");
+const API = process.env.API_URL ?? "http://localhost:4000";
+const PORTAL = process.env.PORTAL_URL ?? "http://localhost:5174";
+const BACKOFFICE = process.env.BACKOFFICE_URL ?? "http://localhost:5184";
+const DB_URL =
+  process.env.DATABASE_URL ??
+  "postgresql://edr:edr_secret@localhost:5544/edr_database?schema=passenger";
+const STAFF = { email: "passenger.admin@edr.local", password: process.env.DEFAULT_PASSWORD ?? "Test@1234" };
+
+export default async function globalSetup(_config: FullConfig) {
+  fs.mkdirSync(STORAGE_DIR, { recursive: true });
+  process.env.DATABASE_URL = DB_URL;
+
+  const prisma = new PrismaClient();
+  try {
+    console.log("[global-setup] seeding test DB…");
+    await seedUi(prisma);
+
+    console.log("[global-setup] minting passenger session…");
+    const { token } = await seedPassengerSession(prisma);
+    const profileRes = await fetch(`${API}/auth/profile`, {
+      headers: { Authorization: `Bearer ${token}` },
+    });
+    if (!profileRes.ok) throw new Error(`/auth/profile failed: HTTP ${profileRes.status}`);
+    const profile = (await profileRes.json())?.data ?? {};
+
+    const passengerState = {
+      cookies: [],
+      origins: [
+        {
+          origin: PORTAL,
+          localStorage: [
+            { name: "auth_token", value: token },
+            { name: "auth_user", value: JSON.stringify(profile) },
+          ],
+        },
+      ],
+    };
+    fs.writeFileSync(path.join(STORAGE_DIR, "passenger.json"), JSON.stringify(passengerState));
+    console.log("[global-setup] passenger.json written");
+  } finally {
+    await prisma.$disconnect();
+  }
+
+  console.log("[global-setup] minting staff storageState via real login…");
+  const browser = await chromium.launch();
+  const ctx = await browser.newContext();
+  const page = await ctx.newPage();
+  await page.goto(`${BACKOFFICE}/login`, { waitUntil: "domcontentloaded" });
+  await page.locator('input[type="email"]').fill(STAFF.email);
+  await page.locator('input[type="password"]').fill(STAFF.password);
+  await Promise.all([
+    page.waitForURL((url) => !url.pathname.startsWith("/login"), { timeout: 30_000 }),
+    page.locator('button[type="submit"]').click(),
+  ]);
+  await ctx.storageState({ path: path.join(STORAGE_DIR, "staff.json") });
+  console.log("[global-setup] staff.json written");
+  await browser.close();
+}
diff --git a/e2e-ui/playwright.config.ts b/e2e-ui/playwright.config.ts
new file mode 100644
index 000000000..c3a08ecb6
--- /dev/null
+++ b/e2e-ui/playwright.config.ts
@@ -0,0 +1,94 @@
+import { defineConfig, devices } from "@playwright/test";
+import * as path from "node:path";
+
+// Defaults so `pnpm test:e2e:ui` runs standalone. Must match apps/edr-passenger-api/.env.
+process.env.DATABASE_URL ??=
+  "postgresql://edr:edr_secret@localhost:5544/edr_database?schema=passenger";
+process.env.JWT_ACCESS_TOKEN_SECRET ??= "test-access-secret-0000000000000000000000";
+process.env.DEFAULT_PASSWORD ??= "Test@1234";
+
+/**
+ * Playwright UI E2E for the EDR passenger platform.
+ * Track A (portal booking combinations) + Track B (backoffice config → portal propagation).
+ * See docs/ui-e2e-test-matrix.md. global-setup boots/awaits the stack, seeds the 5544 test DB,
+ * and mints the passenger + staff storageStates.
+ */
+const PORTAL = process.env.PORTAL_URL ?? "http://localhost:5174";
+const BACKOFFICE = process.env.BACKOFFICE_URL ?? "http://localhost:5184";
+const STORAGE = path.join(__dirname, "fixtures", "storage");
+
+export default defineConfig({
+  testDir: path.join(__dirname, "specs"),
+  fullyParallel: false, // shared seeded DB — serialize to keep assertions deterministic
+  workers: 1,
+  retries: 0,
+  timeout: 60_000,
+  expect: { timeout: 10_000 },
+  globalSetup: path.join(__dirname, "global-setup.ts"),
+  reporter: [
+    ["list"],
+    ["html", { outputFolder: path.join(__dirname, "..", "e2e-ui-report"), open: "never" }],
+  ],
+  // Boot the app tier automatically; reuse it if it's already running (dev). Infra (Postgres 5544,
+  // RabbitMQ, migrations, @edr/types build) is handled by e2e-ui/run.sh BEFORE Playwright starts.
+  webServer: [
+    {
+      command: "pnpm --filter @edr/passenger-api dev",
+      url: "http://localhost:4000/stations",
+      timeout: 180_000,
+      reuseExistingServer: true,
+      env: { GITHUB_PACKAGE_TOKEN: process.env.GITHUB_PACKAGE_TOKEN ?? "dummy" },
+    },
+    {
+      command: "pnpm --filter @edr/passenger-portal dev",
+      url: PORTAL,
+      timeout: 120_000,
+      reuseExistingServer: true,
+      env: { GITHUB_PACKAGE_TOKEN: process.env.GITHUB_PACKAGE_TOKEN ?? "dummy" },
+    },
+    {
+      command: "pnpm --filter @edr/passenger-backoffice dev",
+      url: `${BACKOFFICE}/login`,
+      timeout: 120_000,
+      reuseExistingServer: true,
+      env: { GITHUB_PACKAGE_TOKEN: process.env.GITHUB_PACKAGE_TOKEN ?? "dummy" },
+    },
+  ],
+  use: {
+    trace: "retain-on-failure",
+    screenshot: "only-on-failure",
+    actionTimeout: 15_000,
+    // SLOWMO=500 bash e2e-ui/run.sh --headed  → pause 500ms between each browser action
+    launchOptions: { slowMo: Number(process.env.SLOWMO ?? 0) },
+  },
+  projects: [
+    {
+      name: "portal", // Track A — logged-in passenger
+      testMatch: /specs\/portal\/.*\.spec\.ts/,
+      use: {
+        ...devices["Desktop Chrome"],
+        baseURL: PORTAL,
+        storageState: path.join(STORAGE, "passenger.json"),
+      },
+    },
+    {
+      name: "guest", // Track A — guest bookings (no auth)
+      testMatch: /specs\/guest\/.*\.spec\.ts/,
+      use: { ...devices["Desktop Chrome"], baseURL: PORTAL },
+    },
+    {
+      name: "backoffice", // Track B — staff/admin
+      testMatch: /specs\/backoffice\/.*\.spec\.ts/,
+      use: {
+        ...devices["Desktop Chrome"],
+        baseURL: BACKOFFICE,
+        storageState: path.join(STORAGE, "staff.json"),
+      },
+    },
+    {
+      name: "propagation", // cross-app: staff writes config via API → passenger portal reads
+      testMatch: /specs\/propagation\/.*\.spec\.ts/,
+      use: { ...devices["Desktop Chrome"], baseURL: PORTAL },
+    },
+  ],
+});
diff --git a/e2e-ui/run.sh b/e2e-ui/run.sh
new file mode 100755
index 000000000..a431408f1
--- /dev/null
+++ b/e2e-ui/run.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# One-command UI E2E: infra → build → boot app tier (via Playwright webServer) → seed+auth → run →
+# open the HTML report. Idempotent; reuses an already-running stack. Any args pass through to
+# playwright (e.g. `bash e2e-ui/run.sh --project=portal ua1`).
+set -euo pipefail
+
+HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ROOT="$HERE/.."
+API="$ROOT/apps/edr-passenger-api"
+export GITHUB_PACKAGE_TOKEN="${GITHUB_PACKAGE_TOKEN:-dummy}"
+
+echo "==> 1/4 Infra: Postgres (5544) + RabbitMQ (5672) + migrations"
+bash "$ROOT/e2e/prepare.sh"
+echo "    waiting for RabbitMQ healthy"
+for _ in $(seq 1 30); do
+  s="$(docker inspect --format '{{.State.Health.Status}}' edr-passenger-e2e-rmq 2>/dev/null || echo none)"
+  [ "$s" = "healthy" ] && break; sleep 2
+done
+
+echo "==> 2/4 Build shared types (@edr/types dist — nest build needs it)"
+pnpm --filter @edr/types build >/dev/null
+
+echo "==> 3/4 Ensure passenger-api dev env (test DB 5544, port 4000, brokers/Fayda off, seeding on)"
+if [ ! -f "$API/.env" ]; then
+  sed -e 's/^PORT=.*/PORT=4000/' \
+      -e 's/^SEED_EDR_PASSENGER_ORG=.*/SEED_EDR_PASSENGER_ORG=true/' \
+      -e 's/^SEED_PASSENGER_STAFF=.*/SEED_PASSENGER_STAFF=true/' \
+      "$API/.env.test" > "$API/.env"
+  echo "    created $API/.env"
+fi
+
+echo "==> 4/4 Playwright (boots api/portal/backoffice if not already up, seeds + mints auth, runs)"
+npx playwright test -c "$HERE/playwright.config.ts" "$@" || TEST_EXIT=$?
+
+REPORT="$ROOT/e2e-ui-report/index.html"
+if [ -f "$REPORT" ]; then
+  echo "==> Report: $REPORT"
+  open "$REPORT" 2>/dev/null || true
+fi
+exit "${TEST_EXIT:-0}"
diff --git a/e2e-ui/specs/backoffice/checkin-cutoff.spec.ts b/e2e-ui/specs/backoffice/checkin-cutoff.spec.ts
new file mode 100644
index 000000000..b123f24bc
--- /dev/null
+++ b/e2e-ui/specs/backoffice/checkin-cutoff.spec.ts
@@ -0,0 +1,100 @@
+import { test, expect } from "@playwright/test";
+import { API_URL, STATIONS, staffToken } from "../../fixtures/data";
+import { UI_IDS } from "../../../apps/edr-passenger-api/test/fixtures/seed-ui";
+
+/**
+ * Track B — per-station check-in cutoff, driven by the backoffice route config API. Follows the
+ * same convention as config-validation.spec.ts: hits the passenger-api directly with a staff
+ * bearer token rather than driving the real DOM — the route-stop form has no data-testid hooks,
+ * so browser automation here would be selector-fragile for no extra coverage value.
+ *
+ * Creates its OWN route (not the shared ROUTE_ID from seed-ui) since updateRoute deletes and
+ * recreates all stops — mutating the shared fixture route would break every other spec that
+ * depends on its distances/times staying stable for the whole suite run.
+ */
+function auth() {
+  return { Authorization: `Bearer ${staffToken()}` };
+}
+
+test("BC-11 ✅ travelMinutesToStop drives each stop's estimated arrival independently of route-wide departure", async ({ request }) => {
+  const routeRes = await request.post(`${API_URL}/routes`, {
+    headers: auth(),
+    data: {
+      code: `E2E-CUTOFF-${Date.now()}`,
+      name: "E2E Check-in Cutoff Route",
+      effectiveFrom: "2020-01-01T00:00:00Z",
+      stops: [
+        { stationId: STATIONS.A, sequence: 1 },
+        { stationId: STATIONS.B, sequence: 2, travelMinutesToStop: 60 },
+        { stationId: STATIONS.C, sequence: 3, travelMinutesToStop: 40 },
+      ],
+    },
+  });
+  expect(routeRes.ok()).toBeTruthy();
+  const route = (await routeRes.json())?.data ?? (await routeRes.json());
+  const routeId = route.id;
+
+  // Reuse the seeded coach via a route coach template so schedule creation auto-assigns real
+  // seats (createSchedule auto-applies any route coach template — see schedules.service.ts).
+  const templateRes = await request.put(`${API_URL}/routes/${routeId}/coaches`, {
+    headers: auth(),
+    data: { coaches: [{ coachId: UI_IDS.coach, positionNumber: 1 }] },
+  });
+  expect(templateRes.ok()).toBeTruthy();
+
+  // dep only 5 min out: A's cutoff (dep - 30min default) is already ~25 min in the past by the
+  // time this schedule is queried, but B's arrival (dep + 60min) keeps its own cutoff (arrival -
+  // 30min default) about 35 min in the future — proving the two stations close independently.
+  const dep = new Date(Date.now() + 5 * 60_000);
+  const arr = new Date(dep.getTime() + 100 * 60_000); // A->B 60min + B->C 40min
+  const scheduleRes = await request.post(`${API_URL}/schedules`, {
+    headers: auth(),
+    data: { trainId: UI_IDS.train, routeId, departureAt: dep.toISOString(), arrivalAt: arr.toISOString() },
+  });
+  expect(scheduleRes.ok()).toBeTruthy();
+  const schedule = (await scheduleRes.json())?.data ?? (await scheduleRes.json());
+
+  const getRes = await request.get(`${API_URL}/schedules/${schedule.id}`, { headers: auth() });
+  expect(getRes.ok()).toBeTruthy();
+  const full = (await getRes.json())?.data ?? (await getRes.json());
+  const stopTimes: any[] = full.stopTimes ?? [];
+  const bStop = stopTimes.find((s) => s.stationId === STATIONS.B);
+  const cStop = stopTimes.find((s) => s.stationId === STATIONS.C);
+
+  expect(new Date(bStop.plannedArrivalAt).getTime()).toBe(dep.getTime() + 60 * 60_000);
+  expect(new Date(cStop.plannedArrivalAt).getTime()).toBe(arr.getTime()); // last stop locked to overall arrival
+
+  // A's own segment (no arrival — falls back to its departure) is already past its cutoff...
+  const rejectRes = await request.post(`${API_URL}/seats/hold`, {
+    headers: auth(),
+    data: {
+      scheduleId: schedule.id,
+      originStationId: STATIONS.A,
+      destinationStationId: STATIONS.B,
+      passengers: [{ passengerId: "44444444-4444-4444-8444-444444444444", seatId: "00000000-0000-4000-8000-000000009999" }],
+    },
+  });
+  expect(rejectRes.status()).toBe(400);
+  expect((await rejectRes.json())?.message ?? "").toMatch(/cannot be held within/i);
+
+  // ...while B, whose own arrival is comfortably later, remains independently bookable.
+  const seatmapRes = await request.get(`${API_URL}/seats/seatmap/${schedule.id}`, { headers: auth() });
+  expect(seatmapRes.ok()).toBeTruthy();
+  const seatmap = (await seatmapRes.json())?.data ?? (await seatmapRes.json());
+  const seatId = seatmap.coaches?.[0]?.seats?.[0]?.id;
+  expect(seatId).toBeTruthy();
+
+  const holdRes = await request.post(`${API_URL}/seats/hold`, {
+    headers: auth(),
+    data: {
+      scheduleId: schedule.id,
+      originStationId: STATIONS.B,
+      destinationStationId: STATIONS.C,
+      passengers: [{ passengerId: "55555555-5555-4555-8555-555555555555", seatId }],
+    },
+  });
+  expect(holdRes.ok()).toBeTruthy();
+
+  await request.delete(`${API_URL}/schedules/${schedule.id}`, { headers: auth() }).catch(() => {});
+  await request.delete(`${API_URL}/routes/${routeId}?cascade=true`, { headers: auth() }).catch(() => {});
+});
diff --git a/e2e-ui/specs/backoffice/config-validation.spec.ts b/e2e-ui/specs/backoffice/config-validation.spec.ts
new file mode 100644
index 000000000..6749a1b8a
--- /dev/null
+++ b/e2e-ui/specs/backoffice/config-validation.spec.ts
@@ -0,0 +1,79 @@
+import { test, expect } from "@playwright/test";
+import { API_URL, ROUTE_ID, staffToken } from "../../fixtures/data";
+import { UI_IDS } from "../../../apps/edr-passenger-api/test/fixtures/seed-ui";
+
+/**
+ * Track B — server-side validation gaps and the promo field-name mismatch. Each test calls the same
+ * passenger-api endpoints the backoffice forms hit, proving the client-side guards are the ONLY guard
+ * (the API accepts values the forms block) or that a UI/DTO field-name split silently breaks a config.
+ */
+function auth() {
+  return { Authorization: `Bearer ${staffToken()}` };
+}
+
+test("BC-8 ✅ a promo over 100% is rejected by the API (max validation, M-2)", async ({ request }) => {
+  // percentOff must be bounded 0..100 at the DTO layer (the backoffice form has no such check).
+  const res = await request.post(`${API_URL}/promos`, {
+    headers: auth(),
+    data: { code: `E2E_OVER100_${Date.now()}`, title: "over", percentOff: 200, validUntil: "2030-01-01T00:00:00Z", active: true },
+  });
+  expect(res.status()).toBe(400); // ✅ 200% discount rejected
+
+  // A valid promo (≤100%) still succeeds.
+  const okRes = await request.post(`${API_URL}/promos`, {
+    headers: auth(),
+    data: { code: `E2E_OK_${Date.now()}`, title: "ok", percentOff: 50, validUntil: "2030-01-01T00:00:00Z", active: true },
+  });
+  expect(okRes.ok()).toBeTruthy();
+  const promo = (await okRes.json())?.data ?? {};
+  await request.delete(`${API_URL}/promos/${promo.id}`, { headers: auth() }).catch(() => {});
+});
+
+test("PB-7 🔴 a promo created with the backoffice UI field names is inert (field-name mismatch)", async ({ request }) => {
+  // The backoffice /promos form sends discountType/discountValue/isActive, but the DTO reads
+  // percentOff/amountOffMinor/active — so the sent discount is dropped and the promo saves at 0.
+  const res = await request.post(`${API_URL}/promos`, {
+    headers: auth(),
+    data: { code: `E2E_UIFIELDS_${Date.now()}`, title: "uifields", discountType: "PERCENTAGE", discountValue: 25, isActive: true, validUntil: "2030-01-01T00:00:00Z" },
+  });
+  expect(res.ok()).toBeTruthy();
+  const promo = (await res.json())?.data ?? {};
+  expect(promo.discountValue).toBe(0); // 🔴 the 25% the UI "set" was silently dropped
+  await request.delete(`${API_URL}/promos/${promo.id}`, { headers: auth() }).catch(() => {});
+});
+
+test("BC-9 ✅ a negative seat-hold duration is rejected by /config (DTO validation, M-3)", async ({ request }) => {
+  // The settings form has min=1 max=60; the API must now enforce the same at the DTO layer.
+  const res = await request.patch(`${API_URL}/config`, {
+    headers: auth(),
+    data: { seat_hold_duration_minutes: "-1" },
+  });
+  expect(res.status()).toBe(400); // ✅ negative duration rejected
+
+  // A sane value in range still succeeds and is stored.
+  const ok = await request.patch(`${API_URL}/config`, { headers: auth(), data: { seat_hold_duration_minutes: "15" } });
+  expect(ok.ok()).toBeTruthy();
+  expect(((await ok.json())?.data ?? {}).seat_hold_duration_minutes).toBe("15");
+});
+
+test("BC-10 ✅ a schedule with a past departure is rejected by the API (past-date block, M-4)", async ({ request }) => {
+  // The schedules form only checks arrival > departure — the API must ALSO reject a past departure.
+  const past = new Date("2020-01-02T06:00:00.000Z");
+  const arrive = new Date("2020-01-02T10:00:00.000Z");
+  const res = await request.post(`${API_URL}/schedules`, {
+    headers: auth(),
+    data: { trainId: UI_IDS.train, routeId: ROUTE_ID, departureAt: past.toISOString(), arrivalAt: arrive.toISOString() },
+  });
+  expect(res.status()).toBe(400); // ✅ past-dated schedule rejected
+
+  // A future schedule (a different day than the seeded one) is still accepted.
+  const dep = new Date(Date.now() + 30 * 864e5); dep.setUTCHours(6, 0, 0, 0);
+  const arr = new Date(dep.getTime() + 4 * 3600e3);
+  const okRes = await request.post(`${API_URL}/schedules`, {
+    headers: auth(),
+    data: { trainId: UI_IDS.train, routeId: ROUTE_ID, departureAt: dep.toISOString(), arrivalAt: arr.toISOString() },
+  });
+  expect(okRes.ok()).toBeTruthy();
+  const sched = (await okRes.json())?.data ?? {};
+  await request.delete(`${API_URL}/schedules/${sched.id}`, { headers: auth() }).catch(() => {});
+});
diff --git a/e2e-ui/specs/backoffice/currencies.smoke.spec.ts b/e2e-ui/specs/backoffice/currencies.smoke.spec.ts
new file mode 100644
index 000000000..f0cea1e1f
--- /dev/null
+++ b/e2e-ui/specs/backoffice/currencies.smoke.spec.ts
@@ -0,0 +1,19 @@
+import { test, expect } from "@playwright/test";
+
+/**
+ * Backoffice smoke (Track B foundation): the staff storageState authenticates past the middleware
+ * cookie gate, /currencies loads its list from the API, and the add-rate control is reachable.
+ * Proves staff auth (cookie + localStorage + API token) is fully wired.
+ */
+test("backoffice: staff can load /currencies and reach the add-rate control", async ({ page }) => {
+  await page.goto("/currencies", { waitUntil: "domcontentloaded" });
+
+  // Not bounced to /login (middleware cookie gate passed).
+  await expect(page).not.toHaveURL(/\/login/);
+
+  // The page rendered a currencies view with a seeded currency and an add control.
+  await expect(page.getByText(/ETB|USD|DJF/).first()).toBeVisible({ timeout: 20_000 });
+  await expect(
+    page.getByRole("button", { name: /add/i }).first(),
+  ).toBeVisible();
+});
diff --git a/e2e-ui/specs/guest/search.smoke.spec.ts b/e2e-ui/specs/guest/search.smoke.spec.ts
new file mode 100644
index 000000000..114a1b537
--- /dev/null
+++ b/e2e-ui/specs/guest/search.smoke.spec.ts
@@ -0,0 +1,24 @@
+import { test, expect } from "@playwright/test";
+import { resultsUrl, SCHEDULE_ID } from "../../fixtures/data";
+
+/**
+ * Portal smoke (Track A foundation): deep-link to results → POST /search fires → a priced result
+ * card for the seeded trip renders. Proves stack + seed + search + currency formatting are wired.
+ */
+test("portal: seeded trip appears in search results with a price", async ({ page }) => {
+  const searchResponse = page.waitForResponse(
+    (r) => r.url().includes("/search") && r.request().method() === "POST",
+  );
+
+  await page.goto(resultsUrl());
+
+  const res = await searchResponse;
+  expect([200, 201]).toContain(res.status());
+  const body = await res.json();
+  const outbound = body?.data?.outbound ?? [];
+  expect(outbound.some((t: any) => t.scheduleId === SCHEDULE_ID)).toBe(true);
+
+  // The seeded train + a formatted ETB price render in the DOM.
+  await expect(page.getByText("UI Test Express").first()).toBeVisible({ timeout: 20_000 });
+  await expect(page.getByText(/ETB\s*[\d,]+/).first()).toBeVisible();
+});
diff --git a/e2e-ui/specs/guest/ua14-forged-seat-fare.spec.ts b/e2e-ui/specs/guest/ua14-forged-seat-fare.spec.ts
new file mode 100644
index 000000000..3bc2f7f05
--- /dev/null
+++ b/e2e-ui/specs/guest/ua14-forged-seat-fare.spec.ts
@@ -0,0 +1,37 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookTrip } from "../../fixtures/booking-flow";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-14 ✅ — a GUEST (unauthenticated) booking with forged per-passenger seat fares (ISSUES C-1),
+ * guarded. We intercept POST /bookings/guest and rewrite every seatFareMinor (and reviewedTotalMinor)
+ * to 0. The server must recompute the authoritative fare and REJECT the underpayment with a 4xx —
+ * no free ride, nothing persisted.
+ */
+test("UA-14: server rejects a guest booking with forged seatFareMinor=0 (C-1)", async ({ page }) => {
+  const r = await bookTrip(page, {
+    paymentMethod: "WALLET",
+    tolerateBookingError: true,
+    mutateBookingBody: (body) => ({
+      ...body,
+      reviewedTotalMinor: 0,
+      passengers: (body.passengers ?? []).map((p: any) => ({ ...p, seatFareMinor: 0 })),
+    }),
+  });
+
+  expect(r.guest).toBe(true); // proves the /bookings/guest path was used
+  expect(r.cardBaseFareMinor).toBeGreaterThan(1000);
+
+  // The server must REFUSE the forged 0-fare booking with a 4xx…
+  expect(r.bookingStatus).toBeGreaterThanOrEqual(400);
+  expect(r.bookingStatus).toBeLessThan(500);
+  // …return no booking id and persist no free (0-minor) booking.
+  expect(r.bookingId).toBeFalsy();
+  const forged = await prisma.booking.findFirst({ where: { totalMinor: 0 } });
+  expect(forged).toBeNull();
+});
diff --git a/e2e-ui/specs/portal/ua1.spec.ts b/e2e-ui/specs/portal/ua1.spec.ts
new file mode 100644
index 000000000..75f267965
--- /dev/null
+++ b/e2e-ui/specs/portal/ua1.spec.ts
@@ -0,0 +1,31 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookOneAdult } from "../../fixtures/booking-flow";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-1 — one-way, 1 adult, ETB, WALLET. The full real-browser booking flow, asserting the money
+ * chain: card fare > 0, and reviewedTotalMinor == Booking.totalMinor == displayTotalMinor ==
+ * PaymentIntent.amountMinor == wallet DEBIT, booking CONFIRMED.
+ */
+test("UA-1: one-way WALLET booking, price cross-check holds end to end", async ({ page }) => {
+  const r = await bookOneAdult(page, { nationality: "Ethiopian", paymentMethod: "WALLET" });
+  expect(r.confirmed).toBe(true);
+  expect([200, 201]).toContain(r.initiateStatus);
+
+  const booking = await prisma.booking.findUniqueOrThrow({ where: { id: r.bookingId } });
+  const intent = await prisma.paymentIntent.findUniqueOrThrow({ where: { bookingId: r.bookingId } });
+  const debit = await prisma.walletLedgerEntry.findFirst({
+    where: { relatedBookingId: r.bookingId, type: "DEBIT" },
+  });
+
+  expect(booking.totalMinor).toBe(r.reviewedTotalMinor);
+  expect(booking.displayTotalMinor).toBe(r.reviewedTotalMinor);
+  expect(intent.amountMinor).toBe(r.reviewedTotalMinor);
+  expect(debit?.amountMinor).toBe(r.reviewedTotalMinor);
+  expect(booking.status).toBe("CONFIRMED");
+});
diff --git a/e2e-ui/specs/portal/ua11-expired-promo.spec.ts b/e2e-ui/specs/portal/ua11-expired-promo.spec.ts
new file mode 100644
index 000000000..fe3657435
--- /dev/null
+++ b/e2e-ui/specs/portal/ua11-expired-promo.spec.ts
@@ -0,0 +1,25 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookTrip } from "../../fixtures/booking-flow";
+import { PROMO_EXPIRED } from "../../fixtures/data";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-11 — one-way, ETB, an EXPIRED promo injected via ?promoCode=. The expired code must not discount
+ * anything: the fare breakdown reports no discount and the booked total is the full fare (consistent
+ * with the UA-8 promo-drop behaviour, but here the promo is correctly rejected as expired).
+ */
+test("UA-11: an expired promo code is ignored — full fare is booked", async ({ page }) => {
+  const r = await bookTrip(page, { paymentMethod: "WALLET", promoCode: PROMO_EXPIRED });
+  expect(r.confirmed).toBe(true);
+
+  // No discount from the expired code.
+  if (r.fareBreakdown) expect(r.fareBreakdown.discountMinor ?? 0).toBe(0);
+
+  const booking = await prisma.booking.findUniqueOrThrow({ where: { id: r.bookingId } });
+  expect(booking.totalMinor).toBe(r.cardBaseFareMinor); // full fare, no discount applied
+});
diff --git a/e2e-ui/specs/portal/ua13-forged-total.spec.ts b/e2e-ui/specs/portal/ua13-forged-total.spec.ts
new file mode 100644
index 000000000..3e8b76127
--- /dev/null
+++ b/e2e-ui/specs/portal/ua13-forged-total.spec.ts
@@ -0,0 +1,40 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookOneAdult } from "../../fixtures/booking-flow";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-13 ✅ — client-forged booking total (matrix A1 / ISSUES C-1), guarded through the REAL browser.
+ * We intercept the outgoing POST /bookings and rewrite reviewedTotalMinor (and every per-seat
+ * seatFareMinor) to 1. The server has two trust branches — sum-of-seatFareMinor when all are present,
+ * else reviewedTotalMinor — so the forge targets both. The server must recompute the authoritative
+ * fare and REJECT the mismatched client amount with a 4xx, persisting nothing.
+ */
+test("UA-13: server rejects a client-forged reviewedTotalMinor=1 (C-1)", async ({ page }) => {
+  const r = await bookOneAdult(page, {
+    nationality: "Ethiopian",
+    paymentMethod: "WALLET",
+    tolerateBookingError: true,
+    // Forge both the per-seat fares and the reviewed total → 1.
+    mutateBookingBody: (body) => ({
+      ...body,
+      reviewedTotalMinor: 1,
+      passengers: (body.passengers ?? []).map((p: any) => ({ ...p, seatFareMinor: 1 })),
+    }),
+  });
+
+  // The real fare the engine computed is far above 1…
+  expect(r.cardFareMinor).toBeGreaterThan(1000);
+  // …the browser forced reviewedTotalMinor=1, and the server must REFUSE it with a 4xx.
+  expect(r.reviewedTotalMinor).toBe(1);
+  expect(r.bookingStatus).toBeGreaterThanOrEqual(400);
+  expect(r.bookingStatus).toBeLessThan(500);
+  // No booking id was returned, and no 1-minor booking was persisted.
+  expect(r.bookingId).toBeFalsy();
+  const forged = await prisma.booking.findFirst({ where: { totalMinor: 1 } });
+  expect(forged).toBeNull();
+});
diff --git a/e2e-ui/specs/portal/ua15-telebirr-shortpay.spec.ts b/e2e-ui/specs/portal/ua15-telebirr-shortpay.spec.ts
new file mode 100644
index 000000000..6507ca478
--- /dev/null
+++ b/e2e-ui/specs/portal/ua15-telebirr-shortpay.spec.ts
@@ -0,0 +1,27 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookTrip } from "../../fixtures/booking-flow";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-15 ✅ — forged gateway SHORT-PAY (ISSUES C-4), guarded. A booking with a real fare in the
+ * thousands is settled by a forged payment.succeeded event carrying amountMinor = 1. The server must
+ * compare the settled amount against what the passenger was quoted (the booking's display total) and
+ * REFUSE to confirm a short payment — the booking stays unconfirmed and no ticket is issued.
+ */
+test("UA-15: a short-paid gateway settlement does NOT confirm the booking (C-4)", async ({ page }) => {
+  const r = await bookTrip(page, {
+    paymentMethod: "TELEBIRR",
+    forgeSettlement: { amountMinor: 1 }, // settle for 1 minor against a multi-thousand fare
+  });
+
+  expect(r.cardBaseFareMinor).toBeGreaterThan(1000);
+  expect(r.confirmed).toBe(false); // short-pay must NOT confirm the booking
+
+  const booking = await prisma.booking.findUniqueOrThrow({ where: { id: r.bookingId } });
+  expect(booking.status).not.toBe("CONFIRMED");
+});
diff --git a/e2e-ui/specs/portal/ua16-family-mix.spec.ts b/e2e-ui/specs/portal/ua16-family-mix.spec.ts
new file mode 100644
index 000000000..a0323c342
--- /dev/null
+++ b/e2e-ui/specs/portal/ua16-family-mix.spec.ts
@@ -0,0 +1,27 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookTrip } from "../../fixtures/booking-flow";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-16 — one-way, 2 adults + 3 children under 5, ETB, WALLET (max passenger spread). One free child
+ * per adult → 2 free children, 1 paid. Total = 3 fares (2 adults + 1 paid child); 3 seats booked.
+ * Stresses the free-child reduce + multi-passenger seat assignment through the real browser.
+ */
+test("UA-16: 2 adults + 3 children — two children free, one paid", async ({ page }) => {
+  const r = await bookTrip(page, { adults: 2, children: 3, paymentMethod: "WALLET" });
+  expect(r.confirmed).toBe(true);
+
+  const fare = r.cardBaseFareMinor;
+  expect(r.reviewedTotalMinor).toBe(fare * 3);
+
+  const booking = await prisma.booking.findUniqueOrThrow({ where: { id: r.bookingId } });
+  expect(booking.totalMinor).toBe(fare * 3);
+
+  const seats = await prisma.bookingSeat.findMany({ where: { bookingId: r.bookingId } });
+  expect(seats.length).toBe(3);
+});
diff --git a/e2e-ui/specs/portal/ua1b-usd-divergence.spec.ts b/e2e-ui/specs/portal/ua1b-usd-divergence.spec.ts
new file mode 100644
index 000000000..5441942f6
--- /dev/null
+++ b/e2e-ui/specs/portal/ua1b-usd-divergence.spec.ts
@@ -0,0 +1,31 @@
+import { test, expect } from "@playwright/test";
+import { resultsUrl } from "../../fixtures/data";
+
+/**
+ * UA-1b ✅ — for a non-Ethiopian (USD) search the results card shows the USD-converted
+ * `displayAmountMinor`, and the internal `baseFareMinor` is the ETB source it was converted from
+ * (exactly the USD→ETB rate apart — a correct conversion, not a mislabel). The passenger sees and
+ * carries forward the USD value; the ETB basis is stored honestly on the booking as `currency: ETB`
+ * (proven end-to-end by UA-2). This pins the display layer so a regression that shows the raw ETB
+ * number, or drops the conversion, is caught.
+ */
+test("UA-1b: USD card shows the USD fare, correctly converted from the internal ETB base", async ({ page }) => {
+  const searchDone = page.waitForResponse(
+    (r) => r.url().includes("/search") && r.request().method() === "POST",
+  );
+  await page.goto(resultsUrl({ nationality: "Other" }));
+  const out = (await (await searchDone).json())?.data?.outbound?.[0];
+  const cls = out?.faresByClass?.[0];
+
+  expect(out.displayCurrency).toBe("USD");
+  // The USD display fare is the ETB base converted at the USD→ETB rate (100×), not a parity mislabel.
+  expect(cls.displayAmountMinor).toBeGreaterThan(0);
+  expect(cls.displayAmountMinor).toBeLessThan(cls.baseFareMinor);
+  expect(cls.baseFareMinor).toBe(cls.displayAmountMinor * 100);
+
+  // The DOM shows the USD value the passenger pays (formatFare divides by 100, 2dp) — e.g. "USD 12.50".
+  const usdMajor = (cls.displayAmountMinor / 100).toFixed(2);
+  await expect(page.getByText(new RegExp(`USD\\s*${usdMajor.replace(".", "\\.")}`)).first()).toBeVisible({
+    timeout: 20_000,
+  });
+});
diff --git a/e2e-ui/specs/portal/ua2-usd-booking.spec.ts b/e2e-ui/specs/portal/ua2-usd-booking.spec.ts
new file mode 100644
index 000000000..7e2c83fee
--- /dev/null
+++ b/e2e-ui/specs/portal/ua2-usd-booking.spec.ts
@@ -0,0 +1,37 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookTrip } from "../../fixtures/booking-flow";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-2 ✅ — full one-way USD booking (Other nationality, INTERNATIONAL class, WALLET). The money chain
+ * is now COHERENT: the passenger sees and agrees to a USD amount (displayCurrency/displayTotalMinor),
+ * while the stored charge basis is honestly labeled ETB (currency/totalMinor). The two are the same
+ * fare at the USD→ETB rate — no longer a mislabeled 100× divergence.
+ */
+test("UA-2: USD booking — passenger amount in USD, charge basis stored coherently in ETB", async ({ page }) => {
+  const r = await bookTrip(page, { nationality: "Other", paymentMethod: "WALLET" });
+  expect(r.displayCurrency).toBe("USD");
+  expect(r.confirmed).toBe(true);
+
+  const booking = await prisma.booking.findUniqueOrThrow({ where: { id: r.bookingId } });
+  const intent = await prisma.paymentIntent.findUniqueOrThrow({ where: { bookingId: r.bookingId } });
+
+  // Passenger-facing: the USD amount they saw and agreed to (what the browser reviewed).
+  expect(booking.displayCurrency).toBe("USD");
+  expect(booking.displayTotalMinor).toBe(r.reviewedTotalMinor);
+  expect(r.reviewedTotalMinor).toBe(r.cardDisplayMinor);
+
+  // Stored charge basis: ETB, coherently labeled (no more USD mislabel).
+  expect(booking.currency).toBe("ETB");
+  expect(booking.totalMinor).toBe(r.cardBaseFareMinor); // the ETB fare
+  expect(booking.totalMinor).toBe(r.reviewedTotalMinor * 100); // ETB == USD display × rate
+
+  // The charge/intent moves the ETB amount; booking is confirmed.
+  expect(intent.amountMinor).toBe(booking.totalMinor);
+  expect(booking.status).toBe("CONFIRMED");
+});
diff --git a/e2e-ui/specs/portal/ua3-djf.spec.ts b/e2e-ui/specs/portal/ua3-djf.spec.ts
new file mode 100644
index 000000000..a026cb8fd
--- /dev/null
+++ b/e2e-ui/specs/portal/ua3-djf.spec.ts
@@ -0,0 +1,45 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookTrip } from "../../fixtures/booking-flow";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-3w ✅ — Djiboutian/DJF, WALLET. The money chain is now COHERENT: the passenger sees and agrees
+ * to a DJF amount (displayCurrency/displayTotalMinor), while the stored charge basis is honestly
+ * labeled ETB (currency/totalMinor). Same fare, two correctly-labeled currencies — no mislabel.
+ */
+test("UA-3w: DJF WALLET booking — passenger amount in DJF, charge basis stored coherently in ETB", async ({ page }) => {
+  const r = await bookTrip(page, { nationality: "Djiboutian", paymentMethod: "WALLET" });
+  expect(r.displayCurrency).toBe("DJF");
+  expect(r.confirmed).toBe(true);
+
+  const booking = await prisma.booking.findUniqueOrThrow({ where: { id: r.bookingId } });
+  // Passenger-facing: the DJF amount they saw and agreed to.
+  expect(booking.displayCurrency).toBe("DJF");
+  expect(booking.displayTotalMinor).toBe(r.reviewedTotalMinor);
+  expect(r.reviewedTotalMinor).toBe(r.cardDisplayMinor);
+  // Stored charge basis: ETB, coherently labeled (no more DJF mislabel).
+  expect(booking.currency).toBe("ETB");
+  expect(booking.totalMinor).toBe(r.cardBaseFareMinor);
+  expect(booking.status).toBe("CONFIRMED");
+});
+
+/**
+ * UA-3 — Djiboutian/DJF paid via a forged gateway settlement. The real telebirr gateway is
+ * unreachable in the test env, so (per the matrix's settlement-injection plan) the booking is created
+ * through the real browser flow and settled by forging the payment.succeeded event. Proves the DJF
+ * booking reaches a CONFIRMED, ticketed state through the gateway (non-WALLET) path.
+ */
+test("UA-3: DJF booking settles through a forged gateway payment", async ({ page }) => {
+  const r = await bookTrip(page, { nationality: "Djiboutian", paymentMethod: "TELEBIRR" });
+  expect(r.displayCurrency).toBe("DJF");
+  expect(r.confirmed).toBe(true);
+
+  const booking = await prisma.booking.findUniqueOrThrow({ where: { id: r.bookingId } });
+  expect(booking.displayCurrency).toBe("DJF");
+  expect(booking.status).toBe("CONFIRMED");
+});
diff --git a/e2e-ui/specs/portal/ua4-child-free.spec.ts b/e2e-ui/specs/portal/ua4-child-free.spec.ts
new file mode 100644
index 000000000..522976f2f
--- /dev/null
+++ b/e2e-ui/specs/portal/ua4-child-free.spec.ts
@@ -0,0 +1,27 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookTrip } from "../../fixtures/booking-flow";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-4 — one-way, 1 adult + 1 child under 5, ETB, WALLET. The "first child per adult" policy makes
+ * the child free: the booked total is exactly one adult fare and the free child is not seated.
+ */
+test("UA-4: first child under 5 travels free, total = one adult fare", async ({ page }) => {
+  const r = await bookTrip(page, { adults: 1, children: 1, paymentMethod: "WALLET" });
+  expect(r.confirmed).toBe(true);
+
+  // The child is free → the browser sent one adult fare as the reviewed total.
+  expect(r.reviewedTotalMinor).toBe(r.cardBaseFareMinor);
+
+  const booking = await prisma.booking.findUniqueOrThrow({ where: { id: r.bookingId } });
+  expect(booking.totalMinor).toBe(r.cardBaseFareMinor);
+
+  // The free first-child is filtered out of the booked passengers → only the adult is seated.
+  const seats = await prisma.bookingSeat.findMany({ where: { bookingId: r.bookingId } });
+  expect(seats.length).toBe(1);
+});
diff --git a/e2e-ui/specs/portal/ua5-second-child-paid.spec.ts b/e2e-ui/specs/portal/ua5-second-child-paid.spec.ts
new file mode 100644
index 000000000..dcd77ba66
--- /dev/null
+++ b/e2e-ui/specs/portal/ua5-second-child-paid.spec.ts
@@ -0,0 +1,28 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookTrip } from "../../fixtures/booking-flow";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-5 — one-way, 1 adult + 2 children under 5, ETB, WALLET. One free child per adult: the first
+ * child is free, the second is charged a full adult fare. Total = 2 fares; 2 passengers are seated.
+ */
+test("UA-5: with 1 adult + 2 children, the second child pays full fare", async ({ page }) => {
+  const r = await bookTrip(page, { adults: 1, children: 2, paymentMethod: "WALLET" });
+  expect(r.confirmed).toBe(true);
+
+  const fare = r.cardBaseFareMinor;
+  // adult (paid) + first child (free) + second child (paid) = 2 fares.
+  expect(r.reviewedTotalMinor).toBe(fare * 2);
+
+  const booking = await prisma.booking.findUniqueOrThrow({ where: { id: r.bookingId } });
+  expect(booking.totalMinor).toBe(fare * 2);
+
+  // Only the free first-child is dropped → adult + paid second child are seated.
+  const seats = await prisma.bookingSeat.findMany({ where: { bookingId: r.bookingId } });
+  expect(seats.length).toBe(2);
+});
diff --git a/e2e-ui/specs/portal/ua6-round-trip.spec.ts b/e2e-ui/specs/portal/ua6-round-trip.spec.ts
new file mode 100644
index 000000000..207164c30
--- /dev/null
+++ b/e2e-ui/specs/portal/ua6-round-trip.spec.ts
@@ -0,0 +1,35 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookTrip } from "../../fixtures/booking-flow";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-6 ✅ — round-trip books BOTH legs. The return leg (C→A) traverses the seeded route high→low; the
+ * fare engine now prices the reverse direction by absolute distance (previously it threw "origin must
+ * come before destination" and dropped every class, leaving the inbound leg with seats but no priced
+ * coach — unbookable). The full two-leg wizard now completes: outbound + return seat, and a total of
+ * 2× the one-way fare.
+ */
+test("UA-6: round-trip books both legs — return leg priced, one seat per leg, total = 2× one-way fare", async ({
+  page,
+}) => {
+  const r = await bookTrip(page, { tripType: "ROUND_TRIP", paymentMethod: "WALLET" });
+  expect(r.confirmed).toBe(true);
+
+  const booking = await prisma.booking.findUniqueOrThrow({ where: { id: r.bookingId } });
+  expect(booking.bookingType).toBe("ROUND_TRIP");
+  expect(booking.status).toBe("CONFIRMED");
+
+  // One seat per leg (leg 1 outbound + leg 2 return) for a single passenger.
+  const seats = await prisma.bookingSeat.findMany({ where: { bookingId: r.bookingId } });
+  expect(seats.length).toBe(2);
+  expect(new Set(seats.map((s) => s.leg)).size).toBe(2);
+
+  // Both legs cover the same A↔C distance, so the round-trip total is 2× the one-way base fare (ETB).
+  expect(r.cardBaseFareMinor).toBeGreaterThan(0);
+  expect(booking.totalMinor).toBe(r.cardBaseFareMinor * 2);
+});
diff --git a/e2e-ui/specs/portal/ua7-berth.spec.ts b/e2e-ui/specs/portal/ua7-berth.spec.ts
new file mode 100644
index 000000000..a9c384271
--- /dev/null
+++ b/e2e-ui/specs/portal/ua7-berth.spec.ts
@@ -0,0 +1,17 @@
+import { test } from "@playwright/test";
+
+/**
+ * UA-7 — round trip, berth/bed class, INTERNATIONAL/USD. DEFERRED (documented, not silently omitted).
+ *
+ * A berth booking needs a bed coach type whose seat classes carry a bedPosition the fare engine can
+ * price. The current seed has only regular (bedPosition=null) classes, and UA-6 already shows the
+ * reverse-leg (round-trip) pricing returns empty coach types on this route. Enabling UA-7 requires
+ * two backend/seed prerequisites that are out of scope here:
+ *   1. A bed CoachType + LOCAL/INTL SeatClasses with bedPosition IN (UPPER,MIDDLE,LOWER) + a bed
+ *      Coach with lowercase-bedPosition Seats (matrix §5.4), priced by the fare engine.
+ *   2. Reverse-direction (return-leg) fare resolution, currently unsupported (see UA-6).
+ *
+ * Once both exist, drive: bookTrip with a bed seat class + tripType ROUND_TRIP, asserting the berth
+ * surcharge is applied consistently on both legs.
+ */
+test.skip("UA-7: round-trip berth booking (needs bed coach-type seed + reverse-leg pricing)", () => {});
diff --git a/e2e-ui/specs/portal/ua8-promo-drop.spec.ts b/e2e-ui/specs/portal/ua8-promo-drop.spec.ts
new file mode 100644
index 000000000..c46ab3e7b
--- /dev/null
+++ b/e2e-ui/specs/portal/ua8-promo-drop.spec.ts
@@ -0,0 +1,37 @@
+import { test, expect } from "@playwright/test";
+import { PrismaClient } from "@prisma/client";
+import { bookOneAdult } from "../../fixtures/booking-flow";
+import { PROMO_VALID } from "../../fixtures/data";
+
+const prisma = new PrismaClient();
+test.afterAll(async () => {
+  await prisma.$disconnect();
+});
+
+/**
+ * UA-8 ✅ — a VALID promo is applied server-side even though the browser drops it (H-13). The portal
+ * still sums UNDISCOUNTED per-passenger fares into reviewedTotalMinor, but the server recomputes the
+ * authoritative fare (promo included, via the promoCode it forwards) and books the DISCOUNTED total —
+ * so the customer is charged the promo price, not full price.
+ */
+test("UA-8: valid promo is applied server-side to the booked total (H-13)", async ({ page }) => {
+  const r = await bookOneAdult(page, {
+    nationality: "Ethiopian",
+    paymentMethod: "WALLET",
+    promoCode: PROMO_VALID,
+  });
+
+  const fb = r.fareBreakdown;
+  expect(fb).toBeTruthy();
+
+  // The breakdown recognized the promo and computed a discount…
+  expect(fb.discountMinor).toBeGreaterThan(0);
+  expect(fb.totalMinor).toBeLessThan(fb.subtotalMinor);
+
+  // The browser still sends the UNDISCOUNTED subtotal (the frontend drops the promo)…
+  expect(r.reviewedTotalMinor).toBe(fb.subtotalMinor);
+  // …but the SERVER now applies the promo: the booking is stored at the discounted total.
+  const booking = await prisma.booking.findUniqueOrThrow({ where: { id: r.bookingId } });
+  expect(booking.totalMinor).toBeLessThan(fb.subtotalMinor); // ✅ discount honored
+  expect(booking.totalMinor).toBe(fb.subtotalMinor - fb.discountMinor);
+});
diff --git a/e2e-ui/specs/propagation/pb-config-propagation.spec.ts b/e2e-ui/specs/propagation/pb-config-propagation.spec.ts
new file mode 100644
index 000000000..2e7fb7700
--- /dev/null
+++ b/e2e-ui/specs/propagation/pb-config-propagation.spec.ts
@@ -0,0 +1,200 @@
+import { test, expect, type APIRequestContext, type Page } from "@playwright/test";
+import { API_URL, SEAT_CLASS_LOCAL, STATIONS, resultsUrl, sampleDepartDate, staffToken, passengerToken } from "../../fixtures/data";
+
+/**
+ * Track B — backoffice config → portal propagation. A staff user changes config via the same API the
+ * backoffice calls; the passenger portal is then observed. Each test restores what it changed so the
+ * shared seeded DB stays consistent for other specs.
+ */
+
+/** The "starting from" fare the portal shows for the seeded ETB trip (captured from POST /search). */
+async function portalCardFareMinor(page: Page): Promise<number> {
+  const done = page.waitForResponse(
+    (r) => r.url().includes("/search") && r.request().method() === "POST",
+  );
+  await page.goto(resultsUrl(), { waitUntil: "domcontentloaded" });
+  const body = await (await done).json();
+  return body?.data?.outbound?.[0]?.faresByClass?.[0]?.baseFareMinor;
+}
+
+/** The USD display fare the portal shows for a non-Ethiopian (Other) search. */
+async function portalUsdFare(page: Page): Promise<number> {
+  const done = page.waitForResponse(
+    (r) => r.url().includes("/search") && r.request().method() === "POST",
+  );
+  await page.goto(resultsUrl({ nationality: "Other" }), { waitUntil: "domcontentloaded" });
+  const body = await (await done).json();
+  return body?.data?.outbound?.[0]?.faresByClass?.[0]?.displayAmountMinor;
+}
+
+function authHeader() {
+  return { Authorization: `Bearer ${staffToken()}` };
+}
+
+/** Find a CurrencyExchangeRate row id by its currency pair. */
+async function rateId(request: APIRequestContext, from: string, to: string): Promise<string> {
+  const rows = (await (await request.get(`${API_URL}/currencies`, { headers: authHeader() })).json())?.data ?? [];
+  const row = rows.find((r: any) => r.fromCurrency === from && r.toCurrency === to);
+  if (!row) throw new Error(`no ${from}->${to} currency rate`);
+  return row.id;
+}
+
+test("PB-2: a backoffice seat-class base-price change propagates LIVE to portal search", async ({
+  page,
+  request,
+}) => {
+  const before = await portalCardFareMinor(page);
+  expect(before).toBeGreaterThan(0);
+
+  // Staff doubles the base price via the API the backoffice tariff-rates form uses.
+  const patched = await request.patch(`${API_URL}/seat-classes/${SEAT_CLASS_LOCAL}`, {
+    headers: authHeader(),
+    data: { basePrice: 600 }, // seed-core seeds 300
+  });
+  expect(patched.ok()).toBeTruthy();
+
+  try {
+    const after = await portalCardFareMinor(page);
+    // No server-side config cache → the new price shows on the very next search.
+    expect(after).toBe(before * 2);
+  } finally {
+    await request.patch(`${API_URL}/seat-classes/${SEAT_CLASS_LOCAL}`, {
+      headers: authHeader(),
+      data: { basePrice: 300 },
+    });
+  }
+});
+
+test("BC-11 ✅ a non-admin PASSENGER is forbidden from rewriting exchange rates (C-8)", async ({
+  request,
+}) => {
+  // A global JwtGuard (SharedAuthModule) means anonymous requests get 401 — so this is NOT an
+  // unauthenticated hole. The PUT/PATCH handlers must ALSO carry @PassengerAdmin (as DELETE does) so
+  // a regular authenticated passenger cannot rewrite FX rates.
+  const anon = await request.put(`${API_URL}/fare-engine/exchange-rates`, {
+    data: { fromCurrency: "USD", toCurrency: "ETB", rate: 999 },
+  });
+  expect(anon.status()).toBe(401); // authentication IS required
+
+  const asPassenger = await request.put(`${API_URL}/fare-engine/exchange-rates`, {
+    headers: { Authorization: `Bearer ${passengerToken()}` },
+    data: { fromCurrency: "USD", toCurrency: "ETB", rate: 999, source: "E2E" },
+  });
+  expect(asPassenger.status()).toBe(403); // ✅ a regular passenger is forbidden (admin-only)
+
+  // The PATCH-by-id handler must be equally protected.
+  const patchAsPassenger = await request.patch(`${API_URL}/fare-engine/exchange-rates/${crypto.randomUUID()}`, {
+    headers: { Authorization: `Bearer ${passengerToken()}` },
+    data: { rate: 999 },
+  });
+  expect(patchAsPassenger.status()).toBe(403);
+
+  // A staff admin can still write (proves the endpoint isn't simply broken).
+  const asStaff = await request.put(`${API_URL}/fare-engine/exchange-rates`, {
+    headers: { Authorization: `Bearer ${staffToken()}` },
+    data: { fromCurrency: "USD", toCurrency: "ETB", rate: 100, source: "E2E" },
+  });
+  expect(asStaff.ok()).toBeTruthy();
+});
+
+test("BC-7 ✅ negative seat-class base price is rejected by the live API (M-1)", async ({
+  request,
+}) => {
+  const res = await request.patch(`${API_URL}/seat-classes/${SEAT_CLASS_LOCAL}`, {
+    headers: authHeader(),
+    data: { basePrice: -500 }, // the API must now reject this (DTO @Min(0)), like the backoffice form
+  });
+  expect(res.status()).toBe(400); // ✅ negative fare rejected at the DTO layer
+
+  // The stored fare is unchanged — a valid write still succeeds and returns the seeded 300.
+  const restore = await request.patch(`${API_URL}/seat-classes/${SEAT_CLASS_LOCAL}`, {
+    headers: authHeader(),
+    data: { basePrice: 300 },
+  });
+  expect(restore.ok()).toBeTruthy();
+  expect(((await restore.json())?.data ?? {}).baseFareMinor).toBe(300);
+});
+
+test("PB-2b: base-price field-name — /seat-classes accepts `basePrice` and it drives the fare", async ({
+  request,
+}) => {
+  // Documents which field the live seat-class endpoint reads (basePrice → baseFareMinor). If a future
+  // change renames it, this fails loudly (the tariff-rates vs /fleet/classes split, matrix §7 Q9).
+  const res = await request.patch(`${API_URL}/seat-classes/${SEAT_CLASS_LOCAL}`, {
+    headers: authHeader(),
+    data: { basePrice: 300 }, // no-op value, just asserts the field is accepted
+  });
+  expect(res.ok()).toBeTruthy();
+  const json = await res.json();
+  const updated = json?.data ?? json;
+  expect(updated.baseFareMinor ?? updated.basePrice).toBe(300);
+});
+
+test("PB-1: a backoffice FX-rate change propagates LIVE to portal USD pricing", async ({ page, request }) => {
+  const id = await rateId(request, "USD", "ETB");
+  const before = await portalUsdFare(page);
+  expect(before).toBeGreaterThan(0);
+  try {
+    // Doubling the USD→ETB rate doubles the fare-engine's ETB fare and therefore the USD display fare.
+    const patched = await request.patch(`${API_URL}/currencies/${id}`, { headers: authHeader(), data: { rate: 200 } });
+    expect(patched.ok()).toBeTruthy();
+    const after = await portalUsdFare(page);
+    expect(after).toBe(before * 2); // search has no cache → the new rate shows immediately
+  } finally {
+    await request.patch(`${API_URL}/currencies/${id}`, { headers: authHeader(), data: { rate: 100 } });
+  }
+});
+
+test("PB-4: a station added in the backoffice appears in the portal station list", async ({ request }) => {
+  const code = `E2E${Date.now() % 100000}`;
+  const created = await request.post(`${API_URL}/stations`, {
+    headers: authHeader(),
+    data: { code, name: `E2E Station ${code}`, city: "Testville", countryCode: "ET", sequence: 99, isOperational: true },
+  });
+  expect(created.ok()).toBeTruthy();
+  const id = ((await created.json())?.data ?? {}).id;
+  try {
+    const rows = (await (await request.get(`${API_URL}/stations`)).json())?.data ?? [];
+    expect(rows.some((s: any) => s.code === code)).toBe(true); // portal SearchWidget reads this list
+  } finally {
+    await request.delete(`${API_URL}/stations/${id}?cascade=true`, { headers: authHeader() }).catch(() => {});
+  }
+});
+
+test("PB-10 ✅ deleting an FX rate makes pricing FAIL CLOSED, not a silent 1.0 fallback (M-5/H-2)", async ({ request }) => {
+  const searchBody = {
+    originStationId: STATIONS.A,
+    destinationStationId: STATIONS.C,
+    date: sampleDepartDate(),
+    adultCount: 1,
+    nationality: "OTHER", // USD — the fare engine needs the USD↔ETB rate to price
+  };
+  const usdFaresByClass = async (): Promise<any[]> => {
+    const res = await request.post(`${API_URL}/search`, { headers: authHeader(), data: searchBody });
+    expect(res.ok()).toBeTruthy();
+    return (await res.json())?.data?.outbound?.[0]?.faresByClass ?? [];
+  };
+  // Control: with the USD→ETB rate present, the USD search returns a real priced fare.
+  const before = await usdFaresByClass();
+  expect(before.length).toBeGreaterThan(0);
+  expect(before[0].displayAmountMinor).toBeGreaterThan(0);
+
+  try {
+    // Remove EVERY USD→ETB rate row (an earlier spec may have left a duplicate) so the pair is truly gone.
+    const rows = (await (await request.get(`${API_URL}/currencies`, { headers: authHeader() })).json())?.data ?? [];
+    for (const r of rows.filter((x: any) => x.fromCurrency === "USD" && x.toCurrency === "ETB")) {
+      await request.delete(`${API_URL}/currencies/${r.id}`, { headers: authHeader() });
+    }
+    // With the USD→ETB pair gone, the fare engine must NOT silently substitute rate 1.0 (~100×
+    // underpricing). It fails closed — no priced class is returned for the USD trip, instead of a
+    // bogus parity-priced fare. (A booking attempt would likewise be rejected, not swallowed.)
+    const after = await usdFaresByClass();
+    expect(after.length).toBe(0); // ✅ no silent underpricing — no bogus fare offered
+  } finally {
+    // Restore the pair so later specs price correctly.
+    await request.post(`${API_URL}/currencies`, {
+      headers: authHeader(),
+      data: { fromCurrency: "USD", toCurrency: "ETB", rate: 100 },
+    });
+  }
+});
diff --git a/e2e/README.md b/e2e/README.md
new file mode 100644
index 000000000..7671263ff
--- /dev/null
+++ b/e2e/README.md
@@ -0,0 +1,76 @@
+# EDR Passenger — Pricing/Config E2E Harness
+
+Hermetic, bug-hunting test harness for the passenger platform. Targets **pricing integrity** and
+**backoffice configuration**. Never touches a real database.
+
+## Quick start
+
+```bash
+# 1. Bring up the isolated test Postgres (port 5544) and apply all migrations
+bash e2e/prepare.sh
+#    (or: pnpm --filter @edr/passenger-api test:e2e:prepare)
+
+# 2. Run the suites
+pnpm --filter @edr/passenger-api test:e2e
+
+# 3. Tear down
+pnpm --filter @edr/passenger-api test:e2e:db:down
+```
+
+## What's isolated
+
+- `e2e/docker-compose.yml` — Postgres 17 on host port **5544**, container `edr-passenger-e2e-db`,
+  `tmpfs` data (wiped on `down`). Distinct from any dev/prod DB. Schemas `passenger`, `iam`,
+  `edr_payment` created by `e2e/init/01-schemas.sql`.
+- `apps/edr-passenger-api/.env.test` — points every connection at 5544; brokers/IAM/Fayda OFF.
+  Loaded by `test/setup/load-env.ts` before the app boots.
+
+## Architecture — why two tiers
+
+The full `AppModule` cannot be booted in-process under jest:
+- `@tria-plc/api-common` (pulled via IAM) `require("file-type")`, which is ESM-only → jest's
+  CommonJS resolver fails. (Worked around with a `moduleNameMapper` stub, but…)
+- `@golevelup/nestjs-rabbitmq` + microservice RMQ clients + `onApplicationBootstrap` seeders hang
+  the boot waiting on a broker that isn't there.
+
+So tests use one of two tiers:
+
+**Tier 1 — slim module harness** (`test/setup/slim-app.ts`). Boots ONLY the pricing/config domain
+modules that are free of the IAM/RabbitMQ chain: `fare-engine, currency, currencies, promos,
+seat-classes, stations, schedules, segments, system-config`. Two entry points:
+- `createServiceHarness()` — resolve services (e.g. `FareEngineService`) for direct method calls.
+- `createHttpHarness()` — full HTTP app with the SAME `ValidationPipe` as `src/main.ts`, for
+  controller/DTO/pipe (client-trust, validation) tests over supertest.
+
+**Tier 2 — direct instantiation** (`test/setup/prisma.ts`). For services behind the wall
+(`BookingsService, PaymentsService, WalletService, LoyaltyService, ExcessBaggageService`):
+`new TheService(getTestPrisma(), ...mockedCollaborators)` and assert the money logic. Avoids booting
+the module graph entirely.
+
+## Fixtures
+
+`test/fixtures/seed-core.ts` — deterministic graph (coach type → LOCAL/INTERNATIONAL seat classes →
+3 stations → route with distance-bearing stops → FX rates) with fixed UUIDs in `IDS`. Call
+`resetAndSeedCore(prisma)` in `beforeEach`. The repo's `prisma/seed.ts` is disabled (all steps
+commented out) and is intentionally NOT used.
+
+## Suites (see `docs/e2e-test-matrix.md` for the full matrix)
+
+Spec files are `test/*.e2e-spec.ts`. Each is tagged with the matrix IDs it covers. 🔴 in a test name
+marks a confirmed defect the test documents/reproduces (the assertion encodes the BUGGY behavior;
+a passing 🔴 test = the bug is present).
+
+Current suites (all green):
+- `pricing-fare-engine.e2e-spec.ts` — baseline + D1/D2/D4 (promo → negative total), C1 (FX fallback)
+- `pricing-currency.e2e-spec.ts` — C2/C2b (display↔charge FX divergence), C3 (future rate), C5 (unit divergence)
+- `money-integrity.e2e-spec.ts` — F1/F2 (free wallet top-up), G4/G5 (refund never disbursed), E1/E2 (baggage)
+- `config-validation.e2e-spec.ts` — H1/H2 (negative fares), H4/H5 (promo bounds/date)
+- `auth-gaps.e2e-spec.ts` — J1 (unauthenticated FX writes)
+- `critical-repro.e2e-spec.ts` — C-1 (client-controlled booking total), C-4 (payment amount never
+  validated), C-6 (wallet double-spend via a deterministic race barrier)
+
+`test/app.e2e-spec.ts` is a pre-existing repo test that boots the FULL AppModule; it is excluded via
+`testPathIgnorePatterns` because that boot hangs in-process (RabbitMQ connect + ESM `file-type`) — a
+harness limitation documented above, not a product bug.
+
+Findings are catalogued in `docs/ISSUES.md`.
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
new file mode 100644
index 000000000..8ecd7eef3
--- /dev/null
+++ b/e2e/docker-compose.yml
@@ -0,0 +1,41 @@
+# Hermetic test database for the EDR passenger E2E harness.
+# Isolated from any dev/prod Postgres: distinct container name + non-standard host port (5544).
+# Single database `edr_database` with schemas `passenger`, `iam`, `edr_payment` (see init/01-schemas.sql).
+services:
+  postgres-e2e:
+    image: postgres:17
+    container_name: edr-passenger-e2e-db
+    environment:
+      POSTGRES_USER: edr
+      POSTGRES_PASSWORD: edr_secret
+      POSTGRES_DB: edr_database
+    ports:
+      - "5544:5432"
+    volumes:
+      - ./init:/docker-entrypoint-initdb.d:ro
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U edr -d edr_database"]
+      interval: 3s
+      timeout: 3s
+      retries: 20
+    tmpfs:
+      # Ephemeral storage — every `docker compose down` wipes the DB. Nothing to clean up.
+      - /var/lib/postgresql/data
+
+  # Broker for the passenger-api payment-events consumer (golevelup RabbitMQ). The API blocks boot
+  # until this connects. Pre-creates the `payment` vhost that PAYMENT_RABBITMQ_URL points at.
+  rabbitmq-e2e:
+    image: rabbitmq:3-management
+    container_name: edr-passenger-e2e-rmq
+    environment:
+      RABBITMQ_DEFAULT_USER: edr
+      RABBITMQ_DEFAULT_PASS: edr_secret
+      RABBITMQ_DEFAULT_VHOST: payment
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    healthcheck:
+      test: ["CMD", "rabbitmq-diagnostics", "-q", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 20
diff --git a/e2e/freight/README.md b/e2e/freight/README.md
new file mode 100644
index 000000000..75b877b84
--- /dev/null
+++ b/e2e/freight/README.md
@@ -0,0 +1,108 @@
+# @edr/freight-e2e — Cypress e2e suite for the freight system
+
+Containerized, fully isolated e2e environment: throwaway Postgres (tmpfs),
+MinIO, freight-api, portal, and backoffice — plus a Cypress runner that works
+both headless-in-Docker and interactively from the host against the same URLs.
+
+## Stack (`docker-compose.e2e.yaml`, project name `edr-freight-e2e`)
+
+| Service                 | Default port | Notes                                          |
+| ----------------------- | ------------ | ---------------------------------------------- |
+| `freight-api-e2e`       | 3101         | migrations + seeders run at boot               |
+| `freight-portal-e2e`    | 5373         | nginx static build, API URL baked at build     |
+| `freight-backoffice-e2e`| 5383         | nginx static build, API URL baked at build     |
+| `postgres-freight-e2e`  | 5533         | `edr_freight_e2e`, tmpfs — gone on `down`      |
+| `minio-e2e`             | 9310/9311    | object storage for file features               |
+| `cypress`               | (host net)   | profile `cypress`, headless chrome             |
+
+Ports are env-parameterized (`E2E_API_PORT`, `E2E_PORTAL_PORT`,
+`E2E_BACKOFFICE_PORT`, `E2E_DB_PORT`, `E2E_MINIO_PORT`,
+`E2E_MINIO_CONSOLE_PORT`). Defaults avoid the dev stacks; if a default is
+busy anyway, the launcher scans upward for a free port, remembers the choice
+in `.e2e-ports.json` (gitignored) while the stack is up, and passes matching
+URLs to both compose and Cypress. The dev database is never touched.
+
+## Usage (from repo root)
+
+One command — the launcher (`scripts/e2e.mjs`) auto-builds and starts the
+stack if it isn't running, waits for healthchecks, then runs Cypress against
+whatever ports were picked:
+
+```bash
+pnpm e2e:freight:run     # headless run from the host (auto-up)
+pnpm e2e:freight:open    # interactive Cypress on the host (auto-up)
+pnpm e2e:freight:ci      # headless run inside the cypress container (auto-up)
+pnpm e2e:freight:up      # just start the stack
+pnpm e2e:freight:down    # teardown, drop all data + forget ports
+pnpm e2e:freight:run --spec 'cypress/e2e/flows/**'   # extra args → cypress
+```
+
+First `up` is slow (image builds + 240 migrations + seeders — healthcheck
+allows 3 min). Later runs against a live stack skip docker entirely. Requires
+the same root `.npmrc` (GitHub Packages auth for `@tria-plc`) as the main
+compose file. Note: a non-default API port forces a web-image rebuild (the
+API URL is baked into the static builds).
+
+The `cypress` service uses `network_mode: host` (Linux). On macOS/Windows run
+Cypress from the host (`e2e:freight:open` / `e2e:freight:run`) instead of the
+container.
+
+## Test users
+
+Inserted by Cypress itself — a global `before()` hook runs
+`cy.task("db:seedUsers")`, which executes `cypress/fixtures/seed-users.sql`
+then `cypress/fixtures/seed-company.sql` (idempotent, pre-hashed argon2
+passwords) against the e2e database. No API code is involved; the app's user
+seeders stay disabled. The API's always-on boot seeders must have run first
+(org/unit/positions) — guaranteed once `freight-api-e2e` is healthy.
+
+- Staff (backoffice): `linestaff|chief|director|ceo|marketer|operation|gl-et|gl-dj@edr.local`
+  — password `password@tria`
+- Customers (portal): `user@gmail.com`, `user2@gmail.com`
+  — password `12345678`
+
+`seed-company.sql` additionally gives `user@gmail.com` an ACTIVE company
+("E2E Logistics PLC", TIN `0102030405`) with an approved importer profile —
+the contract wizard's precondition — and grants `chief` the
+`edr_freight_app:admin` permission (customer-profile approval is
+FreightAdmin-guarded and no seeded position carries it otherwise).
+
+Full map in `cypress/fixtures/users.json`.
+
+## Conventions
+
+- **Programmatic login** everywhere except the two dedicated UI-login specs:
+  `cy.loginBackoffice(email?)` / `cy.loginPortal(email?)` — `cy.session`-cached
+  (across specs), `POST /api/auth/login`, sets the `auth-token` /
+  `refresh-token` cookies the apps read.
+- **Origins**: `baseUrl` is the backoffice (5383). Portal specs `cy.visit`
+  the absolute portal URL; a test that touches *both* apps wraps portal steps
+  in `cy.origin()` (different port = different origin). Cookies ignore ports —
+  always call the matching login command right before switching apps so
+  `cy.session` restores the right cookie snapshot.
+- **DB access**: `cy.task("db:query", { sql, params })` runs SQL against the
+  e2e database (`E2E_DB_URL`, default `localhost:5533`). Use for seeding
+  edge-case data and asserting side effects — it can never reach the dev DB.
+- **OTPs**: SMS/email delivery is disabled in e2e, but codes are still stored
+  in `freight.otp_verifications` — `cy.getOtp(emailOrPhone)` polls them out.
+  Used by signup verification and contract customer-signing.
+- **Spec layout**:
+  - `cypress/e2e/api/` — API contract via `cy.request` (no browser)
+  - `cypress/e2e/backoffice/` — staff app
+  - `cypress/e2e/portal/` — customer app
+  - `cypress/e2e/flows/` — cross-app journeys (both directions):
+    - `onboarding.cy.ts` — signup → OTP → wizard (docs + license upload) →
+      backoffice approval → customer can contract
+    - `contract-lifecycle.cy.ts` — wizard → submit → accept → 2-step approval
+      → PDF → customer OTP-sign → staff counter-sign → `CONTRACT_ACTIVE`
+- **Journey specs** (`flows/onboarding`, `flows/contract-lifecycle`) run with
+  `retries: 0` and resolve mid-journey state (user, company, contract) from
+  the DB at the start of each test: switching origin between tests reloads
+  the spec bundle, so module-level variables do NOT survive across tests.
+
+## Extending
+
+Deep module flows (booking wizard → staff approval → scheduling → billing)
+belong in `flows/`. Pattern: arrange via API/`db:query`, act through the UI of
+one app, assert through the UI of the other + a `db:query` cross-check. Prefer
+adding `data-testid` attributes to app code over brittle text selectors.
diff --git a/e2e/freight/cypress.config.ts b/e2e/freight/cypress.config.ts
new file mode 100644
index 000000000..7e659649d
--- /dev/null
+++ b/e2e/freight/cypress.config.ts
@@ -0,0 +1,145 @@
+import { defineConfig } from "cypress";
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { Client } from "pg";
+
+/**
+ * Freight e2e suite. Three origins:
+ *   backoffice  http://localhost:5383  (baseUrl — most specs live here)
+ *   portal      http://localhost:5373  (env.portalUrl; portal specs cy.visit it,
+ *                                       cross-app flows reach it via cy.origin)
+ *   api         http://localhost:3101  (env.apiUrl; cy.request only)
+ *
+ * All URLs are host-published ports from docker-compose.e2e.yaml. The cypress
+ * container in that compose file runs with network_mode: host, so the same
+ * localhost URLs work identically for `cypress open` on the host and for the
+ * containerized headless run.
+ */
+export default defineConfig({
+  e2e: {
+    baseUrl: process.env.CYPRESS_BASE_URL ?? "http://localhost:5383",
+    specPattern: "cypress/e2e/**/*.cy.ts",
+    supportFile: "cypress/support/e2e.ts",
+    video: process.env.CI === "true" || process.env.CYPRESS_VIDEO === "true",
+    screenshotOnRunFailure: true,
+    viewportWidth: 1440,
+    viewportHeight: 900,
+    defaultCommandTimeout: 10000,
+    requestTimeout: 15000,
+    retries: { runMode: 1, openMode: 0 },
+    env: {
+      apiUrl: process.env.CYPRESS_API_URL ?? "http://localhost:3101",
+      portalUrl: process.env.CYPRESS_PORTAL_URL ?? "http://localhost:5373",
+      backofficeUrl: process.env.CYPRESS_BASE_URL ?? "http://localhost:5383",
+      // Staff users: DEFAULT_PASSWORD from docker-compose.e2e.yaml.
+      defaultPassword: process.env.CYPRESS_DEFAULT_PASSWORD ?? "password@tria",
+      // Demo portal users: hardcoded in DemoUsersSeeder.
+      demoPassword: "12345678",
+    },
+    setupNodeEvents(on) {
+      const dbUrl =
+        process.env.E2E_DB_URL ??
+        "postgres://edr_e2e:edr_e2e@localhost:5533/edr_freight_e2e";
+
+      on("task", {
+        /** Run an arbitrary SQL statement against the ephemeral e2e database. */
+        async "db:query"({ sql, params = [] }: { sql: string; params?: unknown[] }) {
+          const client = new Client({ connectionString: dbUrl });
+          await client.connect();
+          try {
+            const result = await client.query(sql, params as never[]);
+            return { rowCount: result.rowCount, rows: result.rows };
+          } finally {
+            await client.end();
+          }
+        },
+
+        /**
+         * Seed the test users (staff + demo) directly in SQL. The API's
+         * user seeders are disabled in app code, so the fixture replicates
+         * their output. Idempotent — safe to run before every spec file.
+         */
+        /** Apply one idempotent SQL fixture from cypress/fixtures (arrange-data). */
+        async "db:seedFile"(file: string) {
+          const client = new Client({ connectionString: dbUrl });
+          await client.connect();
+          try {
+            const sql = readFileSync(
+              join(process.cwd(), "cypress", "fixtures", file),
+              "utf8",
+            );
+            await client.query(sql);
+            return true;
+          } finally {
+            await client.end();
+          }
+        },
+
+        /**
+         * Node-side multipart POST — cy.request cannot stream FormData files,
+         * and driving every GL upload modal through the UI is out of scope for
+         * the scheduling-engine specs. Uses Node 18+ global fetch/FormData.
+         */
+        async "api:upload"({
+          url,
+          token,
+          fields = {},
+          files = [],
+        }: {
+          url: string;
+          token: string;
+          fields?: Record<string, string>;
+          files?: Array<{
+            field: string;
+            fixture: string;
+            filename?: string;
+            contentType?: string;
+          }>;
+        }) {
+          const form = new FormData();
+          for (const [key, value] of Object.entries(fields)) form.append(key, value);
+          for (const f of files) {
+            const buf = readFileSync(join(process.cwd(), "cypress", "fixtures", f.fixture));
+            form.append(
+              f.field,
+              new Blob([buf], { type: f.contentType ?? "application/pdf" }),
+              f.filename ?? "document.pdf",
+            );
+          }
+          const res = await fetch(url, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${token}` },
+            body: form,
+          });
+          const text = await res.text();
+          let body: unknown = text;
+          try {
+            body = JSON.parse(text);
+          } catch {
+            // non-JSON body (rare) — return as text
+          }
+          return { status: res.status, body };
+        },
+
+        async "db:seedUsers"() {
+          // cwd = the e2e/freight project root when Cypress runs.
+          // seed-company.sql depends on rows from seed-users.sql — keep order.
+          const client = new Client({ connectionString: dbUrl });
+          await client.connect();
+          try {
+            for (const file of ["seed-users.sql", "seed-company.sql"]) {
+              const sql = readFileSync(
+                join(process.cwd(), "cypress", "fixtures", file),
+                "utf8",
+              );
+              await client.query(sql);
+            }
+            return true;
+          } finally {
+            await client.end();
+          }
+        },
+      });
+    },
+  },
+});
diff --git a/e2e/freight/cypress/e2e/api/health-and-auth.cy.ts b/e2e/freight/cypress/e2e/api/health-and-auth.cy.ts
new file mode 100644
index 000000000..c183a11df
--- /dev/null
+++ b/e2e/freight/cypress/e2e/api/health-and-auth.cy.ts
@@ -0,0 +1,79 @@
+/**
+ * API contract smoke — no browser, pure cy.request against freight-api.
+ * Verifies the containerized stack booted: migrations ran, seeders ran,
+ * auth issues tokens.
+ */
+const api = () => Cypress.env("apiUrl") as string;
+
+describe("freight-api: health + auth contract", () => {
+  it("GET /api/health responds", () => {
+    cy.request(`${api()}/api/health`).its("status").should("eq", 200);
+  });
+
+  it("rejects bad credentials", () => {
+    cy.request({
+      method: "POST",
+      url: `${api()}/api/auth/login`,
+      body: { email: "nobody@edr.local", password: "wrong-password" },
+      failOnStatusCode: false,
+    })
+      .its("status")
+      .should("be.oneOf", [400, 401, 404]);
+  });
+
+  it("logs in every seeded staff user", () => {
+    cy.fixture("users.json").then((users) => {
+      Object.values<{ email: string }>(users.staff).forEach(({ email }) => {
+        cy.apiLogin(email);
+      });
+    });
+  });
+
+  it("staff token can read /api/me", () => {
+    cy.apiLogin("ceo@edr.local").then(({ token }) => {
+      cy.request({
+        url: `${api()}/api/me`,
+        headers: { Authorization: `Bearer ${token}` },
+      }).then((response) => {
+        expect(response.status).to.eq(200);
+      });
+    });
+  });
+
+  it("refresh-token rotates the session", () => {
+    cy.apiLogin("chief@edr.local").then(({ refreshToken }) => {
+      cy.request("POST", `${api()}/api/auth/refresh-token`, { refreshToken })
+        .its("body.token")
+        .should("be.a", "string");
+    });
+  });
+
+  it("demo portal users are seeded", () => {
+    // DemoUsersSeeder hardcodes this password (staff users use DEFAULT_PASSWORD)
+    cy.apiLogin("user@gmail.com", Cypress.env("demoPassword"));
+    cy.apiLogin("user2@gmail.com", Cypress.env("demoPassword"));
+  });
+});
+
+describe("freight-api: seeded database", () => {
+  it("migrations table is populated", () => {
+    cy.task<{ rowCount: number }>("db:query", {
+      sql: "select count(*)::int as count from migrations",
+    }).then(({ rows }: any) => {
+      expect(rows[0].count).to.be.greaterThan(100);
+    });
+  });
+
+  it("staff users exist with credentials", () => {
+    cy.task("db:query", {
+      sql: `select u.email from iam.users u
+            join iam.user_credentials c on c.user_id = u.id
+            where u.email like '%@edr.local' order by u.email`,
+    }).then(({ rows }: any) => {
+      const emails = rows.map((row: { email: string }) => row.email);
+      expect(emails).to.include.members(["ceo@edr.local", "linestaff@edr.local"]);
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/backoffice/login.cy.ts b/e2e/freight/cypress/e2e/backoffice/login.cy.ts
new file mode 100644
index 000000000..0a729bdae
--- /dev/null
+++ b/e2e/freight/cypress/e2e/backoffice/login.cy.ts
@@ -0,0 +1,41 @@
+/**
+ * The one UI-driven login spec for backoffice — every other spec uses the
+ * programmatic cy.loginBackoffice() session.
+ * Login form: apps/edr-freight-web/backoffice/src/pages/auth/LoginPage.tsx
+ * (Mantine inputs, matched by placeholder).
+ */
+describe("backoffice: UI login", () => {
+  it("redirects unauthenticated users to /auth", () => {
+    cy.clearCookies();
+    cy.visit("/dashboard/overview");
+    cy.location("pathname").should("eq", "/auth");
+  });
+
+  it("logs in via the form and lands on the dashboard", () => {
+    cy.clearCookies();
+    cy.visit("/auth");
+    cy.get('input[placeholder="name@company.com or 09XXXXXXXX"]').type("ceo@edr.local");
+    cy.get('input[placeholder="Enter your password"]').type(
+      Cypress.env("defaultPassword"),
+      { log: false },
+    );
+    cy.get('button[type="submit"]').click();
+
+    cy.location("pathname", { timeout: 20000 }).should("match", /^\/dashboard/);
+    cy.getCookie("auth-token").should("exist");
+    cy.getCookie("refresh-token").should("exist");
+  });
+
+  it("shows an error for wrong credentials and stays on /auth", () => {
+    cy.clearCookies();
+    cy.visit("/auth");
+    cy.get('input[placeholder="name@company.com or 09XXXXXXXX"]').type("ceo@edr.local");
+    cy.get('input[placeholder="Enter your password"]').type("definitely-wrong");
+    cy.get('button[type="submit"]').click();
+
+    cy.location("pathname").should("eq", "/auth");
+    cy.getCookie("auth-token").should("not.exist");
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/backoffice/smoke.cy.ts b/e2e/freight/cypress/e2e/backoffice/smoke.cy.ts
new file mode 100644
index 000000000..db3086e71
--- /dev/null
+++ b/e2e/freight/cypress/e2e/backoffice/smoke.cy.ts
@@ -0,0 +1,49 @@
+/**
+ * Route-level smoke over the backoffice shell: each key module page loads
+ * without bouncing back to /auth and without an unhandled crash. Deep
+ * per-module behavior belongs in dedicated specs — this catches the broad
+ * "page is broken / route is dead / guard rejects seeded role" class.
+ * Routes from apps/edr-freight-web/backoffice/src/App.tsx.
+ */
+const ROUTES = [
+  "/dashboard/overview",
+  "/dashboard/booking-requests",
+  "/dashboard/customers",
+  "/dashboard/invoices",
+  "/dashboard/contract-requests",
+  "/dashboard/shipment-requests",
+  "/dashboard/profile",
+];
+
+describe("backoffice: route smoke (ceo)", () => {
+  beforeEach(() => {
+    cy.loginBackoffice("ceo@edr.local");
+  });
+
+  ROUTES.forEach((route) => {
+    it(`renders ${route}`, () => {
+      cy.visit(route);
+      cy.location("pathname").should("not.eq", "/auth");
+      cy.location("pathname").should("contain", "/dashboard");
+      cy.get("#root").should("not.be.empty");
+    });
+  });
+});
+
+describe("backoffice: role-based access", () => {
+  it("line staff can reach the dashboard shell", () => {
+    cy.loginBackoffice("linestaff@edr.local");
+    cy.visit("/dashboard/overview");
+    cy.location("pathname").should("not.eq", "/auth");
+    cy.get("#root").should("not.be.empty");
+  });
+
+  it("operations officer can reach the dashboard shell", () => {
+    cy.loginBackoffice("operation@edr.local");
+    cy.visit("/dashboard/overview");
+    cy.location("pathname").should("not.eq", "/auth");
+    cy.get("#root").should("not.be.empty");
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/bulk_critical_matrix.cy.ts b/e2e/freight/cypress/e2e/flows/bulk_critical_matrix.cy.ts
new file mode 100644
index 000000000..25213bcfb
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/bulk_critical_matrix.cy.ts
@@ -0,0 +1,215 @@
+/**
+ * BULK IMPORT critical-scenario matrix — bulk-specific corridor edge cases:
+ *
+ *   1. gate: a wheat booking on a day with no open window is rejected
+ *   2. sub-corridor bulk (NAGAD → MOJO, 700 T) rides the through-train next
+ *      to a DJIB_PORT → KALITY 1 400 T booking — corridor-aware batch
+ *   3. bulk intercity ride-along (MOJO → KALITY, DOMESTIC, 140 T): dateless
+ *      booking, staff accept onto the import train's free leg, pay window
+ *      opens, paid + linked
+ *   4. WHOLE-TRAIN giant: a 4 000 T booking (58 wagons worth) alone on a
+ *      54-wagon train → partial offer of the FULL consist (3 780 T), gateway
+ *      settle applies the split, the train is FULL from ONE booking, and the
+ *      220 T outstanding must be rebooked EXACTLY on a later train.
+ *
+ * Sequential steps — retries off.
+ */
+
+import {
+  acceptOperation,
+  apiPost,
+  bookBulk,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  forceWindowOpen,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  settleViaGateway,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(15);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+const GIANT_DEPARTURE = departureAt(16);
+const GIANT_DAY = eatDayStr(GIANT_DEPARTURE);
+const REMAINDER_DEPARTURE = departureAt(17);
+const REMAINDER_DAY = eatDayStr(REMAINDER_DEPARTURE);
+const NO_WINDOW_DAY = eatDayStr(departureAt(19)); // no schedule exists there
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+describe("bulk critical matrix: gates, sub-corridor, bulk intercity, whole-train giant", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    seedImportContract({ suffix: "BM1", reference: stampedRef("BM1"), freight: "BULK" });
+    seedImportContract({
+      suffix: "BMSUB",
+      reference: stampedRef("BMSUB"),
+      freight: "BULK",
+      originCode: "NAGAD",
+      destCode: "MOJO",
+    });
+    seedImportContract({
+      suffix: "BMIC",
+      reference: stampedRef("BMIC"),
+      freight: "BULK",
+      direction: "DOMESTIC",
+      originCode: "MOJO",
+      destCode: "KALITY",
+    });
+    seedImportContract({ suffix: "BMG", reference: stampedRef("BMG"), freight: "BULK" });
+  });
+
+  it("operations prepares the corridor and the D+15 bulk train with an open window", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    resetCorridorDay(GIANT_DEPARTURE);
+    resetCorridorDay(REMAINDER_DEPARTURE);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-IMP-25", "LOCO-IMP-26"],
+      kind: "bulk",
+    });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+  });
+
+  it("gate: a wheat booking on a day with no open window is rejected", () => {
+    bookBulk({
+      suffix: "BM1",
+      tons: 140,
+      scheduledDate: NO_WINDOW_DAY,
+      expectFailure: "booking window",
+    });
+  });
+
+  it("a through-corridor 1 400 T booking and a NAGAD→MOJO 700 T booking share the train", () => {
+    bookBulk({ suffix: "BM1", tons: 1400, scheduledDate: BOOKING_DAY });
+    acceptOperation("BM1");
+    bookBulk({ suffix: "BMSUB", tons: 700, scheduledDate: BOOKING_DAY });
+    acceptOperation("BMSUB");
+
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    ["BM1", "BMSUB"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    markPaid("BM1");
+    pollAllocations("BM1", 20);
+    markPaid("BMSUB");
+    pollAllocations("BMSUB", 10);
+
+    withSchedule(DEPARTURE, (s) => {
+      withBooking("BM1", (b) => expect(b.train_schedule_id).to.eq(s.id));
+      withBooking("BMSUB", (b) => expect(b.train_schedule_id).to.eq(s.id));
+    });
+  });
+
+  it("bulk intercity ride-along: dateless DOMESTIC wheat accepted onto the import train's free leg", () => {
+    bookBulk({ suffix: "BMIC", tons: 140 }); // 2 wagons MOJO → KALITY, dateless
+    acceptOperation("BMIC");
+
+    withSchedule(DEPARTURE, (s) => {
+      withBooking("BMIC", (b) => {
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${s.id}/intercity/accept`, {
+          bookingIds: [b.id],
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+    });
+    pollBookingStatus("BMIC", ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]);
+    withBooking("BMIC", (b) => {
+      expect(b.payment_deadline, "ride-along pay window opened").to.be.a("string");
+    });
+    markPaid("BMIC");
+    withSchedule(DEPARTURE, (s) => {
+      withBooking("BMIC", (b) => {
+        expect(b.train_schedule_id, "linked to the import train").to.eq(s.id);
+        db<{ n: string }>(
+          `SELECT count(*) AS n FROM freight.train_schedule_bookings
+           WHERE booking_id = $1 AND train_schedule_id = $2 AND deleted_at IS NULL`,
+          [b.id, s.id],
+        ).then(({ rows }) => expect(Number(rows[0].n), "link row").to.eq(1));
+      });
+    });
+  });
+
+  it("whole-train giant: 4 000 T alone gets a FULL-consist partial offer (3 780 T) and fills the train", () => {
+    createImportSchedule({
+      departure: GIANT_DEPARTURE,
+      locoPair: ["LOCO-IMP-27", "LOCO-IMP-28"],
+      kind: "bulk",
+    });
+    withSchedule(GIANT_DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+
+    bookBulk({ suffix: "BMG", tons: 4000, scheduledDate: GIANT_DAY });
+    acceptOperation("BMG");
+    withSchedule(GIANT_DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    pollBookingStatus("BMG", ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]);
+    withBooking("BMG", (b) => {
+      pollDb<{ status: string }>(
+        "BMG open partial offer",
+        `SELECT status FROM freight.booking_batch_offers
+         WHERE booking_id = $1 AND deleted_at IS NULL
+         ORDER BY created_at DESC LIMIT 1`,
+        [b.id],
+        (row) => row?.status === "OFFERED",
+        10,
+      );
+    });
+
+    settleViaGateway("BMG");
+    pollAllocations("BMG", 54);
+    withBooking("BMG", (b) => {
+      expect(b.is_split, "BMG is split").to.eq(true);
+    });
+    withSchedule(GIANT_DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      pollDb<ScheduleRow>(
+        "giant train FULL + DONE from one booking",
+        `SELECT window_phase, booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL" && row?.window_phase === "DONE",
+      );
+    });
+  });
+
+  it("the giant's 220 T outstanding must be rebooked EXACTLY on a later train", () => {
+    createImportSchedule({
+      departure: REMAINDER_DEPARTURE,
+      locoPair: ["LOCO-IMP-13", "LOCO-IMP-14"],
+      kind: "bulk",
+    });
+    withSchedule(REMAINDER_DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+
+    bookBulk({
+      suffix: "BMG",
+      tons: 100,
+      scheduledDate: REMAINDER_DAY,
+      expectFailure: "must take the whole",
+    });
+    bookBulk({ suffix: "BMG", tons: 220, scheduledDate: REMAINDER_DAY });
+    pollBookingStatus("BMG", "OPERATION_REQUEST_PENDING", 5);
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/bulk_export_fcfs_space.cy.ts b/e2e/freight/cypress/e2e/flows/bulk_export_fcfs_space.cy.ts
new file mode 100644
index 000000000..878b862e9
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/bulk_export_fcfs_space.cy.ts
@@ -0,0 +1,171 @@
+/**
+ * BULK EXPORT — FCFS capacity truth (mirror of export_fcfs_space):
+ *
+ *   D+9:  three wheat bookings (1 400 + 1 400 + 980 T = 54 wagons) accept
+ *   first and hold the train before any payment; three late 700 T exporters
+ *   are REJECTED AT SUBMISSION by the whole-train space gate. The three pay
+ *   → FULL.
+ *
+ *   D+10: the whole-or-nothing giant — 4 060 T (58 wagons) rejected against
+ *   the empty train; rebooked at exactly 3 780 T (54 wagons) it reserves the
+ *   whole consist alone, pays, allocates 54/54 → FULL; a 70 T afterthought
+ *   bounces.
+ *
+ * Sequential steps — retries off.
+ */
+
+import {
+  acceptExport,
+  bookBulk,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  ensureExportRoute,
+  EXP_DEST,
+  EXP_ORIGIN,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withExportSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(9);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+const GIANT_DEPARTURE = departureAt(10);
+const GIANT_DAY = eatDayStr(GIANT_DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const FIRST = [
+  { suffix: "YA", tons: 1400, wagons: 20 },
+  { suffix: "YB", tons: 1400, wagons: 20 },
+  { suffix: "YC", tons: 980, wagons: 14 },
+];
+const LATE = ["YL1", "YL2", "YL3"];
+
+function seedBulkExport(suffix: string) {
+  seedImportContract({
+    suffix,
+    reference: stampedRef(suffix),
+    freight: "BULK",
+    direction: "EXPORT",
+    originCode: EXP_ORIGIN,
+    destCode: EXP_DEST,
+  });
+}
+
+describe("bulk export FCFS: reservations hold capacity, whole-or-nothing gate", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    [...FIRST.map((b) => b.suffix), ...LATE, "YG", "YS"].forEach(seedBulkExport);
+  });
+
+  it("operations prepares the export corridor and the D+9 CW4 train with an open window", () => {
+    ensureExportRoute();
+    resetCorridorDay(DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    resetCorridorDay(GIANT_DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-EXP-3", "LOCO-EXP-4"],
+      kind: "bulk",
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+  });
+
+  it("three exporters book wheat and are accepted — 54 wagons reserved BEFORE any payment", () => {
+    FIRST.forEach((b) => {
+      bookBulk({ suffix: b.suffix, tons: b.tons, scheduledDate: BOOKING_DAY });
+      acceptExport(b.suffix);
+    });
+  });
+
+  it("three late exporters are rejected at submission — the space gate reports no room", () => {
+    LATE.forEach((suffix) => {
+      bookBulk({
+        suffix,
+        tons: 700,
+        scheduledDate: BOOKING_DAY,
+        expectFailure: /space|window/i,
+      });
+    });
+  });
+
+  it("the three reserved pay — 54/54 allocated and the export window flips FULL", () => {
+    FIRST.forEach((b) => {
+      markPaid(b.suffix);
+      pollAllocations(b.suffix, b.wagons);
+    });
+    withExportSchedule(DEPARTURE, (s) => {
+      pollDb<ScheduleRow>(
+        "export window FULL",
+        `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL",
+      );
+    });
+  });
+
+  it("whole-or-nothing: a 4 060 T giant is rejected against the empty D+10 train", () => {
+    createImportSchedule({
+      departure: GIANT_DEPARTURE,
+      locoPair: ["LOCO-EXP-5", "LOCO-EXP-6"],
+      kind: "bulk",
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(GIANT_DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+
+    bookBulk({
+      suffix: "YG",
+      tons: 4060, // 58 wagons > 54 — export never splits
+      scheduledDate: GIANT_DAY,
+      expectFailure: /space|window/i,
+    });
+  });
+
+  it("rebooked at exactly 3 780 T the giant reserves the whole train alone, pays, fills it", () => {
+    bookBulk({ suffix: "YG", tons: 3780, scheduledDate: GIANT_DAY });
+    acceptExport("YG");
+    markPaid("YG");
+    pollAllocations("YG", 54);
+    withExportSchedule(GIANT_DEPARTURE, (s) => {
+      pollDb<ScheduleRow>(
+        "giant train FULL from one booking",
+        `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL",
+      );
+      withBooking("YG", (b) => {
+        expect(b.train_schedule_id, "giant rides its train").to.eq(s.id);
+      });
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [s.id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+    });
+  });
+
+  it("a 70 T afterthought bounces off the FULL train", () => {
+    bookBulk({
+      suffix: "YS",
+      tons: 70,
+      scheduledDate: GIANT_DAY,
+      expectFailure: /space|window/i,
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/bulk_export_full_train.cy.ts b/e2e/freight/cypress/e2e/flows/bulk_export_full_train.cy.ts
new file mode 100644
index 000000000..bb8e30b55
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/bulk_export_full_train.cy.ts
@@ -0,0 +1,251 @@
+/**
+ * BULK EXPORT journey — six wheat bookings fill the 54-wagon CW4 train on the
+ * reversed corridor KALITY → MOJO → E2E_AWASH → DIRE_DAWA → NAGAD →
+ * DJIB_PORT, all inside the ONE FCFS export window, then the full life of the
+ * train to Djibouti Port and the export customs tail.
+ *
+ * The six bookings (70 T per CW4 wagon — Σ = 54 wagons / 3 780 T):
+ *   XBF1  customs + USD    560 T =  8 wagons
+ *   XBF2  customs + ETB    420 T =  6 wagons
+ *   XBF3  self    + ETB    420 T =  6 wagons
+ *   XBF4  self    + ETB    420 T =  6 wagons
+ *   XBF5  customs + USD  1 540 T = 22 wagons  (the ≥22-wagon giant)
+ *   XBF6  self    + USD    420 T =  6 wagons
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  acceptExport,
+  apiPost,
+  bookBulk,
+  completeBookingMilestone,
+  createImportSchedule,
+  db,
+  dbBooking,
+  departureAt,
+  eatDayStr,
+  ensureExportRoute,
+  EXP_DEST,
+  EXP_ORIGIN,
+  expectMilestoneDone,
+  forceWindowOpen,
+  glUpload,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withExportSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(8);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const BOOKINGS: Array<{
+  suffix: string;
+  customs: boolean;
+  currency: "ETB" | "USD";
+  tons: number;
+  wagons: number;
+}> = [
+  { suffix: "XBF1", customs: true, currency: "USD", tons: 560, wagons: 8 },
+  { suffix: "XBF2", customs: true, currency: "ETB", tons: 420, wagons: 6 },
+  { suffix: "XBF3", customs: false, currency: "ETB", tons: 420, wagons: 6 },
+  { suffix: "XBF4", customs: false, currency: "ETB", tons: 420, wagons: 6 },
+  { suffix: "XBF5", customs: true, currency: "USD", tons: 1540, wagons: 22 },
+  { suffix: "XBF6", customs: false, currency: "USD", tons: 420, wagons: 6 },
+];
+const CUSTOMS = BOOKINGS.filter((b) => b.customs).map((b) => b.suffix);
+const SELF_CLEAR = BOOKINGS.filter((b) => !b.customs).map((b) => b.suffix);
+
+function withScheduleId(fn: (id: string, s: ScheduleRow) => void) {
+  withExportSchedule(DEPARTURE, (s) => fn(s.id, s));
+}
+
+describe("bulk export: six wheat bookings fill the 54-wagon CW4 train (FCFS)", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    for (const b of BOOKINGS) {
+      seedImportContract({
+        suffix: b.suffix,
+        reference: stampedRef(b.suffix),
+        currency: b.currency,
+        customs: b.customs,
+        freight: "BULK",
+        direction: "EXPORT",
+        originCode: EXP_ORIGIN,
+        destCode: EXP_DEST,
+      });
+    }
+  });
+
+  it("operations prepares the export corridor and a 54-wagon CW4 train — window forced open", () => {
+    ensureExportRoute();
+    resetCorridorDay(DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-EXP-1", "LOCO-EXP-2"],
+      kind: "bulk",
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withScheduleId((id) => forceWindowOpen(id, 60));
+  });
+
+  it("six exporters book wheat inside the one window", () => {
+    BOOKINGS.forEach((b) => {
+      bookBulk({ suffix: b.suffix, tons: b.tons, scheduledDate: BOOKING_DAY });
+      pollBookingStatus(b.suffix, "OPERATION_REQUEST_PENDING", 5);
+    });
+  });
+
+  it("each accept reserves FCFS immediately — pay deadlines clamped to the window close", () => {
+    BOOKINGS.forEach((b) => acceptExport(b.suffix));
+    withScheduleId((_, s) => {
+      BOOKINGS.forEach((b) => {
+        withBooking(b.suffix, (row) => {
+          expect(row.payment_deadline, `${b.suffix} pay deadline`).to.be.a("string");
+          expect(
+            new Date(row.payment_deadline!).getTime(),
+            `${b.suffix} deadline never outlives the window close`,
+          ).to.be.at.most(new Date(s.window_closes_at!).getTime());
+        });
+      });
+    });
+    BOOKINGS.forEach((b) => {
+      withBooking(b.suffix, (row) => {
+        pollDb<{ currency: string }>(
+          `${b.suffix} invoice`,
+          `SELECT currency FROM freight.invoices
+           WHERE source_id = $1 AND deleted_at IS NULL
+           ORDER BY created_at DESC LIMIT 1`,
+          [row.id],
+          (inv) => inv?.currency === b.currency,
+          10,
+        );
+      });
+    });
+  });
+
+  it("all six pay — allocated 54/54, the export window flips FULL, staff finalize", () => {
+    BOOKINGS.forEach((b) => {
+      markPaid(b.suffix);
+      pollAllocations(b.suffix, b.wagons);
+    });
+    withScheduleId((id) => {
+      pollDb<ScheduleRow>(
+        "export window FULL",
+        `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.booking_window_status === "FULL",
+      );
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/finalize`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule SCHEDULED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "SCHEDULED",
+        10,
+      );
+    });
+  });
+
+  it("gate pass + T1 uploads, the train dispatches and runs the corridor to Djibouti Port", () => {
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/import-djibouti/gatepass-granted`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        glUpload(`/api/contracts/bookings/${b.id}/transport-document`);
+      });
+    });
+
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/dispatch`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule DISPATCHED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "DISPATCHED",
+        10,
+      );
+      [1, 2, 3, 4].forEach((seq) => {
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+          sequenceNo: seq,
+          kind: "PASSED",
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+        sequenceNo: 5,
+        kind: "ARRIVED",
+      })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule ARRIVED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "ARRIVED",
+        20,
+      );
+    });
+    BOOKINGS.forEach((b) => pollBookingStatus(b.suffix, "ARRIVED", 20));
+  });
+
+  it("GL Djibouti closes the export tail (T1 close → offloaded) on every customs booking", () => {
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        apiPost("superadmin@tria.com", `/api/contracts/bookings/${b.id}/t1-close`)
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+      completeBookingMilestone(suffix, "OFFLOADED");
+      expectMilestoneDone(suffix, "T1_CLOSED");
+      expectMilestoneDone(suffix, "OFFLOADED");
+    });
+  });
+
+  it("the self-clearance bookings arrived clean — no customs tail required", () => {
+    SELF_CLEAR.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        expect(b.status, `${suffix} final status`).to.eq("ARRIVED");
+      });
+      dbBooking(suffix).then(({ rows }) => {
+        db<{ n: string }>(
+          `SELECT count(*) AS n FROM freight.clearance_milestones
+           WHERE booking_id = $1 AND milestone_code = 'T1_CLOSED'
+             AND status = 'COMPLETED' AND deleted_at IS NULL`,
+          [rows[0].id],
+        ).then(({ rows: ms }) =>
+          expect(Number(ms[0].n), `${suffix} has no T1 tail`).to.eq(0),
+        );
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/bulk_export_matrix.cy.ts b/e2e/freight/cypress/e2e/flows/bulk_export_matrix.cy.ts
new file mode 100644
index 000000000..f4d6fe572
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/bulk_export_matrix.cy.ts
@@ -0,0 +1,193 @@
+/**
+ * BULK EXPORT critical matrix (reversed corridor, D+13):
+ *
+ *   1. gate: a wheat booking on a day with no open window is rejected
+ *   2. sub-corridor bulk export (DIRE_DAWA → DJIB_PORT, 980 T) boards
+ *      mid-route and shares the train with a KALITY 2 800 T through-booking
+ *   3. directional FULL: through 40w + sub 14w commit the border edges → the
+ *      export window flips FULL while the home leg still has 14 free wagons
+ *   4. bulk intercity ride-along on the FULL export train's free home leg
+ *      (KALITY → MOJO, DOMESTIC, 140 T, dateless) — accepted, pay window
+ *      clamped to the EXPORT close, paid + linked; the window stays FULL
+ *   5. same-day sibling export train keeps its OWN window (no group rule)
+ *
+ * Sequential steps — retries off.
+ */
+
+import {
+  acceptExport,
+  apiPost,
+  bookBulk,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  ensureExportRoute,
+  EXP_DEST,
+  EXP_ORIGIN,
+  forceWindowOpen,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withExportSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(13);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+const NO_WINDOW_DAY = eatDayStr(departureAt(20)); // no schedule exists there
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+describe("bulk export matrix: sub-corridor, directional FULL, bulk intercity, own windows", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    seedImportContract({
+      suffix: "YM1",
+      reference: stampedRef("YM1"),
+      freight: "BULK",
+      direction: "EXPORT",
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    seedImportContract({
+      suffix: "YMSUB",
+      reference: stampedRef("YMSUB"),
+      freight: "BULK",
+      direction: "EXPORT",
+      originCode: "DIRE_DAWA",
+      destCode: EXP_DEST,
+    });
+    seedImportContract({
+      suffix: "YMIC",
+      reference: stampedRef("YMIC"),
+      freight: "BULK",
+      direction: "DOMESTIC",
+      originCode: EXP_ORIGIN,
+      destCode: "MOJO",
+    });
+  });
+
+  it("operations prepares the export corridor and the D+13 CW4 train with an open window", () => {
+    ensureExportRoute();
+    resetCorridorDay(DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-EXP-11", "LOCO-EXP-12"],
+      kind: "bulk",
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 90));
+  });
+
+  it("gate: a wheat booking on a day with no open window is rejected", () => {
+    bookBulk({
+      suffix: "YM1",
+      tons: 140,
+      scheduledDate: NO_WINDOW_DAY,
+      expectFailure: "booking window",
+    });
+  });
+
+  it("a KALITY through-booking (2 800 T) and a DIRE_DAWA sub-corridor booking (980 T) share the train", () => {
+    bookBulk({ suffix: "YM1", tons: 2800, scheduledDate: BOOKING_DAY });
+    acceptExport("YM1");
+    bookBulk({ suffix: "YMSUB", tons: 980, scheduledDate: BOOKING_DAY });
+    acceptExport("YMSUB");
+
+    markPaid("YM1");
+    pollAllocations("YM1", 40);
+    markPaid("YMSUB");
+    pollAllocations("YMSUB", 14);
+
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("YM1", (b) => expect(b.train_schedule_id).to.eq(s.id));
+      withBooking("YMSUB", (b) => expect(b.train_schedule_id).to.eq(s.id));
+    });
+  });
+
+  it("the border edges are committed — the export window flips FULL (home leg still free)", () => {
+    withExportSchedule(DEPARTURE, (s) => {
+      pollDb<ScheduleRow>(
+        "directional FULL",
+        `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL",
+      );
+    });
+  });
+
+  it("bulk intercity ride-along boards the FULL train's free home leg — clamped, paid, linked", () => {
+    bookBulk({ suffix: "YMIC", tons: 140 }); // 2 wagons KALITY → MOJO, dateless
+    withBooking("YMIC", (b) => {
+      apiPost(opsStaff, `/api/bookings/${b.id}/operation/review`, { decision: "ACCEPT" })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+    pollBookingStatus("YMIC", "FULLY_EXECUTED", 10);
+
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("YMIC", (b) => {
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${s.id}/intercity/accept`, {
+          bookingIds: [b.id],
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+    });
+    pollBookingStatus("YMIC", ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]);
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("YMIC", (b) => {
+        expect(new Date(b.payment_deadline!).getTime()).to.be.at.most(
+          new Date(s.window_closes_at!).getTime(),
+        );
+      });
+    });
+    markPaid("YMIC");
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("YMIC", (b) => {
+        expect(b.train_schedule_id, "linked to the export train").to.eq(s.id);
+      });
+      expect(s.booking_window_status, "window stays FULL").to.eq("FULL");
+    });
+  });
+
+  it("a same-day sibling export train keeps its OWN window — no route-day group for export", () => {
+    const sibling = new Date(DEPARTURE.getTime() + 90 * 60_000);
+    createImportSchedule({
+      departure: sibling,
+      locoPair: ["LOCO-EXP-3", "LOCO-EXP-4"],
+      kind: "bulk",
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(DEPARTURE, (anchor) => {
+      db<{ id: string; window_phase: string; window_closes_at: string }>(
+        `SELECT ts.id, ts.window_phase, ts.window_closes_at
+         FROM freight.train_schedules ts
+         JOIN freight.yards o ON o.id = ts.origin_station_id AND o.code = $1
+         JOIN freight.yards d ON d.id = ts.destination_station_id AND d.code = $2
+         WHERE ts.deleted_at IS NULL AND ts.id <> $3
+           AND abs(extract(epoch FROM (ts.scheduled_departure_date - $4::timestamptz))) < 7200
+         ORDER BY ts.created_at DESC LIMIT 1`,
+        [EXP_ORIGIN, EXP_DEST, anchor.id, DEPARTURE.toISOString()],
+      ).then(({ rows }) => {
+        expect(rows, "sibling export schedule").to.have.length(1);
+        expect(rows[0].window_phase, "own fresh window").to.eq("PRE_WINDOW");
+        expect(
+          new Date(rows[0].window_closes_at).getTime(),
+          "own close, anchored to its own departure",
+        ).to.not.eq(new Date(anchor.window_closes_at!).getTime());
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/bulk_export_pay_or_lose.cy.ts b/e2e/freight/cypress/e2e/flows/bulk_export_pay_or_lose.cy.ts
new file mode 100644
index 000000000..283425cc6
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/bulk_export_pay_or_lose.cy.ts
@@ -0,0 +1,171 @@
+/**
+ * BULK EXPORT — pay-or-lose (mirror of export_pay_or_lose):
+ *
+ *   D+11: ZA + ZB reserve 40 wagons of wheat and pay. ZC reserves the last 14
+ *   (980 T) but never pays; late ZD is rejected for space while ZC's hold
+ *   lives; ZC expires → ZD immediately books the freed 980 T, pays, allocates.
+ *
+ *   D+12: five bookings reserve the whole train (840×4 + 420 T), only three
+ *   pay. The window CLOSE passes → phase DONE, the two unpaid expire, export
+ *   never reopens (cycle counter stays 1).
+ *
+ * Sequential steps — retries off.
+ */
+
+import {
+  acceptExport,
+  bookBulk,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  ensureExportRoute,
+  EXP_DEST,
+  EXP_ORIGIN,
+  forceReservationExpiry,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withExportSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(11);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+const CLOSE_DEPARTURE = departureAt(12);
+const CLOSE_DAY = eatDayStr(CLOSE_DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+function seedBulkExport(suffix: string) {
+  seedImportContract({
+    suffix,
+    reference: stampedRef(suffix),
+    freight: "BULK",
+    direction: "EXPORT",
+    originCode: EXP_ORIGIN,
+    destCode: EXP_DEST,
+  });
+}
+
+const CLOSERS = [
+  { suffix: "ZQA", tons: 840, wagons: 12, pays: true },
+  { suffix: "ZQB", tons: 840, wagons: 12, pays: true },
+  { suffix: "ZQC", tons: 840, wagons: 12, pays: true },
+  { suffix: "ZQD", tons: 840, wagons: 12, pays: false },
+  { suffix: "ZQE", tons: 420, wagons: 6, pays: false },
+];
+
+describe("bulk export pay-or-lose: expiry frees space; close expires the unpaid", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    ["ZA", "ZB", "ZC", "ZD", ...CLOSERS.map((c) => c.suffix)].forEach(seedBulkExport);
+  });
+
+  it("operations prepares the export corridor and the D+11 CW4 train with an open window", () => {
+    ensureExportRoute();
+    resetCorridorDay(DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    resetCorridorDay(CLOSE_DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-EXP-7", "LOCO-EXP-8"],
+      kind: "bulk",
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+  });
+
+  it("ZA and ZB reserve and pay 40 wagons; ZC reserves the last 14 unpaid (clamped)", () => {
+    bookBulk({ suffix: "ZA", tons: 1400, scheduledDate: BOOKING_DAY });
+    acceptExport("ZA");
+    markPaid("ZA");
+    pollAllocations("ZA", 20);
+
+    bookBulk({ suffix: "ZB", tons: 1400, scheduledDate: BOOKING_DAY });
+    acceptExport("ZB");
+    markPaid("ZB");
+    pollAllocations("ZB", 20);
+
+    bookBulk({ suffix: "ZC", tons: 980, scheduledDate: BOOKING_DAY });
+    acceptExport("ZC");
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("ZC", (b) => {
+        expect(new Date(b.payment_deadline!).getTime()).to.be.at.most(
+          new Date(s.window_closes_at!).getTime(),
+        );
+      });
+    });
+  });
+
+  it("a late exporter is rejected while ZC's unpaid reservation holds the space", () => {
+    bookBulk({
+      suffix: "ZD",
+      tons: 980,
+      scheduledDate: BOOKING_DAY,
+      expectFailure: /space|window/i,
+    });
+  });
+
+  it("ZC misses its pay window — EXPIRED — and ZD immediately books the freed wagons", () => {
+    forceReservationExpiry("ZC");
+    bookBulk({ suffix: "ZD", tons: 980, scheduledDate: BOOKING_DAY });
+    acceptExport("ZD");
+    markPaid("ZD");
+    pollAllocations("ZD", 14);
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("ZD", (b) => expect(b.train_schedule_id, "ZD took ZC's seat").to.eq(s.id));
+    });
+  });
+
+  it("window-close day: five reservations, three payments", () => {
+    createImportSchedule({
+      departure: CLOSE_DEPARTURE,
+      locoPair: ["LOCO-EXP-9", "LOCO-EXP-10"],
+      kind: "bulk",
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(CLOSE_DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+
+    CLOSERS.forEach((c) => {
+      bookBulk({ suffix: c.suffix, tons: c.tons, scheduledDate: CLOSE_DAY });
+      acceptExport(c.suffix);
+    });
+    CLOSERS.filter((c) => c.pays).forEach((c) => {
+      markPaid(c.suffix);
+      pollAllocations(c.suffix, c.wagons);
+    });
+  });
+
+  it("the window CLOSES — phase DONE, the two unpaid expire, and export never reopens", () => {
+    withExportSchedule(CLOSE_DEPARTURE, (s) => {
+      db(
+        `UPDATE freight.train_schedules
+         SET window_closes_at = now() - interval '1 second'
+         WHERE id = $1 AND window_phase = 'OPEN'`,
+        [s.id],
+      );
+      pollDb<ScheduleRow>(
+        "export window DONE (no reopen)",
+        `SELECT window_phase, booking_cycle_no FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.window_phase === "DONE" && Number(row?.booking_cycle_no) === 1,
+      );
+    });
+    // Forced close ⇒ force the matching deadline clamp on the unpaid pair.
+    CLOSERS.filter((c) => !c.pays).forEach((c) => forceReservationExpiry(c.suffix));
+    CLOSERS.filter((c) => !c.pays).forEach((c) => pollBookingStatus(c.suffix, "EXPIRED"));
+    CLOSERS.filter((c) => c.pays).forEach((c) =>
+      withBooking(c.suffix, (b) => expect(b.status, `${c.suffix} rides`).to.eq("PAID")),
+    );
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/bulk_import_full_train.cy.ts b/e2e/freight/cypress/e2e/flows/bulk_import_full_train.cy.ts
new file mode 100644
index 000000000..0ffdb37f3
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/bulk_import_full_train.cy.ts
@@ -0,0 +1,286 @@
+/**
+ * BULK IMPORT journey 1 — six wheat bookings fill a 54-wagon CW4 train on the
+ * long corridor DJIB_PORT → NAGAD → DIRE_DAWA → E2E_AWASH → MOJO → KALITY,
+ * all in the FIRST booking window, then the full life of the train: payment,
+ * allocation, gate pass, T1, dispatch, checkpoint-by-checkpoint movement,
+ * arrival, and the post-arrival customs tail.
+ *
+ * The six bookings (70 T per CW4 wagon — Σ = 54 wagons / 3 780 T):
+ *   BF1  customs + USD    560 T =  8 wagons
+ *   BF2  customs + ETB    420 T =  6 wagons
+ *   BF3  self    + ETB    420 T =  6 wagons
+ *   BF4  self    + ETB    420 T =  6 wagons
+ *   BF5  customs + USD  1 540 T = 22 wagons  (the ≥22-wagon giant)
+ *   BF6  self    + USD    420 T =  6 wagons
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  acceptOperation,
+  apiPost,
+  bookBulk,
+  closeBookingWindow,
+  completeBookingMilestone,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  dbBooking,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  expectMilestoneDone,
+  forceWindowOpen,
+  glUpload,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(10);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const BOOKINGS: Array<{
+  suffix: string;
+  customs: boolean;
+  currency: "ETB" | "USD";
+  tons: number;
+  wagons: number;
+}> = [
+  { suffix: "BF1", customs: true, currency: "USD", tons: 560, wagons: 8 },
+  { suffix: "BF2", customs: true, currency: "ETB", tons: 420, wagons: 6 },
+  { suffix: "BF3", customs: false, currency: "ETB", tons: 420, wagons: 6 },
+  { suffix: "BF4", customs: false, currency: "ETB", tons: 420, wagons: 6 },
+  { suffix: "BF5", customs: true, currency: "USD", tons: 1540, wagons: 22 },
+  { suffix: "BF6", customs: false, currency: "USD", tons: 420, wagons: 6 },
+];
+const CUSTOMS = BOOKINGS.filter((b) => b.customs).map((b) => b.suffix);
+const SELF_CLEAR = BOOKINGS.filter((b) => !b.customs).map((b) => b.suffix);
+
+function withScheduleId(fn: (id: string, s: ScheduleRow) => void) {
+  withSchedule(DEPARTURE, (s) => fn(s.id, s));
+}
+
+describe("bulk import: six wheat bookings fill the 54-wagon CW4 train", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    for (const b of BOOKINGS) {
+      seedImportContract({
+        suffix: b.suffix,
+        reference: stampedRef(b.suffix),
+        currency: b.currency,
+        customs: b.customs,
+        freight: "BULK",
+      });
+    }
+  });
+
+  it("operations prepares the corridor and a 54-wagon BULK train — first window forced open", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-IMP-15", "LOCO-IMP-16"],
+      kind: "bulk",
+    });
+    withScheduleId((id) => forceWindowOpen(id, 45));
+    withScheduleId((_, s) => {
+      expect(s.booking_cycle_no, "FIRST window cycle").to.eq(1);
+    });
+  });
+
+  it("customer books all six wheat shipments inside the first window", () => {
+    BOOKINGS.forEach((b) => {
+      bookBulk({ suffix: b.suffix, tons: b.tons, scheduledDate: BOOKING_DAY });
+      pollBookingStatus(b.suffix, "OPERATION_REQUEST_PENDING", 5);
+    });
+  });
+
+  it("operations accepts all six — the whole pool is FULLY_EXECUTED (in window)", () => {
+    BOOKINGS.forEach((b) => acceptOperation(b.suffix));
+  });
+
+  it("window closes, doc review completes — the batch reserves ALL six (they fit exactly)", () => {
+    withScheduleId((id) => {
+      closeBookingWindow(id);
+      completeDocReview(id);
+    });
+    BOOKINGS.forEach((b) =>
+      pollBookingStatus(b.suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    BOOKINGS.forEach((b) => {
+      withBooking(b.suffix, (row) => {
+        expect(row.payment_deadline, `${b.suffix} pay deadline`).to.be.a("string");
+        pollDb<{ currency: string }>(
+          `${b.suffix} invoice`,
+          `SELECT currency FROM freight.invoices
+           WHERE source_id = $1 AND deleted_at IS NULL
+           ORDER BY created_at DESC LIMIT 1`,
+          [row.id],
+          (inv) => inv?.currency === b.currency,
+          10,
+        );
+      });
+    });
+  });
+
+  it("all six pay — allocated onto the train, 54/54 wagons, window FULL and schedule finalized", () => {
+    BOOKINGS.forEach((b) => {
+      markPaid(b.suffix);
+      pollAllocations(b.suffix, b.wagons);
+    });
+    withScheduleId((id) => {
+      endPaymentPhase(id);
+      pollDb<ScheduleRow>(
+        "schedule FULL + DONE + finalized",
+        `SELECT window_phase, booking_window_status, status
+         FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) =>
+          s?.booking_window_status === "FULL" &&
+          s?.window_phase === "DONE" &&
+          s?.status === "SCHEDULED",
+      );
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+    });
+  });
+
+  it("GL Djibouti: gate pass granted, T1 documents uploaded for the customs bookings", () => {
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/import-djibouti/gatepass-granted`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        glUpload(`/api/contracts/bookings/${b.id}/t1-documents`);
+      });
+    });
+  });
+
+  it("the train dispatches and runs the corridor checkpoint by checkpoint to the terminal", () => {
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/dispatch`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule DISPATCHED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "DISPATCHED",
+        10,
+      );
+    });
+    BOOKINGS.forEach((b) => pollBookingStatus(b.suffix, "IN_TRANSIT", 10));
+
+    withScheduleId((id) => {
+      [1, 2, 3, 4].forEach((seq) => {
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+          sequenceNo: seq,
+          kind: "PASSED",
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+        sequenceNo: 5,
+        kind: "ARRIVED",
+      })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule ARRIVED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "ARRIVED",
+        20,
+      );
+    });
+    BOOKINGS.forEach((b) => pollBookingStatus(b.suffix, "ARRIVED", 20));
+    withScheduleId((id) => {
+      db<{ n: string }>(
+        `SELECT count(*) AS n FROM freight.wagon_movements
+         WHERE train_schedule_id = $1`,
+        [id],
+      ).then(({ rows }) =>
+        expect(Number(rows[0].n), "wagon movement ledger rows").to.be.at.least(54),
+      );
+    });
+  });
+
+  it("GL runs the customs tail on every customs booking (T1 close → risk → second duty → release → final invoice)", () => {
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        apiPost("superadmin@tria.com", `/api/contracts/bookings/${b.id}/t1-close`)
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+        apiPost("superadmin@tria.com", `/api/contracts/bookings/${b.id}/risk`, {
+          riskLevel: "GREEN",
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+        glUpload(
+          `/api/contracts/bookings/${b.id}/second-duty`,
+          { dutyRequired: "false" },
+          "attachment",
+        );
+        glUpload(
+          `/api/contracts/bookings/${b.id}/final-invoice`,
+          { amount: "1000", description: "e2e final invoice" },
+          "file",
+        );
+        glUpload(`/api/contracts/bookings/${b.id}/final-invoice-slip`, {}, "file");
+        apiPost(
+          "superadmin@tria.com",
+          `/api/contracts/bookings/${b.id}/final-invoice/confirm`,
+        )
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+      completeBookingMilestone(suffix, "IMPORT_RELEASE_GRANTED");
+      completeBookingMilestone(suffix, "IMPORT_PROCESS_COMPLETED");
+      expectMilestoneDone(suffix, "T1_CLOSED");
+      expectMilestoneDone(suffix, "RISK_ASSIGNED");
+      expectMilestoneDone(suffix, "IMPORT_RELEASE_GRANTED");
+      expectMilestoneDone(suffix, "IMPORT_PROCESS_COMPLETED");
+    });
+  });
+
+  it("the self-clearance bookings arrived clean — no customs tail required", () => {
+    SELF_CLEAR.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        expect(b.status, `${suffix} final status`).to.eq("ARRIVED");
+      });
+      dbBooking(suffix).then(({ rows }) => {
+        db<{ n: string }>(
+          `SELECT count(*) AS n FROM freight.clearance_milestones
+           WHERE booking_id = $1 AND milestone_code = 'T1_CLOSED'
+             AND status = 'COMPLETED' AND deleted_at IS NULL`,
+          [rows[0].id],
+        ).then(({ rows: ms }) =>
+          expect(Number(ms[0].n), `${suffix} has no T1 tail`).to.eq(0),
+        );
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/bulk_import_split_promote.cy.ts b/e2e/freight/cypress/e2e/flows/bulk_import_split_promote.cy.ts
new file mode 100644
index 000000000..163bb7d79
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/bulk_import_split_promote.cy.ts
@@ -0,0 +1,199 @@
+/**
+ * BULK IMPORT journey 3 — split offer, exact-remainder rebooking, pay-window
+ * expiry and priority-ordered waiting-list promotion on one 54-wagon CW4
+ * train (bulk splits are FULL-WAGONS-ONLY at the base 70 T cap):
+ *
+ *   reserved (priority order): BSA 1 400 T = 20w, BSB 980 T = 14w,
+ *   BSD 840 T = 12w → 46w. BSC 1 680 T = 24w does NOT fit whole → PARTIAL
+ *   offer of the remaining 8 wagons = 560 T. BSC settles via the real payment
+ *   pipeline → split applies (is_split + snapshot); the outstanding 1 120 T
+ *   must later be rebooked EXACTLY (a wrong tonnage is rejected).
+ *   BSD never pays → EXPIRES; the freed 12 wagons promote BS1 (420 T = 6w)
+ *   and BS2 (420 T = 6w); BS3 (1 400 T = 20w) never fits and expires.
+ *
+ *   Final consist: 20 + 14 + 8 + 6 + 6 = 54/54.
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  acceptOperation,
+  bookBulk,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  forceReservationExpiry,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  setPriority,
+  settleViaGateway,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(12);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+const REMAINDER_DEPARTURE = departureAt(14);
+const REMAINDER_DAY = eatDayStr(REMAINDER_DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const ORDER = ["BSA", "BSB", "BSD", "BSC", "BS1", "BS2", "BS3"] as const;
+const TONS: Record<string, number> = {
+  BSA: 1400,
+  BSB: 980,
+  BSD: 840,
+  BSC: 1680,
+  BS1: 420,
+  BS2: 420,
+  BS3: 1400,
+};
+
+describe("bulk import: split offer, remainder rebooking, expiry + promotion", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    ORDER.forEach((suffix) =>
+      seedImportContract({ suffix, reference: stampedRef(suffix), freight: "BULK" }),
+    );
+  });
+
+  it("operations prepares the corridor bulk train with an open first window", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    resetCorridorDay(REMAINDER_DEPARTURE);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-IMP-19", "LOCO-IMP-20"],
+      kind: "bulk",
+    });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+  });
+
+  it("seven customers book wheat in the first window; operations accepts them in priority order", () => {
+    ORDER.forEach((suffix) => {
+      bookBulk({ suffix, tons: TONS[suffix], scheduledDate: BOOKING_DAY });
+      acceptOperation(suffix);
+    });
+    ORDER.forEach((suffix, i) => setPriority(suffix, i + 1));
+  });
+
+  it("the batch reserves BSA/BSB/BSD whole and offers BSC a PARTIAL for the last 8 wagons (560 T)", () => {
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    ["BSA", "BSB", "BSD", "BSC"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    withBooking("BSC", (b) => {
+      pollDb<{ status: string }>(
+        "BSC open partial offer",
+        `SELECT status FROM freight.booking_batch_offers
+         WHERE booking_id = $1 AND deleted_at IS NULL
+         ORDER BY created_at DESC LIMIT 1`,
+        [b.id],
+        (row) => row?.status === "OFFERED",
+        10,
+      );
+    });
+    ["BS1", "BS2", "BS3"].forEach((suffix) =>
+      withBooking(suffix, (b) => {
+        expect(b.status, `${suffix} waiting`).to.eq("FULLY_EXECUTED");
+      }),
+    );
+  });
+
+  it("BSA and BSB pay; BSC settles via the gateway — the split applies (full wagons only)", () => {
+    markPaid("BSA");
+    pollAllocations("BSA", 20);
+    markPaid("BSB");
+    pollAllocations("BSB", 14);
+
+    settleViaGateway("BSC");
+    pollAllocations("BSC", 8);
+    withBooking("BSC", (b) => {
+      expect(b.is_split, "BSC is split").to.eq(true);
+      db<{ pre_split_quantities: unknown }>(
+        `SELECT pre_split_quantities FROM freight.bookings WHERE id = $1`,
+        [b.id],
+      ).then(({ rows }) => {
+        expect(rows[0].pre_split_quantities, "pre-split snapshot").to.not.be.null;
+      });
+    });
+  });
+
+  it("BSD misses its pay window — EXPIRED, and the freed wagons promote BS1 + BS2 (payment sent)", () => {
+    forceReservationExpiry("BSD");
+    ["BS1", "BS2"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    ["BS1", "BS2"].forEach((suffix) =>
+      withBooking(suffix, (b) => {
+        expect(b.payment_deadline, `${suffix} got a pay window`).to.be.a("string");
+      }),
+    );
+    withBooking("BS3", (b) => {
+      expect(b.status, "BS3 still has no seat").to.eq("FULLY_EXECUTED");
+    });
+  });
+
+  it("BS1 and BS2 pay — the train is FULL at 54; BS3 expires with the day", () => {
+    markPaid("BS1");
+    pollAllocations("BS1", 6);
+    markPaid("BS2");
+    pollAllocations("BS2", 6);
+
+    withSchedule(DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      pollDb<ScheduleRow>(
+        "window FULL + DONE",
+        `SELECT window_phase, booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL" && row?.window_phase === "DONE",
+      );
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [s.id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+    });
+    pollBookingStatus("BS3", "EXPIRED");
+  });
+
+  it("the split customer must rebook EXACTLY the whole 1 120 T remainder — wrong tonnage rejected, exact accepted", () => {
+    createImportSchedule({
+      departure: REMAINDER_DEPARTURE,
+      locoPair: ["LOCO-IMP-21", "LOCO-IMP-22"],
+      kind: "bulk",
+    });
+    withSchedule(REMAINDER_DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+
+    // 1 680 booked − 560 shipped-by-split = 1 120 T outstanding. 560 ≠ 1 120.
+    bookBulk({
+      suffix: "BSC",
+      tons: 560,
+      scheduledDate: REMAINDER_DAY,
+      expectFailure: "must take the whole",
+    });
+
+    bookBulk({ suffix: "BSC", tons: 1120, scheduledDate: REMAINDER_DAY });
+    pollBookingStatus("BSC", "OPERATION_REQUEST_PENDING", 5);
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/bulk_import_waiting_expiry.cy.ts b/e2e/freight/cypress/e2e/flows/bulk_import_waiting_expiry.cy.ts
new file mode 100644
index 000000000..772124810
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/bulk_import_waiting_expiry.cy.ts
@@ -0,0 +1,133 @@
+/**
+ * BULK IMPORT journey 2 — the CW4 train fills from THREE wheat bookings;
+ * three more sit in the waiting pool of the same (first) window. The three
+ * selected pay and allocate; when the cycle concludes FULL the three waiting
+ * bookings expire with the day.
+ *
+ * Tonnage (70 T per CW4 wagon, 54-wagon consist):
+ *   selected: BWA 1 400 T = 20w, BWB 1 400 T = 20w, BWC 980 T = 14w → Σ 54
+ *   waiting:  BW1/BW2/BW3 700 T = 10w each
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  acceptOperation,
+  bookBulk,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  setPriority,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(11);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const SELECTED = [
+  { suffix: "BWA", tons: 1400, wagons: 20 },
+  { suffix: "BWB", tons: 1400, wagons: 20 },
+  { suffix: "BWC", tons: 980, wagons: 14 },
+];
+const WAITING = [
+  { suffix: "BW1", tons: 700, wagons: 10 },
+  { suffix: "BW2", tons: 700, wagons: 10 },
+  { suffix: "BW3", tons: 700, wagons: 10 },
+];
+const ALL = [...SELECTED, ...WAITING];
+
+describe("bulk import: 3 bookings fill the train, 3 wait and expire", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    ALL.forEach((b) =>
+      seedImportContract({ suffix: b.suffix, reference: stampedRef(b.suffix), freight: "BULK" }),
+    );
+  });
+
+  it("operations prepares the corridor and a 54-wagon bulk train with an open first window", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-IMP-17", "LOCO-IMP-18"],
+      kind: "bulk",
+    });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+  });
+
+  it("six customers book wheat in the first window; operations accepts all six", () => {
+    ALL.forEach((b) => {
+      bookBulk({ suffix: b.suffix, tons: b.tons, scheduledDate: BOOKING_DAY });
+      acceptOperation(b.suffix);
+    });
+    ALL.forEach((b, i) => setPriority(b.suffix, i + 1));
+  });
+
+  it("the batch selects exactly the three that fill 54 wagons; the rest keep waiting", () => {
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    SELECTED.forEach((b) =>
+      pollBookingStatus(b.suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    WAITING.forEach((b) =>
+      withBooking(b.suffix, (row) => {
+        expect(row.status, `${b.suffix} still waiting`).to.eq("FULLY_EXECUTED");
+        expect(row.payment_deadline, `${b.suffix} has no pay deadline`).to.be.null;
+      }),
+    );
+  });
+
+  it("the three selected bookings pay and allocate — 54/54", () => {
+    SELECTED.forEach((b) => {
+      markPaid(b.suffix);
+      pollAllocations(b.suffix, b.wagons);
+    });
+    withSchedule(DEPARTURE, (s) => {
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [s.id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+    });
+  });
+
+  it("the cycle concludes FULL — the three waiting bookings expire with the day", () => {
+    withSchedule(DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      pollDb<ScheduleRow>(
+        "window FULL + DONE",
+        `SELECT window_phase, booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL" && row?.window_phase === "DONE",
+      );
+    });
+    WAITING.forEach((b) => pollBookingStatus(b.suffix, "EXPIRED"));
+    SELECTED.forEach((b) =>
+      withBooking(b.suffix, (row) => expect(row.status, `${b.suffix} stays PAID`).to.eq("PAID")),
+    );
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/bulk_import_window_reopen.cy.ts b/e2e/freight/cypress/e2e/flows/bulk_import_window_reopen.cy.ts
new file mode 100644
index 000000000..90d5e7f84
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/bulk_import_window_reopen.cy.ts
@@ -0,0 +1,115 @@
+/**
+ * BULK IMPORT journey 4 — nobody pays in the first window cycle: both
+ * reserved wheat bookings expire, the cycle concludes NOT-full and the window
+ * REOPENS for a second cycle on the same bulk train. A fresh 700 T booking
+ * arrives in cycle 2, pays, and allocates.
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  acceptOperation,
+  bookBulk,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  forceReservationExpiry,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(13);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+describe("bulk import: dead first cycle — expire all, reopen, book again", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    ["BRA", "BRB", "BRC"].forEach((suffix) =>
+      seedImportContract({ suffix, reference: stampedRef(suffix), freight: "BULK" }),
+    );
+  });
+
+  it("operations prepares the corridor bulk train — first window opens (cycle 1)", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-IMP-23", "LOCO-IMP-24"],
+      kind: "bulk",
+    });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+    withSchedule(DEPARTURE, (s) => expect(s.booking_cycle_no, "cycle 1").to.eq(1));
+  });
+
+  it("two customers book wheat and are reserved in cycle 1", () => {
+    bookBulk({ suffix: "BRA", tons: 1400, scheduledDate: BOOKING_DAY });
+    bookBulk({ suffix: "BRB", tons: 1400, scheduledDate: BOOKING_DAY });
+    ["BRA", "BRB"].forEach((suffix) => acceptOperation(suffix));
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    ["BRA", "BRB"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+  });
+
+  it("nobody pays — both reservations expire and the cycle concludes not-full", () => {
+    ["BRA", "BRB"].forEach((suffix) => forceReservationExpiry(suffix));
+    withSchedule(DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      // When the reopen instant falls inside office hours, the 10s tick's
+      // guard-loop chains PRE_WINDOW straight into OPEN within the SAME tick
+      // (booking-window.service.ts advanceSchedule), so PRE_WINDOW is not a
+      // reliably observable resting state — assert the cycle left PAYMENT
+      // without concluding FULL/DONE, whichever phase it lands on.
+      pollDb<ScheduleRow>(
+        "window concludes not-full (PRE_WINDOW or fast-forwarded to OPEN)",
+        `SELECT window_phase FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => !!row && row.window_phase !== "PAYMENT" && row.window_phase !== "DONE",
+      );
+    });
+  });
+
+  it("the second window opens (cycle 2) and a fresh 700 T booking pays and allocates", () => {
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+    withSchedule(DEPARTURE, (s) => expect(s.booking_cycle_no, "cycle 2").to.eq(2));
+
+    bookBulk({ suffix: "BRC", tons: 700, scheduledDate: BOOKING_DAY });
+    acceptOperation("BRC");
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    pollBookingStatus("BRC", ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]);
+    markPaid("BRC");
+    pollAllocations("BRC", 10);
+
+    ["BRA", "BRB"].forEach((suffix) =>
+      withBooking(suffix, (b) => expect(b.status, `${suffix} stays expired`).to.eq("EXPIRED")),
+    );
+    withSchedule(DEPARTURE, (s) => {
+      withBooking("BRC", (b) => {
+        expect(b.train_schedule_id, "BRC rides the reopened train").to.eq(s.id);
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/contract-lifecycle.cy.ts b/e2e/freight/cypress/e2e/flows/contract-lifecycle.cy.ts
new file mode 100644
index 000000000..e78fe1905
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/contract-lifecycle.cy.ts
@@ -0,0 +1,216 @@
+/**
+ * Contract creation → finalization, spanning portal + backoffice:
+ *
+ *   1. portal (user@gmail.com, company seeded active by seed-company.sql):
+ *      wizard → GENERAL / Import / Container / 20ft → submit + approve quote
+ *   2. backoffice marketer: "Accept for approval" (validity) + approve the
+ *      LINE_STAFF step
+ *   3. backoffice director: approve the DIRECTOR step → PDF → CONTRACT_READY
+ *   4. portal customer: scroll contract, agree, draw signature, OTP-sign
+ *      → SIGNED_CUSTOMER
+ *   5. backoffice marketer: counter-sign as staff → GENERAL contract goes
+ *      CONTRACT_ACTIVE (per-booking clearance, no contract-level gate)
+ *
+ * Sequential steps of one journey — retries off (steps are not idempotent).
+ */
+
+const customer = "user@gmail.com";
+const companyTin = "0102030405"; // seed-company.sql
+
+/**
+ * The journey's contract = the seeded company's latest contract. Each test
+ * resolves it from the DB instead of sharing module state — tests stay
+ * independently runnable against the current DB state.
+ */
+function dbContract() {
+  return cy.task<{ rows: Array<{ id: string; reference: string; status: string }> }>(
+    "db:query",
+    {
+      sql: `SELECT ct.id, ct.reference, ct.status
+            FROM freight.contracts ct
+            JOIN freight.companies c ON c.id = ct.company_id
+            WHERE c.tin = $1
+            ORDER BY ct.created_at DESC LIMIT 1`,
+      params: [companyTin],
+    },
+  );
+}
+
+function withContract(fn: (c: { id: string; reference: string; status: string }) => void) {
+  dbContract().then(({ rows }) => {
+    expect(rows, "latest contract for the seeded company").to.have.length(1);
+    fn(rows[0]);
+  });
+}
+
+function expectStatus(expected: string) {
+  dbContract().then(({ rows }) => {
+    expect(rows[0]?.status, `contract status`).to.eq(expected);
+  });
+}
+
+describe("contract lifecycle: creation to finalization", { retries: 0 }, () => {
+  it("customer creates and submits a GENERAL import container contract", () => {
+    cy.loginPortal(customer);
+    cy.visitPortal("/contracts/new");
+
+    // Step 0 — Setup.
+    cy.mantineSelect(/^Operation Type/, /^Import$/);
+    cy.mantineSelect(/^Contract Kind/, "General Contract");
+    cy.mantineSelect(/^New or Renewal/, "New Contract");
+    cy.contains("Rail Transport Only", { timeout: 15000 }).click();
+    cy.mantineSelect(/^Payment Currency/, /^ETB/);
+    cy.contains("button", "Continue").click({ force: true });
+
+    // Step 1 — Cargo & Route.
+    cy.mantineSelect(/^Cargo Scope/, /Containerized/);
+    cy.get('[role="checkbox"][aria-label="20ft Container"]').click();
+    cy.get('textarea[placeholder*="Electronics"]').type(
+      "E2E electronics shipment scope",
+    );
+    cy.mantineSelect(/^Origin Yard/, "Djibouti Port Terminal");
+    cy.mantineSelect(/^Destination Yard/, "Mojo Dry Port");
+    cy.contains("button", "Continue").click({ force: true });
+
+    // Step 2 — Review & Submit → quotation modal.
+    cy.contains("button", "Submit").click({ force: true });
+    cy.contains("Approve your quotation", { timeout: 30000 }).should(
+      "be.visible",
+    );
+    cy.contains("button", "Approve & submit").click();
+
+    cy.location("pathname", { timeout: 20000 }).should("eq", "/contracts");
+    cy.contains("Submitted", { timeout: 15000 }).should("be.visible");
+
+    dbContract().then(({ rows }) => {
+      expect(rows, "contract row").to.have.length(1);
+      expect(rows[0].status).to.eq("SUBMITTED");
+      expect(rows[0].reference).to.match(/^CTR-/);
+    });
+  });
+
+  it("marketer accepts the submission and approves the LINE_STAFF step", () => {
+    cy.loginBackoffice("marketer@edr.local");
+    withContract((c) => cy.visit(`/dashboard/contract-requests/${c.id}`));
+
+    cy.contains("button", "Accept for approval", { timeout: 20000 }).click();
+    // Validity defaults to the first configured option in the accept modal.
+    cy.contains("button", "Accept & start approval", { timeout: 20000 })
+      .should("not.be.disabled")
+      .click();
+
+    // Approval chain instantiated: LINE_STAFF → DIRECTOR. Approve step 1.
+    cy.contains("Approval chain", { timeout: 20000 }).should("be.visible");
+    cy.contains("button", "Approve", { timeout: 20000 }).click();
+    cy.contains("button", "Confirm approval").click();
+    cy.contains("1/2", { timeout: 20000 }).should("be.visible");
+
+    expectStatus("PENDING_APPROVAL");
+  });
+
+  it("director approves the final step — contract PDF becomes ready", () => {
+    cy.loginBackoffice("director@edr.local");
+    withContract((c) => cy.visit(`/dashboard/contract-requests/${c.id}`));
+
+    cy.contains("button", "Approve", { timeout: 20000 }).click();
+    cy.contains("button", "Confirm approval").click();
+
+    // Final approval renders the contract PDF synchronously → CONTRACT_READY.
+    // The approval-chain card unmounts once the contract leaves approval, so
+    // assert on the signing CTA that replaces it.
+    cy.contains("button", "View & sign", { timeout: 30000 }).should("exist");
+
+    expectStatus("CONTRACT_READY");
+  });
+
+  it("customer signs the contract with OTP", () => {
+    cy.loginPortal(customer);
+    withContract((c) => cy.visitPortal(`/contracts/${c.id}/view`));
+
+    // Scroll the contract iframe to the bottom so the consent bar unlocks.
+    // Retried because the iframe can re-render (query refetch) after a scroll.
+    const unlockConsent = (attempt: number) => {
+      cy.get('iframe[title="Contract document"]', { timeout: 30000 }).then(
+        ($f) => {
+          const win = ($f[0] as HTMLIFrameElement).contentWindow;
+          // documentElement can be null while the srcDoc is (re)parsing —
+          // skip this round and let the retry pick it up.
+          const el =
+            win?.document?.scrollingElement ?? win?.document?.documentElement;
+          if (win && el) {
+            el.scrollTop = el.scrollHeight;
+            win.dispatchEvent(new Event("scroll"));
+          }
+        },
+      );
+      cy.wait(500).then(() => {
+        cy.get("body").then(($b) => {
+          if ($b.text().includes("I have read the entire contract")) return;
+          expect(attempt, "consent bar unlocked").to.be.lessThan(20);
+          unlockConsent(attempt + 1);
+        });
+      });
+    };
+    unlockConsent(0);
+
+    cy.contains("I have read the entire contract", { timeout: 15000 }).click();
+    cy.contains("button", /^Sign contract$|^Approve & sign$/).click();
+
+    // Signature modal: name + drawn signature.
+    cy.contains("label", "Full name")
+      .invoke("attr", "for")
+      .then((id) => {
+        cy.get(`[id="${id}"]`).clear().type("Demo User");
+      });
+    cy.drawSignature();
+    cy.contains("button", "Continue to verification").click();
+
+    // OTP modal — code goes to the signer's registered contacts (email only
+    // for the seeded demo user); read it from the DB.
+    cy.contains("Verify it's you", { timeout: 20000 }).should("be.visible");
+    cy.getOtp(customer).then((otp) => cy.typeOtp(otp));
+    cy.contains("button", "Verify & sign").click();
+
+    cy.contains("Your signature has been recorded", { timeout: 30000 }).should(
+      "be.visible",
+    );
+    expectStatus("SIGNED_CUSTOMER");
+  });
+
+  it("staff counter-signs — GENERAL contract becomes CONTRACT_ACTIVE", () => {
+    cy.loginBackoffice("marketer@edr.local");
+    withContract((c) => cy.visit(`/dashboard/contract-requests/${c.id}/view`));
+
+    cy.contains("button", /^Sign as staff$|^Approve & sign$/, {
+      timeout: 30000,
+    }).click();
+    cy.contains("label", "Full name")
+      .invoke("attr", "for")
+      .then((id) => {
+        cy.get(`[id="${id}"]`).clear().type("EDR Marketer");
+      });
+    cy.drawSignature();
+    // Scoped to the modal — the toolbar behind it has its own "Approve & sign".
+    cy.get(".mantine-Modal-content")
+      .contains("button", /^Confirm signature$|^Approve & sign$/)
+      .click();
+
+    cy.contains("counter-signed", { timeout: 30000 }).should("be.visible");
+
+    // GENERAL → clearance runs per booking, contract goes straight active.
+    expectStatus("CONTRACT_ACTIVE");
+
+    // Both signatures recorded.
+    withContract((c) => {
+      cy.task<{ rows: Array<{ role: string }> }>("db:query", {
+        sql: `SELECT s.role FROM freight.contract_signatures s
+              WHERE s.contract_id = $1 ORDER BY s.role`,
+        params: [c.id],
+      }).then(({ rows }) => {
+        expect(rows.map((r) => r.role)).to.include.members(["CUSTOMER", "STAFF"]);
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/cross-app.cy.ts b/e2e/freight/cypress/e2e/flows/cross-app.cy.ts
new file mode 100644
index 000000000..fe60170ba
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/cross-app.cy.ts
@@ -0,0 +1,69 @@
+/**
+ * Cross-app flow: same business objects seen from both directions —
+ * customer (portal, port 5373) and staff (backoffice, port 5383 = baseUrl).
+ * Different ports = different origins, so portal steps inside a test that
+ * also touches backoffice run inside cy.origin().
+ *
+ * Cookie caveat: cookies ignore ports, so both apps share the localhost
+ * cookie jar. Always call the matching login command immediately before
+ * switching apps — cy.session restores the right cookie snapshot.
+ *
+ * This spec is the template for full journeys (booking → approval →
+ * scheduling → billing). It verifies both sides of the fence against
+ * seeded data via UI + API cross-checks.
+ */
+const portal = () => Cypress.env("portalUrl") as string;
+const api = () => Cypress.env("apiUrl") as string;
+
+describe("flow: customer and staff see the same world", () => {
+  it("staff views booking requests, customer views bookings", () => {
+    // Staff side on the primary origin (baseUrl) first — the first origin a
+    // test visits becomes primary; every other origin needs cy.origin().
+    cy.loginBackoffice("ceo@edr.local");
+    cy.visit("/dashboard/booking-requests");
+    cy.location("pathname").should("eq", "/dashboard/booking-requests");
+    cy.get("#root").should("not.be.empty");
+
+    // Customer side — switch session first, then enter the portal origin.
+    cy.loginPortal("user@gmail.com");
+    cy.origin(portal(), () => {
+      cy.visit("/bookings");
+      cy.location("pathname").should("not.eq", "/login");
+      cy.get("#root").should("not.be.empty");
+    });
+  });
+
+  it("staff and customer both resolve their own /api/me identity", () => {
+    cy.apiLogin("ceo@edr.local").then(({ token }) => {
+      cy.request({
+        url: `${api()}/api/me`,
+        headers: { Authorization: `Bearer ${token}` },
+      })
+        .its("status")
+        .should("eq", 200);
+    });
+    cy.apiLogin("user@gmail.com", Cypress.env("demoPassword")).then(({ token }) => {
+      cy.request({
+        url: `${api()}/api/me`,
+        headers: { Authorization: `Bearer ${token}` },
+      })
+        .its("status")
+        .should("eq", 200);
+    });
+  });
+
+  it("cy.origin: staff dashboard then portal in a single test", () => {
+    cy.loginBackoffice("ceo@edr.local");
+    cy.visit("/dashboard/overview");
+    cy.get("#root").should("not.be.empty");
+
+    cy.loginPortal("user@gmail.com");
+    cy.origin(Cypress.env("portalUrl") as string, () => {
+      cy.visit("/portal");
+      cy.location("pathname").should("not.eq", "/login");
+      cy.get("#root").should("not.be.empty");
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/export_fcfs_space.cy.ts b/e2e/freight/cypress/e2e/flows/export_fcfs_space.cy.ts
new file mode 100644
index 000000000..aef8b9b60
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/export_fcfs_space.cy.ts
@@ -0,0 +1,190 @@
+/**
+ * EXPORT journeys E2 + E5 — FCFS capacity truth on the reversed corridor:
+ *
+ *   E2 (D+3): three bookings (20+20+14 wagons) accept first and hold ALL 54
+ *   wagons before anyone pays. Three late exporters then try to book the same
+ *   day → each is REJECTED AT SUBMISSION by the whole-train space gate
+ *   ("exports ride whole or not at all" — no waiting list, no split). The
+ *   three reserved pay → FULL.
+ *
+ *   E5 (D+4): the whole-or-nothing giant. A 58-wagon booking (116×20ft) is
+ *   rejected against the empty 54-wagon train; rebooked at exactly 54 wagons
+ *   it reserves the ENTIRE train alone, pays, allocates 54/54 → FULL — and a
+ *   1-wagon afterthought bounces off the FULL train.
+ *
+ * Sequential steps — retries off.
+ */
+
+import {
+  acceptExport,
+  bookContainers,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  ensureExportRoute,
+  EXP_DEST,
+  EXP_ORIGIN,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withExportSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(3);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+const GIANT_DEPARTURE = departureAt(4);
+const GIANT_DAY = eatDayStr(GIANT_DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const FIRST = [
+  { suffix: "XA", twenty: 40, forty: 0, wagons: 20 },
+  { suffix: "XB", twenty: 0, forty: 20, wagons: 20 },
+  { suffix: "XC", twenty: 28, forty: 0, wagons: 14 },
+];
+const LATE = ["XL1", "XL2", "XL3"];
+
+function seedExport(suffix: string) {
+  seedImportContract({
+    suffix,
+    reference: stampedRef(suffix),
+    direction: "EXPORT",
+    originCode: EXP_ORIGIN,
+    destCode: EXP_DEST,
+  });
+}
+
+describe("export FCFS: reservations hold capacity, whole-or-nothing space gate", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    [...FIRST.map((b) => b.suffix), ...LATE, "XG", "XS"].forEach(seedExport);
+  });
+
+  it("operations prepares the export corridor and the D+3 train with an open window", () => {
+    ensureExportRoute();
+    resetCorridorDay(DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    resetCorridorDay(GIANT_DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-EXP-3", "LOCO-EXP-4"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+  });
+
+  it("three exporters book and are accepted — 54 wagons reserved BEFORE any payment", () => {
+    let isoSeed = 6500;
+    FIRST.forEach((b) => {
+      bookContainers({
+        suffix: b.suffix,
+        runStamp: stamp,
+        isoSeed,
+        twenty: b.twenty,
+        forty: b.forty,
+        scheduledDate: BOOKING_DAY,
+      });
+      isoSeed += b.twenty + b.forty;
+      acceptExport(b.suffix);
+    });
+  });
+
+  it("three late exporters are rejected at submission — the space gate reports no room", () => {
+    LATE.forEach((suffix, i) => {
+      bookContainers({
+        suffix,
+        runStamp: stamp,
+        isoSeed: 6700 + i * 30,
+        twenty: 20, // 10 wagons — but reservations already hold all 54
+        scheduledDate: BOOKING_DAY,
+        expectFailure: /space|window/i,
+      });
+    });
+  });
+
+  it("the three reserved pay — 54/54 allocated and the export window flips FULL", () => {
+    FIRST.forEach((b) => {
+      markPaid(b.suffix);
+      pollAllocations(b.suffix, b.wagons);
+    });
+    withExportSchedule(DEPARTURE, (s) => {
+      pollDb<ScheduleRow>(
+        "export window FULL",
+        `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL",
+      );
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [s.id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+    });
+  });
+
+  it("whole-or-nothing: a 58-wagon giant is rejected against the empty D+4 train", () => {
+    createImportSchedule({
+      departure: GIANT_DEPARTURE,
+      locoPair: ["LOCO-EXP-5", "LOCO-EXP-6"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(GIANT_DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+
+    bookContainers({
+      suffix: "XG",
+      runStamp: stamp,
+      isoSeed: 7000,
+      twenty: 116, // 58 wagons > 54 — export never splits
+      scheduledDate: GIANT_DAY,
+      expectFailure: /space|window/i,
+    });
+  });
+
+  it("rebooked at exactly 54 wagons the giant reserves the whole train alone, pays, fills it", () => {
+    bookContainers({
+      suffix: "XG",
+      runStamp: stamp,
+      isoSeed: 7200,
+      twenty: 108, // 54 wagons — the whole consist
+      scheduledDate: GIANT_DAY,
+    });
+    acceptExport("XG");
+    markPaid("XG");
+    pollAllocations("XG", 54);
+    withExportSchedule(GIANT_DEPARTURE, (s) => {
+      pollDb<ScheduleRow>(
+        "giant train FULL from one booking",
+        `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL",
+      );
+      withBooking("XG", (b) => {
+        expect(b.train_schedule_id, "giant rides its train").to.eq(s.id);
+      });
+    });
+  });
+
+  it("a 1-wagon afterthought bounces off the FULL train", () => {
+    bookContainers({
+      suffix: "XS",
+      runStamp: stamp,
+      isoSeed: 7400,
+      twenty: 2,
+      scheduledDate: GIANT_DAY,
+      expectFailure: /space|window/i,
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/export_full_train.cy.ts b/e2e/freight/cypress/e2e/flows/export_full_train.cy.ts
new file mode 100644
index 000000000..d7c2c728d
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/export_full_train.cy.ts
@@ -0,0 +1,285 @@
+/**
+ * EXPORT journey E1 — six container bookings fill the 54-wagon train on the
+ * reversed corridor KALITY → MOJO → E2E_AWASH → DIRE_DAWA → NAGAD →
+ * DJIB_PORT, all inside the ONE FCFS export window, then the full life of the
+ * train to Djibouti Port and the export customs tail.
+ *
+ * Export mechanics under test (vs import): no cycles, no doc-review/payment
+ * phases, no batch — the ops ACCEPT itself reserves the wagons FCFS and opens
+ * a pay window CLAMPED to the window close.
+ *
+ * The six bookings (Σ = 54 wagons):
+ *   EF1  customs + USD   16×20ft            =  8 wagons
+ *   EF2  customs + ETB    6×40ft            =  6 wagons
+ *   EF3  self    + ETB   12×20ft            =  6 wagons
+ *   EF4  self    + ETB    6×40ft            =  6 wagons
+ *   EF5  customs + USD   44×20ft            = 22 wagons  (the ≥22-wagon giant)
+ *   EF6  self    + USD    4×40ft + 4×20ft   =  6 wagons
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  acceptExport,
+  apiPost,
+  bookContainers,
+  createImportSchedule,
+  db,
+  dbBooking,
+  departureAt,
+  eatDayStr,
+  ensureExportRoute,
+  EXP_DEST,
+  EXP_ORIGIN,
+  expectMilestoneDone,
+  completeBookingMilestone,
+  forceWindowOpen,
+  glUpload,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withExportSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(2);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const BOOKINGS: Array<{
+  suffix: string;
+  customs: boolean;
+  currency: "ETB" | "USD";
+  twenty: number;
+  forty: number;
+  wagons: number;
+}> = [
+  { suffix: "EF1", customs: true, currency: "USD", twenty: 16, forty: 0, wagons: 8 },
+  { suffix: "EF2", customs: true, currency: "ETB", twenty: 0, forty: 6, wagons: 6 },
+  { suffix: "EF3", customs: false, currency: "ETB", twenty: 12, forty: 0, wagons: 6 },
+  { suffix: "EF4", customs: false, currency: "ETB", twenty: 0, forty: 6, wagons: 6 },
+  { suffix: "EF5", customs: true, currency: "USD", twenty: 44, forty: 0, wagons: 22 },
+  { suffix: "EF6", customs: false, currency: "USD", twenty: 4, forty: 4, wagons: 6 },
+];
+const CUSTOMS = BOOKINGS.filter((b) => b.customs).map((b) => b.suffix);
+const SELF_CLEAR = BOOKINGS.filter((b) => !b.customs).map((b) => b.suffix);
+
+function withScheduleId(fn: (id: string, s: ScheduleRow) => void) {
+  withExportSchedule(DEPARTURE, (s) => fn(s.id, s));
+}
+
+describe("export: six bookings fill the 54-wagon corridor train (FCFS)", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    for (const b of BOOKINGS) {
+      seedImportContract({
+        suffix: b.suffix,
+        reference: stampedRef(b.suffix),
+        currency: b.currency,
+        customs: b.customs,
+        direction: "EXPORT",
+        originCode: EXP_ORIGIN,
+        destCode: EXP_DEST,
+      });
+    }
+  });
+
+  it("operations ensures the reversed export corridor exists (direction frozen EXPORT)", () => {
+    ensureExportRoute();
+    resetCorridorDay(DEPARTURE, EXP_DEST, EXP_ORIGIN);
+  });
+
+  it("operations schedules the 54-wagon export train — its single FCFS window forced open", () => {
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-EXP-1", "LOCO-EXP-2"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withScheduleId((id) => forceWindowOpen(id, 60));
+  });
+
+  it("six exporters book inside the one window", () => {
+    let isoSeed = 6000;
+    BOOKINGS.forEach((b) => {
+      bookContainers({
+        suffix: b.suffix,
+        runStamp: stamp,
+        isoSeed,
+        twenty: b.twenty,
+        forty: b.forty,
+        scheduledDate: BOOKING_DAY,
+      });
+      isoSeed += b.twenty + b.forty;
+      pollBookingStatus(b.suffix, "OPERATION_REQUEST_PENDING", 5);
+    });
+  });
+
+  it("each accept reserves FCFS immediately — pay deadlines clamped to the window close", () => {
+    BOOKINGS.forEach((b) => acceptExport(b.suffix));
+    withScheduleId((_, s) => {
+      BOOKINGS.forEach((b) => {
+        withBooking(b.suffix, (row) => {
+          expect(row.payment_deadline, `${b.suffix} pay deadline`).to.be.a("string");
+          expect(
+            new Date(row.payment_deadline!).getTime(),
+            `${b.suffix} deadline never outlives the window close`,
+          ).to.be.at.most(new Date(s.window_closes_at!).getTime());
+        });
+      });
+    });
+    // Reservation invoices carry the CONTRACT currency.
+    BOOKINGS.forEach((b) => {
+      withBooking(b.suffix, (row) => {
+        pollDb<{ currency: string }>(
+          `${b.suffix} invoice`,
+          `SELECT currency FROM freight.invoices
+           WHERE source_id = $1 AND deleted_at IS NULL
+           ORDER BY created_at DESC LIMIT 1`,
+          [row.id],
+          (inv) => inv?.currency === b.currency,
+          10,
+        );
+      });
+    });
+  });
+
+  it("all six pay — allocated 54/54, the export window flips FULL, staff finalize", () => {
+    BOOKINGS.forEach((b) => {
+      markPaid(b.suffix);
+      pollAllocations(b.suffix, b.wagons);
+    });
+    withScheduleId((id) => {
+      pollDb<ScheduleRow>(
+        "export window FULL",
+        `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.booking_window_status === "FULL",
+      );
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+      // Export has no auto-finalize conclude step — staff finalize explicitly.
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/finalize`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule SCHEDULED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "SCHEDULED",
+        10,
+      );
+    });
+  });
+
+  it("gate pass granted at the Djibouti end; T1 documents uploaded for the customs bookings", () => {
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/import-djibouti/gatepass-granted`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        glUpload(`/api/contracts/bookings/${b.id}/transport-document`);
+      });
+    });
+  });
+
+  it("the train dispatches — every booking boards at KALITY (IN_TRANSIT)", () => {
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/dispatch`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule DISPATCHED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "DISPATCHED",
+        10,
+      );
+    });
+    BOOKINGS.forEach((b) => pollBookingStatus(b.suffix, "IN_TRANSIT", 10));
+  });
+
+  it("the train runs the corridor and arrives at Djibouti Port — every booking ARRIVED", () => {
+    withScheduleId((id) => {
+      [1, 2, 3, 4].forEach((seq) => {
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+          sequenceNo: seq,
+          kind: "PASSED",
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+        sequenceNo: 5,
+        kind: "ARRIVED",
+      })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule ARRIVED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "ARRIVED",
+        20,
+      );
+    });
+    BOOKINGS.forEach((b) => pollBookingStatus(b.suffix, "ARRIVED", 20));
+    withScheduleId((id) => {
+      db<{ n: string }>(
+        `SELECT count(*) AS n FROM freight.wagon_movements
+         WHERE train_schedule_id = $1`,
+        [id],
+      ).then(({ rows }) =>
+        expect(Number(rows[0].n), "wagon movement ledger rows").to.be.at.least(54),
+      );
+    });
+  });
+
+  it("GL Djibouti closes the export tail (T1 close → offloaded) on every customs booking", () => {
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        apiPost("superadmin@tria.com", `/api/contracts/bookings/${b.id}/t1-close`)
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+      completeBookingMilestone(suffix, "OFFLOADED");
+      expectMilestoneDone(suffix, "T1_CLOSED");
+      expectMilestoneDone(suffix, "OFFLOADED");
+    });
+  });
+
+  it("the self-clearance bookings arrived clean — no customs tail required", () => {
+    SELF_CLEAR.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        expect(b.status, `${suffix} final status`).to.eq("ARRIVED");
+      });
+      dbBooking(suffix).then(({ rows }) => {
+        db<{ n: string }>(
+          `SELECT count(*) AS n FROM freight.clearance_milestones
+           WHERE booking_id = $1 AND milestone_code = 'T1_CLOSED'
+             AND status = 'COMPLETED' AND deleted_at IS NULL`,
+          [rows[0].id],
+        ).then(({ rows: ms }) =>
+          expect(Number(ms[0].n), `${suffix} has no T1 tail`).to.eq(0),
+        );
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/export_matrix.cy.ts b/e2e/freight/cypress/e2e/flows/export_matrix.cy.ts
new file mode 100644
index 000000000..34821bd5c
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/export_matrix.cy.ts
@@ -0,0 +1,245 @@
+/**
+ * EXPORT critical-scenario matrix (reversed corridor, D+7):
+ *
+ *   1. sub-corridor export: a DIRE_DAWA → DJIB_PORT booking boards mid-route
+ *      and shares the train with a KALITY through-booking
+ *   2. directional FULL: through 40w + sub-corridor 14w commit every wagon on
+ *      the border edges → the export window flips FULL while the KALITY→MOJO
+ *      home leg still has 14 free wagons
+ *   3. intercity ride-along on the FULL export train's free home leg
+ *      (KALITY → MOJO, DOMESTIC, dateless) — accepted, pay deadline clamped
+ *      to the EXPORT window close, paid + linked; the window stays FULL
+ *   4. same-day sibling export train keeps its OWN window — export is
+ *      excluded from the import route-day group rule
+ *   5. duplicate ISO container number across two bookings of the same
+ *      route-day is rejected
+ *
+ * Sequential steps — retries off.
+ */
+
+import {
+  acceptExport,
+  apiPost,
+  bookContainers,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  ensureExportRoute,
+  EXP_DEST,
+  EXP_ORIGIN,
+  forceWindowOpen,
+  isoNumber,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withExportSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(7);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+describe("export matrix: sub-corridor, directional FULL, intercity on FULL train, own windows", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    seedImportContract({
+      suffix: "EM1",
+      reference: stampedRef("EM1"),
+      direction: "EXPORT",
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    seedImportContract({
+      suffix: "EMSUB",
+      reference: stampedRef("EMSUB"),
+      direction: "EXPORT",
+      originCode: "DIRE_DAWA",
+      destCode: EXP_DEST,
+    });
+    seedImportContract({
+      suffix: "EMIC",
+      reference: stampedRef("EMIC"),
+      direction: "DOMESTIC",
+      originCode: EXP_ORIGIN,
+      destCode: "MOJO",
+    });
+    seedImportContract({
+      suffix: "EMDUP",
+      reference: stampedRef("EMDUP"),
+      direction: "EXPORT",
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+  });
+
+  it("operations prepares the export corridor and the D+7 train with an open window", () => {
+    ensureExportRoute();
+    resetCorridorDay(DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-EXP-11", "LOCO-EXP-12"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 90));
+  });
+
+  it("a KALITY through-booking (40w) and a DIRE_DAWA sub-corridor booking (14w) share the train", () => {
+    bookContainers({
+      suffix: "EM1",
+      runStamp: stamp,
+      isoSeed: 8600,
+      twenty: 80, // 40 wagons, full corridor
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptExport("EM1");
+
+    // While the window is still OPEN (14 wagons free): a booking reusing one
+    // of EM1's ISO container numbers on the same route-day is rejected.
+    db<{ id: string }>(
+      `SELECT id FROM freight.contracts
+       WHERE reference LIKE 'CTR-IMP-%-' || $1
+       ORDER BY created_at DESC LIMIT 1`,
+      ["EMDUP"],
+    ).then(({ rows }) => {
+      apiPost(
+        "user@gmail.com",
+        `/api/contracts/${rows[0].id}/bookings`,
+        {
+          scheduledDate: BOOKING_DAY,
+          containers: [
+            {
+              containerSize: "20ft",
+              quantity: 2,
+              units: [
+                { containerNumber: isoNumber(stamp, 8600), vgmTons: 10 },
+                { containerNumber: isoNumber(stamp, 9990), vgmTons: 10 },
+              ],
+            },
+          ],
+        },
+        false,
+      ).then((res) => {
+        expect(res.status, "cross-booking ISO clash rejected").to.be.within(400, 422);
+        expect(JSON.stringify(res.body).toLowerCase()).to.include("container");
+      });
+    });
+
+    bookContainers({
+      suffix: "EMSUB",
+      runStamp: stamp,
+      isoSeed: 8700,
+      twenty: 28, // 14 wagons, boards mid-route at DIRE_DAWA
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptExport("EMSUB");
+
+    markPaid("EM1");
+    pollAllocations("EM1", 40);
+    markPaid("EMSUB");
+    pollAllocations("EMSUB", 14);
+
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("EM1", (b) => expect(b.train_schedule_id).to.eq(s.id));
+      withBooking("EMSUB", (b) => expect(b.train_schedule_id).to.eq(s.id));
+    });
+  });
+
+  it("the border edges are committed — the export window flips FULL (home leg still empty)", () => {
+    withExportSchedule(DEPARTURE, (s) => {
+      pollDb<ScheduleRow>(
+        "directional FULL",
+        `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL",
+      );
+    });
+  });
+
+  it("intercity ride-along boards the FULL train's free home leg — deadline clamped to the export close", () => {
+    bookContainers({
+      suffix: "EMIC",
+      runStamp: stamp,
+      isoSeed: 8800,
+      twenty: 4, // 2 wagons KALITY → MOJO, dateless
+    });
+    withBooking("EMIC", (b) => {
+      apiPost(opsStaff, `/api/bookings/${b.id}/operation/review`, { decision: "ACCEPT" })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+    pollBookingStatus("EMIC", "FULLY_EXECUTED", 10);
+
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("EMIC", (b) => {
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${s.id}/intercity/accept`, {
+          bookingIds: [b.id],
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+    });
+    pollBookingStatus("EMIC", ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]);
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("EMIC", (b) => {
+        // Export parity: the ride-along's pay window never outlives the close.
+        expect(new Date(b.payment_deadline!).getTime()).to.be.at.most(
+          new Date(s.window_closes_at!).getTime(),
+        );
+      });
+    });
+    markPaid("EMIC");
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("EMIC", (b) => {
+        expect(b.train_schedule_id, "linked to the export train").to.eq(s.id);
+      });
+      // The ride-along never reopens the export window.
+      expect(s.booking_window_status, "window stays FULL").to.eq("FULL");
+    });
+  });
+
+  it("a same-day sibling export train keeps its OWN window — no route-day group for export", () => {
+    const sibling = new Date(DEPARTURE.getTime() + 90 * 60_000);
+    createImportSchedule({
+      departure: sibling,
+      locoPair: ["LOCO-EXP-1", "LOCO-EXP-2"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(DEPARTURE, (anchor) => {
+      db<{ id: string; window_phase: string; window_closes_at: string }>(
+        `SELECT ts.id, ts.window_phase, ts.window_closes_at
+         FROM freight.train_schedules ts
+         JOIN freight.yards o ON o.id = ts.origin_station_id AND o.code = $1
+         JOIN freight.yards d ON d.id = ts.destination_station_id AND d.code = $2
+         WHERE ts.deleted_at IS NULL AND ts.id <> $3
+           AND abs(extract(epoch FROM (ts.scheduled_departure_date - $4::timestamptz))) < 7200
+         ORDER BY ts.created_at DESC LIMIT 1`,
+        [EXP_ORIGIN, EXP_DEST, anchor.id, DEPARTURE.toISOString()],
+      ).then(({ rows }) => {
+        expect(rows, "sibling export schedule").to.have.length(1);
+        // The anchor's window was forced/consumed (FULL); a joiner under the
+        // import group rule would copy its live state. Export siblings don't:
+        // this one starts its own PRE_WINDOW timeline anchored to its OWN
+        // departure.
+        expect(rows[0].window_phase, "own fresh window").to.eq("PRE_WINDOW");
+        expect(
+          new Date(rows[0].window_closes_at).getTime(),
+          "own close, clamped to its own departure",
+        ).to.not.eq(new Date(anchor.window_closes_at!).getTime());
+      });
+    });
+  });
+
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/export_one_time.cy.ts b/e2e/freight/cypress/e2e/flows/export_one_time.cy.ts
new file mode 100644
index 000000000..8e7c6334d
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/export_one_time.cy.ts
@@ -0,0 +1,524 @@
+/**
+ * Export ONE_TIME journeys — two contracts ride the same export train
+ * (Mojo Dry Port → Dire Dawa Yard → Djibouti Port Terminal):
+ *
+ *   A. CONTAINER (20ft + 40ft):
+ *      portal wizard → staff approval chain → OTP sign → counter-sign
+ *      → AWAITING_CLEARANCE_DOCUMENTS (export self-clear has no required
+ *      docs in e2e) → ops finalize → FULLY_EXECUTED → customer books
+ *      2 × 20ft + 1 × 40ft picking a real Shipment day → ops accepts the
+ *      operation request → EXPORT is FCFS, so accept reserves the train slot
+ *      immediately: SELECTED_FOR_BATCH with a pay deadline clamped to the
+ *      export window close → staff mark-paid → PAID + SCHEDULED + linked.
+ *
+ *   B. BULK (E2E Wheat, 60 tons): same journey through the bulk wizard and
+ *      bulk booking form, riding CW4 covered wagons on the same train.
+ *
+ * Infrastructure (route, built train, distances, rates, cargo types) comes
+ * from seed-intercity.sql + seed-export.sql; the export route and the
+ * departing-today schedule are created through the UI when missing.
+ *
+ * Sequential steps of one journey — retries off (steps are not idempotent).
+ */
+
+const customer = "user@gmail.com";
+const companyTin = "0102030405"; // seed-company.sql
+const opsStaff = "operation@edr.local";
+
+const ORIGIN_YARD = "Mojo Dry Port";
+const MID_YARD = "Dire Dawa Yard";
+const PORT_YARD = "Djibouti Port Terminal";
+const TRAIN_CODE = "TRN-E2E-1";
+
+// Container numbers must be ISO (4 letters + 7 digits) and unused — stamp per run.
+const stamp = String(Date.now());
+const isoNumber = (prefix: string, offset: number) =>
+  `${prefix}${String(Number(stamp.slice(-7)) + offset).padStart(7, "0")}`;
+
+const apiUrl = () => Cypress.env("apiUrl") as string;
+
+function dbContract(freight: "CONTAINER" | "BULK") {
+  return cy.task<{ rows: Array<{ id: string; reference: string; status: string }> }>(
+    "db:query",
+    {
+      sql: `SELECT ct.id, ct.reference, ct.status
+            FROM freight.contracts ct
+            JOIN freight.companies c ON c.id = ct.company_id
+            WHERE c.tin = $1 AND ct.trade_direction = 'EXPORT' AND ct.freight_type = $2
+            ORDER BY ct.created_at DESC LIMIT 1`,
+      params: [companyTin, freight],
+    },
+  );
+}
+
+function withContract(
+  freight: "CONTAINER" | "BULK",
+  fn: (c: { id: string; reference: string; status: string }) => void,
+) {
+  dbContract(freight).then(({ rows }) => {
+    expect(rows, `latest EXPORT ${freight} contract`).to.have.length(1);
+    fn(rows[0]);
+  });
+}
+
+function expectContractStatus(freight: "CONTAINER" | "BULK", expected: string) {
+  dbContract(freight).then(({ rows }) => {
+    expect(rows[0]?.status, "contract status").to.eq(expected);
+  });
+}
+
+function dbBooking(freight: "CONTAINER" | "BULK") {
+  return cy.task<{
+    rows: Array<{
+      id: string;
+      reference: string;
+      status: string;
+      scheduling_status: string;
+      train_schedule_id: string | null;
+      payment_deadline: string | null;
+      scheduled_date: string | null;
+    }>;
+  }>("db:query", {
+    sql: `SELECT b.id, b.reference, b.status, b.scheduling_status,
+                 b.train_schedule_id, b.payment_deadline, b.scheduled_date
+          FROM freight.bookings b
+          JOIN freight.companies c ON c.id = b.company_id
+          WHERE c.tin = $1 AND b.trade_direction = 'EXPORT' AND b.freight_type = $2
+          ORDER BY b.created_at DESC LIMIT 1`,
+    params: [companyTin, freight],
+  });
+}
+
+function withBooking(
+  freight: "CONTAINER" | "BULK",
+  fn: (b: {
+    id: string;
+    reference: string;
+    status: string;
+    scheduling_status: string;
+    train_schedule_id: string | null;
+    payment_deadline: string | null;
+    scheduled_date: string | null;
+  }) => void,
+) {
+  dbBooking(freight).then(({ rows }) => {
+    expect(rows, `EXPORT ${freight} booking`).to.have.length(1);
+    fn(rows[0]);
+  });
+}
+
+/**
+ * The journey's export schedule. Export trains must be scheduled ≥ the booking
+ * lead (24h) ahead, and their window OPENS at departure − lead — so the spec
+ * departs at now + 24h + a couple of minutes: creatable now, window opens
+ * minutes later. (The intercity spec's train leaves in 2 days — outside 25h.)
+ */
+function dbUpcomingSchedule() {
+  return cy.task<{
+    rows: Array<{ id: string; window_closes_at: string; booking_window_status: string }>;
+  }>("db:query", {
+    sql: `SELECT ts.id, ts.window_closes_at, ts.booking_window_status
+          FROM freight.train_schedules ts
+          WHERE ts.direction = 'EXPORT' AND ts.deleted_at IS NULL
+            AND ts.scheduled_departure_date > now()
+            AND ts.scheduled_departure_date < now() + interval '25 hours'
+          ORDER BY ts.created_at DESC LIMIT 1`,
+  });
+}
+
+/** The train departs ~24h out — bookings ride its departure day (tomorrow). */
+const SHIPMENT_DAY = new Date(Date.now() + 24 * 3_600_000 + 150_000);
+
+function fill(label: string | RegExp, value: string) {
+  cy.contains("label", label)
+    .invoke("attr", "for")
+    .then((id) => {
+      cy.get(`[id="${id}"]`).clear({ force: true }).type(value, { force: true });
+    });
+}
+
+/** Fill the N-th input whose label matches (two container-size editors both say "Quantity *"). */
+function fillNth(label: RegExp, index: number, value: string) {
+  cy.get("label").then(($labels) => {
+    const matches = $labels.filter((_, el) => label.test(el.textContent ?? ""));
+    expect(matches.length, `labels matching ${label}`).to.be.greaterThan(index);
+    const id = matches.eq(index).attr("for");
+    cy.get(`[id="${id}"]`).clear({ force: true }).type(value, { force: true });
+  });
+}
+
+/**
+ * Choose the train's departure day on the Schedule card's INLINE calendar
+ * (cargo-aware: days only unlock once the cargo details above are valid).
+ */
+function pickShipmentDay() {
+  cy.contains(/available day/, { timeout: 30000 }).should("exist");
+  // Day cells are plain buttons in a div grid; only bookable days are enabled
+  // (out-of-month duplicates stay disabled).
+  const day = String(SHIPMENT_DAY.getDate());
+  cy.get("button:not(:disabled)", { timeout: 15000 })
+    .contains(new RegExp(`^${day}$`))
+    .click({ force: true });
+}
+
+/** Shared staff steps: accept + LINE_STAFF approve, then director approve. */
+function approveChain(freight: "CONTAINER" | "BULK") {
+  cy.loginBackoffice("marketer@edr.local");
+  withContract(freight, (c) => cy.visit(`/dashboard/contract-requests/${c.id}`));
+  cy.contains("button", "Accept for approval", { timeout: 20000 }).click();
+  cy.contains("button", "Accept & start approval", { timeout: 20000 })
+    .should("not.be.disabled")
+    .click();
+  cy.contains("Approval chain", { timeout: 20000 }).should("be.visible");
+  cy.contains("button", "Approve", { timeout: 20000 }).click();
+  cy.contains("button", "Confirm approval").click();
+  cy.contains("1/2", { timeout: 20000 }).should("be.visible");
+
+  cy.loginBackoffice("director@edr.local");
+  withContract(freight, (c) => cy.visit(`/dashboard/contract-requests/${c.id}`));
+  cy.contains("button", "Approve", { timeout: 20000 }).click();
+  cy.contains("button", "Confirm approval").click();
+  cy.contains("button", "View & sign", { timeout: 30000 }).should("exist");
+  expectContractStatus(freight, "CONTRACT_READY");
+}
+
+/** Shared customer OTP-signature step. */
+function customerSigns(freight: "CONTAINER" | "BULK") {
+  cy.loginPortal(customer);
+  withContract(freight, (c) => cy.visitPortal(`/contracts/${c.id}/view`));
+
+  const unlockConsent = (attempt: number) => {
+    cy.get('iframe[title="Contract document"]', { timeout: 30000 }).then(($f) => {
+      const win = ($f[0] as HTMLIFrameElement).contentWindow;
+      const el = win?.document?.scrollingElement ?? win?.document?.documentElement;
+      if (win && el) {
+        el.scrollTop = el.scrollHeight;
+        win.dispatchEvent(new Event("scroll"));
+      }
+    });
+    cy.wait(500).then(() => {
+      cy.get("body").then(($b) => {
+        if ($b.text().includes("I have read the entire contract")) return;
+        expect(attempt, "consent bar unlocked").to.be.lessThan(20);
+        unlockConsent(attempt + 1);
+      });
+    });
+  };
+  unlockConsent(0);
+
+  cy.contains("I have read the entire contract", { timeout: 15000 }).click();
+  cy.contains("button", /^Sign contract$|^Approve & sign$/).click();
+  cy.contains("label", "Full name")
+    .invoke("attr", "for")
+    .then((id) => {
+      cy.get(`[id="${id}"]`).clear().type("Demo User");
+    });
+  cy.drawSignature();
+  cy.contains("button", "Continue to verification").click();
+  cy.contains("Verify it's you", { timeout: 20000 }).should("be.visible");
+  cy.getOtp(customer).then((otp) => cy.typeOtp(otp));
+  cy.contains("button", "Verify & sign").click();
+  cy.contains("Your signature has been recorded", { timeout: 30000 }).should("be.visible");
+  expectContractStatus(freight, "SIGNED_CUSTOMER");
+}
+
+/** Shared counter-sign + ops finalize (export self-clear: no required docs in e2e). */
+function counterSignAndFinalize(freight: "CONTAINER" | "BULK") {
+  cy.loginBackoffice("marketer@edr.local");
+  withContract(freight, (c) => cy.visit(`/dashboard/contract-requests/${c.id}/view`));
+  cy.contains("button", /^Sign as staff$|^Approve & sign$/, { timeout: 30000 }).click();
+  cy.contains("label", "Full name")
+    .invoke("attr", "for")
+    .then((id) => {
+      cy.get(`[id="${id}"]`).clear().type("EDR Marketer");
+    });
+  cy.drawSignature();
+  cy.get(".mantine-Modal-content")
+    .contains("button", /^Confirm signature$|^Approve & sign$/)
+    .click();
+  cy.contains("counter-signed", { timeout: 30000 }).should("be.visible");
+  expectContractStatus(freight, "AWAITING_CLEARANCE_DOCUMENTS");
+
+  cy.loginBackoffice(opsStaff);
+  withContract(freight, (c) => cy.visit(`/dashboard/contract-requests/${c.id}`));
+  cy.contains('[role="tab"]', "Clearance Review", { timeout: 30000 }).click();
+  cy.contains("button", "Finalize document approval", { timeout: 30000 })
+    .should("not.be.disabled")
+    .click();
+  cy.contains("finalized", { timeout: 30000 }).should("be.visible");
+  expectContractStatus(freight, "FULLY_EXECUTED");
+}
+
+/** Ops accept: EXPORT is FCFS — accept reserves the slot and opens the pay window. */
+function acceptAndAssertReserved(freight: "CONTAINER" | "BULK") {
+  cy.loginBackoffice(opsStaff);
+  withBooking(freight, (b) => cy.visit(`/dashboard/booking-requests/${b.id}`));
+  cy.contains("button", /Accept operation|^Accept$/, { timeout: 20000 }).click();
+  cy.contains("Accept operation request?", { timeout: 15000 }).should("be.visible");
+  cy.get(".mantine-Modal-content").contains("button", /^Accept$/).click();
+  cy.get(".mantine-Modal-content", { timeout: 30000 }).should("not.exist");
+
+  dbUpcomingSchedule().then(({ rows: schedules }) => {
+    expect(schedules, "departing-today export schedule").to.have.length(1);
+    withBooking(freight, (b) => {
+      expect(b.status, "FCFS reservation").to.eq("SELECTED_FOR_BATCH");
+      expect(b.train_schedule_id).to.eq(schedules[0].id);
+      // Export parity: the pay window never outlives the booking window close.
+      expect(b.payment_deadline, "pay deadline set").to.be.a("string");
+      expect(new Date(b.payment_deadline!).getTime()).to.be.at.most(
+        new Date(schedules[0].window_closes_at).getTime(),
+      );
+    });
+  });
+}
+
+function markPaidAndAssertAllocated(freight: "CONTAINER" | "BULK") {
+  withBooking(freight, (b) => {
+    cy.apiLogin(opsStaff).then(({ token }) => {
+      cy.request({
+        method: "POST",
+        url: `${apiUrl()}/api/train-scheduling/bookings/${b.id}/mark-paid`,
+        headers: { Authorization: `Bearer ${token}` },
+      })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+  });
+  withBooking(freight, (b) => {
+    expect(b.status).to.eq("PAID");
+    expect(b.scheduling_status).to.eq("SCHEDULED");
+    cy.task<{ rows: Array<{ n: string }> }>("db:query", {
+      sql: `SELECT count(*) AS n FROM freight.train_schedule_bookings
+            WHERE booking_id = $1 AND deleted_at IS NULL`,
+      params: [b.id],
+    }).then(({ rows }) => {
+      expect(Number(rows[0].n), "train_schedule_bookings link").to.eq(1);
+    });
+  });
+}
+
+describe("export one-time journeys: container + bulk on one train", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-intercity.sql");
+    cy.task("db:seedFile", "seed-export.sql");
+  });
+
+  // ── Shared infrastructure ─────────────────────────────────────────────────
+
+  it("operations ensures the export route exists", () => {
+    cy.loginBackoffice(opsStaff);
+    cy.task<{ rows: Array<{ n: string }> }>("db:query", {
+      sql: `SELECT count(*) AS n
+            FROM freight.routes r
+            JOIN freight.yards o ON o.id = r.origin_yard_id AND o.code = 'MOJO'
+            JOIN freight.yards d ON d.id = r.destination_yard_id AND d.code = 'DJIB_PORT'
+            WHERE r.deleted_at IS NULL`,
+    }).then(({ rows }) => {
+      if (Number(rows[0].n) > 0) return;
+
+      cy.visit("/dashboard/routes");
+      cy.contains("button", "Add route", { timeout: 20000 }).click();
+      cy.contains("Add Route", { timeout: 15000 }).should("be.visible");
+      cy.get(".mantine-Modal-content").contains("button", "Add milestone").click();
+      const pickYard = (index: number, yard: string) => {
+        cy.get('.mantine-Modal-content input[placeholder="Select yard"]')
+          .eq(index)
+          .click({ force: true });
+        cy.get('[role="option"]:visible').contains(yard).click();
+      };
+      pickYard(0, ORIGIN_YARD);
+      pickYard(1, MID_YARD);
+      pickYard(2, PORT_YARD);
+      cy.get(".mantine-Modal-content").contains("button", "Save").click();
+    });
+  });
+
+  it("operations schedules the export train — booking window opens", () => {
+    cy.loginBackoffice(opsStaff);
+
+    dbUpcomingSchedule().then(({ rows }) => {
+      if (rows.length > 0) return;
+
+      cy.visit("/dashboard/operations/train-scheduling-v2");
+      cy.contains("button", "New schedule", { timeout: 20000 }).click();
+      cy.contains("Create train schedule", { timeout: 15000 }).should("be.visible");
+      cy.mantineSelect(/^Route$/, new RegExp(ORIGIN_YARD));
+
+      // Just past the 24h scheduling lead: creatable now, and the export
+      // window (opens departure − lead) flips OPEN a couple of minutes later.
+      const local = new Date(
+        SHIPMENT_DAY.getTime() - SHIPMENT_DAY.getTimezoneOffset() * 60000,
+      )
+        .toISOString()
+        .slice(0, 16);
+      cy.get('.mantine-Modal-content input[type="datetime-local"]')
+        .clear({ force: true })
+        .type(local, { force: true });
+      cy.mantineSelect(/^Train$/, new RegExp(TRAIN_CODE));
+      cy.get(".mantine-Modal-content").contains("button", "Create").click();
+      cy.location("pathname", { timeout: 30000 }).should(
+        "match",
+        /\/dashboard\/operations\/train-scheduling-v2\/.+/,
+      );
+    });
+
+    // The 10s window tick flips PRE_WINDOW → OPEN once the lead moment passes.
+    const waitForOpenWindow = (attempt: number) => {
+      dbUpcomingSchedule().then(({ rows }) => {
+        expect(rows, "upcoming export schedule").to.have.length(1);
+        if (rows[0].booking_window_status === "OPEN") return;
+        expect(attempt, "export booking window OPEN").to.be.lessThan(40);
+        cy.wait(10000).then(() => waitForOpenWindow(attempt + 1));
+      });
+    };
+    waitForOpenWindow(0);
+  });
+
+  // ── Journey A: container 20ft + 40ft ──────────────────────────────────────
+
+  it("customer submits an export container contract (20ft + 40ft)", () => {
+    cy.loginPortal(customer);
+    cy.visitPortal("/contracts/new");
+
+    cy.mantineSelect(/^Operation Type/, /^Export$/);
+    cy.mantineSelect(/^Contract Kind/, "One-Time Contract");
+    cy.mantineSelect(/^New or Renewal/, "New Contract");
+    cy.contains("button", "Rail Transport Only", { timeout: 15000 }).click({ force: true });
+    cy.mantineSelect(/^Payment Currency/, /^ETB/);
+    cy.contains("button", "Continue").click({ force: true });
+
+    cy.mantineSelect(/^Cargo Scope/, /Containerized/);
+    cy.get('[role="checkbox"][aria-label="20ft Container"]').click();
+    cy.get('[role="checkbox"][aria-label="40ft Container"]').click();
+    cy.get('textarea[placeholder*="Electronics"]').type("E2E export electronics");
+    cy.mantineSelect(/^Origin Yard/, ORIGIN_YARD);
+    cy.mantineSelect(/^Destination Yard/, PORT_YARD);
+    cy.contains("button", "Continue").click({ force: true });
+
+    cy.contains("button", "Submit").click({ force: true });
+    cy.contains("Approve your quotation", { timeout: 30000 }).should("be.visible");
+    cy.contains("button", "Approve & submit").click();
+    cy.location("pathname", { timeout: 20000 }).should("eq", "/contracts");
+
+    expectContractStatus("CONTAINER", "SUBMITTED");
+  });
+
+  it("staff approve the container contract (marketer + director)", () => {
+    approveChain("CONTAINER");
+  });
+
+  it("customer signs the container contract with OTP", () => {
+    customerSigns("CONTAINER");
+  });
+
+  it("staff counter-sign and operations finalize the container contract", () => {
+    counterSignAndFinalize("CONTAINER");
+  });
+
+  it("customer books 2 × 20ft + 1 × 40ft with a shipment day", () => {
+    cy.loginPortal(customer);
+    withContract("CONTAINER", (c) => cy.visitPortal(`/contracts/${c.id}/bookings/new`));
+    cy.contains("New Shipment Booking", { timeout: 20000 }).should("be.visible");
+
+    // Two size editors, each with its own "Quantity *" (20ft first, then 40ft).
+    fillNth(/^Quantity/, 0, "2");
+    fillNth(/^Quantity/, 1, "1");
+
+    cy.get('input[placeholder*="MSCU"]', { timeout: 15000 }).should("have.length", 3);
+    cy.get('input[placeholder*="MSCU"]').eq(0).type(isoNumber("MSCU", 0));
+    cy.get('input[placeholder*="MSCU"]').eq(1).type(isoNumber("TCLU", 1));
+    cy.get('input[placeholder*="MSCU"]').eq(2).type(isoNumber("FSCU", 2));
+
+    cy.get('input[placeholder*="24.5"]').each(($input) => {
+      cy.wrap($input).clear({ force: true }).type("10", { force: true });
+    });
+
+    pickShipmentDay();
+
+    cy.contains("button", "Review price & book").should("not.be.disabled").click();
+    cy.contains("Confirm shipment price", { timeout: 30000 }).should("be.visible");
+    cy.contains("button", "Confirm & book").click();
+    cy.location("pathname", { timeout: 30000 }).should("match", /^\/bookings\/.+/);
+
+    withBooking("CONTAINER", (b) => {
+      expect(b.status).to.eq("OPERATION_REQUEST_PENDING");
+      expect(b.scheduled_date, "export bookings carry a shipment day").to.be.a("string");
+    });
+  });
+
+  it("operations accepts the container request — FCFS reserves today's train", () => {
+    acceptAndAssertReserved("CONTAINER");
+  });
+
+  it("staff mark the container booking paid — allocated onto the train", () => {
+    markPaidAndAssertAllocated("CONTAINER");
+  });
+
+  // ── Journey B: bulk (E2E Wheat) ───────────────────────────────────────────
+
+  it("customer submits an export bulk contract (wheat)", () => {
+    cy.loginPortal(customer);
+    cy.visitPortal("/contracts/new");
+
+    cy.mantineSelect(/^Operation Type/, /^Export$/);
+    cy.mantineSelect(/^Contract Kind/, "One-Time Contract");
+    cy.mantineSelect(/^New or Renewal/, "New Contract");
+    cy.contains("button", "Rail Transport Only", { timeout: 15000 }).click({ force: true });
+    cy.mantineSelect(/^Payment Currency/, /^ETB/);
+    cy.contains("button", "Continue").click({ force: true });
+
+    cy.mantineSelect(/^Cargo Scope/, /General \/ Bulk cargo/);
+    cy.mantineSelect(/^Bulk Cargo Type/, "E2E Grains");
+    cy.mantineSelect(/^Commodity/, "E2E Wheat");
+    cy.mantineSelect(/^Origin Yard/, ORIGIN_YARD);
+    cy.mantineSelect(/^Destination Yard/, PORT_YARD);
+    cy.contains("button", "Continue").click({ force: true });
+
+    cy.contains("button", "Submit").click({ force: true });
+    cy.contains("Approve your quotation", { timeout: 30000 }).should("be.visible");
+    cy.contains("button", "Approve & submit").click();
+    cy.location("pathname", { timeout: 20000 }).should("eq", "/contracts");
+
+    expectContractStatus("BULK", "SUBMITTED");
+  });
+
+  it("staff approve the bulk contract (marketer + director)", () => {
+    approveChain("BULK");
+  });
+
+  it("customer signs the bulk contract with OTP", () => {
+    customerSigns("BULK");
+  });
+
+  it("staff counter-sign and operations finalize the bulk contract", () => {
+    counterSignAndFinalize("BULK");
+  });
+
+  it("customer books 60 tons of wheat with a shipment day", () => {
+    cy.loginPortal(customer);
+    withContract("BULK", (c) => cy.visitPortal(`/contracts/${c.id}/bookings/new`));
+    cy.contains("New Shipment Booking", { timeout: 20000 }).should("be.visible");
+
+    fill(/^Quantity \(tons\)/, "60");
+    pickShipmentDay();
+
+    cy.contains("button", "Review price & book").should("not.be.disabled").click();
+    cy.contains("Confirm shipment price", { timeout: 30000 }).should("be.visible");
+    cy.contains("button", "Confirm & book").click();
+    cy.location("pathname", { timeout: 30000 }).should("match", /^\/bookings\/.+/);
+
+    withBooking("BULK", (b) => {
+      expect(b.status).to.eq("OPERATION_REQUEST_PENDING");
+    });
+  });
+
+  it("operations accepts the bulk request — FCFS reserves today's train", () => {
+    acceptAndAssertReserved("BULK");
+  });
+
+  it("staff mark the bulk booking paid — allocated onto the train", () => {
+    markPaidAndAssertAllocated("BULK");
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/export_pay_or_lose.cy.ts b/e2e/freight/cypress/e2e/flows/export_pay_or_lose.cy.ts
new file mode 100644
index 000000000..a0ea7b254
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/export_pay_or_lose.cy.ts
@@ -0,0 +1,207 @@
+/**
+ * EXPORT journeys E3 + E4 — pay-or-lose on the reversed corridor:
+ *
+ *   E3 (D+5): PA + PB reserve 40 wagons and pay. PC reserves the last 14 but
+ *   never pays; a late exporter PD is rejected for space while PC's hold
+ *   lives. PC's pay deadline passes → EXPIRED → the freed 14 wagons are
+ *   instantly FCFS-bookable again: PD rebooks, accepts, pays, allocates.
+ *
+ *   E4 (D+6): five bookings reserve the whole train, only three pay. The
+ *   window CLOSE passes → phase DONE, and the day sweep expires the two
+ *   unpaid reservations. Export days never reopen — no second cycle, the
+ *   cycle counter stays at 1 and the three paid bookings ride.
+ *
+ * Sequential steps — retries off.
+ */
+
+import {
+  acceptExport,
+  bookContainers,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  ensureExportRoute,
+  EXP_DEST,
+  EXP_ORIGIN,
+  forceReservationExpiry,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withExportSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(5);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+const CLOSE_DEPARTURE = departureAt(6);
+const CLOSE_DAY = eatDayStr(CLOSE_DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+function seedExport(suffix: string) {
+  seedImportContract({
+    suffix,
+    reference: stampedRef(suffix),
+    direction: "EXPORT",
+    originCode: EXP_ORIGIN,
+    destCode: EXP_DEST,
+  });
+}
+
+/** QA..QE reserve 12+12+12+12+6 = 54; only QA/QB/QC pay. */
+const CLOSERS = [
+  { suffix: "QA", forty: 12, wagons: 12, pays: true },
+  { suffix: "QB", forty: 12, wagons: 12, pays: true },
+  { suffix: "QC", forty: 12, wagons: 12, pays: true },
+  { suffix: "QD", forty: 12, wagons: 12, pays: false },
+  { suffix: "QE", forty: 6, wagons: 6, pays: false },
+];
+
+describe("export pay-or-lose: expiry frees space; window close expires the unpaid", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    ["PA", "PB", "PC", "PD", ...CLOSERS.map((c) => c.suffix)].forEach(seedExport);
+  });
+
+  it("operations prepares the export corridor and the D+5 train with an open window", () => {
+    ensureExportRoute();
+    resetCorridorDay(DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    resetCorridorDay(CLOSE_DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-EXP-7", "LOCO-EXP-8"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+  });
+
+  it("PA and PB reserve and pay 40 wagons; PC reserves the last 14 unpaid", () => {
+    bookContainers({
+      suffix: "PA",
+      runStamp: stamp,
+      isoSeed: 7600,
+      twenty: 40,
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptExport("PA");
+    markPaid("PA");
+    pollAllocations("PA", 20);
+
+    bookContainers({
+      suffix: "PB",
+      runStamp: stamp,
+      isoSeed: 7700,
+      forty: 20,
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptExport("PB");
+    markPaid("PB");
+    pollAllocations("PB", 20);
+
+    bookContainers({
+      suffix: "PC",
+      runStamp: stamp,
+      isoSeed: 7800,
+      twenty: 28,
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptExport("PC");
+    // Clamp: PC's deadline never outlives the window close.
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("PC", (b) => {
+        expect(new Date(b.payment_deadline!).getTime()).to.be.at.most(
+          new Date(s.window_closes_at!).getTime(),
+        );
+      });
+    });
+  });
+
+  it("a late exporter is rejected while PC's unpaid reservation holds the space", () => {
+    bookContainers({
+      suffix: "PD",
+      runStamp: stamp,
+      isoSeed: 7900,
+      twenty: 28,
+      scheduledDate: BOOKING_DAY,
+      expectFailure: /space|window/i,
+    });
+  });
+
+  it("PC misses its pay window — EXPIRED — and PD immediately books the freed 14 wagons", () => {
+    forceReservationExpiry("PC");
+    bookContainers({
+      suffix: "PD",
+      runStamp: stamp,
+      isoSeed: 8000,
+      twenty: 28,
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptExport("PD");
+    markPaid("PD");
+    pollAllocations("PD", 14);
+    withExportSchedule(DEPARTURE, (s) => {
+      withBooking("PD", (b) => expect(b.train_schedule_id, "PD took PC's seat").to.eq(s.id));
+    });
+  });
+
+  it("window-close day: five reservations, three payments", () => {
+    createImportSchedule({
+      departure: CLOSE_DEPARTURE,
+      locoPair: ["LOCO-EXP-9", "LOCO-EXP-10"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(CLOSE_DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+
+    let isoSeed = 8200;
+    CLOSERS.forEach((c) => {
+      bookContainers({
+        suffix: c.suffix,
+        runStamp: stamp,
+        isoSeed,
+        forty: c.forty,
+        scheduledDate: CLOSE_DAY,
+      });
+      isoSeed += c.forty;
+      acceptExport(c.suffix);
+    });
+    CLOSERS.filter((c) => c.pays).forEach((c) => {
+      markPaid(c.suffix);
+      pollAllocations(c.suffix, c.wagons);
+    });
+  });
+
+  it("the window CLOSES — phase DONE, the two unpaid expire, and export never reopens", () => {
+    withExportSchedule(CLOSE_DEPARTURE, (s) => {
+      db(
+        `UPDATE freight.train_schedules
+         SET window_closes_at = now() - interval '1 second'
+         WHERE id = $1 AND window_phase = 'OPEN'`,
+        [s.id],
+      );
+      pollDb<ScheduleRow>(
+        "export window DONE (no reopen)",
+        `SELECT window_phase, booking_cycle_no FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.window_phase === "DONE" && Number(row?.booking_cycle_no) === 1,
+      );
+    });
+    // The unpaid deadlines were clamped to the ORIGINAL close; forcing the
+    // close earlier means forcing their deadlines with it (same semantics).
+    CLOSERS.filter((c) => !c.pays).forEach((c) => forceReservationExpiry(c.suffix));
+    CLOSERS.filter((c) => !c.pays).forEach((c) => pollBookingStatus(c.suffix, "EXPIRED"));
+    CLOSERS.filter((c) => c.pays).forEach((c) =>
+      withBooking(c.suffix, (b) => expect(b.status, `${c.suffix} rides`).to.eq("PAID")),
+    );
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/general_drawdown.cy.ts b/e2e/freight/cypress/e2e/flows/general_drawdown.cy.ts
new file mode 100644
index 000000000..02fdb3efe
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/general_drawdown.cy.ts
@@ -0,0 +1,140 @@
+/**
+ * GENERAL drawdown ledger (D+25) — one GENERAL contract capped at 60×20ft
+ * draws down across many bookings; the cap is enforced at CREATE, releases
+ * when a booking dies, and the contract stays CONTRACT_ACTIVE throughout:
+ *
+ *   B1 30 → B2 20 → B3 asking 20 REJECTED ("only 10 remain") → B3' 10 → cap
+ *   exhausted → B4 2 REJECTED → B3' expires → its 10 return → B5 10 accepted.
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  bookContainers,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  ensureCorridorRoute,
+  forceWindowOpen,
+  pollBookingStatus,
+  resetCorridorDay,
+  seedImportContract,
+  withSchedule,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(25);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const SUFFIX = "GDCAP";
+const REF = `CTR-IMP-${stamp}-${SUFFIX}`;
+
+describe("GENERAL drawdown: a 60×20ft cap across many bookings", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    seedImportContract({ suffix: SUFFIX, reference: REF, kind: "GENERAL", cap20: 60 });
+  });
+
+  it("operations prepares the corridor train with an open window (bookings need an open day)", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-17", "LOCO-IMP-18"] });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+  });
+
+  it("B1 draws 30 and B2 draws 20 — 50 of 60 held", () => {
+    bookContainers({
+      suffix: SUFFIX,
+      runStamp: stamp,
+      isoSeed: 18_000,
+      twenty: 30,
+      scheduledDate: BOOKING_DAY,
+    });
+    bookContainers({
+      suffix: SUFFIX,
+      runStamp: stamp,
+      isoSeed: 18_100,
+      twenty: 20,
+      scheduledDate: BOOKING_DAY,
+    });
+    db<{ n: string }>(
+      `SELECT count(*) AS n FROM freight.bookings b
+       JOIN freight.contracts ct ON ct.id = b.contract_id
+       WHERE ct.reference = $1`,
+      [REF],
+    ).then(({ rows }) => expect(Number(rows[0].n), "two live drawdowns").to.eq(2));
+  });
+
+  it("B3 asking 20 is REJECTED — only 10 of 60 remain", () => {
+    bookContainers({
+      suffix: SUFFIX,
+      runStamp: stamp,
+      isoSeed: 18_200,
+      twenty: 20,
+      scheduledDate: BOOKING_DAY,
+      expectFailure: "remain on this contract",
+    });
+  });
+
+  it("B3' takes exactly the remaining 10 — the contract COMPLETES and B4 is rejected", () => {
+    bookContainers({
+      suffix: SUFFIX,
+      runStamp: stamp,
+      isoSeed: 18_300,
+      twenty: 10,
+      scheduledDate: BOOKING_DAY,
+    });
+    // Booking the last of the cap flips the GENERAL contract to
+    // CONTRACT_CLOSED (fully drawn) — the next booking is rejected as such.
+    db<{ status: string }>(
+      `SELECT status FROM freight.contracts WHERE reference = $1`,
+      [REF],
+    ).then(({ rows }) =>
+      expect(rows[0].status, "fully drawn contract completes").to.eq("CONTRACT_CLOSED"),
+    );
+    bookContainers({
+      suffix: SUFFIX,
+      runStamp: stamp,
+      isoSeed: 18_400,
+      twenty: 2,
+      scheduledDate: BOOKING_DAY,
+      expectFailure: "completed",
+    });
+  });
+
+  it("an EXPIRED booking releases its draw — B5 books the freed 10 and the ledger closes again", () => {
+    // Kill the newest live drawdown (B3', 10×20ft) — expiry releases its hold.
+    db(
+      `UPDATE freight.bookings b SET status = 'EXPIRED'
+       FROM freight.contracts ct
+       WHERE ct.id = b.contract_id AND ct.reference = $1
+         AND b.id = (
+           SELECT b2.id FROM freight.bookings b2
+           JOIN freight.contracts c2 ON c2.id = b2.contract_id
+           WHERE c2.reference = $1 AND b2.status NOT IN ('EXPIRED','CANCELLED','REJECTED')
+           ORDER BY b2.created_at DESC LIMIT 1
+         )`,
+      [REF],
+    );
+    bookContainers({
+      suffix: SUFFIX,
+      runStamp: stamp,
+      isoSeed: 18_500,
+      twenty: 10,
+      scheduledDate: BOOKING_DAY,
+    });
+    pollBookingStatus(SUFFIX, "AWAITING_DOCUMENTS", 5);
+
+    // Completion tracks the outstanding quantity: the released 10 were
+    // rebooked, so the ledger is full again and the contract stays CLOSED.
+    db<{ status: string }>(
+      `SELECT status FROM freight.contracts WHERE reference = $1`,
+      [REF],
+    ).then(({ rows }) =>
+      expect(rows[0].status, "re-drawn contract closed").to.eq("CONTRACT_CLOSED"),
+    );
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/general_mixed_reopen.cy.ts b/e2e/freight/cypress/e2e/flows/general_mixed_reopen.cy.ts
new file mode 100644
index 000000000..3eca27de7
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/general_mixed_reopen.cy.ts
@@ -0,0 +1,136 @@
+/**
+ * GENERAL mixed reopen (D+26) — the same two GENERAL contracts (one
+ * container, one bulk) book AGAIN after their first bookings die: cycle 1
+ * reserves a container + a bulk drawdown, nobody pays, both expire, the
+ * window reopens — and the SAME contracts issue fresh drawdowns in cycle 2
+ * that pay and allocate typed. GENERAL contracts survive dead bookings and
+ * dead cycles alike.
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  bookBulk,
+  bookContainers,
+  clearGeneralBooking,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  expectWagonType,
+  forceReservationExpiry,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(26);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+describe("GENERAL mixed reopen: the same contracts book again after a dead cycle", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    seedImportContract({ suffix: "GMC", reference: stampedRef("GMC"), kind: "GENERAL" });
+    seedImportContract({
+      suffix: "GMB",
+      reference: stampedRef("GMB"),
+      kind: "GENERAL",
+      freight: "BULK",
+    });
+  });
+
+  it("operations prepares the corridor train — first window opens (cycle 1)", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-19", "LOCO-IMP-20"] });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+    withSchedule(DEPARTURE, (s) => expect(s.booking_cycle_no, "cycle 1").to.eq(1));
+  });
+
+  it("cycle 1: a container and a bulk GENERAL drawdown clear per booking and are reserved", () => {
+    bookContainers({
+      suffix: "GMC",
+      runStamp: stamp,
+      isoSeed: 19_000,
+      twenty: 12, // 6 wagons
+      scheduledDate: BOOKING_DAY,
+    });
+    clearGeneralBooking("GMC", BOOKING_DAY);
+    bookBulk({ suffix: "GMB", tons: 700, scheduledDate: BOOKING_DAY }); // 10 wagons
+    clearGeneralBooking("GMB", BOOKING_DAY);
+
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    ["GMC", "GMB"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+  });
+
+  it("nobody pays — both drawdowns expire and the window reopens", () => {
+    ["GMC", "GMB"].forEach((suffix) => forceReservationExpiry(suffix));
+    withSchedule(DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      // Same-tick guard-loop can chain PRE_WINDOW straight into OPEN when the
+      // reopen instant falls inside office hours — assert it left PAYMENT
+      // without concluding FULL/DONE, whichever phase it lands on.
+      pollDb<ScheduleRow>(
+        "window concludes not-full (PRE_WINDOW or fast-forwarded to OPEN)",
+        `SELECT window_phase FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => !!row && row.window_phase !== "PAYMENT" && row.window_phase !== "DONE",
+      );
+    });
+  });
+
+  it("cycle 2: the SAME contracts issue fresh drawdowns that pay and allocate typed", () => {
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+    withSchedule(DEPARTURE, (s) => expect(s.booking_cycle_no, "cycle 2").to.eq(2));
+
+    bookContainers({
+      suffix: "GMC",
+      runStamp: stamp,
+      isoSeed: 19_200,
+      twenty: 12,
+      scheduledDate: BOOKING_DAY,
+    });
+    clearGeneralBooking("GMC", BOOKING_DAY);
+    bookBulk({ suffix: "GMB", tons: 700, scheduledDate: BOOKING_DAY });
+    clearGeneralBooking("GMB", BOOKING_DAY);
+
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    ["GMC", "GMB"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    markPaid("GMC");
+    pollAllocations("GMC", 6);
+    expectWagonType("GMC", "NW5", 6);
+    markPaid("GMB");
+    pollAllocations("GMB", 10);
+    expectWagonType("GMB", "CW4", 10);
+
+    // The cycle-1 corpses stay dead; both contracts remain ACTIVE.
+    ["GMC", "GMB"].forEach((suffix) =>
+      withBooking(suffix, (b) => expect(b.status, `${suffix} cycle-2 rides`).to.eq("PAID")),
+    );
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/general_rush_hour.cy.ts b/e2e/freight/cypress/e2e/flows/general_rush_hour.cy.ts
new file mode 100644
index 000000000..298929c00
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/general_rush_hour.cy.ts
@@ -0,0 +1,179 @@
+/**
+ * GENERAL rush hour — 20 "users" (20 GENERAL contracts) book one 54-wagon
+ * import train in the SAME first window (D+23). Every GENERAL booking clears
+ * PER BOOKING (upload → GL approve → finalize → proceed → ops accept) before
+ * it may enter the pool. Then:
+ *
+ *   – a 21st booking whose operation request is never accepted is EXPIRED by
+ *     the batch at doc-review end (it can no longer make the train)
+ *   – the batch reserves the top 9 (9 × 6w = 54/54); 11 wait
+ *   – the payment race: 5 pay, 4 miss their deadline → the freed 24 wagons
+ *     promote the next 4 waiters live (payment phase extends); they pay →
+ *     the train still departs FULL
+ *   – the 7 left-over waiters expire in the day-end sweep; every contract
+ *     stays CONTRACT_ACTIVE (GENERAL survives its bookings)
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  bookContainers,
+  clearGeneralBooking,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  expectWagonType,
+  forceReservationExpiry,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  setPriority,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(23);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+/** 20 virtual users — one GENERAL contract each, 12×20ft = 6 wagons per booking. */
+const USERS = Array.from({ length: 20 }, (_, i) =>
+  `GR${String(i + 1).padStart(2, "0")}`,
+);
+const SELECTED = USERS.slice(0, 9); // 9 × 6w = 54
+const PAYERS = SELECTED.slice(0, 5);
+const DEFAULTERS = SELECTED.slice(5, 9);
+const PROMOTED = USERS.slice(9, 13); // take the defaulters' 24 wagons
+const LEFTOVER = USERS.slice(13); // 7 expire with the day
+
+describe("GENERAL rush hour: 20 users, one train, one window", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    [...USERS, "GRNA"].forEach((suffix) =>
+      seedImportContract({ suffix, reference: stampedRef(suffix), kind: "GENERAL" }),
+    );
+  });
+
+  it("operations prepares the corridor train with an open first window", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-11", "LOCO-IMP-12"] });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+  });
+
+  it("20 users book at once — each GENERAL booking clears PER BOOKING into the pool", () => {
+    USERS.forEach((suffix, i) => {
+      bookContainers({
+        suffix,
+        runStamp: stamp,
+        isoSeed: 16_000 + i * 15,
+        twenty: 12,
+        scheduledDate: BOOKING_DAY,
+      });
+      clearGeneralBooking(suffix, BOOKING_DAY);
+    });
+    USERS.forEach((suffix, i) => setPriority(suffix, i + 1));
+  });
+
+  it("a 21st booking never accepted by operations is expired when doc review ends", () => {
+    bookContainers({
+      suffix: "GRNA",
+      runStamp: stamp,
+      isoSeed: 16_500,
+      twenty: 12,
+      scheduledDate: BOOKING_DAY,
+    });
+    // Clearance done, operation requested — but ops never accept it.
+    withBooking("GRNA", (b) => {
+      cy.log(`GRNA ${b.reference} stays OPERATION_REQUEST_PENDING`);
+    });
+    db(
+      `UPDATE freight.bookings b SET status = 'OPERATION_REQUEST_PENDING'
+       FROM freight.contracts ct
+       WHERE ct.id = b.contract_id AND ct.reference LIKE 'CTR-IMP-%-GRNA'
+         AND b.status = 'AWAITING_DOCUMENTS'`,
+      [],
+    );
+
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    // Never-accepted bookings are swept BEFORE the batch runs.
+    pollBookingStatus("GRNA", "EXPIRED");
+  });
+
+  it("the batch reserves the top 9 (54/54); 11 wait with no pay window", () => {
+    SELECTED.forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    [...PROMOTED, ...LEFTOVER].forEach((suffix) =>
+      withBooking(suffix, (b) => {
+        expect(b.status, `${suffix} waiting`).to.eq("FULLY_EXECUTED");
+        expect(b.payment_deadline, `${suffix} no pay window yet`).to.be.null;
+      }),
+    );
+  });
+
+  it("payment race: 5 pay, 4 default — the freed 24 wagons promote the next 4 waiters live", () => {
+    PAYERS.forEach((suffix) => {
+      markPaid(suffix);
+      pollAllocations(suffix, 6);
+    });
+    DEFAULTERS.forEach((suffix) => forceReservationExpiry(suffix));
+    PROMOTED.forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+  });
+
+  it("the promoted 4 pay — the train departs FULL at 54/54, typed", () => {
+    PROMOTED.forEach((suffix) => {
+      markPaid(suffix);
+      pollAllocations(suffix, 6);
+      expectWagonType(suffix, "NW5", 6);
+    });
+    withSchedule(DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      pollDb<ScheduleRow>(
+        "window FULL + DONE",
+        `SELECT window_phase, booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL" && row?.window_phase === "DONE",
+      );
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [s.id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+    });
+  });
+
+  it("the 7 leftover waiters expire in ONE day-end sweep; every contract stays ACTIVE", () => {
+    LEFTOVER.forEach((suffix) => pollBookingStatus(suffix, "EXPIRED"));
+    db<{ n: string }>(
+      `SELECT count(*) AS n FROM freight.contracts
+       WHERE reference LIKE 'CTR-IMP-%-GR%' AND status = 'CONTRACT_ACTIVE'
+         AND deleted_at IS NULL AND created_at > now() - interval '1 hour'`,
+      [],
+    ).then(({ rows }) =>
+      expect(Number(rows[0].n), "GENERAL contracts survive their bookings").to.be.at.least(21),
+    );
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/general_two_trains.cy.ts b/e2e/freight/cypress/e2e/flows/general_two_trains.cy.ts
new file mode 100644
index 000000000..861bf4620
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/general_two_trains.cy.ts
@@ -0,0 +1,269 @@
+/**
+ * GENERAL two-trains-one-day — 20 GENERAL bookings against TWO 54-wagon
+ * trains sharing one route-day (D+24): ONE window timeline, ONE batch
+ * release, overflow cascading earliest-departure-first, and a full DUAL
+ * lifecycle (both trains dispatch, run the corridor and arrive the same day).
+ *
+ *   – both schedules share the group window (identical clocks); one
+ *     doc-review-complete releases the WHOLE day
+ *   – 20 × 6w = 120w demand vs 108: train 1 takes 9 bookings, the overflow
+ *     lands on train 2 (9 more), 2 wait
+ *   – all 18 pay → 54/54 on EACH train; the 2 waiters expire only after BOTH
+ *     trains conclude (the sweep defers while a sibling is open)
+ *   – both trains finalize, gate-pass, dispatch, checkpoint and arrive —
+ *     every booking ARRIVED under its own train, movements ledger per train
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  apiPost,
+  bookContainers,
+  clearGeneralBooking,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  ensureCorridorRoute,
+  forceReservationExpiry,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  setPriority,
+  withBooking,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE_1 = departureAt(24);
+const DEPARTURE_2 = new Date(DEPARTURE_1.getTime() + 2 * 3_600_000); // same EAT day
+const BOOKING_DAY = eatDayStr(DEPARTURE_1);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const USERS = Array.from({ length: 20 }, (_, i) =>
+  `GT${String(i + 1).padStart(2, "0")}`,
+);
+const RIDERS = USERS.slice(0, 18); // 9 per train
+const WAITERS = USERS.slice(18); // 2 expire after both trains conclude
+
+interface DayScheduleRow {
+  id: string;
+  window_phase: string;
+  booking_window_status: string;
+  status: string;
+  scheduled_departure_date: string;
+}
+
+/** Both schedules of the day, earliest departure first. */
+function dayShedules() {
+  return db<DayScheduleRow>(
+    `SELECT ts.id, ts.window_phase, ts.booking_window_status, ts.status,
+            ts.scheduled_departure_date
+     FROM freight.train_schedules ts
+     JOIN freight.yards o ON o.id = ts.origin_station_id AND o.code = 'DJIB_PORT'
+     JOIN freight.yards d ON d.id = ts.destination_station_id AND d.code = 'KALITY'
+     WHERE ts.deleted_at IS NULL
+       AND abs(extract(epoch FROM (ts.scheduled_departure_date - $1::timestamptz))) < 14400
+     ORDER BY ts.scheduled_departure_date ASC`,
+    [DEPARTURE_1.toISOString()],
+  );
+}
+
+function withBothSchedules(fn: (first: DayScheduleRow, second: DayScheduleRow) => void) {
+  dayShedules().then(({ rows }) => {
+    expect(rows, "two schedules on the day").to.have.length(2);
+    fn(rows[0], rows[1]);
+  });
+}
+
+describe("GENERAL two trains, one day: shared window, overflow, dual lifecycle", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    USERS.forEach((suffix) =>
+      seedImportContract({ suffix, reference: stampedRef(suffix), kind: "GENERAL" }),
+    );
+  });
+
+  it("operations schedules TWO 54-wagon trains on one day — one shared window, forced open", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE_1);
+    createImportSchedule({ departure: DEPARTURE_1, locoPair: ["LOCO-IMP-13", "LOCO-IMP-14"] });
+    createImportSchedule({ departure: DEPARTURE_2, locoPair: ["LOCO-IMP-15", "LOCO-IMP-16"] });
+
+    // One clock for the whole day: force IDENTICAL window timestamps on both
+    // siblings (the group rule's shared timeline, arranged deterministically).
+    withBothSchedules((first, second) => {
+      db(
+        `UPDATE freight.train_schedules
+         SET window_opens_at = now() - interval '1 minute',
+             window_closes_at = now() + interval '60 minutes'
+         WHERE id = ANY($1::uuid[])`,
+        [[first.id, second.id]],
+      );
+      [first.id, second.id].forEach((id) =>
+        pollDb<ScheduleRow>(
+          `schedule ${id} OPEN`,
+          `SELECT window_phase, booking_window_status FROM freight.train_schedules WHERE id = $1`,
+          [id],
+          (row) => row?.window_phase === "OPEN" && row?.booking_window_status === "OPEN",
+        ),
+      );
+    });
+  });
+
+  it("20 users book into the day (never a specific train); every booking clears per booking", () => {
+    USERS.forEach((suffix, i) => {
+      bookContainers({
+        suffix,
+        runStamp: stamp,
+        isoSeed: 17_000 + i * 15,
+        twenty: 12,
+        scheduledDate: BOOKING_DAY,
+      });
+      clearGeneralBooking(suffix, BOOKING_DAY);
+    });
+    USERS.forEach((suffix, i) => setPriority(suffix, i + 1));
+  });
+
+  it("ONE doc-review-complete releases the whole day — 18 reserved across both trains, 2 wait", () => {
+    withBothSchedules((first, second) => {
+      db(
+        `UPDATE freight.train_schedules
+         SET window_closes_at = now() - interval '1 second'
+         WHERE id = ANY($1::uuid[]) AND window_phase = 'OPEN'`,
+        [[first.id, second.id]],
+      );
+      [first.id, second.id].forEach((id) =>
+        pollDb<ScheduleRow>(
+          `schedule ${id} DOC_REVIEW`,
+          `SELECT window_phase FROM freight.train_schedules WHERE id = $1`,
+          [id],
+          (row) => row?.window_phase === "DOC_REVIEW",
+        ),
+      );
+      // Staff complete doc review on ONE train — the group stamp releases both.
+      completeDocReview(first.id);
+      pollDb<ScheduleRow>(
+        "sibling released by the same action",
+        `SELECT window_phase FROM freight.train_schedules WHERE id = $1`,
+        [second.id],
+        (row) => row?.window_phase === "PAYMENT" || row?.window_phase === "DONE",
+      );
+    });
+    RIDERS.forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    WAITERS.forEach((suffix) =>
+      withBooking(suffix, (b) => {
+        expect(b.status, `${suffix} waiting`).to.eq("FULLY_EXECUTED");
+      }),
+    );
+  });
+
+  it("all 18 pay — 54/54 on EACH train, overflow filled earliest-departure-first", () => {
+    RIDERS.forEach((suffix) => {
+      markPaid(suffix);
+      pollAllocations(suffix, 6);
+    });
+    withBothSchedules((first, second) => {
+      [first.id, second.id].forEach((id) => {
+        pollDb<{ n: string }>(
+          `train ${id} carries 9 bookings`,
+          `SELECT count(*) AS n FROM freight.train_schedule_bookings
+           WHERE train_schedule_id = $1 AND deleted_at IS NULL`,
+          [id],
+          (row) => Number(row?.n) === 9,
+          15,
+        );
+        db<{ n: string }>(
+          `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+           FROM freight.wagon_booking_allocations wba
+           JOIN freight.train_schedule_bookings tsb
+             ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+           WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+          [id],
+        ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons").to.eq(54));
+      });
+      // The top-priority bookings ride the EARLIEST departure.
+      withBooking("GT01", (b) =>
+        expect(b.train_schedule_id, "GT01 on the first train").to.eq(first.id),
+      );
+    });
+  });
+
+  it("both trains conclude FULL — only then do the 2 waiters expire (sweep defers for siblings)", () => {
+    withBothSchedules((first, second) => {
+      db(
+        `UPDATE freight.train_schedules
+         SET payment_phase_ends_at = now() - interval '1 second'
+         WHERE id = ANY($1::uuid[]) AND window_phase = 'PAYMENT'`,
+        [[first.id, second.id]],
+      );
+      [first.id, second.id].forEach((id) =>
+        pollDb<ScheduleRow>(
+          `schedule ${id} FULL + DONE`,
+          `SELECT window_phase, booking_window_status FROM freight.train_schedules WHERE id = $1`,
+          [id],
+          (row) => row?.booking_window_status === "FULL" && row?.window_phase === "DONE",
+        ),
+      );
+    });
+    WAITERS.forEach((suffix) => pollBookingStatus(suffix, "EXPIRED"));
+  });
+
+  it("dual lifecycle: both trains gate-pass, dispatch, run the corridor and arrive", () => {
+    withBothSchedules((first, second) => {
+      [first.id, second.id].forEach((id) => {
+        pollDb<ScheduleRow>(
+          `schedule ${id} finalized`,
+          `SELECT status FROM freight.train_schedules WHERE id = $1`,
+          [id],
+          (row) => row?.status === "SCHEDULED",
+          10,
+        );
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/import-djibouti/gatepass-granted`)
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/dispatch`)
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+        [1, 2, 3, 4].forEach((seq) => {
+          apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+            sequenceNo: seq,
+            kind: "PASSED",
+          })
+            .its("status")
+            .should("be.oneOf", [200, 201]);
+        });
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+          sequenceNo: 5,
+          kind: "ARRIVED",
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+        pollDb<ScheduleRow>(
+          `schedule ${id} ARRIVED`,
+          `SELECT status FROM freight.train_schedules WHERE id = $1`,
+          [id],
+          (row) => row?.status === "ARRIVED",
+          20,
+        );
+        db<{ n: string }>(
+          `SELECT count(*) AS n FROM freight.wagon_movements WHERE train_schedule_id = $1`,
+          [id],
+        ).then(({ rows }) =>
+          expect(Number(rows[0].n), `train ${id} movements`).to.be.at.least(54),
+        );
+      });
+    });
+    RIDERS.forEach((suffix) => pollBookingStatus(suffix, "ARRIVED", 20));
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/import-utils.ts b/e2e/freight/cypress/e2e/flows/import-utils.ts
new file mode 100644
index 000000000..67291b0c0
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/import-utils.ts
@@ -0,0 +1,975 @@
+/**
+ * Shared helpers for the IMPORT corridor flow specs.
+ *
+ * Corridor (A→B→C→D→E→T, DJ→ET = IMPORT):
+ *   DJIB_PORT → NAGAD → DIRE_DAWA → E2E_AWASH → MOJO → KALITY
+ *
+ * Philosophy (same as segment_weight.cy.ts): these specs test the
+ * scheduling/window/clearance ENGINE, not the contract wizard — contracts are
+ * seeded FULLY_EXECUTED in SQL with stamped references; bookings, staff
+ * reviews, window phases, payment, dispatch and clearance run through the real
+ * API + UI. Window *timestamps* are arranged via db:query (the specs arrange
+ * window state, they don't test the wall clock), and every transition is then
+ * performed by the app's own 10s window tick or its staff endpoints.
+ *
+ * No module-level state besides constants: Cypress re-evaluates the spec
+ * bundle on cross-origin reloads, so helpers look rows up by stamped-reference
+ * SUFFIX + newest row, never by captured ids.
+ */
+
+export const customer = "user@gmail.com";
+export const companyTin = "0102030405"; // seed-company.sql
+export const opsStaff = "operation@edr.local";
+/** isSuperAdmin bypasses assertFreightPermission — used for GL endpoints so a
+ *  missing preset permission never masks an engine regression. */
+export const superAdmin = "superadmin@tria.com";
+
+export const CORRIDOR = ["DJIB_PORT", "NAGAD", "DIRE_DAWA", "E2E_AWASH", "MOJO", "KALITY"] as const;
+export const ORIGIN = "DJIB_PORT";
+export const DEST = "KALITY";
+/** Export rides the same corridor reversed (ET → DJ). */
+export const EXP_ORIGIN = "KALITY";
+export const EXP_DEST = "DJIB_PORT";
+
+export const apiUrl = () => Cypress.env("apiUrl") as string;
+
+// ---------------------------------------------------------------------------
+// small generic plumbing
+// ---------------------------------------------------------------------------
+
+export type Row = Record<string, string | number | null>;
+
+export function db<T = Row>(sql: string, params: unknown[] = []) {
+  return cy.task<{ rowCount: number; rows: T[] }>("db:query", { sql, params }, { log: false });
+}
+
+/** Bearer token for a staff/customer account (portal users use the demo pwd). */
+export function tokenFor(email: string): Cypress.Chainable<string> {
+  const pass =
+    email.endsWith("@gmail.com") ? (Cypress.env("demoPassword") as string) : undefined;
+  return cy.apiLogin(email, pass).then(({ token }) => cy.wrap(token, { log: false }));
+}
+
+export function apiPost(
+  email: string,
+  path: string,
+  body?: unknown,
+  failOnStatusCode = true,
+) {
+  return tokenFor(email).then((token) =>
+    cy.request({
+      method: "POST",
+      url: `${apiUrl()}${path}`,
+      headers: { Authorization: `Bearer ${token}` },
+      body: body ?? {},
+      failOnStatusCode,
+    }),
+  );
+}
+
+/** Poll a 1-row query until `check` passes (10s window tick ⇒ 3s cadence). */
+export function pollDb<T = Row>(
+  label: string,
+  sql: string,
+  params: unknown[],
+  check: (row: T | undefined) => boolean,
+  attempts = 40,
+) {
+  const read = (attempt: number): void => {
+    db<T>(sql, params).then(({ rows }) => {
+      if (check(rows[0])) return;
+      expect(attempt, label).to.be.lessThan(attempts);
+      cy.wait(3000, { log: false }).then(() => read(attempt + 1));
+    });
+  };
+  read(0);
+}
+
+// ---------------------------------------------------------------------------
+// time — departures pinned to 12:00 EAT so the EAT day key is unambiguous
+// ---------------------------------------------------------------------------
+
+export function departureAt(dayOffset: number): Date {
+  const eatNow = new Date(Date.now() + 3 * 3_600_000);
+  return new Date(
+    Date.UTC(
+      eatNow.getUTCFullYear(),
+      eatNow.getUTCMonth(),
+      eatNow.getUTCDate() + dayOffset,
+      9, // 09:00 UTC = 12:00 EAT
+      0,
+      0,
+    ),
+  );
+}
+
+/** The EAT calendar day (`YYYY-MM-DD`) of an instant — the booking day key. */
+export const eatDayStr = (d: Date) =>
+  new Date(d.getTime() + 3 * 3_600_000).toISOString().slice(0, 10);
+
+// ---------------------------------------------------------------------------
+// contracts — seeded FULLY_EXECUTED (see file header)
+// ---------------------------------------------------------------------------
+
+export interface SeedContractOpts {
+  suffix: string;
+  reference: string;
+  currency?: "ETB" | "USD";
+  customs?: boolean;
+  direction?: "IMPORT" | "EXPORT" | "DOMESTIC";
+  freight?: "CONTAINER" | "BULK";
+  originCode?: string;
+  destCode?: string;
+  /** GENERAL = multi-booking drawdown contract (status CONTRACT_ACTIVE). */
+  kind?: "ONE_TIME" | "GENERAL";
+  /** GENERAL only: quantity cap on the 20ft scope row (40ft stays uncapped). */
+  cap20?: number;
+}
+
+export function seedImportContract(opts: SeedContractOpts) {
+  const currency = opts.currency ?? "ETB";
+  const customs = opts.customs ?? false;
+  const direction = opts.direction ?? "IMPORT";
+  const freight = opts.freight ?? "CONTAINER";
+  const kind = opts.kind ?? "ONE_TIME";
+  const status = kind === "GENERAL" ? "CONTRACT_ACTIVE" : "FULLY_EXECUTED";
+  // Pre-booking boundary milestone for Path B contracts differs by direction.
+  const boundary = direction === "EXPORT" ? "EXPORT_RELEASED" : "DO_COLLECTED";
+  db(
+    `WITH c AS (
+       INSERT INTO freight.contracts
+         (reference, company_id, company_profile_id, contract_kind,
+          trade_direction, freight_type, service_type_id, payment_currency,
+          customs_clearing_enabled, clearance_status, status,
+          fully_executed_at, contract_valid_from, contract_valid_until,
+          contract_summary)
+       SELECT $1, comp.id,
+              (SELECT p.id FROM freight.company_profiles p
+                WHERE p.company_id = comp.id AND p.deleted_at IS NULL
+                ORDER BY CASE
+                  WHEN $2::text = 'EXPORT' AND p.type = 'exporter' THEN 0
+                  WHEN $2::text <> 'EXPORT' AND p.type = 'importer' THEN 0
+                  ELSE 1
+                END
+                LIMIT 1),
+              $11::text, $2::text, $9::text,
+              (SELECT st.id FROM freight.service_types st ORDER BY st.created_at LIMIT 1),
+              $3, $4,
+              CASE WHEN $4 THEN 'CLEARANCE_READY_FOR_BOOKING' ELSE 'NOT_APPLICABLE' END,
+              $12::text, now(), now() - interval '1 day',
+              now() + interval '60 days', 'E2E import-corridor fixture contract'
+       FROM freight.companies comp
+       WHERE comp.tin = $5
+         -- before() re-runs on cross-origin reloads: keep one stable fresh row
+         -- per suffix (skip when this run already seeded an unbooked one).
+         AND NOT EXISTS (
+           SELECT 1 FROM freight.contracts c2
+           WHERE c2.reference LIKE 'CTR-IMP-%-' || $8
+             AND c2.deleted_at IS NULL
+             AND c2.created_at > now() - interval '30 minutes'
+             AND NOT EXISTS (
+               SELECT 1 FROM freight.bookings b2 WHERE b2.contract_id = c2.id
+             )
+         )
+       RETURNING id
+     ), r AS (
+       INSERT INTO freight.contract_routes
+         (contract_id, origin_yard_id, destination_yard_id, sort_order)
+       SELECT c.id, o.id, d.id, 0 FROM c
+       JOIN freight.yards o ON o.code = $6
+       JOIN freight.yards d ON d.code = $7
+       RETURNING id
+     ), scope_container AS (
+       INSERT INTO freight.contract_cargo_scope
+         (contract_id, container_size, quantity_cap, cargo_free_text)
+       SELECT c.id, v.size,
+              CASE WHEN v.size = '20ft' THEN $13::numeric END,
+              'E2E import corridor cargo'
+       FROM c CROSS JOIN (VALUES ('20ft'), ('40ft')) AS v(size)
+       WHERE $9::text = 'CONTAINER'
+     ), scope_bulk AS (
+       INSERT INTO freight.contract_cargo_scope
+         (contract_id, cargo_type_id, cargo_free_text)
+       SELECT c.id, ct.id, 'E2E import wheat'
+       FROM c JOIN freight.cargo_types ct ON ct.code = 'E2E_IMP_WHEAT'
+       WHERE $9::text = 'BULK'
+     )
+     -- Path B gate: ONE_TIME customs bookings require the pre-booking boundary
+     -- milestone (IMPORT → DO_COLLECTED, EXPORT → EXPORT_RELEASED) COMPLETED.
+     INSERT INTO freight.clearance_milestones
+       (contract_id, milestone_code, milestone_label, status, triggered_at, sort_order)
+     SELECT c.id, $10, 'Pre-booking clearance boundary', 'COMPLETED', now(), 0
+     FROM c WHERE $4`,
+    [
+      opts.reference,
+      direction,
+      currency,
+      customs,
+      companyTin,
+      opts.originCode ?? ORIGIN,
+      opts.destCode ?? DEST,
+      opts.suffix,
+      freight,
+      boundary,
+      kind,
+      status,
+      opts.cap20 ?? null,
+    ],
+  );
+  // Backfill the boundary milestone when the insert above was skipped because
+  // a prior run's still-unbooked contract row is being reused.
+  if (customs) {
+    db(
+      `INSERT INTO freight.clearance_milestones
+         (contract_id, milestone_code, milestone_label, status, triggered_at, sort_order)
+       SELECT ct.id, $2::text, 'Pre-booking clearance boundary', 'COMPLETED', now(), 0
+       FROM freight.contracts ct
+       WHERE ct.reference LIKE 'CTR-IMP-%-' || $1 AND ct.deleted_at IS NULL
+         AND NOT EXISTS (
+           SELECT 1 FROM freight.clearance_milestones m
+           WHERE m.contract_id = ct.id AND m.milestone_code = $2::text
+             AND m.deleted_at IS NULL
+         )`,
+      [opts.suffix, boundary],
+    );
+  }
+}
+
+/** Newest seeded contract for a suffix — stamp-agnostic. */
+export function dbContractId(suffix: string) {
+  return db<{ id: string }>(
+    `SELECT id FROM freight.contracts
+     WHERE reference LIKE 'CTR-IMP-%-' || $1
+     ORDER BY created_at DESC LIMIT 1`,
+    [suffix],
+  ).then(({ rows }) => {
+    expect(rows, `seeded contract *-${suffix}`).to.have.length(1);
+    return cy.wrap(rows[0].id, { log: false });
+  });
+}
+
+// ---------------------------------------------------------------------------
+// bookings
+// ---------------------------------------------------------------------------
+
+export interface BookingRow {
+  id: string;
+  reference: string;
+  status: string;
+  scheduling_status: string;
+  train_schedule_id: string | null;
+  payment_deadline: string | null;
+  priority_score: number;
+  is_split: boolean;
+  contract_id: string;
+}
+
+export function dbBooking(suffix: string) {
+  return db<BookingRow>(
+    `SELECT b.id, b.reference, b.status, b.scheduling_status,
+            b.train_schedule_id, b.payment_deadline, b.priority_score,
+            b.is_split, b.contract_id
+     FROM freight.bookings b
+     JOIN freight.contracts ct ON ct.id = b.contract_id
+     WHERE ct.reference LIKE 'CTR-IMP-%-' || $1
+     ORDER BY b.created_at DESC LIMIT 1`,
+    [suffix],
+  );
+}
+
+export function withBooking(suffix: string, fn: (b: BookingRow) => void) {
+  dbBooking(suffix).then(({ rows }) => {
+    expect(rows, `booking under *-${suffix}`).to.have.length(1);
+    fn(rows[0]);
+  });
+}
+
+export function expectBookingStatus(suffix: string, status: string | string[]) {
+  const want = Array.isArray(status) ? status : [status];
+  withBooking(suffix, (b) =>
+    expect(b.status, `${suffix} booking status`).to.be.oneOf(want),
+  );
+}
+
+export function pollBookingStatus(suffix: string, status: string | string[], attempts = 40) {
+  const want = Array.isArray(status) ? status : [status];
+  pollDb<BookingRow>(
+    `${suffix} → ${want.join("|")}`,
+    `SELECT b.status FROM freight.bookings b
+     JOIN freight.contracts ct ON ct.id = b.contract_id
+     WHERE ct.reference LIKE 'CTR-IMP-%-' || $1
+     ORDER BY b.created_at DESC LIMIT 1`,
+    [suffix],
+    (row) => !!row && want.includes(row.status as string),
+    attempts,
+  );
+}
+
+/** ISO 6346-shaped container number, unique per run+seed (checksum unchecked). */
+export function isoNumber(runStamp: string, seed: number): string {
+  return `MSCU${String((Number(runStamp.slice(-6)) * 100 + seed) % 10_000_000).padStart(7, "0")}`;
+}
+
+/**
+ * Customer books containers under a seeded contract via the API (the portal
+ * booking form is exercised by export_one_time/intercity specs; a 22-wagon
+ * booking means 44 ISO inputs — not a UI journey).
+ */
+export function bookContainers(opts: {
+  suffix: string;
+  runStamp: string;
+  isoSeed: number;
+  twenty?: number;
+  forty?: number;
+  scheduledDate?: string; // omit for DOMESTIC (intercity)
+  vgmTons?: number;
+  expectFailure?: string | RegExp; // substring/regex of the expected 4xx error
+}) {
+  const vgm = opts.vgmTons ?? 10;
+  const lines: Array<Record<string, unknown>> = [];
+  let unit = 0;
+  if (opts.twenty) {
+    lines.push({
+      containerSize: "20ft",
+      quantity: opts.twenty,
+      units: Array.from({ length: opts.twenty }, () => ({
+        containerNumber: isoNumber(opts.runStamp, opts.isoSeed + unit++),
+        vgmTons: vgm,
+      })),
+    });
+  }
+  if (opts.forty) {
+    lines.push({
+      containerSize: "40ft",
+      quantity: opts.forty,
+      units: Array.from({ length: opts.forty }, () => ({
+        containerNumber: isoNumber(opts.runStamp, opts.isoSeed + unit++),
+        vgmTons: vgm,
+      })),
+    });
+  }
+  db<{ id: string; customs_clearing_enabled: boolean }>(
+    `SELECT id, customs_clearing_enabled FROM freight.contracts
+     WHERE reference LIKE 'CTR-IMP-%-' || $1
+     ORDER BY created_at DESC LIMIT 1`,
+    [opts.suffix],
+  ).then(({ rows }) => {
+    expect(rows, `seeded contract *-${opts.suffix}`).to.have.length(1);
+    // Path B: customs-clearance contracts are booked by Global Logistics on
+    // behalf of the customer — the portal user is rejected with a 403.
+    const actor = rows[0].customs_clearing_enabled ? superAdmin : customer;
+    apiPost(
+      actor,
+      `/api/contracts/${rows[0].id}/bookings`,
+      {
+        ...(opts.scheduledDate ? { scheduledDate: opts.scheduledDate } : {}),
+        containers: lines,
+      },
+      !opts.expectFailure,
+    ).then((res) => {
+      if (opts.expectFailure) {
+        expect(res.status, `${opts.suffix} booking rejected`).to.be.within(400, 422);
+        if (opts.expectFailure instanceof RegExp) {
+          expect(JSON.stringify(res.body)).to.match(opts.expectFailure);
+        } else {
+          expect(JSON.stringify(res.body)).to.include(opts.expectFailure);
+        }
+      } else {
+        expect(res.status, `${opts.suffix} booking created`).to.be.oneOf([200, 201]);
+      }
+    });
+  });
+}
+
+/**
+ * Book bulk tons under a seeded BULK contract via the API. Wagon demand =
+ * ceil(tons / 70) on CW4 covered gondolas.
+ */
+export function bookBulk(opts: {
+  suffix: string;
+  tons: number;
+  scheduledDate?: string; // omit for DOMESTIC (intercity)
+  expectFailure?: string | RegExp;
+}) {
+  db<{ id: string; customs_clearing_enabled: boolean; cargo_type_id: string }>(
+    `SELECT ct.id, ct.customs_clearing_enabled,
+            (SELECT t.id FROM freight.cargo_types t WHERE t.code = 'E2E_IMP_WHEAT') AS cargo_type_id
+     FROM freight.contracts ct
+     WHERE ct.reference LIKE 'CTR-IMP-%-' || $1
+     ORDER BY ct.created_at DESC LIMIT 1`,
+    [opts.suffix],
+  ).then(({ rows }) => {
+    expect(rows, `seeded contract *-${opts.suffix}`).to.have.length(1);
+    const actor = rows[0].customs_clearing_enabled ? superAdmin : customer;
+    apiPost(
+      actor,
+      `/api/contracts/${rows[0].id}/bookings`,
+      {
+        ...(opts.scheduledDate ? { scheduledDate: opts.scheduledDate } : {}),
+        bulkLines: [{ cargoTypeId: rows[0].cargo_type_id, cargoWeightTons: opts.tons }],
+        cargoFreeText: "E2E import wheat",
+      },
+      !opts.expectFailure,
+    ).then((res) => {
+      if (opts.expectFailure) {
+        expect(res.status, `${opts.suffix} booking rejected`).to.be.within(400, 422);
+        if (opts.expectFailure instanceof RegExp) {
+          expect(JSON.stringify(res.body)).to.match(opts.expectFailure);
+        } else {
+          expect(JSON.stringify(res.body)).to.include(opts.expectFailure);
+        }
+      } else {
+        expect(res.status, `${opts.suffix} booking created`).to.be.oneOf([200, 201]);
+      }
+    });
+  });
+}
+
+/**
+ * Walk a GENERAL booking through its PER-BOOKING clearance chain (Path A):
+ * AWAITING_DOCUMENTS → upload one doc → GL approves it → finalize →
+ * CLEARANCE_READY → customer proceeds with the shipment day →
+ * OPERATION_REQUEST_PENDING → ops accept → FULLY_EXECUTED (pool). The e2e
+ * seed configures no required documents, so one ad-hoc doc satisfies the
+ * 100%-approved gate.
+ */
+export function clearGeneralBooking(suffix: string, scheduledDate: string) {
+  withBooking(suffix, (b) => {
+    expect(b.status, `${suffix} starts in the clearance gate`).to.eq("AWAITING_DOCUMENTS");
+    glUpload(`/api/bookings/${b.id}/clearance/documents`, {}, "custom_e2e");
+    apiPost(superAdmin, `/api/bookings/${b.id}/clearance/review`, {
+      fileKey: "custom_e2e",
+      status: "APPROVED",
+    })
+      .its("status")
+      .should("be.oneOf", [200, 201]);
+    apiPost(superAdmin, `/api/bookings/${b.id}/clearance/finalize`)
+      .its("status")
+      .should("be.oneOf", [200, 201]);
+    apiPost(customer, `/api/bookings/${b.id}/clearance/proceed`, { scheduledDate })
+      .its("status")
+      .should("be.oneOf", [200, 201]);
+  });
+  acceptOperation(suffix);
+}
+
+/** Ops accepts the operation request → FULLY_EXECUTED (enters the day pool). */
+export function acceptOperation(suffix: string) {
+  withBooking(suffix, (b) => {
+    apiPost(opsStaff, `/api/bookings/${b.id}/operation/review`, { decision: "ACCEPT" })
+      .its("status")
+      .should("be.oneOf", [200, 201]);
+  });
+  pollBookingStatus(suffix, "FULLY_EXECUTED", 10);
+}
+
+/** Batch fill reserves by priority DESC — order 1 = first pick. */
+export function setPriority(suffix: string, order: number) {
+  withBooking(suffix, (b) =>
+    db(`UPDATE freight.bookings SET priority_score = $2 WHERE id = $1`, [
+      b.id,
+      1000 - order,
+    ]),
+  );
+}
+
+/** Staff force-pay; polls PAID + SCHEDULED. */
+export function markPaid(suffix: string) {
+  withBooking(suffix, (b) => {
+    apiPost(opsStaff, `/api/train-scheduling/bookings/${b.id}/mark-paid`)
+      .its("status")
+      .should("be.oneOf", [200, 201]);
+  });
+  pollDb<BookingRow>(
+    `${suffix} PAID+SCHEDULED`,
+    `SELECT b.status, b.scheduling_status FROM freight.bookings b
+     JOIN freight.contracts ct ON ct.id = b.contract_id
+     WHERE ct.reference LIKE 'CTR-IMP-%-' || $1
+     ORDER BY b.created_at DESC LIMIT 1`,
+    [suffix],
+    (row) => row?.status === "PAID" && row?.scheduling_status === "SCHEDULED",
+    20,
+  );
+}
+
+/**
+ * Settle a reservation through the REAL payment pipeline: seed the gateway
+ * intent projection (the payment microservice is absent in e2e), link it to
+ * the open invoice, then deliver the `payment.succeeded` event to the public
+ * internal endpoint. This drives billing settle → `booking.invoice.paid` →
+ * `advanceBookingOnPayment` → `ensurePaidBookingAllocated`, which is the ONLY
+ * path that applies a pending split offer (staff mark-paid skips it).
+ */
+export function settleViaGateway(suffix: string) {
+  withBooking(suffix, (b) => {
+    db<{ intent_id: string; currency: string; total: string }>(
+      `WITH inv AS (
+         SELECT id, currency, total_amount FROM freight.invoices
+         WHERE source_id = $1 AND deleted_at IS NULL AND paid_at IS NULL
+         ORDER BY created_at DESC LIMIT 1
+       ), intent AS (
+         INSERT INTO freight.payments
+           (id, ref_id, type, reference_type, method, currency, amount,
+            reason, raw_initiation, merchant_order_id, status)
+         SELECT gen_random_uuid(), $1, 'FREIGHT', 'SHIPMENT',
+                'telebirr'::freight.payments_method_enum,
+                inv.currency::freight.payments_currency_enum, 1,
+                'e2e gateway settle', '{}'::jsonb, 'E2E_' || $2,
+                'processing'::freight.payments_status_enum
+         FROM inv
+         RETURNING id
+       ), link AS (
+         UPDATE freight.invoices SET payment_id = intent.id
+         FROM intent WHERE freight.invoices.id = (SELECT id FROM inv)
+         RETURNING payment_id
+       )
+       SELECT intent.id AS intent_id, inv.currency, inv.total_amount AS total
+       FROM intent, inv`,
+      [b.id, `${suffix}-${b.id.slice(0, 8)}`],
+    ).then(({ rows }) => {
+      expect(rows, `${suffix} gateway intent`).to.have.length(1);
+      cy.request({
+        method: "POST",
+        url: `${apiUrl()}/api/internal/payments/mark-paid`,
+        body: {
+          version: 1,
+          eventId: crypto.randomUUID(),
+          eventType: "payment.succeeded",
+          occurredAt: new Date().toISOString(),
+          service: "FREIGHT",
+          intentId: rows[0].intent_id,
+          referenceType: "SHIPMENT",
+          referenceId: b.id,
+          merchantOrderId: `E2E_${suffix}_${b.id.slice(0, 8)}`,
+          provider: "TELEBIRR",
+          amountMinor: 1,
+          currency: rows[0].currency,
+        },
+      }).then((res) => {
+        expect(res.status, `${suffix} payment event accepted`).to.eq(200);
+        // The global response interceptor wraps payloads in { success, data }.
+        const raw = res.body as { processed?: boolean; data?: { processed?: boolean } };
+        expect(raw.processed ?? raw.data?.processed, "event processed").to.eq(true);
+      });
+    });
+  });
+  pollDb<BookingRow>(
+    `${suffix} PAID via gateway`,
+    `SELECT b.status FROM freight.bookings b
+     JOIN freight.contracts ct ON ct.id = b.contract_id
+     WHERE ct.reference LIKE 'CTR-IMP-%-' || $1
+     ORDER BY b.created_at DESC LIMIT 1`,
+    [suffix],
+    (row) => row?.status === "PAID",
+    20,
+  );
+}
+
+/** Push a reservation's pay deadline into the past — the 10s tick expires it. */
+export function forceReservationExpiry(suffix: string) {
+  withBooking(suffix, (b) =>
+    db(
+      `UPDATE freight.bookings SET payment_deadline = now() - interval '1 second'
+       WHERE id = $1`,
+      [b.id],
+    ),
+  );
+  pollBookingStatus(suffix, "EXPIRED");
+}
+
+/**
+ * Type-integrity assert for mixed trains: every wagon slot allocated to the
+ * booking is of ONE expected wagon type (containers → NW5, bulk → CW4), and
+ * the slot count matches. No wheat on a flat wagon, no box in a gondola.
+ */
+export function expectWagonType(suffix: string, code: string, wagons: number) {
+  withBooking(suffix, (b) =>
+    pollDb<{ code: string; n: string }>(
+      `${suffix} rides ${wagons}× ${code}`,
+      `SELECT wt.code, count(*) AS n
+       FROM freight.wagon_booking_allocations wba
+       JOIN freight.train_set_wagons tsw ON tsw.id = wba.train_set_wagon_id
+       JOIN freight.wagon_types wt ON wt.id = tsw.wagon_type_id
+       WHERE wba.booking_id = $1 AND wba.deleted_at IS NULL
+       GROUP BY wt.code`,
+      [b.id],
+      (row) => row?.code === code && Number(row?.n) === wagons,
+      20,
+    ),
+  );
+  // A grouped second row would mean mixed wagon types under one booking.
+  withBooking(suffix, (b) =>
+    db<{ k: string }>(
+      `SELECT count(DISTINCT tsw.wagon_type_id) AS k
+       FROM freight.wagon_booking_allocations wba
+       JOIN freight.train_set_wagons tsw ON tsw.id = wba.train_set_wagon_id
+       WHERE wba.booking_id = $1 AND wba.deleted_at IS NULL`,
+      [b.id],
+    ).then(({ rows }) =>
+      expect(Number(rows[0].k), `${suffix} single wagon type`).to.eq(1),
+    ),
+  );
+}
+
+export function pollAllocations(suffix: string, minWagons = 1) {
+  withBooking(suffix, (b) =>
+    pollDb<{ n: string }>(
+      `${suffix} wagon allocations`,
+      `SELECT count(*) AS n FROM freight.wagon_booking_allocations
+       WHERE booking_id = $1 AND deleted_at IS NULL`,
+      [b.id],
+      (row) => Number(row?.n ?? 0) >= minWagons,
+      30,
+    ),
+  );
+}
+
+// ---------------------------------------------------------------------------
+// route + schedule
+// ---------------------------------------------------------------------------
+
+export function dbRouteId(originCode = ORIGIN, destCode = DEST) {
+  return db<{ id: string }>(
+    `SELECT r.id FROM freight.routes r
+     JOIN freight.yards o ON o.id = r.origin_yard_id AND o.code = $1
+     JOIN freight.yards d ON d.id = r.destination_yard_id AND d.code = $2
+     WHERE r.deleted_at IS NULL
+     ORDER BY r.created_at DESC LIMIT 1`,
+    [originCode, destCode],
+  );
+}
+
+/** Create the 6-stop corridor route through the API if it doesn't exist yet. */
+export function ensureCorridorRoute() {
+  dbRouteId().then(({ rows }) => {
+    if (rows.length > 0) return;
+    db<{ id: string; code: string }>(
+      `SELECT id, code FROM freight.yards WHERE code = ANY($1::text[])`,
+      [[...CORRIDOR]],
+    ).then(({ rows: yards }) => {
+      expect(yards, "corridor yards").to.have.length(CORRIDOR.length);
+      const byCode = new Map(yards.map((y) => [y.code, y.id]));
+      apiPost(opsStaff, "/api/routes", {
+        milestones: CORRIDOR.map((code) => ({ yardId: byCode.get(code) })),
+      })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+    // Direction is frozen from the endpoint countries: DJ → ET = IMPORT.
+    db<{ direction: string }>(
+      `SELECT r.direction FROM freight.routes r
+       JOIN freight.yards o ON o.id = r.origin_yard_id AND o.code = $1
+       JOIN freight.yards d ON d.id = r.destination_yard_id AND d.code = $2
+       WHERE r.deleted_at IS NULL ORDER BY r.created_at DESC LIMIT 1`,
+      [ORIGIN, DEST],
+    ).then(({ rows: created }) => {
+      expect(created[0]?.direction, "corridor direction").to.eq("IMPORT");
+    });
+  });
+}
+
+/**
+ * Make a corridor departure-day re-runnable: soft-delete any schedule a prior
+ * run left on that day and expire its leftover fixture bookings (reference
+ * scope CTR-IMP-% only — never touches other suites' data). A wiped schedule
+ * must never leave bookings pointing at it (ghost refs break assign).
+ */
+export function resetCorridorDay(departure: Date, destCode = DEST, originCode = ORIGIN) {
+  db(
+    `WITH stale AS (
+       SELECT ts.id FROM freight.train_schedules ts
+       JOIN freight.yards o ON o.id = ts.origin_station_id AND o.code = $1
+       JOIN freight.yards d ON d.id = ts.destination_station_id AND d.code = $2
+       WHERE ts.deleted_at IS NULL
+         AND abs(extract(epoch FROM (ts.scheduled_departure_date - $3::timestamptz))) < 43200
+     ), unlink AS (
+       UPDATE freight.bookings b
+       SET train_schedule_id = NULL,
+           status = CASE WHEN b.status IN ('FULLY_EXECUTED','SELECTED_FOR_BATCH','AWAITING_PAYMENT')
+                         THEN 'EXPIRED' ELSE b.status END,
+           scheduling_status = 'NOT_SCHEDULED'
+       FROM freight.contracts ct
+       WHERE ct.id = b.contract_id AND ct.reference LIKE 'CTR-IMP-%'
+         AND b.train_schedule_id IN (SELECT id FROM stale)
+     ), drop_links AS (
+       UPDATE freight.train_schedule_bookings SET deleted_at = now()
+       WHERE train_schedule_id IN (SELECT id FROM stale) AND deleted_at IS NULL
+     )
+     UPDATE freight.train_schedules SET deleted_at = now()
+     WHERE id IN (SELECT id FROM stale)`,
+    [originCode, destCode, departure.toISOString()],
+  );
+  // Prior-run pool leftovers (never reserved, so no schedule ref) would
+  // contaminate this run's batch — a stale high-priority booking steals the
+  // top-up slot from this run's waiting list. Reset runs before this run
+  // books anything, so every unpinned fixture booking is debris: expire all.
+  db(
+    `UPDATE freight.bookings b
+     SET status = 'EXPIRED'
+     FROM freight.contracts ct
+     WHERE ct.id = b.contract_id AND ct.reference LIKE 'CTR-IMP-%'
+       AND b.status = 'FULLY_EXECUTED' AND b.train_schedule_id IS NULL`,
+    [],
+  );
+}
+
+/** Create the reversed 6-stop corridor (ET → DJ = EXPORT) if missing. */
+export function ensureExportRoute() {
+  dbRouteId(EXP_ORIGIN, EXP_DEST).then(({ rows }) => {
+    if (rows.length > 0) return;
+    const stops = [...CORRIDOR].reverse();
+    db<{ id: string; code: string }>(
+      `SELECT id, code FROM freight.yards WHERE code = ANY($1::text[])`,
+      [stops],
+    ).then(({ rows: yards }) => {
+      expect(yards, "corridor yards").to.have.length(stops.length);
+      const byCode = new Map(yards.map((y) => [y.code, y.id]));
+      apiPost(opsStaff, "/api/routes", {
+        milestones: stops.map((code) => ({ yardId: byCode.get(code) })),
+      })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+    db<{ direction: string }>(
+      `SELECT r.direction FROM freight.routes r
+       JOIN freight.yards o ON o.id = r.origin_yard_id AND o.code = $1
+       JOIN freight.yards d ON d.id = r.destination_yard_id AND d.code = $2
+       WHERE r.deleted_at IS NULL ORDER BY r.created_at DESC LIMIT 1`,
+      [EXP_ORIGIN, EXP_DEST],
+    ).then(({ rows: created }) => {
+      expect(created[0]?.direction, "export corridor direction").to.eq("EXPORT");
+    });
+  });
+}
+
+/**
+ * Ops accepts an EXPORT operation request — FCFS: the accept itself reserves
+ * the train slot and opens a pay window clamped to the window close.
+ */
+export function acceptExport(suffix: string) {
+  withBooking(suffix, (b) => {
+    apiPost(opsStaff, `/api/bookings/${b.id}/operation/review`, { decision: "ACCEPT" })
+      .its("status")
+      .should("be.oneOf", [200, 201]);
+  });
+  pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"], 10);
+}
+
+export interface ScheduleRow {
+  id: string;
+  status: string;
+  window_phase: string;
+  booking_window_status: string;
+  booking_cycle_no: number;
+  max_wagons: number;
+  window_opens_at: string | null;
+  window_closes_at: string | null;
+  payment_phase_ends_at: string | null;
+  scheduled_departure_date: string;
+}
+
+const SCHEDULE_COLS = `ts.id, ts.status, ts.window_phase, ts.booking_window_status,
+       ts.booking_cycle_no, ts.max_wagons, ts.window_opens_at, ts.window_closes_at,
+       ts.payment_phase_ends_at, ts.scheduled_departure_date`;
+
+/** The corridor schedule departing within ±1h of `departure` (12:00 EAT pin). */
+export function dbSchedule(departure: Date, destCode = DEST, originCode = ORIGIN) {
+  return db<ScheduleRow>(
+    `SELECT ${SCHEDULE_COLS}
+     FROM freight.train_schedules ts
+     JOIN freight.yards o ON o.id = ts.origin_station_id AND o.code = $1
+     JOIN freight.yards d ON d.id = ts.destination_station_id AND d.code = $2
+     WHERE ts.deleted_at IS NULL
+       AND abs(extract(epoch FROM (ts.scheduled_departure_date - $3::timestamptz))) < 3600
+     ORDER BY ts.created_at DESC LIMIT 1`,
+    [originCode, destCode, departure.toISOString()],
+  );
+}
+
+export function withSchedule(departure: Date, fn: (s: ScheduleRow) => void) {
+  dbSchedule(departure).then(({ rows }) => {
+    expect(rows, `schedule departing ${departure.toISOString()}`).to.have.length(1);
+    fn(rows[0]);
+  });
+}
+
+/** Export-corridor (KALITY → DJIB_PORT) variant of withSchedule. */
+export function withExportSchedule(departure: Date, fn: (s: ScheduleRow) => void) {
+  dbSchedule(departure, EXP_DEST, EXP_ORIGIN).then(({ rows }) => {
+    expect(rows, `export schedule departing ${departure.toISOString()}`).to.have.length(1);
+    fn(rows[0]);
+  });
+}
+
+/**
+ * Ops creates an import schedule on the corridor via the API — loco-pair mode
+ * (no built train): capacity comes from maxWagonsPerTrain (54, the corridor
+ * standard) and wagon stock is drawn from the origin yard at allocation time.
+ */
+export function createImportSchedule(opts: {
+  departure: Date;
+  locoPair: [string, string];
+  maxWagons?: number;
+  kind?: "container" | "bulk";
+  originCode?: string;
+  destCode?: string;
+}) {
+  const originCode = opts.originCode ?? ORIGIN;
+  const destCode = opts.destCode ?? DEST;
+  dbSchedule(opts.departure, destCode, originCode).then(({ rows }) => {
+    if (rows.length > 0) return;
+    dbRouteId(originCode, destCode).then(({ rows: routes }) => {
+      expect(routes, "corridor route").to.have.length(1);
+      db<{ id: string }>(
+        `SELECT id FROM freight.locomotives WHERE code = ANY($1::text[]) ORDER BY code`,
+        [opts.locoPair],
+      ).then(({ rows: locos }) => {
+        expect(locos, `locomotives ${opts.locoPair.join(",")}`).to.have.length(2);
+        apiPost(opsStaff, `/api/train-scheduling/${opts.kind ?? "container"}/schedules`, {
+          routeId: routes[0].id,
+          scheduleDate: opts.departure.toISOString(),
+          locomotiveIds: locos.map((l) => l.id),
+          maxWagonsPerTrain: opts.maxWagons ?? 54,
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+    });
+  });
+  dbSchedule(opts.departure, destCode, originCode).then(({ rows }) => {
+    expect(rows, "created schedule").to.have.length(1);
+    expect(rows[0].max_wagons, "54-wagon consist").to.eq(opts.maxWagons ?? 54);
+  });
+}
+
+// ---------------------------------------------------------------------------
+// window choreography — arrange timestamps, let the engine do the transition
+// ---------------------------------------------------------------------------
+
+function pollSchedulePhase(
+  scheduleId: string,
+  want: string[],
+  label: string,
+  attempts = 40,
+) {
+  pollDb<ScheduleRow>(
+    label,
+    `SELECT window_phase, booking_window_status FROM freight.train_schedules WHERE id = $1`,
+    [scheduleId],
+    (row) => !!row && want.includes(row.window_phase as unknown as string),
+    attempts,
+  );
+}
+
+/** Pull the window-open moment into the past; the tick flips PRE_WINDOW→OPEN. */
+export function forceWindowOpen(scheduleId: string, closesInMinutes = 45) {
+  db(
+    `UPDATE freight.train_schedules
+     SET window_opens_at = now() - interval '1 minute',
+         window_closes_at = now() + ($2 || ' minutes')::interval
+     WHERE id = $1`,
+    [scheduleId, String(closesInMinutes)],
+  );
+  pollSchedulePhase(scheduleId, ["OPEN"], `schedule ${scheduleId} window OPEN`);
+  pollDb<ScheduleRow>(
+    `schedule ${scheduleId} bookable`,
+    `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+    [scheduleId],
+    (row) => row?.booking_window_status === "OPEN",
+  );
+}
+
+/** Pull the close moment into the past; the tick flips OPEN→DOC_REVIEW. */
+export function closeBookingWindow(scheduleId: string) {
+  db(
+    `UPDATE freight.train_schedules
+     SET window_closes_at = now() - interval '1 second'
+     WHERE id = $1 AND window_phase = 'OPEN'`,
+    [scheduleId],
+  );
+  pollSchedulePhase(scheduleId, ["DOC_REVIEW"], `schedule ${scheduleId} DOC_REVIEW`);
+}
+
+/**
+ * Staff end document review early → PAYMENT: expires never-accepted bookings,
+ * runs the priority batch over the route-day pool, reserves + issues invoices.
+ * (Lands on DONE instead when the batch reserved nobody.)
+ */
+export function completeDocReview(scheduleId: string) {
+  apiPost(opsStaff, `/api/train-scheduling/schedules/${scheduleId}/doc-review-complete`)
+    .its("status")
+    .should("be.oneOf", [200, 201]);
+  pollSchedulePhase(
+    scheduleId,
+    ["PAYMENT", "DONE", "PRE_WINDOW"],
+    `schedule ${scheduleId} payment phase`,
+  );
+}
+
+/** End the payment phase now — the tick settles (allocate paid / expire unpaid). */
+export function endPaymentPhase(scheduleId: string) {
+  db(
+    `UPDATE freight.train_schedules
+     SET payment_phase_ends_at = now() - interval '1 second'
+     WHERE id = $1 AND window_phase = 'PAYMENT'`,
+    [scheduleId],
+  );
+}
+
+// ---------------------------------------------------------------------------
+// train journey + clearance
+// ---------------------------------------------------------------------------
+
+export function recordCheckpoint(scheduleId: string, sequenceNo: number, kind: string) {
+  apiPost(opsStaff, `/api/train-scheduling/schedules/${scheduleId}/checkpoints`, {
+    sequenceNo,
+    kind,
+  })
+    .its("status")
+    .should("be.oneOf", [200, 201]);
+}
+
+/** GL multipart upload via the Node-side task (cy.request can't send files). */
+export function glUpload(
+  path: string,
+  fields: Record<string, string> = {},
+  fileField = "files",
+) {
+  return tokenFor(superAdmin).then((token) =>
+    cy
+      .task<{ status: number; body: unknown }>("api:upload", {
+        url: `${apiUrl()}${path}`,
+        token,
+        fields,
+        files: [{ field: fileField, fixture: "docs/license.pdf", filename: "e2e-doc.pdf" }],
+      })
+      .then((res) => {
+        expect(res.status, `upload ${path}`).to.be.within(200, 201);
+        return cy.wrap(res.body, { log: false });
+      }),
+  );
+}
+
+export function completeBookingMilestone(suffix: string, code: string) {
+  withBooking(suffix, (b) => {
+    apiPost(superAdmin, `/api/contracts/bookings/${b.id}/milestones/${code}/complete`, {
+      note: "e2e",
+    })
+      .its("status")
+      .should("be.oneOf", [200, 201]);
+  });
+}
+
+export function expectMilestoneDone(suffix: string, code: string) {
+  withBooking(suffix, (b) =>
+    pollDb<{ n: string }>(
+      `${suffix} milestone ${code}`,
+      `SELECT count(*) AS n FROM freight.clearance_milestones
+       WHERE booking_id = $1 AND milestone_code = $2 AND status = 'COMPLETED'
+         AND deleted_at IS NULL`,
+      [b.id, code],
+      (row) => Number(row?.n ?? 0) > 0,
+      10,
+    ),
+  );
+}
diff --git a/e2e/freight/cypress/e2e/flows/import_critical_matrix.cy.ts b/e2e/freight/cypress/e2e/flows/import_critical_matrix.cy.ts
new file mode 100644
index 000000000..dd2300a87
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/import_critical_matrix.cy.ts
@@ -0,0 +1,299 @@
+/**
+ * IMPORT critical-scenario matrix — the corridor edge cases that don't need a
+ * full journey each. One 54-wagon train departing D+7, plus a same-day sibling:
+ *
+ *   1. hard gates at booking creation:
+ *      – no open window on the requested day → rejected
+ *      – duplicate ISO container number inside one booking → rejected
+ *   2. route creation refuses a yard pair with no configured distance
+ *   3. sub-corridor import booking (NAGAD → MOJO) rides the through-train:
+ *      the batch is corridor-aware, the booking reserves only its own leg
+ *   4. intercity ride-along (MOJO → KALITY, DOMESTIC): dateless booking, staff
+ *      accept onto the import train's free leg, pay window opens, paid + linked
+ *   5. same-route same-day sibling schedule JOINS the group window (shared
+ *      open/close timeline — no cross-expiry), and staff can move a booking
+ *      onto the sibling (move-schedule)
+ *
+ * Sequential steps — retries off.
+ */
+
+import {
+  resetCorridorDay,
+  acceptOperation,
+  apiPost,
+  bookContainers,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  departureAt,
+  dbRouteId,
+  eatDayStr,
+  ensureCorridorRoute,
+  forceWindowOpen,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  seedImportContract,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(9);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+const NO_WINDOW_DAY = eatDayStr(departureAt(11)); // no schedule exists there
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+describe("import critical matrix: gates, sub-corridor, intercity, sibling window", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    seedImportContract({ suffix: "MX1", reference: stampedRef("MX1") }); // through-corridor
+    seedImportContract({ suffix: "MX2", reference: stampedRef("MX2") }); // gate probes
+    seedImportContract({
+      suffix: "MXSUB",
+      reference: stampedRef("MXSUB"),
+      originCode: "NAGAD",
+      destCode: "MOJO",
+    });
+    seedImportContract({
+      suffix: "MXIC",
+      reference: stampedRef("MXIC"),
+      direction: "DOMESTIC",
+      originCode: "MOJO",
+      destCode: "KALITY",
+    });
+    seedImportContract({ suffix: "MXMOVE", reference: stampedRef("MXMOVE") });
+  });
+
+  it("operations prepares the corridor and the D+7 train with an open window", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-11", "LOCO-IMP-12"] });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+  });
+
+  it("gate: a booking day with no open window is rejected", () => {
+    bookContainers({
+      suffix: "MX2",
+      runStamp: stamp,
+      isoSeed: 5000,
+      twenty: 2,
+      scheduledDate: NO_WINDOW_DAY,
+      expectFailure: "booking window",
+    });
+  });
+
+  it("gate: a duplicate ISO container number inside one booking is rejected", () => {
+    // Two units, same number: build the payload by hand via the same API.
+    apiPostDuplicate();
+
+    function apiPostDuplicate() {
+      const dupe = `MSCU${String(Number(stamp.slice(-6)) + 5100).padStart(7, "0")}`;
+      db<{ id: string }>(
+        `SELECT id FROM freight.contracts
+         WHERE reference LIKE 'CTR-IMP-%-' || $1
+         ORDER BY created_at DESC LIMIT 1`,
+        ["MX2"],
+      ).then(({ rows }) => {
+        apiPost(
+          "user@gmail.com",
+          `/api/contracts/${rows[0].id}/bookings`,
+          {
+            scheduledDate: BOOKING_DAY,
+            containers: [
+              {
+                containerSize: "20ft",
+                quantity: 2,
+                units: [
+                  { containerNumber: dupe, vgmTons: 10 },
+                  { containerNumber: dupe, vgmTons: 10 },
+                ],
+              },
+            ],
+          },
+          false,
+        ).then((res) => {
+          expect(res.status, "duplicate ISO rejected").to.be.within(400, 422);
+          expect(JSON.stringify(res.body)).to.include("Duplicate container number");
+        });
+      });
+    }
+  });
+
+  it("gate: a route over a yard pair with no configured distance is rejected", () => {
+    db<{ id: string; code: string }>(
+      `SELECT id, code FROM freight.yards WHERE code = ANY($1::text[])`,
+      [["E2E_AWASH", "DJIB_PORT"]],
+    ).then(({ rows }) => {
+      const byCode = new Map(rows.map((y) => [y.code, y.id]));
+      // E2E_AWASH ↔ DJIB_PORT has no direct distance row.
+      apiPost(
+        opsStaff,
+        "/api/routes",
+        {
+          milestones: [
+            { yardId: byCode.get("DJIB_PORT") },
+            { yardId: byCode.get("E2E_AWASH") },
+          ],
+        },
+        false,
+      ).then((res) => {
+        expect(res.status, "distance-less route rejected").to.be.within(400, 422);
+        expect(JSON.stringify(res.body)).to.include("No distance configured");
+      });
+    });
+  });
+
+  it("a through-corridor booking and a NAGAD→MOJO sub-corridor booking share the train", () => {
+    // All windowed bookings (incl. MXMOVE for the later move test) go in while
+    // the window is still OPEN — the create gate closes with it.
+    bookContainers({
+      suffix: "MX1",
+      runStamp: stamp,
+      isoSeed: 5200,
+      twenty: 40, // 20 wagons DJIB_PORT → KALITY
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptOperation("MX1");
+    bookContainers({
+      suffix: "MXSUB",
+      runStamp: stamp,
+      isoSeed: 5300,
+      twenty: 20, // 10 wagons, NAGAD → MOJO leg only
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptOperation("MXSUB");
+    bookContainers({
+      suffix: "MXMOVE",
+      runStamp: stamp,
+      isoSeed: 5500,
+      forty: 4, // 4 wagons — later moved onto the sibling train
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptOperation("MXMOVE");
+
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    ["MX1", "MXSUB", "MXMOVE"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    markPaid("MX1");
+    pollAllocations("MX1", 20);
+    markPaid("MXSUB");
+    pollAllocations("MXSUB", 10);
+
+    // Both ride the same schedule even though MXSUB's endpoints are interior stops.
+    withSchedule(DEPARTURE, (s) => {
+      withBooking("MX1", (b) => expect(b.train_schedule_id).to.eq(s.id));
+      withBooking("MXSUB", (b) => expect(b.train_schedule_id).to.eq(s.id));
+    });
+  });
+
+  it("intercity ride-along: dateless DOMESTIC booking accepted onto the import train's free leg", () => {
+    bookContainers({
+      suffix: "MXIC",
+      runStamp: stamp,
+      isoSeed: 5400,
+      twenty: 4, // 2 wagons MOJO → KALITY — plenty of leg capacity left
+      // no scheduledDate: intercity bookings are dateless
+    });
+    acceptOperation("MXIC");
+
+    withSchedule(DEPARTURE, (s) => {
+      withBooking("MXIC", (b) => {
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${s.id}/intercity/accept`, {
+          bookingIds: [b.id],
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+    });
+    pollBookingStatus("MXIC", ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]);
+    withBooking("MXIC", (b) => {
+      expect(b.payment_deadline, "ride-along pay window opened").to.be.a("string");
+    });
+    markPaid("MXIC");
+    withSchedule(DEPARTURE, (s) => {
+      withBooking("MXIC", (b) => {
+        expect(b.train_schedule_id, "linked to the import train").to.eq(s.id);
+        db<{ n: string }>(
+          `SELECT count(*) AS n FROM freight.train_schedule_bookings
+           WHERE booking_id = $1 AND train_schedule_id = $2 AND deleted_at IS NULL`,
+          [b.id, s.id],
+        ).then(({ rows }) => expect(Number(rows[0].n), "link row").to.eq(1));
+      });
+    });
+  });
+
+  it("a same-route same-day sibling schedule joins the shared group window", () => {
+    createImportSchedule({
+      departure: new Date(DEPARTURE.getTime() + 90 * 60_000), // same EAT day, later
+      locoPair: ["LOCO-IMP-13", "LOCO-IMP-14"],
+    });
+    withSchedule(DEPARTURE, (anchor) => {
+      pollDb<ScheduleRow>(
+        "sibling adopts the group timeline",
+        `SELECT ${["ts.id", "ts.window_phase", "ts.window_opens_at"].join(", ")}
+         FROM freight.train_schedules ts
+         JOIN freight.yards o ON o.id = ts.origin_station_id AND o.code = 'DJIB_PORT'
+         JOIN freight.yards d ON d.id = ts.destination_station_id AND d.code = 'KALITY'
+         WHERE ts.deleted_at IS NULL AND ts.id <> $1
+           AND abs(extract(epoch FROM (ts.scheduled_departure_date - $2::timestamptz))) < 7200
+         ORDER BY ts.created_at DESC LIMIT 1`,
+        [anchor.id, DEPARTURE.toISOString()],
+        // The anchor is already past OPEN (we closed it) — a mid-cycle joiner
+        // mirrors the group's live phase instead of restarting its own clock.
+        (row) => !!row && row.window_phase === anchor.window_phase,
+      );
+    });
+  });
+
+  it("staff move a reserved booking onto the sibling train, then it pays there", () => {
+    withSchedule(DEPARTURE, (anchor) => {
+      db<{ id: string }>(
+        `SELECT ts.id FROM freight.train_schedules ts
+         WHERE ts.deleted_at IS NULL AND ts.id <> $1
+           AND abs(extract(epoch FROM (ts.scheduled_departure_date - $2::timestamptz))) < 7200
+         ORDER BY ts.created_at DESC LIMIT 1`,
+        [anchor.id, DEPARTURE.toISOString()],
+      ).then(({ rows: siblings }) => {
+        expect(siblings, "sibling schedule").to.have.length(1);
+        // move-schedule only accepts an OPEN target — the sibling joined the
+        // group mid-cycle (already past OPEN), so arrange its window state.
+        db(
+          `UPDATE freight.train_schedules SET booking_window_status = 'OPEN'
+           WHERE id = $1`,
+          [siblings[0].id],
+        );
+        withBooking("MXMOVE", (b) => {
+          apiPost(opsStaff, `/api/train-scheduling/bookings/${b.id}/move-schedule`, {
+            trainScheduleId: siblings[0].id,
+          })
+            .its("status")
+            .should("be.oneOf", [200, 201]);
+          pollDb<{ train_schedule_id: string }>(
+            "MXMOVE pinned to the sibling",
+            `SELECT train_schedule_id FROM freight.bookings WHERE id = $1`,
+            [b.id],
+            (row) => row?.train_schedule_id === siblings[0].id,
+            10,
+          );
+        });
+        markPaid("MXMOVE");
+        pollAllocations("MXMOVE", 4);
+        withBooking("MXMOVE", (b) => {
+          expect(b.train_schedule_id, "paid on the sibling").to.eq(siblings[0].id);
+        });
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/import_full_train.cy.ts b/e2e/freight/cypress/e2e/flows/import_full_train.cy.ts
new file mode 100644
index 000000000..4d2f2c084
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/import_full_train.cy.ts
@@ -0,0 +1,332 @@
+/**
+ * IMPORT journey 1 — six container bookings fill a 54-wagon train on the long
+ * corridor DJIB_PORT → NAGAD → DIRE_DAWA → E2E_AWASH → MOJO → KALITY, all in
+ * the FIRST booking window, then the full life of the train: payment,
+ * allocation, gate pass, T1, dispatch, checkpoint-by-checkpoint movement,
+ * arrival, and the post-arrival customs tail to IMPORT_PROCESS_COMPLETED.
+ *
+ * The six bookings (exact wagon math — Σ = 54, the full consist):
+ *   FT1  customs + USD   16×20ft            =  8 wagons
+ *   FT2  customs + ETB    6×40ft            =  6 wagons
+ *   FT3  self    + ETB   12×20ft            =  6 wagons
+ *   FT4  self    + ETB    6×40ft            =  6 wagons
+ *   FT5  customs + USD   44×20ft            = 22 wagons  (the ≥22-wagon giant)
+ *   FT6  self    + USD    4×40ft + 4×20ft   =  6 wagons
+ *
+ * Sequential steps of one journey — retries off (steps are not idempotent).
+ */
+
+import {
+  resetCorridorDay,
+  acceptOperation,
+  apiPost,
+  bookContainers,
+  closeBookingWindow,
+  completeBookingMilestone,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  dbBooking,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  expectMilestoneDone,
+  forceWindowOpen,
+  glUpload,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  seedImportContract,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(4);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+/** suffix → [customs, currency, twenty, forty, wagons] */
+const BOOKINGS: Array<{
+  suffix: string;
+  customs: boolean;
+  currency: "ETB" | "USD";
+  twenty: number;
+  forty: number;
+  wagons: number;
+}> = [
+  { suffix: "FT1", customs: true, currency: "USD", twenty: 16, forty: 0, wagons: 8 },
+  { suffix: "FT2", customs: true, currency: "ETB", twenty: 0, forty: 6, wagons: 6 },
+  { suffix: "FT3", customs: false, currency: "ETB", twenty: 12, forty: 0, wagons: 6 },
+  { suffix: "FT4", customs: false, currency: "ETB", twenty: 0, forty: 6, wagons: 6 },
+  { suffix: "FT5", customs: true, currency: "USD", twenty: 44, forty: 0, wagons: 22 },
+  { suffix: "FT6", customs: false, currency: "USD", twenty: 4, forty: 4, wagons: 6 },
+];
+const CUSTOMS = BOOKINGS.filter((b) => b.customs).map((b) => b.suffix);
+const SELF_CLEAR = BOOKINGS.filter((b) => !b.customs).map((b) => b.suffix);
+
+function withScheduleId(fn: (id: string, s: ScheduleRow) => void) {
+  withSchedule(DEPARTURE, (s) => fn(s.id, s));
+}
+
+describe("import: six bookings fill the 54-wagon corridor train", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    for (const b of BOOKINGS) {
+      seedImportContract({
+        suffix: b.suffix,
+        reference: stampedRef(b.suffix),
+        currency: b.currency,
+        customs: b.customs,
+      });
+    }
+  });
+
+  it("operations ensures the 6-stop import corridor route exists (direction frozen IMPORT)", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+  });
+
+  it("operations schedules the 54-wagon import train — first window forced open", () => {
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-1", "LOCO-IMP-2"] });
+    withScheduleId((id) => forceWindowOpen(id, 45));
+    withScheduleId((_, s) => {
+      expect(s.booking_cycle_no, "FIRST window cycle").to.eq(1);
+    });
+  });
+
+  it("customer books all six shipments inside the first window", () => {
+    let isoSeed = 0;
+    BOOKINGS.forEach((b) => {
+      bookContainers({
+        suffix: b.suffix,
+        runStamp: stamp,
+        isoSeed,
+        twenty: b.twenty,
+        forty: b.forty,
+        scheduledDate: BOOKING_DAY,
+      });
+      isoSeed += b.twenty + b.forty;
+      pollBookingStatus(b.suffix, "OPERATION_REQUEST_PENDING", 5);
+    });
+  });
+
+  it("operations accepts all six — the whole pool is FULLY_EXECUTED (in window)", () => {
+    BOOKINGS.forEach((b) => acceptOperation(b.suffix));
+  });
+
+  it("window closes, doc review completes — the batch reserves ALL six (they fit exactly)", () => {
+    withScheduleId((id) => {
+      closeBookingWindow(id);
+      completeDocReview(id);
+    });
+    BOOKINGS.forEach((b) =>
+      pollBookingStatus(b.suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    // Reservation = pay deadline + a payable invoice in the CONTRACT currency.
+    BOOKINGS.forEach((b) => {
+      withBooking(b.suffix, (row) => {
+        expect(row.payment_deadline, `${b.suffix} pay deadline`).to.be.a("string");
+        pollDb<{ currency: string }>(
+          `${b.suffix} invoice`,
+          `SELECT currency FROM freight.invoices
+           WHERE source_id = $1 AND deleted_at IS NULL
+           ORDER BY created_at DESC LIMIT 1`,
+          [row.id],
+          (inv) => inv?.currency === b.currency,
+          10,
+        );
+      });
+    });
+  });
+
+  it("all six pay — allocated onto the train, 54/54 wagons, window FULL and schedule finalized", () => {
+    BOOKINGS.forEach((b) => {
+      markPaid(b.suffix);
+      pollAllocations(b.suffix, b.wagons);
+    });
+    withScheduleId((id) => {
+      endPaymentPhase(id);
+      // Full train → conclude marks FULL + DONE and auto-finalizes (DRAFT→SCHEDULED).
+      pollDb<ScheduleRow>(
+        "schedule FULL + DONE + finalized",
+        `SELECT window_phase, booking_window_status, status
+         FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) =>
+          s?.booking_window_status === "FULL" &&
+          s?.window_phase === "DONE" &&
+          s?.status === "SCHEDULED",
+      );
+      db<{ n: string }>(
+        `SELECT count(*) AS n FROM freight.train_schedule_bookings
+         WHERE train_schedule_id = $1 AND deleted_at IS NULL`,
+        [id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "6 bookings linked").to.eq(6));
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+    });
+  });
+
+  it("backoffice sees the full train on the schedule detail", () => {
+    cy.loginBackoffice(opsStaff);
+    withScheduleId((id) => cy.visit(`/dashboard/operations/train-scheduling-v2/${id}`));
+    cy.contains(/54/, { timeout: 30000 }).should("exist");
+  });
+
+  it("GL Djibouti: gate pass granted, T1 documents uploaded for the customs bookings", () => {
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/import-djibouti/gatepass-granted`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        glUpload(`/api/contracts/bookings/${b.id}/t1-documents`);
+      });
+    });
+  });
+
+  it("the train dispatches — every booking boards at the origin (IN_TRANSIT)", () => {
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/dispatch`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule DISPATCHED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "DISPATCHED",
+        10,
+      );
+    });
+    BOOKINGS.forEach((b) => pollBookingStatus(b.suffix, "IN_TRANSIT", 10));
+    BOOKINGS.forEach((b) =>
+      withBooking(b.suffix, (row) => {
+        db<{ loaded_at: string | null }>(
+          `SELECT loaded_at FROM freight.bookings WHERE id = $1`,
+          [row.id],
+        ).then(({ rows }) => expect(rows[0].loaded_at, `${b.suffix} loaded`).to.be.a("string"));
+      }),
+    );
+  });
+
+  it("the train runs the corridor checkpoint by checkpoint and arrives at the terminal", () => {
+    withScheduleId((id) => {
+      recordAll(id);
+      pollDb<ScheduleRow>(
+        "schedule ARRIVED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "ARRIVED",
+        20,
+      );
+    });
+    // Final-yard auto-arrive settles every booking + its wagons at KALITY.
+    BOOKINGS.forEach((b) => pollBookingStatus(b.suffix, "ARRIVED", 20));
+    withScheduleId((id) => {
+      db<{ n: string }>(
+        `SELECT count(*) AS n FROM freight.wagon_movements
+         WHERE train_schedule_id = $1`,
+        [id],
+      ).then(({ rows }) =>
+        expect(Number(rows[0].n), "wagon movement ledger rows").to.be.at.least(54),
+      );
+    });
+
+    function recordAll(id: string) {
+      // seq 0 = origin DEPARTED is stamped by dispatch; walk the rest.
+      [1, 2, 3, 4].forEach((seq) => {
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+          sequenceNo: seq,
+          kind: "PASSED",
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+        sequenceNo: 5,
+        kind: "ARRIVED",
+      })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    }
+  });
+
+  it("GL Ethiopia runs the customs tail on every customs booking (T1 close → risk → second duty → release → final invoice)", () => {
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        apiPost("superadmin@tria.com", `/api/contracts/bookings/${b.id}/t1-close`)
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+        apiPost("superadmin@tria.com", `/api/contracts/bookings/${b.id}/risk`, {
+          riskLevel: "GREEN",
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+        glUpload(
+          `/api/contracts/bookings/${b.id}/second-duty`,
+          { dutyRequired: "false" },
+          "attachment",
+        );
+      });
+      completeBookingMilestone(suffix, "IMPORT_RELEASE_GRANTED");
+      expectMilestoneDone(suffix, "T1_CLOSED");
+      expectMilestoneDone(suffix, "RISK_ASSIGNED");
+      expectMilestoneDone(suffix, "IMPORT_RELEASE_GRANTED");
+    });
+  });
+
+  it("GL Djibouti raises the final invoice; GL confirms the slip — import process completed", () => {
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        glUpload(
+          `/api/contracts/bookings/${b.id}/final-invoice`,
+          { amount: "1000", description: "e2e final invoice" },
+          "file",
+        );
+        // The customer attaches the payment slip; only then can GL confirm.
+        glUpload(`/api/contracts/bookings/${b.id}/final-invoice-slip`, {}, "file");
+        apiPost(
+          "superadmin@tria.com",
+          `/api/contracts/bookings/${b.id}/final-invoice/confirm`,
+        )
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+      completeBookingMilestone(suffix, "IMPORT_PROCESS_COMPLETED");
+      expectMilestoneDone(suffix, "IMPORT_PROCESS_COMPLETED");
+    });
+  });
+
+  it("the self-clearance bookings arrived clean — no customs tail required", () => {
+    SELF_CLEAR.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        expect(b.status, `${suffix} final status`).to.eq("ARRIVED");
+      });
+      dbBooking(suffix).then(({ rows }) => {
+        db<{ n: string }>(
+          `SELECT count(*) AS n FROM freight.clearance_milestones
+           WHERE booking_id = $1 AND milestone_code = 'T1_CLOSED'
+             AND status = 'COMPLETED' AND deleted_at IS NULL`,
+          [rows[0].id],
+        ).then(({ rows: ms }) =>
+          expect(Number(ms[0].n), `${suffix} has no T1 tail`).to.eq(0),
+        );
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/import_split_promote.cy.ts b/e2e/freight/cypress/e2e/flows/import_split_promote.cy.ts
new file mode 100644
index 000000000..a312063ba
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/import_split_promote.cy.ts
@@ -0,0 +1,224 @@
+/**
+ * IMPORT journey 3 — split offer, remainder rebooking, pay-window expiry, and
+ * priority-ordered waiting-list promotion, all on one 54-wagon corridor train:
+ *
+ *   reserved by the batch (priority order):
+ *     SA 40×20ft = 20w, SB 14×40ft = 14w, SD 24×20ft = 12w        → 46w
+ *   SC 48×20ft = 24w does NOT fit whole → the batch offers a PARTIAL of the
+ *     remaining 8 wagons (16×20ft). SC pays → the split applies (is_split +
+ *     pre_split_quantities), and the customer must later rebook EXACTLY the
+ *     whole remainder (32×20ft) — a wrong quantity is rejected.
+ *   SD never pays — its pay deadline passes and it EXPIRES; the freed 12
+ *     wagons promote the waiting list in priority order: SW1 (12×20ft = 6w)
+ *     and SW2 (6×40ft = 6w) get pay windows ("payment sent"); SW3 (40×20ft =
+ *     20w) never fits and expires with the day.
+ *
+ *   Final consist: SA 20 + SB 14 + SC(split) 8 + SW1 6 + SW2 6 = 54/54.
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  resetCorridorDay,
+  acceptOperation,
+  bookContainers,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  forceReservationExpiry,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  seedImportContract,
+  settleViaGateway,
+  setPriority,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(6);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+/** The split remainder is rebooked onto a LATER train on the same corridor. */
+const REMAINDER_DEPARTURE = departureAt(8);
+const REMAINDER_DAY = eatDayStr(REMAINDER_DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const ORDER = ["SA", "SB", "SD", "SC", "SW1", "SW2", "SW3"] as const;
+
+describe("import: split offer, remainder rebooking, expiry + promotion", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    ORDER.forEach((suffix) => seedImportContract({ suffix, reference: stampedRef(suffix) }));
+  });
+
+  it("operations prepares the corridor train with an open first window", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    resetCorridorDay(REMAINDER_DEPARTURE);
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-5", "LOCO-IMP-6"] });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+  });
+
+  it("seven customers book in the first window; operations accepts them in priority order", () => {
+    const shapes: Record<string, { twenty: number; forty: number }> = {
+      SA: { twenty: 40, forty: 0 },
+      SB: { twenty: 0, forty: 14 },
+      SD: { twenty: 24, forty: 0 },
+      SC: { twenty: 48, forty: 0 },
+      SW1: { twenty: 12, forty: 0 },
+      SW2: { twenty: 0, forty: 6 },
+      SW3: { twenty: 40, forty: 0 },
+    };
+    let isoSeed = 1500;
+    ORDER.forEach((suffix) => {
+      const s = shapes[suffix];
+      bookContainers({
+        suffix,
+        runStamp: stamp,
+        isoSeed,
+        twenty: s.twenty,
+        forty: s.forty,
+        scheduledDate: BOOKING_DAY,
+      });
+      isoSeed += s.twenty + s.forty;
+      acceptOperation(suffix);
+    });
+    ORDER.forEach((suffix, i) => setPriority(suffix, i + 1));
+  });
+
+  it("the batch reserves SA/SB/SD whole and offers SC a PARTIAL for the last 8 wagons", () => {
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    ["SA", "SB", "SD", "SC"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    // SC's reservation is a partial OFFER (16×20ft of its 48).
+    withBooking("SC", (b) => {
+      pollDb<{ status: string }>(
+        "SC open partial offer",
+        `SELECT status FROM freight.booking_batch_offers
+         WHERE booking_id = $1 AND deleted_at IS NULL
+         ORDER BY created_at DESC LIMIT 1`,
+        [b.id],
+        (row) => row?.status === "OFFERED",
+        10,
+      );
+    });
+    ["SW1", "SW2", "SW3"].forEach((suffix) =>
+      withBooking(suffix, (b) => {
+        expect(b.status, `${suffix} waiting`).to.eq("FULLY_EXECUTED");
+      }),
+    );
+  });
+
+  it("SA and SB pay; SC pays its partial — the split applies and the remainder is snapshotted", () => {
+    markPaid("SA");
+    pollAllocations("SA", 20);
+    markPaid("SB");
+    pollAllocations("SB", 14);
+
+    // SC must settle through the real payment pipeline — only the settle path
+    // applies the pending split offer (staff mark-paid allocates whole).
+    settleViaGateway("SC");
+    pollAllocations("SC", 8);
+    withBooking("SC", (b) => {
+      expect(b.is_split, "SC is split").to.eq(true);
+      db<{ pre_split_quantities: { bySize?: Record<string, number> } | null; n: string }>(
+        `SELECT pre_split_quantities FROM freight.bookings WHERE id = $1`,
+        [b.id],
+      ).then(({ rows }) => {
+        expect(rows[0].pre_split_quantities, "pre-split snapshot").to.not.be.null;
+      });
+      // The booking itself shrank to the offered 16×20ft.
+      db<{ q: string }>(
+        `SELECT sum(quantity) AS q FROM freight.booking_container
+         WHERE booking_id = $1 AND deleted_at IS NULL`,
+        [b.id],
+      ).then(({ rows }) => expect(Number(rows[0].q), "SC shrank to 16 boxes").to.eq(16));
+    });
+  });
+
+  it("SD misses its pay window — EXPIRED, and the freed wagons promote SW1 + SW2 (payment sent)", () => {
+    forceReservationExpiry("SD");
+    // The settle promotes the waiting list in priority order into the freed 12
+    // wagons: SW1 (6w) and SW2 (6w) fit; SW3 (20w) does not.
+    ["SW1", "SW2"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    ["SW1", "SW2"].forEach((suffix) =>
+      withBooking(suffix, (b) => {
+        expect(b.payment_deadline, `${suffix} got a pay window`).to.be.a("string");
+      }),
+    );
+    withBooking("SW3", (b) => {
+      expect(b.status, "SW3 still has no seat").to.eq("FULLY_EXECUTED");
+    });
+  });
+
+  it("SW1 and SW2 pay — the train is FULL at 54; SW3 expires with the day", () => {
+    markPaid("SW1");
+    pollAllocations("SW1", 6);
+    markPaid("SW2");
+    pollAllocations("SW2", 6);
+
+    withSchedule(DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      pollDb<ScheduleRow>(
+        "window FULL + DONE",
+        `SELECT window_phase, booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL" && row?.window_phase === "DONE",
+      );
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [s.id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+    });
+    pollBookingStatus("SW3", "EXPIRED");
+  });
+
+  it("the split customer must rebook EXACTLY the whole remainder — wrong quantity rejected, exact accepted", () => {
+    createImportSchedule({
+      departure: REMAINDER_DEPARTURE,
+      locoPair: ["LOCO-IMP-7", "LOCO-IMP-8"],
+    });
+    withSchedule(REMAINDER_DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+
+    // 48 booked − 16 shipped-by-split = 32×20ft outstanding. 8 ≠ 32 → rejected.
+    bookContainers({
+      suffix: "SC",
+      runStamp: stamp,
+      isoSeed: 3000,
+      twenty: 8,
+      scheduledDate: REMAINDER_DAY,
+      expectFailure: "must take the whole remainder",
+    });
+
+    bookContainers({
+      suffix: "SC",
+      runStamp: stamp,
+      isoSeed: 3100,
+      twenty: 32,
+      scheduledDate: REMAINDER_DAY,
+    });
+    pollBookingStatus("SC", "OPERATION_REQUEST_PENDING", 5);
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/import_waiting_expiry.cy.ts b/e2e/freight/cypress/e2e/flows/import_waiting_expiry.cy.ts
new file mode 100644
index 000000000..981ba742b
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/import_waiting_expiry.cy.ts
@@ -0,0 +1,143 @@
+/**
+ * IMPORT journey 2 — the train fills from THREE bookings; three more sit in
+ * the waiting pool of the same (first) window. The three selected bookings
+ * pay and allocate; when the cycle concludes with the train FULL, the three
+ * waiting bookings have nowhere left to go on the day and expire.
+ *
+ * Wagon math (54-wagon consist):
+ *   selected: WA 40×20ft = 20w, WB 20×40ft = 20w, WC 28×20ft = 14w  → Σ 54
+ *   waiting:  WW1 20×20ft = 10w, WW2 10×40ft = 10w, WW3 20×20ft = 10w
+ *
+ * Priority order (score DESC drives the batch): WA > WB > WC > WW1 > WW2 > WW3.
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  resetCorridorDay,
+  acceptOperation,
+  bookContainers,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  seedImportContract,
+  setPriority,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(5);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const SELECTED = [
+  { suffix: "WA", twenty: 40, forty: 0, wagons: 20 },
+  { suffix: "WB", twenty: 0, forty: 20, wagons: 20 },
+  { suffix: "WC", twenty: 28, forty: 0, wagons: 14 },
+];
+const WAITING = [
+  { suffix: "WW1", twenty: 20, forty: 0, wagons: 10 },
+  { suffix: "WW2", twenty: 0, forty: 10, wagons: 10 },
+  { suffix: "WW3", twenty: 20, forty: 0, wagons: 10 },
+];
+const ALL = [...SELECTED, ...WAITING];
+
+describe("import: 3 bookings fill the train, 3 wait and expire", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    ALL.forEach((b) =>
+      seedImportContract({ suffix: b.suffix, reference: stampedRef(b.suffix) }),
+    );
+  });
+
+  it("operations prepares the corridor and a 54-wagon train with an open first window", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-3", "LOCO-IMP-4"] });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+  });
+
+  it("six customers book in the first window; operations accepts all six", () => {
+    let isoSeed = 500;
+    ALL.forEach((b) => {
+      bookContainers({
+        suffix: b.suffix,
+        runStamp: stamp,
+        isoSeed,
+        twenty: b.twenty,
+        forty: b.forty,
+        scheduledDate: BOOKING_DAY,
+      });
+      isoSeed += b.twenty + b.forty;
+      acceptOperation(b.suffix);
+    });
+    ALL.forEach((b, i) => setPriority(b.suffix, i + 1));
+  });
+
+  it("the batch selects exactly the three that fill 54 wagons; the rest keep waiting", () => {
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    SELECTED.forEach((b) =>
+      pollBookingStatus(b.suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    // Waiting bookings stay in the pool: FULLY_EXECUTED, no pay window opened.
+    WAITING.forEach((b) =>
+      withBooking(b.suffix, (row) => {
+        expect(row.status, `${b.suffix} still waiting`).to.eq("FULLY_EXECUTED");
+        expect(row.payment_deadline, `${b.suffix} has no pay deadline`).to.be.null;
+      }),
+    );
+  });
+
+  it("the three selected bookings pay and allocate — 54/54", () => {
+    SELECTED.forEach((b) => {
+      markPaid(b.suffix);
+      pollAllocations(b.suffix, b.wagons);
+    });
+    withSchedule(DEPARTURE, (s) => {
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [s.id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+    });
+  });
+
+  it("the cycle concludes FULL — the three waiting bookings expire with the day", () => {
+    withSchedule(DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      pollDb<ScheduleRow>(
+        "window FULL + DONE",
+        `SELECT window_phase, booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL" && row?.window_phase === "DONE",
+      );
+    });
+    // No sibling train on the route-day can take them → the leftover day pool
+    // expires (the paid three are untouched).
+    WAITING.forEach((b) => pollBookingStatus(b.suffix, "EXPIRED"));
+    SELECTED.forEach((b) =>
+      withBooking(b.suffix, (row) => expect(row.status, `${b.suffix} stays PAID`).to.eq("PAID")),
+    );
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/import_window_reopen.cy.ts b/e2e/freight/cypress/e2e/flows/import_window_reopen.cy.ts
new file mode 100644
index 000000000..bbcc4da53
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/import_window_reopen.cy.ts
@@ -0,0 +1,131 @@
+/**
+ * IMPORT journey 4 — nobody pays in the first window cycle: every reserved
+ * booking expires, the cycle concludes NOT-full and the window REOPENS for a
+ * second cycle on the same train. A fresh booking arrives in cycle 2, pays,
+ * and allocates — the train recovers from a dead first window.
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  resetCorridorDay,
+  acceptOperation,
+  bookContainers,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  forceReservationExpiry,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  seedImportContract,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(7);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+describe("import: dead first cycle — expire all, reopen, book again", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    ["RA", "RB", "RC"].forEach((suffix) =>
+      seedImportContract({ suffix, reference: stampedRef(suffix) }),
+    );
+  });
+
+  it("operations prepares the corridor train — first window opens (cycle 1)", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-9", "LOCO-IMP-10"] });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+    withSchedule(DEPARTURE, (s) => expect(s.booking_cycle_no, "cycle 1").to.eq(1));
+  });
+
+  it("two customers book and are reserved in cycle 1", () => {
+    bookContainers({
+      suffix: "RA",
+      runStamp: stamp,
+      isoSeed: 4000,
+      twenty: 40,
+      scheduledDate: BOOKING_DAY,
+    });
+    bookContainers({
+      suffix: "RB",
+      runStamp: stamp,
+      isoSeed: 4100,
+      forty: 20,
+      scheduledDate: BOOKING_DAY,
+    });
+    ["RA", "RB"].forEach((suffix) => acceptOperation(suffix));
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    ["RA", "RB"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+  });
+
+  it("nobody pays — both reservations expire and the cycle concludes not-full", () => {
+    ["RA", "RB"].forEach((suffix) => forceReservationExpiry(suffix));
+    withSchedule(DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      // Not full + departure days away → the engine schedules a fresh cycle.
+      // When the reopen instant falls inside office hours, the 10s tick's
+      // guard-loop chains PRE_WINDOW straight into OPEN within the SAME tick
+      // (booking-window.service.ts advanceSchedule), so PRE_WINDOW is not a
+      // reliably observable resting state — assert the cycle left PAYMENT
+      // without concluding FULL/DONE, whichever phase it lands on.
+      pollDb<ScheduleRow>(
+        "window concludes not-full (PRE_WINDOW or fast-forwarded to OPEN)",
+        `SELECT window_phase FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => !!row && row.window_phase !== "PAYMENT" && row.window_phase !== "DONE",
+      );
+    });
+  });
+
+  it("the second window opens (cycle 2) and a fresh booking pays and allocates", () => {
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+    withSchedule(DEPARTURE, (s) => expect(s.booking_cycle_no, "cycle 2").to.eq(2));
+
+    bookContainers({
+      suffix: "RC",
+      runStamp: stamp,
+      isoSeed: 4200,
+      twenty: 20,
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptOperation("RC");
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    pollBookingStatus("RC", ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]);
+    markPaid("RC");
+    pollAllocations("RC", 10);
+
+    // The dead cycle's corpses stay dead; the recovery booking is on the train.
+    ["RA", "RB"].forEach((suffix) =>
+      withBooking(suffix, (b) => expect(b.status, `${suffix} stays expired`).to.eq("EXPIRED")),
+    );
+    withSchedule(DEPARTURE, (s) => {
+      withBooking("RC", (b) => {
+        expect(b.train_schedule_id, "RC rides the reopened train").to.eq(s.id);
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/intercity_one_time.cy.ts b/e2e/freight/cypress/e2e/flows/intercity_one_time.cy.ts
new file mode 100644
index 000000000..b8ca2fd1b
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/intercity_one_time.cy.ts
@@ -0,0 +1,574 @@
+/**
+ * Intercity ONE_TIME journey — the full life of a domestic ride-along shipment:
+ *
+ *   1. portal    — customer creates an INTERCITY / One-Time / Container contract
+ *                  (Mojo Dry Port → Dire Dawa Yard) and submits it
+ *   2. backoffice — marketer REJECTS it with a reason
+ *   3. portal    — customer sees the rejection banner + reason, then submits a
+ *                  fresh contract
+ *   4. backoffice — marketer accepts + approves LINE_STAFF, director approves
+ *                  → CONTRACT_READY
+ *   5. portal    — customer OTP-signs → SIGNED_CUSTOMER
+ *   6. backoffice — marketer counter-signs → AWAITING_CLEARANCE_DOCUMENTS
+ *                  (ONE_TIME intercity always routes through the
+ *                  intercity-documents step; the fixture seeds one REQUIRED
+ *                  document so the step is real)
+ *   6b. portal   — customer uploads the required intercity document
+ *                  → CLEARANCE_UNDER_REVIEW
+ *   7. backoffice — operations approves the document, then finalizes document
+ *                  approval → FULLY_EXECUTED
+ *   8. portal    — customer books 2 × 20ft under the contract (intercity has
+ *                  no shipment date) → booking OPERATION_REQUEST_PENDING
+ *   9. backoffice — operations accepts the operation request → booking
+ *                  FULLY_EXECUTED (intercity waiting pool)
+ *  10. backoffice — operations creates the EXPORT route
+ *                  Mojo → Dire Dawa → Djibouti Port (distances seeded)
+ *  11. backoffice — operations schedules the export train (built Train-Builder
+ *                  train seeded by seed-intercity.sql)
+ *  12. backoffice — operations accepts the intercity booking onto the train
+ *                  (Workspace → Intercity ride-along) → SELECTED_FOR_BATCH with
+ *                  a pay deadline that never outlives the export window close
+ *  13. staff mark-paid (API — the batch panel has no mounted UI button)
+ *                  → PAID + SCHEDULED + linked to the schedule
+ *
+ * Sequential steps of one journey — retries off (steps are not idempotent).
+ */
+
+const customer = "user@gmail.com";
+const companyTin = "0102030405"; // seed-company.sql
+const opsStaff = "operation@edr.local";
+
+const ORIGIN_YARD = "Mojo Dry Port";
+const DEST_YARD = "Dire Dawa Yard";
+const PORT_YARD = "Djibouti Port Terminal";
+const TRAIN_CODE = "TRN-E2E-1";
+
+const apiUrl = () => Cypress.env("apiUrl") as string;
+
+/** Latest contract of the seeded company — the journey's contract. */
+function dbContract() {
+  return cy.task<{ rows: Array<{ id: string; reference: string; status: string }> }>(
+    "db:query",
+    {
+      sql: `SELECT ct.id, ct.reference, ct.status
+            FROM freight.contracts ct
+            JOIN freight.companies c ON c.id = ct.company_id
+            WHERE c.tin = $1 AND ct.trade_direction = 'DOMESTIC'
+            ORDER BY ct.created_at DESC LIMIT 1`,
+      params: [companyTin],
+    },
+  );
+}
+
+function withContract(fn: (c: { id: string; reference: string; status: string }) => void) {
+  dbContract().then(({ rows }) => {
+    expect(rows, "latest contract for the seeded company").to.have.length(1);
+    fn(rows[0]);
+  });
+}
+
+function expectContractStatus(expected: string) {
+  dbContract().then(({ rows }) => {
+    expect(rows[0]?.status, "contract status").to.eq(expected);
+  });
+}
+
+/** Latest DOMESTIC booking of the seeded company — the journey's booking. */
+function dbBooking() {
+  return cy.task<{
+    rows: Array<{
+      id: string;
+      reference: string;
+      status: string;
+      scheduling_status: string;
+      train_schedule_id: string | null;
+      payment_deadline: string | null;
+      scheduled_date: string | null;
+    }>;
+  }>("db:query", {
+    sql: `SELECT b.id, b.reference, b.status, b.scheduling_status,
+                 b.train_schedule_id, b.payment_deadline, b.scheduled_date
+          FROM freight.bookings b
+          JOIN freight.companies c ON c.id = b.company_id
+          WHERE c.tin = $1 AND b.trade_direction = 'DOMESTIC'
+          ORDER BY b.created_at DESC LIMIT 1`,
+    params: [companyTin],
+  });
+}
+
+function withBooking(
+  fn: (b: {
+    id: string;
+    reference: string;
+    status: string;
+    scheduling_status: string;
+    train_schedule_id: string | null;
+    payment_deadline: string | null;
+    scheduled_date: string | null;
+  }) => void,
+) {
+  dbBooking().then(({ rows }) => {
+    expect(rows, "intercity booking for the seeded company").to.have.length(1);
+    fn(rows[0]);
+  });
+}
+
+/** Latest export schedule created by this journey. */
+function dbSchedule() {
+  return cy.task<{
+    rows: Array<{ id: string; status: string; direction: string; window_closes_at: string }>;
+  }>("db:query", {
+    sql: `SELECT ts.id, ts.status, ts.direction, ts.window_closes_at
+          FROM freight.train_schedules ts
+          ORDER BY ts.created_at DESC LIMIT 1`,
+  });
+}
+
+/** Fill a labelled Mantine input (label[for] → input id). */
+function fill(label: string | RegExp, value: string) {
+  cy.contains("label", label)
+    .invoke("attr", "for")
+    .then((id) => {
+      cy.get(`[id="${id}"]`).clear({ force: true }).type(value, { force: true });
+    });
+}
+
+/**
+ * Run the portal wizard for an INTERCITY / One-Time / Container contract and
+ * submit it. Reused for the initial (to-be-rejected) and the second contract.
+ */
+function createIntercityContract() {
+  cy.loginPortal(customer);
+  cy.visitPortal("/contracts/new");
+
+  // Step 0 — Setup. Intercity forces ETB and hides the customs section.
+  cy.mantineSelect(/^Operation Type/, /^Intercity$/);
+  cy.mantineSelect(/^Contract Kind/, "One-Time Contract");
+  cy.mantineSelect(/^New or Renewal/, "New Contract");
+  cy.contains("button", "Rail Transport Only", { timeout: 15000 }).click();
+  cy.mantineSelect(/^Payment Currency/, /^ETB/);
+  cy.contains("button", "Continue").click({ force: true });
+
+  // Step 1 — Cargo & Route (Ethiopian yards only for intercity).
+  cy.mantineSelect(/^Cargo Scope/, /Containerized/);
+  cy.get('[role="checkbox"][aria-label="20ft Container"]').click();
+  cy.get('textarea[placeholder*="Electronics"]').type(
+    "E2E intercity electronics between Ethiopian yards",
+  );
+  cy.mantineSelect(/^Origin Yard/, ORIGIN_YARD);
+  cy.mantineSelect(/^Destination Yard/, DEST_YARD);
+  cy.contains("button", "Continue").click({ force: true });
+
+  // Step 2 — Review & Submit → quotation modal.
+  cy.contains("button", "Submit").click({ force: true });
+  cy.contains("Approve your quotation", { timeout: 30000 }).should("be.visible");
+  cy.contains("button", "Approve & submit").click();
+
+  cy.location("pathname", { timeout: 20000 }).should("eq", "/contracts");
+
+  dbContract().then(({ rows }) => {
+    expect(rows, "contract row").to.have.length(1);
+    expect(rows[0].status).to.eq("SUBMITTED");
+    expect(rows[0].reference).to.match(/^CTR-/);
+  });
+}
+
+describe("intercity one-time journey: contract → booking → export train", { retries: 0 }, () => {
+  before(() => {
+    // Container types, locomotives, built train, yard distances — the
+    // infrastructure the UI journey cannot create in-flow.
+    cy.task("db:seedFile", "seed-intercity.sql");
+  });
+
+  // ── Contract: submit → reject → resubmit → approve → sign ────────────────
+
+  it("customer submits an intercity one-time contract", () => {
+    createIntercityContract();
+  });
+
+  it("marketer rejects the submission with a reason", () => {
+    cy.loginBackoffice("marketer@edr.local");
+    withContract((c) => cy.visit(`/dashboard/contract-requests/${c.id}`));
+
+    cy.contains("button", "Reject contract", { timeout: 20000 }).click();
+    cy.get(".mantine-Modal-content")
+      .contains("label", "Reason for rejection")
+      .invoke("attr", "for")
+      .then((id) => {
+        cy.get(`[id="${id}"]`).type("E2E rejection — cargo details incomplete");
+      });
+    cy.get(".mantine-Modal-content").contains("button", /^Reject$/).click();
+
+    // Modal closes on success; the status pill can sit inside clipped layout,
+    // so the authoritative check is the DB row.
+    cy.get(".mantine-Modal-content", { timeout: 20000 }).should("not.exist");
+    expectContractStatus("REJECTED");
+  });
+
+  it("customer sees the rejection reason on the contracts list", () => {
+    cy.loginPortal(customer);
+    cy.visitPortal("/contracts");
+
+    // The list is a collapsed table — expand the rejected contract's row to
+    // reveal its step banner with the staff reason.
+    withContract((c) => {
+      cy.contains("tr", c.reference, { timeout: 20000 })
+        .find("button")
+        .first()
+        .click();
+    });
+    cy.contains("This contract was rejected.", { timeout: 20000 }).should("be.visible");
+    cy.contains("Reason: E2E rejection — cargo details incomplete").should("be.visible");
+  });
+
+  it("customer submits a fresh intercity contract", () => {
+    createIntercityContract();
+  });
+
+  it("marketer accepts the submission and approves the LINE_STAFF step", () => {
+    cy.loginBackoffice("marketer@edr.local");
+    withContract((c) => cy.visit(`/dashboard/contract-requests/${c.id}`));
+
+    cy.contains("button", "Accept for approval", { timeout: 20000 }).click();
+    cy.contains("button", "Accept & start approval", { timeout: 20000 })
+      .should("not.be.disabled")
+      .click();
+
+    cy.contains("Approval chain", { timeout: 20000 }).should("be.visible");
+    cy.contains("button", "Approve", { timeout: 20000 }).click();
+    cy.contains("button", "Confirm approval").click();
+    cy.contains("1/2", { timeout: 20000 }).should("be.visible");
+
+    expectContractStatus("PENDING_APPROVAL");
+  });
+
+  it("director approves the final step — contract PDF becomes ready", () => {
+    cy.loginBackoffice("director@edr.local");
+    withContract((c) => cy.visit(`/dashboard/contract-requests/${c.id}`));
+
+    cy.contains("button", "Approve", { timeout: 20000 }).click();
+    cy.contains("button", "Confirm approval").click();
+
+    cy.contains("button", "View & sign", { timeout: 30000 }).should("exist");
+    expectContractStatus("CONTRACT_READY");
+  });
+
+  it("customer signs the contract with OTP", () => {
+    cy.loginPortal(customer);
+    withContract((c) => cy.visitPortal(`/contracts/${c.id}/view`));
+
+    // Scroll the contract iframe to the bottom so the consent bar unlocks.
+    const unlockConsent = (attempt: number) => {
+      cy.get('iframe[title="Contract document"]', { timeout: 30000 }).then(($f) => {
+        const win = ($f[0] as HTMLIFrameElement).contentWindow;
+        const el = win?.document?.scrollingElement ?? win?.document?.documentElement;
+        if (win && el) {
+          el.scrollTop = el.scrollHeight;
+          win.dispatchEvent(new Event("scroll"));
+        }
+      });
+      cy.wait(500).then(() => {
+        cy.get("body").then(($b) => {
+          if ($b.text().includes("I have read the entire contract")) return;
+          expect(attempt, "consent bar unlocked").to.be.lessThan(20);
+          unlockConsent(attempt + 1);
+        });
+      });
+    };
+    unlockConsent(0);
+
+    cy.contains("I have read the entire contract", { timeout: 15000 }).click();
+    cy.contains("button", /^Sign contract$|^Approve & sign$/).click();
+
+    cy.contains("label", "Full name")
+      .invoke("attr", "for")
+      .then((id) => {
+        cy.get(`[id="${id}"]`).clear().type("Demo User");
+      });
+    cy.drawSignature();
+    cy.contains("button", "Continue to verification").click();
+
+    cy.contains("Verify it's you", { timeout: 20000 }).should("be.visible");
+    cy.getOtp(customer).then((otp) => cy.typeOtp(otp));
+    cy.contains("button", "Verify & sign").click();
+
+    cy.contains("Your signature has been recorded", { timeout: 30000 }).should("be.visible");
+    expectContractStatus("SIGNED_CUSTOMER");
+  });
+
+  it("marketer counter-signs — intercity one-time enters the documents step", () => {
+    cy.loginBackoffice("marketer@edr.local");
+    withContract((c) => cy.visit(`/dashboard/contract-requests/${c.id}/view`));
+
+    cy.contains("button", /^Sign as staff$|^Approve & sign$/, { timeout: 30000 }).click();
+    cy.contains("label", "Full name")
+      .invoke("attr", "for")
+      .then((id) => {
+        cy.get(`[id="${id}"]`).clear().type("EDR Marketer");
+      });
+    cy.drawSignature();
+    cy.get(".mantine-Modal-content")
+      .contains("button", /^Confirm signature$|^Approve & sign$/)
+      .click();
+
+    cy.contains("counter-signed", { timeout: 30000 }).should("be.visible");
+
+    // DOMESTIC one-time always routes through the intercity-documents step —
+    // unlike GENERAL, it does NOT go straight to CONTRACT_ACTIVE.
+    expectContractStatus("AWAITING_CLEARANCE_DOCUMENTS");
+  });
+
+  it("customer uploads the required intercity document", () => {
+    cy.loginPortal(customer);
+    // Deep link auto-opens the clearance documents modal.
+    withContract((c) => cy.visitPortal(`/contracts/${c.id}?action=clearance`));
+
+    cy.contains("Cargo Manifest", { timeout: 30000 }).should("exist");
+    cy.get('.mantine-Modal-content input[type="file"]')
+      .first()
+      .selectFile("cypress/fixtures/docs/license.pdf", { force: true });
+    cy.contains("button", "Submit documents", { timeout: 15000 })
+      .should("not.be.disabled")
+      .click();
+
+    // Upload hands the contract to Operations review — the card flips to
+    // "Under review" (the host modal may linger while queries refetch).
+    cy.contains("Under review", { timeout: 30000 }).should("exist");
+    expectContractStatus("CLEARANCE_UNDER_REVIEW");
+  });
+
+  it("operations approves the document and finalizes — contract fully executed", () => {
+    cy.loginBackoffice(opsStaff);
+    withContract((c) => cy.visit(`/dashboard/contract-requests/${c.id}`));
+
+    // The clearance review section lives behind its own tab on the detail page.
+    cy.contains('[role="tab"]', "Clearance Review", { timeout: 30000 }).click();
+
+    // Approve the uploaded Cargo Manifest, then finalize.
+    cy.contains("button", /Approve all/, { timeout: 30000 }).click();
+    cy.contains("1/1 approved", { timeout: 30000 }).should("exist");
+
+    cy.contains("button", "Finalize document approval", { timeout: 30000 })
+      .should("not.be.disabled")
+      .click();
+
+    cy.contains("finalized", { timeout: 30000 }).should("be.visible");
+    expectContractStatus("FULLY_EXECUTED");
+  });
+
+  // ── Booking under the contract ────────────────────────────────────────────
+
+  it("customer books 2 × 20ft under the contract (no shipment date for intercity)", () => {
+    cy.loginPortal(customer);
+    withContract((c) => cy.visitPortal(`/contracts/${c.id}/bookings/new`));
+
+    cy.contains("New Shipment Booking", { timeout: 20000 }).should("be.visible");
+
+    // 20ft quantities must be even (pairs share a wagon).
+    fill(/^Quantity/, "2");
+
+    // One ISO container number per unit.
+    cy.get('input[placeholder*="MSCU"]', { timeout: 15000 }).should("have.length", 2);
+    cy.get('input[placeholder*="MSCU"]').eq(0).type("MSCU1234567");
+    cy.get('input[placeholder*="MSCU"]').eq(1).type("TCLU7654321");
+
+    // VGM per unit — column inputs carry a placeholder, not a linked label.
+    cy.get('input[placeholder*="24.5"]').each(($input) => {
+      cy.wrap($input).clear({ force: true }).type("10", { force: true });
+    });
+
+    // Intercity: no "Shipment day" picker — the ride-along note renders instead.
+    cy.contains("Shipment day").should("not.exist");
+
+    cy.contains("button", "Review price & book").should("not.be.disabled").click();
+    cy.contains("Confirm shipment price", { timeout: 30000 }).should("be.visible");
+    cy.contains("button", "Confirm & book").click();
+
+    cy.location("pathname", { timeout: 30000 }).should("match", /^\/bookings\/.+/);
+
+    withBooking((b) => {
+      expect(b.status).to.eq("OPERATION_REQUEST_PENDING");
+      expect(b.scheduled_date, "intercity bookings carry no scheduled date").to.eq(null);
+    });
+  });
+
+  it("operations accepts the operation request — booking joins the intercity pool", () => {
+    cy.loginBackoffice(opsStaff);
+    withBooking((b) => cy.visit(`/dashboard/booking-requests/${b.id}`));
+
+    cy.contains("button", /Accept operation|^Accept$/, { timeout: 20000 }).click();
+    cy.contains("Accept operation request?", { timeout: 15000 }).should("be.visible");
+    cy.get(".mantine-Modal-content").contains("button", /^Accept$/).click();
+
+    withBooking((b) => {
+      expect(b.status, "accepted intercity booking waits in the pool").to.eq("FULLY_EXECUTED");
+      expect(b.train_schedule_id).to.eq(null);
+    });
+  });
+
+  // ── Route + export schedule ───────────────────────────────────────────────
+
+  it("operations creates the export route Mojo → Dire Dawa → Djibouti Port", () => {
+    cy.loginBackoffice(opsStaff);
+
+    // Skip creation when a previous run already added the route (unique yards
+    // pair) — the journey stays re-runnable against a warm DB.
+    cy.task<{ rows: Array<{ n: string }> }>("db:query", {
+      sql: `SELECT count(*) AS n
+            FROM freight.routes r
+            JOIN freight.yards o ON o.id = r.origin_yard_id AND o.code = 'MOJO'
+            JOIN freight.yards d ON d.id = r.destination_yard_id AND d.code = 'DJIB_PORT'
+            WHERE r.deleted_at IS NULL`,
+    }).then(({ rows }) => {
+      if (Number(rows[0].n) > 0) return;
+
+      cy.visit("/dashboard/routes");
+      cy.contains("button", "Add route", { timeout: 20000 }).click();
+      cy.contains("Add Route", { timeout: 15000 }).should("be.visible");
+
+      // Third stop row, then fill Origin / Milestone / Destination in order.
+      cy.get(".mantine-Modal-content").contains("button", "Add milestone").click();
+      const pickYard = (index: number, yard: string) => {
+        cy.get('.mantine-Modal-content input[placeholder="Select yard"]')
+          .eq(index)
+          .click({ force: true });
+        // Three yard selects share option texts — only the open dropdown counts.
+        cy.get('[role="option"]:visible').contains(yard).click();
+      };
+      pickYard(0, ORIGIN_YARD);
+      pickYard(1, DEST_YARD);
+      pickYard(2, PORT_YARD);
+
+      // Distances (when the build has them) resolve from the seeded rows.
+      cy.get(".mantine-Modal-content").contains("button", "Save").click();
+    });
+
+    cy.task<{ rows: Array<{ direction: string }> }>("db:query", {
+      sql: `SELECT r.direction
+            FROM freight.routes r
+            JOIN freight.yards o ON o.id = r.origin_yard_id AND o.code = 'MOJO'
+            JOIN freight.yards d ON d.id = r.destination_yard_id AND d.code = 'DJIB_PORT'
+            WHERE r.deleted_at IS NULL`,
+    }).then(({ rows }) => {
+      expect(rows, "export route").to.have.length.at.least(1);
+      expect(rows[0].direction).to.eq("EXPORT");
+    });
+  });
+
+  it("operations schedules the export train from the built consist", () => {
+    cy.loginBackoffice(opsStaff);
+
+    // One departure per route per day — a warm DB from a previous run already
+    // has this train scheduled, so only create when none is live.
+    cy.task<{ rows: Array<{ n: string }> }>("db:query", {
+      sql: `SELECT count(*) AS n
+            FROM freight.train_schedules ts
+            JOIN freight.routes r ON r.id = ts.route_id
+            JOIN freight.yards o ON o.id = r.origin_yard_id AND o.code = 'MOJO'
+            WHERE ts.status IN ('DRAFT', 'SCHEDULED') AND ts.deleted_at IS NULL`,
+    }).then(({ rows }) => {
+      if (Number(rows[0].n) > 0) return;
+
+      cy.visit("/dashboard/operations/train-scheduling-v2");
+      cy.contains("button", "New schedule", { timeout: 20000 }).click();
+      cy.contains("Create train schedule", { timeout: 15000 }).should("be.visible");
+
+      cy.mantineSelect(/^Route$/, new RegExp(ORIGIN_YARD));
+
+      // Two days out, local datetime-local format.
+      const departure = new Date(Date.now() + 2 * 86400000);
+      const local = new Date(departure.getTime() - departure.getTimezoneOffset() * 60000)
+        .toISOString()
+        .slice(0, 16);
+      cy.get('.mantine-Modal-content input[type="datetime-local"]')
+        .clear({ force: true })
+        .type(local, { force: true });
+
+      cy.mantineSelect(/^Train$/, new RegExp(TRAIN_CODE));
+      cy.get(".mantine-Modal-content").contains("button", "Create").click();
+
+      // Create navigates straight to the new schedule's detail page.
+      cy.location("pathname", { timeout: 30000 }).should(
+        "match",
+        /\/dashboard\/operations\/train-scheduling-v2\/.+/,
+      );
+    });
+
+    dbSchedule().then(({ rows }) => {
+      expect(rows, "created schedule").to.have.length(1);
+      expect(rows[0].direction).to.eq("EXPORT");
+    });
+  });
+
+  // ── Intercity ride-along: accept → pay → allocated ────────────────────────
+
+  it("operations accepts the intercity booking onto the export train", () => {
+    cy.loginBackoffice(opsStaff);
+    dbSchedule().then(({ rows: schedules }) => {
+      cy.visit(`/dashboard/operations/train-scheduling-v2/${schedules[0].id}`);
+    });
+
+    cy.contains('[role="tab"]', "Workspace", { timeout: 30000 }).click();
+    // Presence, not viewport visibility — the panel can sit below the fold /
+    // inside clipped layout once earlier runs' rows stack up.
+    cy.contains("Intercity ride-along", { timeout: 30000 }).should("exist");
+
+    withBooking((b) => {
+      cy.contains("tr", b.reference, { timeout: 30000 })
+        .find('input[type="checkbox"]')
+        .check({ force: true });
+      cy.contains("button", /Accept .*onto this train/).click();
+
+      // Accepted table shows the pay-window state (inside a horizontal
+      // Table.ScrollContainer — assert presence, not viewport visibility).
+      cy.contains("Awaiting payment", { timeout: 30000 }).should("exist");
+    });
+
+    // Export parity: the ride-along's pay deadline never outlives the export
+    // booking window (reserve() clamps it to window_closes_at).
+    dbSchedule().then(({ rows: schedules }) => {
+      withBooking((b) => {
+        expect(b.status).to.eq("SELECTED_FOR_BATCH");
+        expect(b.train_schedule_id).to.eq(schedules[0].id);
+        expect(b.payment_deadline, "pay deadline set").to.be.a("string");
+        expect(new Date(b.payment_deadline!).getTime()).to.be.at.most(
+          new Date(schedules[0].window_closes_at).getTime(),
+        );
+      });
+    });
+  });
+
+  it("staff mark the ride-along paid — booking allocates onto the train", () => {
+    // ScheduleBatchPanel (the only "Mark paid" button) is not mounted in the
+    // current UI, so drive the staff override endpoint directly.
+    withBooking((b) => {
+      cy.apiLogin(opsStaff).then(({ token }) => {
+        cy.request({
+          method: "POST",
+          url: `${apiUrl()}/api/train-scheduling/bookings/${b.id}/mark-paid`,
+          headers: { Authorization: `Bearer ${token}` },
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+    });
+
+    withBooking((b) => {
+      expect(b.status).to.eq("PAID");
+      expect(b.scheduling_status).to.eq("SCHEDULED");
+      expect(b.train_schedule_id, "still pinned to the export train").to.be.a("string");
+
+      // The schedule↔booking link row is what makes the booking visible on the
+      // train board, in yard work, and to the wagon planner.
+      cy.task<{ rows: Array<{ n: string }> }>("db:query", {
+        sql: `SELECT count(*) AS n FROM freight.train_schedule_bookings
+              WHERE booking_id = $1 AND deleted_at IS NULL`,
+        params: [b.id],
+      }).then(({ rows }) => {
+        expect(Number(rows[0].n), "train_schedule_bookings link").to.eq(1);
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/mixed_export_close_intercity.cy.ts b/e2e/freight/cypress/e2e/flows/mixed_export_close_intercity.cy.ts
new file mode 100644
index 000000000..95fbf57df
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/mixed_export_close_intercity.cy.ts
@@ -0,0 +1,253 @@
+/**
+ * MIXED EXPORT journeys XM4 + XM5 — mixed window close, and a FULL mixed
+ * train carrying a DOUBLE intercity ride-along:
+ *
+ *   XM4 (D+17): five mixed reservations (2 container + 3 bulk = 54w), only
+ *   one container + one bulk pay. The window CLOSE passes → phase DONE, the
+ *   three unpaid (both kinds) expire in ONE sweep, export never reopens.
+ *
+ *   XM5 (D+18): through container 40w + sub-corridor bulk (DIRE_DAWA → port)
+ *   14w commit the border edges → directional FULL. Then a container AND a
+ *   bulk intercity ride-along (KALITY → MOJO, dateless) are accepted onto the
+ *   FULL train's free home leg in ONE staff action — pay windows clamped to
+ *   the EXPORT close, both pay, both linked; the export window stays FULL.
+ *
+ * Sequential steps — retries off.
+ */
+
+import {
+  forceReservationExpiry,
+  acceptExport,
+  acceptOperation,
+  apiPost,
+  bookBulk,
+  bookContainers,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  ensureExportRoute,
+  EXP_DEST,
+  EXP_ORIGIN,
+  expectWagonType,
+  forceWindowOpen,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withExportSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const CLOSE_DEPARTURE = departureAt(17);
+const CLOSE_DAY = eatDayStr(CLOSE_DEPARTURE);
+const FULL_DEPARTURE = departureAt(18);
+const FULL_DAY = eatDayStr(FULL_DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+/** 2 container + 3 bulk = 54 wagons; only QMC1 + QMB1 pay. */
+const CLOSERS: Array<{
+  suffix: string;
+  freight: "CONTAINER" | "BULK";
+  twenty?: number;
+  tons?: number;
+  wagons: number;
+  pays: boolean;
+}> = [
+  { suffix: "QMC1", freight: "CONTAINER", twenty: 24, wagons: 12, pays: true },
+  { suffix: "QMB1", freight: "BULK", tons: 840, wagons: 12, pays: true },
+  { suffix: "QMC2", freight: "CONTAINER", twenty: 24, wagons: 12, pays: false },
+  { suffix: "QMB2", freight: "BULK", tons: 840, wagons: 12, pays: false },
+  { suffix: "QMB3", freight: "BULK", tons: 420, wagons: 6, pays: false },
+];
+
+describe("mixed export: mixed close sweep + FULL train with double intercity", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    CLOSERS.forEach((c) =>
+      seedImportContract({
+        suffix: c.suffix,
+        reference: stampedRef(c.suffix),
+        freight: c.freight,
+        direction: "EXPORT",
+        originCode: EXP_ORIGIN,
+        destCode: EXP_DEST,
+      }),
+    );
+    seedImportContract({
+      suffix: "FMTH",
+      reference: stampedRef("FMTH"),
+      direction: "EXPORT",
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    seedImportContract({
+      suffix: "FMSB",
+      reference: stampedRef("FMSB"),
+      freight: "BULK",
+      direction: "EXPORT",
+      originCode: "DIRE_DAWA",
+      destCode: EXP_DEST,
+    });
+    seedImportContract({
+      suffix: "MEIC",
+      reference: stampedRef("MEIC"),
+      direction: "DOMESTIC",
+      originCode: EXP_ORIGIN,
+      destCode: "MOJO",
+    });
+    seedImportContract({
+      suffix: "MEIB",
+      reference: stampedRef("MEIB"),
+      freight: "BULK",
+      direction: "DOMESTIC",
+      originCode: EXP_ORIGIN,
+      destCode: "MOJO",
+    });
+  });
+
+  it("mixed close day: five mixed reservations, one container + one bulk pay", () => {
+    ensureExportRoute();
+    resetCorridorDay(CLOSE_DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    resetCorridorDay(FULL_DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    createImportSchedule({
+      departure: CLOSE_DEPARTURE,
+      locoPair: ["LOCO-EXP-11", "LOCO-EXP-12"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(CLOSE_DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+
+    let isoSeed = 15_000;
+    CLOSERS.forEach((c) => {
+      if (c.freight === "CONTAINER") {
+        bookContainers({
+          suffix: c.suffix,
+          runStamp: stamp,
+          isoSeed,
+          twenty: c.twenty,
+          scheduledDate: CLOSE_DAY,
+        });
+        isoSeed += c.twenty ?? 0;
+      } else {
+        bookBulk({ suffix: c.suffix, tons: c.tons!, scheduledDate: CLOSE_DAY });
+      }
+      acceptExport(c.suffix);
+    });
+    CLOSERS.filter((c) => c.pays).forEach((c) => {
+      markPaid(c.suffix);
+      pollAllocations(c.suffix, c.wagons);
+      expectWagonType(c.suffix, c.freight === "CONTAINER" ? "NW5" : "CW4", c.wagons);
+    });
+  });
+
+  it("the window CLOSES — the three unpaid of BOTH kinds expire in one sweep, no reopen", () => {
+    withExportSchedule(CLOSE_DEPARTURE, (s) => {
+      db(
+        `UPDATE freight.train_schedules
+         SET window_closes_at = now() - interval '1 second'
+         WHERE id = $1 AND window_phase = 'OPEN'`,
+        [s.id],
+      );
+      pollDb<ScheduleRow>(
+        "export window DONE (no reopen)",
+        `SELECT window_phase, booking_cycle_no FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.window_phase === "DONE" && Number(row?.booking_cycle_no) === 1,
+      );
+    });
+    // Forced close ⇒ force the matching deadline clamp on the unpaid trio.
+    CLOSERS.filter((c) => !c.pays).forEach((c) => forceReservationExpiry(c.suffix));
+    CLOSERS.filter((c) => !c.pays).forEach((c) => pollBookingStatus(c.suffix, "EXPIRED"));
+    CLOSERS.filter((c) => c.pays).forEach((c) =>
+      withBooking(c.suffix, (b) => expect(b.status, `${c.suffix} rides`).to.eq("PAID")),
+    );
+  });
+
+  it("FULL-train day: through container 40w + sub-corridor bulk 14w flip the window FULL", () => {
+    createImportSchedule({
+      departure: FULL_DEPARTURE,
+      locoPair: ["LOCO-EXP-1", "LOCO-EXP-2"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(FULL_DEPARTURE, (s) => forceWindowOpen(s.id, 90));
+
+    bookContainers({
+      suffix: "FMTH",
+      runStamp: stamp,
+      isoSeed: 15_500,
+      twenty: 80, // 40 wagons, full corridor
+      scheduledDate: FULL_DAY,
+    });
+    acceptExport("FMTH");
+    bookBulk({ suffix: "FMSB", tons: 980, scheduledDate: FULL_DAY });
+    acceptExport("FMSB");
+
+    markPaid("FMTH");
+    pollAllocations("FMTH", 40);
+    expectWagonType("FMTH", "NW5", 40);
+    markPaid("FMSB");
+    pollAllocations("FMSB", 14);
+    expectWagonType("FMSB", "CW4", 14);
+
+    withExportSchedule(FULL_DEPARTURE, (s) => {
+      pollDb<ScheduleRow>(
+        "directional FULL",
+        `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL",
+      );
+    });
+  });
+
+  it("a container AND a bulk intercity ride-along join the FULL train in ONE accept — clamped, paid, linked", () => {
+    bookContainers({ suffix: "MEIC", runStamp: stamp, isoSeed: 15_700, twenty: 4 });
+    acceptOperation("MEIC");
+    bookBulk({ suffix: "MEIB", tons: 140 });
+    acceptOperation("MEIB");
+
+    withExportSchedule(FULL_DEPARTURE, (s) => {
+      withBooking("MEIC", (bc) => {
+        withBooking("MEIB", (bb) => {
+          apiPost(opsStaff, `/api/train-scheduling/schedules/${s.id}/intercity/accept`, {
+            bookingIds: [bc.id, bb.id],
+          })
+            .its("status")
+            .should("be.oneOf", [200, 201]);
+        });
+      });
+    });
+    ["MEIC", "MEIB"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    withExportSchedule(FULL_DEPARTURE, (s) => {
+      ["MEIC", "MEIB"].forEach((suffix) =>
+        withBooking(suffix, (b) => {
+          // Export parity: ride-along pay windows never outlive the close.
+          expect(new Date(b.payment_deadline!).getTime()).to.be.at.most(
+            new Date(s.window_closes_at!).getTime(),
+          );
+        }),
+      );
+    });
+    markPaid("MEIC");
+    markPaid("MEIB");
+    withExportSchedule(FULL_DEPARTURE, (s) => {
+      ["MEIC", "MEIB"].forEach((suffix) =>
+        withBooking(suffix, (b) => {
+          expect(b.train_schedule_id, `${suffix} linked`).to.eq(s.id);
+        }),
+      );
+      expect(s.booking_window_status, "export window stays FULL").to.eq("FULL");
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/mixed_export_fcfs.cy.ts b/e2e/freight/cypress/e2e/flows/mixed_export_fcfs.cy.ts
new file mode 100644
index 000000000..04907b685
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/mixed_export_fcfs.cy.ts
@@ -0,0 +1,203 @@
+/**
+ * MIXED EXPORT journeys XM2 + XM3 — one FCFS ledger for two cargo kinds:
+ *
+ *   XM2 (D+15): container 20w, bulk 14w, container 20w accept in order — 54
+ *   wagons held before any payment. A late bulk (700 T) AND a late container
+ *   (10w) both bounce off the SAME space gate. The three reserved pay →
+ *   typed allocation, FULL. One shared reservation account, no per-type quota.
+ *
+ *   XM3 (D+16): cross-type pay-or-lose. Container 20w pays, bulk 14w pays,
+ *   a second container 20w never pays → expires at its clamped deadline →
+ *   a BULK 1 400 T booking takes the container's freed slots (slots are
+ *   type-blind, wagons stay typed: the wheat lands on CW4). The train is
+ *   FULL again — a 1-wagon container afterthought bounces.
+ *
+ * Sequential steps — retries off.
+ */
+
+import {
+  acceptExport,
+  bookBulk,
+  bookContainers,
+  createImportSchedule,
+  departureAt,
+  eatDayStr,
+  ensureExportRoute,
+  EXP_DEST,
+  EXP_ORIGIN,
+  expectWagonType,
+  forceReservationExpiry,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withExportSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(15);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+const PAYLOSE_DEPARTURE = departureAt(16);
+const PAYLOSE_DAY = eatDayStr(PAYLOSE_DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+function seedMixedExport(suffix: string, freight: "CONTAINER" | "BULK") {
+  seedImportContract({
+    suffix,
+    reference: stampedRef(suffix),
+    freight,
+    direction: "EXPORT",
+    originCode: EXP_ORIGIN,
+    destCode: EXP_DEST,
+  });
+}
+
+describe("mixed export FCFS: one shared ledger, cross-type pay-or-lose", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    seedMixedExport("FMC1", "CONTAINER");
+    seedMixedExport("FMB1", "BULK");
+    seedMixedExport("FMC2", "CONTAINER");
+    seedMixedExport("FML1", "BULK"); // late bulk
+    seedMixedExport("FML2", "CONTAINER"); // late container
+    seedMixedExport("PLC1", "CONTAINER");
+    seedMixedExport("PLB1", "BULK");
+    seedMixedExport("PLC2", "CONTAINER");
+    seedMixedExport("PLB2", "BULK"); // takes PLC2's freed slots
+    seedMixedExport("PLS", "CONTAINER"); // afterthought
+  });
+
+  it("operations prepares the export corridor and the D+15 train with an open window", () => {
+    ensureExportRoute();
+    resetCorridorDay(DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    resetCorridorDay(PAYLOSE_DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-EXP-7", "LOCO-EXP-8"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+  });
+
+  it("container, bulk, container accept in order — 54 wagons held before any payment", () => {
+    bookContainers({
+      suffix: "FMC1",
+      runStamp: stamp,
+      isoSeed: 14_000,
+      twenty: 40,
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptExport("FMC1");
+    bookBulk({ suffix: "FMB1", tons: 980, scheduledDate: BOOKING_DAY });
+    acceptExport("FMB1");
+    bookContainers({
+      suffix: "FMC2",
+      runStamp: stamp,
+      isoSeed: 14_100,
+      twenty: 40,
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptExport("FMC2");
+  });
+
+  it("a late bulk AND a late container bounce off the same space gate", () => {
+    bookBulk({
+      suffix: "FML1",
+      tons: 700,
+      scheduledDate: BOOKING_DAY,
+      expectFailure: /space|window/i,
+    });
+    bookContainers({
+      suffix: "FML2",
+      runStamp: stamp,
+      isoSeed: 14_200,
+      twenty: 20,
+      scheduledDate: BOOKING_DAY,
+      expectFailure: /space|window/i,
+    });
+  });
+
+  it("the three reserved pay — typed allocation 54/54, window FULL", () => {
+    markPaid("FMC1");
+    pollAllocations("FMC1", 20);
+    expectWagonType("FMC1", "NW5", 20);
+    markPaid("FMB1");
+    pollAllocations("FMB1", 14);
+    expectWagonType("FMB1", "CW4", 14);
+    markPaid("FMC2");
+    pollAllocations("FMC2", 20);
+    expectWagonType("FMC2", "NW5", 20);
+
+    withExportSchedule(DEPARTURE, (s) => {
+      pollDb<ScheduleRow>(
+        "export window FULL",
+        `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL",
+      );
+    });
+  });
+
+  it("pay-or-lose day: container pays, bulk pays, the second container reserves unpaid", () => {
+    createImportSchedule({
+      departure: PAYLOSE_DEPARTURE,
+      locoPair: ["LOCO-EXP-9", "LOCO-EXP-10"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withExportSchedule(PAYLOSE_DEPARTURE, (s) => forceWindowOpen(s.id, 60));
+
+    bookContainers({
+      suffix: "PLC1",
+      runStamp: stamp,
+      isoSeed: 14_400,
+      twenty: 40,
+      scheduledDate: PAYLOSE_DAY,
+    });
+    acceptExport("PLC1");
+    markPaid("PLC1");
+    pollAllocations("PLC1", 20);
+
+    bookBulk({ suffix: "PLB1", tons: 980, scheduledDate: PAYLOSE_DAY });
+    acceptExport("PLB1");
+    markPaid("PLB1");
+    pollAllocations("PLB1", 14);
+
+    bookContainers({
+      suffix: "PLC2",
+      runStamp: stamp,
+      isoSeed: 14_500,
+      twenty: 40,
+      scheduledDate: PAYLOSE_DAY,
+    });
+    acceptExport("PLC2");
+  });
+
+  it("the unpaid container expires — a BULK booking takes its freed slots (typed wagons)", () => {
+    forceReservationExpiry("PLC2");
+    bookBulk({ suffix: "PLB2", tons: 1400, scheduledDate: PAYLOSE_DAY });
+    acceptExport("PLB2");
+    markPaid("PLB2");
+    pollAllocations("PLB2", 20);
+    // Slots are type-blind; the physical wagons are not — wheat rides CW4.
+    expectWagonType("PLB2", "CW4", 20);
+  });
+
+  it("the train is FULL again — a 1-wagon container afterthought bounces", () => {
+    bookContainers({
+      suffix: "PLS",
+      runStamp: stamp,
+      isoSeed: 14_600,
+      twenty: 2,
+      scheduledDate: PAYLOSE_DAY,
+      expectFailure: /space|window/i,
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/mixed_export_full_train.cy.ts b/e2e/freight/cypress/e2e/flows/mixed_export_full_train.cy.ts
new file mode 100644
index 000000000..df458fc65
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/mixed_export_full_train.cy.ts
@@ -0,0 +1,257 @@
+/**
+ * MIXED EXPORT journey XM1 — containers AND wheat share ONE 54-wagon export
+ * train (KALITY → … → DJIB_PORT) inside ONE FCFS window: every accept
+ * reserves instantly with a close-clamped pay deadline; allocation is typed
+ * (NW5 under boxes, CW4 under wheat); then the full journey to Djibouti Port
+ * and both export customs tails.
+ *
+ * The six bookings (Σ = 54 wagons):
+ *   XMC1 container customs + USD  16×20ft =  8 × NW5
+ *   XMB1 bulk      customs + USD    560 T =  8 × CW4
+ *   XMC2 container self    + ETB   6×40ft =  6 × NW5
+ *   XMB2 bulk      self    + ETB    980 T = 14 × CW4
+ *   XMC3 container customs + ETB  16×20ft =  8 × NW5
+ *   XMB3 bulk      self    + USD    700 T = 10 × CW4
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  acceptExport,
+  apiPost,
+  bookBulk,
+  bookContainers,
+  completeBookingMilestone,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  ensureExportRoute,
+  EXP_DEST,
+  EXP_ORIGIN,
+  expectMilestoneDone,
+  expectWagonType,
+  forceWindowOpen,
+  glUpload,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withExportSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(14);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const BOOKINGS: Array<{
+  suffix: string;
+  freight: "CONTAINER" | "BULK";
+  customs: boolean;
+  currency: "ETB" | "USD";
+  twenty?: number;
+  forty?: number;
+  tons?: number;
+  wagons: number;
+}> = [
+  { suffix: "XMC1", freight: "CONTAINER", customs: true, currency: "USD", twenty: 16, wagons: 8 },
+  { suffix: "XMB1", freight: "BULK", customs: true, currency: "USD", tons: 560, wagons: 8 },
+  { suffix: "XMC2", freight: "CONTAINER", customs: false, currency: "ETB", forty: 6, wagons: 6 },
+  { suffix: "XMB2", freight: "BULK", customs: false, currency: "ETB", tons: 980, wagons: 14 },
+  { suffix: "XMC3", freight: "CONTAINER", customs: true, currency: "ETB", twenty: 16, wagons: 8 },
+  { suffix: "XMB3", freight: "BULK", customs: false, currency: "USD", tons: 700, wagons: 10 },
+];
+const CUSTOMS = BOOKINGS.filter((b) => b.customs).map((b) => b.suffix);
+const SELF_CLEAR = BOOKINGS.filter((b) => !b.customs).map((b) => b.suffix);
+
+function withScheduleId(fn: (id: string, s: ScheduleRow) => void) {
+  withExportSchedule(DEPARTURE, (s) => fn(s.id, s));
+}
+
+describe("mixed export: containers and wheat share one 54-wagon FCFS train", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    for (const b of BOOKINGS) {
+      seedImportContract({
+        suffix: b.suffix,
+        reference: stampedRef(b.suffix),
+        currency: b.currency,
+        customs: b.customs,
+        freight: b.freight,
+        direction: "EXPORT",
+        originCode: EXP_ORIGIN,
+        destCode: EXP_DEST,
+      });
+    }
+  });
+
+  it("operations prepares the export corridor and one 54-wagon train — window forced open", () => {
+    ensureExportRoute();
+    resetCorridorDay(DEPARTURE, EXP_DEST, EXP_ORIGIN);
+    createImportSchedule({
+      departure: DEPARTURE,
+      locoPair: ["LOCO-EXP-5", "LOCO-EXP-6"],
+      originCode: EXP_ORIGIN,
+      destCode: EXP_DEST,
+    });
+    withScheduleId((id) => forceWindowOpen(id, 60));
+  });
+
+  it("three container and three bulk exporters book inside the one window", () => {
+    let isoSeed = 13_000;
+    BOOKINGS.forEach((b) => {
+      if (b.freight === "CONTAINER") {
+        bookContainers({
+          suffix: b.suffix,
+          runStamp: stamp,
+          isoSeed,
+          twenty: b.twenty,
+          forty: b.forty,
+          scheduledDate: BOOKING_DAY,
+        });
+        isoSeed += (b.twenty ?? 0) + (b.forty ?? 0);
+      } else {
+        bookBulk({ suffix: b.suffix, tons: b.tons!, scheduledDate: BOOKING_DAY });
+      }
+      pollBookingStatus(b.suffix, "OPERATION_REQUEST_PENDING", 5);
+    });
+  });
+
+  it("each accept reserves FCFS instantly — both kinds share one clamped ledger", () => {
+    BOOKINGS.forEach((b) => acceptExport(b.suffix));
+    withScheduleId((_, s) => {
+      BOOKINGS.forEach((b) => {
+        withBooking(b.suffix, (row) => {
+          expect(
+            new Date(row.payment_deadline!).getTime(),
+            `${b.suffix} deadline never outlives the window close`,
+          ).to.be.at.most(new Date(s.window_closes_at!).getTime());
+        });
+      });
+    });
+    BOOKINGS.forEach((b) => {
+      withBooking(b.suffix, (row) => {
+        pollDb<{ currency: string }>(
+          `${b.suffix} invoice`,
+          `SELECT currency FROM freight.invoices
+           WHERE source_id = $1 AND deleted_at IS NULL
+           ORDER BY created_at DESC LIMIT 1`,
+          [row.id],
+          (inv) => inv?.currency === b.currency,
+          10,
+        );
+      });
+    });
+  });
+
+  it("all six pay — 54/54 STRICTLY typed (boxes on NW5, wheat on CW4), FULL, finalized", () => {
+    BOOKINGS.forEach((b) => {
+      markPaid(b.suffix);
+      pollAllocations(b.suffix, b.wagons);
+    });
+    BOOKINGS.forEach((b) =>
+      expectWagonType(b.suffix, b.freight === "CONTAINER" ? "NW5" : "CW4", b.wagons),
+    );
+    withScheduleId((id) => {
+      pollDb<ScheduleRow>(
+        "export window FULL",
+        `SELECT booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.booking_window_status === "FULL",
+      );
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/finalize`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule SCHEDULED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "SCHEDULED",
+        10,
+      );
+    });
+  });
+
+  it("transport documents uploaded for customs bookings of BOTH kinds; the train runs to Djibouti", () => {
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/import-djibouti/gatepass-granted`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        glUpload(`/api/contracts/bookings/${b.id}/transport-document`);
+      });
+    });
+
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/dispatch`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule DISPATCHED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "DISPATCHED",
+        10,
+      );
+      [1, 2, 3, 4].forEach((seq) => {
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+          sequenceNo: seq,
+          kind: "PASSED",
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+        sequenceNo: 5,
+        kind: "ARRIVED",
+      })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule ARRIVED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "ARRIVED",
+        20,
+      );
+    });
+    BOOKINGS.forEach((b) => pollBookingStatus(b.suffix, "ARRIVED", 20));
+  });
+
+  it("container AND bulk export tails close side by side (T1 close → offloaded)", () => {
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        apiPost("superadmin@tria.com", `/api/contracts/bookings/${b.id}/t1-close`)
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+      completeBookingMilestone(suffix, "OFFLOADED");
+      expectMilestoneDone(suffix, "T1_CLOSED");
+      expectMilestoneDone(suffix, "OFFLOADED");
+    });
+    SELF_CLEAR.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        expect(b.status, `${suffix} arrived clean`).to.eq("ARRIVED");
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/mixed_import_full_train.cy.ts b/e2e/freight/cypress/e2e/flows/mixed_import_full_train.cy.ts
new file mode 100644
index 000000000..e1b779109
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/mixed_import_full_train.cy.ts
@@ -0,0 +1,266 @@
+/**
+ * MIXED IMPORT journey M1 — containers AND bulk wheat share ONE 54-wagon
+ * import train on the corridor DJIB_PORT → … → KALITY. The route-day pool is
+ * type-blind: one window, one doc-review, ONE batch reserves all six; only
+ * wagon allocation cares about the physical type — containers ride NW5 flat
+ * wagons, wheat rides CW4 covered gondolas, never crossed.
+ *
+ * The six bookings (Σ = 54 wagons):
+ *   MC1  container  customs + USD   16×20ft =  8 × NW5
+ *   MB1  bulk       customs + USD     560 T =  8 × CW4
+ *   MC2  container  self    + ETB    6×40ft =  6 × NW5
+ *   MB2  bulk       self    + ETB     980 T = 14 × CW4
+ *   MC3  container  customs + ETB   16×20ft =  8 × NW5
+ *   MB3  bulk       self    + USD     700 T = 10 × CW4
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  acceptOperation,
+  apiPost,
+  bookBulk,
+  bookContainers,
+  closeBookingWindow,
+  completeBookingMilestone,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  expectMilestoneDone,
+  expectWagonType,
+  forceWindowOpen,
+  glUpload,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(18);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const BOOKINGS: Array<{
+  suffix: string;
+  freight: "CONTAINER" | "BULK";
+  customs: boolean;
+  currency: "ETB" | "USD";
+  twenty?: number;
+  forty?: number;
+  tons?: number;
+  wagons: number;
+}> = [
+  { suffix: "MC1", freight: "CONTAINER", customs: true, currency: "USD", twenty: 16, wagons: 8 },
+  { suffix: "MB1", freight: "BULK", customs: true, currency: "USD", tons: 560, wagons: 8 },
+  { suffix: "MC2", freight: "CONTAINER", customs: false, currency: "ETB", forty: 6, wagons: 6 },
+  { suffix: "MB2", freight: "BULK", customs: false, currency: "ETB", tons: 980, wagons: 14 },
+  { suffix: "MC3", freight: "CONTAINER", customs: true, currency: "ETB", twenty: 16, wagons: 8 },
+  { suffix: "MB3", freight: "BULK", customs: false, currency: "USD", tons: 700, wagons: 10 },
+];
+const CUSTOMS = BOOKINGS.filter((b) => b.customs).map((b) => b.suffix);
+const SELF_CLEAR = BOOKINGS.filter((b) => !b.customs).map((b) => b.suffix);
+
+function withScheduleId(fn: (id: string, s: ScheduleRow) => void) {
+  withSchedule(DEPARTURE, (s) => fn(s.id, s));
+}
+
+describe("mixed import: containers and wheat share one 54-wagon train", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    for (const b of BOOKINGS) {
+      seedImportContract({
+        suffix: b.suffix,
+        reference: stampedRef(b.suffix),
+        currency: b.currency,
+        customs: b.customs,
+        freight: b.freight,
+      });
+    }
+  });
+
+  it("operations prepares the corridor and one 54-wagon train — first window forced open", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-1", "LOCO-IMP-2"] });
+    withScheduleId((id) => forceWindowOpen(id, 45));
+  });
+
+  it("three container and three bulk shipments book inside the same first window", () => {
+    let isoSeed = 9000;
+    BOOKINGS.forEach((b) => {
+      if (b.freight === "CONTAINER") {
+        bookContainers({
+          suffix: b.suffix,
+          runStamp: stamp,
+          isoSeed,
+          twenty: b.twenty,
+          forty: b.forty,
+          scheduledDate: BOOKING_DAY,
+        });
+        isoSeed += (b.twenty ?? 0) + (b.forty ?? 0);
+      } else {
+        bookBulk({ suffix: b.suffix, tons: b.tons!, scheduledDate: BOOKING_DAY });
+      }
+      pollBookingStatus(b.suffix, "OPERATION_REQUEST_PENDING", 5);
+    });
+  });
+
+  it("operations accepts all six — one type-blind pool", () => {
+    BOOKINGS.forEach((b) => acceptOperation(b.suffix));
+  });
+
+  it("ONE doc-review-complete releases ONE batch that reserves both cargo kinds together", () => {
+    withScheduleId((id) => {
+      closeBookingWindow(id);
+      completeDocReview(id);
+    });
+    BOOKINGS.forEach((b) =>
+      pollBookingStatus(b.suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    // Currency mix from one batch: USD and ETB invoices side by side.
+    BOOKINGS.forEach((b) => {
+      withBooking(b.suffix, (row) => {
+        pollDb<{ currency: string }>(
+          `${b.suffix} invoice`,
+          `SELECT currency FROM freight.invoices
+           WHERE source_id = $1 AND deleted_at IS NULL
+           ORDER BY created_at DESC LIMIT 1`,
+          [row.id],
+          (inv) => inv?.currency === b.currency,
+          10,
+        );
+      });
+    });
+  });
+
+  it("all six pay — 54/54 with STRICT wagon-type integrity (containers on NW5, wheat on CW4)", () => {
+    BOOKINGS.forEach((b) => {
+      markPaid(b.suffix);
+      pollAllocations(b.suffix, b.wagons);
+    });
+    BOOKINGS.forEach((b) =>
+      expectWagonType(b.suffix, b.freight === "CONTAINER" ? "NW5" : "CW4", b.wagons),
+    );
+    withScheduleId((id) => {
+      endPaymentPhase(id);
+      pollDb<ScheduleRow>(
+        "schedule FULL + DONE + finalized",
+        `SELECT window_phase, booking_window_status, status
+         FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) =>
+          s?.booking_window_status === "FULL" &&
+          s?.window_phase === "DONE" &&
+          s?.status === "SCHEDULED",
+      );
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+    });
+  });
+
+  it("gate pass + T1 uploads for the customs bookings of BOTH kinds", () => {
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/import-djibouti/gatepass-granted`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        glUpload(`/api/contracts/bookings/${b.id}/t1-documents`);
+      });
+    });
+  });
+
+  it("the mixed train dispatches, runs the corridor and arrives — both kinds ARRIVED", () => {
+    withScheduleId((id) => {
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/dispatch`)
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule DISPATCHED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "DISPATCHED",
+        10,
+      );
+      [1, 2, 3, 4].forEach((seq) => {
+        apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+          sequenceNo: seq,
+          kind: "PASSED",
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+      });
+      apiPost(opsStaff, `/api/train-scheduling/schedules/${id}/checkpoints`, {
+        sequenceNo: 5,
+        kind: "ARRIVED",
+      })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+      pollDb<ScheduleRow>(
+        "schedule ARRIVED",
+        `SELECT status FROM freight.train_schedules WHERE id = $1`,
+        [id],
+        (s) => s?.status === "ARRIVED",
+        20,
+      );
+    });
+    BOOKINGS.forEach((b) => pollBookingStatus(b.suffix, "ARRIVED", 20));
+    withScheduleId((id) => {
+      db<{ n: string }>(
+        `SELECT count(*) AS n FROM freight.wagon_movements WHERE train_schedule_id = $1`,
+        [id],
+      ).then(({ rows }) =>
+        expect(Number(rows[0].n), "wagon movement ledger rows").to.be.at.least(54),
+      );
+    });
+  });
+
+  it("the customs tails of container AND bulk bookings complete side by side", () => {
+    CUSTOMS.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        apiPost("superadmin@tria.com", `/api/contracts/bookings/${b.id}/t1-close`)
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+        apiPost("superadmin@tria.com", `/api/contracts/bookings/${b.id}/risk`, {
+          riskLevel: "GREEN",
+        })
+          .its("status")
+          .should("be.oneOf", [200, 201]);
+        glUpload(
+          `/api/contracts/bookings/${b.id}/second-duty`,
+          { dutyRequired: "false" },
+          "attachment",
+        );
+      });
+      completeBookingMilestone(suffix, "IMPORT_RELEASE_GRANTED");
+      expectMilestoneDone(suffix, "T1_CLOSED");
+      expectMilestoneDone(suffix, "IMPORT_RELEASE_GRANTED");
+    });
+    SELF_CLEAR.forEach((suffix) => {
+      withBooking(suffix, (b) => {
+        expect(b.status, `${suffix} arrived clean`).to.eq("ARRIVED");
+      });
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/mixed_import_reopen_matrix.cy.ts b/e2e/freight/cypress/e2e/flows/mixed_import_reopen_matrix.cy.ts
new file mode 100644
index 000000000..9be4636c3
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/mixed_import_reopen_matrix.cy.ts
@@ -0,0 +1,215 @@
+/**
+ * MIXED IMPORT journey M4 + matrix — dead mixed cycle, mixed recovery, and
+ * mixed ride-alongs on one train (D+21):
+ *
+ *   1. cycle 1: one container (20w) and one bulk (1 400 T) reserved, neither
+ *      pays → both expire, the window REOPENS (mixed cycle bookkeeping)
+ *   2. cycle 2: a fresh container (10w) AND a fresh bulk (730 T → ceil = 11
+ *      wagons, the rounding case) book, pay, allocate typed on the recovered
+ *      train
+ *   3. mixed intercity: a container ride-along AND a bulk ride-along
+ *      (KALITY-bound legs are free) join the same import train — accepted,
+ *      paid, linked
+ *   4. mixed sub-corridor: a bulk NAGAD→MOJO booking rides the through-train
+ *      beside the cycle-2 pair
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  acceptOperation,
+  apiPost,
+  bookBulk,
+  bookContainers,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  expectWagonType,
+  forceReservationExpiry,
+  forceWindowOpen,
+  markPaid,
+  opsStaff,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(21);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+describe("mixed import: dead mixed cycle, mixed recovery, mixed ride-alongs", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    seedImportContract({ suffix: "MRC", reference: stampedRef("MRC") });
+    seedImportContract({ suffix: "MRB", reference: stampedRef("MRB"), freight: "BULK" });
+    seedImportContract({ suffix: "MRC2", reference: stampedRef("MRC2") });
+    seedImportContract({ suffix: "MRB2", reference: stampedRef("MRB2"), freight: "BULK" });
+    seedImportContract({
+      suffix: "MRSUB",
+      reference: stampedRef("MRSUB"),
+      freight: "BULK",
+      originCode: "NAGAD",
+      destCode: "MOJO",
+    });
+    seedImportContract({
+      suffix: "MRIC",
+      reference: stampedRef("MRIC"),
+      direction: "DOMESTIC",
+      originCode: "MOJO",
+      destCode: "KALITY",
+    });
+    seedImportContract({
+      suffix: "MRIB",
+      reference: stampedRef("MRIB"),
+      freight: "BULK",
+      direction: "DOMESTIC",
+      originCode: "MOJO",
+      destCode: "KALITY",
+    });
+  });
+
+  it("operations prepares the corridor train — first window opens (cycle 1)", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-9", "LOCO-IMP-10"] });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+    withSchedule(DEPARTURE, (s) => expect(s.booking_cycle_no, "cycle 1").to.eq(1));
+  });
+
+  it("cycle 1: one container and one bulk reserved — neither pays, both expire, window reopens", () => {
+    bookContainers({
+      suffix: "MRC",
+      runStamp: stamp,
+      isoSeed: 12_000,
+      twenty: 40,
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptOperation("MRC");
+    bookBulk({ suffix: "MRB", tons: 1400, scheduledDate: BOOKING_DAY });
+    acceptOperation("MRB");
+
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    ["MRC", "MRB"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    ["MRC", "MRB"].forEach((suffix) => forceReservationExpiry(suffix));
+    withSchedule(DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      // Same-tick guard-loop can chain PRE_WINDOW straight into OPEN when the
+      // reopen instant falls inside office hours — assert it left PAYMENT
+      // without concluding FULL/DONE, whichever phase it lands on.
+      pollDb<ScheduleRow>(
+        "window concludes not-full (PRE_WINDOW or fast-forwarded to OPEN)",
+        `SELECT window_phase FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => !!row && row.window_phase !== "PAYMENT" && row.window_phase !== "DONE",
+      );
+    });
+  });
+
+  it("cycle 2: a fresh container (10w) and a fresh bulk (730 T → 11 wagons) pay and allocate typed", () => {
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+    withSchedule(DEPARTURE, (s) => expect(s.booking_cycle_no, "cycle 2").to.eq(2));
+
+    bookContainers({
+      suffix: "MRC2",
+      runStamp: stamp,
+      isoSeed: 12_200,
+      twenty: 20,
+      scheduledDate: BOOKING_DAY,
+    });
+    acceptOperation("MRC2");
+    // ceil(730 / 70) = 11 — the bulk rounding case rides beside containers.
+    bookBulk({ suffix: "MRB2", tons: 730, scheduledDate: BOOKING_DAY });
+    acceptOperation("MRB2");
+    // Mixed sub-corridor: bulk boards NAGAD, alights MOJO, same train.
+    bookBulk({ suffix: "MRSUB", tons: 700, scheduledDate: BOOKING_DAY });
+    acceptOperation("MRSUB");
+
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    ["MRC2", "MRB2", "MRSUB"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    markPaid("MRC2");
+    pollAllocations("MRC2", 10);
+    expectWagonType("MRC2", "NW5", 10);
+    markPaid("MRB2");
+    pollAllocations("MRB2", 11);
+    expectWagonType("MRB2", "CW4", 11);
+    markPaid("MRSUB");
+    pollAllocations("MRSUB", 10);
+    expectWagonType("MRSUB", "CW4", 10);
+
+    ["MRC", "MRB"].forEach((suffix) =>
+      withBooking(suffix, (b) => expect(b.status, `${suffix} stays expired`).to.eq("EXPIRED")),
+    );
+    withSchedule(DEPARTURE, (s) => {
+      ["MRC2", "MRB2", "MRSUB"].forEach((suffix) =>
+        withBooking(suffix, (b) =>
+          expect(b.train_schedule_id, `${suffix} rides the recovered train`).to.eq(s.id),
+        ),
+      );
+    });
+  });
+
+  it("mixed intercity: a container AND a bulk ride-along join the same import train", () => {
+    bookContainers({ suffix: "MRIC", runStamp: stamp, isoSeed: 12_400, twenty: 4 });
+    acceptOperation("MRIC");
+    bookBulk({ suffix: "MRIB", tons: 140 });
+    acceptOperation("MRIB");
+
+    withSchedule(DEPARTURE, (s) => {
+      withBooking("MRIC", (bc) => {
+        withBooking("MRIB", (bb) => {
+          apiPost(opsStaff, `/api/train-scheduling/schedules/${s.id}/intercity/accept`, {
+            bookingIds: [bc.id, bb.id],
+          })
+            .its("status")
+            .should("be.oneOf", [200, 201]);
+        });
+      });
+    });
+    ["MRIC", "MRIB"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    markPaid("MRIC");
+    markPaid("MRIB");
+    withSchedule(DEPARTURE, (s) => {
+      ["MRIC", "MRIB"].forEach((suffix) =>
+        withBooking(suffix, (b) => {
+          expect(b.train_schedule_id, `${suffix} linked`).to.eq(s.id);
+          // The link row is written by the async allocate step — poll it.
+          pollDb<{ n: string }>(
+            `${suffix} link row`,
+            `SELECT count(*) AS n FROM freight.train_schedule_bookings
+             WHERE booking_id = $1 AND train_schedule_id = $2 AND deleted_at IS NULL`,
+            [b.id, s.id],
+            (row) => Number(row?.n ?? 0) === 1,
+            15,
+          );
+        }),
+      );
+    });
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/mixed_import_split_promote.cy.ts b/e2e/freight/cypress/e2e/flows/mixed_import_split_promote.cy.ts
new file mode 100644
index 000000000..46f27d9a1
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/mixed_import_split_promote.cy.ts
@@ -0,0 +1,216 @@
+/**
+ * MIXED IMPORT journey M3 — a container split and a CROSS-TYPE promotion:
+ * container-freed wagons hand the train to the waiting bulk queue.
+ *
+ * Queue reality: containers order by staff priority, bulk is rule-recomputed
+ * and orders by acceptance. Fill (54 slots):
+ *   MSC container 40×20ft = 20w (prio 1) — pays
+ *   MSD container 40×20ft = 20w (prio 2) — reserved, never pays
+ *   MSX container 48×20ft = 24w (prio 3) — only 14 left → PARTIAL offer 14w;
+ *       settles via the real payment pipeline → split applies (28 boxes ride,
+ *       20×20ft outstanding)
+ *   bulk queue (acceptance order): MSB 840 T = 12w, MSW2 560 T = 8w,
+ *       MSW3 700 T = 10w — no room at fill, ALL wait.
+ *   MSD expires → its 20 container wagons promote the BULK queue: MSB (12w)
+ *   and MSW2 (8w) get pay windows; both pay → CW4 gondolas under the wheat →
+ *   54/54 = 20 NW5 + 14 NW5 + 12 CW4 + 8 CW4. MSW3 expires with the day, and
+ *   the split customer must later rebook EXACTLY the 20×20ft remainder.
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  acceptOperation,
+  bookBulk,
+  bookContainers,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  db,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  expectWagonType,
+  forceReservationExpiry,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  setPriority,
+  settleViaGateway,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(20);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+const REMAINDER_DEPARTURE = departureAt(22);
+const REMAINDER_DAY = eatDayStr(REMAINDER_DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const CONTAINERS = [
+  { suffix: "MSC", twenty: 40, wagons: 20 },
+  { suffix: "MSD", twenty: 40, wagons: 20 },
+  { suffix: "MSX", twenty: 48, wagons: 24 },
+];
+const BULKS = [
+  { suffix: "MSB", tons: 840, wagons: 12 },
+  { suffix: "MSW2", tons: 560, wagons: 8 },
+  { suffix: "MSW3", tons: 700, wagons: 10 },
+];
+
+describe("mixed import: container split; container-freed wagons promote the bulk queue", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    CONTAINERS.forEach((b) =>
+      seedImportContract({ suffix: b.suffix, reference: stampedRef(b.suffix) }),
+    );
+    BULKS.forEach((b) =>
+      seedImportContract({ suffix: b.suffix, reference: stampedRef(b.suffix), freight: "BULK" }),
+    );
+  });
+
+  it("operations prepares the corridor train with an open first window", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    resetCorridorDay(REMAINDER_DEPARTURE);
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-5", "LOCO-IMP-6"] });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+  });
+
+  it("six mixed shipments book in the first window; accepted in queue order", () => {
+    let isoSeed = 10_000;
+    CONTAINERS.forEach((b) => {
+      bookContainers({
+        suffix: b.suffix,
+        runStamp: stamp,
+        isoSeed,
+        twenty: b.twenty,
+        scheduledDate: BOOKING_DAY,
+      });
+      isoSeed += b.twenty;
+      acceptOperation(b.suffix);
+    });
+    BULKS.forEach((b) => {
+      bookBulk({ suffix: b.suffix, tons: b.tons, scheduledDate: BOOKING_DAY });
+      acceptOperation(b.suffix);
+    });
+    CONTAINERS.forEach((b, i) => setPriority(b.suffix, i + 1));
+  });
+
+  it("the batch reserves the containers (MSX gets a 14w PARTIAL); the bulk queue waits whole", () => {
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    CONTAINERS.forEach((b) =>
+      pollBookingStatus(b.suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    withBooking("MSX", (b) => {
+      pollDb<{ status: string }>(
+        "MSX open partial offer",
+        `SELECT status FROM freight.booking_batch_offers
+         WHERE booking_id = $1 AND deleted_at IS NULL
+         ORDER BY created_at DESC LIMIT 1`,
+        [b.id],
+        (row) => row?.status === "OFFERED",
+        10,
+      );
+    });
+    BULKS.forEach((b) =>
+      withBooking(b.suffix, (row) => {
+        expect(row.status, `${b.suffix} waiting`).to.eq("FULLY_EXECUTED");
+      }),
+    );
+  });
+
+  it("MSC pays; MSX settles via the gateway — the split applies (14 × NW5, 28 boxes ride)", () => {
+    markPaid("MSC");
+    pollAllocations("MSC", 20);
+    expectWagonType("MSC", "NW5", 20);
+
+    settleViaGateway("MSX");
+    pollAllocations("MSX", 14);
+    expectWagonType("MSX", "NW5", 14);
+    withBooking("MSX", (b) => {
+      expect(b.is_split, "MSX is split").to.eq(true);
+      db<{ q: string }>(
+        `SELECT sum(quantity) AS q FROM freight.booking_container
+         WHERE booking_id = $1 AND deleted_at IS NULL`,
+        [b.id],
+      ).then(({ rows }) => expect(Number(rows[0].q), "MSX shrank to 28 boxes").to.eq(28));
+    });
+  });
+
+  it("the unpaid container expires — its wagons promote the BULK queue (MSB + MSW2 get pay windows)", () => {
+    forceReservationExpiry("MSD");
+    ["MSB", "MSW2"].forEach((suffix) =>
+      pollBookingStatus(suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    withBooking("MSW3", (b) => {
+      expect(b.status, "the 10w bulk still has no seat").to.eq("FULLY_EXECUTED");
+    });
+  });
+
+  it("both promoted bulks pay — 54/54 typed (NW5 under boxes, CW4 under wheat); MSW3 expires", () => {
+    markPaid("MSB");
+    pollAllocations("MSB", 12);
+    expectWagonType("MSB", "CW4", 12);
+    markPaid("MSW2");
+    pollAllocations("MSW2", 8);
+    expectWagonType("MSW2", "CW4", 8);
+
+    withSchedule(DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      pollDb<ScheduleRow>(
+        "window FULL + DONE",
+        `SELECT window_phase, booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL" && row?.window_phase === "DONE",
+      );
+      db<{ n: string }>(
+        `SELECT count(DISTINCT wba.train_set_wagon_id) AS n
+         FROM freight.wagon_booking_allocations wba
+         JOIN freight.train_schedule_bookings tsb
+           ON tsb.booking_id = wba.booking_id AND tsb.train_schedule_id = $1
+         WHERE wba.deleted_at IS NULL AND tsb.deleted_at IS NULL`,
+        [s.id],
+      ).then(({ rows }) => expect(Number(rows[0].n), "54 wagons allocated").to.eq(54));
+    });
+    pollBookingStatus("MSW3", "EXPIRED");
+  });
+
+  it("the split container customer must rebook EXACTLY the 20×20ft remainder", () => {
+    createImportSchedule({
+      departure: REMAINDER_DEPARTURE,
+      locoPair: ["LOCO-IMP-7", "LOCO-IMP-8"],
+    });
+    withSchedule(REMAINDER_DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+
+    bookContainers({
+      suffix: "MSX",
+      runStamp: stamp,
+      isoSeed: 11_000,
+      twenty: 8,
+      scheduledDate: REMAINDER_DAY,
+      expectFailure: "must take the whole remainder",
+    });
+    bookContainers({
+      suffix: "MSX",
+      runStamp: stamp,
+      isoSeed: 11_100,
+      twenty: 20,
+      scheduledDate: REMAINDER_DAY,
+    });
+    pollBookingStatus("MSX", "OPERATION_REQUEST_PENDING", 5);
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/mixed_import_waiting_expiry.cy.ts b/e2e/freight/cypress/e2e/flows/mixed_import_waiting_expiry.cy.ts
new file mode 100644
index 000000000..ebbcbf00f
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/mixed_import_waiting_expiry.cy.ts
@@ -0,0 +1,149 @@
+/**
+ * MIXED IMPORT journey M2 — one queue, two cargo kinds. Engine ordering rule
+ * under test: CONTAINER bookings keep their staff-set priority scores, BULK
+ * priorities are RECOMPUTED from the rule engine at batch time and then order
+ * among themselves by acceptance — so the queue is containers-by-priority
+ * first, bulk-by-acceptance after. The train fills across both kinds
+ * (20w + 20w containers + the first-accepted 14w bulk = 54); the remaining
+ * bulk trio waits with no pay window and expires when the day concludes FULL.
+ *
+ * Sequential steps of one journey — retries off.
+ */
+
+import {
+  acceptOperation,
+  bookBulk,
+  bookContainers,
+  closeBookingWindow,
+  completeDocReview,
+  createImportSchedule,
+  departureAt,
+  eatDayStr,
+  endPaymentPhase,
+  ensureCorridorRoute,
+  expectWagonType,
+  forceWindowOpen,
+  markPaid,
+  pollAllocations,
+  pollBookingStatus,
+  pollDb,
+  resetCorridorDay,
+  seedImportContract,
+  setPriority,
+  withBooking,
+  withSchedule,
+  type ScheduleRow,
+} from "./import-utils";
+
+const DEPARTURE = departureAt(19);
+const BOOKING_DAY = eatDayStr(DEPARTURE);
+
+const stamp = String(Date.now());
+const stampedRef = (suffix: string) => `CTR-IMP-${stamp}-${suffix}`;
+
+const SELECTED: Array<{
+  suffix: string;
+  freight: "CONTAINER" | "BULK";
+  twenty?: number;
+  tons?: number;
+  wagons: number;
+}> = [
+  { suffix: "MWC1", freight: "CONTAINER", twenty: 40, wagons: 20 },
+  { suffix: "MWC2", freight: "CONTAINER", twenty: 40, wagons: 20 },
+  { suffix: "MWB1", freight: "BULK", tons: 980, wagons: 14 },
+];
+const WAITING = [
+  { suffix: "MWB2", tons: 700 },
+  { suffix: "MWB3", tons: 700 },
+  { suffix: "MWB4", tons: 700 },
+];
+
+describe("mixed import: containers + first bulk fill the train, bulk trio waits and expires", { retries: 0 }, () => {
+  before(() => {
+    cy.task("db:seedFile", "seed-import-corridor.sql");
+    SELECTED.forEach((b) =>
+      seedImportContract({ suffix: b.suffix, reference: stampedRef(b.suffix), freight: b.freight }),
+    );
+    WAITING.forEach((b) =>
+      seedImportContract({ suffix: b.suffix, reference: stampedRef(b.suffix), freight: "BULK" }),
+    );
+  });
+
+  it("operations prepares the corridor train with an open first window", () => {
+    ensureCorridorRoute();
+    resetCorridorDay(DEPARTURE);
+    createImportSchedule({ departure: DEPARTURE, locoPair: ["LOCO-IMP-3", "LOCO-IMP-4"] });
+    withSchedule(DEPARTURE, (s) => forceWindowOpen(s.id, 45));
+  });
+
+  it("six mixed shipments book; operations accepts — MWB1 is the FIRST-accepted bulk", () => {
+    let isoSeed = 9500;
+    // Containers first (manual priority), then bulk in acceptance order —
+    // MWB1 accepted before the waiters so the recomputed-bulk tie-break
+    // (fully_executed_at ASC) puts it at the head of the bulk queue.
+    SELECTED.forEach((b) => {
+      if (b.freight === "CONTAINER") {
+        bookContainers({
+          suffix: b.suffix,
+          runStamp: stamp,
+          isoSeed,
+          twenty: b.twenty,
+          scheduledDate: BOOKING_DAY,
+        });
+        isoSeed += b.twenty ?? 0;
+      } else {
+        bookBulk({ suffix: b.suffix, tons: b.tons!, scheduledDate: BOOKING_DAY });
+      }
+      acceptOperation(b.suffix);
+    });
+    WAITING.forEach((b) => {
+      bookBulk({ suffix: b.suffix, tons: b.tons, scheduledDate: BOOKING_DAY });
+      acceptOperation(b.suffix);
+    });
+    // Manual priority holds for CONTAINER bookings only (bulk is recomputed).
+    setPriority("MWC1", 1);
+    setPriority("MWC2", 2);
+  });
+
+  it("the batch fills 54 across both kinds; the bulk trio keeps waiting with no pay window", () => {
+    withSchedule(DEPARTURE, (s) => {
+      closeBookingWindow(s.id);
+      completeDocReview(s.id);
+    });
+    SELECTED.forEach((b) =>
+      pollBookingStatus(b.suffix, ["SELECTED_FOR_BATCH", "AWAITING_PAYMENT"]),
+    );
+    WAITING.forEach((b) =>
+      withBooking(b.suffix, (row) => {
+        expect(row.status, `${b.suffix} still waiting`).to.eq("FULLY_EXECUTED");
+        expect(row.payment_deadline, `${b.suffix} has no pay deadline`).to.be.null;
+      }),
+    );
+  });
+
+  it("the three selected pay — typed allocation 54/54", () => {
+    SELECTED.forEach((b) => {
+      markPaid(b.suffix);
+      pollAllocations(b.suffix, b.wagons);
+      expectWagonType(b.suffix, b.freight === "CONTAINER" ? "NW5" : "CW4", b.wagons);
+    });
+  });
+
+  it("the day concludes FULL — the waiting bulk trio expires in ONE sweep", () => {
+    withSchedule(DEPARTURE, (s) => {
+      endPaymentPhase(s.id);
+      pollDb<ScheduleRow>(
+        "window FULL + DONE",
+        `SELECT window_phase, booking_window_status FROM freight.train_schedules WHERE id = $1`,
+        [s.id],
+        (row) => row?.booking_window_status === "FULL" && row?.window_phase === "DONE",
+      );
+    });
+    WAITING.forEach((b) => pollBookingStatus(b.suffix, "EXPIRED"));
+    SELECTED.forEach((b) =>
+      withBooking(b.suffix, (row) => expect(row.status, `${b.suffix} stays PAID`).to.eq("PAID")),
+    );
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/onboarding.cy.ts b/e2e/freight/cypress/e2e/flows/onboarding.cy.ts
new file mode 100644
index 000000000..ed6df900b
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/onboarding.cy.ts
@@ -0,0 +1,203 @@
+/**
+ * Full customer onboarding journey, both apps:
+ *
+ *   1. portal    — /signup form → OTP (read from DB, delivery is off in e2e)
+ *                  → account created → onboarding wizard (nationality/role →
+ *                  company → personnel → contact → PoA → documents incl. the
+ *                  per-role business license) → "Submit for review"
+ *   2. backoffice — staff (chief, holds edr_freight_app:admin) approves the
+ *                  importer profile on /dashboard/customers/:id
+ *   3. portal    — the new customer is active: contract wizard reachable
+ *
+ * Tests are sequential steps of ONE journey (fresh unique user per run), so
+ * retries are disabled — a mid-journey retry would replay a non-idempotent
+ * step against already-advanced state.
+ *
+ * NOTE: switching origin between tests (portal 5373 ↔ backoffice 5383)
+ * reloads the spec bundle and resets module state — later tests resolve the
+ * journey's user/company from the DB instead of module variables.
+ */
+
+const stamp = Date.now();
+const email = `e2e.onboard.${stamp}@example.com`;
+// Ethiopian mobile: 9 + 8 digits, unique per run.
+const phoneNational = `9${String(stamp).slice(-8)}`;
+const signupPassword = "Password@e2e1";
+const companyName = `E2E Onboard Co ${stamp}`;
+const tin = String(stamp).slice(-10).padStart(10, "1");
+const vat = String(stamp + 1).slice(-10).padStart(10, "2");
+const fan = String(stamp).slice(-13).padStart(16, "3");
+
+const portal = () => Cypress.env("portalUrl") as string;
+
+/** The journey's company/user = the latest e2e.onboard.* signup in the DB. */
+function latestOnboardJourney() {
+  return cy.task<{ rows: Array<{ name: string; email: string }> }>("db:query", {
+    sql: `SELECT c.name, u.email
+          FROM freight.companies c
+          JOIN freight.external_profiles ep ON ep.company_id = c.id
+          JOIN iam.users u ON u.id = ep.user_id
+          WHERE u.email LIKE 'e2e.onboard.%'
+          ORDER BY c.created_at DESC LIMIT 1`,
+  });
+}
+
+/** Fill a labelled Mantine input (label[for] → input id). */
+function fill(label: string | RegExp, value: string) {
+  cy.contains("label", label)
+    .invoke("attr", "for")
+    .then((id) => {
+      cy.get(`[id="${id}"]`).clear({ force: true }).type(value, { force: true });
+    });
+}
+
+/** The wizard's phone inputs (react-phone-number-input, type=tel). */
+function fillPhone(index: number, national: string) {
+  cy.get('.mantine-Modal-content input[type="tel"]')
+    .eq(index)
+    .clear({ force: true })
+    .type(national, { force: true });
+}
+
+describe("customer onboarding journey", { retries: 0 }, () => {
+  it("signs up with OTP and completes the onboarding wizard", () => {
+    // The eTrade TIN lookup 400s in e2e (external service unreachable). The
+    // form handles it ("fill in the details manually") but axios also throws
+    // an uncaught rejection — ignore just that one.
+    cy.on("uncaught:exception", (err) =>
+      err.message.includes("Request failed with status code 400") ? false : true,
+    );
+    cy.visit(`${portal()}/signup`);
+
+    fill(/^First name/, "Onboard");
+    fill(/^Last name/, "Tester");
+    fill(/^Email/, email);
+    cy.get('input[type="tel"]').first().type(phoneNational, { force: true });
+    fill(/^Password/, signupPassword);
+    fill(/^Confirm password/, signupPassword);
+    cy.contains("button", "Continue").click();
+
+    // OTP stage — the code is generated + stored even though delivery is off.
+    cy.contains("Verify", { timeout: 15000 }).should("be.visible");
+    cy.getOtp(email).then((otp) => cy.typeOtp(otp));
+    cy.contains("button", "Verify & create account").click();
+
+    // Signed in → /portal → wizard auto-opens on the nationality/role step.
+    cy.location("pathname", { timeout: 20000 }).should("eq", "/portal");
+    cy.contains("Where is your company registered?", { timeout: 15000 }).should(
+      "be.visible",
+    );
+    cy.contains("button", "Ethiopian Company").click();
+    cy.contains("button", "Importer").click();
+    cy.get(".mantine-Modal-content").contains("button", "Continue").click();
+
+    // Company step. TIN first — the eTrade auto-lookup fails in e2e (no
+    // external network) and the form allows manual entry.
+    cy.get('input[placeholder="0012345678"]', { timeout: 15000 }).type(tin);
+    fill(/^Company Name/, companyName);
+    fill(/^Company Email/, `ops.${stamp}@example.com`);
+    fillPhone(0, "911234567");
+    fill(/^Location/, "Addis Ababa, Ethiopia");
+    fill(/^VAT Number/, vat);
+    cy.get('input[placeholder="1234567890123456"]').type(fan);
+    cy.mantineSelect(/^Region/, "Addis Ababa");
+    fill(/^Zone/, "Zone 1");
+    fill(/^Woreda/, "Woreda 1");
+    fill(/^Kebele/, "Kebele 1");
+    fill(/^House No/, "123");
+    cy.get(".mantine-Modal-content").contains("button", "Continue").click();
+
+    // Personnel (general manager).
+    fill(/^Name/, "General Manager");
+    fill(/^Email/, `gm.${stamp}@example.com`);
+    fillPhone(0, "911234568");
+    cy.get(".mantine-Modal-content").contains("button", "Continue").click();
+
+    // Contact person.
+    fill(/^Name/, "Contact Person");
+    fillPhone(0, "911234569");
+    cy.get(".mantine-Modal-content").contains("button", "Continue").click();
+
+    // PoA — optional for an importer.
+    cy.get(".mantine-Modal-content").contains("button", "Continue").click();
+
+    // Documents: no company docs are configured in e2e, but every role needs
+    // a business license.
+    cy.contains("Business license", { timeout: 15000 }).should("be.visible");
+    cy.get('.mantine-Modal-content input[type="file"]')
+      .first()
+      .selectFile("cypress/fixtures/docs/license.pdf", { force: true });
+    cy.get(".mantine-Modal-content")
+      .contains("button", "Submit for review")
+      .click();
+
+    cy.contains("You're all set", { timeout: 30000 }).should("be.visible");
+
+    // DB cross-check: submitted, awaiting approval.
+    cy.task<{ rows: Array<{ status: string; onboarding_completed: boolean }> }>(
+      "db:query",
+      {
+        sql: `SELECT c.status, ep.onboarding_completed
+              FROM freight.companies c
+              JOIN freight.external_profiles ep ON ep.company_id = c.id
+              JOIN iam.users u ON u.id = ep.user_id
+              WHERE u.email = $1`,
+        params: [email],
+      },
+    ).then(({ rows }) => {
+      expect(rows, "company row").to.have.length(1);
+      expect(rows[0].status).to.eq("pending");
+      expect(rows[0].onboarding_completed).to.eq(true);
+    });
+  });
+
+  it("backoffice staff approves the submitted importer profile", () => {
+    cy.loginBackoffice("chief@edr.local");
+    cy.visit("/dashboard/customers");
+
+    latestOnboardJourney().then(({ rows }) => {
+      expect(rows, "onboarded company").to.have.length(1);
+      const company = rows[0].name;
+
+      cy.get('input[placeholder*="Search by company"]').type(company);
+      cy.contains(company, { timeout: 15000 }).click();
+
+      // Role profiles table → approve the pending importer profile. Once
+      // active, the row's action flips to "Suspend".
+      cy.contains("button", "Approve", { timeout: 15000 }).click();
+      cy.contains("button", "Suspend", { timeout: 15000 }).should("be.visible");
+
+      cy.task<{ rows: Array<{ status: string; reference: string | null; company_status: string }> }>(
+        "db:query",
+        {
+          sql: `SELECT p.status, p.reference, c.status AS company_status
+                FROM freight.company_profiles p
+                JOIN freight.companies c ON c.id = p.company_id
+                WHERE c.name = $1 AND p.type = 'importer'`,
+          params: [company],
+        },
+      ).then(({ rows: profiles }) => {
+        expect(profiles, "importer profile").to.have.length(1);
+        expect(profiles[0].status).to.eq("active");
+        expect(profiles[0].reference, "minted reference").to.be.a("string").and
+          .not.be.empty;
+        expect(profiles[0].company_status).to.eq("active");
+      });
+    });
+  });
+
+  it("the approved customer can reach the contract wizard", () => {
+    latestOnboardJourney().then(({ rows }) => {
+      cy.loginPortal(rows[0].email, signupPassword);
+    });
+    cy.visitPortal("/contracts/new");
+
+    // No "Awaiting Approval" gate — the wizard's first step renders.
+    cy.contains("label", "Operation Type", { timeout: 15000 }).should(
+      "be.visible",
+    );
+    cy.contains("Awaiting Approval").should("not.exist");
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/flows/segment_weight.cy.ts b/e2e/freight/cypress/e2e/flows/segment_weight.cy.ts
new file mode 100644
index 000000000..5c5c44ba7
--- /dev/null
+++ b/e2e/freight/cypress/e2e/flows/segment_weight.cy.ts
@@ -0,0 +1,634 @@
+/**
+ * Segment weight & tolerance journeys — per-edge capacity on one corridor
+ * (Mojo Dry Port → Dire Dawa Yard → Nagad Terminal), two dedicated
+ * trains departing the same day (seed-segment-weight.sql):
+ *
+ *   TRN-SEG-W "tolerance train" — 240T pull; one loco carries a 90T overage
+ *   tolerance, the second has NONE CONFIGURED (the S-2026-00024 regression
+ *   pair: the set's tolerance must stay 90, not collapse to 0).
+ *
+ *     1. 130T wheat Mojo→Djibouti  → 179.6T gross (2 CW4) on both legs
+ *     2. intercity 2×20ft VGM 24 Mojo→Dire → 70.4T gross (1 NW5); the shared
+ *        Mojo→Dire leg hits 250T — OVER the 240T base, inside the 330T
+ *        ceiling. Wagon allocation must succeed (allocation is what silently
+ *        failed on S-2026-00024: PAID + SCHEDULED, zero allocations).
+ *     3. a second identical ride-along → 320.4T, still inside the ceiling —
+ *        the tolerance admits whole bookings repeatedly until spent
+ *     4. the schedule detail strip shows the per-leg gross vs the ceiling
+ *
+ *   TRN-SEG-F "border-full train" — 200T pull, no tolerance, 4 NW5.
+ *
+ *     5. 8×20ft export boarding at DIRE (sub-corridor) commits all 4 wagons
+ *        on the border edge (W's border edge only has 2 free, so FCFS lands
+ *        it on F) → the window goes FULL for the trade direction
+ *     6. the FULL train still accepts an intercity ride-along Mojo→Dire on
+ *        its free home leg (the old whole-train sum — 169.6 + 70.4 = 240T >
+ *        200T pull — rejected the accept outright; per-edge math admits it).
+ *        Wagon ALLOCATION of that shared wagon is a known gap: physical
+ *        pinning is slot-exclusive, so the test asserts accept + link only.
+ *
+ * Contracts are seeded FULLY_EXECUTED straight into SQL (stamped references,
+ * re-runnable) — contract lifecycle is covered by the other flow specs; this
+ * spec is about the scheduling engine. Run against a fresh e2e stack: the
+ * trains' capacity math assumes empty consists.
+ *
+ * Sequential steps of one journey — retries off (steps are not idempotent).
+ */
+
+const customer = "user@gmail.com";
+const companyTin = "0102030405"; // seed-company.sql
+const opsStaff = "operation@edr.local";
+
+// Own corridor (…→ Nagad, not Djibouti Port): other specs schedule TRN-E2E-1
+// on the Djibouti Port route, and an earlier-departing same-day train there
+// would steal these FCFS bookings.
+const ORIGIN_YARD = "Mojo Dry Port";
+const MID_YARD = "Dire Dawa Yard";
+const PORT_YARD = "Nagad Terminal, Djibouti";
+const TRAIN_W = "TRN-SEG-W";
+const TRAIN_F = "TRN-SEG-F";
+
+const stamp = String(Date.now());
+const isoNumber = (prefix: string, offset: number) =>
+  `${prefix}${String(Number(stamp.slice(-7)) + offset).padStart(7, "0")}`;
+
+// A ONE_TIME contract is spent after one booking, so every run seeds a fresh
+// set with stamped references. Lookups go by SUFFIX + newest row: Cypress
+// re-evaluates the spec bundle on cross-origin reloads, so a module-scope
+// stamp drifts between tests and must never key a lookup.
+const REF = {
+  exportMojo: "EXP1",
+  exportDire: "EXP2",
+  ic1: "IC1",
+  ic2: "IC2",
+  ic3: "IC3",
+} as const;
+const stampedRef = (suffix: string) => `CTR-SEG-${stamp}-${suffix}`;
+
+/** Both trains depart just past the 24h export lead — windows open in minutes. */
+const DEPART_W = new Date(Date.now() + 24 * 3_600_000 + 4 * 60_000);
+const DEPART_F = new Date(Date.now() + 24 * 3_600_000 + 7 * 60_000);
+
+const apiUrl = () => Cypress.env("apiUrl") as string;
+
+/** Seed one FULLY_EXECUTED ONE_TIME contract (contract + route + cargo scope). */
+function seedContract(opts: {
+  suffix: string;
+  reference: string;
+  direction: "EXPORT" | "DOMESTIC";
+  freight: "CONTAINER" | "BULK";
+  originCode: string;
+  destCode: string;
+}) {
+  cy.task("db:query", {
+    sql: `WITH c AS (
+            INSERT INTO freight.contracts
+              (reference, company_id, company_profile_id, contract_kind,
+               trade_direction, freight_type, service_type_id, payment_currency,
+               status, fully_executed_at, contract_valid_from,
+               contract_valid_until, contract_summary)
+            SELECT $1, comp.id,
+                   -- bookings.company_profile_id is NOT NULL and inherits from
+                   -- the contract: exporter profile for exports, any active
+                   -- profile otherwise.
+                   (SELECT p.id FROM freight.company_profiles p
+                     WHERE p.company_id = comp.id AND p.deleted_at IS NULL
+                     ORDER BY CASE
+                       WHEN $2 = 'EXPORT' AND p.type = 'exporter' THEN 0
+                       ELSE 1
+                     END
+                     LIMIT 1),
+                   'ONE_TIME', $2, $3,
+                   (SELECT st.id FROM freight.service_types st ORDER BY st.created_at LIMIT 1),
+                   'ETB', 'FULLY_EXECUTED', now(), now() - interval '1 day',
+                   now() + interval '60 days', 'E2E segment-weight fixture contract'
+            FROM freight.companies comp
+            WHERE comp.tin = $4
+              -- before() re-runs on Cypress reloads: skip when this run
+              -- already seeded a fresh, still-unbooked contract for the
+              -- suffix, so lookups keep pointing at one stable row.
+              AND NOT EXISTS (
+                SELECT 1 FROM freight.contracts c2
+                WHERE c2.reference LIKE 'CTR-SEG-%-' || $7
+                  AND c2.deleted_at IS NULL
+                  AND c2.created_at > now() - interval '15 minutes'
+                  AND NOT EXISTS (
+                    SELECT 1 FROM freight.bookings b2 WHERE b2.contract_id = c2.id
+                  )
+              )
+            RETURNING id
+          ), r AS (
+            INSERT INTO freight.contract_routes
+              (contract_id, origin_yard_id, destination_yard_id, sort_order)
+            SELECT c.id, o.id, d.id, 0 FROM c
+            JOIN freight.yards o ON o.code = $5
+            JOIN freight.yards d ON d.code = $6
+            RETURNING id
+          )
+          INSERT INTO freight.contract_cargo_scope
+            (contract_id, container_size, cargo_type_id, cargo_free_text)
+          SELECT c.id,
+                 CASE WHEN $3 = 'CONTAINER' THEN '20ft' END,
+                 CASE WHEN $3 = 'BULK' THEN
+                   (SELECT ct.id FROM freight.cargo_types ct WHERE ct.code = 'E2E_WHEAT' LIMIT 1)
+                 END,
+                 'E2E segment-weight cargo'
+          FROM c`,
+    params: [
+      opts.reference,
+      opts.direction,
+      opts.freight,
+      companyTin,
+      opts.originCode,
+      opts.destCode,
+      opts.suffix,
+    ],
+  });
+}
+
+/** Newest seeded contract for a suffix — stamp-agnostic (see REF). */
+function dbContractId(suffix: string) {
+  return cy
+    .task<{ rows: Array<{ id: string }> }>("db:query", {
+      sql: `SELECT id FROM freight.contracts
+            WHERE reference LIKE 'CTR-SEG-%-' || $1
+            ORDER BY created_at DESC LIMIT 1`,
+      params: [suffix],
+    })
+    .then(({ rows }) => {
+      expect(rows, `seeded contract *-${suffix}`).to.have.length(1);
+      return cy.wrap(rows[0].id, { log: false });
+    });
+}
+
+type BookingRow = {
+  id: string;
+  reference: string;
+  status: string;
+  scheduling_status: string;
+  train_schedule_id: string | null;
+  payment_deadline: string | null;
+};
+
+/** The (only) booking under this run's seeded contract for a suffix. */
+function withBooking(suffix: string, fn: (b: BookingRow) => void) {
+  cy.task<{ rows: BookingRow[] }>("db:query", {
+    sql: `SELECT b.id, b.reference, b.status, b.scheduling_status,
+                 b.train_schedule_id, b.payment_deadline
+          FROM freight.bookings b
+          JOIN freight.contracts ct ON ct.id = b.contract_id
+          WHERE ct.reference LIKE 'CTR-SEG-%-' || $1
+          ORDER BY b.created_at DESC LIMIT 1`,
+    params: [suffix],
+  }).then(({ rows }) => {
+    expect(rows, `booking under *-${suffix}`).to.have.length(1);
+    fn(rows[0]);
+  });
+}
+
+type ScheduleRow = {
+  id: string;
+  booking_window_status: string;
+  window_closes_at: string;
+};
+
+/** The live schedule riding a given built train on the NAGAD corridor. */
+function dbScheduleFor(trainCode: string) {
+  return cy.task<{ rows: ScheduleRow[] }>("db:query", {
+    sql: `SELECT ts.id, ts.booking_window_status, ts.window_closes_at
+          FROM freight.train_schedules ts
+          JOIN freight.train_sets se ON se.id = ts.train_set_id
+          JOIN freight.trains t ON t.id = se.train_id
+          JOIN freight.yards d ON d.id = ts.destination_station_id
+          WHERE t.code = $1 AND d.code = 'NAGAD' AND ts.deleted_at IS NULL
+          ORDER BY ts.created_at DESC LIMIT 1`,
+    params: [trainCode],
+  });
+}
+
+function withSchedule(trainCode: string, fn: (s: ScheduleRow) => void) {
+  dbScheduleFor(trainCode).then(({ rows }) => {
+    expect(rows, `schedule for ${trainCode}`).to.have.length(1);
+    fn(rows[0]);
+  });
+}
+
+function fill(label: string | RegExp, value: string) {
+  cy.contains("label", label)
+    .invoke("attr", "for")
+    .then((id) => {
+      cy.get(`[id="${id}"]`).clear({ force: true }).type(value, { force: true });
+    });
+}
+
+/** Pick the departure day on the booking form's inline calendar. */
+function pickShipmentDay(date: Date) {
+  cy.contains(/available day/, { timeout: 30000 }).should("exist");
+  const day = String(date.getDate());
+  cy.get("button:not(:disabled)", { timeout: 15000 })
+    .contains(new RegExp(`^${day}$`))
+    .click({ force: true });
+}
+
+/** Create one schedule from a built train, departing at the given moment. */
+function createSchedule(trainCode: string, departure: Date) {
+  cy.visit("/dashboard/operations/train-scheduling-v2");
+  cy.contains("button", "New schedule", { timeout: 20000 }).click();
+  cy.contains("Create train schedule", { timeout: 15000 }).should("be.visible");
+  cy.mantineSelect(/^Route$/, /Nagad/);
+  const local = new Date(departure.getTime() - departure.getTimezoneOffset() * 60000)
+    .toISOString()
+    .slice(0, 16);
+  cy.get('.mantine-Modal-content input[type="datetime-local"]')
+    .clear({ force: true })
+    .type(local, { force: true });
+  cy.mantineSelect(/^Train$/, new RegExp(trainCode));
+  cy.get(".mantine-Modal-content").contains("button", "Create").click();
+  cy.location("pathname", { timeout: 30000 }).should(
+    "match",
+    /\/dashboard\/operations\/train-scheduling-v2\/.+/,
+  );
+}
+
+/** Ops accepts a booking's operation request from the booking-requests page. */
+function acceptOperationRequest(contractRef: string) {
+  cy.loginBackoffice(opsStaff);
+  withBooking(contractRef, (b) => cy.visit(`/dashboard/booking-requests/${b.id}`));
+  cy.contains("button", /Accept operation|^Accept$/, { timeout: 20000 }).click();
+  cy.contains("Accept operation request?", { timeout: 15000 }).should("be.visible");
+  cy.get(".mantine-Modal-content").contains("button", /^Accept$/).click();
+  cy.get(".mantine-Modal-content", { timeout: 30000 }).should("not.exist");
+}
+
+/** Book 2×20ft VGM 24T each under a seeded DOMESTIC contract (48T cargo, 1 NW5). */
+function bookIntercityPair(contractRef: string, isoOffset: number) {
+  cy.loginPortal(customer);
+  dbContractId(contractRef).then((id) => cy.visitPortal(`/contracts/${id}/bookings/new`));
+  cy.contains("New Shipment Booking", { timeout: 20000 }).should("be.visible");
+
+  fill(/^Quantity/, "2");
+  cy.get('input[placeholder*="MSCU"]', { timeout: 15000 }).should("have.length", 2);
+  cy.get('input[placeholder*="MSCU"]').eq(0).type(isoNumber("MSCU", isoOffset));
+  cy.get('input[placeholder*="MSCU"]').eq(1).type(isoNumber("TCLU", isoOffset + 1));
+  cy.get('input[placeholder*="24.5"]').each(($input) => {
+    cy.wrap($input).clear({ force: true }).type("24", { force: true });
+  });
+  cy.contains("Shipment day").should("not.exist");
+
+  cy.contains("button", "Review price & book").should("not.be.disabled").click();
+  cy.contains("Confirm shipment price", { timeout: 30000 }).should("be.visible");
+  cy.contains("button", "Confirm & book").click();
+  cy.location("pathname", { timeout: 30000 }).should("match", /^\/bookings\/.+/);
+}
+
+/** Accept a waiting intercity booking from a schedule's ride-along panel. */
+function acceptRideAlong(trainCode: string, contractRef: string) {
+  cy.loginBackoffice(opsStaff);
+  withSchedule(trainCode, (s) =>
+    cy.visit(`/dashboard/operations/train-scheduling-v2/${s.id}`),
+  );
+  cy.contains('[role="tab"]', "Workspace", { timeout: 30000 }).click();
+  cy.contains("Intercity ride-along", { timeout: 30000 }).should("exist");
+  withBooking(contractRef, (b) => {
+    cy.contains("tr", b.reference, { timeout: 30000 })
+      .find('input[type="checkbox"]')
+      .check({ force: true });
+    cy.contains("button", /Accept .*onto this train/).click();
+    cy.contains("Awaiting payment", { timeout: 30000 }).should("exist");
+  });
+}
+
+/** Staff mark-paid (no mounted UI button), then wait for wagon allocation. */
+function markPaidAndAssertAllocated(contractRef: string) {
+  withBooking(contractRef, (b) => {
+    cy.apiLogin(opsStaff).then(({ token }) => {
+      cy.request({
+        method: "POST",
+        url: `${apiUrl()}/api/train-scheduling/bookings/${b.id}/mark-paid`,
+        headers: { Authorization: `Bearer ${token}` },
+      })
+        .its("status")
+        .should("be.oneOf", [200, 201]);
+    });
+  });
+  withBooking(contractRef, (b) => {
+    expect(b.status).to.eq("PAID");
+    expect(b.scheduling_status).to.eq("SCHEDULED");
+
+    // Wagon allocation runs async after allocate() — poll for its rows.
+    // Zero allocations with a PAID/SCHEDULED booking is exactly the
+    // S-2026-00024 failure shape this spec guards against.
+    const waitForAllocation = (attempt: number) => {
+      cy.task<{ rows: Array<{ n: string }> }>("db:query", {
+        sql: `SELECT count(*) AS n FROM freight.wagon_booking_allocations
+              WHERE booking_id = $1 AND deleted_at IS NULL`,
+        params: [b.id],
+      }).then(({ rows }) => {
+        if (Number(rows[0].n) > 0) return;
+        expect(attempt, `wagon allocations for ${contractRef}`).to.be.lessThan(20);
+        cy.wait(2000).then(() => waitForAllocation(attempt + 1));
+      });
+    };
+    waitForAllocation(0);
+  });
+}
+
+describe(
+  "segment weight: per-edge caps, loco tolerance, directional FULL",
+  { retries: 0 },
+  () => {
+    before(() => {
+      cy.task("db:seedFile", "seed-intercity.sql");
+      cy.task("db:seedFile", "seed-export.sql");
+      cy.task("db:seedFile", "seed-segment-weight.sql");
+      seedContract({
+        suffix: REF.exportMojo,
+        reference: stampedRef(REF.exportMojo),
+        direction: "EXPORT",
+        freight: "BULK",
+        originCode: "MOJO",
+        destCode: "NAGAD",
+      });
+      seedContract({
+        suffix: REF.exportDire,
+        reference: stampedRef(REF.exportDire),
+        direction: "EXPORT",
+        freight: "CONTAINER",
+        originCode: "DIRE_DAWA",
+        destCode: "NAGAD",
+      });
+      for (const ref of [REF.ic1, REF.ic2, REF.ic3]) {
+        seedContract({
+          suffix: ref,
+          reference: stampedRef(ref),
+          direction: "DOMESTIC",
+          freight: "CONTAINER",
+          originCode: "MOJO",
+          destCode: "DIRE_DAWA",
+        });
+      }
+    });
+
+    // ── Infrastructure ───────────────────────────────────────────────────────
+
+    it("operations ensures the export route exists", () => {
+      cy.loginBackoffice(opsStaff);
+      cy.task<{ rows: Array<{ n: string }> }>("db:query", {
+        sql: `SELECT count(*) AS n
+              FROM freight.routes r
+              JOIN freight.yards o ON o.id = r.origin_yard_id AND o.code = 'MOJO'
+              JOIN freight.yards d ON d.id = r.destination_yard_id AND d.code = 'NAGAD'
+              WHERE r.deleted_at IS NULL`,
+      }).then(({ rows }) => {
+        if (Number(rows[0].n) > 0) return;
+
+        cy.visit("/dashboard/routes");
+        cy.contains("button", "Add route", { timeout: 20000 }).click();
+        cy.contains("Add Route", { timeout: 15000 }).should("be.visible");
+        cy.get(".mantine-Modal-content").contains("button", "Add milestone").click();
+        const pickYard = (index: number, yard: string) => {
+          cy.get('.mantine-Modal-content input[placeholder="Select yard"]')
+            .eq(index)
+            .click({ force: true });
+          cy.get('[role="option"]:visible').contains(yard).click();
+        };
+        pickYard(0, ORIGIN_YARD);
+        pickYard(1, MID_YARD);
+        pickYard(2, PORT_YARD);
+        cy.get(".mantine-Modal-content").contains("button", "Save").click();
+      });
+    });
+
+    it("operations schedules both segment trains — same route, same day", () => {
+      cy.loginBackoffice(opsStaff);
+      // Two different physical trains may share a route+day (the guard only
+      // blocks the SAME train twice); export windows are per-schedule.
+      dbScheduleFor(TRAIN_W).then(({ rows }) => {
+        if (rows.length === 0) createSchedule(TRAIN_W, DEPART_W);
+      });
+      dbScheduleFor(TRAIN_F).then(({ rows }) => {
+        if (rows.length === 0) createSchedule(TRAIN_F, DEPART_F);
+      });
+
+      // The export window opens at departure − 24h CLAMPED into the booking
+      // desk hours (8–17 EAT), and the engine can take minutes to advance a
+      // second same-day train. Force both windows OPEN directly — the spec
+      // arranges window state, it does not test the window engine.
+      for (const trainCode of [TRAIN_W, TRAIN_F]) {
+        dbScheduleFor(trainCode).then(({ rows }) => {
+          expect(rows, `schedule for ${trainCode}`).to.have.length(1);
+          cy.task("db:query", {
+            sql: `UPDATE freight.train_schedules
+                  SET window_opens_at = LEAST(window_opens_at, now()),
+                      window_phase = 'OPEN',
+                      booking_window_status = 'OPEN'
+                  WHERE id = $1 AND booking_window_status <> 'FULL'`,
+            params: [rows[0].id],
+          });
+        });
+      }
+
+      // Belt-and-braces: confirm the engine keeps them OPEN.
+      const waitForOpen = (trainCode: string, attempt: number) => {
+        dbScheduleFor(trainCode).then(({ rows }) => {
+          expect(rows, `schedule for ${trainCode}`).to.have.length(1);
+          if (rows[0].booking_window_status === "OPEN") return;
+          expect(attempt, `${trainCode} window OPEN`).to.be.lessThan(60);
+          cy.wait(10000).then(() => waitForOpen(trainCode, attempt + 1));
+        });
+      };
+      waitForOpen(TRAIN_W, 0);
+      waitForOpen(TRAIN_F, 0);
+    });
+
+    // ── Tolerance train (TRN-SEG-W) ──────────────────────────────────────────
+
+    it("customer books 130T of wheat Mojo→Djibouti", () => {
+      cy.loginPortal(customer);
+      dbContractId(REF.exportMojo).then((id) =>
+        cy.visitPortal(`/contracts/${id}/bookings/new`),
+      );
+      cy.contains("New Shipment Booking", { timeout: 20000 }).should("be.visible");
+      fill(/^Quantity \(tons\)/, "130");
+      pickShipmentDay(DEPART_W);
+      cy.contains("button", "Review price & book").should("not.be.disabled").click();
+      cy.contains("Confirm shipment price", { timeout: 30000 }).should("be.visible");
+      cy.contains("button", "Confirm & book").click();
+      cy.location("pathname", { timeout: 30000 }).should("match", /^\/bookings\/.+/);
+    });
+
+    it("the wheat lands on the tolerance train and allocates", () => {
+      acceptOperationRequest(REF.exportMojo);
+
+      // FCFS picks the earliest fitting train of the day — the W train.
+      withSchedule(TRAIN_W, (s) => {
+        withBooking(REF.exportMojo, (b) => {
+          expect(b.status).to.eq("SELECTED_FOR_BATCH");
+          expect(b.train_schedule_id, "reserved on the tolerance train").to.eq(s.id);
+        });
+      });
+      markPaidAndAssertAllocated(REF.exportMojo);
+    });
+
+    it("customer books the first intercity pair Mojo→Dire", () => {
+      bookIntercityPair(REF.ic1, 0);
+    });
+
+    it("the ride-along boards the shared leg through the overage tolerance", () => {
+      // Mojo→Dire now carries 179.6T (wheat). Adding 70.4T (2×20ft VGM 24 on
+      // one NW5) puts the leg at 250T — over the 240T base, inside 240+90.
+      // Before the tolerance fix the second loco's NULL tolerance zeroed the
+      // set and this exact allocation failed at "3500" scale.
+      acceptOperationRequest(REF.ic1);
+      acceptRideAlong(TRAIN_W, REF.ic1);
+
+      withSchedule(TRAIN_W, (s) => {
+        withBooking(REF.ic1, (b) => {
+          expect(b.status).to.eq("SELECTED_FOR_BATCH");
+          expect(b.train_schedule_id).to.eq(s.id);
+          expect(new Date(b.payment_deadline!).getTime()).to.be.at.most(
+            new Date(s.window_closes_at).getTime(),
+          );
+        });
+      });
+      markPaidAndAssertAllocated(REF.ic1);
+    });
+
+    it("customer books the second intercity pair Mojo→Dire", () => {
+      bookIntercityPair(REF.ic2, 2);
+    });
+
+    it("a second ride-along still fits whole — tolerance spends per booking, not once", () => {
+      // 250T + 70.4T = 320.4T on Mojo→Dire — still under the 330T ceiling.
+      acceptOperationRequest(REF.ic2);
+      acceptRideAlong(TRAIN_W, REF.ic2);
+      markPaidAndAssertAllocated(REF.ic2);
+
+      // The border edge (Dire→Djibouti) still has room, so the tolerance
+      // train's window must NOT be FULL — fullness is directional.
+      withSchedule(TRAIN_W, (s) => {
+        expect(s.booking_window_status, "W window stays open").to.eq("OPEN");
+      });
+    });
+
+    it("the schedule detail strip shows per-leg gross against the tolerance ceiling", () => {
+      cy.loginBackoffice(opsStaff);
+      withSchedule(TRAIN_W, (s) =>
+        cy.visit(`/dashboard/operations/train-scheduling-v2/${s.id}`),
+      );
+      // Mojo→Dire: 179.6 (wheat) + 70.4 + 70.4 (ride-alongs) = 320.4T gross;
+      // ceiling = 240 base + 90 tolerance = 330T (the weakest CONFIGURED
+      // tolerance governs — the second loco has none set).
+      cy.contains("320.4 / 330 T gross", { timeout: 30000 }).should("exist");
+      // Border leg carries only the wheat.
+      cy.contains("179.6 / 330 T gross").should("exist");
+    });
+
+    // ── Border-full train (TRN-SEG-F) ────────────────────────────────────────
+
+    it("customer books an 8×20ft export from the MID yard", () => {
+      cy.loginPortal(customer);
+      dbContractId(REF.exportDire).then((id) =>
+        cy.visitPortal(`/contracts/${id}/bookings/new`),
+      );
+      cy.contains("New Shipment Booking", { timeout: 20000 }).should("be.visible");
+      fill(/^Quantity/, "8");
+      cy.get('input[placeholder*="MSCU"]', { timeout: 15000 }).should("have.length", 8);
+      for (let i = 0; i < 8; i += 1) {
+        cy.get('input[placeholder*="MSCU"]').eq(i).type(isoNumber("MSCU", 10 + i));
+      }
+      cy.get('input[placeholder*="24.5"]').each(($input) => {
+        cy.wrap($input).clear({ force: true }).type("10", { force: true });
+      });
+      pickShipmentDay(DEPART_F);
+      cy.contains("button", "Review price & book").should("not.be.disabled").click();
+      cy.contains("Confirm shipment price", { timeout: 30000 }).should("be.visible");
+      cy.contains("button", "Confirm & book").click();
+      cy.location("pathname", { timeout: 30000 }).should("match", /^\/bookings\/.+/);
+    });
+
+    it("the export fills the border edge — the window goes FULL for the direction", () => {
+      acceptOperationRequest(REF.exportDire);
+
+      // 8×20ft = 4 wagons. W's border edge has only 2 wagons free (the wheat
+      // holds the other 2), so FCFS lands this Dire→Djibouti sub-corridor
+      // booking on the F train — all 4 of its wagons, but only past Dire.
+      withSchedule(TRAIN_F, (s) => {
+        withBooking(REF.exportDire, (b) => {
+          expect(b.status).to.eq("SELECTED_FOR_BATCH");
+          expect(b.train_schedule_id, "reserved on the border-full train").to.eq(s.id);
+        });
+      });
+      markPaidAndAssertAllocated(REF.exportDire);
+
+      // Every wagon on the border edge is committed: the train is FULL for
+      // its trade direction even though Mojo→Dire runs completely empty.
+      const waitForFull = (attempt: number) => {
+        dbScheduleFor(TRAIN_F).then(({ rows }) => {
+          if (rows[0]?.booking_window_status === "FULL") return;
+          expect(attempt, "F window FULL").to.be.lessThan(20);
+          cy.wait(3000).then(() => waitForFull(attempt + 1));
+        });
+      };
+      waitForFull(0);
+    });
+
+    it("customer books the third intercity pair Mojo→Dire", () => {
+      bookIntercityPair(REF.ic3, 4);
+    });
+
+    it("the FULL train still accepts and allocates an intercity ride-along on its free leg", () => {
+      // Mojo→Dire on the F train is empty (the export boards at Dire): the
+      // ride-along uses the SAME wagons there and alights before they load.
+      // The old whole-train sum — 169.6 + 70.4 = 240T > 200T pull — rejected
+      // this; per-edge math sees 70.4T on Mojo→Dire and 169.6T on the border,
+      // both within the cap. The FULL flag closes the export window only.
+      acceptOperationRequest(REF.ic3);
+      acceptRideAlong(TRAIN_F, REF.ic3);
+
+      withSchedule(TRAIN_F, (s) => {
+        withBooking(REF.ic3, (b) => {
+          expect(b.status).to.eq("SELECTED_FOR_BATCH");
+          expect(b.train_schedule_id, "accepted onto the FULL train").to.eq(s.id);
+        });
+      });
+
+      // Mark paid: PAID + SCHEDULED + linked. Wagon allocation is asserted
+      // only as far as today's model supports: physical wagon pinning is
+      // slot-exclusive (one wagon serves ONE slot), so the same wagon cannot
+      // yet be pinned to the intercity's Mojo→Dire slot AND the export's
+      // Dire→Nagad slot even though the per-edge budget admits both. KNOWN
+      // GAP — when wagon↔slot pinning becomes leg-aware, restore
+      // markPaidAndAssertAllocated(REF.ic3) here.
+      withBooking(REF.ic3, (b) => {
+        cy.apiLogin(opsStaff).then(({ token }) => {
+          cy.request({
+            method: "POST",
+            url: `${apiUrl()}/api/train-scheduling/bookings/${b.id}/mark-paid`,
+            headers: { Authorization: `Bearer ${token}` },
+          })
+            .its("status")
+            .should("be.oneOf", [200, 201]);
+        });
+      });
+      withBooking(REF.ic3, (b) => {
+        expect(b.status).to.eq("PAID");
+        expect(b.scheduling_status).to.eq("SCHEDULED");
+        cy.task<{ rows: Array<{ n: string }> }>("db:query", {
+          sql: `SELECT count(*) AS n FROM freight.train_schedule_bookings
+                WHERE booking_id = $1 AND deleted_at IS NULL`,
+          params: [b.id],
+        }).then(({ rows }) => {
+          expect(Number(rows[0].n), "train_schedule_bookings link").to.eq(1);
+        });
+      });
+
+      // The ride-along never reopens the export window.
+      withSchedule(TRAIN_F, (s) => {
+        expect(s.booking_window_status, "F window stays FULL").to.eq("FULL");
+      });
+    });
+  },
+);
+
+export {};
diff --git a/e2e/freight/cypress/e2e/portal/login.cy.ts b/e2e/freight/cypress/e2e/portal/login.cy.ts
new file mode 100644
index 000000000..55ef4bc21
--- /dev/null
+++ b/e2e/freight/cypress/e2e/portal/login.cy.ts
@@ -0,0 +1,36 @@
+/**
+ * UI login for the customer portal (seeded demo user).
+ * Form: apps/edr-freight-web/portal/src/pages/accounts/LoginPage.tsx.
+ * Portal is a different origin (port 5373), so specs visit it via absolute
+ * URL — each test here stays on that single origin, no cy.origin needed.
+ */
+const portal = () => Cypress.env("portalUrl") as string;
+
+describe("portal: UI login", () => {
+  it("logs in via the form", () => {
+    cy.clearCookies();
+    cy.visit(`${portal()}/login`);
+    cy.get('input[placeholder="name@company.com or 09XXXXXXXX"]').type("user@gmail.com");
+    cy.get('input[placeholder="Enter your password"]').type(
+      Cypress.env("demoPassword"),
+      { log: false },
+    );
+    cy.get('button[type="submit"]').click();
+
+    cy.location("pathname", { timeout: 20000 }).should("not.eq", "/login");
+    cy.getCookie("auth-token").should("exist");
+  });
+
+  it("rejects wrong credentials", () => {
+    cy.clearCookies();
+    cy.visit(`${portal()}/login`);
+    cy.get('input[placeholder="name@company.com or 09XXXXXXXX"]').type("user@gmail.com");
+    cy.get('input[placeholder="Enter your password"]').type("definitely-wrong");
+    cy.get('button[type="submit"]').click();
+
+    cy.location("pathname").should("eq", "/login");
+    cy.getCookie("auth-token").should("not.exist");
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/e2e/portal/smoke.cy.ts b/e2e/freight/cypress/e2e/portal/smoke.cy.ts
new file mode 100644
index 000000000..5372d7359
--- /dev/null
+++ b/e2e/freight/cypress/e2e/portal/smoke.cy.ts
@@ -0,0 +1,29 @@
+/**
+ * Route-level smoke over the customer portal.
+ * Routes from apps/edr-freight-web/portal/src/App.tsx.
+ */
+const portal = () => Cypress.env("portalUrl") as string;
+
+const ROUTES = ["/portal", "/bookings", "/contracts", "/billing", "/tracking"];
+
+describe("portal: route smoke (demo customer)", () => {
+  beforeEach(() => {
+    cy.loginPortal("user@gmail.com");
+  });
+
+  ROUTES.forEach((route) => {
+    it(`renders ${route}`, () => {
+      cy.visit(`${portal()}${route}`);
+      cy.location("pathname").should("not.eq", "/login");
+      cy.get("#root").should("not.be.empty");
+    });
+  });
+
+  it("new booking wizard opens", () => {
+    cy.visit(`${portal()}/bookings/new`);
+    cy.location("pathname").should("eq", "/bookings/new");
+    cy.get("#root").should("not.be.empty");
+  });
+});
+
+export {};
diff --git a/e2e/freight/cypress/fixtures/docs/license.pdf b/e2e/freight/cypress/fixtures/docs/license.pdf
new file mode 100644
index 000000000..8a4f1376d
--- /dev/null
+++ b/e2e/freight/cypress/fixtures/docs/license.pdf
@@ -0,0 +1,11 @@
+%PDF-1.4
+1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj
+2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj
+3 0 obj<</Type/Page/Parent 2 0 R/MediaBox[0 0 200 200]>>endobj
+xref
+0 4
+0000000000 65535 f 
+trailer<</Size 4/Root 1 0 R>>
+startxref
+0
+%%EOF
diff --git a/e2e/freight/cypress/fixtures/seed-company.sql b/e2e/freight/cypress/fixtures/seed-company.sql
new file mode 100644
index 000000000..f48bfaf81
--- /dev/null
+++ b/e2e/freight/cypress/fixtures/seed-company.sql
@@ -0,0 +1,53 @@
+-- Arrange-data for the contract lifecycle specs, applied after seed-users.sql.
+-- Idempotent. Two things the app cannot provide without manual steps:
+--
+-- 1. chief gets `edr_freight_app:admin` (customer-profile approval is
+--    FreightAdmin-guarded and no seeded position carries it).
+-- 2. user@gmail.com gets an ACTIVE company + approved importer profile so the
+--    contract wizard is reachable without first running the onboarding journey.
+
+-- 1. chief → edr_freight_app:admin
+INSERT INTO iam.position_permissions (id, position_id, permission_id)
+SELECT gen_random_uuid(), p.id, perm.id
+FROM iam.positions p
+JOIN iam.permissions perm ON perm.key = 'edr_freight_app:admin'
+WHERE p.key = 'chief'
+  AND NOT EXISTS (
+    SELECT 1 FROM iam.position_permissions pp
+    WHERE pp.position_id = p.id AND pp.permission_id = perm.id
+  );
+
+-- 2a. Active customer company (TIN is the idempotency key).
+INSERT INTO freight.companies
+  (id, name, type, status, tin, fan_number, country, address, phone, email,
+   nationality, kind, attributes)
+SELECT gen_random_uuid(), 'E2E Logistics PLC', 'customer', 'active',
+  '0102030405', '1234567890123456', 'Ethiopia', 'Addis Ababa, Ethiopia',
+  '+251911000001', 'ops@e2e-logistics.test', 'ethiopian', 'commercial',
+  '{"contactPersonName":"Test Contact","contactPersonPhone":"+251911000002","generalManagerName":"Test GM","generalManagerEmail":"gm@e2e-logistics.test","generalManagerPhone":"+251911000003"}'::jsonb
+WHERE NOT EXISTS (SELECT 1 FROM freight.companies WHERE tin = '0102030405');
+
+-- 2b. Approved importer profile (reference normally minted on approval).
+INSERT INTO freight.company_profiles (id, company_id, type, status, reference)
+SELECT gen_random_uuid(), c.id, 'importer', 'active', 'IMP-E2E-0001'
+FROM freight.companies c
+WHERE c.tin = '0102030405'
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.company_profiles p
+    WHERE p.company_id = c.id AND p.type = 'importer'
+  );
+
+-- 2c. Link the demo portal user to the company, onboarding already done.
+-- (active_profile_type was dropped by migration 2450 — the "active mode"
+-- column no longer exists; bookings resolve the profile per shipment.)
+INSERT INTO freight.external_profiles
+  (id, user_id, company_id, first_name, last_name, is_primary_contact,
+   onboarding_step, onboarding_completed)
+SELECT gen_random_uuid(), u.id, c.id, 'Demo', 'User', true,
+  'done', true
+FROM iam.users u
+JOIN freight.companies c ON c.tin = '0102030405'
+WHERE u.email = 'user@gmail.com'
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.external_profiles ep WHERE ep.user_id = u.id
+  );
diff --git a/e2e/freight/cypress/fixtures/seed-export.sql b/e2e/freight/cypress/fixtures/seed-export.sql
new file mode 100644
index 000000000..574f43f26
--- /dev/null
+++ b/e2e/freight/cypress/fixtures/seed-export.sql
@@ -0,0 +1,85 @@
+-- Arrange-data for flows/export_one_time.cy.ts. Idempotent.
+-- Run AFTER seed-intercity.sql (reuses its container types, locomotives,
+-- built train TRN-E2E-1 and yard distances).
+--
+--   1. bulk cargo hierarchy: group "E2E Grains" → commodity "E2E Wheat",
+--      carried on CW4 covered wagons
+--   2. two CW4 wagons coupled onto the train (bulk capacity)
+--   3. LIVE export rates for Mojo → Djibouti Port: container (per container)
+--      and bulk (per ton) — booking pricing hard-blocks without them
+
+-- 0. Approved exporter profile — picking "Export" in the wizard opens the
+-- "Set up your exporter profile" modal unless the company already has an
+-- active exporter profile (seed-company.sql only creates the importer).
+INSERT INTO freight.company_profiles (id, company_id, type, status, reference)
+SELECT gen_random_uuid(), c.id, 'exporter', 'active', 'EXP-E2E-0001'
+FROM freight.companies c
+WHERE c.tin = '0102030405'
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.company_profiles p
+    WHERE p.company_id = c.id AND p.type = 'exporter'
+  );
+
+-- 1a. Cargo type group + commodity.
+INSERT INTO freight.cargo_types (id, code, cargo_type_name, is_active)
+SELECT gen_random_uuid(), 'E2E_GRAINS', 'E2E Grains', true
+WHERE NOT EXISTS (SELECT 1 FROM freight.cargo_types WHERE code = 'E2E_GRAINS');
+
+INSERT INTO freight.cargo_types (id, code, cargo_type_name, parent_group_id, is_active)
+SELECT gen_random_uuid(), 'E2E_WHEAT', 'E2E Wheat', g.id, true
+FROM freight.cargo_types g
+WHERE g.code = 'E2E_GRAINS'
+  AND NOT EXISTS (SELECT 1 FROM freight.cargo_types WHERE code = 'E2E_WHEAT');
+
+-- 1b. Wheat rides CW4 covered wagons.
+INSERT INTO freight.cargo_type_wagon_types (cargo_type_id, wagon_type_id)
+SELECT ct.id, wt.id
+FROM freight.cargo_types ct
+JOIN freight.wagon_types wt ON wt.code = 'CW4'
+WHERE ct.code IN ('E2E_WHEAT', 'E2E_GRAINS')
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.cargo_type_wagon_types x
+    WHERE x.cargo_type_id = ct.id AND x.wagon_type_id = wt.id
+  );
+
+-- 2. Couple two free CW4 wagons onto the train, parked at Mojo with it.
+UPDATE freight.wagons w
+SET train_id = t.id,
+    sequence_number = 100 + sub.rn,
+    current_yard_id = (SELECT id FROM freight.yards WHERE code = 'MOJO')
+FROM freight.trains t,
+     LATERAL (
+       SELECT w2.id, row_number() OVER (ORDER BY w2.wagon_number) AS rn
+       FROM freight.wagons w2
+       JOIN freight.wagon_types wt ON wt.id = w2.wagon_type_id AND wt.code = 'CW4'
+       WHERE w2.train_id IS NULL AND w2.deleted_at IS NULL
+       ORDER BY w2.wagon_number
+       LIMIT 2
+     ) sub
+WHERE t.code = 'TRN-E2E-1'
+  AND w.id = sub.id
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.wagons wx
+    JOIN freight.wagon_types wxt ON wxt.id = wx.wagon_type_id AND wxt.code = 'CW4'
+    WHERE wx.train_id = t.id
+  );
+
+-- 3. LIVE export rates Mojo → Djibouti Port.
+INSERT INTO freight.rates
+  (id, rate_type, applies_to, trigger, currency, rate_value, rate_unit, status,
+   origin_yard_id, destination_yard_id, proposed_by_staff_id)
+SELECT gen_random_uuid(), v.rate_type, v.applies_to, 'ALWAYS', 'USD', v.value,
+       v.unit, 'LIVE', a.id, b.id, u.id
+FROM (VALUES
+        ('CONTAINER_EXPORT', 'CONTAINER', 600, 'PER_CONTAINER'),
+        ('BULK_EXPORT', 'BULK', 25, 'PER_TON')
+     ) AS v(rate_type, applies_to, value, unit)
+JOIN freight.yards a ON a.code = 'MOJO'
+JOIN freight.yards b ON b.code = 'DJIB_PORT'
+JOIN iam.users u ON u.email = 'operation@edr.local'
+WHERE NOT EXISTS (
+  SELECT 1 FROM freight.rates r
+  WHERE r.rate_type = v.rate_type
+    AND r.origin_yard_id = a.id AND r.destination_yard_id = b.id
+    AND r.deleted_at IS NULL
+);
diff --git a/e2e/freight/cypress/fixtures/seed-import-corridor.sql b/e2e/freight/cypress/fixtures/seed-import-corridor.sql
new file mode 100644
index 000000000..21a2e391c
--- /dev/null
+++ b/e2e/freight/cypress/fixtures/seed-import-corridor.sql
@@ -0,0 +1,359 @@
+-- Arrange-data for the IMPORT corridor flow specs
+-- (flows/import_full_train, import_waiting_expiry, import_split_promote,
+--  import_window_reopen, import_critical_matrix). Idempotent.
+--
+-- Long import corridor (A→B→C→D→E→T, 6 stops, DJ→ET = IMPORT):
+--   DJIB_PORT → NAGAD → DIRE_DAWA → E2E_AWASH → MOJO → KALITY
+--
+-- The specs create the route + schedules through the API; this fixture provides
+-- what the journeys cannot reasonably create in-flow:
+--   1. the extra mid-corridor yard (E2E_AWASH) + container facility rows
+--   2. container types 20FT/40FT + NW5 allow-list (shared with seed-intercity)
+--   3. NW5 rated for 54 wagons per train (the corridor trains run 54)
+--   4. eight locomotives at Djibouti Port (each import schedule needs >= 2)
+--   5. free NW5 wagon stock parked at DJIB_PORT (+ a NAGAD pocket for the
+--      sub-corridor scenario) so wagon allocation has physical stock
+--   6. yard distances for every consecutive pair (route creation refuses
+--      unconfigured pairs)
+--   7. LIVE CONTAINER_IMPORT rates on the legs the specs book (pricing
+--      hard-blocks a container line without a rate on its exact leg) + an
+--      INTERCITY_CONTAINER rate for the ride-along scenario
+
+-- 0. The split-remainder chain (assertExactRemainder in contract-booking)
+-- deliberately creates a SECOND live booking under a split ONE_TIME contract,
+-- but no migration ever relaxed the 1822 one-live-booking unique index for it
+-- (the dev DB was hand-patched). Drop it here the same way — and note it as a
+-- missing production migration.
+DROP INDEX IF EXISTS freight.uq_one_active_booking_per_one_time_contract;
+
+-- 1a. Extra Ethiopian mid-corridor yard.
+INSERT INTO freight.yards (id, code, label, country, is_active, display_order)
+SELECT gen_random_uuid(), 'E2E_AWASH', 'E2E Awash Yard', 'Ethiopia', true, 50
+WHERE NOT EXISTS (SELECT 1 FROM freight.yards WHERE code = 'E2E_AWASH');
+
+-- 1b. Container-capable facility rows for every corridor yard the specs load
+-- or unload at (booking-journey's yard gate reads freight.yard_facilities).
+INSERT INTO freight.yard_facilities
+  (id, yard_id, has_warehouse, handles_container, handles_bulk, is_active)
+SELECT gen_random_uuid(), y.id, false, true, true, true
+FROM freight.yards y
+WHERE y.code IN ('DJIB_PORT', 'NAGAD', 'DIRE_DAWA', 'E2E_AWASH', 'MOJO', 'KALITY')
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.yard_facilities f
+    WHERE f.yard_id = y.id AND f.deleted_at IS NULL
+  );
+
+-- 2a. Container types (booking form + API resolve 20ft/40ft by size_ft).
+INSERT INTO freight.container_types (id, code, label, size_ft, is_active)
+SELECT gen_random_uuid(), v.code, v.label, v.size_ft, true
+FROM (VALUES ('20FT', '20FT', 20), ('40FT', '40FT', 40)) AS v(code, label, size_ft)
+WHERE NOT EXISTS (SELECT 1 FROM freight.container_types t WHERE t.code = v.code);
+
+-- 2b. 20ft/40ft containers ride NW5 flat wagons.
+INSERT INTO freight.container_type_wagon_types (container_type_id, wagon_type_id)
+SELECT ct.id, wt.id
+FROM freight.container_types ct
+JOIN freight.wagon_types wt ON wt.code = 'NW5'
+WHERE ct.code IN ('20FT', '40FT')
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.container_type_wagon_types x
+    WHERE x.container_type_id = ct.id AND x.wagon_type_id = wt.id
+  );
+
+-- 3. Pin the derived slot count at 54: the batch engine recomputes
+-- schedule.max_wagons as floor(locoLength / SHORTEST active wagon length)
+-- (syncScheduleMaxWagons). GW2 (12.228 m) is not part of these flows but is
+-- the shortest active type — deactivate it so NW5 (13.966 m) governs, and run
+-- 760 m locos: floor(760 / 13.966) = 54 slots, and 54 NW5 = 754.2 m still
+-- fits the per-edge length budget.
+UPDATE freight.wagon_types SET is_active = false WHERE code = 'GW2' AND is_active;
+
+-- 4. Fourteen locomotives at Djibouti Port. 9000T pull comfortably clears a
+-- 54-wagon container consist; each spec's schedule picks its own pair.
+INSERT INTO freight.locomotives
+  (id, code, max_pull_weight_tons, max_train_length_meters, current_yard_id)
+SELECT gen_random_uuid(), v.code, 9000, 760, y.id
+FROM (VALUES ('LOCO-IMP-1'), ('LOCO-IMP-2'), ('LOCO-IMP-3'), ('LOCO-IMP-4'),
+             ('LOCO-IMP-5'), ('LOCO-IMP-6'), ('LOCO-IMP-7'), ('LOCO-IMP-8'),
+             ('LOCO-IMP-9'), ('LOCO-IMP-10'), ('LOCO-IMP-11'), ('LOCO-IMP-12'),
+             ('LOCO-IMP-13'), ('LOCO-IMP-14'), ('LOCO-IMP-15'), ('LOCO-IMP-16'),
+             ('LOCO-IMP-17'), ('LOCO-IMP-18'), ('LOCO-IMP-19'), ('LOCO-IMP-20'),
+             ('LOCO-IMP-21'), ('LOCO-IMP-22'), ('LOCO-IMP-23'), ('LOCO-IMP-24'),
+             ('LOCO-IMP-25'), ('LOCO-IMP-26'), ('LOCO-IMP-27'), ('LOCO-IMP-28'))
+     AS v(code)
+JOIN freight.yards y ON y.code = 'DJIB_PORT'
+WHERE NOT EXISTS (SELECT 1 FROM freight.locomotives l WHERE l.code = v.code);
+
+-- Prior seeds may have created the fleet at other dimensions — enforce.
+UPDATE freight.locomotives
+SET max_pull_weight_tons = 9000, max_train_length_meters = 760
+WHERE code LIKE 'LOCO-IMP-%'
+  AND (max_pull_weight_tons IS DISTINCT FROM 9000
+       OR max_train_length_meters IS DISTINCT FROM 760);
+
+-- 5. Wagon stock: park every free NW5 flat at Djibouti Port, then move 20 of
+-- them to NAGAD for the sub-corridor boarding scenario. Coupled wagons
+-- (train_id set — e.g. TRN-E2E-1's four) are untouched.
+UPDATE freight.wagons w
+SET current_yard_id = (SELECT id FROM freight.yards WHERE code = 'DJIB_PORT')
+FROM freight.wagon_types wt
+WHERE wt.id = w.wagon_type_id AND wt.code = 'NW5'
+  AND w.train_id IS NULL AND w.deleted_at IS NULL;
+
+UPDATE freight.wagons w
+SET current_yard_id = (SELECT id FROM freight.yards WHERE code = 'NAGAD')
+FROM (
+  SELECT w2.id
+  FROM freight.wagons w2
+  JOIN freight.wagon_types wt ON wt.id = w2.wagon_type_id AND wt.code = 'NW5'
+  WHERE w2.train_id IS NULL AND w2.deleted_at IS NULL
+  ORDER BY w2.wagon_number DESC
+  LIMIT 20
+) pick
+WHERE w.id = pick.id;
+
+-- 5b. Export-corridor rolling stock: the reversed corridor (KALITY →
+-- DJIB_PORT) loads at KALITY, sub-corridor exports board at DIRE_DAWA, and
+-- twelve dedicated locomotives live at KALITY.
+UPDATE freight.wagons w
+SET current_yard_id = (SELECT id FROM freight.yards WHERE code = 'KALITY')
+FROM (
+  SELECT w2.id
+  FROM freight.wagons w2
+  JOIN freight.wagon_types wt ON wt.id = w2.wagon_type_id AND wt.code = 'NW5'
+  JOIN freight.yards y ON y.id = w2.current_yard_id AND y.code = 'DJIB_PORT'
+  WHERE w2.train_id IS NULL AND w2.deleted_at IS NULL
+  ORDER BY w2.wagon_number ASC
+  LIMIT 120
+) pick
+WHERE w.id = pick.id;
+
+UPDATE freight.wagons w
+SET current_yard_id = (SELECT id FROM freight.yards WHERE code = 'DIRE_DAWA')
+FROM (
+  SELECT w2.id
+  FROM freight.wagons w2
+  JOIN freight.wagon_types wt ON wt.id = w2.wagon_type_id AND wt.code = 'NW5'
+  JOIN freight.yards y ON y.id = w2.current_yard_id AND y.code = 'DJIB_PORT'
+  WHERE w2.train_id IS NULL AND w2.deleted_at IS NULL
+  ORDER BY w2.wagon_number ASC
+  LIMIT 20
+) pick
+WHERE w.id = pick.id;
+
+INSERT INTO freight.locomotives
+  (id, code, max_pull_weight_tons, max_train_length_meters, current_yard_id)
+SELECT gen_random_uuid(), v.code, 9000, 760, y.id
+FROM (VALUES ('LOCO-EXP-1'), ('LOCO-EXP-2'), ('LOCO-EXP-3'), ('LOCO-EXP-4'),
+             ('LOCO-EXP-5'), ('LOCO-EXP-6'), ('LOCO-EXP-7'), ('LOCO-EXP-8'),
+             ('LOCO-EXP-9'), ('LOCO-EXP-10'), ('LOCO-EXP-11'), ('LOCO-EXP-12'))
+     AS v(code)
+JOIN freight.yards y ON y.code = 'KALITY'
+WHERE NOT EXISTS (SELECT 1 FROM freight.locomotives l WHERE l.code = v.code);
+
+-- 5b2. Export-bulk rolling stock: the boot CW4 fleet (110) is already spoken
+-- for by the import-bulk specs at DJIB_PORT — mint dedicated e2e CW4 wagons
+-- for the export side: 80 at KALITY (full trains) + 20 at DIRE_DAWA
+-- (sub-corridor boarding).
+INSERT INTO freight.wagons (id, wagon_number, wagon_type_id, current_yard_id)
+SELECT gen_random_uuid(), 'ECW' || lpad(g::text, 4, '0'), wt.id,
+       (SELECT id FROM freight.yards
+        WHERE code = CASE WHEN g <= 80 THEN 'KALITY' ELSE 'DIRE_DAWA' END)
+FROM generate_series(1, 100) AS g
+JOIN freight.wagon_types wt ON wt.code = 'CW4'
+WHERE NOT EXISTS (
+  SELECT 1 FROM freight.wagons w WHERE w.wagon_number = 'ECW' || lpad(g::text, 4, '0')
+);
+
+-- 5b3. Ledger-day rolling stock: wheat may also ride PW2 box wagons, and the
+-- GRAIN train is a BUILT Train-Builder consist — 37 PW2 wagons coupled at
+-- KALITY behind two dedicated locos. A built train's physical wagon count IS
+-- its schedule capacity (37), immune to the loco-length slot recompute.
+INSERT INTO freight.cargo_type_wagon_types (cargo_type_id, wagon_type_id)
+SELECT ct.id, wt.id
+FROM freight.cargo_types ct
+JOIN freight.wagon_types wt ON wt.code = 'PW2'
+WHERE ct.code IN ('E2E_IMP_GRAINS', 'E2E_IMP_WHEAT')
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.cargo_type_wagon_types x
+    WHERE x.cargo_type_id = ct.id AND x.wagon_type_id = wt.id
+  );
+
+INSERT INTO freight.locomotives
+  (id, code, max_pull_weight_tons, max_train_length_meters, current_yard_id)
+SELECT gen_random_uuid(), v.code, 9000, 760, y.id
+FROM (VALUES ('LOCO-LED-1'), ('LOCO-LED-2')) AS v(code)
+JOIN freight.yards y ON y.code = 'KALITY'
+WHERE NOT EXISTS (SELECT 1 FROM freight.locomotives l WHERE l.code = v.code);
+
+INSERT INTO freight.trains
+  (id, code, train_name, capacity_tons, current_yard_id,
+   import_train_number, export_train_number)
+SELECT gen_random_uuid(), 'TRN-LEDGER-PW2', 'Ledger Grain Carrier', 2600, y.id,
+       '9102', '9101'
+FROM freight.yards y
+WHERE y.code = 'KALITY'
+  AND NOT EXISTS (SELECT 1 FROM freight.trains t WHERE t.code = 'TRN-LEDGER-PW2');
+
+INSERT INTO freight.train_locomotives (id, train_id, locomotive_id, sequence_no)
+SELECT gen_random_uuid(), t.id, l.id,
+       row_number() OVER (ORDER BY l.code) - 1
+FROM freight.trains t
+JOIN freight.locomotives l ON l.code IN ('LOCO-LED-1', 'LOCO-LED-2')
+WHERE t.code = 'TRN-LEDGER-PW2'
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.train_locomotives tl
+    WHERE tl.train_id = t.id AND tl.locomotive_id = l.id
+  );
+
+UPDATE freight.wagons w
+SET train_id = t.id,
+    sequence_number = sub.rn,
+    current_yard_id = (SELECT id FROM freight.yards WHERE code = 'KALITY')
+FROM freight.trains t,
+     LATERAL (
+       SELECT w2.id, row_number() OVER (ORDER BY w2.wagon_number) AS rn
+       FROM freight.wagons w2
+       JOIN freight.wagon_types wt ON wt.id = w2.wagon_type_id AND wt.code = 'PW2'
+       WHERE w2.train_id IS NULL AND w2.deleted_at IS NULL
+       ORDER BY w2.wagon_number
+       LIMIT 37
+     ) sub
+WHERE t.code = 'TRN-LEDGER-PW2'
+  AND w.id = sub.id
+  AND NOT EXISTS (SELECT 1 FROM freight.wagons wx WHERE wx.train_id = t.id);
+
+-- 5c. Approved exporter profile — export contracts bill against it
+-- (seed-company.sql only creates the importer).
+INSERT INTO freight.company_profiles (id, company_id, type, status, reference)
+SELECT gen_random_uuid(), c.id, 'exporter', 'active', 'EXP-E2E-0002'
+FROM freight.companies c
+WHERE c.tin = '0102030405'
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.company_profiles p
+    WHERE p.company_id = c.id AND p.type = 'exporter' AND p.deleted_at IS NULL
+  );
+
+-- 6. Segment distances for every consecutive corridor pair (symmetric rows).
+INSERT INTO freight.yard_distances (id, from_yard_id, to_yard_id, distance_km)
+SELECT gen_random_uuid(), a.id, b.id, v.km
+FROM (VALUES
+        ('DJIB_PORT', 'NAGAD',     20),
+        ('NAGAD',     'DIRE_DAWA', 310),
+        ('DIRE_DAWA', 'E2E_AWASH', 200),
+        ('E2E_AWASH', 'MOJO',      250),
+        ('MOJO',      'KALITY',    70)
+     ) AS v(from_code, to_code, km)
+JOIN freight.yards a ON a.code = v.from_code
+JOIN freight.yards b ON b.code = v.to_code
+WHERE NOT EXISTS (
+  SELECT 1 FROM freight.yard_distances d
+  WHERE (d.from_yard_id = a.id AND d.to_yard_id = b.id)
+     OR (d.from_yard_id = b.id AND d.to_yard_id = a.id)
+);
+
+-- 6b. BULK import cargo hierarchy: group "E2E Import Grains" → commodity
+-- "E2E Import Wheat", carried on CW4 covered gondolas (13.976 m — the only
+-- bulk-capable type whose 54-wagon consist still fits the 760 m locos).
+INSERT INTO freight.cargo_types (id, code, cargo_type_name, is_active)
+SELECT gen_random_uuid(), 'E2E_IMP_GRAINS', 'E2E Import Grains', true
+WHERE NOT EXISTS (SELECT 1 FROM freight.cargo_types WHERE code = 'E2E_IMP_GRAINS');
+
+INSERT INTO freight.cargo_types (id, code, cargo_type_name, parent_group_id, is_active)
+SELECT gen_random_uuid(), 'E2E_IMP_WHEAT', 'E2E Import Wheat', g.id, true
+FROM freight.cargo_types g
+WHERE g.code = 'E2E_IMP_GRAINS'
+  AND NOT EXISTS (SELECT 1 FROM freight.cargo_types WHERE code = 'E2E_IMP_WHEAT');
+
+INSERT INTO freight.cargo_type_wagon_types (cargo_type_id, wagon_type_id)
+SELECT ct.id, wt.id
+FROM freight.cargo_types ct
+JOIN freight.wagon_types wt ON wt.code = 'CW4'
+WHERE ct.code IN ('E2E_IMP_GRAINS', 'E2E_IMP_WHEAT')
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.cargo_type_wagon_types x
+    WHERE x.cargo_type_id = ct.id AND x.wagon_type_id = wt.id
+  );
+
+-- 6c. Park the free CW4 fleet for the bulk specs: bulk trains load at
+-- Djibouti Port, a NAGAD pocket serves the sub-corridor scenario and a MOJO
+-- pocket the bulk intercity ride-along. The e2e-minted ECW% wagons are the
+-- EXPORT pocket (KALITY / DIRE_DAWA) — never sweep them to Djibouti.
+UPDATE freight.wagons w
+SET current_yard_id = (SELECT id FROM freight.yards WHERE code = 'DJIB_PORT')
+FROM freight.wagon_types wt
+WHERE wt.id = w.wagon_type_id AND wt.code = 'CW4'
+  AND w.train_id IS NULL AND w.deleted_at IS NULL
+  AND w.wagon_number NOT LIKE 'ECW%';
+
+-- Re-park the export CW4 pocket every seed (the mint above is insert-guarded).
+UPDATE freight.wagons w
+SET current_yard_id = (SELECT id FROM freight.yards
+                       WHERE code = CASE WHEN substring(w.wagon_number FROM 4)::int <= 80
+                                         THEN 'KALITY' ELSE 'DIRE_DAWA' END)
+FROM freight.wagon_types wt
+WHERE wt.id = w.wagon_type_id AND wt.code = 'CW4'
+  AND w.wagon_number LIKE 'ECW%'
+  AND w.train_id IS NULL AND w.deleted_at IS NULL;
+
+UPDATE freight.wagons w
+SET current_yard_id = (SELECT id FROM freight.yards WHERE code = 'NAGAD')
+FROM (
+  SELECT w2.id
+  FROM freight.wagons w2
+  JOIN freight.wagon_types wt ON wt.id = w2.wagon_type_id AND wt.code = 'CW4'
+  WHERE w2.train_id IS NULL AND w2.deleted_at IS NULL
+  ORDER BY w2.wagon_number DESC
+  LIMIT 10
+) pick
+WHERE w.id = pick.id;
+
+UPDATE freight.wagons w
+SET current_yard_id = (SELECT id FROM freight.yards WHERE code = 'MOJO')
+FROM (
+  SELECT w2.id
+  FROM freight.wagons w2
+  JOIN freight.wagon_types wt ON wt.id = w2.wagon_type_id AND wt.code = 'CW4'
+  JOIN freight.yards y ON y.id = w2.current_yard_id AND y.code = 'DJIB_PORT'
+  WHERE w2.train_id IS NULL AND w2.deleted_at IS NULL
+  ORDER BY w2.wagon_number ASC
+  LIMIT 6
+) pick
+WHERE w.id = pick.id;
+
+-- 7. LIVE import rates on every leg the specs book, plus the intercity
+-- ride-along leg (rates are configured in USD and converted per booking).
+INSERT INTO freight.rates
+  (id, rate_type, applies_to, trigger, currency, rate_value, rate_unit, status,
+   origin_yard_id, destination_yard_id, proposed_by_staff_id)
+SELECT gen_random_uuid(), v.rate_type, v.applies_to, 'ALWAYS', 'USD', v.value,
+       v.unit, 'LIVE', a.id, b.id, u.id
+FROM (VALUES
+        ('CONTAINER_IMPORT',    'CONTAINER', 'DJIB_PORT', 'KALITY', 800, 'PER_CONTAINER'),
+        ('CONTAINER_IMPORT',    'CONTAINER', 'DJIB_PORT', 'MOJO',   700, 'PER_CONTAINER'),
+        ('CONTAINER_IMPORT',    'CONTAINER', 'NAGAD',     'KALITY', 650, 'PER_CONTAINER'),
+        ('CONTAINER_IMPORT',    'CONTAINER', 'NAGAD',     'MOJO',   600, 'PER_CONTAINER'),
+        ('INTERCITY_CONTAINER', 'INTERCITY', 'MOJO',      'KALITY', 200, 'PER_CONTAINER'),
+        ('BULK_IMPORT',         'BULK',      'DJIB_PORT', 'KALITY', 30,  'PER_TON'),
+        ('BULK_IMPORT',         'BULK',      'DJIB_PORT', 'MOJO',   28,  'PER_TON'),
+        ('BULK_IMPORT',         'BULK',      'NAGAD',     'KALITY', 26,  'PER_TON'),
+        ('BULK_IMPORT',         'BULK',      'NAGAD',     'MOJO',   25,  'PER_TON'),
+        ('INTERCITY_BULK',      'INTERCITY', 'MOJO',      'KALITY', 10,  'PER_TON'),
+        ('CONTAINER_EXPORT',    'CONTAINER', 'KALITY',    'DJIB_PORT', 800, 'PER_CONTAINER'),
+        ('CONTAINER_EXPORT',    'CONTAINER', 'MOJO',      'DJIB_PORT', 700, 'PER_CONTAINER'),
+        ('CONTAINER_EXPORT',    'CONTAINER', 'DIRE_DAWA', 'DJIB_PORT', 500, 'PER_CONTAINER'),
+        ('INTERCITY_CONTAINER', 'INTERCITY', 'KALITY',    'MOJO',   200, 'PER_CONTAINER'),
+        ('BULK_EXPORT',         'BULK',      'KALITY',    'DJIB_PORT', 30, 'PER_TON'),
+        ('BULK_EXPORT',         'BULK',      'MOJO',      'DJIB_PORT', 25, 'PER_TON'),
+        ('BULK_EXPORT',         'BULK',      'DIRE_DAWA', 'DJIB_PORT', 20, 'PER_TON'),
+        ('INTERCITY_BULK',      'INTERCITY', 'KALITY',    'MOJO',   10,  'PER_TON')
+     ) AS v(rate_type, applies_to, from_code, to_code, value, unit)
+JOIN freight.yards a ON a.code = v.from_code
+JOIN freight.yards b ON b.code = v.to_code
+JOIN iam.users u ON u.email = 'operation@edr.local'
+WHERE NOT EXISTS (
+  SELECT 1 FROM freight.rates r
+  WHERE r.rate_type = v.rate_type
+    AND r.origin_yard_id = a.id AND r.destination_yard_id = b.id
+    AND r.deleted_at IS NULL
+);
diff --git a/e2e/freight/cypress/fixtures/seed-intercity.sql b/e2e/freight/cypress/fixtures/seed-intercity.sql
new file mode 100644
index 000000000..732624ff4
--- /dev/null
+++ b/e2e/freight/cypress/fixtures/seed-intercity.sql
@@ -0,0 +1,131 @@
+-- Arrange-data for flows/intercity_one_time.cy.ts. Idempotent.
+--
+-- The e2e DB boots with yards + a wagon fleet only: no container types, no
+-- locomotives, no Train-Builder train, no yard distances, no routes. The spec
+-- drives route + schedule creation through the UI; this fixture provides only
+-- the infrastructure the UI journey cannot reasonably create in-flow:
+--
+--   1. container types (booking form resolves 20ft/40ft by size_ft)
+--   2. container-type → wagon-type allow-list (wagon planner)
+--   3. two locomotives (a schedulable train needs >= 2)
+--   4. a built Train-Builder train at Mojo with four NW5 flat wagons
+--   5. yard distances for Mojo–Dire Dawa–Djibouti Port (route creation
+--      refuses unconfigured pairs)
+
+-- 1. Container types.
+INSERT INTO freight.container_types (id, code, label, size_ft, is_active)
+SELECT gen_random_uuid(), v.code, v.label, v.size_ft, true
+FROM (VALUES ('20FT', '20FT', 20), ('40FT', '40FT', 40)) AS v(code, label, size_ft)
+WHERE NOT EXISTS (SELECT 1 FROM freight.container_types t WHERE t.code = v.code);
+
+-- 2. 20ft/40ft containers ride NW5 flat wagons.
+INSERT INTO freight.container_type_wagon_types (container_type_id, wagon_type_id)
+SELECT ct.id, wt.id
+FROM freight.container_types ct
+JOIN freight.wagon_types wt ON wt.code = 'NW5'
+WHERE ct.code IN ('20FT', '40FT')
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.container_type_wagon_types x
+    WHERE x.container_type_id = ct.id AND x.wagon_type_id = wt.id
+  );
+
+-- 3. Two locomotives at Mojo (status defaults to AVAILABLE).
+INSERT INTO freight.locomotives
+  (id, code, max_pull_weight_tons, max_train_length_meters, current_yard_id)
+SELECT gen_random_uuid(), v.code, 4000, 760, y.id
+FROM (VALUES ('LOCO-E2E-1'), ('LOCO-E2E-2')) AS v(code)
+JOIN freight.yards y ON y.code = 'MOJO'
+WHERE NOT EXISTS (SELECT 1 FROM freight.locomotives l WHERE l.code = v.code);
+
+-- 4a. Built train at Mojo (status defaults to AVAILABLE).
+INSERT INTO freight.trains (id, code, train_name, capacity_tons, current_yard_id)
+SELECT gen_random_uuid(), 'TRN-E2E-1', 'E2E Export Carrier', 2000, y.id
+FROM freight.yards y
+WHERE y.code = 'MOJO'
+  AND NOT EXISTS (SELECT 1 FROM freight.trains t WHERE t.code = 'TRN-E2E-1');
+
+-- 4b. Couple both locomotives (available-trains filter requires >= 2).
+INSERT INTO freight.train_locomotives (id, train_id, locomotive_id, sequence_no)
+SELECT gen_random_uuid(), t.id, l.id,
+       row_number() OVER (ORDER BY l.code) - 1
+FROM freight.trains t
+JOIN freight.locomotives l ON l.code IN ('LOCO-E2E-1', 'LOCO-E2E-2')
+WHERE t.code = 'TRN-E2E-1'
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.train_locomotives tl
+    WHERE tl.train_id = t.id AND tl.locomotive_id = l.id
+  );
+
+-- 4c. Couple four free NW5 flat wagons onto the train and park them at Mojo
+-- with it (the seeded fleet sits at Doraleh; the planner reads the consist by
+-- train_id, the yard only matters for warnings).
+UPDATE freight.wagons w
+SET train_id = t.id,
+    sequence_number = sub.rn,
+    current_yard_id = (SELECT id FROM freight.yards WHERE code = 'MOJO')
+FROM freight.trains t,
+     LATERAL (
+       SELECT w2.id, row_number() OVER (ORDER BY w2.wagon_number) AS rn
+       FROM freight.wagons w2
+       JOIN freight.wagon_types wt ON wt.id = w2.wagon_type_id AND wt.code = 'NW5'
+       WHERE w2.train_id IS NULL AND w2.deleted_at IS NULL
+       ORDER BY w2.wagon_number
+       LIMIT 4
+     ) sub
+WHERE t.code = 'TRN-E2E-1'
+  AND w.id = sub.id
+  AND NOT EXISTS (SELECT 1 FROM freight.wagons wx WHERE wx.train_id = t.id);
+
+-- 4d. One REQUIRED intercity clearance document, so the journey exercises the
+-- real customer-upload → ops-review → finalize step (the seeder leaves the
+-- intercity_documents setting empty).
+INSERT INTO freight.file_upload_fields
+  (id, setting_id, file_key, file_label, is_required, is_multiple, max_files,
+   allowed_extensions, max_size_mb, display_order)
+SELECT gen_random_uuid(), s.id, 'cargo_manifest', 'Cargo Manifest', true, false, 1,
+       '{pdf,jpg,jpeg,png}'::text[], 10, 1
+FROM freight.file_upload_settings s
+WHERE s.code = 'intercity_documents'
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.file_upload_fields f
+    WHERE f.setting_id = s.id AND f.file_key = 'cargo_manifest' AND f.deleted_at IS NULL
+  );
+
+-- 5. LIVE intercity container rate for Mojo → Dire Dawa (booking pricing
+-- hard-blocks any container line without a rate on its exact leg; rates are
+-- configured in USD and converted to the booking currency).
+INSERT INTO freight.rates
+  (id, rate_type, applies_to, trigger, currency, rate_value, rate_unit, status,
+   origin_yard_id, destination_yard_id, proposed_by_staff_id)
+SELECT gen_random_uuid(), 'INTERCITY_CONTAINER', 'INTERCITY', 'ALWAYS', 'USD', 500,
+       'PER_CONTAINER', 'LIVE', a.id, b.id, u.id
+FROM freight.yards a
+JOIN freight.yards b ON b.code = 'DIRE_DAWA'
+JOIN iam.users u ON u.email = 'operation@edr.local'
+WHERE a.code = 'MOJO'
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.rates r
+    WHERE r.rate_type = 'INTERCITY_CONTAINER'
+      AND r.origin_yard_id = a.id AND r.destination_yard_id = b.id
+      AND r.deleted_at IS NULL
+  );
+
+-- 6. Segment distances (symmetric — one row covers both directions). Guarded:
+-- an e2e image built from a branch that predates the yard_distances feature
+-- has no table, and its route form doesn't require distances either.
+DO $$
+BEGIN
+  IF to_regclass('freight.yard_distances') IS NOT NULL THEN
+    INSERT INTO freight.yard_distances (id, from_yard_id, to_yard_id, distance_km)
+    SELECT gen_random_uuid(), a.id, b.id, v.km
+    FROM (VALUES ('MOJO', 'DIRE_DAWA', 300), ('DIRE_DAWA', 'DJIB_PORT', 450))
+           AS v(from_code, to_code, km)
+    JOIN freight.yards a ON a.code = v.from_code
+    JOIN freight.yards b ON b.code = v.to_code
+    WHERE NOT EXISTS (
+      SELECT 1 FROM freight.yard_distances d
+      WHERE (d.from_yard_id = a.id AND d.to_yard_id = b.id)
+         OR (d.from_yard_id = b.id AND d.to_yard_id = a.id)
+    );
+  END IF;
+END $$;
diff --git a/e2e/freight/cypress/fixtures/seed-segment-weight.sql b/e2e/freight/cypress/fixtures/seed-segment-weight.sql
new file mode 100644
index 000000000..d106bb059
--- /dev/null
+++ b/e2e/freight/cypress/fixtures/seed-segment-weight.sql
@@ -0,0 +1,175 @@
+-- Arrange-data for flows/segment_weight.cy.ts. Idempotent.
+-- Run AFTER seed-intercity.sql + seed-export.sql (container types, E2E_WHEAT
+-- cargo, Mojo→Djibouti rates, yard distances come from those).
+--
+-- Two dedicated trains on the Mojo → Dire Dawa → Djibouti Port corridor:
+--
+--   TRN-SEG-W ("tolerance train")  — locos 240T pull; LOCO-SEG-A carries a 90T
+--     overage tolerance, LOCO-SEG-B has NONE CONFIGURED (null). The S-2026-00024
+--     regression pair: min-across-locos must keep the 90, not zero it.
+--     Consist: 2 CW4 (bulk) + 2 NW5 (containers).
+--
+--   TRN-SEG-F ("border-full train") — locos 200T pull, no tolerance.
+--     Consist: 4 NW5. An 8×20ft export boarding at Dire Dawa commits every
+--     wagon on the border edge → the train goes FULL for its trade direction
+--     while the Mojo→Dire leg stays free: an intercity ride-along boards the
+--     SAME wagons there and alights before the export loads them.
+--
+-- Wagons are dedicated inserts (WGN-SEG-*) so the fixture never competes with
+-- other specs for free fleet stock, and the corridor targets NAGAD (not
+-- DJIB_PORT) so no other spec's same-day schedule can steal FCFS bookings.
+
+-- 0. Reset any PREVIOUS segment-weight run (namespaced: TRN-SEG-* trains,
+-- CTR-SEG-* contracts, WGN-SEG-* wagons) so the spec re-runs on a warm DB.
+-- Everything is age-guarded (45 min): Cypress re-runs the spec's before()
+-- hook on cross-origin reloads, and an unguarded reset would soft-delete the
+-- CURRENT run's own schedules and contracts mid-flight. Consequence: rerun
+-- the spec no sooner than 45 minutes after a crashed run (or restack).
+UPDATE freight.train_schedules ts
+SET deleted_at = now(), booking_window_status = 'CLOSED'
+WHERE ts.deleted_at IS NULL
+  AND ts.created_at < now() - interval '45 minutes'
+  AND ts.train_set_id IN (
+    SELECT se.id FROM freight.train_sets se
+    JOIN freight.trains t ON t.id = se.train_id
+    WHERE t.code LIKE 'TRN-SEG-%'
+  );
+
+UPDATE freight.wagon_booking_allocations a
+SET deleted_at = now()
+WHERE a.deleted_at IS NULL
+  AND a.booking_id IN (
+    SELECT b.id FROM freight.bookings b
+    JOIN freight.contracts c ON c.id = b.contract_id
+    WHERE c.reference LIKE 'CTR-SEG-%'
+      AND c.created_at < now() - interval '45 minutes'
+  );
+
+UPDATE freight.bookings b
+SET deleted_at = now()
+WHERE b.deleted_at IS NULL
+  AND b.contract_id IN (
+    SELECT id FROM freight.contracts
+    WHERE reference LIKE 'CTR-SEG-%'
+      AND created_at < now() - interval '45 minutes'
+  );
+
+UPDATE freight.contracts
+SET deleted_at = now()
+WHERE deleted_at IS NULL
+  AND reference LIKE 'CTR-SEG-%'
+  AND created_at < now() - interval '45 minutes';
+
+-- Un-pin only wagons whose pin points at a dead schedule — live pins from the
+-- current run must survive a mid-run re-seed.
+UPDATE freight.wagons w
+SET current_train_schedule_id = NULL,
+    train_set_wagon_id = NULL,
+    current_yard_id = (SELECT id FROM freight.yards WHERE code = 'MOJO')
+WHERE w.wagon_number LIKE 'WGN-SEG-%'
+  AND w.current_train_schedule_id IS NOT NULL
+  AND w.current_train_schedule_id IN (
+    SELECT id FROM freight.train_schedules WHERE deleted_at IS NOT NULL
+  );
+
+-- 1. Locomotives at Mojo.
+INSERT INTO freight.locomotives
+  (id, code, max_pull_weight_tons, max_train_length_meters,
+   overage_tolerance_tons, current_yard_id)
+SELECT gen_random_uuid(), v.code, v.pull, 760, v.tol, y.id
+FROM (VALUES
+        ('LOCO-SEG-A', 240, 90),
+        ('LOCO-SEG-B', 240, NULL),
+        ('LOCO-SEG-C', 200, NULL),
+        ('LOCO-SEG-D', 200, NULL)
+     ) AS v(code, pull, tol)
+JOIN freight.yards y ON y.code = 'MOJO'
+WHERE NOT EXISTS (SELECT 1 FROM freight.locomotives l WHERE l.code = v.code);
+
+-- 2. Built trains at Mojo.
+INSERT INTO freight.trains (id, code, train_name, capacity_tons, current_yard_id)
+SELECT gen_random_uuid(), v.code, v.name, 2000, y.id
+FROM (VALUES
+        ('TRN-SEG-W', 'E2E Tolerance Carrier'),
+        ('TRN-SEG-F', 'E2E Border-Full Carrier')
+     ) AS v(code, name)
+JOIN freight.yards y ON y.code = 'MOJO'
+WHERE NOT EXISTS (SELECT 1 FROM freight.trains t WHERE t.code = v.code);
+
+-- 3. Couple the locomotive pairs (schedulable trains need >= 2 locos).
+INSERT INTO freight.train_locomotives (id, train_id, locomotive_id, sequence_no)
+SELECT gen_random_uuid(), t.id, l.id, v.seq
+FROM (VALUES
+        ('TRN-SEG-W', 'LOCO-SEG-A', 0),
+        ('TRN-SEG-W', 'LOCO-SEG-B', 1),
+        ('TRN-SEG-F', 'LOCO-SEG-C', 0),
+        ('TRN-SEG-F', 'LOCO-SEG-D', 1)
+     ) AS v(train_code, loco_code, seq)
+JOIN freight.trains t ON t.code = v.train_code
+JOIN freight.locomotives l ON l.code = v.loco_code
+WHERE NOT EXISTS (
+  SELECT 1 FROM freight.train_locomotives tl
+  WHERE tl.train_id = t.id AND tl.locomotive_id = l.id
+);
+
+-- 4. Dedicated wagons, parked at Mojo.
+INSERT INTO freight.wagons (id, wagon_number, wagon_type_id, current_yard_id)
+SELECT gen_random_uuid(), v.num, wt.id, y.id
+FROM (VALUES
+        ('WGN-SEG-C1', 'CW4'), ('WGN-SEG-C2', 'CW4'),
+        ('WGN-SEG-N1', 'NW5'), ('WGN-SEG-N2', 'NW5'),
+        ('WGN-SEG-N3', 'NW5'), ('WGN-SEG-N4', 'NW5'),
+        ('WGN-SEG-N5', 'NW5'), ('WGN-SEG-N6', 'NW5')
+     ) AS v(num, wt_code)
+JOIN freight.wagon_types wt ON wt.code = v.wt_code
+JOIN freight.yards y ON y.code = 'MOJO'
+WHERE NOT EXISTS (SELECT 1 FROM freight.wagons w WHERE w.wagon_number = v.num);
+
+-- 5. Couple them: W = 2 CW4 + 2 NW5, F = 4 NW5.
+UPDATE freight.wagons w
+SET train_id = t.id, sequence_number = v.seq
+FROM freight.trains t,
+     (VALUES
+        ('WGN-SEG-C1', 'TRN-SEG-W', 1), ('WGN-SEG-C2', 'TRN-SEG-W', 2),
+        ('WGN-SEG-N1', 'TRN-SEG-W', 3), ('WGN-SEG-N2', 'TRN-SEG-W', 4),
+        ('WGN-SEG-N3', 'TRN-SEG-F', 1), ('WGN-SEG-N4', 'TRN-SEG-F', 2),
+        ('WGN-SEG-N5', 'TRN-SEG-F', 3), ('WGN-SEG-N6', 'TRN-SEG-F', 4)
+     ) AS v(num, train_code, seq)
+WHERE w.wagon_number = v.num
+  AND t.code = v.train_code
+  AND w.train_id IS DISTINCT FROM t.id;
+
+-- 6. LIVE export rates for the NAGAD corridor: bulk from Mojo (tolerance
+-- train's wheat) and container from Dire Dawa (border-full scenario's
+-- mid-route export).
+INSERT INTO freight.rates
+  (id, rate_type, applies_to, trigger, currency, rate_value, rate_unit, status,
+   origin_yard_id, destination_yard_id, proposed_by_staff_id)
+SELECT gen_random_uuid(), v.rate_type, v.applies_to, 'ALWAYS', 'USD', v.value,
+       v.unit, 'LIVE', a.id, b.id, u.id
+FROM (VALUES
+        ('BULK_EXPORT', 'BULK', 'MOJO', 25, 'PER_TON'),
+        ('CONTAINER_EXPORT', 'CONTAINER', 'DIRE_DAWA', 600, 'PER_CONTAINER')
+     ) AS v(rate_type, applies_to, origin_code, value, unit)
+JOIN freight.yards a ON a.code = v.origin_code
+JOIN freight.yards b ON b.code = 'NAGAD'
+JOIN iam.users u ON u.email = 'operation@edr.local'
+WHERE NOT EXISTS (
+  SELECT 1 FROM freight.rates r
+  WHERE r.rate_type = v.rate_type
+    AND r.origin_yard_id = a.id AND r.destination_yard_id = b.id
+    AND r.deleted_at IS NULL
+);
+
+-- 7. Segment distance for the new corridor's border leg (Mojo–Dire comes
+-- from seed-intercity.sql).
+INSERT INTO freight.yard_distances (id, from_yard_id, to_yard_id, distance_km)
+SELECT gen_random_uuid(), a.id, b.id, 460
+FROM freight.yards a
+JOIN freight.yards b ON b.code = 'NAGAD'
+WHERE a.code = 'DIRE_DAWA'
+  AND NOT EXISTS (
+    SELECT 1 FROM freight.yard_distances d
+    WHERE (d.from_yard_id = a.id AND d.to_yard_id = b.id)
+       OR (d.from_yard_id = b.id AND d.to_yard_id = a.id)
+  );
diff --git a/e2e/freight/cypress/fixtures/seed-users.sql b/e2e/freight/cypress/fixtures/seed-users.sql
new file mode 100644
index 000000000..5f42e3d5f
--- /dev/null
+++ b/e2e/freight/cypress/fixtures/seed-users.sql
@@ -0,0 +1,137 @@
+-- Test users for the freight e2e stack — replicates what the (disabled)
+-- FreightStaffUsersSeeder + DemoUsersSeeder would write, without touching
+-- API code. Idempotent: every insert is guarded by WHERE NOT EXISTS.
+--
+-- Prerequisites (created by the API's always-on boot seeders):
+--   iam.organizations key='edr_freight', iam.units key='edr_freight_app',
+--   iam.positions keys ceo/chief/director/marketer/operation/ethiopian_gl/djibouti_gl.
+--
+-- Passwords are pre-hashed (argon2id):
+--   staff  (@edr.local)  → password@tria
+--   demo   (gmail.com)   → 12345678
+
+-- ── Demo organization ────────────────────────────────────────────────────────
+insert into iam.organizations (id, name, key, is_super_admin, is_government_organization, status)
+select gen_random_uuid(), '{"en":"Demo IAM"}'::jsonb, 'demo_iam', false, true, 'Active'
+where not exists (select 1 from iam.organizations where key = 'demo_iam');
+
+-- ── Roles ────────────────────────────────────────────────────────────────────
+insert into iam.roles (id, key, name)
+select gen_random_uuid(), v.key, jsonb_build_object('en', v.name)
+from (values
+  ('edr_line_staff',         'edr_line_staff'),
+  ('edr_org_manager',        'edr_org_manager'),
+  ('edr_director',           'edr_director'),
+  ('edr_ceo',                'edr_ceo'),
+  ('edr_marketing',          'edr_marketing'),
+  ('edr_operations_officer', 'edr_operations_officer'),
+  ('edr_gl_ethiopia',        'edr_gl_ethiopia'),
+  ('edr_gl_djibouti',        'edr_gl_djibouti'),
+  ('demo_user1',             'Demo User1'),
+  ('demo_user2',             'Demo User2')
+) v(key, name)
+where not exists (select 1 from iam.roles r where r.key = v.key);
+
+-- ── Demo permissions + role grants ───────────────────────────────────────────
+insert into iam.permissions (id, key, name)
+select gen_random_uuid(), v.key, jsonb_build_object('en', v.name)
+from (values
+  ('can:demo:user1', 'Can access demo user1'),
+  ('can:demo:user2', 'Can access demo user2')
+) v(key, name)
+where not exists (select 1 from iam.permissions p where p.key = v.key);
+
+insert into iam.role_permissions (id, role_id, permission_id)
+select gen_random_uuid(), r.id, p.id
+from (values ('demo_user1', 'can:demo:user1'), ('demo_user2', 'can:demo:user2')) v(role_key, perm_key)
+join iam.roles r on r.key = v.role_key
+join iam.permissions p on p.key = v.perm_key
+where not exists (
+  select 1 from iam.role_permissions rp where rp.role_id = r.id and rp.permission_id = p.id
+);
+
+-- ── Users ────────────────────────────────────────────────────────────────────
+insert into iam.users (id, email, username, name, status, is_active, has_set_password, user_type)
+select gen_random_uuid(), v.email, v.username, jsonb_build_object('en', v.display),
+       'accepted', true, true, 'employee'
+from (values
+  ('linestaff@edr.local', 'linestaff', 'linestaff'),
+  ('chief@edr.local',     'chief',     'chief'),
+  ('director@edr.local',  'director',  'director'),
+  ('ceo@edr.local',       'ceo',       'ceo'),
+  ('marketer@edr.local',  'marketer',  'marketer'),
+  ('operation@edr.local', 'operation', 'operation'),
+  ('gl-et@edr.local',     'gl_et',     'gl_et'),
+  ('gl-dj@edr.local',     'gl_dj',     'gl_dj'),
+  ('user@gmail.com',      'user',      'Demo User 1'),
+  ('user2@gmail.com',     'user2',     'Demo User 2')
+) v(email, username, display)
+where not exists (select 1 from iam.users u where u.email = v.email);
+
+-- ── Credentials ──────────────────────────────────────────────────────────────
+insert into iam.user_credentials (id, user_id, password, is_active)
+select gen_random_uuid(), u.id,
+       case when u.email like '%@edr.local'
+         then '$argon2id$v=19$m=65536,t=3,p=4$JFEcHu4Kp55fsrVDPbHDPg$0NfnGzaE39T/qdmzte73oCkohC0Ri+f8DcrvAF4kyH4'  -- password@tria
+         else '$argon2id$v=19$m=65536,t=3,p=4$aBwVFf7I74pqSJqe9cBoig$gCIKa+6dCAb2X86G+0IjgPtil127cx6A6mwhvLj00Bw'  -- 12345678
+       end,
+       true
+from iam.users u
+where (u.email like '%@edr.local' or u.email in ('user@gmail.com', 'user2@gmail.com'))
+  and not exists (select 1 from iam.user_credentials c where c.user_id = u.id);
+
+-- ── User → role (staff under edr_freight, demo under demo_iam) ──────────────
+insert into iam.user_roles (id, user_id, role_id, organization_id)
+select gen_random_uuid(), u.id, r.id, o.id
+from (values
+  ('linestaff@edr.local', 'edr_line_staff',         'edr_freight'),
+  ('chief@edr.local',     'edr_org_manager',        'edr_freight'),
+  ('director@edr.local',  'edr_director',           'edr_freight'),
+  ('ceo@edr.local',       'edr_ceo',                'edr_freight'),
+  ('marketer@edr.local',  'edr_marketing',          'edr_freight'),
+  ('operation@edr.local', 'edr_operations_officer', 'edr_freight'),
+  ('gl-et@edr.local',     'edr_gl_ethiopia',        'edr_freight'),
+  ('gl-dj@edr.local',     'edr_gl_djibouti',        'edr_freight'),
+  ('user@gmail.com',      'demo_user1',             'demo_iam'),
+  ('user2@gmail.com',     'demo_user2',             'demo_iam')
+) v(email, role_key, org_key)
+join iam.users u on u.email = v.email
+join iam.roles r on r.key = v.role_key
+join iam.organizations o on o.key = v.org_key
+where not exists (select 1 from iam.user_roles ur where ur.user_id = u.id and ur.role_id = r.id);
+
+-- ── Staff employees + position assignment (drives permissions) ───────────────
+insert into iam.employees (id, is_current, status, name, organization_id, unit_id, user_id)
+select gen_random_uuid(), true, 'pending', u.name, o.id, un.id, u.id
+from iam.users u
+join iam.organizations o on o.key = 'edr_freight'
+join iam.units un on un.key = 'edr_freight_app' and un.organization_id = o.id
+where u.email like '%@edr.local'
+  and not exists (select 1 from iam.employees e where e.user_id = u.id);
+
+-- start_date must be set: the login query filters positions on
+-- start_date <= NOW(), and a NULL start_date silently drops the position
+-- (and with it every permission) from the JWT.
+insert into iam.employee_positions (id, is_delegate, is_current, status, start_date, unit_id, employee_id, position_id)
+select gen_random_uuid(), false, true, 'APPROVED', now() - interval '1 day', un.id, e.id, p.id
+from (values
+  ('linestaff@edr.local', 'operation'),
+  ('chief@edr.local',     'chief'),
+  ('director@edr.local',  'director'),
+  ('ceo@edr.local',       'ceo'),
+  ('marketer@edr.local',  'marketer'),
+  ('operation@edr.local', 'operation'),
+  ('gl-et@edr.local',     'ethiopian_gl'),
+  ('gl-dj@edr.local',     'djibouti_gl')
+) v(email, position_key)
+join iam.users u on u.email = v.email
+join iam.employees e on e.user_id = u.id
+join iam.units un on un.key = 'edr_freight_app'
+join iam.positions p on p.key = v.position_key and p.unit_id = un.id
+where not exists (
+  select 1 from iam.employee_positions ep where ep.employee_id = e.id and ep.position_id = p.id
+);
+
+-- Backfill for rows created before start_date was included above.
+update iam.employee_positions set start_date = now() - interval '1 day'
+where start_date is null;
diff --git a/e2e/freight/cypress/fixtures/users.json b/e2e/freight/cypress/fixtures/users.json
new file mode 100644
index 000000000..88c56149f
--- /dev/null
+++ b/e2e/freight/cypress/fixtures/users.json
@@ -0,0 +1,16 @@
+{
+  "staff": {
+    "lineStaff": { "email": "linestaff@edr.local", "role": "edr_line_staff" },
+    "chief": { "email": "chief@edr.local", "role": "edr_org_manager" },
+    "director": { "email": "director@edr.local", "role": "edr_director" },
+    "ceo": { "email": "ceo@edr.local", "role": "edr_ceo" },
+    "marketer": { "email": "marketer@edr.local", "role": "edr_marketing" },
+    "operation": { "email": "operation@edr.local", "role": "edr_operations_officer" },
+    "glEthiopia": { "email": "gl-et@edr.local", "role": "edr_gl_ethiopia" },
+    "glDjibouti": { "email": "gl-dj@edr.local", "role": "edr_gl_djibouti" }
+  },
+  "customers": {
+    "demo1": { "email": "user@gmail.com" },
+    "demo2": { "email": "user2@gmail.com" }
+  }
+}
diff --git a/e2e/freight/cypress/support/commands.ts b/e2e/freight/cypress/support/commands.ts
new file mode 100644
index 000000000..2d18350a0
--- /dev/null
+++ b/e2e/freight/cypress/support/commands.ts
@@ -0,0 +1,179 @@
+/**
+ * Auth model (see apps/edr-freight-api + freight web apps):
+ *  - POST {api}/api/auth/login  { email, password }
+ *    → flattened body { success, token, refreshToken } (response interceptor
+ *      flattens /api/auth responses — no .data nesting).
+ *  - Both web apps read cookies `auth-token` / `refresh-token` and attach
+ *    `Authorization: Bearer <token>`.
+ *  - Cookies are port-agnostic on localhost, so portal and backoffice share
+ *    one cookie jar. cy.session snapshots/restores cookies per session id,
+ *    which keeps staff and customer sessions from clobbering each other —
+ *    but inside a single test, switching apps requires re-invoking the
+ *    matching login command first (see flows specs).
+ */
+
+export interface LoginBody {
+  success: boolean;
+  token: string;
+  refreshToken: string;
+}
+
+const apiUrl = () => Cypress.env("apiUrl") as string;
+const password = () => Cypress.env("defaultPassword") as string;
+
+function apiLogin(email: string, pass?: string): Cypress.Chainable<LoginBody> {
+  return cy
+    .request<LoginBody>("POST", `${apiUrl()}/api/auth/login`, {
+      email,
+      password: pass ?? password(),
+    })
+    .then((response) => {
+      expect(response.status).to.eq(201);
+      expect(response.body.token, "login token").to.be.a("string");
+      return cy.wrap(response.body, { log: false });
+    });
+}
+
+function sessionFor(app: "backoffice" | "portal", email: string, pass?: string) {
+  cy.session(
+    [app, email],
+    () => {
+      apiLogin(email, pass).then(({ token, refreshToken }) => {
+        cy.setCookie("auth-token", token);
+        cy.setCookie("refresh-token", refreshToken);
+      });
+    },
+    {
+      cacheAcrossSpecs: true,
+      validate() {
+        cy.getCookie("auth-token").then((cookie) => {
+          expect(cookie, "auth-token cookie").to.exist;
+          cy.request({
+            url: `${apiUrl()}/api/me`,
+            headers: { Authorization: `Bearer ${cookie!.value}` },
+          })
+            .its("status")
+            .should("eq", 200);
+        });
+      },
+    },
+  );
+}
+
+Cypress.Commands.add("apiLogin", (email: string, pass?: string) => apiLogin(email, pass));
+
+Cypress.Commands.add("loginBackoffice", (email = "ceo@edr.local", pass?: string) => {
+  sessionFor("backoffice", email, pass);
+});
+
+Cypress.Commands.add("loginPortal", (email = "user@gmail.com", pass?: string) => {
+  // Demo portal users are seeded with a hardcoded password (DemoUsersSeeder),
+  // unlike staff users which use DEFAULT_PASSWORD.
+  sessionFor("portal", email, pass ?? (Cypress.env("demoPassword") as string));
+});
+
+Cypress.Commands.add("visitPortal", (path = "/") => {
+  cy.visit(`${Cypress.env("portalUrl")}${path}`);
+});
+
+/**
+ * Read the latest OTP the API generated for a contact. SMS/email delivery is
+ * disabled in e2e (RABBITMQ_ENABLED=false) but the code is still stored in
+ * freight.otp_verifications — keyed by normalized email (lowercased) or E.164
+ * phone. Polls because the row is written async to the UI action.
+ */
+Cypress.Commands.add("getOtp", (target: string) => {
+  const read = (attempt: number): Cypress.Chainable<string> =>
+    cy
+      .task<{ rows: Array<{ otp: string }> }>(
+        "db:query",
+        {
+          sql: `SELECT otp FROM freight.otp_verifications
+                WHERE email = $1 OR phone = $1
+                ORDER BY updated_at DESC LIMIT 1`,
+          params: [target],
+        },
+        { log: false },
+      )
+      .then((res) => {
+        if (res.rows.length > 0) return cy.wrap(res.rows[0].otp, { log: false });
+        expect(attempt, `OTP row for ${target}`).to.be.lessThan(20);
+        return cy.wait(500, { log: false }).then(() => read(attempt + 1));
+      });
+  return read(0);
+});
+
+/** Open a Mantine <Select> by its label and pick an option by exact text. */
+Cypress.Commands.add("mantineSelect", (label: string | RegExp, option: string | RegExp) => {
+  cy.contains("label", label)
+    .invoke("attr", "for")
+    .then((id) => {
+      cy.get(`[id="${id}"]`).click({ force: true });
+    });
+  // :visible — closed dropdowns can linger in the DOM, and two selects on one
+  // page may list the same option text (e.g. the intercity wizard's origin +
+  // destination both list every Ethiopian yard).
+  cy.get('[role="option"]:visible').contains(option).click();
+});
+
+/** Type a 6-digit code into a Mantine PinInput. */
+Cypress.Commands.add("typeOtp", (code: string) => {
+  cy.get(".mantine-PinInput-root input").should("have.length.at.least", code.length);
+  code.split("").forEach((digit, i) => {
+    cy.get(".mantine-PinInput-root input").eq(i).type(digit, { force: true });
+  });
+});
+
+/**
+ * Draw a squiggle on the signature-pad canvas (mouse events). When the account
+ * already has a saved signature the modal opens in "Approve signature" mode
+ * with no canvas — nothing to draw, the saved image is used as-is.
+ */
+Cypress.Commands.add("drawSignature", () => {
+  cy.get(".mantine-Modal-content").then(($modals) => {
+    if ($modals.find("canvas").length === 0) return;
+    drawOnCanvas();
+  });
+});
+
+function drawOnCanvas() {
+  cy.get(".mantine-Modal-content canvas")
+    .first()
+    .then(($canvas) => {
+      const rect = $canvas[0].getBoundingClientRect();
+      const midX = rect.left + rect.width / 2;
+      const midY = rect.top + rect.height / 2;
+      cy.wrap($canvas)
+        .trigger("mousedown", { clientX: midX - 60, clientY: midY, force: true })
+        .trigger("mousemove", { clientX: midX - 20, clientY: midY - 15, force: true })
+        .trigger("mousemove", { clientX: midX + 20, clientY: midY + 15, force: true })
+        .trigger("mousemove", { clientX: midX + 60, clientY: midY, force: true })
+        .trigger("mouseup", { force: true });
+    });
+}
+
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace Cypress {
+    interface Chainable {
+      /** POST /api/auth/login, returns the flattened token body. */
+      apiLogin(email: string, pass?: string): Chainable<LoginBody>;
+      /** Cached programmatic staff session (default ceo@edr.local). */
+      loginBackoffice(email?: string, pass?: string): Chainable<void>;
+      /** Cached programmatic customer session (default user@gmail.com). */
+      loginPortal(email?: string, pass?: string): Chainable<void>;
+      /** cy.visit against the portal origin (env.portalUrl). */
+      visitPortal(path?: string): Chainable<void>;
+      /** Latest OTP stored for an email/phone (delivery is off in e2e). */
+      getOtp(target: string): Chainable<string>;
+      /** Open a Mantine Select by label, pick an option. */
+      mantineSelect(label: string | RegExp, option: string | RegExp): Chainable<void>;
+      /** Fill a Mantine PinInput with a code. */
+      typeOtp(code: string): Chainable<void>;
+      /** Scribble on the signature-pad canvas inside the open modal. */
+      drawSignature(): Chainable<void>;
+    }
+  }
+}
+
+export {};
diff --git a/e2e/freight/cypress/support/e2e.ts b/e2e/freight/cypress/support/e2e.ts
new file mode 100644
index 000000000..49bc8540b
--- /dev/null
+++ b/e2e/freight/cypress/support/e2e.ts
@@ -0,0 +1,18 @@
+import "./commands";
+
+// The API's user seeders are disabled in app code — the SQL fixture creates
+// the staff + demo test users instead. Idempotent, runs before each spec file.
+before(() => {
+  cy.task("db:seedUsers");
+});
+
+// Third-party noise (PostHog, Google Maps, socket.io reconnects) can throw
+// uncaught exceptions that are irrelevant to the assertion under test. App
+// errors still fail tests via failed assertions / failed intercepts.
+Cypress.on("uncaught:exception", (err) => {
+  const ignorable = [/posthog/i, /google/i, /websocket/i, /socket\.io/i, /ResizeObserver/i];
+  if (ignorable.some((pattern) => pattern.test(err.message))) {
+    return false;
+  }
+  return true;
+});
diff --git a/e2e/freight/package.json b/e2e/freight/package.json
new file mode 100644
index 000000000..4097b09da
--- /dev/null
+++ b/e2e/freight/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@edr/freight-e2e",
+  "version": "0.0.0",
+  "private": true,
+  "description": "Cypress end-to-end tests for the EDR freight system (portal + backoffice + API)",
+  "scripts": {
+    "cy:open": "cypress open --e2e",
+    "cy:run": "cypress run",
+    "cy:run:backoffice": "cypress run --spec 'cypress/e2e/backoffice/**'",
+    "cy:run:portal": "cypress run --spec 'cypress/e2e/portal/**'",
+    "cy:run:api": "cypress run --spec 'cypress/e2e/api/**'",
+    "cy:run:flows": "cypress run --spec 'cypress/e2e/flows/**'",
+    "type-check": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "cypress": "^15.3.0",
+    "pg": "^8.13.0",
+    "typescript": "^5.5.4",
+    "@types/node": "^22.0.0",
+    "@types/pg": "^8.11.0"
+  }
+}
diff --git a/e2e/freight/scripts/e2e.mjs b/e2e/freight/scripts/e2e.mjs
new file mode 100644
index 000000000..81c8bf216
--- /dev/null
+++ b/e2e/freight/scripts/e2e.mjs
@@ -0,0 +1,193 @@
+#!/usr/bin/env node
+/**
+ * Freight e2e launcher — one command, no manual steps:
+ *
+ *   node e2e/freight/scripts/e2e.mjs <up|run|open|ci|down> [cypress args...]
+ *
+ * - run/open/ci auto-start the docker stack (build + wait healthy) if it
+ *   isn't already running, then launch Cypress pointed at the right ports.
+ * - Host ports default to 3101/5373/5383/5533/9310/9311; any default that is
+ *   busy is replaced by the next free port. Chosen ports are written to
+ *   e2e/freight/.e2e-ports.json (gitignored) and reused while the stack is
+ *   up, so cypress and compose always agree.
+ * - Extra args are forwarded to Cypress: `pnpm e2e:freight:run --spec ...`.
+ *
+ * No dependencies — plain Node, spawns `docker compose` and `pnpm`.
+ */
+
+import { execFileSync, spawnSync } from "node:child_process";
+import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { createServer } from "node:net";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const e2eDir = resolve(dirname(fileURLToPath(import.meta.url)), "..");
+const repoRoot = resolve(e2eDir, "..", "..");
+const stateFile = join(e2eDir, ".e2e-ports.json");
+const composeBase = ["compose", "-f", join(repoRoot, "docker-compose.e2e.yaml")];
+
+const DEFAULT_PORTS = {
+  E2E_API_PORT: 3101,
+  E2E_PORTAL_PORT: 5373,
+  E2E_BACKOFFICE_PORT: 5383,
+  E2E_DB_PORT: 5533,
+  E2E_MINIO_PORT: 9310,
+  E2E_MINIO_CONSOLE_PORT: 9311,
+};
+
+// Long-running services that must be up before tests (minio-init exits).
+const SERVICES = [
+  "postgres-freight-e2e",
+  "minio-e2e",
+  "freight-api-e2e",
+  "freight-portal-e2e",
+  "freight-backoffice-e2e",
+];
+
+function fail(msg) {
+  console.error(`\ne2e: ${msg}`);
+  process.exit(1);
+}
+
+function preflight() {
+  try {
+    execFileSync("docker", ["info"], { stdio: "ignore" });
+  } catch {
+    fail("docker is not running (or not installed) — start Docker and retry.");
+  }
+  if (!existsSync(join(repoRoot, ".npmrc"))) {
+    fail(
+      ".npmrc missing at repo root — image builds need GitHub Packages auth " +
+        "for @tria-plc (same file the main docker-compose.yaml uses).",
+    );
+  }
+}
+
+function isPortFree(port) {
+  return new Promise((res) => {
+    const srv = createServer();
+    srv.once("error", () => res(false));
+    srv.once("listening", () => srv.close(() => res(true)));
+    srv.listen(port);
+  });
+}
+
+function stackRunning(env) {
+  try {
+    const out = execFileSync(
+      "docker",
+      [...composeBase, "ps", "--services", "--status", "running"],
+      { encoding: "utf8", env, stdio: ["ignore", "pipe", "ignore"] },
+    );
+    const running = new Set(out.split("\n").filter(Boolean));
+    return SERVICES.every((s) => running.has(s));
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * While the stack runs, ports are whatever it was started with (state file,
+ * else the defaults — a hand-started stack used the compose defaults). Only a
+ * fresh start gets to scan for free ports.
+ */
+async function resolvePorts() {
+  if (stackRunning(process.env)) {
+    return existsSync(stateFile)
+      ? JSON.parse(readFileSync(stateFile, "utf8"))
+      : { ...DEFAULT_PORTS };
+  }
+  const ports = {};
+  const taken = new Set();
+  for (const [name, preferred] of Object.entries(DEFAULT_PORTS)) {
+    let port = preferred;
+    while (taken.has(port) || !(await isPortFree(port))) port += 1;
+    taken.add(port);
+    ports[name] = port;
+    if (port !== preferred)
+      console.log(`e2e: port ${preferred} busy → ${name}=${port}`);
+  }
+  return ports;
+}
+
+function envFor(ports) {
+  return {
+    ...process.env,
+    ...Object.fromEntries(
+      Object.entries(ports).map(([k, v]) => [k, String(v)]),
+    ),
+    CYPRESS_BASE_URL: `http://localhost:${ports.E2E_BACKOFFICE_PORT}`,
+    CYPRESS_API_URL: `http://localhost:${ports.E2E_API_PORT}`,
+    CYPRESS_PORTAL_URL: `http://localhost:${ports.E2E_PORTAL_PORT}`,
+    E2E_DB_URL: `postgres://edr_e2e:edr_e2e@localhost:${ports.E2E_DB_PORT}/edr_freight_e2e`,
+  };
+}
+
+function compose(args, env) {
+  const { status } = spawnSync("docker", [...composeBase, ...args], {
+    stdio: "inherit",
+    env,
+  });
+  return status ?? 1;
+}
+
+function up(ports, env) {
+  preflight();
+  console.log(
+    `e2e: starting stack — api :${ports.E2E_API_PORT}  portal :${ports.E2E_PORTAL_PORT}  backoffice :${ports.E2E_BACKOFFICE_PORT}  db :${ports.E2E_DB_PORT}`,
+  );
+  const status = compose(["up", "-d", "--build", "--wait"], env);
+  if (status !== 0)
+    fail(
+      "stack failed to become healthy. Inspect with:\n" +
+        "  docker compose -f docker-compose.e2e.yaml logs freight-api-e2e",
+    );
+  writeFileSync(stateFile, JSON.stringify(ports, null, 2) + "\n");
+}
+
+function ensureUp(ports, env) {
+  if (stackRunning(env)) return;
+  up(ports, env);
+}
+
+function runPnpm(script, extra, env) {
+  const { status } = spawnSync(
+    "pnpm",
+    ["--filter", "@edr/freight-e2e", "run", script, ...extra],
+    { cwd: repoRoot, stdio: "inherit", env },
+  );
+  process.exit(status ?? 1);
+}
+
+const [cmd, ...extra] = process.argv.slice(2);
+const ports = await resolvePorts();
+const env = envFor(ports);
+
+switch (cmd) {
+  case "up":
+    up(ports, env);
+    break;
+  case "run":
+    ensureUp(ports, env);
+    runPnpm("cy:run", extra, env);
+    break;
+  case "open":
+    ensureUp(ports, env);
+    runPnpm("cy:open", extra, env);
+    break;
+  case "ci":
+    ensureUp(ports, env);
+    process.exit(compose(["--profile", "cypress", "run", "--rm", "cypress", ...extra], env));
+    break;
+  case "down":
+    process.exit(
+      (() => {
+        const status = compose(["down", "-v", "--remove-orphans"], env);
+        rmSync(stateFile, { force: true });
+        return status;
+      })(),
+    );
+    break;
+  default:
+    fail(`unknown command "${cmd ?? ""}" — use up | run | open | ci | down`);
+}
diff --git a/e2e/freight/tsconfig.json b/e2e/freight/tsconfig.json
new file mode 100644
index 000000000..c2b049986
--- /dev/null
+++ b/e2e/freight/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "strict": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "types": ["cypress", "node"]
+  },
+  "include": ["cypress/**/*.ts", "cypress.config.ts"]
+}
diff --git a/e2e/init/01-schemas.sql b/e2e/init/01-schemas.sql
new file mode 100644
index 000000000..9a3561e87
--- /dev/null
+++ b/e2e/init/01-schemas.sql
@@ -0,0 +1,6 @@
+-- Runs once on first container start (Postgres initdb hook).
+-- Prisma migrate (passenger) and TypeORM migrate (iam) create their own tables,
+-- but the schemas must exist first. edr_payment is owned by the payment-api.
+CREATE SCHEMA IF NOT EXISTS passenger;
+CREATE SCHEMA IF NOT EXISTS iam;
+CREATE SCHEMA IF NOT EXISTS edr_payment;
diff --git a/e2e/prepare.sh b/e2e/prepare.sh
new file mode 100755
index 000000000..88e07bf29
--- /dev/null
+++ b/e2e/prepare.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+# Bring up the hermetic test DB and apply all migrations. Idempotent — safe to re-run.
+# Usage: bash e2e/prepare.sh   (from repo root or anywhere)
+set -euo pipefail
+
+HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+API="$HERE/../apps/edr-passenger-api"
+
+export DATABASE_URL="postgresql://edr:edr_secret@localhost:5544/edr_database?schema=passenger"
+export DATABASE_HOST=localhost DATABASE_PORT=5544 DATABASE_NAME=edr_database
+export DATABASE_USER=edr DATABASE_PASSWORD=edr_secret DATABASE_SCHEMA=iam
+
+echo "==> Starting test Postgres (5544) + RabbitMQ (5672)"
+docker compose -f "$HERE/docker-compose.yml" up -d
+
+echo "==> Waiting for Postgres healthy"
+for i in $(seq 1 30); do
+  status="$(docker inspect --format '{{.State.Health.Status}}' edr-passenger-e2e-db 2>/dev/null || echo none)"
+  [ "$status" = "healthy" ] && break
+  sleep 2
+done
+[ "${status:-}" = "healthy" ] || { echo "DB did not become healthy"; exit 1; }
+
+echo "==> Prisma migrate deploy (passenger schema)"
+( cd "$API" && npx prisma migrate deploy )
+
+echo "==> IAM TypeORM migrations (iam schema)"
+( cd "$API" && node scripts/run-iam-migrations.cjs )
+
+echo "==> Prisma client generate"
+( cd "$API" && npx prisma generate >/dev/null )
+
+echo "==> Ready. Run:  pnpm --filter @edr/passenger-api test:e2e"
diff --git a/e2e/run.sh b/e2e/run.sh
new file mode 100755
index 000000000..c5b344f0d
--- /dev/null
+++ b/e2e/run.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+# One-shot E2E: ensure Docker is up → start the test DB + migrations → run all suites → open the
+# HTML dashboard. Safe to re-run. The DB is left running for fast subsequent runs unless --down.
+#
+#   bash e2e/run.sh            # run everything, leave the DB up, open the report
+#   bash e2e/run.sh --down     # same, but tear the DB down afterwards
+#   bash e2e/run.sh --no-open  # don't auto-open the browser (just print the path)
+set -euo pipefail
+
+HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+API="$HERE/../apps/edr-passenger-api"
+REPORT="$API/e2e-report/index.html"
+
+DOWN=0; OPEN=1
+for arg in "$@"; do
+  case "$arg" in
+    --down) DOWN=1 ;;
+    --no-open) OPEN=0 ;;
+    *) echo "unknown flag: $arg" >&2; exit 2 ;;
+  esac
+done
+
+# 1. Ensure the Docker daemon is running (start Docker Desktop on macOS if needed).
+if ! docker info >/dev/null 2>&1; then
+  echo "==> Docker daemon not running; attempting to start Docker Desktop…"
+  open -a Docker 2>/dev/null || { echo "Could not launch Docker. Start it manually and re-run."; exit 1; }
+  printf "    waiting for Docker"
+  for _ in $(seq 1 40); do
+    if docker info >/dev/null 2>&1; then echo " — up"; break; fi
+    printf "."; sleep 2
+  done
+  docker info >/dev/null 2>&1 || { echo; echo "Docker did not start in time."; exit 1; }
+fi
+
+# 2. Bring up the test DB + apply migrations (idempotent).
+bash "$HERE/prepare.sh"
+
+# 3. Run all suites (this also writes the HTML report via the jest-html-reporters config).
+#    Don't let a test failure abort the script — we still want to open the report.
+set +e
+( cd "$API" && npx jest --config ./test/jest-e2e.json )
+JEST_EXIT=$?
+set -e
+
+# 4. Open (or print) the report.
+if [ -f "$REPORT" ]; then
+  if [ "$OPEN" -eq 1 ]; then
+    echo "==> Opening report: $REPORT"
+    open "$REPORT" 2>/dev/null || echo "    (open it manually: $REPORT)"
+  else
+    echo "==> Report written: $REPORT"
+  fi
+else
+  echo "!! No report generated (tests may have failed to run)."
+fi
+
+# 5. Optional teardown.
+if [ "$DOWN" -eq 1 ]; then
+  echo "==> Tearing down the test DB"
+  docker compose -f "$HERE/docker-compose.yml" down
+fi
+
+exit "$JEST_EXIT"
diff --git a/package.json b/package.json
index 8909de6cf..cfa584a12 100644
--- a/package.json
+++ b/package.json
@@ -18,16 +18,25 @@
     "build:passenger": "turbo run build --filter=@edr/passenger-api... --filter=@edr/passenger-portal... --filter=@edr/passenger-backoffice...",
     "clean": "find . -type d -name dist -prune -exec rm -rf '{}' + && find . -type f -name '*.tsbuildinfo' -delete",
     "test": "turbo run test",
+    "test:e2e:passenger": "bash e2e/run.sh",
+    "test:e2e:ui": "bash e2e-ui/run.sh",
+    "test:e2e:ui:only": "playwright test -c e2e-ui/playwright.config.ts",
     "lint": "turbo run lint",
     "type-check": "turbo run type-check",
     "format": "prettier --write \"**/*.{ts,tsx,json,md}\"",
     "docker:build": "docker compose build",
     "docker:up": "docker compose up -d",
+    "e2e:freight:up": "node e2e/freight/scripts/e2e.mjs up",
+    "e2e:freight:open": "node e2e/freight/scripts/e2e.mjs open",
+    "e2e:freight:run": "node e2e/freight/scripts/e2e.mjs run",
+    "e2e:freight:ci": "node e2e/freight/scripts/e2e.mjs ci",
+    "e2e:freight:down": "node e2e/freight/scripts/e2e.mjs down",
     "prepare": "husky"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.5.0",
     "@commitlint/config-conventional": "^19.5.0",
+    "@playwright/test": "^1.61.1",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
     "prettier": "^3.3.3",
diff --git a/packages/payment-providers/src/providers/waafi/waafi.provider.ts b/packages/payment-providers/src/providers/waafi/waafi.provider.ts
index e7d78f752..dd5978021 100644
--- a/packages/payment-providers/src/providers/waafi/waafi.provider.ts
+++ b/packages/payment-providers/src/providers/waafi/waafi.provider.ts
@@ -135,15 +135,18 @@ export class WaafiProvider implements PaymentProvider, OnModuleInit {
 
     // Waafi returns transaction info (params.status) ONLY when responseCode is 2001. For an
     // unpaid or not-yet-existing transaction it returns an error envelope (e.g. 5001 / E10206
-    // "Failed to get transaction info") with no status. Treat that as still-pending (PROCESSING),
-    // never terminal — so the intent keeps waiting for the webhook / its expiry rather than being
-    // wrongly resolved off a "no info" response.
+    // "Failed to get transaction info") with no status — i.e. the payer hasn't done anything at
+    // the hosted page yet. That's REQUIRES_ACTION (still awaiting the payer), NOT PROCESSING:
+    // returning PROCESSING here would let the reconciliation sweep persist that guess and block
+    // the payer from switching providers on a session they never touched (see cac-bank.provider's
+    // queryStatus for the same convention). The intent still resolves correctly either way — via
+    // the webhook on a genuine payment, or via expiresAt once the 5-minute HPP session lapses.
     if (response.responseCode !== WAAFI_SUCCESS_CODE) {
       this.logger.warn(
-        `Waafi HPP_GETTRANINFO ${merchantOrderId}: ${response.responseCode}/${response.errorCode} ${response.responseMsg} — treating as pending`,
+        `Waafi HPP_GETTRANINFO ${merchantOrderId}: ${response.responseCode}/${response.errorCode} ${response.responseMsg} — treating as still awaiting the payer`,
       );
       return {
-        status: ProviderPaymentStatus.PROCESSING,
+        status: ProviderPaymentStatus.REQUIRES_ACTION,
         rawResponse: response as unknown as Record<string, unknown>,
       };
     }
diff --git a/packages/types/src/freight/contracts.ts b/packages/types/src/freight/contracts.ts
index d5711897c..bb5c5fb63 100644
--- a/packages/types/src/freight/contracts.ts
+++ b/packages/types/src/freight/contracts.ts
@@ -42,7 +42,6 @@ export const CONTRACT_STATUSES = [
   "FULLY_EXECUTED", // ONE_TIME
   "CONTRACT_ACTIVE", // GENERAL
   // customs clearance execution (Path B, pre-booking)
-  "AWAITING_CLEARANCE_PAYMENT", // clearance service fee invoiced, unpaid
   "AWAITING_CLEARANCE_DOCUMENTS",
   "CLEARANCE_UNDER_REVIEW",
   "CLEARANCE_READY_FOR_BOOKING",
@@ -68,7 +67,6 @@ export type ContractStatus = (typeof CONTRACT_STATUSES)[number];
  */
 export const CONTRACT_CLEARANCE_STATUSES = [
   "NOT_APPLICABLE",
-  "AWAITING_PAYMENT", // Path B — clearance service fee must be paid first
   "AWAITING_DOCUMENTS",
   "DOCUMENTS_UNDER_REVIEW",
   "CLEARANCE_READY_FOR_BOOKING", // Path B — GL may create the booking
@@ -89,6 +87,7 @@ export const CONTRACT_CUSTOMER_EDITABLE_STATUSES: ContractStatus[] = [
 
 export type ContractRateUnit =
   | "per_container"
+  | "per_wagon"
   | "per_ton"
   | "per_item"
   | "per_km"
@@ -534,6 +533,7 @@ export const INCIDENT_TYPES = [
   "CONTAINER_OPENED",
   "CONTAINER_DAMAGED",
   "FLUID_LEAKING",
+  "OTHER",
 ] as const;
 export type IncidentType = (typeof INCIDENT_TYPES)[number];
 
@@ -847,6 +847,8 @@ export interface CreateBookingUnderContractDto {
   equipmentReturn?: string;
   containers?: CreateBookingContainerLineDto[];
   bulkLines?: CreateBulkLineDto[];
+  /** What the containers carry — captured per booking (container freight). */
+  cargoFreeText?: string;
   notes?: string;
 }
 
diff --git a/packages/types/src/freight/index.ts b/packages/types/src/freight/index.ts
index 2fe24773f..618487d91 100644
--- a/packages/types/src/freight/index.ts
+++ b/packages/types/src/freight/index.ts
@@ -103,8 +103,6 @@ export enum BookingStatus {
   PendingConsolidation = "PENDING_CONSOLIDATION",
   Consolidated = "CONSOLIDATED",
   // Post counter-sign document-clearance gate (GL workflow).
-  /** Clearance service fee invoiced; docs + GL work locked until paid. */
-  AwaitingClearancePayment = "AWAITING_CLEARANCE_PAYMENT",
   AwaitingDocuments = "AWAITING_DOCUMENTS",
   DocumentsUnderReview = "DOCUMENTS_UNDER_REVIEW",
   ClearanceReady = "CLEARANCE_READY",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f59a388ba..3b89d65b6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -18,6 +18,9 @@ importers:
       '@commitlint/config-conventional':
         specifier: ^19.5.0
         version: 19.8.1
+      '@playwright/test':
+        specifier: ^1.61.1
+        version: 1.61.1
       husky:
         specifier: ^9.1.6
         version: 9.1.7
@@ -580,7 +583,7 @@ importers:
         version: 5.101.0(react@19.2.6)
       '@tria-plc/iamui':
         specifier: file:../../../local-packages/tria-plc-iamui-0.1.1.tgz
-        version: file:local-packages/tria-plc-iamui-0.1.1.tgz(0ce39b7e349029277dcd938d06eeb0f7)
+        version: file:local-packages/tria-plc-iamui-0.1.1.tgz(a5d0bdee55164ae56064fb273b530e00)
       '@vis.gl/react-google-maps':
         specifier: ^1.8.3
         version: 1.8.3(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -914,6 +917,9 @@ importers:
       jest:
         specifier: ^29.7.0
         version: 29.7.0(@types/node@20.19.42)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.42)(typescript@5.9.3))
+      jest-html-reporters:
+        specifier: ^3.1.7
+        version: 3.1.7
       prisma:
         specifier: ^6.19.3
         version: 6.19.3(typescript@5.9.3)
@@ -955,7 +961,7 @@ importers:
         version: 0.446.0(react@18.3.1)
       next:
         specifier: ^14.2.0
-        version: 14.2.35(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 14.2.35(@playwright/test@1.61.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react:
         specifier: ^18.3.1
         version: 18.3.1
@@ -1040,7 +1046,7 @@ importers:
         version: 0.446.0(react@18.3.1)
       next:
         specifier: ^14.2.0
-        version: 14.2.35(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 14.2.35(@playwright/test@1.61.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       qrcode:
         specifier: ^1.5.4
         version: 1.5.4
@@ -1203,6 +1209,24 @@ importers:
         specifier: ^5.5.4
         version: 5.9.3
 
+  e2e/freight:
+    devDependencies:
+      '@types/node':
+        specifier: ^22.0.0
+        version: 22.20.1
+      '@types/pg':
+        specifier: ^8.11.0
+        version: 8.20.0
+      cypress:
+        specifier: ^15.3.0
+        version: 15.18.1
+      pg:
+        specifier: ^8.13.0
+        version: 8.21.0
+      typescript:
+        specifier: ^5.5.4
+        version: 5.9.3
+
   packages/api-common:
     dependencies:
       '@edr/types':
@@ -1743,6 +1767,13 @@ packages:
     resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
     engines: {node: '>=18'}
 
+  '@cypress/request@4.0.1':
+    resolution: {integrity: sha512-y20e+e6dFYkOUUJLVUZTsJRuTiXZaUQ32WD+R/ux/HBybbTx4ge7cNINcua0pU8+SNkKuRbOF12mBmzuzM8n5w==}
+    engines: {node: '>= 14.17.0'}
+
+  '@cypress/xvfb@1.2.4':
+    resolution: {integrity: sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==}
+
   '@date-fns/tz@1.5.0':
     resolution: {integrity: sha512-lwYN/vDPeNRULcepoE/LO2Pgx+7/RV+S9ARfbc9lr2DtGkOD7pAiruHvbR1RX3Qyf6ja47EWJDMsNK5vK08DJg==}
 
@@ -3143,6 +3174,11 @@ packages:
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
 
+  '@playwright/test@1.61.1':
+    resolution: {integrity: sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   '@popperjs/core@2.11.8':
     resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
 
@@ -4702,6 +4738,9 @@ packages:
   '@types/node@20.19.42':
     resolution: {integrity: sha512-5L7SUaFC1RyDraj2yRhyBzHTobyXHmohD100CChNtyPyleoq37Mqab5Gn8XEKI04dfN/oqPdpHk38MgcQWHbZg==}
 
+  '@types/node@22.20.1':
+    resolution: {integrity: sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==}
+
   '@types/node@24.13.1':
     resolution: {integrity: sha512-RSpUJGmvsJ1ZeBehQZFhIdpsz+bIpES0nIQXko4Ybq+N+kX6XvOq3Jo+iJ82FWLdblFq85AsMikd3m35jgezYg==}
 
@@ -4760,6 +4799,9 @@ packages:
   '@types/signature_pad@2.3.6':
     resolution: {integrity: sha512-v3j92gCQJoxomHhd+yaG4Vsf8tRS/XbzWKqDv85UsqjMGy4zhokuwKe4b6vhbgncKkh+thF+gpz6+fypTtnFqQ==}
 
+  '@types/sinonjs__fake-timers@8.1.1':
+    resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==}
+
   '@types/sizzle@2.3.10':
     resolution: {integrity: sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==}
 
@@ -4778,6 +4820,9 @@ packages:
   '@types/tinymce@4.6.9':
     resolution: {integrity: sha512-pDxBUlV4v1jgJ97SlnVOSyf3KUy3OQ3s5Ddpfh1L9M5lXlBmX7TJ2OLSozx1WBxp91acHvYPWDwz2U/kMM1oxQ==}
 
+  '@types/tmp@0.2.6':
+    resolution: {integrity: sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==}
+
   '@types/trusted-types@2.0.7':
     resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
 
@@ -5372,6 +5417,9 @@ packages:
   append-field@1.0.0:
     resolution: {integrity: sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==}
 
+  arch@2.2.0:
+    resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
+
   archiver-utils@2.1.0:
     resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
     engines: {node: '>= 6'}
@@ -5472,6 +5520,13 @@ packages:
   asap@2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
 
+  asn1@0.2.6:
+    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
+
+  assert-plus@1.0.0:
+    resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
+    engines: {node: '>=0.8'}
+
   assertion-error@2.0.1:
     resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
     engines: {node: '>=12'}
@@ -5504,6 +5559,10 @@ packages:
   asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
 
+  at-least-node@1.0.0:
+    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
+    engines: {node: '>= 4.0.0'}
+
   atob@2.1.2:
     resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
     engines: {node: '>= 4.5.0'}
@@ -5527,6 +5586,12 @@ packages:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
 
+  aws-sign2@0.7.0:
+    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
+
+  aws4@1.13.2:
+    resolution: {integrity: sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==}
+
   axe-core@4.12.0:
     resolution: {integrity: sha512-FTavr/7Ba0IptwGOPxnQvdyW2tAsdLBMTBXz7rKH6xJ2skpyxpBxyHkDdBs4lf69yRqYpkqCdfhnwS8YULGOmg==}
     engines: {node: '>=4'}
@@ -5663,6 +5728,9 @@ packages:
     resolution: {integrity: sha512-bopVNp6ugyA150DDuZfPFdt1KZ5a94ZDiwX4hMgZDzF+GttD80lEy8kj98kbyhLXnPvhtIo93mdnLIjpCAeeOw==}
     engines: {node: '>=10.0.0'}
 
+  bcrypt-pbkdf@1.0.2:
+    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
+
   bcrypt@6.0.0:
     resolution: {integrity: sha512-cU8v/EGSrnH+HnxV2z0J7/blxH8gq7Xh2JFT6Aroax7UohdmiJJlxApMxtKfuI7z68NvvVcmR78k2LbT6efhRg==}
     engines: {node: '>= 18'}
@@ -5684,12 +5752,18 @@ packages:
   bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
 
+  blob-util@2.0.2:
+    resolution: {integrity: sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==}
+
   block-stream2@2.1.0:
     resolution: {integrity: sha512-suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg==}
 
   bluebird@3.4.7:
     resolution: {integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==}
 
+  bluebird@3.7.2:
+    resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
+
   body-parser@1.20.5:
     resolution: {integrity: sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA==}
     engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
@@ -5794,6 +5868,10 @@ packages:
     resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
     engines: {node: '>=0.10.0'}
 
+  cachedir@2.4.0:
+    resolution: {integrity: sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==}
+    engines: {node: '>=6'}
+
   call-bind-apply-helpers@1.0.2:
     resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
     engines: {node: '>= 0.4'}
@@ -5832,6 +5910,9 @@ packages:
     resolution: {integrity: sha512-5ON+q7jCTgMp9cjpu4Jo6XbvfYwSB2Ow3kzHKfIyJfaCAOHLbdKPQqGKgfED/R5B+3TFFfe8pegYA+b423SRyA==}
     engines: {node: '>=10.0.0'}
 
+  caseless@0.12.0:
+    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
+
   cfb@1.2.2:
     resolution: {integrity: sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==}
     engines: {node: '>=0.8'}
@@ -5890,6 +5971,10 @@ packages:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
 
+  ci-info@4.4.0:
+    resolution: {integrity: sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==}
+    engines: {node: '>=8'}
+
   citty@0.1.6:
     resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==}
 
@@ -5931,6 +6016,10 @@ packages:
     resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
     engines: {node: '>=6'}
 
+  cli-table3@0.6.1:
+    resolution: {integrity: sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==}
+    engines: {node: 10.* || >= 12.*}
+
   cli-table3@0.6.5:
     resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==}
     engines: {node: 10.* || >= 12.*}
@@ -5939,6 +6028,10 @@ packages:
     resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==}
     engines: {node: '>=18'}
 
+  cli-truncate@5.2.0:
+    resolution: {integrity: sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==}
+    engines: {node: '>=20'}
+
   cli-width@1.1.1:
     resolution: {integrity: sha512-eMU2akIeEIkCxGXUNmDnJq1KzOIiPnJ+rKqRe6hcxE3vIOPvpMrBYOn/Bl7zNlYJj/zQxXquAnozHUCf9Whnsg==}
 
@@ -6022,6 +6115,10 @@ packages:
     resolution: {integrity: sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==}
     engines: {node: '>=0.1.90'}
 
+  colors@1.4.0:
+    resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==}
+    engines: {node: '>=0.1.90'}
+
   combined-stream@1.0.8:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
@@ -6045,10 +6142,18 @@ packages:
     resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
     engines: {node: '>= 6'}
 
+  commander@6.2.1:
+    resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
+    engines: {node: '>= 6'}
+
   comment-json@5.0.0:
     resolution: {integrity: sha512-uiqLcOiVDJtBP8WGkZHEP+FZIhTzP1dxvn59EfoYUi9gqupjrBWVQkO2atDrbnKPwLeotFYDsuNb26uBMqB+hw==}
     engines: {node: '>= 6'}
 
+  common-tags@1.8.2:
+    resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
+    engines: {node: '>=4.0.0'}
+
   compare-func@2.0.0:
     resolution: {integrity: sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==}
 
@@ -6140,6 +6245,9 @@ packages:
   core-js@3.49.0:
     resolution: {integrity: sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==}
 
+  core-util-is@1.0.2:
+    resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
+
   core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
@@ -6254,6 +6362,11 @@ packages:
     resolution: {integrity: sha512-TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA==}
     engines: {node: '>=0.4.0'}
 
+  cypress@15.18.1:
+    resolution: {integrity: sha512-JtkTVtUE2lvLYgZCaug+Uai0H9IqsJirlBO49c87QwG0bJUGvAUVBz1EJve0b0oaYP244Ew9M0BkrHpcqkYxmw==}
+    engines: {node: ^20.1.0 || ^22.0.0 || >=24.0.0}
+    hasBin: true
+
   d3-array@3.2.4:
     resolution: {integrity: sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==}
     engines: {node: '>=12'}
@@ -6305,6 +6418,10 @@ packages:
     resolution: {integrity: sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==}
     engines: {node: '>=12'}
 
+  dashdash@1.14.1:
+    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
+    engines: {node: '>=0.10'}
+
   data-uri-to-buffer@4.0.1:
     resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
     engines: {node: '>= 12'}
@@ -6433,6 +6550,10 @@ packages:
     resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
     engines: {node: '>= 0.4'}
 
+  define-lazy-prop@2.0.0:
+    resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
+    engines: {node: '>=8'}
+
   define-lazy-prop@3.0.0:
     resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==}
     engines: {node: '>=12'}
@@ -6587,6 +6708,9 @@ packages:
   ebec@2.3.0:
     resolution: {integrity: sha512-bt+0tSL7223VU3PSVi0vtNLZ8pO1AfWolcPPMk2a/a5H+o/ZU9ky0n3A0zhrR4qzJTN61uPsGIO4ShhOukdzxA==}
 
+  ecc-jsbn@0.1.2:
+    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
+
   ecdsa-sig-formatter@1.0.11:
     resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
 
@@ -6913,6 +7037,9 @@ packages:
     resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
     engines: {node: '>=6'}
 
+  eventemitter2@6.4.7:
+    resolution: {integrity: sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==}
+
   eventemitter2@6.4.9:
     resolution: {integrity: sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==}
 
@@ -6941,6 +7068,10 @@ packages:
     resolution: {integrity: sha512-XctvKaEMaj1Ii9oDOqbW/6e1gXknSY4g/aLCDicOXqBE4M0nRWkUu0PTp++UPNzoFY12BNHMfs/VadKIS6llvg==}
     engines: {node: '>=8.3.0'}
 
+  execa@4.1.0:
+    resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
+    engines: {node: '>=10'}
+
   execa@5.1.1:
     resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
     engines: {node: '>=10'}
@@ -6953,6 +7084,10 @@ packages:
     resolution: {integrity: sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==}
     engines: {node: ^18.19.0 || >=20.5.0}
 
+  executable@4.1.1:
+    resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}
+    engines: {node: '>=4'}
+
   exit-hook@1.1.1:
     resolution: {integrity: sha512-MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==}
     engines: {node: '>=0.10.0'}
@@ -6998,6 +7133,9 @@ packages:
     resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
     engines: {node: '>=0.10.0'}
 
+  extend@3.0.2:
+    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
+
   extglob@2.0.4:
     resolution: {integrity: sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==}
     engines: {node: '>=0.10.0'}
@@ -7007,6 +7145,10 @@ packages:
     engines: {node: '>= 10.17.0'}
     hasBin: true
 
+  extsprintf@1.3.0:
+    resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==}
+    engines: {'0': node >=0.6.0}
+
   eyes@0.1.8:
     resolution: {integrity: sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ==}
     engines: {node: '> 0.1.90'}
@@ -7191,6 +7333,9 @@ packages:
     resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==}
     engines: {node: '>=14'}
 
+  forever-agent@0.6.1:
+    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
+
   fork-ts-checker-webpack-plugin@9.1.0:
     resolution: {integrity: sha512-mpafl89VFPJmhnJ1ssH+8wmM2b50n+Rew5x42NeI2U78aRWgtkEtGmctp7iT16UjquJTjorEmIfESj3DxdW84Q==}
     engines: {node: '>=14.21.3'}
@@ -7262,12 +7407,21 @@ packages:
     resolution: {integrity: sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==}
     engines: {node: '>=14.14'}
 
+  fs-extra@9.1.0:
+    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
+    engines: {node: '>=10'}
+
   fs-monkey@1.1.0:
     resolution: {integrity: sha512-QMUezzXWII9EV5aTFXW1UBVUO77wYPpjqIF8/AviUCThNeSYZykpoTixUeaNNBwmCev0AMDWMAni+f8Hxb1IFw==}
 
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
+  fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
   fsevents@2.3.3:
     resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -7362,6 +7516,9 @@ packages:
     resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
     engines: {node: '>=0.10.0'}
 
+  getpass@0.1.7:
+    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
+
   giget@2.0.0:
     resolution: {integrity: sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==}
     hasBin: true
@@ -7406,6 +7563,10 @@ packages:
     resolution: {integrity: sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==}
     engines: {node: '>=18'}
 
+  global-dirs@3.0.1:
+    resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
+    engines: {node: '>=10'}
+
   globals@13.24.0:
     resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
     engines: {node: '>=8'}
@@ -7501,6 +7662,10 @@ packages:
     resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
     engines: {node: '>=0.10.0'}
 
+  hasha@5.2.2:
+    resolution: {integrity: sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==}
+    engines: {node: '>=8'}
+
   hasown@2.0.4:
     resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==}
     engines: {node: '>= 0.4'}
@@ -7571,6 +7736,10 @@ packages:
     resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
     engines: {node: '>= 14'}
 
+  http-signature@1.4.0:
+    resolution: {integrity: sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==}
+    engines: {node: '>=0.10'}
+
   https-proxy-agent@5.0.1:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
@@ -7579,6 +7748,10 @@ packages:
     resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
     engines: {node: '>= 14'}
 
+  human-signals@1.1.1:
+    resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
+    engines: {node: '>=8.12.0'}
+
   human-signals@2.1.0:
     resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
     engines: {node: '>=10.17.0'}
@@ -7684,6 +7857,10 @@ packages:
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
+  ini@2.0.0:
+    resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
+    engines: {node: '>=10'}
+
   ini@4.1.1:
     resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -7790,6 +7967,11 @@ packages:
     resolution: {integrity: sha512-bv5z95W0dDtLfKwDfkTNxaRxmISBD3eQBKJeVxv2AQ7MjuUnDNG7cIQqvFtMOUYhsILWHhMayWdoGqNqYYYjww==}
     engines: {node: '>= 0.4'}
 
+  is-docker@2.2.1:
+    resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
+    engines: {node: '>=8'}
+    hasBin: true
+
   is-docker@3.0.0:
     resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -7852,6 +8034,10 @@ packages:
     engines: {node: '>=14.16'}
     hasBin: true
 
+  is-installed-globally@0.4.0:
+    resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==}
+    engines: {node: '>=10'}
+
   is-interactive@1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
@@ -7969,6 +8155,9 @@ packages:
     resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==}
     engines: {node: '>= 0.4'}
 
+  is-typedarray@1.0.0:
+    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
+
   is-unicode-supported@0.1.0:
     resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
     engines: {node: '>=10'}
@@ -8000,6 +8189,10 @@ packages:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
 
+  is-wsl@2.2.0:
+    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
+    engines: {node: '>=8'}
+
   is-wsl@3.1.1:
     resolution: {integrity: sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==}
     engines: {node: '>=16'}
@@ -8128,6 +8321,9 @@ packages:
     resolution: {integrity: sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
+  jest-html-reporters@3.1.7:
+    resolution: {integrity: sha512-GTmjqK6muQ0S0Mnksf9QkL9X9z2FGIpNSxC52E0PHDzjPQ1XDu2+XTI3B3FS43ZiUzD1f354/5FfwbNIBzT7ew==}
+
   jest-leak-detector@29.7.0:
     resolution: {integrity: sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -8257,6 +8453,9 @@ packages:
     resolution: {integrity: sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==}
     hasBin: true
 
+  jsbn@0.1.1:
+    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
+
   jsdom@25.0.1:
     resolution: {integrity: sha512-8i7LzZj7BF8uplX+ZyOlIz86V6TAsSs+np6m1kpW9u0JWi4z/1t+FzcK1aek+ybTnAC4KhBL4uXCNT0wcUIeCw==}
     engines: {node: '>=18'}
@@ -8286,12 +8485,18 @@ packages:
   json-schema-typed@8.0.2:
     resolution: {integrity: sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==}
 
+  json-schema@0.4.0:
+    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
+
   json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
   json-stream@1.0.0:
     resolution: {integrity: sha512-H/ZGY0nIAg3QcOwE1QN/rK/Fa7gJn7Ii5obwp6zyPO4xiPNwpIMjqy2gwjBEGqzkF/vSWEIBQCBuN19hYiL6Qg==}
 
+  json-stringify-safe@5.0.1:
+    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
+
   json5@1.0.2:
     resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
     hasBin: true
@@ -8330,6 +8535,10 @@ packages:
   jspdf@4.2.1:
     resolution: {integrity: sha512-YyAXyvnmjTbR4bHQRLzex3CuINCDlQnBqoSYyjJwTP2x9jDLuKDzy7aKUl0hgx3uhcl7xzg32agn5vlie6HIlQ==}
 
+  jsprim@2.0.2:
+    resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
+    engines: {'0': node >=0.6.0}
+
   jsx-ast-utils@3.3.5:
     resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
     engines: {node: '>=4.0'}
@@ -8508,6 +8717,10 @@ packages:
     resolution: {integrity: sha512-LWzX2KsqcB1wqQ4AHgYb4RsDXauQiqhjLk+6hjbaeHG4zpjjVAB6wC/gz6X0l+Du1cN3pUB5ZlrvTbhGSNnUQQ==}
     engines: {node: '>=18.0.0'}
 
+  listr2@9.0.5:
+    resolution: {integrity: sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==}
+    engines: {node: '>=20.0.0'}
+
   little-state-machine@4.8.1:
     resolution: {integrity: sha512-liPHqaWMQ7rzZryQUDnbZ1Gclnnai3dIyaJ0nAgwZRXMzqbYrydrlCI0NDojRUbE5VYh5vu6hygEUZiH77nQkQ==}
     peerDependencies:
@@ -9182,6 +9395,10 @@ packages:
     resolution: {integrity: sha512-smsWv2LzFjP03xmvFoJ331ss6h+jixfA4UUV/Bsiyuu4YJPfN+FIQGOIiv4w9/+MoHkfkJ22UIaQWRVFRfH6Vw==}
     engines: {node: '>=20'}
 
+  open@8.4.2:
+    resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==}
+    engines: {node: '>=12'}
+
   optionator@0.9.4:
     resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
     engines: {node: '>= 0.8.0'}
@@ -9194,6 +9411,9 @@ packages:
     resolution: {integrity: sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==}
     engines: {node: '>=18'}
 
+  ospath@1.2.2:
+    resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
+
   outvariant@1.4.3:
     resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==}
 
@@ -9448,6 +9668,16 @@ packages:
     resolution: {integrity: sha512-8xCNE/aT/EXKenuMDZ+xTVwkT8gsoHN2z/Q29l80u0ppGEXVvsKRzNMbtKhg8LS8k1tJLAHHylf6p4VFmP6XUQ==}
     engines: {node: '>= 0.4.0'}
 
+  playwright-core@1.61.1:
+    resolution: {integrity: sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  playwright@1.61.1:
+    resolution: {integrity: sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
@@ -9562,6 +9792,10 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
+  pretty-bytes@5.6.0:
+    resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
+    engines: {node: '>=6'}
+
   pretty-format@29.7.0:
     resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -9609,6 +9843,9 @@ packages:
     resolution: {integrity: sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==}
     engines: {node: '>= 14'}
 
+  proxy-from-env@1.0.0:
+    resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==}
+
   proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
 
@@ -10083,6 +10320,9 @@ packages:
     resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
     engines: {node: '>=0.10'}
 
+  request-progress@3.0.0:
+    resolution: {integrity: sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==}
+
   require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -10410,6 +10650,10 @@ packages:
     resolution: {integrity: sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==}
     engines: {node: '>=18'}
 
+  slice-ansi@8.0.0:
+    resolution: {integrity: sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==}
+    engines: {node: '>=20'}
+
   smart-buffer@4.2.0:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
@@ -10516,6 +10760,11 @@ packages:
     resolution: {integrity: sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==}
     engines: {node: '>=0.8'}
 
+  sshpk@1.18.0:
+    resolution: {integrity: sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+
   stable-hash@0.0.5:
     resolution: {integrity: sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==}
 
@@ -10593,6 +10842,10 @@ packages:
     resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
     engines: {node: '>=18'}
 
+  string-width@8.2.2:
+    resolution: {integrity: sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==}
+    engines: {node: '>=20'}
+
   string.prototype.includes@2.0.1:
     resolution: {integrity: sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==}
     engines: {node: '>= 0.4'}
@@ -10766,6 +11019,12 @@ packages:
   symbol-tree@3.2.4:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
 
+  systeminformation@5.33.0:
+    resolution: {integrity: sha512-0LYSL01CCbjVeJG7iXI8fUCFU76zMjzbHd/EU3or4QpSFYCLMgslR11prwHuA3siz5jmOkqoLhjgOyDRmXBKmA==}
+    engines: {node: '>=10.0.0'}
+    os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android]
+    hasBin: true
+
   tabbable@6.4.0:
     resolution: {integrity: sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==}
 
@@ -10883,6 +11142,9 @@ packages:
   thenify@3.3.1:
     resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
 
+  throttleit@1.0.1:
+    resolution: {integrity: sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==}
+
   through2@2.0.5:
     resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
 
@@ -11006,6 +11268,10 @@ packages:
   traverse@0.3.9:
     resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==}
 
+  tree-kill@1.2.2:
+    resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
+    hasBin: true
+
   trim-canvas@0.1.2:
     resolution: {integrity: sha512-nd4Ga3iLFV94mdhW9JFMLpQbHUyCQuhFOD71PEAt1NjtMD5wbZctzhX8c3agHNybMR5zXD1XTGoIEWk995E6pQ==}
 
@@ -11090,6 +11356,9 @@ packages:
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
+  tunnel-agent@0.6.0:
+    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
+
   turbo@2.9.16:
     resolution: {integrity: sha512-NqgRQy6j6dPYcdSdv0q1g9QsZg7SWg87RERM8otw/1AtKU2yTFVClOM7cbwKzOonZr/Ek1blTBucw64L9H0Bwg==}
     hasBin: true
@@ -11097,6 +11366,9 @@ packages:
   tw-animate-css@1.4.0:
     resolution: {integrity: sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==}
 
+  tweetnacl@0.14.5:
+    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
+
   type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
@@ -11113,6 +11385,10 @@ packages:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
 
+  type-fest@0.8.1:
+    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
+    engines: {node: '>=8'}
+
   type-fest@4.41.0:
     resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
     engines: {node: '>=16'}
@@ -11285,6 +11561,10 @@ packages:
   until-async@3.0.2:
     resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==}
 
+  untildify@4.0.0:
+    resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
+    engines: {node: '>=8'}
+
   unzipper@0.10.14:
     resolution: {integrity: sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==}
 
@@ -11425,6 +11705,10 @@ packages:
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc
       react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc
 
+  verror@1.10.0:
+    resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
+    engines: {'0': node >=0.6.0}
+
   victory-vendor@36.9.2:
     resolution: {integrity: sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==}
 
@@ -11763,6 +12047,10 @@ packages:
   yauzl@2.10.0:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
 
+  yauzl@3.4.0:
+    resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==}
+    engines: {node: '>=12'}
+
   year@0.2.1:
     resolution: {integrity: sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w==}
     engines: {node: '>=0.8'}
@@ -11889,11 +12177,11 @@ snapshots:
       '@babel/helpers': 7.29.7
       '@babel/parser': 7.29.7
       '@babel/template': 7.29.7
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
       '@babel/types': 7.29.7
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -11928,7 +12216,7 @@ snapshots:
       '@babel/helper-optimise-call-expression': 7.29.7
       '@babel/helper-replace-supers': 7.29.7(@babel/core@7.29.7)
       '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
@@ -11937,7 +12225,14 @@ snapshots:
 
   '@babel/helper-member-expression-to-functions@7.29.7':
     dependencies:
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-imports@7.29.7':
+    dependencies:
+      '@babel/traverse': 7.29.7
       '@babel/types': 7.29.7
     transitivePeerDependencies:
       - supports-color
@@ -11952,9 +12247,9 @@ snapshots:
   '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7)':
     dependencies:
       '@babel/core': 7.29.7
-      '@babel/helper-module-imports': 7.29.7(supports-color@5.5.0)
+      '@babel/helper-module-imports': 7.29.7
       '@babel/helper-validator-identifier': 7.29.7
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
@@ -11969,13 +12264,13 @@ snapshots:
       '@babel/core': 7.29.7
       '@babel/helper-member-expression-to-functions': 7.29.7
       '@babel/helper-optimise-call-expression': 7.29.7
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helper-skip-transparent-expression-wrappers@7.29.7':
     dependencies:
-      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7
       '@babel/types': 7.29.7
     transitivePeerDependencies:
       - supports-color
@@ -12128,6 +12423,18 @@ snapshots:
       '@babel/parser': 7.29.7
       '@babel/types': 7.29.7
 
+  '@babel/traverse@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/helper-globals': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
+      debug: 4.4.3(supports-color@8.1.1)
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/traverse@7.29.7(supports-color@5.5.0)':
     dependencies:
       '@babel/code-frame': 7.29.7
@@ -12286,6 +12593,33 @@ snapshots:
 
   '@csstools/css-tokenizer@3.0.4': {}
 
+  '@cypress/request@4.0.1':
+    dependencies:
+      aws-sign2: 0.7.0
+      aws4: 1.13.2
+      caseless: 0.12.0
+      combined-stream: 1.0.8
+      extend: 3.0.2
+      forever-agent: 0.6.1
+      form-data: 4.0.5
+      http-signature: 1.4.0
+      is-typedarray: 1.0.0
+      isstream: 0.1.2
+      json-stringify-safe: 5.0.1
+      mime-types: 2.1.35
+      performance-now: 2.1.0
+      qs: 6.15.2
+      safe-buffer: 5.2.1
+      tough-cookie: 5.1.2
+      tunnel-agent: 0.6.0
+
+  '@cypress/xvfb@1.2.4(supports-color@8.1.1)':
+    dependencies:
+      debug: 3.2.7(supports-color@8.1.1)
+      lodash.once: 4.1.1
+    transitivePeerDependencies:
+      - supports-color
+
   '@date-fns/tz@1.5.0': {}
 
   '@dotenvx/dotenvx@1.71.0':
@@ -12324,7 +12658,7 @@ snapshots:
 
   '@emotion/babel-plugin@11.13.5':
     dependencies:
-      '@babel/helper-module-imports': 7.29.7(supports-color@5.5.0)
+      '@babel/helper-module-imports': 7.29.7
       '@babel/runtime': 7.29.7
       '@emotion/hash': 0.9.2
       '@emotion/memoize': 0.9.0
@@ -12490,7 +12824,7 @@ snapshots:
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.15.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       espree: 9.6.1
       globals: 13.24.0
       ignore: 5.3.2
@@ -12636,7 +12970,7 @@ snapshots:
   '@humanwhocodes/config-array@0.13.0':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       minimatch: 3.1.5
     transitivePeerDependencies:
       - supports-color
@@ -13751,6 +14085,10 @@ snapshots:
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
+  '@playwright/test@1.61.1':
+    dependencies:
+      playwright: 1.61.1
+
   '@popperjs/core@2.11.8': {}
 
   '@posthog/core@1.41.1':
@@ -13803,7 +14141,7 @@ snapshots:
 
   '@puppeteer/browsers@2.13.2':
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       extract-zip: 2.0.1
       progress: 2.0.3
       proxy-agent: 6.5.0
@@ -15871,7 +16209,7 @@ snapshots:
 
   '@tokenizer/inflate@0.4.1':
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       token-types: 6.1.2
     transitivePeerDependencies:
       - supports-color
@@ -16162,6 +16500,130 @@ snapshots:
       - utf-8-validate
       - vite
 
+  '@tria-plc/iamui@file:local-packages/tria-plc-iamui-0.1.1.tgz(a5d0bdee55164ae56064fb273b530e00)':
+    dependencies:
+      '@emotion/react': 11.14.0(@types/react@18.3.31)(react@19.2.6)
+      '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@18.3.31)(react@19.2.6))(@types/react@18.3.31)(react@19.2.6)
+      '@hookform/resolvers': 5.4.0(react-hook-form@7.77.0(react@19.2.6))
+      '@lottiefiles/react-lottie-player': 3.6.0(react@19.2.6)
+      '@mantine/charts': 7.17.8(@mantine/core@7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/hooks@7.17.8(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(recharts@3.8.1(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)(redux@5.0.1))
+      '@mantine/core': 7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@mantine/dates': 7.17.8(@mantine/core@7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/hooks@7.17.8(react@19.2.6))(dayjs@1.11.21)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@mantine/hooks': 7.17.8(react@19.2.6)
+      '@mantine/notifications': 7.17.8(@mantine/core@7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/hooks@7.17.8(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-accordion': 1.2.13(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-alert-dialog': 1.1.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-avatar': 1.1.12(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-checkbox': 1.3.4(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-collapsible': 1.1.13(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-context-menu': 2.3.0(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-dialog': 1.1.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-dropdown-menu': 2.1.17(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-hover-card': 1.1.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-label': 2.1.9(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-navigation-menu': 1.2.15(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-popover': 1.1.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-progress': 1.1.9(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-radio-group': 1.4.0(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-scroll-area': 1.2.11(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-select': 2.3.0(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-separator': 1.1.9(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-slot': 1.2.5(@types/react@18.3.31)(react@19.2.6)
+      '@radix-ui/react-switch': 1.3.0(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-tabs': 1.1.14(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-toast': 1.2.16(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-tooltip': 1.2.9(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@react-pdf-viewer/core': 3.12.0(pdfjs-dist@5.4.296)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@react-pdf-viewer/default-layout': 3.12.0(pdfjs-dist@5.4.296)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@react-pdf/renderer': 4.5.1(react@19.2.6)
+      '@reduxjs/toolkit': 2.12.0(react-redux@9.3.0(@types/react@18.3.31)(react@19.2.6)(redux@5.0.1))(react@19.2.6)
+      '@tabler/icons-react': 3.44.0(react@19.2.6)
+      '@tailwindcss/vite': 4.3.0(vite@5.4.21(@types/node@24.13.1)(lightningcss@1.32.0)(terser@5.48.0))
+      '@tanstack/react-query': 5.101.0(react@19.2.6)
+      '@tanstack/react-query-devtools': 5.101.0(@tanstack/react-query@5.101.0(react@19.2.6))(react@19.2.6)
+      '@tanstack/react-table': 8.21.3(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@tinymce/tinymce-react': 6.3.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(tinymce@7.9.3)
+      '@types/dompurify': 3.2.0
+      '@types/node': 24.13.1
+      '@types/tinymce': 4.6.9
+      axios: 1.17.0
+      class-variance-authority: 0.7.1
+      clsx: 2.1.1
+      cmdk: 1.1.1(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      date-fns: 3.6.0
+      dayjs: 1.11.21
+      dompurify: 3.4.8
+      ethiopian-calendar-date-converter: 2.1.6
+      ethiopian-calendar-new: 1.1.0
+      file-type: 18.7.0
+      framer-motion: 12.40.0(@emotion/is-prop-valid@1.4.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      html2canvas: 1.4.1
+      i18next: 25.10.10(typescript@5.9.3)
+      i18next-browser-languagedetector: 8.2.1
+      jquery: 3.7.1
+      js-cookie: 3.0.8
+      jspdf: 3.0.4
+      lodash: 4.18.1
+      lucide-react: 0.513.0(react@19.2.6)
+      mantine-react-table: 2.0.0-beta.9(@mantine/core@7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/dates@7.17.8(@mantine/core@7.17.8(@mantine/hooks@7.17.8(react@19.2.6))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/hooks@7.17.8(react@19.2.6))(dayjs@1.11.21)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@mantine/hooks@7.17.8(react@19.2.6))(@tabler/icons-react@3.44.0(react@19.2.6))(clsx@2.1.1)(dayjs@1.11.21)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      mui-ethiopian-datepicker: 0.3.2(4b3af212eafdf0059f009b005d7e343d)
+      next-themes: 0.4.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      path: 0.12.7
+      pdf-lib: 1.17.1
+      qs: 6.15.2
+      react: 19.2.6
+      react-cookie: 8.1.2(@types/react@18.3.31)(react@19.2.6)
+      react-css-nocode-editor: 1.0.13(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)
+      react-day-picker: 8.10.2(date-fns@3.6.0)(react@19.2.6)
+      react-dom: 19.2.6(react@19.2.6)
+      react-dropzone: 14.4.1(react@19.2.6)
+      react-hook-form: 7.77.0(react@19.2.6)
+      react-i18next: 15.7.4(i18next@25.10.10(typescript@5.9.3))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(typescript@5.9.3)
+      react-icons: 5.6.0(react@19.2.6)
+      react-image-crop: 11.0.10(react@19.2.6)
+      react-intersection-observer: 9.16.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-pdf: 10.4.1(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-pdf-html: 2.1.5(@react-pdf/renderer@4.5.1(react@19.2.6))(react@19.2.6)
+      react-redux: 9.3.0(@types/react@18.3.31)(react@19.2.6)(redux@5.0.1)
+      react-resizable-panels: 3.0.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-router-dom: 7.17.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react-signature-canvas: 1.1.0-alpha.2(@types/prop-types@15.7.15)(@types/react@18.3.31)(prop-types@15.8.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      recharts: 3.8.1(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)(redux@5.0.1)
+      rollup-plugin-visualizer: 7.0.1(rollup@4.61.1)
+      socket.io-client: 4.8.3
+      sonner: 2.0.7(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      tailwind-merge: 3.6.0
+      tailwind-scrollbar-hide: 4.0.0(tailwindcss@4.3.0)
+      tailwindcss: 4.3.0
+      tailwindcss-animate: 1.0.7(tailwindcss@4.3.0)
+      tinymce: 7.9.3
+      url: 0.11.4
+      vaul: 1.1.2(@types/react-dom@18.3.7(@types/react@18.3.31))(@types/react@18.3.31)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      xlsx: 0.18.5
+      zod: 3.25.76
+    transitivePeerDependencies:
+      - '@babel/core'
+      - '@emotion/is-prop-valid'
+      - '@mui/icons-material'
+      - '@mui/material'
+      - '@mui/x-date-pickers'
+      - '@types/prop-types'
+      - '@types/react'
+      - '@types/react-dom'
+      - bufferutil
+      - debug
+      - pdfjs-dist
+      - prop-types
+      - react-is
+      - react-native
+      - redux
+      - rolldown
+      - rollup
+      - supports-color
+      - typescript
+      - utf-8-validate
+      - vite
+
   '@ts-morph/common@0.27.0':
     dependencies:
       fast-glob: 3.3.3
@@ -16376,6 +16838,10 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
+  '@types/node@22.20.1':
+    dependencies:
+      undici-types: 6.21.0
+
   '@types/node@24.13.1':
     dependencies:
       undici-types: 7.18.2
@@ -16442,6 +16908,8 @@ snapshots:
 
   '@types/signature_pad@2.3.6': {}
 
+  '@types/sinonjs__fake-timers@8.1.1': {}
+
   '@types/sizzle@2.3.10': {}
 
   '@types/stack-utils@2.0.3': {}
@@ -16464,6 +16932,8 @@ snapshots:
     dependencies:
       '@types/jquery': 4.0.1
 
+  '@types/tmp@0.2.6': {}
+
   '@types/trusted-types@2.0.7':
     optional: true
 
@@ -16514,7 +16984,7 @@ snapshots:
       '@typescript-eslint/types': 8.60.1
       '@typescript-eslint/typescript-estree': 8.60.1(typescript@5.9.3)
       '@typescript-eslint/visitor-keys': 8.60.1
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       eslint: 8.57.1
       typescript: 5.9.3
     transitivePeerDependencies:
@@ -16524,7 +16994,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.60.1(typescript@5.9.3)
       '@typescript-eslint/types': 8.60.1
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
@@ -16543,7 +17013,7 @@ snapshots:
       '@typescript-eslint/types': 8.60.1
       '@typescript-eslint/typescript-estree': 8.60.1(typescript@5.9.3)
       '@typescript-eslint/utils': 8.60.1(eslint@8.57.1)(typescript@5.9.3)
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       eslint: 8.57.1
       ts-api-utils: 2.5.0(typescript@5.9.3)
       typescript: 5.9.3
@@ -16558,7 +17028,7 @@ snapshots:
       '@typescript-eslint/tsconfig-utils': 8.60.1(typescript@5.9.3)
       '@typescript-eslint/types': 8.60.1
       '@typescript-eslint/visitor-keys': 8.60.1
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       minimatch: 10.2.5
       semver: 7.8.2
       tinyglobby: 0.2.17
@@ -16838,7 +17308,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -17093,6 +17563,8 @@ snapshots:
 
   append-field@1.0.0: {}
 
+  arch@2.2.0: {}
+
   archiver-utils@2.1.0:
     dependencies:
       glob: 7.2.3
@@ -17240,6 +17712,12 @@ snapshots:
 
   asap@2.0.6: {}
 
+  asn1@0.2.6:
+    dependencies:
+      safer-buffer: 2.1.2
+
+  assert-plus@1.0.0: {}
+
   assertion-error@2.0.1: {}
 
   assign-symbols@1.0.0: {}
@@ -17264,6 +17742,8 @@ snapshots:
 
   asynckit@0.4.0: {}
 
+  at-least-node@1.0.0: {}
+
   atob@2.1.2: {}
 
   attr-accept@2.2.5: {}
@@ -17285,6 +17765,10 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.1.0
 
+  aws-sign2@0.7.0: {}
+
+  aws4@1.13.2: {}
+
   axe-core@4.12.0: {}
 
   axios@1.17.0:
@@ -17348,6 +17832,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  babel-plugin-styled-components@2.3.0(styled-components@5.3.11(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6))(supports-color@5.5.0):
+    dependencies:
+      '@babel/helper-annotate-as-pure': 7.29.7
+      '@babel/helper-module-imports': 7.29.7(supports-color@5.5.0)
+      '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.7)
+      picomatch: 4.0.4
+      styled-components: 5.3.11(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)
+    transitivePeerDependencies:
+      - supports-color
+
   babel-polyfill@6.26.0:
     dependencies:
       babel-runtime: 6.26.0
@@ -17442,6 +17936,10 @@ snapshots:
 
   basic-ftp@5.3.1: {}
 
+  bcrypt-pbkdf@1.0.2:
+    dependencies:
+      tweetnacl: 0.14.5
+
   bcrypt@6.0.0:
     dependencies:
       node-addon-api: 8.8.0
@@ -17466,12 +17964,16 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
+  blob-util@2.0.2: {}
+
   block-stream2@2.1.0:
     dependencies:
       readable-stream: 3.6.2
 
   bluebird@3.4.7: {}
 
+  bluebird@3.7.2: {}
+
   body-parser@1.20.5:
     dependencies:
       bytes: 3.1.2
@@ -17493,7 +17995,7 @@ snapshots:
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       http-errors: 2.0.1
       iconv-lite: 0.7.2
       on-finished: 2.4.1
@@ -17624,6 +18126,8 @@ snapshots:
       union-value: 1.0.1
       unset-value: 1.0.0
 
+  cachedir@2.4.0: {}
+
   call-bind-apply-helpers@1.0.2:
     dependencies:
       es-errors: 1.3.0
@@ -17665,6 +18169,8 @@ snapshots:
       svg-pathdata: 6.0.3
     optional: true
 
+  caseless@0.12.0: {}
+
   cfb@1.2.2:
     dependencies:
       adler-32: 1.3.1
@@ -17731,6 +18237,8 @@ snapshots:
 
   ci-info@3.9.0: {}
 
+  ci-info@4.4.0: {}
+
   citty@0.1.6:
     dependencies:
       consola: 3.4.2
@@ -17774,6 +18282,12 @@ snapshots:
 
   cli-spinners@2.9.2: {}
 
+  cli-table3@0.6.1:
+    dependencies:
+      string-width: 4.2.3
+    optionalDependencies:
+      colors: 1.4.0
+
   cli-table3@0.6.5:
     dependencies:
       string-width: 4.2.3
@@ -17785,6 +18299,11 @@ snapshots:
       slice-ansi: 5.0.0
       string-width: 7.2.0
 
+  cli-truncate@5.2.0:
+    dependencies:
+      slice-ansi: 8.0.0
+      string-width: 8.2.2
+
   cli-width@1.1.1: {}
 
   cli-width@4.1.0: {}
@@ -17858,6 +18377,9 @@ snapshots:
 
   colors@1.0.3: {}
 
+  colors@1.4.0:
+    optional: true
+
   combined-stream@1.0.8:
     dependencies:
       delayed-stream: 1.0.0
@@ -17872,11 +18394,15 @@ snapshots:
 
   commander@4.1.1: {}
 
+  commander@6.2.1: {}
+
   comment-json@5.0.0:
     dependencies:
       array-timsort: 1.0.3
       esprima: 4.0.1
 
+  common-tags@1.8.2: {}
+
   compare-func@2.0.0:
     dependencies:
       array-ify: 1.0.0
@@ -17953,6 +18479,8 @@ snapshots:
 
   core-js@3.49.0: {}
 
+  core-util-is@1.0.2: {}
+
   core-util-is@1.0.3: {}
 
   cors@2.8.6:
@@ -18084,6 +18612,48 @@ snapshots:
 
   cycle@1.0.3: {}
 
+  cypress@15.18.1:
+    dependencies:
+      '@cypress/request': 4.0.1
+      '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
+      '@types/sinonjs__fake-timers': 8.1.1
+      '@types/sizzle': 2.3.10
+      '@types/tmp': 0.2.6
+      arch: 2.2.0
+      blob-util: 2.0.2
+      bluebird: 3.7.2
+      buffer: 5.7.1
+      cachedir: 2.4.0
+      chalk: 4.1.2
+      ci-info: 4.4.0
+      cli-table3: 0.6.1
+      commander: 6.2.1
+      common-tags: 1.8.2
+      dayjs: 1.11.21
+      debug: 4.4.3(supports-color@8.1.1)
+      eventemitter2: 6.4.7
+      execa: 4.1.0
+      executable: 4.1.1
+      fs-extra: 9.1.0
+      hasha: 5.2.2
+      is-installed-globally: 0.4.0
+      listr2: 9.0.5
+      lodash: 4.18.1
+      log-symbols: 4.1.0
+      minimist: 1.2.8
+      ospath: 1.2.2
+      pretty-bytes: 5.6.0
+      process: 0.11.10
+      proxy-from-env: 1.0.0
+      request-progress: 3.0.0
+      supports-color: 8.1.1
+      systeminformation: 5.33.0
+      tmp: 0.2.7
+      tree-kill: 1.2.2
+      tslib: 1.14.1
+      untildify: 4.0.0
+      yauzl: 3.4.0
+
   d3-array@3.2.4:
     dependencies:
       internmap: 2.0.3
@@ -18126,6 +18696,10 @@ snapshots:
 
   dargs@8.1.0: {}
 
+  dashdash@1.14.1:
+    dependencies:
+      assert-plus: 1.0.0
+
   data-uri-to-buffer@4.0.1: {}
 
   data-uri-to-buffer@6.0.2: {}
@@ -18175,9 +18749,11 @@ snapshots:
     dependencies:
       ms: 2.0.0
 
-  debug@3.2.7:
+  debug@3.2.7(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 8.1.1
 
   debug@4.4.3(supports-color@5.5.0):
     dependencies:
@@ -18185,6 +18761,12 @@ snapshots:
     optionalDependencies:
       supports-color: 5.5.0
 
+  debug@4.4.3(supports-color@8.1.1):
+    dependencies:
+      ms: 2.1.3
+    optionalDependencies:
+      supports-color: 8.1.1
+
   decamelize@1.2.0: {}
 
   decimal.js-light@2.5.1: {}
@@ -18226,6 +18808,8 @@ snapshots:
       es-errors: 1.3.0
       gopd: 1.2.0
 
+  define-lazy-prop@2.0.0: {}
+
   define-lazy-prop@3.0.0: {}
 
   define-properties@1.2.1:
@@ -18366,6 +18950,11 @@ snapshots:
 
   ebec@2.3.0: {}
 
+  ecc-jsbn@0.1.2:
+    dependencies:
+      jsbn: 0.1.1
+      safer-buffer: 2.1.2
+
   ecdsa-sig-formatter@1.0.11:
     dependencies:
       safe-buffer: 5.2.1
@@ -18407,7 +18996,7 @@ snapshots:
   engine.io-client@6.6.5:
     dependencies:
       '@socket.io/component-emitter': 3.1.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       engine.io-parser: 5.2.3
       ws: 8.20.1
       xmlhttprequest-ssl: 2.1.2
@@ -18427,7 +19016,7 @@ snapshots:
       base64id: 2.0.0
       cookie: 0.7.2
       cors: 2.8.6
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       engine.io-parser: 5.2.3
       ws: 8.21.0
     transitivePeerDependencies:
@@ -18651,7 +19240,7 @@ snapshots:
 
   eslint-import-resolver-node@0.3.10:
     dependencies:
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@8.1.1)
       is-core-module: 2.16.2
       resolve: 2.0.0-next.7
     transitivePeerDependencies:
@@ -18660,7 +19249,7 @@ snapshots:
   eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.60.1(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       eslint: 8.57.1
       get-tsconfig: 4.14.0
       is-bun-module: 2.0.0
@@ -18674,7 +19263,7 @@ snapshots:
 
   eslint-module-utils@2.13.0(@typescript-eslint/parser@8.60.1(eslint@8.57.1)(typescript@5.9.3))(eslint-import-resolver-node@0.3.10)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.60.1(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@8.1.1)
     optionalDependencies:
       '@typescript-eslint/parser': 8.60.1(eslint@8.57.1)(typescript@5.9.3)
       eslint: 8.57.1
@@ -18690,7 +19279,7 @@ snapshots:
       array.prototype.findlastindex: 1.2.6
       array.prototype.flat: 1.3.3
       array.prototype.flatmap: 1.3.3
-      debug: 3.2.7
+      debug: 3.2.7(supports-color@8.1.1)
       doctrine: 2.1.0
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.10
@@ -18788,7 +19377,7 @@ snapshots:
       ajv: 6.15.0
       chalk: 4.1.2
       cross-spawn: 7.0.6
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -18854,6 +19443,8 @@ snapshots:
 
   event-target-shim@5.0.1: {}
 
+  eventemitter2@6.4.7: {}
+
   eventemitter2@6.4.9: {}
 
   eventemitter3@4.0.7: {}
@@ -18886,6 +19477,18 @@ snapshots:
       unzipper: 0.10.14
       uuid: 8.3.2
 
+  execa@4.1.0:
+    dependencies:
+      cross-spawn: 7.0.6
+      get-stream: 5.2.0
+      human-signals: 1.1.1
+      is-stream: 2.0.1
+      merge-stream: 2.0.0
+      npm-run-path: 4.0.1
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+      strip-final-newline: 2.0.0
+
   execa@5.1.1:
     dependencies:
       cross-spawn: 7.0.6
@@ -18925,6 +19528,10 @@ snapshots:
       strip-final-newline: 4.0.0
       yoctocolors: 2.1.2
 
+  executable@4.1.1:
+    dependencies:
+      pify: 2.3.0
+
   exit-hook@1.1.1: {}
 
   exit@0.1.2: {}
@@ -19000,7 +19607,7 @@ snapshots:
       content-type: 1.0.5
       cookie: 0.7.2
       cookie-signature: 1.2.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       depd: 2.0.0
       encodeurl: 2.0.0
       escape-html: 1.0.3
@@ -19036,6 +19643,8 @@ snapshots:
       assign-symbols: 1.0.0
       is-extendable: 1.0.1
 
+  extend@3.0.2: {}
+
   extglob@2.0.4:
     dependencies:
       array-unique: 0.3.2
@@ -19051,7 +19660,7 @@ snapshots:
 
   extract-zip@2.0.1:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
@@ -19059,6 +19668,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  extsprintf@1.3.0: {}
+
   eyes@0.1.8: {}
 
   falsey@0.3.2:
@@ -19200,7 +19811,7 @@ snapshots:
 
   finalhandler@2.1.1:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
@@ -19266,6 +19877,8 @@ snapshots:
       cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
+  forever-agent@0.6.1: {}
+
   fork-ts-checker-webpack-plugin@9.1.0(typescript@5.9.3)(webpack@5.106.0):
     dependencies:
       '@babel/code-frame': 7.29.7
@@ -19341,10 +19954,20 @@ snapshots:
       jsonfile: 6.2.1
       universalify: 2.0.1
 
+  fs-extra@9.1.0:
+    dependencies:
+      at-least-node: 1.0.0
+      graceful-fs: 4.2.11
+      jsonfile: 6.2.1
+      universalify: 2.0.1
+
   fs-monkey@1.1.0: {}
 
   fs.realpath@1.0.0: {}
 
+  fsevents@2.3.2:
+    optional: true
+
   fsevents@2.3.3:
     optional: true
 
@@ -19434,12 +20057,16 @@ snapshots:
     dependencies:
       basic-ftp: 5.3.1
       data-uri-to-buffer: 6.0.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   get-value@2.0.6: {}
 
+  getpass@0.1.7:
+    dependencies:
+      assert-plus: 1.0.0
+
   giget@2.0.0:
     dependencies:
       citty: 0.1.6
@@ -19501,6 +20128,10 @@ snapshots:
     dependencies:
       ini: 4.1.1
 
+  global-dirs@3.0.1:
+    dependencies:
+      ini: 2.0.0
+
   globals@13.24.0:
     dependencies:
       type-fest: 0.20.2
@@ -19623,6 +20254,11 @@ snapshots:
       is-number: 3.0.0
       kind-of: 4.0.0
 
+  hasha@5.2.2:
+    dependencies:
+      is-stream: 2.0.1
+      type-fest: 0.8.1
+
   hasown@2.0.4:
     dependencies:
       function-bind: 1.1.2
@@ -19702,24 +20338,32 @@ snapshots:
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
+  http-signature@1.4.0:
+    dependencies:
+      assert-plus: 1.0.0
+      jsprim: 2.0.2
+      sshpk: 1.18.0
+
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.6:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
+  human-signals@1.1.1: {}
+
   human-signals@2.1.0: {}
 
   human-signals@5.0.0: {}
@@ -19795,6 +20439,8 @@ snapshots:
 
   inherits@2.0.4: {}
 
+  ini@2.0.0: {}
+
   ini@4.1.1: {}
 
   input-format@0.3.14(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
@@ -19910,6 +20556,8 @@ snapshots:
       is-accessor-descriptor: 1.0.2
       is-data-descriptor: 1.0.1
 
+  is-docker@2.2.1: {}
+
   is-docker@3.0.0: {}
 
   is-even@1.0.0:
@@ -19960,6 +20608,11 @@ snapshots:
     dependencies:
       is-docker: 3.0.0
 
+  is-installed-globally@0.4.0:
+    dependencies:
+      global-dirs: 3.0.1
+      is-path-inside: 3.0.3
+
   is-interactive@1.0.0: {}
 
   is-interactive@2.0.0: {}
@@ -20051,6 +20704,8 @@ snapshots:
     dependencies:
       which-typed-array: 1.1.22
 
+  is-typedarray@1.0.0: {}
+
   is-unicode-supported@0.1.0: {}
 
   is-unicode-supported@1.3.0: {}
@@ -20072,6 +20727,10 @@ snapshots:
 
   is-windows@1.0.2: {}
 
+  is-wsl@2.2.0:
+    dependencies:
+      is-docker: 2.2.1
+
   is-wsl@3.1.1:
     dependencies:
       is-inside-container: 1.0.0
@@ -20124,7 +20783,7 @@ snapshots:
 
   istanbul-lib-source-maps@4.0.1:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -20290,6 +20949,11 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
+  jest-html-reporters@3.1.7:
+    dependencies:
+      fs-extra: 10.1.0
+      open: 8.4.2
+
   jest-leak-detector@29.7.0:
     dependencies:
       jest-get-type: 29.6.3
@@ -20514,6 +21178,8 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
+  jsbn@0.1.1: {}
+
   jsdom@25.0.1:
     dependencies:
       cssstyle: 4.6.0
@@ -20554,10 +21220,14 @@ snapshots:
 
   json-schema-typed@8.0.2: {}
 
+  json-schema@0.4.0: {}
+
   json-stable-stringify-without-jsonify@1.0.1: {}
 
   json-stream@1.0.0: {}
 
+  json-stringify-safe@5.0.1: {}
+
   json5@1.0.2:
     dependencies:
       minimist: 1.2.8
@@ -20626,6 +21296,13 @@ snapshots:
       dompurify: 3.4.8
       html2canvas: 1.4.1
 
+  jsprim@2.0.2:
+    dependencies:
+      assert-plus: 1.0.0
+      extsprintf: 1.3.0
+      json-schema: 0.4.0
+      verror: 1.10.0
+
   jsx-ast-utils@3.3.5:
     dependencies:
       array-includes: 3.1.9
@@ -20778,7 +21455,7 @@ snapshots:
     dependencies:
       chalk: 5.6.2
       commander: 13.1.0
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       execa: 8.0.1
       lilconfig: 3.1.3
       listr2: 8.3.3
@@ -20800,6 +21477,15 @@ snapshots:
       rfdc: 1.4.1
       wrap-ansi: 9.0.2
 
+  listr2@9.0.5:
+    dependencies:
+      cli-truncate: 5.2.0
+      colorette: 2.0.20
+      eventemitter3: 5.0.4
+      log-update: 6.1.0
+      rfdc: 1.4.1
+      wrap-ansi: 9.0.2
+
   little-state-machine@4.8.1(react@19.2.6):
     dependencies:
       react: 19.2.6
@@ -21264,7 +21950,7 @@ snapshots:
       react: 19.2.6
       react-dom: 19.2.6(react@19.2.6)
 
-  next@14.2.35(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  next@14.2.35(@playwright/test@1.61.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       '@next/env': 14.2.35
       '@swc/helpers': 0.5.5
@@ -21285,6 +21971,7 @@ snapshots:
       '@next/swc-win32-arm64-msvc': 14.2.33
       '@next/swc-win32-ia32-msvc': 14.2.33
       '@next/swc-win32-x64-msvc': 14.2.33
+      '@playwright/test': 1.61.1
     transitivePeerDependencies:
       - '@babel/core'
       - babel-plugin-macros
@@ -21460,6 +22147,12 @@ snapshots:
       powershell-utils: 0.1.0
       wsl-utils: 0.3.1
 
+  open@8.4.2:
+    dependencies:
+      define-lazy-prop: 2.0.0
+      is-docker: 2.2.1
+      is-wsl: 2.2.0
+
   optionator@0.9.4:
     dependencies:
       deep-is: 0.1.4
@@ -21493,6 +22186,8 @@ snapshots:
       string-width: 7.2.0
       strip-ansi: 7.2.0
 
+  ospath@1.2.2: {}
+
   outvariant@1.4.3: {}
 
   own-keys@1.0.1:
@@ -21531,7 +22226,7 @@ snapshots:
     dependencies:
       '@tootallnate/quickjs-emscripten': 0.23.0
       agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       get-uri: 6.0.5
       http-proxy-agent: 7.0.2
       https-proxy-agent: 7.0.6
@@ -21658,8 +22353,7 @@ snapshots:
 
   perfect-debounce@1.0.0: {}
 
-  performance-now@2.1.0:
-    optional: true
+  performance-now@2.1.0: {}
 
   pg-cloudflare@1.4.0:
     optional: true
@@ -21722,6 +22416,14 @@ snapshots:
 
   pkginfo@0.4.1: {}
 
+  playwright-core@1.61.1: {}
+
+  playwright@1.61.1:
+    dependencies:
+      playwright-core: 1.61.1
+    optionalDependencies:
+      fsevents: 2.3.2
+
   pluralize@8.0.0: {}
 
   png-js@2.0.0:
@@ -21814,6 +22516,8 @@ snapshots:
 
   prettier@3.8.3: {}
 
+  pretty-bytes@5.6.0: {}
+
   pretty-format@29.7.0:
     dependencies:
       '@jest/schemas': 29.6.3
@@ -21860,7 +22564,7 @@ snapshots:
   proxy-agent@6.5.0:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       http-proxy-agent: 7.0.2
       https-proxy-agent: 7.0.6
       lru-cache: 7.18.3
@@ -21870,6 +22574,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  proxy-from-env@1.0.0: {}
+
   proxy-from-env@1.1.0: {}
 
   proxy-from-env@2.1.0: {}
@@ -21887,7 +22593,7 @@ snapshots:
     dependencies:
       '@puppeteer/browsers': 2.13.2
       chromium-bidi: 14.0.0(devtools-protocol@0.0.1608973)
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       devtools-protocol: 0.0.1608973
       typed-query-selector: 2.12.2
       webdriver-bidi-protocol: 0.4.1
@@ -22127,6 +22833,15 @@ snapshots:
       - '@babel/core'
       - react-is
 
+  react-css-nocode-editor@1.0.13(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6):
+    dependencies:
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      styled-components: 5.3.11(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6)
+    transitivePeerDependencies:
+      - '@babel/core'
+      - react-is
+
   react-day-picker@8.10.2(date-fns@3.6.0)(react@19.2.6):
     dependencies:
       date-fns: 3.6.0
@@ -22568,6 +23283,10 @@ snapshots:
 
   repeat-string@1.6.1: {}
 
+  request-progress@3.0.0:
+    dependencies:
+      throttleit: 1.0.1
+
   require-directory@2.1.1: {}
 
   require-from-string@2.0.2: {}
@@ -22688,7 +23407,7 @@ snapshots:
 
   router@2.2.0:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       depd: 2.0.0
       is-promise: 4.0.0
       parseurl: 1.3.3
@@ -22806,7 +23525,7 @@ snapshots:
 
   send@1.2.1:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -22990,6 +23709,11 @@ snapshots:
       ansi-styles: 6.2.3
       is-fullwidth-code-point: 5.1.0
 
+  slice-ansi@8.0.0:
+    dependencies:
+      ansi-styles: 6.2.3
+      is-fullwidth-code-point: 5.1.0
+
   smart-buffer@4.2.0: {}
 
   smob@1.6.2: {}
@@ -23019,7 +23743,7 @@ snapshots:
 
   socket.io-adapter@2.5.8:
     dependencies:
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       ws: 8.21.0
     transitivePeerDependencies:
       - bufferutil
@@ -23029,7 +23753,7 @@ snapshots:
   socket.io-client@4.8.3:
     dependencies:
       '@socket.io/component-emitter': 3.1.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       engine.io-client: 6.6.5
       socket.io-parser: 4.2.6
     transitivePeerDependencies:
@@ -23040,7 +23764,7 @@ snapshots:
   socket.io-parser@4.2.6:
     dependencies:
       '@socket.io/component-emitter': 3.1.2
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -23049,7 +23773,7 @@ snapshots:
       accepts: 1.3.8
       base64id: 2.0.0
       cors: 2.8.6
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       engine.io: 6.6.9
       socket.io-adapter: 2.5.8
       socket.io-parser: 4.2.6
@@ -23061,7 +23785,7 @@ snapshots:
   socks-proxy-agent@8.0.5:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       socks: 2.8.9
     transitivePeerDependencies:
       - supports-color
@@ -23122,6 +23846,18 @@ snapshots:
     dependencies:
       frac: 1.1.2
 
+  sshpk@1.18.0:
+    dependencies:
+      asn1: 0.2.6
+      assert-plus: 1.0.0
+      bcrypt-pbkdf: 1.0.2
+      dashdash: 1.14.1
+      ecc-jsbn: 0.1.2
+      getpass: 0.1.7
+      jsbn: 0.1.1
+      safer-buffer: 2.1.2
+      tweetnacl: 0.14.5
+
   stable-hash@0.0.5: {}
 
   stack-trace@0.0.10: {}
@@ -23202,6 +23938,11 @@ snapshots:
       get-east-asian-width: 1.6.0
       strip-ansi: 7.2.0
 
+  string-width@8.2.2:
+    dependencies:
+      get-east-asian-width: 1.6.0
+      strip-ansi: 7.2.0
+
   string.prototype.includes@2.0.1:
     dependencies:
       call-bind: 1.0.9
@@ -23324,6 +24065,24 @@ snapshots:
     transitivePeerDependencies:
       - '@babel/core'
 
+  styled-components@5.3.11(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6):
+    dependencies:
+      '@babel/helper-module-imports': 7.29.7(supports-color@5.5.0)
+      '@babel/traverse': 7.29.7(supports-color@5.5.0)
+      '@emotion/is-prop-valid': 1.4.0
+      '@emotion/stylis': 0.8.5
+      '@emotion/unitless': 0.7.5
+      babel-plugin-styled-components: 2.3.0(styled-components@5.3.11(react-dom@19.2.6(react@19.2.6))(react-is@19.2.7)(react@19.2.6))(supports-color@5.5.0)
+      css-to-react-native: 3.2.0
+      hoist-non-react-statics: 3.3.2
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      react-is: 19.2.7
+      shallowequal: 1.1.0
+      supports-color: 5.5.0
+    transitivePeerDependencies:
+      - '@babel/core'
+
   styled-jsx@5.1.1(babel-plugin-macros@3.1.0)(react@18.3.1):
     dependencies:
       client-only: 0.0.1
@@ -23349,7 +24108,7 @@ snapshots:
     dependencies:
       component-emitter: 1.3.1
       cookiejar: 2.1.4
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       fast-safe-stringify: 2.1.1
       form-data: 4.0.5
       formidable: 3.5.4
@@ -23403,6 +24162,8 @@ snapshots:
 
   symbol-tree@3.2.4: {}
 
+  systeminformation@5.33.0: {}
+
   tabbable@6.4.0: {}
 
   tagged-tag@1.0.0: {}
@@ -23530,6 +24291,8 @@ snapshots:
     dependencies:
       any-promise: 1.3.0
 
+  throttleit@1.0.1: {}
+
   through2@2.0.5:
     dependencies:
       readable-stream: 2.3.8
@@ -23639,6 +24402,8 @@ snapshots:
 
   traverse@0.3.9: {}
 
+  tree-kill@1.2.2: {}
+
   trim-canvas@0.1.2: {}
 
   ts-api-utils@2.5.0(typescript@5.9.3):
@@ -23743,6 +24508,10 @@ snapshots:
 
   tslib@2.8.1: {}
 
+  tunnel-agent@0.6.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
   turbo@2.9.16:
     optionalDependencies:
       '@turbo/darwin-64': 2.9.16
@@ -23754,6 +24523,8 @@ snapshots:
 
   tw-animate-css@1.4.0: {}
 
+  tweetnacl@0.14.5: {}
+
   type-check@0.4.0:
     dependencies:
       prelude-ls: 1.2.1
@@ -23764,6 +24535,8 @@ snapshots:
 
   type-fest@0.21.3: {}
 
+  type-fest@0.8.1: {}
+
   type-fest@4.41.0: {}
 
   type-fest@5.7.0:
@@ -23842,7 +24615,7 @@ snapshots:
       app-root-path: 3.1.0
       buffer: 6.0.3
       dayjs: 1.11.21
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       dedent: 1.7.2(babel-plugin-macros@3.1.0)
       dotenv: 16.6.1
       glob: 10.5.0
@@ -23866,7 +24639,7 @@ snapshots:
       app-root-path: 3.1.0
       buffer: 6.0.3
       dayjs: 1.11.21
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       dedent: 1.7.2(babel-plugin-macros@3.1.0)
       dotenv: 16.6.1
       glob: 10.5.0
@@ -23968,6 +24741,8 @@ snapshots:
 
   until-async@3.0.2: {}
 
+  untildify@4.0.0: {}
+
   unzipper@0.10.14:
     dependencies:
       big-integer: 1.6.52
@@ -24118,6 +24893,12 @@ snapshots:
       - '@types/react'
       - '@types/react-dom'
 
+  verror@1.10.0:
+    dependencies:
+      assert-plus: 1.0.0
+      core-util-is: 1.0.2
+      extsprintf: 1.3.0
+
   victory-vendor@36.9.2:
     dependencies:
       '@types/d3-array': 3.2.2
@@ -24161,7 +24942,7 @@ snapshots:
   vite-node@2.1.9(@types/node@24.13.1)(lightningcss@1.32.0)(terser@5.48.0):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       es-module-lexer: 1.7.0
       pathe: 1.1.2
       vite: 5.4.21(@types/node@24.13.1)(lightningcss@1.32.0)(terser@5.48.0)
@@ -24197,7 +24978,7 @@ snapshots:
       '@vitest/spy': 2.1.9
       '@vitest/utils': 2.1.9
       chai: 5.3.3
-      debug: 4.4.3(supports-color@5.5.0)
+      debug: 4.4.3(supports-color@8.1.1)
       expect-type: 1.3.0
       magic-string: 0.30.21
       pathe: 1.1.2
@@ -24538,6 +25319,10 @@ snapshots:
       buffer-crc32: 0.2.13
       fd-slicer: 1.1.0
 
+  yauzl@3.4.0:
+    dependencies:
+      pend: 1.2.0
+
   year@0.2.1: {}
 
   yn@3.1.1: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index ecf919f09..e5e748478 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -4,6 +4,7 @@ packages:
   - "apps/edr-passenger-web/*"
   - "packages/*"
   - "packages/config/*"
+  - "e2e/*"
 verifyDepsBeforeRun: warn
 allowBuilds:
   "@nestjs/core": true
@@ -14,6 +15,7 @@ allowBuilds:
   argon2: true
   bcrypt: true
   core-js: true
+  cypress: true
   es5-ext: true
   esbuild: true
   highlight.js: true