bitp 1.0.7__py3-none-any.whl

bitbake_project/commands/explore.py

@@ -0,0 +1,2269 @@
+#
+# Copyright (C) 2025 Bruce Ashfield <bruce.ashfield@gmail.com>
+#
+# SPDX-License-Identifier: GPL-2.0-only
+#
+"""Explore command - interactively explore commits in layer repos."""
+
+import json
+import os
+import re
+import shutil
+import signal
+import socket
+import subprocess
+import sys
+import tempfile
+import threading
+import time
+import urllib.request
+from typing import Dict, List, Optional, Set, Tuple
+
+from ..core import (
+    Colors,
+    current_branch,
+    current_head,
+    fzf_available,
+    get_fzf_color_args,
+    get_fzf_preview_resize_bindings,
+    git_toplevel,
+    load_defaults,
+    repo_is_clean,
+    save_defaults,
+    terminal_color,
+)
+from .common import (
+    resolve_bblayers_path,
+    resolve_base_and_layers,
+    collect_repos,
+    dedupe_preserve_order,
+    repo_display_name,
+    layer_display_name,
+    discover_layers,
+    add_layer_to_bblayers,
+    remove_layer_from_bblayers,
+    build_layer_collection_map,
+    prompt_action,
+    run_cmd,
+    add_extra_repo,
+    add_hidden_repo,
+    remove_hidden_repo,
+    get_hidden_repos,
+    get_upstream_count_ls_remote,
+    find_repo_by_identifier,
+)
+from .update import fetch_repo, get_upstream_commits
+from .branch import (
+    fzf_branch_repos,
+    get_local_commits,
+    get_upstream_context_commits,
+    get_upstream_to_pull,
+    fzf_multiselect_commits,
+    fzf_select_insertion_point,
+    prompt_branch_name,
+)
+from .config import (
+    show_repo_status_detail,
+    fzf_repo_config,
+    fzf_build_config,
+)
+from .common import copy_to_clipboard, export_commits_from_explore
+from .projects import get_preferred_git_viewer, get_preview_window_arg
+
+def run_status(args) -> int:
+    defaults = load_defaults(args.defaults_file)
+    discover_all = getattr(args, 'all', False)
+    pairs, repo_sets = resolve_base_and_layers(args.bblayers, defaults, discover_all=discover_all)
+
+    repo_layers: Dict[str, List[str]] = {}
+    for layer, repo in pairs:
+        repo_layers.setdefault(repo, []).append(layer)
+
+    # Optionally fetch first
+    if args.fetch:
+        print("Fetching from origin...")
+        for repo in repo_layers.keys():
+            if defaults.get(repo, "rebase") != "skip":
+                fetch_repo(repo)
+
+    repo_cache: Dict[str, Tuple[str, bool, str, List[str]]] = {}
+
+    for repo, layers in repo_layers.items():
+        default_action = defaults.get(repo, "rebase")
+        layer_list = ", ".join(layers)
+        is_discovered = repo in repo_sets.discovered
+        discovered_marker = " (?)" if is_discovered else ""
+
+        # Format layers for multi-line display
+        def format_layers(layer_paths: List[str]) -> str:
+            if len(layer_paths) == 1:
+                return f"  layer: {layer_display_name(layer_paths[0])}"
+            lines = ["  layers:"]
+            for lp in layer_paths:
+                lines.append(f"    {layer_display_name(lp)}")
+            return "\n".join(lines)
+
+        if default_action == "skip":
+            if args.verbose == 0:
+                layer_names = ", ".join(layer_display_name(lp) for lp in layers)
+                print(f"→ {layer_names}{discovered_marker}: default=skip")
+            else:
+                print(f"→ {repo}: default=skip (skipping status)")
+                print(format_layers(layers))
+            continue
+
+        if repo not in repo_cache:
+            branch = current_branch(repo)
+            if not branch:
+                repo_cache[repo] = ("(detached)", False, "detached head", [], [])
+            else:
+                remote_ref = f"origin/{branch}"
+                remote_exists = (
+                    subprocess.run(
+                        ["git", "-C", repo, "rev-parse", "--verify", remote_ref],
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL,
+                    ).returncode
+                    == 0
+                )
+                show_all = args.verbose >= 2
+                desc, lines = get_repo_log(repo, branch, remote_exists, args.max_commits, show_all)
+                upstream = get_upstream_commits(repo, branch) if remote_exists else []
+                repo_cache[repo] = (branch, remote_exists, desc, lines, upstream)
+
+        branch, remote_exists, desc, lines, upstream = repo_cache[repo]
+        is_clean = repo_is_clean(repo)
+
+        # Format worktree status with color
+        if is_clean:
+            worktree_status = terminal_color("clean", "[clean]")
+            worktree_status_plain = "[clean]"
+        else:
+            worktree_status = terminal_color("dirty", "[DIRTY]")
+            worktree_status_plain = "[DIRTY]"
+
+        if branch == "(detached)":
+            if args.verbose == 0:
+                layer_names = ", ".join(layer_display_name(lp) for lp in layers)
+                print(f"→ {layer_names}{discovered_marker}: detached HEAD {worktree_status}")
+            else:
+                print(f"→ {repo}: detached HEAD or no branch {worktree_status}; skipping")
+                print(format_layers(layers))
+            continue
+
+        local_count = len(lines)
+        upstream_count = len(upstream)
+
+        if args.verbose == 0:
+            # Summary mode (default)
+            layer_names = ", ".join(layer_display_name(lp) for lp in layers)
+            status_parts = []
+            if local_count:
+                status_parts.append(f"{local_count} local commit(s)")
+            # Use ls-remote for upstream if not fetched (like repos status does)
+            if args.fetch:
+                if upstream_count:
+                    status_parts.append(terminal_color("upstream", f"{upstream_count} to pull"))
+            else:
+                ls_result = get_upstream_count_ls_remote(repo, branch)
+                if ls_result == -1:
+                    status_parts.append(terminal_color("upstream", "upstream has changes"))
+                elif ls_result and ls_result > 0:
+                    status_parts.append(terminal_color("upstream", f"{ls_result} to pull"))
+            if not status_parts:
+                status_parts.append("up-to-date")
+            print(f"→ {layer_names}{discovered_marker}: {', '.join(status_parts)} on {Colors.bold(branch)} {worktree_status}")
+            continue
+
+        # Build status line with colors
+        status_parts = []
+        if local_count:
+            status_parts.append(f"{local_count} local commit(s)")
+        if upstream_count:
+            status_parts.append(terminal_color("upstream", f"{upstream_count} upstream commit(s) to pull"))
+        if not status_parts:
+            status_parts.append("up-to-date")
+
+        # Color repo path green if clean
+        repo_display = Colors.green(repo) if is_clean else repo
+        branch_display = Colors.bold(branch)
+        print(f"→ {repo_display}: {', '.join(status_parts)} on {branch_display} {worktree_status}")
+        print(format_layers(layers))
+
+        # Show local commits
+        show_all = args.verbose >= 2
+        if lines:
+            print("  local:")
+            limit = len(lines) if show_all else args.max_commits
+            for line in lines[:limit]:
+                print(f"    {line}")
+            if remote_exists and not show_all and len(lines) > args.max_commits:
+                print(f"    ... ({len(lines) - args.max_commits} more)")
+
+        # Show upstream commits (yellow to indicate pending pulls)
+        if upstream:
+            print(f"  {terminal_color('upstream', 'upstream:')}")
+            limit = len(upstream) if show_all else args.max_commits
+            for line in upstream[:limit]:
+                print(f"    {Colors.yellow(line)}")
+            if not show_all and len(upstream) > args.max_commits:
+                print(f"    {terminal_color('upstream', f'... ({len(upstream) - args.max_commits} more)')}")
+
+    return 0
+
+
+
+def _build_layers_view_menu(
+    repos: List[str],
+    repo_info: Dict[str, Dict],
+    repo_layers: Dict[str, List[str]],
+    discovered_repos: Set[str],
+    external_repos: Set[str],
+    configured_layers: Set[str],
+) -> str:
+    """Build fzf menu showing individual layers grouped by repo."""
+    menu_lines = []
+
+    # Build list of all layers with their info
+    layer_entries = []
+    for repo in repos:
+        layers = repo_layers.get(repo, [])
+        is_discovered_repo = repo in discovered_repos
+        is_external = repo in external_repos
+
+        if not layers:
+            # External repo with no layers - show repo itself
+            if is_external:
+                layer_entries.append({
+                    "path": repo,
+                    "name": repo_display_name(repo),
+                    "repo": repo,
+                    "repo_name": repo_display_name(repo),
+                    "is_configured": False,
+                    "is_external": True,
+                    "branch": repo_info.get(repo, {}).get("branch", ""),
+                    "is_dirty": repo_info.get(repo, {}).get("is_dirty", False),
+                })
+            continue
+
+        for layer in layers:
+            layer_name = os.path.basename(layer)
+            is_configured = layer in configured_layers
+            layer_entries.append({
+                "path": layer,
+                "name": layer_name,
+                "repo": repo,
+                "repo_name": repo_display_name(repo),
+                "is_configured": is_configured,
+                "is_external": False,
+                "branch": repo_info.get(repo, {}).get("branch", ""),
+                "is_dirty": repo_info.get(repo, {}).get("is_dirty", False),
+            })
+
+    if not layer_entries:
+        return ""
+
+    # Calculate column widths
+    max_layer_len = max(len(e["name"]) for e in layer_entries)
+    max_layer_len = min(max_layer_len + 6, 40)  # +6 for markers, cap at 40
+    max_repo_len = max(len(e["repo_name"]) for e in layer_entries)
+    max_repo_len = min(max_repo_len, 25)
+    max_branch_len = max(len(e["branch"]) for e in layer_entries) if layer_entries else 15
+    max_branch_len = max(max_branch_len, 15)  # minimum 15 chars
+
+    # Build menu lines
+    for entry in layer_entries:
+        layer_path = entry["path"]
+        layer_name = entry["name"]
+        repo_name = entry["repo_name"]
+        is_configured = entry["is_configured"]
+        is_external = entry["is_external"]
+        branch = entry["branch"]
+        is_dirty = entry["is_dirty"]
+
+        # Markers
+        if is_external:
+            marker = " (ext)"
+        elif not is_configured:
+            marker = " (?)"
+        else:
+            marker = ""
+
+        display_name = f"{layer_name}{marker}"
+
+        # Status
+        if is_dirty:
+            status = terminal_color("dirty", "[DIRTY]")
+        else:
+            status = terminal_color("clean", "[clean]")
+
+        # Color based on status
+        if is_dirty:
+            colored_name = Colors.red(f"{display_name:<{max_layer_len}}")
+            colored_repo = Colors.red(f"{repo_name:<{max_repo_len}}")
+        elif is_external:
+            colored_name = terminal_color("repo_external", f"{display_name:<{max_layer_len}}")
+            colored_repo = terminal_color("repo_external", f"{repo_name:<{max_repo_len}}")
+        elif not is_configured:
+            colored_name = terminal_color("repo_discovered", f"{display_name:<{max_layer_len}}")
+            colored_repo = terminal_color("repo_discovered", f"{repo_name:<{max_repo_len}}")
+        else:
+            colored_name = terminal_color("repo", f"{display_name:<{max_layer_len}}")
+            colored_repo = terminal_color("repo", f"{repo_name:<{max_repo_len}}")
+
+        line = f"LAYER:{layer_path}\t{colored_name}  {colored_repo}  {branch:<{max_branch_len}} {status}"
+        menu_lines.append(line)
+
+    # Reverse so first layer appears at top
+    menu_lines = list(reversed(menu_lines))
+
+    # Column header and separator
+    header_line = f"HEADER\t{'Layer':<{max_layer_len}}  {'Repository':<{max_repo_len}}  {'Branch':<{max_branch_len}} Status"
+    sep_len = max_layer_len + 2 + max_repo_len + 2 + max_branch_len + 1 + 8
+    separator = f"SEPARATOR_HEADER\t{'─' * sep_len}"
+    menu_lines.append(separator)
+    menu_lines.append(header_line)
+
+    return "\n".join(menu_lines)
+
+
+
+def _build_explore_menu_lines(
+    repos: List[str],
+    repo_info: Dict[str, Dict],
+    repo_layers: Dict[str, List[str]],
+    verbose_mode: bool,
+    discovered_repos: Optional[Set[str]] = None,
+    external_repos: Optional[Set[str]] = None,
+    expanded_repos: Optional[Set[str]] = None,
+    layers_mode: bool = False,
+    configured_layers: Optional[Set[str]] = None,
+    bblayers_conf: Optional[str] = None,
+) -> str:
+    """Build fzf menu input for explore repo/layers list. Returns newline-joined string."""
+    menu_lines = []
+    discovered_repos = discovered_repos or set()
+    external_repos = external_repos or set()
+    expanded_repos = expanded_repos or set()
+    configured_layers = configured_layers or set()
+
+    # Layers mode: show individual layers instead of repos
+    if layers_mode:
+        return _build_layers_view_menu(
+            repos, repo_info, repo_layers, discovered_repos,
+            external_repos, configured_layers
+        )
+
+    def get_marker_len(repo: str) -> int:
+        """Get marker length: 4 for '(?)', 6 for '(ext)', 0 otherwise."""
+        if repo in external_repos:
+            return 6  # " (ext)"
+        if repo in discovered_repos:
+            return 4  # " (?)"
+        return 0
+
+    # In verbose mode, show layer names; otherwise show display name
+    # Account for markers on discovered/external repos
+    if verbose_mode:
+        max_name_len = 0
+        for repo in repos:
+            layers = repo_layers.get(repo, [])
+            layer_names = ", ".join(layer_display_name(lp) for lp in layers) if layers else repo_info[repo]["display_name"]
+            name_len = len(layer_names) + get_marker_len(repo)
+            if name_len > max_name_len:
+                max_name_len = name_len
+        max_name_len = min(max_name_len, 56)  # 50 + 6 for marker
+    else:
+        max_name_len = max(
+            len(repo_info[r]["display_name"]) + get_marker_len(r)
+            for r in repos
+        ) if repos else 20
+
+    # Calculate max length of info column for alignment
+    max_info_len = 0
+    for repo in repos:
+        info = repo_info[repo]
+        local_count = info["local_count"]
+        branch = info["branch"]
+        upstream_count = info.get("upstream_count", 0)
+
+        count_str = f"{local_count} local"
+        if upstream_count == -1:
+            upstream_str = ", ↓ upstream"
+        elif upstream_count > 0:
+            upstream_str = f", ↓ {upstream_count}"
+        else:
+            upstream_str = ""
+        info_str = f"{count_str}{upstream_str}, {branch}"
+        if len(info_str) > max_info_len:
+            max_info_len = len(info_str)
+
+    for repo in repos:
+        info = repo_info[repo]
+        local_count = info["local_count"]
+        branch = info["branch"]
+        is_dirty = info["is_dirty"]
+        upstream_count = info.get("upstream_count", 0)
+
+        if verbose_mode:
+            layers = repo_layers.get(repo, [])
+            name = ", ".join(layer_display_name(lp) for lp in layers) if layers else info["display_name"]
+            if len(name) > 50:
+                name = name[:47] + "..."
+        else:
+            name = info["display_name"]
+
+        # Add marker for discovered/external repos
+        is_discovered = repo in discovered_repos
+        is_external = repo in external_repos
+        if is_external:
+            name = f"{name} (ext)"
+        elif is_discovered:
+            name = f"{name} (?)"
+
+        # Add + prefix for repos with multiple layers (expandable)
+        num_layers = len(repo_layers.get(repo, []))
+        expand_marker = "+ " if num_layers > 1 else "  "
+
+        if is_dirty:
+            status = terminal_color("dirty", "[DIRTY]")
+            colored_name = Colors.red(f"{name:<{max_name_len}}")
+        elif is_external:
+            status = terminal_color("clean", "[clean]")
+            colored_name = terminal_color("repo_external", f"{name:<{max_name_len}}")
+        elif is_discovered:
+            status = terminal_color("clean", "[clean]")
+            colored_name = terminal_color("repo_discovered", f"{name:<{max_name_len}}")
+        else:
+            status = terminal_color("clean", "[clean]")
+            colored_name = terminal_color("repo", f"{name:<{max_name_len}}")
+
+        count_str = f"{local_count} local"
+
+        if upstream_count == -1:
+            upstream_str_plain = ", ↓ upstream"
+            upstream_str = terminal_color("upstream", upstream_str_plain)
+        elif upstream_count > 0:
+            upstream_str_plain = f", ↓ {upstream_count}"
+            upstream_str = terminal_color("upstream", upstream_str_plain)
+        else:
+            upstream_str_plain = ""
+            upstream_str = ""
+
+        info_str_plain = f"{count_str}{upstream_str_plain}, {branch}"
+        padding = max_info_len - len(info_str_plain)
+        info_str = f"{count_str}{upstream_str}, {branch}{' ' * padding}"
+
+        line = f"{repo}\t{expand_marker}{colored_name}  {info_str} {status}"
+        menu_lines.append(line)
+
+        # Add layer lines if repo is expanded
+        if repo in expanded_repos:
+            layers = repo_layers.get(repo, [])
+            # Filter out layer that matches the repo display name (redundant)
+            display = repo_display_name(repo)
+            layers = [l for l in layers if os.path.basename(l) != display]
+            for i, layer in enumerate(layers):
+                layer_name = os.path.basename(layer)
+                is_last = (i == len(layers) - 1)
+                prefix = "  └─ " if is_last else "  ├─ "
+                # Color based on whether layer is in bblayers.conf
+                if layer in configured_layers:
+                    layer_display = f"{prefix}{terminal_color('repo', layer_name)}"
+                else:
+                    layer_display = f"{prefix}{terminal_color('repo_discovered', layer_name)} {Colors.dim('(?)')}"
+                # Use LAYER: prefix to identify layer entries
+                layer_line = f"LAYER:{layer}\t{layer_display}"
+                menu_lines.append(layer_line)
+
+    # Add project entry if bblayers.conf is known (with separator)
+    if bblayers_conf:
+        conf_dir = os.path.dirname(bblayers_conf)
+        # Add separator before project (unique ID to distinguish from header separator)
+        menu_lines.append(f"SEPARATOR_PROJECT\t")  # Empty separator line
+        # Pad plain text, then apply color
+        project_name = f"{'project':<{max_name_len}}"
+        project_line = f"PROJECT\t  {Colors.cyan(project_name)}  {'config':<{max_info_len}} {conf_dir}"
+        menu_lines.append(project_line)
+
+    # Reverse so first repo appears at top
+    menu_lines = list(reversed(menu_lines))
+
+    # Column header and separator (unique ID to distinguish from project separator)
+    header_line = f"HEADER\t{'Name':<{max_name_len}}  {'Commits, Branch':<{max_info_len}} Status"
+    sep_len = max_name_len + 2 + max_info_len + 1 + 8
+    separator = f"SEPARATOR_HEADER\t{'─' * sep_len}"
+    menu_lines.append(separator)
+    menu_lines.append(header_line)
+
+    return "\n".join(menu_lines)
+
+
+
+def _find_free_port() -> int:
+    """Find a free port for fzf --listen."""
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.bind(('127.0.0.1', 0))
+        return s.getsockname()[1]
+
+
+
+def _background_upstream_check(
+    repos: List[str],
+    repo_info: Dict[str, Dict],
+    repo_layers: Dict[str, List[str]],
+    verbose_mode: bool,
+    defaults: Dict[str, str],
+    temp_file: str,
+    fzf_port: int,
+    stop_event: threading.Event,
+    discovered_repos: Optional[Set[str]] = None,
+    external_repos: Optional[Set[str]] = None,
+    expanded_repos: Optional[Set[str]] = None,
+    bblayers_conf: Optional[str] = None,
+) -> None:
+    """Background thread: check upstream status via ls-remote and reload fzf."""
+    any_updates = False
+    for repo in repos:
+        if stop_event.is_set():
+            return
+        info = repo_info[repo]
+        branch = info["branch"]
+        if branch == "(detached)" or defaults.get(repo, "rebase") == "skip":
+            continue
+        if info.get("upstream_count", 0) != 0:
+            # Already have upstream info
+            continue
+        try:
+            ls_result = get_upstream_count_ls_remote(repo, branch)
+            if ls_result == -1:
+                repo_info[repo]["upstream_count"] = -1
+                any_updates = True
+            elif ls_result and ls_result > 0:
+                repo_info[repo]["upstream_count"] = ls_result
+                any_updates = True
+        except Exception:
+            pass
+
+    if stop_event.is_set():
+        return
+
+    if any_updates:
+        # Rebuild menu and write to temp file
+        menu_input = _build_explore_menu_lines(repos, repo_info, repo_layers, verbose_mode, discovered_repos, external_repos, expanded_repos, bblayers_conf=bblayers_conf)
+        try:
+            with open(temp_file, 'w') as f:
+                f.write(menu_input)
+            # Tell fzf to reload
+            req = urllib.request.Request(
+                f"http://127.0.0.1:{fzf_port}",
+                data=f"reload(cat {temp_file})".encode(),
+                method='POST',
+            )
+            urllib.request.urlopen(req, timeout=2)
+        except Exception:
+            pass  # fzf may have exited
+
+
+
+def fzf_explore_repo_list(
+    repos: List[str],
+    repo_info: Dict[str, Dict],
+    repo_layers: Dict[str, List[str]] = None,
+    verbose_mode: bool = False,
+    defaults: Dict[str, str] = None,
+    enable_background_refresh: bool = False,
+    discovered_repos: Optional[Set[str]] = None,
+    external_repos: Optional[Set[str]] = None,
+    expanded_repos: Optional[Set[str]] = None,
+    layers_mode: bool = False,
+    configured_layers: Optional[Set[str]] = None,
+    initial_selection: Optional[str] = None,
+    bblayers_conf: Optional[str] = None,
+) -> Tuple[str, Optional[str]]:
+    """
+    Show repo/layer list with local commit counts for selection.
+    Returns: (action, repo_path)
+      action: "explore", "rebase", "merge", "refresh", "refresh_all", "verbose", "status", "quit", "layers_toggle", "interrupt", or "cancelled"
+      repo_path: selected repo/layer path (None for quit/cancelled/refresh_all/verbose/layers_toggle/interrupt)
+    """
+    if not repos:
+        return "cancelled", None
+
+    repo_layers = repo_layers or {}
+    defaults = defaults or {}
+    discovered_repos = discovered_repos or set()
+    external_repos = external_repos or set()
+    expanded_repos = expanded_repos or set()
+    configured_layers = configured_layers or set()
+
+    # Don't reorder - we'll jump to the selected repo's position instead
+    display_repos = repos
+
+    # Build menu input using helper
+    menu_input = _build_explore_menu_lines(
+        display_repos, repo_info, repo_layers, verbose_mode,
+        discovered_repos, external_repos, expanded_repos,
+        layers_mode, configured_layers, bblayers_conf
+    )
+
+    if layers_mode:
+        header = "LAYERS VIEW | Enter=explore | a=add | d=remove | L=repos view | A=discover | q=quit\n+=track | -=hide | H=show hidden"
+    else:
+        header = "REPOS VIEW | Enter=explore | q=quit | L=layers view\nUpdate: u=single | U=all | m=merge | r=refresh | R=refresh all | B=branch all\nView: v=verbose | \\=expand | s=status | t=history\nManage: a/d=add/remove | +/-=track/hide | c=config | A=discover"
+
+    # Setup for background refresh if enabled
+    temp_file = None
+    bg_thread = None
+    stop_event = None
+    fzf_port = None
+
+    if enable_background_refresh:
+        # Write initial menu to temp file (for reload command)
+        fd, temp_file = tempfile.mkstemp(prefix="bitbake-explore-", suffix=".txt")
+        try:
+            with os.fdopen(fd, 'w') as f:
+                f.write(menu_input)
+        except Exception:
+            os.close(fd)
+            temp_file = None
+
+        if temp_file:
+            fzf_port = _find_free_port()
+            stop_event = threading.Event()
+            bg_thread = threading.Thread(
+                target=_background_upstream_check,
+                args=(repos, repo_info, repo_layers, verbose_mode, defaults, temp_file, fzf_port, stop_event, discovered_repos, external_repos, expanded_repos, bblayers_conf),
+                daemon=True,
+            )
+            bg_thread.start()
+
+    try:
+        fzf_cmd = [
+            "fzf",
+            "--no-multi",
+            "--no-sort",
+            "--no-info",
+            "--ansi",
+            "--header", header,
+            "--prompt", "Select repo: ",
+            "--with-nth", "2..",  # Display from field 2 onwards (hide repo path/HEADER)
+            "--delimiter", "\t",
+            "--bind", "right:accept",
+            "--bind", "q:become(echo QUIT)",
+            "--bind", "u:become(echo REBASE {1})",
+            "--bind", "m:become(echo MERGE {1})",
+            "--bind", "r:become(echo REFRESH {1})",
+            "--bind", "R:become(echo REFRESH_ALL)",
+            "--bind", "v:become(echo VERBOSE)",
+            "--bind", "s:become(echo STATUS {1})",
+            "--bind", "t:become(echo TIG {1})",
+            "--bind", "+:become(echo ADD_TRACKED {1})",
+            "--bind", "-:become(echo HIDE {1})",
+            "--bind", "H:become(echo TOGGLE_HIDDEN)",
+            "--bind", "a:become(echo ADD_LAYER {1})",
+            "--bind", "d:become(echo REMOVE_LAYER {1})",
+            "--bind", "\\:become(echo EXPAND {1})",
+            "--bind", "L:become(echo LAYERS_TOGGLE)",
+            "--bind", "c:become(echo CONFIG {1})",
+            "--bind", "A:become(echo DISCOVER_TOGGLE)",
+            "--bind", "U:become(echo UPDATE_ALL)",
+            "--bind", "B:become(echo BRANCH_ALL)",
+        ] + get_fzf_color_args()
+
+        # Add --listen for background refresh support
+        if fzf_port:
+            fzf_cmd.extend(["--listen", str(fzf_port)])
+
+        # Jump to selected repo's position (calculate line number from menu)
+        if initial_selection:
+            # Find line number of selected repo in menu (it's in field 1, tab-separated)
+            lines = menu_input.split('\n')
+            target_line = None
+            search_for = initial_selection
+            # If selection was a LAYER: entry that may no longer exist (collapsed),
+            # fall back to finding the parent repo
+            parent_repo = None
+            if initial_selection.startswith("LAYER:"):
+                layer_path = initial_selection[6:]
+                # Find parent repo by checking which repo contains this layer
+                for repo in repo_layers:
+                    if layer_path in repo_layers.get(repo, []):
+                        parent_repo = repo
+                        break
+            for i, line in enumerate(lines):
+                if line.startswith(search_for + '\t'):
+                    target_line = i + 1  # 1-indexed for fzf pos()
+                    break
+            # If LAYER: entry not found, try parent repo
+            if target_line is None and parent_repo:
+                for i, line in enumerate(lines):
+                    if line.startswith(parent_repo + '\t'):
+                        target_line = i + 1  # 1-indexed
+                        break
+            if target_line:
+                fzf_cmd.extend(["--bind", f"load:pos({target_line})"])
+
+        result = subprocess.run(
+            fzf_cmd,
+            input=menu_input,
+            stdout=subprocess.PIPE,
+            text=True,
+        )
+    except FileNotFoundError:
+        print("fzf not found. Please install fzf for the explore command.")
+        return "cancelled", None
+    finally:
+        # Cleanup background refresh resources
+        if stop_event:
+            stop_event.set()
+        if temp_file:
+            try:
+                os.unlink(temp_file)
+            except Exception:
+                pass
+
+    if result.returncode == 130:
+        # Ctrl+C pressed - return special action for double-tap detection
+        return "interrupt", None
+    if result.returncode != 0 or not result.stdout.strip():
+        return "cancelled", None
+
+    output = result.stdout.strip()
+
+    if output == "QUIT":
+        return "quit", None
+    elif output == "REFRESH_ALL":
+        return "refresh_all", None
+    elif output.startswith("REFRESH "):
+        repo_path = output[8:].strip()
+        if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+            return "cancelled", None
+        return "refresh", repo_path
+    elif output == "VERBOSE":
+        return "verbose", None
+    elif output.startswith("REBASE "):
+        repo_path = output[7:].strip()
+        if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+            return "cancelled", None
+        return "rebase", repo_path
+    elif output.startswith("MERGE "):
+        repo_path = output[6:].strip()
+        if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+            return "cancelled", None
+        return "merge", repo_path
+    elif output.startswith("STATUS "):
+        repo_path = output[7:].strip()
+        if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+            return "cancelled", None
+        return "status", repo_path
+    elif output.startswith("TIG "):
+        repo_path = output[4:].strip()
+        if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+            return "cancelled", None
+        return "tig", repo_path
+    elif output.startswith("ADD_TRACKED "):
+        repo_path = output[12:].strip()
+        if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+            return "cancelled", None
+        # Handle LAYER: prefix for layers view
+        if repo_path.startswith("LAYER:"):
+            layer_path = repo_path[6:]
+            # Find the git repo for this layer
+            try:
+                repo_path = subprocess.check_output(
+                    ["git", "-C", layer_path, "rev-parse", "--show-toplevel"],
+                    text=True, stderr=subprocess.DEVNULL
+                ).strip()
+            except subprocess.CalledProcessError:
+                repo_path = layer_path  # Fallback to layer path
+        return "add_tracked", repo_path
+    elif output.startswith("HIDE "):
+        repo_path = output[5:].strip()
+        if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+            return "cancelled", None
+        return "hide", repo_path
+    elif output == "TOGGLE_HIDDEN":
+        return "toggle_hidden", None
+    elif output.startswith("ADD_LAYER "):
+        repo_path = output[10:].strip()
+        if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+            return "cancelled", None
+        # Handle LAYER: prefix for expanded layer entries
+        if repo_path.startswith("LAYER:"):
+            return "add_layer", repo_path[6:]  # Strip LAYER: prefix
+        return "add_layer", repo_path
+    elif output.startswith("REMOVE_LAYER "):
+        repo_path = output[13:].strip()
+        if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+            return "cancelled", None
+        # Handle LAYER: prefix for expanded layer entries
+        if repo_path.startswith("LAYER:"):
+            return "remove_layer", repo_path[6:]  # Strip LAYER: prefix
+        return "remove_layer", repo_path
+    elif output.startswith("EXPAND "):
+        repo_path = output[7:].strip()
+        if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+            return "expand_all", repo_path  # Expand/collapse all, preserve selection
+        # Handle LAYER: prefix - expand parent repo instead
+        if repo_path.startswith("LAYER:"):
+            return "expand_all", repo_path  # On a layer, expand/collapse all, preserve selection
+        return "expand", repo_path
+    elif output == "LAYERS_TOGGLE":
+        return "layers_toggle", None
+    elif output == "DISCOVER_TOGGLE":
+        return "discover_toggle", None
+    elif output == "UPDATE_ALL":
+        return "update_all", None
+    elif output == "BRANCH_ALL":
+        return "branch_all", None
+    elif output.startswith("CONFIG "):
+        repo_path = output[7:].strip()  # After "CONFIG "
+        if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+            return "cancelled", None
+        return "config", repo_path
+
+    # Default: explore (Enter or right arrow)
+    # Extract repo path (first field before tab), ignore header/separator lines
+    parts = output.split("\t", 1)
+    repo_path = parts[0] if parts else None
+    if repo_path == "HEADER" or repo_path.startswith("SEPARATOR"):
+        return "cancelled", None
+    # PROJECT entry: go to config instead of explore
+    if repo_path == "PROJECT":
+        return "config", "PROJECT"
+    # Handle LAYER: prefix from layers view - strip it to get layer path
+    if repo_path and repo_path.startswith("LAYER:"):
+        repo_path = repo_path[6:]
+    return "explore", repo_path
+
+
+
+def fzf_explore_commits(
+    repo: str,
+    branch: str,
+    local_commits: List[Tuple[str, str]],
+    upstream_context: List[Tuple[str, str]],
+    upstream_to_pull: List[Tuple[str, str]],
+    base_ref: str,
+) -> Tuple[str, List[str]]:
+    """
+    Browse commits with preview pane and optional range selection for export.
+    Returns: (action, commit_hashes)
+      action: "back", "quit", "copy", "export"
+      commit_hashes: list of commit hashes (for export may be multiple)
+    """
+    display_name = repo_display_name(repo)
+    local_count = len(local_commits)
+    # Get actual upstream count (not limited by display cap)
+    try:
+        out = subprocess.check_output(
+            ["git", "-C", repo, "rev-list", "--count", f"HEAD..origin/{branch}"],
+            text=True,
+            stderr=subprocess.DEVNULL,
+        )
+        upstream_count = int(out.strip())
+    except (subprocess.CalledProcessError, ValueError):
+        upstream_count = len(upstream_to_pull)  # Fallback to displayed count
+
+    # Build hash list for range filling and export (local + upstream)
+    all_hashes = [h for h, _ in local_commits]
+    all_upstream_hashes = [h for h, _ in upstream_to_pull] + [h for h, _ in upstream_context]
+
+    # Build display: local commits + separator + upstream to pull + context
+    # (reversed order because fzf shows last input at top)
+    menu_lines = []
+
+    # Upstream context commits (will appear at very bottom)
+    if upstream_context:
+        for hash_val, subject in reversed(upstream_context):
+            menu_lines.append(f"{hash_val[:12]}\t   {Colors.yellow(hash_val[:12])} {subject[:70]}")
+
+    # Separator with base_ref (merge base between local and upstream)
+    separator = f"──────────── {base_ref} ────────────"
+    menu_lines.append(f"---\t{separator}")
+
+    # Upstream commits to pull section
+    if upstream_to_pull:
+        for hash_val, subject in reversed(upstream_to_pull):
+            menu_lines.append(f"{hash_val[:12]}\t   {Colors.cyan(hash_val[:12])} {subject[:70]}")
+        menu_lines.append(f"---\t{'─' * 50}")
+        upstream_header = f"UPSTREAM ({upstream_count} to pull from origin/{branch})"
+        menu_lines.append(f"---\t{Colors.cyan(upstream_header)}")
+        menu_lines.append(f"---\t{'─' * 50}")
+
+    # Local commits header
+    local_header = f"LOCAL ({local_count} ahead of origin/{branch})"
+    menu_lines.append(f"---\t{Colors.bold(local_header)}")
+    menu_lines.append(f"---\t{'─' * 50}")
+
+    # Local commits (oldest first in input, so newest appears at top after fzf reversal)
+    for hash_val, subject in local_commits:
+        menu_lines.append(f"{hash_val[:12]}\t   {hash_val[:12]} {subject[:70]}")
+
+    menu_input = "\n".join(menu_lines)
+
+    # Temp files for state
+    diff_file = f"/tmp/fzf_explore_diff_{os.getpid()}"
+    range_file = f"/tmp/fzf_explore_range_{os.getpid()}"
+
+    # Preview command - check for diff mode toggle
+    preview_cmd = (
+        f'hash={{1}}; '
+        f'if [ "$hash" = "---" ]; then echo "Header line"; exit 0; fi; '
+        f'if [ -f {diff_file} ]; then '
+        f'git -C {repo} show --color=always $hash 2>/dev/null || echo "No commit selected"; '
+        f'else '
+        f'git -C {repo} show --stat --color=always $hash 2>/dev/null || echo "No commit selected"; '
+        f'fi'
+    )
+
+    # Dynamic prompt showing selection count
+    prompt_script = (
+        f'sel=0; rng=0; '
+        f'[ -f {range_file} ] && rng=$(wc -l < {range_file}); '
+        f'if [ $rng -gt 0 ]; then echo "Browse [range:$rng]: "; else echo "Browse: "; fi'
+    )
+
+    header = f"{Colors.bold(display_name)} ({local_count} local"
+    if upstream_count > 0:
+        header += f", {Colors.cyan(f'{upstream_count} to pull')}"
+    header += f") on {Colors.bold(branch)}\n"
+    header += "Tab=mark | Space=range | ?=preview | d=diff | c=copy | e=export | t=history | ←/b=back | q=quit"
+
+    try:
+        result = subprocess.run(
+            [
+                "fzf",
+                "--multi",
+                "--no-sort",
+                "--ansi",
+                "--height", "100%",
+                "--header", header,
+                "--prompt", "Browse: ",
+                "--with-nth", "2..",  # Display from field 2 onwards (hide hash field)
+                "--delimiter", "\t",
+                "--preview", preview_cmd,
+                "--preview-window", get_preview_window_arg("50%"),
+                "--bind", "?:toggle-preview",
+                "--bind", f"d:execute-silent(if [ -f {diff_file} ]; then rm {diff_file}; else touch {diff_file}; fi)+refresh-preview",
+                "--bind", "ctrl-d:preview-half-page-down",
+                "--bind", "ctrl-u:preview-half-page-up",
+                "--bind", "page-down:preview-page-down",
+                "--bind", "page-up:preview-page-up",
+                "--bind", "tab:toggle",
+                "--bind", f"space:toggle+execute-silent(echo {{1}} >> {range_file})+transform-prompt({prompt_script})",
+                "--bind", "esc:become(echo BACK)",
+                "--bind", "b:become(echo BACK)",
+                "--bind", "left:become(echo BACK)",
+                "--bind", "q:become(echo QUIT)",
+                "--bind", "c:become(echo COPY {1})",
+                "--bind", "e:become(echo EXPORT {+1})",  # {+1} = selected or current if none
+                "--bind", "t:become(echo TIG {1})",
+            ] + get_fzf_preview_resize_bindings() + get_fzf_color_args(),
+            input=menu_input,
+            stdout=subprocess.PIPE,
+            text=True,
+        )
+    except FileNotFoundError:
+        return "back", []
+
+    # Read range markers before cleanup
+    range_markers = []
+    if os.path.exists(range_file):
+        with open(range_file) as f:
+            range_markers = [line.strip() for line in f if line.strip() and line.strip() != "---"]
+
+    # Clean up temp files
+    for f in [diff_file, range_file]:
+        if os.path.exists(f):
+            os.remove(f)
+
+    if result.returncode != 0 or not result.stdout.strip():
+        return "back", []
+
+    output = result.stdout.strip()
+
+    if output == "BACK":
+        return "back", []
+    elif output == "QUIT":
+        return "quit", []
+    elif output.startswith("COPY "):
+        commit = output[5:].strip()
+        return "copy", [commit] if commit and commit != "---" else []
+    elif output.startswith("EXPORT "):
+        # May have multiple hashes separated by space
+        hashes_str = output[7:].strip()
+        hashes = [h for h in hashes_str.split() if h and h != "---"]
+
+        # If we have range markers, fill in the range
+        if len(range_markers) >= 2:
+            first_marker = range_markers[0]
+            last_marker = range_markers[-1]
+            try:
+                idx1 = next(i for i, h in enumerate(all_hashes) if h.startswith(first_marker))
+                idx2 = next(i for i, h in enumerate(all_hashes) if h.startswith(last_marker))
+                start_idx, end_idx = min(idx1, idx2), max(idx1, idx2)
+                range_hashes = all_hashes[start_idx:end_idx + 1]
+                # Merge with individually selected
+                all_selected = set(hashes) | set(range_hashes)
+                # Return in original order (oldest first)
+                hashes = [h for h in all_hashes if h in all_selected or any(h.startswith(sel) for sel in all_selected)]
+            except StopIteration:
+                pass
+
+        # Filter to full hashes (check local and upstream)
+        full_hashes = []
+        combined_hashes = all_hashes + all_upstream_hashes
+        for h in hashes:
+            found = False
+            for full_h in combined_hashes:
+                if full_h.startswith(h):
+                    if full_h not in full_hashes:
+                        full_hashes.append(full_h)
+                    found = True
+                    break
+            # If not found in our lists, it might be a full hash already
+            if not found and len(h) >= 7:
+                full_hashes.append(h)
+
+        return "export", full_hashes
+    elif output.startswith("TIG "):
+        commit = output[4:].strip()
+        if commit and commit != "---":
+            return "tig", [commit]
+        return "tig", []
+
+    return "back", []
+
+
+
+def text_select_insertion_point(
+    repo: str,
+    branch: str,
+    base_ref: str,
+    remaining_commits: List[Tuple[str, str]],
+) -> Optional[str]:
+    """Text-based insertion point selection."""
+    display_name = repo_display_name(repo)
+
+    # Get upstream commits for context
+    upstream_commits = get_upstream_context_commits(repo, base_ref)
+
+    print(f"\nSelect insertion point for {Colors.bold(display_name)}:")
+    print("(upstream commits will be placed AFTER the selected point)")
+    print()
+
+    # Local commits newest first (reversed), with index numbers
+    if remaining_commits:
+        for idx, (hash_val, subject) in enumerate(reversed(remaining_commits), 1):
+            print(f"  {idx}. {hash_val[:12]} {subject[:60]}")
+
+    # Separator and default
+    print("  ────────────────────────────────────────")
+    print(f"  0. {base_ref} (default - insert here)")
+
+    # Upstream context
+    if upstream_commits:
+        for hash_val, subject in upstream_commits:
+            print(f"     {hash_val[:12]} {subject[:60]}")
+
+    print()
+
+    try:
+        choice = input("Selection [0]: ").strip()
+    except EOFError:
+        return None
+
+    if not choice or choice == "0":
+        return base_ref
+
+    try:
+        idx = int(choice)
+        if 1 <= idx <= len(remaining_commits):
+            # Convert from display order (newest first) to storage order (oldest first)
+            real_idx = len(remaining_commits) - idx
+            return remaining_commits[real_idx][0]
+    except ValueError:
+        pass
+
+    return base_ref  # Default on invalid input
+
+
+
+def text_multiselect_commits(
+    repo: str,
+    branch: str,
+    commits: List[Tuple[str, str]]
+) -> Optional[Tuple[List[str], str]]:
+    """Text-based commit selection fallback."""
+    if not commits:
+        return ([], "skip")
+
+    display_name = repo_display_name(repo)
+    print(f"\n{Colors.bold(display_name)} on {Colors.bold(branch)}")
+    print(f"Local commits ({len(commits)}):")
+
+    # Display newest-first with indices (user sees 1=newest)
+    for idx, (hash_val, subject) in enumerate(reversed(commits), 1):
+        print(f"  {idx:3}. {hash_val[:12]} {subject[:60]}")
+
+    print()
+    print("Enter commit numbers for UPSTREAM (comma-separated, e.g., 1,3,5)")
+    print("  'a' = all, 's' = skip repo, 'S' = skip remaining repos, 'q' = quit")
+
+    try:
+        choice = input("Selection: ").strip()
+    except EOFError:
+        return None
+
+    if not choice or choice.lower() == 's':
+        return ([], "skip")
+    if choice == 'S':
+        return ([], "skip_rest")
+    if choice.lower() == 'q':
+        return None
+    if choice.lower() == 'a':
+        return ([h for h, _ in commits], "selected")
+
+    # Parse indices
+    try:
+        indices = [int(x.strip()) for x in choice.split(',') if x.strip()]
+        # Convert to 0-based, accounting for reversed display
+        n = len(commits)
+        selected_hashes = []
+        for idx in indices:
+            if 1 <= idx <= n:
+                # idx 1 = newest = commits[n-1], idx n = oldest = commits[0]
+                real_idx = n - idx
+                selected_hashes.append(commits[real_idx][0])
+        # Return in original order (oldest first)
+        selected_ordered = [h for h, _ in commits if h in selected_hashes]
+        return (selected_ordered, "selected")
+    except ValueError:
+        print("Invalid input, skipping repo.")
+        return ([], "skip")
+
+
+
+def reorder_commits_via_cherrypick(
+    repo: str,
+    branch: str,
+    base_ref: str,
+    selected_commits: List[str],
+    remaining_commits: List[str],
+    commits_info: List[Tuple[str, str]],  # (hash, subject) for display
+    insertion_point: str = None,  # Where to insert selected commits (default: base_ref)
+    backup_branch: Optional[str] = None,
+    dry_run: bool = False
+) -> Tuple[bool, str, Optional[str]]:
+    """
+    Reorder commits using cherry-pick approach.
+    If insertion_point is base_ref: base_ref -> selected -> remaining
+    If insertion_point is a commit: commits up to insertion_point -> selected -> rest
+    Returns (success, message, cut_point_hash).
+    cut_point_hash is the commit hash at the end of selected commits (for PR branch creation).
+    """
+    display_name = repo_display_name(repo)
+
+    if insertion_point is None:
+        insertion_point = base_ref
+
+    # Build lookup for commit subjects
+    subject_map = {h: s for h, s in commits_info}
+
+    # Determine final commit order
+    if insertion_point == base_ref:
+        all_commits = selected_commits + remaining_commits
+        insert_desc = base_ref
+        cut_point_idx = len(selected_commits)
+    else:
+        # Find where to split remaining_commits
+        insertion_idx = None
+        for i, h in enumerate(remaining_commits):
+            if h == insertion_point:
+                insertion_idx = i
+                break
+        if insertion_idx is not None:
+            before = remaining_commits[:insertion_idx + 1]
+            after = remaining_commits[insertion_idx + 1:]
+            all_commits = before + selected_commits + after
+            insert_desc = f"after {insertion_point[:12]}"
+            cut_point_idx = len(before) + len(selected_commits)
+        else:
+            all_commits = selected_commits + remaining_commits
+            insert_desc = base_ref
+            cut_point_idx = len(selected_commits)
+
+    # Get current commit order from base_ref to HEAD
+    try:
+        current_commits = subprocess.check_output(
+            ["git", "-C", repo, "rev-list", "--reverse", f"{base_ref}..HEAD"],
+            text=True,
+        ).strip().splitlines()
+    except subprocess.CalledProcessError:
+        current_commits = []
+
+    # Check if commits are already in the correct order
+    if current_commits == all_commits:
+        # Already in correct order - compute cut point and return
+        if cut_point_idx > 0 and cut_point_idx <= len(current_commits):
+            cut_point = current_commits[cut_point_idx - 1]
+        else:
+            cut_point = None
+        msg = f"Already in order: {len(selected_commits)} upstream + {len(remaining_commits)} local"
+        return True, msg, cut_point
+
+    # Dry run mode - show what would happen
+    if dry_run:
+        # Get upstream commits for context
+        upstream_context = get_upstream_context_commits(repo, base_ref, count=3)
+
+        print(f"\n  Selected for upstream ({len(selected_commits)}):")
+        # Show selected commits newest-first
+        for h in reversed(selected_commits):
+            print(f"    {h[:12]} {subject_map.get(h, '')[:60]}")
+
+        print(f"  ────────────────────────────────────────")
+        print(f"  {base_ref}")
+
+        # Show upstream context
+        if upstream_context:
+            for h, subj in upstream_context:
+                print(f"    {h[:12]} {subj[:60]}")
+
+        msg = f"Would reorder {len(selected_commits)} upstream + {len(remaining_commits)} local"
+        return True, msg, None  # No cut point in dry run
+
+    # Record original HEAD for recovery
+    try:
+        original_head = subprocess.check_output(
+            ["git", "-C", repo, "rev-parse", "HEAD"],
+            text=True,
+        ).strip()
+    except subprocess.CalledProcessError:
+        return False, "Failed to get current HEAD", None
+
+    # Create backup branch if requested
+    if backup_branch:
+        result = subprocess.run(
+            ["git", "-C", repo, "branch", backup_branch, "HEAD"],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+        if result.returncode != 0:
+            return False, f"Failed to create backup branch '{backup_branch}'", None
+        print(f"  Created backup: {backup_branch}")
+
+    # Create temp branch at base_ref
+    temp_branch = f"_prepare-export-temp-{uuid.uuid4().hex[:8]}"
+
+    try:
+        # Create and checkout temp branch at base_ref
+        subprocess.run(
+            ["git", "-C", repo, "checkout", "-b", temp_branch, base_ref],
+            check=True,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+    except subprocess.CalledProcessError:
+        return False, f"Failed to create temp branch at {base_ref}", None
+
+    # Cherry-pick all commits in the computed order
+    # (cut_point_idx already computed above)
+    cherry_pick_failed = False
+    failed_commit = None
+    cut_point = None
+
+    for i, commit in enumerate(all_commits):
+        result = subprocess.run(
+            ["git", "-C", repo, "cherry-pick", commit],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+        if result.returncode != 0:
+            cherry_pick_failed = True
+            failed_commit = commit[:12]
+            break
+
+        # Capture cut point (HEAD after last selected commit)
+        if i + 1 == cut_point_idx:
+            cut_point = subprocess.check_output(
+                ["git", "-C", repo, "rev-parse", "HEAD"],
+                text=True,
+            ).strip()
+
+    if cherry_pick_failed:
+        # Abort cherry-pick and restore
+        subprocess.run(
+            ["git", "-C", repo, "cherry-pick", "--abort"],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+        subprocess.run(
+            ["git", "-C", repo, "checkout", branch],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+        subprocess.run(
+            ["git", "-C", repo, "branch", "-D", temp_branch],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+        return False, f"Cherry-pick failed on {failed_commit}, original branch restored", None
+
+    # Get new HEAD
+    new_head = subprocess.check_output(
+        ["git", "-C", repo, "rev-parse", "HEAD"],
+        text=True,
+    ).strip()
+
+    # Switch back to original branch and reset to new HEAD
+    subprocess.run(
+        ["git", "-C", repo, "checkout", branch],
+        check=True,
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+    )
+    subprocess.run(
+        ["git", "-C", repo, "reset", "--hard", new_head],
+        check=True,
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+    )
+
+    # Cleanup temp branch
+    subprocess.run(
+        ["git", "-C", repo, "branch", "-D", temp_branch],
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+    )
+
+    return True, f"Reordered: {len(selected_commits)} upstream + {len(remaining_commits)} local", cut_point
+
+
+
+def run_explore(args) -> int:
+    """Main entry point for explore subcommand."""
+    bblayers_path = resolve_bblayers_path(args.bblayers)
+    defaults = load_defaults(args.defaults_file)
+    discover_all = getattr(args, 'all', False)
+    pairs, repo_sets = resolve_base_and_layers(
+        bblayers_path, defaults, include_external=discover_all, discover_all=discover_all
+    )
+    # Filter out hidden repos
+    repos = dedupe_preserve_order(
+        repo for _, repo in pairs if repo not in repo_sets.hidden
+    )
+
+    # Add external repos to the list (they're not in pairs since they're not layers)
+    for ext_repo in repo_sets.external:
+        if ext_repo not in repos and ext_repo not in repo_sets.hidden:
+            repos.append(ext_repo)
+
+    # For backward compat with UI functions that expect simple sets
+    discovered_repos = repo_sets.discovered
+    external_repos = repo_sets.external
+    configured_layers = repo_sets.configured_layers
+
+    if not repos and not external_repos:
+        print("No repos found.")
+        return 1
+
+    # Build layer mapping for repos (needed for status output)
+    repo_layers: Dict[str, List[str]] = {}
+    for layer, repo in pairs:
+        repo_layers.setdefault(repo, []).append(layer)
+
+    # Optionally fetch first
+    if getattr(args, 'refresh', False) or getattr(args, 'fetch', False):
+        print("Fetching from origin...")
+        for repo in repos:
+            if defaults.get(repo, "rebase") != "skip":
+                fetch_repo(repo)
+        print()
+
+    # Pre-collect repo info for display
+    verbose = getattr(args, 'verbose', 0)
+    max_commits = getattr(args, 'max_commits', 10)
+    did_fetch = getattr(args, 'refresh', False) or getattr(args, 'fetch', False)
+    status_mode = getattr(args, 'status', False)
+
+    repo_info: Dict[str, Dict] = {}
+    for repo in repos:
+        default_action = defaults.get(repo, "rebase")
+        branch = current_branch(repo)
+        if not branch:
+            branch = "(detached)"
+
+        # Get local commits
+        commits = []
+        base_ref = None
+        upstream_count = 0
+        if branch != "(detached)" and default_action != "skip":
+            try:
+                commits_list, base_ref = get_local_commits(repo, branch)
+                commits = commits_list if commits_list else []
+                # Get upstream count:
+                # - If we fetched: use local refs (accurate count)
+                # - If --status mode: do ls-remote (user expects to wait for accurate info)
+                # - Otherwise: skip for fast startup (user can press r/R to refresh)
+                if did_fetch:
+                    upstream = get_upstream_commits(repo, branch)
+                    upstream_count = len(upstream)
+                elif status_mode:
+                    ls_result = get_upstream_count_ls_remote(repo, branch)
+                    if ls_result == -1:
+                        upstream_count = -1  # indicates "has changes" but unknown count
+                    elif ls_result and ls_result > 0:
+                        upstream_count = ls_result
+                # else: leave upstream_count = 0 (unknown) for fast interactive startup
+            except Exception:
+                pass
+
+        repo_info[repo] = {
+            "display_name": repo_display_name(repo),
+            "local_count": len(commits),
+            "commits": commits,
+            "branch": branch,
+            "base_ref": base_ref,
+            "upstream_count": upstream_count,
+            "is_dirty": not repo_is_clean(repo),
+            "default_action": default_action,
+        }
+
+    # Handle --status mode: print text output instead of fzf
+    if getattr(args, 'status', False):
+        def format_layers(layer_paths: List[str]) -> str:
+            if len(layer_paths) == 1:
+                return f"  layer: {layer_display_name(layer_paths[0])}"
+            lines = ["  layers:"]
+            for lp in layer_paths:
+                lines.append(f"    {layer_display_name(lp)}")
+            return "\n".join(lines)
+
+        for repo in repos:
+            info = repo_info[repo]
+            layers = repo_layers.get(repo, [])
+            display_name = info["display_name"]
+            branch = info["branch"]
+            local_count = info["local_count"]
+            upstream_count = info["upstream_count"]
+            is_dirty = info["is_dirty"]
+            default_action = info["default_action"]
+            commits = info["commits"]
+
+            # Format worktree status with color
+            if is_dirty:
+                worktree_status = terminal_color("dirty", "[DIRTY]")
+            else:
+                worktree_status = terminal_color("clean", "[clean]")
+
+            if default_action == "skip":
+                if verbose == 0:
+                    layer_names = ", ".join(layer_display_name(lp) for lp in layers)
+                    print(f"→ {layer_names}: default=skip")
+                else:
+                    print(f"→ {repo}: default=skip (skipping status)")
+                    print(format_layers(layers))
+                continue
+
+            if branch == "(detached)":
+                if verbose == 0:
+                    layer_names = ", ".join(layer_display_name(lp) for lp in layers)
+                    print(f"→ {layer_names}: detached HEAD {worktree_status}")
+                else:
+                    print(f"→ {repo}: detached HEAD or no branch {worktree_status}; skipping")
+                    print(format_layers(layers))
+                continue
+
+            if verbose == 0:
+                # Summary mode (default)
+                layer_names = ", ".join(layer_display_name(lp) for lp in layers)
+                status_parts = []
+                if local_count:
+                    status_parts.append(f"{local_count} local commit(s)")
+                if upstream_count == -1:
+                    status_parts.append(terminal_color("upstream", "upstream has changes"))
+                elif upstream_count > 0:
+                    status_parts.append(terminal_color("upstream", f"{upstream_count} to pull"))
+                if not status_parts:
+                    status_parts.append("up-to-date")
+                print(f"→ {layer_names}: {', '.join(status_parts)} on {Colors.bold(branch)} {worktree_status}")
+            else:
+                # Detailed mode (verbose >= 1)
+                status_parts = []
+                if local_count:
+                    status_parts.append(f"{local_count} local commit(s)")
+                if upstream_count == -1:
+                    status_parts.append(terminal_color("upstream", "upstream has changes"))
+                elif upstream_count > 0:
+                    status_parts.append(terminal_color("upstream", f"{upstream_count} upstream commit(s) to pull"))
+                if not status_parts:
+                    status_parts.append("up-to-date")
+
+                repo_display = Colors.green(repo) if not is_dirty else repo
+                branch_display = Colors.bold(branch)
+                print(f"→ {repo_display}: {', '.join(status_parts)} on {branch_display} {worktree_status}")
+                print(format_layers(layers))
+
+                # Show local commits
+                show_all = verbose >= 2
+                if commits:
+                    print("  local:")
+                    limit = len(commits) if show_all else max_commits
+                    for hash_val, subject in commits[:limit]:
+                        print(f"    {hash_val[:12]} {subject}")
+                    if not show_all and len(commits) > max_commits:
+                        print(f"    ... ({len(commits) - max_commits} more)")
+
+                # Show upstream count hint
+                if upstream_count > 0 and did_fetch:
+                    print(f"  {terminal_color('upstream', f'upstream: {upstream_count} commit(s) to pull')}")
+
+        return 0
+
+    # fzf mode requires fzf
+    if not fzf_available():
+        print("fzf is required for the explore command. Please install fzf.")
+        return 1
+
+    # If specific repo given, jump directly to it
+    if args.repo:
+        repo = find_repo_by_identifier(repos, args.repo, defaults)
+        if not repo:
+            print(f"Repo not found: {args.repo}")
+            return 1
+
+        # Browse single repo until back/quit
+        while True:
+            branch = current_branch(repo) or "(detached)"
+            commits, base_ref = get_local_commits(repo, branch)
+            if not commits:
+                commits = []
+            upstream_context = get_upstream_context_commits(repo, base_ref, args.upstream_count) if base_ref else []
+            upstream_to_pull = get_upstream_to_pull(repo, branch, count=500) if branch != "(detached)" else []
+
+            action, selected_hashes = fzf_explore_commits(
+                repo, branch, commits, upstream_context, upstream_to_pull, base_ref or "HEAD"
+            )
+
+            if action == "quit" or action == "back":
+                break
+            elif action == "copy" and selected_hashes:
+                commit = selected_hashes[0]
+                if copy_to_clipboard(commit):
+                    print(f"Copied: {commit}")
+                else:
+                    print(f"Clipboard not available. Hash: {commit}")
+            elif action == "export" and selected_hashes:
+                export_commits_from_explore(repo, selected_hashes)
+            elif action == "tig":
+                viewer = get_preferred_git_viewer()
+                if not viewer:
+                    print(f"\n{Colors.yellow('No git history viewer found.')}")
+                    print("Install one of: tig, lazygit, or gitk")
+                    print("  apt install tig  (or brew install tig)")
+                    input("Press Enter to continue...")
+                else:
+                    # Launch the preferred viewer
+                    if selected_hashes and viewer == "tig":
+                        subprocess.run(["tig", "show", selected_hashes[0]], cwd=repo)
+                    elif selected_hashes and viewer == "lazygit":
+                        subprocess.run(["lazygit"], cwd=repo)
+                    elif selected_hashes and viewer == "gitk":
+                        subprocess.run(["gitk", selected_hashes[0]], cwd=repo)
+                    else:
+                        subprocess.run([viewer], cwd=repo)
+
+        return 0
+
+    # Two-level navigation loop
+    explore_verbose_mode = False
+    explore_layers_mode = False
+    expanded_repos: Set[str] = set()
+    first_iteration = True
+    next_selection: Optional[str] = None  # Track repo to select after expand/collapse
+    last_interrupt_time: float = 0  # Track Ctrl+C for double-tap exit
+    while True:
+        # Level 1: Repo/Layers list
+        # Enable background upstream check on first iteration only
+        list_action, selected_repo = fzf_explore_repo_list(
+            repos, repo_info, repo_layers, explore_verbose_mode,
+            defaults=defaults,
+            enable_background_refresh=first_iteration,
+            discovered_repos=discovered_repos,
+            external_repos=external_repos,
+            expanded_repos=expanded_repos,
+            layers_mode=explore_layers_mode,
+            configured_layers=configured_layers,
+            initial_selection=next_selection,
+            bblayers_conf=bblayers_path,
+        )
+        first_iteration = False
+        next_selection = None  # Clear after use
+
+        if list_action == "quit":
+            break
+        elif list_action == "interrupt":
+            # Double Ctrl+C to exit
+            now = time.time()
+            if now - last_interrupt_time < 1.0:
+                break  # Exit on double Ctrl+C
+            last_interrupt_time = now
+            print("\nPress Ctrl+C again to exit")
+            continue
+        elif list_action == "cancelled":
+            continue
+        elif list_action in ("rebase", "merge") and selected_repo:
+            branch = current_branch(selected_repo)
+            display_name = repo_display_name(selected_repo)
+            if list_action == "rebase":
+                cmd_desc = f"git pull --rebase origin/{branch}"
+            else:
+                cmd_desc = f"git pull origin/{branch}"
+            try:
+                confirm = input(f"\n→ {display_name}: {cmd_desc} [y/N] ").strip().lower()
+            except (EOFError, KeyboardInterrupt):
+                print()
+                continue
+            if confirm != "y":
+                print("  Cancelled.")
+                continue
+            run_single_repo_update(selected_repo, branch, list_action)
+            print()
+            # Refresh repo info after update
+            try:
+                commits, _ = get_local_commits(selected_repo, branch)
+                repo_info[selected_repo]["local_count"] = len(commits) if commits else 0
+            except Exception:
+                pass
+            continue
+        elif list_action == "refresh" and selected_repo:
+            # Skip special entries
+            if selected_repo in ("HEADER", "PROJECT", "SETTINGS") or selected_repo.startswith("SEPARATOR"):
+                continue
+            # Fetch from single repo and refresh its info
+            display_name = repo_display_name(selected_repo)
+            print(f"\nRefreshing {display_name}...", end=" ", flush=True)
+            try:
+                subprocess.run(
+                    ["git", "-C", selected_repo, "fetch", "--quiet"],
+                    check=True,
+                    stderr=subprocess.DEVNULL,
+                    timeout=30,
+                )
+                print("done")
+            except subprocess.TimeoutExpired:
+                print("timeout")
+            except subprocess.CalledProcessError:
+                print("failed")
+            # Refresh this repo's info
+            branch = current_branch(selected_repo) or "(detached)"
+            try:
+                commits, _ = get_local_commits(selected_repo, branch)
+                repo_info[selected_repo]["local_count"] = len(commits) if commits else 0
+                upstream = get_upstream_commits(selected_repo, branch)
+                repo_info[selected_repo]["upstream_count"] = len(upstream)
+            except Exception:
+                pass
+            repo_info[selected_repo]["is_dirty"] = not repo_is_clean(selected_repo)
+            continue
+        elif list_action == "refresh_all":
+            # Fetch from all repos and refresh info
+            print("\nRefreshing from origin...")
+            for repo in repos:
+                display_name = repo_display_name(repo)
+                try:
+                    subprocess.run(
+                        ["git", "-C", repo, "fetch", "--quiet"],
+                        check=True,
+                        stderr=subprocess.DEVNULL,
+                    )
+                    print(f"  {display_name}: fetched")
+                except subprocess.CalledProcessError:
+                    print(f"  {display_name}: fetch failed")
+            # Rebuild repo info
+            for repo in repos:
+                branch = current_branch(repo) or "(detached)"
+                try:
+                    commits, _ = get_local_commits(repo, branch)
+                    repo_info[repo]["local_count"] = len(commits) if commits else 0
+                    upstream = get_upstream_commits(repo, branch)
+                    repo_info[repo]["upstream_count"] = len(upstream)
+                except Exception:
+                    pass
+                repo_info[repo]["is_dirty"] = not repo_is_clean(repo)
+            print()
+            continue
+        elif list_action == "verbose":
+            # Toggle verbose mode (show layer names instead of display names)
+            explore_verbose_mode = not explore_verbose_mode
+            continue
+        elif list_action == "update_all":
+            # Run update flow for all repos (same as 'bit update')
+            print()
+            for repo in repos:
+                default_action = defaults.get(repo, "rebase")
+                branch = current_branch(repo)
+                action = prompt_action(repo, branch, default_action, use_fzf=True)
+                if action is None:
+                    continue
+                op, target, new_default = action
+
+                if new_default:
+                    defaults[repo] = new_default
+                    save_defaults(args.defaults_file, defaults)
+
+                if op == "quit":
+                    print("Aborting update on user request.")
+                    break
+                if op == "skip":
+                    continue
+
+                if op == "custom":
+                    print(f"Custom command in {repo}")
+                    run_cmd(repo, target, dry_run=False, shell=True)
+                else:
+                    remote_ref = f"origin/{target}"
+                    verb = "pull --rebase" if op == "rebase" else "pull"
+                    print(f"Updating {repo}: git {verb} {remote_ref}")
+                    try:
+                        if op == "rebase":
+                            run_cmd(repo, ["git", "pull", "--rebase", "origin", target], dry_run=False)
+                        elif op == "merge":
+                            run_cmd(repo, ["git", "pull", "origin", target], dry_run=False)
+                    except subprocess.CalledProcessError as exc:
+                        print(f"Update failed: {exc}")
+
+                # Update repo_info after update
+                info = repo_info.get(repo, {})
+                commits, base = get_local_commits(repo, branch)
+                info["local_count"] = len(commits) if commits else 0
+                info["commits"] = commits or []
+                info["base_ref"] = base
+                info["is_dirty"] = not repo_is_clean(repo)
+                info["upstream_count"] = 0
+                repo_info[repo] = info
+
+            print()
+            continue
+        elif list_action == "branch_all":
+            # Jump to branch menu (same as bit branch)
+            fzf_branch_repos(repos)
+            # Update repo_info with new branch info
+            for repo in repos:
+                info = repo_info.get(repo, {})
+                info["branch"] = current_branch(repo) or "(detached)"
+                repo_info[repo] = info
+            continue
+        elif list_action == "layers_toggle":
+            # Toggle between repos view and layers view
+            explore_layers_mode = not explore_layers_mode
+            continue
+        elif list_action == "discover_toggle":
+            # Toggle discovery mode and reload layers
+            discover_all = not discover_all
+            pairs, repo_sets = resolve_base_and_layers(
+                bblayers_path, defaults, include_external=discover_all, discover_all=discover_all
+            )
+            repos = dedupe_preserve_order(repo for _, repo in pairs)
+            discovered_repos = repo_sets.discovered
+            external_repos = repo_sets.external
+            configured_layers = repo_sets.configured_layers
+            # Rebuild repo_layers
+            repo_layers = {}
+            for layer, repo in pairs:
+                repo_layers.setdefault(repo, []).append(layer)
+            # Rebuild repo_info for new repos
+            for repo in repos:
+                if repo not in repo_info:
+                    branch = current_branch(repo) or "(detached)"
+                    commits, _ = get_local_commits(repo, branch)
+                    repo_info[repo] = {
+                        "display_name": repo_display_name(repo),
+                        "branch": branch,
+                        "local_count": len(commits) if commits else 0,
+                        "is_dirty": not repo_is_clean(repo),
+                        "upstream_count": 0,
+                    }
+            continue
+        elif list_action == "config" and selected_repo:
+            # Skip special entries (but PROJECT is handled specially below)
+            if selected_repo in ("HEADER", "SETTINGS") or selected_repo.startswith("SEPARATOR"):
+                continue
+            # Show config menu for selected repo (or project config if PROJECT)
+            if selected_repo == "PROJECT":
+                fzf_build_config(args.bblayers)
+                # Reload layer configuration after returning (bblayers.conf may have been edited)
+                pairs, repo_sets = resolve_base_and_layers(
+                    bblayers_path, defaults, include_external=discover_all, discover_all=discover_all
+                )
+                repos = dedupe_preserve_order(repo for _, repo in pairs)
+                discovered_repos = repo_sets.discovered
+                external_repos = repo_sets.external
+                configured_layers = repo_sets.configured_layers
+                # Rebuild repo_layers
+                repo_layers = {}
+                for layer, repo in pairs:
+                    repo_layers.setdefault(repo, []).append(layer)
+                # Rebuild repo_info
+                for repo in repos:
+                    if repo not in repo_info:
+                        branch = current_branch(repo) or "(detached)"
+                        commits, _ = get_local_commits(repo, branch)
+                        repo_info[repo] = {
+                            "display_name": repo_display_name(repo),
+                            "branch": branch,
+                            "local_count": len(commits) if commits else 0,
+                            "is_dirty": not repo_is_clean(repo),
+                            "upstream_count": 0,
+                        }
+            else:
+                fzf_repo_config(selected_repo, defaults, args.defaults_file)
+            continue
+        elif list_action == "expand" and selected_repo:
+            # Skip special entries
+            if selected_repo in ("HEADER", "PROJECT", "SETTINGS") or selected_repo.startswith("SEPARATOR"):
+                continue
+            # Toggle expansion of repo to show layers
+            if selected_repo in expanded_repos:
+                expanded_repos.discard(selected_repo)
+            else:
+                # Only expand if repo has multiple layers
+                layers = repo_layers.get(selected_repo, [])
+                if len(layers) > 1:
+                    expanded_repos.add(selected_repo)
+            # Preserve position at the expanded/collapsed repo
+            next_selection = selected_repo
+            continue
+        elif list_action == "expand_all":
+            # Toggle expand/collapse all repos with multiple layers
+            # If any are expanded, collapse all; otherwise expand all
+            expandable_repos = [r for r in repos if len(repo_layers.get(r, [])) > 1]
+            if expanded_repos:
+                # Some expanded - collapse all
+                expanded_repos.clear()
+            else:
+                # None expanded - expand all
+                expanded_repos.update(expandable_repos)
+            # Preserve exact selection position (including HEADER/SEPARATOR)
+            if selected_repo:
+                next_selection = selected_repo
+            continue
+        elif list_action == "status" and selected_repo:
+            # Skip special entries
+            if selected_repo in ("HEADER", "PROJECT", "SETTINGS") or selected_repo.startswith("SEPARATOR"):
+                continue
+            # Show status for this repo
+            display_name = repo_display_name(selected_repo)
+            branch = current_branch(selected_repo)
+            print(f"\n→ {display_name} on {branch}")
+            show_repo_status_detail(selected_repo, branch)
+            print()
+            input("Press Enter to continue...")
+            continue
+        elif list_action == "tig" and selected_repo:
+            # Skip special entries
+            if selected_repo in ("HEADER", "PROJECT", "SETTINGS") or selected_repo.startswith("SEPARATOR"):
+                continue
+            # Launch git history viewer for this repo
+            viewer = get_preferred_git_viewer()
+            if not viewer:
+                print(f"\n{Colors.yellow('No git history viewer found.')}")
+                print("Install one of: tig, lazygit, or gitk")
+                print("  apt install tig  (or brew install tig)")
+                input("Press Enter to continue...")
+                continue
+            display_name = repo_display_name(selected_repo)
+            print(f"\nLaunching {viewer} for {display_name}...")
+            try:
+                subprocess.run([viewer], cwd=selected_repo)
+            except Exception as e:
+                print(f"Error launching {viewer}: {e}")
+                input("Press Enter to continue...")
+            continue
+        elif list_action == "add_tracked" and selected_repo:
+            # Skip special entries
+            if selected_repo in ("HEADER", "PROJECT", "SETTINGS") or selected_repo.startswith("SEPARATOR"):
+                continue
+            # Add repo to tracked list AND add layer to bblayers.conf
+            # Works for external, discovered, or hidden repos
+            hidden_repos = set(get_hidden_repos(defaults))
+            is_hidden = selected_repo in hidden_repos
+            is_external = selected_repo in external_repos
+            is_discovered = selected_repo in discovered_repos
+
+            if is_external or is_discovered or is_hidden:
+                # Add to extra repos (makes it permanently tracked)
+                add_extra_repo(args.defaults_file, defaults, selected_repo)
+                # Remove from external/discovered sets (now it's tracked)
+                external_repos.discard(selected_repo)
+                discovered_repos.discard(selected_repo)
+                # If it was hidden, unhide it
+                if is_hidden:
+                    remove_hidden_repo(args.defaults_file, defaults, selected_repo)
+
+            # Also add layer to bblayers.conf if it's a layer
+            # Check if selected_repo is a layer or contains layers
+            layers_to_check = []
+            if os.path.isfile(os.path.join(selected_repo, "conf", "layer.conf")):
+                layers_to_check = [selected_repo]
+            else:
+                layers_to_check = repo_layers.get(selected_repo, [])
+
+            # Filter to unconfigured layers only
+            unconfigured = [l for l in layers_to_check if os.path.realpath(l) not in configured_layers]
+
+            if unconfigured:
+                bblayers_conf = resolve_bblayers_path(args.bblayers)
+                if bblayers_conf:
+                    # Build collection map
+                    all_layer_paths = []
+                    for layer_list in repo_layers.values():
+                        all_layer_paths.extend(layer_list)
+                    collection_map = build_layer_collection_map(all_layer_paths)
+
+                    # Add layers (if single layer, add directly; if multiple, use fzf)
+                    if len(unconfigured) == 1:
+                        layer_to_add = unconfigured[0]
+                        layer_name = os.path.basename(layer_to_add)
+                        print(f"\nAdding {layer_name} to bblayers.conf...")
+                        success, message, added = add_layer_to_bblayers(
+                            layer_to_add, bblayers_conf, collection_map
+                        )
+                        print(f"{message}")
+                        if success and added:
+                            for added_layer in added:
+                                configured_layers.add(os.path.realpath(added_layer))
+                    else:
+                        # Multiple layers - prompt which to add
+                        print(f"\nMultiple unconfigured layers in {repo_display_name(selected_repo)}:")
+                        for i, layer in enumerate(unconfigured, 1):
+                            print(f"  {i}. {os.path.basename(layer)}")
+                        print("  a. Add all")
+                        print("  s. Skip (just track repo)")
+                        try:
+                            choice = input("\nSelect (number/a/s): ").strip().lower()
+                            if choice == "a":
+                                for layer in unconfigured:
+                                    layer_name = os.path.basename(layer)
+                                    print(f"Adding {layer_name}...")
+                                    success, message, added = add_layer_to_bblayers(
+                                        layer, bblayers_conf, collection_map
+                                    )
+                                    if success and added:
+                                        for added_layer in added:
+                                            configured_layers.add(os.path.realpath(added_layer))
+                                    else:
+                                        print(f"  {message}")
+                            elif choice and choice != "s":
+                                idx = int(choice) - 1
+                                if 0 <= idx < len(unconfigured):
+                                    layer_to_add = unconfigured[idx]
+                                    layer_name = os.path.basename(layer_to_add)
+                                    print(f"Adding {layer_name}...")
+                                    success, message, added = add_layer_to_bblayers(
+                                        layer_to_add, bblayers_conf, collection_map
+                                    )
+                                    print(f"{message}")
+                                    if success and added:
+                                        for added_layer in added:
+                                            configured_layers.add(os.path.realpath(added_layer))
+                        except (ValueError, EOFError, KeyboardInterrupt):
+                            pass
+            continue
+        elif list_action == "hide" and selected_repo:
+            # Skip special entries
+            if selected_repo in ("HEADER", "PROJECT", "SETTINGS") or selected_repo.startswith("SEPARATOR"):
+                continue
+            # Hide repo (silently - repo disappears from list)
+            if selected_repo in repos:
+                add_hidden_repo(args.defaults_file, defaults, selected_repo)
+                repos.remove(selected_repo)
+                repo_info.pop(selected_repo, None)
+            continue
+        elif list_action == "toggle_hidden":
+            # Toggle showing hidden repos (silently - fzf will show the updated list)
+            hidden_repos = set(get_hidden_repos(defaults))
+            if hidden_repos:
+                # Check if we're currently showing hidden repos
+                showing_hidden = any(r in repos for r in hidden_repos)
+                if showing_hidden:
+                    # Hide them again
+                    for repo in list(hidden_repos):
+                        if repo in repos:
+                            repos.remove(repo)
+                            repo_info.pop(repo, None)
+                else:
+                    # Show them
+                    for repo in hidden_repos:
+                        if repo not in repos and os.path.isdir(repo):
+                            repos.append(repo)
+                            # Add repo_info for newly shown repo
+                            branch = current_branch(repo) or "(detached)"
+                            is_dirty = not repo_is_clean(repo)
+                            commits, _ = get_local_commits(repo, branch) if branch != "(detached)" else ([], None)
+                            repo_info[repo] = {
+                                "display_name": repo_display_name(repo),
+                                "branch": branch,
+                                "local_count": len(commits) if commits else 0,
+                                "is_dirty": is_dirty,
+                                "upstream_count": 0,
+                            }
+            continue
+        elif list_action == "add_layer" and selected_repo:
+            # Skip special entries
+            if selected_repo in ("HEADER", "PROJECT", "SETTINGS") or selected_repo.startswith("SEPARATOR"):
+                continue
+            # Add a layer to bblayers.conf using bitbake-layers
+            # Check if selected_repo is actually a layer path (from expanded view)
+            is_direct_layer = os.path.isfile(os.path.join(selected_repo, "conf", "layer.conf"))
+
+            if is_direct_layer:
+                # Direct layer selection from expanded view
+                layers_in_repo = [selected_repo]
+            else:
+                # Repo selection - get layers from it
+                layers_in_repo = repo_layers.get(selected_repo, [])
+
+            if not layers_in_repo:
+                print(f"\nNo layers found in {repo_display_name(selected_repo)}")
+                input("Press Enter to continue...")
+                continue
+
+            # Find bblayers.conf path
+            bblayers_conf = resolve_bblayers_path(args.bblayers)
+            if not bblayers_conf:
+                print("\nCould not find bblayers.conf")
+                input("Press Enter to continue...")
+                continue
+
+            # Build collection map from all known layers
+            all_layer_paths = []
+            for layer_list in repo_layers.values():
+                all_layer_paths.extend(layer_list)
+            # Also add layers from other discovered repos
+            for repo in discovered_repos | external_repos:
+                if repo not in repo_layers:
+                    # Check if repo itself is a layer
+                    if os.path.isfile(os.path.join(repo, "conf", "layer.conf")):
+                        all_layer_paths.append(repo)
+            # Discover all layers for collection map
+            peer_dirs = {os.path.dirname(r) for r in repos if r}
+            all_discovered = discover_layers(peer_dirs=peer_dirs)
+            for layer_path, _ in all_discovered:
+                if layer_path not in all_layer_paths:
+                    all_layer_paths.append(layer_path)
+
+            collection_map = build_layer_collection_map(all_layer_paths)
+
+            # Determine layer to add
+            layer_to_add = None
+            if len(layers_in_repo) == 1:
+                layer_to_add = layers_in_repo[0]
+            else:
+                # Use fzf to select layer
+                display_name = repo_display_name(selected_repo)
+                menu_lines = []
+                for layer in layers_in_repo:
+                    layer_name = os.path.basename(layer)
+                    menu_lines.append(f"{layer}\t{layer_name}")
+                menu_input = "\n".join(menu_lines)
+
+                try:
+                    result = subprocess.run(
+                        [
+                            "fzf",
+                            "--no-multi",
+                            "--no-sort",
+                            "--no-info",
+                            "--ansi",
+                            "--height", "~50%",
+                            "--header", f"Select layer from {display_name} (Enter=select, Esc=cancel)",
+                            "--prompt", "Layer: ",
+                            "--with-nth", "2..",
+                            "--delimiter", "\t",
+                        ] + get_fzf_color_args(),
+                        input=menu_input,
+                        stdout=subprocess.PIPE,
+                        text=True,
+                    )
+                    if result.returncode == 0 and result.stdout.strip():
+                        parts = result.stdout.strip().split("\t", 1)
+                        if parts:
+                            layer_to_add = parts[0]
+                except FileNotFoundError:
+                    # Fallback to numbered menu if fzf not available
+                    print(f"\nLayers in {display_name}:")
+                    for i, layer in enumerate(layers_in_repo, 1):
+                        print(f"  {i}. {os.path.basename(layer)}")
+                    try:
+                        choice = input("\nSelect layer number (or Enter to cancel): ").strip()
+                        if choice:
+                            idx = int(choice) - 1
+                            if 0 <= idx < len(layers_in_repo):
+                                layer_to_add = layers_in_repo[idx]
+                    except (ValueError, IndexError):
+                        pass
+
+            if not layer_to_add:
+                # User cancelled layer selection - go back to list
+                continue
+
+            layer_name = os.path.basename(layer_to_add)
+            print(f"\nAdding {layer_name} to bblayers.conf...")
+            success, message, added = add_layer_to_bblayers(
+                layer_to_add, bblayers_conf, collection_map
+            )
+            print(f"{message}\n")
+            if success and added:
+                # Update configured_layers with newly added layers
+                for added_layer in added:
+                    configured_layers.add(os.path.realpath(added_layer))
+                # Also track the repo (add to __extra_repos__ if not already tracked)
+                # Find the repo for this layer
+                try:
+                    layer_repo = subprocess.check_output(
+                        ["git", "-C", layer_to_add, "rev-parse", "--show-toplevel"],
+                        text=True, stderr=subprocess.DEVNULL
+                    ).strip()
+                    if layer_repo in discovered_repos or layer_repo in external_repos:
+                        add_extra_repo(args.defaults_file, defaults, layer_repo)
+                        discovered_repos.discard(layer_repo)
+                        external_repos.discard(layer_repo)
+                except subprocess.CalledProcessError:
+                    pass
+            continue
+        elif list_action == "remove_layer" and selected_repo:
+            # Skip special entries
+            if selected_repo in ("HEADER", "PROJECT", "SETTINGS") or selected_repo.startswith("SEPARATOR"):
+                continue
+            # Remove a layer from bblayers.conf
+            # Determine which layer to remove
+            layer_to_remove = None
+
+            # Check if selected_repo is actually a layer path
+            if os.path.isfile(os.path.join(selected_repo, "conf", "layer.conf")):
+                layer_to_remove = selected_repo
+            else:
+                # It's a repo - get configured layers in this repo
+                repo_layer_list = repo_layers.get(selected_repo, [])
+                configured_in_repo = [l for l in repo_layer_list if os.path.realpath(l) in configured_layers]
+
+                if not configured_in_repo:
+                    print(f"\nNo configured layers in this repo to remove")
+                    input("Press Enter to continue...")
+                    continue
+                elif len(configured_in_repo) == 1:
+                    layer_to_remove = configured_in_repo[0]
+                else:
+                    # Multiple layers - let user choose with fzf
+                    layer_names = [os.path.basename(l) for l in configured_in_repo]
+                    fzf_input = "\n".join(layer_names)
+                    try:
+                        result = subprocess.run(
+                            ["fzf", "--height", "~30%", "--prompt", "Remove layer: ", "--header", "Select layer to remove (Esc to cancel)"] + get_fzf_color_args(),
+                            input=fzf_input,
+                            capture_output=True,
+                            text=True,
+                        )
+                        if result.returncode == 0 and result.stdout.strip():
+                            selected_name = result.stdout.strip()
+                            for l in configured_in_repo:
+                                if os.path.basename(l) == selected_name:
+                                    layer_to_remove = l
+                                    break
+                    except FileNotFoundError:
+                        pass
+
+            if not layer_to_remove:
+                continue
+
+            # Check layer is actually configured
+            layer_realpath = os.path.realpath(layer_to_remove)
+            if layer_realpath not in configured_layers:
+                print(f"\n{os.path.basename(layer_to_remove)} is not in bblayers.conf")
+                input("Press Enter to continue...")
+                continue
+
+            # Find bblayers.conf
+            bblayers_conf = resolve_bblayers_path(args.bblayers)
+            if not bblayers_conf:
+                print("\nCould not find bblayers.conf")
+                input("Press Enter to continue...")
+                continue
+
+            layer_name = os.path.basename(layer_to_remove)
+            print(f"\nRemoving {layer_name} from bblayers.conf...")
+            success, message = remove_layer_from_bblayers(layer_to_remove, bblayers_conf)
+            print(f"{message}\n")
+
+            if success:
+                # Update configured_layers
+                configured_layers.discard(layer_realpath)
+                # If no layers remain configured in repo, mark as discovered
+                repo_layer_list = repo_layers.get(selected_repo, [])
+                if repo_layer_list and not any(os.path.realpath(l) in configured_layers for l in repo_layer_list):
+                    # Find the repo for this layer
+                    layer_repo = git_toplevel(layer_to_remove)
+                    if layer_repo:
+                        discovered_repos.add(layer_repo)
+            continue
+        elif list_action != "explore" or not selected_repo:
+            continue
+
+        # If selected_repo is a layer path (from layers view), resolve to its git repo
+        explore_repo = selected_repo
+        if not os.path.isdir(os.path.join(selected_repo, ".git")):
+            # Not a repo root - might be a layer, find parent repo
+            repo_path = git_toplevel(selected_repo)
+            if repo_path:
+                explore_repo = repo_path
+
+        # Level 2: Commit browser (loop until back/quit)
+        while True:
+            branch = current_branch(explore_repo) or "(detached)"
+            commits, base_ref = get_local_commits(explore_repo, branch)
+            if not commits:
+                commits = []
+            upstream_context = get_upstream_context_commits(explore_repo, base_ref, args.upstream_count) if base_ref else []
+            upstream_to_pull = get_upstream_to_pull(explore_repo, branch, count=500) if branch != "(detached)" else []
+
+            action, selected_hashes = fzf_explore_commits(
+                explore_repo, branch, commits, upstream_context, upstream_to_pull, base_ref or "HEAD"
+            )
+
+            if action == "back":
+                break  # Return to repo list
+            elif action == "quit":
+                return 0  # Exit entirely
+            elif action == "copy" and selected_hashes:
+                commit = selected_hashes[0]
+                if copy_to_clipboard(commit):
+                    print(f"Copied: {commit}")
+                else:
+                    print(f"Clipboard not available. Hash: {commit}")
+            elif action == "export" and selected_hashes:
+                export_commits_from_explore(explore_repo, selected_hashes)
+            elif action == "tig":
+                viewer = get_preferred_git_viewer()
+                if not viewer:
+                    print(f"\n{Colors.yellow('No git history viewer found.')}")
+                    print("Install one of: tig, lazygit, or gitk")
+                    print("  apt install tig  (or brew install tig)")
+                    input("Press Enter to continue...")
+                else:
+                    # Launch the preferred viewer
+                    if selected_hashes and viewer == "tig":
+                        subprocess.run(["tig", "show", selected_hashes[0]], cwd=explore_repo)
+                    elif selected_hashes and viewer == "lazygit":
+                        subprocess.run(["lazygit"], cwd=explore_repo)
+                    elif selected_hashes and viewer == "gitk":
+                        subprocess.run(["gitk", selected_hashes[0]], cwd=explore_repo)
+                    else:
+                        subprocess.run([viewer], cwd=explore_repo)
+
+    return 0
+
+