huskies: merge 891

server/src/agents/pool/auto_assign/story_checks.rs

@@ -19,10 +19,10 @@ pub(super) fn read_story_front_matter_agent(
     story_id: &str,
 ) -> Option<String> {
     if let Some(view) = crate::crdt_state::read_item(story_id)
-        && let Some(agent) = view.agent.as_ref()
+        && let Some(agent) = view.agent()
         && !agent.is_empty()
     {
-        return Some(agent.clone());
+        return Some(agent.to_string());
     }
     use crate::db::yaml_legacy::parse_front_matter;
     let contents = read_story_contents(project_root, story_id)?;
@@ -101,7 +101,7 @@ pub(super) fn has_mergemaster_attempted(
     story_id: &str,
 ) -> bool {
     crate::crdt_state::read_item(story_id)
-        .and_then(|view| view.mergemaster_attempted)
+        .map(|view| view.mergemaster_attempted())
         .unwrap_or(false)
 }
 

server/src/agents/pool/auto_assign/watchdog/tests/limits_tests.rs

@@ -274,9 +274,10 @@ max_turns = 10
     let item = crate::crdt_state::read_item(story_id)
         .expect("story must be in CRDT after watchdog termination");
     assert_eq!(
-        item.stage, "2_blocked",
+        item.stage_str(),
+        "2_blocked",
         "story stage must be 2_blocked after limit termination with max_retries=1 — got: {}",
-        item.stage
+        item.stage_str()
     );
 
     // Sanity: the agent itself is also Failed with the right reason.
@@ -415,7 +416,8 @@ max_turns = 10
     let item = crate::crdt_state::read_item(story_id)
         .expect("story must be in CRDT after per-session overrun");
     assert_eq!(
-        item.stage, "2_blocked",
+        item.stage_str(),
+        "2_blocked",
         "story stage must be 2_blocked after per-session overrun with max_retries=1"
     );
 }
@@ -471,12 +473,12 @@ max_turns = 10
 
         let item = crate::crdt_state::read_item(story_id).expect("story must be in CRDT");
         assert_eq!(
-            item.retry_count,
-            Some(1),
+            item.retry_count(),
+            1,
             "after session 1, retry_count should be 1 in CRDT"
         );
         assert_ne!(
-            item.stage.as_str(),
+            item.stage_str(),
             "2_blocked",
             "story should NOT be blocked after session 1"
         );
@@ -491,12 +493,12 @@ max_turns = 10
 
         let item = crate::crdt_state::read_item(story_id).expect("story must be in CRDT");
         assert_eq!(
-            item.retry_count,
-            Some(2),
+            item.retry_count(),
+            2,
             "after session 2, retry_count should be 2 in CRDT"
         );
         assert_ne!(
-            item.stage.as_str(),
+            item.stage_str(),
             "2_blocked",
             "story should NOT be blocked after session 2"
         );
@@ -511,15 +513,16 @@ max_turns = 10
 
         let item = crate::crdt_state::read_item(story_id).expect("story must be in CRDT");
         assert_eq!(
-            item.stage, "2_blocked",
+            item.stage_str(),
+            "2_blocked",
             "story must be blocked after session 3 (retry_count=3 >= max_retries=3) — got: {}",
-            item.stage
+            item.stage_str()
         );
         // retry_count resets to 0 on stage transition (Bug 780) — the fact
         // that the story reached 2_blocked proves the retry limit was hit.
         assert_eq!(
-            item.retry_count,
-            Some(0),
+            item.retry_count(),
+            0,
             "retry_count should reset to 0 after stage transition to blocked"
         );
     }

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

@@ -63,7 +63,7 @@ pub(super) fn resolve_qa_mode_from_store(
 ) -> crate::io::story_metadata::QaMode {
     // CRDT register is the authoritative source; check it before the content store.
     if let Some(view) = crate::crdt_state::read_item(story_id)
-        && let Some(ref s) = view.qa_mode
+        && let Some(s) = view.qa_mode()
         && let Some(mode) = crate::io::story_metadata::QaMode::from_str(s)
     {
         return mode;

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

@@ -867,8 +867,8 @@ stage = "coder"
     let item =
         crate::crdt_state::read_item("9950_story_warm_resume").expect("story must be in CRDT");
     assert!(
-        item.retry_count.is_some_and(|rc| rc > 0),
-        "retry_count must be incremented after warm-resume: got {:?}",
-        item.retry_count
+        item.retry_count() > 0,
+        "retry_count must be incremented after warm-resume: got {}",
+        item.retry_count()
     );
 }

server/src/agents/pool/start/spawn.rs

@@ -68,7 +68,7 @@ fn inject_gate_failure_section(args: &mut Vec<String>, gate_output: &str) {
 /// prior failure context, even when session-resuming (story 881).
 pub(super) fn maybe_inject_gate_failure(args: &mut Vec<String>, story_id: &str) {
     let retry_count = crate::crdt_state::read_item(story_id)
-        .and_then(|item| item.retry_count)
+        .map(|item| item.retry_count())
         .unwrap_or(0);
     if retry_count > 0
         && let Some(gate_output) = crate::db::read_content(&format!("{story_id}:gate_output"))
@@ -767,8 +767,7 @@ mod tests {
 
             // retry_count must remain 0 — the abort path never calls bump_retry_count.
             let retry_count = crate::crdt_state::read_item(story_id)
-                .and_then(|item| item.retry_count)
-                .map(|r| r as u32)
+                .map(|item| item.retry_count())
                 .unwrap_or(0);
             assert_eq!(
                 retry_count, 0,

server/src/agents/pool/start/validation.rs

@@ -64,10 +64,10 @@ pub(super) fn read_front_matter_agent(story_id: &str, agent_name: Option<&str>)
     // to legacy YAML parsing for stories whose CRDT entry doesn't yet have
     // the field populated.
     if let Some(view) = crate::crdt_state::read_item(story_id)
-        && let Some(agent) = view.agent.as_ref()
+        && let Some(agent) = view.agent()
         && !agent.is_empty()
     {
-        return Some(agent.clone());
+        return Some(agent.to_string());
     }
     crate::db::read_content(story_id).and_then(|contents| {
         crate::db::yaml_legacy::parse_front_matter(&contents)