Add one test

# Conflicts:
#	codex-rs/app-server/tests/suite/codex_message_processor_flow.rs

.github/workflows/rust-ci.yml

@@ -99,10 +99,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: macos-14
+          - runner: macos-15
             target: aarch64-apple-darwin
             profile: dev
-          - runner: macos-14
+          - runner: macos-15
             target: x86_64-apple-darwin
             profile: dev
           - runner: ubuntu-24.04
@@ -128,7 +128,7 @@ jobs:
           # there could be release-only build errors we want to catch.
           # Hopefully this also pre-populates the build cache to speed up
           # releases.
-          - runner: macos-14
+          - runner: macos-15
             target: aarch64-apple-darwin
             profile: release
           - runner: ubuntu-24.04

.github/workflows/rust-release.yml

@@ -58,9 +58,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: macos-14
+          - runner: macos-15
             target: aarch64-apple-darwin
-          - runner: macos-14
+          - runner: macos-15
             target: x86_64-apple-darwin
           - runner: ubuntu-24.04
             target: x86_64-unknown-linux-musl

codex-rs/cli/src/main.rs

@@ -432,6 +432,9 @@ fn merge_resume_cli_flags(interactive: &mut TuiCli, resume_cli: TuiCli) {
     if resume_cli.web_search {
         interactive.web_search = true;
     }
+    if resume_cli.disable_auto_compaction {
+        interactive.disable_auto_compaction = true;
+    }
     if !resume_cli.images.is_empty() {
         interactive.images = resume_cli.images;
     }
@@ -567,6 +570,7 @@ mod tests {
                 "--oss",
                 "--full-auto",
                 "--search",
+                "--disable-auto-compaction",
                 "--sandbox",
                 "workspace-write",
                 "--ask-for-approval",
@@ -609,6 +613,18 @@ mod tests {
             .iter()
             .any(|p| p == std::path::Path::new("/tmp/b.png"));
         assert!(has_a && has_b);
+        assert!(interactive.disable_auto_compaction);
+        assert!(!interactive.resume_picker);
+        assert!(!interactive.resume_last);
+        assert_eq!(interactive.resume_session_id.as_deref(), Some("sid"));
+    }
+
+    #[test]
+    fn resume_disable_auto_compaction_flag_merges() {
+        let interactive =
+            finalize_from_args(["codex", "resume", "sid", "--disable-auto-compaction"].as_ref());
+
+        assert!(interactive.disable_auto_compaction);
         assert!(!interactive.resume_picker);
         assert!(!interactive.resume_last);
         assert_eq!(interactive.resume_session_id.as_deref(), Some("sid"));

codex-rs/core/src/client.rs

@@ -113,9 +113,12 @@ impl ModelClient {
     }
 
     pub fn get_auto_compact_token_limit(&self) -> Option<i64> {
-        self.config.model_auto_compact_token_limit.or_else(|| {
-            get_model_info(&self.config.model_family).and_then(|info| info.auto_compact_token_limit)
-        })
+        match self.config.model_auto_compact_token_limit {
+            Some(limit) if limit <= crate::config::AUTO_COMPACT_DISABLED => None,
+            Some(limit) => Some(limit),
+            None => get_model_info(&self.config.model_family)
+                .and_then(|info| info.auto_compact_token_limit),
+        }
     }
 
     /// Dispatches to either the Responses or Chat implementation depending on
@@ -912,7 +915,11 @@ fn try_parse_retry_after(err: &Error) -> Option<Duration> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::built_in_model_providers;
+    use crate::config::ConfigOverrides;
+    use crate::config::ConfigToml;
     use serde_json::json;
+    use tempfile::TempDir;
     use tokio::sync::mpsc;
     use tokio_test::io::Builder as IoBuilder;
     use tokio_util::io::ReaderStream;
@@ -998,6 +1005,31 @@ mod tests {
         )
     }
 
+    #[test]
+    fn auto_compaction_disabled_when_limit_sentinel() {
+        let codex_home = TempDir::new().expect("tempdir");
+        let mut config = Config::load_from_base_config_with_overrides(
+            ConfigToml::default(),
+            ConfigOverrides::default(),
+            codex_home.path().to_path_buf(),
+        )
+        .expect("load default config");
+        config.model_auto_compact_token_limit = Some(crate::config::AUTO_COMPACT_DISABLED);
+
+        let provider = built_in_model_providers()["openai"].clone();
+        let client = ModelClient::new(
+            Arc::new(config),
+            None,
+            otel_event_manager(),
+            provider,
+            None,
+            ReasoningSummaryConfig::default(),
+            ConversationId::new(),
+        );
+
+        assert!(client.get_auto_compact_token_limit().is_none());
+    }
+
     // ────────────────────────────
     // Tests from `implement-test-for-responses-api-sse-parser`
     // ────────────────────────────

codex-rs/core/src/config.rs

@@ -45,6 +45,8 @@ use toml_edit::Table as TomlTable;
 const OPENAI_DEFAULT_MODEL: &str = "gpt-5-codex";
 const OPENAI_DEFAULT_REVIEW_MODEL: &str = "gpt-5-codex";
 pub const GPT_5_CODEX_MEDIUM_MODEL: &str = "gpt-5-codex";
+/// Sentinel value signalling auto-compaction should be fully disabled.
+pub const AUTO_COMPACT_DISABLED: i64 = -1;
 
 /// Maximum number of bytes of the documentation that will be embedded. Larger
 /// files are *silently truncated* to this size so we do not take up too much of

codex-rs/core/tests/suite/compact.rs

@@ -3,6 +3,7 @@ use codex_core::ConversationManager;
 use codex_core::ModelProviderInfo;
 use codex_core::NewConversation;
 use codex_core::built_in_model_providers;
+use codex_core::config::AUTO_COMPACT_DISABLED;
 use codex_core::protocol::ErrorEvent;
 use codex_core::protocol::EventMsg;
 use codex_core::protocol::InputItem;
@@ -828,3 +829,61 @@ async fn auto_compact_allows_multiple_attempts_when_interleaved_with_other_turn_
         "second auto compact request should include the summarization prompt"
     );
 }
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn auto_compact_respects_disabled_flag() {
+    skip_if_no_network!();
+
+    let server = start_mock_server().await;
+
+    let sse_body = sse(vec![
+        ev_assistant_message("m1", FIRST_REPLY),
+        ev_completed_with_tokens("r1", 500_000),
+    ]);
+
+    Mock::given(method("POST"))
+        .and(path("/v1/responses"))
+        .respond_with(sse_response(sse_body))
+        .expect(1)
+        .mount(&server)
+        .await;
+
+    let model_provider = ModelProviderInfo {
+        base_url: Some(format!("{}/v1", server.uri())),
+        ..built_in_model_providers()["openai"].clone()
+    };
+
+    let home = TempDir::new().unwrap();
+    let mut config = load_default_config_for_test(&home);
+    config.model_provider = model_provider;
+    config.model_auto_compact_token_limit = Some(AUTO_COMPACT_DISABLED);
+    let conversation_manager = ConversationManager::with_auth(CodexAuth::from_api_key("dummy"));
+    let codex = conversation_manager
+        .new_conversation(config)
+        .await
+        .unwrap()
+        .conversation;
+
+    codex
+        .submit(Op::UserInput {
+            items: vec![InputItem::Text {
+                text: FIRST_AUTO_MSG.into(),
+            }],
+        })
+        .await
+        .unwrap();
+
+    wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
+
+    let requests = server.received_requests().await.unwrap();
+    assert_eq!(
+        requests.len(),
+        1,
+        "disable flag should avoid additional summarization requests"
+    );
+    let body = std::str::from_utf8(&requests[0].body).unwrap();
+    assert!(
+        !body.contains("You have exceeded the maximum number of tokens"),
+        "auto compaction should remain disabled even when usage is high"
+    );
+}

codex-rs/tui/src/cli.rs

@@ -72,6 +72,10 @@ pub struct Cli {
     #[arg(long = "search", default_value_t = false)]
     pub web_search: bool,
 
+    /// Disable automatic conversation history compaction triggered near the model token limit.
+    #[arg(long = "disable-auto-compaction", default_value_t = false)]
+    pub disable_auto_compaction: bool,
+
     #[clap(skip)]
     pub config_overrides: CliConfigOverrides,
 }

codex-rs/tui/src/lib.rs

@@ -170,6 +170,10 @@ pub async fn run_main(
         }
     };
 
+    if cli.disable_auto_compaction {
+        config.model_auto_compact_token_limit = Some(codex_core::config::AUTO_COMPACT_DISABLED);
+    }
+
     // we load config.toml here to determine project state.
     #[allow(clippy::print_stderr)]
     let config_toml = {