From b7de3adef6bf9778f8e1cb90e75090b5cb7963f6 Mon Sep 17 00:00:00 2001
From: Chris Busillo <info@shinycomputers.com>
Date: Mon, 25 May 2026 11:37:18 -0400
Subject: [PATCH] chore(local): keep release binary out of fast builds

---
 AGENTS.md                                  |  2 +-
 build-fast.sh                              | 10 ++++++----
 docs/local-overlay.md                      | 11 +++++++++--
 justfile                                   |  4 ++++
 scripts/local/rebuild-path-code.sh         |  4 ++++
 scripts/local/remove-homebrew-code-link.sh | 20 ++++++++++++++++++++
 6 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100755 scripts/local/remove-homebrew-code-link.sh

diff --git a/AGENTS.md b/AGENTS.md
index 30aeddc5364a..9ef03991af60 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -68,7 +68,7 @@ Examples:
 
 - `main` is the Every Code product branch and the GitHub default branch.
 - Use `just local-code-rebuild` to rebuild the current branch into the PATH-resolved binary.
-- After `./build-fast.sh`, run `just local-code-rebuild` again before release smoke checks; the fast build can leave the PATH-resolved `code` pointing at a dev-fast binary that reports `0.0.0`.
+- After `./build-fast.sh`, run `just local-code-rebuild` again before release smoke checks; the fast build validates dev-fast artifacts, while the rebuild recipe owns the PATH-resolved release binary and embeds the package version.
 - Before leaving a local work session, run `just local-cleanup-space --apply`
   to remove rebuildable target/cache artifacts while preserving
   `code-rs/target/release/code`.
diff --git a/build-fast.sh b/build-fast.sh
index 1654bedcfa65..d816ca38e572 100755
--- a/build-fast.sh
+++ b/build-fast.sh
@@ -723,11 +723,13 @@ if [ $? -eq 0 ]; then
       fi
     fi
 
-    mkdir -p ./target/release
-    if [ -e "./target/release/${CRATE_PREFIX}" ]; then
-        rm -f "./target/release/${CRATE_PREFIX}"
+    if [ "$PROFILE" = "release" ] || [ "$PROFILE" = "release-prod" ]; then
+      mkdir -p ./target/release
+      if [ -e "./target/release/${CRATE_PREFIX}" ]; then
+          rm -f "./target/release/${CRATE_PREFIX}"
+      fi
+      ln -sf "${release_link_target}" "./target/release/${CRATE_PREFIX}"
     fi
-    ln -sf "${release_link_target}" "./target/release/${CRATE_PREFIX}"
 
     # Update the symlinks in CLI wrapper directories
     if [ -d "../codex-cli/bin" ]; then
diff --git a/docs/local-overlay.md b/docs/local-overlay.md
index a1ae90d37a49..0e1e833b1e58 100644
--- a/docs/local-overlay.md
+++ b/docs/local-overlay.md
@@ -76,8 +76,15 @@ code exec -m gpt-5.5 --sandbox read-only --max-seconds 30 "Reply with exactly OK
 ```
 
 Run `just local-code-rebuild` after any release-readiness `./build-fast.sh` run:
-the fast build can leave the PATH-resolved `code` pointing at a dev-fast binary
-that reports `0.0.0`.
+the fast build creates dev-fast artifacts for validation, while the rebuild
+recipe owns the PATH-resolved release binary and embeds the package version.
+
+If an old manual Homebrew link exists, remove it so PATH resolution stays
+repo-owned and predictable:
+
+```sh
+just local-remove-homebrew-code-link
+```
 
 ## Session Exit Cleanup
 
diff --git a/justfile b/justfile
index f093ec746bf7..772e32b379fc 100644
--- a/justfile
+++ b/justfile
@@ -67,6 +67,10 @@ bazel-lock-check:
 local-code-rebuild:
     ./scripts/local/rebuild-path-code.sh
 
+[no-cd]
+local-remove-homebrew-code-link:
+    ./scripts/local/remove-homebrew-code-link.sh
+
 [no-cd]
 local-upstream-import:
     ./scripts/local/update-overlay-from-upstream.sh
diff --git a/scripts/local/rebuild-path-code.sh b/scripts/local/rebuild-path-code.sh
index 8ac3d1de79e7..48e323f6630c 100755
--- a/scripts/local/rebuild-path-code.sh
+++ b/scripts/local/rebuild-path-code.sh
@@ -12,6 +12,10 @@ resolve_code_version() {
 code_version="${CODE_VERSION:-$(resolve_code_version || true)}"
 
 echo "Building release binary from $code_rs_root"
+if [[ -L "$release_bin" ]]; then
+	echo "Replacing release-bin symlink with a real binary: $release_bin"
+	rm -f "$release_bin"
+fi
 if [[ -n "$code_version" ]]; then
 	echo "Embedding CODE_VERSION=$code_version"
 	CODE_VERSION="$code_version" cargo build --manifest-path "$code_rs_root/Cargo.toml" -p code-cli --release
diff --git a/scripts/local/remove-homebrew-code-link.sh b/scripts/local/remove-homebrew-code-link.sh
new file mode 100755
index 000000000000..42fc3bbd4eb9
--- /dev/null
+++ b/scripts/local/remove-homebrew-code-link.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+homebrew_link="/opt/homebrew/bin/code"
+repo_release_bin="$repo_root/code-rs/target/release/code"
+
+if [[ ! -L "$homebrew_link" ]]; then
+	echo "No Homebrew code symlink to remove: $homebrew_link"
+	exit 0
+fi
+
+link_target="$(readlink "$homebrew_link")"
+if [[ "$link_target" != "$repo_release_bin" ]]; then
+	echo "Refusing to remove $homebrew_link; it points to $link_target" >&2
+	exit 1
+fi
+
+rm -f "$homebrew_link"
+echo "Removed stale Homebrew code symlink: $homebrew_link"