huskies: merge 986

server/src/agents/merge/mod.rs

@@ -39,7 +39,15 @@ pub struct MergeReport {
     pub conflicts_resolved: bool,
     pub conflict_details: Option<String>,
     pub gates_passed: bool,
+    /// Human-readable output from quality gates (display and retry-prompt injection only).
     pub gate_output: String,
+    /// Typed classification of the gate failure, produced at the gate boundary.
+    /// `None` when `gates_passed` is `true` or when there were no gate results.
+    #[serde(default)]
+    pub gate_failure_kind: Option<crate::agents::gates::GateFailureKind>,
+    /// `true` when the feature branch had zero commits ahead of the base branch.
+    #[serde(default)]
+    pub no_commits: bool,
     pub worktree_cleaned_up: bool,
     pub story_archived: bool,
 }
@@ -56,4 +64,9 @@ pub(crate) struct SquashMergeResult {
     /// due to a gate failure; callers can use this to distinguish gate failures
     /// from merge/commit/FF failures in the `MergeReport`.
     pub(crate) gates_passed: bool,
+    /// Typed gate failure kind produced at the gate boundary.  `None` when
+    /// `gates_passed` is `true` or when failure was not from the gate step.
+    pub(crate) gate_failure_kind: Option<crate::agents::gates::GateFailureKind>,
+    /// `true` when the feature branch had zero commits ahead of the base branch.
+    pub(crate) no_commits: bool,
 }