huskies: merge 870

server/src/agents/pool/pipeline/advance/tests_regression.rs

@@ -467,6 +467,7 @@ async fn no_committed_work_still_retries_and_blocks() {
         .unwrap();
 
     // Set up the story with max_retries=1 so it blocks immediately.
+    crate::crdt_state::init_for_test();
     crate::db::ensure_content_store();
     crate::db::write_content("9946_story_nowork", "---\nname: No Work Test\n---\n");
     crate::db::write_item_with_content(
@@ -806,6 +807,7 @@ stage = "coder"
     )
     .unwrap();
 
+    crate::crdt_state::init_for_test();
     crate::db::ensure_content_store();
     crate::db::write_item_with_content(
         "9950_story_warm_resume",
@@ -848,11 +850,12 @@ stage = "coder"
     );
     drop(agents);
 
-    // Retry counter must have been incremented (AC 3).
-    let content = crate::db::read_content("9950_story_warm_resume")
-        .expect("story must exist in content store");
+    // Retry counter must have been incremented (AC 3) — checked via CRDT.
+    let item =
+        crate::crdt_state::read_item("9950_story_warm_resume").expect("story must be in CRDT");
     assert!(
-        content.contains("retry_count"),
-        "retry_count must be incremented after warm-resume: {content}"
+        item.retry_count.is_some_and(|rc| rc > 0),
+        "retry_count must be incremented after warm-resume: got {:?}",
+        item.retry_count
     );
 }