Close R2 readonly fallback candidate refresh

tests/unit/test_shadow_paper_sample_collection_service.py

@@ -37,7 +37,7 @@ class ShadowPaperSampleCollectionServiceTests(unittest.TestCase):
 
         payload = service.record_daily_observation(
             instrument_id=1,
-            runtime_status={"current_blockers": ["broker_sync_degraded:BTC-USDT"]},
+            runtime_status={"current_blockers": ["runtime_task_stalled:market_state"]},
             now=now,
         )
 
@@ -45,6 +45,34 @@ class ShadowPaperSampleCollectionServiceTests(unittest.TestCase):
         self.assertEqual(payload["system_recommendation"], "pause_runtime_blocked")
         self.assertEqual(payload["next_collection_actions"], ["clear_runtime_blockers_before_counting_shadow_day"])
 
+    def test_readonly_rest_fallback_blocker_still_counts_observation(self) -> None:
+        now = datetime(2026, 5, 17, 12, 0, tzinfo=timezone.utc)
+        repository = _ObservationRepository()
+        service = ShadowPaperSampleCollectionService(repository=repository)
+
+        payload = service.record_daily_observation(
+            instrument_id=1,
+            runtime_status={
+                "current_blockers": ["market_stream_degraded:BTC-USDT:market_stream_connecting"],
+                "latest_market_state_by_symbol": {
+                    "BTC-USDT": {
+                        "freshness": {"code": "market_data_fresh"},
+                        "data_gap_state": {"code": "market_data_gap_clear"},
+                    }
+                },
+            },
+            now=now,
+        )
+
+        self.assertEqual(payload["observation_status"], "candidate_observed")
+        self.assertEqual(payload["system_recommendation"], "wait_for_operator_confirmation")
+        self.assertIn("build_shadow_paper_ticket_for_latest_candidate", payload["next_collection_actions"])
+        self.assertEqual(repository.upsert_call["payload"]["runtime_blockers"], [])
+        self.assertEqual(
+            repository.upsert_call["payload"]["suppressed_runtime_blockers"],
+            ["market_stream_degraded:BTC-USDT:market_stream_connecting"],
+        )
+
     def test_blocked_candidate_waits_before_paper_ticket_action(self) -> None:
         now = datetime(2026, 5, 17, 12, 0, tzinfo=timezone.utc)
         service = ShadowPaperSampleCollectionService(repository=_ObservationRepository(candidate_status="blocked"))

tests/unit/test_shadow_paper_validation_service.py

@@ -58,6 +58,33 @@ class ShadowPaperValidationServiceTests(unittest.TestCase):
         self.assertEqual(summary["status"], "blocked_by_runtime")
         self.assertEqual(summary["next_validation_gate"], "runtime_clear_for_shadow")
 
+    def test_readonly_rest_fallback_suppresses_market_stream_blocker(self) -> None:
+        now = datetime(2026, 5, 17, 12, 0, tzinfo=timezone.utc)
+        service = ShadowPaperValidationService(repository=_ReadyRepository(now))
+
+        summary = service.build_summary(
+            instrument_id=1,
+            runtime_status={
+                "current_blockers": ["market_stream_degraded:BTC-USDT:market_stream_connecting"],
+                "latest_market_state_by_symbol": {
+                    "BTC-USDT": {
+                        "freshness": {"code": "market_data_fresh"},
+                        "data_gap_state": {"code": "market_data_gap_clear"},
+                    }
+                },
+            },
+            weekly_review={"entry_count": 5, "risk_violation_count": 0},
+            now=now,
+        )
+
+        self.assertEqual(summary["status"], "ready_for_shadow_paper_review")
+        self.assertEqual(summary["runtime_blockers"], [])
+        self.assertEqual(
+            summary["suppressed_runtime_blockers"],
+            ["market_stream_degraded:BTC-USDT:market_stream_connecting"],
+        )
+        self.assertNotIn("runtime_clear_for_shadow", summary["failed_criteria"])
+
     def test_daily_observations_count_toward_shadow_coverage_and_operator_feedback(self) -> None:
         now = datetime(2026, 5, 17, 12, 0, tzinfo=timezone.utc)
         service = ShadowPaperValidationService(repository=_ObservationOnlyRepository(now))

tests/unit/test_trading_runtime_service.py

@@ -274,7 +274,9 @@ class TradingRuntimeSchedulerTests(unittest.TestCase):
 
     def test_run_cycle_enters_degraded_mode_when_market_truth_is_bad(self) -> None:
         scheduler = TradingRuntimeScheduler(
-            market_state_service=FakeMarketStateService(FakeMarketState(stream="market_stream_disconnected")),
+            market_state_service=FakeMarketStateService(
+                FakeMarketState(stream="market_stream_disconnected", gap="market_data_gap_detected")
+            ),
             trading_plan_service=FakeTradingPlanService(),
             setup_watcher_service=FakeSetupWatcherService(),
             broker_read_model_service=FakeBrokerReadModelService(),
@@ -298,6 +300,33 @@ class TradingRuntimeSchedulerTests(unittest.TestCase):
         self.assertGreaterEqual(payload["incident_summary"]["severity_counts"]["blocker"], 1)
         self.assertIn("check_market_truth_stream_proxy_and_backfill", payload["incident_summary"]["recommended_actions"])
 
+    def test_run_cycle_uses_readonly_rest_fallback_for_watch_when_stream_is_degraded(self) -> None:
+        shadow_service = FakeShadowPaperSampleService()
+        scheduler = TradingRuntimeScheduler(
+            market_state_service=FakeMarketStateService(FakeMarketState(stream="market_stream_disconnected")),
+            trading_plan_service=FakeTradingPlanService(),
+            setup_watcher_service=FakeSetupWatcherService(),
+            broker_read_model_service=FakeBrokerReadModelService(),
+            reconciliation_service=FakeReconciliationService(),
+            decision_packet_service=FakeDecisionPacketService(),
+            visual_review_service=FakeVisualReviewService(),
+            visual_capture_retention_service=FakeVisualCaptureRetentionService(),
+            research_council_service=FakeResearchCouncilService(),
+            shadow_paper_sample_service=shadow_service,
+        )
+        with patch("src.services.runtime.trading_runtime_service.settings.trading_runtime_symbols", "BTC-USDT"):
+            payload = scheduler.run_cycle()
+
+        self.assertIn("market_stream_degraded:BTC-USDT:market_stream_disconnected", payload["current_blockers"])
+        self.assertIn("watch_using_rest_fallback:BTC-USDT:market_stream_disconnected", payload["current_warnings"])
+        self.assertNotIn("watch_skipped_market_degraded:BTC-USDT", payload["current_noisy_incidents"])
+        self.assertEqual(payload["tasks"]["watch"]["details"]["market_input_mode"], "rest_fallback")
+        self.assertTrue(payload["tasks"]["watch"]["details"]["candidate_generated"])
+        self.assertEqual(
+            shadow_service.calls[0]["runtime_status"]["latest_market_state_by_symbol"]["BTC-USDT"]["freshness"]["code"],
+            "market_data_fresh",
+        )
+
     def test_supervisor_run_once_exposes_supervisor_state(self) -> None:
         scheduler = TradingRuntimeScheduler(
             market_state_service=FakeMarketStateService(),