ef5a4d1 fix(session): address recent navigation review · vev

M internal/usecase/daemon/input_test.go +13 -0


@@ -320,6 +320,19 @@ func TestPaletteBackForwardSessionStaleTrail(t *testing.T) {
320	320		runPaletteCommand(t, d, current, ac, "BSK")
321	321		require.Same(t, newer, ac.currentSession())
322	322		})
	323	+
	324	+	t.Run("failed switch does not advance navigator index", func(t *testing.T) {
	325	+	d, current, ac, _, releases := newRecentNavigationTestSessions(t)
	326	+	defer releaseAll(releases)
	327	+	current.mu.Lock()
	328	+	current.client = nil
	329	+	current.mu.Unlock()
	330	+
	331	+	runPaletteCommand(t, d, current, ac, "BSK")
	332	+
	333	+	require.Same(t, current, ac.currentSession())
	334	+	require.Zero(t, ac.recentNav.index)
	335	+	})
323	336		}
324	337
325	338		func newRecentNavigationTestSessions(t testing.T) (Daemon, session, attachedClient, chan ports.Frame, []func()) {


@@ -320,6 +320,19 @@ func TestPaletteBackForwardSessionStaleTrail(t *testing.T) {
320	runPaletteCommand(t, d, current, ac, "BSK")	320		runPaletteCommand(t, d, current, ac, "BSK")
321	require.Same(t, newer, ac.currentSession())	321		require.Same(t, newer, ac.currentSession())
322	})	322		})
		323	+
		324	+	t.Run("failed switch does not advance navigator index", func(t *testing.T) {
		325	+	d, current, ac, _, releases := newRecentNavigationTestSessions(t)
		326	+	defer releaseAll(releases)
		327	+	current.mu.Lock()
		328	+	current.client = nil
		329	+	current.mu.Unlock()
		330	+
		331	+	runPaletteCommand(t, d, current, ac, "BSK")
		332	+
		333	+	require.Same(t, current, ac.currentSession())
		334	+	require.Zero(t, ac.recentNav.index)
		335	+	})
323	}	336		}
324		337
325	func newRecentNavigationTestSessions(t testing.T) (Daemon, session, attachedClient, chan ports.Frame, []func()) {	338		func newRecentNavigationTestSessions(t testing.T) (Daemon, session, attachedClient, chan ports.Frame, []func()) {

M internal/usecase/daemon/recent_nav.go +10 -2


@@ -46,8 +46,16 @@ func (d Daemon) navigateRecentSession(sess session, ac *attachedClient, delta
46	46		d.paint(sess, ac, true)
47	47		return
48	48		}
49		-	ac.recentNav.index = next
50		-	d.switchToTarget(sess, ac, picker.Target{Session: ac.recentNav.ids[next], TabIndex: -1})
	49	+	targetID := ac.recentNav.ids[next]
	50	+	targetSess := d.sessionByID(targetID)
	51	+	if targetSess == nil {
	52	+	d.paint(sess, ac, true)
	53	+	return
	54	+	}
	55	+	d.switchToTarget(sess, ac, picker.Target{Session: targetID, TabIndex: -1})
	56	+	if ac.currentSession() == targetSess {
	57	+	ac.recentNav.index = next
	58	+	}
51	59		}
52	60
53	61		func (d Daemon) pruneRecentNav(n recentSessionNavigator) bool {

 		d.paint(sess, ac, true)
 		return
 	}
-	ac.recentNav.index = next
+	targetID := ac.recentNav.ids[next]
-	d.switchToTarget(sess, ac, picker.Target{Session: ac.recentNav.ids[next], TabIndex: -1})
+	targetSess := d.sessionByID(targetID)
+	if targetSess == nil {
+		d.paint(sess, ac, true)
+		return
+	}
+	d.switchToTarget(sess, ac, picker.Target{Session: targetID, TabIndex: -1})
+	if ac.currentSession() == targetSess {
+		ac.recentNav.index = next
+	}
 }
 func (d *Daemon) pruneRecentNav(n *recentSessionNavigator) bool {

M internal/usecase/daemon/session_test.go +4 -8


@@ -705,9 +705,7 @@ func TestTouchMRUConcurrentUpdatesRemainMonotonic(t *testing.T) {
705	705		var wg sync.WaitGroup
706	706		var observer sync.WaitGroup
707	707
708		-	observer.Add(1)
709		-	go func() {
710		-	defer observer.Done()
	708	+	observer.Go(func() {
711	709		previous := sess.mruAt.Load()
712	710		for {
713	711		select {

@@ -722,17 +720,15 @@ func TestTouchMRUConcurrentUpdatesRemainMonotonic(t *testing.T) {
722	720		}
723	721		previous = current
724	722		}
725		-	}()
	723	+	})
726	724
727	725		for range goroutines {
728		-	wg.Add(1)
729		-	go func() {
730		-	defer wg.Done()
	726	+	wg.Go(func() {
731	727		<-start
732	728		for range iterations {
733	729		d.touchMRU(sess)
734	730		}
735		-	}()
	731	+	})
736	732		}
737	733		close(start)
738	734		wg.Wait()

 	var wg sync.WaitGroup
 	var observer sync.WaitGroup
-	observer.Add(1)
+	observer.Go(func() {
-	go func() {
-		defer observer.Done()
 		previous := sess.mruAt.Load()
 		for {
 			select {
 			}
 			previous = current
 		}
-	}()
+	})
 	for range goroutines {
-		wg.Add(1)
+		wg.Go(func() {
-		go func() {
-			defer wg.Done()
 			<-start
 			for range iterations {
 				d.touchMRU(sess)
 			}
-		}()
+		})
 	}
 	close(start)
 	wg.Wait()

M internal/usecase/daemon/status.go +13 -6


@@ -244,16 +244,23 @@ func fitMRU(entries []mruSession, rowLen, leftUsed int, feedback string) []mruSe
244	244		return entries
245	245		}
246	246
	247	+	const (
	248	+	mruReserveMinRow = 40
	249	+	mruReserveDivisor = 4
	250	+	mruReserveMin = 12
	251	+	mruReserveMax = 24
	252	+	)
	253	+
247	254		func mruFutureRightReserve(rowLen int) int {
248		-	if rowLen < 40 {
	255	+	if rowLen < mruReserveMinRow {
249	256		return 0
250	257		}
251		-	reserve := rowLen / 4
252		-	if reserve < 12 {
253		-	return 12
	258	+	reserve := rowLen / mruReserveDivisor
	259	+	if reserve < mruReserveMin {
	260	+	return mruReserveMin
254	261		}
255		-	if reserve > 24 {
256		-	return 24
	262	+	if reserve > mruReserveMax {
	263	+	return mruReserveMax
257	264		}
258	265		return reserve
259	266		}

 	return entries
 }
+const (
+	mruReserveMinRow  = 40
+	mruReserveDivisor = 4
+	mruReserveMin     = 12
+	mruReserveMax     = 24
+)
 func mruFutureRightReserve(rowLen int) int {
-	if rowLen < 40 {
+	if rowLen < mruReserveMinRow {
 		return 0
 	}
-	reserve := rowLen / 4
+	reserve := rowLen / mruReserveDivisor
-	if reserve < 12 {
+	if reserve < mruReserveMin {
-		return 12
+		return mruReserveMin
 	}
-	if reserve > 24 {
+	if reserve > mruReserveMax {
-		return 24
+		return mruReserveMax
 	}
 	return reserve
 }

M internal/usecase/daemon/status_test.go +2 -1


@@ -290,7 +290,7 @@ func TestBarStateForMRUFreshestFirstCapCurrentExcludedAndAttention(t *testing.T)
290	290		defer releasePTY()
291	291		sess.name = "current"
292	292		sess.mruAt.Store(100)
293		-	for i := 0; i < 10; i++ {
	293	+	for i := range 10 {
294	294		other := &session{id: domain.SessionID("s" + strconv.Itoa(i)), name: "s" + strconv.Itoa(i), tabs: []*tab{{attention: i == 8}}}
295	295		other.mruAt.Store(uint64(i + 1))
296	296		d.sessions[other.id] = other

@@ -404,6 +404,7 @@ func TestStatusBarMRUGradientTruecolorAndPlainFallback(t *testing.T) {
404	404
405	405		plain := mruStyle(renderer.DefaultStyle(), themeui.Theme{}, 1, 3)
406	406		require.False(t, plain.HasForegroundRGB)
	407	+	require.False(t, plain.HasBackgroundRGB)
407	408		}
408	409
409	410		func TestStatusBarNarrowRowsDropWholeOldestMRUEntries(t *testing.T) {

 	defer releasePTY()
 	sess.name = "current"
 	sess.mruAt.Store(100)
-	for i := 0; i < 10; i++ {
+	for i := range 10 {
 		other := &session{id: domain.SessionID("s" + strconv.Itoa(i)), name: "s" + strconv.Itoa(i), tabs: []*tab{{attention: i == 8}}}
 		other.mruAt.Store(uint64(i + 1))
 		d.sessions[other.id] = other
 	plain := mruStyle(renderer.DefaultStyle(), themeui.Theme{}, 1, 3)
 	require.False(t, plain.HasForegroundRGB)
+	require.False(t, plain.HasBackgroundRGB)
 }
 func TestStatusBarNarrowRowsDropWholeOldestMRUEntries(t *testing.T) {