diff --git a/docs/config.md b/docs/config.md
index 3b06d73019..0ba711f02c 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -464,10 +464,11 @@ http_headers = { "HEADER_NAME" = "HEADER_VALUE" }
 env_http_headers = { "HEADER_NAME" = "ENV_VAR" }
 ```
 
-Streamable HTTP connections always use the experimental Rust MCP client under the hood, so expect occasional rough edges. OAuth login flows are gated on the `experimental_use_rmcp_client = true` flag:
+Streamable HTTP connections always use the experimental Rust MCP client under the hood, so expect occasional rough edges. OAuth login flows are gated on the `rmcp_client = true` flag:
 
 ```toml
-experimental_use_rmcp_client = true
+[features]
+rmcp_client = true
 ```
 
 After enabling it, run `codex mcp login <server-name>` when the server supports OAuth.
@@ -489,17 +490,6 @@ disabled_tools = ["search"]
 
 When both `enabled_tools` and `disabled_tools` are specified, Codex first restricts the server to the allow-list and then removes any tools that appear in the deny-list.
 
-#### Experimental RMCP client
-
-This flag enables OAuth support for streamable HTTP servers.
-
-```toml
-experimental_use_rmcp_client = true
-
-[mcp_servers.server_name]
-…
-```
-
 #### MCP CLI commands
 
 ```shell
diff --git a/docs/contributing.md b/docs/contributing.md
index fc3d5ce836..983d64e6dc 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -25,7 +25,7 @@ If you want to add a new feature or change the behavior of an existing one, plea
 
 - Fill in the PR template (or include similar information) - **What? Why? How?**
 - Include a link to a bug report or enhancement request in the issue tracker
-- Run **all** checks locally (`cargo test && cargo clippy --tests && cargo fmt -- --config imports_granularity=Item`). CI failures that could have been caught locally slow down the process.
+- Run **all** checks locally. Use the root `just` helpers so you stay consistent with the rest of the workspace: `just fmt`, `just fix -p <crate>` for the crate you touched, and the relevant tests (e.g., `cargo test -p codex-tui` or `just test` if you need a full sweep). CI failures that could have been caught locally slow down the process.
 - Make sure your branch is up-to-date with `main` and that you have resolved merge conflicts.
 - Mark the PR as **Ready for review** only when you believe it is in a merge-able state.
 
diff --git a/docs/example-config.md b/docs/example-config.md
index 6061dc8830..f5b3c62904 100644
--- a/docs/example-config.md
+++ b/docs/example-config.md
@@ -226,12 +226,6 @@ enable_experimental_windows_sandbox = false
 # Experimental toggles (legacy; prefer [features])
 ################################################################################
 
-# Use experimental unified exec tool. Default: false
-experimental_use_unified_exec_tool = false
-
-# Use experimental Rust MCP client (enables OAuth for HTTP MCP). Default: false
-experimental_use_rmcp_client = false
-
 # Include apply_patch via freeform editing path (affects default tool set). Default: false
 experimental_use_freeform_apply_patch = false
 
@@ -319,8 +313,6 @@ experimental_use_freeform_apply_patch = false
 # chatgpt_base_url = "https://chatgpt.com/backend-api/"
 # experimental_compact_prompt_file = "compact_prompt.txt"
 # include_apply_patch_tool = false
-# experimental_use_unified_exec_tool = false
-# experimental_use_rmcp_client = false
 # experimental_use_freeform_apply_patch = false
 # experimental_sandbox_command_assessment = false
 # tools_web_search = false
diff --git a/docs/install.md b/docs/install.md
index 724a524e3b..b54b74f16c 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -24,6 +24,10 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 source "$HOME/.cargo/env"
 rustup component add rustfmt
 rustup component add clippy
+# Install helper tools used by the workspace justfile:
+cargo install just
+# Optional: install nextest for the `just test` helper (or use `cargo test --all-features` as a fallback)
+cargo install cargo-nextest
 
 # Build Codex.
 cargo build
@@ -31,10 +35,14 @@ cargo build
 # Launch the TUI with a sample prompt.
 cargo run --bin codex -- "explain this codebase to me"
 
-# After making changes, ensure the code is clean.
-cargo fmt -- --config imports_granularity=Item
-cargo clippy --tests
+# After making changes, use the root justfile helpers (they default to codex-rs):
+just fmt
+just fix -p <crate-you-touched>
 
-# Run the tests.
-cargo test
+# Run the relevant tests (project-specific is fastest), for example:
+cargo test -p codex-tui
+# If you have cargo-nextest installed, `just test` runs the full suite:
+just test
+# Otherwise, fall back to:
+cargo test --all-features
 ```