@scemoon/cdh 1.0.3 → 1.0.5

package/tui/widgets/modified_files.py

@@ -5,11 +5,18 @@ import subprocess
 
 from textual import work
 from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.message import Message
 from textual.reactive import reactive
 from textual.timer import Timer
+from textual.widget import Widget
 from textual.widgets import Static
 from textual import containers
 
+from dataclasses import dataclass
+
+
+CONTENT_WIDTH = 35
 
 GIT_STATUS_TIMEOUT = 5.0
 GIT_STATUS_DEBOUNCE = 0.2
@@ -33,53 +40,62 @@ IGNORED_DIRS = frozenset(
     }
 )
 
+STATUS_ICONS = {"?": "?", "M": "M", "A": "A", "D": "D", "R": "R", "C": "C"}
+STATUS_COLORS = {"?": "green", "M": "yellow", "A": "green", "D": "red", "R": "#888888", "C": "green"}
+DIFF_COLORS: dict[str, str] = {"add": "green", "del": "red", "mix": "yellow", "dim": "#555555"}
 
-class ModifiedFiles(containers.Vertical):
-    DEFAULT_CSS = """
-    ModifiedFiles {
-        height: auto;
-        max-height: 15;
-        overflow-y: auto;
 
-        Static {
-            padding: 0 1;
-        }
+def _status_info(raw: str) -> tuple[str, str]:
+    ch = raw.strip()[:1] or "M"
+    return STATUS_ICONS.get(ch, "M"), STATUS_COLORS.get(ch, "yellow")
 
-        .file-added {
-            color: $text-success;
-        }
-
-        .file-modified {
-            color: $text-warning;
-        }
 
-        .file-deleted {
-            color: $text-error;
-        }
+def _tag_color(added: int, deleted: int) -> str:
+    if added and deleted:
+        return DIFF_COLORS["mix"]
+    if added:
+        return DIFF_COLORS["add"]
+    if deleted:
+        return DIFF_COLORS["del"]
+    return DIFF_COLORS["dim"]
 
-        .file-renamed {
-            color: $text-secondary;
-        }
 
-        .no-changes {
-            color: $text-secondary;
-            text-style: italic;
-        }
+class ModifiedFiles(containers.Vertical, can_focus=True):
+    DEFAULT_CSS = """
+    ModifiedFiles {
+        height: auto;
+        overflow-y: auto;
+        padding: 0 0 0 0;
 
-        .not-a-repo {
-            color: $text-secondary;
-            text-style: italic;
+        &:focus {
+            background-tint: $surface 10%;
         }
 
-        .-loading {
-            color: $text-secondary;
-            text-style: italic;
+        #mf-files {
+            height: auto;
+            padding: 0 0 0 1;
         }
     }
     """
 
+    BINDINGS = [
+        Binding("up", "cursor_up", "Up", group="Files"),
+        Binding("down", "cursor_down", "Down", group="Files"),
+        Binding("enter", "select", "Select"),
+    ]
+
+    @dataclass
+    class FileSelected(Message):
+        filepath: str
+        modified_files: "ModifiedFiles"
+
+        @property
+        def control(self) -> Widget:
+            return self.modified_files
+
     path: reactive[Path | None] = reactive(None)
     files: reactive[list[str]] = reactive(list, recompose=False)
+    highlighted: reactive[int | None] = reactive(None)
 
     def __init__(
         self,
@@ -92,8 +108,9 @@ class ModifiedFiles(containers.Vertical):
         self._debounce_timer: Timer | None = None
         self._status_kind: str = "no-changes"
         self._status_text: str = NO_CHANGES_TEXT
-        self._file_widgets: list[Static] = []
         self._initial_path: Path | None = path
+        self._filepaths: list[str] = []
+        self._lines_data: tuple[list[str], dict[str, tuple[int, int]]] | None = None
 
     def on_mount(self) -> None:
         initial = self._initial_path
@@ -102,21 +119,13 @@ class ModifiedFiles(containers.Vertical):
             self.path = initial
 
     def watch_path(self, path: Path | None) -> None:
-        """Schedule a (debounced, async) git status when path changes."""
         self._cancel_debounce()
-        if path is None:
-            self._show_status("no-changes", NO_CHANGES_TEXT)
-            self._clear_file_widgets()
-            return
-        self._show_status("-loading", LOADING_TEXT)
-        self._schedule_run(path)
+        self._schedule_run(path or Path.cwd())
 
     def refresh_files(self) -> None:
-        """Re-run git status manually (e.g. after file system changes)."""
-        if self.path is not None:
-            self._cancel_debounce()
-            self._show_status("-loading", LOADING_TEXT)
-            self._run_git_status(self.path)
+        target = self.path or Path.cwd()
+        self._cancel_debounce()
+        self._run_git_status(target)
 
     def _schedule_run(self, path: Path) -> None:
         timer = self.set_timer(
@@ -136,8 +145,6 @@ class ModifiedFiles(containers.Vertical):
 
     @work(exclusive=True, group="modified-files-git-status", thread=True)
     def _run_git_status(self, path: Path) -> None:
-        """Worker entry: do the slow ``git status`` off the UI thread,
-        then marshal results back via ``app.call_from_thread``."""
         app = self.app
         outcome = self._do_git_status(path)
         if outcome is None:
@@ -145,24 +152,18 @@ class ModifiedFiles(containers.Vertical):
         kind, text, lines = outcome
         if lines is None:
             app.call_from_thread(self._show_status, kind, text)
-            app.call_from_thread(self._clear_file_widgets)
         else:
             app.call_from_thread(self._render_lines, lines)
 
     def _do_git_status(
         self, path: Path
     ) -> tuple[str, str, list[str] | None] | None:
-        """Pure helper for ``git status``. Returns
-        ``(kind, text, lines_or_None)`` for the UI to render, or ``None``
-        if the call should silently no-op (e.g. ignored path).
-        """
         if any(part in IGNORED_DIRS for part in path.parts):
             return ("not-a-repo", NOT_A_REPO_TEXT, None)
         try:
-            result = subprocess.run(
+            status = subprocess.run(
                 ["git", "-C", str(path), "status", "--porcelain"],
-                capture_output=True,
-                text=True,
+                capture_output=True, text=True,
                 timeout=GIT_STATUS_TIMEOUT,
             )
         except subprocess.TimeoutExpired:
@@ -171,68 +172,135 @@ class ModifiedFiles(containers.Vertical):
             return ("not-a-repo", NOT_A_REPO_TEXT, None)
         except Exception:
             return ("no-changes", NO_CHANGES_TEXT, None)
-        if result.returncode != 0:
+        if status.returncode != 0:
             return ("not-a-repo", NOT_A_REPO_TEXT, None)
-        lines = [
-            line for line in result.stdout.splitlines() if line.strip()
-        ]
+
+        lines = [l for l in status.stdout.splitlines() if l.strip()]
         if not lines:
-            return ("no-changes", NO_CHANGES_TEXT, [])
-        return ("file-modified", "", lines)
+            return ("no-changes", NO_CHANGES_TEXT, ([], {}))
+
+        diffmap: dict[str, tuple[int, int]] = {}
+        for diff_cmd in (
+            ["git", "-C", str(path), "diff", "--numstat"],
+            ["git", "-C", str(path), "diff", "--cached", "--numstat"],
+        ):
+            try:
+                r = subprocess.run(
+                    diff_cmd, capture_output=True, text=True,
+                    timeout=GIT_STATUS_TIMEOUT,
+                )
+            except Exception:
+                continue
+            for dl in r.stdout.splitlines():
+                parts = dl.split("\t", 2)
+                if len(parts) == 3:
+                    added, deleted = parts[0], parts[1]
+                    if added != "-":
+                        a, d = int(added), int(deleted)
+                        fp = parts[2]
+                        prev_a, prev_d = diffmap.get(fp, (0, 0))
+                        diffmap[fp] = (prev_a + a, prev_d + d)
+
+        return ("file-modified", "", (lines, diffmap))
 
-    def _render_lines(self, lines: list[str]) -> None:
+    def _render_lines(self, data: tuple[list[str], dict[str, tuple[int, int]]]) -> None:
+        lines, diffmap = data
         self.files = list(lines)
+        self._filepaths = [l[3:] for l in lines]
         if not lines:
             self._show_status("no-changes", NO_CHANGES_TEXT)
-            self._clear_file_widgets()
+            self._lines_data = None
+            self.highlighted = None
             return
         self._show_status("file-modified", "")
-        self._clear_file_widgets()
-        try:
-            header = self.query_one("#mf-status", Static)
-        except Exception:
+        self._lines_data = data
+        if self.highlighted is None or self.highlighted >= len(self._filepaths):
+            self.highlighted = 0
+        self._apply_rendering()
+
+    def on_focus(self) -> None:
+        if self.highlighted is None and self._filepaths:
+            self.highlighted = 0
+
+    def watch_highlighted(
+        self, old: int | None, highlighted: int | None
+    ) -> None:
+        if self._lines_data is not None:
+            self._apply_rendering()
+
+    def _apply_rendering(self) -> None:
+        assert self._lines_data is not None
+        lines, diffmap = self._lines_data
+        out: list[str] = []
+        for idx, raw_line in enumerate(lines):
+            filepath = raw_line[3:]
+            icon, sc = _status_info(raw_line[:2])
+
+            added, deleted = diffmap.get(filepath, (0, 0))
+            if "?" in raw_line[:2]:
+                tag = "new"
+                tc = DIFF_COLORS["dim"]
+            elif "D" in raw_line[:2]:
+                tag = "del"
+                tc = DIFF_COLORS["del"]
+            elif added or deleted:
+                tag = f"+{added}/-{deleted}"
+                tc = _tag_color(added, deleted)
+            else:
+                tag = ""
+                tc = ""
+
+            tag_s = f" [{tc}]{tag}[/]" if tag else ""
+            tag_len = len(tag) + 1 if tag else 0
+            max_fn = CONTENT_WIDTH - 2 - tag_len
+            if max_fn < 3:
+                max_fn = 3
+            disp = filepath[:max_fn - 1] + "…" if len(filepath) > max_fn else filepath
+            pad = CONTENT_WIDTH - 2 - len(disp) - tag_len
+            pad_s = " " * pad if pad > 0 else ""
+            line = f"[{sc}]{icon} {disp}[/]{pad_s}{tag_s}"
+
+            if idx == self.highlighted:
+                line = f"[reverse]{line}[/]"
+            out.append(line)
+
+        files_widget = self.query_one("#mf-files", Static)
+        files_widget.update("\n".join(out))
+        self.call_after_refresh(self._scroll_to_highlighted)
+
+    def _scroll_to_highlighted(self) -> None:
+        if self.highlighted is not None:
+            self.scroll_to(y=self.highlighted, animate=False)
+
+    def action_cursor_up(self) -> None:
+        if not self._filepaths:
             return
-        for line in lines:
-            status = line[:2]
-            filepath = line[3:]
-            cls = self._class_for_status(status)
-            widget = Static(f" {filepath}", classes=cls)
-            self._file_widgets.append(widget)
-            self.mount(widget, after=header)
+        if self.highlighted is None or self.highlighted <= 0:
+            self.highlighted = 0
+        else:
+            self.highlighted -= 1
+
+    def action_cursor_down(self) -> None:
+        if not self._filepaths:
+            return
+        if self.highlighted is None:
+            self.highlighted = 0
+        elif self.highlighted >= len(self._filepaths) - 1:
+            self.highlighted = len(self._filepaths) - 1
+        else:
+            self.highlighted += 1
+
+    def action_select(self) -> None:
+        if self.highlighted is not None and self._filepaths:
+            filepath = self._filepaths[self.highlighted]
+            self.post_message(self.FileSelected(filepath, self))
 
     def _show_status(self, kind: str, text: str) -> None:
         self._status_kind = kind
         self._status_text = text
-        try:
-            header = self.query_one("#mf-status", Static)
-        except Exception:
-            return
-        header.set_classes(kind)
-        header.update(text)
-        if kind != "file-modified":
-            self._clear_file_widgets()
-
-    def _clear_file_widgets(self) -> None:
-        for w in self._file_widgets:
-            try:
-                w.remove()
-            except Exception:
-                pass
-        self._file_widgets = []
+        status = self.query_one("#mf-status", Static)
+        status.update(text)
 
     def compose(self) -> ComposeResult:
-        yield Static(self._status_text, classes=self._status_kind, id="mf-status")
-
-    @staticmethod
-    def _class_for_status(status: str) -> str:
-        if "?" in status:
-            return "file-added"
-        if "D" in status:
-            return "file-deleted"
-        if "A" in status or "C" in status:
-            return "file-added"
-        if "R" in status:
-            return "file-renamed"
-        if "M" in status:
-            return "file-modified"
-        return "file-modified"
+        yield Static(self._status_text, id="mf-status")
+        yield Static("", id="mf-files")

package/tui/widgets/plan.py

@@ -182,7 +182,7 @@ class Plan(containers.Grid):
         elif status == "pending":
             return Content(" • ")
         elif status == "in_progress":
-            return Content("👉 ")
+            return Content(" 👉")
         return Content()
 
 

package/tui/widgets/project_grid_select.py

@@ -7,7 +7,6 @@ from textual import getters
 from tui.app import A2TUIApp
 from tui.widgets.grid_select import GridSelect
 from tui.widgets.project_summary import ProjectSummary
-from onecode.config import CLOUD_DEV_HARNESS_DIR
 
 
 def _read_project_path(pf: Path) -> str:
@@ -47,11 +46,19 @@ class ProjectGridSelect(GridSelect):
         return True
 
     def compose(self) -> ComposeResult:
-        projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+        projects_dir = Path.home() / ".cdh" / "projects"
         projects_dir.mkdir(parents=True, exist_ok=True)
         project_files = list(projects_dir.glob("*.yaml")) + list(projects_dir.glob("*.json"))
         for pf in sorted(project_files):
             yield ProjectSummary(pf.stem, _read_project_path(pf), id=pf.stem)
 
+    async def reload(self) -> None:
+        await self.remove_children()
+        projects_dir = Path.home() / ".cdh" / "projects"
+        projects_dir.mkdir(parents=True, exist_ok=True)
+        project_files = list(projects_dir.glob("*.yaml")) + list(projects_dir.glob("*.json"))
+        for pf in sorted(project_files):
+            await self.mount(ProjectSummary(pf.stem, _read_project_path(pf), id=pf.stem))
+
     def refresh(self, **kwargs) -> None:
         super().refresh(**kwargs)

package/tui/widgets/session_grid_select.py

@@ -111,6 +111,12 @@ class SessionGridSelect(GridSelect):
                     break
             return
 
+        for i, existing in enumerate(self._all_sessions):
+            if existing.mode_name == mode_name:
+                self._all_sessions[i] = details
+                self._render_page()
+                return
+
         if details.session_pk is not None:
             for i, existing in enumerate(self._all_sessions):
                 if existing.session_pk == details.session_pk:

package/tui/widgets/side_bar.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 
 from textual.app import ComposeResult
+from textual.binding import Binding
 from textual.widget import Widget
 from textual import containers
 from textual import widgets
@@ -9,6 +10,9 @@ from textual.message import Message
 
 class SideBarCollapsible(widgets.Collapsible):
     BINDING_GROUP_TITLE = "Sidebar collapsible"
+    BINDINGS = [
+        Binding("down", "focus_content", "Focus content", show=False),
+    ]
     HELP = """\
 ## Sidebar
 
@@ -20,6 +24,12 @@ The Sidebar contains additonal information associated with the conversation.
 - **enter** expand or collapse secions
 """
 
+    def action_focus_content(self) -> None:
+        """Move focus into the content area when expanded."""
+        if self.collapsed:
+            return
+        self.screen.focus_next()
+
 
 class SideBar(containers.Vertical):
     BINDING_GROUP_TITLE = "Sidebar"