Exchange a view or ViewContext for a scope, never a raw window id

Author: warp-agent-staging[bot]

app/src/settings_view/warp_agent_page.rs

@@ -5543,7 +5543,7 @@ impl AwsBedrockWidget {
         let user_workspaces = UserWorkspaces::as_ref(ctx);
         AISettings::as_ref(ctx).is_any_ai_enabled(ctx)
             && user_workspaces.is_aws_bedrock_credentials_enabled(
-                &user_workspaces.team_context_for_window(ctx.window_id()),
+                &user_workspaces.team_context_for_view(ctx),
                 ctx,
             )
     }
@@ -6029,7 +6029,7 @@ impl GeminiEnterpriseWidget {
     fn is_refresh_enabled_during_construction(ctx: &ViewContext<WarpAgentPageView>) -> bool {
         let user_workspaces = UserWorkspaces::as_ref(ctx);
         let are_credentials_enabled = user_workspaces.is_gemini_enterprise_credentials_enabled(
-            &user_workspaces.team_context_for_window(ctx.window_id()),
+            &user_workspaces.team_context_for_view(ctx),
             ctx,
         );
         Self::is_refresh_enabled_for_credentials(are_credentials_enabled, ctx)

app/src/workspaces/user_workspaces.rs

@@ -495,21 +495,27 @@ impl UserWorkspaces {
         view: &WeakViewHandle<T>,
         app: &AppContext,
     ) -> Option<TeamContext<'a>> {
-        Some(self.team_context_for_window(view.window_id(app)?))
+        Some(self.team_context_for_window_id(view.window_id(app)?))
     }
 
-    /// [`Self::team_context`] for a caller that holds a [`WindowId`] rather than a view handle:
-    /// a model owned by a window's view tree, or a view still inside its own constructor.
+    /// [`Self::team_context`] for a view still inside its own constructor.
     ///
-    /// Same borrow discipline, so a caller still re-resolves on every read and follows the
-    /// window. Unlike [`Self::team_context`] it cannot fail: a `WindowId` names a window
-    /// whether or not this model has a team assignment for it, and a window with no team
-    /// selected yields a scope whose `team_uid()` is `None`.
+    /// A view is not in `view_to_window` until its build closure returns, so its own
+    /// [`WeakViewHandle`] resolves no window yet and [`Self::team_context`] would report no
+    /// scope. A `ViewContext` already names the window, and it is the same one the handle
+    /// resolves to from the first render onward, so this cannot fail. Prefer
+    /// [`Self::team_context`] everywhere else: a handle keeps following the view if it later
+    /// moves between windows.
+    pub(crate) fn team_context_for_view<T: Entity>(&self, ctx: &ViewContext<T>) -> TeamContext<'_> {
+        self.team_context_for_window_id(ctx.window_id())
+    }
+
+    /// The resolution both scope accessors above share.
     ///
-    /// A stored `WindowId` is weaker evidence than a live [`ViewContext`]: dragging a tab
-    /// between windows re-parents the pane and the models it owns, so whoever stores one owes
-    /// it an update on re-parent.
-    pub(crate) fn team_context_for_window(&self, window_id: WindowId) -> TeamContext<'_> {
+    /// Deliberately private. The exchange for a scope is a view or a [`ViewContext`], never a
+    /// raw id, so that no caller is offered a `WindowId`-shaped hole to carry one around in
+    /// place of the view it came from.
+    fn team_context_for_window_id(&self, window_id: WindowId) -> TeamContext<'_> {
         TeamContext {
             team_uid: self
                 .team_uid_for_window(window_id)

app/src/workspaces/user_workspaces_tests.rs

@@ -1362,7 +1362,7 @@ impl ConstructionTimeScopeProbe {
         let user_workspaces = UserWorkspaces::as_ref(ctx);
         Self {
             bedrock_enabled_from_view_context: user_workspaces.is_aws_bedrock_credentials_enabled(
-                &user_workspaces.team_context_for_window(ctx.window_id()),
+                &user_workspaces.team_context_for_view(ctx),
                 ctx,
             ),
             team_uid_from_own_handle: user_workspaces