gitdirector 1.7.0__tar.gz → 1.7.2__tar.gz

{gitdirector-1.7.0 → gitdirector-1.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gitdirector
-Version: 1.7.0
+Version: 1.7.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,6 +74,7 @@ If you find GitDirector useful, please star this repository on GitHub, we need m
 | `gitdirector pull [--yes]`                                 | Pull latest changes for all tracked repositories       |
 | `gitdirector cd NAME`                                      | Open or switch to a tmux session for a repository      |
 | `gitdirector autoclean`                                    | Remove broken repository links from tracking           |
+| `gitdirector reset [--yes]`                                | Kill all sessions and panels, wipe ~/.gitdirector, and recreate the config |
 | `gitdirector info PATH\|NAME [--full]`                     | Show file statistics for a repository                  |
 | `gitdirector gd-tmux PATH\|NAME "command" [--description TEXT]` | Create a gd tmux session and run a command in it       |
 | `gitdirector gd-capture SESSION [--lines N] [--full]`      | Print the scrollback of a live gd tmux session         |
@@ -104,17 +105,17 @@ Features:
 - `/` to filter the active tab
 - `s` to sort the active table
 - `i` to show repository info (file count, lines, tokens, max depth, top file types)
-- `g` on the Repositories tab to open Git operations: status, timeline, branches, remotes, pull, and push
+- `g` on the Repositories tab to open Git operations: status, timeline, branches, remotes, pull, push, and a **Diff Viewer** section with **Review Diff** for uncommitted changes
 - `r` to refresh all statuses
 - Press `enter` on any repository to open an action menu:
     - **New tmux session** — create and attach a session for the repository
-    - **Review Diff** — open a two-pane viewer for uncommitted changes (left: file list with GitHub-style status pills and +/- counts; right: per-file unified diff with GitHub-dark syntax highlighting, line numbers, and green/red backgrounds for added/removed lines). Navigate files with `j`/`k`, `n`/`p`, `g`/`G`, or `]`/`[`. Switch the focused panel with `tab`. `r` refreshes, `esc` closes.
     - **Attach existing session** — switch to any already-running tmux session
     - **Launch AI agent** — open OpenCode, Claude Code, GitHub Copilot, Codex, or Pi in a new tmux session
     - **Remove session** — kill a running tmux session
+- **Review Diff** (from the `g` Git menu) — open a two-pane viewer for uncommitted changes (left: file list with GitHub-style status pills and +/- counts; right: per-file unified diff with GitHub-dark syntax highlighting, line numbers, and green/red backgrounds for added/removed lines). Navigate files with `j`/`k`, `n`/`p`, `g`/`G`, or `]`/`[`. Switch the focused panel with `tab`. `r` refreshes, `esc` closes.
 - **Repository groups** appear directly in the Repositories tab when linked repositories share the same parent directory. Group rows can be expanded/collapsed with `space`; press `enter` on a group to start, attach, remove, or launch AI-agent sessions rooted at that parent directory.
 - **Sessions tab** (press `2`) lists every active `gd/*` tmux session with its status, purpose, repository, **description**, and full session name. The description column is free-form text stored on the session (default `"-"`), with a width that scales to your terminal and wraps long text. Highlight a row and press `d` to edit its description.
-- **Panels tab** (press `3`) manages reusable tmux panel layouts. Press `n` to create a panel, or `enter` on a panel to open, reconfigure, rename, or delete it.
+- **Panels tab** (press `3`) manages reusable tmux panel layouts. Press `n` to create a panel, or `enter` on a panel to open, reconfigure, rename, or delete it. Inside a panel you can **drag with the mouse to select text and copy it to the OS clipboard** on release; pressing `y` copies the entire visible pane as a fallback. GitDirector prefers native clipboard tools such as `pbcopy`, `wl-copy`, `xclip`, `xsel`, or `clip.exe`, and falls back to OSC 52 when needed.
 
 ### unlink
 
@@ -223,6 +224,15 @@ 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.
 
+### reset
+
+```bash
+gitdirector reset          # asks for confirmation
+gitdirector reset --yes    # skip the confirmation prompt
+```
+
+Destructive cleanup. Kills every `gd/*` tmux session (regular sessions and panels), wipes the entire `~/.gitdirector/` directory, and recreates an empty `config.yaml` with defaults. Useful when the local state is corrupted or you want to start fresh — all linked repositories, panel layouts, version-check cache, and tmux theme files are removed in one step.
+
 ### gd-capture
 
 ```bash
@@ -263,7 +273,7 @@ If you are an AI coding agent (Claude Code, OpenCode, GitHub Copilot, Codex, Pi,
 
 ## Configuration
 
-Config is stored at `~/.gitdirector/config.yaml`.
+Main config is stored at `~/.gitdirector/config.yaml`:
 
 ```yaml
 repositories:
@@ -271,6 +281,11 @@ repositories:
     - /path/to/repo2
 max_workers: 10 # optional, valid range 1-32, default 10
 theme: rose-pine # optional, default rose-pine
+```
+
+Secrets (GitHub credentials) are stored in a separate file at `~/.gitdirector/secrets.yaml`:
+
+```yaml
 github_username: your-github-username # optional
 github_PAT: github_pat_or_classic_pat # optional
 ```
@@ -281,7 +296,7 @@ GitDirector first runs git commands using your normal local git credentials. If
 
 - This only applies to HTTPS GitHub remotes.
 - SSH remotes still use your normal SSH key/agent setup.
-- The PAT is stored in plaintext in `~/.gitdirector/config.yaml`; use an appropriately scoped token and protect that file.
+- The PAT is stored in plaintext in `~/.gitdirector/secrets.yaml`; use an appropriately scoped token and protect that file.
 - The PAT is not passed on the command line or shown in TUI command output.
 
 ### Available Themes
@@ -304,6 +319,12 @@ eval "$(gitdirector completion zsh)"
 gitdirector completion fish | source
 ```
 
+The `zsh` script auto-loads `compinit` if `compdef` is not yet available, so the `eval` form works in fresh shells. For the fastest setup (no subprocess on every `TAB`), write the script to a file in your `$fpath` (commonly `~/.zsh/completions/_gitdirector`) and let `compinit` autoload it:
+
+```bash
+gitdirector completion zsh > "${fpath[1]}/_gitdirector"
+```
+
 ## License
 
 MIT

{gitdirector-1.7.0 → gitdirector-1.7.2}/README.md

@@ -32,6 +32,7 @@ If you find GitDirector useful, please star this repository on GitHub, we need m
 | `gitdirector pull [--yes]`                                 | Pull latest changes for all tracked repositories       |
 | `gitdirector cd NAME`                                      | Open or switch to a tmux session for a repository      |
 | `gitdirector autoclean`                                    | Remove broken repository links from tracking           |
+| `gitdirector reset [--yes]`                                | Kill all sessions and panels, wipe ~/.gitdirector, and recreate the config |
 | `gitdirector info PATH\|NAME [--full]`                     | Show file statistics for a repository                  |
 | `gitdirector gd-tmux PATH\|NAME "command" [--description TEXT]` | Create a gd tmux session and run a command in it       |
 | `gitdirector gd-capture SESSION [--lines N] [--full]`      | Print the scrollback of a live gd tmux session         |
@@ -62,17 +63,17 @@ Features:
 - `/` to filter the active tab
 - `s` to sort the active table
 - `i` to show repository info (file count, lines, tokens, max depth, top file types)
-- `g` on the Repositories tab to open Git operations: status, timeline, branches, remotes, pull, and push
+- `g` on the Repositories tab to open Git operations: status, timeline, branches, remotes, pull, push, and a **Diff Viewer** section with **Review Diff** for uncommitted changes
 - `r` to refresh all statuses
 - Press `enter` on any repository to open an action menu:
     - **New tmux session** — create and attach a session for the repository
-    - **Review Diff** — open a two-pane viewer for uncommitted changes (left: file list with GitHub-style status pills and +/- counts; right: per-file unified diff with GitHub-dark syntax highlighting, line numbers, and green/red backgrounds for added/removed lines). Navigate files with `j`/`k`, `n`/`p`, `g`/`G`, or `]`/`[`. Switch the focused panel with `tab`. `r` refreshes, `esc` closes.
     - **Attach existing session** — switch to any already-running tmux session
     - **Launch AI agent** — open OpenCode, Claude Code, GitHub Copilot, Codex, or Pi in a new tmux session
     - **Remove session** — kill a running tmux session
+- **Review Diff** (from the `g` Git menu) — open a two-pane viewer for uncommitted changes (left: file list with GitHub-style status pills and +/- counts; right: per-file unified diff with GitHub-dark syntax highlighting, line numbers, and green/red backgrounds for added/removed lines). Navigate files with `j`/`k`, `n`/`p`, `g`/`G`, or `]`/`[`. Switch the focused panel with `tab`. `r` refreshes, `esc` closes.
 - **Repository groups** appear directly in the Repositories tab when linked repositories share the same parent directory. Group rows can be expanded/collapsed with `space`; press `enter` on a group to start, attach, remove, or launch AI-agent sessions rooted at that parent directory.
 - **Sessions tab** (press `2`) lists every active `gd/*` tmux session with its status, purpose, repository, **description**, and full session name. The description column is free-form text stored on the session (default `"-"`), with a width that scales to your terminal and wraps long text. Highlight a row and press `d` to edit its description.
-- **Panels tab** (press `3`) manages reusable tmux panel layouts. Press `n` to create a panel, or `enter` on a panel to open, reconfigure, rename, or delete it.
+- **Panels tab** (press `3`) manages reusable tmux panel layouts. Press `n` to create a panel, or `enter` on a panel to open, reconfigure, rename, or delete it. Inside a panel you can **drag with the mouse to select text and copy it to the OS clipboard** on release; pressing `y` copies the entire visible pane as a fallback. GitDirector prefers native clipboard tools such as `pbcopy`, `wl-copy`, `xclip`, `xsel`, or `clip.exe`, and falls back to OSC 52 when needed.
 
 ### unlink
 
@@ -181,6 +182,15 @@ 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.
 
+### reset
+
+```bash
+gitdirector reset          # asks for confirmation
+gitdirector reset --yes    # skip the confirmation prompt
+```
+
+Destructive cleanup. Kills every `gd/*` tmux session (regular sessions and panels), wipes the entire `~/.gitdirector/` directory, and recreates an empty `config.yaml` with defaults. Useful when the local state is corrupted or you want to start fresh — all linked repositories, panel layouts, version-check cache, and tmux theme files are removed in one step.
+
 ### gd-capture
 
 ```bash
@@ -221,7 +231,7 @@ If you are an AI coding agent (Claude Code, OpenCode, GitHub Copilot, Codex, Pi,
 
 ## Configuration
 
-Config is stored at `~/.gitdirector/config.yaml`.
+Main config is stored at `~/.gitdirector/config.yaml`:
 
 ```yaml
 repositories:
@@ -229,6 +239,11 @@ repositories:
     - /path/to/repo2
 max_workers: 10 # optional, valid range 1-32, default 10
 theme: rose-pine # optional, default rose-pine
+```
+
+Secrets (GitHub credentials) are stored in a separate file at `~/.gitdirector/secrets.yaml`:
+
+```yaml
 github_username: your-github-username # optional
 github_PAT: github_pat_or_classic_pat # optional
 ```
@@ -239,7 +254,7 @@ GitDirector first runs git commands using your normal local git credentials. If
 
 - This only applies to HTTPS GitHub remotes.
 - SSH remotes still use your normal SSH key/agent setup.
-- The PAT is stored in plaintext in `~/.gitdirector/config.yaml`; use an appropriately scoped token and protect that file.
+- The PAT is stored in plaintext in `~/.gitdirector/secrets.yaml`; use an appropriately scoped token and protect that file.
 - The PAT is not passed on the command line or shown in TUI command output.
 
 ### Available Themes
@@ -262,6 +277,12 @@ eval "$(gitdirector completion zsh)"
 gitdirector completion fish | source
 ```
 
+The `zsh` script auto-loads `compinit` if `compdef` is not yet available, so the `eval` form works in fresh shells. For the fastest setup (no subprocess on every `TAB`), write the script to a file in your `$fpath` (commonly `~/.zsh/completions/_gitdirector`) and let `compinit` autoload it:
+
+```bash
+gitdirector completion zsh > "${fpath[1]}/_gitdirector"
+```
+
 ## License
 
 MIT

{gitdirector-1.7.0 → gitdirector-1.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "gitdirector"
-version = "1.7.0"
+version = "1.7.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.7.0 → gitdirector-1.7.2}/src/gitdirector/cli.py

@@ -20,6 +20,7 @@ from .commands import (
     listt,
     print_update_notice,
     pull,
+    reset,
     status,
     tui,
     unlink,
@@ -59,6 +60,7 @@ cd.register(cli)
 help.register(cli)
 tui.register(cli)
 autoclean.register(cli)
+reset.register(cli)
 info.register(cli)
 gd_tmux.register(cli)
 capture.register(cli)

gitdirector-1.7.2/src/gitdirector/commands/completion.py

@@ -0,0 +1,74 @@
+import click
+from click.shell_completion import CompletionItem, get_completion_class
+
+from ..config import Config
+
+SUPPORTED_SHELLS = ("bash", "zsh", "fish")
+
+
+def _completion_var(prog_name: str) -> str:
+    return f"_{prog_name.replace('-', '_').replace('.', '_').upper()}_COMPLETE"
+
+
+_ZSH_COMPINIT_BOOTSTRAP = (
+    "\n"
+    "# Ensure ``compdef`` is available when this script is ``eval``'d in a\n"
+    "# shell that has not yet loaded ``compinit``. Without this guard the\n"
+    "# ``compdef`` call below fails with ``command not found: compdef``.\n"
+    "if ! typeset -f compdef >/dev/null 2>&1; then\n"
+    "    autoload -U +X compinit\n"
+    "    compinit\n"
+    "fi\n"
+)
+
+
+def _patch_zsh_source(source: str) -> str:
+    """Inject a compinit bootstrap so ``eval`` works without prior setup.
+
+    Click's zsh output ends with ``compdef ...`` which requires the
+    ``compdef`` builtin provided by ``compinit``. When the script is
+    eval'd in a fresh zsh that hasn't loaded ``compinit`` yet, that
+    final call fails. Inserting a bootstrap right after the
+    ``#compdef`` directive ensures ``compdef`` is available without
+    changing behavior when the script is dropped into ``$fpath`` and
+    autoloaded by ``compinit`` (in which case ``compdef`` already
+    exists and the bootstrap is a no-op).
+    """
+    marker = "\n_gitdirector_completion() {"
+    if marker not in source:
+        return source
+    return source.replace(marker, _ZSH_COMPINIT_BOOTSTRAP + "\n_gitdirector_completion() {", 1)
+
+
+def completion_source(cli: click.Group, shell: str, *, prog_name: str = "gitdirector") -> str:
+    complete_cls = get_completion_class(shell)
+    if complete_cls is None:
+        raise click.ClickException(f"Unsupported shell: {shell}")
+    source = complete_cls(cli, {}, prog_name, _completion_var(prog_name)).source()
+    if shell == "zsh":
+        source = _patch_zsh_source(source)
+    return source
+
+
+def complete_repository_names(
+    _ctx: click.Context, _param: click.Parameter, incomplete: str
+) -> list[CompletionItem]:
+    try:
+        repositories = Config().repositories
+    except (OSError, RuntimeError, ValueError):
+        return []
+
+    prefix = incomplete.lower()
+    return [
+        CompletionItem(repo.name, help=str(repo))
+        for repo in sorted(repositories, key=lambda path: (path.name.lower(), str(path)))
+        if repo.name.lower().startswith(prefix)
+    ]
+
+
+def register(cli: click.Group):
+    @cli.command()
+    @click.argument("shell", type=click.Choice(SUPPORTED_SHELLS))
+    def completion(shell: str):
+        """Print shell completion setup for bash, zsh, or fish."""
+        click.echo(completion_source(cli, shell), nl=False)

{gitdirector-1.7.0 → gitdirector-1.7.2}/src/gitdirector/commands/help.py

@@ -1,5 +1,6 @@
 import click
 from rich.table import Table
+from rich.text import Text
 
 from . import console, get_version, print_update_notice
 
@@ -33,6 +34,7 @@ def show_help():
         ("cd NAME", "Open or switch to a tmux session for a repository"),
         ("console", "Interactive TUI for browsing and opening repositories"),
         ("autoclean", "Remove broken repository links from tracking"),
+        ("reset [--yes]", "Kill all sessions and panels, wipe ~/.gitdirector, recreate config"),
         ("info PATH|NAME [--full]", "Show file statistics for a repository"),
         (
             'gd-tmux PATH|NAME "cmd" [--description "..."]',
@@ -42,11 +44,11 @@ def show_help():
             "gd-capture SESSION [--lines N] [--full]",
             "Print the current scrollback of a live gd tmux session",
         ),
-        ("gd-send SESSION [TEXT] [--enter|--key C-c]", "Send text or C-c to a gd session"),
+        ("gd-send SESSION [TEXT] [--enter | --key C-c]", "Send text or C-c to a gd session"),
         ("completion SHELL", "Print shell completion setup for bash, zsh, or fish"),
         ("help", "Show this help message"),
     ]:
-        cmd_table.add_row(cmd, desc)
+        cmd_table.add_row(Text(cmd), desc)
 
     console.print(cmd_table)
 

gitdirector-1.7.2/src/gitdirector/commands/reset.py

@@ -0,0 +1,82 @@
+import shutil
+from pathlib import Path
+
+import click
+
+from ..config import Config
+from . import console
+
+
+def register(cli: click.Group):
+    @cli.command()
+    @click.option(
+        "--yes",
+        "-y",
+        is_flag=True,
+        help="Skip the confirmation prompt and reset immediately.",
+    )
+    def reset(yes: bool):
+        """Kill all sessions and panels, wipe ~/.gitdirector, and recreate config."""
+        _reset(confirm=not yes)
+
+
+def _reset(*, confirm: bool = True) -> None:
+    config_dir = Path.home() / ".gitdirector"
+
+    if confirm and not click.confirm(
+        f"  This will kill every gd tmux session and permanently delete {config_dir}. Continue?",
+        default=False,
+    ):
+        console.print()
+        console.print("  [dim]Cancelled.[/dim]")
+        console.print()
+        return
+
+    console.print()
+
+    killed = _kill_all_sessions()
+    if killed:
+        console.print(f"  [green]Killed {len(killed)} session(s):[/green]")
+        for name in killed:
+            console.print(f"    [dim]-[/dim] {name}")
+    else:
+        console.print("  [dim]No active gd tmux sessions to kill.[/dim]")
+
+    _wipe_config_dir(config_dir)
+
+    config = _recreate_config()
+
+    console.print()
+    console.print(f"  [green]Wiped and recreated:[/green] {config.config_file}")
+    console.print()
+
+
+def _kill_all_sessions() -> list[str]:
+    try:
+        from ..integrations.tmux import kill_all_gd_sessions
+    except ImportError:
+        console.print("  [yellow]tmux integration unavailable; skipping session kill.[/yellow]")
+        return []
+
+    try:
+        return kill_all_gd_sessions()
+    except Exception as exc:
+        console.print(f"  [yellow]Failed to kill some sessions: {exc}[/yellow]")
+        return []
+
+
+def _wipe_config_dir(config_dir: Path) -> None:
+    if not config_dir.exists():
+        console.print(f"  [dim]No existing {config_dir} to remove.[/dim]")
+        return
+
+    try:
+        shutil.rmtree(config_dir)
+    except OSError as exc:
+        raise RuntimeError(f"Failed to remove {config_dir}: {exc}") from exc
+
+
+def _recreate_config() -> Config:
+    config = Config()
+    config.clear()
+    return config

{gitdirector-1.7.0 → gitdirector-1.7.2}/src/gitdirector/commands/tui/app.py

@@ -46,6 +46,7 @@ from .screens.repos import (
     RepoInfoScreen,
 )
 from .screens.sessions import EditSessionDescriptionScreen, RemoveSessionScreen
+from .terminal_caps import host_color_system, no_color_requested
 
 _panel_row_height = _app_panels._panel_row_height
 _render_panel_preview = _app_panels._render_panel_preview
@@ -88,6 +89,9 @@ class GitDirectorConsole(
         background: $surface;
         overflow: hidden;
     }
+    HeaderTitle {
+        padding: 0 10 0 8;
+    }
     #status-bar {
         dock: bottom;
         height: 1;
@@ -120,6 +124,7 @@ class GitDirectorConsole(
         overflow-x: auto;
         overflow-y: auto;
         padding: 0 1;
+        scrollbar-size-horizontal: 0;
     }
     #no-repos-message {
         height: 1fr;
@@ -194,7 +199,7 @@ class GitDirectorConsole(
         Binding("s", "sort", "Sort", show=True),
         Binding("g", "show_git_menu", "Git", show=True),
         Binding("i", "show_info", "Info", show=True),
-        Binding("d", "edit_session_description", "Description", show=False),
+        Binding("d", "edit_session_description", "Description", show=True),
         Binding("escape", "close_search", show=False),
         Binding("1", "tab_repos", "Repos", show=False),
         Binding("2", "tab_sessions", "Sessions", show=False),
@@ -204,6 +209,19 @@ class GitDirectorConsole(
     ]
 
     def __init__(self) -> None:
+        # Ensure Textual's ``App.console`` auto-detects ``"truecolor"`` for
+        # its render Console. ``Strip.render()`` uses ``console._color_system``
+        # to pick the SGR format; if it resolves to ``"256"``, every
+        # truecolor segment produced by child agents gets quantised to
+        # the 256-colour palette — visible banding in gradients.
+        #
+        # Rich's auto-detection runs inside ``App.__init__`` using a
+        # snapshot of ``os.environ``, so the variable must be set
+        # *before* ``super().__init__()`` is called. We only force
+        # ``COLORTERM=truecolor`` when the host actually advertises
+        # truecolor — never downgrade a host that can't render it.
+        if not no_color_requested() and host_color_system() == "truecolor":
+            os.environ["COLORTERM"] = "truecolor"
         super().__init__()
         from ...integrations.tmux import TmuxMonitor
 
@@ -246,7 +264,7 @@ class GitDirectorConsole(
         self._repo_status_executor: ThreadPoolExecutor | None = None
 
     def compose(self) -> ComposeResult:
-        yield Header(show_clock=True)
+        yield Header(show_clock=True, icon="☰")
         with TabbedContent(id="tabs"):
             with TabPane("[1] Repositories", id="repos"):
                 yield Static("", id="repo-search-indicator", classes="search-indicator")
@@ -295,6 +313,7 @@ class GitDirectorConsole(
         self._panels_col_keys = panels_table.add_columns(
             "Map", "Name", "TMUX", "Layout", "Panes", "Status"
         )
+        self._disable_tabs_widget_arrow_keybindings()
         self.app_resume_signal.subscribe(self, self._handle_app_resume)
         self._sync_tmux_theme_config(self.theme)
         self._poll_timer = self.set_interval(
@@ -305,6 +324,21 @@ class GitDirectorConsole(
         self._load_update_notice()
         self._load_repos()
 
+    def _disable_tabs_widget_arrow_keybindings(self) -> None:
+        """Remove the ``left``/``right`` bindings from every Tabs widget.
+
+        The ``Tabs`` widget binds ``left``/``right`` to ``previous_tab``/``next_tab``
+        so it can switch tabs when focused. We want those keys to scroll the
+        active table horizontally instead, so strip the bindings on the
+        underlying ContentTabs instances. Users can still switch tabs with the
+        ``1``/``2``/``3`` number keys (and ``tab``/``shift+tab``).
+        """
+        from textual.widgets._tabs import Tabs
+
+        for tabs_widget in self.query(Tabs):
+            tabs_widget._bindings.key_to_bindings.pop("left", None)
+            tabs_widget._bindings.key_to_bindings.pop("right", None)
+
     def _background_shutdown_requested(self, worker: Worker | None = None) -> bool:
         return self._shutdown_requested or (worker is not None and worker.is_cancelled)
 
@@ -434,8 +468,11 @@ class GitDirectorConsole(
                 kill_tmux_session(session_name)
                 self._update_status(f"tmux agent launch failed: {exc}")
                 return
-            self.push_screen(
-                AgentLoadingScreen(agent_cmd, session_name, ready_marker),
+            self._show_attach_loading_screen(
+                session_name,
+                path,
+                ready_marker=ready_marker,
+                skip_config_sync=True,
                 callback=refresh_after_launch,
             )
         else:
@@ -451,6 +488,7 @@ class GitDirectorConsole(
         session_name: str,
         path: Path | None = None,
         row_key: str | None = None,
+        ready_marker: Path | None = None,
         *,
         skip_config_sync: bool = False,
         callback: Callable[[object], None] | None = None,
@@ -478,6 +516,7 @@ class GitDirectorConsole(
             AgentLoadingScreen(
                 title,
                 session_name,
+                ready_marker,
                 loading_hint=loading_hint,
                 on_attach=attach,
             ),
@@ -724,6 +763,8 @@ class GitDirectorConsole(
             self._show_repo_git_remotes(path)
         elif action == "push":
             self._prompt_repo_push(path)
+        elif action == "review_diff":
+            self._open_review_diff(path)
 
     def _show_repo_git_output(
         self,
@@ -996,8 +1037,6 @@ class GitDirectorConsole(
             session_name = action[len("attach:") :]
             path = self._get_selected_path()
             self._attach_to_session(session_name, path)
-        elif action == "review_diff":
-            self._open_review_diff()
         elif action == "remove_session":
             path = self._get_selected_path()
             if path:
@@ -1006,8 +1045,9 @@ class GitDirectorConsole(
                     callback=self._handle_remove_selection,
                 )
 
-    def _open_review_diff(self) -> None:
-        path = self._get_selected_path()
+    def _open_review_diff(self, path: Path | None = None) -> None:
+        if path is None:
+            path = self._get_selected_path()
         if path is None:
             return
         info = self._results.get(str(path))

{gitdirector-1.7.0 → gitdirector-1.7.2}/src/gitdirector/commands/tui/app_sessions.py

@@ -147,6 +147,7 @@ class ConsoleSessionsMixin:
                     entry["repo"],
                     entry["session_name"],
                     description,
+                    height=None,
                     key=entry["session_name"],
                 )
 

{gitdirector-1.7.0 → gitdirector-1.7.2}/src/gitdirector/commands/tui/app_ui.py

@@ -62,6 +62,8 @@ class ConsoleUIHelpersMixin:
             return self._active_tab == "repos"
         if action in {"show_git_menu", "show_info"}:
             return self._active_tab == "repos"
+        if action == "edit_session_description":
+            return self._active_tab == "sessions"
         return super().check_action(action, parameters)
 
     def _arm_resume_new_panel_guard(self, restore_tab: str) -> None:

{gitdirector-1.7.0 → gitdirector-1.7.2}/src/gitdirector/commands/tui/screens/commit.py

@@ -119,6 +119,20 @@ class StageFilesConfirmScreen(ModalScreen[bool]):
 _COMMIT_MESSAGE_RE = re.compile(r"[\s\S]+", re.MULTILINE)
 
 
+class _CommitActionOptionList(OptionList):
+    """OptionList used as the commit/push picker with vim-style j/k keys.
+
+    The ``j``/``k`` bindings live on the widget itself so they only
+    fire when the picker has focus. This keeps typing ``j`` or ``k``
+    inside the commit message input working as expected.
+    """
+
+    BINDINGS = [
+        Binding("j", "cursor_down", show=False),
+        Binding("k", "cursor_up", show=False),
+    ]
+
+
 class CommitMessageScreen(ModalScreen[Optional[tuple[str, bool]]]):
     """Collect a commit message and the final action (commit / commit & push).
 
@@ -127,18 +141,22 @@ class CommitMessageScreen(ModalScreen[Optional[tuple[str, bool]]]):
     "commit & push" so the caller should run ``git push`` after the
     commit succeeds.
 
-    Two ``OptionList`` entries below the input act as the action
+    Two picker entries below the input act as the action
     picker; the first option ("commit") is highlighted by default.
     Pressing ``enter`` from the input field commits with the currently
     highlighted action, matching the project's existing form
     conventions (see ``CreatePanelScreen``).
+
+    Focus toggles between the input and the action picker with
+    ``tab`` / ``shift+tab``. While the picker is focused, ``j`` /
+    ``k`` (and ``up`` / ``down``) move the selection.
     """
 
     BINDINGS = [
         Binding("escape", "cancel", "Esc cancel", show=True),
         Binding("ctrl+enter", "confirm", "Confirm", show=False),
-        Binding("tab", "focus_action", "Tab focus action", show=False),
-        Binding("shift+tab", "focus_message", "Shift+Tab focus message", show=False),
+        Binding("tab", "focus_toggle", "Tab switch focus", show=False),
+        Binding("shift+tab", "focus_toggle", "Shift+Tab switch focus", show=False),
         Binding("down", "action_cursor_down", "\u2193 action", show=False),
         Binding("up", "action_cursor_up", "\u2191 action", show=False),
     ]
@@ -218,13 +236,14 @@ class CommitMessageScreen(ModalScreen[Optional[tuple[str, bool]]]):
                 placeholder="Commit message\u2026",
                 id="commit-message-input",
             )
-            yield OptionList(
+            yield _CommitActionOptionList(
                 Option("[white]\u2713[/white] [bold]Commit[/bold]", id="commit"),
                 Option("[cyan]\u2191[/cyan] [bold]Commit and push[/bold]", id="commit_push"),
                 id="commit-message-action-list",
             )
             yield Static(
-                "type message    [\u2191\u2193] pick action    [enter] confirm    [esc] cancel",
+                "type message    [tab] switch    [\u2191\u2193/jk] pick action"
+                "    [enter] confirm    [esc] cancel",
                 id="commit-message-hint",
             )
 
@@ -261,20 +280,26 @@ class CommitMessageScreen(ModalScreen[Optional[tuple[str, bool]]]):
         self._in_message = True
         self.query_one("#commit-message-input", Input).focus()
 
+    def action_focus_toggle(self) -> None:
+        """Toggle focus between the message input and the action picker."""
+        if self._action_list_has_focus():
+            self.action_focus_message()
+        else:
+            self.action_focus_action()
+
+    def _action_list_has_focus(self) -> bool:
+        try:
+            action_list = self.query_one("#commit-message-action-list", OptionList)
+        except Exception:
+            return False
+        return self.focused is action_list
+
     def action_cursor_down(self) -> None:
         self.query_one("#commit-message-action-list", OptionList).action_cursor_down()
 
     def action_cursor_up(self) -> None:
         self.query_one("#commit-message-action-list", OptionList).action_cursor_up()
 
-    def action_cursor_down_global(self) -> None:
-        # Bound for the ``down`` key while focus is on the Input —
-        # moves the action list, not the cursor inside the Input.
-        if self._in_message:
-            self.action_cursor_down()
-        else:
-            super().action_cursor_down()  # type: ignore[misc]
-
     def _message(self) -> str:
         return self.query_one("#commit-message-input", Input).value.strip()