gitdirector 1.7.3__tar.gz → 1.7.4__tar.gz

{gitdirector-1.7.3 → gitdirector-1.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gitdirector
-Version: 1.7.3
+Version: 1.7.4
 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

{gitdirector-1.7.3 → gitdirector-1.7.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "gitdirector"
-version = "1.7.3"
+version = "1.7.4"
 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.3 → gitdirector-1.7.4}/src/gitdirector/commands/tui/app.py

@@ -670,7 +670,11 @@ class GitDirectorConsole(
     def action_show_info(self) -> None:
         if self._active_tab != "repos":
             return
-        if self._selected_repo_row_is_group():
+        group = self._get_selected_group()
+        if group is not None:
+            screen = RepoInfoScreen(f"{group.name} ({group.repo_count} repos)", group.path)
+            self.push_screen(screen)
+            self._gather_and_show_group_info(group, screen)
             return
         path = self._get_selected_path()
         if path is None:
@@ -733,6 +737,54 @@ class GitDirectorConsole(
             return
         self.call_from_thread(screen.populate, result)
 
+    @work(thread=True)
+    def _gather_and_show_group_info(self, group, screen: RepoInfoScreen) -> None:
+        worker = self._current_worker_or_none()
+        if self._background_shutdown_requested(worker):
+            return
+
+        from ...info import FileTypeInfo, RepoInfoResult, gather_repo_info
+
+        try:
+            results = [gather_repo_info(path) for path in group.repositories]
+        except Exception as exc:
+            if self._background_shutdown_requested(worker):
+                return
+            self.call_from_thread(screen.show_error, str(exc))
+            return
+
+        file_types: dict[str, tuple[int, int, int, bool]] = {}
+        for result in results:
+            for file_type in result.file_types:
+                count, lines, tokens, has_text = file_types.get(
+                    file_type.extension, (0, 0, 0, False)
+                )
+                if file_type.line_count is not None:
+                    lines += file_type.line_count
+                    tokens += file_type.token_count or 0
+                    has_text = True
+                file_types[file_type.extension] = (count + file_type.count, lines, tokens, has_text)
+
+        aggregate = RepoInfoResult(
+            total_files=sum(result.total_files for result in results),
+            file_types=sorted(
+                [
+                    FileTypeInfo(
+                        extension, count, lines if has_text else None, tokens if has_text else None
+                    )
+                    for extension, (count, lines, tokens, has_text) in file_types.items()
+                ],
+                key=lambda file_type: file_type.line_count or 0,
+                reverse=True,
+            ),
+            total_lines=sum(result.total_lines for result in results),
+            total_tokens=sum(result.total_tokens for result in results),
+            max_depth=max((result.max_depth for result in results), default=0),
+        )
+        if self._background_shutdown_requested(worker):
+            return
+        self.call_from_thread(screen.populate, aggregate)
+
     def _push_info_screen(self, name: str, path: Path, result) -> None:
         self.push_screen(RepoInfoScreen(name, path))
         total = len(self._results)

{gitdirector-1.7.3 → gitdirector-1.7.4}/src/gitdirector/commands/tui/app_panels.py

@@ -370,6 +370,11 @@ class ConsolePanelsMixin:
         )
 
     def _do_delete_panel(self, confirmed: bool, panel_name: str) -> None:
-        if confirmed:
-            self._panel_store.delete(panel_name)
-            self._load_panels()
+        if not confirmed:
+            return
+        if not self._panel_store.delete(panel_name):
+            self._update_status(
+                f"Panel '{panel_name}' could not be deleted because its tmux session is active"
+            )
+            return
+        self._load_panels()

{gitdirector-1.7.3 → gitdirector-1.7.4}/src/gitdirector/commands/tui/app_repos.py

@@ -199,19 +199,17 @@ class ConsoleReposMixin:
         marker = "▸" if self._repo_group_is_collapsed(group) else "▾"
         return f"[bold cyan]{marker} {escape(group.name)}[/bold cyan]"
 
-    def _repo_group_count_label(self, shown: int, total: int) -> str:
-        repo_label = "repo" if total == 1 else "repos"
-        if shown == total:
-            return f"{total} {repo_label}"
-        return f"{shown}/{total} {repo_label}"
+    def _repo_group_count_label(self, group: RepoGroup) -> str:
+        repo_label = "repo" if group.repo_count == 1 else "repos"
+        return f"[bold cyan][{group.repo_count} {repo_label}][/bold cyan]"
 
-    def _add_repo_group_row(self, table: DataTable, group: RepoGroup, shown: int) -> None:
+    def _add_repo_group_row(self, table: DataTable, group: RepoGroup) -> None:
         table.add_row(
             self._repo_group_label(group),
-            f"[bold]{self._repo_group_count_label(shown, group.repo_count)}[/bold]",
-            "[dim]group[/dim]",
-            "[dim]enter actions[/dim]",
-            "—",
+            self._repo_group_count_label(group),
+            "",
+            "",
+            "",
             str(group.path),
             key=self._group_row_key(group.path),
         )
@@ -264,7 +262,7 @@ class ConsoleReposMixin:
             shown_group_count += 1
             shown_repo_count += len(group_paths)
             grouped_paths.update(group_paths)
-            self._add_repo_group_row(table, group, len(group_paths))
+            self._add_repo_group_row(table, group)
             if self._repo_group_is_collapsed(group):
                 continue
             for path in sorted(group_paths, key=lambda item: item.name.lower()):
@@ -298,7 +296,7 @@ class ConsoleReposMixin:
             shown_group_count += 1
             shown_repo_count += len(group_infos)
             grouped_paths.update(info.path for info in group_infos)
-            self._add_repo_group_row(table, group, len(group_infos))
+            self._add_repo_group_row(table, group)
             if self._repo_group_is_collapsed(group):
                 continue
             group_infos.sort(key=key_func, reverse=self._sort_reverse)

{gitdirector-1.7.3 → gitdirector-1.7.4}/src/gitdirector/commands/tui/panels.py

@@ -627,13 +627,20 @@ class PanelStore:
         with advisory_file_lock(self.lock_file):
             write_yaml_atomic(self.panels_file, data)
 
-    def _kill_panel_sessions(self, panel_names: list[str]) -> None:
+    def _kill_panel_sessions(self, panel_names: list[str]) -> bool:
         if not panel_names:
-            return
-        from ...integrations.tmux import kill_panel_tmux_session
+            return True
+        from ...integrations.tmux import kill_panel_tmux_session, panel_tmux_session_exists
 
         for panel_name in panel_names:
-            kill_panel_tmux_session(panel_name)
+            if not kill_panel_tmux_session(panel_name) and panel_tmux_session_exists(panel_name):
+                return False
+        return True
+
+    def _sync_panel_tmux_config(self) -> None:
+        from ...integrations.tmux import sync_panel_tmux_config
+
+        sync_panel_tmux_config()
 
     def _cleanup_inner_panel_sessions(self, session_names: list[str]) -> None:
         if not session_names:
@@ -682,10 +689,12 @@ class PanelStore:
         for i, p in enumerate(self._panels):
             if p.name == name:
                 inner_sessions = [s for s in p.panes.values() if s]
+                if not self._kill_panel_sessions([name]):
+                    return False
                 self._panels.pop(i)
                 self._save()
-                self._kill_panel_sessions([name])
                 self._cleanup_inner_panel_sessions(inner_sessions)
+                self._sync_panel_tmux_config()
                 return True
         return False
 

{gitdirector-1.7.3 → gitdirector-1.7.4}/src/gitdirector/commands/tui/screens/commit.py

@@ -29,7 +29,7 @@ from textual.app import ComposeResult
 from textual.binding import Binding
 from textual.containers import Container, Vertical
 from textual.screen import ModalScreen
-from textual.widgets import Input, LoadingIndicator, OptionList, Static
+from textual.widgets import LoadingIndicator, OptionList, Static, TextArea
 from textual.widgets.option_list import Option
 
 from ..constants import _MODAL_BINDINGS, _MODAL_CSS
@@ -186,12 +186,16 @@ class CommitMessageScreen(ModalScreen[Optional[tuple[str, bool]]]):
         }
         #commit-message-input {
             width: 1fr;
-            height: 3;
+            height: auto;
+            min-height: 3;
+            max-height: 10;
             border: none;
             background: $boost;
             color: $text;
             margin: 0 0 1 0;
             padding: 0 1;
+            scrollbar-size-vertical: 0;
+            overflow-y: hidden;
         }
         #commit-message-input:focus {
             background: $boost;
@@ -232,27 +236,34 @@ class CommitMessageScreen(ModalScreen[Optional[tuple[str, bool]]]):
                 f"[dim]\u00b7  {self.file_count} {noun}[/dim]",
                 id="commit-message-stats",
             )
-            yield Input(
+            yield TextArea(
+                "",
                 placeholder="Commit message\u2026",
                 id="commit-message-input",
             )
             yield _CommitActionOptionList(
-                Option("[white]\u2713[/white] [bold]Commit[/bold]", id="commit"),
                 Option("[cyan]\u2191[/cyan] [bold]Commit and push[/bold]", id="commit_push"),
+                Option("[white]\u2713[/white] [bold]Commit[/bold]", id="commit"),
                 id="commit-message-action-list",
             )
             yield Static(
-                "type message    [tab] switch    [\u2191\u2193/jk] pick action"
-                "    [enter] confirm    [esc] cancel",
+                "type message    \\[tab] switch    [\u2191\u2193/jk] pick action"
+                "    [ctrl+enter] confirm    \\[esc] cancel",
                 id="commit-message-hint",
             )
 
     def on_mount(self) -> None:
-        self.query_one("#commit-message-input", Input).focus()
+        message = self.query_one("#commit-message-input", TextArea)
+        message.focus()
+        self.call_after_refresh(self._resize_message_input)
 
-    def on_input_submitted(self, event: Input.Submitted) -> None:
-        event.stop()
-        self._confirm()
+    def on_text_area_changed(self, event: TextArea.Changed) -> None:
+        if event.text_area.id == "commit-message-input":
+            self.call_after_refresh(self._resize_message_input)
+
+    def _resize_message_input(self) -> None:
+        message = self.query_one("#commit-message-input", TextArea)
+        message.styles.height = min(10, max(3, message.virtual_size.height))
 
     def on_option_list_option_selected(self, event: OptionList.OptionSelected) -> None:
         # Click / enter on an option also confirms; the current
@@ -278,7 +289,7 @@ class CommitMessageScreen(ModalScreen[Optional[tuple[str, bool]]]):
 
     def action_focus_message(self) -> None:
         self._in_message = True
-        self.query_one("#commit-message-input", Input).focus()
+        self.query_one("#commit-message-input", TextArea).focus()
 
     def action_focus_toggle(self) -> None:
         """Toggle focus between the message input and the action picker."""
@@ -301,7 +312,7 @@ class CommitMessageScreen(ModalScreen[Optional[tuple[str, bool]]]):
         self.query_one("#commit-message-action-list", OptionList).action_cursor_up()
 
     def _message(self) -> str:
-        return self.query_one("#commit-message-input", Input).value.strip()
+        return self.query_one("#commit-message-input", TextArea).text.strip()
 
     def _message_valid(self) -> bool:
         msg = self._message()

{gitdirector-1.7.3 → gitdirector-1.7.4}/src/gitdirector/commands/tui/screens/diff.py

@@ -114,21 +114,20 @@ class DiffReviewScreen(ModalScreen[None]):
     #diff-files-pane {
         width: 52;
         height: 1fr;
-        border-right: solid $primary;
+        border-right: solid $boost;
         padding: 0 0;
         background: $surface;
     }
-    #diff-files-pane.--files-focused {
-        border-right: solid $accent;
-    }
-    #diff-files-pane.--diff-focused {
-        border-right: solid $secondary;
-    }
-    #diff-content-pane.--files-focused {
-        border-left: solid $accent;
+    .diff-pane-label {
+        height: 1;
+        padding: 0 1;
+        background: $boost;
+        color: $text-muted;
+        text-style: bold;
     }
-    #diff-content-pane.--diff-focused {
-        border-left: solid $secondary;
+    .diff-pane-label.--focused {
+        background: $accent;
+        color: $text;
     }
     #diff-files-list {
         width: 1fr;
@@ -149,12 +148,6 @@ class DiffReviewScreen(ModalScreen[None]):
         height: 1fr;
         padding: 0 0;
     }
-    #diff-content-pane.--files-focused {
-        border-left: solid $accent;
-    }
-    #diff-content-pane.--diff-focused {
-        border-left: solid $secondary;
-    }
     #diff-content-scroll {
         width: 1fr;
         height: 1fr;
@@ -235,8 +228,10 @@ class DiffReviewScreen(ModalScreen[None]):
                 yield Static("", id="diff-summary")
             with Horizontal(id="diff-body"):
                 with Vertical(id="diff-files-pane"):
+                    yield Static("FILES", id="diff-files-pane-label", classes="diff-pane-label")
                     yield FileTileList(id="diff-files-list")
                 with Vertical(id="diff-content-pane"):
+                    yield Static("DIFF", id="diff-content-pane-label", classes="diff-pane-label")
                     with _DiffContentScroll(id="diff-content-scroll"):
                         yield Static(id="diff-content")
                     with Vertical(id="diff-loading"):
@@ -244,11 +239,11 @@ class DiffReviewScreen(ModalScreen[None]):
                         yield Static("Loading diff\u2026", id="diff-loading-text")
                     yield Static("", id="diff-empty")
             yield Static(
-                "[bold]tab[/bold] panel  "
+                "[bold]tab[/bold] toggle focus  "
                 "[bold]j/k[/bold] line  "
                 "[bold]J/K[/bold] page  "
                 "[bold]h/l[/bold] horizontal  "
-                "[bold]brackets[/bold] file  "
+                "[bold]\\[ ][/bold] cycle  "
                 "[bold]g[/bold] commit  "
                 "[bold]r[/bold] refresh  "
                 "[bold]esc[/bold] close",
@@ -495,17 +490,16 @@ class DiffReviewScreen(ModalScreen[None]):
         if not self._files:
             target = _FOCUS_FILES
         try:
-            # Toggle the focus-class on the two panes so the
-            # divider border can shift colour to signal which side
-            # has focus. We touch *both* panes on every focus
-            # change so the stale classes from the previous focus
-            # don't linger.
             files_pane = self.query_one("#diff-files-pane")
             content_pane = self.query_one("#diff-content-pane")
+            files_label = self.query_one("#diff-files-pane-label")
+            content_label = self.query_one("#diff-content-pane-label")
             files_pane.set_class(False, "--files-focused")
             files_pane.set_class(False, "--diff-focused")
             content_pane.set_class(False, "--files-focused")
             content_pane.set_class(False, "--diff-focused")
+            files_label.set_class(target == _FOCUS_FILES, "--focused")
+            content_label.set_class(target == _FOCUS_DIFF, "--focused")
             if target == _FOCUS_DIFF:
                 content_pane.set_class(True, "--diff-focused")
                 files_pane.set_class(True, "--diff-focused")
@@ -568,9 +562,6 @@ class DiffReviewScreen(ModalScreen[None]):
         if new_index == files_list.index:
             return
         files_list.index = new_index
-        if self._focus_target != _FOCUS_FILES:
-            self._focus_target = _FOCUS_FILES
-            self._apply_focus()
 
     def action_cursor_down(self) -> None:
         if self._focus_target == _FOCUS_FILES or not self._files:

{gitdirector-1.7.3 → gitdirector-1.7.4}/src/gitdirector/commands/tui/screens/sessions.py

@@ -5,9 +5,10 @@ from __future__ import annotations
 from pathlib import Path
 
 from textual.app import ComposeResult
+from textual.binding import Binding
 from textual.containers import Vertical
 from textual.screen import ModalScreen
-from textual.widgets import Input, OptionList, Static
+from textual.widgets import OptionList, Static, TextArea
 from textual.widgets.option_list import Option
 
 from ..constants import _MODAL_BINDINGS, _MODAL_CSS
@@ -143,6 +144,13 @@ class SelectSessionScreen(ModalScreen[str | None]):
 __all__ = ["EditSessionDescriptionScreen", "RemoveSessionScreen", "SelectSessionScreen"]
 
 
+class DescriptionTextArea(TextArea):
+    BINDINGS = [*TextArea.BINDINGS, Binding("enter", "submit", show=False, priority=True)]
+
+    def action_submit(self) -> None:
+        self.screen.action_submit()
+
+
 class EditSessionDescriptionScreen(ModalScreen[str | None]):
     """Modal for editing the description stored on a tmux session.
 
@@ -165,12 +173,16 @@ class EditSessionDescriptionScreen(ModalScreen[str | None]):
     }
     EditSessionDescriptionScreen #description-input {
         width: 1fr;
-        height: 3;
+        height: auto;
+        min-height: 3;
+        max-height: 10;
         border: none;
         background: $boost;
         color: $text;
         margin: 1 0;
         padding: 0 1;
+        scrollbar-size-vertical: 0;
+        overflow-y: hidden;
     }
     #description-session-name {
         text-align: center;
@@ -190,22 +202,32 @@ class EditSessionDescriptionScreen(ModalScreen[str | None]):
         with Vertical(id="menu-container"):
             yield Static("[bold white]Edit Description[/bold white]", id="menu-title")
             yield Static(f"[dim]{self.session_name}[/dim]", id="description-session-name")
-            yield Input(
-                value=self._initial_value,
+            yield DescriptionTextArea(
+                self._initial_value,
                 placeholder="description (leave empty to reset to '-')",
                 id="description-input",
             )
             yield Static("\\[enter] save    \\[esc] cancel", id="menu-hint")
 
     def on_mount(self) -> None:
-        inp = self.query_one("#description-input", Input)
+        inp = self.query_one("#description-input", TextArea)
         inp.focus()
         if self._initial_value:
-            inp.action_end()
+            lines = self._initial_value.splitlines() or [""]
+            inp.move_cursor((len(lines) - 1, len(lines[-1])))
+        self.call_after_refresh(self._resize_description_input)
+
+    def on_text_area_changed(self, event: TextArea.Changed) -> None:
+        if event.text_area.id == "description-input":
+            self.call_after_refresh(self._resize_description_input)
+
+    def _resize_description_input(self) -> None:
+        inp = self.query_one("#description-input", TextArea)
+        inp.styles.height = min(10, max(3, inp.virtual_size.height))
 
-    def on_input_submitted(self, event: Input.Submitted) -> None:
-        new_value = event.value.strip()
-        self.dismiss(new_value)
+    def action_submit(self) -> None:
+        inp = self.query_one("#description-input", TextArea)
+        self.dismiss(inp.text.strip())
 
     def action_cancel(self) -> None:
         self.dismiss(None)

{gitdirector-1.7.3 → gitdirector-1.7.4}/src/gitdirector/integrations/tmux/__init__.py

@@ -78,6 +78,7 @@ from .panels import (
     cleanup_temp_panel_tmux_session,
     ensure_temp_panel_tmux_session,
     kill_panel_tmux_session,
+    panel_tmux_session_exists,
     rebuild_panel_tmux_session,
 )
 
@@ -93,6 +94,7 @@ __all__ = [
     "get_all_session_statuses",
     "kill_all_gd_sessions",
     "kill_panel_tmux_session",
+    "panel_tmux_session_exists",
     "kill_tmux_session",
     "launch_command_in_tmux_session",
     "list_all_gd_sessions",

{gitdirector-1.7.3 → gitdirector-1.7.4}/src/gitdirector/integrations/tmux/core.py

@@ -460,7 +460,7 @@ def kill_all_gd_sessions() -> list[str]:
         session_names.update(
             session_name
             for session_name in _list_sessions()
-            if _is_persistent_panel_session(session_name)
+            if _is_persistent_panel_session(session_name) or _is_temp_panel_session(session_name)
         )
     except (TmuxError, OSError, ValueError):
         logger.debug("Failed to enumerate GitDirector tmux sessions", exc_info=True)
@@ -582,7 +582,9 @@ def _sanitize_panel_name(name: str) -> str:
 
 def _is_temp_panel_session(session_name: str) -> bool:
     parts = session_name.split("/")
-    return len(parts) > 4 and parts[:3] == ["gd", "temp", "panel"]
+    if parts[:3] != ["gd", "temp", "panel"]:
+        return False
+    return len(parts) > 4 or (len(parts) == 4 and parts[3].startswith("build-"))
 
 
 def _is_persistent_panel_session(session_name: str) -> bool:

{gitdirector-1.7.3 → gitdirector-1.7.4}/src/gitdirector/integrations/tmux/panels.py

@@ -88,6 +88,12 @@ def kill_panel_tmux_session(panel_name: str) -> bool:
     return kill_tmux_session(make_panel_session_name(panel_name))
 
 
+def panel_tmux_session_exists(panel_name: str) -> bool:
+    if not isinstance(panel_name, str) or not panel_name:
+        raise ValueError("panel_tmux_session_exists requires a non-empty panel name")
+    return _session_exists(make_panel_session_name(panel_name))
+
+
 def _kill_tmux_session_by_name(intended_name: str) -> bool:
     """Kill a tmux session by the name we requested, tolerating ``.`` -> ``_``.