Add per-stage withdrawal targets with consistency and min trading days

- Add withdrawal stage system: each stage defines profit target, consistency,
  and min trading days for post-withdrawal challenge cycles
- Target Same Equity mode accounts for withdrawn amounts when computing
  effective profit target (profitTarget - remainingProfit)
- Store fund transaction timestamps for time-aware cycle filtering
  (withdrawals before 9 AM CT include that day in new cycle)
- Expose full P&L history (fullDailyPnL) for calendar/equity curve display
  across all cycles, with DB fallback for pre-restart data
- Show stage number (#1, #2, etc.) on calendar cells
- Hide consistency reference line when consistency is 0% or 100%
- Settings UI: "After First W/D" column with same-equity checkbox,
  expandable stage sub-rows with profit/consistency/days inputs
- Default target_same_equity to 1 for new and existing account configs

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

app/api/account-configs/[id]/route.ts

@@ -21,9 +21,11 @@ export async function PUT(
         accountSize?: number;
         maxLoss?: number;
         maxPositionSize?: number;
+        targetSameEquity?: boolean;
+        withdrawalStages?: { profit: number; consistency: number; minTradingDays: number }[];
     };
 
-    const { prefix, profitTarget, consistency, minDayPnL, minTradingDays, accountSize, maxLoss, maxPositionSize } = body;
+    const { prefix, profitTarget, consistency, minDayPnL, minTradingDays, accountSize, maxLoss, maxPositionSize, targetSameEquity, withdrawalStages } = body;
 
     if (
         typeof prefix !== 'string' || !prefix.trim() ||
@@ -46,6 +48,8 @@ export async function PUT(
             accountSize,
             maxLoss: maxLoss ?? 0,
             maxPositionSize: maxPositionSize ?? 0,
+            targetSameEquity: targetSameEquity ?? false,
+            withdrawalStages: withdrawalStages ?? [],
         });
 
         if (!updated) {

app/api/firms/[id]/accounts/route.ts

@@ -25,9 +25,11 @@ export async function POST(
         accountSize?: number;
         maxLoss?: number;
         maxPositionSize?: number;
+        targetSameEquity?: boolean;
+        withdrawalStages?: { profit: number; consistency: number; minTradingDays: number }[];
     };
 
-    const { prefix, profitTarget, consistency, minDayPnL, minTradingDays, accountSize, maxLoss, maxPositionSize } = body;
+    const { prefix, profitTarget, consistency, minDayPnL, minTradingDays, accountSize, maxLoss, maxPositionSize, targetSameEquity, withdrawalStages } = body;
 
     if (
         typeof prefix !== 'string' || !prefix.trim() ||
@@ -50,6 +52,8 @@ export async function POST(
             accountSize,
             maxLoss: maxLoss ?? 0,
             maxPositionSize: maxPositionSize ?? 0,
+            targetSameEquity: targetSameEquity ?? false,
+            withdrawalStages: withdrawalStages ?? [],
         });
 
         return NextResponse.json({
@@ -62,6 +66,8 @@ export async function POST(
             accountSize: row.account_size,
             maxLoss: row.max_loss,
             maxPositionSize: row.max_position_size,
+            targetSameEquity: row.target_same_equity === 1,
+            withdrawalStages: (() => { try { return JSON.parse(row.withdrawal_stages ?? '[]') as { profit: number; consistency: number; minTradingDays: number }[]; } catch { return []; } })(),
         }, { status: 201 });
     } catch (err) {
         console.error('[POST /api/firms/:id/accounts]', err);

app/api/firms/[id]/route.ts

@@ -33,6 +33,8 @@ export async function GET(
             accountSize: a.account_size,
             maxLoss: a.max_loss,
             maxPositionSize: a.max_position_size,
+            targetSameEquity: a.target_same_equity === 1,
+            withdrawalStages: (() => { try { return JSON.parse(a.withdrawal_stages ?? '[]') as { profit: number; consistency: number; minTradingDays: number }[]; } catch { return []; } })(),
         })),
     });
 }

app/api/state/route.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from 'next/server';
-import { getFirms } from '@/lib/db';
+import { getFirms, loadDailyPnL } from '@/lib/db';
 import { getClients } from '@/lib/clients';
-import { computeDailyTarget } from '@/lib/trading-logic';
+import { computeDailyTarget, resolveEffectiveConfig } from '@/lib/trading-logic';
 import type { AccountConfigRow } from '@/lib/db';
 
 function getAccountConfig(name: string, accounts: AccountConfigRow[]): AccountConfigRow | undefined {
@@ -30,16 +30,32 @@ export async function GET() {
                 const cfg = getAccountConfig(acc.name, f.accounts);
                 const autoLiqThreshold = client.autoLiqThresholds[acc.id] ?? 0;
                 const isDead = autoLiqThreshold > 0 && cash.amount <= autoLiqThreshold;
+                const allFundTxns = client.fundTransactions?.[acc.id] ?? [];
+                const priorProfit = client.priorProfit?.[acc.id] ?? 0;
+                // Hide initial funding (amount === accountSize) from display
+                const displayFundTxns = cfg
+                    ? allFundTxns.filter((f) => f.amount !== cfg.account_size)
+                    : allFundTxns;
                 let targetHit = false;
                 let dailyTarget: { amount: number; path: 'first_day' | 'normal_day' | 'reduced_day' } | null = null;
                 if (cfg && !isDead) {
-                    const target = computeDailyTarget(cfg.profit_target, cfg.consistency, totalProfit, dailyPnL, cfg.min_day_pnl, cfg.min_trading_days);
+                    const withdrawalStages: { profit: number; consistency: number; minTradingDays: number }[] = (() => { try { return JSON.parse(cfg.withdrawal_stages ?? '[]'); } catch { return []; } })();
+                    const effective = resolveEffectiveConfig(
+                        cfg.profit_target,
+                        cfg.consistency,
+                        cfg.min_trading_days,
+                        cfg.target_same_equity === 1,
+                        withdrawalStages,
+                        priorProfit,
+                        allFundTxns
+                    );
+                    const target = computeDailyTarget(effective.profitTarget, effective.consistency, totalProfit, dailyPnL, cfg.min_day_pnl, effective.minTradingDays);
                     dailyTarget = target;
                     // Condition 1: profit target already exceeded (target=0), still need days → any activity counts
                     // Condition 2: target > 0 → must have made at least the computed daily target
                     targetHit =
                     // If we are just flipping take any activity as target hit
-                        (target.amount === 0 && Math.abs(cash.realizedPnL) > 0 && client.daysTraded[acc.id] <= cfg.min_trading_days) ||
+                        (target.amount === 0 && Math.abs(cash.realizedPnL) > 0 && client.daysTraded[acc.id] <= effective.minTradingDays) ||
                         (cash.realizedPnL >= target.amount);
                 }
 
@@ -56,7 +72,8 @@ export async function GET() {
                     targetHit,
                     dailyTarget,
                     dailyPnL,
-                    fundTransactions: client.fundTransactions[acc.id] ?? [],
+                    fullDailyPnL: client.fullDailyPnL?.[acc.id] ?? loadDailyPnL(acc.id),
+                    fundTransactions: displayFundTxns,
                 };
             });
             return { firm: f.name, connected: true, accounts, perContractFees: client.perContractFees };