Keep private sidecar profile data transient

crates/ely_app/src/shell/internal_pages.rs

@@ -94,7 +94,7 @@ impl ElyShell {
             "ely://settings/updates" => self.render_updates_page(snapshot),
             "ely://sync/status" => self.render_sync_page(snapshot, cx),
             url if super::web_surface::is_external_web_url(url) => {
-                self.render_external_web_canvas(tab, cx)
+                self.render_external_web_canvas(tab, snapshot, cx)
             }
             _ => render_default_page(tab),
         }

crates/ely_app/src/shell/web_surface.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use ely_domain::{BrowserTab, TabId};
 use gpui::{Bounds, Pixels, Point};
 
-use crate::services::servo_sidecar::SidecarSnapshotRequest;
+use crate::services::{ProfileDataMode, servo_sidecar::SidecarSnapshotRequest};
 
 use super::{
     web_surface_frame::WebSurfaceFrame,
@@ -47,7 +47,11 @@ impl WebSurfaceStore {
         self.states.get(tab_id)
     }
 
-    pub(super) fn prepare_request(&mut self, tab: &BrowserTab) -> Option<WebSurfaceRequest> {
+    pub(super) fn prepare_request(
+        &mut self,
+        tab: &BrowserTab,
+        profile_data_mode: ProfileDataMode,
+    ) -> Option<WebSurfaceRequest> {
         if !is_external_web_url(tab.url().as_str()) {
             return None;
         }
@@ -108,6 +112,7 @@ impl WebSurfaceStore {
             size.width,
             size.height,
         )
+        .with_profile_data_mode(profile_data_mode)
         .with_scroll_offset(scroll_offset.x(), scroll_offset.y());
         if let Some(click_point) = click_point {
             snapshot_request = snapshot_request.with_click_point(click_point.x(), click_point.y());
@@ -410,7 +415,7 @@ mod tests {
     use ely_domain::{BrowserTab, ProfileId, SpaceId, TabId, UrlText};
     use gpui::{Bounds, point, px, size};
 
-    use super::WebSurfaceStore;
+    use super::{ProfileDataMode, WebSurfaceStore};
 
     #[test]
     fn typed_text_enters_snapshot_request_after_clicked_viewport() -> Result<(), Box<dyn Error>> {
@@ -427,7 +432,9 @@ mod tests {
         assert!(store.record_typed_text(tab.id(), tab.url().as_str(), "e"));
         assert!(store.record_typed_text(tab.id(), tab.url().as_str(), "l"));
 
-        let request = store.prepare_request(&tab).ok_or("missing web surface request")?;
+        let request = store
+            .prepare_request(&tab, ProfileDataMode::Persistent)
+            .ok_or("missing web surface request")?;
 
         assert_eq!(request.typed_text.as_deref(), Some("el"));
         assert_eq!(request.snapshot_request.typed_text_for_test(), Some("el"));
@@ -435,6 +442,25 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn private_profile_enters_transient_snapshot_request() -> Result<(), Box<dyn Error>> {
+        let mut store = WebSurfaceStore::new();
+        let tab = web_tab("https://example.com/private")?;
+
+        let bounds = Bounds::new(point(px(0.0), px(0.0)), size(px(640.0), px(480.0)));
+        assert!(store.record_viewport_size(tab.id(), bounds));
+
+        let request = store
+            .prepare_request(&tab, ProfileDataMode::Transient)
+            .ok_or("missing web surface request")?;
+
+        assert_eq!(
+            request.snapshot_request.profile_data_mode_for_test(),
+            ProfileDataMode::Transient
+        );
+        Ok(())
+    }
+
     fn web_tab(url: &str) -> Result<BrowserTab, Box<dyn Error>> {
         Ok(BrowserTab::new(
             TabId::new(),

crates/ely_app/src/shell/web_surface_controller.rs

@@ -1,7 +1,11 @@
-use ely_domain::{BrowserTab, TabId};
+use ely_browser_core::BrowserSnapshot;
+use ely_domain::{BrowserTab, ProfileKind, TabId};
 use gpui::{AnyElement, Bounds, Context, Pixels, Point};
 
-use crate::services::servo_sidecar::{ServoSidecarError, SidecarSnapshot};
+use crate::services::{
+    ProfileDataMode,
+    servo_sidecar::{ServoSidecarError, SidecarSnapshot},
+};
 
 use super::{
     ElyShell,
@@ -26,11 +30,16 @@ impl ElyShell {
     pub(super) fn render_external_web_canvas(
         &mut self,
         tab: &BrowserTab,
+        snapshot: &BrowserSnapshot,
         cx: &mut Context<Self>,
     ) -> AnyElement {
-        self.ensure_external_web_frame(tab, cx);
-
         let state_entity = cx.entity().clone();
+        let Some(profile_data_mode) = profile_data_mode_for(tab, snapshot) else {
+            return render_failed_web_surface(tab, "Profile context is unavailable.", state_entity);
+        };
+
+        self.ensure_external_web_frame(tab, profile_data_mode, cx);
+
         match self.web_surfaces.state(tab.id()) {
             Some(WebSurfaceState::Ready(frame)) => {
                 render_ready_web_surface(frame, tab, state_entity)
@@ -47,8 +56,13 @@ impl ElyShell {
         }
     }
 
-    fn ensure_external_web_frame(&mut self, tab: &BrowserTab, cx: &mut Context<Self>) {
-        let Some(request) = self.web_surfaces.prepare_request(tab) else {
+    fn ensure_external_web_frame(
+        &mut self,
+        tab: &BrowserTab,
+        profile_data_mode: ProfileDataMode,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(request) = self.web_surfaces.prepare_request(tab, profile_data_mode) else {
             return;
         };
 
@@ -190,3 +204,12 @@ impl ElyShell {
         false
     }
 }
+
+fn profile_data_mode_for(tab: &BrowserTab, snapshot: &BrowserSnapshot) -> Option<ProfileDataMode> {
+    snapshot.profiles.iter().find(|profile| profile.id() == tab.profile_id()).map(|profile| {
+        match profile.kind() {
+            ProfileKind::Standard => ProfileDataMode::Persistent,
+            ProfileKind::Private => ProfileDataMode::Transient,
+        }
+    })
+}

crates/ely_app/src/shell/web_surface_live_site_tests.rs

@@ -4,6 +4,7 @@ use ely_domain::{BrowserTab, ProfileId, SpaceId, TabId, UrlText};
 use gpui::{Bounds, point, px, size};
 
 use crate::{
+    services::ProfileDataMode,
     services::prd_live_sites::{
         LiveSiteCase, PRD_REFERENCE_SITE_CASES, PRD_TOP_SITE_CASES,
         assert_prd_reference_urls_are_covered,
@@ -42,7 +43,7 @@ fn assert_web_surfaces_render(cases: &[LiveSiteCase]) -> Result<(), Box<dyn Erro
 
         assert!(store.record_viewport_size(tab.id(), bounds), "{}", case.url);
         let request = store
-            .prepare_request(&tab)
+            .prepare_request(&tab, ProfileDataMode::Persistent)
             .ok_or_else(|| format!("missing web surface request for {}", case.url))?;
         let snapshot = request.client.snapshot(request.snapshot_request)?;
         let frame = WebSurfaceFrame::from_snapshot(