From 37ed4ddc9857c0b0d62a1785c83f55166c8553e6 Mon Sep 17 00:00:00 2001
From: starr-openai <starr@openai.com>
Date: Fri, 3 Apr 2026 11:30:24 -0700
Subject: [PATCH] docs: update devbox run helper for main

---
 .../skills/codex-applied-devbox/SKILL.md      | 30 ++++++++-----------
 .../scripts/sync-worktree-and-run             |  8 ++---
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/personal/starr/skills/codex-applied-devbox/SKILL.md b/personal/starr/skills/codex-applied-devbox/SKILL.md
index 30a142556d..b3abe68c47 100644
--- a/personal/starr/skills/codex-applied-devbox/SKILL.md
+++ b/personal/starr/skills/codex-applied-devbox/SKILL.md
@@ -94,10 +94,7 @@ Default behavior:
 - remote command:
   `cd codex-rs && export PATH=$HOME/code/openai/project/dotslash-gen/bin:$HOME/.local/bin:$PATH && bazel build --bes_backend= --bes_results_url= //codex-rs/cli:cli`
 - prints the exact copy-paste remote Codex Bazel run command for the mirrored checkout
-- the helper command uses `cargo run -p codex-cli --` because that path has
-  been verified on `dev`
-- do not switch the helper command back to Bazel `run` on `dev` until the
-  remote linker failure is resolved
+- the helper command intentionally stays on the mirrored-worktree Bazel path and uses `//codex-rs/cli:codex`
 
 Example:
 
@@ -114,7 +111,7 @@ This will mirror:
 It will print:
 
 ```bash
-ssh -t dev 'cd /tmp/codex-worktrees/my-feature/codex-rs && cargo run -p codex-cli --'
+ssh -t dev 'cd /tmp/codex-worktrees/my-feature/codex-rs && export PATH=$HOME/code/openai/project/dotslash-gen/bin:$HOME/.local/bin:$PATH && bazel run --bes_backend= --bes_results_url= //codex-rs/cli:codex --'
 ```
 
 Custom host, remote root, and command:
@@ -185,17 +182,14 @@ What has been verified:
 - `sync-worktree-and-run` can mirror the local worktree and complete a remote
   Bazel build with:
   `bazel build --bes_backend= --bes_results_url= //codex-rs/cli:cli`
-- `cargo run -p codex-cli -- --help` works from the mirrored remote checkout
-- an interactive `cargo run -p codex-cli --` session starts successfully from
-  the mirrored remote checkout
+- on current `main`, `bazel run --bes_backend= --bes_results_url=
+  //codex-rs/cli:codex --` builds successfully on `dev`
 
-Current caveat:
+Practical note:
 
-- `bazel run --bes_backend= --bes_results_url= //codex-rs/cli:codex --`
-  currently fails on `dev` with a linker error referencing
-  `__libc_csu_init` / `__libc_csu_fini`
-- because of that, the skill's printed helper command intentionally uses
-  `cargo run -p codex-cli --` even though the build step remains Bazel-based
+- older pre-`#16634` checkouts could fail on `dev` when launching
+  `//codex-rs/cli:codex`; treat current `main` as the baseline before carrying
+  that older caveat forward
 
 ## Bazel defaults on the devbox
 
@@ -213,11 +207,11 @@ Use this decision rule:
   - `//codex-rs/tui:tui`
   - `//codex-rs/utils/absolute-path:absolute-path`
 
-Current practical caveat:
+Current practical note:
 
-- `//codex-rs/cli:codex` is not the default helper path here because it hit a
-  remote linker failure on `dev` during validation (`undefined symbol:
-  __libc_csu_init` / `__libc_csu_fini`).
+- older pre-`#16634` checkouts could fail on `dev` when launching
+  `//codex-rs/cli:codex`; re-test current `main` before treating that older
+  caveat as still active
 
 What is shared versus isolated:
 
diff --git a/personal/starr/skills/codex-applied-devbox/scripts/sync-worktree-and-run b/personal/starr/skills/codex-applied-devbox/scripts/sync-worktree-and-run
index afdfbd5284..44886b5af7 100755
--- a/personal/starr/skills/codex-applied-devbox/scripts/sync-worktree-and-run
+++ b/personal/starr/skills/codex-applied-devbox/scripts/sync-worktree-and-run
@@ -21,10 +21,8 @@ Options:
                               $HOME/.local/bin:$PATH &&
                               bazel build --bes_backend= --bes_results_url=
                               //codex-rs/cli:cli
-  Prints the exact Codex SSH run command for the mirrored checkout on every
-  run. The default remote build remains Bazel-backed, but the helper run
-  command uses cargo because `bazel run //codex-rs/cli:codex` is currently not
-  reliable on `dev`.
+  Prints the exact Bazel-backed Codex SSH run command for the mirrored
+  checkout on every run.
   -h, --help                  Show this help text.
 EOF
 }
@@ -111,7 +109,7 @@ esac
 
 remote_worktree="${remote_root%/}/$relative_path"
 remote_codex_dir="${remote_worktree%/}/codex-rs"
-remote_codex_run_command="cd $remote_codex_dir && cargo run -p codex-cli --"
+remote_codex_run_command="cd $remote_codex_dir && export PATH=\$HOME/code/openai/project/dotslash-gen/bin:\$HOME/.local/bin:\$PATH && bazel run --bes_backend= --bes_results_url= //codex-rs/cli:codex --"
 
 echo "# Shared-worktree Bazel Codex run command:"
 echo "ssh -t $host $(shell_single_quote "$remote_codex_run_command")"