gitdirector 1.5.0__tar.gz → 1.5.2__tar.gz

{gitdirector-1.5.0 → gitdirector-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gitdirector
-Version: 1.5.0
+Version: 1.5.2
 Summary: A terminal based control plane for developers working across multiple repositories. Launch multiple AI coding agents, multiple tmux sessions and track changes across all your repos in one place.
 Keywords: git,repository,manager,cli,synchronization,batch
 Author: Anito Anto
@@ -74,8 +74,9 @@ If you find GitDirector useful, please star this repository on GitHub, we need m
 | `gitdirector status`                         | Show repositories with staged/unstaged files           |
 | `gitdirector pull`                           | Pull latest changes for all tracked repositories       |
 | `gitdirector cd NAME`                        | Open or switch to a tmux session for a repository      |
-| `gitdirector autoclean links\|sessions`      | Clean broken links or stale tmux sessions              |
+| `gitdirector autoclean`                      | Remove broken repository links from tracking           |
 | `gitdirector info PATH\|NAME [--full]`       | Show file statistics for a repository                  |
+| `gitdirector gd-tmux PATH\|NAME "command"`   | Create a gd tmux session and run a command in it       |
 | `gitdirector help`                           | Show help                                              |
 
 ### link
@@ -175,6 +176,68 @@ Opens a [tmux](https://github.com/tmux/tmux) session rooted at the repository di
 > Debian/Ubuntu: `sudo apt install tmux`  
 > Arch: `sudo pacman -S tmux`
 
+### gd-tmux
+
+```bash
+gitdirector gd-tmux my-repo "npm test"
+gitdirector gd-tmux /path/to/my-repo "make build"
+gitdirector gd-tmux my-repo 'echo "hello world"'
+```
+
+Creates a new gd tmux session rooted at the given repository, runs the supplied command inside it, and attaches the session. The session is created using the same code path the TUI's **Launch AI agent** menu uses: it is a real `gd/{repo}/{command}/{N}` session, visible in the Sessions tab of `gitdirector console`, and it self-destructs when the command exits.
+
+- `PATH|NAME` — accept either an absolute path to a tracked repository or its basename, with the same disambiguation rules as `gitdirector unlink`.
+- `"command"` — the shell command to run inside the new session. Pass it quoted so the shell hands the whole string to gitdirector; quotes and arguments are preserved verbatim.
+
+The command is the same as opening the repo in the console, picking **Launch AI agent** from the action menu, and entering the command — but you can do it from any shell without entering the TUI first. The new session shows up in the Sessions tab immediately.
+
+### autoclean
+
+```bash
+gitdirector autoclean
+```
+
+Scans the tracked repositories in `~/.gitdirector/config.yaml` for paths that no longer exist on disk and removes them from the config. Lists any broken links for review and asks for confirmation before deleting them.
+
+## Note for AI coding agents
+
+If you are an AI coding agent reading this project: when the user asks you to run a long-lived process inside a tracked repository — a dev server, a frontend bundler, a backend API, a watcher, a database, a test runner with a long timeout, or anything else that does not exit on its own — **do not run it in the foreground**. A foreground process will block your shell for the rest of the session and the user will not be able to interact with you.
+
+Use `gitdirector gd-tmux` to launch the process in a detached gd tmux session that the user can monitor and tear down themselves. The session shows up in the Sessions tab of `gitdirector console`, auto-cleans up when the process exits, and supports path-or-name lookup the same way every other gitdirector command does.
+
+**Always prefer the absolute path over the repo name.** The by-name lookup matches the *directory name on disk* verbatim (via `Path.name`) — case-sensitive, dots and spaces included — and is ambiguous if two tracked repos share the same basename. When in doubt, look up the path with `gitdirector list` and use the absolute path. Quoting a path is fine; an absolute path is never ambiguous.
+
+Examples:
+
+```bash
+# Frontend dev server in the user's web repo — use the absolute path
+gitdirector gd-tmux /Users/me/projects/webapp "npm run dev"
+
+# Backend API in the api repo
+gitdirector gd-tmux /Users/me/projects/api "uvicorn app.main:app --reload --port 8000"
+
+# A long-running integration test with output captured to a log
+gitdirector gd-tmux /Users/me/projects/myrepo "pytest -x -v 2>&1 | tee /tmp/test.log"
+
+# A watcher or build loop
+gitdirector gd-tmux /Users/me/projects/myrepo "npm run watch"
+
+# A repo whose directory name contains a space — quote both the path and the command
+gitdirector gd-tmux "/Users/me/projects/My Repo" "npm run dev"
+```
+
+The by-name form is supported for ergonomic use by humans in interactive shells, but agents should default to the absolute path to avoid any chance of matching the wrong repo.
+
+Rules of thumb:
+
+- **Use the absolute path.** It is unambiguous and survives the user renaming or moving the directory. The by-name form is convenient shorthand, not a slug — it is the raw directory name, case-sensitive.
+- **Repo names with spaces, dots, or punctuation are matched verbatim** when you do use the by-name form. A repo at `/Users/me/My Repo` is matched by `"My Repo"`, not by `My` or `Repo`. Quote the name to keep the shell from splitting it.
+- **Quoting the command matters.** The command string is handed to `sh -lc` inside the new session, so write it as a single quoted string. `'echo "hi"'` (single-quote outer, double-quote inner) is the safest pattern for embedded double quotes.
+- **Path separators in the command are fine.** Commands like `python /path/to/script.py` or `find . -name foo/bar` work; the command is embedded verbatim into the inner shell, while the session-name label is auto-sanitized.
+- **The session self-destructs** when the command exits (success or failure), so you do not need to clean it up.
+- **If you need to capture output**, redirect it to a file in the command itself (`> /tmp/out 2>&1`) and read the file later — the session is gone once the command exits.
+- **If the user asks you to stop a running process**, kill the matching session: `gitdirector console` → Sessions tab, or directly with `tmux kill-session -t =<session-name>`.
+
 ## Configuration
 
 Config is stored at `~/.gitdirector/config.yaml`.

{gitdirector-1.5.0 → gitdirector-1.5.2}/README.md

@@ -31,8 +31,9 @@ If you find GitDirector useful, please star this repository on GitHub, we need m
 | `gitdirector status`                         | Show repositories with staged/unstaged files           |
 | `gitdirector pull`                           | Pull latest changes for all tracked repositories       |
 | `gitdirector cd NAME`                        | Open or switch to a tmux session for a repository      |
-| `gitdirector autoclean links\|sessions`      | Clean broken links or stale tmux sessions              |
+| `gitdirector autoclean`                      | Remove broken repository links from tracking           |
 | `gitdirector info PATH\|NAME [--full]`       | Show file statistics for a repository                  |
+| `gitdirector gd-tmux PATH\|NAME "command"`   | Create a gd tmux session and run a command in it       |
 | `gitdirector help`                           | Show help                                              |
 
 ### link
@@ -132,6 +133,68 @@ Opens a [tmux](https://github.com/tmux/tmux) session rooted at the repository di
 > Debian/Ubuntu: `sudo apt install tmux`  
 > Arch: `sudo pacman -S tmux`
 
+### gd-tmux
+
+```bash
+gitdirector gd-tmux my-repo "npm test"
+gitdirector gd-tmux /path/to/my-repo "make build"
+gitdirector gd-tmux my-repo 'echo "hello world"'
+```
+
+Creates a new gd tmux session rooted at the given repository, runs the supplied command inside it, and attaches the session. The session is created using the same code path the TUI's **Launch AI agent** menu uses: it is a real `gd/{repo}/{command}/{N}` session, visible in the Sessions tab of `gitdirector console`, and it self-destructs when the command exits.
+
+- `PATH|NAME` — accept either an absolute path to a tracked repository or its basename, with the same disambiguation rules as `gitdirector unlink`.
+- `"command"` — the shell command to run inside the new session. Pass it quoted so the shell hands the whole string to gitdirector; quotes and arguments are preserved verbatim.
+
+The command is the same as opening the repo in the console, picking **Launch AI agent** from the action menu, and entering the command — but you can do it from any shell without entering the TUI first. The new session shows up in the Sessions tab immediately.
+
+### autoclean
+
+```bash
+gitdirector autoclean
+```
+
+Scans the tracked repositories in `~/.gitdirector/config.yaml` for paths that no longer exist on disk and removes them from the config. Lists any broken links for review and asks for confirmation before deleting them.
+
+## Note for AI coding agents
+
+If you are an AI coding agent reading this project: when the user asks you to run a long-lived process inside a tracked repository — a dev server, a frontend bundler, a backend API, a watcher, a database, a test runner with a long timeout, or anything else that does not exit on its own — **do not run it in the foreground**. A foreground process will block your shell for the rest of the session and the user will not be able to interact with you.
+
+Use `gitdirector gd-tmux` to launch the process in a detached gd tmux session that the user can monitor and tear down themselves. The session shows up in the Sessions tab of `gitdirector console`, auto-cleans up when the process exits, and supports path-or-name lookup the same way every other gitdirector command does.
+
+**Always prefer the absolute path over the repo name.** The by-name lookup matches the *directory name on disk* verbatim (via `Path.name`) — case-sensitive, dots and spaces included — and is ambiguous if two tracked repos share the same basename. When in doubt, look up the path with `gitdirector list` and use the absolute path. Quoting a path is fine; an absolute path is never ambiguous.
+
+Examples:
+
+```bash
+# Frontend dev server in the user's web repo — use the absolute path
+gitdirector gd-tmux /Users/me/projects/webapp "npm run dev"
+
+# Backend API in the api repo
+gitdirector gd-tmux /Users/me/projects/api "uvicorn app.main:app --reload --port 8000"
+
+# A long-running integration test with output captured to a log
+gitdirector gd-tmux /Users/me/projects/myrepo "pytest -x -v 2>&1 | tee /tmp/test.log"
+
+# A watcher or build loop
+gitdirector gd-tmux /Users/me/projects/myrepo "npm run watch"
+
+# A repo whose directory name contains a space — quote both the path and the command
+gitdirector gd-tmux "/Users/me/projects/My Repo" "npm run dev"
+```
+
+The by-name form is supported for ergonomic use by humans in interactive shells, but agents should default to the absolute path to avoid any chance of matching the wrong repo.
+
+Rules of thumb:
+
+- **Use the absolute path.** It is unambiguous and survives the user renaming or moving the directory. The by-name form is convenient shorthand, not a slug — it is the raw directory name, case-sensitive.
+- **Repo names with spaces, dots, or punctuation are matched verbatim** when you do use the by-name form. A repo at `/Users/me/My Repo` is matched by `"My Repo"`, not by `My` or `Repo`. Quote the name to keep the shell from splitting it.
+- **Quoting the command matters.** The command string is handed to `sh -lc` inside the new session, so write it as a single quoted string. `'echo "hi"'` (single-quote outer, double-quote inner) is the safest pattern for embedded double quotes.
+- **Path separators in the command are fine.** Commands like `python /path/to/script.py` or `find . -name foo/bar` work; the command is embedded verbatim into the inner shell, while the session-name label is auto-sanitized.
+- **The session self-destructs** when the command exits (success or failure), so you do not need to clean it up.
+- **If you need to capture output**, redirect it to a file in the command itself (`> /tmp/out 2>&1`) and read the file later — the session is gone once the command exits.
+- **If the user asks you to stop a running process**, kill the matching session: `gitdirector console` → Sessions tab, or directly with `tmux kill-session -t =<session-name>`.
+
 ## Configuration
 
 Config is stored at `~/.gitdirector/config.yaml`.

{gitdirector-1.5.0 → gitdirector-1.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "gitdirector"
-version = "1.5.0"
+version = "1.5.2"
 description = "A terminal based control plane for developers working across multiple repositories. Launch multiple AI coding agents, multiple tmux sessions and track changes across all your repos in one place."
 readme = "README.md"
 license = { text = "MIT" }

{gitdirector-1.5.0 → gitdirector-1.5.2}/src/gitdirector/cli.py

@@ -10,6 +10,7 @@ from .commands import (
     autoclean,
     cd,
     console,
+    gd_tmux,
     help,
     info,
     link,
@@ -55,6 +56,7 @@ help.register(cli)
 tui.register(cli)
 autoclean.register(cli)
 info.register(cli)
+gd_tmux.register(cli)
 
 
 def main():

gitdirector-1.5.2/src/gitdirector/commands/autoclean.py

@@ -0,0 +1,39 @@
+import click
+
+from ..config import Config
+from . import console
+
+
+def register(cli: click.Group):
+    @cli.command()
+    def autoclean():
+        _autoclean_links()
+
+
+def _autoclean_links():
+    config = Config()
+    broken = [p for p in config.repositories if not p.exists()]
+
+    if not broken:
+        console.print()
+        console.print("  [green]All links are valid.[/green]")
+        console.print()
+        return
+
+    console.print()
+    console.print(f"  Found [yellow]{len(broken)}[/yellow] broken link(s):\n")
+    for p in broken:
+        console.print(f"  [red]✕[/red] {p}", soft_wrap=True)
+    console.print()
+
+    if not click.confirm("  Remove these broken links?"):
+        console.print()
+        console.print("  [dim]Cancelled.[/dim]")
+        console.print()
+        return
+
+    config.remove_repositories(broken)
+
+    console.print()
+    console.print(f"  [green]Removed {len(broken)} broken link(s).[/green]")
+    console.print()

gitdirector-1.5.2/src/gitdirector/commands/gd_tmux.py

@@ -0,0 +1,79 @@
+from pathlib import Path
+
+import click
+
+from ..manager import RepositoryManager
+from ..storage import normalize_repository_path
+from . import console
+
+
+def _resolve_repo(target: str) -> Path | None:
+    """Resolve *target* to a tracked repository path.
+
+    Tries the value as a filesystem path first. If no path-based match is
+    found and the value does not look path-like, falls back to looking it up
+    by repository name. Prints a rich error and returns ``None`` on missing
+    or ambiguous targets.
+    """
+    manager = RepositoryManager()
+    candidate = Path(target)
+    is_path_like = (
+        "/" in target
+        or "\\" in target
+        or target in (".", "..")
+        or candidate.is_absolute()
+        or target.startswith("~")
+        or candidate.exists()
+    )
+
+    if is_path_like:
+        normalized = normalize_repository_path(candidate)
+        if manager.config.has_repository(normalized):
+            return normalized
+        console.print(f"\n  [red]No tracked repository at path: {normalized}[/red]\n")
+        return None
+
+    matches = [r for r in manager.config.repositories if r.name == target]
+    if not matches:
+        console.print(f"\n  [red]No tracked repository named: {target}[/red]\n")
+        return None
+    if len(matches) > 1:
+        paths_list = "\n".join(f"  {p}" for p in matches)
+        console.print(
+            f"\n  [red]Multiple repositories named '{target}' — use the full path:[/red]\n"
+            f"{paths_list}\n"
+        )
+        return None
+    return matches[0]
+
+
+def register(cli: click.Group):
+    @cli.command()
+    @click.argument("target", metavar="PATH|NAME")
+    @click.argument("command")
+    def gd_tmux(target: str, command: str):
+        """Create a gd tmux session for a repository and run a command in it."""
+        if not command.strip():
+            console.print("\n  [red]Command must not be empty.[/red]\n")
+            raise SystemExit(1)
+
+        repo_path = _resolve_repo(target)
+        if repo_path is None:
+            raise SystemExit(1)
+
+        try:
+            from ..integrations.tmux import (
+                attach_tmux_session,
+                create_tmux_session,
+                launch_command_in_tmux_session,
+            )
+        except ImportError:
+            console.print(
+                "\n  [red]The tmux integration is unavailable for the gd-tmux command.[/red]\n"
+                "  Reinstall gitdirector or check your installation.\n"
+            )
+            raise SystemExit(1)
+
+        session_name = create_tmux_session(repo_path.name, repo_path, purpose=command)
+        launch_command_in_tmux_session(session_name, command)
+        attach_tmux_session(session_name, skip_config_sync=True)

{gitdirector-1.5.0 → gitdirector-1.5.2}/src/gitdirector/commands/help.py

@@ -32,8 +32,9 @@ def show_help():
         ("pull", "Pull latest changes for all tracked repositories"),
         ("cd NAME", "Open or switch to a tmux session for a repository"),
         ("console", "Interactive TUI for browsing and opening repositories"),
-        ("autoclean links|sessions", "Clean broken links or stale tmux sessions"),
+        ("autoclean", "Remove broken repository links from tracking"),
         ("info PATH|NAME [--full]", "Show file statistics for a repository"),
+        ('gd-tmux PATH|NAME "cmd"', "Create a gd tmux session and run a command in it"),
         ("help", "Show this help message"),
     ]:
         cmd_table.add_row(cmd, desc)

{gitdirector-1.5.0 → gitdirector-1.5.2}/src/gitdirector/commands/tui/app.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import logging
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 from typing import Callable
@@ -55,6 +56,9 @@ __all__ = [
 ]
 
 
+logger = logging.getLogger(__name__)
+
+
 class GitDirectorConsole(
     ConsolePanelsMixin,
     ConsoleSessionsMixin,
@@ -355,13 +359,13 @@ class GitDirectorConsole(
         if path is None:
             return
 
-        from ...integrations.tmux import create_tmux_session, launch_agent_in_tmux_session
+        from ...integrations.tmux import create_tmux_session, launch_command_in_tmux_session
 
         purpose = agent_cmd if agent_cmd else "shell"
         session_name = create_tmux_session(path.name, path, purpose=purpose)
 
         if agent_cmd:
-            ready_marker = launch_agent_in_tmux_session(session_name, agent_cmd)
+            ready_marker = launch_command_in_tmux_session(session_name, agent_cmd)
             self.push_screen(
                 AgentLoadingScreen(agent_cmd, session_name, ready_marker),
                 callback=lambda _: self.set_timer(0.2, lambda: self._refresh_repo_for_path(path)),
@@ -657,10 +661,27 @@ class GitDirectorConsole(
 
         from ..pull import pull_repository
 
-        result = pull_repository(path)
+        try:
+            result = pull_repository(path)
+        except Exception as exc:
+            logger.exception("pull worker crashed")
+            error_result = (path.name, False, f"Pull failed: {exc}")
+            if self._background_shutdown_requested(worker):
+                return
+            try:
+                self.call_from_thread(
+                    self._show_pull_result, loading_screen, path, command, error_result
+                )
+            except Exception:
+                logger.debug("Failed to post pull error to UI", exc_info=True)
+            return
+
         if self._background_shutdown_requested(worker):
             return
-        self.call_from_thread(self._show_pull_result, loading_screen, path, command, result)
+        try:
+            self.call_from_thread(self._show_pull_result, loading_screen, path, command, result)
+        except Exception:
+            logger.debug("Failed to post pull result to UI", exc_info=True)
 
     def _show_pull_result(
         self,

{gitdirector-1.5.0 → gitdirector-1.5.2}/src/gitdirector/commands/tui/diff_renderer.py

@@ -218,6 +218,7 @@ class ChangedFile:
     additions: int = 0
     deletions: int = 0
     is_binary: bool = False
+    is_image: bool = False
     is_rename: bool = False
     old_path: str | None = None
     diff_text: str = ""
@@ -263,6 +264,35 @@ _RENAME_TO_RE = re.compile(r"^rename to (.+)$")
 _BINARY_RE = re.compile(r"^Binary files .* differ$")
 _HUNK_HEADER_RE = re.compile(r"^@@\s+-\d+(?:,\d+)?\s+\+\d+(?:,\d+)?\s+@@")
 
+_IMAGE_EXTENSIONS: frozenset[str] = frozenset(
+    {
+        ".png",
+        ".jpg",
+        ".jpeg",
+        ".gif",
+        ".bmp",
+        ".ico",
+        ".webp",
+        ".tiff",
+        ".tif",
+    }
+)
+
+
+def is_image_file(path: str) -> bool:
+    """Return ``True`` if ``path`` has a raster-image extension.
+
+    Used to decide whether the diff viewer should suppress the right-hand
+    diff/preview pane entirely for a file. SVG is intentionally excluded
+    because it's text-based and the regular diff renderer handles it fine.
+    """
+    if not path:
+        return False
+    name = PurePosixPath(path).name.lower()
+    if "." not in name:
+        return False
+    return "." + name.rsplit(".", 1)[1] in _IMAGE_EXTENSIONS
+
 
 def _parse_hunk_start(header: str) -> tuple[int, int]:
     """Return ``(old_start, new_start)`` from an ``@@`` hunk header."""
@@ -373,6 +403,7 @@ def parse_diff_files(diff_text: str) -> list[ChangedFile]:
                 additions=current.additions,
                 deletions=current.deletions,
                 is_binary=current.is_binary,
+                is_image=current.is_image,
                 is_rename=current.is_rename,
                 old_path=current.old_path,
                 diff_text="\n".join(current_lines).rstrip("\n"),
@@ -399,6 +430,7 @@ def parse_diff_files(diff_text: str) -> list[ChangedFile]:
                 path=new_name,
                 status="M",
                 is_rename=is_rename,
+                is_image=is_image_file(new_name),
                 old_path=old_name if is_rename else None,
             )
             current_lines = [raw_line]
@@ -469,6 +501,7 @@ def build_diff_bundle(diff_text: str, untracked_paths: list[str], untracked_look
                 path=rel_path,
                 status="?",
                 additions=line_count,
+                is_image=is_image_file(rel_path),
                 diff_text=synthetic.rstrip("\n"),
                 raw_untracked_text=text,
             )
@@ -512,6 +545,9 @@ def render_change_summary(
     if file.is_binary:
         text.append("  ")
         text.append("[binary]", style="dim")
+    elif file.is_image:
+        text.append("  ")
+        text.append("[image]", style="dim")
     elif file.additions or file.deletions:
         text.append("  ")
         text.append(f"+{file.additions}", style="#3fb950")
@@ -539,9 +575,12 @@ def render_file_diff(
 
     pieces.append(_render_file_header(file))
 
+    if file.is_image:
+        return Group(*pieces)
+
     if file.is_binary:
         body = RichText(
-            "\n  Binary file differs from HEAD.\n" "  Diff is not shown for binary files.\n",
+            "\n  Binary file differs from HEAD.\n  Diff is not shown for binary files.\n",
             style="italic dim",
         )
         pieces.append(Padding(body, (1, 2)))

{gitdirector-1.5.0 → gitdirector-1.5.2}/src/gitdirector/commands/tui/screens/_shared.py

@@ -10,6 +10,7 @@ from textual.widgets import OptionList, Static
 from textual.widgets.option_list import Option
 
 from ..constants import _MODAL_BINDINGS, _MODAL_CSS, _SORT_COLUMN_NAMES
+from ..terminal_caps import strip_unsupported_css as _safe_css
 
 
 def _render_ansi_output(output: str) -> Text:
@@ -21,7 +22,7 @@ class ConfirmScreen(ModalScreen[bool]):
 
     BINDINGS = _MODAL_BINDINGS
 
-    CSS = (
+    CSS = _safe_css(
         "ConfirmScreen { align: center middle; background: $panel 80%; hatch: right $primary 30%; }"
         + _MODAL_CSS
     )
@@ -61,7 +62,7 @@ class SortMenuScreen(ModalScreen[tuple | None]):
 
     BINDINGS = _MODAL_BINDINGS
 
-    CSS = (
+    CSS = _safe_css(
         "SortMenuScreen {"
         " align: center middle; background: $panel 80%; hatch: right $primary 30%;"
         " }" + _MODAL_CSS

{gitdirector-1.5.0 → gitdirector-1.5.2}/src/gitdirector/commands/tui/screens/commit.py

@@ -33,6 +33,7 @@ from textual.widgets import Input, LoadingIndicator, OptionList, Static
 from textual.widgets.option_list import Option
 
 from ..constants import _MODAL_BINDINGS, _MODAL_CSS
+from ..terminal_caps import strip_unsupported_css as _safe_css
 
 # ---------------------------------------------------------------------------
 # Stage-all confirm
@@ -52,7 +53,7 @@ class StageFilesConfirmScreen(ModalScreen[bool]):
 
     BINDINGS = _MODAL_BINDINGS
 
-    CSS = (
+    CSS = _safe_css(
         "StageFilesConfirmScreen {"
         " align: center middle; background: $panel 80%; hatch: right $primary 30%;"
         " }" + _MODAL_CSS
@@ -86,7 +87,7 @@ class StageFilesConfirmScreen(ModalScreen[bool]):
                 id="action-menu",
             )
             yield Static(
-                "[green]+N[/green] additions  [red]-N[/red] deletions  " "\u00b7  esc to cancel",
+                "[green]+N[/green] additions  [red]-N[/red] deletions  \u00b7  esc to cancel",
                 id="menu-hint",
             )
 
@@ -142,10 +143,12 @@ class CommitMessageScreen(ModalScreen[Optional[tuple[str, bool]]]):
         Binding("up", "action_cursor_up", "\u2191 action", show=False),
     ]
 
-    CSS = (
+    CSS = _safe_css(
         "CommitMessageScreen {"
         " align: center middle; background: $panel 80%; hatch: right $primary 30%;"
-        " }" + _MODAL_CSS + """
+        " }"
+        + _MODAL_CSS
+        + """
         #commit-message-container {
             width: 60%;
             height: auto;
@@ -202,8 +205,7 @@ class CommitMessageScreen(ModalScreen[Optional[tuple[str, bool]]]):
         noun = "file" if self.file_count == 1 else "files"
         with Vertical(id="commit-message-container"):
             yield Static(
-                f"[bold white]Commit changes in[/bold white] "
-                f"[cyan]{escape(self.repo_name)}[/cyan]",
+                f"[bold white]Commit changes in[/bold white] [cyan]{escape(self.repo_name)}[/cyan]",
                 id="commit-message-title",
             )
             yield Static(
@@ -222,10 +224,7 @@ class CommitMessageScreen(ModalScreen[Optional[tuple[str, bool]]]):
                 id="commit-message-action-list",
             )
             yield Static(
-                "type message    "
-                "[\u2191\u2193] pick action    "
-                "[enter] confirm    "
-                "[esc] cancel",
+                "type message    [\u2191\u2193] pick action    [enter] confirm    [esc] cancel",
                 id="commit-message-hint",
             )
 
@@ -304,10 +303,12 @@ class CommitLoadingScreen(ModalScreen[None]):
 
     BINDINGS = [Binding("escape", "noop", "Esc", show=False)]
 
-    CSS = (
+    CSS = _safe_css(
         "CommitLoadingScreen {"
         " align: center middle; background: $panel 80%; hatch: right $primary 30%;"
-        " }" + _MODAL_CSS + """
+        " }"
+        + _MODAL_CSS
+        + """
         #commit-loading-container {
             width: 50%;
             height: auto;
@@ -368,10 +369,12 @@ class CommitResultScreen(ModalScreen[None]):
 
     BINDINGS = _MODAL_BINDINGS
 
-    CSS = (
+    CSS = _safe_css(
         "CommitResultScreen {"
         " align: center middle; background: $panel 80%; hatch: right $primary 30%;"
-        " }" + _MODAL_CSS + """
+        " }"
+        + _MODAL_CSS
+        + """
         #commit-result-container {
             width: 60%;
             height: auto;

{gitdirector-1.5.0 → gitdirector-1.5.2}/src/gitdirector/commands/tui/screens/diff_files.py

@@ -353,6 +353,9 @@ class FileTile(Static):
         if self._spec.file.is_binary:
             text.append("[binary]", style="#8b949e")
             return text
+        if self._spec.file.is_image:
+            text.append("[image]", style="#8b949e")
+            return text
         additions = self._spec.file.additions
         deletions = self._spec.file.deletions
         text.append(f"+{additions}", style="bold #3fb950")
@@ -445,6 +448,9 @@ class FileTileList(ListView):
         super().__init__(**kwargs)
         self._specs: list[_FileTileSpec] = []
         self._repo_dir: str = ""
+        self._pending_index: int | None = None
+        self._pending_retry_count = 0
+        self._PENDING_RETRY_LIMIT = 50
 
     def set_files(self, files: list[ChangedFile], repo_dir: str = "") -> None:
         self._repo_dir = repo_dir
@@ -455,19 +461,28 @@ class FileTileList(ListView):
             tile = FileTile(spec)
             self.append(ListItem(tile, id=f"file-tile-{id(tile)}"))
         if self._specs:
-            # The ListItem children mount asynchronously, so we set the
-            # initial index via a deferred call. Trying to set ``index``
-            # now would fire ``watch_index`` against half-mounted children
-            # and crash with NoMatches.
             self._suppress_watch = True
             self._pending_index = 0
+            self._pending_retry_count = 0
             self.call_after_refresh(self._apply_initial_selection)
+        else:
+            self._suppress_watch = False
+            self._pending_index = None
 
     def _apply_initial_selection(self) -> None:
-        pending = getattr(self, "_pending_index", None)
+        pending = self._pending_index
         if pending is None:
             return
+        if len(self._nodes) <= pending:
+            self._pending_retry_count += 1
+            if self._pending_retry_count > self._PENDING_RETRY_LIMIT:
+                self._pending_index = None
+                self._suppress_watch = False
+                return
+            self.call_after_refresh(self._apply_initial_selection)
+            return
         self._pending_index = None
+        self._pending_retry_count = 0
         self._suppress_watch = False
         self.index = pending