merge: sync test and stabilize full acceptance

scripts/admin-test-env-acceptance.mjs

@@ -47,6 +47,7 @@ const MODULE_DEPENDENCIES = new Map([
   ['orders', ['merchant-qualification-fixture']],
   ['inbound-hold', ['orders']],
   ['inbound-measurement', ['orders']],
+  ['inbound-fees', ['inbound-measurement']],
   ['manual-order-splitting-fixture', ['inbound-measurement']],
   ['coload-groups', ['inbound-measurement']],
   ['phase3-container-loading', ['inbound-measurement']],
@@ -1571,7 +1572,11 @@ export class AcceptanceRun {
     if (Number(readiness().dropshipContainerCount || 0) < 1) {
       await this.runPhase4ProducerVariant('DROPSHIP-PRIMARY', 'FBA', 'ONE_CLICK_DROPSHIP', true)
     }
-    if (Number(readiness().fbaContainerCount || 0) < 2) {
+    const hasStandardFbaProducer = () => (this.createdResources.phase4InboundProducerFixtures?.containers || [])
+      .some((item) => item?.destinationType === 'FBA'
+        && item?.fulfillmentType !== 'ONE_CLICK_DROPSHIP'
+        && String(item?.resourceKey || '').includes('-P4-FBA-STANDARD:'))
+    if (!hasStandardFbaProducer()) {
       await this.runPhase4ProducerVariant('FBA-STANDARD', 'FBA', 'STANDARD', true)
     }
     if (Number(readiness().overseasContainerCount || 0) < 1) {
@@ -1783,7 +1788,7 @@ export class AcceptanceRun {
           continue
         }
         let restoreFixture = null
-        if (module === 'phase4-overseas-pda') {
+        if (module === 'phase4-tail-order-controls' || module === 'phase4-overseas-pda') {
           try {
             await this.ensurePhase4PdaProducerMatrix()
           } catch (error) {