konoma 0.26.5

// Fetching git status (FR-7). The data source for coloring each tree row's M/A/U/deleted, etc.
// Even without the `git` feature (on by default), `statuses()` returns an empty map, so everything
// besides the feature itself keeps working.
//
// Spec: fetch the whole repository's status at once, into a (absolute path → kind) map.
// A directory reflects the most important change among its descendants, folded in (rollup).

use std::collections::{HashMap, HashSet};
use std::path::{Path, PathBuf};

use ratatui::style::Color;

/// Test-only counter of actual `statuses()` invocations, so a speed guard can assert the per-workdir
/// status cache reuses the result across `h`/`l` instead of re-scanning the whole worktree.
/// Only the `git`-feature `statuses` increments it and the guard is `git`-gated, so scope it to both.
#[cfg(all(test, feature = "git"))]
pub static STATUS_CALLS: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0);

#[cfg(feature = "git")]
thread_local! {
    /// Whether git integration (`[external] git`) is allowed to run **on this thread**. Deliberately
    /// thread-local rather than a process-wide global: `App::new` sets it once for the thread that
    /// constructs the App (production's single main thread, or — in tests — each test's own thread,
    /// since the default test harness runs every `#[test]` on a fresh thread). That keeps concurrently
    /// running tests from ever observing each other's `external.git = false` (a shared `AtomicBool`
    /// toggled per-test caused exactly this kind of flake before — see `STATUS_CALLS`'s history/memory
    /// `git-watch-feedback-loop-perf`). The two places that hop to a **new** background thread
    /// (`spawn_or_sync_statuses`/`spawn_or_sync_ignored` in `app/bookmark_actions.rs`) only ever spawn
    /// when `workdir()` — itself gated below — returned `Some`, i.e. only when this was already `true`,
    /// so the spawned thread's default value (`true`) is already correct without extra propagation.
    static EXTERNAL_GIT_ENABLED: std::cell::Cell<bool> = const { std::cell::Cell::new(true) };
}

/// Enable/disable git integration on the current thread (config `[external] git`). Called once by
/// `App::new`. When disabled, every function below returns exactly the value it would return with the
/// `git` feature compiled out (empty map/set/Vec, `None`, or `Err`) — downstream code already treats
/// that as "not a repo" and degrades safely (flash, no colors, etc.), so nothing else needs to change.
#[cfg(feature = "git")]
pub fn set_external_git_enabled(enabled: bool) {
    EXTERNAL_GIT_ENABLED.with(|c| c.set(enabled));
}

/// Whether git integration is enabled on the current thread: the config allows it **and** a git
/// executable exists on this machine. Defaults to `true` (matches every existing test/binary that
/// never calls `set_external_git_enabled`) as long as `git --version` succeeds.
#[cfg(feature = "git")]
pub fn external_git_enabled() -> bool {
    EXTERNAL_GIT_ENABLED.with(|c| c.get()) && git_binary_available()
}

/// Probe result of `git --version`, cached process-wide. Unlike the config flag above this cannot
/// differ per thread (the machine either has git or it does not), so a `OnceLock` is right here.
#[cfg(feature = "git")]
static GIT_BINARY_AVAILABLE: std::sync::OnceLock<bool> = std::sync::OnceLock::new();

#[cfg(all(test, feature = "git"))]
thread_local! {
    /// Test-only override of the probe. A `OnceLock` cannot be reset, so tests that need to simulate
    /// "this machine has no git" set this instead. Thread-local for the same reason as
    /// `EXTERNAL_GIT_ENABLED`: parallel tests must never observe each other's override.
    static GIT_BINARY_AVAILABLE_OVERRIDE: std::cell::Cell<Option<bool>> =
        const { std::cell::Cell::new(None) };
}

/// Force `git_binary_available()` to a value on the current thread (`None` = probe for real).
/// Tests must reset it to `None` when done.
#[cfg(all(test, feature = "git"))]
pub fn set_git_binary_available_for_test(v: Option<bool>) {
    GIT_BINARY_AVAILABLE_OVERRIDE.with(|c| c.set(v));
}

/// Whether a usable `git` executable exists on this machine (`git --version` succeeds).
///
/// Probed **once, lazily** — on first use rather than at startup. konoma only shells out to git
/// inside a repository (repository discovery itself is in-process libgit2), and on macOS without the
/// Xcode Command Line Tools `/usr/bin/git` is a stub whose invocation pops a system "install the
/// developer tools" dialog; probing eagerly would raise that dialog for users who merely opened a
/// directory that is not a repository.
#[cfg(feature = "git")]
pub fn git_binary_available() -> bool {
    #[cfg(test)]
    if let Some(v) = GIT_BINARY_AVAILABLE_OVERRIDE.with(|c| c.get()) {
        return v;
    }
    *GIT_BINARY_AVAILABLE.get_or_init(|| {
        // Discard stdin/stdout/stderr entirely: don't let the version string dirty the TUI's raw
        // mode screen.
        std::process::Command::new("git")
            .arg("--version")
            .stdin(std::process::Stdio::null())
            .stdout(std::process::Stdio::null())
            .stderr(std::process::Stdio::null())
            .status()
            .map(|s| s.success())
            .unwrap_or(false) // the executable is missing / no execute permission
    })
}

/// Git status of a single file (or a directory rollup).
/// When the `git` feature is disabled the status is always empty, so no variant is ever constructed (warning suppressed).
#[cfg_attr(not(feature = "git"), allow(dead_code))]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum FileStatus {
    Modified,
    Added,
    Untracked,
    Deleted,
    Renamed,
    TypeChange,
    Conflicted,
}

impl FileStatus {
    /// Single-character marker shown at the start of the line.
    pub fn marker(self) -> char {
        match self {
            FileStatus::Modified => 'M',
            FileStatus::Added => 'A',
            FileStatus::Untracked => 'U',
            FileStatus::Deleted => 'D',
            FileStatus::Renamed => 'R',
            FileStatus::TypeChange => 'T',
            FileStatus::Conflicted => '!',
        }
    }

    /// Status color (color = meaning).
    pub fn color(self) -> Color {
        match self {
            FileStatus::Modified => Color::Yellow,
            FileStatus::Added => Color::Green, // added (staged) = green
            FileStatus::Untracked => Color::LightGreen, // untracked = a lighter green (distinct from Added)
            FileStatus::Deleted => Color::Red,
            FileStatus::Renamed => Color::Cyan,
            FileStatus::TypeChange => Color::Yellow,
            FileStatus::Conflicted => Color::LightRed,
        }
    }

    /// Priority when rolling up into a directory (higher = more important = represented by that color).
    #[cfg_attr(not(feature = "git"), allow(dead_code))]
    fn rank(self) -> u8 {
        match self {
            FileStatus::Conflicted => 6,
            FileStatus::Deleted => 5,
            FileStatus::Modified => 4,
            FileStatus::Renamed => 3,
            FileStatus::Added => 2,
            FileStatus::TypeChange => 1,
            FileStatus::Untracked => 0,
        }
    }
}

/// Resolves `path` to the form the filesystem actually has on disk, so a status-map key matches
/// the tree side (`build_dir` reads paths straight off `readdir`, never normalized).
///
/// **Why this is needed only on macOS**: APFS is normalization-*preserving* but lookup is
/// normalization-*insensitive* — a file can be *found* by either the NFC or NFD spelling of its
/// name, but the bytes actually *stored* on disk are whatever the file was created with (verified
/// empirically: creating a name from raw NFC bytes leaves NFC on disk — this is not a blanket
/// "APFS always stores NFD" rule). Decomposed (NFD) names are still common in practice, though,
/// because git on macOS defaults `core.precomposeunicode` to true: it **writes worktree files in
/// NFD** and then **recomposes to NFC when reporting** `git status` paths — so a single file's
/// on-disk name (NFD) and its `git status --porcelain` name (NFC, the input to this function) can
/// disagree.
///
/// `fs::canonicalize` resolves through the filesystem (a `realpath(3)` call) and returns whatever
/// form is actually stored on disk, regardless of which form was used to query it — that is
/// exactly the value the tree side already has, making this the *correct* fix rather than a
/// convenient one: a fixed NFC→NFD string conversion would be wrong for a file that (as
/// demonstrated above) is genuinely stored in NFC.
///
/// A deleted path no longer exists, so canonicalize fails there; falling back to the original path
/// is harmless because there is no tree entry to match it against anyway.
///
/// Linux filesystems don't do any of this (byte sequences round-trip exactly, and
/// `core.precomposeunicode` defaults to false there), so the extra `realpath` syscall per changed
/// file would be pure overhead with no correctness benefit — gated to macOS only.
///
/// Also skips the syscall for an all-ASCII path: NFC and NFD normalization are the identity
/// transform on ASCII text (there is nothing to (de)compose), so canonicalizing one can never
/// change it, only cost a `realpath` call — worth avoiding on a repository with a large changed
/// set, which is exactly where this function's per-file cost matters. The check is on the whole
/// (already workdir-joined) path, not just the changed file's own leaf name, so a plain-ASCII file
/// inside a non-ASCII-named ancestor directory still falls through to canonicalize — its rollup
/// entries need resolving too.
#[cfg(all(feature = "git", target_os = "macos"))]
pub(crate) fn normalize_status_path(path: PathBuf) -> PathBuf {
    match path.to_str() {
        Some(s) if s.is_ascii() => path,
        _ => path.canonicalize().unwrap_or(path),
    }
}

#[cfg(all(feature = "git", not(target_os = "macos")))]
pub(crate) fn normalize_status_path(path: PathBuf) -> PathBuf {
    path
}

/// Returns the repository status as (absolute path -> kind). Discovers the repo containing `root`.
/// Returns an empty map (= no markers) when not a repo / on failure / when the feature is disabled.
///
/// **Computation is delegated to the `git status` CLI.** git2's (libgit2) `repo.statuses()` is
/// orders of magnitude slower on working trees holding huge ignored trees (target/build, etc.) —
/// measured: on EarthApp (41GB), libgit2 ≈600ms vs `git status` CLI ≈20ms (about 30x). Because it ran
/// synchronously at startup and on every watch refresh, it was the main cause of UI freezes.
/// Only repo discovery uses git2 (discover is lightweight because it does not compute status).
#[cfg(feature = "git")]
pub fn statuses(root: &Path) -> HashMap<PathBuf, FileStatus> {
    if !external_git_enabled() {
        return HashMap::new();
    }
    #[cfg(test)]
    STATUS_CALLS.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
    use std::os::unix::ffi::OsStrExt;
    let mut map = HashMap::new();
    let Some(workdir) = workdir(root) else {
        return map; // not a repo / a bare repo
    };

    // porcelain v1 -z: each record is `XY <path>`, NUL-separated. When it's a rename/copy (X or Y
    // is R/C), the NUL field right after is the old path. -uall = recurse into untracked dirs too
    // (equivalent to git2's recurse_untracked_dirs), --ignored=no = exclude ignored, and
    // -c status.renames=true forces rename detection (emits R regardless of the user's config).
    let out = std::process::Command::new("git")
        .current_dir(&workdir)
        .args([
            "--no-optional-locks", // The etiquette for background tools: don't take an optional
            // lock (which writes back the index.lock stat cache). Keeps konoma's own status scans
            // from making a `git pull` fail with "index.lock: File exists" (git 2.15+).
            "-c",
            "status.renames=true",
            "status",
            "--porcelain=v1",
            "-z",
            "-uall",
            "--ignored=no",
        ])
        .output();
    let Ok(out) = out else {
        return map;
    };
    if !out.status.success() {
        return map;
    }

    let mut fields = out.stdout.split(|&b| b == 0);
    while let Some(rec) = fields.next() {
        // Each record is `XY` + a separating space + the path. Discard fractions (a trailing
        // empty field, etc.).
        if rec.len() < 4 {
            continue;
        }
        let (x, y) = (rec[0], rec[1]);
        let is_rename = x == b'R' || x == b'C' || y == b'R' || y == b'C';
        if is_rename {
            // Consume and discard the old-path field (the status attaches to the new path =
            // the current record).
            let _ = fields.next();
        }
        let rel = PathBuf::from(std::ffi::OsStr::from_bytes(&rec[3..]));
        let abs = workdir.join(rel);
        let abs = normalize_status_path(abs);
        rollup(&mut map, &workdir, &abs, classify_porcelain(x, y));
    }
    map
}

/// Maps porcelain v1's two XY characters to a FileStatus. Aligned to the same priority order as the git2-based `classify`.
#[cfg(feature = "git")]
fn classify_porcelain(x: u8, y: u8) -> FileStatus {
    if x == b'U' || y == b'U' || (x == b'A' && y == b'A') || (x == b'D' && y == b'D') {
        FileStatus::Conflicted // unmerged (conflict)
    } else if x == b'?' {
        FileStatus::Untracked // "??"
    } else if x == b'D' || y == b'D' {
        FileStatus::Deleted
    } else if x == b'A' {
        FileStatus::Added
    } else if x == b'R' || y == b'R' || x == b'C' || y == b'C' {
        FileStatus::Renamed
    } else if x == b'M' || y == b'M' {
        FileStatus::Modified
    } else if x == b'T' || y == b'T' {
        FileStatus::TypeChange
    } else {
        FileStatus::Modified
    }
}

#[cfg(not(feature = "git"))]
pub fn statuses(_root: &Path) -> HashMap<PathBuf, FileStatus> {
    HashMap::new()
}

/// Returns the set of absolute paths of the **top-level entries** (files/directories) excluded by gitignore.
/// Because of `recurse_ignored_dirs(false)`, `node_modules` and the like are not enumerated; only
/// **that one directory** is included (avoids enumerating huge trees). Used to dim tree entries whose
/// "self or an ancestor is in this set."
/// Returns an empty set when not a repo / on failure / when the feature is disabled.
///
/// **Computation is delegated to the `git status` CLI** (same reason as `statuses()`). git2's `repo.statuses()`
/// is orders of magnitude slower when scanning the ignored tree on repos holding huge working trees
/// (target/node_modules), and because it ran synchronously inside `tree::render`'s draw closure it was the
/// main cause of first-paint freezes. Only repo discovery uses git2 (discover is lightweight because it does not compute status).
#[cfg(feature = "git")]
pub fn ignored(root: &Path) -> HashSet<PathBuf> {
    if !external_git_enabled() {
        return HashSet::new();
    }
    use std::os::unix::ffi::OsStrExt;
    let mut set = HashSet::new();
    let Some(workdir) = workdir(root) else {
        return set; // not a repo / a bare repo
    };

    // `--ignored=traditional`: enumerate ignored entries with `!!`, and **collapse a fully-ignored
    //   directory** (node_modules/ becomes one entry, not recursed into) = the same as git2's
    //   recurse_ignored_dirs(false).
    // `-unormal`: pin down the default mode so untracked dirs also collapse (if the user's
    //   status.showUntrackedFiles is `all`, ignored dirs get recursively expanded and collapse
    //   breaks, so this is fixed here). `??` lines are discarded below.
    let out = std::process::Command::new("git")
        .current_dir(&workdir)
        .args([
            "--no-optional-locks", // no optional locks (same reason as statuses())
            "status",
            "--porcelain=v1",
            "-z",
            "--ignored=traditional",
            "-unormal",
        ])
        .output();
    let Ok(out) = out else {
        return set;
    };
    if !out.status.success() {
        return set;
    }

    for rec in out.stdout.split(|&b| b == 0) {
        // An ignored entry is `!! <path>`. Other records like a change/untracked (`??`) are discarded.
        if rec.len() < 4 || rec[0] != b'!' || rec[1] != b'!' {
            continue;
        }
        // An ignored directory comes with a trailing `/` → strip it so it matches the tree's absolute path.
        let mut raw = &rec[3..];
        while raw.last() == Some(&b'/') {
            raw = &raw[..raw.len() - 1];
        }
        set.insert(workdir.join(Path::new(std::ffi::OsStr::from_bytes(raw))));
    }
    set
}

#[cfg(not(feature = "git"))]
pub fn ignored(_root: &Path) -> HashSet<PathBuf> {
    HashSet::new()
}

// ── Repository discovery: the one place that answers "where is the repo?" ────────────────────
//
// Everything below that needs to *locate* a repository (workdir / git-dir / common-dir) goes
// through `resolve_repo_dirs`, and everything that needs libgit2's object database goes through
// `open_repo`. Two reasons for the single gate:
//
//   1. **libgit2 refuses repositories it does not fully understand.** `core.repositoryformat
//      version = 1` requires every `[extensions]` key to be one libgit2 knows; an unknown one is a
//      hard error. `git init --ref-format=reftable` (git 2.45+) writes `extensions.refstorage =
//      reftable`, so `git2::Repository::discover` fails outright on such a repository — even
//      though the `git` CLI, which does all of konoma's status/ignored/changed-files/worktree-list
//      work, handles it perfectly. Before this gate existed, a failed *discovery* took those CLI
//      features down with it and konoma showed a reftable repository as "not a repository at all"
//      (no branch chip, no status markers, `o` did nothing).
//   2. It keeps the CLI fallback's cost in exactly one auditable place (see below).
//
// The order inside `resolve_repo_dirs` is what keeps this affordable — konoma re-resolves on every
// filesystem event, so a stray `git` spawn here is a performance bug, not a detail:
//
//   1. libgit2 `discover` — no child process. Handles every ordinary repository, i.e. ~everyone.
//   2. a pure-Rust `.git` ancestor walk — no child process. No marker ⇒ genuinely not a
//      repository ⇒ answer "no" immediately. This is the case that must never spawn.
//   3. only when a marker exists but libgit2 still refused: one `git rev-parse`, **memoized** per
//      marker directory, so a reftable user pays it once rather than once per filesystem event.

/// Where a repository lives, as plain paths. Produced either by libgit2 (fast path) or by the
/// `git rev-parse` fallback; the two are interchangeable by construction.
#[cfg(feature = "git")]
#[derive(Clone, Default)]
struct RepoDirs {
    /// Working-tree root (`--show-toplevel`). `None` for a bare repository.
    workdir: Option<PathBuf>,
    /// This worktree's own git-dir (`--git-dir`): `<repo>/.git` normally,
    /// `<main>/.git/worktrees/<name>` inside a linked worktree.
    git_dir: Option<PathBuf>,
    /// The git-dir shared by every worktree of the repository (`--git-common-dir`). Equal to
    /// `git_dir` except inside a linked worktree — which is exactly how `worktree_origin` tells
    /// the two apart without libgit2's `is_worktree()`.
    common_dir: Option<PathBuf>,
}

/// Memoized `git rev-parse` results, keyed by the directory holding the `.git` marker. Process-wide
/// (unlike this file's thread-local *flags*) because it is a pure fact about the filesystem, so
/// sharing it across the background status/ignored threads is both safe and the point. Bounded by
/// the number of distinct repositories a session visits.
#[cfg(feature = "git")]
static REPO_DIRS_CACHE: std::sync::OnceLock<std::sync::Mutex<HashMap<PathBuf, RepoDirs>>> =
    std::sync::OnceLock::new();

#[cfg(all(test, feature = "git"))]
thread_local! {
    /// Test-only count of **CLI discovery fallbacks** (step 3 above) issued on this thread, so a
    /// guard can pin down "an ordinary directory spawns nothing". Thread-local for the same reason
    /// as `EXTERNAL_GIT_ENABLED`: a process-wide counter would also see the calls made by every
    /// other test running in parallel, which is precisely the flake `STATUS_CALLS` produced.
    static DISCOVERY_CLI_CALLS: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
}

/// Runs `f` and reports how many `git rev-parse` discovery fallbacks it triggered on this thread.
#[cfg(all(test, feature = "git"))]
pub fn count_discovery_cli_calls<T>(f: impl FnOnce() -> T) -> (T, usize) {
    let before = DISCOVERY_CLI_CALLS.with(|c| c.get());
    let out = f();
    (
        out,
        DISCOVERY_CLI_CALLS.with(|c| c.get()).saturating_sub(before),
    )
}

/// Walks from `start` up to the filesystem root looking for a `.git` entry, and returns **the
/// directory containing it** (not the marker itself).
///
/// A `.git` entry may be a directory (ordinary repository) *or* a file (linked worktree, submodule
/// — it holds a `gitdir:` pointer), so this only asks "does an entry with that name exist here",
/// via `symlink_metadata` so that a `.git` symlink counts too.
///
/// Pure filesystem lookup, no child process: this is what lets step 3 stay unreachable for the
/// overwhelmingly common "this is just a directory" case.
#[cfg(feature = "git")]
fn git_marker_dir(start: &Path) -> Option<PathBuf> {
    let mut cur = Some(start);
    while let Some(dir) = cur {
        if std::fs::symlink_metadata(dir.join(".git")).is_ok() {
            return Some(dir.to_path_buf());
        }
        cur = dir.parent();
    }
    None
}

/// Step 3: ask the `git` CLI where the repository is, and remember the answer.
///
/// Deliberately run **from the marker directory** rather than from `root`: the result then depends
/// only on the cache key, so every `root` under one repository shares one answer (konoma descends
/// with `l` constantly), and a `root` that happens to sit *inside* `.git/` cannot poison the entry
/// for the working tree above it.
///
/// One invocation resolves all three paths (`--path-format=absolute` makes the two git-dirs
/// absolute; `--show-toplevel` already is). Failure — including a `git` older than the flag
/// (2.31+), or a bare repository, where `--show-toplevel` errors — caches "nothing", which simply
/// means konoma behaves as it did before this fallback existed.
#[cfg(feature = "git")]
fn repo_dirs_via_cli(marker_dir: &Path) -> RepoDirs {
    let cache = REPO_DIRS_CACHE.get_or_init(|| std::sync::Mutex::new(HashMap::new()));
    // A poisoned lock must not take the app down: fall through and recompute uncached.
    if let Ok(map) = cache.lock() {
        if let Some(hit) = map.get(marker_dir) {
            return hit.clone();
        }
    }
    #[cfg(test)]
    DISCOVERY_CLI_CALLS.with(|c| c.set(c.get() + 1));

    let dirs = run_rev_parse_dirs(marker_dir);
    if let Ok(mut map) = cache.lock() {
        map.insert(marker_dir.to_path_buf(), dirs.clone());
    }
    dirs
}

/// The one `git rev-parse` invocation behind `repo_dirs_via_cli` (split out so the caching and the
/// process launch can be read separately).
#[cfg(feature = "git")]
fn run_rev_parse_dirs(dir: &Path) -> RepoDirs {
    use std::os::unix::ffi::OsStrExt;
    let out = std::process::Command::new("git")
        .current_dir(dir)
        .args([
            "--no-optional-locks", // read-only background call (same etiquette as statuses())
            "rev-parse",
            "--path-format=absolute",
            "--show-toplevel",
            "--git-dir",
            "--git-common-dir",
        ])
        .output();
    let Ok(out) = out else {
        return RepoDirs::default();
    };
    if !out.status.success() {
        return RepoDirs::default();
    }
    // Bytes, not `String`: a path is not required to be UTF-8. (`rev-parse` has no NUL-separated
    // mode, so a path containing a literal newline is not representable here — such a repository
    // simply keeps the pre-fallback behaviour.)
    let mut lines = out
        .stdout
        .split(|&b| b == b'\n')
        .filter(|l| !l.is_empty())
        .map(|l| {
            let p = PathBuf::from(std::ffi::OsStr::from_bytes(l));
            p.canonicalize().unwrap_or(p)
        });
    let workdir = lines.next();
    let git_dir = lines.next();
    let common_dir = lines.next();
    if git_dir.is_none() || common_dir.is_none() {
        return RepoDirs::default(); // truncated output — treat as "could not resolve"
    }
    RepoDirs {
        workdir,
        git_dir,
        common_dir,
    }
}

/// Locates the repository containing `root`, by the three-step ladder documented at the top of this
/// section. Every "where is the repo?" question in this file funnels through here.
#[cfg(feature = "git")]
fn resolve_repo_dirs(root: &Path) -> RepoDirs {
    if !external_git_enabled() {
        return RepoDirs::default();
    }
    // 1. libgit2 (no child process).
    if let Ok(repo) = git2::Repository::discover(root) {
        let canon = |p: &Path| {
            let p = p.to_path_buf();
            p.canonicalize().unwrap_or(p)
        };
        return RepoDirs {
            workdir: repo.workdir().map(canon), // None for a bare repo
            git_dir: Some(canon(repo.path())),
            common_dir: Some(canon(repo.commondir())),
        };
    }
    // 2. No `.git` anywhere above `root` ⇒ not a repository. Answer without spawning anything.
    //    (A bare repository has no marker either, but step 1 already opened those.)
    let Some(marker_dir) = git_marker_dir(root) else {
        return RepoDirs::default();
    };
    // 3. A repository libgit2 will not open (reftable, or any future unknown extension).
    repo_dirs_via_cli(&marker_dir)
}

/// Opens the repository containing `root` **through libgit2**, for the operations below that need
/// its object database (diffs, the commit graph, branch refs) rather than just a path.
///
/// Returns `None` for a repository libgit2 refuses to open — today that means a **reftable**
/// repository (see this section's header).
///
/// A `None` here is no longer a dead end: every caller falls back to the `git` CLI (the next
/// section), so a reftable repository gets the whole git suite — status markers, the ignored set,
/// the changed-files list, the worktree list, the graph and every write were already CLI-backed,
/// and `file_diff` / `log` / `commit_diff` / `commit_meta` / `branches` / `branches_by_recency` /
/// `branch_tip` / `head_commit_id` / `blob_at` / `worktree_diff` / `diff_since` /
/// `merge_base_time` now have CLI implementations of their own.
///
/// **What still differs from this path**: the fallback diffs are computed by diffing the two sides'
/// *contents* with [`diff_contents`], so their hunk boundaries are `similar`'s rather than
/// libgit2's — the same lines are marked added/removed, but where a hunk starts and how nearby
/// changes are grouped can differ slightly. That is deliberate (see the fallback section's header):
/// it reuses output konoma already shows users elsewhere instead of introducing a second,
/// hand-written unified-diff parser.
#[cfg(feature = "git")]
fn open_repo(root: &Path) -> Option<git2::Repository> {
    if !external_git_enabled() {
        return None;
    }
    git2::Repository::discover(root).ok()
}

// ── CLI fallbacks for the object-database reads (reftable repositories) ──────
//
// Everything in this file that needs the *object database* (diffs, log, branch refs, commit
// metadata) keeps its libgit2 implementation **verbatim** and only reaches for the `git` CLI when
// `open_repo` returned `None`. Two consequences worth stating plainly:
//
//   * **An ordinary repository launches not one extra child process.** Pinned by
//     `the_libgit2_path_never_spawns_a_read_fallback`. This is not cosmetic: `file_diff` feeds the
//     change gutter, and `statuses`/`ignored` are recomputed on filesystem events — extra spawns
//     on those paths are precisely the class of stall the `.git` self-loop and Phase G work spent
//     so long removing.
//   * **The fallback is deliberately un-clever.** It never parses a unified diff. It asks git
//     *which* paths differ, reads each side's bytes (`git cat-file blob` for a tree-ish side, the
//     file itself for the working-tree side) and hands the pair to [`diff_contents`] — the same
//     `similar`-backed function the follow-baseline diff already renders for users. Writing a
//     unified-diff parser instead would mean owning a second notion of "what a hunk is" whose
//     disagreements with git only ever surface as subtly wrong output.
//
// The object reads themselves are batched: every blob a diff needs, both sides of every file,
// comes back from a single `git cat-file --batch` (see [`cat_file_batch`]). A child process costs
// ~4ms to start, so the per-file spelling this replaced made a multi-file diff grow linearly —
// ~1.6s on a 200-file commit — while the batched form stays flat.

#[cfg(all(test, feature = "git"))]
thread_local! {
    /// Test-only count of **read fallbacks** (this section) issued on this thread — the counter
    /// behind `count_read_cli_calls`. Thread-local for the same reason as `DISCOVERY_CLI_CALLS`: a
    /// process-wide counter would also see the spawns of every other test running in parallel.
    static READ_CLI_CALLS: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
}

/// Runs `f` and reports how many read fallbacks it spawned on this thread.
///
/// Counts *only* this section's helper. The long-standing CLI implementations (`statuses`,
/// `ignored`, `changed_files`, `worktrees`, `dag_commits`, `precomposed_pathspec`) build their own
/// `Command` and are intentionally left alone, so this measures exactly "did a libgit2-backed read
/// fall back to the CLI" and nothing else.
#[cfg(all(test, feature = "git"))]
pub fn count_read_cli_calls<T>(f: impl FnOnce() -> T) -> (T, usize) {
    let before = READ_CLI_CALLS.with(|c| c.get());
    let out = f();
    (out, READ_CLI_CALLS.with(|c| c.get()).saturating_sub(before))
}

/// Runs one **read-only** `git` command in `dir` and returns its stdout as raw bytes, or `None` if
/// git could not be launched or exited non-zero.
///
/// Bytes, not `String`: paths and file contents are not required to be UTF-8. `--no-optional-locks`
/// is prepended here rather than at each call site so no fallback can forget it — every one of them
/// is a background read that must never contend with a user's concurrent `git pull` (see
/// `statuses()`). stdin is `/dev/null` so a subcommand that would otherwise prompt (credentials,
/// an editor) fails instead of hanging the UI thread.
#[cfg(feature = "git")]
fn git_read<I, S>(dir: &Path, args: I) -> Option<Vec<u8>>
where
    I: IntoIterator<Item = S>,
    S: AsRef<std::ffi::OsStr>,
{
    #[cfg(test)]
    READ_CLI_CALLS.with(|c| c.set(c.get() + 1));
    let out = std::process::Command::new("git")
        .current_dir(dir)
        .arg("--no-optional-locks")
        .args(args)
        .stdin(std::process::Stdio::null())
        .output()
        .ok()?;
    out.status.success().then_some(out.stdout)
}

/// [`git_read`] for a command whose output is a single token (an object id, a timestamp).
/// `None` when the command failed *or* printed nothing — both mean "unresolvable" to every caller.
#[cfg(feature = "git")]
fn git_read_token<I, S>(dir: &Path, args: I) -> Option<String>
where
    I: IntoIterator<Item = S>,
    S: AsRef<std::ffi::OsStr>,
{
    let out = git_read(dir, args)?;
    let s = String::from_utf8_lossy(&out).trim().to_string();
    (!s.is_empty()).then_some(s)
}

/// The directory a read fallback runs in: the repository's working-tree root.
///
/// `None` — and therefore *no child process at all* — when `root` is not inside a repository with
/// a working tree. Resolved through the same memoized discovery ladder as everything else, so the
/// overwhelmingly common "this is just a directory" case is answered by a filesystem walk. A bare
/// repository also lands here: `git rev-parse --show-toplevel` fails in one, so discovery already
/// reports no workdir, and the fallbacks stay disabled exactly as they were.
#[cfg(feature = "git")]
fn cli_dir(root: &Path) -> Option<PathBuf> {
    resolve_repo_dirs(root).workdir
}

/// git's own "is this binary?" heuristic: a NUL byte within the first 8000 bytes.
///
/// Used to keep binary content out of [`diff_contents`], which is a *line* differ — running it
/// over a PNG would emit megabytes of mojibake. libgit2 does not emit line callbacks for a binary
/// delta either, so skipping the body (while still emitting the file header) is what makes the two
/// paths agree.
#[cfg(feature = "git")]
fn looks_binary(bytes: &[u8]) -> bool {
    bytes.iter().take(8000).any(|&b| b == 0)
}

/// The bytes of repo-relative path `rel` as of tree-ish `rev`. `None` when the path did not exist
/// there (every caller reads that as "added on the new side").
///
/// The one-object spelling of [`cat_file_batch`] rather than its own `git cat-file blob` call: a
/// batch of one costs the same single child process, and keeping every object read on one code
/// path means the framing and the failure handling cannot drift apart between them.
///
/// No NFC normalization is applied on macOS (unlike `precomposed_pathspec`, which exists for
/// libgit2's pathspec matcher): git precomposes its own input when `core.precomposeunicode` is on,
/// so an NFD-spelled path from the tree side resolves — verified with a decomposed filename, where
/// both spellings returned the same blob.
#[cfg(feature = "git")]
fn cli_blob(dir: &Path, rev: &str, rel: &Path) -> Option<Vec<u8>> {
    cat_file_batch(dir, std::slice::from_ref(&blob_spec(rev, rel)))
        .into_iter()
        .next()
        .flatten()
}

/// The `<rev>:<path>` object spec `git cat-file` takes, built as an `OsString` so a non-UTF-8
/// filename survives. Always starts with `rev`, so a filename beginning with `-` can never be
/// mistaken for an option.
#[cfg(feature = "git")]
fn blob_spec(rev: &str, rel: &Path) -> std::ffi::OsString {
    let mut spec = std::ffi::OsString::from(rev);
    spec.push(":");
    spec.push(rel.as_os_str());
    spec
}

/// Reads many objects with **one** `git cat-file --batch` child process, returning one slot per
/// input spec (`None` = git had no blob there, which every caller reads as "absent on that side").
///
/// This is what keeps a multi-file diff from costing a process per file: `commit_diff` on a
/// 200-file commit asks for 400 blobs and still spawns one `cat-file`. The per-spawn cost is ~4ms,
/// so the batched form is the difference between a diff view that opens and one that stalls for
/// most of a second.
///
/// **Framing.** `--batch` answers each input line with `<oid> <type> <size>\n`, then exactly
/// `<size>` bytes, then a `\n`. Only the header is text: the payload is read by *count*, never by
/// line, or any blob containing a newline (i.e. every text file) would desynchronise the stream.
/// A spec git cannot resolve is answered `<spec> missing\n` with no payload — routine here, since
/// a file added in a commit has no blob on the parent side. The header is parsed from the right
/// (`… <type> <size>`) because a path — and therefore a `missing` line — may contain spaces.
/// Only `blob` payloads are handed back, so asking for a directory yields `None` exactly as the
/// previous `cat-file blob` call did; other types are still consumed so the stream stays aligned.
///
/// **Why the writer runs on its own thread.** Writing every spec before reading anything
/// deadlocks: once git's stdout pipe fills (~64 KiB) git blocks writing, so it stops draining its
/// stdin, and this thread then blocks filling *that* pipe. Neither side can move. Both konoma's
/// other multi-stream child (`preview::command::run_capture`) and this one solve it the same way —
/// one stream per thread. The writer also owns the `ChildStdin` so dropping it closes the pipe,
/// which is what tells `--batch` to exit.
///
/// A spec whose bytes contain a newline cannot travel through a newline-delimited protocol at all;
/// those (legal, pathological) filenames get their own child process rather than being dropped.
/// A child that fails to launch, dies early, or emits an unparsable header degrades to `None`
/// slots — never a panic.
#[cfg(feature = "git")]
fn cat_file_batch(dir: &Path, specs: &[std::ffi::OsString]) -> Vec<Option<Vec<u8>>> {
    use std::io::{BufReader, Write};
    use std::os::unix::ffi::OsStrExt;

    let mut out: Vec<Option<Vec<u8>>> = specs.iter().map(|_| None).collect();
    if specs.is_empty() {
        return out;
    }

    let (batched, lone): (Vec<usize>, Vec<usize>) =
        (0..specs.len()).partition(|&i| !specs[i].as_bytes().contains(&b'\n'));
    for i in lone {
        out[i] = git_read(
            dir,
            [
                std::ffi::OsStr::new("cat-file"),
                std::ffi::OsStr::new("blob"),
                specs[i].as_os_str(),
            ],
        );
    }
    if batched.is_empty() {
        return out;
    }

    #[cfg(test)]
    READ_CLI_CALLS.with(|c| c.set(c.get() + 1));

    // stderr is discarded: a `missing` answer already arrives on stdout, and nothing else here is
    // actionable. stdin is a pipe (unlike `git_read`'s `/dev/null`) because it *is* the input.
    let Ok(mut child) = std::process::Command::new("git")
        .current_dir(dir)
        .arg("--no-optional-locks")
        .args(["cat-file", "--batch"])
        .stdin(std::process::Stdio::piped())
        .stdout(std::process::Stdio::piped())
        .stderr(std::process::Stdio::null())
        .spawn()
    else {
        return out;
    };
    let (Some(mut stdin), Some(stdout)) = (child.stdin.take(), child.stdout.take()) else {
        let _ = child.kill();
        let _ = child.wait();
        return out;
    };

    let mut payload = Vec::new();
    for &i in &batched {
        payload.extend_from_slice(specs[i].as_bytes());
        payload.push(b'\n');
    }
    let writer = std::thread::spawn(move || {
        // A broken pipe (git exited early) is not an error worth reporting: the reader below
        // already sees the truncated answer stream and leaves the rest of the slots `None`.
        let _ = stdin.write_all(&payload);
        let _ = stdin.flush();
    });

    let mut reader = BufReader::new(stdout);
    for &i in &batched {
        match read_batch_frame(&mut reader) {
            Some(bytes) => out[i] = bytes,
            None => break, // stream ended or lost sync — the remaining slots stay `None`
        }
    }

    let _ = writer.join();
    let _ = child.wait();
    out
}

/// Reads one `cat-file --batch` response.
///
/// `None` means the stream ended or the header could not be parsed, and the caller must stop —
/// once framing is lost, later answers can no longer be trusted to line up with their specs.
/// `Some(None)` is the ordinary "git has no blob there" answer.
#[cfg(feature = "git")]
fn read_batch_frame<R: std::io::BufRead>(r: &mut R) -> Option<Option<Vec<u8>>> {
    use std::io::Read;

    let mut header = Vec::new();
    if r.read_until(b'\n', &mut header).ok()? == 0 {
        return None; // EOF
    }
    if header.last() == Some(&b'\n') {
        header.pop();
    }
    // Parsed from the right: `<oid> <type> <size>`. A `missing` / `ambiguous` answer echoes the
    // spec, which may itself contain spaces, so splitting from the left would misread it.
    let text = String::from_utf8_lossy(&header);
    let mut tail = text.rsplitn(3, ' ');
    let size = tail.next().and_then(|s| s.parse::<usize>().ok());
    let kind = tail.next();
    let (Some(size), Some(kind)) = (size, kind) else {
        return Some(None); // `<spec> missing` — no payload follows
    };
    if !matches!(kind, "blob" | "tree" | "commit" | "tag") {
        return Some(None);
    }

    // `take` rather than a `size`-sized allocation: a bogus header must not let git (or a corrupted
    // stream) ask this process to reserve an arbitrary amount of memory up front.
    let mut buf = Vec::new();
    r.by_ref().take(size as u64).read_to_end(&mut buf).ok()?;
    if buf.len() != size {
        return None; // truncated payload — framing is gone
    }
    let mut nl = [0u8; 1];
    r.read_exact(&mut nl).ok()?; // the separator `--batch` writes after every payload

    // Non-blob types are consumed above (to keep the stream aligned) but never returned: the
    // previous `cat-file blob` spelling failed on them, and every caller expects file contents.
    Some((kind == "blob").then_some(buf))
}

/// Splits NUL-terminated `git` output (`-z`) into repo-relative paths, dropping the trailing empty
/// field. Raw bytes → `PathBuf`, never a lossy `String`, so a non-UTF-8 name round-trips.
#[cfg(feature = "git")]
fn cli_paths(out: &[u8]) -> Vec<PathBuf> {
    use std::os::unix::ffi::OsStrExt;
    out.split(|&b| b == 0)
        .filter(|f| !f.is_empty())
        .map(|f| PathBuf::from(std::ffi::OsStr::from_bytes(f)))
        .collect()
}

/// Appends one file's fallback diff to `out`, in the shape `collect_diff_lines` produces for
/// libgit2: an optional file-boundary header (bare path, both line numbers `None`) followed by the
/// line diff. `None` on a side means "the file does not exist there" (added / deleted).
///
/// A file whose two sides are both absent contributes nothing. A binary file contributes its
/// header and no body, matching libgit2 (see [`looks_binary`]). Text is compared through
/// `from_utf8_lossy` — the same conversion `collect_diff_lines` applies to libgit2's line content.
#[cfg(feature = "git")]
pub(crate) fn push_file_diff(
    out: &mut Vec<DiffLine>,
    rel: &Path,
    old: Option<&[u8]>,
    new: Option<&[u8]>,
    with_headers: bool,
) {
    if old.is_none() && new.is_none() {
        return;
    }
    let (old_b, new_b) = (old.unwrap_or_default(), new.unwrap_or_default());
    if with_headers {
        out.push(DiffLine {
            kind: DiffLineKind::Context,
            old_no: None,
            new_no: None,
            text: rel.to_string_lossy().into_owned(),
        });
    }
    if looks_binary(old_b) || looks_binary(new_b) {
        return;
    }
    out.extend(diff_contents(
        &String::from_utf8_lossy(old_b),
        &String::from_utf8_lossy(new_b),
    ));
}

/// Every path that differs between tree-ish `old` and the working tree (index included), plus
/// untracked files — the CLI equivalent of the `diff_tree_to_workdir_with_index` +
/// `include_untracked`/`recurse_untracked_dirs` options the libgit2 diffs use.
///
/// `old = None` is the unborn-HEAD case, where libgit2 diffs against an empty tree: everything
/// tracked *or* untracked counts as added, so the tracked side comes from `ls-files --cached`
/// rather than a diff. `--no-renames` keeps a rename reported as a delete plus an add, which is
/// what libgit2 produces too (konoma never asks it to run rename detection). Sorted and
/// deduplicated so the merged listing is ordered by path, as libgit2's delta order is.
#[cfg(feature = "git")]
fn cli_paths_vs_worktree(dir: &Path, old: Option<&str>) -> Vec<PathBuf> {
    let tracked = match old {
        Some(rev) => git_read(
            dir,
            ["diff", "--name-only", "--no-renames", "-z", rev, "--"],
        ),
        None => git_read(dir, ["ls-files", "-z", "--cached"]),
    };
    let untracked = git_read(dir, ["ls-files", "-z", "--others", "--exclude-standard"]);
    let mut paths: Vec<PathBuf> = tracked
        .as_deref()
        .map(cli_paths)
        .unwrap_or_default()
        .into_iter()
        .chain(untracked.as_deref().map(cli_paths).unwrap_or_default())
        .collect();
    paths.sort();
    paths.dedup();
    paths
}

/// The diff from tree-ish `old` (`None` = unborn HEAD) through the index to the working tree, for
/// every changed file — the CLI stand-in for `worktree_diff` and `diff_since`.
#[cfg(feature = "git")]
fn cli_diff_vs_worktree(dir: &Path, old: Option<&str>) -> Vec<DiffLine> {
    let paths = cli_paths_vs_worktree(dir, old);
    // Every "before" side in one `cat-file` (see [`cat_file_batch`]); the "after" side is the file
    // on disk, which costs no process at all. Unborn HEAD has no old side to read.
    let before: Vec<Option<Vec<u8>>> = match old {
        Some(rev) => {
            let specs: Vec<_> = paths.iter().map(|rel| blob_spec(rev, rel)).collect();
            cat_file_batch(dir, &specs)
        }
        None => paths.iter().map(|_| None).collect(),
    };
    let mut out = Vec::new();
    for (rel, before) in paths.iter().zip(before) {
        let after = std::fs::read(dir.join(rel)).ok();
        push_file_diff(&mut out, rel, before.as_deref(), after.as_deref(), true);
    }
    out
}

/// Returns the **workdir (working-tree root)** of the git repository that `root` belongs to (canonicalized).
/// Returns None when not a repo / for a bare repo / when the feature is disabled. Discovery is
/// lightweight (see this section's header — it never computes status), so it serves as the key for
/// deciding "do not rebuild the expensive `ignored` set when moving root within the same repository."
#[cfg(feature = "git")]
pub fn workdir(root: &Path) -> Option<PathBuf> {
    resolve_repo_dirs(root).workdir
}

#[cfg(not(feature = "git"))]
pub fn workdir(_root: &Path) -> Option<PathBuf> {
    None
}

/// Returns the **git directory** (where `HEAD`/`index`/refs actually live) for the repository that
/// `root` belongs to (canonicalized). For an ordinary repository this is `<repo>/.git/`. For a
/// **linked worktree** (created with `git worktree add`) it is instead
/// `<main-repo>/.git/worktrees/<name>/` — that linked worktree's own `HEAD` and `index` live there,
/// not under the worktree's checkout. This is a different path from [`workdir`], which always
/// returns the *checked-out tree* side (for a linked worktree, that is the worktree's own root, not
/// the main repo's root). Returns None when not a repo / when the feature is disabled.
#[cfg(feature = "git")]
pub fn git_dir(root: &Path) -> Option<PathBuf> {
    resolve_repo_dirs(root).git_dir
}

#[cfg(not(feature = "git"))]
pub fn git_dir(_root: &Path) -> Option<PathBuf> {
    None
}

/// Returns the current branch name. A short hash when detached, or the HEAD reference name before the first commit (unborn).
/// Returns None when not a repo / when the feature is disabled.
#[cfg(feature = "git")]
pub fn branch(root: &Path) -> Option<String> {
    if !external_git_enabled() {
        return None;
    }
    if let Some(repo) = open_repo(root) {
        if let Ok(head) = repo.head() {
            // git2 0.21: shorthand() is Result<&str, Error> (UTF-8 validated). The None-equivalent is
            // absorbed with .ok().
            return head.shorthand().ok().map(|s| s.to_string());
        }
        // If there is no commit yet (unborn), pull it from HEAD's symbolic reference instead.
        // git2 0.21: symbolic_target() is Result<Option<&str>, Error>.
        return repo
            .find_reference("HEAD")
            .ok()
            .and_then(|r| r.symbolic_target().ok().flatten().map(|t| t.to_string()))
            .map(|t| t.trim_start_matches("refs/heads/").to_string());
    }
    // libgit2 would not open this repository (reftable — see the discovery section's header). Ask
    // git itself, but only once a `.git` marker has confirmed there is a repository here at all,
    // so an ordinary directory still costs nothing.
    branch_via_cli(&git_marker_dir(root)?)
}

/// The `git` CLI answer to "which branch is checked out", for a repository libgit2 refuses.
///
/// **Never reads `.git/HEAD` directly.** A reftable repository keeps a backwards-compatibility
/// placeholder there — literally `ref: refs/heads/.invalid` — so a tool that parses that file
/// reports a branch that does not exist. Asking git is the only way to get the truth.
#[cfg(feature = "git")]
fn branch_via_cli(dir: &Path) -> Option<String> {
    let run = |args: &[&str]| -> Option<String> {
        let out = std::process::Command::new("git")
            .current_dir(dir)
            .args(args)
            .output()
            .ok()?;
        if !out.status.success() {
            return None;
        }
        let s = String::from_utf8_lossy(&out.stdout).trim().to_string();
        (!s.is_empty()).then_some(s)
    };
    match run(&["--no-optional-locks", "rev-parse", "--abbrev-ref", "HEAD"]) {
        // The ordinary case: one child process, the branch name.
        Some(name) if name != "HEAD" => Some(name),
        // Detached HEAD — `--abbrev-ref` literally prints `HEAD`; show a short hash instead, which
        // is what the libgit2 path's `shorthand()` also yields there.
        Some(_) => run(&["--no-optional-locks", "rev-parse", "--short", "HEAD"]),
        // `rev-parse HEAD` fails before the first commit. `branch --show-current` still names the
        // unborn branch, matching the libgit2 path's symbolic-target lookup above.
        None => run(&["--no-optional-locks", "branch", "--show-current"]),
    }
}

#[cfg(not(feature = "git"))]
pub fn branch(_root: &Path) -> Option<String> {
    None
}

/// The name of the repository a **linked worktree** (`git worktree add`) belongs to, or `None`
/// when `root` is not inside one (including: not a repo, the repo's own main worktree, or the
/// feature/config-disabled build). Nothing besides this is shown for the main worktree — the
/// asymmetry (shown only in a linked worktree) is itself the information: konoma's tree/preview
/// title already shows the root directory's own name, which for a linked worktree is some
/// unrelated branch/feature name, not the project's.
///
/// "Is this a linked worktree?" is answered by **git-dir ≠ common-dir**: a linked worktree gets its
/// own private git-dir (`<common>/worktrees/<name>`) while sharing the common one, whereas a main
/// worktree's two are the same directory. (libgit2's `is_worktree()` says the same thing, but is
/// unavailable for a repository libgit2 will not open — see the discovery section's header — and
/// this phrasing works identically on both paths.) It holds even from a subdirectory reached by
/// descending with `l`, since discovery walks up to the repo regardless of `root`. The origin name
/// is derived from the common dir (the shared git-dir every worktree of one repository points at),
/// whose shape differs by layout:
/// - ordinary repo + its linked worktrees: commondir = `<main>/.git/` → the origin name is the
///   **parent directory's** name (`<main>`'s basename).
/// - bare repo + its worktrees (`git clone --bare` + `git worktree add`): commondir = `<bare>/repo.git/`
///   itself (there is no `.git` **inside** a bare repo) → the origin name is commondir's own
///   basename with a trailing `.git` stripped.
///
/// The two are told apart by whether commondir's basename is literally `.git`.
#[cfg(feature = "git")]
pub fn worktree_origin(root: &Path) -> Option<String> {
    let dirs = resolve_repo_dirs(root);
    let (git_dir, commondir) = (dirs.git_dir?, dirs.common_dir?);
    if git_dir == commondir {
        return None; // the main worktree (or a bare repo with no worktree at all)
    }
    let name = commondir.file_name()?.to_str()?;
    if name == ".git" {
        commondir
            .parent()?
            .file_name()
            .and_then(|n| n.to_str())
            .map(|s| s.to_string())
    } else {
        Some(name.strip_suffix(".git").unwrap_or(name).to_string())
    }
}

#[cfg(not(feature = "git"))]
pub fn worktree_origin(_root: &Path) -> Option<String> {
    None
}

// ── Read+write API for diff / changed-files / log (for the Git view) ──────────
//
// Reads go through git2; writes (stage/unstage/discard/commit) are delegated to the `git` CLI
// (to respect hooks, GPG signing, and user config — git2 is never used for writing).
// When the `git` feature is disabled everything returns empty/None/Err, and everything besides
// the feature itself keeps working as normal.

/// Kind of a single diff line. Context = unchanged / Added = addition (green) / Removed = deletion (red).
// The variants are only constructed on the git-feature diff path; the type is still referenced by the
// shared diff renderer under `--no-default-features`, so allow the no-git "never constructed" warning.
#[allow(dead_code)]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum DiffLineKind {
    Context,
    Added,
    Removed,
}

/// A single diff line. `old_no`/`new_no` are the line numbers in the old/new file (None on the missing side).
/// `text` is the line content (trailing newline removed; the leading +/- is not included).
#[derive(Debug, Clone)]
pub struct DiffLine {
    pub kind: DiffLineKind,
    pub old_no: Option<u32>,
    pub new_no: Option<u32>,
    pub text: String,
}

/// One entry in the changed-files list. `path` is absolute; `staged` indicates whether there are INDEX_* changes.
#[derive(Debug, Clone)]
pub struct ChangeEntry {
    pub path: PathBuf,
    pub status: FileStatus,
    pub staged: bool,
}

/// Commit information for one log entry.
#[derive(Debug, Clone)]
pub struct CommitInfo {
    pub id: String,
    pub short: String,
    pub summary: String,
    pub author: String,
    pub time_epoch: i64,
}

/// A single local branch (for the `b` branch list). `is_current` = currently checked out.
#[derive(Debug, Clone)]
pub struct BranchInfo {
    pub name: String,
    pub is_current: bool,
}

/// Returns local branches in ascending name order (the current branch has `is_current`).
/// Returns an empty Vec when not a repo / when the feature is disabled / before the first commit (unborn = no branch created yet).
#[cfg(feature = "git")]
pub fn branches(root: &Path) -> Vec<BranchInfo> {
    if !external_git_enabled() {
        return Vec::new();
    }
    let Some(repo) = open_repo(root) else {
        return branches_via_cli(root);
    };
    let mut out = Vec::new();
    if let Ok(iter) = repo.branches(Some(git2::BranchType::Local)) {
        for (branch, _) in iter.flatten() {
            let is_current = branch.is_head();
            if let Ok(Some(name)) = branch.name() {
                out.push(BranchInfo {
                    name: name.to_string(),
                    is_current,
                });
            }
        }
    }
    out.sort_by(|a, b| a.name.cmp(&b.name));
    out
}

/// `branches` for a repository libgit2 will not open. One `git for-each-ref`.
///
/// `%(HEAD)` is git's own answer to "is this the checked-out branch" (`*` or a space), so a
/// detached HEAD marks nothing current — exactly what `Branch::is_head()` reports. Refnames may
/// not contain control characters, so NUL-separated fields on newline-separated records is
/// unambiguous here.
#[cfg(feature = "git")]
fn branches_via_cli(root: &Path) -> Vec<BranchInfo> {
    let Some(dir) = cli_dir(root) else {
        return Vec::new();
    };
    let Some(out) = git_read(
        &dir,
        ["for-each-ref", "--format=%(refname:short)%00%(HEAD)", REFS],
    ) else {
        return Vec::new();
    };
    let text = String::from_utf8_lossy(&out);
    let mut list: Vec<BranchInfo> = text
        .lines()
        .filter_map(|line| {
            let (name, head) = line.split_once('\0')?;
            (!name.is_empty()).then(|| BranchInfo {
                name: name.to_string(),
                is_current: head.trim() == "*",
            })
        })
        .collect();
    list.sort_by(|a, b| a.name.cmp(&b.name));
    list
}

/// The one ref namespace konoma's branch listings care about (local branches only, as
/// `git2::BranchType::Local` selects).
#[cfg(feature = "git")]
const REFS: &str = "refs/heads/";

#[cfg(not(feature = "git"))]
pub fn branches(_root: &Path) -> Vec<BranchInfo> {
    Vec::new()
}

/// One entry from `git worktree list` — **a linked working tree** (created with `git worktree add`),
/// not to be confused with the rest of this codebase's "worktree" (always "the working tree = the
/// uncommitted changes", e.g. `worktree_diff`/`GraphRow.worktree`/config's `git_worktree_diff`).
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct WorktreeInfo {
    /// Absolute, canonicalized checkout root.
    pub path: PathBuf,
    /// Checked-out branch name (`refs/heads/` stripped). `None` when detached (or, for a bare main
    /// worktree, when there is no checkout at all).
    pub branch: Option<String>,
    /// Short (7-char) HEAD hash. `None` for a bare main worktree, or a linked worktree created
    /// before the repository had its first commit (git reports the all-zero OID there).
    pub head: Option<String>,
    /// Whether this is the worktree the caller (`root`) is presently inside.
    pub is_current: bool,
    /// Whether this is the **main** worktree (always the first record `git worktree list` reports,
    /// regardless of which worktree's directory it is invoked from).
    pub is_main: bool,
    /// Whether this is a bare repository standing in as the main worktree (`git clone --bare` +
    /// `git worktree add`) — it has no checkout of its own to switch into.
    pub is_bare: bool,
    /// `Some(reason)` when locked (`git worktree lock`); `Some("")` when locked with no reason given.
    pub locked: Option<String>,
    /// Whether git considers this entry prunable (its checkout directory is missing/moved).
    pub prunable: bool,
}

/// Returns every worktree linked to the repository containing `root` — the **main** worktree first,
/// then any **linked** worktrees created with `git worktree add` — parsed from
/// `git worktree list --porcelain -z`. Returns an empty Vec when not a repo / on failure / when the
/// feature is disabled (the caller treats that the same as "no repository", same as `branches()`).
///
/// **Computation is delegated to the `git worktree` CLI**, not git2/libgit2: git2's
/// `Repository::worktrees()` only returns the *names* of linked worktrees (never the main one, and
/// not their branch/HEAD/lock state) — matching this function's shape would take several more git2
/// calls per entry. `--porcelain -z` gives the whole picture (path/HEAD/branch/detached/bare/locked/
/// prunable) in one call: the same "heavy or structured read → CLI" split as `statuses()`/`ignored()`.
///
/// **`-z` record shape** (verified against git 2.54.0): each field is one NUL-terminated "line"
/// (`worktree <path>`, then any of `HEAD <sha>`, `branch refs/heads/<name>` XOR `detached`, `bare`,
/// `locked [<reason>]`, `prunable [<reason>]`), and a record ends with one *extra* NUL — two NULs in
/// a row mark the boundary between records, the `-z` equivalent of the blank line that separates
/// records in the non-`-z` porcelain output. `-z` is not optional here: without it a worktree path
/// containing a literal newline would be misparsed (same reasoning as `-z` on `status`). The **first**
/// record is always the main worktree, regardless of which worktree's directory git is invoked from.
/// A bare-repo-as-main-worktree record has only `worktree` + `bare` fields (no `HEAD`/`branch`) — no
/// checkout exists there to switch into.
#[cfg(feature = "git")]
pub fn worktrees(root: &Path) -> Vec<WorktreeInfo> {
    if !external_git_enabled() {
        return Vec::new();
    }
    // `git worktree list` returns the same listing no matter which of the repo's worktrees it's
    // invoked from, so this is just picking *some* directory to run git in — not "the main
    // worktree's workdir". If `root` is inside a linked worktree, this resolves to that linked
    // worktree's own path, not the main one.
    let Some(cwd) = workdir(root) else {
        return Vec::new(); // not a repo / a bare repo opened directly as root
    };

    let out = std::process::Command::new("git")
        .current_dir(&cwd)
        .args([
            "--no-optional-locks", // read-only background call (same etiquette as statuses()/ignored())
            "worktree",
            "list",
            "--porcelain",
            "-z",
        ])
        .output();
    let Ok(out) = out else {
        return Vec::new();
    };
    if !out.status.success() {
        return Vec::new();
    }

    // The worktree this konoma tab is presently inside (compared against each record's path below
    // to compute `is_current`). Not necessarily equal to `root` itself: `root` can be a subdirectory
    // of a worktree's checkout.
    let current = workdir(root);

    let mut list: Vec<WorktreeInfo> = Vec::new();
    let mut rec: Vec<&[u8]> = Vec::new();
    for field in out.stdout.split(|&b| b == 0) {
        if field.is_empty() {
            if !rec.is_empty() {
                let is_main = list.is_empty();
                list.push(worktree_from_record(&rec, is_main, current.as_deref()));
                rec.clear();
            }
            continue;
        }
        rec.push(field);
    }
    if !rec.is_empty() {
        let is_main = list.is_empty();
        list.push(worktree_from_record(&rec, is_main, current.as_deref()));
    }
    list
}

/// Parses one `git worktree list --porcelain -z` record (its NUL-separated field lines, `worktree
/// <path>` always first) into a `WorktreeInfo`. `is_main` = this is the first record in the whole
/// listing. `current` is `workdir(root)` — the checked-out root of whichever worktree the caller is
/// presently inside — compared against this record's (canonicalized) path for `is_current`.
#[cfg(feature = "git")]
fn worktree_from_record(fields: &[&[u8]], is_main: bool, current: Option<&Path>) -> WorktreeInfo {
    use std::os::unix::ffi::OsStrExt;
    let mut path = PathBuf::new();
    let mut head: Option<String> = None;
    let mut branch: Option<String> = None;
    let mut is_bare = false;
    let mut locked: Option<String> = None;
    let mut prunable = false;

    for &f in fields {
        if let Some(rest) = f.strip_prefix(b"worktree ") {
            // Raw bytes, not a lossy UTF-8 conversion: a checkout path could in principle hold
            // non-UTF-8 bytes (same care as `statuses()`'s path handling).
            path = PathBuf::from(std::ffi::OsStr::from_bytes(rest));
            continue;
        }
        // Every other tag line is git-generated ASCII (HEAD/branch/detached/bare/locked/prunable),
        // so a lossy UTF-8 view is safe here — only the path above needs raw-byte handling.
        let line = String::from_utf8_lossy(f);
        if let Some(rest) = line.strip_prefix("HEAD ") {
            // An unborn linked worktree (its branch was created before the repository had any
            // commit) reports the all-zero OID; treat that the same as "no HEAD yet", not a real
            // short hash.
            if !rest.bytes().all(|b| b == b'0') {
                head = Some(rest.chars().take(7).collect());
            }
        } else if let Some(rest) = line.strip_prefix("branch ") {
            branch = Some(
                rest.strip_prefix("refs/heads/")
                    .map(str::to_string)
                    .unwrap_or_else(|| rest.to_string()),
            );
        } else if line == "bare" {
            is_bare = true;
        } else if line == "locked" {
            locked = Some(String::new());
        } else if let Some(rest) = line.strip_prefix("locked ") {
            locked = Some(rest.to_string());
        } else if line == "prunable" || line.starts_with("prunable ") {
            prunable = true;
        }
        // "detached" itself carries no data beyond "branch is absent" (already the default).
    }

    let path = path.canonicalize().unwrap_or(path);
    let is_current = current.is_some_and(|c| c == path);
    WorktreeInfo {
        path,
        branch,
        head,
        is_current,
        is_main,
        is_bare,
        locked,
        prunable,
    }
}

#[cfg(not(feature = "git"))]
pub fn worktrees(_root: &Path) -> Vec<WorktreeInfo> {
    Vec::new()
}

/// For selecting which branches to show in the graph: returns local branches **ordered by most-recent tip commit**.
/// `(name, is_current, time_epoch)`. Ordered so the cap (`ui.graph_max_branches`) can take from the front.
#[cfg(feature = "git")]
pub fn branches_by_recency(root: &Path) -> Vec<(String, bool, i64)> {
    if !external_git_enabled() {
        return Vec::new();
    }
    let Some(repo) = open_repo(root) else {
        return branches_by_recency_via_cli(root);
    };
    let mut out: Vec<(String, bool, i64)> = Vec::new();
    if let Ok(iter) = repo.branches(Some(git2::BranchType::Local)) {
        for (branch, _) in iter.flatten() {
            let is_current = branch.is_head();
            let Ok(Some(name)) = branch.name() else {
                continue;
            };
            // The tip commit's time (0 = treated as oldest if it can't be fetched).
            let t = branch
                .get()
                .peel_to_commit()
                .map(|c| c.time().seconds())
                .unwrap_or(0);
            out.push((name.to_string(), is_current, t));
        }
    }
    // Newest first (descending). Same-time entries are stabilized by name.
    out.sort_by(|a, b| b.2.cmp(&a.2).then_with(|| a.0.cmp(&b.0)));
    out
}

/// `branches_by_recency` for a repository libgit2 will not open. One `git for-each-ref`.
///
/// `%(committerdate:unix)` on a branch ref is the tip commit's committer time — the same clock the
/// libgit2 path reads via `peel_to_commit().time().seconds()`. An unreadable timestamp sorts as
/// oldest (`0`), matching that path's `unwrap_or(0)`.
#[cfg(feature = "git")]
fn branches_by_recency_via_cli(root: &Path) -> Vec<(String, bool, i64)> {
    let Some(dir) = cli_dir(root) else {
        return Vec::new();
    };
    let Some(out) = git_read(
        &dir,
        [
            "for-each-ref",
            "--format=%(refname:short)%00%(HEAD)%00%(committerdate:unix)",
            REFS,
        ],
    ) else {
        return Vec::new();
    };
    let text = String::from_utf8_lossy(&out);
    let mut list: Vec<(String, bool, i64)> = text
        .lines()
        .filter_map(|line| {
            let mut it = line.split('\0');
            let name = it.next()?;
            let head = it.next()?;
            let t = it.next().unwrap_or("").trim().parse::<i64>().unwrap_or(0);
            (!name.is_empty()).then(|| (name.to_string(), head.trim() == "*", t))
        })
        .collect();
    list.sort_by(|a, b| b.2.cmp(&a.2).then_with(|| a.0.cmp(&b.0)));
    list
}

#[cfg(not(feature = "git"))]
#[cfg_attr(not(feature = "git"), allow(dead_code))]
pub fn branches_by_recency(_root: &Path) -> Vec<(String, bool, i64)> {
    Vec::new()
}

/// The tip commit OID of local branch `name` (used to pin the base branch to lane0).
/// Returns None when not a repo / when the branch does not exist / when the feature is disabled.
#[cfg(feature = "git")]
pub fn branch_tip(root: &Path, name: &str) -> Option<String> {
    if !external_git_enabled() {
        return None;
    }
    let Some(repo) = open_repo(root) else {
        return branch_tip_via_cli(root, name);
    };
    let branch = repo.find_branch(name, git2::BranchType::Local).ok()?;
    let oid = branch.get().peel_to_commit().ok()?.id();
    Some(oid.to_string())
}

/// `branch_tip` for a repository libgit2 will not open. One `git rev-parse`.
///
/// The ref is spelled in full (`refs/heads/<name>`) so a branch can never be confused with a file
/// of the same name, and `^{commit}` peels it — together they are `find_branch(.., Local)` plus
/// `peel_to_commit()`.
#[cfg(feature = "git")]
fn branch_tip_via_cli(root: &Path, name: &str) -> Option<String> {
    let dir = cli_dir(root)?;
    git_read_token(
        &dir,
        ["rev-parse", "--verify", &format!("{REFS}{name}^{{commit}}")],
    )
}

#[cfg(not(feature = "git"))]
#[cfg_attr(not(feature = "git"), allow(dead_code))]
pub fn branch_tip(_root: &Path, _name: &str) -> Option<String> {
    None
}

/// One graph legend entry: branch name + its lane color + HEAD/base flags.
#[derive(Debug, Clone)]
pub struct LegendEntry {
    pub name: String,
    pub color: ratatui::style::Color,
    pub is_head: bool,
    pub is_base: bool,
}

/// Builds a "visible local branch -> lane color" legend from already-rendered graph rows.
/// Takes the color of each branch tip row's node (`●`/`◆`). Remotes/tags are excluded (local branch names only).
/// Order is **HEAD first, base next, then appearance order (topo = newest first)**.
#[cfg(feature = "git")]
pub fn legend_from_rows(
    rows: &[GraphRow],
    root: &Path,
    base_label: Option<&str>,
) -> Vec<LegendEntry> {
    use ratatui::style::Color;
    use std::collections::{HashMap, HashSet};
    let locals = branches(root);
    let local_names: HashSet<&str> = locals.iter().map(|b| b.name.as_str()).collect();
    let head_branch = locals.iter().find(|b| b.is_current).map(|b| b.name.clone());

    let mut order: Vec<String> = Vec::new();
    let mut color_of: HashMap<String, Color> = HashMap::new();
    for r in rows {
        if r.commit.is_none() || r.refs.is_empty() {
            continue;
        }
        let node_color = r
            .node_col
            .and_then(|i| r.graph.get(i))
            .and_then(|(_, st)| st.fg)
            .unwrap_or(Color::Reset);
        for tok in r.refs.split(',') {
            let tok = tok.trim();
            let name = tok.strip_prefix("HEAD -> ").unwrap_or(tok);
            if name == "HEAD" || name.starts_with("tag:") || !local_names.contains(name) {
                continue;
            }
            if color_of.contains_key(name) {
                continue;
            }
            color_of.insert(name.to_string(), node_color);
            order.push(name.to_string());
        }
    }
    let mut out: Vec<LegendEntry> = order
        .into_iter()
        .map(|name| {
            let is_head = head_branch.as_deref() == Some(name.as_str());
            let is_base = base_label == Some(name.as_str());
            let color = color_of.get(&name).copied().unwrap_or(Color::Reset);
            LegendEntry {
                name,
                color,
                is_head,
                is_base,
            }
        })
        .collect();
    // Stable sort: HEAD (first) → base → the rest keep their appearance order.
    out.sort_by_key(|e| (!e.is_head, !e.is_base));
    out
}

#[cfg(not(feature = "git"))]
#[cfg_attr(not(feature = "git"), allow(dead_code))]
pub fn legend_from_rows(
    _rows: &[GraphRow],
    _root: &Path,
    _base_label: Option<&str>,
) -> Vec<LegendEntry> {
    Vec::new()
}

/// Resolves the macOS-precomposed (NFC) relative pathspec `git2::DiffOptions::pathspec` needs for
/// `rel`, which (per `normalize_status_path`'s doc comment above) may be spelled NFD when it came
/// from a tree-selected (`canonicalize`/`read_dir`-sourced) path.
///
/// **Why this can't reuse `normalize_status_path`'s canonicalize-based approach**: that function
/// resolves *through the filesystem* to get the on-disk (NFD) spelling; here we need the opposite
/// — the spelling libgit2's diff pathspec matcher itself expects, which is **not** the on-disk
/// form. Confirmed empirically with a probe: the git **CLI** transparently accepts either an
/// NFD- or NFC-spelled pathspec argument (the same `core.precomposeunicode`-aware argv handling
/// that makes `statuses()`'s porcelain output always NFC regardless of what's on disk), but
/// `git2::DiffOptions::pathspec` requires an *exact* match against the tree/workdir iterator's own
/// precomposed candidate names: an NFD-spelled pathspec against a real NFD-named modified file
/// matched 0 deltas; the same string precomposed to NFC matched 1.
///
/// Resolved via a single **file-scoped** `git status --porcelain` call (the same machinery
/// `statuses()` already uses, just narrowed to one pathspec — not a whole-tree scan) — asking git
/// itself for the spelling it uses internally, rather than reimplementing Unicode NFC composition
/// (which would need a real Unicode database, not just a Hiragana/Katakana special case). Skips
/// the call entirely when `rel` is ASCII (the overwhelming common case, and NFC/NFD is a
/// non-issue for ASCII), and falls back to `rel` unchanged if the CLI call fails or reports
/// nothing for it (e.g. a path with no changes to report) — the subsequent pathspec-filtered diff
/// then correctly comes back empty rather than panicking or scanning the whole tree.
///
/// Gated to macOS for the same reason as `normalize_status_path`: Linux's `core.precomposeunicode`
/// defaults to false and filesystem names round-trip byte-for-byte, so there is no NFC/NFD
/// distinction to resolve there, and this would be a pure-overhead extra process spawn.
#[cfg(all(feature = "git", target_os = "macos"))]
fn precomposed_pathspec(workdir: &Path, rel: &str) -> String {
    if rel.is_ascii() {
        return rel.to_string();
    }
    let out = std::process::Command::new("git")
        .current_dir(workdir)
        .args([
            "--no-optional-locks", // read-only background call (same etiquette as statuses())
            "status",
            "--porcelain=v1",
            "-z",
            "-uall",
            "--",
            rel,
        ])
        .output();
    let Ok(out) = out else {
        return rel.to_string();
    };
    if !out.status.success() {
        return rel.to_string();
    }
    let Some(rec) = out.stdout.split(|&b| b == 0).find(|r| r.len() >= 4) else {
        return rel.to_string();
    };
    String::from_utf8_lossy(&rec[3..]).to_string()
}

#[cfg(all(feature = "git", not(target_os = "macos")))]
fn precomposed_pathspec(_workdir: &Path, rel: &str) -> String {
    rel.to_string()
}

/// Returns the working-tree diff of `file` (HEAD tree -> workdir, including the index) line by line.
/// Untracked files are treated as all-Added lines, as is the no-HEAD (unborn) case.
/// Returns an empty Vec when not a repo / on failure / when the feature is disabled. Never panics.
#[cfg(feature = "git")]
pub fn file_diff(root: &Path, file: &Path) -> Vec<DiffLine> {
    if !external_git_enabled() {
        return Vec::new();
    }
    let Some(repo) = open_repo(root) else {
        return file_diff_via_cli(root, file);
    };
    let Some(workdir) = repo.workdir() else {
        return Vec::new();
    };
    let workdir = workdir
        .canonicalize()
        .unwrap_or_else(|_| workdir.to_path_buf());
    // The pathspec is passed as workdir-relative. Even for an absolute path, try to make it
    // relative via strip_prefix.
    let file_abs = file.canonicalize().unwrap_or_else(|_| file.to_path_buf());
    let rel = file_abs
        .strip_prefix(&workdir)
        .unwrap_or(&file_abs)
        .to_path_buf();
    let rel_str = rel.to_string_lossy().to_string();
    let rel_str = precomposed_pathspec(&workdir, &rel_str);

    // The HEAD tree (None = treated as an empty tree if unborn).
    let head_tree = repo.head().ok().and_then(|h| h.peel_to_tree().ok());

    let mut opts = git2::DiffOptions::new();
    opts.include_untracked(true)
        .recurse_untracked_dirs(true)
        // Also emit line content for untracked files (by default only the "untracked" fact
        // shows, with no line diff).
        .show_untracked_content(true)
        .pathspec(&rel_str);

    let diff = match repo.diff_tree_to_workdir_with_index(head_tree.as_ref(), Some(&mut opts)) {
        Ok(d) => d,
        Err(_) => return Vec::new(),
    };
    collect_diff_lines(&diff, false)
}

/// `file_diff` for a repository libgit2 will not open: HEAD's blob against the file on disk.
///
/// One child process (`cat-file`, and none for the disk read), which matters because
/// this feeds the change gutter — though `App::git_gutter_marks` caches per path, so it is once
/// per file opened, not once per keystroke.
///
/// The missing-side cases line up with the libgit2 options this replaces: no blob at HEAD means
/// untracked or unborn, which `include_untracked`/`show_untracked_content` render as all-added;
/// no file on disk means deleted, which renders as all-removed. Both absent contributes nothing.
#[cfg(feature = "git")]
fn file_diff_via_cli(root: &Path, file: &Path) -> Vec<DiffLine> {
    let Some(dir) = cli_dir(root) else {
        return Vec::new();
    };
    let file_abs = file.canonicalize().unwrap_or_else(|_| file.to_path_buf());
    let Ok(rel) = file_abs.strip_prefix(&dir) else {
        return Vec::new(); // outside this repository's working tree
    };
    let before = cli_blob(&dir, "HEAD", rel);
    let after = std::fs::read(&file_abs).ok();
    let mut out = Vec::new();
    push_file_diff(&mut out, rel, before.as_deref(), after.as_deref(), false);
    out
}

#[cfg(not(feature = "git"))]
pub fn file_diff(_root: &Path, _file: &Path) -> Vec<DiffLine> {
    Vec::new()
}

/// Line-level diff between two in-memory contents (`old` → `new`), producing the same `DiffLine`
/// shape as `file_diff` so the existing GitDiff renderer consumes it unchanged. Used by the follow
/// baseline diff, where `old` is the file's content at follow-start and `new` is its content now.
/// Emits hunks with 3 lines of context (like git), not the whole file. Pure text — no git needed,
/// so it is available in the no-git build too.
#[cfg_attr(not(feature = "git"), allow(dead_code))]
pub fn diff_contents(old: &str, new: &str) -> Vec<DiffLine> {
    let diff = similar::TextDiff::from_lines(old, new);
    let mut out = Vec::new();
    for group in diff.grouped_ops(3) {
        for op in &group {
            for change in diff.iter_changes(op) {
                let raw = change.value();
                // Drop the trailing newline (DiffLine.text's contract is that it never includes
                // one, same as file_diff).
                let text = raw
                    .strip_suffix('\n')
                    .unwrap_or(raw)
                    .strip_suffix('\r')
                    .unwrap_or_else(|| raw.strip_suffix('\n').unwrap_or(raw))
                    .to_string();
                let old_no = change.old_index().map(|i| i as u32 + 1);
                let new_no = change.new_index().map(|i| i as u32 + 1);
                let kind = match change.tag() {
                    similar::ChangeTag::Equal => DiffLineKind::Context,
                    similar::ChangeTag::Delete => DiffLineKind::Removed,
                    similar::ChangeTag::Insert => DiffLineKind::Added,
                };
                out.push(DiffLine {
                    kind,
                    old_no,
                    new_no,
                    text,
                });
            }
        }
    }
    out
}

/// The current HEAD commit's full SHA (pinned at follow-start so a clean-at-follow-start file's
/// baseline stays fixed even if the agent commits mid-session). None if unborn / not a repo.
#[cfg(feature = "git")]
pub fn head_commit_id(root: &Path) -> Option<String> {
    if !external_git_enabled() {
        return None;
    }
    let Some(repo) = open_repo(root) else {
        // `rev-parse --verify HEAD^{commit}` is exactly `head()?.peel_to_commit()?`, and fails the
        // same way before the first commit.
        let dir = cli_dir(root)?;
        return git_read_token(&dir, ["rev-parse", "--verify", "HEAD^{commit}"]);
    };
    let commit = repo.head().ok()?.peel_to_commit().ok()?;
    Some(commit.id().to_string())
}

/// The bytes of `file` as of commit `sha` (the baseline for a file that was clean at follow-start).
/// None if the commit/path is unresolvable (e.g. the file did not exist then → caller treats it as
/// all-added). `file` is absolute; it is made relative to the repo workdir for the tree lookup.
#[cfg(feature = "git")]
pub fn blob_at(root: &Path, sha: &str, file: &Path) -> Option<Vec<u8>> {
    if !external_git_enabled() {
        return None;
    }
    let Some(repo) = open_repo(root) else {
        let dir = cli_dir(root)?;
        let file_abs = file.canonicalize().unwrap_or_else(|_| file.to_path_buf());
        let rel = file_abs.strip_prefix(&dir).ok()?;
        return cli_blob(&dir, sha, rel);
    };
    let workdir = repo.workdir()?;
    let workdir = workdir
        .canonicalize()
        .unwrap_or_else(|_| workdir.to_path_buf());
    let file_abs = file.canonicalize().unwrap_or_else(|_| file.to_path_buf());
    let rel = file_abs.strip_prefix(&workdir).ok()?;
    let oid = git2::Oid::from_str(sha).ok()?;
    let tree = repo.find_commit(oid).ok()?.tree().ok()?;
    let entry = tree.get_path(rel).ok()?;
    let obj = entry.to_object(&repo).ok()?;
    Some(obj.as_blob()?.content().to_vec())
}

/// Walks a git2 Diff and assembles the sequence of DiffLines.
/// When `with_headers` = true, inserts a Context line at each file boundary (text = bare path, line numbers None) (for commit_diff). The renderer turns it into a boxed header.
#[cfg(feature = "git")]
fn collect_diff_lines(diff: &git2::Diff, with_headers: bool) -> Vec<DiffLine> {
    use std::cell::RefCell;
    let lines: RefCell<Vec<DiffLine>> = RefCell::new(Vec::new());
    let last_file: RefCell<Option<String>> = RefCell::new(None);

    let _ = diff.foreach(
        &mut |delta, _| {
            if with_headers {
                let path = delta
                    .new_file()
                    .path()
                    .or_else(|| delta.old_file().path())
                    .map(|p| p.to_string_lossy().to_string())
                    .unwrap_or_default();
                let mut lf = last_file.borrow_mut();
                if lf.as_deref() != Some(path.as_str()) {
                    // A file-boundary header: text = **the bare path**, both line numbers None
                    // (= the marker that it's a header). The render side (gitdiff) turns it into a
                    // boxed header and switches per-file highlighting by extension.
                    lines.borrow_mut().push(DiffLine {
                        kind: DiffLineKind::Context,
                        old_no: None,
                        new_no: None,
                        text: path.clone(),
                    });
                    *lf = Some(path);
                }
            }
            true
        },
        None,
        None,
        Some(&mut |_delta, _hunk, line| {
            let kind = match line.origin() {
                '+' => DiffLineKind::Added,
                '-' => DiffLineKind::Removed,
                _ => DiffLineKind::Context,
            };
            let text = String::from_utf8_lossy(line.content())
                .trim_end_matches(['\n', '\r'])
                .to_string();
            lines.borrow_mut().push(DiffLine {
                kind,
                old_no: line.old_lineno(),
                new_no: line.new_lineno(),
                text,
            });
            true
        }),
    );
    lines.into_inner()
}

/// Returns the list of changed files (including untracked) as one entry per file, sorted by path.
///
/// **Computation is delegated to the `git status` CLI** (same reason as `statuses()`). git2's (libgit2)
/// `repo.statuses()` is orders of magnitude slower on working trees holding huge ignored trees (target/build, etc.) —
/// measured: on EarthApp (41GB), libgit2 ≈600ms vs CLI ≈20ms. Because it ran synchronously every time the changes hub (`o`)
/// was opened, this cost showed up each time. Only repo discovery uses git2 (discover is lightweight because it does not compute status).
#[cfg(feature = "git")]
pub fn changed_files(root: &Path) -> Vec<ChangeEntry> {
    if !external_git_enabled() {
        return Vec::new();
    }
    use std::os::unix::ffi::OsStrExt;
    let mut out = Vec::new();
    let Some(workdir) = workdir(root) else {
        return out; // not a repo / a bare repo
    };

    // porcelain v1 -z: each record is `XY <path>`, NUL-separated. When it's a rename/copy (X or Y
    // is R/C), the NUL field right after is the old path (the new path comes first — confirmed by
    // measurement). -uall = recurse into untracked dirs too, --ignored=no = exclude ignored, and
    // -c status.renames=true forces rename detection (emits R regardless of the user's config).
    let cmd_out = std::process::Command::new("git")
        .current_dir(&workdir)
        .args([
            "--no-optional-locks", // no optional locks (same reason as statuses())
            "-c",
            "status.renames=true",
            "status",
            "--porcelain=v1",
            "-z",
            "-uall",
            "--ignored=no",
        ])
        .output();
    let Ok(cmd_out) = cmd_out else {
        return out;
    };
    if !cmd_out.status.success() {
        return out;
    }

    let mut fields = cmd_out.stdout.split(|&b| b == 0);
    while let Some(rec) = fields.next() {
        // Each record is `XY` + a separating space + the path. Discard fractions (a trailing
        // empty field, etc.).
        if rec.len() < 4 {
            continue;
        }
        let (x, y) = (rec[0], rec[1]);
        let is_rename = x == b'R' || x == b'C' || y == b'R' || y == b'C';
        if is_rename {
            // Consume and discard the old-path field (the status attaches to the new path =
            // the current record).
            let _ = fields.next();
        }
        // staged = whether the INDEX side (X column) has a change. ' ' = no index change / '?' =
        // untracked / 'U' = unmerged are not treated as staged (equivalent to the git2 version's
        // INDEX_NEW/MODIFIED/DELETED/RENAMED/TYPECHANGE).
        let staged = matches!(x, b'M' | b'A' | b'D' | b'R' | b'C' | b'T');
        let rel = PathBuf::from(std::ffi::OsStr::from_bytes(&rec[3..]));
        out.push(ChangeEntry {
            path: workdir.join(rel),
            status: classify_porcelain(x, y),
            staged,
        });
    }
    out.sort_by(|a, b| a.path.cmp(&b.path));
    out
}

#[cfg(not(feature = "git"))]
pub fn changed_files(_root: &Path) -> Vec<ChangeEntry> {
    Vec::new()
}

/// Returns up to `max` commits, newest first, starting from HEAD.
#[cfg(feature = "git")]
pub fn log(root: &Path, max: usize) -> Vec<CommitInfo> {
    let mut out = Vec::new();
    if !external_git_enabled() {
        return out;
    }
    let Some(repo) = open_repo(root) else {
        return log_via_cli(root, max);
    };
    let Ok(mut walk) = repo.revwalk() else {
        return out;
    };
    if walk.push_head().is_err() {
        return out; // unborn, etc.
    }
    let _ = walk.set_sorting(git2::Sort::TIME);
    for oid in walk.flatten().take(max) {
        let Ok(commit) = repo.find_commit(oid) else {
            continue;
        };
        let id = oid.to_string();
        let short = id.chars().take(7).collect();
        // git2 0.21: summary() is Result<Option<&str>, Error>. None / non-UTF-8 becomes an empty string.
        let summary = commit.summary().ok().flatten().unwrap_or("").to_string();
        let author = commit.author().name().unwrap_or("").to_string();
        let time_epoch = commit.time().seconds();
        out.push(CommitInfo {
            id,
            short,
            summary,
            author,
            time_epoch,
        });
    }
    out
}

/// `log` for a repository libgit2 will not open. One `git log`.
///
/// Formatted the same way `dag_commits` (which has always been CLI-backed) formats its own log:
/// `%x1f`-separated fields, one commit per line, with a leading separator so the split yields a
/// fixed number of fields. That is safe precisely because none of these fields can contain a
/// newline — `%s` is a subject, which git folds to a single line, and an author name and a commit
/// header timestamp cannot hold one either. (`commit_meta`, which needs the multi-line `%B`, uses
/// NUL separation instead.) `git log`'s default ordering is reverse-chronological, the same as the
/// libgit2 path's `Sort::TIME`, and it fails on an unborn HEAD, yielding the same empty list.
#[cfg(feature = "git")]
fn log_via_cli(root: &Path, max: usize) -> Vec<CommitInfo> {
    let Some(dir) = cli_dir(root) else {
        return Vec::new();
    };
    let Some(out) = git_read(
        &dir,
        [
            "log",
            &format!("--max-count={max}"),
            "--format=%x1f%H%x1f%h%x1f%an%x1f%ct%x1f%s",
        ],
    ) else {
        return Vec::new();
    };
    String::from_utf8_lossy(&out)
        .lines()
        .filter_map(|line| {
            // Bound in the format's own order (%H %h %an %ct %s) rather than in the struct's, so
            // the fields and the placeholders can be read against each other — `it` is stateful,
            // and a reordering here would silently shift every value by one.
            let mut it = line.split('\u{1f}');
            let _lead = it.next(); // the leading %x1f, so the split has a fixed arity
            let id = it.next()?.to_string();
            if id.is_empty() {
                return None;
            }
            let short = it.next().unwrap_or("").to_string();
            let author = it.next().unwrap_or("").to_string();
            let time_epoch = it.next().unwrap_or("").parse().unwrap_or(0);
            let summary = it.next().unwrap_or("").to_string();
            Some(CommitInfo {
                id,
                short,
                summary,
                author,
                time_epoch,
            })
        })
        .collect()
}

#[cfg(not(feature = "git"))]
pub fn log(_root: &Path, _max: usize) -> Vec<CommitInfo> {
    Vec::new()
}

/// Returns the diff of commit `id` (against its first parent; a root commit diffs against the empty tree) for all files.
/// Inserts a Context header line (bare path, line numbers None) at the start of each file.
#[cfg(feature = "git")]
pub fn commit_diff(root: &Path, id: &str) -> Vec<DiffLine> {
    if !external_git_enabled() {
        return Vec::new();
    }
    let Some(repo) = open_repo(root) else {
        return commit_diff_via_cli(root, id);
    };
    let Ok(oid) = git2::Oid::from_str(id) else {
        return Vec::new();
    };
    let Ok(commit) = repo.find_commit(oid) else {
        return Vec::new();
    };
    let Ok(new_tree) = commit.tree() else {
        return Vec::new();
    };
    let parent_tree = commit.parent(0).ok().and_then(|p| p.tree().ok());
    let diff = match repo.diff_tree_to_tree(parent_tree.as_ref(), Some(&new_tree), None) {
        Ok(d) => d,
        Err(_) => return Vec::new(),
    };
    collect_diff_lines(&diff, true)
}

/// `commit_diff` for a repository libgit2 will not open: which paths the commit touched, then both
/// sides of each one.
///
/// `diff-tree --root` covers the root commit in the same call as every other (it diffs against
/// nothing rather than failing), which is how the libgit2 path's `parent(0)`-or-empty-tree choice
/// is reproduced without asking about parentage first: `<id>^` simply has no blob for a root
/// commit, and "no blob on the old side" already means added. `^` is git's first-parent operator,
/// matching `commit.parent(0)`.
#[cfg(feature = "git")]
fn commit_diff_via_cli(root: &Path, id: &str) -> Vec<DiffLine> {
    let Some(dir) = cli_dir(root) else {
        return Vec::new();
    };
    let Some(listing) = git_read(
        &dir,
        [
            "diff-tree",
            "-r",
            "--root",
            "--no-commit-id",
            "--name-only",
            "--no-renames",
            "-z",
            id,
            "--",
        ],
    ) else {
        return Vec::new(); // unresolvable commit
    };
    let parent = format!("{id}^");
    let paths = cli_paths(&listing);
    // Both sides of every file in one `cat-file` (see [`cat_file_batch`]): the old side for all
    // paths, then the new side for all paths, so slot `i` and slot `n + i` are one file's pair.
    let specs: Vec<_> = paths
        .iter()
        .map(|rel| blob_spec(&parent, rel))
        .chain(paths.iter().map(|rel| blob_spec(id, rel)))
        .collect();
    let blobs = cat_file_batch(&dir, &specs);
    let (before, after) = blobs.split_at(paths.len());
    let mut out = Vec::new();
    for ((rel, before), after) in paths.iter().zip(before).zip(after) {
        push_file_diff(&mut out, rel, before.as_deref(), after.as_deref(), true);
    }
    out
}

/// **Metadata** of a commit (for the heading at the top of the detail view). `message` is the full %B-equivalent text
/// (subject + body, multi-line, trailing newline removed). Shown above the diff on Enter in log/graph.
#[derive(Debug, Clone)]
pub struct CommitMeta {
    /// Full hash (40 digits). Used by the copy feature's "full hash."
    #[cfg_attr(not(feature = "git"), allow(dead_code))]
    pub id: String,
    pub short: String,
    pub author: String,
    pub date: String,
    pub message: String,
}

/// Returns the metadata of commit `id` (short hash, author, date, full message).
/// Returns None when not a repo / when the commit does not exist / when the feature is disabled.
#[cfg(feature = "git")]
pub fn commit_meta(root: &Path, id: &str) -> Option<CommitMeta> {
    if !external_git_enabled() {
        return None;
    }
    let Some(repo) = open_repo(root) else {
        return commit_meta_via_cli(root, id);
    };
    let oid = git2::Oid::from_str(id).ok()?;
    let commit = repo.find_commit(oid).ok()?;
    let message = commit.message().unwrap_or("").trim_end().to_string();
    let author = commit.author().name().unwrap_or("").to_string();
    let secs = commit.time().seconds().max(0) as u64;
    let date = crate::fileops::format_epoch_short(secs);
    Some(CommitMeta {
        id: id.to_string(),
        short: short_id(id),
        author,
        date,
        message,
    })
}

/// The 7-character abbreviation shown in the detail heading, taken from the caller's own `id`
/// string rather than from git — both paths must agree, and `id` is the identity the caller is
/// already displaying elsewhere.
#[cfg(feature = "git")]
fn short_id(id: &str) -> String {
    id[..id.len().min(7)].to_string()
}

/// `commit_meta` for a repository libgit2 will not open. One `git show -s`.
///
/// The message is `%B` (subject *and* body, multi-line), so the fields are NUL-separated and the
/// message is taken as "everything after the second separator" — a commit message may contain any
/// byte, so it must never be split on. Trailing whitespace is trimmed, as `commit.message()`'s
/// consumer does. A commit that does not resolve makes `git show` fail, giving the same `None`.
#[cfg(feature = "git")]
fn commit_meta_via_cli(root: &Path, id: &str) -> Option<CommitMeta> {
    let dir = cli_dir(root)?;
    let out = git_read(&dir, ["show", "-s", "--format=%an%x00%ct%x00%B", id, "--"])?;
    let text = String::from_utf8_lossy(&out);
    let mut it = text.splitn(3, '\0');
    let author = it.next()?.to_string();
    let secs: i64 = it.next()?.trim().parse().unwrap_or(0);
    let message = it.next().unwrap_or("").trim_end().to_string();
    Some(CommitMeta {
        id: id.to_string(),
        short: short_id(id),
        author,
        date: crate::fileops::format_epoch_short(secs.max(0) as u64),
        message,
    })
}

#[cfg(not(feature = "git"))]
#[cfg_attr(not(feature = "git"), allow(dead_code))]
pub fn commit_meta(_root: &Path, _id: &str) -> Option<CommitMeta> {
    None
}

#[cfg(not(feature = "git"))]
pub fn commit_diff(_root: &Path, _id: &str) -> Vec<DiffLine> {
    Vec::new()
}

/// Resolves the target repo workdir for write operations (prefers discovery, falls back to root on
/// failure — `git` itself walks up from a subdirectory just fine, so root is a safe last resort).
#[cfg(feature = "git")]
fn workdir_of(root: &Path) -> PathBuf {
    workdir(root).unwrap_or_else(|| root.to_path_buf())
}

/// Picks the single line out of `git`'s stderr that's worth showing the user.
///
/// Two facts about how this ends up on screen drive the order here: the flash footer renders
/// the message as **one line**, clipped at the terminal width — an embedded newline doesn't
/// wrap, it just burns width before the useful part ever gets there — and `git` routinely
/// writes progress chatter to stderr *before* the line that actually explains the failure (e.g.
/// `worktree add` prints `Preparing worktree (checking out '<branch>')` ahead of its `fatal:`
/// line). So: prefer a `fatal:`-prefixed line, then `error:`, then fall back to the last
/// non-empty line (covers subcommands whose failure line uses neither prefix). Only when stderr
/// was empty do we synthesize a message from the exit status.
#[cfg(feature = "git")]
fn git_error_message(out: &std::process::Output) -> String {
    let stderr = String::from_utf8_lossy(&out.stderr);
    let lines: Vec<&str> = stderr
        .lines()
        .map(str::trim)
        .filter(|l| !l.is_empty())
        .collect();
    if let Some(l) = lines.iter().find(|l| l.starts_with("fatal:")) {
        return (*l).to_string();
    }
    if let Some(l) = lines.iter().find(|l| l.starts_with("error:")) {
        return (*l).to_string();
    }
    if let Some(l) = lines.last() {
        return (*l).to_string();
    }
    format!("git exited with {}", out.status)
}

/// Runs the `git` CLI in the repo workdir. A non-zero exit returns an Err whose message is
/// `git`'s own `fatal:`/`error:` line (see `git_error_message`) — deliberately *not* the command
/// line that was run: the caller just pressed the key that triggered it, so echoing back what it
/// did only pushes the actual reason further right, off the edge of the flash line.
#[cfg(feature = "git")]
fn run_git(root: &Path, args: &[&str]) -> anyhow::Result<()> {
    use anyhow::{anyhow, Context};
    if !external_git_enabled() {
        return Err(anyhow!("git disabled (external.git = false)"));
    }
    let cwd = workdir_of(root);
    let mut cmd = std::process::Command::new("git");
    cmd.current_dir(&cwd).args(args);
    // Test-only: `git_error_message` (below) matches on the *literal English* `fatal:`/`error:`
    // prefix, which several tests assert leads the flash message. Git translates that line
    // whenever a matching locale catalog is installed (a real, reachable environment — e.g.
    // `LC_ALL=tr_TR.UTF-8` — not a hypothetical one), which would otherwise make those
    // assertions flaky depending on which machine/locale runs the suite. Pin the *child*
    // process's locale to `C` so the message is always the untranslated source string,
    // regardless of the ambient environment the test binary itself runs under. `#[cfg(test)]`
    // means this is compiled only into test binaries, never the shipped binary — real users
    // still see git's messages translated to their own locale exactly as before.
    #[cfg(test)]
    cmd.env("LC_ALL", "C");
    let out = cmd
        .output()
        .with_context(|| format!("failed to launch git {}", args.join(" ")))?;
    if out.status.success() {
        Ok(())
    } else {
        Err(anyhow!(git_error_message(&out)))
    }
}

/// Stages `file` (git add -- <file>).
#[cfg(feature = "git")]
pub fn stage(root: &Path, file: &Path) -> anyhow::Result<()> {
    run_git(root, &["add", "--", &file.to_string_lossy()])
}

/// Unstages `file` (git reset -q HEAD -- <file>).
#[cfg(feature = "git")]
pub fn unstage(root: &Path, file: &Path) -> anyhow::Result<()> {
    run_git(
        root,
        &["reset", "-q", "HEAD", "--", &file.to_string_lossy()],
    )
}

/// **Stages all** changes (git add -A: modified/new/deleted all go to the index).
#[cfg(feature = "git")]
pub fn stage_all(root: &Path) -> anyhow::Result<()> {
    run_git(root, &["add", "-A"])
}

/// **Unstages everything** (git reset -q HEAD: resets the index to HEAD). Leaves the working tree unchanged.
#[cfg(feature = "git")]
pub fn unstage_all(root: &Path) -> anyhow::Result<()> {
    run_git(root, &["reset", "-q", "HEAD"])
}

/// Discards tracked changes to `file` (git checkout -q -- <file>).
#[cfg(feature = "git")]
pub fn discard(root: &Path, file: &Path) -> anyhow::Result<()> {
    run_git(root, &["checkout", "-q", "--", &file.to_string_lossy()])
}

/// Commits staged changes (git commit -m <message>).
#[cfg(feature = "git")]
pub fn commit(root: &Path, message: &str) -> anyhow::Result<()> {
    run_git(root, &["commit", "-m", message])
}

/// Switches to branch `name` (git switch <name>). git refuses (Err) if uncommitted changes conflict.
/// Uses `switch` rather than `checkout`: it removes the ambiguity between branch and path names and avoids accidental detached HEAD
/// (a switch-only command that does not pull in the file-restore feature). Requires Git >= 2.23.
#[cfg(feature = "git")]
pub fn checkout(root: &Path, name: &str) -> anyhow::Result<()> {
    run_git(root, &["switch", name])
}

/// Creates a new branch and switches to it (git switch -c <name>). git refuses (Err) if the name already exists.
#[cfg(feature = "git")]
pub fn create_branch(root: &Path, name: &str) -> anyhow::Result<()> {
    run_git(root, &["switch", "-c", name])
}

/// Deletes a branch. `force` = false uses `-d` (git refuses unmerged branches = safe) / true uses `-D` (force).
/// git refuses the currently checked-out branch.
#[cfg(feature = "git")]
pub fn delete_branch(root: &Path, name: &str, force: bool) -> anyhow::Result<()> {
    let flag = if force { "-D" } else { "-d" };
    run_git(root, &["branch", flag, name])
}

/// Creates a new **linked worktree** (`git worktree add`) at `path`, checked out to `branch`.
/// `create_branch=true` also creates `branch` fresh (`-b`, starting from HEAD — same starting
/// point as `create_branch()`'s `switch -c`); `create_branch=false` checks out an existing branch
/// (no `-b`). The caller (`App::dialog_submit`'s `PendingOp::WorktreeCreate` arm) decides which by
/// probing `branch_tip` first — this function just executes whichever was decided, it does not
/// re-probe.
///
/// No `--no-optional-locks` here, unlike `worktrees()`/`statuses()`/`ignored()`: that flag is
/// this codebase's etiquette for *background reads* not to contend with a concurrent user-facing
/// write (e.g. so `git pull` never trips on a lock our own idle status scan happens to be
/// holding). `worktree add` is the opposite — a write the user just explicitly triggered by
/// submitting the dialog — so it takes the same lock any other write here does, same as `stage`/
/// `commit`/`checkout`/`create_branch` right above.
///
/// Errors surface as `git`'s own `fatal:` line via `run_git`'s `git_error_message` (same contract
/// as `create_branch`/`checkout` — the caller flashes it as-is). Real cases hit in practice: the
/// target directory already has content (`fatal: '<path>' already exists` — an *empty* directory
/// is fine, git happily uses it), the branch is already checked out by another worktree (`fatal:
/// '<branch>' is already used by worktree at '<path>'`), and — defensively, since the caller
/// already checked via `branch_tip` — `create_branch=true` racing an existing branch name (`fatal:
/// a branch named '<branch>' already exists`).
#[cfg(feature = "git")]
pub fn worktree_add(
    root: &Path,
    path: &Path,
    branch: &str,
    create_branch: bool,
) -> anyhow::Result<()> {
    let path = path.to_string_lossy();
    if create_branch {
        run_git(root, &["worktree", "add", "-b", branch, &path])
    } else {
        run_git(root, &["worktree", "add", &path, branch])
    }
}

/// What a commit-graph node **means**, independent of the glyph that draws it. The backend decides
/// the kind; [`crate::ui::icons::node_glyph`] decides the glyph. Keeping the two apart is what lets
/// the node cell be located by position (`GraphRow::node_col`) instead of by matching on the
/// character — so a second VCS can bring its own symbols without silently breaking the code that
/// paints the legend and the selected row.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[cfg_attr(not(feature = "git"), allow(dead_code))]
pub enum NodeKind {
    /// An ordinary commit (one parent, or the root).
    Normal,
    /// A merge (two or more parents).
    Merge,
    /// The working copy's own row (git: the "Uncommitted changes" pseudo-row; jj: `@`, a real
    /// commit).
    WorkingCopy,
    /// A commit that cannot be rewritten (jj's `immutable`, which includes the root).
    Immutable,
    /// A commit holding a conflict. jj keeps conflicts in commits rather than blocking on them, so
    /// this is a state to show, not an error to stop at.
    Conflict,
}

/// One row of the commit graph (`G`: SourceTree / Git Graph style). `graph` = the (char, style) sequence of the colored lane area;
/// `commit` = the commit on that row (Some = commit row / None = connector-only row).
#[derive(Debug, Clone)]
pub struct GraphRow {
    pub graph: Vec<(String, ratatui::style::Style)>,
    /// What this row's node is (None on connector-only rows).
    #[cfg_attr(not(feature = "git"), allow(dead_code))]
    pub node: Option<NodeKind>,
    /// Index into `graph` of the node cell (None on connector-only rows). **Locate the node with
    /// this, never by comparing the glyph** — the glyph is a per-VCS presentation detail.
    #[cfg_attr(not(feature = "git"), allow(dead_code))]
    pub node_col: Option<usize>,
    pub commit: Option<String>,
    pub short: String,
    pub subject: String,
    pub author: String,
    pub date: String,
    pub refs: String,
    /// Pseudo-row: uncommitted working-tree changes (SourceTree/Git Graph's "Uncommitted changes").
    /// `commit` is None, but the cursor can rest on it and `Enter` opens worktree_diff.
    pub worktree: bool,
}

/// Turns the commit graph into rows by **assigning lanes ourselves from the DAG (parent-ID lists)**.
/// `git log --graph`'s diagonal lines (`/ \`) clash with the box-based, angular TUI, so they are not used;
/// connections use angular box-drawing (`│ ─ ├ ┤ ┌ ┐ └ ┘ ┼` plus nodes `● normal / ◆ merge`).
/// Node/connector colors are **that lane's color** (cyclic palette). **lane0 (base, the left trunk) has a fixed color** so it is always visible.
/// Returns an empty Vec when not a repo / on failure / when the feature is disabled.
///
/// When `base` (the OID of the base branch tip) is given, its **first-parent chain is pinned to lane0 as a straight left line**
/// (Phase 2). With `None` it behaves as before (leftmost by appearance order). Non-base commits branch off to lane1 and beyond (right),
/// and unmerged branches keep their right lane all the way to the top. `docs/GRAPH-BASE-SPEC.md`.
#[cfg(feature = "git")]
pub fn graph_with_base(
    root: &Path,
    base: Option<&str>,
    lang: crate::i18n::Lang,
    refs: Option<&[String]>,
) -> Vec<GraphRow> {
    if !external_git_enabled() {
        return Vec::new();
    }
    let commits = dag_commits(root, 400, refs);
    let wt = worktree_payload(root, lang);
    lay_out_lanes(&commits, base, wt, crate::vcs::VcsKind::Git)
}

/// Raw DAG data for drawing the graph (with parent-ID lists). Does not use `--graph`; lays out ourselves.
#[cfg(feature = "git")]
#[derive(Clone)]
pub(crate) struct DagCommit {
    pub(crate) id: String,
    pub(crate) parents: Vec<String>,
    pub(crate) short: String,
    pub(crate) subject: String,
    pub(crate) author: String,
    pub(crate) date: String,
    pub(crate) refs: String,
    /// What the node means, when the backend knows something the shape of the DAG does not say —
    /// jj marks its working copy, its immutable commits and its conflicts. None falls back to
    /// "a merge has two parents, everything else is ordinary", which is all git can tell.
    pub(crate) kind: Option<NodeKind>,
}

/// Fetches the equivalent of `git log --topo-order --parents`, `%x1f`-delimited, into a sequence of `DagCommit`.
/// Passing `refs` restricts to **only those branches** (for the visibility toggle); `None`/empty uses `--all` (all branches).
#[cfg(feature = "git")]
fn dag_commits(root: &Path, max: usize, refs: Option<&[String]>) -> Vec<DagCommit> {
    let cwd = workdir_of(root);
    // %P = the parent IDs (space-separated). topo-order = never emits a parent before its child +
    // branches don't get mixed (the lanes stay stable).
    let fmt = "--format=%x1f%H%x1f%P%x1f%h%x1f%s%x1f%an%x1f%ad%x1f%D";
    let mut args: Vec<String> = vec![
        "log".into(),
        "--topo-order".into(),
        "--date=short".into(),
        "-n".into(),
        max.to_string(),
        fmt.into(),
    ];
    match refs {
        // Only the given branches. The caller must always include HEAD (to avoid an empty graph).
        Some(r) if !r.is_empty() => args.extend(r.iter().cloned()),
        _ => args.push("--all".into()),
    }
    let out = std::process::Command::new("git")
        .current_dir(&cwd)
        .args(&args)
        .output();
    let Ok(out) = out else {
        return Vec::new();
    };
    if !out.status.success() {
        return Vec::new();
    }
    let text = String::from_utf8_lossy(&out.stdout);
    let mut commits = Vec::new();
    for line in text.lines() {
        // There is a leading %x1f, so split gives ["", H, P, h, s, an, ad, D].
        let mut it = line.split('\u{1f}');
        let _lead = it.next();
        let id = it.next().unwrap_or("").to_string();
        if id.is_empty() {
            continue;
        }
        let parents = it
            .next()
            .unwrap_or("")
            .split_whitespace()
            .map(|s| s.to_string())
            .collect();
        commits.push(DagCommit {
            id,
            parents,
            short: it.next().unwrap_or("").to_string(),
            subject: it.next().unwrap_or("").to_string(),
            author: it.next().unwrap_or("").to_string(),
            date: it.next().unwrap_or("").to_string(),
            refs: it.next().unwrap_or("").to_string(),
            kind: None, // git reads the kind off the DAG's shape
        });
    }
    commits
}

/// An active lane (a vertical line waiting for an ancestor not yet drawn). `target` = the commit that comes to that lane next.
#[cfg(feature = "git")]
#[derive(Clone)]
struct Lane {
    target: String,
    color: ratatui::style::Color,
}

/// Assigns the DAG to lanes and returns the `GraphRow` sequence connected with angular box-drawing (a pure function = testable).
/// One lane = **2 columns** (node/`│` plus the gap on the right). The gap becomes `─` when connecting (`├─┐`/`├─┘`).
/// Rules: a commit sits on the leftmost matching lane (`my_lane`). The first parent continues its own lane; the second parent onward
/// opens a new lane **to the right** (fork = `├─┐` **below** the commit row). When multiple lanes reach the same commit, fold them into the leftmost
/// (merge = `├─┘` **above** the commit row). Lanes are not reused (parallel lanes waiting for the same ancestor merge at that ancestor),
/// so forks/merges are always to the right of my_lane = a simple implementation.
#[cfg(feature = "git")]
pub(crate) fn lay_out_lanes(
    commits: &[DagCommit],
    base: Option<&str>,
    wt: Option<(String, String)>,
    vcs: crate::vcs::VcsKind,
) -> Vec<GraphRow> {
    use ratatui::style::Color;

    // Uncommitted working-tree changes (a pseudo "Uncommitted changes" row).
    // **Splice it into the DAG as a virtual commit whose parent is HEAD's commit**, so lane
    // assignment automatically places `●` at the head of HEAD's lane and connects it to HEAD with
    // `│` (the diff target matches HEAD).
    // When HEAD is out of range / unborn, it degrades to a parentless, standalone node (leftmost).
    const WT_ID: &str = "\u{1}WORKTREE\u{1}";
    let work: Vec<DagCommit> = if let Some((subject, date)) = wt.as_ref() {
        let head = head_id_of(commits);
        let mut v = Vec::with_capacity(commits.len() + 1);
        v.push(DagCommit {
            id: WT_ID.to_string(),
            parents: head.into_iter().collect(),
            short: String::new(),
            subject: subject.clone(),
            author: String::new(),
            date: date.clone(),
            refs: String::new(),
            kind: Some(NodeKind::WorkingCopy),
        });
        v.extend(commits.iter().cloned());
        v
    } else {
        commits.to_vec()
    };
    let commits = &work[..];

    // A cyclic palette for non-base lanes. The base (lane0) has a fixed color (BASE, below).
    const PALETTE: [Color; 6] = [
        Color::Cyan,
        Color::Green,
        Color::Magenta,
        Color::Blue,
        Color::LightRed,
        Color::LightYellow,
    ];
    const BASE: Color = Color::White; // lane0 = base (the left trunk). A fixed color close to the theme's foreground.

    let mut lanes: Vec<Option<Lane>> = Vec::new();
    let mut next_color = 0usize;
    let mut rows: Vec<GraphRow> = Vec::new();

    // Phase 2: when a base is given, reserve lane0 for the base branch's tip. From then on, lane0
    // keeps following the base's first-parent (= a straight line on the left). Every other
    // commit/new tip/branch gets pushed out to lane1 and beyond (right) (`base_floor`).
    let base_floor = if let Some(tip) = base {
        lanes.push(Some(Lane {
            target: tip.to_string(),
            color: BASE,
        }));
        1
    } else {
        0
    };

    // Color for a new lane: lane0 is the fixed BASE, everything else cycles through the palette.
    let pick_color = |idx: usize, next: &mut usize| -> Color {
        if idx == 0 {
            BASE
        } else {
            let c = PALETTE[*next % PALETTE.len()];
            *next += 1;
            c
        }
    };
    // The first free lane number at or after `start` (append at the end if there is none). A
    // branch always comes out at my_lane+1 or beyond = to the right.
    let free_from = |lanes: &mut Vec<Option<Lane>>, start: usize| -> usize {
        if let Some(i) = (start..lanes.len()).find(|&i| lanes[i].is_none()) {
            i
        } else {
            lanes.push(None);
            lanes.len() - 1
        }
    };
    // Assemble the commit row (2 columns per lane). my_lane = the node, other active lanes = │,
    // gaps = blank.
    let commit_cells = |lanes: &[Option<Lane>], my_lane: usize, node: NodeKind, my_color: Color| {
        let n = lanes.len();
        let mut glyph = vec![' '; n.saturating_mul(2).saturating_sub(1).max(1)];
        let mut color = vec![Color::Reset; glyph.len()];
        for (i, l) in lanes.iter().enumerate() {
            if i == my_lane {
                glyph[i * 2] = crate::ui::icons::node_glyph(node, vcs);
                color[i * 2] = my_color;
            } else if let Some(l) = l {
                glyph[i * 2] = '│';
                color[i * 2] = l.color;
            }
        }
        cells_from(glyph, color)
    };

    for c in commits {
        // 1) The lane this commit rides on (the leftmost match). A new tip if there is none.
        let hits: Vec<usize> = lanes
            .iter()
            .enumerate()
            .filter_map(|(i, l)| match l {
                Some(l) if l.target == c.id => Some(i),
                _ => None,
            })
            .collect();
        let my_lane = if let Some(&first) = hits.first() {
            first
        } else {
            // A new tip. When a base is given, avoid lane0 and go to lane1 or beyond (so it
            // doesn't intrude on the base's straight line).
            let idx = free_from(&mut lanes, base_floor);
            let col = pick_color(idx, &mut next_color);
            lanes[idx] = Some(Lane {
                target: c.id.clone(),
                color: col,
            });
            idx
        };
        let my_color = lanes[my_lane].as_ref().map(|l| l.color).unwrap_or(BASE);

        // 2) A merge (multiple matching lanes) inserts a connector row **above** the commit row
        // and folds away the extra lanes.
        let merged: Vec<(usize, Color)> = hits
            .iter()
            .skip(1)
            .filter_map(|&i| lanes[i].as_ref().map(|l| (i, l.color)))
            .collect();
        if !merged.is_empty() {
            let conn = build_connector(&lanes, my_lane, my_color, &merged, false);
            rows.push(connector_row(conn));
            for &(i, _) in &merged {
                lanes[i] = None;
            }
        }

        // 3) The commit row. The *kind* is decided here (the backend knows the meaning); the glyph
        // comes from `icons::node_glyph`, and `node_col` records where it landed so nothing has to
        // find it by comparing characters. Two columns per lane, so the node sits at my_lane * 2.
        let node = c.kind.unwrap_or(if c.id == WT_ID {
            NodeKind::WorkingCopy
        } else if c.parents.len() >= 2 {
            NodeKind::Merge
        } else {
            NodeKind::Normal
        });
        rows.push(GraphRow {
            graph: commit_cells(&lanes, my_lane, node, my_color),
            node: Some(node),
            node_col: Some(my_lane * 2),
            commit: Some(c.id.clone()),
            short: c.short.clone(),
            subject: c.subject.clone(),
            author: c.author.clone(),
            date: c.date.clone(),
            refs: c.refs.clone(),
            worktree: false,
        });

        // 4) Assign parents. 1st parent = continues in its own lane, 2nd parent onward = a new
        // lane to the right (= a branch).
        let mut forked: Vec<(usize, Color)> = Vec::new();
        if c.parents.is_empty() {
            lanes[my_lane] = None; // root: the lane ends here.
        } else {
            if let Some(l) = lanes[my_lane].as_mut() {
                l.target = c.parents[0].clone();
            }
            for p in c.parents.iter().skip(1) {
                let idx = free_from(&mut lanes, my_lane + 1);
                let col = pick_color(idx, &mut next_color);
                lanes[idx] = Some(Lane {
                    target: p.clone(),
                    color: col,
                });
                forked.push((idx, col));
            }
        }

        // 5) A branch inserts a connector row **below** the commit row.
        if !forked.is_empty() {
            let conn = build_connector(&lanes, my_lane, my_color, &forked, true);
            rows.push(connector_row(conn));
        }

        // 6) Trim trailing empty lanes.
        while matches!(lanes.last(), Some(None)) {
            lanes.pop();
        }
    }

    // Turn the spliced-in virtual WT row back into the original "Uncommitted changes" pseudo-row:
    // clear commit, set worktree=true, and repaint the node (●) yellow-bold (keeping the lane position).
    if wt.is_some() {
        use ratatui::style::{Modifier, Style};
        if let Some(r) = rows
            .iter_mut()
            .find(|r| r.node == Some(NodeKind::WorkingCopy))
        {
            r.commit = None;
            r.worktree = true;
            r.short = String::new();
            let node = Style::default()
                .fg(Color::Yellow)
                .add_modifier(Modifier::BOLD);
            if let Some(cell) = r.node_col.and_then(|i| r.graph.get_mut(i)) {
                cell.1 = node;
            }
        }
    }

    // Line up every row's graph width to the max, so subject's left edge lines up.
    let maxw = rows.iter().map(|r| r.graph.len()).max().unwrap_or(0);
    for r in &mut rows {
        while r.graph.len() < maxw {
            r.graph
                .push((" ".to_string(), ratatui::style::Style::default()));
        }
    }
    rows
}

/// Returns the OID of the **commit that HEAD points to** within the DAG (the row whose `%D` ref names include "HEAD").
/// Catches both HEAD -> branch and detached ("HEAD"). Returns None when out of range / unborn.
#[cfg(feature = "git")]
fn head_id_of(commits: &[DagCommit]) -> Option<String> {
    commits
        .iter()
        .find(|c| {
            c.refs
                .split(',')
                .map(|r| r.trim())
                .any(|r| r == "HEAD" || r.starts_with("HEAD ->"))
        })
        .map(|c| c.id.clone())
}

/// (glyph, color) arrays -> `Vec<(String, Style)>` with trailing blanks trimmed.
#[cfg(feature = "git")]
fn cells_from(
    mut glyph: Vec<char>,
    mut color: Vec<ratatui::style::Color>,
) -> Vec<(String, ratatui::style::Style)> {
    use ratatui::style::Style;
    while glyph.len() > 1 && *glyph.last().unwrap() == ' ' {
        glyph.pop();
        color.pop();
    }
    glyph
        .into_iter()
        .zip(color)
        .map(|(g, c)| (g.to_string(), Style::new().fg(c)))
        .collect()
}

/// A connector-only `GraphRow` (no commit).
#[cfg(feature = "git")]
fn connector_row(graph: Vec<(String, ratatui::style::Style)>) -> GraphRow {
    GraphRow {
        graph,
        node: None,
        node_col: None,
        commit: None,
        short: String::new(),
        subject: String::new(),
        author: String::new(),
        date: String::new(),
        refs: String::new(),
        worktree: false,
    }
}

// Constants and table for deciding the connector character from "connection-direction bits
// (up/down/left/right)".
#[cfg(feature = "git")]
const DIR_U: u8 = 1;
#[cfg(feature = "git")]
const DIR_D: u8 = 2;
#[cfg(feature = "git")]
const DIR_L: u8 = 4;
#[cfg(feature = "git")]
const DIR_R: u8 = 8;

/// A set of connection directions -> a single angular box-drawing character. Also renders crossings of multi-fork/merge (┼ ┬ ┴ ├ ┤) correctly.
#[cfg(feature = "git")]
fn glyph_for(mask: u8) -> char {
    match mask {
        m if m == DIR_U | DIR_D => '│',
        m if m == DIR_L | DIR_R => '─',
        m if m == DIR_U | DIR_D | DIR_L | DIR_R => '┼',
        m if m == DIR_U | DIR_D | DIR_R => '├',
        m if m == DIR_U | DIR_D | DIR_L => '┤',
        m if m == DIR_U | DIR_L | DIR_R => '┴',
        m if m == DIR_D | DIR_L | DIR_R => '┬',
        m if m == DIR_D | DIR_L => '┐',
        m if m == DIR_U | DIR_L => '┘',
        m if m == DIR_D | DIR_R => '┌',
        m if m == DIR_U | DIR_R => '└',
        m if m == DIR_U => '│',
        m if m == DIR_D => '│',
        m if m == DIR_L || m == DIR_R => '─',
        _ => ' ',
    }
}

/// Builds a connector row with angular box-drawing (2 columns/lane). `endpoints` = the partner lanes extending to the right (index, color).
/// `is_fork` = true: branches to the right **below** the commit (corner `┐` = down + left). false: merges from the right **above** the commit (corner `┘` = up + left).
/// Each cell accumulates connection-direction bits and then `glyph_for` maps it to a character, so crossings where a horizontal pierces another lane
/// (a passing vertical = `┼` / mid-merge = `┴` / mid-fork = `┬`) do not break. Colors: corner = partner color, horizontal = that branch's color, my_lane = own color.
#[cfg(feature = "git")]
fn build_connector(
    active: &[Option<Lane>],
    my_lane: usize,
    my_color: ratatui::style::Color,
    endpoints: &[(usize, ratatui::style::Color)],
    is_fork: bool,
) -> Vec<(String, ratatui::style::Style)> {
    use ratatui::style::Color;
    let max_e = endpoints.iter().map(|&(i, _)| i).max().unwrap_or(my_lane);
    let lanes_n = active.len().max(max_e + 1);
    let width = lanes_n.saturating_mul(2).saturating_sub(1).max(1);
    let mut conn = vec![0u8; width];
    let mut color = vec![Color::Reset; width];
    let endcols: std::collections::HashSet<usize> = endpoints.iter().map(|&(i, _)| i).collect();

    // 1) A vertical lane just passing through (an active lane that is neither my_lane nor an
    // endpoint) = up+down.
    for (i, l) in active.iter().enumerate() {
        if i == my_lane || endcols.contains(&i) {
            continue;
        }
        if let Some(l) = l {
            conn[i * 2] |= DIR_U | DIR_D;
            color[i * 2] = l.color;
        }
    }
    // 2) my_lane is up+down (continuing) + right.
    conn[my_lane * 2] |= DIR_U | DIR_D | DIR_R;
    color[my_lane * 2] = my_color;
    // 3) Lay the horizontal all at once from my_lane's right neighbor to the farthest endpoint
    // (piercing through the lanes in between).
    for slot in conn[(my_lane * 2 + 1)..(max_e * 2)].iter_mut() {
        *slot |= DIR_L | DIR_R;
    }
    // 4) The endpoint's corner bits. Fork = down+left / merge = up+left. A nearer endpoint gets
    // pierced by the horizontal, so it becomes a T (┬/┴).
    let base = if is_fork {
        DIR_D | DIR_L
    } else {
        DIR_U | DIR_L
    };
    let mut sorted: Vec<(usize, Color)> = endpoints.to_vec();
    sorted.sort_by_key(|&(i, _)| i);
    let mut cursor = my_lane * 2; // Paint each horizontal cell with the color of the nearest endpoint to its right.
    for (e, c) in sorted {
        for slot in color[(cursor + 1)..(e * 2)].iter_mut() {
            if *slot == Color::Reset {
                *slot = c;
            }
        }
        conn[e * 2] |= base;
        color[e * 2] = c;
        cursor = e * 2;
    }

    let glyph: Vec<char> = conn.iter().map(|&m| glyph_for(m)).collect();
    cells_from(glyph, color)
}

#[cfg(not(feature = "git"))]
#[cfg_attr(not(feature = "git"), allow(dead_code))]
pub fn graph_with_base(
    _root: &Path,
    _base: Option<&str>,
    _lang: crate::i18n::Lang,
    _refs: Option<&[String]>,
) -> Vec<GraphRow> {
    Vec::new()
}

/// Returns the heading (`subject`) and the count breakdown (`date` field) of uncommitted working-tree changes.
/// Returns None when there are no changes. `lay_out_lanes` places the `●` on the graph at the head of the HEAD lane.
#[cfg(feature = "git")]
fn worktree_payload(root: &Path, lang: crate::i18n::Lang) -> Option<(String, String)> {
    let entries = changed_files(root);
    if entries.is_empty() {
        return None;
    }
    let (mut staged, mut unstaged, mut untracked) = (0usize, 0usize, 0usize);
    for e in &entries {
        match e.status {
            FileStatus::Untracked => untracked += 1,
            _ if e.staged => staged += 1,
            _ => unstaged += 1,
        }
    }
    let subject = crate::i18n::tr(lang, crate::i18n::Msg::UncommittedChanges).to_string();
    let date = match lang {
        crate::i18n::Lang::En => {
            format!("{staged} staged · {unstaged} unstaged · {untracked} untracked")
        }
        crate::i18n::Lang::Jp => {
            format!("{staged} ステージ済 · {unstaged} 未ステージ · {untracked} 未追跡")
        }
    };
    Some((subject, date))
}

/// Returns the uncommitted working-tree diff (HEAD -> index+workdir, including untracked content) separated by file-boundary headers.
/// For the full-screen diff when pressing `Enter` on the graph's "Uncommitted changes" row. Empty when outside a repo / on failure / when the feature is disabled.
#[cfg(feature = "git")]
pub fn worktree_diff(root: &Path) -> Vec<DiffLine> {
    if !external_git_enabled() {
        return Vec::new();
    }
    let Some(repo) = open_repo(root) else {
        // Fallback: HEAD (or the empty tree when unborn) against the working tree.
        let Some(dir) = cli_dir(root) else {
            return Vec::new();
        };
        let head = git_read_token(&dir, ["rev-parse", "--verify", "HEAD^{commit}"]);
        return cli_diff_vs_worktree(&dir, head.as_deref());
    };
    let head_tree = repo
        .head()
        .ok()
        .and_then(|h| h.peel_to_commit().ok())
        .and_then(|c| c.tree().ok());
    let mut opts = git2::DiffOptions::new();
    opts.include_untracked(true)
        .recurse_untracked_dirs(true)
        .show_untracked_content(true);
    let diff = match repo.diff_tree_to_workdir_with_index(head_tree.as_ref(), Some(&mut opts)) {
        Ok(d) => d,
        Err(_) => return Vec::new(),
    };
    collect_diff_lines(&diff, true)
}

#[cfg(not(feature = "git"))]
#[cfg_attr(not(feature = "git"), allow(dead_code))]
pub fn worktree_diff(_root: &Path) -> Vec<DiffLine> {
    Vec::new()
}

/// Returns the diff from `base`'s merge-base with HEAD, through the index, to the working tree —
/// committed **and** uncommitted changes together — equivalent to
/// `git diff $(git merge-base <base> HEAD)`. This is "everything this worktree has piled up since
/// branching off `base`", which is what the worktree list's `d` wants to show: an AI agent working
/// inside a worktree very often commits along the way, so an uncommitted-only diff
/// (`worktree_diff`) would go empty the moment it commits, hiding everything it actually did.
/// Diffing from the merge-base shows committed and uncommitted work together, correctly, across
/// any mix of the two.
///
/// `root` is the **target worktree's own checkout path** (not necessarily the caller's current
/// root — this is meant to inspect a *different* linked worktree picked from the list). Opening the
/// repo via `Repository::discover(root)` from inside a specific worktree gives a `Repository`
/// bound to that worktree's own HEAD (libgit2 resolves the per-worktree `HEAD`/index through its
/// private `.git/worktrees/<name>` git-dir), so `repo.head()` below is that worktree's HEAD, not
/// whichever worktree happened to open the repo first — same reasoning `worktree_diff` already
/// relies on. Local branches (`base`) are shared repo-wide via the common git-dir, so `find_branch`
/// resolves the same commit regardless of which worktree's path was used to discover the repo.
///
/// Returns an empty Vec when not a repo / `base` does not exist / HEAD is unborn / there is no
/// merge-base / on any other failure or when the feature is disabled — same "quietly render blank"
/// contract as every other diff function here, so the caller can fall back to `worktree_diff`.
#[cfg(feature = "git")]
pub fn diff_since(root: &Path, base: &str) -> Vec<DiffLine> {
    if !external_git_enabled() {
        return Vec::new();
    }
    let Some(repo) = open_repo(root) else {
        let Some(dir) = cli_dir(root) else {
            return Vec::new();
        };
        // Same short-circuits as below, in the same order: unknown base / unborn HEAD / no common
        // ancestor each yield an empty diff the caller falls back from.
        let Some(mb) = cli_merge_base(&dir, base) else {
            return Vec::new();
        };
        return cli_diff_vs_worktree(&dir, Some(&mb));
    };
    let Ok(base_branch) = repo.find_branch(base, git2::BranchType::Local) else {
        return Vec::new();
    };
    let Some(base_oid) = base_branch.get().peel_to_commit().ok().map(|c| c.id()) else {
        return Vec::new();
    };
    let Some(head_oid) = repo
        .head()
        .ok()
        .and_then(|h| h.peel_to_commit().ok())
        .map(|c| c.id())
    else {
        return Vec::new(); // unborn HEAD
    };
    let Ok(merge_base_oid) = repo.merge_base(base_oid, head_oid) else {
        return Vec::new(); // no common ancestor (unrelated histories)
    };
    let Some(base_tree) = repo
        .find_commit(merge_base_oid)
        .ok()
        .and_then(|c| c.tree().ok())
    else {
        return Vec::new();
    };
    let mut opts = git2::DiffOptions::new();
    opts.include_untracked(true)
        .recurse_untracked_dirs(true)
        .show_untracked_content(true);
    let diff = match repo.diff_tree_to_workdir_with_index(Some(&base_tree), Some(&mut opts)) {
        Ok(d) => d,
        Err(_) => return Vec::new(),
    };
    collect_diff_lines(&diff, true)
}

#[cfg(not(feature = "git"))]
#[cfg_attr(not(feature = "git"), allow(dead_code))]
pub fn diff_since(_root: &Path, _base: &str) -> Vec<DiffLine> {
    Vec::new()
}

/// The commit time (Unix epoch seconds) of `git merge-base <base> HEAD`, i.e. the point where
/// `base` and this worktree's HEAD last shared history. Used by `App::worktree_diff_base`
/// (`src/app/git_view.rs`) to rank several candidate base branches for the worktree list's `d`
/// diff: the candidate whose merge-base is *newest* is the branch this worktree most recently
/// diverged from, which is the base that actually explains "everything since base" without
/// dragging in an unrelated branch's own unrelated history.
///
/// `root` must be the **target worktree's own checkout path**, not necessarily the caller's
/// current root — same reasoning `diff_since` above already documents: `Repository::discover
/// (root)` resolves a `Repository` bound to *that* worktree's private per-worktree `HEAD` (via its
/// own `.git/worktrees/<name>` git-dir), so `repo.head()` below returns that worktree's HEAD, not
/// whichever worktree happened to open the repo. `base` is a local branch name, shared repo-wide
/// through the common git-dir, so it resolves to the same commit regardless of which worktree's
/// path was used to discover the repo.
///
/// Returns `None` when not a repo / `base` does not exist / HEAD is unborn / there is no common
/// ancestor / the merge-base commit can't be read / the feature is disabled — same "quietly return
/// nothing, caller treats this candidate as unusable" contract as `branch_tip`/`diff_since`.
#[cfg(feature = "git")]
pub fn merge_base_time(root: &Path, base: &str) -> Option<i64> {
    if !external_git_enabled() {
        return None;
    }
    let Some(repo) = open_repo(root) else {
        let dir = cli_dir(root)?;
        let mb = cli_merge_base(&dir, base)?;
        // `%ct` is the committer timestamp — the same clock `Commit::time()` reports.
        return git_read_token(&dir, ["show", "-s", "--format=%ct", &mb, "--"])?
            .parse()
            .ok();
    };
    let base_oid = repo
        .find_branch(base, git2::BranchType::Local)
        .ok()?
        .get()
        .peel_to_commit()
        .ok()?
        .id();
    let head_oid = repo.head().ok()?.peel_to_commit().ok()?.id();
    let merge_base_oid = repo.merge_base(base_oid, head_oid).ok()?;
    repo.find_commit(merge_base_oid)
        .ok()
        .map(|c| c.time().seconds())
}

/// `git merge-base <base branch> HEAD` for a repository libgit2 will not open — the shared first
/// step of `diff_since` and `merge_base_time`.
///
/// `None` when the local branch `base` does not exist, when HEAD is unborn, or when the two share
/// no history; the callers treat all three the same way their libgit2 counterparts do. `base` is
/// resolved as a full `refs/heads/` ref (matching `find_branch(.., Local)`) before being handed to
/// `merge-base`, so a file of the same name can never stand in for the branch.
#[cfg(feature = "git")]
fn cli_merge_base(dir: &Path, base: &str) -> Option<String> {
    let base_oid = git_read_token(
        dir,
        ["rev-parse", "--verify", &format!("{REFS}{base}^{{commit}}")],
    )?;
    let head_oid = git_read_token(dir, ["rev-parse", "--verify", "HEAD^{commit}"])?;
    git_read_token(dir, ["merge-base", &base_oid, &head_oid])
}

#[cfg(not(feature = "git"))]
pub fn merge_base_time(_root: &Path, _base: &str) -> Option<i64> {
    None
}

#[cfg(not(feature = "git"))]
pub fn stage(_root: &Path, _file: &Path) -> anyhow::Result<()> {
    Err(anyhow::anyhow!("git feature disabled"))
}

#[cfg(not(feature = "git"))]
pub fn unstage(_root: &Path, _file: &Path) -> anyhow::Result<()> {
    Err(anyhow::anyhow!("git feature disabled"))
}

#[cfg(not(feature = "git"))]
pub fn stage_all(_root: &Path) -> anyhow::Result<()> {
    Err(anyhow::anyhow!("git feature disabled"))
}

#[cfg(not(feature = "git"))]
pub fn unstage_all(_root: &Path) -> anyhow::Result<()> {
    Err(anyhow::anyhow!("git feature disabled"))
}

#[cfg(not(feature = "git"))]
pub fn discard(_root: &Path, _file: &Path) -> anyhow::Result<()> {
    Err(anyhow::anyhow!("git feature disabled"))
}

#[cfg(not(feature = "git"))]
pub fn commit(_root: &Path, _message: &str) -> anyhow::Result<()> {
    Err(anyhow::anyhow!("git feature disabled"))
}

#[cfg(not(feature = "git"))]
pub fn checkout(_root: &Path, _name: &str) -> anyhow::Result<()> {
    Err(anyhow::anyhow!("git feature disabled"))
}

#[cfg(not(feature = "git"))]
pub fn create_branch(_root: &Path, _name: &str) -> anyhow::Result<()> {
    Err(anyhow::anyhow!("git feature disabled"))
}

#[cfg(not(feature = "git"))]
pub fn delete_branch(_root: &Path, _name: &str, _force: bool) -> anyhow::Result<()> {
    Err(anyhow::anyhow!("git feature disabled"))
}

#[cfg(not(feature = "git"))]
pub fn worktree_add(
    _root: &Path,
    _path: &Path,
    _branch: &str,
    _create_branch: bool,
) -> anyhow::Result<()> {
    Err(anyhow::anyhow!("git feature disabled"))
}

/// Applies the status to a file and its ancestor directories (up to workdir). Directories keep the higher priority.
///
/// Shared with the jj backend: how a status rolls up into its parent directories is a property of
/// konoma's tree, not of git, so both backends must do it the same way.
#[cfg(feature = "git")]
pub(crate) fn rollup(
    map: &mut HashMap<PathBuf, FileStatus>,
    workdir: &Path,
    abs: &Path,
    st: FileStatus,
) {
    map.entry(abs.to_path_buf())
        .and_modify(|e| {
            if st.rank() > e.rank() {
                *e = st;
            }
        })
        .or_insert(st);
    let mut cur = abs.parent();
    while let Some(dir) = cur {
        if !dir.starts_with(workdir) {
            break;
        }
        map.entry(dir.to_path_buf())
            .and_modify(|e| {
                if st.rank() > e.rank() {
                    *e = st;
                }
            })
            .or_insert(st);
        if dir == workdir {
            break;
        }
        cur = dir.parent();
    }
}

/// Maps git2 Status bits to a FileStatus. After `changed_files` was switched to CLI delegation it became unused in the main code
/// and is now only a test reference (`classify_porcelain` is the runtime implementation that aligns the priority order).
/// Compiled only for the git-feature test build, since that is its sole caller (`classify_maps_status_bits`).
#[cfg(all(test, feature = "git"))]
fn classify(s: git2::Status) -> FileStatus {
    if s.is_conflicted() {
        FileStatus::Conflicted
    } else if s.is_wt_deleted() || s.is_index_deleted() {
        FileStatus::Deleted
    } else if s.is_index_new() {
        FileStatus::Added
    } else if s.is_wt_new() {
        FileStatus::Untracked
    } else if s.is_wt_renamed() || s.is_index_renamed() {
        FileStatus::Renamed
    } else if s.is_wt_modified() || s.is_index_modified() {
        FileStatus::Modified
    } else if s.is_wt_typechange() || s.is_index_typechange() {
        FileStatus::TypeChange
    } else {
        FileStatus::Modified
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    // Every use of `unique_tmp` in this module is now behind `#[cfg(feature = "git")]` (see
    // `background_reads_never_write_the_index`'s doc for why that test itself is gated) — gate the
    // import too, or a `--no-default-features` build warns (and fails `-D warnings`) on it being
    // unused.
    #[cfg(feature = "git")]
    use crate::test_support::unique_tmp;

    /// `diff_contents` (the diff engine for the follow baseline diff) emits only the changed hunks
    /// with correct line numbers (not the whole file); text never contains a newline; identical
    /// content produces an empty result.
    #[test]
    fn diff_contents_emits_changed_hunks_with_line_numbers() {
        let old = "a\nb\nc\nd\ne\n";
        let new = "a\nb\nCHANGED\nd\ne\n";
        let lines = diff_contents(old, new);
        let removed: Vec<&DiffLine> = lines
            .iter()
            .filter(|l| l.kind == DiffLineKind::Removed)
            .collect();
        let added: Vec<&DiffLine> = lines
            .iter()
            .filter(|l| l.kind == DiffLineKind::Added)
            .collect();
        assert_eq!(removed.len(), 1, "変更行1本が Removed");
        assert_eq!(added.len(), 1, "変更行1本が Added");
        assert_eq!(removed[0].text, "c");
        assert_eq!(removed[0].old_no, Some(3), "旧側の行番号");
        assert_eq!(added[0].text, "CHANGED");
        assert_eq!(added[0].new_no, Some(3), "新側の行番号");
        // A context line is Context, and text never contains a newline.
        assert!(lines
            .iter()
            .any(|l| l.kind == DiffLineKind::Context && l.text == "a" && l.old_no == Some(1)));
        assert!(lines.iter().all(|l| !l.text.contains('\n')));
        // Identical content produces an empty result (no changes).
        assert!(diff_contents(new, new).is_empty());
    }

    /// Background reads (statuses/ignored) **never write back** the index (--no-optional-locks).
    /// Confirm that reading status while the stat cache is stale (content identical, only mtime
    /// updated) does not change .git/index. If this breaks, a `git pull` running while konoma is
    /// scanning status fails with "index.lock: File exists" (user report 2026-07-07).
    ///
    /// `#[cfg(feature = "git")]` (matching its sibling `external_git_disabled_returns_empty_for_a_
    /// real_repo` right below): without the git feature, `statuses`/`ignored`/`file_diff` are the
    /// no-git stubs, which unconditionally return empty/None regardless of the repo's real state —
    /// `assert!(st.is_empty())` would then hold *by construction*, not because anything was
    /// actually verified, while the fixture setup (the `run` closure, a raw `git` CLI invocation)
    /// still unconditionally required a `git` binary on PATH for a no-git build to even pass this
    /// test. Gating it means a `--no-default-features` test run needs no `git` binary at all — the
    /// promise every other no-git test already keeps.
    #[cfg(feature = "git")]
    #[test]
    fn background_reads_never_write_the_index() {
        let dir = unique_tmp("konoma_no_optional_locks_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        let run = |args: &[&str]| {
            let out = std::process::Command::new("git")
                .current_dir(&dir)
                .args(args)
                .output()
                .unwrap();
            assert!(out.status.success(), "git {args:?}: {:?}", out);
        };
        run(&["init", "-q", "."]);
        run(&["config", "user.email", "t@t"]);
        run(&["config", "user.name", "t"]);
        std::fs::write(dir.join("a.txt"), b"same content").unwrap();
        run(&["add", "-A"]);
        run(&["commit", "-qm", "init"]);

        // Update mtime while keeping the content identical → the index's stat cache goes stale.
        // A plain, flag-less `git status` would write back the index here (= take index.lock).
        std::thread::sleep(std::time::Duration::from_millis(20));
        std::fs::write(dir.join("a.txt"), b"same content").unwrap();

        let index = dir.join(".git/index");
        let before = std::fs::metadata(&index).unwrap().modified().unwrap();
        let st = statuses(&dir);
        let ig = ignored(&dir);
        // git2's gutter diff (diff_tree_to_workdir_with_index) doesn't set update_index either, so
        // it doesn't write back the index. This is the assumption that keeps background git reads
        // lock-free, which in turn is why we can afford to not swallow `.git/*.lock` events (so the
        // fs-watch self-loop never happens).
        let _diff = file_diff(&dir, &dir.join("a.txt"));
        let after = std::fs::metadata(&index).unwrap().modified().unwrap();
        assert_eq!(before, after, "読み取りで index を書き戻さない");
        assert!(
            st.is_empty(),
            "内容同一なので clean 判定は正しく出る: {st:?}"
        );
        assert!(ig.is_empty());
        std::fs::remove_dir_all(&dir).ok();
    }

    /// `[external] git = false` (via `set_external_git_enabled(false)`): every read returns the same
    /// empty/None value as a `--no-default-features` build, and every write returns `Err`, **even
    /// though the directory is a real repo with real history** — proving the gate actually short-
    /// circuits before touching git2/the `git` CLI, rather than the assertions holding "by accident"
    /// because the repo happens to be empty. Runs entirely on this test's own thread (thread-local),
    /// so it does not affect any other test running concurrently — see the `EXTERNAL_GIT_ENABLED` doc.
    #[cfg(feature = "git")]
    #[test]
    fn external_git_disabled_returns_empty_for_a_real_repo() {
        let dir = unique_tmp("konoma_git_external_disabled_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let file = dir.join("a.txt");
        std::fs::write(&file, b"one\n").unwrap();
        // Baseline sanity check while still enabled (default): the repo really is a repo.
        assert!(external_git_enabled(), "default is enabled");
        assert!(workdir(&dir).is_some(), "sanity: this is a real repo");
        stage(&dir, &file).unwrap();
        commit(&dir, "init").unwrap();
        assert!(branch(&dir).is_some(), "sanity: has a branch after commit");
        // Resolved while still enabled, the same way the branch-name lookups further down are —
        // `commit_meta`/`commit_diff` need a real commit id to look up, but must still fail once
        // the gate is off.
        let commit_id = head_commit_id(&dir).expect("sanity: head resolves to a commit id");
        std::fs::write(&file, b"two\n").unwrap();

        set_external_git_enabled(false);
        assert!(statuses(&dir).is_empty(), "statuses");
        assert!(ignored(&dir).is_empty(), "ignored");
        assert!(workdir(&dir).is_none(), "workdir");
        // The two other discovery entry points share `workdir`'s gate (they all funnel through
        // `resolve_repo_dirs`) — assert them here so moving that gate can never silently let a
        // disabled build keep resolving repositories.
        assert!(git_dir(&dir).is_none(), "git_dir");
        assert!(worktree_origin(&dir).is_none(), "worktree_origin");
        assert!(branch(&dir).is_none(), "branch");
        assert!(branches(&dir).is_empty(), "branches");
        assert!(branches_by_recency(&dir).is_empty(), "branches_by_recency");
        assert!(worktrees(&dir).is_empty(), "worktrees");
        assert!(file_diff(&dir, &file).is_empty(), "file_diff");
        assert!(changed_files(&dir).is_empty(), "changed_files");
        assert!(log(&dir, 10).is_empty(), "log");
        // These two are the only entries missing from every other backend's twelve-method
        // coverage of this same gate — a commit id resolved *before* disabling still fails to
        // look anything up once the gate is off, same as `branch_tip`'s hardcoded name below.
        assert!(commit_meta(&dir, &commit_id).is_none(), "commit_meta");
        assert!(commit_diff(&dir, &commit_id).is_empty(), "commit_diff");
        assert!(worktree_diff(&dir).is_empty(), "worktree_diff");
        assert!(head_commit_id(&dir).is_none(), "head_commit_id");
        // Mutations: all route through the shared `run_git` gate.
        assert!(stage(&dir, &file).is_err(), "stage");
        assert!(unstage(&dir, &file).is_err(), "unstage");
        assert!(stage_all(&dir).is_err(), "stage_all");
        assert!(unstage_all(&dir).is_err(), "unstage_all");
        assert!(discard(&dir, &file).is_err(), "discard");
        assert!(commit(&dir, "nope").is_err(), "commit");
        assert!(checkout(&dir, "nope").is_err(), "checkout");
        assert!(create_branch(&dir, "nope").is_err(), "create_branch");
        assert!(delete_branch(&dir, "nope", false).is_err(), "delete_branch");
        assert!(
            worktree_add(&dir, &dir.join("nope-wt"), "nope", true).is_err(),
            "worktree_add"
        );
        assert!(
            graph_with_base(&dir, None, crate::i18n::Lang::En, None).is_empty(),
            "graph_with_base"
        );

        // Commit id/branch name resolved *before* disabling still work as lookups, but with the gate
        // off they must fail too.
        assert!(
            branch_tip(&dir, "main").is_none() && branch_tip(&dir, "master").is_none(),
            "branch_tip"
        );

        // Re-enable and confirm the gate is not "stuck off": this is the same thread that just
        // disabled it, so re-enabling must restore normal behavior immediately.
        set_external_git_enabled(true);
        assert!(
            !statuses(&dir).is_empty(),
            "statuses work again once re-enabled"
        );
        assert!(branch(&dir).is_some(), "branch works again once re-enabled");
        assert!(
            !worktrees(&dir).is_empty(),
            "worktrees work again once re-enabled"
        );

        std::fs::remove_dir_all(&dir).ok();
    }

    /// `git worktree list --porcelain -z` parsing: main worktree first (`is_main`), the current
    /// worktree flagged (`is_current`), a linked worktree's branch/short-hash read correctly, a
    /// detached worktree has `branch: None`, and a locked worktree carries its reason. Verified
    /// against a real sandbox (not synthetic bytes) so the record shape matches actual git output.
    #[cfg(feature = "git")]
    #[test]
    fn worktrees_parses_main_linked_detached_and_locked_records() {
        let dir = unique_tmp("konoma_git_worktrees_parse_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        std::fs::write(dir.join("a.txt"), b"one\n").unwrap();
        stage(&dir, &dir.join("a.txt")).unwrap();
        commit(&dir, "init").unwrap();
        let main_root = dir.canonicalize().unwrap();

        // `git worktree add` creates the target directory itself, so pick paths that don't exist yet.
        let linked = unique_tmp("konoma_git_worktrees_parse_linked");
        let detached = unique_tmp("konoma_git_worktrees_parse_detached");
        let _ = std::fs::remove_dir_all(&linked);
        let _ = std::fs::remove_dir_all(&detached);
        let sh = |args: &[&str]| {
            let out = std::process::Command::new("git")
                .current_dir(&main_root)
                .args(args)
                .output()
                .unwrap();
            assert!(out.status.success(), "git {args:?}: {out:?}");
        };
        sh(&[
            "worktree",
            "add",
            "-q",
            "-b",
            "konoma-wt-feature",
            linked.to_str().unwrap(),
        ]);
        sh(&[
            "worktree",
            "add",
            "-q",
            "--detach",
            detached.to_str().unwrap(),
        ]);
        sh(&[
            "worktree",
            "lock",
            linked.to_str().unwrap(),
            "--reason",
            "editing",
        ]);

        let list = worktrees(&main_root);
        assert!(
            list.len() >= 3,
            "main + linked + detached の3件以上: {list:?}"
        );
        assert!(list[0].is_main, "先頭レコードは必ずメインワークツリー");
        assert!(
            list[0].is_current,
            "root=main_root なので main が is_current"
        );
        assert!(
            list[1..].iter().all(|w| !w.is_main),
            "2件目以降は is_main=false"
        );

        let linked_abs = linked.canonicalize().unwrap();
        let l = list
            .iter()
            .find(|w| w.path == linked_abs)
            .expect("linked worktree が一覧に無い");
        assert_eq!(l.branch.as_deref(), Some("konoma-wt-feature"));
        assert!(!l.is_current, "linked は現在地ではない");
        assert!(!l.is_main);
        assert!(!l.is_bare);
        assert_eq!(
            l.locked.as_deref(),
            Some("editing"),
            "lock 理由が読める: {l:?}"
        );
        assert!(!l.prunable);
        assert!(
            l.head.as_deref().map(|h| h.len()).unwrap_or(0) <= 7,
            "短縮ハッシュは7文字以内: {:?}",
            l.head
        );

        let detached_abs = detached.canonicalize().unwrap();
        let d = list
            .iter()
            .find(|w| w.path == detached_abs)
            .expect("detached worktree が一覧に無い");
        assert_eq!(d.branch, None, "detached は branch=None");
        assert!(d.locked.is_none());
        assert!(!d.prunable);

        std::fs::remove_dir_all(&detached).ok();
        // Undo the lock before removing (a locked worktree resists a plain rm/prune, though a bare
        // `remove_dir_all` on the checkout itself is unaffected — this just mirrors real usage).
        let _ = std::process::Command::new("git")
            .current_dir(&main_root)
            .args(["worktree", "unlock", linked.to_str().unwrap()])
            .output();
        std::fs::remove_dir_all(&linked).ok();
        std::fs::remove_dir_all(&dir).ok();
    }

    /// `worktree_add` against a branch another worktree already has checked out: the error message
    /// leads with git's own `fatal:` line, not the command that was run. This matters because the
    /// flash footer renders the message as one line clipped at the terminal width, and `worktree
    /// add` writes a progress line (`Preparing worktree (checking out '<branch>')`) to stderr
    /// *before* the `fatal:` line — so a naive "command: stderr.trim()" message buries the actual
    /// reason behind the (often long) command/path, past the visible width, and the user never
    /// sees why it failed. Before the fix (`run_git` prefixing `"git {args}: {stderr}"`), this test
    /// fails: the message starts with `"git worktree add "`, not `"fatal:"`.
    #[cfg(feature = "git")]
    #[test]
    fn worktree_add_error_leads_with_gits_fatal_line_not_the_command() {
        let dir = unique_tmp("konoma_git_worktree_add_err_msg");
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        std::fs::write(dir.join("a.txt"), b"one\n").unwrap();
        stage(&dir, &dir.join("a.txt")).unwrap();
        commit(&dir, "init").unwrap();
        let root = dir.canonicalize().unwrap();

        // A first worktree already has branch "taken" checked out.
        let first = unique_tmp("konoma_git_worktree_add_err_msg_first");
        worktree_add(&root, &first, "taken", true).unwrap();

        // Second attempt on the same branch: git refuses.
        let second = unique_tmp("konoma_git_worktree_add_err_msg_second");
        let err = worktree_add(&root, &second, "taken", false)
            .expect_err("同じブランチへの2本目の worktree add は失敗する");
        let msg = err.to_string();
        assert!(
            msg.starts_with("fatal:"),
            "理由(fatal:)が先頭に来る: {msg:?}"
        );
        assert!(
            !msg.contains("worktree add"),
            "実行したコマンド文字列は含まない(理由を押し出すため): {msg:?}"
        );

        std::fs::remove_dir_all(&first).ok();
        std::fs::remove_dir_all(&dir).ok();
    }

    /// A bare main worktree (`git clone --bare` + `git worktree add`) has no `HEAD`/`branch` of its
    /// own to switch into (`is_bare=true`, `branch=None`, `head=None`), while a linked worktree
    /// added from it parses normally. A **different** linked worktree whose checkout directory is
    /// later removed out from under git is still listed, but reported `prunable`.
    #[cfg(feature = "git")]
    #[test]
    fn worktrees_bare_main_worktree_has_no_checkout_and_gone_checkout_is_prunable() {
        let dir = unique_tmp("konoma_git_worktrees_bare_src");
        let bare = unique_tmp("konoma_git_worktrees_bare_repo.git");
        let wt1 = unique_tmp("konoma_git_worktrees_bare_wt1");
        let wt2 = unique_tmp("konoma_git_worktrees_bare_wt2");
        let _ = std::fs::remove_dir_all(&dir);
        let _ = std::fs::remove_dir_all(&bare);
        let _ = std::fs::remove_dir_all(&wt1);
        let _ = std::fs::remove_dir_all(&wt2);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        std::fs::write(dir.join("a.txt"), b"one\n").unwrap();
        stage(&dir, &dir.join("a.txt")).unwrap();
        commit(&dir, "init").unwrap();

        let sh = |cwd: &Path, args: &[&str]| {
            let out = std::process::Command::new("git")
                .current_dir(cwd)
                .args(args)
                .output()
                .unwrap();
            assert!(out.status.success(), "git {args:?}: {out:?}");
        };
        sh(
            &std::env::temp_dir(),
            &[
                "clone",
                "-q",
                "--bare",
                dir.to_str().unwrap(),
                bare.to_str().unwrap(),
            ],
        );
        sh(
            &bare,
            &[
                "worktree",
                "add",
                "-q",
                "-b",
                "wt1-branch",
                wt1.to_str().unwrap(),
            ],
        );
        sh(
            &bare,
            &[
                "worktree",
                "add",
                "-q",
                "-b",
                "wt2-branch",
                wt2.to_str().unwrap(),
            ],
        );

        // `root` is a *linked* (non-bare) checkout, matching real usage: konoma is pointed at an
        // ordinary working tree, not at the bare repository's own directory — `workdir()` (which
        // `worktrees()` uses to discover the repo) returns None for a bare repo opened directly, by
        // design (mirrors `statuses()`'s "not a repo / a bare repo" early return).
        let list = worktrees(&wt1);
        assert_eq!(list.len(), 3, "bare main + wt1 + wt2: {list:?}");
        let main = &list[0];
        assert!(main.is_main);
        assert!(main.is_bare, "bare メインは is_bare=true");
        assert_eq!(main.branch, None, "bare メインに branch は無い");
        assert_eq!(main.head, None, "bare メインに head は無い");
        assert!(!main.prunable);
        assert!(!main.is_current, "bare メインは現在地ではない");

        let wt1_abs = wt1.canonicalize().unwrap();
        let wt2_abs = wt2.canonicalize().unwrap();
        let w1 = list.iter().find(|w| w.path == wt1_abs).unwrap();
        assert!(!w1.is_bare);
        assert_eq!(w1.branch.as_deref(), Some("wt1-branch"));
        assert!(!w1.prunable);
        assert!(w1.is_current, "root=wt1 なので wt1 が is_current");
        let w2 = list.iter().find(|w| w.path == wt2_abs).unwrap();
        assert!(!w2.prunable);
        assert!(!w2.is_current);

        // Remove wt2's checkout out from under git (without `git worktree remove`) → git reports
        // it prunable. Query again from wt1, which is untouched and still a valid discovery root.
        std::fs::remove_dir_all(&wt2).unwrap();
        let list2 = worktrees(&wt1);
        let gone = list2
            .iter()
            .find(|w| w.path == wt2_abs)
            .expect("消えた worktree もエントリとしては残る");
        assert!(gone.prunable, "実体が無ければ prunable: {gone:?}");
        let still_here = list2.iter().find(|w| w.path == wt1_abs).unwrap();
        assert!(!still_here.prunable, "無事な方は prunable にならない");

        std::fs::remove_dir_all(&wt1).ok();
        std::fs::remove_dir_all(&bare).ok();
        std::fs::remove_dir_all(&dir).ok();
    }

    /// `worktree_origin`: `None` for the main working tree (including from a subdirectory reached
    /// via `l`), `Some("<main's directory name>")` for a linked worktree — and the same value from a
    /// subdirectory inside that linked worktree, since discovery walks up to the repo regardless of
    /// where `root` points.
    #[cfg(feature = "git")]
    #[test]
    fn worktree_origin_is_none_for_main_and_the_repo_name_for_a_linked_worktree() {
        let dir = unique_tmp("konoma_git_worktree_origin_main");
        let linked = unique_tmp("konoma_git_worktree_origin_linked");
        let _ = std::fs::remove_dir_all(&dir);
        let _ = std::fs::remove_dir_all(&linked);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        std::fs::write(dir.join("a.txt"), b"one\n").unwrap();
        stage(&dir, &dir.join("a.txt")).unwrap();
        commit(&dir, "init").unwrap();
        let main_root = dir.canonicalize().unwrap();
        let expected_origin = main_root
            .file_name()
            .and_then(|n| n.to_str())
            .unwrap()
            .to_string();

        assert_eq!(
            worktree_origin(&main_root),
            None,
            "メインの作業ツリーでは None"
        );
        std::fs::create_dir_all(main_root.join("sub")).unwrap();
        assert_eq!(
            worktree_origin(&main_root.join("sub")),
            None,
            "メインのサブディレクトリでも None"
        );

        let sh = |args: &[&str]| {
            let out = std::process::Command::new("git")
                .current_dir(&main_root)
                .args(args)
                .output()
                .unwrap();
            assert!(out.status.success(), "git {args:?}: {out:?}");
        };
        sh(&[
            "worktree",
            "add",
            "-q",
            "-b",
            "konoma-wt-origin-feature",
            linked.to_str().unwrap(),
        ]);
        let linked_abs = linked.canonicalize().unwrap();

        assert_eq!(
            worktree_origin(&linked_abs),
            Some(expected_origin.clone()),
            "リンクワークツリーではメインの repo 名"
        );
        std::fs::create_dir_all(linked_abs.join("nested")).unwrap();
        assert_eq!(
            worktree_origin(&linked_abs.join("nested")),
            Some(expected_origin),
            "リンクワークツリーのサブディレクトリでも同じ値"
        );

        std::fs::remove_dir_all(&linked).ok();
        std::fs::remove_dir_all(&dir).ok();
    }

    /// `worktree_origin` in a **bare** layout (`git clone --bare` + `git worktree add`): there is no
    /// `.git` directory inside a bare repo, so `commondir()` is the bare repo's own directory
    /// (`<name>.git/`) — the origin name is that basename with the trailing `.git` stripped.
    #[cfg(feature = "git")]
    #[test]
    fn worktree_origin_bare_layout_strips_the_trailing_git_suffix() {
        let dir = unique_tmp("konoma_git_worktree_origin_bare_src");
        let bare = unique_tmp("konoma_git_worktree_origin_bare_repo").with_extension("git");
        let wt = unique_tmp("konoma_git_worktree_origin_bare_wt");
        let _ = std::fs::remove_dir_all(&dir);
        let _ = std::fs::remove_dir_all(&bare);
        let _ = std::fs::remove_dir_all(&wt);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        std::fs::write(dir.join("a.txt"), b"one\n").unwrap();
        stage(&dir, &dir.join("a.txt")).unwrap();
        commit(&dir, "init").unwrap();

        let sh = |cwd: &Path, args: &[&str]| {
            let out = std::process::Command::new("git")
                .current_dir(cwd)
                .args(args)
                .output()
                .unwrap();
            assert!(out.status.success(), "git {args:?}: {out:?}");
        };
        sh(
            &std::env::temp_dir(),
            &[
                "clone",
                "-q",
                "--bare",
                dir.to_str().unwrap(),
                bare.to_str().unwrap(),
            ],
        );
        sh(
            &bare,
            &[
                "worktree",
                "add",
                "-q",
                "-b",
                "wt-branch",
                wt.to_str().unwrap(),
            ],
        );

        let bare_abs = bare.canonicalize().unwrap();
        let expected_origin = bare_abs
            .file_name()
            .and_then(|n| n.to_str())
            .unwrap()
            .strip_suffix(".git")
            .unwrap()
            .to_string();
        let wt_abs = wt.canonicalize().unwrap();

        assert_eq!(
            worktree_origin(&wt_abs),
            Some(expected_origin),
            "bare レイアウトでは commondir 自身の名前から `.git` を落とした名前"
        );

        std::fs::remove_dir_all(&wt).ok();
        std::fs::remove_dir_all(&bare).ok();
        std::fs::remove_dir_all(&dir).ok();
    }

    /// The whole point of `diff_since` over `worktree_diff`: it must show **both** what the
    /// worktree has already committed since branching off `base` **and** what's still uncommitted
    /// on top of that — because an AI agent working in a worktree very often commits along the
    /// way, and a plain uncommitted-only diff would go blank the moment it does, hiding everything
    /// it actually produced. This test would fail if `diff_since` were implemented as a thin
    /// wrapper around `worktree_diff` (HEAD → workdir+index only): the committed file's content
    /// would then be absent from the result, since it's already at HEAD and would show as
    /// unchanged.
    #[cfg(feature = "git")]
    #[test]
    fn diff_since_includes_both_committed_and_uncommitted_changes() {
        let dir = unique_tmp("konoma_git_diff_since_both_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        std::fs::write(dir.join("base.txt"), b"base content\n").unwrap();
        stage(&dir, &dir.join("base.txt")).unwrap();
        commit(&dir, "base commit").unwrap();
        let main_root = dir.canonicalize().unwrap();

        // A linked worktree branched off `main` (whatever the initial branch is named — read it
        // back rather than assuming "main", since git's default varies by user/global config).
        let base_name = branch(&main_root).expect("sanity: has a branch after the base commit");
        let linked = unique_tmp("konoma_git_diff_since_both_linked");
        let _ = std::fs::remove_dir_all(&linked);
        let sh = |args: &[&str]| {
            let out = std::process::Command::new("git")
                .current_dir(&main_root)
                .args(args)
                .output()
                .unwrap();
            assert!(out.status.success(), "git {args:?}: {out:?}");
        };
        sh(&[
            "worktree",
            "add",
            "-q",
            "-b",
            "konoma-diff-since-feature",
            linked.to_str().unwrap(),
        ]);
        let linked = linked.canonicalize().unwrap();

        // ① A commit made *inside the worktree* — the kind of thing an agent does mid-task. Named
        // so its filename/content share no substring with the uncommitted file below (a naive
        // "committed"/"uncommitted" naming would have "committed.txt" as a substring of
        // "uncommitted.txt", making the sanity check below vacuously true).
        std::fs::write(linked.join("agent_landed.txt"), b"AGENT_LANDED_MARKER\n").unwrap();
        stage(&linked, &linked.join("agent_landed.txt")).unwrap();
        commit(&linked, "agent commit inside the worktree").unwrap();

        // ② On top of that, still-pending (uncommitted) work.
        std::fs::write(linked.join("agent_pending.txt"), b"AGENT_PENDING_MARKER\n").unwrap();

        let lines = diff_since(&linked, &base_name);
        assert!(
            !lines.is_empty(),
            "base からの積み上げがあるので空のはずがない"
        );
        let joined: String = lines
            .iter()
            .map(|l| l.text.as_str())
            .collect::<Vec<_>>()
            .join("\n");
        assert!(
            joined.contains("agent_landed.txt") && joined.contains("AGENT_LANDED_MARKER"),
            "コミット済みの変更が含まれる（worktree_diff だけの実装ならここが無い）: {joined}"
        );
        assert!(
            joined.contains("agent_pending.txt") && joined.contains("AGENT_PENDING_MARKER"),
            "未コミットの変更も含まれる: {joined}"
        );

        // Sanity check on the premise itself: a plain uncommitted-only diff must NOT contain the
        // committed file's content (it's already at HEAD, so it reads as unchanged) — proving the
        // two functions really do answer different questions, and this test isn't accidentally
        // passing for some other reason. This is exactly the assertion that would fail if
        // `diff_since` were swapped for `worktree_diff`.
        let uncommitted_only = worktree_diff(&linked);
        let uncommitted_only_joined: String = uncommitted_only
            .iter()
            .map(|l| l.text.as_str())
            .collect::<Vec<_>>()
            .join("\n");
        assert!(
            !uncommitted_only_joined.contains("AGENT_LANDED_MARKER")
                && !uncommitted_only_joined.contains("agent_landed.txt"),
            "前提の確認: worktree_diff は未コミットのみで、コミット済みの内容は含まれないはず: {uncommitted_only_joined}"
        );

        std::fs::remove_dir_all(&linked).ok();
        std::fs::remove_dir_all(&dir).ok();
    }

    /// A `base` that doesn't exist in the repo → empty Vec, so the caller's fallback path
    /// (`worktree_diff`) actually runs instead of panicking or silently returning garbage.
    #[cfg(feature = "git")]
    #[test]
    fn diff_since_returns_empty_for_a_nonexistent_base() {
        let dir = unique_tmp("konoma_git_diff_since_missing_base_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        std::fs::write(dir.join("a.txt"), b"one\n").unwrap();
        stage(&dir, &dir.join("a.txt")).unwrap();
        commit(&dir, "init").unwrap();
        std::fs::write(dir.join("a.txt"), b"two\n").unwrap(); // an uncommitted change too

        assert!(
            diff_since(&dir, "this-branch-does-not-exist").is_empty(),
            "存在しない base は空 Vec（フォールバック経路が動く）"
        );

        std::fs::remove_dir_all(&dir).ok();
    }

    #[cfg(feature = "git")]
    #[test]
    fn lay_out_lanes_draws_angular_fork_and_merge() {
        // M (merge B,F) → B (→R) / F (→R) → R (root). A branch = ├─┐ below the commit, a merge =
        // ├─┘ above the commit.
        let dc = |id: &str, parents: &[&str]| DagCommit {
            kind: None,
            id: id.into(),
            parents: parents.iter().map(|s| s.to_string()).collect(),
            short: id.into(),
            subject: format!("{id} subj"),
            author: "a".into(),
            date: "d".into(),
            refs: String::new(),
        };
        let commits = vec![
            dc("M", &["B", "F"]),
            dc("B", &["R"]),
            dc("F", &["R"]),
            dc("R", &[]),
        ];
        let rows = lay_out_lanes(&commits, None, None, crate::vcs::VcsKind::Git);
        let joined: Vec<String> = rows
            .iter()
            .map(|r| {
                r.graph
                    .iter()
                    .map(|(s, _)| s.as_str())
                    .collect::<String>()
                    .trim_end()
                    .to_string()
            })
            .collect();
        assert_eq!(
            joined,
            vec!["◆", "├─┐", "● │", "│ ●", "├─┘", "●"],
            "角ばったグラフが期待と不一致: {joined:?}"
        );
        // No diagonal lines at all (consistent with an angular TUI).
        let all: String = rows
            .iter()
            .flat_map(|r| r.graph.iter().map(|(s, _)| s.clone()))
            .collect();
        assert!(
            !all.contains('/') && !all.contains('\\'),
            "斜め線が残っている: {all}"
        );
        // Nodes: merge = ◆ (1) · normal = ● (3). There are 4 commit rows.
        assert_eq!(all.matches('◆').count(), 1, "マージノード ◆ は1個");
        assert_eq!(all.matches('●').count(), 3, "通常ノード ● は3個");
        assert_eq!(
            rows.iter().filter(|r| r.commit.is_some()).count(),
            4,
            "コミット行は4"
        );
    }

    #[cfg(feature = "git")]
    #[test]
    fn lay_out_lanes_multi_converge_uses_tee() {
        // Three tips merge into the same root R → the middle lane is ┴ (up+left+right), the
        // farthest is ┘. Must not become `├───┘`.
        let dc = |id: &str, parents: &[&str]| DagCommit {
            kind: None,
            id: id.into(),
            parents: parents.iter().map(|s| s.to_string()).collect(),
            short: id.into(),
            subject: id.into(),
            author: "a".into(),
            date: "d".into(),
            refs: String::new(),
        };
        let commits = vec![
            dc("T1", &["R"]),
            dc("T2", &["R"]),
            dc("T3", &["R"]),
            dc("R", &[]),
        ];
        let rows = lay_out_lanes(&commits, None, None, crate::vcs::VcsKind::Git);
        let joined: Vec<String> = rows
            .iter()
            .map(|r| {
                r.graph
                    .iter()
                    .map(|(s, _)| s.as_str())
                    .collect::<String>()
                    .trim_end()
                    .to_string()
            })
            .collect();
        assert!(
            joined.contains(&"├─┴─┘".to_string()),
            "多重合流が ┴ を使っていない(角が水平で潰れた?): {joined:?}"
        );
        assert!(
            !joined.iter().any(|r| r.contains("───")),
            "合流の途中が水平で潰れている: {joined:?}"
        );
    }

    #[cfg(feature = "git")]
    #[test]
    fn lay_out_lanes_base_pins_branch_to_lane0() {
        // Two branches (A: A1→A2→R / B: B1→B2→R). With base specified, that branch's node always
        // lands on lane0 (col0).
        let dc = |id: &str, parents: &[&str]| DagCommit {
            kind: None,
            id: id.into(),
            parents: parents.iter().map(|s| s.to_string()).collect(),
            short: id.into(),
            subject: id.into(),
            author: "a".into(),
            date: "d".into(),
            refs: String::new(),
        };
        let commits = vec![
            dc("A1", &["A2"]),
            dc("A2", &["R"]),
            dc("B1", &["B2"]),
            dc("B2", &["R"]),
            dc("R", &[]),
        ];
        // Whether the commit id's node sits at col0 (lane0).
        let node_at_col0 = |rows: &[GraphRow], id: &str| -> bool {
            rows.iter().any(|r| {
                r.commit.as_deref() == Some(id)
                    && matches!(r.graph.first(), Some((s, _)) if s == "●" || s == "◆")
            })
        };

        // No base: A, which appears first, gets lane0; B goes to the right.
        let none = lay_out_lanes(&commits, None, None, crate::vcs::VcsKind::Git);
        assert!(node_at_col0(&none, "A1"), "base なしでは A1 が lane0");
        assert!(
            !node_at_col0(&none, "B1"),
            "base なしでは B1 は lane0 でない"
        );

        // base=B1 (feature's tip): the B lineage goes to lane0, A gets pushed to the right.
        let based = lay_out_lanes(&commits, Some("B1"), None, crate::vcs::VcsKind::Git);
        assert!(
            node_at_col0(&based, "B1"),
            "base=B1 で B1 が lane0: {based:?}",
        );
        assert!(
            node_at_col0(&based, "B2"),
            "base=B1 で B2 も lane0(first-parent 継続)"
        );
        assert!(
            !node_at_col0(&based, "A1"),
            "base=B1 で A1 は右レーン(lane0 でない)"
        );
        // Every commit row is kept (none disappear).
        assert_eq!(
            based.iter().filter(|r| r.commit.is_some()).count(),
            5,
            "全コミットが残る(--all 相当)"
        );
    }

    #[cfg(feature = "git")]
    #[test]
    fn worktree_row_sits_on_head_lane_not_always_col0() {
        // HEAD=A1 (branch A's tip). With base=B1, lane0 is the B lineage. The uncommitted row must
        // sit **on A's lane (not col0)** and connect vertically directly above HEAD (the diff
        // target matches HEAD).
        let dc = |id: &str, parents: &[&str], refs: &str| DagCommit {
            kind: None,
            id: id.into(),
            parents: parents.iter().map(|s| s.to_string()).collect(),
            short: id.into(),
            subject: id.into(),
            author: "a".into(),
            date: "d".into(),
            refs: refs.into(),
        };
        let commits = vec![
            dc("A1", &["A2"], "HEAD -> feature"),
            dc("A2", &["R"], ""),
            dc("B1", &["B2"], ""),
            dc("B2", &["R"], ""),
            dc("R", &[], ""),
        ];
        let wt = Some(("Uncommitted changes".to_string(), "1 staged".to_string()));

        // base=B1: lane0 = the B lineage. The WT row is worktree=true, and col0 is not `●` (HEAD=A
        // is in the right lane).
        let rows = lay_out_lanes(&commits, Some("B1"), wt.clone(), crate::vcs::VcsKind::Git);
        let wt_row = rows.iter().find(|r| r.worktree).expect("WT 行がある");
        assert!(wt_row.commit.is_none(), "WT 行は commit=None");
        assert!(
            !matches!(wt_row.graph.first(), Some((s, _)) if s == "●"),
            "base が別枝なら WT は col0 に固定されない"
        );
        assert!(
            wt_row.graph.iter().any(|(s, _)| s == "●"),
            "WT 行に ● ノードがある"
        );
        // WT's node column matches HEAD's (A1) node column (they connect vertically).
        let col_of_node = |r: &GraphRow| r.graph.iter().position(|(s, _)| s == "●" || s == "◆");
        let wt_idx = rows.iter().position(|r| r.worktree).unwrap();
        let head_idx = rows
            .iter()
            .position(|r| r.commit.as_deref() == Some("A1"))
            .unwrap();
        assert_eq!(
            col_of_node(&rows[wt_idx]),
            col_of_node(&rows[head_idx]),
            "WT のノード列が HEAD(A1)のノード列と一致"
        );

        // No base: HEAD=A is the leftmost lane0, so WT is also col0 (matches the previous display).
        let rows0 = lay_out_lanes(&commits, None, wt, crate::vcs::VcsKind::Git);
        let wt0 = rows0.iter().find(|r| r.worktree).unwrap();
        assert!(
            matches!(wt0.graph.first(), Some((s, _)) if s == "●"),
            "base なしでは WT は col0(HEAD=lane0)"
        );
    }

    #[test]
    fn marker_and_rank_are_distinct() {
        // The marker is unique per kind.
        let all = [
            FileStatus::Modified,
            FileStatus::Added,
            FileStatus::Untracked,
            FileStatus::Deleted,
            FileStatus::Renamed,
            FileStatus::TypeChange,
            FileStatus::Conflicted,
        ];
        let markers: Vec<char> = all.iter().map(|s| s.marker()).collect();
        let mut uniq = markers.clone();
        uniq.sort_unstable();
        uniq.dedup();
        assert_eq!(markers.len(), uniq.len(), "マーカーが重複");
        // Rollup priority: conflicted is the strongest, untracked is the weakest.
        assert!(FileStatus::Conflicted.rank() > FileStatus::Modified.rank());
        assert!(FileStatus::Modified.rank() > FileStatus::Untracked.rank());
    }

    #[cfg(feature = "git")]
    #[test]
    fn classify_maps_status_bits() {
        use git2::Status as S;
        assert_eq!(classify(S::INDEX_RENAMED), FileStatus::Renamed);
        assert_eq!(classify(S::WT_NEW), FileStatus::Untracked);
        assert_eq!(classify(S::INDEX_NEW), FileStatus::Added);
        assert_eq!(classify(S::WT_MODIFIED), FileStatus::Modified);
        assert_eq!(classify(S::WT_DELETED), FileStatus::Deleted);
        assert_eq!(classify(S::CONFLICTED), FileStatus::Conflicted);
        assert_eq!(classify(S::WT_TYPECHANGE), FileStatus::TypeChange);
    }

    #[cfg(feature = "git")]
    #[test]
    fn untracked_file_and_dir_rollup_detected() {
        let dir = unique_tmp("konoma_git_status_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(dir.join("sub")).unwrap();
        git2::Repository::init(&dir).unwrap();
        std::fs::write(dir.join("sub").join("foo.txt"), b"hi").unwrap();

        let map = statuses(&dir);
        let canon = dir.canonicalize().unwrap();
        // The untracked file is Untracked.
        assert_eq!(
            map.get(&canon.join("sub").join("foo.txt")),
            Some(&FileStatus::Untracked)
        );
        // It also rolls up into the parent directory.
        assert_eq!(map.get(&canon.join("sub")), Some(&FileStatus::Untracked));
        std::fs::remove_dir_all(&dir).ok();
    }

    // Pin down that a rename still shows as "Renamed on the new path" after CLI delegation
    // (porcelain -z is in new→old order).
    #[cfg(feature = "git")]
    #[test]
    fn rename_is_detected_on_new_path() {
        let dir = unique_tmp("konoma_git_status_rename");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        std::fs::write(dir.join("old.txt"), b"content here\n").unwrap();
        stage(&dir, &dir.join("old.txt")).unwrap();
        commit(&dir, "init").unwrap();
        // Rename and stage via git mv.
        std::process::Command::new("git")
            .current_dir(&dir)
            .args(["mv", "old.txt", "new.txt"])
            .output()
            .unwrap();

        let map = statuses(&dir);
        let canon = dir.canonicalize().unwrap();
        // Renamed shows on the new path; the old path does not appear.
        assert_eq!(
            map.get(&canon.join("new.txt")),
            Some(&FileStatus::Renamed),
            "改名は新パスに R が付くはず: {map:?}"
        );
        assert!(
            !map.contains_key(&canon.join("old.txt")),
            "旧パスはツリーに出ないので map に入らないはず"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    // ── Repository discovery ────────────────────────────────────────────────────────────────

    /// The `.git` ancestor walk (step 2 of the discovery ladder) recognises every shape of marker
    /// git itself does — a **directory** (ordinary repository), a **file** (linked worktree /
    /// submodule, holding a `gitdir:` pointer) — finds one on an **ancestor** rather than only on
    /// `start`, and reports **nothing** for a plain directory. That last case is what keeps an
    /// ordinary directory from ever reaching the `git rev-parse` fallback.
    #[cfg(feature = "git")]
    #[test]
    fn git_marker_dir_finds_dir_file_and_ancestor_markers() {
        let base = unique_tmp("konoma_marker_walk_test");
        let _ = std::fs::remove_dir_all(&base);
        // Marker as a directory, with a nested subdirectory to walk up from.
        let as_dir = base.join("as_dir");
        std::fs::create_dir_all(as_dir.join(".git")).unwrap();
        std::fs::create_dir_all(as_dir.join("sub/deep")).unwrap();
        // Marker as a file (what `git worktree add` writes).
        let as_file = base.join("as_file");
        std::fs::create_dir_all(as_file.join("sub")).unwrap();
        std::fs::write(
            as_file.join(".git"),
            b"gitdir: /elsewhere/.git/worktrees/x\n",
        )
        .unwrap();
        // No marker anywhere.
        let plain = base.join("plain/inner");
        std::fs::create_dir_all(&plain).unwrap();

        assert_eq!(git_marker_dir(&as_dir).as_deref(), Some(as_dir.as_path()));
        assert_eq!(
            git_marker_dir(&as_dir.join("sub/deep")).as_deref(),
            Some(as_dir.as_path()),
            "祖先の .git ディレクトリを見つける"
        );
        assert_eq!(
            git_marker_dir(&as_file.join("sub")).as_deref(),
            Some(as_file.as_path()),
            ".git が**ファイル**(リンクワークツリー)でも marker"
        );
        assert_eq!(
            git_marker_dir(&plain),
            None,
            "どこにも .git が無ければ「repo ではない」と即断する"
        );
        std::fs::remove_dir_all(&base).ok();
    }

    /// **Performance contract**: an ordinary (non-repository) directory must not launch a single
    /// `git rev-parse` discovery process, no matter which entry point asks. konoma re-resolves the
    /// repository on every filesystem event, so a spawn here would reintroduce exactly the class of
    /// stall the `.git` self-loop / Phase G caching work spent so long removing.
    ///
    /// Counts the *discovery fallback* specifically (the CLI ladder's step 3). The separate,
    /// once-per-process `git --version` probe behind `external_git_enabled()` predates this and is
    /// pinned to a fixed answer here so the count reflects only discovery.
    #[cfg(feature = "git")]
    #[test]
    fn an_ordinary_directory_never_spawns_a_discovery_process() {
        let dir = unique_tmp("konoma_no_spawn_outside_repo_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(dir.join("sub")).unwrap();
        std::fs::write(dir.join("a.txt"), b"hi\n").unwrap();
        set_git_binary_available_for_test(Some(true));

        let (_, calls) = count_discovery_cli_calls(|| {
            // Every entry point that asks "where is the repo?", including from a subdirectory.
            for probe in [dir.clone(), dir.join("sub")] {
                assert!(workdir(&probe).is_none());
                assert!(git_dir(&probe).is_none());
                assert!(branch(&probe).is_none());
                assert!(worktree_origin(&probe).is_none());
                assert!(statuses(&probe).is_empty());
                assert!(ignored(&probe).is_empty());
                assert!(changed_files(&probe).is_empty());
                assert!(worktrees(&probe).is_empty());
                assert!(log(&probe, 10).is_empty());
                assert!(branches(&probe).is_empty());
                assert!(branch_tip(&probe, "main").is_none());
                assert!(commit_meta(&probe, "abc123").is_none());
                assert!(commit_diff(&probe, "abc123").is_empty());
                // `graph_with_base` is the one exception in this list: unlike every assertion
                // above, it *does* spawn a real child process outside a repository — `dag_commits`
                // (behind it) builds its own `Command` directly from `workdir_of` rather than
                // going through `resolve_repo_dirs`/`cli_dir`, and is one of the "long-standing CLI
                // implementations" `count_read_cli_calls`'s doc comment calls out as deliberately
                // excluded from both counters. So this only pins that it still *answers* empty,
                // not that it spawns nothing — the "0 discovery spawns" assertion below stays true
                // regardless, because that spawn was never a *discovery* spawn to begin with.
                assert!(graph_with_base(&probe, None, crate::i18n::Lang::En, None).is_empty());
            }
        });
        set_git_binary_available_for_test(None);
        assert_eq!(
            calls, 0,
            "repo でないディレクトリで発見用の子プロセスを起動してはいけない"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    /// Creates a **reftable** repository (git 2.45+) at `dir` with one commit, returning `false`
    /// when this machine's `git` is too old to do so — in which case the caller skips, the same way
    /// the PDF tests skip when their optional tool is missing.
    #[cfg(feature = "git")]
    fn init_reftable_repo(dir: &Path) -> bool {
        let run = |args: &[&str]| -> bool {
            std::process::Command::new("git")
                .current_dir(dir)
                .args(args)
                .output()
                .map(|o| o.status.success())
                .unwrap_or(false)
        };
        if !run(&["init", "--ref-format=reftable", "-q", "."]) {
            return false; // git < 2.45
        }
        run(&["config", "user.email", "t@example.com"]);
        run(&["config", "user.name", "Test"]);
        std::fs::write(dir.join("tracked.txt"), b"one\n").unwrap();
        run(&["add", "-A"]) && run(&["commit", "-qm", "init"])
    }

    /// Regression (user report): a **reftable** repository was treated as "not a repository at
    /// all" — no branch chip, no status markers, the Git hub did nothing — even though the `git`
    /// CLI worked there perfectly. libgit2 rejects `extensions.refstorage = reftable` outright, and
    /// konoma routed *discovery* through libgit2 while doing the actual work over the CLI, so a
    /// refused discovery took the CLI-backed features down with it.
    ///
    /// Also pins the two things the fix must not get wrong: the branch name must come from `git`
    /// (a reftable repository's `.git/HEAD` holds the compatibility placeholder
    /// `ref: refs/heads/.invalid`, which a naive reader would report as the branch), and the CLI
    /// fallback must be **memoized** (konoma re-resolves on every filesystem event).
    #[cfg(feature = "git")]
    #[test]
    fn reftable_repository_keeps_status_branch_and_worktree_features() {
        let dir = unique_tmp("konoma_reftable_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        if !init_reftable_repo(&dir) {
            eprintln!("skip: この git は --ref-format=reftable を作れない (git < 2.45)");
            std::fs::remove_dir_all(&dir).ok();
            return;
        }
        let canon = dir.canonicalize().unwrap();
        // The premise of the whole fix. Should a future git2 learn reftable, discovery simply takes
        // the fast path and the behavioural assertions below must still hold — so the
        // fallback-specific ones are gated on this rather than asserted outright.
        let libgit2_refuses = git2::Repository::discover(&dir).is_err();
        assert_eq!(
            std::fs::read_to_string(canon.join(".git/HEAD"))
                .unwrap()
                .trim(),
            "ref: refs/heads/.invalid",
            "reftable の .git/HEAD は後方互換のプレースホルダ(嘘のブランチ名)"
        );

        // Uncommitted changes of both kinds, so `statuses` has something real to report.
        std::fs::write(canon.join("tracked.txt"), b"two\n").unwrap();
        std::fs::write(canon.join("fresh.txt"), b"new\n").unwrap();

        assert_eq!(
            workdir(&dir).as_deref(),
            Some(canon.as_path()),
            "workdir が作業ツリーの根を返す"
        );
        assert_eq!(
            git_dir(&dir).as_deref(),
            Some(canon.join(".git").as_path()),
            "git_dir"
        );
        // From a subdirectory too (konoma descends with `l`).
        std::fs::create_dir_all(canon.join("sub")).unwrap();
        assert_eq!(
            workdir(&canon.join("sub")).as_deref(),
            Some(canon.as_path())
        );

        let st = statuses(&dir);
        assert_eq!(
            st.get(&canon.join("tracked.txt")),
            Some(&FileStatus::Modified),
            "変更が M として出る: {st:?}"
        );
        assert_eq!(
            st.get(&canon.join("fresh.txt")),
            Some(&FileStatus::Untracked),
            "未追跡が U として出る: {st:?}"
        );
        assert_eq!(
            changed_files(&dir).len(),
            2,
            "変更ファイル一覧 (Git ハブ) も出る"
        );
        assert!(
            !worktrees(&dir).is_empty(),
            "worktree 一覧 (CLI 経路) も出る"
        );

        let b = branch(&dir).expect("ブランチ名が取れる");
        assert!(
            b == "main" || b == "master",
            "既定ブランチ名が取れる: {b:?}"
        );
        assert!(
            !b.contains(".invalid"),
            ".git/HEAD のプレースホルダを読んではいけない: {b:?}"
        );
        assert_eq!(
            worktree_origin(&dir),
            None,
            "メインワークツリーなので WT チップは出さない"
        );

        // The object-database reads are covered by their own test
        // (`reftable_repository_serves_the_object_database_reads_over_the_cli`); what belongs here
        // is the discovery contract this test is about.
        if libgit2_refuses {
            // Memoization: the ladder's step 3 runs once per repository, not once per question.
            let (_, calls) = count_discovery_cli_calls(|| {
                for _ in 0..20 {
                    let _ = workdir(&dir);
                    let _ = git_dir(&dir);
                    let _ = statuses(&dir);
                }
            });
            assert_eq!(
                calls, 0,
                "発見結果はキャッシュ済み — fs イベント毎に rev-parse を起動してはいけない"
            );
        }
        std::fs::remove_dir_all(&dir).ok();
    }

    /// The other half of the reftable story: the reads that go through libgit2's **object
    /// database** — diffs, log, branch refs, commit metadata — used to come back empty in a
    /// reftable repository, so the Git views opened onto nothing. Each now falls back to the `git`
    /// CLI, and this pins that all twelve return real data.
    ///
    /// Deliberately asserts on *content*, not just "non-empty": an implementation that shells out
    /// and then misparses the output would still be non-empty.
    #[cfg(feature = "git")]
    #[test]
    fn reftable_repository_serves_the_object_database_reads_over_the_cli() {
        let dir = unique_tmp("konoma_reftable_reads_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        if !init_reftable_repo(&dir) {
            eprintln!("skip: この git は --ref-format=reftable を作れない (git < 2.45)");
            std::fs::remove_dir_all(&dir).ok();
            return;
        }
        let canon = dir.canonicalize().unwrap();
        if git2::Repository::discover(&dir).is_ok() {
            // A future git2 that speaks reftable would take the fast path; nothing to fall back to.
            eprintln!("skip: この git2 は reftable を開ける (フォールバック経路が走らない)");
            std::fs::remove_dir_all(&dir).ok();
            return;
        }
        let run = |args: &[&str]| {
            assert!(std::process::Command::new("git")
                .current_dir(&canon)
                .args(args)
                .output()
                .map(|o| o.status.success())
                .unwrap_or(false));
        };
        // Three commits, a branch pinned at the middle one (so a merge-base exists that is neither
        // HEAD nor the root), and uncommitted work of both kinds left on top.
        std::fs::write(canon.join("tracked.txt"), b"one\ntwo\n").unwrap();
        run(&["add", "-A"]);
        run(&["commit", "-qm", "second subject\n\nbody line"]);
        run(&["branch", "sidebranch"]);
        std::fs::write(canon.join("same.txt"), b"x\n").unwrap();
        run(&["add", "-A"]);
        run(&["commit", "-qm", "third"]);
        std::fs::write(canon.join("tracked.txt"), b"one\nTWO\n").unwrap();
        std::fs::write(canon.join("fresh.txt"), b"brand new\n").unwrap();

        // ── log / commit_meta ────────────────────────────────────────────────
        let entries = log(&dir, 10);
        assert_eq!(entries.len(), 3, "log がコミットを返す: {entries:?}");
        assert_eq!(entries[0].summary, "third", "件名 (newest first)");
        assert_eq!(entries[1].summary, "second subject");
        assert_eq!(entries[2].summary, "init");
        assert_eq!(entries[0].author, "Test");
        assert!(entries[0].time_epoch > 0, "コミット時刻");
        assert_eq!(entries[0].short, entries[0].id[..7], "短縮ハッシュ");
        assert_eq!(log(&dir, 2).len(), 2, "max を尊重する");

        let meta = commit_meta(&dir, &entries[1].id).expect("commit_meta");
        assert_eq!(meta.author, "Test");
        assert_eq!(
            meta.message, "second subject\n\nbody line",
            "本文の改行を保った完全メッセージ"
        );
        assert_eq!(meta.short, entries[1].id[..7]);
        assert!(!meta.date.is_empty());
        assert!(
            commit_meta(&dir, "0000000000000000000000000000000000000000").is_none(),
            "存在しないコミットは None"
        );

        // ── branches / branch_tip / head_commit_id ───────────────────────────
        let names: Vec<String> = branches(&dir).iter().map(|b| b.name.clone()).collect();
        assert!(
            names.iter().any(|n| n == "sidebranch"),
            "ブランチ名が出る: {names:?}"
        );
        assert_eq!(
            branches(&dir).iter().filter(|b| b.is_current).count(),
            1,
            "現在のブランチがちょうど1つ"
        );
        let by_rec = branches_by_recency(&dir);
        assert_eq!(by_rec.len(), names.len(), "同じ集合を返す");
        assert!(
            by_rec.iter().all(|(_, _, t)| *t > 0),
            "tip の時刻: {by_rec:?}"
        );

        let head = head_commit_id(&dir).expect("head_commit_id");
        assert_eq!(head, entries[0].id, "HEAD は log の先頭と一致");
        assert_eq!(
            branch_tip(&dir, "sidebranch").as_deref(),
            Some(entries[1].id.as_str()),
            "sidebranch は真ん中のコミットを指したまま (HEAD ではない)"
        );
        assert!(branch_tip(&dir, "no-such-branch").is_none());

        // ── blob_at ─────────────────────────────────────────────────────────
        let blob = blob_at(&dir, &head, &canon.join("tracked.txt")).expect("blob_at");
        assert_eq!(
            blob, b"one\ntwo\n",
            "作業ツリーの現在値ではなくコミット時点の中身"
        );
        assert!(
            blob_at(&dir, &head, &canon.join("fresh.txt")).is_none(),
            "そのコミットに無いファイルは None"
        );

        // ── file_diff ───────────────────────────────────────────────────────
        let d = file_diff(&dir, &canon.join("tracked.txt"));
        assert!(
            d.iter()
                .any(|l| l.kind == DiffLineKind::Removed && l.text == "two"),
            "変更前の行: {d:?}"
        );
        assert!(
            d.iter()
                .any(|l| l.kind == DiffLineKind::Added && l.text == "TWO"),
            "変更後の行: {d:?}"
        );
        let fresh = file_diff(&dir, &canon.join("fresh.txt"));
        assert!(
            fresh.iter().all(|l| l.kind == DiffLineKind::Added)
                && fresh.iter().any(|l| l.text == "brand new"),
            "未追跡ファイルは全行追加: {fresh:?}"
        );
        assert!(
            file_diff(&dir, &canon.join("same.txt")).is_empty(),
            "変更の無いファイルは空"
        );

        // ── worktree_diff / commit_diff ─────────────────────────────────────
        let wt = worktree_diff(&dir);
        assert!(
            wt.iter()
                .any(|l| l.old_no.is_none() && l.new_no.is_none() && l.text == "fresh.txt"),
            "ファイル境界ヘッダ (未追跡も含む): {wt:?}"
        );
        assert!(
            wt.iter()
                .any(|l| l.kind == DiffLineKind::Added && l.text == "TWO"),
            "未コミットの変更行"
        );

        let cd = commit_diff(&dir, &entries[1].id);
        assert!(
            cd.iter()
                .any(|l| l.old_no.is_none() && l.new_no.is_none() && l.text == "tracked.txt"),
            "コミット差分のヘッダ: {cd:?}"
        );
        assert!(
            cd.iter()
                .any(|l| l.kind == DiffLineKind::Added && l.text == "two"),
            "親コミットに対する追加行: {cd:?}"
        );
        let root_commit = commit_diff(&dir, &entries[2].id);
        assert!(
            root_commit
                .iter()
                .any(|l| l.kind == DiffLineKind::Added && l.text == "one"),
            "ルートコミットは全行追加 (--root): {root_commit:?}"
        );

        // ── diff_since / merge_base_time ────────────────────────────────────
        let since = diff_since(&dir, "sidebranch");
        assert!(
            since
                .iter()
                .any(|l| l.kind == DiffLineKind::Added && l.text == "TWO"),
            "merge-base 以降 = コミット済み+未コミット: {since:?}"
        );
        assert!(
            since.iter().any(|l| l.text == "same.txt"),
            "分岐後にコミットしたファイルも含む: {since:?}"
        );
        assert!(
            diff_since(&dir, "no-such-branch").is_empty(),
            "存在しない base は空"
        );
        let t = merge_base_time(&dir, "sidebranch").expect("merge_base_time");
        assert_eq!(t, entries[1].time_epoch, "merge-base は分岐元のコミット");
        assert!(merge_base_time(&dir, "no-such-branch").is_none());

        std::fs::remove_dir_all(&dir).ok();
    }

    /// **Performance contract**, the read counterpart of
    /// `an_ordinary_directory_never_spawns_a_discovery_process`: in a repository libgit2 *can*
    /// open, not one of the CLI fallbacks may run. `file_diff` alone is enough reason — it backs
    /// the change gutter — but the same holds for every read here.
    #[cfg(feature = "git")]
    #[test]
    fn the_libgit2_path_never_spawns_a_read_fallback() {
        let dir = unique_tmp("konoma_no_read_fallback_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let canon = dir.canonicalize().unwrap();
        std::fs::write(canon.join("a.txt"), b"one\n").unwrap();
        commit_all(&dir, "init");
        std::fs::write(canon.join("a.txt"), b"two\n").unwrap();
        let head = head_commit_id(&dir).expect("head");
        let branch_name = branch(&dir).expect("branch");

        let (_, calls) = count_read_cli_calls(|| {
            for _ in 0..3 {
                let _ = file_diff(&dir, &canon.join("a.txt"));
                let _ = log(&dir, 10);
                let _ = commit_diff(&dir, &head);
                let _ = commit_meta(&dir, &head);
                let _ = branches(&dir);
                let _ = branches_by_recency(&dir);
                let _ = branch_tip(&dir, &branch_name);
                let _ = head_commit_id(&dir);
                let _ = blob_at(&dir, &head, &canon.join("a.txt"));
                let _ = worktree_diff(&dir);
                let _ = diff_since(&dir, &branch_name);
                let _ = merge_base_time(&dir, &branch_name);
            }
        });
        assert_eq!(
            calls, 0,
            "libgit2 が開ける repo でフォールバックの子プロセスを起動してはいけない"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    /// `cat_file_batch` answers every spec from one child process, in order, and keeps its framing
    /// across the cases that would break a line-oriented reader: a payload containing NUL and
    /// newlines, a `missing` answer with no payload at all, a path whose own spaces could be
    /// mistaken for git's header fields, and a non-blob object.
    #[cfg(feature = "git")]
    #[test]
    fn cat_file_batch_answers_every_spec_in_one_process() {
        let dir = unique_tmp("konoma_cat_file_batch_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let canon = dir.canonicalize().unwrap();

        let text = b"first\nsecond\nthird\n".to_vec();
        // NUL *and* a newline: read by line, the payload would be mistaken for the next header.
        let binary = vec![0u8, b'\n', 1, 2, 0, b'\n', 255, 0];
        // Spaces in the name: a `missing` answer echoes the spec, so a header split from the left
        // would read `blob`/`<size>` out of the *path* instead of out of git's own fields.
        let spaced = "a file blob 12 name.txt";
        std::fs::write(canon.join("text.txt"), &text).unwrap();
        std::fs::write(canon.join("bin.dat"), &binary).unwrap();
        std::fs::write(canon.join(spaced), &binary).unwrap();
        commit_all(&dir, "init");
        let head = head_commit_id(&dir).expect("head");

        let specs = vec![
            blob_spec(&head, Path::new("text.txt")),
            blob_spec(&head, Path::new("no-such-file.txt")), // → `missing`, no payload
            blob_spec(&head, Path::new("bin.dat")),
            blob_spec(&head, Path::new(spaced)),
            blob_spec(&head, Path::new("no such blob 9 file")), // a `missing` full of spaces
            blob_spec(&head, Path::new("also-missing")),        // a `missing` at the very end
        ];
        let (got, calls) = count_read_cli_calls(|| cat_file_batch(&canon, &specs));

        assert_eq!(calls, 1, "specs 6 個でも cat-file の起動は 1 回");
        assert_eq!(got.len(), specs.len(), "スロットは spec と 1:1");
        assert_eq!(got[0].as_deref(), Some(&text[..]), "テキストの中身");
        assert_eq!(got[1], None, "存在しないパスは missing → None");
        assert_eq!(
            got[2].as_deref(),
            Some(&binary[..]),
            "NUL と改行を含むバイナリがバイト単位で保たれる"
        );
        assert_eq!(
            got[3].as_deref(),
            Some(&binary[..]),
            "空白入りのファイル名でも読める"
        );
        assert_eq!(got[4], None, "空白だらけの missing 行を中身と取り違えない");
        assert_eq!(got[5], None, "末尾の missing でも枠がずれない");

        // A directory is not a blob: the previous `cat-file blob` spelling failed on it, and the
        // batched form must answer `None` too rather than handing back a tree object's bytes.
        std::fs::create_dir_all(canon.join("sub")).unwrap();
        std::fs::write(canon.join("sub/inner.txt"), b"inner\n").unwrap();
        commit_all(&dir, "second");
        let head2 = head_commit_id(&dir).expect("head2");
        let mixed = vec![
            blob_spec(&head2, Path::new("sub")),
            blob_spec(&head2, Path::new("sub/inner.txt")),
        ];
        let got = cat_file_batch(&canon, &mixed);
        assert_eq!(got[0], None, "ディレクトリ (tree) は blob ではない → None");
        assert_eq!(
            got[1].as_deref(),
            Some(&b"inner\n"[..]),
            "tree を読み飛ばしても次のスロットがずれない"
        );

        std::fs::remove_dir_all(&dir).ok();
    }

    /// The deadlock guard. Writing every spec before reading anything wedges once *both* pipes
    /// fill: git blocks writing its stdout, stops draining stdin, and this side blocks writing.
    ///
    /// The spec count is **measured, not guessed**. With the writer inlined (the shape this test
    /// exists to reject) the wedge reproduced here at 4000 specs and did *not* at 2000 — the pipe
    /// holds 64 KiB, but below that threshold git drains fast enough that neither side stalls.
    /// 6000 leaves margin over the threshold for a slower or differently-buffered machine while
    /// still finishing well under a second: a regression must surface as a hang or a wrong answer
    /// *here*, never as a CI timeout.
    #[cfg(feature = "git")]
    #[test]
    fn cat_file_batch_does_not_deadlock_when_both_pipes_fill() {
        let dir = unique_tmp("konoma_cat_file_batch_pipe_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let canon = dir.canonicalize().unwrap();

        // A long name so the input stream (spec + `\n` per line) crosses the pipe buffer quickly.
        let name = format!("{}.txt", "a-fairly-long-file-name-".repeat(2));
        let body = b"payload line one\npayload line two\n".to_vec();
        std::fs::write(canon.join(&name), &body).unwrap();
        // One larger blob so a multi-KiB payload is framed by count, not by luck.
        let big: Vec<u8> = (0..300_000u32).map(|i| (i % 251) as u8).collect();
        std::fs::write(canon.join("big.dat"), &big).unwrap();
        commit_all(&dir, "init");
        let head = head_commit_id(&dir).expect("head");

        let mut specs: Vec<_> = (0..6000)
            .map(|_| blob_spec(&head, Path::new(&name)))
            .collect();
        specs.insert(3000, blob_spec(&head, Path::new("big.dat")));

        let (got, calls) = count_read_cli_calls(|| cat_file_batch(&canon, &specs));
        assert_eq!(calls, 1, "6001 spec でも起動は 1 回");
        assert_eq!(got.len(), specs.len());
        assert_eq!(got[3000].as_deref(), Some(&big[..]), "大きい blob の中身");
        assert!(
            got.iter()
                .enumerate()
                .filter(|(i, _)| *i != 3000)
                .all(|(_, b)| b.as_deref() == Some(&body[..])),
            "全スロットが正しい中身で埋まる (途中で打ち切られていない)"
        );

        std::fs::remove_dir_all(&dir).ok();
    }

    /// **Performance contract.** A multi-file diff must not grow a process per file: whatever the
    /// commit touches, the CLI path spawns exactly one listing call plus one `cat-file --batch`.
    /// Asserted at two very different file counts, because the constant is the point — the
    /// per-file spelling this replaced cost ~4ms × 2 × files.
    #[cfg(feature = "git")]
    #[test]
    fn a_multi_file_diff_spawns_one_cat_file_whatever_the_file_count() {
        let dir = unique_tmp("konoma_batch_spawn_count_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let canon = dir.canonicalize().unwrap();

        let write_n = |n: usize, tag: &str| {
            for i in 0..n {
                std::fs::write(canon.join(format!("f{i}.txt")), format!("{tag} {i}\n")).unwrap();
            }
        };
        write_n(12, "one");
        commit_all(&dir, "init");
        let small = head_commit_id(&dir).expect("head");
        write_n(3, "two");
        commit_all(&dir, "three files");
        let three = head_commit_id(&dir).expect("head");
        write_n(12, "three");
        commit_all(&dir, "twelve files");
        let twelve = head_commit_id(&dir).expect("head");

        // `cli_dir` is memoized after the first call; warm it so discovery cannot be mistaken for
        // a read fallback (it uses a different counter, but the intent should not depend on that).
        let _ = cli_dir(&dir);

        let (lines3, calls3) = count_read_cli_calls(|| commit_diff_via_cli(&dir, &three));
        let (lines12, calls12) = count_read_cli_calls(|| commit_diff_via_cli(&dir, &twelve));
        assert_eq!(calls3, 2, "3 ファイル: diff-tree 1 + cat-file 1");
        assert_eq!(
            calls12, 2,
            "12 ファイル: ファイル数が増えても起動数は変わらない"
        );
        assert!(
            !lines3.is_empty() && lines12.len() > lines3.len(),
            "比較が空同士で成立していない: {} vs {}",
            lines3.len(),
            lines12.len()
        );

        // The same contract for the working-tree side (`worktree_diff` / `diff_since`), where the
        // "after" side is read from disk and only the "before" side needs git.
        write_n(12, "dirty");
        let (wt, calls_wt) =
            count_read_cli_calls(|| cli_diff_vs_worktree(&canon, Some(small.as_str())));
        assert!(!wt.is_empty(), "作業ツリー差分が空でない");
        assert_eq!(
            calls_wt, 3,
            "listing 2 (diff --name-only + ls-files --others) + cat-file 1 — \
             変更 12 ファイルでもこれ以上増えない"
        );

        std::fs::remove_dir_all(&dir).ok();
    }

    /// The two implementations must describe the same repository. Run in an **ordinary** repository
    /// (where libgit2 works) so both paths can be invoked side by side on identical input — the
    /// only place that comparison is possible at all.
    ///
    /// Compared at the granularity the fallback actually promises (see `open_repo`'s doc): the
    /// **set of changed lines** is identical, while hunk boundaries and context grouping are
    /// `similar`'s rather than libgit2's and may differ. Metadata, on the other hand, must match
    /// exactly — nothing about a hash or a timestamp is a matter of interpretation.
    #[cfg(feature = "git")]
    #[test]
    fn the_cli_fallback_and_libgit2_describe_the_same_repository() {
        let dir = unique_tmp("konoma_fallback_parity_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let canon = dir.canonicalize().unwrap();
        // Enough shape that a naive implementation would drift: several files, an untouched middle
        // that both must treat as context, and an added file.
        let body: String = (1..=40).map(|i| format!("line {i}\n")).collect();
        std::fs::write(canon.join("a.txt"), &body).unwrap();
        std::fs::write(canon.join("b.txt"), b"kept\n").unwrap();
        commit_all(&dir, "init");
        let changed = body.replace("line 3\n", "LINE THREE\n") + "appended\n";
        std::fs::write(canon.join("a.txt"), &changed).unwrap();
        std::fs::write(canon.join("added.txt"), b"fresh\n").unwrap();

        // Changed lines, ignoring context: what the two paths must agree on. Sorted, because only
        // the *set* is promised — the order lines appear in follows hunk grouping, which is
        // exactly the part that may differ.
        let changes = |lines: &[DiffLine]| -> Vec<String> {
            let mut v: Vec<String> = lines
                .iter()
                .filter(|l| l.kind != DiffLineKind::Context)
                .map(|l| {
                    let sign = if l.kind == DiffLineKind::Added {
                        '+'
                    } else {
                        '-'
                    };
                    format!("{sign}{}", l.text)
                })
                .collect();
            v.sort();
            v
        };
        let headers = |lines: &[DiffLine]| -> Vec<String> {
            lines
                .iter()
                .filter(|l| l.old_no.is_none() && l.new_no.is_none())
                .map(|l| l.text.clone())
                .collect()
        };

        let file = canon.join("a.txt");
        assert_eq!(
            changes(&file_diff(&dir, &file)),
            changes(&file_diff_via_cli(&dir, &file)),
            "file_diff の変更行が一致する"
        );
        assert!(
            !changes(&file_diff_via_cli(&dir, &file)).is_empty(),
            "比較が空同士で成立していない"
        );

        let libgit2_wt = worktree_diff(&dir);
        let cli_wt = cli_diff_vs_worktree(&canon, head_commit_id(&dir).as_deref());
        assert_eq!(
            changes(&libgit2_wt),
            changes(&cli_wt),
            "worktree_diff の変更行 (未追跡込み) が一致する"
        );
        assert_eq!(
            headers(&libgit2_wt),
            headers(&cli_wt),
            "ファイル境界ヘッダの並びが一致する"
        );

        let head = head_commit_id(&dir).expect("head");
        assert_eq!(
            head,
            git_read_token(&canon, ["rev-parse", "--verify", "HEAD^{commit}"]).unwrap(),
            "head_commit_id"
        );
        assert_eq!(
            blob_at(&dir, &head, &file),
            cli_blob(&canon, &head, Path::new("a.txt")),
            "blob_at の中身"
        );
        // A *root* commit, where the two paths reach the "no parent" case by different routes
        // (`parent(0)`-or-empty-tree vs `diff-tree --root`).
        assert!(
            !changes(&commit_diff(&dir, &head)).is_empty(),
            "比較が空同士で成立していない"
        );
        assert_eq!(
            changes(&commit_diff(&dir, &head)),
            changes(&commit_diff_via_cli(&dir, &head)),
            "commit_diff の変更行が一致する"
        );
        assert_eq!(
            log(&dir, 10)
                .iter()
                .map(|c| (
                    c.id.clone(),
                    c.summary.clone(),
                    c.author.clone(),
                    c.time_epoch
                ))
                .collect::<Vec<_>>(),
            log_via_cli(&dir, 10)
                .iter()
                .map(|c| (
                    c.id.clone(),
                    c.summary.clone(),
                    c.author.clone(),
                    c.time_epoch
                ))
                .collect::<Vec<_>>(),
            "log のコミット列"
        );
        let m1 = commit_meta(&dir, &head).unwrap();
        let m2 = commit_meta_via_cli(&dir, &head).unwrap();
        assert_eq!(
            (m1.id, m1.short, m1.author, m1.date, m1.message),
            (m2.id, m2.short, m2.author, m2.date, m2.message),
            "commit_meta の全項目"
        );
        assert_eq!(
            branches(&dir)
                .iter()
                .map(|b| (b.name.clone(), b.is_current))
                .collect::<Vec<_>>(),
            branches_via_cli(&dir)
                .iter()
                .map(|b| (b.name.clone(), b.is_current))
                .collect::<Vec<_>>(),
            "branches"
        );
        assert_eq!(
            branches_by_recency(&dir),
            branches_by_recency_via_cli(&dir),
            "branches_by_recency"
        );
        let name = branch(&dir).unwrap();
        assert_eq!(
            branch_tip(&dir, &name),
            branch_tip_via_cli(&dir, &name),
            "branch_tip"
        );
        assert_eq!(
            merge_base_time(&dir, &name),
            git_read_token(
                &canon,
                [
                    "show",
                    "-s",
                    "--format=%ct",
                    &cli_merge_base(&canon, &name).unwrap(),
                    "--"
                ]
            )
            .and_then(|s| s.parse::<i64>().ok()),
            "merge_base_time"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    /// Binary content must not be fed to the line differ: libgit2 emits no line callbacks for a
    /// binary delta, so the fallback emits the file header and stops there too. (A PNG run through
    /// `diff_contents` would otherwise spill megabytes of mojibake into the diff view.)
    #[cfg(feature = "git")]
    #[test]
    fn binary_files_contribute_a_header_but_no_lines() {
        let mut out = Vec::new();
        push_file_diff(
            &mut out,
            Path::new("logo.png"),
            Some(b"\x89PNG\r\n\x1a\n\x00\x00old"),
            Some(b"\x89PNG\r\n\x1a\n\x00\x00new"),
            true,
        );
        assert_eq!(out.len(), 1, "ヘッダ1行のみ: {out:?}");
        assert_eq!(out[0].text, "logo.png");
        assert!(out[0].old_no.is_none() && out[0].new_no.is_none());

        let mut none = Vec::new();
        push_file_diff(
            &mut none,
            Path::new("logo.png"),
            Some(b"\x00a"),
            None,
            false,
        );
        assert!(none.is_empty(), "ヘッダ無しならバイナリは何も出さない");

        // Text still goes through, including a non-UTF-8 byte (lossy, as libgit2's own line
        // content conversion is).
        let mut text = Vec::new();
        push_file_diff(
            &mut text,
            Path::new("t.txt"),
            Some(b"a\n"),
            Some(b"\xff\n"),
            false,
        );
        assert!(
            text.iter().any(|l| l.kind == DiffLineKind::Added),
            "非 UTF-8 のテキストも差分になる: {text:?}"
        );
    }

    #[cfg(feature = "git")]
    fn init_repo(dir: &Path) {
        let repo = git2::Repository::init(dir).unwrap();
        let mut cfg = repo.config().unwrap();
        cfg.set_str("user.name", "Test").unwrap();
        cfg.set_str("user.email", "test@example.com").unwrap();
        cfg.set_str("commit.gpgsign", "false").ok();
    }

    /// Stages everything and commits, through this module's own write helpers (which are CLI-backed
    /// either way, so the fixture is identical for both repository formats).
    #[cfg(feature = "git")]
    fn commit_all(dir: &Path, msg: &str) {
        stage_all(dir).unwrap();
        commit(dir, msg).unwrap();
    }

    /// macOS-only regression (`normalize_status_path`): `git init` sets `core.precomposeunicode
    /// = true` by default on macOS, which makes `git status --porcelain` report a changed file's
    /// name **precomposed (NFC)** even though the bytes macOS actually wrote to disk for that name
    /// are **decomposed (NFD)** — confirmed with a byte-level probe (see that function's doc
    /// comment). Before the fix, `statuses()`'s map key stayed NFC, so a `HashMap::get` keyed by
    /// the tree side's `read_dir`-sourced (on-disk, NFD) path never matched: the file showed no
    /// `M` marker in the tree, and (see `app/tests.rs`'s
    /// `nfd_named_file_status_and_diff_are_reachable_from_the_tree_path`) pressing `d` to open its
    /// diff was rejected with "no changes" even though it really was modified.
    #[cfg(all(feature = "git", target_os = "macos"))]
    #[test]
    fn nfd_named_file_status_is_found_via_the_tree_path() {
        let dir = unique_tmp("konoma_nfd_status_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);

        // NFD spelling: か (U+304B) + the combining voiced sound mark (U+3099) — a decomposed が.
        let nfd_name = "\u{304B}\u{3099}_nfd.txt";
        let canon = dir.canonicalize().unwrap();
        let nfd_path = canon.join(nfd_name);
        std::fs::write(&nfd_path, b"original\n").unwrap();
        stage(&dir, &nfd_path).unwrap();
        commit(&dir, "init").unwrap();

        // Modify it — porcelain now reports it as changed, spelled NFC.
        std::fs::write(&nfd_path, b"original\nchanged\n").unwrap();

        // Guard against this test silently becoming a no-op if some future git/macOS combination
        // stops precomposing: confirm porcelain really does report NFC bytes here, not NFD.
        let out = std::process::Command::new("git")
            .current_dir(&dir)
            .args(["status", "--porcelain=v1", "-z"])
            .output()
            .unwrap();
        let porcelain = String::from_utf8_lossy(&out.stdout);
        let nfc_name = "\u{304C}_nfd.txt"; // が, precomposed: one codepoint, 3 UTF-8 bytes.
        assert!(
            porcelain.contains(nfc_name),
            "テストの前提(core.precomposeunicode): git status は NFC で報告するはず: {porcelain:?}"
        );
        assert!(
            !porcelain.contains(nfd_name),
            "テストの前提: porcelain 出力に NFD 表記は含まれないはず: {porcelain:?}"
        );

        let map = statuses(&dir);
        // The tree side always looks up with the on-disk (NFD) path — exactly `nfd_path` here,
        // since that is the byte sequence the file was created with and still has on disk.
        assert!(
            map.contains_key(&nfd_path),
            "ツリー側の NFD パスで status が引ける必要がある: {map:?}"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    /// Non-regression: an ASCII-named and a precomposed(NFC)-named file next to the NFD one above
    /// still resolve correctly — `normalize_status_path`'s canonicalize round-trip is a no-op for
    /// paths whose porcelain spelling already matches the on-disk spelling.
    #[cfg(all(feature = "git", target_os = "macos"))]
    #[test]
    fn ascii_and_nfc_named_files_are_unaffected_by_nfd_normalization() {
        let dir = unique_tmp("konoma_nfd_status_siblings_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let canon = dir.canonicalize().unwrap();

        let ascii_path = canon.join("ascii.txt");
        // が, precomposed (NFC) — created directly with NFC bytes, which APFS preserves as given
        // (it does not force NFD on write; see `normalize_status_path`'s doc comment).
        let nfc_path = canon.join("\u{304C}_nfc.txt");
        std::fs::write(&ascii_path, b"one\n").unwrap();
        std::fs::write(&nfc_path, b"two\n").unwrap();
        stage(&dir, &ascii_path).unwrap();
        stage(&dir, &nfc_path).unwrap();
        commit(&dir, "init").unwrap();
        std::fs::write(&ascii_path, b"one\nmodified\n").unwrap();
        std::fs::write(&nfc_path, b"two\nmodified\n").unwrap();

        let map = statuses(&dir);
        assert_eq!(
            map.get(&ascii_path),
            Some(&FileStatus::Modified),
            "ASCII 名は非退行: {map:?}"
        );
        assert_eq!(
            map.get(&nfc_path),
            Some(&FileStatus::Modified),
            "NFC 名は非退行: {map:?}"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    /// A deleted file's `abs` path no longer exists on disk, so `canonicalize()` inside
    /// `normalize_status_path` fails there — the fallback must keep the original (NFC-spelled,
    /// straight off porcelain) path rather than dropping the entry or panicking. There is no tree
    /// entry to match a deleted file against anyway, so this is harmless either way, but it must
    /// not regress the status map itself (e.g. by silently losing the `Deleted` entry).
    #[cfg(all(feature = "git", target_os = "macos"))]
    #[test]
    fn deleted_nfd_originated_file_falls_back_to_the_porcelain_path() {
        let dir = unique_tmp("konoma_nfd_status_deleted_test");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let canon = dir.canonicalize().unwrap();

        let nfd_name = "\u{304B}\u{3099}_nfd.txt";
        let nfd_path = canon.join(nfd_name);
        std::fs::write(&nfd_path, b"original\n").unwrap();
        stage(&dir, &nfd_path).unwrap();
        commit(&dir, "init").unwrap();
        std::fs::remove_file(&nfd_path).unwrap();

        let map = statuses(&dir);
        // The path no longer exists, so canonicalize() fails inside normalize_status_path and the
        // fallback keeps porcelain's own (NFC) spelling.
        let nfc_path = canon.join("\u{304C}_nfd.txt");
        assert_eq!(
            map.get(&nfc_path),
            Some(&FileStatus::Deleted),
            "canonicalize 失敗時は元の(NFC)パスにフォールバックし、Deleted のまま残る必要がある: {map:?}"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    #[cfg(feature = "git")]
    #[test]
    fn ignored_collapses_dirs_and_excludes_tracked() {
        let dir = unique_tmp("konoma_git_ignored_set");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        std::fs::write(dir.join(".gitignore"), b"target/\nnode_modules/\n*.log\n").unwrap();
        std::fs::create_dir_all(dir.join("target/deep")).unwrap();
        std::fs::create_dir_all(dir.join("node_modules/pkg")).unwrap();
        std::fs::create_dir_all(dir.join("src")).unwrap();
        std::fs::write(dir.join("target/a.o"), b"x").unwrap();
        std::fs::write(dir.join("target/deep/b.o"), b"x").unwrap();
        std::fs::write(dir.join("node_modules/pkg/index.js"), b"x").unwrap();
        std::fs::write(dir.join("app.log"), b"x").unwrap();
        std::fs::write(dir.join("src/main.rs"), b"fn main(){}\n").unwrap();
        stage(&dir, &dir.join(".gitignore")).unwrap();
        stage(&dir, &dir.join("src/main.rs")).unwrap();
        commit(&dir, "init").unwrap();

        let set = ignored(&dir);
        let canon = dir.canonicalize().unwrap();
        // An ignored dir collapses (one dir entry, not recursed into). Equivalent to
        // recurse_ignored_dirs(false).
        assert!(
            set.contains(&canon.join("target")),
            "target/ が collapse で1件: {set:?}"
        );
        assert!(
            set.contains(&canon.join("node_modules")),
            "node_modules/ が collapse で1件: {set:?}"
        );
        assert!(
            set.contains(&canon.join("app.log")),
            "*.log の無視ファイル: {set:?}"
        );
        // Since it's collapsed, individual files inside it are not included.
        assert!(
            !set.contains(&canon.join("target/a.o")),
            "collapse 中の個別ファイルは入らない: {set:?}"
        );
        // A tracked file / .gitignore itself is not ignored.
        assert!(
            !set.contains(&canon.join("src/main.rs")),
            "追跡ファイルは無視でない"
        );
        assert!(
            !set.contains(&canon.join(".gitignore")),
            ".gitignore 自身は無視でない"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    #[cfg(feature = "git")]
    #[test]
    fn file_diff_untracked_is_all_added() {
        let dir = unique_tmp("konoma_git_filediff_untracked");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let f = dir.join("a.txt");
        std::fs::write(&f, b"line1\nline2\n").unwrap();
        let diff = file_diff(&dir, &f);
        assert!(!diff.is_empty(), "未追跡ファイルの diff が空");
        assert!(
            diff.iter().all(|l| l.kind == DiffLineKind::Added),
            "未追跡は全行 Added のはず: {diff:?}"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    #[cfg(feature = "git")]
    #[test]
    fn file_diff_modified_has_added_and_removed() {
        let dir = unique_tmp("konoma_git_filediff_modified");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let f = dir.join("a.txt");
        std::fs::write(&f, b"alpha\nbeta\n").unwrap();
        // The initial commit.
        let out = std::process::Command::new("git")
            .current_dir(&dir)
            .args(["add", "-A"])
            .output()
            .unwrap();
        assert!(out.status.success());
        let out = std::process::Command::new("git")
            .current_dir(&dir)
            .args(["commit", "-m", "init"])
            .output()
            .unwrap();
        assert!(out.status.success(), "commit 失敗");
        // The change.
        std::fs::write(&f, b"alpha\ngamma\n").unwrap();
        let diff = file_diff(&dir, &f);
        assert!(
            diff.iter().any(|l| l.kind == DiffLineKind::Added),
            "Added 行が無い: {diff:?}"
        );
        assert!(
            diff.iter().any(|l| l.kind == DiffLineKind::Removed),
            "Removed 行が無い: {diff:?}"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    /// macOS-only regression (`precomposed_pathspec`): calling `file_diff` with the tree's on-disk
    /// (NFD) path for a modified file whose macOS-precomposed spelling differs must return actual
    /// diff lines, not an empty Vec. Before the fix, `git2::DiffOptions::pathspec` was given the
    /// NFD spelling verbatim, which does not match libgit2's own precomposed (NFC) tree/workdir
    /// candidate names — the diff silently came back empty (`d` opened a diff view with nothing in
    /// it, distinct from — and just as broken as — the "no changes" rejection
    /// `normalize_status_path` fixes for `git_status_of`/`tree_open_git_diff`).
    #[cfg(all(feature = "git", target_os = "macos"))]
    #[test]
    fn file_diff_finds_changes_for_an_nfd_named_file() {
        let dir = unique_tmp("konoma_git_filediff_nfd");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let canon = dir.canonicalize().unwrap();
        // NFD spelling: か (U+304B) + the combining voiced sound mark (U+3099) — decomposed が.
        let nfd_path = canon.join("\u{304B}\u{3099}_nfd.txt");
        std::fs::write(&nfd_path, b"alpha\nbeta\n").unwrap();
        stage(&dir, &nfd_path).unwrap();
        commit(&dir, "init").unwrap();
        std::fs::write(&nfd_path, b"alpha\ngamma\n").unwrap();

        let diff = file_diff(&dir, &nfd_path);
        assert!(
            diff.iter().any(|l| l.kind == DiffLineKind::Added),
            "Added 行が無い(NFD パスの diff が空): {diff:?}"
        );
        assert!(
            diff.iter().any(|l| l.kind == DiffLineKind::Removed),
            "Removed 行が無い(NFD パスの diff が空): {diff:?}"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    #[cfg(feature = "git")]
    #[test]
    fn changed_files_lists_staged_flag() {
        let dir = unique_tmp("konoma_git_changed_files");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        std::fs::write(dir.join("a.txt"), b"hi\n").unwrap();
        // Before staging: untracked, staged=false.
        let before = changed_files(&dir);
        assert_eq!(before.len(), 1);
        assert!(!before[0].staged);
        // Stage via git add → staged=true.
        let out = std::process::Command::new("git")
            .current_dir(&dir)
            .args(["add", "a.txt"])
            .output()
            .unwrap();
        assert!(out.status.success());
        let after = changed_files(&dir);
        assert_eq!(after.len(), 1);
        assert!(after[0].staged, "add 後は staged=true のはず");
        assert!(after[0].path.ends_with("a.txt"));
        std::fs::remove_dir_all(&dir).ok();
    }

    /// The doc contract: `changed_files`'s result is "sorted by path" — not "happens to be", which
    /// is all `changed_files_lists_staged_flag` above (one file) or `stage_commit_then_log_and_commit_diff`
    /// (also one file) could ever have shown. `git status --porcelain` itself reports tracked
    /// changes and untracked files as **two separately-sorted blocks**, not one merged alphabetical
    /// list — confirmed empirically: with `delta.txt`/`mango.txt` modified and new untracked
    /// `alpha.txt`/`kappa.txt`/`zulu.txt`, `git status --porcelain=v1` prints `delta, mango, alpha,
    /// kappa, zulu`, the untracked block trailing the tracked one regardless of path. Only
    /// `changed_files`'s own `sort_by` turns that into one merged alphabetical list.
    #[cfg(feature = "git")]
    #[test]
    fn changed_files_is_sorted_by_path_across_tracked_and_untracked() {
        let dir = unique_tmp("konoma_git_changed_files_sorted");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        for name in ["mango.txt", "delta.txt"] {
            std::fs::write(dir.join(name), b"one\n").unwrap();
        }
        stage_all(&dir).unwrap();
        commit(&dir, "init").unwrap();
        // Tracked edits, out of alphabetical order relative to each other and to the untracked
        // files added next.
        std::fs::write(dir.join("mango.txt"), b"two\n").unwrap();
        std::fs::write(dir.join("delta.txt"), b"two\n").unwrap();
        // New, untracked — git reports this as a separate block, after the tracked block above.
        for name in ["zulu.txt", "kappa.txt", "alpha.txt"] {
            std::fs::write(dir.join(name), b"new\n").unwrap();
        }
        let names: Vec<String> = changed_files(&dir)
            .iter()
            .map(|e| e.path.file_name().unwrap().to_string_lossy().into_owned())
            .collect();
        assert_eq!(
            names,
            vec![
                "alpha.txt",
                "delta.txt",
                "kappa.txt",
                "mango.txt",
                "zulu.txt"
            ],
            "changed_files must be sorted by path, not grouped by tracked/untracked (git's own \
             report order here is delta, mango, alpha, kappa, zulu): {names:?}"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    #[cfg(feature = "git")]
    #[test]
    fn stage_commit_then_log_and_commit_diff() {
        let dir = unique_tmp("konoma_git_stage_commit_log");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let f = dir.join("a.txt");
        std::fs::write(&f, b"hello\n").unwrap();
        // Stage via the public API → commit.
        stage(&dir, &f).unwrap();
        commit(&dir, "first commit").unwrap();
        let entries = log(&dir, 10);
        assert_eq!(entries.len(), 1, "log は1件のはず");
        assert_eq!(entries[0].summary, "first commit");
        assert_eq!(entries[0].short.len(), 7);
        // commit_diff is not empty (a new file was added).
        let cd = commit_diff(&dir, &entries[0].id);
        assert!(!cd.is_empty(), "commit_diff が空");
        assert!(
            cd.iter().any(|l| l.kind == DiffLineKind::Added),
            "Added 行が無い: {cd:?}"
        );
        std::fs::remove_dir_all(&dir).ok();
    }

    #[cfg(feature = "git")]
    #[test]
    fn unstage_and_discard_work() {
        let dir = unique_tmp("konoma_git_unstage_discard");
        let _ = std::fs::remove_dir_all(&dir);
        std::fs::create_dir_all(&dir).unwrap();
        init_repo(&dir);
        let f = dir.join("a.txt");
        std::fs::write(&f, b"v1\n").unwrap();
        stage(&dir, &f).unwrap();
        commit(&dir, "init").unwrap();
        // Modify and stage → unstage removes it from the index.
        std::fs::write(&f, b"v2\n").unwrap();
        stage(&dir, &f).unwrap();
        assert!(changed_files(&dir).iter().any(|e| e.staged));
        unstage(&dir, &f).unwrap();
        assert!(
            !changed_files(&dir).iter().any(|e| e.staged),
            "unstage 後は staged が無いはず"
        );
        // discard throws away the working-tree change → clean.
        discard(&dir, &f).unwrap();
        assert!(changed_files(&dir).is_empty(), "discard 後はクリーンのはず");
        assert_eq!(std::fs::read_to_string(&f).unwrap(), "v1\n");
        std::fs::remove_dir_all(&dir).ok();
    }

    // SPEED GUARD: lay_out_lanes is a pure function that assigns lanes from a DAG (a parent-ID
    // list). Confirm it stays around O(n) even for a 1000-entry linear chain (a regression guard
    // against lane assignment turning quadratic). No real repo is needed, so a synthetic DAG is
    // passed directly. Generation is cheap, so this is not `#[ignore]`.
    #[cfg(feature = "git")]
    #[test]
    fn lay_out_lanes_linear_dag_is_bounded() {
        use std::time::{Duration, Instant};
        let n = 1000usize;
        let commits: Vec<DagCommit> = (0..n)
            .map(|i| DagCommit {
                kind: None,
                id: format!("c{i}"),
                parents: if i + 1 < n {
                    vec![format!("c{}", i + 1)]
                } else {
                    Vec::new()
                },
                short: format!("c{i}"),
                subject: format!("subject {i}"),
                author: "a".into(),
                date: "d".into(),
                refs: String::new(),
            })
            .collect();
        let t = Instant::now();
        let rows = lay_out_lanes(&commits, None, None, crate::vcs::VcsKind::Git);
        let dt = t.elapsed();
        assert_eq!(
            rows.iter().filter(|r| r.commit.is_some()).count(),
            n,
            "全コミット行が出る"
        );
        assert!(
            dt < Duration::from_secs(2),
            "1000 コミットのレーン割当が遅すぎる(回帰?): {dt:?}"
        );
    }

    // --- jj path: `lay_out_lanes` is VCS-agnostic in its lane/connector algorithm; only the glyph
    // painted into the node cell depends on `vcs`. The six tests above never pass anything but
    // `VcsKind::Git`, so the jj path (and `node_col`'s own correctness) was completely
    // unexercised before. These tests route the same kind of synthetic DAGs through
    // `VcsKind::Jj`.

    #[cfg(feature = "git")]
    #[test]
    fn lay_out_lanes_jj_uses_jjs_glyphs_not_gits_for_a_fork_and_merge() {
        // Same DAG shape as `lay_out_lanes_draws_angular_fork_and_merge` (M merges B and F, both
        // from R), routed through jj instead. All four kinds here are inferred structurally
        // (`kind: None`), and jj folds Normal+Merge into the same ○ (unlike git, which draws a
        // distinct ◆ for the merge) — so every commit row renders the same glyph, and neither of
        // git's node glyphs (●/◆) appears anywhere.
        let dc = |id: &str, parents: &[&str]| DagCommit {
            kind: None,
            id: id.into(),
            parents: parents.iter().map(|s| s.to_string()).collect(),
            short: id.into(),
            subject: format!("{id} subj"),
            author: "a".into(),
            date: "d".into(),
            refs: String::new(),
        };
        let commits = vec![
            dc("M", &["B", "F"]),
            dc("B", &["R"]),
            dc("F", &["R"]),
            dc("R", &[]),
        ];
        let rows = lay_out_lanes(&commits, None, None, crate::vcs::VcsKind::Jj);
        let joined: Vec<String> = rows
            .iter()
            .map(|r| {
                r.graph
                    .iter()
                    .map(|(s, _)| s.as_str())
                    .collect::<String>()
                    .trim_end()
                    .to_string()
            })
            .collect();
        assert_eq!(
            joined,
            vec!["○", "├─┐", "○ │", "│ ○", "├─┘", "○"],
            "jj 経路のグラフが期待と不一致(git の字が混ざっていないか): {joined:?}"
        );
        let all: String = rows
            .iter()
            .flat_map(|r| r.graph.iter().map(|(s, _)| s.clone()))
            .collect();
        assert!(
            !all.contains('●') && !all.contains('◆'),
            "jj 経路に git 専用の字(●/◆)が混ざっている: {all}"
        );
        assert_eq!(
            all.matches('○').count(),
            4,
            "jj の丸ノード○は4個(全コミット分)"
        );
    }

    #[cfg(feature = "git")]
    #[test]
    fn lay_out_lanes_jj_renders_working_copy_immutable_and_conflict_kinds() {
        // jj marks kinds the DAG shape alone can't tell (`DagCommit::kind`, set by the jj backend
        // — not exercised here, since this is a pure-function test on synthetic data). A linear
        // chain W(working copy) -> I(immutable) -> X(conflict) -> R(ordinary root, kind inferred)
        // must render @ / ◆ / × / ○ respectively. jj never synthesizes an "uncommitted changes"
        // pseudo-row (its working copy is already a real commit in the DAG), so `wt` is `None`
        // here — unlike the git worktree-row tests above, which always pass `Some(..)`.
        let dc = |id: &str, parents: &[&str], kind: Option<NodeKind>| DagCommit {
            kind,
            id: id.into(),
            parents: parents.iter().map(|s| s.to_string()).collect(),
            short: id.into(),
            subject: id.into(),
            author: "a".into(),
            date: "d".into(),
            refs: String::new(),
        };
        let commits = vec![
            dc("W", &["I"], Some(NodeKind::WorkingCopy)),
            dc("I", &["X"], Some(NodeKind::Immutable)),
            dc("X", &["R"], Some(NodeKind::Conflict)),
            dc("R", &[], None), // no explicit kind => structural Normal
        ];
        let rows = lay_out_lanes(&commits, None, None, crate::vcs::VcsKind::Jj);
        let glyph_of = |id: &str| -> (Option<NodeKind>, String) {
            let r = rows
                .iter()
                .find(|r| r.commit.as_deref() == Some(id))
                .unwrap_or_else(|| panic!("commit {id} の行が無い: {rows:?}"));
            let cell = r
                .node_col
                .and_then(|c| r.graph.get(c))
                .map(|(s, _)| s.clone())
                .unwrap_or_default();
            (r.node, cell)
        };
        assert_eq!(
            glyph_of("W"),
            (Some(NodeKind::WorkingCopy), "@".to_string()),
            "jj の作業コピー行は @"
        );
        assert_eq!(
            glyph_of("I"),
            (Some(NodeKind::Immutable), "◆".to_string()),
            "jj の不変コミット行は ◆"
        );
        assert_eq!(
            glyph_of("X"),
            (Some(NodeKind::Conflict), "×".to_string()),
            "jj の衝突コミット行は ×"
        );
        assert_eq!(
            glyph_of("R"),
            (Some(NodeKind::Normal), "○".to_string()),
            "kind 未指定は構造(親1個)から Normal(○)と推定"
        );
    }

    /// `node_col`, on every row that has a node, must point at the cell holding exactly the glyph
    /// `ui::icons::node_glyph(kind, vcs)` draws for that row's kind — the invariant the graph
    /// legend's color lookup (`legend_from_rows`) depends on ("locate the node by position, never
    /// by matching the character"). VCS-agnostic, so one helper checks both backends.
    #[cfg(feature = "git")]
    fn assert_node_col_points_at_its_own_glyph(rows: &[GraphRow], vcs: crate::vcs::VcsKind) {
        for r in rows {
            let (Some(kind), Some(col)) = (r.node, r.node_col) else {
                continue; // connector-only rows have neither
            };
            let cell = r
                .graph
                .get(col)
                .unwrap_or_else(|| panic!("node_col={col} が graph の範囲外: {r:?}"));
            assert_eq!(
                cell.0,
                crate::ui::icons::node_glyph(kind, vcs).to_string(),
                "node_col の位置の字が node_glyph(kind, vcs) と不一致: row={r:?}"
            );
        }
    }

    #[cfg(feature = "git")]
    #[test]
    fn lay_out_lanes_node_col_matches_its_glyph_git() {
        // Reuses `lay_out_lanes_base_pins_branch_to_lane0`'s two-branch/base-pin shape, which
        // moves nodes across several lanes.
        let dc = |id: &str, parents: &[&str]| DagCommit {
            kind: None,
            id: id.into(),
            parents: parents.iter().map(|s| s.to_string()).collect(),
            short: id.into(),
            subject: id.into(),
            author: "a".into(),
            date: "d".into(),
            refs: String::new(),
        };
        let commits = vec![
            dc("A1", &["A2"]),
            dc("A2", &["R"]),
            dc("B1", &["B2"]),
            dc("B2", &["R"]),
            dc("R", &[]),
        ];
        let rows = lay_out_lanes(&commits, Some("B1"), None, crate::vcs::VcsKind::Git);
        assert_eq!(rows.iter().filter(|r| r.commit.is_some()).count(), 5);
        assert_node_col_points_at_its_own_glyph(&rows, crate::vcs::VcsKind::Git);
    }

    #[cfg(feature = "git")]
    #[test]
    fn lay_out_lanes_node_col_matches_its_glyph_jj() {
        // A merge (H, structural) folding two branches (A=immutable, B=conflict) back into R,
        // with a working-copy tip on top: multiple lanes, a fork connector, a merge connector,
        // and all five NodeKinds in one DAG.
        let dc = |id: &str, parents: &[&str], kind: Option<NodeKind>| DagCommit {
            kind,
            id: id.into(),
            parents: parents.iter().map(|s| s.to_string()).collect(),
            short: id.into(),
            subject: id.into(),
            author: "a".into(),
            date: "d".into(),
            refs: String::new(),
        };
        let commits = vec![
            dc("W", &["H"], Some(NodeKind::WorkingCopy)),
            dc("H", &["A", "B"], None), // 2 parents => structural Merge
            dc("A", &["R"], Some(NodeKind::Immutable)),
            dc("B", &["R"], Some(NodeKind::Conflict)),
            dc("R", &[], None), // root => structural Normal
        ];
        let rows = lay_out_lanes(&commits, None, None, crate::vcs::VcsKind::Jj);
        assert_eq!(
            rows.iter().filter(|r| r.commit.is_some()).count(),
            5,
            "全コミットが行として残る"
        );
        assert_node_col_points_at_its_own_glyph(&rows, crate::vcs::VcsKind::Jj);
    }
}