Merge 811e095ebb into sapling-pr-archive-bolinfest

codex-cli/scripts/install_native_deps.py

@@ -20,9 +20,10 @@ from urllib.request import urlopen
 
 SCRIPT_DIR = Path(__file__).resolve().parent
 CODEX_CLI_ROOT = SCRIPT_DIR.parent
+REPO_ROOT = CODEX_CLI_ROOT.parent
 DEFAULT_WORKFLOW_URL = "https://github.com/openai/codex/actions/runs/26131514935"  # rust-v0.132.0
 VENDOR_DIR_NAME = "vendor"
-RG_MANIFEST = CODEX_CLI_ROOT / "bin" / "rg"
+RG_MANIFEST = REPO_ROOT / "scripts" / "codex_package" / "rg"
 BINARY_TARGETS = (
     "x86_64-unknown-linux-musl",
     "aarch64-unknown-linux-musl",

scripts/codex_package/README.md

@@ -56,7 +56,7 @@ Windows packages. This keeps package archive creation as a pure staging step
 after signing instead of rebuilding resources.
 
 `rg` is not built from this repository, so the builder fetches it from the
-DotSlash manifest at `codex-cli/bin/rg`. Downloaded archives are cached under
-`$TMPDIR/codex-package/<target>-rg` and are reused only after the recorded size
-and SHA-256 digest have been verified. Pass `--rg-bin` to use a local ripgrep
-executable instead.
+DotSlash manifest at `scripts/codex_package/rg`. Downloaded archives are cached
+under `$TMPDIR/codex-package/<target>-rg` and are reused only after the recorded
+size and SHA-256 digest have been verified. Pass `--rg-bin` to use a local
+ripgrep executable instead.

scripts/codex_package/cli.py

@@ -114,7 +114,7 @@ def parse_args() -> argparse.Namespace:
         type=Path,
         help=(
             "Optional local ripgrep executable override instead of fetching from "
-            "codex-cli/bin/rg."
+            "scripts/codex_package/rg."
         ),
     )
     return parser.parse_args()

scripts/codex_package/ripgrep.py

@@ -1,4 +1,4 @@
-"""Fetch ripgrep from the DotSlash manifest used by the npm package."""
+"""Fetch ripgrep from the DotSlash manifest used by the package builder."""
 
 import hashlib
 import json
@@ -17,7 +17,7 @@ from .targets import TargetSpec
 from .targets import resolve_input_path
 
 
-RG_MANIFEST = REPO_ROOT / "codex-cli" / "bin" / "rg"
+RG_MANIFEST = REPO_ROOT / "scripts" / "codex_package" / "rg"
 DOWNLOAD_TIMEOUT_SECS = 60