Fix footer, test isolation, cleanup obsolete tests

- Use Textual built-in Footer widget (fixes footer not showing)
- Add view indicator to title bar (Work/Plans)
- Show w/p keybindings in footer
- Isolate tests from user's session file via monkeypatch
- Remove obsolete modal tests (now fullscreen views)
- Attempt to fix selection preservation (partial - async timing issue)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: joshribakoff

tui/bearing_tui/app.py

@@ -197,7 +197,7 @@ class BearingApp(App):
     """Bearing worktree management TUI."""
 
     CSS_PATH = "styles/app.tcss"
-    TITLE = "⚓ Bearing [dev-check]"
+    TITLE = "⚓ Bearing "
 
     BINDINGS = [
         Binding("q", "quit", "Quit"),
@@ -210,8 +210,8 @@ class BearingApp(App):
         Binding("d", "daemon", "Daemon"),
         Binding("o", "open_item", "Open", show=False),
         # View switching
-        Binding("w", "switch_to_worktrees", "Worktrees", show=False),
-        Binding("p", "switch_to_plans", "Plans", show=False),
+        Binding("w", "switch_to_worktrees", "Work"),
+        Binding("p", "switch_to_plans", "Plans"),
         # Panel navigation by number (0-indexed)
         Binding("0", "focus_panel_0", "Projects", show=False),
         Binding("1", "focus_panel_1", "Main", show=False),
@@ -246,104 +246,84 @@ def __init__(self, workspace: Path | None = None):
 
     def compose(self) -> ComposeResult:
         """Create the app layout."""
-        yield Static("\u2693 Bearing [dev-check]", id="title")
+        yield Static("⚓ Bearing - Work", id="title")
         with Horizontal(id="main-container"):
             with Vertical(id="projects-panel"):
-                yield Label("[0] Projects [dev-check]", classes="panel-header")
+                yield Label("[0] Projects ", classes="panel-header")
                 yield ProjectList(id="project-list")
             with Vertical(id="main-panel"):
-                yield Label("[1] Worktrees [dev-check]", classes="panel-header", id="main-panel-header")
+                yield Label("[1] Worktrees ", classes="panel-header", id="main-panel-header")
                 yield WorktreeTable(id="worktree-table")
                 yield PlansTable(id="plans-table")
         yield Label("[2] Details", classes="panel-header details-header")
         yield DetailsPanel(id="details-panel")
-        yield Static(self._get_footer_text(), id="footer-bar")
-
-    def _get_footer_text(self) -> str:
-        """Get footer text with current mode highlighted."""
-        if self._view_mode == ViewMode.WORKTREES:
-            mode_text = "[bold cyan][w]orktrees[/] [dim][p]lans[/]"
-        else:
-            mode_text = "[dim][w]orktrees[/] [bold cyan][p]lans[/]"
-        return (
-            f"{mode_text}  "
-            "[yellow]j/k[/] nav  "
-            "[yellow]o[/]pen  "
-            "[yellow]r[/]efresh  "
-            "[yellow]R[/] PRs  "
-            "[yellow]p[/]lans  "
-            "[yellow]?[/] help  "
-            "[yellow]q[/]uit"
-        )
-
-    def _update_footer(self) -> None:
-        """Update footer with current mode."""
-        footer = self.query_one("#footer-bar", Static)
-        footer.update(self._get_footer_text())
+        yield Footer()
 
     def _update_view(self) -> None:
         """Update UI for current view mode."""
         worktree_table = self.query_one("#worktree-table", WorktreeTable)
         plans_table = self.query_one("#plans-table", PlansTable)
         header = self.query_one("#main-panel-header", Label)
+        title = self.query_one("#title", Static)
 
         if self._view_mode == ViewMode.WORKTREES:
+            title.update("⚓ Bearing - Work")
             worktree_table.display = True
             plans_table.display = False
             header.update("[1] Worktrees")
             self._panel_order = ["project-list", "worktree-table", "details-panel"]
         else:
+            title.update("⚓ Bearing - Plans")
             worktree_table.display = False
             plans_table.display = True
             header.update("[1] Plans")
             self._panel_order = ["project-list", "plans-table", "details-panel"]
 
-        self._update_footer()
-
         # Update project list for current view
         if self._view_mode == ViewMode.WORKTREES:
             self._refresh_worktrees_view()
         else:
             self._refresh_plans_view()
 
     def _refresh_worktrees_view(self) -> None:
-        """Refresh project list with worktree counts."""
+        """Refresh project list with worktree counts, preserving selection."""
         projects = self.state.get_projects()
         local_entries = self.state.read_local()
         counts: dict[str, int] = {}
         for entry in local_entries:
             counts[entry.repo] = counts.get(entry.repo, 0) + 1
         project_list = self.query_one(ProjectList)
-        project_list.set_projects(projects, counts)
+        project_list.set_projects(projects, counts, preserve_selection=self._current_project)
 
     def _refresh_plans_view(self) -> None:
-        """Refresh project list with plan counts."""
-        # Get projects that have plans
+        """Refresh project list with plan counts, preserving selection."""
         plan_projects = self.state.get_plan_projects()
         counts: dict[str, int] = {}
         for project in plan_projects:
             plans = self.state.get_plans_for_project(project)
             counts[project] = len(plans)
         project_list = self.query_one(ProjectList)
-        project_list.set_projects(plan_projects, counts)
+        project_list.set_projects(plan_projects, counts, preserve_selection=self._current_project)
 
     def action_switch_to_worktrees(self) -> None:
         """Switch to worktrees view."""
         if self._view_mode != ViewMode.WORKTREES:
             self._view_mode = ViewMode.WORKTREES
             self._update_view()
-            # If project selected, load its worktrees
+            # If project selected, load its worktrees and focus panel 1
             if self._current_project:
                 self._update_worktree_table(self._current_project)
+                self.query_one(WorktreeTable).focus()
 
     def action_switch_to_plans(self) -> None:
         """Switch to plans view."""
         if self._view_mode != ViewMode.PLANS:
             self._view_mode = ViewMode.PLANS
             self._update_view()
-            # If project selected, load its plans
+            # If project selected, load its plans and focus panel 1
             if self._current_project:
                 self._update_plans_table(self._current_project)
+                self.query_one(PlansTable).focus()
 
     @property
     def _session_file(self) -> Path:
@@ -482,16 +462,18 @@ def action_show_prs(self) -> None:
         self.push_screen(PRsScreen(self.workspace, self.state))
 
     def action_refresh(self) -> None:
-        """Refresh data for current view."""
+        """Refresh data for current view, preserving selection."""
+        saved_project = self._current_project
+
         if self._view_mode == ViewMode.WORKTREES:
             self._refresh_worktrees_view()
-            self.query_one(WorktreeTable).clear_worktrees()
+            if saved_project:
+                self._update_worktree_table(saved_project)
         else:
             self._refresh_plans_view()
-            self.query_one(PlansTable).clear_plans()
+            if saved_project:
+                self._update_plans_table(saved_project)
 
-        self.query_one(DetailsPanel).clear()
-        self._current_project = None
         self.notify("Data refreshed", timeout=2)
 
     def action_focus_panel_0(self) -> None:
@@ -546,8 +528,10 @@ def on_project_list_project_selected(self, event: ProjectList.ProjectSelected) -
         self._current_project = event.project
         if self._view_mode == ViewMode.WORKTREES:
             self._update_worktree_table(event.project)
+            self.query_one(WorktreeTable).focus()
         else:
             self._update_plans_table(event.project)
+            self.query_one(PlansTable).focus()
 
     def _update_worktree_table(self, project: str) -> None:
         """Update worktree table for selected project."""

tui/bearing_tui/styles/app.tcss

@@ -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 {

tui/bearing_tui/widgets/projects.py

@@ -67,9 +67,17 @@ def set_projects(self, projects: list[str], counts: dict[str, int] | None = None
         if not projects:
             self.append(ListItem(Static("No projects found")))
         else:
+            selection_index = None
             for i, project in enumerate(projects):
                 count = self._counts.get(project, 0)
-                self.append(ProjectListItem(project, count))
-                # Restore selection if this is the preserved project
+                item = ProjectListItem(project, count)
+                self.append(item)
+                # Track selection for restoration after all items added
                 if preserve_selection and project == preserve_selection:
-                    self.index = i
+                    selection_index = i
+            # Restore selection after all items are added
+            if selection_index is not None:
+                self.index = selection_index
+                # Manually set highlighted since watch_index may not fire correctly
+                if self.highlighted_child:
+                    self.highlighted_child.highlighted = True

tui/tests/conftest.py

@@ -1,8 +1,31 @@
 """Pytest fixtures for Bearing TUI tests."""
 import shutil
+from pathlib import Path
 
 import pytest
 
+
+@pytest.fixture(autouse=True)
+def isolate_session(tmp_path, monkeypatch):
+    """Isolate session file to temp directory to avoid affecting real user state.
+
+    pytest's tmp_path fixture creates a UNIQUE temp directory per test, e.g.:
+    /tmp/pytest-of-user/pytest-123/test_foo0/
+    /tmp/pytest-of-user/pytest-123/test_bar0/
+    So tests won't clobber each other.
+    """
+    # Create temp .bearing directory in this test's unique tmp_path
+    temp_bearing = tmp_path / ".bearing"
+    temp_bearing.mkdir()
+
+    # Monkeypatch Path.home() to return this test's temp directory
+    # This ensures tests don't read/write the user's real ~/.bearing/
+    def mock_home():
+        return tmp_path
+
+    monkeypatch.setattr(Path, "home", staticmethod(mock_home))
+    yield
+
 from tests.mock_data import (
     create_normal_workspace,
     create_empty_workspace,

tui/tests/test_app.py

@@ -342,8 +342,9 @@ async def test_view_switching_to_worktrees(workspace):
 
 @pytest.mark.asyncio
 async def test_view_switch_preserves_project_selection(workspace):
-    """Test that project selection persists when switching between views."""
+    """Test that project selection AND focus persist when switching views."""
     from bearing_tui.app import ViewMode
+    from bearing_tui.widgets import PlansTable
 
     # Create plans directory
     plans_dir = workspace / "plans" / "myapp"
@@ -352,15 +353,15 @@ async def test_view_switch_preserves_project_selection(workspace):
 
     app = BearingApp(workspace=workspace)
     async with app.run_test() as pilot:
-        # Select a project
-        project_list = app.query_one(ProjectList)
+        # Select a project (this auto-focuses worktree table)
         await pilot.press("j")  # Move to first project
         await pilot.press("enter")
         await pilot.pause()
 
-        # Verify project is selected
+        # Verify project is selected and worktree table is focused
         assert app._current_project is not None
         selected_project = app._current_project
+        assert app.focused.id == "worktree-table"
 
         # Switch to plans view
         await pilot.press("p")
@@ -369,6 +370,8 @@ async def test_view_switch_preserves_project_selection(workspace):
         # Project selection should persist
         assert app._current_project == selected_project
         assert app._view_mode == ViewMode.PLANS
+        # Focus should be on plans table (panel 1), NOT project list (panel 0)
+        assert app.focused.id == "plans-table"
 
         # Switch back to worktrees
         await pilot.press("w")
@@ -377,31 +380,18 @@ async def test_view_switch_preserves_project_selection(workspace):
         # Project selection should still persist
         assert app._current_project == selected_project
         assert app._view_mode == ViewMode.WORKTREES
+        # Focus should be on worktree table (panel 1)
+        assert app.focused.id == "worktree-table"
 
 
 @pytest.mark.asyncio
-async def test_footer_shows_current_mode(workspace):
-    """Test that footer highlights current mode."""
-    from bearing_tui.app import ViewMode
+async def test_footer_widget_exists(workspace):
+    """Test that footer widget is present."""
+    from textual.widgets import Footer
 
     app = BearingApp(workspace=workspace)
     async with app.run_test() as pilot:
-        # In worktrees mode
-        assert app._view_mode == ViewMode.WORKTREES
-
-        # The _get_footer_text method should return text with worktrees highlighted
-        footer_text = app._get_footer_text()
-        assert "[bold cyan][w]orktrees[/]" in footer_text
-        assert "[dim][p]lans[/]" in footer_text
-
-        # Switch to plans
-        await pilot.press("p")
         await pilot.pause()
-
-        # In plans mode
-        assert app._view_mode == ViewMode.PLANS
-
-        # Footer should now highlight plans
-        footer_text = app._get_footer_text()
-        assert "[dim][w]orktrees[/]" in footer_text
-        assert "[bold cyan][p]lans[/]" in footer_text
+        footer = app.query_one(Footer)
+        assert footer is not None
+        assert footer.display is True

tui/tests/test_comprehensive.py

@@ -191,6 +191,31 @@ async def test_panel_0_to_1_selection(workspace):
         assert worktree_table.row_count > 0
 
 
+@pytest.mark.asyncio
+async def test_project_selection_auto_focuses_worktrees(workspace):
+    """Test that selecting a project automatically focuses the worktree panel."""
+    app = BearingApp(workspace=workspace)
+    async with app.run_test(size=(100, 25)) as pilot:
+        await pilot.pause()
+
+        # Start on project list
+        await pilot.press("0")
+        await pilot.pause()
+        assert app.focused.id == "project-list"
+
+        # Select a project with Enter
+        await pilot.press("j")
+        await pilot.press("enter")
+        await pilot.pause()
+
+        # Should AUTO-focus worktree table (no manual "1" press needed)
+        assert app.focused.id == "worktree-table"
+
+        # And worktrees should be populated
+        worktree_table = app.query_one(WorktreeTable)
+        assert worktree_table.row_count > 0
+
+
 # ============================================================================
 # Empty States
 # ============================================================================