diff --git a/justfile b/justfile
index a1390ba1d0..4d9a00bea7 100644
--- a/justfile
+++ b/justfile
@@ -1,6 +1,7 @@
 set working-directory := "codex-rs"
 set positional-arguments
 
+repo_root := justfile_directory()
 rust_min_stack := "8388608" # 8 MiB
 
 # Display help
@@ -33,9 +34,9 @@ app-server-test-client *args:
 # Format Rust and Python SDK code.
 [no-cd]
 fmt:
-    cd {{ justfile_directory() }}/codex-rs && cargo fmt -- --config imports_granularity=Item 2>/dev/null
-    cd {{ justfile_directory() }}/sdk/python && uv run --extra dev ruff check --fix --fix-only .
-    cd {{ justfile_directory() }}/sdk/python && uv run --extra dev ruff format .
+    cargo fmt --manifest-path "{{ repo_root }}/codex-rs/Cargo.toml" --all -- --config imports_granularity=Item 2>/dev/null
+    uv run --project "{{ repo_root }}/sdk/python" --extra dev ruff check --fix --fix-only "{{ repo_root }}/sdk/python"
+    uv run --project "{{ repo_root }}/sdk/python" --extra dev ruff format "{{ repo_root }}/sdk/python"
 
 fix *args:
     cargo clippy --fix --tests --allow-dirty "$@"