huskies: merge 671_refactor_migrate_pipeline_state_consumers_from_string_comparisons_to_typed_pipelinestage_enum

server/src/agents/pool/pipeline/advance/mod.rs

@@ -342,17 +342,21 @@ impl AgentPool {
                 // has already reached done or archived (e.g. a previous mergemaster
                 // succeeded), this advance is a zombie — skip it entirely to avoid
                 // phantom notifications and redundant post-merge test runs.
-                if let Ok(Some(typed_item)) = crate::pipeline_state::read_typed(story_id) {
+                if let Ok(Some(typed_item)) = crate::pipeline_state::read_typed(story_id)
+                    && matches!(
+                        typed_item.stage,
+                        crate::pipeline_state::Stage::Done { .. }
+                            | crate::pipeline_state::Stage::Archived { .. }
+                    )
+                {
                     let current_dir = typed_item.stage.dir_name();
-                    if current_dir == "5_done" || current_dir == "6_archived" {
-                        slog!(
-                            "[pipeline] Skipping stale mergemaster advance for '{story_id}': \
-                             story is already in work/{current_dir}/"
-                        );
-                        // Skip pipeline advancement — do not run post-merge tests,
-                        // do not emit notifications, do not restart agents.
-                        return;
-                    }
+                    slog!(
+                        "[pipeline] Skipping stale mergemaster advance for '{story_id}': \
+                         story is already in work/{current_dir}/"
+                    );
+                    // Skip pipeline advancement — do not run post-merge tests,
+                    // do not emit notifications, do not restart agents.
+                    return;
                 }
 
                 // Block advancement if the mergemaster explicitly reported a failure.