version updates

Author: takumi-earth

codex-rs/Cargo.lock

@@ -101,7 +101,7 @@ mcp_test_support = { path = "mcp-server/tests/common" }
 
 # External
 allocative = "0.3.3"
-ansi-to-tui = "7.0.0"
+ansi-to-tui = "8.0.0-beta.0"
 anyhow = "1"
 arboard = { version = "3", features = ["wayland-data-control"] }
 askama = "0.14"
@@ -118,8 +118,8 @@ chrono = "0.4.42"
 clap = "4"
 clap_complete = "4"
 color-eyre = "0.6.3"
-crossterm = "0.28.1"
-ctor = "0.5.0"
+crossterm = "0.29.0"
+ctor = "0.6.1"
 derive_more = "2"
 diffy = "0.4.2"
 dirs = "6"
@@ -145,35 +145,35 @@ landlock = "0.4.1"
 lazy_static = "1"
 libc = "0.2.177"
 log = "0.4"
-lru = "0.12.5"
+lru = "0.16.2"
 maplit = "1.0.2"
 mime_guess = "2.0.5"
 multimap = "0.10.0"
 notify = "8.2.0"
 nucleo-matcher = "0.3.1"
 once_cell = "1.20.2"
 openssl-sys = "*"
-opentelemetry = "0.30.0"
-opentelemetry-appender-tracing = "0.30.0"
-opentelemetry-otlp = "0.30.0"
-opentelemetry-semantic-conventions = "0.30.0"
-opentelemetry_sdk = "0.30.0"
+opentelemetry = "0.31.0"
+opentelemetry-appender-tracing = "0.31.1"
+opentelemetry-otlp = "0.31.0"
+opentelemetry-semantic-conventions = "0.31.0"
+opentelemetry_sdk = "0.31.0"
 os_info = "3.12.0"
 owo-colors = "4.2.0"
 path-absolutize = "3.1.1"
 pathdiff = "0.2"
 portable-pty = "0.9.0"
 predicates = "3"
 pretty_assertions = "1.4.1"
-pulldown-cmark = "0.10"
-rand = "0.9"
-ratatui = "0.29.0"
-ratatui-macros = "0.6.0"
 regex = "1.12.2"
+pulldown-cmark = "0.13.0"
+rand = "0.9.2"
+ratatui = "0.30.0-beta.0"
+ratatui-macros = "0.7.0-beta.0"
 regex-lite = "0.1.7"
 reqwest = "0.12"
 rmcp = { version = "0.10.0", default-features = false }
-schemars = "0.8.22"
+schemars = "1.1.0"
 seccompiler = "0.5.0"
 sentry = "0.34.0"
 serde = "1"
@@ -202,8 +202,8 @@ tokio-test = "0.4"
 tokio-util = "0.7.16"
 toml = "0.9.5"
 toml_edit = "0.23.5"
-tonic = "0.13.1"
 tracing = "0.1.43"
+tonic = "0.14.2"
 tracing-appender = "0.2.3"
 tracing-subscriber = "0.3.20"
 tracing-test = "0.2.5"
@@ -213,14 +213,14 @@ tree-sitter-highlight = "0.25.10"
 ts-rs = "11"
 uds_windows = "1.1.0"
 unicode-segmentation = "1.12.0"
-unicode-width = "0.2"
+unicode-width = "0.2.2"
 url = "2"
 urlencoding = "2.1"
 uuid = "1"
 vt100 = "0.16.2"
 walkdir = "2.5.0"
 webbrowser = "1.0"
-which = "6"
+which = "8.0.0"
 wildmatch = "2.5.0"
 
 wiremock = "0.6"
@@ -286,8 +286,14 @@ opt-level = 0
 [patch.crates-io]
 # Uncomment to debug local changes.
 # ratatui = { path = "../../ratatui" }
-crossterm = { git = "https://github.com/nornagon/crossterm", branch = "nornagon/color-query" }
-ratatui = { git = "https://github.com/nornagon/ratatui", branch = "nornagon-v0.29.0-patch" }
+crossterm = { git = "https://github.com/takumi-earth/crossterm", rev = "b87b8e3b77283d41d7106d87357f929db2e00368" }
+ratatui = { git = "https://github.com/takumi-earth/ratatui", rev = "c250e525a67625dde14a70ccd4cb563610ba103d" }
+ratatui-core = { git = "https://github.com/takumi-earth/ratatui", rev = "c250e525a67625dde14a70ccd4cb563610ba103d" }
+ratatui-widgets = { git = "https://github.com/takumi-earth/ratatui", rev = "c250e525a67625dde14a70ccd4cb563610ba103d" }
+ratatui-crossterm = { git = "https://github.com/takumi-earth/ratatui", rev = "c250e525a67625dde14a70ccd4cb563610ba103d" }
+ratatui-termion = { git = "https://github.com/takumi-earth/ratatui", rev = "c250e525a67625dde14a70ccd4cb563610ba103d" }
+ratatui-termwiz = { git = "https://github.com/takumi-earth/ratatui", rev = "c250e525a67625dde14a70ccd4cb563610ba103d" }
+ratatui-macros = { git = "https://github.com/takumi-earth/ratatui", rev = "c250e525a67625dde14a70ccd4cb563610ba103d" }
 
 # Uncomment to debug local changes.
 # rmcp = { path = "../../rust-sdk/crates/rmcp" }

codex-rs/Cargo.toml

@@ -1,5 +1,6 @@
 use std::collections::VecDeque;
 use std::path::Path;
+use std::path::PathBuf;
 use std::process::Stdio;
 use std::sync::atomic::AtomicI64;
 use std::sync::atomic::Ordering;
@@ -10,8 +11,6 @@ use tokio::process::Child;
 use tokio::process::ChildStdin;
 use tokio::process::ChildStdout;
 
-use anyhow::Context;
-use assert_cmd::prelude::*;
 use codex_app_server_protocol::AddConversationListenerParams;
 use codex_app_server_protocol::ArchiveConversationParams;
 use codex_app_server_protocol::CancelLoginAccountParams;
@@ -49,8 +48,9 @@ use codex_app_server_protocol::ThreadResumeParams;
 use codex_app_server_protocol::ThreadStartParams;
 use codex_app_server_protocol::TurnInterruptParams;
 use codex_app_server_protocol::TurnStartParams;
-use std::process::Command as StdCommand;
 use tokio::process::Command;
+use anyhow::anyhow;
+use anyhow::Context;
 
 pub struct McpProcess {
     next_request_id: AtomicI64,
@@ -78,11 +78,25 @@ impl McpProcess {
         codex_home: &Path,
         env_overrides: &[(&str, Option<&str>)],
     ) -> anyhow::Result<Self> {
-        // Use assert_cmd to locate the binary path and then switch to tokio::process::Command
-        let std_cmd = StdCommand::cargo_bin("codex-app-server")
-            .context("should find binary for codex-mcp-server")?;
-
-        let program = std_cmd.get_program().to_owned();
+        // Use cargo-set env vars to locate the binary path and then switch to tokio::process::Command
+        let program = std::env::var("CARGO_BIN_EXE_codex-app-server")
+            .or_else(|_| std::env::var("CARGO_BIN_EXE_codex_app_server"))
+            .map(PathBuf::from)
+            .or_else(|_| {
+                let workspace_dir = Path::new(env!("CARGO_MANIFEST_DIR"))
+                    .ancestors()
+                    .nth(3)
+                    .unwrap_or_else(|| Path::new(env!("CARGO_MANIFEST_DIR")));
+                let candidate = workspace_dir.join("target/debug").join(format!(
+                    "codex-app-server{}",
+                    std::env::consts::EXE_SUFFIX
+                ));
+                candidate
+                    .exists()
+                    .then_some(candidate)
+                    .ok_or_else(|| anyhow!("codex-app-server binary not found in target/debug"))
+            })
+            .context("should find binary for codex-app-server")?;
 
         let mut cmd = Command::new(program);
 

codex-rs/app-server/tests/common/mcp_process.rs

@@ -1,6 +1,5 @@
-use assert_cmd::prelude::*;
+use assert_cmd::cargo;
 use std::fs;
-use std::process::Command;
 use tempfile::tempdir;
 
 #[test]
@@ -16,8 +15,8 @@ fn test_apply_patch_cli_add_and_update() -> anyhow::Result<()> {
 +hello
 *** End Patch"#
     );
-    Command::cargo_bin("apply_patch")
-        .expect("should find apply_patch binary")
+    let mut cmd = cargo::cargo_bin_cmd!("apply_patch");
+    cmd
         .arg(add_patch)
         .current_dir(tmp.path())
         .assert()
@@ -34,8 +33,8 @@ fn test_apply_patch_cli_add_and_update() -> anyhow::Result<()> {
 +world
 *** End Patch"#
     );
-    Command::cargo_bin("apply_patch")
-        .expect("should find apply_patch binary")
+    let mut cmd = cargo::cargo_bin_cmd!("apply_patch");
+    cmd
         .arg(update_patch)
         .current_dir(tmp.path())
         .assert()
@@ -59,8 +58,7 @@ fn test_apply_patch_cli_stdin_add_and_update() -> anyhow::Result<()> {
 +hello
 *** End Patch"#
     );
-    let mut cmd =
-        assert_cmd::Command::cargo_bin("apply_patch").expect("should find apply_patch binary");
+    let mut cmd = cargo::cargo_bin_cmd!("apply_patch");
     cmd.current_dir(tmp.path());
     cmd.write_stdin(add_patch)
         .assert()
@@ -77,8 +75,7 @@ fn test_apply_patch_cli_stdin_add_and_update() -> anyhow::Result<()> {
 +world
 *** End Patch"#
     );
-    let mut cmd =
-        assert_cmd::Command::cargo_bin("apply_patch").expect("should find apply_patch binary");
+    let mut cmd = cargo::cargo_bin_cmd!("apply_patch");
     cmd.current_dir(tmp.path());
     cmd.write_stdin(update_patch)
         .assert()

codex-rs/apply-patch/tests/suite/cli.rs

@@ -1,17 +1,18 @@
+use assert_cmd::cargo;
 use assert_cmd::Command;
 use pretty_assertions::assert_eq;
 use std::fs;
 use std::path::Path;
 use tempfile::tempdir;
 
 fn run_apply_patch_in_dir(dir: &Path, patch: &str) -> anyhow::Result<assert_cmd::assert::Assert> {
-    let mut cmd = Command::cargo_bin("apply_patch")?;
+    let mut cmd = cargo::cargo_bin_cmd!("apply_patch");
     cmd.current_dir(dir);
     Ok(cmd.arg(patch).assert())
 }
 
 fn apply_patch_command(dir: &Path) -> anyhow::Result<Command> {
-    let mut cmd = Command::cargo_bin("apply_patch")?;
+    let mut cmd = cargo::cargo_bin_cmd!("apply_patch");
     cmd.current_dir(dir);
     Ok(cmd)
 }

codex-rs/apply-patch/tests/suite/tool.rs

@@ -19,7 +19,8 @@ prefix_rule(
 "#,
     )?;
 
-    let output = Command::cargo_bin("codex")?
+    let bin = std::env::var("CARGO_BIN_EXE_codex")?;
+    let output = Command::new(bin)
         .env("CODEX_HOME", codex_home.path())
         .args([
             "execpolicy",

codex-rs/cli/tests/execpolicy.rs

@@ -8,7 +8,8 @@ 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")?;
+    let bin = std::env::var("CARGO_BIN_EXE_codex")?;
+    let mut cmd = assert_cmd::Command::new(bin);
     cmd.env("CODEX_HOME", codex_home);
     Ok(cmd)
 }

codex-rs/cli/tests/mcp_add_remove.rs

@@ -12,7 +12,8 @@ use serde_json::json;
 use tempfile::TempDir;
 
 fn codex_command(codex_home: &Path) -> Result<assert_cmd::Command> {
-    let mut cmd = assert_cmd::Command::cargo_bin("codex")?;
+    let bin = std::env::var("CARGO_BIN_EXE_codex")?;
+    let mut cmd = assert_cmd::Command::new(bin);
     cmd.env("CODEX_HOME", codex_home);
     Ok(cmd)
 }

codex-rs/cli/tests/mcp_list.rs

@@ -43,8 +43,10 @@ impl RateLimitStatusPayload {
 }
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
+#[derive(Default)]
 pub enum PlanType {
     #[serde(rename = "guest")]
+    #[default]
     Guest,
     #[serde(rename = "free")]
     Free,
@@ -72,8 +74,3 @@ pub enum PlanType {
     Edu,
 }
 
-impl Default for PlanType {
-    fn default() -> PlanType {
-        Self::Guest
-    }
-}

codex-rs/codex-backend-openapi-models/src/models/rate_limit_status_payload.rs

@@ -97,7 +97,7 @@ seccompiler = { workspace = true }
 keyring = { workspace = true, features = ["linux-native-async-persistent"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-foundation = "0.9"
+core-foundation = "0.10.1"
 keyring = { workspace = true, features = ["apple-native"] }
 
 # Build OpenSSL from source for musl builds.