feat: include Windows binary of the CLI in the npm release

codex-cli/scripts/install_native_deps.sh

@@ -2,13 +2,8 @@
 
 # Install native runtime dependencies for codex-cli.
 #
-# By default the script copies the sandbox binaries that are required at
-# runtime. When called with the --full-native flag, it additionally
-# bundles pre-built Rust CLI binaries so that the resulting npm package can run
-# the native implementation when users set CODEX_RUST=1.
-#
 # Usage
-#   install_native_deps.sh [--full-native] [--workflow-url URL] [CODEX_CLI_ROOT]
+#   install_native_deps.sh [--workflow-url URL] [CODEX_CLI_ROOT]
 #
 # The optional RELEASE_ROOT is the path that contains package.json.  Omitting
 # it installs the binaries into the repository's own bin/ folder to support
@@ -21,18 +16,14 @@ set -euo pipefail
 # ------------------
 
 CODEX_CLI_ROOT=""
-INCLUDE_RUST=0
 
 # Until we start publishing stable GitHub releases, we have to grab the binaries
 # from the GitHub Action that created them. Update the URL below to point to the
 # appropriate workflow run:
-WORKFLOW_URL="https://github.com/openai/codex/actions/runs/15981617627"
+WORKFLOW_URL="https://github.com/openai/codex/actions/runs/16840150768" # rust-v0.20.0-alpha.2
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
-    --full-native)
-      INCLUDE_RUST=1
-      ;;
     --workflow-url)
       shift || { echo "--workflow-url requires an argument"; exit 1; }
       if [ -n "$1" ]; then
@@ -81,26 +72,20 @@ trap 'rm -rf "$ARTIFACTS_DIR"' EXIT
 # NB: The GitHub CLI `gh` must be installed and authenticated.
 gh run download --dir "$ARTIFACTS_DIR" --repo openai/codex "$WORKFLOW_ID"
 
-# Decompress the artifacts for Linux sandboxing.
-zstd -d "$ARTIFACTS_DIR/x86_64-unknown-linux-musl/codex-linux-sandbox-x86_64-unknown-linux-musl.zst" \
-     -o "$BIN_DIR/codex-linux-sandbox-x64"
-
-zstd -d "$ARTIFACTS_DIR/aarch64-unknown-linux-musl/codex-linux-sandbox-aarch64-unknown-linux-musl.zst" \
-     -o "$BIN_DIR/codex-linux-sandbox-arm64"
-
-if [[ "$INCLUDE_RUST" -eq 1 ]]; then
-  # x64 Linux
-  zstd -d "$ARTIFACTS_DIR/x86_64-unknown-linux-musl/codex-x86_64-unknown-linux-musl.zst" \
-      -o "$BIN_DIR/codex-x86_64-unknown-linux-musl"
-  # ARM64 Linux
-  zstd -d "$ARTIFACTS_DIR/aarch64-unknown-linux-musl/codex-aarch64-unknown-linux-musl.zst" \
-      -o "$BIN_DIR/codex-aarch64-unknown-linux-musl"
-  # x64 macOS
-  zstd -d "$ARTIFACTS_DIR/x86_64-apple-darwin/codex-x86_64-apple-darwin.zst" \
-      -o "$BIN_DIR/codex-x86_64-apple-darwin"
-  # ARM64 macOS
-  zstd -d "$ARTIFACTS_DIR/aarch64-apple-darwin/codex-aarch64-apple-darwin.zst" \
-      -o "$BIN_DIR/codex-aarch64-apple-darwin"
-fi
+# x64 Linux
+zstd -d "$ARTIFACTS_DIR/x86_64-unknown-linux-musl/codex-x86_64-unknown-linux-musl.zst" \
+    -o "$BIN_DIR/codex-x86_64-unknown-linux-musl"
+# ARM64 Linux
+zstd -d "$ARTIFACTS_DIR/aarch64-unknown-linux-musl/codex-aarch64-unknown-linux-musl.zst" \
+    -o "$BIN_DIR/codex-aarch64-unknown-linux-musl"
+# x64 macOS
+zstd -d "$ARTIFACTS_DIR/x86_64-apple-darwin/codex-x86_64-apple-darwin.zst" \
+    -o "$BIN_DIR/codex-x86_64-apple-darwin"
+# ARM64 macOS
+zstd -d "$ARTIFACTS_DIR/aarch64-apple-darwin/codex-aarch64-apple-darwin.zst" \
+    -o "$BIN_DIR/codex-aarch64-apple-darwin"
+# x64 Windows
+zstd -d "$ARTIFACTS_DIR/x86_64-pc-windows-msvc/codex-x86_64-pc-windows-msvc.exe.zst" \
+    -o "$BIN_DIR/codex-x86_64-pc-windows-msvc.exe"
 
 echo "Installed native dependencies into $BIN_DIR"

codex-cli/scripts/stage_release.sh

@@ -7,15 +7,8 @@
 # Usage:
 #
 #   --tmp <dir>  : Use <dir> instead of a freshly created temp directory.
-#   --native     : Bundle the pre-built Rust CLI binaries for Linux alongside
-#                  the JavaScript implementation (a so-called "fat" package).
 #   -h|--help    : Print usage.
 #
-# When --native is supplied we copy the linux-sandbox binaries (as before) and
-# additionally fetch / unpack the two Rust targets that we currently support:
-#   - x86_64-unknown-linux-musl
-#   - aarch64-unknown-linux-musl
-#
 # NOTE: This script is intended to be run from the repository root via
 #       `pnpm --filter codex-cli stage-release ...` or inside codex-cli with the
 #       helper script entry in package.json (`pnpm stage-release ...`).
@@ -27,11 +20,10 @@ set -euo pipefail
 
 usage() {
   cat <<EOF
-Usage: $(basename "$0") [--tmp DIR] [--native] [--version VERSION]
+Usage: $(basename "$0") [--tmp DIR] [--version VERSION]
 
 Options
   --tmp DIR   Use DIR to stage the release (defaults to a fresh mktemp dir)
-  --native    Bundle Rust binaries for Linux (fat package)
   --version   Specify the version to release (defaults to a timestamp-based version)
   -h, --help  Show this help
 
@@ -42,7 +34,6 @@ EOF
 }
 
 TMPDIR=""
-INCLUDE_NATIVE=0
 # Default to a timestamp-based version (keep same scheme as before)
 VERSION="$(printf '0.1.%d' "$(date +%y%m%d%H%M)")"
 WORKFLOW_URL=""
@@ -57,9 +48,6 @@ while [[ $# -gt 0 ]]; do
     --tmp=*)
       TMPDIR="${1#*=}"
       ;;
-    --native)
-      INCLUDE_NATIVE=1
-      ;;
     --version)
       shift || { echo "--version requires an argument"; usage 1; }
       VERSION="$1"
@@ -126,29 +114,15 @@ jq --arg version "$VERSION" \
 
 # 2. Native runtime deps (sandbox plus optional Rust binaries)
 
-if [[ "$INCLUDE_NATIVE" -eq 1 ]]; then
-  ./scripts/install_native_deps.sh --full-native --workflow-url "$WORKFLOW_URL" "$TMPDIR"
-  touch "${TMPDIR}/bin/use-native"
-else
-  ./scripts/install_native_deps.sh "$TMPDIR"
-fi
+./scripts/install_native_deps.sh --workflow-url "$WORKFLOW_URL" "$TMPDIR"
 
 popd >/dev/null
 
 echo "Staged version $VERSION for release in $TMPDIR"
 
-if [[ "$INCLUDE_NATIVE" -eq 1 ]]; then
-  echo "Verify the CLI:"
-  echo "    node ${TMPDIR}/bin/codex.js --version"
-  echo "    node ${TMPDIR}/bin/codex.js --help"
-else
-  echo "Test Node:"
-  echo "    node ${TMPDIR}/bin/codex.js --help"
-fi
+echo "Verify the CLI:"
+echo "    node ${TMPDIR}/bin/codex.js --version"
+echo "    node ${TMPDIR}/bin/codex.js --help"
 
 # Print final hint for convenience
-if [[ "$INCLUDE_NATIVE" -eq 1 ]]; then
-  echo "Next:  cd \"$TMPDIR\" && npm publish --tag native"
-else
-  echo "Next:  cd \"$TMPDIR\" && npm publish"
-fi
+echo "Next:  cd \"$TMPDIR\" && npm publish"

codex-cli/scripts/stage_rust_release.py

@@ -50,7 +50,6 @@ Run this after the GitHub Release has been created and use
             version,
             "--workflow-url",
             workflow["url"],
-            "--native",
         ]
     )
     stage_release.check_returncode()