huskies: merge 984
This commit is contained in:
@@ -21,6 +21,9 @@ pub(super) async fn tool_merge_agent_work(
|
||||
item.stage(),
|
||||
crate::pipeline_state::Stage::Done { .. }
|
||||
| crate::pipeline_state::Stage::Archived { .. }
|
||||
| crate::pipeline_state::Stage::Abandoned { .. }
|
||||
| crate::pipeline_state::Stage::Superseded { .. }
|
||||
| crate::pipeline_state::Stage::Rejected { .. }
|
||||
)
|
||||
{
|
||||
let stage_name = item.stage().dir_name().to_string();
|
||||
|
||||
@@ -62,6 +62,8 @@ pub struct PipelineState {
|
||||
pub qa: Vec<UpcomingStory>,
|
||||
pub merge: Vec<UpcomingStory>,
|
||||
pub done: Vec<UpcomingStory>,
|
||||
/// Abandoned, superseded, and rejected items (story 984).
|
||||
pub closed: Vec<UpcomingStory>,
|
||||
/// Story IDs that currently have a deterministic merge in progress.
|
||||
pub deterministic_merges_in_flight: Vec<String>,
|
||||
}
|
||||
@@ -101,6 +103,7 @@ pub fn load_pipeline_state(ctx: &AppContext) -> Result<PipelineState, String> {
|
||||
qa: Vec::new(),
|
||||
merge: Vec::new(),
|
||||
done: Vec::new(),
|
||||
closed: Vec::new(),
|
||||
deterministic_merges_in_flight,
|
||||
};
|
||||
|
||||
@@ -179,7 +182,10 @@ pub fn load_pipeline_state(ctx: &AppContext) -> Result<PipelineState, String> {
|
||||
}
|
||||
}
|
||||
Stage::Done { .. } => state.done.push(story),
|
||||
Stage::Archived { .. } => {} // skip archived
|
||||
Stage::Abandoned { .. } | Stage::Superseded { .. } | Stage::Rejected { .. } => {
|
||||
state.closed.push(story)
|
||||
}
|
||||
Stage::Archived { .. } => {} // Completed/MergeFailed/ReviewHeld stay hidden
|
||||
}
|
||||
}
|
||||
|
||||
@@ -189,6 +195,7 @@ pub fn load_pipeline_state(ctx: &AppContext) -> Result<PipelineState, String> {
|
||||
state.qa.sort_by(|a, b| a.story_id.cmp(&b.story_id));
|
||||
state.merge.sort_by(|a, b| a.story_id.cmp(&b.story_id));
|
||||
state.done.sort_by(|a, b| a.story_id.cmp(&b.story_id));
|
||||
state.closed.sort_by(|a, b| a.story_id.cmp(&b.story_id));
|
||||
|
||||
Ok(state)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user