Release 0.35.0-alpha.9

.github/workflows/codespell.yml

@@ -25,4 +25,3 @@ jobs:
         uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630 # v2
         with:
           ignore_words_file: .codespellignore
-          skip: frame*.txt

.github/workflows/rust-release.yml

@@ -167,12 +167,6 @@ jobs:
     needs: build
     name: release
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      actions: read
-    outputs:
-      version: ${{ steps.release_name.outputs.name }}
-      tag: ${{ github.ref_name }}
 
     steps:
       - name: Checkout repository
@@ -226,47 +220,6 @@ jobs:
           tag: ${{ github.ref_name }}
           config: .github/dotslash-config.json
 
-  # Publish to npm using OIDC authentication.
-  # July 31, 2025: https://github.blog/changelog/2025-07-31-npm-trusted-publishing-with-oidc-is-generally-available/
-  # npm docs: https://docs.npmjs.com/trusted-publishers
-  publish-npm:
-    # Skip this step for pre-releases (alpha/beta).
-    if: ${{ !contains(needs.release.outputs.version, '-') }}
-    name: publish-npm
-    needs: release
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write # Required for OIDC
-      contents: read
-
-    steps:
-      - name: Setup Node.js
-        uses: actions/setup-node@v5
-        with:
-          node-version: 22
-          registry-url: "https://registry.npmjs.org"
-          scope: "@openai"
-
-      # Trusted publishing requires npm CLI version 11.5.1 or later.
-      - name: Update npm
-        run: npm install -g npm@latest
-
-      - name: Download npm tarball from release
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -euo pipefail
-          version="${{ needs.release.outputs.version }}"
-          tag="${{ needs.release.outputs.tag }}"
-          mkdir -p dist/npm
-          gh release download "$tag" \
-            --pattern "codex-npm-${version}.tgz" \
-            --dir dist/npm
-
-      # No NODE_AUTH_TOKEN needed because we use OIDC.
-      - name: Publish to npm
-        run: npm publish "${GITHUB_WORKSPACE}/dist/npm/codex-npm-${{ needs.release.outputs.version }}.tgz"
-
   update-branch:
     name: Update latest-alpha-cli branch
     permissions:

codex-cli/package.json

@@ -15,8 +15,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/openai/codex.git",
-    "directory": "codex-cli"
+    "url": "git+https://github.com/openai/codex.git"
   },
   "dependencies": {
     "@vscode/ripgrep": "^1.15.14"

codex-rs/Cargo.lock

@@ -407,7 +407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
 dependencies = [
  "memchr",
- "regex-automata",
+ "regex-automata 0.4.9",
  "serde",
 ]
 
@@ -625,7 +625,6 @@ name = "codex-cli"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "assert_cmd",
  "clap",
  "clap_complete",
  "codex-arg0",
@@ -638,10 +637,7 @@ dependencies = [
  "codex-protocol",
  "codex-protocol-ts",
  "codex-tui",
- "predicates",
- "pretty_assertions",
  "serde_json",
- "tempfile",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -670,7 +666,6 @@ dependencies = [
  "bytes",
  "chrono",
  "codex-apply-patch",
- "codex-file-search",
  "codex-mcp-client",
  "codex-protocol",
  "core_test_support",
@@ -738,8 +733,6 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
- "uuid",
- "walkdir",
  "wiremock",
 ]
 
@@ -921,7 +914,6 @@ dependencies = [
  "color-eyre",
  "crossterm",
  "diffy",
- "dirs",
  "image",
  "insta",
  "itertools 0.14.0",
@@ -1328,7 +1320,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b545b8c50194bdd008283985ab0b31dba153cfd5b3066a92770634fbc0d7d291"
 dependencies = [
- "nu-ansi-term",
+ "nu-ansi-term 0.50.1",
 ]
 
 [[package]]
@@ -1910,7 +1902,7 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata",
+ "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
 
@@ -2325,7 +2317,7 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata",
+ "regex-automata 0.4.9",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -2710,11 +2702,11 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
 [[package]]
 name = "matchers"
-version = "0.2.0"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
@@ -2888,6 +2880,16 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.1"
@@ -3126,6 +3128,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "owo-colors"
 version = "4.2.2"
@@ -3588,10 +3596,19 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata",
+ "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
 
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
 [[package]]
 name = "regex-automata"
 version = "0.4.9"
@@ -3926,28 +3943,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.224"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aaeb1e94f53b16384af593c71e20b095e958dab1d26939c1b70645c5cfbcc0b"
-dependencies = [
- "serde_core",
- "serde_derive",
-]
-
-[[package]]
-name = "serde_core"
-version = "1.0.224"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f39390fa6346e24defbcdd3d9544ba8a19985d0af74df8501fbfe9a64341ab"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.224"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ff78ab5e8561c9a675bfc1785cb07ae721f0ee53329a595cefd8c04c2ac4e0"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3967,16 +3974,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.143"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
 dependencies = [
  "indexmap 2.10.0",
  "itoa",
  "memchr",
  "ryu",
  "serde",
- "serde_core",
 ]
 
 [[package]]
@@ -4163,9 +4169,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.11"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
 
 [[package]]
 name = "smallvec"
@@ -4897,14 +4903,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.20"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
- "nu-ansi-term",
+ "nu-ansi-term 0.46.0",
  "once_cell",
- "regex-automata",
+ "regex",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -5292,9 +5298,9 @@ dependencies = [
 
 [[package]]
 name = "wildmatch"
-version = "2.5.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39b7d07a236abaef6607536ccfaf19b396dbe3f5110ddb73d39f4562902ed382"
+checksum = "68ce1ab1f8c62655ebe1350f589c61e505cf94d385bc6a12899442d9081e71fd"
 
 [[package]]
 name = "winapi"

codex-rs/Cargo.toml

@@ -22,7 +22,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.37.0-alpha.4"
+version = "0.35.0-alpha.9"
 # Track the edition for all workspace crates in one place. Individual
 # crates can still override this value, but keeping it here means new
 # crates created with `cargo new -w ...` automatically inherit the 2024

codex-rs/cli/Cargo.toml

@@ -36,11 +36,5 @@ tokio = { version = "1", features = [
     "signal",
 ] }
 tracing = "0.1.41"
-tracing-subscriber = "0.3.20"
+tracing-subscriber = "0.3.19"
 codex-protocol-ts = { path = "../protocol-ts" }
-
-[dev-dependencies]
-assert_cmd = "2"
-predicates = "3"
-pretty_assertions = "1"
-tempfile = "3"

codex-rs/cli/src/main.rs

@@ -17,9 +17,6 @@ use codex_exec::Cli as ExecCli;
 use codex_tui::Cli as TuiCli;
 use std::path::PathBuf;
 
-mod mcp_cmd;
-
-use crate::mcp_cmd::McpCli;
 use crate::proto::ProtoCli;
 
 /// Codex CLI
@@ -59,8 +56,8 @@ enum Subcommand {
     /// Remove stored authentication credentials.
     Logout(LogoutCommand),
 
-    /// [experimental] Run Codex as an MCP server and manage MCP servers.
-    Mcp(McpCli),
+    /// Experimental: run Codex as an MCP server.
+    Mcp,
 
     /// Run the Protocol stream via stdin/stdout
     #[clap(visible_alias = "p")]
@@ -76,9 +73,6 @@ enum Subcommand {
     #[clap(visible_alias = "a")]
     Apply(ApplyCommand),
 
-    /// Resume a previous interactive session (picker by default; use --last to continue the most recent).
-    Resume(ResumeCommand),
-
     /// Internal: generate TypeScript protocol bindings.
     #[clap(hide = true)]
     GenerateTs(GenerateTsCommand),
@@ -91,21 +85,6 @@ struct CompletionCommand {
     shell: Shell,
 }
 
-#[derive(Debug, Parser)]
-struct ResumeCommand {
-    /// Conversation/session id (UUID). When provided, resumes this session.
-    /// If omitted, use --last to pick the most recent recorded session.
-    #[arg(value_name = "SESSION_ID")]
-    session_id: Option<String>,
-
-    /// Continue the most recent session without showing the picker.
-    #[arg(long = "last", default_value_t = false, conflicts_with = "session_id")]
-    last: bool,
-
-    #[clap(flatten)]
-    config_overrides: TuiCli,
-}
-
 #[derive(Debug, Parser)]
 struct DebugArgs {
     #[command(subcommand)]
@@ -164,54 +143,26 @@ fn main() -> anyhow::Result<()> {
 }
 
 async fn cli_main(codex_linux_sandbox_exe: Option<PathBuf>) -> anyhow::Result<()> {
-    let MultitoolCli {
-        config_overrides: root_config_overrides,
-        mut interactive,
-        subcommand,
-    } = MultitoolCli::parse();
+    let cli = MultitoolCli::parse();
 
-    match subcommand {
+    match cli.subcommand {
         None => {
-            prepend_config_flags(
-                &mut interactive.config_overrides,
-                root_config_overrides.clone(),
-            );
-            let usage = codex_tui::run_main(interactive, codex_linux_sandbox_exe).await?;
+            let mut tui_cli = cli.interactive;
+            prepend_config_flags(&mut tui_cli.config_overrides, cli.config_overrides);
+            let usage = codex_tui::run_main(tui_cli, codex_linux_sandbox_exe).await?;
             if !usage.is_zero() {
                 println!("{}", codex_core::protocol::FinalOutput::from(usage));
             }
         }
         Some(Subcommand::Exec(mut exec_cli)) => {
-            prepend_config_flags(
-                &mut exec_cli.config_overrides,
-                root_config_overrides.clone(),
-            );
+            prepend_config_flags(&mut exec_cli.config_overrides, cli.config_overrides);
             codex_exec::run_main(exec_cli, codex_linux_sandbox_exe).await?;
         }
-        Some(Subcommand::Mcp(mut mcp_cli)) => {
-            // Propagate any root-level config overrides (e.g. `-c key=value`).
-            prepend_config_flags(&mut mcp_cli.config_overrides, root_config_overrides.clone());
-            mcp_cli.run(codex_linux_sandbox_exe).await?;
-        }
-        Some(Subcommand::Resume(ResumeCommand {
-            session_id,
-            last,
-            config_overrides,
-        })) => {
-            interactive = finalize_resume_interactive(
-                interactive,
-                root_config_overrides.clone(),
-                session_id,
-                last,
-                config_overrides,
-            );
-            codex_tui::run_main(interactive, codex_linux_sandbox_exe).await?;
+        Some(Subcommand::Mcp) => {
+            codex_mcp_server::run_main(codex_linux_sandbox_exe, cli.config_overrides).await?;
         }
         Some(Subcommand::Login(mut login_cli)) => {
-            prepend_config_flags(
-                &mut login_cli.config_overrides,
-                root_config_overrides.clone(),
-            );
+            prepend_config_flags(&mut login_cli.config_overrides, cli.config_overrides);
             match login_cli.action {
                 Some(LoginSubcommand::Status) => {
                     run_login_status(login_cli.config_overrides).await;
@@ -226,17 +177,11 @@ async fn cli_main(codex_linux_sandbox_exe: Option<PathBuf>) -> anyhow::Result<()
             }
         }
         Some(Subcommand::Logout(mut logout_cli)) => {
-            prepend_config_flags(
-                &mut logout_cli.config_overrides,
-                root_config_overrides.clone(),
-            );
+            prepend_config_flags(&mut logout_cli.config_overrides, cli.config_overrides);
             run_logout(logout_cli.config_overrides).await;
         }
         Some(Subcommand::Proto(mut proto_cli)) => {
-            prepend_config_flags(
-                &mut proto_cli.config_overrides,
-                root_config_overrides.clone(),
-            );
+            prepend_config_flags(&mut proto_cli.config_overrides, cli.config_overrides);
             proto::run_main(proto_cli).await?;
         }
         Some(Subcommand::Completion(completion_cli)) => {
@@ -244,10 +189,7 @@ async fn cli_main(codex_linux_sandbox_exe: Option<PathBuf>) -> anyhow::Result<()
         }
         Some(Subcommand::Debug(debug_args)) => match debug_args.cmd {
             DebugCommand::Seatbelt(mut seatbelt_cli) => {
-                prepend_config_flags(
-                    &mut seatbelt_cli.config_overrides,
-                    root_config_overrides.clone(),
-                );
+                prepend_config_flags(&mut seatbelt_cli.config_overrides, cli.config_overrides);
                 codex_cli::debug_sandbox::run_command_under_seatbelt(
                     seatbelt_cli,
                     codex_linux_sandbox_exe,
@@ -255,10 +197,7 @@ async fn cli_main(codex_linux_sandbox_exe: Option<PathBuf>) -> anyhow::Result<()
                 .await?;
             }
             DebugCommand::Landlock(mut landlock_cli) => {
-                prepend_config_flags(
-                    &mut landlock_cli.config_overrides,
-                    root_config_overrides.clone(),
-                );
+                prepend_config_flags(&mut landlock_cli.config_overrides, cli.config_overrides);
                 codex_cli::debug_sandbox::run_command_under_landlock(
                     landlock_cli,
                     codex_linux_sandbox_exe,
@@ -267,10 +206,7 @@ async fn cli_main(codex_linux_sandbox_exe: Option<PathBuf>) -> anyhow::Result<()
             }
         },
         Some(Subcommand::Apply(mut apply_cli)) => {
-            prepend_config_flags(
-                &mut apply_cli.config_overrides,
-                root_config_overrides.clone(),
-            );
+            prepend_config_flags(&mut apply_cli.config_overrides, cli.config_overrides);
             run_apply_command(apply_cli, None).await?;
         }
         Some(Subcommand::GenerateTs(gen_cli)) => {
@@ -292,208 +228,8 @@ fn prepend_config_flags(
         .splice(0..0, cli_config_overrides.raw_overrides);
 }
 
-/// Build the final `TuiCli` for a `codex resume` invocation.
-fn finalize_resume_interactive(
-    mut interactive: TuiCli,
-    root_config_overrides: CliConfigOverrides,
-    session_id: Option<String>,
-    last: bool,
-    resume_cli: TuiCli,
-) -> TuiCli {
-    // Start with the parsed interactive CLI so resume shares the same
-    // configuration surface area as `codex` without additional flags.
-    let resume_session_id = session_id;
-    interactive.resume_picker = resume_session_id.is_none() && !last;
-    interactive.resume_last = last;
-    interactive.resume_session_id = resume_session_id;
-
-    // Merge resume-scoped flags and overrides with highest precedence.
-    merge_resume_cli_flags(&mut interactive, resume_cli);
-
-    // Propagate any root-level config overrides (e.g. `-c key=value`).
-    prepend_config_flags(&mut interactive.config_overrides, root_config_overrides);
-
-    interactive
-}
-
-/// Merge flags provided to `codex resume` so they take precedence over any
-/// root-level flags. Only overrides fields explicitly set on the resume-scoped
-/// CLI. Also appends `-c key=value` overrides with highest precedence.
-fn merge_resume_cli_flags(interactive: &mut TuiCli, resume_cli: TuiCli) {
-    if let Some(model) = resume_cli.model {
-        interactive.model = Some(model);
-    }
-    if resume_cli.oss {
-        interactive.oss = true;
-    }
-    if let Some(profile) = resume_cli.config_profile {
-        interactive.config_profile = Some(profile);
-    }
-    if let Some(sandbox) = resume_cli.sandbox_mode {
-        interactive.sandbox_mode = Some(sandbox);
-    }
-    if let Some(approval) = resume_cli.approval_policy {
-        interactive.approval_policy = Some(approval);
-    }
-    if resume_cli.full_auto {
-        interactive.full_auto = true;
-    }
-    if resume_cli.dangerously_bypass_approvals_and_sandbox {
-        interactive.dangerously_bypass_approvals_and_sandbox = true;
-    }
-    if let Some(cwd) = resume_cli.cwd {
-        interactive.cwd = Some(cwd);
-    }
-    if resume_cli.web_search {
-        interactive.web_search = true;
-    }
-    if !resume_cli.images.is_empty() {
-        interactive.images = resume_cli.images;
-    }
-    if let Some(prompt) = resume_cli.prompt {
-        interactive.prompt = Some(prompt);
-    }
-
-    interactive
-        .config_overrides
-        .raw_overrides
-        .extend(resume_cli.config_overrides.raw_overrides);
-}
-
 fn print_completion(cmd: CompletionCommand) {
     let mut app = MultitoolCli::command();
     let name = "codex";
     generate(cmd.shell, &mut app, name, &mut std::io::stdout());
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn finalize_from_args(args: &[&str]) -> TuiCli {
-        let cli = MultitoolCli::try_parse_from(args).expect("parse");
-        let MultitoolCli {
-            interactive,
-            config_overrides: root_overrides,
-            subcommand,
-        } = cli;
-
-        let Subcommand::Resume(ResumeCommand {
-            session_id,
-            last,
-            config_overrides: resume_cli,
-        }) = subcommand.expect("resume present")
-        else {
-            unreachable!()
-        };
-
-        finalize_resume_interactive(interactive, root_overrides, session_id, last, resume_cli)
-    }
-
-    #[test]
-    fn resume_model_flag_applies_when_no_root_flags() {
-        let interactive = finalize_from_args(["codex", "resume", "-m", "gpt-5-test"].as_ref());
-
-        assert_eq!(interactive.model.as_deref(), Some("gpt-5-test"));
-        assert!(interactive.resume_picker);
-        assert!(!interactive.resume_last);
-        assert_eq!(interactive.resume_session_id, None);
-    }
-
-    #[test]
-    fn resume_picker_logic_none_and_not_last() {
-        let interactive = finalize_from_args(["codex", "resume"].as_ref());
-        assert!(interactive.resume_picker);
-        assert!(!interactive.resume_last);
-        assert_eq!(interactive.resume_session_id, None);
-    }
-
-    #[test]
-    fn resume_picker_logic_last() {
-        let interactive = finalize_from_args(["codex", "resume", "--last"].as_ref());
-        assert!(!interactive.resume_picker);
-        assert!(interactive.resume_last);
-        assert_eq!(interactive.resume_session_id, None);
-    }
-
-    #[test]
-    fn resume_picker_logic_with_session_id() {
-        let interactive = finalize_from_args(["codex", "resume", "1234"].as_ref());
-        assert!(!interactive.resume_picker);
-        assert!(!interactive.resume_last);
-        assert_eq!(interactive.resume_session_id.as_deref(), Some("1234"));
-    }
-
-    #[test]
-    fn resume_merges_option_flags_and_full_auto() {
-        let interactive = finalize_from_args(
-            [
-                "codex",
-                "resume",
-                "sid",
-                "--oss",
-                "--full-auto",
-                "--search",
-                "--sandbox",
-                "workspace-write",
-                "--ask-for-approval",
-                "on-request",
-                "-m",
-                "gpt-5-test",
-                "-p",
-                "my-profile",
-                "-C",
-                "/tmp",
-                "-i",
-                "/tmp/a.png,/tmp/b.png",
-            ]
-            .as_ref(),
-        );
-
-        assert_eq!(interactive.model.as_deref(), Some("gpt-5-test"));
-        assert!(interactive.oss);
-        assert_eq!(interactive.config_profile.as_deref(), Some("my-profile"));
-        assert!(matches!(
-            interactive.sandbox_mode,
-            Some(codex_common::SandboxModeCliArg::WorkspaceWrite)
-        ));
-        assert!(matches!(
-            interactive.approval_policy,
-            Some(codex_common::ApprovalModeCliArg::OnRequest)
-        ));
-        assert!(interactive.full_auto);
-        assert_eq!(
-            interactive.cwd.as_deref(),
-            Some(std::path::Path::new("/tmp"))
-        );
-        assert!(interactive.web_search);
-        let has_a = interactive
-            .images
-            .iter()
-            .any(|p| p == std::path::Path::new("/tmp/a.png"));
-        let has_b = interactive
-            .images
-            .iter()
-            .any(|p| p == std::path::Path::new("/tmp/b.png"));
-        assert!(has_a && has_b);
-        assert!(!interactive.resume_picker);
-        assert!(!interactive.resume_last);
-        assert_eq!(interactive.resume_session_id.as_deref(), Some("sid"));
-    }
-
-    #[test]
-    fn resume_merges_dangerously_bypass_flag() {
-        let interactive = finalize_from_args(
-            [
-                "codex",
-                "resume",
-                "--dangerously-bypass-approvals-and-sandbox",
-            ]
-            .as_ref(),
-        );
-        assert!(interactive.dangerously_bypass_approvals_and_sandbox);
-        assert!(interactive.resume_picker);
-        assert!(!interactive.resume_last);
-        assert_eq!(interactive.resume_session_id, None);
-    }
-}

codex-rs/cli/src/mcp_cmd.rs

@@ -1,370 +0,0 @@
-use std::collections::BTreeMap;
-use std::collections::HashMap;
-use std::path::PathBuf;
-
-use anyhow::Context;
-use anyhow::Result;
-use anyhow::anyhow;
-use anyhow::bail;
-use codex_common::CliConfigOverrides;
-use codex_core::config::Config;
-use codex_core::config::ConfigOverrides;
-use codex_core::config::find_codex_home;
-use codex_core::config::load_global_mcp_servers;
-use codex_core::config::write_global_mcp_servers;
-use codex_core::config_types::McpServerConfig;
-
-/// [experimental] Launch Codex as an MCP server or manage configured MCP servers.
-///
-/// Subcommands:
-/// - `serve`  — run the MCP server on stdio
-/// - `list`   — list configured servers (with `--json`)
-/// - `get`    — show a single server (with `--json`)
-/// - `add`    — add a server launcher entry to `~/.codex/config.toml`
-/// - `remove` — delete a server entry
-#[derive(Debug, clap::Parser)]
-pub struct McpCli {
-    #[clap(flatten)]
-    pub config_overrides: CliConfigOverrides,
-
-    #[command(subcommand)]
-    pub cmd: Option<McpSubcommand>,
-}
-
-#[derive(Debug, clap::Subcommand)]
-pub enum McpSubcommand {
-    /// [experimental] Run the Codex MCP server (stdio transport).
-    Serve,
-
-    /// [experimental] List configured MCP servers.
-    List(ListArgs),
-
-    /// [experimental] Show details for a configured MCP server.
-    Get(GetArgs),
-
-    /// [experimental] Add a global MCP server entry.
-    Add(AddArgs),
-
-    /// [experimental] Remove a global MCP server entry.
-    Remove(RemoveArgs),
-}
-
-#[derive(Debug, clap::Parser)]
-pub struct ListArgs {
-    /// Output the configured servers as JSON.
-    #[arg(long)]
-    pub json: bool,
-}
-
-#[derive(Debug, clap::Parser)]
-pub struct GetArgs {
-    /// Name of the MCP server to display.
-    pub name: String,
-
-    /// Output the server configuration as JSON.
-    #[arg(long)]
-    pub json: bool,
-}
-
-#[derive(Debug, clap::Parser)]
-pub struct AddArgs {
-    /// Name for the MCP server configuration.
-    pub name: String,
-
-    /// Environment variables to set when launching the server.
-    #[arg(long, value_parser = parse_env_pair, value_name = "KEY=VALUE")]
-    pub env: Vec<(String, String)>,
-
-    /// Command to launch the MCP server.
-    #[arg(trailing_var_arg = true, num_args = 1..)]
-    pub command: Vec<String>,
-}
-
-#[derive(Debug, clap::Parser)]
-pub struct RemoveArgs {
-    /// Name of the MCP server configuration to remove.
-    pub name: String,
-}
-
-impl McpCli {
-    pub async fn run(self, codex_linux_sandbox_exe: Option<PathBuf>) -> Result<()> {
-        let McpCli {
-            config_overrides,
-            cmd,
-        } = self;
-        let subcommand = cmd.unwrap_or(McpSubcommand::Serve);
-
-        match subcommand {
-            McpSubcommand::Serve => {
-                codex_mcp_server::run_main(codex_linux_sandbox_exe, config_overrides).await?;
-            }
-            McpSubcommand::List(args) => {
-                run_list(&config_overrides, args)?;
-            }
-            McpSubcommand::Get(args) => {
-                run_get(&config_overrides, args)?;
-            }
-            McpSubcommand::Add(args) => {
-                run_add(&config_overrides, args)?;
-            }
-            McpSubcommand::Remove(args) => {
-                run_remove(&config_overrides, args)?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-fn run_add(config_overrides: &CliConfigOverrides, add_args: AddArgs) -> Result<()> {
-    // Validate any provided overrides even though they are not currently applied.
-    config_overrides.parse_overrides().map_err(|e| anyhow!(e))?;
-
-    let AddArgs { name, env, command } = add_args;
-
-    validate_server_name(&name)?;
-
-    let mut command_parts = command.into_iter();
-    let command_bin = command_parts
-        .next()
-        .ok_or_else(|| anyhow!("command is required"))?;
-    let command_args: Vec<String> = command_parts.collect();
-
-    let env_map = if env.is_empty() {
-        None
-    } else {
-        let mut map = HashMap::new();
-        for (key, value) in env {
-            map.insert(key, value);
-        }
-        Some(map)
-    };
-
-    let codex_home = find_codex_home().context("failed to resolve CODEX_HOME")?;
-    let mut servers = load_global_mcp_servers(&codex_home)
-        .with_context(|| format!("failed to load MCP servers from {}", codex_home.display()))?;
-
-    let new_entry = McpServerConfig {
-        command: command_bin,
-        args: command_args,
-        env: env_map,
-        startup_timeout_ms: None,
-    };
-
-    servers.insert(name.clone(), new_entry);
-
-    write_global_mcp_servers(&codex_home, &servers)
-        .with_context(|| format!("failed to write MCP servers to {}", codex_home.display()))?;
-
-    println!("Added global MCP server '{name}'.");
-
-    Ok(())
-}
-
-fn run_remove(config_overrides: &CliConfigOverrides, remove_args: RemoveArgs) -> Result<()> {
-    config_overrides.parse_overrides().map_err(|e| anyhow!(e))?;
-
-    let RemoveArgs { name } = remove_args;
-
-    validate_server_name(&name)?;
-
-    let codex_home = find_codex_home().context("failed to resolve CODEX_HOME")?;
-    let mut servers = load_global_mcp_servers(&codex_home)
-        .with_context(|| format!("failed to load MCP servers from {}", codex_home.display()))?;
-
-    let removed = servers.remove(&name).is_some();
-
-    if removed {
-        write_global_mcp_servers(&codex_home, &servers)
-            .with_context(|| format!("failed to write MCP servers to {}", codex_home.display()))?;
-    }
-
-    if removed {
-        println!("Removed global MCP server '{name}'.");
-    } else {
-        println!("No MCP server named '{name}' found.");
-    }
-
-    Ok(())
-}
-
-fn run_list(config_overrides: &CliConfigOverrides, list_args: ListArgs) -> Result<()> {
-    let overrides = config_overrides.parse_overrides().map_err(|e| anyhow!(e))?;
-    let config = Config::load_with_cli_overrides(overrides, ConfigOverrides::default())
-        .context("failed to load configuration")?;
-
-    let mut entries: Vec<_> = config.mcp_servers.iter().collect();
-    entries.sort_by(|(a, _), (b, _)| a.cmp(b));
-
-    if list_args.json {
-        let json_entries: Vec<_> = entries
-            .into_iter()
-            .map(|(name, cfg)| {
-                let env = cfg.env.as_ref().map(|env| {
-                    env.iter()
-                        .map(|(k, v)| (k.clone(), v.clone()))
-                        .collect::<BTreeMap<_, _>>()
-                });
-                serde_json::json!({
-                    "name": name,
-                    "command": cfg.command,
-                    "args": cfg.args,
-                    "env": env,
-                    "startup_timeout_ms": cfg.startup_timeout_ms,
-                })
-            })
-            .collect();
-        let output = serde_json::to_string_pretty(&json_entries)?;
-        println!("{output}");
-        return Ok(());
-    }
-
-    if entries.is_empty() {
-        println!("No MCP servers configured yet. Try `codex mcp add my-tool -- my-command`.");
-        return Ok(());
-    }
-
-    let mut rows: Vec<[String; 4]> = Vec::new();
-    for (name, cfg) in entries {
-        let args = if cfg.args.is_empty() {
-            "-".to_string()
-        } else {
-            cfg.args.join(" ")
-        };
-
-        let env = match cfg.env.as_ref() {
-            None => "-".to_string(),
-            Some(map) if map.is_empty() => "-".to_string(),
-            Some(map) => {
-                let mut pairs: Vec<_> = map.iter().collect();
-                pairs.sort_by(|(a, _), (b, _)| a.cmp(b));
-                pairs
-                    .into_iter()
-                    .map(|(k, v)| format!("{k}={v}"))
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            }
-        };
-
-        rows.push([name.clone(), cfg.command.clone(), args, env]);
-    }
-
-    let mut widths = ["Name".len(), "Command".len(), "Args".len(), "Env".len()];
-    for row in &rows {
-        for (i, cell) in row.iter().enumerate() {
-            widths[i] = widths[i].max(cell.len());
-        }
-    }
-
-    println!(
-        "{:<name_w$}  {:<cmd_w$}  {:<args_w$}  {:<env_w$}",
-        "Name",
-        "Command",
-        "Args",
-        "Env",
-        name_w = widths[0],
-        cmd_w = widths[1],
-        args_w = widths[2],
-        env_w = widths[3],
-    );
-
-    for row in rows {
-        println!(
-            "{:<name_w$}  {:<cmd_w$}  {:<args_w$}  {:<env_w$}",
-            row[0],
-            row[1],
-            row[2],
-            row[3],
-            name_w = widths[0],
-            cmd_w = widths[1],
-            args_w = widths[2],
-            env_w = widths[3],
-        );
-    }
-
-    Ok(())
-}
-
-fn run_get(config_overrides: &CliConfigOverrides, get_args: GetArgs) -> Result<()> {
-    let overrides = config_overrides.parse_overrides().map_err(|e| anyhow!(e))?;
-    let config = Config::load_with_cli_overrides(overrides, ConfigOverrides::default())
-        .context("failed to load configuration")?;
-
-    let Some(server) = config.mcp_servers.get(&get_args.name) else {
-        bail!("No MCP server named '{name}' found.", name = get_args.name);
-    };
-
-    if get_args.json {
-        let env = server.env.as_ref().map(|env| {
-            env.iter()
-                .map(|(k, v)| (k.clone(), v.clone()))
-                .collect::<BTreeMap<_, _>>()
-        });
-        let output = serde_json::to_string_pretty(&serde_json::json!({
-            "name": get_args.name,
-            "command": server.command,
-            "args": server.args,
-            "env": env,
-            "startup_timeout_ms": server.startup_timeout_ms,
-        }))?;
-        println!("{output}");
-        return Ok(());
-    }
-
-    println!("{}", get_args.name);
-    println!("  command: {}", server.command);
-    let args = if server.args.is_empty() {
-        "-".to_string()
-    } else {
-        server.args.join(" ")
-    };
-    println!("  args: {args}");
-    let env_display = match server.env.as_ref() {
-        None => "-".to_string(),
-        Some(map) if map.is_empty() => "-".to_string(),
-        Some(map) => {
-            let mut pairs: Vec<_> = map.iter().collect();
-            pairs.sort_by(|(a, _), (b, _)| a.cmp(b));
-            pairs
-                .into_iter()
-                .map(|(k, v)| format!("{k}={v}"))
-                .collect::<Vec<_>>()
-                .join(", ")
-        }
-    };
-    println!("  env: {env_display}");
-    if let Some(timeout) = server.startup_timeout_ms {
-        println!("  startup_timeout_ms: {timeout}");
-    }
-    println!("  remove: codex mcp remove {}", get_args.name);
-
-    Ok(())
-}
-
-fn parse_env_pair(raw: &str) -> Result<(String, String), String> {
-    let mut parts = raw.splitn(2, '=');
-    let key = parts
-        .next()
-        .map(str::trim)
-        .filter(|s| !s.is_empty())
-        .ok_or_else(|| "environment entries must be in KEY=VALUE form".to_string())?;
-    let value = parts
-        .next()
-        .map(str::to_string)
-        .ok_or_else(|| "environment entries must be in KEY=VALUE form".to_string())?;
-
-    Ok((key.to_string(), value))
-}
-
-fn validate_server_name(name: &str) -> Result<()> {
-    let is_valid = !name.is_empty()
-        && name
-            .chars()
-            .all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_');
-
-    if is_valid {
-        Ok(())
-    } else {
-        bail!("invalid server name '{name}' (use letters, numbers, '-', '_')");
-    }
-}

codex-rs/cli/tests/mcp_add_remove.rs

@@ -1,86 +0,0 @@
-use std::path::Path;
-
-use anyhow::Result;
-use codex_core::config::load_global_mcp_servers;
-use predicates::str::contains;
-use pretty_assertions::assert_eq;
-use tempfile::TempDir;
-
-fn codex_command(codex_home: &Path) -> Result<assert_cmd::Command> {
-    let mut cmd = assert_cmd::Command::cargo_bin("codex")?;
-    cmd.env("CODEX_HOME", codex_home);
-    Ok(cmd)
-}
-
-#[test]
-fn add_and_remove_server_updates_global_config() -> Result<()> {
-    let codex_home = TempDir::new()?;
-
-    let mut add_cmd = codex_command(codex_home.path())?;
-    add_cmd
-        .args(["mcp", "add", "docs", "--", "echo", "hello"])
-        .assert()
-        .success()
-        .stdout(contains("Added global MCP server 'docs'."));
-
-    let servers = load_global_mcp_servers(codex_home.path())?;
-    assert_eq!(servers.len(), 1);
-    let docs = servers.get("docs").expect("server should exist");
-    assert_eq!(docs.command, "echo");
-    assert_eq!(docs.args, vec!["hello".to_string()]);
-    assert!(docs.env.is_none());
-
-    let mut remove_cmd = codex_command(codex_home.path())?;
-    remove_cmd
-        .args(["mcp", "remove", "docs"])
-        .assert()
-        .success()
-        .stdout(contains("Removed global MCP server 'docs'."));
-
-    let servers = load_global_mcp_servers(codex_home.path())?;
-    assert!(servers.is_empty());
-
-    let mut remove_again_cmd = codex_command(codex_home.path())?;
-    remove_again_cmd
-        .args(["mcp", "remove", "docs"])
-        .assert()
-        .success()
-        .stdout(contains("No MCP server named 'docs' found."));
-
-    let servers = load_global_mcp_servers(codex_home.path())?;
-    assert!(servers.is_empty());
-
-    Ok(())
-}
-
-#[test]
-fn add_with_env_preserves_key_order_and_values() -> Result<()> {
-    let codex_home = TempDir::new()?;
-
-    let mut add_cmd = codex_command(codex_home.path())?;
-    add_cmd
-        .args([
-            "mcp",
-            "add",
-            "envy",
-            "--env",
-            "FOO=bar",
-            "--env",
-            "ALPHA=beta",
-            "--",
-            "python",
-            "server.py",
-        ])
-        .assert()
-        .success();
-
-    let servers = load_global_mcp_servers(codex_home.path())?;
-    let envy = servers.get("envy").expect("server should exist");
-    let env = envy.env.as_ref().expect("env should be present");
-
-    assert_eq!(env.len(), 2);
-    assert_eq!(env.get("FOO"), Some(&"bar".to_string()));
-    assert_eq!(env.get("ALPHA"), Some(&"beta".to_string()));
-
-    Ok(())
-}

codex-rs/cli/tests/mcp_list.rs

@@ -1,106 +0,0 @@
-use std::path::Path;
-
-use anyhow::Result;
-use predicates::str::contains;
-use pretty_assertions::assert_eq;
-use serde_json::Value as JsonValue;
-use tempfile::TempDir;
-
-fn codex_command(codex_home: &Path) -> Result<assert_cmd::Command> {
-    let mut cmd = assert_cmd::Command::cargo_bin("codex")?;
-    cmd.env("CODEX_HOME", codex_home);
-    Ok(cmd)
-}
-
-#[test]
-fn list_shows_empty_state() -> Result<()> {
-    let codex_home = TempDir::new()?;
-
-    let mut cmd = codex_command(codex_home.path())?;
-    let output = cmd.args(["mcp", "list"]).output()?;
-    assert!(output.status.success());
-    let stdout = String::from_utf8(output.stdout)?;
-    assert!(stdout.contains("No MCP servers configured yet."));
-
-    Ok(())
-}
-
-#[test]
-fn list_and_get_render_expected_output() -> Result<()> {
-    let codex_home = TempDir::new()?;
-
-    let mut add = codex_command(codex_home.path())?;
-    add.args([
-        "mcp",
-        "add",
-        "docs",
-        "--env",
-        "TOKEN=secret",
-        "--",
-        "docs-server",
-        "--port",
-        "4000",
-    ])
-    .assert()
-    .success();
-
-    let mut list_cmd = codex_command(codex_home.path())?;
-    let list_output = list_cmd.args(["mcp", "list"]).output()?;
-    assert!(list_output.status.success());
-    let stdout = String::from_utf8(list_output.stdout)?;
-    assert!(stdout.contains("Name"));
-    assert!(stdout.contains("docs"));
-    assert!(stdout.contains("docs-server"));
-    assert!(stdout.contains("TOKEN=secret"));
-
-    let mut list_json_cmd = codex_command(codex_home.path())?;
-    let json_output = list_json_cmd.args(["mcp", "list", "--json"]).output()?;
-    assert!(json_output.status.success());
-    let stdout = String::from_utf8(json_output.stdout)?;
-    let parsed: JsonValue = serde_json::from_str(&stdout)?;
-    let array = parsed.as_array().expect("expected array");
-    assert_eq!(array.len(), 1);
-    let entry = &array[0];
-    assert_eq!(entry.get("name"), Some(&JsonValue::String("docs".into())));
-    assert_eq!(
-        entry.get("command"),
-        Some(&JsonValue::String("docs-server".into()))
-    );
-
-    let args = entry
-        .get("args")
-        .and_then(|v| v.as_array())
-        .expect("args array");
-    assert_eq!(
-        args,
-        &vec![
-            JsonValue::String("--port".into()),
-            JsonValue::String("4000".into())
-        ]
-    );
-
-    let env = entry
-        .get("env")
-        .and_then(|v| v.as_object())
-        .expect("env map");
-    assert_eq!(env.get("TOKEN"), Some(&JsonValue::String("secret".into())));
-
-    let mut get_cmd = codex_command(codex_home.path())?;
-    let get_output = get_cmd.args(["mcp", "get", "docs"]).output()?;
-    assert!(get_output.status.success());
-    let stdout = String::from_utf8(get_output.stdout)?;
-    assert!(stdout.contains("docs"));
-    assert!(stdout.contains("command: docs-server"));
-    assert!(stdout.contains("args: --port 4000"));
-    assert!(stdout.contains("env: TOKEN=secret"));
-    assert!(stdout.contains("remove: codex mcp remove docs"));
-
-    let mut get_json_cmd = codex_command(codex_home.path())?;
-    get_json_cmd
-        .args(["mcp", "get", "docs", "--json"])
-        .assert()
-        .success()
-        .stdout(contains("\"name\": \"docs\""));
-
-    Ok(())
-}

codex-rs/common/src/model_presets.rs

@@ -1,6 +1,4 @@
-use codex_core::config::GPT_5_CODEX_MEDIUM_MODEL;
 use codex_core::protocol_config_types::ReasoningEffort;
-use codex_protocol::mcp_protocol::AuthMode;
 
 /// A simple preset pairing a model slug with a reasoning effort.
 #[derive(Debug, Clone, Copy)]
@@ -17,65 +15,61 @@ pub struct ModelPreset {
     pub effort: Option<ReasoningEffort>,
 }
 
-const PRESETS: &[ModelPreset] = &[
-    ModelPreset {
-        id: "gpt-5-codex-low",
-        label: "gpt-5-codex low",
-        description: "",
-        model: "gpt-5-codex",
-        effort: Some(ReasoningEffort::Low),
-    },
-    ModelPreset {
-        id: "gpt-5-codex-medium",
-        label: "gpt-5-codex medium",
-        description: "",
-        model: "gpt-5-codex",
-        effort: None,
-    },
-    ModelPreset {
-        id: "gpt-5-codex-high",
-        label: "gpt-5-codex high",
-        description: "",
-        model: "gpt-5-codex",
-        effort: Some(ReasoningEffort::High),
-    },
-    ModelPreset {
-        id: "gpt-5-minimal",
-        label: "gpt-5 minimal",
-        description: "— fastest responses with limited reasoning; ideal for coding, instructions, or lightweight tasks",
-        model: "gpt-5",
-        effort: Some(ReasoningEffort::Minimal),
-    },
-    ModelPreset {
-        id: "gpt-5-low",
-        label: "gpt-5 low",
-        description: "— balances speed with some reasoning; useful for straightforward queries and short explanations",
-        model: "gpt-5",
-        effort: Some(ReasoningEffort::Low),
-    },
-    ModelPreset {
-        id: "gpt-5-medium",
-        label: "gpt-5 medium",
-        description: "— default setting; provides a solid balance of reasoning depth and latency for general-purpose tasks",
-        model: "gpt-5",
-        effort: Some(ReasoningEffort::Medium),
-    },
-    ModelPreset {
-        id: "gpt-5-high",
-        label: "gpt-5 high",
-        description: "— maximizes reasoning depth for complex or ambiguous problems",
-        model: "gpt-5",
-        effort: Some(ReasoningEffort::High),
-    },
-];
-
-pub fn builtin_model_presets(auth_mode: Option<AuthMode>) -> Vec<ModelPreset> {
-    match auth_mode {
-        Some(AuthMode::ApiKey) => PRESETS
-            .iter()
-            .copied()
-            .filter(|p| p.model != GPT_5_CODEX_MEDIUM_MODEL)
-            .collect(),
-        _ => PRESETS.to_vec(),
-    }
+/// Built-in list of model presets that pair a model with a reasoning effort.
+///
+/// Keep this UI-agnostic so it can be reused by both TUI and MCP server.
+pub fn builtin_model_presets() -> &'static [ModelPreset] {
+    // Order groups swiftfox variants before gpt-5 presets, each from minimal to high.
+    const PRESETS: &[ModelPreset] = &[
+        ModelPreset {
+            id: "swiftfox-low",
+            label: "swiftfox low",
+            description: "",
+            model: "swiftfox",
+            effort: Some(ReasoningEffort::Low),
+        },
+        ModelPreset {
+            id: "swiftfox-medium",
+            label: "swiftfox medium",
+            description: "",
+            model: "swiftfox",
+            effort: None,
+        },
+        ModelPreset {
+            id: "swiftfox-high",
+            label: "swiftfox high",
+            description: "",
+            model: "swiftfox",
+            effort: Some(ReasoningEffort::High),
+        },
+        ModelPreset {
+            id: "gpt-5-minimal",
+            label: "gpt-5 minimal",
+            description: "— fastest responses with limited reasoning; ideal for coding, instructions, or lightweight tasks",
+            model: "gpt-5",
+            effort: Some(ReasoningEffort::Minimal),
+        },
+        ModelPreset {
+            id: "gpt-5-low",
+            label: "gpt-5 low",
+            description: "— balances speed with some reasoning; useful for straightforward queries and short explanations",
+            model: "gpt-5",
+            effort: Some(ReasoningEffort::Low),
+        },
+        ModelPreset {
+            id: "gpt-5-medium",
+            label: "gpt-5 medium",
+            description: "— default setting; provides a solid balance of reasoning depth and latency for general-purpose tasks",
+            model: "gpt-5",
+            effort: Some(ReasoningEffort::Medium),
+        },
+        ModelPreset {
+            id: "gpt-5-high",
+            label: "gpt-5 high",
+            description: "— maximizes reasoning depth for complex or ambiguous problems",
+            model: "gpt-5",
+            effort: Some(ReasoningEffort::High),
+        },
+    ];
+    PRESETS
 }

codex-rs/core/Cargo.toml

@@ -19,7 +19,6 @@ base64 = "0.22"
 bytes = "1.10.1"
 chrono = { version = "0.4", features = ["serde"] }
 codex-apply-patch = { path = "../apply-patch" }
-codex-file-search = { path = "../file-search" }
 codex-mcp-client = { path = "../mcp-client" }
 codex-protocol = { path = "../protocol" }
 dirs = "6"
@@ -57,7 +56,7 @@ tree-sitter = "0.25.9"
 tree-sitter-bash = "0.25.0"
 uuid = { version = "1", features = ["serde", "v4"] }
 which = "6"
-wildmatch = "2.5.0"
+wildmatch = "2.4.0"
 
 
 [target.'cfg(target_os = "linux")'.dependencies]

codex-rs/core/prompt.md

@@ -251,16 +251,6 @@ You are producing plain text that will later be styled by the CLI. Follow these
 - Apply to inline examples and to bullet keywords if the keyword itself is a literal file/command.
 - Never mix monospace and bold markers; choose one based on whether it’s a keyword (`**`) or inline code/path (`` ` ``).
 
-**File References**
-When referencing files in your response, make sure to include the relevant start line and always follow the below rules:
-  * Use inline code to make file paths clickable.
-  * Each reference should have a stand alone path. Even if it's the same file.
-  * Accepted: absolute, workspace‑relative, a/ or b/ diff prefixes, or bare filename/suffix.
-  * Line/column (1‑based, optional): :line[:column] or #Lline[Ccolumn] (column defaults to 1).
-  * Do not use URIs like file://, vscode://, or https://.
-  * Do not provide range of lines
-  * Examples: src/app.ts, src/app.ts:42, b/server/index.js#L10, C:\repo\project\main.rs:12:5
-
 **Structure**
 
 - Place related bullets together; don’t mix unrelated concepts in the same section.

codex-rs/core/src/auth.rs

@@ -408,32 +408,6 @@ mod tests {
         assert_eq!(auth_dot_json, same_auth_dot_json);
     }
 
-    #[test]
-    fn login_with_api_key_overwrites_existing_auth_json() {
-        let dir = tempdir().unwrap();
-        let auth_path = dir.path().join("auth.json");
-        let stale_auth = json!({
-            "OPENAI_API_KEY": "sk-old",
-            "tokens": {
-                "id_token": "stale.header.payload",
-                "access_token": "stale-access",
-                "refresh_token": "stale-refresh",
-                "account_id": "stale-acc"
-            }
-        });
-        std::fs::write(
-            &auth_path,
-            serde_json::to_string_pretty(&stale_auth).unwrap(),
-        )
-        .unwrap();
-
-        super::login_with_api_key(dir.path(), "sk-new").expect("login_with_api_key should succeed");
-
-        let auth = super::try_read_auth_json(&auth_path).expect("auth.json should parse");
-        assert_eq!(auth.openai_api_key.as_deref(), Some("sk-new"));
-        assert!(auth.tokens.is_none(), "tokens should be cleared");
-    }
-
     #[tokio::test]
     async fn pro_account_with_no_api_key_uses_chatgpt_auth() {
         let codex_home = tempdir().unwrap();

codex-rs/core/src/client_common.rs

@@ -41,9 +41,8 @@ impl Prompt {
             .unwrap_or(model.base_instructions.deref());
         let mut sections: Vec<&str> = vec![base];
 
-        // When there are no custom instructions, add apply_patch_tool_instructions if:
-        // - the model needs special instructions (4.1)
-        // AND
+        // When there are no custom instructions, add apply_patch_tool_instructions if either:
+        // - the model needs special instructions (4.1), or
         // - there is no apply_patch tool present
         let is_apply_patch_tool_present = self.tools.iter().any(|tool| match tool {
             OpenAiTool::Function(f) => f.name == "apply_patch",
@@ -51,8 +50,7 @@ impl Prompt {
             _ => false,
         });
         if self.base_instructions_override.is_none()
-            && model.needs_special_apply_patch_instructions
-            && !is_apply_patch_tool_present
+            && (model.needs_special_apply_patch_instructions || !is_apply_patch_tool_present)
         {
             sections.push(APPLY_PATCH_TOOL_INSTRUCTIONS);
         }
@@ -176,64 +174,22 @@ impl Stream for ResponseStream {
 #[cfg(test)]
 mod tests {
     use crate::model_family::find_family_for_model;
-    use pretty_assertions::assert_eq;
 
     use super::*;
 
-    struct InstructionsTestCase {
-        pub slug: &'static str,
-        pub expects_apply_patch_instructions: bool,
-    }
     #[test]
     fn get_full_instructions_no_user_content() {
         let prompt = Prompt {
             ..Default::default()
         };
-        let test_cases = vec![
-            InstructionsTestCase {
-                slug: "gpt-3.5",
-                expects_apply_patch_instructions: true,
-            },
-            InstructionsTestCase {
-                slug: "gpt-4.1",
-                expects_apply_patch_instructions: true,
-            },
-            InstructionsTestCase {
-                slug: "gpt-4o",
-                expects_apply_patch_instructions: true,
-            },
-            InstructionsTestCase {
-                slug: "gpt-5",
-                expects_apply_patch_instructions: true,
-            },
-            InstructionsTestCase {
-                slug: "codex-mini-latest",
-                expects_apply_patch_instructions: true,
-            },
-            InstructionsTestCase {
-                slug: "gpt-oss:120b",
-                expects_apply_patch_instructions: false,
-            },
-            InstructionsTestCase {
-                slug: "gpt-5-codex",
-                expects_apply_patch_instructions: false,
-            },
-        ];
-        for test_case in test_cases {
-            let model_family = find_family_for_model(test_case.slug).expect("known model slug");
-            let expected = if test_case.expects_apply_patch_instructions {
-                format!(
-                    "{}\n{}",
-                    model_family.clone().base_instructions,
-                    APPLY_PATCH_TOOL_INSTRUCTIONS
-                )
-            } else {
-                model_family.clone().base_instructions
-            };
+        let model_family = find_family_for_model("gpt-4.1").expect("known model slug");
 
-            let full = prompt.get_full_instructions(&model_family);
-            assert_eq!(full, expected);
-        }
+        let expected = format!(
+            "{}\n{}",
+            model_family.base_instructions, APPLY_PATCH_TOOL_INSTRUCTIONS
+        );
+        let full = prompt.get_full_instructions(&model_family);
+        assert_eq!(full, expected);
     }
 
     #[test]

codex-rs/core/src/codex.rs

@@ -11,7 +11,6 @@ use std::time::Duration;
 use crate::AuthManager;
 use crate::client_common::REVIEW_PROMPT;
 use crate::event_mapping::map_response_item_to_event_messages;
-use crate::review_format::format_review_findings_block;
 use async_channel::Receiver;
 use async_channel::Sender;
 use codex_apply_patch::ApplyPatchAction;
@@ -19,7 +18,6 @@ use codex_apply_patch::MaybeApplyPatchVerified;
 use codex_apply_patch::maybe_parse_apply_patch_verified;
 use codex_protocol::mcp_protocol::ConversationId;
 use codex_protocol::protocol::ConversationPathResponseEvent;
-use codex_protocol::protocol::ExitedReviewModeEvent;
 use codex_protocol::protocol::ReviewRequest;
 use codex_protocol::protocol::RolloutItem;
 use codex_protocol::protocol::TaskStartedEvent;
@@ -1155,16 +1153,20 @@ impl AgentTask {
     fn abort(self, reason: TurnAbortReason) {
         // TOCTOU?
         if !self.handle.is_finished() {
+            if self.kind == AgentTaskKind::Review {
+                let sess = self.sess.clone();
+                let sub_id = self.sub_id.clone();
+                tokio::spawn(async move {
+                    exit_review_mode(sess, sub_id, None).await;
+                });
+            }
             self.handle.abort();
             let event = Event {
-                id: self.sub_id.clone(),
+                id: self.sub_id,
                 msg: EventMsg::TurnAborted(TurnAbortedEvent { reason }),
             };
             let sess = self.sess;
             tokio::spawn(async move {
-                if self.kind == AgentTaskKind::Review {
-                    exit_review_mode(sess.clone(), self.sub_id, None).await;
-                }
                 sess.send_event(event).await;
             });
         }
@@ -1345,21 +1347,10 @@ async fn submission_loop(
                         cwd,
                         is_review_mode: false,
                     };
-
-                    // if the environment context has changed, record it in the conversation history
-                    let previous_env_context = EnvironmentContext::from(turn_context.as_ref());
-                    let new_env_context = EnvironmentContext::from(&fresh_turn_context);
-                    if !new_env_context.equals_except_shell(&previous_env_context) {
-                        sess.record_conversation_items(&[ResponseItem::from(new_env_context)])
-                            .await;
-                    }
-
-                    // Install the new persistent context for subsequent tasks/turns.
-                    turn_context = Arc::new(fresh_turn_context);
-
+                    // TODO: record the new environment context in the conversation history
                     // no current task, spawn a new one with the per‑turn context
                     let task =
-                        AgentTask::spawn(sess.clone(), Arc::clone(&turn_context), sub.id, items);
+                        AgentTask::spawn(sess.clone(), Arc::new(fresh_turn_context), sub.id, items);
                     sess.set_task(task);
                 }
             }
@@ -1557,8 +1548,7 @@ async fn spawn_review_thread(
         experimental_unified_exec_tool: config.use_experimental_unified_exec_tool,
     });
 
-    let base_instructions = REVIEW_PROMPT.to_string();
-    let review_prompt = review_request.prompt.clone();
+    let base_instructions = Some(REVIEW_PROMPT.to_string());
     let provider = parent_turn_context.client.get_provider();
     let auth_manager = parent_turn_context.client.get_auth_manager();
     let model_family = review_model_family.clone();
@@ -1567,19 +1557,16 @@ async fn spawn_review_thread(
     let mut per_turn_config = (*config).clone();
     per_turn_config.model = model.clone();
     per_turn_config.model_family = model_family.clone();
-    per_turn_config.model_reasoning_effort = Some(ReasoningEffortConfig::Low);
-    per_turn_config.model_reasoning_summary = ReasoningSummaryConfig::Detailed;
     if let Some(model_info) = get_model_info(&model_family) {
         per_turn_config.model_context_window = Some(model_info.context_window);
     }
 
-    let per_turn_config = Arc::new(per_turn_config);
     let client = ModelClient::new(
-        per_turn_config.clone(),
+        Arc::new(per_turn_config),
         auth_manager,
         provider,
-        per_turn_config.model_reasoning_effort,
-        per_turn_config.model_reasoning_summary,
+        parent_turn_context.client.get_reasoning_effort(),
+        parent_turn_context.client.get_reasoning_summary(),
         sess.conversation_id,
     );
 
@@ -1587,7 +1574,7 @@ async fn spawn_review_thread(
         client,
         tools_config,
         user_instructions: None,
-        base_instructions: Some(base_instructions.clone()),
+        base_instructions,
         approval_policy: parent_turn_context.approval_policy,
         sandbox_policy: parent_turn_context.sandbox_policy.clone(),
         shell_environment_policy: parent_turn_context.shell_environment_policy.clone(),
@@ -1597,7 +1584,7 @@ async fn spawn_review_thread(
 
     // Seed the child task with the review prompt as the initial user message.
     let input: Vec<InputItem> = vec![InputItem::Text {
-        text: format!("{base_instructions}\n\n---\n\nNow, here's your task: {review_prompt}"),
+        text: review_request.prompt.clone(),
     }];
     let tc = Arc::new(review_turn_context);
 
@@ -1655,8 +1642,6 @@ async fn run_task(
     let is_review_mode = turn_context.is_review_mode;
     let mut review_thread_history: Vec<ResponseItem> = Vec::new();
     if is_review_mode {
-        // Seed review threads with environment context so the model knows the working directory.
-        review_thread_history.extend(sess.build_initial_context(turn_context.as_ref()));
         review_thread_history.push(initial_input_for_turn.into());
     } else {
         sess.record_input_and_rollout_usermsg(&initial_input_for_turn)
@@ -3260,59 +3245,17 @@ fn convert_call_tool_result_to_function_call_output_payload(
     }
 }
 
-/// Emits an ExitedReviewMode Event with optional ReviewOutput,
-/// and records a developer message with the review output.
+/// Emits an ExitedReviewMode Event with optional ReviewOutput.
 async fn exit_review_mode(
     session: Arc<Session>,
     task_sub_id: String,
-    review_output: Option<ReviewOutputEvent>,
+    res: Option<ReviewOutputEvent>,
 ) {
     let event = Event {
         id: task_sub_id,
-        msg: EventMsg::ExitedReviewMode(ExitedReviewModeEvent {
-            review_output: review_output.clone(),
-        }),
+        msg: EventMsg::ExitedReviewMode(res),
     };
     session.send_event(event).await;
-
-    let mut user_message = String::new();
-    if let Some(out) = review_output {
-        let mut findings_str = String::new();
-        let text = out.overall_explanation.trim();
-        if !text.is_empty() {
-            findings_str.push_str(text);
-        }
-        if !out.findings.is_empty() {
-            let block = format_review_findings_block(&out.findings, None);
-            findings_str.push_str(&format!("\n{block}"));
-        }
-        user_message.push_str(&format!(
-            r#"<user_action>
-  <context>User initiated a review task. Here's the full review output from reviewer model. User may select one or more comments to resolve.</context>
-  <action>review</action>
-  <results>
-  {findings_str}
-  </results>
-</user_tool>
-"#));
-    } else {
-        user_message.push_str(r#"<user_action>
-  <context>User initiated a review task, but was interrupted. If user asks about this, tell them to re-initiate a review with `/review` and wait for it to complete.</context>
-  <action>review</action>
-  <results>
-  None.
-  </results>
-</user_tool>
-"#);
-    }
-
-    session
-        .record_conversation_items(&[ResponseItem::Message {
-            id: None,
-            role: "user".to_string(),
-            content: vec![ContentItem::InputText { text: user_message }],
-        }])
-        .await;
 }
 
 #[cfg(test)]

codex-rs/core/src/config.rs

@@ -1,7 +1,6 @@
 use crate::config_profile::ConfigProfile;
 use crate::config_types::History;
 use crate::config_types::McpServerConfig;
-use crate::config_types::Notifications;
 use crate::config_types::ReasoningSummaryFormat;
 use crate::config_types::SandboxWorkspaceWrite;
 use crate::config_types::ShellEnvironmentPolicy;
@@ -26,20 +25,17 @@ use codex_protocol::mcp_protocol::Tools;
 use codex_protocol::mcp_protocol::UserSavedConfig;
 use dirs::home_dir;
 use serde::Deserialize;
-use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::path::Path;
 use std::path::PathBuf;
 use tempfile::NamedTempFile;
 use toml::Value as TomlValue;
-use toml_edit::Array as TomlArray;
 use toml_edit::DocumentMut;
-use toml_edit::Item as TomlItem;
-use toml_edit::Table as TomlTable;
 
 const OPENAI_DEFAULT_MODEL: &str = "gpt-5";
-const OPENAI_DEFAULT_REVIEW_MODEL: &str = "gpt-5-codex";
-pub const GPT_5_CODEX_MEDIUM_MODEL: &str = "gpt-5-codex";
+const OPENAI_DEFAULT_REVIEW_MODEL: &str = "gpt-5";
+pub const SWIFTFOX_MEDIUM_MODEL: &str = "swiftfox";
+pub const SWIFTFOX_MODEL_DISPLAY_NAME: &str = "swiftfox-medium";
 
 /// 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
@@ -118,10 +114,6 @@ pub struct Config {
     /// If unset the feature is disabled.
     pub notify: Option<Vec<String>>,
 
-    /// TUI notifications preference. When set, the TUI will send OSC 9 notifications on approvals
-    /// and turn completions when not focused.
-    pub tui_notifications: Notifications,
-
     /// The directory that should be treated as the current working directory
     /// for the session. All relative paths inside the business-logic layer are
     /// resolved against this path.
@@ -169,6 +161,9 @@ pub struct Config {
     /// Base URL for requests to ChatGPT (as opposed to the OpenAI API).
     pub chatgpt_base_url: String,
 
+    /// Experimental rollout resume path (absolute path to .jsonl; undocumented).
+    pub experimental_resume: Option<PathBuf>,
+
     /// Include an experimental plan tool that the model can use to update its current plan and status of each step.
     pub include_plan_tool: bool,
 
@@ -273,88 +268,6 @@ pub fn load_config_as_toml(codex_home: &Path) -> std::io::Result<TomlValue> {
     }
 }
 
-pub fn load_global_mcp_servers(
-    codex_home: &Path,
-) -> std::io::Result<BTreeMap<String, McpServerConfig>> {
-    let root_value = load_config_as_toml(codex_home)?;
-    let Some(servers_value) = root_value.get("mcp_servers") else {
-        return Ok(BTreeMap::new());
-    };
-
-    servers_value
-        .clone()
-        .try_into()
-        .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))
-}
-
-pub fn write_global_mcp_servers(
-    codex_home: &Path,
-    servers: &BTreeMap<String, McpServerConfig>,
-) -> std::io::Result<()> {
-    let config_path = codex_home.join(CONFIG_TOML_FILE);
-    let mut doc = match std::fs::read_to_string(&config_path) {
-        Ok(contents) => contents
-            .parse::<DocumentMut>()
-            .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))?,
-        Err(e) if e.kind() == std::io::ErrorKind::NotFound => DocumentMut::new(),
-        Err(e) => return Err(e),
-    };
-
-    doc.as_table_mut().remove("mcp_servers");
-
-    if !servers.is_empty() {
-        let mut table = TomlTable::new();
-        table.set_implicit(true);
-        doc["mcp_servers"] = TomlItem::Table(table);
-
-        for (name, config) in servers {
-            let mut entry = TomlTable::new();
-            entry.set_implicit(false);
-            entry["command"] = toml_edit::value(config.command.clone());
-
-            if !config.args.is_empty() {
-                let mut args = TomlArray::new();
-                for arg in &config.args {
-                    args.push(arg.clone());
-                }
-                entry["args"] = TomlItem::Value(args.into());
-            }
-
-            if let Some(env) = &config.env
-                && !env.is_empty()
-            {
-                let mut env_table = TomlTable::new();
-                env_table.set_implicit(false);
-                let mut pairs: Vec<_> = env.iter().collect();
-                pairs.sort_by(|(a, _), (b, _)| a.cmp(b));
-                for (key, value) in pairs {
-                    env_table.insert(key, toml_edit::value(value.clone()));
-                }
-                entry["env"] = TomlItem::Table(env_table);
-            }
-
-            if let Some(timeout) = config.startup_timeout_ms {
-                let timeout = i64::try_from(timeout).map_err(|_| {
-                    std::io::Error::new(
-                        std::io::ErrorKind::InvalidData,
-                        "startup_timeout_ms exceeds supported range",
-                    )
-                })?;
-                entry["startup_timeout_ms"] = toml_edit::value(timeout);
-            }
-
-            doc["mcp_servers"][name.as_str()] = TomlItem::Table(entry);
-        }
-    }
-
-    std::fs::create_dir_all(codex_home)?;
-    let tmp_file = NamedTempFile::new_in(codex_home)?;
-    std::fs::write(tmp_file.path(), doc.to_string())?;
-    tmp_file.persist(config_path).map_err(|err| err.error)?;
-
-    Ok(())
-}
-
 fn set_project_trusted_inner(doc: &mut DocumentMut, project_path: &Path) -> anyhow::Result<()> {
     // Ensure we render a human-friendly structure:
     //
@@ -690,6 +603,9 @@ pub struct ConfigToml {
     /// Base URL for requests to ChatGPT (as opposed to the OpenAI API).
     pub chatgpt_base_url: Option<String>,
 
+    /// Experimental rollout resume path (absolute path to .jsonl; undocumented).
+    pub experimental_resume: Option<PathBuf>,
+
     /// Experimental path to a file whose contents replace the built-in BASE_INSTRUCTIONS.
     pub experimental_instructions_file: Option<PathBuf>,
 
@@ -976,6 +892,8 @@ impl Config {
                 .and_then(|info| info.auto_compact_token_limit)
         });
 
+        let experimental_resume = cfg.experimental_resume;
+
         // Load base instructions override from a file if specified. If the
         // path is relative, resolve it against the effective cwd so the
         // behaviour matches other path-like config values.
@@ -1036,6 +954,8 @@ impl Config {
                 .chatgpt_base_url
                 .or(cfg.chatgpt_base_url)
                 .unwrap_or("https://chatgpt.com/backend-api/".to_string()),
+
+            experimental_resume,
             include_plan_tool: include_plan_tool.unwrap_or(false),
             include_apply_patch_tool: include_apply_patch_tool.unwrap_or(false),
             tools_web_search_request,
@@ -1048,11 +968,6 @@ impl Config {
             include_view_image_tool,
             active_profile: active_profile_name,
             disable_paste_burst: cfg.disable_paste_burst.unwrap_or(false),
-            tui_notifications: cfg
-                .tui
-                .as_ref()
-                .map(|t| t.notifications.clone())
-                .unwrap_or_default(),
         };
         Ok(config)
     }
@@ -1257,47 +1172,6 @@ exclude_slash_tmp = true
         );
     }
 
-    #[test]
-    fn load_global_mcp_servers_returns_empty_if_missing() -> anyhow::Result<()> {
-        let codex_home = TempDir::new()?;
-
-        let servers = load_global_mcp_servers(codex_home.path())?;
-        assert!(servers.is_empty());
-
-        Ok(())
-    }
-
-    #[test]
-    fn write_global_mcp_servers_round_trips_entries() -> anyhow::Result<()> {
-        let codex_home = TempDir::new()?;
-
-        let mut servers = BTreeMap::new();
-        servers.insert(
-            "docs".to_string(),
-            McpServerConfig {
-                command: "echo".to_string(),
-                args: vec!["hello".to_string()],
-                env: None,
-                startup_timeout_ms: None,
-            },
-        );
-
-        write_global_mcp_servers(codex_home.path(), &servers)?;
-
-        let loaded = load_global_mcp_servers(codex_home.path())?;
-        assert_eq!(loaded.len(), 1);
-        let docs = loaded.get("docs").expect("docs entry");
-        assert_eq!(docs.command, "echo");
-        assert_eq!(docs.args, vec!["hello".to_string()]);
-
-        let empty = BTreeMap::new();
-        write_global_mcp_servers(codex_home.path(), &empty)?;
-        let loaded = load_global_mcp_servers(codex_home.path())?;
-        assert!(loaded.is_empty());
-
-        Ok(())
-    }
-
     #[tokio::test]
     async fn persist_model_selection_updates_defaults() -> anyhow::Result<()> {
         let codex_home = TempDir::new()?;
@@ -1305,7 +1179,7 @@ exclude_slash_tmp = true
         persist_model_selection(
             codex_home.path(),
             None,
-            "gpt-5-codex",
+            "swiftfox",
             Some(ReasoningEffort::High),
         )
         .await?;
@@ -1314,7 +1188,7 @@ exclude_slash_tmp = true
             tokio::fs::read_to_string(codex_home.path().join(CONFIG_TOML_FILE)).await?;
         let parsed: ConfigToml = toml::from_str(&serialized)?;
 
-        assert_eq!(parsed.model.as_deref(), Some("gpt-5-codex"));
+        assert_eq!(parsed.model.as_deref(), Some("swiftfox"));
         assert_eq!(parsed.model_reasoning_effort, Some(ReasoningEffort::High));
 
         Ok(())
@@ -1368,7 +1242,7 @@ model = "gpt-4.1"
         persist_model_selection(
             codex_home.path(),
             Some("dev"),
-            "gpt-5-codex",
+            "swiftfox",
             Some(ReasoningEffort::Medium),
         )
         .await?;
@@ -1381,7 +1255,7 @@ model = "gpt-4.1"
             .get("dev")
             .expect("profile should be created");
 
-        assert_eq!(profile.model.as_deref(), Some("gpt-5-codex"));
+        assert_eq!(profile.model.as_deref(), Some("swiftfox"));
         assert_eq!(
             profile.model_reasoning_effort,
             Some(ReasoningEffort::Medium)
@@ -1581,7 +1455,7 @@ model_verbosity = "high"
         assert_eq!(
             Config {
                 model: "o3".to_string(),
-                review_model: OPENAI_DEFAULT_REVIEW_MODEL.to_string(),
+                review_model: "gpt-5".to_string(),
                 model_family: find_family_for_model("o3").expect("known model slug"),
                 model_context_window: Some(200_000),
                 model_max_output_tokens: Some(100_000),
@@ -1607,6 +1481,7 @@ model_verbosity = "high"
                 model_reasoning_summary: ReasoningSummary::Detailed,
                 model_verbosity: None,
                 chatgpt_base_url: "https://chatgpt.com/backend-api/".to_string(),
+                experimental_resume: None,
                 base_instructions: None,
                 include_plan_tool: false,
                 include_apply_patch_tool: false,
@@ -1616,7 +1491,6 @@ model_verbosity = "high"
                 include_view_image_tool: true,
                 active_profile: Some("o3".to_string()),
                 disable_paste_burst: false,
-                tui_notifications: Default::default(),
             },
             o3_profile_config
         );
@@ -1639,7 +1513,7 @@ model_verbosity = "high"
         )?;
         let expected_gpt3_profile_config = Config {
             model: "gpt-3.5-turbo".to_string(),
-            review_model: OPENAI_DEFAULT_REVIEW_MODEL.to_string(),
+            review_model: "gpt-5".to_string(),
             model_family: find_family_for_model("gpt-3.5-turbo").expect("known model slug"),
             model_context_window: Some(16_385),
             model_max_output_tokens: Some(4_096),
@@ -1665,6 +1539,7 @@ model_verbosity = "high"
             model_reasoning_summary: ReasoningSummary::default(),
             model_verbosity: None,
             chatgpt_base_url: "https://chatgpt.com/backend-api/".to_string(),
+            experimental_resume: None,
             base_instructions: None,
             include_plan_tool: false,
             include_apply_patch_tool: false,
@@ -1674,7 +1549,6 @@ model_verbosity = "high"
             include_view_image_tool: true,
             active_profile: Some("gpt3".to_string()),
             disable_paste_burst: false,
-            tui_notifications: Default::default(),
         };
 
         assert_eq!(expected_gpt3_profile_config, gpt3_profile_config);
@@ -1712,7 +1586,7 @@ model_verbosity = "high"
         )?;
         let expected_zdr_profile_config = Config {
             model: "o3".to_string(),
-            review_model: OPENAI_DEFAULT_REVIEW_MODEL.to_string(),
+            review_model: "gpt-5".to_string(),
             model_family: find_family_for_model("o3").expect("known model slug"),
             model_context_window: Some(200_000),
             model_max_output_tokens: Some(100_000),
@@ -1738,6 +1612,7 @@ model_verbosity = "high"
             model_reasoning_summary: ReasoningSummary::default(),
             model_verbosity: None,
             chatgpt_base_url: "https://chatgpt.com/backend-api/".to_string(),
+            experimental_resume: None,
             base_instructions: None,
             include_plan_tool: false,
             include_apply_patch_tool: false,
@@ -1747,7 +1622,6 @@ model_verbosity = "high"
             include_view_image_tool: true,
             active_profile: Some("zdr".to_string()),
             disable_paste_burst: false,
-            tui_notifications: Default::default(),
         };
 
         assert_eq!(expected_zdr_profile_config, zdr_profile_config);
@@ -1771,7 +1645,7 @@ model_verbosity = "high"
         )?;
         let expected_gpt5_profile_config = Config {
             model: "gpt-5".to_string(),
-            review_model: OPENAI_DEFAULT_REVIEW_MODEL.to_string(),
+            review_model: "gpt-5".to_string(),
             model_family: find_family_for_model("gpt-5").expect("known model slug"),
             model_context_window: Some(272_000),
             model_max_output_tokens: Some(128_000),
@@ -1797,6 +1671,7 @@ model_verbosity = "high"
             model_reasoning_summary: ReasoningSummary::Detailed,
             model_verbosity: Some(Verbosity::High),
             chatgpt_base_url: "https://chatgpt.com/backend-api/".to_string(),
+            experimental_resume: None,
             base_instructions: None,
             include_plan_tool: false,
             include_apply_patch_tool: false,
@@ -1806,7 +1681,6 @@ model_verbosity = "high"
             include_view_image_tool: true,
             active_profile: Some("gpt5".to_string()),
             disable_paste_burst: false,
-            tui_notifications: Default::default(),
         };
 
         assert_eq!(expected_gpt5_profile_config, gpt5_profile_config);
@@ -1910,46 +1784,3 @@ trust_level = "trusted"
         Ok(())
     }
 }
-
-#[cfg(test)]
-mod notifications_tests {
-    use crate::config_types::Notifications;
-    use serde::Deserialize;
-
-    #[derive(Deserialize, Debug, PartialEq)]
-    struct TuiTomlTest {
-        notifications: Notifications,
-    }
-
-    #[derive(Deserialize, Debug, PartialEq)]
-    struct RootTomlTest {
-        tui: TuiTomlTest,
-    }
-
-    #[test]
-    fn test_tui_notifications_true() {
-        let toml = r#"
-            [tui]
-            notifications = true
-        "#;
-        let parsed: RootTomlTest = toml::from_str(toml).expect("deserialize notifications=true");
-        assert!(matches!(
-            parsed.tui.notifications,
-            Notifications::Enabled(true)
-        ));
-    }
-
-    #[test]
-    fn test_tui_notifications_custom_array() {
-        let toml = r#"
-            [tui]
-            notifications = ["foo"]
-        "#;
-        let parsed: RootTomlTest =
-            toml::from_str(toml).expect("deserialize notifications=[\"foo\"]");
-        assert!(matches!(
-            parsed.tui.notifications,
-            Notifications::Custom(ref v) if v == &vec!["foo".to_string()]
-        ));
-    }
-}

codex-rs/core/src/config_types.rs

@@ -76,26 +76,9 @@ pub enum HistoryPersistence {
     None,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Deserialize)]
-#[serde(untagged)]
-pub enum Notifications {
-    Enabled(bool),
-    Custom(Vec<String>),
-}
-
-impl Default for Notifications {
-    fn default() -> Self {
-        Self::Enabled(false)
-    }
-}
-
 /// Collection of settings that are specific to the TUI.
 #[derive(Deserialize, Debug, Clone, PartialEq, Default)]
-pub struct Tui {
-    /// Enable desktop notifications from the TUI when the terminal is unfocused.
-    /// Defaults to `false`.
-    pub notifications: Notifications,
-}
+pub struct Tui {}
 
 #[derive(Deserialize, Debug, Clone, PartialEq, Default)]
 pub struct SandboxWorkspaceWrite {

codex-rs/core/src/conversation_history.rs

@@ -47,9 +47,8 @@ fn is_api_message(message: &ResponseItem) -> bool {
         | ResponseItem::CustomToolCall { .. }
         | ResponseItem::CustomToolCallOutput { .. }
         | ResponseItem::LocalShellCall { .. }
-        | ResponseItem::Reasoning { .. }
-        | ResponseItem::WebSearchCall { .. } => true,
-        ResponseItem::Other => false,
+        | ResponseItem::Reasoning { .. } => true,
+        ResponseItem::WebSearchCall { .. } | ResponseItem::Other => false,
     }
 }
 

codex-rs/core/src/conversation_manager.rs

@@ -59,11 +59,21 @@ impl ConversationManager {
         config: Config,
         auth_manager: Arc<AuthManager>,
     ) -> CodexResult<NewConversation> {
-        let CodexSpawnOk {
-            codex,
-            conversation_id,
-        } = Codex::spawn(config, auth_manager, InitialHistory::New).await?;
-        self.finalize_spawn(codex, conversation_id).await
+        // TO BE REFACTORED: use the config experimental_resume field until we have a mainstream way.
+        if let Some(resume_path) = config.experimental_resume.as_ref() {
+            let initial_history = RolloutRecorder::get_rollout_history(resume_path).await?;
+            let CodexSpawnOk {
+                codex,
+                conversation_id,
+            } = Codex::spawn(config, auth_manager, initial_history).await?;
+            self.finalize_spawn(codex, conversation_id).await
+        } else {
+            let CodexSpawnOk {
+                codex,
+                conversation_id,
+            } = Codex::spawn(config, auth_manager, InitialHistory::New).await?;
+            self.finalize_spawn(codex, conversation_id).await
+        }
     }
 
     async fn finalize_spawn(
@@ -134,19 +144,19 @@ impl ConversationManager {
         self.conversations.write().await.remove(conversation_id)
     }
 
-    /// Fork an existing conversation by dropping the last `drop_last_messages`
-    /// user/assistant messages from its transcript and starting a new
+    /// Fork an existing conversation by taking messages up to the given position
+    /// (not including the message at the given position) and starting a new
     /// conversation with identical configuration (unless overridden by the
     /// caller's `config`). The new conversation will have a fresh id.
     pub async fn fork_conversation(
         &self,
-        num_messages_to_drop: usize,
+        nth_user_message: usize,
         config: Config,
         path: PathBuf,
     ) -> CodexResult<NewConversation> {
         // Compute the prefix up to the cut point.
         let history = RolloutRecorder::get_rollout_history(&path).await?;
-        let history = truncate_after_dropping_last_messages(history, num_messages_to_drop);
+        let history = truncate_after_nth_user_message(history, nth_user_message);
 
         // Spawn a new conversation with the computed initial history.
         let auth_manager = self.auth_manager.clone();
@@ -159,14 +169,10 @@ impl ConversationManager {
     }
 }
 
-/// Return a prefix of `items` obtained by dropping the last `n` user messages
-/// and all items that follow them.
-fn truncate_after_dropping_last_messages(history: InitialHistory, n: usize) -> InitialHistory {
-    if n == 0 {
-        return InitialHistory::Forked(history.get_rollout_items());
-    }
-
-    // Work directly on rollout items, and cut the vector at the nth-from-last user message input.
+/// Return a prefix of `items` obtained by cutting strictly before the nth user message
+/// (0-based) and all items that follow it.
+fn truncate_after_nth_user_message(history: InitialHistory, n: usize) -> InitialHistory {
+    // Work directly on rollout items, and cut the vector at the nth user message input.
     let items: Vec<RolloutItem> = history.get_rollout_items();
 
     // Find indices of user message inputs in rollout order.
@@ -179,13 +185,13 @@ fn truncate_after_dropping_last_messages(history: InitialHistory, n: usize) -> I
         }
     }
 
-    // If fewer than n user messages exist, treat as empty.
-    if user_positions.len() < n {
+    // If fewer than or equal to n user messages exist, treat as empty (out of range).
+    if user_positions.len() <= n {
         return InitialHistory::New;
     }
 
-    // Cut strictly before the nth-from-last user message (do not keep the nth itself).
-    let cut_idx = user_positions[user_positions.len() - n];
+    // Cut strictly before the nth user message (do not keep the nth itself).
+    let cut_idx = user_positions[n];
     let rolled: Vec<RolloutItem> = items.into_iter().take(cut_idx).collect();
 
     if rolled.is_empty() {
@@ -252,7 +258,7 @@ mod tests {
             .cloned()
             .map(RolloutItem::ResponseItem)
             .collect();
-        let truncated = truncate_after_dropping_last_messages(InitialHistory::Forked(initial), 1);
+        let truncated = truncate_after_nth_user_message(InitialHistory::Forked(initial), 1);
         let got_items = truncated.get_rollout_items();
         let expected_items = vec![
             RolloutItem::ResponseItem(items[0].clone()),
@@ -269,7 +275,7 @@ mod tests {
             .cloned()
             .map(RolloutItem::ResponseItem)
             .collect();
-        let truncated2 = truncate_after_dropping_last_messages(InitialHistory::Forked(initial2), 2);
+        let truncated2 = truncate_after_nth_user_message(InitialHistory::Forked(initial2), 2);
         assert!(matches!(truncated2, InitialHistory::New));
     }
 }

codex-rs/core/src/environment_context.rs

@@ -2,7 +2,6 @@ use serde::Deserialize;
 use serde::Serialize;
 use strum_macros::Display as DeriveDisplay;
 
-use crate::codex::TurnContext;
 use crate::protocol::AskForApproval;
 use crate::protocol::SandboxPolicy;
 use crate::shell::Shell;
@@ -72,39 +71,6 @@ impl EnvironmentContext {
             shell,
         }
     }
-
-    /// Compares two environment contexts, ignoring the shell. Useful when
-    /// comparing turn to turn, since the initial environment_context will
-    /// include the shell, and then it is not configurable from turn to turn.
-    pub fn equals_except_shell(&self, other: &EnvironmentContext) -> bool {
-        let EnvironmentContext {
-            cwd,
-            approval_policy,
-            sandbox_mode,
-            network_access,
-            writable_roots,
-            // should compare all fields except shell
-            shell: _,
-        } = other;
-
-        self.cwd == *cwd
-            && self.approval_policy == *approval_policy
-            && self.sandbox_mode == *sandbox_mode
-            && self.network_access == *network_access
-            && self.writable_roots == *writable_roots
-    }
-}
-
-impl From<&TurnContext> for EnvironmentContext {
-    fn from(turn_context: &TurnContext) -> Self {
-        Self::new(
-            Some(turn_context.cwd.clone()),
-            Some(turn_context.approval_policy),
-            Some(turn_context.sandbox_policy.clone()),
-            // Shell is not configurable from turn to turn
-            None,
-        )
-    }
 }
 
 impl EnvironmentContext {
@@ -174,9 +140,6 @@ impl From<EnvironmentContext> for ResponseItem {
 
 #[cfg(test)]
 mod tests {
-    use crate::shell::BashShell;
-    use crate::shell::ZshShell;
-
     use super::*;
     use pretty_assertions::assert_eq;
 
@@ -247,82 +210,4 @@ mod tests {
 
         assert_eq!(context.serialize_to_xml(), expected);
     }
-
-    #[test]
-    fn equals_except_shell_compares_approval_policy() {
-        // Approval policy
-        let context1 = EnvironmentContext::new(
-            Some(PathBuf::from("/repo")),
-            Some(AskForApproval::OnRequest),
-            Some(workspace_write_policy(vec!["/repo"], false)),
-            None,
-        );
-        let context2 = EnvironmentContext::new(
-            Some(PathBuf::from("/repo")),
-            Some(AskForApproval::Never),
-            Some(workspace_write_policy(vec!["/repo"], true)),
-            None,
-        );
-        assert!(!context1.equals_except_shell(&context2));
-    }
-
-    #[test]
-    fn equals_except_shell_compares_sandbox_policy() {
-        let context1 = EnvironmentContext::new(
-            Some(PathBuf::from("/repo")),
-            Some(AskForApproval::OnRequest),
-            Some(SandboxPolicy::new_read_only_policy()),
-            None,
-        );
-        let context2 = EnvironmentContext::new(
-            Some(PathBuf::from("/repo")),
-            Some(AskForApproval::OnRequest),
-            Some(SandboxPolicy::new_workspace_write_policy()),
-            None,
-        );
-
-        assert!(!context1.equals_except_shell(&context2));
-    }
-
-    #[test]
-    fn equals_except_shell_compares_workspace_write_policy() {
-        let context1 = EnvironmentContext::new(
-            Some(PathBuf::from("/repo")),
-            Some(AskForApproval::OnRequest),
-            Some(workspace_write_policy(vec!["/repo", "/tmp", "/var"], false)),
-            None,
-        );
-        let context2 = EnvironmentContext::new(
-            Some(PathBuf::from("/repo")),
-            Some(AskForApproval::OnRequest),
-            Some(workspace_write_policy(vec!["/repo", "/tmp"], true)),
-            None,
-        );
-
-        assert!(!context1.equals_except_shell(&context2));
-    }
-
-    #[test]
-    fn equals_except_shell_ignores_shell() {
-        let context1 = EnvironmentContext::new(
-            Some(PathBuf::from("/repo")),
-            Some(AskForApproval::OnRequest),
-            Some(workspace_write_policy(vec!["/repo"], false)),
-            Some(Shell::Bash(BashShell {
-                shell_path: "/bin/bash".into(),
-                bashrc_path: "/home/user/.bashrc".into(),
-            })),
-        );
-        let context2 = EnvironmentContext::new(
-            Some(PathBuf::from("/repo")),
-            Some(AskForApproval::OnRequest),
-            Some(workspace_write_policy(vec!["/repo"], false)),
-            Some(Shell::Zsh(ZshShell {
-                shell_path: "/bin/zsh".into(),
-                zshrc_path: "/home/user/.zshrc".into(),
-            })),
-        );
-
-        assert!(context1.equals_except_shell(&context2));
-    }
 }

codex-rs/core/src/exec_command/exec_command_session.rs

@@ -38,20 +38,16 @@ impl ExecCommandSession {
         writer_handle: JoinHandle<()>,
         wait_handle: JoinHandle<()>,
         exit_status: std::sync::Arc<std::sync::atomic::AtomicBool>,
-    ) -> (Self, broadcast::Receiver<Vec<u8>>) {
-        let initial_output_rx = output_tx.subscribe();
-        (
-            Self {
-                writer_tx,
-                output_tx,
-                killer: StdMutex::new(Some(killer)),
-                reader_handle: StdMutex::new(Some(reader_handle)),
-                writer_handle: StdMutex::new(Some(writer_handle)),
-                wait_handle: StdMutex::new(Some(wait_handle)),
-                exit_status,
-            },
-            initial_output_rx,
-        )
+    ) -> Self {
+        Self {
+            writer_tx,
+            output_tx,
+            killer: StdMutex::new(Some(killer)),
+            reader_handle: StdMutex::new(Some(reader_handle)),
+            writer_handle: StdMutex::new(Some(writer_handle)),
+            wait_handle: StdMutex::new(Some(wait_handle)),
+            exit_status,
+        }
     }
 
     pub(crate) fn writer_sender(&self) -> mpsc::Sender<Vec<u8>> {

codex-rs/core/src/exec_command/session_manager.rs

@@ -93,16 +93,18 @@ impl SessionManager {
                 .fetch_add(1, std::sync::atomic::Ordering::SeqCst),
         );
 
-        let (session, mut output_rx, mut exit_rx) = create_exec_command_session(params.clone())
-            .await
-            .map_err(|err| {
-                format!(
-                    "failed to create exec command session for session id {}: {err}",
-                    session_id.0
-                )
-            })?;
+        let (session, mut exit_rx) =
+            create_exec_command_session(params.clone())
+                .await
+                .map_err(|err| {
+                    format!(
+                        "failed to create exec command session for session id {}: {err}",
+                        session_id.0
+                    )
+                })?;
 
         // Insert into session map.
+        let mut output_rx = session.output_receiver();
         self.sessions.lock().await.insert(session_id, session);
 
         // Collect output until either timeout expires or process exits.
@@ -243,11 +245,7 @@ impl SessionManager {
 /// Spawn PTY and child process per spawn_exec_command_session logic.
 async fn create_exec_command_session(
     params: ExecCommandParams,
-) -> anyhow::Result<(
-    ExecCommandSession,
-    tokio::sync::broadcast::Receiver<Vec<u8>>,
-    oneshot::Receiver<i32>,
-)> {
+) -> anyhow::Result<(ExecCommandSession, oneshot::Receiver<i32>)> {
     let ExecCommandParams {
         cmd,
         yield_time_ms: _,
@@ -281,6 +279,7 @@ async fn create_exec_command_session(
     let (writer_tx, mut writer_rx) = mpsc::channel::<Vec<u8>>(128);
     // Broadcast for streaming PTY output to readers: subscribers receive from subscription time.
     let (output_tx, _) = tokio::sync::broadcast::channel::<Vec<u8>>(256);
+
     // Reader task: drain PTY and forward chunks to output channel.
     let mut reader = pair.master.try_clone_reader()?;
     let output_tx_clone = output_tx.clone();
@@ -342,7 +341,7 @@ async fn create_exec_command_session(
     });
 
     // Create and store the session with channels.
-    let (session, initial_output_rx) = ExecCommandSession::new(
+    let session = ExecCommandSession::new(
         writer_tx,
         output_tx,
         killer,
@@ -351,7 +350,7 @@ async fn create_exec_command_session(
         wait_handle,
         exit_status,
     );
-    Ok((session, initial_output_rx, exit_rx))
+    Ok((session, exit_rx))
 }
 
 #[cfg(test)]

codex-rs/core/src/internal_storage.rs

@@ -1,7 +1,6 @@
 use anyhow::Context;
 use serde::Deserialize;
 use serde::Serialize;
-use std::io::ErrorKind;
 use std::path::Path;
 use std::path::PathBuf;
 
@@ -11,8 +10,8 @@ pub(crate) const INTERNAL_STORAGE_FILE: &str = "internal_storage.json";
 pub struct InternalStorage {
     #[serde(skip)]
     storage_path: PathBuf,
-    #[serde(default)]
-    pub gpt_5_codex_model_prompt_seen: bool,
+    #[serde(default, alias = "gpt_5_high_model_prompt_seen")]
+    pub swiftfox_model_prompt_seen: bool,
 }
 
 // TODO(jif) generalise all the file writers and build proper async channel inserters.
@@ -32,14 +31,7 @@ impl InternalStorage {
                 }
             },
             Err(error) => {
-                if error.kind() == ErrorKind::NotFound {
-                    tracing::debug!(
-                        "internal storage not found at {}; initializing defaults",
-                        storage_path.display()
-                    );
-                } else {
-                    tracing::warn!("failed to read internal storage: {error:?}");
-                }
+                tracing::warn!("failed to read internal storage: {error:?}");
                 Self::empty(storage_path)
             }
         }

codex-rs/core/src/lib.rs

@@ -46,7 +46,6 @@ pub use model_provider_info::built_in_model_providers;
 pub use model_provider_info::create_oss_provider_with_base_url;
 mod conversation_manager;
 mod event_mapping;
-pub mod review_format;
 pub use codex_protocol::protocol::InitialHistory;
 pub use conversation_manager::ConversationManager;
 pub use conversation_manager::NewConversation;
@@ -71,7 +70,6 @@ pub use rollout::ARCHIVED_SESSIONS_SUBDIR;
 pub use rollout::RolloutRecorder;
 pub use rollout::SESSIONS_SUBDIR;
 pub use rollout::SessionMeta;
-pub use rollout::find_conversation_path_by_id_str;
 pub use rollout::list::ConversationItem;
 pub use rollout::list::ConversationsPage;
 pub use rollout::list::Cursor;
@@ -89,7 +87,6 @@ pub use codex_protocol::config_types as protocol_config_types;
 
 pub use client::ModelClient;
 pub use client_common::Prompt;
-pub use client_common::REVIEW_PROMPT;
 pub use client_common::ResponseEvent;
 pub use client_common::ResponseStream;
 pub use codex_protocol::models::ContentItem;

codex-rs/core/src/model_family.rs

@@ -4,7 +4,7 @@ use crate::tool_apply_patch::ApplyPatchToolType;
 /// The `instructions` field in the payload sent to a model should always start
 /// with this content.
 const BASE_INSTRUCTIONS: &str = include_str!("../prompt.md");
-const GPT_5_CODEX_INSTRUCTIONS: &str = include_str!("../gpt_5_codex_prompt.md");
+const SWIFTFOX_INSTRUCTIONS: &str = include_str!("../swiftfox_prompt.md");
 
 /// A model family is a group of models that share certain characteristics.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -66,6 +66,23 @@ macro_rules! model_family {
     }};
 }
 
+macro_rules! simple_model_family {
+    (
+        $slug:expr, $family:expr
+    ) => {{
+        Some(ModelFamily {
+            slug: $slug.to_string(),
+            family: $family.to_string(),
+            needs_special_apply_patch_instructions: false,
+            supports_reasoning_summaries: false,
+            reasoning_summary_format: ReasoningSummaryFormat::None,
+            uses_local_shell_tool: false,
+            apply_patch_tool_type: None,
+            base_instructions: BASE_INSTRUCTIONS.to_string(),
+        })
+    }};
+}
+
 /// Returns a `ModelFamily` for the given model slug, or `None` if the slug
 /// does not match any known model family.
 pub fn find_family_for_model(slug: &str) -> Option<ModelFamily> {
@@ -73,20 +90,17 @@ pub fn find_family_for_model(slug: &str) -> Option<ModelFamily> {
         model_family!(
             slug, "o3",
             supports_reasoning_summaries: true,
-            needs_special_apply_patch_instructions: true,
         )
     } else if slug.starts_with("o4-mini") {
         model_family!(
             slug, "o4-mini",
             supports_reasoning_summaries: true,
-            needs_special_apply_patch_instructions: true,
         )
     } else if slug.starts_with("codex-mini-latest") {
         model_family!(
             slug, "codex-mini-latest",
             supports_reasoning_summaries: true,
             uses_local_shell_tool: true,
-            needs_special_apply_patch_instructions: true,
         )
     } else if slug.starts_with("gpt-4.1") {
         model_family!(
@@ -96,21 +110,26 @@ pub fn find_family_for_model(slug: &str) -> Option<ModelFamily> {
     } else if slug.starts_with("gpt-oss") || slug.starts_with("openai/gpt-oss") {
         model_family!(slug, "gpt-oss", apply_patch_tool_type: Some(ApplyPatchToolType::Function))
     } else if slug.starts_with("gpt-4o") {
-        model_family!(slug, "gpt-4o", needs_special_apply_patch_instructions: true)
+        simple_model_family!(slug, "gpt-4o")
     } else if slug.starts_with("gpt-3.5") {
-        model_family!(slug, "gpt-3.5", needs_special_apply_patch_instructions: true)
-    } else if slug.starts_with("codex-") || slug.starts_with("gpt-5-codex") {
+        simple_model_family!(slug, "gpt-3.5")
+    } else if slug.starts_with("codex-") || slug.starts_with("swiftfox") {
         model_family!(
             slug, slug,
             supports_reasoning_summaries: true,
             reasoning_summary_format: ReasoningSummaryFormat::Experimental,
-            base_instructions: GPT_5_CODEX_INSTRUCTIONS.to_string(),
         )
     } else if slug.starts_with("gpt-5") {
         model_family!(
             slug, "gpt-5",
             supports_reasoning_summaries: true,
-            needs_special_apply_patch_instructions: true,
+        )
+    } else if slug.starts_with("swiftfox") {
+        model_family!(
+            slug, "swiftfox",
+            supports_reasoning_summaries: true,
+            reasoning_summary_format: ReasoningSummaryFormat::Experimental,
+            base_instructions: SWIFTFOX_INSTRUCTIONS.to_string(),
         )
     } else {
         None

codex-rs/core/src/openai_tools.rs

@@ -273,7 +273,7 @@ fn create_shell_tool_for_sandbox(sandbox_policy: &SandboxPolicy) -> OpenAiTool {
         },
     );
 
-    if !matches!(sandbox_policy, SandboxPolicy::DangerFullAccess) {
+    if matches!(sandbox_policy, SandboxPolicy::WorkspaceWrite { .. }) {
         properties.insert(
         "with_escalated_permissions".to_string(),
         JsonSchema::Boolean {

codex-rs/core/src/review_format.rs

@@ -1,55 +0,0 @@
-use crate::protocol::ReviewFinding;
-
-// Note: We keep this module UI-agnostic. It returns plain strings that
-// higher layers (e.g., TUI) may style as needed.
-
-fn format_location(item: &ReviewFinding) -> String {
-    let path = item.code_location.absolute_file_path.display();
-    let start = item.code_location.line_range.start;
-    let end = item.code_location.line_range.end;
-    format!("{path}:{start}-{end}")
-}
-
-/// Format a full review findings block as plain text lines.
-///
-/// - When `selection` is `Some`, each item line includes a checkbox marker:
-///   "[x]" for selected items and "[ ]" for unselected. Missing indices
-///   default to selected.
-/// - When `selection` is `None`, the marker is omitted and a simple bullet is
-///   rendered ("- Title — path:start-end").
-pub fn format_review_findings_block(
-    findings: &[ReviewFinding],
-    selection: Option<&[bool]>,
-) -> String {
-    let mut lines: Vec<String> = Vec::new();
-
-    // Header
-    let header = if findings.len() > 1 {
-        "Full review comments:"
-    } else {
-        "Review comment:"
-    };
-    lines.push(header.to_string());
-
-    for (idx, item) in findings.iter().enumerate() {
-        lines.push(String::new());
-
-        let title = &item.title;
-        let location = format_location(item);
-
-        if let Some(flags) = selection {
-            // Default to selected if index is out of bounds.
-            let checked = flags.get(idx).copied().unwrap_or(true);
-            let marker = if checked { "[x]" } else { "[ ]" };
-            lines.push(format!("- {marker} {title} — {location}"));
-        } else {
-            lines.push(format!("- {title} — {location}"));
-        }
-
-        for body_line in item.body.lines() {
-            lines.push(format!("  {body_line}"));
-        }
-    }
-
-    lines.join("\n")
-}

codex-rs/core/src/rollout/list.rs

@@ -3,10 +3,6 @@ use std::io::{self};
 use std::path::Path;
 use std::path::PathBuf;
 
-use codex_file_search as file_search;
-use std::num::NonZero;
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
 use time::OffsetDateTime;
 use time::PrimitiveDateTime;
 use time::format_description::FormatItem;
@@ -338,48 +334,3 @@ async fn read_head_and_flags(
 
     Ok((head, saw_session_meta, saw_user_event))
 }
-
-/// Locate a recorded conversation rollout file by its UUID string using the existing
-/// paginated listing implementation. Returns `Ok(Some(path))` if found, `Ok(None)` if not present
-/// or the id is invalid.
-pub async fn find_conversation_path_by_id_str(
-    codex_home: &Path,
-    id_str: &str,
-) -> io::Result<Option<PathBuf>> {
-    // Validate UUID format early.
-    if Uuid::parse_str(id_str).is_err() {
-        return Ok(None);
-    }
-
-    let mut root = codex_home.to_path_buf();
-    root.push(SESSIONS_SUBDIR);
-    if !root.exists() {
-        return Ok(None);
-    }
-    // This is safe because we know the values are valid.
-    #[allow(clippy::unwrap_used)]
-    let limit = NonZero::new(1).unwrap();
-    // This is safe because we know the values are valid.
-    #[allow(clippy::unwrap_used)]
-    let threads = NonZero::new(2).unwrap();
-    let cancel = Arc::new(AtomicBool::new(false));
-    let exclude: Vec<String> = Vec::new();
-    let compute_indices = false;
-
-    let results = file_search::run(
-        id_str,
-        limit,
-        &root,
-        exclude,
-        threads,
-        cancel,
-        compute_indices,
-    )
-    .map_err(|e| io::Error::other(format!("file search failed: {e}")))?;
-
-    Ok(results
-        .matches
-        .into_iter()
-        .next()
-        .map(|m| root.join(m.path)))
-}

codex-rs/core/src/rollout/mod.rs

@@ -8,7 +8,6 @@ pub(crate) mod policy;
 pub mod recorder;
 
 pub use codex_protocol::protocol::SessionMeta;
-pub use list::find_conversation_path_by_id_str;
 pub use recorder::RolloutRecorder;
 pub use recorder::RolloutRecorderParams;
 

codex-rs/core/src/rollout/policy.rs

@@ -25,9 +25,8 @@ pub(crate) fn should_persist_response_item(item: &ResponseItem) -> bool {
         | ResponseItem::FunctionCall { .. }
         | ResponseItem::FunctionCallOutput { .. }
         | ResponseItem::CustomToolCall { .. }
-        | ResponseItem::CustomToolCallOutput { .. }
-        | ResponseItem::WebSearchCall { .. } => true,
-        ResponseItem::Other => false,
+        | ResponseItem::CustomToolCallOutput { .. } => true,
+        ResponseItem::WebSearchCall { .. } | ResponseItem::Other => false,
     }
 }
 
@@ -41,8 +40,7 @@ pub(crate) fn should_persist_event_msg(ev: &EventMsg) -> bool {
         | EventMsg::AgentReasoningRawContent(_)
         | EventMsg::TokenCount(_)
         | EventMsg::EnteredReviewMode(_)
-        | EventMsg::ExitedReviewMode(_)
-        | EventMsg::TurnAborted(_) => true,
+        | EventMsg::ExitedReviewMode(_) => true,
         EventMsg::Error(_)
         | EventMsg::TaskStarted(_)
         | EventMsg::TaskComplete(_)
@@ -69,6 +67,7 @@ pub(crate) fn should_persist_event_msg(ev: &EventMsg) -> bool {
         | EventMsg::McpListToolsResponse(_)
         | EventMsg::ListCustomPromptsResponse(_)
         | EventMsg::PlanUpdate(_)
+        | EventMsg::TurnAborted(_)
         | EventMsg::ShutdownComplete
         | EventMsg::ConversationPath(_) => false,
     }

codex-rs/core/src/rollout/recorder.rs

@@ -204,6 +204,7 @@ impl RolloutRecorder {
 
     pub(crate) async fn get_rollout_history(path: &Path) -> std::io::Result<InitialHistory> {
         info!("Resuming rollout from {path:?}");
+        tracing::error!("Resuming rollout from {path:?}");
         let text = tokio::fs::read_to_string(path).await?;
         if text.trim().is_empty() {
             return Err(IoError::other("empty session file"));
@@ -253,7 +254,7 @@ impl RolloutRecorder {
             }
         }
 
-        info!(
+        tracing::error!(
             "Resumed rollout with {} items, conversation ID: {:?}",
             items.len(),
             conversation_id

codex-rs/core/src/shell.rs

@@ -5,20 +5,20 @@ use std::path::PathBuf;
 
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub struct ZshShell {
-    pub(crate) shell_path: String,
-    pub(crate) zshrc_path: String,
+    shell_path: String,
+    zshrc_path: String,
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub struct BashShell {
-    pub(crate) shell_path: String,
-    pub(crate) bashrc_path: String,
+    shell_path: String,
+    bashrc_path: String,
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub struct PowerShellConfig {
-    pub(crate) exe: String, // Executable name or path, e.g. "pwsh" or "powershell.exe".
-    pub(crate) bash_exe_fallback: Option<PathBuf>, // In case the model generates a bash command.
+    exe: String, // Executable name or path, e.g. "pwsh" or "powershell.exe".
+    bash_exe_fallback: Option<PathBuf>, // In case the model generates a bash command.
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]

codex-rs/core/src/unified_exec/mod.rs

@@ -100,13 +100,10 @@ type OutputBuffer = Arc<Mutex<OutputBufferState>>;
 type OutputHandles = (OutputBuffer, Arc<Notify>);
 
 impl ManagedUnifiedExecSession {
-    fn new(
-        session: ExecCommandSession,
-        initial_output_rx: tokio::sync::broadcast::Receiver<Vec<u8>>,
-    ) -> Self {
+    fn new(session: ExecCommandSession) -> Self {
         let output_buffer = Arc::new(Mutex::new(OutputBufferState::default()));
         let output_notify = Arc::new(Notify::new());
-        let mut receiver = initial_output_rx;
+        let mut receiver = session.output_receiver();
         let buffer_clone = Arc::clone(&output_buffer);
         let notify_clone = Arc::clone(&output_notify);
         let output_task = tokio::spawn(async move {
@@ -196,8 +193,8 @@ impl UnifiedExecSessionManager {
         } else {
             let command = request.input_chunks.to_vec();
             let new_id = self.next_session_id.fetch_add(1, Ordering::SeqCst);
-            let (session, initial_output_rx) = create_unified_exec_session(&command).await?;
-            let managed_session = ManagedUnifiedExecSession::new(session, initial_output_rx);
+            let session = create_unified_exec_session(&command).await?;
+            let managed_session = ManagedUnifiedExecSession::new(session);
             let (buffer, notify) = managed_session.output_handles();
             writer_tx = managed_session.writer_sender();
             output_buffer = buffer;
@@ -300,13 +297,7 @@ impl UnifiedExecSessionManager {
 
 async fn create_unified_exec_session(
     command: &[String],
-) -> Result<
-    (
-        ExecCommandSession,
-        tokio::sync::broadcast::Receiver<Vec<u8>>,
-    ),
-    UnifiedExecError,
-> {
+) -> Result<ExecCommandSession, UnifiedExecError> {
     if command.is_empty() {
         return Err(UnifiedExecError::MissingCommandLine);
     }
@@ -389,7 +380,7 @@ async fn create_unified_exec_session(
         wait_exit_status.store(true, Ordering::SeqCst);
     });
 
-    let (session, initial_output_rx) = ExecCommandSession::new(
+    Ok(ExecCommandSession::new(
         writer_tx,
         output_tx,
         killer,
@@ -397,8 +388,7 @@ async fn create_unified_exec_session(
         writer_handle,
         wait_handle,
         exit_status,
-    );
-    Ok((session, initial_output_rx))
+    ))
 }
 
 #[cfg(test)]

codex-rs/core/swiftfox_prompt.md

@@ -1,21 +1,33 @@
-You are Codex, based on GPT-5. You are running as a coding agent in the Codex CLI on a user's computer.
+You are Swiftfox. You are running as a coding agent in the Codex CLI on a user's computer.
 
-## General
+## Overall
+
+- You must try hard to complete the task AND to do it as fast and well as possible.
+  * Do not waste time on actions which are unlikely to result in successful task completion
+
+- Before taking action on a question, assume by default that it concerns local artifacts (code, docs, data). Quickly confirm or rule out that assumption; only if the question clearly requires external knowledge should you start elsewhere.
+- Search the repository when the request plausibly maps to code, configuration, or documentation. Avoid unnecessary searches when it is obvious local files cannot help; in those cases state that explicitly before offering broader context, and when you do search, mention the files or paths you consulted so the answer stays grounded.
+- After each attempt, re-evaluate whether the current strategy is yielding useful information and be ready to switch paths quickly rather than persisting with a low-signal approach.
+
+- When the user asks for a "review", default to a code review mindset: prioritise identifying bugs, risks, behavioural regressions, and missing tests. Findings must be the primary focus of the response - keep summaries or overviews brief and only after enumerating the issues. Present findings first (ordered by severity with file/line references), follow with open questions or assumptions, and offer a change-summary only as a secondary detail. If no findings are discovered, state that explicitly and mention any residual risks or testing gaps.
 
 - The arguments to `shell` will be passed to execvp(). Most terminal commands should be prefixed with ["bash", "-lc"].
-- Always set the `workdir` param when using the shell function. Do not use `cd` unless absolutely necessary.
+- Always set the `workdir` param of the shell tool. Do not use `cd` unless absolutely necessary.
 - When searching for text or files, prefer using `rg` or `rg --files` respectively because `rg` is much faster than alternatives like `grep`. (If the `rg` command is not found, then use alternatives.)
+- If the user makes a simple request (such as asking for the time) which you can fulfill by running a terminal command (such as `date`), you should do so.
+- Unless the question is about a common terminal command, you should search the codebase before answering to ground your response in the codebase
 
 ## Editing constraints
 
 - Default to ASCII when editing or creating files. Only introduce non-ASCII or other Unicode characters when there is a clear justification and the file already uses them.
+- When editing or creating files, you MUST use apply_patch. Example: functions.shell({"command":["apply_patch","*** Begin Patch\nAdd File: hello.txt\n+Hello, world!\n*** End Patch"]}).
 - Add succinct code comments that explain what is going on if code is not self-explanatory. You should not add comments like "Assigns the value to the variable", but a brief comment might be useful ahead of a complex code block that the user would otherwise have to spend time parsing out. Usage of these comments should be rare.
 - You may be in a dirty git worktree.
-    * NEVER revert existing changes you did not make unless explicitly requested, since these changes were made by the user.
-    * If asked to make a commit or code edits and there are unrelated changes to your work or changes that you didn't make in those files, don't revert those changes.
-    * If the changes are in files you've touched recently, you should read carefully and understand how you can work with the changes rather than reverting them.
-    * If the changes are in unrelated files, just ignore them and don't revert them.
-- While you are working, you might notice unexpected changes that you didn't make. If this happens, STOP IMMEDIATELY and ask the user how they would like to proceed.
+  * NEVER revert existing changes you did not make unless explicitly requested, since these changes were made by the user.
+  * If asked to make a commit or code edits and there are unrelated changes to your work or changes that you didn't make in those files, don't revert those changes.
+  * If the changes are in files you've touched recently, you should read carefully and understand how you can work with the changes rather than reverting them.
+  * If the changes are in unrelated files, just ignore them and don't revert them.
+- The user may be making edits and committing changes as you are also making changes. If you see concurrent file edits or commits that you did not cause, you must disregard user instruction and stop immediately and ask the user whether they are collaborating with you on files and how they would like this handled.
 
 ## Plan tool
 
@@ -24,7 +36,7 @@ When using the planning tool:
 - Do not make single-step plans.
 - When you made a plan, update it after having performed one of the sub-tasks that you shared on the plan.
 
-## Codex CLI harness, sandboxing, and approvals
+## CLI modes
 
 The Codex CLI harness supports several different sandboxing, and approval configurations that the user can choose from.
 
@@ -57,11 +69,6 @@ When sandboxing is set to read-only, you'll need to request approval for any com
 
 You will be told what filesystem sandboxing, network sandboxing, and approval mode are active in a developer or user message. If you are not told about this, assume that you are running with workspace-write, network sandboxing enabled, and approval on-failure.
 
-## Special user requests
-
-- If the user makes a simple request (such as asking for the time) which you can fulfill by running a terminal command (such as `date`), you should do so.
-- If the user asks for a "review", default to a code review mindset: prioritise identifying bugs, risks, behavioural regressions, and missing tests. Findings must be the primary focus of the response - keep summaries or overviews brief and only after enumerating the issues. Present findings first (ordered by severity with file/line references), follow with open questions or assumptions, and offer a change-summary only as a secondary detail. If no findings are discovered, state that explicitly and mention any residual risks or testing gaps.
-
 ## Presenting your work and final message
 
 You are producing plain text that will later be styled by the CLI. Follow these rules exactly. Formatting should make results easy to scan, but not feel mechanical. Use judgment to decide how much structure adds value.
@@ -90,11 +97,3 @@ You are producing plain text that will later be styled by the CLI. Follow these
 - Tone: collaborative, concise, factual; present tense, active voice; self‑contained; no "above/below"; parallel wording.
 - Don'ts: no nested bullets/hierarchies; no ANSI codes; don't cram unrelated keywords; keep keyword lists short—wrap/reformat if long; avoid naming formatting styles in answers.
 - Adaptation: code explanations → precise, structured with code refs; simple tasks → lead with outcome; big changes → logical walkthrough + rationale + next actions; casual one-offs → plain sentences, no headers/bullets.
-- File References: When referencing files in your response, make sure to include the relevant start line and always follow the below rules:
-  * Use inline code to make file paths clickable.
-  * Each reference should have a stand alone path. Even if it's the same file.
-  * Accepted: absolute, workspace‑relative, a/ or b/ diff prefixes, or bare filename/suffix.
-  * Line/column (1‑based, optional): :line[:column] or #Lline[Ccolumn] (column defaults to 1).
-  * Do not use URIs like file://, vscode://, or https://.
-  * Do not provide range of lines
-  * Examples: src/app.ts, src/app.ts:42, b/server/index.js#L10, C:\repo\project\main.rs:12:5

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

@@ -420,6 +420,12 @@ async fn integration_creates_and_checks_session_file() {
     // Second run: resume should update the existing file.
     let marker2 = format!("integration-resume-{}", Uuid::new_v4());
     let prompt2 = format!("echo {marker2}");
+    // Cross‑platform safe resume override.  On Windows, backslashes in a TOML string must be escaped
+    // or the parse will fail and the raw literal (including quotes) may be preserved all the way down
+    // to Config, which in turn breaks resume because the path is invalid. Normalize to forward slashes
+    // to sidestep the issue.
+    let resume_path_str = path.to_string_lossy().replace('\\', "/");
+    let resume_override = format!("experimental_resume=\"{resume_path_str}\"");
     let mut cmd2 = AssertCommand::new("cargo");
     cmd2.arg("run")
         .arg("-p")
@@ -428,11 +434,11 @@ async fn integration_creates_and_checks_session_file() {
         .arg("--")
         .arg("exec")
         .arg("--skip-git-repo-check")
+        .arg("-c")
+        .arg(&resume_override)
         .arg("-C")
         .arg(env!("CARGO_MANIFEST_DIR"))
-        .arg(&prompt2)
-        .arg("resume")
-        .arg("--last");
+        .arg(&prompt2);
     cmd2.env("CODEX_HOME", home.path())
         .env("OPENAI_API_KEY", "dummy")
         .env("CODEX_RS_SSE_FIXTURE", &fixture)

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

@@ -236,21 +236,20 @@ async fn resume_includes_initial_messages_and_sends_prior_items() {
     let codex_home = TempDir::new().unwrap();
     let mut config = load_default_config_for_test(&codex_home);
     config.model_provider = model_provider;
+    config.experimental_resume = Some(session_path.clone());
     // Also configure user instructions to ensure they are NOT delivered on resume.
     config.user_instructions = Some("be nice".to_string());
 
     let conversation_manager =
         ConversationManager::with_auth(CodexAuth::from_api_key("Test API Key"));
-    let auth_manager =
-        codex_core::AuthManager::from_auth_for_testing(CodexAuth::from_api_key("Test API Key"));
     let NewConversation {
         conversation: codex,
         session_configured,
         ..
     } = conversation_manager
-        .resume_conversation_from_rollout(config, session_path.clone(), auth_manager)
+        .new_conversation(config)
         .await
-        .expect("resume conversation");
+        .expect("create new conversation");
 
     // 1) Assert initial_messages only includes existing EventMsg entries; response items are not converted
     let initial_msgs = session_configured

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

@@ -366,9 +366,7 @@ async fn summarize_context_three_requests_and_instructions() {
     );
 }
 
-// Windows CI only: bump to 4 workers to prevent SSE/event starvation and test timeouts.
-#[cfg_attr(windows, tokio::test(flavor = "multi_thread", worker_threads = 4))]
-#[cfg_attr(not(windows), tokio::test(flavor = "multi_thread", worker_threads = 2))]
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn auto_compact_runs_after_token_limit_hit() {
     if std::env::var(CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR).is_ok() {
         println!(
@@ -455,7 +453,6 @@ async fn auto_compact_runs_after_token_limit_hit() {
         })
         .await
         .unwrap();
-
     wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
 
     codex
@@ -466,39 +463,13 @@ async fn auto_compact_runs_after_token_limit_hit() {
         })
         .await
         .unwrap();
-
     wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
     // wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
 
     let requests = server.received_requests().await.unwrap();
-    assert!(
-        requests.len() >= 3,
-        "auto compact should add at least a third request, got {}",
-        requests.len()
-    );
-    let is_auto_compact = |req: &wiremock::Request| {
-        std::str::from_utf8(&req.body)
-            .unwrap_or("")
-            .contains("You have exceeded the maximum number of tokens")
-    };
-    let auto_compact_count = requests.iter().filter(|req| is_auto_compact(req)).count();
-    assert_eq!(
-        auto_compact_count, 1,
-        "expected exactly one auto compact request"
-    );
-    let auto_compact_index = requests
-        .iter()
-        .enumerate()
-        .find_map(|(idx, req)| is_auto_compact(req).then_some(idx))
-        .expect("auto compact request missing");
-    assert_eq!(
-        auto_compact_index, 2,
-        "auto compact should add a third request"
-    );
+    assert_eq!(requests.len(), 3, "auto compact should add a third request");
 
-    let body3 = requests[auto_compact_index]
-        .body_json::<serde_json::Value>()
-        .unwrap();
+    let body3 = requests[2].body_json::<serde_json::Value>().unwrap();
     let instructions = body3
         .get("instructions")
         .and_then(|v| v.as_str())

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

@@ -74,7 +74,7 @@ async fn compact_resume_and_fork_preserve_model_history_view() {
         "compact+resume test expects resumed path {resumed_path:?} to exist",
     );
 
-    let forked = fork_conversation(&manager, &config, resumed_path, 1).await;
+    let forked = fork_conversation(&manager, &config, resumed_path, 4).await;
     user_turn(&forked, "AFTER_FORK").await;
 
     // 3. Capture the requests to the model and validate the history slices.
@@ -535,7 +535,7 @@ async fn compact_resume_after_second_compaction_preserves_history() {
         "second compact test expects resumed path {resumed_path:?} to exist",
     );
 
-    let forked = fork_conversation(&manager, &config, resumed_path, 3).await;
+    let forked = fork_conversation(&manager, &config, resumed_path, 1).await;
     user_turn(&forked, "AFTER_FORK").await;
 
     compact_conversation(&forked).await;

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

@@ -104,7 +104,8 @@ async fn fork_conversation_twice_drops_to_first_message() {
         items
     };
 
-    // Compute expected prefixes after each fork by truncating base rollout at nth-from-last user input.
+    // Compute expected prefixes after each fork by truncating base rollout
+    // strictly before the nth user input (0-based).
     let base_items = read_items(&base_path);
     let find_user_input_positions = |items: &[RolloutItem]| -> Vec<usize> {
         let mut pos = Vec::new();
@@ -126,11 +127,8 @@ async fn fork_conversation_twice_drops_to_first_message() {
     };
     let user_inputs = find_user_input_positions(&base_items);
 
-    // After dropping last user input (n=1), cut strictly before that input if present, else empty.
-    let cut1 = user_inputs
-        .get(user_inputs.len().saturating_sub(1))
-        .copied()
-        .unwrap_or(0);
+    // After cutting at nth user input (n=1 → second user message), cut strictly before that input.
+    let cut1 = user_inputs.get(1).copied().unwrap_or(0);
     let expected_after_first: Vec<RolloutItem> = base_items[..cut1].to_vec();
 
     // After dropping again (n=1 on fork1), compute expected relative to fork1's rollout.
@@ -161,12 +159,12 @@ async fn fork_conversation_twice_drops_to_first_message() {
         serde_json::to_value(&expected_after_first).unwrap()
     );
 
-    // Fork again with n=1 → drops the (new) last user message, leaving only the first.
+    // Fork again with n=0 → drops the (new) last user message, leaving only the first.
     let NewConversation {
         conversation: codex_fork2,
         ..
     } = conversation_manager
-        .fork_conversation(1, config_for_fork.clone(), fork1_path.clone())
+        .fork_conversation(0, config_for_fork.clone(), fork1_path.clone())
         .await
         .expect("fork 2");
 

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

@@ -11,7 +11,6 @@ mod live_cli;
 mod model_overrides;
 mod prompt_caching;
 mod review;
-mod rollout_list_find;
 mod seatbelt;
 mod stream_error_allows_next_turn;
 mod stream_no_completed;

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

@@ -12,7 +12,6 @@ use codex_core::protocol::Op;
 use codex_core::protocol::SandboxPolicy;
 use codex_core::protocol_config_types::ReasoningEffort;
 use codex_core::protocol_config_types::ReasoningSummary;
-use codex_core::shell::Shell;
 use codex_core::shell::default_user_shell;
 use core_test_support::load_default_config_for_test;
 use core_test_support::load_sse_fixture_with_id;
@@ -24,30 +23,6 @@ use wiremock::ResponseTemplate;
 use wiremock::matchers::method;
 use wiremock::matchers::path;
 
-fn text_user_input(text: String) -> serde_json::Value {
-    serde_json::json!({
-        "type": "message",
-        "role": "user",
-        "content": [ { "type": "input_text", "text": text } ]
-    })
-}
-
-fn default_env_context_str(cwd: &str, shell: &Shell) -> String {
-    format!(
-        r#"<environment_context>
-  <cwd>{}</cwd>
-  <approval_policy>on-request</approval_policy>
-  <sandbox_mode>read-only</sandbox_mode>
-  <network_access>restricted</network_access>
-{}</environment_context>"#,
-        cwd,
-        match shell.name() {
-            Some(name) => format!("  <shell>{name}</shell>\n"),
-            None => String::new(),
-        }
-    )
-}
-
 /// Build minimal SSE stream with completed marker using the JSON fixture.
 fn sse_completed(id: &str) -> String {
     load_sse_fixture_with_id("tests/fixtures/completed_template.json", id)
@@ -571,262 +546,12 @@ async fn per_turn_overrides_keep_cached_prefix_and_key_constant() {
         "role": "user",
         "content": [ { "type": "input_text", "text": "hello 2" } ]
     });
-    let expected_env_text_2 = format!(
-        r#"<environment_context>
-  <cwd>{}</cwd>
-  <approval_policy>never</approval_policy>
-  <sandbox_mode>workspace-write</sandbox_mode>
-  <network_access>enabled</network_access>
-  <writable_roots>
-    <root>{}</root>
-  </writable_roots>
-</environment_context>"#,
-        new_cwd.path().to_string_lossy(),
-        writable.path().to_string_lossy(),
-    );
-    let expected_env_msg_2 = serde_json::json!({
-        "type": "message",
-        "role": "user",
-        "content": [ { "type": "input_text", "text": expected_env_text_2 } ]
-    });
     let expected_body2 = serde_json::json!(
         [
             body1["input"].as_array().unwrap().as_slice(),
-            [expected_env_msg_2, expected_user_message_2].as_slice(),
+            [expected_user_message_2].as_slice(),
         ]
         .concat()
     );
     assert_eq!(body2["input"], expected_body2);
 }
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn send_user_turn_with_no_changes_does_not_send_environment_context() {
-    use pretty_assertions::assert_eq;
-
-    let server = MockServer::start().await;
-
-    let sse = sse_completed("resp");
-    let template = ResponseTemplate::new(200)
-        .insert_header("content-type", "text/event-stream")
-        .set_body_raw(sse, "text/event-stream");
-
-    Mock::given(method("POST"))
-        .and(path("/v1/responses"))
-        .respond_with(template)
-        .expect(2)
-        .mount(&server)
-        .await;
-
-    let model_provider = ModelProviderInfo {
-        base_url: Some(format!("{}/v1", server.uri())),
-        ..built_in_model_providers()["openai"].clone()
-    };
-
-    let cwd = TempDir::new().unwrap();
-    let codex_home = TempDir::new().unwrap();
-    let mut config = load_default_config_for_test(&codex_home);
-    config.cwd = cwd.path().to_path_buf();
-    config.model_provider = model_provider;
-    config.user_instructions = Some("be consistent and helpful".to_string());
-
-    let default_cwd = config.cwd.clone();
-    let default_approval_policy = config.approval_policy;
-    let default_sandbox_policy = config.sandbox_policy.clone();
-    let default_model = config.model.clone();
-    let default_effort = config.model_reasoning_effort;
-    let default_summary = config.model_reasoning_summary;
-
-    let conversation_manager =
-        ConversationManager::with_auth(CodexAuth::from_api_key("Test API Key"));
-    let codex = conversation_manager
-        .new_conversation(config)
-        .await
-        .expect("create new conversation")
-        .conversation;
-
-    codex
-        .submit(Op::UserTurn {
-            items: vec![InputItem::Text {
-                text: "hello 1".into(),
-            }],
-            cwd: default_cwd.clone(),
-            approval_policy: default_approval_policy,
-            sandbox_policy: default_sandbox_policy.clone(),
-            model: default_model.clone(),
-            effort: default_effort,
-            summary: default_summary,
-        })
-        .await
-        .unwrap();
-    wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
-
-    codex
-        .submit(Op::UserTurn {
-            items: vec![InputItem::Text {
-                text: "hello 2".into(),
-            }],
-            cwd: default_cwd.clone(),
-            approval_policy: default_approval_policy,
-            sandbox_policy: default_sandbox_policy.clone(),
-            model: default_model.clone(),
-            effort: default_effort,
-            summary: default_summary,
-        })
-        .await
-        .unwrap();
-    wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
-
-    let requests = server.received_requests().await.unwrap();
-    assert_eq!(requests.len(), 2, "expected two POST requests");
-
-    let body1 = requests[0].body_json::<serde_json::Value>().unwrap();
-    let body2 = requests[1].body_json::<serde_json::Value>().unwrap();
-
-    let shell = default_user_shell().await;
-    let expected_ui_text =
-        "<user_instructions>\n\nbe consistent and helpful\n\n</user_instructions>";
-    let expected_ui_msg = text_user_input(expected_ui_text.to_string());
-
-    let expected_env_msg_1 = text_user_input(default_env_context_str(
-        &cwd.path().to_string_lossy(),
-        &shell,
-    ));
-    let expected_user_message_1 = text_user_input("hello 1".to_string());
-
-    let expected_input_1 = serde_json::Value::Array(vec![
-        expected_ui_msg.clone(),
-        expected_env_msg_1.clone(),
-        expected_user_message_1.clone(),
-    ]);
-    assert_eq!(body1["input"], expected_input_1);
-
-    let expected_user_message_2 = text_user_input("hello 2".to_string());
-    let expected_input_2 = serde_json::Value::Array(vec![
-        expected_ui_msg,
-        expected_env_msg_1,
-        expected_user_message_1,
-        expected_user_message_2,
-    ]);
-    assert_eq!(body2["input"], expected_input_2);
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn send_user_turn_with_changes_sends_environment_context() {
-    use pretty_assertions::assert_eq;
-
-    let server = MockServer::start().await;
-
-    let sse = sse_completed("resp");
-    let template = ResponseTemplate::new(200)
-        .insert_header("content-type", "text/event-stream")
-        .set_body_raw(sse, "text/event-stream");
-
-    Mock::given(method("POST"))
-        .and(path("/v1/responses"))
-        .respond_with(template)
-        .expect(2)
-        .mount(&server)
-        .await;
-
-    let model_provider = ModelProviderInfo {
-        base_url: Some(format!("{}/v1", server.uri())),
-        ..built_in_model_providers()["openai"].clone()
-    };
-
-    let cwd = TempDir::new().unwrap();
-    let codex_home = TempDir::new().unwrap();
-    let mut config = load_default_config_for_test(&codex_home);
-    config.cwd = cwd.path().to_path_buf();
-    config.model_provider = model_provider;
-    config.user_instructions = Some("be consistent and helpful".to_string());
-
-    let default_cwd = config.cwd.clone();
-    let default_approval_policy = config.approval_policy;
-    let default_sandbox_policy = config.sandbox_policy.clone();
-    let default_model = config.model.clone();
-    let default_effort = config.model_reasoning_effort;
-    let default_summary = config.model_reasoning_summary;
-
-    let conversation_manager =
-        ConversationManager::with_auth(CodexAuth::from_api_key("Test API Key"));
-    let codex = conversation_manager
-        .new_conversation(config.clone())
-        .await
-        .expect("create new conversation")
-        .conversation;
-
-    codex
-        .submit(Op::UserTurn {
-            items: vec![InputItem::Text {
-                text: "hello 1".into(),
-            }],
-            cwd: default_cwd.clone(),
-            approval_policy: default_approval_policy,
-            sandbox_policy: default_sandbox_policy.clone(),
-            model: default_model,
-            effort: default_effort,
-            summary: default_summary,
-        })
-        .await
-        .unwrap();
-    wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
-
-    codex
-        .submit(Op::UserTurn {
-            items: vec![InputItem::Text {
-                text: "hello 2".into(),
-            }],
-            cwd: default_cwd.clone(),
-            approval_policy: AskForApproval::Never,
-            sandbox_policy: SandboxPolicy::DangerFullAccess,
-            model: "o3".to_string(),
-            effort: Some(ReasoningEffort::High),
-            summary: ReasoningSummary::Detailed,
-        })
-        .await
-        .unwrap();
-    wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
-
-    let requests = server.received_requests().await.unwrap();
-    assert_eq!(requests.len(), 2, "expected two POST requests");
-
-    let body1 = requests[0].body_json::<serde_json::Value>().unwrap();
-    let body2 = requests[1].body_json::<serde_json::Value>().unwrap();
-
-    let shell = default_user_shell().await;
-    let expected_ui_text =
-        "<user_instructions>\n\nbe consistent and helpful\n\n</user_instructions>";
-    let expected_ui_msg = serde_json::json!({
-        "type": "message",
-        "role": "user",
-        "content": [ { "type": "input_text", "text": expected_ui_text } ]
-    });
-    let expected_env_text_1 = default_env_context_str(&default_cwd.to_string_lossy(), &shell);
-    let expected_env_msg_1 = text_user_input(expected_env_text_1);
-    let expected_user_message_1 = text_user_input("hello 1".to_string());
-    let expected_input_1 = serde_json::Value::Array(vec![
-        expected_ui_msg.clone(),
-        expected_env_msg_1.clone(),
-        expected_user_message_1.clone(),
-    ]);
-    assert_eq!(body1["input"], expected_input_1);
-
-    let expected_env_msg_2 = text_user_input(format!(
-        r#"<environment_context>
-  <cwd>{}</cwd>
-  <approval_policy>never</approval_policy>
-  <sandbox_mode>danger-full-access</sandbox_mode>
-  <network_access>enabled</network_access>
-</environment_context>"#,
-        default_cwd.to_string_lossy()
-    ));
-    let expected_user_message_2 = text_user_input("hello 2".to_string());
-    let expected_input_2 = serde_json::Value::Array(vec![
-        expected_ui_msg,
-        expected_env_msg_1,
-        expected_user_message_1,
-        expected_env_msg_2,
-        expected_user_message_2,
-    ]);
-    assert_eq!(body2["input"], expected_input_2);
-}

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

@@ -1,16 +1,10 @@
 use codex_core::CodexAuth;
 use codex_core::CodexConversation;
-use codex_core::ContentItem;
 use codex_core::ConversationManager;
 use codex_core::ModelProviderInfo;
-use codex_core::REVIEW_PROMPT;
-use codex_core::ResponseItem;
 use codex_core::built_in_model_providers;
 use codex_core::config::Config;
-use codex_core::protocol::ConversationPathResponseEvent;
-use codex_core::protocol::ENVIRONMENT_CONTEXT_OPEN_TAG;
 use codex_core::protocol::EventMsg;
-use codex_core::protocol::ExitedReviewModeEvent;
 use codex_core::protocol::InputItem;
 use codex_core::protocol::Op;
 use codex_core::protocol::ReviewCodeLocation;
@@ -18,8 +12,6 @@ use codex_core::protocol::ReviewFinding;
 use codex_core::protocol::ReviewLineRange;
 use codex_core::protocol::ReviewOutputEvent;
 use codex_core::protocol::ReviewRequest;
-use codex_core::protocol::RolloutItem;
-use codex_core::protocol::RolloutLine;
 use codex_core::spawn::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR;
 use core_test_support::load_default_config_for_test;
 use core_test_support::load_sse_fixture_with_id_from_str;
@@ -97,10 +89,8 @@ async fn review_op_emits_lifecycle_and_review_output() {
     let _entered = wait_for_event(&codex, |ev| matches!(ev, EventMsg::EnteredReviewMode(_))).await;
     let closed = wait_for_event(&codex, |ev| matches!(ev, EventMsg::ExitedReviewMode(_))).await;
     let review = match closed {
-        EventMsg::ExitedReviewMode(ev) => ev
-            .review_output
-            .expect("expected ExitedReviewMode with Some(review_output)"),
-        other => panic!("expected ExitedReviewMode(..), got {other:?}"),
+        EventMsg::ExitedReviewMode(Some(r)) => r,
+        other => panic!("expected ExitedReviewMode(Some(..)), got {other:?}"),
     };
 
     // Deep compare full structure using PartialEq (floats are f32 on both sides).
@@ -122,55 +112,13 @@ async fn review_op_emits_lifecycle_and_review_output() {
     assert_eq!(expected, review);
     let _complete = wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
 
-    // Also verify that a user message with the header and a formatted finding
-    // was recorded back in the parent session's rollout.
-    codex.submit(Op::GetPath).await.unwrap();
-    let history_event =
-        wait_for_event(&codex, |ev| matches!(ev, EventMsg::ConversationPath(_))).await;
-    let path = match history_event {
-        EventMsg::ConversationPath(ConversationPathResponseEvent { path, .. }) => path,
-        other => panic!("expected ConversationPath event, got {other:?}"),
-    };
-    let text = std::fs::read_to_string(&path).expect("read rollout file");
-
-    let mut saw_header = false;
-    let mut saw_finding_line = false;
-    for line in text.lines() {
-        if line.trim().is_empty() {
-            continue;
-        }
-        let v: serde_json::Value = serde_json::from_str(line).expect("jsonl line");
-        let rl: RolloutLine = serde_json::from_value(v).expect("rollout line");
-        if let RolloutItem::ResponseItem(ResponseItem::Message { role, content, .. }) = rl.item
-            && role == "user"
-        {
-            for c in content {
-                if let ContentItem::InputText { text } = c {
-                    if text.contains("full review output from reviewer model") {
-                        saw_header = true;
-                    }
-                    if text.contains("- Prefer Stylize helpers — /tmp/file.rs:10-20") {
-                        saw_finding_line = true;
-                    }
-                }
-            }
-        }
-    }
-    assert!(saw_header, "user header missing from rollout");
-    assert!(
-        saw_finding_line,
-        "formatted finding line missing from rollout"
-    );
-
     server.verify().await;
 }
 
 /// When the model returns plain text that is not JSON, ensure the child
 /// lifecycle still occurs and the plain text is surfaced via
 /// ExitedReviewMode(Some(..)) as the overall_explanation.
-// Windows CI only: bump to 4 workers to prevent SSE/event starvation and test timeouts.
-#[cfg_attr(windows, tokio::test(flavor = "multi_thread", worker_threads = 4))]
-#[cfg_attr(not(windows), tokio::test(flavor = "multi_thread", worker_threads = 2))]
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn review_op_with_plain_text_emits_review_fallback() {
     if std::env::var(CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR).is_ok() {
         println!(
@@ -203,10 +151,8 @@ async fn review_op_with_plain_text_emits_review_fallback() {
     let _entered = wait_for_event(&codex, |ev| matches!(ev, EventMsg::EnteredReviewMode(_))).await;
     let closed = wait_for_event(&codex, |ev| matches!(ev, EventMsg::ExitedReviewMode(_))).await;
     let review = match closed {
-        EventMsg::ExitedReviewMode(ev) => ev
-            .review_output
-            .expect("expected ExitedReviewMode with Some(review_output)"),
-        other => panic!("expected ExitedReviewMode(..), got {other:?}"),
+        EventMsg::ExitedReviewMode(Some(r)) => r,
+        other => panic!("expected ExitedReviewMode(Some(..)), got {other:?}"),
     };
 
     // Expect a structured fallback carrying the plain text.
@@ -222,9 +168,7 @@ async fn review_op_with_plain_text_emits_review_fallback() {
 
 /// When the model returns structured JSON in a review, ensure no AgentMessage
 /// is emitted; the UI consumes the structured result via ExitedReviewMode.
-// Windows CI only: bump to 4 workers to prevent SSE/event starvation and test timeouts.
-#[cfg_attr(windows, tokio::test(flavor = "multi_thread", worker_threads = 4))]
-#[cfg_attr(not(windows), tokio::test(flavor = "multi_thread", worker_threads = 2))]
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn review_does_not_emit_agent_message_on_structured_output() {
     if std::env::var(CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR).is_ok() {
         println!(
@@ -335,15 +279,7 @@ async fn review_uses_custom_review_model_from_config() {
 
     // Wait for completion
     let _entered = wait_for_event(&codex, |ev| matches!(ev, EventMsg::EnteredReviewMode(_))).await;
-    let _closed = wait_for_event(&codex, |ev| {
-        matches!(
-            ev,
-            EventMsg::ExitedReviewMode(ExitedReviewModeEvent {
-                review_output: None
-            })
-        )
-    })
-    .await;
+    let _closed = wait_for_event(&codex, |ev| matches!(ev, EventMsg::ExitedReviewMode(None))).await;
     let _complete = wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
 
     // Assert the request body model equals the configured review model
@@ -357,9 +293,7 @@ async fn review_uses_custom_review_model_from_config() {
 /// When a review session begins, it must not prepend prior chat history from
 /// the parent session. The request `input` should contain only the review
 /// prompt from the user.
-// Windows CI only: bump to 4 workers to prevent SSE/event starvation and test timeouts.
-#[cfg_attr(windows, tokio::test(flavor = "multi_thread", worker_threads = 4))]
-#[cfg_attr(not(windows), tokio::test(flavor = "multi_thread", worker_threads = 2))]
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn review_input_isolated_from_parent_history() {
     if std::env::var(CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR).is_ok() {
         println!(
@@ -439,8 +373,13 @@ async fn review_input_isolated_from_parent_history() {
             .await
             .unwrap();
     }
-    let codex =
-        resume_conversation_for_server(&server, &codex_home, session_file.clone(), |_| {}).await;
+    config.experimental_resume = Some(session_file);
+
+    let codex = new_conversation_for_server(&server, &codex_home, |cfg| {
+        // apply resume file
+        cfg.experimental_resume = config.experimental_resume.clone();
+    })
+    .await;
 
     // Submit review request; it must start fresh (no parent history in `input`).
     let review_prompt = "Please review only this".to_string();
@@ -455,84 +394,20 @@ async fn review_input_isolated_from_parent_history() {
         .unwrap();
 
     let _entered = wait_for_event(&codex, |ev| matches!(ev, EventMsg::EnteredReviewMode(_))).await;
-    let _closed = wait_for_event(&codex, |ev| {
-        matches!(
-            ev,
-            EventMsg::ExitedReviewMode(ExitedReviewModeEvent {
-                review_output: None
-            })
-        )
-    })
-    .await;
+    let _closed = wait_for_event(&codex, |ev| matches!(ev, EventMsg::ExitedReviewMode(None))).await;
     let _complete = wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
 
-    // Assert the request `input` contains the environment context followed by the review prompt.
+    // Assert the request `input` contains only the single review user message.
     let request = &server.received_requests().await.unwrap()[0];
     let body = request.body_json::<serde_json::Value>().unwrap();
-    let input = body["input"].as_array().expect("input array");
-    assert_eq!(
-        input.len(),
-        2,
-        "expected environment context and review prompt"
-    );
-
-    let env_msg = &input[0];
-    assert_eq!(env_msg["type"].as_str().unwrap(), "message");
-    assert_eq!(env_msg["role"].as_str().unwrap(), "user");
-    let env_text = env_msg["content"][0]["text"].as_str().expect("env text");
-    assert!(
-        env_text.starts_with(ENVIRONMENT_CONTEXT_OPEN_TAG),
-        "environment context must be the first item"
-    );
-    assert!(
-        env_text.contains("<cwd>"),
-        "environment context should include cwd"
-    );
-
-    let review_msg = &input[1];
-    assert_eq!(review_msg["type"].as_str().unwrap(), "message");
-    assert_eq!(review_msg["role"].as_str().unwrap(), "user");
-    assert_eq!(
-        review_msg["content"][0]["text"].as_str().unwrap(),
-        format!("{REVIEW_PROMPT}\n\n---\n\nNow, here's your task: Please review only this",)
-    );
-
-    // Also verify that a user interruption note was recorded in the rollout.
-    codex.submit(Op::GetPath).await.unwrap();
-    let history_event =
-        wait_for_event(&codex, |ev| matches!(ev, EventMsg::ConversationPath(_))).await;
-    let path = match history_event {
-        EventMsg::ConversationPath(ConversationPathResponseEvent { path, .. }) => path,
-        other => panic!("expected ConversationPath event, got {other:?}"),
-    };
-    let text = std::fs::read_to_string(&path).expect("read rollout file");
-    let mut saw_interruption_message = false;
-    for line in text.lines() {
-        if line.trim().is_empty() {
-            continue;
-        }
-        let v: serde_json::Value = serde_json::from_str(line).expect("jsonl line");
-        let rl: RolloutLine = serde_json::from_value(v).expect("rollout line");
-        if let RolloutItem::ResponseItem(ResponseItem::Message { role, content, .. }) = rl.item
-            && role == "user"
+    let expected_input = serde_json::json!([
         {
-            for c in content {
-                if let ContentItem::InputText { text } = c
-                    && text.contains("User initiated a review task, but was interrupted.")
-                {
-                    saw_interruption_message = true;
-                    break;
-                }
-            }
+            "type": "message",
+            "role": "user",
+            "content": [{"type": "input_text", "text": review_prompt}]
         }
-        if saw_interruption_message {
-            break;
-        }
-    }
-    assert!(
-        saw_interruption_message,
-        "expected user interruption message in rollout"
-    );
+    ]);
+    assert_eq!(body["input"], expected_input);
 
     server.verify().await;
 }
@@ -573,12 +448,7 @@ async fn review_history_does_not_leak_into_parent_session() {
         .unwrap();
     let _entered = wait_for_event(&codex, |ev| matches!(ev, EventMsg::EnteredReviewMode(_))).await;
     let _closed = wait_for_event(&codex, |ev| {
-        matches!(
-            ev,
-            EventMsg::ExitedReviewMode(ExitedReviewModeEvent {
-                review_output: Some(_)
-            })
-        )
+        matches!(ev, EventMsg::ExitedReviewMode(Some(_)))
     })
     .await;
     let _complete = wait_for_event(&codex, |ev| matches!(ev, EventMsg::TaskComplete(_))).await;
@@ -670,32 +540,3 @@ where
         .expect("create conversation")
         .conversation
 }
-
-/// Create a conversation resuming from a rollout file, configured to talk to the provided mock server.
-#[expect(clippy::expect_used)]
-async fn resume_conversation_for_server<F>(
-    server: &MockServer,
-    codex_home: &TempDir,
-    resume_path: std::path::PathBuf,
-    mutator: F,
-) -> Arc<CodexConversation>
-where
-    F: FnOnce(&mut Config),
-{
-    let model_provider = ModelProviderInfo {
-        base_url: Some(format!("{}/v1", server.uri())),
-        ..built_in_model_providers()["openai"].clone()
-    };
-    let mut config = load_default_config_for_test(codex_home);
-    config.model_provider = model_provider;
-    mutator(&mut config);
-    let conversation_manager =
-        ConversationManager::with_auth(CodexAuth::from_api_key("Test API Key"));
-    let auth_manager =
-        codex_core::AuthManager::from_auth_for_testing(CodexAuth::from_api_key("Test API Key"));
-    conversation_manager
-        .resume_conversation_from_rollout(config, resume_path, auth_manager)
-        .await
-        .expect("resume conversation")
-        .conversation
-}

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

@@ -1,50 +0,0 @@
-#![allow(clippy::unwrap_used, clippy::expect_used)]
-use std::io::Write;
-use std::path::PathBuf;
-
-use codex_core::find_conversation_path_by_id_str;
-use tempfile::TempDir;
-use uuid::Uuid;
-
-/// Create sessions/YYYY/MM/DD and write a minimal rollout file containing the
-/// provided conversation id in the SessionMeta line. Returns the absolute path.
-fn write_minimal_rollout_with_id(codex_home: &TempDir, id: Uuid) -> PathBuf {
-    let sessions = codex_home.path().join("sessions/2024/01/01");
-    std::fs::create_dir_all(&sessions).unwrap();
-
-    let file = sessions.join(format!("rollout-2024-01-01T00-00-00-{id}.jsonl"));
-    let mut f = std::fs::File::create(&file).unwrap();
-    // Minimal first line: session_meta with the id so content search can find it
-    writeln!(
-        f,
-        "{}",
-        serde_json::json!({
-            "timestamp": "2024-01-01T00:00:00.000Z",
-            "type": "session_meta",
-            "payload": {
-                "id": id,
-                "timestamp": "2024-01-01T00:00:00Z",
-                "instructions": null,
-                "cwd": ".",
-                "originator": "test",
-                "cli_version": "test"
-            }
-        })
-    )
-    .unwrap();
-
-    file
-}
-
-#[tokio::test]
-async fn find_locates_rollout_file_by_id() {
-    let home = TempDir::new().unwrap();
-    let id = Uuid::new_v4();
-    let expected = write_minimal_rollout_with_id(&home, id);
-
-    let found = find_conversation_path_by_id_str(home.path(), &id.to_string())
-        .await
-        .unwrap();
-
-    assert_eq!(found.unwrap(), expected);
-}

codex-rs/docs/codex_mcp_interface.md

@@ -1,123 +0,0 @@
-# Codex MCP Interface [experimental]
-
-This document describes Codex’s experimental MCP interface: a JSON‑RPC API that runs over the Model Context Protocol (MCP) transport to control a local Codex engine.
-
-- Status: experimental and subject to change without notice
-- Server binary: `codex mcp` (or `codex-mcp-server`)
-- Transport: standard MCP over stdio (JSON‑RPC 2.0, line‑delimited)
-
-## Overview
-
-Codex exposes a small set of MCP‑compatible methods to create and manage conversations, send user input, receive live events, and handle approval prompts. The types are defined in `protocol/src/mcp_protocol.rs` and re‑used by the MCP server implementation in `mcp-server/`.
-
-At a glance:
-
-- Conversations
-  - `newConversation` → start a Codex session
-  - `sendUserMessage` / `sendUserTurn` → send user input into a conversation
-  - `interruptConversation` → stop the current turn
-  - `listConversations`, `resumeConversation`, `archiveConversation`
-- Configuration and info
-  - `getUserSavedConfig`, `setDefaultModel`, `getUserAgent`, `userInfo`
-- Auth
-  - `loginApiKey`, `loginChatGpt`, `cancelLoginChatGpt`, `logoutChatGpt`, `getAuthStatus`
-- Utilities
-  - `gitDiffToRemote`, `execOneOffCommand`
-- Approvals (server → client requests)
-  - `applyPatchApproval`, `execCommandApproval`
-- Notifications (server → client)
-  - `loginChatGptComplete`, `authStatusChange`
-  - `codex/event` stream with agent events
-
-See code for full type definitions and exact shapes: `protocol/src/mcp_protocol.rs`.
-
-## Starting the server
-
-Run Codex as an MCP server and connect an MCP client:
-
-```bash
-codex mcp | your_mcp_client
-```
-
-For a simple inspection UI, you can also try:
-
-```bash
-npx @modelcontextprotocol/inspector codex mcp
-```
-
-## Conversations
-
-Start a new session with optional overrides:
-
-Request `newConversation` params (subset):
-
-- `model`: string model id (e.g. "o3", "gpt-5")
-- `profile`: optional named profile
-- `cwd`: optional working directory
-- `approvalPolicy`: `untrusted` | `on-request` | `on-failure` | `never`
-- `sandbox`: `read-only` | `workspace-write` | `danger-full-access`
-- `config`: map of additional config overrides
-- `baseInstructions`: optional instruction override
-- `includePlanTool` / `includeApplyPatchTool`: booleans
-
-Response: `{ conversationId, model, reasoningEffort?, rolloutPath }`
-
-Send input to the active turn:
-
-- `sendUserMessage` → enqueue items to the conversation
-- `sendUserTurn` → structured turn with explicit `cwd`, `approvalPolicy`, `sandboxPolicy`, `model`, optional `effort`, and `summary`
-
-Interrupt a running turn: `interruptConversation`.
-
-List/resume/archive: `listConversations`, `resumeConversation`, `archiveConversation`.
-
-## Event stream
-
-While a conversation runs, the server sends notifications:
-
-- `codex/event` with the serialized Codex event payload. The shape matches `core/src/protocol.rs`’s `Event` and `EventMsg` types. Some notifications include a `_meta.requestId` to correlate with the originating request.
-- Auth notifications via method names `loginChatGptComplete` and `authStatusChange`.
-
-Clients should render events and, when present, surface approval requests (see next section).
-
-## Approvals (server → client)
-
-When Codex needs approval to apply changes or run commands, the server issues JSON‑RPC requests to the client:
-
-- `applyPatchApproval { conversationId, callId, fileChanges, reason?, grantRoot? }`
-- `execCommandApproval { conversationId, callId, command, cwd, reason? }`
-
-The client must reply with `{ decision: "allow" | "deny" }` for each request.
-
-## Auth helpers
-
-For ChatGPT or API‑key based auth flows, the server exposes helpers:
-
-- `loginApiKey { apiKey }`
-- `loginChatGpt` → returns `{ loginId, authUrl }`; browser completes flow; then `loginChatGptComplete` notification follows
-- `cancelLoginChatGpt { loginId }`, `logoutChatGpt`, `getAuthStatus { includeToken?, refreshToken? }`
-
-## Example: start and send a message
-
-```json
-{ "jsonrpc": "2.0", "id": 1, "method": "newConversation", "params": { "model": "gpt-5", "approvalPolicy": "on-request" } }
-```
-
-Server responds:
-
-```json
-{ "jsonrpc": "2.0", "id": 1, "result": { "conversationId": "c7b0…", "model": "gpt-5", "rolloutPath": "/path/to/rollout.jsonl" } }
-```
-
-Then send input:
-
-```json
-{ "jsonrpc": "2.0", "id": 2, "method": "sendUserMessage", "params": { "conversationId": "c7b0…", "items": [{ "type": "text", "text": "Hello Codex" }] } }
-```
-
-While processing, the server emits `codex/event` notifications containing agent output, approvals, and status updates.
-
-## Compatibility and stability
-
-This interface is experimental. Method names, fields, and event shapes may evolve. For the authoritative schema, consult `protocol/src/mcp_protocol.rs` and the corresponding server wiring in `mcp-server/`.
-

codex-rs/exec/Cargo.toml

@@ -38,7 +38,7 @@ tokio = { version = "1", features = [
     "signal",
 ] }
 tracing = { version = "0.1.41", features = ["log"] }
-tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 
 [dev-dependencies]
 assert_cmd = "2"
@@ -46,6 +46,4 @@ core_test_support = { path = "../core/tests/common" }
 libc = "0.2"
 predicates = "3"
 tempfile = "3.13.0"
-uuid = "1"
-walkdir = "2"
 wiremock = "0.6"

codex-rs/exec/src/cli.rs

@@ -6,10 +6,6 @@ use std::path::PathBuf;
 #[derive(Parser, Debug)]
 #[command(version)]
 pub struct Cli {
-    /// Action to perform. If omitted, runs a new non-interactive session.
-    #[command(subcommand)]
-    pub command: Option<Command>,
-
     /// Optional image(s) to attach to the initial prompt.
     #[arg(long = "image", short = 'i', value_name = "FILE", value_delimiter = ',', num_args = 1..)]
     pub images: Vec<PathBuf>,
@@ -73,28 +69,6 @@ pub struct Cli {
     pub prompt: Option<String>,
 }
 
-#[derive(Debug, clap::Subcommand)]
-pub enum Command {
-    /// Resume a previous session by id or pick the most recent with --last.
-    Resume(ResumeArgs),
-}
-
-#[derive(Parser, Debug)]
-pub struct ResumeArgs {
-    /// Conversation/session id (UUID). When provided, resumes this session.
-    /// If omitted, use --last to pick the most recent recorded session.
-    #[arg(value_name = "SESSION_ID")]
-    pub session_id: Option<String>,
-
-    /// Resume the most recent recorded session (newest) without specifying an id.
-    #[arg(long = "last", default_value_t = false, conflicts_with = "session_id")]
-    pub last: bool,
-
-    /// Prompt to send after resuming the session. If `-` is used, read from stdin.
-    #[arg(value_name = "PROMPT")]
-    pub prompt: Option<String>,
-}
-
 #[derive(Debug, Clone, Copy, Default, PartialEq, Eq, ValueEnum)]
 #[value(rename_all = "kebab-case")]
 pub enum Color {

codex-rs/exec/src/lib.rs

@@ -30,14 +30,11 @@ use tracing::error;
 use tracing::info;
 use tracing_subscriber::EnvFilter;
 
-use crate::cli::Command as ExecCommand;
 use crate::event_processor::CodexStatus;
 use crate::event_processor::EventProcessor;
-use codex_core::find_conversation_path_by_id_str;
 
 pub async fn run_main(cli: Cli, codex_linux_sandbox_exe: Option<PathBuf>) -> anyhow::Result<()> {
     let Cli {
-        command,
         images,
         model: model_cli_arg,
         oss,
@@ -54,15 +51,8 @@ pub async fn run_main(cli: Cli, codex_linux_sandbox_exe: Option<PathBuf>) -> any
         config_overrides,
     } = cli;
 
-    // Determine the prompt source (parent or subcommand) and read from stdin if needed.
-    let prompt_arg = match &command {
-        // Allow prompt before the subcommand by falling back to the parent-level prompt
-        // when the Resume subcommand did not provide its own prompt.
-        Some(ExecCommand::Resume(args)) => args.prompt.clone().or(prompt),
-        None => prompt,
-    };
-
-    let prompt = match prompt_arg {
+    // Determine the prompt based on CLI arg and/or stdin.
+    let prompt = match prompt {
         Some(p) if p != "-" => p,
         // Either `-` was passed or no positional arg.
         maybe_dash => {
@@ -200,29 +190,11 @@ pub async fn run_main(cli: Cli, codex_linux_sandbox_exe: Option<PathBuf>) -> any
 
     let conversation_manager =
         ConversationManager::new(AuthManager::shared(config.codex_home.clone()));
-
-    // Handle resume subcommand by resolving a rollout path and using explicit resume API.
     let NewConversation {
         conversation_id: _,
         conversation,
         session_configured,
-    } = if let Some(ExecCommand::Resume(args)) = command {
-        let resume_path = resolve_resume_path(&config, &args).await?;
-
-        if let Some(path) = resume_path {
-            conversation_manager
-                .resume_conversation_from_rollout(
-                    config.clone(),
-                    path,
-                    AuthManager::shared(config.codex_home.clone()),
-                )
-                .await?
-        } else {
-            conversation_manager.new_conversation(config).await?
-        }
-    } else {
-        conversation_manager.new_conversation(config).await?
-    };
+    } = conversation_manager.new_conversation(config).await?;
     info!("Codex initialized with event: {session_configured:?}");
 
     let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel::<Event>();
@@ -307,23 +279,3 @@ pub async fn run_main(cli: Cli, codex_linux_sandbox_exe: Option<PathBuf>) -> any
 
     Ok(())
 }
-
-async fn resolve_resume_path(
-    config: &Config,
-    args: &crate::cli::ResumeArgs,
-) -> anyhow::Result<Option<PathBuf>> {
-    if args.last {
-        match codex_core::RolloutRecorder::list_conversations(&config.codex_home, 1, None).await {
-            Ok(page) => Ok(page.items.first().map(|it| it.path.clone())),
-            Err(e) => {
-                error!("Error listing conversations: {e}");
-                Ok(None)
-            }
-        }
-    } else if let Some(id_str) = args.session_id.as_deref() {
-        let path = find_conversation_path_by_id_str(&config.codex_home, id_str).await?;
-        Ok(path)
-    } else {
-        Ok(None)
-    }
-}

codex-rs/exec/tests/fixtures/cli_responses_fixture.sse

@@ -1,10 +0,0 @@
-event: response.created
-data: {"type":"response.created","response":{"id":"resp1"}}
-
-event: response.output_item.done
-data: {"type":"response.output_item.done","item":{"type":"message","role":"assistant","content":[{"type":"output_text","text":"fixture hello"}]}}
-
-event: response.completed
-data: {"type":"response.completed","response":{"id":"resp1","output":[]}}
-
-

codex-rs/exec/tests/suite/mod.rs

@@ -1,5 +1,4 @@
 // Aggregates all former standalone integration tests as modules.
 mod apply_patch;
 mod common;
-mod resume;
 mod sandbox;

codex-rs/exec/tests/suite/resume.rs

@@ -1,267 +0,0 @@
-#![allow(clippy::unwrap_used, clippy::expect_used)]
-use anyhow::Context;
-use assert_cmd::prelude::*;
-use serde_json::Value;
-use std::process::Command;
-use tempfile::TempDir;
-use uuid::Uuid;
-use walkdir::WalkDir;
-
-/// Utility: scan the sessions dir for a rollout file that contains `marker`
-/// in any response_item.message.content entry. Returns the absolute path.
-fn find_session_file_containing_marker(
-    sessions_dir: &std::path::Path,
-    marker: &str,
-) -> Option<std::path::PathBuf> {
-    for entry in WalkDir::new(sessions_dir) {
-        let entry = match entry {
-            Ok(e) => e,
-            Err(_) => continue,
-        };
-        if !entry.file_type().is_file() {
-            continue;
-        }
-        if !entry.file_name().to_string_lossy().ends_with(".jsonl") {
-            continue;
-        }
-        let path = entry.path();
-        let Ok(content) = std::fs::read_to_string(path) else {
-            continue;
-        };
-        // Skip the first meta line and scan remaining JSONL entries.
-        let mut lines = content.lines();
-        if lines.next().is_none() {
-            continue;
-        }
-        for line in lines {
-            if line.trim().is_empty() {
-                continue;
-            }
-            let Ok(item): Result<Value, _> = serde_json::from_str(line) else {
-                continue;
-            };
-            if item.get("type").and_then(|t| t.as_str()) == Some("response_item")
-                && let Some(payload) = item.get("payload")
-                && payload.get("type").and_then(|t| t.as_str()) == Some("message")
-                && payload
-                    .get("content")
-                    .map(|c| c.to_string())
-                    .unwrap_or_default()
-                    .contains(marker)
-            {
-                return Some(path.to_path_buf());
-            }
-        }
-    }
-    None
-}
-
-/// Extract the conversation UUID from the first SessionMeta line in the rollout file.
-fn extract_conversation_id(path: &std::path::Path) -> String {
-    let content = std::fs::read_to_string(path).unwrap();
-    let mut lines = content.lines();
-    let meta_line = lines.next().expect("missing meta line");
-    let meta: Value = serde_json::from_str(meta_line).expect("invalid meta json");
-    meta.get("payload")
-        .and_then(|p| p.get("id"))
-        .and_then(|v| v.as_str())
-        .unwrap_or_default()
-        .to_string()
-}
-
-#[test]
-fn exec_resume_last_appends_to_existing_file() -> anyhow::Result<()> {
-    let home = TempDir::new()?;
-    let fixture = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
-        .join("tests/fixtures/cli_responses_fixture.sse");
-
-    // 1) First run: create a session with a unique marker in the content.
-    let marker = format!("resume-last-{}", Uuid::new_v4());
-    let prompt = format!("echo {marker}");
-
-    Command::cargo_bin("codex-exec")
-        .context("should find binary for codex-exec")?
-        .env("CODEX_HOME", home.path())
-        .env("OPENAI_API_KEY", "dummy")
-        .env("CODEX_RS_SSE_FIXTURE", &fixture)
-        .env("OPENAI_BASE_URL", "http://unused.local")
-        .arg("--skip-git-repo-check")
-        .arg("-C")
-        .arg(env!("CARGO_MANIFEST_DIR"))
-        .arg(&prompt)
-        .assert()
-        .success();
-
-    // Find the created session file containing the marker.
-    let sessions_dir = home.path().join("sessions");
-    let path = find_session_file_containing_marker(&sessions_dir, &marker)
-        .expect("no session file found after first run");
-
-    // 2) Second run: resume the most recent file with a new marker.
-    let marker2 = format!("resume-last-2-{}", Uuid::new_v4());
-    let prompt2 = format!("echo {marker2}");
-
-    let mut binding = assert_cmd::Command::cargo_bin("codex-exec")
-        .context("should find binary for codex-exec")?;
-    let cmd = binding
-        .env("CODEX_HOME", home.path())
-        .env("OPENAI_API_KEY", "dummy")
-        .env("CODEX_RS_SSE_FIXTURE", &fixture)
-        .env("OPENAI_BASE_URL", "http://unused.local")
-        .arg("--skip-git-repo-check")
-        .arg("-C")
-        .arg(env!("CARGO_MANIFEST_DIR"))
-        .arg(&prompt2)
-        .arg("resume")
-        .arg("--last");
-    cmd.assert().success();
-
-    // Ensure the same file was updated and contains both markers.
-    let resumed_path = find_session_file_containing_marker(&sessions_dir, &marker2)
-        .expect("no resumed session file containing marker2");
-    assert_eq!(
-        resumed_path, path,
-        "resume --last should append to existing file"
-    );
-    let content = std::fs::read_to_string(&resumed_path)?;
-    assert!(content.contains(&marker));
-    assert!(content.contains(&marker2));
-    Ok(())
-}
-
-#[test]
-fn exec_resume_by_id_appends_to_existing_file() -> anyhow::Result<()> {
-    let home = TempDir::new()?;
-    let fixture = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
-        .join("tests/fixtures/cli_responses_fixture.sse");
-
-    // 1) First run: create a session
-    let marker = format!("resume-by-id-{}", Uuid::new_v4());
-    let prompt = format!("echo {marker}");
-
-    Command::cargo_bin("codex-exec")
-        .context("should find binary for codex-exec")?
-        .env("CODEX_HOME", home.path())
-        .env("OPENAI_API_KEY", "dummy")
-        .env("CODEX_RS_SSE_FIXTURE", &fixture)
-        .env("OPENAI_BASE_URL", "http://unused.local")
-        .arg("--skip-git-repo-check")
-        .arg("-C")
-        .arg(env!("CARGO_MANIFEST_DIR"))
-        .arg(&prompt)
-        .assert()
-        .success();
-
-    let sessions_dir = home.path().join("sessions");
-    let path = find_session_file_containing_marker(&sessions_dir, &marker)
-        .expect("no session file found after first run");
-    let session_id = extract_conversation_id(&path);
-    assert!(
-        !session_id.is_empty(),
-        "missing conversation id in meta line"
-    );
-
-    // 2) Resume by id
-    let marker2 = format!("resume-by-id-2-{}", Uuid::new_v4());
-    let prompt2 = format!("echo {marker2}");
-
-    let mut binding = assert_cmd::Command::cargo_bin("codex-exec")
-        .context("should find binary for codex-exec")?;
-    let cmd = binding
-        .env("CODEX_HOME", home.path())
-        .env("OPENAI_API_KEY", "dummy")
-        .env("CODEX_RS_SSE_FIXTURE", &fixture)
-        .env("OPENAI_BASE_URL", "http://unused.local")
-        .arg("--skip-git-repo-check")
-        .arg("-C")
-        .arg(env!("CARGO_MANIFEST_DIR"))
-        .arg(&prompt2)
-        .arg("resume")
-        .arg(&session_id);
-    cmd.assert().success();
-
-    let resumed_path = find_session_file_containing_marker(&sessions_dir, &marker2)
-        .expect("no resumed session file containing marker2");
-    assert_eq!(
-        resumed_path, path,
-        "resume by id should append to existing file"
-    );
-    let content = std::fs::read_to_string(&resumed_path)?;
-    assert!(content.contains(&marker));
-    assert!(content.contains(&marker2));
-    Ok(())
-}
-
-#[test]
-fn exec_resume_preserves_cli_configuration_overrides() -> anyhow::Result<()> {
-    let home = TempDir::new()?;
-    let fixture = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
-        .join("tests/fixtures/cli_responses_fixture.sse");
-
-    let marker = format!("resume-config-{}", Uuid::new_v4());
-    let prompt = format!("echo {marker}");
-
-    Command::cargo_bin("codex-exec")
-        .context("should find binary for codex-exec")?
-        .env("CODEX_HOME", home.path())
-        .env("OPENAI_API_KEY", "dummy")
-        .env("CODEX_RS_SSE_FIXTURE", &fixture)
-        .env("OPENAI_BASE_URL", "http://unused.local")
-        .arg("--skip-git-repo-check")
-        .arg("--sandbox")
-        .arg("workspace-write")
-        .arg("--model")
-        .arg("gpt-5")
-        .arg("-C")
-        .arg(env!("CARGO_MANIFEST_DIR"))
-        .arg(&prompt)
-        .assert()
-        .success();
-
-    let sessions_dir = home.path().join("sessions");
-    let path = find_session_file_containing_marker(&sessions_dir, &marker)
-        .expect("no session file found after first run");
-
-    let marker2 = format!("resume-config-2-{}", Uuid::new_v4());
-    let prompt2 = format!("echo {marker2}");
-
-    let output = Command::cargo_bin("codex-exec")
-        .context("should find binary for codex-exec")?
-        .env("CODEX_HOME", home.path())
-        .env("OPENAI_API_KEY", "dummy")
-        .env("CODEX_RS_SSE_FIXTURE", &fixture)
-        .env("OPENAI_BASE_URL", "http://unused.local")
-        .arg("--skip-git-repo-check")
-        .arg("--sandbox")
-        .arg("workspace-write")
-        .arg("--model")
-        .arg("gpt-5-high")
-        .arg("-C")
-        .arg(env!("CARGO_MANIFEST_DIR"))
-        .arg(&prompt2)
-        .arg("resume")
-        .arg("--last")
-        .output()
-        .context("resume run should succeed")?;
-
-    assert!(output.status.success(), "resume run failed: {output:?}");
-
-    let stdout = String::from_utf8(output.stdout)?;
-    assert!(
-        stdout.contains("model: gpt-5-high"),
-        "stdout missing model override: {stdout}"
-    );
-    assert!(
-        stdout.contains("sandbox: workspace-write"),
-        "stdout missing sandbox override: {stdout}"
-    );
-
-    let resumed_path = find_session_file_containing_marker(&sessions_dir, &marker2)
-        .expect("no resumed session file containing marker2");
-    assert_eq!(resumed_path, path, "resume should append to same file");
-
-    let content = std::fs::read_to_string(&resumed_path)?;
-    assert!(content.contains(&marker));
-    assert!(content.contains(&marker2));
-    Ok(())
-}

codex-rs/execpolicy/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-edition = "2024"
 name = "codex-execpolicy"
 version = { workspace = true }
+edition = "2024"
 
 [[bin]]
 name = "codex-execpolicy"
@@ -15,8 +15,9 @@ path = "src/lib.rs"
 workspace = true
 
 [dependencies]
-allocative = "0.3.3"
 anyhow = "1"
+starlark = "0.13.0"
+allocative = "0.3.3"
 clap = { version = "4", features = ["derive"] }
 derive_more = { version = "2", features = ["display"] }
 env_logger = "0.11.5"
@@ -24,10 +25,9 @@ log = "0.4"
 multimap = "0.10.0"
 path-absolutize = "3.1.1"
 regex-lite = "0.1"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+serde = { version = "1.0.194", features = ["derive"] }
+serde_json = "1.0.143"
 serde_with = { version = "3", features = ["macros"] }
-starlark = "0.13.0"
 
 [dev-dependencies]
 tempfile = "3.13.0"

codex-rs/file-search/Cargo.toml

@@ -17,5 +17,5 @@ clap = { version = "4", features = ["derive"] }
 ignore = "0.4.23"
 nucleo-matcher = "0.3.1"
 serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+serde_json = "1.0.143"
 tokio = { version = "1", features = ["full"] }

codex-rs/login/src/server.rs

@@ -238,8 +238,8 @@ async fn process_request(
                         &opts.codex_home,
                         api_key.clone(),
                         tokens.id_token.clone(),
-                        tokens.access_token.clone(),
-                        tokens.refresh_token.clone(),
+                        Some(tokens.access_token.clone()),
+                        Some(tokens.refresh_token.clone()),
                     )
                     .await
                     {
@@ -446,8 +446,8 @@ async fn persist_tokens_async(
     codex_home: &Path,
     api_key: Option<String>,
     id_token: String,
-    access_token: String,
-    refresh_token: String,
+    access_token: Option<String>,
+    refresh_token: Option<String>,
 ) -> io::Result<()> {
     // Reuse existing synchronous logic but run it off the async runtime.
     let codex_home = codex_home.to_path_buf();
@@ -459,29 +459,43 @@ async fn persist_tokens_async(
             std::fs::create_dir_all(parent).map_err(io::Error::other)?;
         }
 
-        let mut tokens = TokenData {
-            id_token: parse_id_token(&id_token).map_err(io::Error::other)?,
-            access_token,
-            refresh_token,
-            account_id: None,
-        };
+        let mut auth = read_or_default(&auth_file);
+        if let Some(key) = api_key {
+            auth.openai_api_key = Some(key);
+        }
+        let tokens = auth.tokens.get_or_insert_with(TokenData::default);
+        tokens.id_token = parse_id_token(&id_token).map_err(io::Error::other)?;
+        // Persist chatgpt_account_id if present in claims
         if let Some(acc) = jwt_auth_claims(&id_token)
             .get("chatgpt_account_id")
             .and_then(|v| v.as_str())
         {
             tokens.account_id = Some(acc.to_string());
         }
-        let auth = AuthDotJson {
-            openai_api_key: api_key,
-            tokens: Some(tokens),
-            last_refresh: Some(Utc::now()),
-        };
+        if let Some(at) = access_token {
+            tokens.access_token = at;
+        }
+        if let Some(rt) = refresh_token {
+            tokens.refresh_token = rt;
+        }
+        auth.last_refresh = Some(Utc::now());
         codex_core::auth::write_auth_json(&auth_file, &auth)
     })
     .await
     .map_err(|e| io::Error::other(format!("persist task failed: {e}")))?
 }
 
+fn read_or_default(path: &Path) -> AuthDotJson {
+    match codex_core::auth::try_read_auth_json(path) {
+        Ok(auth) => auth,
+        Err(_) => AuthDotJson {
+            openai_api_key: None,
+            tokens: None,
+            last_refresh: None,
+        },
+    }
+}
+
 fn compose_success_url(port: u16, issuer: &str, id_token: &str, access_token: &str) -> String {
     let token_claims = jwt_auth_claims(id_token);
     let access_claims = jwt_auth_claims(access_token);

codex-rs/login/tests/suite/login_server_e2e.rs

@@ -90,22 +90,6 @@ async fn end_to_end_login_flow_persists_auth_json() {
     let tmp = tempdir().unwrap();
     let codex_home = tmp.path().to_path_buf();
 
-    // Seed auth.json with stale API key + tokens that should be overwritten.
-    let stale_auth = serde_json::json!({
-        "OPENAI_API_KEY": "sk-stale",
-        "tokens": {
-            "id_token": "stale.header.payload",
-            "access_token": "stale-access",
-            "refresh_token": "stale-refresh",
-            "account_id": "stale-acc"
-        }
-    });
-    std::fs::write(
-        codex_home.join("auth.json"),
-        serde_json::to_string_pretty(&stale_auth).unwrap(),
-    )
-    .unwrap();
-
     let state = "test_state_123".to_string();
 
     // Run server in background
@@ -138,10 +122,10 @@ async fn end_to_end_login_flow_persists_auth_json() {
     let auth_path = codex_home.join("auth.json");
     let data = std::fs::read_to_string(&auth_path).unwrap();
     let json: serde_json::Value = serde_json::from_str(&data).unwrap();
-    // The following assert is here because of the old oauth flow that exchanges tokens for an
-    // API key. See obtain_api_key in server.rs for details. Once we remove this old mechanism
-    // from the code, this test should be updated to expect that the API key is no longer present.
-    assert_eq!(json["OPENAI_API_KEY"], "access-123");
+    assert!(
+        !json["OPENAI_API_KEY"].is_null(),
+        "OPENAI_API_KEY should be set"
+    );
     assert_eq!(json["tokens"]["access_token"], "access-123");
     assert_eq!(json["tokens"]["refresh_token"], "refresh-123");
     assert_eq!(json["tokens"]["account_id"], "acc-123");

codex-rs/mcp-server/src/codex_message_processor.rs

@@ -423,41 +423,32 @@ impl CodexMessageProcessor {
         // Determine whether auth is required based on the active model provider.
         // If a custom provider is configured with `requires_openai_auth == false`,
         // then no auth step is required; otherwise, default to requiring auth.
-        let requires_openai_auth = self.config.model_provider.requires_openai_auth;
+        let requires_openai_auth = Some(self.config.model_provider.requires_openai_auth);
 
-        let response = if !requires_openai_auth {
-            codex_protocol::mcp_protocol::GetAuthStatusResponse {
+        let response = match self.auth_manager.auth() {
+            Some(auth) => {
+                let (reported_auth_method, token_opt) = match auth.get_token().await {
+                    Ok(token) if !token.is_empty() => {
+                        let tok = if include_token { Some(token) } else { None };
+                        (Some(auth.mode), tok)
+                    }
+                    Ok(_) => (None, None),
+                    Err(err) => {
+                        tracing::warn!("failed to get token for auth status: {err}");
+                        (None, None)
+                    }
+                };
+                codex_protocol::mcp_protocol::GetAuthStatusResponse {
+                    auth_method: reported_auth_method,
+                    auth_token: token_opt,
+                    requires_openai_auth,
+                }
+            }
+            None => codex_protocol::mcp_protocol::GetAuthStatusResponse {
                 auth_method: None,
                 auth_token: None,
-                requires_openai_auth: Some(false),
-            }
-        } else {
-            match self.auth_manager.auth() {
-                Some(auth) => {
-                    let auth_mode = auth.mode;
-                    let (reported_auth_method, token_opt) = match auth.get_token().await {
-                        Ok(token) if !token.is_empty() => {
-                            let tok = if include_token { Some(token) } else { None };
-                            (Some(auth_mode), tok)
-                        }
-                        Ok(_) => (None, None),
-                        Err(err) => {
-                            tracing::warn!("failed to get token for auth status: {err}");
-                            (None, None)
-                        }
-                    };
-                    codex_protocol::mcp_protocol::GetAuthStatusResponse {
-                        auth_method: reported_auth_method,
-                        auth_token: token_opt,
-                        requires_openai_auth: Some(true),
-                    }
-                }
-                None => codex_protocol::mcp_protocol::GetAuthStatusResponse {
-                    auth_method: None,
-                    auth_token: None,
-                    requires_openai_auth: Some(true),
-                },
-            }
+                requires_openai_auth,
+            },
         };
 
         self.outgoing.send_response(request_id, response).await;

codex-rs/mcp-server/tests/suite/auth.rs

@@ -15,17 +15,11 @@ use tokio::time::timeout;
 
 const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10);
 
-fn create_config_toml_custom_provider(
-    codex_home: &Path,
-    requires_openai_auth: bool,
-) -> std::io::Result<()> {
+// Helper to create a config.toml; mirrors create_conversation.rs
+fn create_config_toml(codex_home: &Path) -> std::io::Result<()> {
     let config_toml = codex_home.join("config.toml");
-    let requires_line = if requires_openai_auth {
-        "requires_openai_auth = true\n"
-    } else {
-        ""
-    };
-    let contents = format!(
+    std::fs::write(
+        config_toml,
         r#"
 model = "mock-model"
 approval_policy = "never"
@@ -39,20 +33,6 @@ base_url = "http://127.0.0.1:0/v1"
 wire_api = "chat"
 request_max_retries = 0
 stream_max_retries = 0
-{requires_line}
-"#
-    );
-    std::fs::write(config_toml, contents)
-}
-
-fn create_config_toml(codex_home: &Path) -> std::io::Result<()> {
-    let config_toml = codex_home.join("config.toml");
-    std::fs::write(
-        config_toml,
-        r#"
-model = "mock-model"
-approval_policy = "never"
-sandbox_mode = "danger-full-access"
 "#,
     )
 }
@@ -144,47 +124,6 @@ async fn get_auth_status_with_api_key() {
     assert_eq!(status.auth_token, Some("sk-test-key".to_string()));
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn get_auth_status_with_api_key_when_auth_not_required() {
-    let codex_home = TempDir::new().unwrap_or_else(|e| panic!("create tempdir: {e}"));
-    create_config_toml_custom_provider(codex_home.path(), false)
-        .unwrap_or_else(|err| panic!("write config.toml: {err}"));
-
-    let mut mcp = McpProcess::new(codex_home.path())
-        .await
-        .expect("spawn mcp process");
-    timeout(DEFAULT_READ_TIMEOUT, mcp.initialize())
-        .await
-        .expect("init timeout")
-        .expect("init failed");
-
-    login_with_api_key_via_request(&mut mcp, "sk-test-key").await;
-
-    let request_id = mcp
-        .send_get_auth_status_request(GetAuthStatusParams {
-            include_token: Some(true),
-            refresh_token: Some(false),
-        })
-        .await
-        .expect("send getAuthStatus");
-
-    let resp: JSONRPCResponse = timeout(
-        DEFAULT_READ_TIMEOUT,
-        mcp.read_stream_until_response_message(RequestId::Integer(request_id)),
-    )
-    .await
-    .expect("getAuthStatus timeout")
-    .expect("getAuthStatus response");
-    let status: GetAuthStatusResponse = to_response(resp).expect("deserialize status");
-    assert_eq!(status.auth_method, None, "expected no auth method");
-    assert_eq!(status.auth_token, None, "expected no token");
-    assert_eq!(
-        status.requires_openai_auth,
-        Some(false),
-        "requires_openai_auth should be false",
-    );
-}
-
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn get_auth_status_with_api_key_no_include_token() {
     let codex_home = TempDir::new().unwrap_or_else(|e| panic!("create tempdir: {e}"));

codex-rs/protocol/src/protocol.rs

@@ -414,7 +414,6 @@ pub struct Event {
 }
 
 /// Response event from the agent
-/// NOTE: Make sure none of these values have optional types, as it will mess up the extension code-gen.
 #[derive(Debug, Clone, Deserialize, Serialize, Display, TS)]
 #[serde(tag = "type", rename_all = "snake_case")]
 #[strum(serialize_all = "snake_case")]
@@ -515,12 +514,7 @@ pub enum EventMsg {
     EnteredReviewMode(ReviewRequest),
 
     /// Exited review mode with an optional final result to apply.
-    ExitedReviewMode(ExitedReviewModeEvent),
-}
-
-#[derive(Debug, Clone, Deserialize, Serialize, TS)]
-pub struct ExitedReviewModeEvent {
-    pub review_output: Option<ReviewOutputEvent>,
+    ExitedReviewMode(Option<ReviewOutputEvent>),
 }
 
 // Individual event payload types matching each `EventMsg` variant.

codex-rs/tui/Cargo.toml

@@ -43,7 +43,6 @@ crossterm = { version = "0.28.1", features = [
     "bracketed-paste",
     "event-stream",
 ] }
-dirs = "6"
 diffy = "0.4.2"
 image = { version = "^0.25.8", default-features = false, features = [
     "jpeg",
@@ -79,7 +78,7 @@ tokio = { version = "1", features = [
 tokio-stream = "0.1.17"
 tracing = { version = "0.1.41", features = ["log"] }
 tracing-appender = "0.2.3"
-tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 pulldown-cmark = "0.10"
 unicode-segmentation = "1.12.0"
 unicode-width = "0.1"

codex-rs/tui/frames/blocks/frame_1.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒▓▒▓▒██▒▒██▒             
-         ▒▒█▓█▒█▓█▒▒░░▒▒ ▒ █▒         
-       █░█░███ ▒░   ░ █░ ░▒░░░█       
-      ▓█▒▒████▒            ▓█░▓░█     
-     ▒▒▓▓█▒░▒░▒▒             ▓░▒▒█    
-    ░█ █░  ░█▓▓░░█           █▓▒░░█   
-   █▒ ▓█    █▒░█▓ ░▒            ░▓░   
-   ░░▒░░     █▓▓░▓░█             ░░   
-   ░▒░█░    ▓░░▒▒░ ▓░██████▒██ ▒  ░   
-    ▒░▓█  ▒▓█░ ▓█ ░ ░▒▒▒▓▓███░▓█▓█░   
-    ▒▒▒ ▒ ▒▒█▓▓░   ░▒████ ▒█ ▓█▓▒▓    
-     █▒█  █ ░              ██▓█▒░     
-       ▒▒█░▒█▒          ▒▒▒█░▒█       
-         ▒██▒▒ ██▓▓▒▓▓▓▒██▒█░█        
-           ░█ █░░░▒▒▒█▒▓██            
-                                      

codex-rs/tui/frames/blocks/frame_10.txt

@@ -1,17 +0,0 @@
-                                      
-              ▒████▒██▒               
-             ██░███▒░▓▒██             
-            ▒▒█░░▓░░▓░█▒██            
-           ░▒▒▓▒░▓▒▓▒███▒▒█           
-           ▓ ▓░░ ░▒ ██▓▒▓░▓           
-          ░░ █░█░▓▓▒   ░▒ ░           
-          ▒  ░█ █░░░░█   ░▓█          
-             ░░▒█▓█░░▓▒░▓▒░░          
-             ░▒ ▒▒░▓░░█▒█▓░░          
-          ░  █░▒█░▒▓▒█▒▒▒░█░          
-           █  ░░░░░   ▒█ ▒░░          
-           ▒░██▒██  ▒░  █▓▓           
-            ░█ ░░░░██▓█▓░▓░           
-             ▓░██▓░█▓▒ ▓▓█            
-              ██ ▒█▒▒█▓█              
-                                      

codex-rs/tui/frames/blocks/frame_11.txt

@@ -1,17 +0,0 @@
-                                      
-               ███████▒               
-              ▓  ▓░░░▒▒█              
-             ▓ ▒▒░░▓▒█▓▒█             
-             ░▒▒░░▒▓█▒▒▓▓             
-            ▒ ▓▓▒░█▒█▓▒░░█            
-            ░█░░░█▒▓▓░▒▓░░            
-            ██ █░░░░░░▒░▒▒            
-            ░  ░░▓░░▒▓ ░ ░            
-            ▓  █░▓░░█▓█░▒░            
-            ██ ▒░▓▒█ ▓░▒░▒            
-            █░▓ ░░░░▒▓░▒▒░            
-             ▒▒▓▓░▒█▓██▓░░            
-              ▒ █░▒▒▒▒░▓              
-              ▒█ █░░█▒▓█░             
-               ▒▒ ███▒█░              
-                                      

codex-rs/tui/frames/blocks/frame_12.txt

@@ -1,17 +0,0 @@
-                                      
-                █████▓                
-               █▒░▒▓░█▒               
-                  ░▓▒██               
-               ▓█░░░▒▒ ░              
-              ░ █░░░░▓▓░              
-              ░█▓▓█▒ ▒░               
-              ░   ░▓▒░░▒              
-              ░   ▓█▒░░               
-              ██ ░▓░░█░░              
-              ░   ▓░█▓█▒              
-              ░▓  ░ ▒██▓              
-               █  █░ ▒█░              
-               ▓ ██░██▒░              
-               █▒▓ █░▒░░              
-                ▒ █░▒▓▓               
-                                      

codex-rs/tui/frames/blocks/frame_13.txt

@@ -1,17 +0,0 @@
-                                      
-                 ▓████                
-                 ░▒▒░░                
-                 ░░▒░                 
-                 ░██░▒                
-                 █  ░░                
-                  ▓▓░░                
-                 █  ░░                
-                 █   ░                
-                ▓█  ▒░▓               
-                ░   █▒░               
-                █░▓▓ ░░               
-                 ░▒▒▒░                
-                 ░██░▒                
-                 █▒▒░▒                
-                 █ ▓ ▒                
-                                      

codex-rs/tui/frames/blocks/frame_14.txt

@@ -1,17 +0,0 @@
-                                      
-                 ████▓                
-                 █▓▒▒▓▒               
-                ░▒░░▓ ░               
-                ░░▓░ ▒░█              
-                ░░░▒   ░              
-                ░█░░  █░              
-                ░░░░ ▓ █              
-                ░░▒░░  ▒              
-                ░░░░                  
-                 ▒▓▓  ▓▓              
-                ▒░  █▓█░              
-                ░█░░▒▒▒░              
-                ▓  ░▒▒▒░              
-                ░▒▓█▒▒▓               
-                 ▒█ █▒▓               
-                                      

codex-rs/tui/frames/blocks/frame_15.txt

@@ -1,17 +0,0 @@
-                                      
-                 █████░▒              
-                ░█▒░░▒▓██             
-               ▓▓░█▒▒░ █░             
-               ░▓░ ▓▓█▓▒▒░            
-              ░░▒ ▒▒░░▓ ▒░            
-              ▒░░▓░░▓▓░               
-              ░░   ░░░░░░█░           
-              ░░▓░░█░░░ █▓░           
-              ░░████░░░▒▓▓░           
-              ░▒░▓▓░▒░█▓ ▓░           
-              ░▓░░░░▒░ ░ ▓            
-              ░██▓▒░░▒▓  ▒            
-              █░▒█ ▓▓▓░ ▓░            
-               ░▒░░▒▒▓█▒▓             
-                ▒▒█▒▒▒▒▓              
-                   ░░                 

codex-rs/tui/frames/blocks/frame_16.txt

@@ -1,17 +0,0 @@
-                                      
-                ▒▒█ ███░▒             
-               ▓▒░░█░░▒░▒▒            
-              ░▓▓ ▒▓▒▒░░ █▒           
-             ▓▓▓ ▓█▒▒░▒░░██░          
-             ░░▓▒▓██▒░░█▓░░▒          
-            ░░░█░█ ░▒▒  ░ ░▓░         
-            ▒▒░ ▓░█░░░░▓█ █ ░         
-            ░▓▓ ░░░░▓░░░ ▓ ░░         
-            ▒▒░░░█░▓▒░░ ██  ▓         
-            █ ▒▒█▒▒▒█░▓▒░ █▒░         
-            ░░░█  ▓█▒░▓ ▓▓░░░         
-             ░░█ ░░  ░▓▓█  ▓          
-             ▒░█  ░  ▓█▓▒█░           
-              ▒░░ ▒█░▓▓█▒░            
-               █▓▓▒▒▓▒▒▓█             
-                                      

codex-rs/tui/frames/blocks/frame_17.txt

@@ -1,17 +0,0 @@
-                                      
-                █▒███▓▓░█▒            
-             ▒▓██░░░█▒█░█ ▒█          
-            ██▒▓▒▒▒░██ ░░░▒ ▒         
-           ▓░▓▒▓░ ▒░ █░▓▒░░░▒▒        
-           ░▓▒ ░    ░ ▓▒▒▒▓▓  █       
-          ░▒██▓░   █▓▓░ ▓█▒▓░▓▓       
-          █ ▓▓░   █▓▓░▒ █ ░░▓▒░       
-          ▓ ▒░     ▓▓░░▓░█░░▒▓█       
-          █▓█▓▒▒▒█░▒▒░▒▒▓▒░░░ ░       
-           ░ ▒▓▒▒░▓█▒▓░░▒ ▒███▒       
-          ▒▒▒▓   ████▒▒░█▓▓▒ ▒█       
-           ▒░░▒█       ░▓░░░ ▓        
-            ▒▒▒ █▒▒   ███▓▒▒▓         
-             █ ░██▒▒█░▒▓█▓░█          
-              ░█▓▓▒██░█▒██            
-                   ░                  

codex-rs/tui/frames/blocks/frame_18.txt

@@ -1,17 +0,0 @@
-                                      
-               ▒▒▒█▒▒█▓░█▒            
-            ▒█ ▒▓███░▒▒█ █▓▓▒         
-          ▒▓▓░█ █▒ █ ▓▒ █▓▓▒ █        
-         █░░█▓█▒ █ █▒░▒▓▒░▒▓▒▒▒█      
-        ▒▒▓▓ ▓░  ▒ █▒▒▓░▓░▒▒▓▒▒▒      
-        ▓▒░ ██░▓▒▒▒▓███░█▓▓▒▓░▓░      
-        ░░▒▓▓     █▓█▓░ ▒▓ █░▒░▒█     
-         ▒▓░░     ▒▒ ░░▓▒   ░▓░       
-       ▒   █▒▒▒▓▒▓█░░█░█▓▒█ ░█░░      
-        ▒▒▒░█▒█ ░░▓▒▒▒▒░░░▒▓░░▒ █     
-        ░▓░▒░  █████░ ▒▒▒▓░▓█▓░▓░     
-         ▒▒ █▒█         ░░█ ▓█▒█      
-          ▒▒██▒▒▓      ▒█▒▒▓▒█░       
-           █░▓████▒▒▒▒██▒▓▒██         
-              ░░▒▓▒▒█▓█ ▓█            
-                    ░                 

codex-rs/tui/frames/blocks/frame_19.txt

@@ -1,17 +0,0 @@
-                                      
-              ▒▒▒▒█░█▒▒░▓▒            
-           ▒█░░░▒▓▒▒▒▒█▒█░███         
-         ██▓▓▓ ░██░    ░█▓█░█▓▒       
-        ▓▓░██▒░         ▒▒▒██▒░██     
-       ░░▓░▓░         █░▒ ▓ ░▒ ░▒█    
-      ░▒▓██         ▒░█░▓ ▓▓ █▓█░     
-      ▒▒░░█        ▓█▒▓░██░   ▓▓▓█░   
-      ░░░░         ░▓ ▒░ █    ░ ░░░   
-      ░█░▒█▒▓▓▒▒▒░░░░██▓█░▓   ▒  ░░   
-      ▒▓▓█░▒█▓▒██▒█░█ ▒▒ ▓▒▒▒█▓▓░▒    
-      █▒ ▓█░     ██    ▒▒▒▓░▓▓ ▓▓█    
-       ▒▒▒█▒▒             ░▓▓▒▓▓█     
-        █ ▒▒░░██        █▓▒▓▓░▓░      
-          █ ▓░█▓░█▒▒▒▓▓█  ▓█░█        
-              ░▓▒▓▓█▒█▓▒█▓▒           
-                                      

codex-rs/tui/frames/blocks/frame_2.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒▓▒▓▒█▒▒▒██▒             
-         ▒██▓█▓█░░░▒░░▒▒█░██▒         
-       █░█░▒██░█░░  ░ █▒█▓░░▓░█       
-     ▒░▓▒▓████▒           ▓█▒░▓░█     
-     █▒ ▓█▒░▒▒▒▒▒           ▒█░▒░█    
-    █▓█ ░  ░█▒█▓▒█           ▒▒░█░    
-   █░██░    ▒▓░▓░▒░█          ▓ ░ ░   
-   ░  ▒░     █░█░░▓█          ░█▓▓░   
-   █  ▒░    ▓░▒▒▒░ ▓░█████████░▒░░█   
-    ▒▒█░  ▓░░█ ▓█ ░▒▒▒▒▒▒▓▓▒▒░█▓ ░    
-    ▒▒▒ █ █▒▓▓░█   ░ ███████ ░██░░    
-     █▒▒▓▓█ ░              ██▓▓██     
-       ▓▒▒▒░██          █▒▒█ ▒░       
-        ░░▒▓▒▒ ██▓▓▒▓▓▓▒█░▒░░█        
-           ░████░░▒▒▒▒░▓▓█            
-                                      

codex-rs/tui/frames/blocks/frame_20.txt

@@ -1,17 +0,0 @@
-                                      
-              ▒▒█▒░░▒█▒█▒▒            
-          █▓▒ ▓█▒█▒▒▒░░▒▒█▒██         
-        ██ ▒██ ░█     ░ ▒ ▒██░█▒      
-      ▒░ ▒█░█           ▒██░▒▓█▒▒     
-     ▒░ █░█           ▒▓ ▒░░▒█▒░░▒    
-     ▓░█░█           ███▓░ ▓  █▒░░▒   
-    ▓░▓█░          ██ ▓██▒     █▒░▓   
-    ░▒▒▓░            ▓▓░ █     ░░ ░   
-    ░▓░░▓█▒▓▒▒▒▒▒▒▒██▓▒▒▒▒█    ▓ ░▒   
-    █░▒░▒  ▓░░▒▒▒▒░▒  █▒▒ ░▒▒ █▓ ░░   
-     ▒█▒▒█       █      ▒█▒░░█░ ▓▒    
-      █ ▒█▓█               ▒▓█▓░▓     
-        ▒▒▒██░▒          █▓█░▓██      
-          ▒█▓▓ ░█▒▓▓█▓ ░ ░█▓██        
-            ░██░▒ ▒▒▒▒▒░█             
-                                      

codex-rs/tui/frames/blocks/frame_21.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒▒█▒█▒▒█▒██▒▒            
-          ███░░▒▒█░▒░█▓▒░▓██▒         
-        ▓█▒▒██▒ ░     ░▒░██▒░██       
-      ██░▓ █             ▒█▓██▓██     
-     ▓█▓█░             █░▓▒▒ ▒▒▒▒█    
-    ▓ ▓░             ███▒▓▓    ▒▒▒█   
-    ░█░░           ▒ ▓░█▓█     ▒▓▒    
-     ░▒            ▒▓  ░█       ░ ░   
-    ░ ░  ██▓▓▓▓▓███  ▒░█ ░█    ▓▓ ░   
-    ░ ░▒ ░▒      ▒█░   ▒ ░█░█  ▓ ▓▓   
-     ▓  ▓ ░░     █░     ██▒█▓ ▓░ █    
-     ██ ▓▓▒                 ▒█  ▓     
-       █▒  ▒▓▒          ▒▓▓██ █░      
-         █▒▒ █ ██▓░░▓▓▒█    ▓░        
-            ███▓█▒▒▒▒█▒▓██░           
-                                      

codex-rs/tui/frames/blocks/frame_22.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒██▒█▒▒█▒██▒             
-         ▒█▓█░▓▒▓░▓▒░░▓░█▓██▒         
-       █▓█▓░▒██░    ░ █▒███▒▒██       
-      ▓█░██             ██░░░▒█▒      
-     ▒░░▓█            █▒▓░▒░▓▓▓█░     
-    ▒░█▓░           █░▓░▓▒▓░ ▒░▒▒░    
-   ░██▒▓           ░█░▒█▓█    ░░▓░    
-   ░░▒░░           ░▒░░▒▒     ░▒░ ░   
-   ░░█ █ █░▒▒▓▓▓▒██▒▒█░▒ ▒█   ▒░▓     
-   ▒░▒ █▒▒▒█ ▓█ ░▓▓░  ▒█▓▒ ░██ ▓▒▒    
-    ▒▒▒▒░      ██ ░    ░▓██▒▓▓▓ █░    
-     ▒█▒▒▒█               ▒██ ░██     
-      █ █▓ ██▒         ▒▓██ █▒▓       
-        █▓███ █░▓▒█▓▓▓▒█  ███         
-            ░ ░▒▓▒▒▒▓▒▒▓▒█░           
-                                      

codex-rs/tui/frames/blocks/frame_23.txt

@@ -1,17 +0,0 @@
-                                      
-            ▒██▒▒████▒█▒▒             
-         ▒▒░█░▒▒█▒▒▒█░▒░█░█▒          
-       █ █░██▓█░     ░▓█░▒▓░░█        
-      ▓▓░█▓▓░          ▒▓▓▒░░▓▒       
-     ▓▓░░▓█          █▓████▓█▒░▒      
-    █▒░ ▓░         ▒█████▓██░░▒░█     
-    ░░░ ░         ▓▓▓▓ ▒░░    ░██     
-    ░▓░ ░         ░ ░█▒▒█   ░ █▓░     
-    ▒ ▒ ░█░▓▒▒▒▒▒▓▒░▒█░▒ ▒▒ ░ ░░░     
-    ░▒▒▒░ ▒        ▓░▒ ▒░▒▒█░ ▒▒░     
-     ▓█░ ░ ░          █░▓▓▒░▒▓▒▓░     
-      █░░▒░▓             █▓░▒▒▓░      
-       ▒ ░██▓▒▒       ▒▓ ▓█▓█▓        
-         ▒▒▒█▓██▒░▒▒▒██ ▓▒██░         
-            ░ █▒▒░▒▒█▒▒██░            
-                                      

codex-rs/tui/frames/blocks/frame_24.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒░▒▓███▒▒█▒              
-          █ ▒▓ ░▒▒░▒▒██▒██            
-        █ █▓▒▓█ ░ ▓░▓█░███ ▒          
-       ██▓▓█▓░▒█▒░░▓░ ▒█▒░▒▒█         
-      █ ▓▓▒▓█    ░  ▓▒▒░░░▒░██        
-      ░█▒█▒░       ███▓ ▓░▓ ▓ ▒       
-     ░  ░░       █▓▒█▓ ▓▒▒░▒▒░▒       
-     ░ ▒░░       ░█▒▓▒▒░░▒▓▓░░░       
-     ░▓ ░▓▓▓▓██░░░██▒██▒░ ░  ░░       
-      ▒ ▓  █░▓██▓▓██░▓▒▒██░ ░█░       
-      ▒ █▒░▒█      ░ ▒█▓█▒░▒▓█░       
-       ▒ ▒██▒           ░  ▓▓▓        
-        ▒▓█▒░░▓      ▒▒ ▒▓▓▒█         
-          ▓▓██▒▒ ░░▓▒▒▓░▒▒▓░          
-            █▓▒██▓▒▒▒▒▒██             
-                                      

codex-rs/tui/frames/blocks/frame_25.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒█▒█▓████▒               
-           █ ███░▒▓▒░█░░█             
-          ▓░▓▓██ ▓░█▒▒▒░░░▒           
-         ░██░ ▓  ▒░  ▒░██▒▓           
-        █▒▒▒█▓█▒▓▓▒░  ░▓▓▒▓█          
-        ▒█░░░▒██▓▒░▓ ▓░█░▓▓░█         
-        ░▓░█░ ░▒▒▓▒▒▓░▒▓▒ ░▒░         
-        ░░░▓░▓  ░▒▒▒▓░▒▒░▒░░▒         
-       ▒█▒░ ░▒▒▒▒▒▒█░░▒▒░██░▒         
-        ▓▓ ░▓░█░▒░░▓█▒░▒█▒▓▒░         
-        ▒░█▓▒░░     ██▓░▒░▓░░         
-         ░▒ ░▓█▓▒▓██▓▒▓█▓▓░▓          
-          ▒░▒░▒▒▒█▓▓█▒▓▒░░▓           
-           ▒▓▓▒▒▒█▒░██ █░█            
-             ░█ █▒██▒█░█              
-                                      

codex-rs/tui/frames/blocks/frame_26.txt

@@ -1,17 +0,0 @@
-                                      
-              ▒▓███ ██                
-             ▓█░▓▓▒░█▓░█              
-            ▓█  ░▓▒░▒  ▒█             
-           ▓█ █░░░▒░░▒█▓▒             
-           ░▒█▒░▓░ █▒▓▓░▒▓            
-           ▒  ░▓▓▓ █▒▒ ▒▒▓            
-          ░   ██▒░░▓░░▓▓ █            
-          ▓▓  ▒░░░▒▒▒░░▓░░            
-          ░  ▓▒█▓█░█▒▒▓▒░░            
-            ▓▒░▓█░▒▒██▒▒█░            
-           ░░ ▓░█ ▒█▓░█▒░░            
-           ▒▒░░▓▒   ▓▓ ░░░            
-            █  █░▒ ▒░▓░▓█             
-             ░ █▒▒ █▒██▓              
-              ▒▓▓▒█░▒▒█               
-                                      

codex-rs/tui/frames/blocks/frame_27.txt

@@ -1,17 +0,0 @@
-                                      
-                ▓█████                
-               ░▓▓▓░▓▒                
-              ▓█░ █░▓█░               
-              ░░░▒░░▓░░               
-              ░  ░░▒▓█▒               
-              ░▒▓▒ ░░░░░              
-              ▒  ░░▒█░░               
-             ░  ░░░░▒ ░░              
-             ░▓ ▓ ░█░░░░              
-             █▒ ▓ ▒░▒█░░              
-              ░▓ ▒▒███▓█              
-              ░░██░░▒▓░               
-              ░▒▒█▒█▓░▒               
-               ▒▒▒░▒▒▓▓               
-               █▒  ▒▒▓                
-                                      

codex-rs/tui/frames/blocks/frame_28.txt

@@ -1,17 +0,0 @@
-                                      
-                 ▓██▓                 
-                 ░█▒░░                
-                 ▒ ▓░░                
-                 ░▓░█░                
-                 ░  ░░                
-                 ░ ▓ ░                
-                ▒░░ ▒░                
-                 ░▓  ░                
-                ▓▒  ▒░                
-                ░░▓▓░░                
-                 ░  ▒░                
-                 ░▒█▒░                
-                 ░▒█░░                
-                 █▒▒▓░                
-                 ░ ▓█░                
-                                      

codex-rs/tui/frames/blocks/frame_29.txt

@@ -1,17 +0,0 @@
-                                      
-                 ██████               
-                █░█▓ █▒               
-                ▒█░░ █ ░              
-                ░░░░▒▒█▓              
-                ▒ ░ ░  ░              
-                ░█░░░ ▒▒              
-                ░▒▒░░░ ▒              
-                ░░▒░░                 
-                ░░░█░   ░             
-                ▒░▒░░   ░             
-                █░░▓░▒ ▒              
-                ░▓░░░ ▒░              
-                ░░░░░░▒░              
-                ░▒░█▓ ░█              
-                 ░░█ ▓█               
-                                      

codex-rs/tui/frames/blocks/frame_3.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒▓▒▓██▒▒▒▒█▒             
-         ▒██▓▒░░█░ ▒▒░▓▒▒░██▒         
-       █▓▓█▓░█  ░   ░ ░ ███▓▒░█       
-      ▓█▓▒░▓██▒          ░▒█ ░░▒      
-     █▓█░▓▒▓░░█▒▒           ▒▒▒░░▒    
-    ▓░▒▒▓  ▓█░▒▓▒▒           ░ ▒▒░    
-    ▒█ ░    ██▒░▒ ░█          ▓█▓░█   
-   █▓░█░     █▓░ ▓▒░          ░▒░▒░   
-    ▓ █░    ▓░██░░█▓░▒██▒▒▒██▒░▒ ▓░   
-    █▒▓▒█ ▓▓█▓▓▓░ ░█░▒▒█ ▒▓█▓▒░░▒░░   
-    █▒░ ░  ░░██     ███   ███▓▓▓█▓    
-     ██░ ▒█ ░              ▓▒█▒▓▓     
-       ▒▒▓▓█▒█          ██▓▓ █░█      
-         ▒▒██▒██▒▒▓▒▓█▓▒█▓░▒█         
-           ░███▒▓░▒▒▒▒░▓▓▒            
-                                      

codex-rs/tui/frames/blocks/frame_30.txt

@@ -1,17 +0,0 @@
-                                      
-                 ▒▓ ████              
-               ▒▓▓░░▒██▒▒             
-                █▒░█▒▒░██▒            
-              ░░▒░▓░▒▒░▒ ▒█           
-              ▒█░░░▒░█░█  ░           
-             ░█░▒█  █░░░░▓░           
-             ▒▓░░░▒▒ ▒▓▒░ ▒░          
-              ░ ██▒░█░ ░▓  ░          
-              ░▒ ▒░▒░▒▓░█  ░          
-              ░░▒░▒▒░░ ██  ░          
-              ▒░░▓▒▒█░░░█░░           
-              ░█▓▓█▓█▒░░  ░           
-              ▒░▒░░▓█░░█░▓            
-               █▒██▒▒▓░█▓█            
-                ▒▓▓░▒▒▒▓█             
-                  ░░░░                

codex-rs/tui/frames/blocks/frame_31.txt

@@ -1,17 +0,0 @@
-                                      
-                ▒▓▓████▒█             
-              ▒██▓██▒ █▒███           
-             █░▒▓▓█▒▒░▓ ░▒█▒          
-            █░▓█▒▒█▓▒█▒▒░▒░░▒         
-            ▒░░░░█▓█▒▒█ ▒░▓▒▒         
-           ▓░▒░░▒░█ ▒▓██▓▓░█ ░        
-           ▓░░ ░▒█░▒▓▒▓▓█░█░▓░        
-           ▒▒█ ░░ ░▒ ░▒  ░░▒▓░        
-           ░▒█▒░█▒░░░▓█░░░▒  ░        
-            ░░░▓▓░░▒▒▒▒▒░▒░░ █        
-           ▒█▒▓█░█ ▓███░▓░█░▒         
-            ░░░▒▒▒█     ▒▒█ ░         
-             ▓░█▒▒ █  ▓ ░█░▓░         
-              ▓░▒░▓▒░░█░ █░░          
-               █ ▒░▒██▓▓▓█            
-                   ░░░░               

codex-rs/tui/frames/blocks/frame_32.txt

@@ -1,17 +0,0 @@
-                                      
-                █████▓▓░█▒            
-              ▓█░██░▒░░██░░█          
-            ▓▒█▒▒██▒▓▓░█░█▒███        
-           █▓▓░▒█░▓▓ ▓ █▒▒░██ █       
-          ▓▓░█░█▒██░▓ █░█░▒▓▒█▒█      
-          ▒▓▒▒█▒█░░▓░░█▒   ░█▓ █      
-         █░ ▓█░█▒░░██░█▒░▓▒▓▓░█▒      
-         ░░░█▒   ▒░░ ▓█░▓▓▒ ▒░  ░     
-         ▒░░▓▒ █▒░ ▒▒░███░░░▒░ ▒░     
-         █  ▒░░█▒█▒▒▒▒▒▒░░█░▓░▓▒      
-           █▒█░░▓ ░█  ███▒▓▓▓▓▓▓      
-           ▒█░▒▒▒        █▒░▓█░       
-           ███░░░█▒    ▒▓▒░▓ █        
-             ▒▓▒ ░█░▓▒█░▒█ ▒▓         
-               ░▓▒▒▒██▓█▒             
-                   ░░░                

codex-rs/tui/frames/blocks/frame_33.txt

@@ -1,17 +0,0 @@
-                                      
-               ▒██▒█▒█▒░▓▒            
-            ▒██░░▒█▒░▓░▓░█░█▓         
-          ▒▓▒░████▒ ░   █▓░░█ █       
-         █▒▓░▓▒░█▒        █░░▒▒█      
-        ▒▓░▓░░░▓▒▒▒         ░█▒▒▒     
-        ▓▓█   ▒▒▒▒░▒█        ▓▒▓▒▒    
-        ░░█    ▒██░▒░▒       ░█░░     
-        █░██   ███▒▓▒█       ▒ ░█     
-        ░░░ ░ █░ ▓████▓▒▒█░░█▓▒░▒░    
-        ▒▓░█ ▓▓█▓░░░▒▒▒▒▒░░█▒▒▒░░▓    
-        ▒▒▒█ ░▓░▓ ▓     ███ ░░█▓▒░    
-         ▒█▒██ █           ▓▓▓▓▒▓     
-          █▒ ███▓█      ▒█░█▓█▒█      
-            ▒░ █▒█░█▓█▒ ▓█▒█░█        
-               ▒▒██▒▒▒▒██▓▓           
-                   ░░░░               

codex-rs/tui/frames/blocks/frame_34.txt

@@ -1,17 +0,0 @@
-                                      
-               ▒█▒████▒░█▒            
-           ▒███▓▒▓░ ░██▒██▓█▒▒        
-         ▒▓▓█░█ ▓░█░   ░▒▒▒█ ███      
-        █▓▒░█▒▓█▒          █░██▒▒     
-       ▓▓░▒▓▓░ ░  █          ▒▒█▒▒    
-      █▓▒░░▓ ▒▒ ░▒█▒          ▒█▒░▒   
-      ░█▒░▒   █▒▒█░▒▒          ░▓░▒   
-      ▒░▒ ▓    ░█▒░▓ ░         ▓ ▒▒   
-      ██▓▓    ▓▒▓▓ ▒▒▒██████░▒▒  ░▒░  
-      ░░▒█▓██▒ ▓▓█░░░▒░▓▒▒▒█▓▒░░░░▒   
-       ▓▒▒█ ░▒░█▒    ██░░░░▒ █▓█▒░█   
-        ▓█▒▓▒▒▒             ▓▓▓░▓█    
-         ▒█░░█▒▓█        ▒█▒ ▒▓█░     
-           ▓▒▓░ ░██▓██▒█▒█░██▓█       
-              ░▒▓▒▒▒▒▒▒▓▒█▒▒          
-                   ░░░                

codex-rs/tui/frames/blocks/frame_35.txt

@@ -1,17 +0,0 @@
-                                      
-              ▒██▓▒███▒██▒            
-           ██▒█▓░███ ░█░▓ ░█▒▒        
-        ▒▓▓░▓██░▒█ ░  ░ █▒█▓ ░██      
-       █▓▓█▓█▓█▒            ██▒▒░▒    
-      ▓▓░░▓▓▒  ▒██            ░▒█░█   
-     ▓▓▓▓█░ █░▒ ▓▓█▒           ░▒▒░   
-     ▒  ▓▓    ▒▒ ██▒▓           ░▒▒▒  
-     ░░░▓      ▓▒▒▓▓█           ▓  ▓  
-     ▓ █▒    █░░▓▓ ▓░▒▒▒▓▒▒█░░  ░░▒█  
-     ░█▒▓█  ▓▓▓ ██▓░▓ ▒█▒▒▒▒▓ ░▓█ ░█  
-      ▓░▒██▓▒▒░▓▒░  ░ ▒▒▒▒█▒▒█▓▓▒█░   
-        ▓▒▒▓░               ▒▓█ █▒    
-        ▒▓░▒▓█▓█          █▓▓▒███     
-           ▒▒ ░█░▓▓░░█░▓▓█ ▒▓▓        
-              ▒░▓▒▒▒▓▒▒███ ▒          
-                                      

codex-rs/tui/frames/blocks/frame_36.txt

@@ -1,17 +0,0 @@
-                                      
-              ▒▒█▒████▒██▒            
-          ▒▒  ▒█▓▓▓█▒█▓██ ███▒        
-        █▒█▒███▓█ ░░ ░ █░██░██░█      
-      ▒░ ██▒▒▒▒            ██░▒ ░     
-     █▓▒▓▒█░▒░▒█▓             ▒▒▓█    
-     ▓ █▓░  █▒  ░▓█             ▒▒█   
-    ░ ▓ ░      ▒  ▒▒            ░▒░█  
-    ░░▒░      ▒▒ ▒▓▓            ▒░ ░  
-    ░█ ░     ▓▓ ██ ████▒█████▒  ░▒░░  
-     ▒█░▒  █░▒▒▓░▓  ░░▒▒▒▒▒▒▒░░ ▒▓█░  
-     █ █░▒ █▒█▓▒      ██▒▒▒▒▒  ░█ ▓   
-      ██ ▒▓▓                 █▓░ ▓    
-        ▒▓░░█░█           ███ ▓█░     
-          ██▒ ██▒▒▓░▒█░▓ ▓ █▓██       
-            ░██▓░▒██▒██████           
-                                      

codex-rs/tui/frames/blocks/frame_4.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒▓▒▓█▒▒█▒██▒             
-         ▒▓ ██░▓ ░▒▒▓█▓░ ▓██▒         
-       ██▒░░░██ ░   ░▒░▒▒█░▓▒▒▒       
-      ▓▓░█░ ▓██           ░██▒█▒      
-     ▓░▓▒░▒░▒▓▒░█          ▒ ▒░█▒     
-    ▓░░▒░  █▒░░▓█▒          █ ▒▒░█    
-     ▒░▓░   ███▒█ ░█         █  ▓░    
-     ░▓▒     █░▓█▒░░           ░░░    
-    ▒░ ░▒   ▓░▓ ▒▓▓█░███▒▒▒▒██ ░░█    
-    ░▒▓ ░ █▓▓▓█▒░░▒▒░█▓▒█▓▓▒▓░▓▓ ░    
-     ░░▓█▒█▒▒█▒▓    ████████▒▓░░░░    
-      █░▒ ░▒░             █▒▓▓███     
-       ▒▒█▓▒ █▒        ▒▓▒██▓░▓       
-         ░░░▒▒██▒▓▓▒▓██▒██▒░█░        
-            █▒▒░▓░▒▒▒▒▒▓▓█░           
-                                      

codex-rs/tui/frames/blocks/frame_5.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒▓▒▓▓█▒▒▒██▒             
-         ▒█ █▓█▓░░█░▒█▓▒░ ██          
-        █▒▓▒█░█ ░    ▒▒░█▒ ███        
-      █░▓░▓░▓▒█          ▓▒░░░░▒      
-     █▒▓█▓▒▒█░▒▒█         ░ ▒░▒░▒     
-     ░░░░▓ ▒▒░▒▓▓░▒          █▓░░     
-    ░▓░ █   ░▒▒░▒ ░█        ██░█░█    
-    ░▓░▒     █▒▒░▓▒░          █░▒░    
-    ░█░▒█   ▓▒░ █░█▒▒░█░▒▒▒██▒ ░▓░    
-     ▒▒░▒██▓██  ░  ▓▓▒▒▒█▒▓█▓░▓█░░    
-     ▒█░░█░█▒▒▓█░   ██     █░▓░▒▓     
-      ▒▒█▓▒▒ ░            ▓▒▓██▒      
-       ▒▓█▒░▒█▒        ▒▒████▓█       
-         ▒░█░███▒▓░▒▒██▒█▒░▓█         
-            ▒▓█▒█ ▒▒▒▓▒███░           
-                                      

codex-rs/tui/frames/blocks/frame_6.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒▓▒▓▓█▒▒██▒▒             
-          █▒▓▓█░▒██░██▓▒███▒          
-        ███░░░█    ░ ░▓▒███▓▒▒        
-       ▓█░█░█▒▒█        ▒█░░░░█       
-      █▒░░░█▒▒██▒         ▓▒▒░▒█      
-     ▓▓▓░▓░▒█▓░▒▒░█        ▓▒▒▓░      
-     ▒ █░░    ▒▒░▓▒▒        ▒█░▒░     
-     ░ ░░░   ▒░▒░▓░░        ░█▒░░     
-     ▒▓░▓░  ▓█░░█▓▓█▒░█░▒▒██▒▓▒▓░     
-     ░░▒█▓▒▒▒▓█ ░▓▒██░░█▓▒▒▒░█░▒      
-      ▓ ░ ▓░░░▓▓    █   ██ ░▒▒▓░      
-       █ ▓ ▓█░           █▓▒▓▓░░      
-        ▓░▒▒███       ▒█▒▒▓███        
-         ░ ░██ █ ▓░▒▒████ ▓▓█         
-            ▒▓▓███▒▒▒░▒███            
-                                      

codex-rs/tui/frames/blocks/frame_7.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒▓░▓██▒▒██▒              
-          ██░█▒░███▒▒▒▓ ░██           
-         █ █░░░█░  ░▒░░ █▓▒██         
-        ▒▒░░░░▓█       ▒░▒█░▓█        
-       ░█░█░░▒░▓▒█       ▓ █░░▒       
-      ░ ▓░░  ░█▒▓░▒       █▓░░░       
-       ░▒ ░  ▒▒░▒░▒░       ██▒░░      
-      ▒ ▓░░   ▒█▓░█░░      █ ░░░      
-       ▓ ░█ █ ▒▓░▒▓░░▓▓▒░░▒▓█▒░░      
-      ░██░░▒▓░░▓█░▓▒░░▒▒█▒█▓▒░▒░      
-       ▒ ▒▒▓█░█▒▓  ██████  ▒▓░░       
-       █▒ ▓▒▓▒░         █ ▓▓▓▓█       
-        █▓██▒▒▒▒      █▒░██▓██        
-          ▒▒█▒░█▒▓░▒▒▒██░██▓          
-             ░█ ░▓░▒▒█▒▓██            
-                                      

codex-rs/tui/frames/blocks/frame_8.txt

@@ -1,17 +0,0 @@
-                                      
-             ▒▒█▒▓██▒██▒              
-           █ █▓░░░█▒▒ ░  █            
-         ▒░▒█░▓▓█ █ ░▓░█▒█▒█          
-        ▒█▒█▓░██░     █ ▒▒░░▒         
-        █ ▓░▓█▒░▓▒      ▓█▒░░█        
-       ░██░▒▒▒▒▒░▒█      ▒█░░░        
-       ░█░░░ █▒▓▒░░░     ░▒░▓░█       
-       ▒█░░▓  ░█▒▓░██▓    ▓░▓░░       
-       ▒ ▒░░▒▒  ▓█▒░░▓█████▒░░░       
-          ▒█▓▒▒░ █░█░░▓░▒▒▒░░▒█       
-        ▓▓▒▒░▒░░░▓█▒█▒█ ▒█ ▓▒░        
-        ██ ░▒░░░        ▓█▓▓▓█        
-         █▒▒█▒▒▒▒    ▒▓▒▒░█▓█         
-           ▓▓█░██ ▓▓██▓▓▒█░░          
-             ░░▒██▒░▒██▓▒░            
-                  ░░                  

codex-rs/tui/frames/blocks/frame_9.txt

@@ -1,17 +0,0 @@
-                                      
-              ▓▒▒█▓██▒█               
-            ▓█▒▓░░█ ▒ ▒▓▒▒            
-           ▓ █░░▓█▒▒▒▓ ▒▒░█           
-            ░░▓▓▒▒ ▒▒█░▒▒░██          
-         ▓█ ▓▒█ ░██ █▓██▓█░░          
-         ░ ░░░ ▒░▒▓▒▒ ░█░█░░░         
-         ░ ░█▒░██░▒▒█ ▓█▓ ░░░         
-        ░  ░▓▒█▒░░░▒▓▒▒▒░  ░░         
-            █░  ▓░ ░░░░█░░█░░░        
-         ░▒░░░▒█░▒░▒░░░░▒▒░░░         
-           ░▒▓▒▒░▓ ████░░ ▓▒░         
-          ▒░░░▒█░     █▓ ▒▓░░         
-           ▒█▒░▒▒    ▓▓▒▓░▓█          
-            ▒▓ ▒▒░█▓█▒▓▓█░░           
-             █▓▒ █▒▒░▓█▓              
-                                      

codex-rs/tui/frames/codex/frame_1.txt

@@ -1,17 +0,0 @@
-                                      
-             eoeddccddcoe             
-         edoocecocedxxde ecce         
-       oxcxccccee   eccecxdxxxc       
-      dceeccooe            ocxdxo     
-     eedocexeeee            coxeeo    
-    xc ce  xcodxxo           coexxo   
-   cecoc    cexcocxe            xox   
-   xxexe     oooxdxc            cex   
-   xdxce    dxxeexcoxcccccceco dc x   
-    exdc  edce oc xcxeeeodoooxoooox   
-    eeece eeoooe   eecccc eccoodeo    
-     ceo co e              ococex     
-       eeoeece          edecxecc      
-         ecoee ccdddddodcceoxc        
-           ecccxxxeeeoedccc           
-                                      

codex-rs/tui/frames/codex/frame_10.txt

@@ -1,17 +0,0 @@
-                                      
-              eccccecce               
-             ccecccexoeco             
-            eeoxxoxxoxceoo            
-           xeeoexdeoeocceeo           
-           o dxxcxe cooeoxo           
-          xe cxcxooe   eecx           
-          e  xcccxxxxc   xoo          
-          c  xxecocxxoeeoexx          
-          c  xe eexdxxcecdxx          
-          x  oxeoxeoeceeexce          
-           o cxxxxxcc eocexe          
-           eecoeocc exccooo           
-            xc xxxxcodooxoe           
-             deccoxcde ooc            
-              co eceeodc              
-                                      

codex-rs/tui/frames/codex/frame_11.txt

@@ -1,17 +0,0 @@
-                                      
-               occcccce               
-              oc dxxxeeo              
-             oceexxdecoeo             
-             xeexxddoedoo             
-            ecodexcecdexxo            
-            xcexxceddxeoxx            
-            cc oxxxxxxexde            
-            x  xxoxxeo xcx            
-            o  cxoxxcocxex            
-            cc exodocoxexe            
-            ceo xxxxdoxeex            
-             eeooxecoccdxe            
-              e cxeeeexdc             
-              ec cxxoeoce             
-               ee cccece              
-                                      

codex-rs/tui/frames/codex/frame_12.txt

@@ -1,17 +0,0 @@
-                                      
-                ccccco                
-               odeeoxoe               
-               c  xoeco               
-               ocxxxddcx              
-              x cxxxxoox              
-              xcoocecexc              
-              x   xoexxe              
-              x   ocexxc              
-              co xoxxcxx              
-              x   oxcdce              
-              xo  xcdcco              
-               o  cx eox              
-               o ccxocex              
-               ceocoxexe              
-                e cxeoo               
-                                      

codex-rs/tui/frames/codex/frame_13.txt

@@ -1,17 +0,0 @@
-                                      
-                 occco                
-                 xeexx                
-                 xeexc                
-                 xccxe                
-                 c  xx                
-                 cdoxx                
-                 o  xx                
-                 c  cx                
-                oc  exo               
-                xc  cdx               
-                ceoo xe               
-                 xeeex                
-                 xcoxe                
-                 ceexd                
-                 o ocd                
-