0c2bd95 fix(picker): bound stopped tab selectors · vev

M internal/usecase/daemon/remote_picker.go +3 -1


@@ -5,6 +5,7 @@ import (
5	5		"encoding/base64"
6	6		"errors"
7	7		"fmt"
	8	+	"math"
8	9		"sort"
9	10		"time"
10	11

@@ -166,7 +167,8 @@ func remotePickerView(key domain.RemoteSessionKey, session ports.RemoteCatalogSe
166	167		if first.ID != "" {
167	168		target.StoppedTab = domain.NewStableTabSelector(domain.TabStableID(first.ID))
168	169		} else {
169		-	target.StoppedTab = domain.NewOrdinalTabSelector(0, first.Name, uint16(len(tabs)))
	170	+	tabCount := min(len(tabs), math.MaxUint16)
	171	+	target.StoppedTab = domain.NewOrdinalTabSelector(0, first.Name, uint16(tabCount))
170	172		}
171	173		} else {
172	174		target.LiveTabID = domain.TabStableID(tabs[active].ID)

 	"encoding/base64"
 	"errors"
 	"fmt"
+	"math"
 	"sort"
 	"time"
 			if first.ID != "" {
 				target.StoppedTab = domain.NewStableTabSelector(domain.TabStableID(first.ID))
 			} else {
-				target.StoppedTab = domain.NewOrdinalTabSelector(0, first.Name, uint16(len(tabs)))
+				tabCount := min(len(tabs), math.MaxUint16)
+				target.StoppedTab = domain.NewOrdinalTabSelector(0, first.Name, uint16(tabCount))
 			}
 		} else {
 			target.LiveTabID = domain.TabStableID(tabs[active].ID)

M internal/usecase/daemon/remote_picker_test.go +13 -1


@@ -6,6 +6,7 @@ import (
6	6		"fmt"
7	7		"io"
8	8		"log/slog"
	9	+	"math"
9	10		"sync"
10	11		"testing"
11	12		"time"

@@ -84,6 +85,17 @@ func TestRemotePickerStoppedRowsUseCanonicalStateAndSafeSelection(t *testing.T)
84	85		}
85	86		}
86	87
	88	+	func TestRemotePickerClampsStoppedOrdinalTabCount(t *testing.T) {
	89	+	tabs := make([]ports.RemoteCatalogTab, math.MaxUint16+1)
	90	+	tabs[0] = ports.RemoteCatalogTab{Name: "main"}
	91	+	view := remotePickerView(domain.RemoteSessionKey{Host: "arch", Name: "work"}, ports.RemoteCatalogSession{
	92	+	LifecycleID: remoteLifecycleForTest(), Name: "work", State: "down", Tabs: tabs,
	93	+	}, remoteHostFresh, time.Unix(100, 0))
	94	+
	95	+	require.NotNil(t, view.RemoteTarget)
	96	+	require.Equal(t, uint16(math.MaxUint16), view.RemoteTarget.StoppedTab.ExpectedCount)
	97	+	}
	98	+
87	99		func TestRemotePickerUsesCompactUpDetailRegardlessOfAttachment(t *testing.T) {
88	100		for _, attached := range []bool{false, true} {
89	101		view := remotePickerView(domain.RemoteSessionKey{Host: "remote", Name: "work"}, ports.RemoteCatalogSession{

@@ -750,9 +762,9 @@ func TestRemotePickerSelectsStoppedRemoteTabAndRestoresIt(t *testing.T) {
750	762		EnvironmentPolicy: ports.EnvironmentPolicyDaemonOwned,
751	763		}, transport)
752	764		require.NoError(t, err)
	765	+	t.Cleanup(func() { remote.clientGone(restored, attachment, transport, false) })
753	766		require.Equal(t, lifecycle, restored.incarnation)
754	767		require.Equal(t, domain.TabStableID("tab-b"), attachment.viewSnapshot().tabID)
755		-	remote.clientGone(restored, attachment, transport, false)
756	768		}
757	769
758	770		func TestNavigationActionHandoffSendsBoundedAction(t *testing.T) {

 	"fmt"
 	"io"
 	"log/slog"
+	"math"
 	"sync"
 	"testing"
 	"time"
 	}
 }
+func TestRemotePickerClampsStoppedOrdinalTabCount(t *testing.T) {
+	tabs := make([]ports.RemoteCatalogTab, math.MaxUint16+1)
+	tabs[0] = ports.RemoteCatalogTab{Name: "main"}
+	view := remotePickerView(domain.RemoteSessionKey{Host: "arch", Name: "work"}, ports.RemoteCatalogSession{
+		LifecycleID: remoteLifecycleForTest(), Name: "work", State: "down", Tabs: tabs,
+	}, remoteHostFresh, time.Unix(100, 0))
+	require.NotNil(t, view.RemoteTarget)
+	require.Equal(t, uint16(math.MaxUint16), view.RemoteTarget.StoppedTab.ExpectedCount)
+}
 func TestRemotePickerUsesCompactUpDetailRegardlessOfAttachment(t *testing.T) {
 	for _, attached := range []bool{false, true} {
 		view := remotePickerView(domain.RemoteSessionKey{Host: "remote", Name: "work"}, ports.RemoteCatalogSession{
 		EnvironmentPolicy: ports.EnvironmentPolicyDaemonOwned,
 	}, transport)
 	require.NoError(t, err)
+	t.Cleanup(func() { remote.clientGone(restored, attachment, transport, false) })
 	require.Equal(t, lifecycle, restored.incarnation)
 	require.Equal(t, domain.TabStableID("tab-b"), attachment.viewSnapshot().tabID)
-	remote.clientGone(restored, attachment, transport, false)
 }
 func TestNavigationActionHandoffSendsBoundedAction(t *testing.T) {

M internal/usecase/picker/model.go +4 -1

@@ -1,6 +1,8 @@
1	1		package picker
2	2
3	3		import (
	4	+	"math"
	5	+
4	6		renderer "github.com/bnema/vev-vt"
5	7		"github.com/bnema/vev/internal/domain"
6	8		"github.com/bnema/vev/internal/usecase/ui"

@@ -329,7 +331,8 @@ func rowsForSession(session SessionView, config SelectionConfig) []row {
329	331		if tab.TabID != "" {
330	332		remoteTarget.StoppedTab = domain.NewStableTabSelector(tab.TabID)
331	333		} else {
332		-	remoteTarget.StoppedTab = domain.NewOrdinalTabSelector(uint16(i), tab.RawName, uint16(len(session.Tabs)))
	334	+	tabCount := min(len(session.Tabs), math.MaxUint16)
	335	+	remoteTarget.StoppedTab = domain.NewOrdinalTabSelector(uint16(i), tab.RawName, uint16(tabCount))
333	336		}
334	337		} else {
335	338		remoteTarget.StoppedTab = domain.TabSelector{}

 package picker
 import (
+	"math"
 	renderer "github.com/bnema/vev-vt"
 	"github.com/bnema/vev/internal/domain"
 	"github.com/bnema/vev/internal/usecase/ui"
 						if tab.TabID != "" {
 							remoteTarget.StoppedTab = domain.NewStableTabSelector(tab.TabID)
 						} else {
-							remoteTarget.StoppedTab = domain.NewOrdinalTabSelector(uint16(i), tab.RawName, uint16(len(session.Tabs)))
+							tabCount := min(len(session.Tabs), math.MaxUint16)
+							remoteTarget.StoppedTab = domain.NewOrdinalTabSelector(uint16(i), tab.RawName, uint16(tabCount))
 						}
 					} else {
 						remoteTarget.StoppedTab = domain.TabSelector{}