update schema, fix bazel test setup

Author: sayan-oai

codex-rs/core/BUILD.bazel

@@ -28,7 +28,10 @@ codex_rust_crate(
     #
     # TODO(aibrahim): Update the tests so that `just bazel-remote-test` succeeds
     # without this workaround.
-    test_data_extra = ["//:AGENTS.md"],
+    test_data_extra = [
+        "//:AGENTS.md",
+        "config.schema.json",
+    ],
     integration_deps_extra = ["//codex-rs/core/tests/common:common"],
     test_tags = ["no-sandbox"],
     extra_binaries = [

codex-rs/core/config.schema.json

@@ -75,6 +75,9 @@
         "apply_patch_freeform": {
           "type": "boolean"
         },
+        "collab": {
+          "type": "boolean"
+        },
         "elevated_windows_sandbox": {
           "type": "boolean"
         },
@@ -96,6 +99,9 @@
         "experimental_windows_sandbox": {
           "type": "boolean"
         },
+        "hierarchical_agents": {
+          "type": "boolean"
+        },
         "include_apply_patch_tool": {
           "type": "boolean"
         },
@@ -135,6 +141,14 @@
       },
       "additionalProperties": false
     },
+    "feedback": {
+      "description": "When `false`, disables feedback collection across Codex product surfaces. Defaults to `true`.",
+      "allOf": [
+        {
+          "$ref": "#/definitions/FeedbackConfigToml"
+        }
+      ]
+    },
     "file_opener": {
       "description": "Optional URI-based file opener. If set, citations to files in the model output will be hyperlinked using the specified URI scheme.",
       "allOf": [
@@ -383,6 +397,32 @@
       "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
       "type": "string"
     },
+    "AltScreenMode": {
+      "description": "Controls whether the TUI uses the terminal's alternate screen buffer.\n\n**Background:** The alternate screen buffer provides a cleaner fullscreen experience without polluting the terminal's scrollback history. However, it conflicts with terminal multiplexers like Zellij that strictly follow the xterm specification, which defines that alternate screen buffers should not have scrollback.\n\n**Zellij's behavior:** Zellij intentionally disables scrollback in alternate screen mode (see https://github.com/zellij-org/zellij/pull/1032) to comply with the xterm spec. This is by design and not configurable in Zellij—there is no option to enable scrollback in alternate screen mode.\n\n**Solution:** This setting provides a pragmatic workaround: - `auto` (default): Automatically detect the terminal multiplexer. If running in Zellij, disable alternate screen to preserve scrollback. Enable it everywhere else. - `always`: Always use alternate screen mode (original behavior before this fix). - `never`: Never use alternate screen mode. Runs in inline mode, preserving scrollback in all multiplexers.\n\nThe CLI flag `--no-alt-screen` can override this setting at runtime.",
+      "oneOf": [
+        {
+          "description": "Auto-detect: disable alternate screen in Zellij, enable elsewhere.",
+          "type": "string",
+          "enum": [
+            "auto"
+          ]
+        },
+        {
+          "description": "Always use alternate screen (original behavior).",
+          "type": "string",
+          "enum": [
+            "always"
+          ]
+        },
+        {
+          "description": "Never use alternate screen (inline mode only).",
+          "type": "string",
+          "enum": [
+            "never"
+          ]
+        }
+      ]
+    },
     "AnalyticsConfigToml": {
       "description": "Analytics settings loaded from config.toml. Fields are optional so we can apply defaults.",
       "type": "object",
@@ -486,6 +526,9 @@
             "apply_patch_freeform": {
               "type": "boolean"
             },
+            "collab": {
+              "type": "boolean"
+            },
             "elevated_windows_sandbox": {
               "type": "boolean"
             },
@@ -507,6 +550,9 @@
             "experimental_windows_sandbox": {
               "type": "boolean"
             },
+            "hierarchical_agents": {
+              "type": "boolean"
+            },
             "include_apply_patch_tool": {
               "type": "boolean"
             },
@@ -580,6 +626,16 @@
       },
       "additionalProperties": false
     },
+    "FeedbackConfigToml": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "description": "When `false`, disables the feedback flow across Codex product surfaces.",
+          "type": "boolean"
+        }
+      },
+      "additionalProperties": false
+    },
     "ForcedLoginMethod": {
       "type": "string",
       "enum": [
@@ -1236,6 +1292,15 @@
       "description": "Collection of settings that are specific to the TUI.",
       "type": "object",
       "properties": {
+        "alternate_screen": {
+          "description": "Controls whether the TUI uses the terminal's alternate screen buffer.\n\n- `auto` (default): Disable alternate screen in Zellij, enable elsewhere. - `always`: Always use alternate screen (original behavior). - `never`: Never use alternate screen (inline mode only, preserves scrollback).\n\nUsing alternate screen provides a cleaner fullscreen experience but prevents scrollback in terminal multiplexers like Zellij that follow the xterm spec.",
+          "default": "auto",
+          "allOf": [
+            {
+              "$ref": "#/definitions/AltScreenMode"
+            }
+          ]
+        },
         "animations": {
           "description": "Enable animations (welcome screen, shimmer effects, spinners). Defaults to `true`.",
           "default": true,

codex-rs/core/src/config/schema.rs

@@ -77,23 +77,21 @@ pub fn write_config_schema(out_path: &Path) -> anyhow::Result<()> {
 #[cfg(test)]
 mod tests {
     use super::config_schema_json;
-    use similar::TextDiff;
+    use pretty_assertions::assert_eq;
 
     #[test]
     fn config_schema_matches_fixture() {
         let fixture_path = codex_utils_cargo_bin::find_resource!("config.schema.json")
             .expect("resolve config schema fixture path");
         let fixture = std::fs::read_to_string(fixture_path).expect("read config schema fixture");
+        let fixture_value: serde_json::Value =
+            serde_json::from_str(&fixture).expect("parse config schema fixture");
         let schema_json = config_schema_json().expect("serialize config schema");
-        let schema_str = String::from_utf8(schema_json).expect("decode schema json");
-        if fixture != schema_str {
-            let diff = TextDiff::from_lines(&fixture, &schema_str)
-                .unified_diff()
-                .to_string();
-            let short = diff.lines().take(50).collect::<Vec<_>>().join("\n");
-            panic!(
-                "Current schema for `config.toml` doesn't match the fixture. Run `just write-config-schema` to overwrite with your changes.\n\n{short}"
-            );
-        }
+        let schema_value: serde_json::Value =
+            serde_json::from_slice(&schema_json).expect("decode schema json");
+        assert_eq!(
+            fixture_value, schema_value,
+            "Current schema for `config.toml` doesn't match the fixture. Run `just write-config-schema` to overwrite with your changes."
+        );
     }
 }

codex-rs/core/src/config/types.rs

@@ -290,7 +290,8 @@ pub struct AnalyticsConfigToml {
     pub enabled: Option<bool>,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, JsonSchema)]
+#[schemars(deny_unknown_fields)]
 pub struct FeedbackConfigToml {
     /// When `false`, disables the feedback flow across Codex product surfaces.
     pub enabled: Option<bool>,