Skip to content

"Vibe-Trading: Your Personal Trading Agent"

fix(validation): preserve entry dates when reloading marked trades

Rixfcaae566ef55
diff --git a/README.md b/README.md
index a1c21775f..85cf48c37 100644
--- a/README.md
+++ b/README.md
@@ -1384,7 +1384,10 @@ New BaseEngine `artifacts/trades.csv` files include an `event` column:
`entry` marks an opening row and `exit` marks a completed trade, including
zero-PnL exits. Validation and strategy-discovery readers use this marker.
Files without it retain legacy loading; their zero-PnL exits remain ambiguous.
-The separate options-engine trade format is unchanged.
+The separate options-engine trade format is unchanged. Validation also recovers entry dates from
+matching adjacent `entry`/`exit` rows, so walk-forward trade counts and win rates
+retain entry-window attribution after reload. Unmarked or unmatched rows keep
+the legacy timestamp fallback.
```bash
# Moving average crossover on US equities
diff --git a/agent/backtest/validation.py b/agent/backtest/validation.py
index 79b1aa034..49b06f64a 100644
--- a/agent/backtest/validation.py
+++ b/agent/backtest/validation.py
@@ -404,8 +404,27 @@ def _load_trades(run_dir: Path) -> List[TradeRecord]:
# Unmarked historical/other-engine files retain their legacy convention.
trades = []
exit_mask = df["event"].eq("exit") if "event" in df.columns else df["pnl"].ne(0)
- exit_rows = df[exit_mask].reset_index(drop=True)
- for _, row in exit_rows.iterrows():
+ exit_rows = df[exit_mask]
+ for row_idx, row in exit_rows.iterrows():
+ exit_time = pd.Timestamp(row.get("timestamp", "2000-01-01"))
+ entry_time = exit_time
+ # BaseEngine emits adjacent entry/exit pairs. Recover entry dates only
+ # from an explicit matching pair; legacy/exit-only files stay unchanged.
+ if "event" in df.columns and row_idx > 0:
+ entry = df.iloc[row_idx - 1]
+ expected_side = {"sell": "buy", "buy": "sell"}.get(row.get("side"))
+ if (
+ entry["event"] == "entry"
+ and entry.get("code") == row.get("code")
+ and expected_side is not None
+ and entry.get("side") == expected_side
+ ):
+ candidate_time = pd.to_datetime(entry.get("timestamp"), errors="coerce")
+ try:
+ if pd.notna(candidate_time) and candidate_time <= exit_time:
+ entry_time = candidate_time
+ except TypeError:
+ pass # Incompatible timestamp timezones cannot form a pair.
hold = pd.to_numeric(row.get("holding_bars"), errors="coerce")
if pd.isna(hold):
hold = pd.to_numeric(row.get("holding_days", 0), errors="coerce")
@@ -416,8 +435,8 @@ def _load_trades(run_dir: Path) -> List[TradeRecord]:
direction=1 if row.get("side") == "sell" else -1,
entry_price=0.0,
exit_price=float(row.get("price", 0)),
- entry_time=pd.Timestamp(row.get("timestamp", "2000-01-01")),
- exit_time=pd.Timestamp(row.get("timestamp", "2000-01-01")),
+ entry_time=entry_time,
+ exit_time=exit_time,
size=float(row.get("qty", 0)),
leverage=1.0,
pnl=float(row.get("pnl", 0)),
diff --git a/agent/tests/test_validation_entry_times.py b/agent/tests/test_validation_entry_times.py
new file mode 100644
index 000000000..91f7cb44c
--- /dev/null
+++ b/agent/tests/test_validation_entry_times.py
@@ -0,0 +1,119 @@
+"""Reloaded BaseEngine trades retain entry-based window attribution."""
+
+from pathlib import Path
+
+import pandas as pd
+import pytest
+
+from backtest.engines.china_a import ChinaAEngine
+from backtest.models import TradeRecord
+from backtest.validation import _load_trades, walk_forward_analysis
+
+
[email protected]("direction", [1, -1])
[email protected]("same_day", [False, True])
+def test_round_trip_preserves_entry_window(
+ tmp_path: Path, direction: int, same_day: bool
+) -> None:
+ engine = ChinaAEngine({"initial_cash": 1000.0})
+ dates = pd.date_range("2026-01-01", periods=10)
+ engine.trades = [
+ TradeRecord(
+ symbol="TEST",
+ direction=direction,
+ entry_price=100.0,
+ exit_price=100.0 + direction * pnl,
+ entry_time=dates[entry],
+ exit_time=dates[entry if same_day else exit_],
+ size=1.0,
+ leverage=1.0,
+ pnl=pnl,
+ pnl_pct=pnl,
+ exit_reason="signal",
+ holding_bars=0 if same_day else exit_ - entry,
+ commission=0.0,
+ )
+ for entry, exit_, pnl in [(0, 5, 10.0), (1, 7, -5.0), (6, 9, 0.0)]
+ ]
+ equity = pd.Series([1000, 1010, 1005, 1020, 1015] * 2, index=dates)
+ engine._write_artifacts(
+ tmp_path,
+ {},
+ dates,
+ equity,
+ equity,
+ pd.Series(0.0, index=dates),
+ pd.DataFrame(index=dates),
+ {},
+ ["TEST"],
+ )
+
+ restored = _load_trades(tmp_path)
+ actual = walk_forward_analysis(equity, restored, n_windows=2)
+ expected = walk_forward_analysis(equity, engine.trades, n_windows=2)
+
+ assert [w["trades"] for w in actual["windows"]] == [2, 1]
+ assert [w["win_rate"] for w in actual["windows"]] == [0.5, 0.0]
+ assert actual == expected
+ assert [t.entry_time for t in restored] == [t.entry_time for t in engine.trades]
+ assert [t.exit_time for t in restored] == [t.exit_time for t in engine.trades]
+ assert [t.holding_bars for t in restored] == [t.holding_bars for t in engine.trades]
+
+
[email protected]("event_column", [False, True])
+def test_exit_only_artifacts_keep_timestamp_fallback(
+ tmp_path: Path, event_column: bool
+) -> None:
+ artifacts = tmp_path / "artifacts"
+ artifacts.mkdir()
+ frame = pd.DataFrame(
+ {
+ "timestamp": ["2026-01-06"],
+ "code": ["TEST"],
+ "side": ["sell"],
+ "price": [105],
+ "qty": [1],
+ "pnl": [5],
+ }
+ )
+ if event_column:
+ frame["event"] = "exit"
+ frame.to_csv(artifacts / "trades.csv", index=False)
+
+ trade = _load_trades(tmp_path)[0]
+
+ assert trade.entry_time == trade.exit_time == pd.Timestamp("2026-01-06")
+
+
+ "mismatch", ["symbol", "side", "future", "unmarked", "invalid_date", "timezone"]
+)
+def test_unmatched_previous_row_does_not_supply_entry_time(
+ tmp_path: Path, mismatch: str
+) -> None:
+ artifacts = tmp_path / "artifacts"
+ artifacts.mkdir()
+ entry_date = {
+ "future": "2026-01-07",
+ "invalid_date": "invalid",
+ "timezone": "2026-01-01T00:00:00Z",
+ }.get(mismatch, "2026-01-01")
+ frame = pd.DataFrame(
+ {
+ "timestamp": [
+ entry_date,
+ "2026-01-06",
+ ],
+ "code": ["OTHER" if mismatch == "symbol" else "TEST", "TEST"],
+ "side": ["sell" if mismatch == "side" else "buy", "sell"],
+ "price": [100, 105],
+ "qty": [1, 1],
+ "pnl": [0, 5],
+ "event": ["unknown" if mismatch == "unmarked" else "entry", "exit"],
+ }
+ )
+ frame.to_csv(artifacts / "trades.csv", index=False)
+
+ trade = _load_trades(tmp_path)[0]
+
+ assert trade.entry_time == trade.exit_time == pd.Timestamp("2026-01-06")