Merge pull request #211 from bnema/feat/palette-remote-discovery

feat(palette): discover remote sessions

commit: cd20560e6fd530b9d13e48a440cd757d114e2526
author: bnema · 58d ago · 2026-08-25 12:20 UTC
committer: GitHub · 58d ago · 2026-08-25 12:20 UTC
merge of: f571e9b + c574469 · diff against the first parent
signature: GPG UnverifiedB5690EEEBB952194 The key is unknown

13 files · +854 -191

M docs/remote-resilience.md +14 -6


@@ -27,12 +27,20 @@ directory; direct CLI remote attaches retain their client-request semantics.
27	27
28	28		Remote attachments remain direct: the selected remote daemon owns the session,
29	29		PTYs, rendering, input, resize, effects, and teardown. The client does not
30		-	proxy remote content through the local daemon. A single client process keeps a
31		-	bounded, in-memory route history across local, direct remote, and picker-
32		-	discovered attachments. The daemon renders the latest attachment snapshot;
33		-	active routes are metadata-only, while `JRS` and `BCK` send typed key/generation
34		-	actions back to the client. History is process-local and is not persisted or
35		-	shared between clients.
	30	+	proxy remote content through the local daemon. The session picker and command
	31	+	palette read remote session inventory from the daemon's durable catalog cache
	32	+	and refresh it asynchronously while either overlay is open. Cached names appear
	33	+	immediately, but selection still requires a fresh exact lifecycle and tab
	34	+	identity.
	35	+
	36	+	A single client process separately keeps a bounded, in-memory route history
	37	+	across local, direct remote, and picker-discovered attachments. Catalog targets
	38	+	retain exact endpoints, while route snapshots keep endpoints private; rows from
	39	+	those sources therefore remain separate when their authority cannot be compared
	40	+	exactly. The daemon renders the latest attachment snapshot; active routes are
	41	+	metadata-only, while `JRS` and `BCK` send typed
	42	+	key/generation actions back to the client. Route history is process-local and
	43	+	is not persisted or shared between clients.
36	44
37	45		A picker-selected remote target is a direct handoff with one input pump. Exact
38	46		lifecycle/name identities are carried separately from display labels, and a


@@ -27,12 +27,20 @@ directory; direct CLI remote attaches retain their client-request semantics.
27			27
28		Remote attachments remain direct: the selected remote daemon owns the session,	28		Remote attachments remain direct: the selected remote daemon owns the session,
29		PTYs, rendering, input, resize, effects, and teardown. The client does not	29		PTYs, rendering, input, resize, effects, and teardown. The client does not
30	-	proxy remote content through the local daemon. A single client process keeps a	30	+	proxy remote content through the local daemon. The session picker and command
31	-	bounded, in-memory route history across local, direct remote, and picker-	31	+	palette read remote session inventory from the daemon's durable catalog cache
32	-	discovered attachments. The daemon renders the latest attachment snapshot;	32	+	and refresh it asynchronously while either overlay is open. Cached names appear
33	-	active routes are metadata-only, while `JRS` and `BCK` send typed key/generation	33	+	immediately, but selection still requires a fresh exact lifecycle and tab
34	-	actions back to the client. History is process-local and is not persisted or	34	+	identity.
35	-	shared between clients.	35	+
			36	+	A single client process separately keeps a bounded, in-memory route history
			37	+	across local, direct remote, and picker-discovered attachments. Catalog targets
			38	+	retain exact endpoints, while route snapshots keep endpoints private; rows from
			39	+	those sources therefore remain separate when their authority cannot be compared
			40	+	exactly. The daemon renders the latest attachment snapshot; active routes are
			41	+	metadata-only, while `JRS` and `BCK` send typed
			42	+	key/generation actions back to the client. Route history is process-local and
			43	+	is not persisted or shared between clients.
36			44
37		A picker-selected remote target is a direct handoff with one input pump. Exact	45		A picker-selected remote target is a direct handoff with one input pump. Exact
38		lifecycle/name identities are carried separately from display labels, and a	46		lifecycle/name identities are carried separately from display labels, and a

M internal/usecase/daemon/client_transport_errors.go +2 -0


@@ -95,6 +95,7 @@ func (d Daemon) finishClientGone(sess session, ac *attachedClient, failed port
95	95		// IntentResume waiters are not stranded on a never-published park.
96	96		d.clearParkingInFlight(d.resumeTokenSnapshot(ac), ac)
97	97		d.closePicker(ac)
	98	+	d.closePalette(ac)
98	99
99	100		d.resetScreenDefaultColors(sess)
100	101		if explicit && notice {

@@ -183,6 +184,7 @@ func (d Daemon) finishSendErrorDetach(sess session, ac *attachedClient, failed
183	184		}
184	185		d.clearParkingInFlight(d.resumeTokenSnapshot(ac), ac)
185	186		d.closePicker(ac)
	187	+	d.closePalette(ac)
186	188		d.resetScreenDefaultColors(sess)
187	189		_ = ac.closeCapturedTransport(failed)
188	190		d.log.Warn("detached client after send error", "session", name)


@@ -95,6 +95,7 @@ func (d Daemon) finishClientGone(sess session, ac *attachedClient, failed port
95	// IntentResume waiters are not stranded on a never-published park.	95		// IntentResume waiters are not stranded on a never-published park.
96	d.clearParkingInFlight(d.resumeTokenSnapshot(ac), ac)	96		d.clearParkingInFlight(d.resumeTokenSnapshot(ac), ac)
97	d.closePicker(ac)	97		d.closePicker(ac)
		98	+	d.closePalette(ac)
98		99
99	d.resetScreenDefaultColors(sess)	100		d.resetScreenDefaultColors(sess)
100	if explicit && notice {	101		if explicit && notice {

@@ -183,6 +184,7 @@ func (d Daemon) finishSendErrorDetach(sess session, ac *attachedClient, failed
183	}	184		}
184	d.clearParkingInFlight(d.resumeTokenSnapshot(ac), ac)	185		d.clearParkingInFlight(d.resumeTokenSnapshot(ac), ac)
185	d.closePicker(ac)	186		d.closePicker(ac)
		187	+	d.closePalette(ac)
186	d.resetScreenDefaultColors(sess)	188		d.resetScreenDefaultColors(sess)
187	_ = ac.closeCapturedTransport(failed)	189		_ = ac.closeCapturedTransport(failed)
188	d.log.Warn("detached client after send error", "session", name)	190		d.log.Warn("detached client after send error", "session", name)

M internal/usecase/daemon/daemon.go +9 -8


@@ -322,13 +322,14 @@ type Daemon struct {
322	322		}
323	323
324	324		type parkedAttachment struct {
325		-	sess *session
326		-	ac *attachedClient
327		-	pickerGeneration uint64
328		-	timer ports.Timer
329		-	claimed bool
330		-	done chan struct{}
331		-	doneOnce sync.Once
	325	+	sess *session
	326	+	ac *attachedClient
	327	+	pickerGeneration uint64
	328	+	paletteGeneration uint64
	329	+	timer ports.Timer
	330	+	claimed bool
	331	+	done chan struct{}
	332	+	doneOnce sync.Once
332	333		}
333	334
334	335		// parkingAttachment is the observable detach→park lifecycle for one resume

@@ -816,7 +817,7 @@ func (d *Daemon) shutdownAll(reason uint8) (checkpointIncomplete bool) {
816	817		}
817	818
818	819		func (d Daemon) shutdownAllWithSnapshotDeadline(reason uint8, deadline snapshotShutdownDeadline) (checkpointIncomplete bool) {
819		-	d.cancelRemotePickerRefresh()
	820	+	d.cancelRemoteDiscoveryRefresh()
820	821		d.closeMoveLifecycles()
821	822		d.mu.Lock()
822	823		d.closing = true


@@ -322,13 +322,14 @@ type Daemon struct {
322		}	322		}
323			323
324		type parkedAttachment struct {	324		type parkedAttachment struct {
325	-	sess *session	325	+	sess *session
326	-	ac *attachedClient	326	+	ac *attachedClient
327	-	pickerGeneration uint64	327	+	pickerGeneration uint64
328	-	timer ports.Timer	328	+	paletteGeneration uint64
329	-	claimed bool	329	+	timer ports.Timer
330	-	done chan struct{}	330	+	claimed bool
331	-	doneOnce sync.Once	331	+	done chan struct{}
			332	+	doneOnce sync.Once
332		}	333		}
333			334
334		// parkingAttachment is the observable detach→park lifecycle for one resume	335		// parkingAttachment is the observable detach→park lifecycle for one resume

@@ -816,7 +817,7 @@ func (d *Daemon) shutdownAll(reason uint8) (checkpointIncomplete bool) {
816		}	817		}
817			818
818		func (d Daemon) shutdownAllWithSnapshotDeadline(reason uint8, deadline snapshotShutdownDeadline) (checkpointIncomplete bool) {	819		func (d Daemon) shutdownAllWithSnapshotDeadline(reason uint8, deadline snapshotShutdownDeadline) (checkpointIncomplete bool) {
819	-	d.cancelRemotePickerRefresh()	820	+	d.cancelRemoteDiscoveryRefresh()
820		d.closeMoveLifecycles()	821		d.closeMoveLifecycles()
821		d.mu.Lock()	822		d.mu.Lock()
822		d.closing = true	823		d.closing = true

M internal/usecase/daemon/palette.go +176 -18


@@ -43,16 +43,42 @@ func (d Daemon) enterPalette(sess session, ac *attachedClient) {
43	43		routeSnapshot := ac.routeSnapshotCopy()
44	44		commands := d.paletteCommands()
45	45		results := d.paletteResults(sess, commands, routeSnapshot)
	46	+	model := palette.New(results)
46	47		ac.overlays.paletteMu.Lock()
47	48		ac.overlays.paletteGeneration++
48		-	ac.overlays.palette = palette.New(results)
	49	+	ac.overlays.palette = model
49	50		ac.overlays.paletteRouteSnapshot = routeSnapshot
50	51		ac.overlays.paletteHints = palette.ContextualHints{}
51	52		ac.overlays.palettePreview = ""
52	53		ac.overlays.paletteFeedback = ""
53	54		ac.overlays.palettePending = nil
	55	+	generation := ac.overlays.paletteGeneration
54	56		ac.overlays.paletteMu.Unlock()
55	57		d.invalidateRender(sess, ac, true, "palette.go")
	58	+	d.remoteDiscoveryOpened(remoteDiscoveryInstance{
	59	+	ac: ac, kind: remoteDiscoveryPalette, generation: generation, palette: model,
	60	+	})
	61	+	}
	62	+
	63	+	type paletteSessionIdentity struct {
	64	+	kind ports.RouteKind
	65	+	endpoint string
	66	+	lifecycle domain.SessionLifecycleID
	67	+	}
	68	+
	69	+	func localPaletteSessionIdentity(lifecycle domain.SessionLifecycleID) paletteSessionIdentity {
	70	+	return paletteSessionIdentity{kind: ports.RouteKindLocal, endpoint: "local", lifecycle: lifecycle}
	71	+	}
	72	+
	73	+	func remotePaletteSessionIdentity(endpoint string, lifecycle domain.SessionLifecycleID) paletteSessionIdentity {
	74	+	return paletteSessionIdentity{kind: ports.RouteKindRemote, endpoint: endpoint, lifecycle: lifecycle}
	75	+	}
	76	+
	77	+	func remotePaletteUnavailableReason(status remoteHostStatus, session ports.RemoteCatalogSession) string {
	78	+	if session.State == ports.RemoteCatalogSessionBroken {
	79	+	return "session_broken"
	80	+	}
	81	+	return remoteReasonForStatus(status)
56	82		}
57	83
58	84		// paletteResults captures eligible named sessions before paletteMu so the

@@ -61,16 +87,23 @@ func (d Daemon) paletteResults(current session, commands []command.Command, ro
61	87		d.mu.Lock()
62	88		sessions := d.sessionsSnapshotLocked()
63	89		stopped := make([]inactiveSession, 0, len(d.inactive))
64		-	localLifecycles := make(map[domain.SessionLifecycleID]struct{}, len(sessions)+len(d.inactive))
	90	+	represented := make(map[paletteSessionIdentity]struct{}, len(sessions)+len(d.inactive)+len(routeSnapshot.Entries))
65	91		for _, entry := range d.inactive {
66		-	localLifecycles[entry.incarnation] = struct{}{}
	92	+	represented[localPaletteSessionIdentity(entry.incarnation)] = struct{}{}
67	93		if entry.canResume() {
68	94		stopped = append(stopped, entry)
69	95		}
70	96		}
71	97		d.mu.Unlock()
72	98
73		-	results := make([]palette.Result, 0, len(commands)+len(sessions)+len(stopped)+len(routeSnapshot.Entries))
	99	+	remoteCatalog := d.remoteCatalogSnapshot()
	100	+	sortRemoteCatalog(remoteCatalog, d.remoteHostRanks())
	101	+	remoteSessionCount := 0
	102	+	for _, host := range remoteCatalog {
	103	+	remoteSessionCount += len(host.entry.Sessions)
	104	+	}
	105	+
	106	+	results := make([]palette.Result, 0, len(commands)+len(sessions)+len(stopped)+remoteSessionCount+len(routeSnapshot.Entries))
74	107		for _, cmd := range commands {
75	108		results = append(results, palette.NewCommandResult(cmd))
76	109		}

@@ -80,7 +113,7 @@ func (d Daemon) paletteResults(current session, commands []command.Command, ro
80	113		if snap.name == "" \|\| snap.ephemeral {
81	114		continue
82	115		}
83		-	localLifecycles[snap.incarnation] = struct{}{}
	116	+	represented[localPaletteSessionIdentity(snap.incarnation)] = struct{}{}
84	117		if candidate == current {
85	118		continue
86	119		}

@@ -97,7 +130,29 @@ func (d Daemon) paletteResults(current session, commands []command.Command, ro
97	130		for _, candidate := range stopped {
98	131		target := ports.ExactSessionTarget{LifecycleID: candidate.incarnation, SessionName: candidate.name}
99	132		results = append(results, palette.NewStoppedSessionResult(target, time.Unix(0, candidate.createdAt)))
100		-	localLifecycles[target.LifecycleID] = struct{}{}
	133	+	represented[localPaletteSessionIdentity(target.LifecycleID)] = struct{}{}
	134	+	}
	135	+	type discoveredRemote struct {
	136	+	identity paletteSessionIdentity
	137	+	result palette.Result
	138	+	}
	139	+	discovered := make([]discoveredRemote, 0, remoteSessionCount)
	140	+	for _, host := range remoteCatalog {
	141	+	for _, session := range host.entry.Sessions {
	142	+	if session.Ephemeral {
	143	+	continue
	144	+	}
	145	+	key, target := remoteCatalogSessionTarget(domain.RemoteSessionKey{
	146	+	Host: host.entry.Host, Name: session.Name,
	147	+	}, session)
	148	+	if key.Validate() != nil \|\| target.Validate() != nil {
	149	+	continue
	150	+	}
	151	+	discovered = append(discovered, discoveredRemote{
	152	+	identity: remotePaletteSessionIdentity(key.Host, session.LifecycleID),
	153	+	result: palette.NewRemoteSessionResult(key, target, remotePaletteUnavailableReason(host.status, session)),
	154	+	})
	155	+	}
101	156		}
102	157		formattedRoutes := formatRecentRouteSnapshot(routeSnapshot)
103	158		for i, entry := range routeSnapshot.Entries {

@@ -108,7 +163,8 @@ func (d Daemon) paletteResults(current session, commands []command.Command, ro
108	163		if label == "" {
109	164		continue
110	165		}
111		-	if _, represented := localLifecycles[entry.Target.LifecycleID]; represented {
	166	+	identity := localPaletteSessionIdentity(entry.Target.LifecycleID)
	167	+	if _, exists := represented[identity]; entry.Kind == ports.RouteKindLocal && exists {
112	168		continue
113	169		}
114	170		results = append(results, palette.NewRecentRouteResult(label, ports.RouteNavigationAction{

@@ -116,10 +172,48 @@ func (d Daemon) paletteResults(current session, commands []command.Command, ro
116	172		Key: entry.Key,
117	173		Generation: entry.Generation,
118	174		}))
	175	+	if entry.Kind == ports.RouteKindLocal {
	176	+	represented[identity] = struct{}{}
	177	+	}
	178	+	}
	179	+	for _, remote := range discovered {
	180	+	if _, exists := represented[remote.identity]; exists {
	181	+	continue
	182	+	}
	183	+	results = append(results, remote.result)
	184	+	represented[remote.identity] = struct{}{}
119	185		}
120	186		return results
121	187		}
122	188
	189	+	func (d Daemon) refreshPalette(ac attachedClient) {
	190	+	if d == nil \|\| ac == nil \|\| ac.overlays == nil {
	191	+	return
	192	+	}
	193	+	sess := ac.currentAttachmentSession()
	194	+	if sess == nil {
	195	+	return
	196	+	}
	197	+	rt := ac.overlays
	198	+	rt.paletteMu.Lock()
	199	+	model := rt.palette
	200	+	generation := rt.paletteGeneration
	201	+	routeSnapshot := rt.paletteRouteSnapshot
	202	+	routeSnapshot.Entries = append([]ports.RecentRouteEntry(nil), routeSnapshot.Entries...)
	203	+	rt.paletteMu.Unlock()
	204	+	if model == nil {
	205	+	return
	206	+	}
	207	+
	208	+	results := d.paletteResults(sess, d.paletteCommands(), routeSnapshot)
	209	+	rt.paletteMu.Lock()
	210	+	defer rt.paletteMu.Unlock()
	211	+	if rt.paletteGeneration != generation \|\| rt.palette != model {
	212	+	return
	213	+	}
	214	+	model.ReplaceResults(results)
	215	+	}
	216	+
123	217		func recentRouteHints(snapshot ports.RecentRouteSnapshot, args []string) palette.ContextualHints {
124	218		formatted := formatRecentRouteSnapshot(snapshot)
125	219		names := make([]string, len(formatted))

@@ -192,6 +286,10 @@ func (d Daemon) handlePaletteInput(ac attachedClient, data []byte, effects ...
192	286		var cmd command.Command
193	287		var sessionTarget palette.Result
194	288		var hasSessionTarget bool
	289	+	var remoteTarget domain.RemoteSessionTarget
	290	+	var remoteKey domain.RemoteSessionKey
	291	+	var remoteUnavailableReason string
	292	+	var hasRemoteTarget bool
195	293		var routeTarget ports.RouteNavigationAction
196	294		var hasRouteTarget bool
197	295		var args []string

@@ -199,6 +297,7 @@ func (d Daemon) handlePaletteInput(ac attachedClient, data []byte, effects ...
199	297		var generation uint64
200	298		var rawQuery string
201	299		changed, cancel, execute := false, false, false
	300	+	var closedDiscovery remoteDiscoveryInstance
202	301		var effect *attachmentEffectTicket
203	302		if len(effects) != 0 {
204	303		effect = effects[0]

@@ -270,6 +369,16 @@ func (d Daemon) handlePaletteInput(ac attachedClient, data []byte, effects ...
270	369		routeSnapshot = ac.overlays.paletteRouteSnapshot
271	370		routeSnapshot.Entries = append([]ports.RecentRouteEntry(nil), routeSnapshot.Entries...)
272	371		}
	372	+	} else if target, ok := selected.RemoteSessionTarget(); ok {
	373	+	key, keyOK := selected.RemoteSessionKey()
	374	+	if !keyOK {
	375	+	changed = true
	376	+	return
	377	+	}
	378	+	remoteTarget = target
	379	+	remoteKey = key
	380	+	remoteUnavailableReason, _ = selected.RemoteSessionUnavailableReason()
	381	+	hasRemoteTarget = true
273	382		} else if action, ok := selected.RouteNavigationAction(); ok {
274	383		routeTarget = action
275	384		hasRouteTarget = true

@@ -303,10 +412,11 @@ func (d Daemon) handlePaletteInput(ac attachedClient, data []byte, effects ...
303	412		}
304	413		}
305	414		if cancel {
306		-	ac.clearPaletteLocked()
	415	+	closedDiscovery = ac.clearPaletteLocked()
307	416		}
308	417		ac.overlays.paletteMu.Unlock()
309	418		if cancel {
	419	+	d.remoteDiscoveryClosed(closedDiscovery)
310	420		d.invalidateRender(entry, ac, true, "palette.go")
311	421		return
312	422		}

@@ -317,6 +427,29 @@ func (d Daemon) handlePaletteInput(ac attachedClient, data []byte, effects ...
317	427		return
318	428		}
319	429
	430	+	if hasRemoteTarget {
	431	+	if effect == nil {
	432	+	ac.paletteFailure(generation, rawQuery, "requested remote session is unavailable")
	433	+	d.invalidateRender(entry, ac, true, "palette.go")
	434	+	return
	435	+	}
	436	+	target := picker.Target{
	437	+	Session: remoteKey.ID(), Incarnation: remoteKey.LifecycleID, Name: remoteKey.Display(),
	438	+	RemoteKey: &remoteKey, RemoteTarget: &remoteTarget, RemoteHost: remoteKey.Host,
	439	+	UnavailableReason: remoteUnavailableReason, TabIndex: -1,
	440	+	}
	441	+	err := d.switchToTargetForAttachment(effect.connectionToken(), target, sessionHandoffGuard{}, "palette-remote-session")
	442	+	if err == nil {
	443	+	d.closeExecutedPalette(ac, generation, rawQuery)
	444	+	return
	445	+	}
	446	+	if !errors.Is(err, errAttachmentTransition) {
	447	+	ac.paletteFailure(generation, rawQuery, "requested remote session is unavailable")
	448	+	d.invalidateRender(entry, ac, true, "palette.go")
	449	+	}
	450	+	return
	451	+	}
	452	+
320	453		if hasRouteTarget {
321	454		exec := paletteExec{d: d, sess: sess, attachment: entry, ac: ac, effect: effect}
322	455		if err := exec.NavigateRecentRoute(routeTarget); err != nil {

@@ -327,7 +460,7 @@ func (d Daemon) handlePaletteInput(ac attachedClient, data []byte, effects ...
327	460		d.invalidateRender(entry, ac, true, "palette.go")
328	461		return
329	462		}
330		-	if ac.closeExecutedPalette(generation, rawQuery) {
	463	+	if d.closeExecutedPalette(ac, generation, rawQuery) {
331	464		d.invalidateRender(entry, ac, true, "palette.go")
332	465		}
333	466		return

@@ -356,7 +489,7 @@ func (d Daemon) handlePaletteInput(ac attachedClient, data []byte, effects ...
356	489		d.invalidateRender(entry, ac, true, "palette.go")
357	490		return
358	491		}
359		-	if ac.closeExecutedPalette(generation, rawQuery) {
	492	+	if d.closeExecutedPalette(ac, generation, rawQuery) {
360	493		if current := ac.currentAttachmentSession(); current != nil {
361	494		d.invalidateRender(current, ac, true, "palette.go")
362	495		}

@@ -380,7 +513,7 @@ func (d Daemon) handlePaletteInput(ac attachedClient, data []byte, effects ...
380	513		d.invalidateRender(entry, ac, true, "palette.go")
381	514		return
382	515		}
383		-	if ac.closeExecutedPalette(generation, rawQuery) {
	516	+	if d.closeExecutedPalette(ac, generation, rawQuery) {
384	517		d.recordPaletteUse(cmd.Code)
385	518		if current := ac.currentAttachmentSession(); current != nil {
386	519		d.invalidateRender(current, ac, true, "palette.go")

@@ -389,7 +522,7 @@ func (d Daemon) handlePaletteInput(ac attachedClient, data []byte, effects ...
389	522		return
390	523		}
391	524		attachmentHandoff := cmd.Slug == "back-session" \|\| cmd.Slug == "detach"
392		-	if !attachmentHandoff && !ac.closeExecutedPalette(generation, rawQuery) {
	525	+	if !attachmentHandoff && !d.closeExecutedPalette(ac, generation, rawQuery) {
393	526		return
394	527		}
395	528		sess.dispatchMu.Lock()

@@ -399,14 +532,14 @@ func (d Daemon) handlePaletteInput(ac attachedClient, data []byte, effects ...
399	532		if current := ac.currentSession(); current != nil {
400	533		currentToken := current.attachmentToken(ac, ac.transport())
401	534		fresh, admitted := ac.beginAttachmentEffect(currentToken)
402		-	if ac.closeExecutedPalette(generation, rawQuery) {
	535	+	if d.closeExecutedPalette(ac, generation, rawQuery) {
403	536		d.invalidateRender(current, ac, true, "palette.go")
404	537		}
405	538		if admitted {
406	539		fresh.End()
407	540		}
408	541		} else {
409		-	ac.closeExecutedPalette(generation, rawQuery)
	542	+	d.closeExecutedPalette(ac, generation, rawQuery)
410	543		}
411	544		}
412	545		if errors.Is(err, errAttachmentTransition) {

@@ -435,7 +568,8 @@ func paletteArgs(query string, cmd command.Command) []string {
435	568		return action.Args
436	569		}
437	570
438		-	func (ac *attachedClient) clearPaletteLocked() {
	571	+	func (ac *attachedClient) clearPaletteLocked() remoteDiscoveryInstance {
	572	+	model := ac.overlays.palette
439	573		ac.overlays.paletteGeneration++
440	574		ac.overlays.palette = nil
441	575		ac.overlays.paletteRouteSnapshot = ports.RecentRouteSnapshot{}

@@ -443,6 +577,9 @@ func (ac *attachedClient) clearPaletteLocked() {
443	577		ac.overlays.palettePreview = ""
444	578		ac.overlays.paletteFeedback = ""
445	579		ac.overlays.palettePending = nil
	580	+	return remoteDiscoveryInstance{
	581	+	ac: ac, kind: remoteDiscoveryPalette, generation: ac.overlays.paletteGeneration, palette: model,
	582	+	}
446	583		}
447	584
448	585		func (ac *attachedClient) paletteFailure(generation uint64, rawQuery, feedback string) {

@@ -454,13 +591,34 @@ func (ac *attachedClient) paletteFailure(generation uint64, rawQuery, feedback s
454	591		ac.overlays.paletteFeedback = feedback
455	592		}
456	593
457		-	func (ac *attachedClient) closeExecutedPalette(generation uint64, rawQuery string) bool {
	594	+	func (d Daemon) closeExecutedPalette(ac attachedClient, generation uint64, rawQuery string) bool {
458	595		ac.overlays.paletteMu.Lock()
459		-	defer ac.overlays.paletteMu.Unlock()
460	596		if ac.overlays.palette == nil \|\| ac.overlays.paletteGeneration != generation \|\| ac.overlays.palette.Query() != rawQuery {
	597	+	ac.overlays.paletteMu.Unlock()
461	598		return false
462	599		}
463		-	ac.clearPaletteLocked()
	600	+	instance := ac.clearPaletteLocked()
	601	+	ac.overlays.paletteMu.Unlock()
	602	+	d.remoteDiscoveryClosed(instance)
	603	+	return true
	604	+	}
	605	+
	606	+	func (d Daemon) closePalette(ac attachedClient) {
	607	+	d.closePaletteIfCurrent(ac, 0)
	608	+	}
	609	+
	610	+	func (d Daemon) closePaletteIfCurrent(ac attachedClient, generation uint64) bool {
	611	+	if d == nil \|\| ac == nil \|\| ac.overlays == nil {
	612	+	return false
	613	+	}
	614	+	ac.overlays.paletteMu.Lock()
	615	+	if ac.overlays.palette == nil \|\| generation != 0 && ac.overlays.paletteGeneration != generation {
	616	+	ac.overlays.paletteMu.Unlock()
	617	+	return false
	618	+	}
	619	+	instance := ac.clearPaletteLocked()
	620	+	ac.overlays.paletteMu.Unlock()
	621	+	d.remoteDiscoveryClosed(instance)
464	622		return true
465	623		}
466	624

 	routeSnapshot := ac.routeSnapshotCopy()
 	commands := d.paletteCommands()
 	results := d.paletteResults(sess, commands, routeSnapshot)
+	model := palette.New(results)
 	ac.overlays.paletteMu.Lock()
 	ac.overlays.paletteGeneration++
-	ac.overlays.palette = palette.New(results)
+	ac.overlays.palette = model
 	ac.overlays.paletteRouteSnapshot = routeSnapshot
 	ac.overlays.paletteHints = palette.ContextualHints{}
 	ac.overlays.palettePreview = ""
 	ac.overlays.paletteFeedback = ""
 	ac.overlays.palettePending = nil
+	generation := ac.overlays.paletteGeneration
 	ac.overlays.paletteMu.Unlock()
 	d.invalidateRender(sess, ac, true, "palette.go")
+	d.remoteDiscoveryOpened(remoteDiscoveryInstance{
+		ac: ac, kind: remoteDiscoveryPalette, generation: generation, palette: model,
+	})
+}
+type paletteSessionIdentity struct {
+	kind      ports.RouteKind
+	endpoint  string
+	lifecycle domain.SessionLifecycleID
+}
+func localPaletteSessionIdentity(lifecycle domain.SessionLifecycleID) paletteSessionIdentity {
+	return paletteSessionIdentity{kind: ports.RouteKindLocal, endpoint: "local", lifecycle: lifecycle}
+}
+func remotePaletteSessionIdentity(endpoint string, lifecycle domain.SessionLifecycleID) paletteSessionIdentity {
+	return paletteSessionIdentity{kind: ports.RouteKindRemote, endpoint: endpoint, lifecycle: lifecycle}
+}
+func remotePaletteUnavailableReason(status remoteHostStatus, session ports.RemoteCatalogSession) string {
+	if session.State == ports.RemoteCatalogSessionBroken {
+		return "session_broken"
+	}
+	return remoteReasonForStatus(status)
 }
 // paletteResults captures eligible named sessions before paletteMu so the
 	d.mu.Lock()
 	sessions := d.sessionsSnapshotLocked()
 	stopped := make([]inactiveSession, 0, len(d.inactive))
-	localLifecycles := make(map[domain.SessionLifecycleID]struct{}, len(sessions)+len(d.inactive))
+	represented := make(map[paletteSessionIdentity]struct{}, len(sessions)+len(d.inactive)+len(routeSnapshot.Entries))
 	for _, entry := range d.inactive {
-		localLifecycles[entry.incarnation] = struct{}{}
+		represented[localPaletteSessionIdentity(entry.incarnation)] = struct{}{}
 		if entry.canResume() {
 			stopped = append(stopped, entry)
 		}
 	}
 	d.mu.Unlock()
-	results := make([]palette.Result, 0, len(commands)+len(sessions)+len(stopped)+len(routeSnapshot.Entries))
+	remoteCatalog := d.remoteCatalogSnapshot()
+	sortRemoteCatalog(remoteCatalog, d.remoteHostRanks())
+	remoteSessionCount := 0
+	for _, host := range remoteCatalog {
+		remoteSessionCount += len(host.entry.Sessions)
+	}
+	results := make([]palette.Result, 0, len(commands)+len(sessions)+len(stopped)+remoteSessionCount+len(routeSnapshot.Entries))
 	for _, cmd := range commands {
 		results = append(results, palette.NewCommandResult(cmd))
 	}
 		if snap.name == "" || snap.ephemeral {
 			continue
 		}
-		localLifecycles[snap.incarnation] = struct{}{}
+		represented[localPaletteSessionIdentity(snap.incarnation)] = struct{}{}
 		if candidate == current {
 			continue
 		}
 	for _, candidate := range stopped {
 		target := ports.ExactSessionTarget{LifecycleID: candidate.incarnation, SessionName: candidate.name}
 		results = append(results, palette.NewStoppedSessionResult(target, time.Unix(0, candidate.createdAt)))
-		localLifecycles[target.LifecycleID] = struct{}{}
+		represented[localPaletteSessionIdentity(target.LifecycleID)] = struct{}{}
+	}
+	type discoveredRemote struct {
+		identity paletteSessionIdentity
+		result   palette.Result
+	}
+	discovered := make([]discoveredRemote, 0, remoteSessionCount)
+	for _, host := range remoteCatalog {
+		for _, session := range host.entry.Sessions {
+			if session.Ephemeral {
+				continue
+			}
+			key, target := remoteCatalogSessionTarget(domain.RemoteSessionKey{
+				Host: host.entry.Host, Name: session.Name,
+			}, session)
+			if key.Validate() != nil || target.Validate() != nil {
+				continue
+			}
+			discovered = append(discovered, discoveredRemote{
+				identity: remotePaletteSessionIdentity(key.Host, session.LifecycleID),
+				result:   palette.NewRemoteSessionResult(key, target, remotePaletteUnavailableReason(host.status, session)),
+			})
+		}
 	}
 	formattedRoutes := formatRecentRouteSnapshot(routeSnapshot)
 	for i, entry := range routeSnapshot.Entries {
 		if label == "" {
 			continue
 		}
-		if _, represented := localLifecycles[entry.Target.LifecycleID]; represented {
+		identity := localPaletteSessionIdentity(entry.Target.LifecycleID)
+		if _, exists := represented[identity]; entry.Kind == ports.RouteKindLocal && exists {
 			continue
 		}
 		results = append(results, palette.NewRecentRouteResult(label, ports.RouteNavigationAction{
 			Key:                entry.Key,
 			Generation:         entry.Generation,
 		}))
+		if entry.Kind == ports.RouteKindLocal {
+			represented[identity] = struct{}{}
+		}
+	}
+	for _, remote := range discovered {
+		if _, exists := represented[remote.identity]; exists {
+			continue
+		}
+		results = append(results, remote.result)
+		represented[remote.identity] = struct{}{}
 	}
 	return results
 }
+func (d *Daemon) refreshPalette(ac *attachedClient) {
+	if d == nil || ac == nil || ac.overlays == nil {
+		return
+	}
+	sess := ac.currentAttachmentSession()
+	if sess == nil {
+		return
+	}
+	rt := ac.overlays
+	rt.paletteMu.Lock()
+	model := rt.palette
+	generation := rt.paletteGeneration
+	routeSnapshot := rt.paletteRouteSnapshot
+	routeSnapshot.Entries = append([]ports.RecentRouteEntry(nil), routeSnapshot.Entries...)
+	rt.paletteMu.Unlock()
+	if model == nil {
+		return
+	}
+	results := d.paletteResults(sess, d.paletteCommands(), routeSnapshot)
+	rt.paletteMu.Lock()
+	defer rt.paletteMu.Unlock()
+	if rt.paletteGeneration != generation || rt.palette != model {
+		return
+	}
+	model.ReplaceResults(results)
+}
 func recentRouteHints(snapshot ports.RecentRouteSnapshot, args []string) palette.ContextualHints {
 	formatted := formatRecentRouteSnapshot(snapshot)
 	names := make([]string, len(formatted))
 	var cmd command.Command
 	var sessionTarget palette.Result
 	var hasSessionTarget bool
+	var remoteTarget domain.RemoteSessionTarget
+	var remoteKey domain.RemoteSessionKey
+	var remoteUnavailableReason string
+	var hasRemoteTarget bool
 	var routeTarget ports.RouteNavigationAction
 	var hasRouteTarget bool
 	var args []string
 	var generation uint64
 	var rawQuery string
 	changed, cancel, execute := false, false, false
+	var closedDiscovery remoteDiscoveryInstance
 	var effect *attachmentEffectTicket
 	if len(effects) != 0 {
 		effect = effects[0]
 					routeSnapshot = ac.overlays.paletteRouteSnapshot
 					routeSnapshot.Entries = append([]ports.RecentRouteEntry(nil), routeSnapshot.Entries...)
 				}
+			} else if target, ok := selected.RemoteSessionTarget(); ok {
+				key, keyOK := selected.RemoteSessionKey()
+				if !keyOK {
+					changed = true
+					return
+				}
+				remoteTarget = target
+				remoteKey = key
+				remoteUnavailableReason, _ = selected.RemoteSessionUnavailableReason()
+				hasRemoteTarget = true
 			} else if action, ok := selected.RouteNavigationAction(); ok {
 				routeTarget = action
 				hasRouteTarget = true
 		}
 	}
 	if cancel {
-		ac.clearPaletteLocked()
+		closedDiscovery = ac.clearPaletteLocked()
 	}
 	ac.overlays.paletteMu.Unlock()
 	if cancel {
+		d.remoteDiscoveryClosed(closedDiscovery)
 		d.invalidateRender(entry, ac, true, "palette.go")
 		return
 	}
 		return
 	}
+	if hasRemoteTarget {
+		if effect == nil {
+			ac.paletteFailure(generation, rawQuery, "requested remote session is unavailable")
+			d.invalidateRender(entry, ac, true, "palette.go")
+			return
+		}
+		target := picker.Target{
+			Session: remoteKey.ID(), Incarnation: remoteKey.LifecycleID, Name: remoteKey.Display(),
+			RemoteKey: &remoteKey, RemoteTarget: &remoteTarget, RemoteHost: remoteKey.Host,
+			UnavailableReason: remoteUnavailableReason, TabIndex: -1,
+		}
+		err := d.switchToTargetForAttachment(effect.connectionToken(), target, sessionHandoffGuard{}, "palette-remote-session")
+		if err == nil {
+			d.closeExecutedPalette(ac, generation, rawQuery)
+			return
+		}
+		if !errors.Is(err, errAttachmentTransition) {
+			ac.paletteFailure(generation, rawQuery, "requested remote session is unavailable")
+			d.invalidateRender(entry, ac, true, "palette.go")
+		}
+		return
+	}
 	if hasRouteTarget {
 		exec := paletteExec{d: d, sess: sess, attachment: entry, ac: ac, effect: effect}
 		if err := exec.NavigateRecentRoute(routeTarget); err != nil {
 			d.invalidateRender(entry, ac, true, "palette.go")
 			return
 		}
-		if ac.closeExecutedPalette(generation, rawQuery) {
+		if d.closeExecutedPalette(ac, generation, rawQuery) {
 			d.invalidateRender(entry, ac, true, "palette.go")
 		}
 		return
 			d.invalidateRender(entry, ac, true, "palette.go")
 			return
 		}
-		if ac.closeExecutedPalette(generation, rawQuery) {
+		if d.closeExecutedPalette(ac, generation, rawQuery) {
 			if current := ac.currentAttachmentSession(); current != nil {
 				d.invalidateRender(current, ac, true, "palette.go")
 			}
 			d.invalidateRender(entry, ac, true, "palette.go")
 			return
 		}
-		if ac.closeExecutedPalette(generation, rawQuery) {
+		if d.closeExecutedPalette(ac, generation, rawQuery) {
 			d.recordPaletteUse(cmd.Code)
 			if current := ac.currentAttachmentSession(); current != nil {
 				d.invalidateRender(current, ac, true, "palette.go")
 		return
 	}
 	attachmentHandoff := cmd.Slug == "back-session" || cmd.Slug == "detach"
-	if !attachmentHandoff && !ac.closeExecutedPalette(generation, rawQuery) {
+	if !attachmentHandoff && !d.closeExecutedPalette(ac, generation, rawQuery) {
 		return
 	}
 	sess.dispatchMu.Lock()
 		if current := ac.currentSession(); current != nil {
 			currentToken := current.attachmentToken(ac, ac.transport())
 			fresh, admitted := ac.beginAttachmentEffect(currentToken)
-			if ac.closeExecutedPalette(generation, rawQuery) {
+			if d.closeExecutedPalette(ac, generation, rawQuery) {
 				d.invalidateRender(current, ac, true, "palette.go")
 			}
 			if admitted {
 				fresh.End()
 			}
 		} else {
-			ac.closeExecutedPalette(generation, rawQuery)
+			d.closeExecutedPalette(ac, generation, rawQuery)
 		}
 	}
 	if errors.Is(err, errAttachmentTransition) {
 	return action.Args
 }
-func (ac *attachedClient) clearPaletteLocked() {
+func (ac *attachedClient) clearPaletteLocked() remoteDiscoveryInstance {
+	model := ac.overlays.palette
 	ac.overlays.paletteGeneration++
 	ac.overlays.palette = nil
 	ac.overlays.paletteRouteSnapshot = ports.RecentRouteSnapshot{}
 	ac.overlays.palettePreview = ""
 	ac.overlays.paletteFeedback = ""
 	ac.overlays.palettePending = nil
+	return remoteDiscoveryInstance{
+		ac: ac, kind: remoteDiscoveryPalette, generation: ac.overlays.paletteGeneration, palette: model,
+	}
 }
 func (ac *attachedClient) paletteFailure(generation uint64, rawQuery, feedback string) {
 	ac.overlays.paletteFeedback = feedback
 }
-func (ac *attachedClient) closeExecutedPalette(generation uint64, rawQuery string) bool {
+func (d *Daemon) closeExecutedPalette(ac *attachedClient, generation uint64, rawQuery string) bool {
 	ac.overlays.paletteMu.Lock()
-	defer ac.overlays.paletteMu.Unlock()
 	if ac.overlays.palette == nil || ac.overlays.paletteGeneration != generation || ac.overlays.palette.Query() != rawQuery {
+		ac.overlays.paletteMu.Unlock()
 		return false
 	}
-	ac.clearPaletteLocked()
+	instance := ac.clearPaletteLocked()
+	ac.overlays.paletteMu.Unlock()
+	d.remoteDiscoveryClosed(instance)
+	return true
+}
+func (d *Daemon) closePalette(ac *attachedClient) {
+	d.closePaletteIfCurrent(ac, 0)
+}
+func (d *Daemon) closePaletteIfCurrent(ac *attachedClient, generation uint64) bool {
+	if d == nil || ac == nil || ac.overlays == nil {
+		return false
+	}
+	ac.overlays.paletteMu.Lock()
+	if ac.overlays.palette == nil || generation != 0 && ac.overlays.paletteGeneration != generation {
+		ac.overlays.paletteMu.Unlock()
+		return false
+	}
+	instance := ac.clearPaletteLocked()
+	ac.overlays.paletteMu.Unlock()
+	d.remoteDiscoveryClosed(instance)
 	return true
 }

M internal/usecase/daemon/palette_test.go +253 -0


@@ -4,6 +4,7 @@ import (
4	4		"errors"
5	5		"sync"
6	6		"testing"
	7	+	"time"
7	8
8	9		"github.com/stretchr/testify/mock"
9	10		"github.com/stretchr/testify/require"

@@ -428,6 +429,258 @@ func TestPaletteJRSUsesEffectiveOverrideOnly(t *testing.T) {
428	429		require.True(t, ac.overlays.paletteActive(), "literal JRS must not execute an overridden jump command")
429	430		}
430	431
	432	+	func TestPaletteIncludesExactRemoteCatalogTargetBesideSameNameLocalSession(t *testing.T) {
	433	+	now := time.Unix(1_000, 0)
	434	+	d := newTestDaemon(t, nil, fixedRemoteRefreshClock{now: now})
	435	+	current := addControlSession(d, "current", "tab-1", "pane-1")
	436	+	current.ephemeral = false
	437	+	local := addControlSession(d, "vev", "tab-2", "pane-2")
	438	+	local.ephemeral = false
	439	+	remoteLifecycle := domain.SessionLifecycleID{21}
	440	+	d.remoteCatalog.mu.Lock()
	441	+	d.remoteCatalog.cache["user@arch"] = ports.RemoteCatalogCacheEntry{
	442	+	Host: "user@arch", FetchedAt: now,
	443	+	Sessions: []ports.RemoteCatalogSession{{
	444	+	LifecycleID: remoteLifecycle, Name: "vev", State: ports.RemoteCatalogSessionUp,
	445	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-remote", Index: 0, Name: "shell"}}, ActiveTabID: "tab-remote",
	446	+	}},
	447	+	}
	448	+	d.remoteCatalog.status["user@arch"] = remoteHostFresh
	449	+	d.remoteCatalog.mu.Unlock()
	450	+
	451	+	results := d.paletteResults(current, nil, ports.RecentRouteSnapshot{})
	452	+	var matching []palette.Result
	453	+	for _, result := range results {
	454	+	if result.DisplayText() == "Switch to session vev" \|\| result.DisplayText() == "Switch to session vev@arch" {
	455	+	matching = append(matching, result)
	456	+	}
	457	+	}
	458	+	require.Len(t, matching, 2)
	459	+	remoteTarget, ok := matching[1].RemoteSessionTarget()
	460	+	require.True(t, ok)
	461	+	require.Equal(t, domain.RemoteSessionTarget{
	462	+	Endpoint: "user@arch", DisplayOrigin: "arch", LifecycleID: remoteLifecycle,
	463	+	SessionName: "vev", LiveTabID: "tab-remote",
	464	+	}, remoteTarget)
	465	+	}
	466	+
	467	+	func TestPaletteKeepsExactCatalogEndpointsWithEqualDisplayAndLifecycle(t *testing.T) {
	468	+	now := time.Unix(1_000, 0)
	469	+	d := newTestDaemon(t, nil, fixedRemoteRefreshClock{now: now})
	470	+	current := addControlSession(d, "current", "tab-1", "pane-1")
	471	+	current.ephemeral = false
	472	+	lifecycle := domain.SessionLifecycleID{22}
	473	+	d.remoteCatalog.mu.Lock()
	474	+	for _, endpoint := range []string{"user@arch", "admin@arch"} {
	475	+	d.remoteCatalog.cache[endpoint] = ports.RemoteCatalogCacheEntry{
	476	+	Host: endpoint, FetchedAt: now,
	477	+	Sessions: []ports.RemoteCatalogSession{{
	478	+	LifecycleID: lifecycle, Name: "vev", State: ports.RemoteCatalogSessionUp,
	479	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-vev", Index: 0}}, ActiveTabID: "tab-vev",
	480	+	}},
	481	+	}
	482	+	d.remoteCatalog.status[endpoint] = remoteHostFresh
	483	+	}
	484	+	d.remoteCatalog.mu.Unlock()
	485	+
	486	+	results := d.paletteResults(current, nil, ports.RecentRouteSnapshot{})
	487	+	var endpoints []string
	488	+	for _, result := range results {
	489	+	if result.DisplayText() != "Switch to session vev@arch" {
	490	+	continue
	491	+	}
	492	+	target, ok := result.RemoteSessionTarget()
	493	+	require.True(t, ok)
	494	+	endpoints = append(endpoints, target.Endpoint)
	495	+	}
	496	+	require.ElementsMatch(t, []string{"user@arch", "admin@arch"}, endpoints)
	497	+	}
	498	+
	499	+	func TestPaletteRemoteCatalogSelectionSendsExactAttachTarget(t *testing.T) {
	500	+	p, release := newBlockingPTY(t)
	501	+	defer release()
	502	+	d, current, ac, sends := newManualSessionWithPTYs(t, p)
	503	+	ac.resumeCapable = true
	504	+	now := time.Unix(1_000, 0)
	505	+	d.clock = fixedRemoteRefreshClock{now: now}
	506	+	remoteLifecycle := domain.SessionLifecycleID{31}
	507	+	d.remoteCatalog.mu.Lock()
	508	+	d.remoteCatalog.cache["user@arch"] = ports.RemoteCatalogCacheEntry{
	509	+	Host: "user@arch", FetchedAt: now,
	510	+	Sessions: []ports.RemoteCatalogSession{{
	511	+	LifecycleID: remoteLifecycle, Name: "work", State: ports.RemoteCatalogSessionUp,
	512	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-work", Index: 0, Name: "shell"}}, ActiveTabID: "tab-work",
	513	+	}},
	514	+	}
	515	+	d.remoteCatalog.status["user@arch"] = remoteHostFresh
	516	+	d.remoteCatalog.mu.Unlock()
	517	+	token := beginRecentRoutePaletteEffect(t, d, current, ac)
	518	+
	519	+	d.handleInputForAttachment(token, []byte("\x1b "))
	520	+	awaitFrame(t, sends, ports.MsgOutput)
	521	+	d.handleInputForAttachment(token, []byte("work@arch\r"))
	522	+
	523	+	frame := awaitFrame(t, sends, ports.MsgAttachTarget)
	524	+	target, err := ports.UnmarshalAttachTarget(frame.Payload)
	525	+	require.NoError(t, err)
	526	+	remoteTarget := domain.RemoteSessionTarget{
	527	+	Endpoint: "user@arch", DisplayOrigin: "arch", LifecycleID: remoteLifecycle,
	528	+	SessionName: "work", LiveTabID: "tab-work",
	529	+	}
	530	+	require.Equal(t, ports.AttachTarget{
	531	+	Endpoint: "user@arch", Session: "work", Intent: ports.IntentAttach,
	532	+	RemoteTarget: &remoteTarget, EnvironmentPolicy: ports.EnvironmentPolicyDaemonOwned,
	533	+	}, target)
	534	+	require.False(t, ac.overlays.paletteActive())
	535	+	d.remoteCatalog.mu.Lock()
	536	+	require.Zero(t, d.remoteCatalog.consumers[ac]&remoteDiscoveryPalette)
	537	+	d.remoteCatalog.mu.Unlock()
	538	+	}
	539	+
	540	+	func TestPaletteCachedRemoteSelectionFailsClosed(t *testing.T) {
	541	+	p, release := newBlockingPTY(t)
	542	+	defer release()
	543	+	d, current, ac, sends := newManualSessionWithPTYs(t, p)
	544	+	now := time.Unix(1_000, 0)
	545	+	d.clock = fixedRemoteRefreshClock{now: now}
	546	+	d.remoteCatalog.mu.Lock()
	547	+	d.remoteCatalog.cache["arch"] = ports.RemoteCatalogCacheEntry{
	548	+	Host: "arch", FetchedAt: now,
	549	+	Sessions: []ports.RemoteCatalogSession{{
	550	+	LifecycleID: domain.SessionLifecycleID{32}, Name: "cached", State: ports.RemoteCatalogSessionUp,
	551	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-cached", Index: 0}}, ActiveTabID: "tab-cached",
	552	+	}},
	553	+	}
	554	+	d.remoteCatalog.status["arch"] = remoteHostCached
	555	+	d.remoteCatalog.mu.Unlock()
	556	+	token := beginRecentRoutePaletteEffect(t, d, current, ac)
	557	+
	558	+	d.handleInputForAttachment(token, []byte("\x1b "))
	559	+	awaitFrame(t, sends, ports.MsgOutput)
	560	+	d.handleInputForAttachment(token, []byte("cached@arch\r"))
	561	+
	562	+	require.Same(t, current, ac.currentAttachmentSession())
	563	+	require.True(t, ac.overlays.paletteActive())
	564	+	history := d.notices.history()
	565	+	require.NotEmpty(t, history)
	566	+	require.Contains(t, history[len(history)-1].Message, "refreshing")
	567	+	require.NotContains(t, history[len(history)-1].Message, "identity changed")
	568	+	for {
	569	+	select {
	570	+	case frame := <-sends:
	571	+	require.NotEqual(t, ports.MsgAttachTarget, frame.Type)
	572	+	default:
	573	+	return
	574	+	}
	575	+	}
	576	+	}
	577	+
	578	+	func TestRemoteRefreshUpdatesOpenPaletteAndPreservesQuery(t *testing.T) {
	579	+	hosts := &remoteRefreshHostStore{hosts: []string{"user@arch"}}
	580	+	d, catalog, cache := newRemoteRefreshDaemon(t, hosts, time.Unix(1_000, 0))
	581	+	sess, ac, _ := addRemoteRefreshPickerOwner(t, d, "current")
	582	+
	583	+	d.enterPalette(sess, ac)
	584	+	request := receiveRemotePicker(t, catalog.requests, "palette catalog request")
	585	+	ac.overlays.paletteMu.Lock()
	586	+	model := ac.overlays.palette
	587	+	for _, r := range "vev" {
	588	+	model.Insert(r)
	589	+	}
	590	+	ac.overlays.paletteMu.Unlock()
	591	+	request.result <- remoteRefreshResult{catalog: remoteCatalogForTest(ports.RemoteCatalogSession{
	592	+	LifecycleID: domain.SessionLifecycleID{41}, Name: "vev", State: ports.RemoteCatalogSessionUp,
	593	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-vev", Index: 0}}, ActiveTabID: "tab-vev",
	594	+	})}
	595	+	receiveRemotePicker(t, cache.stores, "palette catalog cache store")
	596	+	d.sessWg.Wait()
	597	+
	598	+	ac.overlays.paletteMu.Lock()
	599	+	require.Same(t, model, ac.overlays.palette)
	600	+	require.Equal(t, "vev", model.Query())
	601	+	matches := model.Matches()
	602	+	ac.overlays.paletteMu.Unlock()
	603	+	displayTexts := make([]string, len(matches))
	604	+	for i, match := range matches {
	605	+	displayTexts[i] = match.Result.DisplayText()
	606	+	}
	607	+	require.Contains(t, displayTexts, "Switch to session vev@arch")
	608	+
	609	+	d.closePalette(ac)
	610	+	d.remoteCatalog.mu.Lock()
	611	+	require.NotContains(t, d.remoteCatalog.consumers, ac)
	612	+	require.Nil(t, d.remoteCatalog.cancel)
	613	+	d.remoteCatalog.mu.Unlock()
	614	+	}
	615	+
	616	+	func TestRemoteRefreshTracksPickerAndPaletteOnSameAttachment(t *testing.T) {
	617	+	hosts := &remoteRefreshHostStore{hosts: []string{"arch"}}
	618	+	d, catalog, _ := newRemoteRefreshDaemon(t, hosts, time.Unix(1_100, 0))
	619	+	sess, ac, _ := addRemoteRefreshPickerOwner(t, d, "owner")
	620	+
	621	+	d.publishPicker(sess, ac, d.newPickerModel(sess, ac, pickerNavigate, moveSourceLocator{}, picker.SourceFilter{}), pickerNavigate, moveSourceLocator{})
	622	+	request := receiveRemotePicker(t, catalog.requests, "picker catalog request")
	623	+	d.enterPalette(sess, ac)
	624	+	receiveRemotePickerClose(t, request.ctx.Done(), "superseded picker catalog request")
	625	+	request = receiveRemotePicker(t, catalog.requests, "shared catalog request")
	626	+
	627	+	d.closePalette(ac)
	628	+	select {
	629	+	case <-request.ctx.Done():
	630	+	t.Fatal("refresh canceled while the picker remained open")
	631	+	default:
	632	+	}
	633	+	d.remoteCatalog.mu.Lock()
	634	+	require.Equal(t, remoteDiscoveryPicker, d.remoteCatalog.consumers[ac])
	635	+	d.remoteCatalog.mu.Unlock()
	636	+
	637	+	d.closePicker(ac)
	638	+	receiveRemotePickerClose(t, request.ctx.Done(), "last discovery consumer cancellation")
	639	+	d.remoteCatalog.mu.Lock()
	640	+	require.Empty(t, d.remoteCatalog.consumers)
	641	+	require.Nil(t, d.remoteCatalog.cancel)
	642	+	d.remoteCatalog.mu.Unlock()
	643	+	}
	644	+
	645	+	func TestPaletteKeepsCatalogTargetWhenRecentRouteHasOnlyDisplayOrigin(t *testing.T) {
	646	+	now := time.Unix(1_200, 0)
	647	+	d := newTestDaemon(t, nil, fixedRemoteRefreshClock{now: now})
	648	+	current := addControlSession(d, "current", "tab-1", "pane-1")
	649	+	current.ephemeral = false
	650	+	lifecycle := domain.SessionLifecycleID{51}
	651	+	d.remoteCatalog.mu.Lock()
	652	+	d.remoteCatalog.cache["arch"] = ports.RemoteCatalogCacheEntry{
	653	+	Host: "arch", FetchedAt: now,
	654	+	Sessions: []ports.RemoteCatalogSession{{
	655	+	LifecycleID: lifecycle, Name: "vev", State: ports.RemoteCatalogSessionUp,
	656	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-vev", Index: 0}}, ActiveTabID: "tab-vev",
	657	+	}},
	658	+	}
	659	+	d.remoteCatalog.status["arch"] = remoteHostFresh
	660	+	d.remoteCatalog.mu.Unlock()
	661	+
	662	+	results := d.paletteResults(current, nil, ports.RecentRouteSnapshot{
	663	+	Generation: 2,
	664	+	Entries: []ports.RecentRouteEntry{{
	665	+	Key: 3, Generation: 1,
	666	+	Target: ports.ExactSessionTarget{LifecycleID: lifecycle, SessionName: "vev"},
	667	+	Name: "vev", HostLabel: "arch", Kind: ports.RouteKindRemote,
	668	+	}},
	669	+	})
	670	+	var matching []palette.Result
	671	+	for _, result := range results {
	672	+	if result.DisplayText() == "Switch to session vev@arch" {
	673	+	matching = append(matching, result)
	674	+	}
	675	+	}
	676	+	require.Len(t, matching, 2, "presentation-only route origin cannot deduplicate an exact catalog endpoint")
	677	+	action, routeOK := matching[0].RouteNavigationAction()
	678	+	_, catalogOK := matching[1].RemoteSessionTarget()
	679	+	require.True(t, routeOK)
	680	+	require.True(t, catalogOK)
	681	+	require.Equal(t, ports.RouteNavigationAction{SnapshotGeneration: 2, Key: 3, Generation: 1}, action)
	682	+	}
	683	+
431	684		func TestPaletteResultsDeduplicateByLifecycleAndKeepEqualLabels(t *testing.T) {
432	685		d := newTestDaemon(t, nil, stubClock{})
433	686		current := addControlSession(d, "hi", "tab-1", "pane-1")


@@ -4,6 +4,7 @@ import (
4	"errors"	4		"errors"
5	"sync"	5		"sync"
6	"testing"	6		"testing"
		7	+	"time"
7		8
8	"github.com/stretchr/testify/mock"	9		"github.com/stretchr/testify/mock"
9	"github.com/stretchr/testify/require"	10		"github.com/stretchr/testify/require"

@@ -428,6 +429,258 @@ func TestPaletteJRSUsesEffectiveOverrideOnly(t *testing.T) {
428	require.True(t, ac.overlays.paletteActive(), "literal JRS must not execute an overridden jump command")	429		require.True(t, ac.overlays.paletteActive(), "literal JRS must not execute an overridden jump command")
429	}	430		}
430		431
		432	+	func TestPaletteIncludesExactRemoteCatalogTargetBesideSameNameLocalSession(t *testing.T) {
		433	+	now := time.Unix(1_000, 0)
		434	+	d := newTestDaemon(t, nil, fixedRemoteRefreshClock{now: now})
		435	+	current := addControlSession(d, "current", "tab-1", "pane-1")
		436	+	current.ephemeral = false
		437	+	local := addControlSession(d, "vev", "tab-2", "pane-2")
		438	+	local.ephemeral = false
		439	+	remoteLifecycle := domain.SessionLifecycleID{21}
		440	+	d.remoteCatalog.mu.Lock()
		441	+	d.remoteCatalog.cache["user@arch"] = ports.RemoteCatalogCacheEntry{
		442	+	Host: "user@arch", FetchedAt: now,
		443	+	Sessions: []ports.RemoteCatalogSession{{
		444	+	LifecycleID: remoteLifecycle, Name: "vev", State: ports.RemoteCatalogSessionUp,
		445	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-remote", Index: 0, Name: "shell"}}, ActiveTabID: "tab-remote",
		446	+	}},
		447	+	}
		448	+	d.remoteCatalog.status["user@arch"] = remoteHostFresh
		449	+	d.remoteCatalog.mu.Unlock()
		450	+
		451	+	results := d.paletteResults(current, nil, ports.RecentRouteSnapshot{})
		452	+	var matching []palette.Result
		453	+	for _, result := range results {
		454	+	if result.DisplayText() == "Switch to session vev" \|\| result.DisplayText() == "Switch to session vev@arch" {
		455	+	matching = append(matching, result)
		456	+	}
		457	+	}
		458	+	require.Len(t, matching, 2)
		459	+	remoteTarget, ok := matching[1].RemoteSessionTarget()
		460	+	require.True(t, ok)
		461	+	require.Equal(t, domain.RemoteSessionTarget{
		462	+	Endpoint: "user@arch", DisplayOrigin: "arch", LifecycleID: remoteLifecycle,
		463	+	SessionName: "vev", LiveTabID: "tab-remote",
		464	+	}, remoteTarget)
		465	+	}
		466	+
		467	+	func TestPaletteKeepsExactCatalogEndpointsWithEqualDisplayAndLifecycle(t *testing.T) {
		468	+	now := time.Unix(1_000, 0)
		469	+	d := newTestDaemon(t, nil, fixedRemoteRefreshClock{now: now})
		470	+	current := addControlSession(d, "current", "tab-1", "pane-1")
		471	+	current.ephemeral = false
		472	+	lifecycle := domain.SessionLifecycleID{22}
		473	+	d.remoteCatalog.mu.Lock()
		474	+	for _, endpoint := range []string{"user@arch", "admin@arch"} {
		475	+	d.remoteCatalog.cache[endpoint] = ports.RemoteCatalogCacheEntry{
		476	+	Host: endpoint, FetchedAt: now,
		477	+	Sessions: []ports.RemoteCatalogSession{{
		478	+	LifecycleID: lifecycle, Name: "vev", State: ports.RemoteCatalogSessionUp,
		479	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-vev", Index: 0}}, ActiveTabID: "tab-vev",
		480	+	}},
		481	+	}
		482	+	d.remoteCatalog.status[endpoint] = remoteHostFresh
		483	+	}
		484	+	d.remoteCatalog.mu.Unlock()
		485	+
		486	+	results := d.paletteResults(current, nil, ports.RecentRouteSnapshot{})
		487	+	var endpoints []string
		488	+	for _, result := range results {
		489	+	if result.DisplayText() != "Switch to session vev@arch" {
		490	+	continue
		491	+	}
		492	+	target, ok := result.RemoteSessionTarget()
		493	+	require.True(t, ok)
		494	+	endpoints = append(endpoints, target.Endpoint)
		495	+	}
		496	+	require.ElementsMatch(t, []string{"user@arch", "admin@arch"}, endpoints)
		497	+	}
		498	+
		499	+	func TestPaletteRemoteCatalogSelectionSendsExactAttachTarget(t *testing.T) {
		500	+	p, release := newBlockingPTY(t)
		501	+	defer release()
		502	+	d, current, ac, sends := newManualSessionWithPTYs(t, p)
		503	+	ac.resumeCapable = true
		504	+	now := time.Unix(1_000, 0)
		505	+	d.clock = fixedRemoteRefreshClock{now: now}
		506	+	remoteLifecycle := domain.SessionLifecycleID{31}
		507	+	d.remoteCatalog.mu.Lock()
		508	+	d.remoteCatalog.cache["user@arch"] = ports.RemoteCatalogCacheEntry{
		509	+	Host: "user@arch", FetchedAt: now,
		510	+	Sessions: []ports.RemoteCatalogSession{{
		511	+	LifecycleID: remoteLifecycle, Name: "work", State: ports.RemoteCatalogSessionUp,
		512	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-work", Index: 0, Name: "shell"}}, ActiveTabID: "tab-work",
		513	+	}},
		514	+	}
		515	+	d.remoteCatalog.status["user@arch"] = remoteHostFresh
		516	+	d.remoteCatalog.mu.Unlock()
		517	+	token := beginRecentRoutePaletteEffect(t, d, current, ac)
		518	+
		519	+	d.handleInputForAttachment(token, []byte("\x1b "))
		520	+	awaitFrame(t, sends, ports.MsgOutput)
		521	+	d.handleInputForAttachment(token, []byte("work@arch\r"))
		522	+
		523	+	frame := awaitFrame(t, sends, ports.MsgAttachTarget)
		524	+	target, err := ports.UnmarshalAttachTarget(frame.Payload)
		525	+	require.NoError(t, err)
		526	+	remoteTarget := domain.RemoteSessionTarget{
		527	+	Endpoint: "user@arch", DisplayOrigin: "arch", LifecycleID: remoteLifecycle,
		528	+	SessionName: "work", LiveTabID: "tab-work",
		529	+	}
		530	+	require.Equal(t, ports.AttachTarget{
		531	+	Endpoint: "user@arch", Session: "work", Intent: ports.IntentAttach,
		532	+	RemoteTarget: &remoteTarget, EnvironmentPolicy: ports.EnvironmentPolicyDaemonOwned,
		533	+	}, target)
		534	+	require.False(t, ac.overlays.paletteActive())
		535	+	d.remoteCatalog.mu.Lock()
		536	+	require.Zero(t, d.remoteCatalog.consumers[ac]&remoteDiscoveryPalette)
		537	+	d.remoteCatalog.mu.Unlock()
		538	+	}
		539	+
		540	+	func TestPaletteCachedRemoteSelectionFailsClosed(t *testing.T) {
		541	+	p, release := newBlockingPTY(t)
		542	+	defer release()
		543	+	d, current, ac, sends := newManualSessionWithPTYs(t, p)
		544	+	now := time.Unix(1_000, 0)
		545	+	d.clock = fixedRemoteRefreshClock{now: now}
		546	+	d.remoteCatalog.mu.Lock()
		547	+	d.remoteCatalog.cache["arch"] = ports.RemoteCatalogCacheEntry{
		548	+	Host: "arch", FetchedAt: now,
		549	+	Sessions: []ports.RemoteCatalogSession{{
		550	+	LifecycleID: domain.SessionLifecycleID{32}, Name: "cached", State: ports.RemoteCatalogSessionUp,
		551	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-cached", Index: 0}}, ActiveTabID: "tab-cached",
		552	+	}},
		553	+	}
		554	+	d.remoteCatalog.status["arch"] = remoteHostCached
		555	+	d.remoteCatalog.mu.Unlock()
		556	+	token := beginRecentRoutePaletteEffect(t, d, current, ac)
		557	+
		558	+	d.handleInputForAttachment(token, []byte("\x1b "))
		559	+	awaitFrame(t, sends, ports.MsgOutput)
		560	+	d.handleInputForAttachment(token, []byte("cached@arch\r"))
		561	+
		562	+	require.Same(t, current, ac.currentAttachmentSession())
		563	+	require.True(t, ac.overlays.paletteActive())
		564	+	history := d.notices.history()
		565	+	require.NotEmpty(t, history)
		566	+	require.Contains(t, history[len(history)-1].Message, "refreshing")
		567	+	require.NotContains(t, history[len(history)-1].Message, "identity changed")
		568	+	for {
		569	+	select {
		570	+	case frame := <-sends:
		571	+	require.NotEqual(t, ports.MsgAttachTarget, frame.Type)
		572	+	default:
		573	+	return
		574	+	}
		575	+	}
		576	+	}
		577	+
		578	+	func TestRemoteRefreshUpdatesOpenPaletteAndPreservesQuery(t *testing.T) {
		579	+	hosts := &remoteRefreshHostStore{hosts: []string{"user@arch"}}
		580	+	d, catalog, cache := newRemoteRefreshDaemon(t, hosts, time.Unix(1_000, 0))
		581	+	sess, ac, _ := addRemoteRefreshPickerOwner(t, d, "current")
		582	+
		583	+	d.enterPalette(sess, ac)
		584	+	request := receiveRemotePicker(t, catalog.requests, "palette catalog request")
		585	+	ac.overlays.paletteMu.Lock()
		586	+	model := ac.overlays.palette
		587	+	for _, r := range "vev" {
		588	+	model.Insert(r)
		589	+	}
		590	+	ac.overlays.paletteMu.Unlock()
		591	+	request.result <- remoteRefreshResult{catalog: remoteCatalogForTest(ports.RemoteCatalogSession{
		592	+	LifecycleID: domain.SessionLifecycleID{41}, Name: "vev", State: ports.RemoteCatalogSessionUp,
		593	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-vev", Index: 0}}, ActiveTabID: "tab-vev",
		594	+	})}
		595	+	receiveRemotePicker(t, cache.stores, "palette catalog cache store")
		596	+	d.sessWg.Wait()
		597	+
		598	+	ac.overlays.paletteMu.Lock()
		599	+	require.Same(t, model, ac.overlays.palette)
		600	+	require.Equal(t, "vev", model.Query())
		601	+	matches := model.Matches()
		602	+	ac.overlays.paletteMu.Unlock()
		603	+	displayTexts := make([]string, len(matches))
		604	+	for i, match := range matches {
		605	+	displayTexts[i] = match.Result.DisplayText()
		606	+	}
		607	+	require.Contains(t, displayTexts, "Switch to session vev@arch")
		608	+
		609	+	d.closePalette(ac)
		610	+	d.remoteCatalog.mu.Lock()
		611	+	require.NotContains(t, d.remoteCatalog.consumers, ac)
		612	+	require.Nil(t, d.remoteCatalog.cancel)
		613	+	d.remoteCatalog.mu.Unlock()
		614	+	}
		615	+
		616	+	func TestRemoteRefreshTracksPickerAndPaletteOnSameAttachment(t *testing.T) {
		617	+	hosts := &remoteRefreshHostStore{hosts: []string{"arch"}}
		618	+	d, catalog, _ := newRemoteRefreshDaemon(t, hosts, time.Unix(1_100, 0))
		619	+	sess, ac, _ := addRemoteRefreshPickerOwner(t, d, "owner")
		620	+
		621	+	d.publishPicker(sess, ac, d.newPickerModel(sess, ac, pickerNavigate, moveSourceLocator{}, picker.SourceFilter{}), pickerNavigate, moveSourceLocator{})
		622	+	request := receiveRemotePicker(t, catalog.requests, "picker catalog request")
		623	+	d.enterPalette(sess, ac)
		624	+	receiveRemotePickerClose(t, request.ctx.Done(), "superseded picker catalog request")
		625	+	request = receiveRemotePicker(t, catalog.requests, "shared catalog request")
		626	+
		627	+	d.closePalette(ac)
		628	+	select {
		629	+	case <-request.ctx.Done():
		630	+	t.Fatal("refresh canceled while the picker remained open")
		631	+	default:
		632	+	}
		633	+	d.remoteCatalog.mu.Lock()
		634	+	require.Equal(t, remoteDiscoveryPicker, d.remoteCatalog.consumers[ac])
		635	+	d.remoteCatalog.mu.Unlock()
		636	+
		637	+	d.closePicker(ac)
		638	+	receiveRemotePickerClose(t, request.ctx.Done(), "last discovery consumer cancellation")
		639	+	d.remoteCatalog.mu.Lock()
		640	+	require.Empty(t, d.remoteCatalog.consumers)
		641	+	require.Nil(t, d.remoteCatalog.cancel)
		642	+	d.remoteCatalog.mu.Unlock()
		643	+	}
		644	+
		645	+	func TestPaletteKeepsCatalogTargetWhenRecentRouteHasOnlyDisplayOrigin(t *testing.T) {
		646	+	now := time.Unix(1_200, 0)
		647	+	d := newTestDaemon(t, nil, fixedRemoteRefreshClock{now: now})
		648	+	current := addControlSession(d, "current", "tab-1", "pane-1")
		649	+	current.ephemeral = false
		650	+	lifecycle := domain.SessionLifecycleID{51}
		651	+	d.remoteCatalog.mu.Lock()
		652	+	d.remoteCatalog.cache["arch"] = ports.RemoteCatalogCacheEntry{
		653	+	Host: "arch", FetchedAt: now,
		654	+	Sessions: []ports.RemoteCatalogSession{{
		655	+	LifecycleID: lifecycle, Name: "vev", State: ports.RemoteCatalogSessionUp,
		656	+	Tabs: []ports.RemoteCatalogTab{{ID: "tab-vev", Index: 0}}, ActiveTabID: "tab-vev",
		657	+	}},
		658	+	}
		659	+	d.remoteCatalog.status["arch"] = remoteHostFresh
		660	+	d.remoteCatalog.mu.Unlock()
		661	+
		662	+	results := d.paletteResults(current, nil, ports.RecentRouteSnapshot{
		663	+	Generation: 2,
		664	+	Entries: []ports.RecentRouteEntry{{
		665	+	Key: 3, Generation: 1,
		666	+	Target: ports.ExactSessionTarget{LifecycleID: lifecycle, SessionName: "vev"},
		667	+	Name: "vev", HostLabel: "arch", Kind: ports.RouteKindRemote,
		668	+	}},
		669	+	})
		670	+	var matching []palette.Result
		671	+	for _, result := range results {
		672	+	if result.DisplayText() == "Switch to session vev@arch" {
		673	+	matching = append(matching, result)
		674	+	}
		675	+	}
		676	+	require.Len(t, matching, 2, "presentation-only route origin cannot deduplicate an exact catalog endpoint")
		677	+	action, routeOK := matching[0].RouteNavigationAction()
		678	+	_, catalogOK := matching[1].RemoteSessionTarget()
		679	+	require.True(t, routeOK)
		680	+	require.True(t, catalogOK)
		681	+	require.Equal(t, ports.RouteNavigationAction{SnapshotGeneration: 2, Key: 3, Generation: 1}, action)
		682	+	}
		683	+
431	func TestPaletteResultsDeduplicateByLifecycleAndKeepEqualLabels(t *testing.T) {	684		func TestPaletteResultsDeduplicateByLifecycleAndKeepEqualLabels(t *testing.T) {
432	d := newTestDaemon(t, nil, stubClock{})	685		d := newTestDaemon(t, nil, stubClock{})
433	current := addControlSession(d, "hi", "tab-1", "pane-1")	686		current := addControlSession(d, "hi", "tab-1", "pane-1")

M internal/usecase/daemon/picker.go +7 -7


@@ -86,7 +86,7 @@ func (d Daemon) publishPicker(sess session, ac attachedClient, model picker.
86	86		if rt.beforeRemotePickerRegistration != nil {
87	87		rt.beforeRemotePickerRegistration()
88	88		}
89		-	d.remotePickerOpened(instance)
	89	+	d.remoteDiscoveryOpened(instance.discoveryInstance())
90	90		}
91	91
92	92		// pickerViews captures one canonical lifecycle/tab snapshot. It intentionally

@@ -165,8 +165,8 @@ func (d Daemon) pickerViews(cur session, ac *attachedClient) ([]picker.Session
165	165		})
166	166		}
167	167
168		-	catalog := d.remotePickerCatalogSnapshot()
169		-	sortRemotePickerCatalog(catalog, d.remotePickerHostRanks())
	168	+	catalog := d.remoteCatalogSnapshot()
	169	+	sortRemoteCatalog(catalog, d.remoteHostRanks())
170	170
171	171		catalogRows := 0
172	172		for _, host := range catalog {

@@ -283,7 +283,7 @@ func (d Daemon) pickerListInputState(ac attachedClient) listInputState {
283	283		},
284	284		afterClose: func() {
285	285		d.clearPreviewGeneration(ac, previewGeneration)
286		-	d.remotePickerClosed(instance)
	286	+	d.remoteDiscoveryClosed(instance.discoveryInstance())
287	287		if sess := ac.currentAttachmentSession(); sess != nil {
288	288		d.invalidateRender(sess, ac, true, "picker.go")
289	289		}

@@ -742,7 +742,7 @@ func (d Daemon) closePickerIfCurrent(ac attachedClient, model *picker.Model, g
742	742		ac.overlays.pickerMu.Unlock()
743	743		d.clearPreviewGeneration(ac, previewGeneration)
744	744		if instance.model != nil {
745		-	d.remotePickerClosed(instance)
	745	+	d.remoteDiscoveryClosed(instance.discoveryInstance())
746	746		}
747	747		return true
748	748		}

@@ -969,7 +969,7 @@ func (d *Daemon) sendRemoteAttachTargetForAttachment(token attachmentConnectionT
969	969		}
970	970		remoteTarget := *target.RemoteTarget
971	971		key := *target.RemoteKey
972		-	if err := remoteTarget.Validate(); err != nil \|\| key.Validate() != nil \|\| target.Session != key.ID() \|\| key.Host != remoteTarget.Endpoint \|\| key.Name != remoteTarget.SessionName \|\| key.LifecycleID != remoteTarget.LifecycleID \|\| !d.remotePickerTargetReadyTarget(remoteTarget) {
	972	+	if err := remoteTarget.Validate(); err != nil \|\| key.Validate() != nil \|\| target.Session != key.ID() \|\| key.Host != remoteTarget.Endpoint \|\| key.Name != remoteTarget.SessionName \|\| key.LifecycleID != remoteTarget.LifecycleID \|\| !d.remoteCatalogTargetReady(remoteTarget) {
973	973		return failUnavailable()
974	974		}
975	975		handoff := ports.AttachTarget{

@@ -1005,7 +1005,7 @@ func (d *Daemon) remoteCatalogEntryLocked(host string) (ports.RemoteCatalogCache
1005	1005		return entry, true
1006	1006		}
1007	1007
1008		-	func (d *Daemon) remotePickerTargetReadyTarget(target domain.RemoteSessionTarget) bool {
	1008	+	func (d *Daemon) remoteCatalogTargetReady(target domain.RemoteSessionTarget) bool {
1009	1009		if d == nil \|\| target.Validate() != nil {
1010	1010		return false
1011	1011		}


@@ -86,7 +86,7 @@ func (d Daemon) publishPicker(sess session, ac attachedClient, model picker.
86		if rt.beforeRemotePickerRegistration != nil {	86		if rt.beforeRemotePickerRegistration != nil {
87		rt.beforeRemotePickerRegistration()	87		rt.beforeRemotePickerRegistration()
88		}	88		}
89	-	d.remotePickerOpened(instance)	89	+	d.remoteDiscoveryOpened(instance.discoveryInstance())
90		}	90		}
91			91
92		// pickerViews captures one canonical lifecycle/tab snapshot. It intentionally	92		// pickerViews captures one canonical lifecycle/tab snapshot. It intentionally

@@ -165,8 +165,8 @@ func (d Daemon) pickerViews(cur session, ac *attachedClient) ([]picker.Session
165		})	165		})
166		}	166		}
167			167
168	-	catalog := d.remotePickerCatalogSnapshot()	168	+	catalog := d.remoteCatalogSnapshot()
169	-	sortRemotePickerCatalog(catalog, d.remotePickerHostRanks())	169	+	sortRemoteCatalog(catalog, d.remoteHostRanks())
170			170
171		catalogRows := 0	171		catalogRows := 0
172		for _, host := range catalog {	172		for _, host := range catalog {

@@ -283,7 +283,7 @@ func (d Daemon) pickerListInputState(ac attachedClient) listInputState {
283		},	283		},
284		afterClose: func() {	284		afterClose: func() {
285		d.clearPreviewGeneration(ac, previewGeneration)	285		d.clearPreviewGeneration(ac, previewGeneration)
286	-	d.remotePickerClosed(instance)	286	+	d.remoteDiscoveryClosed(instance.discoveryInstance())
287		if sess := ac.currentAttachmentSession(); sess != nil {	287		if sess := ac.currentAttachmentSession(); sess != nil {
288		d.invalidateRender(sess, ac, true, "picker.go")	288		d.invalidateRender(sess, ac, true, "picker.go")
289		}	289		}

@@ -742,7 +742,7 @@ func (d Daemon) closePickerIfCurrent(ac attachedClient, model *picker.Model, g
742		ac.overlays.pickerMu.Unlock()	742		ac.overlays.pickerMu.Unlock()
743		d.clearPreviewGeneration(ac, previewGeneration)	743		d.clearPreviewGeneration(ac, previewGeneration)
744		if instance.model != nil {	744		if instance.model != nil {
745	-	d.remotePickerClosed(instance)	745	+	d.remoteDiscoveryClosed(instance.discoveryInstance())
746		}	746		}
747		return true	747		return true
748		}	748		}

@@ -969,7 +969,7 @@ func (d *Daemon) sendRemoteAttachTargetForAttachment(token attachmentConnectionT
969		}	969		}
970		remoteTarget := *target.RemoteTarget	970		remoteTarget := *target.RemoteTarget
971		key := *target.RemoteKey	971		key := *target.RemoteKey
972	-	if err := remoteTarget.Validate(); err != nil \|\| key.Validate() != nil \|\| target.Session != key.ID() \|\| key.Host != remoteTarget.Endpoint \|\| key.Name != remoteTarget.SessionName \|\| key.LifecycleID != remoteTarget.LifecycleID \|\| !d.remotePickerTargetReadyTarget(remoteTarget) {	972	+	if err := remoteTarget.Validate(); err != nil \|\| key.Validate() != nil \|\| target.Session != key.ID() \|\| key.Host != remoteTarget.Endpoint \|\| key.Name != remoteTarget.SessionName \|\| key.LifecycleID != remoteTarget.LifecycleID \|\| !d.remoteCatalogTargetReady(remoteTarget) {
973		return failUnavailable()	973		return failUnavailable()
974		}	974		}
975		handoff := ports.AttachTarget{	975		handoff := ports.AttachTarget{

@@ -1005,7 +1005,7 @@ func (d *Daemon) remoteCatalogEntryLocked(host string) (ports.RemoteCatalogCache
1005		return entry, true	1005		return entry, true
1006		}	1006		}
1007			1007
1008	-	func (d *Daemon) remotePickerTargetReadyTarget(target domain.RemoteSessionTarget) bool {	1008	+	func (d *Daemon) remoteCatalogTargetReady(target domain.RemoteSessionTarget) bool {
1009		if d == nil \|\| target.Validate() != nil {	1009		if d == nil \|\| target.Validate() != nil {
1010		return false	1010		return false
1011		}	1011		}

M internal/usecase/daemon/remote_catalog_state.go +19 -12


@@ -24,23 +24,30 @@ const (
24	24
25	25		// remoteCatalogState owns the cache-derived discovery state. Its mutex never
26	26		// covers cache or transport I/O; writeMu only serializes complete cache writes.
	27	+	type remoteDiscoveryConsumerKind uint8
	28	+
	29	+	const (
	30	+	remoteDiscoveryPicker remoteDiscoveryConsumerKind = 1 << iota
	31	+	remoteDiscoveryPalette
	32	+	)
	33	+
27	34		type remoteCatalogState struct {
28		-	mu sync.Mutex
29		-	cache map[string]ports.RemoteCatalogCacheEntry
30		-	status map[string]remoteHostStatus
31		-	failure map[string]time.Time
32		-	refresh uint64
33		-	cancel context.CancelFunc
34		-	pickers map[*attachedClient]struct{}
35		-	writeMu sync.Mutex
	35	+	mu sync.Mutex
	36	+	cache map[string]ports.RemoteCatalogCacheEntry
	37	+	status map[string]remoteHostStatus
	38	+	failure map[string]time.Time
	39	+	refresh uint64
	40	+	cancel context.CancelFunc
	41	+	consumers map[*attachedClient]remoteDiscoveryConsumerKind
	42	+	writeMu sync.Mutex
36	43		}
37	44
38	45		func newRemoteCatalogState() remoteCatalogState {
39	46		return remoteCatalogState{
40		-	cache: make(map[string]ports.RemoteCatalogCacheEntry),
41		-	status: make(map[string]remoteHostStatus),
42		-	failure: make(map[string]time.Time),
43		-	pickers: make(map[*attachedClient]struct{}),
	47	+	cache: make(map[string]ports.RemoteCatalogCacheEntry),
	48	+	status: make(map[string]remoteHostStatus),
	49	+	failure: make(map[string]time.Time),
	50	+	consumers: make(map[*attachedClient]remoteDiscoveryConsumerKind),
44	51		}
45	52		}
46	53


@@ -24,23 +24,30 @@ const (
24			24
25		// remoteCatalogState owns the cache-derived discovery state. Its mutex never	25		// remoteCatalogState owns the cache-derived discovery state. Its mutex never
26		// covers cache or transport I/O; writeMu only serializes complete cache writes.	26		// covers cache or transport I/O; writeMu only serializes complete cache writes.
			27	+	type remoteDiscoveryConsumerKind uint8
			28	+
			29	+	const (
			30	+	remoteDiscoveryPicker remoteDiscoveryConsumerKind = 1 << iota
			31	+	remoteDiscoveryPalette
			32	+	)
			33	+
27		type remoteCatalogState struct {	34		type remoteCatalogState struct {
28	-	mu sync.Mutex	35	+	mu sync.Mutex
29	-	cache map[string]ports.RemoteCatalogCacheEntry	36	+	cache map[string]ports.RemoteCatalogCacheEntry
30	-	status map[string]remoteHostStatus	37	+	status map[string]remoteHostStatus
31	-	failure map[string]time.Time	38	+	failure map[string]time.Time
32	-	refresh uint64	39	+	refresh uint64
33	-	cancel context.CancelFunc	40	+	cancel context.CancelFunc
34	-	pickers map[*attachedClient]struct{}	41	+	consumers map[*attachedClient]remoteDiscoveryConsumerKind
35	-	writeMu sync.Mutex	42	+	writeMu sync.Mutex
36		}	43		}
37			44
38		func newRemoteCatalogState() remoteCatalogState {	45		func newRemoteCatalogState() remoteCatalogState {
39		return remoteCatalogState{	46		return remoteCatalogState{
40	-	cache: make(map[string]ports.RemoteCatalogCacheEntry),	47	+	cache: make(map[string]ports.RemoteCatalogCacheEntry),
41	-	status: make(map[string]remoteHostStatus),	48	+	status: make(map[string]remoteHostStatus),
42	-	failure: make(map[string]time.Time),	49	+	failure: make(map[string]time.Time),
43	-	pickers: make(map[*attachedClient]struct{}),	50	+	consumers: make(map[*attachedClient]remoteDiscoveryConsumerKind),
44		}	51		}
45		}	52		}
46			53

M internal/usecase/daemon/remote_picker.go +204 -92


@@ -11,10 +11,11 @@ import (
11	11
12	12		"github.com/bnema/vev/internal/domain"
13	13		"github.com/bnema/vev/internal/ports"
	14	+	"github.com/bnema/vev/internal/usecase/palette"
14	15		"github.com/bnema/vev/internal/usecase/picker"
15	16		)
16	17
17		-	type remotePickerCatalogEntry struct {
	18	+	type remoteCatalogPresentationEntry struct {
18	19		entry ports.RemoteCatalogCacheEntry
19	20		status remoteHostStatus
20	21		}

@@ -28,12 +29,25 @@ type remotePickerInstance struct {
28	29		model *picker.Model
29	30		}
30	31
31		-	// remotePickerCatalogSnapshot copies the cache-derived state needed for a
32		-	// picker before any row sorting begins. No remote-state lock survives this
33		-	// snapshot.
34		-	const remotePickerAttachTTL = 30 * time.Second
	32	+	func (i remotePickerInstance) discoveryInstance() remoteDiscoveryInstance {
	33	+	return remoteDiscoveryInstance{
	34	+	ac: i.ac, kind: remoteDiscoveryPicker, generation: i.generation, picker: i.model,
	35	+	}
	36	+	}
	37	+
	38	+	type remoteDiscoveryInstance struct {
	39	+	ac *attachedClient
	40	+	kind remoteDiscoveryConsumerKind
	41	+	generation uint64
	42	+	picker *picker.Model
	43	+	palette *palette.Model
	44	+	}
	45	+
	46	+	const remoteCatalogAttachTTL = 30 * time.Second
35	47
36		-	func (d *Daemon) remotePickerCatalogSnapshot() []remotePickerCatalogEntry {
	48	+	// remoteCatalogSnapshot copies the cache-derived discovery state before any
	49	+	// overlay sorting begins. No remote-state lock survives this snapshot.
	50	+	func (d *Daemon) remoteCatalogSnapshot() []remoteCatalogPresentationEntry {
37	51		if d == nil {
38	52		return nil
39	53		}

@@ -44,10 +58,10 @@ func (d *Daemon) remotePickerCatalogSnapshot() []remotePickerCatalogEntry {
44	58		d.remoteCatalog.status[host] = remoteHostStale
45	59		}
46	60		}
47		-	entries := make([]remotePickerCatalogEntry, 0, len(d.remoteCatalog.cache)+len(d.remoteCatalog.status))
	61	+	entries := make([]remoteCatalogPresentationEntry, 0, len(d.remoteCatalog.cache)+len(d.remoteCatalog.status))
48	62		seen := make(map[string]struct{}, len(d.remoteCatalog.cache))
49	63		for host, entry := range d.remoteCatalog.cache {
50		-	entries = append(entries, remotePickerCatalogEntry{
	64	+	entries = append(entries, remoteCatalogPresentationEntry{
51	65		entry: cloneRemoteCatalogEntry(entry),
52	66		status: d.remoteCatalog.status[host],
53	67		})

@@ -57,7 +71,7 @@ func (d *Daemon) remotePickerCatalogSnapshot() []remotePickerCatalogEntry {
57	71		if _, exists := seen[host]; exists \|\| (status != remoteHostUnreachable && status != remoteHostVersionMismatch && status != remoteHostMalformed) {
58	72		continue
59	73		}
60		-	entries = append(entries, remotePickerCatalogEntry{
	74	+	entries = append(entries, remoteCatalogPresentationEntry{
61	75		entry: ports.RemoteCatalogCacheEntry{Host: host},
62	76		status: status,
63	77		})

@@ -66,14 +80,14 @@ func (d *Daemon) remotePickerCatalogSnapshot() []remotePickerCatalogEntry {
66	80		return entries
67	81		}
68	82
69		-	func (d *Daemon) remotePickerHostRanks() map[string]int {
	83	+	func (d *Daemon) remoteHostRanks() map[string]int {
70	84		ranks := make(map[string]int)
71	85		if d == nil \|\| d.remoteHostStore == nil {
72	86		return ranks
73	87		}
74	88		pinned, learned, err := d.remoteHostStore.Hosts()
75	89		if err != nil {
76		-	d.log.Warn("listing remote hosts for picker failed", "err", err)
	90	+	d.log.Warn("listing remote hosts for discovery failed", "err", err)
77	91		return ranks
78	92		}
79	93		for _, host := range append(pinned, learned...) {

@@ -85,7 +99,7 @@ func (d *Daemon) remotePickerHostRanks() map[string]int {
85	99		}
86	100
87	101		func remoteCatalogExpired(fetchedAt, now time.Time) bool {
88		-	return fetchedAt.IsZero() \|\| (!now.Before(fetchedAt) && now.Sub(fetchedAt) >= remotePickerAttachTTL)
	102	+	return fetchedAt.IsZero() \|\| (!now.Before(fetchedAt) && now.Sub(fetchedAt) >= remoteCatalogAttachTTL)
89	103		}
90	104
91	105		func remotePickerAvailability(status remoteHostStatus) picker.RemoteAvailability {

@@ -128,9 +142,43 @@ func remoteSessionStateStopped(state ports.RemoteCatalogSessionState) bool {
128	142		return state == ports.RemoteCatalogSessionDown
129	143		}
130	144
131		-	func remotePickerView(key domain.RemoteSessionKey, session ports.RemoteCatalogSession, status remoteHostStatus, fetchedAt time.Time) picker.SessionView {
	145	+	func remoteCatalogSessionTarget(key domain.RemoteSessionKey, session ports.RemoteCatalogSession) (domain.RemoteSessionKey, domain.RemoteSessionTarget) {
132	146		key.LifecycleID = session.LifecycleID
133	147		key.DisplayOrigin = domain.RemoteDisplayOrigin(key.Host)
	148	+	target := domain.RemoteSessionTarget{
	149	+	Endpoint: key.Host,
	150	+	DisplayOrigin: key.DisplayOrigin,
	151	+	LifecycleID: session.LifecycleID,
	152	+	SessionName: session.Name,
	153	+	Stopped: remoteSessionStateStopped(session.State),
	154	+	}
	155	+	tabs := ports.CatalogTabs(session)
	156	+	if len(tabs) == 0 {
	157	+	return key, target
	158	+	}
	159	+	if target.Stopped {
	160	+	first := tabs[0]
	161	+	if first.ID != "" {
	162	+	target.StoppedTab = domain.NewStableTabSelector(domain.TabStableID(first.ID))
	163	+	} else {
	164	+	tabCount := min(len(tabs), math.MaxUint16)
	165	+	target.StoppedTab = domain.NewOrdinalTabSelector(0, first.Name, uint16(tabCount))
	166	+	}
	167	+	return key, target
	168	+	}
	169	+	active := 0
	170	+	for i, tab := range tabs {
	171	+	if session.ActiveTabID != "" && tab.ID == session.ActiveTabID {
	172	+	active = i
	173	+	break
	174	+	}
	175	+	}
	176	+	target.LiveTabID = domain.TabStableID(tabs[active].ID)
	177	+	return key, target
	178	+	}
	179	+
	180	+	func remotePickerView(key domain.RemoteSessionKey, session ports.RemoteCatalogSession, status remoteHostStatus, fetchedAt time.Time) picker.SessionView {
	181	+	key, target := remoteCatalogSessionTarget(key, session)
134	182		availability := remotePickerAvailability(status)
135	183		stopped := remoteSessionStateStopped(session.State)
136	184		broken := session.State == ports.RemoteCatalogSessionBroken

@@ -153,26 +201,6 @@ func remotePickerView(key domain.RemoteSessionKey, session ports.RemoteCatalogSe
153	201		Attention: tab.Attention,
154	202		})
155	203		}
156		-	target := domain.RemoteSessionTarget{
157		-	Endpoint: key.Host,
158		-	DisplayOrigin: key.DisplayOrigin,
159		-	LifecycleID: session.LifecycleID,
160		-	SessionName: session.Name,
161		-	Stopped: stopped,
162		-	}
163		-	if len(tabs) != 0 {
164		-	first := tabs[0]
165		-	if stopped {
166		-	if first.ID != "" {
167		-	target.StoppedTab = domain.NewStableTabSelector(domain.TabStableID(first.ID))
168		-	} else {
169		-	tabCount := min(len(tabs), math.MaxUint16)
170		-	target.StoppedTab = domain.NewOrdinalTabSelector(0, first.Name, uint16(tabCount))
171		-	}
172		-	} else {
173		-	target.LiveTabID = domain.TabStableID(tabs[active].ID)
174		-	}
175		-	}
176	204		// Keep the structured session identity on rows even when one tab ID is
177	205		// malformed or a broken session cannot be activated. Cursor navigation
178	206		// must remain possible, while sendRemoteAttachTargetForAttachment will

@@ -265,7 +293,7 @@ func remotePickerHostView(host string, status remoteHostStatus) picker.SessionVi
265	293		}
266	294		}
267	295
268		-	func sortRemotePickerCatalog(entries []remotePickerCatalogEntry, ranks map[string]int) {
	296	+	func sortRemoteCatalog(entries []remoteCatalogPresentationEntry, ranks map[string]int) {
269	297		for i := range entries {
270	298		sort.Slice(entries[i].entry.Sessions, func(left, right int) bool {
271	299		l, r := entries[i].entry.Sessions[left], entries[i].entry.Sessions[right]

@@ -289,63 +317,106 @@ func sortRemotePickerCatalog(entries []remotePickerCatalogEntry, ranks map[strin
289	317		})
290	318		}
291	319
292		-	func (d *Daemon) remotePickerOpened(instance remotePickerInstance) {
293		-	if d.registerRemotePicker(instance) {
294		-	d.startRemotePickerRefresh(instance)
	320	+	func (d *Daemon) remoteDiscoveryOpened(instance remoteDiscoveryInstance) {
	321	+	if d.registerRemoteDiscoveryConsumer(instance) {
	322	+	d.startRemoteDiscoveryRefresh(instance)
295	323		}
296	324		}
297	325
298		-	// registerRemotePicker installs one exact picker generation as a refresh owner.
299		-	// Keeping this step separate gives refresh startup a second atomic validation
300		-	// point: a close can win between registration and startup without being undone
301		-	// by a delayed opener.
302		-	func (d *Daemon) registerRemotePicker(instance remotePickerInstance) bool {
303		-	if d == nil \|\| instance.ac == nil \|\| instance.ac.overlays == nil \|\| instance.model == nil {
	326	+	// registerRemoteDiscoveryConsumer installs one exact overlay generation as a
	327	+	// refresh owner. Overlay ownership always nests its model lock before the
	328	+	// catalog lock; no path may acquire an overlay lock while retaining catalog.mu.
	329	+	func (d *Daemon) registerRemoteDiscoveryConsumer(instance remoteDiscoveryInstance) bool {
	330	+	if d == nil \|\| instance.ac == nil \|\| instance.ac.overlays == nil {
304	331		return false
305	332		}
306	333		rt := instance.ac.overlays
307		-	// Picker ownership always nests pickerMu -> remoteCatalog.mu. No path may
308		-	// acquire pickerMu while retaining the catalog lock.
309		-	rt.pickerMu.Lock()
310		-	defer rt.pickerMu.Unlock()
311		-	if rt.pickerGeneration != instance.generation \|\| rt.picker != instance.model {
	334	+	switch instance.kind {
	335	+	case remoteDiscoveryPicker:
	336	+	if instance.picker == nil {
	337	+	return false
	338	+	}
	339	+	rt.pickerMu.Lock()
	340	+	defer rt.pickerMu.Unlock()
	341	+	if rt.pickerGeneration != instance.generation \|\| rt.picker != instance.picker {
	342	+	return false
	343	+	}
	344	+	case remoteDiscoveryPalette:
	345	+	if instance.palette == nil {
	346	+	return false
	347	+	}
	348	+	rt.paletteMu.Lock()
	349	+	defer rt.paletteMu.Unlock()
	350	+	if rt.paletteGeneration != instance.generation \|\| rt.palette != instance.palette {
	351	+	return false
	352	+	}
	353	+	default:
312	354		return false
313	355		}
314	356		d.remoteCatalog.mu.Lock()
315		-	d.remoteCatalog.pickers[instance.ac] = struct{}{}
	357	+	d.remoteCatalog.consumers[instance.ac] \|= instance.kind
316	358		d.remoteCatalog.mu.Unlock()
317	359		return true
318	360		}
319	361
320		-	func (d *Daemon) remotePickerClosed(instance remotePickerInstance) {
321		-	if d == nil \|\| instance.ac == nil \|\| instance.ac.overlays == nil \|\| instance.model == nil {
	362	+	func (d *Daemon) remoteDiscoveryClosed(instance remoteDiscoveryInstance) {
	363	+	if d == nil \|\| instance.ac == nil \|\| instance.ac.overlays == nil {
322	364		return
323	365		}
324	366		rt := instance.ac.overlays
325		-	rt.pickerMu.Lock()
326		-	current := rt.pickerGeneration == instance.generation && rt.picker == nil
	367	+	var current bool
	368	+	var unlock func()
	369	+	switch instance.kind {
	370	+	case remoteDiscoveryPicker:
	371	+	if instance.picker == nil {
	372	+	return
	373	+	}
	374	+	rt.pickerMu.Lock()
	375	+	unlock = rt.pickerMu.Unlock
	376	+	current = rt.pickerGeneration == instance.generation && rt.picker == nil
	377	+	case remoteDiscoveryPalette:
	378	+	if instance.palette == nil {
	379	+	return
	380	+	}
	381	+	rt.paletteMu.Lock()
	382	+	unlock = rt.paletteMu.Unlock
	383	+	current = rt.paletteGeneration == instance.generation && rt.palette == nil
	384	+	default:
	385	+	return
	386	+	}
327	387		if !current {
328		-	rt.pickerMu.Unlock()
	388	+	unlock()
329	389		return
330	390		}
331	391		d.remoteCatalog.mu.Lock()
332		-	delete(d.remoteCatalog.pickers, instance.ac)
333		-	if len(d.remoteCatalog.pickers) != 0 {
	392	+	owners := d.remoteCatalog.consumers[instance.ac]
	393	+	if owners&instance.kind == 0 {
334	394		d.remoteCatalog.mu.Unlock()
335		-	rt.pickerMu.Unlock()
	395	+	unlock()
	396	+	return
	397	+	}
	398	+	owners &^= instance.kind
	399	+	if owners == 0 {
	400	+	delete(d.remoteCatalog.consumers, instance.ac)
	401	+	} else {
	402	+	d.remoteCatalog.consumers[instance.ac] = owners
	403	+	}
	404	+	if len(d.remoteCatalog.consumers) != 0 {
	405	+	d.remoteCatalog.mu.Unlock()
	406	+	unlock()
336	407		return
337	408		}
338	409		d.remoteCatalog.refresh++
339	410		cancel := d.remoteCatalog.cancel
340	411		d.remoteCatalog.cancel = nil
341	412		d.remoteCatalog.mu.Unlock()
342		-	rt.pickerMu.Unlock()
	413	+	unlock()
343	414		if cancel != nil {
344	415		cancel()
345	416		}
346	417		}
347	418
348		-	func (d *Daemon) cancelRemotePickerRefresh() {
	419	+	func (d *Daemon) cancelRemoteDiscoveryRefresh() {
349	420		if d == nil {
350	421		return
351	422		}

@@ -359,7 +430,7 @@ func (d *Daemon) cancelRemotePickerRefresh() {
359	430		}
360	431		}
361	432
362		-	func (d *Daemon) remotePickerHosts() ([]string, error) {
	433	+	func (d *Daemon) remoteDiscoveryHosts() ([]string, error) {
363	434		if d == nil \|\| d.remoteHostStore == nil {
364	435		return nil, nil
365	436		}

@@ -383,12 +454,12 @@ func (d *Daemon) remotePickerHosts() ([]string, error) {
383	454		return hosts, nil
384	455		}
385	456
386		-	// startRemotePickerRefresh replaces the current refresh generation and launches
387		-	// one bounded catalog call per known host. Installing the generation is gated
388		-	// by the exact picker generation that registered ownership. Host-store and
389		-	// remote I/O happen after every architecture lock has been released.
390		-	func (d *Daemon) startRemotePickerRefresh(instance remotePickerInstance) uint64 {
391		-	if d == nil \|\| instance.ac == nil \|\| instance.ac.overlays == nil \|\| instance.model == nil {
	457	+	// startRemoteDiscoveryRefresh replaces the current refresh generation and
	458	+	// launches one bounded catalog call per known host. Installing the generation
	459	+	// is gated by the exact overlay generation that registered ownership. Host
	460	+	// store and remote I/O happen after every architecture lock is released.
	461	+	func (d *Daemon) startRemoteDiscoveryRefresh(instance remoteDiscoveryInstance) uint64 {
	462	+	if d == nil \|\| instance.ac == nil \|\| instance.ac.overlays == nil {
392	463		return 0
393	464		}
394	465		root := context.Background()

@@ -398,22 +469,47 @@ func (d *Daemon) startRemotePickerRefresh(instance remotePickerInstance) uint64
398	469		ctx, cancel := context.WithCancel(root)
399	470
400	471		rt := instance.ac.overlays
401		-	rt.pickerMu.Lock()
402		-	d.remoteCatalog.mu.Lock()
403		-	_, owner := d.remoteCatalog.pickers[instance.ac]
404		-	current := rt.pickerGeneration == instance.generation && rt.picker == instance.model
405		-	if !current \|\| !owner \|\| len(d.remoteCatalog.pickers) == 0 {
406		-	d.remoteCatalog.mu.Unlock()
	472	+	install := func(current bool) (context.CancelFunc, uint64, bool) {
	473	+	d.remoteCatalog.mu.Lock()
	474	+	defer d.remoteCatalog.mu.Unlock()
	475	+	owner := d.remoteCatalog.consumers[instance.ac]&instance.kind != 0
	476	+	if !current \|\| !owner \|\| len(d.remoteCatalog.consumers) == 0 {
	477	+	return nil, 0, false
	478	+	}
	479	+	previous := d.remoteCatalog.cancel
	480	+	d.remoteCatalog.refresh++
	481	+	generation := d.remoteCatalog.refresh
	482	+	d.remoteCatalog.cancel = cancel
	483	+	return previous, generation, true
	484	+	}
	485	+	var previous context.CancelFunc
	486	+	var generation uint64
	487	+	var installed bool
	488	+	switch instance.kind {
	489	+	case remoteDiscoveryPicker:
	490	+	if instance.picker == nil {
	491	+	cancel()
	492	+	return 0
	493	+	}
	494	+	rt.pickerMu.Lock()
	495	+	previous, generation, installed = install(rt.pickerGeneration == instance.generation && rt.picker == instance.picker)
407	496		rt.pickerMu.Unlock()
	497	+	case remoteDiscoveryPalette:
	498	+	if instance.palette == nil {
	499	+	cancel()
	500	+	return 0
	501	+	}
	502	+	rt.paletteMu.Lock()
	503	+	previous, generation, installed = install(rt.paletteGeneration == instance.generation && rt.palette == instance.palette)
	504	+	rt.paletteMu.Unlock()
	505	+	default:
	506	+	cancel()
	507	+	return 0
	508	+	}
	509	+	if !installed {
408	510		cancel()
409	511		return 0
410	512		}
411		-	previous := d.remoteCatalog.cancel
412		-	d.remoteCatalog.refresh++
413		-	generation := d.remoteCatalog.refresh
414		-	d.remoteCatalog.cancel = cancel
415		-	d.remoteCatalog.mu.Unlock()
416		-	rt.pickerMu.Unlock()
417	513		if previous != nil {
418	514		previous()
419	515		}

@@ -421,7 +517,7 @@ func (d *Daemon) startRemotePickerRefresh(instance remotePickerInstance) uint64
421	517		return generation
422	518		}
423	519
424		-	hosts, err := d.remotePickerHosts()
	520	+	hosts, err := d.remoteDiscoveryHosts()
425	521		if err != nil {
426	522		d.log.Warn("listing remote hosts for refresh failed", "err", err)
427	523		return generation

@@ -454,7 +550,7 @@ func (d *Daemon) startRemotePickerRefresh(instance remotePickerInstance) uint64
454	550		if cacheChanged {
455	551		d.persistRemoteCatalogCache()
456	552		}
457		-	d.refreshRemoteOpenPickers()
	553	+	d.refreshRemoteDiscoveryConsumers()
458	554
459	555		for _, host := range hosts {
460	556		d.sessWg.Go(func() {

@@ -465,7 +561,7 @@ func (d *Daemon) startRemotePickerRefresh(instance remotePickerInstance) uint64
465	561		return generation
466	562		}
467	563
468		-	func containsRemotePickerHost(hosts []string, target string) bool {
	564	+	func containsRemoteDiscoveryHost(hosts []string, target string) bool {
469	565		for _, host := range hosts {
470	566		if host == target {
471	567		return true

@@ -488,12 +584,12 @@ func (d *Daemon) applyRemoteRefreshResult(generation uint64, host string, catalo
488	584		return false
489	585		}
490	586
491		-	hosts, hostsErr := d.remotePickerHosts()
	587	+	hosts, hostsErr := d.remoteDiscoveryHosts()
492	588		if hostsErr != nil {
493	589		d.log.Warn("revalidating remote host refresh failed", "host", host, "err", hostsErr)
494	590		return false
495	591		}
496		-	stillKnown := containsRemotePickerHost(hosts, host)
	592	+	stillKnown := containsRemoteDiscoveryHost(hosts, host)
497	593		now := d.clock.Now()
498	594		if listErr == nil {
499	595		if err := ports.ValidateRemoteCatalog(catalog); err != nil {

@@ -514,7 +610,7 @@ func (d *Daemon) applyRemoteRefreshResult(generation uint64, host string, catalo
514	610		d.remoteCatalog.mu.Unlock()
515	611		if cacheChanged {
516	612		d.persistRemoteCatalogCache()
517		-	d.refreshRemoteOpenPickers()
	613	+	d.refreshRemoteDiscoveryConsumers()
518	614		}
519	615		return cacheChanged
520	616		}

@@ -532,7 +628,7 @@ func (d *Daemon) applyRemoteRefreshResult(generation uint64, host string, catalo
532	628		d.remoteCatalog.status[host] = status
533	629		d.remoteCatalog.failure[host] = now
534	630		d.remoteCatalog.mu.Unlock()
535		-	d.refreshRemoteOpenPickers()
	631	+	d.refreshRemoteDiscoveryConsumers()
536	632		return false
537	633		}
538	634		d.remoteCatalog.cache[host] = cloneRemoteCatalogEntry(ports.RemoteCatalogCacheEntry{

@@ -545,26 +641,42 @@ func (d *Daemon) applyRemoteRefreshResult(generation uint64, host string, catalo
545	641		d.remoteCatalog.mu.Unlock()
546	642
547	643		d.persistRemoteCatalogCache()
548		-	d.refreshRemoteOpenPickers()
	644	+	d.refreshRemoteDiscoveryConsumers()
549	645		return true
550	646		}
551	647
552		-	func (d *Daemon) refreshRemoteOpenPickers() {
	648	+	func (d *Daemon) refreshRemoteDiscoveryConsumers() {
553	649		if d == nil {
554	650		return
555	651		}
	652	+	type consumer struct {
	653	+	ac *attachedClient
	654	+	kind remoteDiscoveryConsumerKind
	655	+	}
556	656		d.remoteCatalog.mu.Lock()
557		-	clients := make([]*attachedClient, 0, len(d.remoteCatalog.pickers))
558		-	for ac := range d.remoteCatalog.pickers {
559		-	clients = append(clients, ac)
	657	+	consumers := make([]consumer, 0, len(d.remoteCatalog.consumers))
	658	+	for ac, kind := range d.remoteCatalog.consumers {
	659	+	consumers = append(consumers, consumer{ac: ac, kind: kind})
560	660		}
561	661		d.remoteCatalog.mu.Unlock()
562	662
563		-	for _, ac := range clients {
	663	+	for _, consumer := range consumers {
	664	+	ac := consumer.ac
564	665		if ac == nil \|\| ac.overlays == nil {
565	666		continue
566	667		}
567		-	d.refreshPickerOpts(ac, pickerRefreshOptions{preserveSelection: true, nearestRow: -1})
	668	+	refreshed := false
	669	+	if consumer.kind&remoteDiscoveryPicker != 0 {
	670	+	d.refreshPickerOpts(ac, pickerRefreshOptions{preserveSelection: true, nearestRow: -1})
	671	+	refreshed = true
	672	+	}
	673	+	if consumer.kind&remoteDiscoveryPalette != 0 {
	674	+	d.refreshPalette(ac)
	675	+	refreshed = true
	676	+	}
	677	+	if !refreshed {
	678	+	continue
	679	+	}
568	680		if entry := ac.currentAttachmentSession(); entry != nil {
569	681		d.invalidateRender(entry, ac, true, "remote_picker.go")
570	682		}

 	"github.com/bnema/vev/internal/domain"
 	"github.com/bnema/vev/internal/ports"
+	"github.com/bnema/vev/internal/usecase/palette"
 	"github.com/bnema/vev/internal/usecase/picker"
 )
-type remotePickerCatalogEntry struct {
+type remoteCatalogPresentationEntry struct {
 	entry  ports.RemoteCatalogCacheEntry
 	status remoteHostStatus
 }
 	model      *picker.Model
 }
-// remotePickerCatalogSnapshot copies the cache-derived state needed for a
+func (i remotePickerInstance) discoveryInstance() remoteDiscoveryInstance {
-// picker before any row sorting begins. No remote-state lock survives this
+	return remoteDiscoveryInstance{
-// snapshot.
+		ac: i.ac, kind: remoteDiscoveryPicker, generation: i.generation, picker: i.model,
-const remotePickerAttachTTL = 30 * time.Second
+	}
+}
+type remoteDiscoveryInstance struct {
+	ac         *attachedClient
+	kind       remoteDiscoveryConsumerKind
+	generation uint64
+	picker     *picker.Model
+	palette    *palette.Model
+}
+const remoteCatalogAttachTTL = 30 * time.Second
-func (d *Daemon) remotePickerCatalogSnapshot() []remotePickerCatalogEntry {
+// remoteCatalogSnapshot copies the cache-derived discovery state before any
+// overlay sorting begins. No remote-state lock survives this snapshot.
+func (d *Daemon) remoteCatalogSnapshot() []remoteCatalogPresentationEntry {
 	if d == nil {
 		return nil
 	}
 			d.remoteCatalog.status[host] = remoteHostStale
 		}
 	}
-	entries := make([]remotePickerCatalogEntry, 0, len(d.remoteCatalog.cache)+len(d.remoteCatalog.status))
+	entries := make([]remoteCatalogPresentationEntry, 0, len(d.remoteCatalog.cache)+len(d.remoteCatalog.status))
 	seen := make(map[string]struct{}, len(d.remoteCatalog.cache))
 	for host, entry := range d.remoteCatalog.cache {
-		entries = append(entries, remotePickerCatalogEntry{
+		entries = append(entries, remoteCatalogPresentationEntry{
 			entry:  cloneRemoteCatalogEntry(entry),
 			status: d.remoteCatalog.status[host],
 		})
 		if _, exists := seen[host]; exists || (status != remoteHostUnreachable && status != remoteHostVersionMismatch && status != remoteHostMalformed) {
 			continue
 		}
-		entries = append(entries, remotePickerCatalogEntry{
+		entries = append(entries, remoteCatalogPresentationEntry{
 			entry:  ports.RemoteCatalogCacheEntry{Host: host},
 			status: status,
 		})
 	return entries
 }
-func (d *Daemon) remotePickerHostRanks() map[string]int {
+func (d *Daemon) remoteHostRanks() map[string]int {
 	ranks := make(map[string]int)
 	if d == nil || d.remoteHostStore == nil {
 		return ranks
 	}
 	pinned, learned, err := d.remoteHostStore.Hosts()
 	if err != nil {
-		d.log.Warn("listing remote hosts for picker failed", "err", err)
+		d.log.Warn("listing remote hosts for discovery failed", "err", err)
 		return ranks
 	}
 	for _, host := range append(pinned, learned...) {
 }
 func remoteCatalogExpired(fetchedAt, now time.Time) bool {
-	return fetchedAt.IsZero() || (!now.Before(fetchedAt) && now.Sub(fetchedAt) >= remotePickerAttachTTL)
+	return fetchedAt.IsZero() || (!now.Before(fetchedAt) && now.Sub(fetchedAt) >= remoteCatalogAttachTTL)
 }
 func remotePickerAvailability(status remoteHostStatus) picker.RemoteAvailability {
 	return state == ports.RemoteCatalogSessionDown
 }
-func remotePickerView(key domain.RemoteSessionKey, session ports.RemoteCatalogSession, status remoteHostStatus, fetchedAt time.Time) picker.SessionView {
+func remoteCatalogSessionTarget(key domain.RemoteSessionKey, session ports.RemoteCatalogSession) (domain.RemoteSessionKey, domain.RemoteSessionTarget) {
 	key.LifecycleID = session.LifecycleID
 	key.DisplayOrigin = domain.RemoteDisplayOrigin(key.Host)
+	target := domain.RemoteSessionTarget{
+		Endpoint:      key.Host,
+		DisplayOrigin: key.DisplayOrigin,
+		LifecycleID:   session.LifecycleID,
+		SessionName:   session.Name,
+		Stopped:       remoteSessionStateStopped(session.State),
+	}
+	tabs := ports.CatalogTabs(session)
+	if len(tabs) == 0 {
+		return key, target
+	}
+	if target.Stopped {
+		first := tabs[0]
+		if first.ID != "" {
+			target.StoppedTab = domain.NewStableTabSelector(domain.TabStableID(first.ID))
+		} else {
+			tabCount := min(len(tabs), math.MaxUint16)
+			target.StoppedTab = domain.NewOrdinalTabSelector(0, first.Name, uint16(tabCount))
+		}
+		return key, target
+	}
+	active := 0
+	for i, tab := range tabs {
+		if session.ActiveTabID != "" && tab.ID == session.ActiveTabID {
+			active = i
+			break
+		}
+	}
+	target.LiveTabID = domain.TabStableID(tabs[active].ID)
+	return key, target
+}
+func remotePickerView(key domain.RemoteSessionKey, session ports.RemoteCatalogSession, status remoteHostStatus, fetchedAt time.Time) picker.SessionView {
+	key, target := remoteCatalogSessionTarget(key, session)
 	availability := remotePickerAvailability(status)
 	stopped := remoteSessionStateStopped(session.State)
 	broken := session.State == ports.RemoteCatalogSessionBroken
 			Attention: tab.Attention,
 		})
 	}
-	target := domain.RemoteSessionTarget{
-		Endpoint:      key.Host,
-		DisplayOrigin: key.DisplayOrigin,
-		LifecycleID:   session.LifecycleID,
-		SessionName:   session.Name,
-		Stopped:       stopped,
-	}
-	if len(tabs) != 0 {
-		first := tabs[0]
-		if stopped {
-			if first.ID != "" {
-				target.StoppedTab = domain.NewStableTabSelector(domain.TabStableID(first.ID))
-			} else {
-				tabCount := min(len(tabs), math.MaxUint16)
-				target.StoppedTab = domain.NewOrdinalTabSelector(0, first.Name, uint16(tabCount))
-			}
-		} else {
-			target.LiveTabID = domain.TabStableID(tabs[active].ID)
-		}
-	}
 	// Keep the structured session identity on rows even when one tab ID is
 	// malformed or a broken session cannot be activated. Cursor navigation
 	// must remain possible, while sendRemoteAttachTargetForAttachment will
 	}
 }
-func sortRemotePickerCatalog(entries []remotePickerCatalogEntry, ranks map[string]int) {
+func sortRemoteCatalog(entries []remoteCatalogPresentationEntry, ranks map[string]int) {
 	for i := range entries {
 		sort.Slice(entries[i].entry.Sessions, func(left, right int) bool {
 			l, r := entries[i].entry.Sessions[left], entries[i].entry.Sessions[right]
 	})
 }
-func (d *Daemon) remotePickerOpened(instance remotePickerInstance) {
+func (d *Daemon) remoteDiscoveryOpened(instance remoteDiscoveryInstance) {
-	if d.registerRemotePicker(instance) {
+	if d.registerRemoteDiscoveryConsumer(instance) {
-		d.startRemotePickerRefresh(instance)
+		d.startRemoteDiscoveryRefresh(instance)
 	}
 }
-// registerRemotePicker installs one exact picker generation as a refresh owner.
+// registerRemoteDiscoveryConsumer installs one exact overlay generation as a
-// Keeping this step separate gives refresh startup a second atomic validation
+// refresh owner. Overlay ownership always nests its model lock before the
-// point: a close can win between registration and startup without being undone
+// catalog lock; no path may acquire an overlay lock while retaining catalog.mu.
-// by a delayed opener.
+func (d *Daemon) registerRemoteDiscoveryConsumer(instance remoteDiscoveryInstance) bool {
-func (d *Daemon) registerRemotePicker(instance remotePickerInstance) bool {
+	if d == nil || instance.ac == nil || instance.ac.overlays == nil {
-	if d == nil || instance.ac == nil || instance.ac.overlays == nil || instance.model == nil {
 		return false
 	}
 	rt := instance.ac.overlays
-	// Picker ownership always nests pickerMu -> remoteCatalog.mu. No path may
+	switch instance.kind {
-	// acquire pickerMu while retaining the catalog lock.
+	case remoteDiscoveryPicker:
-	rt.pickerMu.Lock()
+		if instance.picker == nil {
-	defer rt.pickerMu.Unlock()
+			return false
-	if rt.pickerGeneration != instance.generation || rt.picker != instance.model {
+		}
+		rt.pickerMu.Lock()
+		defer rt.pickerMu.Unlock()
+		if rt.pickerGeneration != instance.generation || rt.picker != instance.picker {
+			return false
+		}
+	case remoteDiscoveryPalette:
+		if instance.palette == nil {
+			return false
+		}
+		rt.paletteMu.Lock()
+		defer rt.paletteMu.Unlock()
+		if rt.paletteGeneration != instance.generation || rt.palette != instance.palette {
+			return false
+		}
+	default:
 		return false
 	}
 	d.remoteCatalog.mu.Lock()
-	d.remoteCatalog.pickers[instance.ac] = struct{}{}
+	d.remoteCatalog.consumers[instance.ac] |= instance.kind
 	d.remoteCatalog.mu.Unlock()
 	return true
 }
-func (d *Daemon) remotePickerClosed(instance remotePickerInstance) {
+func (d *Daemon) remoteDiscoveryClosed(instance remoteDiscoveryInstance) {
-	if d == nil || instance.ac == nil || instance.ac.overlays == nil || instance.model == nil {
+	if d == nil || instance.ac == nil || instance.ac.overlays == nil {
 		return
 	}
 	rt := instance.ac.overlays
-	rt.pickerMu.Lock()
+	var current bool
-	current := rt.pickerGeneration == instance.generation && rt.picker == nil
+	var unlock func()
+	switch instance.kind {
+	case remoteDiscoveryPicker:
+		if instance.picker == nil {
+			return
+		}
+		rt.pickerMu.Lock()
+		unlock = rt.pickerMu.Unlock
+		current = rt.pickerGeneration == instance.generation && rt.picker == nil
+	case remoteDiscoveryPalette:
+		if instance.palette == nil {
+			return
+		}
+		rt.paletteMu.Lock()
+		unlock = rt.paletteMu.Unlock
+		current = rt.paletteGeneration == instance.generation && rt.palette == nil
+	default:
+		return
+	}
 	if !current {
-		rt.pickerMu.Unlock()
+		unlock()
 		return
 	}
 	d.remoteCatalog.mu.Lock()
-	delete(d.remoteCatalog.pickers, instance.ac)
+	owners := d.remoteCatalog.consumers[instance.ac]
-	if len(d.remoteCatalog.pickers) != 0 {
+	if owners&instance.kind == 0 {
 		d.remoteCatalog.mu.Unlock()
-		rt.pickerMu.Unlock()
+		unlock()
+		return
+	}
+	owners &^= instance.kind
+	if owners == 0 {
+		delete(d.remoteCatalog.consumers, instance.ac)
+	} else {
+		d.remoteCatalog.consumers[instance.ac] = owners
+	}
+	if len(d.remoteCatalog.consumers) != 0 {
+		d.remoteCatalog.mu.Unlock()
+		unlock()
 		return
 	}
 	d.remoteCatalog.refresh++
 	cancel := d.remoteCatalog.cancel
 	d.remoteCatalog.cancel = nil
 	d.remoteCatalog.mu.Unlock()
-	rt.pickerMu.Unlock()
+	unlock()
 	if cancel != nil {
 		cancel()
 	}
 }
-func (d *Daemon) cancelRemotePickerRefresh() {
+func (d *Daemon) cancelRemoteDiscoveryRefresh() {
 	if d == nil {
 		return
 	}
 	}
 }
-func (d *Daemon) remotePickerHosts() ([]string, error) {
+func (d *Daemon) remoteDiscoveryHosts() ([]string, error) {
 	if d == nil || d.remoteHostStore == nil {
 		return nil, nil
 	}
 	return hosts, nil
 }
-// startRemotePickerRefresh replaces the current refresh generation and launches
+// startRemoteDiscoveryRefresh replaces the current refresh generation and
-// one bounded catalog call per known host. Installing the generation is gated
+// launches one bounded catalog call per known host. Installing the generation
-// by the exact picker generation that registered ownership. Host-store and
+// is gated by the exact overlay generation that registered ownership. Host
-// remote I/O happen after every architecture lock has been released.
+// store and remote I/O happen after every architecture lock is released.
-func (d *Daemon) startRemotePickerRefresh(instance remotePickerInstance) uint64 {
+func (d *Daemon) startRemoteDiscoveryRefresh(instance remoteDiscoveryInstance) uint64 {
-	if d == nil || instance.ac == nil || instance.ac.overlays == nil || instance.model == nil {
+	if d == nil || instance.ac == nil || instance.ac.overlays == nil {
 		return 0
 	}
 	root := context.Background()
 	ctx, cancel := context.WithCancel(root)
 	rt := instance.ac.overlays
-	rt.pickerMu.Lock()
+	install := func(current bool) (context.CancelFunc, uint64, bool) {
-	d.remoteCatalog.mu.Lock()
+		d.remoteCatalog.mu.Lock()
-	_, owner := d.remoteCatalog.pickers[instance.ac]
+		defer d.remoteCatalog.mu.Unlock()
-	current := rt.pickerGeneration == instance.generation && rt.picker == instance.model
+		owner := d.remoteCatalog.consumers[instance.ac]&instance.kind != 0
-	if !current || !owner || len(d.remoteCatalog.pickers) == 0 {
+		if !current || !owner || len(d.remoteCatalog.consumers) == 0 {
-		d.remoteCatalog.mu.Unlock()
+			return nil, 0, false
+		}
+		previous := d.remoteCatalog.cancel
+		d.remoteCatalog.refresh++
+		generation := d.remoteCatalog.refresh
+		d.remoteCatalog.cancel = cancel
+		return previous, generation, true
+	}
+	var previous context.CancelFunc
+	var generation uint64
+	var installed bool
+	switch instance.kind {
+	case remoteDiscoveryPicker:
+		if instance.picker == nil {
+			cancel()
+			return 0
+		}
+		rt.pickerMu.Lock()
+		previous, generation, installed = install(rt.pickerGeneration == instance.generation && rt.picker == instance.picker)
 		rt.pickerMu.Unlock()
+	case remoteDiscoveryPalette:
+		if instance.palette == nil {
+			cancel()
+			return 0
+		}
+		rt.paletteMu.Lock()
+		previous, generation, installed = install(rt.paletteGeneration == instance.generation && rt.palette == instance.palette)
+		rt.paletteMu.Unlock()
+	default:
+		cancel()
+		return 0
+	}
+	if !installed {
 		cancel()
 		return 0
 	}
-	previous := d.remoteCatalog.cancel
-	d.remoteCatalog.refresh++
-	generation := d.remoteCatalog.refresh
-	d.remoteCatalog.cancel = cancel
-	d.remoteCatalog.mu.Unlock()
-	rt.pickerMu.Unlock()
 	if previous != nil {
 		previous()
 	}
 		return generation
 	}
-	hosts, err := d.remotePickerHosts()
+	hosts, err := d.remoteDiscoveryHosts()
 	if err != nil {
 		d.log.Warn("listing remote hosts for refresh failed", "err", err)
 		return generation
 	if cacheChanged {
 		d.persistRemoteCatalogCache()
 	}
-	d.refreshRemoteOpenPickers()
+	d.refreshRemoteDiscoveryConsumers()
 	for _, host := range hosts {
 		d.sessWg.Go(func() {
 	return generation
 }
-func containsRemotePickerHost(hosts []string, target string) bool {
+func containsRemoteDiscoveryHost(hosts []string, target string) bool {
 	for _, host := range hosts {
 		if host == target {
 			return true
 		return false
 	}
-	hosts, hostsErr := d.remotePickerHosts()
+	hosts, hostsErr := d.remoteDiscoveryHosts()
 	if hostsErr != nil {
 		d.log.Warn("revalidating remote host refresh failed", "host", host, "err", hostsErr)
 		return false
 	}
-	stillKnown := containsRemotePickerHost(hosts, host)
+	stillKnown := containsRemoteDiscoveryHost(hosts, host)
 	now := d.clock.Now()
 	if listErr == nil {
 		if err := ports.ValidateRemoteCatalog(catalog); err != nil {
 		d.remoteCatalog.mu.Unlock()
 		if cacheChanged {
 			d.persistRemoteCatalogCache()
-			d.refreshRemoteOpenPickers()
+			d.refreshRemoteDiscoveryConsumers()
 		}
 		return cacheChanged
 	}
 		d.remoteCatalog.status[host] = status
 		d.remoteCatalog.failure[host] = now
 		d.remoteCatalog.mu.Unlock()
-		d.refreshRemoteOpenPickers()
+		d.refreshRemoteDiscoveryConsumers()
 		return false
 	}
 	d.remoteCatalog.cache[host] = cloneRemoteCatalogEntry(ports.RemoteCatalogCacheEntry{
 	d.remoteCatalog.mu.Unlock()
 	d.persistRemoteCatalogCache()
-	d.refreshRemoteOpenPickers()
+	d.refreshRemoteDiscoveryConsumers()
 	return true
 }
-func (d *Daemon) refreshRemoteOpenPickers() {
+func (d *Daemon) refreshRemoteDiscoveryConsumers() {
 	if d == nil {
 		return
 	}
+	type consumer struct {
+		ac   *attachedClient
+		kind remoteDiscoveryConsumerKind
+	}
 	d.remoteCatalog.mu.Lock()
-	clients := make([]*attachedClient, 0, len(d.remoteCatalog.pickers))
+	consumers := make([]consumer, 0, len(d.remoteCatalog.consumers))
-	for ac := range d.remoteCatalog.pickers {
+	for ac, kind := range d.remoteCatalog.consumers {
-		clients = append(clients, ac)
+		consumers = append(consumers, consumer{ac: ac, kind: kind})
 	}
 	d.remoteCatalog.mu.Unlock()
-	for _, ac := range clients {
+	for _, consumer := range consumers {
+		ac := consumer.ac
 		if ac == nil || ac.overlays == nil {
 			continue
 		}
-		d.refreshPickerOpts(ac, pickerRefreshOptions{preserveSelection: true, nearestRow: -1})
+		refreshed := false
+		if consumer.kind&remoteDiscoveryPicker != 0 {
+			d.refreshPickerOpts(ac, pickerRefreshOptions{preserveSelection: true, nearestRow: -1})
+			refreshed = true
+		}
+		if consumer.kind&remoteDiscoveryPalette != 0 {
+			d.refreshPalette(ac)
+			refreshed = true
+		}
+		if !refreshed {
+			continue
+		}
 		if entry := ac.currentAttachmentSession(); entry != nil {
 			d.invalidateRender(entry, ac, true, "remote_picker.go")
 		}

M internal/usecase/daemon/remote_picker_test.go +34 -28


@@ -130,7 +130,7 @@ func TestRemotePickerCatalogExpiresAtAttachTTL(t *testing.T) {
130	130		d := newTestDaemon(t, nil, clock)
131	131		lifecycle := remoteLifecycleForTest()
132	132		d.remoteCatalog.replaceCache([]ports.RemoteCatalogCacheEntry{{
133		-	Host: "arch", FetchedAt: now.Add(-remotePickerAttachTTL), Sessions: []ports.RemoteCatalogSession{{
	133	+	Host: "arch", FetchedAt: now.Add(-remoteCatalogAttachTTL), Sessions: []ports.RemoteCatalogSession{{
134	134		LifecycleID: lifecycle, Name: "work", State: "up", Tabs: []ports.RemoteCatalogTab{{ID: "tab-1", Index: 0, Name: "main"}},
135	135		}},
136	136		}})

@@ -138,11 +138,11 @@ func TestRemotePickerCatalogExpiresAtAttachTTL(t *testing.T) {
138	138		d.remoteCatalog.status["arch"] = remoteHostFresh
139	139		d.remoteCatalog.mu.Unlock()
140	140
141		-	entries := d.remotePickerCatalogSnapshot()
	141	+	entries := d.remoteCatalogSnapshot()
142	142		require.Len(t, entries, 1)
143	143		require.Equal(t, remoteHostStale, entries[0].status)
144	144		target := domain.RemoteSessionTarget{Endpoint: "arch", DisplayOrigin: "arch", LifecycleID: lifecycle, SessionName: "work", LiveTabID: "tab-1"}
145		-	require.False(t, d.remotePickerTargetReadyTarget(target), "attachment must reject a catalogue exactly at the TTL boundary")
	145	+	require.False(t, d.remoteCatalogTargetReady(target), "attachment must reject a catalogue exactly at the TTL boundary")
146	146		}
147	147
148	148		func TestRemotePickerTargetReadyExpiresAfterPickerBuildWithoutSnapshot(t *testing.T) {

@@ -163,10 +163,10 @@ func TestRemotePickerTargetReadyExpiresAfterPickerBuildWithoutSnapshot(t *testin
163	163		target, ok := model.Selected()
164	164		require.True(t, ok)
165	165		require.NotNil(t, target.RemoteTarget)
166		-	require.True(t, d.remotePickerTargetReadyTarget(*target.RemoteTarget), "fresh picker target must be ready before the attach TTL")
	166	+	require.True(t, d.remoteCatalogTargetReady(*target.RemoteTarget), "fresh picker target must be ready before the attach TTL")
167	167
168		-	clock.Advance(remotePickerAttachTTL)
169		-	require.False(t, d.remotePickerTargetReadyTarget(*target.RemoteTarget), "handoff must reject a picker target whose catalog reached the attach TTL")
	168	+	clock.Advance(remoteCatalogAttachTTL)
	169	+	require.False(t, d.remoteCatalogTargetReady(*target.RemoteTarget), "handoff must reject a picker target whose catalog reached the attach TTL")
170	170		d.remoteCatalog.mu.Lock()
171	171		require.Equal(t, remoteHostStale, d.remoteCatalog.status["arch"])
172	172		d.remoteCatalog.mu.Unlock()

@@ -483,7 +483,7 @@ func TestRemoteRefreshStartsPerHostAndCancelsSupersededGeneration(t *testing.T)
483	483		ac.overlays.pickerGeneration++
484	484		instance := remotePickerInstance{ac: ac, generation: ac.overlays.pickerGeneration, model: model}
485	485		ac.overlays.pickerMu.Unlock()
486		-	require.True(t, d.registerRemotePicker(instance))
	486	+	require.True(t, d.registerRemoteDiscoveryConsumer(instance.discoveryInstance()))
487	487		lifecycle := remoteLifecycleForTest()
488	488		d.remoteCatalog.replaceCache([]ports.RemoteCatalogCacheEntry{{
489	489		Host: "arch", FetchedAt: time.Unix(10, 0), Sessions: []ports.RemoteCatalogSession{{

@@ -492,7 +492,7 @@ func TestRemoteRefreshStartsPerHostAndCancelsSupersededGeneration(t *testing.T)
492	492		}},
493	493		}})
494	494
495		-	firstGeneration := d.startRemotePickerRefresh(instance)
	495	+	firstGeneration := d.startRemoteDiscoveryRefresh(instance.discoveryInstance())
496	496		first := map[string]remoteRefreshRequest{}
497	497		for range 2 {
498	498		request := receiveRemotePicker(t, catalog.requests, "catalog request")

@@ -514,7 +514,7 @@ func TestRemoteRefreshStartsPerHostAndCancelsSupersededGeneration(t *testing.T)
514	514		_, selectable := refreshedModel.Selected()
515	515		require.False(t, selectable, "refreshing status must gate picker activation")
516	516
517		-	secondGeneration := d.startRemotePickerRefresh(instance)
	517	+	secondGeneration := d.startRemoteDiscoveryRefresh(instance.discoveryInstance())
518	518		require.Greater(t, secondGeneration, firstGeneration)
519	519		for _, request := range first {
520	520		receiveRemotePickerClose(t, request.ctx.Done(), "catalog request cancellation")

@@ -547,9 +547,9 @@ func TestRemoteRefreshLockProbesSerialized(t *testing.T) {
547	547		ac.overlays.pickerGeneration++
548	548		instance := remotePickerInstance{ac: ac, generation: ac.overlays.pickerGeneration, model: model}
549	549		ac.overlays.pickerMu.Unlock()
550		-	require.True(t, d.registerRemotePicker(instance))
	550	+	require.True(t, d.registerRemoteDiscoveryConsumer(instance.discoveryInstance()))
551	551
552		-	d.startRemotePickerRefresh(instance)
	552	+	d.startRemoteDiscoveryRefresh(instance.discoveryInstance())
553	553		request := receiveRemotePicker(t, catalog.requests, "catalog request")
554	554		request.result <- remoteRefreshResult{catalog: remoteCatalogForTest()}
555	555		receiveRemotePicker(t, cache.stores, "remote cache store")

@@ -567,9 +567,9 @@ func TestRemoteRefreshWithoutCatalogClientDoesNotMarkHostsRefreshing(t *testing.
567	567		ac.overlays.pickerGeneration++
568	568		instance := remotePickerInstance{ac: ac, generation: ac.overlays.pickerGeneration, model: model}
569	569		ac.overlays.pickerMu.Unlock()
570		-	require.True(t, d.registerRemotePicker(instance))
	570	+	require.True(t, d.registerRemoteDiscoveryConsumer(instance.discoveryInstance()))
571	571
572		-	require.NotZero(t, d.startRemotePickerRefresh(instance))
	572	+	require.NotZero(t, d.startRemoteDiscoveryRefresh(instance.discoveryInstance()))
573	573		d.remoteCatalog.mu.Lock()
574	574		require.NotEqual(t, remoteHostRefreshing, d.remoteCatalog.status["arch"])
575	575		d.remoteCatalog.mu.Unlock()

@@ -950,7 +950,7 @@ func TestRemoteRefreshUpdatesAllOpenPickersPreservingSelection(t *testing.T) {
950	950		instance := remotePickerInstance{ac: owner, generation: owner.overlays.pickerGeneration, model: owner.overlays.picker}
951	951		before[owner] = owner.overlays.picker
952	952		owner.overlays.pickerMu.Unlock()
953		-	require.True(t, d.registerRemotePicker(instance))
	953	+	require.True(t, d.registerRemoteDiscoveryConsumer(instance.discoveryInstance()))
954	954		}
955	955		d.remoteCatalog.mu.Lock()
956	956		d.remoteCatalog.refresh = 4

@@ -1002,7 +1002,7 @@ func TestRemotePickerTeardownLifecycle(t *testing.T) {
1002	1002		test.teardown(d, sess, ac)
1003	1003
1004	1004		d.remoteCatalog.mu.Lock()
1005		-	_, registered := d.remoteCatalog.pickers[ac]
	1005	+	_, registered := d.remoteCatalog.consumers[ac]
1006	1006		d.remoteCatalog.mu.Unlock()
1007	1007		ac.overlays.pickerMu.Lock()
1008	1008		current, currentGeneration := ac.overlays.picker, ac.overlays.pickerGeneration

@@ -1025,7 +1025,7 @@ func TestRemotePickerTeardownLifecycle(t *testing.T) {
1025	1025		}
1026	1026		}
1027	1027
1028		-	func TestParkedPickerExpiryClosesCapturedGenerationAndCancelsRefresh(t *testing.T) {
	1028	+	func TestParkedOverlayExpiryClosesCapturedDiscoveryGenerations(t *testing.T) {
1029	1029		clock := &signalClock{timers: make(chan *signalTimer, 1)}
1030	1030		hosts := &remoteRefreshHostStore{hosts: []string{"arch"}}
1031	1031		d, catalog, _ := newRemoteRefreshDaemon(t, hosts, time.Unix(475, 0))

@@ -1033,7 +1033,10 @@ func TestParkedPickerExpiryClosesCapturedGenerationAndCancelsRefresh(t *testing.
1033	1033		sess, ac, _ := addRemoteRefreshPickerOwner(t, d, "owner")
1034	1034		ac.resumeCapable = true
1035	1035		d.publishPicker(sess, ac, d.newPickerModel(sess, nil, pickerNavigate, moveSourceLocator{}, picker.SourceFilter{}), pickerNavigate, moveSourceLocator{})
1036		-	request := receiveRemotePicker(t, catalog.requests, "catalog request")
	1036	+	request := receiveRemotePicker(t, catalog.requests, "picker catalog request")
	1037	+	d.enterPalette(sess, ac)
	1038	+	receiveRemotePickerClose(t, request.ctx.Done(), "superseded picker catalog request")
	1039	+	request = receiveRemotePicker(t, catalog.requests, "shared catalog request")
1037	1040
1038	1041		require.True(t, d.parkAttachment(sess, ac))
1039	1042		timer := receiveRemotePicker(t, clock.timers, "park expiry timer")

@@ -1043,8 +1046,11 @@ func TestParkedPickerExpiryClosesCapturedGenerationAndCancelsRefresh(t *testing.
1043	1046		ac.overlays.pickerMu.Lock()
1044	1047		require.Nil(t, ac.overlays.picker)
1045	1048		ac.overlays.pickerMu.Unlock()
	1049	+	ac.overlays.paletteMu.Lock()
	1050	+	require.Nil(t, ac.overlays.palette)
	1051	+	ac.overlays.paletteMu.Unlock()
1046	1052		d.remoteCatalog.mu.Lock()
1047		-	require.NotContains(t, d.remoteCatalog.pickers, ac)
	1053	+	require.NotContains(t, d.remoteCatalog.consumers, ac)
1048	1054		d.remoteCatalog.mu.Unlock()
1049	1055		}
1050	1056

@@ -1155,12 +1161,12 @@ func TestRemoteRefreshCancellationWhenLastPickerCloses(t *testing.T) {
1155	1161		instance.ac.overlays.pickerMu.Lock()
1156	1162		instance.ac.overlays.picker = nil
1157	1163		instance.ac.overlays.pickerMu.Unlock()
1158		-	d.remotePickerClosed(instance)
	1164	+	d.remoteDiscoveryClosed(instance.discoveryInstance())
1159	1165		}
1160	1166		first, second := newInstance(), newInstance()
1161		-	d.remotePickerOpened(first)
	1167	+	d.remoteDiscoveryOpened(first.discoveryInstance())
1162	1168		request := receiveRemotePicker(t, catalog.requests, "catalog request")
1163		-	d.remotePickerOpened(second)
	1169	+	d.remoteDiscoveryOpened(second.discoveryInstance())
1164	1170		receiveRemotePickerClose(t, request.ctx.Done(), "catalog request cancellation")
1165	1171		request = receiveRemotePicker(t, catalog.requests, "catalog request")
1166	1172

@@ -1174,7 +1180,7 @@ func TestRemoteRefreshCancellationWhenLastPickerCloses(t *testing.T) {
1174	1180		receiveRemotePickerClose(t, request.ctx.Done(), "catalog request cancellation")
1175	1181
1176	1182		d.remoteCatalog.mu.Lock()
1177		-	require.Empty(t, d.remoteCatalog.pickers)
	1183	+	require.Empty(t, d.remoteCatalog.consumers)
1178	1184		require.Nil(t, d.remoteCatalog.cancel)
1179	1185		d.remoteCatalog.mu.Unlock()
1180	1186		}

@@ -1193,19 +1199,19 @@ func TestRemoteRefreshCannotStartAfterLastPickerCloseWins(t *testing.T) {
1193	1199
1194	1200		// Stop at the production seam after exact picker ownership registration but
1195	1201		// before refresh startup, then let the last-picker close linearize first.
1196		-	require.True(t, d.registerRemotePicker(instance))
	1202	+	require.True(t, d.registerRemoteDiscoveryConsumer(instance.discoveryInstance()))
1197	1203		ac.overlays.pickerMu.Lock()
1198	1204		ac.overlays.picker = nil
1199	1205		ac.overlays.pickerMu.Unlock()
1200		-	d.remotePickerClosed(instance)
	1206	+	d.remoteDiscoveryClosed(instance.discoveryInstance())
1201	1207
1202	1208		d.remoteCatalog.mu.Lock()
1203	1209		refreshBefore := d.remoteCatalog.refresh
1204	1210		d.remoteCatalog.mu.Unlock()
1205		-	require.Zero(t, d.startRemotePickerRefresh(instance))
	1211	+	require.Zero(t, d.startRemoteDiscoveryRefresh(instance.discoveryInstance()))
1206	1212
1207	1213		d.remoteCatalog.mu.Lock()
1208		-	require.Empty(t, d.remoteCatalog.pickers, "the closing picker must remain unregistered")
	1214	+	require.Empty(t, d.remoteCatalog.consumers, "the closing picker must remain unregistered")
1209	1215		require.Equal(t, refreshBefore, d.remoteCatalog.refresh, "a close that wins before startup must prevent a later refresh generation")
1210	1216		require.Nil(t, d.remoteCatalog.cancel, "a close that wins before startup must prevent a later cancel installation")
1211	1217		d.remoteCatalog.mu.Unlock()

@@ -1232,7 +1238,7 @@ func TestRemotePickerStaleAfterCloseCannotRemoveReopenedPicker(t *testing.T) {
1232	1238		staleClose.afterClose()
1233	1239
1234	1240		d.remoteCatalog.mu.Lock()
1235		-	_, registered := d.remoteCatalog.pickers[ac]
	1241	+	_, registered := d.remoteCatalog.consumers[ac]
1236	1242		d.remoteCatalog.mu.Unlock()
1237	1243		require.True(t, registered, "stale close cleanup must retain the reopened picker registration")
1238	1244		ac.overlays.pickerMu.Lock()

@@ -1255,7 +1261,7 @@ func TestRemotePickerStaleRefreshCannotOverwriteReopenedModel(t *testing.T) {
1255	1261		}
1256	1262		refreshed := make(chan struct{})
1257	1263		go func() {
1258		-	d.refreshRemoteOpenPickers()
	1264	+	d.refreshRemoteDiscoveryConsumers()
1259	1265		close(refreshed)
1260	1266		}()
1261	1267		receiveRemotePickerClose(t, rebuildReached, "picker rebuild")

 	d := newTestDaemon(t, nil, clock)
 	lifecycle := remoteLifecycleForTest()
 	d.remoteCatalog.replaceCache([]ports.RemoteCatalogCacheEntry{{
-		Host: "arch", FetchedAt: now.Add(-remotePickerAttachTTL), Sessions: []ports.RemoteCatalogSession{{
+		Host: "arch", FetchedAt: now.Add(-remoteCatalogAttachTTL), Sessions: []ports.RemoteCatalogSession{{
 			LifecycleID: lifecycle, Name: "work", State: "up", Tabs: []ports.RemoteCatalogTab{{ID: "tab-1", Index: 0, Name: "main"}},
 		}},
 	}})
 	d.remoteCatalog.status["arch"] = remoteHostFresh
 	d.remoteCatalog.mu.Unlock()
-	entries := d.remotePickerCatalogSnapshot()
+	entries := d.remoteCatalogSnapshot()
 	require.Len(t, entries, 1)
 	require.Equal(t, remoteHostStale, entries[0].status)
 	target := domain.RemoteSessionTarget{Endpoint: "arch", DisplayOrigin: "arch", LifecycleID: lifecycle, SessionName: "work", LiveTabID: "tab-1"}
-	require.False(t, d.remotePickerTargetReadyTarget(target), "attachment must reject a catalogue exactly at the TTL boundary")
+	require.False(t, d.remoteCatalogTargetReady(target), "attachment must reject a catalogue exactly at the TTL boundary")
 }
 func TestRemotePickerTargetReadyExpiresAfterPickerBuildWithoutSnapshot(t *testing.T) {
 	target, ok := model.Selected()
 	require.True(t, ok)
 	require.NotNil(t, target.RemoteTarget)
-	require.True(t, d.remotePickerTargetReadyTarget(*target.RemoteTarget), "fresh picker target must be ready before the attach TTL")
+	require.True(t, d.remoteCatalogTargetReady(*target.RemoteTarget), "fresh picker target must be ready before the attach TTL")
-	clock.Advance(remotePickerAttachTTL)
+	clock.Advance(remoteCatalogAttachTTL)
-	require.False(t, d.remotePickerTargetReadyTarget(*target.RemoteTarget), "handoff must reject a picker target whose catalog reached the attach TTL")
+	require.False(t, d.remoteCatalogTargetReady(*target.RemoteTarget), "handoff must reject a picker target whose catalog reached the attach TTL")
 	d.remoteCatalog.mu.Lock()
 	require.Equal(t, remoteHostStale, d.remoteCatalog.status["arch"])
 	d.remoteCatalog.mu.Unlock()
 	ac.overlays.pickerGeneration++
 	instance := remotePickerInstance{ac: ac, generation: ac.overlays.pickerGeneration, model: model}
 	ac.overlays.pickerMu.Unlock()
-	require.True(t, d.registerRemotePicker(instance))
+	require.True(t, d.registerRemoteDiscoveryConsumer(instance.discoveryInstance()))
 	lifecycle := remoteLifecycleForTest()
 	d.remoteCatalog.replaceCache([]ports.RemoteCatalogCacheEntry{{
 		Host: "arch", FetchedAt: time.Unix(10, 0), Sessions: []ports.RemoteCatalogSession{{
 		}},
 	}})
-	firstGeneration := d.startRemotePickerRefresh(instance)
+	firstGeneration := d.startRemoteDiscoveryRefresh(instance.discoveryInstance())
 	first := map[string]remoteRefreshRequest{}
 	for range 2 {
 		request := receiveRemotePicker(t, catalog.requests, "catalog request")
 	_, selectable := refreshedModel.Selected()
 	require.False(t, selectable, "refreshing status must gate picker activation")
-	secondGeneration := d.startRemotePickerRefresh(instance)
+	secondGeneration := d.startRemoteDiscoveryRefresh(instance.discoveryInstance())
 	require.Greater(t, secondGeneration, firstGeneration)
 	for _, request := range first {
 		receiveRemotePickerClose(t, request.ctx.Done(), "catalog request cancellation")
 	ac.overlays.pickerGeneration++
 	instance := remotePickerInstance{ac: ac, generation: ac.overlays.pickerGeneration, model: model}
 	ac.overlays.pickerMu.Unlock()
-	require.True(t, d.registerRemotePicker(instance))
+	require.True(t, d.registerRemoteDiscoveryConsumer(instance.discoveryInstance()))
-	d.startRemotePickerRefresh(instance)
+	d.startRemoteDiscoveryRefresh(instance.discoveryInstance())
 	request := receiveRemotePicker(t, catalog.requests, "catalog request")
 	request.result <- remoteRefreshResult{catalog: remoteCatalogForTest()}
 	receiveRemotePicker(t, cache.stores, "remote cache store")
 	ac.overlays.pickerGeneration++
 	instance := remotePickerInstance{ac: ac, generation: ac.overlays.pickerGeneration, model: model}
 	ac.overlays.pickerMu.Unlock()
-	require.True(t, d.registerRemotePicker(instance))
+	require.True(t, d.registerRemoteDiscoveryConsumer(instance.discoveryInstance()))
-	require.NotZero(t, d.startRemotePickerRefresh(instance))
+	require.NotZero(t, d.startRemoteDiscoveryRefresh(instance.discoveryInstance()))
 	d.remoteCatalog.mu.Lock()
 	require.NotEqual(t, remoteHostRefreshing, d.remoteCatalog.status["arch"])
 	d.remoteCatalog.mu.Unlock()
 		instance := remotePickerInstance{ac: owner, generation: owner.overlays.pickerGeneration, model: owner.overlays.picker}
 		before[owner] = owner.overlays.picker
 		owner.overlays.pickerMu.Unlock()
-		require.True(t, d.registerRemotePicker(instance))
+		require.True(t, d.registerRemoteDiscoveryConsumer(instance.discoveryInstance()))
 	}
 	d.remoteCatalog.mu.Lock()
 	d.remoteCatalog.refresh = 4
 			test.teardown(d, sess, ac)
 			d.remoteCatalog.mu.Lock()
-			_, registered := d.remoteCatalog.pickers[ac]
+			_, registered := d.remoteCatalog.consumers[ac]
 			d.remoteCatalog.mu.Unlock()
 			ac.overlays.pickerMu.Lock()
 			current, currentGeneration := ac.overlays.picker, ac.overlays.pickerGeneration
 	}
 }
-func TestParkedPickerExpiryClosesCapturedGenerationAndCancelsRefresh(t *testing.T) {
+func TestParkedOverlayExpiryClosesCapturedDiscoveryGenerations(t *testing.T) {
 	clock := &signalClock{timers: make(chan *signalTimer, 1)}
 	hosts := &remoteRefreshHostStore{hosts: []string{"arch"}}
 	d, catalog, _ := newRemoteRefreshDaemon(t, hosts, time.Unix(475, 0))
 	sess, ac, _ := addRemoteRefreshPickerOwner(t, d, "owner")
 	ac.resumeCapable = true
 	d.publishPicker(sess, ac, d.newPickerModel(sess, nil, pickerNavigate, moveSourceLocator{}, picker.SourceFilter{}), pickerNavigate, moveSourceLocator{})
-	request := receiveRemotePicker(t, catalog.requests, "catalog request")
+	request := receiveRemotePicker(t, catalog.requests, "picker catalog request")
+	d.enterPalette(sess, ac)
+	receiveRemotePickerClose(t, request.ctx.Done(), "superseded picker catalog request")
+	request = receiveRemotePicker(t, catalog.requests, "shared catalog request")
 	require.True(t, d.parkAttachment(sess, ac))
 	timer := receiveRemotePicker(t, clock.timers, "park expiry timer")
 	ac.overlays.pickerMu.Lock()
 	require.Nil(t, ac.overlays.picker)
 	ac.overlays.pickerMu.Unlock()
+	ac.overlays.paletteMu.Lock()
+	require.Nil(t, ac.overlays.palette)
+	ac.overlays.paletteMu.Unlock()
 	d.remoteCatalog.mu.Lock()
-	require.NotContains(t, d.remoteCatalog.pickers, ac)
+	require.NotContains(t, d.remoteCatalog.consumers, ac)
 	d.remoteCatalog.mu.Unlock()
 }
 		instance.ac.overlays.pickerMu.Lock()
 		instance.ac.overlays.picker = nil
 		instance.ac.overlays.pickerMu.Unlock()
-		d.remotePickerClosed(instance)
+		d.remoteDiscoveryClosed(instance.discoveryInstance())
 	}
 	first, second := newInstance(), newInstance()
-	d.remotePickerOpened(first)
+	d.remoteDiscoveryOpened(first.discoveryInstance())
 	request := receiveRemotePicker(t, catalog.requests, "catalog request")
-	d.remotePickerOpened(second)
+	d.remoteDiscoveryOpened(second.discoveryInstance())
 	receiveRemotePickerClose(t, request.ctx.Done(), "catalog request cancellation")
 	request = receiveRemotePicker(t, catalog.requests, "catalog request")
 	receiveRemotePickerClose(t, request.ctx.Done(), "catalog request cancellation")
 	d.remoteCatalog.mu.Lock()
-	require.Empty(t, d.remoteCatalog.pickers)
+	require.Empty(t, d.remoteCatalog.consumers)
 	require.Nil(t, d.remoteCatalog.cancel)
 	d.remoteCatalog.mu.Unlock()
 }
 	// Stop at the production seam after exact picker ownership registration but
 	// before refresh startup, then let the last-picker close linearize first.
-	require.True(t, d.registerRemotePicker(instance))
+	require.True(t, d.registerRemoteDiscoveryConsumer(instance.discoveryInstance()))
 	ac.overlays.pickerMu.Lock()
 	ac.overlays.picker = nil
 	ac.overlays.pickerMu.Unlock()
-	d.remotePickerClosed(instance)
+	d.remoteDiscoveryClosed(instance.discoveryInstance())
 	d.remoteCatalog.mu.Lock()
 	refreshBefore := d.remoteCatalog.refresh
 	d.remoteCatalog.mu.Unlock()
-	require.Zero(t, d.startRemotePickerRefresh(instance))
+	require.Zero(t, d.startRemoteDiscoveryRefresh(instance.discoveryInstance()))
 	d.remoteCatalog.mu.Lock()
-	require.Empty(t, d.remoteCatalog.pickers, "the closing picker must remain unregistered")
+	require.Empty(t, d.remoteCatalog.consumers, "the closing picker must remain unregistered")
 	require.Equal(t, refreshBefore, d.remoteCatalog.refresh, "a close that wins before startup must prevent a later refresh generation")
 	require.Nil(t, d.remoteCatalog.cancel, "a close that wins before startup must prevent a later cancel installation")
 	d.remoteCatalog.mu.Unlock()
 	staleClose.afterClose()
 	d.remoteCatalog.mu.Lock()
-	_, registered := d.remoteCatalog.pickers[ac]
+	_, registered := d.remoteCatalog.consumers[ac]
 	d.remoteCatalog.mu.Unlock()
 	require.True(t, registered, "stale close cleanup must retain the reopened picker registration")
 	ac.overlays.pickerMu.Lock()
 	}
 	refreshed := make(chan struct{})
 	go func() {
-		d.refreshRemoteOpenPickers()
+		d.refreshRemoteDiscoveryConsumers()
 		close(refreshed)
 	}()
 	receiveRemotePickerClose(t, rebuildReached, "picker rebuild")

M internal/usecase/daemon/resume.go +26 -15


@@ -221,11 +221,14 @@ func (d Daemon) parkAttachment(sess session, ac *attachedClient) bool {
221	221		// cannot leave closed panes retained through its capture cache. This must
222	222		// remain outside d.mu: sendMu is ordered before the daemon lock.
223	223		ac.clearCaptureFrames()
224		-	var pickerGeneration uint64
	224	+	var pickerGeneration, paletteGeneration uint64
225	225		if ac.overlays != nil {
226	226		ac.overlays.pickerMu.Lock()
227	227		pickerGeneration = ac.overlays.pickerGeneration
228	228		ac.overlays.pickerMu.Unlock()
	229	+	ac.overlays.paletteMu.Lock()
	230	+	paletteGeneration = ac.overlays.paletteGeneration
	231	+	ac.overlays.paletteMu.Unlock()
229	232		}
230	233		d.mu.Lock()
231	234		if d.closing \|\| d.sessions[sess.id] != sess {

@@ -248,7 +251,10 @@ func (d Daemon) parkAttachment(sess session, ac *attachedClient) bool {
248	251		}
249	252		grace := d.resumeParkGrace
250	253		timer := d.clock.NewTimer(grace)
251		-	parked := &parkedAttachment{sess: sess, ac: ac, pickerGeneration: pickerGeneration, timer: timer, done: make(chan struct{})}
	254	+	parked := &parkedAttachment{
	255	+	sess: sess, ac: ac, pickerGeneration: pickerGeneration, paletteGeneration: paletteGeneration,
	256	+	timer: timer, done: make(chan struct{}),
	257	+	}
252	258		ac.parked = true
253	259		d.parked[token] = parked
254	260		d.clearParkingInFlightLocked(token, ac)

@@ -291,6 +297,7 @@ func (d Daemon) expireParked(token uint64, parked parkedAttachment) {
291	297		d.removeParkedLocked(token, parked)
292	298		d.mu.Unlock()
293	299		d.closePickerIfCurrent(parked.ac, nil, parked.pickerGeneration)
	300	+	d.closePaletteIfCurrent(parked.ac, parked.paletteGeneration)
294	301		d.log.Warn("parked client expired", "session", parked.sess.nameSnapshot())
295	302		return
296	303		}

@@ -373,11 +380,12 @@ func (d Daemon) abortResumeClaim(ac attachedClient) bool {
373	380		}
374	381		parked.closeDone()
375	382		rearmed := &parkedAttachment{
376		-	sess: parked.sess,
377		-	ac: ac,
378		-	pickerGeneration: parked.pickerGeneration,
379		-	timer: d.clock.NewTimer(d.resumeParkGrace),
380		-	done: make(chan struct{}),
	383	+	sess: parked.sess,
	384	+	ac: ac,
	385	+	pickerGeneration: parked.pickerGeneration,
	386	+	paletteGeneration: parked.paletteGeneration,
	387	+	timer: d.clock.NewTimer(d.resumeParkGrace),
	388	+	done: make(chan struct{}),
381	389		}
382	390		d.parked[token] = rearmed
383	391		captured := ac.transportSnapshot().transport

@@ -394,9 +402,10 @@ func (d Daemon) abortResumeClaim(ac attachedClient) bool {
394	402		}
395	403
396	404		type parkedAttachmentRetirement struct {
397		-	parked *parkedAttachment
398		-	pickerGeneration uint64
399		-	transport transportSnapshot
	405	+	parked *parkedAttachment
	406	+	pickerGeneration uint64
	407	+	paletteGeneration uint64
	408	+	transport transportSnapshot
400	409		}
401	410
402	411		func (d Daemon) retireParkedAttachmentLocked(token uint64, parked parkedAttachment) parkedAttachmentRetirement {

@@ -406,9 +415,10 @@ func (d Daemon) retireParkedAttachmentLocked(token uint64, parked parkedAttach
406	415		parked.ac.connectionGeneration.Add(1)
407	416		parked.ac.setSession(nil)
408	417		return parkedAttachmentRetirement{
409		-	parked: parked,
410		-	pickerGeneration: parked.pickerGeneration,
411		-	transport: parked.ac.transportSnapshot(),
	418	+	parked: parked,
	419	+	pickerGeneration: parked.pickerGeneration,
	420	+	paletteGeneration: parked.paletteGeneration,
	421	+	transport: parked.ac.transportSnapshot(),
412	422		}
413	423		}
414	424

@@ -433,8 +443,8 @@ func (d *Daemon) purgeAllParkedLocked() []parkedAttachmentRetirement {
433	443		return retirements
434	444		}
435	445
436		-	// finishParkedAttachmentRetirements stops timers and retires picker ownership
437		-	// and transports without holding daemon, session, coordinator, or pane locks.
	446	+	// finishParkedAttachmentRetirements stops timers and retires discovery-overlay
	447	+	// ownership and transports without holding daemon, session, coordinator, or pane locks.
438	448		func (d *Daemon) finishParkedAttachmentRetirements(retirements []parkedAttachmentRetirement) {
439	449		for _, retirement := range retirements {
440	450		if retirement.parked.timer != nil {

@@ -443,6 +453,7 @@ func (d *Daemon) finishParkedAttachmentRetirements(retirements []parkedAttachmen
443	453		retirement.parked.closeDone()
444	454		ac := retirement.parked.ac
445	455		d.closePickerIfCurrent(ac, nil, retirement.pickerGeneration)
	456	+	d.closePaletteIfCurrent(ac, retirement.paletteGeneration)
446	457		_ = ac.closeCapturedTransport(ac.revokeTransport(retirement.transport.transport))
447	458		}
448	459		}

 	// cannot leave closed panes retained through its capture cache. This must
 	// remain outside d.mu: sendMu is ordered before the daemon lock.
 	ac.clearCaptureFrames()
-	var pickerGeneration uint64
+	var pickerGeneration, paletteGeneration uint64
 	if ac.overlays != nil {
 		ac.overlays.pickerMu.Lock()
 		pickerGeneration = ac.overlays.pickerGeneration
 		ac.overlays.pickerMu.Unlock()
+		ac.overlays.paletteMu.Lock()
+		paletteGeneration = ac.overlays.paletteGeneration
+		ac.overlays.paletteMu.Unlock()
 	}
 	d.mu.Lock()
 	if d.closing || d.sessions[sess.id] != sess {
 	}
 	grace := d.resumeParkGrace
 	timer := d.clock.NewTimer(grace)
-	parked := &parkedAttachment{sess: sess, ac: ac, pickerGeneration: pickerGeneration, timer: timer, done: make(chan struct{})}
+	parked := &parkedAttachment{
+		sess: sess, ac: ac, pickerGeneration: pickerGeneration, paletteGeneration: paletteGeneration,
+		timer: timer, done: make(chan struct{}),
+	}
 	ac.parked = true
 	d.parked[token] = parked
 	d.clearParkingInFlightLocked(token, ac)
 		d.removeParkedLocked(token, parked)
 		d.mu.Unlock()
 		d.closePickerIfCurrent(parked.ac, nil, parked.pickerGeneration)
+		d.closePaletteIfCurrent(parked.ac, parked.paletteGeneration)
 		d.log.Warn("parked client expired", "session", parked.sess.nameSnapshot())
 		return
 	}
 	}
 	parked.closeDone()
 	rearmed := &parkedAttachment{
-		sess:             parked.sess,
+		sess:              parked.sess,
-		ac:               ac,
+		ac:                ac,
-		pickerGeneration: parked.pickerGeneration,
+		pickerGeneration:  parked.pickerGeneration,
-		timer:            d.clock.NewTimer(d.resumeParkGrace),
+		paletteGeneration: parked.paletteGeneration,
-		done:             make(chan struct{}),
+		timer:             d.clock.NewTimer(d.resumeParkGrace),
+		done:              make(chan struct{}),
 	}
 	d.parked[token] = rearmed
 	captured := ac.transportSnapshot().transport
 }
 type parkedAttachmentRetirement struct {
-	parked           *parkedAttachment
+	parked            *parkedAttachment
-	pickerGeneration uint64
+	pickerGeneration  uint64
-	transport        transportSnapshot
+	paletteGeneration uint64
+	transport         transportSnapshot
 }
 func (d *Daemon) retireParkedAttachmentLocked(token uint64, parked *parkedAttachment) parkedAttachmentRetirement {
 	parked.ac.connectionGeneration.Add(1)
 	parked.ac.setSession(nil)
 	return parkedAttachmentRetirement{
-		parked:           parked,
+		parked:            parked,
-		pickerGeneration: parked.pickerGeneration,
+		pickerGeneration:  parked.pickerGeneration,
-		transport:        parked.ac.transportSnapshot(),
+		paletteGeneration: parked.paletteGeneration,
+		transport:         parked.ac.transportSnapshot(),
 	}
 }
 	return retirements
 }
-// finishParkedAttachmentRetirements stops timers and retires picker ownership
+// finishParkedAttachmentRetirements stops timers and retires discovery-overlay
-// and transports without holding daemon, session, coordinator, or pane locks.
+// ownership and transports without holding daemon, session, coordinator, or pane locks.
 func (d *Daemon) finishParkedAttachmentRetirements(retirements []parkedAttachmentRetirement) {
 	for _, retirement := range retirements {
 		if retirement.parked.timer != nil {
 		retirement.parked.closeDone()
 		ac := retirement.parked.ac
 		d.closePickerIfCurrent(ac, nil, retirement.pickerGeneration)
+		d.closePaletteIfCurrent(ac, retirement.paletteGeneration)
 		_ = ac.closeCapturedTransport(ac.revokeTransport(retirement.transport.transport))
 	}
 }

M internal/usecase/palette/model.go +22 -0


@@ -57,6 +57,28 @@ func New(results []Result) *Model {
57	57
58	58		func NewRegistry() *Model { return New(CommandResults(command.PaletteRegistry())) }
59	59
	60	+	// ReplaceResults replaces the model's immutable result source while preserving
	61	+	// the current query and exact selected target when it remains available.
	62	+	func (m *Model) ReplaceResults(results []Result) {
	63	+	if m == nil {
	64	+	return
	65	+	}
	66	+	selected, hadSelection := m.Selected()
	67	+	m.results = append([]Result(nil), results...)
	68	+	m.argumentResults = requiredArgumentResults(m.results)
	69	+	m.refresh()
	70	+	if !hadSelection {
	71	+	return
	72	+	}
	73	+	for i, match := range m.matches {
	74	+	if match.Result.sameTarget(selected) {
	75	+	m.selected = i
	76	+	m.clamp()
	77	+	return
	78	+	}
	79	+	}
	80	+	}
	81	+
60	82		func DefaultRenderStyles() RenderStyles {
61	83		selection := renderer.DefaultStyle()
62	84		selection.Inverse = true


@@ -57,6 +57,28 @@ func New(results []Result) *Model {
57		57
58	func NewRegistry() *Model { return New(CommandResults(command.PaletteRegistry())) }	58		func NewRegistry() *Model { return New(CommandResults(command.PaletteRegistry())) }
59		59
		60	+	// ReplaceResults replaces the model's immutable result source while preserving
		61	+	// the current query and exact selected target when it remains available.
		62	+	func (m *Model) ReplaceResults(results []Result) {
		63	+	if m == nil {
		64	+	return
		65	+	}
		66	+	selected, hadSelection := m.Selected()
		67	+	m.results = append([]Result(nil), results...)
		68	+	m.argumentResults = requiredArgumentResults(m.results)
		69	+	m.refresh()
		70	+	if !hadSelection {
		71	+	return
		72	+	}
		73	+	for i, match := range m.matches {
		74	+	if match.Result.sameTarget(selected) {
		75	+	m.selected = i
		76	+	m.clamp()
		77	+	return
		78	+	}
		79	+	}
		80	+	}
		81	+
60	func DefaultRenderStyles() RenderStyles {	82		func DefaultRenderStyles() RenderStyles {
61	selection := renderer.DefaultStyle()	83		selection := renderer.DefaultStyle()
62	selection.Inverse = true	84		selection.Inverse = true

M internal/usecase/palette/model_test.go +25 -0


@@ -12,6 +12,31 @@ import (
12	12		"github.com/stretchr/testify/require"
13	13		)
14	14
	15	+	func TestReplaceResultsPreservesExactRemoteSelection(t *testing.T) {
	16	+	result := func(endpoint string, lifecycle byte) Result {
	17	+	key := domain.RemoteSessionKey{
	18	+	Host: endpoint, Name: "vev", LifecycleID: domain.SessionLifecycleID{lifecycle}, DisplayOrigin: "arch",
	19	+	}
	20	+	target := domain.RemoteSessionTarget{
	21	+	Endpoint: endpoint, DisplayOrigin: "arch", LifecycleID: key.LifecycleID,
	22	+	SessionName: "vev", LiveTabID: "tab-vev",
	23	+	}
	24	+	return NewRemoteSessionResult(key, target, "")
	25	+	}
	26	+	first := result("user@arch", 1)
	27	+	selected := result("admin@arch", 2)
	28	+	m := New([]Result{first, selected})
	29	+	m.Down()
	30	+
	31	+	m.ReplaceResults([]Result{selected, first})
	32	+
	33	+	got, ok := m.Selected()
	34	+	require.True(t, ok)
	35	+	target, ok := got.RemoteSessionTarget()
	36	+	require.True(t, ok)
	37	+	require.Equal(t, "admin@arch", target.Endpoint)
	38	+	}
	39	+
15	40		func TestModelInsertBackspaceAndSelectionClamp(t *testing.T) {
16	41		m := New(CommandResults([]command.Command{
17	42		cmd("ABC", "Alpha", "first"),


@@ -12,6 +12,31 @@ import (
12	"github.com/stretchr/testify/require"	12		"github.com/stretchr/testify/require"
13	)	13		)
14		14
		15	+	func TestReplaceResultsPreservesExactRemoteSelection(t *testing.T) {
		16	+	result := func(endpoint string, lifecycle byte) Result {
		17	+	key := domain.RemoteSessionKey{
		18	+	Host: endpoint, Name: "vev", LifecycleID: domain.SessionLifecycleID{lifecycle}, DisplayOrigin: "arch",
		19	+	}
		20	+	target := domain.RemoteSessionTarget{
		21	+	Endpoint: endpoint, DisplayOrigin: "arch", LifecycleID: key.LifecycleID,
		22	+	SessionName: "vev", LiveTabID: "tab-vev",
		23	+	}
		24	+	return NewRemoteSessionResult(key, target, "")
		25	+	}
		26	+	first := result("user@arch", 1)
		27	+	selected := result("admin@arch", 2)
		28	+	m := New([]Result{first, selected})
		29	+	m.Down()
		30	+
		31	+	m.ReplaceResults([]Result{selected, first})
		32	+
		33	+	got, ok := m.Selected()
		34	+	require.True(t, ok)
		35	+	target, ok := got.RemoteSessionTarget()
		36	+	require.True(t, ok)
		37	+	require.Equal(t, "admin@arch", target.Endpoint)
		38	+	}
		39	+
15	func TestModelInsertBackspaceAndSelectionClamp(t *testing.T) {	40		func TestModelInsertBackspaceAndSelectionClamp(t *testing.T) {
16	m := New(CommandResults([]command.Command{	41		m := New(CommandResults([]command.Command{
17	cmd("ABC", "Alpha", "first"),	42		cmd("ABC", "Alpha", "first"),

M internal/usecase/palette/result.go +63 -5


@@ -3,6 +3,7 @@ package palette
3	3		import (
4	4		"time"
5	5
	6	+	"github.com/bnema/vev/internal/domain"
6	7		"github.com/bnema/vev/internal/ports"
7	8		"github.com/bnema/vev/internal/usecase/command"
8	9		)

@@ -14,16 +15,18 @@ const (
14	15		ResultKindCommand ResultKind = iota
15	16		ResultKindActiveSession
16	17		ResultKindStoppedSession
	18	+	ResultKindRemoteSession
17	19		ResultKindRecentRoute
18	20		)
19	21
20	22		// Result is an immutable palette target. Its kind is the sole discriminator
21		-	// for its private command or session payload.
	23	+	// for its private command, local-session, remote-session, or route payload.
22	24		type Result struct {
23		-	kind ResultKind
24		-	command command.Command
25		-	session sessionPayload
26		-	route routePayload
	25	+	kind ResultKind
	26	+	command command.Command
	27	+	session sessionPayload
	28	+	remoteSession remoteSessionPayload
	29	+	route routePayload
27	30		}
28	31
29	32		type sessionPayload struct {

@@ -32,6 +35,12 @@ type sessionPayload struct {
32	35		target ports.ExactSessionTarget
33	36		}
34	37
	38	+	type remoteSessionPayload struct {
	39	+	key domain.RemoteSessionKey
	40	+	target domain.RemoteSessionTarget
	41	+	unavailableReason string
	42	+	}
	43	+
35	44		type routePayload struct {
36	45		label string
37	46		action ports.RouteNavigationAction

@@ -58,6 +67,16 @@ func NewStoppedSessionResult(target ports.ExactSessionTarget, createdAt time.Tim
58	67		}
59	68		}
60	69
	70	+	// NewRemoteSessionResult creates an immutable catalog-backed remote target.
	71	+	func NewRemoteSessionResult(key domain.RemoteSessionKey, target domain.RemoteSessionTarget, unavailableReason string) Result {
	72	+	return Result{
	73	+	kind: ResultKindRemoteSession,
	74	+	remoteSession: remoteSessionPayload{
	75	+	key: key, target: target, unavailableReason: unavailableReason,
	76	+	},
	77	+	}
	78	+	}
	79	+
61	80		// NewRecentRouteResult creates an immutable client-ledger route target.
62	81		func NewRecentRouteResult(label string, action ports.RouteNavigationAction) Result {
63	82		return Result{kind: ResultKindRecentRoute, route: routePayload{label: label, action: action}}

@@ -65,10 +84,31 @@ func NewRecentRouteResult(label string, action ports.RouteNavigationAction) Resu
65	84
66	85		func (r Result) Kind() ResultKind { return r.kind }
67	86
	87	+	func (r Result) sameTarget(other Result) bool {
	88	+	if r.kind != other.kind {
	89	+	return false
	90	+	}
	91	+	switch r.kind {
	92	+	case ResultKindCommand:
	93	+	return r.command.Slug == other.command.Slug
	94	+	case ResultKindActiveSession, ResultKindStoppedSession:
	95	+	return r.session.target == other.session.target
	96	+	case ResultKindRemoteSession:
	97	+	return r.remoteSession.key == other.remoteSession.key && r.remoteSession.target == other.remoteSession.target
	98	+	case ResultKindRecentRoute:
	99	+	return r.route.action == other.route.action
	100	+	default:
	101	+	return false
	102	+	}
	103	+	}
	104	+
68	105		func (r Result) DisplayText() string {
69	106		if r.kind == ResultKindCommand {
70	107		return r.command.Code
71	108		}
	109	+	if r.kind == ResultKindRemoteSession {
	110	+	return activeSessionDisplayPrefix + r.remoteSession.key.Display()
	111	+	}
72	112		if r.kind == ResultKindRecentRoute {
73	113		return activeSessionDisplayPrefix + r.route.label
74	114		}

@@ -107,6 +147,24 @@ func (r Result) SessionTarget() (ports.ExactSessionTarget, bool) {
107	147		return r.session.target, r.kind == ResultKindActiveSession \|\| r.kind == ResultKindStoppedSession
108	148		}
109	149
	150	+	// RemoteSessionTarget returns the structured catalog target only for a remote
	151	+	// session result.
	152	+	func (r Result) RemoteSessionTarget() (domain.RemoteSessionTarget, bool) {
	153	+	return r.remoteSession.target, r.kind == ResultKindRemoteSession
	154	+	}
	155	+
	156	+	// RemoteSessionKey returns the structured catalog identity only for a remote
	157	+	// session result.
	158	+	func (r Result) RemoteSessionKey() (domain.RemoteSessionKey, bool) {
	159	+	return r.remoteSession.key, r.kind == ResultKindRemoteSession
	160	+	}
	161	+
	162	+	// RemoteSessionUnavailableReason returns the catalog availability reason only
	163	+	// for a remote session result.
	164	+	func (r Result) RemoteSessionUnavailableReason() (string, bool) {
	165	+	return r.remoteSession.unavailableReason, r.kind == ResultKindRemoteSession
	166	+	}
	167	+
110	168		// RouteNavigationAction returns the exact client-ledger target only for a
111	169		// recent-route result.
112	170		func (r Result) RouteNavigationAction() (ports.RouteNavigationAction, bool) {


@@ -3,6 +3,7 @@ package palette
3		import (	3		import (
4		"time"	4		"time"
5			5
			6	+	"github.com/bnema/vev/internal/domain"
6		"github.com/bnema/vev/internal/ports"	7		"github.com/bnema/vev/internal/ports"
7		"github.com/bnema/vev/internal/usecase/command"	8		"github.com/bnema/vev/internal/usecase/command"
8		)	9		)

@@ -14,16 +15,18 @@ const (
14		ResultKindCommand ResultKind = iota	15		ResultKindCommand ResultKind = iota
15		ResultKindActiveSession	16		ResultKindActiveSession
16		ResultKindStoppedSession	17		ResultKindStoppedSession
			18	+	ResultKindRemoteSession
17		ResultKindRecentRoute	19		ResultKindRecentRoute
18		)	20		)
19			21
20		// Result is an immutable palette target. Its kind is the sole discriminator	22		// Result is an immutable palette target. Its kind is the sole discriminator
21	-	// for its private command or session payload.	23	+	// for its private command, local-session, remote-session, or route payload.
22		type Result struct {	24		type Result struct {
23	-	kind ResultKind	25	+	kind ResultKind
24	-	command command.Command	26	+	command command.Command
25	-	session sessionPayload	27	+	session sessionPayload
26	-	route routePayload	28	+	remoteSession remoteSessionPayload
			29	+	route routePayload
27		}	30		}
28			31
29		type sessionPayload struct {	32		type sessionPayload struct {

@@ -32,6 +35,12 @@ type sessionPayload struct {
32		target ports.ExactSessionTarget	35		target ports.ExactSessionTarget
33		}	36		}
34			37
			38	+	type remoteSessionPayload struct {
			39	+	key domain.RemoteSessionKey
			40	+	target domain.RemoteSessionTarget
			41	+	unavailableReason string
			42	+	}
			43	+
35		type routePayload struct {	44		type routePayload struct {
36		label string	45		label string
37		action ports.RouteNavigationAction	46		action ports.RouteNavigationAction

@@ -58,6 +67,16 @@ func NewStoppedSessionResult(target ports.ExactSessionTarget, createdAt time.Tim
58		}	67		}
59		}	68		}
60			69
			70	+	// NewRemoteSessionResult creates an immutable catalog-backed remote target.
			71	+	func NewRemoteSessionResult(key domain.RemoteSessionKey, target domain.RemoteSessionTarget, unavailableReason string) Result {
			72	+	return Result{
			73	+	kind: ResultKindRemoteSession,
			74	+	remoteSession: remoteSessionPayload{
			75	+	key: key, target: target, unavailableReason: unavailableReason,
			76	+	},
			77	+	}
			78	+	}
			79	+
61		// NewRecentRouteResult creates an immutable client-ledger route target.	80		// NewRecentRouteResult creates an immutable client-ledger route target.
62		func NewRecentRouteResult(label string, action ports.RouteNavigationAction) Result {	81		func NewRecentRouteResult(label string, action ports.RouteNavigationAction) Result {
63		return Result{kind: ResultKindRecentRoute, route: routePayload{label: label, action: action}}	82		return Result{kind: ResultKindRecentRoute, route: routePayload{label: label, action: action}}

@@ -65,10 +84,31 @@ func NewRecentRouteResult(label string, action ports.RouteNavigationAction) Resu
65			84
66		func (r Result) Kind() ResultKind { return r.kind }	85		func (r Result) Kind() ResultKind { return r.kind }
67			86
			87	+	func (r Result) sameTarget(other Result) bool {
			88	+	if r.kind != other.kind {
			89	+	return false
			90	+	}
			91	+	switch r.kind {
			92	+	case ResultKindCommand:
			93	+	return r.command.Slug == other.command.Slug
			94	+	case ResultKindActiveSession, ResultKindStoppedSession:
			95	+	return r.session.target == other.session.target
			96	+	case ResultKindRemoteSession:
			97	+	return r.remoteSession.key == other.remoteSession.key && r.remoteSession.target == other.remoteSession.target
			98	+	case ResultKindRecentRoute:
			99	+	return r.route.action == other.route.action
			100	+	default:
			101	+	return false
			102	+	}
			103	+	}
			104	+
68		func (r Result) DisplayText() string {	105		func (r Result) DisplayText() string {
69		if r.kind == ResultKindCommand {	106		if r.kind == ResultKindCommand {
70		return r.command.Code	107		return r.command.Code
71		}	108		}
			109	+	if r.kind == ResultKindRemoteSession {
			110	+	return activeSessionDisplayPrefix + r.remoteSession.key.Display()
			111	+	}
72		if r.kind == ResultKindRecentRoute {	112		if r.kind == ResultKindRecentRoute {
73		return activeSessionDisplayPrefix + r.route.label	113		return activeSessionDisplayPrefix + r.route.label
74		}	114		}

@@ -107,6 +147,24 @@ func (r Result) SessionTarget() (ports.ExactSessionTarget, bool) {
107		return r.session.target, r.kind == ResultKindActiveSession \|\| r.kind == ResultKindStoppedSession	147		return r.session.target, r.kind == ResultKindActiveSession \|\| r.kind == ResultKindStoppedSession
108		}	148		}
109			149
			150	+	// RemoteSessionTarget returns the structured catalog target only for a remote
			151	+	// session result.
			152	+	func (r Result) RemoteSessionTarget() (domain.RemoteSessionTarget, bool) {
			153	+	return r.remoteSession.target, r.kind == ResultKindRemoteSession
			154	+	}
			155	+
			156	+	// RemoteSessionKey returns the structured catalog identity only for a remote
			157	+	// session result.
			158	+	func (r Result) RemoteSessionKey() (domain.RemoteSessionKey, bool) {
			159	+	return r.remoteSession.key, r.kind == ResultKindRemoteSession
			160	+	}
			161	+
			162	+	// RemoteSessionUnavailableReason returns the catalog availability reason only
			163	+	// for a remote session result.
			164	+	func (r Result) RemoteSessionUnavailableReason() (string, bool) {
			165	+	return r.remoteSession.unavailableReason, r.kind == ResultKindRemoteSession
			166	+	}
			167	+
110		// RouteNavigationAction returns the exact client-ledger target only for a	168		// RouteNavigationAction returns the exact client-ledger target only for a
111		// recent-route result.	169		// recent-route result.
112		func (r Result) RouteNavigationAction() (ports.RouteNavigationAction, bool) {	170		func (r Result) RouteNavigationAction() (ports.RouteNavigationAction, bool) {