huskies: merge 997

server/src/db/ops.rs

@@ -17,7 +17,6 @@ use super::shadow_write::{PIPELINE_DB, PipelineWriteMsg};
 pub struct ItemMeta {
     pub name: Option<String>,
     pub agent: Option<String>,
-    pub retry_count: Option<i64>,
     pub depends_on: Option<Vec<u32>>,
 }
 
@@ -91,7 +90,6 @@ pub fn write_item_with_content(story_id: &str, stage: &str, content: &str, meta:
         &typed_stage,
         meta.name.as_deref(),
         meta.agent.as_deref(),
-        meta.retry_count,
         depends_on_json.as_deref(),
         merged_at_ts,
     );
@@ -103,7 +101,7 @@ pub fn write_item_with_content(story_id: &str, stage: &str, content: &str, meta:
             stage: stage.to_string(),
             name: meta.name,
             agent: meta.agent,
-            retry_count: meta.retry_count,
+            retry_count: None,
             depends_on: depends_on_json,
             content: Some(content.to_string()),
         };
@@ -146,7 +144,7 @@ pub fn move_item_stage(
     };
     let merged_at_ts = matches!(typed_stage, crate::pipeline_state::Stage::Done { .. })
         .then(|| chrono::Utc::now().timestamp() as f64);
-    crate::crdt_state::write_item(story_id, &typed_stage, None, None, None, None, merged_at_ts);
+    crate::crdt_state::write_item(story_id, &typed_stage, None, None, None, merged_at_ts);
     // Bug 780: stage transitions reset retry_count to 0.  retry_count tracks
     // attempts at THIS stage's work (coding, merging, qa); a fresh attempt at
     // a new stage is conceptually distinct from prior attempts at a different