From 7d0ec022dec4483c9430e47d1ddd972767e7eede Mon Sep 17 00:00:00 2001 From: Michael D'Angelo Date: Thu, 19 Nov 2026 16:29:27 -0800 Subject: [PATCH] fix(usage): retain post-reconnect counters after a native receipt --- .../scripts/workbench_scan_usage.py | 9 +++++++++ .../tests/test_workbench_scan_usage.py | 15 +++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/plugins/codex-security/scripts/workbench_scan_usage.py b/plugins/codex-security/scripts/workbench_scan_usage.py index 476751028..1cf51bd75 100644 --- a/plugins/codex-security/scripts/workbench_scan_usage.py +++ b/plugins/codex-security/scripts/workbench_scan_usage.py @@ -1328,6 +1328,7 @@ class _TurnUsage: self.response_usage = _empty_token_usage() self.has_receipts = False self.has_turn_total = False + self.exact_at_reconnect: dict[str, int] | None = None self.ambiguous_cache = False self.ambiguous_model = False self.counter_regressed = False @@ -1549,6 +1550,8 @@ def _read_rollout_usage_with_extent( and (payload.get("id") or payload.get("session_id")) == session.thread_id ): previous_counter_turn = None + if turn.has_turn_total: + turn.exact_at_reconnect = turn.total.copy() if event.get("type") == "token_usage_record": response_id = payload.get("response_id") usage = _usage_counts(payload.get("usage")) @@ -1607,6 +1610,7 @@ def _read_rollout_usage_with_extent( continue if turn_usage is not None: receipt_turn.has_turn_total = True + receipt_turn.exact_at_reconnect = None if any( turn_usage[key] > receipt_turn.response_usage[key] for key in TOKEN_FIELDS.values() @@ -1715,6 +1719,11 @@ def _read_rollout_usage_with_extent( delta["cacheWriteInputTokensReported"] = False previous = baseline previous_counter_turn = current_turn_id + if reset and turn.exact_at_reconnect is not None: + # The previous turn total covers only work before the reconnect. + turn.counters = turn.exact_at_reconnect + turn.has_turn_total = False + turn.exact_at_reconnect = None if past_scan_end(timestamp, current_turn_id): continue if owner_turn_id is not None and current_turn_id != owner_turn_id: diff --git a/plugins/codex-security/tests/test_workbench_scan_usage.py b/plugins/codex-security/tests/test_workbench_scan_usage.py index 3fdb5f19b..1e8137306 100644 --- a/plugins/codex-security/tests/test_workbench_scan_usage.py +++ b/plugins/codex-security/tests/test_workbench_scan_usage.py @@ -3761,6 +3761,21 @@ def test_lower_counter_after_new_turn_or_reconnect(scan_usage, tmp_path, kind, p assert usage.warnings == {"token_counter_regressed"} +def test_same_turn_reconnect_keeps_usage_after_last_exact_receipt(scan_usage, tmp_path): + at = datetime.fromisoformat("2026-01-01T00:00:00+00:00") + events = [ + _event(at, "turn_context", {"turn_id": "first"}), + _token_event(at, 100, 0), + _response_event(at, "scan-parent", "first", 110, 0, turn_id="first"), + _event(at, "session_meta", {"id": "scan-parent"}), + _token_event(at, 30, 0), + _token_event(at, 60, 0), + ] + usage = _measure_rollout(scan_usage, _rollout(tmp_path, "scan-parent", events), at, at) + assert usage.tokens == _counts(170, 0, 0) + assert usage.warnings == {"token_receipts_incomplete"} + + def test_receipt_does_not_resolve_another_turns_counter_regression(scan_usage, tmp_path): at = datetime.fromisoformat("2026-01-01T00:00:00+00:00") events = [