commandertui 1.1.0__tar.gz → 1.3.0__tar.gz

{commandertui-1.1.0 → commandertui-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.1.0
+Version: 1.3.0
 Summary: Dual-pane retro terminal file manager: compare, sync, copy and move folders
 Author: Humberto Barchini
 License-Expression: MIT
@@ -22,7 +22,7 @@ Dual-pane terminal file manager: compare two folders, sync them, or move
 files/folders between them (and to USB/SMB/any mounted path) — with a
 phosphor-green 80s-terminal look and a short modem-style boot animation.
 
-Status: **v1.1.0** — tests passing. MIT licensed.
+Status: **v1.3.0** — 119/119 tests passing. MIT licensed.
 
 ---
 
@@ -32,7 +32,7 @@ A safe, simple alternative to heavier dual-pane file managers. It was
 written after an earlier attempt of the same idea had to be scrapped for
 running an unauthenticated local HTTP server. This project deliberately:
 
-- **Never opens a network port.** Pure terminal UI (Textual), no HTTP server,
+- **Never opens a network port.** Pure terminal UI (Textual), no HTTP server (the only outgoing request is the daily update check, which you can turn off),
   no webview.
 - **Never does a raw `rm -rf`.** Deletes always go through the desktop trash
   (`send2trash` → `gio trash` → manual move into `~/.local/share/Trash`, in
@@ -58,13 +58,19 @@ makepkg -si
 
 Remove it with `sudo pacman -R commandertui`.
 
-**Other distros.** It is a regular Python package (Python 3.11+):
+**PyPI (Linux / macOS / WSL).** It is a standard package on [PyPI](https://pypi.org/project/commandertui/) (Python 3.11+). Recommended via `pipx`:
 
 ```bash
-pipx install git+https://github.com/juniorbarchini-oss/commandertui.git
+pipx install commandertui
 ```
 
-**macOS.** Same Python package (`pipx install ...` as above), plus
+Or inside an activated virtual environment:
+
+```bash
+pip install commandertui
+```
+
+**macOS.** Same Python package (`pipx install commandertui`), plus
 [kitty](https://sw.kovidgoyal.net/kitty/) for the standalone window. Places
 lists the volumes under `/Volumes` (system volumes such as Recovery and
 Preboot are hidden) and FUSE mounts inside your home folder. To get a
@@ -120,14 +126,20 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `↑`/`↓`, `Enter` | Navigate, open directory |
 | `Backspace` | Go to parent directory |
 | `Space` | Mark/unmark item under cursor |
+| `F2` | Rename the item under the cursor (never overwrites an existing name) |
+| `F4` | Edit the file under the cursor with `$VISUAL` / `$EDITOR` (falls back to nano, vim or vi); CommanderTUI pauses and comes back when you close the editor |
 | `F5` | Copy marked (or item under cursor) to the other pane |
 | `F6` | Move marked to the other pane |
 | `F7` | Create a folder in the active pane |
 | `F8` / `Delete` | Delete marked (to trash) |
+| `/` | Filter the active pane by name (contains, ignores case) as you type; `Enter` keeps it, `Esc` clears it |
+| `+` / `-` / `*` | Mark / unmark by pattern (`*.iso`, or plain text = contains) / invert marks, over the rows shown |
+| `u` | Update: shows the pending new version (see *Updates*) |
 | `i` | Size: file/folder count and total bytes of marked items (background, `Esc` stops it) |
 | `h` | Show/hide hidden (dot) files in both panes |
-| `p` | Places: jump to a mounted drive (USB/SMB/rclone) or saved bookmark |
-| `c` | Compare: full recursive diff between the two panes' current folders |
+| `t` | Color theme: Phosphor green (default), Phosphor amber, Nord, Gruvbox, Dracula, Tokyo Night, Catppuccin Mocha, Solarized Dark, Monokai, Textual Dark. Previews as you move, Enter keeps it (saved in `~/.config/commandertui/settings.json`), Esc goes back |
+| `p` | Places: jump to a mounted drive (USB/SMB/rclone), saved bookmark or saved network location. Inside: `a` add a network location, `s` save the active pane's folder as a bookmark, `d` delete a saved one |
+| `c` | Compare: full recursive diff between the two panes' current folders, with size and date of both sides (and which is newer when a file changed) |
 | `r` | Refresh both panes |
 | `q` | Quit |
 
@@ -141,6 +153,41 @@ half-written), and a move never removes a source it didn't fully copy.
 on-demand mount point doesn't show), GVFS/Nautilus network shares, FUSE
 mounts inside `$HOME` (e.g. `rclone mount`), and saved bookmarks.
 
+**Network locations (Linux, needs `gio`/GVFS):** in Places press `a`, pick
+SMB, SFTP or FTP and type the server's IP or name. For SMB the app lists the
+shares on the server and you pick one; SFTP/FTP connect straight in. The
+location is saved in `~/.config/commandertui/network.json` (protocol, host
+and share only -- never a password) and reappears in Places, mounting itself
+when picked. If the server asks for a login, `gio` asks for it in the
+terminal and can remember it in the system keyring, exactly like Nautilus.
+
+Every key also has a clickable box on the bottom bar: one row on wide windows
+(168+ columns), two rows when narrower (120 columns is the practical minimum).
+The active pane has the thick border and the inverted path bar; each path bar
+shows the free space of that disk, and the marked count and total size.
+
+## Updates
+
+Once a day, in the background and only after the start-up animation, the app
+asks PyPI for the latest version (a plain GET, nothing about you is sent). If
+a newer one exists you get a dialog -- **Update now / Later / Skip this
+version** -- and the header keeps saying `update X available (press u)`.
+It never installs on its own. **Update now** hands the terminal over and runs
+the command that matches how it was installed:
+
+| Installed as | Update runs |
+|---|---|
+| Arch package (`makepkg`) | rebuilds from the release's PKGBUILD with `makepkg -si` (your sudo password is typed in the terminal, never read by the app) |
+| pipx | `pipx upgrade commandertui` |
+| pip | `pip install --upgrade commandertui` |
+| git checkout | no button: the dialog tells you to `git pull` |
+
+Turn the check off with `commandertui --no-update-check` or by setting
+`COMMANDERTUI_NO_UPDATE_CHECK=1`. `COMMANDERTUI_FAKE_LATEST=9.9.9` shows the
+dialog without a real release, to see how it looks. The logic lives in one
+self-contained file, `commandertui/updater.py`, written to be copied into
+other apps.
+
 Inside **Compare**:
 
 | Key | Action |
@@ -167,7 +214,9 @@ commandertui/
 ├── trash.py               # 3-layer safe delete (send2trash / gio trash / manual)
 ├── executor.py             # runs an OperationQueue against the filesystem
 ├── bookmarks.py             # detected mounts (USB/SMB/rclone) + saved places
-├── theme.py                  # green/amber phosphor palettes
+├── netlocations.py           # SMB/SFTP/FTP locations via gio (list shares, mount, save)
+├── theme.py                  # phosphor green/amber themes + the stylesheet (Textual theme variables)
+├── settings.py               # saved settings (color theme)
 ├── boot.py                    # startup "modem" reveal animation
 ├── widgets.py                  # FilePanel: one pane's directory listing
 ├── modals.py                    # Confirm / Places / Input / Size / Message screens

{commandertui-1.1.0 → commandertui-1.3.0}/README.md

@@ -4,7 +4,7 @@ Dual-pane terminal file manager: compare two folders, sync them, or move
 files/folders between them (and to USB/SMB/any mounted path) — with a
 phosphor-green 80s-terminal look and a short modem-style boot animation.
 
-Status: **v1.1.0** — tests passing. MIT licensed.
+Status: **v1.3.0** — 119/119 tests passing. MIT licensed.
 
 ---
 
@@ -14,7 +14,7 @@ A safe, simple alternative to heavier dual-pane file managers. It was
 written after an earlier attempt of the same idea had to be scrapped for
 running an unauthenticated local HTTP server. This project deliberately:
 
-- **Never opens a network port.** Pure terminal UI (Textual), no HTTP server,
+- **Never opens a network port.** Pure terminal UI (Textual), no HTTP server (the only outgoing request is the daily update check, which you can turn off),
   no webview.
 - **Never does a raw `rm -rf`.** Deletes always go through the desktop trash
   (`send2trash` → `gio trash` → manual move into `~/.local/share/Trash`, in
@@ -40,13 +40,19 @@ makepkg -si
 
 Remove it with `sudo pacman -R commandertui`.
 
-**Other distros.** It is a regular Python package (Python 3.11+):
+**PyPI (Linux / macOS / WSL).** It is a standard package on [PyPI](https://pypi.org/project/commandertui/) (Python 3.11+). Recommended via `pipx`:
 
 ```bash
-pipx install git+https://github.com/juniorbarchini-oss/commandertui.git
+pipx install commandertui
 ```
 
-**macOS.** Same Python package (`pipx install ...` as above), plus
+Or inside an activated virtual environment:
+
+```bash
+pip install commandertui
+```
+
+**macOS.** Same Python package (`pipx install commandertui`), plus
 [kitty](https://sw.kovidgoyal.net/kitty/) for the standalone window. Places
 lists the volumes under `/Volumes` (system volumes such as Recovery and
 Preboot are hidden) and FUSE mounts inside your home folder. To get a
@@ -102,14 +108,20 @@ o.window("^commandertui$", { float = true, center = true, size = { 1174, 637 } }
 | `↑`/`↓`, `Enter` | Navigate, open directory |
 | `Backspace` | Go to parent directory |
 | `Space` | Mark/unmark item under cursor |
+| `F2` | Rename the item under the cursor (never overwrites an existing name) |
+| `F4` | Edit the file under the cursor with `$VISUAL` / `$EDITOR` (falls back to nano, vim or vi); CommanderTUI pauses and comes back when you close the editor |
 | `F5` | Copy marked (or item under cursor) to the other pane |
 | `F6` | Move marked to the other pane |
 | `F7` | Create a folder in the active pane |
 | `F8` / `Delete` | Delete marked (to trash) |
+| `/` | Filter the active pane by name (contains, ignores case) as you type; `Enter` keeps it, `Esc` clears it |
+| `+` / `-` / `*` | Mark / unmark by pattern (`*.iso`, or plain text = contains) / invert marks, over the rows shown |
+| `u` | Update: shows the pending new version (see *Updates*) |
 | `i` | Size: file/folder count and total bytes of marked items (background, `Esc` stops it) |
 | `h` | Show/hide hidden (dot) files in both panes |
-| `p` | Places: jump to a mounted drive (USB/SMB/rclone) or saved bookmark |
-| `c` | Compare: full recursive diff between the two panes' current folders |
+| `t` | Color theme: Phosphor green (default), Phosphor amber, Nord, Gruvbox, Dracula, Tokyo Night, Catppuccin Mocha, Solarized Dark, Monokai, Textual Dark. Previews as you move, Enter keeps it (saved in `~/.config/commandertui/settings.json`), Esc goes back |
+| `p` | Places: jump to a mounted drive (USB/SMB/rclone), saved bookmark or saved network location. Inside: `a` add a network location, `s` save the active pane's folder as a bookmark, `d` delete a saved one |
+| `c` | Compare: full recursive diff between the two panes' current folders, with size and date of both sides (and which is newer when a file changed) |
 | `r` | Refresh both panes |
 | `q` | Quit |
 
@@ -123,6 +135,41 @@ half-written), and a move never removes a source it didn't fully copy.
 on-demand mount point doesn't show), GVFS/Nautilus network shares, FUSE
 mounts inside `$HOME` (e.g. `rclone mount`), and saved bookmarks.
 
+**Network locations (Linux, needs `gio`/GVFS):** in Places press `a`, pick
+SMB, SFTP or FTP and type the server's IP or name. For SMB the app lists the
+shares on the server and you pick one; SFTP/FTP connect straight in. The
+location is saved in `~/.config/commandertui/network.json` (protocol, host
+and share only -- never a password) and reappears in Places, mounting itself
+when picked. If the server asks for a login, `gio` asks for it in the
+terminal and can remember it in the system keyring, exactly like Nautilus.
+
+Every key also has a clickable box on the bottom bar: one row on wide windows
+(168+ columns), two rows when narrower (120 columns is the practical minimum).
+The active pane has the thick border and the inverted path bar; each path bar
+shows the free space of that disk, and the marked count and total size.
+
+## Updates
+
+Once a day, in the background and only after the start-up animation, the app
+asks PyPI for the latest version (a plain GET, nothing about you is sent). If
+a newer one exists you get a dialog -- **Update now / Later / Skip this
+version** -- and the header keeps saying `update X available (press u)`.
+It never installs on its own. **Update now** hands the terminal over and runs
+the command that matches how it was installed:
+
+| Installed as | Update runs |
+|---|---|
+| Arch package (`makepkg`) | rebuilds from the release's PKGBUILD with `makepkg -si` (your sudo password is typed in the terminal, never read by the app) |
+| pipx | `pipx upgrade commandertui` |
+| pip | `pip install --upgrade commandertui` |
+| git checkout | no button: the dialog tells you to `git pull` |
+
+Turn the check off with `commandertui --no-update-check` or by setting
+`COMMANDERTUI_NO_UPDATE_CHECK=1`. `COMMANDERTUI_FAKE_LATEST=9.9.9` shows the
+dialog without a real release, to see how it looks. The logic lives in one
+self-contained file, `commandertui/updater.py`, written to be copied into
+other apps.
+
 Inside **Compare**:
 
 | Key | Action |
@@ -149,7 +196,9 @@ commandertui/
 ├── trash.py               # 3-layer safe delete (send2trash / gio trash / manual)
 ├── executor.py             # runs an OperationQueue against the filesystem
 ├── bookmarks.py             # detected mounts (USB/SMB/rclone) + saved places
-├── theme.py                  # green/amber phosphor palettes
+├── netlocations.py           # SMB/SFTP/FTP locations via gio (list shares, mount, save)
+├── theme.py                  # phosphor green/amber themes + the stylesheet (Textual theme variables)
+├── settings.py               # saved settings (color theme)
 ├── boot.py                    # startup "modem" reveal animation
 ├── widgets.py                  # FilePanel: one pane's directory listing
 ├── modals.py                    # Confirm / Places / Input / Size / Message screens

commandertui-1.3.0/commandertui/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.3.0"

commandertui-1.3.0/commandertui/app.py

@@ -0,0 +1,81 @@
+from __future__ import annotations
+
+import os
+
+from textual.app import App
+
+from . import settings, theme, updater
+from .boot import BootScreen
+from .main_screen import MainScreen
+
+
+class CommanderApp(App):
+    """Owns only the screen stack. All pane behavior lives in MainScreen --
+    see its docstring for why that split matters for key bindings.
+    """
+
+    CSS = theme.CSS
+
+    def __init__(
+        self, left_path: str | None = None, right_path: str | None = None, check_updates: bool = True
+    ) -> None:
+        super().__init__()
+        for phosphor in theme.PHOSPHOR_THEMES:
+            self.register_theme(phosphor)
+        saved = settings.load_theme()
+        self.theme = saved if saved in self.available_themes else theme.DEFAULT_THEME
+        self.check_updates = check_updates and not updater.updates_disabled()
+        self.update_info: updater.UpdateInfo | None = None
+        self.update_prompted = False
+        self.left_path = os.path.abspath(left_path or os.path.expanduser("~"))
+        self.right_path = os.path.abspath(right_path or os.path.expanduser("~"))
+
+    def on_unmount(self) -> None:
+        # Whatever theme is showing when the app closes is the one to reopen
+        # with -- covers the picker (t) and Textual's own palette (ctrl+p).
+        settings.save_theme(self.theme)
+
+    def preview_theme(self, name: str) -> None:
+        self.theme = name
+
+    def on_mount(self) -> None:
+        self.push_screen(MainScreen(self.left_path, self.right_path))
+        self.push_screen(BootScreen(), self._after_boot)
+
+    def _after_boot(self, _result=None) -> None:
+        # Looked up only once the boot animation is over, so a quick answer
+        # can never pop a dialog over it.
+        if self.check_updates:
+            self.run_worker(self._look_for_update, thread=True)
+
+    def _look_for_update(self) -> None:
+        info = updater.check()
+        if info:
+            self.call_from_thread(self.update_found, info)
+
+    def update_found(self, info: updater.UpdateInfo) -> None:
+        """Remember the newer version and say so in the header; the dialog
+        itself waits until the main screen is actually showing (not the boot
+        animation)."""
+        self.update_info = info
+        self.sub_title = f"update {info.latest} available (press u)"
+        if isinstance(self.screen, MainScreen):
+            self.screen.prompt_update()
+
+    def clear_update(self) -> None:
+        self.update_info = None
+        self.sub_title = ""
+
+    # Convenience passthroughs so existing tests/tools that poke at the app
+    # directly (e.g. app._panel("left")) keep working without knowing about
+    # the MainScreen split.
+    def _panel(self, side: str):
+        return self.main_screen._panel(side)
+
+    @property
+    def main_screen(self) -> MainScreen:
+        return next(s for s in self.screen_stack if isinstance(s, MainScreen))
+
+    @property
+    def active_side(self) -> str:
+        return self.main_screen.active_side

{commandertui-1.1.0 → commandertui-1.3.0}/commandertui/bookmarks.py

@@ -186,4 +186,7 @@ def remove_bookmark(path: str) -> None:
 
 def all_places() -> list[Place]:
     home = Place(label="Home", path=os.path.expanduser("~"), kind="home")
-    return [home] + detect_mounted() + detect_network_mounts() + detect_home_mounts() + load_saved()
+    from .netlocations import load_locations  # lazy: netlocations imports CONFIG_DIR from here
+
+    saved_net = [Place(label=loc.label, path=loc.uri, kind="net-saved") for loc in load_locations()]
+    return [home] + detect_mounted() + detect_network_mounts() + detect_home_mounts() + load_saved() + saved_net

{commandertui-1.1.0 → commandertui-1.3.0}/commandertui/cli.py

@@ -11,10 +11,15 @@ def main() -> None:
     parser = argparse.ArgumentParser(prog="commandertui", description="Dual-pane TUI file manager")
     parser.add_argument("left", nargs="?", default=os.path.expanduser("~"))
     parser.add_argument("right", nargs="?", default=os.path.expanduser("~"))
+    parser.add_argument(
+        "--no-update-check",
+        action="store_true",
+        help="never contact PyPI to look for a newer version",
+    )
     parser.add_argument("--version", action="version", version=f"commandertui {__version__}")
     args = parser.parse_args()
 
-    app = CommanderApp(left_path=args.left, right_path=args.right)
+    app = CommanderApp(left_path=args.left, right_path=args.right, check_updates=not args.no_update_check)
     app.run()
 
 

{commandertui-1.1.0 → commandertui-1.3.0}/commandertui/compare_screen.py

@@ -1,16 +1,20 @@
 from __future__ import annotations
 
+import threading
+import time
+
 from textual.app import ComposeResult
 from textual.binding import Binding
 from textual.containers import Vertical
 from textual.screen import Screen
-from textual.widgets import DataTable, Footer, Static
+from textual.widgets import DataTable, Static
 
 from .diff import compare
 from .modals import MessageScreen
-from .models import DiffStatus, OpKind, OpSide, OperationQueue, QueuedOp
+from .models import DiffEntry, DiffStatus, EntryKind, FileEntry, OpKind, OpSide, OperationQueue, QueuedOp
 from .plan import plan_mirror, plan_two_way, plan_update
 from .run_queue import run_queue_with_progress
+from .widgets import SPINNER_FRAMES, CompareBar, _format_bytes
 
 STATUS_LABEL = {
     DiffStatus.LEFT_ONLY: "< only left",
@@ -20,6 +24,23 @@ STATUS_LABEL = {
 }
 
 
+def side_info(entry: FileEntry | None) -> str:
+    """"1.2 MB  2026-10-20 14:03" for one side of a difference ("-" if absent)."""
+    if entry is None:
+        return "-"
+    when = time.strftime("%Y-%m-%d %H:%M", time.localtime(entry.mtime))
+    size = "<dir>" if entry.kind == EntryKind.DIR else _format_bytes(entry.size)
+    return f"{size}  {when}"
+
+
+def status_text(d: DiffEntry) -> str:
+    """Status label; for a changed file also says which side has the newer copy."""
+    label = STATUS_LABEL[d.status]
+    if d.status == DiffStatus.MODIFIED and d.left and d.right and d.left.mtime != d.right.mtime:
+        label += " (left newer)" if d.left.mtime > d.right.mtime else " (right newer)"
+    return label
+
+
 class CompareScreen(Screen):
     """Full recursive diff between the two panes' current directories, with
     bulk actions (mirror/update/two-way) or per-item manual handling.
@@ -41,51 +62,114 @@ class CompareScreen(Screen):
         self.left_root = left_root
         self.right_root = right_root
         self.manual_marks: set[str] = set()
+        self.diffs: list[DiffEntry] = []
+        self.scanning = False
+        self._cancel = threading.Event()
+        self._spinner = None
 
     def compose(self) -> ComposeResult:
         yield Static("", id="compare-summary")
         yield DataTable(id="compare-table", cursor_type="row")
-        yield Footer()
+        yield CompareBar()
 
     def on_mount(self) -> None:
         self.reload()
 
+    def _stop_spinner(self) -> None:
+        if self._spinner is not None:
+            self._spinner.stop()
+            self._spinner = None
+
     def reload(self) -> None:
-        self.diffs = compare(self.left_root, self.right_root)
+        """Compare in a worker thread (a big tree can take minutes), with a
+        spinner so the screen never looks frozen; Esc cancels."""
+        if self.scanning:
+            return
+        self.scanning = True
+        cancel = self._cancel = threading.Event()
+        summary = self.query_one("#compare-summary", Static)
+        started = time.monotonic()
+        frame = 0
+
+        def spin() -> None:
+            nonlocal frame
+            frame += 1
+            summary.update(
+                f"{self.left_root}  <->  {self.right_root}\n"
+                f"Comparing {SPINNER_FRAMES[frame % 4]}  {int(time.monotonic() - started)}s"
+                "   (Esc to cancel)"
+            )
+
+        spin()
+        self._spinner = self.set_interval(0.12, spin)
+
+        def work() -> None:
+            try:
+                diffs, error = compare(self.left_root, self.right_root, cancel_check=cancel.is_set), ""
+            except OSError as e:
+                diffs, error = [], str(e)
+            if not cancel.is_set():
+                self.app.call_from_thread(self._scan_done, diffs, error)
+
+        self.run_worker(work, thread=True)
+
+    def _scan_done(self, diffs: list[DiffEntry], error: str) -> None:
+        self._stop_spinner()
+        self.scanning = False
+        if error:
+            self.app.push_screen(MessageScreen(f"Could not compare:\n{error}"))
+        self.diffs = diffs
+        self._fill_table()
+
+    def _fill_table(self) -> None:
         table = self.query_one("#compare-table", DataTable)
         table.clear(columns=True)
-        table.add_columns(" ", "Path", "Status")
+        table.add_columns(" ", "Path", "Status", "Left (size, date)", "Right (size, date)")
         for d in self.diffs:
             if d.status == DiffStatus.IDENTICAL:
                 continue
             mark = "*" if d.rel_path in self.manual_marks else ""
-            table.add_row(mark, d.rel_path, STATUS_LABEL[d.status], key=d.rel_path)
+            table.add_row(
+                mark, d.rel_path, status_text(d), side_info(d.left), side_info(d.right), key=d.rel_path
+            )
 
         non_identical = sum(1 for d in self.diffs if d.status != DiffStatus.IDENTICAL)
         summary = self.query_one("#compare-summary", Static)
         summary.update(
             f"{self.left_root}  <->  {self.right_root}\n"
-            f"{non_identical} differences   "
-            "[m]irror  [u]pdate  [b]idirectional  [space] mark  [c]opy marked  [esc] back"
+            f"{non_identical} differences"
         )
 
     def action_back(self) -> None:
+        self._cancel.set()  # stops a running comparison; its late result is dropped
+        self._stop_spinner()
         self.dismiss()
 
+    def _busy(self) -> bool:
+        if self.scanning:
+            self.notify("Still comparing. Wait for it to finish, or press Esc to cancel.", severity="warning")
+        return self.scanning
+
     def _run_queue(self, title: str, queue: OperationQueue) -> None:
         run_queue_with_progress(
             self, title, queue, self.left_root, self.right_root, after=lambda report: self.reload()
         )
 
     def action_mirror(self) -> None:
+        if self._busy():
+            return
         active = [d for d in self.diffs if d.status != DiffStatus.IDENTICAL]
         self._run_queue("Mirror: make RIGHT identical to LEFT", plan_mirror(active))
 
     def action_update(self) -> None:
+        if self._busy():
+            return
         active = [d for d in self.diffs if d.status != DiffStatus.IDENTICAL]
         self._run_queue("Update: copy new/changed LEFT -> RIGHT (no deletes)", plan_update(active))
 
     def action_two_way(self) -> None:
+        if self._busy():
+            return
         active = [d for d in self.diffs if d.status != DiffStatus.IDENTICAL]
         queue, conflicts = plan_two_way(active)
         if conflicts:
@@ -99,6 +183,8 @@ class CompareScreen(Screen):
         self._run_queue("Two-way: propagate each side's exclusive changes", queue)
 
     def action_toggle_manual(self) -> None:
+        if self._busy():
+            return
         table = self.query_one("#compare-table", DataTable)
         if table.row_count == 0:
             return
@@ -110,9 +196,11 @@ class CompareScreen(Screen):
             self.manual_marks.discard(rel_path)
         else:
             self.manual_marks.add(rel_path)
-        self.reload()
+        self._fill_table()
 
     def action_copy_manual(self) -> None:
+        if self._busy():
+            return
         if not self.manual_marks:
             self.app.push_screen(MessageScreen("No items marked. Use [space] first."))
             return

commandertui-1.3.0/commandertui/editor.py

@@ -0,0 +1,26 @@
+"""Which text editor F4 opens: the user's own choice first."""
+
+from __future__ import annotations
+
+import os
+import shlex
+import shutil
+
+FALLBACKS = ("nano", "vim", "vi")
+
+
+def editor_command() -> list[str] | None:
+    """$VISUAL, then $EDITOR, then the first of nano/vim/vi that is installed."""
+    for var in ("VISUAL", "EDITOR"):
+        value = os.environ.get(var, "").strip()
+        if value:
+            try:
+                parts = shlex.split(value)
+            except ValueError:
+                continue
+            if parts and shutil.which(parts[0]):
+                return parts
+    for name in FALLBACKS:
+        if shutil.which(name):
+            return [name]
+    return None