@backtest-kit/cli 17.0.0 → 17.7.0

package/build/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import * as BacktestKit from 'backtest-kit';
-import { setConfig, listenExit, emitters, Notification, Cron, Recent, Storage, Markdown, Report, Dump, State, Memory, MarkdownWriter, ReportWriter, PersistSignalAdapter, PersistRiskAdapter, PersistScheduleAdapter, PersistPartialAdapter, PersistBreakevenAdapter, PersistCandleAdapter, PersistStorageAdapter, PersistNotificationAdapter, PersistLogAdapter, PersistMeasureAdapter, PersistIntervalAdapter, PersistMemoryAdapter, PersistRecentAdapter, PersistStateAdapter, PersistSessionAdapter, PersistStrategyAdapter, Log, StorageLive, StorageBacktest, NotificationLive, NotificationBacktest, RecentLive, RecentBacktest, Broker, SessionLive, SessionBacktest, MemoryLive, MemoryBacktest, StateLive, StateBacktest, listExchangeSchema, addExchangeSchema, roundTicks, listFrameSchema, addFrameSchema, listenDoneLive, listenDoneBacktest, shutdown, listenSignal, listStrategySchema, overrideExchangeSchema, Backtest, System, Cache, Interval, alignToInterval, addWalkerSchema, overrideWalkerSchema, Walker, listenDoneWalker, Live, getCandles, checkCandles, warmCandles, listenRisk, listenStrategyCommit, listenOrderFill, listenOrderReject, listenOrderContinue, listenOrderStop, listenSignalNotify, Exchange, runInMockContext, addSimulatorSchema, Simulator } from 'backtest-kit';
+import { setConfig, listenExit, emitters, Notification, Cron, Recent, Storage, Markdown, Report, Dump, State, Memory, MarkdownWriter, ReportWriter, PersistSignalAdapter, PersistRiskAdapter, PersistScheduleAdapter, PersistPartialAdapter, PersistBreakevenAdapter, PersistCandleAdapter, PersistStorageAdapter, PersistNotificationAdapter, PersistLogAdapter, PersistMeasureAdapter, PersistIntervalAdapter, PersistMemoryAdapter, PersistRecentAdapter, PersistStateAdapter, PersistSessionAdapter, PersistStrategyAdapter, Log, StorageLive, StorageBacktest, NotificationLive, NotificationBacktest, RecentLive, RecentBacktest, Broker, SessionLive, SessionBacktest, MemoryLive, MemoryBacktest, StateLive, StateBacktest, listExchangeSchema, addExchangeSchema, roundTicks, listFrameSchema, addFrameSchema, listenDoneLive, listenDoneBacktest, shutdown, listenSignal, listStrategySchema, overrideExchangeSchema, Backtest, System, Cache, Interval, alignToInterval, addWalkerSchema, overrideWalkerSchema, Walker, listenDoneWalker, Live, getCandles, checkCandles, warmCandles, listenRisk, listenStrategyCommit, listenOrderFill, listenOrderReject, listenOrderContinue, listenOrderStop, listenSignalNotify, Exchange, runInMockContext, addSweepSchema, Sweep } from 'backtest-kit';
 import { singleshot, sleep, getErrorMessage, errorData, BehaviorSubject, Subject, str, compose, createAwaiter, execpool, queued, randomString, TIMEOUT_SYMBOL, typo, retry, trycatch, ttl, Source, memoize, isObject } from 'functools-kit';
 import { exec, spawn } from 'child_process';
 import fs, { constants, realpathSync } from 'fs';
@@ -28,7 +28,7 @@ import Module, { createRequire } from 'module';
 import * as BacktestKitGraph from '@backtest-kit/graph';
 import * as BacktestKitOllama from '@backtest-kit/ollama';
 import * as BacktestKitPinets from '@backtest-kit/pinets';
-import { run as run$1, Code, toMarkdown as toMarkdown$2 } from '@backtest-kit/pinets';
+import { run as run$1, Code, toMarkdown as toMarkdown$1 } from '@backtest-kit/pinets';
 import * as BacktestKitSignals from '@backtest-kit/signals';
 import open from 'open';
 
@@ -208,14 +208,14 @@ const getReadySubject = singleshot(() => {
     return new Subject();
 });
 
-const main$l = () => {
+const main$k = () => {
     const entrySubject = getEntrySubject();
     entrySubject.subscribe(async (path) => {
         console.log("Running", path);
         await getReadySubject().next();
     });
 };
-main$l();
+main$k();
 
 const ERROR_HANDLER_INSTALLED = Symbol.for("error-handler-installed");
 function dumpStackTrace(error) {
@@ -866,11 +866,7 @@ const getArgs = singleshot(() => {
                 type: "boolean",
                 default: false,
             },
-            simulator: {
-                type: "boolean",
-                default: false,
-            },
-            tune: {
+            sweep: {
                 type: "boolean",
                 default: false,
             },
@@ -3651,14 +3647,14 @@ const cli = {
 };
 init();
 
-const MODES = ["backtest", "walker", "paper", "live", "main", "pine", "editor", "dump", "pnldebug", "brokerdebug", "simulator", "tune", "flush", "init", "docker", "help", "version"];
+const MODES = ["backtest", "walker", "paper", "live", "main", "pine", "editor", "dump", "pnldebug", "brokerdebug", "sweep", "flush", "init", "docker", "help", "version"];
 const ENTRY_PATH$1 = "./node_modules/@backtest-kit/cli/build/index.mjs";
 const HELP_TEXT$1 = `
 Example:
 
   node ${ENTRY_PATH$1} --help
 `.trimStart();
-const main$k = async () => {
+const main$j = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -3666,14 +3662,14 @@ const main$k = async () => {
     if (MODES.some((mode) => values[mode])) {
         return;
     }
-    process.stdout.write(`@backtest-kit/cli ${"17.0.0"}\n`);
+    process.stdout.write(`@backtest-kit/cli ${"17.7.0"}\n`);
     process.stdout.write("\n");
     process.stdout.write(`Run with --help to see available commands.\n`);
     process.stdout.write("\n");
     process.stdout.write(HELP_TEXT$1);
     process.exit(0);
 };
-main$k();
+main$j();
 
 const notifyShutdown = singleshot(async () => {
     console.log("Graceful shutdown initiated.");
@@ -3689,7 +3685,7 @@ const flush = async (entryPoint) => {
         console.log(`Removed: ${target}`);
     }
 };
-const main$j = async () => {
+const main$i = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -3706,7 +3702,7 @@ const main$j = async () => {
     }
     process.exit(0);
 };
-main$j();
+main$i();
 
 const BEFORE_EXIT_FN$6 = singleshot(async () => {
     process.off("SIGINT", BEFORE_EXIT_FN$6);
@@ -3729,7 +3725,7 @@ const BEFORE_EXIT_FN$6 = singleshot(async () => {
 const listenGracefulShutdown$6 = singleshot(() => {
     process.on("SIGINT", BEFORE_EXIT_FN$6);
 });
-const main$i = async () => {
+const main$h = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -3747,7 +3743,7 @@ const main$i = async () => {
     await cli.backtestMainService.connect();
     listenGracefulShutdown$6();
 };
-main$i();
+main$h();
 
 const BEFORE_EXIT_FN$5 = singleshot(async () => {
     process.off("SIGINT", BEFORE_EXIT_FN$5);
@@ -3766,7 +3762,7 @@ const BEFORE_EXIT_FN$5 = singleshot(async () => {
 const listenGracefulShutdown$5 = singleshot(() => {
     process.on("SIGINT", BEFORE_EXIT_FN$5);
 });
-const main$h = async () => {
+const main$g = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -3785,7 +3781,7 @@ const main$h = async () => {
     listenGracefulShutdown$5();
     await cli.walkerMainService.connect();
 };
-main$h();
+main$g();
 
 const BEFORE_EXIT_FN$4 = singleshot(async () => {
     process.off("SIGINT", BEFORE_EXIT_FN$4);
@@ -3807,7 +3803,7 @@ const BEFORE_EXIT_FN$4 = singleshot(async () => {
 const listenGracefulShutdown$4 = singleshot(() => {
     process.on("SIGINT", BEFORE_EXIT_FN$4);
 });
-const main$g = async () => {
+const main$f = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -3821,7 +3817,7 @@ const main$g = async () => {
     await cli.paperMainService.connect();
     listenGracefulShutdown$4();
 };
-main$g();
+main$f();
 
 const BEFORE_EXIT_FN$3 = singleshot(async () => {
     process.off("SIGINT", BEFORE_EXIT_FN$3);
@@ -3843,7 +3839,7 @@ const BEFORE_EXIT_FN$3 = singleshot(async () => {
 const listenGracefulShutdown$3 = singleshot(() => {
     process.on("SIGINT", BEFORE_EXIT_FN$3);
 });
-const main$f = async () => {
+const main$e = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -3857,7 +3853,7 @@ const main$f = async () => {
     await cli.liveMainService.connect();
     listenGracefulShutdown$3();
 };
-main$f();
+main$e();
 
 const stopBacktestList$1 = async () => {
     for (const item of await Backtest.list()) {
@@ -3921,7 +3917,7 @@ const BEFORE_EXIT_FN$2 = singleshot(async () => {
 const listenGracefulShutdown$2 = singleshot(() => {
     process.on("SIGINT", BEFORE_EXIT_FN$2);
 });
-const main$e = async () => {
+const main$d = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -3977,7 +3973,7 @@ const main$e = async () => {
     listenGracefulShutdown$2();
     await cli.resolveService.attachEntry(path.resolve(cwd, entryPoint));
 };
-main$e();
+main$d();
 
 const MODE_MODULE = {
     backtest: "backtest.module",
@@ -4080,7 +4076,7 @@ const createGracefulShutdown = (mode) => {
         process.on("SIGINT", handler);
     });
 };
-const main$d = async () => {
+const main$c = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -4156,7 +4152,7 @@ const main$d = async () => {
     }
     await getEntrySubject().next(absolutePath);
 };
-main$d();
+main$c();
 
 const BEFORE_EXIT_FN$1 = singleshot(async () => {
     process.off("SIGINT", BEFORE_EXIT_FN$1);
@@ -4167,7 +4163,7 @@ const BEFORE_EXIT_FN$1 = singleshot(async () => {
 const listenGracefulShutdown$1 = singleshot(() => {
     process.on("SIGINT", BEFORE_EXIT_FN$1);
 });
-const main$c = async () => {
+const main$b = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -4177,7 +4173,7 @@ const main$c = async () => {
     }
     listenGracefulShutdown$1();
 };
-main$c();
+main$b();
 
 const BEFORE_EXIT_FN = singleshot(async () => {
     process.off("SIGINT", BEFORE_EXIT_FN);
@@ -4188,7 +4184,7 @@ const BEFORE_EXIT_FN = singleshot(async () => {
 const listenGracefulShutdown = singleshot(() => {
     process.on("SIGINT", BEFORE_EXIT_FN);
 });
-const main$b = async () => {
+const main$a = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -4198,7 +4194,7 @@ const main$b = async () => {
     }
     listenGracefulShutdown();
 };
-main$b();
+main$a();
 
 const EXTRACT_ROWS_FN = (plots, schema) => {
     const keys = Object.keys(schema);
@@ -4220,7 +4216,7 @@ const EXTRACT_ROWS_FN = (plots, schema) => {
     }
     return rows;
 };
-const main$a = async () => {
+const main$9 = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -4312,17 +4308,17 @@ const main$a = async () => {
     if (values.markdown) {
         const filePath = resolve(dumpDir, `${dumpName}.md`);
         await mkdir(dumpDir, { recursive: true });
-        await writeFile(filePath, await toMarkdown$2(signalId, plots, signalSchema), "utf-8");
+        await writeFile(filePath, await toMarkdown$1(signalId, plots, signalSchema), "utf-8");
         console.log(`Saved: ${filePath}`);
         process.exit(0);
         return;
     }
-    console.log(await toMarkdown$2(signalId, plots, signalSchema));
+    console.log(await toMarkdown$1(signalId, plots, signalSchema));
     process.exit(0);
 };
-main$a();
+main$9();
 
-const main$9 = async () => {
+const main$8 = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -4385,9 +4381,9 @@ const main$9 = async () => {
     };
     process.on("SIGINT", beforeExit);
 };
-main$9();
+main$8();
 
-const main$8 = async () => {
+const main$7 = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -4468,9 +4464,9 @@ const main$8 = async () => {
     console.log(JSON.stringify(candles, null, 2));
     process.exit(0);
 };
-main$8();
+main$7();
 
-const main$7 = async () => {
+const main$6 = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -4584,7 +4580,7 @@ const main$7 = async () => {
     }
     process.exit(0);
 };
-main$7();
+main$6();
 
 const getBroker = singleshot(() => {
     // Reaches into BrokerAdapter internals on purpose: the public commit*
@@ -4693,7 +4689,7 @@ const ZERO_PNL = {
     pnlCost: 0,
     pnlEntries: 0,
 };
-const main$6 = async () => {
+const main$5 = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
@@ -4887,23 +4883,23 @@ const main$6 = async () => {
     }
     process.exit(0);
 };
-main$6();
+main$5();
 
-const SIMULATOR_NAME$1 = "cli_simulator";
-const CONFIG_KEYS$1 = ["gridAxes", "reportOrder"];
-const validateConfig$1 = (config) => {
+const SIMULATOR_NAME = "cli_sweep";
+const CONFIG_KEYS = ["gridAxes", "reportOrder"];
+const validateConfig = (config) => {
     if (typeof config !== "object" || config === null || Array.isArray(config)) {
         return "config must be a JSON object";
     }
     for (const key of Object.keys(config)) {
-        if (!CONFIG_KEYS$1.includes(key)) {
-            return `unknown key "${key}" (expected: ${CONFIG_KEYS$1.join(", ")})`;
+        if (!CONFIG_KEYS.includes(key)) {
+            return `unknown key "${key}" (expected: ${CONFIG_KEYS.join(", ")})`;
         }
     }
     return null;
 };
-const IDEA_DIRECTIONS$1 = ["LONG", "SHORT", "NEUTRAL"];
-const validateIdea$1 = (idea, line) => {
+const IDEA_DIRECTIONS = ["LONG", "SHORT", "NEUTRAL"];
+const validateIdea = (idea, line) => {
     if (typeof idea !== "object" || idea === null) {
         return `line ${line}: not an object`;
     }
@@ -4916,20 +4912,21 @@ const validateIdea$1 = (idea, line) => {
     if (typeof idea.symbol !== "string" || !idea.symbol) {
         return `line ${line}: "symbol" must be a non-empty string`;
     }
-    if (!IDEA_DIRECTIONS$1.includes(idea.direction)) {
-        return `line ${line}: "direction" must be one of ${IDEA_DIRECTIONS$1.join("|")}, got ${JSON.stringify(idea.direction)}`;
+    if (!IDEA_DIRECTIONS.includes(idea.direction)) {
+        return `line ${line}: "direction" must be one of ${IDEA_DIRECTIONS.join("|")}, got ${JSON.stringify(idea.direction)}`;
     }
     if (typeof idea.author !== "string" || !idea.author) {
         return `line ${line}: "author" must be a non-empty string`;
     }
     return null;
 };
-const toMarkdown$1 = (result) => {
-    const buckets = Object.entries(result.reports).filter(([, bucket]) => bucket.reports.length > 0);
-    const allReports = buckets.flatMap(([, bucket]) => bucket.reports);
+const fmtSimRatio = (value) => Number.isFinite(value) ? value.toFixed(2) : "inf";
+const toMarkdown = (result) => {
+    const bucket = result.reports;
+    const allReports = bucket.reports;
     const profitable = allReports.filter(({ totalPnlPercent }) => totalPnlPercent > 0).length;
     const lines = [];
-    lines.push(`# Simulator Report — ${result.symbol}`);
+    lines.push(`# Sweep Report — ${result.symbol}`);
     lines.push("");
     lines.push(`| Metric | Value |`);
     lines.push(`| --- | --- |`);
@@ -4937,41 +4934,44 @@ const toMarkdown$1 = (result) => {
     lines.push(`| Profiles (truncated) | ${result.profileCount} (${result.truncatedCount}) |`);
     lines.push(`| Profitable corridor | ${profitable} / ${allReports.length} grid points |`);
     lines.push(`| Hold minutes avg / p95 / p99 | ${result.avgHoldMinutes.toFixed(0)} / ${result.p95HoldMinutes} / ${result.p99HoldMinutes} |`);
-    // каждая метрика — самодостаточная корзина: свои победители и
-    // свои словари банов, между собой не склеиваются
-    for (const [metric, bucket] of buckets) {
-        lines.push("");
-        lines.push(`## Metric: ${metric}`);
-        lines.push("");
-        lines.push(`| Criterion | Stop% | Hold | Track | HitRate | Trades | PNL% | WinRate | Sharpe | Sortino |`);
-        lines.push(`| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |`);
-        for (const best of bucket.best) {
-            if (!best.report) {
-                lines.push(`| ${best.criterion} | — | — | — | — | — | — | — | — | — |`);
-                continue;
-            }
-            const { point } = best.report;
-            lines.push(`| ${best.criterion} | ${point.hardStopPercent} | ${point.holdMinutes / 60}h | ${point.minAuthorTrack} | ${point.minAuthorHitRate} | ` +
-                `${best.report.trades} | ${best.report.totalPnlPercent.toFixed(2)}% | ${(best.report.winRate * 100).toFixed(0)}% | ${best.report.sharpe.toFixed(2)} | ${best.report.sortino.toFixed(2)} |`);
-        }
-        const sharpeBest = bucket.best.find(({ criterion }) => criterion === "sharpe");
-        lines.push("");
-        lines.push(`### Allowed authors (sharpe winner rule)`);
-        lines.push("");
-        lines.push(`| Author | Ideas | Hits | HitRate |`);
-        lines.push(`| --- | --- | --- | --- |`);
-        for (const stat of (sharpeBest?.authorStats ?? []).filter(({ banned }) => !banned)) {
-            lines.push(`| ${stat.author} | ${stat.ideas} | ${stat.hits} | ${(stat.hitRate * 100).toFixed(0)}% |`);
+    // единственная метрика — profit-before-stop: одна корзина с
+    // победителями и author tracks
+    lines.push("");
+    lines.push(`## Grid winners`);
+    lines.push("");
+    lines.push(`| Criterion | Stop% | Trail% | Hold | Lock% | Trades | PNL% | WinRate | Sharpe | Sortino |`);
+    lines.push(`| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |`);
+    for (const best of bucket.best) {
+        if (!best.report) {
+            lines.push(`| ${best.criterion} | — | — | — | — | — | — | — | — | — |`);
+            continue;
         }
+        const { point } = best.report;
+        lines.push(`| ${best.criterion} | ${point.hardStopPercent} | ${point.trailingTakePercent} | ${point.holdMinutes / 60}h | ${point.profitLockPercent} | ` +
+            `${best.report.tradesList.length} | ${best.report.totalPnlPercent.toFixed(2)}% | ${(best.report.winRate * 100).toFixed(0)}% | ${fmtSimRatio(best.report.sharpe)} | ${fmtSimRatio(best.report.sortino)} |`);
+    }
+    // сырой author track: userspace решает, кому верить (порога/бана
+    // нет). Топ по hitRate
+    const tracks = [...bucket.tracks]
+        .filter(({ ideas }) => ideas > 0)
+        .sort((a, b) => b.hitRate - a.hitRate || b.ideas - a.ideas)
+        .slice(0, 20);
+    lines.push("");
+    lines.push(`### Author tracks — raw ideas/hits/hitRate per rule (top ${tracks.length} by hitRate; full set in --json)`);
+    lines.push("");
+    lines.push(`| Author | Hold | Lock% | Stop% | Trail% | Ideas | Hits | HitRate |`);
+    lines.push(`| --- | --- | --- | --- | --- | --- | --- | --- |`);
+    for (const t of tracks) {
+        lines.push(`| ${t.author} | ${t.holdMinutes / 60}h | ${t.profitLockPercent} | ${t.hardStopPercent} | ${t.trailingTakePercent} | ${t.ideas} | ${t.hits} | ${(t.hitRate * 100).toFixed(0)}% |`);
     }
     return lines.join("\n");
 };
-const main$5 = async () => {
+const main$4 = async () => {
     if (!getEntry(import.meta.url)) {
         return;
     }
     const { values, positionals } = getArgs();
-    if (!values.simulator) {
+    if (!values.sweep) {
         return;
     }
     const [ideasPath = null] = positionals.filter((value) => value.endsWith(".jsonl"));
@@ -4999,10 +4999,10 @@ const main$5 = async () => {
             console.error(`Error: invalid JSON in config file: ${configPath}`);
             process.exit(1);
         }
-        const problem = validateConfig$1(config);
+        const problem = validateConfig(config);
         if (problem) {
-            console.error(`Error: simulator config does not match the structure — ${problem}`);
-            console.error(`Expected shape: { "gridAxes"?: ISimulatorGridAxes, "reportOrder"?: "sharpe"|"sortino"|"pnl"|"recovery" }`);
+            console.error(`Error: sweep config does not match the structure — ${problem}`);
+            console.error(`Expected shape: { "gridAxes"?: ISweepGridAxes, "reportOrder"?: "sharpe"|"sortino"|"pnl"|"recovery" }`);
             process.exit(1);
         }
     }
@@ -5030,7 +5030,7 @@ const main$5 = async () => {
                 console.error(`Error: invalid JSON in ideas file, line ${i + 1}`);
                 process.exit(1);
             }
-            const problem = validateIdea$1(idea, i + 1);
+            const problem = validateIdea(idea, i + 1);
             if (problem) {
                 console.error(`Error: ideas file does not match the idea structure — ${problem}`);
                 console.error(`Expected shape: { "id": number, "ts": number, "symbol": string, "direction": "LONG"|"SHORT"|"NEUTRAL", "author": string }`);
@@ -5059,7 +5059,7 @@ const main$5 = async () => {
             process.exit(-1);
         }
     }
-    await cli.moduleConnectionService.loadModule("simulator.module");
+    await cli.moduleConnectionService.loadModule("sweep.module");
     {
         await cli.exchangeSchemaService.addSchema();
         await cli.symbolSchemaService.addSchema();
@@ -5079,8 +5079,8 @@ const main$5 = async () => {
     const symbol = values.symbol || "BTCUSDT";
     // оси и порядок отчёта приходят позиционным конфигом потребителя;
     // пустой конфиг — дефолтная сетка движка из connection-сервиса
-    addSimulatorSchema({
-        simulatorName: SIMULATOR_NAME$1,
+    addSweepSchema({
+        sweepName: SIMULATOR_NAME,
         exchangeName,
         ...(config.gridAxes ? { gridAxes: config.gridAxes } : {}),
         ...(config.reportOrder ? { reportOrder: config.reportOrder } : {}),
@@ -5100,22 +5100,20 @@ const main$5 = async () => {
                     console.log("onProfiles", { symbol, profiles: profiles.length, truncatedCount });
                 }
             },
-            onAuthorsTrained: (symbol, stats, bannedIdeas) => {
+            onAuthorsTrained: (symbol, tracks) => {
                 if (values.verbose) {
                     console.log("onAuthorsTrained", {
                         symbol,
-                        authors: stats.length,
-                        banned: stats.filter(({ banned }) => banned).length,
-                        bannedIdeas,
+                        authors: tracks.length,
                     });
                 }
             },
-            onGridPoint: (symbol, report) => {
+            onGridPoint: (symbol, report, trades) => {
                 if (values.verbose) {
                     console.log("onGridPoint", {
                         symbol,
                         point: report.point,
-                        trades: report.trades,
+                        trades: trades.length,
                         pnl: +report.totalPnlPercent.toFixed(2),
                         sharpe: +report.sharpe.toFixed(2),
                     });
@@ -5135,19 +5133,19 @@ const main$5 = async () => {
                 if (values.verbose) {
                     console.log("onDone", {
                         symbol,
-                        reports: Object.values(result.reports).flatMap((bucket) => bucket.reports).length,
-                        bans: Object.values(result.reports).flatMap((bucket) => bucket.bans).length,
+                        reports: result.reports.reports.length,
+                        tracks: result.reports.tracks.length,
                     });
                 }
             },
         },
     });
-    const result = await Simulator.run({
+    const result = await Sweep.run({
         symbol,
-        simulatorName: SIMULATOR_NAME$1,
+        sweepName: SIMULATOR_NAME,
         ideas,
     });
-    const dumpName = values.output || `simulator_${symbol}_${Date.now()}`;
+    const dumpName = values.output || `sweep_${symbol}_${Date.now()}`;
     const dumpDir = join(process.cwd(), "dump");
     if (values.json) {
         const filePath = resolve(dumpDir, `${dumpName}.json`);
@@ -5159,308 +5157,11 @@ const main$5 = async () => {
     if (values.markdown) {
         const filePath = resolve(dumpDir, `${dumpName}.md`);
         await mkdir(dumpDir, { recursive: true });
-        await writeFile(filePath, toMarkdown$1(result), "utf-8");
+        await writeFile(filePath, toMarkdown(result), "utf-8");
         console.log(`Saved: ${filePath}`);
         process.exit(0);
     }
-    console.log(toMarkdown$1(result));
-    process.exit(0);
-};
-main$5();
-
-const SIMULATOR_NAME = "cli_tune";
-const CONFIG_KEYS = ["point", "authorStats", "gridAxes", "reportOrder"];
-const POINT_NUMBER_FIELDS = [
-    "hardStopPercent",
-    "trailingTakePercent",
-    "holdMinutes",
-    "minAuthorTrack",
-    "minAuthorHitRate",
-    "profitLockPercent",
-];
-const IDEA_DIRECTIONS = ["LONG", "SHORT", "NEUTRAL"];
-const validateIdea = (idea, line) => {
-    if (typeof idea !== "object" || idea === null) {
-        return `line ${line}: not an object`;
-    }
-    if (typeof idea.id !== "number") {
-        return `line ${line}: "id" must be a number, got ${typeof idea.id}`;
-    }
-    if (typeof idea.ts !== "number") {
-        return `line ${line}: "ts" must be a number (unix ms), got ${typeof idea.ts}`;
-    }
-    if (typeof idea.symbol !== "string" || !idea.symbol) {
-        return `line ${line}: "symbol" must be a non-empty string`;
-    }
-    if (!IDEA_DIRECTIONS.includes(idea.direction)) {
-        return `line ${line}: "direction" must be one of ${IDEA_DIRECTIONS.join("|")}, got ${JSON.stringify(idea.direction)}`;
-    }
-    if (typeof idea.author !== "string" || !idea.author) {
-        return `line ${line}: "author" must be a non-empty string`;
-    }
-    return null;
-};
-const validateConfig = (config) => {
-    if (typeof config !== "object" || config === null || Array.isArray(config)) {
-        return "config must be a JSON object";
-    }
-    for (const key of Object.keys(config)) {
-        if (!CONFIG_KEYS.includes(key)) {
-            return `unknown key "${key}" (expected: ${CONFIG_KEYS.join(", ")})`;
-        }
-    }
-    if (typeof config.point !== "object" || config.point === null) {
-        return `"point" is required — the frozen grid point of a training run`;
-    }
-    for (const field of POINT_NUMBER_FIELDS) {
-        if (typeof config.point[field] !== "number") {
-            return `"point.${field}" must be a number, got ${typeof config.point[field]}`;
-        }
-    }
-    if (typeof config.point.authorMetric !== "string") {
-        return `"point.authorMetric" must be a string, got ${typeof config.point.authorMetric}`;
-    }
-    if (!Array.isArray(config.authorStats) || !config.authorStats.length) {
-        return `"authorStats" is required — the frozen raw track record (non-empty array)`;
-    }
-    for (let i = 0; i < config.authorStats.length; i++) {
-        const stat = config.authorStats[i];
-        if (typeof stat !== "object" ||
-            stat === null ||
-            typeof stat.author !== "string" ||
-            typeof stat.ideas !== "number" ||
-            typeof stat.hits !== "number") {
-            return `"authorStats[${i}]" must be { author: string, ideas: number, hits: number }`;
-        }
-    }
-    return null;
-};
-/** Одноточечные оси, зеркалящие замороженную точку — сетка инертна. */
-const axesFromPoint = (point) => ({
-    hardStopPercent: [point.hardStopPercent],
-    trailingTakePercent: [point.trailingTakePercent],
-    holdMinutes: [point.holdMinutes],
-    minAuthorTrack: [point.minAuthorTrack],
-    minAuthorHitRate: [point.minAuthorHitRate],
-    profitLockPercent: [point.profitLockPercent],
-    authorMetric: [point.authorMetric],
-});
-const pointLabel = (point) => `H=${point.hardStopPercent} TT=${point.trailingTakePercent} hold=${point.holdMinutes / 60}h ` +
-    `track=${point.minAuthorTrack} rate=${point.minAuthorHitRate} ` +
-    `lock=${point.profitLockPercent} metric=${point.authorMetric}`;
-const fmtRatio = (value) => Number.isFinite(value) ? value.toFixed(2) : "inf";
-const toMarkdown = (test) => {
-    const lines = [];
-    lines.push(`# Tune Report — ${test.symbol}`);
-    lines.push("");
-    lines.push(`ONE out-of-sample shot of a FROZEN training artifact: nothing is trained here — the point and the raw author track record come from the input config verbatim, bans are re-derived from the frozen numbers under the point's rule, unseen authors are banned by default.`);
-    lines.push("");
-    lines.push(`Frozen point: ${pointLabel(test.point)}`);
-    lines.push("");
-    lines.push(`## Out-of-sample (${test.ideasDirectional} directional ideas)`);
-    lines.push("");
-    lines.push(`| Metric | Value |`);
-    lines.push(`| --- | --- |`);
-    lines.push(`| Trades (skipped busy) | ${test.report.trades} (${test.report.skippedBusy}) |`);
-    lines.push(`| PNL | ${test.report.totalPnlPercent.toFixed(2)}% |`);
-    lines.push(`| Win rate | ${(test.report.winRate * 100).toFixed(0)}% |`);
-    lines.push(`| Profit factor | ${fmtRatio(test.report.profitFactor)} |`);
-    lines.push(`| Max series drawdown | ${test.report.maxSeriesDrawdownPercent.toFixed(2)}% |`);
-    lines.push(`| Sharpe / Sortino | ${fmtRatio(test.report.sharpe)} / ${fmtRatio(test.report.sortino)} |`);
-    lines.push(`| Recovery factor | ${fmtRatio(test.report.recoveryFactor)} |`);
-    lines.push(`| Exits | ${Object.entries(test.report.exitReasons).map(([reason, count]) => `${reason}=${count}`).join(", ")} |`);
-    lines.push("");
-    lines.push(`## Test trades`);
-    lines.push("");
-    lines.push(`| Direction | Exit | PNL% | Hold | Entry (UTC) |`);
-    lines.push(`| --- | --- | --- | --- | --- |`);
-    for (const trade of test.trades) {
-        lines.push(`| ${trade.direction} | ${trade.exitReason} | ${trade.pnlPercent.toFixed(2)} | ${trade.holdMinutesActual}m | ${new Date(trade.entryTimestamp).toISOString()} |`);
-    }
-    lines.push("");
-    lines.push(`## Frozen author track record (re-derived bans under the point's rule)`);
-    lines.push("");
-    lines.push(`| Author | Ideas | Hits | Banned |`);
-    lines.push(`| --- | --- | --- | --- |`);
-    for (const stat of test.authorStats) {
-        lines.push(`| ${stat.author} | ${stat.ideas} | ${stat.hits} | ${stat.banned ? "yes" : ""} |`);
-    }
-    return lines.join("\n");
-};
-const main$4 = async () => {
-    if (!getEntry(import.meta.url)) {
-        return;
-    }
-    const { values, positionals } = getArgs();
-    if (!values.tune) {
-        return;
-    }
-    const [ideasPath = null] = positionals.filter((value) => value.endsWith(".jsonl"));
-    if (!ideasPath) {
-        console.error("Error: positional path to an ideas .jsonl file is required");
-        process.exit(1);
-    }
-    // конфиг — позиционный JSON; без него подтягивается пустой объект
-    // (и валидация честно скажет, что замороженной точки нет)
-    const [configPath = null] = positionals.filter((value) => value.endsWith(".json") && !value.endsWith(".jsonl"));
-    let config = {};
-    if (configPath) {
-        let content;
-        try {
-            content = await readFile(resolve(configPath), "utf-8");
-        }
-        catch (error) {
-            console.error(`Error: cannot read config file: ${configPath}`);
-            process.exit(1);
-        }
-        try {
-            config = JSON.parse(content);
-        }
-        catch {
-            console.error(`Error: invalid JSON in config file: ${configPath}`);
-            process.exit(1);
-        }
-    }
-    {
-        const problem = validateConfig(config);
-        if (problem) {
-            console.error(`Error: tune config does not match the structure — ${problem}`);
-            console.error(`Expected shape: { "point": ISimulatorGridPoint, "authorStats": [{ "author", "ideas", "hits" }], "gridAxes"?, "reportOrder"? }`);
-            process.exit(1);
-        }
-    }
-    let ideas = [];
-    {
-        let content;
-        try {
-            content = await readFile(resolve(ideasPath), "utf-8");
-        }
-        catch (error) {
-            console.error(`Error: cannot read ideas file: ${ideasPath}`);
-            process.exit(1);
-        }
-        const rows = content.split("\n").filter(Boolean);
-        if (!rows.length) {
-            console.error(`Error: ideas file is empty: ${ideasPath}`);
-            process.exit(1);
-        }
-        for (let i = 0; i < rows.length; i++) {
-            let idea;
-            try {
-                idea = JSON.parse(rows[i]);
-            }
-            catch {
-                console.error(`Error: invalid JSON in ideas file, line ${i + 1}`);
-                process.exit(1);
-            }
-            const problem = validateIdea(idea, i + 1);
-            if (problem) {
-                console.error(`Error: ideas file does not match the idea structure — ${problem}`);
-                console.error(`Expected shape: { "id": number, "ts": number, "symbol": string, "direction": "LONG"|"SHORT"|"NEUTRAL", "author": string }`);
-                process.exit(1);
-            }
-            ideas.push(idea);
-        }
-    }
-    {
-        const cwd = process.cwd();
-        dotenv.config({ path: path.join(cwd, '.env'), override: true, quiet: true });
-    }
-    await cli.configConnectionService.loadConfig("setup.config");
-    {
-        const loader = await cli.configConnectionService.loadConfig("loader.config");
-        try {
-            if (typeof loader === "function") {
-                await loader();
-            }
-            if (typeof loader?.loader === "function") {
-                await loader.loader();
-            }
-        }
-        catch (error) {
-            console.error("Module loader failed", error);
-            process.exit(-1);
-        }
-    }
-    await cli.moduleConnectionService.loadModule("tune.module");
-    {
-        await cli.exchangeSchemaService.addSchema();
-        await cli.symbolSchemaService.addSchema();
-    }
-    const [defaultExchangeName = null] = await listExchangeSchema();
-    const exchangeName = values.exchange || defaultExchangeName?.exchangeName;
-    if (values.verbose) {
-        overrideExchangeSchema({
-            exchangeName,
-            callbacks: {
-                onCandleData(symbol, interval, since) {
-                    console.log(`Received candle data for symbol: ${symbol}, interval: ${interval}, since: ${since.toUTCString()}`);
-                },
-            },
-        });
-    }
-    const symbol = values.symbol || "BTCUSDT";
-    // сетка для test() инертна (оценивается ровно замороженная точка):
-    // без явных осей в конфиге они одноточечно зеркалят точку
-    addSimulatorSchema({
-        simulatorName: SIMULATOR_NAME,
-        exchangeName,
-        gridAxes: config.gridAxes ?? axesFromPoint(config.point),
-        ...(config.reportOrder ? { reportOrder: config.reportOrder } : {}),
-        callbacks: {
-            onProgress: (symbol, stage, processed, total) => {
-                if (values.verbose) {
-                    console.log("onProgress", { symbol, stage, processed, total });
-                }
-            },
-            onIdeas: (symbol, ideasTotal, ideasDirectional) => {
-                if (values.verbose) {
-                    console.log("onIdeas", { symbol, ideasTotal, ideasDirectional });
-                }
-            },
-            onProfiles: (symbol, profiles, truncatedCount) => {
-                if (values.verbose) {
-                    console.log("onProfiles", { symbol, profiles: profiles.length, truncatedCount });
-                }
-            },
-            onTestDone: (symbol, result) => {
-                if (values.verbose) {
-                    console.log("onTestDone", {
-                        symbol,
-                        trades: result.report.trades,
-                        pnl: +result.report.totalPnlPercent.toFixed(2),
-                    });
-                }
-            },
-        },
-    });
-    // только out-of-sample: обучения нет, точка и трек-рекорд приходят
-    // из конфига verbatim — test() перевыводит баны под правило точки,
-    // невиданные авторы забанены по умолчанию
-    const test = await Simulator.test({
-        symbol,
-        simulatorName: SIMULATOR_NAME,
-        ideas,
-        point: config.point,
-        authorStats: config.authorStats,
-    });
-    const dumpName = values.output || `tune_${symbol}_${Date.now()}`;
-    const dumpDir = join(process.cwd(), "dump");
-    if (values.json) {
-        const filePath = resolve(dumpDir, `${dumpName}.json`);
-        await mkdir(dumpDir, { recursive: true });
-        await writeFile(filePath, JSON.stringify(test, null, 2), "utf-8");
-        console.log(`Saved: ${filePath}`);
-        process.exit(0);
-    }
-    if (values.markdown) {
-        const filePath = resolve(dumpDir, `${dumpName}.md`);
-        await mkdir(dumpDir, { recursive: true });
-        await writeFile(filePath, toMarkdown(test), "utf-8");
-        console.log(`Saved: ${filePath}`);
-        process.exit(0);
-    }
-    console.log(toMarkdown(test));
+    console.log(toMarkdown(result));
     process.exit(0);
 };
 main$4();
@@ -5661,8 +5362,7 @@ Modes:
   --dump                Fetch and save raw OHLCV candles
   --pnldebug            Simulate PnL per minute for a given entry price and direction
   --brokerdebug         Fire a single broker commit against the live broker adapter
-  --simulator <ideas.jsonl> [config.json]  Feasibility probe over crowd ideas: is there a profitable corridor at all
-  --tune      <ideas.jsonl> <config.json>   ONE out-of-sample shot of a frozen training artifact (point + author track)
+  --sweep <ideas.jsonl> [config.json]  Grid sweep over crowd ideas: profit-before-stop corridor + raw author tracks
   --flush  <entry...>   Delete report/log/markdown/agent folders from strategy dump dir
   --init                Scaffold a new project in the current directory
   --docker              Scaffold a Docker workspace for running strategies in a container
@@ -5783,64 +5483,36 @@ Broker debug flags (--brokerdebug):
   Loads ./live.module, fetches the last candle for --symbol/--timeframe, and calls
   the selected broker commit with synthetic payload values derived from current price.
 
-Simulator flags (--simulator):
+Sweep flags (--sweep):
 
   --symbol      <string>   Trading pair to simulate (default: BTCUSDT)
   --exchange    <string>   Exchange name (default: first registered)
-  --output      <string>   Output file base name (default: simulator_{SYMBOL}_{TIMESTAMP})
-  --json                   Save full ISimulatorResult to ./dump/<output>.json
+  --output      <string>   Output file base name (default: sweep_{SYMBOL}_{TIMESTAMP})
+  --json                   Save full ISweepResult to ./dump/<output>.json
   --markdown               Save summary report to ./dump/<output>.md
-  --verbose                Log every simulator lifecycle callback to the console
+  --verbose                Log every sweep lifecycle callback to the console
 
   Positionals: path to an ideas .jsonl file — one idea per line with the exact shape
   { "id": number, "ts": number, "symbol": string, "direction": "LONG"|"SHORT"|"NEUTRAL",
   "author": string } — and an OPTIONAL config .json with the shape
-  { "gridAxes"?: ISimulatorGridAxes, "reportOrder"?: "sharpe"|"sortino"|"pnl"|"recovery" }.
+  { "gridAxes"?: ISweepGridAxes, "reportOrder"?: "sharpe"|"sortino"|"pnl"|"recovery" }.
   Both files are validated BEFORE any work; a mismatch aborts the run with an error.
   No config -> an empty object is used and the engine defaults apply (the full
   default grid axes and reportOrder "sharpe" of the connection service).
 
-  A FEASIBILITY PROBE, not an out-of-sample shot (that is --tune): the grid from
-  the config (or the engine default) answers one question — does the feed contain
-  a profitable corridor at all. One candle pass per idea to the grid's longest
-  hold, flood dedupe (one idea per author per direction per 8h), default-ban
-  author filter graded inside each point's own hold window, time-based
-  Sharpe/Sortino, per-metric buckets with their own ranking winners and ban
-  dictionaries. Ideas of other symbols are filtered out — one shared feed serves
-  any --symbol.
+  A GRID SWEEP: the grid from the config (or the engine default) is evaluated
+  per point. One candle pass per idea to the grid's longest hold, flood dedupe
+  (one idea per author per direction per 8h), EVERY author traded (no ban — the
+  engine reports the raw per-author track graded inside each point's own hold
+  window; who to trust is userspace), time-based Sharpe/Sortino, per-metric
+  buckets with their own ranking winners and author tracks. Ideas of other
+  symbols are filtered out — one shared feed serves any --symbol.
 
   No output flag → print the Markdown summary to stdout. With --verbose every
-  simulator lifecycle callback (onProgress, onIdeas, onProfiles, onAuthorsTrained,
+  sweep lifecycle callback (onProgress, onIdeas, onProfiles, onAuthorsTrained,
   onGridPoint, onRanking, onDone) is logged to the console as it fires.
 
-  Module file ./modules/simulator.module is loaded automatically if it exists
-  (register your exchange there); without it CCXT Binance is used by default.
-
-Tune flags (--tune):
-
-  --symbol      <string>   Trading pair to test (default: BTCUSDT)
-  --exchange    <string>   Exchange name (default: first registered)
-  --output      <string>   Output file base name (default: tune_{SYMBOL}_{TIMESTAMP})
-  --json                   Save the full ISimulatorTestResult to ./dump/<output>.json
-  --markdown               Save the out-of-sample report to ./dump/<output>.md
-  --verbose                Log simulator lifecycle callbacks to the console
-
-  Positionals: path to an ideas .jsonl file (same shape and validation as
-  --simulator) and a config .json carrying the FROZEN training artifact:
-  { "point": ISimulatorGridPoint, "authorStats": [{ "author", "ideas", "hits" }],
-  "gridAxes"?, "reportOrder"? }. The point and authorStats are REQUIRED — without
-  them there is nothing to test and the run aborts with an error. gridAxes are
-  optional: by default they mirror the frozen point one value per axis (the grid
-  is inert for a test).
-
-  ONE OUT-OF-SAMPLE SHOT, no training: the CLI never runs the sweep — pick your
-  candidate elsewhere (a Simulator.run of your own), freeze its point and raw
-  author track record into the config, and fire it once here via Simulator.test.
-  Bans are re-derived from the frozen numbers under the point's rule; authors
-  unseen in the config are banned by default. The report carries the result with
-  the trade list and the frozen track record with re-derived ban flags.
-
-  Module file ./modules/tune.module is loaded automatically if it exists
+  Module file ./modules/sweep.module is loaded automatically if it exists
   (register your exchange there); without it CCXT Binance is used by default.
 
 Flush flags (--flush):
@@ -5876,8 +5548,7 @@ Module hooks (loaded automatically by each mode):
   modules/dump.module       --dump       Exchange schema for candle dumps
   modules/pnldebug.module   --pnldebug      Exchange schema for PnL debug runs
   modules/brokerdebug.module  --brokerdebug   Broker adapter used for broker commit testing
-  modules/simulator.module  --simulator     Exchange schema for the crowd-ideas feasibility probe
-  modules/tune.module       --tune          Exchange schema for the walk-forward parameter search
+  modules/sweep.module  --sweep     Exchange schema for the crowd-ideas feasibility probe
 
   --flush has no associated module. It only removes dump subdirectories.
 
@@ -5906,10 +5577,8 @@ Examples:
   node ${ENTRY_PATH} --pnldebug --priceopen 67956.73 --direction long --when 1772064000000 --minutes 60 --markdown
   node ${ENTRY_PATH} --brokerdebug --commit signal-open --symbol BTCUSDT
   node ${ENTRY_PATH} --brokerdebug --commit partial-profit --symbol ETHUSDT
-  node ${ENTRY_PATH} --simulator --symbol BTCUSDT ./assets/tv-ideas.normalized.jsonl
-  node ${ENTRY_PATH} --simulator --symbol BTCUSDT --json --output jun_2026_probe ./assets/tv-ideas.normalized.jsonl ./assets/probe.config.json
-  node ${ENTRY_PATH} --tune --symbol BTCUSDT ./assets/tv-ideas.normalized.jsonl
-  node ${ENTRY_PATH} --tune --symbol BTCUSDT --markdown --output jun_2026_tune ./assets/tv-ideas.normalized.jsonl ./assets/tune.config.json
+  node ${ENTRY_PATH} --sweep --symbol BTCUSDT ./assets/tv-ideas.normalized.jsonl
+  node ${ENTRY_PATH} --sweep --symbol BTCUSDT --json --output jun_2026_probe ./assets/tv-ideas.normalized.jsonl ./assets/probe.config.json
   node ${ENTRY_PATH} --flush ./content/feb_2026.strategy/feb_2026.strategy.ts
   node ${ENTRY_PATH} --flush ./content/feb_2026.strategy/feb_2026.strategy.ts ./content/feb_2026.strategy/feb_2026.test.ts
   node ${ENTRY_PATH} --init --output my-trading-bot
@@ -5923,7 +5592,7 @@ const main$1 = async () => {
     if (!values.help) {
         return;
     }
-    process.stdout.write(`@backtest-kit/cli ${"17.0.0"}\n\n`);
+    process.stdout.write(`@backtest-kit/cli ${"17.7.0"}\n\n`);
     process.stdout.write(HELP_TEXT);
     process.exit(0);
 };
@@ -5937,7 +5606,7 @@ const main = async () => {
     if (!values.version) {
         return;
     }
-    process.stdout.write(`@backtest-kit/cli ${"17.0.0"}\n`);
+    process.stdout.write(`@backtest-kit/cli ${"17.7.0"}\n`);
     process.exit(0);
 };
 main();