huskies: merge 945

server/src/service/agents/mod.rs

@@ -357,7 +357,6 @@ max_budget_usd = 5.0
             None,
             None,
             None,
-            None,
         );
         let item = get_work_item_content(tmp.path(), "42_story_foo").unwrap();
         assert!(item.content.contains("Some content."));

server/src/service/notifications/format.rs

@@ -19,6 +19,9 @@ pub fn stage_display_name(stage: &Stage) -> &'static str {
         Stage::Done { .. } => "Done",
         Stage::Archived { .. } => "Archived",
         Stage::MergeFailure { .. } => "MergeFailure",
+        Stage::MergeFailureFinal { .. } => "MergeFailureFinal",
+        Stage::Frozen { .. } => "Frozen",
+        Stage::ReviewHold { .. } => "ReviewHold",
     }
 }
 

server/src/service/work_item/assign.rs

@@ -66,7 +66,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
 
         let tmp = tempfile::tempdir().unwrap();
@@ -108,7 +107,6 @@ mod tests {
                 None,
                 None,
                 None,
-                None,
             );
         }
 

server/src/service/work_item/delete.rs

@@ -205,7 +205,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
 
         // Seed content store.

server/src/service/work_item/freeze.rs

@@ -28,8 +28,10 @@ pub enum UnfreezeStatus {
 /// stage without making any CRDT writes.  Returns `Err` if the state transition
 /// fails (e.g. the item is not found or is in a terminal stage).
 pub fn freeze(story_id: &str) -> Result<FreezeStatus, String> {
-    let already_frozen = crate::crdt_state::read_item(story_id)
-        .map(|view| view.frozen())
+    let already_frozen = crate::pipeline_state::read_typed(story_id)
+        .ok()
+        .flatten()
+        .map(|item| item.is_frozen())
         .unwrap_or(false);
 
     if already_frozen {
@@ -46,8 +48,10 @@ pub fn freeze(story_id: &str) -> Result<FreezeStatus, String> {
 /// Returns [`UnfreezeStatus::NotFrozen`] if the item is not currently frozen.
 /// Returns `Err` if the state transition fails.
 pub fn unfreeze(story_id: &str) -> Result<UnfreezeStatus, String> {
-    let is_frozen = crate::crdt_state::read_item(story_id)
-        .map(|view| view.frozen())
+    let is_frozen = crate::pipeline_state::read_typed(story_id)
+        .ok()
+        .flatten()
+        .map(|item| item.is_frozen())
         .unwrap_or(false);
 
     if !is_frozen {