Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

37.4 KB
Raw Blame
//! State enums for worktree and branch status.
//!
//! These represent various states a worktree or branch can be in relative to
//! the default branch, upstream remote, or git operations in progress.

use worktrunk::git::{InProgressOperation, IntegrationReason};

/// Upstream divergence state relative to remote tracking branch.
///
/// Used only for upstream/remote divergence. Main branch divergence is
/// handled by [`MainState`] which combines divergence with integration states.
///
/// | Variant   | Symbol |
/// |-----------|--------|
/// | None      | (empty) - no remote configured |
/// | InSync    | `\|`   - up-to-date with remote |
/// | Ahead     | `⇡`    - has unpushed commits   |
/// | Behind    | `⇣`    - missing remote commits |
/// | Diverged  | `⇅`    - both ahead and behind  |
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
pub enum Divergence {
    /// No remote tracking branch configured
    #[default]
    None,
    /// In sync with upstream remote
    InSync,
    /// Has commits the remote doesn't have
    Ahead,
    /// Missing commits from the remote
    Behind,
    /// Both ahead and behind the remote
    Diverged,
}

impl Divergence {
    /// Compute divergence state when a remote tracking branch exists.
    ///
    /// Returns `InSync` for 0/0 since we know a remote exists.
    /// For cases where there's no remote, use `Divergence::None` directly.
    pub fn from_counts_with_remote(ahead: usize, behind: usize) -> Self {
        match (ahead, behind) {
            (0, 0) => Self::InSync,
            (_, 0) => Self::Ahead,
            (0, _) => Self::Behind,
            _ => Self::Diverged,
        }
    }

    /// Get the display symbol for this divergence state.
    pub fn symbol(self) -> &'static str {
        match self {
            Self::None => "",
            Self::InSync => "|",
            Self::Ahead => "⇡",
            Self::Behind => "⇣",
            Self::Diverged => "⇅",
        }
    }

    /// Returns styled symbol (dimmed), or None for None variant.
    pub fn styled(self) -> Option<String> {
        use color_print::cformat;
        if self == Self::None {
            None
        } else {
            Some(cformat!("<dim>{}</>", self.symbol()))
        }
    }
}

/// Worktree state indicator
///
/// Shows the "location" state of a worktree or branch:
/// - For worktrees: whether the path matches the template, or has issues
/// - For branches (without worktree): shows / to distinguish from worktrees
///
/// Priority order for worktrees: Prunable > Locked > Detached >
/// DuplicateBranch > BranchWorktreeMismatch
///
/// `DuplicateBranch` and `BranchWorktreeMismatch` share the `⚐` glyph: both
/// say this worktree's place in the branch ⇔ worktree map is irregular, and
/// the table already distinguishes them — a repeated Branch cell is the
/// duplicate, an off-template Path cell the mismatch. The variants stay
/// separate because the JSON `worktree.state` names the cause, where there
/// is no glyph budget to spend.
///
/// `Detached` gets a glyph of its own because nothing else in the row says
/// so: the Branch cell holds a short hash, which reads as a branch named
/// like one until the column tells you otherwise.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
pub enum WorktreeState {
    /// Normal worktree (path matches template, not locked or prunable)
    #[default]
    None,
    /// Branch-worktree mismatch: path doesn't match what the template would generate
    BranchWorktreeMismatch,
    /// The branch is checked out in more than one worktree
    DuplicateBranch,
    /// Detached HEAD: the worktree is on a commit, not a branch
    Detached,
    /// Prunable (worktree directory or its `.git` gone)
    Prunable,
    /// Locked (protected from removal)
    Locked,
    /// Branch indicator (for branches without worktrees)
    Branch,
}

impl std::fmt::Display for WorktreeState {
    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
        match self {
            Self::None => Ok(()),
            Self::BranchWorktreeMismatch | Self::DuplicateBranch => write!(f, "⚐"),
            Self::Detached => write!(f, "⊘"),
            Self::Prunable => write!(f, "⊟"),
            Self::Locked => write!(f, "⊞"),
            Self::Branch => write!(f, "/"),
        }
    }
}

/// Default branch relationship state
///
/// Represents the combined relationship to the default branch in a single position.
/// Uses solid vertical arrows (vs dashed arrows for the Remote column).
///
/// Priority order determines which symbol is shown:
/// 1. IsMain (^) - this IS the main worktree
/// 2. Orphan (∅) - no common ancestor with default branch
/// 3. Empty (_) - same commit as default branch AND clean working tree (safe to delete)
/// 4. Integrated (⊂) - content is in default branch via different history (safe to delete)
/// 5. WouldConflict (✗) - merge-tree simulation shows conflicts AND not already integrated
/// 6. SameCommit (–) - same commit as default branch with uncommitted changes
/// 7. Diverged (↕) - both ahead and behind default branch
/// 8. Ahead (↑) - has commits default branch doesn't have
/// 9. Behind (↓) - missing commits from default branch
///
/// `Empty`/`Integrated` rank above `WouldConflict`: a branch whose content is
/// already in the default branch is safe to delete regardless of whether a
/// naive re-merge would conflict. Such a conflict is vacuous — it happens when
/// the default branch squash-merged the branch and then re-edited the same
/// lines, so resolving it just reproduces the default branch's tree (nothing
/// added). `wt step prune` reaches the same verdict via the same patch-id
/// check, so the list symbol and the prune message agree. (Same rationale as
/// `Orphan` outranking `WouldConflict`: show the root-cause state, not the
/// downstream conflict.)
///
/// The `Integrated` variant carries an [`IntegrationReason`] explaining how the
/// content was integrated.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, strum::IntoStaticStr)]
#[strum(serialize_all = "snake_case")]
pub enum MainState {
    /// Normal working branch (up-to-date with default branch, no special state)
    #[default]
    #[strum(serialize = "")]
    None,
    /// This IS the main worktree
    IsMain,
    /// Merge-tree conflicts with default branch (simulated via git merge-tree)
    WouldConflict,
    /// Branch HEAD is same commit as default branch AND working tree is clean (safe to delete)
    Empty,
    /// Branch HEAD is same commit as default branch but has uncommitted changes
    SameCommit,
    /// Content is integrated into default branch via different history
    #[strum(serialize = "integrated")]
    Integrated(IntegrationReason),
    /// No common ancestor with default branch (orphan branch)
    Orphan,
    /// Both ahead and behind default branch
    Diverged,
    /// Has commits default branch doesn't have
    Ahead,
    /// Missing commits from default branch
    Behind,
}

impl std::fmt::Display for MainState {
    /// Solid vertical arrows for the Main column (vs dashed arrows for the Remote column).
    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
        match self {
            Self::None => Ok(()),
            Self::IsMain => write!(f, "^"),
            Self::WouldConflict => write!(f, "✗"),
            Self::Empty => write!(f, "_"),
            Self::SameCommit => write!(f, "–"), // en-dash U+2013
            Self::Integrated(_) => write!(f, "⊂"),
            Self::Orphan => write!(f, "∅"), // U+2205 empty set
            Self::Diverged => write!(f, "↕"),
            Self::Ahead => write!(f, "↑"),
            Self::Behind => write!(f, "↓"),
        }
    }
}

impl MainState {
    /// Returns styled symbol with appropriate color, or None for None variant.
    ///
    /// Color semantics:
    /// - WARNING (yellow): WouldConflict - potential problem needing attention
    /// - HINT (dimmed): All others - informational states
    pub fn styled(&self) -> Option<String> {
        use color_print::cformat;
        match self {
            Self::None => None,
            Self::WouldConflict => Some(cformat!("<yellow>{self}</>")),
            _ => Some(cformat!("<dim>{self}</>")),
        }
    }

    /// Returns the integration reason if this is an integrated state, None otherwise.
    pub fn integration_reason(&self) -> Option<IntegrationReason> {
        match self {
            Self::Integrated(reason) => Some(*reason),
            _ => None,
        }
    }

    /// Returns the JSON string representation for main_state field.
    pub fn as_json_str(self) -> Option<&'static str> {
        let s: &'static str = self.into();
        if s.is_empty() { None } else { Some(s) }
    }

    /// Compute from divergence counts, integration state, and same-commit-dirty flag.
    ///
    /// Priority: IsMain > Orphan > integration > WouldConflict > SameCommit > Diverged > Ahead > Behind
    ///
    /// Both Orphan and integration take priority over WouldConflict because:
    /// - Each is a more fundamental property (no common ancestor / content
    ///   already in the default branch)
    /// - The merge conflict they imply is expected and not actionable —
    ///   an orphan can't be merged cleanly, and an integrated branch has
    ///   nothing left to merge (its conflict is vacuous)
    /// - Users should see "this is an orphan branch" / "this is integrated
    ///   (safe to delete)" rather than the downstream "this would conflict"
    ///
    /// This function takes every input up front — it's the "all data is
    /// available" path. For the per-gate resolver that walks tiers with
    /// partial data, see [`tier_is_main`], [`tier_orphan`],
    /// [`tier_would_conflict`], [`tier_counts`], and the [`Tier`] helper below.
    pub fn from_integration_and_counts(
        is_main: bool,
        would_conflict: bool,
        integration: Option<MainState>,
        is_same_commit_dirty: bool,
        is_orphan: bool,
        ahead: usize,
        behind: usize,
    ) -> Self {
        if is_main {
            Self::IsMain
        } else if is_orphan {
            Self::Orphan
        } else if let Some(state) = integration {
            state
        } else if would_conflict {
            Self::WouldConflict
        } else if is_same_commit_dirty {
            Self::SameCommit
        } else {
            match (ahead, behind) {
                (0, 0) => Self::None,
                (_, 0) => Self::Ahead,
                (0, _) => Self::Behind,
                _ => Self::Diverged,
            }
        }
    }
}

/// Result of attempting to resolve a single tier of the main_state priority
/// chain with partial data.
///
/// The main-state gate (`refresh_status_symbols` gate 3) walks tiers in
/// priority order. Each tier returns one of:
///
/// - [`Tier::Fired`] — this tier's signal is both known and positive; use
///   the carried value and ignore lower-priority tiers.
/// - [`Tier::RuledOut`] — this tier's signal is known to be negative; move
///   on to the next (lower-priority) tier.
/// - [`Tier::Wait`] — this tier's signal is not yet loaded; we cannot
///   safely fall through to a lower tier because a later drain tick might
///   still produce a higher-priority answer. Stop and return `None` from
///   the gate resolver so the cell renders `·`.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Tier<T> {
    /// Tier signal is known and positive — short-circuit with this value.
    Fired(T),
    /// Tier signal is known and negative — fall through to the next tier.
    RuledOut,
    /// Tier signal not yet loaded — the gate must wait.
    Wait,
}

/// Tier 1: `IsMain`. Resolves immediately since `is_main` is metadata.
///
/// Returns `Fired(IsMain)` for main worktrees, `RuledOut` otherwise.
pub fn tier_is_main(is_main: bool) -> Tier<MainState> {
    if is_main {
        Tier::Fired(MainState::IsMain)
    } else {
        Tier::RuledOut
    }
}

/// Tier 2: `Orphan`. Requires `is_orphan` to be loaded.
///
/// Orphan branches have no common ancestor with the default branch, so
/// every lower-priority signal (ahead/behind, integration, conflict) is
/// meaningless for them. Once we know `is_orphan == Some(true)`, the gate
/// short-circuits without needing anything else.
pub fn tier_orphan(is_orphan: Option<bool>) -> Tier<MainState> {
    match is_orphan {
        Some(true) => Tier::Fired(MainState::Orphan),
        Some(false) => Tier::RuledOut,
        None => Tier::Wait,
    }
}

/// Tier 4: `WouldConflict`. Runs *after* the integration tier, because a
/// merge-tree conflict only means `✗` for a branch that isn't already
/// integrated into the default branch.
///
/// `has_merge_tree_conflicts` is the committed-HEAD probe (from
/// `MergeTreeConflicts`). `has_working_tree_conflicts` is the tracked-tree
/// probe (from `WorkingTreeConflicts`), with a nested Option: outer `None`
/// = task not run, `Some(None)` = task ran but has no tracked result (fall back
/// to the HEAD probe), `Some(Some(b))` = tracked-tree result.
///
/// **The working-tree probe is authoritative when present.** Its tree includes
/// HEAD's content plus staged and unstaged tracked changes, so its merge-tree
/// result reflects the tracked working state better than the HEAD-only probe.
/// When `has_working_tree_conflicts` is
/// `Some(Some(b))`, fire/rule out on `b` and ignore the HEAD probe.
/// The merge-tree conflict task skips its merge-tree call in that case to
/// avoid a redundant subprocess (returning a sentinel `false` that this
/// gate ignores).
///
/// **The conflict verdict (from the two probes):**
/// - `has_working_tree_conflicts == Some(Some(true))` → conflict.
/// - `has_working_tree_conflicts == Some(Some(false))` → no conflict.
/// - Otherwise consult the HEAD probe:
///   - `Some(true)` → conflict.
///   - `Some(false)` and working-tree probe loaded (`Some(None)`, i.e.,
///     clean or unmerged) → no conflict.
///   - `Some(false)` and working-tree probe still `None` → unknown (the
///     working-tree probe could still flip us).
///   - `None` → unknown.
///
/// **Then the integration gate:** a conflict fires `✗` only once
/// `integration_resolved` is true (the integration verdict is final and
/// negative — a positive verdict already fired `⊂`/`_` in the earlier
/// tier). While the verdict is still pending, a detected conflict holds at
/// `Wait` rather than flashing `✗` for a branch that may settle to `⊂`.
/// No conflict rules out; an unknown conflict waits.
pub fn tier_would_conflict(
    has_merge_tree_conflicts: Option<bool>,
    has_working_tree_conflicts: Option<Option<bool>>,
    integration_resolved: bool,
) -> Tier<MainState> {
    use Tier::*;
    let conflict = match (has_merge_tree_conflicts, has_working_tree_conflicts) {
        // Working-tree probe is authoritative when it reports a dirty result.
        (_, Some(Some(true))) => Some(true),
        (_, Some(Some(false))) => Some(false),
        // Otherwise consult HEAD probe.
        (Some(true), _) => Some(true),
        (Some(false), Some(None)) => Some(false),
        // HEAD says "no conflict" but WT hasn't reported — unknown.
        (Some(false), None) => None,
        (None, _) => None,
    };
    match conflict {
        // A conflict is only `✗` for a branch that isn't already integrated.
        // Hold until the integration verdict is final so we never flash `✗`
        // for a branch that will settle to `⊂`.
        Some(true) if integration_resolved => Fired(MainState::WouldConflict),
        Some(true) => Wait,
        Some(false) => RuledOut,
        None => Wait,
    }
}

/// Tiers 5–6: same-commit-dirty / counts-based fallback.
///
/// Reached once tiers 1–4 have been ruled out (not main, not orphan, not
/// integrated, no un-integrated conflict). The gate needs `counts` and
/// `is_clean`. Integration is resolved in the earlier integration tier, so
/// this delegates to [`MainState::from_integration_and_counts`] with
/// `is_main = false`, `would_conflict = false`, `integration = None`,
/// `is_orphan = false` (callers enforce those invariants via the earlier
/// tiers).
///
/// Returns:
/// - `Fired(state)` if `counts` and `is_clean` are both known. (`state`
///   may be `MainState::None` when there's nothing to display, which
///   callers should still treat as a resolved gate.)
/// - `Wait` if either `counts` or `is_clean` is still loading.
pub fn tier_counts(
    counts: Option<super::stats::AheadBehind>,
    is_clean: Option<bool>,
) -> Tier<MainState> {
    let Some(counts) = counts else {
        return Tier::Wait;
    };
    let Some(is_clean) = is_clean else {
        return Tier::Wait;
    };
    // is_same_commit_dirty requires counts and !is_clean.
    let is_same_commit_dirty = !is_clean && counts.ahead == 0 && counts.behind == 0;
    Tier::Fired(MainState::from_integration_and_counts(
        false, // is_main — tier 1 ruled this out
        false, // would_conflict — tier 4 ruled this out
        None,  // integration — resolved in the integration tier
        is_same_commit_dirty,
        false, // is_orphan — tier 2 ruled this out
        counts.ahead,
        counts.behind,
    ))
}

/// Worktree operation state
///
/// Represents blocking git operations in progress that require resolution.
/// These take priority over all other states in the Worktree column.
///
/// Priority: Conflicts (✘) > InProgress (↻)
///
/// Every in-progress operation renders the same symbol. What the reader does
/// about a stopped rebase, merge, cherry-pick, revert, or bisect is identical —
/// run `git status`, then finish or abort it — so splitting the column across a
/// glyph per operation asked the reader to distinguish states that lead to the
/// same next step, and left the operations without a glyph invisible. The
/// operation's identity is still carried, for `--format=json` to name.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
pub enum OperationState {
    /// No operation in progress
    #[default]
    None,
    /// Actual merge conflicts (unmerged paths in working tree)
    Conflicts,
    /// Git is partway through an operation of its own.
    InProgress(InProgressOperation),
}

impl std::fmt::Display for OperationState {
    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
        match self {
            Self::None => Ok(()),
            Self::Conflicts => write!(f, "✘"),
            Self::InProgress(_) => write!(f, "↻"),
        }
    }
}

impl OperationState {
    /// Returns styled symbol with appropriate color, or None for None variant.
    ///
    /// Color semantics:
    /// - ERROR (red): Conflicts - blocking problems
    /// - WARNING (yellow): InProgress - active/stuck states
    pub fn styled(&self) -> Option<String> {
        use color_print::cformat;
        match self {
            Self::None => None,
            Self::Conflicts => Some(cformat!("<red>{self}</>")),
            Self::InProgress(_) => Some(cformat!("<yellow>{self}</>")),
        }
    }

    /// Returns the JSON string representation.
    ///
    /// The symbol collapses every operation into one glyph; JSON keeps the
    /// operation's own name, so a consumer can still tell a stopped bisect from
    /// a stopped rebase.
    pub fn as_json_str(self) -> Option<&'static str> {
        match self {
            Self::None => None,
            Self::Conflicts => Some("conflicts"),
            Self::InProgress(operation) => Some(operation.into()),
        }
    }
}

#[cfg(test)]
mod tests {
    use super::*;

    // ============================================================================
    // Divergence Tests
    // ============================================================================

    #[test]
    fn test_divergence_from_counts_with_remote() {
        assert_eq!(
            Divergence::from_counts_with_remote(0, 0),
            Divergence::InSync
        );
        assert_eq!(Divergence::from_counts_with_remote(5, 0), Divergence::Ahead);
        assert_eq!(
            Divergence::from_counts_with_remote(0, 3),
            Divergence::Behind
        );
        assert_eq!(
            Divergence::from_counts_with_remote(5, 3),
            Divergence::Diverged
        );
    }

    #[test]
    fn test_divergence_symbol() {
        assert_eq!(Divergence::None.symbol(), "");
        assert_eq!(Divergence::InSync.symbol(), "|");
        assert_eq!(Divergence::Ahead.symbol(), "⇡");
        assert_eq!(Divergence::Behind.symbol(), "⇣");
        assert_eq!(Divergence::Diverged.symbol(), "⇅");
    }

    #[test]
    fn test_divergence_styled() {
        use insta::assert_snapshot;
        assert!(Divergence::None.styled().is_none());
        assert_snapshot!(Divergence::InSync.styled().unwrap(), @"|");
        assert_snapshot!(Divergence::Ahead.styled().unwrap(), @"⇡");
        assert_snapshot!(Divergence::Behind.styled().unwrap(), @"⇣");
        assert_snapshot!(Divergence::Diverged.styled().unwrap(), @"⇅");
    }

    // ============================================================================
    // WorktreeState Tests
    // ============================================================================

    #[test]
    fn test_worktree_state_display() {
        assert_eq!(format!("{}", WorktreeState::None), "");
        assert_eq!(format!("{}", WorktreeState::BranchWorktreeMismatch), "⚐");
        // Shares the mismatch glyph; the JSON state names which cause it was.
        assert_eq!(format!("{}", WorktreeState::DuplicateBranch), "⚐");
        // Its own glyph: the Branch cell holds a short hash, which reads as a
        // branch named like one until this column says otherwise.
        assert_eq!(format!("{}", WorktreeState::Detached), "⊘");
        assert_eq!(format!("{}", WorktreeState::Prunable), "⊟");
        assert_eq!(format!("{}", WorktreeState::Locked), "⊞");
        assert_eq!(format!("{}", WorktreeState::Branch), "/");
    }

    // ============================================================================
    // MainState Tests
    // ============================================================================

    #[test]
    fn test_main_state_display() {
        assert_eq!(format!("{}", MainState::None), "");
        assert_eq!(format!("{}", MainState::IsMain), "^");
        assert_eq!(format!("{}", MainState::WouldConflict), "✗");
        assert_eq!(format!("{}", MainState::Empty), "_");
        assert_eq!(format!("{}", MainState::SameCommit), "–"); // en-dash
        assert_eq!(
            format!("{}", MainState::Integrated(IntegrationReason::Ancestor)),
            "⊂"
        );
        assert_eq!(format!("{}", MainState::Orphan), "∅"); // empty set
        assert_eq!(format!("{}", MainState::Diverged), "↕");
        assert_eq!(format!("{}", MainState::Ahead), "↑");
        assert_eq!(format!("{}", MainState::Behind), "↓");
    }

    #[test]
    fn test_main_state_styled() {
        use insta::assert_snapshot;
        assert!(MainState::None.styled().is_none());
        assert_snapshot!(MainState::WouldConflict.styled().unwrap(), @"✗");
        assert_snapshot!(MainState::IsMain.styled().unwrap(), @"^");
        assert_snapshot!(MainState::Ahead.styled().unwrap(), @"↑");
        assert_snapshot!(MainState::Orphan.styled().unwrap(), @"∅");
    }

    #[test]
    fn test_main_state_as_json_str() {
        assert_eq!(MainState::None.as_json_str(), None);
        assert_eq!(MainState::IsMain.as_json_str(), Some("is_main"));
        assert_eq!(
            MainState::WouldConflict.as_json_str(),
            Some("would_conflict")
        );
        assert_eq!(MainState::Empty.as_json_str(), Some("empty"));
        assert_eq!(MainState::SameCommit.as_json_str(), Some("same_commit"));
        assert_eq!(
            MainState::Integrated(IntegrationReason::TreesMatch).as_json_str(),
            Some("integrated")
        );
        assert_eq!(MainState::Diverged.as_json_str(), Some("diverged"));
        assert_eq!(MainState::Ahead.as_json_str(), Some("ahead"));
        assert_eq!(MainState::Behind.as_json_str(), Some("behind"));
    }

    #[test]
    fn test_integration_reason_into_static_str() {
        let s: &'static str = IntegrationReason::SameCommit.into();
        assert_eq!(s, "same-commit");
        let s: &'static str = IntegrationReason::Ancestor.into();
        assert_eq!(s, "ancestor");
        let s: &'static str = IntegrationReason::TreesMatch.into();
        assert_eq!(s, "trees-match");
        let s: &'static str = IntegrationReason::NoAddedChanges.into();
        assert_eq!(s, "no-added-changes");
        let s: &'static str = IntegrationReason::MergeAddsNothing.into();
        assert_eq!(s, "merge-adds-nothing");
        let s: &'static str = IntegrationReason::PatchIdMatch.into();
        assert_eq!(s, "patch-id-match");
    }

    #[test]
    fn test_main_state_integration_reason() {
        // Non-integrated states return None
        assert_eq!(MainState::None.integration_reason(), None);
        assert_eq!(MainState::IsMain.integration_reason(), None);
        assert_eq!(MainState::WouldConflict.integration_reason(), None);
        assert_eq!(MainState::Empty.integration_reason(), None);
        assert_eq!(MainState::SameCommit.integration_reason(), None);
        assert_eq!(MainState::Diverged.integration_reason(), None);
        assert_eq!(MainState::Ahead.integration_reason(), None);
        assert_eq!(MainState::Behind.integration_reason(), None);

        // Integrated states return the reason
        assert_eq!(
            MainState::Integrated(IntegrationReason::Ancestor).integration_reason(),
            Some(IntegrationReason::Ancestor)
        );
        assert_eq!(
            MainState::Integrated(IntegrationReason::TreesMatch).integration_reason(),
            Some(IntegrationReason::TreesMatch)
        );
        assert_eq!(
            MainState::Integrated(IntegrationReason::NoAddedChanges).integration_reason(),
            Some(IntegrationReason::NoAddedChanges)
        );
        assert_eq!(
            MainState::Integrated(IntegrationReason::MergeAddsNothing).integration_reason(),
            Some(IntegrationReason::MergeAddsNothing)
        );
        assert_eq!(
            MainState::Integrated(IntegrationReason::PatchIdMatch).integration_reason(),
            Some(IntegrationReason::PatchIdMatch)
        );
    }

    #[test]
    fn test_main_state_from_integration_and_counts() {
        // IsMain takes priority
        assert!(matches!(
            MainState::from_integration_and_counts(true, false, None, false, false, 5, 3),
            MainState::IsMain
        ));

        // Orphan takes priority over WouldConflict (orphan is root cause)
        assert!(matches!(
            MainState::from_integration_and_counts(false, true, None, false, true, 0, 0),
            MainState::Orphan
        ));

        // WouldConflict when not orphan and not integrated
        assert!(matches!(
            MainState::from_integration_and_counts(false, true, None, false, false, 5, 3),
            MainState::WouldConflict
        ));

        // Integration outranks WouldConflict: a branch whose content is
        // already in the default branch shows ⊂, not ✗, even though a naive
        // re-merge would conflict (the conflict is vacuous). This is the
        // squash-merged-then-base-moved-on case.
        assert!(matches!(
            MainState::from_integration_and_counts(
                false, // is_main
                true,  // would_conflict
                Some(MainState::Integrated(IntegrationReason::PatchIdMatch)),
                false, // is_same_commit_dirty
                false, // is_orphan
                1,
                11,
            ),
            MainState::Integrated(IntegrationReason::PatchIdMatch)
        ));

        // Empty (same commit, clean) also outranks WouldConflict.
        assert!(matches!(
            MainState::from_integration_and_counts(
                false,
                true,
                Some(MainState::Empty),
                false,
                false,
                0,
                0
            ),
            MainState::Empty
        ));

        // Empty (passed as integration state - same commit with clean working tree)
        assert!(matches!(
            MainState::from_integration_and_counts(
                false,
                false,
                Some(MainState::Empty),
                false,
                false,
                0,
                0
            ),
            MainState::Empty
        ));

        // Integrated (passed as integration state)
        assert!(matches!(
            MainState::from_integration_and_counts(
                false,
                false,
                Some(MainState::Integrated(IntegrationReason::Ancestor)),
                false,
                false,
                0,
                5
            ),
            MainState::Integrated(IntegrationReason::Ancestor)
        ));

        // SameCommit (via is_same_commit_dirty flag, NOT integration)
        assert!(matches!(
            MainState::from_integration_and_counts(false, false, None, true, false, 0, 0),
            MainState::SameCommit
        ));

        // Orphan (no common ancestor with default branch)
        assert!(matches!(
            MainState::from_integration_and_counts(false, false, None, false, true, 0, 0),
            MainState::Orphan
        ));

        // Diverged (both ahead and behind)
        assert!(matches!(
            MainState::from_integration_and_counts(false, false, None, false, false, 3, 2),
            MainState::Diverged
        ));

        // Ahead only
        assert!(matches!(
            MainState::from_integration_and_counts(false, false, None, false, false, 3, 0),
            MainState::Ahead
        ));

        // Behind only
        assert!(matches!(
            MainState::from_integration_and_counts(false, false, None, false, false, 0, 2),
            MainState::Behind
        ));

        // None (in sync)
        assert!(matches!(
            MainState::from_integration_and_counts(false, false, None, false, false, 0, 0),
            MainState::None
        ));
    }

    // ============================================================================
    // MainState Tier Tests (per-gate resolution with partial data)
    // ============================================================================

    #[test]
    fn test_tier_is_main() {
        assert_eq!(tier_is_main(true), Tier::Fired(MainState::IsMain));
        assert_eq!(tier_is_main(false), Tier::RuledOut);
    }

    #[test]
    fn test_tier_orphan() {
        assert_eq!(tier_orphan(Some(true)), Tier::Fired(MainState::Orphan));
        assert_eq!(tier_orphan(Some(false)), Tier::RuledOut);
        assert_eq!(tier_orphan(None), Tier::Wait);
    }

    #[test]
    fn test_tier_would_conflict() {
        // The integration verdict is resolved-negative (`true`) in these
        // cases, so the conflict verdict alone decides the tier — the
        // historical contract for the two probes is unchanged.

        // HEAD probe says conflict → fire, even if working-tree probe
        // hasn't reported.
        assert_eq!(
            tier_would_conflict(Some(true), None, true),
            Tier::Fired(MainState::WouldConflict)
        );
        // Working-tree probe says dirty conflict → fire, even if HEAD
        // probe hasn't reported.
        assert_eq!(
            tier_would_conflict(None, Some(Some(true)), true),
            Tier::Fired(MainState::WouldConflict)
        );
        // Both probes report "no conflict" (HEAD: Some(false), WT:
        // Some(None) meaning "working tree is clean, no dirty-tree
        // result") → rule out.
        assert_eq!(
            tier_would_conflict(Some(false), Some(None), true),
            Tier::RuledOut
        );
        // WT probe reports a clean dirty-tree result (Some(Some(false)))
        // → rule out, regardless of HEAD probe.
        assert_eq!(
            tier_would_conflict(Some(false), Some(Some(false)), true),
            Tier::RuledOut
        );
        // WT probe is authoritative: rule out even when HEAD probe was
        // skipped (None) because the merge-tree conflict task deferred to it.
        assert_eq!(
            tier_would_conflict(None, Some(Some(false)), true),
            Tier::RuledOut
        );
        // WT probe is authoritative: fire even when HEAD probe says no
        // conflict (the dirty tree's merge result wins).
        assert_eq!(
            tier_would_conflict(Some(false), Some(Some(true)), true),
            Tier::Fired(MainState::WouldConflict)
        );
        // WT probe is authoritative: rule out even when HEAD probe says
        // "would conflict" (uncommitted changes resolve it). This
        // combination shouldn't arise in production — the
        // merge-tree conflict task's skip-when-dirty path keeps HEAD as a
        // sentinel `false` whenever WT is `Some(Some(_))` — but pin the
        // contract so a future refactor that reorders the matches
        // doesn't silently regress.
        assert_eq!(
            tier_would_conflict(Some(true), Some(Some(false)), true),
            Tier::RuledOut
        );
        // HEAD probe hasn't reported → wait (could flip us to conflict).
        assert_eq!(tier_would_conflict(None, None, true), Tier::Wait);
        assert_eq!(tier_would_conflict(None, Some(None), true), Tier::Wait);
        // HEAD probe says "no conflict" but WT probe hasn't reported →
        // wait (WT could still flip us).
        assert_eq!(tier_would_conflict(Some(false), None, true), Tier::Wait);

        // Integration gate: a detected conflict holds at Wait until the
        // integration verdict is final, so an integrated-but-stale branch
        // never flashes ✗ before tier 3 settles it to ⊂.
        assert_eq!(tier_would_conflict(Some(true), None, false), Tier::Wait);
        assert_eq!(
            tier_would_conflict(None, Some(Some(true)), false),
            Tier::Wait
        );
        // The integration gate doesn't change a "no conflict" or "unknown"
        // verdict — only a detected conflict is held.
        assert_eq!(
            tier_would_conflict(Some(false), Some(None), false),
            Tier::RuledOut
        );
        assert_eq!(tier_would_conflict(None, None, false), Tier::Wait);
    }

    #[test]
    fn test_tier_counts() {
        use super::super::stats::AheadBehind;

        // counts missing → wait
        assert_eq!(tier_counts(None, Some(true)), Tier::Wait);

        // is_clean missing → wait
        assert_eq!(
            tier_counts(
                Some(AheadBehind {
                    ahead: 0,
                    behind: 0
                }),
                None,
            ),
            Tier::Wait
        );

        // in-sync clean → Fired(None)
        assert_eq!(
            tier_counts(
                Some(AheadBehind {
                    ahead: 0,
                    behind: 0
                }),
                Some(true),
            ),
            Tier::Fired(MainState::None)
        );

        // in-sync dirty → SameCommit
        assert_eq!(
            tier_counts(
                Some(AheadBehind {
                    ahead: 0,
                    behind: 0
                }),
                Some(false),
            ),
            Tier::Fired(MainState::SameCommit)
        );

        // Ahead only
        assert_eq!(
            tier_counts(
                Some(AheadBehind {
                    ahead: 3,
                    behind: 0
                }),
                Some(true),
            ),
            Tier::Fired(MainState::Ahead)
        );

        // Diverged
        assert_eq!(
            tier_counts(
                Some(AheadBehind {
                    ahead: 3,
                    behind: 2
                }),
                Some(true),
            ),
            Tier::Fired(MainState::Diverged)
        );
    }

    // ============================================================================
    // OperationState Tests
    // ============================================================================

    #[test]
    fn test_operation_state_display() {
        assert_eq!(format!("{}", OperationState::None), "");
        assert_eq!(format!("{}", OperationState::Conflicts), "✘");
        // Every operation renders the same glyph.
        for operation in [
            InProgressOperation::Rebase,
            InProgressOperation::Merge,
            InProgressOperation::CherryPick,
            InProgressOperation::Revert,
            InProgressOperation::Bisect,
        ] {
            assert_eq!(format!("{}", OperationState::InProgress(operation)), "↻");
        }
    }

    #[test]
    fn test_operation_state_styled() {
        use insta::assert_snapshot;
        assert!(OperationState::None.styled().is_none());
        assert_snapshot!(OperationState::Conflicts.styled().unwrap(), @"✘");
        assert_snapshot!(
            OperationState::InProgress(InProgressOperation::Rebase)
                .styled()
                .unwrap(),
            @"↻"
        );
    }

    #[test]
    fn test_operation_state_as_json_str() {
        assert_eq!(OperationState::None.as_json_str(), None);
        assert_eq!(OperationState::Conflicts.as_json_str(), Some("conflicts"));
        // The symbol is shared; the JSON name is not.
        assert_eq!(
            OperationState::InProgress(InProgressOperation::Rebase).as_json_str(),
            Some("rebase")
        );
        assert_eq!(
            OperationState::InProgress(InProgressOperation::CherryPick).as_json_str(),
            Some("cherry_pick")
        );
        assert_eq!(
            OperationState::InProgress(InProgressOperation::Bisect).as_json_str(),
            Some("bisect")
        );
    }
}