dexbot 1.1.14 → 1.2.1

package/dist/modules/order/grid.js

@@ -3,7 +3,7 @@
  * modules/order/grid.ts - Grid Engine
  *
  * Order grid creation, synchronization, and health management.
- * Exports a single Grid class with static methods for grid operations.
+ * Exports plain functions for grid operations.
  *
  * Manages the complete lifecycle of the order grid:
  * - Creates geometric price grids with configurable spacing (increments)
@@ -13,7 +13,7 @@
  * - Detects and flags out-of-spread conditions
  *
  * ===============================================================================
- * TABLE OF CONTENTS - Grid Class (25 static methods)
+ * TABLE OF CONTENTS - Grid Functions (28 exported functions)
  * ===============================================================================
  *
  * CONFIGURATION & CALCULATION (2 methods)
@@ -95,6 +95,31 @@
  *
  * ===============================================================================
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateGapSlots = calculateGapSlots;
+exports.isGridBloated = isGridBloated;
+exports.isGridBloatGraceActive = isGridBloatGraceActive;
+exports.clearGridBloatFlag = clearGridBloatFlag;
+exports.getSizingContext = getSizingContext;
+exports._getSizingContext = _getSizingContext;
+exports.createOrderGrid = createOrderGrid;
+exports.loadGrid = loadGrid;
+exports.initializeGrid = initializeGrid;
+exports.recalculateGrid = recalculateGrid;
+exports.checkAndUpdateGridIfNeeded = checkAndUpdateGridIfNeeded;
+exports._recalculateGridOrderSizesFromBlockchain = _recalculateGridOrderSizesFromBlockchain;
+exports.updateGridFromBlockchainSnapshot = updateGridFromBlockchainSnapshot;
+exports.compareGrids = compareGrids;
+exports.monitorDivergence = monitorDivergence;
+exports.calculateCurrentSpread = calculateCurrentSpread;
+exports.checkSpreadCondition = checkSpreadCondition;
+exports.checkGridHealth = checkGridHealth;
+exports.checkWindowDust = checkWindowDust;
+exports.hasAnyDust = hasAnyDust;
+exports.getDustOrders = getDustOrders;
+exports.determineOrderSideByFunds = determineOrderSideByFunds;
+exports.calculateGeometricSizeForSpreadCorrection = calculateGeometricSizeForSpreadCorrection;
+exports.prepareSpreadCorrectionOrders = prepareSpreadCorrectionOrders;
 const { ORDER_TYPES, ORDER_STATES, COW_ACTIONS, DEFAULT_CONFIG, GRID_LIMITS, TIMING, MARKET_ADAPTER } = require('../constants');
 const { GRID_COMPARISON } = GRID_LIMITS;
 const Format = require('./format');
@@ -111,340 +136,336 @@ function _snapshotFundState(manager) {
         sellLocked: Number(manager.accountTotals?.sellLocked || 0),
     };
 }
-const { floatToBlockchainInt, blockchainToFloat, getPrecisionByOrderType, getPrecisionsForManager, calculateOrderCreationFees, calculateOrderSizes, calculateRotationOrderSizes, calculateAvailableFundsValue, calculateGridSideDivergenceMetric, getPrecisionSlack, getMinAbsoluteOrderSize, getSingleDustThreshold, getGridBestPrices, calculateSpreadFromOrders, allocateFundsByWeights, calculateGapSlots, calculatePriceTolerance } = require('./utils/math');
-const { filterOrdersByType, checkSizesBeforeMinimum, checkSizeThreshold, resolveConfiguredPriceBound, shouldFlagOutOfSpread, isOrderHealthy, isPhantomOrder, isSlotAvailable, isOrderOnChain, hasOnChainId, calculateIdealBoundary, assignGridRoles } = require('./utils/order');
+const { floatToBlockchainInt, blockchainToFloat, getPrecisionByOrderType, getPrecisionsForManager, calculateOrderCreationFees, calculateOrderSizes, calculateRotationOrderSizes, calculateAvailableFundsValue, calculateGridSideDivergenceMetric, getPrecisionSlack, getMinAbsoluteOrderSize, getSingleDustThreshold, getGridBestPrices, calculateSpreadFromOrders, allocateFundsByWeights, calculateGapSlots: _mathGapSlots, calculatePriceTolerance } = require('./utils/math');
+const { adjustBudgetForBtsFees, filterOrdersByType, checkSizesBeforeMinimum, checkSizeThreshold, resolveConfiguredPriceBound, shouldFlagOutOfSpread, isOrderHealthy, isPhantomOrder, isSlotAvailable, isOrderOnChain, hasOnChainId, calculateIdealBoundary, assignGridRoles } = require('./utils/order');
 const { derivePrice, loadAmaCenterPrice, loadAmaCenterSnapshot } = require('./utils/system');
 const { getWhitelistFlags } = require('../market_adapter_whitelist');
-class Grid {
-    /**
-     * Calculate the spread gap size (number of empty slots between BUY and SELL rails).
-     * Delegates to utils/math for pure calculation logic.
-     *
-     * @param {number} incrementPercent
-     * @param {number} targetSpreadPercent
-     * @returns {number}
-     */
-    static calculateGapSlots(incrementPercent, targetSpreadPercent, gridLimitsOverride) {
-        return calculateGapSlots(incrementPercent, targetSpreadPercent, gridLimitsOverride ?? GRID_LIMITS);
-    }
-    /**
-     * Detect grid bloat: compares total grid size to expected maximum based on
-     * actual placed orders (ACTIVE/PARTIAL with orderId) plus gap slots plus 1
-     * tolerance slot. Accepts either an array (from persisted grid load) or a
-     * Map (from manager.orders at runtime).
-     *
-     * Formula: maxAllowed = placedCount + gapSlots + 1
-     *
-     * @param {Object} manager - OrderManager instance (provides config).
-     * @param {Array|Map} orders - Grid orders as array or Map.
-     * @returns {{bloated: boolean, details?: {gridSize: number, placedCount: number, numBuyActive: number, numSellActive: number, gapSlots: number, maxAllowed: number}}}
-     */
-    static isGridBloated(manager, orders) {
-        const gridSize = Array.isArray(orders) ? orders.length : orders.size;
-        if (!gridSize || !manager?.config)
-            return { bloated: false };
-        const config = manager.config;
-        const incPct = config.incrementPercent || 0.3;
-        if (incPct <= 0)
-            return { bloated: false };
-        const targetSpreadPct = config.targetSpreadPercent || incPct * 2;
-        const orderList = Array.isArray(orders) ? orders : Array.from(orders.values());
-        const numBuyActive = orderList.filter((o) => o.type === ORDER_TYPES.BUY &&
-            (o.state === ORDER_STATES.ACTIVE || o.state === ORDER_STATES.PARTIAL) &&
-            o.orderId).length;
-        const numSellActive = orderList.filter((o) => o.type === ORDER_TYPES.SELL &&
-            (o.state === ORDER_STATES.ACTIVE || o.state === ORDER_STATES.PARTIAL) &&
-            o.orderId).length;
-        const placedCount = numBuyActive + numSellActive;
-        if (!placedCount)
-            return { bloated: false };
-        const gapSlots = Grid.calculateGapSlots(incPct, targetSpreadPct);
-        const maxAllowed = placedCount + gapSlots + 1;
-        return {
-            bloated: gridSize > maxAllowed,
-            details: { gridSize, placedCount, numBuyActive, numSellActive, gapSlots, maxAllowed }
-        };
+function calculateGapSlots(incrementPercent, targetSpreadPercent, gridLimitsOverride) {
+    return _mathGapSlots(incrementPercent, targetSpreadPercent, gridLimitsOverride ?? GRID_LIMITS);
+}
+function isGridBloated(manager, orders) {
+    const gridSize = Array.isArray(orders) ? orders.length : orders.size;
+    if (!gridSize || !manager?.config)
+        return { bloated: false };
+    const config = manager.config;
+    const incPct = config.incrementPercent || 0.3;
+    if (incPct <= 0)
+        return { bloated: false };
+    const targetSpreadPct = config.targetSpreadPercent || incPct * 2;
+    const orderList = Array.isArray(orders) ? orders : Array.from(orders.values());
+    const numBuyActive = orderList.filter((o) => o.type === ORDER_TYPES.BUY &&
+        (o.state === ORDER_STATES.ACTIVE || o.state === ORDER_STATES.PARTIAL) &&
+        o.orderId).length;
+    const numSellActive = orderList.filter((o) => o.type === ORDER_TYPES.SELL &&
+        (o.state === ORDER_STATES.ACTIVE || o.state === ORDER_STATES.PARTIAL) &&
+        o.orderId).length;
+    const placedCount = numBuyActive + numSellActive;
+    if (!placedCount)
+        return { bloated: false };
+    const gapSlots = calculateGapSlots(incPct, targetSpreadPct);
+    const maxAllowed = placedCount + gapSlots + 1;
+    return {
+        bloated: gridSize > maxAllowed,
+        details: { gridSize, placedCount, numBuyActive, numSellActive, gapSlots, maxAllowed }
+    };
+}
+/**
+ * Check whether the grid-bloat grace period is still active, i.e. a
+ * bloat detection happened recently enough that a structural resync
+ * has not had time to resolve it.
+ *
+ * Used by both Grid.loadGrid (to suppress redundant resync requests)
+ * and the maintenance runtime (to decide when to re-check after the
+ * grace window expires) so the two policies share one definition of
+ * the grace window.
+ *
+ * @param {Object} manager - OrderManager instance.
+ * @returns {{active: boolean, elapsed: number, graceMs: number}}
+ */
+function isGridBloatGraceActive(manager) {
+    const graceMs = Number(TIMING?.GRID_BLOAT_RESYNC_GRACE_MS) || TIMING.GRID_BLOAT_RESYNC_GRACE_MS;
+    if (!manager._gridBloatDetectedAt) {
+        return { active: false, elapsed: 0, graceMs };
     }
-    /**
-     * Public wrapper for side sizing context.
-     * Keeps StrategyEngine decoupled from Grid private internals.
-     *
-     * @param {import('./types').OrderManager} manager
-     * @param {'buy'|'sell'} side
-     * @returns {Promise<import('./types').SizingContext|null>}
-     */
-    static async getSizingContext(manager, side) {
-        return await Grid._getSizingContext(manager, side);
-    }
-    /**
-     * Unifies budget calculation and fee deduction for all grid sizing scenarios.
-     * Ensures consistent fund context (Allocated vs Total) across the bot.
-     *
-     * @param {import('./types').OrderManager} manager - OrderManager instance
-     * @param {string} side - 'buy' or 'sell'
-     * @returns {Promise<import('./types').SizingContext|null>}
-     * @private
-     */
-    static async _getSizingContext(manager, side, { skipRecalc = false } = {}) {
-        if (!manager || !manager.assets)
-            return null;
-        // 1. Ensure fund state is fresh before sizing
-        if (!skipRecalc) {
-            await manager.recalculateFunds();
-        }
-        const snap = manager.getChainFundsSnapshot ? manager.getChainFundsSnapshot() : {};
-        const isBuy = side === 'buy';
-        const type = isBuy ? ORDER_TYPES.BUY : ORDER_TYPES.SELL;
-        // 2. Determine base budget: Always use ALLOCATED funds (respects botFunds %)
-        // This ensures the bot only "thinks" about the capital it is allowed to use.
-        let budget = isBuy ? (snap.allocatedBuy || 0) : (snap.allocatedSell || 0);
-        // 3. Standardize BTS Fee Deduction (Issue #15 consistency)
-        // BTS fees are paid for ALL order operations regardless of side, so the
-        // BTS-holding side reserves fees for both buy and sell target counts.
+    const elapsed = Date.now() - manager._gridBloatDetectedAt;
+    return { active: elapsed < graceMs, elapsed, graceMs };
+}
+/**
+ * Clear the grid-bloat detection timestamp once the grid size has
+ * returned to normal. Shared so both call sites use the same key.
+ * @param {Object} manager - OrderManager instance.
+ */
+function clearGridBloatFlag(manager) {
+    delete manager._gridBloatDetectedAt;
+}
+/**
+ * Public wrapper for side sizing context.
+ * Keeps StrategyEngine decoupled from Grid private internals.
+ *
+ * @param {import('./types').OrderManager} manager
+ * @param {'buy'|'sell'} side
+ * @returns {Promise<import('./types').SizingContext|null>}
+ */
+async function getSizingContext(manager, side) {
+    return await _getSizingContext(manager, side);
+}
+/**
+ * Unifies budget calculation and fee deduction for all grid sizing scenarios.
+ * Ensures consistent fund context (Allocated vs Total) across the bot.
+ *
+ * @param {import('./types').OrderManager} manager - OrderManager instance
+ * @param {string} side - 'buy' or 'sell'
+ * @returns {Promise<import('./types').SizingContext|null>}
+ * @private
+ */
+async function _getSizingContext(manager, side, { skipRecalc = false } = {}) {
+    if (!manager || !manager.assets)
+        return null;
+    // 1. Ensure fund state is fresh before sizing
+    if (!skipRecalc) {
+        await manager.recalculateFunds();
+    }
+    const snap = manager.getChainFundsSnapshot ? manager.getChainFundsSnapshot() : {};
+    const isBuy = side === 'buy';
+    const type = isBuy ? ORDER_TYPES.BUY : ORDER_TYPES.SELL;
+    // 2. Determine base budget: Always use ALLOCATED funds (respects botFunds %)
+    // This ensures the bot only "thinks" about the capital it is allowed to use.
+    let budget = isBuy ? (snap.allocatedBuy || 0) : (snap.allocatedSell || 0);
+    // 3. Standardize BTS Fee Deduction (Issue #15 consistency)
+    // BTS fees are paid for ALL order operations regardless of side, so the
+    // BTS-holding side reserves fees for both buy and sell target counts.
+    if (budget > 0) {
+        const targetBuy = Math.max(0, manager.config.activeOrders?.buy ?? 1);
+        const targetSell = Math.max(0, manager.config.activeOrders?.sell ?? 1);
+        const totalTarget = targetBuy + targetSell;
         const isBtsSide = (isBuy && manager.config.assetB === 'BTS') || (!isBuy && manager.config.assetA === 'BTS');
-        const btsReservationMultiplier = manager.config?.feeParams?.BTS_RESERVATION_MULTIPLIER;
-        if (isBtsSide && budget > 0) {
-            const targetBuy = Math.max(0, manager.config.activeOrders?.buy ?? 1);
-            const targetSell = Math.max(0, manager.config.activeOrders?.sell ?? 1);
-            const totalTarget = targetBuy + targetSell;
-            const btsFees = calculateOrderCreationFees(manager.config.assetA, manager.config.assetB, totalTarget, btsReservationMultiplier);
-            budget = Math.max(0, budget - btsFees);
-        }
-        // Non-BTS pair: reserve proportional share for BTS fee budget
-        if (!isBtsSide && budget > 0) {
-            const targetBuy = Math.max(0, manager.config.activeOrders?.buy ?? 1);
-            const targetSell = Math.max(0, manager.config.activeOrders?.sell ?? 1);
-            const totalTarget = targetBuy + targetSell;
-            const formulaBudget = calculateOrderCreationFees(manager.config.assetA, manager.config.assetB, totalTarget, btsReservationMultiplier);
-            const configMin = manager.config.min_BTS_value;
-            const effectiveMin = (configMin > 0) ? configMin : formulaBudget;
-            const btsFree = Format.toFiniteNumber(manager.funds?.btsBalance?.free, 0);
-            const btsDeficit = Math.max(0, effectiveMin - btsFree);
-            if (btsDeficit > 0) {
-                const sideFree = Format.toFiniteNumber(isBuy ? manager.accountTotals?.buyFree : manager.accountTotals?.sellFree, 0);
-                const totalFree = Format.toFiniteNumber(manager.accountTotals?.buyFree, 0)
-                    + Format.toFiniteNumber(manager.accountTotals?.sellFree, 0);
-                const share = totalFree > 0 ? sideFree / totalFree : 0.5;
-                budget = Math.max(0, budget - btsDeficit * share);
-            }
-        }
-        return {
-            budget,
-            precision: getPrecisionByOrderType(manager.assets, type),
-            config: manager.config
-        };
+        const formulaBudget = calculateOrderCreationFees(manager.config.assetA, manager.config.assetB, totalTarget, manager.config?.feeParams?.BTS_RESERVATION_MULTIPLIER);
+        budget = adjustBudgetForBtsFees(budget, isBtsSide, formulaBudget, manager.config.min_BTS_value || 0, Format.toFiniteNumber(manager.funds?.btsBalance?.free, 0), Format.toFiniteNumber(isBuy ? manager.accountTotals?.buyFree : manager.accountTotals?.sellFree, 0), Format.toFiniteNumber(manager.accountTotals?.buyFree, 0)
+            + Format.toFiniteNumber(manager.accountTotals?.sellFree, 0));
     }
-    /**
-     * Create the initial order grid structure based on configuration.
-     *
-     * ALGORITHM: Geometric Grid Creation with Fixed Spread Gap
-     * =========================================================
-     * This method generates a unified "Master Rail" of price levels with geometric spacing.
-     * The grid is centered around startPrice with a fixed-size spread gap.
-     *
-     * KEY CONCEPTS:
-     * - Geometric Spacing: Each price level is incrementPercent% away from neighbors
-     * - Master Rail: Single unified array (not separate buy/sell rails)
-     * - Spread Gap: Fixed-size buffer between best buy and best sell
-     * - Role Assignment: BUY / SPREAD / SELL based on position relative to startPrice
-     *
-     * SPREAD GAP FORMULA:
-     * ===================
-     * The spread gap size is calculated to match the target spread percentage:
-     *
-     * 1. Step Factor (s): s = 1 + (incrementPercent / 100)
-     *    Example: If incrementPercent = 0.5%, then s = 1.005
-     *
-     * 2. Minimum Spread: minSpread = incrementPercent × MIN_SPREAD_FACTOR
-     *    This ensures spread is at least 2× the increment (prevents too-narrow spread)
-     *
-     * 3. Target Steps (n): Number of price levels needed to achieve target spread
-     *    Formula: n = ceil(ln(1 + targetSpread/100) / ln(s))
-     *
-     *    Derivation: If we want price to grow by targetSpread% over n steps:
-     *    - Final price = startPrice × s^n
-     *    - Growth factor = (1 + targetSpread/100)
-     *    - Therefore: s^n = (1 + targetSpread/100)
-     *    - Taking ln: n × ln(s) = ln(1 + targetSpread/100)
-     *    - Solving: n = ln(1 + targetSpread/100) / ln(s)
-     *
-     * 4. Gap Slots (G): G = max(MIN_SPREAD_ORDERS, n)
-     *    Ensures at least MIN_SPREAD_ORDERS slots even if target spread is small
-     *
-     * EXAMPLE:
-     * --------
-     * incrementPercent = 0.5%, targetSpread = 2%
-     * - s = 1.005
-     * - minSpread = 0.5% × 2 = 1%
-     * - targetSpread = max(2%, 1%) = 2%
-     * - n = ceil(ln(1.02) / ln(1.005)) = ceil(3.98) = 4 steps
-     * - G = max(2, 4) = 4 slots
-     *
-     * @param {import('./types').GridConfig} config - Grid configuration
-     * @returns {import('./types').GridCreationResult}
-     */
-    static createOrderGrid(config) {
-        const { startPrice, minPrice, maxPrice, incrementPercent } = config;
-        // FIX: Add comprehensive input validation to prevent silent grid creation failures
-        if (!Number.isFinite(startPrice)) {
-            throw new Error(`Invalid startPrice: ${startPrice}. Must be a finite number.`);
-        }
-        if (!Number.isFinite(minPrice)) {
-            throw new Error(`Invalid minPrice: ${minPrice}. Must be a finite number.`);
-        }
-        if (minPrice <= 0) {
-            throw new Error(`Invalid minPrice: ${minPrice}. Must be positive.`);
-        }
-        if (!Number.isFinite(maxPrice)) {
-            throw new Error(`Invalid maxPrice: ${maxPrice}. Must be a finite number.`);
-        }
-        if (minPrice >= maxPrice) {
-            throw new Error(`Invalid price bounds: minPrice (${minPrice}) must be < maxPrice (${maxPrice}).`);
-        }
-        if (!(minPrice <= startPrice && startPrice <= maxPrice)) {
-            throw new Error(`startPrice (${startPrice}) must be within bounds [${minPrice}, ${maxPrice}].`);
-        }
-        if (maxPrice <= 0) {
-            throw new Error(`maxPrice (${maxPrice}) must be positive.`);
-        }
-        if (!Number.isFinite(incrementPercent)) {
-            throw new Error(`Invalid incrementPercent: ${incrementPercent}. Must be a finite number.`);
-        }
-        const minPercent = config.incrementBounds?.MIN_PERCENT;
-        const maxPercent = config.incrementBounds?.MAX_PERCENT;
-        if (incrementPercent < minPercent || incrementPercent > maxPercent) {
-            throw new Error(`Invalid incrementPercent: ${incrementPercent}. Must be between ` +
-                `${minPercent} and ${maxPercent} (inclusive).`);
-        }
-        const stepUp = 1 + (incrementPercent / 100);
-        const stepDown = 1 - (incrementPercent / 100);
-        // ================================================================================
-        // STEP 1: GENERATE PRICE LEVELS (Geometric progression)
-        // ================================================================================
-        // Create a geometric series of prices from minPrice to maxPrice.
-        // Each level is incrementPercent% away from its neighbors.
-        //
-        // We start from startPrice and expand outward in both directions to ensure
-        // the grid is centered around the market price.
-        const priceLevels = [];
-        // Generate levels upwards from startPrice (higher prices for SELL orders)
-        // Start from sqrt(stepUp) × startPrice to center the grid
-        let upPrice = startPrice * Math.sqrt(stepUp);
-        while (upPrice <= maxPrice) {
-            priceLevels.push(upPrice);
-            upPrice *= stepUp;
-        }
-        // Generate levels downwards from startPrice (lower prices for BUY orders)
-        // Start from sqrt(stepDown) × startPrice to center the grid
-        let downPrice = startPrice * Math.sqrt(stepDown);
-        while (downPrice >= minPrice) {
-            priceLevels.push(downPrice);
-            downPrice *= stepDown;
-        }
-        // Sort all levels from lowest to highest (Master Rail order)
-        priceLevels.sort((a, b) => a - b);
-        if (priceLevels.length === 0) {
-            throw new Error(`Grid generation produced no price levels for startPrice=${startPrice}, ` +
-                `bounds=[${minPrice}, ${maxPrice}], incrementPercent=${incrementPercent}. ` +
-                `Widen bounds or reduce incrementPercent.`);
-        }
-        // ================================================================================
-        // STEP 2: CALCULATE SPREAD GAP SIZE
-        // ================================================================================
-        // Determine how many slots should be in the spread zone.
-        // See formula documentation in JSDoc above.
-        const gapSlots = Grid.calculateGapSlots(incrementPercent, config.targetSpreadPercent, config.gridLimits);
-        // ================================================================================
-        // STEP 3: FIND SPLIT INDEX & ROLE ASSIGNMENT
-        // ================================================================================
-        // Determine the boundary and assign roles (BUY/SPREAD/SELL) to each slot.
-        //
-        // STRATEGY: Center the spread gap around startPrice
-        const boundaryIdx = calculateIdealBoundary(priceLevels.map(p => ({ price: p })), startPrice, gapSlots);
-        // ================================================================================
-        // STEP 4: CREATE ORDER OBJECTS
-        // ================================================================================
-        // Convert price levels to order objects with assigned roles.
-        const orders = priceLevels.map((price, i) => ({
-            id: `slot-${i}`,
-            price,
-            type: null, // assigned below
-            state: ORDER_STATES.VIRTUAL,
-            size: 0
-        }));
-        const updatedOrders = assignGridRoles(orders, boundaryIdx, gapSlots, ORDER_TYPES, ORDER_STATES);
-        const buyCount = updatedOrders.filter(o => o.type === ORDER_TYPES.BUY).length;
-        const sellCount = updatedOrders.filter(o => o.type === ORDER_TYPES.SELL).length;
-        if (buyCount === 0 || sellCount === 0) {
-            throw new Error(`Grid generation produced an imbalanced rail (buy=${buyCount}, sell=${sellCount}) for ` +
-                `startPrice=${startPrice}, bounds=[${minPrice}, ${maxPrice}], incrementPercent=${incrementPercent}, ` +
-                `targetSpreadPercent=${config.targetSpreadPercent}. Widen bounds or reduce target spread.`);
-        }
-        const initialSpreadCount = {
-            buy: Math.floor(gapSlots / 2),
-            sell: gapSlots - Math.floor(gapSlots / 2)
-        };
-        return { orders: updatedOrders, boundaryIdx, initialSpreadCount };
-    }
-    /**
-     * Internal utility to clear all order-related manager caches.
-     * Prevents stale references during grid reinitialization.
-     * RC-2: Synchronized to prevent concurrent modifications during clear
-     *
-     * Note: Uses explicit assignment instead of .clear() to enforce COW semantics:
-     * - Replace the master grid atomically with a fresh Map instance
-     * - Avoid mutating any previously referenced Map object
-     * @param {import('./types').OrderManager} manager - OrderManager instance
-     * @private
-     */
-    static _clearOrderCachesLogic(manager) {
-        // Replace frozen master grid with fresh empty frozen Map (COW pattern)
-        manager.orders = Object.freeze(new Map());
-        // Clear index Sets with fresh empty Sets (mutable for _applyOrderUpdate)
-        if (manager._ordersByState) {
-            for (const key of Object.keys(manager._ordersByState)) {
-                manager._ordersByState[key] = new Set();
-            }
+    return {
+        budget,
+        precision: getPrecisionByOrderType(manager.assets, type),
+        config: manager.config
+    };
+}
+/**
+ * Create the initial order grid structure based on configuration.
+ *
+ * ALGORITHM: Geometric Grid Creation with Fixed Spread Gap
+ * =========================================================
+ * This method generates a unified "Master Rail" of price levels with geometric spacing.
+ * The grid is centered around startPrice with a fixed-size spread gap.
+ *
+ * KEY CONCEPTS:
+ * - Geometric Spacing: Each price level is incrementPercent% away from neighbors
+ * - Master Rail: Single unified array (not separate buy/sell rails)
+ * - Spread Gap: Fixed-size buffer between best buy and best sell
+ * - Role Assignment: BUY / SPREAD / SELL based on position relative to startPrice
+ *
+ * SPREAD GAP FORMULA:
+ * ===================
+ * The spread gap size is calculated to match the target spread percentage:
+ *
+ * 1. Step Factor (s): s = 1 + (incrementPercent / 100)
+ *    Example: If incrementPercent = 0.5%, then s = 1.005
+ *
+ * 2. Minimum Spread: minSpread = incrementPercent × MIN_SPREAD_FACTOR
+ *    This ensures spread is at least 2× the increment (prevents too-narrow spread)
+ *
+ * 3. Target Steps (n): Number of price levels needed to achieve target spread
+ *    Formula: n = ceil(ln(1 + targetSpread/100) / ln(s))
+ *
+ *    Derivation: If we want price to grow by targetSpread% over n steps:
+ *    - Final price = startPrice × s^n
+ *    - Growth factor = (1 + targetSpread/100)
+ *    - Therefore: s^n = (1 + targetSpread/100)
+ *    - Taking ln: n × ln(s) = ln(1 + targetSpread/100)
+ *    - Solving: n = ln(1 + targetSpread/100) / ln(s)
+ *
+ * 4. Gap Slots (G): G = max(MIN_SPREAD_ORDERS, n)
+ *    Ensures at least MIN_SPREAD_ORDERS slots even if target spread is small
+ *
+ * EXAMPLE:
+ * --------
+ * incrementPercent = 0.5%, targetSpread = 2%
+ * - s = 1.005
+ * - minSpread = 0.5% × 2 = 1%
+ * - targetSpread = max(2%, 1%) = 2%
+ * - n = ceil(ln(1.02) / ln(1.005)) = ceil(3.98) = 4 steps
+ * - G = max(2, 4) = 4 slots
+ *
+ * @param {import('./types').GridConfig} config - Grid configuration
+ * @returns {import('./types').GridCreationResult}
+ */
+function createOrderGrid(config) {
+    const { startPrice, minPrice, maxPrice, incrementPercent } = config;
+    // FIX: Add comprehensive input validation to prevent silent grid creation failures
+    if (!Number.isFinite(startPrice)) {
+        throw new Error(`Invalid startPrice: ${startPrice}. Must be a finite number.`);
+    }
+    if (!Number.isFinite(minPrice)) {
+        throw new Error(`Invalid minPrice: ${minPrice}. Must be a finite number.`);
+    }
+    if (minPrice <= 0) {
+        throw new Error(`Invalid minPrice: ${minPrice}. Must be positive.`);
+    }
+    if (!Number.isFinite(maxPrice)) {
+        throw new Error(`Invalid maxPrice: ${maxPrice}. Must be a finite number.`);
+    }
+    if (minPrice >= maxPrice) {
+        throw new Error(`Invalid price bounds: minPrice (${minPrice}) must be < maxPrice (${maxPrice}).`);
+    }
+    if (!(minPrice <= startPrice && startPrice <= maxPrice)) {
+        throw new Error(`startPrice (${startPrice}) must be within bounds [${minPrice}, ${maxPrice}].`);
+    }
+    if (maxPrice <= 0) {
+        throw new Error(`maxPrice (${maxPrice}) must be positive.`);
+    }
+    if (!Number.isFinite(incrementPercent)) {
+        throw new Error(`Invalid incrementPercent: ${incrementPercent}. Must be a finite number.`);
+    }
+    const minPercent = config.incrementBounds?.MIN_PERCENT;
+    const maxPercent = config.incrementBounds?.MAX_PERCENT;
+    if (incrementPercent < minPercent || incrementPercent > maxPercent) {
+        throw new Error(`Invalid incrementPercent: ${incrementPercent}. Must be between ` +
+            `${minPercent} and ${maxPercent} (inclusive).`);
+    }
+    const stepUp = 1 + (incrementPercent / 100);
+    const stepDown = 1 - (incrementPercent / 100);
+    // ================================================================================
+    // STEP 1: GENERATE PRICE LEVELS (Geometric progression)
+    // ================================================================================
+    // Create a geometric series of prices from minPrice to maxPrice.
+    // Each level is incrementPercent% away from its neighbors.
+    //
+    // We start from startPrice and expand outward in both directions to ensure
+    // the grid is centered around the market price.
+    const priceLevels = [];
+    // Generate levels upwards from startPrice (higher prices for SELL orders)
+    // Start from sqrt(stepUp) × startPrice to center the grid
+    let upPrice = startPrice * Math.sqrt(stepUp);
+    while (upPrice <= maxPrice) {
+        priceLevels.push(upPrice);
+        upPrice *= stepUp;
+    }
+    // Generate levels downwards from startPrice (lower prices for BUY orders)
+    // Start from sqrt(stepDown) × startPrice to center the grid
+    let downPrice = startPrice * Math.sqrt(stepDown);
+    while (downPrice >= minPrice) {
+        priceLevels.push(downPrice);
+        downPrice *= stepDown;
+    }
+    // Sort all levels from lowest to highest (Master Rail order)
+    priceLevels.sort((a, b) => a - b);
+    if (priceLevels.length === 0) {
+        throw new Error(`Grid generation produced no price levels for startPrice=${startPrice}, ` +
+            `bounds=[${minPrice}, ${maxPrice}], incrementPercent=${incrementPercent}. ` +
+            `Widen bounds or reduce incrementPercent.`);
+    }
+    // ================================================================================
+    // STEP 2: CALCULATE SPREAD GAP SIZE
+    // ================================================================================
+    // Determine how many slots should be in the spread zone.
+    // See formula documentation in JSDoc above.
+    const gapSlots = calculateGapSlots(incrementPercent, config.targetSpreadPercent, config.gridLimits);
+    // ================================================================================
+    // STEP 3: FIND SPLIT INDEX & ROLE ASSIGNMENT
+    // ================================================================================
+    // Determine the boundary and assign roles (BUY/SPREAD/SELL) to each slot.
+    //
+    // STRATEGY: Center the spread gap around startPrice
+    const boundaryIdx = calculateIdealBoundary(priceLevels.map(p => ({ price: p })), startPrice, gapSlots);
+    // ================================================================================
+    // STEP 4: CREATE ORDER OBJECTS
+    // ================================================================================
+    // Convert price levels to order objects with assigned roles.
+    const orders = priceLevels.map((price, i) => ({
+        id: `slot-${i}`,
+        price,
+        type: null, // assigned below
+        state: ORDER_STATES.VIRTUAL,
+        size: 0
+    }));
+    const updatedOrders = assignGridRoles(orders, boundaryIdx, gapSlots, ORDER_TYPES, ORDER_STATES);
+    const buyCount = updatedOrders.filter(o => o.type === ORDER_TYPES.BUY).length;
+    const sellCount = updatedOrders.filter(o => o.type === ORDER_TYPES.SELL).length;
+    if (buyCount === 0 || sellCount === 0) {
+        throw new Error(`Grid generation produced an imbalanced rail (buy=${buyCount}, sell=${sellCount}) for ` +
+            `startPrice=${startPrice}, bounds=[${minPrice}, ${maxPrice}], incrementPercent=${incrementPercent}, ` +
+            `targetSpreadPercent=${config.targetSpreadPercent}. Widen bounds or reduce target spread.`);
+    }
+    const initialSpreadCount = {
+        buy: Math.floor(gapSlots / 2),
+        sell: gapSlots - Math.floor(gapSlots / 2)
+    };
+    return { orders: updatedOrders, boundaryIdx, initialSpreadCount };
+}
+/**
+ * Internal utility to clear all order-related manager caches.
+ * Prevents stale references during grid reinitialization.
+ * RC-2: Synchronized to prevent concurrent modifications during clear
+ *
+ * Note: Uses explicit assignment instead of .clear() to enforce COW semantics:
+ * - Replace the master grid atomically with a fresh Map instance
+ * - Avoid mutating any previously referenced Map object
+ * @param {import('./types').OrderManager} manager - OrderManager instance
+ * @private
+ */
+function _clearOrderCachesLogic(manager) {
+    // Replace frozen master grid with fresh empty frozen Map (COW pattern)
+    manager.orders = Object.freeze(new Map());
+    // Clear index Sets with fresh empty Sets (mutable for _applyOrderUpdate)
+    if (manager._ordersByState) {
+        for (const key of Object.keys(manager._ordersByState)) {
+            manager._ordersByState[key] = new Set();
         }
-        if (manager._ordersByType) {
-            for (const key of Object.keys(manager._ordersByType)) {
-                manager._ordersByType[key] = new Set();
-            }
+    }
+    if (manager._ordersByType) {
+        for (const key of Object.keys(manager._ordersByType)) {
+            manager._ordersByType[key] = new Set();
         }
     }
-    /**
-     * Restore a persisted grid snapshot onto a manager instance.
-     * @param {import('./types').OrderManager} manager - The manager instance.
-     * @param {Array<import('./types').GridOrderSlot>} grid - The persisted grid array.
-     * @param {number|null} [boundaryIdx=null] - The master boundary index.
-     * @returns {Promise<void>}
-     */
-    static async loadGrid(manager, grid, boundaryIdx = null) {
-        if (!Array.isArray(grid))
-            return;
-        return await manager._gridLock.acquire(async () => {
-            try {
-                await manager._initializeAssets();
-            }
-            catch (e) {
-                manager.logger?.log?.(`Asset initialization failed during grid load: ${e.message}`, 'warn');
-            }
-            // RC-2: Use logic helper
-            Grid._clearOrderCachesLogic(manager);
-            const savedBtsFeesOwed = manager.funds.btsFeesOwed;
-            manager.resetFunds();
-            manager.funds.btsFeesOwed = savedBtsFeesOwed;
-            // Restore boundary index for StrategyEngine
-            if (typeof boundaryIdx === 'number') {
-                manager.boundaryIdx = boundaryIdx;
-                // FIX: Use consistent optional chaining pattern for logger calls
-                manager.logger?.log?.(`Restored boundary index: ${boundaryIdx}`, 'info');
+}
+/**
+ * Restore a persisted grid snapshot onto a manager instance.
+ * @param {import('./types').OrderManager} manager - The manager instance.
+ * @param {Array<import('./types').GridOrderSlot>} grid - The persisted grid array.
+ * @param {number|null} [boundaryIdx=null] - The master boundary index.
+ * @returns {Promise<void>}
+ */
+async function loadGrid(manager, grid, boundaryIdx = null) {
+    if (!Array.isArray(grid))
+        return;
+    return await manager._gridLock.acquire(async () => {
+        try {
+            await manager._initializeAssets();
+        }
+        catch (e) {
+            manager.logger?.log?.(`Asset initialization failed during grid load: ${e.message}`, 'warn');
+        }
+        // RC-2: Use logic helper
+        _clearOrderCachesLogic(manager);
+        const savedBtsFeesOwed = manager.funds.btsFeesOwed;
+        manager.resetFunds();
+        manager.funds.btsFeesOwed = savedBtsFeesOwed;
+        // Restore boundary index for StrategyEngine
+        if (typeof boundaryIdx === 'number') {
+            manager.boundaryIdx = boundaryIdx;
+            // FIX: Use consistent optional chaining pattern for logger calls
+            manager.logger?.log?.(`Restored boundary index: ${boundaryIdx}`, 'info');
+        }
+        // Gap 6: Grid size cap — validate grid slot count against expected maximum.
+        // Formula: placedOrders (active+partial with orderId) + gapSlots + 1 tolerance slot.
+        const bloatResult = isGridBloated(manager, grid);
+        if (bloatResult.bloated) {
+            const d = bloatResult.details;
+            const grace = isGridBloatGraceActive(manager);
+            if (grace.active) {
+                manager.logger?.log?.(`[GRID-BLOAT] Grid size ${d.gridSize} exceeds expected maximum ${d.maxAllowed} ` +
+                    `(grace period active ${grace.elapsed}ms/${grace.graceMs}ms). Skipping re-request.`, 'debug');
             }
-            // Gap 6: Grid size cap — validate grid slot count against expected maximum.
-            // Formula: placedOrders (active+partial with orderId) + gapSlots + 1 tolerance slot.
-            const bloatResult = Grid.isGridBloated(manager, grid);
-            if (bloatResult.bloated) {
-                const d = bloatResult.details;
+            else {
                 manager.logger?.log?.(`[GRID-BLOAT] Grid size ${d.gridSize} exceeds expected maximum ${d.maxAllowed} ` +
                     `(placed=${d.placedCount} buy=${d.numBuyActive} sell=${d.numSellActive} ` +
                     `gapSlots=${d.gapSlots}). Triggering protective structural resync.`, 'warn');
@@ -455,1345 +476,1344 @@ class Grid {
                     });
                 }
             }
-            manager.pauseRecalcLogging();
-            manager.pauseFundRecalc();
-            try {
-                // RC-2: Use applyOrderUpdate (PRIVATE/UNLOCKED)
-                for (const order of grid) {
-                    let currentOrder = order;
-                    if (isPhantomOrder(order)) {
-                        manager.logger?.log?.(`Sanitizing corrupted order ${order.id}: ACTIVE/PARTIAL without orderId -> VIRTUAL`, 'warn');
-                        currentOrder = { ...order, state: ORDER_STATES.VIRTUAL };
-                    }
-                    await manager._applyOrderUpdate(currentOrder, 'grid-load', { skipAccounting: true });
-                }
-                const spreadCount = grid.filter(o => o.type === ORDER_TYPES.SPREAD).length;
-                manager.targetSpreadCount = spreadCount;
-                manager.currentSpreadCount = spreadCount;
-            }
-            finally {
-                await manager.resumeFundRecalc();
-                manager.resumeRecalcLogging();
-            }
-            manager.logger?.log?.(`Loaded ${manager.orders.size} orders from persisted grid.`, 'info');
-        });
-    }
-    /**
-     * Initialize the order grid with blockchain-aware sizing.
-     * @param {import('./types').OrderManager} manager - The manager instance.
-     * @returns {Promise<void>}
-     * @throws {Error} If initialization fails or account totals are missing.
-     */
-    static async initializeGrid(manager) {
-        if (!manager)
-            throw new Error('initializeGrid requires a manager instance');
-        await manager._initializeAssets();
-        // FIX: Add explicit state validation to prevent cryptic errors later
-        if (!manager.assets || !manager.assets.assetA || !manager.assets.assetB) {
-            throw new Error('Asset initialization did not complete properly - assetA or assetB undefined');
         }
-        if (!manager.config) {
-            throw new Error('Manager config not initialized before grid initialization');
-        }
-        const mpRaw = manager.config.startPrice;
-        manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: mpRaw type=${typeof mpRaw}, value=${mpRaw}`, 'debug');
-        // Auto-derive price if not a fixed numeric value (e.g. "pool", "book", or undefined)
-        if (typeof mpRaw !== 'number' || isNaN(mpRaw)) {
-            try {
-                const { BitShares } = require('../bitshares_client');
-                const derived = await derivePrice(BitShares, manager.config.assetA, manager.config.assetB, manager.config.priceMode || 'auto');
-                if (derived) {
-                    manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: Derived new startPrice=${derived.toFixed(8)} (mode=${manager.config.priceMode || 'auto'})`, 'info');
-                    manager.config.startPrice = Number(derived);
-                }
-                else {
-                    throw new Error(`Price derivation returned no result for ${manager.config.assetA}/${manager.config.assetB}`);
+        manager.pauseRecalcLogging();
+        manager.pauseFundRecalc();
+        try {
+            // RC-2: Use applyOrderUpdate (PRIVATE/UNLOCKED)
+            for (const order of grid) {
+                let currentOrder = order;
+                if (isPhantomOrder(order)) {
+                    manager.logger?.log?.(`Sanitizing corrupted order ${order.id}: ACTIVE/PARTIAL without orderId -> VIRTUAL`, 'warn');
+                    currentOrder = { ...order, state: ORDER_STATES.VIRTUAL };
                 }
+                await manager._applyOrderUpdate(currentOrder, 'grid-load', { skipAccounting: true });
             }
-            catch (err) {
-                manager.logger?.log?.(`Failed to derive market price: ${err.message}`, 'warn');
-                throw err; // Re-throw to prevent "pool" string reaching numeric math
-            }
+            const spreadCount = grid.filter(o => o.type === ORDER_TYPES.SPREAD).length;
+            manager.targetSpreadCount = spreadCount;
+            manager.currentSpreadCount = spreadCount;
         }
-        const configuredStartPrice = manager.config.startPrice;
-        const configuredMinPrice = manager.config.minPrice;
-        const configuredMaxPrice = manager.config.maxPrice;
-        const mp = Number(manager.config.startPrice);
-        // Derive gridPrice — separate reference for x-factor bounds (may differ from startPrice).
-        // Supported modes:
-        //   - numeric: fixed value
-        //   - "pool" / "book": live blockchain price for the pair
-        //   - "ama"/"ama1".."ama4": center from profiles/orders/<botKey>.dynamicgrid.json
-        //   - null/anything else: fallback to startPrice (backward-compatible)
-        let gp = mp;
-        let gpSource = 'startPrice';
-        let amaSnapshot = null;
-        const whitelistFlags = getWhitelistFlags(manager.config.botKey);
-        const isGridRangeScalingWhitelisted = whitelistFlags.asymmetricBounds === true;
-        let gridPriceOffsetPct = 0;
-        const gpRaw = manager.config.gridPrice;
-        const gpMode = (typeof gpRaw === 'string') ? gpRaw.trim().toLowerCase() : null;
-        if (typeof gpRaw === 'number' && Number.isFinite(gpRaw) && gpRaw > 0) {
-            gp = gpRaw;
-            gpSource = 'numeric';
-            manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: gridPrice=numeric ${gp.toFixed(8)}`, 'info');
+        finally {
+            await manager.resumeFundRecalc();
+            manager.resumeRecalcLogging();
         }
-        else if (gpMode === 'pool' || gpMode === 'book') {
-            try {
-                const { BitShares } = require('../bitshares_client');
-                const derived = await derivePrice(BitShares, manager.config.assetA, manager.config.assetB, gpMode);
-                if (derived) {
-                    gp = Number(derived);
-                    gpSource = gpMode;
-                    manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: gridPrice=${gpMode} ${gp.toFixed(8)}`, 'info');
-                }
-                else {
-                    manager.logger?.log?.(`initializeGrid: ${gpMode} gridPrice unavailable, falling back to startPrice`, 'warn');
-                }
+        manager.logger?.log?.(`Loaded ${manager.orders.size} orders from persisted grid.`, 'info');
+    });
+}
+/**
+ * Initialize the order grid with blockchain-aware sizing.
+ * @param {import('./types').OrderManager} manager - The manager instance.
+ * @returns {Promise<void>}
+ * @throws {Error} If initialization fails or account totals are missing.
+ */
+async function initializeGrid(manager) {
+    if (!manager)
+        throw new Error('initializeGrid requires a manager instance');
+    await manager._initializeAssets();
+    // FIX: Add explicit state validation to prevent cryptic errors later
+    if (!manager.assets || !manager.assets.assetA || !manager.assets.assetB) {
+        throw new Error('Asset initialization did not complete properly - assetA or assetB undefined');
+    }
+    if (!manager.config) {
+        throw new Error('Manager config not initialized before grid initialization');
+    }
+    const mpRaw = manager.config.startPrice;
+    manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: mpRaw type=${typeof mpRaw}, value=${mpRaw}`, 'debug');
+    // Auto-derive price if not a fixed numeric value (e.g. "pool", "book", or undefined)
+    if (typeof mpRaw !== 'number' || isNaN(mpRaw)) {
+        try {
+            const { BitShares } = require('../bitshares_client');
+            const derived = await derivePrice(BitShares, manager.config.assetA, manager.config.assetB, manager.config.priceMode || 'auto');
+            if (derived) {
+                manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: Derived new startPrice=${derived.toFixed(8)} (mode=${manager.config.priceMode || 'auto'})`, 'info');
+                manager.config.startPrice = Number(derived);
             }
-            catch (err) {
-                manager.logger?.log?.(`initializeGrid: ${gpMode} gridPrice derivation failed: ${err.message}`, 'warn');
+            else {
+                throw new Error(`Price derivation returned no result for ${manager.config.assetA}/${manager.config.assetB}`);
             }
         }
-        else if (/^ama(?:[1-4])?$/.test(gpMode || '')) {
-            amaSnapshot = loadAmaCenterSnapshot(manager.config.botKey);
-            const amaCenter = amaSnapshot?.gridCenterPrice ?? loadAmaCenterPrice(manager.config.botKey);
-            if (Number.isFinite(amaCenter) && amaCenter > 0) {
-                gp = amaCenter;
-                gpSource = 'ama';
-                const snapshotGridPriceOffsetPct = Number(amaSnapshot?.gridPriceOffsetPct);
-                const hasGridPriceOffset = isGridRangeScalingWhitelisted
-                    && Number.isFinite(snapshotGridPriceOffsetPct)
-                    && snapshotGridPriceOffsetPct !== 0;
-                gridPriceOffsetPct = hasGridPriceOffset ? snapshotGridPriceOffsetPct : 0;
-                manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: gridPrice=AMA center ${gp.toFixed(8)}`, 'info');
+        catch (err) {
+            manager.logger?.log?.(`Failed to derive market price: ${err.message}`, 'warn');
+            throw err; // Re-throw to prevent "pool" string reaching numeric math
+        }
+    }
+    const configuredStartPrice = manager.config.startPrice;
+    const configuredMinPrice = manager.config.minPrice;
+    const configuredMaxPrice = manager.config.maxPrice;
+    const mp = Number(manager.config.startPrice);
+    // Derive gridPrice — separate reference for x-factor bounds (may differ from startPrice).
+    // Supported modes:
+    //   - numeric: fixed value
+    //   - "pool" / "book": live blockchain price for the pair
+    //   - "ama"/"ama1".."ama4": center from profiles/orders/<botKey>.dynamicgrid.json
+    //   - null/anything else: fallback to startPrice (backward-compatible)
+    let gp = mp;
+    let gpSource = 'startPrice';
+    let amaSnapshot = null;
+    const whitelistFlags = getWhitelistFlags(manager.config.botKey);
+    const isGridRangeScalingWhitelisted = whitelistFlags.asymmetricBounds === true;
+    let gridPriceOffsetPct = 0;
+    const gpRaw = manager.config.gridPrice;
+    const gpMode = (typeof gpRaw === 'string') ? gpRaw.trim().toLowerCase() : null;
+    if (typeof gpRaw === 'number' && Number.isFinite(gpRaw) && gpRaw > 0) {
+        gp = gpRaw;
+        gpSource = 'numeric';
+        manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: gridPrice=numeric ${gp.toFixed(8)}`, 'info');
+    }
+    else if (gpMode === 'pool' || gpMode === 'book') {
+        try {
+            const { BitShares } = require('../bitshares_client');
+            const derived = await derivePrice(BitShares, manager.config.assetA, manager.config.assetB, gpMode);
+            if (derived) {
+                gp = Number(derived);
+                gpSource = gpMode;
+                manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: gridPrice=${gpMode} ${gp.toFixed(8)}`, 'info');
             }
             else {
-                manager.logger?.log?.(`initializeGrid: AMA center unavailable for gridPrice, falling back to startPrice`, 'warn');
+                manager.logger?.log?.(`initializeGrid: ${gpMode} gridPrice unavailable, falling back to startPrice`, 'warn');
             }
         }
-        const minP = resolveConfiguredPriceBound(manager.config.minPrice, DEFAULT_CONFIG.minPrice, gp, 'min');
-        const maxP = resolveConfiguredPriceBound(manager.config.maxPrice, DEFAULT_CONFIG.maxPrice, gp, 'max');
-        // Asymmetric bound adjustment: widen the bound in the AMA trend direction
-        // and tighten the opposite side, giving the grid more room when the center
-        // trails price. Uses slope data from the dynamicgrid.json snapshot.
-        let resolvedMinP = minP;
-        let resolvedMaxP = maxP;
-        let rangeScalingFactor = null;
-        if (gpSource === 'ama' && Number.isFinite(minP) && Number.isFinite(maxP)
-            && isGridRangeScalingWhitelisted) {
-            const dw = amaSnapshot?.dynamicWeights;
-            // Fallback to root-level asymmetricBounds when dynamicWeights is
-            // absent (asymmetricBounds: true without dynamicWeight: true).
-            const rootBounds = !dw && amaSnapshot?.asymmetricBounds
-                && typeof amaSnapshot.asymmetricBounds === 'object'
-                ? amaSnapshot.asymmetricBounds
-                : null;
-            if (dw) {
-                const maxAsymmetryFactor = resolveMaxAsymmetryFactor(manager.config.asymmetricBounds?.maxAsymmetryFactor, dw?.maxAsymmetryFactor, MARKET_ADAPTER.ASYMMETRIC_BOUNDS_MAX_ASYMMETRY_FACTOR);
-                const adjustment = applyAsymmetricBounds({
-                    centerPrice: gp,
-                    minPrice: minP,
-                    maxPrice: maxP,
-                    trend: dw?.trend,
-                    slopeOffset: dw?.slopeOffset,
-                    maxSlopeOffset: dw?.maxSlopeOffset,
-                    maxAsymmetryFactor,
-                });
-                if (Number.isFinite(adjustment.appliedAsymmetryFactor)) {
-                    resolvedMinP = adjustment.resolvedMinPrice;
-                    resolvedMaxP = adjustment.resolvedMaxPrice;
-                    rangeScalingFactor = Number(adjustment.appliedAsymmetryFactor);
-                    manager.logger?.log?.(`[BOUND-ASYMMETRY] trend=${dw.trend} slopeOffset=${dw.slopeOffset.toFixed(4)} `
-                        + `raw=${(adjustment.rawAsymmetryFactor * 100).toFixed(1)}% `
-                        + `cap=${(maxAsymmetryFactor * 100).toFixed(0)}% `
-                        + `asymmetry=${(adjustment.appliedAsymmetryFactor * 100).toFixed(1)}% `
-                        + `min ${minP.toFixed(8)}→${resolvedMinP.toFixed(8)} `
-                        + `max ${maxP.toFixed(8)}→${resolvedMaxP.toFixed(8)}`, 'info');
-                }
-            }
-            else if (rootBounds && Number.isFinite(rootBounds.appliedAsymmetryFactor)
-                && (rootBounds.trend === 'UP' || rootBounds.trend === 'DOWN')) {
-                const asymmetry = Number(rootBounds.appliedAsymmetryFactor);
-                const rootTrend = rootBounds.trend;
-                if (rootTrend === 'DOWN') {
-                    resolvedMinP = gp / ((gp / minP) * (1 + asymmetry));
-                    resolvedMaxP = gp * ((maxP / gp) * (1 - asymmetry));
-                }
-                else {
-                    resolvedMinP = gp / ((gp / minP) * (1 - asymmetry));
-                    resolvedMaxP = gp * ((maxP / gp) * (1 + asymmetry));
-                }
-                rangeScalingFactor = asymmetry;
-                manager.logger?.log?.(`[BOUND-ASYMMETRY] trend=${rootTrend} `
-                    + `asymmetry=${(asymmetry * 100).toFixed(1)}% `
-                    + `(root-level) min ${minP.toFixed(8)}→${resolvedMinP.toFixed(8)} `
+        catch (err) {
+            manager.logger?.log?.(`initializeGrid: ${gpMode} gridPrice derivation failed: ${err.message}`, 'warn');
+        }
+    }
+    else if (/^ama(?:[1-4])?$/.test(gpMode || '')) {
+        amaSnapshot = loadAmaCenterSnapshot(manager.config.botKey);
+        const amaCenter = amaSnapshot?.gridCenterPrice ?? loadAmaCenterPrice(manager.config.botKey);
+        if (Number.isFinite(amaCenter) && amaCenter > 0) {
+            gp = amaCenter;
+            gpSource = 'ama';
+            const snapshotGridPriceOffsetPct = Number(amaSnapshot?.gridPriceOffsetPct);
+            const hasGridPriceOffset = isGridRangeScalingWhitelisted
+                && Number.isFinite(snapshotGridPriceOffsetPct)
+                && snapshotGridPriceOffsetPct !== 0;
+            gridPriceOffsetPct = hasGridPriceOffset ? snapshotGridPriceOffsetPct : 0;
+            manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: gridPrice=AMA center ${gp.toFixed(8)}`, 'info');
+        }
+        else {
+            manager.logger?.log?.(`initializeGrid: AMA center unavailable for gridPrice, falling back to startPrice`, 'warn');
+        }
+    }
+    const minP = resolveConfiguredPriceBound(manager.config.minPrice, DEFAULT_CONFIG.minPrice, gp, 'min');
+    const maxP = resolveConfiguredPriceBound(manager.config.maxPrice, DEFAULT_CONFIG.maxPrice, gp, 'max');
+    // Asymmetric bound adjustment: widen the bound in the AMA trend direction
+    // and tighten the opposite side, giving the grid more room when the center
+    // trails price. Uses slope data from the dynamicgrid.json snapshot.
+    let resolvedMinP = minP;
+    let resolvedMaxP = maxP;
+    let rangeScalingFactor = null;
+    if (gpSource === 'ama' && Number.isFinite(minP) && Number.isFinite(maxP)
+        && isGridRangeScalingWhitelisted) {
+        const dw = amaSnapshot?.dynamicWeights;
+        // Fallback to root-level asymmetricBounds when dynamicWeights is
+        // absent (asymmetricBounds: true without dynamicWeight: true).
+        const rootBounds = !dw && amaSnapshot?.asymmetricBounds
+            && typeof amaSnapshot.asymmetricBounds === 'object'
+            ? amaSnapshot.asymmetricBounds
+            : null;
+        if (dw) {
+            const maxAsymmetryFactor = resolveMaxAsymmetryFactor(manager.config.asymmetricBounds?.maxAsymmetryFactor, dw?.maxAsymmetryFactor, MARKET_ADAPTER.ASYMMETRIC_BOUNDS_MAX_ASYMMETRY_FACTOR);
+            const adjustment = applyAsymmetricBounds({
+                centerPrice: gp,
+                minPrice: minP,
+                maxPrice: maxP,
+                trend: dw?.trend,
+                slopeOffset: dw?.slopeOffset,
+                maxSlopeOffset: dw?.maxSlopeOffset,
+                maxAsymmetryFactor,
+            });
+            if (Number.isFinite(adjustment.appliedAsymmetryFactor)) {
+                resolvedMinP = adjustment.resolvedMinPrice;
+                resolvedMaxP = adjustment.resolvedMaxPrice;
+                rangeScalingFactor = Number(adjustment.appliedAsymmetryFactor);
+                manager.logger?.log?.(`[BOUND-ASYMMETRY] trend=${dw.trend} slopeOffset=${dw.slopeOffset.toFixed(4)} `
+                    + `raw=${(adjustment.rawAsymmetryFactor * 100).toFixed(1)}% `
+                    + `cap=${(maxAsymmetryFactor * 100).toFixed(0)}% `
+                    + `asymmetry=${(adjustment.appliedAsymmetryFactor * 100).toFixed(1)}% `
+                    + `min ${minP.toFixed(8)}→${resolvedMinP.toFixed(8)} `
                     + `max ${maxP.toFixed(8)}→${resolvedMaxP.toFixed(8)}`, 'info');
             }
         }
-        let gridStartPrice = mp;
-        let offsetAdjustedStartPrice = gridStartPrice;
-        if (gpSource === 'ama' && gridPriceOffsetPct !== 0 && Number.isFinite(gridStartPrice) && gridStartPrice > 0) {
-            const adjustedMarketPrice = gridStartPrice * (1 + (gridPriceOffsetPct / 100));
-            manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: applying AMA market-price offset ${gridPriceOffsetPct.toFixed(3)}% `
-                + `to startPrice ${gridStartPrice.toFixed(8)} -> ${adjustedMarketPrice.toFixed(8)}`, 'info');
-            gridStartPrice = adjustedMarketPrice;
-            offsetAdjustedStartPrice = adjustedMarketPrice;
-        }
-        if (!(gridStartPrice >= resolvedMinP && gridStartPrice <= resolvedMaxP)) {
-            if (Number.isFinite(gp) && gp > 0 && gp >= resolvedMinP && gp <= resolvedMaxP) {
-                gridStartPrice = gp;
-                manager.logger?.log?.(`initializeGrid: startPrice (${mp}) outside bounds [${resolvedMinP}, ${resolvedMaxP}]; using gridPrice center ${gp}`, 'warn');
+        else if (rootBounds && Number.isFinite(rootBounds.appliedAsymmetryFactor)
+            && (rootBounds.trend === 'UP' || rootBounds.trend === 'DOWN')) {
+            const asymmetry = Number(rootBounds.appliedAsymmetryFactor);
+            const rootTrend = rootBounds.trend;
+            if (rootTrend === 'DOWN') {
+                resolvedMinP = gp / ((gp / minP) * (1 + asymmetry));
+                resolvedMaxP = gp * ((maxP / gp) * (1 - asymmetry));
             }
             else {
-                const clamped = Math.min(resolvedMaxP, Math.max(resolvedMinP, gridStartPrice));
-                manager.logger?.log?.(`initializeGrid: startPrice (${mp}) outside bounds [${resolvedMinP}, ${resolvedMaxP}]; clamping to ${clamped}`, 'warn');
-                gridStartPrice = clamped;
+                resolvedMinP = gp / ((gp / minP) * (1 - asymmetry));
+                resolvedMaxP = gp * ((maxP / gp) * (1 + asymmetry));
             }
+            rangeScalingFactor = asymmetry;
+            manager.logger?.log?.(`[BOUND-ASYMMETRY] trend=${rootTrend} `
+                + `asymmetry=${(asymmetry * 100).toFixed(1)}% `
+                + `(root-level) min ${minP.toFixed(8)}→${resolvedMinP.toFixed(8)} `
+                + `max ${maxP.toFixed(8)}→${resolvedMaxP.toFixed(8)}`, 'info');
         }
-        manager.config.minPrice = resolvedMinP;
-        manager.config.maxPrice = resolvedMaxP;
-        manager._lastGridPricingContext = {
-            gridPrice: gp,
-            gridPriceOffsetPct,
-            offsetAdjustedStartPrice,
-            startPrice: gridStartPrice,
-            configuredMinPrice,
-            configuredMaxPrice,
-            rangeScalingFactor
-        };
-        // Ensure percentage-based funds are resolved before sizing
-        try {
-            if (manager.accountId && !manager.accountTotals) {
-                await manager.waitForAccountTotals(TIMING.ACCOUNT_TOTALS_TIMEOUT_MS);
-            }
-        }
-        catch (e) {
-            manager.logger?.log?.(`Failed to load account totals: ${e.message}`, 'warn');
-            // FIX: Add error handling - cannot proceed with grid initialization without account totals
-            // Continuing would create grid with 0 fund allocation, rendering it non-functional
-            throw new Error(`Cannot initialize grid without account totals: ${e.message}`);
-        }
-        const { orders, boundaryIdx, initialSpreadCount } = Grid.createOrderGrid({
-            ...manager.config,
-            startPrice: gridStartPrice,
-            minPrice: resolvedMinP,
-            maxPrice: resolvedMaxP,
-        });
-        // RC-8: Update boundary with notification to dependent systems
-        // Persist master boundary for StrategyEngine
-        if (manager.boundaryIdx !== boundaryIdx) {
-            manager.boundaryIdx = boundaryIdx;
-            // RC-8: Notify StrategyEngine of boundary change (if method exists)
-            if (typeof manager.notifyBoundaryUpdate === 'function') {
-                try {
-                    manager.notifyBoundaryUpdate(boundaryIdx);
-                }
-                catch (err) {
-                    manager.logger?.log?.(`Error notifying boundary update: ${err.message}`, 'warn');
-                }
-            }
+    }
+    let gridStartPrice = mp;
+    let offsetAdjustedStartPrice = gridStartPrice;
+    if (gpSource === 'ama' && gridPriceOffsetPct !== 0 && Number.isFinite(gridStartPrice) && gridStartPrice > 0) {
+        const adjustedMarketPrice = gridStartPrice * (1 + (gridPriceOffsetPct / 100));
+        manager.logger?.log?.(`[DIAGNOSTIC] initializeGrid: applying AMA market-price offset ${gridPriceOffsetPct.toFixed(3)}% `
+            + `to startPrice ${gridStartPrice.toFixed(8)} -> ${adjustedMarketPrice.toFixed(8)}`, 'info');
+        gridStartPrice = adjustedMarketPrice;
+        offsetAdjustedStartPrice = adjustedMarketPrice;
+    }
+    if (!(gridStartPrice >= resolvedMinP && gridStartPrice <= resolvedMaxP)) {
+        if (Number.isFinite(gp) && gp > 0 && gp >= resolvedMinP && gp <= resolvedMaxP) {
+            gridStartPrice = gp;
+            manager.logger?.log?.(`initializeGrid: startPrice (${mp}) outside bounds [${resolvedMinP}, ${resolvedMaxP}]; using gridPrice center ${gp}`, 'warn');
         }
-        const minSellSize = getMinAbsoluteOrderSize(ORDER_TYPES.SELL, manager.assets);
-        const minBuySize = getMinAbsoluteOrderSize(ORDER_TYPES.BUY, manager.assets);
-        const { A: precA, B: precB } = getPrecisionsForManager(manager.assets);
-        // Use centralized sizing context for both sides.
-        // Resolve funds once upfront so both contexts share the same snapshot,
-        // avoiding a redundant recalculateFunds inside the second _getSizingContext call.
-        await manager.recalculateFunds();
-        const sellCtx = await Grid._getSizingContext(manager, 'sell', { skipRecalc: true });
-        const buyCtx = await Grid._getSizingContext(manager, 'buy', { skipRecalc: true });
-        if (!sellCtx || !buyCtx)
-            throw new Error('Failed to retrieve sizing context for grid initialization');
-        let sizedOrders = calculateOrderSizes(orders, manager.config, sellCtx.budget, buyCtx.budget, minSellSize, minBuySize, precA, precB);
-        // Verification of sizes
-        const sells = filterOrdersByType(sizedOrders, ORDER_TYPES.SELL).map(o => Number(o.size || 0));
-        const buys = filterOrdersByType(sizedOrders, ORDER_TYPES.BUY).map(o => Number(o.size || 0));
-        if (checkSizesBeforeMinimum(sells, minSellSize, precA) || checkSizesBeforeMinimum(buys, minBuySize, precB)) {
-            throw new Error('Calculated orders fall below minimum allowable size.');
+        else {
+            const clamped = Math.min(resolvedMaxP, Math.max(resolvedMinP, gridStartPrice));
+            manager.logger?.log?.(`initializeGrid: startPrice (${mp}) outside bounds [${resolvedMinP}, ${resolvedMaxP}]; clamping to ${clamped}`, 'warn');
+            gridStartPrice = clamped;
         }
-        // Check for warning if orders are near minimal size (regression fix)
-        const warningSellSize = minSellSize > 0 ? getMinAbsoluteOrderSize(ORDER_TYPES.SELL, manager.assets, 100) : 0;
-        const warningBuySize = minBuySize > 0 ? getMinAbsoluteOrderSize(ORDER_TYPES.BUY, manager.assets, 100) : 0;
-        if (checkSizeThreshold(sells, warningSellSize, precA, false) || checkSizeThreshold(buys, warningBuySize, precB, false)) {
-            manager.logger?.log?.("WARNING: Order grid contains orders near minimum size. To ensure the bot runs properly, consider increasing the funds of your bot.", "warn");
+    }
+    manager.config.minPrice = resolvedMinP;
+    manager.config.maxPrice = resolvedMaxP;
+    manager._lastGridPricingContext = {
+        gridPrice: gp,
+        gridPriceOffsetPct,
+        offsetAdjustedStartPrice,
+        startPrice: gridStartPrice,
+        configuredMinPrice,
+        configuredMaxPrice,
+        rangeScalingFactor
+    };
+    // Ensure percentage-based funds are resolved before sizing
+    try {
+        if (manager.accountId && !manager.accountTotals) {
+            await manager.waitForAccountTotals(TIMING.ACCOUNT_TOTALS_TIMEOUT_MS);
         }
-        // RC-2: Wrap atomic changes in grid lock
-        await manager._gridLock.acquire(async () => {
-            Grid._clearOrderCachesLogic(manager);
-            manager.resetFunds();
-            manager.pauseRecalcLogging();
-            manager.pauseFundRecalc();
+    }
+    catch (e) {
+        manager.logger?.log?.(`Failed to load account totals: ${e.message}`, 'warn');
+        // FIX: Add error handling - cannot proceed with grid initialization without account totals
+        // Continuing would create grid with 0 fund allocation, rendering it non-functional
+        throw new Error(`Cannot initialize grid without account totals: ${e.message}`);
+    }
+    const { orders, boundaryIdx, initialSpreadCount } = createOrderGrid({
+        ...manager.config,
+        startPrice: gridStartPrice,
+        minPrice: resolvedMinP,
+        maxPrice: resolvedMaxP,
+    });
+    // RC-8: Update boundary with notification to dependent systems
+    // Persist master boundary for StrategyEngine
+    if (manager.boundaryIdx !== boundaryIdx) {
+        manager.boundaryIdx = boundaryIdx;
+        // RC-8: Notify StrategyEngine of boundary change (if method exists)
+        if (typeof manager.notifyBoundaryUpdate === 'function') {
             try {
-                // RC-2: Use _applyOrderUpdate (PRIVATE/UNLOCKED)
-                for (const order of sizedOrders) {
-                    await manager._applyOrderUpdate(order, 'grid-init', { skipAccounting: true });
-                }
+                manager.notifyBoundaryUpdate(boundaryIdx);
             }
-            finally {
-                await manager.resumeFundRecalc();
-                manager.resumeRecalcLogging();
+            catch (err) {
+                manager.logger?.log?.(`Error notifying boundary update: ${err.message}`, 'warn');
             }
-            // RC-6: Spread count updates protected by grid lock
-            manager.targetSpreadCount = initialSpreadCount.buy + initialSpreadCount.sell;
-            manager.currentSpreadCount = manager.targetSpreadCount;
-        });
-        // FIX: Use consistent optional chaining pattern for all logger calls
-        manager.logger?.log?.(`Initialized grid with ${orders.length} orders.`, 'info');
-        manager.logger?.logFundsStatus?.(manager);
-        manager.logger?.logOrderGrid?.(Array.from(manager.orders.values()), gridStartPrice);
-    }
-    /**
-     * Full grid resynchronization from blockchain state.
-     * @param {import('./types').OrderManager} manager - The manager instance.
-     * @param {Object} opts - Options for resynchronization.
-     * @param {Function} opts.readOpenOrdersFn - Function to read open orders.
-     * @param {Object} opts.chainOrders - Chain orders module.
-     * @param {string} opts.account - Account name.
-     * @param {string} opts.privateKey - Private key.
-     * @returns {Promise<void>}
-     */
-    static async recalculateGrid(manager, opts) {
-        const { readOpenOrdersFn, chainOrders, account, privateKey } = opts;
-        // Suppress invariant warnings during full resync
-        manager.startBootstrap();
+        }
+    }
+    const minSellSize = getMinAbsoluteOrderSize(ORDER_TYPES.SELL, manager.assets);
+    const minBuySize = getMinAbsoluteOrderSize(ORDER_TYPES.BUY, manager.assets);
+    const { A: precA, B: precB } = getPrecisionsForManager(manager.assets);
+    // Use centralized sizing context for both sides.
+    // Resolve funds once upfront so both contexts share the same snapshot,
+    // avoiding a redundant recalculateFunds inside the second _getSizingContext call.
+    await manager.recalculateFunds();
+    const sellCtx = await _getSizingContext(manager, 'sell', { skipRecalc: true });
+    const buyCtx = await _getSizingContext(manager, 'buy', { skipRecalc: true });
+    if (!sellCtx || !buyCtx)
+        throw new Error('Failed to retrieve sizing context for grid initialization');
+    let sizedOrders = calculateOrderSizes(orders, manager.config, sellCtx.budget, buyCtx.budget, minSellSize, minBuySize, precA, precB);
+    // Verification of sizes
+    const sells = filterOrdersByType(sizedOrders, ORDER_TYPES.SELL).map(o => Number(o.size || 0));
+    const buys = filterOrdersByType(sizedOrders, ORDER_TYPES.BUY).map(o => Number(o.size || 0));
+    if (checkSizesBeforeMinimum(sells, minSellSize, precA) || checkSizesBeforeMinimum(buys, minBuySize, precB)) {
+        throw new Error('Calculated orders fall below minimum allowable size.');
+    }
+    // Check for warning if orders are near minimal size (regression fix)
+    const warningSellSize = minSellSize > 0 ? getMinAbsoluteOrderSize(ORDER_TYPES.SELL, manager.assets, 100) : 0;
+    const warningBuySize = minBuySize > 0 ? getMinAbsoluteOrderSize(ORDER_TYPES.BUY, manager.assets, 100) : 0;
+    if (checkSizeThreshold(sells, warningSellSize, precA, false) || checkSizeThreshold(buys, warningBuySize, precB, false)) {
+        manager.logger?.log?.("WARNING: Order grid contains orders near minimum size. To ensure the bot runs properly, consider increasing the funds of your bot.", "warn");
+    }
+    // RC-2: Wrap atomic changes in grid lock
+    await manager._gridLock.acquire(async () => {
+        _clearOrderCachesLogic(manager);
+        manager.resetFunds();
+        manager.pauseRecalcLogging();
+        manager.pauseFundRecalc();
         try {
-            // FIX: Use consistent optional chaining pattern for logger calls
-            manager.logger?.log?.('Starting full resync...', 'info');
-            await manager._initializeAssets();
-            await manager.fetchAccountTotals();
-            const chainOpenOrders = await readOpenOrdersFn();
-            if (!Array.isArray(chainOpenOrders))
-                return;
-            // CRITICAL: Filter out PARTIAL orders before synchronizing - they're from old grid
-            // and shouldn't be part of the fresh regenerated grid structure
-            const activeOrders = chainOpenOrders.filter(o => o.state !== ORDER_STATES.PARTIAL);
-            await manager.syncFromOpenOrders(activeOrders, { skipAccounting: true, fillLockAlreadyHeld: true });
-            manager.resetFunds();
-            await manager.persistGrid();
-            await Grid.initializeGrid(manager);
-            const { reconcileGridOrders } = require('./grid_reconcile');
-            // FIX: Add error context for debugging grid recalculation issues
-            try {
-                await reconcileGridOrders({ manager, config: manager.config, account, privateKey, chainOrders, chainOpenOrders, fillLockAlreadyHeld: true });
-            }
-            catch (err) {
-                manager.logger?.log?.(`Error during startup order reconciliation: ${err.message}`, 'error');
-                throw new Error(`Grid recalculation failed during order reconciliation: ${err.message}`);
+            // RC-2: Use _applyOrderUpdate (PRIVATE/UNLOCKED)
+            for (const order of sizedOrders) {
+                await manager._applyOrderUpdate(order, 'grid-init', { skipAccounting: true });
             }
-            // FIX: Use consistent optional chaining pattern for logger calls
-            manager.logger?.log?.('Full resync complete.', 'info');
         }
         finally {
-            manager.finishBootstrap();
+            await manager.resumeFundRecalc();
+            manager.resumeRecalcLogging();
+        }
+        // RC-6: Spread count updates protected by grid lock
+        manager.targetSpreadCount = initialSpreadCount.buy + initialSpreadCount.sell;
+        manager.currentSpreadCount = manager.targetSpreadCount;
+    });
+    // FIX: Use consistent optional chaining pattern for all logger calls
+    manager.logger?.log?.(`Initialized grid with ${orders.length} orders.`, 'info');
+    manager.logger?.logFundsStatus?.(manager);
+    manager.logger?.logOrderGrid?.(Array.from(manager.orders.values()), gridStartPrice);
+}
+/**
+ * Full grid resynchronization from blockchain state.
+ * @param {import('./types').OrderManager} manager - The manager instance.
+ * @param {Object} opts - Options for resynchronization.
+ * @param {Function} opts.readOpenOrdersFn - Function to read open orders.
+ * @param {Object} opts.chainOrders - Chain orders module.
+ * @param {string} opts.account - Account name.
+ * @param {string} opts.privateKey - Private key.
+ * @returns {Promise<void>}
+ */
+async function recalculateGrid(manager, opts) {
+    const { readOpenOrdersFn, chainOrders, account, privateKey } = opts;
+    // Suppress invariant warnings during full resync
+    manager.startBootstrap();
+    try {
+        // FIX: Use consistent optional chaining pattern for logger calls
+        manager.logger?.log?.('Starting full resync...', 'info');
+        await manager._initializeAssets();
+        await manager.fetchAccountTotals();
+        const chainOpenOrders = await readOpenOrdersFn();
+        if (!Array.isArray(chainOpenOrders))
+            return;
+        // CRITICAL: Filter out PARTIAL orders before synchronizing - they're from old grid
+        // and shouldn't be part of the fresh regenerated grid structure
+        const activeOrders = chainOpenOrders.filter(o => o.state !== ORDER_STATES.PARTIAL);
+        await manager.syncFromOpenOrders(activeOrders, { skipAccounting: true });
+        manager.resetFunds();
+        await manager.persistGrid();
+        await initializeGrid(manager);
+        const { reconcileGridOrders } = require('./grid_reconcile');
+        // FIX: Add error context for debugging grid recalculation issues
+        try {
+            await reconcileGridOrders({ manager, config: manager.config, account, privateKey, chainOrders, chainOpenOrders });
         }
+        catch (err) {
+            manager.logger?.log?.(`Error during startup order reconciliation: ${err.message}`, 'error');
+            throw new Error(`Grid recalculation failed during order reconciliation: ${err.message}`);
+        }
+        // FIX: Use consistent optional chaining pattern for logger calls
+        manager.logger?.log?.('Full resync complete.', 'info');
     }
-    /**
-     * Check for grid divergence and trigger update if threshold is met.
-     *
-     * @param {import('./types').OrderManager} manager - Manager instance with order state
-     * @returns {import('./types').SideUpdateFlags}
-     */
-    static checkAndUpdateGridIfNeeded(manager) {
-        const threshold = manager.config?.gridLimits?.GRID_REGENERATION_PERCENTAGE;
-        const chainSnap = manager.getChainFundsSnapshot();
-        const gridBuy = Number(manager.funds?.total?.grid?.buy || 0);
-        const gridSell = Number(manager.funds?.total?.grid?.sell || 0);
-        const result = { buyUpdated: false, sellUpdated: false };
-        const sides = [
-            { name: 'buy', grid: gridBuy, orderType: ORDER_TYPES.BUY },
-            { name: 'sell', grid: gridSell, orderType: ORDER_TYPES.SELL }
-        ];
-        for (const s of sides) {
-            if (s.grid <= 0)
-                continue;
-            const availableFunds = calculateAvailableFundsValue(s.name, manager.accountTotals, manager.funds, manager.config.assetA, manager.config.assetB, manager.config.activeOrders, manager.config.min_BTS_value, manager.config.feeParams ?? null);
-            // Denominator: side's allocated capital (or chain total fallback).
-            const allocated = s.name === 'buy' ? chainSnap.allocatedBuy : chainSnap.allocatedSell;
-            const denominator = (allocated > 0) ? allocated : (s.grid + availableFunds);
-            const ratio = (denominator > 0) ? (availableFunds / denominator) * 100 : 0;
-            manager.logger?.log?.(`[DIVERGENCE] ${s.name.toUpperCase()} ratio check: availableFunds=${availableFunds.toFixed(5)}, allocated=${allocated.toFixed(5)}, ratio=${ratio.toFixed(4)}% (threshold=${threshold}%) → ${ratio >= threshold ? 'TRIGGER' : 'no trigger'}`, 'debug');
-            if (ratio >= threshold) {
-                // RC-3: Use Set for automatic duplicate prevention
-                if (!(manager._gridSidesUpdated instanceof Set))
-                    manager._gridSidesUpdated = new Set();
-                manager._gridSidesUpdated.add(s.orderType);
-                if (s.name === 'buy')
-                    result.buyUpdated = true;
-                else
-                    result.sellUpdated = true;
-            }
+    finally {
+        manager.finishBootstrap();
+    }
+}
+/**
+ * Check for grid divergence and trigger update if threshold is met.
+ *
+ * @param {import('./types').OrderManager} manager - Manager instance with order state
+ * @returns {import('./types').SideUpdateFlags}
+ */
+function checkAndUpdateGridIfNeeded(manager) {
+    const threshold = manager.config?.gridLimits?.GRID_REGENERATION_PERCENTAGE;
+    const chainSnap = manager.getChainFundsSnapshot();
+    const gridBuy = Number(manager.funds?.total?.grid?.buy || 0);
+    const gridSell = Number(manager.funds?.total?.grid?.sell || 0);
+    const result = { buyUpdated: false, sellUpdated: false };
+    const sides = [
+        { name: 'buy', grid: gridBuy, orderType: ORDER_TYPES.BUY },
+        { name: 'sell', grid: gridSell, orderType: ORDER_TYPES.SELL }
+    ];
+    for (const s of sides) {
+        if (s.grid <= 0)
+            continue;
+        const availableFunds = calculateAvailableFundsValue(s.name, manager.accountTotals, manager.funds, manager.config.assetA, manager.config.assetB, manager.config.activeOrders, manager.config.min_BTS_value, manager.config.feeParams ?? null);
+        // Denominator: side's allocated capital (or chain total fallback).
+        const allocated = s.name === 'buy' ? chainSnap.allocatedBuy : chainSnap.allocatedSell;
+        const denominator = (allocated > 0) ? allocated : (s.grid + availableFunds);
+        const ratio = (denominator > 0) ? (availableFunds / denominator) * 100 : 0;
+        manager.logger?.log?.(`[DIVERGENCE] ${s.name.toUpperCase()} ratio check: availableFunds=${availableFunds.toFixed(5)}, allocated=${allocated.toFixed(5)}, ratio=${ratio.toFixed(4)}% (threshold=${threshold}%) → ${ratio >= threshold ? 'TRIGGER' : 'no trigger'}`, 'debug');
+        if (ratio >= threshold) {
+            // RC-3: Use Set for automatic duplicate prevention
+            if (!(manager._gridSidesUpdated instanceof Set))
+                manager._gridSidesUpdated = new Set();
+            manager._gridSidesUpdated.add(s.orderType);
+            if (s.name === 'buy')
+                result.buyUpdated = true;
+            else
+                result.sellUpdated = true;
         }
-        return result;
-    }
-    /**
-     * Standardize grid sizes using blockchain total context.
-     *
-     * FUND CAPPING STRATEGY:
-     * =====================
-     * During grid regeneration (e.g., after fills increase available funds),
-     * this method recalculates all order sizes using geometric weighting.
-     * However, ACTIVE/PARTIAL orders must not grow larger than currently available funds.
-     *
-     * Rationale for capping:
-     * 1. POST-FILL EXPANSION PREVENTION: After a large fill, funds become available.
-     *    A naive size recalculation might expand orders, consuming all new capital.
-     *    Capping prevents this "resize explosion" by limiting growth to available free balance.
-     * 2. VIRTUAL ORDER PROTECTION: Virtual orders (not yet placed) are uncapped,
-     *    allowing natural expansion when their slot comes up for placement.
-     * 3. BLOCKCHAIN-BACKED CONSTRAINT: sideFreeAvailable tracks exactly what we can spend,
-     *    decreasing as commitments grow (proportional to realized delta).
-     *
-     * Fund Capping Algorithm:
-     * ========================
-     * For each ACTIVE/PARTIAL order slot:
-     *   1. Calculate new size from geometric series
-     *   2. If delta > 0 (growth):
-     *      - affordableDelta = min(delta, sideFreeAvailable)
-     *      - Cap growth to what we actually have: newSize = currentSize + affordableDelta
-     *      - Deduct from sideFreeAvailable (this spending is now committed)
-     *   3. If delta < 0 (shrinkage):
-     *      - Release the freed capital back to sideFreeAvailable
-     *      - Allows later slots to grow into this freed capacity
-     *   4. For VIRTUAL orders (not on-chain):
-     *      - Apply new size directly (no capping)
-     *      - They will be constrained when actually placed
-     *
-     * Example (2 slots, buy side, budget=1000, simplify to linear):
-     * ========================================================
-     * Initial: slot[0]=400 (ACTIVE), slot[1]=0 (VIRTUAL), sideFree=600
-     * Recalc:  newSizes=[500, 500]
-     *
-     *   Process slot[0]:
-     *     - Type: ACTIVE, current=400, new=500, delta=+100
-     *     - affordableDelta = min(100, 600) = 100
-     *     - Apply: size=500 (full growth), sideFree=500
-     *
-     *   Process slot[1]:
-     *     - Type: VIRTUAL (not capped), current=0, new=500, delta=+500
-     *     - Apply: size=500 (no cap check)
-     *     - Result: slot[1] ready for placement, will consume from sideFree when placed
-     *
-     * @param {import('./types').OrderManager} manager - OrderManager instance
-     * @param {string} orderType - ORDER_TYPES.BUY or ORDER_TYPES.SELL
-     * @param {Object} [options] - Options object
-     * @param {import('./working_grid')} [options.workingGrid] - Working grid for COW pattern
-     * @returns {Promise<{actions: Array, changed: boolean}|undefined>} - COW result or undefined
-     * @private
-     */
-    static async _recalculateGridOrderSizesFromBlockchain(manager, orderType, options = {}) {
-        if (!manager.assets)
-            return options?.workingGrid ? { actions: [], changed: false } : undefined;
-        const workingGrid = options?.workingGrid || null;
-        const collectActions = !!workingGrid;
-        const isBuy = orderType === ORDER_TYPES.BUY;
-        const sideName = isBuy ? 'buy' : 'sell';
-        // Use centralized sizing context (respects botFunds % allocation)
-        const ctx = await Grid._getSizingContext(manager, sideName);
-        if (!ctx)
-            return collectActions ? { actions: [], changed: false } : undefined;
-        // Get ALL slots for this side, sorted for calculateRotationOrderSizes
-        // SELL: sorted ASC (Market to Edge)
-        // BUY: sorted ASC (Edge to Market)
-        const allSideSlots = Array.from(manager.orders.values())
-            .filter(o => o.type === orderType)
-            .sort((a, b) => a.price - b.price);
-        if (allSideSlots.length === 0)
-            return collectActions ? { actions: [], changed: false } : undefined;
-        // Calculate geometric sizes for the ENTIRE rail
-        const newSizes = calculateRotationOrderSizes(ctx.budget, 0, allSideSlots.length, orderType, manager.config, 0, ctx.precision);
-        const actions = [];
-        let changed = false;
-        const freeKey = isBuy ? 'buyFree' : 'sellFree';
-        let sideFreeAvailable = Number(manager.accountTotals?.[freeKey] || 0);
-        if (!collectActions)
-            manager.pauseRecalcLogging();
-        try {
-            // Apply new sizes to all slots on the side
-            for (let i = 0; i < allSideSlots.length; i++) {
-                const slot = allSideSlots[i];
-                let newSize = newSizes[i] || 0;
-                // FUND CAPPING FOR COMMITTED (ON-CHAIN) ORDERS:
-                // Only ACTIVE/PARTIAL orders are constrained by available funds.
-                // Virtual orders (not yet placed) will be constrained when they are actually placed.
-                //
-                // NOTE: BTS update fees are paid from BTS balance (separate from asset balance),
-                // so they don't affect this asset-side size cap. Fee budgets are tracked in
-                // funds.btsFeesOwed and reserved separately via btsFeesReservation.
-                const isCommitted = isOrderOnChain(slot);
-                if (isCommitted) {
-                    const currentSize = Number(slot.size || 0);
-                    const delta = newSize - currentSize;
-                    if (delta > 0) {
-                        // GROWTH: Cap to available free balance
-                        // This prevents aggressive expansion after fills
-                        const affordableDelta = Math.min(delta, Math.max(0, sideFreeAvailable));
-                        if (affordableDelta < delta) {
-                            // Cannot afford full growth; cap to what's available
-                            newSize = currentSize + affordableDelta;
-                        }
-                        sideFreeAvailable = Math.max(0, sideFreeAvailable - affordableDelta);
-                    }
-                    else if (delta < 0) {
-                        // SHRINKAGE: Release freed capital back for other slots
-                        sideFreeAvailable += Math.abs(delta);
+    }
+    return result;
+}
+/**
+ * Standardize grid sizes using blockchain total context.
+ *
+ * FUND CAPPING STRATEGY:
+ * =====================
+ * During grid regeneration (e.g., after fills increase available funds),
+ * this method recalculates all order sizes using geometric weighting.
+ * However, ACTIVE/PARTIAL orders must not grow larger than currently available funds.
+ *
+ * Rationale for capping:
+ * 1. POST-FILL EXPANSION PREVENTION: After a large fill, funds become available.
+ *    A naive size recalculation might expand orders, consuming all new capital.
+ *    Capping prevents this "resize explosion" by limiting growth to available free balance.
+ * 2. VIRTUAL ORDER PROTECTION: Virtual orders (not yet placed) are uncapped,
+ *    allowing natural expansion when their slot comes up for placement.
+ * 3. BLOCKCHAIN-BACKED CONSTRAINT: sideFreeAvailable tracks exactly what we can spend,
+ *    decreasing as commitments grow (proportional to realized delta).
+ *
+ * Fund Capping Algorithm:
+ * ========================
+ * For each ACTIVE/PARTIAL order slot:
+ *   1. Calculate new size from geometric series
+ *   2. If delta > 0 (growth):
+ *      - affordableDelta = min(delta, sideFreeAvailable)
+ *      - Cap growth to what we actually have: newSize = currentSize + affordableDelta
+ *      - Deduct from sideFreeAvailable (this spending is now committed)
+ *   3. If delta < 0 (shrinkage):
+ *      - Release the freed capital back to sideFreeAvailable
+ *      - Allows later slots to grow into this freed capacity
+ *   4. For VIRTUAL orders (not on-chain):
+ *      - Apply new size directly (no capping)
+ *      - They will be constrained when actually placed
+ *
+ * Example (2 slots, buy side, budget=1000, simplify to linear):
+ * ========================================================
+ * Initial: slot[0]=400 (ACTIVE), slot[1]=0 (VIRTUAL), sideFree=600
+ * Recalc:  newSizes=[500, 500]
+ *
+ *   Process slot[0]:
+ *     - Type: ACTIVE, current=400, new=500, delta=+100
+ *     - affordableDelta = min(100, 600) = 100
+ *     - Apply: size=500 (full growth), sideFree=500
+ *
+ *   Process slot[1]:
+ *     - Type: VIRTUAL (not capped), current=0, new=500, delta=+500
+ *     - Apply: size=500 (no cap check)
+ *     - Result: slot[1] ready for placement, will consume from sideFree when placed
+ *
+ * @param {import('./types').OrderManager} manager - OrderManager instance
+ * @param {string} orderType - ORDER_TYPES.BUY or ORDER_TYPES.SELL
+ * @param {Object} [options] - Options object
+ * @param {import('./working_grid')} [options.workingGrid] - Working grid for COW pattern
+ * @returns {Promise<{actions: Array, changed: boolean}|undefined>} - COW result or undefined
+ * @private
+ */
+async function _recalculateGridOrderSizesFromBlockchain(manager, orderType, options = {}) {
+    if (!manager.assets)
+        return options?.workingGrid ? { actions: [], changed: false } : undefined;
+    const workingGrid = options?.workingGrid || null;
+    const collectActions = !!workingGrid;
+    const isBuy = orderType === ORDER_TYPES.BUY;
+    const sideName = isBuy ? 'buy' : 'sell';
+    // Use centralized sizing context (respects botFunds % allocation)
+    const ctx = await _getSizingContext(manager, sideName);
+    if (!ctx)
+        return collectActions ? { actions: [], changed: false } : undefined;
+    // Get ALL slots for this side, sorted for calculateRotationOrderSizes
+    // SELL: sorted ASC (Market to Edge)
+    // BUY: sorted ASC (Edge to Market)
+    const allSideSlots = Array.from(manager.orders.values())
+        .filter(o => o.type === orderType)
+        .sort((a, b) => a.price - b.price);
+    if (allSideSlots.length === 0)
+        return collectActions ? { actions: [], changed: false } : undefined;
+    // Calculate geometric sizes for the ENTIRE rail
+    const newSizes = calculateRotationOrderSizes(ctx.budget, 0, allSideSlots.length, orderType, manager.config, 0, ctx.precision);
+    const actions = [];
+    let changed = false;
+    const freeKey = isBuy ? 'buyFree' : 'sellFree';
+    let sideFreeAvailable = Number(manager.accountTotals?.[freeKey] || 0);
+    if (!collectActions)
+        manager.pauseRecalcLogging();
+    try {
+        // Apply new sizes to all slots on the side
+        for (let i = 0; i < allSideSlots.length; i++) {
+            const slot = allSideSlots[i];
+            let newSize = newSizes[i] || 0;
+            // FUND CAPPING FOR COMMITTED (ON-CHAIN) ORDERS:
+            // Only ACTIVE/PARTIAL orders are constrained by available funds.
+            // Virtual orders (not yet placed) will be constrained when they are actually placed.
+            //
+            // NOTE: BTS update fees are paid from BTS balance (separate from asset balance),
+            // so they don't affect this asset-side size cap. Fee budgets are tracked in
+            // funds.btsFeesOwed and reserved separately via btsFeesReservation.
+            const isCommitted = isOrderOnChain(slot);
+            if (isCommitted) {
+                const currentSize = Number(slot.size || 0);
+                const delta = newSize - currentSize;
+                if (delta > 0) {
+                    // GROWTH: Cap to available free balance
+                    // This prevents aggressive expansion after fills
+                    const affordableDelta = Math.min(delta, Math.max(0, sideFreeAvailable));
+                    if (affordableDelta < delta) {
+                        // Cannot afford full growth; cap to what's available
+                        newSize = currentSize + affordableDelta;
                     }
+                    sideFreeAvailable = Math.max(0, sideFreeAvailable - affordableDelta);
                 }
-                // Use integer comparison to avoid redundant updates from float noise
-                const currentSizeInt = floatToBlockchainInt(slot.size || 0, ctx.precision);
-                const newSizeInt = floatToBlockchainInt(newSize, ctx.precision);
-                if (slot.size === undefined || currentSizeInt !== newSizeInt) {
-                    changed = true;
-                    if (collectActions) {
-                        workingGrid.set(slot.id, {
-                            ...slot,
-                            size: newSize
-                        });
-                        if (isCommitted && hasOnChainId(slot)) {
-                            actions.push({
-                                type: COW_ACTIONS.UPDATE,
+                else if (delta < 0) {
+                    // SHRINKAGE: Release freed capital back for other slots
+                    sideFreeAvailable += Math.abs(delta);
+                }
+            }
+            // Use integer comparison to avoid redundant updates from float noise
+            const currentSizeInt = floatToBlockchainInt(slot.size || 0, ctx.precision);
+            const newSizeInt = floatToBlockchainInt(newSize, ctx.precision);
+            if (slot.size === undefined || currentSizeInt !== newSizeInt) {
+                changed = true;
+                if (collectActions) {
+                    workingGrid.set(slot.id, {
+                        ...slot,
+                        size: newSize
+                    });
+                    if (isCommitted && hasOnChainId(slot)) {
+                        actions.push({
+                            type: COW_ACTIONS.UPDATE,
+                            id: slot.id,
+                            orderId: slot.orderId,
+                            newGridId: slot.id,
+                            newSize,
+                            newPrice: slot.price,
+                            order: {
                                 id: slot.id,
-                                orderId: slot.orderId,
-                                newGridId: slot.id,
-                                newSize,
-                                newPrice: slot.price,
-                                order: {
-                                    id: slot.id,
-                                    type: slot.type,
-                                    price: slot.price,
-                                    size: newSize
-                                }
-                            });
-                        }
+                                type: slot.type,
+                                price: slot.price,
+                                size: newSize
+                            }
+                        });
                     }
-                    else {
-                        // CRITICAL: Set skipAccounting=false to ensure delta is consumed/released from ChainFree
-                        const resizeOk = await manager._updateOrder({ ...slot, size: newSize }, 'grid-resize', { skipAccounting: false, fee: 0 });
-                        if (resizeOk === false) {
-                            manager.logger?.log?.(`Failed to resize order ${slot.id}`, 'warn');
-                        }
+                }
+                else {
+                    // CRITICAL: Set skipAccounting=false to ensure delta is consumed/released from ChainFree
+                    const resizeOk = await manager._updateOrder({ ...slot, size: newSize }, 'grid-resize', { skipAccounting: false, fee: 0 });
+                    if (resizeOk === false) {
+                        manager.logger?.log?.(`Failed to resize order ${slot.id}`, 'warn');
                     }
                 }
             }
-            if (!collectActions) {
-                await manager.recalculateFunds();
-            }
-        }
-        finally {
-            if (!collectActions)
-                manager.resumeRecalcLogging();
-        }
-        if (collectActions) {
-            return { actions, changed };
-        }
-        return undefined;
-    }
-    /**
-     * High-level entry for resizing grid from snapshot using COW pattern.
-     * Creates working grid, calculates new sizes, generates UPDATE actions.
-     * Master grid is only updated after successful blockchain confirmation.
-     *
-     * @param {import('./types').OrderManager} manager - Manager instance
-     * @param {string} orderType - 'buy', 'sell', or 'both' - which sides to update
-     * @param {boolean} [fromBlockchainTimer=false] - If true, skip refetch of account totals (already current)
-     * @param {number|null} [overrideBoundaryIdx=null] - Optional override for boundary index
-     * @returns {Promise<{actions: Array, workingGrid: import('./working_grid'), workingIndexes: Object, workingBoundary: number, hasWorkingChanges: boolean, aborted: boolean}|null>}
-     */
-    static async updateGridFromBlockchainSnapshot(manager, orderType = 'both', fromBlockchainTimer = false, overrideBoundaryIdx = null) {
-        if (!fromBlockchainTimer && manager.config?.accountId) {
-            await manager.fetchAccountTotals(manager.config.accountId);
-        }
-        const { WorkingGrid } = require('./working_grid');
-        const workingGrid = new WorkingGrid(manager.orders, { baseVersion: manager._gridVersion });
-        const allActions = [];
-        let hasWorkingChanges = false;
-        // Calculate size updates for each side (via existing sizing function in COW mode)
-        if (orderType === ORDER_TYPES.BUY || orderType === 'both') {
-            const buyResult = await Grid._recalculateGridOrderSizesFromBlockchain(manager, ORDER_TYPES.BUY, { workingGrid });
-            allActions.push(...buyResult.actions);
-            hasWorkingChanges = hasWorkingChanges || buyResult.changed;
-        }
-        if (orderType === ORDER_TYPES.SELL || orderType === 'both') {
-            const sellResult = await Grid._recalculateGridOrderSizesFromBlockchain(manager, ORDER_TYPES.SELL, { workingGrid });
-            allActions.push(...sellResult.actions);
-            hasWorkingChanges = hasWorkingChanges || sellResult.changed;
-        }
-        // If the boundary is shifting, reassign slot types in the WorkingGrid now.
-        // This ensures the COW commit delivers consistent types + boundaryIdx in one
-        // atomic operation — manager.boundaryIdx must not be touched before the commit.
-        const newBoundary = (overrideBoundaryIdx !== null) ? overrideBoundaryIdx : manager.boundaryIdx;
-        if (overrideBoundaryIdx !== null && overrideBoundaryIdx !== manager.boundaryIdx) {
-            const gapSlots = Grid.calculateGapSlots(manager.config.incrementPercent, manager.config.targetSpreadPercent, manager.config.gridLimits);
-            const allSlots = Array.from(workingGrid.values())
-                .filter(s => s.price != null)
-                .sort((a, b) => a.price - b.price);
-            const updatedSlots = assignGridRoles(allSlots, newBoundary, gapSlots, ORDER_TYPES, ORDER_STATES);
-            for (const slot of updatedSlots) {
-                workingGrid.set(slot.id, slot);
-            }
-            hasWorkingChanges = true;
-        }
-        // Return COW result only if there are changes
-        if (allActions.length === 0 && !hasWorkingChanges) {
-            return null;
         }
-        return {
-            actions: allActions,
-            workingGrid,
-            workingIndexes: workingGrid.getIndexes(),
-            workingBoundary: newBoundary,
-            hasWorkingChanges,
-            aborted: false
-        };
-    }
-    /**
-     * Compare ideal grid vs persisted grid to detect divergence.
-     * INDEPENDENT SIDE CHECKING: Buy and sell sides are evaluated independently.
-     * Each side's RMS divergence is compared against its own threshold.
-     * Only sides exceeding the threshold are marked for update.
-     *
-     * PURPOSE: Detect if the calculated in-memory grid has diverged significantly from the
-     * persisted grid state. High divergence indicates that order fills/rotations have caused
-     * size distributions to deviate, potentially requiring grid size recalculation.
-     *
-     * METRIC: RMS (Root Mean Square) percentage of relative size differences
-     * Formula: RMS% = sqrt(mean((calculated - persisted) / persisted)²) × 100
-     * This measures the typical relative error across all orders on each side.
-     *
-     * SIDE INDEPENDENCE:
-     * - Buy side RMS is checked against GRID_COMPARISON.RMS_PERCENTAGE independently
-     * - Sell side RMS is checked against GRID_COMPARISON.RMS_PERCENTAGE independently
-     * - One side can diverge while the other remains stable (no update for stable side)
-     *
-     * RC-4: Atomic snapshot taking prevents stale data from concurrent fill operations
-     *   - Grids are snapshotted atomically before comparison
-     *   - Prevents mixing old and new grid state
-     *   - Ensures consistent RMS metrics across both sides
-     *
-     * @param {Array<import('./types').GridOrderSlot>} calculatedGrid - Ideal calculated grid
-     * @param {Array<import('./types').GridOrderSlot>} persistedGrid - Persisted grid state
-     * @param {import('./types').OrderManager|null} [manager=null] - Manager instance (for grid lock access)
-     * @returns {Promise<import('./types').GridComparisonResult>}
-     */
-    static async compareGrids(calculatedGrid, persistedGrid, manager = null) {
-        if (!Array.isArray(calculatedGrid) || !Array.isArray(persistedGrid)) {
-            return { buy: { metric: 0, updated: false }, sell: { metric: 0, updated: false } };
-        }
-        // RC-4: Take snapshots atomically to prevent concurrent modification races
-        // If manager has grid lock, use it to get consistent snapshots
-        let calculatedSnap = calculatedGrid;
-        let persistedSnap = persistedGrid;
-        if (manager?._gridLock?.acquire) {
-            const snapshotResult = await manager._gridLock.acquire(() => {
-                return {
-                    calculated: Array.from(calculatedGrid),
-                    persisted: Array.from(persistedGrid)
-                };
-            });
-            calculatedSnap = snapshotResult.calculated;
-            persistedSnap = snapshotResult.persisted;
-        }
-        // Filter to ACTIVE orders only (excludes PARTIAL/VIRTUAL/SPREAD)
-        // Partial orders are excluded from divergence calculation as they are expected to deviate;
-        // they are instead handled by the available-funds ratio check or follow-up correction.
-        // Must be sorted ASC for calculateRotationOrderSizes to match geometric weight distribution
-        const filterForRms = (orders, type) => {
-            const result = Array.isArray(orders) ? orders.filter(o => o && o.type === type && o.state === ORDER_STATES.ACTIVE) : [];
-            return result
-                .sort((a, b) => (a.price ?? 0) - (b.price ?? 0));
-        };
-        const calculatedBuys = filterForRms(calculatedSnap, ORDER_TYPES.BUY);
-        const calculatedSells = filterForRms(calculatedSnap, ORDER_TYPES.SELL);
-        const persistedBuys = filterForRms(persistedSnap, ORDER_TYPES.BUY);
-        const persistedSells = filterForRms(persistedSnap, ORDER_TYPES.SELL);
-        // Calculate ideal sizes for each order based on current available budget.
-        // The sizing context (which includes recalculateFunds) is resolved once per side up front
-        // so both buy and sell metrics share a single fund snapshot. This avoids the previous
-        // double-recalculateFunds between the two sides and keeps the metric consistent even if
-        // a fill event arrives between per-side calculations.
-        const computeSideIdeals = (activeOrders, type, ctx) => {
-            if (!manager || !ctx || ctx.budget <= 0 || activeOrders.length === 0)
-                return activeOrders;
-            // Identify ALL slots currently assigned to this side.
-            // Ideal sizing must use the full slot count to determine geometric share per slot.
-            const sideSlots = Array.from(manager.orders.values())
-                .filter(o => o.type === type)
-                .sort((a, b) => (a.price ?? 0) - (b.price ?? 0));
-            if (sideSlots.length === 0)
-                return activeOrders;
-            // Calculate geometric ideals for the ENTIRE side (all slots)
-            try {
-                const allIdealSizes = calculateRotationOrderSizes(ctx.budget, 0, sideSlots.length, type, manager.config, 0, ctx.precision);
-                // Map Ideal sizes to IDs for quick lookup
-                const idealMap = new Map();
-                sideSlots.forEach((slot, i) => idealMap.set(slot.id, allIdealSizes[i]));
-                // Return the activeOrders subset with their true geometric ideal sizes
-                return activeOrders.map(o => ({ ...o, size: idealMap.get(o.id) ?? 0 }));
-            }
-            catch (e) {
-                return activeOrders;
-            }
-        };
-        const needsBuy = calculatedBuys.length > 0 && manager?.assets;
-        const needsSell = calculatedSells.length > 0 && manager?.assets;
-        if (needsBuy || needsSell) {
+        if (!collectActions) {
             await manager.recalculateFunds();
         }
-        const buyCtx = needsBuy
-            ? await Grid._getSizingContext(manager, 'buy', { skipRecalc: true })
-            : null;
-        const sellCtx = needsSell
-            ? await Grid._getSizingContext(manager, 'sell', { skipRecalc: true })
-            : null;
-        const buyIdeals = computeSideIdeals(calculatedBuys, ORDER_TYPES.BUY, buyCtx);
-        const sellIdeals = computeSideIdeals(calculatedSells, ORDER_TYPES.SELL, sellCtx);
-        // Calculate RMS divergence metric for each side
-        const buyMetric = calculateGridSideDivergenceMetric(buyIdeals, persistedBuys, 'buy');
-        const sellMetric = calculateGridSideDivergenceMetric(sellIdeals, persistedSells, 'sell');
-        // Check if metrics exceed threshold and flag sides for regeneration
-        // Set RMS_PERCENTAGE to 0 to disable RMS divergence checks
-        let buyUpdated = false, sellUpdated = false;
-        if (manager && (manager.config?.gridLimits?.GRID_COMPARISON?.RMS_PERCENTAGE ?? GRID_COMPARISON.RMS_PERCENTAGE) > 0) {
-            const limit = (manager.config?.gridLimits?.GRID_COMPARISON?.RMS_PERCENTAGE ?? GRID_COMPARISON.RMS_PERCENTAGE) / GRID_CONSTANTS.RMS_PERCENTAGE_SCALE;
-            if (buyMetric > limit) {
-                // RC-3: Use Set for automatic duplicate prevention
-                if (!(manager._gridSidesUpdated instanceof Set))
-                    manager._gridSidesUpdated = new Set();
-                manager._gridSidesUpdated.add(ORDER_TYPES.BUY);
-                buyUpdated = true;
-            }
-            if (sellMetric > limit) {
-                // RC-3: Use Set for automatic duplicate prevention
-                if (!(manager._gridSidesUpdated instanceof Set))
-                    manager._gridSidesUpdated = new Set();
-                manager._gridSidesUpdated.add(ORDER_TYPES.SELL);
-                sellUpdated = true;
-            }
+    }
+    finally {
+        if (!collectActions)
+            manager.resumeRecalcLogging();
+    }
+    if (collectActions) {
+        return { actions, changed };
+    }
+    return undefined;
+}
+/**
+ * High-level entry for resizing grid from snapshot using COW pattern.
+ * Creates working grid, calculates new sizes, generates UPDATE actions.
+ * Master grid is only updated after successful blockchain confirmation.
+ *
+ * @param {import('./types').OrderManager} manager - Manager instance
+ * @param {string} orderType - 'buy', 'sell', or 'both' - which sides to update
+ * @param {boolean} [fromBlockchainTimer=false] - If true, skip refetch of account totals (already current)
+ * @param {number|null} [overrideBoundaryIdx=null] - Optional override for boundary index
+ * @returns {Promise<{actions: Array, workingGrid: import('./working_grid'), workingIndexes: Object, workingBoundary: number, hasWorkingChanges: boolean, aborted: boolean}|null>}
+ */
+async function updateGridFromBlockchainSnapshot(manager, orderType = 'both', fromBlockchainTimer = false, overrideBoundaryIdx = null) {
+    if (!fromBlockchainTimer && manager.config?.accountId) {
+        await manager.fetchAccountTotals(manager.config.accountId);
+    }
+    const { WorkingGrid } = require('./working_grid');
+    const workingGrid = new WorkingGrid(manager.orders, { baseVersion: manager._gridVersion });
+    const allActions = [];
+    let hasWorkingChanges = false;
+    // Calculate size updates for each side (via existing sizing function in COW mode)
+    if (orderType === ORDER_TYPES.BUY || orderType === 'both') {
+        const buyResult = await _recalculateGridOrderSizesFromBlockchain(manager, ORDER_TYPES.BUY, { workingGrid });
+        allActions.push(...buyResult.actions);
+        hasWorkingChanges = hasWorkingChanges || buyResult.changed;
+    }
+    if (orderType === ORDER_TYPES.SELL || orderType === 'both') {
+        const sellResult = await _recalculateGridOrderSizesFromBlockchain(manager, ORDER_TYPES.SELL, { workingGrid });
+        allActions.push(...sellResult.actions);
+        hasWorkingChanges = hasWorkingChanges || sellResult.changed;
+    }
+    // If the boundary is shifting, reassign slot types in the WorkingGrid now.
+    // This ensures the COW commit delivers consistent types + boundaryIdx in one
+    // atomic operation — manager.boundaryIdx must not be touched before the commit.
+    const newBoundary = (overrideBoundaryIdx !== null) ? overrideBoundaryIdx : manager.boundaryIdx;
+    if (overrideBoundaryIdx !== null && overrideBoundaryIdx !== manager.boundaryIdx) {
+        const gapSlots = calculateGapSlots(manager.config.incrementPercent, manager.config.targetSpreadPercent, manager.config.gridLimits);
+        const allSlots = Array.from(workingGrid.values())
+            .filter(s => s.price != null)
+            .sort((a, b) => a.price - b.price);
+        const updatedSlots = assignGridRoles(allSlots, newBoundary, gapSlots, ORDER_TYPES, ORDER_STATES);
+        for (const slot of updatedSlots) {
+            workingGrid.set(slot.id, slot);
         }
-        return {
-            buy: { metric: buyMetric, updated: buyUpdated },
-            sell: { metric: sellMetric, updated: sellUpdated },
-            totalMetric: (buyMetric + sellMetric) / 2
-        };
+        hasWorkingChanges = true;
     }
-    /**
-     * Unified divergence monitoring.
-     * Performs both Ratio-based and RMS-based divergence checks.
-     *
-     * @param {import('./types').OrderManager} manager - Manager instance
-     * @param {Array<import('./types').GridOrderSlot>} calculatedGrid - Ideal/calculated grid
-     * @param {Array<import('./types').GridOrderSlot>} persistedGrid - Current/persisted grid
-     * @returns {Promise<import('./types').DivergenceResult>}
-     */
-    static async monitorDivergence(manager, calculatedGrid, persistedGrid) {
-        // 1. Check ratio-based divergence (available funds vs allocated)
-        const ratioResult = Grid.checkAndUpdateGridIfNeeded(manager);
-        if (ratioResult.buyUpdated || ratioResult.sellUpdated) {
-            const { getOrderTypeFromUpdatedFlags } = require('./utils/order');
+    // Return COW result only if there are changes
+    if (allActions.length === 0 && !hasWorkingChanges) {
+        return null;
+    }
+    return {
+        actions: allActions,
+        workingGrid,
+        workingIndexes: workingGrid.getIndexes(),
+        workingBoundary: newBoundary,
+        hasWorkingChanges,
+        aborted: false
+    };
+}
+/**
+ * Compare ideal grid vs persisted grid to detect divergence.
+ * INDEPENDENT SIDE CHECKING: Buy and sell sides are evaluated independently.
+ * Each side's RMS divergence is compared against its own threshold.
+ * Only sides exceeding the threshold are marked for update.
+ *
+ * PURPOSE: Detect if the calculated in-memory grid has diverged significantly from the
+ * persisted grid state. High divergence indicates that order fills/rotations have caused
+ * size distributions to deviate, potentially requiring grid size recalculation.
+ *
+ * METRIC: RMS (Root Mean Square) percentage of relative size differences
+ * Formula: RMS% = sqrt(mean((calculated - persisted) / persisted)²) × 100
+ * This measures the typical relative error across all orders on each side.
+ *
+ * SIDE INDEPENDENCE:
+ * - Buy side RMS is checked against GRID_COMPARISON.RMS_PERCENTAGE independently
+ * - Sell side RMS is checked against GRID_COMPARISON.RMS_PERCENTAGE independently
+ * - One side can diverge while the other remains stable (no update for stable side)
+ *
+ * RC-4: Atomic snapshot taking prevents stale data from concurrent fill operations
+ *   - Grids are snapshotted atomically before comparison
+ *   - Prevents mixing old and new grid state
+ *   - Ensures consistent RMS metrics across both sides
+ *
+ * @param {Array<import('./types').GridOrderSlot>} calculatedGrid - Ideal calculated grid
+ * @param {Array<import('./types').GridOrderSlot>} persistedGrid - Persisted grid state
+ * @param {import('./types').OrderManager|null} [manager=null] - Manager instance (for grid lock access)
+ * @returns {Promise<import('./types').GridComparisonResult>}
+ */
+async function compareGrids(calculatedGrid, persistedGrid, manager = null) {
+    if (!Array.isArray(calculatedGrid) || !Array.isArray(persistedGrid)) {
+        return { buy: { metric: 0, updated: false }, sell: { metric: 0, updated: false } };
+    }
+    // RC-4: Take snapshots atomically to prevent concurrent modification races
+    // If manager has grid lock, use it to get consistent snapshots
+    let calculatedSnap = calculatedGrid;
+    let persistedSnap = persistedGrid;
+    if (manager?._gridLock?.acquire) {
+        const snapshotResult = await manager._gridLock.acquire(() => {
             return {
-                needsUpdate: true,
-                buy: { updated: ratioResult.buyUpdated, ratio: ratioResult.buyUpdated, rms: false, metric: 0 },
-                sell: { updated: ratioResult.sellUpdated, ratio: ratioResult.sellUpdated, rms: false, metric: 0 },
-                orderType: getOrderTypeFromUpdatedFlags(ratioResult.buyUpdated, ratioResult.sellUpdated)
+                calculated: Array.from(calculatedGrid),
+                persisted: Array.from(persistedGrid)
             };
-        }
-        // 2. Check RMS-based divergence (structural deviation)
-        const rmsResult = await Grid.compareGrids(calculatedGrid, persistedGrid, manager);
-        const buyUpdated = ratioResult.buyUpdated || rmsResult.buy.updated;
-        const sellUpdated = ratioResult.sellUpdated || rmsResult.sell.updated;
-        const { getOrderTypeFromUpdatedFlags } = require('./utils/order');
-        return {
-            needsUpdate: buyUpdated || sellUpdated,
-            buy: { updated: buyUpdated, ratio: ratioResult.buyUpdated, rms: rmsResult.buy.updated, metric: rmsResult.buy.metric },
-            sell: { updated: sellUpdated, ratio: ratioResult.sellUpdated, rms: rmsResult.sell.updated, metric: rmsResult.sell.metric },
-            orderType: getOrderTypeFromUpdatedFlags(buyUpdated, sellUpdated)
-        };
+        });
+        calculatedSnap = snapshotResult.calculated;
+        persistedSnap = snapshotResult.persisted;
     }
-    /**
-     * Collect on-chain buy and sell orders from the manager.
-     * Filters to orders with valid orderId and positive size.
-     * @param {import('./types').OrderManager} manager - The manager instance.
-     * @returns {{onChainBuys: Array<import('./types').Order>, onChainSells: Array<import('./types').Order>}}
-     */
-    static _getOnChainOrders(manager) {
-        const onChainBuys = [
-            ...manager.getOrdersByTypeAndState(ORDER_TYPES.BUY, ORDER_STATES.ACTIVE),
-            ...manager.getOrdersByTypeAndState(ORDER_TYPES.BUY, ORDER_STATES.PARTIAL)
-        ].filter(o => o?.orderId && Number(o?.size || 0) > 0);
-        const onChainSells = [
-            ...manager.getOrdersByTypeAndState(ORDER_TYPES.SELL, ORDER_STATES.ACTIVE),
-            ...manager.getOrdersByTypeAndState(ORDER_TYPES.SELL, ORDER_STATES.PARTIAL)
-        ].filter(o => o?.orderId && Number(o?.size || 0) > 0);
-        return { onChainBuys, onChainSells };
-    }
-    /**
-     * Calculate current market spread using on-chain orders.
-     * @param {import('./types').OrderManager} manager - The manager instance.
-     * @returns {number} The calculated spread percentage.
-     */
-    static calculateCurrentSpread(manager) {
-        const { onChainBuys, onChainSells } = Grid._getOnChainOrders(manager);
-        return calculateSpreadFromOrders(onChainBuys, onChainSells);
-    }
-    /**
-     * Proactive spread correction check.
-     *
-     * CRITICAL: Uses AsyncLock to prevent race conditions with fill processing.
-     * Without the lock, a TOCTOU (Time-Of-Check-To-Use) vulnerability exists where:
-     * - Fund snapshot is taken (check phase)
-     * - Fill processor modifies funds in another thread
-     * - Order is placed based on stale funds (use phase)
-     * Result: Orders placed beyond available liquidity, fund accounting errors
-     *
-     * DESIGN DECISION: Lock is released before blockchain operations for performance
-     * - Lock held: Fund verification and correction decision (synchronized)
-     * - Lock released: Blockchain submission (async, potentially slow)
-     * - RACE CONDITION WINDOW: Between lock release and blockchain submission
-     * - MITIGATION: Pre-flight fund verification before submission; comprehensive error handling
-     *
-     * See RACE_CONDITION_ANALYSIS.md for detailed vulnerability documentation.
-     *
-     * @param {import('./types').OrderManager} manager - Manager instance
-     * @param {Object} BitShares - BitShares API client
-     * @param {Function|null} [updateOrdersOnChainBatch=null] - Optional batch update function
-     * @returns {Promise<import('./types').SpreadCheckResult>}
-     */
-    static async checkSpreadCondition(manager, BitShares, updateOrdersOnChainBatch = null) {
-        // CRITICAL: Acquire corrections lock to serialize spread correction operations
-        // This prevents concurrent fill processing from modifying funds while we're making decisions
-        let correction = null;
-        let shouldApplyCorrection = false;
-        // Derive current market price from the bot's own grid (no blockchain call needed).
-        // Grid prices are in B/A format (e.g. BTS/XRP) so no inversion is required.
-        // Mid between best bid and best ask is the most current price the bot has.
-        // Falls back to config.startPrice when either side is empty (e.g. at startup).
-        const { onChainBuys, onChainSells } = Grid._getOnChainOrders(manager);
-        const { bestBuy, bestSell } = getGridBestPrices(onChainBuys, onChainSells);
-        const lastPrice = (bestBuy !== null && bestSell !== null)
-            ? (bestBuy + bestSell) / 2
-            : Number(manager.config.startPrice) || 0;
-        // FIX: Use optional chaining for lock - if no lock exists, execute synchronously
-        let fundSnapshot = null;
-        const executeSpreadCheck = async () => {
-            const currentSpread = Grid.calculateCurrentSpread(manager);
-            // Nominal spread is the configured target spread percentage.
-            // Keep this fixed: doubled-side flags are fill/replacement mechanics only.
-            const nominalSpread = manager.config.targetSpreadPercent ?? DEFAULT_CONFIG.targetSpreadPercent;
-            // Fixed tolerance: 0.5 steps = half increment (tighter spread check).
-            const toleranceSteps = 0.5;
-            const buyCount = manager.getOrdersByTypeAndState(ORDER_TYPES.BUY, ORDER_STATES.ACTIVE)
-                .concat(manager.getOrdersByTypeAndState(ORDER_TYPES.BUY, ORDER_STATES.PARTIAL))
-                .filter(o => o?.orderId && Number(o?.size || 0) > 0)
-                .length;
-            const sellCount = manager.getOrdersByTypeAndState(ORDER_TYPES.SELL, ORDER_STATES.ACTIVE)
-                .concat(manager.getOrdersByTypeAndState(ORDER_TYPES.SELL, ORDER_STATES.PARTIAL))
-                .filter(o => o?.orderId && Number(o?.size || 0) > 0)
-                .length;
-            manager.outOfSpread = shouldFlagOutOfSpread(currentSpread, nominalSpread, toleranceSteps, buyCount, sellCount, manager.config.incrementPercent);
-            if (manager.outOfSpread === 0)
-                return false;
-            // Limit spread = nominal + half increment tolerance (0.5 steps).
-            const limitSpread = nominalSpread + (manager.config.incrementPercent * toleranceSteps);
-            manager.logger?.log?.(`Spread too wide (${Format.formatPercent(currentSpread)} > ${Format.formatPercent(limitSpread)}), correcting with ${manager.outOfSpread} extra slot(s)...`, 'warn');
-            const decision = Grid.determineOrderSideByFunds(manager, lastPrice);
-            if (!decision.side)
-                return false;
-            // Perform spread correction by placing orders on the chosen side.
-            correction = await Grid.prepareSpreadCorrectionOrders(manager, decision.side);
-            if (!correction)
-                return false;
-            const placeCount = correction.ordersToPlace?.length || 0;
-            const updateCount = correction.ordersToUpdate?.length || 0;
-            // Capture fund snapshot under lock for pre-flight verification before broadcast
-            fundSnapshot = _snapshotFundState(manager);
-            return (placeCount + updateCount) > 0;
-        };
+    // Filter to ACTIVE orders only (excludes PARTIAL/VIRTUAL/SPREAD)
+    // Partial orders are excluded from divergence calculation as they are expected to deviate;
+    // they are instead handled by the available-funds ratio check or follow-up correction.
+    // Must be sorted ASC for calculateRotationOrderSizes to match geometric weight distribution
+    const filterForRms = (orders, type) => {
+        const result = Array.isArray(orders) ? orders.filter(o => o && o.type === type && o.state === ORDER_STATES.ACTIVE) : [];
+        return result
+            .sort((a, b) => (a.price ?? 0) - (b.price ?? 0));
+    };
+    const calculatedBuys = filterForRms(calculatedSnap, ORDER_TYPES.BUY);
+    const calculatedSells = filterForRms(calculatedSnap, ORDER_TYPES.SELL);
+    const persistedBuys = filterForRms(persistedSnap, ORDER_TYPES.BUY);
+    const persistedSells = filterForRms(persistedSnap, ORDER_TYPES.SELL);
+    // Calculate ideal sizes for each order based on current available budget.
+    // The sizing context (which includes recalculateFunds) is resolved once per side up front
+    // so both buy and sell metrics share a single fund snapshot. This avoids the previous
+    // double-recalculateFunds between the two sides and keeps the metric consistent even if
+    // a fill event arrives between per-side calculations.
+    const computeSideIdeals = (activeOrders, type, ctx) => {
+        if (!manager || !ctx || ctx.budget <= 0 || activeOrders.length === 0)
+            return activeOrders;
+        // Identify ALL slots currently assigned to this side.
+        // Ideal sizing must use the full slot count to determine geometric share per slot.
+        const sideSlots = Array.from(manager.orders.values())
+            .filter(o => o.type === type)
+            .sort((a, b) => (a.price ?? 0) - (b.price ?? 0));
+        if (sideSlots.length === 0)
+            return activeOrders;
+        // Calculate geometric ideals for the ENTIRE side (all slots)
         try {
-            shouldApplyCorrection = await manager._gridLock.acquire(executeSpreadCheck);
+            const allIdealSizes = calculateRotationOrderSizes(ctx.budget, 0, sideSlots.length, type, manager.config, 0, ctx.precision);
+            // Map Ideal sizes to IDs for quick lookup
+            const idealMap = new Map();
+            sideSlots.forEach((slot, i) => idealMap.set(slot.id, allIdealSizes[i]));
+            // Return the activeOrders subset with their true geometric ideal sizes
+            return activeOrders.map(o => ({ ...o, size: idealMap.get(o.id) ?? 0 }));
         }
-        catch (err) {
-            manager.logger?.log?.(`Error checking spread condition: ${err.message}`, 'warn');
-            return { ordersPlaced: 0, partialsMoved: 0 };
+        catch (e) {
+            return activeOrders;
         }
-        // FIX: Apply blockchain operations OUTSIDE the lock to reduce lock contention
-        // The lock is only needed for fund verification; order placement doesn't need it
-        // Pre-flight fund verification to mitigate TOCTOU between lock release and broadcast
-        if (shouldApplyCorrection && updateOrdersOnChainBatch && correction && fundSnapshot) {
-            const currentFunds = _snapshotFundState(manager);
-            const fundChanged = fundSnapshot.buyFree !== currentFunds.buyFree
-                || fundSnapshot.sellFree !== currentFunds.sellFree
-                || fundSnapshot.buyLocked !== currentFunds.buyLocked
-                || fundSnapshot.sellLocked !== currentFunds.sellLocked;
-            if (fundChanged) {
-                manager.logger?.log?.(`Spread correction aborted: fund state changed between lock release and broadcast (pre-flight check)`, 'warn');
-                return { ordersPlaced: 0, partialsMoved: 0 };
-            }
-            try {
-                const batchResult = await updateOrdersOnChainBatch(correction);
-                if (!batchResult || batchResult.executed !== true) {
-                    manager.logger?.log?.(`Spread correction batch was prepared but not executed. Keeping local state unchanged.`, 'warn');
-                    return { ordersPlaced: 0, partialsMoved: 0 };
-                }
-                await manager.recalculateFunds();
-                const placed = correction.ordersToPlace?.length || 0;
-                const updated = correction.ordersToUpdate?.length || 0;
-                return { ordersPlaced: placed + updated, partialsMoved: updated };
-            }
-            catch (err) {
-                manager.logger?.log?.(`Error applying spread correction on-chain: ${err.message}`, 'warn');
-                return { ordersPlaced: 0, partialsMoved: 0 };
-            }
+    };
+    const needsBuy = calculatedBuys.length > 0 && manager?.assets;
+    const needsSell = calculatedSells.length > 0 && manager?.assets;
+    if (needsBuy || needsSell) {
+        await manager.recalculateFunds();
+    }
+    const buyCtx = needsBuy
+        ? await _getSizingContext(manager, 'buy', { skipRecalc: true })
+        : null;
+    const sellCtx = needsSell
+        ? await _getSizingContext(manager, 'sell', { skipRecalc: true })
+        : null;
+    const buyIdeals = computeSideIdeals(calculatedBuys, ORDER_TYPES.BUY, buyCtx);
+    const sellIdeals = computeSideIdeals(calculatedSells, ORDER_TYPES.SELL, sellCtx);
+    // Calculate RMS divergence metric for each side
+    const buyMetric = calculateGridSideDivergenceMetric(buyIdeals, persistedBuys, 'buy');
+    const sellMetric = calculateGridSideDivergenceMetric(sellIdeals, persistedSells, 'sell');
+    // Check if metrics exceed threshold and flag sides for regeneration
+    // Set RMS_PERCENTAGE to 0 to disable RMS divergence checks
+    let buyUpdated = false, sellUpdated = false;
+    if (manager && (manager.config?.gridLimits?.GRID_COMPARISON?.RMS_PERCENTAGE ?? GRID_COMPARISON.RMS_PERCENTAGE) > 0) {
+        const limit = (manager.config?.gridLimits?.GRID_COMPARISON?.RMS_PERCENTAGE ?? GRID_COMPARISON.RMS_PERCENTAGE) / GRID_CONSTANTS.RMS_PERCENTAGE_SCALE;
+        if (buyMetric > limit) {
+            // RC-3: Use Set for automatic duplicate prevention
+            if (!(manager._gridSidesUpdated instanceof Set))
+                manager._gridSidesUpdated = new Set();
+            manager._gridSidesUpdated.add(ORDER_TYPES.BUY);
+            buyUpdated = true;
+        }
+        if (sellMetric > limit) {
+            // RC-3: Use Set for automatic duplicate prevention
+            if (!(manager._gridSidesUpdated instanceof Set))
+                manager._gridSidesUpdated = new Set();
+            manager._gridSidesUpdated.add(ORDER_TYPES.SELL);
+            sellUpdated = true;
         }
-        return { ordersPlaced: 0, partialsMoved: 0 };
     }
-    /**
-     * Grid health check for structural violations.
-     * Monitors for "Dust Partials" that are too small to be traded on-chain,
-     * scoped to the active buy/sell window.
-     *
-     * NOTE: Internal gaps (virtual slots between active ones) are no longer
-     * flagged as violations. The "Edge-First" placement strategy intentionally
-     * creates these gaps to maximize grid coverage during fund expansion.
-     *
-     * @param {import('./types').OrderManager} manager - The manager instance.
-     * @param {Function|null} [updateOrdersOnChainBatch=null] - Optional batch update function.
-     * @returns {Promise<import('./types').DustCheckResult>}
-     */
-    static async checkGridHealth(manager, updateOrdersOnChainBatch = null) {
-        if (!manager)
-            return { buyDust: false, sellDust: false, buyDustOrders: [], sellDustOrders: [] };
-        // Skip health checks during bootstrap to prevent spamming warnings
-        if (manager._state.isBootstrapping())
-            return { buyDust: false, sellDust: false, buyDustOrders: [], sellDustOrders: [] };
-        // Health checks are scoped to the active on-chain window only.
-        // This keeps detection aligned with maintenance actions that operate on
-        // active window partials.
-        const { buyDust, sellDust, buyDustOrders, sellDustOrders } = await Grid.checkWindowDust(manager);
-        // Partial split/merge maintenance is intentionally disabled.
-        // Health checks remain detection-only.
-        return { buyDust, sellDust, buyDustOrders, sellDustOrders };
-    }
-    /**
-     * Dust check covering all partial orders, with interior-only guard.
-     *
-     * The top-of-window partial (closest to market) is always eligible for dust
-     * detection since cancelling it is just the grid edge moving inward.
-     *
-     * Interior partials (further from market) are only eligible if they have a
-     * duplicate price level — another active order at essentially the same price.
-     * Cancelling such an interior partial won't leave a gap in the grid because
-     * the sibling active order already covers that price level.
-     *
-     * Returns boolean flags plus the actual dust order objects so callers can act
-     * on individual orders (e.g. DUST_CANCEL_DELAY_SEC auto-cancel).
-     *
-     * @param {import('./types').OrderManager} manager
-     * @returns {Promise<import('./types').DustCheckResult>}
-     */
-    static async checkWindowDust(manager) {
-        if (!manager)
-            return { buyDust: false, sellDust: false, buyDustOrders: [], sellDustOrders: [] };
-        const allOrders = Array.from(manager.orders.values());
-        const isLiveOrder = order => order &&
-            order.orderId &&
-            order.price != null &&
-            (order.state === ORDER_STATES.ACTIVE || order.state === ORDER_STATES.PARTIAL);
-        // Identify top-of-window orders (closest to market per side).
-        const topBuyOrder = allOrders
-            .filter(o => o.type === ORDER_TYPES.BUY && isLiveOrder(o))
-            .sort((a, b) => b.price - a.price)[0];
-        const topSellOrder = allOrders
-            .filter(o => o.type === ORDER_TYPES.SELL && isLiveOrder(o))
-            .sort((a, b) => a.price - b.price)[0];
-        // Check if an order has a duplicate price level — an active sibling at the
-        // same price within tolerance. If so, cancelling won't create a grid gap.
-        // Only checks ACTIVE siblings. If two PARTIALs share a price with no active
-        // sibling, neither qualifies and the gap is left to the rebalancer.
-        // Uses the LARGER size of the two orders for tolerance calculation to prevent
-        // a tiny dust order from inflating the tolerance window.
-        const hasDuplicatePriceLevel = (order, assets) => allOrders.some(o => {
-            if (o.id === order.id || o.type !== order.type)
-                return false;
-            if (o.state !== ORDER_STATES.ACTIVE || !o.orderId || o.price == null)
-                return false;
-            const toleranceSize = Math.max(order.size, o.size);
-            const tolerance = calculatePriceTolerance(Math.min(order.price, o.price), toleranceSize, order.type, assets);
-            return tolerance != null && Math.abs(o.price - order.price) <= tolerance;
-        });
-        const assets = manager.assets;
-        const allPartials = allOrders.filter((o) => isLiveOrder(o) && o.state === ORDER_STATES.PARTIAL);
-        const isTopBuy = (o) => topBuyOrder && o.id === topBuyOrder.id;
-        const isTopSell = (o) => topSellOrder && o.id === topSellOrder.id;
-        // Safety filter: top-of-window partials always qualify; interior partials
-        // only qualify if they have a duplicate price level (no gap risk).
-        const eligibleBuyPartials = allPartials.filter((o) => o.type === ORDER_TYPES.BUY && (isTopBuy(o) || hasDuplicatePriceLevel(o, assets)));
-        const eligibleSellPartials = allPartials.filter((o) => o.type === ORDER_TYPES.SELL && (isTopSell(o) || hasDuplicatePriceLevel(o, assets)));
-        const buyDustOrders = await Grid._getDustOrders(manager, eligibleBuyPartials, ORDER_TYPES.BUY);
-        const sellDustOrders = await Grid._getDustOrders(manager, eligibleSellPartials, ORDER_TYPES.SELL);
+    return {
+        buy: { metric: buyMetric, updated: buyUpdated },
+        sell: { metric: sellMetric, updated: sellUpdated },
+        totalMetric: (buyMetric + sellMetric) / 2
+    };
+}
+/**
+ * Unified divergence monitoring.
+ * Performs both Ratio-based and RMS-based divergence checks.
+ *
+ * @param {import('./types').OrderManager} manager - Manager instance
+ * @param {Array<import('./types').GridOrderSlot>} calculatedGrid - Ideal/calculated grid
+ * @param {Array<import('./types').GridOrderSlot>} persistedGrid - Current/persisted grid
+ * @returns {Promise<import('./types').DivergenceResult>}
+ */
+async function monitorDivergence(manager, calculatedGrid, persistedGrid) {
+    // 1. Check ratio-based divergence (available funds vs allocated)
+    const ratioResult = checkAndUpdateGridIfNeeded(manager);
+    if (ratioResult.buyUpdated || ratioResult.sellUpdated) {
+        const { getOrderTypeFromUpdatedFlags } = require('./utils/order');
         return {
-            buyDust: buyDustOrders.length > 0,
-            sellDust: sellDustOrders.length > 0,
-            buyDustOrders,
-            sellDustOrders,
+            needsUpdate: true,
+            buy: { updated: ratioResult.buyUpdated, ratio: ratioResult.buyUpdated, rms: false, metric: 0 },
+            sell: { updated: ratioResult.sellUpdated, ratio: ratioResult.sellUpdated, rms: false, metric: 0 },
+            orderType: getOrderTypeFromUpdatedFlags(ratioResult.buyUpdated, ratioResult.sellUpdated)
         };
     }
-    /**
-     * Return the subset of partial orders that qualify as dust on a given side.
-     * Shares the same sizing context as _hasAnyDust but returns the actual order
-     * objects so callers can act on them (e.g. auto-cancel).
-     * @private
-     * @param {import('./types').OrderManager} manager
-     * @param {Array<import('./types').GridOrderSlot>} partials - Candidate partial orders to test.
-     * @param {string} type - ORDER_TYPES.BUY or ORDER_TYPES.SELL
-     * @returns {Promise<Array<import('./types').GridOrderSlot>>} Orders whose size is below the dust threshold.
-     */
-    static async _getDustOrders(manager, partials, type) {
-        if (!partials || partials.length === 0)
-            return [];
-        const side = type === ORDER_TYPES.BUY ? 'buy' : 'sell';
-        const ctx = await Grid._getSizingContext(manager, side);
-        if (!ctx || ctx.budget <= 0)
-            return [];
-        const sideSlots = Array.from(manager.orders.values())
-            .filter(o => o.type === type)
-            .sort((a, b) => a.price - b.price);
-        if (sideSlots.length === 0)
-            return [];
-        const idealSizes = allocateFundsByWeights(ctx.budget, sideSlots.length, manager.config.weightDistribution[side], manager.config.incrementPercent / 100, type === ORDER_TYPES.BUY, 0, ctx.precision);
-        return partials.filter(p => {
-            const idx = sideSlots.findIndex(s => s.id === p.id);
-            if (idx === -1)
-                return false;
-            const threshold = getSingleDustThreshold(idealSizes[idx], manager.config?.gridLimits?.PARTIAL_DUST_THRESHOLD_PERCENTAGE);
-            return p.size < threshold;
-        });
-    }
-    /**
-     * Check if any partial orders on a side represent "dust" that should be cleaned.
-     * @param {import('./types').OrderManager} manager - Manager instance
-     * @param {Array<import('./types').GridOrderSlot>} partials - Partial orders to check
-     * @param {string} type - ORDER_TYPES.BUY or ORDER_TYPES.SELL
-     * @returns {Promise<boolean>} true if dust partials exist
-     * @private
-     */
-    static async _hasAnyDust(manager, partials, type) {
-        return (await Grid._getDustOrders(manager, partials, type)).length > 0;
-    }
-    /**
-     * Public dust helper shared by StrategyEngine and Grid health checks.
-     * @param {import('./types').OrderManager} manager
-     * @param {Array<import('./types').GridOrderSlot>} partials
-     * @param {'buy'|'sell'} side
-     * @returns {Promise<boolean>}
-     */
-    static async hasAnyDust(manager, partials, side) {
-        const type = side === 'buy' ? ORDER_TYPES.BUY : side === 'sell' ? ORDER_TYPES.SELL : null;
-        if (!type)
+    // 2. Check RMS-based divergence (structural deviation)
+    const rmsResult = await compareGrids(calculatedGrid, persistedGrid, manager);
+    const buyUpdated = ratioResult.buyUpdated || rmsResult.buy.updated;
+    const sellUpdated = ratioResult.sellUpdated || rmsResult.sell.updated;
+    const { getOrderTypeFromUpdatedFlags } = require('./utils/order');
+    return {
+        needsUpdate: buyUpdated || sellUpdated,
+        buy: { updated: buyUpdated, ratio: ratioResult.buyUpdated, rms: rmsResult.buy.updated, metric: rmsResult.buy.metric },
+        sell: { updated: sellUpdated, ratio: ratioResult.sellUpdated, rms: rmsResult.sell.updated, metric: rmsResult.sell.metric },
+        orderType: getOrderTypeFromUpdatedFlags(buyUpdated, sellUpdated)
+    };
+}
+/**
+ * Collect on-chain buy and sell orders from the manager.
+ * Filters to orders with valid orderId and positive size.
+ * @param {import('./types').OrderManager} manager - The manager instance.
+ * @returns {{onChainBuys: Array<import('./types').Order>, onChainSells: Array<import('./types').Order>}}
+ */
+function _getOnChainOrders(manager) {
+    const onChainBuys = [
+        ...manager.getOrdersByTypeAndState(ORDER_TYPES.BUY, ORDER_STATES.ACTIVE),
+        ...manager.getOrdersByTypeAndState(ORDER_TYPES.BUY, ORDER_STATES.PARTIAL)
+    ].filter(o => o?.orderId && Number(o?.size || 0) > 0);
+    const onChainSells = [
+        ...manager.getOrdersByTypeAndState(ORDER_TYPES.SELL, ORDER_STATES.ACTIVE),
+        ...manager.getOrdersByTypeAndState(ORDER_TYPES.SELL, ORDER_STATES.PARTIAL)
+    ].filter(o => o?.orderId && Number(o?.size || 0) > 0);
+    return { onChainBuys, onChainSells };
+}
+/**
+ * Calculate current market spread using on-chain orders.
+ * @param {import('./types').OrderManager} manager - The manager instance.
+ * @returns {number} The calculated spread percentage.
+ */
+function calculateCurrentSpread(manager) {
+    const { onChainBuys, onChainSells } = _getOnChainOrders(manager);
+    return calculateSpreadFromOrders(onChainBuys, onChainSells);
+}
+/**
+ * Proactive spread correction check.
+ *
+ * CRITICAL: Uses AsyncLock to prevent race conditions with fill processing.
+ * Without the lock, a TOCTOU (Time-Of-Check-To-Use) vulnerability exists where:
+ * - Fund snapshot is taken (check phase)
+ * - Fill processor modifies funds in another thread
+ * - Order is placed based on stale funds (use phase)
+ * Result: Orders placed beyond available liquidity, fund accounting errors
+ *
+ * DESIGN DECISION: Lock is released before blockchain operations for performance
+ * - Lock held: Fund verification and correction decision (synchronized)
+ * - Lock released: Blockchain submission (async, potentially slow)
+ * - RACE CONDITION WINDOW: Between lock release and blockchain submission
+ * - MITIGATION: Pre-flight fund verification before submission; comprehensive error handling
+ *
+ * See RACE_CONDITION_ANALYSIS.md for detailed vulnerability documentation.
+ *
+ * @param {import('./types').OrderManager} manager - Manager instance
+ * @param {Object} BitShares - BitShares API client
+ * @param {Function|null} [updateOrdersOnChainBatch=null] - Optional batch update function
+ * @returns {Promise<import('./types').SpreadCheckResult>}
+ */
+async function checkSpreadCondition(manager, BitShares, updateOrdersOnChainBatch = null) {
+    // CRITICAL: Acquire corrections lock to serialize spread correction operations
+    // This prevents concurrent fill processing from modifying funds while we're making decisions
+    let correction = null;
+    let shouldApplyCorrection = false;
+    // Derive current market price from the bot's own grid (no blockchain call needed).
+    // Grid prices are in B/A format (e.g. BTS/XRP) so no inversion is required.
+    // Mid between best bid and best ask is the most current price the bot has.
+    // Falls back to config.startPrice when either side is empty (e.g. at startup).
+    const { onChainBuys, onChainSells } = _getOnChainOrders(manager);
+    const { bestBuy, bestSell } = getGridBestPrices(onChainBuys, onChainSells);
+    const lastPrice = (bestBuy !== null && bestSell !== null)
+        ? (bestBuy + bestSell) / 2
+        : Number(manager.config.startPrice) || 0;
+    // FIX: Use optional chaining for lock - if no lock exists, execute synchronously
+    let fundSnapshot = null;
+    const executeSpreadCheck = async () => {
+        const currentSpread = calculateCurrentSpread(manager);
+        // Nominal spread is the configured target spread percentage.
+        // Keep this fixed: doubled-side flags are fill/replacement mechanics only.
+        const nominalSpread = manager.config.targetSpreadPercent ?? DEFAULT_CONFIG.targetSpreadPercent;
+        // Fixed tolerance: 0.5 steps = half increment (tighter spread check).
+        const toleranceSteps = 0.5;
+        const buyCount = manager.getOrdersByTypeAndState(ORDER_TYPES.BUY, ORDER_STATES.ACTIVE)
+            .concat(manager.getOrdersByTypeAndState(ORDER_TYPES.BUY, ORDER_STATES.PARTIAL))
+            .filter(o => o?.orderId && Number(o?.size || 0) > 0)
+            .length;
+        const sellCount = manager.getOrdersByTypeAndState(ORDER_TYPES.SELL, ORDER_STATES.ACTIVE)
+            .concat(manager.getOrdersByTypeAndState(ORDER_TYPES.SELL, ORDER_STATES.PARTIAL))
+            .filter(o => o?.orderId && Number(o?.size || 0) > 0)
+            .length;
+        manager.outOfSpread = shouldFlagOutOfSpread(currentSpread, nominalSpread, toleranceSteps, buyCount, sellCount, manager.config.incrementPercent);
+        if (manager.outOfSpread === 0)
             return false;
-        return await Grid._hasAnyDust(manager, partials, type);
-    }
-    /**
-     * Public dust helper that returns the subset of candidate partials currently below
-     * the configured dust threshold for the requested side.
-     * @param {import('./types').OrderManager} manager
-     * @param {Array<import('./types').GridOrderSlot>} partials
-     * @param {'buy'|'sell'} side
-     * @returns {Promise<Array<import('./types').GridOrderSlot>>}
-     */
-    static async getDustOrders(manager, partials, side) {
-        const type = side === 'buy' ? ORDER_TYPES.BUY : side === 'sell' ? ORDER_TYPES.SELL : null;
-        if (!type)
-            return [];
-        return await Grid._getDustOrders(manager, partials, type);
-    }
-    /**
-     * Determine which side has more available funds for spread correction.
-     * @param {import('./types').OrderManager} manager - The manager instance.
-     * @param {number} currentMarketPrice - Last traded price in B/A format (e.g. BTS/XRP), used to
-     *   normalize sell-side funds into buy-side units for a fair cross-asset comparison.
-     * @returns {{ side: import('./types').OrderType|null, reason: string }} The side to correct on, or null if insufficient funds.
-     */
-    static determineOrderSideByFunds(manager, currentMarketPrice) {
-        const buyAvailable = Math.min(Number(manager.funds?.available?.buy || 0), Number(manager.accountTotals?.buyFree || 0));
-        const sellAvailable = Math.min(Number(manager.funds?.available?.sell || 0), Number(manager.accountTotals?.sellFree || 0));
-        // Need at least some funds on a side to justify correction
-        const buyPrecision = manager.assets?.assetB?.precision;
-        const sellPrecision = manager.assets?.assetA?.precision;
-        if (buyPrecision === undefined || sellPrecision === undefined) {
-            throw new Error(`CRITICAL: Asset precision unavailable for grid correction check`);
-        }
-        const buyMinUnit = 1 / Math.pow(10, buyPrecision);
-        const sellMinUnit = 1 / Math.pow(10, sellPrecision);
-        const buyViable = buyAvailable > buyMinUnit;
-        const sellViable = sellAvailable > sellMinUnit;
-        let side = null;
-        if (buyViable && sellViable) {
-            // Normalize sell (assetA) to assetB units using market price so both sides
-            // are comparable. Without this, a raw number comparison (e.g. 2192 BTS vs
-            // 0.12 XRP) always picks BUY even when the sell side is larger in value.
-            const marketPrice = Number(currentMarketPrice);
-            const sellInBuyUnits = (Number.isFinite(marketPrice) && marketPrice > 0)
-                ? sellAvailable * marketPrice
-                : sellAvailable;
-            side = buyAvailable >= sellInBuyUnits ? ORDER_TYPES.BUY : ORDER_TYPES.SELL;
-        }
-        else if (buyViable) {
-            side = ORDER_TYPES.BUY;
-        }
-        else if (sellViable) {
-            side = ORDER_TYPES.SELL;
-        }
-        if (!side) {
-            const committedBuy = Math.max(0, Number(manager.funds?.committed?.chain?.buy || 0));
-            const committedSell = Math.max(0, Number(manager.funds?.committed?.chain?.sell || 0));
-            const marketPrice = Number(currentMarketPrice);
-            const hasValidPrice = Number.isFinite(marketPrice) && marketPrice > 0;
-            if (committedBuy > buyMinUnit || committedSell > sellMinUnit) {
-                if (hasValidPrice) {
-                    const buyComparable = committedBuy;
-                    const sellComparable = committedSell * marketPrice;
-                    side = buyComparable >= sellComparable ? ORDER_TYPES.BUY : ORDER_TYPES.SELL;
-                }
-                else if (committedBuy > buyMinUnit && committedSell <= sellMinUnit) {
-                    side = ORDER_TYPES.BUY;
-                }
-                else if (committedSell > sellMinUnit && committedBuy <= buyMinUnit) {
-                    side = ORDER_TYPES.SELL;
-                }
-                else {
-                    // Deterministic fallback when both sides hold inventory but market valuation is unavailable.
-                    side = ORDER_TYPES.BUY;
-                }
-                manager.logger?.log?.(`Spread correction using redistribution fallback on ${side} ` +
-                    `(free buy=${Format.formatAmount8(buyAvailable)}, free sell=${Format.formatAmount8(sellAvailable)}, ` +
-                    `price=${hasValidPrice ? Format.formatAmount8(marketPrice) : 'unavailable'})`, 'info');
-            }
-        }
-        if (!side) {
-            manager.logger?.log?.(`Spread correction skipped: insufficient free funds and no committed inventory to redistribute ` +
-                `(buy=${Format.formatAmount8(buyAvailable)}, sell=${Format.formatAmount8(sellAvailable)})`, 'warn');
+        // Limit spread = nominal + half increment tolerance (0.5 steps).
+        const limitSpread = nominalSpread + (manager.config.incrementPercent * toleranceSteps);
+        manager.logger?.log?.(`Spread too wide (${Format.formatPercent(currentSpread)} > ${Format.formatPercent(limitSpread)}), correcting with ${manager.outOfSpread} extra slot(s)...`, 'warn');
+        const decision = determineOrderSideByFunds(manager, lastPrice);
+        if (!decision.side)
+            return false;
+        // Perform spread correction by placing orders on the chosen side.
+        correction = await prepareSpreadCorrectionOrders(manager, decision.side);
+        if (!correction)
+            return false;
+        const placeCount = correction.ordersToPlace?.length || 0;
+        const updateCount = correction.ordersToUpdate?.length || 0;
+        // Capture fund snapshot under lock for pre-flight verification before broadcast
+        fundSnapshot = _snapshotFundState(manager);
+        return (placeCount + updateCount) > 0;
+    };
+    try {
+        shouldApplyCorrection = await manager._gridLock.acquire(executeSpreadCheck);
+    }
+    catch (err) {
+        manager.logger?.log?.(`Error checking spread condition: ${err.message}`, 'warn');
+        return { ordersPlaced: 0, partialsMoved: 0 };
+    }
+    // FIX: Apply blockchain operations OUTSIDE the lock to reduce lock contention
+    // The lock is only needed for fund verification; order placement doesn't need it
+    // Pre-flight fund verification to mitigate TOCTOU between lock release and broadcast
+    if (shouldApplyCorrection && updateOrdersOnChainBatch && correction && fundSnapshot) {
+        const currentFunds = _snapshotFundState(manager);
+        const fundChanged = fundSnapshot.buyFree !== currentFunds.buyFree
+            || fundSnapshot.sellFree !== currentFunds.sellFree
+            || fundSnapshot.buyLocked !== currentFunds.buyLocked
+            || fundSnapshot.sellLocked !== currentFunds.sellLocked;
+        if (fundChanged) {
+            manager.logger?.log?.(`Spread correction aborted: fund state changed between lock release and broadcast (pre-flight check)`, 'warn');
+            return { ordersPlaced: 0, partialsMoved: 0 };
         }
-        return { side, reason: side ? `Choosing ${side}` : 'Insufficient funds or committed inventory' };
-    }
-    /**
-     * Calculate the geometric ideal size for a new order being placed during spread correction.
-     * @param {import('./types').OrderManager} manager - The manager instance.
-     * @param {import('./types').OrderType} targetType - The type of order being placed (ORDER_TYPES.BUY or ORDER_TYPES.SELL).
-     * @returns {Promise<number|null>} The calculated geometric size.
-     */
-    static async calculateGeometricSizeForSpreadCorrection(manager, targetType) {
-        const side = targetType === ORDER_TYPES.BUY ? 'buy' : 'sell';
-        const slotsCount = Array.from(manager.orders.values()).filter(o => o.type === targetType).length + 1;
-        // Use centralized sizing context (respects botFunds % allocation)
-        const ctx = await Grid._getSizingContext(manager, side);
-        if (!ctx || ctx.budget <= 0 || slotsCount < 1)
-            return null;
-        // ALLOW slotsCount === 1 to enable spread correction even if a side is completely missing
-        const dummy = Array.from({ length: slotsCount }, () => ({ type: targetType }));
         try {
-            const sized = calculateOrderSizes(dummy, manager.config, side === 'sell' ? ctx.budget : 0, side === 'buy' ? ctx.budget : 0, 0, 0, ctx.precision, ctx.precision);
-            if (!Array.isArray(sized) || sized.length === 0) {
-                manager.logger?.log?.(`calculateOrderSizes returned invalid result for spread correction`, 'warn');
-                return null;
+            const batchResult = await updateOrdersOnChainBatch(correction);
+            if (!batchResult || batchResult.executed !== true) {
+                manager.logger?.log?.(`Spread correction batch was prepared but not executed. Keeping local state unchanged.`, 'warn');
+                return { ordersPlaced: 0, partialsMoved: 0 };
             }
-            return side === 'sell' ? sized[0].size : sized[sized.length - 1].size;
+            await manager.recalculateFunds();
+            const placed = correction.ordersToPlace?.length || 0;
+            const updated = correction.ordersToUpdate?.length || 0;
+            return { ordersPlaced: placed + updated, partialsMoved: updated };
         }
-        catch (e) {
-            manager.logger?.log?.(`Error calculating geometric size for spread correction: ${e.message}`, 'warn');
-            return null;
+        catch (err) {
+            manager.logger?.log?.(`Error applying spread correction on-chain: ${err.message}`, 'warn');
+            return { ordersPlaced: 0, partialsMoved: 0 };
         }
     }
-    /**
-     * Prepares one or more orders to correct a wide spread.
-     * @param {import('./types').OrderManager} manager - The OrderManager instance.
-     * @param {string} preferredSide - The side to place the correction on (ORDER_TYPES.BUY/SELL).
-     * @returns {Promise<import('./types').SpreadCorrectionResult>}
-     * @throws {Error} If preferredSide is invalid.
-     */
-    static async prepareSpreadCorrectionOrders(manager, preferredSide) {
-        // FIX: Validate preferredSide parameter to prevent silent logic errors
-        if (preferredSide !== ORDER_TYPES.BUY && preferredSide !== ORDER_TYPES.SELL) {
-            throw new Error(`Invalid preferredSide: ${preferredSide}. Must be '${ORDER_TYPES.BUY}' or '${ORDER_TYPES.SELL}'.`);
-        }
-        const ordersToPlace = [];
-        const ordersToUpdate = [];
-        const railType = preferredSide;
-        const sideName = railType === ORDER_TYPES.BUY ? 'buy' : 'sell';
-        const configuredMissingSlots = Number(manager.outOfSpread || 0);
-        const missingSlots = configuredMissingSlots > 0
-            ? Math.floor(configuredMissingSlots)
-            : 1;
-        // STRATEGY: Edge-Based Correction (Safe Bridging)
-        // Instead of calculating a "mid-price" (which can be dangerous in wide gaps),
-        // we strictly target the orders closest to the spread gap.
-        // 1. Priority: Update existing PARTIAL orders at the edge (Highest Buy / Lowest Sell).
-        // 2. Fallback: Activate SPREAD slots at the edge (Lowest Spread for Buy / Highest Spread for Sell).
-        const allOrders = Array.from(manager.orders.values());
-        let edgePartial = null;
-        const partials = allOrders
-            .filter(o => o.type === railType && o.state === ORDER_STATES.PARTIAL)
-            .sort((a, b) => railType === ORDER_TYPES.BUY ? b.price - a.price : a.price - b.price);
-        if (partials.length > 0) {
-            edgePartial = partials[0];
-            manager.logger?.log?.(`[SPREAD-CORRECTION] Identified partial order at ${edgePartial.price} for update`, 'debug');
-        }
-        // Primary candidates: SPREAD-type slots adjacent to the gap.
-        const typedSpreadCandidates = allOrders
-            .filter(o => o.type === ORDER_TYPES.SPREAD && isSlotAvailable(o))
-            .sort((a, b) => railType === ORDER_TYPES.BUY ? a.price - b.price : b.price - a.price)
-            .slice(0, missingSlots);
-        // Secondary candidates: orphaned virtual slots of the correct side-type that have
-        // lost their order (e.g. stale-cleaned after a race condition during a crash).
-        // These sit inside the active window and are invisible to the SPREAD-type filter above.
-        const orphanedVirtualCandidates = allOrders
-            .filter(o => o.type === railType && o.state === ORDER_STATES.VIRTUAL && !o.orderId && Number(o.size || 0) === 0)
-            .sort((a, b) => railType === ORDER_TYPES.BUY ? b.price - a.price : a.price - b.price)
-            .slice(0, missingSlots);
-        // Merge: prefer orphaned virtuals (they already occupy correct grid positions) then
-        // fall back to SPREAD slots for any remaining quota.
-        const remainingQuota = Math.max(0, missingSlots - orphanedVirtualCandidates.length);
-        const spreadCandidates = [
-            ...orphanedVirtualCandidates,
-            ...typedSpreadCandidates.slice(0, remainingQuota)
-        ];
-        if (spreadCandidates.length > 0) {
-            manager.logger?.log?.(`[SPREAD-CORRECTION] Identified ${spreadCandidates.length}/${missingSlots} slot(s) for activation on ${sideName} (orphaned=${orphanedVirtualCandidates.length}, spread=${spreadCandidates.length - orphanedVirtualCandidates.length})`, 'debug');
-        }
-        if (!edgePartial && spreadCandidates.length === 0) {
-            manager.logger?.log?.(`[SPREAD-CORRECTION] No suitable partials, orphaned virtual slots, or spread slots found. Skipping.`, 'warn');
-            return { ordersToPlace: [], ordersToUpdate: [] };
-        }
-        const orphanedIds = new Set(orphanedVirtualCandidates.map(o => o.id));
-        const sideSlots = allOrders
-            .filter(o => o.type === railType && !orphanedIds.has(o.id))
-            .sort((a, b) => a.price - b.price);
-        const syntheticSideSlots = [
-            ...sideSlots,
-            ...spreadCandidates.map(slot => ({ ...slot, type: railType }))
-        ].sort((a, b) => a.price - b.price);
-        const ctx = await Grid._getSizingContext(manager, sideName);
-        if (!ctx || ctx.budget <= 0 || syntheticSideSlots.length === 0) {
-            return { ordersToPlace: [], ordersToUpdate: [] };
-        }
-        const precisionEpsilon = getPrecisionSlack(ctx.precision, 1);
-        const idealSizes = allocateFundsByWeights(ctx.budget, syntheticSideSlots.length, manager.config.weightDistribution[sideName], manager.config.incrementPercent / 100, railType === ORDER_TYPES.BUY, 0, ctx.precision);
-        const idealById = new Map();
-        syntheticSideSlots.forEach((slot, idx) => {
-            idealById.set(slot.id, Number(idealSizes[idx] || 0));
-        });
-        const availableFund = Math.max(0, Math.min(Number(manager.funds?.available?.[sideName] || 0), Number(sideName === 'buy' ? manager.accountTotals?.buyFree : manager.accountTotals?.sellFree) || 0));
-        const minAbsoluteSize = getMinAbsoluteOrderSize(railType, manager.assets);
-        const prioritizedTargets = [];
-        if (edgePartial && edgePartial.id) {
-            const ideal = Number(idealById.get(edgePartial.id) || 0);
-            const current = Number(edgePartial.size || 0);
-            if (ideal > current + precisionEpsilon) {
-                prioritizedTargets.push({
-                    kind: 'partial-topup',
-                    order: edgePartial,
-                    current,
-                    ideal,
-                    needed: Math.max(0, ideal - current)
-                });
+    return { ordersPlaced: 0, partialsMoved: 0 };
+}
+/**
+ * Grid health check for structural violations.
+ * Monitors for "Dust Partials" that are too small to be traded on-chain,
+ * scoped to the active buy/sell window.
+ *
+ * NOTE: Internal gaps (virtual slots between active ones) are no longer
+ * flagged as violations. The "Edge-First" placement strategy intentionally
+ * creates these gaps to maximize grid coverage during fund expansion.
+ *
+ * @param {import('./types').OrderManager} manager - The manager instance.
+ * @param {Function|null} [updateOrdersOnChainBatch=null] - Optional batch update function.
+ * @returns {Promise<import('./types').DustCheckResult>}
+ */
+async function checkGridHealth(manager, updateOrdersOnChainBatch = null) {
+    if (!manager)
+        return { buyDust: false, sellDust: false, buyDustOrders: [], sellDustOrders: [] };
+    // Skip health checks during bootstrap to prevent spamming warnings
+    if (manager.isBootstrapping())
+        return { buyDust: false, sellDust: false, buyDustOrders: [], sellDustOrders: [] };
+    // Health checks are scoped to the active on-chain window only.
+    // This keeps detection aligned with maintenance actions that operate on
+    // active window partials.
+    const { buyDust, sellDust, buyDustOrders, sellDustOrders } = await checkWindowDust(manager);
+    // Partial split/merge maintenance is intentionally disabled.
+    // Health checks remain detection-only.
+    return { buyDust, sellDust, buyDustOrders, sellDustOrders };
+}
+/**
+ * Dust check covering all partial orders, with interior-only guard.
+ *
+ * The top-of-window partial (closest to market) is always eligible for dust
+ * detection since cancelling it is just the grid edge moving inward.
+ *
+ * Interior partials (further from market) are only eligible if they have a
+ * duplicate price level — another active order at essentially the same price.
+ * Cancelling such an interior partial won't leave a gap in the grid because
+ * the sibling active order already covers that price level.
+ *
+ * Returns boolean flags plus the actual dust order objects so callers can act
+ * on individual orders (e.g. DUST_CANCEL_DELAY_SEC auto-cancel).
+ *
+ * @param {import('./types').OrderManager} manager
+ * @returns {Promise<import('./types').DustCheckResult>}
+ */
+async function checkWindowDust(manager) {
+    if (!manager)
+        return { buyDust: false, sellDust: false, buyDustOrders: [], sellDustOrders: [] };
+    const allOrders = Array.from(manager.orders.values());
+    const isLiveOrder = order => order &&
+        order.orderId &&
+        order.price != null &&
+        (order.state === ORDER_STATES.ACTIVE || order.state === ORDER_STATES.PARTIAL);
+    // Identify top-of-window orders (closest to market per side).
+    const topBuyOrder = allOrders
+        .filter(o => o.type === ORDER_TYPES.BUY && isLiveOrder(o))
+        .sort((a, b) => b.price - a.price)[0];
+    const topSellOrder = allOrders
+        .filter(o => o.type === ORDER_TYPES.SELL && isLiveOrder(o))
+        .sort((a, b) => a.price - b.price)[0];
+    // Check if an order has a duplicate price level — an active sibling at the
+    // same price within tolerance. If so, cancelling won't create a grid gap.
+    // Only checks ACTIVE siblings. If two PARTIALs share a price with no active
+    // sibling, neither qualifies and the gap is left to the rebalancer.
+    // Uses the LARGER size of the two orders for tolerance calculation to prevent
+    // a tiny dust order from inflating the tolerance window.
+    const hasDuplicatePriceLevel = (order, assets) => allOrders.some(o => {
+        if (o.id === order.id || o.type !== order.type)
+            return false;
+        if (o.state !== ORDER_STATES.ACTIVE || !o.orderId || o.price == null)
+            return false;
+        const toleranceSize = Math.max(order.size, o.size);
+        const tolerance = calculatePriceTolerance(Math.min(order.price, o.price), toleranceSize, order.type, assets);
+        return tolerance != null && Math.abs(o.price - order.price) <= tolerance;
+    });
+    const assets = manager.assets;
+    const allPartials = allOrders.filter((o) => isLiveOrder(o) && o.state === ORDER_STATES.PARTIAL);
+    const isTopBuy = (o) => topBuyOrder && o.id === topBuyOrder.id;
+    const isTopSell = (o) => topSellOrder && o.id === topSellOrder.id;
+    // Safety filter: top-of-window partials always qualify; interior partials
+    // only qualify if they have a duplicate price level (no gap risk).
+    const eligibleBuyPartials = allPartials.filter((o) => o.type === ORDER_TYPES.BUY && (isTopBuy(o) || hasDuplicatePriceLevel(o, assets)));
+    const eligibleSellPartials = allPartials.filter((o) => o.type === ORDER_TYPES.SELL && (isTopSell(o) || hasDuplicatePriceLevel(o, assets)));
+    const buyDustOrders = await _getDustOrders(manager, eligibleBuyPartials, ORDER_TYPES.BUY);
+    const sellDustOrders = await _getDustOrders(manager, eligibleSellPartials, ORDER_TYPES.SELL);
+    return {
+        buyDust: buyDustOrders.length > 0,
+        sellDust: sellDustOrders.length > 0,
+        buyDustOrders,
+        sellDustOrders,
+    };
+}
+/**
+ * Return the subset of partial orders that qualify as dust on a given side.
+ * Shares the same sizing context as _hasAnyDust but returns the actual order
+ * objects so callers can act on them (e.g. auto-cancel).
+ * @private
+ * @param {import('./types').OrderManager} manager
+ * @param {Array<import('./types').GridOrderSlot>} partials - Candidate partial orders to test.
+ * @param {string} type - ORDER_TYPES.BUY or ORDER_TYPES.SELL
+ * @returns {Promise<Array<import('./types').GridOrderSlot>>} Orders whose size is below the dust threshold.
+ */
+async function _getDustOrders(manager, partials, type) {
+    if (!partials || partials.length === 0)
+        return [];
+    const side = type === ORDER_TYPES.BUY ? 'buy' : 'sell';
+    const ctx = await _getSizingContext(manager, side);
+    if (!ctx || ctx.budget <= 0)
+        return [];
+    const sideSlots = Array.from(manager.orders.values())
+        .filter(o => o.type === type)
+        .sort((a, b) => a.price - b.price);
+    if (sideSlots.length === 0)
+        return [];
+    const idealSizes = allocateFundsByWeights(ctx.budget, sideSlots.length, manager.config.weightDistribution[side], manager.config.incrementPercent / 100, type === ORDER_TYPES.BUY, 0, ctx.precision);
+    return partials.filter(p => {
+        const idx = sideSlots.findIndex(s => s.id === p.id);
+        if (idx === -1)
+            return false;
+        const threshold = getSingleDustThreshold(idealSizes[idx], manager.config?.gridLimits?.PARTIAL_DUST_THRESHOLD_PERCENTAGE);
+        return p.size < threshold;
+    });
+}
+/**
+ * Check if any partial orders on a side represent "dust" that should be cleaned.
+ * @param {import('./types').OrderManager} manager - Manager instance
+ * @param {Array<import('./types').GridOrderSlot>} partials - Partial orders to check
+ * @param {string} type - ORDER_TYPES.BUY or ORDER_TYPES.SELL
+ * @returns {Promise<boolean>} true if dust partials exist
+ * @private
+ */
+async function _hasAnyDust(manager, partials, type) {
+    return (await _getDustOrders(manager, partials, type)).length > 0;
+}
+/**
+ * Public dust helper shared by StrategyEngine and Grid health checks.
+ * @param {import('./types').OrderManager} manager
+ * @param {Array<import('./types').GridOrderSlot>} partials
+ * @param {'buy'|'sell'} side
+ * @returns {Promise<boolean>}
+ */
+async function hasAnyDust(manager, partials, side) {
+    const type = side === 'buy' ? ORDER_TYPES.BUY : side === 'sell' ? ORDER_TYPES.SELL : null;
+    if (!type)
+        return false;
+    return await _hasAnyDust(manager, partials, type);
+}
+/**
+ * Public dust helper that returns the subset of candidate partials currently below
+ * the configured dust threshold for the requested side.
+ * @param {import('./types').OrderManager} manager
+ * @param {Array<import('./types').GridOrderSlot>} partials
+ * @param {'buy'|'sell'} side
+ * @returns {Promise<Array<import('./types').GridOrderSlot>>}
+ */
+async function getDustOrders(manager, partials, side) {
+    const type = side === 'buy' ? ORDER_TYPES.BUY : side === 'sell' ? ORDER_TYPES.SELL : null;
+    if (!type)
+        return [];
+    return await _getDustOrders(manager, partials, type);
+}
+/**
+ * Determine which side has more available funds for spread correction.
+ * @param {import('./types').OrderManager} manager - The manager instance.
+ * @param {number} currentMarketPrice - Last traded price in B/A format (e.g. BTS/XRP), used to
+ *   normalize sell-side funds into buy-side units for a fair cross-asset comparison.
+ * @returns {{ side: import('./types').OrderType|null, reason: string }} The side to correct on, or null if insufficient funds.
+ */
+function determineOrderSideByFunds(manager, currentMarketPrice) {
+    const buyAvailable = Math.min(Number(manager.funds?.available?.buy || 0), Number(manager.accountTotals?.buyFree || 0));
+    const sellAvailable = Math.min(Number(manager.funds?.available?.sell || 0), Number(manager.accountTotals?.sellFree || 0));
+    // Need at least some funds on a side to justify correction
+    const buyPrecision = manager.assets?.assetB?.precision;
+    const sellPrecision = manager.assets?.assetA?.precision;
+    if (buyPrecision === undefined || sellPrecision === undefined) {
+        throw new Error(`CRITICAL: Asset precision unavailable for grid correction check`);
+    }
+    const buyMinUnit = 1 / Math.pow(10, buyPrecision);
+    const sellMinUnit = 1 / Math.pow(10, sellPrecision);
+    const buyViable = buyAvailable > buyMinUnit;
+    const sellViable = sellAvailable > sellMinUnit;
+    let side = null;
+    if (buyViable && sellViable) {
+        // Normalize sell (assetA) to assetB units using market price so both sides
+        // are comparable. Without this, a raw number comparison (e.g. 2192 BTS vs
+        // 0.12 XRP) always picks BUY even when the sell side is larger in value.
+        const marketPrice = Number(currentMarketPrice);
+        const sellInBuyUnits = (Number.isFinite(marketPrice) && marketPrice > 0)
+            ? sellAvailable * marketPrice
+            : sellAvailable;
+        side = buyAvailable >= sellInBuyUnits ? ORDER_TYPES.BUY : ORDER_TYPES.SELL;
+    }
+    else if (buyViable) {
+        side = ORDER_TYPES.BUY;
+    }
+    else if (sellViable) {
+        side = ORDER_TYPES.SELL;
+    }
+    if (!side) {
+        const committedBuy = Math.max(0, Number(manager.funds?.committed?.chain?.buy || 0));
+        const committedSell = Math.max(0, Number(manager.funds?.committed?.chain?.sell || 0));
+        const marketPrice = Number(currentMarketPrice);
+        const hasValidPrice = Number.isFinite(marketPrice) && marketPrice > 0;
+        if (committedBuy > buyMinUnit || committedSell > sellMinUnit) {
+            if (hasValidPrice) {
+                const buyComparable = committedBuy;
+                const sellComparable = committedSell * marketPrice;
+                side = buyComparable >= sellComparable ? ORDER_TYPES.BUY : ORDER_TYPES.SELL;
             }
-        }
-        for (const slot of spreadCandidates) {
-            const ideal = Number(idealById.get(slot.id) || 0);
-            if (ideal > precisionEpsilon) {
-                prioritizedTargets.push({
-                    kind: 'create',
-                    order: slot,
-                    current: 0,
-                    ideal,
-                    needed: ideal
-                });
+            else if (committedBuy > buyMinUnit && committedSell <= sellMinUnit) {
+                side = ORDER_TYPES.BUY;
             }
-        }
-        if (prioritizedTargets.length === 0) {
-            return { ordersToPlace: [], ordersToUpdate: [] };
-        }
-        const totalNeeded = prioritizedTargets.reduce((sum, t) => sum + Math.max(0, Number(t.needed || 0)), 0);
-        let recoveredBudget = 0;
-        const redistributionUpdates = [];
-        if (totalNeeded > availableFund + precisionEpsilon) {
-            let shortfall = totalNeeded - availableFund;
-            const donors = sideSlots
-                .filter(o => hasOnChainId(o) && (o.state === ORDER_STATES.ACTIVE || o.state === ORDER_STATES.PARTIAL))
-                .filter(o => !edgePartial || o.id !== edgePartial.id)
-                .sort((a, b) => railType === ORDER_TYPES.BUY ? a.price - b.price : b.price - a.price);
-            for (const donor of donors) {
-                if (shortfall <= precisionEpsilon)
-                    break;
-                const donorCurrent = Number(donor.size || 0);
-                const donorIdeal = Number(idealById.get(donor.id) || 0);
-                const donorFloor = Math.max(minAbsoluteSize, donorIdeal);
-                const donorReducible = Math.max(0, donorCurrent - donorFloor);
-                if (donorReducible <= precisionEpsilon)
-                    continue;
-                const reduction = Math.min(donorReducible, shortfall);
-                const donorNext = donorCurrent - reduction;
-                if (donorNext <= precisionEpsilon)
-                    continue;
-                if (!isOrderHealthy(donorNext, railType, manager.assets, donorIdeal || donorNext))
-                    continue;
-                redistributionUpdates.push({ partialOrder: { ...donor }, newSize: donorNext });
-                recoveredBudget += reduction;
-                shortfall -= reduction;
+            else if (committedSell > sellMinUnit && committedBuy <= buyMinUnit) {
+                side = ORDER_TYPES.SELL;
             }
-            if (recoveredBudget > precisionEpsilon) {
-                manager.logger?.log?.(`[SPREAD-CORRECTION] Recovered ${Format.formatSizeByOrderType(recoveredBudget, railType, manager.assets)} on ${sideName} via redistribution`, 'info');
+            else {
+                // Deterministic fallback when both sides hold inventory but market valuation is unavailable.
+                side = ORDER_TYPES.BUY;
             }
+            manager.logger?.log?.(`Spread correction using redistribution fallback on ${side} ` +
+                `(free buy=${Format.formatAmount8(buyAvailable)}, free sell=${Format.formatAmount8(sellAvailable)}, ` +
+                `price=${hasValidPrice ? Format.formatAmount8(marketPrice) : 'unavailable'})`, 'info');
         }
-        let remainingBudget = availableFund + recoveredBudget;
-        for (const target of prioritizedTargets) {
-            if (remainingBudget <= precisionEpsilon)
+    }
+    if (!side) {
+        manager.logger?.log?.(`Spread correction skipped: insufficient free funds and no committed inventory to redistribute ` +
+            `(buy=${Format.formatAmount8(buyAvailable)}, sell=${Format.formatAmount8(sellAvailable)})`, 'warn');
+    }
+    return { side, reason: side ? `Choosing ${side}` : 'Insufficient funds or committed inventory' };
+}
+/**
+ * Calculate the geometric ideal size for a new order being placed during spread correction.
+ * @param {import('./types').OrderManager} manager - The manager instance.
+ * @param {import('./types').OrderType} targetType - The type of order being placed (ORDER_TYPES.BUY or ORDER_TYPES.SELL).
+ * @returns {Promise<number|null>} The calculated geometric size.
+ */
+async function calculateGeometricSizeForSpreadCorrection(manager, targetType) {
+    const side = targetType === ORDER_TYPES.BUY ? 'buy' : 'sell';
+    const slotsCount = Array.from(manager.orders.values()).filter(o => o.type === targetType).length + 1;
+    // Use centralized sizing context (respects botFunds % allocation)
+    const ctx = await _getSizingContext(manager, side);
+    if (!ctx || ctx.budget <= 0 || slotsCount < 1)
+        return null;
+    // ALLOW slotsCount === 1 to enable spread correction even if a side is completely missing
+    const dummy = Array.from({ length: slotsCount }, () => ({ type: targetType }));
+    try {
+        const sized = calculateOrderSizes(dummy, manager.config, side === 'sell' ? ctx.budget : 0, side === 'buy' ? ctx.budget : 0, 0, 0, ctx.precision, ctx.precision);
+        if (!Array.isArray(sized) || sized.length === 0) {
+            manager.logger?.log?.(`calculateOrderSizes returned invalid result for spread correction`, 'warn');
+            return null;
+        }
+        return side === 'sell' ? sized[0].size : sized[sized.length - 1].size;
+    }
+    catch (e) {
+        manager.logger?.log?.(`Error calculating geometric size for spread correction: ${e.message}`, 'warn');
+        return null;
+    }
+}
+/**
+ * Prepares one or more orders to correct a wide spread.
+ * @param {import('./types').OrderManager} manager - The OrderManager instance.
+ * @param {string} preferredSide - The side to place the correction on (ORDER_TYPES.BUY/SELL).
+ * @returns {Promise<import('./types').SpreadCorrectionResult>}
+ * @throws {Error} If preferredSide is invalid.
+ */
+async function prepareSpreadCorrectionOrders(manager, preferredSide) {
+    // FIX: Validate preferredSide parameter to prevent silent logic errors
+    if (preferredSide !== ORDER_TYPES.BUY && preferredSide !== ORDER_TYPES.SELL) {
+        throw new Error(`Invalid preferredSide: ${preferredSide}. Must be '${ORDER_TYPES.BUY}' or '${ORDER_TYPES.SELL}'.`);
+    }
+    const ordersToPlace = [];
+    const ordersToUpdate = [];
+    const railType = preferredSide;
+    const sideName = railType === ORDER_TYPES.BUY ? 'buy' : 'sell';
+    const configuredMissingSlots = Number(manager.outOfSpread || 0);
+    const missingSlots = configuredMissingSlots > 0
+        ? Math.floor(configuredMissingSlots)
+        : 1;
+    // STRATEGY: Edge-Based Correction (Safe Bridging)
+    // Instead of calculating a "mid-price" (which can be dangerous in wide gaps),
+    // we strictly target the orders closest to the spread gap.
+    // 1. Priority: Update existing PARTIAL orders at the edge (Highest Buy / Lowest Sell).
+    // 2. Fallback: Activate SPREAD slots at the edge (Lowest Spread for Buy / Highest Spread for Sell).
+    const allOrders = Array.from(manager.orders.values());
+    let edgePartial = null;
+    const partials = allOrders
+        .filter(o => o.type === railType && o.state === ORDER_STATES.PARTIAL)
+        .sort((a, b) => railType === ORDER_TYPES.BUY ? b.price - a.price : a.price - b.price);
+    if (partials.length > 0) {
+        edgePartial = partials[0];
+        manager.logger?.log?.(`[SPREAD-CORRECTION] Identified partial order at ${edgePartial.price} for update`, 'debug');
+    }
+    // Primary candidates: SPREAD-type slots adjacent to the gap.
+    const typedSpreadCandidates = allOrders
+        .filter(o => o.type === ORDER_TYPES.SPREAD && isSlotAvailable(o))
+        .sort((a, b) => railType === ORDER_TYPES.BUY ? a.price - b.price : b.price - a.price)
+        .slice(0, missingSlots);
+    // Secondary candidates: orphaned virtual slots of the correct side-type that have
+    // lost their order (e.g. stale-cleaned after a race condition during a crash).
+    // These sit inside the active window and are invisible to the SPREAD-type filter above.
+    const orphanedVirtualCandidates = allOrders
+        .filter(o => o.type === railType && o.state === ORDER_STATES.VIRTUAL && !o.orderId && Number(o.size || 0) === 0)
+        .sort((a, b) => railType === ORDER_TYPES.BUY ? b.price - a.price : a.price - b.price)
+        .slice(0, missingSlots);
+    // Merge: prefer orphaned virtuals (they already occupy correct grid positions) then
+    // fall back to SPREAD slots for any remaining quota.
+    const remainingQuota = Math.max(0, missingSlots - orphanedVirtualCandidates.length);
+    const spreadCandidates = [
+        ...orphanedVirtualCandidates,
+        ...typedSpreadCandidates.slice(0, remainingQuota)
+    ];
+    if (spreadCandidates.length > 0) {
+        manager.logger?.log?.(`[SPREAD-CORRECTION] Identified ${spreadCandidates.length}/${missingSlots} slot(s) for activation on ${sideName} (orphaned=${orphanedVirtualCandidates.length}, spread=${spreadCandidates.length - orphanedVirtualCandidates.length})`, 'debug');
+    }
+    if (!edgePartial && spreadCandidates.length === 0) {
+        manager.logger?.log?.(`[SPREAD-CORRECTION] No suitable partials, orphaned virtual slots, or spread slots found. Skipping.`, 'warn');
+        return { ordersToPlace: [], ordersToUpdate: [] };
+    }
+    const orphanedIds = new Set(orphanedVirtualCandidates.map(o => o.id));
+    const sideSlots = allOrders
+        .filter(o => o.type === railType && !orphanedIds.has(o.id))
+        .sort((a, b) => a.price - b.price);
+    const syntheticSideSlots = [
+        ...sideSlots,
+        ...spreadCandidates.map(slot => ({ ...slot, type: railType }))
+    ].sort((a, b) => a.price - b.price);
+    const ctx = await _getSizingContext(manager, sideName);
+    if (!ctx || ctx.budget <= 0 || syntheticSideSlots.length === 0) {
+        return { ordersToPlace: [], ordersToUpdate: [] };
+    }
+    const precisionEpsilon = getPrecisionSlack(ctx.precision, 1);
+    const idealSizes = allocateFundsByWeights(ctx.budget, syntheticSideSlots.length, manager.config.weightDistribution[sideName], manager.config.incrementPercent / 100, railType === ORDER_TYPES.BUY, 0, ctx.precision);
+    const idealById = new Map();
+    syntheticSideSlots.forEach((slot, idx) => {
+        idealById.set(slot.id, Number(idealSizes[idx] || 0));
+    });
+    const availableFund = Math.max(0, Math.min(Number(manager.funds?.available?.[sideName] || 0), Number(sideName === 'buy' ? manager.accountTotals?.buyFree : manager.accountTotals?.sellFree) || 0));
+    const minAbsoluteSize = getMinAbsoluteOrderSize(railType, manager.assets);
+    const prioritizedTargets = [];
+    if (edgePartial && edgePartial.id) {
+        const ideal = Number(idealById.get(edgePartial.id) || 0);
+        const current = Number(edgePartial.size || 0);
+        if (ideal > current + precisionEpsilon) {
+            prioritizedTargets.push({
+                kind: 'partial-topup',
+                order: edgePartial,
+                current,
+                ideal,
+                needed: Math.max(0, ideal - current)
+            });
+        }
+    }
+    for (const slot of spreadCandidates) {
+        const ideal = Number(idealById.get(slot.id) || 0);
+        if (ideal > precisionEpsilon) {
+            prioritizedTargets.push({
+                kind: 'create',
+                order: slot,
+                current: 0,
+                ideal,
+                needed: ideal
+            });
+        }
+    }
+    if (prioritizedTargets.length === 0) {
+        return { ordersToPlace: [], ordersToUpdate: [] };
+    }
+    const totalNeeded = prioritizedTargets.reduce((sum, t) => sum + Math.max(0, Number(t.needed || 0)), 0);
+    let recoveredBudget = 0;
+    const redistributionUpdates = [];
+    if (totalNeeded > availableFund + precisionEpsilon) {
+        let shortfall = totalNeeded - availableFund;
+        const donors = sideSlots
+            .filter(o => hasOnChainId(o) && (o.state === ORDER_STATES.ACTIVE || o.state === ORDER_STATES.PARTIAL))
+            .filter(o => !edgePartial || o.id !== edgePartial.id)
+            .sort((a, b) => railType === ORDER_TYPES.BUY ? a.price - b.price : b.price - a.price);
+        for (const donor of donors) {
+            if (shortfall <= precisionEpsilon)
                 break;
-            if (target.kind === 'partial-topup') {
-                const topUp = Math.min(target.needed, remainingBudget);
-                const newSize = target.current + topUp;
-                if (newSize > target.current + precisionEpsilon && isOrderHealthy(newSize, railType, manager.assets, target.ideal)) {
-                    ordersToUpdate.push({ partialOrder: { ...target.order }, newSize });
-                    remainingBudget -= topUp;
-                }
-                continue;
-            }
-            const createSize = Math.min(target.ideal, remainingBudget);
-            if (createSize <= precisionEpsilon)
+            const donorCurrent = Number(donor.size || 0);
+            const donorIdeal = Number(idealById.get(donor.id) || 0);
+            const donorFloor = Math.max(minAbsoluteSize, donorIdeal);
+            const donorReducible = Math.max(0, donorCurrent - donorFloor);
+            if (donorReducible <= precisionEpsilon)
                 continue;
-            if (!isOrderHealthy(createSize, railType, manager.assets, target.ideal))
+            const reduction = Math.min(donorReducible, shortfall);
+            const donorNext = donorCurrent - reduction;
+            if (donorNext <= precisionEpsilon)
                 continue;
-            ordersToPlace.push({
-                ...target.order,
-                type: railType,
-                size: createSize,
-                state: ORDER_STATES.VIRTUAL
-            });
-            remainingBudget -= createSize;
-        }
-        const combinedUpdates = [...redistributionUpdates];
-        for (const plannedUpdate of ordersToUpdate) {
-            const id = plannedUpdate?.partialOrder?.id || plannedUpdate?.id;
-            if (!id)
+            if (!isOrderHealthy(donorNext, railType, manager.assets, donorIdeal || donorNext))
                 continue;
-            const existingIdx = combinedUpdates.findIndex(u => (u?.partialOrder?.id || u?.id) === id);
-            if (existingIdx >= 0) {
-                combinedUpdates[existingIdx] = plannedUpdate;
-            }
-            else {
-                combinedUpdates.push(plannedUpdate);
-            }
-        }
-        if (spreadCandidates.length < missingSlots) {
-            manager.logger?.log?.(`[SPREAD-CORRECTION] Requested ${missingSlots} extra slot(s), found ${spreadCandidates.length} available slot(s) on ${sideName}`, 'warn');
+            redistributionUpdates.push({ partialOrder: { ...donor }, newSize: donorNext });
+            recoveredBudget += reduction;
+            shortfall -= reduction;
         }
-        if (ordersToPlace.length < spreadCandidates.length) {
-            manager.logger?.log?.(`[SPREAD-CORRECTION] Fund-constrained placement on ${sideName}: planned ${spreadCandidates.length}, placing ${ordersToPlace.length}`, 'info');
+        if (recoveredBudget > precisionEpsilon) {
+            manager.logger?.log?.(`[SPREAD-CORRECTION] Recovered ${Format.formatSizeByOrderType(recoveredBudget, railType, manager.assets)} on ${sideName} via redistribution`, 'info');
         }
-        if (combinedUpdates.length > 0 || ordersToPlace.length > 0) {
-            manager.logger?.log?.(`[SPREAD-CORRECTION] Prepared updates=${combinedUpdates.length}, creates=${ordersToPlace.length}, remainingBudget=${Format.formatSizeByOrderType(Math.max(0, remainingBudget), railType, manager.assets)}`, 'debug');
+    }
+    let remainingBudget = availableFund + recoveredBudget;
+    for (const target of prioritizedTargets) {
+        if (remainingBudget <= precisionEpsilon)
+            break;
+        if (target.kind === 'partial-topup') {
+            const topUp = Math.min(target.needed, remainingBudget);
+            const newSize = target.current + topUp;
+            if (newSize > target.current + precisionEpsilon && isOrderHealthy(newSize, railType, manager.assets, target.ideal)) {
+                ordersToUpdate.push({ partialOrder: { ...target.order }, newSize });
+                remainingBudget -= topUp;
+            }
+            continue;
+        }
+        const createSize = Math.min(target.ideal, remainingBudget);
+        if (createSize <= precisionEpsilon)
+            continue;
+        if (!isOrderHealthy(createSize, railType, manager.assets, target.ideal))
+            continue;
+        ordersToPlace.push({
+            ...target.order,
+            type: railType,
+            size: createSize,
+            state: ORDER_STATES.VIRTUAL
+        });
+        remainingBudget -= createSize;
+    }
+    const combinedUpdates = [...redistributionUpdates];
+    for (const plannedUpdate of ordersToUpdate) {
+        const id = plannedUpdate?.partialOrder?.id || plannedUpdate?.id;
+        if (!id)
+            continue;
+        const existingIdx = combinedUpdates.findIndex(u => (u?.partialOrder?.id || u?.id) === id);
+        if (existingIdx >= 0) {
+            combinedUpdates[existingIdx] = plannedUpdate;
+        }
+        else {
+            combinedUpdates.push(plannedUpdate);
         }
-        return { ordersToPlace, ordersToUpdate: combinedUpdates };
     }
+    if (spreadCandidates.length < missingSlots) {
+        manager.logger?.log?.(`[SPREAD-CORRECTION] Requested ${missingSlots} extra slot(s), found ${spreadCandidates.length} available slot(s) on ${sideName}`, 'warn');
+    }
+    if (ordersToPlace.length < spreadCandidates.length) {
+        manager.logger?.log?.(`[SPREAD-CORRECTION] Fund-constrained placement on ${sideName}: planned ${spreadCandidates.length}, placing ${ordersToPlace.length}`, 'info');
+    }
+    if (combinedUpdates.length > 0 || ordersToPlace.length > 0) {
+        manager.logger?.log?.(`[SPREAD-CORRECTION] Prepared updates=${combinedUpdates.length}, creates=${ordersToPlace.length}, remainingBudget=${Format.formatSizeByOrderType(Math.max(0, remainingBudget), railType, manager.assets)}`, 'debug');
+    }
+    return { ordersToPlace, ordersToUpdate: combinedUpdates };
 }
-module.exports = Grid;
 //# sourceMappingURL=grid.js.map