dexbot 1.4.4 → 1.4.6

package/dist/modules/order/async_lock.js

@@ -68,9 +68,11 @@
  *
  * Re-entrancy detection uses AsyncLocalStorage (Node.js) to distinguish
  * truly nested calls (same async context) from separate concurrent
- * callers. If AsyncLocalStorage is unavailable in the current runtime
- * (e.g. a browser bundle shim), the lock falls back to a simpler
- * _holding flag that treats any concurrent call as re-entrant.
+ * callers. The store tracks a Set of all lock IDs held in the current
+ * async context chain, preserving outer lock identity across nested
+ * acquisitions. If AsyncLocalStorage is unavailable in the current
+ * runtime (e.g. a browser bundle shim), the lock falls back to a
+ * simpler _holding flag that treats any concurrent call as re-entrant.
  *
  * CRITICAL INVARIANTS:
  * - _locked = true ONLY if callback is currently executing
@@ -106,6 +108,7 @@ class AsyncLock {
     _defaultTimeout;
     _onContention;
     _lockId;
+    _orphaned;
     constructor(options = {}) {
         this._queue = [];
         this._locked = false;
@@ -114,6 +117,7 @@ class AsyncLock {
         this._defaultTimeout = options.timeout || null;
         this._onContention = options.onContention || null;
         this._lockId = Symbol('AsyncLock');
+        this._orphaned = false;
     }
     /**
      * Acquire the lock and execute callback exclusively
@@ -128,14 +132,19 @@ class AsyncLock {
         // context, run the callback directly. Uses AsyncLocalStorage (Node.js)
         // to distinguish truly nested calls from separate concurrent callers.
         // Falls back to _holding flag in environments without AsyncLocalStorage.
-        const contextId = _lockCtx ? _lockCtx.getStore() : undefined;
-        if (contextId === this._lockId || (!_lockCtx && this._holding)) {
+        const contextSet = _lockCtx ? _lockCtx.getStore() : undefined;
+        if ((contextSet && contextSet.has(this._lockId)) || (!_lockCtx && this._holding)) {
             return callback();
         }
         const timeout = options.timeout || this._defaultTimeout;
         const cancelToken = options.cancelToken;
         const wrappedCallback = _lockCtx
-            ? () => _lockCtx.run(this._lockId, callback)
+            ? () => {
+                const prevSet = _lockCtx.getStore() || new Set();
+                const newSet = new Set(prevSet);
+                newSet.add(this._lockId);
+                return _lockCtx.run(newSet, callback);
+            }
             : callback;
         return new Promise((resolve, reject) => {
             let timer;
@@ -223,6 +232,17 @@ class AsyncLock {
                 this._locked = false;
                 this._processQueue();
             }
+            else if (this._orphaned) {
+                // Stale callback finishing after forceRelease. The
+                // forceRelease deferred _locked = false to us via the
+                // _orphaned flag. Release the lock so queued callbacks
+                // can proceed. This prevents concurrent execution: the
+                // stale callback continues to hold _locked until it
+                // finishes, blocking any new acquirer.
+                this._orphaned = false;
+                this._locked = false;
+                this._processQueue();
+            }
             // After a callback completes, if there are still queued items
             // (but the previous _locked=false path already called
             // _processQueue which started the next one), check whether
@@ -247,7 +267,8 @@ class AsyncLock {
      */
     isReentrant() {
         if (_lockCtx) {
-            return _lockCtx.getStore() === this._lockId;
+            const store = _lockCtx.getStore();
+            return store ? store.has(this._lockId) : false;
         }
         return this._holding;
     }
@@ -288,6 +309,12 @@ class AsyncLock {
      * stale callback from interfering with a new acquirer that claimed
      * the lock after forceRelease.
      *
+     * CONCURRENT EXECUTION GUARD: If a callback is currently executing
+     * (_holding is true), forceRelease defers _locked = false to the
+     * stale callback's finally block via the _orphaned flag. This
+     * prevents a new acquirer from entering while the stale callback
+     * is still running, preserving mutual exclusion.
+     *
      * @returns {number} Count of cleared items
      */
     forceRelease() {
@@ -296,6 +323,7 @@ class AsyncLock {
         // finally block — it will see generation mismatch and skip
         // touching _locked / _processQueue.
         this._generation++;
+        const wasHolding = this._holding;
         this._holding = false;
         while (this._queue.length > 0) {
             const { reject, timer } = this._queue.shift();
@@ -303,7 +331,17 @@ class AsyncLock {
                 clearTimeout(timer);
             reject(new Error('Lock force-released'));
         }
-        this._locked = false;
+        if (wasHolding) {
+            // A callback is currently executing — defer lock release to
+            // the stale callback's finally block, which detects the
+            // orphan state via generation mismatch + _orphaned flag and
+            // releases _locked when done. This prevents concurrent
+            // execution between the stale callback and a new acquirer.
+            this._orphaned = true;
+        }
+        else {
+            this._locked = false;
+        }
         return count;
     }
 }

package/dist/modules/order/async_lock.js.map

@@ -1 +1 @@
-{"version":3,"file":"async_lock.js","sourceRoot":"","sources":["../../../modules/order/async_lock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"async_lock.js","sourceRoot":"","sources":["../../../modules/order/async_lock.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoFG;;AAIH,gCAAwC;AAsBxC,IAAI,kBAAuB,CAAC;AAC5B,MAAM,YAAY,GAAG,IAAA,oBAAc,GAAE,CAAC;AACtC,IAAI,YAAY,EAAE,CAAC;IACf,IAAI,CAAC;QACD,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;IAC7E,CAAC;IAAC,MAAM,CAAC;QACL,kBAAkB,GAAG,IAAI,CAAC;IAC9B,CAAC;AACL,CAAC;KAAM,CAAC;IACJ,kBAAkB,GAAG,IAAI,CAAC;AAC9B,CAAC;AACD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAEtE,MAAM,SAAS;IACH,MAAM,CAAmB;IACzB,OAAO,CAAU;IACjB,QAAQ,CAAU;IAClB,WAAW,CAAS;IACpB,eAAe,CAAgB;IAC/B,aAAa,CAAsB;IAC1B,OAAO,CAAS;IACzB,SAAS,CAAU;IAE3B,YAAY,UAA4B,EAAE;QACtC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC;QAC/C,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC;QAClD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO,CAAI,QAA0B,EAAE,UAA0B,EAAE;QACrE,uEAAuE;QACvE,uEAAuE;QACvE,sEAAsE;QACtE,yEAAyE;QACzE,MAAM,UAAU,GAA4B,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACvF,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/E,OAAO,QAAQ,EAAE,CAAC;QACtB,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,eAAe,CAAC;QACxD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QAExC,MAAM,eAAe,GAAG,QAAQ;YAC5B,CAAC,CAAC,GAAG,EAAE;gBACH,MAAM,OAAO,GAAgB,QAAQ,CAAC,QAAQ,EAAE,IAAI,IAAI,GAAG,EAAE,CAAC;gBAC9D,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;gBAChC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzB,OAAO,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACxC,CAAC;YACH,CAAC,CAAC,QAAQ,CAAC;QAEf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,KAAgD,CAAC;YAErD,MAAM,IAAI,GAAG;gBACT,QAAQ,EAAE,eAAe;gBACzB,WAAW;gBACX,OAAO,EAAE,CAAC,GAAM,EAAE,EAAE;oBAChB,IAAI,KAAK,EAAE,CAAC;wBACR,YAAY,CAAC,KAAK,CAAC,CAAC;wBACpB,KAAK,GAAG,SAAS,CAAC;oBACtB,CAAC;oBACD,OAAO,CAAC,GAAG,CAAC,CAAC;gBACjB,CAAC;gBACD,MAAM,EAAE,CAAC,GAAY,EAAE,EAAE;oBACrB,IAAI,KAAK,EAAE,CAAC;wBACR,YAAY,CAAC,KAAK,CAAC,CAAC;wBACpB,KAAK,GAAG,SAAS,CAAC;oBACtB,CAAC;oBACD,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChB,CAAC;aACJ,CAAC;YAEF,IAAI,OAAO,EAAE,CAAC;gBACV,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;oBACpB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBACxC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;wBACf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;wBAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,kCAAkC,OAAO,IAAI,CAAC,CAAC,CAAC;oBAC1E,CAAC;gBACL,CAAC,EAAE,OAAO,CAAC,CAAC;YAChB,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,8DAA8D;YAC9D,0DAA0D;YAC1D,gEAAgE;YAChE,6DAA6D;YAC7D,uDAAuD;YACvD,8DAA8D;YAC9D,4DAA4D;YAC5D,+DAA+D;YAC/D,+DAA+D;YAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC;gBACtD,IAAI,EAAE;oBAAE,EAAE,EAAE,CAAC;YACjB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,aAAa;QACvB,qDAAqD;QACrD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO;QACX,CAAC;QAED,kDAAkD;QAClD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAG,CAAC;QAExE,qDAAqD;QACrD,IAAI,WAAW,IAAI,WAAW,CAAC,WAAW,EAAE,CAAC;YACzC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACrB,MAAM,CAAC,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC,CAAC;YAC1D,gCAAgC;YAChC,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;QAChC,CAAC;QAED,MAAM,UAAU,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QAErB,IAAI,CAAC;YACD,gDAAgD;YAChD,MAAM,MAAM,GAAG,MAAM,QAAQ,EAAE,CAAC;YAChC,OAAO,CAAC,MAAM,CAAC,CAAC;QACpB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAChB,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC;gBAAS,CAAC;YACP,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,gEAAgE;YAChE,iEAAiE;YACjE,gEAAgE;YAChE,mDAAmD;YACnD,IAAI,UAAU,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;gBAClC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;gBACrB,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,CAAC;iBAAM,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACxB,mDAAmD;gBACnD,sDAAsD;gBACtD,uDAAuD;gBACvD,uDAAuD;gBACvD,oDAAoD;gBACpD,uCAAuC;gBACvC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;gBACvB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;gBACrB,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,CAAC;YACD,8DAA8D;YAC9D,sDAAsD;YACtD,2DAA2D;YAC3D,yDAAyD;YACzD,mDAAmD;YACnD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC/C,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,CAAC;QACL,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,QAAQ;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED;;;;OAIG;IACH,WAAW;QACP,IAAI,QAAQ,EAAE,CAAC;YACX,MAAM,KAAK,GAA4B,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAC3D,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACnD,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,cAAc;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,UAAU;QACN,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAG,CAAC;YACxC,MAAM,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,YAAY;QACR,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QACjC,8DAA8D;QAC9D,2DAA2D;QAC3D,oCAAoC;QACpC,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAG,CAAC;YAC/C,IAAI,KAAK;gBAAE,YAAY,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACb,4DAA4D;YAC5D,wDAAwD;YACxD,4DAA4D;YAC5D,uDAAuD;YACvD,2DAA2D;YAC3D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAC1B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACzB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAED,kBAAe,SAAS,CAAA;AACxB,MAAM,CAAC,OAAO,GAAG,SAAS,CAAA"}

package/dist/modules/order/grid.d.ts

@@ -65,9 +65,8 @@
  *   21. getDustOrders(manager, partials, side) - Get all dust order IDs (public)
  *   22. determineOrderSideByFunds(manager, currentMarketPrice) - Determine priority side
  *
- * SPREAD CORRECTION (2 methods)
- *   23. calculateGeometricSizeForSpreadCorrection(manager, targetType) - Calculate correction size
- *   24. prepareSpreadCorrectionOrders(manager, preferredSide) - Prepare correction orders
+ * SPREAD CORRECTION (1 method)
+ *   23. prepareSpreadCorrectionOrders(manager, preferredSide) - Prepare correction orders
  *
  * DUST DETECTION (1 method - internal)
  *   25. _getDustOrders(manager, partials, type) - Internal dust detection helper
@@ -193,6 +192,14 @@ export declare function _getSizingContext(manager: any, side: any, { skipRecalc
 export declare function createOrderGrid(config: any): any;
 /**
  * Restore a persisted grid snapshot onto a manager instance.
+ *
+ * Side effects on manager:
+ * - Reassigns all slot types to match current boundary + gapSlots
+ *   (fixes stale persisted types that cause ILLEGAL_SPREAD_STATE)
+ * - Sets `manager._gapSlots` to the computed gapSlots so strategy reads
+ *   the creation-time value instead of recomputing from live config
+ * - Sanitizes phantom orders (ACTIVE/PARTIAL without orderId → VIRTUAL)
+ *
  * @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.
@@ -431,13 +438,6 @@ export declare function getDustOrders(manager: any, partials: any, side: any): P
  * @returns {{ side: import('./types').OrderType|null, reason: string }} The side to correct on, or null if insufficient funds.
  */
 export declare function determineOrderSideByFunds(manager: any, currentMarketPrice: any): any;
-/**
- * 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.
- */
-export declare function calculateGeometricSizeForSpreadCorrection(manager: any, targetType: any): Promise<any>;
 /**
  * Prepares one or more orders to correct a wide spread.
  * @param {import('./types').OrderManager} manager - The OrderManager instance.

package/dist/modules/order/grid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../../modules/order/grid.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../../modules/order/grid.ts"],"names":[],"mappings":"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"}

package/dist/modules/order/grid.js

@@ -66,9 +66,8 @@
  *   21. getDustOrders(manager, partials, side) - Get all dust order IDs (public)
  *   22. determineOrderSideByFunds(manager, currentMarketPrice) - Determine priority side
  *
- * SPREAD CORRECTION (2 methods)
- *   23. calculateGeometricSizeForSpreadCorrection(manager, targetType) - Calculate correction size
- *   24. prepareSpreadCorrectionOrders(manager, preferredSide) - Prepare correction orders
+ * SPREAD CORRECTION (1 method)
+ *   23. prepareSpreadCorrectionOrders(manager, preferredSide) - Prepare correction orders
  *
  * DUST DETECTION (1 method - internal)
  *   25. _getDustOrders(manager, partials, type) - Internal dust detection helper
@@ -151,7 +150,6 @@ exports.checkWindowDust = checkWindowDust;
 exports.hasAnyDust = hasAnyDust;
 exports.getDustOrders = getDustOrders;
 exports.determineOrderSideByFunds = determineOrderSideByFunds;
-exports.calculateGeometricSizeForSpreadCorrection = calculateGeometricSizeForSpreadCorrection;
 exports.prepareSpreadCorrectionOrders = prepareSpreadCorrectionOrders;
 const constants_1 = require("../constants");
 const { GRID_COMPARISON } = constants_1.GRID_LIMITS;
@@ -461,7 +459,7 @@ function createOrderGrid(config) {
         buy: Math.floor(gapSlots / 2),
         sell: gapSlots - Math.floor(gapSlots / 2)
     };
-    return { orders: updatedOrders, boundaryIdx, initialSpreadCount };
+    return { orders: updatedOrders, boundaryIdx, initialSpreadCount, gapSlots };
 }
 /**
  * Internal utility to clear all order-related manager caches.
@@ -480,6 +478,14 @@ function _clearOrderCachesLogic(manager) {
 }
 /**
  * Restore a persisted grid snapshot onto a manager instance.
+ *
+ * Side effects on manager:
+ * - Reassigns all slot types to match current boundary + gapSlots
+ *   (fixes stale persisted types that cause ILLEGAL_SPREAD_STATE)
+ * - Sets `manager._gapSlots` to the computed gapSlots so strategy reads
+ *   the creation-time value instead of recomputing from live config
+ * - Sanitizes phantom orders (ACTIVE/PARTIAL without orderId → VIRTUAL)
+ *
  * @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.
@@ -505,31 +511,32 @@ async function loadGrid(manager, grid, boundaryIdx = null) {
             manager._restoreBoundary(boundaryIdx);
             manager.logger?.log?.(`Restored boundary index: ${boundaryIdx}`, 'info');
         }
-        // Reassign slot types for virtual slots based on current boundary.
-        // Over time, boundary shifts leave stale SPREAD/BUY/SELL types on
-        // virtual slots that no longer match their position. Virtual slots
-        // have no on-chain commitment, so their type is safely corrected.
+        // Reassign slot types based on current boundary.
+        // Every slot's type must match its position in the price-sorted rail
+        // relative to the boundary + gapSlots.  Stale persisted types cause
+        // split spread zones and ILLEGAL_SPREAD_STATE errors.  The subsequent
+        // sync will detect type mismatches with chain orders (e.g. a BUY-zone
+        // slot holding a SELL chain order) and auto-cancel + recreate them.
         if (typeof boundaryIdx === 'number') {
             const gapSlots = calculateGapSlots(manager.config?.incrementPercent, manager.config?.targetSpreadPercent, manager.config?.gridLimits);
+            manager._gapSlots = gapSlots;
             const buyEndIdx = boundaryIdx;
             const sellStartIdx = (0, math_1.getSellStartIdx)(boundaryIdx, gapSlots);
             let reassignCount = 0;
             grid = grid.map((slot, i) => {
-                if (slot.state === constants_1.ORDER_STATES.VIRTUAL && !slot.orderId) {
-                    const correctType = (i <= buyEndIdx)
-                        ? constants_1.ORDER_TYPES.BUY
-                        : (i >= sellStartIdx)
-                            ? constants_1.ORDER_TYPES.SELL
-                            : constants_1.ORDER_TYPES.SPREAD;
-                    if (slot.type !== correctType) {
-                        reassignCount++;
-                        return { ...slot, type: correctType };
-                    }
+                const correctType = (i <= buyEndIdx)
+                    ? constants_1.ORDER_TYPES.BUY
+                    : (i >= sellStartIdx)
+                        ? constants_1.ORDER_TYPES.SELL
+                        : constants_1.ORDER_TYPES.SPREAD;
+                if (slot.type !== correctType) {
+                    reassignCount++;
+                    return { ...slot, type: correctType };
                 }
                 return slot;
             });
             if (reassignCount > 0) {
-                manager.logger?.log?.(`[GRID-LOAD] Reassigned ${reassignCount} stale virtual slot type(s) based on boundary ${boundaryIdx}`, 'warn');
+                manager.logger?.log?.(`[GRID-TYPE-CORRECT] Reassigned ${reassignCount} stale slot type(s) based on boundary ${boundaryIdx}`, 'warn');
             }
         }
         // Gap 6: Grid size cap — validate grid slot count against expected maximum.
@@ -779,12 +786,13 @@ async function initializeGrid(manager) {
         // Continuing would create grid with 0 fund allocation, rendering it non-functional
         throw new Error(`Cannot initialize grid without account totals: ${(0, errors_1.getErrorMessage)(e)}`);
     }
-    const { orders, boundaryIdx, initialSpreadCount } = createOrderGrid({
+    const { orders, boundaryIdx, initialSpreadCount, gapSlots } = createOrderGrid({
         ...manager.config,
         startPrice: gridStartPrice,
         minPrice: resolvedMinP,
         maxPrice: resolvedMaxP,
     });
+    manager._gapSlots = gapSlots;
     // RC-8: Update boundary with notification to dependent systems
     // Persist master boundary for StrategyEngine
     if (manager.boundaryIdx !== boundaryIdx) {
@@ -1180,7 +1188,7 @@ async function updateGridFromBlockchainSnapshot(manager, orderType = 'both', fro
     // that a shift is needed.  The boundary is only written atomically
     // inside _commitWorkingGrid via _setBoundary.
     if (overrideBoundaryIdx !== null && overrideBoundaryIdx !== manager.boundaryIdx) {
-        const gapSlots = calculateGapSlots(manager.config.incrementPercent, manager.config.targetSpreadPercent, manager.config.gridLimits);
+        const gapSlots = manager._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);
@@ -1438,6 +1446,10 @@ async function checkSpreadCondition(manager, _BitShares, updateOrdersOnChainBatc
     // This prevents concurrent fill processing from modifying funds while we're making decisions
     let correction = null;
     let shouldApplyCorrection = false;
+    if (!manager._gridLock) {
+        manager.logger?.log?.('Spread check skipped: no grid lock available', 'warn');
+        return { ordersPlaced: 0, partialsMoved: 0 };
+    }
     // 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.
@@ -1447,7 +1459,7 @@ async function checkSpreadCondition(manager, _BitShares, updateOrdersOnChainBatc
     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
+    // Lock guard is handled at function entry — if _gridLock is absent we return early.
     let fundSnapshot = null;
     // Detect empty-side condition: when one side has zero on-chain orders,
     // the spread is technically infinite and shouldFlagOutOfSpread's old
@@ -1485,7 +1497,7 @@ async function checkSpreadCondition(manager, _BitShares, updateOrdersOnChainBatc
             const allSlots = Array.from(manager.orders.values())
                 .filter((o) => o.price != null)
                 .sort((a, b) => a.price - b.price);
-            const gapSlots = calculateGapSlots(manager.config.incrementPercent, manager.config.targetSpreadPercent, manager.config.gridLimits);
+            const gapSlots = manager._gapSlots ?? calculateGapSlots(manager.config.incrementPercent, manager.config.targetSpreadPercent, manager.config.gridLimits);
             const railLen = allSlots.length;
             const buyEndIdx = manager.boundaryIdx;
             const sellStartIdx = (0, math_1.getSellStartIdx)(manager.boundaryIdx, gapSlots);
@@ -1540,12 +1552,20 @@ async function checkSpreadCondition(manager, _BitShares, updateOrdersOnChainBatc
         shouldApplyCorrection = await manager._gridLock.acquire(executeSpreadCheck);
     }
     catch (err) {
-        manager.logger?.log?.(`Error checking spread condition: ${(0, errors_1.getErrorMessage)(err)}`, 'warn');
+        manager.logger?.log?.(`Error checking spread condition: ${(0, errors_1.getErrorMessage)(err)}`, 'error');
+        // Track failure in recovery state for external monitoring.
+        // Do NOT throw — the startup runtime path lacks a try/catch and
+        // a throw would crash startup. The error is symptom of a deeper
+        // issue (lock contention, grid inconsistency) that should be
+        // diagnosed separately.
+        if (manager._recoveryState) {
+            manager._recoveryState = { ...manager._recoveryState, lastFailureAt: Date.now() };
+        }
         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
+    // Blockchain operations are intentionally 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 mitigates TOCTOU between lock release and broadcast.
     if (shouldApplyCorrection && updateOrdersOnChainBatch && correction && fundSnapshot) {
         const currentFunds = _snapshotFundState(manager);
         const fundChanged = fundSnapshot.buyFree !== currentFunds.buyFree
@@ -1554,28 +1574,27 @@ async function checkSpreadCondition(manager, _BitShares, updateOrdersOnChainBatc
             || fundSnapshot.sellLocked !== currentFunds.sellLocked;
         if (fundChanged) {
             // TOCTOU: fund state changed between lock release and broadcast.
-            // Instead of silently aborting, re-plan with fresh funds so the
-            // correction still applies on this cycle.  The pre-flight check
-            // still guards against placing orders based on stale fund snapshots.
-            // Re-acquire _gridLock for the re-plan to ensure consistent grid
-            // state (the lock is re-entrant for this call chain — the outer
-            // acquire's callback completed before we reach here, so there is
-            // no nested lock to recurse into).  If determineOrderSideByFunds
-            // or prepareSpreadCorrectionOrders grow to hold the lock for
-            // heavy work, hoist the result to avoid serial re-execution.
-            const rePlanResult = await manager._gridLock.acquire(async () => {
-                const decision = determineOrderSideByFunds(manager, lastPrice);
-                if (!decision.side)
-                    return { side: false };
-                const c = await prepareSpreadCorrectionOrders(manager, decision.side, manager.outOfSpread);
-                return { side: true, correction: c };
-            });
-            if (!rePlanResult.side) {
+            // Lock-free re-plan — no _gridLock needed because the fund read
+            // (recalculateFunds) is serialized by _fundLock internally, and
+            // the remaining logic is read-only against COW-frozen state.
+            // All grid-lock-needing work (fund verification, grid reads) is
+            // done under the single outer acquire above; this re-plan runs
+            // after that lock was released.
+            // Refresh lastPrice from current grid state — the grid may
+            // have changed since function entry (TOCTOU).
+            const freshOnChain = _getOnChainOrders(manager);
+            const freshBest = (0, math_1.getGridBestPrices)(freshOnChain.onChainBuys, freshOnChain.onChainSells);
+            const freshPrice = (freshBest.bestBuy !== null && freshBest.bestSell !== null)
+                ? (freshBest.bestBuy + freshBest.bestSell) / 2
+                : Number(manager.config.startPrice) || 0;
+            const rePlanDecision = determineOrderSideByFunds(manager, freshPrice);
+            if (!rePlanDecision.side) {
                 manager.logger?.log?.(`[SPREAD] Fund state changed; no side has sufficient funds for re-plan. Skipping cycle.`, 'warn');
                 return { ordersPlaced: 0, partialsMoved: 0 };
             }
-            correction = rePlanResult.correction;
-            if (correction && ((correction.ordersToPlace?.length || 0) + (correction.ordersToUpdate?.length || 0) > 0)) {
+            const rePlanCorrection = await prepareSpreadCorrectionOrders(manager, rePlanDecision.side, manager.outOfSpread);
+            if (rePlanCorrection && ((rePlanCorrection.ordersToPlace?.length || 0) + (rePlanCorrection.ordersToUpdate?.length || 0) > 0)) {
+                correction = rePlanCorrection;
                 fundSnapshot = currentFunds;
                 manager.logger?.log?.(`[SPREAD] Fund state changed between lock release and broadcast — ` +
                     `re-planned with updated funds: ${correction.ordersToPlace?.length || 0} creates, ` +
@@ -1832,40 +1851,6 @@ function determineOrderSideByFunds(manager, currentMarketPrice) {
     }
     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 === constants_1.ORDER_TYPES.BUY ? 'buy' : 'sell';
-    // Count only on-chain orders (ACTIVE+PARTIAL) to avoid diluting the
-    // spread-correction order size across hundreds of virtual slots on a
-    // full-rail grid.  Virtual slots have their capital tracked separately
-    // in funds.virtual and should not compete for the free budget.
-    const slotsCount = Array.from(manager.orders.values())
-        .filter((o) => o.type === targetType && (o.state === constants_1.ORDER_STATES.ACTIVE || o.state === constants_1.ORDER_STATES.PARTIAL))
-        .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 = (0, math_1.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: ${(0, errors_1.getErrorMessage)(e)}`, 'warn');
-        return null;
-    }
-}
 /**
  * Prepares one or more orders to correct a wide spread.
  * @param {import('./types').OrderManager} manager - The OrderManager instance.
@@ -1904,17 +1889,15 @@ async function prepareSpreadCorrectionOrders(manager, preferredSide, outOfSpread
         .filter((o) => o.price != null && Number.isFinite(o.price))
         .sort((a, b) => a.price - b.price);
     const slotIndexMap = new Map(allSlotsByPrice.map((o, i) => [o.id, i]));
-    const gapSlots = calculateGapSlots(manager.config?.incrementPercent, manager.config?.targetSpreadPercent, manager.config?.gridLimits);
-    // Compute boundary from current fund state for local slot classification.
-    // syncBoundaryToFunds is a pure computation — it does NOT mutate
-    // manager.boundaryIdx.  The boundary is only updated atomically through
-    // _commitWorkingGrid in the COW pipeline via _setBoundary.
-    const boundarySync = (0, system_1.syncBoundaryToFunds)(manager);
-    const bIdx = (boundarySync.changed && boundarySync.newIdx !== undefined)
-        ? boundarySync.newIdx
-        : (manager.boundaryIdx ?? 0);
-    const buyEndIdx = bIdx;
-    const sellStartIdx = (0, math_1.getSellStartIdx)(bIdx, gapSlots);
+    const gapSlots = manager._gapSlots ?? calculateGapSlots(manager.config?.incrementPercent, manager.config?.targetSpreadPercent, manager.config?.gridLimits);
+    // Use the committed boundary for slot classification — never a speculative
+    // value from syncBoundaryToFunds that hasn't been persisted through the COW
+    // pipeline.  If the boundary shifts later via _commitWorkingGrid, the next
+    // spread correction cycle will re-classify with the updated committed value.
+    // This prevents TOCTOU-style inconsistency where slot types are chosen
+    // against a boundary that was never atomically committed to manager.orders.
+    const buyEndIdx = manager.boundaryIdx ?? 0;
+    const sellStartIdx = (0, math_1.getSellStartIdx)(manager.boundaryIdx, gapSlots);
     const getSlotCorrectType = (slot) => {
         const idx = slotIndexMap.get(slot.id);
         if (idx === undefined)