fix(migration): enforce v2 strategy semantics

Author: brndnmtthws

tests/test_config_migration.py

@@ -628,7 +628,7 @@ def test_migration_report_contains_mapping_and_warnings_sections(
     assert "`symbols` -> `portfolio.symbols`" in report
 
 
-def test_migration_regime_enabled_non_shares_only_uses_explicit_stage_plan() -> None:
+def test_migration_regime_enabled_non_shares_only_uses_strategy_plan() -> None:
     raw = """
 [account]
 number = "DUX"
@@ -658,24 +658,13 @@ def test_migration_regime_enabled_non_shares_only_uses_explicit_stage_plan() ->
     migrated = migrate_v1_to_v2(raw)
     parsed = tomlkit.parse(migrated.migrated_text).unwrap()
     run = parsed["run"]
-    assert "stages" in run
-    assert "strategies" not in run
-    stage_ids = [stage["id"] for stage in run["stages"]]
-    assert stage_ids == [
-        "options_write_puts",
-        "options_write_calls",
-        "equity_regime_rebalance",
-        "equity_buy_rebalance",
-        "equity_sell_rebalance",
-        "options_roll_positions",
-        "options_close_positions",
-    ]
-    assert any("explicit run.stages" in warning for warning in migrated.warnings), (
-        migrated.warnings
-    )
+    assert "strategies" in run
+    assert "stages" not in run
+    assert run["strategies"] == ["regime_rebalance"]
+    assert not any("explicit run.stages" in warning for warning in migrated.warnings)
 
 
-def test_migration_regime_shares_only_excludes_option_stages() -> None:
+def test_migration_regime_shares_only_uses_strategy_plan() -> None:
     raw = """
 [account]
 number = "DUX"
@@ -704,16 +693,74 @@ def test_migration_regime_shares_only_excludes_option_stages() -> None:
 """
     migrated = migrate_v1_to_v2(raw)
     parsed = tomlkit.parse(migrated.migrated_text).unwrap()
-    stage_ids = [stage["id"] for stage in parsed["run"]["stages"]]
-    assert "options_write_puts" not in stage_ids
-    assert "options_write_calls" not in stage_ids
-    assert "options_roll_positions" not in stage_ids
-    assert "options_close_positions" not in stage_ids
-    assert stage_ids == [
-        "equity_regime_rebalance",
-        "equity_buy_rebalance",
-        "equity_sell_rebalance",
-    ]
+    run = parsed["run"]
+    assert "strategies" in run
+    assert "stages" not in run
+    assert run["strategies"] == ["regime_rebalance"]
+
+
+def test_migration_cash_management_enabled_does_not_force_wheel_strategy() -> None:
+    raw = """
+[account]
+number = "DUX"
+margin_usage = 0.5
+
+[option_chains]
+expirations = 4
+strikes = 10
+
+[target]
+dte = 30
+minimum_open_interest = 5
+
+[roll_when]
+dte = 7
+
+[ibc]
+
+[cash_management]
+enabled = true
+cash_fund = "SGOV"
+target_cash_balance = 1000
+
+[symbols.AAA]
+weight = 1.0
+"""
+    migrated = migrate_v1_to_v2(raw)
+    parsed = tomlkit.parse(migrated.migrated_text).unwrap()
+    run = parsed["run"]
+    assert run["strategies"] == ["cash_management"]
+
+
+def test_migration_vix_enabled_does_not_force_wheel_strategy() -> None:
+    raw = """
+[account]
+number = "DUX"
+margin_usage = 0.5
+
+[option_chains]
+expirations = 4
+strikes = 10
+
+[target]
+dte = 30
+minimum_open_interest = 5
+
+[roll_when]
+dte = 7
+
+[ibc]
+
+[vix_call_hedge]
+enabled = true
+
+[symbols.AAA]
+weight = 1.0
+"""
+    migrated = migrate_v1_to_v2(raw)
+    parsed = tomlkit.parse(migrated.migrated_text).unwrap()
+    run = parsed["run"]
+    assert run["strategies"] == ["vix_call_hedge"]
 
 
 def test_golden_migration_output_subset_for_stable_shape() -> None:

thetagang/config_migration/migrate_v1_to_v2.py

@@ -6,11 +6,7 @@
 
 import tomlkit
 
-from thetagang.config import (
-    CANONICAL_STAGE_ORDER,
-    DEFAULT_RUN_STRATEGIES,
-    STAGE_KIND_BY_ID,
-)
+from thetagang.config import DEFAULT_RUN_STRATEGIES
 from thetagang.legacy_config import LegacyConfig, normalize_config
 
 RUNTIME_KEYS = [
@@ -336,25 +332,8 @@ def _strip_legacy_symbol_strategy_keys(symbols_doc: Any) -> None:
 
 
 def _infer_run_plan(
-    validated_legacy: Dict[str, Any], warnings: List[str]
+    validated_legacy: Dict[str, Any], _warnings: List[str]
 ) -> Dict[str, Any]:
-    regime = validated_legacy.get("regime_rebalance", {})
-    regime_enabled = (
-        bool(regime.get("enabled", False)) if isinstance(regime, dict) else False
-    )
-    shares_only = (
-        bool(regime.get("shares_only", False)) if isinstance(regime, dict) else False
-    )
-
-    if regime_enabled:
-        stage_ids = _legacy_stage_ids(
-            regime_shares_only=shares_only, config=validated_legacy
-        )
-        warnings.append(
-            "regime_rebalance.enabled=true migrated to explicit run.stages to preserve legacy execution order."
-        )
-        return {"stages": _build_stage_plan(stage_ids)}
-
     return {"strategies": _infer_run_strategies(validated_legacy)}
 
 
@@ -366,7 +345,8 @@ def _infer_run_strategies(validated_legacy: Dict[str, Any]) -> List[str]:
     )
     if regime_enabled:
         out.append("regime_rebalance")
-    else:
+    wheel_enabled = not regime_enabled
+    if wheel_enabled:
         out.append("wheel")
 
     vix = validated_legacy.get("vix_call_hedge", {})
@@ -377,51 +357,7 @@ def _infer_run_strategies(validated_legacy: Dict[str, Any]) -> List[str]:
     if isinstance(cash, dict) and bool(cash.get("enabled", False)):
         out.append("cash_management")
 
-    if not out:
-        return list(DEFAULT_RUN_STRATEGIES)
-    return out
-
-
-def _legacy_stage_ids(*, regime_shares_only: bool, config: Dict[str, Any]) -> List[str]:
-    enabled = set()
-    if not regime_shares_only:
-        enabled.update(
-            {
-                "options_write_puts",
-                "options_write_calls",
-                "options_roll_positions",
-                "options_close_positions",
-            }
-        )
-    enabled.update(
-        {
-            "equity_regime_rebalance",
-            "equity_buy_rebalance",
-            "equity_sell_rebalance",
-        }
-    )
-    vix = config.get("vix_call_hedge", {})
-    if isinstance(vix, dict) and bool(vix.get("enabled", False)):
-        enabled.add("post_vix_call_hedge")
-
-    cash = config.get("cash_management", {})
-    if isinstance(cash, dict) and bool(cash.get("enabled", False)):
-        enabled.add("post_cash_management")
-
-    return [stage_id for stage_id in CANONICAL_STAGE_ORDER if stage_id in enabled]
-
-
-def _build_stage_plan(stage_ids: List[str]) -> List[Dict[str, Any]]:
-    plan: List[Dict[str, Any]] = []
-    previous_id: str | None = None
-    for stage_id in stage_ids:
-        stage = {
-            "id": stage_id,
-            "kind": STAGE_KIND_BY_ID[stage_id],
-            "enabled": True,
-        }
-        if previous_id is not None:
-            stage["depends_on"] = [previous_id]
-        plan.append(stage)
-        previous_id = stage_id
-    return plan
+    explicitly_enabled = [strategy_id for strategy_id in out if strategy_id != "wheel"]
+    if explicitly_enabled:
+        return explicitly_enabled
+    return list(DEFAULT_RUN_STRATEGIES)