@backtest-kit/cli 3.8.0 → 5.0.0

package/build/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import * as BacktestKit from 'backtest-kit';
-import { Storage, Notification, Markdown, Report, StorageLive, StorageBacktest, NotificationLive, NotificationBacktest, setConfig, Log, listExchangeSchema, addExchangeSchema, roundTicks, listFrameSchema, addFrameSchema, listenDoneLive, listenDoneBacktest, shutdown, listenSignal, listStrategySchema, overrideExchangeSchema, Backtest, Live, getCandles, checkCandles, warmCandles, listenRisk, listenStrategyCommit } from 'backtest-kit';
-import { getErrorMessage, errorData, singleshot, str, BehaviorSubject, compose, execpool, queued, sleep, randomString, createAwaiter, TIMEOUT_SYMBOL, typo, retry, memoize, trycatch } from 'functools-kit';
+import { Storage, Notification, Markdown, Report, StorageLive, StorageBacktest, NotificationLive, NotificationBacktest, setConfig, Log, listExchangeSchema, addExchangeSchema, roundTicks, listFrameSchema, addFrameSchema, listenDoneLive, listenDoneBacktest, shutdown, listenSignal, listStrategySchema, overrideExchangeSchema, Backtest, Live, getCandles, checkCandles, warmCandles, listenRisk, listenStrategyCommit, listenSync } from 'backtest-kit';
+import { getErrorMessage, errorData, singleshot, str, BehaviorSubject, compose, execpool, queued, sleep, randomString, createAwaiter, TIMEOUT_SYMBOL, typo, retry, trycatch, memoize } from 'functools-kit';
 import fs, { constants } from 'fs';
 import * as stackTrace from 'stack-trace';
 import { fileURLToPath, pathToFileURL } from 'url';
@@ -200,7 +200,6 @@ const schemaServices$1 = {
 const providerServices$1 = {
     frontendProviderService: Symbol('frontendProviderService'),
     telegramProviderService: Symbol('telegramProviderService'),
-    liveProviderService: Symbol('liveProviderService'),
 };
 const webServices$1 = {
     telegramWebService: Symbol('telegramWebService'),
@@ -586,6 +585,7 @@ class BacktestMainService {
         this.cacheLogicService = inject(TYPES.cacheLogicService);
         this.frontendProviderService = inject(TYPES.frontendProviderService);
         this.telegramProviderService = inject(TYPES.telegramProviderService);
+        this.moduleConnectionService = inject(TYPES.moduleConnectionService);
         this.run = singleshot(async (payload) => {
             this.loggerService.log("backtestMainService run", {
                 payload,
@@ -634,6 +634,7 @@ class BacktestMainService {
                 });
                 notifyVerbose();
             }
+            await this.moduleConnectionService.loadModule("./backtest.module");
             Backtest.background(symbol, {
                 strategyName,
                 frameName,
@@ -677,7 +678,7 @@ class LiveMainService {
         this.symbolSchemaService = inject(TYPES.symbolSchemaService);
         this.frontendProviderService = inject(TYPES.frontendProviderService);
         this.telegramProviderService = inject(TYPES.telegramProviderService);
-        this.liveProviderService = inject(TYPES.liveProviderService);
+        this.moduleConnectionService = inject(TYPES.moduleConnectionService);
         this.run = singleshot(async (payload) => {
             this.loggerService.log("liveMainService run", {
                 payload,
@@ -685,7 +686,6 @@ class LiveMainService {
             {
                 this.frontendProviderService.connect();
                 this.telegramProviderService.connect();
-                this.liveProviderService.connect();
             }
             await this.resolveService.attachEntryPoint(payload.entryPoint);
             {
@@ -714,6 +714,7 @@ class LiveMainService {
                 });
                 notifyVerbose();
             }
+            await this.moduleConnectionService.loadModule("./live.module");
             Live.background(symbol, {
                 strategyName,
                 exchangeName,
@@ -752,6 +753,7 @@ class PaperMainService {
         this.symbolSchemaService = inject(TYPES.symbolSchemaService);
         this.frontendProviderService = inject(TYPES.frontendProviderService);
         this.telegramProviderService = inject(TYPES.telegramProviderService);
+        this.moduleConnectionService = inject(TYPES.moduleConnectionService);
         this.run = singleshot(async (payload) => {
             this.loggerService.log("paperMainService init");
             {
@@ -785,6 +787,7 @@ class PaperMainService {
                 });
                 notifyVerbose();
             }
+            await this.moduleConnectionService.loadModule("./paper.module");
             Live.background(symbol, {
                 strategyName,
                 exchangeName,
@@ -1487,6 +1490,26 @@ class TelegramLogicService {
                 markdown,
             });
         };
+        this.notifySignalOpen = trycatch(async (event) => {
+            this.loggerService.log("telegramLogicService notifySignalOpen", {
+                event,
+            });
+            const markdown = await this.telegramTemplateService.getSignalOpenMarkdown(event);
+            await this.telegramWebService.publishNotify({
+                symbol: event.symbol,
+                markdown,
+            });
+        });
+        this.notifySignalClose = trycatch(async (event) => {
+            this.loggerService.log("telegramLogicService notifySignalClose", {
+                event,
+            });
+            const markdown = await this.telegramTemplateService.getSignalCloseMarkdown(event);
+            await this.telegramWebService.publishNotify({
+                symbol: event.symbol,
+                markdown,
+            });
+        });
         this.connect = singleshot(() => {
             this.loggerService.log("telegramLogicService connect");
             const unRisk = listenRisk(async (event) => {
@@ -1536,8 +1559,18 @@ class TelegramLogicService {
                     return;
                 }
             });
+            const unSync = listenSync(async (event) => {
+                if (event.action === "signal-open") {
+                    await this.notifySignalOpen(event);
+                    return;
+                }
+                if (event.action === "signal-close") {
+                    await this.notifySignalClose(event);
+                    return;
+                }
+            });
             const unConnect = () => this.connect.clear();
-            const unListen = compose(() => unRisk(), () => unSignal(), () => unCommit(), () => unConnect());
+            const unListen = compose(() => unRisk(), () => unSignal(), () => unCommit(), () => unSync(), () => unConnect());
             return () => {
                 STOP_BOT_FN();
                 unListen();
@@ -1632,6 +1665,18 @@ class TelegramTemplateService {
             });
             return await RENDER_TEMPLATE_FN("average-buy.mustache", event, this);
         };
+        this.getSignalOpenMarkdown = async (event) => {
+            this.loggerService.log("telegramTemplateService getSignalOpenMarkdown", {
+                event,
+            });
+            return await RENDER_TEMPLATE_FN("signal-open.mustache", event, this);
+        };
+        this.getSignalCloseMarkdown = async (event) => {
+            this.loggerService.log("telegramTemplateService getSignalCloseMarkdown", {
+                event,
+            });
+            return await RENDER_TEMPLATE_FN("signal-close.mustache", event, this);
+        };
     }
 }
 
@@ -1650,39 +1695,36 @@ const getExtVariants = (fileName) => {
 };
 const REQUIRE_MODULE_FACTORY = (fileName) => {
     {
-        return null;
+        return false;
     }
 };
 const IMPORT_MODULE_FACTORY = async (fileName) => {
     for (const variant of getExtVariants(fileName)) {
         try {
-            return await import(pathToFileURL(variant).href);
+            await import(pathToFileURL(variant).href);
+            return true;
         }
         catch {
             continue;
         }
     }
-    return null;
+    return false;
 };
 const BABEL_MODULE_FACTORY = async (fileName, self) => {
     for (const variant of getExtVariants(fileName)) {
         try {
             const code = await fs$1.readFile(variant, "utf-8");
-            const { exports } = self.babelService.transpileAndRun(code);
-            if (exports.default) {
-                return exports.default;
-            }
-            return exports;
+            self.babelService.transpileAndRun(code);
+            return true;
         }
         catch (error) {
             console.log(getErrorMessage(error));
             continue;
         }
     }
-    return null;
+    return false;
 };
 const LOAD_MODULE_MODULE_FN = async (fileName, self) => {
-    let Ctor = null;
     const overridePath = path.join(self.resolveService.OVERRIDE_MODULES_DIR, fileName);
     const targetPath = path.join(process.cwd(), "modules", fileName);
     const hasOverride = await fs$1
@@ -1690,212 +1732,29 @@ const LOAD_MODULE_MODULE_FN = async (fileName, self) => {
         .then(() => true)
         .catch(() => false);
     const resolvedFile = hasOverride ? overridePath : targetPath;
-    if ((Ctor = REQUIRE_MODULE_FACTORY())) {
-        return typeof Ctor === "function" ? new Ctor() : Ctor;
+    if (REQUIRE_MODULE_FACTORY()) {
+        return true;
     }
-    if ((Ctor = await IMPORT_MODULE_FACTORY(resolvedFile))) {
-        return typeof Ctor === "function" ? new Ctor() : Ctor;
+    if (await IMPORT_MODULE_FACTORY(resolvedFile)) {
+        return true;
     }
-    if ((Ctor = await BABEL_MODULE_FACTORY(resolvedFile, self))) {
-        return typeof Ctor === "function" ? new Ctor() : Ctor;
+    if (await BABEL_MODULE_FACTORY(resolvedFile, self)) {
+        return true;
     }
-    throw new Error(`Module module import failed for file: ${resolvedFile}`);
+    console.warn(`Module module import failed for file: ${resolvedFile}`);
+    return false;
 };
 class ModuleConnectionService {
     constructor() {
         this.loggerService = inject(TYPES.loggerService);
         this.resolveService = inject(TYPES.resolveService);
         this.babelService = inject(TYPES.babelService);
-        this.getInstance = memoize(([fileName]) => `${fileName}`, async (fileName) => {
+        this.loadModule = async (fileName) => {
             this.loggerService.log("moduleConnectionService getInstance", {
                 fileName,
             });
             return await LOAD_MODULE_MODULE_FN(fileName, this);
-        });
-    }
-}
-
-const LOAD_INSTANCE_FN = singleshot(trycatch(async (self) => {
-    const module = (await self.moduleConnectionService.getInstance("./live.module"));
-    return module;
-}, { defaultValue: null }));
-class LiveProviderService {
-    constructor() {
-        this.loggerService = inject(TYPES.loggerService);
-        this.moduleConnectionService = inject(TYPES.moduleConnectionService);
-        this.handleTrailingTake = async (event) => {
-            this.loggerService.log("liveProviderService handleTrailingTake", {
-                event,
-            });
-            const instance = await LOAD_INSTANCE_FN(this);
-            if (instance?.onTrailingTake) {
-                await instance.onTrailingTake(event);
-            }
-        };
-        this.handleTrailingStop = async (event) => {
-            this.loggerService.log("liveProviderService handleTrailingStop", {
-                event,
-            });
-            const instance = await LOAD_INSTANCE_FN(this);
-            if (instance?.onTrailingStop) {
-                await instance.onTrailingStop(event);
-            }
-        };
-        this.handleBreakeven = async (event) => {
-            this.loggerService.log("liveProviderService handleBreakeven", {
-                event,
-            });
-            const instance = await LOAD_INSTANCE_FN(this);
-            if (instance?.onBreakeven) {
-                await instance.onBreakeven(event);
-            }
         };
-        this.handlePartialProfit = async (event) => {
-            this.loggerService.log("liveProviderService handlePartialProfit", {
-                event,
-            });
-            const instance = await LOAD_INSTANCE_FN(this);
-            if (instance?.onPartialProfit) {
-                await instance.onPartialProfit(event);
-            }
-        };
-        this.handlePartialLoss = async (event) => {
-            this.loggerService.log("liveProviderService handlePartialLoss", {
-                event,
-            });
-            const instance = await LOAD_INSTANCE_FN(this);
-            if (instance?.onPartialLoss) {
-                await instance.onPartialLoss(event);
-            }
-        };
-        this.handleScheduled = async (event) => {
-            this.loggerService.log("liveProviderService handleScheduled", {
-                event,
-            });
-            const instance = await LOAD_INSTANCE_FN(this);
-            if (instance?.onScheduled) {
-                await instance.onScheduled(event);
-            }
-        };
-        this.handleCancelled = async (event) => {
-            this.loggerService.log("liveProviderService handleCancelled", {
-                event,
-            });
-            const instance = await LOAD_INSTANCE_FN(this);
-            if (instance?.onCancelled) {
-                await instance.onCancelled(event);
-            }
-        };
-        this.handleOpened = async (event) => {
-            this.loggerService.log("liveProviderService handleOpened", {
-                event,
-            });
-            const instance = await LOAD_INSTANCE_FN(this);
-            if (instance?.onOpened) {
-                await instance.onOpened(event);
-            }
-        };
-        this.handleClosed = async (event) => {
-            this.loggerService.log("liveProviderService handleClosed", {
-                event,
-            });
-            const instance = await LOAD_INSTANCE_FN(this);
-            if (instance?.onClosed) {
-                await instance.onClosed(event);
-            }
-        };
-        this.handleRisk = async (event) => {
-            this.loggerService.log("liveProviderService handleClosed", {
-                event,
-            });
-            const instance = await LOAD_INSTANCE_FN(this);
-            if (instance?.onRisk) {
-                await instance.onRisk(event);
-            }
-        };
-        this.handleAverageBuy = async (event) => {
-            this.loggerService.log("liveProviderService handleAverageBuy", {
-                event,
-            });
-            const instance = await LOAD_INSTANCE_FN(this);
-            if (instance?.onAverageBuy) {
-                await instance.onAverageBuy(event);
-            }
-        };
-        this.enable = singleshot(() => {
-            this.loggerService.log("liveProviderService enable");
-            LOAD_INSTANCE_FN(this).then((module) => {
-                if (module) {
-                    this.loggerService.log("Live trading initialized successfully with ./modules/live.module.mjs");
-                    return;
-                }
-                console.log("No ./modules/live.module.mjs found, live trading failed to initialize");
-                process.exit(-1);
-            });
-            const unRisk = listenRisk(async (event) => {
-                await this.handleRisk(event);
-            });
-            const unSignal = listenSignal(async (event) => {
-                if (event.action === "scheduled") {
-                    await this.handleScheduled(event);
-                    return;
-                }
-                if (event.action === "cancelled") {
-                    await this.handleCancelled(event);
-                    return;
-                }
-                if (event.action === "opened") {
-                    await this.handleOpened(event);
-                    return;
-                }
-                if (event.action === "closed") {
-                    await this.handleClosed(event);
-                    return;
-                }
-            });
-            const unCommit = listenStrategyCommit(async (event) => {
-                if (event.action === "trailing-take") {
-                    await this.handleTrailingTake(event);
-                    return;
-                }
-                if (event.action === "trailing-stop") {
-                    await this.handleTrailingStop(event);
-                    return;
-                }
-                if (event.action === "breakeven") {
-                    await this.handleBreakeven(event);
-                    return;
-                }
-                if (event.action === "partial-profit") {
-                    await this.handlePartialProfit(event);
-                    return;
-                }
-                if (event.action === "partial-loss") {
-                    await this.handlePartialLoss(event);
-                    return;
-                }
-                if (event.action === "average-buy") {
-                    await this.handleAverageBuy(event);
-                    return;
-                }
-            });
-            const unConnect = () => this.enable.clear();
-            return compose(() => unRisk(), () => unSignal(), () => unCommit(), () => unConnect());
-        });
-        this.disable = () => {
-            this.loggerService.log("liveProviderService disable");
-            if (this.enable.hasValue()) {
-                const lastSubscription = this.enable();
-                lastSubscription();
-            }
-        };
-        this.connect = singleshot(async () => {
-            this.loggerService.log("liveProviderService connect");
-            if (!getArgs().values.live) {
-                return;
-            }
-            return entrySubject.subscribe(this.enable);
-        });
     }
 }
 
@@ -2018,7 +1877,6 @@ globalThis.BacktestKitSignals = BacktestKitSignals;
 {
     provide(TYPES.telegramProviderService, () => new TelegramProviderService());
     provide(TYPES.frontendProviderService, () => new FrontendProviderService());
-    provide(TYPES.liveProviderService, () => new LiveProviderService());
 }
 {
     provide(TYPES.telegramWebService, () => new TelegramWebService());
@@ -2057,7 +1915,6 @@ const schemaServices = {
 const providerServices = {
     frontendProviderService: inject(TYPES.frontendProviderService),
     telegramProviderService: inject(TYPES.telegramProviderService),
-    liveProviderService: inject(TYPES.liveProviderService),
 };
 const webServices = {
     telegramWebService: inject(TYPES.telegramWebService),
@@ -2162,7 +2019,6 @@ const BEFORE_EXIT_FN$2 = singleshot(async () => {
         exchangeName,
         strategyName,
     });
-    listenDoneLive(cli.liveProviderService.disable);
 });
 const listenGracefulShutdown$2 = singleshot(() => {
     process.on("SIGINT", BEFORE_EXIT_FN$2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backtest-kit/cli",
-  "version": "3.8.0",
+  "version": "5.0.0",
   "description": "Zero-boilerplate CLI runner for backtest-kit strategies. Run backtests, paper trading, and live bots with candle cache warming, web dashboard, and Telegram notifications — no setup code required.",
   "author": {
     "name": "Petr Tripolsky",
@@ -60,11 +60,11 @@
   "devDependencies": {
     "@babel/plugin-transform-modules-umd": "7.27.1",
     "@babel/standalone": "7.29.1",
-    "@backtest-kit/ui": "3.8.0",
-    "@backtest-kit/graph": "3.8.0",
-    "@backtest-kit/ollama": "3.8.0",
-    "@backtest-kit/pinets": "3.8.0",
-    "@backtest-kit/signals": "3.8.0",
+    "@backtest-kit/ui": "5.0.0",
+    "@backtest-kit/graph": "5.0.0",
+    "@backtest-kit/ollama": "5.0.0",
+    "@backtest-kit/pinets": "5.0.0",
+    "@backtest-kit/signals": "5.0.0",
     "@rollup/plugin-replace": "6.0.3",
     "@rollup/plugin-typescript": "11.1.6",
     "@types/image-size": "0.7.0",
@@ -72,7 +72,7 @@
     "@types/mustache": "4.2.6",
     "@types/node": "22.9.0",
     "@types/stack-trace": "0.0.33",
-    "backtest-kit": "3.8.0",
+    "backtest-kit": "5.0.0",
     "glob": "11.0.1",
     "markdown-it": "14.1.1",
     "rimraf": "6.0.1",
@@ -87,12 +87,12 @@
   "peerDependencies": {
     "@babel/plugin-transform-modules-umd": "^7.27.1",
     "@babel/standalone": "^7.29.1",
-    "@backtest-kit/ui": "^3.8.0",
-    "@backtest-kit/graph": "^3.8.0",
-    "@backtest-kit/ollama": "^3.8.0",
-    "@backtest-kit/pinets": "^3.8.0",
-    "@backtest-kit/signals": "^3.8.0",
-    "backtest-kit": "^3.8.0",
+    "@backtest-kit/ui": "^5.0.0",
+    "@backtest-kit/graph": "^5.0.0",
+    "@backtest-kit/ollama": "^5.0.0",
+    "@backtest-kit/pinets": "^5.0.0",
+    "@backtest-kit/signals": "^5.0.0",
+    "backtest-kit": "^5.0.0",
     "markdown-it": "^14.1.1",
     "typescript": "^5.0.0"
   },

package/template/average-buy.mustache

@@ -5,12 +5,17 @@
 **Current:** `{{currentPrice}}`
 **New Avg Entry:** `{{effectivePriceOpen}}`
 **Orig Entry:** `{{originalPriceOpen}}`
+**Cost:** `{{cost}}`
 **DCA Entries:** `{{totalEntries}}`
+**Partials Done:** `{{totalPartials}}`
 **Take Profit:** `{{priceTakeProfit}}`
 **Stop Loss:** `{{priceStopLoss}}`
+**Orig TP:** `{{originalPriceTakeProfit}}`
+**Orig SL:** `{{originalPriceStopLoss}}`
+**PnL:** {{pnl.pnlPercentage}}% ({{pnl.pnlCost}} / {{pnl.pnlEntries}})
 **Signal ID:** `{{signalId}}`
 **Time:** `{{timestamp}}`
 
 {{#backtest}}
 _🧪 Backtest_
-{{/backtest}}
+{{/backtest}}

package/template/breakeven.mustache

@@ -4,13 +4,17 @@
 
 **Current:** `{{currentPrice}}`
 **Entry:** `{{priceOpen}}`
-**Take Profit:** `{{priceTakeProfit}}`
-**Stop Loss:** `{{priceStopLoss}}`
 **Orig Entry:** `{{originalPriceOpen}}`
 **DCA Entries:** `{{totalEntries}}`
+**Partials Done:** `{{totalPartials}}`
+**Take Profit:** `{{priceTakeProfit}}`
+**Stop Loss:** `{{priceStopLoss}}`
+**Orig TP:** `{{originalPriceTakeProfit}}`
+**Orig SL:** `{{originalPriceStopLoss}}`
+**PnL:** {{pnl.pnlPercentage}}% ({{pnl.pnlCost}} / {{pnl.pnlEntries}})
 **Signal ID:** `{{signalId}}`
 **Time:** `{{timestamp}}`
 
 {{#backtest}}
 _🧪 Backtest_
-{{/backtest}}
+{{/backtest}}

package/template/cancelled.mustache

@@ -6,11 +6,15 @@
 **Entry:** `{{signal.priceOpen}}`
 **Current:** `{{currentPrice}}`
 **Orig Entry:** `{{signal.originalPriceOpen}}`
+**Orig TP:** `{{signal.originalPriceTakeProfit}}`
+**Orig SL:** `{{signal.originalPriceStopLoss}}`
 **DCA Entries:** `{{signal.totalEntries}}`
+**Partials Done:** `{{signal.totalPartials}}`
+**Partial Executed:** {{signal.partialExecuted}}%
 **Signal ID:** `{{signal.id}}`
 {{#cancelId}}**Cancel ID:** `{{cancelId}}`
 {{/cancelId}}**Time:** `{{createdAt}}`
 
 {{#backtest}}
 _🧪 Backtest_
-{{/backtest}}
+{{/backtest}}

package/template/closed.mustache

@@ -3,15 +3,20 @@
 **Symbol:** `{{symbol}}` ({{signal.position}})
 
 **Reason:** `{{closeReason}}`
+**Current:** `{{currentPrice}}`
 **Entry:** `{{pnl.priceOpen}}`
 **Exit:** `{{pnl.priceClose}}`
-**PnL:** {{pnl.pnlPercentage}}%
+**PnL:** {{pnl.pnlPercentage}}% ({{pnl.pnlCost}} / {{pnl.pnlEntries}})
 **Orig Entry:** `{{signal.originalPriceOpen}}`
+**Orig TP:** `{{signal.originalPriceTakeProfit}}`
+**Orig SL:** `{{signal.originalPriceStopLoss}}`
 **DCA Entries:** `{{signal.totalEntries}}`
+**Partials Done:** `{{signal.totalPartials}}`
+**Partial Executed:** {{signal.partialExecuted}}%
 **Signal ID:** `{{signal.id}}`
 {{#closeId}}**Close ID:** `{{closeId}}`
 {{/closeId}}**Time:** `{{createdAt}}`
 
 {{#backtest}}
 _🧪 Backtest_
-{{/backtest}}
+{{/backtest}}

package/template/opened.mustache

@@ -7,11 +7,15 @@
 **Take Profit:** `{{signal.priceTakeProfit}}`
 **Stop Loss:** `{{signal.priceStopLoss}}`
 **Orig Entry:** `{{signal.originalPriceOpen}}`
+**Orig TP:** `{{signal.originalPriceTakeProfit}}`
+**Orig SL:** `{{signal.originalPriceStopLoss}}`
+**Cost:** `{{signal.cost}}`
 **DCA Entries:** `{{signal.totalEntries}}`
+**Partials Done:** `{{signal.totalPartials}}`
 **TTL:** {{signal.minuteEstimatedTime}} min
 **Signal ID:** `{{signal.id}}`
 **Time:** `{{createdAt}}`
 
 {{#backtest}}
 _🧪 Backtest_
-{{/backtest}}
+{{/backtest}}

package/template/partial-loss.mustache

@@ -4,14 +4,18 @@
 
 **Current:** `{{currentPrice}}`
 **Entry:** `{{priceOpen}}`
+**Orig Entry:** `{{originalPriceOpen}}`
 **Closed:** {{percentToClose}}%
 **Take Profit:** `{{priceTakeProfit}}`
 **Stop Loss:** `{{priceStopLoss}}`
-**Orig Entry:** `{{originalPriceOpen}}`
+**Orig TP:** `{{originalPriceTakeProfit}}`
+**Orig SL:** `{{originalPriceStopLoss}}`
 **DCA Entries:** `{{totalEntries}}`
+**Partials Done:** `{{totalPartials}}`
+**PnL:** {{pnl.pnlPercentage}}% ({{pnl.pnlCost}} / {{pnl.pnlEntries}})
 **Signal ID:** `{{signalId}}`
 **Time:** `{{timestamp}}`
 
 {{#backtest}}
 _🧪 Backtest_
-{{/backtest}}
+{{/backtest}}

package/template/partial-profit.mustache

@@ -4,14 +4,18 @@
 
 **Current:** `{{currentPrice}}`
 **Entry:** `{{priceOpen}}`
+**Orig Entry:** `{{originalPriceOpen}}`
 **Closed:** {{percentToClose}}%
 **Take Profit:** `{{priceTakeProfit}}`
 **Stop Loss:** `{{priceStopLoss}}`
-**Orig Entry:** `{{originalPriceOpen}}`
+**Orig TP:** `{{originalPriceTakeProfit}}`
+**Orig SL:** `{{originalPriceStopLoss}}`
 **DCA Entries:** `{{totalEntries}}`
+**Partials Done:** `{{totalPartials}}`
+**PnL:** {{pnl.pnlPercentage}}% ({{pnl.pnlCost}} / {{pnl.pnlEntries}})
 **Signal ID:** `{{signalId}}`
 **Time:** `{{timestamp}}`
 
 {{#backtest}}
 _🧪 Backtest_
-{{/backtest}}
+{{/backtest}}

package/template/risk.mustache

@@ -6,10 +6,10 @@
 **Entry:** `{{currentSignal.priceOpen}}`
 **Take Profit:** `{{currentSignal.priceTakeProfit}}`
 **Stop Loss:** `{{currentSignal.priceStopLoss}}`
-**Orig Entry:** `{{currentSignal.originalPriceOpen}}`
-**DCA Entries:** `{{currentSignal.totalEntries}}`
-**Active positions:** {{activePositionCount}}
-{{#rejectionId}}**Rejection ID:** `{{rejectionId}}`
+**TTL:** {{currentSignal.minuteEstimatedTime}} min
+**Active Positions:** {{activePositionCount}}
+{{#currentSignal.note}}**Note:** {{currentSignal.note}}
+{{/currentSignal.note}}{{#rejectionId}}**Rejection ID:** `{{rejectionId}}`
 {{/rejectionId}}**Time:** `{{timestamp}}`
 
 **Reason:**
@@ -17,4 +17,4 @@
 
 {{#backtest}}
 _🧪 Backtest_
-{{/backtest}}
+{{/backtest}}

package/template/scheduled.mustache

@@ -7,11 +7,15 @@
 **Take Profit:** `{{signal.priceTakeProfit}}`
 **Stop Loss:** `{{signal.priceStopLoss}}`
 **Orig Entry:** `{{signal.originalPriceOpen}}`
+**Orig TP:** `{{signal.originalPriceTakeProfit}}`
+**Orig SL:** `{{signal.originalPriceStopLoss}}`
+**Cost:** `{{signal.cost}}`
 **DCA Entries:** `{{signal.totalEntries}}`
+**Partials Done:** `{{signal.totalPartials}}`
 **TTL:** {{signal.minuteEstimatedTime}} min
 **Signal ID:** `{{signal.id}}`
 **Time:** `{{createdAt}}`
 
 {{#backtest}}
 _🧪 Backtest_
-{{/backtest}}
+{{/backtest}}