huskies: merge 891

2026-05-12 17:03:41 +00:00
parent b76633b79b
commit 148ce37beb
20 changed files with 418 additions and 262 deletions
@@ -17,7 +17,7 @@ pub(super) async fn tool_merge_agent_work(
    // Check CRDT stage before attempting merge — if already done or archived,
    // return success immediately to avoid spurious error notifications.
    if let Some(item) = crate::crdt_state::read_item(story_id)
-        && crate::pipeline_state::Stage::from_dir(&item.stage).is_some_and(|s| {
+        && crate::pipeline_state::Stage::from_dir(item.stage_str()).is_some_and(|s| {
            matches!(
                s,
                crate::pipeline_state::Stage::Done { .. }
@@ -31,7 +31,7 @@ pub(super) async fn tool_merge_agent_work(
            "success": true,
            "message": format!(
                "Story '{}' is already in '{}' — no merge needed.",
-                story_id, item.stage
+                story_id, item.stage_str()
            ),
        }))
        .map_err(|e| format!("Serialization error: {e}"));