Merge origin/master into oz-agent/REMOTE-2409

Co-Authored-By: Oz <oz-agent@warp.dev>

Author: oz-agent

app/src/settings/privacy.rs

@@ -93,7 +93,7 @@ define_settings_group!(WarpDrivePrivacySettings, settings: [
         default: true,
         supported_platforms: SupportedPlatforms::ALL,
         sync_to_cloud: SyncToCloud::Globally(RespectUserSyncSetting::No),
-        surface: settings::SettingSurfaces::GUI,
+        surface: settings::SettingSurfaces::ALL,
         private: false,
         storage_key: "TelemetryEnabled",
         toml_path: "privacy.telemetry_enabled",
@@ -104,7 +104,7 @@ define_settings_group!(WarpDrivePrivacySettings, settings: [
         default: true,
         supported_platforms: SupportedPlatforms::ALL,
         sync_to_cloud: SyncToCloud::Globally(RespectUserSyncSetting::No),
-        surface: settings::SettingSurfaces::GUI,
+        surface: settings::SettingSurfaces::ALL,
         private: false,
         storage_key: "CrashReportingEnabled",
         toml_path: "privacy.crash_reporting_enabled",
@@ -115,7 +115,7 @@ define_settings_group!(WarpDrivePrivacySettings, settings: [
         default: true,
         supported_platforms: SupportedPlatforms::ALL,
         sync_to_cloud: SyncToCloud::Globally(RespectUserSyncSetting::No),
-        surface: settings::SettingSurfaces::GUI,
+        surface: settings::SettingSurfaces::ALL,
         private: false,
         storage_key: "CloudConversationStorageEnabled",
         toml_path: "agents.cloud_conversation_storage_enabled",
@@ -857,3 +857,7 @@ impl Entity for PrivacySettings {
 }
 
 impl SingletonEntity for PrivacySettings {}
+
+#[cfg(test)]
+#[path = "privacy_tests.rs"]
+mod tests;

app/src/settings/privacy_tests.rs

@@ -0,0 +1,23 @@
+use settings::schema::SettingSchemaEntry;
+use settings::{Setting, SettingSurfaces, SettingsMode};
+
+use super::{IsCloudConversationStorageEnabled, IsCrashReportingEnabled, IsTelemetryEnabled};
+
+#[test]
+fn privacy_settings_apply_to_gui_and_tui() {
+    for storage_key in [
+        IsTelemetryEnabled::toml_key(),
+        IsCrashReportingEnabled::toml_key(),
+        IsCloudConversationStorageEnabled::toml_key(),
+    ] {
+        let entry = inventory::iter::<SettingSchemaEntry>
+            .into_iter()
+            .find(|entry| entry.storage_key == storage_key)
+            .unwrap_or_else(|| panic!("missing schema entry for {storage_key}"));
+        let surfaces = (entry.surfaces_fn)();
+
+        assert_eq!(surfaces, SettingSurfaces::ALL, "{storage_key}");
+        assert!(surfaces.includes(SettingsMode::Gui), "{storage_key}");
+        assert!(surfaces.includes(SettingsMode::Tui), "{storage_key}");
+    }
+}