@gbozee/ultimate 0.0.2-next.64 → 0.0.2-next.66

package/dist/index.cjs

@@ -74993,7 +74993,8 @@ function build_reduce_config(payload) {
     not_reduce = false,
     _positions,
     long_config,
-    short_config
+    short_config,
+    kind
   } = payload;
   const long_position = _positions.find((x) => x.kind === "long");
   const short_position = _positions.find((x) => x.kind === "short");
@@ -75008,8 +75009,8 @@ function build_reduce_config(payload) {
     short_target_pnl = Math.abs(short_position.entry - buy_price) * short_position.quantity;
   }
   return {
-    trigger_short: true,
-    trigger_long: true,
+    trigger_short: kind ? kind === "short" : true,
+    trigger_long: kind ? kind === "long" : true,
     symbol,
     short_minimum_pnl,
     long_minimum_pnl,
@@ -76793,8 +76794,7 @@ async function savePaperDetails(client, payload, new_payload) {
   });
   return await updateDbDetails(client, payload, current_account_info, new_payload);
 }
-async function fetchDBExchangeData(client, symbol) {
-  const current_price = await getCurrentPrice3(client.client, symbol);
+async function fetchDBExchangeData(client, symbol, options) {
   let orders = [];
   let trades = { long: [], short: [] };
   let positions = {
@@ -76805,6 +76805,8 @@ async function fetchDBExchangeData(client, symbol) {
     long: null,
     short: null
   };
+  let drift = { long: false, short: false };
+  let priceChanged = false;
   const app_db = await client.initializeAppDb();
   const live_exchange_details = await app_db.getLiveExchangeInstance({
     account: {
@@ -76814,8 +76816,12 @@ async function fetchDBExchangeData(client, symbol) {
     symbol
   });
   const symbol_config = await app_db.getSymbolConfigFromDB(symbol);
+  const dbPrice = live_exchange_details?.data?.current_price;
+  const current_price = options?.current_price ?? dbPrice ?? await getCurrentPrice3(client.client, symbol);
+  priceChanged = dbPrice !== undefined && dbPrice !== current_price;
   if (live_exchange_details) {
     const raw_data = live_exchange_details.data;
+    raw_data.current_price = current_price;
     orders = raw_data.config.trades.exchange_info.open_orders || [];
     positions = raw_data.config.trades.exchange_info.positions;
     const long_result = updatePositionBasedOffTpOrSl({
@@ -76835,6 +76841,20 @@ async function fetchDBExchangeData(client, symbol) {
     positions.short = short_result.position;
     live_exchange_details.data.config.trades.exchange_info.open_orders = orders;
     live_exchange_details.data.config.trades.exchange_info.positions = positions;
+    const prevLong = live_exchange_details.data.long_position;
+    const prevShort = live_exchange_details.data.short_position;
+    drift = {
+      long: prevLong?.entry !== positions.long?.entry || prevLong?.quantity !== positions.long?.quantity,
+      short: prevShort?.entry !== positions.short?.entry || prevShort?.quantity !== positions.short?.quantity
+    };
+    live_exchange_details.data.long_position = {
+      ...prevLong,
+      ...positions.long
+    };
+    live_exchange_details.data.short_position = {
+      ...prevShort,
+      ...positions.short
+    };
     trades = {
       long: long_result.trades,
       short: short_result.trades
@@ -76847,11 +76867,13 @@ async function fetchDBExchangeData(client, symbol) {
     current_price,
     config: config2,
     trades,
+    drift,
+    priceChanged,
     raw_data: live_exchange_details?.data
   };
 }
-async function getPositionInfo3(client, symbol) {
-  const { positions, symbol_config, current_price, raw_data, trades } = await fetchDBExchangeData(client, symbol);
+async function reconcileEngineState(client, symbol, options) {
+  const { positions, symbol_config, current_price, raw_data, trades, drift, priceChanged } = await fetchDBExchangeData(client, symbol, options);
   const long_generator = new TradeEngine({
     position: {
       kind: "long",
@@ -76876,65 +76898,44 @@ async function getPositionInfo3(client, symbol) {
     trades: trades.short,
     price: current_price
   });
+  let changed = false;
   if (raw_data) {
     const long_state_trades = long_state.newTrades;
     const short_state_trades = short_state.newTrades;
-    if (trades.long.length !== long_state_trades.length && positions.long.quantity !== long_state.position.quantity) {
-      console.log({
-        old: trades.long.length,
-        new: long_state_trades.length,
-        position: long_state.position
-      });
-      let _position = {
-        entry: long_state.position.entry,
-        quantity: long_state.position.quantity
-      };
-      let tp = undefined;
-      if (long_state_trades.length === 0 && positions.long.quantity === 0) {
-        _position.entry = 0;
-        _position.quantity = 0;
-        long_state.position.entry = 0;
-        long_state.position.quantity = 0;
-        tp = {
-          price: 0,
-          quantity: 0
+    for (const kind of ["long", "short"]) {
+      const state = kind === "long" ? long_state : short_state;
+      const state_trades = kind === "long" ? long_state_trades : short_state_trades;
+      if (trades[kind].length !== state_trades.length && positions[kind].quantity !== state.position.quantity || drift[kind]) {
+        let _position = {
+          entry: state.position.entry,
+          quantity: state.position.quantity
         };
+        let tp = undefined;
+        if (state_trades.length === 0 && positions[kind].quantity === 0) {
+          _position.entry = 0;
+          _position.quantity = 0;
+          state.position.entry = 0;
+          state.position.quantity = 0;
+          tp = { price: 0, quantity: 0 };
+        }
+        await updateDbDetails(client, { kind, symbol }, raw_data, { take_profit: tp, position: _position, orders: state_trades });
+        changed = true;
       }
-      await updateDbDetails(client, {
-        kind: "long",
-        symbol
-      }, raw_data, {
-        take_profit: tp,
-        position: _position,
-        orders: long_state_trades
-      });
     }
-    if (trades.short.length !== short_state_trades.length && positions.short.quantity !== short_state.position.quantity) {
-      let _position = {
-        entry: short_state.position.entry,
-        quantity: short_state.position.quantity
-      };
-      let tp = undefined;
-      if (short_state_trades.length === 0 && positions.short.quantity === 0) {
-        _position.entry = 0;
-        _position.quantity = 0;
-        short_state.position.entry = 0;
-        short_state.position.quantity = 0;
-        tp = {
-          price: 0,
-          quantity: 0
-        };
-      }
-      await updateDbDetails(client, {
-        kind: "short",
-        symbol
-      }, raw_data, {
-        position: _position,
-        orders: short_state_trades,
-        take_profit: tp
+    if (!changed && priceChanged) {
+      const app_db = await client.initializeAppDb();
+      await app_db.createOrUpdateLiveExchangeInstance({
+        account: { owner: client.owner, exchange: "paper" },
+        symbol,
+        data: raw_data
       });
+      changed = true;
     }
   }
+  return { long_state, short_state, changed };
+}
+async function getPositionInfo3(client, symbol) {
+  const { long_state, short_state } = await reconcileEngineState(client, symbol);
   const long_position = long_state.position;
   const short_position = short_state.position;
   const long_quantity = long_position.quantity;
@@ -77808,7 +77809,8 @@ class ExchangeAccount {
         short_position.getInstance()
       ],
       long_config,
-      short_config
+      short_config,
+      kind: payload.kind
     });
     console.log("config", config2);
     if (!long_config || !short_config) {

package/dist/index.js

@@ -74905,7 +74905,8 @@ function build_reduce_config(payload) {
     not_reduce = false,
     _positions,
     long_config,
-    short_config
+    short_config,
+    kind
   } = payload;
   const long_position = _positions.find((x) => x.kind === "long");
   const short_position = _positions.find((x) => x.kind === "short");
@@ -74920,8 +74921,8 @@ function build_reduce_config(payload) {
     short_target_pnl = Math.abs(short_position.entry - buy_price) * short_position.quantity;
   }
   return {
-    trigger_short: true,
-    trigger_long: true,
+    trigger_short: kind ? kind === "short" : true,
+    trigger_long: kind ? kind === "long" : true,
     symbol,
     short_minimum_pnl,
     long_minimum_pnl,
@@ -76705,8 +76706,7 @@ async function savePaperDetails(client, payload, new_payload) {
   });
   return await updateDbDetails(client, payload, current_account_info, new_payload);
 }
-async function fetchDBExchangeData(client, symbol) {
-  const current_price = await getCurrentPrice3(client.client, symbol);
+async function fetchDBExchangeData(client, symbol, options) {
   let orders = [];
   let trades = { long: [], short: [] };
   let positions = {
@@ -76717,6 +76717,8 @@ async function fetchDBExchangeData(client, symbol) {
     long: null,
     short: null
   };
+  let drift = { long: false, short: false };
+  let priceChanged = false;
   const app_db = await client.initializeAppDb();
   const live_exchange_details = await app_db.getLiveExchangeInstance({
     account: {
@@ -76726,8 +76728,12 @@ async function fetchDBExchangeData(client, symbol) {
     symbol
   });
   const symbol_config = await app_db.getSymbolConfigFromDB(symbol);
+  const dbPrice = live_exchange_details?.data?.current_price;
+  const current_price = options?.current_price ?? dbPrice ?? await getCurrentPrice3(client.client, symbol);
+  priceChanged = dbPrice !== undefined && dbPrice !== current_price;
   if (live_exchange_details) {
     const raw_data = live_exchange_details.data;
+    raw_data.current_price = current_price;
     orders = raw_data.config.trades.exchange_info.open_orders || [];
     positions = raw_data.config.trades.exchange_info.positions;
     const long_result = updatePositionBasedOffTpOrSl({
@@ -76747,6 +76753,20 @@ async function fetchDBExchangeData(client, symbol) {
     positions.short = short_result.position;
     live_exchange_details.data.config.trades.exchange_info.open_orders = orders;
     live_exchange_details.data.config.trades.exchange_info.positions = positions;
+    const prevLong = live_exchange_details.data.long_position;
+    const prevShort = live_exchange_details.data.short_position;
+    drift = {
+      long: prevLong?.entry !== positions.long?.entry || prevLong?.quantity !== positions.long?.quantity,
+      short: prevShort?.entry !== positions.short?.entry || prevShort?.quantity !== positions.short?.quantity
+    };
+    live_exchange_details.data.long_position = {
+      ...prevLong,
+      ...positions.long
+    };
+    live_exchange_details.data.short_position = {
+      ...prevShort,
+      ...positions.short
+    };
     trades = {
       long: long_result.trades,
       short: short_result.trades
@@ -76759,11 +76779,13 @@ async function fetchDBExchangeData(client, symbol) {
     current_price,
     config: config2,
     trades,
+    drift,
+    priceChanged,
     raw_data: live_exchange_details?.data
   };
 }
-async function getPositionInfo3(client, symbol) {
-  const { positions, symbol_config, current_price, raw_data, trades } = await fetchDBExchangeData(client, symbol);
+async function reconcileEngineState(client, symbol, options) {
+  const { positions, symbol_config, current_price, raw_data, trades, drift, priceChanged } = await fetchDBExchangeData(client, symbol, options);
   const long_generator = new TradeEngine({
     position: {
       kind: "long",
@@ -76788,65 +76810,44 @@ async function getPositionInfo3(client, symbol) {
     trades: trades.short,
     price: current_price
   });
+  let changed = false;
   if (raw_data) {
     const long_state_trades = long_state.newTrades;
     const short_state_trades = short_state.newTrades;
-    if (trades.long.length !== long_state_trades.length && positions.long.quantity !== long_state.position.quantity) {
-      console.log({
-        old: trades.long.length,
-        new: long_state_trades.length,
-        position: long_state.position
-      });
-      let _position = {
-        entry: long_state.position.entry,
-        quantity: long_state.position.quantity
-      };
-      let tp = undefined;
-      if (long_state_trades.length === 0 && positions.long.quantity === 0) {
-        _position.entry = 0;
-        _position.quantity = 0;
-        long_state.position.entry = 0;
-        long_state.position.quantity = 0;
-        tp = {
-          price: 0,
-          quantity: 0
+    for (const kind of ["long", "short"]) {
+      const state = kind === "long" ? long_state : short_state;
+      const state_trades = kind === "long" ? long_state_trades : short_state_trades;
+      if (trades[kind].length !== state_trades.length && positions[kind].quantity !== state.position.quantity || drift[kind]) {
+        let _position = {
+          entry: state.position.entry,
+          quantity: state.position.quantity
         };
+        let tp = undefined;
+        if (state_trades.length === 0 && positions[kind].quantity === 0) {
+          _position.entry = 0;
+          _position.quantity = 0;
+          state.position.entry = 0;
+          state.position.quantity = 0;
+          tp = { price: 0, quantity: 0 };
+        }
+        await updateDbDetails(client, { kind, symbol }, raw_data, { take_profit: tp, position: _position, orders: state_trades });
+        changed = true;
       }
-      await updateDbDetails(client, {
-        kind: "long",
-        symbol
-      }, raw_data, {
-        take_profit: tp,
-        position: _position,
-        orders: long_state_trades
-      });
     }
-    if (trades.short.length !== short_state_trades.length && positions.short.quantity !== short_state.position.quantity) {
-      let _position = {
-        entry: short_state.position.entry,
-        quantity: short_state.position.quantity
-      };
-      let tp = undefined;
-      if (short_state_trades.length === 0 && positions.short.quantity === 0) {
-        _position.entry = 0;
-        _position.quantity = 0;
-        short_state.position.entry = 0;
-        short_state.position.quantity = 0;
-        tp = {
-          price: 0,
-          quantity: 0
-        };
-      }
-      await updateDbDetails(client, {
-        kind: "short",
-        symbol
-      }, raw_data, {
-        position: _position,
-        orders: short_state_trades,
-        take_profit: tp
+    if (!changed && priceChanged) {
+      const app_db = await client.initializeAppDb();
+      await app_db.createOrUpdateLiveExchangeInstance({
+        account: { owner: client.owner, exchange: "paper" },
+        symbol,
+        data: raw_data
       });
+      changed = true;
     }
   }
+  return { long_state, short_state, changed };
+}
+async function getPositionInfo3(client, symbol) {
+  const { long_state, short_state } = await reconcileEngineState(client, symbol);
   const long_position = long_state.position;
   const short_position = short_state.position;
   const long_quantity = long_position.quantity;
@@ -77720,7 +77721,8 @@ class ExchangeAccount {
         short_position.getInstance()
       ],
       long_config,
-      short_config
+      short_config,
+      kind: payload.kind
     });
     console.log("config", config2);
     if (!long_config || !short_config) {

package/dist/mcp-server.cjs

@@ -78715,7 +78715,8 @@ function build_reduce_config(payload) {
     not_reduce = false,
     _positions,
     long_config,
-    short_config
+    short_config,
+    kind
   } = payload;
   const long_position = _positions.find((x) => x.kind === "long");
   const short_position = _positions.find((x) => x.kind === "short");
@@ -78730,8 +78731,8 @@ function build_reduce_config(payload) {
     short_target_pnl = Math.abs(short_position.entry - buy_price) * short_position.quantity;
   }
   return {
-    trigger_short: true,
-    trigger_long: true,
+    trigger_short: kind ? kind === "short" : true,
+    trigger_long: kind ? kind === "long" : true,
     symbol,
     short_minimum_pnl,
     long_minimum_pnl,
@@ -80515,8 +80516,7 @@ async function savePaperDetails(client, payload, new_payload) {
   });
   return await updateDbDetails(client, payload, current_account_info, new_payload);
 }
-async function fetchDBExchangeData(client, symbol) {
-  const current_price = await getCurrentPrice3(client.client, symbol);
+async function fetchDBExchangeData(client, symbol, options) {
   let orders = [];
   let trades = { long: [], short: [] };
   let positions = {
@@ -80527,6 +80527,8 @@ async function fetchDBExchangeData(client, symbol) {
     long: null,
     short: null
   };
+  let drift = { long: false, short: false };
+  let priceChanged = false;
   const app_db = await client.initializeAppDb();
   const live_exchange_details = await app_db.getLiveExchangeInstance({
     account: {
@@ -80536,8 +80538,12 @@ async function fetchDBExchangeData(client, symbol) {
     symbol
   });
   const symbol_config = await app_db.getSymbolConfigFromDB(symbol);
+  const dbPrice = live_exchange_details?.data?.current_price;
+  const current_price = options?.current_price ?? dbPrice ?? await getCurrentPrice3(client.client, symbol);
+  priceChanged = dbPrice !== undefined && dbPrice !== current_price;
   if (live_exchange_details) {
     const raw_data = live_exchange_details.data;
+    raw_data.current_price = current_price;
     orders = raw_data.config.trades.exchange_info.open_orders || [];
     positions = raw_data.config.trades.exchange_info.positions;
     const long_result = updatePositionBasedOffTpOrSl({
@@ -80557,6 +80563,20 @@ async function fetchDBExchangeData(client, symbol) {
     positions.short = short_result.position;
     live_exchange_details.data.config.trades.exchange_info.open_orders = orders;
     live_exchange_details.data.config.trades.exchange_info.positions = positions;
+    const prevLong = live_exchange_details.data.long_position;
+    const prevShort = live_exchange_details.data.short_position;
+    drift = {
+      long: prevLong?.entry !== positions.long?.entry || prevLong?.quantity !== positions.long?.quantity,
+      short: prevShort?.entry !== positions.short?.entry || prevShort?.quantity !== positions.short?.quantity
+    };
+    live_exchange_details.data.long_position = {
+      ...prevLong,
+      ...positions.long
+    };
+    live_exchange_details.data.short_position = {
+      ...prevShort,
+      ...positions.short
+    };
     trades = {
       long: long_result.trades,
       short: short_result.trades
@@ -80569,11 +80589,13 @@ async function fetchDBExchangeData(client, symbol) {
     current_price,
     config: config2,
     trades,
+    drift,
+    priceChanged,
     raw_data: live_exchange_details?.data
   };
 }
-async function getPositionInfo3(client, symbol) {
-  const { positions, symbol_config, current_price, raw_data, trades } = await fetchDBExchangeData(client, symbol);
+async function reconcileEngineState(client, symbol, options) {
+  const { positions, symbol_config, current_price, raw_data, trades, drift, priceChanged } = await fetchDBExchangeData(client, symbol, options);
   const long_generator = new TradeEngine({
     position: {
       kind: "long",
@@ -80598,65 +80620,44 @@ async function getPositionInfo3(client, symbol) {
     trades: trades.short,
     price: current_price
   });
+  let changed = false;
   if (raw_data) {
     const long_state_trades = long_state.newTrades;
     const short_state_trades = short_state.newTrades;
-    if (trades.long.length !== long_state_trades.length && positions.long.quantity !== long_state.position.quantity) {
-      console.log({
-        old: trades.long.length,
-        new: long_state_trades.length,
-        position: long_state.position
-      });
-      let _position = {
-        entry: long_state.position.entry,
-        quantity: long_state.position.quantity
-      };
-      let tp = undefined;
-      if (long_state_trades.length === 0 && positions.long.quantity === 0) {
-        _position.entry = 0;
-        _position.quantity = 0;
-        long_state.position.entry = 0;
-        long_state.position.quantity = 0;
-        tp = {
-          price: 0,
-          quantity: 0
+    for (const kind of ["long", "short"]) {
+      const state = kind === "long" ? long_state : short_state;
+      const state_trades = kind === "long" ? long_state_trades : short_state_trades;
+      if (trades[kind].length !== state_trades.length && positions[kind].quantity !== state.position.quantity || drift[kind]) {
+        let _position = {
+          entry: state.position.entry,
+          quantity: state.position.quantity
         };
+        let tp = undefined;
+        if (state_trades.length === 0 && positions[kind].quantity === 0) {
+          _position.entry = 0;
+          _position.quantity = 0;
+          state.position.entry = 0;
+          state.position.quantity = 0;
+          tp = { price: 0, quantity: 0 };
+        }
+        await updateDbDetails(client, { kind, symbol }, raw_data, { take_profit: tp, position: _position, orders: state_trades });
+        changed = true;
       }
-      await updateDbDetails(client, {
-        kind: "long",
-        symbol
-      }, raw_data, {
-        take_profit: tp,
-        position: _position,
-        orders: long_state_trades
-      });
     }
-    if (trades.short.length !== short_state_trades.length && positions.short.quantity !== short_state.position.quantity) {
-      let _position = {
-        entry: short_state.position.entry,
-        quantity: short_state.position.quantity
-      };
-      let tp = undefined;
-      if (short_state_trades.length === 0 && positions.short.quantity === 0) {
-        _position.entry = 0;
-        _position.quantity = 0;
-        short_state.position.entry = 0;
-        short_state.position.quantity = 0;
-        tp = {
-          price: 0,
-          quantity: 0
-        };
-      }
-      await updateDbDetails(client, {
-        kind: "short",
-        symbol
-      }, raw_data, {
-        position: _position,
-        orders: short_state_trades,
-        take_profit: tp
+    if (!changed && priceChanged) {
+      const app_db = await client.initializeAppDb();
+      await app_db.createOrUpdateLiveExchangeInstance({
+        account: { owner: client.owner, exchange: "paper" },
+        symbol,
+        data: raw_data
       });
+      changed = true;
     }
   }
+  return { long_state, short_state, changed };
+}
+async function getPositionInfo3(client, symbol) {
+  const { long_state, short_state } = await reconcileEngineState(client, symbol);
   const long_position = long_state.position;
   const short_position = short_state.position;
   const long_quantity = long_position.quantity;
@@ -81530,7 +81531,8 @@ class ExchangeAccount {
         short_position.getInstance()
       ],
       long_config,
-      short_config
+      short_config,
+      kind: payload.kind
     });
     console.log("config", config2);
     if (!long_config || !short_config) {

package/dist/mcp-server.js

@@ -78688,7 +78688,8 @@ function build_reduce_config(payload) {
     not_reduce = false,
     _positions,
     long_config,
-    short_config
+    short_config,
+    kind
   } = payload;
   const long_position = _positions.find((x) => x.kind === "long");
   const short_position = _positions.find((x) => x.kind === "short");
@@ -78703,8 +78704,8 @@ function build_reduce_config(payload) {
     short_target_pnl = Math.abs(short_position.entry - buy_price) * short_position.quantity;
   }
   return {
-    trigger_short: true,
-    trigger_long: true,
+    trigger_short: kind ? kind === "short" : true,
+    trigger_long: kind ? kind === "long" : true,
     symbol,
     short_minimum_pnl,
     long_minimum_pnl,
@@ -80488,8 +80489,7 @@ async function savePaperDetails(client, payload, new_payload) {
   });
   return await updateDbDetails(client, payload, current_account_info, new_payload);
 }
-async function fetchDBExchangeData(client, symbol) {
-  const current_price = await getCurrentPrice3(client.client, symbol);
+async function fetchDBExchangeData(client, symbol, options) {
   let orders = [];
   let trades = { long: [], short: [] };
   let positions = {
@@ -80500,6 +80500,8 @@ async function fetchDBExchangeData(client, symbol) {
     long: null,
     short: null
   };
+  let drift = { long: false, short: false };
+  let priceChanged = false;
   const app_db = await client.initializeAppDb();
   const live_exchange_details = await app_db.getLiveExchangeInstance({
     account: {
@@ -80509,8 +80511,12 @@ async function fetchDBExchangeData(client, symbol) {
     symbol
   });
   const symbol_config = await app_db.getSymbolConfigFromDB(symbol);
+  const dbPrice = live_exchange_details?.data?.current_price;
+  const current_price = options?.current_price ?? dbPrice ?? await getCurrentPrice3(client.client, symbol);
+  priceChanged = dbPrice !== undefined && dbPrice !== current_price;
   if (live_exchange_details) {
     const raw_data = live_exchange_details.data;
+    raw_data.current_price = current_price;
     orders = raw_data.config.trades.exchange_info.open_orders || [];
     positions = raw_data.config.trades.exchange_info.positions;
     const long_result = updatePositionBasedOffTpOrSl({
@@ -80530,6 +80536,20 @@ async function fetchDBExchangeData(client, symbol) {
     positions.short = short_result.position;
     live_exchange_details.data.config.trades.exchange_info.open_orders = orders;
     live_exchange_details.data.config.trades.exchange_info.positions = positions;
+    const prevLong = live_exchange_details.data.long_position;
+    const prevShort = live_exchange_details.data.short_position;
+    drift = {
+      long: prevLong?.entry !== positions.long?.entry || prevLong?.quantity !== positions.long?.quantity,
+      short: prevShort?.entry !== positions.short?.entry || prevShort?.quantity !== positions.short?.quantity
+    };
+    live_exchange_details.data.long_position = {
+      ...prevLong,
+      ...positions.long
+    };
+    live_exchange_details.data.short_position = {
+      ...prevShort,
+      ...positions.short
+    };
     trades = {
       long: long_result.trades,
       short: short_result.trades
@@ -80542,11 +80562,13 @@ async function fetchDBExchangeData(client, symbol) {
     current_price,
     config: config2,
     trades,
+    drift,
+    priceChanged,
     raw_data: live_exchange_details?.data
   };
 }
-async function getPositionInfo3(client, symbol) {
-  const { positions, symbol_config, current_price, raw_data, trades } = await fetchDBExchangeData(client, symbol);
+async function reconcileEngineState(client, symbol, options) {
+  const { positions, symbol_config, current_price, raw_data, trades, drift, priceChanged } = await fetchDBExchangeData(client, symbol, options);
   const long_generator = new TradeEngine({
     position: {
       kind: "long",
@@ -80571,65 +80593,44 @@ async function getPositionInfo3(client, symbol) {
     trades: trades.short,
     price: current_price
   });
+  let changed = false;
   if (raw_data) {
     const long_state_trades = long_state.newTrades;
     const short_state_trades = short_state.newTrades;
-    if (trades.long.length !== long_state_trades.length && positions.long.quantity !== long_state.position.quantity) {
-      console.log({
-        old: trades.long.length,
-        new: long_state_trades.length,
-        position: long_state.position
-      });
-      let _position = {
-        entry: long_state.position.entry,
-        quantity: long_state.position.quantity
-      };
-      let tp = undefined;
-      if (long_state_trades.length === 0 && positions.long.quantity === 0) {
-        _position.entry = 0;
-        _position.quantity = 0;
-        long_state.position.entry = 0;
-        long_state.position.quantity = 0;
-        tp = {
-          price: 0,
-          quantity: 0
+    for (const kind of ["long", "short"]) {
+      const state = kind === "long" ? long_state : short_state;
+      const state_trades = kind === "long" ? long_state_trades : short_state_trades;
+      if (trades[kind].length !== state_trades.length && positions[kind].quantity !== state.position.quantity || drift[kind]) {
+        let _position = {
+          entry: state.position.entry,
+          quantity: state.position.quantity
         };
+        let tp = undefined;
+        if (state_trades.length === 0 && positions[kind].quantity === 0) {
+          _position.entry = 0;
+          _position.quantity = 0;
+          state.position.entry = 0;
+          state.position.quantity = 0;
+          tp = { price: 0, quantity: 0 };
+        }
+        await updateDbDetails(client, { kind, symbol }, raw_data, { take_profit: tp, position: _position, orders: state_trades });
+        changed = true;
       }
-      await updateDbDetails(client, {
-        kind: "long",
-        symbol
-      }, raw_data, {
-        take_profit: tp,
-        position: _position,
-        orders: long_state_trades
-      });
     }
-    if (trades.short.length !== short_state_trades.length && positions.short.quantity !== short_state.position.quantity) {
-      let _position = {
-        entry: short_state.position.entry,
-        quantity: short_state.position.quantity
-      };
-      let tp = undefined;
-      if (short_state_trades.length === 0 && positions.short.quantity === 0) {
-        _position.entry = 0;
-        _position.quantity = 0;
-        short_state.position.entry = 0;
-        short_state.position.quantity = 0;
-        tp = {
-          price: 0,
-          quantity: 0
-        };
-      }
-      await updateDbDetails(client, {
-        kind: "short",
-        symbol
-      }, raw_data, {
-        position: _position,
-        orders: short_state_trades,
-        take_profit: tp
+    if (!changed && priceChanged) {
+      const app_db = await client.initializeAppDb();
+      await app_db.createOrUpdateLiveExchangeInstance({
+        account: { owner: client.owner, exchange: "paper" },
+        symbol,
+        data: raw_data
       });
+      changed = true;
     }
   }
+  return { long_state, short_state, changed };
+}
+async function getPositionInfo3(client, symbol) {
+  const { long_state, short_state } = await reconcileEngineState(client, symbol);
   const long_position = long_state.position;
   const short_position = short_state.position;
   const long_quantity = long_position.quantity;
@@ -81503,7 +81504,8 @@ class ExchangeAccount {
         short_position.getInstance()
       ],
       long_config,
-      short_config
+      short_config,
+      kind: payload.kind
     });
     console.log("config", config2);
     if (!long_config || !short_config) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gbozee/ultimate",
   "type": "module",
-  "version": "0.0.2-next.64",
+  "version": "0.0.2-next.66",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",