huskies: merge 997

server/src/crdt_state/write/migrations.rs

@@ -349,7 +349,6 @@ mod stage_migration_tests {
             None,
             None,
             None,
-            None,
         );
         // Then overwrite the stage register with the raw legacy string,
         // bypassing `db::normalise_stage_str` / `write_item_str`'s mapping.
@@ -373,6 +372,7 @@ mod stage_migration_tests {
                 Stage::Coding {
                     claim: None,
                     plan: PlanState::Missing,
+                    retries: 0,
                 },
             ),
             (
@@ -390,6 +390,7 @@ mod stage_migration_tests {
                     feature_branch: BranchName(String::new()),
                     commits_ahead: NonZeroU32::new(1).unwrap(),
                     claim: None,
+                    retries: 0,
                 },
             ),
             (
@@ -458,12 +459,12 @@ mod stage_migration_tests {
             &Stage::Coding {
                 claim: None,
                 plan: PlanState::Missing,
+                retries: 0,
             },
             Some("Already Clean"),
             None,
             None,
             None,
-            None,
         );
         seed_with_raw_stage("9521_needs_migration", "2_current");