@tradejs/app 2.0.6 → 2.0.7

package/README.md

@@ -26,8 +26,19 @@ npx tradejs-app dev
 ```
 
 Use matching versions for all `@tradejs/*` packages. The installable launcher
-requires `@tradejs/app@1.0.10` or newer.
+is included in current `@tradejs/app` releases.
 
 The launcher reads env and `tradejs.config.ts` from the caller project directory
 via `PROJECT_CWD`. When it runs from `node_modules`, it creates a generated
 `.tradejs/app` working copy and runs Next.js there.
+
+## Anonymous Onboarding Telemetry
+
+The Web UI reports only the anonymous Yandex Metrica goal names
+`scaffold_success` and `first_backtest`. It does not include strategy
+configuration, symbols, credentials, or backtest results. Disable these events
+before starting or building the app with:
+
+```bash
+NEXT_PUBLIC_TRADEJS_TELEMETRY_DISABLED=1
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tradejs/app",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Installable Next.js UI for the TradeJS TypeScript framework: dashboards, backtests, charts, and runtime data.",
   "keywords": [
     "tradejs",
@@ -51,12 +51,12 @@
     "@emotion/react": "^11.14.0",
     "@langchain/core": "^1.2.3",
     "@langchain/openai": "^1.5.5",
-    "@tradejs/connectors": "^2.0.6",
-    "@tradejs/core": "^2.0.6",
-    "@tradejs/indicators": "^2.0.6",
-    "@tradejs/infra": "^2.0.6",
-    "@tradejs/node": "^2.0.6",
-    "@tradejs/types": "^2.0.6",
+    "@tradejs/connectors": "^2.0.7",
+    "@tradejs/core": "^2.0.7",
+    "@tradejs/indicators": "^2.0.7",
+    "@tradejs/infra": "^2.0.7",
+    "@tradejs/node": "^2.0.7",
+    "@tradejs/types": "^2.0.7",
     "@types/bcryptjs": "2.4.6",
     "@types/lodash": "4.17.24",
     "@types/node": "24.13.3",

package/src/app/api/strategies/runtime/route.ts

@@ -1,5 +1,4 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { TTL_1M } from '@tradejs/core/constants';
 import { getRuntimeStorageDayKeys } from '@tradejs/core/time';
 import { logger } from '@tradejs/infra/logger';
 import {
@@ -9,17 +8,14 @@ import {
 } from '@tradejs/infra/tradingAccounts';
 import { strategyEntries } from '@tradejs/strategies';
 import {
-  delKey,
   getData,
   getHashJsonValues,
   getKeys,
   redisKeys,
-  setData,
 } from '@tradejs/infra/redis';
 import type {
   Connector,
   ConnectorCreator,
-  PositionPnlSnapshot,
   RuntimeTradeRecord,
   Interval,
   StrategyConfig,
@@ -39,15 +35,12 @@ import {
   resolveStrategyConfigIdentityByKey,
   RuntimeStrategiesResponse,
   selectTradesForWindow,
-  takeClosedPnlMatch,
   toRuntimeTradeView,
 } from '#app/lib/runtimeStrategies';
-
-type ClosedPnlRecordWithOrderLinkId = Awaited<
-  ReturnType<NonNullable<Connector['getClosedPnl']>>
->[number] & {
-  orderLinkId?: string;
-};
+import {
+  isRuntimeTradeInConnectorScope,
+  syncRuntimeTrades,
+} from '#app/lib/runtimeTradeSync';
 
 export const dynamic = 'force-dynamic';
 
@@ -322,207 +315,25 @@ const loadExchangeEntryRows = async ({
 const loadOpenPositions = async (
   connector: Connector,
   errors?: string[],
-): Promise<PositionPnlSnapshot[]> => {
+): Promise<{
+  positions: Awaited<ReturnType<NonNullable<Connector['getOpenPositionPnl']>>>;
+  reliable: boolean;
+}> => {
   if (typeof connector.getOpenPositionPnl !== 'function') {
-    return [];
+    return { positions: [], reliable: false };
   }
 
   try {
-    return await connector.getOpenPositionPnl();
+    return {
+      positions: await connector.getOpenPositionPnl(),
+      reliable: true,
+    };
   } catch (error) {
     const message = (error as Error)?.message || String(error);
     errors?.push(`getOpenPositionPnl: ${message}`);
     logger.warn('strategies runtime: getOpenPositionPnl failed: %s', message);
-    return [];
-  }
-};
-
-const buildRiskLevelsAnalysis = (position: PositionPnlSnapshot) => {
-  const takeProfitPrice =
-    typeof position.takeProfitPrice === 'number' &&
-    Number.isFinite(position.takeProfitPrice)
-      ? position.takeProfitPrice
-      : null;
-  const stopLossPrice =
-    typeof position.stopLossPrice === 'number' &&
-    Number.isFinite(position.stopLossPrice)
-      ? position.stopLossPrice
-      : null;
-
-  if (takeProfitPrice == null && stopLossPrice == null) {
-    return null;
-  }
-
-  return {
-    ...(takeProfitPrice != null ? { takeProfitPrice } : {}),
-    ...(stopLossPrice != null ? { stopLossPrice } : {}),
-  };
-};
-
-const syncRuntimeTrades = async ({
-  userName,
-  trades,
-  endTime,
-  openPositions,
-  closedPnlRows,
-}: {
-  userName: string;
-  trades: RuntimeTradeRecord[];
-  endTime: number;
-  openPositions: PositionPnlSnapshot[];
-  closedPnlRows: ClosedPnlRecordWithOrderLinkId[];
-}) => {
-  const openPositionsBySymbol = new Map(
-    openPositions.map((position) => [position.symbol, position]),
-  );
-  const activeOrderIdBySymbol = new Map<string, string | null>();
-  const symbols = [...new Set(trades.map((trade) => trade.symbol))];
-
-  await Promise.all(
-    symbols.map(async (symbol) => {
-      const activeRef = (await getData(
-        redisKeys.runtimeActiveTrade(userName, symbol),
-        null,
-      )) as { orderId?: string } | null;
-      activeOrderIdBySymbol.set(
-        symbol,
-        typeof activeRef?.orderId === 'string' ? activeRef.orderId : null,
-      );
-    }),
-  );
-
-  const closedPnlRowsWithOrderLinkId =
-    closedPnlRows as ClosedPnlRecordWithOrderLinkId[];
-  const exactByOrderLinkId = new Map(
-    closedPnlRowsWithOrderLinkId
-      .filter(
-        (row): row is typeof row & { orderLinkId: string } =>
-          typeof row.orderLinkId === 'string' && row.orderLinkId.length > 0,
-      )
-      .map((row) => [row.orderLinkId, row]),
-  );
-  const exactByOrderId = new Map(
-    closedPnlRowsWithOrderLinkId
-      .filter(
-        (row): row is typeof row & { orderId: string } =>
-          typeof row.orderId === 'string' && row.orderId.length > 0,
-      )
-      .map((row) => [row.orderId, row]),
-  );
-  const symbolBuckets = new Map<string, ClosedPnlRecordWithOrderLinkId[]>();
-
-  for (const row of closedPnlRowsWithOrderLinkId) {
-    const bucket = symbolBuckets.get(row.symbol) ?? [];
-    bucket.push(row);
-    symbolBuckets.set(row.symbol, bucket);
-  }
-
-  const syncedTrades: RuntimeTradeRecord[] = [];
-
-  for (const trade of trades) {
-    const closedTradeHasExchangeDetails =
-      trade.status === 'closed' &&
-      typeof trade.exitPrice === 'number' &&
-      Number.isFinite(trade.exitPrice) &&
-      typeof trade.actualExitPrice === 'number' &&
-      Number.isFinite(trade.actualExitPrice) &&
-      typeof trade.closedPnl === 'number' &&
-      Number.isFinite(trade.closedPnl) &&
-      typeof trade.openFee === 'number' &&
-      Number.isFinite(trade.openFee) &&
-      typeof trade.closeFee === 'number' &&
-      Number.isFinite(trade.closeFee);
-
-    if (trade.status !== 'active' && closedTradeHasExchangeDetails) {
-      syncedTrades.push(trade);
-      continue;
-    }
-
-    const openPosition = openPositionsBySymbol.get(trade.symbol);
-    const activeOrderId = activeOrderIdBySymbol.get(trade.symbol);
-    const isCurrentActiveTrade = activeOrderId === trade.orderId;
-
-    if (
-      isCurrentActiveTrade &&
-      openPosition &&
-      openPosition.direction === trade.direction
-    ) {
-      const riskLevelsAnalysis = buildRiskLevelsAnalysis(openPosition);
-      const nextTrade: RuntimeTradeRecord = {
-        ...trade,
-        status: 'active',
-        currentPrice: openPosition.currentPrice,
-        currentPnl: openPosition.unrealizedPnl,
-        aiAnalysis: riskLevelsAnalysis
-          ? { ...(trade.aiAnalysis ?? {}), ...riskLevelsAnalysis }
-          : trade.aiAnalysis,
-        lastSyncedAt: endTime,
-      };
-
-      await setData(
-        redisKeys.runtimeTrade(userName, trade.orderId),
-        nextTrade,
-        {
-          expire: 0,
-        },
-      );
-      syncedTrades.push(nextTrade);
-      continue;
-    }
-
-    const matchedClosedPnl = takeClosedPnlMatch({
-      exactByOrderLinkId,
-      exactByOrderId,
-      symbolBuckets,
-      trade,
-    });
-
-    if (trade.status === 'closed' && !matchedClosedPnl) {
-      syncedTrades.push(trade);
-      continue;
-    }
-
-    const nextTrade: RuntimeTradeRecord = {
-      ...trade,
-      status: 'closed',
-      currentPrice: matchedClosedPnl?.exitPrice ?? trade.currentPrice ?? null,
-      currentPnl:
-        matchedClosedPnl?.closedPnl ??
-        trade.closedPnl ??
-        trade.currentPnl ??
-        null,
-      closedPnl:
-        matchedClosedPnl?.closedPnl ??
-        trade.closedPnl ??
-        trade.currentPnl ??
-        null,
-      actualEntryPrice:
-        matchedClosedPnl?.entryPrice ?? trade.actualEntryPrice ?? null,
-      exitPrice: matchedClosedPnl?.exitPrice ?? trade.exitPrice ?? null,
-      actualExitPrice:
-        matchedClosedPnl?.exitPrice ?? trade.actualExitPrice ?? null,
-      exitTimestamp:
-        matchedClosedPnl?.closedAt ?? trade.exitTimestamp ?? endTime,
-      exitType: trade.exitType ?? null,
-      openFee: matchedClosedPnl?.openFee ?? trade.openFee ?? null,
-      closeFee: matchedClosedPnl?.closeFee ?? trade.closeFee ?? null,
-      fundingFee: matchedClosedPnl?.fundingFee ?? trade.fundingFee ?? null,
-      totalFee: matchedClosedPnl?.totalFee ?? trade.totalFee ?? null,
-      lastSyncedAt: endTime,
-    };
-
-    await Promise.all([
-      setData(redisKeys.runtimeTrade(userName, trade.orderId), nextTrade, {
-        expire: TTL_1M,
-      }),
-      ...(isCurrentActiveTrade
-        ? [delKey(redisKeys.runtimeActiveTrade(userName, trade.symbol))]
-        : []),
-    ]);
-    syncedTrades.push(nextTrade);
+    return { positions: [], reliable: false };
   }
-
-  return syncedTrades;
 };
 
 export const GET = async (request: NextRequest) => {
@@ -559,7 +370,7 @@ export const GET = async (request: NextRequest) => {
       activeOrderIds,
       closedPnlRows,
       entryRows,
-      openPositions,
+      openPositionsSnapshot,
       runtimeDeployments,
       tradingAccounts,
     ] = await Promise.all([
@@ -588,20 +399,22 @@ export const GET = async (request: NextRequest) => {
       startTime,
       activeOrderIds,
     );
-    const scopedTrades = relevantTrades.filter((trade) =>
-      Boolean(trade.accountId || trade.deploymentId),
+    const syncableTrades = relevantTrades.filter((trade) =>
+      isRuntimeTradeInConnectorScope(trade, connector),
     );
-    const defaultAccountTrades = relevantTrades.filter(
-      (trade) => !trade.accountId && !trade.deploymentId,
+    const unsyncedTrades = relevantTrades.filter(
+      (trade) => !isRuntimeTradeInConnectorScope(trade, connector),
     );
-    const syncedDefaultAccountTrades = await syncRuntimeTrades({
+    const syncedConnectorTrades = await syncRuntimeTrades({
       userName,
-      trades: defaultAccountTrades,
+      connector,
+      trades: syncableTrades,
       endTime,
-      openPositions,
+      openPositions: openPositionsSnapshot.positions,
+      openPositionsReliable: openPositionsSnapshot.reliable,
       closedPnlRows,
     });
-    const syncedTrades = [...scopedTrades, ...syncedDefaultAccountTrades];
+    const syncedTrades = [...unsyncedTrades, ...syncedConnectorTrades];
     const fallbackStrategyNames = [
       ...new Set([
         ...runtimeStrategyConfigs.map(({ strategyName }) => strategyName),
@@ -611,7 +424,7 @@ export const GET = async (request: NextRequest) => {
     const fallbackTrades = buildExchangeFallbackRuntimeTrades({
       entryRows,
       closedPnlRows,
-      openPositions,
+      openPositions: openPositionsSnapshot.positions,
       strategyNames: fallbackStrategyNames,
       existingTrades: syncedTrades,
       endTime,

package/src/app/components/Dashboard/KlineChart/figures/backtestFigureTypes.ts

@@ -1,4 +1,5 @@
 export type {
+  EntryAnnotationExtendData,
   EntryLineExtendData,
   EntryPointsExtendData,
   EntryZoneExtendData,

package/src/app/components/Dashboard/KlineChart/figures/entryAnnotationPointFigure.ts

@@ -0,0 +1 @@
+export { createEntryAnnotationPointFigure } from '@tradejs/core/figures';

package/src/app/layout.tsx

@@ -1,5 +1,7 @@
 import type { Metadata } from 'next';
+import Script from 'next/script';
 import { AppShell } from '#shared/AppShell';
+import { YANDEX_METRIKA_COUNTER_ID } from '#app/lib/yandexMetrika';
 import Provider from './provider';
 import './globals.css';
 
@@ -53,6 +55,9 @@ export default function RootLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
+  const telemetryEnabled =
+    process.env.NEXT_PUBLIC_TRADEJS_TELEMETRY_DISABLED !== '1';
+
   return (
     <html
       lang="en"
@@ -61,6 +66,39 @@ export default function RootLayout({
       suppressHydrationWarning
     >
       <body suppressHydrationWarning>
+        {telemetryEnabled ? (
+          <>
+            <Script id="yandex-metrika" strategy="afterInteractive">
+              {`
+                (function(m,e,t,r,i,k,a){
+                  m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
+                  m[i].l=1*new Date();
+                  for (var j = 0; j < document.scripts.length; j++) {
+                    if (document.scripts[j].src === r) { return; }
+                  }
+                  k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a);
+                })(window, document, 'script', 'https://mc.yandex.ru/metrika/tag.js?id=${YANDEX_METRIKA_COUNTER_ID}', 'ym');
+
+                ym(${YANDEX_METRIKA_COUNTER_ID}, 'init', {
+                  clickmap: false,
+                  ecommerce: false,
+                  accurateTrackBounce: true,
+                  trackLinks: false
+                });
+              `}
+            </Script>
+            <noscript>
+              <div>
+                {/* eslint-disable-next-line @next/next/no-img-element */}
+                <img
+                  src={`https://mc.yandex.ru/watch/${YANDEX_METRIKA_COUNTER_ID}`}
+                  style={{ position: 'absolute', left: '-9999px' }}
+                  alt=""
+                />
+              </div>
+            </noscript>
+          </>
+        ) : null}
         <Provider>
           <AppShell>{children}</AppShell>
         </Provider>

package/src/app/lib/runtimeTradeSync.ts

@@ -0,0 +1,271 @@
+import { TTL_1M } from '@tradejs/core/constants';
+import { getRuntimeStorageDayKey } from '@tradejs/core/time';
+import {
+  delKey,
+  getData,
+  redisKeys,
+  setData,
+  setHashJsonField,
+} from '@tradejs/infra/redis';
+import type {
+  ClosedPnlRecord,
+  Connector,
+  PositionPnlSnapshot,
+  RuntimeTradeRecord,
+} from '@tradejs/types';
+import { takeClosedPnlMatch } from './runtimeStrategies';
+
+export type ClosedPnlRecordWithOrderLinkId = ClosedPnlRecord & {
+  orderLinkId?: string;
+};
+
+const getRuntimeTradeScopeId = (trade: RuntimeTradeRecord) =>
+  trade.deploymentId ?? trade.accountId;
+
+export const isRuntimeTradeInConnectorScope = (
+  trade: RuntimeTradeRecord,
+  connector: Connector,
+) => {
+  if (trade.deploymentId && trade.deploymentId !== connector.deploymentId) {
+    return false;
+  }
+  if (trade.deploymentId && !connector.deploymentId) {
+    return false;
+  }
+  if (trade.accountId && trade.accountId !== connector.accountId) {
+    return false;
+  }
+  if (trade.accountId && !connector.accountId) {
+    return false;
+  }
+
+  return (trade.universe ?? 'crypto') === connector.universe;
+};
+
+const buildRiskLevelsAnalysis = (position: PositionPnlSnapshot) => {
+  const takeProfitPrice =
+    typeof position.takeProfitPrice === 'number' &&
+    Number.isFinite(position.takeProfitPrice)
+      ? position.takeProfitPrice
+      : null;
+  const stopLossPrice =
+    typeof position.stopLossPrice === 'number' &&
+    Number.isFinite(position.stopLossPrice)
+      ? position.stopLossPrice
+      : null;
+
+  if (takeProfitPrice == null && stopLossPrice == null) {
+    return null;
+  }
+
+  return {
+    ...(takeProfitPrice != null ? { takeProfitPrice } : {}),
+    ...(stopLossPrice != null ? { stopLossPrice } : {}),
+  };
+};
+
+const hasExchangeCloseDetails = (trade: RuntimeTradeRecord) =>
+  trade.status === 'closed' &&
+  typeof trade.exitPrice === 'number' &&
+  Number.isFinite(trade.exitPrice) &&
+  typeof trade.actualExitPrice === 'number' &&
+  Number.isFinite(trade.actualExitPrice) &&
+  typeof trade.closedPnl === 'number' &&
+  Number.isFinite(trade.closedPnl) &&
+  typeof trade.openFee === 'number' &&
+  Number.isFinite(trade.openFee) &&
+  typeof trade.closeFee === 'number' &&
+  Number.isFinite(trade.closeFee);
+
+export const syncRuntimeTrades = async ({
+  userName,
+  connector,
+  trades,
+  endTime,
+  openPositions,
+  openPositionsReliable,
+  closedPnlRows,
+}: {
+  userName: string;
+  connector: Connector;
+  trades: RuntimeTradeRecord[];
+  endTime: number;
+  openPositions: PositionPnlSnapshot[];
+  openPositionsReliable: boolean;
+  closedPnlRows: ClosedPnlRecordWithOrderLinkId[];
+}) => {
+  const openPositionsBySymbol = new Map(
+    openPositions.map((position) => [position.symbol, position]),
+  );
+  const activeOrderIdByKey = new Map<string, string | null>();
+  const activeTradeKeys = [
+    ...new Set(
+      trades
+        .filter((trade) => isRuntimeTradeInConnectorScope(trade, connector))
+        .map((trade) =>
+          redisKeys.runtimeActiveTrade(
+            userName,
+            trade.symbol,
+            getRuntimeTradeScopeId(trade),
+          ),
+        ),
+    ),
+  ];
+
+  await Promise.all(
+    activeTradeKeys.map(async (key) => {
+      const activeRef = (await getData(key, null)) as {
+        orderId?: string;
+      } | null;
+      activeOrderIdByKey.set(
+        key,
+        typeof activeRef?.orderId === 'string' ? activeRef.orderId : null,
+      );
+    }),
+  );
+
+  const exactByOrderLinkId = new Map(
+    closedPnlRows
+      .filter(
+        (
+          row,
+        ): row is ClosedPnlRecordWithOrderLinkId & { orderLinkId: string } =>
+          typeof row.orderLinkId === 'string' && row.orderLinkId.length > 0,
+      )
+      .map((row) => [row.orderLinkId, row]),
+  );
+  const exactByOrderId = new Map(
+    closedPnlRows
+      .filter(
+        (row): row is ClosedPnlRecordWithOrderLinkId & { orderId: string } =>
+          typeof row.orderId === 'string' && row.orderId.length > 0,
+      )
+      .map((row) => [row.orderId, row]),
+  );
+  const symbolBuckets = new Map<string, ClosedPnlRecordWithOrderLinkId[]>();
+
+  for (const row of closedPnlRows) {
+    const bucket = symbolBuckets.get(row.symbol) ?? [];
+    bucket.push(row);
+    symbolBuckets.set(row.symbol, bucket);
+  }
+
+  const syncedTrades: RuntimeTradeRecord[] = [];
+
+  for (const trade of trades) {
+    if (!isRuntimeTradeInConnectorScope(trade, connector)) {
+      syncedTrades.push(trade);
+      continue;
+    }
+
+    const activeTradeKey = redisKeys.runtimeActiveTrade(
+      userName,
+      trade.symbol,
+      getRuntimeTradeScopeId(trade),
+    );
+    const isCurrentActiveTrade =
+      activeOrderIdByKey.get(activeTradeKey) === trade.orderId;
+
+    if (hasExchangeCloseDetails(trade)) {
+      if (isCurrentActiveTrade) {
+        await delKey(activeTradeKey);
+      }
+      syncedTrades.push(trade);
+      continue;
+    }
+
+    const openPosition = openPositionsBySymbol.get(trade.symbol);
+
+    if (trade.status === 'active' && !openPositionsReliable) {
+      syncedTrades.push(trade);
+      continue;
+    }
+
+    if (
+      trade.status === 'active' &&
+      isCurrentActiveTrade &&
+      openPosition &&
+      openPosition.direction === trade.direction
+    ) {
+      const riskLevelsAnalysis = buildRiskLevelsAnalysis(openPosition);
+      const nextTrade: RuntimeTradeRecord = {
+        ...trade,
+        status: 'active',
+        currentPrice: openPosition.currentPrice,
+        currentPnl: openPosition.unrealizedPnl,
+        aiAnalysis: riskLevelsAnalysis
+          ? { ...(trade.aiAnalysis ?? {}), ...riskLevelsAnalysis }
+          : trade.aiAnalysis,
+        lastSyncedAt: endTime,
+      };
+
+      await Promise.all([
+        setData(redisKeys.runtimeTrade(userName, trade.orderId), nextTrade, {
+          expire: 0,
+        }),
+        setHashJsonField(
+          redisKeys.runtimeTradeBucket(
+            userName,
+            getRuntimeStorageDayKey(trade.entryTimestamp),
+          ),
+          trade.orderId,
+          nextTrade,
+          { expire: 0 },
+        ),
+      ]);
+      syncedTrades.push(nextTrade);
+      continue;
+    }
+
+    const matchedClosedPnl = takeClosedPnlMatch({
+      exactByOrderLinkId,
+      exactByOrderId,
+      symbolBuckets,
+      trade,
+    });
+
+    if (!matchedClosedPnl) {
+      syncedTrades.push(trade);
+      continue;
+    }
+
+    const nextTrade: RuntimeTradeRecord = {
+      ...trade,
+      status: 'closed',
+      currentPrice: matchedClosedPnl.exitPrice ?? trade.currentPrice ?? null,
+      currentPnl: matchedClosedPnl.closedPnl,
+      closedPnl: matchedClosedPnl.closedPnl,
+      actualEntryPrice:
+        matchedClosedPnl.entryPrice ?? trade.actualEntryPrice ?? null,
+      exitPrice: matchedClosedPnl.exitPrice ?? trade.exitPrice ?? null,
+      actualExitPrice:
+        matchedClosedPnl.exitPrice ?? trade.actualExitPrice ?? null,
+      exitTimestamp: matchedClosedPnl.closedAt,
+      exitType: trade.exitType ?? null,
+      openFee: matchedClosedPnl.openFee ?? trade.openFee ?? null,
+      closeFee: matchedClosedPnl.closeFee ?? trade.closeFee ?? null,
+      fundingFee: matchedClosedPnl.fundingFee ?? trade.fundingFee ?? null,
+      totalFee: matchedClosedPnl.totalFee ?? trade.totalFee ?? null,
+      lastSyncedAt: endTime,
+    };
+
+    await Promise.all([
+      setData(redisKeys.runtimeTrade(userName, trade.orderId), nextTrade, {
+        expire: TTL_1M,
+      }),
+      setHashJsonField(
+        redisKeys.runtimeTradeBucket(
+          userName,
+          getRuntimeStorageDayKey(trade.entryTimestamp),
+        ),
+        trade.orderId,
+        nextTrade,
+        { expire: TTL_1M },
+      ),
+      ...(isCurrentActiveTrade ? [delKey(activeTradeKey)] : []),
+    ]);
+    syncedTrades.push(nextTrade);
+  }
+
+  return syncedTrades;
+};

package/src/app/lib/yandexMetrika.ts

@@ -0,0 +1,30 @@
+export const YANDEX_METRIKA_COUNTER_ID = 107254154;
+
+export type YandexMetrikaGoal = 'scaffold_success' | 'first_backtest';
+
+type YandexMetrika = (
+  counterId: number,
+  method: 'reachGoal',
+  target: YandexMetrikaGoal,
+  params?: Record<string, unknown>,
+) => void;
+
+export const reachYandexMetrikaGoal = (
+  target: YandexMetrikaGoal,
+  params?: Record<string, unknown>,
+) => {
+  if (
+    typeof window === 'undefined' ||
+    process.env.NEXT_PUBLIC_TRADEJS_TELEMETRY_DISABLED === '1'
+  ) {
+    return false;
+  }
+
+  const ym = (window as Window & { ym?: YandexMetrika }).ym;
+  if (!ym) {
+    return false;
+  }
+
+  ym(YANDEX_METRIKA_COUNTER_ID, 'reachGoal', target, params);
+  return true;
+};

package/src/app/routes/backtest/page.tsx

@@ -44,6 +44,7 @@ import type {
   BacktestJobRecord,
   BacktestJobStatus,
 } from '#app/lib/backtestJobs';
+import { reachYandexMetrikaGoal } from '#app/lib/yandexMetrika';
 
 const PERIOD_ITEMS = [
   { label: 'Days', value: 'days' },
@@ -84,6 +85,9 @@ type PeriodMode = 'days' | 'range';
 type JobAction = 'pause' | 'stop' | 'resume' | 'cancel' | 'heartbeat';
 
 const DAY_MS = 24 * 60 * 60 * 1000;
+const FIRST_BACKTEST_REPORTED_KEY = 'tradejs:analytics:first-backtest-reported';
+const FIRST_BACKTEST_PENDING_JOB_KEY =
+  'tradejs:analytics:first-backtest-pending-job';
 
 const toInputDate = (date: Date) => date.toISOString().slice(0, 10);
 
@@ -386,6 +390,31 @@ const BacktestRunPage = () => {
     jobsRef.current = jobs;
   }, [jobs]);
 
+  useEffect(() => {
+    if (window.localStorage.getItem(FIRST_BACKTEST_REPORTED_KEY) === '1') {
+      return;
+    }
+
+    const pendingJobId = window.localStorage.getItem(
+      FIRST_BACKTEST_PENDING_JOB_KEY,
+    );
+    if (!pendingJobId) {
+      return;
+    }
+
+    const pendingJob = jobs.find((job) => job.id === pendingJobId);
+    if (pendingJob?.status !== 'completed') {
+      return;
+    }
+
+    if (!reachYandexMetrikaGoal('first_backtest')) {
+      return;
+    }
+
+    window.localStorage.setItem(FIRST_BACKTEST_REPORTED_KEY, '1');
+    window.localStorage.removeItem(FIRST_BACKTEST_PENDING_JOB_KEY);
+  }, [jobs]);
+
   useEffect(() => {
     const timer = window.setInterval(() => {
       const runningJobs = jobsRef.current.filter(
@@ -478,6 +507,9 @@ const BacktestRunPage = () => {
     try {
       const job = await startBacktestRun(payload);
       setJobs((currentJobs) => mergeJob(currentJobs, job));
+      if (window.localStorage.getItem(FIRST_BACKTEST_REPORTED_KEY) !== '1') {
+        window.localStorage.setItem(FIRST_BACKTEST_PENDING_JOB_KEY, job.id);
+      }
       toaster.success({
         title: 'Backtest started',
         description: getJobTitle(job),

package/src/app/routes/install/page.tsx

@@ -5,6 +5,7 @@ import { useRouter } from 'next/navigation';
 import Image from 'next/image';
 import { signIn } from 'next-auth/react';
 import { Box, Button, Field, Flex, Input, Stack, Text } from '@chakra-ui/react';
+import { reachYandexMetrikaGoal } from '#app/lib/yandexMetrika';
 
 const FIRST_DASHBOARD_PATH = '/routes/dashboard/coinbase/crypto/BTCUSDT/15';
 
@@ -64,6 +65,8 @@ const Install = () => {
       return;
     }
 
+    reachYandexMetrikaGoal('scaffold_success');
+
     const result = await signIn('credentials', {
       redirect: false,
       username: 'root',