huskies: merge 987

server/src/startup/project.rs

@@ -163,6 +163,8 @@ pub(crate) async fn init_subsystems(app_state: &Arc<SessionState>, cwd: &Path) {
             {
                 worktree::migrate_slug_paths(project_root, &id_migrations);
             }
+            // Story 987: upgrade four-bool MergeJob entries to typed MergeResult enum.
+            crdt_state::migrate_merge_job(db_path);
         }
     }
 }