Upload 2 files

hub_dashboard.html

@@ -2739,6 +2739,8 @@ function switchTab(tab) {
     renderTradingTab();
   } else if (tab === 'assets') {
     renderAssetsTab();
+  } else if (tab === 'terminal') {
+    updateTerminal();
   }
 }
 
@@ -2962,6 +2964,178 @@ async function refresh(){
 refresh(); setInterval(refresh,2000);
 setInterval(()=>{ document.getElementById('kpi-upd').textContent=_health.last_update_ago!=null?_health.last_update_ago+'s ago':'—'; },1000);
 
+/* ════════════════════════════════════════════════════════════════════════════
+   TERMINAL PANEL LOGIC — polls /api/trades every 2s
+════════════════════════════════════════════════════════════════════════════ */
+let _trmEquityChart = null;
+let _trmEquityCurve = [];  // running cumulative PnL
+
+async function updateTerminal() {
+  let data;
+  try {
+    const res = await fetch('/api/trades');
+    if (!res.ok) throw new Error('trades api error');
+    data = await res.json();
+  } catch(e) {
+    console.error('[Terminal] fetch error:', e);
+    return;
+  }
+
+  const open   = data.open   || [];
+  const closed = data.closed || [];
+  const stats  = data.stats  || {};
+
+  // ── KPI strip ──────────────────────────────────────────────────────────────
+  const totalPnl    = stats.total_pnl || 0;
+  const totalClosed = stats.total_closed || 0;
+  const winCount    = stats.win_count  || 0;
+  const lossCount   = stats.loss_count || 0;
+  const winRate     = stats.win_rate   || 0;
+  const avgPnl      = totalClosed > 0 ? (totalPnl / totalClosed) : 0;
+
+  // Equity = sum of all closed PnL (running balance proxy)
+  const pnlClr = v => v > 0 ? 'var(--green)' : v < 0 ? 'var(--red)' : 'var(--t1)';
+  const fPnl   = v => (v >= 0 ? '+' : '') + v.toFixed(2);
+
+  const eqEl = document.getElementById('trm-equity');
+  if (eqEl) { eqEl.textContent = fPnl(totalPnl); eqEl.style.color = pnlClr(totalPnl); }
+
+  const opEl = document.getElementById('trm-open-pnl');
+  if (opEl) { opEl.textContent = open.length ? open.length + ' open' : '—'; }
+
+  const ocEl = document.getElementById('trm-open-count');
+  if (ocEl) ocEl.textContent = open.length + ' position' + (open.length !== 1 ? 's' : '');
+
+  const rpEl = document.getElementById('trm-realized-pnl');
+  if (rpEl) { rpEl.textContent = fPnl(totalPnl); rpEl.style.color = pnlClr(totalPnl); }
+
+  const ccEl = document.getElementById('trm-closed-count');
+  if (ccEl) ccEl.textContent = totalClosed + ' closed trades';
+
+  const wrEl = document.getElementById('trm-winrate');
+  if (wrEl) wrEl.textContent = winRate + '%';
+
+  const wlEl = document.getElementById('trm-wl');
+  if (wlEl) wlEl.textContent = 'W:' + winCount + ' / L:' + lossCount;
+
+  const apEl = document.getElementById('trm-avg-pnl');
+  if (apEl) { apEl.textContent = fPnl(avgPnl); apEl.style.color = pnlClr(avgPnl); }
+
+  // Update sidebar Logs counter with trade count
+  const scLogsEl = document.getElementById('sc-logs');
+  if (scLogsEl && !isNaN(totalClosed)) {
+    // don't overwrite log count — leave it
+  }
+
+  // ── Equity curve chart ─────────────────────────────────────────────────────
+  // Rebuild cumulative curve from closed trades (newest-first → reverse for chrono)
+  const chronoClosed = [...closed].reverse();
+  let cum = 0;
+  const curveData   = chronoClosed.map(t => { cum += (t.pnl || 0); return +cum.toFixed(4); });
+  const curveLabels = chronoClosed.map(t => t.closed_at ? t.closed_at.slice(11,19) : '');
+
+  const chartCanvas = document.getElementById('trm-equity-chart');
+  if (chartCanvas) {
+    if (!_trmEquityChart) {
+      _trmEquityChart = new Chart(chartCanvas, {
+        type: 'line',
+        data: {
+          labels: curveLabels,
+          datasets: [{
+            data: curveData,
+            borderColor: '#E8720A',
+            backgroundColor: 'rgba(232,114,10,0.08)',
+            borderWidth: 2,
+            fill: true,
+            pointRadius: 0,
+            tension: 0.4,
+          }]
+        },
+        options: {
+          responsive: true, maintainAspectRatio: false,
+          plugins: { legend: { display: false } },
+          scales: {
+            x: { display: false },
+            y: { grid: { color: 'rgba(255,255,255,0.04)' },
+                 ticks: { color: 'rgba(255,255,255,0.3)', font: { size: 9 }, maxTicksLimit: 5 } }
+          }
+        }
+      });
+    } else {
+      _trmEquityChart.data.labels   = curveLabels;
+      _trmEquityChart.data.datasets[0].data = curveData;
+      _trmEquityChart.update('none');
+    }
+  }
+  const cmEl = document.getElementById('trm-curve-meta');
+  if (cmEl) cmEl.textContent = totalClosed + ' closed trades · ' + new Date().toLocaleTimeString('en-GB',{hour12:false});
+
+  // ── Open positions table ────────────────────────────────────────────────────
+  const ob = document.getElementById('trm-open-body');
+  if (ob) {
+    if (!open.length) {
+      ob.innerHTML = '<tr><td colspan="8" style="padding:32px;text-align:center;color:var(--t4);font-size:0.75rem">No open positions</td></tr>';
+    } else {
+      const now = new Date();
+      ob.innerHTML = open.map(t => {
+        const dirCls = t.direction === 'LONG' || t.direction === 'BUY' ? 'BUY' : 'SELL';
+        // Duration from opened_at
+        let dur = '—';
+        if (t.opened_at) {
+          const diffMs = now - new Date(t.opened_at);
+          const diffS  = Math.floor(diffMs / 1000);
+          dur = diffS < 60 ? diffS + 's' : diffS < 3600 ? Math.floor(diffS/60) + 'm' : Math.floor(diffS/3600) + 'h ' + Math.floor((diffS%3600)/60) + 'm';
+        }
+        return `<tr>
+          <td style="padding:12px 16px;font-size:0.72rem;color:var(--t3);font-family:monospace">${t.trade_id}</td>
+          <td style="padding:12px 16px;font-weight:800;color:var(--t0)">${t.asset || '—'}</td>
+          <td style="padding:12px 16px"><span class="sig ${dirCls}" style="font-size:0.65rem">${t.direction || '—'}</span></td>
+          <td style="padding:12px 16px;text-align:right;font-variant-numeric:tabular-nums;color:var(--cyan)">${t.entry != null ? t.entry.toFixed(4) : '—'}</td>
+          <td style="padding:12px 16px;text-align:right;font-variant-numeric:tabular-nums">${t.qty != null ? t.qty.toFixed(6) : '—'}</td>
+          <td style="padding:12px 16px;text-align:right;color:var(--t3)">—</td>
+          <td style="padding:12px 16px;text-align:right;color:var(--t2)">${dur}</td>
+          <td style="padding:12px 16px;text-align:right;font-size:0.7rem;color:var(--t3)">${t.opened_at ? t.opened_at.replace('T',' ') : '—'}</td>
+        </tr>`;
+      }).join('');
+    }
+  }
+  const omEl = document.getElementById('trm-open-meta');
+  if (omEl) omEl.textContent = open.length + ' position' + (open.length!==1?'s':'') + ' · live · updates every 2s';
+
+  // ── Trade history table ─────────────────────────────────────────────────────
+  const hb = document.getElementById('trm-hist-body');
+  if (hb) {
+    if (!closed.length) {
+      hb.innerHTML = '<tr><td colspan="9" style="padding:32px;text-align:center;color:var(--t4);font-size:0.75rem">No trade history</td></tr>';
+    } else {
+      hb.innerHTML = closed.map(t => {
+        const pnl    = t.pnl || 0;
+        const pnlCls = pnl >= 0 ? 'color:var(--green)' : 'color:var(--red)';
+        const dirCls = t.direction === 'LONG' || t.direction === 'BUY' ? 'BUY' : 'SELL';
+        return `<tr>
+          <td style="padding:10px 16px;font-size:0.68rem;color:var(--t3);font-family:monospace">${t.trade_id}</td>
+          <td style="padding:10px 16px;font-weight:800;color:var(--t0)">${t.asset || '—'}</td>
+          <td style="padding:10px 16px"><span class="sig ${dirCls}" style="font-size:0.6rem">${t.direction || '—'}</span></td>
+          <td style="padding:10px 16px;text-align:right;font-variant-numeric:tabular-nums">${t.entry != null ? t.entry.toFixed(4) : '—'}</td>
+          <td style="padding:10px 16px;text-align:right;font-variant-numeric:tabular-nums;color:var(--t2)">—</td>
+          <td style="padding:10px 16px;text-align:right;font-variant-numeric:tabular-nums">${t.qty != null ? t.qty.toFixed(6) : '—'}</td>
+          <td style="padding:10px 16px;text-align:right;font-weight:800;${pnlCls}">${pnl >= 0 ? '+' : ''}${pnl.toFixed(4)}</td>
+          <td style="padding:10px 16px;text-align:right;color:var(--t3)">—</td>
+          <td style="padding:10px 16px;text-align:right;font-size:0.7rem;color:var(--t3)">${t.closed_at ? t.closed_at.replace('T',' ') : '—'}</td>
+        </tr>`;
+      }).join('');
+    }
+  }
+  const hmEl = document.getElementById('trm-hist-meta');
+  if (hmEl) hmEl.textContent = 'last ' + closed.length + ' closed trades';
+}
+
+// Auto-refresh terminal tab every 2s (also on tab switch)
+setInterval(function(){
+  const tEl = document.getElementById('terminal-tab');
+  if (tEl && tEl.classList.contains('active')) updateTerminal();
+}, 2000);
+
 /* ════════════════════════════════════════════════════════════════════════════
    TRADING PANEL LOGIC
 ════════════════════════════════════════════════════════════════════════════ */

hub_dashboard_service.py

@@ -59,15 +59,22 @@ class TradeLogParser:
     [2026-03-30 16:20:39] | INFO | TRADE | CRASH500 | TRADE CLOSED | ID=CRASH500_456 | pnl=-3.5246 | return=+0.01%
     """
 
-    # Regex patterns matching the actual log format
-    # Pattern for OPEN: ... | TRADE OPENED | ID=xxx | Dir=xxx | Entry=xxx
-    TRADE_OPEN_RE = re.compile(r'TRADE OPENED \| ID=(\S+) \| Dir=(\w+) \| Entry=([\d.]+)')
-    
+    # Regex patterns matching the actual log format from ranker_logging.py:
+    # [2026-03-30 17:14:35] | INFO     | TRADE           | V100_1s | TRADE OPENED | ID=... | Dir=long | Entry=0.0000 | Qty=10.0
+    # [2026-03-30 17:14:35] | INFO     | TRADE           | CRASH500 | TRADE CLOSED | ID=... | pnl=-3.52 | return=+0.01%
+    TRADE_OPEN_RE = re.compile(
+        r'TRADE OPENED \| ID=(\S+) \| Dir=(\w+) \| Entry=([\d.]+) \| Qty=([\d.]+)'
+    )
+    TRADE_OPEN_RE_NOQTY = re.compile(
+        r'TRADE OPENED \| ID=(\S+) \| Dir=(\w+) \| Entry=([\d.]+)'
+    )
+
     # Pattern for CLOSE: ... | TRADE CLOSED | ID=xxx | pnl=xxx | return=xxx
     TRADE_CLOSE_RE = re.compile(r'TRADE CLOSED \| ID=(\S+) \| pnl=([+-]?[\d.]+)')
-    
-    # Pattern to extract asset from the log line (the part after TRADE |)
-    TRADE_ASSET_RE = re.compile(r'TRADE \| (\w+) \|')
+
+    # Asset sits between the 4th and 5th pipe-separated fields:
+    # "[ts] | LEVEL    | TRADE           | <ASSET> | ..."
+    TRADE_ASSET_RE = re.compile(r'\|\s*TRADE\s*\|\s*(\w+)\s*\|')
 
     def __init__(self, log_dir: str = _LOG_DIR):
         self.log_dir = Path(log_dir)
@@ -109,7 +116,10 @@ class TradeLogParser:
             time.sleep(2.0)
 
     def refresh(self) -> None:
-        """Find all log files, read new lines since last position."""
+        """Find all log files, read new lines since last position.
+        On first call for each file, always scan from the beginning so trades
+        that were written before the service started are not missed.
+        """
         pattern = str(self.log_dir / "*.log")
         files = sorted(glob.glob(pattern))
         
@@ -122,12 +132,14 @@ class TradeLogParser:
             self._tail_file(fpath)
 
     def _tail_file(self, fpath: str) -> None:
-        """Read only new bytes from fpath since last call."""
+        """Read only new bytes from fpath since last call.
+        First encounter: start from byte 0 (full scan) so pre-existing trades are loaded."""
         try:
             size = os.path.getsize(fpath)
         except OSError:
             return
 
+        # Use 0 as default so a file seen for the first time is fully scanned
         last = self._last_pos.get(fpath, 0)
         if size <= last:
             return
@@ -153,25 +165,32 @@ class TradeLogParser:
         # ── TRADE OPENED ─────────────────────────────────────────────────────────
         m = self.TRADE_OPEN_RE.search(line)
         if m:
-            trade_id, direction, entry = m.group(1), m.group(2), float(m.group(3))
-            # Normalize direction: long -> LONG, short -> SHORT
+            trade_id, direction, entry, qty = m.group(1), m.group(2), float(m.group(3)), float(m.group(4))
+        else:
+            m2 = self.TRADE_OPEN_RE_NOQTY.search(line)
+            if m2:
+                trade_id, direction, entry, qty = m2.group(1), m2.group(2), float(m2.group(3)), 0.0
+            else:
+                m2 = None
+            m = m2  # unify the branch below
+
+        if m:
             direction = direction.upper()
-            
-            # Parse timestamp from log line
             ts = self._parse_timestamp(line)
-            
+
             with self._lock:
                 self._open[trade_id] = {
                     "trade_id": trade_id,
                     "asset": asset or trade_id.split('_')[0],
                     "direction": direction,
                     "entry": entry,
+                    "qty": qty,
                     "opened_at": ts,
                     "status": "OPEN",
                 }
                 self._stats["total_opened"] += 1
-            
-            logger.debug(f"[TradeLogParser] OPEN: {trade_id} | {direction} @ {entry}")
+
+            logger.debug(f"[TradeLogParser] OPEN: {trade_id} | {direction} @ {entry} qty={qty}")
             return
 
         # ── TRADE CLOSED ─────────────────────────────────────────────────────────