[bazel] Improve runfiles handling #10098

bolinfest · 2026-01-28T18:41:45Z

What is our long-term plan for this dep?

there's a few potential options:

We figure out who owns the runfiles crate on crates.io and get it bumped

We upstream this fix back to rules_rust so it's consumable from the "official" github

We make it part of rules_rs and that becomes "official" as it continues to get traction

By the way, this is only necessary for cargo test and non-bazel clippy, so if there's a world where those flows are both bazelized, this can be removed (I will teach rules_rs to alias @crates//:runfiles to @rules_rust//rust/runfiles instead of the crate from crates.io)

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     # Without this, Bazel will consider BUILD.bazel files in
     # .git/sl/origbackups (which can be populated by Sapling SCM).
     .git
+    codex-rs/target

-Original file line number
+Diff line change
@@ -1,5 +1,7 @@
     common --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
     common --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1
+    # Dummy xcode config so we don't need to build xcode_locator in repo rule.
+    common --xcode_version_config=//:disable_xcode
     common --disk_cache=~/.cache/bazel-disk-cache
     common --repo_contents_cache=~/.cache/bazel-repo-contents-cache
@@ Expand All / @@ -9,6 +11,9 @@ startup --experimental_remote_repo_contents_cache @@
     common --experimental_platform_in_output_dir
+    # Runfiles strategy rationale: codex-rs/utils/cargo-bin/README.md
+    common --noenable_runfiles
     common --enable_platform_specific_config
     # TODO(zbarsky): We need to untangle these libc constraints to get linux remote builds working.
     common:linux --host_platform=//:local
@@ Expand Down Expand Up / @@ -44,4 +49,3 @@ common --jobs=30 @@
     common:remote --extra_execution_platforms=//:rbe
     common:remote --remote_executor=grpcs://remote.buildbuddy.io
     common:remote --jobs=800

-Original file line number
+Diff line change
@@ -1,3 +1,7 @@
+    load("@apple_support//xcode:xcode_config.bzl", "xcode_config")
+    xcode_config(name = "disable_xcode")
     # We mark the local platform as glibc-compatible so that rust can grab a toolchain for us.
     # TODO(zbarsky): Upstream a better libc constraint into rules_rust.
     # We only enable this on linux though for sanity, and because it breaks remote execution.
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,8 @@ register_toolchains( @@
         "@toolchains_llvm_bootstrapped//toolchain:all",
     )
+    # Needed to disable xcode...
+    bazel_dep(name = "apple_support", version = "2.1.0")
     bazel_dep(name = "rules_cc", version = "0.2.16")
     bazel_dep(name = "rules_platform", version = "0.1.0")
     bazel_dep(name = "rules_rust", version = "0.68.1")
@@ Expand Down Expand Up / @@ -90,6 +92,11 @@ crate.annotation( @@
     inject_repo(crate, "openssl")
+    crate.annotation(
+        crate = "runfiles",
+        workspace_cargo_toml = "rust/runfiles/Cargo.toml",
+    )
     # Fix readme inclusions
     crate.annotation(
         crate = "windows-link",
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -186,6 +186,7 @@ regex = "1.12.2" @@
     regex-lite = "0.1.8"
     reqwest = "0.12"
     rmcp = { version = "0.12.0", default-features = false }
+    runfiles = { git = "https://github.com/dzbarsky/rules_rust", rev = "b56cbaa8465e74127f1ea216f813cd377295ad81" }
     schemars = "0.8.22"
     seccompiler = "0.5.0"
     sentry = "0.46.0"
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[bazel] Improve runfiles handling #10098

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

bolinfest Jan 28, 2026

Uh oh!

zbarsky-openai Jan 28, 2026

Uh oh!

Uh oh!

Uh oh!

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ use wiremock::matchers::path; @@
     fn repo_root() -> std::path::PathBuf {
         #[expect(clippy::expect_used)]
-        find_resource!(".").expect("failed to resolve repo root")
+        codex_utils_cargo_bin::repo_root().expect("failed to resolve repo root")
     }
     fn cli_responses_fixture() -> std::path::PathBuf {
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #![allow(clippy::unwrap_used, clippy::expect_used)]
-    use codex_utils_cargo_bin::find_resource;
     use core_test_support::responses::ev_completed;
     use core_test_support::responses::mount_sse_once_match;
     use core_test_support::responses::sse;
@@ Expand All / @@ -11,7 +10,7 @@ use wiremock::matchers::header; @@
     async fn exec_uses_codex_api_key_env_var() -> anyhow::Result<()> {
         let test = test_codex_exec();
         let server = start_mock_server().await;
-        let repo_root = find_resource!(".")?;
+        let repo_root = codex_utils_cargo_bin::repo_root()?;
         mount_sse_once_match(
             &server,
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -113,7 +113,7 @@ fn exec_fixture() -> anyhow::Result<std::path::PathBuf> { @@
     }
     fn exec_repo_root() -> anyhow::Result<std::path::PathBuf> {
-        Ok(find_resource!(".")?)
+        Ok(codex_utils_cargo_bin::repo_root()?)
     }
     #[test]
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,10 @@ load("//:defs.bzl", "codex_rust_crate") @@
     codex_rust_crate(
         name = "cargo-bin",
         crate_name = "codex_utils_cargo_bin",
+        compile_data = ["repo_root.marker"],
+        lib_data_extra = ["repo_root.marker"],
+        test_data_extra = ["repo_root.marker"],
+        rustc_env = {
+            "CODEX_REPO_ROOT_MARKER": "$(rlocationpath :repo_root.marker)",
+        },
     )

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,5 +9,5 @@ workspace = true @@
     [dependencies]
     assert_cmd = { workspace = true }
-    path-absolutize = { workspace = true }
+    runfiles = { workspace = true }
     thiserror = { workspace = true }

-Original file line number
+Diff line change
@@ -0,0 +1,20 @@
+    # codex-utils-cargo-bin runfiles strategy
+    We disable the directory-based runfiles strategy and rely on the manifest
+    strategy across all platforms. This avoids Windows path length issues and keeps
+    behavior consistent in local and remote builds on all platforms. Bazel sets
+    `RUNFILES_MANIFEST_FILE`, and the `codex-utils-cargo-bin` helpers use the
+    `runfiles` crate to resolve runfiles via that manifest.
+    Function behavior:
+    - `cargo_bin`: reads `CARGO_BIN_EXE_*` environment variables (set by Cargo or
+      Bazel) and resolves them via the runfiles manifest when `RUNFILES_MANIFEST_FILE`
+      is present. When not under runfiles, it only accepts absolute paths from
+      `CARGO_BIN_EXE_*` and returns an error otherwise.
+    - `find_resource!`: used by tests to locate fixtures. It chooses the Bazel
+      runfiles resolution path when `RUNFILES_MANIFEST_FILE` is set, otherwise it
+      falls back to a `CARGO_MANIFEST_DIR`-relative path for Cargo runs.
+    Background:
+    - https://bazel.build/docs/runfiles
+    - https://bazel.build/docs/runfiles#runfiles-manifest

[bazel] Improve runfiles handling #10098

Uh oh!

[bazel] Improve runfiles handling #10098

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

bolinfest Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

zbarsky-openai Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!