huskies: merge 864

2026-04-30 22:23:21 +00:00
parent 3911c24c26
commit 61cf7684de
41 changed files with 540 additions and 71 deletions
@@ -83,7 +83,12 @@ impl AgentPool {
                                    &contents,
                                );
                            crate::db::write_content(story_id, &updated);
-                            crate::db::write_item_with_content(story_id, "4_merge", &updated);
+                            crate::db::write_item_with_content(
+                                story_id,
+                                "4_merge",
+                                &updated,
+                                crate::db::ItemMeta::from_yaml(&updated),
+                            );
                        }
                        crate::crdt_state::set_mergemaster_attempted(story_id, true);
                        if let Err(e) = self