Add agent CLI flag for cloud runs

app/src/ai/agent_sdk/ambient.rs

@@ -483,6 +483,7 @@ impl AmbientAgentRunner {
                     (_, true) => Some(false),
                     _ => None,
                 },
+                agent_identity_uid: args.agent_uid,
                 skill,
                 attachments,
                 interactive: None,

app/src/ai/agent_sdk/mcp_config_tests.rs

@@ -278,6 +278,7 @@ fn serializes_mcp_servers_as_object_not_string() {
         }),
         title: None,
         team: None,
+        agent_identity_uid: None,
         skill: None,
         attachments: vec![],
         interactive: None,

app/src/ai/ambient_agents/spawn_tests.rs

@@ -335,6 +335,7 @@ async fn poll_stops_on_terminal_failure_like_state() {
         config: None,
         title: None,
         team: None,
+        agent_identity_uid: None,
         skill: None,
         attachments: vec![],
         interactive: None,
@@ -451,6 +452,7 @@ async fn poll_for_session_join_info_waits_until_link_is_available() {
         config: None,
         title: None,
         team: None,
+        agent_identity_uid: None,
         skill: None,
         attachments: vec![],
         interactive: None,

app/src/pane_group/pane/terminal_pane.rs

@@ -1391,6 +1391,7 @@ fn handle_terminal_view_event(
                                 }),
                                 title: (!title.is_empty()).then_some(title),
                                 team: None,
+                                agent_identity_uid: None,
                                 skill: None,
                                 attachments: vec![],
                                 interactive: Some(true),

app/src/server/server_api/ai.rs

@@ -207,6 +207,12 @@ pub struct SpawnAgentRequest {
     pub title: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub team: Option<bool>,
+    /// Agent identity UID to use as the execution principal for the run.
+    #[serde(
+        rename = "agent_identity_uid",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub agent_identity_uid: Option<String>,
     /// Use a Claude-compatible skill as the base prompt.
     /// Format: "repo:skill_name" or just "skill_name".
     /// The skill is resolved at runtime in the agent environment.

app/src/server/server_api/ai_test.rs

@@ -8,7 +8,7 @@ use super::{
     build_list_agent_runs_url, build_run_followup_url, AgentMessageHeader, AgentRunEvent,
     AgentSource, AmbientAgentTaskState, Artifact, ArtifactDownloadResponse, ArtifactType,
     ExecutionLocation, ListRunsResponse, ReadAgentMessageResponse, RunFollowupRequest, RunSortBy,
-    RunSortOrder, TaskListFilter,
+    RunSortOrder, SpawnAgentRequest, TaskListFilter, UserQueryMode,
 };
 use crate::notebooks::NotebookId;
 
@@ -33,6 +33,32 @@ fn ambient_agent_headers_for_task_overrides_existing_cloud_agent_header() {
     );
 }
 
+#[test]
+fn spawn_agent_request_serializes_agent_uid_as_agent_identity_uid() {
+    let request = SpawnAgentRequest {
+        prompt: "hello".to_string(),
+        mode: UserQueryMode::Normal,
+        config: None,
+        title: None,
+        team: None,
+        agent_identity_uid: Some("agent_123".to_string()),
+        skill: None,
+        attachments: vec![],
+        interactive: None,
+        parent_run_id: None,
+        runtime_skills: vec![],
+        referenced_attachments: vec![],
+    };
+
+    let value = serde_json::to_value(&request).unwrap();
+
+    assert_eq!(
+        value.get("agent_identity_uid").and_then(|v| v.as_str()),
+        Some("agent_123")
+    );
+    assert!(value.get("agent_uid").is_none());
+}
+
 #[test]
 fn test_deserialize_file_artifact_download_response() {
     let json = r#"{

app/src/terminal/view/ambient_agent/model.rs

@@ -576,6 +576,7 @@ impl AmbientAgentViewModel {
             config,
             title: None,
             team: None,
+            agent_identity_uid: None,
             skill: None,
             attachments,
             interactive: None,

crates/warp_cli/src/agent.rs

@@ -436,6 +436,14 @@ pub struct RunCloudArgs {
     #[command(flatten)]
     pub scope: ObjectScope,
 
+    /// UID of the agent to execute this run as.
+    ///
+    /// This will apply the agent's configuration, such
+    /// as its skills and base model, and attribute
+    /// credit usage back to the agent.
+    #[arg(long = "agent", value_name = "UID")]
+    pub agent_uid: Option<String>,
+
     /// Where this job should be hosted. Setting "warp" runs it on Warp's infrastructure. Any other
     /// value is treated is a self-hosted job and the value will be matched with the self-hosted
     /// worker's name.

crates/warp_cli/src/lib_tests.rs

@@ -275,6 +275,29 @@ fn agent_run_cloud_accepts_model() {
     assert_eq!(run_args.model.model.as_deref(), Some("gpt-4o"));
 }
 
+#[test]
+fn agent_run_cloud_accepts_agent_flag() {
+    let args = Args::try_parse_from([
+        "warp",
+        "agent",
+        "run-cloud",
+        "--prompt",
+        "hello",
+        "--agent",
+        "agent_123",
+    ])
+    .unwrap();
+
+    let Some(Command::CommandLine(boxed_cmd)) = args.command else {
+        panic!("Expected `warp agent run-cloud` command");
+    };
+    let CliCommand::Agent(AgentCommand::RunCloud(run_args)) = boxed_cmd.as_ref() else {
+        panic!("Expected `warp agent run-cloud` command");
+    };
+
+    assert_eq!(run_args.agent_uid.as_deref(), Some("agent_123"));
+}
+
 #[test]
 fn agent_run_cloud_accepts_mcp() {
     let uuid = uuid::Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap();