From 3b478e69dcbe8e416ddd46f0e24156392d4e71da Mon Sep 17 00:00:00 2001
From: akbash <akbash@herdr.dev>
Date: Mon, 14 Sep 2026 01:11:07 +0300
Subject: fix: scope agent views to the selected machine (#3784)

* fix: scope agent views to the selected machine

refs #3732

* fix: preserve stable agent view ordering

refs #3732

---------

Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
Co-authored-by: JJ Liebig <jonathan.liebig@gmail.com>
---
 src/server/headless/render.rs | 49 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 6 deletions(-)

(limited to 'src/server/headless/render.rs')

diff --git a/src/server/headless/render.rs b/src/server/headless/render.rs
index 87c96964..dd2cce38 100644
--- a/src/server/headless/render.rs
+++ b/src/server/headless/render.rs
@@ -479,6 +479,7 @@ impl HeadlessServer {
                     .clients
                     .get(&client_id)
                     .and_then(|client| client.shell_location.clone());
+                let agent_view = self.app.state.agent_view_override.clone();
                 let Some(client) = self.clients.get_mut(&client_id) else {
                     continue;
                 };
@@ -495,19 +496,52 @@ impl HeadlessServer {
                     self.server_config_diagnostic_without_keybindings.clone()
                 };
                 candidate.revision = client.shell_projection_revision;
-                if client.shell_snapshot.as_ref() != Some(&candidate) {
+                if client.shell_snapshot.as_ref() != Some(&candidate)
+                    || client.shell_agent_view != agent_view
+                {
                     client.shell_projection_revision =
                         client.shell_projection_revision.saturating_add(1);
                     candidate.revision = client.shell_projection_revision;
-                    let message = match crate::protocol::endpoint::snapshot_message(&candidate) {
-                        Ok(message) => message,
+                    let projection_message = if agent_view.is_some()
+                        || client.shell_agent_view.is_some()
+                    {
+                        match crate::protocol::endpoint::agent_view_projection_message(
+                            &candidate.boot_id,
+                            candidate.revision,
+                            agent_view.as_ref(),
+                        ) {
+                            Ok(message) => Some(message),
+                            Err(err) => {
+                                warn!(client_id, err = %err, "failed to encode endpoint agent view");
+                                broken_clients.push(client_id);
+                                continue;
+                            }
+                        }
+                    } else {
+                        None
+                    };
+                    let snapshot_message =
+                        match crate::protocol::endpoint::snapshot_message(&candidate) {
+                            Ok(message) => message,
+                            Err(err) => {
+                                warn!(client_id, err = %err, "failed to encode endpoint snapshot");
+                                broken_clients.push(client_id);
+                                continue;
+                            }
+                        };
+                    let projection_framed = match projection_message
+                        .as_ref()
+                        .map(Self::frame_server_message)
+                        .transpose()
+                    {
+                        Ok(framed) => framed,
                         Err(err) => {
-                            warn!(client_id, err = %err, "failed to encode endpoint snapshot");
+                            warn!(client_id, err = %err, "failed to frame endpoint agent view");
                             broken_clients.push(client_id);
                             continue;
                         }
                     };
-                    let framed = match Self::frame_server_message(&message) {
+                    let snapshot_framed = match Self::frame_server_message(&snapshot_message) {
                         Ok(framed) => framed,
                         Err(err) => {
                             warn!(client_id, err = %err, "failed to frame endpoint snapshot");
@@ -519,11 +553,14 @@ impl HeadlessServer {
                         broken_clients.push(client_id);
                         continue;
                     };
-                    if writer.control.send(framed).is_err() {
+                    if projection_framed.is_some_and(|framed| writer.control.send(framed).is_err())
+                        || writer.control.send(snapshot_framed).is_err()
+                    {
                         broken_clients.push(client_id);
                         continue;
                     }
                     client.shell_snapshot = Some(candidate);
+                    client.shell_agent_view = agent_view;
                 }
                 shell_projection_revision = client.shell_projection_revision;
                 if !client.shell_surface_active {
-- 
cgit v1.2.3