Skip to content

"Vibe-Trading: Your Personal Trading Agent"

fix(live): close exact recovery restart gaps

Miranda20f3ad77c64d
diff --git a/agent/src/live/daily_count.py b/agent/src/live/daily_count.py
index 96d1222fe..db5cfb339 100644
--- a/agent/src/live/daily_count.py
+++ b/agent/src/live/daily_count.py
@@ -130,14 +130,17 @@ def increment_daily_count(broker: str, action_id: str | None = None) -> int:
if action_id is not None and not (1 <= len(action_id) <= 128):
raise DailyCountError("action_id must contain 1-128 characters")
try:
- action_ids = _read_action_ids(broker)
+ counter_date, action_ids = _read_action_ids(broker)
except DailyCountError:
if action_id is not None:
raise
+ counter_date = None
action_ids = []
count = read_daily_count(broker)
if action_id is not None and action_id in action_ids:
return count
+ if counter_date != today:
+ action_ids = []
count += 1
if action_id is not None:
action_ids.append(action_id)
@@ -168,23 +171,24 @@ def increment_daily_count(broker: str, action_id: str | None = None) -> int:
return count
-def _read_action_ids(broker: str) -> list[str]:
+def _read_action_ids(broker: str) -> tuple[str | None, list[str]]:
path = _counter_path(broker)
if not path.is_file():
- return []
+ return None, []
try:
raw = json.loads(path.read_text(encoding="utf-8"))
except (OSError, ValueError) as exc:
raise DailyCountError("daily order count cannot be read") from exc
- if not isinstance(raw, dict) or raw.get("date") != _utc_today():
- return []
- count, values = raw.get("count"), raw.get("action_ids", [])
+ if not isinstance(raw, dict):
+ raise DailyCountError("daily order count has an invalid schema")
+ date, count, values = raw.get("date"), raw.get("count"), raw.get("action_ids", [])
if (
- isinstance(count, bool) or not isinstance(count, int) or count < 0
+ not isinstance(date, str) or not date
+ or isinstance(count, bool) or not isinstance(count, int) or count < 0
or not isinstance(values, list)
or any(not isinstance(value, str) or not value for value in values)
or len(set(values)) != len(values)
or len(values) > count
):
raise DailyCountError("daily order count has an invalid schema")
- return values
+ return date, values
diff --git a/agent/src/live/sdk_order_gate.py b/agent/src/live/sdk_order_gate.py
index 328c9c1ee..a63cfc700 100644
--- a/agent/src/live/sdk_order_gate.py
+++ b/agent/src/live/sdk_order_gate.py
@@ -89,6 +89,20 @@ def execute_live_order(
broker = (broker or "").strip().lower()
mandate = load_mandate(broker)
+ if broker == "alpaca":
+ try:
+ with daily_order_lock(broker):
+ recovery = _pending_recovery_result(
+ broker, session_id, connector_module, config, mandate
+ )
+ except DailyOrderLockUnavailable as exc:
+ return _deny(
+ broker, session_id, str(exc),
+ ["pending_action", "daily_order_lock"], mandate, intent=None,
+ )
+ if recovery is not None:
+ return recovery
+
if mandate is None or mandate.schema_version != MANDATE_SCHEMA_VERSION:
return _deny(broker, session_id, "no valid mandate on file", ["mandate"], mandate, intent=None)
@@ -126,25 +140,11 @@ def execute_live_order(
try:
with daily_order_lock(broker):
if broker == "alpaca":
- try:
- unresolved = pending_action.load_pending_action(broker)
- except pending_action.PendingActionError:
- return _deny(
- broker, session_id,
- "pending broker action is invalid and requires recovery",
- ["mandate", "expiry", "halt_flag", "pending_action"], mandate,
- intent=intent, reason_code="pending_action_invalid",
- )
- if unresolved is not None:
- if unresolved.phase == "resolved_needs_revalidation":
- return _deny(
- broker, session_id, "recovered broker order requires policy revalidation",
- ["mandate", "expiry", "halt_flag", "pending_action"], mandate,
- intent=intent, reason_code="pending_action_needs_revalidation",
- )
- return _recover_pending_order(
- broker, session_id, connector_module, config, mandate, unresolved
- )
+ recovery = _pending_recovery_result(
+ broker, session_id, connector_module, config, mandate
+ )
+ if recovery is not None:
+ return recovery
daily_count = read_daily_count(broker)
breach = check_mandate(
mandate,
@@ -181,6 +181,29 @@ def execute_live_order(
return _deny_breach(broker, session_id, breach, mandate, intent, reauth)
+def _pending_recovery_result(broker, session_id, connector, config, mandate):
+ """Recover an existing marker under the caller-held broker lock."""
+ try:
+ unresolved = pending_action.load_pending_action(broker)
+ except pending_action.PendingActionError:
+ return _deny(
+ broker, session_id, "pending broker action is invalid and requires recovery",
+ ["pending_action", "exact_broker_evidence"], mandate,
+ intent=None, reason_code="pending_action_invalid",
+ )
+ if unresolved is None:
+ return None
+ if unresolved.phase == "resolved_needs_revalidation":
+ return _deny(
+ broker, session_id, "recovered broker order requires policy revalidation",
+ ["pending_action", "exact_broker_evidence"], mandate,
+ intent=None, reason_code="pending_action_needs_revalidation",
+ )
+ return _recover_pending_order(
+ broker, session_id, connector, config, mandate, unresolved
+ )
+
+
def execute_live_action(
*,
broker: str,
diff --git a/agent/tests/test_daily_count.py b/agent/tests/test_daily_count.py
index 3ed4d2689..01fee6635 100644
--- a/agent/tests/test_daily_count.py
+++ b/agent/tests/test_daily_count.py
@@ -11,6 +11,7 @@ from pathlib import Path
import pytest
import src.live.paths as live_paths
+from src.live import daily_count
from src.live.daily_count import daily_order_lock, increment_daily_count, read_daily_count
pytestmark = pytest.mark.unit
@@ -67,3 +68,22 @@ def test_action_id_increment_is_durable_and_deduplicated(tmp_path, monkeypatch)
assert read_daily_count("alpaca") == 2
payload = json.loads((runtime_root / "live" / "alpaca" / "trade_counter.json").read_text())
assert payload["action_ids"] == ["act_one", "act_two"]
+
+
+def test_action_id_deduplicates_after_utc_rollover(tmp_path, monkeypatch) -> None:
+ runtime_root = tmp_path / ".vibe-trading"
+ current_day = ["2026-08-25"]
+ monkeypatch.setattr(live_paths, "get_runtime_root", lambda: runtime_root)
+ monkeypatch.setattr(daily_count, "_utc_today", lambda: current_day[0])
+
+ assert increment_daily_count("alpaca", action_id="act_recovered") == 1
+ current_day[0] = "2026-08-26"
+ assert increment_daily_count("alpaca", action_id="act_recovered") == 0
+ assert read_daily_count("alpaca") == 0
+ assert increment_daily_count("alpaca", action_id="act_new") == 1
+ payload = json.loads((runtime_root / "live" / "alpaca" / "trade_counter.json").read_text())
+ assert payload == {
+ "date": "2026-08-26",
+ "count": 1,
+ "action_ids": ["act_new"],
+ }
diff --git a/agent/tests/test_sdk_order_gate.py b/agent/tests/test_sdk_order_gate.py
index 057f6ba7e..6db117e69 100644
--- a/agent/tests/test_sdk_order_gate.py
+++ b/agent/tests/test_sdk_order_gate.py
@@ -333,8 +333,32 @@ def test_restart_recovers_exact_working_order_once_and_never_resubmits(monkeypat
assert len(connector.placed) == 1 and connector.lookups == [action.client_order_id] * 2
[email protected]("blocker", ["missing_mandate", "expired", "halted"])
+def test_exact_recovery_precedes_current_policy_blockers(monkeypatch, blocker) -> None:
+ _patch_gate(monkeypatch, mandate=_mandate())
+ connector = _LostResponseConnector()
+ _place(connector)
+ action = load_pending_action("alpaca")
+ connector.lookup_result = _exact_order(action, status="canceled")
+ connector.get_positions = lambda config: pytest.fail("recovery read positions")
+ connector.get_account_snapshot = lambda config: pytest.fail("recovery read account")
+ if blocker == "missing_mandate":
+ monkeypatch.setattr(gate, "load_mandate", lambda broker: None)
+ elif blocker == "expired":
+ monkeypatch.setattr(gate, "_is_expired", lambda mandate: True)
+ else:
+ monkeypatch.setattr(gate, "halt_flag_set", lambda broker: True)
+
+ result = _place(connector)
+
+ assert result["reason_code"] == "pending_action_resolved_terminal"
+ assert load_pending_action("alpaca") is None
+ assert len(connector.placed) == 1
+ assert connector.lookups == [action.client_order_id]
+
+
@pytest.mark.parametrize("change", [None, {"symbol": "MSFT"}, {"client_order_id": "manual"},
- {"order_status": "mystery"}])
+ {"order_status": "mystery"}])
def test_recovery_insufficient_or_mismatched_evidence_stays_blocked(monkeypatch, change) -> None:
counted: list[str] = []
_patch_gate(monkeypatch, mandate=_mandate())