@backtest-kit/cli 5.6.0 → 5.6.2

package/README.md

@@ -302,11 +302,11 @@ Requires `CC_TELEGRAM_TOKEN` and `CC_TELEGRAM_CHANNEL` in your environment.
 
 The CLI supports **mode-specific module files** that are loaded as side-effect imports before the strategy starts. Each file is expected to call `Broker.useBrokerAdapter()` from `backtest-kit` to register a broker adapter.
 
-| Mode          | Module file                     | Loaded before               |
-|---------------|---------------------------------|-----------------------------|
-| `--live`      | `./modules/live.module.mjs`     | `Live.background()`         |
-| `--paper`     | `./modules/paper.module.mjs`    | `Live.background()` (paper) |
-| `--backtest`  | `./modules/backtest.module.mjs` | `Backtest.background()`     |
+| Command Line Args | Module file                     | Loaded before               |
+|-------------------|---------------------------------|-----------------------------|
+| `--live`          | `./modules/live.module.mjs`     | `Live.background()`         |
+| `--paper`         | `./modules/paper.module.mjs`    | `Live.background()` (paper) |
+| `--backtest`      | `./modules/backtest.module.mjs` | `Backtest.background()`     |
 
 > File is resolved relative to `cwd` (the strategy directory). All of `.mjs`, `.cjs`, `.ts` extensions are tried automatically. Missing module is a soft warning — not an error.
 

package/build/index.cjs

@@ -266,8 +266,13 @@ class ResolveService {
         this.loggerService = inject(TYPES.loggerService);
         this.loaderService = inject(TYPES.loaderService);
         this.DEFAULT_TEMPLATE_DIR = path.resolve(__dirname$1, '..', 'template');
+        this.DEFAULT_MODULES_DIR = path.resolve(__dirname$1, '..', 'modules');
         this.OVERRIDE_TEMPLATE_DIR = path.resolve(process.cwd(), 'template');
         this.OVERRIDE_MODULES_DIR = path.resolve(process.cwd(), 'modules');
+        this.getIsLaunched = () => {
+            this.loggerService.log("resolveService getIsLaunched");
+            return _is_launched;
+        };
         this.attachEntryPoint = async (entryPoint) => {
             this.loggerService.log("resolveService attachEntryPoint");
             if (_is_launched) {
@@ -1719,25 +1724,35 @@ class TelegramTemplateService {
     }
 }
 
+const GET_MODULE_VARIANTS_FN = (fileName, self) => {
+    const result = [];
+    result.push({
+        filePath: path.join(process.cwd(), "modules", fileName),
+        baseDir: path.join(process.cwd(), "modules")
+    });
+    result.push({
+        filePath: path.join(self.resolveService.OVERRIDE_MODULES_DIR, fileName),
+        baseDir: self.resolveService.OVERRIDE_MODULES_DIR,
+    });
+    result.push({
+        filePath: path.join(self.resolveService.DEFAULT_MODULES_DIR, fileName),
+        baseDir: self.resolveService.DEFAULT_MODULES_DIR,
+    });
+    return result;
+};
 const LOAD_MODULE_MODULE_FN = async (fileName, self) => {
-    const overridePath = path.join(self.resolveService.OVERRIDE_MODULES_DIR, fileName);
-    const targetPath = path.join(process.cwd(), "modules", fileName);
-    const hasOverride = await fs$1
-        .access(overridePath, fs.constants.F_OK | fs.constants.R_OK)
-        .then(() => true)
-        .catch(() => false);
-    const resolvedFile = hasOverride ? overridePath : targetPath;
-    try {
-        if (self.loaderService.check(resolvedFile)) {
-            self.loaderService.import(resolvedFile);
-            return true;
+    for (const { filePath, baseDir } of GET_MODULE_VARIANTS_FN(fileName, self)) {
+        try {
+            if (await self.loaderService.check(filePath, baseDir)) {
+                self.loaderService.import(filePath, baseDir);
+                return true;
+            }
+        }
+        catch {
+            console.warn(`Module module import failed for file: ${filePath}`);
         }
-        return false;
-    }
-    catch {
-        console.warn(`Module module import failed for file: ${resolvedFile}`);
-        return false;
     }
+    return false;
 };
 class ModuleConnectionService {
     constructor() {
@@ -2231,6 +2246,9 @@ function setLogger(logger) {
 
 let _is_started = false;
 async function run(mode, args) {
+    if (cli.resolveService.getIsLaunched()) {
+        throw new Error("Entry point is already attached. Multiple entry points are not allowed.");
+    }
     {
         if (_is_started) {
             throw new Error("Should be called only once");

package/build/index.mjs

@@ -240,8 +240,13 @@ class ResolveService {
         this.loggerService = inject(TYPES.loggerService);
         this.loaderService = inject(TYPES.loaderService);
         this.DEFAULT_TEMPLATE_DIR = path.resolve(__dirname, '..', 'template');
+        this.DEFAULT_MODULES_DIR = path.resolve(__dirname, '..', 'modules');
         this.OVERRIDE_TEMPLATE_DIR = path.resolve(process.cwd(), 'template');
         this.OVERRIDE_MODULES_DIR = path.resolve(process.cwd(), 'modules');
+        this.getIsLaunched = () => {
+            this.loggerService.log("resolveService getIsLaunched");
+            return _is_launched;
+        };
         this.attachEntryPoint = async (entryPoint) => {
             this.loggerService.log("resolveService attachEntryPoint");
             if (_is_launched) {
@@ -1693,25 +1698,35 @@ class TelegramTemplateService {
     }
 }
 
+const GET_MODULE_VARIANTS_FN = (fileName, self) => {
+    const result = [];
+    result.push({
+        filePath: path.join(process.cwd(), "modules", fileName),
+        baseDir: path.join(process.cwd(), "modules")
+    });
+    result.push({
+        filePath: path.join(self.resolveService.OVERRIDE_MODULES_DIR, fileName),
+        baseDir: self.resolveService.OVERRIDE_MODULES_DIR,
+    });
+    result.push({
+        filePath: path.join(self.resolveService.DEFAULT_MODULES_DIR, fileName),
+        baseDir: self.resolveService.DEFAULT_MODULES_DIR,
+    });
+    return result;
+};
 const LOAD_MODULE_MODULE_FN = async (fileName, self) => {
-    const overridePath = path.join(self.resolveService.OVERRIDE_MODULES_DIR, fileName);
-    const targetPath = path.join(process.cwd(), "modules", fileName);
-    const hasOverride = await fs$1
-        .access(overridePath, constants.F_OK | constants.R_OK)
-        .then(() => true)
-        .catch(() => false);
-    const resolvedFile = hasOverride ? overridePath : targetPath;
-    try {
-        if (self.loaderService.check(resolvedFile)) {
-            self.loaderService.import(resolvedFile);
-            return true;
+    for (const { filePath, baseDir } of GET_MODULE_VARIANTS_FN(fileName, self)) {
+        try {
+            if (await self.loaderService.check(filePath, baseDir)) {
+                self.loaderService.import(filePath, baseDir);
+                return true;
+            }
+        }
+        catch {
+            console.warn(`Module module import failed for file: ${filePath}`);
         }
-        return false;
-    }
-    catch {
-        console.warn(`Module module import failed for file: ${resolvedFile}`);
-        return false;
     }
+    return false;
 };
 class ModuleConnectionService {
     constructor() {
@@ -2201,6 +2216,9 @@ function setLogger(logger) {
 
 let _is_started = false;
 async function run(mode, args) {
+    if (cli.resolveService.getIsLaunched()) {
+        throw new Error("Entry point is already attached. Multiple entry points are not allowed.");
+    }
     {
         if (_is_started) {
             throw new Error("Should be called only once");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backtest-kit/cli",
-  "version": "5.6.0",
+  "version": "5.6.2",
   "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": "5.6.0",
-    "@backtest-kit/graph": "5.6.0",
-    "@backtest-kit/ollama": "5.6.0",
-    "@backtest-kit/pinets": "5.6.0",
-    "@backtest-kit/signals": "5.6.0",
+    "@backtest-kit/ui": "5.6.2",
+    "@backtest-kit/graph": "5.6.2",
+    "@backtest-kit/ollama": "5.6.2",
+    "@backtest-kit/pinets": "5.6.2",
+    "@backtest-kit/signals": "5.6.2",
     "@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": "5.6.0",
+    "backtest-kit": "5.6.2",
     "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": "^5.6.0",
-    "@backtest-kit/graph": "^5.6.0",
-    "@backtest-kit/ollama": "^5.6.0",
-    "@backtest-kit/pinets": "^5.6.0",
-    "@backtest-kit/signals": "^5.6.0",
-    "backtest-kit": "^5.6.0",
+    "@backtest-kit/ui": "^5.6.2",
+    "@backtest-kit/graph": "^5.6.2",
+    "@backtest-kit/ollama": "^5.6.2",
+    "@backtest-kit/pinets": "^5.6.2",
+    "@backtest-kit/signals": "^5.6.2",
+    "backtest-kit": "^5.6.2",
     "markdown-it": "^14.1.1",
     "typescript": "^5.0.0"
   },

package/types.d.ts

@@ -99,8 +99,10 @@ declare class ResolveService {
     readonly loggerService: LoggerService;
     readonly loaderService: LoaderService;
     readonly DEFAULT_TEMPLATE_DIR: string;
+    readonly DEFAULT_MODULES_DIR: string;
     readonly OVERRIDE_TEMPLATE_DIR: string;
     readonly OVERRIDE_MODULES_DIR: string;
+    getIsLaunched: () => boolean;
     attachEntryPoint: (entryPoint: string) => Promise<void>;
 }