huskies: merge 997

server/src/db/mod.rs

@@ -377,7 +377,6 @@ mod tests {
         let meta = ItemMeta {
             name: Some("Typed Name".into()),
             agent: Some("coder-1".into()),
-            retry_count: Some(2),
             depends_on: Some(vec![100, 200]),
         };
         write_item_with_content(story_id, "2_current", content, meta);
@@ -386,7 +385,7 @@ mod tests {
         assert_eq!(view.stage().dir_name(), "coding");
         assert_eq!(view.name(), "Typed Name");
         assert_eq!(view.agent(), Some(crate::config::AgentName::Coder1));
-        assert_eq!(view.retry_count(), 2);
+        assert_eq!(view.retry_count(), 0);
         assert_eq!(view.depends_on(), &[100, 200]);
 
         // Content is stored verbatim (no parsing, no rewrite).
@@ -461,18 +460,14 @@ mod tests {
             "2_current",
             Some("Retry reset test"),
             None,
-            Some(3),
             None,
             None,
         );
-        write_content(
-            ContentKey::Story(story_id),
-            "---\nname: Retry reset test\nretry_count: 3\n---\n",
-        );
+        crate::crdt_state::set_retry_count(story_id, 3);
         let typed = crate::pipeline_state::read_typed(story_id)
             .expect("read should succeed")
             .expect("story exists in CRDT");
-        assert_eq!(typed.retry_count, 3);
+        assert_eq!(typed.retry_count(), 3);
 
         // Promote to 4_merge.  retry_count must reset.
         move_item_stage(story_id, "4_merge", None);
@@ -482,7 +477,8 @@ mod tests {
             .expect("story exists in CRDT");
         assert_eq!(typed_after.stage.dir_name(), "merge");
         assert_eq!(
-            typed_after.retry_count, 0,
+            typed_after.retry_count(),
+            0,
             "retry_count must reset to 0 on stage transition"
         );
     }