huskies: merge 873

2026-04-29 16:05:54 +00:00
parent cf35027b5a
commit 8a7e1aa036
6 changed files with 104 additions and 1 deletions
@@ -85,6 +85,7 @@ impl AgentPool {
                            crate::db::write_content(story_id, &updated);
                            crate::db::write_item_with_content(story_id, "4_merge", &updated);
                        }
+                        crate::crdt_state::set_mergemaster_attempted(story_id, true);
                        if let Err(e) = self
                            .start_agent(project_root, story_id, Some(&agent_name), None, None)
                            .await