@gbozee/ultimate 0.0.2-77 → 0.0.2-79

package/dist/frontend-index.js

@@ -1203,9 +1203,7 @@ function buildConfig(app_config, {
   }
   const condition = (kind === "long" ? entry > app_config.support : entry >= app_config.support) && stop >= app_config.support * 0.999;
   if (kind === "short") {
-    console.log("condition", condition, entry === stop);
   }
-  console.log({ entry, support: app_config.support, stop });
   const result = entry === stop ? [] : condition ? instance.build_entry({
     current_price: entry,
     stop_loss: stop,
@@ -1534,7 +1532,6 @@ function generateOptimumAppConfig(config, payload, position2) {
   const tolerance = 0.1;
   const max_iterations = 150;
   let iterations = 0;
-  console.log(`Starting risk search for ${position2.kind} position. Target Entry: ${position2.entry}, Initial Risk Range: [${low_risk}, ${high_risk}]`);
   while (high_risk - low_risk > tolerance && iterations < max_iterations) {
     iterations++;
     const mid_risk = (low_risk + high_risk) / 2;
@@ -1580,9 +1577,7 @@ function generateOptimumAppConfig(config, payload, position2) {
       price_places: current_app_config.price_places,
       decimal_places: current_app_config.decimal_places
     });
-    console.log(`Iteration ${iterations}: Risk=${mid_risk.toFixed(2)}, Low=${low_risk.toFixed(2)}, High=${high_risk.toFixed(2)}`);
     if (full_trades.length === 0) {
-      console.log(`  -> No trades generated by sortedBuildConfig at Risk=${mid_risk.toFixed(2)}. Adjusting high_risk down.`);
       high_risk = mid_risk;
       continue;
     }
@@ -1595,29 +1590,23 @@ function generateOptimumAppConfig(config, payload, position2) {
       existingOrders: []
     });
     if (trades.length === 0) {
-      console.log(`  -> No trades met quantity requirement after filtering at Risk=${mid_risk.toFixed(2)}. Adjusting low_risk up.`);
       low_risk = mid_risk;
       continue;
     }
     const last_trade = trades[trades.length - 1];
     const last_entry = last_trade.entry;
-    console.log(`  -> Last Trade Entry (Filtered): ${last_entry.toFixed(4)}`);
     if (position2.kind === "long") {
       if (last_entry > position2.entry) {
-        console.log(`  -> Constraint VIOLATED (Long): last_entry (${last_entry.toFixed(4)}) > position.entry (${position2.entry.toFixed(4)}). Reducing high_risk.`);
         high_risk = mid_risk;
       } else {
-        console.log(`  -> Constraint MET (Long): last_entry (${last_entry.toFixed(4)}) <= position.entry (${position2.entry.toFixed(4)}). Storing as best, increasing low_risk.`);
         best_risk = mid_risk;
         best_app_config = current_app_config;
         low_risk = mid_risk;
       }
     } else {
       if (last_entry < position2.entry) {
-        console.log(`  -> Constraint VIOLATED (Short): last_entry (${last_entry.toFixed(4)}) < position.entry (${position2.entry.toFixed(4)}). Reducing high_risk.`);
         high_risk = mid_risk;
       } else {
-        console.log(`  -> Constraint MET (Short): last_entry (${last_entry.toFixed(4)}) >= position.entry (${position2.entry.toFixed(4)}). Storing as best, increasing low_risk.`);
         best_risk = mid_risk;
         best_app_config = current_app_config;
         low_risk = mid_risk;
@@ -1854,7 +1843,6 @@ class Strategy {
       quantity,
       kind
     };
-    console.log({ second_payload, third_payload });
     const app_config = generateOptimumAppConfig(this.config.global_config, second_payload, third_payload);
     let entries = [];
     let risk_per_trade = this.config.budget;
@@ -1867,6 +1855,7 @@ class Strategy {
       if (ignore_entries) {
         entries = [];
       }
+      console.log({ app_config });
     }
     const risk = this.to_f(risk_per_trade);
     let below_reverse_entries = kind === "long" ? entries.filter((u) => {

package/dist/index.cjs

@@ -51509,6 +51509,18 @@ class AppDatabase {
       await this.saveCredentials(password, credentials);
     }
   }
+  async getAccountWithActivePositions() {
+    const positions = await this.pb.collection("positions").getFullList({
+      filter: `quantity > 0`,
+      fields: `account`
+    });
+    const accounts = Array.from(new Set(positions.map((p) => p.account)));
+    const filter = accounts.map((a) => `id = "${a}"`).join(" || ");
+    const account_instances = await this.pb.collection("exchange_accounts").getFullList({
+      filter
+    });
+    return account_instances;
+  }
   async getAllSymbolsFromPositions(options) {
     const { no_position = false, kind = "long", custom_filter } = options || {};
     let filter = custom_filter || (no_position ? `quantity = 0` : undefined);
@@ -53262,9 +53274,7 @@ function buildConfig(app_config, {
   }
   const condition = (kind === "long" ? entry > app_config.support : entry >= app_config.support) && stop >= app_config.support * 0.999;
   if (kind === "short") {
-    console.log("condition", condition, entry === stop);
   }
-  console.log({ entry, support: app_config.support, stop });
   const result = entry === stop ? [] : condition ? instance.build_entry({
     current_price: entry,
     stop_loss: stop,
@@ -53593,7 +53603,6 @@ function generateOptimumAppConfig(config2, payload, position2) {
   const tolerance = 0.1;
   const max_iterations = 150;
   let iterations = 0;
-  console.log(`Starting risk search for ${position2.kind} position. Target Entry: ${position2.entry}, Initial Risk Range: [${low_risk}, ${high_risk}]`);
   while (high_risk - low_risk > tolerance && iterations < max_iterations) {
     iterations++;
     const mid_risk = (low_risk + high_risk) / 2;
@@ -53639,9 +53648,7 @@ function generateOptimumAppConfig(config2, payload, position2) {
       price_places: current_app_config.price_places,
       decimal_places: current_app_config.decimal_places
     });
-    console.log(`Iteration ${iterations}: Risk=${mid_risk.toFixed(2)}, Low=${low_risk.toFixed(2)}, High=${high_risk.toFixed(2)}`);
     if (full_trades.length === 0) {
-      console.log(`  -> No trades generated by sortedBuildConfig at Risk=${mid_risk.toFixed(2)}. Adjusting high_risk down.`);
       high_risk = mid_risk;
       continue;
     }
@@ -53654,29 +53661,23 @@ function generateOptimumAppConfig(config2, payload, position2) {
       existingOrders: []
     });
     if (trades.length === 0) {
-      console.log(`  -> No trades met quantity requirement after filtering at Risk=${mid_risk.toFixed(2)}. Adjusting low_risk up.`);
       low_risk = mid_risk;
       continue;
     }
     const last_trade = trades[trades.length - 1];
     const last_entry = last_trade.entry;
-    console.log(`  -> Last Trade Entry (Filtered): ${last_entry.toFixed(4)}`);
     if (position2.kind === "long") {
       if (last_entry > position2.entry) {
-        console.log(`  -> Constraint VIOLATED (Long): last_entry (${last_entry.toFixed(4)}) > position.entry (${position2.entry.toFixed(4)}). Reducing high_risk.`);
         high_risk = mid_risk;
       } else {
-        console.log(`  -> Constraint MET (Long): last_entry (${last_entry.toFixed(4)}) <= position.entry (${position2.entry.toFixed(4)}). Storing as best, increasing low_risk.`);
         best_risk = mid_risk;
         best_app_config = current_app_config;
         low_risk = mid_risk;
       }
     } else {
       if (last_entry < position2.entry) {
-        console.log(`  -> Constraint VIOLATED (Short): last_entry (${last_entry.toFixed(4)}) < position.entry (${position2.entry.toFixed(4)}). Reducing high_risk.`);
         high_risk = mid_risk;
       } else {
-        console.log(`  -> Constraint MET (Short): last_entry (${last_entry.toFixed(4)}) >= position.entry (${position2.entry.toFixed(4)}). Storing as best, increasing low_risk.`);
         best_risk = mid_risk;
         best_app_config = current_app_config;
         low_risk = mid_risk;
@@ -53914,7 +53915,6 @@ class Strategy {
       quantity,
       kind
     };
-    console.log({ second_payload, third_payload });
     const app_config = generateOptimumAppConfig(this.config.global_config, second_payload, third_payload);
     let entries = [];
     let risk_per_trade = this.config.budget;
@@ -53927,6 +53927,7 @@ class Strategy {
       if (ignore_entries) {
         entries = [];
       }
+      console.log({ app_config });
     }
     const risk = this.to_f(risk_per_trade);
     let below_reverse_entries = kind === "long" ? entries.filter((u) => {
@@ -58001,8 +58002,42 @@ class ExchangeAccount {
     }
     return 0;
   }
+  async placeOppositeTradeAction(payload) {
+    const { symbol, kind, data } = payload;
+    const position2 = await this.syncAccount({
+      symbol,
+      kind,
+      as_view: true
+    });
+    if (position2.avg_qty !== data.avg.quantity) {
+      const config2 = await this.getPositionConfig({
+        symbol,
+        kind
+      });
+      await this.app_db.updateScheduledTrade(config2.id, {
+        entry: data.entry,
+        stop: data.stop,
+        risk: data.risk_per_trade,
+        profit_percent: data.profit_percent,
+        risk_reward: data.risk_reward
+      });
+      await this.placeTrade({
+        symbol,
+        kind,
+        place: true,
+        ignore_config: true
+      });
+      await this.placeTrade({
+        symbol,
+        kind,
+        place: true,
+        stop: true,
+        ignore_config: true
+      });
+    }
+  }
   async buildOppositeTrades(payload) {
-    const { symbol, kind, place } = payload;
+    const { symbol, kind, place, place_symbol } = payload;
     const strategy = await this.runSimulation({
       symbol,
       kind,
@@ -58013,37 +58048,12 @@ class ExchangeAccount {
       avg_entry: strategy.position[kind].avg_price
     });
     if (place && result?.kind) {
-      const position2 = await this.syncAccount({
-        symbol,
+      const _symbol = place_symbol || symbol;
+      await this.placeOppositeTradeAction({
+        symbol: _symbol,
         kind: result.kind,
-        as_view: true
+        data: result
       });
-      if (position2.avg_qty !== result.avg.quantity) {
-        const config2 = await this.getPositionConfig({
-          symbol,
-          kind: result.kind
-        });
-        await this.app_db.updateScheduledTrade(config2.id, {
-          entry: result.entry,
-          stop: result.stop,
-          risk: result.risk_per_trade,
-          profit_percent: result.profit_percent,
-          risk_reward: result.risk_reward
-        });
-        await this.placeTrade({
-          symbol,
-          kind: result.kind,
-          place: true,
-          ignore_config: true
-        });
-        await this.placeTrade({
-          symbol,
-          kind: result.kind,
-          place: true,
-          stop: true,
-          ignore_config: true
-        });
-      }
     }
     return result;
   }
@@ -58651,6 +58661,7 @@ class ExchangeAccount {
       kind,
       place,
       tp,
+      limit = true,
       raw: _raw,
       cancel,
       stop,
@@ -58663,13 +58674,14 @@ class ExchangeAccount {
         kind
       });
     }
-    if (place) {
+    if (limit) {
       return await this.triggerTradeFromConfig({
         symbol,
         kind,
         raw: payload.raw,
         stop,
-        ignore_config
+        ignore_config,
+        place
       });
     }
     await this.syncAccount({
@@ -58996,7 +59008,7 @@ class App {
     return await this.app_db.getMoverExchangeInstances();
   }
   async updateTpOnAllMarkets() {
-    const move_instances = await this.getMoverExchangeInstances();
+    const move_instances = await this.app_db.getAccountWithActivePositions();
     for (const instance of move_instances) {
       const params = {
         account: {

package/dist/index.d.ts

@@ -340,6 +340,7 @@ export declare class AppDatabase {
 		api_key: string;
 		api_secret: string;
 	}): Promise<void>;
+	getAccountWithActivePositions(): Promise<import("pocketbase").RecordModel[]>;
 	getAllSymbolsFromPositions(options?: {
 		no_position?: boolean;
 		kind?: "long" | "short";
@@ -1494,10 +1495,26 @@ declare class ExchangeAccount$1 {
 		symbol: string;
 		kind: "long" | "short";
 	}): Promise<number>;
+	placeOppositeTradeAction(payload: {
+		symbol: string;
+		kind: "long" | "short";
+		data: {
+			avg: {
+				quantity: number;
+				price: number;
+			};
+			entry: number;
+			stop: number;
+			risk_per_trade: number;
+			profit_percent: number;
+			risk_reward: number;
+		};
+	}): Promise<void>;
 	buildOppositeTrades(payload: {
 		symbol: string;
 		kind: "long" | "short";
 		place?: boolean;
+		place_symbol?: string;
 	}): Promise<{
 		avg: {
 			entry: number;
@@ -1635,6 +1652,7 @@ declare class ExchangeAccount$1 {
 		symbol: string;
 		kind: "long" | "short";
 		place?: boolean;
+		limit?: boolean;
 		tp?: boolean;
 		stop?: boolean;
 		raw?: boolean;

package/dist/index.js

@@ -51464,6 +51464,18 @@ class AppDatabase {
       await this.saveCredentials(password, credentials);
     }
   }
+  async getAccountWithActivePositions() {
+    const positions = await this.pb.collection("positions").getFullList({
+      filter: `quantity > 0`,
+      fields: `account`
+    });
+    const accounts = Array.from(new Set(positions.map((p) => p.account)));
+    const filter = accounts.map((a) => `id = "${a}"`).join(" || ");
+    const account_instances = await this.pb.collection("exchange_accounts").getFullList({
+      filter
+    });
+    return account_instances;
+  }
   async getAllSymbolsFromPositions(options) {
     const { no_position = false, kind = "long", custom_filter } = options || {};
     let filter = custom_filter || (no_position ? `quantity = 0` : undefined);
@@ -53217,9 +53229,7 @@ function buildConfig(app_config, {
   }
   const condition = (kind === "long" ? entry > app_config.support : entry >= app_config.support) && stop >= app_config.support * 0.999;
   if (kind === "short") {
-    console.log("condition", condition, entry === stop);
   }
-  console.log({ entry, support: app_config.support, stop });
   const result = entry === stop ? [] : condition ? instance.build_entry({
     current_price: entry,
     stop_loss: stop,
@@ -53548,7 +53558,6 @@ function generateOptimumAppConfig(config2, payload, position2) {
   const tolerance = 0.1;
   const max_iterations = 150;
   let iterations = 0;
-  console.log(`Starting risk search for ${position2.kind} position. Target Entry: ${position2.entry}, Initial Risk Range: [${low_risk}, ${high_risk}]`);
   while (high_risk - low_risk > tolerance && iterations < max_iterations) {
     iterations++;
     const mid_risk = (low_risk + high_risk) / 2;
@@ -53594,9 +53603,7 @@ function generateOptimumAppConfig(config2, payload, position2) {
       price_places: current_app_config.price_places,
       decimal_places: current_app_config.decimal_places
     });
-    console.log(`Iteration ${iterations}: Risk=${mid_risk.toFixed(2)}, Low=${low_risk.toFixed(2)}, High=${high_risk.toFixed(2)}`);
     if (full_trades.length === 0) {
-      console.log(`  -> No trades generated by sortedBuildConfig at Risk=${mid_risk.toFixed(2)}. Adjusting high_risk down.`);
       high_risk = mid_risk;
       continue;
     }
@@ -53609,29 +53616,23 @@ function generateOptimumAppConfig(config2, payload, position2) {
       existingOrders: []
     });
     if (trades.length === 0) {
-      console.log(`  -> No trades met quantity requirement after filtering at Risk=${mid_risk.toFixed(2)}. Adjusting low_risk up.`);
       low_risk = mid_risk;
       continue;
     }
     const last_trade = trades[trades.length - 1];
     const last_entry = last_trade.entry;
-    console.log(`  -> Last Trade Entry (Filtered): ${last_entry.toFixed(4)}`);
     if (position2.kind === "long") {
       if (last_entry > position2.entry) {
-        console.log(`  -> Constraint VIOLATED (Long): last_entry (${last_entry.toFixed(4)}) > position.entry (${position2.entry.toFixed(4)}). Reducing high_risk.`);
         high_risk = mid_risk;
       } else {
-        console.log(`  -> Constraint MET (Long): last_entry (${last_entry.toFixed(4)}) <= position.entry (${position2.entry.toFixed(4)}). Storing as best, increasing low_risk.`);
         best_risk = mid_risk;
         best_app_config = current_app_config;
         low_risk = mid_risk;
       }
     } else {
       if (last_entry < position2.entry) {
-        console.log(`  -> Constraint VIOLATED (Short): last_entry (${last_entry.toFixed(4)}) < position.entry (${position2.entry.toFixed(4)}). Reducing high_risk.`);
         high_risk = mid_risk;
       } else {
-        console.log(`  -> Constraint MET (Short): last_entry (${last_entry.toFixed(4)}) >= position.entry (${position2.entry.toFixed(4)}). Storing as best, increasing low_risk.`);
         best_risk = mid_risk;
         best_app_config = current_app_config;
         low_risk = mid_risk;
@@ -53869,7 +53870,6 @@ class Strategy {
       quantity,
       kind
     };
-    console.log({ second_payload, third_payload });
     const app_config = generateOptimumAppConfig(this.config.global_config, second_payload, third_payload);
     let entries = [];
     let risk_per_trade = this.config.budget;
@@ -53882,6 +53882,7 @@ class Strategy {
       if (ignore_entries) {
         entries = [];
       }
+      console.log({ app_config });
     }
     const risk = this.to_f(risk_per_trade);
     let below_reverse_entries = kind === "long" ? entries.filter((u) => {
@@ -57956,8 +57957,42 @@ class ExchangeAccount {
     }
     return 0;
   }
+  async placeOppositeTradeAction(payload) {
+    const { symbol, kind, data } = payload;
+    const position2 = await this.syncAccount({
+      symbol,
+      kind,
+      as_view: true
+    });
+    if (position2.avg_qty !== data.avg.quantity) {
+      const config2 = await this.getPositionConfig({
+        symbol,
+        kind
+      });
+      await this.app_db.updateScheduledTrade(config2.id, {
+        entry: data.entry,
+        stop: data.stop,
+        risk: data.risk_per_trade,
+        profit_percent: data.profit_percent,
+        risk_reward: data.risk_reward
+      });
+      await this.placeTrade({
+        symbol,
+        kind,
+        place: true,
+        ignore_config: true
+      });
+      await this.placeTrade({
+        symbol,
+        kind,
+        place: true,
+        stop: true,
+        ignore_config: true
+      });
+    }
+  }
   async buildOppositeTrades(payload) {
-    const { symbol, kind, place } = payload;
+    const { symbol, kind, place, place_symbol } = payload;
     const strategy = await this.runSimulation({
       symbol,
       kind,
@@ -57968,37 +58003,12 @@ class ExchangeAccount {
       avg_entry: strategy.position[kind].avg_price
     });
     if (place && result?.kind) {
-      const position2 = await this.syncAccount({
-        symbol,
+      const _symbol = place_symbol || symbol;
+      await this.placeOppositeTradeAction({
+        symbol: _symbol,
         kind: result.kind,
-        as_view: true
+        data: result
       });
-      if (position2.avg_qty !== result.avg.quantity) {
-        const config2 = await this.getPositionConfig({
-          symbol,
-          kind: result.kind
-        });
-        await this.app_db.updateScheduledTrade(config2.id, {
-          entry: result.entry,
-          stop: result.stop,
-          risk: result.risk_per_trade,
-          profit_percent: result.profit_percent,
-          risk_reward: result.risk_reward
-        });
-        await this.placeTrade({
-          symbol,
-          kind: result.kind,
-          place: true,
-          ignore_config: true
-        });
-        await this.placeTrade({
-          symbol,
-          kind: result.kind,
-          place: true,
-          stop: true,
-          ignore_config: true
-        });
-      }
     }
     return result;
   }
@@ -58606,6 +58616,7 @@ class ExchangeAccount {
       kind,
       place,
       tp,
+      limit = true,
       raw: _raw,
       cancel,
       stop,
@@ -58618,13 +58629,14 @@ class ExchangeAccount {
         kind
       });
     }
-    if (place) {
+    if (limit) {
       return await this.triggerTradeFromConfig({
         symbol,
         kind,
         raw: payload.raw,
         stop,
-        ignore_config
+        ignore_config,
+        place
       });
     }
     await this.syncAccount({
@@ -58951,7 +58963,7 @@ class App {
     return await this.app_db.getMoverExchangeInstances();
   }
   async updateTpOnAllMarkets() {
-    const move_instances = await this.getMoverExchangeInstances();
+    const move_instances = await this.app_db.getAccountWithActivePositions();
     for (const instance of move_instances) {
       const params = {
         account: {

package/dist/mcp-server.cjs

@@ -58220,6 +58220,18 @@ class AppDatabase {
       await this.saveCredentials(password, credentials);
     }
   }
+  async getAccountWithActivePositions() {
+    const positions = await this.pb.collection("positions").getFullList({
+      filter: `quantity > 0`,
+      fields: `account`
+    });
+    const accounts = Array.from(new Set(positions.map((p) => p.account)));
+    const filter = accounts.map((a) => `id = "${a}"`).join(" || ");
+    const account_instances = await this.pb.collection("exchange_accounts").getFullList({
+      filter
+    });
+    return account_instances;
+  }
   async getAllSymbolsFromPositions(options) {
     const { no_position = false, kind = "long", custom_filter } = options || {};
     let filter = custom_filter || (no_position ? `quantity = 0` : undefined);
@@ -59966,9 +59978,7 @@ function buildConfig(app_config, {
   }
   const condition = (kind === "long" ? entry > app_config.support : entry >= app_config.support) && stop >= app_config.support * 0.999;
   if (kind === "short") {
-    console.log("condition", condition, entry === stop);
   }
-  console.log({ entry, support: app_config.support, stop });
   const result = entry === stop ? [] : condition ? instance.build_entry({
     current_price: entry,
     stop_loss: stop,
@@ -60284,7 +60294,6 @@ function generateOptimumAppConfig(config2, payload, position2) {
   const tolerance = 0.1;
   const max_iterations = 150;
   let iterations = 0;
-  console.log(`Starting risk search for ${position2.kind} position. Target Entry: ${position2.entry}, Initial Risk Range: [${low_risk}, ${high_risk}]`);
   while (high_risk - low_risk > tolerance && iterations < max_iterations) {
     iterations++;
     const mid_risk = (low_risk + high_risk) / 2;
@@ -60330,9 +60339,7 @@ function generateOptimumAppConfig(config2, payload, position2) {
       price_places: current_app_config.price_places,
       decimal_places: current_app_config.decimal_places
     });
-    console.log(`Iteration ${iterations}: Risk=${mid_risk.toFixed(2)}, Low=${low_risk.toFixed(2)}, High=${high_risk.toFixed(2)}`);
     if (full_trades.length === 0) {
-      console.log(`  -> No trades generated by sortedBuildConfig at Risk=${mid_risk.toFixed(2)}. Adjusting high_risk down.`);
       high_risk = mid_risk;
       continue;
     }
@@ -60345,29 +60352,23 @@ function generateOptimumAppConfig(config2, payload, position2) {
       existingOrders: []
     });
     if (trades.length === 0) {
-      console.log(`  -> No trades met quantity requirement after filtering at Risk=${mid_risk.toFixed(2)}. Adjusting low_risk up.`);
       low_risk = mid_risk;
       continue;
     }
     const last_trade = trades[trades.length - 1];
     const last_entry = last_trade.entry;
-    console.log(`  -> Last Trade Entry (Filtered): ${last_entry.toFixed(4)}`);
     if (position2.kind === "long") {
       if (last_entry > position2.entry) {
-        console.log(`  -> Constraint VIOLATED (Long): last_entry (${last_entry.toFixed(4)}) > position.entry (${position2.entry.toFixed(4)}). Reducing high_risk.`);
         high_risk = mid_risk;
       } else {
-        console.log(`  -> Constraint MET (Long): last_entry (${last_entry.toFixed(4)}) <= position.entry (${position2.entry.toFixed(4)}). Storing as best, increasing low_risk.`);
         best_risk = mid_risk;
         best_app_config = current_app_config;
         low_risk = mid_risk;
       }
     } else {
       if (last_entry < position2.entry) {
-        console.log(`  -> Constraint VIOLATED (Short): last_entry (${last_entry.toFixed(4)}) < position.entry (${position2.entry.toFixed(4)}). Reducing high_risk.`);
         high_risk = mid_risk;
       } else {
-        console.log(`  -> Constraint MET (Short): last_entry (${last_entry.toFixed(4)}) >= position.entry (${position2.entry.toFixed(4)}). Storing as best, increasing low_risk.`);
         best_risk = mid_risk;
         best_app_config = current_app_config;
         low_risk = mid_risk;
@@ -60605,7 +60606,6 @@ class Strategy {
       quantity,
       kind
     };
-    console.log({ second_payload, third_payload });
     const app_config = generateOptimumAppConfig(this.config.global_config, second_payload, third_payload);
     let entries = [];
     let risk_per_trade = this.config.budget;
@@ -60618,6 +60618,7 @@ class Strategy {
       if (ignore_entries) {
         entries = [];
       }
+      console.log({ app_config });
     }
     const risk = this.to_f(risk_per_trade);
     let below_reverse_entries = kind === "long" ? entries.filter((u) => {
@@ -64692,8 +64693,42 @@ class ExchangeAccount {
     }
     return 0;
   }
+  async placeOppositeTradeAction(payload) {
+    const { symbol, kind, data } = payload;
+    const position2 = await this.syncAccount({
+      symbol,
+      kind,
+      as_view: true
+    });
+    if (position2.avg_qty !== data.avg.quantity) {
+      const config2 = await this.getPositionConfig({
+        symbol,
+        kind
+      });
+      await this.app_db.updateScheduledTrade(config2.id, {
+        entry: data.entry,
+        stop: data.stop,
+        risk: data.risk_per_trade,
+        profit_percent: data.profit_percent,
+        risk_reward: data.risk_reward
+      });
+      await this.placeTrade({
+        symbol,
+        kind,
+        place: true,
+        ignore_config: true
+      });
+      await this.placeTrade({
+        symbol,
+        kind,
+        place: true,
+        stop: true,
+        ignore_config: true
+      });
+    }
+  }
   async buildOppositeTrades(payload) {
-    const { symbol, kind, place } = payload;
+    const { symbol, kind, place, place_symbol } = payload;
     const strategy = await this.runSimulation({
       symbol,
       kind,
@@ -64704,37 +64739,12 @@ class ExchangeAccount {
       avg_entry: strategy.position[kind].avg_price
     });
     if (place && result?.kind) {
-      const position2 = await this.syncAccount({
-        symbol,
+      const _symbol = place_symbol || symbol;
+      await this.placeOppositeTradeAction({
+        symbol: _symbol,
         kind: result.kind,
-        as_view: true
+        data: result
       });
-      if (position2.avg_qty !== result.avg.quantity) {
-        const config2 = await this.getPositionConfig({
-          symbol,
-          kind: result.kind
-        });
-        await this.app_db.updateScheduledTrade(config2.id, {
-          entry: result.entry,
-          stop: result.stop,
-          risk: result.risk_per_trade,
-          profit_percent: result.profit_percent,
-          risk_reward: result.risk_reward
-        });
-        await this.placeTrade({
-          symbol,
-          kind: result.kind,
-          place: true,
-          ignore_config: true
-        });
-        await this.placeTrade({
-          symbol,
-          kind: result.kind,
-          place: true,
-          stop: true,
-          ignore_config: true
-        });
-      }
     }
     return result;
   }
@@ -65342,6 +65352,7 @@ class ExchangeAccount {
       kind,
       place,
       tp,
+      limit = true,
       raw: _raw,
       cancel,
       stop,
@@ -65354,13 +65365,14 @@ class ExchangeAccount {
         kind
       });
     }
-    if (place) {
+    if (limit) {
       return await this.triggerTradeFromConfig({
         symbol,
         kind,
         raw: payload.raw,
         stop,
-        ignore_config
+        ignore_config,
+        place
       });
     }
     await this.syncAccount({
@@ -65687,7 +65699,7 @@ class App {
     return await this.app_db.getMoverExchangeInstances();
   }
   async updateTpOnAllMarkets() {
-    const move_instances = await this.getMoverExchangeInstances();
+    const move_instances = await this.app_db.getAccountWithActivePositions();
     for (const instance of move_instances) {
       const params = {
         account: {

package/dist/mcp-server.js

@@ -58197,6 +58197,18 @@ class AppDatabase {
       await this.saveCredentials(password, credentials);
     }
   }
+  async getAccountWithActivePositions() {
+    const positions = await this.pb.collection("positions").getFullList({
+      filter: `quantity > 0`,
+      fields: `account`
+    });
+    const accounts = Array.from(new Set(positions.map((p) => p.account)));
+    const filter = accounts.map((a) => `id = "${a}"`).join(" || ");
+    const account_instances = await this.pb.collection("exchange_accounts").getFullList({
+      filter
+    });
+    return account_instances;
+  }
   async getAllSymbolsFromPositions(options) {
     const { no_position = false, kind = "long", custom_filter } = options || {};
     let filter = custom_filter || (no_position ? `quantity = 0` : undefined);
@@ -59943,9 +59955,7 @@ function buildConfig(app_config, {
   }
   const condition = (kind === "long" ? entry > app_config.support : entry >= app_config.support) && stop >= app_config.support * 0.999;
   if (kind === "short") {
-    console.log("condition", condition, entry === stop);
   }
-  console.log({ entry, support: app_config.support, stop });
   const result = entry === stop ? [] : condition ? instance.build_entry({
     current_price: entry,
     stop_loss: stop,
@@ -60261,7 +60271,6 @@ function generateOptimumAppConfig(config2, payload, position2) {
   const tolerance = 0.1;
   const max_iterations = 150;
   let iterations = 0;
-  console.log(`Starting risk search for ${position2.kind} position. Target Entry: ${position2.entry}, Initial Risk Range: [${low_risk}, ${high_risk}]`);
   while (high_risk - low_risk > tolerance && iterations < max_iterations) {
     iterations++;
     const mid_risk = (low_risk + high_risk) / 2;
@@ -60307,9 +60316,7 @@ function generateOptimumAppConfig(config2, payload, position2) {
       price_places: current_app_config.price_places,
       decimal_places: current_app_config.decimal_places
     });
-    console.log(`Iteration ${iterations}: Risk=${mid_risk.toFixed(2)}, Low=${low_risk.toFixed(2)}, High=${high_risk.toFixed(2)}`);
     if (full_trades.length === 0) {
-      console.log(`  -> No trades generated by sortedBuildConfig at Risk=${mid_risk.toFixed(2)}. Adjusting high_risk down.`);
       high_risk = mid_risk;
       continue;
     }
@@ -60322,29 +60329,23 @@ function generateOptimumAppConfig(config2, payload, position2) {
       existingOrders: []
     });
     if (trades.length === 0) {
-      console.log(`  -> No trades met quantity requirement after filtering at Risk=${mid_risk.toFixed(2)}. Adjusting low_risk up.`);
       low_risk = mid_risk;
       continue;
     }
     const last_trade = trades[trades.length - 1];
     const last_entry = last_trade.entry;
-    console.log(`  -> Last Trade Entry (Filtered): ${last_entry.toFixed(4)}`);
     if (position2.kind === "long") {
       if (last_entry > position2.entry) {
-        console.log(`  -> Constraint VIOLATED (Long): last_entry (${last_entry.toFixed(4)}) > position.entry (${position2.entry.toFixed(4)}). Reducing high_risk.`);
         high_risk = mid_risk;
       } else {
-        console.log(`  -> Constraint MET (Long): last_entry (${last_entry.toFixed(4)}) <= position.entry (${position2.entry.toFixed(4)}). Storing as best, increasing low_risk.`);
         best_risk = mid_risk;
         best_app_config = current_app_config;
         low_risk = mid_risk;
       }
     } else {
       if (last_entry < position2.entry) {
-        console.log(`  -> Constraint VIOLATED (Short): last_entry (${last_entry.toFixed(4)}) < position.entry (${position2.entry.toFixed(4)}). Reducing high_risk.`);
         high_risk = mid_risk;
       } else {
-        console.log(`  -> Constraint MET (Short): last_entry (${last_entry.toFixed(4)}) >= position.entry (${position2.entry.toFixed(4)}). Storing as best, increasing low_risk.`);
         best_risk = mid_risk;
         best_app_config = current_app_config;
         low_risk = mid_risk;
@@ -60582,7 +60583,6 @@ class Strategy {
       quantity,
       kind
     };
-    console.log({ second_payload, third_payload });
     const app_config = generateOptimumAppConfig(this.config.global_config, second_payload, third_payload);
     let entries = [];
     let risk_per_trade = this.config.budget;
@@ -60595,6 +60595,7 @@ class Strategy {
       if (ignore_entries) {
         entries = [];
       }
+      console.log({ app_config });
     }
     const risk = this.to_f(risk_per_trade);
     let below_reverse_entries = kind === "long" ? entries.filter((u) => {
@@ -64669,8 +64670,42 @@ class ExchangeAccount {
     }
     return 0;
   }
+  async placeOppositeTradeAction(payload) {
+    const { symbol, kind, data } = payload;
+    const position2 = await this.syncAccount({
+      symbol,
+      kind,
+      as_view: true
+    });
+    if (position2.avg_qty !== data.avg.quantity) {
+      const config2 = await this.getPositionConfig({
+        symbol,
+        kind
+      });
+      await this.app_db.updateScheduledTrade(config2.id, {
+        entry: data.entry,
+        stop: data.stop,
+        risk: data.risk_per_trade,
+        profit_percent: data.profit_percent,
+        risk_reward: data.risk_reward
+      });
+      await this.placeTrade({
+        symbol,
+        kind,
+        place: true,
+        ignore_config: true
+      });
+      await this.placeTrade({
+        symbol,
+        kind,
+        place: true,
+        stop: true,
+        ignore_config: true
+      });
+    }
+  }
   async buildOppositeTrades(payload) {
-    const { symbol, kind, place } = payload;
+    const { symbol, kind, place, place_symbol } = payload;
     const strategy = await this.runSimulation({
       symbol,
       kind,
@@ -64681,37 +64716,12 @@ class ExchangeAccount {
       avg_entry: strategy.position[kind].avg_price
     });
     if (place && result?.kind) {
-      const position2 = await this.syncAccount({
-        symbol,
+      const _symbol = place_symbol || symbol;
+      await this.placeOppositeTradeAction({
+        symbol: _symbol,
         kind: result.kind,
-        as_view: true
+        data: result
       });
-      if (position2.avg_qty !== result.avg.quantity) {
-        const config2 = await this.getPositionConfig({
-          symbol,
-          kind: result.kind
-        });
-        await this.app_db.updateScheduledTrade(config2.id, {
-          entry: result.entry,
-          stop: result.stop,
-          risk: result.risk_per_trade,
-          profit_percent: result.profit_percent,
-          risk_reward: result.risk_reward
-        });
-        await this.placeTrade({
-          symbol,
-          kind: result.kind,
-          place: true,
-          ignore_config: true
-        });
-        await this.placeTrade({
-          symbol,
-          kind: result.kind,
-          place: true,
-          stop: true,
-          ignore_config: true
-        });
-      }
     }
     return result;
   }
@@ -65319,6 +65329,7 @@ class ExchangeAccount {
       kind,
       place,
       tp,
+      limit = true,
       raw: _raw,
       cancel,
       stop,
@@ -65331,13 +65342,14 @@ class ExchangeAccount {
         kind
       });
     }
-    if (place) {
+    if (limit) {
       return await this.triggerTradeFromConfig({
         symbol,
         kind,
         raw: payload.raw,
         stop,
-        ignore_config
+        ignore_config,
+        place
       });
     }
     await this.syncAccount({
@@ -65664,7 +65676,7 @@ class App {
     return await this.app_db.getMoverExchangeInstances();
   }
   async updateTpOnAllMarkets() {
-    const move_instances = await this.getMoverExchangeInstances();
+    const move_instances = await this.app_db.getAccountWithActivePositions();
     for (const instance of move_instances) {
       const params = {
         account: {

package/package.json

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