From 72f119de510f1bc337a279fa40c85d34736c15e9 Mon Sep 17 00:00:00 2001
From: Oz Agent <oz-agent@warp.dev>
Date: Fri, 31 Jul 2026 16:17:58 +0000
Subject: [PATCH] Clean up AmbientAgentsImageUpload feature flag

---
 app/Cargo.toml                             |  2 --
 app/src/ai/agent_sdk/ambient.rs            | 35 +++++++---------------
 app/src/ai/agent_sdk/driver/attachments.rs |  4 ---
 app/src/features.rs                        |  2 --
 crates/warp_features/src/lib.rs            |  3 --
 5 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/app/Cargo.toml b/app/Cargo.toml
index 460739c5a79..26db61b72f1 100644
--- a/app/Cargo.toml
+++ b/app/Cargo.toml
@@ -601,7 +601,6 @@ default = [
     "fork_from_command",
     "context_window_usage_v2",
     "ambient_agents_command_line",
-    "ambient_agents_image_upload",
     "scheduled_ambient_agents",
     "warp_managed_secrets",
     "v4a_file_diffs",
@@ -759,7 +758,6 @@ agent_mode_evals = [
     "warp_server_client/agent_mode_evals",
 ]
 ambient_agents_command_line = []
-ambient_agents_image_upload = []
 scheduled_ambient_agents = []
 allow_ignoring_input_suggestions = []
 inline_slash_commands = ["agent_view"]
diff --git a/app/src/ai/agent_sdk/ambient.rs b/app/src/ai/agent_sdk/ambient.rs
index f002deac8e2..592546731ed 100644
--- a/app/src/ai/agent_sdk/ambient.rs
+++ b/app/src/ai/agent_sdk/ambient.rs
@@ -350,33 +350,18 @@ impl AmbientAgentRunner {
                 return;
             }
 
-            let attachments = if FeatureFlag::AmbientAgentsImageUpload.is_enabled() {
-                if !args.attachment_paths.is_empty() {
-                    match args
-                        .attachment_paths
-                        .iter()
-                        .enumerate()
-                        .map(|(i, path)| process_attachment(path, i))
-                        .collect::<Result<Vec<_>, _>>()
-                    {
-                        Ok(processed) => processed,
-                        Err(err) => {
-                            super::report_fatal_error(err, ctx);
-                            return;
-                        }
-                    }
-                } else {
-                    vec![]
-                }
-            } else {
-                if !args.attachment_paths.is_empty() {
-                    super::report_fatal_error(
-                        anyhow::anyhow!("Attachment upload is not enabled"),
-                        ctx,
-                    );
+            let attachments = match args
+                .attachment_paths
+                .iter()
+                .enumerate()
+                .map(|(i, path)| process_attachment(path, i))
+                .collect::<Result<Vec<_>, _>>()
+            {
+                Ok(processed) => processed,
+                Err(err) => {
+                    super::report_fatal_error(err, ctx);
                     return;
                 }
-                vec![]
             };
 
             let mut environment_args = args.environment;
diff --git a/app/src/ai/agent_sdk/driver/attachments.rs b/app/src/ai/agent_sdk/driver/attachments.rs
index 2de540a01fa..b72cd888847 100644
--- a/app/src/ai/agent_sdk/driver/attachments.rs
+++ b/app/src/ai/agent_sdk/driver/attachments.rs
@@ -39,10 +39,6 @@ pub(crate) async fn fetch_and_download_attachments(
     task_id: String,
     attachments_dir: PathBuf,
 ) -> anyhow::Result<Option<String>> {
-    if !FeatureFlag::AmbientAgentsImageUpload.is_enabled() {
-        return Ok(None);
-    }
-
     let attachments = ai_client
         .get_task_attachments(task_id.clone())
         .await
diff --git a/app/src/features.rs b/app/src/features.rs
index 7e426e87c3b..78d4dc292dd 100644
--- a/app/src/features.rs
+++ b/app/src/features.rs
@@ -275,8 +275,6 @@ fn enabled_features() -> HashSet<FeatureFlag> {
         FeatureFlag::AllowIgnoringInputSuggestions,
         #[cfg(feature = "ambient_agents_command_line")]
         FeatureFlag::AmbientAgentsCommandLine,
-        #[cfg(feature = "ambient_agents_image_upload")]
-        FeatureFlag::AmbientAgentsImageUpload,
         #[cfg(feature = "scheduled_ambient_agents")]
         FeatureFlag::ScheduledAmbientAgents,
         #[cfg(feature = "conversation_api")]
diff --git a/crates/warp_features/src/lib.rs b/crates/warp_features/src/lib.rs
index 1612e769cea..342ffba7855 100644
--- a/crates/warp_features/src/lib.rs
+++ b/crates/warp_features/src/lib.rs
@@ -653,9 +653,6 @@ pub enum FeatureFlag {
     /// Gates populating/reading oz updates from channel versions in the changelog model.
     OzChangelogUpdates,
 
-    /// Enables image upload for ambient agents.
-    AmbientAgentsImageUpload,
-
     /// Enables image attachment support for cloud mode conversations.
     CloudModeImageContext,