Merge pull request #79 from joshribakoff/tui-integration

Merge tui-integration: footer fix, test isolation

Author: joshribakoff

tui/bearing-tui

@@ -0,0 +1,13 @@
+#!/Users/joshribakoff/.pyenv/versions/3.11.2/bin/python3.11
+import os
+import sys
+from pathlib import Path
+
+root = Path(__file__).resolve().parent
+os.environ["BEARING_WORKSPACE"] = "/Users/joshribakoff/Projects"
+sys.path.insert(0, str(root))
+
+from bearing_tui.app import main
+
+if __name__ == "__main__":
+    main()

tui/bearing_tui/app.py

@@ -56,6 +56,21 @@ class HealthEntry:
     last_check: Optional[datetime]
 
 
+@dataclass
+class PREntry:
+    """Represents a GitHub PR from prs.jsonl."""
+    repo: str
+    number: int
+    title: str
+    state: str  # OPEN, CLOSED, MERGED
+    branch: str
+    base_branch: str
+    author: str
+    updated: Optional[datetime]
+    checks: Optional[str]  # SUCCESS, FAILURE, PENDING, None
+    draft: bool = False
+
+
 def _parse_datetime(value: Optional[str]) -> Optional[datetime]:
     """Parse ISO format datetime, handling 'unknown' and None."""
     if not value or value == "unknown":
@@ -152,6 +167,91 @@ def get_workflow_for_branch(self, repo: str, branch: str) -> Optional[WorkflowEn
                 return entry
         return None
 
+    def get_plans_for_project(self, project: str) -> list[dict]:
+        """Get plans for a specific project from plans directory."""
+        from .widgets.plans import parse_plan_frontmatter
+        plans_dir = self.workspace_dir / "plans" / project
+        if not plans_dir.exists():
+            return []
+
+        plans = []
+        for plan_file in plans_dir.glob("*.md"):
+            try:
+                fm = parse_plan_frontmatter(plan_file)
+                plans.append({
+                    "file_path": plan_file,
+                    "project": project,
+                    "title": fm.get("title", plan_file.stem),
+                    "issue": fm.get("issue"),
+                    "status": fm.get("status", "draft"),
+                    "pr": fm.get("pr"),
+                })
+            except Exception:
+                continue
+
+        # Sort by status (active first), then title
+        status_order = {"active": 0, "in_progress": 1, "draft": 2, "completed": 3}
+        plans.sort(key=lambda p: (status_order.get(p["status"], 4), p["title"]))
+        return plans
+
+    def get_plan_projects(self) -> list[str]:
+        """Get unique project names that have plans."""
+        plans_dir = self.workspace_dir / "plans"
+        if not plans_dir.exists():
+            return []
+        projects = []
+        for project_dir in plans_dir.iterdir():
+            if project_dir.is_dir() and list(project_dir.glob("*.md")):
+                projects.append(project_dir.name)
+        return sorted(projects)
+
+    def read_prs(self) -> list[PREntry]:
+        """Read prs.jsonl - cached PR data."""
+        entries = _read_jsonl(self.workspace_dir / "prs.jsonl")
+        return [
+            PREntry(
+                repo=e["repo"],
+                number=e["number"],
+                title=e.get("title", ""),
+                state=e.get("state", "OPEN"),
+                branch=e.get("branch", ""),
+                base_branch=e.get("baseBranch", "main"),
+                author=e.get("author", ""),
+                updated=_parse_datetime(e.get("updated")),
+                checks=e.get("checks"),
+                draft=e.get("draft", False),
+            )
+            for e in entries
+        ]
+
+    def get_prs_for_project(self, repo: str) -> list[PREntry]:
+        """Get PRs for a specific repo, sorted: open first, then by updated."""
+        prs = [p for p in self.read_prs() if p.repo == repo]
+        # Sort: OPEN first, then by updated (newest first)
+        state_order = {"OPEN": 0, "DRAFT": 1, "MERGED": 2, "CLOSED": 3}
+        prs.sort(key=lambda p: (
+            state_order.get(p.state, 4),
+            -(p.updated.timestamp() if p.updated else 0)
+        ))
+        return prs
+
+    def get_all_prs(self) -> list[PREntry]:
+        """Get all PRs, sorted: open first, then by updated."""
+        prs = self.read_prs()
+        state_order = {"OPEN": 0, "DRAFT": 1, "MERGED": 2, "CLOSED": 3}
+        prs.sort(key=lambda p: (
+            state_order.get(p.state, 4),
+            -(p.updated.timestamp() if p.updated else 0)
+        ))
+        return prs
+
+    def get_worktree_for_branch(self, repo: str, branch: str) -> Optional[LocalEntry]:
+        """Find worktree that matches a branch."""
+        for entry in self.read_local():
+            if entry.repo == repo and entry.branch == branch:
+                return entry
+        return None
+
 
 if __name__ == "__main__":
     # Test by reading actual files

tui/bearing_tui/state.py

@@ -60,15 +60,15 @@ Screen {
     border: round $border-focus;
 }
 
-/* Right panel - Worktrees */
-#worktrees-panel {
+/* Right panel - Main (Worktrees or Plans) */
+#main-panel {
     width: 1fr;
     background: $bg-panel;
     border: round $border;
     margin: 0 1 0 1;
 }
 
-#worktrees-panel:focus-within {
+#main-panel:focus-within {
     border: round $border-focus;
 }
 
@@ -83,15 +83,7 @@ Screen {
     padding: 0 1;
 }
 
-/* Footer with keybindings */
-#footer-bar {
-    width: 100%;
-    height: 1;
-    background: $bg-surface;
-    color: $text-dim;
-    padding: 0 1;
-    border-top: solid $border;
-}
+/* Footer uses Textual's built-in Footer widget */
 
 /* Project list styling */
 ProjectList {
@@ -176,6 +168,55 @@ WorktreeTable:focus > .datatable--odd-row {
     background: $bg-surface;
 }
 
+/* Plans table styling */
+PlansTable {
+    background: $bg-panel;
+    scrollbar-background: $bg-surface;
+    scrollbar-color: $border;
+    scrollbar-color-hover: $text-dim;
+    border: none;
+}
+
+PlansTable > .datatable--header {
+    background: $bg-surface;
+    color: $accent-purple;
+    text-style: bold;
+}
+
+/* Cursor when table has focus - bright selection */
+PlansTable:focus > .datatable--cursor {
+    background: #2d5a8a;
+    color: $text-bright;
+    text-style: bold;
+}
+
+/* Cursor when table doesn't have focus - dimmer but visible */
+PlansTable > .datatable--cursor {
+    background: $bg-selection;
+    color: $text;
+}
+
+PlansTable > .datatable--header-cursor {
+    background: $bg-surface;
+    color: $accent-purple;
+}
+
+PlansTable > .datatable--even-row {
+    background: $bg-panel;
+}
+
+PlansTable > .datatable--odd-row {
+    background: $bg-surface;
+}
+
+PlansTable:focus > .datatable--even-row {
+    background: $bg-panel;
+}
+
+PlansTable:focus > .datatable--odd-row {
+    background: $bg-surface;
+}
+
 /* Details panel styling */
 DetailsPanel {
     height: auto;
@@ -284,3 +325,54 @@ PlansList:focus PlanListItem.-highlight {
     color: $text-bright;
     text-style: bold;
 }
+
+/* PRs modal styling */
+PRsScreen {
+    align: center middle;
+}
+
+#prs-modal {
+    width: 90;
+    height: auto;
+    max-height: 80%;
+    background: $bg-panel;
+    border: round $accent-green;
+    padding: 1 2;
+}
+
+#prs-header {
+    height: 1;
+    margin-bottom: 1;
+}
+
+PRsTable {
+    background: $bg-panel;
+    height: auto;
+    max-height: 20;
+    border: none;
+}
+
+PRsTable > .datatable--header {
+    background: $bg-surface;
+    color: $accent-green;
+    text-style: bold;
+}
+
+PRsTable:focus > .datatable--cursor {
+    background: #2d5a8a;
+    color: $text-bright;
+    text-style: bold;
+}
+
+PRsTable > .datatable--cursor {
+    background: $bg-selection;
+    color: $text;
+}
+
+PRsTable > .datatable--even-row {
+    background: $bg-panel;
+}
+
+PRsTable > .datatable--odd-row {
+    background: $bg-surface;
+}

tui/bearing_tui/styles/app.tcss

@@ -3,7 +3,10 @@
 from .worktrees import WorktreeTable, WorktreeEntry, HealthEntry
 from .details import DetailsPanel, LocalEntry, WorkflowEntry
 from .details import HealthEntry as DetailsHealthEntry
-from .plans import PlansList, PlanEntry, load_plans
+from .plans import PlansList, load_plans
+from .plans import PlanEntry as LegacyPlanEntry
+from .plans_table import PlansTable, PlanEntry
+from .prs import PRsTable, PRDisplayEntry
 
 __all__ = [
     "ProjectList",
@@ -14,6 +17,10 @@
     "LocalEntry",
     "WorkflowEntry",
     "PlansList",
+    "PlansTable",
     "PlanEntry",
+    "LegacyPlanEntry",
     "load_plans",
+    "PRsTable",
+    "PRDisplayEntry",
 ]

tui/bearing_tui/widgets/__init__.py

@@ -0,0 +1,98 @@
+"""Plans table widget for the plans view."""
+from dataclasses import dataclass
+from pathlib import Path
+from typing import NamedTuple
+
+from textual.widgets import DataTable
+from textual.message import Message
+
+
+class PlanEntry(NamedTuple):
+    """Represents a plan entry."""
+    file_path: Path
+    project: str
+    title: str
+    issue: str | None
+    status: str
+    pr: str | None = None
+
+
+class PlansTable(DataTable):
+    """Table showing plans for selected project."""
+
+    class PlanSelected(Message):
+        """Emitted when a plan row is selected."""
+        def __init__(self, plan: PlanEntry) -> None:
+            self.plan = plan
+            super().__init__()
+
+    def __init__(self, **kwargs) -> None:
+        super().__init__(**kwargs)
+        self.cursor_type = "row"
+        self._plans: list[PlanEntry] = []
+
+    def _setup_columns(self) -> None:
+        """Add table columns."""
+        self.add_columns("Title", "Status", "PR", "Issue")
+
+    def on_mount(self) -> None:
+        """Set up table when mounted."""
+        self._setup_columns()
+
+    def set_plans(self, plans: list[PlanEntry]) -> None:
+        """Update table with plans."""
+        self._plans = plans
+        self.clear()
+
+        if not plans:
+            self.add_row("No plans", "", "", "", key="empty")
+            return
+
+        for plan in plans:
+            status_display = self._format_status(plan.status)
+            pr_display = plan.pr if plan.pr else "-"
+            issue_display = f"#{plan.issue}" if plan.issue else "-"
+            title = (plan.title[:35] + "...") if len(plan.title) > 35 else plan.title
+            self.add_row(title, status_display, pr_display, issue_display, key=str(plan.file_path))
+
+    def _format_status(self, status: str) -> str:
+        """Format status with color indicator."""
+        indicators = {
+            "active": "[green]\u25cf[/] active",
+            "in_progress": "[yellow]\u25cf[/] in_progress",
+            "draft": "[dim]\u25cf[/] draft",
+            "completed": "[blue]\u25cf[/] completed",
+        }
+        return indicators.get(status, f"[dim]\u25cb[/] {status}")
+
+    def on_data_table_row_selected(self, event: DataTable.RowSelected) -> None:
+        """Handle row selection and emit PlanSelected message."""
+        if event.row_key and event.row_key.value != "empty":
+            # Find the plan by file path
+            for plan in self._plans:
+                if str(plan.file_path) == event.row_key.value:
+                    self.post_message(self.PlanSelected(plan))
+                    break
+
+    def clear_plans(self) -> None:
+        """Clear the table and show empty state."""
+        self._plans = []
+        self.clear()
+        self.add_row("Select a project", "", "", "", key="empty")
+
+    def get_selected_plan(self) -> PlanEntry | None:
+        """Get the currently selected plan."""
+        if self.row_count == 0:
+            return None
+        try:
+            from textual.coordinate import Coordinate
+            cell_key = self.coordinate_to_cell_key(Coordinate(self.cursor_row, 0))
+            key = str(cell_key.row_key.value)
+            if key == "empty":
+                return None
+            for plan in self._plans:
+                if str(plan.file_path) == key:
+                    return plan
+        except Exception:
+            pass
+        return None