huskies: merge 1009

server/src/db/mod.rs

@@ -466,8 +466,6 @@ mod tests {
             Some(3),
             None,
             None,
-            None,
-            None,
         );
         write_content(
             ContentKey::Story(story_id),

server/src/db/ops.rs

@@ -93,8 +93,6 @@ pub fn write_item_with_content(story_id: &str, stage: &str, content: &str, meta:
         meta.agent.as_deref(),
         meta.retry_count,
         depends_on_json.as_deref(),
-        None,
-        None,
         merged_at_ts,
     );
 
@@ -148,17 +146,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,
-        None,
-        None,
-        merged_at_ts,
-    );
+    crate::crdt_state::write_item(story_id, &typed_stage, None, 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

server/src/db/recover.rs

@@ -350,8 +350,6 @@ mod tests {
             None,
             None,
             None,
-            None,
-            None,
         );
         assert!(
             crdt_state::read_item(old_id).is_none(),