Refactor: Set paper trade notifications to priority 1

.env.example

@@ -6,5 +6,6 @@ PORT=3004
 SURREAL_URL=
 SURREAL_USER=
 SURREAL_PASS=
+KALSHI_API_BASE=https://api.elections.kalshi.com
 KALSHI_API_KEY_ID=your-key-id-here
 KALSHI_RSA_PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----\nPASTE_YOUR_FULL_KEY_HERE\n-----END RSA PRIVATE KEY-----"

app/api/login/route.js

@@ -1,5 +1,6 @@
 import { NextResponse } from 'next/server';
 import crypto from 'crypto';
+import { signSession } from '../../../lib/auth';
 
 export async function POST(req) {
     try {
@@ -15,8 +16,21 @@ export async function POST(req) {
         }
 
         if (email === process.env.ADMIN_EMAIL && password === process.env.ADMIN_PASS) {
-            // Real implementation would set a JWT or session cookie here
+            // Generate our secure edge-compatible token
-            return NextResponse.json({ success: true, message: 'Welcome back, Master!' });
+            const token = await signSession();
+            
+            const response = NextResponse.json({ success: true, message: 'Welcome back, Master!' });
+            
+            // Set it as an HttpOnly cookie so JavaScript can't touch it
+            response.cookies.set('kalbot_session', token, {
+                httpOnly: true,
+                secure: process.env.NODE_ENV === 'production',
+                sameSite: 'strict',
+                path: '/',
+                maxAge: 60 * 60 * 24 // 1 day in seconds
+            });
+
+            return response;
         } else {
             // Trigger NTFY alert for failed login
             if (process.env.NTFY_URL) {

app/api/reset/route.js

@@ -0,0 +1,12 @@
+import { NextResponse } from 'next/server';
+import fs from 'fs';
+
+export async function POST() {
+  try {
+    // Write a flag file that the worker polls for
+    fs.writeFileSync('/tmp/kalbot-reset-flag', 'reset');
+    return NextResponse.json({ success: true, message: 'Reset signal sent. Data will clear momentarily.' });
+  } catch (e) {
+    return NextResponse.json({ error: e.message }, { status: 500 });
+  }
+}

app/api/state/route.js

@@ -14,6 +14,7 @@ export async function GET() {
     return NextResponse.json({
       market: null,
       paper: { balance: 1000, totalPnL: 0, wins: 0, losses: 0, winRate: 0, openPositions: [], totalTrades: 0 },
+      paperByStrategy: {},
       strategies: [],
       workerUptime: 0,
       lastUpdate: null,

app/api/trades/route.js

@@ -3,23 +3,52 @@ import Surreal from 'surrealdb';
 
 export const dynamic = 'force-dynamic';
 
-export async function GET() {
+function normalizeRows(result) {
+  if (!Array.isArray(result) || !result.length) return [];
+  const first = result[0];
+  if (Array.isArray(first)) return first;
+  if (first && typeof first === 'object' && Array.isArray(first.result)) return first.result;
+  return [];
+}
+
+export async function GET(req) {
   const url = process.env.SURREAL_URL;
   if (!url) {
     return NextResponse.json({ trades: [], error: 'No DB configured' });
   }
 
+  const { searchParams } = new URL(req.url);
+  const strategyFilter = searchParams.get('strategy');
+
+  let client = null;
+
   try {
-    const client = new Surreal();
+    client = new Surreal();
     await client.connect(url);
     await client.signin({ username: process.env.SURREAL_USER, password: process.env.SURREAL_PASS });
     await client.use({ namespace: 'kalbot', database: 'kalbot' });
 
-    const result = await client.query('SELECT * FROM paper_positions ORDER BY entryTime DESC LIMIT 50');
+    let query = 'SELECT * FROM paper_positions WHERE settled = true';
-    const trades = result[0] || [];
+    const vars = {};
+
+    if (strategyFilter) {
+      query += ' AND strategy = $strategy';
+      vars.strategy = strategyFilter;
+    }
+
+    query += ' ORDER BY settleTime DESC LIMIT 50';
+
+    const result = await client.query(query, vars);
+    const trades = normalizeRows(result);
 
     return NextResponse.json({ trades });
   } catch (e) {
     return NextResponse.json({ trades: [], error: e.message });
+  } finally {
+    try {
+      await client?.close?.();
+    } catch {
+      // ignore
+    }
   }
 }

app/dash/page.js

@@ -0,0 +1,18 @@
+'use client';
+
+const GREEN = '#16A34A';
+
+export default function LiveDashboard() {
+  return (
+    <div className="min-h-screen bg-gray-50 flex items-center justify-center">
+      <div className="text-center space-y-4">
+        <h1 className="text-2xl font-bold" style={{ color: GREEN }}>Live Trading</h1>
+        <p className="text-gray-500 text-sm">Coming soon, Meowster.</p>
+        <p className="text-gray-400 text-xs">Find a profitable paper strategy first.</p>
+        <a href="/paper" className="inline-block text-sm px-4 py-2 rounded-lg bg-white border border-gray-200 text-gray-600 hover:bg-gray-50 transition-all shadow-sm">
+          ← Back to Paper Trading
+        </a>
+      </div>
+    </div>
+  );
+}

app/dashboard/page.js

@@ -1,360 +1,5 @@
-'use client';
+import { redirect } from 'next/navigation';
-import { useState, useEffect } from 'react';
-
-const GREEN = '#28CC95';
-const RED = '#FF6B6B';
 
 export default function Dashboard() {
-  const [data, setData] = useState(null);
+  redirect('/paper');
-  const [trades, setTrades] = useState([]);
-  const [loading, setLoading] = useState(true);
-  const [tab, setTab] = useState('market');
-
-  useEffect(() => {
-    const fetchState = async () => {
-      try {
-        const res = await fetch('/api/state');
-        const json = await res.json();
-        setData(json);
-        setLoading(false);
-      } catch (e) {
-        console.error('State fetch error:', e);
-      }
-    };
-
-    const fetchTrades = async () => {
-      try {
-        const res = await fetch('/api/trades');
-        const json = await res.json();
-        setTrades(json.trades || []);
-      } catch (e) {
-        console.error('Trades fetch error:', e);
-      }
-    };
-
-    fetchState();
-    fetchTrades();
-    const interval = setInterval(fetchState, 2000);
-    const tradesInterval = setInterval(fetchTrades, 10000);
-
-    return () => {
-      clearInterval(interval);
-      clearInterval(tradesInterval);
-    };
-  }, []);
-
-  if (loading) {
-    return (
-      <div className="min-h-screen bg-[#0a0a0a] flex items-center justify-center">
-        <div className="text-[#28CC95] text-lg animate-pulse">Loading Kalbot...</div>
-      </div>
-    );
-  }
-
-  const market = data?.market;
-  const paper = data?.paper;
-  const strategies = data?.strategies || [];
-
-  return (
-    <div className="min-h-screen bg-[#0a0a0a] text-white font-sans pb-20">
-      {/* Header */}
-      <header className="sticky top-0 z-50 bg-[#0a0a0a]/95 backdrop-blur border-b border-white/10 px-4 py-3">
-        <div className="flex items-center justify-between max-w-lg mx-auto">
-          <h1 className="text-lg font-bold" style={{ color: GREEN }}>Kalbot</h1>
-          <div className="flex items-center gap-2">
-            <span className={`w-2 h-2 rounded-full ${data?.lastUpdate ? 'bg-green-400 animate-pulse' : 'bg-red-500'}`} />
-            <span className="text-xs text-gray-400">
-              {data?.lastUpdate ? 'Live' : 'Offline'}
-            </span>
-          </div>
-        </div>
-      </header>
-
-      <main className="max-w-lg mx-auto px-4 pt-4 space-y-4">
-        {/* Market Card */}
-        <MarketCard market={market} />
-
-        {/* Paper Stats */}
-        <PaperStats paper={paper} />
-
-        {/* Tab Bar */}
-        <div className="flex gap-1 bg-white/5 rounded-lg p-1">
-          {['market', 'strategies', 'trades'].map(t => (
-            <button
-              key={t}
-              onClick={() => setTab(t)}
-              className={`flex-1 py-2 px-3 rounded-md text-sm font-medium transition-all ${
-                tab === t ? 'bg-white/10 text-white' : 'text-gray-500 hover:text-gray-300'
-              }`}
-            >
-              {t.charAt(0).toUpperCase() + t.slice(1)}
-            </button>
-          ))}
-        </div>
-
-        {/* Tab Content */}
-        {tab === 'market' && <MarketDetails market={market} />}
-        {tab === 'strategies' && <StrategiesView strategies={strategies} />}
-        {tab === 'trades' && <TradesView trades={trades} openPositions={paper?.openPositions || []} />}
-      </main>
-
-      {/* Worker Uptime */}
-      <div className="fixed bottom-0 left-0 right-0 bg-[#0a0a0a]/95 backdrop-blur border-t border-white/5 py-2 px-4">
-        <div className="max-w-lg mx-auto flex justify-between text-xs text-gray-600">
-          <span>Worker uptime: {formatUptime(data?.workerUptime)}</span>
-          <span>Updated: {data?.lastUpdate ? new Date(data.lastUpdate).toLocaleTimeString() : 'never'}</span>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-function MarketCard({ market }) {
-  if (!market) {
-    return (
-      <div className="bg-white/5 rounded-2xl p-5 border border-white/10">
-        <p className="text-gray-500 text-center">No active market — waiting for next 15-min window...</p>
-      </div>
-    );
-  }
-
-  const timeLeft = market.closeTime ? getTimeLeft(market.closeTime) : null;
-
-  return (
-    <div className="bg-white/5 rounded-2xl p-5 border border-white/10 space-y-4">
-      {/* Title */}
-      <div className="flex items-center justify-between">
-        <div>
-          <h2 className="font-bold text-base">BTC Up or Down</h2>
-          <p className="text-xs text-gray-400">15 minutes</p>
-        </div>
-        <div className="flex items-center gap-2">
-          {timeLeft && (
-            <span className="text-xs bg-white/10 px-2 py-1 rounded-full text-gray-300">
-              ⏱ {timeLeft}
-            </span>
-          )}
-          <span className="text-2xl">₿</span>
-        </div>
-      </div>
-
-      {/* Up */}
-      <div className="space-y-2">
-        <div className="flex items-center justify-between">
-          <span className="text-sm font-medium">Up</span>
-          <div className="flex items-center gap-3">
-            <span className="text-sm text-gray-400">{market.yesOdds}x</span>
-            <span className="text-sm font-bold px-3 py-1 rounded-full border"
-              style={{ borderColor: GREEN, color: GREEN }}>
-              {market.yesPct}%
-            </span>
-          </div>
-        </div>
-        <div className="w-full bg-white/10 rounded-full h-2">
-          <div className="h-2 rounded-full transition-all duration-500"
-            style={{ width: `${market.yesPct}%`, backgroundColor: GREEN }} />
-        </div>
-      </div>
-
-      {/* Down */}
-      <div className="space-y-2">
-        <div className="flex items-center justify-between">
-          <span className="text-sm font-medium">Down</span>
-          <div className="flex items-center gap-3">
-            <span className="text-sm text-gray-400">{market.noOdds}x</span>
-            <span className="text-sm font-bold px-3 py-1 rounded-full border"
-              style={{ borderColor: '#4A90D9', color: '#4A90D9' }}>
-              {market.noPct}%
-            </span>
-          </div>
-        </div>
-        <div className="w-full bg-white/10 rounded-full h-2">
-          <div className="h-2 rounded-full transition-all duration-500"
-            style={{ width: `${market.noPct}%`, backgroundColor: '#4A90D9' }} />
-        </div>
-      </div>
-
-      {/* Volume */}
-      <div className="flex justify-between text-xs text-gray-500 pt-1">
-        <span>${(market.volume || 0).toLocaleString()} vol</span>
-        <span className="font-mono text-gray-600">{market.ticker}</span>
-      </div>
-    </div>
-  );
-}
-
-function PaperStats({ paper }) {
-  if (!paper) return null;
-
-  const pnlColor = paper.totalPnL >= 0 ? GREEN : RED;
-
-  return (
-    <div className="grid grid-cols-4 gap-2">
-      <StatBox label="Balance" value={`$${paper.balance}`} />
-      <StatBox label="PnL" value={`${paper.totalPnL >= 0 ? '+' : ''}$${paper.totalPnL}`} color={pnlColor} />
-      <StatBox label="Win Rate" value={`${paper.winRate}%`} color={paper.winRate >= 50 ? GREEN : RED} />
-      <StatBox label="Trades" value={paper.totalTrades} />
-    </div>
-  );
-}
-
-function StatBox({ label, value, color }) {
-  return (
-    <div className="bg-white/5 rounded-xl p-3 border border-white/5 text-center">
-      <p className="text-[10px] text-gray-500 uppercase tracking-wider">{label}</p>
-      <p className="text-sm font-bold mt-0.5" style={color ? { color } : {}}>{value}</p>
-    </div>
-  );
-}
-
-function MarketDetails({ market }) {
-  if (!market) return <p className="text-gray-500 text-sm text-center py-8">No market data</p>;
-
-  const rows = [
-    ['Yes Bid / Ask', `${market.yesBid || '-'}¢ / ${market.yesAsk || '-'}¢`],
-    ['No Bid / Ask', `${market.noBid || '-'}¢ / ${market.noAsk || '-'}¢`],
-    ['Last Price', `${market.lastPrice || '-'}¢`],
-    ['Volume 24h', `$${(market.volume24h || 0).toLocaleString()}`],
-    ['Open Interest', (market.openInterest || 0).toLocaleString()],
-    ['Status', market.status || 'unknown'],
-    ['Closes', market.closeTime ? new Date(market.closeTime).toLocaleTimeString() : '-'],
-  ];
-
-  return (
-    <div className="bg-white/5 rounded-xl border border-white/5 overflow-hidden">
-      {rows.map(([k, v], i) => (
-        <div key={k} className={`flex justify-between px-4 py-3 ${i < rows.length - 1 ? 'border-b border-white/5' : ''}`}>
-          <span className="text-sm text-gray-400">{k}</span>
-          <span className="text-sm font-medium">{v}</span>
-        </div>
-      ))}
-    </div>
-  );
-}
-
-function StrategiesView({ strategies }) {
-  if (!strategies.length) {
-    return <p className="text-gray-500 text-sm text-center py-8">No strategies loaded</p>;
-  }
-
-  return (
-    <div className="space-y-3">
-      {strategies.map((s, i) => (
-        <div key={i} className="bg-white/5 rounded-xl p-4 border border-white/5">
-          <div className="flex items-center justify-between mb-2">
-            <div className="flex items-center gap-2">
-              <span className={`w-2 h-2 rounded-full ${s.enabled && !s.paused ? 'bg-green-400' : 'bg-red-500'}`} />
-              <span className="font-bold text-sm capitalize">{s.name}</span>
-            </div>
-            <span className="text-xs px-2 py-0.5 rounded-full bg-white/10 text-gray-400">{s.mode}</span>
-          </div>
-
-          <div className="space-y-1 text-xs text-gray-400">
-            {s.config && Object.entries(s.config).map(([k, v]) => (
-              <div key={k} className="flex justify-between">
-                <span>{k}</span>
-                <span className="text-gray-300">{typeof v === 'number' ? v : String(v)}</span>
-              </div>
-            ))}
-            {s.consecutiveLosses !== undefined && (
-              <div className="flex justify-between mt-1 pt-1 border-t border-white/5">
-                <span>Consecutive Losses</span>
-                <span className={s.consecutiveLosses > 0 ? 'text-red-400' : 'text-gray-300'}>
-                  {s.consecutiveLosses}
-                </span>
-              </div>
-            )}
-            {s.currentBetSize !== undefined && (
-              <div className="flex justify-between">
-                <span>Next Bet</span>
-                <span className="text-gray-300">${s.currentBetSize}</span>
-              </div>
-            )}
-            {s.paused && (
-              <div className="text-red-400 font-medium mt-1">⚠️ PAUSED — max losses reached</div>
-            )}
-          </div>
-        </div>
-      ))}
-    </div>
-  );
-}
-
-function TradesView({ trades, openPositions }) {
-  return (
-    <div className="space-y-3">
-      {/* Open Positions */}
-      {openPositions.length > 0 && (
-        <div>
-          <h3 className="text-xs text-gray-500 uppercase tracking-wider mb-2">Open Positions</h3>
-          {openPositions.map((t, i) => (
-            <TradeRow key={i} trade={t} isOpen />
-          ))}
-        </div>
-      )}
-
-      {/* Trade History */}
-      <div>
-        <h3 className="text-xs text-gray-500 uppercase tracking-wider mb-2">
-          History ({trades.length})
-        </h3>
-        {trades.length === 0 ? (
-          <p className="text-gray-600 text-sm text-center py-6">No trades yet. Strategies are watching...</p>
-        ) : (
-          trades.map((t, i) => <TradeRow key={i} trade={t} />)
-        )}
-      </div>
-    </div>
-  );
-}
-
-function TradeRow({ trade, isOpen }) {
-  const won = trade.pnl > 0;
-  const pnlColor = trade.pnl == null ? 'text-gray-400' : won ? 'text-green-400' : 'text-red-400';
-
-  return (
-    <div className="bg-white/5 rounded-lg p-3 border border-white/5 mb-2">
-      <div className="flex items-center justify-between">
-        <div className="flex items-center gap-2">
-          {isOpen ? (
-            <span className="w-2 h-2 rounded-full bg-yellow-400 animate-pulse" />
-          ) : (
-            <span>{won ? '✅' : '❌'}</span>
-          )}
-          <span className="text-sm font-medium capitalize">{trade.side}</span>
-          <span className="text-xs text-gray-500">@ {trade.price}¢</span>
-        </div>
-        <span className={`text-sm font-bold ${pnlColor}`}>
-          {trade.pnl != null ? `${trade.pnl >= 0 ? '+' : ''}$${trade.pnl}` : 'open'}
-        </span>
-      </div>
-      <div className="flex justify-between mt-1">
-        <span className="text-[10px] text-gray-600 capitalize">{trade.strategy}</span>
-        <span className="text-[10px] text-gray-600">
-          {trade.entryTime ? new Date(trade.entryTime).toLocaleTimeString() : ''}
-        </span>
-      </div>
-      {trade.reason && (
-        <p className="text-[10px] text-gray-600 mt-1 truncate">{trade.reason}</p>
-      )}
-    </div>
-  );
-}
-
-function getTimeLeft(closeTime) {
-  const diff = new Date(closeTime).getTime() - Date.now();
-  if (diff <= 0) return 'Closing...';
-  const mins = Math.floor(diff / 60000);
-  const secs = Math.floor((diff % 60000) / 1000);
-  return `${mins}:${secs.toString().padStart(2, '0')}`;
-}
-
-function formatUptime(seconds) {
-  if (!seconds) return '0s';
-  const h = Math.floor(seconds / 3600);
-  const m = Math.floor((seconds % 3600) / 60);
-  const s = Math.floor(seconds % 60);
-  if (h > 0) return `${h}h ${m}m`;
-  if (m > 0) return `${m}m ${s}s`;
-  return `${s}s`;
 }

app/page.js

@@ -1,14 +1,14 @@
 'use client';
 import { useState, useRef } from 'react';
-
+import { useRouter } from 'next/navigation';
-// TODO: We should use this Kalshi green accent (#28CC95) all over the code.
 
 export default function LoginPage() {
-    const[email, setEmail] = useState('');
+    const router = useRouter();
+    const [email, setEmail] = useState('');
     const [password, setPassword] = useState('');
-    const[captcha, setCaptcha] = useState('');
+    const [captcha, setCaptcha] = useState('');
     const [error, setError] = useState('');
-    const[success, setSuccess] = useState('');
+    const [success, setSuccess] = useState('');
     const captchaImgRef = useRef(null);
 
     const refreshCaptcha = () => {
@@ -35,6 +35,7 @@ export default function LoginPage() {
             setCaptcha('');
         } else {
             setSuccess(data.message);
+            router.push('/paper');
         }
     };
 

app/paper/page.js

@@ -0,0 +1,397 @@
+'use client';
+import { useState, useEffect } from 'react';
+
+const GREEN = '#16A34A';
+const RED = '#DC2626';
+const BLUE = '#2563EB';
+
+export default function PaperDashboard() {
+  const [data, setData] = useState(null);
+  const [trades, setTrades] = useState({});
+  const [loading, setLoading] = useState(true);
+  const [activeStrat, setActiveStrat] = useState(null);
+  const [resetting, setResetting] = useState(false);
+
+  useEffect(() => {
+    const fetchState = async () => {
+      try {
+        const res = await fetch('/api/state');
+        const json = await res.json();
+        setData(json);
+        if (!activeStrat && json.strategies?.length) {
+          setActiveStrat(json.strategies[0].name);
+        }
+        setLoading(false);
+      } catch (e) {
+        console.error('State fetch error:', e);
+      }
+    };
+
+    fetchState();
+    const interval = setInterval(fetchState, 2000);
+    return () => clearInterval(interval);
+  }, [activeStrat]);
+
+  useEffect(() => {
+    if (!activeStrat) return;
+
+    const fetchTrades = async () => {
+      try {
+        const res = await fetch(`/api/trades?strategy=${encodeURIComponent(activeStrat)}`);
+        const json = await res.json();
+        setTrades(prev => ({ ...prev, [activeStrat]: json.trades || [] }));
+      } catch (e) {
+        console.error('Trades fetch error:', e);
+      }
+    };
+
+    fetchTrades();
+    const interval = setInterval(fetchTrades, 10000);
+    return () => clearInterval(interval);
+  }, [activeStrat]);
+
+  const handleReset = async () => {
+    if (!confirm('Reset ALL paper trading data? This clears all history, stats, and open positions for every strategy.')) return;
+    setResetting(true);
+    try {
+      await fetch('/api/reset', { method: 'POST' });
+      setTrades({});
+    } catch (e) {
+      console.error('Reset error:', e);
+    }
+    setTimeout(() => setResetting(false), 2000);
+  };
+
+  if (loading) {
+    return (
+      <div className="min-h-screen bg-gray-50 flex items-center justify-center">
+        <div className="text-green-600 text-lg animate-pulse">Loading Paper Trading...</div>
+      </div>
+    );
+  }
+
+  const market = data?.market;
+  const strategies = data?.strategies || [];
+  const paperByStrategy = data?.paperByStrategy || {};
+  const activeStratData = strategies.find(s => s.name === activeStrat);
+  const activeStats = paperByStrategy[activeStrat];
+  const activeTrades = trades[activeStrat] || [];
+
+  return (
+    <div className="min-h-screen bg-gray-50 text-gray-900 font-sans pb-20">
+      <header className="sticky top-0 z-50 bg-white/95 backdrop-blur border-b border-gray-200 px-4 py-3 shadow-sm">
+        <div className="flex items-center justify-between max-w-lg mx-auto">
+          <div className="flex items-center gap-2">
+            <h1 className="text-lg font-bold" style={{ color: GREEN }}>Kalbot</h1>
+            <span className="text-xs bg-amber-100 text-amber-700 px-2 py-0.5 rounded-full font-medium">PAPER</span>
+          </div>
+          <div className="flex items-center gap-3">
+            <button
+              onClick={handleReset}
+              disabled={resetting}
+              className="text-[10px] px-2 py-1 rounded bg-red-50 text-red-600 border border-red-200 hover:bg-red-100 transition-colors disabled:opacity-50 font-medium"
+            >
+              {resetting ? 'Resetting...' : '🗑 Reset All'}
+            </button>
+            <div className="flex items-center gap-1.5">
+              <span className={`w-2 h-2 rounded-full ${data?.lastUpdate ? 'bg-green-500 animate-pulse' : 'bg-red-500'}`} />
+              <span className="text-xs text-gray-500">
+                {data?.lastUpdate ? 'Live' : 'Offline'}
+              </span>
+            </div>
+          </div>
+        </div>
+      </header>
+
+      <main className="max-w-lg mx-auto px-4 pt-4 space-y-4">
+        <MarketCardCompact market={market} />
+
+        <div className="flex gap-1 bg-gray-100 rounded-lg p-1 overflow-x-auto">
+          {strategies.map(s => (
+            <button
+              key={s.name}
+              onClick={() => setActiveStrat(s.name)}
+              className={`flex-shrink-0 py-2 px-3 rounded-md text-xs font-medium transition-all whitespace-nowrap ${
+                activeStrat === s.name
+                  ? 'bg-white text-gray-900 shadow-sm'
+                  : 'text-gray-500 hover:text-gray-700'
+              }`}
+            >
+              <span className={`inline-block w-1.5 h-1.5 rounded-full mr-1.5 ${
+                s.enabled && !s.paused ? 'bg-green-500' : 'bg-red-500'
+              }`} />
+              {s.name}
+            </button>
+          ))}
+        </div>
+
+        {activeStrat && activeStratData && (
+          <StrategyDetailView
+            strategy={activeStratData}
+            stats={activeStats}
+            trades={activeTrades}
+          />
+        )}
+
+        <AllStrategiesOverview paperByStrategy={paperByStrategy} strategies={strategies} />
+      </main>
+
+      <div className="fixed bottom-0 left-0 right-0 bg-white/95 backdrop-blur border-t border-gray-200 py-2 px-4">
+        <div className="max-w-lg mx-auto flex justify-between text-xs text-gray-400">
+          <span>Worker: {formatUptime(data?.workerUptime)}</span>
+          <span>{data?.lastUpdate ? new Date(data.lastUpdate).toLocaleTimeString() : 'never'}</span>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function MarketCardCompact({ market }) {
+  if (!market) {
+    return (
+      <div className="bg-white rounded-xl p-4 border border-gray-200 shadow-sm">
+        <p className="text-gray-400 text-center text-sm">No active market — waiting...</p>
+      </div>
+    );
+  }
+
+  const timeLeft = market.closeTime ? getTimeLeft(market.closeTime) : null;
+
+  return (
+    <div className="bg-white rounded-xl p-4 border border-gray-200 shadow-sm">
+      <div className="flex items-center justify-between mb-3">
+        <div>
+          <h2 className="font-bold text-sm text-gray-900">BTC Up or Down</h2>
+          <p className="text-[10px] text-gray-400">15 min</p>
+        </div>
+        <div className="flex items-center gap-2">
+          {timeLeft && (
+            <span className="text-[10px] bg-gray-100 px-2 py-0.5 rounded-full text-gray-600">⏱ {timeLeft}</span>
+          )}
+          <span className="text-lg">₿</span>
+        </div>
+      </div>
+      <div className="flex items-center gap-3">
+        <div className="flex-1">
+          <div className="flex justify-between text-xs mb-1">
+            <span className="text-gray-600">Up</span>
+            <span style={{ color: GREEN }} className="font-medium">{market.yesPct}%</span>
+          </div>
+          <div className="w-full bg-gray-100 rounded-full h-1.5">
+            <div className="h-1.5 rounded-full transition-all duration-500" style={{ width: `${market.yesPct}%`, backgroundColor: GREEN }} />
+          </div>
+        </div>
+        <div className="flex-1">
+          <div className="flex justify-between text-xs mb-1">
+            <span className="text-gray-600">Down</span>
+            <span style={{ color: BLUE }} className="font-medium">{market.noPct}%</span>
+          </div>
+          <div className="w-full bg-gray-100 rounded-full h-1.5">
+            <div className="h-1.5 rounded-full transition-all duration-500" style={{ width: `${market.noPct}%`, backgroundColor: BLUE }} />
+          </div>
+        </div>
+      </div>
+      <div className="flex justify-between text-[10px] text-gray-400 mt-2">
+        <span>${(market.volume || 0).toLocaleString()} vol</span>
+        <span className="font-mono">{market.ticker}</span>
+      </div>
+    </div>
+  );
+}
+
+function StrategyDetailView({ strategy, stats, trades }) {
+  const s = stats || { balance: 1000, totalPnL: 0, wins: 0, losses: 0, winRate: 0, totalTrades: 0, openPositions: [] };
+  const pnlColor = s.totalPnL >= 0 ? GREEN : RED;
+
+  return (
+    <div className="space-y-3">
+      <div className="bg-white rounded-xl p-4 border border-gray-200 shadow-sm">
+        <div className="flex items-center justify-between mb-3">
+          <div className="flex items-center gap-2">
+            <span className={`w-2 h-2 rounded-full ${strategy.enabled && !strategy.paused ? 'bg-green-500' : 'bg-red-500'}`} />
+            <h3 className="font-bold text-sm capitalize text-gray-900">{strategy.name}</h3>
+          </div>
+          <span className="text-[10px] px-2 py-0.5 rounded-full bg-amber-100 text-amber-700 font-medium">{strategy.mode}</span>
+        </div>
+
+        <div className="grid grid-cols-4 gap-2 mb-3">
+          <StatBox label="Balance" value={`$${s.balance}`} />
+          <StatBox label="PnL" value={`${s.totalPnL >= 0 ? '+' : ''}$${s.totalPnL}`} color={pnlColor} />
+          <StatBox label="Win Rate" value={`${s.winRate}%`} color={s.winRate >= 50 ? GREEN : RED} />
+          <StatBox label="Trades" value={s.totalTrades} />
+        </div>
+
+        <div className="space-y-1 text-xs text-gray-500 border-t border-gray-100 pt-3">
+          {strategy.config && Object.entries(strategy.config).map(([k, v]) => (
+            <div key={k} className="flex justify-between">
+              <span>{k}</span>
+              <span className="text-gray-700">{typeof v === 'number' ? v : String(v)}</span>
+            </div>
+          ))}
+          {strategy.consecutiveLosses !== undefined && (
+            <div className="flex justify-between mt-1 pt-1 border-t border-gray-100">
+              <span>Consecutive Losses</span>
+              <span className={strategy.consecutiveLosses > 0 ? 'text-red-600' : 'text-gray-700'}>
+                {strategy.consecutiveLosses}
+              </span>
+            </div>
+          )}
+          {strategy.currentBetSize !== undefined && (
+            <div className="flex justify-between">
+              <span>Next Bet</span>
+              <span className="text-gray-700">${strategy.currentBetSize}</span>
+            </div>
+          )}
+          {strategy.round !== undefined && (
+            <div className="flex justify-between">
+              <span>Cycle Round</span>
+              <span className="text-gray-700">{strategy.round}/{strategy.maxRounds}</span>
+            </div>
+          )}
+          {strategy.cycleWins !== undefined && (
+            <div className="flex justify-between">
+              <span>Cycles Won/Lost</span>
+              <span className="text-gray-700">{strategy.cycleWins}W / {strategy.cycleLosses}L</span>
+            </div>
+          )}
+          {strategy.cycleWinRate !== undefined && (
+            <div className="flex justify-between">
+              <span>Cycle Win Rate</span>
+              <span className={strategy.cycleWinRate >= 50 ? 'text-green-600' : 'text-red-600'}>
+                {strategy.cycleWinRate}%
+              </span>
+            </div>
+          )}
+          {strategy.paused && (
+            <div className="text-red-600 font-medium mt-1">⚠️ PAUSED — max losses reached</div>
+          )}
+        </div>
+      </div>
+
+      {s.openPositions.length > 0 && (
+        <div>
+          <h4 className="text-[10px] text-gray-400 uppercase tracking-wider mb-2 font-bold">Open Positions ({s.openPositions.length})</h4>
+          {s.openPositions.map((t, i) => <TradeRow key={i} trade={t} isOpen />)}
+        </div>
+      )}
+
+      <div>
+        <h4 className="text-[10px] text-gray-400 uppercase tracking-wider mb-2 font-bold">
+          Trade History ({trades.length})
+        </h4>
+        {trades.length === 0 ? (
+          <p className="text-gray-400 text-xs text-center py-4">No settled trades yet.</p>
+        ) : (
+          trades.map((t, i) => <TradeRow key={i} trade={t} />)
+        )}
+      </div>
+    </div>
+  );
+}
+
+function AllStrategiesOverview({ paperByStrategy, strategies }) {
+  const entries = strategies.map(s => ({
+    name: s.name,
+    stats: paperByStrategy[s.name] || { balance: 1000, totalPnL: 0, winRate: 0, totalTrades: 0 },
+    enabled: s.enabled,
+    paused: s.paused
+  }));
+
+  if (!entries.length) return null;
+
+  entries.sort((a, b) => b.stats.totalPnL - a.stats.totalPnL);
+
+  return (
+    <div className="bg-white rounded-xl border border-gray-200 overflow-hidden shadow-sm">
+      <div className="px-4 py-3 border-b border-gray-100">
+        <h3 className="text-xs text-gray-500 uppercase tracking-wider font-bold">📊 Strategy Leaderboard</h3>
+      </div>
+      {entries.map((e, i) => {
+        const pnlColor = e.stats.totalPnL >= 0 ? GREEN : RED;
+        return (
+          <div key={e.name} className={`flex items-center justify-between px-4 py-3 ${i < entries.length - 1 ? 'border-b border-gray-100' : ''}`}>
+            <div className="flex items-center gap-2">
+              <span className="text-xs text-gray-400 w-4">{i + 1}.</span>
+              <span className={`w-1.5 h-1.5 rounded-full ${e.enabled && !e.paused ? 'bg-green-500' : 'bg-red-500'}`} />
+              <span className="text-sm font-medium capitalize text-gray-800">{e.name}</span>
+            </div>
+            <div className="flex items-center gap-4 text-xs">
+              <span className="text-gray-400">{e.stats.totalTrades} trades</span>
+              <span className="text-gray-400">{e.stats.winRate}% wr</span>
+              <span className="font-bold" style={{ color: pnlColor }}>
+                {e.stats.totalPnL >= 0 ? '+' : ''}${e.stats.totalPnL}
+              </span>
+            </div>
+          </div>
+        );
+      })}
+    </div>
+  );
+}
+
+function StatBox({ label, value, color }) {
+  return (
+    <div className="bg-gray-50 rounded-lg p-2 border border-gray-100 text-center">
+      <p className="text-[9px] text-gray-400 uppercase tracking-wider">{label}</p>
+      <p className="text-xs font-bold mt-0.5" style={color ? { color } : { color: '#111827' }}>{value}</p>
+    </div>
+  );
+}
+
+function TradeRow({ trade, isOpen }) {
+  // Fix: Check side vs result for actual win condition, not strictly PNL > 0
+  const won = trade.result && trade.side.toLowerCase() === trade.result.toLowerCase();
+  const isNeutral = trade.result === 'cancelled' || trade.result === 'expired';
+  
+  const pnlColor = trade.pnl == null ? 'text-gray-400' : trade.pnl > 0 ? 'text-green-600' : trade.pnl < 0 ? 'text-red-600' : 'text-gray-600';
+
+  return (
+    <div className="bg-white rounded-lg p-3 border border-gray-200 mb-2 shadow-sm">
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          {isOpen ? (
+            <span className="w-2 h-2 rounded-full bg-amber-400 animate-pulse" />
+          ) : (
+            <span>{isNeutral ? '➖' : won ? '✅' : '❌'}</span>
+          )}
+          <span className="text-sm font-medium capitalize text-gray-900">{trade.side}</span>
+          <span className="text-xs text-gray-400">@ {trade.price}¢</span>
+          <span className="text-[10px] text-gray-400">${trade.size}</span>
+        </div>
+        <span className={`text-sm font-bold ${pnlColor}`}>
+          {trade.pnl != null ? `${trade.pnl >= 0 ? '+' : ''}$${trade.pnl}` : 'open'}
+        </span>
+      </div>
+      <div className="flex justify-between mt-1">
+        <span className="text-[10px] text-gray-400">{trade.reason}</span>
+      </div>
+      <div className="flex justify-between items-center mt-0.5">
+        {trade.result && !isOpen && (
+          <span className="text-[10px] text-gray-400">Result: {trade.result}</span>
+        )}
+        {!trade.result && <span />}
+        <span className="text-[10px] text-gray-400">
+          {trade.entryTime ? new Date(trade.entryTime).toLocaleTimeString() : ''}
+        </span>
+      </div>
+    </div>
+  );
+}
+
+function getTimeLeft(closeTime) {
+  const diff = new Date(closeTime).getTime() - Date.now();
+  if (diff <= 0) return 'Closing...';
+  const mins = Math.floor(diff / 60000);
+  const secs = Math.floor((diff % 60000) / 1000);
+  return `${mins}:${secs.toString().padStart(2, '0')}`;
+}
+
+function formatUptime(seconds) {
+  if (!seconds) return '0s';
+  const h = Math.floor(seconds / 3600);
+  const m = Math.floor((seconds % 3600) / 60);
+  const s = Math.floor(seconds % 60);
+  if (h > 0) return `${h}h ${m}m`;
+  if (m > 0) return `${m}m ${s}s`;
+  return `${s}s`;
+}

lib/auth.js

@@ -0,0 +1,57 @@
+/**
+ * Edge-compatible session signer/verifier using Web Crypto API.
+ */
+
+async function getSessionKey() {
+    const secret = process.env.CAPTCHA_SECRET || 'dev_secret_meow';
+    const encoder = new TextEncoder();
+    return await crypto.subtle.importKey(
+        'raw',
+        encoder.encode(secret),
+        { name: 'HMAC', hash: 'SHA-256' },
+        false,
+        ['sign', 'verify']
+    );
+}
+
+export async function signSession() {
+    const expires = Date.now() + 24 * 60 * 60 * 1000; // 24 hours validity
+    const data = `admin.${expires}`;
+    const encoder = new TextEncoder();
+    const key = await getSessionKey();
+    
+    const signatureBuffer = await crypto.subtle.sign('HMAC', key, encoder.encode(data));
+    const signatureArray = Array.from(new Uint8Array(signatureBuffer));
+    const signatureHex = signatureArray.map(b => b.toString(16).padStart(2, '0')).join('');
+    
+    return `${data}.${signatureHex}`;
+}
+
+export async function verifySession(token) {
+    if (!token) return false;
+    
+    const parts = token.split('.');
+    if (parts.length !== 3) return false;
+    
+    const [user, expires, signatureHex] = parts;
+    if (user !== 'admin') return false;
+    
+    // Check if token expired
+    if (Date.now() > parseInt(expires, 10)) return false;
+
+    const data = `${user}.${expires}`;
+    const encoder = new TextEncoder();
+    const key = await getSessionKey();
+    
+    // Convert hex string back to Uint8Array
+    const signatureBytes = new Uint8Array(
+        signatureHex.match(/.{1,2}/g).map(byte => parseInt(byte, 16))
+    );
+    
+    try {
+        // Verify the HMAC signature ensures the token hasn't been tampered with
+        return await crypto.subtle.verify('HMAC', key, signatureBytes, encoder.encode(data));
+    } catch {
+        return false;
+    }
+}

lib/db.js

@@ -7,8 +7,6 @@ class Database {
   }
 
   async connect() {
-    if (this.connected) return;
-
     const url = process.env.SURREAL_URL;
     const user = process.env.SURREAL_USER;
     const pass = process.env.SURREAL_PASS;
@@ -20,7 +18,9 @@ class Database {
     }
 
     try {
+      if (!this.client) {
         this.client = new Surreal();
+      }
       await this.client.connect(url);
       await this.client.signin({ username: user, password: pass });
       await this.client.use({ namespace: 'kalbot', database: 'kalbot' });
@@ -32,11 +32,45 @@ class Database {
     }
   }
 
+  _normalizeQueryResult(raw) {
+    if (!Array.isArray(raw)) return [[]];
+
+    return raw.map((entry) => {
+      if (Array.isArray(entry)) return entry;
+      if (entry && typeof entry === 'object' && 'result' in entry) {
+        return Array.isArray(entry.result) ? entry.result : [entry.result];
+      }
+      return [];
+    });
+  }
+
+  async _handleTokenExpiration(e) {
+    if (e.message && e.message.toLowerCase().includes('token has expired')) {
+      console.log('[DB] Session token expired! Attempting to re-authenticate...');
+      this.connected = false;
+      await this.connect();
+      return this.connected; // Returns true if reconnection was successful
+    }
+    return false;
+  }
+
   async query(sql, vars = {}) {
     if (!this.connected) return [[]];
+
     try {
-      return await this.client.query(sql, vars);
+      const raw = await this.client.query(sql, vars);
+      return this._normalizeQueryResult(raw);
     } catch (e) {
+      // Check if it's an expiration issue, if so, reconnect and retry once
+      if (await this._handleTokenExpiration(e)) {
+        try {
+          const retryRaw = await this.client.query(sql, vars);
+          return this._normalizeQueryResult(retryRaw);
+        } catch (retryErr) {
+          console.error('[DB] Query retry error:', retryErr.message);
+          return [[]];
+        }
+      }
       console.error('[DB] Query error:', e.message);
       return [[]];
     }
@@ -47,6 +81,14 @@ class Database {
     try {
       return await this.client.create(table, data);
     } catch (e) {
+      if (await this._handleTokenExpiration(e)) {
+        try {
+          return await this.client.create(table, data);
+        } catch (retryErr) {
+          console.error('[DB] Create retry error:', retryErr.message);
+          return null;
+        }
+      }
       console.error('[DB] Create error:', e.message);
       return null;
     }
@@ -57,6 +99,14 @@ class Database {
     try {
       return await this.client.select(table);
     } catch (e) {
+      if (await this._handleTokenExpiration(e)) {
+        try {
+          return await this.client.select(table);
+        } catch (retryErr) {
+          console.error('[DB] Select retry error:', retryErr.message);
+          return [];
+        }
+      }
       console.error('[DB] Select error:', e.message);
       return [];
     }

lib/kalshi/auth.js

@@ -1,14 +1,36 @@
 import crypto from 'crypto';
 
-const KALSHI_API_BASE = 'https://api.elections.kalshi.com';
+const DEFAULT_KALSHI_API_BASE = 'https://api.elections.kalshi.com';
+const KALSHI_API_BASE = (process.env.KALSHI_API_BASE || DEFAULT_KALSHI_API_BASE).trim().replace(/\/+$/, '');
+
+function normalizePrivateKey(value) {
+  if (!value) return '';
+
+  let key = String(value).trim();
+
+  // Strip accidental wrapping quotes from env UIs
+  if (
+    (key.startsWith('"') && key.endsWith('"')) ||
+    (key.startsWith("'") && key.endsWith("'"))
+  ) {
+    key = key.slice(1, -1);
+  }
+
+  // Normalize line breaks from various env formats
+  return key
+    .replace(/\\r\\n/g, '\n')
+    .replace(/\r\n/g, '\n')
+    .replace(/\\n/g, '\n')
+    .trim();
+}
 
 /**
  * Signs a Kalshi API request using RSA-PSS with SHA-256.
  * Returns headers needed for authenticated requests.
  */
 export function signRequest(method, path, timestampMs = Date.now()) {
-  const keyId = process.env.KALSHI_API_KEY_ID;
+  const keyId = process.env.KALSHI_API_KEY_ID?.trim();
-  const privateKeyPem = process.env.KALSHI_RSA_PRIVATE_KEY?.replace(/\\n/g, '\n');
+  const privateKeyPem = normalizePrivateKey(process.env.KALSHI_RSA_PRIVATE_KEY);
 
   if (!keyId || !privateKeyPem) {
     throw new Error('Missing KALSHI_API_KEY_ID or KALSHI_RSA_PRIVATE_KEY');

lib/kalshi/rest.js

@@ -1,27 +1,206 @@
 import { signRequest, KALSHI_API_BASE } from './auth.js';
 
-async function kalshiFetch(method, path, body = null) {
+const SERIES_TICKER = (process.env.KALSHI_SERIES_TICKER || 'KXBTC15M').trim().toUpperCase();
-  const headers = signRequest(method, path);
+const OPEN_EVENT_STATUSES = new Set(['open', 'active', 'initialized', 'trading']);
-  const opts = { method, headers };
+const TRADABLE_EVENT_STATUSES = new Set(['open', 'active', 'trading']);
-  if (body) opts.body = JSON.stringify(body);
 
-  const res = await fetch(`${KALSHI_API_BASE}${path}`, opts);
+const DEFAULT_HTTP_RETRIES = Math.max(0, Number(process.env.KALSHI_HTTP_RETRIES || 3));
-  if (!res.ok) {
+const BASE_BACKOFF_MS = Math.max(100, Number(process.env.KALSHI_HTTP_BACKOFF_MS || 350));
+
+const EVENTS_CACHE_TTL_MS = Math.max(1000, Number(process.env.KALSHI_EVENTS_CACHE_TTL_MS || 5000));
+const eventsCache = new Map(); // key -> { expiresAt, data }
+const inflightEvents = new Map(); // key -> Promise<events>
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+function parseRetryAfterMs(value) {
+  if (!value) return null;
+
+  const asSeconds = Number(value);
+  if (Number.isFinite(asSeconds) && asSeconds >= 0) return asSeconds * 1000;
+
+  const asDate = new Date(value).getTime();
+  if (Number.isFinite(asDate)) return Math.max(0, asDate - Date.now());
+
+  return null;
+}
+
+function backoffMs(attempt) {
+  const exp = BASE_BACKOFF_MS * Math.pow(2, attempt);
+  const jitter = Math.floor(Math.random() * 200);
+  return exp + jitter;
+}
+
+async function kalshiFetch(method, path, body = null, opts = {}) {
+  const retries = Number.isFinite(opts.retries) ? opts.retries : DEFAULT_HTTP_RETRIES;
+  const payload = body == null ? null : JSON.stringify(body);
+
+  for (let attempt = 0; attempt <= retries; attempt++) {
+    const headers = signRequest(method, path);
+    const req = { method, headers };
+    if (payload) req.body = payload;
+
+    let res;
+    try {
+      res = await fetch(`${KALSHI_API_BASE}${path}`, req);
+    } catch (e) {
+      if (attempt < retries) {
+        await sleep(backoffMs(attempt));
+        continue;
+      }
+      throw new Error(`Kalshi API ${method} ${path} network error: ${e.message}`);
+    }
+
+    if (res.ok) {
+      if (res.status === 204) return {};
       const text = await res.text();
+      if (!text) return {};
+      try {
+        return JSON.parse(text);
+      } catch {
+        return {};
+      }
+    }
+
+    const text = await res.text();
+    const retryable = res.status === 429 || (res.status >= 500 && res.status < 600);
+
+    if (retryable && attempt < retries) {
+      const retryAfter = parseRetryAfterMs(res.headers.get('retry-after'));
+      await sleep(retryAfter ?? backoffMs(attempt));
+      continue;
+    }
+
     throw new Error(`Kalshi API ${method} ${path} → ${res.status}: ${text}`);
   }
-  return res.json();
+
+  throw new Error(`Kalshi API ${method} ${path} failed after retries`);
+}
+
+function getTimeMs(value) {
+  if (!value) return null;
+  const ts = new Date(value).getTime();
+  return Number.isFinite(ts) ? ts : null;
+}
+
+function getEventCloseTimeMs(event) {
+  return (
+    getTimeMs(event?.close_time) ||
+    getTimeMs(event?.expiration_time) ||
+    getTimeMs(event?.settlement_time) ||
+    getTimeMs(event?.end_date) ||
+    null
+  );
+}
+
+function rankEvents(events = []) {
+  const now = Date.now();
+
+  return events
+    .filter(Boolean)
+    .map((event) => {
+      const status = String(event.status || '').toLowerCase();
+      const closeTs = getEventCloseTimeMs(event);
+
+      const openLike = OPEN_EVENT_STATUSES.has(status);
+      const tradableLike = TRADABLE_EVENT_STATUSES.has(status);
+      const notClearlyExpired = closeTs == null || closeTs > now - 60_000;
+
+      const delta = closeTs == null ? Number.MAX_SAFE_INTEGER : closeTs - now;
+      const closenessScore = delta < 0 ? Math.abs(delta) + 3_600_000 : delta;
+
+      return { event, openLike, tradableLike, notClearlyExpired, closenessScore };
+    })
+    .filter((x) => x.openLike || x.notClearlyExpired)
+    .sort((a, b) => {
+      if (a.tradableLike !== b.tradableLike) return a.tradableLike ? -1 : 1;
+      if (a.openLike !== b.openLike) return a.openLike ? -1 : 1;
+      if (a.notClearlyExpired !== b.notClearlyExpired) return a.notClearlyExpired ? -1 : 1;
+      return a.closenessScore - b.closenessScore;
+    })
+    .map((x) => x.event);
+}
+
+function getCachedEvents(key) {
+  const hit = eventsCache.get(key);
+  if (!hit) return null;
+  if (Date.now() > hit.expiresAt) {
+    eventsCache.delete(key);
+    return null;
+  }
+  return hit.data;
+}
+
+function setCachedEvents(key, events) {
+  eventsCache.set(key, {
+    expiresAt: Date.now() + EVENTS_CACHE_TTL_MS,
+    data: events
+  });
+}
+
+async function fetchEvents(series, query) {
+  const normalizedSeries = String(series || '').trim().toUpperCase();
+  const normalizedQuery = String(query || '').trim();
+  const key = `${normalizedSeries}|${normalizedQuery}`;
+
+  const cached = getCachedEvents(key);
+  if (cached) return cached;
+
+  const pending = inflightEvents.get(key);
+  if (pending) return pending;
+
+  const task = (async () => {
+    try {
+      const path = `/trade-api/v2/events?series_ticker=${encodeURIComponent(normalizedSeries)}&${normalizedQuery}`;
+      const data = await kalshiFetch('GET', path);
+      const events = Array.isArray(data.events) ? data.events : [];
+      setCachedEvents(key, events);
+      return events;
+    } finally {
+      inflightEvents.delete(key);
+    }
+  })();
+
+  inflightEvents.set(key, task);
+  return task;
 }
 
 /**
- * Get events for the BTC 15-min series.
+ * Return ranked candidate events for BTC 15m.
- * Returns the currently active event + its markets.
+ */
+export async function getActiveBTCEvents(limit = 12) {
+  const seriesCandidates = [SERIES_TICKER];
+  const eventMap = new Map();
+
+  for (const series of seriesCandidates) {
+    try {
+      // Use only known-good filter to avoid 400s from unsupported statuses.
+      const openEvents = await fetchEvents(series, 'status=open&limit=25');
+      for (const event of openEvents) {
+        if (event?.event_ticker) eventMap.set(event.event_ticker, event);
+      }
+
+      // Fallback if endpoint returns empty.
+      if (!openEvents.length) {
+        const fallbackEvents = await fetchEvents(series, 'limit=25');
+        for (const event of fallbackEvents) {
+          if (event?.event_ticker) eventMap.set(event.event_ticker, event);
+        }
+      }
+    } catch (e) {
+      console.error(`[Kalshi] Event fetch failed (${series}):`, e.message);
+    }
+  }
+
+  return rankEvents([...eventMap.values()]).slice(0, limit);
+}
+
+/**
+ * Backward-compatible: return single best candidate event.
  */
 export async function getActiveBTCEvent() {
-  const data = await kalshiFetch('GET', '/trade-api/v2/events?series_ticker=KXBTC15M&status=open&limit=1');
+  const events = await getActiveBTCEvents(1);
-  const event = data.events?.[0];
+  return events[0] || null;
-  if (!event) return null;
-  return event;
 }
 
 /**
@@ -29,7 +208,8 @@ export async function getActiveBTCEvent() {
  */
 export async function getEventMarkets(eventTicker) {
   const data = await kalshiFetch('GET', `/trade-api/v2/events/${eventTicker}`);
-  return data.event?.markets || [];
+  const markets = data?.event?.markets ?? data?.markets ?? data?.event_markets ?? [];
+  return Array.isArray(markets) ? markets : [];
 }
 
 /**

lib/kalshi/websocket.js

@@ -4,6 +4,16 @@ import { EventEmitter } from 'events';
 
 const WS_URL = 'wss://api.elections.kalshi.com/trade-api/ws/v2';
 
+function unwrapPacket(packet) {
+  if (!packet || typeof packet !== 'object') return { type: null, payload: null };
+  const type = packet.type || null;
+  const meta = { id: packet.id, sid: packet.sid, seq: packet.seq, type };
+  if (packet.msg && typeof packet.msg === 'object') {
+    return { type, payload: { ...meta, ...packet.msg } };
+  }
+  return { type, payload: { ...meta, ...packet } };
+}
+
 export class KalshiWS extends EventEmitter {
   constructor() {
     super();
@@ -12,10 +22,13 @@ export class KalshiWS extends EventEmitter {
     this.alive = false;
     this.reconnectTimer = null;
     this.pingInterval = null;
+    this.shouldReconnect = true;
+    this._cmdId = 1;
   }
 
   connect() {
     if (this.ws) this.disconnect();
+    this.shouldReconnect = true;
 
     const path = '/trade-api/ws/v2';
     const headers = signRequest('GET', path);
@@ -26,27 +39,28 @@ export class KalshiWS extends EventEmitter {
       console.log('[WS] Connected to Kalshi');
       this.alive = true;
       this._startPing();
-      // Resubscribe to any tickers we were watching
+
-      for (const ticker of this.subscribedTickers) {
+      for (const ticker of this.subscribedTickers) this._sendSubscribe(ticker);
-        this._sendSubscribe(ticker);
-      }
       this.emit('connected');
     });
 
     this.ws.on('message', (raw) => {
       try {
-        const msg = JSON.parse(raw.toString());
+        const packet = JSON.parse(raw.toString());
-        this._handleMessage(msg);
+        this._handleMessage(packet);
       } catch (e) {
         console.error('[WS] Parse error:', e.message);
       }
     });
 
     this.ws.on('close', (code) => {
-      console.log(`[WS] Disconnected (code: ${code}). Reconnecting in 3s...`);
+      console.log(`[WS] Disconnected (code: ${code}).`);
       this.alive = false;
       this._stopPing();
+      if (this.shouldReconnect) {
+        console.log('[WS] Reconnecting in 3s...');
         this._scheduleReconnect();
+      }
     });
 
     this.ws.on('error', (err) => {
@@ -55,22 +69,30 @@ export class KalshiWS extends EventEmitter {
   }
 
   subscribeTicker(ticker) {
+    if (!ticker) return;
     this.subscribedTickers.add(ticker);
     if (this.alive) this._sendSubscribe(ticker);
   }
 
   unsubscribeTicker(ticker) {
+    if (!ticker) return;
     this.subscribedTickers.delete(ticker);
-    if (this.alive) {
+    if (this.alive && this.ws?.readyState === WebSocket.OPEN) {
       this.ws.send(JSON.stringify({
-        id: Date.now(),
+        id: this._cmdId++,
         cmd: 'unsubscribe',
-        params: { channels: ['orderbook_delta', 'ticker'], market_tickers: [ticker] }
+        params: { channels: ['orderbook_delta'], market_ticker: ticker }
+      }));
+      this.ws.send(JSON.stringify({
+        id: this._cmdId++,
+        cmd: 'unsubscribe',
+        params: { channels: ['ticker'], market_ticker: ticker }
       }));
     }
   }
 
   disconnect() {
+    this.shouldReconnect = false;
     this._stopPing();
     clearTimeout(this.reconnectTimer);
     if (this.ws) {
@@ -82,34 +104,56 @@ export class KalshiWS extends EventEmitter {
   }
 
   _sendSubscribe(ticker) {
+    if (!this.ws || this.ws.readyState !== WebSocket.OPEN) return;
+
+    // Subscribe orderbook_delta (private channel) with market_ticker
     this.ws.send(JSON.stringify({
-      id: Date.now(),
+      id: this._cmdId++,
       cmd: 'subscribe',
-      params: { channels: ['orderbook_delta', 'ticker'], market_tickers: [ticker] }
+      params: { channels: ['orderbook_delta'], market_ticker: ticker }
+    }));
+
+    // Subscribe ticker (public channel) with market_ticker
+    this.ws.send(JSON.stringify({
+      id: this._cmdId++,
+      cmd: 'subscribe',
+      params: { channels: ['ticker'], market_ticker: ticker }
     }));
   }
 
-  _handleMessage(msg) {
+  _handleMessage(packet) {
-    const { type } = msg;
+    const { type, payload } = unwrapPacket(packet);
+    if (!type || !payload) return;
+
     if (type === 'orderbook_snapshot' || type === 'orderbook_delta') {
-      this.emit('orderbook', msg);
+      this.emit('orderbook', payload);
-    } else if (type === 'ticker') {
+      return;
-      this.emit('ticker', msg);
+    }
-    } else if (type === 'subscribed') {
+
-      console.log(`[WS] Subscribed to: ${msg.msg?.channels || 'unknown'}`);
+    if (type === 'ticker') {
+      this.emit('ticker', payload);
+      return;
+    }
+
+    if (type === 'subscribed' || type === 'ok') {
+      console.log(`[WS] ${type}:`, JSON.stringify(payload).slice(0, 200));
+    }
+
+    if (type === 'error') {
+      console.error('[WS] Server error:', JSON.stringify(payload).slice(0, 300));
     }
   }
 
   _startPing() {
+    this._stopPing();
     this.pingInterval = setInterval(() => {
-      if (this.alive && this.ws?.readyState === WebSocket.OPEN) {
+      if (this.alive && this.ws?.readyState === WebSocket.OPEN) this.ws.ping();
-        this.ws.ping();
-      }
     }, 15000);
   }
 
   _stopPing() {
     clearInterval(this.pingInterval);
+    this.pingInterval = null;
   }
 
   _scheduleReconnect() {

lib/market/tracker.js

@@ -1,7 +1,21 @@
-import { getActiveBTCEvent, getEventMarkets, getOrderbook, getMarket } from '../kalshi/rest.js';
+import { getActiveBTCEvents, getEventMarkets, getOrderbook, getMarket } from '../kalshi/rest.js';
 import { KalshiWS } from '../kalshi/websocket.js';
 import { EventEmitter } from 'events';
 
+const OPEN_MARKET_STATUSES = new Set(['open', 'active', 'initialized', 'trading']);
+const TRADABLE_MARKET_STATUSES = new Set(['open', 'active', 'trading']);
+
+/**
+ * Converts a dollar string like "0.4200" to cents integer (42).
+ * Returns null if not parseable.
+ */
+function dollarsToCents(val) {
+  if (val == null) return null;
+  const n = Number(val);
+  if (!Number.isFinite(n)) return null;
+  return Math.round(n * 100);
+}
+
 /**
  * Tracks the currently active BTC 15-min market.
  * Auto-rotates when the current market expires.
@@ -21,16 +35,11 @@ export class MarketTracker extends EventEmitter {
   async start() {
     console.log('[Tracker] Starting market tracker...');
 
-    // Connect WebSocket
     this.ws.connect();
-
     this.ws.on('orderbook', (msg) => this._onOrderbook(msg));
     this.ws.on('ticker', (msg) => this._onTicker(msg));
 
-    // Initial market discovery
     await this._findAndSubscribe();
-
-    // Check for market rotation every 30 seconds
     this.rotateInterval = setInterval(() => this._checkRotation(), 30000);
   }
 
@@ -42,14 +51,34 @@ export class MarketTracker extends EventEmitter {
   getState() {
     if (!this.marketData) return null;
 
-    const yesAsk = this.orderbook.yes?.[0]?.[0] || this.marketData.yes_ask;
+    const quotes = this._extractMarketQuotes(this.marketData);
-    const noAsk = this.orderbook.no?.[0]?.[0] || this.marketData.no_ask;
+    const bestYesBook = this._bestBookPrice(this.orderbook.yes);
+    const bestNoBook = this._bestBookPrice(this.orderbook.no);
 
-    // Prices on Kalshi are in cents (1-99)
+    const yesBid = quotes.yesBid ?? bestYesBook;
-    const yesPct = yesAsk || 50;
+    const noBid = quotes.noBid ?? bestNoBook;
-    const noPct = noAsk || 50;
+    const yesAsk = quotes.yesAsk ?? (noBid != null ? 100 - noBid : null);
+    const noAsk = quotes.noAsk ?? (yesBid != null ? 100 - yesBid : null);
+
+    let yesPct = yesAsk ?? yesBid ?? bestYesBook;
+    let noPct = noAsk ?? noBid ?? bestNoBook;
+
+    if (yesPct == null && noPct != null) yesPct = 100 - noPct;
+    if (noPct == null && yesPct != null) noPct = 100 - yesPct;
+
+    if (yesPct == null && noPct == null && quotes.lastPrice != null) {
+      yesPct = quotes.lastPrice;
+      noPct = 100 - quotes.lastPrice;
+    }
+
+    if (yesPct == null || noPct == null) {
+      yesPct = 50;
+      noPct = 50;
+    }
+
+    yesPct = this._clampPct(yesPct) ?? 50;
+    noPct = this._clampPct(noPct) ?? 50;
 
-    // Odds = 100 / price
     const yesOdds = yesPct > 0 ? (100 / yesPct).toFixed(2) : '0.00';
     const noOdds = noPct > 0 ? (100 / noPct).toFixed(2) : '0.00';
 
@@ -62,14 +91,14 @@ export class MarketTracker extends EventEmitter {
       noPct,
       yesOdds: parseFloat(yesOdds),
       noOdds: parseFloat(noOdds),
-      yesBid: this.marketData.yes_bid,
+      yesBid: this._clampPct(yesBid),
-      yesAsk: this.marketData.yes_ask,
+      yesAsk: this._clampPct(yesAsk),
-      noBid: this.marketData.no_bid,
+      noBid: this._clampPct(noBid),
-      noAsk: this.marketData.no_ask,
+      noAsk: this._clampPct(noAsk),
-      volume: this.marketData.volume || 0,
+      volume: this._num(this.marketData.volume) ?? 0,
-      volume24h: this.marketData.volume_24h || 0,
+      volume24h: this._num(this.marketData.volume_24h) ?? 0,
-      openInterest: this.marketData.open_interest || 0,
+      openInterest: this._num(this.marketData.open_interest) ?? 0,
-      lastPrice: this.marketData.last_price,
+      lastPrice: this._clampPct(quotes.lastPrice),
       closeTime: this.marketData.close_time || this.marketData.expiration_time,
       status: this.marketData.status,
       result: this.marketData.result,
@@ -77,70 +106,243 @@ export class MarketTracker extends EventEmitter {
     };
   }
 
+  _num(value) {
+    if (value == null) return null;
+    const n = Number(value);
+    return Number.isFinite(n) ? n : null;
+  }
+
+  _clampPct(value) {
+    const n = this._num(value);
+    if (n == null) return null;
+    return Math.max(0, Math.min(100, n));
+  }
+
+  _toTs(value) {
+    if (!value) return null;
+    const ts = new Date(value).getTime();
+    return Number.isFinite(ts) ? ts : null;
+  }
+
+  _extractMarketQuotes(market) {
+    const pick = (...keys) => {
+      for (const key of keys) {
+        const v = this._num(market?.[key]);
+        if (v != null) return v;
+      }
+      return null;
+    };
+
+    // Try cents first (from REST API), then dollar-string fields (from WS ticker)
+    let yesBid = pick('yes_bid', 'yesBid');
+    let yesAsk = pick('yes_ask', 'yesAsk');
+    let noBid = pick('no_bid', 'noBid');
+    let noAsk = pick('no_ask', 'noAsk');
+    let lastPrice = pick('last_price', 'lastPrice', 'yes_price', 'yesPrice');
+
+    // WS ticker sends dollar strings — convert to cents
+    if (yesBid == null) yesBid = dollarsToCents(market?.yes_bid_dollars);
+    if (yesAsk == null) yesAsk = dollarsToCents(market?.yes_ask_dollars);
+    if (noBid == null) noBid = dollarsToCents(market?.no_bid_dollars);
+    if (noAsk == null) noAsk = dollarsToCents(market?.no_ask_dollars);
+    if (lastPrice == null) lastPrice = dollarsToCents(market?.price_dollars);
+
+    return { yesBid, yesAsk, noBid, noAsk, lastPrice };
+  }
+
+  _normalizeBookSide(levels) {
+    if (!Array.isArray(levels)) return [];
+    const out = [];
+
+    for (const level of levels) {
+      let price = null;
+      let qty = null;
+
+      if (Array.isArray(level)) {
+        // New API format: ["0.4200", "300.00"] (dollar strings)
+        // Or old format: [42, 300] (cents integers)
+        const rawPrice = level[0];
+        const rawQty = level[1];
+
+        // Detect dollar-string format (contains a decimal point and is < 1.01)
+        if (typeof rawPrice === 'string' && rawPrice.includes('.')) {
+          price = dollarsToCents(rawPrice);
+          qty = this._num(rawQty);
+        } else {
+          price = this._num(rawPrice);
+          qty = this._num(rawQty);
+        }
+      } else if (level && typeof level === 'object') {
+        // Object format
+        const rawPrice = level.price ?? level.price_dollars ?? level[0];
+        const rawQty = level.qty ?? level.quantity ?? level.size ?? level.count ?? level[1];
+
+        if (typeof rawPrice === 'string' && rawPrice.includes('.')) {
+          price = dollarsToCents(rawPrice);
+        } else {
+          price = this._num(rawPrice);
+        }
+        qty = this._num(rawQty);
+      }
+
+      if (price == null || qty == null || qty <= 0) continue;
+      out.push([price, qty]);
+    }
+
+    return out.sort((a, b) => b[0] - a[0]);
+  }
+
+  _normalizeOrderbook(book) {
+    const root = book?.orderbook && typeof book.orderbook === 'object' ? book.orderbook : book;
+    return {
+      // Support both old fields (yes/no) and new fields (yes_dollars_fp/no_dollars_fp)
+      yes: this._normalizeBookSide(root?.yes ?? root?.yes_dollars_fp ?? root?.yes_dollars),
+      no: this._normalizeBookSide(root?.no ?? root?.no_dollars_fp ?? root?.no_dollars)
+    };
+  }
+
+  _bestBookPrice(sideBook) {
+    if (!Array.isArray(sideBook) || !sideBook.length) return null;
+    return this._num(sideBook[0][0]);
+  }
+
+  _pickBestMarket(markets = []) {
+    const now = Date.now();
+
+    const ranked = markets
+      .filter(Boolean)
+      .map((market) => {
+        const status = String(market?.status || '').toLowerCase();
+        const closeTs =
+          this._toTs(market?.close_time) ||
+          this._toTs(market?.expiration_time) ||
+          this._toTs(market?.settlement_time) ||
+          null;
+
+        const tradable = TRADABLE_MARKET_STATUSES.has(status);
+        const openLike = OPEN_MARKET_STATUSES.has(status);
+        const notClearlyExpired = closeTs == null || closeTs > now - 60_000;
+
+        return { market, tradable, openLike, notClearlyExpired, closeTs };
+      })
+      .filter((x) => x.openLike || x.notClearlyExpired);
+
+    if (!ranked.length) return markets[0] || null;
+
+    ranked.sort((a, b) => {
+      if (a.tradable !== b.tradable) return a.tradable ? -1 : 1;
+      if (a.openLike !== b.openLike) return a.openLike ? -1 : 1;
+      if (a.notClearlyExpired !== b.notClearlyExpired) return a.notClearlyExpired ? -1 : 1;
+      const aTs = a.closeTs ?? Number.MAX_SAFE_INTEGER;
+      const bTs = b.closeTs ?? Number.MAX_SAFE_INTEGER;
+      return aTs - bTs;
+    });
+
+    return ranked[0].market;
+  }
+
   async _findAndSubscribe() {
     try {
-      const event = await getActiveBTCEvent();
+      const candidates = await getActiveBTCEvents(12);
-      if (!event) {
+
+      if (!candidates.length) {
+        if (!this.currentTicker) this.emit('update', null);
         console.log('[Tracker] No active BTC 15m event found. Retrying in 30s...');
         return;
       }
 
-      const markets = event.markets || await getEventMarkets(event.event_ticker);
+      let selectedEvent = null;
-      // Find the up/down market (usually only one market per event)
+      let selectedMarket = null;
-      const market = markets.find(m => m.status === 'active' || m.status === 'open') || markets[0];
 
-      if (!market) {
+      for (const event of candidates) {
-        console.log('[Tracker] No active market in event. Retrying...');
+        const eventTicker = event?.event_ticker;
+        if (!eventTicker) continue;
+
+        let markets = Array.isArray(event.markets) ? event.markets : [];
+        if (!markets.length) {
+          try {
+            markets = await getEventMarkets(eventTicker);
+          } catch (e) {
+            console.error(`[Tracker] Failed loading markets for ${eventTicker}:`, e.message);
+            continue;
+          }
+        }
+
+        if (!markets.length) continue;
+
+        const market = this._pickBestMarket(markets);
+        if (!market?.ticker) continue;
+
+        selectedEvent = event;
+        selectedMarket = market;
+        break;
+      }
+
+      if (!selectedEvent || !selectedMarket) {
+        if (!this.currentTicker) this.emit('update', null);
+        console.log('[Tracker] No tradable BTC 15m market found yet. Retrying...');
         return;
       }
 
-      const newTicker = market.ticker;
+      const newTicker = selectedMarket.ticker;
 
-      if (newTicker === this.currentTicker) return;
+      if (newTicker === this.currentTicker) {
+        this.currentEvent = selectedEvent.event_ticker || this.currentEvent;
+        this.marketData = { ...(this.marketData || {}), ...selectedMarket };
+        this.emit('update', this.getState());
+        return;
+      }
 
-      // Unsubscribe from old
+      const oldTicker = this.currentTicker;
-      if (this.currentTicker) {
+
-        console.log(`[Tracker] Rotating from ${this.currentTicker} → ${newTicker}`);
+      if (oldTicker) {
-        this.ws.unsubscribeTicker(this.currentTicker);
+        console.log(`[Tracker] Rotating from ${oldTicker} → ${newTicker}`);
+        this.ws.unsubscribeTicker(oldTicker);
       }
 
       this.currentTicker = newTicker;
-      this.currentEvent = event.event_ticker;
+      this.currentEvent = selectedEvent.event_ticker;
-      this.marketData = market;
+      this.marketData = selectedMarket;
       this.orderbook = { yes: [], no: [] };
 
-      // Fetch fresh orderbook via REST
       try {
-        const ob = await getOrderbook(newTicker);
+        const [freshMarket, ob] = await Promise.all([
-        this.orderbook = ob;
+          getMarket(newTicker).catch(() => null),
+          getOrderbook(newTicker).catch(() => null)
+        ]);
+
+        if (freshMarket) this.marketData = { ...selectedMarket, ...freshMarket };
+        if (ob) this.orderbook = this._normalizeOrderbook(ob);
       } catch (e) {
-        console.error('[Tracker] Orderbook fetch error:', e.message);
+        console.error('[Tracker] Initial market bootstrap error:', e.message);
       }
 
-      // Subscribe via WS
       this.ws.subscribeTicker(newTicker);
-      console.log(`[Tracker] Now tracking: ${newTicker} (${market.title || market.subtitle})`);
+
+      console.log(
+        `[Tracker] Now tracking: ${newTicker} (${this.marketData?.title || this.marketData?.subtitle || selectedEvent.event_ticker})`
+      );
 
       this.emit('update', this.getState());
-      this.emit('market-rotated', { from: this.currentTicker, to: newTicker });
+      this.emit('market-rotated', { from: oldTicker, to: newTicker });
-
     } catch (err) {
       console.error('[Tracker] Discovery error:', err.message);
     }
   }
 
   async _checkRotation() {
-    // Refresh market data via REST
     if (this.currentTicker) {
       try {
         const fresh = await getMarket(this.currentTicker);
-        this.marketData = fresh;
+        this.marketData = { ...(this.marketData || {}), ...(fresh || {}) };
 
         const state = this.getState();
         this.emit('update', state);
 
-        // If market closed/settled, find the next one
+        const status = String(fresh?.status || '').toLowerCase();
-        if (fresh.status === 'closed' || fresh.status === 'settled' || fresh.result) {
+        const settledLike = status === 'closed' || status === 'settled' || status === 'expired' || status === 'finalized';
+
+        if (settledLike || fresh?.result) {
           console.log(`[Tracker] Market ${this.currentTicker} settled (result: ${fresh.result}). Rotating...`);
           this.emit('settled', { ticker: this.currentTicker, result: fresh.result });
           this.currentTicker = null;
@@ -158,11 +360,39 @@ export class MarketTracker extends EventEmitter {
     if (msg.market_ticker !== this.currentTicker) return;
 
     if (msg.type === 'orderbook_snapshot') {
-      this.orderbook = { yes: msg.yes || [], no: msg.no || [] };
+      // New format: yes_dollars_fp / no_dollars_fp
+      this.orderbook = this._normalizeOrderbook(msg);
+      console.log(`[Tracker] Orderbook snapshot: ${this.orderbook.yes.length} yes levels, ${this.orderbook.no.length} no levels`);
     } else if (msg.type === 'orderbook_delta') {
-      // Apply delta updates
+      const side = String(msg.side || '').toLowerCase();
-      if (msg.yes) this.orderbook.yes = this._applyDelta(this.orderbook.yes, msg.yes);
+
-      if (msg.no) this.orderbook.no = this._applyDelta(this.orderbook.no, msg.no);
+      // New format uses price_dollars + delta_fp
+      let price = this._num(msg.price);
+      if (price == null) price = dollarsToCents(msg.price_dollars);
+
+      let delta = this._num(msg.delta);
+      if (delta == null) delta = this._num(msg.delta_fp);
+
+      const absoluteQty = this._num(msg.qty ?? msg.quantity ?? msg.size);
+
+      if ((side === 'yes' || side === 'no') && price != null) {
+        const book = this.orderbook[side] || [];
+        const map = new Map(book);
+
+        const current = this._num(map.get(price)) ?? 0;
+        const next = delta != null ? current + delta : (absoluteQty ?? current);
+
+        if (next <= 0) map.delete(price);
+        else map.set(price, next);
+
+        this.orderbook[side] = [...map.entries()].sort((a, b) => b[0] - a[0]);
+      } else {
+        // Batch delta arrays (old format fallback)
+        const yesArr = msg.yes ?? msg.yes_dollars_fp;
+        const noArr = msg.no ?? msg.no_dollars_fp;
+        if (Array.isArray(yesArr)) this.orderbook.yes = this._applyDelta(this.orderbook.yes, yesArr);
+        if (Array.isArray(noArr)) this.orderbook.no = this._applyDelta(this.orderbook.no, noArr);
+      }
     }
 
     this.emit('update', this.getState());
@@ -171,27 +401,60 @@ export class MarketTracker extends EventEmitter {
   _onTicker(msg) {
     if (msg.market_ticker !== this.currentTicker) return;
 
-    // Merge ticker data into marketData
     if (this.marketData) {
-      Object.assign(this.marketData, {
+      // New API sends dollar-string fields; store them for _extractMarketQuotes
-        yes_bid: msg.yes_bid ?? this.marketData.yes_bid,
+      const fields = [
-        yes_ask: msg.yes_ask ?? this.marketData.yes_ask,
+        'yes_bid', 'yes_ask', 'no_bid', 'no_ask', 'last_price', 'volume',
-        no_bid: msg.no_bid ?? this.marketData.no_bid,
+        'yes_bid_dollars', 'yes_ask_dollars', 'no_bid_dollars', 'no_ask_dollars',
-        no_ask: msg.no_ask ?? this.marketData.no_ask,
+        'price_dollars', 'volume_fp', 'open_interest_fp',
-        last_price: msg.last_price ?? this.marketData.last_price,
+        'dollar_volume', 'dollar_open_interest'
-        volume: msg.volume ?? this.marketData.volume
+      ];
-      });
+
+      for (const key of fields) {
+        if (msg[key] != null) this.marketData[key] = msg[key];
+      }
+
+      // Also map dollar_volume / dollar_open_interest to standard fields
+      if (msg.dollar_volume != null) this.marketData.volume = this._num(msg.dollar_volume) ?? this.marketData.volume;
+      if (msg.dollar_open_interest != null) this.marketData.open_interest = this._num(msg.dollar_open_interest) ?? this.marketData.open_interest;
+      if (msg.volume_fp != null && this.marketData.volume == null) this.marketData.volume = this._num(msg.volume_fp);
     }
 
     this.emit('update', this.getState());
   }
 
   _applyDelta(book, deltas) {
-    const map = new Map(book);
+    const map = new Map(book || []);
-    for (const [price, qty] of deltas) {
+
-      if (qty === 0) map.delete(price);
+    for (const delta of Array.isArray(deltas) ? deltas : []) {
+      let price = null;
+      let qty = null;
+
+      if (Array.isArray(delta)) {
+        const rawPrice = delta[0];
+        const rawQty = delta[1];
+        if (typeof rawPrice === 'string' && rawPrice.includes('.')) {
+          price = dollarsToCents(rawPrice);
+        } else {
+          price = this._num(rawPrice);
+        }
+        qty = this._num(rawQty);
+      } else if (delta && typeof delta === 'object') {
+        const rawPrice = delta.price ?? delta.price_dollars ?? delta[0];
+        const rawQty = delta.qty ?? delta.quantity ?? delta.size ?? delta[1];
+        if (typeof rawPrice === 'string' && rawPrice.includes('.')) {
+          price = dollarsToCents(rawPrice);
+        } else {
+          price = this._num(rawPrice);
+        }
+        qty = this._num(rawQty);
+      }
+
+      if (price == null || qty == null) continue;
+      if (qty <= 0) map.delete(price);
       else map.set(price, qty);
     }
-    return [...map.entries()].sort((a, b) => a[0] - b[0]);
+
+    return [...map.entries()].sort((a, b) => b[0] - a[0]);
   }
 }

lib/paper/engine.js

@@ -2,63 +2,134 @@ import { db } from '../db.js';
 import { notify } from '../notify.js';
 
 /**
- * Paper Trading Engine.
+ * Per-Strategy Paper Trading Engine.
- * Executes virtual trades, tracks PnL, stores in SurrealDB.
+ * Each strategy gets its own isolated balance, PnL, and trade history.
  */
-export class PaperEngine {
+class StrategyPaperAccount {
-  constructor(initialBalance = 1000) {
+  constructor(strategyName, initialBalance = 1000) {
+    this.strategyName = strategyName;
     this.balance = initialBalance;
+    this.initialBalance = initialBalance;
     this.openPositions = new Map(); // ticker -> [positions]
-    this.tradeHistory = [];
     this.totalPnL = 0;
     this.wins = 0;
     this.losses = 0;
   }
 
-  async init() {
+  getStats() {
-    // Load state from SurrealDB
+    const openPositionsList = [];
-    try {
+    for (const [, positions] of this.openPositions) {
-      const state = await db.query('SELECT * FROM paper_state ORDER BY timestamp DESC LIMIT 1');
+      openPositionsList.push(...positions);
-      const saved = state[0]?.[0];
+    }
-      if (saved) {
+    return {
-        this.balance = saved.balance;
+      strategy: this.strategyName,
-        this.totalPnL = saved.totalPnL;
+      balance: parseFloat(this.balance.toFixed(2)),
-        this.wins = saved.wins;
+      initialBalance: this.initialBalance,
-        this.losses = saved.losses;
+      totalPnL: parseFloat(this.totalPnL.toFixed(2)),
-        console.log(`[Paper] Restored state: $${this.balance.toFixed(2)} balance, ${this.wins}W/${this.losses}L`);
+      wins: this.wins,
+      losses: this.losses,
+      winRate: this.wins + this.losses > 0
+        ? parseFloat(((this.wins / (this.wins + this.losses)) * 100).toFixed(1))
+        : 0,
+      openPositions: openPositionsList,
+      totalTrades: this.wins + this.losses
+    };
+  }
+}
+
+export class PaperEngine {
+  constructor(initialBalancePerStrategy = 1000) {
+    this.initialBalancePerStrategy = initialBalancePerStrategy;
+    this.accounts = new Map(); // strategyName -> StrategyPaperAccount
+    this._resetting = false;
+  }
+
+  _getAccount(strategyName) {
+    if (!this.accounts.has(strategyName)) {
+      this.accounts.set(strategyName, new StrategyPaperAccount(strategyName, this.initialBalancePerStrategy));
+    }
+    return this.accounts.get(strategyName);
+  }
+
+  /**
+   * Generate a short unique ID safe for SurrealDB v2 record keys.
+   * Avoids colons so we control the full `table:id` format ourselves.
+   */
+  _genId() {
+    return `pt_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+  }
+
+  /**
+   * Extract the raw record key from a SurrealDB id.
+   * e.g. "paper_positions:pt_123_abc" -> "pt_123_abc"
+   *      "pt_123_abc" -> "pt_123_abc"
+   */
+  _rawId(id) {
+    if (!id) return id;
+    const str = typeof id === 'object' && id.id ? String(id.id) : String(id);
+    const idx = str.indexOf(':');
+    return idx >= 0 ? str.slice(idx + 1) : str;
+  }
+
+  /**
+   * Build the full `table:id` string for use in raw queries.
+   */
+  _recordId(id) {
+    const raw = this._rawId(id);
+    return raw.startsWith('paper_positions:') ? raw : `paper_positions:⟨${raw}⟩`;
+  }
+
+  async init() {
+    try {
+      const states = await db.query('SELECT * FROM paper_strategy_state ORDER BY timestamp DESC');
+      const rows = states[0] || [];
+      const seen = new Set();
+      for (const saved of rows) {
+        if (!saved.strategyName || seen.has(saved.strategyName)) continue;
+        seen.add(saved.strategyName);
+        const acct = this._getAccount(saved.strategyName);
+        acct.balance = saved.balance;
+        acct.totalPnL = saved.totalPnL;
+        acct.wins = saved.wins;
+        acct.losses = saved.losses;
+        console.log(`[Paper:${saved.strategyName}] Restored: $${acct.balance.toFixed(2)}, ${acct.wins}W/${acct.losses}L`);
       }
 
-      // Load open positions
       const positions = await db.query('SELECT * FROM paper_positions WHERE settled = false');
       if (positions[0]) {
         for (const pos of positions[0]) {
-          const list = this.openPositions.get(pos.ticker) || [];
+          const acct = this._getAccount(pos.strategy);
+          const list = acct.openPositions.get(pos.ticker) || [];
           list.push(pos);
-          this.openPositions.set(pos.ticker, list);
+          acct.openPositions.set(pos.ticker, list);
+        }
+        const totalOpen = positions[0].length;
+        if (totalOpen > 0) {
+          console.log(`[Paper] Loaded ${totalOpen} open position(s) from DB`);
         }
-        console.log(`[Paper] Restored ${this.openPositions.size} open position(s)`);
       }
     } catch (e) {
       console.error('[Paper] Init error (fresh start):', e.message);
     }
   }
 
-  /**
-   * Execute a paper trade from a strategy signal.
-   */
   async executeTrade(signal, marketState) {
-    const cost = signal.size; // Each contract costs signal.price cents, but we simplify: $1 per contract unit
+    if (this._resetting) return null;
-    if (this.balance < cost) {
+
-      console.log(`[Paper] Insufficient balance ($${this.balance.toFixed(2)}) for $${cost} trade`);
+    const acct = this._getAccount(signal.strategy);
+    const cost = signal.size;
+
+    if (acct.balance < cost) {
+      console.log(`[Paper:${signal.strategy}] Insufficient balance ($${acct.balance.toFixed(2)}) for $${cost} trade`);
       return null;
     }
 
     const trade = {
-      id: `pt_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
+      id: this._genId(),
       strategy: signal.strategy,
       ticker: signal.ticker,
-      side: signal.side,
+      side: signal.side.toLowerCase(),
-      price: signal.price, // Entry price in cents
+      price: signal.price,
       size: signal.size,
       cost,
       reason: signal.reason,
@@ -74,41 +145,48 @@ export class PaperEngine {
       }
     };
 
-    this.balance -= cost;
+    acct.balance -= cost;
 
-    const list = this.openPositions.get(trade.ticker) || [];
+    const list = acct.openPositions.get(trade.ticker) || [];
     list.push(trade);
-    this.openPositions.set(trade.ticker, list);
+    acct.openPositions.set(trade.ticker, list);
 
-    // Store in SurrealDB
     try {
       await db.create('paper_positions', trade);
-      await this._saveState();
+      await this._saveState(acct);
     } catch (e) {
       console.error('[Paper] DB write error:', e.message);
     }
 
-    const msg = `📝 PAPER ${trade.side.toUpperCase()} @ ${trade.price}¢ ($${cost}) | ${trade.strategy} | ${trade.reason}`;
+    const msg = `📝 PAPER [${trade.strategy}] ${trade.side.toUpperCase()} @ ${trade.price}¢ ($${cost}) | ${trade.reason}`;
     console.log(`[Paper] ${msg}`);
-    await notify(msg, 'Paper Trade');
+    await notify(msg, `Paper: ${trade.strategy}`, '1');
 
     return trade;
   }
 
-  /**
+  async settle(ticker, rawResult) {
-   * Settle all positions for a ticker when the market resolves.
+    const result = String(rawResult || '').toLowerCase();
-   */
-  async settle(ticker, result) {
-    const positions = this.openPositions.get(ticker);
-    if (!positions || positions.length === 0) return;
 
-    console.log(`[Paper] Settling ${positions.length} position(s) for ${ticker}, result: ${result}`);
+    if (result !== 'yes' && result !== 'no') {
+      console.warn(`[Paper] Unknown settlement result "${rawResult}" for ${ticker}, skipping.`);
+      return null;
+    }
+
+    const allSettled = [];
+
+    for (const [strategyName, acct] of this.accounts) {
+      const positions = acct.openPositions.get(ticker);
+      if (!positions || positions.length === 0) continue;
+
+      console.log(`[Paper:${strategyName}] Settling ${positions.length} position(s) for ${ticker}, result: ${result}`);
 
       for (const pos of positions) {
-      const won = pos.side === result;
+        const side = String(pos.side || '').toLowerCase();
-      // Payout: if won, pay out at $1 per contract (100¢), minus cost
+        const won = side === result;
-      // If lost, lose the cost
+
-      const payout = won ? (100 / pos.price) * pos.cost : 0;
+        const price = pos.price > 0 ? pos.price : 50;
+        const payout = won ? (100 / price) * pos.cost : 0;
         const pnl = payout - pos.cost;
 
         pos.settled = true;
@@ -116,62 +194,220 @@ export class PaperEngine {
         pos.pnl = parseFloat(pnl.toFixed(2));
         pos.settleTime = Date.now();
 
-      this.balance += payout;
+        acct.balance += payout;
-      this.totalPnL += pnl;
+        acct.totalPnL += pnl;
 
-      if (won) this.wins++;
+        if (won) acct.wins++;
-      else this.losses++;
+        else acct.losses++;
+
+        const recordId = this._recordId(pos.id);
 
-      // Update in SurrealDB
         try {
-        await db.query(`UPDATE paper_positions SET settled = true, result = $result, pnl = $pnl, settleTime = $settleTime WHERE id = $id`, {
+          const updated = await db.query(
-          id: pos.id,
+            `UPDATE ${recordId} SET settled = true, result = $result, pnl = $pnl, settleTime = $settleTime`,
-          result,
+            { result, pnl: pos.pnl, settleTime: pos.settleTime }
-          pnl: pos.pnl,
+          );
-          settleTime: pos.settleTime
+          const rows = updated[0] || [];
-        });
+          if (rows.length === 0) {
+            // Record vanished from DB — re-insert the full settled trade
+            await db.create('paper_positions', { ...pos, id: this._rawId(pos.id) });
+          }
         } catch (e) {
           console.error('[Paper] Settle DB error:', e.message);
+          try {
+            await db.create('paper_positions', { ...pos, id: this._rawId(pos.id) });
+          } catch (e2) {
+            console.error('[Paper] Settle DB fallback error:', e2.message);
+          }
         }
 
         const emoji = won ? '✅' : '❌';
-      const msg = `${emoji} ${pos.strategy} ${pos.side.toUpperCase()} ${won ? 'WON' : 'LOST'} | PnL: $${pnl.toFixed(2)} | Balance: $${this.balance.toFixed(2)}`;
+        const msg = `${emoji} [${strategyName}] ${side.toUpperCase()} ${won ? 'WON' : 'LOST'} | PnL: $${pnl.toFixed(2)} | Bal: $${acct.balance.toFixed(2)}`;
         console.log(`[Paper] ${msg}`);
-      await notify(msg, won ? 'Paper Win!' : 'Paper Loss');
+        await notify(msg, won ? `${strategyName} Win!` : `${strategyName} Loss`, '1');
+
+        allSettled.push(pos);
       }
 
-    this.openPositions.delete(ticker);
+      acct.openPositions.delete(ticker);
-    await this._saveState();
+      await this._saveState(acct);
+    }
 
-    return positions;
+    return allSettled.length > 0 ? allSettled : null;
+  }
+
+  getOpenTickers() {
+    const tickers = new Set();
+    for (const [, acct] of this.accounts) {
+      for (const ticker of acct.openPositions.keys()) {
+        tickers.add(ticker);
+      }
+    }
+    return Array.from(tickers);
+  }
+
+  async checkOrphans(getMarketFn) {
+    const orphanTickers = this.getOpenTickers();
+    if (!orphanTickers.length) return { settled: [], expired: [] };
+
+    const results = { settled: [], expired: [] };
+
+    for (const ticker of orphanTickers) {
+      try {
+        const market = await getMarketFn(ticker);
+        const status = String(market?.status || '').toLowerCase();
+        const result = market?.result;
+
+        if (result) {
+          console.log(`[Paper] Delayed result found for ${ticker}: "${result}"`);
+          const settledPos = await this.settle(ticker, result);
+          if (settledPos) results.settled.push(...settledPos);
+        } else if (['expired', 'cancelled'].includes(status)) {
+          console.log(`[Paper] Ticker ${ticker} marked as ${status} — force-settling as expired`);
+          const expiredPos = await this._forceExpirePositions(ticker);
+          if (expiredPos) results.expired.push(...expiredPos);
+        }
+      } catch (e) {
+        console.error(`[Paper] Orphan check failed for ${ticker}:`, e.message);
+      }
+    }
+    return results;
+  }
+
+  async _forceExpirePositions(ticker) {
+    const expired = [];
+    for (const [strategyName, acct] of this.accounts) {
+      const positions = acct.openPositions.get(ticker);
+      if (!positions || !positions.length) continue;
+
+      for (const pos of positions) {
+        pos.settled = true;
+        pos.result = 'expired';
+        pos.pnl = parseFloat((-pos.cost).toFixed(2));
+        pos.settleTime = Date.now();
+
+        acct.totalPnL -= pos.cost;
+        acct.losses++;
+
+        const recordId = this._recordId(pos.id);
+
+        try {
+          const updated = await db.query(
+            `UPDATE ${recordId} SET settled = true, result = $result, pnl = $pnl, settleTime = $settleTime`,
+            { result: 'expired', pnl: pos.pnl, settleTime: pos.settleTime }
+          );
+          const rows = updated[0] || [];
+          if (rows.length === 0) {
+            await db.create('paper_positions', { ...pos, id: this._rawId(pos.id) });
+          }
+        } catch (e) {
+          console.error('[Paper] Force-expire DB error:', e.message);
+        }
+
+        console.log(`[Paper:${strategyName}] Force-expired position ${pos.id} for ${ticker} (lost $${pos.cost})`);
+        expired.push(pos);
+      }
+
+      acct.openPositions.delete(ticker);
+      await this._saveState(acct);
+    }
+    return expired;
+  }
+
+  async resetAll() {
+    this._resetting = true;
+
+    for (const [name, acct] of this.accounts) {
+      for (const [ticker, positions] of acct.openPositions) {
+        for (const pos of positions) {
+          acct.balance += pos.cost;
+          pos.settled = true;
+          pos.result = 'cancelled';
+          pos.pnl = 0;
+          pos.settleTime = Date.now();
+
+          try {
+            const recordId = this._recordId(pos.id);
+            await db.query(
+              `UPDATE ${recordId} SET settled = true, result = $result, pnl = $pnl, settleTime = $settleTime`,
+              { result: 'cancelled', pnl: 0, settleTime: pos.settleTime }
+            );
+          } catch (e) {}
+          console.log(`[Paper:${name}] Cancelled open position ${pos.id} for ${ticker} (refunded $${pos.cost})`);
+        }
+      }
+      acct.openPositions.clear();
+    }
+
+    for (const [name, acct] of this.accounts) {
+      acct.balance = acct.initialBalance;
+      acct.totalPnL = 0;
+      acct.wins = 0;
+      acct.losses = 0;
+      acct.openPositions.clear();
+      console.log(`[Paper:${name}] Reset to $${acct.initialBalance}`);
+    }
+
+    try {
+      await db.query('DELETE paper_positions');
+      await db.query('DELETE paper_strategy_state');
+      console.log('[Paper] Cleared all DB records');
+    } catch (e) {
+      console.error('[Paper] Reset DB error:', e.message);
+    }
+
+    for (const [, acct] of this.accounts) {
+      await this._saveState(acct);
+    }
+
+    this._resetting = false;
   }
 
   getStats() {
-    const openPositionsList = [];
+    const allOpen = [];
-    for (const [ticker, positions] of this.openPositions) {
+    let totalBalance = 0;
-      openPositionsList.push(...positions);
+    let totalPnL = 0;
+    let totalWins = 0;
+    let totalLosses = 0;
+
+    for (const [, acct] of this.accounts) {
+      const s = acct.getStats();
+      totalBalance += s.balance;
+      totalPnL += s.totalPnL;
+      totalWins += s.wins;
+      totalLosses += s.losses;
+      allOpen.push(...s.openPositions);
     }
 
     return {
-      balance: parseFloat(this.balance.toFixed(2)),
+      balance: parseFloat(totalBalance.toFixed(2)),
-      totalPnL: parseFloat(this.totalPnL.toFixed(2)),
+      totalPnL: parseFloat(totalPnL.toFixed(2)),
-      wins: this.wins,
+      wins: totalWins,
-      losses: this.losses,
+      losses: totalLosses,
-      winRate: this.wins + this.losses > 0
+      winRate: totalWins + totalLosses > 0
-        ? parseFloat(((this.wins / (this.wins + this.losses)) * 100).toFixed(1))
+        ? parseFloat(((totalWins / (totalWins + totalLosses)) * 100).toFixed(1))
         : 0,
-      openPositions: openPositionsList,
+      openPositions: allOpen,
-      totalTrades: this.wins + this.losses
+      totalTrades: totalWins + totalLosses
     };
   }
 
-  async _saveState() {
+  getPerStrategyStats() {
+    const result = {};
+    for (const [name, acct] of this.accounts) {
+      result[name] = acct.getStats();
+    }
+    return result;
+  }
+
+  async _saveState(acct) {
     try {
-      await db.create('paper_state', {
+      await db.create('paper_strategy_state', {
-        balance: this.balance,
+        strategyName: acct.strategyName,
-        totalPnL: this.totalPnL,
+        balance: acct.balance,
-        wins: this.wins,
+        totalPnL: acct.totalPnL,
-        losses: this.losses,
+        wins: acct.wins,
+        losses: acct.losses,
         timestamp: Date.now()
       });
     } catch (e) {

lib/strategies/bull-dip-buyer.js

@@ -0,0 +1,44 @@
+import { BaseStrategy } from './base.js';
+
+export class BullDipBuyer extends BaseStrategy {
+  constructor(config = {}) {
+    super('bull-dip-buyer', {
+      maxYesPrice: config.maxYesPrice || 45, // Buy the dip when Yes is cheap
+      minYesPrice: config.minYesPrice || 15, // Avoid completely dead markets
+      betSize: config.betSize || 2,
+      cooldownMs: config.cooldownMs || 60000,
+      ...config
+    });
+    
+    this.lastTradeTime = 0;
+    this.lastTradeTicker = null;
+  }
+
+  evaluate(state) {
+    if (!state || !this.enabled) return null;
+
+    const now = Date.now();
+    if (now - this.lastTradeTime < this.config.cooldownMs) return null;
+    if (state.ticker === this.lastTradeTicker) return null;
+
+    const { yesPct } = state;
+
+    // Only buy YES when it dips into our target buy zone
+    if (yesPct <= this.config.maxYesPrice && yesPct >= this.config.minYesPrice) {
+      const signal = {
+        strategy: this.name,
+        side: 'yes',
+        price: yesPct,
+        size: this.config.betSize,
+        reason: `Bullish dip buy: Yes dropped to ${yesPct}¢`,
+        ticker: state.ticker
+      };
+
+      this.lastTradeTime = now;
+      this.lastTradeTicker = state.ticker;
+      return signal;
+    }
+
+    return null;
+  }
+}

lib/strategies/dont-doubt-bull.js

@@ -0,0 +1,50 @@
+import { BaseStrategy } from './base.js';
+
+export class DontDoubtBullStrategy extends BaseStrategy {
+  constructor(config = {}) {
+    super('dont-doubt-bull', {
+      minYesPct: config.minYesPct || 30,
+      maxYesPct: config.maxYesPct || 40,
+      betSize: config.betSize || 2,
+      cooldownMs: config.cooldownMs || 60000,
+      ...config
+    });
+    
+    this.lastTradeTime = 0;
+    this.lastTradeTicker = null;
+  }
+
+  evaluate(state) {
+    if (!state || !this.enabled || !state.closeTime) return null;
+
+    const now = Date.now();
+    if (now - this.lastTradeTime < this.config.cooldownMs) return null;
+    if (state.ticker === this.lastTradeTicker) return null;
+
+    // 15 minute market total. First 1-5 minutes means 10 to 14 mins left.
+    const timeLeftMs = new Date(state.closeTime).getTime() - now;
+    const minsLeft = timeLeftMs / 60000;
+
+    if (minsLeft > 14 || minsLeft < 10) return null; // Outside our time window
+
+    const { yesPct } = state;
+
+    // Buy Yes if it's struggling early on
+    if (yesPct >= this.config.minYesPct && yesPct <= this.config.maxYesPct) {
+      const signal = {
+        strategy: this.name,
+        side: 'yes',
+        price: yesPct,
+        size: this.config.betSize,
+        reason: `Early Bullish Dip: ${minsLeft.toFixed(1)}m left, Yes @ ${yesPct}¢`,
+        ticker: state.ticker
+      };
+
+      this.lastTradeTime = now;
+      this.lastTradeTicker = state.ticker;
+      return signal;
+    }
+
+    return null;
+  }
+}

lib/strategies/martingale-alpha.js

@@ -0,0 +1,120 @@
+import { BaseStrategy } from './base.js';
+import crypto from 'crypto';
+
+/**
+ * Martingale Alpha Strategy
+ *
+ * When odds are between 40-60% for both sides (a ~coin-flip market):
+ * - Use crypto.randomInt to pick yes/no
+ * - Round 1: bet $1, Round 2: bet $2, Round 3: bet $4
+ * - If any round wins, reset to round 1
+ * - If all 3 lose, reset to round 1 anyway (cap losses at $7 per cycle)
+ *
+ * Probability of losing 3 consecutive 50/50s = 12.5%
+ * Probability of winning at least 1 of 3 = 87.5%
+ */
+export class MartingaleAlphaStrategy extends BaseStrategy {
+  constructor(config = {}) {
+    super('martingale-alpha', {
+      minPct: config.minPct || 40,
+      maxPct: config.maxPct || 60,
+      baseBet: config.baseBet || 1,
+      maxRounds: config.maxRounds || 3,
+      cooldownMs: config.cooldownMs || 60000,
+      ...config
+    });
+
+    this.round = 0; // 0 = waiting, 1-3 = active round
+    this.currentBetSize = this.config.baseBet;
+    this.lastTradeTime = 0;
+    this.lastTradeTicker = null;
+    this.cycleWins = 0;
+    this.cycleLosses = 0;
+    this.totalCycles = 0;
+  }
+
+  evaluate(state) {
+    if (!state || !this.enabled) return null;
+
+    const now = Date.now();
+    if (now - this.lastTradeTime < this.config.cooldownMs) return null;
+    if (state.ticker === this.lastTradeTicker) return null;
+
+    const { yesPct, noPct } = state;
+    const { minPct, maxPct } = this.config;
+
+    // Only trade when both sides are in the 40-60% range (coin-flip territory)
+    if (yesPct < minPct || yesPct > maxPct) return null;
+    if (noPct < minPct || noPct > maxPct) return null;
+
+    // Secure random coin flip: 0 = yes, 1 = no
+    const flip = crypto.randomInt(0, 2);
+    const side = flip === 0 ? 'yes' : 'no';
+    const price = side === 'yes' ? yesPct : noPct;
+
+    // Determine bet size based on current round
+    const roundIndex = this.round; // 0, 1, or 2
+    const betSize = this.config.baseBet * Math.pow(2, roundIndex);
+
+    const signal = {
+      strategy: this.name,
+      side,
+      price,
+      size: betSize,
+      reason: `R${roundIndex + 1}/${this.config.maxRounds} coin-flip ${side.toUpperCase()} @ ${price}¢ ($${betSize}) | Market: ${yesPct}/${noPct}`,
+      ticker: state.ticker
+    };
+
+    this.lastTradeTime = now;
+    this.lastTradeTicker = state.ticker;
+    this.currentBetSize = betSize;
+
+    return signal;
+  }
+
+  onSettlement(result, trade) {
+    if (!trade || trade.strategy !== this.name) return;
+
+    const won = trade.side === result;
+
+    if (won) {
+      console.log(`[MartingaleAlpha] WIN on round ${this.round + 1} — cycle complete, resetting`);
+      this.cycleWins++;
+      this.totalCycles++;
+      this._resetCycle();
+    } else {
+      this.round++;
+      if (this.round >= this.config.maxRounds) {
+        console.log(`[MartingaleAlpha] LOST all ${this.config.maxRounds} rounds — cycle failed, resetting`);
+        this.cycleLosses++;
+        this.totalCycles++;
+        this._resetCycle();
+      } else {
+        const nextBet = this.config.baseBet * Math.pow(2, this.round);
+        console.log(`[MartingaleAlpha] LOSS round ${this.round}/${this.config.maxRounds} — next bet: $${nextBet}`);
+        this.currentBetSize = nextBet;
+      }
+    }
+  }
+
+  _resetCycle() {
+    this.round = 0;
+    this.currentBetSize = this.config.baseBet;
+    this.lastTradeTicker = null; // Allow trading same ticker in new cycle
+  }
+
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      round: this.round + 1,
+      maxRounds: this.config.maxRounds,
+      currentBetSize: this.currentBetSize,
+      cycleWins: this.cycleWins,
+      cycleLosses: this.cycleLosses,
+      totalCycles: this.totalCycles,
+      cycleWinRate: this.totalCycles > 0
+        ? parseFloat(((this.cycleWins / this.totalCycles) * 100).toFixed(1))
+        : 0
+    };
+  }
+}

lib/strategies/martingale.js

@@ -1,21 +1,12 @@
 import { BaseStrategy } from './base.js';
 
-/**
- * Martingale Strategy
- * 
- * Logic:
- * - If one side is ~70%+ (configurable), bet the opposite side.
- * - On loss, double the bet size (Martingale).
- * - On win, reset to base bet size.
- * - Max consecutive losses cap to prevent blowup.
- */
 export class MartingaleStrategy extends BaseStrategy {
   constructor(config = {}) {
     super('martingale', {
-      threshold: config.threshold || 70,    // Trigger when one side >= this %
+      threshold: config.threshold || 70,    
-      baseBet: config.baseBet || 1,         // Base bet in dollars
+      baseBet: config.baseBet || 1,         
-      maxDoublings: config.maxDoublings || 5, // Max consecutive losses before stopping
+      maxDoublings: config.maxDoublings || 5, 
-      cooldownMs: config.cooldownMs || 60000, // Min time between trades (1 min)
+      cooldownMs: config.cooldownMs || 60000, 
       ...config
     });
 
@@ -30,24 +21,17 @@ export class MartingaleStrategy extends BaseStrategy {
 
     const now = Date.now();
 
-    // Cooldown — don't spam trades
     if (now - this.lastTradeTime < this.config.cooldownMs) return null;
-
-    // Don't trade same ticker twice
     if (state.ticker === this.lastTradeTicker) return null;
-
+    if (this.consecutiveLosses >= this.config.maxDoublings) return null; 
-    // Check if Martingale limit reached
-    if (this.consecutiveLosses >= this.config.maxDoublings) {
-      return null; // Paused — too many consecutive losses
-    }
 
     const { yesPct, noPct } = state;
     const threshold = this.config.threshold;
 
     let signal = null;
 
-    // If "Yes" is at 70%+, bet "No" (the underdog)
+    // Prevent buying useless contracts at >= 99¢ (which would result in $0 or 0.01¢ profit)
-    if (yesPct >= threshold) {
+    if (yesPct >= threshold && noPct < 99) {
       signal = {
         strategy: this.name,
         side: 'no',
@@ -57,8 +41,7 @@ export class MartingaleStrategy extends BaseStrategy {
         ticker: state.ticker
       };
     }
-    // If "No" is at 70%+, bet "Yes" (the underdog)
+    else if (noPct >= threshold && yesPct < 99) {
-    else if (noPct >= threshold) {
       signal = {
         strategy: this.name,
         side: 'yes',

lib/strategies/momentum-rider.js

@@ -0,0 +1,56 @@
+import { BaseStrategy } from './base.js';
+
+export class MomentumRiderStrategy extends BaseStrategy {
+  constructor(config = {}) {
+    super('momentum-rider', {
+      triggerPct: config.triggerPct || 75,
+      betSize: config.betSize || 2,
+      cooldownMs: config.cooldownMs || 60000,
+      ...config
+    });
+    
+    this.lastTradeTime = 0;
+    this.lastTradeTicker = null;
+  }
+
+  evaluate(state) {
+    if (!state || !this.enabled) return null;
+
+    const now = Date.now();
+    if (now - this.lastTradeTime < this.config.cooldownMs) return null;
+    if (state.ticker === this.lastTradeTicker) return null;
+
+    const { yesPct, noPct } = state;
+    const trigger = this.config.triggerPct;
+
+    let signal = null;
+
+    // Buy the favorite!
+    if (yesPct >= trigger && yesPct < 99) {
+      signal = {
+        strategy: this.name,
+        side: 'yes',
+        price: yesPct,
+        size: this.config.betSize,
+        reason: `Riding Momentum! Yes is at ${yesPct}%`,
+        ticker: state.ticker
+      };
+    } else if (noPct >= trigger && noPct < 99) {
+      signal = {
+        strategy: this.name,
+        side: 'no',
+        price: noPct,
+        size: this.config.betSize,
+        reason: `Riding Momentum! No is at ${noPct}%`,
+        ticker: state.ticker
+      };
+    }
+
+    if (signal) {
+      this.lastTradeTime = now;
+      this.lastTradeTicker = state.ticker;
+    }
+
+    return signal;
+  }
+}

lib/strategies/sniper-reversal.js

@@ -0,0 +1,62 @@
+import { BaseStrategy } from './base.js';
+
+export class SniperReversalStrategy extends BaseStrategy {
+  constructor(config = {}) {
+    super('sniper-reversal', {
+      triggerPct: config.triggerPct || 95, // Bet against a 95% favorite
+      minsLeft: config.minsLeft || 3,      // Only in the last 3 minutes
+      betSize: config.betSize || 1,        // Cheap lotto tickets
+      cooldownMs: config.cooldownMs || 60000,
+      ...config
+    });
+    
+    this.lastTradeTime = 0;
+    this.lastTradeTicker = null;
+  }
+
+  evaluate(state) {
+    if (!state || !this.enabled || !state.closeTime) return null;
+
+    const now = Date.now();
+    if (now - this.lastTradeTime < this.config.cooldownMs) return null;
+    if (state.ticker === this.lastTradeTicker) return null;
+
+    const timeLeftMs = new Date(state.closeTime).getTime() - now;
+    const minsLeft = timeLeftMs / 60000;
+
+    // Only strike in the final minutes
+    if (minsLeft > this.config.minsLeft || minsLeft <= 0) return null;
+
+    const { yesPct, noPct } = state;
+    const trigger = this.config.triggerPct;
+
+    let signal = null;
+
+    if (yesPct >= trigger && noPct > 0) {
+      signal = {
+        strategy: this.name,
+        side: 'no',
+        price: noPct,
+        size: this.config.betSize,
+        reason: `Buzzer beater No at ${noPct}¢ (Yes is ${yesPct}%) with ${minsLeft.toFixed(1)}m left`,
+        ticker: state.ticker
+      };
+    } else if (noPct >= trigger && yesPct > 0) {
+      signal = {
+        strategy: this.name,
+        side: 'yes',
+        price: yesPct,
+        size: this.config.betSize,
+        reason: `Buzzer beater Yes at ${yesPct}¢ (No is ${noPct}%) with ${minsLeft.toFixed(1)}m left`,
+        ticker: state.ticker
+      };
+    }
+
+    if (signal) {
+      this.lastTradeTime = now;
+      this.lastTradeTicker = state.ticker;
+    }
+
+    return signal;
+  }
+}

lib/strategies/threshold.js

@@ -1,13 +1,5 @@
 import { BaseStrategy } from './base.js';
 
-/**
- * Threshold (Contrarian) Strategy
- * 
- * Logic:
- * - If one side goes above a high threshold (e.g. 65%), bet the other.
- * - Fixed bet size — no progression.
- * - Simple mean-reversion assumption for short-term BTC markets.
- */
 export class ThresholdStrategy extends BaseStrategy {
   constructor(config = {}) {
     super('threshold', {
@@ -33,7 +25,7 @@ export class ThresholdStrategy extends BaseStrategy {
 
     let signal = null;
 
-    if (yesPct >= trigger) {
+    if (yesPct >= trigger && noPct < 99) {
       signal = {
         strategy: this.name,
         side: 'no',
@@ -42,7 +34,7 @@ export class ThresholdStrategy extends BaseStrategy {
         reason: `Yes at ${yesPct}% (≥${trigger}%), contrarian No at ${noPct}¢`,
         ticker: state.ticker
       };
-    } else if (noPct >= trigger) {
+    } else if (noPct >= trigger && yesPct < 99) {
       signal = {
         strategy: this.name,
         side: 'yes',

middleware.js

@@ -0,0 +1,27 @@
+import { NextResponse } from 'next/server';
+import { verifySession } from './lib/auth';
+
+export const config = {
+  matcher: [
+    '/dashboard/:path*',
+    '/paper/:path*',
+    '/dash/:path*',
+    '/api/state',
+    '/api/trades',
+    '/api/reset'
+  ],
+};
+
+export async function middleware(req) {
+  const token = req.cookies.get('kalbot_session')?.value;
+  const isValid = await verifySession(token);
+
+  if (!isValid) {
+    if (req.nextUrl.pathname.startsWith('/api/')) {
+      return NextResponse.json({ error: 'Unauthorized. Nice try!' }, { status: 401 });
+    }
+    return NextResponse.redirect(new URL('/', req.url));
+  }
+
+  return NextResponse.next();
+}

worker.js

@@ -1,46 +1,89 @@
 import { MarketTracker } from './lib/market/tracker.js';
 import { PaperEngine } from './lib/paper/engine.js';
 import { MartingaleStrategy } from './lib/strategies/martingale.js';
+import { MartingaleAlphaStrategy } from './lib/strategies/martingale-alpha.js';
 import { ThresholdStrategy } from './lib/strategies/threshold.js';
+import { BullDipBuyer } from './lib/strategies/bull-dip-buyer.js';
+import { SniperReversalStrategy } from './lib/strategies/sniper-reversal.js';
+import { MomentumRiderStrategy } from './lib/strategies/momentum-rider.js';
+import { DontDoubtBullStrategy } from './lib/strategies/dont-doubt-bull.js';
+import { getMarket } from './lib/kalshi/rest.js';
 import { db } from './lib/db.js';
 import { notify } from './lib/notify.js';
 import fs from 'fs';
 
-// Shared state file for the Next.js frontend to read
 const STATE_FILE = '/tmp/kalbot-state.json';
+const HEARTBEAT_MS = 2000;
 
 async function main() {
   console.log('=== Kalbot Worker Starting ===');
 
-  // Connect to SurrealDB
   await db.connect();
 
-  // Initialize paper engine
   const paper = new PaperEngine(1000);
   await paper.init();
 
-  // Initialize strategies
+  // Load all 7 strategies!
   const strategies = [
     new MartingaleStrategy({ threshold: 70, baseBet: 1, maxDoublings: 5 }),
-    new ThresholdStrategy({ triggerPct: 65, betSize: 1 })
+    new MartingaleAlphaStrategy({ minPct: 40, maxPct: 60, baseBet: 1, maxRounds: 3 }),
+    new ThresholdStrategy({ triggerPct: 65, betSize: 1 }),
+    new BullDipBuyer({ maxYesPrice: 45, minYesPrice: 15, betSize: 2 }),
+    new SniperReversalStrategy({ triggerPct: 95, minsLeft: 3, betSize: 1 }),
+    new MomentumRiderStrategy({ triggerPct: 75, betSize: 2 }),
+    new DontDoubtBullStrategy({ minYesPct: 30, maxYesPct: 40, betSize: 2 })
   ];
 
-  console.log(`[Worker] Loaded ${strategies.length} strategies: ${strategies.map(s => s.name).join(', ')}`);
+  for (const s of strategies) {
+    paper._getAccount(s.name);
+  }
+
+  console.log(`[Worker] Loaded ${strategies.length} strategies: ${strategies.map((s) => s.name).join(', ')}`);
+
+  let latestMarketState = null;
+
+  async function processOrphans() {
+    if (paper._resetting) return;
+    try {
+      const { settled, expired } = await paper.checkOrphans(getMarket);
+      const allResolved = [...settled, ...expired];
+      if (allResolved.length > 0) {
+        for (const strategy of strategies) {
+          for (const trade of allResolved) {
+            if (trade.strategy === strategy.name) {
+              strategy.onSettlement(trade.result, trade);
+            }
+          }
+        }
+        writeState(latestMarketState, paper, strategies);
+      }
+    } catch (e) {
+      console.error('[Worker] Orphan check error:', e.message);
+    }
+  }
+
+  await processOrphans();
+  setInterval(processOrphans, 60000);
 
-  // Initialize market tracker
   const tracker = new MarketTracker();
+  let heartbeatTimer = null;
+
+  writeState(latestMarketState, paper, strategies);
 
-  // On every market update, run strategies
   tracker.on('update', async (state) => {
-    if (!state) return;
+    latestMarketState = state || null;
+    writeState(latestMarketState, paper, strategies);
 
-    // Write state to file for frontend
+    if (!state || paper._resetting) return;
-    writeState(state, paper, strategies);
 
-    // Run each strategy
     for (const strategy of strategies) {
       if (!strategy.enabled) continue;
 
+      const acct = paper._getAccount(strategy.name);
+      if (acct.openPositions.size > 0) {
+        continue;
+      }
+
       const signal = strategy.evaluate(state);
       if (signal) {
         console.log(`[Worker] Signal from ${strategy.name}: ${signal.side} @ ${signal.price}¢ — ${signal.reason}`);
@@ -48,62 +91,90 @@ async function main() {
         if (strategy.mode === 'paper') {
           await paper.executeTrade(signal, state);
         }
-        // TODO: Live mode — use placeOrder() from rest.js
       }
     }
 
-    // Update state file after potential trades
+    writeState(latestMarketState, paper, strategies);
-    writeState(state, paper, strategies);
   });
 
-  // On market settlement, settle paper positions and notify strategies
   tracker.on('settled', async ({ ticker, result }) => {
-    console.log(`[Worker] Market ${ticker} settled: ${result}`);
+    console.log(`[Worker] Market ${ticker} rotated/closed. Result: ${result || 'pending'}`);
 
+    if (paper._resetting) return;
+
+    if (result) {
       const settledPositions = await paper.settle(ticker, result);
-
-    // Notify strategies about settlement
-    for (const strategy of strategies) {
       if (settledPositions) {
+        for (const strategy of strategies) {
           for (const trade of settledPositions) {
-          strategy.onSettlement(result, trade);
+            strategy.onSettlement(trade.result, trade);
           }
         }
-    }
-
         await notify(
-      `Market ${ticker} settled: ${result?.toUpperCase() || 'unknown'}`,
+          `Market ${ticker} settled: ${result.toUpperCase()}`,
           'Market Settled',
           'default',
           'chart_with_upwards_trend'
         );
+      }
+    } else {
+      console.log(`[Worker] Result for ${ticker} pending.`);
+    }
+
+    writeState(latestMarketState, paper, strategies);
   });
 
-  // Start tracking
   await tracker.start();
-  await notify('🤖 Kalbot Worker started!', 'Kalbot Online', 'low', 'robot,green_circle');
+  await notify('🤖 Kalbot Worker started with 7 strats!', 'Kalbot Online', 'low', 'robot,green_circle');
+
+  heartbeatTimer = setInterval(() => {
+    writeState(latestMarketState, paper, strategies);
+  }, HEARTBEAT_MS);
+
+  setInterval(async () => {
+    try {
+      if (fs.existsSync('/tmp/kalbot-reset-flag')) {
+        fs.unlinkSync('/tmp/kalbot-reset-flag');
+        console.log('[Worker] Reset flag detected — resetting all paper data');
+        await paper.resetAll();
+        for (const s of strategies) {
+          if (s.consecutiveLosses !== undefined) s.consecutiveLosses = 0;
+          if (s.currentBetSize !== undefined) s.currentBetSize = s.config.baseBet;
+          if (s.round !== undefined) s.round = 0;
+          if (s.cycleWins !== undefined) s.cycleWins = 0;
+          if (s.cycleLosses !== undefined) s.cycleLosses = 0;
+          if (s.totalCycles !== undefined) s.totalCycles = 0;
+          s.lastTradeTicker = null;
+          s.lastTradeTime = 0;
+        }
+        writeState(latestMarketState, paper, strategies);
+        await notify('🔄 Paper trading reset by admin', 'Kalbot Reset', 'default', 'recycle');
+      }
+    } catch {
+      // ignore
+    }
+  }, 1000);
 
   console.log('[Worker] Running. Press Ctrl+C to stop.');
 
-  // Graceful shutdown
+  const shutdown = async (signal) => {
-  process.on('SIGINT', async () => {
+    console.log(`\n[Worker] ${signal} received. Shutting down...`);
-    console.log('\n[Worker] Shutting down...');
+    clearInterval(heartbeatTimer);
     tracker.stop();
     await notify('🔴 Kalbot Worker stopped', 'Kalbot Offline', 'high', 'robot,red_circle');
     process.exit(0);
-  });
+  };
 
-  process.on('SIGTERM', async () => {
+  process.on('SIGINT', () => shutdown('SIGINT'));
-    tracker.stop();
+  process.on('SIGTERM', () => shutdown('SIGTERM'));
-    process.exit(0);
-  });
 }
 
 function writeState(marketState, paper, strategies) {
   const data = {
     market: marketState,
     paper: paper.getStats(),
-    strategies: strategies.map(s => s.toJSON()),
+    paperByStrategy: paper.getPerStrategyStats(),
+    strategies: strategies.map((s) => s.toJSON()),
     workerUptime: process.uptime(),
     lastUpdate: Date.now()
   };