savepoint 1.0.2 → 1.0.4

package/internal/board/update_test.go

@@ -5,9 +5,11 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/opencode/savepoint/internal/data"
+	"github.com/opencode/savepoint/internal/testutil"
 )
 
 func requireModel(t *testing.T, got tea.Model) Model {
@@ -178,7 +180,14 @@ func TestUpdate_unknownMsgNoOp(t *testing.T) {
 	}
 }
 
-func TestUpdate_mSetsRouterToFocusedTask(t *testing.T) {
+func processCmd(t *testing.T, m Model, cmd tea.Cmd) Model {
+	t.Helper()
+	msg := cmd()
+	got, _ := m.Update(msg)
+	return requireModel(t, got)
+}
+
+func TestUpdate_pSetsRouterToFocusedTask(t *testing.T) {
 	root := writeRouterFixture(t)
 	tasks := []data.Task{
 		{ID: "E05-tasking-permissions/T004-implement-m-hotkey", Release: "v1.1", Epic: "E05-tasking-permissions", Column: data.ColumnPlanned},
@@ -187,8 +196,9 @@ func TestUpdate_mSetsRouterToFocusedTask(t *testing.T) {
 	m := NewModel(tasks, "v1.1", "E05-tasking-permissions")
 	m.Root = root
 
-	got, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("m")})
-	updated := requireModel(t, got)
+	got, cmd := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("p")})
+	first := requireModel(t, got)
+	updated := processCmd(t, first, cmd)
 
 	if !strings.Contains(updated.StatusMessage, "Router set to v1.1 E05-tasking-permissions/T004") {
 		t.Fatalf("StatusMessage = %q", updated.StatusMessage)
@@ -208,7 +218,7 @@ func TestUpdate_mSetsRouterToFocusedTask(t *testing.T) {
 	}
 }
 
-func TestUpdate_mSetsAuditPendingForLastUncompletedTask(t *testing.T) {
+func TestUpdate_pSetsRouterToFocusedTaskWhenItIsLastUncompleted(t *testing.T) {
 	root := writeRouterFixture(t)
 	tasks := []data.Task{
 		{ID: "E05-tasking-permissions/T004-implement-m-hotkey", Release: "v1.1", Epic: "E05-tasking-permissions", Column: data.ColumnPlanned},
@@ -217,28 +227,47 @@ func TestUpdate_mSetsAuditPendingForLastUncompletedTask(t *testing.T) {
 	m := NewModel(tasks, "v1.1", "E05-tasking-permissions")
 	m.Root = root
 
-	got, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("m")})
-	updated := requireModel(t, got)
+	got, cmd := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("p")})
+	first := requireModel(t, got)
+	updated := processCmd(t, first, cmd)
 
-	if updated.StatusMessage != "Audit pending for E05-tasking-permissions" {
+	if !strings.Contains(updated.StatusMessage, "Router set to v1.1 E05-tasking-permissions/T004") {
 		t.Fatalf("StatusMessage = %q", updated.StatusMessage)
 	}
 	state := readRouterFixture(t, root)
-	if state.State != "audit-pending" {
-		t.Errorf("router state = %q, want audit-pending", state.State)
+	if state.State != "task-building" {
+		t.Errorf("router state = %q, want task-building", state.State)
 	}
-	if state.Task != "" {
-		t.Errorf("router task = %q, want empty", state.Task)
+	if state.Task != "E05-tasking-permissions/T004-implement-m-hotkey" {
+		t.Errorf("router task = %q, want focused task", state.Task)
 	}
 }
 
-func TestUpdate_mDoesNothingWhenOverlayOpen(t *testing.T) {
+func TestUpdate_pDoesNothingWhenOverlayOpen(t *testing.T) {
 	root := writeRouterFixture(t)
 	tasks := []data.Task{{ID: "E05-tasking-permissions/T004-implement-m-hotkey", Release: "v1.1", Epic: "E05-tasking-permissions", Column: data.ColumnPlanned}}
 	m := NewModel(tasks, "v1.1", "E05-tasking-permissions")
 	m.Root = root
 	m.Overlay = OverlayHelp
 
+	got, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("p")})
+	updated := requireModel(t, got)
+
+	if updated.StatusMessage != "" {
+		t.Fatalf("StatusMessage = %q, want empty", updated.StatusMessage)
+	}
+	state := readRouterFixture(t, root)
+	if state.Task != "T001" {
+		t.Errorf("router task = %q, want unchanged T001", state.Task)
+	}
+}
+
+func TestUpdate_mDoesNotSetRouterTask(t *testing.T) {
+	root := writeRouterFixture(t)
+	tasks := []data.Task{{ID: "E05-tasking-permissions/T004-implement-m-hotkey", Release: "v1.1", Epic: "E05-tasking-permissions", Column: data.ColumnPlanned}}
+	m := NewModel(tasks, "v1.1", "E05-tasking-permissions")
+	m.Root = root
+
 	got, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("m")})
 	updated := requireModel(t, got)
 
@@ -251,14 +280,14 @@ func TestUpdate_mDoesNothingWhenOverlayOpen(t *testing.T) {
 	}
 }
 
-func TestUpdate_mDoesNotSetDoneTask(t *testing.T) {
+func TestUpdate_pDoesNotSetDoneTask(t *testing.T) {
 	root := writeRouterFixture(t)
 	tasks := []data.Task{{ID: "E05-tasking-permissions/T004-implement-m-hotkey", Release: "v1.1", Epic: "E05-tasking-permissions", Column: data.ColumnDone}}
 	m := NewModel(tasks, "v1.1", "E05-tasking-permissions")
 	m.Root = root
 	m.FocusedColumn = data.ColumnDone
 
-	got, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("m")})
+	got, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("p")})
 	updated := requireModel(t, got)
 
 	if updated.StatusMessage != "Router not updated: focused task is done" {
@@ -270,13 +299,292 @@ func TestUpdate_mDoesNotSetDoneTask(t *testing.T) {
 	}
 }
 
+func TestUpdate_spaceShowsPhaseTransitionMessage(t *testing.T) {
+	tasks := []data.Task{{ID: "E05/T004", Column: data.ColumnInProgress, Stage: data.StageBuild}}
+	m := NewModel(tasks, "v1.1", "E05")
+	m.FocusedColumn = data.ColumnInProgress
+
+	got, _ := m.Update(tea.KeyMsg{Type: tea.KeySpace})
+	updated := requireModel(t, got)
+
+	if updated.StatusMessage != "Moved T004 to test" {
+		t.Fatalf("StatusMessage = %q", updated.StatusMessage)
+	}
+	if updated.AllTasks[0].Stage != data.StageTest {
+		t.Errorf("Stage = %q, want test", updated.AllTasks[0].Stage)
+	}
+}
+
+func TestUpdate_spaceWarnsAfterStaleMtime(t *testing.T) {
+	path := filepath.Join(t.TempDir(), "T004-task.md")
+	content := "---\nid: E05/T004\nstatus: in_progress\nstage: build\nphase: build\n---\n\n# Task\n"
+	testutil.WriteFile(t, path, content)
+	fi, err := os.Stat(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	tasks := []data.Task{{
+		ID:     "E05/T004",
+		Column: data.ColumnInProgress,
+		Stage:  data.StageBuild,
+		Path:   path,
+		Mtime:  fi.ModTime().Add(-time.Hour),
+	}}
+	m := NewModel(tasks, "v1.1", "E05")
+	m.FocusedColumn = data.ColumnInProgress
+
+	got, cmd := m.Update(tea.KeyMsg{Type: tea.KeySpace})
+	// cmd should be errorMsg since mtime is stale
+	msg := cmd()
+	if _, ok := msg.(errorMsg); !ok {
+		t.Fatalf("expected errorMsg, got %T", msg)
+	}
+	updated := requireModel(t, got)
+	got2, _ := updated.Update(msg)
+	updated2 := requireModel(t, got2)
+
+	if updated2.StatusMessage != "mtime conflict: refresh before retrying" {
+		t.Fatalf("StatusMessage = %q", updated2.StatusMessage)
+	}
+	raw, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	parsed, err := data.NewParser().ParseTaskFile(path, string(raw))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if parsed.Stage != data.StageBuild {
+		t.Errorf("persisted Stage = %q, want build", parsed.Stage)
+	}
+	if !strings.Contains(string(raw), "stage:") {
+		t.Error("legacy stage field should remain when write is rejected")
+	}
+	if updated2.AllTasks[0].Stage != data.StageBuild {
+		t.Errorf("model Stage = %q after rejected write, want build", updated2.AllTasks[0].Stage)
+	}
+}
+
+func TestUpdate_backspaceShowsRetreatMessageAndSyncsStatus(t *testing.T) {
+	tasks := []data.Task{{ID: "E05/T004", Status: string(data.ColumnDone), Column: data.ColumnDone}}
+	m := NewModel(tasks, "v1.1", "E05")
+	m.FocusedColumn = data.ColumnDone
+
+	got, _ := m.Update(tea.KeyMsg{Type: tea.KeyBackspace})
+	updated := requireModel(t, got)
+
+	if updated.StatusMessage != "Moved back T004 to audit" {
+		t.Fatalf("StatusMessage = %q", updated.StatusMessage)
+	}
+	if updated.AllTasks[0].Column != data.ColumnInProgress {
+		t.Errorf("Column = %q, want in_progress", updated.AllTasks[0].Column)
+	}
+	if updated.AllTasks[0].Stage != data.StageAudit {
+		t.Errorf("Stage = %q, want audit", updated.AllTasks[0].Stage)
+	}
+	if updated.AllTasks[0].Status != string(data.ColumnInProgress) {
+		t.Errorf("Status = %q, want in_progress", updated.AllTasks[0].Status)
+	}
+}
+
+func TestUpdate_key1SwitchesToDetailTab(t *testing.T) {
+	m := NewModel(nil, "v1.1", "E06-audit-command")
+	m.Epics = []string{"E06-audit-command"}
+	m.Overlay = OverlayEpicDetail
+	m.EpicDetailTab = 1
+	m.EpicDetailOffset = 5
+
+	got, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("1")})
+	updated := requireModel(t, got)
+
+	if updated.EpicDetailTab != 0 {
+		t.Errorf("EpicDetailTab = %d, want 0", updated.EpicDetailTab)
+	}
+	if updated.EpicDetailOffset != 0 {
+		t.Errorf("EpicDetailOffset = %d, want 0 (reset on tab switch)", updated.EpicDetailOffset)
+	}
+}
+
+func TestUpdate_key2SwitchesToAuditTabAndLoadsContent(t *testing.T) {
+	root := t.TempDir()
+	auditDir := filepath.Join(root, "releases", "v1.1", "epics", "E06-audit-command")
+	testutil.MkdirAll(t, auditDir)
+	auditContent := "# E06 Audit\n\n## Findings\n\n- [x] All good\n"
+	testutil.WriteFile(t, filepath.Join(auditDir, "E06-Audit.md"), auditContent)
+
+	m := NewModel(nil, "v1.1", "E06-audit-command")
+	m.Root = root
+	m.Epics = []string{"E06-audit-command"}
+	m.EpicPanelCursor = 0
+	m.Overlay = OverlayEpicDetail
+	m.EpicDetailTab = 0
+	m.EpicDetailOffset = 3
+
+	got, cmd := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("2")})
+	updated := requireModel(t, got)
+
+	if updated.EpicDetailTab != 1 {
+		t.Errorf("EpicDetailTab = %d, want 1", updated.EpicDetailTab)
+	}
+	if updated.EpicDetailOffset != 0 {
+		t.Errorf("EpicDetailOffset = %d, want 0 (reset on tab switch)", updated.EpicDetailOffset)
+	}
+
+	msg := cmd()
+	got2, _ := updated.Update(msg)
+	updated2 := requireModel(t, got2)
+	if updated2.EpicAuditContent != auditContent {
+		t.Errorf("EpicAuditContent = %q, want %q", updated2.EpicAuditContent, auditContent)
+	}
+}
+
+func TestUpdate_key2LoadsAuditForOpenedEpicWhenPanelCursorStale(t *testing.T) {
+	root := t.TempDir()
+	epicA := filepath.Join(root, "releases", "v1.1", "epics", "E02-cross-platform-compatibility")
+	epicB := filepath.Join(root, "releases", "v1.1", "epics", "E06-audit-command")
+	testutil.MkdirAll(t, epicA)
+	testutil.MkdirAll(t, epicB)
+	auditContent := "# E06 Audit\n\n## Main Findings\nE06 content\n"
+	testutil.WriteFile(t, filepath.Join(epicB, "E06-Audit.md"), auditContent)
+
+	m := NewModel(nil, "v1.1", "E06-audit-command")
+	m.Root = root
+	m.Epics = []string{"E02-cross-platform-compatibility", "E06-audit-command"}
+	m.SelectedEpic = "E06-audit-command"
+	m.EpicDetailEpic = "E06-audit-command"
+	m.EpicPanelCursor = 0
+	m.Overlay = OverlayEpicDetail
+
+	got, cmd := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("2")})
+	updated := requireModel(t, got)
+
+	msg := cmd()
+	got2, _ := updated.Update(msg)
+	updated2 := requireModel(t, got2)
+	if updated2.EpicAuditContent != auditContent {
+		t.Errorf("EpicAuditContent = %q, want opened epic audit content", updated2.EpicAuditContent)
+	}
+}
+
+func TestUpdate_key2FallsBackWhenNoAuditFile(t *testing.T) {
+	m := NewModel(nil, "v1.1", "E06-audit-command")
+	m.Epics = []string{"E06-audit-command"}
+	m.EpicPanelCursor = 0
+	m.Overlay = OverlayEpicDetail
+
+	got, cmd := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("2")})
+	updated := requireModel(t, got)
+
+	if updated.EpicDetailTab != 1 {
+		t.Errorf("EpicDetailTab = %d, want 1", updated.EpicDetailTab)
+	}
+
+	msg := cmd()
+	got2, _ := updated.Update(msg)
+	updated2 := requireModel(t, got2)
+	if updated2.EpicAuditContent != "(no audit available)" {
+		t.Errorf("EpicAuditContent = %q, want \"(no audit available)\"", updated2.EpicAuditContent)
+	}
+}
+
+func TestUpdate_key2CachesAuditContent(t *testing.T) {
+	m := NewModel(nil, "v1.1", "E06-audit-command")
+	m.Epics = []string{"E06-audit-command"}
+	m.EpicPanelCursor = 0
+	m.Overlay = OverlayEpicDetail
+	m.EpicAuditContent = "already cached"
+
+	got, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("2")})
+	updated := requireModel(t, got)
+
+	if updated.EpicAuditContent != "already cached" {
+		t.Errorf("EpicAuditContent = %q, want cached value preserved", updated.EpicAuditContent)
+	}
+}
+
+func TestUpdate_openEpicDetailOverlayResetsTabState(t *testing.T) {
+	m := NewModel(nil, "v1.1", "E06-audit-command")
+	m.Epics = []string{"E06-audit-command"}
+	m.EpicPanelCursor = 0
+	m.EpicDetailTab = 1
+	m.EpicAuditContent = "stale content"
+
+	m.openEpicDetailOverlay()
+
+	if m.EpicDetailTab != 0 {
+		t.Errorf("EpicDetailTab = %d, want 0 after overlay open", m.EpicDetailTab)
+	}
+	if m.EpicAuditContent != "" {
+		t.Errorf("EpicAuditContent = %q, want empty after overlay open", m.EpicAuditContent)
+	}
+}
+
+func TestUpdate_tabKeysNoopOutsideEpicDetailOverlay(t *testing.T) {
+	m := NewModel(nil, "v1.1", "E06-audit-command")
+	m.Overlay = OverlayHelp
+	m.EpicDetailTab = 0
+
+	got, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune("2")})
+	updated := requireModel(t, got)
+
+	if updated.EpicDetailTab != 0 {
+		t.Errorf("EpicDetailTab changed outside EpicDetail overlay: got %d", updated.EpicDetailTab)
+	}
+}
+
+func TestReloadMsgUpdatesRouterState(t *testing.T) {
+	m := NewModel(nil, "v1", "E01")
+	m.RouterState = &data.RouterState{State: "task-building", Task: "E01/T001", NextAction: "Build E01/T001."}
+	m.RouterTask = "E01/T001"
+
+	newState := &data.RouterState{State: "task-building", Task: "E01/T002", NextAction: "Build E01/T002."}
+	got, _ := m.Update(reloadMsg{
+		tasks:        nil,
+		releases:     []string{"v1"},
+		releaseEpics: map[string][]string{"v1": {"E01"}},
+		routerState:  newState,
+	})
+	updated := requireModel(t, got)
+
+	if updated.RouterTask != "E01/T002" {
+		t.Errorf("RouterTask = %q, want E01/T002", updated.RouterTask)
+	}
+	if updated.RouterState == nil || updated.RouterState.NextAction != "Build E01/T002." {
+		t.Errorf("RouterState.NextAction = %q, want Build E01/T002.", updated.RouterState.NextAction)
+	}
+}
+
+func TestEnsureFocusedTaskVisible_lastTaskAlwaysVisible(t *testing.T) {
+	// 5 tasks, pageSize=4 at standard height. Pressing down past the page
+	// boundary must keep the focused task in the rendered window.
+	tasks := make([]data.Task, 5)
+	for i := range tasks {
+		tasks[i] = data.Task{ID: "T00" + string(rune('1'+i)), Column: data.ColumnPlanned}
+	}
+	m := NewModel(tasks, "v1", "E01")
+	m.Width = 100
+	m.Height = 24
+	m.FocusedColumn = data.ColumnPlanned
+	m.FocusedTask = 4
+
+	m.ensureFocusedTaskVisible()
+
+	offset := m.ColumnOffsets[data.ColumnPlanned]
+	pageSize := m.columnPageSize() // 4
+	if offset+pageSize-1 < 4 {
+		t.Errorf("offset=%d pageSize=%d: focused task 4 not in [offset, offset+pageSize-1]", offset, pageSize)
+	}
+	// Render must actually show the focused task (not cut off by scroll indicator).
+	got := RenderColumn(tasks, data.ColumnPlanned, 30, CalculateLayout(100, 24).ContentHeight, offset, 4, true, nil)
+	if !strings.Contains(got, tasks[4].ID) {
+		t.Errorf("focused last task %q not visible in rendered column (offset=%d):\n%s", tasks[4].ID, offset, got)
+	}
+}
+
 func writeRouterFixture(t *testing.T) string {
 	t.Helper()
 	root := t.TempDir()
-	content := "# Agent State Machine\n\n## Current state\n\n```yaml\nstate: task-building\nrelease: v1.1\nepic: E05\ntask: T001\nnext_action: Build T001.\n```\n"
-	if err := os.WriteFile(filepath.Join(root, "router.md"), []byte(content), 0644); err != nil {
-		t.Fatal(err)
-	}
+	testutil.WriteRouter(t, root, "task-building", "v1.1", "E05", "T001", "Build T001.")
 	return root
 }
 

package/internal/board/util.go

@@ -0,0 +1,76 @@
+package board
+
+import "strings"
+
+// sliceIndex returns the index of target in items, or 0 if not found.
+func sliceIndex(items []string, target string) int {
+	for i, e := range items {
+		if e == target {
+			return i
+		}
+	}
+	return 0
+}
+
+// WrapText wraps s to fit within width, splitting on word boundaries.
+func WrapText(s string, width int) []string {
+	if width < 4 {
+		width = 4
+	}
+	words := strings.Fields(s)
+	if len(words) == 0 {
+		return nil
+	}
+	lines := []string{}
+	current := ""
+	for _, word := range words {
+		if len([]rune(word)) > width {
+			if current != "" {
+				lines = append(lines, current)
+				current = ""
+			}
+			lines = append(lines, SplitLongWord(word, width)...)
+			continue
+		}
+		if current == "" {
+			current = word
+			continue
+		}
+		if len([]rune(current))+1+len([]rune(word)) <= width {
+			current += " " + word
+			continue
+		}
+		lines = append(lines, current)
+		current = word
+	}
+	if current != "" {
+		lines = append(lines, current)
+	}
+	return lines
+}
+
+// SplitLongWord splits a long word into chunks of at most width runes.
+func SplitLongWord(word string, width int) []string {
+	runes := []rune(word)
+	lines := []string{}
+	for len(runes) > width {
+		lines = append(lines, string(runes[:width]))
+		runes = runes[width:]
+	}
+	if len(runes) > 0 {
+		lines = append(lines, string(runes))
+	}
+	return lines
+}
+
+// truncate clips s to max runes, appending "…" if clipped.
+func truncate(s string, max int) string {
+	runes := []rune(s)
+	if len(runes) <= max {
+		return s
+	}
+	if max <= 1 {
+		return "…"
+	}
+	return string(runes[:max-1]) + "…"
+}

package/internal/board/view.go

@@ -28,9 +28,18 @@ func (m Model) View() string {
 
 	header := m.renderHeader(w)
 	nextActivity := m.renderNextActivityLine(w)
-	layout := CalculateLayoutWithChrome(w, h, extraHeaderLines(nextActivity))
+	extra := extraHeaderLines(nextActivity)
+	layout := CalculateLayoutWithChrome(w, h, extra)
 	topDivider := dividerLine(w)
 	board := m.renderBoard(layout)
+	boardBudget := h - 8 - extra
+	if boardBudget < 0 {
+		boardBudget = 0
+	}
+	boardLines := strings.Split(board, "\n")
+	if len(boardLines) > boardBudget {
+		board = strings.Join(boardLines[:boardBudget], "\n")
+	}
 	bottomDivider := dividerLine(w)
 	footer := m.renderFooter(w)
 	sections := []string{header}
@@ -67,11 +76,13 @@ func (m Model) View() string {
 
 	if m.Overlay == OverlayEpicDetail {
 		ow := overlayWidth(w)
-		epicSlug := ""
-		if m.EpicPanelCursor >= 0 && m.EpicPanelCursor < len(m.Epics) {
-			epicSlug = m.Epics[m.EpicPanelCursor]
+		epicSlug := m.epicDetailEpic()
+		var detail string
+		if m.EpicDetailTab == 1 {
+			detail = RenderEpicAuditTab(epicSlug, m.EpicAuditContent, ow, detailMaxHeight(h), m.EpicDetailOffset, m.EpicDetailTab)
+		} else {
+			detail = RenderEpicDetail(epicSlug, m.EpicDetailContent, ow, detailMaxHeight(h), m.EpicDetailOffset, m.EpicDetailTab)
 		}
-		detail := RenderEpicDetail(epicSlug, m.EpicDetailContent, ow, detailMaxHeight(h), m.EpicDetailOffset)
 		return overlayOnBase(dimLines(base), detail, w, h)
 	}
 
@@ -137,13 +148,13 @@ func FormatNextActivity(state *data.RouterState) string {
 	var s string
 	switch state.State {
 	case "task-building":
-		s = fmt.Sprintf("Build %s %s/%s", state.Release, shortRouterID(state.Epic), shortRouterID(state.Task))
+		s = fmt.Sprintf("Build %s %s/%s", state.Release, shortID(state.Epic), shortID(state.Task))
 	case "audit-pending":
-		s = fmt.Sprintf("Audit %s", shortRouterID(state.Epic))
+		s = fmt.Sprintf("Audit %s", shortID(state.Epic))
 	case "epic-design":
-		s = fmt.Sprintf("Design %s", shortRouterID(state.Epic))
+		s = fmt.Sprintf("Design %s", shortID(state.Epic))
 	case "epic-task-breakdown":
-		s = fmt.Sprintf("Plan %s", shortRouterID(state.Epic))
+		s = fmt.Sprintf("Plan %s", shortID(state.Epic))
 	case "pre-implementation":
 		s = fmt.Sprintf("Planning %s", state.Release)
 	default:
@@ -152,19 +163,7 @@ func FormatNextActivity(state *data.RouterState) string {
 	return xansi.Truncate(s, 20, "…")
 }
 
-// shortRouterID extracts the compact prefix from a full router slug.
-// "E01-tui-optimisation/T001-border-resize-fix" → "T001"
-// "E01-tui-optimisation" → "E01"
-func shortRouterID(full string) string {
-	part := full
-	if i := strings.LastIndex(full, "/"); i >= 0 {
-		part = full[i+1:]
-	}
-	if i := strings.Index(part, "-"); i >= 0 {
-		return part[:i]
-	}
-	return part
-}
+
 
 func (m Model) focusedTask() (data.Task, bool) {
 	tasks := m.Tasks[m.FocusedColumn]
@@ -243,7 +242,7 @@ func (m Model) renderBoard(layout Layout) string {
 	cols := m.renderColumns(layout)
 	var content string
 	if layout.EpicPanelVisible {
-		epic := m.renderEpicPanel(layout.EpicPanelWidth)
+		epic := m.renderEpicPanel(layout.EpicPanelWidth, layout.ContentHeight)
 		content = lipgloss.JoinHorizontal(lipgloss.Top, epic, cols)
 	} else {
 		content = cols
@@ -263,8 +262,8 @@ func (m Model) renderColumns(layout Layout) string {
 	return lipgloss.JoinHorizontal(lipgloss.Top, rendered...)
 }
 
-func (m Model) renderEpicPanel(w int) string {
-	return RenderEpicSidebar(m.Epics, m.SelectedEpic, w, m.EpicPanelFocus, m.EpicPanelCursor, m.EpicStatus)
+func (m Model) renderEpicPanel(w int, maxHeight int) string {
+	return RenderEpicSidebar(m.Epics, m.SelectedEpic, w, m.EpicPanelFocus, m.EpicPanelCursor, m.EpicStatus, maxHeight)
 }
 
 func (m Model) renderColumn(col data.ColumnType, colW, maxHeight int) string {
@@ -291,9 +290,13 @@ func (m Model) renderFooter(termW int) string {
 			styles.FooterDivider.Render(" │ ")+
 			styles.FooterPhaseAudit.Render("AUDIT"),
 	)
-	hints := footerLine(termW, styles.FooterHints.Render("←/→:nav  E:epic  R:release  ?:help  q:quit"))
-	spacer := footerLine(termW, "")
-	return lipgloss.JoinVertical(lipgloss.Center, phase, spacer, hints)
+	hints := footerLine(termW, styles.FooterHints.Render("←/→:nav  p: Priority  R:release  ?:help  q:quit"))
+	status := ""
+	if m.StatusMessage != "" {
+		status = styles.StatusBar.Render(m.StatusMessage)
+	}
+	statusLine := footerLine(termW, status)
+	return lipgloss.JoinVertical(lipgloss.Center, phase, statusLine, hints)
 }
 
 func dividerLine(termW int) string {