neuroalpha 0.6.0 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuroalpha",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "НейроАльфа — ИИ-автопилот для рынка акций Мосбиржи: эмбеддинги акций, самообучение правил, коннекторы Т-Банк / БКС / Финам / Алор и боты Telegram / MAX",
   "author": "Roman A. Perepelkin",
   "license": "UNLICENSED",

package/public/app.js

@@ -37,6 +37,7 @@ function fmtDayGroup(ts) {
   const nowIso = new Date(Date.now() + MSK).toISOString();
   const todayKey = nowIso.slice(0, 10);
   const yestKey = new Date(Date.now() + MSK - 86400000).toISOString().slice(0, 10);
+  const beforeYestKey = new Date(Date.now() + MSK - 2 * 86400000).toISOString().slice(0, 10);
   const dNum = Number(iso.slice(8, 10));
   const mName = MONTHS_GEN[Number(iso.slice(5, 7)) - 1] || '';
   const y = iso.slice(0, 4);
@@ -45,8 +46,21 @@ function fmtDayGroup(ts) {
   const base = `${dNum} ${mName}${y !== curY ? ` ${y} г.` : ''}`;
   if (dayKey === todayKey) return `Сегодня, ${base}`;
   if (dayKey === yestKey) return `Вчера, ${base}`;
+  if (dayKey === beforeYestKey) return `Позавчера, ${base}`;
   return `${base} (${dow})`;
 }
+function fmtDayChip(dayKey) {
+  if (!dayKey) return '—';
+  const todayKey = new Date(Date.now() + MSK).toISOString().slice(0, 10);
+  const yestKey = new Date(Date.now() + MSK - 86400000).toISOString().slice(0, 10);
+  const beforeYestKey = new Date(Date.now() + MSK - 2 * 86400000).toISOString().slice(0, 10);
+  const dm = `${dayKey.slice(8, 10)}.${dayKey.slice(5, 7)}`;
+  if (dayKey === todayKey) return `Сегодня (${dm})`;
+  if (dayKey === yestKey) return `Вчера (${dm})`;
+  if (dayKey === beforeYestKey) return `Позавчера (${dm})`;
+  const dow = DOW_SHORT[new Date(`${dayKey}T12:00:00Z`).getUTCDay()] || '';
+  return `${dm} (${dow})`;
+}
 const fmtDate = (ts) => { const d = new Date(ts + MSK).toISOString(); return `${d.slice(8, 10)}.${d.slice(5, 7)}.${d.slice(2, 4)}`; };
 const cls = (v) => (v > 0 ? 'pos' : v < 0 ? 'neg' : '');
 const KNOWN_MOEX_TICKERS = new Set([
@@ -945,6 +959,14 @@ let forecastBusyAt = 0;
 let pulseClearTimer = null;
 const prevClientExp = new Map();
 const prevClientRank = new Map();
+let nearDayFilter = ''; // '' — последний день с сигналами (обычно сегодня), 'YYYY-MM-DD' — выбранный день, 'all' — все дни
+let renderNearSignalsNow = null;
+$('#forecast')?.addEventListener('click', (e) => {
+  const btn = e.target.closest('button[data-near-day]');
+  if (!btn) return;
+  nearDayFilter = btn.dataset.nearDay || '';
+  if (renderNearSignalsNow) renderNearSignalsNow();
+});
 
 function triggerTradingPulse(text = 'Обновление котировок и сигналов…', durationMs = 2400) {
   state.tradingPulseActive = true;
@@ -1136,37 +1158,66 @@ async function loadForecast(force, silent = false) {
     // общая сетка колонок для обеих таблиц: столбцы выровнены по всей высоте блока
     const fcTable = (title, rows, extraStyle = '', side = 'long') => `<table class="fc-table" style="table-layout:fixed;width:100%${extraStyle}">${colgroup}<thead><tr><th>${title}</th><th class="num">Цена</th><th class="num">Ожидание</th><th class="num">Динамика</th><th style="text-align:center">Сигнал</th><th>Под влиянием</th><th class="num" title="Индивидуальный порог входа с учётом ликвидности бумаги (1-й или 2–3-й эшелон) и тренда индекса">Порог</th></tr></thead><tbody>${rows.map((r) => row(r, side)).join('')}</tbody></table>`;
     const nearList = Array.isArray(f.nearSignals) ? f.nearSignals : [];
+    const nearByDay = new Map();
+    for (const ep of nearList) {
+      const dk = ep.day || (ep.lastBarTs ? new Date(ep.lastBarTs + MSK).toISOString().slice(0, 10) : '');
+      if (!dk) continue;
+      if (!nearByDay.has(dk)) nearByDay.set(dk, []);
+      nearByDay.get(dk).push(ep);
+    }
+    const nearDays = [...nearByDay.keys()].sort((a, b) => b.localeCompare(a));
+    const dayCountsStr = (arr) => `${arr.filter((x) => x.status === 'signal').length} сигн., ${arr.filter((x) => x.status === 'blocked').length} блок., ${arr.filter((x) => x.status === 'near').length} почти`;
+    const nearEpRow = (ep) => {
+      const tRange = ep.firstBar && ep.lastBar && ep.firstBar !== ep.lastBar ? `${ep.firstBar}–${ep.lastBar} (${ep.barsCount} св.)` : `${ep.peakBar || ep.lastBar || ''}`;
+      const isSh = ep.side === 'short';
+      const thrStr = `${isSh ? '−' : '+'}${fmtNum(ep.thresholdPct, 2)}%`;
+      const stBadge = ep.status === 'signal'
+        ? `<span class="tag ok">${isSh ? '✓ сигнал шорт' : '✓ сигнал купить'}</span>`
+        : ep.status === 'blocked'
+          ? '<span class="tag blocked">⛔ блок входа</span>'
+          : `<span class="tag mid">почти (${ep.peakRatioPct}%)</span>`;
+      const rowCls = ep.status === 'signal' ? ' class="best"' : ep.status === 'blocked' ? ' class="fc-blocked"' : '';
+      return `<tr${rowCls}>
+        <td class="muted small" style="white-space:nowrap">${esc(tRange)}</td>
+        <td style="white-space:nowrap"><span class="sym-link" data-sym="${esc(ep.symbol)}" title="Открыть досье акции ${esc(ep.symbol)}"><b>${esc(ep.symbol)}</b> <span class="muted small">${esc(ep.name || '')}</span></span></td>
+        <td class="${isSh ? 'neg' : 'pos'} small" style="white-space:nowrap">${isSh ? 'В шорт' : 'В покупку'}</td>
+        <td class="num ${cls(ep.peakExpectedPct)}" style="white-space:nowrap"><b>${fmtPct(ep.peakExpectedPct, 2)}</b></td>
+        <td class="num muted small" style="white-space:nowrap">${thrStr}</td>
+        <td class="num small" style="white-space:nowrap"><b>${ep.peakRatioPct}%</b></td>
+        <td class="small" style="white-space:normal">${stBadge} <span class="muted">${esc(ep.reasonText || '')}</span></td>
+      </tr>`;
+    };
+    const buildNearInnerHtml = () => {
+      if (nearDayFilter !== 'all' && !nearByDay.has(nearDayFilter)) nearDayFilter = '';
+      const activeNearDay = nearDayFilter || nearDays[0] || 'all';
+      const shownNearDays = activeNearDay === 'all' ? nearDays : (nearByDay.has(activeNearDay) ? [activeNearDay] : nearDays.slice(0, 1));
+      const nearBodyHtml = shownNearDays.map((dk) => {
+        const arr = nearByDay.get(dk) || [];
+        const dayTs = arr[0]?.lastBarTs || Date.parse(`${dk}T12:00:00+03:00`);
+        const hdr = `<tr class="day-group-row"><td colspan="7"><div style="display:flex;justify-content:space-between;align-items:center;gap:12px;flex-wrap:wrap"><span>📅 ${esc(fmtDayGroup(dayTs))}</span><span class="small" style="font-weight:500;color:var(--muted)">${dayCountsStr(arr)}</span></div></td></tr>`;
+        return hdr + arr.map(nearEpRow).join('');
+      }).join('');
+      const nearButtonsHtml = `<div class="row-gap" style="margin:8px 0;align-items:center;flex-wrap:wrap">
+        ${nearDays.map((dk) => {
+          const arr = nearByDay.get(dk) || [];
+          const on = activeNearDay === dk;
+          return `<button type="button" class="brk-toggle small${on ? ' on' : ''}" data-near-day="${esc(dk)}" title="${esc(dayCountsStr(arr))}">${on ? '✓ ' : ''}${esc(fmtDayChip(dk))} (${arr.length})</button>`;
+        }).join('')}
+        ${nearDays.length > 1 ? `<button type="button" class="brk-toggle small${activeNearDay === 'all' ? ' on' : ''}" data-near-day="all">${activeNearDay === 'all' ? '✓ ' : ''}Все дни (${nearList.length})</button>` : ''}
+      </div>`;
+      return `<summary style="font-weight:500">Журнал сигналов и почти-сигналов за неделю (≥75% порога) · ${dayCountsStr(nearList)}</summary>
+        ${nearButtonsHtml}
+        <div style="overflow-x:auto">
+          <table class="fc-table" style="width:100%">
+            <thead><tr><th>Время МСК</th><th>Бумага</th><th>Направление</th><th class="num">Пик ожидания</th><th class="num">Порог</th><th class="num">К порогу</th><th>Статус и причина</th></tr></thead>
+            <tbody>${nearBodyHtml}</tbody>
+          </table>
+        </div>`;
+    };
+    renderNearSignalsNow = () => { const el = $('#fc-near-box'); if (el) el.innerHTML = buildNearInnerHtml(); };
     const prevNearEl = $('#fc-near-box');
     const nearOpenAttr = (!prevNearEl || prevNearEl.open) ? ' open' : '';
-    const nearHtml = nearList.length ? `<details id="fc-near-box"${nearOpenAttr} style="margin-top:12px;border-top:1px solid var(--line);padding-top:10px">
-      <summary style="font-weight:500">Журнал сигналов и почти-сигналов за неделю (≥75% порога) · ${nearList.filter((x) => x.status === 'signal').length} сигн., ${nearList.filter((x) => x.status === 'blocked').length} блок., ${nearList.filter((x) => x.status === 'near').length} почти</summary>
-      <div style="overflow-x:auto;margin-top:8px">
-        <table class="fc-table" style="width:100%">
-          <thead><tr><th>Дата · время МСК</th><th>Бумага</th><th>Направление</th><th class="num">Пик ожидания</th><th class="num">Порог</th><th class="num">К порогу</th><th>Статус и причина</th></tr></thead>
-          <tbody>${nearList.slice(0, 18).map((ep) => {
-            const dStr = ep.day ? `${ep.day.slice(8, 10)}.${ep.day.slice(5, 7)}` : '';
-            const tRange = ep.firstBar && ep.lastBar && ep.firstBar !== ep.lastBar ? `${ep.firstBar}–${ep.lastBar} (${ep.barsCount} св.)` : `${ep.peakBar || ep.lastBar || ''}`;
-            const isSh = ep.side === 'short';
-            const thrStr = `${isSh ? '−' : '+'}${fmtNum(ep.thresholdPct, 2)}%`;
-            const stBadge = ep.status === 'signal'
-              ? `<span class="tag ok">${isSh ? '✓ сигнал шорт' : '✓ сигнал купить'}</span>`
-              : ep.status === 'blocked'
-                ? '<span class="tag blocked">⛔ блок входа</span>'
-                : `<span class="tag mid">почти (${ep.peakRatioPct}%)</span>`;
-            const rowCls = ep.status === 'signal' ? ' class="best"' : ep.status === 'blocked' ? ' class="fc-blocked"' : '';
-            return `<tr${rowCls}>
-              <td class="muted small" style="white-space:nowrap">${esc(dStr)} ${esc(tRange)}</td>
-              <td style="white-space:nowrap"><span class="sym-link" data-sym="${esc(ep.symbol)}" title="Открыть досье акции ${esc(ep.symbol)}"><b>${esc(ep.symbol)}</b> <span class="muted small">${esc(ep.name || '')}</span></span></td>
-              <td class="${isSh ? 'neg' : 'pos'} small" style="white-space:nowrap">${isSh ? 'В шорт' : 'В покупку'}</td>
-              <td class="num ${cls(ep.peakExpectedPct)}" style="white-space:nowrap"><b>${fmtPct(ep.peakExpectedPct, 2)}</b></td>
-              <td class="num muted small" style="white-space:nowrap">${thrStr}</td>
-              <td class="num small" style="white-space:nowrap"><b>${ep.peakRatioPct}%</b></td>
-              <td class="small" style="white-space:normal">${stBadge} <span class="muted">${esc(ep.reasonText || '')}</span></td>
-            </tr>`;
-          }).join('')}</tbody>
-        </table>
-      </div>
-    </details>` : '';
+    const nearHtml = nearList.length ? `<details id="fc-near-box"${nearOpenAttr} style="margin-top:12px;border-top:1px solid var(--line);padding-top:10px">${buildNearInnerHtml()}</details>` : '';
     box.innerHTML = `<div style="overflow-x:auto">${fcTable('Сильнее рынка', shownRows.slice(0, 6), '', 'long')}
       ${fcTable('Слабее рынка', shortRows, ';margin-top:14px', 'short')}</div>
       <p class="muted small">Ожидание — движение относительно рынка в целом (авто-пересчёт каждые 15 сек по живым ценам Мосбиржи). Точный индивидуальный порог каждой акции рассчитывается в колонке <b>«Порог»</b> с учётом её ликвидности (оборота торгов), волатильности свечи и тренда индекса. <span style="color:var(--blocked-fg)">Розовым</span> выделяются только те бумаги, где ожидание <b>уже пробило порог</b>, но сделка остановлена защитным фильтром (если ожидание ещё ниже порога, фильтр указывается справочно рядом с «ниже порога»).</p>${nearHtml}`;

package/server/model/forecast.js

@@ -539,7 +539,26 @@ function withNews(result, p) {
     r.thresholdRatioPct = Math.round(ratio * 100);
     r.crossedThreshold = ratio >= 1;
   }
-  if (!Array.isArray(result.nearSignals) || !result.nearSignals.length) {
+  // Если в сохранённом кэше список был обрезан прежним лимитом (40), пересобираем полный список из накопленных записей
+  const saved = !nearSignalsCache.episodesMap.size ? kvGet('nearSignalsLog') : null;
+  if (saved?.entries?.length && (saved.list?.length || 0) < Math.min(120, saved.entries.length)) {
+    nearSignalsCache = { key: saved.key, scannedBarTs: saved.scannedBarTs || 0, episodesMap: new Map(saved.entries), list: [] };
+  }
+  if (!Array.isArray(result.nearSignals) || !result.nearSignals.length || (nearSignalsCache.episodesMap.size && !nearSignalsCache.list.length)) {
+    if (nearSignalsCache.episodesMap.size && !nearSignalsCache.list.length) {
+      nearSignalsCache.list = [...nearSignalsCache.episodesMap.values()]
+        .sort((a, b) => (b.lastBarTs - a.lastBarTs) || (b.peakRatioPct - a.peakRatioPct))
+        .slice(0, 120)
+        .map((ep) => {
+          const gapPct = round(Math.max(0, ep.thresholdPct - Math.abs(ep.peakExpectedPct)), 2);
+          const reasonText = ep.status === 'signal'
+            ? 'Порог пройден — сигнал сформирован'
+            : ep.status === 'blocked'
+              ? `Порог пройден, но вход закрыт: ${(ep.reasons || []).join(' · ') || 'защитный фильтр'}`
+              : `Ниже порога на ${gapPct}%${ep.reasons?.length ? ` (также активен фильтр: ${ep.reasons.join(' · ')})` : ''}`;
+          return { ...ep, gapPct, reasonText };
+        });
+    }
     const savedNear = nearSignalsCache.list?.length ? nearSignalsCache.list : (kvGet('nearSignalsLog')?.list || []);
     result.nearSignals = savedNear;
   }
@@ -662,7 +681,7 @@ async function updateNearSignalsJournal(ds, p, last, key) {
   if (updated || !nearSignalsCache.list.length) {
     const list = [...nearSignalsCache.episodesMap.values()]
       .sort((a, b) => (b.lastBarTs - a.lastBarTs) || (b.peakRatioPct - a.peakRatioPct))
-      .slice(0, 40)
+      .slice(0, 120)
       .map((ep) => {
         const gapPct = round(Math.max(0, ep.thresholdPct - Math.abs(ep.peakExpectedPct)), 2);
         const reasonText = ep.status === 'signal'