@gbozee/ultimate 0.0.2-115 → 0.0.2-117

package/dist/index.cjs

@@ -50323,6 +50323,8 @@ function configure(options) {
 var exports_database = {};
 __export(exports_database, {
   initPocketBaseClient: () => initPocketBaseClient,
+  encryptObject: () => encryptObject,
+  decryptObject: () => decryptObject,
   AppDatabase: () => AppDatabase
 });
 var import_crypto = require("crypto");
@@ -55124,7 +55126,10 @@ class AccountService {
     this.proxyAgent = payload.proxyAgent;
   }
   async getAccount(owner) {
-    const credentials = this.getCredentials(owner, "binance");
+    const credentials = await this.getCredentials({
+      account: owner,
+      exchange: "binance"
+    });
     const email = credentials.email;
     const is_sub_account = owner !== "main_account";
     return {
@@ -56058,6 +56063,9 @@ class BinanceExchange extends BaseExchange {
   async getOpenOrders(payload) {
     return await getOpenOrders(this.client, payload.symbol);
   }
+  async forceClosePosition(symbol, options) {
+    return await forceClosePosition(this.client, symbol, options);
+  }
 }
 function getPricePlaces(target) {
   const numStr = target.toString();
@@ -56067,6 +56075,90 @@ function getPricePlaces(target) {
     return 0;
   }
 }
+async function forceClosePosition(client, symbol, options) {
+  const {
+    kind = "both",
+    price_places = "%.1f",
+    decimal_places = "%.3f"
+  } = options || {};
+  const result = {
+    success: true,
+    closedPositions: [],
+    errors: []
+  };
+  try {
+    const positionInfo = await getPositionInfo(client, symbol);
+    try {
+      await cancelAllOrders(client, symbol, {});
+      console.log(`Cancelled all orders for ${symbol}`);
+    } catch (error) {
+      console.warn(`Warning: Could not cancel orders for ${symbol}:`, error);
+    }
+    const positionsToClose = [];
+    if ((kind === "long" || kind === "both") && positionInfo.long.size > 0) {
+      positionsToClose.push({
+        kind: "long",
+        size: positionInfo.long.size,
+        side: "sell"
+      });
+    }
+    if ((kind === "short" || kind === "both") && positionInfo.short.size > 0) {
+      positionsToClose.push({
+        kind: "short",
+        size: positionInfo.short.size,
+        side: "buy"
+      });
+    }
+    if (positionsToClose.length === 0) {
+      console.log(`No active positions found for ${symbol} (kind: ${kind})`);
+      return result;
+    }
+    for (const position2 of positionsToClose) {
+      try {
+        const order = {
+          kind: position2.kind,
+          side: position2.side,
+          quantity: position2.size,
+          force_market: true
+        };
+        console.log(`Closing ${position2.kind} position for ${symbol}: ${position2.size} units`);
+        const orderResult = await createLimitPurchaseOrders(client, symbol, price_places, decimal_places, [order]);
+        result.closedPositions.push({
+          kind: position2.kind,
+          quantity: position2.size,
+          orderResult
+        });
+        console.log(`Successfully closed ${position2.kind} position for ${symbol}`);
+      } catch (error) {
+        const errorMsg = `Failed to close ${position2.kind} position for ${symbol}: ${error}`;
+        console.error(errorMsg);
+        result.errors.push(errorMsg);
+        result.success = false;
+      }
+    }
+    if (result.success && result.closedPositions.length > 0) {
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+      try {
+        const updatedPositions = await getPositionInfo(client, symbol);
+        const remainingLong = kind === "long" || kind === "both" ? updatedPositions.long.size : 0;
+        const remainingShort = kind === "short" || kind === "both" ? updatedPositions.short.size : 0;
+        if (remainingLong > 0 || remainingShort > 0) {
+          const warningMsg = `Warning: Some positions may still be open after force close for ${symbol}. Long: ${remainingLong}, Short: ${remainingShort}`;
+          console.warn(warningMsg);
+          result.errors.push(warningMsg);
+        }
+      } catch (error) {
+        console.warn(`Could not validate position closure for ${symbol}:`, error);
+      }
+    }
+  } catch (error) {
+    const errorMsg = `Critical error in forceClosePosition for ${symbol}: ${error}`;
+    console.error(errorMsg);
+    result.errors.push(errorMsg);
+    result.success = false;
+  }
+  return result;
+}
 
 // src/exchanges/bybit.ts
 var import_bybit_api = __toESM(require_lib3());
@@ -56179,11 +56271,11 @@ async function getPositionInfo2(client, symbol) {
 async function cancelOrders2(payload) {
   const client = payload.custom_client;
   const results = [];
-  for (let i2 = 0;i2 < payload.orders.length; i2 += 10) {
-    const batch2 = payload.orders.slice(i2, i2 + 10);
+  for (let i2 = 0;i2 < payload.orders.length; i2 += 15) {
+    const batch2 = payload.orders.slice(i2, i2 + 15);
     let rr = await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
     results.push(rr);
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    await new Promise((resolve) => setTimeout(resolve, 1000));
   }
   return results;
 }
@@ -59560,7 +59652,6 @@ class ExchangeAccount {
     const long_position = positions.find((k) => k.kind === "long");
     const short_position = positions.find((k) => k.kind === "short");
     console.log("Getting focus position for ", symbol, kind);
-    const reverse_position = kind === "long" ? short_position : long_position;
     if (strategy2.max_reward_factor === 0) {
       reward_factor = strategy2.reward_factor;
     }
@@ -59617,13 +59708,6 @@ class ExchangeAccount {
       params: config2
     });
     console.log("Checking orders to place for ", symbol, kind);
-    const orders_to_place = await this.placeTrade({
-      symbol,
-      raw: true,
-      kind,
-      place: false,
-      ignore_config: true
-    });
     await this.placeTrade({
       symbol,
       kind,
@@ -59635,9 +59719,6 @@ class ExchangeAccount {
       ...config2,
       ...data
     };
-    let reverse_action = null;
-    let reverse_orders_to_buy = [];
-    let reverse_config = null;
     if (focus_position.avg_qty < last_value.avg_size) {
       console.log("Placing trade for ", symbol, kind);
       await this.placeTrade({
@@ -59648,97 +59729,11 @@ class ExchangeAccount {
       });
     }
     console.log("Checking if focus position has quantity for ", symbol, kind);
-    if (focus_position.quantity > 0) {
-      console.log("Getting details for ", reverse_position.kind);
-      reverse_action = await this.buildOppositeTrades({
-        symbol,
-        kind
-      });
-      if (!reverse_action) {
-        return;
-      }
-      console.log("Updating config for ", symbol, reverse_action.kind);
-      await this.getPositionConfig({
-        symbol,
-        kind: reverse_action.kind,
-        params: {
-          entry: reverse_action.entry,
-          stop: reverse_action.stop,
-          risk: reverse_action.risk_per_trade,
-          profit_percent: reverse_action.profit_percent,
-          risk_reward: reverse_action.risk_reward
-        }
-      });
-      console.log("Checking reverse orders to buy for ", symbol, reverse_action.kind);
-      const reverse_app_config = await this.buildAppConfig({
-        entry: reverse_action.entry,
-        stop: reverse_action.stop,
-        risk_reward: reverse_action.risk_reward,
-        risk: reverse_action.risk_per_trade,
-        symbol
-      });
-      if (reverse_app_config.max_size != reverse_position.avg_qty) {
-        reverse_orders_to_buy = await this.placeTrade({
-          symbol,
-          raw: true,
-          kind: reverse_action.kind,
-          ignore_config: true,
-          place: false
-        });
-        let _reverse_config = {
-          avg: reverse_action.avg,
-          entry: reverse_action.entry,
-          stop: reverse_action.stop,
-          risk_per_trade: reverse_action.risk_per_trade,
-          profit_percent: reverse_action.profit_percent,
-          risk_reward: reverse_action.risk_reward
-        };
-        if (reverse_orders_to_buy.length > 0) {
-          console.log("Placing opposite trade action for ", symbol, reverse_action.kind);
-          let existing = await this.placeOppositeTradeAction({
-            symbol,
-            kind: reverse_action.kind,
-            data: _reverse_config
-          });
-          _reverse_config = {
-            ...existing,
-            ..._reverse_config
-          };
-        }
-        reverse_config = _reverse_config;
-      }
-      if (!reverse_config?.id) {
-        console.log("fetching reverse config for ", symbol, reverse_action.kind);
-        reverse_config = await this.getPositionConfig({
-          symbol,
-          kind: reverse_action.kind
-        });
-      }
-      if (reverse_position.quantity > 0 && reverse_config?.id) {
-        console.log("Checking if reverse position has quantity for ", symbol, reverse_action.kind);
-        const max_size = app_config.max_size * 0.98;
-        if (reverse_config.threshold_qty !== max_size) {
-          await this.app_db.updateScheduledTrade(reverse_config.id, {
-            follow: strategy2.follow,
-            threshold_qty: max_size
-          });
-        }
-        console.log("Updating follow and threshold for ", symbol, reverse_action.kind);
-      } else {
-        await this.app_db.updateScheduledTrade(reverse_config.id, {
-          follow: false
-        });
-      }
-    }
     return {
-      reverse_config,
-      reverse_action,
-      reverse_orders_to_buy,
       positions: {
         long: long_position,
         short: short_position
       },
-      orders_to_place,
       config_details: {
         app_config,
         last_value,

package/dist/index.d.ts

@@ -302,11 +302,13 @@ export interface CandlestickAnalysisResult {
 }
 declare abstract class BaseExchange {
 	client: any;
-	getCredentials: (owner: string) => {
+	getCredentials: (payload: {
+		account: string;
+	}) => Promise<{
 		api_key: string;
 		api_secret: string;
 		email: string;
-	};
+	}>;
 	proxyAgent?: any;
 	constructor(client: any);
 	protected abstract getPositionInfo(symbol: string): Promise<any>;
@@ -508,14 +510,18 @@ declare abstract class BaseExchange {
 		symbol: string;
 	}): Promise<CandlestickAnalysisResult>;
 	setAccountDetails(payload: {
-		getCredentials: (owner: string) => {
+		getCredentials: (payload: {
+			account: string;
+		}) => Promise<{
 			api_key: string;
 			api_secret: string;
 			email: string;
-		};
+		}>;
 		proxyAgent?: any;
 	}): void;
 }
+declare function encryptObject(obj: any, password: string): string;
+declare function decryptObject(encryptedString: string, password: string): any;
 declare function initPocketBaseClient(proxy_credentials: {
 	host: string;
 	email: string;
@@ -2180,41 +2186,6 @@ declare class ExchangeAccount$1 {
 	profitWithinGapStrategy(payload: {
 		symbol: string;
 	}): Promise<{
-		reverse_config: any;
-		reverse_action: {
-			avg: {
-				entry: number;
-				price: number;
-				quantity: number;
-			};
-			loss: number;
-			profit_percent: number;
-			fee: number;
-			risk_per_trade: number;
-			risk_reward: number;
-			symbol?: string;
-			focus: number;
-			budget: number;
-			support: number;
-			resistance: number;
-			percent_change: number;
-			tradeSplit?: number;
-			take_profit?: number;
-			kind: "long" | "short";
-			entry: number;
-			stop: number;
-			min_size: number;
-			price_places?: string;
-			strategy?: "quantity" | "entry";
-			as_array?: boolean;
-			decimal_places?: string;
-			min_profit?: number;
-			raw?: boolean;
-			gap?: number;
-			rr?: number;
-			max_size?: number;
-		};
-		reverse_orders_to_buy: any;
 		positions: {
 			long: PositionsView & {
 				expand?: {
@@ -2227,7 +2198,6 @@ declare class ExchangeAccount$1 {
 				};
 			};
 		};
-		orders_to_place: any;
 		config_details: {
 			app_config: {
 				fee: number;
@@ -2456,41 +2426,6 @@ declare class App {
 		account: ExchangeType;
 		symbol: string;
 	}): Promise<{
-		reverse_config: any;
-		reverse_action: {
-			avg: {
-				entry: number;
-				price: number;
-				quantity: number;
-			};
-			loss: number;
-			profit_percent: number;
-			fee: number;
-			risk_per_trade: number;
-			risk_reward: number;
-			symbol?: string;
-			focus: number;
-			budget: number;
-			support: number;
-			resistance: number;
-			percent_change: number;
-			tradeSplit?: number;
-			take_profit?: number;
-			kind: "long" | "short";
-			entry: number;
-			stop: number;
-			min_size: number;
-			price_places?: string;
-			strategy?: "quantity" | "entry";
-			as_array?: boolean;
-			decimal_places?: string;
-			min_profit?: number;
-			raw?: boolean;
-			gap?: number;
-			rr?: number;
-			max_size?: number;
-		};
-		reverse_orders_to_buy: any;
 		positions: {
 			long: PositionsView & {
 				expand?: {
@@ -2503,7 +2438,6 @@ declare class App {
 				};
 			};
 		};
-		orders_to_place: any;
 		config_details: {
 			app_config: {
 				fee: number;
@@ -2600,7 +2534,7 @@ export declare function initialize(payload: {
 }): Promise<App>;
 
 declare namespace database {
-	export { AppDatabase, ExchangeType, initPocketBaseClient };
+	export { AppDatabase, ExchangeType, decryptObject, encryptObject, initPocketBaseClient };
 }
 declare namespace exchange_account {
 	export { ExchangeAccount$1 as ExchangeAccount, getExchangeAccount };

package/dist/index.js

@@ -50268,6 +50268,8 @@ function configure(options) {
 var exports_database = {};
 __export(exports_database, {
   initPocketBaseClient: () => initPocketBaseClient,
+  encryptObject: () => encryptObject,
+  decryptObject: () => decryptObject,
   AppDatabase: () => AppDatabase
 });
 var import_https_proxy_agent = __toESM(require_dist2(), 1);
@@ -55074,7 +55076,10 @@ class AccountService {
     this.proxyAgent = payload.proxyAgent;
   }
   async getAccount(owner) {
-    const credentials = this.getCredentials(owner, "binance");
+    const credentials = await this.getCredentials({
+      account: owner,
+      exchange: "binance"
+    });
     const email = credentials.email;
     const is_sub_account = owner !== "main_account";
     return {
@@ -56008,6 +56013,9 @@ class BinanceExchange extends BaseExchange {
   async getOpenOrders(payload) {
     return await getOpenOrders(this.client, payload.symbol);
   }
+  async forceClosePosition(symbol, options) {
+    return await forceClosePosition(this.client, symbol, options);
+  }
 }
 function getPricePlaces(target) {
   const numStr = target.toString();
@@ -56017,6 +56025,90 @@ function getPricePlaces(target) {
     return 0;
   }
 }
+async function forceClosePosition(client, symbol, options) {
+  const {
+    kind = "both",
+    price_places = "%.1f",
+    decimal_places = "%.3f"
+  } = options || {};
+  const result = {
+    success: true,
+    closedPositions: [],
+    errors: []
+  };
+  try {
+    const positionInfo = await getPositionInfo(client, symbol);
+    try {
+      await cancelAllOrders(client, symbol, {});
+      console.log(`Cancelled all orders for ${symbol}`);
+    } catch (error) {
+      console.warn(`Warning: Could not cancel orders for ${symbol}:`, error);
+    }
+    const positionsToClose = [];
+    if ((kind === "long" || kind === "both") && positionInfo.long.size > 0) {
+      positionsToClose.push({
+        kind: "long",
+        size: positionInfo.long.size,
+        side: "sell"
+      });
+    }
+    if ((kind === "short" || kind === "both") && positionInfo.short.size > 0) {
+      positionsToClose.push({
+        kind: "short",
+        size: positionInfo.short.size,
+        side: "buy"
+      });
+    }
+    if (positionsToClose.length === 0) {
+      console.log(`No active positions found for ${symbol} (kind: ${kind})`);
+      return result;
+    }
+    for (const position2 of positionsToClose) {
+      try {
+        const order = {
+          kind: position2.kind,
+          side: position2.side,
+          quantity: position2.size,
+          force_market: true
+        };
+        console.log(`Closing ${position2.kind} position for ${symbol}: ${position2.size} units`);
+        const orderResult = await createLimitPurchaseOrders(client, symbol, price_places, decimal_places, [order]);
+        result.closedPositions.push({
+          kind: position2.kind,
+          quantity: position2.size,
+          orderResult
+        });
+        console.log(`Successfully closed ${position2.kind} position for ${symbol}`);
+      } catch (error) {
+        const errorMsg = `Failed to close ${position2.kind} position for ${symbol}: ${error}`;
+        console.error(errorMsg);
+        result.errors.push(errorMsg);
+        result.success = false;
+      }
+    }
+    if (result.success && result.closedPositions.length > 0) {
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+      try {
+        const updatedPositions = await getPositionInfo(client, symbol);
+        const remainingLong = kind === "long" || kind === "both" ? updatedPositions.long.size : 0;
+        const remainingShort = kind === "short" || kind === "both" ? updatedPositions.short.size : 0;
+        if (remainingLong > 0 || remainingShort > 0) {
+          const warningMsg = `Warning: Some positions may still be open after force close for ${symbol}. Long: ${remainingLong}, Short: ${remainingShort}`;
+          console.warn(warningMsg);
+          result.errors.push(warningMsg);
+        }
+      } catch (error) {
+        console.warn(`Could not validate position closure for ${symbol}:`, error);
+      }
+    }
+  } catch (error) {
+    const errorMsg = `Critical error in forceClosePosition for ${symbol}: ${error}`;
+    console.error(errorMsg);
+    result.errors.push(errorMsg);
+    result.success = false;
+  }
+  return result;
+}
 
 // src/exchanges/bybit.ts
 var import_bybit_api = __toESM(require_lib3(), 1);
@@ -56129,11 +56221,11 @@ async function getPositionInfo2(client, symbol) {
 async function cancelOrders2(payload) {
   const client = payload.custom_client;
   const results = [];
-  for (let i2 = 0;i2 < payload.orders.length; i2 += 10) {
-    const batch2 = payload.orders.slice(i2, i2 + 10);
+  for (let i2 = 0;i2 < payload.orders.length; i2 += 15) {
+    const batch2 = payload.orders.slice(i2, i2 + 15);
     let rr = await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
     results.push(rr);
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    await new Promise((resolve) => setTimeout(resolve, 1000));
   }
   return results;
 }
@@ -59510,7 +59602,6 @@ class ExchangeAccount {
     const long_position = positions.find((k) => k.kind === "long");
     const short_position = positions.find((k) => k.kind === "short");
     console.log("Getting focus position for ", symbol, kind);
-    const reverse_position = kind === "long" ? short_position : long_position;
     if (strategy2.max_reward_factor === 0) {
       reward_factor = strategy2.reward_factor;
     }
@@ -59567,13 +59658,6 @@ class ExchangeAccount {
       params: config2
     });
     console.log("Checking orders to place for ", symbol, kind);
-    const orders_to_place = await this.placeTrade({
-      symbol,
-      raw: true,
-      kind,
-      place: false,
-      ignore_config: true
-    });
     await this.placeTrade({
       symbol,
       kind,
@@ -59585,9 +59669,6 @@ class ExchangeAccount {
       ...config2,
       ...data
     };
-    let reverse_action = null;
-    let reverse_orders_to_buy = [];
-    let reverse_config = null;
     if (focus_position.avg_qty < last_value.avg_size) {
       console.log("Placing trade for ", symbol, kind);
       await this.placeTrade({
@@ -59598,97 +59679,11 @@ class ExchangeAccount {
       });
     }
     console.log("Checking if focus position has quantity for ", symbol, kind);
-    if (focus_position.quantity > 0) {
-      console.log("Getting details for ", reverse_position.kind);
-      reverse_action = await this.buildOppositeTrades({
-        symbol,
-        kind
-      });
-      if (!reverse_action) {
-        return;
-      }
-      console.log("Updating config for ", symbol, reverse_action.kind);
-      await this.getPositionConfig({
-        symbol,
-        kind: reverse_action.kind,
-        params: {
-          entry: reverse_action.entry,
-          stop: reverse_action.stop,
-          risk: reverse_action.risk_per_trade,
-          profit_percent: reverse_action.profit_percent,
-          risk_reward: reverse_action.risk_reward
-        }
-      });
-      console.log("Checking reverse orders to buy for ", symbol, reverse_action.kind);
-      const reverse_app_config = await this.buildAppConfig({
-        entry: reverse_action.entry,
-        stop: reverse_action.stop,
-        risk_reward: reverse_action.risk_reward,
-        risk: reverse_action.risk_per_trade,
-        symbol
-      });
-      if (reverse_app_config.max_size != reverse_position.avg_qty) {
-        reverse_orders_to_buy = await this.placeTrade({
-          symbol,
-          raw: true,
-          kind: reverse_action.kind,
-          ignore_config: true,
-          place: false
-        });
-        let _reverse_config = {
-          avg: reverse_action.avg,
-          entry: reverse_action.entry,
-          stop: reverse_action.stop,
-          risk_per_trade: reverse_action.risk_per_trade,
-          profit_percent: reverse_action.profit_percent,
-          risk_reward: reverse_action.risk_reward
-        };
-        if (reverse_orders_to_buy.length > 0) {
-          console.log("Placing opposite trade action for ", symbol, reverse_action.kind);
-          let existing = await this.placeOppositeTradeAction({
-            symbol,
-            kind: reverse_action.kind,
-            data: _reverse_config
-          });
-          _reverse_config = {
-            ...existing,
-            ..._reverse_config
-          };
-        }
-        reverse_config = _reverse_config;
-      }
-      if (!reverse_config?.id) {
-        console.log("fetching reverse config for ", symbol, reverse_action.kind);
-        reverse_config = await this.getPositionConfig({
-          symbol,
-          kind: reverse_action.kind
-        });
-      }
-      if (reverse_position.quantity > 0 && reverse_config?.id) {
-        console.log("Checking if reverse position has quantity for ", symbol, reverse_action.kind);
-        const max_size = app_config.max_size * 0.98;
-        if (reverse_config.threshold_qty !== max_size) {
-          await this.app_db.updateScheduledTrade(reverse_config.id, {
-            follow: strategy2.follow,
-            threshold_qty: max_size
-          });
-        }
-        console.log("Updating follow and threshold for ", symbol, reverse_action.kind);
-      } else {
-        await this.app_db.updateScheduledTrade(reverse_config.id, {
-          follow: false
-        });
-      }
-    }
     return {
-      reverse_config,
-      reverse_action,
-      reverse_orders_to_buy,
       positions: {
         long: long_position,
         short: short_position
       },
-      orders_to_place,
       config_details: {
         app_config,
         last_value,

package/dist/mcp-server.cjs

@@ -61804,7 +61804,10 @@ class AccountService {
     this.proxyAgent = payload.proxyAgent;
   }
   async getAccount(owner) {
-    const credentials = this.getCredentials(owner, "binance");
+    const credentials = await this.getCredentials({
+      account: owner,
+      exchange: "binance"
+    });
     const email = credentials.email;
     const is_sub_account = owner !== "main_account";
     return {
@@ -62738,6 +62741,9 @@ class BinanceExchange extends BaseExchange {
   async getOpenOrders(payload) {
     return await getOpenOrders(this.client, payload.symbol);
   }
+  async forceClosePosition(symbol, options) {
+    return await forceClosePosition(this.client, symbol, options);
+  }
 }
 function getPricePlaces(target) {
   const numStr = target.toString();
@@ -62747,6 +62753,90 @@ function getPricePlaces(target) {
     return 0;
   }
 }
+async function forceClosePosition(client, symbol, options) {
+  const {
+    kind = "both",
+    price_places = "%.1f",
+    decimal_places = "%.3f"
+  } = options || {};
+  const result = {
+    success: true,
+    closedPositions: [],
+    errors: []
+  };
+  try {
+    const positionInfo = await getPositionInfo(client, symbol);
+    try {
+      await cancelAllOrders(client, symbol, {});
+      console.log(`Cancelled all orders for ${symbol}`);
+    } catch (error) {
+      console.warn(`Warning: Could not cancel orders for ${symbol}:`, error);
+    }
+    const positionsToClose = [];
+    if ((kind === "long" || kind === "both") && positionInfo.long.size > 0) {
+      positionsToClose.push({
+        kind: "long",
+        size: positionInfo.long.size,
+        side: "sell"
+      });
+    }
+    if ((kind === "short" || kind === "both") && positionInfo.short.size > 0) {
+      positionsToClose.push({
+        kind: "short",
+        size: positionInfo.short.size,
+        side: "buy"
+      });
+    }
+    if (positionsToClose.length === 0) {
+      console.log(`No active positions found for ${symbol} (kind: ${kind})`);
+      return result;
+    }
+    for (const position2 of positionsToClose) {
+      try {
+        const order = {
+          kind: position2.kind,
+          side: position2.side,
+          quantity: position2.size,
+          force_market: true
+        };
+        console.log(`Closing ${position2.kind} position for ${symbol}: ${position2.size} units`);
+        const orderResult = await createLimitPurchaseOrders(client, symbol, price_places, decimal_places, [order]);
+        result.closedPositions.push({
+          kind: position2.kind,
+          quantity: position2.size,
+          orderResult
+        });
+        console.log(`Successfully closed ${position2.kind} position for ${symbol}`);
+      } catch (error) {
+        const errorMsg = `Failed to close ${position2.kind} position for ${symbol}: ${error}`;
+        console.error(errorMsg);
+        result.errors.push(errorMsg);
+        result.success = false;
+      }
+    }
+    if (result.success && result.closedPositions.length > 0) {
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+      try {
+        const updatedPositions = await getPositionInfo(client, symbol);
+        const remainingLong = kind === "long" || kind === "both" ? updatedPositions.long.size : 0;
+        const remainingShort = kind === "short" || kind === "both" ? updatedPositions.short.size : 0;
+        if (remainingLong > 0 || remainingShort > 0) {
+          const warningMsg = `Warning: Some positions may still be open after force close for ${symbol}. Long: ${remainingLong}, Short: ${remainingShort}`;
+          console.warn(warningMsg);
+          result.errors.push(warningMsg);
+        }
+      } catch (error) {
+        console.warn(`Could not validate position closure for ${symbol}:`, error);
+      }
+    }
+  } catch (error) {
+    const errorMsg = `Critical error in forceClosePosition for ${symbol}: ${error}`;
+    console.error(errorMsg);
+    result.errors.push(errorMsg);
+    result.success = false;
+  }
+  return result;
+}
 
 // src/exchanges/bybit.ts
 var import_bybit_api = __toESM(require_lib3());
@@ -62859,11 +62949,11 @@ async function getPositionInfo2(client, symbol) {
 async function cancelOrders2(payload) {
   const client = payload.custom_client;
   const results = [];
-  for (let i2 = 0;i2 < payload.orders.length; i2 += 10) {
-    const batch2 = payload.orders.slice(i2, i2 + 10);
+  for (let i2 = 0;i2 < payload.orders.length; i2 += 15) {
+    const batch2 = payload.orders.slice(i2, i2 + 15);
     let rr = await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
     results.push(rr);
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    await new Promise((resolve) => setTimeout(resolve, 1000));
   }
   return results;
 }
@@ -66240,7 +66330,6 @@ class ExchangeAccount {
     const long_position = positions.find((k) => k.kind === "long");
     const short_position = positions.find((k) => k.kind === "short");
     console.log("Getting focus position for ", symbol, kind);
-    const reverse_position = kind === "long" ? short_position : long_position;
     if (strategy2.max_reward_factor === 0) {
       reward_factor = strategy2.reward_factor;
     }
@@ -66297,13 +66386,6 @@ class ExchangeAccount {
       params: config2
     });
     console.log("Checking orders to place for ", symbol, kind);
-    const orders_to_place = await this.placeTrade({
-      symbol,
-      raw: true,
-      kind,
-      place: false,
-      ignore_config: true
-    });
     await this.placeTrade({
       symbol,
       kind,
@@ -66315,9 +66397,6 @@ class ExchangeAccount {
       ...config2,
       ...data
     };
-    let reverse_action = null;
-    let reverse_orders_to_buy = [];
-    let reverse_config = null;
     if (focus_position.avg_qty < last_value.avg_size) {
       console.log("Placing trade for ", symbol, kind);
       await this.placeTrade({
@@ -66328,97 +66407,11 @@ class ExchangeAccount {
       });
     }
     console.log("Checking if focus position has quantity for ", symbol, kind);
-    if (focus_position.quantity > 0) {
-      console.log("Getting details for ", reverse_position.kind);
-      reverse_action = await this.buildOppositeTrades({
-        symbol,
-        kind
-      });
-      if (!reverse_action) {
-        return;
-      }
-      console.log("Updating config for ", symbol, reverse_action.kind);
-      await this.getPositionConfig({
-        symbol,
-        kind: reverse_action.kind,
-        params: {
-          entry: reverse_action.entry,
-          stop: reverse_action.stop,
-          risk: reverse_action.risk_per_trade,
-          profit_percent: reverse_action.profit_percent,
-          risk_reward: reverse_action.risk_reward
-        }
-      });
-      console.log("Checking reverse orders to buy for ", symbol, reverse_action.kind);
-      const reverse_app_config = await this.buildAppConfig({
-        entry: reverse_action.entry,
-        stop: reverse_action.stop,
-        risk_reward: reverse_action.risk_reward,
-        risk: reverse_action.risk_per_trade,
-        symbol
-      });
-      if (reverse_app_config.max_size != reverse_position.avg_qty) {
-        reverse_orders_to_buy = await this.placeTrade({
-          symbol,
-          raw: true,
-          kind: reverse_action.kind,
-          ignore_config: true,
-          place: false
-        });
-        let _reverse_config = {
-          avg: reverse_action.avg,
-          entry: reverse_action.entry,
-          stop: reverse_action.stop,
-          risk_per_trade: reverse_action.risk_per_trade,
-          profit_percent: reverse_action.profit_percent,
-          risk_reward: reverse_action.risk_reward
-        };
-        if (reverse_orders_to_buy.length > 0) {
-          console.log("Placing opposite trade action for ", symbol, reverse_action.kind);
-          let existing = await this.placeOppositeTradeAction({
-            symbol,
-            kind: reverse_action.kind,
-            data: _reverse_config
-          });
-          _reverse_config = {
-            ...existing,
-            ..._reverse_config
-          };
-        }
-        reverse_config = _reverse_config;
-      }
-      if (!reverse_config?.id) {
-        console.log("fetching reverse config for ", symbol, reverse_action.kind);
-        reverse_config = await this.getPositionConfig({
-          symbol,
-          kind: reverse_action.kind
-        });
-      }
-      if (reverse_position.quantity > 0 && reverse_config?.id) {
-        console.log("Checking if reverse position has quantity for ", symbol, reverse_action.kind);
-        const max_size = app_config.max_size * 0.98;
-        if (reverse_config.threshold_qty !== max_size) {
-          await this.app_db.updateScheduledTrade(reverse_config.id, {
-            follow: strategy2.follow,
-            threshold_qty: max_size
-          });
-        }
-        console.log("Updating follow and threshold for ", symbol, reverse_action.kind);
-      } else {
-        await this.app_db.updateScheduledTrade(reverse_config.id, {
-          follow: false
-        });
-      }
-    }
     return {
-      reverse_config,
-      reverse_action,
-      reverse_orders_to_buy,
       positions: {
         long: long_position,
         short: short_position
       },
-      orders_to_place,
       config_details: {
         app_config,
         last_value,

package/dist/mcp-server.js

@@ -61781,7 +61781,10 @@ class AccountService {
     this.proxyAgent = payload.proxyAgent;
   }
   async getAccount(owner) {
-    const credentials = this.getCredentials(owner, "binance");
+    const credentials = await this.getCredentials({
+      account: owner,
+      exchange: "binance"
+    });
     const email = credentials.email;
     const is_sub_account = owner !== "main_account";
     return {
@@ -62715,6 +62718,9 @@ class BinanceExchange extends BaseExchange {
   async getOpenOrders(payload) {
     return await getOpenOrders(this.client, payload.symbol);
   }
+  async forceClosePosition(symbol, options) {
+    return await forceClosePosition(this.client, symbol, options);
+  }
 }
 function getPricePlaces(target) {
   const numStr = target.toString();
@@ -62724,6 +62730,90 @@ function getPricePlaces(target) {
     return 0;
   }
 }
+async function forceClosePosition(client, symbol, options) {
+  const {
+    kind = "both",
+    price_places = "%.1f",
+    decimal_places = "%.3f"
+  } = options || {};
+  const result = {
+    success: true,
+    closedPositions: [],
+    errors: []
+  };
+  try {
+    const positionInfo = await getPositionInfo(client, symbol);
+    try {
+      await cancelAllOrders(client, symbol, {});
+      console.log(`Cancelled all orders for ${symbol}`);
+    } catch (error) {
+      console.warn(`Warning: Could not cancel orders for ${symbol}:`, error);
+    }
+    const positionsToClose = [];
+    if ((kind === "long" || kind === "both") && positionInfo.long.size > 0) {
+      positionsToClose.push({
+        kind: "long",
+        size: positionInfo.long.size,
+        side: "sell"
+      });
+    }
+    if ((kind === "short" || kind === "both") && positionInfo.short.size > 0) {
+      positionsToClose.push({
+        kind: "short",
+        size: positionInfo.short.size,
+        side: "buy"
+      });
+    }
+    if (positionsToClose.length === 0) {
+      console.log(`No active positions found for ${symbol} (kind: ${kind})`);
+      return result;
+    }
+    for (const position2 of positionsToClose) {
+      try {
+        const order = {
+          kind: position2.kind,
+          side: position2.side,
+          quantity: position2.size,
+          force_market: true
+        };
+        console.log(`Closing ${position2.kind} position for ${symbol}: ${position2.size} units`);
+        const orderResult = await createLimitPurchaseOrders(client, symbol, price_places, decimal_places, [order]);
+        result.closedPositions.push({
+          kind: position2.kind,
+          quantity: position2.size,
+          orderResult
+        });
+        console.log(`Successfully closed ${position2.kind} position for ${symbol}`);
+      } catch (error) {
+        const errorMsg = `Failed to close ${position2.kind} position for ${symbol}: ${error}`;
+        console.error(errorMsg);
+        result.errors.push(errorMsg);
+        result.success = false;
+      }
+    }
+    if (result.success && result.closedPositions.length > 0) {
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+      try {
+        const updatedPositions = await getPositionInfo(client, symbol);
+        const remainingLong = kind === "long" || kind === "both" ? updatedPositions.long.size : 0;
+        const remainingShort = kind === "short" || kind === "both" ? updatedPositions.short.size : 0;
+        if (remainingLong > 0 || remainingShort > 0) {
+          const warningMsg = `Warning: Some positions may still be open after force close for ${symbol}. Long: ${remainingLong}, Short: ${remainingShort}`;
+          console.warn(warningMsg);
+          result.errors.push(warningMsg);
+        }
+      } catch (error) {
+        console.warn(`Could not validate position closure for ${symbol}:`, error);
+      }
+    }
+  } catch (error) {
+    const errorMsg = `Critical error in forceClosePosition for ${symbol}: ${error}`;
+    console.error(errorMsg);
+    result.errors.push(errorMsg);
+    result.success = false;
+  }
+  return result;
+}
 
 // src/exchanges/bybit.ts
 var import_bybit_api = __toESM(require_lib3(), 1);
@@ -62836,11 +62926,11 @@ async function getPositionInfo2(client, symbol) {
 async function cancelOrders2(payload) {
   const client = payload.custom_client;
   const results = [];
-  for (let i2 = 0;i2 < payload.orders.length; i2 += 10) {
-    const batch2 = payload.orders.slice(i2, i2 + 10);
+  for (let i2 = 0;i2 < payload.orders.length; i2 += 15) {
+    const batch2 = payload.orders.slice(i2, i2 + 15);
     let rr = await client.batchCancelOrders("linear", batch2.map((x) => ({ orderId: x.orderId, symbol: payload.symbol })));
     results.push(rr);
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    await new Promise((resolve) => setTimeout(resolve, 1000));
   }
   return results;
 }
@@ -66217,7 +66307,6 @@ class ExchangeAccount {
     const long_position = positions.find((k) => k.kind === "long");
     const short_position = positions.find((k) => k.kind === "short");
     console.log("Getting focus position for ", symbol, kind);
-    const reverse_position = kind === "long" ? short_position : long_position;
     if (strategy2.max_reward_factor === 0) {
       reward_factor = strategy2.reward_factor;
     }
@@ -66274,13 +66363,6 @@ class ExchangeAccount {
       params: config2
     });
     console.log("Checking orders to place for ", symbol, kind);
-    const orders_to_place = await this.placeTrade({
-      symbol,
-      raw: true,
-      kind,
-      place: false,
-      ignore_config: true
-    });
     await this.placeTrade({
       symbol,
       kind,
@@ -66292,9 +66374,6 @@ class ExchangeAccount {
       ...config2,
       ...data
     };
-    let reverse_action = null;
-    let reverse_orders_to_buy = [];
-    let reverse_config = null;
     if (focus_position.avg_qty < last_value.avg_size) {
       console.log("Placing trade for ", symbol, kind);
       await this.placeTrade({
@@ -66305,97 +66384,11 @@ class ExchangeAccount {
       });
     }
     console.log("Checking if focus position has quantity for ", symbol, kind);
-    if (focus_position.quantity > 0) {
-      console.log("Getting details for ", reverse_position.kind);
-      reverse_action = await this.buildOppositeTrades({
-        symbol,
-        kind
-      });
-      if (!reverse_action) {
-        return;
-      }
-      console.log("Updating config for ", symbol, reverse_action.kind);
-      await this.getPositionConfig({
-        symbol,
-        kind: reverse_action.kind,
-        params: {
-          entry: reverse_action.entry,
-          stop: reverse_action.stop,
-          risk: reverse_action.risk_per_trade,
-          profit_percent: reverse_action.profit_percent,
-          risk_reward: reverse_action.risk_reward
-        }
-      });
-      console.log("Checking reverse orders to buy for ", symbol, reverse_action.kind);
-      const reverse_app_config = await this.buildAppConfig({
-        entry: reverse_action.entry,
-        stop: reverse_action.stop,
-        risk_reward: reverse_action.risk_reward,
-        risk: reverse_action.risk_per_trade,
-        symbol
-      });
-      if (reverse_app_config.max_size != reverse_position.avg_qty) {
-        reverse_orders_to_buy = await this.placeTrade({
-          symbol,
-          raw: true,
-          kind: reverse_action.kind,
-          ignore_config: true,
-          place: false
-        });
-        let _reverse_config = {
-          avg: reverse_action.avg,
-          entry: reverse_action.entry,
-          stop: reverse_action.stop,
-          risk_per_trade: reverse_action.risk_per_trade,
-          profit_percent: reverse_action.profit_percent,
-          risk_reward: reverse_action.risk_reward
-        };
-        if (reverse_orders_to_buy.length > 0) {
-          console.log("Placing opposite trade action for ", symbol, reverse_action.kind);
-          let existing = await this.placeOppositeTradeAction({
-            symbol,
-            kind: reverse_action.kind,
-            data: _reverse_config
-          });
-          _reverse_config = {
-            ...existing,
-            ..._reverse_config
-          };
-        }
-        reverse_config = _reverse_config;
-      }
-      if (!reverse_config?.id) {
-        console.log("fetching reverse config for ", symbol, reverse_action.kind);
-        reverse_config = await this.getPositionConfig({
-          symbol,
-          kind: reverse_action.kind
-        });
-      }
-      if (reverse_position.quantity > 0 && reverse_config?.id) {
-        console.log("Checking if reverse position has quantity for ", symbol, reverse_action.kind);
-        const max_size = app_config.max_size * 0.98;
-        if (reverse_config.threshold_qty !== max_size) {
-          await this.app_db.updateScheduledTrade(reverse_config.id, {
-            follow: strategy2.follow,
-            threshold_qty: max_size
-          });
-        }
-        console.log("Updating follow and threshold for ", symbol, reverse_action.kind);
-      } else {
-        await this.app_db.updateScheduledTrade(reverse_config.id, {
-          follow: false
-        });
-      }
-    }
     return {
-      reverse_config,
-      reverse_action,
-      reverse_orders_to_buy,
       positions: {
         long: long_position,
         short: short_position
       },
-      orders_to_place,
       config_details: {
         app_config,
         last_value,

package/package.json

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