diff --git a/Cargo.toml b/Cargo.toml
index f64b6d0185e5e..26e44d5fb18c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,387 +1,193 @@
+# @generated by autocargo
+
+[patch.crates-io]
+perf-event = { version = "0.4", git = "https://github.com/Nero5023/perf-event.git", rev = "6dae86b6d4807acec081e6dc0a53167f57f8c0f4" }
+perf-event-open-sys = { version = "5.0", git = "https://github.com/Nero5023/perf-event.git", rev = "6dae86b6d4807acec081e6dc0a53167f57f8c0f4" }
+
+[profile.release]
+panic = "abort"
+incremental = true
+
+[profile.dev]
+opt-level = 1
+debug = true
+lto = "off"
+panic = "abort"
+incremental = true
+
+[profile.test]
+incremental = true
+
+[profile.bench]
+incremental = true
+
+[profile.release-symbols]
+debug = true
+incremental = true
+inherits = "release"
+
 [workspace]
 members = [
-    "allocative/allocative",
-    "allocative/allocative_derive",
-    "app/buck2",
-    "app/buck2_action_impl",
-    "app/buck2_action_impl_tests",
-    "app/buck2_action_metadata_proto",
-    "app/buck2_analysis",
-    "app/buck2_anon_target",
-    "app/buck2_cmd_audit_client",
-    "app/buck2_cmd_audit_server",
-    "app/buck2_bxl",
-    "app/buck2_build_info",
-    "app/buck2_certs",
-    "app/buck2_cfg_constructor",
-    "app/buck2_client",
-    "app/buck2_client_ctx",
-    "app/buck2_cmd_completion_client",
-    "app/buck2_cmd_debug_client",
-    "app/buck2_cmd_docs_client",
-    "app/buck2_cmd_docs_server",
-    "app/buck2_cmd_log_client",
-    "app/buck2_cmd_query_server",
-    "app/buck2_cmd_rage_client",
-    "app/buck2_common",
-    "app/buck2_env",
-    "app/buck2_configured",
-    "app/buck2_core",
-    "app/buck2_cli_proto",
-    "app/buck2_cmd_targets_server",
-    "app/buck2_daemon",
-    "app/buck2_directory",
-    "app/buck2_downward_api",
-    "app/buck2_downward_api_proto",
-    "app/buck2_error",
-    "app/buck2_error_derive",
-    "app/buck2_error_tests",
-    "app/buck2_errorformat",
-    "app/buck2_event_observer",
-    "app/buck2_events",
-    "app/buck2_event_log",
-    "app/buck2_execute",
-    "app/buck2_execute_impl",
-    "app/buck2_execute_local",
-    "app/buck2_external_cells",
-    "app/buck2_external_cells_bundled",
-    "app/buck2_grpc",
-    "app/buck2_health_check",
-    "app/buck2_health_check_proto",
-    "app/buck2_http",
-    "app/buck2_install_proto",
-    "app/buck2_interpreter",
-    "app/buck2_interpreter_for_build",
-    "app/buck2_interpreter_for_build_tests",
-    "app/buck2_miniperf",
-    "app/buck2_miniperf_proto",
-    "app/buck2_node",
-    "app/buck2_node_tests",
-    "app/buck2_offline_archive",
-    "app/buck2_artifact",
-    "app/buck2_cmd_starlark_client",
-    "app/buck2_cmd_starlark_server",
-    "app/buck2_test",
-    "app/buck2_test_api",
-    "app/buck2_test_proto",
-    "app/buck2_test_runner",
-    "app/buck2_forkserver",
-    "app/buck2_forkserver_proto",
-    "app/buck2_fs",
-    "app/buck2_profile",
-    "app/buck2_protoc_dev",
-    "app/buck2_query",
-    "app/buck2_query_impls",
-    "app/buck2_query_parser",
-    "app/buck2_query_derive",
-    "app/buck2_re_configuration",
-    "app/buck2_resource_control",
-    "app/buck2_server",
-    "app/buck2_server_commands",
-    "app/buck2_server_ctx",
-    "app/buck2_server_starlark_debug",
-    "app/buck2_transition",
-    "app/buck2_util",
-    "app/buck2_data",
-    "app/buck2_worker_proto",
-    "app/buck2_wrapper_common",
-    "app/buck2_build_api",
-    "app/buck2_build_api_derive",
-    "app/buck2_build_api_tests",
-    "app/buck2_subscription_proto",
-    "app/buck2_critical_path",
-    "app/buck2_build_signals",
-    "app/buck2_build_signals_impl",
-    "app/buck2_validation",
-    "app/buck2_host_sharing_proto",
-    "dice/dice",
-    "dice/dice_error",
-    "dice/dice_examples",
-    "dice/dice_futures",
-    "dice/dice_tests",
-    # @oss-disable: "dice/fuzzy_dice",
-    "dice/read_dump",
-    # @oss-disable: "host_sharing",
-    "games",
-    "gazebo/display_container",
-    "gazebo/cmp_any",
-    "gazebo/gazebo",
-    "gazebo/gazebo_derive",
-    "gazebo/strong_hash",
-    "gazebo/strong_hash_derive",
-    "gazebo/strong_hash_tests",
-    "integrations/resources/rust",
-    "integrations/rust-project",
-    "pagable",
-    "pagable_derive",
-    "pagable_storage",
-    "remote_execution/oss/re_grpc",
-    "remote_execution/oss/re_grpc_proto",
-    "starlark-rust/starlark",
-    "starlark-rust/starlark_bin",
-    "starlark-rust/starlark_derive",
-    "starlark-rust/starlark_lsp",
-    "starlark-rust/starlark_map",
-    "starlark-rust/starlark_syntax",
-    "buck2_sketches",
-    "shed/setsketch",
-    "app/buck2_hash",
-    "shed/static_interner",
-    "shed/lock_free_hashtable",
-    "shed/lock_free_vec",
-    "shed/provider",
-    "shed/three_billion_instructions",
-    "superconsole",
+  "allocative/allocative",
+  "allocative/allocative_derive",
+  "app/buck2",
+  "app/buck2_action_impl",
+  "app/buck2_action_impl_tests",
+  "app/buck2_action_metadata_proto",
+  "app/buck2_analysis",
+  "app/buck2_anon_target",
+  "app/buck2_artifact",
+  "app/buck2_build_api",
+  "app/buck2_build_api_derive",
+  "app/buck2_build_api_tests",
+  "app/buck2_build_info",
+  "app/buck2_build_signals",
+  "app/buck2_build_signals_impl",
+  "app/buck2_bxl",
+  "app/buck2_certs",
+  "app/buck2_cfg_constructor",
+  "app/buck2_cli_proto",
+  "app/buck2_client",
+  "app/buck2_client_ctx",
+  "app/buck2_cmd_audit_client",
+  "app/buck2_cmd_audit_server",
+  "app/buck2_cmd_completion_client",
+  "app/buck2_cmd_debug_client",
+  "app/buck2_cmd_docs_client",
+  "app/buck2_cmd_docs_server",
+  "app/buck2_cmd_log_client",
+  "app/buck2_cmd_query_server",
+  "app/buck2_cmd_rage_client",
+  "app/buck2_cmd_starlark_client",
+  "app/buck2_cmd_starlark_server",
+  "app/buck2_cmd_targets_server",
+  "app/buck2_common",
+  "app/buck2_configured",
+  "app/buck2_core",
+  "app/buck2_critical_path",
+  "app/buck2_daemon",
+  "app/buck2_data",
+  "app/buck2_directory",
+  "app/buck2_downward_api",
+  "app/buck2_downward_api_proto",
+  "app/buck2_env",
+  "app/buck2_error",
+  "app/buck2_error_derive",
+  "app/buck2_error_tests",
+  "app/buck2_errorformat",
+  "app/buck2_event_log",
+  "app/buck2_event_observer",
+  "app/buck2_events",
+  "app/buck2_execute",
+  "app/buck2_execute_impl",
+  "app/buck2_execute_local",
+  "app/buck2_external_cells",
+  "app/buck2_external_cells_bundled",
+  "app/buck2_file_watcher",
+  "app/buck2_forkserver",
+  "app/buck2_forkserver_proto",
+  "app/buck2_fs",
+  "app/buck2_grpc",
+  "app/buck2_hash",
+  "app/buck2_health_check",
+  "app/buck2_health_check_proto",
+  "app/buck2_host_sharing_proto",
+  "app/buck2_http",
+  "app/buck2_install_proto",
+  "app/buck2_interpreter",
+  "app/buck2_interpreter_for_build",
+  "app/buck2_interpreter_for_build_tests",
+  "app/buck2_miniperf",
+  "app/buck2_miniperf_proto",
+  "app/buck2_node",
+  "app/buck2_node_tests",
+  "app/buck2_offline_archive",
+  "app/buck2_profile",
+  "app/buck2_protoc_dev",
+  "app/buck2_query",
+  "app/buck2_query_derive",
+  "app/buck2_query_impls",
+  "app/buck2_query_parser",
+  "app/buck2_re_configuration",
+  "app/buck2_resource_control",
+  "app/buck2_server",
+  "app/buck2_server_commands",
+  "app/buck2_server_ctx",
+  "app/buck2_server_starlark_debug",
+  "app/buck2_subscription_proto",
+  "app/buck2_test",
+  "app/buck2_test_api",
+  "app/buck2_test_proto",
+  "app/buck2_test_runner",
+  "app/buck2_transition",
+  "app/buck2_util",
+  "app/buck2_validation",
+  "app/buck2_worker_proto",
+  "app/buck2_wrapper_common",
+  "buck2_sketches",
+  "dice/dice",
+  "dice/dice_error",
+  "dice/dice_examples",
+  "dice/dice_futures",
+  "dice/dice_tests",
+  "dice/read_dump",
+  "games",
+  "gazebo/cmp_any",
+  "gazebo/display_container",
+  "gazebo/dupe",
+  "gazebo/dupe_derive",
+  "gazebo/gazebo",
+  "gazebo/gazebo_derive",
+  "gazebo/strong_hash",
+  "gazebo/strong_hash_derive",
+  "gazebo/strong_hash_tests",
+  "host_sharing",
+  "integrations/resources/rust",
+  "integrations/rust-project",
+  "pagable",
+  "pagable_derive",
+  "pagable_storage",
+  "remote_execution/oss/re_grpc",
+  "remote_execution/oss/re_grpc_proto",
+  "shed/lock_free_hashtable",
+  "shed/lock_free_vec",
+  "shed/provider",
+  "shed/setsketch",
+  "shed/static_interner",
+  "shed/three_billion_instructions",
+  "starlark-rust/starlark",
+  "starlark-rust/starlark_bin",
+  "starlark-rust/starlark_derive",
+  "starlark-rust/starlark_js_example",
+  "starlark-rust/starlark_lsp",
+  "starlark-rust/starlark_map",
+  "starlark-rust/starlark_syntax",
+  "superconsole",
 ]
 resolver = "2"
 
 [workspace.package]
+version = "0.1.0"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/facebook/buck2"
 
-[workspace.lints.rust]
-unexpected_cfgs = { level = "allow", check-cfg = ['cfg(fbcode_build)', 'cfg(buck_build)'] }
-
 [workspace.dependencies]
-anyhow = "1.0.98"
+allocative = { path = "allocative/allocative", features = ["anyhow", "bumpalo", "chrono", "compact_str", "dashmap", "either", "futures", "hashbrown", "indexmap", "num-bigint", "once_cell", "parking_lot", "prost-types", "serde_json", "slab", "smallvec", "sorted_vector_map", "tokio", "triomphe"] }
+anyhow = "1.0.102"
 anymap3 = "1.0.1"
-arc-swap = "1.6.0"
-argfile = "0.2.1"
+arc-swap = { version = "1.9.0", features = ["weak"] }
 assert_matches = "1.5"
-async-compression = { version = "0.4.41", features = ["tokio", "brotli", "deflate", "gzip", "zstd"] }
-async-condvar-fair = { version = "1.0", features = ["parking_lot_0_12", "tokio"] }
+async-compression = { version = "0.4.42", features = ["brotli", "bzip2", "deflate", "futures-io", "gzip", "tokio", "zlib", "zstd", "zstdmt"] }
+async-condvar-fair = { version = "1.0.1", features = ["parking_lot_0_12", "tokio"] }
 async-recursion = "1.1.1"
 async-scoped = { version = "0.9", features = ["use-tokio"] }
 async-stream = "0.3"
 async-trait = "0.1.86"
-atomic = "0.5.3"
-backtrace = "0.3.76"
-base64 = "0.22.1"
-bincode = { version = "2.0.1", features = ["serde"] }
-blake3 = { version = "=1.8.2", features = ["default", "rayon", "std", "traits-preview"] }
-bumpalo = "3.19.1"
-bytemuck = { version = "1.25", features = ["const_zeroed", "derive", "min_const_generics", "must_cast", "nightly_portable_simd", "nightly_stdsimd"] }
-byteorder = "1.5"
-bytes = "1.11.1"
-bytesize = "2.0"
-chrono = { version = "0.4.41", features = ["serde"] }
-clap = { version = "4.5.42", features = ["derive", "env", "string"] }
-clap_complete = "4.5.55"
-common-path = "1.0.0"
-compact_str = { version = "0.9.0", features = ["serde"] }
-console = "0.15.11"
-const-oid = { version = "0.9.6", features = ["db"] }
-const_format = "0.2.32"
-constant_time_eq = "0.2.4"
-convert_case = "0.10.0"
-criterion = { version = "0.5.1", features = [] }
-crossbeam = "0.8"
-crossbeam-channel = "0.5.15"
-crossbeam-epoch = "0.9.18"
-crossterm = "0.29"
-csv = "1.3"
-ctor = "1.0.5"
-dashmap = "6.1.0"
-debugserver-types = "0.5.0"
-derivative = "2.2"
-derive_more = { version = "1.0.0", features = ["full"] }
-digest = { version = "0.10", features = ["oid"] }
-dirs = "6.0"
-dunce = "1.0.5"
-either = "1.8"
-enum-iterator = "2.1"
-enum-map = "2.7.3"
-env_logger = "0.11.8"
-equivalent = "1.0.2"
-erased-serde = "0.4.9"
-faccess = "0.2.4"
-fancy-regex = "0.16.2"
-flate2 = "1.1.9"
-fnv = "1.0"
-fs4 = { version = "0.9.1", features = ["sync"] }
-futures = { version = "0.3.31", features = ["async-await", "compat"] }
-futures-intrusive = "0.4.2"
-fxhash = "0.2.1"
-glob = "0.3.2"
-globset = "0.4.13"
-h2 = { version = "^0.4.13" } # force version bump for https://github.com/facebook/buck2/issues/1123
-hashbrown = "0.17"
-hex = "0.4.3"
-hostname = "0.3.1"
-http = "1.4.0"
-http-body = "1.0"
-http-body-util = "0.1.0"
-httparse = "1.7.1"
-httptest = "0.16"
-humantime = "2.1"
-hyper = { version = "1.8.1", features = ["client", "http1", "http2"] }
-hyper-http-proxy = "1.0"
-hyper-rustls = { version = "0.27.0", features = ["http2"] }
-hyper-timeout = "0.5"
-hyper-util = "0.1.10"
-hyperlocal = { version = "0.9", features = ["client"] }
-image = { version = "0.25.9", features = ["png"], default-features = false }
-indent_write = "2.2.0"
-indenter = "0.3.4"
-index_vec = "0.1.4"
-indexmap = { version = "2.13.0", features = ["serde"] }
-indoc = "2.0.2"
-inferno = { version = "0.11.21", default-features = false }
-internment = { version = "0.8", features = ["arc"] }
-inventory = "0.3.21"
-ipnetwork = "0.20.0"
-is_proc_translated = "0.1.1"
-itertools = "0.14.0"
-libc = "0.2.158"
-linked-hash-map = { version = "0.5", features = ["serde_impl"] }
-linkme = { version = "0.3.32", features = ["used_linker"] }
-log = "0.4.27"
-logos = "0.15"
-lru = "0.16.3"
-lsp-server = "0.7.9"
-lsp-types = "0.97.0"
-maplit = "1.0.2"
-mappable-rc = { version = "0.1.1", features = ["std"] }
-memchr = "2.8.0"
-memmap2 = "0.9.5"
-memoffset = "0.9.1"
-mimalloc = "0.1.48"
-multimap = "0.8.2"
-native-tls = "0.2"
-nix = { version = "0.30.1", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "signal", "term", "time", "user", "zerocopy"] }
-nom = "8"
-nom-language = "0.1"
-notify = "8.2.0"
-num-bigint = { version = "0.4.6", features = ["serde"] }
-num-traits = "0.2.19"
-num_cpus = "1.16"
-num_enum = "0.7.4"
-object = "0.36.7"
-once_cell = "1.21"
-os_str_bytes = { version = "6.6.0", features = ["conversions"] }
-parking_lot = { version = "0.12.1", features = ["send_guard"] }
-paste = "1.0.15"
-pathdiff = "0.2"
-perf-event = "0.4"
-perf-event-open-sys = "5.0"
-pin-project = "1.1.10"
-plist = "1.7.1"
-postcard = { version = "1.0.8", features = ["use-crc", "use-std"] }
-pretty_assertions = "1.2.1"
-proc-macro2 = "1.0.106"
-prost = "0.14.3"
-prost-build = "0.14.3"
-prost-derive = "0.14.3"
-prost-types = "0.14.3"
-protoc-bin-vendored = "3.0.0"
-psutil = "3.2"
-quick-xml = { version = "0.37", features = ["overlapped-lists", "serialize"] }
-quote = "1.0.44"
-rand = "0.10"
-rand_chacha = "0.10"
-rand_distr = "0.6"
-rand_xoshiro = "0.8"
-ref-cast = "1.0.18"
-regex = "1.12.2"
-rusqlite = { version = "0.37.0", features = ["bundled"] }
-rustc-hash = { version = "2.1.1" }
-rustls = { package = "rustls", version = "0.23.37", features = ["aws-lc-rs", "ring"], default-features = false }
-rustls-native-certs = { version = "0.8.1" }
-rustls-pki-types = { version = "1.0", features = ["alloc", "std"] }
-rustyline = "14.0"
-scopeguard = "1.2.0"
-sequence_trie = "0.3.6"
-serde = { version = "1.0.228", features = ["derive", "rc"] }
-serde_json = { version = "1.0.149", features = ["raw_value"] }
-serde_path_to_error = "0.1"
-sha1 = "0.10.5"
-sha2 = "0.10.6"
-shlex = "1.3"
-siphasher = "0.3.11"
-slab = "0.4.12"
-slog = "2.8.2"
-smallvec = { version = "1.15", features = ["const_generics", "const_new", "serde", "specialization", "union", "write"] }
-sorted_vector_map = "0.2.1"
-static_assertions = "1.1.0"
-strsim = "0.11.1"
-strum = { version = "0.27.1", features = ["derive", "strum_macros"] }
-syn = { version = "2.0.110", features = ["extra-traits", "full", "visit"] }
-sync_wrapper = "0.1.2"
-sys-info = "0.9.1"
-sysinfo = "0.38.4"
-take_mut = "0.2.2"
-tar = "0.4.44"
-tempfile = "3.22"
-termimad = "0.34.1"
-termios = "0.3"
-termwiz = { git = "https://github.com/wezterm/wezterm.git", rev = "05343b387085842b434d267f91b6b0ec157e4331", default-features = false }
-test-case = "3.3.1"
-textwrap = { version = "0.16.0", features = ["terminal_size"] }
-thiserror = "2.0.18"
-threadpool = "1.8.1"
-tikv-jemallocator = { version = "0.6.1", features = ["profiling"] }
-tokio = { version = "1.50.0", features = ["full", "test-util", "tracing"] }
-tokio-rustls = { version = "0.26" }
-tokio-stream = { version = "0.1.17", features = ["fs", "io-util", "net", "sync", "time", "signal"] }
-tokio-util = { version = "0.7.15", features = ["full"] }
-toml = "0.9.11"
-tonic = { version = "0.14.5", features = ["tls-native-roots", "tls-ring", "tls-webpki-roots"] }
-tonic-build = { version = "0.14.5" }
-tonic-prost = { version = "0.14.5" }
-tonic-prost-build = { version = "0.14.5" }
-tower = { version = "0.5.3", features = ["util"] }
-tower-layer = "0.3.1"
-tower-lsp-server = "0.22.1"
-tower-service = "0.3.3"
-tracing = "0.1.41"
-tracing-subscriber = { version = "0.3.20", features = ["env-filter", "json"] }
-triomphe = "0.1.11"
-trybuild = "1.0.56"
-twox-hash = "1.6.1"
-typed-arena = "2.0"
-unicode-segmentation = "1.12.0"
-uuid = { version = "1.23.0", features = ["v4"] }
-walkdir = "2.3.2"
-which = "4.3.0"
-windows-sys = { version = "0.61.0", features = ["Win32_Foundation", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Security", "Win32_Storage_FileSystem", "Win32_System_Console", "Win32_System_IO", "Win32_System_JobObjects", "Win32_System_ProcessStatus", "Win32_System_SystemInformation", "Win32_System_SystemServices", "Win32_System_Threading"] }
-x509-parser = "0.18.0"
-xattr = "1.5.0"
-zstd = "0.13.3"
-
-# @oss-disable: fbinit.path = "../common/rust/shed/fbinit"
-fbinit.version = "0.2"
-
-allocative.features = ["anyhow", "bumpalo", "chrono", "dashmap", "either", "futures", "hashbrown", "indexmap", "num-bigint", "once_cell", "parking_lot", "prost-types", "serde_json", "slab", "smallvec", "compact_str", "sorted_vector_map", "tokio", "triomphe"]
-allocative.path = "allocative/allocative"
-allocative.version = "0.3.6"
-buck2_hash = { path = "app/buck2_hash" }
-cmp_any = { path = "gazebo/cmp_any" }
-dice = { path = "dice/dice" }
-dice_error = { path = "dice/dice_error" }
-dice_futures = { path = "dice/dice_futures" }
-display_container = { path = "gazebo/display_container" }
-dupe.path = "gazebo/dupe"
-dupe.version = "0.9.1"
-gazebo.features = ["str_pattern_extensions"]
-gazebo.path = "gazebo/gazebo"
-gazebo.version = "0.8.1"
-host_sharing = { path = "host_sharing" }
-lock_free_hashtable = { version = "0.1.4", path = "shed/lock_free_hashtable" }
-lock_free_vec = { path = "shed/lock_free_vec" }
-pagable = { version = "0.4.1", path = "pagable", features = ["tokio"] }
-pagable_storage = { version = "0.4.1", path = "pagable_storage", features = ["tokio"] }
-provider = { path = "shed/provider" }
-remote_execution = { path = "remote_execution/oss/re_grpc" }
-setsketch = { path = "shed/setsketch" }
-sled = "0.34"
-starlark = { version = "0.14.0", path = "starlark-rust/starlark" }
-starlark_lsp = { version = "0.14.0", path = "starlark-rust/starlark_lsp" }
-starlark_map = { version = "0.14.0", path = "starlark-rust/starlark_map" }
-starlark_syntax = { version = "0.14.0", path = "starlark-rust/starlark_syntax" }
-static_interner = { version = "0.1.2", path = "shed/static_interner", features = ["allocative", "dupe", "strong_hash"] }
-strong_hash = { version = "0.1.0", path = "gazebo/strong_hash", features = ["num-bigint", "triomphe"] }
-three_billion_instructions = { path = "shed/three_billion_instructions" }
-
+backtrace = "0.3"
+base64 = { version = "0.22.1", features = ["alloc"] }
+bincode = { version = "2", features = ["serde"] }
+blake3 = { version = "=1.8.2", features = ["mmap", "rayon", "traits-preview"] }
 buck2_action_impl = { path = "app/buck2_action_impl" }
 buck2_action_metadata_proto = { path = "app/buck2_action_metadata_proto" }
 buck2_analysis = { path = "app/buck2_analysis" }
@@ -436,6 +242,7 @@ buck2_forkserver = { path = "app/buck2_forkserver" }
 buck2_forkserver_proto = { path = "app/buck2_forkserver_proto" }
 buck2_fs = { path = "app/buck2_fs" }
 buck2_grpc = { path = "app/buck2_grpc" }
+buck2_hash = { path = "app/buck2_hash" }
 buck2_health_check = { path = "app/buck2_health_check" }
 buck2_health_check_proto = { path = "app/buck2_health_check_proto" }
 buck2_host_sharing_proto = { path = "app/buck2_host_sharing_proto" }
@@ -443,8 +250,6 @@ buck2_http = { path = "app/buck2_http" }
 buck2_install_proto = { path = "app/buck2_install_proto" }
 buck2_interpreter = { path = "app/buck2_interpreter" }
 buck2_interpreter_for_build = { path = "app/buck2_interpreter_for_build" }
-buck2_interpreter_for_build_tests = { path = "app/buck2_interpreter_for_build_tests" }
-buck2_miniperf = { path = "app/buck2_miniperf" }
 buck2_miniperf_proto = { path = "app/buck2_miniperf_proto" }
 buck2_node = { path = "app/buck2_node" }
 buck2_offline_archive = { path = "app/buck2_offline_archive" }
@@ -471,35 +276,199 @@ buck2_util = { path = "app/buck2_util" }
 buck2_validation = { path = "app/buck2_validation" }
 buck2_worker_proto = { path = "app/buck2_worker_proto" }
 buck2_wrapper_common = { path = "app/buck2_wrapper_common" }
+bumpalo = { version = "3.20.3", features = ["allocator_api", "collections"] }
+bytes = { version = "1.11.1", features = ["serde"] }
+bytesize = "2.3.1"
+chrono = { version = "0.4.45", features = ["clock", "serde", "std"], default-features = false }
+clap = { version = "4.6.0", features = ["derive", "env", "string", "unicode", "wrap_help"] }
+clap_complete = "4.6.5"
+cmp_any = { path = "gazebo/cmp_any" }
+common-path = "1.0.0"
+compact_str = { version = "0.9.1", features = ["serde"] }
+console = "0.15.11"
+const_format = "0.2.36"
+constant_time_eq = "0.2.6"
+convert_case = "0.11"
+crossbeam = "0.8"
+crossbeam-channel = "0.5.15"
+crossterm = { version = "0.29", features = ["event-stream", "serde"] }
+csv = "1.4.0"
+ctor = "1.0.7"
+dashmap = { version = "6.2.1", features = ["rayon", "serde"] }
+debugserver-types = "0.5.0"
+derivative = "2.2"
+derive_more = { version = "1.0.0", features = ["full"] }
+dice = { path = "dice/dice", features = ["pagable"] }
+dice_error = { path = "dice/dice_error" }
+dice_futures = { path = "dice/dice_futures" }
+digest = { version = "0.10", features = ["rand_core"] }
+dirs = "6.0"
+display_container = { path = "gazebo/display_container" }
+dunce = "1.0.5"
+dupe = { path = "gazebo/dupe" }
+either = "1.16.0"
+elf = "0.8"
+enum-iterator = "2.3.0"
+enum-map = "2.7.3"
+equivalent = "1.0.2"
+faccess = "0.2.4"
+fancy-regex = "0.16.2"
+fbinit = "0.2"
+flate2 = { version = "1.0.33", features = ["rust_backend"], default-features = false }
+fnv = "1.0"
+form_urlencoded = "1.2.1"
+fs4 = { version = "0.9.1", features = ["sync"] }
+futures = { version = "0.3.31", features = ["async-await", "compat"] }
+futures-intrusive = "0.4.2"
+fxhash = "0.2.1"
+games = { path = "games" }
+gazebo = { path = "gazebo/gazebo", features = ["str_pattern_extensions"] }
+glob = "0.3.2"
+globset = { version = "0.4.13", features = ["serde1"] }
+hashbrown = "0.17.1"
+hex = { version = "0.4.3", features = ["alloc"] }
+host_sharing = { path = "host_sharing" }
+hostname = "0.4.2"
+http = "=1.4.0"
+http-body = "1.0.1"
+http-body-util = "0.1.0"
+httparse = "1.7.1"
+httptest = "0.16.4"
+humantime = "2.1"
+hyper = { version = "1.10.1", features = ["client", "http1", "http2"] }
+hyper-http-proxy = "1.0"
+hyper-rustls = { version = "0.27.9", features = ["http2"] }
+hyper-timeout = "0.5.2"
+hyper-util = { version = "0.1.20", features = ["client-legacy", "http1", "http2", "server-auto", "service", "tokio"] }
+hyperlocal = { version = "0.9", features = ["client"] }
+image = { version = "0.25.10", features = ["bmp", "dds", "ff", "gif", "hdr", "ico", "jpeg", "png", "pnm", "tga", "tiff", "webp"], default-features = false }
+indent_write = "2.2.0"
+indexmap = { version = "2.14.0", features = ["arbitrary", "rayon", "serde"] }
+indoc = "2.0.2"
+inferno = { version = "0.11.21", default-features = false }
+internment = { version = "0.8.6", features = ["arc", "serde"] }
+inventory = "0.3.24"
+ipnetwork = "0.20.0"
+is_proc_translated = "0.1.1"
+itertools = "0.14.0"
+libc = "0.2.186"
+linked-hash-map = { version = "0.5", features = ["serde_impl"] }
+linkme = { version = "0.3.36", features = ["used_linker"] }
+lock_free_hashtable = { path = "shed/lock_free_hashtable", features = ["allocative"] }
+lock_free_vec = { path = "shed/lock_free_vec" }
+lru = { version = "0.16.4", default-features = false }
+lsp-server = "0.7.9"
+lsp-types = "0.97"
+maplit = "1.0"
+memchr = "2.8.1"
+memmap2 = "0.9.10"
+mimalloc = { version = "0.1.52", default-features = false }
+multimap = "0.8.3"
+nix = { version = "0.30.1", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "signal", "term", "time", "user", "zerocopy"] }
+nom = "8"
+nom-language = "0.1"
+notify = "8.2.0"
+num-bigint = { version = "0.4.6", features = ["rand", "serde"] }
+num_enum = "0.7.6"
+object = { version = "0.36.7", features = ["read", "write"] }
+once_cell = "1.21.4"
+os_str_bytes = { version = "6.6.1", features = ["conversions"] }
+pagable = { path = "pagable", features = ["tokio"] }
+pagable_storage = { path = "pagable_storage", features = ["tokio"] }
+parking_lot = { version = "0.12.1", features = ["arc_lock", "send_guard"] }
+paste = "1.0.14"
+pathdiff = "0.2"
+perf-event = "0.4"
+pin-project = "1.1.13"
+plist = "1.9.0"
+pretty_assertions = { version = "1.4.1", features = ["alloc"], default-features = false }
+proc-macro2 = { version = "1.0.106", features = ["span-locations"] }
+prost = { version = "0.14.4", default-features = false }
+prost-types = { version = "0.14.4", default-features = false }
+protoc-bin-vendored = "3.0.0"
+psutil = "3.3.0"
+quick-xml = { version = "0.37", features = ["overlapped-lists", "serialize"] }
+quote = "1.0.45"
+rand = "0.10.1"
+rand_chacha = "0.10"
+rand_distr = "0.6"
+rand_xoshiro = "0.8.1"
+re_grpc_proto = { path = "remote_execution/oss/re_grpc_proto" }
+ref-cast = "1.0.18"
+regex = "1.12.3"
+remote_execution = { path = "remote_execution/oss/re_grpc" }
+rusqlite = { version = "0.37.0", features = ["backup", "blob", "bundled", "column_decltype", "functions", "limits", "modern_sqlite", "serde_json"] }
+rustc-hash = "2.1.2"
+rustls = { version = "0.23.37", features = ["ring"] }
+rustls-native-certs = "0.8.3"
+rustls-pki-types = { version = "1.14.1", features = ["alloc", "std"] }
+scopeguard = "1.2.0"
+sequence_trie = { version = "0.3.6", features = ["serde"] }
+serde = { version = "1.0.219", features = ["derive", "rc"] }
+serde_json = { version = "1.0.140", features = ["alloc", "float_roundtrip", "raw_value", "unbounded_depth"] }
+serde_path_to_error = "0.1.20"
+setsketch = { path = "shed/setsketch" }
+sha1 = "0.10.5"
+sha2 = "0.10.6"
+shlex = "1.3"
+siphasher = "1.0.3"
+slab = "0.4.12"
+slog = { version = "2.8.2", features = ["max_level_trace", "nested-values"] }
+smallvec = { version = "1.15", features = ["impl_bincode", "serde", "specialization", "union", "write"] }
+sorted_vector_map = "0.2.1"
+starlark = { path = "starlark-rust/starlark" }
+starlark_lsp = { path = "starlark-rust/starlark_lsp" }
+starlark_map = { path = "starlark-rust/starlark_map", features = ["pagable_dep"] }
+starlark_syntax = { path = "starlark-rust/starlark_syntax" }
+static_assertions = "1.1.0"
+static_interner = { path = "shed/static_interner", features = ["allocative", "dupe", "strong_hash"] }
+strong_hash = { path = "gazebo/strong_hash", features = ["num-bigint", "triomphe"] }
+strsim = "0.11.1"
+strum = { version = "0.28.0", features = ["derive"] }
+superconsole = { path = "superconsole" }
+syn = { version = "2.0.117", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
+sync_wrapper = "1.0.2"
+sys-info = "0.9.1"
+sysinfo = "0.38.4"
+take_mut = "0.2"
+tar = "0.4.46"
+tempfile = "3.27.0"
+termimad = "0.34.1"
+termios = "0.3"
+termwiz = { git = "https://github.com/wezterm/wezterm.git", rev = "05343b387085842b434d267f91b6b0ec157e4331", features = ["use_serde", "widgets"], default-features = false }
+test-case = "3.3.1"
+textwrap = { version = "0.16.0", features = ["terminal_size"] }
+thiserror = "2.0.18"
+threadpool = "1.8.1"
+three_billion_instructions = { path = "shed/three_billion_instructions" }
+tikv-jemallocator = "0.6.1"
+tokio = { version = "1.52.3", features = ["full", "test-util", "tracing"] }
+tokio-retry = "0.3.1"
+tokio-rustls = { version = "0.26.4", features = ["logging", "ring", "tls12"], default-features = false }
+tokio-stream = { version = "0.1.18", features = ["fs", "io-util", "net", "signal", "sync", "time"] }
+tokio-util = { version = "0.7.18", features = ["full"] }
+toml = { version = "1.1.2", features = ["preserve_order"] }
+tonic = { version = "0.14.6", features = ["codegen", "gzip", "tls-native-roots", "tls-ring", "tls-webpki-roots", "transport"] }
+tonic-prost = "0.14.6"
+tonic-prost-build = "0.14.6"
+tower = { version = "0.5.3", features = ["util"] }
+tower-layer = "0.3.3"
+tower-lsp-server = "0.22.1"
+tower-service = "0.3.3"
+tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
+tracing-subscriber = { version = "0.3.23", features = ["chrono", "env-filter", "json", "local-time", "parking_lot", "registry"] }
+triomphe = "0.1.11"
+twox-hash = "1.6.1"
+typed-arena = "2"
+uuid = { version = "1.23.3", features = ["rng-getrandom", "serde", "v4", "v5", "v6", "v7", "v8"] }
+walkdir = "2.3"
+watchman_client = "0.9.0"
+whoami = "1.5"
+windows-sys = { version = "0.61.2", features = ["Win32_Foundation", "Win32_Globalization", "Win32_NetworkManagement_IpHelper", "Win32_NetworkManagement_Ndis", "Win32_Security", "Win32_Security_Credentials", "Win32_Storage_FileSystem", "Win32_System_Console", "Win32_System_Environment", "Win32_System_IO", "Win32_System_JobObjects", "Win32_System_LibraryLoader", "Win32_System_Memory", "Win32_System_ProcessStatus", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_UI_Shell"] }
+winver = "1"
+x509-parser = "0.18.1"
+xattr = "1.6.1"
+zstd = { version = "0.13.3", features = ["experimental", "zstdmt"] }
 
-[profile.release]
-incremental = true
-panic = "abort"
-# The line below increases build times from 50s to 84s, with no observed impact on runtime speed.
-# But maybe for some benchmarks it will show more noticeable variation.
-# lto = "thin"
-
-# Use with: --profile=release-symbols -Z unstable-options
-[profile.release-symbols]
-debug = true
-incremental = true
-inherits = "release"
-
-[profile.dev]
-debug = true
-incremental = true
-lto = "off"
-opt-level = 1
-panic = "abort"
-
-[profile.test]
-incremental = true
-
-[profile.bench]
-incremental = true
-
-[patch.crates-io]
-# For https://github.com/jimblandy/perf-event/pull/29
-# Base on the comment in https://github.com/jimblandy/perf-event/pull/53, we will no long need this patch in future.
-perf-event = { git = "https://github.com/Nero5023/perf-event.git", rev = "6dae86b6d4807acec081e6dc0a53167f57f8c0f4", version = "0.4" }
-perf-event-open-sys = { git = "https://github.com/Nero5023/perf-event.git", rev = "6dae86b6d4807acec081e6dc0a53167f57f8c0f4", version = "5.0" }
+[workspace.lints.rust]
+unexpected_cfgs = { level = "allow", check-cfg = ["cfg(fbcode_build)", "cfg(buck_build)", "cfg(client_only)", "cfg(tokio_unstable)"]}
diff --git a/allocative/allocative/BUCK b/allocative/allocative/BUCK
index 46ce8088c3c1d..3b9c0ecd26ee0 100644
--- a/allocative/allocative/BUCK
+++ b/allocative/allocative/BUCK
@@ -17,6 +17,30 @@ rust_library(
     srcs = glob(
         ["src/**/*.rs"],
     ),
+    # FIXME(JakobDegen): Needed because autocargo doesn't handle the select below
+    autocargo = {
+        "edge_features": [
+            "anyhow",
+            "bumpalo",
+            "chrono",
+            "dashmap",
+            "either",
+            "futures",
+            "hashbrown",
+            "indexmap",
+            "num-bigint",
+            "once_cell",
+            "parking_lot",
+            "prost-types",
+            "slab",
+            "smallvec",
+            "compact_str",
+            "serde_json",
+            "sorted_vector_map",
+            "tokio",
+            "triomphe",
+        ],
+    },
     features = [
         "anyhow",
         "bumpalo",
diff --git a/app/buck2/BUCK b/app/buck2/BUCK
index f1a9d48dfcc3a..45b41f06554e6 100644
--- a/app/buck2/BUCK
+++ b/app/buck2/BUCK
@@ -10,6 +10,30 @@ prelude = native
 rust_library(
     name = "buck2",
     srcs = glob(["src/**/*.rs"]),
+    # Cargo-only deps used in `bin/buck2.rs` under `#[cfg(not(buck_build))]`.
+    # On linux/macos cargo uses jemalloc as the global allocator; buck builds
+    # rely on fbcode.default_allocator instead.
+    autocargo = {
+        "cargo_toml_config": {
+            "dependencies_override": {
+                "dependencies": {
+                    "fbinit": {
+                        "path": None,
+                        "version": "0.2",
+                    },
+                },
+            },
+            "extra_buck_dependencies": {
+                "target": {
+                    '\'cfg(any(target_os = "linux", target_os = "macos"))\'': {
+                        "dependencies": [
+                            "fbsource//third-party/rust:jemallocator",
+                        ],
+                    },
+                },
+            },
+        },
+    },
     rustc_flags = select({
         ":buck2_client_only_build": ["--cfg=client_only"],
         "DEFAULT": [],
diff --git a/app/buck2/Cargo.toml b/app/buck2/Cargo.toml
index 5e13a79355514..3bd1d5b345666 100644
--- a/app/buck2/Cargo.toml
+++ b/app/buck2/Cargo.toml
@@ -1,91 +1,89 @@
+# @generated by autocargo from //buck2/app/buck2:[buck2,buck2-bin]
+
 [package]
-description = ""
-edition = "2024"
-license = { workspace = true }
 name = "buck2"
-repository = { workspace = true }
-version = "0.1.0"
-
-[dependencies]
-backtrace = { workspace = true }
-blake3 = { workspace = true }
-clap = { workspace = true }
-fbinit = { workspace = true }
-hex = { workspace = true }
-rustls = { workspace = true }
-tokio = { workspace = true }
-tracing = { workspace = true }
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
-dupe = { workspace = true }
-gazebo = { workspace = true }
-host_sharing = { workspace = true }
-superconsole = { version = "0.2.0", path = "../../superconsole" }
+[[bin]]
+name = "buck2"
+path = "bin/buck2.rs"
+test = false
 
-buck2_action_impl = { workspace = true }
-buck2_analysis = { workspace = true }
-buck2_anon_target = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_build_info = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_build_signals_impl = { workspace = true }
-buck2_bxl = { workspace = true }
-buck2_certs = { workspace = true }
-buck2_cfg_constructor = { workspace = true }
-buck2_client = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_cmd_audit_client = { workspace = true }
-buck2_cmd_audit_server = { workspace = true }
-buck2_cmd_completion_client = { workspace = true }
-buck2_cmd_debug_client = { workspace = true }
-buck2_cmd_docs_client = { workspace = true }
-buck2_cmd_docs_server = { workspace = true }
-buck2_cmd_log_client = { workspace = true }
-buck2_cmd_query_server = { workspace = true }
-buck2_cmd_rage_client = { workspace = true }
-buck2_cmd_starlark_client = { workspace = true }
-buck2_cmd_starlark_server = { workspace = true }
-buck2_cmd_targets_server = { workspace = true }
-buck2_common = { workspace = true }
-buck2_configured = { workspace = true }
-buck2_core = { workspace = true }
-buck2_daemon = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_log = { workspace = true }
-buck2_event_observer = { workspace = true }
-buck2_events = { workspace = true }
-buck2_external_cells = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_query_impls = { workspace = true }
-buck2_server = { workspace = true }
-buck2_server_commands = { workspace = true }
-buck2_test = { workspace = true }
-buck2_test_runner = { workspace = true }
-buck2_transition = { workspace = true }
-buck2_util = { workspace = true }
-buck2_validation = { workspace = true }
-buck2_wrapper_common = { workspace = true }
+[dependencies]
+backtrace.workspace = true
+buck2_action_impl.workspace = true
+buck2_analysis.workspace = true
+buck2_anon_target.workspace = true
+buck2_build_api.workspace = true
+buck2_build_info.workspace = true
+buck2_build_signals_impl.workspace = true
+buck2_bxl.workspace = true
+buck2_certs.workspace = true
+buck2_cfg_constructor.workspace = true
+buck2_client.workspace = true
+buck2_client_ctx.workspace = true
+buck2_cmd_audit_client.workspace = true
+buck2_cmd_audit_server.workspace = true
+buck2_cmd_completion_client.workspace = true
+buck2_cmd_debug_client.workspace = true
+buck2_cmd_docs_client.workspace = true
+buck2_cmd_docs_server.workspace = true
+buck2_cmd_log_client.workspace = true
+buck2_cmd_query_server.workspace = true
+buck2_cmd_rage_client.workspace = true
+buck2_cmd_starlark_client.workspace = true
+buck2_cmd_starlark_server.workspace = true
+buck2_cmd_targets_server.workspace = true
+buck2_common.workspace = true
+buck2_configured.workspace = true
+buck2_core.workspace = true
+buck2_daemon.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_event_log.workspace = true
+buck2_event_observer.workspace = true
+buck2_events.workspace = true
+buck2_external_cells.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_query_impls.workspace = true
+buck2_server.workspace = true
+buck2_server_commands.workspace = true
+buck2_test.workspace = true
+buck2_test_runner.workspace = true
+buck2_transition.workspace = true
+buck2_util.workspace = true
+buck2_validation.workspace = true
+buck2_wrapper_common.workspace = true
+clap.workspace = true
+dupe.workspace = true
+fbinit.workspace = true
+superconsole.workspace = true
+tokio.workspace = true
+tracing.workspace = true
 
 [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
-tikv-jemallocator = { workspace = true }
-
-[target.'cfg(unix)'.dependencies]
-dirs = { workspace = true }
-libc = { workspace = true }
-nix = { workspace = true }
+tikv-jemallocator.workspace = true
 
-buck2_forkserver = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+buck2_forkserver.workspace = true
+dirs.workspace = true
+libc.workspace = true
+nix.workspace = true
 
-[target.'cfg(windows)'.dependencies]
-libc = { workspace = true }
-mimalloc = { workspace = true }
-windows-sys = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+buck2_forkserver.workspace = true
+dirs.workspace = true
+libc.workspace = true
+nix.workspace = true
 
-[[bin]]
-name = "buck2"
-path = "bin/buck2.rs"
+[target.'cfg(target_os = "windows")'.dependencies]
+mimalloc.workspace = true
+windows-sys.workspace = true
 
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ["cfg(buck_build)", "cfg(client_only)", "cfg(fbcode_build)"] }
+[lints]
+workspace = true
diff --git a/app/buck2_action_impl/BUCK b/app/buck2_action_impl/BUCK
index 60f332f118f6f..e1e9abe480b74 100644
--- a/app/buck2_action_impl/BUCK
+++ b/app/buck2_action_impl/BUCK
@@ -5,6 +5,18 @@ oncall("build_infra")
 rust_library(
     name = "buck2_action_impl",
     srcs = glob(["src/**/*.rs"]),
+    # `//buck2/remote_execution:remote_execution` is an alias selecting between
+    # the internal and OSS impls; autocargo doesn't follow aliases, so point at
+    # the OSS rust_library directly for cargo's sake.
+    autocargo = {
+        "cargo_toml_config": {
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    "fbcode//buck2/remote_execution/oss/re_grpc:remote_execution",
+                ],
+            },
+        },
+    },
     deps = [
         "fbsource//third-party/rust:async-trait",
         "fbsource//third-party/rust:chrono",
diff --git a/app/buck2_action_impl/Cargo.toml b/app/buck2_action_impl/Cargo.toml
index a6f9fbd69f650..b9a0df4335542 100644
--- a/app/buck2_action_impl/Cargo.toml
+++ b/app/buck2_action_impl/Cargo.toml
@@ -1,59 +1,58 @@
+# @generated by autocargo from //buck2/app/buck2_action_impl:buck2_action_impl
+
 [package]
-description = "Action implementations and context functions"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_action_impl"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-chrono = { workspace = true }
-ctor = { workspace = true }
-dashmap = { workspace = true }
-derive_more = { workspace = true }
-dupe = { workspace = true }
-either = { workspace = true }
-futures = { workspace = true }
-hex = { workspace = true }
-http = { workspace = true }
-itertools = { workspace = true }
-once_cell = { workspace = true }
-parking_lot = { workspace = true }
-rustc-hash = { workspace = true }
-serde_json = { workspace = true }
-sha1 = { workspace = true }
-smallvec = { workspace = true }
-static_assertions = { workspace = true }
-tracing = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-sorted_vector_map = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_action_metadata_proto.workspace = true
+buck2_analysis.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api.workspace = true
+buck2_build_signals.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_directory.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_file_watcher.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_http.workspace = true
+buck2_interpreter.workspace = true
+buck2_util.workspace = true
+chrono.workspace = true
+ctor.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+either.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+hex.workspace = true
+host_sharing.workspace = true
+http.workspace = true
+itertools.workspace = true
+once_cell.workspace = true
+pagable.workspace = true
+parking_lot.workspace = true
+remote_execution.workspace = true
+serde_json.workspace = true
+sha1.workspace = true
+smallvec.workspace = true
+sorted_vector_map.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
+static_assertions.workspace = true
+tracing.workspace = true
 
-buck2_action_metadata_proto = { workspace = true }
-buck2_analysis = { workspace = true }
-buck2_artifact = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_directory = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_file_watcher = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_http = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_node = { workspace = true }
-buck2_util = { workspace = true }
-dice_futures = { workspace = true }
-host_sharing = { workspace = true }
-remote_execution = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_action_impl_tests/Cargo.toml b/app/buck2_action_impl_tests/Cargo.toml
index 843c8273b7e67..cd0bb7459d26d 100644
--- a/app/buck2_action_impl_tests/Cargo.toml
+++ b/app/buck2_action_impl_tests/Cargo.toml
@@ -1,25 +1,31 @@
+# @generated by autocargo from //buck2/app/buck2_action_impl_tests:buck2_action_impl_tests
+
 [package]
-description = "Tests for buck2_action_impl"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_action_impl_tests"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
+autolib = false
 
-[dev-dependencies]
-ctor = { workspace = true }
-indoc = { workspace = true }
-maplit = { workspace = true }
+[[test]]
+name = "buck2_action_impl_tests"
+path = "src/lib.rs"
 
-buck2_error = { workspace = true }
-dupe = { workspace = true }
-starlark = { workspace = true }
+[dev-dependencies]
+buck2_action_impl.workspace = true
+buck2_anon_target.workspace = true
+buck2_build_api.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_execute.workspace = true
+buck2_interpreter.workspace = true
+buck2_interpreter_for_build.workspace = true
+ctor.workspace = true
+dupe.workspace = true
+indoc.workspace = true
+maplit.workspace = true
+starlark.workspace = true
 
-buck2_action_impl = { workspace = true }
-buck2_anon_target = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_core = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_node = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_action_metadata_proto/Cargo.toml b/app/buck2_action_metadata_proto/Cargo.toml
index 2bc59d195ba4e..b6ab207c06ead 100644
--- a/app/buck2_action_metadata_proto/Cargo.toml
+++ b/app/buck2_action_metadata_proto/Cargo.toml
@@ -1,15 +1,19 @@
+# @generated by autocargo from //buck2/app/buck2_action_metadata_proto:buck2_action_metadata_proto
+
 [package]
 name = "buck2_action_metadata_proto"
-
-edition = "2024"
-license = { workspace = true }
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-prost = { workspace = true }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
+prost.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_analysis/Cargo.toml b/app/buck2_analysis/Cargo.toml
index 9eb43c041f26f..c00fe8316aa51 100644
--- a/app/buck2_analysis/Cargo.toml
+++ b/app/buck2_analysis/Cargo.toml
@@ -1,36 +1,38 @@
+# @generated by autocargo from //buck2/app/buck2_analysis:buck2_analysis
+
 [package]
-description = "Execute rule function"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_analysis"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-derive_more = { workspace = true }
-either = { workspace = true }
-futures = { workspace = true }
-smallvec = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api.workspace = true
+buck2_build_signals.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_node.workspace = true
+buck2_query.workspace = true
+buck2_util.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dupe.workspace = true
+either.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+pagable.workspace = true
+smallvec.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
 
-buck2_artifact = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_node = { workspace = true }
-buck2_query = { workspace = true }
-buck2_util = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_anon_target/Cargo.toml b/app/buck2_anon_target/Cargo.toml
index ca6c8baf1fff6..39c791c6a206b 100644
--- a/app/buck2_anon_target/Cargo.toml
+++ b/app/buck2_anon_target/Cargo.toml
@@ -1,44 +1,45 @@
+# @generated by autocargo from //buck2/app/buck2_anon_target:buck2_anon_target
+
 [package]
-description = "Anonymous targets"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_anon_target"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-derive_more = { workspace = true }
-either = { workspace = true }
-futures = { workspace = true }
-rustc-hash = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-
-allocative = { workspace = true }
-cmp_any = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true }
-strong_hash = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_analysis.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api.workspace = true
+buck2_build_signals.workspace = true
+buck2_configured.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_node.workspace = true
+buck2_util.workspace = true
+cmp_any.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+either.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+pagable.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
+strong_hash.workspace = true
 
-buck2_analysis = { workspace = true }
-buck2_artifact = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_configured = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_node = { workspace = true }
-buck2_util = { workspace = true }
-dice_futures = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_artifact/Cargo.toml b/app/buck2_artifact/Cargo.toml
index 525030e2efd60..5240ed476e626 100644
--- a/app/buck2_artifact/Cargo.toml
+++ b/app/buck2_artifact/Cargo.toml
@@ -1,35 +1,37 @@
+# @generated by autocargo from //buck2/app/buck2_artifact:buck2_artifact
+
 [package]
-description = "Artifact types"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_artifact"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-derivative = { workspace = true }
-derive_more = { workspace = true }
-either = { workspace = true }
-serde = { workspace = true }
-static_assertions = { workspace = true }
-take_mut = { workspace = true }
-
-allocative = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true }
-strong_hash = { workspace = true }
-
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_util = { workspace = true }
+allocative.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_execute.workspace = true
+buck2_fs.workspace = true
+buck2_util.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+either.workspace = true
+gazebo.workspace = true
+pagable.workspace = true
+serde.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
+static_assertions.workspace = true
+strong_hash.workspace = true
+take_mut.workspace = true
 
 [dev-dependencies]
-assert_matches = { workspace = true }
-serde_json = { workspace = true }
+assert_matches.workspace = true
+serde_json.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_build_api/BUCK b/app/buck2_build_api/BUCK
index 0abcc3aeff837..ba014011e425e 100644
--- a/app/buck2_build_api/BUCK
+++ b/app/buck2_build_api/BUCK
@@ -5,6 +5,18 @@ oncall("build_infra")
 rust_library(
     name = "buck2_build_api",
     srcs = glob(["src/**/*.rs"]),
+    # `//buck2/remote_execution:remote_execution` is an alias selecting between
+    # the internal and OSS impls; autocargo doesn't follow aliases, so point at
+    # the OSS rust_library directly for cargo's sake.
+    autocargo = {
+        "cargo_toml_config": {
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    "fbcode//buck2/remote_execution/oss/re_grpc:remote_execution",
+                ],
+            },
+        },
+    },
     test_deps = [
         "//buck2/app/buck2_certs:buck2_certs",
         "//buck2/app/buck2_wrapper_common:buck2_wrapper_common",
diff --git a/app/buck2_build_api/Cargo.toml b/app/buck2_build_api/Cargo.toml
index 6deebe38289f3..4af6e0f85b51a 100644
--- a/app/buck2_build_api/Cargo.toml
+++ b/app/buck2_build_api/Cargo.toml
@@ -1,79 +1,77 @@
+# @generated by autocargo from //buck2/app/buck2_build_api:buck2_build_api
+
 [package]
-description = "Build related interpreter defs, coercion logic, some build rule impelementations, and handing actions off to DICE for caching and execution. A large chunk of the 'build' part of BuckV2"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_build_api"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-recursion = { workspace = true }
-async-trait = { workspace = true }
-blake3 = { workspace = true }
-console = { workspace = true }
-dashmap = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-either = { workspace = true }
-futures = { workspace = true }
-fxhash = { workspace = true }
-indexmap = { workspace = true }
-internment = { workspace = true }
-inventory = { workspace = true }
-itertools = { workspace = true }
-linkme = { workspace = true }
-multimap = { workspace = true }
-once_cell = { workspace = true }
-ref-cast = { workspace = true }
-regex = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-smallvec = { workspace = true }
-static_assertions = { workspace = true }
-strong_hash = { workspace = true }
-tokio = { workspace = true }
-tracing = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-display_container = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-remote_execution = { workspace = true }
-rustls = { workspace = true }
-setsketch = { workspace = true }
-sorted_vector_map = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true }
-
-buck2_artifact = { workspace = true }
-buck2_build_api_derive = { workspace = true }
-buck2_build_info = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_directory = { workspace = true }
-buck2_error = { workspace = true }
-buck2_errorformat = { workspace = true }
-buck2_event_observer = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_file_watcher = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_http = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_node = { workspace = true }
-buck2_query = { workspace = true }
-buck2_sketches = { workspace = true }
-buck2_test_api = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
-dice_futures = { workspace = true }
+allocative.workspace = true
+async-recursion.workspace = true
+async-trait.workspace = true
+blake3.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api_derive.workspace = true
+buck2_build_info.workspace = true
+buck2_build_signals.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_directory.workspace = true
+buck2_error.workspace = true
+buck2_errorformat.workspace = true
+buck2_event_observer.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_file_watcher.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_http.workspace = true
+buck2_interpreter.workspace = true
+buck2_node.workspace = true
+buck2_query.workspace = true
+buck2_sketches.workspace = true
+buck2_test_api.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+console.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+display_container.workspace = true
+dupe.workspace = true
+either.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+indexmap.workspace = true
+internment.workspace = true
+inventory.workspace = true
+itertools.workspace = true
+linkme.workspace = true
+multimap.workspace = true
+once_cell.workspace = true
+pagable.workspace = true
+ref-cast.workspace = true
+regex.workspace = true
+remote_execution.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+setsketch.workspace = true
+smallvec.workspace = true
+sorted_vector_map.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
+static_assertions.workspace = true
+strong_hash.workspace = true
+tokio.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
-buck2_certs = { workspace = true }
-buck2_wrapper_common = { workspace = true }
+buck2_certs.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_build_api_derive/Cargo.toml b/app/buck2_build_api_derive/Cargo.toml
index b4cbcea18d5ca..eb010eb70dd28 100644
--- a/app/buck2_build_api_derive/Cargo.toml
+++ b/app/buck2_build_api_derive/Cargo.toml
@@ -1,19 +1,23 @@
+# @generated by autocargo from //buck2/app/buck2_build_api_derive:buck2_build_api_derive
+
 [package]
-authors = ["Facebook"]
-description = "Derive macros for the Buck's buck2_build_api"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_build_api_derive"
-repository = { workspace = true }
-version = "0.4.1"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [lib]
+test = false
+doctest = false
 proc-macro = true
 
 [dependencies]
-convert_case = { workspace = true }
-proc-macro2 = { workspace = true }
-quote = { workspace = true }
-syn = { workspace = true }
+convert_case.workspace = true
+gazebo.workspace = true
+proc-macro2.workspace = true
+quote.workspace = true
+syn.workspace = true
 
-gazebo = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_build_api_tests/Cargo.toml b/app/buck2_build_api_tests/Cargo.toml
index 39c47cbe25bba..89cde061d6cb7 100644
--- a/app/buck2_build_api_tests/Cargo.toml
+++ b/app/buck2_build_api_tests/Cargo.toml
@@ -1,55 +1,60 @@
+# @generated by autocargo from //buck2/app/buck2_build_api_tests:buck2_build_api_tests
+
 [package]
-description = "Tests for buck2_build_api crate"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_build_api_tests"
-repository = { workspace = true }
-version = "0.1.0"
-
-[dev-dependencies]
-assert_matches = { workspace = true }
-async-trait = { workspace = true }
-ctor = { workspace = true }
-derivative = { workspace = true }
-indoc = { workspace = true }
-maplit = { workspace = true }
-rustc-hash = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true }
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
+autolib = false
 
-sorted_vector_map = { workspace = true }
+[[test]]
+name = "buck2_build_api_tests"
+path = "src/lib.rs"
 
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-itertools = { workspace = true }
-pagable = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true }
+[dev-dependencies]
+allocative.workspace = true
+assert_matches.workspace = true
+async-trait.workspace = true
+buck2_action_impl.workspace = true
+buck2_analysis.workspace = true
+buck2_anon_target.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api.workspace = true
+buck2_build_signals.workspace = true
+buck2_certs.workspace = true
+buck2_common.workspace = true
+buck2_configured.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_directory.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_file_watcher.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_http.workspace = true
+buck2_interpreter.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_node.workspace = true
+buck2_test_api.workspace = true
+buck2_transition.workspace = true
+buck2_util.workspace = true
+ctor.workspace = true
+derivative.workspace = true
+dice.workspace = true
+dupe.workspace = true
+gazebo.workspace = true
+indoc.workspace = true
+itertools.workspace = true
+maplit.workspace = true
+pagable.workspace = true
+serde_json.workspace = true
+sorted_vector_map.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
+tokio.workspace = true
 
-buck2_action_impl = { workspace = true }
-buck2_analysis = { workspace = true }
-buck2_anon_target = { workspace = true }
-buck2_artifact = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_certs = { workspace = true }
-buck2_common = { workspace = true }
-buck2_configured = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_directory = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_file_watcher = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_http = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_node = { workspace = true }
-buck2_test_api = { workspace = true }
-buck2_transition = { workspace = true }
-buck2_util = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_build_info/Cargo.toml b/app/buck2_build_info/Cargo.toml
index 17a9b63262af5..9e45ebecec9ec 100644
--- a/app/buck2_build_info/Cargo.toml
+++ b/app/buck2_build_info/Cargo.toml
@@ -1,12 +1,14 @@
+# @generated by autocargo from //buck2/app/buck2_build_info:buck2_build_info
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_build_info"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-buck2_util = { workspace = true }
+buck2_util.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_build_signals/Cargo.toml b/app/buck2_build_signals/Cargo.toml
index 23837e6fbb141..ef484fe498e36 100644
--- a/app/buck2_build_signals/Cargo.toml
+++ b/app/buck2_build_signals/Cargo.toml
@@ -1,24 +1,27 @@
+# @generated by autocargo from //buck2/app/buck2_build_signals:buck2_build_signals
+
 [package]
-authors = ["Meta"]
-description = "Interface for build signals"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_build_signals"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-async-trait = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_util = { workspace = true }
-cmp_any = { workspace = true }
-derive_more = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-tokio = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_util.workspace = true
+cmp_any.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dupe.workspace = true
+gazebo.workspace = true
+tokio.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_build_signals_impl/Cargo.toml b/app/buck2_build_signals_impl/Cargo.toml
index 0e582a4d6a63e..f1ca7ba033d5e 100644
--- a/app/buck2_build_signals_impl/Cargo.toml
+++ b/app/buck2_build_signals_impl/Cargo.toml
@@ -1,38 +1,41 @@
+# @generated by autocargo from //buck2/app/buck2_build_signals_impl:buck2_build_signals_impl
+
 [package]
-authors = ["Meta"]
-description = "Capture build signals during a build to produce a critical path"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_build_signals_impl"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-buck2_analysis = { workspace = true }
-buck2_artifact = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_critical_path = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_node = { workspace = true }
-buck2_util = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-itertools = { workspace = true }
-prost-types = { workspace = true }
-ref-cast = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-smallvec = { workspace = true }
-static_assertions = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tracing = { workspace = true }
+async-trait.workspace = true
+buck2_analysis.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api.workspace = true
+buck2_build_signals.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_critical_path.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_node.workspace = true
+buck2_util.workspace = true
+dice.workspace = true
+dupe.workspace = true
+gazebo.workspace = true
+itertools.workspace = true
+prost-types.workspace = true
+ref-cast.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+smallvec.workspace = true
+static_assertions.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
+tracing.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_bxl/Cargo.toml b/app/buck2_bxl/Cargo.toml
index c6cf9ec1d6b79..bd24a5e74df02 100644
--- a/app/buck2_bxl/Cargo.toml
+++ b/app/buck2_bxl/Cargo.toml
@@ -1,60 +1,63 @@
+# @generated by autocargo from //buck2/app/buck2_bxl:buck2_bxl
+
 [package]
-description = "Buck V2 extension language"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_bxl"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-anyhow = { workspace = true }
-async-recursion = { workspace = true }
-async-trait = { workspace = true }
-buck2_events = { workspace = true }
-clap = { workspace = true }
-cmp_any = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-dice = { workspace = true }
-display_container = { workspace = true }
-dupe = { workspace = true }
-either = { workspace = true }
-futures = { workspace = true }
-gazebo = { workspace = true }
-itertools = { workspace = true }
-num-bigint = { workspace = true }
-pagable = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true, features = ["pagable_dep"] }
-strong_hash = { workspace = true }
-tokio = { workspace = true }
-
-buck2_action_impl = { workspace = true }
-buck2_analysis = { workspace = true }
-buck2_artifact = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_node = { workspace = true }
-buck2_profile = { workspace = true }
-buck2_query = { workspace = true }
-buck2_query_parser = { workspace = true }
-buck2_server_ctx = { workspace = true }
-buck2_util = { workspace = true }
-dice_futures = { workspace = true }
-once_cell = { workspace = true }
+allocative.workspace = true
+anyhow.workspace = true
+async-recursion.workspace = true
+async-trait.workspace = true
+buck2_action_impl.workspace = true
+buck2_analysis.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_node.workspace = true
+buck2_profile.workspace = true
+buck2_query.workspace = true
+buck2_query_parser.workspace = true
+buck2_server_ctx.workspace = true
+buck2_util.workspace = true
+clap.workspace = true
+cmp_any.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+display_container.workspace = true
+dupe.workspace = true
+either.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+itertools.workspace = true
+num-bigint.workspace = true
+once_cell.workspace = true
+pagable.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
+strong_hash.workspace = true
+tokio.workspace = true
 
 [dev-dependencies]
-ctor = { workspace = true }
-maplit = { workspace = true }
+ctor.workspace = true
+maplit.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_certs/Cargo.toml b/app/buck2_certs/Cargo.toml
index 50981fe555036..ac3b8476f676d 100644
--- a/app/buck2_certs/Cargo.toml
+++ b/app/buck2_certs/Cargo.toml
@@ -1,23 +1,22 @@
+# @generated by autocargo from //buck2/app/buck2_certs:buck2_certs
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_certs"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-rustls = { workspace = true }
-rustls-native-certs = { workspace = true }
-rustls-pki-types = { workspace = true }
-tokio = { workspace = true }
-
-tracing = { workspace = true }
-x509-parser = { workspace = true }
-
-dupe = { workspace = true }
-
-buck2_error = { workspace = true }
-buck2_util = { workspace = true }
+buck2_error.workspace = true
+buck2_util.workspace = true
+dupe.workspace = true
+rustls.workspace = true
+rustls-native-certs.workspace = true
+rustls-pki-types.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+x509-parser.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_cfg_constructor/Cargo.toml b/app/buck2_cfg_constructor/Cargo.toml
index 590a54ec75326..ceb1d4e9c63eb 100644
--- a/app/buck2_cfg_constructor/Cargo.toml
+++ b/app/buck2_cfg_constructor/Cargo.toml
@@ -1,27 +1,30 @@
+# @generated by autocargo from //buck2/app/buck2_cfg_constructor:buck2_cfg_constructor
+
 [package]
-description = "Implementation of configuration constructor for modifier feature"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cfg_constructor"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-async-trait = { workspace = true }
-derive_more = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-futures = { workspace = true }
-pagable = { workspace = true }
-starlark = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_build_api.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_interpreter.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_node.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+futures.workspace = true
+pagable.workspace = true
+starlark.workspace = true
 
-buck2_build_api = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_node = { workspace = true }
-dice_futures = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_cli_proto/Cargo.toml b/app/buck2_cli_proto/Cargo.toml
index c1ae1d7ee9598..1145db9866508 100644
--- a/app/buck2_cli_proto/Cargo.toml
+++ b/app/buck2_cli_proto/Cargo.toml
@@ -1,30 +1,33 @@
+# @generated by autocargo from //buck2/app/buck2_cli_proto:buck2_cli_proto
+
 [package]
 name = "buck2_cli_proto"
-
-edition = "2024"
-license = { workspace = true }
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-bytes = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-serde = { workspace = true }
-tokio-util = { workspace = true }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
+allocative.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_fs.workspace = true
+buck2_subscription_proto.workspace = true
+bytes.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+serde.workspace = true
+tokio-util.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_subscription_proto = { workspace = true }
+[dev-dependencies]
+futures.workspace = true
+tokio.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
 
-[dev-dependencies]
-futures = { workspace = true }
-tokio = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_client/Cargo.toml b/app/buck2_client/Cargo.toml
index 4462391d3e06f..4fd3937d25e10 100644
--- a/app/buck2_client/Cargo.toml
+++ b/app/buck2_client/Cargo.toml
@@ -1,58 +1,55 @@
+# @generated by autocargo from //buck2/app/buck2_client:buck2_client
+
 [package]
-description = "Some parts of Buck client"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_client"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-recursion = { workspace = true }
-async-trait = { workspace = true }
-bytesize = { workspace = true }
-chrono = { workspace = true }
-clap = { workspace = true }
-dupe = { workspace = true }
-futures = { workspace = true }
-gazebo = { workspace = true }
-humantime = { workspace = true }
-libc = { workspace = true }
-lsp-server = { workspace = true }
-maplit = { workspace = true }
-multimap = { workspace = true }
-once_cell = { workspace = true }
-prost = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-shlex = { workspace = true }
-superconsole = { version = "0.2.0", path = "../../superconsole" }
-threadpool = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tokio-util = { workspace = true }
-tonic = { workspace = true }
-tracing = { workspace = true }
-uuid = { workspace = true }
-walkdir = { workspace = true }
-
-# Please do not add dependency on `buck2_build_api`.
-buck2_cli_proto = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_log = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_query_parser = { workspace = true }
-buck2_subscription_proto = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
+async-recursion.workspace = true
+async-trait.workspace = true
+buck2_cli_proto.workspace = true
+buck2_client_ctx.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_event_log.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_query_parser.workspace = true
+buck2_subscription_proto.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+bytesize.workspace = true
+chrono.workspace = true
+clap.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+humantime.workspace = true
+libc.workspace = true
+lsp-server.workspace = true
+once_cell.workspace = true
+prost.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+shlex.workspace = true
+superconsole.workspace = true
+threadpool.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
+tokio-util.workspace = true
+tonic.workspace = true
+tracing.workspace = true
+uuid.workspace = true
+walkdir.workspace = true
 
 [dev-dependencies]
-assert_matches = { workspace = true }
-tempfile = { workspace = true }
+assert_matches.workspace = true
+tempfile.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_client_ctx/BUCK b/app/buck2_client_ctx/BUCK
index bd74246bf9594..da26308bed282 100644
--- a/app/buck2_client_ctx/BUCK
+++ b/app/buck2_client_ctx/BUCK
@@ -5,6 +5,23 @@ oncall("build_infra")
 rust_library(
     name = "buck2_client_ctx",
     srcs = glob(["src/**/*.rs"]),
+    autocargo = {
+        "cargo_toml_config": {
+            "dependencies_override": {
+                "dependencies": {
+                    "fbinit": {
+                        "path": None,
+                        "version": "0.2",
+                    },
+                },
+            },
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    (None, "//common/rust/shed/detect_eden:detect_eden"),
+                ],
+            },
+        },
+    },
     test_deps = [
         "fbsource//third-party/rust:assert_matches",
         "fbsource//third-party/rust:indoc",
diff --git a/app/buck2_client_ctx/Cargo.toml b/app/buck2_client_ctx/Cargo.toml
index de056aa487583..9b8a2eee968da 100644
--- a/app/buck2_client_ctx/Cargo.toml
+++ b/app/buck2_client_ctx/Cargo.toml
@@ -1,88 +1,87 @@
+# @generated by autocargo from //buck2/app/buck2_client_ctx:buck2_client_ctx
+
 [package]
-description = "Code supporting buck2 client commands"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_client_ctx"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-anyhow = { workspace = true }
-async-compression = { workspace = true }
-async-trait = { workspace = true }
-blake3 = { workspace = true }
-bytes = { workspace = true }
-chrono = { workspace = true }
-clap = { workspace = true }
-console = { workspace = true }
-crossterm = { workspace = true }
-csv = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-dupe = { workspace = true }
-fbinit = { workspace = true }
-fs4 = { workspace = true }
-futures = { workspace = true }
-gazebo = { workspace = true }
-hex = { workspace = true }
-httparse = { workspace = true }
-humantime = { workspace = true }
-itertools = { workspace = true }
-libc = { workspace = true }
-memmap2 = { workspace = true }
-object = { workspace = true }
-once_cell = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-rand = { workspace = true }
-regex = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-shlex = { workspace = true }
-strum = { workspace = true }
-superconsole = { version = "0.2.0", path = "../../superconsole" }
-sysinfo = { workspace = true }
-take_mut = { workspace = true }
-termwiz = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tokio-util = { workspace = true }
-tonic = { workspace = true }
-tracing = { workspace = true }
-
-games = { path = "../../games" }
+anyhow.workspace = true
+async-compression.workspace = true
+async-trait.workspace = true
+blake3.workspace = true
+buck2_build_info.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_event_log.workspace = true
+buck2_event_observer.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_health_check.workspace = true
+buck2_resource_control.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+bytes.workspace = true
+chrono.workspace = true
+clap.workspace = true
+console.workspace = true
+crossterm.workspace = true
+csv.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+fbinit.workspace = true
+fs4.workspace = true
+futures.workspace = true
+games.workspace = true
+gazebo.workspace = true
+hex.workspace = true
+httparse.workspace = true
+humantime.workspace = true
+itertools.workspace = true
+libc.workspace = true
+memmap2.workspace = true
+object.workspace = true
+once_cell.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+rand.workspace = true
+regex.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+shlex.workspace = true
+strum.workspace = true
+superconsole.workspace = true
+sysinfo.workspace = true
+take_mut.workspace = true
+termwiz.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
+tokio-util.workspace = true
+tonic.workspace = true
+tracing.workspace = true
 
-# Please do not add dependency on `buck2_build_api`.
-buck2_build_info = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_log = { workspace = true }
-buck2_event_observer = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_health_check = { workspace = true }
-buck2_resource_control = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
+[dev-dependencies]
+assert_matches.workspace = true
+indoc.workspace = true
+lsp-server.workspace = true
+pretty_assertions.workspace = true
+tempfile.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-termios = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+termios.workspace = true
 
-[target.'cfg(windows)'.dependencies]
-windows-sys = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+termios.workspace = true
 
-[dev-dependencies]
-assert_matches = { workspace = true }
-indoc = { workspace = true }
-lsp-server = { workspace = true }
-maplit = { workspace = true }
-pretty_assertions = { workspace = true }
-tempfile = { workspace = true }
+[target.'cfg(target_os = "windows")'.dependencies]
+windows-sys.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_cmd_audit_client/Cargo.toml b/app/buck2_cmd_audit_client/Cargo.toml
index 14cabdc0725ae..d9b5c61cc5469 100644
--- a/app/buck2_cmd_audit_client/Cargo.toml
+++ b/app/buck2_cmd_audit_client/Cargo.toml
@@ -1,18 +1,20 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_audit_client:buck2_cmd_audit_client
+
 [package]
-description = "Client side of `buck2 audit`"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_audit_client"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-clap = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-
-dupe = { workspace = true }
+async-trait.workspace = true
+buck2_cli_proto.workspace = true
+buck2_client_ctx.workspace = true
+clap.workspace = true
+dupe.workspace = true
+serde.workspace = true
+serde_json.workspace = true
 
-buck2_cli_proto = { workspace = true }
-buck2_client_ctx = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_cmd_audit_server/Cargo.toml b/app/buck2_cmd_audit_server/Cargo.toml
index e04f78caf6ccd..9441a37b14f92 100644
--- a/app/buck2_cmd_audit_server/Cargo.toml
+++ b/app/buck2_cmd_audit_server/Cargo.toml
@@ -1,42 +1,44 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_audit_server:buck2_cmd_audit_server
+
 [package]
-description = "Server side of `buck2 audit`"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_audit_server"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-derive_more = { workspace = true }
-futures = { workspace = true }
-indent_write = { workspace = true }
-itertools = { workspace = true }
-ref-cast = { workspace = true }
-regex = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-starlark_map = { workspace = true }
-
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
+async-trait.workspace = true
+buck2_analysis.workspace = true
+buck2_build_api.workspace = true
+buck2_cli_proto.workspace = true
+buck2_client_ctx.workspace = true
+buck2_cmd_audit_client.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_node.workspace = true
+buck2_query.workspace = true
+buck2_server_ctx.workspace = true
+buck2_util.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+indent_write.workspace = true
+itertools.workspace = true
+ref-cast.workspace = true
+regex.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+starlark_map.workspace = true
 
-buck2_analysis = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_cmd_audit_client = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_node = { workspace = true }
-buck2_query = { workspace = true }
-buck2_server_ctx = { workspace = true }
-buck2_util = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_cmd_completion_client/Cargo.toml b/app/buck2_cmd_completion_client/Cargo.toml
index 8025925470270..d6b71f08b584b 100644
--- a/app/buck2_cmd_completion_client/Cargo.toml
+++ b/app/buck2_cmd_completion_client/Cargo.toml
@@ -1,28 +1,28 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_completion_client:buck2_cmd_completion_client
+
 [package]
-description = "`buck2 completion` command client implementation"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_completion_client"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-clap = { workspace = true }
-clap_complete = { workspace = true }
-futures = { workspace = true }
-tokio = { workspace = true }
-
-buck2_cli_proto = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
+async-trait.workspace = true
+buck2_cli_proto.workspace = true
+buck2_client_ctx.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+clap.workspace = true
+clap_complete.workspace = true
+futures.workspace = true
+tokio.workspace = true
 
 [dev-dependencies]
-paste = { workspace = true }
+paste.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_cmd_debug_client/Cargo.toml b/app/buck2_cmd_debug_client/Cargo.toml
index 3ebd3d38671d9..331fc59181cb7 100644
--- a/app/buck2_cmd_debug_client/Cargo.toml
+++ b/app/buck2_cmd_debug_client/Cargo.toml
@@ -1,44 +1,45 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_debug_client:buck2_cmd_debug_client
+
 [package]
-description = "`buck2 debug` command client implementation"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_debug_client"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-chrono = { workspace = true }
-clap = { workspace = true }
-derive_more = { workspace = true }
-flate2 = { workspace = true }
-futures = { workspace = true }
-humantime = { workspace = true }
-lsp-types = { workspace = true }
-prost = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-tempfile = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tracing = { workspace = true }
-
-allocative = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_log = { workspace = true }
-buck2_event_observer = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_offline_archive = { workspace = true }
-buck2_wrapper_common = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_cli_proto.workspace = true
+buck2_client_ctx.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_event_log.workspace = true
+buck2_event_observer.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_offline_archive.workspace = true
+buck2_wrapper_common.workspace = true
+chrono.workspace = true
+clap.workspace = true
+const_format.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+flate2.workspace = true
+form_urlencoded.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+humantime.workspace = true
+prost.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tempfile.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
+tracing.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_cmd_docs_client/Cargo.toml b/app/buck2_cmd_docs_client/Cargo.toml
index 4f96082f2dbcf..ecceb76c55e28 100644
--- a/app/buck2_cmd_docs_client/Cargo.toml
+++ b/app/buck2_cmd_docs_client/Cargo.toml
@@ -1,19 +1,22 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_docs_client:buck2_cmd_docs_client
+
 [package]
-description = "`buck2 docs` command client implementation"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_docs_client"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-clap = { workspace = true }
-dupe = { workspace = true }
-termimad = { workspace = true }
+async-trait.workspace = true
+buck2_cli_proto.workspace = true
+buck2_client_ctx.workspace = true
+buck2_error.workspace = true
+buck2_query.workspace = true
+clap.workspace = true
+dupe.workspace = true
+regex.workspace = true
+termimad.workspace = true
 
-buck2_cli_proto = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_error = { workspace = true }
-buck2_query = { workspace = true }
-regex = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_cmd_docs_server/Cargo.toml b/app/buck2_cmd_docs_server/Cargo.toml
index e4e79781667c4..e8f9894a41ffc 100644
--- a/app/buck2_cmd_docs_server/Cargo.toml
+++ b/app/buck2_cmd_docs_server/Cargo.toml
@@ -1,28 +1,30 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_docs_server:buck2_cmd_docs_server
+
 [package]
-description = "`buck2 docs` command server implementation"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_docs_server"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-futures = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-starlark = { workspace = true }
+async-trait.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_server_ctx.workspace = true
+dice.workspace = true
+dupe.workspace = true
+futures.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+starlark.workspace = true
 
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_server_ctx = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_cmd_log_client/Cargo.toml b/app/buck2_cmd_log_client/Cargo.toml
index 5ec5596ca69a4..e0c9e08a77b55 100644
--- a/app/buck2_cmd_log_client/Cargo.toml
+++ b/app/buck2_cmd_log_client/Cargo.toml
@@ -1,46 +1,45 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_log_client:buck2_cmd_log_client
+
 [package]
-description = "`buck2 log` command client implementation"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_log_client"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-clap = { workspace = true }
-csv = { workspace = true }
-derive_more = { workspace = true }
-futures = { workspace = true }
-linked-hash-map = { workspace = true }
-prost-types = { workspace = true }
-regex = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-
-buck2_cli_proto = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_common = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_log = { workspace = true }
-buck2_event_observer = { workspace = true }
-buck2_events = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-
-superconsole = { version = "0.2.0", path = "../../superconsole" }
+async-trait.workspace = true
+buck2_cli_proto.workspace = true
+buck2_client_ctx.workspace = true
+buck2_common.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_event_log.workspace = true
+buck2_event_observer.workspace = true
+buck2_events.workspace = true
+buck2_hash.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+clap.workspace = true
+csv.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+linked-hash-map.workspace = true
+prost-types.workspace = true
+regex.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+superconsole.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
 
 [dev-dependencies]
-buck2_fs = { workspace = true }
-prost = { workspace = true }
-tempfile = { workspace = true }
-zstd = { workspace = true }
+buck2_fs.workspace = true
+prost.workspace = true
+tempfile.workspace = true
+zstd.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_cmd_query_server/Cargo.toml b/app/buck2_cmd_query_server/Cargo.toml
index d2038f33871d0..14f98de407a9f 100644
--- a/app/buck2_cmd_query_server/Cargo.toml
+++ b/app/buck2_cmd_query_server/Cargo.toml
@@ -1,40 +1,39 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_query_server:buck2_cmd_query_server
+
 [package]
-description = "Query server commands for Buck2"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_query_server"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-futures = { workspace = true }
-indent_write = { workspace = true }
-once_cell = { workspace = true }
-regex = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-starlark_map = { workspace = true }
-
-buck2_build_api = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_node = { workspace = true }
-buck2_profile = { workspace = true }
-buck2_query = { workspace = true }
-buck2_server_ctx = { workspace = true }
-buck2_util = { workspace = true }
+async-trait.workspace = true
+buck2_build_api.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_node.workspace = true
+buck2_profile.workspace = true
+buck2_query.workspace = true
+buck2_server_ctx.workspace = true
+buck2_util.workspace = true
+dice.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+indent_write.workspace = true
+once_cell.workspace = true
+regex.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+starlark_map.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_cmd_rage_client/Cargo.toml b/app/buck2_cmd_rage_client/Cargo.toml
index bd623197c4c37..ce0fa4adea917 100644
--- a/app/buck2_cmd_rage_client/Cargo.toml
+++ b/app/buck2_cmd_rage_client/Cargo.toml
@@ -1,41 +1,39 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_rage_client:buck2_cmd_rage_client
+
 [package]
-description = "`buck2 rage` command client implementation"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_rage_client"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-chrono = { workspace = true }
-clap = { workspace = true }
-derive_more = { workspace = true }
-dupe = { workspace = true }
-futures = { workspace = true }
-humantime = { workspace = true }
-prost-types = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true }
-tracing = { workspace = true }
-
-superconsole = { version = "0.2.0", path = "../../superconsole" }
-
-# Buck2 dependencies
-buck2_cli_proto = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_cmd_audit_client = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_log = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
+async-trait.workspace = true
+buck2_cli_proto.workspace = true
+buck2_client_ctx.workspace = true
+buck2_cmd_audit_client.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_event_log.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+chrono.workspace = true
+clap.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+futures.workspace = true
+humantime.workspace = true
+prost-types.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+superconsole.workspace = true
+tokio.workspace = true
+tracing.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_cmd_starlark_client/Cargo.toml b/app/buck2_cmd_starlark_client/Cargo.toml
index ee4edb55e54d1..af239a208d799 100644
--- a/app/buck2_cmd_starlark_client/Cargo.toml
+++ b/app/buck2_cmd_starlark_client/Cargo.toml
@@ -1,24 +1,27 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_starlark_client:buck2_cmd_starlark_client
+
 [package]
-description = "`buck2 starlark` command client implementation"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_starlark_client"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-clap = { workspace = true }
-debugserver-types = { workspace = true }
-futures = { workspace = true }
-once_cell = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
+async-trait.workspace = true
+buck2_cli_proto.workspace = true
+buck2_client_ctx.workspace = true
+buck2_common.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_event_observer.workspace = true
+buck2_events.workspace = true
+clap.workspace = true
+debugserver-types.workspace = true
+futures.workspace = true
+once_cell.workspace = true
+serde.workspace = true
+serde_json.workspace = true
 
-buck2_cli_proto = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_common = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_observer = { workspace = true }
-buck2_events = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_cmd_starlark_server/Cargo.toml b/app/buck2_cmd_starlark_server/Cargo.toml
index 641ece6abce8e..9e02287339c25 100644
--- a/app/buck2_cmd_starlark_server/Cargo.toml
+++ b/app/buck2_cmd_starlark_server/Cargo.toml
@@ -1,29 +1,32 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_starlark_server:buck2_cmd_starlark_server
+
 [package]
-description = "`buck2 starlark` command server implementation"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_starlark_server"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-recursion = { workspace = true }
-async-trait = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-serde_json = { workspace = true }
-starlark = { workspace = true }
+async-recursion.workspace = true
+async-trait.workspace = true
+buck2_cli_proto.workspace = true
+buck2_client_ctx.workspace = true
+buck2_cmd_starlark_client.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_server_ctx.workspace = true
+dice.workspace = true
+dupe.workspace = true
+serde_json.workspace = true
+starlark.workspace = true
 
-buck2_cli_proto = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_cmd_starlark_client = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_server_ctx = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_cmd_targets_server/Cargo.toml b/app/buck2_cmd_targets_server/Cargo.toml
index bef8b7e25adca..1044afcec13f7 100644
--- a/app/buck2_cmd_targets_server/Cargo.toml
+++ b/app/buck2_cmd_targets_server/Cargo.toml
@@ -1,47 +1,46 @@
+# @generated by autocargo from //buck2/app/buck2_cmd_targets_server:buck2_cmd_targets_server
+
 [package]
-description = "Implementation of Buck2 targets command"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_cmd_targets_server"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-recursion = { workspace = true }
-async-trait = { workspace = true }
-blake3 = { workspace = true }
-derive_more = { workspace = true }
-flate2 = { workspace = true }
-futures = { workspace = true }
-itertools = { workspace = true }
-os_str_bytes = { workspace = true }
-regex = { workspace = true }
-serde_json = { workspace = true }
-siphasher = { workspace = true }
-tokio = { workspace = true }
-zstd = { workspace = true }
-
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-starlark_map = { workspace = true }
-
-buck2_artifact = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_node = { workspace = true }
-buck2_query = { workspace = true }
-buck2_server_ctx = { workspace = true }
-buck2_util = { workspace = true }
-dice_futures = { workspace = true }
+async-recursion.workspace = true
+async-trait.workspace = true
+blake3.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_execute.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_node.workspace = true
+buck2_query.workspace = true
+buck2_server_ctx.workspace = true
+buck2_util.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+flate2.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+itertools.workspace = true
+os_str_bytes.workspace = true
+regex.workspace = true
+serde_json.workspace = true
+siphasher.workspace = true
+starlark_map.workspace = true
+tokio.workspace = true
+zstd.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_common/BUCK b/app/buck2_common/BUCK
index 30eebfb474fd7..d21fddb6fbbca 100644
--- a/app/buck2_common/BUCK
+++ b/app/buck2_common/BUCK
@@ -7,6 +7,23 @@ rust_library(
     srcs = glob(
         ["src/**/*.rs"],
     ),
+    autocargo = {
+        "cargo_toml_config": {
+            "dependencies_override": {
+                "dependencies": {
+                    "fbinit": {
+                        "path": None,
+                        "version": "0.2",
+                    },
+                },
+            },
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    (None, "//common/rust/shed/hostcaps:hostcaps"),
+                ],
+            },
+        },
+    },
     test_deps = [
         "fbsource//third-party/rust:assert_matches",
         "fbsource//third-party/rust:indoc",
diff --git a/app/buck2_common/Cargo.toml b/app/buck2_common/Cargo.toml
index 78bcdbb705e21..c5361864a53f7 100644
--- a/app/buck2_common/Cargo.toml
+++ b/app/buck2_common/Cargo.toml
@@ -1,81 +1,85 @@
+# @generated by autocargo from //buck2/app/buck2_common:buck2_common
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_common"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-scoped = { workspace = true }
-async-trait = { workspace = true }
-blake3 = { workspace = true }
-bytes = { workspace = true }
-chrono = { workspace = true }
-compact_str = { workspace = true }
-dashmap = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-digest = { workspace = true }
-dirs = { workspace = true }
-fbinit = { workspace = true }
-fs4 = { workspace = true }
-futures = { workspace = true }
-globset = { workspace = true }
-hex = { workspace = true }
-hyper = { workspace = true }
-indexmap = { workspace = true }
-itertools = { workspace = true }
-num_enum = { workspace = true }
-once_cell = { workspace = true }
-parking_lot = { workspace = true }
-prost-types = { workspace = true }
-rand = { workspace = true }
-ref-cast = { workspace = true }
-regex = { workspace = true }
-rusqlite = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-sha1 = { workspace = true }
-sha2 = { workspace = true }
-smallvec = { workspace = true }
-strsim = { workspace = true }
-tokio = { workspace = true }
-tonic = { workspace = true }
-tracing = { workspace = true }
-triomphe = { workspace = true }
-
-allocative = { workspace = true }
-cmp_any = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-starlark_map = { workspace = true }
-static_interner = { workspace = true }
+allocative.workspace = true
+async-scoped.workspace = true
+async-trait.workspace = true
+blake3.workspace = true
+buck2_cli_proto.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_http.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+bytes.workspace = true
+chrono.workspace = true
+cmp_any.workspace = true
+compact_str.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+digest.workspace = true
+dirs.workspace = true
+dupe.workspace = true
+fbinit.workspace = true
+fs4.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+globset.workspace = true
+hex.workspace = true
+hyper.workspace = true
+itertools.workspace = true
+num_enum.workspace = true
+once_cell.workspace = true
+pagable.workspace = true
+parking_lot.workspace = true
+prost-types.workspace = true
+rand.workspace = true
+ref-cast.workspace = true
+regex.workspace = true
+rusqlite.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+sha1.workspace = true
+sha2.workspace = true
+smallvec.workspace = true
+starlark_map.workspace = true
+static_interner.workspace = true
+strsim.workspace = true
+tokio.workspace = true
+tonic.workspace = true
+tracing.workspace = true
 
-buck2_cli_proto = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_http = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
-dice_futures = { workspace = true }
+[dev-dependencies]
+assert_matches.workspace = true
+indoc.workspace = true
+tempfile.workspace = true
+test-case.workspace = true
+triomphe.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-hyper-util = { workspace = true }
-nix = { workspace = true }
-tower = { workspace = true }
-xattr = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+hyper-util.workspace = true
+nix.workspace = true
+tower.workspace = true
+xattr.workspace = true
 
-[dev-dependencies]
-assert_matches = { workspace = true }
-indoc = { workspace = true }
-tempfile = { workspace = true }
-test-case = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+hyper-util.workspace = true
+nix.workspace = true
+tower.workspace = true
+xattr.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_configured/Cargo.toml b/app/buck2_configured/Cargo.toml
index 58c92d76f4565..178d9800fef4c 100644
--- a/app/buck2_configured/Cargo.toml
+++ b/app/buck2_configured/Cargo.toml
@@ -1,29 +1,32 @@
+# @generated by autocargo from //buck2/app/buck2_configured:buck2_configured
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_configured"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-derive_more = { workspace = true }
-futures = { workspace = true }
-itertools = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-ref-cast = { workspace = true }
-starlark_map = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_build_api.workspace = true
+buck2_build_signals.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_node.workspace = true
+buck2_util.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+itertools.workspace = true
+pagable.workspace = true
+ref-cast.workspace = true
+starlark_map.workspace = true
 
-buck2_build_api = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_node = { workspace = true }
-buck2_util = { workspace = true }
-dice_futures = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_core/Cargo.toml b/app/buck2_core/Cargo.toml
index b3b77819afd53..6b3bf64c89173 100644
--- a/app/buck2_core/Cargo.toml
+++ b/app/buck2_core/Cargo.toml
@@ -1,61 +1,61 @@
+# @generated by autocargo from //buck2/app/buck2_core:[buck2_core,soft_error]
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_core"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-blake3 = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-equivalent = { workspace = true }
-futures = { workspace = true }
-hex = { workspace = true }
-hostname = { workspace = true }
-indent_write = { workspace = true }
-itertools = { workspace = true }
-memchr = { workspace = true }
-once_cell = { workspace = true }
-os_str_bytes = { workspace = true }
-pagable = { workspace = true }
-pin-project = { workspace = true }
-rand = { workspace = true }
-ref-cast = { workspace = true }
-regex = { workspace = true }
-sequence_trie = { workspace = true }
-serde = { workspace = true }
-smallvec = { workspace = true }
-starlark_map = { workspace = true, features = ["pagable_dep"] }
-static_assertions = { workspace = true }
-strong_hash = { workspace = true }
-tempfile = { workspace = true }
-tokio = { workspace = true }
-tracing = { workspace = true }
-tracing-subscriber = { workspace = true }
-triomphe = { workspace = true }
-
-allocative = { workspace = true }
-cmp_any = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-lock_free_hashtable = { workspace = true }
-static_interner = { workspace = true }
-
-buck2_data = { workspace = true }
-buck2_env = { workspace = true }
-buck2_error = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_util = { workspace = true }
-
-[target.'cfg(windows)'.dependencies]
-common-path = { workspace = true }
+allocative.workspace = true
+blake3.workspace = true
+buck2_data.workspace = true
+buck2_env.workspace = true
+buck2_error.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_util.workspace = true
+cmp_any.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+equivalent.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+hex.workspace = true
+hostname.workspace = true
+indent_write.workspace = true
+itertools.workspace = true
+lock_free_hashtable.workspace = true
+memchr.workspace = true
+once_cell.workspace = true
+os_str_bytes.workspace = true
+pagable.workspace = true
+pin-project.workspace = true
+rand.workspace = true
+ref-cast.workspace = true
+regex.workspace = true
+sequence_trie.workspace = true
+serde.workspace = true
+smallvec.workspace = true
+starlark_map.workspace = true
+static_assertions.workspace = true
+static_interner.workspace = true
+strong_hash.workspace = true
+tempfile.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+triomphe.workspace = true
 
 [dev-dependencies]
-assert_matches = { workspace = true }
-serde_json = { workspace = true }
-test-case = { workspace = true }
+assert_matches.workspace = true
+serde_json.workspace = true
+test-case.workspace = true
+
+[target.'cfg(target_os = "windows")'.dependencies]
+common-path.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_critical_path/Cargo.toml b/app/buck2_critical_path/Cargo.toml
index 7377cba77a221..1e93621046ecb 100644
--- a/app/buck2_critical_path/Cargo.toml
+++ b/app/buck2_critical_path/Cargo.toml
@@ -1,20 +1,22 @@
+# @generated by autocargo from //buck2/app/buck2_critical_path:buck2_critical_path
+
 [package]
-authors = ["Meta"]
-description = "Critical path calculations for Buck2"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_critical_path"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-crossbeam = { workspace = true }
-derive_more = { workspace = true }
-starlark_map = { workspace = true }
-
-buck2_error = { workspace = true }
+buck2_error.workspace = true
+crossbeam.workspace = true
+derive_more.workspace = true
+starlark_map.workspace = true
 
 [dev-dependencies]
-rand = { workspace = true }
-rand_chacha = { workspace = true }
-rand_distr = { workspace = true }
+rand.workspace = true
+rand_chacha.workspace = true
+rand_distr.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_daemon/Cargo.toml b/app/buck2_daemon/Cargo.toml
index 1515969d58764..76d1d343dae94 100644
--- a/app/buck2_daemon/Cargo.toml
+++ b/app/buck2_daemon/Cargo.toml
@@ -1,42 +1,45 @@
+# @generated by autocargo from //buck2/app/buck2_daemon:buck2_daemon
+
 [package]
-description = ""
-edition = "2024"
 name = "buck2_daemon"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-clap = { workspace = true }
-futures = { workspace = true }
-libc = { workspace = true }
-rand = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tracing = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
+allocative.workspace = true
+buck2_cli_proto.workspace = true
+buck2_client_ctx.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_resource_control.workspace = true
+buck2_server.workspace = true
+buck2_util.workspace = true
+clap.workspace = true
+dice.workspace = true
+dupe.workspace = true
+futures.workspace = true
+libc.workspace = true
+rand.workspace = true
+serde_json.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
+tracing.workspace = true
 
-buck2_cli_proto = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_resource_control = { workspace = true }
-buck2_server = { workspace = true }
-buck2_util = { workspace = true }
+[dev-dependencies]
+buck2_certs.workspace = true
+fbinit.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-nix = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+nix.workspace = true
 
-[dev-dependencies]
-buck2_certs = { workspace = true }
-fbinit = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+nix.workspace = true
 
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ["cfg(buck_build)", "cfg(client_only)", "cfg(fbcode_build)"] }
+[lints]
+workspace = true
diff --git a/app/buck2_data/Cargo.toml b/app/buck2_data/Cargo.toml
index 46ede9fd7b5a2..e2b20f5f83b2c 100644
--- a/app/buck2_data/Cargo.toml
+++ b/app/buck2_data/Cargo.toml
@@ -1,24 +1,28 @@
+# @generated by autocargo from //buck2/app/buck2_data:buck2_data
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_data"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-buck2_host_sharing_proto = { workspace = true }
-derive_more = { workspace = true }
-hex = { workspace = true }
-pagable = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-serde = { workspace = true }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
-
-dupe = { workspace = true }
-gazebo = { workspace = true }
+allocative.workspace = true
+buck2_host_sharing_proto.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+gazebo.workspace = true
+hex.workspace = true
+pagable.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+serde.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_directory/Cargo.toml b/app/buck2_directory/Cargo.toml
index db6c3d3007471..00d36c7435b40 100644
--- a/app/buck2_directory/Cargo.toml
+++ b/app/buck2_directory/Cargo.toml
@@ -1,28 +1,30 @@
+# @generated by autocargo from //buck2/app/buck2_directory:buck2_directory
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_directory"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-dashmap = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-either = { workspace = true }
-
-allocative = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-sorted_vector_map = { workspace = true }
-starlark_map = { workspace = true }
-
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_util = { workspace = true }
+allocative.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+dashmap.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+either.workspace = true
+gazebo.workspace = true
+pagable.workspace = true
+sorted_vector_map.workspace = true
+starlark_map.workspace = true
 
 [dev-dependencies]
-assert_matches = "1.5"
+assert_matches.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_downward_api/Cargo.toml b/app/buck2_downward_api/Cargo.toml
index 6a03d05cb0896..27f5732f1f845 100644
--- a/app/buck2_downward_api/Cargo.toml
+++ b/app/buck2_downward_api/Cargo.toml
@@ -1,12 +1,17 @@
+# @generated by autocargo from //buck2/app/buck2_downward_api:buck2_downward_api
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_downward_api"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-buck2_error = { workspace = true }
-buck2_hash = { workspace = true }
-tracing = { workspace = true }
+async-trait.workspace = true
+buck2_error.workspace = true
+buck2_hash.workspace = true
+tracing.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_downward_api_proto/Cargo.toml b/app/buck2_downward_api_proto/Cargo.toml
index e8bffc100a4d2..c710206c4a5e3 100644
--- a/app/buck2_downward_api_proto/Cargo.toml
+++ b/app/buck2_downward_api_proto/Cargo.toml
@@ -1,18 +1,22 @@
+# @generated by autocargo from //buck2/app/buck2_downward_api_proto:buck2_downward_api_proto
+
 [package]
 name = "buck2_downward_api_proto"
-
-edition = "2024"
-license = { workspace = true }
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-buck2_error = { workspace = true }
-buck2_hash = { workspace = true }
-prost = { workspace = true }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
-tracing = { workspace = true }
+buck2_error.workspace = true
+buck2_hash.workspace = true
+prost.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
+tracing.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_eden/BUCK b/app/buck2_eden/BUCK
index 073de964c57be..89e7c168e7a0c 100644
--- a/app/buck2_eden/BUCK
+++ b/app/buck2_eden/BUCK
@@ -5,6 +5,7 @@ oncall("build_infra")
 rust_library(
     name = "buck2_eden",
     srcs = glob(["src/**/*.rs"]),
+    autocargo = {"ignore_rule": True},
     named_deps = {
         # @oss-disable[end= ]: "edenfs": "//eden/fs/service:thrift-rust",
         # @oss-disable[end= ]: "edenfs_clients": "//eden/fs/service:thrift-rust-clients",
diff --git a/app/buck2_env/Cargo.toml b/app/buck2_env/Cargo.toml
index 3780aef60d2d2..8f41fefac6a1e 100644
--- a/app/buck2_env/Cargo.toml
+++ b/app/buck2_env/Cargo.toml
@@ -1,23 +1,23 @@
+# @generated by autocargo from //buck2/app/buck2_env:buck2_env
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_env"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-arc-swap = { workspace = true }
-linkme = { workspace = true }
-once_cell = { workspace = true }
-starlark_map = { workspace = true }
-tracing = { workspace = true }
-
-dupe = { workspace = true }
-
-buck2_error = { workspace = true }
+arc-swap.workspace = true
+buck2_error.workspace = true
+dupe.workspace = true
+linkme.workspace = true
+once_cell.workspace = true
+starlark_map.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
-assert_matches = { workspace = true }
+assert_matches.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_error/BUCK b/app/buck2_error/BUCK
index c61c8ca36bf8c..bb9bb3857ba65 100644
--- a/app/buck2_error/BUCK
+++ b/app/buck2_error/BUCK
@@ -7,6 +7,24 @@ rust_library(
     srcs = glob(
         ["src/**/*.rs"],
     ),
+    autocargo = {
+        "cargo_toml_config": {
+            "dependencies_override": {
+                "dependencies": {
+                    "watchman_client": {
+                        "path": None,
+                        "version": "0.9.0",
+                    },
+                },
+            },
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    (None, "//eden/fs/service:thrift-rust-clients"),
+                    (None, "//thrift/lib/rust:fbthrift"),
+                ],
+            },
+        },
+    },
     named_deps = {
         # @oss-disable[end= ]: "edenfs_clients": "//eden/fs/service:thrift-rust-clients",
     },
diff --git a/app/buck2_error/Cargo.toml b/app/buck2_error/Cargo.toml
index fd1e2e82cd7e3..35632a32f2685 100644
--- a/app/buck2_error/Cargo.toml
+++ b/app/buck2_error/Cargo.toml
@@ -1,54 +1,51 @@
+# @generated by autocargo from //buck2/app/buck2_error:buck2_error
+
 [package]
-description = """
-Library providing an `anyhow` inspired error type for buck2
-"""
-edition = "2024"
-license = { workspace = true }
 name = "buck2_error"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-anyhow = { workspace = true }
-clap = { workspace = true }
-derive_more = { workspace = true }
-either = { workspace = true }
-fancy-regex = { workspace = true }
-hex = { workspace = true }
-http = { workspace = true }
-hyper = { workspace = true }
-hyper-util = { workspace = true }
-libc = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-ref-cast = { workspace = true }
-regex = { workspace = true }
-rusqlite = { workspace = true }
-rustls-native-certs = { workspace = true }
-rustls-pki-types = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-smallvec = { workspace = true }
-thiserror = { workspace = true }
-tokio = { workspace = true }
-toml = { workspace = true }
-tonic = { workspace = true }
-uuid = { workspace = true }
-
-allocative = { workspace = true }
-dice_error = { workspace = true }
-dupe = { workspace = true }
-superconsole = { version = "0.2.0", path = "../../superconsole" }
-# @oss-disable: watchman_client.path = "../../../watchman/rust/watchman_client"
-watchman_client.version = "0.9.0"
-
-buck2_data = { workspace = true }
-buck2_error_derive = { workspace = true }
+allocative.workspace = true
+anyhow.workspace = true
+buck2_data.workspace = true
+buck2_error_derive.workspace = true
+clap.workspace = true
+derive_more.workspace = true
+dice_error.workspace = true
+dupe.workspace = true
+fancy-regex.workspace = true
+hex.workspace = true
+http.workspace = true
+hyper.workspace = true
+hyper-util.workspace = true
+libc.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+ref-cast.workspace = true
+regex.workspace = true
+rusqlite.workspace = true
+rustls-native-certs.workspace = true
+rustls-pki-types.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+smallvec.workspace = true
+starlark_syntax.workspace = true
+superconsole.workspace = true
+thiserror.workspace = true
+tokio.workspace = true
+toml.workspace = true
+tonic.workspace = true
+uuid.workspace = true
+watchman_client.workspace = true
 
-starlark_syntax = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+nix.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-nix = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+nix.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_error_derive/Cargo.toml b/app/buck2_error_derive/Cargo.toml
index 2b7129dd084ca..ae8cccc94e47a 100644
--- a/app/buck2_error_derive/Cargo.toml
+++ b/app/buck2_error_derive/Cargo.toml
@@ -1,17 +1,21 @@
+# @generated by autocargo from //buck2/app/buck2_error_derive:buck2_error_derive
+
 [package]
-description = """
-Fork of thiserror used by buck2_error
-"""
-edition = "2024"
-license = { workspace = true }
 name = "buck2_error_derive"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [lib]
+test = false
+doctest = false
 proc-macro = true
 
 [dependencies]
-proc-macro2 = { workspace = true }
-quote = { workspace = true }
-syn = { workspace = true }
+proc-macro2.workspace = true
+quote.workspace = true
+syn.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_error_tests/Cargo.toml b/app/buck2_error_tests/Cargo.toml
index b75c2ab4673fb..eb62956680ae5 100644
--- a/app/buck2_error_tests/Cargo.toml
+++ b/app/buck2_error_tests/Cargo.toml
@@ -1,16 +1,22 @@
+# @generated by autocargo from //buck2/app/buck2_error_tests:buck2_error_tests
+
 [package]
-description = "Tests for buck2_error"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_error_tests"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
+autolib = false
 
-[dev-dependencies]
-anyhow = { workspace = true }
+[[test]]
+name = "buck2_error_tests"
+path = "src/lib.rs"
 
-starlark = { workspace = true }
-starlark_syntax = { workspace = true }
+[dev-dependencies]
+anyhow.workspace = true
+buck2_error.workspace = true
+buck2_util.workspace = true
+starlark.workspace = true
 
-buck2_error = { workspace = true }
-buck2_util = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_errorformat/Cargo.toml b/app/buck2_errorformat/Cargo.toml
index 6b7002751b93e..b42ec44df2509 100644
--- a/app/buck2_errorformat/Cargo.toml
+++ b/app/buck2_errorformat/Cargo.toml
@@ -1,13 +1,17 @@
+# @generated by autocargo from //buck2/app/buck2_errorformat:buck2_errorformat
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_errorformat"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-fancy-regex = { workspace = true }
-nom = { workspace = true }
-tracing = { workspace = true }
+buck2_error.workspace = true
+fancy-regex.workspace = true
+nom.workspace = true
+tracing.workspace = true
 
-buck2_error = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_event_log/Cargo.toml b/app/buck2_event_log/Cargo.toml
index f189b92f9e664..4447dd8988c30 100644
--- a/app/buck2_event_log/Cargo.toml
+++ b/app/buck2_event_log/Cargo.toml
@@ -1,46 +1,46 @@
+# @generated by autocargo from //buck2/app/buck2_event_log:buck2_event_log
+
 [package]
-description = "Code supporting buck2 event log handling"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_event_log"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-async-compression = { workspace = true }
-chrono = { workspace = true }
-dupe = { workspace = true }
-futures = { workspace = true }
-gazebo = { workspace = true }
-itertools = { workspace = true }
-pin-project = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-regex = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-shlex = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tokio-util = { workspace = true }
-tracing = { workspace = true }
-
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_observer = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
+allocative.workspace = true
+async-compression.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_event_observer.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+chrono.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+itertools.workspace = true
+pin-project.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+regex.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+shlex.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
+tokio-util.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
-buck2_hash = { workspace = true }
-maplit = { workspace = true }
-tempfile = { workspace = true }
+buck2_hash.workspace = true
+maplit.workspace = true
+tempfile.workspace = true
 
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ["cfg(tokio_unstable)"] }
+[lints]
+workspace = true
diff --git a/app/buck2_event_observer/Cargo.toml b/app/buck2_event_observer/Cargo.toml
index 45507f6a246b9..88777588439c6 100644
--- a/app/buck2_event_observer/Cargo.toml
+++ b/app/buck2_event_observer/Cargo.toml
@@ -1,35 +1,38 @@
+# @generated by autocargo from //buck2/app/buck2_event_observer:buck2_event_observer
+
 [package]
-description = "utilities to interpret the buck2 event stream"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_event_observer"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-starlark_map = { workspace = true }
-
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_test_api = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
-clap = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-linked-hash-map = { workspace = true }
-prost-types = { workspace = true }
-regex = { workspace = true }
-shlex = { workspace = true }
-superconsole = { version = "0.2.0", path = "../../superconsole" }
-termwiz = { workspace = true }
-tracing = { workspace = true }
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_hash.workspace = true
+buck2_test_api.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+clap.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+gazebo.workspace = true
+linked-hash-map.workspace = true
+prost-types.workspace = true
+regex.workspace = true
+shlex.workspace = true
+starlark_map.workspace = true
+superconsole.workspace = true
+termwiz.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
-assert_matches = { workspace = true }
+assert_matches.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_events/BUCK b/app/buck2_events/BUCK
index 8a1f2f2c1751b..65bc9d08bae42 100644
--- a/app/buck2_events/BUCK
+++ b/app/buck2_events/BUCK
@@ -7,6 +7,23 @@ rust_library(
     srcs = glob(
         ["src/**/*.rs"],
     ),
+    autocargo = {
+        "cargo_toml_config": {
+            "dependencies_override": {
+                "dependencies": {
+                    "fbinit": {
+                        "path": None,
+                        "version": "0.2",
+                    },
+                },
+            },
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    (None, "//common/rust/shed/hostcaps:hostcaps"),
+                ],
+            },
+        },
+    },
     test_deps = ["fbsource//third-party/rust:tokio"],
     deps = [
         "fbsource//third-party/rust:async-trait",
diff --git a/app/buck2_events/Cargo.toml b/app/buck2_events/Cargo.toml
index b9739286511f0..fde4b2204ec1c 100644
--- a/app/buck2_events/Cargo.toml
+++ b/app/buck2_events/Cargo.toml
@@ -1,41 +1,48 @@
+# @generated by autocargo from //buck2/app/buck2_events:buck2_events
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_events"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-console = { workspace = true }
-crossbeam-channel = { workspace = true }
-derive_more = { workspace = true }
-futures = { workspace = true }
-hostname = { workspace = true }
-is_proc_translated = { workspace = true }
-pin-project = { workspace = true }
-serde = { workspace = true }
-smallvec = { workspace = true }
-sys-info = { workspace = true }
-tokio = { workspace = true }
-uuid = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_build_info.workspace = true
+buck2_cli_proto.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_hash.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+console.workspace = true
+crossbeam-channel.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+fbinit.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+hostname.workspace = true
+is_proc_translated.workspace = true
+pin-project.workspace = true
+prost.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+smallvec.workspace = true
+tokio.workspace = true
+uuid.workspace = true
 
-allocative = { workspace = true }
-dupe = { workspace = true }
-fbinit = { workspace = true }
-gazebo = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+sys-info.workspace = true
 
-buck2_build_info = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+sys-info.workspace = true
 
-[target."cfg(windows)".dependencies]
-winver = "1"
+[target.'cfg(target_os = "windows")'.dependencies]
+winver.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_execute/BUCK b/app/buck2_execute/BUCK
index 74ff80b49e45e..ebdb3cc0e2a03 100644
--- a/app/buck2_execute/BUCK
+++ b/app/buck2_execute/BUCK
@@ -7,6 +7,26 @@ rust_library(
     srcs = glob(
         ["src/**/*.rs"],
     ),
+    # `//buck2/remote_execution:remote_execution` is an alias selecting between
+    # the internal and OSS impls; autocargo doesn't follow aliases, so point at
+    # the OSS rust_library directly for cargo's sake.
+    autocargo = {
+        "cargo_toml_config": {
+            "dependencies_override": {
+                "dependencies": {
+                    "fbinit": {
+                        "path": None,
+                        "version": "0.2",
+                    },
+                },
+            },
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    "fbcode//buck2/remote_execution/oss/re_grpc:remote_execution",
+                ],
+            },
+        },
+    },
     test_deps = [
         "fbsource//third-party/rust:assert_matches",
         "fbsource//third-party/rust:prost-types",
diff --git a/app/buck2_execute/Cargo.toml b/app/buck2_execute/Cargo.toml
index d5efbafd9d5d4..e6e5e8a744272 100644
--- a/app/buck2_execute/Cargo.toml
+++ b/app/buck2_execute/Cargo.toml
@@ -1,78 +1,78 @@
+# @generated by autocargo from //buck2/app/buck2_execute:buck2_execute
+
 [package]
-description = "Remote-execution support for Buck"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_execute"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-anyhow = { workspace = true }
-async-recursion = { workspace = true }
-async-trait = { workspace = true }
-bytes = { workspace = true }
-chrono = { workspace = true }
-crossbeam-channel = { workspace = true }
-ctor = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-digest = { workspace = true }
-either = { workspace = true }
-faccess = { workspace = true }
-futures = { workspace = true }
-hex = { workspace = true }
-http = { workspace = true }
-hyper = { workspace = true }
-itertools = { workspace = true }
-once_cell = { workspace = true }
-pathdiff = { workspace = true }
-prost = { workspace = true }
-ref-cast = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-sha1 = { workspace = true }
-sha2 = { workspace = true }
-smallvec = { workspace = true }
-tokio = { workspace = true }
-tokio-util = { workspace = true }
-tracing = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-fbinit = { workspace = true }
-gazebo = { workspace = true }
-host_sharing = { workspace = true }
-pagable = { workspace = true }
-remote_execution = { workspace = true }
-sorted_vector_map = { workspace = true }
-starlark_map = { workspace = true }
-static_interner = { workspace = true }
-strong_hash = { workspace = true }
-
-buck2_action_metadata_proto = { workspace = true }
-buck2_build_info = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_directory = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_http = { workspace = true }
-buck2_miniperf_proto = { workspace = true }
-buck2_re_configuration = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
-dice_futures = { workspace = true }
+allocative.workspace = true
+anyhow.workspace = true
+async-recursion.workspace = true
+async-trait.workspace = true
+buck2_action_metadata_proto.workspace = true
+buck2_build_info.workspace = true
+buck2_build_signals.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_directory.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_http.workspace = true
+buck2_miniperf_proto.workspace = true
+buck2_re_configuration.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+bytes.workspace = true
+chrono.workspace = true
+crossbeam-channel.workspace = true
+ctor.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+digest.workspace = true
+dupe.workspace = true
+either.workspace = true
+faccess.workspace = true
+fbinit.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+hex.workspace = true
+host_sharing.workspace = true
+http.workspace = true
+hyper.workspace = true
+itertools.workspace = true
+once_cell.workspace = true
+pagable.workspace = true
+pathdiff.workspace = true
+prost.workspace = true
+ref-cast.workspace = true
+remote_execution.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+sha1.workspace = true
+sha2.workspace = true
+slog.workspace = true
+smallvec.workspace = true
+sorted_vector_map.workspace = true
+starlark_map.workspace = true
+static_interner.workspace = true
+strong_hash.workspace = true
+tokio.workspace = true
+tokio-util.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
-assert_matches = { workspace = true }
-prost-types = { workspace = true }
-tempfile = { workspace = true }
+assert_matches.workspace = true
+prost-types.workspace = true
+tempfile.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_execute_impl/BUCK b/app/buck2_execute_impl/BUCK
index 81324c400bc0f..1be989e0325f8 100644
--- a/app/buck2_execute_impl/BUCK
+++ b/app/buck2_execute_impl/BUCK
@@ -7,6 +7,21 @@ rust_library(
     srcs = glob(
         ["src/**/*.rs"],
     ),
+    # `//buck2/remote_execution:remote_execution` is an alias selecting between
+    # the internal and OSS impls; autocargo doesn't follow aliases, so point at
+    # the OSS rust_library directly for cargo's sake.
+    autocargo = {
+        "cargo_toml_config": {
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    "fbcode//buck2/remote_execution/oss/re_grpc:remote_execution",
+                ],
+                "target": {
+                    "'cfg(target_os = \"linux\")'": {"dependencies": [(None, "//common/rust/shed/hostcaps:hostcaps")]},
+                },
+            },
+        },
+    },
     test_deps = [
         "fbsource//third-party/rust:assert_matches",
     ],
diff --git a/app/buck2_execute_impl/Cargo.toml b/app/buck2_execute_impl/Cargo.toml
index 138c1e3499452..63e4b302e0b8c 100644
--- a/app/buck2_execute_impl/Cargo.toml
+++ b/app/buck2_execute_impl/Cargo.toml
@@ -1,67 +1,69 @@
+# @generated by autocargo from //buck2/app/buck2_execute_impl:buck2_execute_impl
+
 [package]
-description = "Implementations of executors and materializers"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_execute_impl"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-condvar-fair = { workspace = true }
-async-trait = { workspace = true }
-chrono = { workspace = true }
-dashmap = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-dupe = { workspace = true }
-futures = { workspace = true }
-gazebo = { workspace = true }
-host_sharing = { workspace = true }
-indexmap = { workspace = true }
-itertools = { workspace = true }
-once_cell = { workspace = true }
-parking_lot = { workspace = true }
-pin-project = { workspace = true }
-prost = { workspace = true }
-regex = { workspace = true }
-remote_execution = { workspace = true }
-rusqlite = { workspace = true }
-starlark_map = { workspace = true }
-tokio = { workspace = true }
-tokio-retry = "0.3"
-tokio-stream = { workspace = true }
-tonic = { workspace = true }
-tracing = { workspace = true }
-zstd = { workspace = true }
-
-allocative = { workspace = true }
+allocative.workspace = true
+async-condvar-fair.workspace = true
+async-trait.workspace = true
+buck2_action_metadata_proto.workspace = true
+buck2_build_signals.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_directory.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_execute_local.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_http.workspace = true
+buck2_resource_control.workspace = true
+buck2_util.workspace = true
+buck2_worker_proto.workspace = true
+buck2_wrapper_common.workspace = true
+chrono.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+host_sharing.workspace = true
+hostname.workspace = true
+itertools.workspace = true
+once_cell.workspace = true
+parking_lot.workspace = true
+pin-project.workspace = true
+prost.workspace = true
+regex.workspace = true
+remote_execution.workspace = true
+rusqlite.workspace = true
+starlark_map.workspace = true
+tokio.workspace = true
+tokio-retry.workspace = true
+tokio-stream.workspace = true
+tonic.workspace = true
+tracing.workspace = true
+zstd.workspace = true
 
-buck2_action_metadata_proto = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_directory = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_execute_local = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_http = { workspace = true }
-buck2_resource_control = { workspace = true }
-buck2_util = { workspace = true }
-buck2_worker_proto = { workspace = true }
-buck2_wrapper_common = { workspace = true }
-dice_futures = { workspace = true }
+[dev-dependencies]
+assert_matches.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-buck2_forkserver = { workspace = true }
-buck2_forkserver_proto = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+buck2_forkserver.workspace = true
+buck2_forkserver_proto.workspace = true
 
-[dev-dependencies]
-assert_matches = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+buck2_forkserver.workspace = true
+buck2_forkserver_proto.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_execute_local/Cargo.toml b/app/buck2_execute_local/Cargo.toml
index ee0c73e8b6eeb..e1c6b5f443290 100644
--- a/app/buck2_execute_local/Cargo.toml
+++ b/app/buck2_execute_local/Cargo.toml
@@ -1,45 +1,48 @@
+# @generated by autocargo from //buck2/app/buck2_execute_local:buck2_execute_local
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_execute_local"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-bincode = { workspace = true }
-bytes = { workspace = true }
-futures = { workspace = true }
-libc = { workspace = true }
-pin-project = { workspace = true }
-take_mut = { workspace = true }
-tokio = { workspace = true }
-tokio-util = { workspace = true }
-tracing = { workspace = true }
-
-buck2_common = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_miniperf_proto = { workspace = true }
-buck2_resource_control = { workspace = true }
+async-trait.workspace = true
+bincode.workspace = true
+buck2_common.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_fs.workspace = true
+buck2_miniperf_proto.workspace = true
+buck2_resource_control.workspace = true
+bytes.workspace = true
+futures.workspace = true
+libc.workspace = true
+pin-project.workspace = true
+take_mut.workspace = true
+tokio.workspace = true
+tokio-util.workspace = true
+tracing.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-nix = { workspace = true }
+[dev-dependencies]
+assert_matches.workspace = true
+buck2_util.workspace = true
+dupe.workspace = true
+sysinfo.workspace = true
+tempfile.workspace = true
+tokio-stream.workspace = true
 
-[target.'cfg(windows)'.dependencies]
-buck2_wrapper_common = { workspace = true }
-dupe = { workspace = true }
-windows-sys = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+nix.workspace = true
 
-[dev-dependencies]
-assert_matches = { workspace = true }
-dupe = { workspace = true }
-sysinfo = { workspace = true }
-tempfile = { workspace = true }
-tokio-stream = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+nix.workspace = true
 
-buck2_util = { workspace = true }
+[target.'cfg(target_os = "windows")'.dependencies]
+buck2_wrapper_common.workspace = true
+dupe.workspace = true
+windows-sys.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_external_cells/Cargo.toml b/app/buck2_external_cells/Cargo.toml
index ced767573c961..bffc4870dc69b 100644
--- a/app/buck2_external_cells/Cargo.toml
+++ b/app/buck2_external_cells/Cargo.toml
@@ -1,33 +1,32 @@
+# @generated by autocargo from //buck2/app/buck2_external_cells:buck2_external_cells
+
 [package]
-description = "Buck2 external cells implementation"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_external_cells"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-cmp_any = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-
-async-trait = { workspace = true }
-blake3 = { workspace = true }
-derive_more = { workspace = true }
-pagable = { workspace = true }
-tokio = { workspace = true }
-
-buck2_build_api = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_directory = { workspace = true }
-buck2_error = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_external_cells_bundled = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_util = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+blake3.workspace = true
+buck2_build_api.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_directory.workspace = true
+buck2_error.workspace = true
+buck2_execute.workspace = true
+buck2_external_cells_bundled.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_util.workspace = true
+cmp_any.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dupe.workspace = true
+pagable.workspace = true
+tokio.workspace = true
 
-[dev-dependencies]
-tokio = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_external_cells_bundled/BUCK b/app/buck2_external_cells_bundled/BUCK
index 25b3caaf8a50e..7ea55aaaaaa27 100644
--- a/app/buck2_external_cells_bundled/BUCK
+++ b/app/buck2_external_cells_bundled/BUCK
@@ -17,6 +17,15 @@ rust_library(
         "test_data/**/*",
         "test_data/**/.*",
     ]),
+    autocargo = {
+        "cargo_toml_config": {
+            "extra_buck_dependencies": {
+                "build-dependencies": [
+                    "fbsource//third-party/rust:walkdir",
+                ],
+            },
+        },
+    },
     mapped_srcs = {
         ":prelude": "src/prelude",
     },
diff --git a/app/buck2_external_cells_bundled/Cargo.toml b/app/buck2_external_cells_bundled/Cargo.toml
index aef107f074bcd..bc576e8572551 100644
--- a/app/buck2_external_cells_bundled/Cargo.toml
+++ b/app/buck2_external_cells_bundled/Cargo.toml
@@ -1,19 +1,18 @@
+# @generated by autocargo from //buck2/app/buck2_external_cells_bundled:[buck2_external_cells_bundled,processor]
+
 [package]
-build = "build.rs"
-description = "Buck2 external cells bundled data"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_external_cells_bundled"
-repository = { workspace = true }
-version = "0.1.0"
-
-[dependencies]
-async-trait = { workspace = true }
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
-buck2_common = { workspace = true }
+[[bin]]
+name = "processor"
+path = "processor.rs"
 
 [build-dependencies]
-walkdir = { workspace = true }
+walkdir.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_file_watcher/BUCK b/app/buck2_file_watcher/BUCK
index 09c0da772b21c..9e580fafe68e3 100644
--- a/app/buck2_file_watcher/BUCK
+++ b/app/buck2_file_watcher/BUCK
@@ -5,6 +5,28 @@ oncall("build_infra")
 rust_library(
     name = "buck2_file_watcher",
     srcs = glob(["src/**/*.rs"]),
+    autocargo = {
+        "cargo_toml_config": {
+            "dependencies_override": {
+                "dependencies": {
+                    "fbinit": {
+                        "path": None,
+                        "version": "0.2",
+                    },
+                    "watchman_client": {
+                        "path": None,
+                        "version": "0.9.0",
+                    },
+                },
+            },
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    (None, "//common/rust/shed/detect_eden:detect_eden"),
+                    (None, "//eden/fs/service:thrift-rust"),
+                ],
+            },
+        },
+    },
     named_deps = {
         # @oss-disable[end= ]: "edenfs": "//eden/fs/service:thrift-rust",
     },
diff --git a/app/buck2_file_watcher/Cargo.toml b/app/buck2_file_watcher/Cargo.toml
index e62417bf69a05..4e096eb8fde60 100644
--- a/app/buck2_file_watcher/Cargo.toml
+++ b/app/buck2_file_watcher/Cargo.toml
@@ -1,48 +1,51 @@
+# @generated by autocargo from //buck2/app/buck2_file_watcher:buck2_file_watcher
+
 [package]
-description = "Buck2 file watcher"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_file_watcher"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-futures = { workspace = true }
-notify = { workspace = true }
-serde = { workspace = true }
-tokio = { workspace = true }
-tracing = { workspace = true }
-uuid = { workspace = true }
-
-allocative = { workspace = true }
-blake3 = { workspace = true }
-compact_str = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-fbinit = { workspace = true }
-hex = { workspace = true }
-starlark_map = { workspace = true }
-# @oss-disable: watchman_client.path = "../../../watchman/rust/watchman_client"
-watchman_client.version = "0.9.0"
-
-buck2_certs = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_util = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+blake3.workspace = true
+buck2_certs.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_util.workspace = true
+compact_str.workspace = true
+dice.workspace = true
+dupe.workspace = true
+fbinit.workspace = true
+futures.workspace = true
+hex.workspace = true
+notify.workspace = true
+serde.workspace = true
+starlark_map.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+uuid.workspace = true
+watchman_client.workspace = true
 
 [dev-dependencies]
-tempfile = { workspace = true }
+tempfile.workspace = true
+
+[target.'cfg(target_os = "linux")'.dev-dependencies]
+assert_matches.workspace = true
+buck2_util.workspace = true
+gazebo.workspace = true
 
-[target.'cfg(unix)'.dev-dependencies]
-assert_matches = { workspace = true }
-buck2_util = { workspace = true }
-gazebo = { workspace = true }
+[target.'cfg(target_os = "macos")'.dev-dependencies]
+assert_matches.workspace = true
+buck2_util.workspace = true
+gazebo.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_forkserver/Cargo.toml b/app/buck2_forkserver/Cargo.toml
index ed699f3374597..be539e16bd466 100644
--- a/app/buck2_forkserver/Cargo.toml
+++ b/app/buck2_forkserver/Cargo.toml
@@ -1,37 +1,36 @@
+# @generated by autocargo from //buck2/app/buck2_forkserver:buck2_forkserver
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_forkserver"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-arc-swap = { workspace = true }
-async-trait = { workspace = true }
-futures = { workspace = true }
-libc = { workspace = true }
-nix = { workspace = true }
-rand = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tonic = { workspace = true }
-
-allocative = { workspace = true }
-dupe = { workspace = true }
-
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_execute_local = { workspace = true }
-buck2_forkserver_proto = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_grpc = { workspace = true }
-buck2_resource_control = { workspace = true }
-buck2_util = { workspace = true }
+allocative.workspace = true
+arc-swap.workspace = true
+async-trait.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_execute_local.workspace = true
+buck2_forkserver_proto.workspace = true
+buck2_fs.workspace = true
+buck2_grpc.workspace = true
+buck2_resource_control.workspace = true
+buck2_util.workspace = true
+dupe.workspace = true
+futures.workspace = true
+libc.workspace = true
+rand.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
+tonic.workspace = true
 
-[dev-dependencies]
-assert_matches = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+nix.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_forkserver_proto/Cargo.toml b/app/buck2_forkserver_proto/Cargo.toml
index 6659ff7f97436..e3b3bf69c20d6 100644
--- a/app/buck2_forkserver_proto/Cargo.toml
+++ b/app/buck2_forkserver_proto/Cargo.toml
@@ -1,20 +1,23 @@
+# @generated by autocargo from //buck2/app/buck2_forkserver_proto:buck2_forkserver_proto
+
 [package]
 name = "buck2_forkserver_proto"
-
-edition = "2024"
-license = { workspace = true }
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-derive_more = { workspace = true }
-gazebo = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
-
-buck2_data = { workspace = true }
+buck2_data.workspace = true
+derive_more.workspace = true
+gazebo.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_fs/BUCK b/app/buck2_fs/BUCK
index 8b4400f23d1ec..d18e449616b03 100644
--- a/app/buck2_fs/BUCK
+++ b/app/buck2_fs/BUCK
@@ -7,6 +7,15 @@ rust_library(
     srcs = glob(
         ["src/**/*.rs"],
     ),
+    autocargo = {
+        "cargo_toml_config": {
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    (None, "//common/rust/shed/detect_eden:detect_eden"),
+                ],
+            },
+        },
+    },
     test_deps = [
         "fbsource//third-party/rust:assert_matches",
         "fbsource//third-party/rust:serde_json",
diff --git a/app/buck2_fs/Cargo.toml b/app/buck2_fs/Cargo.toml
index db556117b98bc..dc96e4bda2fb8 100644
--- a/app/buck2_fs/Cargo.toml
+++ b/app/buck2_fs/Cargo.toml
@@ -1,43 +1,47 @@
+# @generated by autocargo from //buck2/app/buck2_fs:buck2_fs
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_fs"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-compact_str = { workspace = true }
-derive_more = { workspace = true }
-dunce = { workspace = true }
-memchr = { workspace = true }
-ref-cast = { workspace = true }
-serde = { workspace = true }
-smallvec = { workspace = true }
-tokio = { workspace = true }
-
-allocative = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-strong_hash = { workspace = true }
+allocative.workspace = true
+buck2_env.workspace = true
+buck2_error.workspace = true
+buck2_util.workspace = true
+compact_str.workspace = true
+derive_more.workspace = true
+dunce.workspace = true
+dupe.workspace = true
+gazebo.workspace = true
+memchr.workspace = true
+pagable.workspace = true
+ref-cast.workspace = true
+serde.workspace = true
+smallvec.workspace = true
+strong_hash.workspace = true
+tokio.workspace = true
 
-buck2_env = { workspace = true }
-buck2_error = { workspace = true }
-buck2_util = { workspace = true }
+[dev-dependencies]
+assert_matches.workspace = true
+buck2_hash.workspace = true
+serde_json.workspace = true
+tempfile.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-libc = { workspace = true }
-nix = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+libc.workspace = true
+nix.workspace = true
 
-[target.'cfg(windows)'.dependencies]
-common-path = { workspace = true }
-windows-sys = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+libc.workspace = true
+nix.workspace = true
 
-[dev-dependencies]
-assert_matches = { workspace = true }
-buck2_hash = { workspace = true }
-serde_json = { workspace = true }
-tempfile = { workspace = true }
+[target.'cfg(target_os = "windows")'.dependencies]
+common-path.workspace = true
+windows-sys.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_grpc/Cargo.toml b/app/buck2_grpc/Cargo.toml
index adc368d23eab2..25cebbcbbfd70 100644
--- a/app/buck2_grpc/Cargo.toml
+++ b/app/buck2_grpc/Cargo.toml
@@ -1,19 +1,21 @@
+# @generated by autocargo from //buck2/app/buck2_grpc:buck2_grpc
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_grpc"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-buck2_error = { workspace = true }
-futures = { workspace = true }
-hyper = { workspace = true }
-hyper-util = { workspace = true }
-pin-project = { workspace = true }
-tokio = { workspace = true }
-tonic = { workspace = true }
-tower = { workspace = true }
+buck2_error.workspace = true
+futures.workspace = true
+hyper.workspace = true
+hyper-util.workspace = true
+pin-project.workspace = true
+tokio.workspace = true
+tonic.workspace = true
+tower.workspace = true
 
-[dev-dependencies]
-assert_matches = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_hash/Cargo.toml b/app/buck2_hash/Cargo.toml
index 1a1e1fc637b0b..851c98a0a68f7 100644
--- a/app/buck2_hash/Cargo.toml
+++ b/app/buck2_hash/Cargo.toml
@@ -1,18 +1,17 @@
-[package]
-description = """
-Hash function abstractions for buck2.
+# @generated by autocargo from //buck2/app/buck2_hash:buck2_hash
 
-This crate provides a level of indirection for hash function implementations
-used throughout buck2. It currently uses fxhash::FxHasher64 for performance.
-"""
-edition = "2024"
-license = { workspace = true }
+[package]
 name = "buck2_hash"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-dashmap = { workspace = true }
-dupe = { workspace = true }
-fxhash = { workspace = true }
-indexmap = { workspace = true }
+dashmap.workspace = true
+dupe.workspace = true
+fxhash.workspace = true
+indexmap.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_health_check/Cargo.toml b/app/buck2_health_check/Cargo.toml
index f9061a26a56e7..d61ee927c4d19 100644
--- a/app/buck2_health_check/Cargo.toml
+++ b/app/buck2_health_check/Cargo.toml
@@ -1,28 +1,30 @@
+# @generated by autocargo from //buck2/app/buck2_health_check:buck2_health_check
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_health_check"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_grpc = { workspace = true }
-buck2_health_check_proto = { workspace = true }
-buck2_util = { workspace = true }
-dupe = { workspace = true }
-itertools = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-regex = { workspace = true }
-tokio = { workspace = true }
-tonic = { workspace = true }
-tracing = { workspace = true }
+async-trait.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_fs.workspace = true
+buck2_health_check_proto.workspace = true
+buck2_util.workspace = true
+dupe.workspace = true
+futures.workspace = true
+prost-types.workspace = true
+tokio.workspace = true
+tonic.workspace = true
+tracing.workspace = true
+
+[dev-dependencies]
+tempfile.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_health_check_proto/Cargo.toml b/app/buck2_health_check_proto/Cargo.toml
index f61046694570f..9bc1ce8a87338 100644
--- a/app/buck2_health_check_proto/Cargo.toml
+++ b/app/buck2_health_check_proto/Cargo.toml
@@ -1,20 +1,21 @@
+# @generated by autocargo from //buck2/app/buck2_health_check_proto:buck2_health_check_proto
+
 [package]
 name = "buck2_health_check_proto"
-
-edition = "2024"
-license = { workspace = true }
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-derive_more = { workspace = true }
-gazebo = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
-
-buck2_data = { workspace = true }
+buck2_data.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_host_sharing_proto/Cargo.toml b/app/buck2_host_sharing_proto/Cargo.toml
index 0437f6128127f..eacffcc73d21d 100644
--- a/app/buck2_host_sharing_proto/Cargo.toml
+++ b/app/buck2_host_sharing_proto/Cargo.toml
@@ -1,18 +1,21 @@
+# @generated by autocargo from //buck2/app/buck2_host_sharing_proto:buck2_host_sharing_proto
+
 [package]
 name = "buck2_host_sharing_proto"
-
-edition = "2024"
-license = { workspace = true }
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-serde = { workspace = true }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
+allocative.workspace = true
+prost.workspace = true
+serde.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_http/Cargo.toml b/app/buck2_http/Cargo.toml
index 39fd194d85a90..83b469096b408 100644
--- a/app/buck2_http/Cargo.toml
+++ b/app/buck2_http/Cargo.toml
@@ -1,43 +1,49 @@
+# @generated by autocargo from //buck2/app/buck2_http:buck2_http
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_http"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-bytes = { workspace = true }
-futures = { workspace = true }
-http = { workspace = true }
-http-body-util = { workspace = true }
-hyper = { workspace = true }
-hyper-http-proxy = { workspace = true }
-hyper-rustls = { workspace = true }
-hyper-timeout = { workspace = true }
-hyper-util = { workspace = true }
-ipnetwork = { workspace = true }
-pin-project = { workspace = true }
-rustls = { workspace = true }
-tokio = { workspace = true }
-tokio-rustls = { workspace = true }
-tokio-util = { workspace = true }
-tower-service = { workspace = true }
-tracing = { workspace = true }
-
-allocative = { workspace = true }
-dupe = { workspace = true }
-
-buck2_certs = { workspace = true }
-buck2_error = { workspace = true }
-
-[target.'cfg(unix)'.dependencies]
-hyperlocal = { workspace = true }
+allocative.workspace = true
+buck2_certs.workspace = true
+buck2_error.workspace = true
+bytes.workspace = true
+dupe.workspace = true
+futures.workspace = true
+http.workspace = true
+http-body-util.workspace = true
+hyper.workspace = true
+hyper-http-proxy.workspace = true
+hyper-rustls.workspace = true
+hyper-timeout.workspace = true
+hyper-util.workspace = true
+ipnetwork.workspace = true
+pin-project.workspace = true
+rustls.workspace = true
+tokio.workspace = true
+tokio-rustls.workspace = true
+tokio-util.workspace = true
+tower-service.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
-httptest = { workspace = true }
+httptest.workspace = true
+
+[target.'cfg(target_os = "linux")'.dependencies]
+hyperlocal.workspace = true
+
+[target.'cfg(target_os = "linux")'.dev-dependencies]
+tempfile.workspace = true
+
+[target.'cfg(target_os = "macos")'.dependencies]
+hyperlocal.workspace = true
 
-[target.'cfg(unix)'.dev-dependencies]
-tempfile = { workspace = true }
+[target.'cfg(target_os = "macos")'.dev-dependencies]
+tempfile.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_install_proto/Cargo.toml b/app/buck2_install_proto/Cargo.toml
index 7e73d1c150326..9703e9257bddf 100644
--- a/app/buck2_install_proto/Cargo.toml
+++ b/app/buck2_install_proto/Cargo.toml
@@ -1,15 +1,19 @@
+# @generated by autocargo from //buck2/app/buck2_install_proto:buck2_install_proto
+
 [package]
 name = "buck2_install_proto"
-
-edition = "2024"
-license = { workspace = true }
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-prost = { workspace = true }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
+prost.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_interpreter/Cargo.toml b/app/buck2_interpreter/Cargo.toml
index 71e082c19569d..712732257ca22 100644
--- a/app/buck2_interpreter/Cargo.toml
+++ b/app/buck2_interpreter/Cargo.toml
@@ -1,42 +1,44 @@
+# @generated by autocargo from //buck2/app/buck2_interpreter:buck2_interpreter
+
 [package]
-description = "Interprets build files and handles loading and interpreting extension files, and communicating this information to DICE"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_interpreter"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-either = { workspace = true }
-fancy-regex = { workspace = true }
-itertools = { workspace = true }
-plist = { workspace = true }
-ref-cast = { workspace = true }
-regex = { workspace = true }
-serde = { workspace = true }
-tokio = { workspace = true }
-triomphe = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true }
-strong_hash = { workspace = true }
-
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_util = { workspace = true }
-dice_futures = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_util.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+either.workspace = true
+fancy-regex.workspace = true
+gazebo.workspace = true
+itertools.workspace = true
+pagable.workspace = true
+plist.workspace = true
+ref-cast.workspace = true
+regex.workspace = true
+serde.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
+strong_hash.workspace = true
+tokio.workspace = true
+triomphe.workspace = true
 
 [dev-dependencies]
-buck2_hash = { workspace = true }
-tempfile = { workspace = true }
+buck2_hash.workspace = true
+tempfile.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_interpreter_for_build/Cargo.toml b/app/buck2_interpreter_for_build/Cargo.toml
index 86eb75b97296b..902d728a3d904 100644
--- a/app/buck2_interpreter_for_build/Cargo.toml
+++ b/app/buck2_interpreter_for_build/Cargo.toml
@@ -1,56 +1,58 @@
+# @generated by autocargo from //buck2/app/buck2_interpreter_for_build:buck2_interpreter_for_build
+
 [package]
-description = "Interpreter setup to BUCK files"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_interpreter_for_build"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-bumpalo = { workspace = true }
-cmp_any = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-either = { workspace = true }
-fancy-regex = { workspace = true }
-futures = { workspace = true }
-glob = { workspace = true }
-hashbrown = { workspace = true }
-hex = { workspace = true }
-indoc = { workspace = true }
-itertools = { workspace = true }
-maplit = { workspace = true }
-once_cell = { workspace = true }
-quick-xml = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-sha1 = { workspace = true }
-sha2 = { workspace = true }
-smallvec = { workspace = true }
-toml = { workspace = true }
-tracing = { workspace = true }
-twox-hash = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_event_observer.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_node.workspace = true
+buck2_query.workspace = true
+buck2_query_parser.workspace = true
+buck2_util.workspace = true
+bumpalo.workspace = true
+cmp_any.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+either.workspace = true
+fancy-regex.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+glob.workspace = true
+hashbrown.workspace = true
+hex.workspace = true
+indoc.workspace = true
+itertools.workspace = true
+maplit.workspace = true
+once_cell.workspace = true
+pagable.workspace = true
+quick-xml.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+sha1.workspace = true
+sha2.workspace = true
+smallvec.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
+toml.workspace = true
+tracing.workspace = true
+twox-hash.workspace = true
 
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_observer = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_node = { workspace = true }
-buck2_query = { workspace = true }
-buck2_query_parser = { workspace = true }
-buck2_util = { workspace = true }
-dice_futures = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_interpreter_for_build_tests/Cargo.toml b/app/buck2_interpreter_for_build_tests/Cargo.toml
index da9514840ff11..93e99b59d96ea 100644
--- a/app/buck2_interpreter_for_build_tests/Cargo.toml
+++ b/app/buck2_interpreter_for_build_tests/Cargo.toml
@@ -1,31 +1,37 @@
+# @generated by autocargo from //buck2/app/buck2_interpreter_for_build_tests:buck2_interpreter_for_build_tests
+
 [package]
-description = "Tests for buck2_interpreter_for_build"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_interpreter_for_build_tests"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
+autolib = false
 
-[dev-dependencies]
-ctor = { workspace = true }
-indoc = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true }
+[[test]]
+name = "buck2_interpreter_for_build_tests"
+path = "src/lib.rs"
 
-dice = { workspace = true }
-dupe = { workspace = true }
-futures = { workspace = true }
-gazebo = { workspace = true }
-starlark = { workspace = true }
+[dev-dependencies]
+buck2_build_api.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_interpreter.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_node.workspace = true
+buck2_transition.workspace = true
+buck2_util.workspace = true
+ctor.workspace = true
+dice.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+indoc.workspace = true
+serde_json.workspace = true
+starlark.workspace = true
+tokio.workspace = true
 
-buck2_build_api = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_node = { workspace = true }
-buck2_query = { workspace = true }
-buck2_transition = { workspace = true }
-buck2_util = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_miniperf/BUCK b/app/buck2_miniperf/BUCK
index 75d13e1db34a1..74cdea2696264 100644
--- a/app/buck2_miniperf/BUCK
+++ b/app/buck2_miniperf/BUCK
@@ -37,6 +37,7 @@ rust_library(
     srcs = glob(
         ["test/**/*.rs"],
     ),
+    autocargo = {"ignore_rule": True},
     test_deps = select({
         # Ideally we'd use compatible_with, but TD does not understand that.
         "DEFAULT": [],
diff --git a/app/buck2_miniperf/Cargo.toml b/app/buck2_miniperf/Cargo.toml
index 0ecefe2236b7c..117dec5a67ec0 100644
--- a/app/buck2_miniperf/Cargo.toml
+++ b/app/buck2_miniperf/Cargo.toml
@@ -1,19 +1,21 @@
+# @generated by autocargo from //buck2/app/buck2_miniperf:buck2_miniperf
+
 [package]
-authors = ["Meta"]
-description = "A minimal implementation of perf. This has lower overhead when only CPU instruction counts are needed."
-edition = "2024"
-license = { workspace = true }
 name = "buck2_miniperf"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-anyhow = { workspace = true }
+anyhow.workspace = true
 
 [target.'cfg(target_os = "linux")'.dependencies]
-bincode = { workspace = true }
-buck2_miniperf_proto = { workspace = true }
-buck2_util = { workspace = true }
-perf-event = { workspace = true }
-smallvec = { workspace = true }
-thiserror = { workspace = true }
+bincode.workspace = true
+buck2_miniperf_proto.workspace = true
+perf-event.workspace = true
+smallvec.workspace = true
+thiserror.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_miniperf_proto/Cargo.toml b/app/buck2_miniperf_proto/Cargo.toml
index b36735d90a04b..e3153bd804794 100644
--- a/app/buck2_miniperf_proto/Cargo.toml
+++ b/app/buck2_miniperf_proto/Cargo.toml
@@ -1,16 +1,19 @@
+# @generated by autocargo from //buck2/app/buck2_miniperf_proto:buck2_miniperf_proto
+
 [package]
-authors = ["Meta"]
-description = "Serialized datastructures for buck2_miniperf"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_miniperf_proto"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-buck2_data = { workspace = true }
-dupe = { workspace = true }
-serde = { workspace = true }
+buck2_data.workspace = true
+dupe.workspace = true
+serde.workspace = true
 
 [dev-dependencies]
-bincode = { workspace = true }
+bincode.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_node/Cargo.toml b/app/buck2_node/Cargo.toml
index cf57dac2a59a9..f9acfa0b9ed99 100644
--- a/app/buck2_node/Cargo.toml
+++ b/app/buck2_node/Cargo.toml
@@ -1,50 +1,52 @@
+# @generated by autocargo from //buck2/app/buck2_node:buck2_node
+
 [package]
-description = "Target graph node"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_node"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-derive_more = { workspace = true }
-either = { workspace = true }
-futures = { workspace = true }
-itertools = { workspace = true }
-memchr = { workspace = true }
-once_cell = { workspace = true }
-ref-cast = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-smallvec = { workspace = true }
-static_assertions = { workspace = true }
-static_interner = { workspace = true }
-strsim = { workspace = true }
-triomphe = { workspace = true }
-
-allocative = { workspace = true }
-cmp_any = { workspace = true }
-dice = { workspace = true }
-display_container = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true }
-strong_hash = { workspace = true }
-
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_query = { workspace = true }
-buck2_query_parser = { workspace = true }
-buck2_util = { workspace = true }
-dice_futures = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_query.workspace = true
+buck2_query_parser.workspace = true
+buck2_util.workspace = true
+cmp_any.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+display_container.workspace = true
+dupe.workspace = true
+either.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+itertools.workspace = true
+memchr.workspace = true
+once_cell.workspace = true
+pagable.workspace = true
+ref-cast.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+smallvec.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
+static_assertions.workspace = true
+static_interner.workspace = true
+strong_hash.workspace = true
+strsim.workspace = true
+triomphe.workspace = true
 
 [dev-dependencies]
-tokio = { workspace = true }
+tokio.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_node_tests/Cargo.toml b/app/buck2_node_tests/Cargo.toml
index ca4cdd7a5b4c8..7e34a1c1faa78 100644
--- a/app/buck2_node_tests/Cargo.toml
+++ b/app/buck2_node_tests/Cargo.toml
@@ -1,16 +1,24 @@
+# @generated by autocargo from //buck2/app/buck2_node_tests:buck2_node_tests
+
 [package]
-description = "Tests for buck2_node"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_node_tests"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
+autolib = false
+
+[[test]]
+name = "buck2_node_tests"
+path = "src/lib.rs"
 
 [dev-dependencies]
-buck2_error = { workspace = true }
-dupe = { workspace = true }
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_fs.workspace = true
+buck2_node.workspace = true
+buck2_util.workspace = true
+dupe.workspace = true
 
-buck2_core = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_node = { workspace = true }
-buck2_util = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_offline_archive/Cargo.toml b/app/buck2_offline_archive/Cargo.toml
index 30badc96a164c..aeb6c62bb3e67 100644
--- a/app/buck2_offline_archive/Cargo.toml
+++ b/app/buck2_offline_archive/Cargo.toml
@@ -1,18 +1,24 @@
+# @generated by autocargo from //buck2/app/buck2_offline_archive:buck2_offline_archive
+
 [package]
-description = "Supporting code and utilities for manipulating offline build archives"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_offline_archive"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-serde = { workspace = true }
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_fs.workspace = true
+buck2_util.workspace = true
+serde.workspace = true
+
+[target.'cfg(target_os = "linux")'.dev-dependencies]
+tempfile.workspace = true
 
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_util = { workspace = true }
+[target.'cfg(target_os = "macos")'.dev-dependencies]
+tempfile.workspace = true
 
-[target.'cfg(unix)'.dev-dependencies]
-tempfile = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_profile/Cargo.toml b/app/buck2_profile/Cargo.toml
index 78810ff6b9e9a..fa0878c33b665 100644
--- a/app/buck2_profile/Cargo.toml
+++ b/app/buck2_profile/Cargo.toml
@@ -1,18 +1,20 @@
+# @generated by autocargo from //buck2/app/buck2_profile:buck2_profile
+
 [package]
-description = "common utitilies of buck2 profile"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_profile"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-inferno = { workspace = true }
-
-starlark = { workspace = true }
+buck2_cli_proto.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_fs.workspace = true
+buck2_interpreter.workspace = true
+inferno.workspace = true
+starlark.workspace = true
 
-buck2_cli_proto = { workspace = true }
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_interpreter = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_protoc_dev/BUCK b/app/buck2_protoc_dev/BUCK
index d311daca4d4f8..707ab58efb12d 100644
--- a/app/buck2_protoc_dev/BUCK
+++ b/app/buck2_protoc_dev/BUCK
@@ -5,9 +5,19 @@ oncall("build_infra")
 rust_library(
     name = "buck2_protoc_dev",
     srcs = glob(["src/**/*.rs"]),
-    rustc_flags = [
-        "--cfg=buck2_build",
-    ],
+    # Used only under `#[cfg(not(buck2_build))]` (i.e. cargo builds) to locate
+    # the protoc binary at runtime. BUCK sets `--cfg=buck2_build` and gets the
+    # paths via env vars instead, so these aren't real buck deps.
+    autocargo = {
+        "cargo_toml_config": {
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    "fbsource//third-party/rust:dunce",
+                    "fbsource//third-party/rust:protoc-bin-vendored",
+                ],
+            },
+        },
+    },
     deps = [
         "fbsource//third-party/rust:tonic-prost-build",
     ],
diff --git a/app/buck2_protoc_dev/Cargo.toml b/app/buck2_protoc_dev/Cargo.toml
index 360211006d8b8..2e17b87ec1292 100644
--- a/app/buck2_protoc_dev/Cargo.toml
+++ b/app/buck2_protoc_dev/Cargo.toml
@@ -1,15 +1,16 @@
+# @generated by autocargo from //buck2/app/buck2_protoc_dev:buck2_protoc_dev
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_protoc_dev"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-dunce = { workspace = true }
-protoc-bin-vendored = { workspace = true }
-tonic-build = { workspace = true }
-tonic-prost-build = { workspace = true }
+dunce.workspace = true
+protoc-bin-vendored.workspace = true
+tonic-prost-build.workspace = true
 
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ["cfg(buck2_build)"] }
+[lints]
+workspace = true
diff --git a/app/buck2_protoc_dev/src/lib.rs b/app/buck2_protoc_dev/src/lib.rs
index 0fcafba8738b6..fcf380112ff05 100644
--- a/app/buck2_protoc_dev/src/lib.rs
+++ b/app/buck2_protoc_dev/src/lib.rs
@@ -12,7 +12,7 @@ use std::env;
 use std::ffi::OsString;
 use std::io;
 use std::path::Path;
-#[cfg(not(buck2_build))]
+#[cfg(not(buck_build))]
 use std::path::PathBuf;
 
 fn get_env(key: &str) -> Option<OsString> {
@@ -20,7 +20,7 @@ fn get_env(key: &str) -> Option<OsString> {
     env::var_os(key)
 }
 
-#[cfg(not(buck2_build))]
+#[cfg(not(buck_build))]
 unsafe fn set_var(
     var: &str,
     override_var: &str,
@@ -50,7 +50,7 @@ unsafe fn set_var(
 ///
 /// Note: repo root is expected to be a relative or absolute path to the root of the repository.
 unsafe fn maybe_set_protoc() {
-    #[cfg(not(buck2_build))]
+    #[cfg(not(buck_build))]
     {
         // `cargo build` of `buck2` does not require external `protoc` dependency
         // because it uses prebuilt bundled `protoc` binary from `protoc-bin-vendored` crate.
@@ -70,7 +70,7 @@ unsafe fn maybe_set_protoc() {
 
 /// Set $PROTOC_INCLUDE.
 unsafe fn maybe_set_protoc_include() {
-    #[cfg(not(buck2_build))]
+    #[cfg(not(buck_build))]
     {
         unsafe {
             set_var(
diff --git a/app/buck2_query/Cargo.toml b/app/buck2_query/Cargo.toml
index 52bd3b13c34b3..b99e9fb973c15 100644
--- a/app/buck2_query/Cargo.toml
+++ b/app/buck2_query/Cargo.toml
@@ -1,35 +1,35 @@
+# @generated by autocargo from //buck2/app/buck2_query:buck2_query
+
 [package]
-description = "Buck query generic implementation"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_query"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-derive_more = { workspace = true }
-enum-iterator = { workspace = true }
-fancy-regex = { workspace = true }
-futures = { workspace = true }
-indexmap = { workspace = true }
-indoc = { workspace = true }
-itertools = { workspace = true }
-ref-cast = { workspace = true }
-tokio = { workspace = true }
-
-allocative = { workspace = true }
-display_container = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-starlark_map = { workspace = true }
-
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_query_derive = { workspace = true }
-buck2_query_parser = { workspace = true }
-buck2_util = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_hash.workspace = true
+buck2_query_derive.workspace = true
+buck2_query_parser.workspace = true
+buck2_util.workspace = true
+derive_more.workspace = true
+display_container.workspace = true
+dupe.workspace = true
+enum-iterator.workspace = true
+fancy-regex.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+indexmap.workspace = true
+indoc.workspace = true
+itertools.workspace = true
+pagable.workspace = true
+ref-cast.workspace = true
+starlark_map.workspace = true
+tokio.workspace = true
 
-[lib]
+[lints]
+workspace = true
diff --git a/app/buck2_query_derive/Cargo.toml b/app/buck2_query_derive/Cargo.toml
index f9d4736c91238..b6fd12d0eca28 100644
--- a/app/buck2_query_derive/Cargo.toml
+++ b/app/buck2_query_derive/Cargo.toml
@@ -1,18 +1,23 @@
+# @generated by autocargo from //buck2/app/buck2_query_derive:buck2_query_derive
+
 [package]
-authors = ["Facebook"]
-description = "Proc macros for Buck's buck_query crate"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_query_derive"
-repository = { workspace = true }
-version = "0.4.1"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [lib]
+test = false
+doctest = false
 proc-macro = true
 
 [dependencies]
-itertools = { workspace = true }
-proc-macro2 = { workspace = true }
-quote = { workspace = true }
-syn = { workspace = true }
-textwrap = { workspace = true }
+itertools.workspace = true
+proc-macro2.workspace = true
+quote.workspace = true
+syn.workspace = true
+textwrap.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_query_impls/Cargo.toml b/app/buck2_query_impls/Cargo.toml
index 4fd1c0a980b3b..456976f422fc5 100644
--- a/app/buck2_query_impls/Cargo.toml
+++ b/app/buck2_query_impls/Cargo.toml
@@ -1,44 +1,45 @@
+# @generated by autocargo from //buck2/app/buck2_query_impls:buck2_query_impls
+
 [package]
-authors = ["Facebook"]
-description = "uquery, cquery, aquery and analysis query implementations for Buck2"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_query_impls"
-repository = { workspace = true }
-version = "0.0.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-dashmap = { workspace = true }
-derive_more = { workspace = true }
-either = { workspace = true }
-futures = { workspace = true }
-itertools = { workspace = true }
-ref-cast = { workspace = true }
-tokio = { workspace = true }
-tracing = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-starlark = { workspace = true }
-
-buck2_artifact = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_node = { workspace = true }
-buck2_query = { workspace = true }
-buck2_query_parser = { workspace = true }
-buck2_util = { workspace = true }
-dice_futures = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_node.workspace = true
+buck2_query.workspace = true
+buck2_query_parser.workspace = true
+buck2_util.workspace = true
+dashmap.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+either.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+itertools.workspace = true
+pagable.workspace = true
+ref-cast.workspace = true
+starlark.workspace = true
+tokio.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
-assert_matches = { workspace = true }
+assert_matches.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_query_parser/Cargo.toml b/app/buck2_query_parser/Cargo.toml
index 10f113a350fbd..617526567051e 100644
--- a/app/buck2_query_parser/Cargo.toml
+++ b/app/buck2_query_parser/Cargo.toml
@@ -1,19 +1,21 @@
+# @generated by autocargo from //buck2/app/buck2_query_parser:buck2_query_parser
+
 [package]
-description = "Buck2 query language parser"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_query_parser"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-derive_more = { workspace = true }
-enum-map = { workspace = true }
-nom = { workspace = true }
-nom-language = { workspace = true }
-
-dupe = { workspace = true }
-gazebo = { workspace = true }
+buck2_error.workspace = true
+buck2_util.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+enum-map.workspace = true
+gazebo.workspace = true
+nom.workspace = true
+nom-language.workspace = true
 
-buck2_error = { workspace = true }
-buck2_util = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_re_configuration/Cargo.toml b/app/buck2_re_configuration/Cargo.toml
index 52eb90fbc44b9..2c7a9607bf2de 100644
--- a/app/buck2_re_configuration/Cargo.toml
+++ b/app/buck2_re_configuration/Cargo.toml
@@ -1,16 +1,17 @@
+# @generated by autocargo from //buck2/app/buck2_re_configuration:buck2_re_configuration
+
 [package]
-description = "utilities to configure RE in Buck2"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_re_configuration"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
+allocative.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_resource_control/Cargo.toml b/app/buck2_resource_control/Cargo.toml
index e38c0c7010965..8496e9c82ce08 100644
--- a/app/buck2_resource_control/Cargo.toml
+++ b/app/buck2_resource_control/Cargo.toml
@@ -1,32 +1,35 @@
+# @generated by autocargo from //buck2/app/buck2_resource_control:buck2_resource_control
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_resource_control"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-derive_more = { workspace = true }
-futures = { workspace = true }
-ref-cast = { workspace = true }
-tokio = { workspace = true }
-tokio-util = { workspace = true }
-
-allocative = { workspace = true }
-dupe = { workspace = true }
+allocative.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+futures.workspace = true
+ref-cast.workspace = true
+tokio.workspace = true
+tokio-util.workspace = true
 
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+nix.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-nix = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+nix.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_server/BUCK b/app/buck2_server/BUCK
index d0adc78c30535..96f7bdbde231b 100644
--- a/app/buck2_server/BUCK
+++ b/app/buck2_server/BUCK
@@ -5,6 +5,23 @@ oncall("build_infra")
 rust_library(
     name = "buck2_server",
     srcs = glob(["src/**/*.rs"]),
+    autocargo = {
+        "cargo_toml_config": {
+            "dependencies_override": {
+                "dependencies": {
+                    "fbinit": {
+                        "path": None,
+                        "version": "0.2",
+                    },
+                },
+            },
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    (None, "//common/rust/shed/detect_eden:detect_eden"),
+                ],
+            },
+        },
+    },
     test_deps = [
         "fbsource//third-party/rust:assert_matches",
         "fbsource//third-party/rust:indoc",
diff --git a/app/buck2_server/Cargo.toml b/app/buck2_server/Cargo.toml
index eb2cd1a7d7a70..f51de57f2d27e 100644
--- a/app/buck2_server/Cargo.toml
+++ b/app/buck2_server/Cargo.toml
@@ -1,91 +1,93 @@
+# @generated by autocargo from //buck2/app/buck2_server:buck2_server
+
 [package]
-description = "Some parts of Buck2 server"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_server"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-recursion = { workspace = true }
-async-trait = { workspace = true }
-bincode = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_re_configuration = { workspace = true }
-chrono = { workspace = true }
-constant_time_eq = { workspace = true }
-crossbeam-channel = { workspace = true }
-flate2 = { workspace = true }
-futures = { workspace = true }
-host_sharing = { workspace = true }
-inferno = { workspace = true }
-itertools = { workspace = true }
-lsp-server = { workspace = true }
-lsp-types = { workspace = true }
-once_cell = { workspace = true }
-parking_lot = { workspace = true }
-pin-project = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-rand = { workspace = true }
-serde_json = { workspace = true }
-shlex = { workspace = true }
-sync_wrapper = { workspace = true }
-tar = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tonic = { workspace = true }
-tower-lsp-server = { workspace = true }
-tracing = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-fbinit = { workspace = true }
-gazebo = { workspace = true }
-starlark = { workspace = true }
-starlark_lsp = { workspace = true }
+allocative.workspace = true
+async-recursion.workspace = true
+async-trait.workspace = true
+bincode.workspace = true
+buck2_analysis.workspace = true
+buck2_build_api.workspace = true
+buck2_build_signals.workspace = true
+buck2_certs.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_configured.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_directory.workspace = true
+buck2_error.workspace = true
+buck2_event_observer.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_execute_impl.workspace = true
+buck2_file_watcher.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_http.workspace = true
+buck2_interpreter.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_node.workspace = true
+buck2_profile.workspace = true
+buck2_re_configuration.workspace = true
+buck2_resource_control.workspace = true
+buck2_server_ctx.workspace = true
+buck2_server_starlark_debug.workspace = true
+buck2_subscription_proto.workspace = true
+buck2_test.workspace = true
+buck2_util.workspace = true
+buck2_validation.workspace = true
+buck2_wrapper_common.workspace = true
+chrono.workspace = true
+constant_time_eq.workspace = true
+crossbeam-channel.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+fbinit.workspace = true
+flate2.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+host_sharing.workspace = true
+inferno.workspace = true
+itertools.workspace = true
+lsp-server.workspace = true
+lsp-types.workspace = true
+once_cell.workspace = true
+parking_lot.workspace = true
+pin-project.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+rand.workspace = true
+serde_json.workspace = true
+shlex.workspace = true
+starlark.workspace = true
+starlark_lsp.workspace = true
+sync_wrapper.workspace = true
+tar.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
+tonic.workspace = true
+tower-lsp-server.workspace = true
+tracing.workspace = true
 
-buck2_analysis = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_certs = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_configured = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_directory = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_observer = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_execute_impl = { workspace = true }
-buck2_file_watcher = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_http = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_node = { workspace = true }
-buck2_profile = { workspace = true }
-buck2_resource_control = { workspace = true }
-buck2_server_ctx = { workspace = true }
-buck2_server_starlark_debug = { workspace = true }
-buck2_subscription_proto = { workspace = true }
-buck2_test = { workspace = true }
-buck2_util = { workspace = true }
-buck2_validation = { workspace = true }
-buck2_wrapper_common = { workspace = true }
-dice_futures = { workspace = true }
+[dev-dependencies]
+assert_matches.workspace = true
+indoc.workspace = true
 
-[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
-buck2_forkserver = { workspace = true }
-psutil = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+buck2_forkserver.workspace = true
+psutil.workspace = true
 
-[dev-dependencies]
-assert_matches = { workspace = true }
-buck2_util = { workspace = true }
-indoc = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+buck2_forkserver.workspace = true
+psutil.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_server_commands/Cargo.toml b/app/buck2_server_commands/Cargo.toml
index d571bbe26a687..613252e8e98ab 100644
--- a/app/buck2_server_commands/Cargo.toml
+++ b/app/buck2_server_commands/Cargo.toml
@@ -1,49 +1,45 @@
+# @generated by autocargo from //buck2/app/buck2_server_commands:buck2_server_commands
+
 [package]
-description = "Implementation of several Buck commands"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_server_commands"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-chrono = { workspace = true }
-futures = { workspace = true }
-fxhash = { workspace = true }
-indexmap = { workspace = true }
-itertools = { workspace = true }
-rustc-hash = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tonic = { workspace = true }
-tracing = { workspace = true }
-
-dice = { workspace = true }
-dupe = { workspace = true }
-starlark_map = { workspace = true }
-
-buck2_artifact = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_certs = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_directory = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_log = { workspace = true }
-buck2_event_observer = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_install_proto = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_node = { workspace = true }
-buck2_query = { workspace = true }
-buck2_server_ctx = { workspace = true }
-buck2_util = { workspace = true }
+async-trait.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api.workspace = true
+buck2_certs.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_directory.workspace = true
+buck2_error.workspace = true
+buck2_event_log.workspace = true
+buck2_event_observer.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_install_proto.workspace = true
+buck2_interpreter.workspace = true
+buck2_node.workspace = true
+buck2_query.workspace = true
+buck2_server_ctx.workspace = true
+buck2_util.workspace = true
+chrono.workspace = true
+dice.workspace = true
+dupe.workspace = true
+futures.workspace = true
+itertools.workspace = true
+starlark_map.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
+tonic.workspace = true
+tracing.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_server_ctx/Cargo.toml b/app/buck2_server_ctx/Cargo.toml
index 3a42ccda63298..6ccb59f61f4b3 100644
--- a/app/buck2_server_ctx/Cargo.toml
+++ b/app/buck2_server_ctx/Cargo.toml
@@ -1,50 +1,49 @@
+# @generated by autocargo from //buck2/app/buck2_server_ctx:buck2_server_ctx
+
 [package]
-description = "Common parts of Buck commands"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_server_ctx"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-condvar-fair = { workspace = true }
-async-trait = { workspace = true }
-const_format = { workspace = true }
-derive_more = { workspace = true }
-futures = { workspace = true }
-itertools = { workspace = true }
-parking_lot = { workspace = true }
-pin-project = { workspace = true }
-tokio = { workspace = true }
-tonic = { workspace = true }
-tracing = { workspace = true }
-tracing-subscriber = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-
-# Please do not add dependency on `buck2_build_api`.
-buck2_build_signals = { workspace = true }
-buck2_certs = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_node = { workspace = true }
-buck2_util = { workspace = true }
-buck2_wrapper_common = { workspace = true }
-dice_futures = { workspace = true }
-starlark_map = { workspace = true }
+allocative.workspace = true
+async-condvar-fair.workspace = true
+async-trait.workspace = true
+buck2_build_signals.workspace = true
+buck2_certs.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_node.workspace = true
+buck2_util.workspace = true
+buck2_wrapper_common.workspace = true
+const_format.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+itertools.workspace = true
+parking_lot.workspace = true
+pin-project.workspace = true
+starlark_map.workspace = true
+tokio.workspace = true
+tonic.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
-assert_matches = { workspace = true }
-derivative = { workspace = true }
-tokio = { workspace = true }
+assert_matches.workspace = true
+derivative.workspace = true
+pagable.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_server_starlark_debug/Cargo.toml b/app/buck2_server_starlark_debug/Cargo.toml
index 5cb5448ecf66e..bec65faa38e8b 100644
--- a/app/buck2_server_starlark_debug/Cargo.toml
+++ b/app/buck2_server_starlark_debug/Cargo.toml
@@ -1,33 +1,35 @@
+# @generated by autocargo from //buck2/app/buck2_server_starlark_debug:buck2_server_starlark_debug
+
 [package]
-description = "Server implementation of starlark debug command"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_server_starlark_debug"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-debugserver-types = { workspace = true }
-derive_more = { workspace = true }
-futures = { workspace = true }
-itertools = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tracing = { workspace = true }
-
-dupe = { workspace = true }
-starlark = { workspace = true }
+async-trait.workspace = true
+buck2_cli_proto.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_server_ctx.workspace = true
+buck2_util.workspace = true
+debugserver-types.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+futures.workspace = true
+itertools.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+starlark.workspace = true
+tokio.workspace = true
+tokio-stream.workspace = true
+tracing.workspace = true
 
-buck2_cli_proto = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_server_ctx = { workspace = true }
-buck2_util = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_subscription_proto/Cargo.toml b/app/buck2_subscription_proto/Cargo.toml
index dde73c1d204f5..169af1accce42 100644
--- a/app/buck2_subscription_proto/Cargo.toml
+++ b/app/buck2_subscription_proto/Cargo.toml
@@ -1,17 +1,22 @@
+# @generated by autocargo from //buck2/app/buck2_subscription_proto:buck2_subscription_proto
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_subscription_proto"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-derive_more = { workspace = true }
-prost = { workspace = true }
-serde = { workspace = true }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
+allocative.workspace = true
+derive_more.workspace = true
+prost.workspace = true
+serde.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_test/BUCK b/app/buck2_test/BUCK
index 7d54862cce45c..63a8f9c4b07ee 100644
--- a/app/buck2_test/BUCK
+++ b/app/buck2_test/BUCK
@@ -5,6 +5,18 @@ oncall("build_infra")
 rust_library(
     name = "buck2_test",
     srcs = glob(["src/**/*.rs"]),
+    # `//buck2/remote_execution:remote_execution` is an alias selecting between
+    # the internal and OSS impls; autocargo doesn't follow aliases, so point at
+    # the OSS rust_library directly for cargo's sake.
+    autocargo = {
+        "cargo_toml_config": {
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    "fbcode//buck2/remote_execution/oss/re_grpc:remote_execution",
+                ],
+            },
+        },
+    },
     test_deps = [
         "fbsource//third-party/rust:maplit",
     ],
diff --git a/app/buck2_test/Cargo.toml b/app/buck2_test/Cargo.toml
index ee7b9d9de0247..1ecff282199db 100644
--- a/app/buck2_test/Cargo.toml
+++ b/app/buck2_test/Cargo.toml
@@ -1,63 +1,63 @@
+# @generated by autocargo from //buck2/app/buck2_test:buck2_test
+
 [package]
-description = "Buck V2 test runner"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_test"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-dashmap = { workspace = true }
-derive_more = { workspace = true }
-display_container = { workspace = true }
-futures = { workspace = true }
-itertools = { workspace = true }
-once_cell = { workspace = true }
-rustc-hash = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true }
-tracing = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-host_sharing = { workspace = true }
-pagable = { workspace = true }
-remote_execution = { workspace = true }
-sorted_vector_map = { workspace = true }
-starlark = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_build_api.workspace = true
+buck2_build_signals.workspace = true
+buck2_cli_proto.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_downward_api.workspace = true
+buck2_error.workspace = true
+buck2_error_derive.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_execute_impl.workspace = true
+buck2_fs.workspace = true
+buck2_grpc.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_node.workspace = true
+buck2_resource_control.workspace = true
+buck2_server_ctx.workspace = true
+buck2_test_api.workspace = true
+buck2_util.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+display_container.workspace = true
+dupe.workspace = true
+futures.workspace = true
+host_sharing.workspace = true
+itertools.workspace = true
+once_cell.workspace = true
+pagable.workspace = true
+remote_execution.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+sorted_vector_map.workspace = true
+starlark.workspace = true
+tokio.workspace = true
+tracing.workspace = true
 
-buck2_build_api = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_cli_proto = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_downward_api = { workspace = true }
-buck2_error = { workspace = true }
-buck2_error_derive = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_execute_impl = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_grpc = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_node = { workspace = true }
-buck2_resource_control = { workspace = true }
-buck2_server_ctx = { workspace = true }
-buck2_test_api = { workspace = true }
-buck2_util = { workspace = true }
-dice_futures = { workspace = true }
+[dev-dependencies]
+maplit.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-libc = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+libc.workspace = true
 
-[dev-dependencies]
-maplit = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+libc.workspace = true
 
 [lints]
 workspace = true
diff --git a/app/buck2_test_api/Cargo.toml b/app/buck2_test_api/Cargo.toml
index 3bd835f5649a7..4ebb2f5fe5446 100644
--- a/app/buck2_test_api/Cargo.toml
+++ b/app/buck2_test_api/Cargo.toml
@@ -1,40 +1,43 @@
+# @generated by autocargo from //buck2/app/buck2_test_api:buck2_test_api
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_test_api"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-async-trait = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-futures = { workspace = true }
-pagable = { workspace = true }
-prost-types = { workspace = true }
-tokio = { workspace = true }
-tonic = { workspace = true }
-tower-layer = { workspace = true }
-tower-service = { workspace = true }
-tracing = { workspace = true }
-
-dupe = { workspace = true }
-gazebo = { workspace = true }
-host_sharing = { workspace = true }
-sorted_vector_map = { workspace = true }
-
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_downward_api = { workspace = true }
-buck2_downward_api_proto = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_grpc = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_host_sharing_proto = { workspace = true }
-buck2_test_proto = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_downward_api.workspace = true
+buck2_downward_api_proto.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_fs.workspace = true
+buck2_grpc.workspace = true
+buck2_hash.workspace = true
+buck2_host_sharing_proto.workspace = true
+buck2_test_proto.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+host_sharing.workspace = true
+pagable.workspace = true
+prost-types.workspace = true
+sorted_vector_map.workspace = true
+tokio.workspace = true
+tonic.workspace = true
+tower-layer.workspace = true
+tower-service.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
-assert_matches = { workspace = true }
+assert_matches.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_test_proto/Cargo.toml b/app/buck2_test_proto/Cargo.toml
index 5e6cb32b70b61..a90bfb9c146f1 100644
--- a/app/buck2_test_proto/Cargo.toml
+++ b/app/buck2_test_proto/Cargo.toml
@@ -1,18 +1,22 @@
+# @generated by autocargo from //buck2/app/buck2_test_proto:buck2_test_proto
+
 [package]
 name = "buck2_test_proto"
-
-edition = "2024"
-license = { workspace = true }
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-buck2_data = { workspace = true }
-buck2_host_sharing_proto = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
+buck2_data.workspace = true
+buck2_host_sharing_proto.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_test_runner/Cargo.toml b/app/buck2_test_runner/Cargo.toml
index ef28257669a07..b66b802a165ff 100644
--- a/app/buck2_test_runner/Cargo.toml
+++ b/app/buck2_test_runner/Cargo.toml
@@ -1,18 +1,22 @@
+# @generated by autocargo from //buck2/app/buck2_test_runner:buck2_test_runner
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "buck2_test_runner"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-clap = { workspace = true }
-futures = { workspace = true }
-parking_lot = { workspace = true }
-tokio = { workspace = true }
+async-trait.workspace = true
+buck2_error.workspace = true
+buck2_grpc.workspace = true
+buck2_test_api.workspace = true
+clap.workspace = true
+futures.workspace = true
+host_sharing.workspace = true
+parking_lot.workspace = true
+tokio.workspace = true
 
-buck2_error = { workspace = true }
-buck2_grpc = { workspace = true }
-buck2_test_api = { workspace = true }
-host_sharing = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_transition/Cargo.toml b/app/buck2_transition/Cargo.toml
index bcffa612eca76..d7dcdab9024db 100644
--- a/app/buck2_transition/Cargo.toml
+++ b/app/buck2_transition/Cargo.toml
@@ -1,33 +1,34 @@
+# @generated by autocargo from //buck2/app/buck2_transition:buck2_transition
+
 [package]
-description = "Implementation of configuration transition"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_transition"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-derive_more = { workspace = true }
-either = { workspace = true }
-itertools = { workspace = true }
-ref-cast = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-dupe = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_build_api.workspace = true
+buck2_build_api_derive.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter.workspace = true
+buck2_node.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+either.workspace = true
+gazebo.workspace = true
+itertools.workspace = true
+pagable.workspace = true
+ref-cast.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
 
-buck2_analysis = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_build_api_derive = { workspace = true }
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_node = { workspace = true }
-dice_futures = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_util/BUCK b/app/buck2_util/BUCK
index 933345ac5cf4a..644916e8a0006 100644
--- a/app/buck2_util/BUCK
+++ b/app/buck2_util/BUCK
@@ -2,20 +2,11 @@ load("@fbsource//tools/build_defs:rust_library.bzl", "rust_library")
 
 oncall("build_infra")
 
-# @oss-disable[end= ]: _is_oss = False
-_is_oss = True # @oss-enable
-
 rust_library(
     name = "buck2_util",
     srcs = glob(
         ["src/**/*.rs"],
     ),
-    rustc_flags = (select({
-        "DEFAULT": [],
-        "ovr_config//build_mode:sanitizer_type[asan-ubsan-dev]": ["--cfg=buck2_asan"],
-        "ovr_config//build_mode:sanitizer_type[asan-ubsan]": ["--cfg=buck2_asan"],
-        "ovr_config//build_mode:sanitizer_type[asan]": ["--cfg=buck2_asan"],
-    }) if not _is_oss else []),
     test_deps = [
         "fbcode//buck2/shed/three_billion_instructions:three_billion_instructions",
         "fbsource//third-party/rust:serde_json",
diff --git a/app/buck2_util/Cargo.toml b/app/buck2_util/Cargo.toml
index 4d55f84b9abf6..2579794f027f6 100644
--- a/app/buck2_util/Cargo.toml
+++ b/app/buck2_util/Cargo.toml
@@ -1,47 +1,44 @@
+# @generated by autocargo from //buck2/app/buck2_util:buck2_util
+
 [package]
-description = """
-Unsorted utilities used by buck2. Not specific to buck2, generic enough to be used by other projects.
-but not generic or stable enough to be published on crates.io as standalone crates.
-"""
-edition = "2024"
-license = { workspace = true }
 name = "buck2_util"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-blake3 = { workspace = true }
-dupe = { workspace = true }
-futures = { workspace = true }
-pagable = { workspace = true }
-starlark_map = { workspace = true }
-strong_hash = { workspace = true }
-sysinfo = { workspace = true }
-tracing = { workspace = true }
-triomphe = { workspace = true }
+allocative.workspace = true
+blake3.workspace = true
+buck2_env.workspace = true
+buck2_error.workspace = true
+buck2_hash.workspace = true
+buck2_wrapper_common.workspace = true
+dupe.workspace = true
+futures.workspace = true
+pagable.workspace = true
+serde.workspace = true
+starlark_map.workspace = true
+static_assertions.workspace = true
+strong_hash.workspace = true
+sysinfo.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+triomphe.workspace = true
 
-buck2_env = { workspace = true }
-buck2_error = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_wrapper_common = { workspace = true }
-serde = { workspace = true }
-static_assertions = { workspace = true }
-tokio = { workspace = true }
+[dev-dependencies]
+serde_json.workspace = true
+three_billion_instructions.workspace = true
 
 [target.'cfg(target_os = "linux")'.dependencies]
-perf-event = { workspace = true }
-
-[target.'cfg(unix)'.dependencies]
-libc = { workspace = true }
+libc.workspace = true
+perf-event.workspace = true
 
-[target.'cfg(windows)'.dependencies]
-windows-sys = { workspace = true }
-
-[dev-dependencies]
-serde_json = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+libc.workspace = true
 
-three_billion_instructions = { workspace = true }
+[target.'cfg(target_os = "windows")'.dependencies]
+windows-sys.workspace = true
 
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ["cfg(debug)", "cfg(buck2_asan)"] }
+[lints]
+workspace = true
diff --git a/app/buck2_util/src/threads.rs b/app/buck2_util/src/threads.rs
index 8d3e049538b87..dd1ad8420edcd 100644
--- a/app/buck2_util/src/threads.rs
+++ b/app/buck2_util/src/threads.rs
@@ -46,10 +46,7 @@ pub fn available_parallelism_fresh() -> usize {
 ///
 /// We want to be independent of possible future changes to the default stack size in Rust.
 pub(crate) const THREAD_DEFAULT_STACK_SIZE: usize = {
-    if cfg!(buck2_asan) {
-        // ASAN requires much larger stack size.
-        8 << 20
-    } else if cfg!(debug_assertions) {
+    if cfg!(debug_assertions) {
         // Need 4MB for windows-debug according to D60449433.
         4 << 20
     } else {
diff --git a/app/buck2_validation/Cargo.toml b/app/buck2_validation/Cargo.toml
index 9af1b21b7be3c..664c5556c2dd6 100644
--- a/app/buck2_validation/Cargo.toml
+++ b/app/buck2_validation/Cargo.toml
@@ -1,30 +1,31 @@
+# @generated by autocargo from //buck2/app/buck2_validation:buck2_validation
+
 [package]
-description = """
-This crate defines the implementation logic for validation functionality.
-"""
-edition = "2024"
-license = { workspace = true }
 name = "buck2_validation"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-async-trait = { workspace = true }
-derivative = { workspace = true }
-derive_more = { workspace = true }
-dice = { workspace = true }
-dice_error = { workspace = true }
-dupe = { workspace = true }
-either = { workspace = true }
-futures = { workspace = true }
-pagable = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api.workspace = true
+buck2_core.workspace = true
+buck2_error.workspace = true
+buck2_execute.workspace = true
+buck2_fs.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_error.workspace = true
+dupe.workspace = true
+either.workspace = true
+futures.workspace = true
+pagable.workspace = true
+serde.workspace = true
+serde_json.workspace = true
 
-buck2_artifact = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_core = { workspace = true }
-buck2_error = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_fs = { workspace = true }
+[lints]
+workspace = true
diff --git a/app/buck2_worker_proto/Cargo.toml b/app/buck2_worker_proto/Cargo.toml
index 237689af9ab09..fda2385169c91 100644
--- a/app/buck2_worker_proto/Cargo.toml
+++ b/app/buck2_worker_proto/Cargo.toml
@@ -1,15 +1,19 @@
+# @generated by autocargo from //buck2/app/buck2_worker_proto:buck2_worker_proto
+
 [package]
 name = "buck2_worker_proto"
-
-edition = "2024"
-license = { workspace = true }
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-prost = { workspace = true }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
+prost.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
+
+[lints]
+workspace = true
diff --git a/app/buck2_wrapper_common/Cargo.toml b/app/buck2_wrapper_common/Cargo.toml
index d90bc191a0ed3..21407d5c0984f 100644
--- a/app/buck2_wrapper_common/Cargo.toml
+++ b/app/buck2_wrapper_common/Cargo.toml
@@ -1,35 +1,35 @@
-[package]
-description = """
-Code shared with Meta internal buck2 launcher.
+# @generated by autocargo from //buck2/app/buck2_wrapper_common:buck2_wrapper_common
 
-Careful! The wrapper is not released as part of the regular buck version bumps,
-meaning code changes here are not "atomically" updated.
-"""
-edition = "2024"
-license = { workspace = true }
+[package]
 name = "buck2_wrapper_common"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-derive_more = { workspace = true }
-dupe = { workspace = true }
-serde = { workspace = true }
-shlex = { workspace = true }
-sysinfo = { workspace = true }
-uuid = { workspace = true }
+allocative.workspace = true
+buck2_error.workspace = true
+buck2_hash.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+serde.workspace = true
+shlex.workspace = true
+sysinfo.workspace = true
+uuid.workspace = true
 
-buck2_error = { workspace = true }
-buck2_hash = { workspace = true }
+[dev-dependencies]
+buck2_util.workspace = true
+serde_json.workspace = true
 
-[target.'cfg(unix)'.dependencies]
-nix = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+nix.workspace = true
 
-[target.'cfg(windows)'.dependencies]
-windows-sys = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+nix.workspace = true
 
-[dev-dependencies]
-serde_json = { workspace = true }
+[target.'cfg(target_os = "windows")'.dependencies]
+windows-sys.workspace = true
 
-buck2_util = { workspace = true }
+[lints]
+workspace = true
diff --git a/buck2_sketches/Cargo.toml b/buck2_sketches/Cargo.toml
index f7980cd9ef695..7958125a25e5f 100644
--- a/buck2_sketches/Cargo.toml
+++ b/buck2_sketches/Cargo.toml
@@ -1,11 +1,15 @@
+# @generated by autocargo from //buck2/buck2_sketches:buck2_sketches
+
 [package]
-description = "Typed sketch wrappers for buck2"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_sketches"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-base64 = { workspace = true }
-setsketch = { workspace = true }
+base64.workspace = true
+setsketch.workspace = true
+
+[lints]
+workspace = true
diff --git a/dice/dice/BUCK b/dice/dice/BUCK
index 54557fa6fd25f..9a9dc3ede9464 100644
--- a/dice/dice/BUCK
+++ b/dice/dice/BUCK
@@ -7,6 +7,16 @@ rust_library(
     srcs = glob(
         ["src/**/*.rs"],
     ),
+    # `dep:` is required so cargo doesn't auto-create a same-named implicit
+    # feature that fails to enable the optional dep.
+    autocargo = {
+        "cargo_toml_config": {
+            "features": {
+                "default": ["pagable"],
+                "pagable": ["dep:pagable"],
+            },
+        },
+    },
     crate_root = "src/lib.rs",
     features = ["pagable"],
     test_deps = [
diff --git a/dice/dice/Cargo.toml b/dice/dice/Cargo.toml
index c9dcf7c6aac24..b0175c7cd7442 100644
--- a/dice/dice/Cargo.toml
+++ b/dice/dice/Cargo.toml
@@ -1,55 +1,55 @@
+# @generated by autocargo from //buck2/dice/dice:dice
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "dice"
-repository = { workspace = true }
-version = "0.1.0"
-
-[features]
-default = ["pagable"]
-pagable = ["dep:pagable"]
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-anyhow = "1.0.65"
-anymap3 = "1.0.1"
-async-trait = "0.1.24"
-buck2_hash = { workspace = true }
-cmp_any = { workspace = true }
-dashmap = "6.1.0"
-derivative = { workspace = true }
-derive_more = { version = "1.0.0", features = ["full"] }
-dice_error = { path = "../dice_error" }
-dice_futures = { path = "../dice_futures" }
-dupe = { workspace = true }
-futures = "0.3"
-gazebo = { workspace = true }
-indoc = { workspace = true }
-itertools = "0.14.0"
-lock_free_hashtable = { workspace = true, features = ["allocative"] }
-lock_free_vec = { workspace = true }
-once_cell = "1.21"
+allocative.workspace = true
+anyhow.workspace = true
+anymap3.workspace = true
+async-trait.workspace = true
+buck2_hash.workspace = true
+cmp_any.workspace = true
+dashmap.workspace = true
+derivative.workspace = true
+derive_more.workspace = true
+dice_error.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+itertools.workspace = true
+lock_free_hashtable.workspace = true
+lock_free_vec.workspace = true
 pagable = { workspace = true, optional = true }
-pagable_storage = { workspace = true }
-parking_lot = { version = "0.12.1", features = ["send_guard"] }
-ref-cast = { workspace = true }
-scopeguard = { workspace = true }
-serde = { version = "1.0", features = ["derive"] }
-slab = "0.4.12"
-sled = { workspace = true }
-sorted_vector_map = { workspace = true }
-static_assertions = { workspace = true }
-take_mut = { workspace = true }
-thiserror = "2.0.18"
-tokio = { version = "1.5", features = ["full"] }
-tracing = "0.1.22"
-triomphe = { workspace = true }
-typed-arena = { workspace = true }
+pagable_storage.workspace = true
+parking_lot.workspace = true
+ref-cast.workspace = true
+scopeguard.workspace = true
+serde.workspace = true
+slab.workspace = true
+sorted_vector_map.workspace = true
+static_assertions.workspace = true
+take_mut.workspace = true
+thiserror.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+triomphe.workspace = true
+typed-arena.workspace = true
 
 [dev-dependencies]
-anyhow = "1.0.65"
-assert_matches = "1.5"
-bincode = { workspace = true }
-derivative = "2.2"
-tempfile = "3.1"
-tokio = { version = "1.5", features = ["full"] }
+assert_matches.workspace = true
+bincode.workspace = true
+indoc.workspace = true
+tempfile.workspace = true
+
+[features]
+default = ["pagable"]
+pagable = ["dep:pagable"]
+
+[lints]
+workspace = true
diff --git a/dice/dice_error/Cargo.toml b/dice/dice_error/Cargo.toml
index a1e7f965fdf4e..c56d8202f5f04 100644
--- a/dice/dice_error/Cargo.toml
+++ b/dice/dice_error/Cargo.toml
@@ -1,13 +1,18 @@
+# @generated by autocargo from //buck2/dice/dice_error:dice_error
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "dice_error"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-cmp_any = { workspace = true }
-derive_more = { version = "1.0.0", features = ["full"] }
-dupe = { workspace = true }
-thiserror = "2.0.18"
+allocative.workspace = true
+cmp_any.workspace = true
+derive_more.workspace = true
+dupe.workspace = true
+thiserror.workspace = true
+
+[lints]
+workspace = true
diff --git a/dice/dice_examples/BUCK b/dice/dice_examples/BUCK
index c71eb533eaa62..ccc15ee316f22 100644
--- a/dice/dice_examples/BUCK
+++ b/dice/dice_examples/BUCK
@@ -85,6 +85,8 @@ rust_binary(
         "bin/benchmarks/benchmark_utils.rs",
         "bin/benchmarks/hydration_bench.rs",
     ],
+    # Depends on internal `json_value`; not part of the OSS workspace.
+    autocargo = {"ignore_rule": True},
     compatible_with = ["ovr_config//os:linux"],
     unittests = False,
     deps = [
@@ -112,6 +114,8 @@ rust_binary(
         "bin/benchmarks/bench_runner.rs",
         "bin/benchmarks/table.rs",
     ],
+    # Depends on internal `json_value`; not part of the OSS workspace.
+    autocargo = {"ignore_rule": True},
     deps = [
         "fbsource//third-party/rust:anyhow",
         "fbsource//third-party/rust:clap",
diff --git a/dice/dice_examples/Cargo.toml b/dice/dice_examples/Cargo.toml
index 1b11a0f6f98a6..dfe8d8679dec4 100644
--- a/dice/dice_examples/Cargo.toml
+++ b/dice/dice_examples/Cargo.toml
@@ -1,28 +1,39 @@
+# @generated by autocargo from //buck2/dice/dice_examples:[dice-examples,invalidate_stress,many_cancel,memory_by_key]
+
 [package]
-edition = "2024"
-license = { workspace = true }
-name = "dice_examples"
-repository = { workspace = true }
-version = "0.0.0"
+name = "dice-examples"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
-[dependencies]
-allocative = { workspace = true }
-anyhow = "1.0.65"
-async-trait = "0.1.24"
-clap = { version = "4", features = ["derive"] }
-derive_more = { version = "1.0.0", features = ["full"] }
-dice_futures = { path = "../dice_futures" }
-dupe = { workspace = true }
-futures = "0.3"
-gazebo = { workspace = true }
-pagable = { workspace = true }
-ref-cast = "1.0.0"
-tokio = { version = "1.5", features = ["full"] }
+[[bin]]
+name = "invalidate_stress"
+path = "bin/invalidate_stress.rs"
+
+[[bin]]
+name = "many_cancel"
+path = "bin/many_cancel.rs"
 
-dice = { path = "../dice" }
-dice_error = { path = "../dice_error" }
+[[bin]]
+name = "memory_by_key"
+path = "bin/memory_by_key.rs"
+
+[dependencies]
+allocative.workspace = true
+anyhow.workspace = true
+async-trait.workspace = true
+clap.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_error.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+pagable.workspace = true
+ref-cast.workspace = true
+tokio.workspace = true
 
-[dev-dependencies]
-anyhow = "1.0.65"
-cast = "0.3.0"
-futures = "0.3"
+[lints]
+workspace = true
diff --git a/dice/dice_examples/bin/memory_by_key.rs b/dice/dice_examples/bin/memory_by_key.rs
index e68e54809ef40..144d3307d54a6 100644
--- a/dice/dice_examples/bin/memory_by_key.rs
+++ b/dice/dice_examples/bin/memory_by_key.rs
@@ -40,7 +40,7 @@
 //!
 //! 4. **Final unified report** linearly fits the three phases to extract
 //!    per-edge cost, fixed cost for the One and Many variants, and the
-//!    Box<SPDepsMany> overhead, then prints the per-tx breakdown.
+//!    `Box<SPDepsMany>` overhead, then prints the per-tx breakdown.
 //!
 //! Methodology choices and their reasons:
 //! - Single-threaded tokio runtime: removes per-worker scratch noise.
@@ -174,7 +174,7 @@ enum Shape {
     Chain,
     /// Dense DAG: node i depends on nodes (i+1)..(i+1+dense_width).
     /// Each node has ≈ dense_width deps + dense_width rdeps; uses
-    /// `SeriesParallelDeps::Many` variant (Box<SPDepsMany> overhead).
+    /// `SeriesParallelDeps::Many` variant (`Box<SPDepsMany>` overhead).
     Dense { dense_width: u32 },
 }
 
diff --git a/dice/dice_futures/Cargo.toml b/dice/dice_futures/Cargo.toml
index d71fee435768a..55a41d15959eb 100644
--- a/dice/dice_futures/Cargo.toml
+++ b/dice/dice_futures/Cargo.toml
@@ -1,19 +1,24 @@
+# @generated by autocargo from //buck2/dice/dice_futures:dice_futures
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "dice_futures"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-dupe = { workspace = true }
-futures = "0.3"
-once_cell = { workspace = true }
-parking_lot = { workspace = true }
-pin-project = "1.1.11"
-slab = "0.4.12"
-thiserror = { workspace = true }
-tokio = { version = "1.5", features = ["full"] }
+dupe.workspace = true
+futures.workspace = true
+once_cell.workspace = true
+parking_lot.workspace = true
+pin-project.workspace = true
+slab.workspace = true
+thiserror.workspace = true
+tokio.workspace = true
 
 [dev-dependencies]
-assert_matches = { workspace = true }
+assert_matches.workspace = true
+
+[lints]
+workspace = true
diff --git a/dice/dice_tests/Cargo.toml b/dice/dice_tests/Cargo.toml
index dc8291f39dd26..7ed6089b64573 100644
--- a/dice/dice_tests/Cargo.toml
+++ b/dice/dice_tests/Cargo.toml
@@ -1,22 +1,26 @@
+# @generated by autocargo from //buck2/dice/dice_tests:dice_tests
+
 [package]
-description = "e2e tests for DICE. Live in a separate crate for faster development."
-edition = "2024"
 name = "dice_tests"
-publish = false
-version = "0.0.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dev-dependencies]
-allocative = { workspace = true }
-dice_futures = { workspace = true }
-dupe = { workspace = true }
+allocative.workspace = true
+anyhow.workspace = true
+async-trait.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+pagable.workspace = true
+parking_lot.workspace = true
+tempfile.workspace = true
+tokio.workspace = true
 
-anyhow = { workspace = true }
-async-trait = { workspace = true }
-derive_more = { workspace = true }
-dice = { workspace = true }
-futures = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-parking_lot = { workspace = true }
-tempfile = { workspace = true }
-tokio = { workspace = true }
+[lints]
+workspace = true
diff --git a/dice/read_dump/Cargo.toml b/dice/read_dump/Cargo.toml
index bde3b1c77469e..83c72d59e0f6a 100644
--- a/dice/read_dump/Cargo.toml
+++ b/dice/read_dump/Cargo.toml
@@ -1,14 +1,18 @@
+# @generated by autocargo from //buck2/dice/read_dump:read_dump
+
 [package]
-edition = "2024"
-license = { workspace = true }
 name = "read_dump"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-anyhow = { workspace = true }
-bincode = { workspace = true }
-clap = { workspace = true }
-serde_json = { workspace = true }
+anyhow.workspace = true
+bincode.workspace = true
+clap.workspace = true
+dice.workspace = true
+serde_json.workspace = true
 
-dice = { path = "../dice" }
+[lints]
+workspace = true
diff --git a/games/Cargo.toml b/games/Cargo.toml
index 7977bb0b6177a..283ce3a5ebc35 100644
--- a/games/Cargo.toml
+++ b/games/Cargo.toml
@@ -1,42 +1,24 @@
+# @generated by autocargo from //buck2/games:[blocks,breakout,games,jump,life,menu,minesweeper,snake,sokoban,sokoban_gen,static,twenty48]
+
 [package]
-description = "Some tui games"
-edition = "2024"
 name = "games"
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
-[dependencies]
-anyhow = { workspace = true }
-async-stream = { workspace = true }
-async-trait = { workspace = true }
-clap = { workspace = true }
-futures = { workspace = true }
-image = { workspace = true }
-itertools = { workspace = true }
-rand = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-superconsole = { version = "0.2.0", path = "../superconsole" }
-tokio = { workspace = true }
-
-[target.'cfg(unix)'.dependencies]
-termios = { workspace = true }
+[[bin]]
+name = "blocks"
+path = "bin/blocks.rs"
 
 [[bin]]
 name = "breakout"
 path = "bin/breakout.rs"
 
-[[bin]]
-name = "blocks"
-path = "bin/blocks.rs"
-
 [[bin]]
 name = "jump"
 path = "bin/jump.rs"
 
-[[bin]]
-name = "minesweeper"
-path = "bin/minesweeper.rs"
-
 [[bin]]
 name = "life"
 path = "bin/life.rs"
@@ -45,6 +27,10 @@ path = "bin/life.rs"
 name = "menu"
 path = "bin/menu.rs"
 
+[[bin]]
+name = "minesweeper"
+path = "bin/minesweeper.rs"
+
 [[bin]]
 name = "snake"
 path = "bin/snake.rs"
@@ -58,9 +44,32 @@ name = "sokoban_gen"
 path = "bin/sokoban_gen.rs"
 
 [[bin]]
-name = "static"
+name = "static_"
 path = "bin/static.rs"
 
 [[bin]]
 name = "twenty48"
 path = "bin/twenty48.rs"
+
+[dependencies]
+anyhow.workspace = true
+async-stream.workspace = true
+async-trait.workspace = true
+clap.workspace = true
+futures.workspace = true
+image.workspace = true
+itertools.workspace = true
+rand.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+superconsole.workspace = true
+tokio.workspace = true
+
+[target.'cfg(target_os = "linux")'.dependencies]
+termios.workspace = true
+
+[target.'cfg(target_os = "macos")'.dependencies]
+termios.workspace = true
+
+[lints]
+workspace = true
diff --git a/host_sharing/Cargo.toml b/host_sharing/Cargo.toml
index 73570cac41428..72ade36ffe494 100644
--- a/host_sharing/Cargo.toml
+++ b/host_sharing/Cargo.toml
@@ -1,15 +1,19 @@
+# @generated by autocargo from //buck2/host_sharing:host_sharing
+
 [package]
-authors = ["Logan Wendholt <lwendholt@fb.com>"]
-edition = "2024"
-license = { workspace = true }
 name = "host_sharing"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
-anyhow = { workspace = true }
-dashmap = { workspace = true }
-futures-intrusive = { workspace = true }
-pagable = { workspace = true }
-starlark_map = { workspace = true, features = ["pagable_dep"] }
+allocative.workspace = true
+anyhow.workspace = true
+dashmap.workspace = true
+futures-intrusive.workspace = true
+pagable.workspace = true
+starlark_map.workspace = true
+
+[lints]
+workspace = true
diff --git a/integrations/rust-project/Cargo.toml b/integrations/rust-project/Cargo.toml
index d7aff72a47420..6c47b7604d0e2 100644
--- a/integrations/rust-project/Cargo.toml
+++ b/integrations/rust-project/Cargo.toml
@@ -1,28 +1,25 @@
+# @generated by autocargo from //buck2/integrations/rust-project:rust-project
+
 [package]
-description = "A Rust-centric companion tool to Buck for usage in IDEs."
-edition = "2024"
-license = { workspace = true }
 name = "rust-project"
-readme = "README.md"
-repository = { workspace = true }
-version = "0.0.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-anyhow = { workspace = true }
-clap = { workspace = true }
-crossbeam = { workspace = true }
-dunce = { workspace = true }
-elf = "0.8.0"
-lsp-server = { workspace = true }
-lsp-types = { workspace = true }
-rustc-hash = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-serde_path_to_error = { workspace = true }
-tracing = { workspace = true }
-tracing-core = "0.1.32"
-tracing-subscriber = { workspace = true }
-whoami = "1.4.0"
+anyhow.workspace = true
+clap.workspace = true
+dunce.workspace = true
+elf.workspace = true
+fbinit.workspace = true
+rustc-hash.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+serde_path_to_error.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+whoami.workspace = true
 
 [lints]
 workspace = true
diff --git a/pagable/BUCK b/pagable/BUCK
index b053ad6fcd59b..6fb95c32da5de 100644
--- a/pagable/BUCK
+++ b/pagable/BUCK
@@ -7,6 +7,12 @@ rust_library(
     srcs = glob(
         ["src/**/*.rs"],
     ),
+    # FIXME(JakobDegen): Needed because autocargo doesn't handle the select below
+    autocargo = {
+        "edge_features": [
+            "tokio",
+        ],
+    },
     crate_root = "src/lib.rs",
     features = select({
         "DEFAULT": ["tokio"],
diff --git a/pagable/Cargo.toml b/pagable/Cargo.toml
index fd1bc371bf020..cce1acc192ddc 100644
--- a/pagable/Cargo.toml
+++ b/pagable/Cargo.toml
@@ -11,11 +11,11 @@ allocative = { workspace = true }
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 blake3 = { workspace = true }
-bytemuck = { workspace = true }
+bytemuck = { version = "1.25", features = ["const_zeroed", "derive", "min_const_generics", "must_cast"] }
 dashmap = { workspace = true }
 dupe = { workspace = true }
 either = { workspace = true }
-erased-serde = { workspace = true }
+erased-serde = "0.4.9"
 fancy-regex = { workspace = true }
 indexmap = { workspace = true }
 inventory = { workspace = true }
@@ -23,7 +23,7 @@ num-bigint = { workspace = true }
 once_cell = { workspace = true }
 pagable_derive = { version = "=0.4.1", path = "../pagable_derive" }
 parking_lot = { workspace = true }
-postcard = { workspace = true }
+postcard = { version = "1.0.8", features = ["use-crc", "use-std"] }
 regex = { workspace = true }
 sequence_trie = { workspace = true }
 serde = { workspace = true }
diff --git a/pagable_storage/BUCK b/pagable_storage/BUCK
index a5033116039f6..804e16f49797b 100644
--- a/pagable_storage/BUCK
+++ b/pagable_storage/BUCK
@@ -7,6 +7,12 @@ rust_library(
     srcs = glob(
         ["src/**/*.rs"],
     ),
+    # FIXME(JakobDegen): Needed because autocargo doesn't handle the select below
+    autocargo = {
+        "edge_features": [
+            "tokio",
+        ],
+    },
     crate_root = "src/lib.rs",
     features = select({
         "DEFAULT": ["tokio"],
diff --git a/pagable_storage/Cargo.toml b/pagable_storage/Cargo.toml
index db50779aaba5c..a99e739c83a5c 100644
--- a/pagable_storage/Cargo.toml
+++ b/pagable_storage/Cargo.toml
@@ -9,12 +9,12 @@ version = "0.4.1"
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-bytemuck = { workspace = true }
+bytemuck = { version = "1.25" }
 dashmap = { workspace = true }
 either = { workspace = true }
 pagable = { version = "=0.4.1", path = "../pagable" }
 rusqlite = { version = "0.37.0", features = ["bundled"] }
-sled = { workspace = true }
+sled = { version = "0.34" }
 tokio = { workspace = true, optional = true }
 
 [features]
diff --git a/proto_defs.bzl b/proto_defs.bzl
index 87888016821a9..3c6e0ec5fc8dc 100644
--- a/proto_defs.bzl
+++ b/proto_defs.bzl
@@ -47,6 +47,10 @@ def _rust_protobuf_library(name, srcs, build_script, buck2_protoc_dev, prost_ver
     buck_rust_binary(
         name = build_name,
         srcs = [build_script],
+        # Don't emit a `[[bin]]` in the generated Cargo.toml. Cargo
+        # auto-detects `build.rs` as a build script; `buck2_protoc_dev` is
+        # wired in as a build-dependency on the rust_library below.
+        autocargo = {"ignore_rule": True},
         crate_root = build_script,
         deps = [
             "fbcode//buck2/app/buck2_protoc_dev:" + buck2_protoc_dev,
@@ -81,6 +85,15 @@ def _rust_protobuf_library(name, srcs, build_script, buck2_protoc_dev, prost_ver
         name = name,
         crate = crate_name or name,
         srcs = srcs,
+        autocargo = {
+            "cargo_toml_config": {
+                "extra_buck_dependencies": {
+                    "build-dependencies": [
+                        "fbcode//buck2/app/buck2_protoc_dev:" + buck2_protoc_dev,
+                    ],
+                },
+            },
+        },
         doctests = doctests,
         env = {
             # This is where prost looks for generated .rs files
diff --git a/remote_execution/oss/re_grpc/Cargo.toml b/remote_execution/oss/re_grpc/Cargo.toml
index b1843cb602132..94ab95ab7be5e 100644
--- a/remote_execution/oss/re_grpc/Cargo.toml
+++ b/remote_execution/oss/re_grpc/Cargo.toml
@@ -1,41 +1,42 @@
+# @generated by autocargo from //buck2/remote_execution/oss/re_grpc:remote_execution
+
 [package]
-description = "A library providing remote execution using gRPC"
-edition = "2024"
-license = { workspace = true }
 name = "remote_execution"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-anyhow = { workspace = true }
-async-compression = { workspace = true }
-dupe = { workspace = true }
-futures = { workspace = true }
-gazebo = { workspace = true }
-http = { workspace = true }
-http-body = { workspace = true }
-http-body-util = { workspace = true }
-hyper = { workspace = true }
-hyper-util = { workspace = true }
-lru = { workspace = true }
-once_cell = { workspace = true }
-prost = { workspace = true }
-prost-types = { workspace = true }
-rand = { workspace = true }
-regex = { workspace = true }
-thiserror = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-tokio-util = { workspace = true }
-tonic = { workspace = true }
-tower = { workspace = true }
-tracing = { workspace = true }
-uuid = { workspace = true }
-zstd = { workspace = true }
-
-buck2_re_configuration = { workspace = true }
-buck2_util = { workspace = true }
-re_grpc_proto = { path = "../re_grpc_proto" }
+anyhow.workspace = true
+async-compression.workspace = true
+buck2_re_configuration.workspace = true
+buck2_util.workspace = true
+dupe.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+http.workspace = true
+http-body.workspace = true
+http-body-util.workspace = true
+hyper.workspace = true
+hyper-util.workspace = true
+lru.workspace = true
+once_cell.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+rand.workspace = true
+re_grpc_proto.workspace = true
+regex.workspace = true
+thiserror.workspace = true
+tokio.workspace = true
+tokio-util.workspace = true
+tonic.workspace = true
+tower.workspace = true
+tracing.workspace = true
+uuid.workspace = true
 
 [dev-dependencies]
-tempfile = { workspace = true }
+tempfile.workspace = true
+
+[lints]
+workspace = true
diff --git a/remote_execution/oss/re_grpc_proto/Cargo.toml b/remote_execution/oss/re_grpc_proto/Cargo.toml
index 243a87b99fd71..8ae9a0eef7e60 100644
--- a/remote_execution/oss/re_grpc_proto/Cargo.toml
+++ b/remote_execution/oss/re_grpc_proto/Cargo.toml
@@ -1,19 +1,22 @@
+# @generated by autocargo from //buck2/remote_execution/oss/re_grpc_proto:re_grpc_proto
+
 [package]
-description = "A library providing gRPC client for Bazel remote execution"
-edition = "2024"
-license = { workspace = true }
 name = "re_grpc_proto"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-prost = { workspace = true }
-prost-types = { workspace = true }
-serde = { workspace = true, features = ["derive"] }
-tonic = { workspace = true }
-tonic-prost = { workspace = true }
-
-buck2_data = { workspace = true }
+buck2_data.workspace = true
+prost.workspace = true
+prost-types.workspace = true
+serde.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
 [build-dependencies]
-buck2_protoc_dev = { workspace = true }
+buck2_protoc_dev.workspace = true
+
+[lints]
+workspace = true
diff --git a/shed/lock_free_hashtable/Cargo.toml b/shed/lock_free_hashtable/Cargo.toml
index 3fd4d6bcdfb8a..a5230df8f930c 100644
--- a/shed/lock_free_hashtable/Cargo.toml
+++ b/shed/lock_free_hashtable/Cargo.toml
@@ -8,11 +8,11 @@ version = "0.1.4"
 
 [dependencies]
 allocative = { version = "0.3.6", path = "../../allocative/allocative", default-features = false, optional = true }
-atomic = { workspace = true }
+atomic = "0.5.3"
 parking_lot = "0.12.1"
 
 [dev-dependencies]
-num_cpus = { workspace = true }
+num_cpus = "1.16"
 
 [features]
 allocative = ["dep:allocative"]
diff --git a/shed/lock_free_vec/Cargo.toml b/shed/lock_free_vec/Cargo.toml
index 2abd2837e6ad9..2596d618eda58 100644
--- a/shed/lock_free_vec/Cargo.toml
+++ b/shed/lock_free_vec/Cargo.toml
@@ -1,10 +1,14 @@
+# @generated by autocargo from //buck2/shed/lock_free_vec:lock_free_vec
+
 [package]
-description = "Data structure"
-edition = "2024"
-license = { workspace = true }
 name = "lock_free_vec"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-allocative = { workspace = true }
+allocative.workspace = true
+
+[lints]
+workspace = true
diff --git a/shed/provider/Cargo.toml b/shed/provider/Cargo.toml
index d2d357df897cd..8ef34dce57217 100644
--- a/shed/provider/Cargo.toml
+++ b/shed/provider/Cargo.toml
@@ -1,7 +1,11 @@
+# @generated by autocargo from //buck2/shed/provider:provider
+
 [package]
-description = "std::any::Provider replacement"
-edition = "2024"
-license = { workspace = true }
 name = "provider"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
+
+[lints]
+workspace = true
diff --git a/shed/setsketch/Cargo.toml b/shed/setsketch/Cargo.toml
index 273e53184c9b6..54d1f827b871f 100644
--- a/shed/setsketch/Cargo.toml
+++ b/shed/setsketch/Cargo.toml
@@ -1,16 +1,25 @@
+# @generated by autocargo from //buck2/shed/setsketch:[setsketch,sketch_size]
+
 [package]
-description = "Set sketches used by buck2"
-edition = "2024"
-license = { workspace = true }
 name = "setsketch"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
+
+[[bin]]
+name = "sketch_size"
+path = "bin/sketch_size.rs"
 
 [dependencies]
-base64 = { workspace = true }
-rand = { workspace = true }
-rand_distr = { workspace = true }
-rand_xoshiro = { workspace = true }
+anyhow.workspace = true
+base64.workspace = true
+rand.workspace = true
+rand_distr.workspace = true
+rand_xoshiro.workspace = true
 
 [dev-dependencies]
-fnv = { workspace = true }
+fnv.workspace = true
+
+[lints]
+workspace = true
diff --git a/shed/three_billion_instructions/Cargo.toml b/shed/three_billion_instructions/Cargo.toml
index a163a07b0f0c7..eb188901a0986 100644
--- a/shed/three_billion_instructions/Cargo.toml
+++ b/shed/three_billion_instructions/Cargo.toml
@@ -1,11 +1,18 @@
+# @generated by autocargo from //buck2/shed/three_billion_instructions:[three_billion_instructions,three_billion_instructions-bin]
+
 [package]
-authors = ["Meta"]
-description = "Run 3B instructions"
-edition = "2024"
-license = { workspace = true }
 name = "three_billion_instructions"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
+
+[[bin]]
+name = "three_billion_instructions_bin"
+path = "bin/three_billion_instructions.rs"
 
 [dependencies]
-thiserror = { workspace = true }
+thiserror.workspace = true
+
+[lints]
+workspace = true