Merge branch 'vest-fix-display' into vest-fixes

# Conflicts:
#	package.json
#	scripts/check-trading-logic.mjs

app/api/state/route.ts

@@ -173,7 +173,7 @@ export async function GET() {
                             };
                         }
                     }
-                    if (plan && !dayBooked && botStopsActive(cfg)) {
+                    if (plan && !dayBooked && botStopsActive(cfg, effective)) {
                         const obf = obfuscationStopDollars(cfg, dailyPnL, plan, combined.tradeDate, plan.remainingToday);
                         // The reserve grows with the position (dllReserve): at
                         // the size the next leg would trade, where it's known.
@@ -276,7 +276,7 @@ export async function GET() {
                     // An account the bot puts stops on whose day booked red via
                     // its own stop — the personal DLL. Firm DLL lockouts show
                     // via !active instead.
-                    personalDll: !!cfg && botStopsActive(cfg)
+                    personalDll: !!cfg && !!effective && botStopsActive(cfg, effective)
                         && acc.active && !client.positions[acc.id]
                         && combined.realizedPnL <= -25,
                     positionDirection: client.positions[acc.id]
@@ -296,6 +296,8 @@ export async function GET() {
                     lastStand: lastStandNext,
                     remainingToday,
                     effectiveProfitTarget,
+                    effectiveDailyLossLimit: effective?.dailyLossLimit ?? null,
+                    effectiveMinTradingDays: effective?.minTradingDays ?? null,
                     dailyPnL,
                     fullDailyPnL: combineCmeSessions(
                         cfg?.combineCmeHolidays === true,