first pass of merging in warp (doesn't build)

app/src/terminal/block_list_settings.rs

@@ -1,4 +1,5 @@
-use settings::{macros::define_settings_group, SupportedPlatforms, SyncToCloud};
+use settings::macros::define_settings_group;
+use settings::{RespectUserSyncSetting, SupportedPlatforms, SyncToCloud};
 
 // Settings for controlling the behavior of the block list.
 define_settings_group!(BlockListSettings, settings: [
@@ -20,6 +21,18 @@ define_settings_group!(BlockListSettings, settings: [
        toml_path: "general.snackbar_enabled",
        description: "Whether to show snackbar notifications.",
    }
+   // When enabled, the input box retains focus when selecting a block in shell mode
+   // (useful for quickly attaching context). When disabled, selecting a block focuses
+   // the terminal so blocklist navigation with arrow keys continues to work.
+   preserve_input_focus_on_block_selection: PreserveInputFocusOnBlockSelection {
+       type: bool,
+       default: false,
+       supported_platforms: SupportedPlatforms::ALL,
+       sync_to_cloud: SyncToCloud::Globally(RespectUserSyncSetting::Yes),
+       private: false,
+       toml_path: "general.preserve_input_focus_on_block_selection",
+       description: "Whether to preserve input box focus when selecting a block.",
+   }
    show_block_dividers: ShowBlockDividers {
        type: bool,
        default: true,