.tar.gz (new)
-
- # 1. Produce a .tar.gz for every file in the directory *before* we
- # run `zstd --rm`, because that flag deletes the original files.
- for f in "$dest"/*; do
- base="$(basename "$f")"
- # Skip files that are already archives (shouldn't happen, but be
- # safe).
- if [[ "$base" == *.tar.gz || "$base" == *.tar.zst || "$base" == *.zip || "$base" == *.dmg ]]; then
- continue
- fi
-
- # Don't try to compress signature bundles.
- if [[ "$base" == *.sigstore ]]; then
- continue
- fi
-
- # Create per-binary tar.gz
- tar -C "$dest" -czf "$dest/${base}.tar.gz" "$base"
-
- # Also create .zst and remove the uncompressed binaries to keep
- # non-Windows artifact directories small.
- zstd -T0 -19 --rm "$dest/$base"
- done
-
- - name: Suffix Bazel artifact filenames
- if: ${{ matrix.build-system == 'bazel' && runner.os != 'macOS' }}
- shell: bash
- run: |
- set -euo pipefail
- for artifact in "dist/${{ matrix.target }}"/*; do
- name="${artifact##*/}"
- stem="${name%%.*}"
- mv "$artifact" "${artifact%/*}/${stem}-bazel${name#"$stem"}"
- done
-
- - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- if: ${{ runner.os != 'macOS' }}
- with:
- name: ${{ matrix.artifact_name }}${{ env.ARTIFACT_SUFFIX }}
- # Upload the per-binary .zst files, .tar.gz equivalents, and any
- # prebuilt archives staged above.
- path: |
- codex-rs/dist/${{ matrix.target }}/*
-
- build-macos-voice:
- needs: tag-check
- name: Build voice runtime - ${{ matrix.target }}
- runs-on: ${{ matrix.runner }}
- environment:
- name: bazel
- deployment: false
- timeout-minutes: 120
- permissions:
- contents: read
- strategy:
- fail-fast: false
- matrix:
- include:
- - target: aarch64-apple-darwin
- runner: macos-15
- prefix: macos_aarch64
- - target: x86_64-apple-darwin
- runner: macos-15-intel
- prefix: macos_x86_64
- steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
- with:
- python-version: "3.12"
- - name: Prepare Bazel CI
- uses: ./.github/actions/prepare-bazel-ci
- with:
- target: ${{ matrix.target }}
- cache-scope: bazel-release-primary
- - name: Build matching helper and native runtime
- shell: bash
- env:
- TARGET: ${{ matrix.target }}
- PREFIX: ${{ matrix.prefix }}
- BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
- run: |
- set -euo pipefail
- # Release tags bump Cargo.toml without rewriting the workspace lockfile.
- # Refresh workspace versions before Bazel reads the Cargo dependency graph.
- (cd codex-rs && cargo update --workspace)
- python3 .github/scripts/run_bazel_with_buildbuddy.py build --config=release \
- --macos_minimum_os=14.0 //codex-rs/voice-host:codex-voice-host //third_party/voice:native_runtime
- runtime="bazel-bin/third_party/voice/native_runtime_${PREFIX}"
- PYTHONPATH=third_party/voice python3 - "$runtime" "$TARGET" <<'PY'
- from pathlib import Path
- import sys
- from package_runtime import runtime_files
- runtime_files(Path(sys.argv[1]).resolve(strict=True), sys.argv[2])
- PY
- mkdir -p "voice-unsigned/${TARGET}"
- cp -R "$runtime" "voice-unsigned/${TARGET}/runtime"
- # GNU tar extraction and signing need writable copies of Bazel outputs.
- chmod -R u+w "voice-unsigned/${TARGET}/runtime"
- cp bazel-bin/codex-rs/voice-host/codex-voice-host "voice-unsigned/${TARGET}/codex-voice-host"
- tar -C "voice-unsigned/${TARGET}" -czf "voice-unsigned-${TARGET}.tar.gz" runtime codex-voice-host
- - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: voice-${{ matrix.target }}-unsigned
- path: voice-unsigned-${{ matrix.target }}.tar.gz
- if-no-files-found: error
-
- sign-macos-binaries:
- needs: [build, build-macos-voice]
- if: ${{ always() && needs.build.result == 'success' && needs.build-macos-voice.result == 'success' }}
- name: Sign macOS binaries - ${{ matrix.target }} - ${{ matrix.bundle }} - ${{ matrix.build-system }}
- continue-on-error: ${{ matrix.build-system == 'bazel' }}
- runs-on: ubuntu-latest
- timeout-minutes: 45
- environment:
- name: codesigning
- deployment: false
- permissions:
- contents: read
- id-token: write
-
- env:
- ARTIFACT_SUFFIX: ${{ matrix.build-system == 'bazel' && '-bazel' || '' }}
-
- strategy:
- fail-fast: false
- matrix:
- build-system: [cargo, bazel]
- target:
- - aarch64-apple-darwin
- - x86_64-apple-darwin
- bundle: [primary, app-server]
- include:
- - target: aarch64-apple-darwin
- bundle: primary
- artifact_name: aarch64-apple-darwin
- binaries: "codex codex-code-mode-host codex-responses-api-proxy"
- - target: aarch64-apple-darwin
- bundle: app-server
- artifact_name: aarch64-apple-darwin-app-server
- binaries: "codex-app-server codex-code-mode-host"
- - target: x86_64-apple-darwin
- bundle: primary
- artifact_name: x86_64-apple-darwin
- binaries: "codex codex-code-mode-host codex-responses-api-proxy"
- - target: x86_64-apple-darwin
- bundle: app-server
- artifact_name: x86_64-apple-darwin-app-server
- binaries: "codex-app-server codex-code-mode-host"
-
- steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- - name: Download unsigned macOS binaries
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- name: ${{ matrix.artifact_name }}-unsigned${{ env.ARTIFACT_SUFFIX }}
- path: ${{ runner.temp }}/unsigned-macos
-
- - name: Download unsigned voice runtime
- if: ${{ matrix.bundle == 'primary' }}
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- name: voice-${{ matrix.target }}-unsigned
- path: ${{ runner.temp }}/unsigned-voice
-
- - name: Set up AKV PKCS11 macOS signing
- uses: ./.github/actions/setup-akv-pkcs11-codesigning
- with:
- rcodesign-blob-uri: ${{ secrets.AKV_CODESIGN_RCODESIGN_BLOB_URI }}
- rcodesign-sha256: ${{ secrets.AKV_CODESIGN_RCODESIGN_SHA256 }}
- akv-pkcs11-library-blob-uri: ${{ secrets.AKV_CODESIGN_PKCS11_LIBRARY_BLOB_URI }}
- akv-pkcs11-library-sha256: ${{ secrets.AKV_CODESIGN_PKCS11_LIBRARY_SHA256 }}
- azure-client-id: ${{ secrets.AKV_CODESIGN_AZURE_CLIENT_ID }}
- azure-tenant-id: ${{ secrets.AKV_CODESIGN_TENANT }}
- azure-subscription-id: ${{ secrets.AKV_CODESIGN_SUBSCRIPTION }}
- key-vault-name: ${{ secrets.AKV_CODESIGN_KEY_VAULT_NAME }}
- key-name: ${{ secrets.AKV_CODESIGN_KEY_NAME }}
- key-version: ${{ secrets.AKV_CODESIGN_KEY_VERSION || '' }}
- certificate-sha256: ${{ secrets.AKV_CODESIGN_CERTIFICATE_SHA256 || '' }}
-
- - name: Sign and notarize macOS binaries
- shell: bash
- env:
- TARGET: ${{ matrix.target }}
- BINARIES: ${{ matrix.binaries }}
- APPLE_NOTARIZATION_AKV_KEY_NAME: ${{ secrets.AKV_NOTARIZATION_KEY_NAME }}
- APPLE_NOTARIZATION_AKV_KEY_VERSION: ${{ secrets.AKV_NOTARIZATION_KEY_VERSION }}
- run: |
- set -euo pipefail
-
- input_dir="${RUNNER_TEMP}/unsigned-macos"
- output_dir="${GITHUB_WORKSPACE}/signed-macos/${TARGET}"
- report_dir="${GITHUB_WORKSPACE}/macos-binary-signing-verification/${TARGET}"
- mkdir -p "$output_dir" "$report_dir"
-
- for binary in ${BINARIES}; do
- unsigned_path="${input_dir}/${binary}-${TARGET}-unsigned.zst"
- signed_path="${output_dir}/${binary}"
- if [[ ! -f "$unsigned_path" ]]; then
- echo "Unsigned binary $unsigned_path not found"
- exit 1
- fi
-
- zstd -d --stdout "$unsigned_path" >"$signed_path"
- chmod 0755 "$signed_path"
-
- entitlements="${GITHUB_WORKSPACE}/.github/scripts/macos-signing/${binary}.entitlements.plist"
- if [[ ! -f "$entitlements" ]]; then
- echo "Entitlements file $entitlements not found"
- exit 1
- fi
-
- .github/scripts/macos-signing/sign_macos_code.sh \
- --target "$signed_path" \
- --identity unused \
- --deep false \
- --identifier "$binary" \
- --options runtime \
- --timestamp true \
- --entitlements "$entitlements"
-
- mkdir -p "${report_dir}/${binary}"
- rcodesign print-signature-info "$signed_path" \
- >"${report_dir}/${binary}/signature-info.yaml"
-
- .github/scripts/macos-signing/notarize_macos_binary_with_akv.sh \
- --binary "$signed_path" \
- --report-dir "${report_dir}/${binary}"
- done
-
- - name: Fetch, sign, and notarize pinned macOS helpers
- if: ${{ matrix.bundle == 'primary' }}
- shell: bash
- env:
- TARGET: ${{ matrix.target }}
- APPLE_NOTARIZATION_AKV_KEY_NAME: ${{ secrets.AKV_NOTARIZATION_KEY_NAME }}
- APPLE_NOTARIZATION_AKV_KEY_VERSION: ${{ secrets.AKV_NOTARIZATION_KEY_VERSION }}
- run: |
- set -euo pipefail
-
- signed_root="${GITHUB_WORKSPACE}/signed-resources/${TARGET}"
- mkdir -p "$signed_root"
-
- PYTHONPATH="${GITHUB_WORKSPACE}/scripts" python3 - "$TARGET" "$signed_root" <<'PY'
- import shutil
- import sys
- from pathlib import Path
-
- from codex_package.ripgrep import fetch_rg
- from codex_package.targets import TARGET_SPECS
-
- spec = TARGET_SPECS[sys.argv[1]]
- signed_root = Path(sys.argv[2])
- shutil.copy2(fetch_rg(spec), signed_root / "rg")
- PY
-
- for resource in rg; do
- binary="${signed_root}/${resource}"
- report_dir="${GITHUB_WORKSPACE}/macos-binary-signing-verification/${TARGET}/${resource}"
- mkdir -p "$report_dir"
- chmod 0755 "$binary"
- .github/scripts/macos-signing/sign_macos_code.sh \
- --target "$binary" \
- --identity unused \
- --deep false \
- --identifier "com.openai.codex.${resource}" \
- --options runtime \
- --timestamp true
-
- rcodesign print-signature-info "$binary" \
- >"${report_dir}/signature-info.yaml"
-
- .github/scripts/macos-signing/notarize_macos_binary_with_akv.sh \
- --binary "$binary" \
- --report-dir "$report_dir"
- done
-
- - name: Sign and notarize voice runtime
- if: ${{ matrix.bundle == 'primary' }}
- shell: bash
- env:
- TARGET: ${{ matrix.target }}
- APPLE_NOTARIZATION_AKV_KEY_NAME: ${{ secrets.AKV_NOTARIZATION_KEY_NAME }}
- APPLE_NOTARIZATION_AKV_KEY_VERSION: ${{ secrets.AKV_NOTARIZATION_KEY_VERSION }}
- run: |
- set -euo pipefail
- unsigned="${RUNNER_TEMP}/unsigned-voice/extracted"
- signed="${GITHUB_WORKSPACE}/signed-voice/${TARGET}"
- mkdir -p "$unsigned" "$signed"
- tar -xzf "${RUNNER_TEMP}/unsigned-voice/voice-unsigned-${TARGET}.tar.gz" -C "$unsigned"
- python3 third_party/voice/release_runtime.py stage \
- --target "$TARGET" --source "$unsigned/runtime" --output "$signed/runtime"
- cp "$unsigned/codex-voice-host" "$signed/codex-voice-host"
- chmod 0755 "$signed/codex-voice-host"
-
- while IFS= read -r -d '' library; do
- name="$(basename "$library")"
- .github/scripts/macos-signing/sign_macos_code.sh \
- --target "$library" --identity unused --deep false \
- --identifier "com.openai.codex.voice.${name}" \
- --options runtime --timestamp true
- done < <(find "$signed/runtime" -name '*.dylib' -type f -print0)
- .github/scripts/macos-signing/sign_macos_code.sh \
- --target "$signed/codex-voice-host" --identity unused --deep false \
- --identifier com.openai.codex.voice-host --options runtime --timestamp true \
- --entitlements .github/scripts/macos-signing/codex-voice-host.entitlements.plist
-
- # Notarize the actual signed closure together, then hash those bytes.
- (cd "$signed" && zip -qr "${RUNNER_TEMP}/voice-${TARGET}.zip" runtime codex-voice-host)
- report_dir="${GITHUB_WORKSPACE}/macos-binary-signing-verification/${TARGET}/voice"
- mkdir -p "$report_dir"
- python3 .github/scripts/macos-signing/notarize_with_akv.py \
- --file "${RUNNER_TEMP}/voice-${TARGET}.zip" \
- --report-log "${report_dir}/notarization.json" \
- --max-wait-seconds 600
- python3 third_party/voice/release_runtime.py seal \
- --target "$TARGET" --output "$signed/runtime"
- tar -C "$signed" -czf "${GITHUB_WORKSPACE}/signed-voice-${TARGET}.tar.gz" \
- runtime codex-voice-host
-
- - name: Upload signed voice runtime
- if: ${{ matrix.bundle == 'primary' }}
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: voice-${{ matrix.target }}-signed${{ env.ARTIFACT_SUFFIX }}
- path: signed-voice-${{ matrix.target }}.tar.gz
- if-no-files-found: error
-
- - name: Upload signed macOS binaries
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: ${{ matrix.artifact_name }}-signed-binaries${{ env.ARTIFACT_SUFFIX }}
- path: signed-macos/${{ matrix.target }}/*
- if-no-files-found: error
-
- - name: Upload signed macOS helpers
- if: ${{ matrix.bundle == 'primary' }}
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: ${{ matrix.target }}-signed-resources${{ env.ARTIFACT_SUFFIX }}
- path: signed-resources/${{ matrix.target }}/*
- if-no-files-found: error
-
- - name: Upload binary signing verification
- if: ${{ always() }}
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: ${{ matrix.artifact_name }}-binary-signing-verification${{ env.ARTIFACT_SUFFIX }}
- path: macos-binary-signing-verification/${{ matrix.target }}/
- if-no-files-found: warn
-
- package-macos:
- needs: sign-macos-binaries
- name: Package macOS artifacts - ${{ matrix.target }} - ${{ matrix.bundle }} - ${{ matrix.build-system }}
- continue-on-error: ${{ matrix.build-system == 'bazel' }}
- runs-on: macos-15-xlarge
- timeout-minutes: 45
- permissions:
- contents: read
- defaults:
- run:
- working-directory: codex-rs
-
- env:
- ARTIFACT_SUFFIX: ${{ matrix.build-system == 'bazel' && '-bazel' || '' }}
-
- strategy:
- fail-fast: false
- matrix:
- build-system: [cargo, bazel]
- target:
- - aarch64-apple-darwin
- - x86_64-apple-darwin
- bundle: [primary, app-server]
- include:
- - target: aarch64-apple-darwin
- bundle: primary
- artifact_name: aarch64-apple-darwin
- binaries: "codex codex-code-mode-host codex-responses-api-proxy"
- build_dmg: "true"
- - target: aarch64-apple-darwin
- bundle: app-server
- artifact_name: aarch64-apple-darwin-app-server
- binaries: "codex-app-server codex-code-mode-host"
- build_dmg: "false"
- - target: x86_64-apple-darwin
- bundle: primary
- artifact_name: x86_64-apple-darwin
- binaries: "codex codex-code-mode-host codex-responses-api-proxy"
- build_dmg: "true"
- - target: x86_64-apple-darwin
- bundle: app-server
- artifact_name: x86_64-apple-darwin-app-server
- binaries: "codex-app-server codex-code-mode-host"
- build_dmg: "false"
-
- steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- - name: Download signed macOS binaries
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- name: ${{ matrix.artifact_name }}-signed-binaries${{ env.ARTIFACT_SUFFIX }}
- path: codex-rs/target/${{ matrix.target }}/release
-
- - name: Download signed macOS helpers
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- name: ${{ matrix.target }}-signed-resources${{ env.ARTIFACT_SUFFIX }}
- path: codex-rs/signed-resources/${{ matrix.target }}
-
- - name: Download signed voice runtime
- if: ${{ matrix.bundle == 'primary' }}
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- name: voice-${{ matrix.target }}-signed${{ env.ARTIFACT_SUFFIX }}
- path: ${{ runner.temp }}/signed-voice
-
- - name: Verify signed voice runtime
- if: ${{ matrix.bundle == 'primary' }}
- shell: bash
- env:
- TARGET: ${{ matrix.target }}
- run: |
- set -euo pipefail
- root="${RUNNER_TEMP}/signed-voice/${TARGET}"
- mkdir -p "$root"
- tar -xzf "${RUNNER_TEMP}/signed-voice/signed-voice-${TARGET}.tar.gz" -C "$root"
- case "$TARGET" in
- aarch64-apple-darwin) arch=arm64 ;;
- x86_64-apple-darwin) arch=x86_64 ;;
- *) exit 1 ;;
- esac
- PYTHONPATH="${GITHUB_WORKSPACE}/third_party/voice" python3 - "$root/runtime" "$TARGET" <<'PY'
- from pathlib import Path
- import sys
- from package_runtime import runtime_files
- runtime_files(Path(sys.argv[1]).resolve(strict=True), sys.argv[2], public_release=True)
- PY
- while IFS= read -r -d '' binary; do
- lipo "$binary" -verify_arch "$arch"
- codesign --verify --strict --verbose=2 "$binary"
- done < <(find "$root/runtime" -name '*.dylib' -type f -print0)
- lipo "$root/codex-voice-host" -verify_arch "$arch"
- codesign --verify --strict --verbose=2 "$root/codex-voice-host"
-
- - name: Verify signed macOS binaries
- shell: bash
- run: |
- set -euo pipefail
- for binary in ${{ matrix.binaries }}; do
- binary_path="target/${{ matrix.target }}/release/${binary}"
- chmod 0755 "$binary_path"
- codesign --verify --strict --verbose=2 "$binary_path"
- done
-
- for resource in rg; do
- resource_path="signed-resources/${{ matrix.target }}/${resource}"
- chmod 0755 "$resource_path"
- codesign --verify --strict --verbose=2 "$resource_path"
- done
-
- - name: Stage macOS artifacts
- shell: bash
- run: |
- set -euo pipefail
- dest="dist/${{ matrix.target }}"
- mkdir -p "$dest"
-
- for binary in ${{ matrix.binaries }}; do
- # Both variants package the host, but only the primary bundle publishes
- # standalone binary archives to avoid duplicate release asset names.
- if [[ "${{ matrix.bundle }}" == "app-server" && "$binary" == "codex-code-mode-host" ]]; then
- continue
- fi
- cp "target/${{ matrix.target }}/release/${binary}" "$dest/${binary}-${{ matrix.target }}"
- done
-
- - name: Build Codex package archive
- shell: bash
- env:
- TARGET: ${{ matrix.target }}
- BUNDLE: ${{ matrix.bundle }}
- run: |
- set -euo pipefail
- voice_args=()
- if [[ "$BUNDLE" == "primary" ]]; then
- voice_args+=(--voice-release-dir "${RUNNER_TEMP}/signed-voice/${TARGET}")
- voice_args+=(--release-version "${GITHUB_REF_NAME#rust-v}")
- fi
- bash "${GITHUB_WORKSPACE}/.github/scripts/build-codex-package-archive.sh" \
- --target "$TARGET" \
- --bundle "$BUNDLE" \
- --entrypoint-dir "target/${TARGET}/release" \
- --archive-dir "dist/${TARGET}" \
- --rg-bin "signed-resources/${TARGET}/rg" \
- ${voice_args[@]+"${voice_args[@]}"}
-
- - name: Build unsigned macOS DMG
- if: ${{ matrix.build_dmg == 'true' }}
- shell: bash
- run: |
- set -euo pipefail
-
- target="${{ matrix.target }}"
- release_dir="target/${target}/release"
- dmg_root="${RUNNER_TEMP}/codex-dmg-root-${target}"
- volname="Codex (${target})"
- dmg_path="${release_dir}/codex-${target}.dmg"
-
- rm -rf "$dmg_root"
- mkdir -p "$dmg_root"
-
- for binary in ${{ matrix.binaries }}; do
- binary_path="${release_dir}/${binary}"
- if [[ ! -f "$binary_path" ]]; then
- echo "Binary $binary_path not found"
- exit 1
- fi
- ditto "$binary_path" "${dmg_root}/${binary}"
- done
-
- if [[ "${{ matrix.bundle }}" == "primary" ]]; then
- # Keep the root-level invocation, but resolve it into the canonical
- # package layout so InstallContext finds its adjacent voice runtime.
- package="${RUNNER_TEMP}/codex-package-voice-${target}"
- ditto "$package" "$dmg_root"
- rm "${dmg_root}/codex"
- ln -s bin/codex "${dmg_root}/codex"
- fi
-
- rm -f "$dmg_path"
- hdiutil create \
- -volname "$volname" \
- -srcfolder "$dmg_root" \
- -format UDZO \
- -ov \
- "$dmg_path"
-
- if [[ ! -f "$dmg_path" ]]; then
- echo "DMG $dmg_path not found after build"
- exit 1
- fi
-
- - name: Upload unsigned macOS DMG
- if: ${{ matrix.build_dmg == 'true' }}
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: ${{ matrix.artifact_name }}-unsigned-dmg${{ env.ARTIFACT_SUFFIX }}
- path: codex-rs/target/${{ matrix.target }}/release/codex-${{ matrix.target }}.dmg
- if-no-files-found: error
-
- - name: Set up Python release tools
- if: ${{ matrix.build-system == 'cargo' && matrix.bundle == 'primary' }}
- uses: ./.github/actions/setup-python-release-tools
- with:
- group: runtime
-
- - name: Build Python runtime wheel
- if: ${{ matrix.build-system == 'cargo' && matrix.bundle == 'primary' }}
- shell: bash
- run: |
- set -euo pipefail
-
- case "${{ matrix.target }}" in
- aarch64-apple-darwin)
- platform_tag="macosx_11_0_arm64"
- ;;
- x86_64-apple-darwin)
- platform_tag="macosx_10_9_x86_64"
- ;;
- *)
- echo "No Python runtime wheel platform tag for ${{ matrix.target }}"
- exit 1
- ;;
- esac
-
- # The wheel keeps its macOS 10.9/11 tags. The native voice build
- # currently targets macOS 14, so keep it in the release archives and
- # DMG but leave this older-OS-compatible wheel unchanged.
- wheel_archives="${RUNNER_TEMP}/voice-free-wheel/${{ matrix.target }}"
- bash "${GITHUB_WORKSPACE}/.github/scripts/build-codex-package-archive.sh" \
- --target "${{ matrix.target }}" \
- --bundle primary \
- --entrypoint-dir "target/${{ matrix.target }}/release" \
- --archive-dir "$wheel_archives" \
- --rg-bin "signed-resources/${{ matrix.target }}/rg"
- wheel_archive="${wheel_archives}/codex-package-${{ matrix.target }}.tar.gz"
- python3 - "$wheel_archive" <<'PY'
- import sys
- import tarfile
- with tarfile.open(sys.argv[1]) as archive:
- assert not any("codex-resources/voice/" in item.name for item in archive)
- PY
-
- stage_dir="${RUNNER_TEMP}/openai-codex-cli-bin-${{ matrix.target }}"
- wheel_dir="${GITHUB_WORKSPACE}/python-runtime-dist/${{ matrix.target }}"
- python3 \
- "${GITHUB_WORKSPACE}/sdk/python/scripts/update_sdk_artifacts.py" \
- stage-runtime \
- "$stage_dir" \
- "$wheel_archive" \
- --codex-version "${GITHUB_REF_NAME}" \
- --platform-tag "$platform_tag"
- uv build --offline --no-build-isolation --no-create-gitignore \
- --python "${RUNNER_TEMP}/python-runtime-build-venv" --wheel --out-dir "$wheel_dir" "$stage_dir"
-
- - name: Upload Python runtime wheel
- if: ${{ matrix.build-system == 'cargo' && matrix.bundle == 'primary' }}
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: python-runtime-wheel-${{ matrix.target }}
- path: python-runtime-dist/${{ matrix.target }}/*.whl
- if-no-files-found: error
-
- - name: Compress artifacts
- shell: bash
- run: |
- set -euo pipefail
- dest="dist/${{ matrix.target }}"
- for f in "$dest"/*; do
- base="$(basename "$f")"
- if [[ "$base" == *.tar.gz || "$base" == *.tar.zst || "$base" == *.zip || "$base" == *.dmg ]]; then
- continue
- fi
-
- tar -C "$dest" -czf "$dest/${base}.tar.gz" "$base"
- zstd -T0 -19 --rm "$dest/$base"
- done
-
- - name: Upload packaged macOS artifacts
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: ${{ matrix.artifact_name }}-packaged${{ env.ARTIFACT_SUFFIX }}
- path: codex-rs/dist/${{ matrix.target }}/*
- if-no-files-found: error
-
- sign-macos-dmg:
- needs: package-macos
- name: Sign macOS DMG - ${{ matrix.target }} - ${{ matrix.build-system }}
- continue-on-error: ${{ matrix.build-system == 'bazel' }}
- runs-on: ubuntu-latest
- timeout-minutes: 45
- environment:
- name: codesigning
- deployment: false
- permissions:
- contents: read
- id-token: write
-
- env:
- ARTIFACT_SUFFIX: ${{ matrix.build-system == 'bazel' && '-bazel' || '' }}
-
- strategy:
- fail-fast: false
- matrix:
- build-system: [cargo, bazel]
- target:
- - aarch64-apple-darwin
- - x86_64-apple-darwin
- include:
- - target: aarch64-apple-darwin
- artifact_name: aarch64-apple-darwin
- - target: x86_64-apple-darwin
- artifact_name: x86_64-apple-darwin
-
- steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- - name: Download unsigned macOS DMG
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- name: ${{ matrix.artifact_name }}-unsigned-dmg${{ env.ARTIFACT_SUFFIX }}
- path: ${{ runner.temp }}/unsigned-dmg
-
- - name: Set up AKV PKCS11 macOS signing
- uses: ./.github/actions/setup-akv-pkcs11-codesigning
- with:
- rcodesign-blob-uri: ${{ secrets.AKV_CODESIGN_RCODESIGN_BLOB_URI }}
- rcodesign-sha256: ${{ secrets.AKV_CODESIGN_RCODESIGN_SHA256 }}
- akv-pkcs11-library-blob-uri: ${{ secrets.AKV_CODESIGN_PKCS11_LIBRARY_BLOB_URI }}
- akv-pkcs11-library-sha256: ${{ secrets.AKV_CODESIGN_PKCS11_LIBRARY_SHA256 }}
- azure-client-id: ${{ secrets.AKV_CODESIGN_AZURE_CLIENT_ID }}
- azure-tenant-id: ${{ secrets.AKV_CODESIGN_TENANT }}
- azure-subscription-id: ${{ secrets.AKV_CODESIGN_SUBSCRIPTION }}
- key-vault-name: ${{ secrets.AKV_CODESIGN_KEY_VAULT_NAME }}
- key-name: ${{ secrets.AKV_CODESIGN_KEY_NAME }}
- key-version: ${{ secrets.AKV_CODESIGN_KEY_VERSION || '' }}
- certificate-sha256: ${{ secrets.AKV_CODESIGN_CERTIFICATE_SHA256 || '' }}
-
- - name: Sign, notarize, and staple macOS DMG
- shell: bash
- env:
- TARGET: ${{ matrix.target }}
- APPLE_NOTARIZATION_AKV_KEY_NAME: ${{ secrets.AKV_NOTARIZATION_KEY_NAME }}
- APPLE_NOTARIZATION_AKV_KEY_VERSION: ${{ secrets.AKV_NOTARIZATION_KEY_VERSION }}
- run: |
- set -euo pipefail
-
- dmg_path="${RUNNER_TEMP}/unsigned-dmg/codex-${TARGET}.dmg"
- report_dir="${GITHUB_WORKSPACE}/macos-dmg-signing-verification/${TARGET}"
- if [[ ! -f "$dmg_path" ]]; then
- echo "Unsigned DMG $dmg_path not found"
- exit 1
- fi
-
- .github/scripts/macos-signing/sign_macos_code.sh \
- --target "$dmg_path" \
- --identity unused \
- --deep false \
- --timestamp true
-
- mkdir -p "$report_dir"
- rcodesign print-signature-info "$dmg_path" \
- >"${report_dir}/signature-info-before-notarization.yaml"
-
- .github/scripts/macos-signing/notarize_macos_dmg_with_akv.sh \
- --dmg "$dmg_path" \
- --report-dir "$report_dir"
-
- rcodesign print-signature-info "$dmg_path" \
- >"${report_dir}/signature-info.yaml"
-
- - name: Upload signed macOS DMG
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: ${{ matrix.artifact_name }}-signed-dmg${{ env.ARTIFACT_SUFFIX }}
- path: ${{ runner.temp }}/unsigned-dmg/codex-${{ matrix.target }}.dmg
- if-no-files-found: error
-
- - name: Upload DMG signing verification
- if: ${{ always() }}
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: ${{ matrix.artifact_name }}-dmg-signing-verification${{ env.ARTIFACT_SUFFIX }}
- path: macos-dmg-signing-verification/${{ matrix.target }}/
- if-no-files-found: warn
-
- finalize-macos:
- needs:
- - package-macos
- - sign-macos-dmg
- name: Verify macOS artifacts - ${{ matrix.target }} - ${{ matrix.bundle }} - ${{ matrix.build-system }}
- continue-on-error: ${{ matrix.build-system == 'bazel' }}
- runs-on: macos-15-xlarge
- timeout-minutes: 30
- permissions:
- contents: read
- defaults:
- run:
- working-directory: codex-rs
-
- env:
- ARTIFACT_SUFFIX: ${{ matrix.build-system == 'bazel' && '-bazel' || '' }}
-
- strategy:
- fail-fast: false
- matrix:
- build-system: [cargo, bazel]
- target:
- - aarch64-apple-darwin
- - x86_64-apple-darwin
- bundle: [primary, app-server]
- include:
- - target: aarch64-apple-darwin
- bundle: primary
- artifact_name: aarch64-apple-darwin
- binaries: "codex codex-code-mode-host codex-responses-api-proxy"
- verify_dmg: "true"
- - target: aarch64-apple-darwin
- bundle: app-server
- artifact_name: aarch64-apple-darwin-app-server
- binaries: "codex-app-server codex-code-mode-host"
- verify_dmg: "false"
- - target: x86_64-apple-darwin
- bundle: primary
- artifact_name: x86_64-apple-darwin
- binaries: "codex codex-code-mode-host codex-responses-api-proxy"
- verify_dmg: "true"
- - target: x86_64-apple-darwin
- bundle: app-server
- artifact_name: x86_64-apple-darwin-app-server
- binaries: "codex-app-server codex-code-mode-host"
- verify_dmg: "false"
-
- steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- - name: Download packaged macOS artifacts
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- name: ${{ matrix.artifact_name }}-packaged${{ env.ARTIFACT_SUFFIX }}
- path: codex-rs/dist/${{ matrix.target }}
-
- - name: Download signed macOS binaries
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- name: ${{ matrix.artifact_name }}-signed-binaries${{ env.ARTIFACT_SUFFIX }}
- path: ${{ runner.temp }}/signed-binaries
-
- - name: Download signed macOS DMG
- if: ${{ matrix.verify_dmg == 'true' }}
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- name: ${{ matrix.artifact_name }}-signed-dmg${{ env.ARTIFACT_SUFFIX }}
- path: ${{ runner.temp }}/signed-dmg
-
- - name: Verify signed macOS artifacts
- shell: bash
- run: |
- set -euo pipefail
-
- target="${{ matrix.target }}"
- packaged_dir="dist/${target}"
- case "$target" in
- aarch64-apple-darwin) expected_arch="arm64" ;;
- x86_64-apple-darwin) expected_arch="x86_64" ;;
- *)
- echo "Unexpected macOS target: $target"
- exit 1
- ;;
- esac
-
- verify_signed_binary() {
- local path="$1"
- local binary="$2"
- local actual_entitlements expected_entitlements normalized_actual normalized_expected
-
- chmod 0755 "$path"
- lipo "$path" -verify_arch "$expected_arch"
- codesign --verify --strict --verbose=2 "$path"
-
- expected_entitlements="${GITHUB_WORKSPACE}/.github/scripts/macos-signing/${binary}.entitlements.plist"
- if [[ ! -f "$expected_entitlements" ]]; then
- echo "Expected entitlements file $expected_entitlements not found"
- exit 1
- fi
- actual_entitlements="$(mktemp)"
- normalized_actual="$(mktemp)"
- normalized_expected="$(mktemp)"
- codesign -d --entitlements :- "$path" >"$actual_entitlements"
- plutil -convert xml1 -o "$normalized_actual" "$actual_entitlements"
- plutil -convert xml1 -o "$normalized_expected" "$expected_entitlements"
- diff -u "$normalized_expected" "$normalized_actual"
- rm -f "$actual_entitlements" "$normalized_actual" "$normalized_expected"
- }
-
- for binary in ${{ matrix.binaries }}; do
- binary_path="${RUNNER_TEMP}/signed-binaries/${binary}"
- verify_signed_binary "$binary_path" "$binary"
-
- # The app-server package contains the host, but its standalone archives
- # are omitted above to avoid duplicate release asset names.
- if [[ "${{ matrix.bundle }}" == "app-server" && "$binary" == "codex-code-mode-host" ]]; then
- continue
- fi
-
- direct_archive_dir="${RUNNER_TEMP}/direct-archive-${binary}-${target}"
- rm -rf "$direct_archive_dir"
- mkdir -p "$direct_archive_dir"
- tar -xzf "${packaged_dir}/${binary}-${target}.tar.gz" -C "$direct_archive_dir"
- verify_signed_binary "${direct_archive_dir}/${binary}-${target}" "$binary"
-
- direct_zstd_path="${RUNNER_TEMP}/${binary}-${target}-from-zstd"
- zstd -d --stdout "${packaged_dir}/${binary}-${target}.zst" >"$direct_zstd_path"
- verify_signed_binary "$direct_zstd_path" "$binary"
- done
-
- case "${{ matrix.bundle }}" in
- primary)
- package_stem="codex-package"
- package_entrypoint="codex"
- ;;
- app-server)
- package_stem="codex-app-server-package"
- package_entrypoint="codex-app-server"
- ;;
- *)
- echo "Unexpected macOS bundle: ${{ matrix.bundle }}"
- exit 1
- ;;
- esac
-
- package_dir="${RUNNER_TEMP}/${package_stem}-${target}"
- rm -rf "$package_dir"
- mkdir -p "$package_dir"
- tar -xzf "${packaged_dir}/${package_stem}-${target}.tar.gz" -C "$package_dir"
- verify_signed_binary "${package_dir}/bin/${package_entrypoint}" "$package_entrypoint"
- verify_signed_binary "${package_dir}/bin/codex-code-mode-host" "codex-code-mode-host"
-
- for resource in \
- "${package_dir}/codex-path/rg"
- do
- chmod 0755 "$resource"
- lipo "$resource" -verify_arch "$expected_arch"
- codesign --verify --strict --verbose=2 "$resource"
- entitlements="$(mktemp)"
- codesign -d --entitlements :- "$resource" >"$entitlements"
- if [[ -s "$entitlements" ]]; then
- echo "Bundled helper $resource must not have code-signing entitlements." >&2
- plutil -p "$entitlements" >&2
- exit 1
- fi
- rm -f "$entitlements"
- done
-
- if [[ "${{ matrix.bundle }}" == "primary" ]]; then
- voice="${package_dir}/codex-resources/voice"
- [[ -f "${voice}/lib/libgstreamer-1.0.0.dylib" ]]
- export VOICE_BUILD_COMMIT="$(git rev-parse HEAD)"
- PYTHONPATH="${GITHUB_WORKSPACE}/third_party/voice" python3 - "$voice" "$target" "$package_dir" <<'PY'
- import json
- import sys
- from pathlib import Path
- from package_runtime import runtime_files
- from runtime import digest
-
- voice, target, package = map(Path, sys.argv[1:])
- runtime_files(voice.resolve(strict=True), str(target), public_release=True)
- manifest = json.loads((voice / "manifest.json").read_text())
- assert manifest["buildCommit"] == __import__("os").environ["VOICE_BUILD_COMMIT"]
- for relative, expected in manifest["sha256"].items():
- assert digest(package / relative) == expected, relative
- PY
- helper="${voice}/bin/codex-voice-host"
- [[ "$("$helper" --build-commit)" == "$VOICE_BUILD_COMMIT" ]]
- while IFS= read -r -d '' library; do
- lipo "$library" -verify_arch "$expected_arch"
- codesign --verify --strict --verbose=2 "$library"
- done < <(find "$voice" -name '*.dylib' -type f -print0)
- verify_signed_binary "$helper" "codex-voice-host"
- fi
-
- if [[ "${{ matrix.verify_dmg }}" != "true" ]]; then
- exit 0
- fi
-
- dmg_path="${RUNNER_TEMP}/signed-dmg/codex-${target}.dmg"
- mount_dir="${RUNNER_TEMP}/codex-dmg-mount-${target}"
- if [[ ! -f "$dmg_path" ]]; then
- echo "Signed DMG $dmg_path not found"
- exit 1
- fi
-
- hdiutil verify "$dmg_path"
- codesign --verify --strict --verbose=2 "$dmg_path"
- xcrun stapler validate "$dmg_path"
-
- rm -rf "$mount_dir"
- mkdir -p "$mount_dir"
- hdiutil attach "$dmg_path" -nobrowse -readonly -mountpoint "$mount_dir"
- cleanup_mount() {
- hdiutil detach "$mount_dir" >/dev/null
- }
- trap cleanup_mount EXIT
-
- for binary in ${{ matrix.binaries }}; do
- verify_signed_binary "${mount_dir}/${binary}" "$binary"
- done
-
- if [[ "${{ matrix.bundle }}" == "primary" ]]; then
- [[ "$(readlink "${mount_dir}/codex")" == "bin/codex" ]]
- cmp "${mount_dir}/codex-package.json" "${package_dir}/codex-package.json"
- cmp "${mount_dir}/codex-resources/voice/manifest.json" \
- "${package_dir}/codex-resources/voice/manifest.json"
- cmp "${mount_dir}/codex-resources/voice/bin/codex-voice-host" \
- "${package_dir}/codex-resources/voice/bin/codex-voice-host"
- fi
-
- cleanup_mount
- trap - EXIT
- cp "$dmg_path" "dist/${target}/codex-${target}.dmg"
-
- - name: Suffix Bazel artifact filenames
- if: ${{ matrix.build-system == 'bazel' }}
- shell: bash
- run: |
- set -euo pipefail
- for artifact in "dist/${{ matrix.target }}"/*; do
- name="${artifact##*/}"
- stem="${name%%.*}"
- mv "$artifact" "${artifact%/*}/${stem}-bazel${name#"$stem"}"
- done
-
- - name: Upload verified macOS artifacts
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: ${{ matrix.artifact_name }}${{ env.ARTIFACT_SUFFIX }}
- path: codex-rs/dist/${{ matrix.target }}/*
- if-no-files-found: error
-
- # Keep provisioned packages separate from the legacy CLI/npm/installer layout.
- # Desktop consumes the versioned codex-provisioned manifest from this release.
- provisioned-macos-candidate:
- needs: finalize-macos
- if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/rust-v') && vars.CODEX_PROVISIONED_MACOS_CANDIDATE == 'true'
- permissions:
- contents: read
- id-token: write
- uses: ./.github/workflows/rust-release-provisioned-macos.yml
- secrets: inherit
-
- build-windows:
- needs: tag-check
- uses: ./.github/workflows/rust-release-windows.yml
- secrets: inherit
-
- argument-comment-lint-release-assets:
- name: argument-comment-lint release assets
- needs: tag-check
- uses: ./.github/workflows/rust-release-argument-comment-lint.yml
- with:
- publish: true
-
- stage-npm-packages:
- name: stage npm packages
- needs:
- - build
- - finalize-macos
- - build-windows
- runs-on: ubuntu-latest
- permissions:
- contents: read
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- - name: Download target artifacts
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- path: dist
- pattern: "{aarch64,x86_64}-{apple-darwin{,-app-server},unknown-linux-musl{,-app-server},pc-windows-msvc}"
-
- - name: Setup pnpm
- uses: pnpm/action-setup@a8198c4bff370c8506180b035930dea56dbd5288 # v5
- with:
- run_install: false
-
- - name: Setup Node.js for npm packaging
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
- with:
- node-version: 22
-
- - name: Install dependencies
- run: pnpm install --frozen-lockfile
-
- - name: Stage npm packages
- run: |
- release_version="${GITHUB_REF_NAME#rust-v}"
- ./scripts/stage_npm_packages.py \
- --release-version "$release_version" \
- --artifacts-dir "${GITHUB_WORKSPACE}/dist" \
- --package codex \
- --package codex-responses-api-proxy \
- --package codex-sdk
-
- - name: Upload staged npm packages
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: npm-packages
- path: dist/npm/*.tgz
- if-no-files-found: error
-
- release:
- # Each job checks its channel under this lock; out-of-order builds cannot
- # roll back GitHub, npm, R2, or the canary branch.
- concurrency: &release-publication
- group: rust-release
- queue: max
- cancel-in-progress: false
- needs:
- - tag-check
- - build
- - finalize-macos
- - build-windows
- - argument-comment-lint-release-assets
- - stage-npm-packages
- - provisioned-macos-candidate
- if: >-
- ${{
- always() &&
- needs.tag-check.result == 'success' &&
- needs.build.result == 'success' &&
- needs.finalize-macos.result == 'success' &&
- needs.build-windows.result == 'success' &&
- needs.argument-comment-lint-release-assets.result == 'success' &&
- needs.stage-npm-packages.result == 'success' &&
- (needs.provisioned-macos-candidate.result == 'success' ||
- (vars.CODEX_PROVISIONED_MACOS_CANDIDATE != 'true' &&
- needs.provisioned-macos-candidate.result == 'skipped'))
- }}
- name: release
- runs-on: ubuntu-latest
- permissions:
- contents: write
- outputs:
- version: ${{ steps.release_name.outputs.name }}
- tag: ${{ github.ref_name }}
- make_latest: ${{ steps.release_name.outputs.make_latest }}
- prerelease: ${{ steps.release_name.outputs.prerelease }}
- should_publish_npm: ${{ steps.npm_publish_settings.outputs.should_publish }}
- npm_tag: ${{ steps.npm_publish_settings.outputs.npm_tag }}
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- - name: Generate release notes from tag commit message
- id: release_notes
- shell: bash
- run: |
- set -euo pipefail
-
- # On tag pushes, GITHUB_SHA may be a tag object for annotated tags;
- # peel it to the underlying commit.
- commit="$(git rev-parse "${GITHUB_SHA}^{commit}")"
- notes_path="${RUNNER_TEMP}/release-notes.md"
-
- # Use the commit message for the commit the tag points at (not the
- # annotated tag message).
- # Preserve the previous publisher's 124,999-character cap, reserving
- # the last character for a trailing newline for GitHub's renderer.
- git log -1 --format=%B "${commit}" |
- python3 -c 'import sys; print(sys.stdin.read()[:124998])' > "${notes_path}"
-
- echo "path=${notes_path}" >> "${GITHUB_OUTPUT}"
-
- - name: Download release artifacts
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- path: dist
- pattern: "{{aarch64,x86_64}-{apple-darwin{,-app-server},unknown-linux-musl{,-app-server},pc-windows-msvc}{,-bazel},*-symbols{,-bazel},argument-comment-lint-*,python-runtime-wheel-*,npm-packages}"
-
- - name: Download verified provisioned macOS packages
- if: vars.CODEX_PROVISIONED_MACOS_CANDIDATE == 'true'
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- path: dist
- pattern: "provisioned-macos-verified-candidate-*"
-
- - name: Remove per-architecture checksum filenames before release upload
- if: vars.CODEX_PROVISIONED_MACOS_CANDIDATE == 'true'
- run: rm dist/provisioned-macos-verified-candidate-*/SHA256SUMS
-
- - name: List
- run: ls -R dist/
-
- - name: Add Codex package checksum manifest
- run: |
- set -euo pipefail
-
- manifest="dist/codex-package_SHA256SUMS"
- tmp_manifest="$(mktemp)"
- find dist -type f \
- \( -name 'codex-package-*.tar.gz' -o -name 'codex-app-server-package-*.tar.gz' -o -name 'codex-provisioned-package-*.tar.gz' \) \
- -print |
- sort |
- while IFS= read -r archive; do
- sha256sum "$archive" |
- awk -v name="$(basename "$archive")" '{ print $1 " " name }'
- done > "$tmp_manifest"
-
- if [[ ! -s "$tmp_manifest" ]]; then
- echo "No Codex package archives found for checksum manifest"
- exit 1
- fi
-
- mv "$tmp_manifest" "$manifest"
- cat "$manifest"
-
- - name: Add config schema release asset
- run: |
- cp codex-rs/core/config.schema.json dist/config-schema.json
-
- - name: Define release name
- id: release_name
- env:
- GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: |
- set -euo pipefail
- # Extract the version from the tag name, which is in the format
- # "rust-v0.1.0".
- version="${GITHUB_REF_NAME#rust-v}"
- echo "name=${version}" >> $GITHUB_OUTPUT
- if [[ "${version}" == *-* ]]; then
- echo "make_latest=false" >> $GITHUB_OUTPUT
- echo "prerelease=true" >> $GITHUB_OUTPUT
- else
- make_latest="$(gh api "repos/${GITHUB_REPOSITORY}/releases/latest" \
- | python3 .github/scripts/releases.py "$version" --check-github latest)"
- echo "make_latest=${make_latest}" >> $GITHUB_OUTPUT
- echo "prerelease=false" >> $GITHUB_OUTPUT
- fi
-
- - name: Determine npm publish settings
- id: npm_publish_settings
- env:
- VERSION: ${{ steps.release_name.outputs.name }}
- run: |
- set -euo pipefail
- version="${VERSION}"
-
- if [[ "${version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
- echo "should_publish=true" >> "$GITHUB_OUTPUT"
- echo "npm_tag=" >> "$GITHUB_OUTPUT"
- elif [[ "${version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-alpha\.[0-9]+(\.[0-9]+)?$ ]]; then
- echo "should_publish=true" >> "$GITHUB_OUTPUT"
- echo "npm_tag=alpha" >> "$GITHUB_OUTPUT"
- else
- echo "should_publish=false" >> "$GITHUB_OUTPUT"
- echo "npm_tag=" >> "$GITHUB_OUTPUT"
- fi
-
- - name: Stage installer scripts
- run: |
- cp scripts/install/install.sh dist/install.sh
- mv dist/x86_64-pc-windows-msvc/install.ps1 dist/install.ps1
-
- - name: Create GitHub Release
- env:
- GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- RELEASE_NAME: ${{ steps.release_name.outputs.name }}
- RELEASE_NOTES: ${{ steps.release_notes.outputs.path }}
- MAKE_LATEST: ${{ steps.release_name.outputs.make_latest }}
- PRERELEASE: ${{ steps.release_name.outputs.prerelease }}
- run: |
- set -euo pipefail
-
- # Look up this tag, including drafts, without listing release history.
- # API errors must fail the step rather than look like an absent release.
- # shellcheck disable=SC2016
- exists="$(gh api graphql \
- -f query='query($owner:String!,$repo:String!,$tag:String!){repository(owner:$owner,name:$repo){release(tagName:$tag){databaseId}}}' \
- -f owner="$GITHUB_REPOSITORY_OWNER" \
- -f repo="${GITHUB_REPOSITORY#*/}" \
- -f tag="$GITHUB_REF_NAME" \
- --jq '.data.repository.release != null')"
- release_args=(
- --repo "$GITHUB_REPOSITORY"
- --title "$RELEASE_NAME"
- --notes-file "$RELEASE_NOTES"
- --prerelease="$PRERELEASE"
- )
- if [[ "$exists" == false ]]; then
- # Prereleases must be created directly to keep prereleased events.
- draft=true
- if [[ "$PRERELEASE" == true ]]; then
- draft=false
- fi
- gh release create "$GITHUB_REF_NAME" "${release_args[@]}" \
- --draft="$draft" --verify-tag --latest=false
- fi
-
- mapfile -d '' assets < <(find dist -type f -print0 | sort -z)
- gh release upload "$GITHUB_REF_NAME" "${assets[@]}" \
- --repo "$GITHUB_REPOSITORY" --clobber
- gh release edit "$GITHUB_REF_NAME" "${release_args[@]}" \
- --draft=false --latest="$MAKE_LATEST"
-
- publish-r2-assets:
- name: publish-r2-assets
- needs: release
- if: ${{ !cancelled() && needs.release.result == 'success' }}
- permissions:
- contents: read
- uses: ./.github/workflows/r2-release.yml
- secrets: inherit
- with:
- tag: ${{ needs.release.outputs.tag }}
- make_latest: ${{ fromJSON(needs.release.outputs.make_latest) }}
- prerelease: ${{ fromJSON(needs.release.outputs.prerelease) }}
- stage: assets
-
- publish-r2:
- concurrency: *release-publication
- name: publish-r2
- needs: [release, publish-dotslash, publish-r2-assets]
- if: >-
- ${{
- !cancelled() &&
- needs.release.result == 'success' &&
- needs.publish-dotslash.result == 'success' &&
- needs.publish-r2-assets.result == 'success'
- }}
- permissions:
- contents: read
- uses: ./.github/workflows/r2-release.yml
- secrets: inherit
- with:
- tag: ${{ needs.release.outputs.tag }}
- make_latest: ${{ fromJSON(needs.release.outputs.make_latest) }}
- prerelease: ${{ fromJSON(needs.release.outputs.prerelease) }}
- stage: finalize
-
- publish-dotslash:
- name: publish-dotslash
- needs: release
- if: ${{ !cancelled() && needs.release.result == 'success' }}
- runs-on: ubuntu-latest
- permissions:
- contents: write
-
- steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- - uses: ./.github/actions/publish-dotslash
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- tag: ${{ github.ref_name }}
- configs: |
- .github/dotslash-config.json
- .github/dotslash-argument-comment-lint-config.json
-
- - name: Publish the provisioned macOS package manifest
- if: vars.CODEX_PROVISIONED_MACOS_CANDIDATE == 'true'
- uses: facebook/dotslash-publish-release@9c9ec027515c34db9282a09a25a9cab5880b2c52 # v2
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- tag: ${{ github.ref_name }}
- config: .github/dotslash-provisioned-config.json
-
- # Publish to npm using OIDC authentication.
- # July 31, 2025: https://github.blog/changelog/2025-07-31-npm-trusted-publishing-with-oidc-is-generally-available/
- # npm docs: https://docs.npmjs.com/trusted-publishers
- publish-npm:
- concurrency: *release-publication
- # Publish to npm for stable releases, numbered alphas, and alpha hotfixes.
- if: >-
- ${{
- !cancelled() &&
- needs.release.result == 'success' &&
- needs.release.outputs.should_publish_npm == 'true'
- }}
- name: publish-npm
- needs: release
- runs-on: ubuntu-latest
- permissions:
- id-token: write # Required for OIDC
- contents: read
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- - name: Setup Node.js
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
- with:
- # Node 24 bundles npm >= 11.5.1, which trusted publishing requires.
- node-version: 24
- registry-url: "https://registry.npmjs.org"
- scope: "@openai"
-
- - name: Download npm tarballs from release
- env:
- GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- RELEASE_TAG: ${{ needs.release.outputs.tag }}
- RELEASE_VERSION: ${{ needs.release.outputs.version }}
- run: |
- set -euo pipefail
- version="$RELEASE_VERSION"
- tag="$RELEASE_TAG"
- mkdir -p dist/npm
- patterns=(
- "codex-npm-${version}.tgz"
- "codex-npm-linux-*-${version}.tgz"
- "codex-npm-darwin-*-${version}.tgz"
- "codex-npm-win32-*-${version}.tgz"
- "codex-responses-api-proxy-npm-${version}.tgz"
- "codex-sdk-npm-${version}.tgz"
- )
- for pattern in "${patterns[@]}"; do
- gh release download "$tag" \
- --repo "${GITHUB_REPOSITORY}" \
- --pattern "$pattern" \
- --dir dist/npm
- done
-
- # No NODE_AUTH_TOKEN needed because we use OIDC.
- - name: Publish to npm
- env:
- VERSION: ${{ needs.release.outputs.version }}
- NPM_TAG: ${{ needs.release.outputs.npm_tag }}
- NPM_CONFIG_LOGLEVEL: verbose
- NPM_CONFIG_LOGS_DIR: ${{ runner.temp }}/npm-publish-logs
- NPM_CONFIG_LOGS_MAX: "100"
- run: |
- set -euo pipefail
- prefix=""
- if [[ -n "${NPM_TAG}" ]]; then
- prefix="${NPM_TAG}-"
- fi
-
- root_tarball="dist/npm/codex-npm-${VERSION}.tgz"
- sdk_tarball="dist/npm/codex-sdk-npm-${VERSION}.tgz"
- # Keep this list in sync with CODEX_PLATFORM_PACKAGES in
- # codex-cli/scripts/build_npm_package.py. The root wrapper advances
- # @openai/codex@latest as soon as it publishes, so every platform
- # package it aliases must already exist in the registry first.
- platform_tarballs=(
- "dist/npm/codex-npm-linux-x64-${VERSION}.tgz"
- "dist/npm/codex-npm-linux-arm64-${VERSION}.tgz"
- "dist/npm/codex-npm-darwin-x64-${VERSION}.tgz"
- "dist/npm/codex-npm-darwin-arm64-${VERSION}.tgz"
- "dist/npm/codex-npm-win32-x64-${VERSION}.tgz"
- "dist/npm/codex-npm-win32-arm64-${VERSION}.tgz"
- )
-
- for required_tarball in "${platform_tarballs[@]}" "${root_tarball}"; do
- if [[ ! -f "${required_tarball}" ]]; then
- echo "Missing npm tarball: ${required_tarball}"
- exit 1
- fi
- done
-
- shopt -s nullglob
- other_tarballs=()
- for tarball in dist/npm/*-"${VERSION}".tgz; do
- if [[ "${tarball}" == "${root_tarball}" || "${tarball}" == "${sdk_tarball}" ]]; then
- continue
- fi
-
- is_platform_tarball=false
- for platform_tarball in "${platform_tarballs[@]}"; do
- if [[ "${tarball}" == "${platform_tarball}" ]]; then
- is_platform_tarball=true
- break
- fi
- done
- if [[ "${is_platform_tarball}" == true ]]; then
- continue
- fi
-
- other_tarballs+=("${tarball}")
- done
-
- # npm returns HTTP 409 when concurrent publishes update the same
- # packument. Every platform tarball is a version of @openai/codex,
- # so publish all tarballs serially.
- tarballs=(
- "${platform_tarballs[@]}"
- "${other_tarballs[@]}"
- "${root_tarball}"
- )
- # The SDK depends on this exact root package version.
- if [[ -f "${sdk_tarball}" ]]; then
- tarballs+=("${sdk_tarball}")
- fi
-
- for tarball in "${tarballs[@]}"; do
- filename="$(basename "${tarball}")"
- tag=""
-
- case "${filename}" in
- codex-npm-linux-*-"${VERSION}".tgz|codex-npm-darwin-*-"${VERSION}".tgz|codex-npm-win32-*-"${VERSION}".tgz)
- platform="${filename#codex-npm-}"
- platform="${platform%-${VERSION}.tgz}"
- tag="${prefix}${platform}"
- ;;
- codex-npm-"${VERSION}".tgz|codex-responses-api-proxy-npm-"${VERSION}".tgz|codex-sdk-npm-"${VERSION}".tgz)
- tag="${NPM_TAG}"
- ;;
- *)
- echo "Unexpected npm tarball: ${filename}"
- exit 1
- ;;
- esac
-
- # The publication workflow holds the lock from this lookup through
- # publish, including concurrent releases from other version lines.
- tag="$(python3 .github/scripts/npm_alpha_tag.py "${tarball}" "${VERSION}" "${tag:-latest}")"
-
- publish_cmd=(npm publish "${GITHUB_WORKSPACE}/${tarball}")
- if [[ -n "${tag}" ]]; then
- publish_cmd+=(--tag "${tag}")
- fi
-
- # A fresh npm process obtains new OIDC credentials on each attempt.
- for attempt in 1 2 3; do
- echo "+ ${publish_cmd[*]} (attempt ${attempt}/3)"
- set +e
- publish_output="$("${publish_cmd[@]}" 2>&1)"
- publish_status=$?
- set -e
-
- echo "${publish_output}"
- if [[ ${publish_status} -eq 0 ]]; then
- break
- fi
-
- if grep -qiE "previously published|cannot publish over|version already exists" <<< "${publish_output}"; then
- echo "Skipping already-published package version for ${filename}"
- break
- fi
-
- if [[ ${attempt} -eq 3 ]]; then
- exit "${publish_status}"
- fi
- delay=$((attempt * 10))
- echo "Publishing ${filename} failed; retrying in ${delay} seconds."
- sleep "${delay}"
- done
- done
-
- - name: Retain npm debug logs
- if: always()
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: npm-publish-logs-${{ github.run_attempt }}
- path: ${{ runner.temp }}/npm-publish-logs/
- if-no-files-found: ignore
- retention-days: 7
-
- deploy-dev-website:
- name: Trigger developers.openai.com deploy
- needs: release
- # Only trigger the deploy for a stable release.
- # The deploy updates developers.openai.com with the new config schema json file.
- if: >-
- ${{
- !cancelled() &&
- needs.release.result == 'success' &&
- !contains(needs.release.outputs.version, '-')
- }}
- runs-on: ubuntu-latest
- continue-on-error: true
- permissions: {}
- environment:
- name: dev-website-vercel-deploy
- deployment: false
-
- steps:
- - name: Trigger developers.openai.com deploy
- continue-on-error: true
- env:
- DEV_WEBSITE_VERCEL_DEPLOY_HOOK_URL: ${{ secrets.DEV_WEBSITE_VERCEL_DEPLOY_HOOK_URL }}
- run: |
- if ! curl -sS -f -o /dev/null -X POST "$DEV_WEBSITE_VERCEL_DEPLOY_HOOK_URL"; then
- echo "::warning title=developers.openai.com deploy hook failed::Vercel deploy hook POST failed for ${GITHUB_REF_NAME}"
- exit 1
- fi
-
- winget:
- concurrency: *release-publication
- name: winget
- needs: release
- # Only publish stable/mainline releases to WinGet; pre-releases include a
- # '-' in the semver string (e.g., 1.2.3-alpha.1).
- if: >-
- ${{
- !cancelled() &&
- needs.release.result == 'success' &&
- !contains(needs.release.outputs.version, '-')
- }}
- # komac opens the winget-pkgs PR using the published Windows archives;
- # it runs on Linux and does not execute the Windows binaries.
- runs-on: ubuntu-latest
- permissions:
- contents: read
- environment:
- name: mainline-release-winget
- deployment: false
-
- steps:
- # Adapted from the WinGet Releaser version previously used by this job:
- # https://github.com/vedantmgoyal9/winget-releaser/blob/7bd472be23763def6e16bd06cc8b1cdfab0e2fd5/action.yml
- # Keep dependencies explicit because its cargo-binstall@main reference
- # violates the policy requiring full commit SHA action pins.
- - name: Install cargo-binstall
- uses: cargo-bins/cargo-binstall@b874e25ea559687bec77e281e9b271aa1367b624 # v1.23.0
- with:
- version: "1.23.0"
- env:
- GITHUB_TOKEN: ${{ github.token }}
-
- - name: Install komac
- env:
- GITHUB_TOKEN: ${{ github.token }}
- run: cargo-binstall komac --version 2.16.0 --no-confirm
-
- - name: Publish to WinGet
- shell: bash
- env:
- GH_TOKEN: ${{ github.token }}
- GITHUB_TOKEN: ${{ secrets.WINGET_PUBLISH_PAT }}
- RELEASE_VERSION: ${{ needs.release.outputs.version }}
- RELEASE_TAG: ${{ needs.release.outputs.tag }}
- KOMAC_FORK_OWNER: openai-oss-forks
- KOMAC_CREATED_WITH: Codex release workflow
- KOMAC_CREATED_WITH_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
- run: |
- set -euo pipefail
- installer_urls="$(gh release view "$RELEASE_TAG" --repo "$GITHUB_REPOSITORY" \
- --json assets \
- --jq '.assets[] | select(.name | test("^codex-(x86_64|aarch64)-pc-windows-msvc\\.exe\\.zip$")) | .url')"
- mapfile -t urls <<< "$installer_urls"
- if [[ ${#urls[@]} -ne 2 ]]; then
- echo "::error::Expected x86_64 and aarch64 Windows archives for $RELEASE_TAG"
- exit 1
- fi
- komac sync-fork
- komac update OpenAI.Codex --version "$RELEASE_VERSION" --submit --urls "${urls[@]}"
- komac cleanup --only-merged
-
- update-branch:
- concurrency: *release-publication
- name: Update latest-alpha-cli branch
- if: >-
- ${{
- !cancelled() &&
- needs.release.result == 'success' &&
- needs.release.outputs.npm_tag == 'alpha' &&
- needs.publish-r2.result == 'success' &&
- needs.publish-npm.result == 'success'
- }}
- permissions:
- contents: write
- # R2 waits for the GitHub release and DotSlash release-asset uploads.
- needs:
- - release
- - publish-r2
- - publish-npm
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
- - name: Determine whether to update the GitHub canary branch
- id: github_canary
- shell: bash
- env:
- GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- RELEASE_VERSION: ${{ needs.release.outputs.version }}
- PYTHONPATH: .github/scripts
- run: |
- set -euo pipefail
- # Despite its name, raw+json returns raw TOML. The default response
- # is JSON metadata with the file contents encoded as base64.
- update="$(gh api "repos/$GITHUB_REPOSITORY/contents/codex-rs/Cargo.toml?ref=latest-alpha-cli" \
- -H 'Accept: application/vnd.github.raw+json' \
- | python3 .github/scripts/releases.py "$RELEASE_VERSION" --check-github canary)"
- echo "update=$update" >> "$GITHUB_OUTPUT"
- - name: Update latest-alpha-cli branch
- if: success() && steps.github_canary.outputs.update == 'true'
- env:
- GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: |
- set -euo pipefail
- gh api \
- repos/${GITHUB_REPOSITORY}/git/refs/heads/latest-alpha-cli \
- -X PATCH \
- -f sha="${GITHUB_SHA}" \
- -F force=true
+ echo "::error::Upstream Rust release including macOS is disabled in Codefx. Use codefx-rust-v0.166-release.yml."
+ exit 1
diff --git a/.github/workflows/rusty-v8-release.yml b/.github/workflows/rusty-v8-release.yml
index 3dcdbe09859d..68a759c6c02a 100644
--- a/.github/workflows/rusty-v8-release.yml
+++ b/.github/workflows/rusty-v8-release.yml
@@ -1,495 +1,13 @@
-name: rusty-v8-release
-
+name: Disabled upstream V8 publisher (Codefx Linux/Windows only)
on:
- push:
- tags:
- - "rusty-v8-v*.*.*"
-
-# Cargo's libgit2 transport has been flaky when fetching git dependencies with
-# nested submodules. Prefer the system git CLI for Cargo smoke tests.
-env:
- CARGO_NET_GIT_FETCH_WITH_CLI: "true"
-
-concurrency:
- group: ${{ github.workflow }}::${{ github.ref_name }}
- cancel-in-progress: false
-
+ workflow_dispatch:
+permissions:
+ contents: read
jobs:
- metadata:
- runs-on: ubuntu-latest
- outputs:
- release_tag: ${{ steps.release_tag.outputs.release_tag }}
- v8_version: ${{ steps.v8_version.outputs.version }}
-
+ disabled:
+ runs-on: ubuntu-24.04
steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- - name: Set up Python
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
- with:
- python-version: "3.12"
-
- - name: Resolve exact v8 crate version
- id: v8_version
- shell: bash
+ - name: Block upstream multi-OS publishing
run: |
- set -euo pipefail
- version="$(python3 .github/scripts/rusty_v8_bazel.py resolved-v8-crate-version)"
- echo "version=${version}" >> "$GITHUB_OUTPUT"
-
- - name: Resolve release tag
- id: release_tag
- env:
- GITHUB_REF_NAME: ${{ github.ref_name }}
- V8_VERSION: ${{ steps.v8_version.outputs.version }}
- shell: bash
- run: |
- set -euo pipefail
-
- expected_release_tag="rusty-v8-v${V8_VERSION}"
- release_tag="${GITHUB_REF_NAME}"
- if [[ "${release_tag}" != "${expected_release_tag}" ]]; then
- echo "Tag ${release_tag} does not match expected release tag ${expected_release_tag}." >&2
- exit 1
- fi
-
- echo "release_tag=${release_tag}" >> "$GITHUB_OUTPUT"
-
- build:
- name: Build ${{ matrix.variant }} ${{ matrix.target }}
- needs: metadata
- runs-on: ${{ matrix.runner }}
- permissions:
- contents: read
- actions: read
- environment:
- name: bazel
- deployment: false
- strategy:
- fail-fast: false
- matrix:
- include:
- - runner: ubuntu-24.04
- bazel_config: ci-v8
- platform: linux_amd64
- sandbox: false
- target: x86_64-unknown-linux-gnu
- v8_cpu: x64
- variant: release
- - runner: ubuntu-24.04
- bazel_config: ci-v8
- platform: linux_amd64
- sandbox: true
- target: x86_64-unknown-linux-gnu
- v8_cpu: x64
- variant: ptrcomp-sandbox
- - runner: ubuntu-24.04-arm
- bazel_config: ci-v8
- platform: linux_arm64
- sandbox: false
- target: aarch64-unknown-linux-gnu
- v8_cpu: arm64
- variant: release
- - runner: ubuntu-24.04-arm
- bazel_config: ci-v8
- platform: linux_arm64
- sandbox: true
- target: aarch64-unknown-linux-gnu
- v8_cpu: arm64
- variant: ptrcomp-sandbox
- - runner: macos-15-xlarge
- bazel_config: ci-macos
- platform: macos_amd64
- sandbox: false
- target: x86_64-apple-darwin
- v8_cpu: x64
- variant: release
- - runner: macos-15-xlarge
- bazel_config: ci-macos
- platform: macos_amd64
- sandbox: true
- target: x86_64-apple-darwin
- v8_cpu: x64
- variant: ptrcomp-sandbox
- - runner: macos-15-xlarge
- bazel_config: ci-macos
- platform: macos_arm64
- sandbox: false
- target: aarch64-apple-darwin
- v8_cpu: arm64
- variant: release
- - runner: macos-15-xlarge
- bazel_config: ci-macos
- platform: macos_arm64
- sandbox: true
- target: aarch64-apple-darwin
- v8_cpu: arm64
- variant: ptrcomp-sandbox
- - runner: ubuntu-24.04
- bazel_config: ci-v8
- platform: linux_amd64_musl
- sandbox: false
- target: x86_64-unknown-linux-musl
- v8_cpu: x64
- variant: release
- - runner: ubuntu-24.04-arm
- bazel_config: ci-v8
- platform: linux_arm64_musl
- sandbox: false
- target: aarch64-unknown-linux-musl
- v8_cpu: arm64
- variant: release
- - runner: ubuntu-24.04
- bazel_config: ci-v8
- platform: linux_amd64_musl
- sandbox: true
- target: x86_64-unknown-linux-musl
- v8_cpu: x64
- variant: ptrcomp-sandbox
- - runner: ubuntu-24.04-arm
- bazel_config: ci-v8
- platform: linux_arm64_musl
- sandbox: true
- target: aarch64-unknown-linux-musl
- v8_cpu: arm64
- variant: ptrcomp-sandbox
-
- steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- - name: Prepare Bazel CI
- uses: ./.github/actions/prepare-bazel-ci
- with:
- target: ${{ matrix.target }}
- cache-scope: bazel-v8
-
- - name: Set up Python
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
- with:
- python-version: "3.12"
-
- - name: Set up Rust toolchain for Cargo smoke
- uses: dtolnay/rust-toolchain@d124f86f28ff42855784ff3319f48ac182c248f8 # 1.99.1
- with:
- toolchain: "1.99.1"
-
- - name: Build Bazel V8 release pair
- env:
- BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
- PLATFORM: ${{ matrix.platform }}
- SANDBOX: ${{ matrix.sandbox }}
- TARGET: ${{ matrix.target }}
- V8_CPU: ${{ matrix.v8_cpu }}
- shell: bash
- run: |
- set -euo pipefail
-
- target_suffix="${TARGET//-/_}"
- pair_kind="release_pair"
- if [[ "${SANDBOX}" == "true" ]]; then
- pair_kind="sandbox_release_pair"
- fi
- pair_target="//third_party/v8:rusty_v8_${pair_kind}_${target_suffix}"
-
- bazel_args=(
- build
- -c
- opt
- "--platforms=@llvm//platforms:${PLATFORM}"
- --config=rusty-v8-upstream-libcxx
- "--config=v8-target-${V8_CPU}"
- "${pair_target}"
- --build_metadata=COMMIT_SHA=$(git rev-parse HEAD)
- )
- if [[ "${SANDBOX}" != "true" ]]; then
- bazel_args+=(--config=v8-release-compat)
- fi
-
- ./.github/scripts/run_bazel_with_buildbuddy.py \
- --noexperimental_remote_repo_contents_cache \
- "${bazel_args[@]}" \
- "--config=${{ matrix.bazel_config }}"
-
- - name: Stage release pair
- env:
- BAZEL_CONFIG: ${{ matrix.bazel_config }}
- BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
- PLATFORM: ${{ matrix.platform }}
- SANDBOX: ${{ matrix.sandbox }}
- TARGET: ${{ matrix.target }}
- V8_CPU: ${{ matrix.v8_cpu }}
- shell: bash
- run: |
- set -euo pipefail
-
- stage_args=(
- --platform "${PLATFORM}"
- --target "${TARGET}"
- --compilation-mode opt
- --output-dir "dist/${TARGET}"
- --bazel-config "${BAZEL_CONFIG}"
- --bazel-config "v8-target-${V8_CPU}"
- )
- if [[ "${SANDBOX}" == "true" ]]; then
- stage_args+=(--sandbox)
- else
- stage_args+=(--bazel-config v8-release-compat)
- fi
-
- python3 .github/scripts/rusty_v8_bazel.py stage-release-pair "${stage_args[@]}"
-
- - name: Smoke test staged artifact with Cargo
- env:
- SANDBOX: ${{ matrix.sandbox }}
- TARGET: ${{ matrix.target }}
- shell: bash
- run: |
- set -euo pipefail
-
- host_arch="$(uname -m)"
- case "${TARGET}:${host_arch}" in
- x86_64-apple-darwin:x86_64|aarch64-apple-darwin:arm64|x86_64-unknown-linux-gnu:x86_64|aarch64-unknown-linux-gnu:aarch64)
- ;;
- *)
- echo "Skipping non-native Cargo smoke for ${TARGET} on ${host_arch}."
- exit 0
- ;;
- esac
-
- archive="$(find "dist/${TARGET}" -maxdepth 1 -type f -name 'librusty_v8_*.a.gz' -print -quit)"
- binding="$(find "dist/${TARGET}" -maxdepth 1 -type f -name 'src_binding_*.rs' -print -quit)"
- if [[ -z "${archive}" || -z "${binding}" ]]; then
- echo "Missing staged archive or binding for ${TARGET}." >&2
- exit 1
- fi
-
- cargo_args=(test -p codex-v8-poc)
- if [[ "${SANDBOX}" == "true" ]]; then
- cargo_args+=(--features sandbox)
- fi
-
- (
- cd codex-rs
- CARGO_TARGET_DIR="${RUNNER_TEMP}/rusty-v8-cargo-smoke-${TARGET}-${SANDBOX}" \
- RUSTY_V8_ARCHIVE="${GITHUB_WORKSPACE}/${archive}" \
- RUSTY_V8_SRC_BINDING_PATH="${GITHUB_WORKSPACE}/${binding}" \
- cargo "${cargo_args[@]}"
- )
-
- - name: Upload staged artifacts
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: rusty-v8-${{ needs.metadata.outputs.v8_version }}-${{ matrix.variant }}-${{ matrix.target }}
- path: dist/${{ matrix.target }}/*
-
- build-windows-source:
- name: Build ptrcomp-sandbox ${{ matrix.target }} from source
- needs: metadata
- runs-on: ${{ matrix.runner }}
- permissions:
- contents: read
- strategy:
- fail-fast: false
- matrix:
- include:
- - runner: windows-2022
- target: x86_64-pc-windows-msvc
- - runner: windows-2022
- target: aarch64-pc-windows-msvc
-
- steps:
- - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- - name: Configure git for upstream checkout
- shell: bash
- run: git config --global core.symlinks true
-
- - name: Check out upstream rusty_v8
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- repository: denoland/rusty_v8
- ref: v${{ needs.metadata.outputs.v8_version }}
- path: upstream-rusty-v8
- submodules: recursive
- persist-credentials: false
-
- - name: Download upstream Windows build tools
- shell: bash
- working-directory: upstream-rusty-v8
- run: |
- set -euo pipefail
- # Upstream skips this submodule and downloads the pinned archive in CI.
- mkdir -p tools/win
- curl -fL https://chromium.googlesource.com/chromium/src/tools/win/+archive/faefd1b6fa9eeb033ad6fe60368ccb9bf908cbd0.tar.gz |
- tar -xz -C tools/win
-
- - name: Set up Python
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
- with:
- python-version: "3.11"
- architecture: x64
-
- - name: Set up Codex Rust toolchain for Cargo smoke
- uses: dtolnay/rust-toolchain@d124f86f28ff42855784ff3319f48ac182c248f8 # 1.99.1
- with:
- toolchain: "1.99.1"
- targets: ${{ matrix.target }}
-
- - name: Install rusty_v8 Rust toolchain
- env:
- TARGET: ${{ matrix.target }}
- shell: bash
- run: |
- set -euo pipefail
- rustup toolchain install 1.91.0 --profile minimal --no-self-update
- rustup target add --toolchain 1.91.0 "${TARGET}"
-
- - name: Write upstream submodule status
- shell: bash
- working-directory: upstream-rusty-v8
- run: git submodule status --recursive > git_submodule_status.txt
-
- - name: Restore upstream source-build cache
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
- with:
- path: |
- upstream-rusty-v8/target/sccache
- upstream-rusty-v8/target/${{ matrix.target }}/release/gn_out
- key: rusty-v8-source-${{ matrix.target }}-sandbox-${{ hashFiles('upstream-rusty-v8/Cargo.lock', 'upstream-rusty-v8/build.rs', 'upstream-rusty-v8/git_submodule_status.txt', 'patches/v8_array_sort_elements_kind.patch') }}
- restore-keys: |
- rusty-v8-source-${{ matrix.target }}-sandbox-
-
- - name: Apply V8 Array.sort backport
- shell: bash
- working-directory: upstream-rusty-v8/v8
- run: git apply -p3 "${GITHUB_WORKSPACE}/patches/v8_array_sort_elements_kind.patch"
-
- - name: Install sccache
- uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
- with:
- tool: sccache@0.8.2
-
- - name: Start sccache
- shell: pwsh
- env:
- SCCACHE_CACHE_SIZE: 256M
- SCCACHE_DIR: ${{ github.workspace }}/upstream-rusty-v8/target/sccache
- SCCACHE_IDLE_TIMEOUT: 0
- run: sccache --start-server
-
- - name: Install Chromium clang for ARM64 MSVC cross build
- if: matrix.target == 'aarch64-pc-windows-msvc'
- shell: bash
- working-directory: upstream-rusty-v8
- run: python3 tools/clang/scripts/update.py
-
- - name: Build upstream rusty_v8 sandbox release pair
- env:
- SCCACHE_IDLE_TIMEOUT: 0
- TARGET: ${{ matrix.target }}
- V8_FROM_SOURCE: "1"
- shell: bash
- working-directory: upstream-rusty-v8
- run: cargo +1.91.0 build --locked --release --target "${TARGET}" --features v8_enable_sandbox
-
- - name: Stage upstream sandbox release pair
- env:
- TARGET: ${{ matrix.target }}
- shell: bash
- run: |
- set -euo pipefail
- python3 .github/scripts/rusty_v8_bazel.py stage-upstream-release-pair \
- --target-dir upstream-rusty-v8/target \
- --target "${TARGET}" \
- --output-dir "dist/${TARGET}" \
- --sandbox
-
- - name: Smoke link staged artifact with Cargo
- env:
- TARGET: ${{ matrix.target }}
- shell: bash
- run: |
- set -euo pipefail
-
- archive="$(find "dist/${TARGET}" -maxdepth 1 -type f -name 'rusty_v8_*.lib.gz' -print -quit)"
- binding="$(find "dist/${TARGET}" -maxdepth 1 -type f -name 'src_binding_*.rs' -print -quit)"
- if [[ -z "${archive}" || -z "${binding}" ]]; then
- echo "Missing staged archive or binding for ${TARGET}." >&2
- exit 1
- fi
-
- (
- cd codex-rs
- RUSTY_V8_ARCHIVE="${GITHUB_WORKSPACE}/${archive}" \
- RUSTY_V8_SRC_BINDING_PATH="${GITHUB_WORKSPACE}/${binding}" \
- cargo +1.99.1 test -p codex-v8-poc --target "${TARGET}" --features sandbox --no-run
- )
-
- - name: Upload staged artifacts
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
- with:
- name: rusty-v8-${{ needs.metadata.outputs.v8_version }}-ptrcomp-sandbox-${{ matrix.target }}
- path: dist/${{ matrix.target }}/*
-
- publish-release:
- needs:
- - metadata
- - build
- - build-windows-source
- runs-on: ubuntu-latest
- permissions:
- contents: write
- actions: read
-
- steps:
- - name: Check whether release already exists
- env:
- GH_TOKEN: ${{ github.token }}
- RELEASE_TAG: ${{ needs.metadata.outputs.release_tag }}
- shell: bash
- run: |
- set -euo pipefail
-
- if is_draft="$(gh release view "${RELEASE_TAG}" --repo "${GITHUB_REPOSITORY}" --json isDraft --jq '.isDraft' 2>/dev/null)"; then
- if [[ "${is_draft}" != "true" ]]; then
- echo "Refusing to replace existing published release ${RELEASE_TAG}." >&2
- exit 1
- fi
-
- echo "Removing unfinished draft release for ${RELEASE_TAG}."
- gh release delete "${RELEASE_TAG}" --repo "${GITHUB_REPOSITORY}" --yes
- fi
-
- - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
- with:
- path: dist
-
- - name: Create GitHub Release
- env:
- GH_TOKEN: ${{ github.token }}
- RELEASE_TAG: ${{ needs.metadata.outputs.release_tag }}
- shell: bash
- run: |
- set -euo pipefail
- assets=()
- while IFS= read -r -d '' asset; do
- assets+=("${asset}")
- done < <(find dist -type f -print0)
- if [[ "${#assets[@]}" -eq 0 ]]; then
- echo "No V8 release artifacts were found." >&2
- exit 1
- fi
-
- # GitHub CLI keeps asset-bearing releases in draft until all uploads finish.
- gh release create "${RELEASE_TAG}" \
- --repo "${GITHUB_REPOSITORY}" \
- --title "${RELEASE_TAG}" \
- --verify-tag \
- --prerelease \
- "${assets[@]}"
+ echo "::error::Upstream V8 release workflow contains macOS release builds and is disabled in Codefx."
+ exit 1
diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index 4cb081eb94f8..ea82ac692021 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -4,11 +4,15 @@ on:
workflow_call:
jobs:
- python-sdk-installation:
- runs-on:
- group: ${{ github.event.repository.name }}-runners
- labels: ${{ github.event.repository.name }}-linux-x64
- timeout-minutes: 10
+ sdks:
+ # Keep both SDK suites on one runner. They share checkout, Docker, and
+ # Bazel setup; running them in one job preserves every test while avoiding
+ # a second runner allocation and a second repository checkout.
+ runs-on: ubuntu-24.04
+ timeout-minutes: 120
+ environment:
+ name: bazel
+ deployment: false
steps:
- name: Checkout repository
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -35,20 +39,6 @@ jobs:
env -u PYTHONPATH -u CODEX_EXEC_PATH /tmp/installed/bin/python tests/installed_sdk_smoke.py
'
- sdks:
- runs-on:
- group: ${{ github.event.repository.name }}-runners
- labels: ${{ github.event.repository.name }}-linux-x64
- timeout-minutes: 20
- environment:
- name: bazel
- deployment: false
- steps:
- - name: Checkout repository
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- with:
- persist-credentials: false
-
- name: Install Linux bwrap build dependencies
shell: bash
run: |
@@ -64,7 +54,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
with:
- node-version: 22
+ node-version-file: .nvmrc
cache: pnpm
- name: Prepare Bazel CI
@@ -72,7 +62,7 @@ jobs:
uses: ./.github/actions/prepare-bazel-ci
with:
target: x86_64-unknown-linux-gnu
- cache-scope: sdk
+ cache-scope: bazel-target
- name: Build codex and the code-mode host with Bazel
id: build_bazel
diff --git a/.github/workflows/v8-canary.yml b/.github/workflows/v8-canary.yml
index ae155133ed9c..36c4c3ccea11 100644
--- a/.github/workflows/v8-canary.yml
+++ b/.github/workflows/v8-canary.yml
@@ -10,7 +10,7 @@ on:
workflow_dispatch:
concurrency:
- group: ${{ github.workflow }}::${{ github.event.pull_request.number > 0 && format('pr-{0}', github.event.pull_request.number) || github.ref_name }}
+ group: ${{ github.workflow }}::${{ github.event.pull_request.number > 0 && format('pr-{0}', github.event.pull_request.number) || github.ref_name }}::scheduler-v4
cancel-in-progress: ${{ github.ref_name != 'main' }}
jobs:
@@ -83,6 +83,7 @@ jobs:
deployment: false
strategy:
fail-fast: false
+ max-parallel: 1
matrix:
include:
- runner: ubuntu-24.04
@@ -90,84 +91,48 @@ jobs:
platform: linux_amd64
sandbox: false
target: x86_64-unknown-linux-gnu
- v8_cpu: x64
variant: release
- runner: ubuntu-24.04
bazel_config: ci-v8
platform: linux_amd64
sandbox: true
target: x86_64-unknown-linux-gnu
- v8_cpu: x64
variant: ptrcomp-sandbox
- runner: ubuntu-24.04-arm
bazel_config: ci-v8
platform: linux_arm64
sandbox: false
target: aarch64-unknown-linux-gnu
- v8_cpu: arm64
variant: release
- runner: ubuntu-24.04-arm
bazel_config: ci-v8
platform: linux_arm64
sandbox: true
target: aarch64-unknown-linux-gnu
- v8_cpu: arm64
- variant: ptrcomp-sandbox
- - runner: macos-15-xlarge
- bazel_config: ci-macos
- platform: macos_amd64
- sandbox: false
- target: x86_64-apple-darwin
- v8_cpu: x64
- variant: release
- - runner: macos-15-xlarge
- bazel_config: ci-macos
- platform: macos_amd64
- sandbox: true
- target: x86_64-apple-darwin
- v8_cpu: x64
- variant: ptrcomp-sandbox
- - runner: macos-15-xlarge
- bazel_config: ci-macos
- platform: macos_arm64
- sandbox: false
- target: aarch64-apple-darwin
- v8_cpu: arm64
- variant: release
- - runner: macos-15-xlarge
- bazel_config: ci-macos
- platform: macos_arm64
- sandbox: true
- target: aarch64-apple-darwin
- v8_cpu: arm64
variant: ptrcomp-sandbox
- runner: ubuntu-24.04
bazel_config: ci-v8
platform: linux_amd64_musl
sandbox: false
target: x86_64-unknown-linux-musl
- v8_cpu: x64
variant: release
- runner: ubuntu-24.04
bazel_config: ci-v8
platform: linux_amd64_musl
sandbox: true
target: x86_64-unknown-linux-musl
- v8_cpu: x64
variant: ptrcomp-sandbox
- runner: ubuntu-24.04-arm
bazel_config: ci-v8
platform: linux_arm64_musl
sandbox: false
target: aarch64-unknown-linux-musl
- v8_cpu: arm64
variant: release
- runner: ubuntu-24.04-arm
bazel_config: ci-v8
platform: linux_arm64_musl
sandbox: true
target: aarch64-unknown-linux-musl
- v8_cpu: arm64
variant: ptrcomp-sandbox
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -186,9 +151,10 @@ jobs:
python-version: "3.12"
- name: Set up Rust toolchain for Cargo smoke
- uses: dtolnay/rust-toolchain@d124f86f28ff42855784ff3319f48ac182c248f8 # 1.99.1
+ uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
with:
- toolchain: "1.99.1"
+ toolchain: "1.95.0"
+ targets: ${{ matrix.target }}
- name: Build Bazel V8 release pair
env:
@@ -196,7 +162,6 @@ jobs:
PLATFORM: ${{ matrix.platform }}
SANDBOX: ${{ matrix.sandbox }}
TARGET: ${{ matrix.target }}
- V8_CPU: ${{ matrix.v8_cpu }}
shell: bash
run: |
set -euo pipefail
@@ -211,14 +176,9 @@ jobs:
bazel_args=(
build
"--platforms=@llvm//platforms:${PLATFORM}"
- --config=rusty-v8-upstream-libcxx
- "--config=v8-target-${V8_CPU}"
"${pair_target}"
--build_metadata=COMMIT_SHA=$(git rev-parse HEAD)
)
- if [[ "${SANDBOX}" != "true" ]]; then
- bazel_args+=(--config=v8-release-compat)
- fi
./.github/scripts/run_bazel_with_buildbuddy.py \
--noexperimental_remote_repo_contents_cache \
@@ -232,7 +192,6 @@ jobs:
PLATFORM: ${{ matrix.platform }}
SANDBOX: ${{ matrix.sandbox }}
TARGET: ${{ matrix.target }}
- V8_CPU: ${{ matrix.v8_cpu }}
shell: bash
run: |
set -euo pipefail
@@ -242,16 +201,33 @@ jobs:
--target "${TARGET}"
--output-dir "dist/${TARGET}"
--bazel-config "${BAZEL_CONFIG}"
- --bazel-config "v8-target-${V8_CPU}"
)
if [[ "${SANDBOX}" == "true" ]]; then
stage_args+=(--sandbox)
- else
- stage_args+=(--bazel-config v8-release-compat)
fi
python3 .github/scripts/rusty_v8_bazel.py stage-release-pair "${stage_args[@]}"
+ # Larger Linux runner images may omit the host linker used by Cargo build scripts.
+ - name: Install native Linux Cargo smoke dependencies
+ if: ${{ runner.os == 'Linux' }}
+ env:
+ TARGET: ${{ matrix.target }}
+ shell: bash
+ run: |
+ set -euo pipefail
+ packages=(build-essential)
+ if [[ "${TARGET}" == *-musl ]]; then
+ packages+=(musl-tools)
+ fi
+ sudo apt-get update -y
+ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends "${packages[@]}"
+ if [[ "${TARGET}" == *-musl ]]; then
+ # Use musl only for target links; Cargo build scripts still link on the glibc host.
+ linker_var="CARGO_TARGET_${TARGET^^}_LINKER"
+ echo "${linker_var//-/_}=$(command -v musl-gcc)" >> "${GITHUB_ENV}"
+ fi
+
- name: Smoke test staged artifact with Cargo
env:
SANDBOX: ${{ matrix.sandbox }}
@@ -260,16 +236,6 @@ jobs:
run: |
set -euo pipefail
- host_arch="$(uname -m)"
- case "${TARGET}:${host_arch}" in
- x86_64-apple-darwin:x86_64|aarch64-apple-darwin:arm64|x86_64-unknown-linux-gnu:x86_64|aarch64-unknown-linux-gnu:aarch64)
- ;;
- *)
- echo "Skipping non-native Cargo smoke for ${TARGET} on ${host_arch}."
- exit 0
- ;;
- esac
-
archive="$(find "dist/${TARGET}" -maxdepth 1 -type f -name 'librusty_v8_*.a.gz' -print -quit)"
binding="$(find "dist/${TARGET}" -maxdepth 1 -type f -name 'src_binding_*.rs' -print -quit)"
if [[ -z "${archive}" || -z "${binding}" ]]; then
@@ -277,10 +243,11 @@ jobs:
exit 1
fi
- cargo_args=(test -p codex-v8-poc)
+ cargo_args=(test -p codex-v8-poc --target "${TARGET}")
if [[ "${SANDBOX}" == "true" ]]; then
cargo_args+=(--features sandbox)
fi
+ cargo_args+=(-- --include-ignored)
(
cd codex-rs
@@ -302,13 +269,14 @@ jobs:
build-windows-source:
name: Build ptrcomp-sandbox ${{ matrix.target }} from source
- needs: metadata
- if: ${{ needs.metadata.outputs.windows_source_required == 'true' }}
+ needs: [metadata, build]
+ if: ${{ always() && !cancelled() && needs.metadata.outputs.windows_source_required == 'true' }}
runs-on: ${{ matrix.runner }}
permissions:
contents: read
strategy:
fail-fast: false
+ max-parallel: 1
matrix:
include:
- runner: windows-2025
@@ -354,9 +322,9 @@ jobs:
architecture: x64
- name: Set up Codex Rust toolchain for Cargo smoke
- uses: dtolnay/rust-toolchain@d124f86f28ff42855784ff3319f48ac182c248f8 # 1.99.1
+ uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
with:
- toolchain: "1.99.1"
+ toolchain: "1.95.0"
targets: ${{ matrix.target }}
- name: Install rusty_v8 Rust toolchain
@@ -446,7 +414,7 @@ jobs:
cd codex-rs
RUSTY_V8_ARCHIVE="${GITHUB_WORKSPACE}/${archive}" \
RUSTY_V8_SRC_BINDING_PATH="${GITHUB_WORKSPACE}/${binding}" \
- cargo +1.99.1 test -p codex-v8-poc --target "${TARGET}" --features sandbox --no-run
+ cargo +1.95.0 test -p codex-v8-poc --target "${TARGET}" --features sandbox --no-run
)
- name: Upload staged artifacts
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000000..ce62013c39ae
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+24.22.1
diff --git a/BUILD.bazel b/BUILD.bazel
index 9a6e5fb5c0e6..10d64abbaa0b 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,12 +1,4 @@
load("@apple_support//xcode:xcode_config.bzl", "xcode_config")
-load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
-
-# Set for builds that need custom V8 C++ flags or source instrumentation.
-bool_flag(
- name = "rusty_v8_from_source",
- build_setting_default = False,
- visibility = ["//visibility:public"],
-)
xcode_config(name = "disable_xcode")
diff --git a/MODULE.bazel b/MODULE.bazel
index b4bcc6f99435..66f6054c1219 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -151,6 +151,14 @@ bazel_dep(name = "rules_cc", version = "0.2.18")
cc_configure = use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_extension")
use_repo(cc_configure, "local_config_cc")
+single_version_override(
+ module_name = "rules_cc",
+ patch_strip = 1,
+ patches = [
+ "//patches:rules_cc_windows_native_llvm.patch",
+ ],
+)
+
bazel_dep(name = "rules_platform", version = "0.1.0")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "aws-lc", version = "5.1.0.bcr.1")
@@ -317,7 +325,7 @@ toolchains.toolchain(
edition = "2024",
extra_exec_rustc_flags = MSVC_RUSTC_FLAGS,
extra_rustc_flags = MSVC_RUSTC_FLAGS,
- version = "1.99.1",
+ version = "1.95.0",
)
use_repo(toolchains, "default_rust_toolchains")
@@ -393,6 +401,14 @@ crate.annotation(
},
rustc_flags = ["-Copt-level=3"],
)
+
+# Match the CodeModeHost response-compression benchmark's zstd level.
+crate.annotation(
+ crate = "tonic",
+ patch_args = ["-p1"],
+ patches = ["//patches:tonic-zstd-level1.patch"],
+ version = "0.14.3",
+)
crate.annotation(
crate = "zstd-sys",
gen_build_script = "on",
@@ -807,25 +823,47 @@ inject_repo(crate, "alsa_lib")
]
]
-bazel_dep(name = "v8", version = "15.2.124.1")
bazel_dep(name = "rules_license", version = "1.0.0")
-archive_override(
- module_name = "v8",
+engine_repository = use_repo_rule("//third_party/v8:engine_repository.bzl", "engine_repository")
+
+engine_repository(
+ name = "v8",
integrity = "sha256-aNN5G427qQbP/5o+NXONgXR8ZvS6mjf6mfAI6jtxyzI=",
patch_strip = 3,
patches = [
- "//patches:v8_module_deps.patch",
- "//patches:v8_bazel_rules.patch",
"//patches:v8_source_portability.patch",
"//patches:v8_array_sort_elements_kind.patch",
+ "//third_party/v8:v8_defs.patch",
],
strip_prefix = "v8-15.2.124.1",
urls = ["https://github.com/v8/v8/archive/refs/tags/15.2.124.1.tar.gz"],
)
-# The dependency repos and their BUILD files belong to Codex. V8 only needs
-# its original apparent repo names to resolve to these same imports.
+# All V8 inputs are owned here, including the pinned Python generator inputs.
+pip.parse(
+ extra_pip_args = ["--require-hashes"],
+ hub_name = "v8_python_deps",
+ python_version = "3.11",
+ requirements_lock = "@v8//:bazel/requirements.txt",
+ simpleapi_skip = [
+ "jinja2",
+ "markupsafe",
+ ],
+)
+use_repo(pip, "v8_python_deps")
+
+native_windows_llvm = use_repo_rule("//third_party/v8:native_windows.bzl", "native_windows_llvm")
+
+native_windows_llvm(name = "v8_native_windows_llvm")
+
+native_windows_cc = use_repo_rule("//third_party/v8:native_windows.bzl", "native_windows_cc")
+
+native_windows_cc(
+ name = "v8_native_windows_cc",
+ native_llvm = "@v8_native_windows_llvm//:BUILD.bazel",
+)
+
v8_dependencies = use_extension("//third_party/v8:dependencies.bzl", "dependencies")
use_repo(
v8_dependencies,
@@ -838,26 +876,13 @@ use_repo(
"v8_simdutf",
)
-v8_dependency_bridge = use_extension("@v8//:bazel/codex_deps.bzl", "codex_deps")
-
-inject_repo(
- v8_dependency_bridge,
- dragonbox = "v8_dragonbox",
- fast_float = "v8_fast_float",
- fp16 = "v8_fp16",
- highway = "v8_highway",
- icu = "v8_icu",
- simdutf = "v8_simdutf",
- v8_abseil = "v8_abseil",
-)
-
http_archive(
name = "v8_crate_152_2_0",
build_file = "//third_party/v8:v8_crate.BUILD.bazel",
- sha256 = "a10fe1a92da5c32c7c7f838ce36c0ccfcfd5edf0865b58bdde820aa64cea9888",
- strip_prefix = "v8-152.2.0",
+ sha256 = "e2e7f9961af59dbb749a60ac0a3c34c9680f6b86dd04277f2715356b5a52feab",
+ strip_prefix = "rusty_v8-350c5a859a9b3c84ab8701b3ad51e3b7699b30c0",
type = "tar.gz",
- urls = ["https://static.crates.io/crates/v8/v8-152.2.0.crate"],
+ urls = ["https://github.com/seanh-oai/rusty_v8/archive/350c5a859a9b3c84ab8701b3ad51e3b7699b30c0.tar.gz"],
)
git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 9ac9cc6ab1e1..834f2c1f34e9 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -1273,10 +1273,10 @@
"dunce_1.0.5": "{\"dependencies\":[],\"features\":{}}",
"dupe_0.9.1": "{\"dependencies\":[{\"name\":\"dupe_derive\",\"req\":\"=0.9.1\"}],\"features\":{}}",
"dupe_derive_0.9.1": "{\"dependencies\":[{\"name\":\"proc-macro2\",\"req\":\"^1.0\"},{\"name\":\"quote\",\"req\":\"^1.0.3\"},{\"features\":[\"extra-traits\"],\"name\":\"syn\",\"req\":\"^2\"}],\"features\":{}}",
- "dylint_6.1.0": "{\"dependencies\":[{\"name\":\"anstyle\",\"req\":\"^1.0\"},{\"name\":\"anyhow\",\"req\":\"^1.0\"},{\"name\":\"cargo-util\",\"optional\":true,\"req\":\"^0.2\"},{\"name\":\"cargo-util-schemas\",\"optional\":true,\"req\":\"^0.14\"},{\"name\":\"cargo_metadata\",\"req\":\"^0.23\"},{\"default_features\":false,\"name\":\"chrono\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"dunce\",\"optional\":true,\"req\":\"^1.0\"},{\"features\":[\"config\",\"git\",\"link\",\"packaging\",\"rustup\"],\"name\":\"dylint_internal\",\"req\":\"=6.1.0\"},{\"features\":[\"cargo\"],\"kind\":\"build\",\"name\":\"dylint_internal\",\"req\":\"=6.1.0\"},{\"features\":[\"examples\"],\"kind\":\"dev\",\"name\":\"dylint_internal\",\"req\":\"=6.1.0\"},{\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\"^0.11\"},{\"name\":\"fs_extra\",\"optional\":true,\"req\":\"^1.3\"},{\"name\":\"glob\",\"optional\":true,\"req\":\"^0.3\"},{\"name\":\"heck\",\"optional\":true,\"req\":\"^0.5\"},{\"name\":\"hex\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"log\",\"req\":\"^0.4\"},{\"name\":\"once_cell\",\"req\":\"^1.21\"},{\"name\":\"rewriter\",\"optional\":true,\"req\":\"^2.1\"},{\"name\":\"rustc-stable-hash\",\"optional\":true,\"req\":\"^0.1\"},{\"name\":\"semver\",\"req\":\"^1.0\"},{\"name\":\"serde\",\"req\":\"^1.0\"},{\"name\":\"serde-untagged\",\"optional\":true,\"req\":\"^0.1\"},{\"name\":\"serde_json\",\"req\":\"^1.0\"},{\"default_features\":false,\"features\":[\"default-syntaxes\",\"regex-fancy\",\"parsing\"],\"name\":\"syntect\",\"optional\":true,\"req\":\"^5.3\"},{\"name\":\"tempfile\",\"req\":\"^3.27\"},{\"name\":\"toml\",\"optional\":true,\"req\":\"^1.1\"},{\"name\":\"url\",\"optional\":true,\"req\":\"^2.5\"},{\"name\":\"walkdir\",\"optional\":true,\"req\":\"^2.5\"}],\"features\":{\"__cargo_cli\":[\"cargo-util\",\"cargo-util-schemas\",\"dunce\",\"dylint_internal/home\",\"fs_extra\",\"glob\",\"hex\",\"rustc-stable-hash\",\"serde-untagged\",\"toml\",\"url\"],\"__driver_from_crates_io\":[],\"default\":[],\"library_packages\":[\"__cargo_cli\"],\"package_options\":[\"chrono\",\"dylint_internal/clippy_utils\",\"dylint_internal/git\",\"heck\",\"rewriter\",\"syntect\",\"walkdir\"]}}",
- "dylint_internal_6.1.0": "{\"dependencies\":[{\"name\":\"anstyle\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"anyhow\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"assert_cmd\",\"req\":\"^2.2\"},{\"name\":\"bitflags\",\"optional\":true,\"req\":\"^2.13\"},{\"name\":\"cargo-util\",\"optional\":true,\"req\":\"^0.2\"},{\"name\":\"cargo_metadata\",\"optional\":true,\"req\":\"^0.23\"},{\"name\":\"ctor\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"env_logger\",\"optional\":true,\"req\":\"^0.11\"},{\"name\":\"git2\",\"optional\":true,\"req\":\"^0.21\"},{\"name\":\"home\",\"optional\":true,\"req\":\"^0.5\"},{\"name\":\"log\",\"req\":\"^0.4\"},{\"kind\":\"dev\",\"name\":\"predicates\",\"req\":\"^3.1\"},{\"name\":\"regex\",\"req\":\"^1.13\"},{\"name\":\"semver\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"serde_json\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"tar\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"tempfile\",\"optional\":true,\"req\":\"^3.27\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.27\"},{\"name\":\"thiserror\",\"optional\":true,\"req\":\"^2.0\"},{\"name\":\"toml\",\"optional\":true,\"req\":\"^1.1\"},{\"kind\":\"dev\",\"name\":\"toml\",\"req\":\"^1.1\"},{\"name\":\"toml_edit\",\"optional\":true,\"req\":\"^0.25\"},{\"kind\":\"dev\",\"name\":\"toml_edit\",\"req\":\"^0.25\"},{\"name\":\"walkdir\",\"optional\":true,\"req\":\"^2.5\"}],\"features\":{\"cargo\":[\"anstyle\",\"bitflags\",\"cargo_metadata\",\"home\"],\"clippy_utils\":[\"git\",\"semver\",\"tempfile\",\"toml\",\"toml_edit\"],\"config\":[\"cargo_metadata\",\"serde\",\"thiserror\",\"toml\"],\"examples\":[\"cargo\",\"cargo-util\",\"rustup\",\"walkdir\"],\"git\":[\"git2\"],\"home\":[\"dep:home\"],\"link\":[\"cargo\",\"rustup\",\"serde_json\"],\"match_def_path\":[],\"packaging\":[\"cargo\",\"tar\"],\"rustup\":[\"cargo_metadata\"],\"testing\":[\"ctor\",\"env_logger\",\"packaging\"]}}",
- "dylint_linting_6.1.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"assert_cmd\",\"req\":\"^2.2\"},{\"name\":\"cargo_metadata\",\"req\":\"^0.23\"},{\"features\":[\"config\"],\"name\":\"dylint_internal\",\"req\":\"=6.1.0\"},{\"features\":[\"clippy_utils\"],\"kind\":\"build\",\"name\":\"dylint_internal\",\"req\":\"=6.1.0\"},{\"name\":\"paste\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"rustc_version\",\"req\":\"^0.4\"},{\"name\":\"rustversion\",\"req\":\"^1.0\"},{\"name\":\"serde\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.27\"},{\"name\":\"thiserror\",\"req\":\"^2.0\"},{\"name\":\"toml\",\"req\":\"^1.1\"},{\"kind\":\"build\",\"name\":\"toml\",\"req\":\"^1.1\"}],\"features\":{\"constituent\":[]}}",
- "dylint_testing_6.1.0": "{\"dependencies\":[{\"name\":\"anyhow\",\"req\":\"^1.0\"},{\"name\":\"cargo_metadata\",\"req\":\"^0.23\"},{\"name\":\"compiletest_rs\",\"req\":\"^0.11\"},{\"name\":\"dylint\",\"req\":\"=6.1.0\"},{\"features\":[\"link\"],\"name\":\"dylint_internal\",\"req\":\"=6.1.0\"},{\"name\":\"env_logger\",\"req\":\"^0.11\"},{\"name\":\"once_cell\",\"req\":\"^1.21\"},{\"name\":\"regex\",\"req\":\"^1.13\"},{\"name\":\"tempfile\",\"req\":\"^3.27\"}],\"features\":{\"default\":[],\"deny_warnings\":[]}}",
+ "dylint_6.3.2": "{\"dependencies\":[{\"name\":\"anstyle\",\"req\":\"^1.0\"},{\"name\":\"anyhow\",\"req\":\"^1.0\"},{\"name\":\"cargo-util\",\"optional\":true,\"req\":\"^0.2\"},{\"name\":\"cargo-util-schemas\",\"optional\":true,\"req\":\"^0.14\"},{\"name\":\"cargo_metadata\",\"req\":\"^0.23\"},{\"default_features\":false,\"name\":\"chrono\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"dunce\",\"optional\":true,\"req\":\"^1.0\"},{\"features\":[\"config\",\"git\",\"link\",\"packaging\",\"rustup\"],\"name\":\"dylint_internal\",\"req\":\"=6.3.2\"},{\"features\":[\"cargo\"],\"kind\":\"build\",\"name\":\"dylint_internal\",\"req\":\"=6.3.2\"},{\"features\":[\"examples\"],\"kind\":\"dev\",\"name\":\"dylint_internal\",\"req\":\"=6.3.2\"},{\"kind\":\"dev\",\"name\":\"env_logger\",\"req\":\"^0.11\"},{\"name\":\"fs_extra\",\"optional\":true,\"req\":\"^1.3\"},{\"name\":\"glob\",\"optional\":true,\"req\":\"^0.3\"},{\"name\":\"heck\",\"optional\":true,\"req\":\"^0.5\"},{\"name\":\"hex\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"log\",\"req\":\"^0.4\"},{\"name\":\"once_cell\",\"req\":\"^1.21\"},{\"name\":\"rewriter\",\"optional\":true,\"req\":\"^2.1\"},{\"name\":\"rustc-stable-hash\",\"optional\":true,\"req\":\"^0.1\"},{\"name\":\"semver\",\"req\":\"^1.0\"},{\"name\":\"serde\",\"req\":\"^1.0\"},{\"name\":\"serde-untagged\",\"optional\":true,\"req\":\"^0.1\"},{\"name\":\"serde_json\",\"req\":\"^1.0\"},{\"default_features\":false,\"features\":[\"default-syntaxes\",\"regex-fancy\",\"parsing\"],\"name\":\"syntect\",\"optional\":true,\"req\":\"^5.3\"},{\"name\":\"tempfile\",\"req\":\"^3.27\"},{\"name\":\"toml\",\"optional\":true,\"req\":\"^1.1\"},{\"name\":\"url\",\"optional\":true,\"req\":\"^2.5\"},{\"name\":\"walkdir\",\"optional\":true,\"req\":\"^2.5\"}],\"features\":{\"__cargo_cli\":[\"cargo-util\",\"cargo-util-schemas\",\"dunce\",\"dylint_internal/home\",\"fs_extra\",\"glob\",\"hex\",\"rustc-stable-hash\",\"serde-untagged\",\"toml\",\"url\"],\"__driver_from_crates_io\":[],\"default\":[],\"library_packages\":[\"__cargo_cli\"],\"package_options\":[\"chrono\",\"dylint_internal/clippy_utils\",\"dylint_internal/git\",\"heck\",\"rewriter\",\"syntect\",\"walkdir\"]}}",
+ "dylint_internal_6.3.2": "{\"dependencies\":[{\"name\":\"anstyle\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"anyhow\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"assert_cmd\",\"req\":\"^2.2\"},{\"name\":\"bitflags\",\"optional\":true,\"req\":\"^2.13\"},{\"name\":\"cargo-util\",\"optional\":true,\"req\":\"^0.2\"},{\"name\":\"cargo_metadata\",\"optional\":true,\"req\":\"^0.23\"},{\"name\":\"ctor\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"env_logger\",\"optional\":true,\"req\":\"^0.11\"},{\"name\":\"git2\",\"optional\":true,\"req\":\"^0.21\"},{\"name\":\"home\",\"optional\":true,\"req\":\"^0.5\"},{\"name\":\"log\",\"req\":\"^0.4\"},{\"name\":\"pastey\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"predicates\",\"req\":\"^3.1\"},{\"name\":\"regex\",\"req\":\"^1.13\"},{\"name\":\"semver\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"serde_json\",\"optional\":true,\"req\":\"^1.0\"},{\"name\":\"tar\",\"optional\":true,\"req\":\"^0.4\"},{\"name\":\"tempfile\",\"req\":\"^3.27\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.27\"},{\"name\":\"thiserror\",\"optional\":true,\"req\":\"^2.0\"},{\"name\":\"toml\",\"optional\":true,\"req\":\"^1.1\"},{\"kind\":\"dev\",\"name\":\"toml\",\"req\":\"^1.1\"},{\"name\":\"toml_edit\",\"optional\":true,\"req\":\"^0.25\"},{\"kind\":\"dev\",\"name\":\"toml_edit\",\"req\":\"^0.25\"},{\"name\":\"walkdir\",\"optional\":true,\"req\":\"^2.5\"}],\"features\":{\"cargo\":[\"anstyle\",\"bitflags\",\"cargo_metadata\",\"home\"],\"clippy_utils\":[\"git\",\"semver\",\"toml\",\"toml_edit\"],\"config\":[\"cargo_metadata\",\"serde\",\"thiserror\",\"toml\"],\"examples\":[\"cargo\",\"cargo-util\",\"rustup\",\"walkdir\"],\"git\":[\"git2\"],\"home\":[\"dep:home\"],\"link\":[\"cargo\",\"rustup\",\"serde_json\"],\"match_def_path\":[],\"packaging\":[\"cargo\",\"tar\"],\"rustup\":[\"cargo_metadata\"],\"testing\":[\"ctor\",\"env_logger\",\"packaging\",\"rustup\"]}}",
+ "dylint_linting_6.3.2": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"assert_cmd\",\"req\":\"^2.2\"},{\"name\":\"cargo_metadata\",\"req\":\"^0.23\"},{\"features\":[\"config\"],\"name\":\"dylint_internal\",\"req\":\"=6.3.2\"},{\"features\":[\"clippy_utils\"],\"kind\":\"build\",\"name\":\"dylint_internal\",\"req\":\"=6.3.2\"},{\"name\":\"paste\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"rustc_version\",\"req\":\"^0.4\"},{\"name\":\"rustversion\",\"req\":\"^1.0\"},{\"name\":\"serde\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.27\"},{\"name\":\"thiserror\",\"req\":\"^2.0\"},{\"name\":\"toml\",\"req\":\"^1.1\"},{\"kind\":\"build\",\"name\":\"toml\",\"req\":\"^1.1\"}],\"features\":{\"constituent\":[]}}",
+ "dylint_testing_6.3.2": "{\"dependencies\":[{\"name\":\"anyhow\",\"req\":\"^1.0\"},{\"name\":\"cargo_metadata\",\"req\":\"^0.23\"},{\"name\":\"compiletest_rs\",\"req\":\"^0.11\"},{\"name\":\"dylint\",\"req\":\"=6.3.2\"},{\"features\":[\"link\"],\"name\":\"dylint_internal\",\"req\":\"=6.3.2\"},{\"name\":\"env_logger\",\"req\":\"^0.11\"},{\"name\":\"once_cell\",\"req\":\"^1.21\"},{\"name\":\"regex\",\"req\":\"^1.13\"},{\"name\":\"tempfile\",\"req\":\"^3.27\"}],\"features\":{\"default\":[],\"deny_warnings\":[]}}",
"dyn-clone_1.0.20": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"rustversion\",\"req\":\"^1.0\"},{\"features\":[\"diff\"],\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1.0.66\"}],\"features\":{}}",
"ecdsa_0.16.9": "{\"dependencies\":[{\"name\":\"der\",\"optional\":true,\"req\":\"^0.7\"},{\"default_features\":false,\"features\":[\"oid\"],\"name\":\"digest\",\"optional\":true,\"req\":\"^0.10.7\"},{\"default_features\":false,\"features\":[\"digest\",\"sec1\"],\"name\":\"elliptic-curve\",\"req\":\"^0.13.6\"},{\"default_features\":false,\"features\":[\"dev\"],\"kind\":\"dev\",\"name\":\"elliptic-curve\",\"req\":\"^0.13\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.4\"},{\"name\":\"rfc6979\",\"optional\":true,\"req\":\"^0.4\"},{\"default_features\":false,\"features\":[\"alloc\"],\"name\":\"serdect\",\"optional\":true,\"req\":\"^0.2\"},{\"default_features\":false,\"features\":[\"oid\"],\"name\":\"sha2\",\"optional\":true,\"req\":\"^0.10\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"sha2\",\"req\":\"^0.10\"},{\"default_features\":false,\"features\":[\"rand_core\"],\"name\":\"signature\",\"req\":\"^2.0, <2.3\"},{\"default_features\":false,\"name\":\"spki\",\"optional\":true,\"req\":\"^0.7.2\"}],\"features\":{\"alloc\":[\"elliptic-curve/alloc\",\"signature/alloc\",\"spki/alloc\"],\"arithmetic\":[\"elliptic-curve/arithmetic\"],\"default\":[\"digest\"],\"dev\":[\"arithmetic\",\"digest\",\"elliptic-curve/dev\",\"hazmat\"],\"digest\":[\"dep:digest\",\"signature/digest\"],\"hazmat\":[],\"pem\":[\"elliptic-curve/pem\",\"pkcs8\"],\"pkcs8\":[\"digest\",\"elliptic-curve/pkcs8\",\"der\"],\"serde\":[\"elliptic-curve/serde\",\"serdect\"],\"signing\":[\"arithmetic\",\"digest\",\"hazmat\",\"rfc6979\"],\"std\":[\"alloc\",\"elliptic-curve/std\",\"signature/std\"],\"verifying\":[\"arithmetic\",\"digest\",\"hazmat\"]}}",
"ed25519-dalek_2.2.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"bincode\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"blake2\",\"req\":\"^0.10\"},{\"features\":[\"html_reports\"],\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.5\"},{\"default_features\":false,\"features\":[\"digest\"],\"name\":\"curve25519-dalek\",\"req\":\"^4\"},{\"default_features\":false,\"features\":[\"digest\",\"rand_core\"],\"kind\":\"dev\",\"name\":\"curve25519-dalek\",\"req\":\"^4\"},{\"default_features\":false,\"name\":\"ed25519\",\"req\":\">=2.2, <2.3\"},{\"kind\":\"dev\",\"name\":\"hex\",\"req\":\"^0.4\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.4\"},{\"default_features\":false,\"name\":\"merlin\",\"optional\":true,\"req\":\"^3\"},{\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8\"},{\"default_features\":false,\"name\":\"rand_core\",\"optional\":true,\"req\":\"^0.6.4\"},{\"default_features\":false,\"kind\":\"dev\",\"name\":\"rand_core\",\"req\":\"^0.6.4\"},{\"default_features\":false,\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0\"},{\"default_features\":false,\"name\":\"sha2\",\"req\":\"^0.10\"},{\"kind\":\"dev\",\"name\":\"sha3\",\"req\":\"^0.10\"},{\"default_features\":false,\"name\":\"signature\",\"optional\":true,\"req\":\">=2.0, <2.3\"},{\"default_features\":false,\"name\":\"subtle\",\"req\":\"^2.3.0\"},{\"kind\":\"dev\",\"name\":\"toml\",\"req\":\"^0.7\"},{\"default_features\":false,\"features\":[\"static_secrets\"],\"kind\":\"dev\",\"name\":\"x25519-dalek\",\"req\":\"^2\"},{\"default_features\":false,\"name\":\"zeroize\",\"optional\":true,\"req\":\"^1.5\"}],\"features\":{\"alloc\":[\"curve25519-dalek/alloc\",\"ed25519/alloc\",\"serde?/alloc\",\"zeroize/alloc\"],\"asm\":[\"sha2/asm\"],\"batch\":[\"alloc\",\"merlin\",\"rand_core\"],\"default\":[\"fast\",\"std\",\"zeroize\"],\"digest\":[\"signature/digest\"],\"fast\":[\"curve25519-dalek/precomputed-tables\"],\"hazmat\":[],\"legacy_compatibility\":[\"curve25519-dalek/legacy_compatibility\"],\"pem\":[\"alloc\",\"ed25519/pem\",\"pkcs8\"],\"pkcs8\":[\"ed25519/pkcs8\"],\"rand_core\":[\"dep:rand_core\"],\"serde\":[\"dep:serde\",\"ed25519/serde\"],\"std\":[\"alloc\",\"ed25519/std\",\"serde?/std\",\"sha2/std\"],\"zeroize\":[\"dep:zeroize\",\"curve25519-dalek/zeroize\"]}}",
@@ -1394,6 +1394,7 @@
"git+https://github.com/openai-oss-forks/tokio-tungstenite?rev=0e5b2d73aa18dd9f0a50ee9ff199d5aef7594186#0e5b2d73aa18dd9f0a50ee9ff199d5aef7594186_tokio-tungstenite": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"sink\",\"std\"],\"name\":\"futures-util\",\"optional\":false,\"req\":\"0.3.28\"},{\"name\":\"log\",\"req\":\"0.4.17\"},{\"default_features\":true,\"features\":[],\"name\":\"native-tls-crate\",\"optional\":true,\"package\":\"native-tls\",\"req\":\"0.2.11\"},{\"default_features\":false,\"features\":[],\"name\":\"rustls\",\"optional\":true,\"req\":\"0.23.0\"},{\"default_features\":true,\"features\":[],\"name\":\"rustls-native-certs\",\"optional\":true,\"req\":\"0.8.0\"},{\"default_features\":true,\"features\":[],\"name\":\"rustls-pki-types\",\"optional\":true,\"req\":\"1.0\"},{\"default_features\":false,\"features\":[\"io-util\"],\"name\":\"tokio\",\"optional\":false,\"req\":\"1.0.0\"},{\"default_features\":true,\"features\":[],\"name\":\"tokio-native-tls\",\"optional\":true,\"req\":\"0.3.1\"},{\"default_features\":false,\"features\":[],\"name\":\"tokio-rustls\",\"optional\":true,\"req\":\"0.26.0\"},{\"default_features\":false,\"features\":[],\"name\":\"tungstenite\",\"optional\":false},{\"default_features\":true,\"features\":[],\"name\":\"webpki-roots\",\"optional\":true,\"req\":\"0.26.0\"}],\"features\":{\"__rustls-tls\":[\"rustls\",\"rustls-pki-types\",\"tokio-rustls\",\"stream\",\"tungstenite/__rustls-tls\",\"handshake\"],\"connect\":[\"stream\",\"tokio/net\",\"tokio/time\",\"handshake\"],\"default\":[\"connect\",\"handshake\"],\"handshake\":[\"tungstenite/handshake\"],\"native-tls\":[\"native-tls-crate\",\"tokio-native-tls\",\"stream\",\"tungstenite/native-tls\",\"handshake\"],\"native-tls-vendored\":[\"native-tls\",\"native-tls-crate/vendored\",\"tungstenite/native-tls-vendored\"],\"proxy\":[\"tungstenite/proxy\",\"tokio/net\",\"handshake\"],\"rustls-tls-native-roots\":[\"__rustls-tls\",\"rustls-native-certs\"],\"rustls-tls-webpki-roots\":[\"__rustls-tls\",\"webpki-roots\"],\"stream\":[],\"url\":[\"tungstenite/url\"]},\"strip_prefix\":\"\"}",
"git+https://github.com/openai-oss-forks/tungstenite-rs?rev=4fffad30fe373adbdcffab9545e9e9bf4f2fc19f#4fffad30fe373adbdcffab9545e9e9bf4f2fc19f_tungstenite": "{\"dependencies\":[{\"name\":\"bytes\",\"req\":\"1.9.0\"},{\"default_features\":true,\"features\":[],\"name\":\"data-encoding\",\"optional\":true,\"req\":\"2\"},{\"default_features\":false,\"features\":[\"zlib-rs\"],\"name\":\"flate2\",\"optional\":true,\"req\":\"1.1.0\"},{\"default_features\":true,\"features\":[],\"name\":\"headers\",\"optional\":true,\"req\":\"0.4.0\"},{\"default_features\":true,\"features\":[],\"name\":\"http\",\"optional\":true,\"req\":\"1.0\"},{\"default_features\":true,\"features\":[],\"name\":\"httparse\",\"optional\":true,\"req\":\"1.3.4\"},{\"name\":\"log\",\"req\":\"0.4.8\"},{\"default_features\":true,\"features\":[],\"name\":\"native-tls-crate\",\"optional\":true,\"package\":\"native-tls\",\"req\":\"0.2.3\"},{\"name\":\"rand\",\"req\":\"0.9.0\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"rustls\",\"optional\":true,\"req\":\"0.23.0\"},{\"default_features\":true,\"features\":[],\"name\":\"rustls-native-certs\",\"optional\":true,\"req\":\"0.8.0\"},{\"default_features\":true,\"features\":[],\"name\":\"rustls-pki-types\",\"optional\":true,\"req\":\"1.0\"},{\"default_features\":true,\"features\":[],\"name\":\"sha1\",\"optional\":true,\"req\":\"0.10\"},{\"name\":\"thiserror\",\"req\":\"2.0.7\"},{\"default_features\":true,\"features\":[],\"name\":\"url\",\"optional\":true,\"req\":\"2.1.0\"},{\"name\":\"utf-8\",\"req\":\"0.7.5\"},{\"default_features\":true,\"features\":[],\"name\":\"webpki-roots\",\"optional\":true,\"req\":\"0.26\"}],\"features\":{\"__rustls-tls\":[\"rustls\",\"rustls-pki-types\"],\"default\":[\"handshake\"],\"deflate\":[\"headers\",\"flate2\"],\"handshake\":[\"data-encoding\",\"headers\",\"httparse\",\"sha1\"],\"headers\":[\"http\",\"dep:headers\"],\"native-tls\":[\"native-tls-crate\"],\"native-tls-vendored\":[\"native-tls\",\"native-tls-crate/vendored\"],\"proxy\":[\"handshake\"],\"rustls-tls-native-roots\":[\"__rustls-tls\",\"rustls-native-certs\"],\"rustls-tls-webpki-roots\":[\"__rustls-tls\",\"webpki-roots\"],\"url\":[\"dep:url\"]},\"strip_prefix\":\"\"}",
"git+https://github.com/rust-lang/rust-clippy?rev=21baba9c10c5d179915cae82e6247bc2337872fb#21baba9c10c5d179915cae82e6247bc2337872fb_clippy_utils": "{\"dependencies\":[{\"default_features\":false,\"features\":[],\"name\":\"arrayvec\",\"optional\":false,\"req\":\"0.7\"},{\"name\":\"itertools\",\"req\":\"0.15\"},{\"name\":\"rustc_apfloat\",\"req\":\"0.2.0\"}],\"features\":{},\"strip_prefix\":\"clippy_utils\"}",
+ "git+https://github.com/seanh-oai/rusty_v8.git?rev=350c5a859a9b3c84ab8701b3ad51e3b7699b30c0#350c5a859a9b3c84ab8701b3ad51e3b7699b30c0_v8": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"2.5\"},{\"name\":\"paste\",\"req\":\"1.0\"},{\"default_features\":true,\"features\":[\"zoneinfo64\"],\"name\":\"temporal_capi\",\"optional\":false,\"req\":\"0.2.3\"},{\"kind\":\"build\",\"name\":\"bindgen\",\"req\":\"0.72\"},{\"kind\":\"build\",\"name\":\"fslock\",\"req\":\"0.2\"},{\"kind\":\"build\",\"name\":\"gzip-header\",\"req\":\"1.0.0\"},{\"kind\":\"build\",\"name\":\"home\",\"req\":\"0\"},{\"kind\":\"build\",\"name\":\"miniz_oxide\",\"req\":\"0.8.8\"},{\"kind\":\"build\",\"name\":\"which\",\"req\":\"6\"}],\"features\":{\"default\":[\"use_custom_libcxx\"],\"simdutf\":[],\"use_custom_libcxx\":[],\"v8_enable_pointer_compression\":[],\"v8_enable_sandbox\":[\"v8_enable_pointer_compression\"],\"v8_enable_v8_checks\":[]},\"strip_prefix\":\"\"}",
"git2_0.21.0": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2.1.0\"},{\"features\":[\"derive\"],\"kind\":\"dev\",\"name\":\"clap\",\"req\":\"^4.4.13\"},{\"name\":\"libc\",\"req\":\"^0.2\"},{\"name\":\"libgit2-sys\",\"req\":\"^0.18.4\"},{\"name\":\"log\",\"req\":\"^0.4.8\"},{\"name\":\"openssl-probe\",\"optional\":true,\"req\":\"^0.1\",\"target\":\"cfg(all(unix, not(target_os = \\\"macos\\\")))\"},{\"name\":\"openssl-sys\",\"optional\":true,\"req\":\"^0.9.45\",\"target\":\"cfg(all(unix, not(target_os = \\\"macos\\\")))\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3.1.0\"},{\"features\":[\"formatting\"],\"kind\":\"dev\",\"name\":\"time\",\"req\":\"^0.3.47\"},{\"name\":\"url\",\"optional\":true,\"req\":\"^2.5.4\"},{\"kind\":\"dev\",\"name\":\"url\",\"req\":\"^2.5.4\"}],\"features\":{\"cred\":[\"dep:url\"],\"default\":[],\"https\":[\"libgit2-sys/https\",\"openssl-sys\",\"openssl-probe\",\"cred\"],\"ssh\":[\"libgit2-sys/ssh\",\"cred\"],\"unstable\":[],\"unstable-sha256\":[\"libgit2-sys/unstable-sha256\"],\"vendored-libgit2\":[\"libgit2-sys/vendored\"],\"vendored-openssl\":[\"openssl-sys/vendored\",\"libgit2-sys/vendored-openssl\"],\"zlib-ng-compat\":[\"libgit2-sys/zlib-ng-compat\"]}}",
"gix-actor_0.44.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.0\"},{\"name\":\"gix-date\",\"req\":\"^0.18.0\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"kind\":\"dev\",\"name\":\"pretty_assertions\",\"req\":\"^1.0.0\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-date/serde\"]}}",
"gix-attributes_0.37.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"std\",\"unicode\"],\"name\":\"bstr\",\"req\":\"^1.12.0\"},{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.8.2\"},{\"name\":\"document-features\",\"optional\":true,\"req\":\"^0.2.1\"},{\"features\":[\"bstr\"],\"name\":\"gix-error\",\"req\":\"^0.5.0\"},{\"name\":\"gix-glob\",\"req\":\"^0.29.0\"},{\"name\":\"gix-parallel\",\"req\":\"^0.50.0\"},{\"name\":\"gix-path\",\"req\":\"^0.14.0\"},{\"name\":\"gix-quote\",\"req\":\"^0.10.0\"},{\"name\":\"gix-trace\",\"req\":\"^0.3.0\"},{\"kind\":\"dev\",\"name\":\"insta\",\"req\":\"^1.46.3\"},{\"default_features\":false,\"features\":[\"derive\"],\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0.114\"},{\"name\":\"smallvec\",\"req\":\"^1.15.1\"},{\"name\":\"unicode-bom\",\"req\":\"^2.0.3\"}],\"features\":{\"serde\":[\"dep:serde\",\"bstr/serde\",\"gix-glob/serde\"]}}",
@@ -1598,7 +1599,7 @@
"libredox_0.1.14": "{\"dependencies\":[{\"name\":\"bitflags\",\"optional\":true,\"req\":\"^2\"},{\"name\":\"ioslice\",\"optional\":true,\"req\":\"^0.6\"},{\"name\":\"libc\",\"optional\":true,\"req\":\"^0.2\"},{\"name\":\"plain\",\"optional\":true,\"req\":\"^0.2\"},{\"name\":\"redox_syscall\",\"optional\":true,\"req\":\"^0.7\"}],\"features\":{\"base\":[\"libc\"],\"call\":[\"base\"],\"default\":[\"base\",\"call\",\"std\",\"redox_syscall\",\"protocol\"],\"mkns\":[\"ioslice\"],\"protocol\":[\"plain\",\"bitflags\",\"redox_syscall\"],\"std\":[\"base\"]}}",
"libsqlite3-sys_0.37.0": "{\"dependencies\":[{\"default_features\":false,\"features\":[\"runtime\"],\"kind\":\"build\",\"name\":\"bindgen\",\"optional\":true,\"req\":\"^0.72\"},{\"kind\":\"build\",\"name\":\"cc\",\"optional\":true,\"req\":\"^1.2.27\"},{\"name\":\"openssl-sys\",\"optional\":true,\"req\":\"^0.9.103\"},{\"kind\":\"build\",\"name\":\"pkg-config\",\"optional\":true,\"req\":\"^0.3.19\"},{\"kind\":\"build\",\"name\":\"prettyplease\",\"optional\":true,\"req\":\"^0.2.20\"},{\"default_features\":false,\"kind\":\"build\",\"name\":\"quote\",\"optional\":true,\"req\":\"^1.0.36\"},{\"features\":[\"full\",\"extra-traits\",\"visit-mut\"],\"kind\":\"build\",\"name\":\"syn\",\"optional\":true,\"req\":\"^2.0.89\"},{\"kind\":\"build\",\"name\":\"vcpkg\",\"optional\":true,\"req\":\"^0.2.15\"}],\"features\":{\"buildtime_bindgen\":[\"bindgen\",\"pkg-config\",\"vcpkg\"],\"bundled\":[\"cc\",\"bundled_bindings\"],\"bundled-sqlcipher\":[\"bundled\"],\"bundled-sqlcipher-vendored-openssl\":[\"bundled-sqlcipher\",\"openssl-sys/vendored\"],\"bundled-windows\":[\"cc\",\"bundled_bindings\"],\"bundled_bindings\":[],\"column_metadata\":[],\"default\":[\"min_sqlite_version_3_34_1\"],\"in_gecko\":[],\"loadable_extension\":[\"prettyplease\",\"quote\",\"syn\"],\"min_sqlite_version_3_34_1\":[\"pkg-config\",\"vcpkg\"],\"preupdate_hook\":[\"buildtime_bindgen\"],\"session\":[\"preupdate_hook\",\"buildtime_bindgen\"],\"sqlcipher\":[],\"unlock_notify\":[],\"wasm32-wasi-vfs\":[],\"with-asan\":[]}}",
"libz-sys_1.1.25": "{\"dependencies\":[{\"kind\":\"build\",\"name\":\"cc\",\"req\":\"^1.0.98\"},{\"kind\":\"build\",\"name\":\"cmake\",\"optional\":true,\"req\":\"^0.1.50\"},{\"name\":\"libc\",\"optional\":true,\"req\":\"^0.2.43\"},{\"kind\":\"build\",\"name\":\"pkg-config\",\"req\":\"^0.3.9\"},{\"kind\":\"build\",\"name\":\"vcpkg\",\"req\":\"^0.2.11\"}],\"features\":{\"asm\":[],\"default\":[\"libc\",\"stock-zlib\"],\"static\":[],\"stock-zlib\":[],\"zlib-ng\":[\"libc\",\"cmake\"],\"zlib-ng-no-cmake-experimental-community-maintained\":[\"libc\"]}}",
- "libz-sys_1.1.29": "{\"dependencies\":[{\"kind\":\"build\",\"name\":\"cc\",\"req\":\"^1.0.98\"},{\"kind\":\"build\",\"name\":\"cmake\",\"optional\":true,\"req\":\"^0.1.50\"},{\"name\":\"libc\",\"optional\":true,\"req\":\"^0.2.43\"},{\"kind\":\"build\",\"name\":\"pkg-config\",\"req\":\"^0.3.9\"},{\"kind\":\"build\",\"name\":\"vcpkg\",\"req\":\"^0.2.11\"}],\"features\":{\"asm\":[],\"default\":[\"libc\",\"stock-zlib\"],\"static\":[],\"stock-zlib\":[],\"zlib-ng\":[\"libc\",\"cmake\"],\"zlib-ng-no-cmake-experimental-community-maintained\":[\"libc\"]}}",
+ "libz-sys_1.1.31": "{\"dependencies\":[{\"kind\":\"build\",\"name\":\"cc\",\"req\":\"^1.0.98\"},{\"kind\":\"build\",\"name\":\"cmake\",\"optional\":true,\"req\":\"^0.1.50\"},{\"name\":\"libc\",\"optional\":true,\"req\":\"^0.2.43\"},{\"kind\":\"build\",\"name\":\"pkg-config\",\"req\":\"^0.3.9\"},{\"kind\":\"build\",\"name\":\"vcpkg\",\"req\":\"^0.2.11\"}],\"features\":{\"asm\":[],\"default\":[\"libc\",\"stock-zlib\"],\"static\":[],\"stock-zlib\":[],\"zlib-ng\":[\"libc\",\"cmake\"],\"zlib-ng-no-cmake-experimental-community-maintained\":[\"libc\"]}}",
"line-clipping_0.3.7": "{\"dependencies\":[{\"name\":\"bitflags\",\"req\":\"^2.11\"},{\"kind\":\"dev\",\"name\":\"rstest\",\"req\":\"^0.26\"}],\"features\":{}}",
"link-section_0.17.2": "{\"dependencies\":[{\"features\":[\"link_section\"],\"name\":\"linktime-proc-macro\",\"optional\":true,\"req\":\"^0.1.0\"},{\"kind\":\"dev\",\"name\":\"macrotest\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3\"},{\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"walkdir\",\"req\":\"^2\"}],\"features\":{\"default\":[\"proc_macro\",\"std\"],\"proc_macro\":[\"dep:linktime-proc-macro\"],\"std\":[]}}",
"linkify_0.11.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.3\"},{\"kind\":\"dev\",\"name\":\"doc-comment\",\"req\":\"^0.3.3\"},{\"name\":\"memchr\",\"req\":\"^2.0.1\"}],\"features\":{}}",
@@ -1746,6 +1747,7 @@
"parking_lot_core_0.9.12": "{\"dependencies\":[{\"name\":\"backtrace\",\"optional\":true,\"req\":\"^0.3.60\"},{\"name\":\"cfg-if\",\"req\":\"^1.0.0\"},{\"name\":\"libc\",\"req\":\"^0.2.95\",\"target\":\"cfg(unix)\"},{\"name\":\"petgraph\",\"optional\":true,\"req\":\"^0.6.0\"},{\"name\":\"redox_syscall\",\"req\":\"^0.5\",\"target\":\"cfg(target_os = \\\"redox\\\")\"},{\"name\":\"smallvec\",\"req\":\"^1.6.1\"},{\"name\":\"windows-link\",\"req\":\"^0.2.0\",\"target\":\"cfg(windows)\"}],\"features\":{\"deadlock_detection\":[\"petgraph\",\"backtrace\"],\"nightly\":[]}}",
"paste_1.0.15": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"paste-test-suite\",\"req\":\"^0\"},{\"kind\":\"dev\",\"name\":\"rustversion\",\"req\":\"^1.0\"},{\"features\":[\"diff\"],\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1.0.49\"}],\"features\":{}}",
"pastey_0.2.1": "{\"dependencies\":[],\"features\":{}}",
+ "pastey_0.2.3": "{\"dependencies\":[],\"features\":{}}",
"pathdiff_0.2.3": "{\"dependencies\":[{\"name\":\"camino\",\"optional\":true,\"req\":\"^1.0.5\"},{\"kind\":\"dev\",\"name\":\"cfg-if\",\"req\":\"^1.0.0\"}],\"features\":{}}",
"pbkdf2_0.12.2": "{\"dependencies\":[{\"features\":[\"mac\"],\"name\":\"digest\",\"req\":\"^0.10.7\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^0.4.0\"},{\"default_features\":false,\"name\":\"hmac\",\"optional\":true,\"req\":\"^0.12\"},{\"kind\":\"dev\",\"name\":\"hmac\",\"req\":\"^0.12\"},{\"default_features\":false,\"features\":[\"rand_core\"],\"name\":\"password-hash\",\"optional\":true,\"req\":\"^0.5\"},{\"name\":\"rayon\",\"optional\":true,\"req\":\"^1.7\"},{\"default_features\":false,\"name\":\"sha1\",\"optional\":true,\"req\":\"^0.10\"},{\"kind\":\"dev\",\"name\":\"sha1\",\"req\":\"^0.10\"},{\"default_features\":false,\"name\":\"sha2\",\"optional\":true,\"req\":\"^0.10\"},{\"kind\":\"dev\",\"name\":\"sha2\",\"req\":\"^0.10\"},{\"kind\":\"dev\",\"name\":\"streebog\",\"req\":\"^0.10\"}],\"features\":{\"default\":[\"hmac\"],\"parallel\":[\"rayon\",\"std\"],\"simple\":[\"hmac\",\"password-hash\",\"sha2\"],\"std\":[\"password-hash/std\"]}}",
"pbkdf2_0.13.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"belt-hash\",\"req\":\"^0.2\"},{\"features\":[\"mac\"],\"name\":\"digest\",\"req\":\"^0.11\"},{\"kind\":\"dev\",\"name\":\"hex-literal\",\"req\":\"^1\"},{\"default_features\":false,\"name\":\"hmac\",\"optional\":true,\"req\":\"^0.13\"},{\"kind\":\"dev\",\"name\":\"hmac\",\"req\":\"^0.13\"},{\"name\":\"kdf\",\"optional\":true,\"req\":\"^0.1\"},{\"default_features\":false,\"features\":[\"base64\"],\"name\":\"mcf\",\"optional\":true,\"req\":\"^0.6\"},{\"default_features\":false,\"name\":\"password-hash\",\"optional\":true,\"req\":\"^0.6\"},{\"kind\":\"dev\",\"name\":\"sha1\",\"req\":\"^0.11\"},{\"default_features\":false,\"name\":\"sha2\",\"optional\":true,\"req\":\"^0.11\"},{\"kind\":\"dev\",\"name\":\"sha2\",\"req\":\"^0.11\"},{\"kind\":\"dev\",\"name\":\"streebog\",\"req\":\"^0.11\"}],\"features\":{\"alloc\":[\"mcf?/alloc\",\"password-hash?/alloc\"],\"default\":[\"hmac\"],\"getrandom\":[\"password-hash/getrandom\"],\"kdf\":[\"sha2\",\"dep:kdf\"],\"mcf\":[\"sha2\",\"password-hash\",\"dep:mcf\"],\"phc\":[\"password-hash/phc\",\"sha2\"],\"rand_core\":[\"password-hash/rand_core\"],\"sha2\":[\"hmac\",\"dep:sha2\"]}}",
@@ -2230,7 +2232,6 @@
"utf8_iter_1.0.4": "{\"dependencies\":[],\"features\":{}}",
"utf8parse_0.2.2": "{\"dependencies\":[],\"features\":{\"default\":[],\"nightly\":[]}}",
"uuid_1.20.0": "{\"dependencies\":[{\"name\":\"arbitrary\",\"optional\":true,\"req\":\"^1.1.3\"},{\"default_features\":false,\"name\":\"atomic\",\"optional\":true,\"req\":\"^0.6\"},{\"default_features\":false,\"name\":\"borsh\",\"optional\":true,\"req\":\"^1\"},{\"default_features\":false,\"name\":\"borsh-derive\",\"optional\":true,\"req\":\"^1\"},{\"features\":[\"derive\"],\"name\":\"bytemuck\",\"optional\":true,\"req\":\"^1.20.0\"},{\"name\":\"getrandom\",\"optional\":true,\"req\":\"^0.3\",\"target\":\"cfg(not(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\"))))\"},{\"default_features\":false,\"name\":\"js-sys\",\"optional\":true,\"req\":\"^0.3\",\"target\":\"cfg(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\"), target_feature = \\\"atomics\\\"))\"},{\"default_features\":false,\"name\":\"md-5\",\"optional\":true,\"req\":\"^0.10\"},{\"name\":\"rand\",\"optional\":true,\"req\":\"^0.9\",\"target\":\"cfg(not(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\"))))\"},{\"kind\":\"dev\",\"name\":\"rustversion\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"serde\",\"req\":\"^1.0.221\"},{\"default_features\":false,\"name\":\"serde_core\",\"optional\":true,\"req\":\"^1.0.221\"},{\"kind\":\"dev\",\"name\":\"serde_derive\",\"req\":\"^1.0.221\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_test\",\"req\":\"^1.0.56\"},{\"default_features\":false,\"name\":\"sha1_smol\",\"optional\":true,\"req\":\"^1\"},{\"name\":\"slog\",\"optional\":true,\"req\":\"^2\"},{\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1.0.52\"},{\"name\":\"uuid-rng-internal-lib\",\"optional\":true,\"package\":\"uuid-rng-internal\",\"req\":\"^1.20.0\",\"target\":\"cfg(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\")))\"},{\"default_features\":false,\"features\":[\"msrv\"],\"name\":\"wasm-bindgen\",\"optional\":true,\"req\":\"^0.2\",\"target\":\"cfg(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\")))\"},{\"kind\":\"dev\",\"name\":\"wasm-bindgen\",\"req\":\"^0.2\",\"target\":\"cfg(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\")))\"},{\"kind\":\"dev\",\"name\":\"wasm-bindgen-test\",\"req\":\"^0.3\",\"target\":\"cfg(all(target_arch = \\\"wasm32\\\", any(target_os = \\\"unknown\\\", target_os = \\\"none\\\")))\"},{\"features\":[\"derive\"],\"name\":\"zerocopy\",\"optional\":true,\"req\":\"^0.8\"}],\"features\":{\"atomic\":[\"dep:atomic\"],\"borsh\":[\"dep:borsh\",\"dep:borsh-derive\"],\"default\":[\"std\"],\"fast-rng\":[\"rng\",\"dep:rand\"],\"js\":[\"dep:wasm-bindgen\",\"dep:js-sys\"],\"macro-diagnostics\":[],\"md5\":[\"dep:md-5\"],\"rng\":[\"dep:getrandom\"],\"rng-getrandom\":[\"rng\",\"dep:getrandom\",\"uuid-rng-internal-lib\",\"uuid-rng-internal-lib/getrandom\"],\"rng-rand\":[\"rng\",\"dep:rand\",\"uuid-rng-internal-lib\",\"uuid-rng-internal-lib/rand\"],\"serde\":[\"dep:serde_core\"],\"sha1\":[\"dep:sha1_smol\"],\"std\":[\"wasm-bindgen?/std\",\"js-sys?/std\"],\"v1\":[\"atomic\"],\"v3\":[\"md5\"],\"v4\":[\"rng\"],\"v5\":[\"sha1\"],\"v6\":[\"atomic\"],\"v7\":[\"rng\"],\"v8\":[]}}",
- "v8_152.2.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"align-data\",\"req\":\"^0.1.0\"},{\"kind\":\"build\",\"name\":\"bindgen\",\"req\":\"^0.72\"},{\"kind\":\"dev\",\"name\":\"bindgen\",\"req\":\"^0.72\"},{\"name\":\"bitflags\",\"req\":\"^2.5\"},{\"kind\":\"dev\",\"name\":\"bytes\",\"req\":\"^1\"},{\"kind\":\"build\",\"name\":\"fslock\",\"req\":\"^0.2\"},{\"kind\":\"dev\",\"name\":\"fslock\",\"req\":\"^0.2\"},{\"kind\":\"build\",\"name\":\"gzip-header\",\"req\":\"^1.0.0\"},{\"kind\":\"dev\",\"name\":\"gzip-header\",\"req\":\"^1.0.0\"},{\"kind\":\"build\",\"name\":\"home\",\"req\":\"^0\"},{\"kind\":\"dev\",\"name\":\"home\",\"req\":\"^0\"},{\"kind\":\"build\",\"name\":\"miniz_oxide\",\"req\":\"^0.8.8\"},{\"kind\":\"dev\",\"name\":\"miniz_oxide\",\"req\":\"^0.8.8\"},{\"name\":\"paste\",\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"rustversion\",\"req\":\"^1\"},{\"features\":[\"zoneinfo64\"],\"name\":\"temporal_capi\",\"req\":\"^0.2.3\"},{\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1.0.96\"},{\"kind\":\"build\",\"name\":\"which\",\"req\":\"^6\"},{\"kind\":\"dev\",\"name\":\"which\",\"req\":\"^6\"}],\"features\":{\"default\":[\"use_custom_libcxx\"],\"simdutf\":[],\"use_custom_libcxx\":[],\"v8_enable_pointer_compression\":[],\"v8_enable_sandbox\":[\"v8_enable_pointer_compression\"],\"v8_enable_v8_checks\":[]}}",
"valuable_0.1.1": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"criterion\",\"req\":\"^0.3\"},{\"name\":\"valuable-derive\",\"optional\":true,\"req\":\"=0.1.1\"}],\"features\":{\"alloc\":[],\"default\":[\"std\"],\"derive\":[\"valuable-derive\"],\"std\":[\"alloc\"]}}",
"vcpkg_0.2.15": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"lazy_static\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"tempdir\",\"req\":\"^0.3.7\"}],\"features\":{}}",
"version-compare_0.2.1": "{\"dependencies\":[],\"features\":{}}",
@@ -2421,107 +2422,107 @@
"zvariant_utils_2.1.0": "{\"dependencies\":[{\"name\":\"proc-macro2\",\"req\":\"^1.0.81\"},{\"name\":\"quote\",\"req\":\"^1.0.36\"},{\"features\":[\"extra-traits\",\"full\"],\"name\":\"syn\",\"req\":\"^2.0.64\"}],\"features\":{}}"
},
"@@rules_rs+//rs/toolchains:module_extension.bzl%toolchains": {
- "cargo-1.99.1-aarch64-apple-darwin.tar.xz": "685e563d94db1f003ffa5f5831439eec02569b9950b69867953c8213269c1eaf",
- "cargo-1.99.1-aarch64-pc-windows-msvc.tar.xz": "28ae5b9b72ae43aa01d2f6c1b285be59f8aef6eafc96f9e16b912c3c1363a638",
- "cargo-1.99.1-aarch64-unknown-linux-gnu.tar.xz": "5156832e0c1254e9b49a79edabdc6d4c35f32f8fc1cf3ca700f268ff96087ab0",
- "cargo-1.99.1-x86_64-apple-darwin.tar.xz": "6636dabcec164909d1c6eb9e2c596148787c84f7d3a02ff68a141569077f80b5",
- "cargo-1.99.1-x86_64-pc-windows-msvc.tar.xz": "4adb46c3707dee790682f7769d86983841148111695f561c843c33daa2af0c9b",
- "cargo-1.99.1-x86_64-unknown-linux-gnu.tar.xz": "53f3521949404d595efb06a55c12c5658d4ed1c75566f33d3d514eaebe70bd8a",
- "clippy-1.99.1-aarch64-apple-darwin.tar.xz": "c463f31831196702fc544900a0dc4c1837905327507fbec751fe46e59ca098bf",
- "clippy-1.99.1-aarch64-pc-windows-msvc.tar.xz": "6324b172cdda7ca117df406564a6c1f6634f983c06afc71c7a9fd46a4e34bfa8",
- "clippy-1.99.1-aarch64-unknown-linux-gnu.tar.xz": "3bea76c26dcf30c176c0a8a8cc283eb59fabd754e24a68b4ca0701e5f3245f6b",
- "clippy-1.99.1-x86_64-apple-darwin.tar.xz": "b5810174b696eaa05dd4ffd5b24c40a33c6d4bccc05fb72264006b7bfefb8c5d",
- "clippy-1.99.1-x86_64-pc-windows-msvc.tar.xz": "eb20d3f60731450acecd7c6b108bec2eb4abd18321b383e6663a3f072fe9c0b3",
- "clippy-1.99.1-x86_64-unknown-linux-gnu.tar.xz": "458339712a058e52cc4522ff9ef8b59cd1ea1340312216cd94194c464a3f6dc5",
- "rust-analyzer-1.99.1-aarch64-apple-darwin.tar.xz": "c1ee8a54e685e13414e53fc46029d46db12613bc45c081f1a49020f1674ad6b4",
- "rust-analyzer-1.99.1-aarch64-pc-windows-msvc.tar.xz": "a4df9d29b15a2ab6f9b6fefe1198f3bdb03e2b7e91899cdc0f0fdf8b68b5c44b",
- "rust-analyzer-1.99.1-aarch64-unknown-linux-gnu.tar.xz": "b626351402eb9ea16af2ebc2b2cd02ec6f6ca6f0c18fa74b41243eb42996e2b1",
- "rust-analyzer-1.99.1-x86_64-apple-darwin.tar.xz": "fe414afba5aa69e7994e29dddd9b166496900e70acc51fd3a55c82bfac86fe97",
- "rust-analyzer-1.99.1-x86_64-pc-windows-msvc.tar.xz": "e8d29f16781a71468dbff5c602dd48d6c544696c957752be783ed5a1edd954e4",
- "rust-analyzer-1.99.1-x86_64-unknown-linux-gnu.tar.xz": "5f2613d62003fc8cbe788d4ae409359c91c241ba248adbefe032df8bb77357bf",
- "rust-src-1.99.1.tar.xz": "e485a88c45db546b73571df7bebfcb4454ba4fb552c492e25fc5b00eeb5bf22d",
- "rust-std-1.99.1-aarch64-apple-darwin.tar.xz": "fe79d6ab5a0321de26463999d8c112b8ad3eafbcbcf822d66a2300b45dde1031",
- "rust-std-1.99.1-aarch64-apple-ios-macabi.tar.xz": "0d5ec58e0b034fab7decd4e72f21cfa6428421585ca98cf6ab65d3d5369b3f8b",
- "rust-std-1.99.1-aarch64-apple-ios-sim.tar.xz": "9780e3b33bb4aad552b2288de1aa65dff4feba66f51b77a4a6b2c52bfd455a28",
- "rust-std-1.99.1-aarch64-apple-ios.tar.xz": "d62c2e84717c6fa56ef0d8e5a11821850fb717c40879075a8e465a1e15af247c",
- "rust-std-1.99.1-aarch64-linux-android.tar.xz": "7463b06bb5f734c02d3bac967538b4de4da910fb90668398bc21b10b5620e35d",
- "rust-std-1.99.1-aarch64-pc-windows-gnullvm.tar.xz": "cf14a1b1fb7f32b90369d91f97fa157fe1ca43edb64235df951006baab677a95",
- "rust-std-1.99.1-aarch64-pc-windows-msvc.tar.xz": "044748841f47007a222dd5b3f5e9dacec1dae7386d7d308c5172d07ea7112fa0",
- "rust-std-1.99.1-aarch64-unknown-fuchsia.tar.xz": "c28c7143f598af3cdaa8d62e120a2348473e7a7cb580b0958c99ec1b1d764fbc",
- "rust-std-1.99.1-aarch64-unknown-linux-gnu.tar.xz": "e25668477083d6a9ddb87b9beb9c00742225f38233ccb4bfba3afa7a07427f52",
- "rust-std-1.99.1-aarch64-unknown-linux-musl.tar.xz": "2f3eb0d0610e2b7f6b2121d106e2490ac648decfa0c09b30873bdfc60de6c1ab",
- "rust-std-1.99.1-aarch64-unknown-none-softfloat.tar.xz": "6ff3ecba5ae285c5286ad6f5024994d818cee569c59d980aa2edc9e5fa3bcd4e",
- "rust-std-1.99.1-aarch64-unknown-none.tar.xz": "fa76b51dba64b20f6ca0593ed9bfb582a91fb0060fa803c54b68f1f6a3774eb9",
- "rust-std-1.99.1-aarch64-unknown-uefi.tar.xz": "e48e00681ea2c989d39274e3ed50ffdacb3bccea0950ea1789ab5075c8f36dae",
- "rust-std-1.99.1-arm-linux-androideabi.tar.xz": "6973466090a51ab5d5fadde4449cb2e521371ede85b35f95252ba2119aceb9b6",
- "rust-std-1.99.1-arm-unknown-linux-gnueabi.tar.xz": "fb93e9715ef14ed17fd6922dd200d14cfe855b46c4fa1e8a03ee85ca75646022",
- "rust-std-1.99.1-arm-unknown-linux-gnueabihf.tar.xz": "32278298365b7b78cf5b67ec34bf5e11821679dfea8a6d867725af860c4cbe50",
- "rust-std-1.99.1-arm-unknown-linux-musleabi.tar.xz": "f66cb84ada451344f46757c72d1bfa5a34e8f174affe67b7fa9c3b2d8a033e26",
- "rust-std-1.99.1-arm-unknown-linux-musleabihf.tar.xz": "74adeec515565c17242c8fafedbda40a30a49f85e9510fc60013cbc539f83782",
- "rust-std-1.99.1-armv7-linux-androideabi.tar.xz": "8c5c8d2bb1faf551ab21de3c9f9f930bfc7e610222e08bfae43b9438413fe300",
- "rust-std-1.99.1-armv7-unknown-linux-gnueabi.tar.xz": "d9f8155889cd3f4fc36ac35dd1ec357c46ae9cade0b106aca03e272b005e0823",
- "rust-std-1.99.1-armv7-unknown-linux-gnueabihf.tar.xz": "53fdf6581a24f510def5173813a0d23518a8cde547b9fbf4876499f19feda18c",
- "rust-std-1.99.1-armv7-unknown-linux-musleabi.tar.xz": "eaf5ee2b0948e18e586af42aa9aeb0e8e5aba515bc2d862bf0d23dc59569a8a9",
- "rust-std-1.99.1-armv7-unknown-linux-musleabihf.tar.xz": "edccfaef9195cb74b5c33541e587629f92433f59fb5e4bbb7b8293f966ecd60a",
- "rust-std-1.99.1-i686-linux-android.tar.xz": "76494f24073c8c3f0f98649580bf4ae8d3e91831c763017c2d120ade90a5a108",
- "rust-std-1.99.1-i686-pc-windows-gnu.tar.xz": "bf9668700154fcce55eca02d785da580eea561c1b6f70e723fd2f8a4296fd93f",
- "rust-std-1.99.1-i686-pc-windows-gnullvm.tar.xz": "28ffcbd7ff0f7cf1d4104fce7ef72d186a3e1c583319e8e32b69957d17ce498a",
- "rust-std-1.99.1-i686-pc-windows-msvc.tar.xz": "3a086606ba2581d43e905f65466d122c257ef0329ae3fbc3ceb067286d0668b0",
- "rust-std-1.99.1-i686-unknown-freebsd.tar.xz": "90342aa51874648ca441913f8df923a915dcbc229694b8bf4620b3d53389350f",
- "rust-std-1.99.1-i686-unknown-linux-gnu.tar.xz": "8abb74feac06cfb0d3de4e27301adb05f740661c7d6fb154528906202157ae15",
- "rust-std-1.99.1-i686-unknown-linux-musl.tar.xz": "25df5dae9ead02745f709ed133f09700abdec5eb7a8027e08bb41aefb1a451a1",
- "rust-std-1.99.1-i686-unknown-uefi.tar.xz": "c1297ae654a1a695056aa3c5113c67a9e68616bf225ba3da78873cc3cc538792",
- "rust-std-1.99.1-loongarch64-unknown-linux-gnu.tar.xz": "6400e6880a1f8183bba1a8b939cb1c6d189ab64e4aff4f246c00161941ee76e8",
- "rust-std-1.99.1-loongarch64-unknown-linux-musl.tar.xz": "3053ebe881b3434879a934012c4a61b1fa94a0aec922115a574cc81e8e3ca15e",
- "rust-std-1.99.1-loongarch64-unknown-none.tar.xz": "01dd53deb6fe0d62b0dffa0e172935c1cf6ab1f59bf6287306df0937db47db9b",
- "rust-std-1.99.1-powerpc-unknown-linux-gnu.tar.xz": "25d05cf16db111ecfe7dd8e1a3d61d144f2348e87dafeb07ff3cf402e3196cfd",
- "rust-std-1.99.1-powerpc64-unknown-linux-gnu.tar.xz": "58f8526a50eb47eb106130a29e77c97e3c5fd60af41e8a16a63d39673f9aa33d",
- "rust-std-1.99.1-powerpc64le-unknown-linux-gnu.tar.xz": "4bfb8ca55cc13f11addc5782a946b360b78888a18c8e315635b822f961f553c6",
- "rust-std-1.99.1-powerpc64le-unknown-linux-musl.tar.xz": "6db9c7e403354b0f52321d286a032565a84aa925624daed33a87c02f956e302f",
- "rust-std-1.99.1-riscv32imc-unknown-none-elf.tar.xz": "1c92e40aca279ee001a3a36d816140d49997f4b3791d81ae67175cfcbdb1d817",
- "rust-std-1.99.1-riscv64gc-unknown-linux-gnu.tar.xz": "0fe2aa8294281e16886a101466160ec460ed99e51c8af11e1c76f88f8bd0de6b",
- "rust-std-1.99.1-riscv64gc-unknown-linux-musl.tar.xz": "59797f5c7c87ef38c1d202576cb6fb9c6423730d8efcaf2fab7c367d2d878a39",
- "rust-std-1.99.1-riscv64gc-unknown-none-elf.tar.xz": "bf5b831d8df3ad039770dffaf59ad3492ff0b239a5c4bb225a1961831c117b3e",
- "rust-std-1.99.1-s390x-unknown-linux-gnu.tar.xz": "a5e394a3d85c6888f016abc9ac02dceadc6eb8a7216b8a5ba863d6cf649766ae",
- "rust-std-1.99.1-sparc64-unknown-linux-gnu.tar.xz": "c73df3e84bba70fa87151ead94aac7848fee8334f16526bc2f97d20372b327ae",
- "rust-std-1.99.1-thumbv6m-none-eabi.tar.xz": "2097eeae25f0d9a76a9fab9d78e5b8eed6f5c262946c9c0418f23aa6273e9b2f",
- "rust-std-1.99.1-thumbv7em-none-eabi.tar.xz": "dbe6561e6a655e9866a8502961fe7089bffd438195945d03a190ee59a9568a02",
- "rust-std-1.99.1-thumbv7em-none-eabihf.tar.xz": "dff135161000157504513c459a9646e52125d8b825395559c35ce78d54d226c8",
- "rust-std-1.99.1-thumbv7m-none-eabi.tar.xz": "04c171e0c59fee9ea8b4b27f0195eadbf2f47495e06e14ff09d19eb6c6946d38",
- "rust-std-1.99.1-thumbv8m.main-none-eabi.tar.xz": "59251d3c7d1804242c4a1ade2a08b0e133ee83537deff860408b08d1a239f938",
- "rust-std-1.99.1-thumbv8m.main-none-eabihf.tar.xz": "a24ca64600d6ff0d7f765ff4d60cb697b1535b6f4fdb3fe3054918b75c702e0f",
- "rust-std-1.99.1-wasm32-unknown-emscripten.tar.xz": "1797fc9e45d1a8fe819573e9d002fd9f3d4e680d3cfc4bb49af43cebd3096e90",
- "rust-std-1.99.1-wasm32-unknown-unknown.tar.xz": "5f628f857dd00a8aa3fcac2e275665d2782066a5795274ed124c5b560f46423c",
- "rust-std-1.99.1-wasm32-wasip1-threads.tar.xz": "5d44556bbae559fd029f207c8c2140b63ed70f0aa29f08be1bf42bed1bf7f716",
- "rust-std-1.99.1-wasm32-wasip1.tar.xz": "d498fbff3fd032f2f5fabc299e5cbf7bc9d64abac6e389fc1a315b69821b48c4",
- "rust-std-1.99.1-wasm32-wasip2.tar.xz": "15d54cff9ce112ab273cf7e214600108754d51100ce7d6bd62a354f16c93b4f3",
- "rust-std-1.99.1-x86_64-apple-darwin.tar.xz": "484d5b88b424ddd29df196e1eb9420c8335bb5fac90a3c37140253345a8c65c4",
- "rust-std-1.99.1-x86_64-apple-ios-macabi.tar.xz": "a85f3aacdc89a737b384f9676c4cfbc9e1f802c8ae4e10ba298bd07e06f2501e",
- "rust-std-1.99.1-x86_64-apple-ios.tar.xz": "cfadc69ce94f86a7517510389893cc10a4df88e619536bd7bb5f4db57d76bd94",
- "rust-std-1.99.1-x86_64-linux-android.tar.xz": "48132cd1f40a8112345ead45e8483495ab48285f152100f3ae1b1190bed4d8d4",
- "rust-std-1.99.1-x86_64-pc-windows-gnu.tar.xz": "b17e3bc962ff24b3bc47a750d838defed85b280746250e3a3ad029e6c1a29dd7",
- "rust-std-1.99.1-x86_64-pc-windows-gnullvm.tar.xz": "8ddc26705e13c46530c898524b0d2657b7d416a25e8d9ffe369a97b23a619bf6",
- "rust-std-1.99.1-x86_64-pc-windows-msvc.tar.xz": "4fe09430ded40b8b3092b49f0a651178eb1f8154ef4d1f1a73f2a3595b2d956f",
- "rust-std-1.99.1-x86_64-unknown-freebsd.tar.xz": "cd11b574be47094026f0fdb12ab3ae7fdb16acea71143d87c3ccf0208e6c9852",
- "rust-std-1.99.1-x86_64-unknown-fuchsia.tar.xz": "00e4d731dd46e0879bd25a280178627b2bc53b4143d7ec3fac05b746ea8f5537",
- "rust-std-1.99.1-x86_64-unknown-linux-gnu.tar.xz": "109b074225bf5b9ea3820890876bfdf4ed161adbfaf94b2b4b5984c85ee5d958",
- "rust-std-1.99.1-x86_64-unknown-linux-musl.tar.xz": "1dd241eaeb19ff3b5180461c77bdee93d6cafc669eda9de834e7c06b0ec3ca95",
- "rust-std-1.99.1-x86_64-unknown-netbsd.tar.xz": "97569760ad6e042d56ccdac2fd295df8a10351403b9bbca2a19567f8ed6ae46b",
- "rust-std-1.99.1-x86_64-unknown-none.tar.xz": "ae62c0c5ea47af55eb432dabc8f4a92c1815965633fc3ecf4056c02948f302cf",
- "rust-std-1.99.1-x86_64-unknown-uefi.tar.xz": "436c3de8edf19b2bea8f877f495927d2bdef4f3f6e6c67eae3eb5d31b0820616",
- "rustc-1.99.1-aarch64-apple-darwin.tar.xz": "23948a0a9c162fd2952defb3fb0462c44e8fcfd1a4ab8a274a1e1bdb2cf810a3",
- "rustc-1.99.1-aarch64-pc-windows-msvc.tar.xz": "4d89c7f3f9d8637c667332adf77b55f43c322ae0ff038e75493bb28e16369af2",
- "rustc-1.99.1-aarch64-unknown-linux-gnu.tar.xz": "acdcdfe09ae1f103aa9a2b7f88903a9588bc2e99288af10e6fbf5514e2e49f25",
- "rustc-1.99.1-src.tar.xz": "6451598a99e77f07571960f6b21d577399d3a30f33e80cbd2e3a4aae6535d265",
- "rustc-1.99.1-x86_64-apple-darwin.tar.xz": "203feef2c2165d7dda1f30ccf75590f72a6abc52ce259ed1c418de84a6887698",
- "rustc-1.99.1-x86_64-pc-windows-msvc.tar.xz": "7da83c2af1f209606b0160f25174d2867c7c7b73667c32c9e5fbcef4f5f45348",
- "rustc-1.99.1-x86_64-unknown-linux-gnu.tar.xz": "2ff05ff9c08a90861e7f6e4065b40a8b87463b4576186fd613871c3e37f2091f",
- "rustfmt-1.99.1-aarch64-apple-darwin.tar.xz": "8b80dda570f140ee9ced8799294e812bba847a025f185bae4cba85a2ba235570",
- "rustfmt-1.99.1-aarch64-pc-windows-msvc.tar.xz": "2ad35c2fd069066955c40eaa48fe8c5f14c55c86de73fda35ab53e7decef49a8",
- "rustfmt-1.99.1-aarch64-unknown-linux-gnu.tar.xz": "26b3200b1461921415927abf7fe410202a6eda2db3e419abde59e0abfcd93fc2",
- "rustfmt-1.99.1-x86_64-apple-darwin.tar.xz": "06491b425e02612479c30ad9a49f72f88bc8e033310ec8cc238a15eafecf91b7",
- "rustfmt-1.99.1-x86_64-pc-windows-msvc.tar.xz": "1a4d309df5ecacbefe5798c092a03f9d00aa9e1cbc65673c4ace1367c7a25989",
- "rustfmt-1.99.1-x86_64-unknown-linux-gnu.tar.xz": "e3b36c4c7ec3486c059d8067ff48787676612007123aad7a4e8ec12c48ee9ba2"
+ "cargo-1.95.0-aarch64-apple-darwin.tar.xz": "6c2ffed8e1ac9cf4dc9e80f282a869a6b237a153e7c55cca039d33de29d80aaf",
+ "cargo-1.95.0-aarch64-pc-windows-msvc.tar.xz": "e645b30fa035a18aa12d28b699052014c7efa9dd4a33dabd223f0d16b5fa28e8",
+ "cargo-1.95.0-aarch64-unknown-linux-gnu.tar.xz": "7c070aeba9bbf12073646995a03f36c346bb5f541d0078ba6d9dc2a7adaaf6af",
+ "cargo-1.95.0-x86_64-apple-darwin.tar.xz": "e2e1131ade2dddc0d779e0ab3a6a990085c7a654951235742823c3a1ce0f190f",
+ "cargo-1.95.0-x86_64-pc-windows-msvc.tar.xz": "cab2606cb2d0aa31c55d50512fe07a9f15e893227566fbeb448306760cd0d2bf",
+ "cargo-1.95.0-x86_64-unknown-linux-gnu.tar.xz": "e74edd2cf7d0f1f1383b4f00eb90c843750bc489e2ccf7214e6476678a907425",
+ "clippy-1.95.0-aarch64-apple-darwin.tar.xz": "fd183baa023d0c4e0c5b8184226e2d4c85126adf156cb1f3a726ec593bba8d62",
+ "clippy-1.95.0-aarch64-pc-windows-msvc.tar.xz": "44c1b7ada72aa8f3fcaceb37a3899665bc9b160c2fea77879c8ecb65a9e97eba",
+ "clippy-1.95.0-aarch64-unknown-linux-gnu.tar.xz": "fb021e0c0fc2238be9266d7614f4a26bc372544c4cba3528d729ab24ad229fc9",
+ "clippy-1.95.0-x86_64-apple-darwin.tar.xz": "e47367f6b1489d74cbba93b387310adcb82e27a51e44b2c6ff543eb4f199fe32",
+ "clippy-1.95.0-x86_64-pc-windows-msvc.tar.xz": "ddc151d6f58c6658b7380292ecaef36e62d063bbdbf7f5802669810575bb5b75",
+ "clippy-1.95.0-x86_64-unknown-linux-gnu.tar.xz": "ac779bc9839dd47180806b133e4e2563c4a34716284cd5b8fede8ef289f452ca",
+ "rust-analyzer-1.95.0-aarch64-apple-darwin.tar.xz": "11231fc6574301b94bd379af4ef409caef7c65b877bcecf2b227dc0d74aa0ec7",
+ "rust-analyzer-1.95.0-aarch64-pc-windows-msvc.tar.xz": "92958624f23d4b0980748ac9e6d67f6f67a868f8224e8c6240e3f84145e2d805",
+ "rust-analyzer-1.95.0-aarch64-unknown-linux-gnu.tar.xz": "b37e5b9aad624e54228254f98a710ee19ad464fe7ada93ef12e20c87886a0047",
+ "rust-analyzer-1.95.0-x86_64-apple-darwin.tar.xz": "6cd111900e13fd19b188c5d8844b34136af3967066c0ea2914ce5c3508296c85",
+ "rust-analyzer-1.95.0-x86_64-pc-windows-msvc.tar.xz": "ba58e349f5e8b0ef13735c48d4ad8d8c7664472f8403f3c9d97b291bd54a7638",
+ "rust-analyzer-1.95.0-x86_64-unknown-linux-gnu.tar.xz": "a9d71c6e7427c45afcd846a8b34a3e3301ae7a0e91a2bcf929326af77a7dc68e",
+ "rust-src-1.95.0.tar.xz": "67b09138c8db96afc4bbfc69ea771ac9a091fd777698acb43f6dfd9fb7dea363",
+ "rust-std-1.95.0-aarch64-apple-darwin.tar.xz": "9b30089b0f767cb91b2190ffec55a9beeb2a21a1405d8da0f664d7e09d08e6d8",
+ "rust-std-1.95.0-aarch64-apple-ios-macabi.tar.xz": "0e1760828f4e0fa1cde0061ba5680619dcc1cdcafec9242cc18dc4547c73b1cd",
+ "rust-std-1.95.0-aarch64-apple-ios-sim.tar.xz": "4bfe5b0c74c10d121a8ac60f1833c7714b963f9130f6256ca313d94405267deb",
+ "rust-std-1.95.0-aarch64-apple-ios.tar.xz": "6fcc42d8dbba4910a128ffa32d62a730339a7e3882a90341a881f2edf66ff55a",
+ "rust-std-1.95.0-aarch64-linux-android.tar.xz": "de5e8fa5d955809891eea77682811fc90be705f78883bd94071e98f5a738d05b",
+ "rust-std-1.95.0-aarch64-pc-windows-gnullvm.tar.xz": "93d810b8872771afe04f66aa30a4eee48736aca693186e4c7cc2766e1a82e340",
+ "rust-std-1.95.0-aarch64-pc-windows-msvc.tar.xz": "be21b5a8a71c49b4dcbc19956233b0de7bfda3ee3c8a199148299f867e95cb42",
+ "rust-std-1.95.0-aarch64-unknown-fuchsia.tar.xz": "b311a0523f75e031d683d983515edb9baaf22a843dbd44ce2a30a3204752f592",
+ "rust-std-1.95.0-aarch64-unknown-linux-gnu.tar.xz": "3a21b271b1ff973b94d69b25e7a39992f9fbcae1ab6d9475844a23e6ad3908ac",
+ "rust-std-1.95.0-aarch64-unknown-linux-musl.tar.xz": "f6710416ed9a7d5cf2a15efa761eb79a1deeb43f9961bbe05cc97bec4ef9064a",
+ "rust-std-1.95.0-aarch64-unknown-none-softfloat.tar.xz": "54d691468e25e7989b022a171337beadf78b5202877b312b75182b7f93efbb8b",
+ "rust-std-1.95.0-aarch64-unknown-none.tar.xz": "2b0c986dc9902866311f1fe2d44bc2bd84479d2ac84ed7ada76a5eb7ba37080f",
+ "rust-std-1.95.0-aarch64-unknown-uefi.tar.xz": "ca657564103024d345ca32e8e4ade7ebb395a51163d2897d9e5f8373c025e49e",
+ "rust-std-1.95.0-arm-linux-androideabi.tar.xz": "12a9c5fa24608159c2b2bd50abc0c6d0add407c0258cee894c2f61c07051a9c4",
+ "rust-std-1.95.0-arm-unknown-linux-gnueabi.tar.xz": "f6cd592dacdf41f724ee90a2f34db028e37ca2a7fb26fa86e93e8fd68e24d066",
+ "rust-std-1.95.0-arm-unknown-linux-gnueabihf.tar.xz": "fda8408ea17881c6529e27e58672d6c628f786cad557fac92856077e7a610239",
+ "rust-std-1.95.0-arm-unknown-linux-musleabi.tar.xz": "62f21fabc209fd0de53156764fc426da74c59525bb60cb4c1c3ffd1be0bbe00b",
+ "rust-std-1.95.0-arm-unknown-linux-musleabihf.tar.xz": "2842ce67f7a4c68c6e8b30ad3bb36484fb745edcc2694b2a36bf0609cf758044",
+ "rust-std-1.95.0-armv7-linux-androideabi.tar.xz": "61e95e144986c52ff9fa2fe3c249a68b2bf268adb2a2eeb81d80c180e43027f1",
+ "rust-std-1.95.0-armv7-unknown-linux-gnueabi.tar.xz": "e23454d6ca7fc3f5eb7cf9241572765176d86e9f45d4f394de31a5fd794e523f",
+ "rust-std-1.95.0-armv7-unknown-linux-gnueabihf.tar.xz": "bd319e18ca2dad0450f76277874d56356330da536be8cf271509f8e6f28ac6de",
+ "rust-std-1.95.0-armv7-unknown-linux-musleabi.tar.xz": "a49bc987e0531800f92825ce61402b5734ea747caa8970d3373506742ed7daa6",
+ "rust-std-1.95.0-armv7-unknown-linux-musleabihf.tar.xz": "77f9aaff4669c076edc96cdb99dc21749d2c692c862232b52176572c289fe671",
+ "rust-std-1.95.0-i686-linux-android.tar.xz": "e7b5e18d1d4119c7c1454ee8427933f27aeff9e81a22248c2829f5f299d3a937",
+ "rust-std-1.95.0-i686-pc-windows-gnu.tar.xz": "2e98fb94fc500690d7e72e071ce29dd98790ff518163963f5c82c32afba9231d",
+ "rust-std-1.95.0-i686-pc-windows-gnullvm.tar.xz": "b429a8c456d6a1815ece064102bd6a25f67d46db4f6d7b79dbe7d1b9d1f78e0f",
+ "rust-std-1.95.0-i686-pc-windows-msvc.tar.xz": "6206fd7e8bd119e9d1ba1c425ad25c282512eb0d5659f2dcb4be224b84715706",
+ "rust-std-1.95.0-i686-unknown-freebsd.tar.xz": "3b13b3ccecf482c0da3e94f19e0aa5e8e375622f4e09b30e6dae2b7638bee63f",
+ "rust-std-1.95.0-i686-unknown-linux-gnu.tar.xz": "527c5d5249a7f77b48d3c9da3ac512d27b47f43d08dbe3c6f82a3d5b35d8aa27",
+ "rust-std-1.95.0-i686-unknown-linux-musl.tar.xz": "af4d3e7aabb63d39a7a2ff5435cc993b65ff38a2d2e23f1967e519037a1b0455",
+ "rust-std-1.95.0-i686-unknown-uefi.tar.xz": "3233985273616ec36861f2d50b4a025c903b2bb8c45b171c0ae9e2de8342125b",
+ "rust-std-1.95.0-loongarch64-unknown-linux-gnu.tar.xz": "eaf2c37c3293eea742e7ab20f25718ab19c93bd381df8823113fce70460c19c3",
+ "rust-std-1.95.0-loongarch64-unknown-linux-musl.tar.xz": "959b1bf99bc724c87bc4f2c0d184eb0554c134885c05c90d060eb572838924fd",
+ "rust-std-1.95.0-loongarch64-unknown-none.tar.xz": "139e8bdc86cbc21e149a2229c092f74741c907ef6424fa8ce8d435db47895cb6",
+ "rust-std-1.95.0-powerpc-unknown-linux-gnu.tar.xz": "59e0abbaa246502521e37c55b8d6cf88d5b8a697b0c70c61ec189937308f7246",
+ "rust-std-1.95.0-powerpc64-unknown-linux-gnu.tar.xz": "cc7fb9aa289ff1756502ae16a05e2885289165f01ed94a7c2db6576b3dae74a6",
+ "rust-std-1.95.0-powerpc64le-unknown-linux-gnu.tar.xz": "2370d9266051a0b23346d42e43a00f91b2daff22a963fb03e28ae50cb0b76c50",
+ "rust-std-1.95.0-powerpc64le-unknown-linux-musl.tar.xz": "0362ba4ecfe0bb508f0d2b064c6fbbfe72604d5ae1989d6a8a7b4fe5ff1889f1",
+ "rust-std-1.95.0-riscv32imc-unknown-none-elf.tar.xz": "04befebf3b15372dacb7e6c0fcdab842c17a63ea58bf2f4cdccd7182ae9195c6",
+ "rust-std-1.95.0-riscv64gc-unknown-linux-gnu.tar.xz": "50fe7869e166bb4c990a0e1664366b1ffdbe669664b7663cd03c079bd0efdcac",
+ "rust-std-1.95.0-riscv64gc-unknown-linux-musl.tar.xz": "e01bdbf5d6fa3e529671d49e87ba81dc9612101144f3ee5a0e1de3c48f27b47c",
+ "rust-std-1.95.0-riscv64gc-unknown-none-elf.tar.xz": "a4cb7a1527f3b56a39464e5ca2b174a27b708b26d78e604735eb5ffd9ee4d20b",
+ "rust-std-1.95.0-s390x-unknown-linux-gnu.tar.xz": "31978c1286afff9a0bb7f01c2ae4a39f40727b6100a82b6d934f146b06cde510",
+ "rust-std-1.95.0-sparc64-unknown-linux-gnu.tar.xz": "88619b2413d218c119a2060e583a9e835fa5f9cf6ac038070eec10b02c191056",
+ "rust-std-1.95.0-thumbv6m-none-eabi.tar.xz": "602ec023c4615fc1c2d78b688554d42fa525e07e861c052f406fd7a607e5d5ee",
+ "rust-std-1.95.0-thumbv7em-none-eabi.tar.xz": "fb671966ba9aede333956ed43fcfe114ec890ca6e70369c9f3219871ee3ae8ae",
+ "rust-std-1.95.0-thumbv7em-none-eabihf.tar.xz": "fa3d189c09b64d818ad65a3fec1ce1c7d7b3908aea6fc4607a3fcc05067cad81",
+ "rust-std-1.95.0-thumbv7m-none-eabi.tar.xz": "e9e39f483ad4c1ce55fa4f508009e8d7d7ef25efe6592f7bfbabc159a24658ff",
+ "rust-std-1.95.0-thumbv8m.main-none-eabi.tar.xz": "3b64bffb193b37e83dc7b169add55f0ef3298220f8475468be4bb87276a68105",
+ "rust-std-1.95.0-thumbv8m.main-none-eabihf.tar.xz": "25ec92187d3a45fb1e397b0ba6000341d872523925a99a48b1978bdf1e6038cb",
+ "rust-std-1.95.0-wasm32-unknown-emscripten.tar.xz": "967b92a8682e8b8a1a459d776b36e41c906cdcac1008fef70e4800fec40d6864",
+ "rust-std-1.95.0-wasm32-unknown-unknown.tar.xz": "5587b89ff69623d09e476439d44a24453b4e4ea3d5e0b53a5c0a935151ff3fd1",
+ "rust-std-1.95.0-wasm32-wasip1-threads.tar.xz": "9079935a00a3c3aaf284957bbe82972983ce2708019687cec1f4988c30c1e0f3",
+ "rust-std-1.95.0-wasm32-wasip1.tar.xz": "86e5b6d98c7520bb9c3ad4f8cbbbf14beaf230b0f06b437db398e3c4f7dae43e",
+ "rust-std-1.95.0-wasm32-wasip2.tar.xz": "68146eb4c887431379966efa21d75dc957f18bd1166239c1deaa53fe38cb9ab4",
+ "rust-std-1.95.0-x86_64-apple-darwin.tar.xz": "2be13c14122b8d4d09b7f7c434fca9ae7215ec72049944189c88c4d9128ce504",
+ "rust-std-1.95.0-x86_64-apple-ios-macabi.tar.xz": "60b92e51e87f84046e0b19ccedc88c45b4b62c3ab10351f8473453f341c894f1",
+ "rust-std-1.95.0-x86_64-apple-ios.tar.xz": "11abb7b1c92b5a88b8c3ba21ee596a1be7dee5e817b336f26b4968d8ed5513ad",
+ "rust-std-1.95.0-x86_64-linux-android.tar.xz": "77b8e2be4a6e784a63cd77de944864c8044ddf4d5c7d56f663ada8a38a8319c4",
+ "rust-std-1.95.0-x86_64-pc-windows-gnu.tar.xz": "f57e045016a04130125fb43295d95f9ad2bebc296150eadb031dbf5167ad12bd",
+ "rust-std-1.95.0-x86_64-pc-windows-gnullvm.tar.xz": "3c52a0e34e0b4abe4439cabd77383408f5f9c80b6e249fbc0855df424b45008d",
+ "rust-std-1.95.0-x86_64-pc-windows-msvc.tar.xz": "7c659bdc88646e7e1befa370881bd311be87b26f006933a28b40dcab2f7cc832",
+ "rust-std-1.95.0-x86_64-unknown-freebsd.tar.xz": "dfe913c2f477172db10d3723d9f5c536d8b6f42776c979cc855820d8249adec3",
+ "rust-std-1.95.0-x86_64-unknown-fuchsia.tar.xz": "faa2bc09a3992f1d81b538121d64a3a396f4ec666e665c79d2ab47461c2d3206",
+ "rust-std-1.95.0-x86_64-unknown-linux-gnu.tar.xz": "047ea7098803d3500fa1072e9cee5392697e21525559e4458128a2bf874aa382",
+ "rust-std-1.95.0-x86_64-unknown-linux-musl.tar.xz": "aee540abf132920f791ef781489851a078d69dff493fb628d49c1d573f92bb3a",
+ "rust-std-1.95.0-x86_64-unknown-netbsd.tar.xz": "7a82b71c53f20cb147a340819fcab645da220b312a96194531e631ee99783a7d",
+ "rust-std-1.95.0-x86_64-unknown-none.tar.xz": "7c151c0e7bf3b0b4d7136774cd3686e5f691b761b648b17e83af58e7669d3e01",
+ "rust-std-1.95.0-x86_64-unknown-uefi.tar.xz": "4cc55629480aa8ab5b39eb6b7458433b48461d6626fdea0330fb88e23af818ea",
+ "rustc-1.95.0-aarch64-apple-darwin.tar.xz": "149e85a285b6eba58eb6c8bdf7deb1b93763890598e62cb635a712e3a8454f04",
+ "rustc-1.95.0-aarch64-pc-windows-msvc.tar.xz": "0dbec9739b93427ccdd3948c3b1f83cec42e4c9545d930a8d1e1464ff4092c5f",
+ "rustc-1.95.0-aarch64-unknown-linux-gnu.tar.xz": "0fe3689eeaed603e5ef24572d11597d3edadaefd2cb181674ad621260f2501d2",
+ "rustc-1.95.0-src.tar.xz": "62b67230754da642a264ca0cb9fc08820c54e2ed7b3baba0289876d4cdb48c08",
+ "rustc-1.95.0-x86_64-apple-darwin.tar.xz": "33db457715446a69ed6f69f78f5fbb9ca8e17a16585d1d7a0060479bfe4c7afc",
+ "rustc-1.95.0-x86_64-pc-windows-msvc.tar.xz": "4cb1f3b578adc6541cbe13a6f85f1fd8c0ce643d90b506a36dee24c680864c67",
+ "rustc-1.95.0-x86_64-unknown-linux-gnu.tar.xz": "8426a3d170a5879f5682f5fbdd024a1779b3951e7baba685af2d6dc32a6dfc15",
+ "rustfmt-1.95.0-aarch64-apple-darwin.tar.xz": "c54af79adfdc790d27fc56e24407e370c80be5a89ad537eef9fbd45d3c3e28e8",
+ "rustfmt-1.95.0-aarch64-pc-windows-msvc.tar.xz": "a873c048743e6da29e09a8b55c774ee113f8f6ae4fd57d988d304a6453801b34",
+ "rustfmt-1.95.0-aarch64-unknown-linux-gnu.tar.xz": "64cce868f0f3d29f1524e11e9bab01ac9d538a31665fea1cd6b78af46a1c0a41",
+ "rustfmt-1.95.0-x86_64-apple-darwin.tar.xz": "5f7228f40a160e80d260e74e068d6fec8627aa02f1f5ae29d2019b9347076401",
+ "rustfmt-1.95.0-x86_64-pc-windows-msvc.tar.xz": "8bcf91606e36b8a0164efafde50709cd7a3c02143a2edaa81dbf3dccd6ed8f4c",
+ "rustfmt-1.95.0-x86_64-unknown-linux-gnu.tar.xz": "f1b2a7301513ffdd95ebf22ebbdd932e4d17fc806f748d93924740d0297b1396"
},
"@@windows_support+//windows:extensions.bzl%msvc_runtime": {
"visual_studio_installer_manifest_v1": {
diff --git a/README.md b/README.md
index 43c66619a986..f028d7ba626c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
Codefx CLI is a fork of OpenAI Codex CLI with resilient retries and Codefx release updates.
- 
+ 
If you want Codex in your code editor (VS Code, Cursor, Windsurf), install in your IDE.
@@ -13,17 +13,17 @@ If you want Codex in your code editor (VS Code, Cursor, Windsurf), {});
+ process.execve(binaryPath, [binaryPath, ...process.argv.slice(2)], env);
+}
+
+// Older Node versions and Windows need a child process. Spawn asynchronously
+// so Node can forward signals while the native binary is executing.
const child = spawn(binaryPath, process.argv.slice(2), {
stdio: "inherit",
env,
@@ -280,8 +286,9 @@ const childResult = await new Promise((resolve) => {
});
if (childResult.type === "signal") {
- // Re-emit the same signal so that the parent terminates with the expected
- // semantics (this also sets the correct exit code of 128 + n).
+ // Preserve a failure exit code even if Node ignores the re-emitted signal.
+ process.exitCode = 128 + constants.signals[childResult.signal];
+ process.removeAllListeners(childResult.signal);
process.kill(process.pid, childResult.signal);
} else {
process.exit(childResult.exitCode);
diff --git a/codex-cli/scripts/README.md b/codex-cli/scripts/README.md
index 4877781c36b9..e60657a387c3 100644
--- a/codex-cli/scripts/README.md
+++ b/codex-cli/scripts/README.md
@@ -18,6 +18,12 @@ When `--package codex` is provided, the staging helper builds the lightweight
`@openai/codex` meta package plus all platform-native `@openai/codex` variants
that are later published under platform-specific dist-tags.
+The npm variants omit the standalone `codex-exec-server` executable and its
+`execServer` manifest entry to keep uploads within npm's package size limit.
+They retain `codex exec-server` through the CLI, the code-mode host, and the
+platform sandbox helpers. Canonical release archives retain the standalone
+executor; npm staging changes only the package copy.
+
Direct `build_npm_package.py` invocations are still useful for package-specific
debugging, but native packages expect `--vendor-src` to point at a prehydrated
`vendor/` tree. Release packaging should use `scripts/stage_npm_packages.py`
diff --git a/codex-cli/scripts/build_npm_package.py b/codex-cli/scripts/build_npm_package.py
index 12f4f9dc8993..7b7cd5d95547 100755
--- a/codex-cli/scripts/build_npm_package.py
+++ b/codex-cli/scripts/build_npm_package.py
@@ -391,6 +391,16 @@ def copy_native_binaries(
if dest_target_dir.exists():
shutil.rmtree(dest_target_dir)
shutil.copytree(target_dir, dest_target_dir)
+ # standalone exec-server is a binary that is equal to codex exec-server, do not publish it to npm
+ for name in ("codex-exec-server", "codex-exec-server.exe"):
+ (dest_target_dir / "bin" / name).unlink(missing_ok=True)
+ metadata_path = dest_target_dir / "codex-package.json"
+ if metadata_path.is_file():
+ metadata = json.loads(metadata_path.read_text(encoding="utf-8"))
+ metadata.pop("execServer", None)
+ metadata_path.write_text(
+ json.dumps(metadata, indent=2) + "\n", encoding="utf-8"
+ )
else:
dest_target_dir.mkdir(parents=True, exist_ok=True)
diff --git a/codex-cli/tests/exit-status.test.mjs b/codex-cli/tests/exit-status.test.mjs
new file mode 100644
index 000000000000..6eb265dc71cd
--- /dev/null
+++ b/codex-cli/tests/exit-status.test.mjs
@@ -0,0 +1,121 @@
+// Run with CODEX_TEST_BINARY=/absolute/path/to/codex node --test codex-cli/tests/exit-status.test.mjs.
+import assert from "node:assert/strict";
+import { execFileSync, spawn, spawnSync } from "node:child_process";
+import { once } from "node:events";
+import {
+ copyFile,
+ mkdir,
+ mkdtemp,
+ rm,
+ symlink,
+ writeFile,
+} from "node:fs/promises";
+import { constants, tmpdir } from "node:os";
+import path from "node:path";
+import { createInterface } from "node:readline";
+import test from "node:test";
+
+test(
+ "the npm wrapper preserves numeric exits and child signals",
+ {
+ skip: process.platform === "win32",
+ },
+ async () => {
+ assert.ok(
+ process.env.CODEX_TEST_BINARY,
+ "Set CODEX_TEST_BINARY to a built Codex binary",
+ );
+ const directory = await mkdtemp(path.join(tmpdir(), "codex-npm-exit-"));
+ let child;
+ let killTimer;
+ try {
+ const arch = process.arch === "arm64" ? "aarch64" : "x86_64";
+ const target = `${arch}-${process.platform === "darwin" ? "apple-darwin" : "unknown-linux-musl"}`;
+ const bin = path.join(directory, "vendor", target, "bin");
+ const home = path.join(directory, "home");
+ await mkdir(bin, { recursive: true });
+ await mkdir(home);
+ await mkdir(path.join(directory, "bin"));
+ await writeFile(
+ path.join(directory, "package.json"),
+ '{"type":"module"}',
+ );
+ const wrapper = path.join(directory, "bin", "codex.js");
+ await copyFile(new URL("../bin/codex.js", import.meta.url), wrapper);
+ await symlink(
+ path.resolve(process.env.CODEX_TEST_BINARY),
+ path.join(bin, "codex"),
+ );
+ const env = { ...process.env, CODEX_HOME: home, CODEX_SQLITE_HOME: home };
+
+ // A normal CLI argument error must retain its numeric exit status.
+ const invalid = spawnSync(
+ process.execPath,
+ [wrapper, "--invalid-codex-option"],
+ { env, timeout: 30_000, killSignal: "SIGKILL" },
+ );
+ assert.equal(invalid.error, undefined);
+ assert.deepEqual([invalid.status, invalid.signal], [2, null]);
+
+ for (const signal of ["SIGHUP", "SIGXFSZ"]) {
+ // Wait for the real migration prompt before terminating a process.
+ child = spawn(process.execPath, [wrapper, "migrate-nfs-db"], {
+ env,
+ detached: true,
+ });
+ const processGroup = child.pid;
+ killTimer = setTimeout(() => {
+ try {
+ process.kill(-processGroup, "SIGKILL");
+ } catch (error) {
+ if (error.code !== "ESRCH") throw error;
+ }
+ }, 30_000);
+ const exited = once(child, "exit");
+ const lines = createInterface({ input: child.stderr });
+ let prompted = false;
+ for await (const line of lines) {
+ if (line.endsWith("[y/N]:")) {
+ prompted = true;
+ break;
+ }
+ }
+ assert.ok(prompted, "migration must reach its confirmation prompt");
+ const processes = execFileSync("ps", ["-axo", "pid=,ppid="], {
+ encoding: "utf8",
+ });
+ const children = processes
+ .trim()
+ .split("\n")
+ .map((line) => line.trim().split(/\s+/).map(Number))
+ .filter(([, parent]) => parent === child.pid);
+ const usesExecve = typeof process.execve === "function";
+ assert.equal(
+ children.length,
+ usesExecve ? 0 : 1,
+ "execve must replace the wrapper; spawn must create one native child",
+ );
+ if (usesExecve || signal === "SIGHUP") {
+ // Signal the native process directly, or let the wrapper forward it.
+ child.kill(signal);
+ assert.deepEqual(await exited, [null, signal]);
+ } else {
+ // A native child can die from a signal that Node ignores by default.
+ process.kill(children[0][0], signal);
+ assert.deepEqual(await exited, [
+ 128 + constants.signals[signal],
+ null,
+ ]);
+ }
+ clearTimeout(killTimer);
+ }
+ } finally {
+ clearTimeout(killTimer);
+ if (child && child.exitCode === null && child.signalCode === null) {
+ process.kill(-child.pid, "SIGKILL");
+ await once(child, "exit");
+ }
+ await rm(directory, { recursive: true, force: true });
+ }
+ },
+);
diff --git a/codex-cli/tests/test_build_npm_package.py b/codex-cli/tests/test_build_npm_package.py
new file mode 100644
index 000000000000..1424abe15db0
--- /dev/null
+++ b/codex-cli/tests/test_build_npm_package.py
@@ -0,0 +1,112 @@
+"""Check the contents of npm archives staged from canonical release packages."""
+
+import json
+from pathlib import Path
+import shutil
+import subprocess
+import sys
+import tarfile
+import tempfile
+import unittest
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+sys.path.insert(0, str(REPO_ROOT / "codex-cli" / "scripts"))
+
+from build_npm_package import CODEX_PLATFORM_PACKAGES
+
+
+class NpmPackageTest(unittest.TestCase):
+ def test_npm_archives_preserve_cli_runtime_without_standalone_executor(
+ self,
+ ) -> None:
+ # Use an installed executable as prebuilt input: packaging must preserve its
+ # bytes even when staging a package for another operating system.
+ executable = shutil.which("whoami") or sys.executable
+ for package, platform in CODEX_PLATFORM_PACKAGES.items():
+ with self.subTest(package=package), tempfile.TemporaryDirectory() as temp:
+ root = Path(temp)
+ target = platform["target_triple"]
+ source = root / "vendor" / target
+ suffix = ".exe" if platform["os"] == "win32" else ""
+ metadata = {
+ "layoutVersion": 1,
+ "variant": "codex",
+ "version": "1.2.3",
+ "target": target,
+ "entrypoint": f"bin/codex{suffix}",
+ "execServer": f"bin/codex-exec-server{suffix}",
+ "resourcesDir": "codex-resources",
+ "pathDir": "codex-path",
+ }
+ files = [
+ metadata["entrypoint"],
+ metadata["execServer"],
+ f"bin/codex-code-mode-host{suffix}",
+ f"codex-path/rg{suffix}",
+ ]
+ if platform["os"] == "linux":
+ files.append("codex-resources/bwrap")
+ elif platform["os"] == "win32":
+ files.extend(
+ [
+ "codex-resources/codex-command-runner.exe",
+ "codex-resources/codex-windows-sandbox-setup.exe",
+ ]
+ )
+ for name in files:
+ destination = source / name
+ destination.parent.mkdir(parents=True, exist_ok=True)
+ shutil.copy2(executable, destination)
+ (source / "codex-package.json").write_text(json.dumps(metadata))
+ original = {
+ path.relative_to(source).as_posix(): path.read_bytes()
+ for path in source.rglob("*")
+ if path.is_file()
+ }
+ archive_path = root / "package.tgz"
+ subprocess.run(
+ [
+ sys.executable,
+ str(
+ REPO_ROOT / "codex-cli" / "scripts" / "build_npm_package.py"
+ ),
+ "--package",
+ package,
+ "--version",
+ "1.2.3",
+ "--vendor-src",
+ str(source.parent),
+ "--staging-dir",
+ str(root / "staged"),
+ "--pack-output",
+ str(archive_path),
+ ],
+ check=True,
+ capture_output=True,
+ )
+ with tarfile.open(archive_path, "r:gz") as archive:
+ prefix = f"package/vendor/{target}/"
+ actual = {
+ member.name.removeprefix(prefix): archive.extractfile(
+ member
+ ).read()
+ for member in archive.getmembers()
+ if member.isfile() and member.name.startswith(prefix)
+ }
+ expected = original.copy()
+ metadata = json.loads(expected.pop("codex-package.json"))
+ expected.pop(metadata.pop("execServer"))
+ self.assertEqual(json.loads(actual.pop("codex-package.json")), metadata)
+ self.assertEqual(actual, expected)
+ self.assertEqual(
+ {
+ path.relative_to(source).as_posix(): path.read_bytes()
+ for path in source.rglob("*")
+ if path.is_file()
+ },
+ original,
+ )
+
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/codex-rs/.cargo/audit.toml b/codex-rs/.cargo/audit.toml
index a1e347895cab..d7ebe861a0bc 100644
--- a/codex-rs/.cargo/audit.toml
+++ b/codex-rs/.cargo/audit.toml
@@ -17,4 +17,12 @@ ignore = [
"RUSTSEC-2026-0372", # zvariant_derive 4.2.0 via zbus 4.4.0 in Linux TUI and keyring/secret-service; remove when those paths migrate off the retired standalone crates
# Reviewed 2026-10-20.
"RUSTSEC-2026-0374", # basic-toml 0.1.10 via i18n-config/i18n-embed-fl under age 0.12.1 in codex-secrets; no patched release; remove when age's localization dependencies migrate off basic-toml
+ "RUSTSEC-2026-0387", # crypto-bigint 0.5.5 via elliptic-curve 0.13.8 is used by age, AWS login, user verification, and WebRTC; timing leakage can affect private-key or session-secret operations; remove when these dependency paths use crypto-bigint >=0.7.6
+ # Reviewed 2026-10-26.
+ "RUSTSEC-2026-0391", # Codex, tonic and zip use zstd 0.13.3 without reusing borrowed contexts across streams. Remove when all paths use zstd >=0.14.3.
+ "RUSTSEC-2026-0398", # zstd 0.13.3 pulls in zstd-safe 7.2.4 with the affected seekable feature disabled. Remove when all paths use zstd-safe >=8.2.0.
+ "RUSTSEC-2026-0403", # zstd 0.13.3 pulls in zstd-safe 7.2.4. Codex, tonic and zip use read decoders or initialized output buffers and discard output on error. Remove when all paths use zstd-safe >=8.2.0.
+ "RUSTSEC-2026-0410", # zstd-safe 7.2.4 pulls in zstd-sys 2.0.16. Its allocator bug only affects wasm32, and Codex ships native binaries. Remove when the lockfile uses zstd-sys >=2.1.2.
+ # Reviewed 2026-11-05: unmaintained only; no known exploitable issue or fixed upstream release.
+ "RUSTSEC-2026-0441", # pin-utils 0.1.0 via aws-smithy-http 0.62.6 -> aws-config 1.8.12 -> codex-aws-auth. Remove when AWS SDK dependencies drop pin-utils.
]
diff --git a/codex-rs/BUILD.bazel b/codex-rs/BUILD.bazel
index e1698941536a..fc151fdc2ed2 100644
--- a/codex-rs/BUILD.bazel
+++ b/codex-rs/BUILD.bazel
@@ -53,6 +53,7 @@ runtime_archive(
"//codex-rs/app-server:release_files",
"//codex-rs/cli:release_files",
"//codex-rs/code-mode-host:release_files",
+ "//codex-rs/exec-server-cli:release_files",
] + select({
"@platforms//os:linux": ["//codex-rs/bwrap:release_files"],
"@platforms//os:windows": [
@@ -70,6 +71,7 @@ runtime_archive(
srcs = [
"//codex-rs/cli:release_files",
"//codex-rs/code-mode-host:release_files",
+ "//codex-rs/exec-server-cli:release_files",
"//codex-rs/responses-api-proxy:release_files",
] + select({
"@platforms//os:linux": ["//codex-rs/bwrap:release_files"],
@@ -84,6 +86,7 @@ runtime_archive(
srcs = [
"//codex-rs/app-server:release_files",
"//codex-rs/code-mode-host:release_files",
+ "//codex-rs/exec-server-cli:release_files",
] + select({
"@platforms//os:linux": ["//codex-rs/bwrap:release_files"],
"//conditions:default": [],
diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock
index 96316db08871..35ced85bcc13 100644
--- a/codex-rs/Cargo.lock
+++ b/codex-rs/Cargo.lock
@@ -287,7 +287,7 @@ checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
[[package]]
name = "app_test_support"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"base64 0.22.1",
@@ -1888,7 +1888,7 @@ dependencies = [
[[package]]
name = "codex-agent-extension"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-core",
@@ -1900,7 +1900,7 @@ dependencies = [
[[package]]
name = "codex-agent-graph-store"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-protocol",
"codex-state",
@@ -1915,7 +1915,7 @@ dependencies = [
[[package]]
name = "codex-agent-identity"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"base64 0.22.1",
@@ -1935,7 +1935,7 @@ dependencies = [
[[package]]
name = "codex-agent-message-board-client"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"chrono",
@@ -1958,7 +1958,7 @@ dependencies = [
[[package]]
name = "codex-agent-message-board-extension"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-extension-api",
"codex-message-board",
@@ -1972,7 +1972,7 @@ dependencies = [
[[package]]
name = "codex-agent-roles"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-config",
"codex-file-system",
@@ -1985,7 +1985,7 @@ dependencies = [
[[package]]
name = "codex-analytics"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-app-server-protocol",
"codex-git-utils",
@@ -2008,7 +2008,7 @@ dependencies = [
[[package]]
name = "codex-ansi-escape"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"ansi-to-tui",
"pretty_assertions",
@@ -2019,7 +2019,7 @@ dependencies = [
[[package]]
name = "codex-api"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"assert_matches",
@@ -2057,7 +2057,7 @@ dependencies = [
[[package]]
name = "codex-app-server"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"app_test_support",
@@ -2065,7 +2065,6 @@ dependencies = [
"base64 0.22.1",
"chrono",
"clap",
- "codex-agent-extension",
"codex-analytics",
"codex-app-server-daemon",
"codex-app-server-protocol",
@@ -2175,10 +2174,11 @@ dependencies = [
[[package]]
name = "codex-app-server-client"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-app-server",
"codex-app-server-protocol",
+ "codex-app-server-transport",
"codex-arg0",
"codex-config",
"codex-core",
@@ -2202,7 +2202,7 @@ dependencies = [
[[package]]
name = "codex-app-server-daemon"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"blake3",
@@ -2232,7 +2232,7 @@ dependencies = [
[[package]]
name = "codex-app-server-protocol"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-app-server-protocol-noop-macros",
@@ -2266,11 +2266,11 @@ dependencies = [
[[package]]
name = "codex-app-server-protocol-noop-macros"
-version = "0.0.0"
+version = "0.166.0"
[[package]]
name = "codex-app-server-test-client"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"clap",
@@ -2292,7 +2292,7 @@ dependencies = [
[[package]]
name = "codex-app-server-transport"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"axum",
"base64 0.22.1",
@@ -2335,7 +2335,7 @@ dependencies = [
[[package]]
name = "codex-apply-patch"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"assert_cmd",
@@ -2355,7 +2355,7 @@ dependencies = [
[[package]]
name = "codex-arg0"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-apply-patch",
@@ -2378,7 +2378,7 @@ dependencies = [
[[package]]
name = "codex-async-utils"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"pretty_assertions",
"rand 0.9.3",
@@ -2388,7 +2388,7 @@ dependencies = [
[[package]]
name = "codex-attachment-store"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"pretty_assertions",
"serde",
@@ -2398,7 +2398,7 @@ dependencies = [
[[package]]
name = "codex-aws-auth"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"aws-config",
"aws-credential-types",
@@ -2424,7 +2424,7 @@ dependencies = [
[[package]]
name = "codex-backend-client"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-api",
@@ -2444,7 +2444,7 @@ dependencies = [
[[package]]
name = "codex-backend-openapi-models"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"serde",
"serde_json",
@@ -2453,7 +2453,7 @@ dependencies = [
[[package]]
name = "codex-build-info"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-install-context",
"pretty_assertions",
@@ -2466,7 +2466,7 @@ dependencies = [
[[package]]
name = "codex-bwrap"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"cc",
"libc",
@@ -2475,7 +2475,7 @@ dependencies = [
[[package]]
name = "codex-chatgpt"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"clap",
@@ -2497,7 +2497,7 @@ dependencies = [
[[package]]
name = "codex-cli"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"app_test_support",
@@ -2513,7 +2513,6 @@ dependencies = [
"codex-app-server-protocol",
"codex-app-server-test-client",
"codex-arg0",
- "codex-aws-auth",
"codex-build-info",
"codex-chatgpt",
"codex-cloud-config",
@@ -2523,6 +2522,7 @@ dependencies = [
"codex-core-plugins",
"codex-exec",
"codex-exec-server",
+ "codex-exec-server-cli",
"codex-execpolicy",
"codex-extension-api",
"codex-features",
@@ -2570,7 +2570,6 @@ dependencies = [
"insta",
"jsonwebtoken",
"libc",
- "libsqlite3-sys",
"os_info",
"owo-colors",
"predicates",
@@ -2602,7 +2601,7 @@ dependencies = [
[[package]]
name = "codex-client"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-http-client",
"eventsource-stream",
@@ -2616,7 +2615,7 @@ dependencies = [
[[package]]
name = "codex-cloud-client"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"async-stream",
@@ -2640,7 +2639,7 @@ dependencies = [
[[package]]
name = "codex-cloud-config"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"chrono",
@@ -2668,7 +2667,7 @@ dependencies = [
[[package]]
name = "codex-cloud-tasks"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"chrono",
@@ -2701,7 +2700,7 @@ dependencies = [
[[package]]
name = "codex-cloud-tasks-client"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"chrono",
@@ -2716,7 +2715,7 @@ dependencies = [
[[package]]
name = "codex-cloud-tasks-mock-client"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"chrono",
"codex-cloud-tasks-client",
@@ -2725,7 +2724,7 @@ dependencies = [
[[package]]
name = "codex-code-mode"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-code-mode-protocol",
"codex-http-client",
@@ -2749,7 +2748,7 @@ dependencies = [
[[package]]
name = "codex-code-mode-host"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"axum",
@@ -2760,8 +2759,10 @@ dependencies = [
"codex-http-client",
"codex-otel",
"codex-otel-trace-websocket",
+ "codex-plugin-host",
"codex-protocol",
"codex-utils-cargo-bin",
+ "codex-utils-process",
"futures",
"pretty_assertions",
"prost",
@@ -2778,7 +2779,7 @@ dependencies = [
[[package]]
name = "codex-code-mode-protocol"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-protocol",
"glob",
@@ -2796,10 +2797,11 @@ dependencies = [
[[package]]
name = "codex-code-mode-runtime"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"codex-code-mode-protocol",
+ "codex-plugin-host",
"codex-protocol",
"deno_core_icudata",
"futures",
@@ -2814,11 +2816,11 @@ dependencies = [
[[package]]
name = "codex-collaboration-mode-templates"
-version = "0.0.0"
+version = "0.166.0"
[[package]]
name = "codex-config"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"base64 0.22.1",
@@ -2853,6 +2855,7 @@ dependencies = [
"serde_path_to_error",
"sha2 0.10.9",
"tempfile",
+ "test-case",
"thiserror 2.0.18",
"tokio",
"tokio-stream",
@@ -2871,7 +2874,7 @@ dependencies = [
[[package]]
name = "codex-config-schema"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"clap",
@@ -2880,7 +2883,7 @@ dependencies = [
[[package]]
name = "codex-connectors"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"arc-swap",
@@ -2902,7 +2905,7 @@ dependencies = [
[[package]]
name = "codex-connectors-extension"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-connectors",
"codex-core-plugins",
@@ -2916,7 +2919,7 @@ dependencies = [
[[package]]
name = "codex-context-fragments"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-protocol",
"codex-protocol-test-support",
@@ -2927,7 +2930,7 @@ dependencies = [
[[package]]
name = "codex-core"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"arc-swap",
@@ -2954,6 +2957,7 @@ dependencies = [
"codex-context-fragments",
"codex-core-plugins",
"codex-diagnostics",
+ "codex-direct-tool-timing",
"codex-exec-server",
"codex-exec-server-test-support",
"codex-execpolicy",
@@ -2989,6 +2993,7 @@ dependencies = [
"codex-rmcp-client",
"codex-rollout",
"codex-rollout-trace",
+ "codex-runtime-agent-instance",
"codex-sandboxing",
"codex-shell-command",
"codex-skills",
@@ -3002,6 +3007,7 @@ dependencies = [
"codex-utils-audio",
"codex-utils-cache",
"codex-utils-cargo-bin",
+ "codex-utils-critical-path",
"codex-utils-git-discovery",
"codex-utils-head-tail-buffer",
"codex-utils-home-dir",
@@ -3074,7 +3080,7 @@ dependencies = [
[[package]]
name = "codex-core-api"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-analytics",
"codex-app-server-protocol",
@@ -3097,7 +3103,7 @@ dependencies = [
[[package]]
name = "codex-core-plugin-common"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-utils-absolute-path",
"semver",
@@ -3108,7 +3114,7 @@ dependencies = [
[[package]]
name = "codex-core-plugins"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"chrono",
@@ -3165,7 +3171,7 @@ dependencies = [
[[package]]
name = "codex-diagnostics"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"libc",
"pretty_assertions",
@@ -3173,15 +3179,18 @@ dependencies = [
[[package]]
name = "codex-direct-tool-timing"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-utils-critical-path",
"pretty_assertions",
+ "test-case",
+ "tokio",
+ "tokio-util",
]
[[package]]
name = "codex-exec"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"assert_cmd",
@@ -3234,7 +3243,7 @@ dependencies = [
[[package]]
name = "codex-exec-server"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"arc-swap",
@@ -3277,6 +3286,7 @@ dependencies = [
"futures",
"http 1.4.0",
"libc",
+ "notify",
"opentelemetry",
"opentelemetry_sdk",
"pretty_assertions",
@@ -3304,9 +3314,49 @@ dependencies = [
"wiremock",
]
+[[package]]
+name = "codex-exec-server-cli"
+version = "0.166.0"
+dependencies = [
+ "anyhow",
+ "assert_matches",
+ "clap",
+ "codex-api",
+ "codex-app-server",
+ "codex-arg0",
+ "codex-aws-auth",
+ "codex-build-info",
+ "codex-cloud-config",
+ "codex-config",
+ "codex-core",
+ "codex-exec-server",
+ "codex-http-client",
+ "codex-login",
+ "codex-model-provider",
+ "codex-protocol",
+ "codex-sandboxing",
+ "codex-utils-absolute-path",
+ "codex-utils-cargo-bin",
+ "codex-utils-cli",
+ "codex-utils-process",
+ "codex-websocket-auth",
+ "http 1.4.0",
+ "insta",
+ "pretty_assertions",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "tikv-jemallocator",
+ "tokio",
+ "toml 0.9.11+spec-1.1.0",
+ "tracing",
+ "tracing-subscriber",
+ "url",
+]
+
[[package]]
name = "codex-exec-server-protocol"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"codex-file-system",
@@ -3324,7 +3374,7 @@ dependencies = [
[[package]]
name = "codex-exec-server-test-support"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-exec-server",
@@ -3339,7 +3389,7 @@ dependencies = [
[[package]]
name = "codex-execpolicy"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"clap",
@@ -3357,7 +3407,7 @@ dependencies = [
[[package]]
name = "codex-experimental-api-macros"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"proc-macro2",
"quote",
@@ -3366,7 +3416,7 @@ dependencies = [
[[package]]
name = "codex-extension-api"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-api",
"codex-config",
@@ -3389,7 +3439,7 @@ dependencies = [
[[package]]
name = "codex-extension-items"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-utils-absolute-path",
"pretty_assertions",
@@ -3401,7 +3451,7 @@ dependencies = [
[[package]]
name = "codex-external-agent-migration"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"chrono",
"codex-analytics",
@@ -3432,7 +3482,7 @@ dependencies = [
[[package]]
name = "codex-features"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-network-proxy",
"codex-protocol",
@@ -3446,7 +3496,7 @@ dependencies = [
[[package]]
name = "codex-feedback"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"bytes",
@@ -3474,7 +3524,7 @@ dependencies = [
[[package]]
name = "codex-file-search"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"clap",
@@ -3490,7 +3540,7 @@ dependencies = [
[[package]]
name = "codex-file-system"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"bytes",
"codex-protocol",
@@ -3504,7 +3554,7 @@ dependencies = [
[[package]]
name = "codex-file-watcher"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"notify",
"pretty_assertions",
@@ -3515,7 +3565,7 @@ dependencies = [
[[package]]
name = "codex-git-attribution"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-backend-client",
"codex-extension-api",
@@ -3528,7 +3578,7 @@ dependencies = [
[[package]]
name = "codex-git-utils"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"chrono",
@@ -3556,7 +3606,7 @@ dependencies = [
[[package]]
name = "codex-goal-extension"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"chrono",
@@ -3581,7 +3631,7 @@ dependencies = [
[[package]]
name = "codex-guardian-context"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-context-fragments",
"codex-history",
@@ -3595,21 +3645,32 @@ dependencies = [
[[package]]
name = "codex-guardian-reviewer"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-analytics",
+ "codex-context-fragments",
"codex-extension-api",
+ "codex-features",
"codex-feedback",
"codex-guardian-context",
+ "codex-history",
"codex-mcp",
+ "codex-models-manager",
"codex-otel",
"codex-prompts",
"codex-protocol",
+ "codex-protocol-test-support",
+ "codex-rmcp-client",
+ "codex-shell-command",
+ "codex-utils-output-truncation",
+ "codex-utils-path-uri",
+ "codex-utils-string",
"opentelemetry",
"opentelemetry_sdk",
"pretty_assertions",
"rand 0.9.3",
+ "rmcp",
"serde",
"serde_json",
"test-case",
@@ -3620,7 +3681,7 @@ dependencies = [
[[package]]
name = "codex-guardian-v2"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-analytics",
@@ -3659,7 +3720,7 @@ dependencies = [
[[package]]
name = "codex-guardian-v3"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-message-board",
"codex-protocol",
@@ -3668,7 +3729,7 @@ dependencies = [
[[package]]
name = "codex-history"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-protocol",
@@ -3680,7 +3741,7 @@ dependencies = [
[[package]]
name = "codex-history-notes-extension"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-analytics",
"codex-client",
@@ -3706,7 +3767,7 @@ dependencies = [
[[package]]
name = "codex-home"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-extension-api",
"codex-utils-absolute-path",
@@ -3718,7 +3779,7 @@ dependencies = [
[[package]]
name = "codex-hooks"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"async-channel",
@@ -3747,7 +3808,7 @@ dependencies = [
[[package]]
name = "codex-http-client"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"bytes",
"codex-utils-cargo-bin",
@@ -3787,7 +3848,7 @@ dependencies = [
[[package]]
name = "codex-image-generation-extension"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"codex-api",
@@ -3819,7 +3880,7 @@ dependencies = [
[[package]]
name = "codex-install-context"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-utils-absolute-path",
"codex-utils-home-dir",
@@ -3832,7 +3893,7 @@ dependencies = [
[[package]]
name = "codex-keyring-store"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"keyring",
"pretty_assertions",
@@ -3843,7 +3904,7 @@ dependencies = [
[[package]]
name = "codex-linux-sandbox"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"clap",
"codex-core",
@@ -3872,7 +3933,7 @@ dependencies = [
[[package]]
name = "codex-lmstudio"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-core",
"codex-http-client",
@@ -3886,7 +3947,7 @@ dependencies = [
[[package]]
name = "codex-login"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"base64 0.22.1",
@@ -3932,7 +3993,7 @@ dependencies = [
[[package]]
name = "codex-mcp"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"arc-swap",
@@ -3976,7 +4037,7 @@ dependencies = [
[[package]]
name = "codex-mcp-extension"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"axum",
@@ -4009,7 +4070,7 @@ dependencies = [
[[package]]
name = "codex-memories-extension"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-core",
"codex-extension-api",
@@ -4031,7 +4092,7 @@ dependencies = [
[[package]]
name = "codex-memories-read"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-protocol",
"codex-shell-command",
@@ -4041,7 +4102,7 @@ dependencies = [
[[package]]
name = "codex-memories-write"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"chrono",
@@ -4078,7 +4139,7 @@ dependencies = [
[[package]]
name = "codex-mermaid"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"insta",
"pretty_assertions",
@@ -4087,7 +4148,7 @@ dependencies = [
[[package]]
name = "codex-message-board"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"caseless",
@@ -4110,7 +4171,7 @@ dependencies = [
[[package]]
name = "codex-message-history"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-config",
"memchr",
@@ -4124,13 +4185,14 @@ dependencies = [
[[package]]
name = "codex-model-provider"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"chrono",
"codex-agent-identity",
"codex-api",
"codex-aws-auth",
+ "codex-features",
"codex-feedback",
"codex-http-client",
"codex-keyring-store",
@@ -4140,12 +4202,16 @@ dependencies = [
"codex-otel",
"codex-protocol",
"codex-response-debug-context",
+ "codex-runtime-agent-instance",
"codex-secrets",
"codex-utils-cargo-bin",
"codex-utils-process",
"codex-utils-redacted-string",
+ "codex-utils-rustls-provider",
"http 1.4.0",
"pretty_assertions",
+ "rcgen",
+ "rustls",
"serde",
"serde_json",
"sha2 0.10.9",
@@ -4158,7 +4224,7 @@ dependencies = [
[[package]]
name = "codex-model-provider-info"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-client",
"codex-http-client",
@@ -4176,7 +4242,7 @@ dependencies = [
[[package]]
name = "codex-models-manager"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"chrono",
"codex-http-client",
@@ -4195,7 +4261,7 @@ dependencies = [
[[package]]
name = "codex-multi-env-copy-file"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-config",
@@ -4221,7 +4287,7 @@ dependencies = [
[[package]]
name = "codex-mxc-sandbox"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-network-proxy",
@@ -4242,7 +4308,7 @@ dependencies = [
[[package]]
name = "codex-network-proxy"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"aws-credential-types",
@@ -4293,7 +4359,7 @@ dependencies = [
[[package]]
name = "codex-ollama"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"assert_matches",
"async-stream",
@@ -4313,7 +4379,7 @@ dependencies = [
[[package]]
name = "codex-otel"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"bytes",
"chrono",
@@ -4335,11 +4401,13 @@ dependencies = [
"opentelemetry_sdk",
"os_info",
"pretty_assertions",
+ "rcgen",
"reqwest 0.12.28",
"seccompiler",
"serde",
"serde_json",
"strum_macros 0.28.0",
+ "tempfile",
"thiserror 2.0.18",
"tokio",
"tokio-tungstenite",
@@ -4350,7 +4418,7 @@ dependencies = [
[[package]]
name = "codex-otel-trace-websocket"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"axum",
@@ -4361,7 +4429,7 @@ dependencies = [
[[package]]
name = "codex-plugin"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-config",
"codex-core-plugin-common",
@@ -4374,9 +4442,26 @@ dependencies = [
"thiserror 2.0.18",
]
+[[package]]
+name = "codex-plugin-host"
+version = "0.166.0"
+dependencies = [
+ "codex-utils-cargo-bin",
+ "codex-utils-process",
+ "codex-utils-pty",
+ "futures",
+ "libc",
+ "pretty_assertions",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "tokio",
+ "tokio-util",
+]
+
[[package]]
name = "codex-process-hardening"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"libc",
"pretty_assertions",
@@ -4384,7 +4469,7 @@ dependencies = [
[[package]]
name = "codex-prompts"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-collaboration-mode-templates",
@@ -4402,7 +4487,7 @@ dependencies = [
[[package]]
name = "codex-protocol"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"chardetng",
@@ -4448,14 +4533,14 @@ dependencies = [
[[package]]
name = "codex-protocol-test-support"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-protocol",
]
[[package]]
name = "codex-queue-extension"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-core",
@@ -4476,7 +4561,7 @@ dependencies = [
[[package]]
name = "codex-realtime-webrtc"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-build-info",
@@ -4495,7 +4580,7 @@ dependencies = [
[[package]]
name = "codex-response-debug-context"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"codex-api",
@@ -4506,7 +4591,7 @@ dependencies = [
[[package]]
name = "codex-responses-api-proxy"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"bytes",
@@ -4530,7 +4615,7 @@ dependencies = [
[[package]]
name = "codex-rmcp-client"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"axum",
@@ -4581,7 +4666,7 @@ dependencies = [
[[package]]
name = "codex-rollout"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"chrono",
@@ -4614,7 +4699,7 @@ dependencies = [
[[package]]
name = "codex-rollout-trace"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-code-mode",
@@ -4631,7 +4716,7 @@ dependencies = [
[[package]]
name = "codex-runtime-agent-instance"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"codex-agent-identity",
@@ -4657,7 +4742,7 @@ dependencies = [
[[package]]
name = "codex-sandboxing"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-mxc-sandbox",
@@ -4685,7 +4770,7 @@ dependencies = [
[[package]]
name = "codex-secrets"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"age",
"anyhow",
@@ -4706,7 +4791,7 @@ dependencies = [
[[package]]
name = "codex-shell-command"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"base64 0.22.1",
@@ -4729,7 +4814,7 @@ dependencies = [
[[package]]
name = "codex-skills"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-protocol",
"codex-shell-command",
@@ -4746,7 +4831,7 @@ dependencies = [
[[package]]
name = "codex-skills-extension"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"assert_matches",
"blake3",
@@ -4786,7 +4871,7 @@ dependencies = [
[[package]]
name = "codex-state"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"chrono",
@@ -4806,6 +4891,7 @@ dependencies = [
"sqlx-macros",
"sqlx-sqlite",
"strum 0.27.2",
+ "tempfile",
"tokio",
"tracing",
"tracing-subscriber",
@@ -4814,7 +4900,7 @@ dependencies = [
[[package]]
name = "codex-stdio-to-uds"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-uds",
@@ -4826,7 +4912,7 @@ dependencies = [
[[package]]
name = "codex-tcp-tunnel"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"bytes",
@@ -4847,7 +4933,7 @@ dependencies = [
[[package]]
name = "codex-terminal-detection"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"pretty_assertions",
"tracing",
@@ -4855,7 +4941,7 @@ dependencies = [
[[package]]
name = "codex-test-binary-support"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-arg0",
"tempfile",
@@ -4863,7 +4949,7 @@ dependencies = [
[[package]]
name = "codex-thread-manager-sample"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"clap",
@@ -4874,7 +4960,7 @@ dependencies = [
[[package]]
name = "codex-thread-store"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"chrono",
"codex-app-server-protocol",
@@ -4905,7 +4991,7 @@ dependencies = [
[[package]]
name = "codex-tools"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"bitflags 2.13.1",
"codex-attachment-store",
@@ -4931,7 +5017,7 @@ dependencies = [
[[package]]
name = "codex-tui"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"app_test_support",
@@ -5059,7 +5145,7 @@ dependencies = [
[[package]]
name = "codex-uds"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"async-io",
"libc",
@@ -5073,7 +5159,7 @@ dependencies = [
[[package]]
name = "codex-user-verification"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"block2",
@@ -5094,7 +5180,7 @@ dependencies = [
[[package]]
name = "codex-utils-absolute-path"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"dirs",
"dunce",
@@ -5108,14 +5194,14 @@ dependencies = [
[[package]]
name = "codex-utils-approval-presets"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-protocol",
]
[[package]]
name = "codex-utils-audio"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"codex-protocol",
@@ -5129,7 +5215,7 @@ dependencies = [
[[package]]
name = "codex-utils-cache"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"lru",
"sha1 0.10.6",
@@ -5138,7 +5224,7 @@ dependencies = [
[[package]]
name = "codex-utils-cargo-bin"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"assert_cmd",
"runfiles",
@@ -5147,7 +5233,7 @@ dependencies = [
[[package]]
name = "codex-utils-cli"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"clap",
"codex-protocol",
@@ -5159,22 +5245,22 @@ dependencies = [
[[package]]
name = "codex-utils-critical-path"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"pretty_assertions",
]
[[package]]
name = "codex-utils-elapsed"
-version = "0.0.0"
+version = "0.166.0"
[[package]]
name = "codex-utils-fuzzy-match"
-version = "0.0.0"
+version = "0.166.0"
[[package]]
name = "codex-utils-git-discovery"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-git-utils",
"codex-utils-absolute-path",
@@ -5187,14 +5273,14 @@ dependencies = [
[[package]]
name = "codex-utils-head-tail-buffer"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"pretty_assertions",
]
[[package]]
name = "codex-utils-home-dir"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-utils-absolute-path",
"dirs",
@@ -5204,7 +5290,7 @@ dependencies = [
[[package]]
name = "codex-utils-image"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"codex-utils-cache",
@@ -5218,7 +5304,7 @@ dependencies = [
[[package]]
name = "codex-utils-json-to-toml"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"pretty_assertions",
"serde_json",
@@ -5227,7 +5313,7 @@ dependencies = [
[[package]]
name = "codex-utils-oss"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-core",
"codex-lmstudio",
@@ -5237,7 +5323,7 @@ dependencies = [
[[package]]
name = "codex-utils-output-truncation"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-protocol",
"codex-utils-string",
@@ -5247,7 +5333,7 @@ dependencies = [
[[package]]
name = "codex-utils-path"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-utils-absolute-path",
"dunce",
@@ -5258,7 +5344,7 @@ dependencies = [
[[package]]
name = "codex-utils-path-uri"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"base64 0.22.1",
"codex-utils-absolute-path",
@@ -5274,7 +5360,7 @@ dependencies = [
[[package]]
name = "codex-utils-plugins"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-exec-server",
"codex-exec-server-protocol",
@@ -5288,7 +5374,7 @@ dependencies = [
[[package]]
name = "codex-utils-process"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"pretty_assertions",
"tokio",
@@ -5296,7 +5382,7 @@ dependencies = [
[[package]]
name = "codex-utils-pty"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-utils-cargo-bin",
@@ -5315,7 +5401,7 @@ dependencies = [
[[package]]
name = "codex-utils-readiness"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"assert_matches",
"thiserror 2.0.18",
@@ -5325,7 +5411,7 @@ dependencies = [
[[package]]
name = "codex-utils-redacted-string"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"schemars 0.8.22",
"serde",
@@ -5333,14 +5419,14 @@ dependencies = [
[[package]]
name = "codex-utils-rustls-provider"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"rustls",
]
[[package]]
name = "codex-utils-sandbox-summary"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-protocol",
"codex-utils-absolute-path",
@@ -5350,7 +5436,7 @@ dependencies = [
[[package]]
name = "codex-utils-sleep-inhibitor"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"core-foundation 0.9.4",
"libc",
@@ -5360,14 +5446,14 @@ dependencies = [
[[package]]
name = "codex-utils-stream-parser"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"pretty_assertions",
]
[[package]]
name = "codex-utils-string"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"pretty_assertions",
"regex-lite",
@@ -5377,14 +5463,14 @@ dependencies = [
[[package]]
name = "codex-utils-template"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"pretty_assertions",
]
[[package]]
name = "codex-v8-poc"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"pretty_assertions",
"v8",
@@ -5392,7 +5478,7 @@ dependencies = [
[[package]]
name = "codex-voice-host"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-install-context",
@@ -5419,7 +5505,7 @@ dependencies = [
[[package]]
name = "codex-web-search-extension"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-api",
"codex-core",
@@ -5441,7 +5527,7 @@ dependencies = [
[[package]]
name = "codex-websocket-auth"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"base64 0.22.1",
@@ -5460,7 +5546,7 @@ dependencies = [
[[package]]
name = "codex-websocket-client"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-http-client",
"codex-utils-rustls-provider",
@@ -5476,7 +5562,7 @@ dependencies = [
[[package]]
name = "codex-windows-sandbox"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"base64 0.22.1",
@@ -5506,7 +5592,7 @@ dependencies = [
[[package]]
name = "codex-windows-sandbox-service"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-cloud-config",
@@ -5524,14 +5610,14 @@ dependencies = [
[[package]]
name = "codex-windows-sandbox-test-support"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"dirs",
]
[[package]]
name = "codex-workload-identity"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"codex-http-client",
"pretty_assertions",
@@ -5546,7 +5632,7 @@ dependencies = [
[[package]]
name = "codex-worktree"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"codex-git-utils",
@@ -5799,7 +5885,7 @@ dependencies = [
[[package]]
name = "core_test_support"
-version = "0.0.0"
+version = "0.166.0"
dependencies = [
"anyhow",
"assert_cmd",
@@ -9987,9 +10073,9 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.1.29"
+version = "1.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bc9657773828b90eeb625adff10eeac83cc21bbfd8e23a03eaa8a33c9e28d9"
+checksum = "ff20308ecabd635a2dc1dd5834a86c462cca20efba1d5d3ddab1f8aea3455cb2"
dependencies = [
"cc",
"libc",
@@ -15925,6 +16011,7 @@ dependencies = [
"tower-layer",
"tower-service",
"tracing",
+ "zstd",
]
[[package]]
@@ -16523,8 +16610,7 @@ dependencies = [
[[package]]
name = "v8"
version = "152.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a10fe1a92da5c32c7c7f838ce36c0ccfcfd5edf0865b58bdde820aa64cea9888"
+source = "git+https://github.com/seanh-oai/rusty_v8.git?rev=350c5a859a9b3c84ab8701b3ad51e3b7699b30c0#350c5a859a9b3c84ab8701b3ad51e3b7699b30c0"
dependencies = [
"bindgen",
"bitflags 2.13.1",
diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml
index d7bd76b11c5a..85cd80b7c453 100644
--- a/codex-rs/Cargo.toml
+++ b/codex-rs/Cargo.toml
@@ -30,6 +30,7 @@ members = [
"code-mode-host",
"code-mode-protocol",
"code-mode-runtime",
+ "plugin-host",
"codex-home",
"cloud-config",
"cloud-tasks",
@@ -58,6 +59,7 @@ members = [
"file-system",
"exec-server-protocol",
"exec-server",
+ "exec-server-cli",
"exec-server/tests/support",
"execpolicy",
"ext/agent",
@@ -167,7 +169,7 @@ members = [
resolver = "2"
[workspace.package]
-version = "0.0.0"
+version = "0.166.0"
# Track the edition for all workspace crates in one place. Individual
# crates can still override this value, but keeping it here means new
# crates created with `cargo new -w ...` automatically inherit the 2024
@@ -208,13 +210,13 @@ codex-cloud-tasks-mock-client = { path = "cloud-tasks-mock-client" }
codex-code-mode = { path = "code-mode" }
codex-code-mode-protocol = { path = "code-mode-protocol" }
codex-code-mode-runtime = { path = "code-mode-runtime" }
+codex-plugin-host = { path = "plugin-host" }
codex-home = { path = "codex-home" }
codex-http-client = { path = "http-client" }
codex-websocket-auth = { path = "websocket-auth" }
codex-websocket-client = { path = "websocket-client" }
codex-config = { path = "config" }
codex-connectors = { path = "connectors" }
-codex-agent-extension = { path = "ext/agent" }
codex-agent-message-board-client = { path = "agent-message-board-client" }
codex-agent-message-board-extension = { path = "ext/agent-message-board" }
codex-message-board = { path = "message-board" }
@@ -225,10 +227,12 @@ codex-core-api = { path = "core-api" }
codex-core-plugin-common = { path = "core-plugin-common" }
codex-core-plugins = { path = "core-plugins" }
codex-diagnostics = { path = "diagnostics" }
+codex-direct-tool-timing = { path = "direct-tool-timing" }
codex-exec = { path = "exec" }
codex-file-system = { path = "file-system" }
codex-exec-server-protocol = { path = "exec-server-protocol" }
codex-exec-server = { path = "exec-server" }
+codex-exec-server-cli = { path = "exec-server-cli" }
codex-exec-server-test-support = { path = "exec-server/tests/support" }
codex-execpolicy = { path = "execpolicy" }
codex-extension-api = { path = "ext/extension-api" }
@@ -282,6 +286,7 @@ codex-response-debug-context = { path = "response-debug-context" }
codex-rmcp-client = { path = "rmcp-client" }
codex-rollout = { path = "rollout" }
codex-rollout-trace = { path = "rollout-trace" }
+codex-runtime-agent-instance = { path = "runtime-agent-instance" }
codex-sandboxing = { path = "sandboxing" }
codex-secrets = { path = "secrets" }
codex-shell-command = { path = "shell-command" }
@@ -668,6 +673,7 @@ opt-level = 0
crossterm = { git = "https://github.com/openai-oss-forks/crossterm", rev = "ed1cdab335221515706178d68495bba2aed1924f" }
tokio-tungstenite = { git = "https://github.com/openai-oss-forks/tokio-tungstenite", rev = "0e5b2d73aa18dd9f0a50ee9ff199d5aef7594186" }
tungstenite = { git = "https://github.com/openai-oss-forks/tungstenite-rs", rev = "4fffad30fe373adbdcffab9545e9e9bf4f2fc19f" }
+v8 = { git = "https://github.com/seanh-oai/rusty_v8.git", rev = "350c5a859a9b3c84ab8701b3ad51e3b7699b30c0" }
# Uncomment to debug local changes.
# rmcp = { path = "../../rust-sdk/crates/rmcp" }
diff --git a/codex-rs/agent-identity/src/lib.rs b/codex-rs/agent-identity/src/lib.rs
index 30f2b8a2eba5..14a9e3519011 100644
--- a/codex-rs/agent-identity/src/lib.rs
+++ b/codex-rs/agent-identity/src/lib.rs
@@ -564,6 +564,7 @@ fn signing_key_from_private_key_pkcs8_base64(private_key_pkcs8_base64: &str) ->
#[cfg(test)]
mod tests {
+ use base64::Engine as _;
use ed25519_dalek::Signature;
use ed25519_dalek::Verifier as _;
use jsonwebtoken::EncodingKey;
diff --git a/codex-rs/analytics/src/client.rs b/codex-rs/analytics/src/client.rs
index aef8abef1324..0c54d0167a94 100644
--- a/codex-rs/analytics/src/client.rs
+++ b/codex-rs/analytics/src/client.rs
@@ -65,6 +65,7 @@ use codex_app_server_protocol::TurnStatus;
use codex_app_server_protocol::item_event_to_server_notification;
use codex_login::AuthManager;
use codex_login::CodexAuth;
+use codex_model_provider::ChatgptBaseUrl;
use codex_plugin::PluginId;
use codex_plugin::PluginTelemetryMetadata;
use codex_protocol::ThreadId;
@@ -116,7 +117,7 @@ pub struct AnalyticsEventsClient {
#[derive(Clone, Debug, Eq, PartialEq)]
enum AnalyticsEventsDestination {
Http {
- url: String,
+ base_url: ChatgptBaseUrl,
},
#[cfg(debug_assertions)]
CaptureFile {
@@ -125,12 +126,15 @@ enum AnalyticsEventsDestination {
}
impl AnalyticsEventsDestination {
- fn from_base_url(base_url: String) -> Self {
+ fn from_base_url(base_url: ChatgptBaseUrl) -> Self {
let capture_file = analytics_capture_file_from_env();
Self::from_base_url_and_capture_file(base_url, capture_file)
}
- fn from_base_url_and_capture_file(base_url: String, capture_file: Option) -> Self {
+ fn from_base_url_and_capture_file(
+ base_url: ChatgptBaseUrl,
+ capture_file: Option,
+ ) -> Self {
#[cfg(debug_assertions)]
if let Some(path) = capture_file {
if let Err(err) = crate::analytics_capture::initialize(&path) {
@@ -149,9 +153,17 @@ impl AnalyticsEventsDestination {
#[cfg(not(debug_assertions))]
let _ = capture_file;
- let base_url = base_url.trim_end_matches('/');
- Self::Http {
- url: format!("{base_url}/codex/analytics-events/events"),
+ Self::Http { base_url }
+ }
+
+ fn url_for_auth(&self, auth: &CodexAuth) -> Option {
+ match self {
+ Self::Http { base_url } => {
+ let base_url = base_url.resolve(auth).trim_end_matches('/');
+ Some(format!("{base_url}/codex/analytics-events/events"))
+ }
+ #[cfg(debug_assertions)]
+ Self::CaptureFile { .. } => None,
}
}
}
@@ -313,10 +325,10 @@ impl AnalyticsEventsClient {
pub fn new(
auth_manager: Arc,
- base_url: String,
+ base_url: impl Into,
analytics_enabled: Option,
) -> Self {
- let destination = AnalyticsEventsDestination::from_base_url(base_url);
+ let destination = AnalyticsEventsDestination::from_base_url(base_url.into());
Self {
queue: (analytics_enabled != Some(false))
.then(|| AnalyticsEventsQueue::new(Arc::clone(&auth_manager), destination)),
@@ -436,22 +448,29 @@ impl AnalyticsEventsClient {
completed_at_ms: i64,
) {
let thread_id = item.sender_thread_id.to_string();
- let completed_item = TurnItem::CollabAgentToolCall(item.clone()).into();
+ let completed_item = codex_app_server_protocol::ThreadItemPayload::from(
+ TurnItem::CollabAgentToolCall(item.clone()),
+ );
item.status = CollabAgentToolCallStatus::InProgress;
- self.track_notification(&ServerNotification::ItemStarted(ItemStartedNotification {
- item: TurnItem::CollabAgentToolCall(item).into(),
- thread_id: thread_id.clone(),
- turn_id: turn_id.clone(),
- started_at_ms,
- }));
+ self.track_notification(&ServerNotification::ItemStarted(
+ ItemStartedNotification::new(
+ thread_id.clone(),
+ turn_id.clone(),
+ codex_app_server_protocol::ThreadItemPayload::from(TurnItem::CollabAgentToolCall(
+ item,
+ )),
+ started_at_ms,
+ ),
+ ));
self.track_notification(&ServerNotification::ItemCompleted(
- ItemCompletedNotification {
- item: completed_item,
+ ItemCompletedNotification::new(
thread_id,
turn_id,
+ completed_item,
+ Some(started_at_ms),
completed_at_ms,
- },
+ ),
));
}
@@ -935,7 +954,7 @@ fn session_event_to_analytics_notification(
match ¬ification {
ServerNotification::ItemStarted(ItemStartedNotification { item, .. })
| ServerNotification::ItemCompleted(ItemCompletedNotification { item, .. }) => {
- tracked_tool_item_id(item)?;
+ tracked_tool_item_id(&item.payload)?;
}
_ => {}
}
@@ -1050,10 +1069,8 @@ async fn send_track_events_request(
return;
}
- let url = match destination {
- AnalyticsEventsDestination::Http { url } => url,
- #[cfg(debug_assertions)]
- AnalyticsEventsDestination::CaptureFile { .. } => return,
+ let Some(url) = destination.url_for_auth(auth) else {
+ return;
};
let headers = match codex_model_provider::auth_provider_from_auth(auth).to_auth_headers() {
Ok(headers) => headers,
@@ -1077,7 +1094,7 @@ async fn send_track_events_request(
}
};
let mut request = client
- .post(url)
+ .post(&url)
.timeout(ANALYTICS_EVENTS_TIMEOUT)
.headers(headers)
.header("Content-Type", "application/json")
diff --git a/codex-rs/analytics/src/client_product_tests.rs b/codex-rs/analytics/src/client_product_tests.rs
index 029dea7fd103..39c50f73ce75 100644
--- a/codex-rs/analytics/src/client_product_tests.rs
+++ b/codex-rs/analytics/src/client_product_tests.rs
@@ -22,7 +22,7 @@ use codex_app_server_protocol::ItemCompletedNotification;
use codex_app_server_protocol::ItemStartedNotification;
use codex_app_server_protocol::RequestId;
use codex_app_server_protocol::ServerNotification;
-use codex_app_server_protocol::ThreadItem;
+use codex_app_server_protocol::ThreadItemPayload;
use codex_app_server_protocol::TurnStartedNotification;
use codex_login::AuthManager;
use codex_protocol::ThreadId;
@@ -89,7 +89,7 @@ async fn capture_requests(
) {
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let destination = AnalyticsEventsDestination::Http {
- url: format!("http://{}/events", listener.local_addr().unwrap()),
+ base_url: format!("http://{}", listener.local_addr().unwrap()).into(),
};
let (paused_tx, paused_rx) = tokio::sync::oneshot::channel();
let (resume_tx, resume_rx) = tokio::sync::oneshot::channel();
@@ -238,11 +238,10 @@ async fn buffered_tool_events_preserve_attribution_or_drop_it_on_queue_overflow(
turn: started.turn,
}));
// Collaborator completions wait in the reducer for subsequent sampling evidence.
- let completed = ItemCompletedNotification {
- thread_id: thread_id.to_string(),
- turn_id: "turn-1".to_string(),
- completed_at_ms: 2,
- item: ThreadItem::CollabAgentToolCall {
+ let completed = ItemCompletedNotification::new(
+ thread_id.to_string(),
+ "turn-1".to_string(),
+ ThreadItemPayload::CollabAgentToolCall {
id: "item".to_string(),
tool: CollabAgentTool::SendMessage,
status: CollabAgentToolCallStatus::Failed,
@@ -253,13 +252,17 @@ async fn buffered_tool_events_preserve_attribution_or_drop_it_on_queue_overflow(
reasoning_effort: None,
agents_states: Default::default(),
},
- };
- client.track_notification(&ServerNotification::ItemStarted(ItemStartedNotification {
- thread_id: thread_id.to_string(),
- turn_id: "turn-1".to_string(),
- started_at_ms: 1,
- item: completed.item.clone(),
- }));
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 2,
+ );
+ client.track_notification(&ServerNotification::ItemStarted(
+ ItemStartedNotification::new(
+ thread_id.to_string(),
+ "turn-1".to_string(),
+ completed.item.payload.clone(),
+ /*started_at_ms*/ 1,
+ ),
+ ));
client.track_notification(&ServerNotification::ItemCompleted(completed));
let measurement = PluginMeasurementsInput {
thread_id: thread_id.to_string(),
diff --git a/codex-rs/analytics/src/client_tests.rs b/codex-rs/analytics/src/client_tests.rs
index e28a38e503a9..d7d8ff637e6a 100644
--- a/codex-rs/analytics/src/client_tests.rs
+++ b/codex-rs/analytics/src/client_tests.rs
@@ -95,6 +95,7 @@ use codex_http_client::HttpClientFactory;
use codex_http_client::OutboundProxyPolicy;
#[cfg(debug_assertions)]
use codex_login::AuthManager;
+use codex_model_provider::ChatgptBaseUrl;
use codex_protocol::protocol::RealtimeConversationVersion;
use codex_utils_absolute_path::test_support::PathBufExt;
use codex_utils_absolute_path::test_support::test_path_buf;
@@ -308,7 +309,7 @@ fn client_with_receiver() -> (
fn analytics_destination_uses_explicit_capture_file() {
let capture_path = unique_capture_path("destination");
let destination = AnalyticsEventsDestination::from_base_url_and_capture_file(
- "https://chatgpt.com/backend-api/".to_string(),
+ "https://chatgpt.com/backend-api/".into(),
Some(capture_path.clone()),
);
@@ -337,31 +338,53 @@ fn analytics_destination_uses_explicit_capture_file() {
#[test]
fn analytics_destination_uses_http_without_capture_file() {
- let destination = AnalyticsEventsDestination::from_base_url_and_capture_file(
- "https://chatgpt.com/backend-api/".to_string(),
- /*capture_file*/ None,
- );
-
- assert_eq!(
- destination,
- AnalyticsEventsDestination::Http {
- url: "https://chatgpt.com/backend-api/codex/analytics-events/events".to_string()
+ let commercial_url = "https://chatgpt.com/backend-api/codex/analytics-events/events";
+ let gov_url = "https://gov.chatgpt.com/backend-api/codex/analytics-events/events";
+ for (base_url, expected_urls) in [
+ (
+ ChatgptBaseUrl::Default,
+ [commercial_url, gov_url, commercial_url],
+ ),
+ (
+ ChatgptBaseUrl::from("https://chatgpt.com/backend-api/"),
+ [commercial_url; 3],
+ ),
+ (
+ ChatgptBaseUrl::from("https://proxy.example/backend-api/"),
+ ["https://proxy.example/backend-api/codex/analytics-events/events"; 3],
+ ),
+ ] {
+ let destination = AnalyticsEventsDestination::from_base_url_and_capture_file(
+ base_url.clone(),
+ /*capture_file*/ None,
+ );
+ assert_eq!(destination, AnalyticsEventsDestination::Http { base_url });
+
+ for (api_key, expected_url) in ["sk-test", "sk-proj-fedramp-test", "sk-test"]
+ .into_iter()
+ .zip(expected_urls)
+ {
+ let auth = codex_login::CodexAuth::from_api_key(api_key);
+ assert_eq!(
+ destination.url_for_auth(&auth).as_deref(),
+ Some(expected_url)
+ );
}
- );
+ }
}
#[test]
#[cfg(not(debug_assertions))]
fn analytics_destination_ignores_capture_file_in_release() {
let destination = AnalyticsEventsDestination::from_base_url_and_capture_file(
- "https://chatgpt.com/backend-api/".to_string(),
+ "https://chatgpt.com/backend-api/".into(),
Some(std::path::PathBuf::from("ignored.jsonl")),
);
assert_eq!(
destination,
AnalyticsEventsDestination::Http {
- url: "https://chatgpt.com/backend-api/codex/analytics-events/events".to_string()
+ base_url: "https://chatgpt.com/backend-api/".into()
}
);
}
@@ -1172,7 +1195,7 @@ async fn account_switch_between_batches_does_not_send_old_credentials() {
assert!(controller.publish(policy.revision(), DestinationPolicy::Unrestricted));
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
let destination = AnalyticsEventsDestination::Http {
- url: format!("http://{}/events", listener.local_addr().unwrap()),
+ base_url: format!("http://{}", listener.local_addr().unwrap()).into(),
};
let requests = Arc::new(Mutex::new(Vec::new()));
let captured = Arc::clone(&requests);
diff --git a/codex-rs/analytics/src/events.rs b/codex-rs/analytics/src/events.rs
index cb0aacff8dcc..0cd0f66ad5fd 100644
--- a/codex-rs/analytics/src/events.rs
+++ b/codex-rs/analytics/src/events.rs
@@ -85,6 +85,7 @@ pub(crate) enum TrackEventRequest {
CommandExecution(CodexCommandExecutionEventRequest),
PluginMeasurement(CodexPluginMeasurementEventRequest),
FileChange(CodexFileChangeEventRequest),
+ CuaToolCallStarted(CodexCuaToolCallStartedEventRequest),
McpToolCall(CodexMcpToolCallEventRequest),
DynamicToolCall(CodexDynamicToolCallEventRequest),
ControlToolCall(CodexControlToolCallEventRequest),
@@ -167,6 +168,7 @@ impl TrackEventRequest {
match self {
Self::PluginUsed(event) => event.event_params.plugin.plugin_id.is_some(),
Self::SkillInvocation(event) => event.event_params.plugin_id.is_some(),
+ Self::CuaToolCallStarted(event) => event.event_params.plugin_id.is_some(),
Self::McpToolCall(event) => event.event_params.plugin_id.is_some(),
Self::ArtifactOperation(event) => !event.event_params.plugin_id.is_empty(),
Self::PluginMeasurement(event) => !event.event_params.plugin_id.is_empty(),
@@ -367,6 +369,7 @@ impl From<&AdditionalPermissionProfile> for GuardianAdditionalPermissions {
#[derive(Clone, Debug, Serialize)]
#[serde(tag = "type", rename_all = "snake_case")]
pub enum GuardianReviewedAction {
+ NativeToolCall {},
Shell {
sandbox_permissions: SandboxPermissions,
additional_permissions: Option,
@@ -714,6 +717,35 @@ pub(crate) struct CodexToolItemEventBase {
pub(crate) requested_network_access: bool,
}
+#[derive(Serialize)]
+pub(crate) struct CodexCuaToolCallStartedEventParams {
+ pub(crate) thread_id: String,
+ pub(crate) session_id: String,
+ pub(crate) turn_id: String,
+ pub(crate) root_turn_id: Option,
+ pub(crate) item_id: String,
+ pub(crate) cell_id: Option,
+ pub(crate) parent_call_id: Option,
+ pub(crate) originating_response_id: Option,
+ pub(crate) app_server_client: CodexAppServerClientMetadata,
+ pub(crate) runtime: CodexRuntimeMetadata,
+ pub(crate) thread_source: Option,
+ pub(crate) subagent_source: Option,
+ pub(crate) parent_thread_id: Option,
+ pub(crate) tool_event_type: Option,
+ pub(crate) started_at_ms: u64,
+ pub(crate) mcp_server_name: String,
+ pub(crate) mcp_tool_name: String,
+ pub(crate) plugin_id: Option,
+ pub(crate) connector_id: Option,
+}
+
+#[derive(Serialize)]
+pub(crate) struct CodexCuaToolCallStartedEventRequest {
+ pub(crate) event_type: &'static str,
+ pub(crate) event_params: CodexCuaToolCallStartedEventParams,
+}
+
#[allow(dead_code)]
#[derive(Clone, Copy, Debug, Serialize)]
#[serde(rename_all = "snake_case")]
@@ -1079,6 +1111,8 @@ pub(crate) struct CodexGoalEventRequest {
#[derive(Serialize)]
pub(crate) struct CodexTurnEventParams {
+ #[serde(flatten)]
+ pub(crate) critical_path: crate::turn_critical_path::CriticalPathEventParams,
pub(crate) thread_id: String,
pub(crate) session_id: String,
pub(crate) turn_id: String,
diff --git a/codex-rs/analytics/src/facts.rs b/codex-rs/analytics/src/facts.rs
index 9189babd9f1b..68d055c80fca 100644
--- a/codex-rs/analytics/src/facts.rs
+++ b/codex-rs/analytics/src/facts.rs
@@ -246,6 +246,7 @@ pub struct TurnTokenUsageFact {
#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
pub struct TurnProfile {
+ pub critical_path: crate::TurnCriticalPath,
pub before_first_sampling_ms: u64,
pub sampling_ms: u64,
pub compaction_ms: u64,
diff --git a/codex-rs/analytics/src/lib.rs b/codex-rs/analytics/src/lib.rs
index 6160dd704a0a..15a1d4fd0bbf 100644
--- a/codex-rs/analytics/src/lib.rs
+++ b/codex-rs/analytics/src/lib.rs
@@ -8,6 +8,7 @@ mod guardian_v2;
mod product_attribution;
mod reducer;
mod thread_hint;
+mod turn_critical_path;
use std::time::SystemTime;
use std::time::UNIX_EPOCH;
@@ -82,6 +83,8 @@ pub use guardian_v2::GuardianV2EventKind;
pub use product_attribution::ThreadProductUpdate;
pub use thread_hint::ThreadHintStatus;
pub use thread_hint::ThreadHintStatusEvent;
+pub use turn_critical_path::TurnCriticalPath;
+pub use turn_critical_path::TurnCriticalPathDurations;
#[cfg(test)]
mod tests;
diff --git a/codex-rs/analytics/src/product_attribution.rs b/codex-rs/analytics/src/product_attribution.rs
index 4fa872102e68..da5958f35d52 100644
--- a/codex-rs/analytics/src/product_attribution.rs
+++ b/codex-rs/analytics/src/product_attribution.rs
@@ -88,6 +88,7 @@ fn event_thread_id(event: &TrackEventRequest) -> Option<&str> {
TrackEventRequest::CommandExecution(event) => Some(&event.event_params.base.thread_id),
TrackEventRequest::PluginMeasurement(event) => Some(&event.event_params.thread_id),
TrackEventRequest::FileChange(event) => Some(&event.event_params.base.thread_id),
+ TrackEventRequest::CuaToolCallStarted(event) => Some(&event.event_params.thread_id),
TrackEventRequest::McpToolCall(event) => Some(&event.event_params.base.thread_id),
TrackEventRequest::DynamicToolCall(event) => Some(&event.event_params.base.thread_id),
TrackEventRequest::ControlToolCall(event) => Some(&event.event_params.base.thread_id),
diff --git a/codex-rs/analytics/src/reducer.rs b/codex-rs/analytics/src/reducer.rs
index 0bebe6771d3f..d0707e36c34d 100644
--- a/codex-rs/analytics/src/reducer.rs
+++ b/codex-rs/analytics/src/reducer.rs
@@ -14,6 +14,8 @@ use crate::events::CodexCommandExecutionEventRequest;
use crate::events::CodexCompactionEventRequest;
use crate::events::CodexControlToolCallEventParams;
use crate::events::CodexControlToolCallEventRequest;
+use crate::events::CodexCuaToolCallStartedEventParams;
+use crate::events::CodexCuaToolCallStartedEventRequest;
use crate::events::CodexDynamicToolCallEventParams;
use crate::events::CodexDynamicToolCallEventRequest;
use crate::events::CodexFileChangeEventParams;
@@ -152,7 +154,7 @@ use codex_app_server_protocol::ServerNotification;
use codex_app_server_protocol::ServerRequest;
use codex_app_server_protocol::ServerResponse;
use codex_app_server_protocol::SubAgentActivityKind;
-use codex_app_server_protocol::ThreadItem;
+use codex_app_server_protocol::ThreadItemPayload;
use codex_app_server_protocol::TurnSteerResponse;
use codex_app_server_protocol::UserInput;
use codex_app_server_protocol::WebSearchAction;
@@ -165,6 +167,7 @@ use codex_protocol::config_types::Personality;
use codex_protocol::config_types::ReasoningSummary;
use codex_protocol::items::ModelInvocationContext;
use codex_protocol::items::is_safe_plugin_relative_path;
+use codex_protocol::mcp::is_node_repl_backed_connector;
use codex_protocol::models::PermissionProfile;
use codex_protocol::protocol::SessionSource;
use codex_protocol::protocol::SkillScope;
@@ -342,6 +345,16 @@ impl<'a> AnalyticsDropSite<'a> {
}
}
+ fn cua_tool_call_started(thread_id: &'a str, turn_id: &'a str, item_id: &'a str) -> Self {
+ Self {
+ event_name: "CUA tool call start",
+ thread_id,
+ turn_id: Some(turn_id),
+ review_id: None,
+ item_id: Some(item_id),
+ }
+ }
+
fn turn_steer(thread_id: &'a str) -> Self {
Self {
event_name: "turn steer",
@@ -478,6 +491,7 @@ struct TurnState {
latest_diff: Option,
steer_count: usize,
tool_counts: TurnToolCounts,
+ completed_cua_tool_item_ids: HashSet,
resource_skill_invocations: HashSet,
turn_event_emitted: bool,
}
@@ -521,36 +535,36 @@ struct TurnToolCounts {
}
impl TurnToolCounts {
- fn record(&mut self, item: &ThreadItem) {
+ fn record(&mut self, item: &ThreadItemPayload) {
match item {
- ThreadItem::CommandExecution { .. } => self.shell_command += 1,
- ThreadItem::FileChange { .. } => self.file_change += 1,
- ThreadItem::McpToolCall { .. } => self.mcp_tool_call += 1,
- ThreadItem::DynamicToolCall { .. } => self.dynamic_tool_call += 1,
- ThreadItem::SubAgentActivity {
+ ThreadItemPayload::CommandExecution { .. } => self.shell_command += 1,
+ ThreadItemPayload::FileChange { .. } => self.file_change += 1,
+ ThreadItemPayload::McpToolCall { .. } => self.mcp_tool_call += 1,
+ ThreadItemPayload::DynamicToolCall { .. } => self.dynamic_tool_call += 1,
+ ThreadItemPayload::SubAgentActivity {
kind: SubAgentActivityKind::Completed,
..
} => return,
- ThreadItem::CollabAgentToolCall { id, .. }
- | ThreadItem::SubAgentActivity { id, .. } => {
+ ThreadItemPayload::CollabAgentToolCall { id, .. }
+ | ThreadItemPayload::SubAgentActivity { id, .. } => {
if !self.subagent_tool_call_ids.insert(id.clone()) {
return;
}
self.subagent_tool_call += 1;
}
- ThreadItem::WebSearch(_) => self.web_search += 1,
- ThreadItem::ImageGeneration(_) => self.image_generation += 1,
- ThreadItem::UserMessage { .. }
- | ThreadItem::HookPrompt { .. }
- | ThreadItem::AgentMessage { .. }
- | ThreadItem::FunctionCallOutput { .. }
- | ThreadItem::Plan { .. }
- | ThreadItem::Reasoning { .. }
- | ThreadItem::ImageView { .. }
- | ThreadItem::Sleep(_)
- | ThreadItem::EnteredReviewMode { .. }
- | ThreadItem::ExitedReviewMode { .. }
- | ThreadItem::ContextCompaction { .. } => return,
+ ThreadItemPayload::WebSearch(_) => self.web_search += 1,
+ ThreadItemPayload::ImageGeneration(_) => self.image_generation += 1,
+ ThreadItemPayload::UserMessage { .. }
+ | ThreadItemPayload::HookPrompt { .. }
+ | ThreadItemPayload::AgentMessage { .. }
+ | ThreadItemPayload::FunctionCallOutput { .. }
+ | ThreadItemPayload::Plan { .. }
+ | ThreadItemPayload::Reasoning { .. }
+ | ThreadItemPayload::ImageView { .. }
+ | ThreadItemPayload::Sleep(_)
+ | ThreadItemPayload::EnteredReviewMode { .. }
+ | ThreadItemPayload::ExitedReviewMode { .. }
+ | ThreadItemPayload::ContextCompaction { .. } => return,
}
self.total += 1;
}
@@ -2046,31 +2060,100 @@ impl AnalyticsReducer {
}));
}
ServerNotification::ItemStarted(notification) => {
- let Some(item_id) = tracked_tool_item_id(¬ification.item) else {
+ let Some(item_id) = tracked_tool_item_id(¬ification.item.payload) else {
return;
};
let Some(started_at_ms) = option_i64_to_u64(Some(notification.started_at_ms))
else {
return;
};
- let model_context = match ¬ification.item {
- ThreadItem::CommandExecution { model_context, .. } => model_context.clone(),
+ let model_context = match ¬ification.item.payload {
+ ThreadItemPayload::CommandExecution { model_context, .. } => {
+ model_context.clone()
+ }
_ => None,
};
self.turn_state(notification.turn_id.clone())
.thread_id
.get_or_insert(notification.thread_id.clone());
+ let key = ToolItemKey {
+ thread_id: notification.thread_id.clone(),
+ turn_id: notification.turn_id.clone(),
+ item_id: item_id.to_string(),
+ };
+ let cua_identity = cua_mcp_tool_identity(¬ification.item.payload);
+ if cua_identity.is_some()
+ && self
+ .turns
+ .get(¬ification.turn_id)
+ .is_some_and(|turn| turn.completed_cua_tool_item_ids.contains(item_id))
+ {
+ return;
+ }
+ let first_notification = !self.tool_items_started_at_ms.contains_key(&key);
self.tool_items_started_at_ms
- .entry(ToolItemKey {
- thread_id: notification.thread_id,
- turn_id: notification.turn_id,
- item_id: item_id.to_string(),
- })
+ .entry(key)
.and_modify(|(timestamp, _)| *timestamp = started_at_ms)
.or_insert((started_at_ms, model_context));
+ if !first_notification {
+ return;
+ }
+ let Some((server, tool, plugin_id, connector_id)) = cua_identity else {
+ return;
+ };
+ let Some((connection_state, thread_state, thread_metadata)) = self
+ .thread_context_or_warn(AnalyticsDropSite::cua_tool_call_started(
+ ¬ification.thread_id,
+ ¬ification.turn_id,
+ item_id,
+ ))
+ else {
+ return;
+ };
+ let attribution = tool_response_attribution(
+ item_id,
+ /*cell_id*/ None,
+ self.tool_response_states
+ .get(&(notification.thread_id.clone(), notification.turn_id.clone())),
+ self.code_mode_cells.get(¬ification.thread_id),
+ );
+ let root_turn_id = self
+ .turns
+ .get(¬ification.turn_id)
+ .and_then(|turn| turn.resolved_config.as_ref())
+ .and_then(|config| config.turn_metadata.root_turn_id());
+ out.push(TrackEventRequest::CuaToolCallStarted(
+ CodexCuaToolCallStartedEventRequest {
+ event_type: "codex_cua_tool_call_started",
+ event_params: CodexCuaToolCallStartedEventParams {
+ thread_id: notification.thread_id,
+ session_id: thread_metadata.session_id.clone(),
+ turn_id: notification.turn_id,
+ root_turn_id,
+ item_id: item_id.to_string(),
+ cell_id: attribution.cell_id,
+ parent_call_id: attribution.parent_call_id,
+ originating_response_id: attribution.originating_response_id,
+ app_server_client: thread_state.app_server_client(connection_state),
+ runtime: connection_state.runtime.clone(),
+ thread_source: thread_metadata.thread_source.clone(),
+ subagent_source: thread_metadata.subagent_source.clone(),
+ parent_thread_id: thread_metadata.parent_thread_id.clone(),
+ tool_event_type: attribution.tool_event_type,
+ started_at_ms,
+ mcp_server_name: server.to_string(),
+ mcp_tool_name: tool.to_string(),
+ plugin_id: plugin_id.map(str::to_string),
+ connector_id: connector_id.map(str::to_string),
+ },
+ },
+ ));
}
ServerNotification::ItemCompleted(notification) => {
- if matches!(notification.item, ThreadItem::SubAgentActivity { .. }) {
+ if matches!(
+ notification.item.payload,
+ ThreadItemPayload::SubAgentActivity { .. }
+ ) {
let Some(turn_state) = self.turns.get_mut(¬ification.turn_id) else {
tracing::warn!(
thread_id = %notification.thread_id,
@@ -2079,10 +2162,10 @@ impl AnalyticsReducer {
);
return;
};
- turn_state.tool_counts.record(¬ification.item);
+ turn_state.tool_counts.record(¬ification.item.payload);
return;
}
- let Some(item_id) = tracked_tool_item_id(¬ification.item) else {
+ let Some(item_id) = tracked_tool_item_id(¬ification.item.payload) else {
return;
};
let key = ToolItemKey {
@@ -2090,18 +2173,29 @@ impl AnalyticsReducer {
turn_id: notification.turn_id.clone(),
item_id: item_id.to_string(),
};
- let elicitation_type =
- if matches!(notification.item, ThreadItem::McpToolCall { .. }) {
- // Producers enqueue known classifications before completion on
- // the same analytics queue, so completed keys need no history.
- self.pending_mcp_tool_elicitations
- .iter()
- .position(|(pending, _)| pending == &key)
- .and_then(|index| self.pending_mcp_tool_elicitations.remove(index))
- .map(|(_, elicitation_type)| elicitation_type)
- } else {
- None
- };
+ let is_cua = cua_mcp_tool_identity(¬ification.item.payload).is_some();
+ if is_cua
+ && self
+ .turns
+ .get(¬ification.turn_id)
+ .is_some_and(|turn| turn.completed_cua_tool_item_ids.contains(item_id))
+ {
+ return;
+ }
+ let elicitation_type = if matches!(
+ notification.item.payload,
+ ThreadItemPayload::McpToolCall { .. }
+ ) {
+ // Producers enqueue known classifications before completion on
+ // the same analytics queue, so completed keys need no history.
+ self.pending_mcp_tool_elicitations
+ .iter()
+ .position(|(pending, _)| pending == &key)
+ .and_then(|index| self.pending_mcp_tool_elicitations.remove(index))
+ .map(|(_, elicitation_type)| elicitation_type)
+ } else {
+ None
+ };
let Some(turn_state) = self.turns.get_mut(¬ification.turn_id) else {
tracing::warn!(
thread_id = %notification.thread_id,
@@ -2111,7 +2205,7 @@ impl AnalyticsReducer {
);
return;
};
- turn_state.tool_counts.record(¬ification.item);
+ turn_state.tool_counts.record(¬ification.item.payload);
let Some((started_at_ms, model_context)) =
self.tool_items_started_at_ms.remove(&key)
else {
@@ -2135,7 +2229,7 @@ impl AnalyticsReducer {
if let Some(mut event) = tool_item_event(ToolItemEventInput {
thread_id: ¬ification.thread_id,
turn_id: ¬ification.turn_id,
- item: ¬ification.item,
+ item: ¬ification.item.payload,
model_context: model_context.as_ref(),
started_at_ms,
completed_at_ms,
@@ -2158,12 +2252,14 @@ impl AnalyticsReducer {
.and_then(|config| config.turn_metadata.root_turn_id());
// Fast collaborator tools can complete before their sampling response.
// Keep the event until that response can supply its originating ID.
- let emission =
- if matches!(¬ification.item, ThreadItem::CollabAgentToolCall { .. }) {
- ToolEventEmission::AwaitResponse
- } else {
- ToolEventEmission::ImmediateUnlessCorrelated
- };
+ let emission = if matches!(
+ ¬ification.item.payload,
+ ThreadItemPayload::CollabAgentToolCall { .. }
+ ) {
+ ToolEventEmission::AwaitResponse
+ } else {
+ ToolEventEmission::ImmediateUnlessCorrelated
+ };
self.record_tool_event(
¬ification.thread_id,
¬ification.turn_id,
@@ -2172,6 +2268,9 @@ impl AnalyticsReducer {
emission,
out,
);
+ if is_cua && let Some(turn) = self.turns.get_mut(¬ification.turn_id) {
+ turn.completed_cua_tool_item_ids.insert(item_id.to_string());
+ }
}
self.item_review_summaries.remove(&key);
if self
@@ -2813,30 +2912,54 @@ fn warn_missing_analytics_context(
);
}
-pub(crate) fn tracked_tool_item_id(item: &ThreadItem) -> Option<&str> {
+pub(crate) fn tracked_tool_item_id(item: &ThreadItemPayload) -> Option<&str> {
match item {
- ThreadItem::CommandExecution { id, .. }
- | ThreadItem::FileChange { id, .. }
- | ThreadItem::McpToolCall { id, .. }
- | ThreadItem::DynamicToolCall { id, .. }
- | ThreadItem::CollabAgentToolCall { id, .. } => Some(id),
- ThreadItem::WebSearch(item) => Some(&item.id),
- ThreadItem::ImageGeneration(item) => Some(&item.id),
- ThreadItem::UserMessage { .. }
- | ThreadItem::HookPrompt { .. }
- | ThreadItem::AgentMessage { .. }
- | ThreadItem::FunctionCallOutput { .. }
- | ThreadItem::Plan { .. }
- | ThreadItem::Reasoning { .. }
- | ThreadItem::SubAgentActivity { .. }
- | ThreadItem::ImageView { .. }
- | ThreadItem::Sleep(_)
- | ThreadItem::EnteredReviewMode { .. }
- | ThreadItem::ExitedReviewMode { .. }
- | ThreadItem::ContextCompaction { .. } => None,
+ ThreadItemPayload::CommandExecution { id, .. }
+ | ThreadItemPayload::FileChange { id, .. }
+ | ThreadItemPayload::McpToolCall { id, .. }
+ | ThreadItemPayload::DynamicToolCall { id, .. }
+ | ThreadItemPayload::CollabAgentToolCall { id, .. } => Some(id),
+ ThreadItemPayload::WebSearch(item) => Some(&item.id),
+ ThreadItemPayload::ImageGeneration(item) => Some(&item.id),
+ ThreadItemPayload::UserMessage { .. }
+ | ThreadItemPayload::HookPrompt { .. }
+ | ThreadItemPayload::AgentMessage { .. }
+ | ThreadItemPayload::FunctionCallOutput { .. }
+ | ThreadItemPayload::Plan { .. }
+ | ThreadItemPayload::Reasoning { .. }
+ | ThreadItemPayload::SubAgentActivity { .. }
+ | ThreadItemPayload::ImageView { .. }
+ | ThreadItemPayload::Sleep(_)
+ | ThreadItemPayload::EnteredReviewMode { .. }
+ | ThreadItemPayload::ExitedReviewMode { .. }
+ | ThreadItemPayload::ContextCompaction { .. } => None,
}
}
+fn cua_mcp_tool_identity(
+ item: &ThreadItemPayload,
+) -> Option<(&str, &str, Option<&str>, Option<&str>)> {
+ let ThreadItemPayload::McpToolCall {
+ server,
+ tool,
+ plugin_id,
+ app_context,
+ ..
+ } = item
+ else {
+ return None;
+ };
+ let connector_id = app_context
+ .as_ref()
+ .map(|app_context| app_context.connector_id.as_str());
+ (tool == "js" && is_node_repl_backed_connector(server, connector_id)).then_some((
+ server,
+ tool,
+ plugin_id.as_deref(),
+ connector_id,
+ ))
+}
+
fn tool_event_base_mut(event: &mut TrackEventRequest) -> Option<&mut CodexToolItemEventBase> {
match event {
TrackEventRequest::CommandExecution(event) => Some(&mut event.event_params.base),
@@ -2859,36 +2982,52 @@ fn enrich_tool_response_event(
let Some(base) = tool_event_base_mut(event) else {
return;
};
+ let attribution =
+ tool_response_attribution(&base.item_id, base.cell_id.clone(), Some(state), cells);
+ base.tool_event_type = attribution.tool_event_type;
+ base.cell_id = attribution.cell_id;
+ base.parent_call_id = attribution.parent_call_id;
+ base.originating_response_id = attribution.originating_response_id;
+}
+
+#[derive(Default)]
+struct ToolResponseAttribution {
+ tool_event_type: Option,
+ cell_id: Option,
+ parent_call_id: Option,
+ originating_response_id: Option,
+}
+
+fn tool_response_attribution(
+ item_id: &str,
+ cell_id: Option,
+ state: Option<&ToolResponseState>,
+ cells: Option<&HashMap>,
+) -> ToolResponseAttribution {
// A cell association can also describe a separately sampled wait call. Classify
// only from evidence about this exact call ID, not its parent or response lineage.
- base.tool_event_type = match (
- state.response_ids_by_call_id.contains_key(&base.item_id),
- state.cell_ids_by_child_call_id.contains_key(&base.item_id),
+ let tool_event_type = match (
+ state.is_some_and(|state| state.response_ids_by_call_id.contains_key(item_id)),
+ state.is_some_and(|state| state.cell_ids_by_child_call_id.contains_key(item_id)),
) {
(true, false) => Some(ToolEventType::ModelToolCall),
(false, true) => Some(ToolEventType::InnerToolCall),
(false, false) | (true, true) => None,
};
- if base.cell_id.is_none() {
- base.cell_id = state.cell_ids_by_child_call_id.get(&base.item_id).cloned();
- }
-
- let cell = base
- .cell_id
- .as_ref()
- .and_then(|cell_id| cells?.get(cell_id));
- if let Some(cell) = cell {
- base.parent_call_id =
- (cell.parent_call_id != base.item_id).then(|| cell.parent_call_id.clone());
- } else {
- base.cell_id = None;
- base.parent_call_id = None;
- }
- base.originating_response_id = state
- .response_ids_by_call_id
- .get(&base.item_id)
- .cloned()
+ let cell_id = cell_id
+ .or_else(|| state.and_then(|state| state.cell_ids_by_child_call_id.get(item_id).cloned()));
+ let cell = cell_id.as_ref().and_then(|cell_id| cells?.get(cell_id));
+ let parent_call_id =
+ cell.and_then(|cell| (cell.parent_call_id != item_id).then(|| cell.parent_call_id.clone()));
+ let originating_response_id = state
+ .and_then(|state| state.response_ids_by_call_id.get(item_id).cloned())
.or_else(|| cell.and_then(|cell| cell.originating_response_id.clone()));
+ ToolResponseAttribution {
+ tool_event_type,
+ cell_id: cell.is_some().then_some(cell_id).flatten(),
+ parent_call_id,
+ originating_response_id,
+ }
}
fn item_review_summary_key(pending_review: &PendingReviewState) -> Option {
@@ -2909,7 +3048,7 @@ fn item_review_summary_key(pending_review: &PendingReviewState) -> Option {
thread_id: &'a str,
turn_id: &'a str,
- item: &'a ThreadItem,
+ item: &'a ThreadItemPayload,
model_context: Option<&'a ModelInvocationContext>,
started_at_ms: u64,
completed_at_ms: u64,
@@ -2935,7 +3074,7 @@ fn tool_item_event(input: ToolItemEventInput<'_>) -> Option {
elicitation_type,
} = input;
match item {
- ThreadItem::CommandExecution {
+ ThreadItemPayload::CommandExecution {
id,
sandbox_type,
plugin_id,
@@ -2994,7 +3133,7 @@ fn tool_item_event(input: ToolItemEventInput<'_>) -> Option {
},
))
}
- ThreadItem::FileChange {
+ ThreadItemPayload::FileChange {
id,
changes,
status,
@@ -3032,7 +3171,7 @@ fn tool_item_event(input: ToolItemEventInput<'_>) -> Option {
},
}))
}
- ThreadItem::McpToolCall {
+ ThreadItemPayload::McpToolCall {
id,
server,
tool,
@@ -3081,7 +3220,7 @@ fn tool_item_event(input: ToolItemEventInput<'_>) -> Option {
},
))
}
- ThreadItem::DynamicToolCall {
+ ThreadItemPayload::DynamicToolCall {
id,
tool,
status,
@@ -3128,7 +3267,7 @@ fn tool_item_event(input: ToolItemEventInput<'_>) -> Option {
},
))
}
- ThreadItem::CollabAgentToolCall {
+ ThreadItemPayload::CollabAgentToolCall {
id,
tool,
status,
@@ -3195,7 +3334,7 @@ fn tool_item_event(input: ToolItemEventInput<'_>) -> Option {
},
))
}
- ThreadItem::WebSearch(item) => {
+ ThreadItemPayload::WebSearch(item) => {
let base = tool_item_base(
thread_id,
turn_id,
@@ -3225,7 +3364,7 @@ fn tool_item_event(input: ToolItemEventInput<'_>) -> Option {
},
}))
}
- ThreadItem::ImageGeneration(item) => {
+ ThreadItemPayload::ImageGeneration(item) => {
let (terminal_status, failure_kind) = image_generation_outcome(item.status.as_str());
let base = tool_item_base(
thread_id,
@@ -3819,6 +3958,7 @@ fn codex_turn_event_params(
is_first_turn,
} = resolved_config;
let TurnProfile {
+ critical_path,
before_first_sampling_ms,
sampling_ms,
compaction_ms,
@@ -3832,6 +3972,7 @@ fn codex_turn_event_params(
let token_usage = turn_state.token_usage.clone();
let codex_error = turn_state.codex_error.as_ref();
CodexTurnEventParams {
+ critical_path: critical_path.into(),
thread_id,
session_id: thread_metadata.session_id.clone(),
turn_id,
@@ -4107,11 +4248,10 @@ mod tests {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemCompleted(
- ItemCompletedNotification {
- thread_id: keys[2].thread_id.clone(),
- turn_id: keys[2].turn_id.clone(),
- completed_at_ms: 1_000,
- item: ThreadItem::McpToolCall {
+ ItemCompletedNotification::new(
+ keys[2].thread_id.clone(),
+ keys[2].turn_id.clone(),
+ ThreadItemPayload::McpToolCall {
id: keys[2].item_id.clone(),
server: "server".to_string(),
tool: "tool".to_string(),
@@ -4126,7 +4266,9 @@ mod tests {
error: None,
duration_ms: None,
},
- },
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 1_000,
+ ),
))),
&mut events,
)
diff --git a/codex-rs/analytics/src/tests/suite/reducer_ordering_tests.rs b/codex-rs/analytics/src/tests/suite/reducer_ordering_tests.rs
index 1275543ce45f..d6e8c65f2a92 100644
--- a/codex-rs/analytics/src/tests/suite/reducer_ordering_tests.rs
+++ b/codex-rs/analytics/src/tests/suite/reducer_ordering_tests.rs
@@ -308,16 +308,16 @@ async fn completed_background_tool_item_emits_after_turn_event() {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemStarted(
- ItemStartedNotification {
- thread_id: "thread-2".to_string(),
- turn_id: "turn-2".to_string(),
- started_at_ms: 998,
- item: sample_command_execution_item(
+ ItemStartedNotification::new(
+ "thread-2".to_string(),
+ "turn-2".to_string(),
+ sample_command_execution_item(
CommandExecutionStatus::InProgress,
/*exit_code*/ None,
/*duration_ms*/ None,
),
- },
+ /*started_at_ms*/ 998,
+ ),
))),
&mut out,
)
@@ -343,16 +343,17 @@ async fn completed_background_tool_item_emits_after_turn_event() {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemCompleted(
- ItemCompletedNotification {
- thread_id: "thread-2".to_string(),
- turn_id: "turn-2".to_string(),
- completed_at_ms: 1_000,
- item: sample_command_execution_item(
+ ItemCompletedNotification::new(
+ "thread-2".to_string(),
+ "turn-2".to_string(),
+ sample_command_execution_item(
CommandExecutionStatus::Completed,
Some(0),
Some(1),
),
- },
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 1_000,
+ ),
))),
&mut out,
)
@@ -430,16 +431,17 @@ async fn item_completed_without_turn_state_does_not_create_turn_state() {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemCompleted(
- ItemCompletedNotification {
- thread_id: "thread-2".to_string(),
- turn_id: "turn-2".to_string(),
- completed_at_ms: 1_000,
- item: sample_command_execution_item(
+ ItemCompletedNotification::new(
+ "thread-2".to_string(),
+ "turn-2".to_string(),
+ sample_command_execution_item(
CommandExecutionStatus::Completed,
Some(0),
Some(1),
),
- },
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 1_000,
+ ),
))),
&mut out,
)
diff --git a/codex-rs/analytics/src/tests/suite/threads_tests.rs b/codex-rs/analytics/src/tests/suite/threads_tests.rs
index 49eb280e7c70..b0c4cc0f0847 100644
--- a/codex-rs/analytics/src/tests/suite/threads_tests.rs
+++ b/codex-rs/analytics/src/tests/suite/threads_tests.rs
@@ -830,16 +830,16 @@ async fn subagent_tool_items_inherit_parent_connection_metadata() {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemStarted(
- ItemStartedNotification {
- thread_id: "thread-subagent".to_string(),
- turn_id: "turn-subagent".to_string(),
- started_at_ms: 1_000,
- item: sample_command_execution_item(
+ ItemStartedNotification::new(
+ "thread-subagent".to_string(),
+ "turn-subagent".to_string(),
+ sample_command_execution_item(
CommandExecutionStatus::InProgress,
/*exit_code*/ None,
/*duration_ms*/ None,
),
- },
+ /*started_at_ms*/ 1_000,
+ ),
))),
&mut events,
)
@@ -847,16 +847,17 @@ async fn subagent_tool_items_inherit_parent_connection_metadata() {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemCompleted(
- ItemCompletedNotification {
- thread_id: "thread-subagent".to_string(),
- turn_id: "turn-subagent".to_string(),
- completed_at_ms: 1_042,
- item: sample_command_execution_item(
+ ItemCompletedNotification::new(
+ "thread-subagent".to_string(),
+ "turn-subagent".to_string(),
+ sample_command_execution_item(
CommandExecutionStatus::Completed,
Some(0),
Some(42),
),
- },
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 1_042,
+ ),
))),
&mut events,
)
diff --git a/codex-rs/analytics/src/tests/suite/tools_tests.rs b/codex-rs/analytics/src/tests/suite/tools_tests.rs
index 6272b8458fe3..9ca6b21d45ca 100644
--- a/codex-rs/analytics/src/tests/suite/tools_tests.rs
+++ b/codex-rs/analytics/src/tests/suite/tools_tests.rs
@@ -47,7 +47,7 @@ use codex_app_server_protocol::ItemStartedNotification;
use codex_app_server_protocol::McpToolCallAppContext;
use codex_app_server_protocol::McpToolCallStatus;
use codex_app_server_protocol::ServerNotification;
-use codex_app_server_protocol::ThreadItem;
+use codex_app_server_protocol::ThreadItemPayload;
use codex_app_server_protocol::TurnStatus as AppServerTurnStatus;
use codex_protocol::protocol::ThreadSource;
use codex_protocol::sandbox::SandboxType;
@@ -64,9 +64,9 @@ fn sample_command_execution_item_with_actions(
plugin_id: Option<&str>,
script_path: Option<&str>,
sandbox_type: Option,
-) -> ThreadItem {
+) -> ThreadItemPayload {
let mut item = sample_command_execution_item(status, exit_code, duration_ms);
- let ThreadItem::CommandExecution {
+ let ThreadItemPayload::CommandExecution {
command_actions: item_command_actions,
plugin_id: item_plugin_id,
script_path: item_script_path,
@@ -218,6 +218,101 @@ fn command_execution_event_serializes_expected_shape() {
assert_eq!(payload, expected);
}
+#[tokio::test]
+async fn cua_tool_call_lifecycle_requires_a_start_and_deduplicates_replay() {
+ let mut reducer = AnalyticsReducer::default();
+ let mut events = Vec::new();
+ ingest_turn_prerequisites(
+ &mut reducer,
+ &mut events,
+ /*include_initialize*/ true,
+ /*include_resolved_config*/ true,
+ /*include_started*/ true,
+ /*include_token_usage*/ false,
+ )
+ .await;
+ events.clear();
+
+ let item = |status| ThreadItemPayload::McpToolCall {
+ id: "cua-call".into(),
+ server: "codex_apps".into(),
+ tool: "js".into(),
+ status,
+ arguments: json!({"script": "synthetic-private-input"}),
+ app_context: Some(McpToolCallAppContext {
+ connector_id: "connector_openai_browser".into(),
+ link_id: None,
+ resource_uri: None,
+ app_name: None,
+ action_name: None,
+ }),
+ mcp_app_resource_uri: None,
+ mcp_app_ui: None,
+ plugin_id: Some("browser@openai-curated".into()),
+ read_only_hint: None,
+ result: None,
+ error: None,
+ duration_ms: None,
+ };
+ let started = ServerNotification::ItemStarted(ItemStartedNotification::new(
+ "thread-2".into(),
+ "turn-2".into(),
+ item(McpToolCallStatus::InProgress),
+ /*started_at_ms*/ 1_000,
+ ));
+ let completed = ServerNotification::ItemCompleted(ItemCompletedNotification::new(
+ "thread-2".into(),
+ "turn-2".into(),
+ item(McpToolCallStatus::Completed),
+ Some(1_000),
+ /*completed_at_ms*/ 1_100,
+ ));
+ for notification in [
+ completed.clone(), // Missing start must not poison later deduplication.
+ started.clone(),
+ started.clone(),
+ completed.clone(),
+ started, // Replay after a valid terminal.
+ completed,
+ ] {
+ reducer
+ .ingest(
+ AnalyticsFact::Notification(Box::new(notification)),
+ &mut events,
+ )
+ .await;
+ }
+
+ let [
+ TrackEventRequest::CuaToolCallStarted(start),
+ TrackEventRequest::McpToolCall(terminal),
+ ] = events.as_slice()
+ else {
+ panic!("expected exactly one CUA start and one terminal");
+ };
+ assert_eq!(
+ (
+ start.event_type,
+ start.event_params.connector_id.as_deref(),
+ start.event_params.plugin_id.as_deref(),
+ start.event_params.started_at_ms,
+ terminal.event_params.base.started_at_ms,
+ ),
+ (
+ "codex_cua_tool_call_started",
+ Some("connector_openai_browser"),
+ Some("browser@openai-curated"),
+ 1_000,
+ 1_000,
+ )
+ );
+ assert!(
+ !serde_json::to_string(&events)
+ .expect("serialize CUA lifecycle events")
+ .contains("synthetic-private-input")
+ );
+}
+
#[tokio::test]
async fn item_lifecycle_notifications_publish_command_execution_event() {
let mut reducer = AnalyticsReducer::default();
@@ -236,17 +331,18 @@ async fn item_lifecycle_notifications_publish_command_execution_event() {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemStarted(
- ItemStartedNotification {
- thread_id: "thread-1".to_string(),
- turn_id: "turn-1".to_string(),
- started_at_ms: 1_000,
- item: {
+ ItemStartedNotification::new(
+ "thread-1".to_string(),
+ "turn-1".to_string(),
+ {
let mut item = sample_command_execution_item(
CommandExecutionStatus::InProgress,
/*exit_code*/ None,
/*duration_ms*/ None,
);
- if let ThreadItem::CommandExecution { model_context, .. } = &mut item {
+ if let ThreadItemPayload::CommandExecution { model_context, .. } =
+ &mut item
+ {
*model_context =
Some(codex_protocol::items::ModelInvocationContext {
model_slug: model.to_string(),
@@ -255,7 +351,8 @@ async fn item_lifecycle_notifications_publish_command_execution_event() {
}
item
},
- },
+ /*started_at_ms*/ 1_000,
+ ),
))),
&mut events,
)
@@ -269,11 +366,10 @@ async fn item_lifecycle_notifications_publish_command_execution_event() {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemCompleted(
- ItemCompletedNotification {
- thread_id: "thread-1".to_string(),
- turn_id: "turn-1".to_string(),
- completed_at_ms: 1_045,
- item: sample_command_execution_item_with_actions(
+ ItemCompletedNotification::new(
+ "thread-1".to_string(),
+ "turn-1".to_string(),
+ sample_command_execution_item_with_actions(
CommandExecutionStatus::Completed,
Some(0),
Some(42),
@@ -300,7 +396,9 @@ async fn item_lifecycle_notifications_publish_command_execution_event() {
Some("scripts/run.py"),
Some(SandboxType::WindowsMxc),
),
- },
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 1_045,
+ ),
))),
&mut events,
)
@@ -372,7 +470,7 @@ async fn collaborator_tool_events_keep_response_ids_when_completion_races_sampli
&mut events,
)
.await;
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: "call-1".into(),
tool: CollabAgentTool::SendMessage,
status: CollabAgentToolCallStatus::Failed,
@@ -386,12 +484,12 @@ async fn collaborator_tool_events_keep_response_ids_when_completion_races_sampli
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemStarted(
- ItemStartedNotification {
- thread_id: "thread-1".into(),
- turn_id: "turn-1".into(),
- started_at_ms: 1_000,
- item: item.clone(),
- },
+ ItemStartedNotification::new(
+ "thread-1".into(),
+ "turn-1".into(),
+ item.clone(),
+ /*started_at_ms*/ 1_000,
+ ),
))),
&mut events,
)
@@ -400,12 +498,13 @@ async fn collaborator_tool_events_keep_response_ids_when_completion_races_sampli
sampling_response("turn-1", "response-1", &["call-1"]),
));
let completion = AnalyticsFact::Notification(Box::new(ServerNotification::ItemCompleted(
- ItemCompletedNotification {
- thread_id: "thread-1".into(),
- turn_id: "turn-1".into(),
- completed_at_ms: 1_010,
+ ItemCompletedNotification::new(
+ "thread-1".into(),
+ "turn-1".into(),
item,
- },
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 1_010,
+ ),
)));
let facts = if response_first {
[response, completion]
@@ -691,7 +790,7 @@ async fn mcp_elicitation_classification_survives_turn_completion_and_preserves_c
("retry", "calendar", None),
("denied", "drive", Some(ElicitationType::Approval)),
] {
- let item = ThreadItem::McpToolCall {
+ let item = ThreadItemPayload::McpToolCall {
id: item_id.to_string(),
server: "server".to_string(),
tool: "search".to_string(),
@@ -715,12 +814,12 @@ async fn mcp_elicitation_classification_survives_turn_completion_and_preserves_c
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemStarted(
- ItemStartedNotification {
- thread_id: "thread-2".to_string(),
- turn_id: "turn-2".to_string(),
- started_at_ms: 998,
- item: item.clone(),
- },
+ ItemStartedNotification::new(
+ "thread-2".to_string(),
+ "turn-2".to_string(),
+ item.clone(),
+ /*started_at_ms*/ 998,
+ ),
))),
&mut events,
)
@@ -757,12 +856,13 @@ async fn mcp_elicitation_classification_survives_turn_completion_and_preserves_c
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemCompleted(
- ItemCompletedNotification {
- thread_id: "thread-2".to_string(),
- turn_id: "turn-2".to_string(),
- completed_at_ms: 1_000,
+ ItemCompletedNotification::new(
+ "thread-2".to_string(),
+ "turn-2".to_string(),
item,
- },
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 1_000,
+ ),
))),
&mut events,
)
@@ -872,7 +972,7 @@ async fn image_generation_events_preserve_transparent_background_metadata() {
)
.await;
- let item = ThreadItem::ImageGeneration(ImageGenerationItem {
+ let item = ThreadItemPayload::ImageGeneration(ImageGenerationItem {
id: "image-1".to_string(),
status: status.to_string(),
revised_prompt: None,
@@ -890,12 +990,12 @@ async fn image_generation_events_preserve_transparent_background_metadata() {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemStarted(
- ItemStartedNotification {
- thread_id: "thread-2".to_string(),
- turn_id: "turn-2".to_string(),
- started_at_ms: 998,
- item: item.clone(),
- },
+ ItemStartedNotification::new(
+ "thread-2".to_string(),
+ "turn-2".to_string(),
+ item.clone(),
+ /*started_at_ms*/ 998,
+ ),
))),
&mut out,
)
@@ -903,12 +1003,13 @@ async fn image_generation_events_preserve_transparent_background_metadata() {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemCompleted(
- ItemCompletedNotification {
- thread_id: "thread-2".to_string(),
- turn_id: "turn-2".to_string(),
- completed_at_ms: 1_000,
+ ItemCompletedNotification::new(
+ "thread-2".to_string(),
+ "turn-2".to_string(),
item,
- },
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 1_000,
+ ),
))),
&mut out,
)
diff --git a/codex-rs/analytics/src/tests/suite/turns/events_tests.rs b/codex-rs/analytics/src/tests/suite/turns/events_tests.rs
index 959dfe72c471..5a86e9a05828 100644
--- a/codex-rs/analytics/src/tests/suite/turns/events_tests.rs
+++ b/codex-rs/analytics/src/tests/suite/turns/events_tests.rs
@@ -34,7 +34,7 @@ use codex_app_server_protocol::McpToolCallStatus;
use codex_app_server_protocol::PatchApplyStatus;
use codex_app_server_protocol::ServerNotification;
use codex_app_server_protocol::SubAgentActivityKind;
-use codex_app_server_protocol::ThreadItem;
+use codex_app_server_protocol::ThreadItemPayload;
use codex_app_server_protocol::ThreadRealtimeStartedNotification;
use codex_app_server_protocol::TurnStatus as AppServerTurnStatus;
use codex_app_server_protocol::WebSearchItem;
@@ -102,6 +102,7 @@ fn turn_event_serializes_expected_shape() {
let event = TrackEventRequest::TurnEvent(Box::new(CodexTurnEventRequest {
event_type: "codex_turn_event",
event_params: crate::events::CodexTurnEventParams {
+ critical_path: crate::TurnCriticalPath::Disabled.into(),
thread_id: "thread-2".to_string(),
session_id: "session-thread-2".to_string(),
turn_id: "turn-2".to_string(),
@@ -187,6 +188,14 @@ fn turn_event_serializes_expected_shape() {
r#"{
"event_type": "codex_turn_event",
"event_params": {
+ "critical_path_status": "disabled",
+ "critical_path_duration_ms": null,
+ "critical_path_inference_ms": null,
+ "critical_path_auto_review_ms": null,
+ "critical_path_user_wait_ms": null,
+ "critical_path_tools_ms": null,
+ "critical_path_overhead_ms": null,
+ "critical_path_unknown_ms": null,
"thread_id": "thread-2",
"session_id": "session-thread-2",
"turn_id": "turn-2",
@@ -474,7 +483,7 @@ async fn turn_event_counts_completed_tool_items() {
)
.await;
- let mcp_tool_call_item = |status, duration_ms| ThreadItem::McpToolCall {
+ let mcp_tool_call_item = |status, duration_ms| ThreadItemPayload::McpToolCall {
id: "mcp-1".to_string(),
server: "server".to_string(),
tool: "search".to_string(),
@@ -497,13 +506,13 @@ async fn turn_event_counts_completed_tool_items() {
};
let completed_tool_items = vec![
sample_command_execution_item(CommandExecutionStatus::Completed, Some(0), Some(1)),
- ThreadItem::FileChange {
+ ThreadItemPayload::FileChange {
id: "file-change-1".to_string(),
changes: Vec::new(),
status: PatchApplyStatus::Completed,
},
mcp_tool_call_item(McpToolCallStatus::Completed, Some(2)),
- ThreadItem::DynamicToolCall {
+ ThreadItemPayload::DynamicToolCall {
id: "dynamic-1".to_string(),
// A name collision with code-mode exec must not change the event boundary.
namespace: Some("custom".to_string()),
@@ -514,7 +523,7 @@ async fn turn_event_counts_completed_tool_items() {
success: Some(true),
duration_ms: Some(3),
},
- ThreadItem::CollabAgentToolCall {
+ ThreadItemPayload::CollabAgentToolCall {
id: "collab-1".to_string(),
tool: CollabAgentTool::SpawnAgent,
status: CollabAgentToolCallStatus::Completed,
@@ -525,7 +534,7 @@ async fn turn_event_counts_completed_tool_items() {
reasoning_effort: None,
agents_states: Default::default(),
},
- ThreadItem::SubAgentActivity {
+ ThreadItemPayload::SubAgentActivity {
model: None,
reasoning_effort: None,
id: "sub-agent-activity-1".to_string(),
@@ -533,7 +542,7 @@ async fn turn_event_counts_completed_tool_items() {
agent_thread_id: "thread-child".to_string(),
agent_path: "/root/child".to_string(),
},
- ThreadItem::SubAgentActivity {
+ ThreadItemPayload::SubAgentActivity {
model: None,
reasoning_effort: None,
id: "sub-agent-activity-completed".to_string(),
@@ -541,13 +550,13 @@ async fn turn_event_counts_completed_tool_items() {
agent_thread_id: "thread-child".to_string(),
agent_path: "/root/child".to_string(),
},
- ThreadItem::WebSearch(WebSearchItem {
+ ThreadItemPayload::WebSearch(WebSearchItem {
id: "web-1".to_string(),
query: "codex".to_string(),
action: None,
results: None,
}),
- ThreadItem::ImageGeneration(ImageGenerationItem {
+ ThreadItemPayload::ImageGeneration(ImageGenerationItem {
id: "image-1".to_string(),
status: "completed".to_string(),
revised_prompt: None,
@@ -567,12 +576,12 @@ async fn turn_event_counts_completed_tool_items() {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemStarted(
- ItemStartedNotification {
- thread_id: "thread-2".to_string(),
- turn_id: "turn-2".to_string(),
- started_at_ms: 998,
- item: item.clone(),
- },
+ ItemStartedNotification::new(
+ "thread-2".to_string(),
+ "turn-2".to_string(),
+ item.clone(),
+ /*started_at_ms*/ 998,
+ ),
))),
&mut out,
)
@@ -583,12 +592,13 @@ async fn turn_event_counts_completed_tool_items() {
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemCompleted(
- ItemCompletedNotification {
- thread_id: "thread-2".to_string(),
- turn_id: "turn-2".to_string(),
- completed_at_ms: 1_000,
+ ItemCompletedNotification::new(
+ "thread-2".to_string(),
+ "turn-2".to_string(),
item,
- },
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 1_000,
+ ),
))),
&mut out,
)
@@ -957,3 +967,107 @@ async fn turn_completed_without_started_notification_emits_null_started_at() {
);
assert_eq!(payload["event_params"]["total_tokens"], json!(null));
}
+
+#[tokio::test]
+async fn critical_path_payload_preserves_capture_status_and_emits_once() {
+ use crate::TurnCriticalPath;
+ use crate::TurnCriticalPathDurations;
+ use crate::TurnProfileFact;
+ use crate::tests::support::sample_turn_profile;
+
+ for status in [
+ AppServerTurnStatus::Completed,
+ AppServerTurnStatus::Interrupted,
+ ] {
+ for (critical_path, expected) in [
+ (
+ TurnCriticalPath::Disabled,
+ json!(["disabled", null, null, null, null, null, null, null]),
+ ),
+ (
+ TurnCriticalPath::Incomplete,
+ json!(["incomplete", null, null, null, null, null, null, null]),
+ ),
+ (
+ TurnCriticalPath::Complete(TurnCriticalPathDurations {
+ duration_ms: 1234,
+ inference_ms: 700,
+ auto_review_ms: 200,
+ user_wait_ms: 100,
+ tools_ms: 150,
+ overhead_ms: 80,
+ unknown_ms: 4,
+ }),
+ json!(["complete", 1234, 700, 200, 100, 150, 80, 4]),
+ ),
+ (
+ TurnCriticalPath::Complete(TurnCriticalPathDurations {
+ duration_ms: 1234,
+ inference_ms: 1234,
+ auto_review_ms: 0,
+ user_wait_ms: 0,
+ tools_ms: 0,
+ overhead_ms: 0,
+ unknown_ms: 0,
+ }),
+ json!(["complete", 1234, 1234, 0, 0, 0, 0, 0]),
+ ),
+ ] {
+ let mut reducer = AnalyticsReducer::default();
+ let mut out = Vec::new();
+ ingest_turn_prerequisites(
+ &mut reducer,
+ &mut out,
+ /*include_initialize*/ true,
+ /*include_resolved_config*/ true,
+ /*include_started*/ true,
+ /*include_token_usage*/ true,
+ )
+ .await;
+ let mut profile = sample_turn_profile();
+ profile.critical_path = critical_path;
+ reducer
+ .ingest(
+ AnalyticsFact::Custom(CustomAnalyticsFact::TurnProfile(Box::new(
+ TurnProfileFact {
+ turn_id: "turn-2".into(),
+ profile,
+ },
+ ))),
+ &mut out,
+ )
+ .await;
+ for _ in 0..2 {
+ reducer
+ .ingest(
+ AnalyticsFact::Notification(Box::new(sample_turn_completed_notification(
+ "thread-2",
+ "turn-2",
+ status.clone(),
+ /*codex_error_info*/ None,
+ ))),
+ &mut out,
+ )
+ .await;
+ }
+ assert_eq!(out.len(), 1);
+ let payload = serde_json::to_value(&out[0]).unwrap();
+ let params = &payload["event_params"];
+ assert_eq!(
+ json!([
+ params["critical_path_status"],
+ params["critical_path_duration_ms"],
+ params["critical_path_inference_ms"],
+ params["critical_path_auto_review_ms"],
+ params["critical_path_user_wait_ms"],
+ params["critical_path_tools_ms"],
+ params["critical_path_overhead_ms"],
+ params["critical_path_unknown_ms"],
+ ]),
+ expected
+ );
+ assert_eq!(params["tool_blocking_ms"], json!(250));
+ assert_eq!(params["duration_ms"], json!(1234));
+ }
+ }
+}
diff --git a/codex-rs/analytics/src/tests/support.rs b/codex-rs/analytics/src/tests/support.rs
index e32fe28aca58..c47593d50d9c 100644
--- a/codex-rs/analytics/src/tests/support.rs
+++ b/codex-rs/analytics/src/tests/support.rs
@@ -31,7 +31,7 @@ use codex_app_server_protocol::SandboxPolicy as AppServerSandboxPolicy;
use codex_app_server_protocol::ServerNotification;
use codex_app_server_protocol::SessionSource as AppServerSessionSource;
use codex_app_server_protocol::Thread;
-use codex_app_server_protocol::ThreadItem;
+use codex_app_server_protocol::ThreadItemPayload;
use codex_app_server_protocol::ThreadResumeResponse;
use codex_app_server_protocol::ThreadSource as AppServerThreadSource;
use codex_app_server_protocol::ThreadStartResponse;
@@ -374,6 +374,7 @@ pub(super) fn sample_turn_resolved_config(
pub(super) fn sample_turn_profile() -> TurnProfile {
TurnProfile {
+ critical_path: crate::TurnCriticalPath::Disabled,
before_first_sampling_ms: 100,
sampling_ms: 700,
compaction_ms: 40,
@@ -545,17 +546,17 @@ pub(super) async fn ingest_completed_command_execution_item(
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemStarted(
- ItemStartedNotification {
- thread_id: thread_id.to_string(),
- turn_id: "turn-1".to_string(),
- started_at_ms: 1_000,
- item: sample_command_execution_item_with_id(
+ ItemStartedNotification::new(
+ thread_id.to_string(),
+ "turn-1".to_string(),
+ sample_command_execution_item_with_id(
item_id,
CommandExecutionStatus::InProgress,
/*exit_code*/ None,
/*duration_ms*/ None,
),
- },
+ /*started_at_ms*/ 1_000,
+ ),
))),
events,
)
@@ -563,17 +564,18 @@ pub(super) async fn ingest_completed_command_execution_item(
reducer
.ingest(
AnalyticsFact::Notification(Box::new(ServerNotification::ItemCompleted(
- ItemCompletedNotification {
- thread_id: thread_id.to_string(),
- turn_id: "turn-1".to_string(),
- completed_at_ms: 1_042,
- item: sample_command_execution_item_with_id(
+ ItemCompletedNotification::new(
+ thread_id.to_string(),
+ "turn-1".to_string(),
+ sample_command_execution_item_with_id(
item_id,
CommandExecutionStatus::Completed,
Some(0),
Some(42),
),
- },
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 1_042,
+ ),
))),
events,
)
@@ -640,7 +642,7 @@ pub(super) fn sample_command_execution_item(
status: CommandExecutionStatus,
exit_code: Option,
duration_ms: Option,
-) -> ThreadItem {
+) -> ThreadItemPayload {
sample_command_execution_item_with_id("item-1", status, exit_code, duration_ms)
}
@@ -649,8 +651,8 @@ pub(super) fn sample_command_execution_item_with_id(
status: CommandExecutionStatus,
exit_code: Option,
duration_ms: Option,
-) -> ThreadItem {
- ThreadItem::CommandExecution {
+) -> ThreadItemPayload {
+ ThreadItemPayload::CommandExecution {
model_context: None,
sandbox_type: None,
id: id.to_string(),
diff --git a/codex-rs/analytics/src/turn_critical_path.rs b/codex-rs/analytics/src/turn_critical_path.rs
new file mode 100644
index 000000000000..ef8e4738d807
--- /dev/null
+++ b/codex-rs/analytics/src/turn_critical_path.rs
@@ -0,0 +1,59 @@
+//! Turn critical-path facts and their nullable analytics fields.
+//! Missing capture never becomes a zero-duration measurement.
+
+use serde::Serialize;
+
+/// Capture coverage for one finalized turn, independent of its completion status.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize)]
+pub enum TurnCriticalPath {
+ #[default]
+ Disabled,
+ Incomplete,
+ Complete(TurnCriticalPathDurations),
+}
+
+/// Category totals over the server turn interval, truncated to milliseconds.
+/// Sampling and compaction both contribute to inference. Independent truncation
+/// can leave the category sum up to five milliseconds below duration_ms.
+#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
+pub struct TurnCriticalPathDurations {
+ pub duration_ms: u64,
+ pub inference_ms: u64,
+ pub auto_review_ms: u64,
+ pub user_wait_ms: u64,
+ pub tools_ms: u64,
+ pub overhead_ms: u64,
+ pub unknown_ms: u64,
+}
+
+#[derive(Serialize)]
+pub(crate) struct CriticalPathEventParams {
+ critical_path_status: &'static str,
+ critical_path_duration_ms: Option,
+ critical_path_inference_ms: Option,
+ critical_path_auto_review_ms: Option,
+ critical_path_user_wait_ms: Option,
+ critical_path_tools_ms: Option,
+ critical_path_overhead_ms: Option,
+ critical_path_unknown_ms: Option,
+}
+
+impl From for CriticalPathEventParams {
+ fn from(path: TurnCriticalPath) -> Self {
+ let (status, durations) = match path {
+ TurnCriticalPath::Disabled => ("disabled", None),
+ TurnCriticalPath::Incomplete => ("incomplete", None),
+ TurnCriticalPath::Complete(durations) => ("complete", Some(durations)),
+ };
+ Self {
+ critical_path_status: status,
+ critical_path_duration_ms: durations.as_ref().map(|value| value.duration_ms),
+ critical_path_inference_ms: durations.as_ref().map(|value| value.inference_ms),
+ critical_path_auto_review_ms: durations.as_ref().map(|value| value.auto_review_ms),
+ critical_path_user_wait_ms: durations.as_ref().map(|value| value.user_wait_ms),
+ critical_path_tools_ms: durations.as_ref().map(|value| value.tools_ms),
+ critical_path_overhead_ms: durations.as_ref().map(|value| value.overhead_ms),
+ critical_path_unknown_ms: durations.as_ref().map(|value| value.unknown_ms),
+ }
+ }
+}
diff --git a/codex-rs/app-server-client/Cargo.toml b/codex-rs/app-server-client/Cargo.toml
index daa6ef661f00..272173b83a7f 100644
--- a/codex-rs/app-server-client/Cargo.toml
+++ b/codex-rs/app-server-client/Cargo.toml
@@ -15,6 +15,7 @@ workspace = true
[dependencies]
codex-app-server = { workspace = true }
codex-app-server-protocol = { workspace = true }
+codex-app-server-transport = { workspace = true }
codex-arg0 = { workspace = true }
codex-config = { workspace = true }
codex-core = { workspace = true }
diff --git a/codex-rs/app-server-client/src/lib.rs b/codex-rs/app-server-client/src/lib.rs
index e038e439f691..e7df794ea809 100644
--- a/codex-rs/app-server-client/src/lib.rs
+++ b/codex-rs/app-server-client/src/lib.rs
@@ -23,6 +23,7 @@
mod cloud;
mod path;
mod remote;
+mod remote_websocket;
pub use cloud::CloudClient;
pub use cloud::CloudCommand;
pub use cloud::CloudOperation;
@@ -1134,19 +1135,22 @@ mod tests {
}
fn item_completed_notification(text: &str) -> ServerNotification {
- ServerNotification::ItemCompleted(codex_app_server_protocol::ItemCompletedNotification {
- thread_id: "thread".to_string(),
- turn_id: "turn".to_string(),
- completed_at_ms: 0,
- item: codex_app_server_protocol::ThreadItem::AgentMessage {
- id: "item".to_string(),
- text: text.to_string(),
- phase: None,
- memory_citation: None,
- delivery: None,
- questions: None,
- },
- })
+ ServerNotification::ItemCompleted(
+ codex_app_server_protocol::ItemCompletedNotification::new(
+ "thread".to_string(),
+ "turn".to_string(),
+ codex_app_server_protocol::ThreadItemPayload::AgentMessage {
+ id: "item".to_string(),
+ text: text.to_string(),
+ phase: None,
+ memory_citation: None,
+ delivery: None,
+ questions: None,
+ },
+ /*started_at_ms*/ None,
+ /*completed_at_ms*/ 0,
+ ),
+ )
}
fn turn_completed_notification() -> ServerNotification {
@@ -1882,8 +1886,8 @@ mod tests {
}
ServerNotification::ItemCompleted(notification)
if matches!(
- ¬ification.item,
- codex_app_server_protocol::ThreadItem::AgentMessage { text, .. }
+ ¬ification.item.payload,
+ codex_app_server_protocol::ThreadItemPayload::AgentMessage { text, .. }
if text == "hello"
) =>
{
diff --git a/codex-rs/app-server-client/src/remote.rs b/codex-rs/app-server-client/src/remote.rs
index c5d9b0321f05..ad8d28bceced 100644
--- a/codex-rs/app-server-client/src/remote.rs
+++ b/codex-rs/app-server-client/src/remote.rs
@@ -22,6 +22,8 @@ use crate::RequestResult;
use crate::SHUTDOWN_TIMEOUT;
use crate::TypedRequestError;
use crate::decode_typed_response;
+use crate::remote_websocket::RemoteWebSocket;
+use crate::remote_websocket::WebSocketHandshake;
use codex_app_server_protocol::ClientInfo;
use codex_app_server_protocol::ClientNotification;
use codex_app_server_protocol::ClientRequest;
@@ -37,11 +39,11 @@ use codex_app_server_protocol::RequestId;
use codex_app_server_protocol::Result as JsonRpcResult;
use codex_app_server_protocol::ServerNotification;
use codex_app_server_protocol::ServerRequest;
+use codex_app_server_transport::WEBSOCKET_COMPRESSION_HEADER;
+use codex_app_server_transport::ZSTD_STREAM_PROTOCOL;
use codex_uds::UnixStream;
use codex_utils_absolute_path::AbsolutePathBuf;
use codex_utils_rustls_provider::ensure_rustls_crypto_provider;
-use futures::SinkExt;
-use futures::StreamExt;
use serde::de::DeserializeOwned;
use tokio::io::AsyncRead;
use tokio::io::AsyncWrite;
@@ -50,12 +52,12 @@ use tokio::sync::mpsc;
use tokio::sync::oneshot;
use tokio::time::timeout;
use tokio_tungstenite::MaybeTlsStream;
-use tokio_tungstenite::WebSocketStream;
use tokio_tungstenite::client_async_with_config;
use tokio_tungstenite::connect_async_with_config;
use tokio_tungstenite::tungstenite::Error as TungsteniteError;
use tokio_tungstenite::tungstenite::Message;
use tokio_tungstenite::tungstenite::client::IntoClientRequest;
+use tokio_tungstenite::tungstenite::handshake::client::Request;
use tokio_tungstenite::tungstenite::http::HeaderValue;
use tokio_tungstenite::tungstenite::http::header::AUTHORIZATION;
use tokio_tungstenite::tungstenite::protocol::WebSocketConfig;
@@ -239,13 +241,14 @@ impl RemoteAppServerClient {
async fn connect_with_stream(
channel_capacity: usize,
endpoint: String,
- stream: WebSocketStream,
+ stream: WebSocketHandshake,
initialize_params: InitializeParams,
) -> IoResult
where
S: AsyncRead + AsyncWrite + Unpin + Send + 'static,
{
- let mut stream = stream;
+ let mut stream =
+ RemoteWebSocket::from_handshake(stream, REMOTE_APP_SERVER_MAX_WEBSOCKET_MESSAGE_SIZE)?;
let (pending_events, metadata) = initialize_remote_connection(
&mut stream,
&endpoint,
@@ -264,7 +267,7 @@ impl RemoteAppServerClient {
tokio::select! {
command = command_rx.recv() => {
let Some(command) = command else {
- let _ = stream.close(None).await;
+ let _ = stream.close().await;
break;
};
match command {
@@ -346,7 +349,7 @@ impl RemoteAppServerClient {
let _ = response_tx.send(result);
}
RemoteClientCommand::Shutdown { response_tx } => {
- let close_result = stream.close(None).await.or_else(|err| {
+ let close_result = stream.close().await.or_else(|err| {
if websocket_close_error_is_already_closed(&err) {
Ok(())
} else {
@@ -719,7 +722,7 @@ impl RemoteAppServerRequestHandle {
async fn connect_websocket_endpoint(
websocket_url: String,
auth_token: Option,
-) -> IoResult<(String, WebSocketStream>)> {
+) -> IoResult<(String, WebSocketHandshake>)> {
let url = Url::parse(&websocket_url).map_err(|err| {
IoError::new(
ErrorKind::InvalidInput,
@@ -735,7 +738,7 @@ async fn connect_websocket_endpoint(
));
}
- let mut request = url.as_str().into_client_request().map_err(|err| {
+ let mut request = websocket_request(url.as_str()).map_err(|err| {
IoError::new(
ErrorKind::InvalidInput,
format!("invalid websocket URL `{websocket_url}`: {err}"),
@@ -769,7 +772,6 @@ async fn connect_websocket_endpoint(
format!("timed out connecting to remote app server at `{websocket_url}`"),
)
})?
- .map(|(stream, _response)| stream)
.map_err(|err| {
IoError::other(format!(
"failed to connect to remote app server at `{websocket_url}`: {err}"
@@ -782,16 +784,14 @@ async fn connect_websocket_endpoint(
async fn connect_unix_socket_endpoint(
socket_path: AbsolutePathBuf,
peer_policy: SocketPeerPolicy,
-) -> IoResult<(String, WebSocketStream)> {
+) -> IoResult<(String, WebSocketHandshake)> {
let endpoint = format!("unix://{}", socket_path.display());
- let request = UDS_WEBSOCKET_HANDSHAKE_URL
- .into_client_request()
- .map_err(|err| {
- IoError::new(
- ErrorKind::InvalidInput,
- format!("invalid UDS websocket handshake URL: {err}"),
- )
- })?;
+ let request = websocket_request(UDS_WEBSOCKET_HANDSHAKE_URL).map_err(|err| {
+ IoError::new(
+ ErrorKind::InvalidInput,
+ format!("invalid UDS websocket handshake URL: {err}"),
+ )
+ })?;
let stream = timeout(CONNECT_TIMEOUT, UnixStream::connect(socket_path.as_path()))
.await
.map_err(|_| {
@@ -822,7 +822,6 @@ async fn connect_unix_socket_endpoint(
format!("timed out upgrading remote app server at `{endpoint}`"),
)
})?
- .map(|(stream, _response)| stream)
.map_err(|err| {
IoError::other(format!(
"failed to upgrade remote app server at `{endpoint}`: {err}"
@@ -832,6 +831,15 @@ async fn connect_unix_socket_endpoint(
Ok((endpoint, stream))
}
+fn websocket_request(url: &str) -> Result {
+ let mut request = url.into_client_request()?;
+ request.headers_mut().insert(
+ WEBSOCKET_COMPRESSION_HEADER,
+ HeaderValue::from_static(ZSTD_STREAM_PROTOCOL),
+ );
+ Ok(request)
+}
+
fn remote_websocket_config() -> WebSocketConfig {
WebSocketConfig::default()
.max_frame_size(Some(REMOTE_APP_SERVER_MAX_WEBSOCKET_MESSAGE_SIZE))
@@ -839,7 +847,7 @@ fn remote_websocket_config() -> WebSocketConfig {
}
async fn initialize_remote_connection(
- stream: &mut WebSocketStream,
+ stream: &mut RemoteWebSocket,
endpoint: &str,
params: InitializeParams,
initialize_timeout: Duration,
@@ -1030,7 +1038,7 @@ fn jsonrpc_notification_from_client_notification(
}
async fn write_jsonrpc_message(
- stream: &mut WebSocketStream,
+ stream: &mut RemoteWebSocket,
message: JSONRPCMessage,
endpoint: &str,
) -> IoResult<()>
@@ -1038,14 +1046,11 @@ where
S: AsyncRead + AsyncWrite + Unpin,
{
let payload = serde_json::to_string(&message).map_err(IoError::other)?;
- stream
- .send(Message::Text(payload.into()))
- .await
- .map_err(|err| {
- IoError::other(format!(
- "failed to write websocket message to `{endpoint}`: {err}"
- ))
- })
+ stream.send_text(payload).await.map_err(|err| {
+ IoError::other(format!(
+ "failed to write websocket message to `{endpoint}`: {err}"
+ ))
+ })
}
fn websocket_close_error_is_already_closed(err: &TungsteniteError) -> bool {
diff --git a/codex-rs/app-server-client/src/remote_websocket.rs b/codex-rs/app-server-client/src/remote_websocket.rs
new file mode 100644
index 000000000000..44fac9537732
--- /dev/null
+++ b/codex-rs/app-server-client/src/remote_websocket.rs
@@ -0,0 +1,120 @@
+//! Negotiated WebSocket compression. Codec history lasts for the connection.
+
+use std::io;
+
+use codex_app_server_transport::CompressionConnection;
+use codex_app_server_transport::WEBSOCKET_COMPRESSION_HEADER;
+use codex_app_server_transport::WebSocketCompression;
+use codex_app_server_transport::ZstdDecoder;
+use codex_app_server_transport::ZstdEncoder;
+use codex_app_server_transport::zstd_codec_pair;
+use futures::SinkExt;
+use futures::StreamExt;
+use tokio::io::AsyncRead;
+use tokio::io::AsyncWrite;
+use tokio_tungstenite::WebSocketStream;
+use tokio_tungstenite::tungstenite::Bytes;
+use tokio_tungstenite::tungstenite::Error;
+use tokio_tungstenite::tungstenite::Message;
+use tokio_tungstenite::tungstenite::handshake::client::Response;
+use tokio_tungstenite::tungstenite::http::HeaderValue;
+use tokio_tungstenite::tungstenite::protocol::frame::Frame;
+use tokio_tungstenite::tungstenite::protocol::frame::coding::Data;
+use tokio_tungstenite::tungstenite::protocol::frame::coding::OpCode;
+
+// Match the listener's default incoming frame limit when no smaller cap is advertised.
+const DEFAULT_MAX_FRAME_BYTES: usize = 16 << 20;
+const MAX_UNFRAGMENTED_MESSAGE_BYTES_HEADER: &str =
+ "x-codex-websocket-max-unfragmented-message-bytes";
+
+pub(crate) type WebSocketHandshake = (WebSocketStream, Response);
+
+pub(crate) struct RemoteWebSocket {
+ stream: WebSocketStream,
+ codec: Option<(ZstdEncoder, ZstdDecoder)>,
+ max_frame_bytes: usize,
+ write_failed: bool,
+}
+
+impl RemoteWebSocket {
+ pub(crate) fn from_handshake(
+ (stream, response): WebSocketHandshake,
+ max_message_size: usize,
+ ) -> io::Result {
+ let headers = response.headers();
+ let header = headers
+ .get(WEBSOCKET_COMPRESSION_HEADER)
+ .map(HeaderValue::to_str)
+ .transpose()
+ .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
+ let codec = match WebSocketCompression::from_response_header(header)? {
+ WebSocketCompression::Plain => None,
+ WebSocketCompression::Zstd => Some(zstd_codec_pair(
+ max_message_size,
+ CompressionConnection::NativeClient,
+ )?),
+ };
+ let max_frame_bytes = headers
+ .get(MAX_UNFRAGMENTED_MESSAGE_BYTES_HEADER)
+ .and_then(|value| value.to_str().ok())
+ .and_then(|value| value.parse::().ok())
+ .filter(|value| *value > 0)
+ .unwrap_or(DEFAULT_MAX_FRAME_BYTES)
+ .min(DEFAULT_MAX_FRAME_BYTES);
+ Ok(Self {
+ stream,
+ codec,
+ max_frame_bytes,
+ write_failed: false,
+ })
+ }
+
+ pub(crate) async fn next(&mut self) -> Option> {
+ if self.write_failed {
+ return Some(Err(Error::Io(io::ErrorKind::BrokenPipe.into())));
+ }
+ let message = self.stream.next().await?;
+ Some(match (&mut self.codec, message) {
+ (Some((_, decoder)), Ok(Message::Binary(bytes))) => decoder
+ .decode(&bytes)
+ .map(|text| Message::Text(text.into()))
+ .map_err(Error::Io),
+ (Some(_), Ok(Message::Text(_))) => Err(Error::Io(io::Error::new(
+ io::ErrorKind::InvalidData,
+ "expected compressed binary app-server message",
+ ))),
+ (_, message) => message,
+ })
+ }
+
+ pub(crate) async fn send_text(&mut self, text: String) -> Result<(), Error> {
+ if self.write_failed {
+ return Err(Error::Io(io::ErrorKind::BrokenPipe.into()));
+ }
+ let result = async {
+ let Some((encoder, _)) = &mut self.codec else {
+ return self.stream.send(Message::Text(text.into())).await;
+ };
+ let mut bytes = Bytes::from(encoder.encode(&text).map_err(Error::Io)?);
+ if bytes.len() <= self.max_frame_bytes {
+ return self.stream.send(Message::Binary(bytes)).await;
+ }
+ let mut opcode = OpCode::Data(Data::Binary);
+ while !bytes.is_empty() {
+ let chunk = bytes.split_to(bytes.len().min(self.max_frame_bytes));
+ let frame = Frame::message(chunk, opcode, bytes.is_empty());
+ self.stream.feed(Message::Frame(frame)).await?;
+ opcode = OpCode::Data(Data::Continue);
+ }
+ self.stream.flush().await
+ }
+ .await;
+ // A failed write may leave the compression history ahead of the receiver.
+ self.write_failed = result.is_err();
+ result
+ }
+
+ pub(crate) async fn close(&mut self) -> Result<(), Error> {
+ self.stream.close(/*msg*/ None).await
+ }
+}
diff --git a/codex-rs/app-server-client/tests/remote_compression.rs b/codex-rs/app-server-client/tests/remote_compression.rs
new file mode 100644
index 000000000000..cbab159c1d7d
--- /dev/null
+++ b/codex-rs/app-server-client/tests/remote_compression.rs
@@ -0,0 +1,115 @@
+//! Exercise a negotiated compressed session through the remote client API.
+
+use std::error::Error;
+
+use codex_app_server_client::AppServerEvent;
+use codex_app_server_client::RemoteAppServerClient;
+use codex_app_server_client::RemoteAppServerConnectArgs;
+use codex_app_server_client::RemoteAppServerEndpoint;
+use codex_app_server_protocol::JSONRPCRequest;
+use codex_app_server_protocol::RequestId;
+use codex_app_server_transport::WEBSOCKET_COMPRESSION_HEADER;
+use codex_app_server_transport::ZSTD_STREAM_PROTOCOL;
+use codex_app_server_transport::ZstdDecoder;
+use codex_app_server_transport::ZstdEncoder;
+use codex_uds::UnixListener;
+use codex_utils_absolute_path::AbsolutePathBuf;
+use futures::SinkExt;
+use futures::StreamExt;
+use pretty_assertions::assert_eq;
+use serde_json::Value;
+use serde_json::json;
+use tempfile::TempDir;
+use tokio_tungstenite::accept_hdr_async_with_config;
+use tokio_tungstenite::tungstenite::Message;
+use tokio_tungstenite::tungstenite::handshake::server::Request;
+use tokio_tungstenite::tungstenite::handshake::server::Response;
+use tokio_tungstenite::tungstenite::http::HeaderValue;
+use tokio_tungstenite::tungstenite::protocol::WebSocketConfig;
+
+#[tokio::test]
+async fn compressed_session_negotiates_fragments_and_retains_history() -> Result<(), Box>
+{
+ const FRAME_LIMIT: usize = 16;
+ let dir = TempDir::new()?;
+ let socket_path = AbsolutePathBuf::from_absolute_path(dir.path().join("codex.sock"))?;
+ let mut listener = UnixListener::bind(socket_path.as_path()).await?;
+ let server = async {
+ let stream = listener.accept().await?;
+ let mut websocket = accept_hdr_async_with_config(
+ stream,
+ |request: &Request, mut response: Response| {
+ assert_eq!(
+ request.headers()[WEBSOCKET_COMPRESSION_HEADER],
+ ZSTD_STREAM_PROTOCOL
+ );
+ response.headers_mut().insert(
+ WEBSOCKET_COMPRESSION_HEADER,
+ HeaderValue::from_static(ZSTD_STREAM_PROTOCOL),
+ );
+ response.headers_mut().insert(
+ "x-codex-websocket-max-unfragmented-message-bytes",
+ HeaderValue::from(FRAME_LIMIT),
+ );
+ Ok(response)
+ },
+ Some(WebSocketConfig::default().max_frame_size(Some(FRAME_LIMIT))),
+ )
+ .await?;
+ let mut decoder = ZstdDecoder::new(/*max_message_size*/ 1024)?;
+ let mut encoder = ZstdEncoder::new()?;
+ for expected_method in ["initialize", "initialized", "echo"] {
+ let Message::Binary(bytes) = websocket.next().await.ok_or("connection closed")?? else {
+ return Err("expected compressed message".into());
+ };
+ if expected_method == "initialize" {
+ assert!(
+ bytes.len() > FRAME_LIMIT,
+ "initialize must require fragmentation"
+ );
+ }
+ let request: Value = serde_json::from_str(&decoder.decode(&bytes)?)?;
+ assert_eq!(request["method"], expected_method);
+ if expected_method != "initialized" {
+ let response = json!({"id": request["id"], "result": {"ok": true}}).to_string();
+ websocket
+ .send(Message::Binary(encoder.encode(&response)?.into()))
+ .await?;
+ }
+ }
+ websocket.send(Message::Text("{}".into())).await?;
+ Ok::<(), Box>(())
+ };
+ let client = async {
+ let mut client = RemoteAppServerClient::connect(RemoteAppServerConnectArgs {
+ endpoint: RemoteAppServerEndpoint::UnixSocket { socket_path },
+ client_name: "compression-test".to_string(),
+ client_version: "0.0.0".to_string(),
+ experimental_api: false,
+ mcp_server_openai_form_elicitation: false,
+ opt_out_notification_methods: Vec::new(),
+ channel_capacity: 8,
+ })
+ .await?;
+ assert_eq!(
+ client
+ .request_handle()
+ .request_json_rpc(JSONRPCRequest {
+ id: RequestId::Integer(1),
+ method: "echo".to_string(),
+ params: None,
+ trace: None,
+ })
+ .await?,
+ Ok(json!({"ok": true}))
+ );
+ let Some(AppServerEvent::Disconnected { message }) = client.next_event().await else {
+ return Err("expected disconnect after uncompressed message".into());
+ };
+ assert!(message.contains("expected compressed binary"));
+ client.shutdown().await?;
+ Ok::<(), Box>(())
+ };
+ tokio::try_join!(server, client)?;
+ Ok(())
+}
diff --git a/codex-rs/app-server-daemon/Cargo.toml b/codex-rs/app-server-daemon/Cargo.toml
index 788f92f69c17..4bd1678402c2 100644
--- a/codex-rs/app-server-daemon/Cargo.toml
+++ b/codex-rs/app-server-daemon/Cargo.toml
@@ -45,6 +45,7 @@ tracing-appender = { workspace = true }
[dev-dependencies]
codex-utils-cargo-bin = { workspace = true }
pretty_assertions = { workspace = true }
+tokio = { workspace = true, features = ["test-util"] }
tracing-subscriber = { workspace = true }
[target.'cfg(windows)'.dependencies]
diff --git a/codex-rs/app-server-daemon/src/backend/mod.rs b/codex-rs/app-server-daemon/src/backend/mod.rs
index 1d2f4ecfacef..1c2ea755e939 100644
--- a/codex-rs/app-server-daemon/src/backend/mod.rs
+++ b/codex-rs/app-server-daemon/src/backend/mod.rs
@@ -10,6 +10,7 @@ use std::path::PathBuf;
use serde::Serialize;
pub(crate) use pid::PidBackend;
+pub(crate) use pid::wait_for_process_exit;
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
#[serde(rename_all = "camelCase")]
diff --git a/codex-rs/app-server-daemon/src/backend/pid.rs b/codex-rs/app-server-daemon/src/backend/pid.rs
index 60e793e18d76..97738dd8e24f 100644
--- a/codex-rs/app-server-daemon/src/backend/pid.rs
+++ b/codex-rs/app-server-daemon/src/backend/pid.rs
@@ -1,4 +1,5 @@
//! PID reservations serialize detached launches; process identities protect stale-record cleanup.
+//! PID probes explicitly unlock so concurrent forks cannot retain their transient reservations.
#[path = "pid_identity.rs"]
mod identity;
@@ -460,6 +461,20 @@ impl PidBackend {
}
}
+/// Wait for a published process to exit without modifying its PID reservation.
+pub(crate) async fn wait_for_process_exit(pid_file: &Path) {
+ loop {
+ // A missing or empty record can belong to a launch still publishing its PID.
+ if let Ok(contents) = fs::read(pid_file).await
+ && let Ok(record) = serde_json::from_slice::(&contents)
+ && matches!(process_matches_record(&record).await, Ok(false))
+ {
+ return;
+ }
+ sleep(crate::START_POLL_INTERVAL).await;
+ }
+}
+
pub(crate) async fn read_stderr_log_tail(pid_file: &Path) -> Result> {
let path = stderr_log_file_for_pid_file(pid_file);
let Some(contents) = read_log_tail(&path, STDERR_LOG_TAIL_BYTES).await? else {
@@ -689,7 +704,26 @@ async fn reservation_lock_is_active(path: &Path) -> Result {
.with_context(|| format!("failed to inspect pid lock file {}", path.display()));
}
};
- Ok(!try_lock_file(&file)?)
+ probe_reservation_lock(file)
+}
+
+#[cfg(any(unix, windows))]
+fn probe_reservation_lock(file: fs::File) -> Result {
+ if !try_lock_file(&file)? {
+ return Ok(true);
+ }
+ #[cfg(unix)]
+ {
+ use std::os::fd::AsRawFd;
+
+ // A concurrent fork can inherit this descriptor before it closes. Release the
+ // probe's lock explicitly so the child cannot look like a live reservation.
+ if unsafe { libc::flock(file.as_raw_fd(), libc::LOCK_UN) } != 0 {
+ return Err(std::io::Error::last_os_error())
+ .context("failed to unlock pid reservation probe");
+ }
+ }
+ Ok(false)
}
#[cfg(not(any(unix, windows)))]
@@ -716,9 +750,36 @@ async fn inspect_empty_pid_reservation(
});
}
};
+ inspect_empty_pid_reservation_with_file(pid_path, file).await
+}
+
+#[cfg(unix)]
+struct EmptyPidProbeLock(fs::File);
+
+#[cfg(unix)]
+impl Drop for EmptyPidProbeLock {
+ fn drop(&mut self) {
+ use std::os::fd::AsRawFd;
+
+ // Closing alone leaves the lock held by any concurrent fork. Release it
+ // on every exit, including errors and cancellation while inspecting the PID.
+ if unsafe { libc::flock(self.0.as_raw_fd(), libc::LOCK_UN) } != 0 {
+ let error = std::io::Error::last_os_error();
+ tracing::warn!(%error, "failed to unlock empty pid reservation probe");
+ }
+ }
+}
+
+#[cfg(any(unix, windows))]
+async fn inspect_empty_pid_reservation_with_file(
+ pid_path: &Path,
+ file: fs::File,
+) -> Result {
if !try_lock_file(&file)? {
return Ok(EmptyPidReservation::Active);
}
+ #[cfg(unix)]
+ let _probe_lock = EmptyPidProbeLock(file);
let contents = match fs::read_to_string(pid_path).await {
Ok(contents) => contents,
@@ -757,6 +818,7 @@ async fn read_process_start_time(pid: u32) -> Result {
async fn read_process_details(pid: u32) -> Result<(String, String)> {
let output = Command::new("ps")
.args(["-p", &pid.to_string(), "-o", "stat=", "-o", "lstart="])
+ .kill_on_drop(true)
.output()
.await
.context("failed to invoke ps for pid-managed app server")?;
diff --git a/codex-rs/app-server-daemon/src/backend/pid_tests.rs b/codex-rs/app-server-daemon/src/backend/pid_tests.rs
index e04b230cdd21..3c47d1249674 100644
--- a/codex-rs/app-server-daemon/src/backend/pid_tests.rs
+++ b/codex-rs/app-server-daemon/src/backend/pid_tests.rs
@@ -67,6 +67,17 @@ async fn locked_empty_pid_file_is_treated_as_active_reservation() {
PidFileState::Starting
);
assert!(pid_file.exists());
+
+ tokio::fs::remove_file(&pid_file)
+ .await
+ .expect("remove pid file");
+ assert_eq!(
+ backend
+ .read_pid_file_state()
+ .await
+ .expect("read missing pid"),
+ PidFileState::Starting
+ );
}
#[tokio::test]
@@ -89,6 +100,115 @@ async fn unlocked_empty_pid_file_is_treated_as_stale_reservation() {
assert!(!pid_file.exists());
}
+#[cfg(unix)]
+#[test]
+fn reservation_probe_releases_lock_with_duplicated_handle() {
+ #[derive(Debug, Clone, Copy)]
+ enum Probe {
+ Missing,
+ Empty,
+ ReadError,
+ Cancelled,
+ }
+
+ let runtime = tokio::runtime::Builder::new_current_thread()
+ .enable_all()
+ .max_blocking_threads(/*val*/ 1)
+ .build()
+ .expect("runtime");
+ runtime.block_on(async {
+ for case in [
+ Probe::Missing,
+ Probe::Empty,
+ Probe::ReadError,
+ Probe::Cancelled,
+ ] {
+ let temp_dir = TempDir::new().expect("temp dir");
+ let backend = PidBackend::new(
+ temp_dir.path().join("codex"),
+ temp_dir.path().join("app-server.pid"),
+ /*remote_control_enabled*/ false,
+ );
+ match case {
+ Probe::Missing => {}
+ Probe::Empty | Probe::Cancelled => {
+ std::fs::write(&backend.pid_file, "").expect("empty pid file");
+ }
+ Probe::ReadError => {
+ std::fs::create_dir(&backend.pid_file).expect("unreadable pid file");
+ }
+ }
+ let file = std::fs::OpenOptions::new()
+ .create(true)
+ .truncate(false)
+ .write(true)
+ .open(&backend.lock_file)
+ .expect("open pid lock file");
+ // Share the open file description as fork would, without inheriting
+ // unrelated descriptors from other tests.
+ let inherited = file.try_clone().expect("clone pid lock file");
+
+ let file = tokio::fs::File::from_std(file);
+ let mut cancellation = None;
+ let probe = match case {
+ Probe::Missing => super::probe_reservation_lock(file),
+ Probe::Empty | Probe::ReadError => {
+ super::inspect_empty_pid_reservation_with_file(&backend.pid_file, file)
+ .await
+ .map(|state| state != super::EmptyPidReservation::Stale)
+ }
+ Probe::Cancelled => {
+ // Occupy the sole blocking worker so the PID read cannot finish
+ // before cancellation. No timing assumptions or sleeps are needed.
+ let (started_tx, started_rx) = std::sync::mpsc::channel();
+ let (release_tx, release_rx) = std::sync::mpsc::channel();
+ let blocker = tokio::task::spawn_blocking(move || {
+ started_tx.send(()).expect("worker started");
+ release_rx.recv().expect("release worker");
+ });
+ started_rx.recv().expect("wait for worker");
+ let mut inspection = Box::pin(super::inspect_empty_pid_reservation_with_file(
+ &backend.pid_file,
+ file,
+ ));
+ let pending = futures::poll!(&mut inspection).is_pending();
+ let contender = tokio::fs::File::from_std(
+ std::fs::OpenOptions::new()
+ .write(true)
+ .open(&backend.lock_file)
+ .expect("open competing reservation"),
+ );
+ cancellation = Some((pending, try_lock_file(&contender)));
+ drop(contender);
+ drop(inspection);
+ release_tx.send(()).expect("unblock PID read");
+ blocker.await.expect("blocking worker");
+ Ok(false)
+ }
+ };
+ if matches!(case, Probe::ReadError) {
+ std::fs::remove_dir(&backend.pid_file).expect("remove unreadable pid file");
+ }
+ let running = backend.is_starting_or_running().await;
+
+ drop(inherited);
+ match case {
+ Probe::ReadError => assert!(probe.is_err(), "{case:?}"),
+ Probe::Missing | Probe::Empty | Probe::Cancelled => {
+ assert!(!probe.expect("probe reservation"), "{case:?}");
+ }
+ }
+ if let Some((pending, acquired)) = cancellation {
+ assert_eq!(
+ (pending, acquired.expect("competing reservation")),
+ (true, false)
+ );
+ }
+ assert!(!running.expect("read daemon status"), "{case:?}");
+ }
+ });
+}
+
#[tokio::test]
async fn stop_waits_for_live_reservation_to_resolve() {
let temp_dir = TempDir::new().expect("temp dir");
diff --git a/codex-rs/app-server-daemon/src/lib.rs b/codex-rs/app-server-daemon/src/lib.rs
index 0c4f95ff2fce..51b9c72e72f8 100644
--- a/codex-rs/app-server-daemon/src/lib.rs
+++ b/codex-rs/app-server-daemon/src/lib.rs
@@ -50,10 +50,11 @@ use tokio::time::sleep;
const START_POLL_INTERVAL: Duration = Duration::from_millis(50);
// An older updater can pass background policy to a replacement daemon, so retain
-// the longer readiness allowance during upgrades on macOS.
-#[cfg(target_os = "macos")]
+// the longer readiness allowance during upgrades on macOS. On Linux, a cold
+// start from a rotational disk can take more than ten seconds.
+#[cfg(any(target_os = "macos", target_os = "linux"))]
const START_TIMEOUT: Duration = Duration::from_secs(30);
-#[cfg(not(target_os = "macos"))]
+#[cfg(not(any(target_os = "macos", target_os = "linux")))]
const START_TIMEOUT: Duration = Duration::from_secs(10);
// Leave room for the longest graceful stop, forced-exit check, and restart.
const OPERATION_LOCK_TIMEOUT: Duration =
@@ -701,20 +702,22 @@ impl Daemon {
}
async fn wait_until_ready(&self) -> Result {
+ let exited = backend::wait_for_process_exit(&self.pid_file);
+ tokio::pin!(exited);
let deadline = tokio::time::Instant::now() + START_TIMEOUT;
- loop {
+ let err = loop {
match client::probe(&self.socket_path).await {
Ok(info) => return Ok(info),
Err(err) if tokio::time::Instant::now() < deadline => {
- let _ = err;
- sleep(START_POLL_INTERVAL).await;
- }
- Err(err) => {
- let context = self.app_server_not_ready_context().await;
- return Err(err).context(context);
+ tokio::select! {
+ () = &mut exited => break err,
+ () = sleep(START_POLL_INTERVAL) => {}
+ }
}
+ Err(err) => break err,
}
- }
+ };
+ Err(err).context(self.app_server_not_ready_context().await)
}
async fn app_server_not_ready_context(&self) -> String {
@@ -1523,7 +1526,7 @@ mod tests {
}
#[tokio::test]
- async fn not_ready_context_reports_daemon_app_server_before_stderr() {
+ async fn readiness_reports_stderr_promptly_when_daemon_is_gone() {
let temp_dir = TempDir::new().expect("temp dir");
let daemon = Daemon {
log_diagnostics: false,
@@ -1539,8 +1542,25 @@ mod tests {
.await
.expect("write stderr log");
+ // A daemon that exits during startup leaves its published PID record behind.
+ let mut child = std::process::Command::new(std::env::current_exe().unwrap())
+ .arg("--help")
+ .stdout(std::process::Stdio::null())
+ .spawn()
+ .unwrap();
+ child.wait().unwrap();
+ std::fs::write(
+ &daemon.pid_file,
+ serde_json::json!({ "pid": child.id(), "processStartTime": "exited" }).to_string(),
+ )
+ .unwrap();
+ let error =
+ tokio::time::timeout(std::time::Duration::from_secs(5), daemon.wait_until_ready())
+ .await
+ .expect("an exited daemon should not exhaust the readiness timeout")
+ .expect_err("daemon is gone");
assert_eq!(
- daemon.app_server_not_ready_context().await,
+ error.to_string(),
format!(
"app server did not become ready on {}\n\n\
Daemon used app-server:\n path: {}\n version: unknown\n\n\
diff --git a/codex-rs/app-server-daemon/src/prepare_install_tests.rs b/codex-rs/app-server-daemon/src/prepare_install_tests.rs
index ee33ca866bbe..48f389a21cde 100644
--- a/codex-rs/app-server-daemon/src/prepare_install_tests.rs
+++ b/codex-rs/app-server-daemon/src/prepare_install_tests.rs
@@ -120,8 +120,8 @@ async fn seeds_full_package() {
use std::os::unix::fs::PermissionsExt;
let read_only = old.join("codex-resources/nested");
std::fs::set_permissions(&read_only, std::fs::Permissions::from_mode(0o555)).unwrap();
- let _ = release_pruning::prune(&daemon, &root, &settings).await;
- assert!(!old.exists());
+ let result = release_pruning::prune(&daemon, &root, &settings).await;
+ assert!(!old.exists(), "release was not retired: {result:#?}");
for retained in [&selected, &previous, &outside, &linked] {
assert!(retained.join("codex-resources/nested/runtime").is_file());
}
diff --git a/codex-rs/app-server-daemon/src/remote_control_client.rs b/codex-rs/app-server-daemon/src/remote_control_client.rs
index 74c978f21930..d48a71f851e3 100644
--- a/codex-rs/app-server-daemon/src/remote_control_client.rs
+++ b/codex-rs/app-server-daemon/src/remote_control_client.rs
@@ -28,6 +28,8 @@ use crate::RemoteControlReadyStatus;
use crate::client;
const REMOTE_CONTROL_READY_TIMEOUT: Duration = Duration::from_secs(10);
+// Allow the daemon's 30-second pairing request to finish and return its response.
+const PAIRING_TIMEOUT: Duration = Duration::from_secs(35);
const REMOTE_CONTROL_REQUEST_ID: RequestId = RequestId::Integer(2);
const INVALID_PARAMS_ERROR_CODE: i64 = -32602;
@@ -56,6 +58,12 @@ pub(crate) async fn disable_remote_control(socket_path: &Path) -> Result Result {
+ timeout(PAIRING_TIMEOUT, start_pairing_inner(socket_path))
+ .await
+ .context("timed out waiting for remoteControl/pairing/start response")?
+}
+
+async fn start_pairing_inner(socket_path: &Path) -> Result {
let mut websocket = client::connect(socket_path).await?;
initialize_client(&mut websocket).await?;
let params = serde_json::to_value(RemoteControlPairingStartParams { manual_code: true })?;
@@ -70,6 +78,7 @@ pub(crate) async fn start_pairing(socket_path: &Path) -> Result Ok(response),
RemoteControlRpcResponse::InvalidParams => {
send_remote_control_request(
@@ -177,8 +194,13 @@ where
/*params*/ None,
)
.await?;
- match read_remote_control_response(websocket, &REMOTE_CONTROL_REQUEST_ID, method)
- .await?
+ match read_remote_control_response(
+ websocket,
+ &REMOTE_CONTROL_REQUEST_ID,
+ method,
+ message_timeout,
+ )
+ .await?
{
RemoteControlRpcResponse::Success(response) => Ok(response),
RemoteControlRpcResponse::InvalidParams => {
@@ -217,18 +239,21 @@ async fn read_remote_control_response(
websocket: &mut WebSocketStream,
request_id: &RequestId,
method: &str,
+ message_timeout: Option,
) -> Result>
where
S: AsyncRead + AsyncWrite + Unpin,
T: DeserializeOwned,
{
loop {
- let message = timeout(
- client::CONTROL_SOCKET_RESPONSE_TIMEOUT,
- client::read_message(websocket),
- )
- .await
- .with_context(|| format!("timed out waiting for {method} response"))??;
+ let read = client::read_message(websocket);
+ let message = if let Some(duration) = message_timeout {
+ timeout(duration, read)
+ .await
+ .with_context(|| format!("timed out waiting for {method} response"))??
+ } else {
+ read.await?
+ };
match message {
JSONRPCMessage::Response(response) if response.id == *request_id => {
let response = serde_json::from_value::(response.result)
@@ -586,6 +611,10 @@ mod tests {
pairing.params,
Some(serde_json::json!({ "manualCode": true }))
);
+ // Use virtual time only for the reply delay, after the socket handshake.
+ tokio::time::pause();
+ sleep(Duration::from_secs(3)).await;
+ tokio::time::resume();
client::send_message(
&mut websocket,
&JSONRPCMessage::Response(JSONRPCResponse {
@@ -616,6 +645,42 @@ mod tests {
Ok(())
}
+ #[tokio::test]
+ async fn pairing_notification_does_not_extend_the_response_deadline() -> Result<()> {
+ let dir = TempDir::new()?;
+ let socket_path = dir.path().join("app-server.sock");
+ let listener = UnixListener::bind(&socket_path).await?;
+ let server_task = tokio::spawn(async move {
+ let mut websocket = accept_initialized_client(listener).await?;
+ client::read_message(&mut websocket).await?;
+
+ tokio::time::pause();
+ sleep(Duration::from_secs(20)).await;
+ send_remote_control_status(
+ &mut websocket,
+ remote_control_status(
+ RemoteControlConnectionStatus::Connecting,
+ /*environment_id*/ None,
+ ),
+ )
+ .await?;
+ // With a fresh timeout after the notification, the client would see EOF at 40s.
+ sleep(Duration::from_secs(20)).await;
+ Ok::<_, anyhow::Error>(())
+ });
+
+ let start = Instant::now();
+ let error = start_pairing(&socket_path).await.unwrap_err();
+ let elapsed = start.elapsed();
+ server_task.await??;
+ assert!(error.is::(), "{error:#}");
+ assert!(
+ (Duration::from_secs(30)..Duration::from_secs(40)).contains(&elapsed),
+ "pairing timed out after {elapsed:?}"
+ );
+ Ok(())
+ }
+
struct EnableScenario {
initial_notification: Option,
enable_response: RemoteControlStatusChangedNotification,
diff --git a/codex-rs/app-server-daemon/src/update_loop_tests.rs b/codex-rs/app-server-daemon/src/update_loop_tests.rs
index 02aca068a152..3eaf610e3d9e 100644
--- a/codex-rs/app-server-daemon/src/update_loop_tests.rs
+++ b/codex-rs/app-server-daemon/src/update_loop_tests.rs
@@ -829,6 +829,29 @@ async fn manual_update_restarts_managed_daemon_with_automatic_updates_disabled()
check_manual_update_restart("standalone").await;
}
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+#[tokio::test]
+async fn readiness_waits_for_a_slow_managed_daemon() {
+ let home = TempDir::new().unwrap();
+ let (daemon, _) = manual_update_daemon(&home);
+ let settings = crate::settings::DaemonSettings::default();
+ let backend = crate::backend::pid_backend(daemon.backend_paths(&settings));
+ backend.start().await.unwrap();
+
+ tokio::time::pause();
+ let (ready, listener) = tokio::join!(daemon.wait_until_ready(), async {
+ // Model a cold start that takes longer than the old Linux readiness deadline.
+ tokio::time::sleep(Duration::from_secs(15)).await;
+ tokio::time::resume();
+ test_control_server(&daemon, home.path())
+ .await
+ .abort_handle()
+ });
+ backend.stop().await.unwrap();
+ listener.abort();
+ assert_eq!(ready.unwrap().app_server_version, "1.0.0");
+}
+
#[cfg(unix)]
#[tokio::test]
async fn daemon_start_and_restart_preserve_launch_features() {
diff --git a/codex-rs/app-server-protocol/BUILD.bazel b/codex-rs/app-server-protocol/BUILD.bazel
index ff2343250588..097997b93245 100644
--- a/codex-rs/app-server-protocol/BUILD.bazel
+++ b/codex-rs/app-server-protocol/BUILD.bazel
@@ -67,7 +67,13 @@ rust_binary(
"BAZEL_PACKAGE": "codex-rs/app-server-protocol",
"CARGO_PKG_NAME": "codex-app-server-protocol",
},
- rustc_flags = ["--test"] + WINDOWS_RUSTC_LINK_FLAGS,
+ # This short-lived exporter sits on application builds' critical path. Avoid
+ # optimizing its full test harness, retaining exec-mode assertion behavior.
+ rustc_flags = [
+ "--test",
+ "-Copt-level=0",
+ "-Cdebug-assertions=no",
+ ] + WINDOWS_RUSTC_LINK_FLAGS,
tags = ["manual"],
visibility = ["//bazel/schema:__pkg__"],
deps = all_crate_deps(
diff --git a/codex-rs/app-server-protocol/schema/json/ClientRequest.json b/codex-rs/app-server-protocol/schema/json/ClientRequest.json
index 8702f522a449..ccb590e3a95b 100644
--- a/codex-rs/app-server-protocol/schema/json/ClientRequest.json
+++ b/codex-rs/app-server-protocol/schema/json/ClientRequest.json
@@ -17,6 +17,13 @@
"kind": {
"$ref": "#/definitions/AdditionalContextKind"
},
+ "name": {
+ "description": "Optional name for untrusted context, used to label its tool output.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"value": {
"type": "string"
}
@@ -3953,8 +3960,7 @@
},
"ReviewDelivery": {
"enum": [
- "inline",
- "detached"
+ "inline"
],
"type": "string"
},
@@ -3970,7 +3976,7 @@
}
],
"default": null,
- "description": "Where to run the review: inline (default) on the current thread or detached on a new thread (returned in `reviewThreadId`). Detached delivery is deprecated and emits `deprecationNotice`. Use `thread/start` followed by an inline review for a separate review thread."
+ "description": "Reviews run inline on the supplied thread. Omit this field or pass `inline`. To review on a separate thread, start a thread first and use its id."
},
"target": {
"$ref": "#/definitions/ReviewTarget"
diff --git a/codex-rs/app-server-protocol/schema/json/ServerNotification.json b/codex-rs/app-server-protocol/schema/json/ServerNotification.json
index cf708bc436cb..d97a0ac6f479 100644
--- a/codex-rs/app-server-protocol/schema/json/ServerNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/ServerNotification.json
@@ -664,6 +664,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -3401,6 +3402,13 @@
"format": "int32",
"type": "integer"
},
+ "outputDrainTimedOut": {
+ "description": "Whether output collection hit its post-exit deadline before seeing EOF or reaching the requested byte cap on either stream. Older servers omit this field.",
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
"processHandle": {
"description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
"type": "string"
@@ -4643,6 +4651,7 @@
"type": "string"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -5425,6 +5434,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -5545,7 +5562,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadNameUpdatedNotification": {
"properties": {
diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
index 317837bdf18a..afeb27696a4b 100644
--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
@@ -6805,6 +6805,13 @@
],
"title": "ChatgptAccountType",
"type": "string"
+ },
+ "workspaceName": {
+ "description": "Display name of the selected ChatGPT workspace, when available.",
+ "type": [
+ "string",
+ "null"
+ ]
}
},
"required": [
@@ -6912,6 +6919,103 @@
],
"type": "string"
},
+ "AccountSession": {
+ "properties": {
+ "displayName": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "email": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "imageUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "isActive": {
+ "type": "boolean"
+ },
+ "lastUsedAt": {
+ "format": "int64",
+ "type": "integer"
+ },
+ "selectedWorkspaceAccountId": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "sessionId": {
+ "type": "string"
+ },
+ "userId": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "workspaces": {
+ "items": {
+ "$ref": "#/definitions/v2/AccountSessionWorkspace"
+ },
+ "type": "array"
+ }
+ },
+ "required": [
+ "isActive",
+ "lastUsedAt",
+ "sessionId",
+ "workspaces"
+ ],
+ "type": "object"
+ },
+ "AccountSessionWorkspace": {
+ "properties": {
+ "accountId": {
+ "type": "string"
+ },
+ "imageUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "kind": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/v2/AccountSessionWorkspaceKind"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "name": {
+ "type": [
+ "string",
+ "null"
+ ]
+ }
+ },
+ "required": [
+ "accountId"
+ ],
+ "type": "object"
+ },
+ "AccountSessionWorkspaceKind": {
+ "enum": [
+ "personal",
+ "workspace"
+ ],
+ "type": "string"
+ },
"AccountTokenUsageDailyBucket": {
"properties": {
"startDate": {
@@ -7034,6 +7138,13 @@
"kind": {
"$ref": "#/definitions/v2/AdditionalContextKind"
},
+ "name": {
+ "description": "Optional name for untrusted context, used to label its tool output.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"value": {
"type": "string"
}
@@ -8580,6 +8691,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -10294,6 +10406,16 @@
}
]
},
+ "otel": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/v2/OtelRequirements"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
"sqliteHome": {
"type": [
"string",
@@ -15989,6 +16111,81 @@
"title": "ModelProviderCapabilitiesReadResponse",
"type": "object"
},
+ "ModelProviderError": {
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "description": "Structured JSON-RPC error data. Unknown errors must retain the client's normal fallback.",
+ "oneOf": [
+ {
+ "properties": {
+ "currentModelProvider": {
+ "type": "string"
+ },
+ "modelProvider": {
+ "type": "string"
+ },
+ "type": {
+ "enum": [
+ "modelProviderMismatch"
+ ],
+ "title": "ModelProviderMismatchv2::ModelProviderErrorType",
+ "type": "string"
+ }
+ },
+ "required": [
+ "currentModelProvider",
+ "modelProvider",
+ "type"
+ ],
+ "title": "ModelProviderMismatchv2::ModelProviderError",
+ "type": "object"
+ },
+ {
+ "properties": {
+ "modelProvider": {
+ "type": "string"
+ },
+ "type": {
+ "enum": [
+ "modelProviderNotConfigured"
+ ],
+ "title": "ModelProviderNotConfiguredv2::ModelProviderErrorType",
+ "type": "string"
+ }
+ },
+ "required": [
+ "modelProvider",
+ "type"
+ ],
+ "title": "ModelProviderNotConfiguredv2::ModelProviderError",
+ "type": "object"
+ },
+ {
+ "properties": {
+ "modelProvider": {
+ "type": "string"
+ },
+ "requiredModelProvider": {
+ "type": "string"
+ },
+ "type": {
+ "enum": [
+ "modelProviderPolicyConflict"
+ ],
+ "title": "ModelProviderPolicyConflictv2::ModelProviderErrorType",
+ "type": "string"
+ }
+ },
+ "required": [
+ "modelProvider",
+ "requiredModelProvider",
+ "type"
+ ],
+ "title": "ModelProviderPolicyConflictv2::ModelProviderError",
+ "type": "object"
+ }
+ ],
+ "title": "ModelProviderError"
+ },
"ModelRerouteReason": {
"enum": [
"highRiskCyberActivity"
@@ -16287,7 +16484,7 @@
"additionalProperties": {
"$ref": "#/definitions/v2/NetworkDomainPermission"
},
- "description": "Canonical network permission map for `experimental_network`.",
+ "description": "Canonical managed network permission map.",
"type": [
"object",
"null"
@@ -16336,7 +16533,7 @@
"additionalProperties": {
"$ref": "#/definitions/v2/NetworkUnixSocketPermission"
},
- "description": "Canonical unix socket permission map for `experimental_network`.",
+ "description": "Canonical managed unix socket permission map.",
"type": [
"object",
"null"
@@ -16410,6 +16607,232 @@
],
"title": "Nullable_GetAccountTokenUsageParams"
},
+ "OtelExporter": {
+ "oneOf": [
+ {
+ "enum": [
+ "none",
+ "statsig"
+ ],
+ "type": "string"
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "otlp-http": {
+ "properties": {
+ "endpoint": {
+ "type": "string"
+ },
+ "headers": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "description": "Header names are retained; values are redacted by the server.",
+ "type": "object"
+ },
+ "protocol": {
+ "$ref": "#/definitions/v2/OtelHttpProtocol"
+ },
+ "tls": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/v2/OtelTlsConfig"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ }
+ },
+ "required": [
+ "endpoint",
+ "headers",
+ "protocol"
+ ],
+ "type": "object"
+ }
+ },
+ "required": [
+ "otlp-http"
+ ],
+ "title": "OtlpHttpOtelExporter",
+ "type": "object"
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "otlp-grpc": {
+ "properties": {
+ "endpoint": {
+ "type": "string"
+ },
+ "headers": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "description": "Header names are retained; values are redacted by the server.",
+ "type": "object"
+ },
+ "tls": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/v2/OtelTlsConfig"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ }
+ },
+ "required": [
+ "endpoint",
+ "headers"
+ ],
+ "type": "object"
+ }
+ },
+ "required": [
+ "otlp-grpc"
+ ],
+ "title": "OtlpGrpcOtelExporter",
+ "type": "object"
+ }
+ ]
+ },
+ "OtelHttpProtocol": {
+ "enum": [
+ "binary",
+ "json"
+ ],
+ "type": "string"
+ },
+ "OtelRequirements": {
+ "properties": {
+ "environment": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "exporter": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/v2/OtelExporter"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "log_agent_responses": {
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "log_guardian_assessments": {
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "log_user_prompt": {
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "metrics_exporter": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/v2/OtelExporter"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "span_attributes": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "type": [
+ "object",
+ "null"
+ ]
+ },
+ "tool_result": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/v2/OtelToolResultLogConfig"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "trace_exporter": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/v2/OtelExporter"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "tracestate": {
+ "additionalProperties": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "type": "object"
+ },
+ "type": [
+ "object",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
+ },
+ "OtelTlsConfig": {
+ "properties": {
+ "ca-certificate": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "client-certificate": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "client-private-key": {
+ "type": [
+ "string",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
+ },
+ "OtelToolResultLogConfig": {
+ "properties": {
+ "max_bytes": {
+ "format": "uint",
+ "minimum": 0.0,
+ "type": "integer"
+ }
+ },
+ "required": [
+ "max_bytes"
+ ],
+ "type": "object"
+ },
"OverriddenMetadata": {
"properties": {
"effectiveValue": true,
@@ -18005,6 +18428,13 @@
"format": "int32",
"type": "integer"
},
+ "outputDrainTimedOut": {
+ "description": "Whether output collection hit its post-exit deadline before seeing EOF or reaching the requested byte cap on either stream. Older servers omit this field.",
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
"processHandle": {
"description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
"type": "string"
@@ -19982,8 +20412,7 @@
},
"ReviewDelivery": {
"enum": [
- "inline",
- "detached"
+ "inline"
],
"type": "string"
},
@@ -20000,7 +20429,7 @@
}
],
"default": null,
- "description": "Where to run the review: inline (default) on the current thread or detached on a new thread (returned in `reviewThreadId`). Detached delivery is deprecated and emits `deprecationNotice`. Use `thread/start` followed by an inline review for a separate review thread."
+ "description": "Reviews run inline on the supplied thread. Omit this field or pass `inline`. To review on a separate thread, start a thread first and use its id."
},
"target": {
"$ref": "#/definitions/v2/ReviewTarget"
@@ -20020,7 +20449,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"reviewThreadId": {
- "description": "Identifies the thread where the review runs.\n\nFor inline reviews, this is the original thread id. For detached reviews, this is the id of the new review thread.",
+ "description": "The thread id supplied to `review/start`.",
"type": "string"
},
"turn": {
@@ -22316,6 +22745,7 @@
"type": "object"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -23098,6 +23528,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -23218,7 +23656,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadItemEntry": {
"properties": {
@@ -25870,6 +26329,14 @@
},
"type": "array"
},
+ "nativeUsageUsdMicros": {
+ "description": "Native dollar usage, independent of credit estimates. None means unknown, not zero.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
"threadId": {
"type": "string"
}
diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
index fac312d9ac25..b6a76228a4c3 100644
--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
@@ -40,6 +40,13 @@
],
"title": "ChatgptAccountType",
"type": "string"
+ },
+ "workspaceName": {
+ "description": "Display name of the selected ChatGPT workspace, when available.",
+ "type": [
+ "string",
+ "null"
+ ]
}
},
"required": [
@@ -147,6 +154,103 @@
],
"type": "string"
},
+ "AccountSession": {
+ "properties": {
+ "displayName": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "email": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "imageUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "isActive": {
+ "type": "boolean"
+ },
+ "lastUsedAt": {
+ "format": "int64",
+ "type": "integer"
+ },
+ "selectedWorkspaceAccountId": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "sessionId": {
+ "type": "string"
+ },
+ "userId": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "workspaces": {
+ "items": {
+ "$ref": "#/definitions/AccountSessionWorkspace"
+ },
+ "type": "array"
+ }
+ },
+ "required": [
+ "isActive",
+ "lastUsedAt",
+ "sessionId",
+ "workspaces"
+ ],
+ "type": "object"
+ },
+ "AccountSessionWorkspace": {
+ "properties": {
+ "accountId": {
+ "type": "string"
+ },
+ "imageUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "kind": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/AccountSessionWorkspaceKind"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "name": {
+ "type": [
+ "string",
+ "null"
+ ]
+ }
+ },
+ "required": [
+ "accountId"
+ ],
+ "type": "object"
+ },
+ "AccountSessionWorkspaceKind": {
+ "enum": [
+ "personal",
+ "workspace"
+ ],
+ "type": "string"
+ },
"AccountTokenUsageDailyBucket": {
"properties": {
"startDate": {
@@ -269,6 +373,13 @@
"kind": {
"$ref": "#/definitions/AdditionalContextKind"
},
+ "name": {
+ "description": "Optional name for untrusted context, used to label its tool output.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"value": {
"type": "string"
}
@@ -4396,6 +4507,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -6110,6 +6222,16 @@
}
]
},
+ "otel": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelRequirements"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
"sqliteHome": {
"type": [
"string",
@@ -11981,6 +12103,81 @@
"title": "ModelProviderCapabilitiesReadResponse",
"type": "object"
},
+ "ModelProviderError": {
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "description": "Structured JSON-RPC error data. Unknown errors must retain the client's normal fallback.",
+ "oneOf": [
+ {
+ "properties": {
+ "currentModelProvider": {
+ "type": "string"
+ },
+ "modelProvider": {
+ "type": "string"
+ },
+ "type": {
+ "enum": [
+ "modelProviderMismatch"
+ ],
+ "title": "ModelProviderMismatchv2::ModelProviderErrorType",
+ "type": "string"
+ }
+ },
+ "required": [
+ "currentModelProvider",
+ "modelProvider",
+ "type"
+ ],
+ "title": "ModelProviderMismatchv2::ModelProviderError",
+ "type": "object"
+ },
+ {
+ "properties": {
+ "modelProvider": {
+ "type": "string"
+ },
+ "type": {
+ "enum": [
+ "modelProviderNotConfigured"
+ ],
+ "title": "ModelProviderNotConfiguredv2::ModelProviderErrorType",
+ "type": "string"
+ }
+ },
+ "required": [
+ "modelProvider",
+ "type"
+ ],
+ "title": "ModelProviderNotConfiguredv2::ModelProviderError",
+ "type": "object"
+ },
+ {
+ "properties": {
+ "modelProvider": {
+ "type": "string"
+ },
+ "requiredModelProvider": {
+ "type": "string"
+ },
+ "type": {
+ "enum": [
+ "modelProviderPolicyConflict"
+ ],
+ "title": "ModelProviderPolicyConflictv2::ModelProviderErrorType",
+ "type": "string"
+ }
+ },
+ "required": [
+ "modelProvider",
+ "requiredModelProvider",
+ "type"
+ ],
+ "title": "ModelProviderPolicyConflictv2::ModelProviderError",
+ "type": "object"
+ }
+ ],
+ "title": "ModelProviderError"
+ },
"ModelRerouteReason": {
"enum": [
"highRiskCyberActivity"
@@ -12279,7 +12476,7 @@
"additionalProperties": {
"$ref": "#/definitions/NetworkDomainPermission"
},
- "description": "Canonical network permission map for `experimental_network`.",
+ "description": "Canonical managed network permission map.",
"type": [
"object",
"null"
@@ -12328,7 +12525,7 @@
"additionalProperties": {
"$ref": "#/definitions/NetworkUnixSocketPermission"
},
- "description": "Canonical unix socket permission map for `experimental_network`.",
+ "description": "Canonical managed unix socket permission map.",
"type": [
"object",
"null"
@@ -12402,6 +12599,232 @@
],
"title": "Nullable_GetAccountTokenUsageParams"
},
+ "OtelExporter": {
+ "oneOf": [
+ {
+ "enum": [
+ "none",
+ "statsig"
+ ],
+ "type": "string"
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "otlp-http": {
+ "properties": {
+ "endpoint": {
+ "type": "string"
+ },
+ "headers": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "description": "Header names are retained; values are redacted by the server.",
+ "type": "object"
+ },
+ "protocol": {
+ "$ref": "#/definitions/OtelHttpProtocol"
+ },
+ "tls": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelTlsConfig"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ }
+ },
+ "required": [
+ "endpoint",
+ "headers",
+ "protocol"
+ ],
+ "type": "object"
+ }
+ },
+ "required": [
+ "otlp-http"
+ ],
+ "title": "OtlpHttpOtelExporter",
+ "type": "object"
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "otlp-grpc": {
+ "properties": {
+ "endpoint": {
+ "type": "string"
+ },
+ "headers": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "description": "Header names are retained; values are redacted by the server.",
+ "type": "object"
+ },
+ "tls": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelTlsConfig"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ }
+ },
+ "required": [
+ "endpoint",
+ "headers"
+ ],
+ "type": "object"
+ }
+ },
+ "required": [
+ "otlp-grpc"
+ ],
+ "title": "OtlpGrpcOtelExporter",
+ "type": "object"
+ }
+ ]
+ },
+ "OtelHttpProtocol": {
+ "enum": [
+ "binary",
+ "json"
+ ],
+ "type": "string"
+ },
+ "OtelRequirements": {
+ "properties": {
+ "environment": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "exporter": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelExporter"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "log_agent_responses": {
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "log_guardian_assessments": {
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "log_user_prompt": {
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "metrics_exporter": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelExporter"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "span_attributes": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "type": [
+ "object",
+ "null"
+ ]
+ },
+ "tool_result": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelToolResultLogConfig"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "trace_exporter": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelExporter"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "tracestate": {
+ "additionalProperties": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "type": "object"
+ },
+ "type": [
+ "object",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
+ },
+ "OtelTlsConfig": {
+ "properties": {
+ "ca-certificate": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "client-certificate": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "client-private-key": {
+ "type": [
+ "string",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
+ },
+ "OtelToolResultLogConfig": {
+ "properties": {
+ "max_bytes": {
+ "format": "uint",
+ "minimum": 0.0,
+ "type": "integer"
+ }
+ },
+ "required": [
+ "max_bytes"
+ ],
+ "type": "object"
+ },
"OverriddenMetadata": {
"properties": {
"effectiveValue": true,
@@ -13997,6 +14420,13 @@
"format": "int32",
"type": "integer"
},
+ "outputDrainTimedOut": {
+ "description": "Whether output collection hit its post-exit deadline before seeing EOF or reaching the requested byte cap on either stream. Older servers omit this field.",
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
"processHandle": {
"description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
"type": "string"
@@ -15974,8 +16404,7 @@
},
"ReviewDelivery": {
"enum": [
- "inline",
- "detached"
+ "inline"
],
"type": "string"
},
@@ -15992,7 +16421,7 @@
}
],
"default": null,
- "description": "Where to run the review: inline (default) on the current thread or detached on a new thread (returned in `reviewThreadId`). Detached delivery is deprecated and emits `deprecationNotice`. Use `thread/start` followed by an inline review for a separate review thread."
+ "description": "Reviews run inline on the supplied thread. Omit this field or pass `inline`. To review on a separate thread, start a thread first and use its id."
},
"target": {
"$ref": "#/definitions/ReviewTarget"
@@ -16012,7 +16441,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"reviewThreadId": {
- "description": "Identifies the thread where the review runs.\n\nFor inline reviews, this is the original thread id. For detached reviews, this is the id of the new review thread.",
+ "description": "The thread id supplied to `review/start`.",
"type": "string"
},
"turn": {
@@ -20030,6 +20459,7 @@
"type": "object"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -20812,6 +21242,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -20932,7 +21370,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadItemEntry": {
"properties": {
@@ -23584,6 +24043,14 @@
},
"type": "array"
},
+ "nativeUsageUsdMicros": {
+ "description": "Native dollar usage, independent of credit estimates. None means unknown, not zero.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
"threadId": {
"type": "string"
}
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json
index d549850ac106..caa30bcab565 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json
@@ -654,6 +654,16 @@
}
]
},
+ "otel": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelRequirements"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
"sqliteHome": {
"type": [
"string",
@@ -1046,7 +1056,7 @@
"additionalProperties": {
"$ref": "#/definitions/NetworkDomainPermission"
},
- "description": "Canonical network permission map for `experimental_network`.",
+ "description": "Canonical managed network permission map.",
"type": [
"object",
"null"
@@ -1095,7 +1105,7 @@
"additionalProperties": {
"$ref": "#/definitions/NetworkUnixSocketPermission"
},
- "description": "Canonical unix socket permission map for `experimental_network`.",
+ "description": "Canonical managed unix socket permission map.",
"type": [
"object",
"null"
@@ -1138,6 +1148,232 @@
},
"type": "object"
},
+ "OtelExporter": {
+ "oneOf": [
+ {
+ "enum": [
+ "none",
+ "statsig"
+ ],
+ "type": "string"
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "otlp-http": {
+ "properties": {
+ "endpoint": {
+ "type": "string"
+ },
+ "headers": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "description": "Header names are retained; values are redacted by the server.",
+ "type": "object"
+ },
+ "protocol": {
+ "$ref": "#/definitions/OtelHttpProtocol"
+ },
+ "tls": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelTlsConfig"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ }
+ },
+ "required": [
+ "endpoint",
+ "headers",
+ "protocol"
+ ],
+ "type": "object"
+ }
+ },
+ "required": [
+ "otlp-http"
+ ],
+ "title": "OtlpHttpOtelExporter",
+ "type": "object"
+ },
+ {
+ "additionalProperties": false,
+ "properties": {
+ "otlp-grpc": {
+ "properties": {
+ "endpoint": {
+ "type": "string"
+ },
+ "headers": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "description": "Header names are retained; values are redacted by the server.",
+ "type": "object"
+ },
+ "tls": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelTlsConfig"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ }
+ },
+ "required": [
+ "endpoint",
+ "headers"
+ ],
+ "type": "object"
+ }
+ },
+ "required": [
+ "otlp-grpc"
+ ],
+ "title": "OtlpGrpcOtelExporter",
+ "type": "object"
+ }
+ ]
+ },
+ "OtelHttpProtocol": {
+ "enum": [
+ "binary",
+ "json"
+ ],
+ "type": "string"
+ },
+ "OtelRequirements": {
+ "properties": {
+ "environment": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "exporter": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelExporter"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "log_agent_responses": {
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "log_guardian_assessments": {
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "log_user_prompt": {
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
+ "metrics_exporter": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelExporter"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "span_attributes": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "type": [
+ "object",
+ "null"
+ ]
+ },
+ "tool_result": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelToolResultLogConfig"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "trace_exporter": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/OtelExporter"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "tracestate": {
+ "additionalProperties": {
+ "additionalProperties": {
+ "type": "string"
+ },
+ "type": "object"
+ },
+ "type": [
+ "object",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
+ },
+ "OtelTlsConfig": {
+ "properties": {
+ "ca-certificate": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "client-certificate": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "client-private-key": {
+ "type": [
+ "string",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
+ },
+ "OtelToolResultLogConfig": {
+ "properties": {
+ "max_bytes": {
+ "format": "uint",
+ "minimum": 0.0,
+ "type": "integer"
+ }
+ },
+ "required": [
+ "max_bytes"
+ ],
+ "type": "object"
+ },
"ReasoningEffort": {
"description": "A non-empty reasoning effort value advertised by the model.",
"minLength": 1,
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ErrorNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ErrorNotification.json
index 51f654296aff..808a08aa98d2 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ErrorNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ErrorNotification.json
@@ -12,6 +12,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
diff --git a/codex-rs/app-server-protocol/schema/json/v2/GetAccountResponse.json b/codex-rs/app-server-protocol/schema/json/v2/GetAccountResponse.json
index 3a0b91064f16..2c5d632ee356 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/GetAccountResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/GetAccountResponse.json
@@ -36,6 +36,13 @@
],
"title": "ChatgptAccountType",
"type": "string"
+ },
+ "workspaceName": {
+ "description": "Display name of the selected ChatGPT workspace, when available.",
+ "type": [
+ "string",
+ "null"
+ ]
}
},
"required": [
diff --git a/codex-rs/app-server-protocol/schema/json/v2/GetAccountTokenUsageResponse.json b/codex-rs/app-server-protocol/schema/json/v2/GetAccountTokenUsageResponse.json
index a7e85aa8b46b..dbfafb5dac0e 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/GetAccountTokenUsageResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/GetAccountTokenUsageResponse.json
@@ -76,6 +76,14 @@
},
"type": "array"
},
+ "nativeUsageUsdMicros": {
+ "description": "Native dollar usage, independent of credit estimates. None means unknown, not zero.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
"threadId": {
"type": "string"
}
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
index f822591d7db4..692617e9570a 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
@@ -797,6 +797,7 @@
"type": "object"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -1579,6 +1580,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -1699,7 +1708,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"UserInput": {
"oneOf": [
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
index d766bf8d5554..286ce308fb4a 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
@@ -797,6 +797,7 @@
"type": "object"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -1579,6 +1580,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -1699,7 +1708,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"UserInput": {
"oneOf": [
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ModelProviderError.json b/codex-rs/app-server-protocol/schema/json/v2/ModelProviderError.json
new file mode 100644
index 000000000000..e479bd550969
--- /dev/null
+++ b/codex-rs/app-server-protocol/schema/json/v2/ModelProviderError.json
@@ -0,0 +1,75 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "description": "Structured JSON-RPC error data. Unknown errors must retain the client's normal fallback.",
+ "oneOf": [
+ {
+ "properties": {
+ "currentModelProvider": {
+ "type": "string"
+ },
+ "modelProvider": {
+ "type": "string"
+ },
+ "type": {
+ "enum": [
+ "modelProviderMismatch"
+ ],
+ "title": "ModelProviderMismatchv2::ModelProviderErrorType",
+ "type": "string"
+ }
+ },
+ "required": [
+ "currentModelProvider",
+ "modelProvider",
+ "type"
+ ],
+ "title": "ModelProviderMismatchv2::ModelProviderError",
+ "type": "object"
+ },
+ {
+ "properties": {
+ "modelProvider": {
+ "type": "string"
+ },
+ "type": {
+ "enum": [
+ "modelProviderNotConfigured"
+ ],
+ "title": "ModelProviderNotConfiguredv2::ModelProviderErrorType",
+ "type": "string"
+ }
+ },
+ "required": [
+ "modelProvider",
+ "type"
+ ],
+ "title": "ModelProviderNotConfiguredv2::ModelProviderError",
+ "type": "object"
+ },
+ {
+ "properties": {
+ "modelProvider": {
+ "type": "string"
+ },
+ "requiredModelProvider": {
+ "type": "string"
+ },
+ "type": {
+ "enum": [
+ "modelProviderPolicyConflict"
+ ],
+ "title": "ModelProviderPolicyConflictv2::ModelProviderErrorType",
+ "type": "string"
+ }
+ },
+ "required": [
+ "modelProvider",
+ "requiredModelProvider",
+ "type"
+ ],
+ "title": "ModelProviderPolicyConflictv2::ModelProviderError",
+ "type": "object"
+ }
+ ],
+ "title": "ModelProviderError"
+}
\ No newline at end of file
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ProcessExitedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ProcessExitedNotification.json
index 3a0a81d316e0..ba6696617b5d 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ProcessExitedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ProcessExitedNotification.json
@@ -7,6 +7,13 @@
"format": "int32",
"type": "integer"
},
+ "outputDrainTimedOut": {
+ "description": "Whether output collection hit its post-exit deadline before seeing EOF or reaching the requested byte cap on either stream. Older servers omit this field.",
+ "type": [
+ "boolean",
+ "null"
+ ]
+ },
"processHandle": {
"description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
"type": "string"
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartParams.json b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartParams.json
index 5dcb0e184af1..7344339b3665 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartParams.json
@@ -3,8 +3,7 @@
"definitions": {
"ReviewDelivery": {
"enum": [
- "inline",
- "detached"
+ "inline"
],
"type": "string"
},
@@ -111,7 +110,7 @@
}
],
"default": null,
- "description": "Where to run the review: inline (default) on the current thread or detached on a new thread (returned in `reviewThreadId`). Detached delivery is deprecated and emits `deprecationNotice`. Use `thread/start` followed by an inline review for a separate review thread."
+ "description": "Reviews run inline on the supplied thread. Omit this field or pass `inline`. To review on a separate thread, start a thread first and use its id."
},
"target": {
"$ref": "#/definitions/ReviewTarget"
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
index e8c2d6984b39..bc7b9ad49b6b 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
@@ -62,6 +62,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1001,6 +1002,7 @@
"type": "object"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -1783,6 +1785,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -1903,7 +1913,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"Turn": {
"properties": {
@@ -2362,7 +2393,7 @@
},
"properties": {
"reviewThreadId": {
- "description": "Identifies the thread where the review runs.\n\nFor inline reviews, this is the original thread id. For detached reviews, this is the id of the new review thread.",
+ "description": "The thread id supplied to `review/start`.",
"type": "string"
},
"turn": {
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
index acf5e470ebfd..a025f8b78d91 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
@@ -143,6 +143,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1615,6 +1616,7 @@
"type": "string"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -2397,6 +2399,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -2517,7 +2527,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadSection": {
"description": "An independently persisted, user-visible thread section.",
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadItemsListResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadItemsListResponse.json
index 41a14aa33841..eb54f49826f4 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadItemsListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadItemsListResponse.json
@@ -797,6 +797,7 @@
"type": "object"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -1579,6 +1580,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -1699,7 +1708,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadItemEntry": {
"properties": {
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
index 9a8ddee00007..8446a6a4da80 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
@@ -65,6 +65,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1406,6 +1407,7 @@
"type": "string"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -2188,6 +2190,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -2308,7 +2318,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadReadState": {
"description": "The first unread position in a durable local thread. A null position means read. The opaque revision guards edits against activity or marks the caller has not seen.",
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
index 27399f7544b6..d167771d3666 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
@@ -65,6 +65,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1406,6 +1407,7 @@
"type": "string"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -2188,6 +2190,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -2308,7 +2318,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadSection": {
"description": "An independently persisted, user-visible thread section.",
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
index 09b124e5a788..fffe7e206f33 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
@@ -65,6 +65,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1406,6 +1407,7 @@
"type": "string"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -2188,6 +2190,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -2308,7 +2318,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadReadState": {
"description": "The first unread position in a durable local thread. A null position means read. The opaque revision guards edits against activity or marks the caller has not seen.",
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
index 612c30e99b59..baa806edccc0 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
@@ -143,6 +143,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1667,6 +1668,7 @@
"type": "string"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -2449,6 +2451,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -2569,7 +2579,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadSection": {
"description": "An independently persisted, user-visible thread section.",
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadRevertResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadRevertResponse.json
index 62277c4ad1a7..b06f6b9efcda 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRevertResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRevertResponse.json
@@ -65,6 +65,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1406,6 +1407,7 @@
"type": "string"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -2188,6 +2190,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -2308,7 +2318,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadSection": {
"description": "An independently persisted, user-visible thread section.",
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
index 8c26333295f9..0e44e3042cbd 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
@@ -143,6 +143,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1615,6 +1616,7 @@
"type": "string"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -2397,6 +2399,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -2517,7 +2527,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadSection": {
"description": "An independently persisted, user-visible thread section.",
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
index f2f9e9dce8b0..326694cf14e3 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
@@ -65,6 +65,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1406,6 +1407,7 @@
"type": "string"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -2188,6 +2190,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -2308,7 +2318,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadSection": {
"description": "An independently persisted, user-visible thread section.",
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadTurnsListResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadTurnsListResponse.json
index da152655ccb1..74ef9915886d 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadTurnsListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadTurnsListResponse.json
@@ -62,6 +62,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1001,6 +1002,7 @@
"type": "object"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -1783,6 +1785,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -1903,7 +1913,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"Turn": {
"properties": {
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
index 37830b79ec86..bcfd2f2571d1 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
@@ -65,6 +65,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1406,6 +1407,7 @@
"type": "string"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -2188,6 +2190,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -2308,7 +2318,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"ThreadSection": {
"description": "An independently persisted, user-visible thread section.",
diff --git a/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
index 98f92049159d..0c0cf075df44 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
@@ -62,6 +62,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1001,6 +1002,7 @@
"type": "object"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -1783,6 +1785,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -1903,7 +1913,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"Turn": {
"properties": {
diff --git a/codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json b/codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json
index ad4194a51160..cdac11cbe73d 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json
@@ -10,6 +10,13 @@
"kind": {
"$ref": "#/definitions/AdditionalContextKind"
},
+ "name": {
+ "description": "Optional name for untrusted context, used to label its tool output.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"value": {
"type": "string"
}
diff --git a/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json b/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
index 6e161a29f5a4..fbe2695c5d39 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
@@ -62,6 +62,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1001,6 +1002,7 @@
"type": "object"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -1783,6 +1785,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -1903,7 +1913,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"Turn": {
"properties": {
diff --git a/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
index 5e5c05fd0876..d4ba38ae892d 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
@@ -62,6 +62,7 @@
"flexUnavailable",
"serverOverloaded",
"modelNotFound",
+ "policyCapacityUnavailable",
"cyberPolicy",
"misalignmentPolicyViolation",
"tooManyDenials",
@@ -1001,6 +1002,7 @@
"type": "object"
},
"ThreadItem": {
+ "description": "A thread item and its recorded lifecycle times. The payload stays flat on the wire.",
"oneOf": [
{
"properties": {
@@ -1783,6 +1785,14 @@
],
"default": null
},
+ "generationId": {
+ "default": null,
+ "description": "Image generation identifier for the generated image, when provided by the image backend.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"id": {
"type": "string"
},
@@ -1903,7 +1913,28 @@
"title": "ContextCompactionThreadItem",
"type": "object"
}
- ]
+ ],
+ "properties": {
+ "completedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item completed, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "startedAtMs": {
+ "default": null,
+ "description": "Unix timestamp in milliseconds when the item started, if recorded.",
+ "format": "int64",
+ "type": [
+ "integer",
+ "null"
+ ]
+ }
+ },
+ "type": "object"
},
"Turn": {
"properties": {
diff --git a/codex-rs/app-server-protocol/schema/json/v2/TurnSteerParams.json b/codex-rs/app-server-protocol/schema/json/v2/TurnSteerParams.json
index 7dbdefa046ae..2fdbb54a1bcc 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnSteerParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnSteerParams.json
@@ -6,6 +6,13 @@
"kind": {
"$ref": "#/definitions/AdditionalContextKind"
},
+ "name": {
+ "description": "Optional name for untrusted context, used to label its tool output.",
+ "type": [
+ "string",
+ "null"
+ ]
+ },
"value": {
"type": "string"
}
diff --git a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst
index 68f61805ed0a..4c7ea92a77d7 100644
Binary files a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst and b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst differ
diff --git a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst
index 1aa988f6461c..24ce1c7ad931 100644
Binary files a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst and b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst differ
diff --git a/codex-rs/app-server-protocol/schema/typescript/ImageGenerationItem.ts b/codex-rs/app-server-protocol/schema/typescript/ImageGenerationItem.ts
index 1dfe3aa12096..e43fb2995cf7 100644
--- a/codex-rs/app-server-protocol/schema/typescript/ImageGenerationItem.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/ImageGenerationItem.ts
@@ -9,4 +9,8 @@ export type ImageGenerationItem = { id: string, status: string, revisedPrompt: s
/**
* Observed local inputs for a completed generation, absent on older items.
*/
-inputImages?: Array, } & ({ fileId: string, } | { result: string, });
+inputImages?: Array,
+/**
+ * Image generation identifier for the generated image, when provided by the image backend.
+ */
+generationId: string | null, } & ({ fileId: string, } | { result: string, });
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/Account.ts b/codex-rs/app-server-protocol/schema/typescript/v2/Account.ts
index 4897b1ff9a12..6b6982479d49 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/Account.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/Account.ts
@@ -3,4 +3,8 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { PlanType } from "../PlanType";
-export type Account = { "type": "apiKey", } | { "type": "chatgpt", email: string | null, planType: PlanType, } | { "type": "amazonBedrock", usesCodexManagedCredentials: boolean, } | { "type": "gcp", };
+export type Account = { "type": "apiKey", } | { "type": "chatgpt", email: string | null, planType: PlanType,
+/**
+ * Display name of the selected ChatGPT workspace, when available.
+ */
+workspaceName: string | null, } | { "type": "amazonBedrock", usesCodexManagedCredentials: boolean, } | { "type": "gcp", };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/AccountSession.ts b/codex-rs/app-server-protocol/schema/typescript/v2/AccountSession.ts
new file mode 100644
index 000000000000..71a36b0d750e
--- /dev/null
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/AccountSession.ts
@@ -0,0 +1,6 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AccountSessionWorkspace } from "./AccountSessionWorkspace";
+
+export type AccountSession = { sessionId: string, email: string | null, userId: string | null, displayName: string | null, imageUrl: string | null, lastUsedAt: bigint, isActive: boolean, selectedWorkspaceAccountId: string | null, workspaces: Array, };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/AccountSessionWorkspace.ts b/codex-rs/app-server-protocol/schema/typescript/v2/AccountSessionWorkspace.ts
new file mode 100644
index 000000000000..b55d2a9ea778
--- /dev/null
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/AccountSessionWorkspace.ts
@@ -0,0 +1,6 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AccountSessionWorkspaceKind } from "./AccountSessionWorkspaceKind";
+
+export type AccountSessionWorkspace = { accountId: string, name: string | null, imageUrl: string | null, kind: AccountSessionWorkspaceKind | null, };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/AccountSessionWorkspaceKind.ts b/codex-rs/app-server-protocol/schema/typescript/v2/AccountSessionWorkspaceKind.ts
new file mode 100644
index 000000000000..1ece70db35a5
--- /dev/null
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/AccountSessionWorkspaceKind.ts
@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AccountSessionWorkspaceKind = "personal" | "workspace";
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/AdditionalContextEntry.ts b/codex-rs/app-server-protocol/schema/typescript/v2/AdditionalContextEntry.ts
index 8d959269d423..064b9b2fe3cc 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/AdditionalContextEntry.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/AdditionalContextEntry.ts
@@ -3,4 +3,8 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { AdditionalContextKind } from "./AdditionalContextKind";
-export type AdditionalContextEntry = { value: string, kind: AdditionalContextKind, };
+export type AdditionalContextEntry = { value: string, kind: AdditionalContextKind,
+/**
+ * Optional name for untrusted context, used to label its tool output.
+ */
+name?: string | null, };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/CodexErrorInfo.ts b/codex-rs/app-server-protocol/schema/typescript/v2/CodexErrorInfo.ts
index 4b36f4de6a52..2b51044eed33 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/CodexErrorInfo.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/CodexErrorInfo.ts
@@ -9,4 +9,4 @@ import type { NonSteerableTurnKind } from "./NonSteerableTurnKind";
* When an upstream HTTP status is available (for example, from the Responses API or a provider),
* it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.
*/
-export type CodexErrorInfo = "contextWindowExceeded" | "sessionBudgetExceeded" | "usageLimitExceeded" | "rateLimitExceeded" | "flexUnavailable" | "serverOverloaded" | "modelNotFound" | "cyberPolicy" | "misalignmentPolicyViolation" | "tooManyDenials" | { "httpConnectionFailed": { httpStatusCode: number | null, } } | { "responseStreamConnectionFailed": { httpStatusCode: number | null, } } | "internalServerError" | "unauthorized" | "badRequest" | "threadRollbackFailed" | "sandboxError" | { "responseStreamDisconnected": { httpStatusCode: number | null, } } | { "responseTooManyFailedAttempts": { httpStatusCode: number | null, } } | { "activeTurnNotSteerable": { turnKind: NonSteerableTurnKind, } } | "other" | string | { [key: string]: unknown };
+export type CodexErrorInfo = "contextWindowExceeded" | "sessionBudgetExceeded" | "usageLimitExceeded" | "rateLimitExceeded" | "flexUnavailable" | "serverOverloaded" | "modelNotFound" | "policyCapacityUnavailable" | "cyberPolicy" | "misalignmentPolicyViolation" | "tooManyDenials" | { "httpConnectionFailed": { httpStatusCode: number | null, } } | { "responseStreamConnectionFailed": { httpStatusCode: number | null, } } | "internalServerError" | "unauthorized" | "badRequest" | "threadRollbackFailed" | "sandboxError" | { "responseStreamDisconnected": { httpStatusCode: number | null, } } | { "responseTooManyFailedAttempts": { httpStatusCode: number | null, } } | { "activeTurnNotSteerable": { turnKind: NonSteerableTurnKind, } } | "other" | string | { [key: string]: unknown };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/ConfigRequirements.ts b/codex-rs/app-server-protocol/schema/typescript/v2/ConfigRequirements.ts
index c8e40d1541b8..c9cf1cfe535c 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ConfigRequirements.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ConfigRequirements.ts
@@ -13,6 +13,7 @@ import type { ComputerUseRequirements } from "./ComputerUseRequirements";
import type { FeedbackRequirements } from "./FeedbackRequirements";
import type { InAppBrowserRequirements } from "./InAppBrowserRequirements";
import type { ModelsRequirements } from "./ModelsRequirements";
+import type { OtelRequirements } from "./OtelRequirements";
import type { ResidencyRequirement } from "./ResidencyRequirement";
import type { SandboxMode } from "./SandboxMode";
import type { WindowsSandboxImplementation } from "./WindowsSandboxImplementation";
@@ -27,4 +28,4 @@ modelProviders: { [key in string]?: JsonValue } | null, /**
* Effective login methods after managed, forced-login, and workspace restrictions.
* An empty list permits no login method. Older servers may omit this field.
*/
-allowedLoginMethods: Array | null, cliAuthCredentialsStore: CliAuthCredentialsStoreMode | null, chatgptBaseUrl: string | null, additionalDeveloperInstructions: string | null, allowedApprovalPolicies: Array | null, allowedSandboxModes: Array | null, allowedWindowsSandboxImplementations: Array | null, allowedPermissionProfiles: { [key in string]?: boolean } | null, defaultPermissions: string | null, allowedWebSearchModes: Array | null, allowManagedHooksOnly: boolean | null, allowBrowserAndComputerUse: boolean | null, allowAppshots: boolean | null, allowRemoteControl: boolean | null, computerUse: ComputerUseRequirements | null, browserUse: BrowserUseRequirements | null, inAppBrowser: InAppBrowserRequirements | null, featureRequirements: { [key in string]?: boolean } | null, enforceResidency: ResidencyRequirement | null, autoReview: AutoReviewRequirements | null, models: ModelsRequirements | null, sqliteHome: PathUri | null, logDir: PathUri | null, modelCatalogJson: PathUri | null, checkForUpdateOnStartup: boolean | null, allowLoginShell: boolean | null, feedback: FeedbackRequirements | null};
+allowedLoginMethods: Array | null, cliAuthCredentialsStore: CliAuthCredentialsStoreMode | null, chatgptBaseUrl: string | null, additionalDeveloperInstructions: string | null, allowedApprovalPolicies: Array | null, allowedSandboxModes: Array | null, allowedWindowsSandboxImplementations: Array | null, allowedPermissionProfiles: { [key in string]?: boolean } | null, defaultPermissions: string | null, allowedWebSearchModes: Array | null, allowManagedHooksOnly: boolean | null, allowBrowserAndComputerUse: boolean | null, allowAppshots: boolean | null, allowRemoteControl: boolean | null, computerUse: ComputerUseRequirements | null, browserUse: BrowserUseRequirements | null, inAppBrowser: InAppBrowserRequirements | null, featureRequirements: { [key in string]?: boolean } | null, enforceResidency: ResidencyRequirement | null, autoReview: AutoReviewRequirements | null, models: ModelsRequirements | null, sqliteHome: PathUri | null, logDir: PathUri | null, modelCatalogJson: PathUri | null, checkForUpdateOnStartup: boolean | null, allowLoginShell: boolean | null, feedback: FeedbackRequirements | null, otel: OtelRequirements | null};
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/ModelProviderError.ts b/codex-rs/app-server-protocol/schema/typescript/v2/ModelProviderError.ts
new file mode 100644
index 000000000000..1c3931ae3f95
--- /dev/null
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ModelProviderError.ts
@@ -0,0 +1,8 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+/**
+ * Structured JSON-RPC error data. Unknown errors must retain the client's normal fallback.
+ */
+export type ModelProviderError = { "type": "modelProviderMismatch", modelProvider: string, currentModelProvider: string, } | { "type": "modelProviderNotConfigured", modelProvider: string, } | { "type": "modelProviderPolicyConflict", modelProvider: string, requiredModelProvider: string, };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/NetworkRequirements.ts b/codex-rs/app-server-protocol/schema/typescript/v2/NetworkRequirements.ts
index 5a496b132ac7..953f69da7c20 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/NetworkRequirements.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/NetworkRequirements.ts
@@ -6,7 +6,7 @@ import type { NetworkUnixSocketPermission } from "./NetworkUnixSocketPermission"
export type NetworkRequirements = { enabled: boolean | null, httpPort: number | null, socksPort: number | null, allowUpstreamProxy: boolean | null, dangerouslyAllowNonLoopbackProxy: boolean | null, dangerouslyAllowAllUnixSockets: boolean | null,
/**
- * Canonical network permission map for `experimental_network`.
+ * Canonical managed network permission map.
*/
domains: { [key in string]?: NetworkDomainPermission } | null,
/**
@@ -27,7 +27,7 @@ allowedDomains: Array | null,
*/
deniedDomains: Array | null,
/**
- * Canonical unix socket permission map for `experimental_network`.
+ * Canonical managed unix socket permission map.
*/
unixSockets: { [key in string]?: NetworkUnixSocketPermission } | null,
/**
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/OtelExporter.ts b/codex-rs/app-server-protocol/schema/typescript/v2/OtelExporter.ts
new file mode 100644
index 000000000000..f18fa658c480
--- /dev/null
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/OtelExporter.ts
@@ -0,0 +1,15 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { OtelHttpProtocol } from "./OtelHttpProtocol";
+import type { OtelTlsConfig } from "./OtelTlsConfig";
+
+export type OtelExporter = "none" | "statsig" | { "otlp-http": { endpoint: string,
+/**
+ * Header names are retained; values are redacted by the server.
+ */
+headers: { [key in string]?: string }, protocol: OtelHttpProtocol, tls: OtelTlsConfig | null, } } | { "otlp-grpc": { endpoint: string,
+/**
+ * Header names are retained; values are redacted by the server.
+ */
+headers: { [key in string]?: string }, tls: OtelTlsConfig | null, } };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/OtelHttpProtocol.ts b/codex-rs/app-server-protocol/schema/typescript/v2/OtelHttpProtocol.ts
new file mode 100644
index 000000000000..dc24d2e22643
--- /dev/null
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/OtelHttpProtocol.ts
@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type OtelHttpProtocol = "binary" | "json";
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/OtelRequirements.ts b/codex-rs/app-server-protocol/schema/typescript/v2/OtelRequirements.ts
new file mode 100644
index 000000000000..7279fe874634
--- /dev/null
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/OtelRequirements.ts
@@ -0,0 +1,7 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { OtelExporter } from "./OtelExporter";
+import type { OtelToolResultLogConfig } from "./OtelToolResultLogConfig";
+
+export type OtelRequirements = { tool_result: OtelToolResultLogConfig | null, log_user_prompt: boolean | null, log_agent_responses: boolean | null, log_guardian_assessments: boolean | null, environment: string | null, exporter: OtelExporter | null, trace_exporter: OtelExporter | null, metrics_exporter: OtelExporter | null, span_attributes: { [key in string]?: string } | null, tracestate: { [key in string]?: { [key in string]?: string } } | null, };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/OtelTlsConfig.ts b/codex-rs/app-server-protocol/schema/typescript/v2/OtelTlsConfig.ts
new file mode 100644
index 000000000000..db35d2cc0c9a
--- /dev/null
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/OtelTlsConfig.ts
@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type OtelTlsConfig = { "ca-certificate": string | null, "client-certificate": string | null, "client-private-key": string | null, };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/OtelToolResultLogConfig.ts b/codex-rs/app-server-protocol/schema/typescript/v2/OtelToolResultLogConfig.ts
new file mode 100644
index 000000000000..61c6c2f4c4dc
--- /dev/null
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/OtelToolResultLogConfig.ts
@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type OtelToolResultLogConfig = { max_bytes: number, };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/ProcessExitedNotification.ts b/codex-rs/app-server-protocol/schema/typescript/v2/ProcessExitedNotification.ts
index 0d82633421e2..40194f55bf1f 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ProcessExitedNotification.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ProcessExitedNotification.ts
@@ -14,6 +14,11 @@ processHandle: string,
* Process exit code.
*/
exitCode: number,
+/**
+ * Whether output collection hit its post-exit deadline before seeing EOF or reaching the
+ * requested byte cap on either stream. Older servers omit this field.
+ */
+outputDrainTimedOut?: boolean | null,
/**
* Buffered stdout capture.
*
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/ReviewDelivery.ts b/codex-rs/app-server-protocol/schema/typescript/v2/ReviewDelivery.ts
index 8fbccd1050ab..11c13c1c738b 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ReviewDelivery.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ReviewDelivery.ts
@@ -2,4 +2,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-export type ReviewDelivery = "inline" | "detached";
+export type ReviewDelivery = "inline";
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/ReviewStartParams.ts b/codex-rs/app-server-protocol/schema/typescript/v2/ReviewStartParams.ts
index 839a3c745f56..14fadcb090c9 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ReviewStartParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ReviewStartParams.ts
@@ -6,9 +6,7 @@ import type { ReviewTarget } from "./ReviewTarget";
export type ReviewStartParams = { threadId: string, target: ReviewTarget,
/**
- * Where to run the review: inline (default) on the current thread or
- * detached on a new thread (returned in `reviewThreadId`).
- * Detached delivery is deprecated and emits `deprecationNotice`.
- * Use `thread/start` followed by an inline review for a separate review thread.
+ * Reviews run inline on the supplied thread. Omit this field or pass `inline`.
+ * To review on a separate thread, start a thread first and use its id.
*/
delivery?: ReviewDelivery | null, };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/ReviewStartResponse.ts b/codex-rs/app-server-protocol/schema/typescript/v2/ReviewStartResponse.ts
index 6d6c2bb74fa9..4ea7c1aa258a 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ReviewStartResponse.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ReviewStartResponse.ts
@@ -5,9 +5,6 @@ import type { Turn } from "./Turn";
export type ReviewStartResponse = { turn: Turn,
/**
- * Identifies the thread where the review runs.
- *
- * For inline reviews, this is the original thread id.
- * For detached reviews, this is the id of the new review thread.
+ * The thread id supplied to `review/start`.
*/
reviewThreadId: string, };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadItem.ts b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadItem.ts
index 1f132df8daf8..f93eda554e39 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadItem.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadItem.ts
@@ -31,7 +31,18 @@ import type { PatchApplyStatus } from "./PatchApplyStatus";
import type { SubAgentActivityKind } from "./SubAgentActivityKind";
import type { UserInput } from "./UserInput";
-export type ThreadItem = { "type": "userMessage", id: string, clientId: string | null, content: Array, } | { "type": "hookPrompt", id: string, fragments: Array, } | { "type": "agentMessage", id: string, text: string, phase: MessagePhase | null, memoryCitation: MemoryCitation | null, delivery: AgentMessageDelivery | null, questions: Array | null, } | { "type": "functionCallOutput", id: string, name: string, namespace: string | null, output: FunctionCallOutputBody, } | { "type": "plan", id: string, text: string, } | { "type": "reasoning", id: string, summary: Array, content: Array, } | { "type": "commandExecution", id: string,
+/**
+ * A thread item and its recorded lifecycle times. The payload stays flat on the wire.
+ */
+export type ThreadItem = {
+/**
+ * Unix timestamp in milliseconds when the item started, if recorded.
+ */
+startedAtMs?: number | null,
+/**
+ * Unix timestamp in milliseconds when the item completed, if recorded.
+ */
+completedAtMs?: number | null, } & ({ "type": "userMessage", id: string, clientId: string | null, content: Array, } | { "type": "hookPrompt", id: string, fragments: Array, } | { "type": "agentMessage", id: string, text: string, phase: MessagePhase | null, memoryCitation: MemoryCitation | null, delivery: AgentMessageDelivery | null, questions: Array | null, } | { "type": "functionCallOutput", id: string, name: string, namespace: string | null, output: FunctionCallOutputBody, } | { "type": "plan", id: string, text: string, } | { "type": "reasoning", id: string, summary: Array, content: Array, } | { "type": "commandExecution", id: string,
/**
* Trusted first-party plugin id when this command resolves to one plugin script.
*/
@@ -130,4 +141,4 @@ model: string | null,
/**
* Resolved reasoning effort at sub-agent creation, when known.
*/
-reasoningEffort: ReasoningEffort | null, id: string, kind: SubAgentActivityKind, agentThreadId: string, agentPath: string, } | { "type": "webSearch" } & WebSearchItem | { "type": "imageView", id: string, path: LegacyAppPathString, } | { "type": "sleep" } & SleepItem | { "type": "imageGeneration" } & ImageGenerationItem | { "type": "enteredReviewMode", id: string, review: string, } | { "type": "exitedReviewMode", id: string, review: string, } | { "type": "contextCompaction", id: string, };
+reasoningEffort: ReasoningEffort | null, id: string, kind: SubAgentActivityKind, agentThreadId: string, agentPath: string, } | { "type": "webSearch" } & WebSearchItem | { "type": "imageView", id: string, path: LegacyAppPathString, } | { "type": "sleep" } & SleepItem | { "type": "imageGeneration" } & ImageGenerationItem | { "type": "enteredReviewMode", id: string, review: string, } | { "type": "exitedReviewMode", id: string, review: string, } | { "type": "contextCompaction", id: string, });
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadUsage.ts b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadUsage.ts
index 1fcf444131c1..005f62ee6bd0 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadUsage.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadUsage.ts
@@ -3,4 +3,8 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { ThreadUsageBreakdownGroup } from "./ThreadUsageBreakdownGroup";
-export type ThreadUsage = { threadId: string, estimatedUsageCreditsMicros: bigint, estimatedUsageUsdMicros: bigint | null, groups: Array, };
+export type ThreadUsage = { threadId: string, estimatedUsageCreditsMicros: bigint, estimatedUsageUsdMicros: bigint | null,
+/**
+ * Native dollar usage, independent of credit estimates. None means unknown, not zero.
+ */
+nativeUsageUsdMicros?: bigint | null, groups: Array, };
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/index.ts b/codex-rs/app-server-protocol/schema/typescript/v2/index.ts
index e8b3866f299b..4ec94e59a4e7 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/index.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/index.ts
@@ -4,6 +4,9 @@ export type { Account } from "./Account";
export type { AccountLoginCompletedNotification } from "./AccountLoginCompletedNotification";
export type { AccountRateLimitsUpdatedNotification } from "./AccountRateLimitsUpdatedNotification";
export type { AccountRoutingOverride } from "./AccountRoutingOverride";
+export type { AccountSession } from "./AccountSession";
+export type { AccountSessionWorkspace } from "./AccountSessionWorkspace";
+export type { AccountSessionWorkspaceKind } from "./AccountSessionWorkspaceKind";
export type { AccountTokenUsageDailyBucket } from "./AccountTokenUsageDailyBucket";
export type { AccountTokenUsageSummary } from "./AccountTokenUsageSummary";
export type { AccountUpdatedNotification } from "./AccountUpdatedNotification";
@@ -326,6 +329,7 @@ export type { ModelListParams } from "./ModelListParams";
export type { ModelListResponse } from "./ModelListResponse";
export type { ModelProviderCapabilitiesReadParams } from "./ModelProviderCapabilitiesReadParams";
export type { ModelProviderCapabilitiesReadResponse } from "./ModelProviderCapabilitiesReadResponse";
+export type { ModelProviderError } from "./ModelProviderError";
export type { ModelRerouteReason } from "./ModelRerouteReason";
export type { ModelReroutedNotification } from "./ModelReroutedNotification";
export type { ModelSafetyBufferingUpdatedNotification } from "./ModelSafetyBufferingUpdatedNotification";
@@ -345,6 +349,11 @@ export type { NetworkRequirements } from "./NetworkRequirements";
export type { NetworkUnixSocketPermission } from "./NetworkUnixSocketPermission";
export type { NewThreadModelDefaults } from "./NewThreadModelDefaults";
export type { NonSteerableTurnKind } from "./NonSteerableTurnKind";
+export type { OtelExporter } from "./OtelExporter";
+export type { OtelHttpProtocol } from "./OtelHttpProtocol";
+export type { OtelRequirements } from "./OtelRequirements";
+export type { OtelTlsConfig } from "./OtelTlsConfig";
+export type { OtelToolResultLogConfig } from "./OtelToolResultLogConfig";
export type { OverriddenMetadata } from "./OverriddenMetadata";
export type { PatchApplyStatus } from "./PatchApplyStatus";
export type { PatchChangeKind } from "./PatchChangeKind";
diff --git a/codex-rs/app-server-protocol/src/export.rs b/codex-rs/app-server-protocol/src/export.rs
index 0f90faf920cf..e43b9656fbf4 100644
--- a/codex-rs/app-server-protocol/src/export.rs
+++ b/codex-rs/app-server-protocol/src/export.rs
@@ -133,6 +133,7 @@ pub fn generate_ts_with_options(
export_client_responses(out_dir)?;
ClientNotification::export_all_to(out_dir)?;
crate::UserVerificationRpcError::export_all_to(out_dir)?;
+ crate::ModelProviderError::export_all_to(out_dir)?;
ServerRequest::export_all_to(out_dir)?;
export_server_responses(out_dir)?;
@@ -234,6 +235,10 @@ pub fn generate_json_with_experimental(out_dir: &Path, experimental_api: bool) -
out_dir,
"v2::UserVerificationRpcError",
)?);
+ schemas.push(write_json_schema::(
+ out_dir,
+ "v2::ModelProviderError",
+ )?);
schemas.extend(export_client_param_schemas(out_dir)?);
schemas.extend(export_client_response_schemas(out_dir)?);
schemas.extend(export_server_param_schemas(out_dir)?);
@@ -2262,14 +2267,14 @@ mod tests {
continue;
}
- // Only allow "?: T | null" in objects representing JSON-RPC requests,
- // which we assume are called "*Params".
+ // Allow "?: T | null" in JSON-RPC request objects and nested request types.
let allow_optional_nullable = path
.file_stem()
.and_then(|stem| stem.to_str())
.is_some_and(|stem| {
stem.ends_with("Params")
|| stem == "InitializeCapabilities"
+ || stem == "AdditionalContextEntry"
|| matches!(
stem,
"CollabAgentRef"
@@ -2409,8 +2414,14 @@ mod tests {
let legacy_optional_nullable_field = (path
== Path::new("v2/GetAccountTokenUsageResponse.ts")
&& field_prefix.trim() == "threadUsage?")
+ || (path == Path::new("v2/ThreadUsage.ts")
+ && field_prefix.trim() == "nativeUsageUsdMicros?")
+ || (path == Path::new("v2/ThreadItem.ts")
+ && matches!(field_prefix.trim(), "startedAtMs?" | "completedAtMs?"))
|| (path == Path::new("v2/McpServerOauthLoginCompletedNotification.ts")
&& field_prefix.trim() == "loginId?")
+ || (path == Path::new("v2/ProcessExitedNotification.ts")
+ && field_prefix.trim() == "outputDrainTimedOut?")
|| (path == Path::new("v2/MisalignmentErrorDetails.ts")
&& field_prefix.trim() == "reviewTarget?");
if field_prefix.chars().rev().find(|c| !c.is_whitespace()) == Some('?')
diff --git a/codex-rs/app-server-protocol/src/protocol/common.rs b/codex-rs/app-server-protocol/src/protocol/common.rs
index 3a777cdc3d24..2936c01855e4 100644
--- a/codex-rs/app-server-protocol/src/protocol/common.rs
+++ b/codex-rs/app-server-protocol/src/protocol/common.rs
@@ -148,9 +148,12 @@ macro_rules! serialization_scope_expr {
($actual_params:ident, global_shared_read($key:literal)) => {
Some(ClientRequestSerializationScope::GlobalSharedRead($key))
};
- ($actual_params:ident, thread_id($params:ident . $field:ident)) => {
+ // Match one or more dot-separated fields, allowing both `params.thread_id`
+ // and nested paths like `params.start.thread_id`. The resolved ID selects
+ // the per-thread request queue, preserving ordering with other thread operations.
+ ($actual_params:ident, thread_id($params:ident . $($field:ident).+)) => {
Some(ClientRequestSerializationScope::Thread {
- thread_id: $actual_params.$field.clone(),
+ thread_id: $actual_params.$($field).+.clone(),
})
};
($actual_params:ident, optional_thread_id($params:ident . $field:ident)) => {
@@ -1338,6 +1341,13 @@ client_request_definitions! {
response: v2::BedrockSetupResponse,
},
+ #[experimental("account/gcp/setup")]
+ GcpSetup => "account/gcp/setup" {
+ params: v2::GcpSetupParams,
+ serialization: global("account-auth"),
+ response: v2::GcpSetupResponse,
+ },
+
#[experimental("account/bedrock/checkGovCloudRequirements")]
BedrockCheckGovCloudRequirements => "account/bedrock/checkGovCloudRequirements" {
params: v2::BedrockCheckGovCloudRequirementsParams,
@@ -1351,6 +1361,22 @@ client_request_definitions! {
response: v2::CancelLoginAccountResponse,
},
+ #[experimental("accountSession/list")]
+ AccountSessionsList => "accountSession/list" {
+ params: v2::AccountSessionsListParams,
+ serialization: global("account-auth"),
+ manual_payload_conversion: manual,
+ response: v2::AccountSessionsResponse,
+ },
+
+ #[experimental("accountSession/switch")]
+ AccountSessionsSwitch => "accountSession/switch" {
+ params: v2::AccountSessionsSwitchParams,
+ serialization: global("account-auth"),
+ manual_payload_conversion: manual,
+ response: v2::AccountSessionsSwitchResponse,
+ },
+
LogoutAccount => "account/logout" {
params: #[ts(type = "undefined")] #[serde(skip_serializing_if = "Option::is_none")] Option<()>,
serialization: global("account-auth"),
@@ -3654,12 +3680,14 @@ mod tests {
let chatgpt = v2::Account::Chatgpt {
email: Some("user@example.com".to_string()),
plan_type: PlanType::Plus,
+ workspace_name: None,
};
assert_eq!(
json!({
"type": "chatgpt",
"email": "user@example.com",
"planType": "plus",
+ "workspaceName": null,
}),
serde_json::to_value(&chatgpt)?,
);
@@ -3667,12 +3695,14 @@ mod tests {
let chatgpt_without_email = v2::Account::Chatgpt {
email: None,
plan_type: PlanType::Pro,
+ workspace_name: None,
};
assert_eq!(
json!({
"type": "chatgpt",
"email": null,
"planType": "pro",
+ "workspaceName": null,
}),
serde_json::to_value(&chatgpt_without_email)?,
);
diff --git a/codex-rs/app-server-protocol/src/protocol/event_mapping.rs b/codex-rs/app-server-protocol/src/protocol/event_mapping.rs
index e0fcfb6759d8..9ba6a32d7065 100644
--- a/codex-rs/app-server-protocol/src/protocol/event_mapping.rs
+++ b/codex-rs/app-server-protocol/src/protocol/event_mapping.rs
@@ -17,7 +17,7 @@ use crate::protocol::v2::ReasoningSummaryPartAddedNotification;
use crate::protocol::v2::ReasoningSummaryTextDeltaNotification;
use crate::protocol::v2::ReasoningTextDeltaNotification;
use crate::protocol::v2::TerminalInteractionNotification;
-use crate::protocol::v2::ThreadItem;
+use crate::protocol::v2::ThreadItemPayload;
use codex_protocol::dynamic_tools::DynamicToolCallOutputContentItem as CoreDynamicToolCallOutputContentItem;
use codex_protocol::protocol::EventMsg;
use std::collections::HashMap;
@@ -42,7 +42,7 @@ pub fn item_event_to_server_notification(
DynamicToolCallStatus::Failed
};
let duration_ms = i64::try_from(response.duration.as_millis()).ok();
- let item = ThreadItem::DynamicToolCall {
+ let item = ThreadItemPayload::DynamicToolCall {
id: response.call_id,
namespace: response.namespace,
tool: response.tool,
@@ -68,15 +68,16 @@ pub fn item_event_to_server_notification(
success: Some(response.success),
duration_ms,
};
- ServerNotification::ItemCompleted(ItemCompletedNotification {
+ ServerNotification::ItemCompleted(ItemCompletedNotification::new(
thread_id,
- turn_id: response.turn_id,
+ response.turn_id,
item,
- completed_at_ms: response.completed_at_ms,
- })
+ /*started_at_ms*/ None,
+ response.completed_at_ms,
+ ))
}
EventMsg::CollabAgentSpawnBegin(begin_event) => {
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: begin_event.call_id,
tool: CollabAgentTool::SpawnAgent,
status: CollabAgentToolCallStatus::InProgress,
@@ -87,12 +88,12 @@ pub fn item_event_to_server_notification(
reasoning_effort: Some(begin_event.reasoning_effort),
agents_states: HashMap::new(),
};
- ServerNotification::ItemStarted(ItemStartedNotification {
+ ServerNotification::ItemStarted(ItemStartedNotification::new(
thread_id,
turn_id,
item,
- started_at_ms: begin_event.started_at_ms,
- })
+ begin_event.started_at_ms,
+ ))
}
EventMsg::CollabAgentSpawnEnd(end_event) => {
let has_receiver = end_event.new_thread_id.is_some();
@@ -115,7 +116,7 @@ pub fn item_event_to_server_notification(
}
None => (Vec::new(), HashMap::new()),
};
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: end_event.call_id,
tool: CollabAgentTool::SpawnAgent,
status,
@@ -126,16 +127,17 @@ pub fn item_event_to_server_notification(
reasoning_effort: Some(end_event.reasoning_effort),
agents_states,
};
- ServerNotification::ItemCompleted(ItemCompletedNotification {
+ ServerNotification::ItemCompleted(ItemCompletedNotification::new(
thread_id,
turn_id,
item,
- completed_at_ms: end_event.completed_at_ms,
- })
+ /*started_at_ms*/ None,
+ end_event.completed_at_ms,
+ ))
}
EventMsg::CollabAgentInteractionBegin(begin_event) => {
let receiver_thread_ids = vec![begin_event.receiver_thread_id.to_string()];
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: begin_event.call_id,
tool: CollabAgentTool::SendInput,
status: CollabAgentToolCallStatus::InProgress,
@@ -146,12 +148,12 @@ pub fn item_event_to_server_notification(
reasoning_effort: None,
agents_states: HashMap::new(),
};
- ServerNotification::ItemStarted(ItemStartedNotification {
+ ServerNotification::ItemStarted(ItemStartedNotification::new(
thread_id,
turn_id,
item,
- started_at_ms: begin_event.started_at_ms,
- })
+ begin_event.started_at_ms,
+ ))
}
EventMsg::CollabAgentInteractionEnd(end_event) => {
let status = match &end_event.status {
@@ -163,7 +165,7 @@ pub fn item_event_to_server_notification(
};
let receiver_id = end_event.receiver_thread_id.to_string();
let received_status = CollabAgentState::from(end_event.status);
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: end_event.call_id,
tool: CollabAgentTool::SendInput,
status,
@@ -174,15 +176,16 @@ pub fn item_event_to_server_notification(
reasoning_effort: None,
agents_states: [(receiver_id, received_status)].into_iter().collect(),
};
- ServerNotification::ItemCompleted(ItemCompletedNotification {
+ ServerNotification::ItemCompleted(ItemCompletedNotification::new(
thread_id,
turn_id,
item,
- completed_at_ms: end_event.completed_at_ms,
- })
+ /*started_at_ms*/ None,
+ end_event.completed_at_ms,
+ ))
}
EventMsg::SubAgentActivity(activity) => {
- let item = ThreadItem::SubAgentActivity {
+ let item = ThreadItemPayload::SubAgentActivity {
model: activity.model,
reasoning_effort: activity.reasoning_effort,
id: activity.event_id,
@@ -190,12 +193,13 @@ pub fn item_event_to_server_notification(
agent_thread_id: activity.agent_thread_id.to_string(),
agent_path: String::from(activity.agent_path),
};
- ServerNotification::ItemCompleted(ItemCompletedNotification {
+ ServerNotification::ItemCompleted(ItemCompletedNotification::new(
thread_id,
turn_id,
item,
- completed_at_ms: activity.occurred_at_ms,
- })
+ /*started_at_ms*/ None,
+ activity.occurred_at_ms,
+ ))
}
EventMsg::CollabWaitingBegin(begin_event) => {
let receiver_thread_ids = begin_event
@@ -203,7 +207,7 @@ pub fn item_event_to_server_notification(
.iter()
.map(ToString::to_string)
.collect();
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: begin_event.call_id,
tool: CollabAgentTool::Wait,
status: CollabAgentToolCallStatus::InProgress,
@@ -214,12 +218,12 @@ pub fn item_event_to_server_notification(
reasoning_effort: None,
agents_states: HashMap::new(),
};
- ServerNotification::ItemStarted(ItemStartedNotification {
+ ServerNotification::ItemStarted(ItemStartedNotification::new(
thread_id,
turn_id,
item,
- started_at_ms: begin_event.started_at_ms,
- })
+ begin_event.started_at_ms,
+ ))
}
EventMsg::CollabWaitingEnd(end_event) => {
let status = if end_event.statuses.values().any(|status| {
@@ -239,7 +243,7 @@ pub fn item_event_to_server_notification(
.iter()
.map(|(id, status)| (id.to_string(), CollabAgentState::from(status.clone())))
.collect();
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: end_event.call_id,
tool: CollabAgentTool::Wait,
status,
@@ -250,15 +254,16 @@ pub fn item_event_to_server_notification(
reasoning_effort: None,
agents_states,
};
- ServerNotification::ItemCompleted(ItemCompletedNotification {
+ ServerNotification::ItemCompleted(ItemCompletedNotification::new(
thread_id,
turn_id,
item,
- completed_at_ms: end_event.completed_at_ms,
- })
+ /*started_at_ms*/ None,
+ end_event.completed_at_ms,
+ ))
}
EventMsg::CollabCloseBegin(begin_event) => {
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: begin_event.call_id,
tool: CollabAgentTool::CloseAgent,
status: CollabAgentToolCallStatus::InProgress,
@@ -269,12 +274,12 @@ pub fn item_event_to_server_notification(
reasoning_effort: None,
agents_states: HashMap::new(),
};
- ServerNotification::ItemStarted(ItemStartedNotification {
+ ServerNotification::ItemStarted(ItemStartedNotification::new(
thread_id,
turn_id,
item,
- started_at_ms: begin_event.started_at_ms,
- })
+ begin_event.started_at_ms,
+ ))
}
EventMsg::CollabCloseEnd(end_event) => {
let status = match &end_event.status {
@@ -291,7 +296,7 @@ pub fn item_event_to_server_notification(
)]
.into_iter()
.collect();
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: end_event.call_id,
tool: CollabAgentTool::CloseAgent,
status,
@@ -302,15 +307,16 @@ pub fn item_event_to_server_notification(
reasoning_effort: None,
agents_states,
};
- ServerNotification::ItemCompleted(ItemCompletedNotification {
+ ServerNotification::ItemCompleted(ItemCompletedNotification::new(
thread_id,
turn_id,
item,
- completed_at_ms: end_event.completed_at_ms,
- })
+ /*started_at_ms*/ None,
+ end_event.completed_at_ms,
+ ))
}
EventMsg::CollabResumeBegin(begin_event) => {
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: begin_event.call_id,
tool: CollabAgentTool::ResumeAgent,
status: CollabAgentToolCallStatus::InProgress,
@@ -321,12 +327,12 @@ pub fn item_event_to_server_notification(
reasoning_effort: None,
agents_states: HashMap::new(),
};
- ServerNotification::ItemStarted(ItemStartedNotification {
+ ServerNotification::ItemStarted(ItemStartedNotification::new(
thread_id,
turn_id,
item,
- started_at_ms: begin_event.started_at_ms,
- })
+ begin_event.started_at_ms,
+ ))
}
EventMsg::CollabResumeEnd(end_event) => {
let status = match &end_event.status {
@@ -343,7 +349,7 @@ pub fn item_event_to_server_notification(
)]
.into_iter()
.collect();
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: end_event.call_id,
tool: CollabAgentTool::ResumeAgent,
status,
@@ -354,12 +360,13 @@ pub fn item_event_to_server_notification(
reasoning_effort: None,
agents_states,
};
- ServerNotification::ItemCompleted(ItemCompletedNotification {
+ ServerNotification::ItemCompleted(ItemCompletedNotification::new(
thread_id,
turn_id,
item,
- completed_at_ms: end_event.completed_at_ms,
- })
+ /*started_at_ms*/ None,
+ end_event.completed_at_ms,
+ ))
}
EventMsg::AgentMessageContentDelta(event) => {
let codex_protocol::protocol::AgentMessageContentDeltaEvent { item_id, delta, .. } =
@@ -404,20 +411,21 @@ pub fn item_event_to_server_notification(
})
}
EventMsg::ItemStarted(item_started_event) => {
- ServerNotification::ItemStarted(ItemStartedNotification {
+ ServerNotification::ItemStarted(ItemStartedNotification::new(
thread_id,
turn_id,
- item: item_started_event.item.into(),
- started_at_ms: item_started_event.started_at_ms,
- })
+ ThreadItemPayload::from(item_started_event.item),
+ item_started_event.started_at_ms,
+ ))
}
EventMsg::ItemCompleted(item_completed_event) => {
- ServerNotification::ItemCompleted(ItemCompletedNotification {
+ ServerNotification::ItemCompleted(ItemCompletedNotification::new(
thread_id,
turn_id,
- item: item_completed_event.item.into(),
- completed_at_ms: item_completed_event.completed_at_ms,
- })
+ ThreadItemPayload::from(item_completed_event.item),
+ item_completed_event.started_at_ms,
+ item_completed_event.completed_at_ms,
+ ))
}
EventMsg::PatchApplyUpdated(event) => {
ServerNotification::FileChangePatchUpdated(FileChangePatchUpdatedNotification {
@@ -428,12 +436,12 @@ pub fn item_event_to_server_notification(
})
}
EventMsg::ExecCommandBegin(exec_command_begin_event) => {
- ServerNotification::ItemStarted(ItemStartedNotification {
+ ServerNotification::ItemStarted(ItemStartedNotification::new(
thread_id,
turn_id,
- item: build_command_execution_begin_item(&exec_command_begin_event),
- started_at_ms: exec_command_begin_event.started_at_ms,
- })
+ build_command_execution_begin_item(&exec_command_begin_event),
+ exec_command_begin_event.started_at_ms,
+ ))
}
EventMsg::ExecCommandOutputDelta(exec_command_output_delta_event) => {
let item_id = exec_command_output_delta_event.call_id;
@@ -457,12 +465,13 @@ pub fn item_event_to_server_notification(
})
}
EventMsg::ExecCommandEnd(exec_command_end_event) => {
- ServerNotification::ItemCompleted(ItemCompletedNotification {
+ ServerNotification::ItemCompleted(ItemCompletedNotification::new(
thread_id,
turn_id,
- item: build_command_execution_end_item(&exec_command_end_event),
- completed_at_ms: exec_command_end_event.completed_at_ms,
- })
+ build_command_execution_end_item(&exec_command_end_event),
+ /*started_at_ms*/ None,
+ exec_command_end_event.completed_at_ms,
+ ))
}
_ => unreachable!("unsupported item event"),
}
@@ -528,11 +537,10 @@ mod tests {
);
assert_item_started_server_notification(
notification,
- ItemStartedNotification {
- thread_id: "thread-1".to_string(),
- turn_id: "turn-1".to_string(),
- started_at_ms: event.started_at_ms,
- item: ThreadItem::CollabAgentToolCall {
+ ItemStartedNotification::new(
+ "thread-1".to_string(),
+ "turn-1".to_string(),
+ ThreadItemPayload::CollabAgentToolCall {
id: event.call_id,
tool: CollabAgentTool::ResumeAgent,
status: CollabAgentToolCallStatus::InProgress,
@@ -543,7 +551,8 @@ mod tests {
reasoning_effort: None,
agents_states: HashMap::new(),
},
- },
+ event.started_at_ms,
+ ),
);
}
@@ -567,11 +576,10 @@ mod tests {
);
assert_item_completed_server_notification(
notification,
- ItemCompletedNotification {
- thread_id: "thread-2".to_string(),
- turn_id: "turn-2".to_string(),
- completed_at_ms: event.completed_at_ms,
- item: ThreadItem::CollabAgentToolCall {
+ ItemCompletedNotification::new(
+ "thread-2".to_string(),
+ "turn-2".to_string(),
+ ThreadItemPayload::CollabAgentToolCall {
id: event.call_id,
tool: CollabAgentTool::ResumeAgent,
status: CollabAgentToolCallStatus::Failed,
@@ -587,7 +595,9 @@ mod tests {
.into_iter()
.collect(),
},
- },
+ /*started_at_ms*/ None,
+ event.completed_at_ms,
+ ),
);
}
diff --git a/codex-rs/app-server-protocol/src/protocol/item_builders.rs b/codex-rs/app-server-protocol/src/protocol/item_builders.rs
index 1ace0e8a6ebd..3f100534d7f2 100644
--- a/codex-rs/app-server-protocol/src/protocol/item_builders.rs
+++ b/codex-rs/app-server-protocol/src/protocol/item_builders.rs
@@ -21,7 +21,7 @@ use crate::protocol::v2::ItemGuardianApprovalReviewCompletedNotification;
use crate::protocol::v2::ItemGuardianApprovalReviewStartedNotification;
use crate::protocol::v2::PatchApplyStatus;
use crate::protocol::v2::PatchChangeKind;
-use crate::protocol::v2::ThreadItem;
+use crate::protocol::v2::ThreadItemPayload;
use codex_protocol::ThreadId;
use codex_protocol::parse_command::ParsedCommand;
use codex_protocol::protocol::ApplyPatchApprovalRequestEvent;
@@ -69,34 +69,34 @@ pub(crate) fn review_output_text(output: Option<&ReviewOutputEvent>) -> String {
pub fn build_file_change_approval_request_item(
payload: &ApplyPatchApprovalRequestEvent,
-) -> ThreadItem {
- ThreadItem::FileChange {
+) -> ThreadItemPayload {
+ ThreadItemPayload::FileChange {
id: payload.call_id.clone(),
changes: convert_patch_changes(&payload.changes),
status: PatchApplyStatus::InProgress,
}
}
-pub fn build_file_change_begin_item(payload: &PatchApplyBeginEvent) -> ThreadItem {
- ThreadItem::FileChange {
+pub fn build_file_change_begin_item(payload: &PatchApplyBeginEvent) -> ThreadItemPayload {
+ ThreadItemPayload::FileChange {
id: payload.call_id.clone(),
changes: convert_patch_changes(&payload.changes),
status: PatchApplyStatus::InProgress,
}
}
-pub fn build_file_change_end_item(payload: &PatchApplyEndEvent) -> ThreadItem {
- ThreadItem::FileChange {
+pub fn build_file_change_end_item(payload: &PatchApplyEndEvent) -> ThreadItemPayload {
+ ThreadItemPayload::FileChange {
id: payload.call_id.clone(),
changes: convert_patch_changes(&payload.changes),
status: (&payload.status).into(),
}
}
-pub fn build_command_execution_begin_item(payload: &ExecCommandBeginEvent) -> ThreadItem {
+pub fn build_command_execution_begin_item(payload: &ExecCommandBeginEvent) -> ThreadItemPayload {
let presentation =
CommandExecutionPresentation::from_raw(&payload.command, &payload.parsed_cmd, &payload.cwd);
- ThreadItem::CommandExecution {
+ ThreadItemPayload::CommandExecution {
model_context: None,
sandbox_type: None,
id: payload.call_id.clone(),
@@ -114,7 +114,7 @@ pub fn build_command_execution_begin_item(payload: &ExecCommandBeginEvent) -> Th
}
}
-pub fn build_command_execution_end_item(payload: &ExecCommandEndEvent) -> ThreadItem {
+pub fn build_command_execution_end_item(payload: &ExecCommandEndEvent) -> ThreadItemPayload {
let aggregated_output = if payload.aggregated_output.is_empty() {
None
} else {
@@ -124,7 +124,7 @@ pub fn build_command_execution_end_item(payload: &ExecCommandEndEvent) -> Thread
let presentation =
CommandExecutionPresentation::from_raw(&payload.command, &payload.parsed_cmd, &payload.cwd);
- ThreadItem::CommandExecution {
+ ThreadItemPayload::CommandExecution {
model_context: None,
sandbox_type: None,
id: payload.call_id.clone(),
@@ -193,7 +193,7 @@ fn command_actions_for_path_uri(parsed_cmd: &[ParsedCommand], cwd: &PathUri) ->
pub fn build_item_from_guardian_event(
assessment: &GuardianAssessmentEvent,
status: CommandExecutionStatus,
-) -> Option {
+) -> Option {
match &assessment.action {
GuardianAssessmentAction::Command { command, cwd, .. } => {
let id = assessment.target_item_id.as_ref()?;
@@ -201,7 +201,7 @@ pub fn build_item_from_guardian_event(
let command_actions = vec![CommandAction::Unknown {
command: command.clone(),
}];
- Some(ThreadItem::CommandExecution {
+ Some(ThreadItemPayload::CommandExecution {
id: id.clone(),
model_context: assessment.model_context.clone(),
sandbox_type: None,
@@ -241,7 +241,7 @@ pub fn build_item_from_guardian_event(
.map(|parsed| CommandAction::from_core_with_cwd(parsed, cwd))
.collect()
};
- Some(ThreadItem::CommandExecution {
+ Some(ThreadItemPayload::CommandExecution {
id: id.clone(),
model_context: assessment.model_context.clone(),
sandbox_type: None,
diff --git a/codex-rs/app-server-protocol/src/protocol/item_builders_tests.rs b/codex-rs/app-server-protocol/src/protocol/item_builders_tests.rs
index f08082a8d9bf..e9509d78999f 100644
--- a/codex-rs/app-server-protocol/src/protocol/item_builders_tests.rs
+++ b/codex-rs/app-server-protocol/src/protocol/item_builders_tests.rs
@@ -1,5 +1,6 @@
use super::*;
use crate::protocol::thread_history::build_turns_from_rollout_items;
+use crate::protocol::v2::ThreadItem;
use codex_protocol::protocol::EventMsg;
use codex_protocol::protocol::ExecCommandSource;
use codex_protocol::protocol::GuardianAssessmentStatus;
@@ -126,7 +127,11 @@ fn guardian_stdin_reviews_preserve_parent_command_history() {
assert_eq!(expected.len(), 2);
assert_eq!(
expected[0].items,
- vec![build_command_execution_begin_item(&begin)],
+ [ThreadItem {
+ payload: build_command_execution_begin_item(&begin),
+ started_at_ms: Some(begin.started_at_ms),
+ completed_at_ms: None,
+ }],
);
assert!(expected[1].items.is_empty());
diff --git a/codex-rs/app-server-protocol/src/protocol/thread_history.rs b/codex-rs/app-server-protocol/src/protocol/thread_history.rs
index 418a9fb1bb5c..c087791283dc 100644
--- a/codex-rs/app-server-protocol/src/protocol/thread_history.rs
+++ b/codex-rs/app-server-protocol/src/protocol/thread_history.rs
@@ -17,6 +17,7 @@ use crate::protocol::v2::McpToolCallError;
use crate::protocol::v2::McpToolCallResult;
use crate::protocol::v2::McpToolCallStatus;
use crate::protocol::v2::ThreadItem;
+use crate::protocol::v2::ThreadItemPayload;
use crate::protocol::v2::Turn;
use crate::protocol::v2::TurnError as V2TurnError;
use crate::protocol::v2::TurnError;
@@ -53,6 +54,7 @@ use codex_protocol::protocol::McpToolCallBeginEvent;
use codex_protocol::protocol::McpToolCallEndEvent;
use codex_protocol::protocol::PatchApplyBeginEvent;
use codex_protocol::protocol::PatchApplyEndEvent;
+use codex_protocol::protocol::ThreadHistoryMode;
use codex_protocol::protocol::ThreadRolledBackEvent;
use codex_protocol::protocol::TurnAbortedEvent;
use codex_protocol::protocol::TurnCompleteEvent;
@@ -95,13 +97,52 @@ pub fn build_turns_from_rollout_items(items: &[RolloutItem]) -> Vec {
builder.finish()
}
+#[derive(Default)]
+struct ItemTimes {
+ started_at_ms: Option,
+ completed_at_ms: Option,
+}
+
+impl ItemTimes {
+ // Legacy events deserialize an omitted integer timestamp as zero. Leave the
+ // item untimed in that case so replay never shows a date in 1970.
+ fn legacy_start(started_at_ms: i64) -> Self {
+ Self {
+ started_at_ms: (started_at_ms != 0).then_some(started_at_ms),
+ ..Self::default()
+ }
+ }
+
+ fn legacy_completion(completed_at_ms: i64) -> Self {
+ Self {
+ completed_at_ms: (completed_at_ms != 0).then_some(completed_at_ms),
+ ..Self::default()
+ }
+ }
+}
+
+fn history_items_with_times(
+ items: Vec,
+ times: &HashMap,
+) -> Vec {
+ items
+ .into_iter()
+ .map(|payload| {
+ let times = times.get(payload.id());
+ ThreadItem {
+ started_at_ms: times.and_then(|t| t.started_at_ms),
+ completed_at_ms: times.and_then(|t| t.completed_at_ms),
+ payload,
+ }
+ })
+ .collect()
+}
+
/// A materialized `ThreadItem` snapshot that changed while handling one input.
#[derive(Debug, Clone, PartialEq)]
pub struct ThreadHistoryItemChange {
pub turn_id: String,
pub item: ThreadItem,
- pub started_at_ms: Option,
- pub completed_at_ms: Option,
}
/// Turn metadata for history projection and snapshots that do not need items.
@@ -362,7 +403,19 @@ impl ThreadHistoryBuilder {
/// This function should handle all EventMsg variants that can be persisted in a rollout file.
/// See `persisted_rollout_item` in `codex-rs/rollout/src/policy.rs`.
pub fn handle_event(&mut self, event: &EventMsg) {
+ self.handle_event_for_history_mode(event, ThreadHistoryMode::Legacy);
+ }
+
+ /// Paginated live history uses canonical items when Core's compatibility
+ /// events omit their IDs. Legacy rollouts have only the compatibility events.
+ pub fn handle_event_for_history_mode(&mut self, event: &EventMsg, mode: ThreadHistoryMode) {
match event {
+ EventMsg::UserMessage(_)
+ | EventMsg::AgentMessage(_)
+ | EventMsg::AgentReasoning(_)
+ | EventMsg::AgentReasoningRawContent(_)
+ | EventMsg::ContextCompacted(_)
+ if mode == ThreadHistoryMode::Paginated => {}
EventMsg::UserMessage(payload) => self.handle_user_message(payload),
EventMsg::AgentMessage(payload) => self.handle_agent_message(payload),
EventMsg::AgentReasoning(payload) => self.handle_agent_reasoning(payload),
@@ -410,8 +463,8 @@ impl ThreadHistoryBuilder {
EventMsg::ContextCompacted(payload) => self.handle_context_compacted(payload),
EventMsg::EnteredReviewMode(payload) => self.handle_entered_review_mode(payload),
EventMsg::ExitedReviewMode(payload) => self.handle_exited_review_mode(payload),
- EventMsg::ItemStarted(payload) => self.handle_item_started(payload),
- EventMsg::ItemCompleted(payload) => self.handle_item_completed(payload),
+ EventMsg::ItemStarted(payload) => self.handle_item_started(payload, mode),
+ EventMsg::ItemCompleted(payload) => self.handle_item_completed(payload, mode),
EventMsg::HookStarted(_) | EventMsg::HookCompleted(_) => {}
EventMsg::Error(payload) => self.handle_error(payload),
EventMsg::TokenCount(_) => {}
@@ -438,6 +491,7 @@ impl ThreadHistoryBuilder {
| RolloutItem::RealtimeItem(_)
| RolloutItem::RetainedContext(_)
| RolloutItem::SecurityRiskScore(_)
+ | RolloutItem::DynamicToolsUpdated { .. }
| RolloutItem::SessionMeta(_) => {}
}
}
@@ -475,7 +529,19 @@ impl ThreadHistoryBuilder {
debug_assert!(self.active_change_set.is_none());
self.active_change_set = Some(ThreadHistoryChangeSet::default());
handle(self);
- self.active_change_set.take().unwrap_or_default()
+ let mut changes = self.active_change_set.take().unwrap_or_default();
+ // Canonical events can record times after updating the payload. Publish
+ // the same lifecycle times a turn snapshot would return after this event.
+ for change in &mut changes.changed_items {
+ if let Some(times) = self
+ .turn_mut(&change.turn_id)
+ .and_then(|turn| turn.item_times.get(change.item.id()))
+ {
+ change.item.started_at_ms = times.started_at_ms;
+ change.item.completed_at_ms = times.completed_at_ms;
+ }
+ }
+ changes
}
fn handle_response_item(&mut self, item: &codex_protocol::models::ResponseItem) {
@@ -494,7 +560,7 @@ impl ThreadHistoryBuilder {
return;
};
- self.push_item_in_current_turn(ThreadItem::HookPrompt {
+ self.push_item_in_current_turn(ThreadItemPayload::HookPrompt {
id: hook_prompt.id,
fragments: hook_prompt
.fragments
@@ -516,7 +582,7 @@ impl ThreadHistoryBuilder {
}
let id = self.next_item_id();
let content = self.build_user_inputs(payload);
- self.push_item_in_current_turn(ThreadItem::UserMessage {
+ self.push_item_in_current_turn(ThreadItemPayload::UserMessage {
id,
client_id: payload.client_id.clone(),
content,
@@ -529,7 +595,7 @@ impl ThreadHistoryBuilder {
}
let id = self.next_item_id();
- self.push_item_in_current_turn(ThreadItem::AgentMessage {
+ self.push_item_in_current_turn(ThreadItemPayload::AgentMessage {
id,
text: payload.message.clone(),
phase: payload.phase.clone(),
@@ -548,7 +614,7 @@ impl ThreadHistoryBuilder {
let existing_item_change = {
let tracking_changes = self.is_tracking_changes();
let turn = self.ensure_turn();
- if let Some(ThreadItem::Reasoning { summary, .. }) = turn.items.last_mut() {
+ if let Some(ThreadItemPayload::Reasoning { summary, .. }) = turn.items.last_mut() {
summary.push(payload.text.clone());
let changed_item = if tracking_changes {
turn.items
@@ -572,7 +638,7 @@ impl ThreadHistoryBuilder {
// Otherwise, create a new reasoning item.
let id = self.next_item_id();
- self.push_item_in_current_turn(ThreadItem::Reasoning {
+ self.push_item_in_current_turn(ThreadItemPayload::Reasoning {
id,
summary: vec![payload.text.clone()],
content: Vec::new(),
@@ -588,7 +654,7 @@ impl ThreadHistoryBuilder {
let existing_item_change = {
let tracking_changes = self.is_tracking_changes();
let turn = self.ensure_turn();
- if let Some(ThreadItem::Reasoning { content, .. }) = turn.items.last_mut() {
+ if let Some(ThreadItemPayload::Reasoning { content, .. }) = turn.items.last_mut() {
content.push(payload.text.clone());
let changed_item = if tracking_changes {
turn.items
@@ -612,19 +678,62 @@ impl ThreadHistoryBuilder {
// Otherwise, create a new reasoning item.
let id = self.next_item_id();
- self.push_item_in_current_turn(ThreadItem::Reasoning {
+ self.push_item_in_current_turn(ThreadItemPayload::Reasoning {
id,
summary: Vec::new(),
content: vec![payload.text.clone()],
});
}
- fn handle_item_started(&mut self, payload: &ItemStartedEvent) {
+ fn handle_item_started(&mut self, payload: &ItemStartedEvent, mode: ThreadHistoryMode) {
self.handle_materialized_item_lifecycle(&payload.turn_id, &payload.item);
+ self.record_item_times(
+ &payload.turn_id,
+ &payload.item,
+ Some(payload.started_at_ms),
+ /*completed_at_ms*/ None,
+ mode,
+ );
}
- fn handle_item_completed(&mut self, payload: &ItemCompletedEvent) {
- self.handle_materialized_item_lifecycle(&payload.turn_id, &payload.item);
+ fn handle_item_completed(&mut self, payload: &ItemCompletedEvent, mode: ThreadHistoryMode) {
+ if mode == ThreadHistoryMode::Paginated && has_idless_legacy_copy(&payload.item) {
+ let item = ThreadItemPayload::from(payload.item.clone());
+ if !matches!(&item, ThreadItemPayload::AgentMessage { text, .. } if text.is_empty()) {
+ self.upsert_item_in_turn_id(&payload.turn_id, item);
+ }
+ } else {
+ self.handle_materialized_item_lifecycle(&payload.turn_id, &payload.item);
+ }
+ self.record_item_times(
+ &payload.turn_id,
+ &payload.item,
+ payload.started_at_ms,
+ (payload.completed_at_ms != 0).then_some(payload.completed_at_ms),
+ mode,
+ );
+ }
+
+ fn record_item_times(
+ &mut self,
+ turn_id: &str,
+ item: &codex_protocol::items::TurnItem,
+ started_at_ms: Option,
+ completed_at_ms: Option,
+ mode: ThreadHistoryMode,
+ ) {
+ // The compatibility events for these items assign synthetic IDs. A matching
+ // ID string alone cannot establish that a timestamp belongs to that item.
+ let keeps_item_id = mode == ThreadHistoryMode::Paginated || !has_idless_legacy_copy(item);
+ if keeps_item_id && let Some(turn) = self.turn_mut(turn_id) {
+ turn.record_item_times(
+ &item.id(),
+ ItemTimes {
+ started_at_ms,
+ completed_at_ms,
+ },
+ );
+ }
}
fn handle_materialized_item_lifecycle(
@@ -660,7 +769,7 @@ impl ThreadHistoryBuilder {
};
if should_upsert {
- let item = ThreadItem::from(item.clone());
+ let item = ThreadItemPayload::from(item.clone());
if is_review_mode_item {
self.upsert_review_mode_item(Some(turn_id), item);
} else {
@@ -670,7 +779,7 @@ impl ThreadHistoryBuilder {
}
fn handle_web_search_begin(&mut self, payload: &WebSearchBeginEvent) {
- let item = ThreadItem::WebSearch(WebSearchItem {
+ let item = ThreadItemPayload::WebSearch(WebSearchItem {
id: payload.call_id.clone(),
query: String::new(),
action: None,
@@ -680,7 +789,7 @@ impl ThreadHistoryBuilder {
}
fn handle_web_search_end(&mut self, payload: &WebSearchEndEvent) {
- let item = ThreadItem::WebSearch(WebSearchItem {
+ let item = ThreadItemPayload::WebSearch(WebSearchItem {
id: payload.call_id.clone(),
query: payload.query.clone(),
action: Some(web_search_action_from_core(payload.action.clone())),
@@ -691,7 +800,8 @@ impl ThreadHistoryBuilder {
fn handle_exec_command_begin(&mut self, payload: &ExecCommandBeginEvent) {
let item = build_command_execution_begin_item(payload);
- self.upsert_item_in_turn_id(&payload.turn_id, item);
+ let times = ItemTimes::legacy_start(payload.started_at_ms);
+ self.upsert_item(Some(&payload.turn_id), item, times);
}
fn handle_exec_command_end(&mut self, payload: &ExecCommandEndEvent) {
@@ -701,7 +811,8 @@ impl ThreadHistoryBuilder {
// background exit watcher when that process finally exits. By then, a
// newer user turn may already have started. Route by event turn_id so
// replay preserves the original turn association.
- self.upsert_item_in_turn_id(&payload.turn_id, item);
+ let times = ItemTimes::legacy_completion(payload.completed_at_ms);
+ self.upsert_item(Some(&payload.turn_id), item, times);
}
fn handle_guardian_assessment(&mut self, payload: &GuardianAssessmentEvent) {
@@ -711,25 +822,32 @@ impl ThreadHistoryBuilder {
CommandExecutionStatus::Declined
}
GuardianAssessmentStatus::TimedOut => CommandExecutionStatus::Failed,
+ // Approval hands the command back to execution, which supplies its completion time.
GuardianAssessmentStatus::Approved => return,
};
let Some(item) = build_item_from_guardian_event(payload, status) else {
return;
};
- if payload.turn_id.is_empty() {
- self.upsert_item_in_current_turn(item);
- } else {
- self.upsert_item_in_turn_id(&payload.turn_id, item);
- }
+ self.upsert_item(
+ (!payload.turn_id.is_empty()).then_some(payload.turn_id.as_str()),
+ item,
+ ItemTimes {
+ completed_at_ms: payload.completed_at_ms,
+ ..ItemTimes::legacy_start(payload.started_at_ms)
+ },
+ );
}
fn handle_apply_patch_approval_request(&mut self, payload: &ApplyPatchApprovalRequestEvent) {
- let item = build_file_change_approval_request_item(payload);
- if payload.turn_id.is_empty() {
- self.upsert_item_in_current_turn(item);
- } else {
- self.upsert_item_in_turn_id(&payload.turn_id, item);
- }
+ // An approval can be the first event in the history for this file change.
+ self.upsert_item(
+ (!payload.turn_id.is_empty()).then_some(payload.turn_id.as_str()),
+ build_file_change_approval_request_item(payload),
+ ItemTimes {
+ started_at_ms: Some(payload.started_at_ms),
+ completed_at_ms: None,
+ },
+ );
}
fn handle_patch_apply_begin(&mut self, payload: &PatchApplyBeginEvent) {
@@ -754,7 +872,7 @@ impl ThreadHistoryBuilder {
&mut self,
payload: &codex_protocol::dynamic_tools::DynamicToolCallRequest,
) {
- let item = ThreadItem::DynamicToolCall {
+ let item = ThreadItemPayload::DynamicToolCall {
id: payload.call_id.clone(),
namespace: payload.namespace.clone(),
tool: payload.tool.clone(),
@@ -764,11 +882,11 @@ impl ThreadHistoryBuilder {
success: None,
duration_ms: None,
};
- if payload.turn_id.is_empty() {
- self.upsert_item_in_current_turn(item);
- } else {
- self.upsert_item_in_turn_id(&payload.turn_id, item);
- }
+ self.upsert_item(
+ (!payload.turn_id.is_empty()).then_some(payload.turn_id.as_str()),
+ item,
+ ItemTimes::legacy_start(payload.started_at_ms),
+ );
}
fn handle_dynamic_tool_call_response(&mut self, payload: &DynamicToolCallResponseEvent) {
@@ -778,7 +896,7 @@ impl ThreadHistoryBuilder {
DynamicToolCallStatus::Failed
};
let duration_ms = i64::try_from(payload.duration.as_millis()).ok();
- let item = ThreadItem::DynamicToolCall {
+ let item = ThreadItemPayload::DynamicToolCall {
id: payload.call_id.clone(),
namespace: payload.namespace.clone(),
tool: payload.tool.clone(),
@@ -788,15 +906,15 @@ impl ThreadHistoryBuilder {
success: Some(payload.success),
duration_ms,
};
- if payload.turn_id.is_empty() {
- self.upsert_item_in_current_turn(item);
- } else {
- self.upsert_item_in_turn_id(&payload.turn_id, item);
- }
+ self.upsert_item(
+ (!payload.turn_id.is_empty()).then_some(payload.turn_id.as_str()),
+ item,
+ ItemTimes::legacy_completion(payload.completed_at_ms),
+ );
}
fn handle_mcp_tool_call_begin(&mut self, payload: &McpToolCallBeginEvent) {
- let item = ThreadItem::McpToolCall {
+ let item = ThreadItemPayload::McpToolCall {
id: payload.call_id.clone(),
server: payload.invocation.server.clone(),
tool: payload.invocation.tool.clone(),
@@ -854,7 +972,7 @@ impl ThreadHistoryBuilder {
}),
),
};
- let item = ThreadItem::McpToolCall {
+ let item = ThreadItemPayload::McpToolCall {
id: payload.call_id.clone(),
server: payload.invocation.server.clone(),
tool: payload.invocation.tool.clone(),
@@ -890,7 +1008,7 @@ impl ThreadHistoryBuilder {
}
fn handle_view_image_tool_call(&mut self, payload: &ViewImageToolCallEvent) {
- let item = ThreadItem::ImageView {
+ let item = ThreadItemPayload::ImageView {
id: payload.call_id.clone(),
path: payload.path.clone().into(),
};
@@ -898,7 +1016,7 @@ impl ThreadHistoryBuilder {
}
fn handle_image_generation_begin(&mut self, payload: &ImageGenerationBeginEvent) {
- let item = ThreadItem::ImageGeneration(ImageGenerationItem {
+ let item = ThreadItemPayload::ImageGeneration(ImageGenerationItem {
id: payload.call_id.clone(),
status: String::new(),
revised_prompt: None,
@@ -916,7 +1034,7 @@ impl ThreadHistoryBuilder {
}
fn handle_image_generation_end(&mut self, payload: &ImageGenerationEndEvent) {
- let item = ThreadItem::ImageGeneration(ImageGenerationItem {
+ let item = ThreadItemPayload::ImageGeneration(ImageGenerationItem {
id: payload.call_id.clone(),
status: payload.status.clone(),
revised_prompt: payload.revised_prompt.clone(),
@@ -926,7 +1044,7 @@ impl ThreadHistoryBuilder {
saved_path: payload.saved_path.clone(),
input_images: payload.input_images.clone(),
imagegen_request_id: None,
- generation_id: None,
+ generation_id: payload.generation_id.clone(),
});
self.upsert_item_in_current_turn(item);
}
@@ -935,7 +1053,7 @@ impl ThreadHistoryBuilder {
&mut self,
payload: &codex_protocol::protocol::CollabAgentSpawnBeginEvent,
) {
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: payload.call_id.clone(),
tool: CollabAgentTool::SpawnAgent,
status: CollabAgentToolCallStatus::InProgress,
@@ -946,7 +1064,8 @@ impl ThreadHistoryBuilder {
reasoning_effort: Some(payload.reasoning_effort.clone()),
agents_states: HashMap::new(),
};
- self.upsert_item_in_current_turn(item);
+ let times = ItemTimes::legacy_start(payload.started_at_ms);
+ self.upsert_item(/*turn_id*/ None, item, times);
}
fn handle_collab_agent_spawn_end(
@@ -970,7 +1089,7 @@ impl ThreadHistoryBuilder {
}
None => (Vec::new(), HashMap::new()),
};
- self.upsert_item_in_current_turn(ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: payload.call_id.clone(),
tool: CollabAgentTool::SpawnAgent,
status,
@@ -980,14 +1099,16 @@ impl ThreadHistoryBuilder {
model: Some(payload.model.clone()),
reasoning_effort: Some(payload.reasoning_effort.clone()),
agents_states,
- });
+ };
+ let times = ItemTimes::legacy_completion(payload.completed_at_ms);
+ self.upsert_item(/*turn_id*/ None, item, times);
}
fn handle_collab_agent_interaction_begin(
&mut self,
payload: &codex_protocol::protocol::CollabAgentInteractionBeginEvent,
) {
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: payload.call_id.clone(),
tool: CollabAgentTool::SendInput,
status: CollabAgentToolCallStatus::InProgress,
@@ -998,7 +1119,8 @@ impl ThreadHistoryBuilder {
reasoning_effort: None,
agents_states: HashMap::new(),
};
- self.upsert_item_in_current_turn(item);
+ let times = ItemTimes::legacy_start(payload.started_at_ms);
+ self.upsert_item(/*turn_id*/ None, item, times);
}
fn handle_collab_agent_interaction_end(
@@ -1011,7 +1133,7 @@ impl ThreadHistoryBuilder {
};
let receiver_id = payload.receiver_thread_id.to_string();
let received_status = CollabAgentState::from(payload.status.clone());
- self.upsert_item_in_current_turn(ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: payload.call_id.clone(),
tool: CollabAgentTool::SendInput,
status,
@@ -1021,28 +1143,32 @@ impl ThreadHistoryBuilder {
model: None,
reasoning_effort: None,
agents_states: [(receiver_id, received_status)].into_iter().collect(),
- });
+ };
+ let times = ItemTimes::legacy_completion(payload.completed_at_ms);
+ self.upsert_item(/*turn_id*/ None, item, times);
}
fn handle_sub_agent_activity(
&mut self,
payload: &codex_protocol::protocol::SubAgentActivityEvent,
) {
- self.upsert_item_in_current_turn(ThreadItem::SubAgentActivity {
+ let item = ThreadItemPayload::SubAgentActivity {
model: payload.model.clone(),
reasoning_effort: payload.reasoning_effort.clone(),
id: payload.event_id.clone(),
kind: payload.kind.into(),
agent_thread_id: payload.agent_thread_id.to_string(),
agent_path: String::from(payload.agent_path.clone()),
- });
+ };
+ let times = ItemTimes::legacy_completion(payload.occurred_at_ms);
+ self.upsert_item(/*turn_id*/ None, item, times);
}
fn handle_collab_waiting_begin(
&mut self,
payload: &codex_protocol::protocol::CollabWaitingBeginEvent,
) {
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: payload.call_id.clone(),
tool: CollabAgentTool::Wait,
status: CollabAgentToolCallStatus::InProgress,
@@ -1057,7 +1183,8 @@ impl ThreadHistoryBuilder {
reasoning_effort: None,
agents_states: HashMap::new(),
};
- self.upsert_item_in_current_turn(item);
+ let times = ItemTimes::legacy_start(payload.started_at_ms);
+ self.upsert_item(/*turn_id*/ None, item, times);
}
fn handle_collab_waiting_end(
@@ -1081,7 +1208,7 @@ impl ThreadHistoryBuilder {
.iter()
.map(|(id, status)| (id.to_string(), CollabAgentState::from(status.clone())))
.collect();
- self.upsert_item_in_current_turn(ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: payload.call_id.clone(),
tool: CollabAgentTool::Wait,
status,
@@ -1091,14 +1218,16 @@ impl ThreadHistoryBuilder {
model: None,
reasoning_effort: None,
agents_states,
- });
+ };
+ let times = ItemTimes::legacy_completion(payload.completed_at_ms);
+ self.upsert_item(/*turn_id*/ None, item, times);
}
fn handle_collab_close_begin(
&mut self,
payload: &codex_protocol::protocol::CollabCloseBeginEvent,
) {
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: payload.call_id.clone(),
tool: CollabAgentTool::CloseAgent,
status: CollabAgentToolCallStatus::InProgress,
@@ -1109,7 +1238,8 @@ impl ThreadHistoryBuilder {
reasoning_effort: None,
agents_states: HashMap::new(),
};
- self.upsert_item_in_current_turn(item);
+ let times = ItemTimes::legacy_start(payload.started_at_ms);
+ self.upsert_item(/*turn_id*/ None, item, times);
}
fn handle_collab_close_end(&mut self, payload: &codex_protocol::protocol::CollabCloseEndEvent) {
@@ -1124,7 +1254,7 @@ impl ThreadHistoryBuilder {
)]
.into_iter()
.collect();
- self.upsert_item_in_current_turn(ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: payload.call_id.clone(),
tool: CollabAgentTool::CloseAgent,
status,
@@ -1134,14 +1264,16 @@ impl ThreadHistoryBuilder {
model: None,
reasoning_effort: None,
agents_states,
- });
+ };
+ let times = ItemTimes::legacy_completion(payload.completed_at_ms);
+ self.upsert_item(/*turn_id*/ None, item, times);
}
fn handle_collab_resume_begin(
&mut self,
payload: &codex_protocol::protocol::CollabResumeBeginEvent,
) {
- let item = ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: payload.call_id.clone(),
tool: CollabAgentTool::ResumeAgent,
status: CollabAgentToolCallStatus::InProgress,
@@ -1152,7 +1284,8 @@ impl ThreadHistoryBuilder {
reasoning_effort: None,
agents_states: HashMap::new(),
};
- self.upsert_item_in_current_turn(item);
+ let times = ItemTimes::legacy_start(payload.started_at_ms);
+ self.upsert_item(/*turn_id*/ None, item, times);
}
fn handle_collab_resume_end(
@@ -1170,7 +1303,7 @@ impl ThreadHistoryBuilder {
)]
.into_iter()
.collect();
- self.upsert_item_in_current_turn(ThreadItem::CollabAgentToolCall {
+ let item = ThreadItemPayload::CollabAgentToolCall {
id: payload.call_id.clone(),
tool: CollabAgentTool::ResumeAgent,
status,
@@ -1180,12 +1313,14 @@ impl ThreadHistoryBuilder {
model: None,
reasoning_effort: None,
agents_states,
- });
+ };
+ let times = ItemTimes::legacy_completion(payload.completed_at_ms);
+ self.upsert_item(/*turn_id*/ None, item, times);
}
fn handle_context_compacted(&mut self, _payload: &ContextCompactedEvent) {
let id = self.next_item_id();
- self.push_item_in_current_turn(ThreadItem::ContextCompaction { id });
+ self.push_item_in_current_turn(ThreadItemPayload::ContextCompaction { id });
}
fn handle_entered_review_mode(
@@ -1202,7 +1337,7 @@ impl ThreadHistoryBuilder {
.unwrap_or_else(|| self.next_item_id());
self.upsert_review_mode_item(
payload.turn_id.as_deref(),
- ThreadItem::EnteredReviewMode { id, review },
+ ThreadItemPayload::EnteredReviewMode { id, review },
);
}
@@ -1217,11 +1352,11 @@ impl ThreadHistoryBuilder {
.unwrap_or_else(|| self.next_item_id());
self.upsert_review_mode_item(
payload.turn_id.as_deref(),
- ThreadItem::ExitedReviewMode { id, review },
+ ThreadItemPayload::ExitedReviewMode { id, review },
);
}
- fn upsert_review_mode_item(&mut self, turn_id: Option<&str>, item: ThreadItem) {
+ fn upsert_review_mode_item(&mut self, turn_id: Option<&str>, item: ThreadItemPayload) {
let Some(turn_id) = turn_id else {
self.upsert_item_in_current_turn(item);
return;
@@ -1425,6 +1560,7 @@ impl ThreadHistoryBuilder {
root_turn_id: None,
items: Vec::new(),
item_index: TurnItemIndex::default(),
+ item_times: HashMap::new(),
error: None,
status: TurnStatus::Completed,
started_at: None,
@@ -1450,7 +1586,7 @@ impl ThreadHistoryBuilder {
unreachable!("current turn must exist after initialization");
}
- fn push_item_in_current_turn(&mut self, item: ThreadItem) {
+ fn push_item_in_current_turn(&mut self, item: ThreadItemPayload) {
let tracking_changes = self.is_tracking_changes();
let changed_item = {
let turn = self.ensure_turn();
@@ -1463,46 +1599,40 @@ impl ThreadHistoryBuilder {
}
}
- fn upsert_item_in_turn_id(&mut self, turn_id: &str, item: ThreadItem) {
- let tracking_changes = self.is_tracking_changes();
- if let Some(turn) = self.current_turn.as_mut()
- && turn.id == turn_id
- {
- let changed_item = {
- let item = turn.item_index.upsert(&mut turn.items, item);
- tracking_changes.then(|| (turn.id.clone(), item.clone()))
- };
- if let Some((turn_id, item)) = changed_item {
- self.record_changed_item(turn_id, item);
- }
- return;
- }
+ fn turn_mut(&mut self, turn_id: &str) -> Option<&mut PendingTurn> {
+ self.current_turn
+ .as_mut()
+ .filter(|turn| turn.id == turn_id)
+ .or_else(|| self.turns.iter_mut().find(|turn| turn.id == turn_id))
+ }
- if let Some(turn) = self.turns.iter_mut().find(|turn| turn.id == turn_id) {
- let changed_item = {
- let item = turn.item_index.upsert(&mut turn.items, item);
- tracking_changes.then(|| (turn.id.clone(), item.clone()))
- };
- if let Some((turn_id, item)) = changed_item {
- self.record_changed_item(turn_id, item);
- }
- return;
- }
+ fn upsert_item_in_turn_id(&mut self, turn_id: &str, item: ThreadItemPayload) {
+ self.upsert_item(Some(turn_id), item, ItemTimes::default());
+ }
- warn!(
- item_id = item.id(),
- "dropping turn-scoped item for unknown turn id `{turn_id}`"
- );
+ fn upsert_item_in_current_turn(&mut self, item: ThreadItemPayload) {
+ self.upsert_item(/*turn_id*/ None, item, ItemTimes::default());
}
- fn upsert_item_in_current_turn(&mut self, item: ThreadItem) {
+ fn upsert_item(&mut self, turn_id: Option<&str>, item: ThreadItemPayload, times: ItemTimes) {
let tracking_changes = self.is_tracking_changes();
- let changed_item = {
- let turn = self.ensure_turn();
- let item = turn.item_index.upsert(&mut turn.items, item);
- tracking_changes.then(|| (turn.id.clone(), item.clone()))
+ let turn = if let Some(turn_id) = turn_id {
+ let Some(turn) = self.turn_mut(turn_id) else {
+ warn!(
+ item_id = item.id(),
+ "dropping turn-scoped item for unknown turn id `{turn_id}`"
+ );
+ return;
+ };
+ turn
+ } else {
+ self.ensure_turn()
};
- if let Some((turn_id, item)) = changed_item {
+ turn.record_item_times(item.id(), times);
+ let item = turn.item_index.upsert(&mut turn.items, item);
+ if tracking_changes {
+ let turn_id = turn.id.clone();
+ let item = item.clone();
self.record_changed_item(turn_id, item);
}
}
@@ -1511,14 +1641,11 @@ impl ThreadHistoryBuilder {
self.active_change_set.is_some()
}
- fn record_changed_item(&mut self, turn_id: String, item: ThreadItem) {
+ fn record_changed_item(&mut self, turn_id: String, item: ThreadItemPayload) {
if let Some(change_set) = self.active_change_set.as_mut() {
change_set.changed_items.push(ThreadHistoryItemChange {
turn_id,
- item,
- // Legacy events used by ThreadHistoryBuilder don't have timestamps
- started_at_ms: None,
- completed_at_ms: None,
+ item: ThreadItem::untimed(item),
});
}
}
@@ -1636,6 +1763,18 @@ impl ThreadHistoryBuilder {
}
}
+/// These items get synthetic IDs when reconstructed from compatibility events.
+fn has_idless_legacy_copy(item: &codex_protocol::items::TurnItem) -> bool {
+ use codex_protocol::items::TurnItem;
+ matches!(
+ item,
+ TurnItem::UserMessage(_)
+ | TurnItem::AgentMessage(_)
+ | TurnItem::Reasoning(_)
+ | TurnItem::ContextCompaction(_)
+ )
+}
+
fn convert_dynamic_tool_content_items(
items: &[codex_protocol::dynamic_tools::DynamicToolCallOutputContentItem],
) -> Vec {
@@ -1667,7 +1806,7 @@ struct TurnItemIndex {
}
impl TurnItemIndex {
- fn push(&mut self, items: &mut Vec, item: ThreadItem) {
+ fn push(&mut self, items: &mut Vec, item: ThreadItemPayload) {
if let Some(positions) = &mut self.positions {
positions
.entry(item.id().to_string())
@@ -1676,7 +1815,11 @@ impl TurnItemIndex {
items.push(item);
}
- fn upsert<'a>(&mut self, items: &'a mut Vec, item: ThreadItem) -> &'a ThreadItem {
+ fn upsert<'a>(
+ &mut self,
+ items: &'a mut Vec,
+ item: ThreadItemPayload,
+ ) -> &'a ThreadItemPayload {
if self.positions.is_none() && items.len() >= TURN_ITEM_INDEX_THRESHOLD {
let mut positions = HashMap::with_capacity(items.len());
for (index, existing) in items.iter().enumerate() {
@@ -1703,8 +1846,9 @@ impl TurnItemIndex {
struct PendingTurn {
id: String,
root_turn_id: Option,
- items: Vec,
+ items: Vec,
item_index: TurnItemIndex,
+ item_times: HashMap,
error: Option,
status: TurnStatus,
started_at: Option,
@@ -1721,6 +1865,16 @@ struct PendingTurn {
}
impl PendingTurn {
+ fn record_item_times(&mut self, item_id: &str, times: ItemTimes) {
+ if times.started_at_ms.is_some() || times.completed_at_ms.is_some() {
+ let recorded = self.item_times.entry(item_id.to_owned()).or_default();
+ // Canonical and compatibility events can describe the same item.
+ // Each fills in only the part of its lifecycle we have yet to observe.
+ recorded.started_at_ms = recorded.started_at_ms.or(times.started_at_ms);
+ recorded.completed_at_ms = recorded.completed_at_ms.or(times.completed_at_ms);
+ }
+ }
+
fn opened_explicitly(mut self) -> Self {
self.opened_explicitly = true;
self
@@ -1737,10 +1891,11 @@ impl PendingTurn {
}
fn snapshot(&self, items_view: TurnItemsView) -> Turn {
+ let items = items_view.project_items(&self.items);
Turn {
id: self.id.clone(),
root_turn_id: self.root_turn_id.clone(),
- items: items_view.project_items(&self.items),
+ items: history_items_with_times(items, &self.item_times),
items_view,
error: self.error.clone(),
status: self.status.clone(),
@@ -1756,7 +1911,7 @@ impl From for Turn {
Self {
id: value.id,
root_turn_id: value.root_turn_id,
- items: value.items,
+ items: history_items_with_times(value.items, &value.item_times),
items_view: TurnItemsView::Full,
error: value.error,
status: value.status,
@@ -1829,8 +1984,8 @@ mod tests {
use std::time::Duration;
use uuid::Uuid;
- fn indexed_sleep_item(id: &str, duration_ms: u64) -> ThreadItem {
- ThreadItem::Sleep(CoreSleepItem {
+ fn indexed_sleep_item(id: &str, duration_ms: u64) -> ThreadItemPayload {
+ ThreadItemPayload::Sleep(CoreSleepItem {
id: id.to_string(),
duration_ms,
})
@@ -1864,6 +2019,62 @@ mod tests {
}
}
+ #[test]
+ fn paginated_snapshot_keeps_reasoning_and_compaction_lifecycle() {
+ use codex_protocol::items::ContextCompactionItem;
+ use codex_protocol::items::ReasoningItem;
+ use codex_protocol::protocol::HasLegacyEvent;
+
+ let mode = ThreadHistoryMode::Paginated;
+ let mut builder = ThreadHistoryBuilder::new();
+ let turn_id = "turn-1".to_string();
+ builder.handle_event_for_history_mode(
+ &EventMsg::TurnStarted(TurnStartedEvent {
+ turn_id: turn_id.clone(),
+ turn_attribution: None,
+ root_turn_id: None,
+ trace_id: None,
+ started_at: None,
+ model_context_window: None,
+ collaboration_mode_kind: Default::default(),
+ }),
+ mode,
+ );
+ let mut expected = Vec::new();
+ for item in [
+ CoreTurnItem::Reasoning(ReasoningItem {
+ id: "reasoning".into(),
+ summary_text: vec!["summary".into()],
+ raw_content: vec!["content".into()],
+ }),
+ CoreTurnItem::ContextCompaction(ContextCompactionItem {
+ id: "compaction".into(),
+ }),
+ ] {
+ let started = ItemStartedEvent {
+ thread_id: ThreadId::default(),
+ turn_id: turn_id.clone(),
+ item: item.clone(),
+ started_at_ms: 10,
+ };
+ builder.handle_event_for_history_mode(&EventMsg::ItemStarted(started), mode);
+ let completed = ItemCompletedEvent {
+ thread_id: ThreadId::default(),
+ turn_id: turn_id.clone(),
+ item,
+ started_at_ms: Some(10),
+ completed_at_ms: 20,
+ };
+ expected.push(ThreadItem::from(&completed));
+ let copies = completed.as_legacy_events(/*show_raw_agent_reasoning*/ true);
+ builder.handle_event_for_history_mode(&EventMsg::ItemCompleted(completed), mode);
+ for copy in copies {
+ builder.handle_event_for_history_mode(©, mode);
+ }
+ }
+ assert_eq!(builder.active_turn_snapshot().unwrap().items, expected);
+ }
+
#[test]
fn builds_multiple_turns_with_reasoning_items() {
let events = vec![
@@ -1917,8 +2128,8 @@ mod tests {
assert_eq!(first.status, TurnStatus::Completed);
assert_eq!(first.items.len(), 3);
assert_eq!(
- first.items[0],
- ThreadItem::UserMessage {
+ first.items[0].payload,
+ ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![
@@ -1936,8 +2147,8 @@ mod tests {
}
);
assert_eq!(
- first.items[1],
- ThreadItem::AgentMessage {
+ first.items[1].payload,
+ ThreadItemPayload::AgentMessage {
id: "item-2".into(),
text: "Hi there".into(),
phase: None,
@@ -1947,8 +2158,8 @@ mod tests {
}
);
assert_eq!(
- first.items[2],
- ThreadItem::Reasoning {
+ first.items[2].payload,
+ ThreadItemPayload::Reasoning {
id: "item-3".into(),
summary: vec!["thinking".into()],
content: vec!["full reasoning".into()],
@@ -1960,8 +2171,8 @@ mod tests {
assert_ne!(first.id, second.id);
assert_eq!(second.items.len(), 2);
assert_eq!(
- second.items[0],
- ThreadItem::UserMessage {
+ second.items[0].payload,
+ ThreadItemPayload::UserMessage {
id: "item-4".into(),
client_id: None,
content: vec![UserInput::Text {
@@ -1971,8 +2182,8 @@ mod tests {
}
);
assert_eq!(
- second.items[1],
- ThreadItem::AgentMessage {
+ second.items[1].payload,
+ ThreadItemPayload::AgentMessage {
id: "item-5".into(),
text: "Reply two".into(),
phase: None,
@@ -2019,13 +2230,13 @@ mod tests {
assert_eq!(turns[0].id, "turn-1");
assert_eq!(
- turns[0].items,
- vec![
- ThreadItem::EnteredReviewMode {
+ turns[0].item_payloads().collect::>(),
+ [
+ &ThreadItemPayload::EnteredReviewMode {
id: "entered-review".into(),
review: "Review requested.".into(),
},
- ThreadItem::ExitedReviewMode {
+ &ThreadItemPayload::ExitedReviewMode {
id: "exited-review".into(),
review: REVIEW_FALLBACK_MESSAGE.into(),
},
@@ -2082,13 +2293,13 @@ mod tests {
assert_eq!(turns[0].id, "turn-1");
assert_eq!(
- turns[0].items,
- vec![
- ThreadItem::EnteredReviewMode {
+ turns[0].item_payloads().collect::>(),
+ [
+ &ThreadItemPayload::EnteredReviewMode {
id: "entered-review".into(),
review: "Review requested.".into(),
},
- ThreadItem::ExitedReviewMode {
+ &ThreadItemPayload::ExitedReviewMode {
id: "exited-review".into(),
review: REVIEW_FALLBACK_MESSAGE.into(),
},
@@ -2121,8 +2332,8 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(
- turns[0].items[0],
- ThreadItem::UserMessage {
+ turns[0].items[0].payload,
+ ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![
@@ -2172,8 +2383,8 @@ mod tests {
let turns = build_turns_from_rollout_items(&events);
assert_eq!(
- turns[0].items[0],
- ThreadItem::UserMessage {
+ turns[0].items[0].payload,
+ ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![
@@ -2246,8 +2457,8 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].items.len(), 1);
assert_eq!(
- turns[0].items[0],
- ThreadItem::UserMessage {
+ turns[0].items[0].payload,
+ ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![UserInput::Text {
@@ -2303,12 +2514,19 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(
- turns[0].items,
- vec![ThreadItem::Sleep(CoreSleepItem {
+ turns[0].item_payloads().collect::>(),
+ [&ThreadItemPayload::Sleep(CoreSleepItem {
id: "sleep-1".to_string(),
duration_ms: 1_000,
})]
);
+ assert_eq!(
+ (
+ turns[0].items[0].started_at_ms,
+ turns[0].items[0].completed_at_ms
+ ),
+ (Some(0), Some(1_000))
+ );
}
#[test]
@@ -2329,7 +2547,10 @@ mod tests {
builder.handle_thread_rollback(&ThreadRolledBackEvent { num_turns: 1 });
expected[0] = indexed_sleep_item("0", /*duration_ms*/ 2);
builder.upsert_item_in_turn_id("retained", expected[0].clone());
- assert_eq!(builder.finish()[0].items, expected);
+ assert_eq!(
+ builder.finish()[0].item_payloads().collect::>(),
+ expected.iter().collect::>()
+ );
}
#[test]
@@ -2396,8 +2617,8 @@ mod tests {
let turns = build_turns_from_rollout_items(&items);
assert_eq!(
- turns[0].items,
- vec![ThreadItem::ImageGeneration(ImageGenerationItem {
+ turns[0].item_payloads().collect::>(),
+ [&ThreadItemPayload::ImageGeneration(ImageGenerationItem {
id: "image-1".to_string(),
status: "completed".to_string(),
revised_prompt: Some("A blue square".to_string()),
@@ -2511,8 +2732,10 @@ mod tests {
.collect::>();
assert_eq!(
- build_turns_from_rollout_items(&items[..2])[0].items,
- vec![ThreadItem::CommandExecution {
+ build_turns_from_rollout_items(&items[..2])[0]
+ .item_payloads()
+ .collect::>(),
+ [&ThreadItemPayload::CommandExecution {
model_context: None,
sandbox_type: None,
id: "exec-1".to_string(),
@@ -2538,8 +2761,8 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(
- turns[0].items,
- vec![ThreadItem::CommandExecution {
+ turns[0].item_payloads().collect::>(),
+ [&ThreadItemPayload::CommandExecution {
model_context: None,
sandbox_type: None,
id: "exec-1".to_string(),
@@ -2618,14 +2841,14 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(
turns[0].items,
- vec![ThreadItem::UserMessage {
+ [ThreadItem::untimed(ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: Some("client-message-1".to_string()),
content: vec![UserInput::Text {
text: "hello".into(),
text_elements: Vec::new(),
}],
- }]
+ })]
);
}
@@ -2656,8 +2879,8 @@ mod tests {
let turns = build_turns_from_rollout_items(&items);
assert_eq!(turns.len(), 1);
assert_eq!(
- turns[0].items[0],
- ThreadItem::AgentMessage {
+ turns[0].items[0].payload,
+ ThreadItemPayload::AgentMessage {
id: "item-1".into(),
text: "Final reply".into(),
phase: Some(CoreMessagePhase::FinalAnswer),
@@ -2707,6 +2930,7 @@ mod tests {
path: test_path_buf("/tmp/reference.png").abs(),
sha256: "ab".repeat(32),
}],
+ generation_id: None,
})),
RolloutItem::EventMsg(EventMsg::TurnComplete(TurnCompleteEvent {
root_turn_id: None,
@@ -2734,15 +2958,15 @@ mod tests {
duration_ms: None,
items_view: TurnItemsView::Full,
items: vec![
- ThreadItem::UserMessage {
+ ThreadItem::untimed(ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![UserInput::Text {
text: "generate an image".into(),
text_elements: Vec::new(),
}],
- },
- ThreadItem::ImageGeneration(ImageGenerationItem {
+ }),
+ ThreadItem::untimed(ThreadItemPayload::ImageGeneration(ImageGenerationItem {
id: "ig_123".into(),
status: "completed".into(),
revised_prompt: Some("final prompt".into()),
@@ -2763,7 +2987,7 @@ mod tests {
}],
imagegen_request_id: None,
generation_id: None,
- }),
+ })),
],
}
);
@@ -2808,16 +3032,16 @@ mod tests {
assert_eq!(turn.items.len(), 4);
assert_eq!(
- turn.items[1],
- ThreadItem::Reasoning {
+ turn.items[1].payload,
+ ThreadItemPayload::Reasoning {
id: "item-2".into(),
summary: vec!["first summary".into()],
content: vec!["first content".into()],
}
);
assert_eq!(
- turn.items[3],
- ThreadItem::Reasoning {
+ turn.items[3].payload,
+ ThreadItemPayload::Reasoning {
id: "item-4".into(),
summary: vec!["second summary".into()],
content: Vec::new(),
@@ -2880,8 +3104,8 @@ mod tests {
assert_eq!(first_turn.status, TurnStatus::Interrupted);
assert_eq!(first_turn.items.len(), 2);
assert_eq!(
- first_turn.items[0],
- ThreadItem::UserMessage {
+ first_turn.items[0].payload,
+ ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![UserInput::Text {
@@ -2891,8 +3115,8 @@ mod tests {
}
);
assert_eq!(
- first_turn.items[1],
- ThreadItem::AgentMessage {
+ first_turn.items[1].payload,
+ ThreadItemPayload::AgentMessage {
id: "item-2".into(),
text: "Working...".into(),
phase: None,
@@ -2906,8 +3130,8 @@ mod tests {
assert_eq!(second_turn.status, TurnStatus::Completed);
assert_eq!(second_turn.items.len(), 2);
assert_eq!(
- second_turn.items[0],
- ThreadItem::UserMessage {
+ second_turn.items[0].payload,
+ ThreadItemPayload::UserMessage {
id: "item-3".into(),
client_id: None,
content: vec![UserInput::Text {
@@ -2917,8 +3141,8 @@ mod tests {
}
);
assert_eq!(
- second_turn.items[1],
- ThreadItem::AgentMessage {
+ second_turn.items[1].payload,
+ ThreadItemPayload::AgentMessage {
id: "item-4".into(),
text: "Second attempt complete.".into(),
phase: None,
@@ -2992,9 +3216,9 @@ mod tests {
assert_eq!(turns[0].status, TurnStatus::Completed);
assert_eq!(turns[1].status, TurnStatus::Completed);
assert_eq!(
- turns[0].items,
- vec![
- ThreadItem::UserMessage {
+ turns[0].item_payloads().collect::>(),
+ [
+ &ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![UserInput::Text {
@@ -3002,7 +3226,7 @@ mod tests {
text_elements: Vec::new(),
}],
},
- ThreadItem::AgentMessage {
+ &ThreadItemPayload::AgentMessage {
id: "item-2".into(),
text: "A1".into(),
phase: None,
@@ -3013,9 +3237,9 @@ mod tests {
]
);
assert_eq!(
- turns[1].items,
- vec![
- ThreadItem::UserMessage {
+ turns[1].item_payloads().collect::>(),
+ [
+ &ThreadItemPayload::UserMessage {
id: "item-3".into(),
client_id: None,
content: vec![UserInput::Text {
@@ -3023,7 +3247,7 @@ mod tests {
text_elements: Vec::new(),
}],
},
- ThreadItem::AgentMessage {
+ &ThreadItemPayload::AgentMessage {
id: "item-4".into(),
text: "A3".into(),
phase: None,
@@ -3127,9 +3351,9 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].id, "turn-a");
assert_eq!(
- turns[0].items,
- vec![
- ThreadItem::UserMessage {
+ turns[0].item_payloads().collect::>(),
+ [
+ &ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![UserInput::Text {
@@ -3137,7 +3361,7 @@ mod tests {
text_elements: Vec::new(),
}],
},
- ThreadItem::UserMessage {
+ &ThreadItemPayload::UserMessage {
id: "item-2".into(),
client_id: None,
content: vec![UserInput::Text {
@@ -3230,8 +3454,8 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].items.len(), 4);
assert_eq!(
- turns[0].items[1],
- ThreadItem::WebSearch(WebSearchItem {
+ turns[0].items[1].payload,
+ ThreadItemPayload::WebSearch(WebSearchItem {
id: "search-1".into(),
query: "codex".into(),
action: Some(WebSearchAction::Search {
@@ -3246,8 +3470,8 @@ mod tests {
})
);
assert_eq!(
- turns[0].items[2],
- ThreadItem::CommandExecution {
+ turns[0].items[2].payload,
+ ThreadItemPayload::CommandExecution {
model_context: None,
sandbox_type: None,
id: "exec-1".into(),
@@ -3267,8 +3491,8 @@ mod tests {
}
);
assert_eq!(
- turns[0].items[3],
- ThreadItem::McpToolCall {
+ turns[0].items[3].payload,
+ ThreadItemPayload::McpToolCall {
id: "mcp-1".into(),
server: "docs".into(),
tool: "lookup".into(),
@@ -3338,8 +3562,8 @@ mod tests {
let turns = build_turns_from_rollout_items(&items);
assert_eq!(turns.len(), 1);
assert_eq!(
- turns[0].items[0],
- ThreadItem::McpToolCall {
+ turns[0].items[0].payload,
+ ThreadItemPayload::McpToolCall {
id: "mcp-1".into(),
server: "docs".into(),
tool: "lookup".into(),
@@ -3434,8 +3658,8 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].items.len(), 2);
assert_eq!(
- turns[0].items[1],
- ThreadItem::DynamicToolCall {
+ turns[0].items[1].payload,
+ ThreadItemPayload::DynamicToolCall {
id: "dyn-1".into(),
namespace: Some("codex_app".into()),
tool: "lookup_ticket".into(),
@@ -3521,8 +3745,8 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].items.len(), 3);
assert_eq!(
- turns[0].items[1],
- ThreadItem::CommandExecution {
+ turns[0].items[1].payload,
+ ThreadItemPayload::CommandExecution {
model_context: None,
sandbox_type: None,
id: "exec-declined".into(),
@@ -3542,8 +3766,8 @@ mod tests {
}
);
assert_eq!(
- turns[0].items[2],
- ThreadItem::FileChange {
+ turns[0].items[2].payload,
+ ThreadItemPayload::FileChange {
id: "patch-declined".into(),
changes: vec![FileUpdateChange {
path: "README.md".into(),
@@ -3632,9 +3856,14 @@ mod tests {
let turns = build_turns_from_rollout_items(&items);
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].items.len(), 2);
+ let item = &turns[0].items[1];
+ assert_eq!(
+ (item.started_at_ms, item.completed_at_ms),
+ (Some(1_000), Some(1_042))
+ );
assert_eq!(
- turns[0].items[1],
- ThreadItem::CommandExecution {
+ item.payload,
+ ThreadItemPayload::CommandExecution {
model_context: None,
sandbox_type: None,
id: "guardian-exec".into(),
@@ -3709,8 +3938,8 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].items.len(), 2);
assert_eq!(
- turns[0].items[1],
- ThreadItem::CommandExecution {
+ turns[0].items[1].payload,
+ ThreadItemPayload::CommandExecution {
model_context: None,
sandbox_type: None,
id: "guardian-execve".into(),
@@ -3808,7 +4037,9 @@ mod tests {
let mut expected = build_turns_from_rollout_items(&items);
expected[0]
.items
- .push(ThreadItem::from(completion.item.clone()));
+ .push(ThreadItem::untimed(ThreadItemPayload::from(
+ completion.item.clone(),
+ )));
let legacy = completion.as_legacy_events(/*show_raw_agent_reasoning*/ false);
let serialized = serde_json::to_string(&legacy[0]).unwrap();
@@ -3917,8 +4148,8 @@ mod tests {
assert_eq!(turns[0].items.len(), 2);
assert_eq!(turns[1].items.len(), 1);
assert_eq!(
- turns[0].items[1],
- ThreadItem::CommandExecution {
+ turns[0].items[1].payload,
+ ThreadItemPayload::CommandExecution {
model_context: None,
sandbox_type: None,
id: "exec-late".into(),
@@ -4028,8 +4259,8 @@ mod tests {
assert_eq!(turns[0].items.len(), 1);
assert_eq!(turns[1].items.len(), 1);
assert_eq!(
- turns[1].items[0],
- ThreadItem::UserMessage {
+ turns[1].items[0].payload,
+ ThreadItemPayload::UserMessage {
id: "item-2".into(),
client_id: None,
content: vec![UserInput::Text {
@@ -4222,9 +4453,9 @@ mod tests {
assert_eq!(snapshot.id, turn_id);
assert_eq!(snapshot.status, TurnStatus::InProgress);
assert_eq!(
- snapshot.items,
- vec![
- ThreadItem::UserMessage {
+ snapshot.item_payloads().collect::>(),
+ [
+ &ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![UserInput::Text {
@@ -4232,7 +4463,7 @@ mod tests {
text_elements: Vec::new(),
}],
},
- ThreadItem::FileChange {
+ &ThreadItemPayload::FileChange {
id: "patch-call".into(),
changes: vec![FileUpdateChange {
path: "README.md".into(),
@@ -4270,7 +4501,7 @@ mod tests {
EventMsg::ApplyPatchApprovalRequest(ApplyPatchApprovalRequestEvent {
call_id: "patch-call".into(),
turn_id: turn_id.to_string(),
- started_at_ms: 0,
+ started_at_ms: 1_250,
changes: [(
PathBuf::from("README.md"),
codex_protocol::protocol::FileChange::Add {
@@ -4293,10 +4524,11 @@ mod tests {
.expect("active turn snapshot");
assert_eq!(snapshot.id, turn_id);
assert_eq!(snapshot.status, TurnStatus::InProgress);
+ assert_eq!(snapshot.items[1].started_at_ms, Some(1_250));
assert_eq!(
- snapshot.items,
- vec![
- ThreadItem::UserMessage {
+ snapshot.item_payloads().collect::>(),
+ [
+ &ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![UserInput::Text {
@@ -4304,7 +4536,7 @@ mod tests {
text_elements: Vec::new(),
}],
},
- ThreadItem::FileChange {
+ &ThreadItemPayload::FileChange {
id: "patch-call".into(),
changes: vec![FileUpdateChange {
path: "README.md".into(),
@@ -4449,7 +4681,7 @@ mod tests {
error: Some(ErrorEvent {
misalignment: None,
message: "Selected model is at capacity. Please try a different model.".into(),
- codex_error_info: Some(CodexErrorInfo::ServerOverloaded),
+ codex_error_info: Some(CodexErrorInfo::PolicyCapacityUnavailable),
}),
completed_at: Some(20),
duration_ms: Some(10_000),
@@ -4469,21 +4701,21 @@ mod tests {
id: "turn-a".into(),
root_turn_id: None,
items_view: TurnItemsView::Full,
- items: vec![ThreadItem::UserMessage {
+ items: vec![ThreadItem::untimed(ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![UserInput::Text {
text: "first".into(),
text_elements: Vec::new(),
}],
- }],
+ })],
status: TurnStatus::Failed,
error: Some(TurnError {
misalignment: None,
message: "Selected model is at capacity. Please try a different model."
.into(),
codex_error_info: Some(
- crate::protocol::v2::CodexErrorInfo::ServerOverloaded,
+ crate::protocol::v2::CodexErrorInfo::PolicyCapacityUnavailable,
),
additional_details: None,
}),
@@ -4495,14 +4727,14 @@ mod tests {
id: "turn-b".into(),
root_turn_id: None,
items_view: TurnItemsView::Full,
- items: vec![ThreadItem::UserMessage {
+ items: vec![ThreadItem::untimed(ThreadItemPayload::UserMessage {
id: "item-2".into(),
client_id: None,
content: vec![UserInput::Text {
text: "second".into(),
text_elements: Vec::new(),
}],
- }],
+ })],
status: TurnStatus::InProgress,
error: None,
started_at: Some(30),
@@ -4658,7 +4890,7 @@ mod tests {
}),
EventMsg::CollabResumeEnd(codex_protocol::protocol::CollabResumeEndEvent {
call_id: "resume-1".into(),
- completed_at_ms: 0,
+ completed_at_ms: 2_000,
sender_thread_id: ThreadId::try_from("00000000-0000-0000-0000-000000000001")
.expect("valid sender thread id"),
receiver_thread_id: ThreadId::try_from("00000000-0000-0000-0000-000000000002")
@@ -4676,9 +4908,14 @@ mod tests {
let turns = build_turns_from_rollout_items(&items);
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].items.len(), 2);
+ let item = &turns[0].items[1];
assert_eq!(
- turns[0].items[1],
- ThreadItem::CollabAgentToolCall {
+ (item.started_at_ms, item.completed_at_ms),
+ (None, Some(2_000))
+ );
+ assert_eq!(
+ item.payload,
+ ThreadItemPayload::CollabAgentToolCall {
id: "resume-1".into(),
tool: CollabAgentTool::ResumeAgent,
status: CollabAgentToolCallStatus::Completed,
@@ -4737,8 +4974,8 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].items.len(), 2);
assert_eq!(
- turns[0].items[1],
- ThreadItem::CollabAgentToolCall {
+ turns[0].items[1].payload,
+ ThreadItemPayload::CollabAgentToolCall {
id: "spawn-1".into(),
tool: CollabAgentTool::SpawnAgent,
status: CollabAgentToolCallStatus::Completed,
@@ -4809,8 +5046,8 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].items.len(), 2);
assert_eq!(
- turns[0].items[1],
- ThreadItem::CollabAgentToolCall {
+ turns[0].items[1].payload,
+ ThreadItemPayload::CollabAgentToolCall {
id: "send-1".into(),
tool: CollabAgentTool::SendInput,
status: CollabAgentToolCallStatus::Completed,
@@ -4921,14 +5158,14 @@ mod tests {
completed_at: None,
duration_ms: None,
items_view: TurnItemsView::Full,
- items: vec![ThreadItem::UserMessage {
+ items: vec![ThreadItem::untimed(ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![UserInput::Text {
text: "hello".into(),
text_elements: Vec::new(),
}],
- }],
+ })],
}
);
}
@@ -5042,14 +5279,14 @@ mod tests {
id: "turn-a".into(),
root_turn_id: None,
items_view: TurnItemsView::Full,
- items: vec![ThreadItem::UserMessage {
+ items: vec![ThreadItem::untimed(ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: None,
content: vec![UserInput::Text {
text: "retry me".into(),
text_elements: Vec::new(),
}],
- }],
+ })],
status: TurnStatus::Failed,
error: Some(TurnError {
misalignment: None,
@@ -5107,8 +5344,8 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(turns[0].items.len(), 2);
assert_eq!(
- turns[0].items[1],
- ThreadItem::HookPrompt {
+ turns[0].items[1].payload,
+ ThreadItemPayload::HookPrompt {
id: turns[0].items[1].id().to_string(),
fragments: vec![
crate::protocol::v2::HookPromptFragment {
@@ -5133,7 +5370,11 @@ mod tests {
"hook-run-1",
)],
});
- let expected_item = ThreadItem::from(hook_prompt.clone());
+ let expected_item = ThreadItem {
+ payload: ThreadItemPayload::from(hook_prompt.clone()),
+ started_at_ms: Some(10),
+ completed_at_ms: Some(20),
+ };
let mut builder = ThreadHistoryBuilder::new();
builder.handle_event(&EventMsg::TurnStarted(TurnStartedEvent {
turn_attribution: None,
@@ -5144,18 +5385,18 @@ mod tests {
model_context_window: None,
collaboration_mode_kind: Default::default(),
}));
- builder.handle_event(&EventMsg::ItemCompleted(ItemCompletedEvent {
- thread_id: ThreadId::new(),
- turn_id: "turn-a".into(),
- item: hook_prompt,
- started_at_ms: Some(0),
- completed_at_ms: 0,
- }));
+ let changes =
+ builder.handle_event_with_changes(&EventMsg::ItemCompleted(ItemCompletedEvent {
+ thread_id: ThreadId::new(),
+ turn_id: "turn-a".into(),
+ item: hook_prompt,
+ started_at_ms: Some(10),
+ completed_at_ms: 20,
+ }));
- assert_eq!(
- builder.active_turn_snapshot().expect("active turn").items,
- vec![expected_item]
- );
+ let snapshot = builder.active_turn_snapshot().expect("active turn");
+ assert_eq!(snapshot.items, [expected_item]);
+ assert_eq!(changes.changed_items[0].item, snapshot.items[0]);
}
#[test]
@@ -5180,7 +5421,7 @@ mod tests {
started_at_ms: Some(1),
completed_at_ms: 2,
};
- let expected_spawn = ThreadItem::from(spawn.item.clone());
+ let expected_spawn = ThreadItemPayload::from(spawn.item.clone());
let legacy_spawn = spawn
.as_legacy_events(/*show_raw_agent_reasoning*/ false)
.pop()
@@ -5191,7 +5432,7 @@ mod tests {
panic!("expected item completed");
};
assert_eq!(
- (notification.item, notification.completed_at_ms),
+ (notification.item.payload, notification.completed_at_ms),
(expected_spawn.clone(), 2)
);
for spawn in [EventMsg::ItemCompleted(spawn), legacy_spawn] {
@@ -5236,10 +5477,10 @@ mod tests {
assert_eq!(turns.len(), 1);
assert_eq!(
- turns[0].items,
- vec![
- expected_spawn.clone(),
- ThreadItem::SubAgentActivity {
+ turns[0].item_payloads().collect::>(),
+ [
+ &expected_spawn,
+ &ThreadItemPayload::SubAgentActivity {
model: None,
reasoning_effort: None,
id: "child-turn-completed".into(),
@@ -5314,16 +5555,14 @@ mod tests {
ThreadHistoryChangeSet {
changed_items: vec![ThreadHistoryItemChange {
turn_id: "rollout-0".into(),
- item: ThreadItem::UserMessage {
+ item: ThreadItem::untimed(ThreadItemPayload::UserMessage {
id: "item-1".into(),
client_id: Some("client-message-1".into()),
content: vec![UserInput::Text {
text: "hello".into(),
text_elements: Vec::new(),
}],
- },
- started_at_ms: None,
- completed_at_ms: None,
+ })
}],
changed_turns: vec![ThreadHistoryTurnMetadata {
turn_id: "rollout-0".into(),
@@ -5364,7 +5603,7 @@ mod tests {
ThreadHistoryChangeSet {
changed_items: vec![ThreadHistoryItemChange {
turn_id: "rollout-0".into(),
- item: ThreadItem::WebSearch(WebSearchItem {
+ item: ThreadItem::untimed(ThreadItemPayload::WebSearch(WebSearchItem {
id: "search-1".into(),
query: "codex".into(),
action: Some(WebSearchAction::Search {
@@ -5372,9 +5611,7 @@ mod tests {
queries: None,
}),
results: None,
- }),
- started_at_ms: None,
- completed_at_ms: None,
+ }))
}],
changed_turns: Vec::new(),
removed_turn_ids: Vec::new(),
@@ -5401,13 +5638,11 @@ mod tests {
ThreadHistoryChangeSet {
changed_items: vec![ThreadHistoryItemChange {
turn_id: "rollout-0".into(),
- item: ThreadItem::Reasoning {
+ item: ThreadItem::untimed(ThreadItemPayload::Reasoning {
id: "item-1".into(),
summary: vec!["summary".into()],
content: vec!["raw content".into()],
- },
- started_at_ms: None,
- completed_at_ms: None,
+ })
}],
changed_turns: Vec::new(),
removed_turn_ids: Vec::new(),
@@ -5510,7 +5745,7 @@ mod tests {
ThreadHistoryChangeSet {
changed_items: vec![ThreadHistoryItemChange {
turn_id: "rollout-0".into(),
- item: ThreadItem::WebSearch(WebSearchItem {
+ item: ThreadItem::untimed(ThreadItemPayload::WebSearch(WebSearchItem {
id: "search-1".into(),
query: "codex".into(),
action: Some(WebSearchAction::Search {
@@ -5518,9 +5753,7 @@ mod tests {
queries: None,
}),
results: None,
- }),
- started_at_ms: None,
- completed_at_ms: None,
+ }))
}],
changed_turns: vec![ThreadHistoryTurnMetadata {
turn_id: "rollout-0".into(),
diff --git a/codex-rs/app-server-protocol/src/protocol/thread_history_projection.rs b/codex-rs/app-server-protocol/src/protocol/thread_history_projection.rs
index 756f42e3ab9d..9f6f345e12ca 100644
--- a/codex-rs/app-server-protocol/src/protocol/thread_history_projection.rs
+++ b/codex-rs/app-server-protocol/src/protocol/thread_history_projection.rs
@@ -78,13 +78,12 @@ pub fn project_rollout_line(line: &RolloutLine) -> ThreadHistoryChangeSet {
RolloutItem::EventMsg(EventMsg::ItemCompleted(event)) => ThreadHistoryChangeSet {
changed_items: vec![ThreadHistoryItemChange {
turn_id: event.turn_id.clone(),
- item: ThreadItem::from(event.item.clone()),
- started_at_ms: event.started_at_ms,
- completed_at_ms: (event.completed_at_ms != 0).then_some(event.completed_at_ms),
+ item: ThreadItem::from(event),
}],
..Default::default()
},
- RolloutItem::SessionMeta(_)
+ RolloutItem::DynamicToolsUpdated { .. }
+ | RolloutItem::SessionMeta(_)
| RolloutItem::ResponseItem(_)
| RolloutItem::InterAgentCommunication(_)
| RolloutItem::InterAgentCommunicationMetadata { .. }
diff --git a/codex-rs/app-server-protocol/src/protocol/thread_history_projection_tests.rs b/codex-rs/app-server-protocol/src/protocol/thread_history_projection_tests.rs
index a2ca09c6b74a..9517d459abbd 100644
--- a/codex-rs/app-server-protocol/src/protocol/thread_history_projection_tests.rs
+++ b/codex-rs/app-server-protocol/src/protocol/thread_history_projection_tests.rs
@@ -19,7 +19,7 @@ use pretty_assertions::assert_eq;
use std::collections::BTreeMap;
use super::*;
-use crate::protocol::v2::ThreadItem;
+use crate::protocol::v2::ThreadItemPayload;
use crate::protocol::v2::TurnError;
#[test]
@@ -145,18 +145,22 @@ fn projects_completed_canonical_turn_items() {
user_changes.changed_items,
vec![ThreadHistoryItemChange {
turn_id: "turn-1".to_string(),
- item: ThreadItem::from(user_item),
- started_at_ms: Some(100),
- completed_at_ms: Some(123),
+ item: ThreadItem {
+ payload: ThreadItemPayload::from(user_item),
+ started_at_ms: Some(100),
+ completed_at_ms: Some(123)
+ }
}]
);
assert_eq!(
agent_changes.changed_items,
vec![ThreadHistoryItemChange {
turn_id: "turn-1".to_string(),
- item: ThreadItem::from(agent_item),
- started_at_ms: Some(100),
- completed_at_ms: Some(123),
+ item: ThreadItem {
+ payload: ThreadItemPayload::from(agent_item),
+ started_at_ms: Some(100),
+ completed_at_ms: Some(123)
+ }
}]
);
}
@@ -187,9 +191,11 @@ fn projects_optional_completed_item_lifecycle_timestamps() {
ThreadHistoryChangeSet {
changed_items: vec![ThreadHistoryItemChange {
turn_id: "turn-1".to_string(),
- item: ThreadItem::from(item.clone()),
- started_at_ms,
- completed_at_ms: expected_completed_at_ms,
+ item: ThreadItem {
+ payload: ThreadItemPayload::from(item.clone()),
+ started_at_ms,
+ completed_at_ms: expected_completed_at_ms
+ }
}],
..Default::default()
}
diff --git a/codex-rs/app-server-protocol/src/protocol/turn_items_view.rs b/codex-rs/app-server-protocol/src/protocol/turn_items_view.rs
index 7af9fe50ce2a..593a6ca56013 100644
--- a/codex-rs/app-server-protocol/src/protocol/turn_items_view.rs
+++ b/codex-rs/app-server-protocol/src/protocol/turn_items_view.rs
@@ -1,25 +1,25 @@
//! Projects a turn's items without copying payloads excluded by the requested view.
-use super::v2::ThreadItem;
+use super::v2::ThreadItemPayload;
use super::v2::TurnItemsView;
+use std::borrow::Borrow;
impl TurnItemsView {
/// Copies only the items included in this view, preserving summary selection order.
- pub fn project_items(self, items: &[ThreadItem]) -> Vec {
+ pub fn project_items + Clone>(self, items: &[T]) -> Vec {
match self {
Self::NotLoaded => Vec::new(),
Self::Full => items.to_vec(),
Self::Summary => {
let first_user_message = items
.iter()
- .find(|item| matches!(item, ThreadItem::UserMessage { .. }));
- let final_agent_message = items
- .iter()
- .rev()
- .find(|item| matches!(item, ThreadItem::AgentMessage { .. }));
+ .find(|item| matches!((*item).borrow(), ThreadItemPayload::UserMessage { .. }));
+ let final_agent_message = items.iter().rev().find(|item| {
+ matches!((*item).borrow(), ThreadItemPayload::AgentMessage { .. })
+ });
match (first_user_message, final_agent_message) {
(Some(user_message), Some(agent_message))
- if user_message.id() != agent_message.id() =>
+ if user_message.borrow().id() != agent_message.borrow().id() =>
{
vec![user_message.clone(), agent_message.clone()]
}
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/account.rs b/codex-rs/app-server-protocol/src/protocol/v2/account.rs
index 2de06c9edaf8..a5a5009d12b9 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/account.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/account.rs
@@ -33,6 +33,8 @@ pub enum Account {
)]
email: Option,
plan_type: PlanType,
+ /// Display name of the selected ChatGPT workspace, when available.
+ workspace_name: Option,
},
#[serde(rename = "amazonBedrock", rename_all = "camelCase")]
@@ -52,7 +54,11 @@ impl From for Account {
fn from(account: ProviderAccount) -> Self {
match account {
ProviderAccount::ApiKey => Self::ApiKey {},
- ProviderAccount::Chatgpt { email, plan_type } => Self::Chatgpt { email, plan_type },
+ ProviderAccount::Chatgpt { email, plan_type } => Self::Chatgpt {
+ email,
+ plan_type,
+ workspace_name: None,
+ },
ProviderAccount::AmazonBedrock {
uses_codex_managed_credentials,
} => Self::AmazonBedrock {
@@ -221,8 +227,26 @@ pub struct AccountSessionsLogoutParams {
#[serde(rename_all = "camelCase")]
#[ts(export_to = "v2/")]
pub struct AccountSessionsSwitchParams {
+ /// Opaque active-login identifier returned by accountSession/list.
pub session_id: String,
+ /// Workspace to select within that login; this is not a user identifier.
pub account_id: String,
+ /// Allow Core to start browser sign-in if this session needs SSO for the workspace.
+ #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+ #[ts(optional, as = "Option")]
+ pub allow_browser_login: bool,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
+#[serde(untagged, rename_all_fields = "camelCase")]
+#[ts(untagged, rename_all_fields = "camelCase", export_to = "v2/")]
+pub enum AccountSessionsSwitchResponse {
+ Switched {
+ #[serde(flatten)]
+ sessions: AccountSessionsResponse,
+ },
+ /// Open the URL and await account/login/completed for this login ID.
+ BrowserLogin { login_id: String, auth_url: String },
}
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/config.rs b/codex-rs/app-server-protocol/src/protocol/v2/config.rs
index 552520aff3c9..177d000775c6 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/config.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/config.rs
@@ -19,6 +19,7 @@ use codex_protocol::config_types::WebSearchToolConfig;
use codex_protocol::openai_models::ReasoningEffort;
use codex_utils_absolute_path::AbsolutePathBuf;
use codex_utils_path_uri::PathUri;
+pub use codex_utils_redacted_string::SerdeRedactedString;
use serde::Deserialize;
use serde::Serialize;
use serde_json::Value as JsonValue;
@@ -456,6 +457,7 @@ pub struct ConfigRequirements {
pub check_for_update_on_startup: Option,
pub allow_login_shell: Option,
pub feedback: Option,
+ pub otel: Option,
}
#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
@@ -499,6 +501,71 @@ pub struct FeedbackRequirements {
pub enabled: Option,
}
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
+#[serde(rename_all = "snake_case")]
+#[ts(export_to = "v2/")]
+pub struct OtelRequirements {
+ pub tool_result: Option,
+ pub log_user_prompt: Option,
+ pub log_agent_responses: Option,
+ pub log_guardian_assessments: Option,
+ pub environment: Option,
+ pub exporter: Option,
+ pub trace_exporter: Option,
+ pub metrics_exporter: Option,
+ pub span_attributes: Option>,
+ pub tracestate: Option>>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
+#[serde(rename_all = "snake_case")]
+#[ts(export_to = "v2/")]
+pub struct OtelToolResultLogConfig {
+ pub max_bytes: usize,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
+#[serde(rename_all = "kebab-case")]
+#[ts(export_to = "v2/", rename_all = "kebab-case")]
+pub enum OtelExporter {
+ None,
+ Statsig,
+ OtlpHttp {
+ endpoint: String,
+ /// Header names are retained; values are redacted by the server.
+ #[schemars(with = "HashMap")]
+ #[ts(as = "HashMap")]
+ headers: HashMap,
+ protocol: OtelHttpProtocol,
+ tls: Option,
+ },
+ OtlpGrpc {
+ endpoint: String,
+ /// Header names are retained; values are redacted by the server.
+ #[schemars(with = "HashMap")]
+ #[ts(as = "HashMap")]
+ headers: HashMap,
+ tls: Option,
+ },
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
+#[serde(rename_all = "kebab-case")]
+#[ts(export_to = "v2/", rename_all = "kebab-case")]
+pub enum OtelHttpProtocol {
+ Binary,
+ Json,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
+#[serde(rename_all = "kebab-case")]
+#[ts(export_to = "v2/", rename_all = "kebab-case")]
+pub struct OtelTlsConfig {
+ pub ca_certificate: Option,
+ pub client_certificate: Option,
+ pub client_private_key: Option,
+}
+
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
#[serde(rename_all = "camelCase")]
#[ts(export_to = "v2/")]
@@ -723,7 +790,7 @@ pub struct NetworkRequirements {
pub allow_upstream_proxy: Option,
pub dangerously_allow_non_loopback_proxy: Option,
pub dangerously_allow_all_unix_sockets: Option,
- /// Canonical network permission map for `experimental_network`.
+ /// Canonical managed network permission map.
pub domains: Option>,
/// Host patterns routed to network approval before ordinary allow rules.
pub review_domains: Option>,
@@ -734,7 +801,7 @@ pub struct NetworkRequirements {
pub allowed_domains: Option>,
/// Legacy compatibility view derived from `domains`.
pub denied_domains: Option>,
- /// Canonical unix socket permission map for `experimental_network`.
+ /// Canonical managed unix socket permission map.
pub unix_sockets: Option>,
/// Legacy compatibility view derived from `unix_sockets`.
pub allow_unix_sockets: Option>,
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/gcp.rs b/codex-rs/app-server-protocol/src/protocol/v2/gcp.rs
new file mode 100644
index 000000000000..97b18ef66c25
--- /dev/null
+++ b/codex-rs/app-server-protocol/src/protocol/v2/gcp.rs
@@ -0,0 +1,27 @@
+//! Shared setup parameters for the built-in Google Cloud Vertex AI provider.
+
+use crate::JsonSchema;
+use crate::TS;
+use serde::Deserialize;
+use serde::Serialize;
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export_to = "v2/")]
+pub struct GcpSetupParams {
+ pub project_id: String,
+ /// Vertex AI location. Omission or null selects `global`.
+ #[ts(optional = nullable)]
+ pub location: Option,
+ /// Absolute path to a credential file on the app-server host.
+ /// Omit or pass `null` to clear the active user configuration's override and use ADC.
+ /// If another configuration layer would still supply a credential file, setup fails
+ /// without saving changes.
+ #[ts(optional = nullable)]
+ pub credential_file: Option,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq, Eq, JsonSchema, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export_to = "v2/")]
+pub struct GcpSetupResponse {}
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/item.rs b/codex-rs/app-server-protocol/src/protocol/v2/item.rs
index bde4c2aa87c2..f496ef172b77 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/item.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/item.rs
@@ -231,11 +231,72 @@ impl CommandAction {
}
}
+/// A thread item and its recorded lifecycle times. The payload stays flat on the wire.
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export_to = "v2/")]
+pub struct ThreadItem {
+ #[serde(flatten)]
+ pub payload: ThreadItemPayload,
+ /// Unix timestamp in milliseconds when the item started, if recorded.
+ #[serde(default)]
+ #[ts(type = "number | null", optional)]
+ pub started_at_ms: Option,
+ /// Unix timestamp in milliseconds when the item completed, if recorded.
+ #[serde(default)]
+ #[ts(type = "number | null", optional)]
+ pub completed_at_ms: Option,
+}
+
+impl ThreadItem {
+ /// Creates an item with no recorded start or completion time.
+ pub fn untimed(payload: ThreadItemPayload) -> Self {
+ Self {
+ payload,
+ started_at_ms: None,
+ completed_at_ms: None,
+ }
+ }
+
+ fn completed(
+ payload: ThreadItemPayload,
+ started_at_ms: Option,
+ completed_at_ms: i64,
+ ) -> Self {
+ Self {
+ payload,
+ started_at_ms,
+ // Older rollout events default a missing completion time to zero.
+ completed_at_ms: (completed_at_ms != 0).then_some(completed_at_ms),
+ }
+ }
+
+ pub fn id(&self) -> &str {
+ self.payload.id()
+ }
+}
+
+impl From<&codex_protocol::protocol::ItemCompletedEvent> for ThreadItem {
+ fn from(event: &codex_protocol::protocol::ItemCompletedEvent) -> Self {
+ ThreadItem::completed(
+ ThreadItemPayload::from(event.item.clone()),
+ event.started_at_ms,
+ event.completed_at_ms,
+ )
+ }
+}
+
+impl std::borrow::Borrow for ThreadItem {
+ fn borrow(&self) -> &ThreadItemPayload {
+ &self.payload
+ }
+}
+
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
#[serde(tag = "type", rename_all = "camelCase")]
#[ts(tag = "type")]
#[ts(export_to = "v2/")]
-pub enum ThreadItem {
+pub enum ThreadItemPayload {
#[serde(rename_all = "camelCase")]
#[ts(rename_all = "camelCase")]
UserMessage {
@@ -453,28 +514,28 @@ pub struct HookPromptFragment {
pub hook_run_id: String,
}
-impl ThreadItem {
+impl ThreadItemPayload {
pub fn id(&self) -> &str {
match self {
- ThreadItem::UserMessage { id, .. }
- | ThreadItem::HookPrompt { id, .. }
- | ThreadItem::AgentMessage { id, .. }
- | ThreadItem::FunctionCallOutput { id, .. }
- | ThreadItem::Plan { id, .. }
- | ThreadItem::Reasoning { id, .. }
- | ThreadItem::CommandExecution { id, .. }
- | ThreadItem::FileChange { id, .. }
- | ThreadItem::McpToolCall { id, .. }
- | ThreadItem::DynamicToolCall { id, .. }
- | ThreadItem::CollabAgentToolCall { id, .. }
- | ThreadItem::SubAgentActivity { id, .. }
- | ThreadItem::ImageView { id, .. }
- | ThreadItem::EnteredReviewMode { id, .. }
- | ThreadItem::ExitedReviewMode { id, .. }
- | ThreadItem::ContextCompaction { id, .. } => id,
- ThreadItem::WebSearch(item) => &item.id,
- ThreadItem::Sleep(item) => &item.id,
- ThreadItem::ImageGeneration(item) => &item.id,
+ Self::UserMessage { id, .. }
+ | Self::HookPrompt { id, .. }
+ | Self::AgentMessage { id, .. }
+ | Self::FunctionCallOutput { id, .. }
+ | Self::Plan { id, .. }
+ | Self::Reasoning { id, .. }
+ | Self::CommandExecution { id, .. }
+ | Self::FileChange { id, .. }
+ | Self::McpToolCall { id, .. }
+ | Self::DynamicToolCall { id, .. }
+ | Self::CollabAgentToolCall { id, .. }
+ | Self::SubAgentActivity { id, .. }
+ | Self::ImageView { id, .. }
+ | Self::EnteredReviewMode { id, .. }
+ | Self::ExitedReviewMode { id, .. }
+ | Self::ContextCompaction { id, .. } => id,
+ Self::WebSearch(item) => &item.id,
+ Self::Sleep(item) => &item.id,
+ Self::ImageGeneration(item) => &item.id,
}
}
}
@@ -872,15 +933,15 @@ pub(crate) fn web_search_action_from_core(
}
}
-impl From for ThreadItem {
+impl From for ThreadItemPayload {
fn from(value: CoreTurnItem) -> Self {
match value {
- CoreTurnItem::UserMessage(user) => ThreadItem::UserMessage {
+ CoreTurnItem::UserMessage(user) => Self::UserMessage {
id: user.id,
client_id: user.client_id,
content: user.content.into_iter().map(UserInput::from).collect(),
},
- CoreTurnItem::HookPrompt(hook_prompt) => ThreadItem::HookPrompt {
+ CoreTurnItem::HookPrompt(hook_prompt) => Self::HookPrompt {
id: hook_prompt.id,
fragments: hook_prompt
.fragments
@@ -896,7 +957,7 @@ impl From for ThreadItem {
CoreAgentMessageContent::Text { text } => text,
})
.collect::();
- ThreadItem::AgentMessage {
+ Self::AgentMessage {
id: agent.id,
text,
phase: agent.phase,
@@ -905,17 +966,17 @@ impl From for ThreadItem {
questions: agent.questions,
}
}
- CoreTurnItem::FunctionCallOutput(output) => ThreadItem::FunctionCallOutput {
+ CoreTurnItem::FunctionCallOutput(output) => Self::FunctionCallOutput {
id: output.id,
name: output.name,
namespace: output.namespace,
output: output.output,
},
- CoreTurnItem::Plan(plan) => ThreadItem::Plan {
+ CoreTurnItem::Plan(plan) => Self::Plan {
id: plan.id,
text: plan.text,
},
- CoreTurnItem::Reasoning(reasoning) => ThreadItem::Reasoning {
+ CoreTurnItem::Reasoning(reasoning) => Self::Reasoning {
id: reasoning.id,
summary: reasoning.summary_text,
content: reasoning.raw_content,
@@ -926,7 +987,7 @@ impl From for ThreadItem {
&command.parsed_cmd,
&command.cwd,
);
- ThreadItem::CommandExecution {
+ Self::CommandExecution {
id: command.id,
model_context: command.model_context,
sandbox_type: command.sandbox_type,
@@ -947,7 +1008,7 @@ impl From for ThreadItem {
.and_then(|duration| i64::try_from(duration.as_millis()).ok()),
}
}
- CoreTurnItem::DynamicToolCall(call) => ThreadItem::DynamicToolCall {
+ CoreTurnItem::DynamicToolCall(call) => Self::DynamicToolCall {
id: call.id,
namespace: call.namespace,
tool: call.tool,
@@ -964,7 +1025,7 @@ impl From for ThreadItem {
.duration
.and_then(|duration| i64::try_from(duration.as_millis()).ok()),
},
- CoreTurnItem::CollabAgentToolCall(call) => ThreadItem::CollabAgentToolCall {
+ CoreTurnItem::CollabAgentToolCall(call) => Self::CollabAgentToolCall {
id: call.id,
tool: call.tool.into(),
status: call.status.into(),
@@ -983,7 +1044,7 @@ impl From for ThreadItem {
.map(|(thread_id, status)| (thread_id.to_string(), status.into()))
.collect(),
},
- CoreTurnItem::SubAgentActivity(activity) => ThreadItem::SubAgentActivity {
+ CoreTurnItem::SubAgentActivity(activity) => Self::SubAgentActivity {
model: activity.model,
reasoning_effort: activity.reasoning_effort,
id: activity.id,
@@ -991,46 +1052,44 @@ impl From for ThreadItem {
agent_thread_id: activity.agent_thread_id.to_string(),
agent_path: String::from(activity.agent_path),
},
- CoreTurnItem::WebSearch(search) => ThreadItem::WebSearch(WebSearchItem {
+ CoreTurnItem::WebSearch(search) => Self::WebSearch(WebSearchItem {
id: search.id,
query: search.query,
action: Some(web_search_action_from_core(search.action)),
results: search.results,
}),
- CoreTurnItem::ImageView(image) => ThreadItem::ImageView {
+ CoreTurnItem::ImageView(image) => Self::ImageView {
id: image.id,
path: image.path.into(),
},
CoreTurnItem::Extension(extension) => match extension {
- ExtensionItem::ImageGeneration(item) => ThreadItem::ImageGeneration(item),
- ExtensionItem::Sleep(item) => ThreadItem::Sleep(item),
- ExtensionItem::WebSearch(item) => ThreadItem::WebSearch(item),
+ ExtensionItem::ImageGeneration(item) => Self::ImageGeneration(item),
+ ExtensionItem::Sleep(item) => Self::Sleep(item),
+ ExtensionItem::WebSearch(item) => Self::WebSearch(item),
},
- CoreTurnItem::ImageGeneration(image) => {
- ThreadItem::ImageGeneration(ImageGenerationItem {
- id: image.id,
- status: image.status,
- revised_prompt: image.revised_prompt,
- image: GeneratedImageRef::Inline {
- result: image.result,
- },
- transparent_background: None,
- failure: None,
- saved_path: image.saved_path,
- input_images: Vec::new(),
- imagegen_request_id: None,
- generation_id: None,
- })
- }
- CoreTurnItem::EnteredReviewMode(review) => ThreadItem::EnteredReviewMode {
+ CoreTurnItem::ImageGeneration(image) => Self::ImageGeneration(ImageGenerationItem {
+ id: image.id,
+ status: image.status,
+ revised_prompt: image.revised_prompt,
+ image: GeneratedImageRef::Inline {
+ result: image.result,
+ },
+ transparent_background: None,
+ failure: None,
+ saved_path: image.saved_path,
+ input_images: Vec::new(),
+ imagegen_request_id: None,
+ generation_id: None,
+ }),
+ CoreTurnItem::EnteredReviewMode(review) => Self::EnteredReviewMode {
id: review.id,
review: review.user_facing_hint,
},
- CoreTurnItem::ExitedReviewMode(review) => ThreadItem::ExitedReviewMode {
+ CoreTurnItem::ExitedReviewMode(review) => Self::ExitedReviewMode {
id: review.id,
review: review_output_text(review.review_output.as_ref()),
},
- CoreTurnItem::FileChange(file_change) => ThreadItem::FileChange {
+ CoreTurnItem::FileChange(file_change) => Self::FileChange {
id: file_change.id,
changes: convert_patch_changes(&file_change.changes),
status: file_change
@@ -1044,7 +1103,7 @@ impl From for ThreadItem {
.duration
.and_then(|duration| i64::try_from(duration.as_millis()).ok());
- ThreadItem::McpToolCall {
+ Self::McpToolCall {
id: mcp.id,
server: mcp.server,
tool: mcp.tool,
@@ -1067,7 +1126,7 @@ impl From for ThreadItem {
}
}
CoreTurnItem::ContextCompaction(compaction) => {
- ThreadItem::ContextCompaction { id: compaction.id }
+ Self::ContextCompaction { id: compaction.id }
}
}
}
@@ -1353,6 +1412,25 @@ pub struct ItemStartedNotification {
#[ts(type = "number")]
pub started_at_ms: i64,
}
+impl ItemStartedNotification {
+ pub fn new(
+ thread_id: String,
+ turn_id: String,
+ payload: ThreadItemPayload,
+ started_at_ms: i64,
+ ) -> Self {
+ Self {
+ thread_id,
+ turn_id,
+ started_at_ms,
+ item: ThreadItem {
+ payload,
+ started_at_ms: Some(started_at_ms),
+ completed_at_ms: None,
+ },
+ }
+ }
+}
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
#[serde(rename_all = "camelCase")]
@@ -1431,6 +1509,22 @@ pub struct ItemCompletedNotification {
#[ts(type = "number")]
pub completed_at_ms: i64,
}
+impl ItemCompletedNotification {
+ pub fn new(
+ thread_id: String,
+ turn_id: String,
+ payload: ThreadItemPayload,
+ started_at_ms: Option,
+ completed_at_ms: i64,
+ ) -> Self {
+ Self {
+ thread_id,
+ turn_id,
+ completed_at_ms,
+ item: ThreadItem::completed(payload, started_at_ms, completed_at_ms),
+ }
+ }
+}
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
#[serde(rename_all = "camelCase")]
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/mod.rs b/codex-rs/app-server-protocol/src/protocol/v2/mod.rs
index f2f157fe7f97..0ecd5499098a 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/mod.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/mod.rs
@@ -16,11 +16,13 @@ mod environment;
mod experimental_feature;
mod feedback;
mod fs;
+mod gcp;
mod hook;
mod item;
mod mcp;
mod memory;
mod model;
+mod model_provider_error;
mod notification;
mod permissions;
mod plugin;
@@ -57,11 +59,13 @@ pub use environment::*;
pub use experimental_feature::*;
pub use feedback::*;
pub use fs::*;
+pub use gcp::*;
pub use hook::*;
pub use item::*;
pub use mcp::*;
pub use memory::*;
pub use model::*;
+pub use model_provider_error::*;
pub use notification::*;
pub use permissions::*;
pub use plugin::*;
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/model_provider_error.rs b/codex-rs/app-server-protocol/src/protocol/v2/model_provider_error.rs
new file mode 100644
index 000000000000..ee8cc7b74652
--- /dev/null
+++ b/codex-rs/app-server-protocol/src/protocol/v2/model_provider_error.rs
@@ -0,0 +1,70 @@
+//! Recoverable provider failures shared by resume and inference admission.
+
+use crate::JsonSchema;
+use crate::TS;
+use serde::Deserialize;
+use serde::Serialize;
+
+/// Structured JSON-RPC error data. Unknown errors must retain the client's normal fallback.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema, TS)]
+#[serde(
+ tag = "type",
+ rename_all = "camelCase",
+ rename_all_fields = "camelCase"
+)]
+#[ts(
+ tag = "type",
+ rename_all = "camelCase",
+ rename_all_fields = "camelCase",
+ export_to = "v2/"
+)]
+pub enum ModelProviderError {
+ ModelProviderMismatch {
+ #[schemars(rename = "modelProvider")]
+ model_provider: String,
+ #[schemars(rename = "currentModelProvider")]
+ current_model_provider: String,
+ },
+ ModelProviderNotConfigured {
+ #[schemars(rename = "modelProvider")]
+ model_provider: String,
+ },
+ ModelProviderPolicyConflict {
+ #[schemars(rename = "modelProvider")]
+ model_provider: String,
+ #[schemars(rename = "requiredModelProvider")]
+ required_model_provider: String,
+ },
+}
+
+impl ModelProviderError {
+ pub fn title(&self) -> &'static str {
+ match self {
+ Self::ModelProviderMismatch { .. } => "Model provider mismatch",
+ Self::ModelProviderNotConfigured { .. } => "Model provider unavailable",
+ Self::ModelProviderPolicyConflict { .. } => "Model provider blocked by policy",
+ }
+ }
+}
+
+impl std::fmt::Display for ModelProviderError {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ Self::ModelProviderMismatch { model_provider, current_model_provider } => write!(f,
+ "This chat uses {model_provider}, but your current provider is {current_model_provider}. Switch to {model_provider} to continue."),
+ Self::ModelProviderNotConfigured { model_provider } => write!(f,
+ "This chat uses model provider “{model_provider}”, which is no longer configured. Restore this provider’s configuration to continue."),
+ Self::ModelProviderPolicyConflict { model_provider, required_model_provider }
+ if model_provider != required_model_provider => write!(f,
+ "This chat uses model provider “{model_provider}”, but your organization requires “{required_model_provider}”. Contact your administrator or start a new chat using the required provider."),
+ Self::ModelProviderPolicyConflict { .. } => f.write_str(
+ "This chat’s model provider settings no longer match your organization’s requirements. Contact your administrator or start a new chat using the current provider settings."),
+ }
+ }
+}
+
+impl std::error::Error for ModelProviderError {}
+
+#[cfg(test)]
+#[path = "model_provider_error_tests.rs"]
+mod tests;
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/model_provider_error_tests.rs b/codex-rs/app-server-protocol/src/protocol/v2/model_provider_error_tests.rs
new file mode 100644
index 000000000000..0537ec6a2161
--- /dev/null
+++ b/codex-rs/app-server-protocol/src/protocol/v2/model_provider_error_tests.rs
@@ -0,0 +1,53 @@
+//! Checks that generated provider-error schemas describe the serialized wire payloads.
+
+use super::ModelProviderError;
+use pretty_assertions::assert_eq;
+use std::collections::BTreeSet;
+
+#[test]
+fn provider_error_schema_matches_wire_fields() -> anyhow::Result<()> {
+ let schema = serde_json::to_value(schemars::schema_for!(ModelProviderError))?;
+ for error in [
+ ModelProviderError::ModelProviderMismatch {
+ model_provider: "old-provider".to_string(),
+ current_model_provider: "current-provider".to_string(),
+ },
+ ModelProviderError::ModelProviderNotConfigured {
+ model_provider: "old-provider".to_string(),
+ },
+ ModelProviderError::ModelProviderPolicyConflict {
+ model_provider: "old-provider".to_string(),
+ required_model_provider: "required-provider".to_string(),
+ },
+ ] {
+ let wire = serde_json::to_value(&error)?;
+ let variant = schema["oneOf"]
+ .as_array()
+ .expect("tagged variants")
+ .iter()
+ .find(|variant| variant["properties"]["type"]["enum"][0] == wire["type"])
+ .expect("schema variant for wire discriminator");
+ let wire_fields: BTreeSet<_> = wire
+ .as_object()
+ .unwrap()
+ .keys()
+ .map(String::as_str)
+ .collect();
+ let schema_fields: BTreeSet<_> = variant["properties"]
+ .as_object()
+ .unwrap()
+ .keys()
+ .map(String::as_str)
+ .collect();
+ let required_fields: BTreeSet<_> = variant["required"]
+ .as_array()
+ .unwrap()
+ .iter()
+ .map(|value| value.as_str().unwrap())
+ .collect();
+ assert_eq!(schema_fields, wire_fields);
+ assert_eq!(required_fields, wire_fields);
+ assert_eq!(serde_json::from_value::(wire)?, error);
+ }
+ Ok(())
+}
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/process.rs b/codex-rs/app-server-protocol/src/protocol/v2/process.rs
index 11a8d687d43a..600e5cc22a48 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/process.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/process.rs
@@ -183,6 +183,10 @@ pub struct ProcessExitedNotification {
pub process_handle: String,
/// Process exit code.
pub exit_code: i32,
+ /// Whether output collection hit its post-exit deadline before seeing EOF or reaching the
+ /// requested byte cap on either stream. Older servers omit this field.
+ #[ts(optional, as = "Option>")]
+ pub output_drain_timed_out: Option,
/// Buffered stdout capture.
///
/// Empty when stdout was streamed via `process/outputDelta`.
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/review.rs b/codex-rs/app-server-protocol/src/protocol/v2/review.rs
index 8f9ac02ec926..8c8418af679c 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/review.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/review.rs
@@ -1,15 +1,15 @@
use super::Turn;
-use super::shared::v2_enum_from_core;
use crate::JsonSchema;
use crate::TS;
use serde::Deserialize;
use serde::Serialize;
-v2_enum_from_core!(
- pub enum ReviewDelivery from codex_protocol::protocol::ReviewDelivery {
- Inline, Detached
- }
-);
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export_to = "v2/")]
+pub enum ReviewDelivery {
+ Inline,
+}
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
#[serde(rename_all = "camelCase")]
@@ -18,10 +18,8 @@ pub struct ReviewStartParams {
pub thread_id: String,
pub target: ReviewTarget,
- /// Where to run the review: inline (default) on the current thread or
- /// detached on a new thread (returned in `reviewThreadId`).
- /// Detached delivery is deprecated and emits `deprecationNotice`.
- /// Use `thread/start` followed by an inline review for a separate review thread.
+ /// Reviews run inline on the supplied thread. Omit this field or pass `inline`.
+ /// To review on a separate thread, start a thread first and use its id.
#[serde(default)]
#[ts(optional = nullable)]
pub delivery: Option,
@@ -32,10 +30,7 @@ pub struct ReviewStartParams {
#[ts(export_to = "v2/")]
pub struct ReviewStartResponse {
pub turn: Turn,
- /// Identifies the thread where the review runs.
- ///
- /// For inline reviews, this is the original thread id.
- /// For detached reviews, this is the id of the new review thread.
+ /// The thread id supplied to `review/start`.
pub review_thread_id: String,
}
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/shared.rs b/codex-rs/app-server-protocol/src/protocol/v2/shared.rs
index 1eaa0d036dc6..1edd7b4a44f9 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/shared.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/shared.rs
@@ -81,6 +81,8 @@ pub enum CodexErrorInfo {
FlexUnavailable,
ServerOverloaded,
ModelNotFound,
+ // Capacity is unavailable on a route restricted by server policy.
+ PolicyCapacityUnavailable,
CyberPolicy,
MisalignmentPolicyViolation,
TooManyDenials,
@@ -157,6 +159,9 @@ impl From for CodexErrorInfo {
CoreCodexErrorInfo::FlexUnavailable => CodexErrorInfo::FlexUnavailable,
CoreCodexErrorInfo::ServerOverloaded => CodexErrorInfo::ServerOverloaded,
CoreCodexErrorInfo::ModelNotFound => CodexErrorInfo::ModelNotFound,
+ CoreCodexErrorInfo::PolicyCapacityUnavailable => {
+ CodexErrorInfo::PolicyCapacityUnavailable
+ }
CoreCodexErrorInfo::CyberPolicy => CodexErrorInfo::CyberPolicy,
CoreCodexErrorInfo::BioPolicy => CodexErrorInfo::Other,
CoreCodexErrorInfo::MisalignmentPolicyViolation => {
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/tests.rs b/codex-rs/app-server-protocol/src/protocol/v2/tests.rs
index d268de69fb12..4580410ea9a4 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/tests.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/tests.rs
@@ -461,8 +461,12 @@ fn thread_items_list_round_trips() {
let response = ThreadItemsListResponse {
data: vec![ThreadItemEntry {
turn_id: "turn_456".to_string(),
- item: ThreadItem::ContextCompaction {
- id: "item_1".to_string(),
+ item: ThreadItem {
+ payload: ThreadItemPayload::ContextCompaction {
+ id: "item_1".to_string(),
+ },
+ started_at_ms,
+ completed_at_ms,
},
started_at_ms,
completed_at_ms,
@@ -476,7 +480,7 @@ fn thread_items_list_round_trips() {
json!({
"data": [{
"turnId": "turn_456",
- "item": {"type": "contextCompaction", "id": "item_1"},
+ "item": {"type": "contextCompaction", "id": "item_1", "startedAtMs": started_at_ms, "completedAtMs": completed_at_ms},
"startedAtMs": started_at_ms,
"completedAtMs": completed_at_ms,
}],
@@ -1941,6 +1945,7 @@ fn process_notifications_round_trip() {
let exited = ProcessExitedNotification {
process_handle: "proc-1".to_string(),
exit_code: 0,
+ output_drain_timed_out: Some(true),
stdout: "out".to_string(),
stdout_cap_reached: false,
stderr: "err".to_string(),
@@ -1952,15 +1957,25 @@ fn process_notifications_round_trip() {
json!({
"processHandle": "proc-1",
"exitCode": 0,
+ "outputDrainTimedOut": true,
"stdout": "out",
"stdoutCapReached": false,
"stderr": "err",
"stderrCapReached": true,
})
);
- let decoded = serde_json::from_value::(value)
+ let decoded = serde_json::from_value::(value.clone())
.expect("deserialize process/exited");
assert_eq!(decoded, exited);
+
+ let mut legacy = value;
+ legacy
+ .as_object_mut()
+ .unwrap()
+ .remove("outputDrainTimedOut");
+ let decoded = serde_json::from_value::(legacy)
+ .expect("deserialize process/exited from an older server");
+ assert_eq!(decoded.output_drain_timed_out, None);
}
#[test]
@@ -2211,6 +2226,7 @@ fn config_requirements_granular_allowed_approval_policy_is_marked_experimental()
check_for_update_on_startup: None,
allow_login_shell: None,
feedback: None,
+ otel: None,
});
assert_eq!(reason, Some("askForApproval.granular"));
@@ -3164,8 +3180,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(user_item),
- ThreadItem::UserMessage {
+ ThreadItemPayload::from(user_item),
+ ThreadItemPayload::UserMessage {
id: "user-1".to_string(),
client_id: Some("client-message-1".to_string()),
content: vec![
@@ -3218,8 +3234,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(agent_item),
- ThreadItem::AgentMessage {
+ ThreadItemPayload::from(agent_item),
+ ThreadItemPayload::AgentMessage {
id: "agent-1".to_string(),
text: "Hello world".to_string(),
phase: None,
@@ -3249,8 +3265,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(agent_item_with_phase),
- ThreadItem::AgentMessage {
+ ThreadItemPayload::from(agent_item_with_phase),
+ ThreadItemPayload::AgentMessage {
id: "agent-2".to_string(),
text: "final".to_string(),
phase: Some(MessagePhase::FinalAnswer),
@@ -3268,7 +3284,7 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
}
);
- let async_item = ThreadItem::from(TurnItem::AgentMessage(AgentMessageItem {
+ let async_item = ThreadItemPayload::from(TurnItem::AgentMessage(AgentMessageItem {
id: "async-1".to_string(),
content: vec![AgentMessageContent::Text {
text: "Which?".to_string(),
@@ -3288,13 +3304,13 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
"memoryCitation": null, "delivery": "async", "questions": [{"title": "Which?", "options": null}]
})
);
- let old_item: ThreadItem = serde_json::from_value(json!({
+ let old_item: ThreadItemPayload = serde_json::from_value(json!({
"type": "agentMessage", "id": "old-1", "text": "An old message"
}))
.unwrap();
assert!(matches!(
old_item,
- ThreadItem::AgentMessage {
+ ThreadItemPayload::AgentMessage {
questions: None,
..
}
@@ -3307,8 +3323,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(reasoning_item),
- ThreadItem::Reasoning {
+ ThreadItemPayload::from(reasoning_item),
+ ThreadItemPayload::Reasoning {
id: "reasoning-1".to_string(),
summary: vec!["line one".to_string(), "line two".to_string()],
content: vec![],
@@ -3345,8 +3361,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(command_item),
- ThreadItem::CommandExecution {
+ ThreadItemPayload::from(command_item),
+ ThreadItemPayload::CommandExecution {
model_context: None,
sandbox_type: None,
id: "exec-1".to_string(),
@@ -3391,8 +3407,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(dynamic_tool_call_item),
- ThreadItem::DynamicToolCall {
+ ThreadItemPayload::from(dynamic_tool_call_item),
+ ThreadItemPayload::DynamicToolCall {
id: "dynamic-1".to_string(),
namespace: Some("apps".to_string()),
tool: "lookup".to_string(),
@@ -3432,8 +3448,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(collab_item),
- ThreadItem::CollabAgentToolCall {
+ ThreadItemPayload::from(collab_item),
+ ThreadItemPayload::CollabAgentToolCall {
id: "collab-1".to_string(),
tool: CollabAgentTool::SendInput,
status: CollabAgentToolCallStatus::Completed,
@@ -3466,8 +3482,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(sub_agent_activity_item),
- ThreadItem::SubAgentActivity {
+ ThreadItemPayload::from(sub_agent_activity_item),
+ ThreadItemPayload::SubAgentActivity {
model: Some("gpt-5".into()),
reasoning_effort: Some(ReasoningEffort::High),
id: "activity-1".to_string(),
@@ -3484,7 +3500,7 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
"agent_path": "/root/worker",
}))
.unwrap();
- let old_wire_activity: ThreadItem = serde_json::from_value(json!({
+ let old_wire_activity: ThreadItemPayload = serde_json::from_value(json!({
"type": "subAgentActivity",
"id": "old-activity",
"kind": "started",
@@ -3493,7 +3509,7 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
}))
.unwrap();
assert_eq!(
- ThreadItem::from(TurnItem::SubAgentActivity(old_activity)),
+ ThreadItemPayload::from(TurnItem::SubAgentActivity(old_activity)),
old_wire_activity
);
@@ -3526,14 +3542,14 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
};
assert_eq!(
- ThreadItem::from(search_item),
- ThreadItem::WebSearch(expected_search_item.clone())
+ ThreadItemPayload::from(search_item),
+ ThreadItemPayload::WebSearch(expected_search_item.clone())
);
assert_eq!(
- ThreadItem::from(TurnItem::Extension(
+ ThreadItemPayload::from(TurnItem::Extension(
codex_extension_items::ExtensionItem::WebSearch(expected_search_item.clone()),
)),
- ThreadItem::WebSearch(expected_search_item)
+ ThreadItemPayload::WebSearch(expected_search_item)
);
let image_view_item = TurnItem::ImageView(ImageViewItem {
@@ -3542,8 +3558,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(image_view_item),
- ThreadItem::ImageView {
+ ThreadItemPayload::from(image_view_item),
+ ThreadItemPayload::ImageView {
id: "view-image-1".to_string(),
path: LegacyAppPathString::from_abs_path(&test_path_buf("/tmp/view-image.png").abs()),
}
@@ -3566,8 +3582,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(file_change_item),
- ThreadItem::FileChange {
+ ThreadItemPayload::from(file_change_item),
+ ThreadItemPayload::FileChange {
id: "patch-1".to_string(),
changes: vec![FileUpdateChange {
path: "README.md".to_string(),
@@ -3598,8 +3614,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(mcp_tool_call_item),
- ThreadItem::McpToolCall {
+ ThreadItemPayload::from(mcp_tool_call_item),
+ ThreadItemPayload::McpToolCall {
id: "mcp-1".to_string(),
server: "server".to_string(),
tool: "tool".to_string(),
@@ -3647,8 +3663,8 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
});
assert_eq!(
- ThreadItem::from(completed_mcp_tool_call_item),
- ThreadItem::McpToolCall {
+ ThreadItemPayload::from(completed_mcp_tool_call_item),
+ ThreadItemPayload::McpToolCall {
id: "mcp-2".to_string(),
server: "server".to_string(),
tool: "tool".to_string(),
@@ -3672,7 +3688,7 @@ fn core_turn_item_into_thread_item_converts_supported_variants() {
#[test]
fn mcp_tool_call_app_context_serializes_connector_id() {
- let item = ThreadItem::McpToolCall {
+ let item = ThreadItemPayload::McpToolCall {
id: "mcp-1".to_string(),
server: "codex_apps".to_string(),
tool: "calendar.create_event".to_string(),
@@ -4792,6 +4808,10 @@ fn codex_error_info_serializes_http_status_code_in_camel_case() {
#[test]
fn core_error_info_converts_to_camel_case() {
for (core, expected) in [
+ (
+ CoreCodexErrorInfo::PolicyCapacityUnavailable,
+ json!("policyCapacityUnavailable"),
+ ),
(CoreCodexErrorInfo::CyberPolicy, json!("cyberPolicy")),
(CoreCodexErrorInfo::BioPolicy, json!("other")),
(CoreCodexErrorInfo::InvalidPrompt, json!("other")),
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/thread.rs b/codex-rs/app-server-protocol/src/protocol/v2/thread.rs
index 79422eba095e..1279bb8661c1 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/thread.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/thread.rs
@@ -624,7 +624,7 @@ pub struct ThreadForkParams {
#[serde(default, skip_serializing_if = "std::ops::Not::not")]
pub ephemeral: bool,
/// Persist the fork as an attached thread of its resolved source, hidden from ordinary
- /// lists. The source cannot be deleted while attached threads exist. Requires local storage;
+ /// lists. The source cannot be deleted while attached threads exist. Requires a paginated source and local storage;
/// incompatible with ephemeral and deferGoalContinuation. Omitted or false creates an ordinary fork.
#[experimental("thread/fork.attachToSource")]
#[serde(default, skip_serializing_if = "std::ops::Not::not")]
@@ -1845,6 +1845,16 @@ pub struct ThreadItemEntry {
pub completed_at_ms: Option,
}
+impl From for ThreadItem {
+ fn from(entry: ThreadItemEntry) -> Self {
+ Self {
+ started_at_ms: entry.item.started_at_ms.or(entry.started_at_ms),
+ completed_at_ms: entry.item.completed_at_ms.or(entry.completed_at_ms),
+ ..entry.item
+ }
+ }
+}
+
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
#[serde(rename_all = "camelCase")]
#[ts(export_to = "v2/")]
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/thread_data.rs b/codex-rs/app-server-protocol/src/protocol/v2/thread_data.rs
index 015d81346207..dd7c0d854a62 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/thread_data.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/thread_data.rs
@@ -1,6 +1,7 @@
use super::CodexErrorInfo;
use super::ThreadEnvironment;
use super::ThreadItem;
+use super::ThreadItemPayload;
use super::ThreadStatus;
use super::TurnStatus;
use crate::JsonSchema;
@@ -409,6 +410,15 @@ pub struct Turn {
pub duration_ms: Option,
}
+impl Turn {
+ /// Iterates over the item payloads in this turn.
+ pub fn item_payloads(
+ &self,
+ ) -> impl DoubleEndedIterator- + ExactSizeIterator {
+ self.items.iter().map(|item| &item.payload)
+ }
+}
+
#[derive(Default, Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
#[serde(rename_all = "camelCase")]
#[ts(export_to = "v2/")]
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/thread_usage.rs b/codex-rs/app-server-protocol/src/protocol/v2/thread_usage.rs
index 249cfa969b2d..b48e35ecddcf 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/thread_usage.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/thread_usage.rs
@@ -1,3 +1,5 @@
+//! Thread billing amounts, keeping native dollars separate from credit estimates.
+
use crate::JsonSchema;
use crate::TS;
use serde::Deserialize;
@@ -10,6 +12,9 @@ pub struct ThreadUsage {
pub thread_id: String,
pub estimated_usage_credits_micros: i64,
pub estimated_usage_usd_micros: Option,
+ /// Native dollar usage, independent of credit estimates. None means unknown, not zero.
+ #[ts(optional, as = "Option>")]
+ pub native_usage_usd_micros: Option,
pub groups: Vec,
}
diff --git a/codex-rs/app-server-protocol/src/protocol/v2/turn.rs b/codex-rs/app-server-protocol/src/protocol/v2/turn.rs
index 38b00228a6d4..bf2444553ab3 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2/turn.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/turn.rs
@@ -116,6 +116,9 @@ pub enum AdditionalContextKind {
pub struct AdditionalContextEntry {
pub value: String,
pub kind: AdditionalContextKind,
+ /// Optional name for untrusted context, used to label its tool output.
+ #[ts(optional = nullable)]
+ pub name: Option,
}
/// Requested cyber treatment for an OpenAI model turn.
diff --git a/codex-rs/app-server-protocol/src/schema_fixtures.rs b/codex-rs/app-server-protocol/src/schema_fixtures.rs
index d0f36db800a1..83e8126ba301 100644
--- a/codex-rs/app-server-protocol/src/schema_fixtures.rs
+++ b/codex-rs/app-server-protocol/src/schema_fixtures.rs
@@ -64,6 +64,7 @@ pub fn generate_typescript_schema_fixture_subtree_for_tests() -> Result(&mut files, &mut seen)?;
+ collect_typescript_fixture_file::(&mut files, &mut seen)?;
collect_typescript_fixture_file::(&mut files, &mut seen)?;
visit_typescript_fixture_dependencies(&mut files, &mut seen, |visitor| {
visit_server_response_types(visitor);
diff --git a/codex-rs/app-server-test-client/src/lib.rs b/codex-rs/app-server-test-client/src/lib.rs
index 5db6d881ae7e..ae04387445c6 100644
--- a/codex-rs/app-server-test-client/src/lib.rs
+++ b/codex-rs/app-server-test-client/src/lib.rs
@@ -57,7 +57,7 @@ use codex_app_server_protocol::ThreadDecrementElicitationParams;
use codex_app_server_protocol::ThreadDecrementElicitationResponse;
use codex_app_server_protocol::ThreadIncrementElicitationParams;
use codex_app_server_protocol::ThreadIncrementElicitationResponse;
-use codex_app_server_protocol::ThreadItem;
+use codex_app_server_protocol::ThreadItemPayload;
use codex_app_server_protocol::ThreadListParams;
use codex_app_server_protocol::ThreadListResponse;
use codex_app_server_protocol::ThreadResumeParams;
@@ -1456,13 +1456,13 @@ struct CodexClient {
command_item_started: bool,
helper_done_seen: bool,
turn_completed_before_helper_done: bool,
- unexpected_items_before_helper_done: Vec,
+ unexpected_items_before_helper_done: Vec,
last_turn_status: Option,
last_turn_error_message: Option,
}
fn item_started_before_helper_done_is_unexpected(
- item: &ThreadItem,
+ item: &ThreadItemPayload,
command_item_started: bool,
helper_done_seen: bool,
) -> bool {
@@ -1470,7 +1470,7 @@ fn item_started_before_helper_done_is_unexpected(
return false;
}
- !matches!(item, ThreadItem::UserMessage { .. })
+ !matches!(item, ThreadItemPayload::UserMessage { .. })
}
impl CodexClient {
@@ -1816,28 +1816,31 @@ impl CodexClient {
std::io::stdout().flush().ok();
}
ServerNotification::ItemStarted(payload) => {
- if matches!(payload.item, ThreadItem::CommandExecution { .. }) {
+ if matches!(
+ payload.item.payload,
+ ThreadItemPayload::CommandExecution { .. }
+ ) {
if self.command_item_started && !self.helper_done_seen {
self.unexpected_items_before_helper_done
- .push(payload.item.clone());
+ .push(payload.item.payload.clone());
}
self.command_item_started = true;
} else if item_started_before_helper_done_is_unexpected(
- &payload.item,
+ &payload.item.payload,
self.command_item_started,
self.helper_done_seen,
) {
self.unexpected_items_before_helper_done
- .push(payload.item.clone());
+ .push(payload.item.payload.clone());
}
- println!("\n< item started: {:?}", payload.item);
+ println!("\n< item started: {:?}", payload.item.payload);
}
ServerNotification::ItemCompleted(payload) => {
- if let ThreadItem::CommandExecution {
+ if let ThreadItemPayload::CommandExecution {
status,
aggregated_output,
..
- } = payload.item.clone()
+ } = payload.item.payload.clone()
{
self.command_execution_statuses.push(status);
if let Some(aggregated_output) = aggregated_output {
@@ -1845,7 +1848,7 @@ impl CodexClient {
self.command_execution_outputs.push(aggregated_output);
}
}
- println!("< item completed: {:?}", payload.item);
+ println!("< item completed: {:?}", payload.item.payload);
}
ServerNotification::TurnCompleted(payload) => {
if payload.turn.id == turn_id {
diff --git a/codex-rs/app-server-transport/src/lib.rs b/codex-rs/app-server-transport/src/lib.rs
index 895f65a0fd71..d635273a4024 100644
--- a/codex-rs/app-server-transport/src/lib.rs
+++ b/codex-rs/app-server-transport/src/lib.rs
@@ -45,8 +45,10 @@ pub use transport::start_stdio_connection;
pub use transport::start_websocket_acceptor;
pub use transport::take_remote_control_disabled_env;
pub use transport::verified_local_daemon_socket;
+pub use websocket_compression::CompressionConnection;
pub use websocket_compression::WEBSOCKET_COMPRESSION_HEADER;
pub use websocket_compression::WebSocketCompression;
pub use websocket_compression::ZSTD_STREAM_PROTOCOL;
pub use websocket_compression::ZstdDecoder;
pub use websocket_compression::ZstdEncoder;
+pub use websocket_compression::zstd_codec_pair;
diff --git a/codex-rs/app-server-transport/src/transport/remote_control/auth.rs b/codex-rs/app-server-transport/src/transport/remote_control/auth.rs
index e0e7f9e9dd58..a776638b6fa1 100644
--- a/codex-rs/app-server-transport/src/transport/remote_control/auth.rs
+++ b/codex-rs/app-server-transport/src/transport/remote_control/auth.rs
@@ -61,7 +61,7 @@ impl RemoteControlAuth {
}
}
-pub(super) const REMOTE_CONTROL_ACCOUNT_ID_HEADER: &str = "chatgpt-account-id";
+pub(super) use codex_http_client::CHATGPT_ACCOUNT_ID_HEADER as REMOTE_CONTROL_ACCOUNT_ID_HEADER;
pub(super) struct RemoteControlConnectionAuth {
pub(super) http_client_factory: codex_http_client::HttpClientFactory,
diff --git a/codex-rs/app-server-transport/src/transport/websocket.rs b/codex-rs/app-server-transport/src/transport/websocket.rs
index f02aed975a56..4c15beb72dee 100644
--- a/codex-rs/app-server-transport/src/transport/websocket.rs
+++ b/codex-rs/app-server-transport/src/transport/websocket.rs
@@ -11,6 +11,7 @@ use crate::websocket_compression::WebSocketCompression;
use crate::websocket_compression::ZSTD_STREAM_PROTOCOL;
use crate::websocket_compression::ZstdDecoder;
use crate::websocket_compression::ZstdEncoder;
+use crate::websocket_compression::zstd_codec_pair;
use axum::Router;
use axum::body::Body;
use axum::body::Bytes;
@@ -211,20 +212,22 @@ pub(crate) async fn run_websocket_connection(
SinkError: Send + 'static,
StreamError: std::fmt::Display + Send + 'static,
{
+ let connection_id = next_connection_id();
let (encoder, decoder) = match compression {
WebSocketCompression::Plain => (None, None),
- WebSocketCompression::Zstd => match (
- ZstdEncoder::new(),
- ZstdDecoder::new(MAX_DECOMPRESSED_MESSAGE_SIZE),
- ) {
- (Ok(encoder), Ok(decoder)) => (Some(encoder), Some(decoder)),
- _ => {
- warn!("failed to initialize websocket compression");
- return;
+ WebSocketCompression::Zstd => {
+ match zstd_codec_pair(
+ MAX_DECOMPRESSED_MESSAGE_SIZE,
+ crate::CompressionConnection::Listener(connection_id),
+ ) {
+ Ok((encoder, decoder)) => (Some(encoder), Some(decoder)),
+ Err(_) => {
+ warn!("failed to initialize websocket compression");
+ return;
+ }
}
- },
+ }
};
- let connection_id = next_connection_id();
let (writer_tx, writer_rx) =
mpsc::channel::(WEBSOCKET_OUTBOUND_CHANNEL_CAPACITY);
let writer_tx_for_reader = writer_tx.clone();
diff --git a/codex-rs/app-server-transport/src/websocket_compression.rs b/codex-rs/app-server-transport/src/websocket_compression.rs
index 17ac36e0b011..2aeface92e49 100644
--- a/codex-rs/app-server-transport/src/websocket_compression.rs
+++ b/codex-rs/app-server-transport/src/websocket_compression.rs
@@ -6,8 +6,13 @@
//! Each binary message contains one UTF-8 JSON message flushed with `ZSTD_e_flush`.
//! Keep separate streams per direction and start fresh on reconnect. Never finish
//! the zstd frame between messages.
+//! Paired codecs report cumulative payload sizes per connection and direction.
use std::io;
+use std::sync::atomic::AtomicU64;
+use std::sync::atomic::Ordering;
+use std::time::Duration;
+use std::time::Instant;
use zstd::stream::raw::CParameter;
use zstd::stream::raw::DParameter;
use zstd::stream::raw::Decoder;
@@ -15,11 +20,15 @@ use zstd::stream::raw::Encoder;
use zstd::stream::raw::Operation;
use zstd::stream::raw::OutBuffer;
+use crate::ConnectionId;
+
pub const WEBSOCKET_COMPRESSION_HEADER: &str = "x-codex-app-server-compression";
pub const ZSTD_STREAM_PROTOCOL: &str = "zstd-stream-v1";
const COMPRESSION_LEVEL: i32 = -7;
const WINDOW_LOG: u32 = 20;
const BUFFER_SIZE: usize = 32 * 1024;
+const STATS_INTERVAL: Duration = Duration::from_secs(60);
+static NEXT_NATIVE_CONNECTION_ID: AtomicU64 = AtomicU64::new(1);
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum WebSocketCompression {
@@ -43,13 +52,17 @@ impl WebSocketCompression {
pub struct ZstdEncoder {
encoder: Encoder<'static>,
+ stats: Option,
}
impl ZstdEncoder {
pub fn new() -> io::Result {
let mut encoder = Encoder::new(COMPRESSION_LEVEL)?;
encoder.set_parameter(CParameter::WindowLog(WINDOW_LOG))?;
- Ok(Self { encoder })
+ Ok(Self {
+ encoder,
+ stats: None,
+ })
}
/// Flush one message without ending the frame or resetting its history.
@@ -67,6 +80,9 @@ impl ZstdEncoder {
let remaining = self.encoder.flush(&mut output)?;
encoded.extend_from_slice(output.as_slice());
if remaining == 0 {
+ if let Some(stats) = &mut self.stats {
+ stats.record(text.len(), encoded.len());
+ }
return Ok(encoded);
}
}
@@ -76,6 +92,7 @@ impl ZstdEncoder {
pub struct ZstdDecoder {
decoder: Decoder<'static>,
max_message_size: usize,
+ stats: Option