Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
refactor(cdp): stabilize target session routes
ldm081c161ee6684
diff --git a/moli-protocol/src/conn.rs b/moli-protocol/src/conn.rsindex dfff9ac2e..176fa6e2a 100644--- a/moli-protocol/src/conn.rs+++ b/moli-protocol/src/conn.rs@@ -1150,7 +1150,6 @@ pub struct CdpConnection {// Browser/session routing state.pub browser_context: Option<BrowserContext>,pub inactive_browser_contexts: Vec<BrowserContext>,- browser_session_ids: HashSet<String>,/// When true, every newly-created target is immediately auto-attached.pub auto_attach: bool,/// Root/browser owner Target discovery mirror for diagnostics and@@ -1474,7 +1473,6 @@ impl CdpConnection {Self {browser_context: None,inactive_browser_contexts: Vec::new(),- browser_session_ids: HashSet::new(),auto_attach: false,target_discovery_enabled: false,target_info_change_events_enabled: false,@@ -2675,31 +2673,21 @@ impl CdpConnection {return;};let page_owner = match route {- CdpSessionRoute::PageTargetHost {- browser_context_id,- target_id,- }- | CdpSessionRoute::ActiveTarget {- browser_context_id,- target_id: Some(target_id),- }- | CdpSessionRoute::AuxiliaryTarget {+ CdpSessionRoute::PageTarget {browser_context_id,target_id,+ ..} => Some((browser_context_id, target_id)),- CdpSessionRoute::ActiveTarget {- browser_context_id,- target_id: None,- } => self- .browser_context_by_id(&browser_context_id)- .and_then(|browser_context| browser_context.active_target_id())- .map(str::to_owned)- .map(|target_id| (browser_context_id, target_id)),CdpSessionRoute::Browser| CdpSessionRoute::TabTarget { .. }| CdpSessionRoute::SharedWorkerTarget { .. }| CdpSessionRoute::DedicatedWorkerTarget { .. }| CdpSessionRoute::ServiceWorkerTarget { .. } => None,+ CdpSessionRoute::BrowserContext { browser_context_id } => self+ .browser_context_by_id(&browser_context_id)+ .and_then(|browser_context| browser_context.active_target_id())+ .map(str::to_owned)+ .map(|target_id| (browser_context_id, target_id)),};if let Some((browser_context_id, target_id)) = page_owner {self.install_page_navigation_engine(&browser_context_id, &target_id, engine)@@ -3198,7 +3186,7 @@ impl CdpConnection {"connection": {"hasActiveBrowserContext": self.browser_context.is_some(),"inactiveBrowserContextCount": self.inactive_browser_contexts.len(),- "browserSessionIdCount": self.browser_session_ids.len(),+ "browserSessionIdCount": self.target_control.browser_session_count(),"globalIoStreamCount": self.global_io_streams.len(),"tracing": self.tracing_state.diagnostics(),"permissionOverrideCount": self.permission_overrides.len(),diff --git a/moli-protocol/src/conn/activity_source.rs b/moli-protocol/src/conn/activity_source.rsindex f55087898..9f951bccf 100644--- a/moli-protocol/src/conn/activity_source.rs+++ b/moli-protocol/src/conn/activity_source.rs@@ -4,7 +4,7 @@ use moli_core::{};use std::time::Instant;-use super::{BrowserContext, CdpConnection, CdpSessionRoute, TargetRuntimeSlot};+use super::{CdpConnection, CdpSessionRoute, TargetRuntimeSlot};pub(crate) struct PendingChildFrameLifecycleWork {session_id: Option<String>,@@ -42,29 +42,21 @@ impl CdpConnection {.unwrap_or(CdpSessionRoute::Browser),};let (browser_context_id, target_id) = match &route {- CdpSessionRoute::ActiveTarget {- browser_context_id,- target_id,- } => (- browser_context_id.clone(),- target_id.clone().or_else(|| {- self.browser_context_by_id(browser_context_id)- .and_then(BrowserContext::active_target_id)- .map(str::to_owned)- })?,- ),- CdpSessionRoute::AuxiliaryTarget {- browser_context_id,- target_id,- }- | CdpSessionRoute::PageTargetHost {+ CdpSessionRoute::PageTarget {browser_context_id,target_id,+ ..} => (browser_context_id.clone(), target_id.clone()),CdpSessionRoute::Browser => {let context = self.browser_context.as_ref()?;(context.id.clone(), context.active_target_id()?.to_owned())}+ CdpSessionRoute::BrowserContext { browser_context_id } => (+ browser_context_id.clone(),+ self.browser_context_by_id(browser_context_id)?+ .active_target_id()?+ .to_owned(),+ ),CdpSessionRoute::TabTarget { .. }| CdpSessionRoute::SharedWorkerTarget { .. }| CdpSessionRoute::DedicatedWorkerTarget { .. }diff --git a/moli-protocol/src/conn/bidi_channel_work.rs b/moli-protocol/src/conn/bidi_channel_work.rsindex 1ac09e83a..8b2d1b70e 100644--- a/moli-protocol/src/conn/bidi_channel_work.rs+++ b/moli-protocol/src/conn/bidi_channel_work.rs@@ -220,9 +220,10 @@ mod tests {#[test]fn implicit_page_owner_reenters_its_frozen_route_and_restores_the_caller() {let mut conn = connection_with_page_session();- let owner_route = crate::conn::CdpSessionRoute::ActiveTarget {+ let owner_route = crate::conn::CdpSessionRoute::PageTarget {browser_context_id: "BID-owner".to_owned(),- target_id: Some("TID-owner".to_owned()),+ target_id: "TID-owner".to_owned(),+ is_attached_session: false,};let owner = {let mut scope = conn.scoped_none_session_owner_route_override(owner_route.clone());diff --git a/moli-protocol/src/conn/browser_context/fetch_owner.rs b/moli-protocol/src/conn/browser_context/fetch_owner.rsindex e5bcbc9dc..03cd0ffff 100644--- a/moli-protocol/src/conn/browser_context/fetch_owner.rs+++ b/moli-protocol/src/conn/browser_context/fetch_owner.rs@@ -339,26 +339,16 @@ impl CdpConnection {fn target_fetch_config_for_target(&self, target_id: &str) -> Option<TargetFetchConfig> {match self.target_session_route_for_target_id(target_id)? {- CdpSessionRoute::ActiveTarget {- browser_context_id, ..- } => self- .browser_context_by_id(&browser_context_id)- .map(|browser_context| browser_context.active_target.fetch_owner.config_snapshot()),- CdpSessionRoute::PageTargetHost {- browser_context_id,- target_id,- } => self- .browser_context_by_id(&browser_context_id)?- .background_target(&target_id)- .map(|target| target.fetch_owner.config_snapshot()),- CdpSessionRoute::AuxiliaryTarget {+ CdpSessionRoute::PageTarget {browser_context_id,target_id,+ ..} => self.browser_context_by_id(&browser_context_id)?- .background_target(&target_id)+ .page_target(&target_id).map(|target| target.fetch_owner.config_snapshot()),CdpSessionRoute::Browser+ | CdpSessionRoute::BrowserContext { .. }| CdpSessionRoute::TabTarget { .. }| CdpSessionRoute::SharedWorkerTarget { .. }| CdpSessionRoute::DedicatedWorkerTarget { .. }@@ -1202,9 +1192,10 @@ fn pending_fetch_request_route(.fetch_owner.contains_pending_request(request_id){- return Some(CdpSessionRoute::ActiveTarget {+ return Some(CdpSessionRoute::PageTarget {browser_context_id: browser_context.id.clone(),- target_id: browser_context.active_target_id_owned(),+ target_id: browser_context.active_target_id_owned()?,+ is_attached_session: false,});}@@ -1212,9 +1203,10 @@ fn pending_fetch_request_route(target.fetch_owner.contains_pending_request(request_id)- .then(|| CdpSessionRoute::PageTargetHost {+ .then(|| CdpSessionRoute::PageTarget {browser_context_id: browser_context.id.clone(),target_id: target.target_id().to_owned(),+ is_attached_session: false,})})}diff --git a/moli-protocol/src/conn/browser_context/lookup.rs b/moli-protocol/src/conn/browser_context/lookup.rsindex a114961ce..b8fa098d1 100644--- a/moli-protocol/src/conn/browser_context/lookup.rs+++ b/moli-protocol/src/conn/browser_context/lookup.rs@@ -49,14 +49,11 @@ impl CdpConnection {.browser_context.as_mut().ok_or((-31998, "BrowserContextNotLoaded")),+ CdpSessionRoute::BrowserContext { browser_context_id } => self+ .browser_context_by_id_mut(&browser_context_id)+ .ok_or((-31998, "UnknownBrowserContextId")),CdpSessionRoute::TabTarget { .. } => Err((-31998, "DirectSessionRouteRequired")),- CdpSessionRoute::ActiveTarget {- browser_context_id, ..- }- | CdpSessionRoute::AuxiliaryTarget {- browser_context_id, ..- }- | CdpSessionRoute::PageTargetHost {+ CdpSessionRoute::PageTarget {browser_context_id, ..}| CdpSessionRoute::SharedWorkerTarget {diff --git a/moli-protocol/src/conn/browser_context/session_owner.rs b/moli-protocol/src/conn/browser_context/session_owner.rsindex 25fab83ca..d8a3f94ee 100644--- a/moli-protocol/src/conn/browser_context/session_owner.rs+++ b/moli-protocol/src/conn/browser_context/session_owner.rs@@ -84,70 +84,31 @@ impl CdpConnection {}).unwrap_or(TargetSessionOwner::NoLoadedBrowserContext),),- CdpSessionRoute::ActiveTarget {+ CdpSessionRoute::BrowserContext { browser_context_id } => Some(+ self.browser_context_by_id(&browser_context_id)+ .filter(|browser_context| browser_context.has_active_target())+ .map(|_| TargetSessionOwner::ActiveTarget {+ browser_context_id,+ is_auxiliary_target_session: false,+ })+ .unwrap_or(TargetSessionOwner::NoLoadedBrowserContext),+ ),+ CdpSessionRoute::PageTarget {browser_context_id,target_id,+ is_attached_session,} => {let browser_context = self.browser_context_by_id(&browser_context_id)?;- match target_id {- Some(target_id) if browser_context.is_active_target(&target_id) => {- Some(TargetSessionOwner::ActiveTarget {- browser_context_id,- is_auxiliary_target_session: false,- })- }- Some(target_id) if browser_context.page_target(&target_id).is_some() => {- Some(TargetSessionOwner::PageTargetHost {- browser_context_id,- target_id,- is_auxiliary_target_session: false,- })- }- None if browser_context.has_active_target() => {- Some(TargetSessionOwner::ActiveTarget {- browser_context_id,- is_auxiliary_target_session: false,- })- }- _ => Some(TargetSessionOwner::NoLoadedBrowserContext),- }- }- CdpSessionRoute::AuxiliaryTarget {- browser_context_id,- target_id,- } => {- let is_background_target = self- .browser_context_by_id(&browser_context_id)?- .background_target(&target_id)- .is_some();- if is_background_target {- Some(TargetSessionOwner::PageTargetHost {- browser_context_id,- target_id,- is_auxiliary_target_session: true,- })- } else if self- .browser_context_by_id(&browser_context_id)?- .is_active_target(&target_id)- {+ if browser_context.is_active_target(&target_id) {Some(TargetSessionOwner::ActiveTarget {browser_context_id,- is_auxiliary_target_session: true,+ is_auxiliary_target_session: is_attached_session,})- } else {- Some(TargetSessionOwner::NoLoadedBrowserContext)- }- }- CdpSessionRoute::PageTargetHost {- browser_context_id,- target_id,- } => {- let browser_context = self.browser_context_by_id(&browser_context_id)?;- if browser_context.page_target(&target_id).is_some() {+ } else if browser_context.page_target(&target_id).is_some() {Some(TargetSessionOwner::PageTargetHost {browser_context_id,target_id,- is_auxiliary_target_session: false,+ is_auxiliary_target_session: is_attached_session,})} else {Some(TargetSessionOwner::NoLoadedBrowserContext)diff --git a/moli-protocol/src/conn/browser_context/target_session_owner.rs b/moli-protocol/src/conn/browser_context/target_session_owner.rsindex 51e01e04f..5e60fd7a3 100644--- a/moli-protocol/src/conn/browser_context/target_session_owner.rs+++ b/moli-protocol/src/conn/browser_context/target_session_owner.rs@@ -2886,12 +2886,9 @@ impl CdpConnection {) -> Option<TargetPageResidenceIdentity> {let (browser_context_id, routed_target_id) =self.target_owner_identity_for_route(session_id, owner_route)?;- // `None` in a `CdpSessionRoute::ActiveTarget` is a routing shorthand:- // it means "whichever target is currently active". A Page residence- // identity must never retain that mutable shorthand. Freeze the- // concrete target now, otherwise a later `browsingContext.create`- // can make output from the old Page resolve through the new active- // target while preserving the same browser-context id and residence.+ // Context-scoped work may not carry a Page id. Freeze its concrete+ // active target before an async boundary so later foreground changes+ // cannot redirect output from the old Page.let target_id = routed_target_id.or_else(|| {self.browser_context_by_id(&browser_context_id).and_then(|browser_context| browser_context.active_target_id())diff --git a/moli-protocol/src/conn/command_owner_scope.rs b/moli-protocol/src/conn/command_owner_scope.rsindex 1d6973cb6..e99cacbb6 100644--- a/moli-protocol/src/conn/command_owner_scope.rs+++ b/moli-protocol/src/conn/command_owner_scope.rs@@ -14,9 +14,10 @@ impl CommandOwnerScope {conn.none_session_owner_route_override().or_else(|| {let browser_context = conn.browser_context.as_ref()?;let target_id = browser_context.active_target_id_owned()?;- Some(CdpSessionRoute::ActiveTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: browser_context.id.clone(),- target_id: Some(target_id),+ target_id,+ is_attached_session: false,})})})diff --git a/moli-protocol/src/conn/dispatch_tests.rs b/moli-protocol/src/conn/dispatch_tests.rsindex 0407fcb99..92adcc7e9 100644--- a/moli-protocol/src/conn/dispatch_tests.rs+++ b/moli-protocol/src/conn/dispatch_tests.rs@@ -311,7 +311,7 @@ async fn assert_bidi_fetch_action_consumes_background_request(let mut conn = connection_with_background_pending_fetch_action(request_id);assert!(matches!(conn.pending_fetch_request_session_route(request_id),- Some(CdpSessionRoute::PageTargetHost { target_id, .. }) if target_id == "TID-background"+ Some(CdpSessionRoute::PageTarget { target_id, .. }) if target_id == "TID-background"));let (result, events, protocol_events, renderer_output_predecessor) = conn@@ -731,7 +731,7 @@ async fn bidi_fetch_control_resolves_background_request_owner() {assert!(matches!(conn.pending_fetch_request_session_route("FETCH-background"),- Some(CdpSessionRoute::PageTargetHost { target_id, .. }) if target_id == "TID-background"+ Some(CdpSessionRoute::PageTarget { target_id, .. }) if target_id == "TID-background"));let context = DevToolsCommandContext {diff --git a/moli-protocol/src/conn/popup_activation_work.rs b/moli-protocol/src/conn/popup_activation_work.rsindex 09382ff89..6961e8e45 100644--- a/moli-protocol/src/conn/popup_activation_work.rs+++ b/moli-protocol/src/conn/popup_activation_work.rs@@ -24,9 +24,10 @@ impl PopupTargetActivationAction {(route.browser_context_id() == Some(browser_context_id)).then(|| Self {owner_scope: CommandOwnerScope::from_session_and_owner_route(None,- Some(CdpSessionRoute::AuxiliaryTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: browser_context_id.to_owned(),target_id: target_id.to_owned(),+ is_attached_session: false,}),),browser_context_id: browser_context_id.to_owned(),diff --git a/moli-protocol/src/conn/popup_navigation_work.rs b/moli-protocol/src/conn/popup_navigation_work.rsindex 0cb32241c..3679d39b6 100644--- a/moli-protocol/src/conn/popup_navigation_work.rs+++ b/moli-protocol/src/conn/popup_navigation_work.rs@@ -39,13 +39,14 @@ impl PopupTargetNavigationOwnerAction {let route = conn.target_session_route_for_target_id(target_id)?;(route.browser_context_id() == Some(browser_context_id)).then(|| Self {// Activation has an independent owner action. Unlike a frozen- // PageTargetHost route, AuxiliaryTarget keeps this exact target- // addressable if that action changes its residence first.+ // Stable PageTarget route keeps this exact target addressable if+ // the independent activation action changes its residence first.owner_scope: CommandOwnerScope::from_session_and_owner_route(None,- Some(CdpSessionRoute::AuxiliaryTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: browser_context_id.to_owned(),target_id: target_id.to_owned(),+ is_attached_session: false,}),),browser_context_id: browser_context_id.to_owned(),diff --git a/moli-protocol/src/conn/runtime_eval.rs b/moli-protocol/src/conn/runtime_eval.rsindex 78344c83d..a426ce055 100644--- a/moli-protocol/src/conn/runtime_eval.rs+++ b/moli-protocol/src/conn/runtime_eval.rs@@ -1304,13 +1304,15 @@ impl CdpConnection {if let Some(route) = self.session_route(session_id) {return Some(route);}- self.target_owner_identity_for_session(session_id)- .map(- |(browser_context_id, target_id)| CdpSessionRoute::ActiveTarget {+ self.target_owner_identity_for_session(session_id).and_then(+ |(browser_context_id, target_id)| {+ target_id.map(|target_id| CdpSessionRoute::PageTarget {browser_context_id,target_id,- },- )+ is_attached_session: false,+ })+ },+ )}pub(crate) fn next_internal_runtime_command_id(&mut self) -> u64 {@@ -4382,15 +4384,10 @@ impl CdpConnection {.browser_context.as_ref().and_then(|bc| bc.active_target_id_owned()),- CdpSessionRoute::ActiveTarget {- browser_context_id,- target_id,- } => target_id.or_else(|| {- self.browser_context_by_id(&browser_context_id)?- .active_target_id_owned()- }),- CdpSessionRoute::AuxiliaryTarget { target_id, .. }- | CdpSessionRoute::PageTargetHost { target_id, .. } => Some(target_id),+ CdpSessionRoute::BrowserContext { browser_context_id } => self+ .browser_context_by_id(&browser_context_id)+ .and_then(|bc| bc.active_target_id_owned()),+ CdpSessionRoute::PageTarget { target_id, .. } => Some(target_id),CdpSessionRoute::TabTarget { .. }| CdpSessionRoute::SharedWorkerTarget { .. }| CdpSessionRoute::DedicatedWorkerTarget { .. }diff --git a/moli-protocol/src/conn/target/control.rs b/moli-protocol/src/conn/target/control.rsindex e7cf6220e..16ab278d3 100644--- a/moli-protocol/src/conn/target/control.rs+++ b/moli-protocol/src/conn/target/control.rs@@ -477,6 +477,14 @@ impl TargetControlPlane {self.sessions.attached_sessions_for_target(target_id)}+ pub(crate) fn attached_session_route(&self, session_id: &str) -> Option<&CdpSessionRoute> {+ self.sessions.attached_session_route(session_id)+ }++ pub(crate) fn browser_session_count(&self) -> usize {+ self.sessions.browser_session_count()+ }+pub(crate) fn target_has_waiting_for_debugger_session(&self, target_id: &str) -> bool {self.sessions.target_has_waiting_for_debugger_session(target_id)@@ -647,9 +655,10 @@ mod tests {#[test]fn commit_auto_attached_session_event_records_committed_session_plan() {let mut control = TargetControlPlane::default();- let route = CdpSessionRoute::ActiveTarget {+ let route = CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),- target_id: Some("TID-page".to_owned()),+ target_id: "TID-page".to_owned(),+ is_attached_session: false,};control.ensure_owner(Some("SID-tab"));@@ -688,9 +697,10 @@ mod tests {#[test]fn detach_attached_session_event_plan_records_detached_session() {let mut control = TargetControlPlane::default();- let route = CdpSessionRoute::ActiveTarget {+ let route = CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),- target_id: Some("TID-page".to_owned()),+ target_id: "TID-page".to_owned(),+ is_attached_session: false,};control.commit_attached_session_event("SID-page".to_owned(),@@ -737,9 +747,10 @@ mod tests {session_id.to_owned(),None,"TID-page",- Some(CdpSessionRoute::ActiveTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),- target_id: Some("TID-page".to_owned()),+ target_id: "TID-page".to_owned(),+ is_attached_session: false,}),false,false,@@ -772,9 +783,10 @@ mod tests {session_id.to_owned(),None,"TID-page",- Some(CdpSessionRoute::ActiveTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),- target_id: Some("TID-page".to_owned()),+ target_id: "TID-page".to_owned(),+ is_attached_session: false,}),false,false,@@ -810,9 +822,10 @@ mod tests {"SID-page".to_owned(),Some("SID-tab"),"TID-page",- Some(CdpSessionRoute::ActiveTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),- target_id: Some("TID-page".to_owned()),+ target_id: "TID-page".to_owned(),+ is_attached_session: true,}),true,false,diff --git a/moli-protocol/src/conn/target/route.rs b/moli-protocol/src/conn/target/route.rsindex ddc5be74f..011652f39 100644--- a/moli-protocol/src/conn/target/route.rs+++ b/moli-protocol/src/conn/target/route.rs@@ -10,21 +10,19 @@ pub(crate) enum TargetHandlerAccessMode {#[derive(Clone, Debug, PartialEq, Eq)]pub(crate) enum CdpSessionRoute {Browser,- TabTarget {- browser_context_id: String,- tab_target_id: String,- },- ActiveTarget {+ /// Internal owner route for context-scoped work that may run before the+ /// context has a Page target. External CDP sessions never use this route.+ BrowserContext {browser_context_id: String,- target_id: Option<String>,},- AuxiliaryTarget {+ TabTarget {browser_context_id: String,- target_id: String,+ tab_target_id: String,},- PageTargetHost {+ PageTarget {browser_context_id: String,target_id: String,+ is_attached_session: bool,},SharedWorkerTarget {browser_context_id: String,@@ -44,16 +42,11 @@ impl CdpSessionRoute {pub(crate) fn browser_context_id(&self) -> Option<&str> {match self {Self::Browser => None,- Self::TabTarget {+ Self::BrowserContext { browser_context_id }+ | Self::TabTarget {browser_context_id, ..}- | Self::ActiveTarget {- browser_context_id, ..- }- | Self::AuxiliaryTarget {- browser_context_id, ..- }- | Self::PageTargetHost {+ | Self::PageTarget {browser_context_id, ..}| Self::SharedWorkerTarget {@@ -87,11 +80,9 @@ impl CdpSessionRoute {| "Target"| "Tracing"),+ Self::BrowserContext { .. } | Self::PageTarget { .. } => true,Self::TabTarget { .. } => matches!(domain, "IO" | "Target" | "Tracing"),- Self::ActiveTarget { .. }- | Self::AuxiliaryTarget { .. }- | Self::PageTargetHost { .. }- | Self::SharedWorkerTarget { .. }+ Self::SharedWorkerTarget { .. }| Self::DedicatedWorkerTarget { .. }| Self::ServiceWorkerTarget { .. } => true,}@@ -100,10 +91,9 @@ impl CdpSessionRoute {pub(crate) fn target_handler_access_mode(&self) -> TargetHandlerAccessMode {match self {Self::Browser => TargetHandlerAccessMode::Browser,- Self::TabTarget { .. }- | Self::ActiveTarget { .. }- | Self::AuxiliaryTarget { .. }- | Self::PageTargetHost { .. } => TargetHandlerAccessMode::Regular,+ Self::BrowserContext { .. } | Self::TabTarget { .. } | Self::PageTarget { .. } => {+ TargetHandlerAccessMode::Regular+ }Self::SharedWorkerTarget { .. }| Self::DedicatedWorkerTarget { .. }| Self::ServiceWorkerTarget { .. } => TargetHandlerAccessMode::AutoAttachOnly,@@ -164,9 +154,13 @@ impl CdpConnection {pub(crate) fn session_route(&self, session_id: Option<&str>) -> Option<CdpSessionRoute> {let session_id = session_id?;- if self.browser_session_ids.contains(session_id) {- return Some(CdpSessionRoute::Browser);+ if let Some(route) = self.target_control.attached_session_route(session_id) {+ return Some(route.clone());}++ // The remaining lookups cover only the interval after a target-owned+ // binding is prepared and before its Target.attachedToTarget event is+ // committed. Committed sessions always resolve from target_control.if let Some(tab_target_id) = self.tab_target_id_for_session_id(session_id)&& let Some(browser_context_id) =self.browser_context_id_for_tab_target_id(tab_target_id)@@ -177,7 +171,7 @@ impl CdpConnection {});}self.browser_contexts()- .find_map(|bc| browser_context_session_route(bc, session_id))+ .find_map(|bc| prepared_browser_context_session_route(bc, session_id))}pub(crate) fn target_session_route_for_target_id(@@ -196,15 +190,17 @@ impl CdpConnection {}self.browser_contexts().find_map(|browser_context| {if browser_context.active_target_id() == Some(target_id) {- return Some(CdpSessionRoute::ActiveTarget {+ return Some(CdpSessionRoute::PageTarget {browser_context_id: browser_context.id.clone(),- target_id: None,+ target_id: target_id.to_owned(),+ is_attached_session: false,});}if browser_context.background_target(target_id).is_some() {- return Some(CdpSessionRoute::PageTargetHost {+ return Some(CdpSessionRoute::PageTarget {browser_context_id: browser_context.id.clone(),target_id: target_id.to_owned(),+ is_attached_session: false,});}if browser_context.has_shared_worker_target(target_id) {@@ -243,23 +239,11 @@ impl CdpConnection {tab_target_id: target_id,..}- | CdpSessionRoute::AuxiliaryTarget { target_id, .. }- | CdpSessionRoute::PageTargetHost { target_id, .. }+ | CdpSessionRoute::PageTarget { target_id, .. }| CdpSessionRoute::SharedWorkerTarget { target_id, .. }| CdpSessionRoute::DedicatedWorkerTarget { target_id, .. }- | CdpSessionRoute::ServiceWorkerTarget { target_id, .. }- | CdpSessionRoute::ActiveTarget {- target_id: Some(target_id),- ..- } => Some(target_id),- CdpSessionRoute::ActiveTarget {- browser_context_id,- target_id: None,- } => self- .browser_context_by_id(&browser_context_id)- .and_then(|browser_context| browser_context.active_target_id())- .map(str::to_owned),- CdpSessionRoute::Browser => None,+ | CdpSessionRoute::ServiceWorkerTarget { target_id, .. } => Some(target_id),+ CdpSessionRoute::Browser | CdpSessionRoute::BrowserContext { .. } => None,}}@@ -281,18 +265,10 @@ impl CdpConnection {target.owner_state.has_attached_child_frame_id(frame_id)- .then(|| {- if browser_context.is_active_target(target.target_id()) {- CdpSessionRoute::ActiveTarget {- browser_context_id: browser_context.id.clone(),- target_id: None,- }- } else {- CdpSessionRoute::PageTargetHost {- browser_context_id: browser_context.id.clone(),- target_id: target.target_id().to_owned(),- }- }+ .then(|| CdpSessionRoute::PageTarget {+ browser_context_id: browser_context.id.clone(),+ target_id: target.target_id().to_owned(),+ is_attached_session: false,})})})@@ -322,51 +298,50 @@ impl CdpConnection {session_id: Option<&str>,) -> Option<(String, String)> {match self.session_route(session_id)? {- CdpSessionRoute::PageTargetHost {+ CdpSessionRoute::PageTarget {browser_context_id,target_id,- } => Some((browser_context_id, target_id)),- CdpSessionRoute::AuxiliaryTarget {- browser_context_id,- target_id,- } => self+ ..+ } => (!self.browser_context_by_id(&browser_context_id)?- .background_target(&target_id)- .is_some()- .then_some((browser_context_id, target_id)),+ .is_active_target(&target_id))+ .then_some((browser_context_id, target_id)),CdpSessionRoute::Browser+ | CdpSessionRoute::BrowserContext { .. }| CdpSessionRoute::TabTarget { .. }- | CdpSessionRoute::ActiveTarget { .. }| CdpSessionRoute::SharedWorkerTarget { .. }| CdpSessionRoute::DedicatedWorkerTarget { .. }| CdpSessionRoute::ServiceWorkerTarget { .. } => None,}}}-fn browser_context_session_route(+fn prepared_browser_context_session_route(browser_context: &BrowserContext,session_id: &str,) -> Option<CdpSessionRoute> {if browser_context.active_session_id() == Some(session_id) {- return Some(CdpSessionRoute::ActiveTarget {+ return Some(CdpSessionRoute::PageTarget {browser_context_id: browser_context.id.clone(),- target_id: browser_context.active_target_id().map(str::to_owned),+ target_id: browser_context.active_target_id()?.to_owned(),+ is_attached_session: false,});}if let Some(target_id) = browser_context.auxiliary_target_id_for_session(session_id) {- return Some(CdpSessionRoute::AuxiliaryTarget {+ return Some(CdpSessionRoute::PageTarget {browser_context_id: browser_context.id.clone(),target_id: target_id.to_owned(),+ is_attached_session: true,});}browser_context.background_targets().find(|target| target.is_session(session_id))- .map(|target| CdpSessionRoute::PageTargetHost {+ .map(|target| CdpSessionRoute::PageTarget {browser_context_id: browser_context.id.clone(),target_id: target.target_id().to_owned(),+ is_attached_session: false,}).or_else(|| {browser_context@@ -393,3 +368,45 @@ fn browser_context_session_route(})})}++#[cfg(test)]+mod tests {+ use super::*;+ use crate::conn::PageTargetHost;++ #[test]+ fn committed_page_session_route_is_stable_across_foreground_selection() {+ let mut connection = CdpConnection::new();+ let mut browser_context = BrowserContext::new("BID-route".to_owned());+ browser_context.set_active_target_id("TID-a");+ browser_context.attach_active_session("SID-a");+ assert!(browser_context.insert_page_target_host(PageTargetHost::empty("TID-b".to_owned())));+ connection.browser_context = Some(browser_context);++ let route = CdpSessionRoute::PageTarget {+ browser_context_id: "BID-route".to_owned(),+ target_id: "TID-a".to_owned(),+ is_attached_session: false,+ };+ connection.target_control.commit_attached_session(+ "SID-a".to_owned(),+ None,+ "TID-a",+ Some(route.clone()),+ false,+ false,+ );++ connection+ .browser_context+ .as_mut()+ .expect("browser context")+ .set_active_target_id("TID-b");++ assert_eq!(connection.session_route(Some("SID-a")), Some(route));+ assert_eq!(+ connection.background_target_route(Some("SID-a")),+ Some(("BID-route".to_owned(), "TID-a".to_owned()))+ );+ }+}diff --git a/moli-protocol/src/conn/target/session.rs b/moli-protocol/src/conn/target/session.rsindex d0bbaa336..81e7fb146 100644--- a/moli-protocol/src/conn/target/session.rs+++ b/moli-protocol/src/conn/target/session.rs@@ -345,11 +345,17 @@ impl TargetSessionRegistry {}}- #[cfg(test)]pub(crate) fn attached_session_route(&self, session_id: &str) -> Option<&CdpSessionRoute> {self.attached_sessions.get(session_id)?.route.as_ref()}+ pub(crate) fn browser_session_count(&self) -> usize {+ self.attached_sessions+ .values()+ .filter(|session| session.route == Some(CdpSessionRoute::Browser))+ .count()+ }+pub(crate) fn attached_sessions_for_target(&self, target_id: &str) -> Vec<String> {sorted_index_values(self.attached_sessions_by_target.get(target_id))}@@ -644,9 +650,10 @@ mod tests {session_id.to_owned(),owner_session_id,target_id,- Some(CdpSessionRoute::ActiveTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),- target_id: Some(target_id.to_owned()),+ target_id: target_id.to_owned(),+ is_attached_session: auto_attached,}),auto_attached,false,@@ -740,9 +747,10 @@ mod tests {"SID-page".to_owned(),Some("SID-tab"),"TID-page",- Some(CdpSessionRoute::ActiveTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),- target_id: Some("TID-page".to_owned()),+ target_id: "TID-page".to_owned(),+ is_attached_session: false,}),true,true,diff --git a/moli-protocol/src/conn/target/session_binding.rs b/moli-protocol/src/conn/target/session_binding.rsindex 68f5e4976..935d8ad63 100644--- a/moli-protocol/src/conn/target/session_binding.rs+++ b/moli-protocol/src/conn/target/session_binding.rs@@ -40,20 +40,23 @@ impl CdpConnection {let Some(session_id) = session_id else {return false;};- self.browser_session_ids.contains(session_id)+ self.target_control.attached_session_route(session_id) == Some(&CdpSessionRoute::Browser)}#[cfg(test)]pub(crate) fn register_browser_session(&mut self, session_id: String) {- self.browser_session_ids.insert(session_id);- }-- pub(crate) fn remove_browser_session(&mut self, session_id: &str) -> bool {- self.browser_session_ids.remove(session_id)+ self.target_control.commit_attached_session(+ session_id,+ None,+ "browser",+ Some(CdpSessionRoute::Browser),+ false,+ false,+ );}fn clear_browser_session_owner_state(&mut self, session_id: &str) -> bool {- if !self.remove_browser_session(session_id) {+ if !self.is_browser_session_id(Some(session_id)) {return false;}self.download_behavior@@ -488,7 +491,6 @@ impl CdpConnection {target_id: &str,target_info: DevToolsTargetInfo,) -> TargetEventPlan {- self.browser_session_ids.insert(session_id.clone());self.target_control.commit_attached_session_event(session_id,owner_session_id,@@ -602,11 +604,14 @@ impl CdpConnection {if let Some(cleanup_plan) = rollback_plan.cleanup_plan() {if matches!(cleanup_plan.action(),- TargetBindingCleanupAction::ActiveTargetPrimaryAutoAttached+ TargetBindingCleanupAction::PageTarget {+ is_attached_session: false,+ ..+ }) {debug_assert!(false,- "active target rollback requires async binding cleanup"+ "primary Page target rollback requires async binding cleanup");} else {self.execute_target_binding_cleanup_without_event_sync(cleanup_plan);@@ -620,14 +625,10 @@ impl CdpConnection {cleanup_plan: &TargetBindingCleanupPlan,) {match cleanup_plan.action() {- TargetBindingCleanupAction::BackgroundTargetPrimaryAutoAttached { .. } => {- if let Some(bc) = self.browser_context.as_mut() {- let _ = bc.clear_background_target_primary_auto_attached_session(- cleanup_plan.session_id(),- );- }- }- TargetBindingCleanupAction::AuxiliaryTarget { .. } => {+ TargetBindingCleanupAction::PageTarget {+ is_attached_session: true,+ ..+ } => {if let Some(bc) = self.browser_context.as_mut() {let _ = bc.remove_auxiliary_session(cleanup_plan.session_id());}@@ -651,7 +652,10 @@ impl CdpConnection {}}TargetBindingCleanupAction::None- | TargetBindingCleanupAction::ActiveTargetPrimaryAutoAttached => {}+ | TargetBindingCleanupAction::PageTarget {+ is_attached_session: false,+ ..+ } => {}}}@@ -702,21 +706,26 @@ impl CdpConnection {).await;match cleanup_plan.action() {- TargetBindingCleanupAction::ActiveTargetPrimaryAutoAttached => {- if let Some(bc) = self.browser_context.as_mut() {- let _ = bc- .clear_active_target_primary_auto_attached_session_async()- .await;- }- }- TargetBindingCleanupAction::BackgroundTargetPrimaryAutoAttached { .. } => {+ TargetBindingCleanupAction::PageTarget {+ target_id,+ is_attached_session: false,+ } => {if let Some(bc) = self.browser_context.as_mut() {- let _ = bc.clear_background_target_primary_auto_attached_session(- cleanup_plan.session_id(),- );+ if bc.is_active_target(target_id) {+ let _ = bc+ .clear_active_target_primary_auto_attached_session_async()+ .await;+ } else {+ let _ = bc.clear_background_target_primary_auto_attached_session(+ cleanup_plan.session_id(),+ );+ }}}- TargetBindingCleanupAction::AuxiliaryTarget { .. } => {+ TargetBindingCleanupAction::PageTarget {+ is_attached_session: true,+ ..+ } => {if let Some(bc) = self.browser_context.as_mut() {let _ = bc.remove_auxiliary_session(cleanup_plan.session_id());}diff --git a/moli-protocol/src/conn/target/transaction.rs b/moli-protocol/src/conn/target/transaction.rsindex 35ff79846..f438d95d4 100644--- a/moli-protocol/src/conn/target/transaction.rs+++ b/moli-protocol/src/conn/target/transaction.rs@@ -318,26 +318,34 @@ impl TargetBindingCleanupPlan {#[derive(Clone, Debug, PartialEq, Eq)]pub(crate) enum TargetBindingCleanupAction {None,- ActiveTargetPrimaryAutoAttached,- BackgroundTargetPrimaryAutoAttached { target_id: String },- AuxiliaryTarget { target_id: String },- TabTarget { tab_target_id: String },- SharedWorkerTarget { target_id: String },- DedicatedWorkerTarget { target_id: String },- ServiceWorkerTarget { target_id: String },+ PageTarget {+ target_id: String,+ is_attached_session: bool,+ },+ TabTarget {+ tab_target_id: String,+ },+ SharedWorkerTarget {+ target_id: String,+ },+ DedicatedWorkerTarget {+ target_id: String,+ },+ ServiceWorkerTarget {+ target_id: String,+ },}impl TargetBindingCleanupAction {fn from_route(route: &CdpSessionRoute) -> Self {match route {- CdpSessionRoute::ActiveTarget { .. } => Self::ActiveTargetPrimaryAutoAttached,- CdpSessionRoute::PageTargetHost { target_id, .. } => {- Self::BackgroundTargetPrimaryAutoAttached {- target_id: target_id.clone(),- }- }- CdpSessionRoute::AuxiliaryTarget { target_id, .. } => Self::AuxiliaryTarget {+ CdpSessionRoute::PageTarget {+ target_id,+ is_attached_session,+ ..+ } => Self::PageTarget {target_id: target_id.clone(),+ is_attached_session: *is_attached_session,},CdpSessionRoute::TabTarget { tab_target_id, .. } => Self::TabTarget {tab_target_id: tab_target_id.clone(),@@ -353,7 +361,7 @@ impl TargetBindingCleanupAction {CdpSessionRoute::ServiceWorkerTarget { target_id, .. } => Self::ServiceWorkerTarget {target_id: target_id.clone(),},- CdpSessionRoute::Browser => Self::None,+ CdpSessionRoute::Browser | CdpSessionRoute::BrowserContext { .. } => Self::None,}}}@@ -560,26 +568,32 @@ mod tests {assert_eq!(TargetBindingCleanupPlan::from_route("SID-active",- &CdpSessionRoute::ActiveTarget {+ &CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),- target_id: Some("TID-active".to_owned()),+ target_id: "TID-active".to_owned(),+ is_attached_session: false,},).action(),- &TargetBindingCleanupAction::ActiveTargetPrimaryAutoAttached,+ &TargetBindingCleanupAction::PageTarget {+ target_id: "TID-active".to_owned(),+ is_attached_session: false,+ },);assert_eq!(TargetBindingCleanupPlan::from_route("SID-bg",- &CdpSessionRoute::PageTargetHost {+ &CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),target_id: "TID-bg".to_owned(),+ is_attached_session: false,},).action(),- &TargetBindingCleanupAction::BackgroundTargetPrimaryAutoAttached {- target_id: "TID-bg".to_owned()+ &TargetBindingCleanupAction::PageTarget {+ target_id: "TID-bg".to_owned(),+ is_attached_session: false,},);diff --git a/moli-protocol/src/conn/tests/mod.rs b/moli-protocol/src/conn/tests/mod.rsindex 7dab427c2..c98409d14 100644--- a/moli-protocol/src/conn/tests/mod.rs+++ b/moli-protocol/src/conn/tests/mod.rs@@ -489,13 +489,15 @@ fn navigation_gate_resolves_websocket_events_to_their_session_target() {#[test]fn none_session_owner_route_override_scope_restores_previous_route_on_drop() {let mut conn = CdpConnection::new();- let previous_route = CdpSessionRoute::ActiveTarget {+ let previous_route = CdpSessionRoute::PageTarget {browser_context_id: "BID-active".to_owned(),- target_id: Some("TID-active".to_owned()),+ target_id: "TID-active".to_owned(),+ is_attached_session: false,};- let scoped_route = CdpSessionRoute::PageTargetHost {+ let scoped_route = CdpSessionRoute::PageTarget {browser_context_id: "BID-background".to_owned(),target_id: "TID-background".to_owned(),+ is_attached_session: false,};conn.replace_none_session_owner_route_override(Some(previous_route.clone()));diff --git a/moli-protocol/src/domains/activity/publication_route.rs b/moli-protocol/src/domains/activity/publication_route.rsindex daa394d57..955e1f6cb 100644--- a/moli-protocol/src/domains/activity/publication_route.rs+++ b/moli-protocol/src/domains/activity/publication_route.rs@@ -53,7 +53,7 @@ pub(crate) enum RendererPublicationProjection {impl RendererPublicationRoute {fn for_target(browser_context_id: String,- target_id: Option<String>,+ target_id: String,session_id: Option<String>,projection: RendererPublicationProjection,) -> Self {@@ -63,15 +63,10 @@ impl RendererPublicationRoute {projection,};}- let owner_route = match target_id {- Some(target_id) => CdpSessionRoute::PageTargetHost {- browser_context_id,- target_id,- },- None => CdpSessionRoute::ActiveTarget {- browser_context_id,- target_id: None,- },+ let owner_route = CdpSessionRoute::PageTarget {+ browser_context_id,+ target_id,+ is_attached_session: false,};Self::UnattachedOwner {owner_route,@@ -129,9 +124,10 @@ impl RendererPublicationOwner {.chain(conn.inactive_browser_contexts.iter()).find(|browser_context| browser_context.id == *browser_context_id)?;Some(RendererPublicationRoute::UnattachedOwner {- owner_route: CdpSessionRoute::ActiveTarget {+ owner_route: CdpSessionRoute::PageTarget {browser_context_id: browser_context.id.clone(),- target_id: None,+ target_id: browser_context.active_target_id()?.to_owned(),+ is_attached_session: false,},projection: RendererPublicationProjection::CurrentPage,})@@ -165,7 +161,7 @@ impl RendererPublicationOwner {};let route_for =|runtime_slot: &crate::conn::TargetRuntimeSlot,- route_target_id: Option<String>,+ route_target_id: String,session_id: Option<String>| {projection_for(runtime_slot).map(|projection| {RendererPublicationRoute::for_target(@@ -190,12 +186,9 @@ impl RendererPublicationOwner {.flatten()});let frozen_route = frozen_target.and_then(|target| {- let route_target_id = (!browser_context- .is_active_target(target.target_id()))- .then(|| target.target_id().to_owned());route_for(target.runtime_slot(),- route_target_id,+ target.target_id().to_owned(),target.session_id().map(str::to_owned),)});@@ -208,12 +201,9 @@ impl RendererPublicationOwner {// attachment id remain stable across that rename, so use// those identities to recover the current concrete route.browser_context.page_targets.iter().find_map(|target| {- let route_target_id = (!browser_context- .is_active_target(target.target_id()))- .then(|| target.target_id().to_owned());route_for(target.runtime_slot(),- route_target_id,+ target.target_id().to_owned(),target.session_id().map(str::to_owned),)})diff --git a/moli-protocol/src/domains/emulation.rs b/moli-protocol/src/domains/emulation.rsindex a96cbdc86..4d06696b8 100644--- a/moli-protocol/src/domains/emulation.rs+++ b/moli-protocol/src/domains/emulation.rs@@ -1932,31 +1932,14 @@ fn start_timezone_update_for_current_route(}fn pending_emulation_target_for_route(- conn: &CdpConnection,+ _conn: &CdpConnection,route: &CdpSessionRoute,) -> Result<PendingEmulationPageTarget, DevToolsError> {match route {- CdpSessionRoute::ActiveTarget {- browser_context_id,- target_id,- } => {- let target_id = target_id- .clone()- .or_else(|| {- conn.browser_context_by_id(browser_context_id)- .and_then(BrowserContext::active_target_id_owned)- })- .ok_or_else(|| {- DevToolsError::new(DevToolsErrorKind::NoSuchTarget, "NoSuchTarget")- })?;- Ok(PendingEmulationPageTarget::BrowserContextTarget {- browser_context_id: browser_context_id.clone(),- target_id,- })- }- CdpSessionRoute::PageTargetHost {+ CdpSessionRoute::PageTarget {browser_context_id,target_id,+ ..} => Ok(PendingEmulationPageTarget::BrowserContextTarget {browser_context_id: browser_context_id.clone(),target_id: target_id.clone(),@@ -2044,16 +2027,11 @@ fn top_level_target_routes_for_browser_contexts({continue;}- if browser_context.active_target_id().is_some() {- routes.push(CdpSessionRoute::ActiveTarget {- browser_context_id: browser_context.id.clone(),- target_id: None,- });- }- routes.extend(browser_context.background_targets().map(|target| {- CdpSessionRoute::PageTargetHost {+ routes.extend(browser_context.page_targets.iter().map(|target| {+ CdpSessionRoute::PageTarget {browser_context_id: browser_context.id.clone(),target_id: target.target_id().to_owned(),+ is_attached_session: false,}}));}diff --git a/moli-protocol/src/domains/fetch.rs b/moli-protocol/src/domains/fetch.rsindex 9af70453d..84ba2c953 100644--- a/moli-protocol/src/domains/fetch.rs+++ b/moli-protocol/src/domains/fetch.rs@@ -236,13 +236,10 @@ impl PendingFetchCommandDispatch {// BrowserContext becomes active before the completion is processed.let session_owner_route =match session_id.and_then(|session_id| conn.session_route(Some(session_id))) {- Some(- route @ (CdpSessionRoute::ActiveTarget { .. }- | CdpSessionRoute::AuxiliaryTarget { .. }- | CdpSessionRoute::PageTargetHost { .. }),- ) => Some(route),+ Some(route @ CdpSessionRoute::PageTarget { .. }) => Some(route),Some(CdpSessionRoute::Browser+ | CdpSessionRoute::BrowserContext { .. }| CdpSessionRoute::TabTarget { .. }| CdpSessionRoute::SharedWorkerTarget { .. }| CdpSessionRoute::DedicatedWorkerTarget { .. }diff --git a/moli-protocol/src/domains/page.rs b/moli-protocol/src/domains/page.rsindex 1cfbb187e..beb87b5ff 100644--- a/moli-protocol/src/domains/page.rs+++ b/moli-protocol/src/domains/page.rs@@ -1395,9 +1395,7 @@ async fn bring_session_route_to_front_async() -> Result<Vec<BackgroundProtocolEvent>, String> {let (browser_context_id, target_id) = match route {CdpSessionRoute::Browser => return Ok(Vec::new()),- CdpSessionRoute::ActiveTarget {- browser_context_id, ..- } => {+ CdpSessionRoute::BrowserContext { browser_context_id } => {if !conn.activate_browser_context_by_id_async(&browser_context_id).await@@ -1406,13 +1404,10 @@ async fn bring_session_route_to_front_async(}return Ok(Vec::new());}- CdpSessionRoute::AuxiliaryTarget {- browser_context_id,- target_id,- }- | CdpSessionRoute::PageTargetHost {+ CdpSessionRoute::PageTarget {browser_context_id,target_id,+ ..} => (browser_context_id, target_id),CdpSessionRoute::TabTarget { .. }| CdpSessionRoute::SharedWorkerTarget { .. }diff --git a/moli-protocol/src/domains/page/preload.rs b/moli-protocol/src/domains/page/preload.rsindex b4df9a416..4551ef35c 100644--- a/moli-protocol/src/domains/page/preload.rs+++ b/moli-protocol/src/domains/page/preload.rs@@ -461,15 +461,17 @@ async fn execute_devtools_browser_context_add_preload_script_command(.record_default_document_start_script_with_identifier(identifier.clone(), &script);}for browser_context_id in &browser_context_ids {- let has_active_target = conn+ let active_target_id = conn.browser_context_by_id(browser_context_id)- .is_some_and(|browser_context| browser_context.active_target_id().is_some());- if !has_active_target {+ .and_then(BrowserContext::active_target_id)+ .map(str::to_owned);+ let Some(active_target_id) = active_target_id else {continue;- }- let route = CdpSessionRoute::ActiveTarget {+ };+ let route = CdpSessionRoute::PageTarget {browser_context_id: browser_context_id.clone(),- target_id: None,+ target_id: active_target_id,+ is_attached_session: false,};let mut route_scope = conn.scoped_none_session_owner_route_override(route);append_loaded_page_document_start_script_for_session_async(@@ -670,15 +672,17 @@ async fn execute_devtools_bidi_browser_context_remove_preload_script_command(}}for (browser_context_id, registry_key) in &removed_contexts {- let has_active_target = conn+ let active_target_id = conn.browser_context_by_id(browser_context_id)- .is_some_and(|browser_context| browser_context.active_target_id().is_some());- if !has_active_target {+ .and_then(BrowserContext::active_target_id)+ .map(str::to_owned);+ let Some(active_target_id) = active_target_id else {continue;- }- let route = CdpSessionRoute::ActiveTarget {+ };+ let route = CdpSessionRoute::PageTarget {browser_context_id: browser_context_id.clone(),- target_id: None,+ target_id: active_target_id,+ is_attached_session: false,};let mut route_scope = conn.scoped_none_session_owner_route_override(route);remove_loaded_page_document_start_script_for_session_async(@@ -887,9 +891,8 @@ fn default_add_preload_command_route(.browser_context.as_ref().ok_or_else(|| DevToolsError::new(DevToolsErrorKind::NoSuchTarget, "NoSuchTarget"))?;- Ok(CdpSessionRoute::ActiveTarget {+ Ok(CdpSessionRoute::BrowserContext {browser_context_id: browser_context.id.clone(),- target_id: None,})}@@ -947,9 +950,8 @@ fn find_default_preload_script_route() -> Option<CdpSessionRoute> {conn.browser_contexts().find(|browser_context| browser_context.has_default_document_start_script(script_id))- .map(|browser_context| CdpSessionRoute::ActiveTarget {+ .map(|browser_context| CdpSessionRoute::BrowserContext {browser_context_id: browser_context.id.clone(),- target_id: None,})}diff --git a/moli-protocol/src/domains/runtime/dispatcher.rs b/moli-protocol/src/domains/runtime/dispatcher.rsindex 439b05353..d398450cd 100644--- a/moli-protocol/src/domains/runtime/dispatcher.rs+++ b/moli-protocol/src/domains/runtime/dispatcher.rs@@ -11337,9 +11337,10 @@ mod protocol_neutral_tests {let previous_route = Some(CdpSessionRoute::Browser);conn.replace_none_session_owner_route_override(previous_route.clone());- let target_route = CdpSessionRoute::ActiveTarget {+ let target_route = CdpSessionRoute::PageTarget {browser_context_id: "BID-active".to_owned(),- target_id: Some("TID-active".to_owned()),+ target_id: "TID-active".to_owned(),+ is_attached_session: false,};{let mut scope = RuntimeProbeCompletionScope::enter(&mut conn, target_route.clone());@@ -11358,9 +11359,10 @@ mod protocol_neutral_tests {let previous_route = Some(CdpSessionRoute::Browser);conn.replace_none_session_owner_route_override(previous_route.clone());- let target_route = CdpSessionRoute::ActiveTarget {+ let target_route = CdpSessionRoute::PageTarget {browser_context_id: "BID-active".to_owned(),- target_id: Some("TID-active".to_owned()),+ target_id: "TID-active".to_owned(),+ is_attached_session: false,};{let mut scope = conn.scoped_none_session_owner_route_override(target_route.clone());diff --git a/moli-protocol/src/domains/runtime/tests/shared_worker.rs b/moli-protocol/src/domains/runtime/tests/shared_worker.rsindex 297541eba..56f23ff8d 100644--- a/moli-protocol/src/domains/runtime/tests/shared_worker.rs+++ b/moli-protocol/src/domains/runtime/tests/shared_worker.rs@@ -3640,9 +3640,10 @@ async fn shared_worker_discard_console_entries_is_target_local() {);assert_eq!(ctx.conn.session_route(Some("SID-page")),- Some(crate::conn::CdpSessionRoute::ActiveTarget {+ Some(crate::conn::CdpSessionRoute::PageTarget {browser_context_id: "BID-shared".to_owned(),- target_id: Some("TID-page".to_owned())+ target_id: "TID-page".to_owned(),+ is_attached_session: false,}),"shared worker Runtime.discardConsoleEntries must not consume or rewrite the page session route");diff --git a/moli-protocol/src/domains/runtime_context_events.rs b/moli-protocol/src/domains/runtime_context_events.rsindex 65207db2a..59f49d82d 100644--- a/moli-protocol/src/domains/runtime_context_events.rs+++ b/moli-protocol/src/domains/runtime_context_events.rs@@ -276,10 +276,9 @@ fn qualify_worker_runtime_context_event_for_session_owner(}}CdpSessionRoute::Browser+ | CdpSessionRoute::BrowserContext { .. }| CdpSessionRoute::TabTarget { .. }- | CdpSessionRoute::ActiveTarget { .. }- | CdpSessionRoute::AuxiliaryTarget { .. }- | CdpSessionRoute::PageTargetHost { .. } => {}+ | CdpSessionRoute::PageTarget { .. } => {}}}diff --git a/moli-protocol/src/domains/storage/ops.rs b/moli-protocol/src/domains/storage/ops.rsindex 520b2173e..caf808e6a 100644--- a/moli-protocol/src/domains/storage/ops.rs+++ b/moli-protocol/src/domains/storage/ops.rs@@ -710,15 +710,12 @@ fn effective_storage_browser_context_id(}if let Some(session_id) = session_id {return match conn.session_route(Some(session_id)) {- Some(crate::conn::CdpSessionRoute::ActiveTarget {+ Some(crate::conn::CdpSessionRoute::PageTarget {browser_context_id, ..})- | Some(crate::conn::CdpSessionRoute::AuxiliaryTarget {- browser_context_id, ..- })- | Some(crate::conn::CdpSessionRoute::PageTargetHost {- browser_context_id, ..- }) => Ok(browser_context_id),+ | Some(crate::conn::CdpSessionRoute::BrowserContext { browser_context_id }) => {+ Ok(browser_context_id)+ }Some(crate::conn::CdpSessionRoute::Browser) => conn.browser_context.as_ref()diff --git a/moli-protocol/src/domains/target/attachment.rs b/moli-protocol/src/domains/target/attachment.rsindex c4c7169c9..245c96bf1 100644--- a/moli-protocol/src/domains/target/attachment.rs+++ b/moli-protocol/src/domains/target/attachment.rs@@ -1064,11 +1064,10 @@ async fn detach_from_target_inner_async(fn detach_session_route_target_id(route: &crate::conn::CdpSessionRoute) -> Option<&str> {match route {- crate::conn::CdpSessionRoute::Browser => None,+ crate::conn::CdpSessionRoute::Browser+ | crate::conn::CdpSessionRoute::BrowserContext { .. } => None,crate::conn::CdpSessionRoute::TabTarget { tab_target_id, .. } => Some(tab_target_id),- crate::conn::CdpSessionRoute::ActiveTarget { target_id, .. } => target_id.as_deref(),- crate::conn::CdpSessionRoute::AuxiliaryTarget { target_id, .. }- | crate::conn::CdpSessionRoute::PageTargetHost { target_id, .. }+ crate::conn::CdpSessionRoute::PageTarget { target_id, .. }| crate::conn::CdpSessionRoute::SharedWorkerTarget { target_id, .. }| crate::conn::CdpSessionRoute::DedicatedWorkerTarget { target_id, .. }| crate::conn::CdpSessionRoute::ServiceWorkerTarget { target_id, .. } => Some(target_id),diff --git a/moli-protocol/src/domains/target/auto_attach.rs b/moli-protocol/src/domains/target/auto_attach.rsindex ce08ade63..1bb6967d0 100644--- a/moli-protocol/src/domains/target/auto_attach.rs+++ b/moli-protocol/src/domains/target/auto_attach.rs@@ -178,21 +178,7 @@ fn owner_already_auto_attached_to_page_target(conn.auto_attached_sessions_for_owner(owner_session_id).into_iter().any(|session_id| match conn.session_route(Some(&session_id)) {- Some(crate::conn::CdpSessionRoute::ActiveTarget {- browser_context_id,- target_id: route_target_id,- }) => {- route_target_id.as_deref() == Some(target_id)- || conn- .browser_context_by_id(&browser_context_id)- .and_then(BrowserContext::active_target_id)- == Some(target_id)- }- Some(crate::conn::CdpSessionRoute::PageTargetHost {- target_id: route_target_id,- ..- })- | Some(crate::conn::CdpSessionRoute::AuxiliaryTarget {+ Some(crate::conn::CdpSessionRoute::PageTarget {target_id: route_target_id,..}) => route_target_id == target_id,@@ -265,21 +251,7 @@ fn page_session_route_matches_target(target_id: &str,) -> bool {match conn.session_route(Some(session_id)) {- Some(crate::conn::CdpSessionRoute::ActiveTarget {- browser_context_id,- target_id: route_target_id,- }) => {- route_target_id.as_deref() == Some(target_id)- || conn- .browser_context_by_id(&browser_context_id)- .and_then(BrowserContext::active_target_id)- == Some(target_id)- }- Some(crate::conn::CdpSessionRoute::PageTargetHost {- target_id: route_target_id,- ..- })- | Some(crate::conn::CdpSessionRoute::AuxiliaryTarget {+ Some(crate::conn::CdpSessionRoute::PageTarget {target_id: route_target_id,..}) => route_target_id == target_id,@@ -1063,12 +1035,10 @@ pub(super) async fn release_attached_sessions_for_root_frontend_async(let detach_plan = conn.auto_attached_session_detach_plan(&session_id);let preserves_other_frontends = matches!(detach_plan.cleanup_plan().map(|plan| plan.action()),- Some(- crate::conn::TargetBindingCleanupAction::ActiveTargetPrimaryAutoAttached- | crate::conn::TargetBindingCleanupAction::BackgroundTargetPrimaryAutoAttached {- ..- }- )+ Some(crate::conn::TargetBindingCleanupAction::PageTarget {+ is_attached_session: false,+ ..+ }));if !preserves_other_frontends {detach_attached_session_for_owner_async(conn, out, &session_id, command_context).await;@@ -1139,19 +1109,10 @@ async fn detach_attached_session_for_owner_async(return;};match cleanup_plan.action().clone() {- crate::conn::TargetBindingCleanupAction::ActiveTargetPrimaryAutoAttached => {- let target_id = conn- .browser_context- .as_ref()- .and_then(BrowserContext::active_target_identity)- .and_then(|(target_id, current_session_id)| {- (current_session_id.as_deref() == Some(session_id))- .then(|| target_id.to_owned())- });- let Some(target_id) = target_id else {- conn.rollback_auto_attached_session_detach_plan_without_event(&detach_plan);- return;- };+ crate::conn::TargetBindingCleanupAction::PageTarget {+ target_id,+ is_attached_session,+ } => {// A parent-session detach cascade bypasses the direct// Target.detachFromTarget path. Release the renderer inspector// here before resetting protocol state so the replacement primary@@ -1165,61 +1126,29 @@ async fn detach_attached_session_for_owner_async(let _ = conn.detach_runtime_inspector_session_for_session_owner_async(Some(session_id)).await;- events::fail_pending_fetch_state_for_target_background_events_async(- conn,- out.background_events_mut(),- Some(session_id),- "Target detached",- )- .await;- let event_plan = conn- .detach_session_with_binding_cleanup_event_plan_async(- crate::conn::TargetSessionDetachCleanupPlan::new(- target_id, session_id, None, None,- ),+ if is_attached_session {+ clear_detached_session_target_overrides_best_effort(conn, session_id).await;+ super::clear_detached_target_fetch_state_background_events_async(+ conn,+ out.background_events_mut(),+ session_id,).await;- out.extend_background_events(event_plan);- }- crate::conn::TargetBindingCleanupAction::AuxiliaryTarget { target_id } => {- conn.fail_pending_inspector_awaits_for_session_owner_background_events_into(- out.background_events_mut(),- command_context.protocol_events_mut(),- Some(session_id),- "Target detached",- );- let _ = conn- .detach_runtime_inspector_session_for_session_owner_async(Some(session_id))- .await;- clear_detached_session_target_overrides_best_effort(conn, session_id).await;- super::clear_detached_target_fetch_state_background_events_async(- conn,- out.background_events_mut(),- session_id,- )- .await;- let event_plan = conn- .detach_session_with_binding_cleanup_event_plan_async(- crate::conn::TargetSessionDetachCleanupPlan::new(- target_id, session_id, None, None,- ),+ } else if conn+ .browser_context+ .as_ref()+ .is_some_and(|browser_context| browser_context.is_active_target(&target_id))+ {+ events::fail_pending_fetch_state_for_target_background_events_async(+ conn,+ out.background_events_mut(),+ Some(session_id),+ "Target detached",).await;- out.extend_background_events(event_plan);- }- crate::conn::TargetBindingCleanupAction::BackgroundTargetPrimaryAutoAttached {- target_id,- } => {- conn.fail_pending_inspector_awaits_for_session_owner_background_events_into(- out.background_events_mut(),- command_context.protocol_events_mut(),- Some(session_id),- "Target detached",- );- let _ = conn- .detach_runtime_inspector_session_for_session_owner_async(Some(session_id))- .await;- clear_detached_session_target_overrides_best_effort(conn, session_id).await;+ } else {+ clear_detached_session_target_overrides_best_effort(conn, session_id).await;+ }let event_plan = conn.detach_session_with_binding_cleanup_event_plan_async(crate::conn::TargetSessionDetachCleanupPlan::new(diff --git a/moli-protocol/src/domains/target/popup.rs b/moli-protocol/src/domains/target/popup.rsindex e408f4a30..dcb2da0fc 100644--- a/moli-protocol/src/domains/target/popup.rs+++ b/moli-protocol/src/domains/target/popup.rs@@ -474,12 +474,7 @@ pub(crate) fn schedule_initial_document_target_url_navigation_after_debugger_barlet Some(route) = conn.target_session_route_for_target_id(target_id) else {return false;};- if !matches!(- &route,- crate::conn::CdpSessionRoute::ActiveTarget { .. }- | crate::conn::CdpSessionRoute::AuxiliaryTarget { .. }- | crate::conn::CdpSessionRoute::PageTargetHost { .. }- ) {+ if !matches!(&route, crate::conn::CdpSessionRoute::PageTarget { .. }) {return false;}let Some(browser_context_id) = route.browser_context_id().map(str::to_owned) else {diff --git a/moli-protocol/src/domains/target/tests/tests_target_attachment.rs b/moli-protocol/src/domains/target/tests/tests_target_attachment.rsindex 4d1622dc5..bb3bae6f1 100644--- a/moli-protocol/src/domains/target/tests/tests_target_attachment.rs+++ b/moli-protocol/src/domains/target/tests/tests_target_attachment.rs@@ -1018,7 +1018,10 @@ async fn detach_browser_target_session_cascades_owned_target_sessions() {ctx.expect_event("Target.attachedToTarget", None);assert!(matches!(ctx.conn.session_route(Some(&page_session_id)),- Some(CdpSessionRoute::AuxiliaryTarget { .. })+ Some(CdpSessionRoute::PageTarget {+ is_attached_session: true,+ ..+ })));ctx.process_async(json!({@@ -1165,7 +1168,10 @@ async fn root_frontend_release_preserves_private_browser_owned_page_session() {);assert!(matches!(ctx.conn.session_route(Some(&private_page_session_id)),- Some(CdpSessionRoute::AuxiliaryTarget { .. })+ Some(CdpSessionRoute::PageTarget {+ is_attached_session: true,+ ..+ })));assert!(ctx.conn.target_discovery_filter_for_owner(None).is_none());assert!(@@ -1298,23 +1304,26 @@ async fn session_route_finds_browser_active_auxiliary_background_and_inactive_se);assert_eq!(ctx.conn.session_route(Some("SID-active")),- Some(CdpSessionRoute::ActiveTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: "BID-A".to_owned(),- target_id: Some("TID-000000000A".to_owned()),+ target_id: "TID-000000000A".to_owned(),+ is_attached_session: false,}));assert_eq!(ctx.conn.session_route(Some("SID-auxiliary")),- Some(CdpSessionRoute::AuxiliaryTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: "BID-A".to_owned(),target_id: "TID-000000000A".to_owned(),+ is_attached_session: true,}));assert_eq!(ctx.conn.session_route(Some("SID-background")),- Some(CdpSessionRoute::PageTargetHost {+ Some(CdpSessionRoute::PageTarget {browser_context_id: "BID-A".to_owned(),target_id: "TID-000000000B".to_owned(),+ is_attached_session: false,}));assert_eq!(@@ -1326,9 +1335,10 @@ async fn session_route_finds_browser_active_auxiliary_background_and_inactive_se);assert_eq!(ctx.conn.session_route(Some("SID-inactive")),- Some(CdpSessionRoute::ActiveTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: "BID-B".to_owned(),- target_id: Some("TID-000000000C".to_owned()),+ target_id: "TID-000000000C".to_owned(),+ is_attached_session: false,}));assert_eq!(ctx.conn.session_route(Some("SID-missing")), None);@@ -1348,9 +1358,10 @@ async fn session_route_finds_browser_active_auxiliary_background_and_inactive_se);assert_eq!(ctx.conn.session_route(Some("SID-inactive-aux-background")),- Some(CdpSessionRoute::AuxiliaryTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: "BID-B".to_owned(),target_id: "TID-000000000D".to_owned(),+ is_attached_session: true,}));assert_eq!(@@ -2838,8 +2849,9 @@ async fn set_auto_attach_true_attaches_existing_page_target_for_each_owner() {assert_ne!(owner_page_session_id, browser_session_id);assert!(matches!(ctx.conn.session_route(Some(&owner_page_session_id)),- Some(CdpSessionRoute::AuxiliaryTarget {+ Some(CdpSessionRoute::PageTarget {target_id,+ is_attached_session: true,..}) if target_id == "TID-page"));diff --git a/moli-protocol/src/domains/target/tests/tests_target_creation.rs b/moli-protocol/src/domains/target/tests/tests_target_creation.rsindex 488b7c96f..d2a496a2e 100644--- a/moli-protocol/src/domains/target/tests/tests_target_creation.rs+++ b/moli-protocol/src/domains/target/tests/tests_target_creation.rs@@ -2852,7 +2852,7 @@ async fn tab_session_auto_attach_catchall_attaches_child_page() {.expect("page session id");assert!(matches!(ctx.conn.session_route(Some(page_session_id)),- Some(crate::conn::CdpSessionRoute::ActiveTarget { .. })+ Some(crate::conn::CdpSessionRoute::PageTarget { .. })));}diff --git a/moli-protocol/src/domains/target/worker_target.rs b/moli-protocol/src/domains/target/worker_target.rsindex cd06fac0d..f2764cf79 100644--- a/moli-protocol/src/domains/target/worker_target.rs+++ b/moli-protocol/src/domains/target/worker_target.rs@@ -6856,9 +6856,10 @@ mod tests {assert_eq!(conn.session_route(Some(&attached_session_id)), None);assert_eq!(conn.session_route(Some("SID-page")),- Some(crate::conn::CdpSessionRoute::ActiveTarget {+ Some(crate::conn::CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),- target_id: Some("TID-page".to_owned())+ target_id: "TID-page".to_owned(),+ is_attached_session: false,}),"dropping late shared worker output must not disturb or reuse the active page session");diff --git a/moli-protocol/src/domains/tracing/tests.rs b/moli-protocol/src/domains/tracing/tests.rsindex de7e02957..370ac564f 100644--- a/moli-protocol/src/domains/tracing/tests.rs+++ b/moli-protocol/src/domains/tracing/tests.rs@@ -698,9 +698,10 @@ fn tracing_owner_scope_distinguishes_flattened_sessions() {let ctx = context_with_page_sessions();assert_eq!(ctx.conn.session_route(Some("SID-peer")),- Some(CdpSessionRoute::AuxiliaryTarget {+ Some(CdpSessionRoute::PageTarget {browser_context_id: "BID-tracing".to_owned(),target_id: "TID-tracing".to_owned(),+ is_attached_session: true,}));assert_ne!(