Merge branch 'main' into etraut/loop

codex-rs/features/src/lib.rs

@@ -124,6 +124,8 @@ pub enum Feature {
     CodexGitCommit,
     /// Enable runtime metrics snapshots via a manual reader.
     RuntimeMetrics,
+    /// Enable thread lifecycle analytics emitted via the app-server analytics pipeline.
+    GeneralAnalytics,
     /// Persist rollout metadata to a local SQLite database.
     Sqlite,
     /// Enable startup memory extraction and file-backed memory consolidation.
@@ -611,6 +613,12 @@ pub const FEATURES: &[FeatureSpec] = &[
         stage: Stage::UnderDevelopment,
         default_enabled: false,
     },
+    FeatureSpec {
+        id: Feature::GeneralAnalytics,
+        key: "general_analytics",
+        stage: Stage::UnderDevelopment,
+        default_enabled: false,
+    },
     FeatureSpec {
         id: Feature::Sqlite,
         key: "sqlite",

codex-rs/features/src/tests.rs

@@ -126,6 +126,12 @@ fn tool_search_is_under_development_and_disabled_by_default() {
     assert_eq!(Feature::ToolSearch.default_enabled(), false);
 }
 
+#[test]
+fn general_analytics_is_under_development_and_disabled_by_default() {
+    assert_eq!(Feature::GeneralAnalytics.stage(), Stage::UnderDevelopment);
+    assert_eq!(Feature::GeneralAnalytics.default_enabled(), false);
+}
+
 #[test]
 fn use_linux_sandbox_bwrap_is_a_removed_feature_key() {
     assert_eq!(