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

app/src/undo_close/mod.rs

@@ -1,11 +1,13 @@
 pub mod settings;
 mod stack;
 
-use galaxyui::{keymap::EditableBinding, AppContext};
+use galaxyui::keymap::EditableBinding;
+use galaxyui::AppContext;
 
-use crate::{util::bindings::CustomAction, workspace::WorkspaceAction};
-
-pub use self::{settings::UndoCloseSettings, stack::UndoCloseStack, stack::UndoCloseStackEvent};
+pub use self::settings::UndoCloseSettings;
+pub use self::stack::{UndoCloseStack, UndoCloseStackEvent};
+use crate::util::bindings::CustomAction;
+use crate::workspace::WorkspaceAction;
 
 /// Register keybindings for undo close functionality.
 pub fn init(ctx: &mut AppContext) {

app/src/undo_close/settings.rs

@@ -1,6 +1,7 @@
 use std::time::Duration;
 
-use settings::{macros::define_settings_group, SupportedPlatforms, SyncToCloud};
+use settings::macros::define_settings_group;
+use settings::{RespectUserSyncSetting, SupportedPlatforms, SyncToCloud};
 
 define_settings_group!(UndoCloseSettings, settings: [
     enabled: UndoCloseEnabled {

app/src/undo_close/stack.rs

@@ -1,20 +1,19 @@
-use galaxyui::{
-    r#async::SpawnedFutureHandle, AppContext, ClosedWindowData, Entity, EntityId, ModelContext,
-    ModelHandle, SingletonEntity, ViewHandle, WeakViewHandle, WindowId,
-};
 use uuid::Uuid;
-
-use crate::{
-    ai::active_agent_views_model::ActiveAgentViewsModel,
-    ai::blocklist::BlocklistAIHistoryModel,
-    pane_group::{PaneGroup, PaneId},
-    send_telemetry_from_app_ctx,
-    server::telemetry::{TelemetryEvent, UndoCloseItemType},
-    tab::TabData,
-    workspace::Workspace,
+use galaxyui::r#async::SpawnedFutureHandle;
+use galaxyui::{
+    AppContext, ClosedWindowData, Entity, EntityId, ModelContext, ModelHandle, SingletonEntity,
+    ViewHandle, WeakViewHandle, WindowId,
 };
 
-use super::{settings::UndoCloseSettingsChangedEvent, UndoCloseSettings};
+use super::settings::UndoCloseSettingsChangedEvent;
+use super::UndoCloseSettings;
+use crate::ai::active_agent_views_model::ActiveAgentViewsModel;
+use crate::ai::blocklist::BlocklistAIHistoryModel;
+use crate::pane_group::{PaneGroup, PaneId};
+use crate::send_telemetry_from_app_ctx;
+use crate::server::telemetry::{TelemetryEvent, UndoCloseItemType};
+use crate::tab::TabData;
+use crate::workspace::Workspace;
 
 /// A unique identifier for an item in the undo close stack.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -130,7 +129,8 @@ impl ClosedItem {
 
             for terminal_view_id in terminal_view_ids {
                 history_model.update(ctx, |history_model, _| {
-                    history_model.mark_conversations_historical_for_terminal_view(terminal_view_id);
+                    history_model
+                        .mark_conversations_historical_for_terminal_surface(terminal_view_id);
                 });
             }
         }
@@ -161,7 +161,7 @@ pub struct UndoCloseStack {
 impl UndoCloseStack {
     /// Constructs a new undo close stack.
     pub fn new(ctx: &mut ModelContext<Self>) -> Self {
-        ctx.subscribe_to_model(&UndoCloseSettings::handle(ctx), |me, event, ctx| {
+        ctx.subscribe_to_model(&UndoCloseSettings::handle(ctx), |me, _, event, ctx| {
             me.handle_settings_event(event, ctx);
         });