@gbozee/ultimate 0.0.2-107 → 0.0.2-109

package/dist/frontend-index.d.ts

@@ -82,7 +82,7 @@ export type RawPosition = {
 	entry: number;
 	quantity: number;
 	price_places: string;
-	decimal_places: string;
+	decimal_places?: string;
 };
 export type ConfigOptionType = {
 	reduce_ratio: number | string;
@@ -451,6 +451,7 @@ export declare function computeProfitDetail(payload: {
 		max_reward_factor: number;
 		risk: number;
 	};
+	pnl: number;
 	reduce_position?: {
 		kind: "long" | "short";
 		entry: number;

package/dist/frontend-index.js

@@ -1807,24 +1807,14 @@ function computeProfitDetail(payload) {
   const {
     focus_position,
     strategy,
+    pnl,
     price_places = "%.1f",
     reduce_position,
     decimal_places,
     reverse_position
   } = payload;
   let reward_factor = strategy.reward_factor;
-  let risk = strategy.risk;
-  if (strategy.max_reward_factor === 0) {
-    reward_factor = strategy.reward_factor;
-  }
-  if (focus_position.avg_qty >= focus_position.quantity && strategy.max_reward_factor) {
-    reward_factor = to_f(focus_position.quantity * strategy.max_reward_factor / focus_position.avg_qty, "%.4f");
-  } else {
-    reward_factor = strategy.reward_factor;
-  }
-  const full_pnl = reward_factor * risk;
-  const profit_percent = to_f(full_pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
-  const pnl = to_f(focus_position.entry * focus_position.quantity * profit_percent / 100, "%.2f");
+  const profit_percent = to_f(pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
   const diff = pnl / focus_position.quantity;
   const sell_price = to_f(focus_position.kind === "long" ? focus_position.entry + diff : focus_position.entry - diff, price_places);
   let loss = 0;
@@ -2381,6 +2371,7 @@ class Strategy {
         avg_price: focus_position.avg_price,
         avg_qty: focus_position.avg_qty
       },
+      pnl: this.pnl(kind),
       strategy: {
         reward_factor,
         max_reward_factor,

package/dist/index.cjs

@@ -54027,24 +54027,14 @@ function computeProfitDetail(payload) {
   const {
     focus_position,
     strategy,
+    pnl,
     price_places = "%.1f",
     reduce_position,
     decimal_places,
     reverse_position
   } = payload;
   let reward_factor = strategy.reward_factor;
-  let risk = strategy.risk;
-  if (strategy.max_reward_factor === 0) {
-    reward_factor = strategy.reward_factor;
-  }
-  if (focus_position.avg_qty >= focus_position.quantity && strategy.max_reward_factor) {
-    reward_factor = to_f2(focus_position.quantity * strategy.max_reward_factor / focus_position.avg_qty, "%.4f");
-  } else {
-    reward_factor = strategy.reward_factor;
-  }
-  const full_pnl = reward_factor * risk;
-  const profit_percent = to_f2(full_pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
-  const pnl = to_f2(focus_position.entry * focus_position.quantity * profit_percent / 100, "%.2f");
+  const profit_percent = to_f2(pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
   const diff = pnl / focus_position.quantity;
   const sell_price = to_f2(focus_position.kind === "long" ? focus_position.entry + diff : focus_position.entry - diff, price_places);
   let loss = 0;
@@ -54602,6 +54592,7 @@ class Strategy {
         avg_price: focus_position.avg_price,
         avg_qty: focus_position.avg_qty
       },
+      pnl: this.pnl(kind),
       strategy: {
         reward_factor,
         max_reward_factor,
@@ -54723,6 +54714,56 @@ class BaseExchange {
       decimal_places
     });
   }
+  async analyzeCandlesticks(payload) {
+    const { symbol } = payload;
+    const arr = [
+      "weekly",
+      "days_3",
+      "daily",
+      "hours_12",
+      "hours_8",
+      "hours_6",
+      "hours_4",
+      "hours_2"
+    ];
+    const results = await Promise.all(arr.map((x) => this.analyzeCharts({ chartType: x, raw: true, limit: 99, symbol })));
+    const currentPrice = await this.get_current_price(symbol);
+    const resistance = {};
+    const support = {};
+    for (let i2 = 0;i2 < arr.length; i2++) {
+      const interval = arr[i2];
+      const data = results[i2];
+      for (const value2 of data.slice(1)) {
+        const high = value2[2];
+        const low = value2[3];
+        console.log("slice", { high, low, interval });
+        if (high in resistance) {
+          resistance[high] += 1;
+        } else {
+          resistance[high] = 1;
+        }
+        if (low in support) {
+          support[low] += 1;
+        } else {
+          support[low] = 1;
+        }
+      }
+    }
+    const filteredResistance = Object.fromEntries(Object.entries(resistance).filter(([k, v]) => parseFloat(k) > currentPrice));
+    const filteredSupport = Object.fromEntries(Object.entries(support).filter(([k, v]) => parseFloat(k) < currentPrice));
+    const candlesticks = arr.reduce((acc, interval, index) => {
+      acc[interval] = results[index].slice(1);
+      return acc;
+    }, {});
+    const minimumWeekly = Math.min(...candlesticks["weekly"].map((x) => parseFloat(x[3])));
+    return {
+      candlesticks,
+      resistance: filteredResistance,
+      support: filteredSupport,
+      current_price: currentPrice,
+      minimum_weekly: minimumWeekly
+    };
+  }
 }
 
 // src/exchanges/binance.ts
@@ -55597,8 +55638,8 @@ class BinanceExchange extends BaseExchange {
       client: this.client,
       symbol: payload.symbol,
       chartType: payload.chartType,
-      count: payload.count,
-      raw: payload.raw || false
+      limit: payload.limit,
+      raw: payload.raw
     });
   }
   async getExchangeAccountInfo(options) {
@@ -56418,7 +56459,7 @@ class BybitExchange extends BaseExchange {
       client: this.client,
       symbol: payload.symbol,
       chartType: payload.chartType,
-      count: payload.count,
+      limit: payload.limit,
       raw: payload.raw || false
     });
   }
@@ -59565,7 +59606,7 @@ class ExchangeAccount {
     });
   }
   async getSellPriceFromStrategy(payload) {
-    const { symbol, reduce_position } = payload;
+    const { symbol, reduce_position, kind } = payload;
     const symbol_config = await this.recomputeSymbolConfig({
       symbol
     });
@@ -59573,7 +59614,13 @@ class ExchangeAccount {
       symbol,
       as_view: true
     });
-    const focus_position = positions.find((k) => k.expand?.account_strategy);
+    const focus_position = positions.find((k) => {
+      let condition = Boolean(k.expand?.account_strategy);
+      if (kind) {
+        condition = condition && k.kind === kind;
+      }
+      return condition;
+    });
     if (!focus_position) {
       return;
     }
@@ -59591,6 +59638,7 @@ class ExchangeAccount {
         avg_price: focus_position.avg_price,
         avg_qty: focus_position.avg_qty
       },
+      pnl: focus_position.target_pnl,
       strategy: {
         reward_factor: strategy.reward_factor,
         risk: strategy.risk,
@@ -59956,7 +60004,8 @@ class App {
     });
     const result = await main_exchange_account.getSellPriceFromStrategy({
       symbol: main_account.symbol,
-      reduce_position
+      reduce_position,
+      kind: main_account.kind
     });
     if (place) {
       await reduce_exchange_account.cancelOrders({

package/dist/index.d.ts

@@ -287,6 +287,19 @@ interface Order$1 {
 	stop: number;
 	triggerPrice?: number;
 }
+export interface CandlestickAnalysisResult {
+	candlesticks: {
+		[key: string]: any[];
+	};
+	resistance: {
+		[key: string]: number;
+	};
+	support: {
+		[key: string]: number;
+	};
+	current_price: number;
+	minimum_weekly: number;
+}
 declare abstract class BaseExchange {
 	client: any;
 	constructor(client: any);
@@ -317,7 +330,7 @@ declare abstract class BaseExchange {
 	abstract analyzeCharts(payload: {
 		symbol: string;
 		chartType: any;
-		count: number;
+		limit: number;
 		raw?: boolean;
 	}): Promise<any>;
 	abstract getExchangeAccountInfo(options: {
@@ -424,6 +437,9 @@ declare abstract class BaseExchange {
 		price_places?: string;
 		decimal_places?: string;
 	}): Promise<any>;
+	analyzeCandlesticks(payload: {
+		symbol: string;
+	}): Promise<CandlestickAnalysisResult>;
 }
 declare function initPocketBaseClient(proxy_credentials: {
 	host: string;
@@ -1273,6 +1289,7 @@ export declare function computeProfitDetail(payload: {
 		max_reward_factor: number;
 		risk: number;
 	};
+	pnl: number;
 	reduce_position?: {
 		kind: "long" | "short";
 		entry: number;
@@ -2151,6 +2168,7 @@ declare class ExchangeAccount$1 {
 	getSellPriceFromStrategy(payload: {
 		symbol: string;
 		reduce_position: PositionsView;
+		kind?: "long" | "short";
 	}): Promise<{
 		pnl: number;
 		loss: number;
@@ -2388,6 +2406,7 @@ declare class App {
 	reduceExistingPosition(payload: {
 		main_account: ExchangeType & {
 			symbol: string;
+			kind?: "long" | "short";
 		};
 		reduce_account: ExchangeType & {
 			symbol: string;

package/dist/index.js

@@ -53979,24 +53979,14 @@ function computeProfitDetail(payload) {
   const {
     focus_position,
     strategy,
+    pnl,
     price_places = "%.1f",
     reduce_position,
     decimal_places,
     reverse_position
   } = payload;
   let reward_factor = strategy.reward_factor;
-  let risk = strategy.risk;
-  if (strategy.max_reward_factor === 0) {
-    reward_factor = strategy.reward_factor;
-  }
-  if (focus_position.avg_qty >= focus_position.quantity && strategy.max_reward_factor) {
-    reward_factor = to_f2(focus_position.quantity * strategy.max_reward_factor / focus_position.avg_qty, "%.4f");
-  } else {
-    reward_factor = strategy.reward_factor;
-  }
-  const full_pnl = reward_factor * risk;
-  const profit_percent = to_f2(full_pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
-  const pnl = to_f2(focus_position.entry * focus_position.quantity * profit_percent / 100, "%.2f");
+  const profit_percent = to_f2(pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
   const diff = pnl / focus_position.quantity;
   const sell_price = to_f2(focus_position.kind === "long" ? focus_position.entry + diff : focus_position.entry - diff, price_places);
   let loss = 0;
@@ -54554,6 +54544,7 @@ class Strategy {
         avg_price: focus_position.avg_price,
         avg_qty: focus_position.avg_qty
       },
+      pnl: this.pnl(kind),
       strategy: {
         reward_factor,
         max_reward_factor,
@@ -54675,6 +54666,56 @@ class BaseExchange {
       decimal_places
     });
   }
+  async analyzeCandlesticks(payload) {
+    const { symbol } = payload;
+    const arr = [
+      "weekly",
+      "days_3",
+      "daily",
+      "hours_12",
+      "hours_8",
+      "hours_6",
+      "hours_4",
+      "hours_2"
+    ];
+    const results = await Promise.all(arr.map((x) => this.analyzeCharts({ chartType: x, raw: true, limit: 99, symbol })));
+    const currentPrice = await this.get_current_price(symbol);
+    const resistance = {};
+    const support = {};
+    for (let i2 = 0;i2 < arr.length; i2++) {
+      const interval = arr[i2];
+      const data = results[i2];
+      for (const value2 of data.slice(1)) {
+        const high = value2[2];
+        const low = value2[3];
+        console.log("slice", { high, low, interval });
+        if (high in resistance) {
+          resistance[high] += 1;
+        } else {
+          resistance[high] = 1;
+        }
+        if (low in support) {
+          support[low] += 1;
+        } else {
+          support[low] = 1;
+        }
+      }
+    }
+    const filteredResistance = Object.fromEntries(Object.entries(resistance).filter(([k, v]) => parseFloat(k) > currentPrice));
+    const filteredSupport = Object.fromEntries(Object.entries(support).filter(([k, v]) => parseFloat(k) < currentPrice));
+    const candlesticks = arr.reduce((acc, interval, index) => {
+      acc[interval] = results[index].slice(1);
+      return acc;
+    }, {});
+    const minimumWeekly = Math.min(...candlesticks["weekly"].map((x) => parseFloat(x[3])));
+    return {
+      candlesticks,
+      resistance: filteredResistance,
+      support: filteredSupport,
+      current_price: currentPrice,
+      minimum_weekly: minimumWeekly
+    };
+  }
 }
 
 // src/exchanges/binance.ts
@@ -55549,8 +55590,8 @@ class BinanceExchange extends BaseExchange {
       client: this.client,
       symbol: payload.symbol,
       chartType: payload.chartType,
-      count: payload.count,
-      raw: payload.raw || false
+      limit: payload.limit,
+      raw: payload.raw
     });
   }
   async getExchangeAccountInfo(options) {
@@ -56370,7 +56411,7 @@ class BybitExchange extends BaseExchange {
       client: this.client,
       symbol: payload.symbol,
       chartType: payload.chartType,
-      count: payload.count,
+      limit: payload.limit,
       raw: payload.raw || false
     });
   }
@@ -59517,7 +59558,7 @@ class ExchangeAccount {
     });
   }
   async getSellPriceFromStrategy(payload) {
-    const { symbol, reduce_position } = payload;
+    const { symbol, reduce_position, kind } = payload;
     const symbol_config = await this.recomputeSymbolConfig({
       symbol
     });
@@ -59525,7 +59566,13 @@ class ExchangeAccount {
       symbol,
       as_view: true
     });
-    const focus_position = positions.find((k) => k.expand?.account_strategy);
+    const focus_position = positions.find((k) => {
+      let condition = Boolean(k.expand?.account_strategy);
+      if (kind) {
+        condition = condition && k.kind === kind;
+      }
+      return condition;
+    });
     if (!focus_position) {
       return;
     }
@@ -59543,6 +59590,7 @@ class ExchangeAccount {
         avg_price: focus_position.avg_price,
         avg_qty: focus_position.avg_qty
       },
+      pnl: focus_position.target_pnl,
       strategy: {
         reward_factor: strategy.reward_factor,
         risk: strategy.risk,
@@ -59908,7 +59956,8 @@ class App {
     });
     const result = await main_exchange_account.getSellPriceFromStrategy({
       symbol: main_account.symbol,
-      reduce_position
+      reduce_position,
+      kind: main_account.kind
     });
     if (place) {
       await reduce_exchange_account.cancelOrders({

package/dist/mcp-server.cjs

@@ -60715,24 +60715,14 @@ function computeProfitDetail(payload) {
   const {
     focus_position,
     strategy,
+    pnl,
     price_places = "%.1f",
     reduce_position,
     decimal_places,
     reverse_position
   } = payload;
   let reward_factor = strategy.reward_factor;
-  let risk = strategy.risk;
-  if (strategy.max_reward_factor === 0) {
-    reward_factor = strategy.reward_factor;
-  }
-  if (focus_position.avg_qty >= focus_position.quantity && strategy.max_reward_factor) {
-    reward_factor = to_f2(focus_position.quantity * strategy.max_reward_factor / focus_position.avg_qty, "%.4f");
-  } else {
-    reward_factor = strategy.reward_factor;
-  }
-  const full_pnl = reward_factor * risk;
-  const profit_percent = to_f2(full_pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
-  const pnl = to_f2(focus_position.entry * focus_position.quantity * profit_percent / 100, "%.2f");
+  const profit_percent = to_f2(pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
   const diff = pnl / focus_position.quantity;
   const sell_price = to_f2(focus_position.kind === "long" ? focus_position.entry + diff : focus_position.entry - diff, price_places);
   let loss = 0;
@@ -61284,6 +61274,7 @@ class Strategy {
         avg_price: focus_position.avg_price,
         avg_qty: focus_position.avg_qty
       },
+      pnl: this.pnl(kind),
       strategy: {
         reward_factor,
         max_reward_factor,
@@ -61405,6 +61396,56 @@ class BaseExchange {
       decimal_places
     });
   }
+  async analyzeCandlesticks(payload) {
+    const { symbol } = payload;
+    const arr = [
+      "weekly",
+      "days_3",
+      "daily",
+      "hours_12",
+      "hours_8",
+      "hours_6",
+      "hours_4",
+      "hours_2"
+    ];
+    const results = await Promise.all(arr.map((x) => this.analyzeCharts({ chartType: x, raw: true, limit: 99, symbol })));
+    const currentPrice = await this.get_current_price(symbol);
+    const resistance = {};
+    const support = {};
+    for (let i2 = 0;i2 < arr.length; i2++) {
+      const interval = arr[i2];
+      const data = results[i2];
+      for (const value2 of data.slice(1)) {
+        const high = value2[2];
+        const low = value2[3];
+        console.log("slice", { high, low, interval });
+        if (high in resistance) {
+          resistance[high] += 1;
+        } else {
+          resistance[high] = 1;
+        }
+        if (low in support) {
+          support[low] += 1;
+        } else {
+          support[low] = 1;
+        }
+      }
+    }
+    const filteredResistance = Object.fromEntries(Object.entries(resistance).filter(([k, v]) => parseFloat(k) > currentPrice));
+    const filteredSupport = Object.fromEntries(Object.entries(support).filter(([k, v]) => parseFloat(k) < currentPrice));
+    const candlesticks = arr.reduce((acc, interval, index) => {
+      acc[interval] = results[index].slice(1);
+      return acc;
+    }, {});
+    const minimumWeekly = Math.min(...candlesticks["weekly"].map((x) => parseFloat(x[3])));
+    return {
+      candlesticks,
+      resistance: filteredResistance,
+      support: filteredSupport,
+      current_price: currentPrice,
+      minimum_weekly: minimumWeekly
+    };
+  }
 }
 
 // src/exchanges/binance.ts
@@ -62279,8 +62320,8 @@ class BinanceExchange extends BaseExchange {
       client: this.client,
       symbol: payload.symbol,
       chartType: payload.chartType,
-      count: payload.count,
-      raw: payload.raw || false
+      limit: payload.limit,
+      raw: payload.raw
     });
   }
   async getExchangeAccountInfo(options) {
@@ -63100,7 +63141,7 @@ class BybitExchange extends BaseExchange {
       client: this.client,
       symbol: payload.symbol,
       chartType: payload.chartType,
-      count: payload.count,
+      limit: payload.limit,
       raw: payload.raw || false
     });
   }
@@ -66247,7 +66288,7 @@ class ExchangeAccount {
     });
   }
   async getSellPriceFromStrategy(payload) {
-    const { symbol, reduce_position } = payload;
+    const { symbol, reduce_position, kind } = payload;
     const symbol_config = await this.recomputeSymbolConfig({
       symbol
     });
@@ -66255,7 +66296,13 @@ class ExchangeAccount {
       symbol,
       as_view: true
     });
-    const focus_position = positions.find((k) => k.expand?.account_strategy);
+    const focus_position = positions.find((k) => {
+      let condition = Boolean(k.expand?.account_strategy);
+      if (kind) {
+        condition = condition && k.kind === kind;
+      }
+      return condition;
+    });
     if (!focus_position) {
       return;
     }
@@ -66273,6 +66320,7 @@ class ExchangeAccount {
         avg_price: focus_position.avg_price,
         avg_qty: focus_position.avg_qty
       },
+      pnl: focus_position.target_pnl,
       strategy: {
         reward_factor: strategy.reward_factor,
         risk: strategy.risk,
@@ -66638,7 +66686,8 @@ class App {
     });
     const result = await main_exchange_account.getSellPriceFromStrategy({
       symbol: main_account.symbol,
-      reduce_position
+      reduce_position,
+      kind: main_account.kind
     });
     if (place) {
       await reduce_exchange_account.cancelOrders({

package/dist/mcp-server.js

@@ -60692,24 +60692,14 @@ function computeProfitDetail(payload) {
   const {
     focus_position,
     strategy,
+    pnl,
     price_places = "%.1f",
     reduce_position,
     decimal_places,
     reverse_position
   } = payload;
   let reward_factor = strategy.reward_factor;
-  let risk = strategy.risk;
-  if (strategy.max_reward_factor === 0) {
-    reward_factor = strategy.reward_factor;
-  }
-  if (focus_position.avg_qty >= focus_position.quantity && strategy.max_reward_factor) {
-    reward_factor = to_f2(focus_position.quantity * strategy.max_reward_factor / focus_position.avg_qty, "%.4f");
-  } else {
-    reward_factor = strategy.reward_factor;
-  }
-  const full_pnl = reward_factor * risk;
-  const profit_percent = to_f2(full_pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
-  const pnl = to_f2(focus_position.entry * focus_position.quantity * profit_percent / 100, "%.2f");
+  const profit_percent = to_f2(pnl * 100 / (focus_position.avg_price * focus_position.avg_qty), "%.4f");
   const diff = pnl / focus_position.quantity;
   const sell_price = to_f2(focus_position.kind === "long" ? focus_position.entry + diff : focus_position.entry - diff, price_places);
   let loss = 0;
@@ -61261,6 +61251,7 @@ class Strategy {
         avg_price: focus_position.avg_price,
         avg_qty: focus_position.avg_qty
       },
+      pnl: this.pnl(kind),
       strategy: {
         reward_factor,
         max_reward_factor,
@@ -61382,6 +61373,56 @@ class BaseExchange {
       decimal_places
     });
   }
+  async analyzeCandlesticks(payload) {
+    const { symbol } = payload;
+    const arr = [
+      "weekly",
+      "days_3",
+      "daily",
+      "hours_12",
+      "hours_8",
+      "hours_6",
+      "hours_4",
+      "hours_2"
+    ];
+    const results = await Promise.all(arr.map((x) => this.analyzeCharts({ chartType: x, raw: true, limit: 99, symbol })));
+    const currentPrice = await this.get_current_price(symbol);
+    const resistance = {};
+    const support = {};
+    for (let i2 = 0;i2 < arr.length; i2++) {
+      const interval = arr[i2];
+      const data = results[i2];
+      for (const value2 of data.slice(1)) {
+        const high = value2[2];
+        const low = value2[3];
+        console.log("slice", { high, low, interval });
+        if (high in resistance) {
+          resistance[high] += 1;
+        } else {
+          resistance[high] = 1;
+        }
+        if (low in support) {
+          support[low] += 1;
+        } else {
+          support[low] = 1;
+        }
+      }
+    }
+    const filteredResistance = Object.fromEntries(Object.entries(resistance).filter(([k, v]) => parseFloat(k) > currentPrice));
+    const filteredSupport = Object.fromEntries(Object.entries(support).filter(([k, v]) => parseFloat(k) < currentPrice));
+    const candlesticks = arr.reduce((acc, interval, index) => {
+      acc[interval] = results[index].slice(1);
+      return acc;
+    }, {});
+    const minimumWeekly = Math.min(...candlesticks["weekly"].map((x) => parseFloat(x[3])));
+    return {
+      candlesticks,
+      resistance: filteredResistance,
+      support: filteredSupport,
+      current_price: currentPrice,
+      minimum_weekly: minimumWeekly
+    };
+  }
 }
 
 // src/exchanges/binance.ts
@@ -62256,8 +62297,8 @@ class BinanceExchange extends BaseExchange {
       client: this.client,
       symbol: payload.symbol,
       chartType: payload.chartType,
-      count: payload.count,
-      raw: payload.raw || false
+      limit: payload.limit,
+      raw: payload.raw
     });
   }
   async getExchangeAccountInfo(options) {
@@ -63077,7 +63118,7 @@ class BybitExchange extends BaseExchange {
       client: this.client,
       symbol: payload.symbol,
       chartType: payload.chartType,
-      count: payload.count,
+      limit: payload.limit,
       raw: payload.raw || false
     });
   }
@@ -66224,7 +66265,7 @@ class ExchangeAccount {
     });
   }
   async getSellPriceFromStrategy(payload) {
-    const { symbol, reduce_position } = payload;
+    const { symbol, reduce_position, kind } = payload;
     const symbol_config = await this.recomputeSymbolConfig({
       symbol
     });
@@ -66232,7 +66273,13 @@ class ExchangeAccount {
       symbol,
       as_view: true
     });
-    const focus_position = positions.find((k) => k.expand?.account_strategy);
+    const focus_position = positions.find((k) => {
+      let condition = Boolean(k.expand?.account_strategy);
+      if (kind) {
+        condition = condition && k.kind === kind;
+      }
+      return condition;
+    });
     if (!focus_position) {
       return;
     }
@@ -66250,6 +66297,7 @@ class ExchangeAccount {
         avg_price: focus_position.avg_price,
         avg_qty: focus_position.avg_qty
       },
+      pnl: focus_position.target_pnl,
       strategy: {
         reward_factor: strategy.reward_factor,
         risk: strategy.risk,
@@ -66615,7 +66663,8 @@ class App {
     });
     const result = await main_exchange_account.getSellPriceFromStrategy({
       symbol: main_account.symbol,
-      reduce_position
+      reduce_position,
+      kind: main_account.kind
     });
     if (place) {
       await reduce_exchange_account.cancelOrders({

package/package.json

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