[REV-2383] Scope oz run list by team

app/src/ai/agent_conversations_model.rs

@@ -920,6 +920,9 @@ impl AgentConversationsModel {
                                 updated_after: Some(updated_after),
                                 ..Default::default()
                             },
+                            // TODO: Multi-team UI needs a team component in the cache or equivalent
+                            // scope-aware filtering before this request can supply team scope.
+                            None,
                         )
                         .await
                 }
@@ -992,6 +995,9 @@ impl AgentConversationsModel {
                             creator_uid: Some(creator_uid),
                             ..Default::default()
                         },
+                        // TODO: Multi-team UI needs a team component in the cache or equivalent
+                        // scope-aware filtering before this request can supply team scope.
+                        None,
                     );
                     let conversation_metadata_future =
                         ai_client.list_ai_conversation_metadata(None);
@@ -1221,7 +1227,13 @@ impl AgentConversationsModel {
                 let ai_client = ai_client.clone();
                 async move {
                     ai_client
-                        .list_ambient_agent_tasks(100, TaskListFilter::default())
+                        .list_ambient_agent_tasks(
+                            100,
+                            TaskListFilter::default(),
+                            // TODO: Multi-team UI needs a team component in the cache or equivalent
+                            // scope-aware filtering before this request can supply team scope.
+                            None,
+                        )
                         .await
                 }
             },
@@ -2035,7 +2047,13 @@ impl AgentConversationsModel {
                 let task_filter = task_filter.clone();
                 async move {
                     ai_client
-                        .list_ambient_agent_tasks(INITIAL_TASK_AMOUNT, task_filter)
+                        .list_ambient_agent_tasks(
+                            INITIAL_TASK_AMOUNT,
+                            task_filter,
+                            // TODO: Multi-team UI needs a team component in the cache or equivalent
+                            // scope-aware filtering before this request can supply team scope.
+                            None,
+                        )
                         .await
                 }
             },

app/src/ai/agent_sdk/ambient.rs

@@ -46,6 +46,7 @@ use crate::server::server_api::ai::{
     ListAgentMessagesRequest, ReadAgentMessageResponse, RunSortBy, RunSortOrder,
     SendAgentMessageRequest, SendAgentMessageResponse, SpawnAgentRequest, TaskListFilter,
 };
+use crate::server::team_scope::RequestTeamScope;
 use crate::terminal::shared_session;
 use crate::util::time_format::format_approx_duration_from_now_utc;
 use crate::workspaces::user_workspaces::UserWorkspaces;
@@ -78,7 +79,14 @@ pub fn list_ambient_agent_tasks(
     let json_output = args.json_output.clone();
     let output_format = global_options.output_format;
     runner.update(ctx, |runner, ctx| {
-        runner.list_tasks(args.limit, filter, output_format, json_output, ctx)
+        runner.list_tasks(
+            args.team_selection,
+            args.limit,
+            filter,
+            output_format,
+            json_output,
+            ctx,
+        )
     })
 }
 
@@ -195,6 +203,39 @@ fn sort_order_from_arg(arg: SortOrderArg) -> RunSortOrder {
     }
 }
 
+fn request_team_scope_for_cli(
+    team_selection: &warp_cli::scope::TeamSelection,
+    ctx: &AppContext,
+) -> anyhow::Result<RequestTeamScope> {
+    let cli_scope = UserWorkspaces::as_ref(ctx).team_scope_for_cli(team_selection)?;
+    Ok(RequestTeamScope::from_scope(&cli_scope))
+}
+
+enum ListTasksOutput {
+    Raw(serde_json::Value),
+    Tasks(Vec<AmbientAgentTask>),
+}
+
+async fn load_tasks_for_output(
+    ai_client: &dyn AIClient,
+    limit: i32,
+    filter: TaskListFilter,
+    request_team_scope: RequestTeamScope,
+    output_format: OutputFormat,
+    json_output: &JsonOutput,
+) -> anyhow::Result<ListTasksOutput> {
+    if matches!(output_format, OutputFormat::Json) || json_output.force_json_output() {
+        let response = ai_client
+            .list_agent_runs_raw(limit, filter, Some(request_team_scope))
+            .await?;
+        Ok(ListTasksOutput::Raw(response))
+    } else {
+        let tasks = ai_client
+            .list_ambient_agent_tasks(limit, filter, Some(request_team_scope))
+            .await?;
+        Ok(ListTasksOutput::Tasks(tasks))
+    }
+}
 /// Run a message-related CLI command.
 pub fn run_message(
     ctx: &mut AppContext,
@@ -640,30 +681,56 @@ impl AmbientAgentRunner {
 
     fn list_tasks(
         &self,
+        team_selection: warp_cli::scope::TeamSelection,
         limit: i32,
         filter: TaskListFilter,
         output_format: OutputFormat,
         json_output: JsonOutput,
         ctx: &mut ModelContext<Self>,
     ) -> anyhow::Result<()> {
-        let ai_client = ServerApiProvider::as_ref(ctx).get_ai_client();
-
-        let list_future = async move {
-            if matches!(output_format, OutputFormat::Json) || json_output.force_json_output() {
-                let response = ai_client.list_agent_runs_raw(limit, filter).await?;
-                super::output::print_raw_json(response, &json_output)?;
-            } else if matches!(output_format, OutputFormat::Ndjson) {
-                let tasks = ai_client.list_ambient_agent_tasks(limit, filter).await?;
-                for task in tasks {
-                    super::output::write_json_line(&task, std::io::stdout())?;
-                }
-            } else {
-                let tasks = ai_client.list_ambient_agent_tasks(limit, filter).await?;
-                Self::print_tasks_table(&tasks);
+        let refresh_future = super::common::refresh_workspace_metadata(ctx);
+        ctx.spawn(refresh_future, move |runner, refresh_result, ctx| {
+            if let Err(err) = refresh_result {
+                super::report_fatal_error(err, ctx);
+                return;
             }
-            Ok(())
-        };
-        self.spawn_command(list_future, ctx);
+            let request_team_scope = match request_team_scope_for_cli(&team_selection, ctx) {
+                Ok(scope) => scope,
+                Err(err) => {
+                    super::report_fatal_error(err, ctx);
+                    return;
+                }
+            };
+            let ai_client = ServerApiProvider::as_ref(ctx).get_ai_client();
+            let list_future = async move {
+                match load_tasks_for_output(
+                    ai_client.as_ref(),
+                    limit,
+                    filter,
+                    request_team_scope,
+                    output_format,
+                    &json_output,
+                )
+                .await?
+                {
+                    ListTasksOutput::Raw(response) => {
+                        super::output::print_raw_json(response, &json_output)?;
+                    }
+                    ListTasksOutput::Tasks(tasks)
+                        if matches!(output_format, OutputFormat::Ndjson) =>
+                    {
+                        for task in tasks {
+                            super::output::write_json_line(&task, std::io::stdout())?;
+                        }
+                    }
+                    ListTasksOutput::Tasks(tasks) => {
+                        Self::print_tasks_table(&tasks);
+                    }
+                }
+                Ok(())
+            };
+            runner.spawn_command(list_future, ctx);
+        });
 
         Ok(())
     }