From 82abd03443ebc2fa3a53cbd0d9c5a8e5e2dd353f Mon Sep 17 00:00:00 2001
From: firestar5683 <168790843+firestar5683@users.noreply.github.com>
Date: Sat, 24 Oct 2026 23:36:17 -0500
Subject: [PATCH] Retain pending learning study across consumed-source timing
 gaps

---
 openpilot/starpilot/flm/live_tracking.py      |  4 +-
 .../flm/tests/test_source_study_gaps.py       | 39 ++++++++++++++++++-
 prebuilt.json                                 |  2 +-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/openpilot/starpilot/flm/live_tracking.py b/openpilot/starpilot/flm/live_tracking.py
index 81c9f94f71..9c2df05446 100644
--- a/openpilot/starpilot/flm/live_tracking.py
+++ b/openpilot/starpilot/flm/live_tracking.py
@@ -493,9 +493,11 @@ class LiveTrackingOptimizer:
     # Retain only inert numerical study intent on missing/stale evidence. The
     # command still rolls back; a fresh baseline ACK must precede a NEW wire
     # trial. Completed scores, alpha and original deadline are never reset.
+    # Normalized source timing gaps reject the pair without changing identity.
+    # Wrong domains still arrive with context_changed=True and discard intent.
     transient = not context_changed and reason in (
       'acknowledged_trial_profile_withdrawn', 'expired_response_witness', 'stale_control', 'stale_applied_output',
-      'current_evidence_delayed', 'learning_evidence_delayed',
+      'current_evidence_delayed', 'learning_evidence_delayed', 'consumed_source_mismatch',
       'fresh_physical_residual_window_required',
     )
     if not transient:
diff --git a/openpilot/starpilot/flm/tests/test_source_study_gaps.py b/openpilot/starpilot/flm/tests/test_source_study_gaps.py
index 74b5ce124e..511ad96000 100644
--- a/openpilot/starpilot/flm/tests/test_source_study_gaps.py
+++ b/openpilot/starpilot/flm/tests/test_source_study_gaps.py
@@ -22,7 +22,8 @@ def active_study():
 
 class SourceStudyGaps(unittest.TestCase):
   def test_each_transient_keeps_completed_scores_and_original_deadline_only(self):
-    for reason in ('current_evidence_delayed', 'learning_evidence_delayed', 'fresh_physical_residual_window_required'):
+    for reason in ('current_evidence_delayed', 'learning_evidence_delayed', 'fresh_physical_residual_window_required',
+                   'consumed_source_mismatch'):
       with self.subTest(reason=reason):
         o, now = active_study()
         before = tuple(o.before)
@@ -39,6 +40,42 @@ class SourceStudyGaps(unittest.TestCase):
         assert tuple(o.before) == before and tuple(o.future) == future and o.settled_ns is None
         assert not any(o.accepted.values())
 
+  def test_normalized_join_clock_gap_keeps_inert_study_but_wrong_domain_does_not(self):
+    from openpilot.starpilot.flm.fullrate_collector import FullrateCollector
+    from openpilot.starpilot.flm.tests.test_fullrate_pipeline import BASE, SyntheticAdapter, snapshots
+    from types import SimpleNamespace
+
+    for wrong_domain in (False, True):
+      with self.subTest(wrong_domain=wrong_domain):
+        o, now = active_study()
+        original = o.offer_state.copy()
+        scores = tuple(o.before), tuple(o.future)
+        c = FullrateCollector(SyntheticAdapter())
+        c.adapter.command_domain = 'normalized_torque'
+        c.live_tracking = SimpleNamespace(interrupt=o.interrupt)
+        control, output, _pose = snapshots(BASE)
+        control = replace(control, domain='normalized_torque')
+        output = replace(output, domain='wrong' if wrong_domain else 'normalized_torque',
+                         state_ns=control.state_ns, apply_ns=control.control_ns+30_000_001)
+        c._join_emission(control, output)
+        assert c.reason == 'consumed_source_mismatch' and not c.ready
+        assert o.offer_state['phase'] == 'rollback' and o.settled_ns is None
+        assert not o.before and not o.future and not any(o.accepted.values())
+        if wrong_domain:
+          assert o.paused_intent is None
+        else:
+          assert o.paused_intent[1:] == scores
+        refresh(o, now+200_000_000)
+        rollback = o.offer(now+200_000_000)
+        assert source_ack(o, rollback, now+210_000_000)
+        if wrong_domain:
+          assert o.offer_state['phase'] == 'rollback' and o.offer_state['accepted']
+        else:
+          assert o.offer_state['phase'] == 'trial' and o.offer_state['trial_id'] != original['trial_id']
+          for field in ('started_ns', 'deadline_ns', 'alpha', 'required_episodes', 'target', 'baseline'):
+            assert o.offer_state[field] == original[field]
+          assert (tuple(o.before), tuple(o.future)) == scores and o.settled_ns is None
+
   def test_context_change_drops_study_instead_of_resuming(self):
     o, now = active_study()
     o.interrupt('source_configuration_changed', context_changed=True)
diff --git a/prebuilt.json b/prebuilt.json
index 1573b4790b..262fd8618f 100644
--- a/prebuilt.json
+++ b/prebuilt.json
@@ -1 +1 @@
-{"protected_inventory_sha256": "057843785651f8d565d177248fa73717707b4ae95f2666a2adab128ec7e668fc", "schema_version": 1}
+{"protected_inventory_sha256": "50ee49f3154d54503b9f342aa72fc3e03f597166656a6aa0a0760fae2124fca8", "schema_version": 1}