Remove setting

crates/assistant_settings/src/assistant_settings.rs

@@ -252,7 +252,6 @@ impl AssistantSettingsContent {
                     commit_message_model: None,
                     thread_summary_model: None,
                     inline_alternatives: None,
-                    enable_experimental_live_diffs: None,
                     default_profile: None,
                     profiles: None,
                     always_allow_tool_actions: None,
@@ -283,7 +282,6 @@ impl AssistantSettingsContent {
                 commit_message_model: None,
                 thread_summary_model: None,
                 inline_alternatives: None,
-                enable_experimental_live_diffs: None,
                 default_profile: None,
                 profiles: None,
                 always_allow_tool_actions: None,
@@ -565,7 +563,6 @@ impl Default for VersionedAssistantSettingsContent {
             commit_message_model: None,
             thread_summary_model: None,
             inline_alternatives: None,
-            enable_experimental_live_diffs: None,
             default_profile: None,
             profiles: None,
             always_allow_tool_actions: None,
@@ -610,10 +607,6 @@ pub struct AssistantSettingsContentV2 {
     thread_summary_model: Option<LanguageModelSelection>,
     /// Additional models with which to generate alternatives when performing inline assists.
     inline_alternatives: Option<Vec<LanguageModelSelection>>,
-    /// Enable experimental live diffs in the assistant panel.
-    ///
-    /// Default: false
-    enable_experimental_live_diffs: Option<bool>,
     /// The default profile to use in the Agent.
     ///
     /// Default: write
@@ -985,7 +978,6 @@ mod tests {
                                 dock: None,
                                 default_width: None,
                                 default_height: None,
-                                enable_experimental_live_diffs: None,
                                 default_profile: None,
                                 profiles: None,
                                 always_allow_tool_actions: None,

docs/src/ai/text-threads.md

@@ -228,7 +228,6 @@ Zed has the following internal rule templates:
 
 - `content_prompt.hbs`: Used for generating content in the editor.
 - `terminal_assistant_prompt.hbs`: Used for the terminal assistant feature.
-- `suggest_edits.hbs`: Used for generating the model instructions for the XML Suggest Edits should return.
 
 At this point it is unknown if we will expand templates further to be user-creatable.
 
@@ -244,8 +243,6 @@ The following templates can be overridden:
 
 2. [`terminal_assistant_prompt.hbs`](https://github.com/zed-industries/zed/tree/main/assets/prompts/terminal_assistant_prompt.hbs): Used for the terminal assistant feature.
 
-3. [`suggest_edits.hbs`](https://github.com/zed-industries/zed/tree/main/assets/prompts/suggest_edits.hbs): Used for generating the model instructions for the XML Suggest Edits should return.
-
 > **Note:** Be sure you want to override these, as you'll miss out on iteration on our built-in features. This should be primarily used when developing Zed.
 
 You can customize these templates to better suit your needs while maintaining the core structure and variables used by Zed. Zed will automatically reload your prompt overrides when they change on disk.