diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index e40ab834a8710cbfd30754e215624fc9fdfa9a6a..5d4de36cb69335de7a77eb7ad7a15f75b8e2b0b7 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -8,7 +8,9 @@ use crate::{
 };
 use acp_thread::{MentionUri, UserMessageId};
 use action_log::ActionLog;
-use feature_flags::{FeatureFlagAppExt as _, SubagentsFeatureFlag};
+use feature_flags::{
+    FeatureFlagAppExt as _, StreamingEditFileToolFeatureFlag, SubagentsFeatureFlag,
+};
 
 use agent_client_protocol as acp;
 use agent_settings::{
@@ -2457,7 +2459,7 @@ impl Thread {
             }
         }
 
-        let use_streaming_edit_tool = false;
+        let use_streaming_edit_tool = cx.has_flag::<StreamingEditFileToolFeatureFlag>();
 
         let mut tools = self
             .tools
diff --git a/crates/feature_flags/src/flags.rs b/crates/feature_flags/src/flags.rs
index 5910ad30defed888c649a281d1623c175867fe13..8f96de0e7b6d9b385fcda533a31ecc34b5afdbcc 100644
--- a/crates/feature_flags/src/flags.rs
+++ b/crates/feature_flags/src/flags.rs
@@ -56,3 +56,13 @@ impl FeatureFlag for DiffReviewFeatureFlag {
         false
     }
 }
+
+pub struct StreamingEditFileToolFeatureFlag;
+
+impl FeatureFlag for StreamingEditFileToolFeatureFlag {
+    const NAME: &'static str = "streaming-edit-file-tool";
+
+    fn enabled_for_staff() -> bool {
+        false
+    }
+}