fix code mode host resource installation

scripts/codex_package/README.md

@@ -10,10 +10,10 @@ The builder creates a canonical Codex package directory:
 .
 ├── codex-package.json
 ├── bin
-│   ├── <entrypoint>[.exe]
-│   └── codex-code-mode-host[.exe]
+│   └── <entrypoint>[.exe]
 ├── codex-resources
 │   ├── bwrap                             # Linux only
+│   ├── codex-code-mode-host[.exe]
 │   ├── zsh/bin/zsh                       # supported Unix targets only
 │   ├── codex-command-runner.exe          # Windows only
 │   └── codex-windows-sandbox-setup.exe   # Windows only
@@ -53,7 +53,7 @@ entrypoint should pass `--entrypoint-bin` so the package contains that exact
 binary instead of rebuilding it.
 
 Release jobs should likewise pass `--code-mode-host-bin` so the package contains
-the signed host executable beside the signed entrypoint.
+the signed host executable in `codex-resources`.
 
 Release jobs that already built package resource binaries should also pass the
 corresponding resource flags: `--bwrap-bin` for Linux packages, and

scripts/codex_package/layout.py

@@ -53,7 +53,7 @@ def build_package_dir(
     )
     copy_executable(
         inputs.code_mode_host_bin,
-        bin_dir / f"codex-code-mode-host{spec.exe_suffix}",
+        resources_dir / f"codex-code-mode-host{spec.exe_suffix}",
         is_windows=spec.is_windows,
     )
     copy_executable(inputs.rg_bin, path_dir / spec.rg_name, is_windows=spec.is_windows)
@@ -135,7 +135,7 @@ def validate_package_dir(
 
     required_files = [
         Path("bin") / variant.entrypoint_name(spec),
-        Path("bin") / f"codex-code-mode-host{spec.exe_suffix}",
+        Path("codex-resources") / f"codex-code-mode-host{spec.exe_suffix}",
         Path("codex-path") / spec.rg_name,
     ]
     executable_files = list(required_files)

scripts/codex_package/test_layout.py

@@ -15,36 +15,61 @@ from codex_package.targets import TARGET_SPECS
 
 
 class PackageLayoutTest(unittest.TestCase):
-    def test_app_server_package_places_code_mode_host_beside_entrypoint(self) -> None:
+    def test_app_server_package_places_code_mode_host_in_resources(self) -> None:
         with tempfile.TemporaryDirectory() as temp_dir:
-            root = Path(temp_dir)
-            package_dir = root / "package"
-            package_dir.mkdir()
-            inputs = PackageInputs(
-                entrypoint_bin=touch_executable(root / "codex-app-server"),
-                code_mode_host_bin=touch_executable(root / "codex-code-mode-host"),
-                rg_bin=touch_executable(root / "rg"),
-                zsh_bin=None,
-                bwrap_bin=touch_executable(root / "bwrap"),
-                codex_command_runner_bin=None,
-                codex_windows_sandbox_setup_bin=None,
-            )
+            for target in (
+                "x86_64-unknown-linux-musl",
+                "x86_64-pc-windows-msvc",
+            ):
+                with self.subTest(target=target):
+                    root = Path(temp_dir) / target
+                    root.mkdir()
+                    package_dir = root / "package"
+                    package_dir.mkdir()
+                    spec = TARGET_SPECS[target]
+                    inputs = PackageInputs(
+                        entrypoint_bin=touch_executable(root / "codex-app-server"),
+                        code_mode_host_bin=touch_executable(
+                            root / "codex-code-mode-host"
+                        ),
+                        rg_bin=touch_executable(root / "rg"),
+                        zsh_bin=None,
+                        bwrap_bin=(
+                            touch_executable(root / "bwrap") if spec.is_linux else None
+                        ),
+                        codex_command_runner_bin=(
+                            touch_executable(root / "codex-command-runner.exe")
+                            if spec.is_windows
+                            else None
+                        ),
+                        codex_windows_sandbox_setup_bin=(
+                            touch_executable(root / "codex-windows-sandbox-setup.exe")
+                            if spec.is_windows
+                            else None
+                        ),
+                    )
 
-            build_package_dir(
-                package_dir,
-                "1.2.3",
-                PACKAGE_VARIANTS["codex-app-server"],
-                TARGET_SPECS["x86_64-unknown-linux-musl"],
-                inputs,
-            )
-            validate_package_dir(
-                package_dir,
-                PACKAGE_VARIANTS["codex-app-server"],
-                TARGET_SPECS["x86_64-unknown-linux-musl"],
-                include_zsh=False,
-            )
+                    build_package_dir(
+                        package_dir,
+                        "1.2.3",
+                        PACKAGE_VARIANTS["codex-app-server"],
+                        spec,
+                        inputs,
+                    )
+                    validate_package_dir(
+                        package_dir,
+                        PACKAGE_VARIANTS["codex-app-server"],
+                        spec,
+                        include_zsh=False,
+                    )
 
-            self.assertTrue((package_dir / "bin" / "codex-code-mode-host").is_file())
+                    self.assertTrue(
+                        (
+                            package_dir
+                            / "codex-resources"
+                            / f"codex-code-mode-host{spec.exe_suffix}"
+                        ).is_file()
+                    )
 
 
 def touch_executable(path: Path) -> Path:

scripts/install/install.ps1

@@ -538,8 +538,8 @@ function Test-PackageContentsAreComplete {
     $expectedFiles = @(
         "codex-package.json",
         "bin\codex.exe",
-        "bin\codex-code-mode-host.exe",
         "codex-path\rg.exe",
+        "codex-resources\codex-code-mode-host.exe",
         "codex-resources\codex-command-runner.exe",
         "codex-resources\codex-windows-sandbox-setup.exe"
     )

scripts/install/install.sh

@@ -771,12 +771,11 @@ install_package_release() {
   tar -xzf "$archive_path" -C "$stage_release"
   chmod 0755 \
     "$stage_release/bin/codex" \
-    "$stage_release/bin/codex-code-mode-host" \
+    "$stage_release/codex-resources/codex-code-mode-host" \
     "$stage_release/codex-path/rg"
   if [ -f "$stage_release/codex-resources/bwrap" ]; then
     chmod 0755 "$stage_release/codex-resources/bwrap"
   fi
-  ln -sf "bin/codex" "$stage_release/codex"
 
   if [ -e "$release_dir" ] || [ -L "$release_dir" ]; then
     rm -rf "$release_dir"
@@ -825,8 +824,7 @@ release_dir_is_complete() {
     package)
       [ -f "$release_dir/codex-package.json" ] &&
         [ -x "$release_dir/bin/codex" ] &&
-        [ -x "$release_dir/bin/codex-code-mode-host" ] &&
-        [ -x "$release_dir/codex" ] &&
+        [ -x "$release_dir/codex-resources/codex-code-mode-host" ] &&
         [ -x "$release_dir/codex-path/rg" ] ||
         return 1
       ;;