huskies: merge 945

2026-05-13 06:09:34 +00:00
parent 3a8894ea8f
commit 9ce5a8df0c
53 changed files with 497 additions and 654 deletions
@@ -54,8 +54,16 @@ pub(super) async fn tool_approve_qa(args: &Value, ctx: &AppContext) -> Result<St

    let project_root = ctx.services.agents.get_project_root(&ctx.state)?;

-    // Clear review_hold before moving (story 932: CRDT register).
-    crate::crdt_state::set_review_hold(story_id, false);
+    // Clear review_hold before moving (story 945: Stage::ReviewHold variant).
+    if let Ok(Some(item)) = crate::pipeline_state::read_typed(story_id)
+        && matches!(item.stage, crate::pipeline_state::Stage::ReviewHold { .. })
+    {
+        let _ = crate::pipeline_state::apply_transition_str(
+            story_id,
+            crate::pipeline_state::PipelineEvent::ReviewHoldCleared,
+            None,
+        );
+    }

    if is_spike(story_id) {
        // Spikes skip the merge stage entirely: merge the feature branch to master