@metamask-previews/perps-controller 12.2.0-preview-e68ab1498 → 13.0.0-preview-56ae4c857

package/dist/PerpsController.mjs

@@ -9,7 +9,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _PerpsController_instances, _a, _PerpsController_initializationPromise, _PerpsController_isReinitializing, _PerpsController_myxRegistrationPromise, _PerpsController_blockedRegionListVersion, _PerpsController_hip3Enabled, _PerpsController_hip3AllowlistMarkets, _PerpsController_hip3BlocklistMarkets, _PerpsController_hip3ConfigSource, _PerpsController_priceDeviationLimit, _PerpsController_attributionContext, _PerpsController_isMYXProviderEnabled, _PerpsController_standaloneProvider, _PerpsController_handlersRegistered, _PerpsController_standaloneProviderIsTestnet, _PerpsController_standaloneProviderHip3Version, _PerpsController_standaloneProviderOperations, _PerpsController_eligibilityCheckDeferred, _PerpsController_ausQueue, _PerpsController_userDiskWrite, _PerpsController_options, _PerpsController_tradingService, _PerpsController_marketDataService, _PerpsController_accountService, _PerpsController_eligibilityService, _PerpsController_dataLakeService, _PerpsController_depositService, _PerpsController_featureFlagConfigurationService, _PerpsController_rewardsIntegrationService, _PerpsController_logError, _PerpsController_debugLog, _PerpsController_awaitInitializationIfInProgress, _PerpsController_getAggregatedCacheProviderIds, _PerpsController_isMarketCacheEntryCurrent, _PerpsController_isUserCacheIdentityCurrent, _PerpsController_fetchAndCacheUserDataSnapshot, _PerpsController_getOrCreateStandaloneProvider, _PerpsController_trackStandaloneProviderOperation, _PerpsController_retireStandaloneProvider, _PerpsController_cleanupStandaloneProvider, _PerpsController_getMetrics, _PerpsController_findNetworkClientIdForChain, _PerpsController_submitTransaction, _PerpsController_migrateRequestsIfNeeded, _PerpsController_withStreamPause, _PerpsController_performInitialization, _PerpsController_createProviders, _PerpsController_assignActiveProvider, _PerpsController_getErrorContext, _PerpsController_getControllerState, _PerpsController_buildMarketAllowedFilter, _PerpsController_compilePatternsSafely, _PerpsController_createServiceContext, _PerpsController_ensureTradingServiceDeps, _PerpsController_getActiveProviderWhenReady, _PerpsController_buildGlobalSnapshotContext, _PerpsController_getStaticSnapshotDexes, _PerpsController_preloadWatchedPaths, _PerpsController_preloadTimer, _PerpsController_isPreloading, _PerpsController_marketPreloadQueued, _PerpsController_isPreloadingUserData, _PerpsController_userPreloadQueued, _PerpsController_userSnapshotRequests, _PerpsController_preloadStateUnsubscribe, _PerpsController_accountChangeUnsubscribe, _PerpsController_previousIsTestnet, _PerpsController_previousHip3ConfigVersion, _PerpsController_preloadRefreshMs, _PerpsController_preloadGuardMs, _PerpsController_hydrateCacheFromDiskSync, _PerpsController_persistUserCacheToDisk, _PerpsController_performMarketDataPreload, _PerpsController_performUserDataPreload, _PerpsController_persistWatchlistToRemote, _PerpsController_syncWatchlistFromRemote;
+var _PerpsController_instances, _a, _PerpsController_initializationPromise, _PerpsController_isReinitializing, _PerpsController_reinitializationOperationPromise, _PerpsController_disconnectOperationPromise, _PerpsController_myxRegistrationPromise, _PerpsController_blockedRegionListVersion, _PerpsController_hip3Enabled, _PerpsController_hip3AllowlistMarkets, _PerpsController_hip3BlocklistMarkets, _PerpsController_hip3ConfigSource, _PerpsController_priceDeviationLimit, _PerpsController_attributionContext, _PerpsController_isMYXProviderEnabled, _PerpsController_standaloneProvider, _PerpsController_handlersRegistered, _PerpsController_standaloneProviderIsTestnet, _PerpsController_standaloneProviderHip3Version, _PerpsController_standaloneProviderOperations, _PerpsController_eligibilityCheckDeferred, _PerpsController_ausQueue, _PerpsController_userDiskWrite, _PerpsController_options, _PerpsController_tradingService, _PerpsController_marketDataService, _PerpsController_accountService, _PerpsController_eligibilityService, _PerpsController_dataLakeService, _PerpsController_depositService, _PerpsController_featureFlagConfigurationService, _PerpsController_rewardsIntegrationService, _PerpsController_publishChaseOrderMaxDistanceReached, _PerpsController_logError, _PerpsController_debugLog, _PerpsController_getAggregatedCacheProviderIds, _PerpsController_isMarketCacheEntryCurrent, _PerpsController_isUserCacheIdentityCurrent, _PerpsController_fetchAndCacheUserDataSnapshot, _PerpsController_getOrCreateStandaloneProvider, _PerpsController_trackStandaloneProviderOperation, _PerpsController_retireStandaloneProvider, _PerpsController_cleanupStandaloneProvider, _PerpsController_getMetrics, _PerpsController_findNetworkClientIdForChain, _PerpsController_submitTransaction, _PerpsController_migrateRequestsIfNeeded, _PerpsController_withStreamPause, _PerpsController_initWithoutDisconnectWait, _PerpsController_beginReinitialization, _PerpsController_performInitialization, _PerpsController_createProviders, _PerpsController_assignActiveProvider, _PerpsController_getErrorContext, _PerpsController_getControllerState, _PerpsController_buildMarketAllowedFilter, _PerpsController_compilePatternsSafely, _PerpsController_createServiceContext, _PerpsController_ensureTradingServiceDeps, _PerpsController_getActiveProviderWhenReady, _PerpsController_getUnavailableOrderCapabilities, _PerpsController_getDirectProviderId, _PerpsController_hasConflictingProviderRoute, _PerpsController_resolveRoutedOrderProvider, _PerpsController_buildGlobalSnapshotContext, _PerpsController_getStaticSnapshotDexes, _PerpsController_preloadWatchedPaths, _PerpsController_preloadTimer, _PerpsController_preloadStartRequested, _PerpsController_isPreloading, _PerpsController_marketPreloadQueued, _PerpsController_isPreloadingUserData, _PerpsController_userPreloadQueued, _PerpsController_lifecycleGeneration, _PerpsController_userSnapshotRequests, _PerpsController_preloadStateUnsubscribe, _PerpsController_accountChangeUnsubscribe, _PerpsController_previousIsTestnet, _PerpsController_previousHip3ConfigVersion, _PerpsController_preloadRefreshMs, _PerpsController_preloadGuardMs, _PerpsController_hydrateCacheFromDiskSync, _PerpsController_persistUserCacheToDisk, _PerpsController_performMarketDataPreload, _PerpsController_performUserDataPreload, _PerpsController_performDisconnect, _PerpsController_persistWatchlistToRemote, _PerpsController_syncWatchlistFromRemote;
 import { BaseController } from "@metamask/base-controller";
 import { ORIGIN_METAMASK } from "@metamask/controller-utils";
 import { v4 as uuidv4 } from "uuid";
@@ -36,6 +36,7 @@ import { getSelectedEvmAccountFromMessenger } from "./utils/accountUtils.mjs";
 import { ensureError } from "./utils/errorUtils.mjs";
 import { parseAssetName } from "./utils/hyperLiquidAdapter.mjs";
 import { clonePerpsMarketData, compileMarketPattern, shouldIncludeMarket } from "./utils/marketUtils.mjs";
+import { isStrategyOrderType } from "./utils/orderTypes.mjs";
 import { hydrateFromDiskSync, persistMarketEntriesToDisk, persistUserEntriesToDisk } from "./utils/perpsDiskPersistence.mjs";
 import { wait } from "./utils/wait.mjs";
 function cloneUserDataSnapshot(snapshot) {
@@ -453,6 +454,7 @@ const MESSENGER_EXPOSED_METHODS = [
     'getCachedMarketDataForActiveProvider',
     'getCachedUserDataForActiveProvider',
     'getChaseOrders',
+    'getTwapOrders',
     'getUserDataSnapshot',
     'getCurrentNetwork',
     'getFunding',
@@ -465,6 +467,7 @@ const MESSENGER_EXPOSED_METHODS = [
     'getOpenOrders',
     'getOrderBookGrouping',
     'getOrderBookPreferences',
+    'getOrderCapabilities',
     'getOrderFills',
     'getOrders',
     'getPendingTradeConfiguration',
@@ -551,6 +554,8 @@ export class PerpsController extends BaseController {
         this.isInitialized = false;
         _PerpsController_initializationPromise.set(this, null);
         _PerpsController_isReinitializing.set(this, false);
+        _PerpsController_reinitializationOperationPromise.set(this, null);
+        _PerpsController_disconnectOperationPromise.set(this, null);
         /** Tracks the async MYX dynamic import so performInitialization can await it. */
         _PerpsController_myxRegistrationPromise.set(this, null);
         this.blockedRegionList = {
@@ -622,11 +627,16 @@ export class PerpsController extends BaseController {
         _PerpsController_depositService.set(this, void 0);
         _PerpsController_featureFlagConfigurationService.set(this, void 0);
         _PerpsController_rewardsIntegrationService.set(this, void 0);
+        _PerpsController_publishChaseOrderMaxDistanceReached.set(this, (event) => {
+            this.messenger.publish('PerpsController:chaseOrderMaxDistanceReached', event);
+        });
         _PerpsController_preloadTimer.set(this, null);
+        _PerpsController_preloadStartRequested.set(this, false);
         _PerpsController_isPreloading.set(this, false);
         _PerpsController_marketPreloadQueued.set(this, false);
         _PerpsController_isPreloadingUserData.set(this, false);
         _PerpsController_userPreloadQueued.set(this, false);
+        _PerpsController_lifecycleGeneration.set(this, 0);
         _PerpsController_userSnapshotRequests.set(this, new Map());
         _PerpsController_preloadStateUnsubscribe.set(this, null);
         _PerpsController_accountChangeUnsubscribe.set(this, null);
@@ -850,6 +860,7 @@ export class PerpsController extends BaseController {
         }
         const { address } = evmAccount;
         const { isTestnet, hip3ConfigVersion } = this.state;
+        const lifecycleGeneration = __classPrivateFieldGet(this, _PerpsController_lifecycleGeneration, "f");
         const network = isTestnet ? 'testnet' : 'mainnet';
         const expectedDexes = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getStaticSnapshotDexes).call(this);
         if (!expectedDexes) {
@@ -863,7 +874,8 @@ export class PerpsController extends BaseController {
             catch {
                 return false;
             }
-            return (this.state.activeProvider === 'hyperliquid' &&
+            return (__classPrivateFieldGet(this, _PerpsController_lifecycleGeneration, "f") === lifecycleGeneration &&
+                this.state.activeProvider === 'hyperliquid' &&
                 (!capturedActiveProvider ||
                     this.activeProviderInstance === capturedActiveProvider) &&
                 this.state.isTestnet === isTestnet &&
@@ -979,18 +991,19 @@ export class PerpsController extends BaseController {
      * @returns A promise that resolves when the operation completes.
      */
     async init() {
-        if (!__classPrivateFieldGet(this, _PerpsController_handlersRegistered, "f")) {
-            this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
-            __classPrivateFieldSet(this, _PerpsController_handlersRegistered, true, "f");
-        }
-        if (this.isInitialized) {
-            return undefined;
-        }
-        if (__classPrivateFieldGet(this, _PerpsController_initializationPromise, "f")) {
-            return __classPrivateFieldGet(this, _PerpsController_initializationPromise, "f");
+        while (true) {
+            const pendingDisconnect = __classPrivateFieldGet(this, _PerpsController_disconnectOperationPromise, "f");
+            if (pendingDisconnect) {
+                await pendingDisconnect;
+                continue;
+            }
+            const pendingReinitialization = __classPrivateFieldGet(this, _PerpsController_reinitializationOperationPromise, "f");
+            if (pendingReinitialization) {
+                await pendingReinitialization;
+                continue;
+            }
+            return __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_initWithoutDisconnectWait).call(this);
         }
-        __classPrivateFieldSet(this, _PerpsController_initializationPromise, __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performInitialization).call(this), "f");
-        return __classPrivateFieldGet(this, _PerpsController_initializationPromise, "f");
     }
     /**
      * Registers the MYX provider after dynamic import resolves.
@@ -1092,6 +1105,50 @@ export class PerpsController extends BaseController {
         // Return the active provider instance or null if not found
         return this.activeProviderInstance ?? null;
     }
+    /**
+     * Get strategy capabilities through the active provider route used by order
+     * placement. The query waits for in-flight initialization and reports an
+     * explicit unavailable status when no provider route can answer reliably.
+     *
+     * @param params - Market and optional provider route.
+     * @returns Provider-owned order capabilities.
+     */
+    async getOrderCapabilities(params) {
+        let activeProvider;
+        try {
+            activeProvider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getActiveProviderWhenReady).call(this);
+        }
+        catch (error) {
+            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Order capabilities unavailable', {
+                error: ensureError(error, 'PerpsController.getOrderCapabilities')
+                    .message,
+            });
+            return __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getUnavailableOrderCapabilities).call(this, 'provider_unavailable', params.providerId);
+        }
+        const resolvedProviderId = params.providerId ?? __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getDirectProviderId).call(this, activeProvider);
+        if (__classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_hasConflictingProviderRoute).call(this, params.providerId, activeProvider)) {
+            return __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getUnavailableOrderCapabilities).call(this, 'provider_not_routable', resolvedProviderId);
+        }
+        if (!activeProvider.getOrderCapabilities) {
+            return __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getUnavailableOrderCapabilities).call(this, 'not_implemented', resolvedProviderId);
+        }
+        try {
+            const capabilities = await activeProvider.getOrderCapabilities(params);
+            if (capabilities.status === 'unavailable' &&
+                capabilities.providerId === undefined &&
+                resolvedProviderId !== undefined) {
+                return { ...capabilities, providerId: resolvedProviderId };
+            }
+            return capabilities;
+        }
+        catch (error) {
+            const safeError = ensureError(error, 'PerpsController.getOrderCapabilities');
+            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Order capabilities unavailable', {
+                error: safeError.message,
+            });
+            return __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getUnavailableOrderCapabilities).call(this, 'provider_unavailable', resolvedProviderId);
+        }
+    }
     /**
      * Place a new order
      * Thin delegation to TradingService
@@ -1100,7 +1157,10 @@ export class PerpsController extends BaseController {
      * @returns The order result with order ID and status.
      */
     async placeOrder(params) {
-        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getActiveProviderWhenReady).call(this);
+        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_resolveRoutedOrderProvider).call(this, {
+            orderType: params.orderType,
+            providerId: params.providerId,
+        });
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_ensureTradingServiceDeps).call(this);
         const result = await __classPrivateFieldGet(this, _PerpsController_tradingService, "f").placeOrder({
             provider,
@@ -1123,7 +1183,16 @@ export class PerpsController extends BaseController {
      * @returns The updated order result with order ID and status.
      */
     async editOrder(params) {
-        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getActiveProviderWhenReady).call(this);
+        if (isStrategyOrderType(params.newOrder.orderType)) {
+            return {
+                success: false,
+                error: PERPS_ERROR_CODES.ORDER_EDIT_STRATEGY_UNSUPPORTED,
+            };
+        }
+        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_resolveRoutedOrderProvider).call(this, {
+            orderType: params.newOrder.orderType,
+            providerId: params.newOrder.providerId,
+        });
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_ensureTradingServiceDeps).call(this);
         return __classPrivateFieldGet(this, _PerpsController_tradingService, "f").editOrder({
             provider,
@@ -1138,13 +1207,26 @@ export class PerpsController extends BaseController {
      * @returns The cancellation result with status.
      */
     async cancelOrder(params) {
-        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getActiveProviderWhenReady).call(this);
+        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_resolveRoutedOrderProvider).call(this, {
+            orderType: params.orderType,
+            providerId: params.providerId,
+        });
         return __classPrivateFieldGet(this, _PerpsController_tradingService, "f").cancelOrder({
             provider,
             params,
             context: __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_createServiceContext).call(this, 'cancelOrder'),
         });
     }
+    /**
+     * Read venue-backed TWAP lifecycle records through the active provider.
+     * Providers without native TWAP history return an empty list.
+     *
+     * @returns Current and terminal TWAP schedules with slice fills.
+     */
+    async getTwapOrders() {
+        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getActiveProviderWhenReady).call(this);
+        return provider.getTwapOrders ? await provider.getTwapOrders() : [];
+    }
     /**
      * Read the active provider's retained Chase lifecycle snapshots.
      * Providers without an emulated Chase implementation return an empty list.
@@ -1195,7 +1277,10 @@ export class PerpsController extends BaseController {
      * @returns The order result from the close position request.
      */
     async closePosition(params) {
-        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getActiveProviderWhenReady).call(this);
+        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_resolveRoutedOrderProvider).call(this, {
+            orderType: params.orderType,
+            providerId: params.providerId,
+        });
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_ensureTradingServiceDeps).call(this);
         return __classPrivateFieldGet(this, _PerpsController_tradingService, "f").closePosition({
             provider,
@@ -1231,7 +1316,10 @@ export class PerpsController extends BaseController {
      * @returns The order result from the TP/SL update.
      */
     async updatePositionTPSL(params) {
-        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getActiveProviderWhenReady).call(this);
+        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_resolveRoutedOrderProvider).call(this, {
+            orderType: undefined,
+            providerId: params.providerId,
+        });
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_ensureTradingServiceDeps).call(this);
         return __classPrivateFieldGet(this, _PerpsController_tradingService, "f").updatePositionTPSL({
             provider,
@@ -1917,6 +2005,11 @@ export class PerpsController extends BaseController {
      * Watches for isTestnet and hip3ConfigVersion changes to re-preload.
      */
     startMarketDataPreload() {
+        __classPrivateFieldSet(this, _PerpsController_preloadStartRequested, true, "f");
+        if (__classPrivateFieldGet(this, _PerpsController_disconnectOperationPromise, "f")) {
+            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Disconnect in progress, deferring market data preload');
+            return;
+        }
         if (__classPrivateFieldGet(this, _PerpsController_preloadTimer, "f")) {
             __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Preload already started, skipping');
             return;
@@ -2005,6 +2098,7 @@ export class PerpsController extends BaseController {
      */
     stopMarketDataPreload() {
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Stopping market data preload');
+        __classPrivateFieldSet(this, _PerpsController_preloadStartRequested, false, "f");
         if (__classPrivateFieldGet(this, _PerpsController_preloadTimer, "f")) {
             clearInterval(__classPrivateFieldGet(this, _PerpsController_preloadTimer, "f"));
             __classPrivateFieldSet(this, _PerpsController_preloadTimer, null, "f");
@@ -2113,7 +2207,10 @@ export class PerpsController extends BaseController {
      * @returns True if the condition is met.
      */
     async validateOrder(params) {
-        const provider = this.getActiveProvider();
+        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_resolveRoutedOrderProvider).call(this, {
+            orderType: params.orderType,
+            providerId: params.providerId,
+        });
         const context = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_createServiceContext).call(this, 'validateOrder');
         return __classPrivateFieldGet(this, _PerpsController_marketDataService, "f").validateOrder({ provider, params, context });
     }
@@ -2124,7 +2221,10 @@ export class PerpsController extends BaseController {
      * @returns A promise that resolves to the result.
      */
     async validateClosePosition(params) {
-        const provider = this.getActiveProvider();
+        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_resolveRoutedOrderProvider).call(this, {
+            orderType: params.orderType,
+            providerId: params.providerId,
+        });
         const context = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_createServiceContext).call(this, 'validateClosePosition');
         return __classPrivateFieldGet(this, _PerpsController_marketDataService, "f").validateClosePosition({
             provider,
@@ -2217,6 +2317,9 @@ export class PerpsController extends BaseController {
      * @returns The toggle result with success status and current network mode.
      */
     async toggleTestnet() {
+        while (__classPrivateFieldGet(this, _PerpsController_disconnectOperationPromise, "f")) {
+            await __classPrivateFieldGet(this, _PerpsController_disconnectOperationPromise, "f");
+        }
         // Prevent concurrent reinitializations
         if (this.isCurrentlyReinitializing()) {
             __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Already reinitializing, skipping toggle', {
@@ -2228,10 +2331,13 @@ export class PerpsController extends BaseController {
                 error: PERPS_ERROR_CODES.CLIENT_REINITIALIZING,
             };
         }
-        __classPrivateFieldSet(this, _PerpsController_isReinitializing, true, "f");
-        // Store previous isTestnet for rollback on failure
+        const completeReinitialization = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_beginReinitialization).call(this);
         const previousIsTestnet = this.state.isTestnet;
         try {
+            const pendingInitialization = __classPrivateFieldGet(this, _PerpsController_initializationPromise, "f");
+            if (pendingInitialization) {
+                await pendingInitialization;
+            }
             await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_cleanupStandaloneProvider).call(this);
             const previousNetwork = previousIsTestnet ? 'testnet' : 'mainnet';
             this.update((state) => {
@@ -2246,7 +2352,7 @@ export class PerpsController extends BaseController {
             // Reset initialization state and reinitialize provider with new testnet setting
             this.isInitialized = false;
             __classPrivateFieldSet(this, _PerpsController_initializationPromise, null, "f");
-            await this.init();
+            await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_initWithoutDisconnectWait).call(this);
             // Check if initialization actually succeeded — performInitialization()
             // does not throw on failure, it sets state to Failed and resolves.
             if (this.state.initializationState === InitializationState.Failed) {
@@ -2272,7 +2378,7 @@ export class PerpsController extends BaseController {
             };
         }
         finally {
-            __classPrivateFieldSet(this, _PerpsController_isReinitializing, false, "f");
+            completeReinitialization();
             // Re-trigger preload now that reinit is complete and the
             // activeProviderInstance points to the correct network.
             // The state-change listener may have already fired during reinit
@@ -2296,19 +2402,8 @@ export class PerpsController extends BaseController {
      * @returns The switch result with success status and active provider.
      */
     async switchProvider(providerId) {
-        // No-op if already on this provider (regardless of init state)
-        if (this.state.activeProvider === providerId) {
-            return { success: true, providerId };
-        }
-        // Validate provider is available
-        // 'aggregated' is always valid, individual providers must exist in the map
-        const isValidProvider = providerId === 'aggregated' || this.providers.has(providerId);
-        if (!isValidProvider) {
-            return {
-                success: false,
-                providerId: this.state.activeProvider,
-                error: `Provider ${providerId} not available`,
-            };
+        while (__classPrivateFieldGet(this, _PerpsController_disconnectOperationPromise, "f")) {
+            await __classPrivateFieldGet(this, _PerpsController_disconnectOperationPromise, "f");
         }
         // Prevent concurrent switches
         if (this.isCurrentlyReinitializing()) {
@@ -2318,10 +2413,44 @@ export class PerpsController extends BaseController {
                 error: PERPS_ERROR_CODES.CLIENT_REINITIALIZING,
             };
         }
-        __classPrivateFieldSet(this, _PerpsController_isReinitializing, true, "f");
-        // Store previous provider for rollback on failure
-        const previousProvider = this.state.activeProvider;
+        const completeReinitialization = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_beginReinitialization).call(this);
+        let previousProvider = this.state.activeProvider;
         try {
+            const pendingInitialization = __classPrivateFieldGet(this, _PerpsController_initializationPromise, "f");
+            if (pendingInitialization) {
+                await pendingInitialization;
+            }
+            // A completed disconnect leaves no initialization promise to await. Rebuild
+            // the provider registry before same-provider detection or route validation
+            // so a successful switch always leaves a usable active provider.
+            const needsInitialization = !this.isInitialized ||
+                this.state.initializationState !== InitializationState.Initialized;
+            if (needsInitialization) {
+                await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_initWithoutDisconnectWait).call(this);
+                const initializationFailed = !this.isInitialized ||
+                    this.state.initializationState !== InitializationState.Initialized;
+                if (initializationFailed) {
+                    throw new Error(this.state.initializationError ?? 'Provider initialization failed');
+                }
+            }
+            // Initialization may select a fallback provider. Read the effective
+            // provider only after it settles so no-op detection and rollback both
+            // use the state this switch is actually replacing.
+            previousProvider = this.state.activeProvider;
+            if (previousProvider === providerId) {
+                return { success: true, providerId };
+            }
+            // Validate provider only after a pending initialization has rebuilt the
+            // registry. Otherwise a switch queued behind disconnect can observe the
+            // intentionally empty teardown state.
+            const isValidProvider = providerId === 'aggregated' || this.providers.has(providerId);
+            if (!isValidProvider) {
+                return {
+                    success: false,
+                    providerId: this.state.activeProvider,
+                    error: `Provider ${providerId} not available`,
+                };
+            }
             await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_cleanupStandaloneProvider).call(this);
             __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Provider switch initiated', {
                 from: previousProvider,
@@ -2329,8 +2458,7 @@ export class PerpsController extends BaseController {
                 timestamp: new Date().toISOString(),
             });
             // Provider disconnect is handled by performInitialization() during
-            // reinitialization. The disconnect() method skips provider teardown
-            // when isReinitializing is true to prevent double-disconnect.
+            // reinitialization.
             // Update state with new provider (market data cache preserved per-provider)
             this.update((state) => {
                 state.activeProvider = providerId;
@@ -2340,7 +2468,7 @@ export class PerpsController extends BaseController {
             // Reset initialization state and reinitialize
             this.isInitialized = false;
             __classPrivateFieldSet(this, _PerpsController_initializationPromise, null, "f");
-            await this.init();
+            await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_initWithoutDisconnectWait).call(this);
             // Check if initialization actually succeeded — performInitialization()
             // does not throw on failure, it sets state to Failed and resolves.
             if (this.state.initializationState === InitializationState.Failed) {
@@ -2363,7 +2491,7 @@ export class PerpsController extends BaseController {
             try {
                 this.isInitialized = false;
                 __classPrivateFieldSet(this, _PerpsController_initializationPromise, null, "f");
-                await this.init();
+                await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_initWithoutDisconnectWait).call(this);
                 __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Rollback to previous provider succeeded', {
                     previousProvider,
                     timestamp: new Date().toISOString(),
@@ -2387,7 +2515,7 @@ export class PerpsController extends BaseController {
             };
         }
         finally {
-            __classPrivateFieldSet(this, _PerpsController_isReinitializing, false, "f");
+            completeReinitialization();
             // Re-trigger preload now that reinit is complete.
             if (__classPrivateFieldGet(this, _PerpsController_preloadTimer, "f")) {
                 __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performMarketDataPreload).call(this).catch(() => {
@@ -2723,14 +2851,18 @@ export class PerpsController extends BaseController {
         }
     }
     /**
-     * Calculate trading fees for the active provider
-     * Each provider implements its own fee structure
+     * Calculate trading fees through the active provider route.
+     * Each provider owns its fee policy. An explicit provider route overrides
+     * the active/default provider used by placement.
      *
      * @param params - The operation parameters.
      * @returns The fee calculation result for the trade.
      */
     async calculateFees(params) {
-        const provider = this.getActiveProvider();
+        const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_resolveRoutedOrderProvider).call(this, {
+            orderType: params.orderType,
+            providerId: params.providerId,
+        });
         // Preview owns subscription hydration. The submit resolver remains a pure
         // cache read and can therefore never start a benefits request while an
         // order is being signed.
@@ -2771,46 +2903,33 @@ export class PerpsController extends BaseController {
      * Call this when navigating away from Perps screens to prevent battery drain
      */
     async disconnect() {
-        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Disconnecting provider to cleanup subscriptions', {
-            timestamp: new Date().toISOString(),
+        while (__classPrivateFieldGet(this, _PerpsController_disconnectOperationPromise, "f")) {
+            // Each explicit disconnect claims a teardown after the operation already
+            // in flight. This lets a later disconnect close providers created by an
+            // init call that was queued behind the same earlier teardown.
+            __classPrivateFieldSet(this, _PerpsController_preloadStartRequested, false, "f");
+            await __classPrivateFieldGet(this, _PerpsController_disconnectOperationPromise, "f");
+        }
+        // A disconnect stops the current preload session. A later start call made
+        // while teardown is in flight sets this back to true and is resumed below.
+        __classPrivateFieldSet(this, _PerpsController_preloadStartRequested, false, "f");
+        let resolveOperation = () => undefined;
+        const operation = new Promise((resolve) => {
+            resolveOperation = resolve;
         });
-        // Stop preload interval and messenger subscriptions first,
-        // so no background work fires while we tear down providers.
-        if (__classPrivateFieldGet(this, _PerpsController_preloadTimer, "f")) {
-            clearInterval(__classPrivateFieldGet(this, _PerpsController_preloadTimer, "f"));
-            __classPrivateFieldSet(this, _PerpsController_preloadTimer, null, "f");
-        }
-        if (__classPrivateFieldGet(this, _PerpsController_preloadStateUnsubscribe, "f")) {
-            __classPrivateFieldGet(this, _PerpsController_preloadStateUnsubscribe, "f").call(this);
-            __classPrivateFieldSet(this, _PerpsController_preloadStateUnsubscribe, null, "f");
-        }
-        if (__classPrivateFieldGet(this, _PerpsController_accountChangeUnsubscribe, "f")) {
-            __classPrivateFieldGet(this, _PerpsController_accountChangeUnsubscribe, "f").call(this);
-            __classPrivateFieldSet(this, _PerpsController_accountChangeUnsubscribe, null, "f");
+        __classPrivateFieldSet(this, _PerpsController_disconnectOperationPromise, operation, "f");
+        try {
+            await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performDisconnect).call(this);
         }
-        __classPrivateFieldSet(this, _PerpsController_previousIsTestnet, null, "f");
-        __classPrivateFieldSet(this, _PerpsController_previousHip3ConfigVersion, null, "f");
-        // Only disconnect the provider if we're initialized
-        if (this.isInitialized && !this.isCurrentlyReinitializing()) {
-            try {
-                const provider = this.getActiveProvider();
-                await provider.disconnect();
+        finally {
+            resolveOperation();
+            if (__classPrivateFieldGet(this, _PerpsController_disconnectOperationPromise, "f") === operation) {
+                __classPrivateFieldSet(this, _PerpsController_disconnectOperationPromise, null, "f");
             }
-            catch (error) {
-                __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_logError).call(this, ensureError(error, 'PerpsController.disconnect'), __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getErrorContext).call(this, 'disconnect'));
+            if (__classPrivateFieldGet(this, _PerpsController_preloadStartRequested, "f")) {
+                this.startMarketDataPreload();
             }
         }
-        // Clear stale reference so standalone reads don't route through old provider
-        this.activeProviderInstance = null;
-        // Cleanup cached standalone provider (if any) — awaited to prevent races
-        await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_cleanupStandaloneProvider).call(this);
-        // Note: Feature-flag subscription is NOT cleaned up here.
-        // It is a controller-lifetime concern (set once in the constructor),
-        // not a session-lifetime concern. Unsubscribing here would break
-        // geo-blocking / HIP-3 flag propagation after disconnect → reconnect.
-        // Reset initialization state to ensure proper reconnection
-        this.isInitialized = false;
-        __classPrivateFieldSet(this, _PerpsController_initializationPromise, null, "f");
     }
     /**
      * Eligibility (Geo-Blocking)
@@ -3558,7 +3677,7 @@ export class PerpsController extends BaseController {
         return __classPrivateFieldGet(this, _PerpsController_isReinitializing, "f");
     }
 }
-_a = PerpsController, _PerpsController_initializationPromise = new WeakMap(), _PerpsController_isReinitializing = new WeakMap(), _PerpsController_myxRegistrationPromise = new WeakMap(), _PerpsController_blockedRegionListVersion = new WeakMap(), _PerpsController_hip3Enabled = new WeakMap(), _PerpsController_hip3AllowlistMarkets = new WeakMap(), _PerpsController_hip3BlocklistMarkets = new WeakMap(), _PerpsController_hip3ConfigSource = new WeakMap(), _PerpsController_priceDeviationLimit = new WeakMap(), _PerpsController_attributionContext = new WeakMap(), _PerpsController_standaloneProvider = new WeakMap(), _PerpsController_handlersRegistered = new WeakMap(), _PerpsController_standaloneProviderIsTestnet = new WeakMap(), _PerpsController_standaloneProviderHip3Version = new WeakMap(), _PerpsController_standaloneProviderOperations = new WeakMap(), _PerpsController_eligibilityCheckDeferred = new WeakMap(), _PerpsController_ausQueue = new WeakMap(), _PerpsController_userDiskWrite = new WeakMap(), _PerpsController_options = new WeakMap(), _PerpsController_tradingService = new WeakMap(), _PerpsController_marketDataService = new WeakMap(), _PerpsController_accountService = new WeakMap(), _PerpsController_eligibilityService = new WeakMap(), _PerpsController_dataLakeService = new WeakMap(), _PerpsController_depositService = new WeakMap(), _PerpsController_featureFlagConfigurationService = new WeakMap(), _PerpsController_rewardsIntegrationService = new WeakMap(), _PerpsController_preloadTimer = new WeakMap(), _PerpsController_isPreloading = new WeakMap(), _PerpsController_marketPreloadQueued = new WeakMap(), _PerpsController_isPreloadingUserData = new WeakMap(), _PerpsController_userPreloadQueued = new WeakMap(), _PerpsController_userSnapshotRequests = new WeakMap(), _PerpsController_preloadStateUnsubscribe = new WeakMap(), _PerpsController_accountChangeUnsubscribe = new WeakMap(), _PerpsController_previousIsTestnet = new WeakMap(), _PerpsController_previousHip3ConfigVersion = new WeakMap(), _PerpsController_instances = new WeakSet(), _PerpsController_isMYXProviderEnabled = function _PerpsController_isMYXProviderEnabled() {
+_a = PerpsController, _PerpsController_initializationPromise = new WeakMap(), _PerpsController_isReinitializing = new WeakMap(), _PerpsController_reinitializationOperationPromise = new WeakMap(), _PerpsController_disconnectOperationPromise = new WeakMap(), _PerpsController_myxRegistrationPromise = new WeakMap(), _PerpsController_blockedRegionListVersion = new WeakMap(), _PerpsController_hip3Enabled = new WeakMap(), _PerpsController_hip3AllowlistMarkets = new WeakMap(), _PerpsController_hip3BlocklistMarkets = new WeakMap(), _PerpsController_hip3ConfigSource = new WeakMap(), _PerpsController_priceDeviationLimit = new WeakMap(), _PerpsController_attributionContext = new WeakMap(), _PerpsController_standaloneProvider = new WeakMap(), _PerpsController_handlersRegistered = new WeakMap(), _PerpsController_standaloneProviderIsTestnet = new WeakMap(), _PerpsController_standaloneProviderHip3Version = new WeakMap(), _PerpsController_standaloneProviderOperations = new WeakMap(), _PerpsController_eligibilityCheckDeferred = new WeakMap(), _PerpsController_ausQueue = new WeakMap(), _PerpsController_userDiskWrite = new WeakMap(), _PerpsController_options = new WeakMap(), _PerpsController_tradingService = new WeakMap(), _PerpsController_marketDataService = new WeakMap(), _PerpsController_accountService = new WeakMap(), _PerpsController_eligibilityService = new WeakMap(), _PerpsController_dataLakeService = new WeakMap(), _PerpsController_depositService = new WeakMap(), _PerpsController_featureFlagConfigurationService = new WeakMap(), _PerpsController_rewardsIntegrationService = new WeakMap(), _PerpsController_publishChaseOrderMaxDistanceReached = new WeakMap(), _PerpsController_preloadTimer = new WeakMap(), _PerpsController_preloadStartRequested = new WeakMap(), _PerpsController_isPreloading = new WeakMap(), _PerpsController_marketPreloadQueued = new WeakMap(), _PerpsController_isPreloadingUserData = new WeakMap(), _PerpsController_userPreloadQueued = new WeakMap(), _PerpsController_lifecycleGeneration = new WeakMap(), _PerpsController_userSnapshotRequests = new WeakMap(), _PerpsController_preloadStateUnsubscribe = new WeakMap(), _PerpsController_accountChangeUnsubscribe = new WeakMap(), _PerpsController_previousIsTestnet = new WeakMap(), _PerpsController_previousHip3ConfigVersion = new WeakMap(), _PerpsController_instances = new WeakSet(), _PerpsController_isMYXProviderEnabled = function _PerpsController_isMYXProviderEnabled() {
     const myx = __classPrivateFieldGet(this, _PerpsController_options, "f").clientConfig?.providerCredentials?.myx;
     // Local env-var override (MM_PERPS_MYX_PROVIDER_ENABLED) always wins —
     // matches the UI selector (resolvePerpsMyxProviderEnabled) so controller
@@ -3591,16 +3710,6 @@ _a = PerpsController, _PerpsController_initializationPromise = new WeakMap(), _P
     __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.logger.error(error, options);
 }, _PerpsController_debugLog = function _PerpsController_debugLog(...args) {
     __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.debugLogger.log(...args);
-}, _PerpsController_awaitInitializationIfInProgress = 
-/**
- * Awaits the in-flight initialization promise if init is currently running.
- * Called internally by #getActiveProviderWhenReady().
- */
-async function _PerpsController_awaitInitializationIfInProgress() {
-    if (this.state.initializationState === InitializationState.Initializing &&
-        __classPrivateFieldGet(this, _PerpsController_initializationPromise, "f")) {
-        await __classPrivateFieldGet(this, _PerpsController_initializationPromise, "f");
-    }
 }, _PerpsController_getAggregatedCacheProviderIds = function _PerpsController_getAggregatedCacheProviderIds(cacheKeys) {
     const providerIds = new Set();
     const currentNetwork = this.state.isTestnet ? 'testnet' : 'mainnet';
@@ -3745,6 +3854,7 @@ async function _PerpsController_awaitInitializationIfInProgress() {
             ?.subscriptionBuilderAddressTestnet,
         subscriptionBuilderAddressMainnet: __classPrivateFieldGet(this, _PerpsController_options, "f").clientConfig?.providerCredentials?.hyperliquid
             ?.subscriptionBuilderAddressMainnet,
+        onChaseOrderMaxDistanceReached: __classPrivateFieldGet(this, _PerpsController_publishChaseOrderMaxDistanceReached, "f"),
     }), "f");
     __classPrivateFieldSet(this, _PerpsController_standaloneProviderIsTestnet, currentIsTestnet, "f");
     __classPrivateFieldSet(this, _PerpsController_standaloneProviderHip3Version, currentHip3Version, "f");
@@ -3889,6 +3999,40 @@ async function _PerpsController_withStreamPause(operation, channels) {
             }
         }
     }
+}, _PerpsController_initWithoutDisconnectWait = 
+/**
+ * Initialize without waiting for disconnect. Reinitialization operations use
+ * this after they have claimed the controller lifecycle.
+ *
+ * @returns A promise that resolves when initialization finishes.
+ */
+async function _PerpsController_initWithoutDisconnectWait() {
+    if (!__classPrivateFieldGet(this, _PerpsController_handlersRegistered, "f")) {
+        this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
+        __classPrivateFieldSet(this, _PerpsController_handlersRegistered, true, "f");
+    }
+    if (this.isInitialized) {
+        return undefined;
+    }
+    if (__classPrivateFieldGet(this, _PerpsController_initializationPromise, "f")) {
+        return __classPrivateFieldGet(this, _PerpsController_initializationPromise, "f");
+    }
+    __classPrivateFieldSet(this, _PerpsController_initializationPromise, __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performInitialization).call(this), "f");
+    return __classPrivateFieldGet(this, _PerpsController_initializationPromise, "f");
+}, _PerpsController_beginReinitialization = function _PerpsController_beginReinitialization() {
+    __classPrivateFieldSet(this, _PerpsController_isReinitializing, true, "f");
+    let resolveOperation = () => undefined;
+    const operation = new Promise((resolve) => {
+        resolveOperation = resolve;
+    });
+    __classPrivateFieldSet(this, _PerpsController_reinitializationOperationPromise, operation, "f");
+    return () => {
+        __classPrivateFieldSet(this, _PerpsController_isReinitializing, false, "f");
+        resolveOperation();
+        if (__classPrivateFieldGet(this, _PerpsController_reinitializationOperationPromise, "f") === operation) {
+            __classPrivateFieldSet(this, _PerpsController_reinitializationOperationPromise, null, "f");
+        }
+    };
 }, _PerpsController_performInitialization = 
 /**
  * Actual initialization implementation with retry logic
@@ -4009,6 +4153,7 @@ async function _PerpsController_performInitialization() {
             ?.subscriptionBuilderAddressTestnet,
         subscriptionBuilderAddressMainnet: __classPrivateFieldGet(this, _PerpsController_options, "f").clientConfig?.providerCredentials?.hyperliquid
             ?.subscriptionBuilderAddressMainnet,
+        onChaseOrderMaxDistanceReached: __classPrivateFieldGet(this, _PerpsController_publishChaseOrderMaxDistanceReached, "f"),
     });
     this.providers.set('hyperliquid', hyperLiquidProvider);
     // Register MYX provider if enabled via feature flag.
@@ -4138,8 +4283,56 @@ async function _PerpsController_performInitialization() {
  * @returns The active provider once initialization completes.
  */
 async function _PerpsController_getActiveProviderWhenReady() {
-    await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_awaitInitializationIfInProgress).call(this);
-    return this.getActiveProvider();
+    while (true) {
+        const pendingDisconnect = __classPrivateFieldGet(this, _PerpsController_disconnectOperationPromise, "f");
+        if (pendingDisconnect) {
+            await pendingDisconnect;
+            continue;
+        }
+        const pendingReinitialization = __classPrivateFieldGet(this, _PerpsController_reinitializationOperationPromise, "f");
+        if (pendingReinitialization) {
+            await pendingReinitialization;
+            continue;
+        }
+        const pendingInitialization = __classPrivateFieldGet(this, _PerpsController_initializationPromise, "f");
+        if (this.state.initializationState === InitializationState.Initializing &&
+            pendingInitialization) {
+            await pendingInitialization;
+            continue;
+        }
+        return this.getActiveProvider();
+    }
+}, _PerpsController_getUnavailableOrderCapabilities = function _PerpsController_getUnavailableOrderCapabilities(reason, providerId) {
+    return providerId
+        ? { status: 'unavailable', providerId, reason }
+        : { status: 'unavailable', reason };
+}, _PerpsController_getDirectProviderId = function _PerpsController_getDirectProviderId(provider) {
+    if (provider.routesOrdersByProviderId) {
+        return undefined;
+    }
+    return Array.from(this.providers.entries()).find(([, candidate]) => candidate === provider)?.[0];
+}, _PerpsController_hasConflictingProviderRoute = function _PerpsController_hasConflictingProviderRoute(providerId, provider) {
+    return (providerId !== undefined &&
+        !provider.routesOrdersByProviderId &&
+        providerId !== provider.protocolId);
+}, _PerpsController_resolveRoutedOrderProvider = 
+/**
+ * Resolve one routed order operation after any in-flight initialization.
+ *
+ * @param params - Routed operation context.
+ * @param params.orderType - Order type, when the operation carries one.
+ * @param params.providerId - Explicit provider route, when supplied.
+ * @returns The initialized provider that owns the operation.
+ */
+async function _PerpsController_resolveRoutedOrderProvider(params) {
+    const { orderType, providerId } = params;
+    const provider = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getActiveProviderWhenReady).call(this);
+    if (__classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_hasConflictingProviderRoute).call(this, providerId, provider)) {
+        throw new Error(orderType !== undefined && isStrategyOrderType(orderType)
+            ? PERPS_ERROR_CODES.ORDER_STRATEGY_ROUTE_UNAVAILABLE
+            : PERPS_ERROR_CODES.PROVIDER_NOT_FOUND);
+    }
+    return provider;
 }, _PerpsController_buildGlobalSnapshotContext = function _PerpsController_buildGlobalSnapshotContext() {
     const snapshotConfigured = Boolean(__classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.terminalApi?.globalSnapshotUrl) ||
         typeof __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.terminalMarketService
@@ -4266,7 +4459,12 @@ async function _PerpsController_performMarketDataPreload() {
         activeProvider: this.state.activeProvider,
         isTestnet: this.state.isTestnet,
         hip3ConfigVersion: this.state.hip3ConfigVersion,
+        lifecycleGeneration: __classPrivateFieldGet(this, _PerpsController_lifecycleGeneration, "f"),
     };
+    const isCurrent = () => __classPrivateFieldGet(this, _PerpsController_lifecycleGeneration, "f") === preloadContext.lifecycleGeneration &&
+        this.state.activeProvider === preloadContext.activeProvider &&
+        this.state.isTestnet === preloadContext.isTestnet &&
+        this.state.hip3ConfigVersion === preloadContext.hip3ConfigVersion;
     const staticSnapshotDexes = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getStaticSnapshotDexes).call(this);
     const now = Date.now();
     const existingEntry = this.state.cachedMarketDataByProvider[cacheKey];
@@ -4296,9 +4494,7 @@ async function _PerpsController_performMarketDataPreload() {
             duration_ms: Math.round(performance.now() - preloadStart),
             markets: data.length,
         });
-        if (this.state.activeProvider !== preloadContext.activeProvider ||
-            this.state.isTestnet !== preloadContext.isTestnet ||
-            this.state.hip3ConfigVersion !== preloadContext.hip3ConfigVersion) {
+        if (!isCurrent()) {
             traceData = {
                 success: false,
                 error: 'Global snapshot preload context changed',
@@ -4323,6 +4519,13 @@ async function _PerpsController_performMarketDataPreload() {
             }
             : {};
         const marketDiskEntries = [];
+        if (!isCurrent()) {
+            traceData = {
+                success: false,
+                error: 'Global snapshot preload context changed',
+            };
+            return;
+        }
         if (this.state.activeProvider === 'aggregated' &&
             this.activeProviderInstance) {
             // Split returned data by providerId and store each slice
@@ -4423,6 +4626,7 @@ async function _PerpsController_performUserDataPreload() {
     }
     const userAddress = evmAccount.address;
     const { activeProvider, isTestnet, hip3ConfigVersion } = this.state;
+    const lifecycleGeneration = __classPrivateFieldGet(this, _PerpsController_lifecycleGeneration, "f");
     const { activeProviderInstance } = this;
     const hyperliquidDexes = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getStaticSnapshotDexes).call(this);
     const isCurrent = () => {
@@ -4433,7 +4637,8 @@ async function _PerpsController_performUserDataPreload() {
         catch {
             return false;
         }
-        return (this.state.activeProvider === activeProvider &&
+        return (__classPrivateFieldGet(this, _PerpsController_lifecycleGeneration, "f") === lifecycleGeneration &&
+            this.state.activeProvider === activeProvider &&
             this.activeProviderInstance === activeProviderInstance &&
             this.state.isTestnet === isTestnet &&
             this.state.hip3ConfigVersion === hip3ConfigVersion &&
@@ -4476,6 +4681,15 @@ async function _PerpsController_performUserDataPreload() {
     const traceId = uuidv4();
     const preloadStart = performance.now();
     let traceData;
+    const staleContextError = 'User data preload context changed';
+    const discardStalePreload = () => {
+        if (isCurrent()) {
+            return false;
+        }
+        traceData = { success: false, error: staleContextError };
+        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Discarding stale user data preload');
+        return true;
+    };
     try {
         __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.tracer.trace({
             name: PerpsTraceNames.UserDataPreload,
@@ -4489,6 +4703,9 @@ async function _PerpsController_performUserDataPreload() {
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Fetching user data in background');
         if (activeProvider === 'hyperliquid') {
             const snapshot = await this.getUserDataSnapshot();
+            if (discardStalePreload()) {
+                return;
+            }
             __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: User data preloaded', {
                 positionCount: snapshot.positions.length,
                 orderCount: snapshot.orders.length,
@@ -4507,8 +4724,8 @@ async function _PerpsController_performUserDataPreload() {
             this.getOpenOrders({ standalone: true, userAddress }),
             this.getAccountState({ standalone: true, userAddress }),
         ]);
-        if (!isCurrent()) {
-            throw new Error('User data preload context changed');
+        if (discardStalePreload()) {
+            return;
         }
         if (activeProvider === 'aggregated' && activeProviderInstance) {
             // Split by providerId and write one cache entry per provider key
@@ -4532,6 +4749,9 @@ async function _PerpsController_performUserDataPreload() {
             }
             // AccountState — assign to its provider bucket
             ensureBucket(accountState.providerId ?? fallbackProviderId).accountState = accountState;
+            if (discardStalePreload()) {
+                return;
+            }
             this.update((state) => {
                 for (const [pid, data] of byProvider) {
                     const key = buildProviderCacheKey(pid, isTestnet);
@@ -4560,6 +4780,9 @@ async function _PerpsController_performUserDataPreload() {
         else {
             // Single provider — store directly under its key
             const ts = Date.now();
+            if (discardStalePreload()) {
+                return;
+            }
             this.update((state) => {
                 state.cachedUserDataByProvider[providerNetworkKey] = {
                     positions,
@@ -4589,6 +4812,9 @@ async function _PerpsController_performUserDataPreload() {
         __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.tracer.setMeasurement(PerpsMeasurementName.PerpsUserDataPreload, performance.now() - preloadStart, 'millisecond', traceId);
     }
     catch (error) {
+        if (discardStalePreload()) {
+            return;
+        }
         traceData = {
             success: false,
             error: ensureError(error, 'PerpsController.performUserDataPreload')
@@ -4612,6 +4838,70 @@ async function _PerpsController_performUserDataPreload() {
             });
         }
     }
+}, _PerpsController_performDisconnect = 
+/**
+ * Disconnect after this call has claimed the controller lifecycle.
+ *
+ * @returns A promise that resolves when teardown finishes.
+ */
+async function _PerpsController_performDisconnect() {
+    __classPrivateFieldSet(this, _PerpsController_lifecycleGeneration, __classPrivateFieldGet(this, _PerpsController_lifecycleGeneration, "f") + 1, "f");
+    __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Disconnecting provider to cleanup subscriptions', {
+        timestamp: new Date().toISOString(),
+    });
+    // Stop preload interval and messenger subscriptions first,
+    // so no background work fires while we tear down providers.
+    if (__classPrivateFieldGet(this, _PerpsController_preloadTimer, "f")) {
+        clearInterval(__classPrivateFieldGet(this, _PerpsController_preloadTimer, "f"));
+        __classPrivateFieldSet(this, _PerpsController_preloadTimer, null, "f");
+    }
+    if (__classPrivateFieldGet(this, _PerpsController_preloadStateUnsubscribe, "f")) {
+        __classPrivateFieldGet(this, _PerpsController_preloadStateUnsubscribe, "f").call(this);
+        __classPrivateFieldSet(this, _PerpsController_preloadStateUnsubscribe, null, "f");
+    }
+    if (__classPrivateFieldGet(this, _PerpsController_accountChangeUnsubscribe, "f")) {
+        __classPrivateFieldGet(this, _PerpsController_accountChangeUnsubscribe, "f").call(this);
+        __classPrivateFieldSet(this, _PerpsController_accountChangeUnsubscribe, null, "f");
+    }
+    __classPrivateFieldSet(this, _PerpsController_previousIsTestnet, null, "f");
+    __classPrivateFieldSet(this, _PerpsController_previousHip3ConfigVersion, null, "f");
+    const pendingReinitialization = __classPrivateFieldGet(this, _PerpsController_reinitializationOperationPromise, "f");
+    if (pendingReinitialization) {
+        await pendingReinitialization;
+    }
+    // Initialization owns provider creation. Let it finish before teardown so
+    // it cannot repopulate providers after this method clears the references.
+    const pendingInitialization = __classPrivateFieldGet(this, _PerpsController_initializationPromise, "f");
+    if (pendingInitialization) {
+        try {
+            await pendingInitialization;
+        }
+        catch (error) {
+            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_logError).call(this, ensureError(error, 'PerpsController.disconnect.initialization'), __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getErrorContext).call(this, 'disconnect', {
+                operation: 'awaitInitialization',
+            }));
+        }
+    }
+    const provider = this.activeProviderInstance;
+    if (provider) {
+        try {
+            await provider.disconnect();
+        }
+        catch (error) {
+            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_logError).call(this, ensureError(error, 'PerpsController.disconnect'), __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getErrorContext).call(this, 'disconnect'));
+        }
+    }
+    // Clear stale reference so standalone reads don't route through old provider
+    this.activeProviderInstance = null;
+    // Cleanup cached standalone provider (if any) — awaited to prevent races
+    await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_cleanupStandaloneProvider).call(this);
+    // Note: Feature-flag subscription is NOT cleaned up here.
+    // It is a controller-lifetime concern (set once in the constructor),
+    // not a session-lifetime concern. Unsubscribing here would break
+    // geo-blocking / HIP-3 flag propagation after disconnect → reconnect.
+    // Reset initialization state to ensure proper reconnection
+    this.isInitialized = false;
+    __classPrivateFieldSet(this, _PerpsController_initializationPromise, null, "f");
 }, _PerpsController_persistWatchlistToRemote = 
 /**
  * Writes the current local watchlist to AuthenticatedUserStorageService