chore: unify cargo versions (#4044)

Unify cargo versions at root

codex-rs/Cargo.lock

@@ -687,7 +687,7 @@ dependencies = [
  "portable-pty",
  "predicates",
  "pretty_assertions",
- "rand 0.9.2",
+ "rand",
  "regex-lite",
  "reqwest",
  "seccompiler",
@@ -798,7 +798,7 @@ dependencies = [
  "codex-core",
  "codex-protocol",
  "core_test_support",
- "rand 0.8.5",
+ "rand",
  "reqwest",
  "serde",
  "serde_json",
@@ -936,7 +936,7 @@ dependencies = [
  "pathdiff",
  "pretty_assertions",
  "pulldown-cmark",
- "rand 0.9.2",
+ "rand",
  "ratatui",
  "regex-lite",
  "serde",
@@ -3454,35 +3454,14 @@ dependencies = [
  "nibble_vec",
 ]
 
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
 [[package]]
 name = "rand"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
- "rand_chacha 0.9.0",
+ "rand_chacha",
- "rand_core 0.9.3",
+ "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -3492,16 +3471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.3",
+ "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.16",
 ]
 
 [[package]]

codex-rs/Cargo.toml

@@ -29,6 +29,124 @@ version = "0.0.0"
 # edition.
 edition = "2024"
 
+[workspace.dependencies]
+# Internal
+codex-ansi-escape = { path = "ansi-escape" }
+codex-apply-patch = { path = "apply-patch" }
+codex-arg0 = { path = "arg0" }
+codex-chatgpt = { path = "chatgpt" }
+codex-common = { path = "common" }
+codex-core = { path = "core" }
+codex-exec = { path = "exec" }
+codex-file-search = { path = "file-search" }
+codex-linux-sandbox = { path = "linux-sandbox" }
+codex-login = { path = "login" }
+codex-mcp-client = { path = "mcp-client" }
+codex-mcp-server = { path = "mcp-server" }
+codex-ollama = { path = "ollama" }
+codex-protocol = { path = "protocol" }
+codex-protocol-ts = { path = "protocol-ts" }
+codex-tui = { path = "tui" }
+core_test_support = { path = "core/tests/common" }
+mcp-types = { path = "mcp-types" }
+mcp_test_support = { path = "mcp-server/tests/common" }
+
+# External
+allocative = "0.3.3"
+ansi-to-tui = "7.0.0"
+anyhow = "1"
+arboard = "3"
+askama = "0.12"
+assert_cmd = "2"
+async-channel = "2.3.1"
+async-stream = "0.3.6"
+base64 = "0.22.1"
+bytes = "1.10.1"
+chrono = "0.4.40"
+clap = "4"
+clap_complete = "4"
+color-eyre = "0.6.3"
+crossterm = "0.28.1"
+derive_more = "2"
+diffy = "0.4.2"
+dirs = "6"
+dotenvy = "0.15.7"
+env-flags = "0.1.1"
+env_logger = "0.11.5"
+eventsource-stream = "0.2.3"
+futures = "0.3"
+icu_decimal = "2.0.0"
+icu_locale_core = "2.0.0"
+ignore = "0.4.23"
+image = { version = "^0.25.8", default-features = false }
+insta = "1.43.2"
+itertools = "0.14.0"
+landlock = "0.4.1"
+lazy_static = "1"
+libc = "0.2.175"
+log = "0.4"
+maplit = "1.0.2"
+mime_guess = "2.0.5"
+multimap = "0.10.0"
+nucleo-matcher = "0.3.1"
+once_cell = "1"
+openssl-sys = "*"
+os_info = "3.12.0"
+owo-colors = "4.2.0"
+path-absolutize = "3.1.1"
+path-clean = "1.0.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"
+regex-lite = "0.1.7"
+reqwest = "0.12"
+schemars = "0.8.22"
+seccompiler = "0.5.0"
+serde = "1"
+serde_json = "1"
+serde_with = "3.14"
+sha1 = "0.10.6"
+sha2 = "0.10"
+shlex = "1.3.0"
+similar = "2.7.0"
+starlark = "0.13.0"
+strum = "0.27.2"
+strum_macros = "0.27.2"
+supports-color = "3.0.2"
+sys-locale = "0.3.2"
+tempfile = "3.13.0"
+textwrap = "0.16.2"
+thiserror = "2.0.16"
+time = "0.3"
+tiny_http = "0.12"
+tokio = "1"
+tokio-stream = "0.1.17"
+tokio-test = "0.4"
+tokio-util = "0.7.16"
+toml = "0.9.5"
+toml_edit = "0.23.4"
+tracing = "0.1.41"
+tracing-appender = "0.2.3"
+tracing-subscriber = "0.3.20"
+tree-sitter = "0.25.9"
+tree-sitter-bash = "0.25.0"
+ts-rs = "11"
+unicode-segmentation = "1.12.0"
+unicode-width = "0.1"
+url = "2"
+urlencoding = "2.1"
+uuid = "1"
+vt100 = "0.16.2"
+walkdir = "2.5.0"
+webbrowser = "1.0"
+which = "6"
+wildmatch = "2.5.0"
+wiremock = "0.6"
+
 [workspace.lints]
 rust = {}
 
@@ -38,6 +156,11 @@ redundant_clone = "deny"
 uninlined_format_args = "deny"
 unwrap_used = "deny"
 
+# cargo-shear cannot see the platform-specific openssl-sys usage, so we
+# silence the false positive here instead of deleting a real dependency.
+[workspace.metadata.cargo-shear]
+ignored = ["openssl-sys"]
+
 [profile.release]
 lto = "fat"
 # Because we bundle some of these executables with the TypeScript CLI, we

codex-rs/ansi-escape/Cargo.toml

@@ -8,9 +8,9 @@ name = "codex_ansi_escape"
 path = "src/lib.rs"
 
 [dependencies]
-ansi-to-tui = "7.0.0"
+ansi-to-tui = { workspace = true }
-ratatui = { version = "0.29.0", features = [
+ratatui = { workspace = true, features = [
     "unstable-rendered-line-info",
     "unstable-widget-ref",
 ] }
-tracing = { version = "0.1.41", features = ["log"] }
+tracing = { workspace = true, features = ["log"] }

codex-rs/apply-patch/Cargo.toml

@@ -15,14 +15,14 @@ path = "src/main.rs"
 workspace = true
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-similar = "2.7.0"
+similar = { workspace = true }
-thiserror = "2.0.16"
+thiserror = { workspace = true }
-tree-sitter = "0.25.9"
+tree-sitter = { workspace = true }
-tree-sitter-bash = "0.25.0"
+tree-sitter-bash = { workspace = true }
-once_cell = "1"
+once_cell = { workspace = true }
 
 [dev-dependencies]
-assert_cmd = "2"
+assert_cmd = { workspace = true }
-pretty_assertions = "1.4.1"
+pretty_assertions = { workspace = true }
-tempfile = "3.13.0"
+tempfile = { workspace = true }

codex-rs/arg0/Cargo.toml

@@ -11,10 +11,10 @@ path = "src/lib.rs"
 workspace = true
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-codex-apply-patch = { path = "../apply-patch" }
+codex-apply-patch = { workspace = true }
-codex-core = { path = "../core" }
+codex-core = { workspace = true }
-codex-linux-sandbox = { path = "../linux-sandbox" }
+codex-linux-sandbox = { workspace = true }
-dotenvy = "0.15.7"
+dotenvy = { workspace = true }
-tempfile = "3"
+tempfile = { workspace = true }
-tokio = { version = "1", features = ["rt-multi-thread"] }
+tokio = { workspace = true, features = ["rt-multi-thread"] }

codex-rs/chatgpt/Cargo.toml

@@ -7,13 +7,13 @@ version = { workspace = true }
 workspace = true
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-clap = { version = "4", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
-codex-common = { path = "../common", features = ["cli"] }
+codex-common = { workspace = true, features = ["cli"] }
-codex-core = { path = "../core" }
+codex-core = { workspace = true }
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
-serde_json = "1"
+serde_json = { workspace = true }
-tokio = { version = "1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 
 [dev-dependencies]
-tempfile = "3"
+tempfile = { workspace = true }

codex-rs/cli/Cargo.toml

@@ -15,32 +15,32 @@ path = "src/lib.rs"
 workspace = true
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-clap = { version = "4", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
-clap_complete = "4"
+clap_complete = { workspace = true }
-codex-arg0 = { path = "../arg0" }
+codex-arg0 = { workspace = true }
-codex-chatgpt = { path = "../chatgpt" }
+codex-chatgpt = { workspace = true }
-codex-common = { path = "../common", features = ["cli"] }
+codex-common = { workspace = true, features = ["cli"] }
-codex-core = { path = "../core" }
+codex-core = { workspace = true }
-codex-exec = { path = "../exec" }
+codex-exec = { workspace = true }
-codex-login = { path = "../login" }
+codex-login = { workspace = true }
-codex-mcp-server = { path = "../mcp-server" }
+codex-mcp-server = { workspace = true }
-codex-protocol = { path = "../protocol" }
+codex-protocol = { workspace = true }
-codex-tui = { path = "../tui" }
+codex-tui = { workspace = true }
-serde_json = "1"
+serde_json = { workspace = true }
-tokio = { version = "1", features = [
+tokio = { workspace = true, features = [
     "io-std",
     "macros",
     "process",
     "rt-multi-thread",
     "signal",
 ] }
-tracing = "0.1.41"
+tracing = { workspace = true }
-tracing-subscriber = "0.3.20"
+tracing-subscriber = { workspace = true }
-codex-protocol-ts = { path = "../protocol-ts" }
+codex-protocol-ts = { workspace = true }
 
 [dev-dependencies]
-assert_cmd = "2"
+assert_cmd = { workspace = true }
-predicates = "3"
+predicates = { workspace = true }
-pretty_assertions = "1"
+pretty_assertions = { workspace = true }
-tempfile = "3"
+tempfile = { workspace = true }

codex-rs/common/Cargo.toml

@@ -7,11 +7,11 @@ version = { workspace = true }
 workspace = true
 
 [dependencies]
-clap = { version = "4", features = ["derive", "wrap_help"], optional = true }
+clap = { workspace = true, features = ["derive", "wrap_help"], optional = true }
-codex-core = { path = "../core" }
+codex-core = { workspace = true }
-codex-protocol = { path = "../protocol" }
+codex-protocol = { workspace = true }
-serde = { version = "1", optional = true }
+serde = { workspace = true, optional = true }
-toml = { version = "0.9", optional = true }
+toml = { workspace = true, optional = true }
 
 [features]
 # Separate feature so that `clap` is not a mandatory dependency.

codex-rs/core/Cargo.toml

@@ -12,81 +12,81 @@ path = "src/lib.rs"
 workspace = true
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-askama = "0.12"
+askama = { workspace = true }
-async-channel = "2.3.1"
+async-channel = { workspace = true }
-base64 = "0.22"
+base64 = { workspace = true }
-bytes = "1.10.1"
+bytes = { workspace = true }
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { workspace = true, features = ["serde"] }
-codex-apply-patch = { path = "../apply-patch" }
+codex-apply-patch = { workspace = true }
-codex-file-search = { path = "../file-search" }
+codex-file-search = { workspace = true }
-codex-mcp-client = { path = "../mcp-client" }
+codex-mcp-client = { workspace = true }
-codex-protocol = { path = "../protocol" }
+codex-protocol = { workspace = true }
-dirs = "6"
+dirs = { workspace = true }
-env-flags = "0.1.1"
+env-flags = { workspace = true }
-eventsource-stream = "0.2.3"
+eventsource-stream = { workspace = true }
-futures = "0.3"
+futures = { workspace = true }
-libc = "0.2.175"
+libc = { workspace = true }
-mcp-types = { path = "../mcp-types" }
+mcp-types = { workspace = true }
-os_info = "3.12.0"
+os_info = { workspace = true }
-portable-pty = "0.9.0"
+portable-pty = { workspace = true }
-rand = "0.9"
+rand = { workspace = true }
-regex-lite = "0.1.7"
+regex-lite = { workspace = true }
-reqwest = { version = "0.12", features = ["json", "stream"] }
+reqwest = { workspace = true, features = ["json", "stream"] }
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
-serde_json = "1"
+serde_json = { workspace = true }
-sha1 = "0.10.6"
+sha1 = { workspace = true }
-shlex = "1.3.0"
+shlex = { workspace = true }
-similar = "2.7.0"
+similar = { workspace = true }
-strum_macros = "0.27.2"
+strum_macros = { workspace = true }
-tempfile = "3"
+tempfile = { workspace = true }
-thiserror = "2.0.16"
+thiserror = { workspace = true }
-time = { version = "0.3", features = [
+time = { workspace = true, features = [
     "formatting",
     "parsing",
     "local-offset",
     "macros",
 ] }
-tokio = { version = "1", features = [
+tokio = { workspace = true, features = [
     "io-std",
     "macros",
     "process",
     "rt-multi-thread",
     "signal",
 ] }
-tokio-util = "0.7.16"
+tokio-util = { workspace = true }
-toml = "0.9.5"
+toml = { workspace = true }
-toml_edit = "0.23.4"
+toml_edit = { workspace = true }
-tracing = { version = "0.1.41", features = ["log"] }
+tracing = { workspace = true, features = ["log"] }
-tree-sitter = "0.25.9"
+tree-sitter = { workspace = true }
-tree-sitter-bash = "0.25.0"
+tree-sitter-bash = { workspace = true }
-uuid = { version = "1", features = ["serde", "v4"] }
+uuid = { workspace = true, features = ["serde", "v4"] }
-which = "6"
+which = { workspace = true }
-wildmatch = "2.5.0"
+wildmatch = { workspace = true }
 
 
 [target.'cfg(target_os = "linux")'.dependencies]
-landlock = "0.4.1"
+landlock = { workspace = true }
-seccompiler = "0.5.0"
+seccompiler = { workspace = true }
 
 # Build OpenSSL from source for musl builds.
 [target.x86_64-unknown-linux-musl.dependencies]
-openssl-sys = { version = "*", features = ["vendored"] }
+openssl-sys = { workspace = true, features = ["vendored"] }
 
 # Build OpenSSL from source for musl builds.
 [target.aarch64-unknown-linux-musl.dependencies]
-openssl-sys = { version = "*", features = ["vendored"] }
+openssl-sys = { workspace = true, features = ["vendored"] }
 
 [dev-dependencies]
-assert_cmd = "2"
+assert_cmd = { workspace = true }
-core_test_support = { path = "tests/common" }
+core_test_support = { workspace = true }
-maplit = "1.0.2"
+maplit = { workspace = true }
-predicates = "3"
+predicates = { workspace = true }
-pretty_assertions = "1.4.1"
+pretty_assertions = { workspace = true }
-tempfile = "3"
+tempfile = { workspace = true }
-tokio-test = "0.4"
+tokio-test = { workspace = true }
-walkdir = "2.5.0"
+walkdir = { workspace = true }
-wiremock = "0.6"
+wiremock = { workspace = true }
 
 [package.metadata.cargo-shear]
 ignored = ["openssl-sys"]

codex-rs/core/tests/common/Cargo.toml

@@ -7,8 +7,8 @@ edition = "2024"
 path = "lib.rs"
 
 [dependencies]
-codex-core = { path = "../.." }
+codex-core = { workspace = true }
-serde_json = "1"
+serde_json = { workspace = true }
-tempfile = "3"
+tempfile = { workspace = true }
-tokio = { version = "1", features = ["time"] }
+tokio = { workspace = true, features = ["time"] }
-wiremock = "0.6"
+wiremock = { workspace = true }

codex-rs/exec/Cargo.toml

@@ -15,37 +15,37 @@ path = "src/lib.rs"
 workspace = true
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-chrono = "0.4.40"
+chrono = { workspace = true }
-clap = { version = "4", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
-codex-arg0 = { path = "../arg0" }
+codex-arg0 = { workspace = true }
-codex-common = { path = "../common", features = [
+codex-common = { workspace = true, features = [
     "cli",
     "elapsed",
     "sandbox_summary",
 ] }
-codex-core = { path = "../core" }
+codex-core = { workspace = true }
-codex-ollama = { path = "../ollama" }
+codex-ollama = { workspace = true }
-codex-protocol = { path = "../protocol" }
+codex-protocol = { workspace = true }
-owo-colors = "4.2.0"
+owo-colors = { workspace = true }
-serde_json = "1"
+serde_json = { workspace = true }
-shlex = "1.3.0"
+shlex = { workspace = true }
-tokio = { version = "1", features = [
+tokio = { workspace = true, features = [
     "io-std",
     "macros",
     "process",
     "rt-multi-thread",
     "signal",
 ] }
-tracing = { version = "0.1.41", features = ["log"] }
+tracing = { workspace = true, features = ["log"] }
-tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
 [dev-dependencies]
-assert_cmd = "2"
+assert_cmd = { workspace = true }
-core_test_support = { path = "../core/tests/common" }
+core_test_support = { workspace = true }
-libc = "0.2"
+libc = { workspace = true }
-predicates = "3"
+predicates = { workspace = true }
-tempfile = "3.13.0"
+tempfile = { workspace = true }
-uuid = "1"
+uuid = { workspace = true }
-walkdir = "2"
+walkdir = { workspace = true }
-wiremock = "0.6"
+wiremock = { workspace = true }

codex-rs/execpolicy/Cargo.toml

@@ -15,19 +15,19 @@ path = "src/lib.rs"
 workspace = true
 
 [dependencies]
-allocative = "0.3.3"
+allocative = { workspace = true }
-anyhow = "1"
+anyhow = { workspace = true }
-clap = { version = "4", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
-derive_more = { version = "2", features = ["display"] }
+derive_more = { workspace = true, features = ["display"] }
-env_logger = "0.11.5"
+env_logger = { workspace = true }
-log = "0.4"
+log = { workspace = true }
-multimap = "0.10.0"
+multimap = { workspace = true }
-path-absolutize = "3.1.1"
+path-absolutize = { workspace = true }
-regex-lite = "0.1"
+regex-lite = { workspace = true }
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
-serde_json = "1"
+serde_json = { workspace = true }
-serde_with = { version = "3", features = ["macros"] }
+serde_with = { workspace = true, features = ["macros"] }
-starlark = "0.13.0"
+starlark = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3.13.0"
+tempfile = { workspace = true }

codex-rs/file-search/Cargo.toml

@@ -12,10 +12,10 @@ name = "codex_file_search"
 path = "src/lib.rs"
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-clap = { version = "4", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
-ignore = "0.4.23"
+ignore = { workspace = true }
-nucleo-matcher = "0.3.1"
+nucleo-matcher = { workspace = true }
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
-serde_json = "1"
+serde_json = { workspace = true }
-tokio = { version = "1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }

codex-rs/linux-sandbox/Cargo.toml

@@ -15,15 +15,15 @@ path = "src/lib.rs"
 workspace = true
 
 [target.'cfg(target_os = "linux")'.dependencies]
-clap = { version = "4", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
-codex-core = { path = "../core" }
+codex-core = { workspace = true }
-landlock = "0.4.1"
+landlock = { workspace = true }
-libc = "0.2.175"
+libc = { workspace = true }
-seccompiler = "0.5.0"
+seccompiler = { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dev-dependencies]
-tempfile = "3"
+tempfile = { workspace = true }
-tokio = { version = "1", features = [
+tokio = { workspace = true, features = [
     "io-std",
     "macros",
     "process",

codex-rs/login/Cargo.toml

@@ -7,28 +7,28 @@ version = { workspace = true }
 workspace = true
 
 [dependencies]
-base64 = "0.22"
+base64 = { workspace = true }
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { workspace = true, features = ["serde"] }
-codex-core = { path = "../core" }
+codex-core = { workspace = true }
-codex-protocol = { path = "../protocol" }
+codex-protocol = { workspace = true }
-rand = "0.8"
+rand = { workspace = true }
-reqwest = { version = "0.12", features = ["json", "blocking"] }
+reqwest = { workspace = true, features = ["json", "blocking"] }
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
-serde_json = "1"
+serde_json = { workspace = true }
-sha2 = "0.10"
+sha2 = { workspace = true }
-tempfile = "3"
+tempfile = { workspace = true }
-tiny_http = "0.12"
+tiny_http = { workspace = true }
-tokio = { version = "1", features = [
+tokio = { workspace = true, features = [
     "io-std",
     "macros",
     "process",
     "rt-multi-thread",
     "signal",
 ] }
-url = "2"
+url = { workspace = true }
-urlencoding = "2.1"
+urlencoding = { workspace = true }
-webbrowser = "1.0"
+webbrowser = { workspace = true }
 
 [dev-dependencies]
-tempfile = "3"
+core_test_support = { workspace = true }
-core_test_support = { path = "../core/tests/common" }
+tempfile = { workspace = true }

codex-rs/login/src/pkce.rs

@@ -11,7 +11,7 @@ pub struct PkceCodes {
 
 pub fn generate_pkce() -> PkceCodes {
     let mut bytes = [0u8; 64];
-    rand::thread_rng().fill_bytes(&mut bytes);
+    rand::rng().fill_bytes(&mut bytes);
 
     // Verifier: URL-safe base64 without padding (43..128 chars)
     let code_verifier = base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(bytes);

codex-rs/login/src/server.rs

@@ -326,7 +326,7 @@ fn build_authorize_url(
 
 fn generate_state() -> String {
     let mut bytes = [0u8; 32];
-    rand::thread_rng().fill_bytes(&mut bytes);
+    rand::rng().fill_bytes(&mut bytes);
     base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(bytes)
 }
 

codex-rs/mcp-client/Cargo.toml

@@ -7,13 +7,13 @@ edition = "2024"
 workspace = true
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-mcp-types = { path = "../mcp-types" }
+mcp-types = { workspace = true }
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
-serde_json = "1"
+serde_json = { workspace = true }
-tracing = { version = "0.1.41", features = ["log"] }
+tracing = { workspace = true, features = ["log"] }
-tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] }
+tracing-subscriber = { workspace = true, features = ["fmt", "env-filter"] }
-tokio = { version = "1", features = [
+tokio = { workspace = true, features = [
     "io-util",
     "macros",
     "process",

codex-rs/mcp-server/Cargo.toml

@@ -15,35 +15,35 @@ path = "src/lib.rs"
 workspace = true
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-codex-arg0 = { path = "../arg0" }
+codex-arg0 = { workspace = true }
-codex-common = { path = "../common", features = ["cli"] }
+codex-common = { workspace = true, features = ["cli"] }
-codex-core = { path = "../core" }
+codex-core = { workspace = true }
-codex-login = { path = "../login" }
+codex-login = { workspace = true }
-codex-protocol = { path = "../protocol" }
+codex-protocol = { workspace = true }
-mcp-types = { path = "../mcp-types" }
+mcp-types = { workspace = true }
-schemars = "0.8.22"
+schemars = { workspace = true }
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
-serde_json = "1"
+serde_json = { workspace = true }
-shlex = "1.3.0"
+shlex = { workspace = true }
-tokio = { version = "1", features = [
+tokio = { workspace = true, features = [
     "io-std",
     "macros",
     "process",
     "rt-multi-thread",
     "signal",
 ] }
-toml = "0.9"
+toml = { workspace = true }
-tracing = { version = "0.1.41", features = ["log"] }
+tracing = { workspace = true, features = ["log"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
+tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
-uuid = { version = "1", features = ["serde", "v7"] }
+uuid = { workspace = true, features = ["serde", "v7"] }
 
 [dev-dependencies]
-assert_cmd = "2"
+assert_cmd = { workspace = true }
-base64 = "0.22"
+base64 = { workspace = true }
-mcp_test_support = { path = "tests/common" }
+core_test_support = { workspace = true }
-os_info = "3.12.0"
+mcp_test_support = { workspace = true }
-pretty_assertions = "1.4.1"
+os_info = { workspace = true }
-tempfile = "3"
+pretty_assertions = { workspace = true }
-wiremock = "0.6"
+tempfile = { workspace = true }
-core_test_support = { path = "../core/tests/common" }
+wiremock = { workspace = true }

codex-rs/mcp-server/tests/common/Cargo.toml

@@ -7,20 +7,20 @@ version = { workspace = true }
 path = "lib.rs"
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-assert_cmd = "2"
+assert_cmd = { workspace = true }
-codex-core = { path = "../../../core" }
+codex-core = { workspace = true }
-codex-mcp-server = { path = "../.." }
+codex-mcp-server = { workspace = true }
-codex-protocol = { path = "../../../protocol" }
+codex-protocol = { workspace = true }
-mcp-types = { path = "../../../mcp-types" }
+mcp-types = { workspace = true }
-os_info = "3.12.0"
+os_info = { workspace = true }
-pretty_assertions = "1.4.1"
+pretty_assertions = { workspace = true }
-serde = { version = "1" }
+serde = { workspace = true }
-serde_json = "1"
+serde_json = { workspace = true }
-tokio = { version = "1", features = [
+tokio = { workspace = true, features = [
     "io-std",
     "macros",
     "process",
     "rt-multi-thread",
 ] }
-wiremock = "0.6"
+wiremock = { workspace = true }

codex-rs/mcp-types/Cargo.toml

@@ -7,6 +7,6 @@ version = { workspace = true }
 workspace = true
 
 [dependencies]
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
-serde_json = "1"
+serde_json = { workspace = true }
-ts-rs = { version = "11", features = ["serde-json-impl", "no-serde-warnings"] }
+ts-rs = { workspace = true, features = ["serde-json-impl", "no-serde-warnings"] }

codex-rs/ollama/Cargo.toml

@@ -11,20 +11,20 @@ path = "src/lib.rs"
 workspace = true
 
 [dependencies]
-async-stream = "0.3"
+async-stream = { workspace = true }
-bytes = "1.10.1"
+bytes = { workspace = true }
-codex-core = { path = "../core" }
+codex-core = { workspace = true }
-futures = "0.3"
+futures = { workspace = true }
-reqwest = { version = "0.12", features = ["json", "stream"] }
+reqwest = { workspace = true, features = ["json", "stream"] }
-serde_json = "1"
+serde_json = { workspace = true }
-tokio = { version = "1", features = [
+tokio = { workspace = true, features = [
     "io-std",
     "macros",
     "process",
     "rt-multi-thread",
     "signal",
 ] }
-tracing = { version = "0.1.41", features = ["log"] }
+tracing = { workspace = true, features = ["log"] }
-wiremock = "0.6"
+wiremock = { workspace = true }
 
 [dev-dependencies]

codex-rs/protocol-ts/Cargo.toml

@@ -15,8 +15,8 @@ name = "codex-protocol-ts"
 path = "src/main.rs"
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-mcp-types = { path = "../mcp-types" }
+mcp-types = { workspace = true }
-codex-protocol = { path = "../protocol" }
+codex-protocol = { workspace = true }
-ts-rs = "11"
+ts-rs = { workspace = true }
-clap = { version = "4", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }

codex-rs/protocol/Cargo.toml

@@ -11,28 +11,28 @@ path = "src/lib.rs"
 workspace = true
 
 [dependencies]
-base64 = "0.22.1"
+base64 = { workspace = true }
-icu_decimal = "2.0.0"
+icu_decimal = { workspace = true }
-icu_locale_core = "2.0.0"
+icu_locale_core = { workspace = true }
-mcp-types = { path = "../mcp-types" }
+mcp-types = { workspace = true }
-mime_guess = "2.0.5"
+mime_guess = { workspace = true }
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
-serde_json = "1"
+serde_json = { workspace = true }
-serde_with = { version = "3.14.0", features = ["macros", "base64"] }
+serde_with = { workspace = true, features = ["macros", "base64"] }
-strum = "0.27.2"
+strum = { workspace = true }
-strum_macros = "0.27.2"
+strum_macros = { workspace = true }
-sys-locale = "0.3.2"
+sys-locale = { workspace = true }
-tracing = "0.1.41"
+tracing = { workspace = true }
-ts-rs = { version = "11", features = [
+ts-rs = { workspace = true, features = [
     "uuid-impl",
     "serde-json-impl",
     "no-serde-warnings",
 ] }
-uuid = { version = "1", features = ["serde", "v7"] }
+uuid = { workspace = true, features = ["serde", "v7"] }
 
 [dev-dependencies]
-pretty_assertions = "1.4.1"
+pretty_assertions = { workspace = true }
-tempfile = "3"
+tempfile = { workspace = true }
 
 [package.metadata.cargo-shear]
 # Required because the not imported as strum_macros in non-nightly builds.

codex-rs/tui/Cargo.toml

@@ -21,84 +21,84 @@ debug-logs = []
 workspace = true
 
 [dependencies]
-anyhow = "1"
+anyhow = { workspace = true }
-async-stream = "0.3.6"
+async-stream = { workspace = true }
-base64 = "0.22.1"
+base64 = { workspace = true }
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { workspace = true, features = ["serde"] }
-clap = { version = "4", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
-codex-ansi-escape = { path = "../ansi-escape" }
+codex-ansi-escape = { workspace = true }
-codex-arg0 = { path = "../arg0" }
+codex-arg0 = { workspace = true }
-codex-common = { path = "../common", features = [
+codex-common = { workspace = true, features = [
     "cli",
     "elapsed",
     "sandbox_summary",
 ] }
-codex-core = { path = "../core" }
+codex-core = { workspace = true }
-codex-file-search = { path = "../file-search" }
+codex-file-search = { workspace = true }
-codex-login = { path = "../login" }
+codex-login = { workspace = true }
-codex-ollama = { path = "../ollama" }
+codex-ollama = { workspace = true }
-codex-protocol = { path = "../protocol" }
+codex-protocol = { workspace = true }
-color-eyre = "0.6.3"
+color-eyre = { workspace = true }
-crossterm = { version = "0.28.1", features = [
+crossterm = { workspace = true, features = [
     "bracketed-paste",
     "event-stream",
 ] }
-dirs = "6"
+dirs = { workspace = true }
-diffy = "0.4.2"
+diffy = { workspace = true }
-image = { version = "^0.25.8", default-features = false, features = [
+image = { workspace = true, features = [
     "jpeg",
     "png",
 ] }
-itertools = "0.14.0"
+itertools = { workspace = true }
-lazy_static = "1"
+lazy_static = { workspace = true }
-mcp-types = { path = "../mcp-types" }
+mcp-types = { workspace = true }
-once_cell = "1"
+once_cell = { workspace = true }
-path-clean = "1.0.1"
+path-clean = { workspace = true }
-rand = "0.9"
+rand = { workspace = true }
-ratatui = { version = "0.29.0", features = [
+ratatui = { workspace = true, features = [
     "scrolling-regions",
     "unstable-rendered-line-info",
     "unstable-widget-ref",
 ] }
-regex-lite = "0.1"
+regex-lite = { workspace = true }
-serde = { version = "1", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
-serde_json = { version = "1", features = ["preserve_order"] }
+serde_json = { workspace = true, features = ["preserve_order"] }
-shlex = "1.3.0"
+shlex = { workspace = true }
-strum = "0.27.2"
+strum = { workspace = true }
-strum_macros = "0.27.2"
+strum_macros = { workspace = true }
-supports-color = "3.0.2"
+supports-color = { workspace = true }
-tempfile = "3"
+tempfile = { workspace = true }
-textwrap = "0.16.2"
+textwrap = { workspace = true }
-tokio = { version = "1", features = [
+tokio = { workspace = true, features = [
     "io-std",
     "macros",
     "process",
     "rt-multi-thread",
     "signal",
 ] }
-tokio-stream = "0.1.17"
+tokio-stream = { workspace = true }
-tracing = { version = "0.1.41", features = ["log"] }
+tracing = { workspace = true, features = ["log"] }
-tracing-appender = "0.2.3"
+tracing-appender = { workspace = true }
-tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
-pulldown-cmark = "0.10"
+pulldown-cmark = { workspace = true }
-unicode-segmentation = "1.12.0"
+unicode-segmentation = { workspace = true }
-unicode-width = "0.1"
+unicode-width = { workspace = true }
-url = "2"
+url = { workspace = true }
-pathdiff = "0.2"
+pathdiff = { workspace = true }
-owo-colors = "4.2.0"
+owo-colors = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
-libc = "0.2"
+libc = { workspace = true }
 
 # Clipboard support via `arboard` is not available on Android/Termux.
 # Only include it for non-Android targets so the crate builds on Android.
 [target.'cfg(not(target_os = "android"))'.dependencies]
-arboard = "3"
+arboard = { workspace = true }
 
 
 [dev-dependencies]
-chrono = { version = "0.4", features = ["serde"] }
+chrono = { workspace = true, features = ["serde"] }
-insta = "1.43.2"
+insta = { workspace = true }
-pretty_assertions = "1"
+pretty_assertions = { workspace = true }
-rand = "0.9"
+rand = { workspace = true }
-vt100 = "0.16.2"
+vt100 = { workspace = true }