try more things

a bit more
chore: make specs more linears
2026-06-04 04:12:03 +00:00 · 2026-05-22 18:58:38 +01:00 · 2026-05-22 18:35:36 +01:00 · 2026-05-22 14:18:29 +01:00
961 changed files with 16789 additions and 52734 deletions
--- a/.codex/environments/environment.toml
+++ b/.codex/environments/environment.toml
@@ -8,4 +8,4 @@ script = ""
 [[actions]]
 name = "Run"
 icon = "run"
-command = "cargo +1.95.0 run --manifest-path=codex-rs/Cargo.toml --bin codex -- -c mcp_oauth_credentials_store=file"
+command = "cargo +1.93.0 run --manifest-path=codex-rs/Cargo.toml --bin codex -- -c mcp_oauth_credentials_store=file"
--- a/.devcontainer/Dockerfile.secure
+++ b/.devcontainer/Dockerfile.secure
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04
 ARG TZ
 ARG DEBIAN_FRONTEND=noninteractive
 ARG NODE_MAJOR=22
-ARG RUST_TOOLCHAIN=1.95.0
+ARG RUST_TOOLCHAIN=1.92.0
 # Keep this in sync with .devcontainer/codex-install/package.json and pnpm-lock.yaml.
 ARG CODEX_NPM_VERSION=0.121.0

--- a/.devcontainer/devcontainer.secure.json
+++ b/.devcontainer/devcontainer.secure.json
@@ -7,7 +7,7 @@
    "args": {
      "TZ": "${localEnv:TZ:UTC}",
      "NODE_MAJOR": "22",
-      "RUST_TOOLCHAIN": "1.95.0",
+      "RUST_TOOLCHAIN": "1.92.0",
      "CODEX_NPM_VERSION": "0.121.0"
    }
  },
--- a/.github/actions/setup-rusty-v8-musl/action.yml
+++ b/.github/actions/setup-rusty-v8-musl/action.yml
@@ -1,20 +1,29 @@
-name: setup-rusty-v8
-description: Download and verify Codex-built rusty_v8 artifacts for Cargo builds.
+name: setup-rusty-v8-musl
+description: Download and verify musl rusty_v8 artifacts for Cargo builds.
 inputs:
  target:
-    description: Rust target triple with Codex-built V8 release artifacts.
+    description: Rust musl target triple.
    required: true

 runs:
  using: composite
  steps:
-    - name: Configure rusty_v8 artifact overrides and verify checksums
+    - name: Configure musl rusty_v8 artifact overrides and verify checksums
      shell: bash
      env:
        TARGET: ${{ inputs.target }}
      run: |
        set -euo pipefail

+        case "${TARGET}" in
+          x86_64-unknown-linux-musl|aarch64-unknown-linux-musl)
+            ;;
+          *)
+            echo "Unsupported musl rusty_v8 target: ${TARGET}" >&2
+            exit 1
+            ;;
+        esac
+
        version="$(python3 "${GITHUB_WORKSPACE}/.github/scripts/rusty_v8_bazel.py" resolved-v8-crate-version)"
        release_tag="rusty-v8-v${version}"
        base_url="https://github.com/openai/codex/releases/download/${release_tag}"
@@ -33,10 +42,6 @@ runs:
          exit 1
        fi

-        if command -v sha256sum >/dev/null 2>&1; then
-          (cd "${binding_dir}" && sha256sum -c "${checksums_path}")
-        else
-          (cd "${binding_dir}" && shasum -a 256 -c "${checksums_path}")
-        fi
+        (cd "${binding_dir}" && sha256sum -c "${checksums_path}")
        echo "RUSTY_V8_ARCHIVE=${archive_path}" >> "${GITHUB_ENV}"
        echo "RUSTY_V8_SRC_BINDING_PATH=${binding_path}" >> "${GITHUB_ENV}"
--- a/.github/dotslash-zsh-config.json
+++ b/.github/dotslash-zsh-config.json
@@ -7,11 +7,6 @@
          "format": "tar.gz",
          "path": "codex-zsh/bin/zsh"
        },
-        "macos-x86_64": {
-          "name": "codex-zsh-x86_64-apple-darwin.tar.gz",
-          "format": "tar.gz",
-          "path": "codex-zsh/bin/zsh"
-        },
        "linux-x86_64": {
          "name": "codex-zsh-x86_64-unknown-linux-musl.tar.gz",
          "format": "tar.gz",
--- a/.github/scripts/install-musl-build-tools.sh
+++ b/.github/scripts/install-musl-build-tools.sh
@@ -150,9 +150,7 @@ for arg in "\$@"; do
  args+=("\${arg}")
 done

-# Zig enables UBSan for debug C builds by default. Rust links these objects
-# without Zig's sanitizer runtime, so keep native dependencies uninstrumented.
-exec "${zig_bin}" cc -target "${zig_target}" "\${args[@]}" -fno-sanitize=undefined
+exec "${zig_bin}" cc -target "${zig_target}" "\${args[@]}"
 EOF
  cat >"${cxx}" <<EOF
 #!/usr/bin/env bash
@@ -209,9 +207,7 @@ for arg in "\$@"; do
  args+=("\${arg}")
 done

-# Zig enables UBSan for debug C++ builds by default. Rust links these objects
-# without Zig's sanitizer runtime, so keep native dependencies uninstrumented.
-exec "${zig_bin}" c++ -target "${zig_target}" "\${args[@]}" -fno-sanitize=undefined
+exec "${zig_bin}" c++ -target "${zig_target}" "\${args[@]}"
 EOF
  chmod +x "${cc}" "${cxx}"

@@ -274,11 +270,6 @@ echo "PKG_CONFIG_PATH=${pkg_config_path}" >> "$GITHUB_ENV"
 pkg_config_path_var="PKG_CONFIG_PATH_${TARGET}"
 pkg_config_path_var="${pkg_config_path_var//-/_}"
 echo "${pkg_config_path_var}=${libcap_pkgconfig_dir}" >> "$GITHUB_ENV"
-pkg_config_libdir_var="PKG_CONFIG_LIBDIR_${TARGET}"
-pkg_config_libdir_var="${pkg_config_libdir_var//-/_}"
-# Do not let musl cross-builds resolve native libraries from the host glibc
-# pkg-config directories. libcap is the only target package provided here.
-echo "${pkg_config_libdir_var}=${libcap_pkgconfig_dir}" >> "$GITHUB_ENV"

 if [[ -n "${sysroot}" && "${sysroot}" != "/" ]]; then
  echo "PKG_CONFIG_SYSROOT_DIR=${sysroot}" >> "$GITHUB_ENV"
--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -141,9 +141,7 @@ jobs:
          - 2
          - 3
          - 4
-    runs-on:
-      group: codex-runners
-      labels: codex-windows-x64
+    runs-on: windows-latest
    name: Bazel test on windows-latest for x86_64-pc-windows-gnullvm shard ${{ matrix.shard }}/4

    steps:
@@ -248,9 +246,7 @@ jobs:
    # it a larger timeout.
    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
    timeout-minutes: 40
-    runs-on:
-      group: codex-runners
-      labels: codex-windows-x64
+    runs-on: windows-latest
    name: Bazel test on windows-latest for x86_64-pc-windows-gnullvm (native main)

    steps:
@@ -336,10 +332,7 @@ jobs:
            target: aarch64-apple-darwin
          - os: windows-latest
            target: x86_64-pc-windows-gnullvm
-            runs_on:
-              group: codex-runners
-              labels: codex-windows-x64
-    runs-on: ${{ matrix.runs_on || matrix.os }}
+    runs-on: ${{ matrix.os }}
    name: Bazel clippy on ${{ matrix.os }} for ${{ matrix.target }}

    steps:
@@ -429,10 +422,7 @@ jobs:
            target: aarch64-apple-darwin
          - os: windows-latest
            target: x86_64-pc-windows-gnullvm
-            runs_on:
-              group: codex-runners
-              labels: codex-windows-x64
-    runs-on: ${{ matrix.runs_on || matrix.os }}
+    runs-on: ${{ matrix.os }}
    name: Verify release build on ${{ matrix.os }} for ${{ matrix.target }}

    steps:
--- a/.github/workflows/cargo-deny.yml
+++ b/.github/workflows/cargo-deny.yml
@@ -20,10 +20,10 @@ jobs:
          persist-credentials: false

      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+        uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0

      - name: Run cargo-deny
        uses: EmbarkStudios/cargo-deny-action@82eb9f621fbc699dd0918f3ea06864c14cc84246 # v2
        with:
-          rust-version: 1.95.0
+          rust-version: 1.93.0
          manifest-path: ./codex-rs/Cargo.toml
--- a/.github/workflows/issue-deduplicator.yml
+++ b/.github/workflows/issue-deduplicator.yml
@@ -12,7 +12,6 @@ jobs:
    # Prevent runs on forks (requires OpenAI API key, wastes Actions minutes)
    if: github.repository == 'openai/codex' && (github.event.action == 'opened' || (github.event.action == 'labeled' && github.event.label.name == 'codex-deduplicate'))
    runs-on: ubuntu-latest
-    environment: issue-triage
    permissions:
      contents: read
    outputs:
@@ -158,7 +157,6 @@ jobs:
    needs: normalize-duplicates-all
    if: ${{ needs.normalize-duplicates-all.result == 'success' && needs.normalize-duplicates-all.outputs.has_matches != 'true' }}
    runs-on: ubuntu-latest
-    environment: issue-triage
    permissions:
      contents: read
    outputs:
--- a/.github/workflows/issue-labeler.yml
+++ b/.github/workflows/issue-labeler.yml
@@ -12,7 +12,6 @@ jobs:
    # Prevent runs on forks (requires OpenAI API key, wastes Actions minutes)
    if: github.repository == 'openai/codex' && (github.event.action == 'opened' || (github.event.action == 'labeled' && github.event.label.name == 'codex-label'))
    runs-on: ubuntu-latest
-    environment: issue-triage
    permissions:
      contents: read
    outputs:
--- a/.github/workflows/python-sdk-release.yml
+++ b/.github/workflows/python-sdk-release.yml
@@ -1,91 +0,0 @@
-name: python-sdk-release
-
-on:
-  push:
-    tags:
-      - "python-v*"
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: false
-
-jobs:
-  build-python-sdk:
-    if: github.repository == 'openai/codex'
-    name: build-python-sdk
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-
-      - name: Validate tag and build Python SDK package
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          sdk_version="${GITHUB_REF_NAME#python-v}"
-          if [[ ! "${sdk_version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+b[0-9]+$ ]]; then
-            echo "Python SDK release tags must identify a beta release, for example python-v0.1.0b1."
-            exit 1
-          fi
-
-          # The pinned runtime currently publishes a musllinux Linux wheel.
-          # Build in Alpine so release type generation installs that wheel.
-          docker run --rm \
-            --user "$(id -u):$(id -g)" \
-            -e HOME=/tmp/codex-python-sdk-home \
-            -e UV_LINK_MODE=copy \
-            -e SDK_VERSION="${sdk_version}" \
-            -e SDK_STAGE_DIR="${RUNNER_TEMP}/openai-codex" \
-            -e SDK_DIST_DIR="${GITHUB_WORKSPACE}/dist/python-sdk" \
-            -v "${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE}" \
-            -v "${RUNNER_TEMP}:${RUNNER_TEMP}" \
-            -w "${GITHUB_WORKSPACE}/sdk/python" \
-            python:3.12-alpine \
-            sh -euxc '
-              python -m venv /tmp/release-tools
-              /tmp/release-tools/bin/python -m pip install build twine uv==0.11.3
-              /tmp/release-tools/bin/uv sync --extra dev --frozen
-              /tmp/release-tools/bin/uv run --extra dev --frozen python scripts/update_sdk_artifacts.py \
-                stage-sdk "${SDK_STAGE_DIR}" \
-                --sdk-version "${SDK_VERSION}"
-              /tmp/release-tools/bin/python -m build \
-                --wheel \
-                --sdist \
-                --outdir "${SDK_DIST_DIR}" \
-                "${SDK_STAGE_DIR}"
-              /tmp/release-tools/bin/python -m twine check --strict "${SDK_DIST_DIR}/"*
-            '
-
-      - name: Upload Python SDK package
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
-        with:
-          name: python-sdk-package
-          path: dist/python-sdk/*
-          if-no-files-found: error
-
-  publish-python-sdk:
-    name: publish-python-sdk
-    needs: build-python-sdk
-    runs-on: ubuntu-latest
-    environment: pypi
-    permissions:
-      contents: read
-      id-token: write # Required for PyPI trusted publishing.
-
-    steps:
-      - name: Download Python SDK package
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: python-sdk-package
-          path: dist/python-sdk
-
-      - name: Publish Python SDK to PyPI
-        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
-        with:
-          packages-dir: dist/python-sdk
--- a/.github/workflows/rust-ci-full-nextest-platform.yml
+++ b/.github/workflows/rust-ci-full-nextest-platform.yml
@@ -94,7 +94,7 @@ jobs:
      - name: Install DotSlash
        uses: facebook/install-dotslash@1e4e7b3e07eaca387acb98f1d4720e0bee8dbb6a # v2

-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
          targets: ${{ inputs.target }}

@@ -319,7 +319,7 @@ jobs:
      - name: Install DotSlash
        uses: facebook/install-dotslash@1e4e7b3e07eaca387acb98f1d4720e0bee8dbb6a # v2

-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
          targets: ${{ inputs.target }}

--- a/.github/workflows/rust-ci-full.yml
+++ b/.github/workflows/rust-ci-full.yml
@@ -25,16 +25,11 @@ jobs:
      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
          components: rustfmt
-      - uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
-        with:
-          tool: just
      - name: cargo fmt
        run: cargo fmt -- --config imports_granularity=Item --check
-      - name: Rust benchmark smoke test
-        run: just bench-smoke

  cargo_shear:
    name: cargo shear
@@ -46,7 +41,7 @@ jobs:
      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
      - uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: cargo-shear@1.11.2
@@ -63,7 +58,7 @@ jobs:
      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
          toolchain: nightly-2025-09-18
          components: llvm-tools-preview, rustc-dev, rust-src
@@ -260,9 +255,13 @@ jobs:
          set -euo pipefail
          if command -v apt-get >/dev/null 2>&1; then
            sudo apt-get update -y
-            sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends pkg-config libcap-dev
+            packages=(pkg-config libcap-dev)
+            if [[ "${{ matrix.target }}" == 'x86_64-unknown-linux-musl' || "${{ matrix.target }}" == 'aarch64-unknown-linux-musl' ]]; then
+              packages+=(libubsan1)
+            fi
+            sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends "${packages[@]}"
          fi
-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
          targets: ${{ matrix.target }}
          components: clippy
@@ -344,6 +343,14 @@ jobs:
            sccache-${{ matrix.runner }}-${{ matrix.target }}-${{ matrix.profile }}-${{ steps.lockhash.outputs.hash }}-
            sccache-${{ matrix.runner }}-${{ matrix.target }}-${{ matrix.profile }}-

+      - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'}}
+        name: Disable sccache wrapper (musl)
+        shell: bash
+        run: |
+          set -euo pipefail
+          echo "RUSTC_WRAPPER=" >> "$GITHUB_ENV"
+          echo "RUSTC_WORKSPACE_WRAPPER=" >> "$GITHUB_ENV"
+
      - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'}}
        name: Prepare APT cache directories (musl)
        shell: bash
@@ -377,9 +384,61 @@ jobs:
        shell: bash
        run: bash "${GITHUB_WORKSPACE}/.github/scripts/install-musl-build-tools.sh"

-      - if: ${{ !contains(matrix.target, 'windows') }}
-        name: Configure rusty_v8 artifact overrides and verify checksums
-        uses: ./.github/actions/setup-rusty-v8
+      - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'}}
+        name: Configure rustc UBSan wrapper (musl host)
+        shell: bash
+        run: |
+          set -euo pipefail
+          ubsan=""
+          if command -v ldconfig >/dev/null 2>&1; then
+            ubsan="$(ldconfig -p | grep -m1 'libubsan\.so\.1' | sed -E 's/.*=> (.*)$/\1/')"
+          fi
+          wrapper_root="${RUNNER_TEMP:-/tmp}"
+          wrapper="${wrapper_root}/rustc-ubsan-wrapper"
+          cat > "${wrapper}" <<EOF
+          #!/usr/bin/env bash
+          set -euo pipefail
+          if [[ -n "${ubsan}" ]]; then
+            export LD_PRELOAD="${ubsan}\${LD_PRELOAD:+:\${LD_PRELOAD}}"
+          fi
+          exec "\$1" "\${@:2}"
+          EOF
+          chmod +x "${wrapper}"
+          echo "RUSTC_WRAPPER=${wrapper}" >> "$GITHUB_ENV"
+          echo "RUSTC_WORKSPACE_WRAPPER=" >> "$GITHUB_ENV"
+
+      - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'}}
+        name: Clear sanitizer flags (musl)
+        shell: bash
+        run: |
+          set -euo pipefail
+          # Clear global Rust flags so host/proc-macro builds don't pull in UBSan.
+          echo "RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "CARGO_ENCODED_RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "RUSTDOCFLAGS=" >> "$GITHUB_ENV"
+          # Override any runner-level Cargo config rustflags as well.
+          echo "CARGO_BUILD_RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS=" >> "$GITHUB_ENV"
+
+          sanitize_flags() {
+            local input="$1"
+            input="${input//-fsanitize=undefined/}"
+            input="${input//-fno-sanitize-recover=undefined/}"
+            input="${input//-fno-sanitize-trap=undefined/}"
+            echo "$input"
+          }
+
+          cflags="$(sanitize_flags "${CFLAGS-}")"
+          cxxflags="$(sanitize_flags "${CXXFLAGS-}")"
+          echo "CFLAGS=${cflags}" >> "$GITHUB_ENV"
+          echo "CXXFLAGS=${cxxflags}" >> "$GITHUB_ENV"
+
+      - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl' }}
+        name: Configure musl rusty_v8 artifact overrides and verify checksums
+        uses: ./.github/actions/setup-rusty-v8-musl
        with:
          target: ${{ matrix.target }}

--- a/.github/workflows/rust-ci.yml
+++ b/.github/workflows/rust-ci.yml
@@ -67,16 +67,11 @@ jobs:
        with:
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
          persist-credentials: false
-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
          components: rustfmt
-      - uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
-        with:
-          tool: just
      - name: cargo fmt
        run: cargo fmt -- --config imports_granularity=Item --check
-      - name: Rust benchmark smoke test
-        run: just bench-smoke

  cargo_shear:
    name: cargo shear
@@ -91,7 +86,7 @@ jobs:
        with:
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
          persist-credentials: false
-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
      - uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2.62.49
        with:
          tool: cargo-shear@1.11.2
@@ -111,7 +106,7 @@ jobs:
        with:
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
          persist-credentials: false
-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
      - name: Install nightly argument-comment-lint toolchain
        shell: bash
        run: |
--- a/.github/workflows/rust-release-argument-comment-lint.yml
+++ b/.github/workflows/rust-release-argument-comment-lint.yml
@@ -60,7 +60,7 @@ jobs:
        with:
          persist-credentials: false

-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
          toolchain: nightly-2025-09-18
          targets: ${{ matrix.target }}
--- a/.github/workflows/rust-release-windows.yml
+++ b/.github/workflows/rust-release-windows.yml
@@ -100,7 +100,7 @@ jobs:
          Write-Host "Total RAM: $ramGiB GiB"
          Write-Host "Disk usage:"
          Get-PSDrive -PSProvider FileSystem | Format-Table -AutoSize Name, @{Name='Size(GB)';Expression={[math]::Round(($_.Used + $_.Free) / 1GB, 1)}}, @{Name='Free(GB)';Expression={[math]::Round($_.Free / 1GB, 1)}}
-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
          targets: ${{ matrix.target }}

--- a/.github/workflows/rust-release-zsh.yml
+++ b/.github/workflows/rust-release-zsh.yml
@@ -69,10 +69,6 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - runner: macos-15-large
-            target: x86_64-apple-darwin
-            variant: macos-15
-            archive_name: codex-zsh-x86_64-apple-darwin.tar.gz
          - runner: macos-15-xlarge
            target: aarch64-apple-darwin
            variant: macos-15
--- a/.github/workflows/rust-release.yml
+++ b/.github/workflows/rust-release.yml
@@ -56,7 +56,7 @@ jobs:
      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
      - name: Validate tag matches Cargo.toml version
        shell: bash
        env:
@@ -245,7 +245,16 @@ jobs:
          set -euo pipefail
          sudo apt-get update -y
          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends pkg-config libcap-dev
-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - name: Install UBSan runtime (musl)
+        if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl' }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          if command -v apt-get >/dev/null 2>&1; then
+            sudo apt-get update -y
+            sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libubsan1
+          fi
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
          targets: ${{ matrix.target }}

@@ -274,7 +283,30 @@ jobs:
        run: bash "${GITHUB_WORKSPACE}/.github/scripts/install-musl-build-tools.sh"

      - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'}}
-        name: Disable aws-lc jitter entropy (musl)
+        name: Configure rustc UBSan wrapper (musl host)
+        shell: bash
+        run: |
+          set -euo pipefail
+          ubsan=""
+          if command -v ldconfig >/dev/null 2>&1; then
+            ubsan="$(ldconfig -p | grep -m1 'libubsan\.so\.1' | sed -E 's/.*=> (.*)$/\1/')"
+          fi
+          wrapper_root="${RUNNER_TEMP:-/tmp}"
+          wrapper="${wrapper_root}/rustc-ubsan-wrapper"
+          cat > "${wrapper}" <<EOF
+          #!/usr/bin/env bash
+          set -euo pipefail
+          if [[ -n "${ubsan}" ]]; then
+            export LD_PRELOAD="${ubsan}\${LD_PRELOAD:+:\${LD_PRELOAD}}"
+          fi
+          exec "\$1" "\${@:2}"
+          EOF
+          chmod +x "${wrapper}"
+          echo "RUSTC_WRAPPER=${wrapper}" >> "$GITHUB_ENV"
+          echo "RUSTC_WORKSPACE_WRAPPER=" >> "$GITHUB_ENV"
+
+      - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'}}
+        name: Clear sanitizer flags (musl)
        shell: bash
        run: |
          set -euo pipefail
@@ -284,8 +316,33 @@ jobs:
          target_no_jitter="${target_no_jitter//-/_}"
          echo "${target_no_jitter}=1" >> "$GITHUB_ENV"

-      - name: Configure rusty_v8 artifact overrides and verify checksums
-        uses: ./.github/actions/setup-rusty-v8
+          # Clear global Rust flags so host/proc-macro builds don't pull in UBSan.
+          echo "RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "CARGO_ENCODED_RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "RUSTDOCFLAGS=" >> "$GITHUB_ENV"
+          # Override any runner-level Cargo config rustflags as well.
+          echo "CARGO_BUILD_RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS=" >> "$GITHUB_ENV"
+          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS=" >> "$GITHUB_ENV"
+
+          sanitize_flags() {
+            local input="$1"
+            input="${input//-fsanitize=undefined/}"
+            input="${input//-fno-sanitize-recover=undefined/}"
+            input="${input//-fno-sanitize-trap=undefined/}"
+            echo "$input"
+          }
+
+          cflags="$(sanitize_flags "${CFLAGS-}")"
+          cxxflags="$(sanitize_flags "${CXXFLAGS-}")"
+          echo "CFLAGS=${cflags}" >> "$GITHUB_ENV"
+          echo "CXXFLAGS=${cxxflags}" >> "$GITHUB_ENV"
+
+      - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl' }}
+        name: Configure musl rusty_v8 artifact overrides and verify checksums
+        uses: ./.github/actions/setup-rusty-v8-musl
        with:
          target: ${{ matrix.target }}

@@ -1226,6 +1283,19 @@ jobs:
          tag: ${{ github.ref_name }}
          config: .github/dotslash-argument-comment-lint-config.json

+      - name: Trigger developers.openai.com deploy
+        # Only trigger the deploy if the release is not a pre-release.
+        # The deploy is used to update the developers.openai.com website with the new config schema json file.
+        if: ${{ env.SIGN_MACOS == 'true' && !contains(steps.release_name.outputs.name, '-') }}
+        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
+
  # 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
@@ -1438,36 +1508,6 @@ jobs:
          packages-dir: dist/python-runtime
          skip-existing: true

-  deploy-dev-website:
-    name: Trigger developers.openai.com deploy
-    needs: release
-    # Only trigger the deploy for a stable signed release.
-    # The deploy updates developers.openai.com with the new config schema json file.
-    if: >-
-      ${{
-        !cancelled() &&
-        needs.release.result == 'success' &&
-        needs.release.outputs.sign_macos == 'true' &&
-        !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:
    name: winget
    needs: release
--- a/.github/workflows/rusty-v8-release.yml
+++ b/.github/workflows/rusty-v8-release.yml
@@ -152,9 +152,9 @@ jobs:
          python-version: "3.12"

      - name: Set up Rust toolchain for Cargo smoke
-        uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+        uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
-          toolchain: "1.95.0"
+          toolchain: "1.93.0"

      - name: Build Bazel V8 release pair
        env:
--- a/.github/workflows/v8-canary.yml
+++ b/.github/workflows/v8-canary.yml
@@ -166,9 +166,9 @@ jobs:
          python-version: "3.12"

      - name: Set up Rust toolchain for Cargo smoke
-        uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+        uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
-          toolchain: "1.95.0"
+          toolchain: "1.93.0"

      - name: Build Bazel V8 release pair
        env:
@@ -310,9 +310,9 @@ jobs:
          architecture: x64

      - name: Set up Codex Rust toolchain for Cargo smoke
-        uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+        uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
        with:
-          toolchain: "1.95.0"
+          toolchain: "1.93.0"
          targets: ${{ matrix.target }}

      - name: Install rusty_v8 Rust toolchain
@@ -401,7 +401,7 @@ jobs:
            cd codex-rs
            RUSTY_V8_ARCHIVE="${GITHUB_WORKSPACE}/${archive}" \
            RUSTY_V8_SRC_BINDING_PATH="${GITHUB_WORKSPACE}/${binding}" \
-            cargo +1.95.0 test -p codex-v8-poc --target "${TARGET}" --features sandbox --no-run
+            cargo +1.93.0 test -p codex-v8-poc --target "${TARGET}" --features sandbox --no-run
          )

      - name: Upload staged artifacts
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,5 @@
 {
    "recommendations": [
-        "BazelBuild.vscode-bazel",
        "rust-lang.rust-analyzer",
        "charliermarsh.ruff",
        "tamasfe.even-better-toml",
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -30,7 +30,6 @@ In the codex-rs folder where the rust code lives:
 - Prefer private modules and explicitly exported public crate API.
 - If you change `ConfigToml` or nested config types, run `just write-config-schema` to update `codex-rs/core/config.schema.json`.
 - When working with MCP tool calls, prefer using `codex-rs/codex-mcp/src/mcp_connection_manager.rs` to handle mutation of tools and tool calls. Aim to minimize the footprint of changes and leverage existing abstractions rather than plumbing code through multiple levels of function calls.
- Do not call `reset_client_session` unnecessarily; let the incremental check logic decide whether to reuse the previous request.
 - If you change Rust dependencies (`Cargo.toml` or `Cargo.lock`), run `just bazel-lock-update` from the
  repo root to refresh `MODULE.bazel.lock`, and include that lockfile update in the same change.
 - After dependency changes, run `just bazel-lock-check` from the repo root so lockfile drift is caught
@@ -53,13 +52,12 @@ In the codex-rs folder where the rust code lives:
    the new implementation so the invariants stay close to the code that owns them.
  - Avoid adding new standalone methods to `codex-rs/tui/src/chatwidget.rs` unless the change is
    trivial; prefer new modules/files and keep `chatwidget.rs` focused on orchestration.
- When running Rust commands (e.g. `just fix` or `just test`) be patient with the command and never try to kill them using the PID. Rust lock can make the execution slow, this is expected.
+- When running Rust commands (e.g. `just fix` or `cargo test`) be patient with the command and never try to kill them using the PID. Rust lock can make the execution slow, this is expected.

 Run `just fmt` (in `codex-rs` directory) automatically after you have finished making Rust code changes; do not ask for approval to run it. Additionally, run the tests:

-1. Do not run `cargo test` directly. Use `just test` so test execution follows the repo defaults.
-2. Run the test for the specific project that was changed. For example, if changes were made in `codex-rs/tui`, run `just test -p codex-tui`.
-3. Once those pass, if any changes were made in common, core, or protocol, run the complete test suite with `just test`. Avoid `--all-features` for routine local runs because it expands the build matrix and can significantly increase `target/` disk usage; use it only when you specifically need full feature coverage. project-specific or individual tests can be run without asking the user, but do ask the user before running the complete test suite.
+1. Run the test for the specific project that was changed. For example, if changes were made in `codex-rs/tui`, run `cargo test -p codex-tui`.
+2. Once those pass, if any changes were made in common, core, or protocol, run the complete test suite with `cargo test` (or `just test` if `cargo-nextest` is installed). Avoid `--all-features` for routine local runs because it expands the build matrix and can significantly increase `target/` disk usage; use it only when you specifically need full feature coverage. project-specific or individual tests can be run without asking the user, but do ask the user before running the complete test suite.

 Before finalizing a large change to `codex-rs`, run `just fix -p <project>` (in `codex-rs` directory) to fix any linter issues in the code. Prefer scoping with `-p` to avoid slow workspace‑wide Clippy builds; only run `just fix` without `-p` if you changed shared crates. Do not re-run tests after running `fix` or `fmt`.

@@ -122,7 +120,7 @@ is easy to review and future diffs stay visual.
 When UI or text output changes intentionally, update the snapshots as follows:

 - Run tests to generate any updated snapshots:
-  - `just test -p codex-tui`
+  - `cargo test -p codex-tui`
 - Check what’s pending:
  - `cargo insta pending-snapshots -p codex-tui`
 - Review changes by reading the generated `*.snap.new` files directly in the repo, or preview a specific file:
@@ -216,6 +214,6 @@ These guidelines apply to app-server protocol work in `codex-rs`, especially:
 - Regenerate schema fixtures when API shapes change:
  `just write-app-server-schema`
  (and `just write-app-server-schema --experimental` when experimental API fixtures are affected).
- Validate with `just test -p codex-app-server-protocol`.
+- Validate with `cargo test -p codex-app-server-protocol`.
 - Avoid boilerplate tests that only assert experimental field markers for individual
  request fields in `common.rs`; rely on schema generation/tests and behavioral coverage instead.
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -163,7 +163,7 @@ use_repo(nightly_rust, "rust_toolchains")
 toolchains = use_extension("@rules_rs//rs/experimental/toolchains:module_extension.bzl", "toolchains")
 toolchains.toolchain(
    edition = "2024",
-    version = "1.95.0",
+    version = "1.93.0",
 )
 use_repo(toolchains, "default_rust_toolchains")

--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<p align="center"><code>npm i -g @openai/codex</code><br />or <code>brew install --cask codex</code></p>
 <p align="center"><strong>Codex CLI</strong> is a coding agent from OpenAI that runs locally on your computer.
 <p align="center">
  <img src="https://github.com/openai/codex/blob/main/.github/codex-cli-splash.png" alt="Codex CLI splash" width="80%" />
@@ -13,19 +14,7 @@ If you want Codex in your code editor (VS Code, Cursor, Windsurf), <a href="http

 ### Installing and running Codex CLI

-Run the following on Mac or Linux to install Codex CLI:
-
-```shell
-curl -fsSL https://chatgpt.com/codex/install.sh | sh
-```
-
-Run the following on Windows to install Codex CLI:
-
-```
-powershell -ExecutionPolicy ByPass -c "irm https://chatgpt.com/codex/install.ps1 | iex"
-```
-
-Codex CLI can also be installed via the following package managers:
+Install globally with your preferred package manager:

 ```shell
 # Install using npm
--- a/codex-rs/.github/workflows/cargo-audit.yml
+++ b/codex-rs/.github/workflows/cargo-audit.yml
@@ -17,7 +17,7 @@ jobs:
        working-directory: codex-rs
    steps:
      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
+      - uses: dtolnay/rust-toolchain@a0b273b48ed29de4470960879e8381ff45632f26 # 1.93.0
      - name: Install cargo-audit
        uses: taiki-e/install-action@v2
        with:
--- a/codex-rs/Cargo.lock
+++ b/codex-rs/Cargo.lock
--- a/codex-rs/Cargo.toml
+++ b/codex-rs/Cargo.toml
@@ -14,6 +14,7 @@ members = [
    "app-server-client",
    "app-server-protocol",
    "app-server-test-client",
+    "debug-client",
    "apply-patch",
    "arg0",
    "feedback",
@@ -46,9 +47,7 @@ members = [
    "ext/extension-api",
    "ext/goal",
    "ext/guardian",
-    "ext/image-generation",
    "ext/memories",
-    "ext/web-search",
    "external-agent-migration",
    "external-agent-sessions",
    "keyring-store",
@@ -59,6 +58,7 @@ members = [
    "login",
    "codex-mcp",
    "mcp-server",
+    "memories/mcp",
    "memories/read",
    "memories/write",
    "model-provider-info",
@@ -165,7 +165,6 @@ codex-execpolicy = { path = "execpolicy" }
 codex-extension-api = { path = "ext/extension-api" }
 codex-goal-extension = { path = "ext/goal" }
 codex-guardian = { path = "ext/guardian" }
-codex-image-generation-extension = { path = "ext/image-generation" }
 codex-external-agent-migration = { path = "external-agent-migration" }
 codex-external-agent-sessions = { path = "external-agent-sessions" }
 codex-experimental-api-macros = { path = "codex-experimental-api-macros" }
@@ -182,7 +181,6 @@ codex-lmstudio = { path = "lmstudio" }
 codex-login = { path = "login" }
 codex-message-history = { path = "message-history" }
 codex-memories-extension = { path = "ext/memories" }
-codex-web-search-extension = { path = "ext/web-search" }
 codex-memories-read = { path = "memories/read" }
 codex-memories-write = { path = "memories/write" }
 codex-mcp = { path = "codex-mcp" }
@@ -277,7 +275,6 @@ deno_core_icudata = "0.77.0"
 derive_more = "2"
 diffy = "0.4.2"
 dirs = "6"
-divan = "0.1.21"
 dns-lookup = "3.0.1"
 dotenvy = "0.15.7"
 dunce = "1.0.4"
@@ -343,7 +340,7 @@ rcgen = { version = "0.14.7", default-features = false, features = [
 regex = "1.12.3"
 regex-lite = "0.1.8"
 reqwest = { version = "0.12", features = ["cookies"] }
-rmcp = { version = "1.7.0", default-features = false }
+rmcp = { version = "0.15.0", default-features = false }
 runfiles = { git = "https://github.com/dzbarsky/rules_rust", rev = "b56cbaa8465e74127f1ea216f813cd377295ad81" }
 rustls = { version = "0.23", default-features = false, features = [
    "ring",
@@ -367,14 +364,13 @@ sha2 = "0.10"
 shlex = "1.3.0"
 similar = "2.7.0"
 socket2 = "0.6.1"
-sqlx = { version = "0.9.0", default-features = false, features = [
+sqlx = { version = "0.8.6", default-features = false, features = [
    "chrono",
    "json",
    "macros",
    "migrate",
-    "runtime-tokio",
-    "tls-rustls",
-    "sqlite-bundled",
+    "runtime-tokio-rustls",
+    "sqlite",
    "time",
    "uuid",
 ] }
--- a/codex-rs/README.md
+++ b/codex-rs/README.md
@@ -55,20 +55,25 @@ Use `codex exec --ephemeral ...` to run without persisting session rollout files

 ### Experimenting with the Codex Sandbox

-To test to see what happens when a command is run under the sandbox provided by Codex, use the `sandbox` subcommand in Codex CLI:
+To test to see what happens when a command is run under the sandbox provided by Codex, we provide the following subcommands in Codex CLI:

 ```
-# Uses the sandbox implementation for the current host OS:
-# Seatbelt on macOS, the Linux sandbox on Linux, and Windows restricted token on Windows.
-codex sandbox [COMMAND]...
+# macOS
+codex sandbox macos [--log-denials] [COMMAND]...

-# macOS-only diagnostic option
-codex sandbox --log-denials [COMMAND]...
+# Linux
+codex sandbox linux [COMMAND]...
+
+# Windows
+codex sandbox windows [COMMAND]...
+
+# Legacy aliases
+codex debug seatbelt [--log-denials] [COMMAND]...
+codex debug landlock [COMMAND]...
 ```

-`codex sandbox` also accepts `--profile NAME` (`-p NAME`) to layer
-`$CODEX_HOME/NAME.config.toml` onto the base user config for the sandboxed
-command.
+To try a writable legacy sandbox mode with these commands, pass an explicit config override such
+as `-c 'sandbox_mode="workspace-write"'`.

 ### Selecting a sandbox policy via `--sandbox`

@@ -85,6 +90,7 @@ codex --sandbox workspace-write
 codex --sandbox danger-full-access
 ```

+The same setting can be persisted in `~/.codex/config.toml` via the top-level `sandbox_mode = "MODE"` key, e.g. `sandbox_mode = "workspace-write"`.
 In `workspace-write`, Codex also includes `~/.codex/memories` in its writable roots so memory maintenance does not require an extra approval.

 ## Code Organization
--- a/codex-rs/analytics/src/analytics_client_tests.rs
+++ b/codex-rs/analytics/src/analytics_client_tests.rs
@@ -122,7 +122,6 @@ use codex_app_server_protocol::TurnStartedNotification;
 use codex_app_server_protocol::TurnStatus as AppServerTurnStatus;
 use codex_app_server_protocol::TurnSteerParams;
 use codex_app_server_protocol::TurnSteerResponse;
-use codex_app_server_protocol::TurnSubmissionParams;
 use codex_app_server_protocol::UserInput;
 use codex_login::default_client::DEFAULT_ORIGINATOR;
 use codex_login::default_client::originator;
@@ -264,7 +263,6 @@ fn sample_thread_resume_response_with_source(
        sandbox: AppServerSandboxPolicy::DangerFullAccess,
        active_permission_profile: None,
        reasoning_effort: None,
-        initial_turns_page: None,
    })
 }

@@ -273,20 +271,16 @@ fn sample_turn_start_request(thread_id: &str, request_id: i64) -> ClientRequest
        request_id: RequestId::Integer(request_id),
        params: TurnStartParams {
            thread_id: thread_id.to_string(),
-            client_user_message_id: None,
-            submission: TurnSubmissionParams {
-                input: vec![
-                    UserInput::Text {
-                        text: "hello".to_string(),
-                        text_elements: vec![],
-                    },
-                    UserInput::Image {
-                        url: "https://example.com/a.png".to_string(),
-                        detail: None,
-                    },
-                ],
-                ..Default::default()
-            },
+            input: vec![
+                UserInput::Text {
+                    text: "hello".to_string(),
+                    text_elements: vec![],
+                },
+                UserInput::Image {
+                    url: "https://example.com/a.png".to_string(),
+                    detail: None,
+                },
+            ],
            ..Default::default()
        },
    }
@@ -396,7 +390,6 @@ fn sample_turn_steer_request(
        params: TurnSteerParams {
            thread_id: thread_id.to_string(),
            expected_turn_id: expected_turn_id.to_string(),
-            client_user_message_id: None,
            input: vec![
                UserInput::Text {
                    text: "more".to_string(),
@@ -408,7 +401,6 @@ fn sample_turn_steer_request(
                },
            ],
            responsesapi_client_metadata: None,
-            additional_context: None,
        },
    }
 }
@@ -1220,7 +1212,6 @@ fn compaction_event_serializes_expected_shape() {
                completed_at: 106,
                duration_ms: Some(6543),
            },
-            "session-thread-1".to_string(),
            sample_app_server_client_metadata(),
            sample_runtime_metadata(),
            Some(ThreadSource::User),
@@ -1237,7 +1228,6 @@ fn compaction_event_serializes_expected_shape() {
            "event_type": "codex_compaction_event",
            "event_params": {
                "thread_id": "thread-1",
-                "session_id": "session-thread-1",
                "turn_id": "turn-1",
                "app_server_client": {
                    "product_client_id": DEFAULT_ORIGINATOR,
@@ -1272,14 +1262,6 @@ fn compaction_event_serializes_expected_shape() {
    );
 }

-#[test]
-fn compaction_implementation_serializes_remote_v2() {
-    let payload = serde_json::to_value(CompactionImplementation::ResponsesCompactionV2)
-        .expect("serialize compaction implementation");
-
-    assert_eq!(payload, json!("responses_compaction_v2"));
-}
-
 #[test]
 fn app_used_dedupe_is_keyed_by_turn_and_connector() {
    let (sender, _receiver) = mpsc::channel(1);
@@ -1316,7 +1298,6 @@ fn thread_initialized_event_serializes_expected_shape() {
        event_type: "codex_thread_initialized",
        event_params: ThreadInitializedEventParams {
            thread_id: "thread-0".to_string(),
-            session_id: "session-thread-0".to_string(),
            app_server_client: CodexAppServerClientMetadata {
                product_client_id: DEFAULT_ORIGINATOR.to_string(),
                client_name: Some("codex-tui".to_string()),
@@ -1348,7 +1329,6 @@ fn thread_initialized_event_serializes_expected_shape() {
            "event_type": "codex_thread_initialized",
            "event_params": {
                "thread_id": "thread-0",
-                "session_id": "session-thread-0",
                "app_server_client": {
                    "product_client_id": DEFAULT_ORIGINATOR,
                    "client_name": "codex-tui",
@@ -1616,7 +1596,6 @@ async fn initialize_caches_client_and_thread_lifecycle_publishes_once_initialize
    let payload = serde_json::to_value(&events).expect("serialize events");
    assert_eq!(payload.as_array().expect("events array").len(), 1);
    assert_eq!(payload[0]["event_type"], "codex_thread_initialized");
-    assert_eq!(payload[0]["event_params"]["session_id"], "session-thread-1");
    assert_eq!(
        payload[0]["event_params"]["app_server_client"]["product_client_id"],
        DEFAULT_ORIGINATOR
@@ -1793,7 +1772,6 @@ async fn compaction_event_ingests_custom_fact() {
    let payload = serde_json::to_value(&events).expect("serialize events");
    assert_eq!(payload.as_array().expect("events array").len(), 1);
    assert_eq!(payload[0]["event_type"], "codex_compaction_event");
-    assert_eq!(payload[0]["event_params"]["session_id"], "session-thread-1");
    assert_eq!(payload[0]["event_params"]["thread_id"], "thread-1");
    assert_eq!(payload[0]["event_params"]["turn_id"], "turn-compact");
    assert_eq!(
@@ -1918,10 +1896,6 @@ async fn guardian_review_event_ingests_custom_fact_with_optional_target_item() {
    let payload = serde_json::to_value(&events).expect("serialize events");
    assert_eq!(payload.as_array().expect("events array").len(), 1);
    assert_eq!(payload[0]["event_type"], "codex_guardian_review");
-    assert_eq!(
-        payload[0]["event_params"]["session_id"],
-        "session-thread-guardian"
-    );
    assert_eq!(payload[0]["event_params"]["thread_id"], "thread-guardian");
    assert_eq!(payload[0]["event_params"]["turn_id"], "turn-guardian");
    assert_eq!(payload[0]["event_params"]["review_id"], "review-guardian");
@@ -2414,7 +2388,6 @@ async fn item_review_summaries_do_not_cross_threads_with_reused_item_ids() {
 fn subagent_thread_started_review_serializes_expected_shape() {
    let event = TrackEventRequest::ThreadInitialized(subagent_thread_started_event_request(
        SubAgentThreadStartedInput {
-            session_id: "session-root".to_string(),
            thread_id: "thread-review".to_string(),
            parent_thread_id: None,
            product_client_id: "codex-tui".to_string(),
@@ -2458,7 +2431,6 @@ fn subagent_thread_started_thread_spawn_serializes_parent_thread_id() {
            .expect("valid thread id");
    let event = TrackEventRequest::ThreadInitialized(subagent_thread_started_event_request(
        SubAgentThreadStartedInput {
-            session_id: "session-root".to_string(),
            thread_id: "thread-spawn".to_string(),
            parent_thread_id: None,
            product_client_id: "codex-tui".to_string(),
@@ -2478,21 +2450,18 @@ fn subagent_thread_started_thread_spawn_serializes_parent_thread_id() {
    ));

    let payload = serde_json::to_value(&event).expect("serialize thread spawn subagent event");
-    assert_eq!(payload["event_params"]["thread_id"], "thread-spawn");
    assert_eq!(payload["event_params"]["thread_source"], "subagent");
    assert_eq!(payload["event_params"]["subagent_source"], "thread_spawn");
    assert_eq!(
        payload["event_params"]["parent_thread_id"],
        "11111111-1111-1111-1111-111111111111"
    );
-    assert_eq!(payload["event_params"]["session_id"], "session-root");
 }

 #[test]
 fn subagent_thread_started_memory_consolidation_serializes_expected_shape() {
    let event = TrackEventRequest::ThreadInitialized(subagent_thread_started_event_request(
        SubAgentThreadStartedInput {
-            session_id: "session-root".to_string(),
            thread_id: "thread-memory".to_string(),
            parent_thread_id: None,
            product_client_id: "codex-tui".to_string(),
@@ -2518,7 +2487,6 @@ fn subagent_thread_started_memory_consolidation_serializes_expected_shape() {
 fn subagent_thread_started_other_serializes_expected_shape() {
    let event = TrackEventRequest::ThreadInitialized(subagent_thread_started_event_request(
        SubAgentThreadStartedInput {
-            session_id: "session-root".to_string(),
            thread_id: "thread-guardian".to_string(),
            parent_thread_id: None,
            product_client_id: "codex-tui".to_string(),
@@ -2540,7 +2508,6 @@ fn subagent_thread_started_other_serializes_expected_shape() {
 fn subagent_thread_started_other_serializes_explicit_parent_thread_id() {
    let event = TrackEventRequest::ThreadInitialized(subagent_thread_started_event_request(
        SubAgentThreadStartedInput {
-            session_id: "session-root".to_string(),
            thread_id: "thread-guardian".to_string(),
            parent_thread_id: Some("parent-thread-guardian".to_string()),
            product_client_id: "codex-tui".to_string(),
@@ -2570,7 +2537,6 @@ async fn subagent_thread_started_publishes_without_initialize() {
        .ingest(
            AnalyticsFact::Custom(CustomAnalyticsFact::SubAgentThreadStarted(
                SubAgentThreadStartedInput {
-                    session_id: "session-root".to_string(),
                    thread_id: "thread-review".to_string(),
                    parent_thread_id: None,
                    product_client_id: "codex-tui".to_string(),
@@ -2644,7 +2610,6 @@ async fn subagent_thread_started_inherits_parent_connection_for_new_thread() {
        .ingest(
            AnalyticsFact::Custom(CustomAnalyticsFact::SubAgentThreadStarted(
                SubAgentThreadStartedInput {
-                    session_id: "session-root".to_string(),
                    thread_id: "thread-review".to_string(),
                    parent_thread_id: None,
                    product_client_id: "parent-client".to_string(),
@@ -2692,8 +2657,6 @@ async fn subagent_thread_started_inherits_parent_connection_for_new_thread() {
        .await;

    let payload = serde_json::to_value(&events).expect("serialize events");
-    assert_eq!(payload[0]["event_params"]["session_id"], "session-root");
-    assert_eq!(payload[0]["event_params"]["thread_id"], "thread-review");
    assert_eq!(
        payload[0]["event_params"]["app_server_client"]["product_client_id"],
        "parent-client"
@@ -2714,7 +2677,6 @@ async fn subagent_tool_items_inherit_parent_connection_metadata() {
        .ingest(
            AnalyticsFact::Custom(CustomAnalyticsFact::SubAgentThreadStarted(
                SubAgentThreadStartedInput {
-                    session_id: "session-root".to_string(),
                    thread_id: "thread-subagent".to_string(),
                    parent_thread_id: Some("thread-1".to_string()),
                    product_client_id: "codex-tui".to_string(),
@@ -3220,7 +3182,6 @@ fn turn_event_serializes_expected_shape() {
        event_type: "codex_turn_event",
        event_params: crate::events::CodexTurnEventParams {
            thread_id: "thread-2".to_string(),
-            session_id: "session-thread-2".to_string(),
            turn_id: "turn-2".to_string(),
            app_server_client: sample_app_server_client_metadata(),
            runtime: sample_runtime_metadata(),
@@ -3271,7 +3232,6 @@ fn turn_event_serializes_expected_shape() {
            "event_type": "codex_turn_event",
            "event_params": {
                "thread_id": "thread-2",
-                "session_id": "session-thread-2",
                "turn_id": "turn-2",
                "submission_type": null,
                "app_server_client": {
@@ -3373,10 +3333,6 @@ async fn accepted_turn_steer_emits_expected_event() {
    let payload = serde_json::to_value(&out[0]).expect("serialize turn steer event");
    assert_eq!(payload["event_type"], json!("codex_turn_steer_event"));
    assert_eq!(payload["event_params"]["thread_id"], json!("thread-2"));
-    assert_eq!(
-        payload["event_params"]["session_id"],
-        json!("session-thread-2")
-    );
    assert_eq!(payload["event_params"]["expected_turn_id"], json!("turn-2"));
    assert_eq!(payload["event_params"]["accepted_turn_id"], json!("turn-2"));
    assert_eq!(payload["event_params"]["num_input_images"], json!(1));
@@ -3594,10 +3550,6 @@ async fn turn_lifecycle_emits_turn_event() {
    let payload = serde_json::to_value(&out[0]).expect("serialize turn event");
    assert_eq!(payload["event_type"], json!("codex_turn_event"));
    assert_eq!(payload["event_params"]["thread_id"], json!("thread-2"));
-    assert_eq!(
-        payload["event_params"]["session_id"],
-        json!("session-thread-2")
-    );
    assert_eq!(payload["event_params"]["turn_id"], json!("turn-2"));
    assert_eq!(
        payload["event_params"]["app_server_client"],
--- a/codex-rs/analytics/src/client_tests.rs
+++ b/codex-rs/analytics/src/client_tests.rs
@@ -89,7 +89,7 @@ fn sample_turn_start_request() -> ClientRequest {
        request_id: RequestId::Integer(1),
        params: TurnStartParams {
            thread_id: "thread-1".to_string(),
-            client_user_message_id: None,
+            input: Vec::new(),
            ..Default::default()
        },
    }
@@ -101,10 +101,8 @@ fn sample_turn_steer_request() -> ClientRequest {
        params: TurnSteerParams {
            thread_id: "thread-1".to_string(),
            expected_turn_id: "turn-1".to_string(),
-            client_user_message_id: None,
            input: Vec::new(),
            responsesapi_client_metadata: None,
-            additional_context: None,
        },
    }
 }
@@ -173,7 +171,6 @@ fn sample_thread_resume_response() -> ClientResponsePayload {
        sandbox: AppServerSandboxPolicy::DangerFullAccess,
        active_permission_profile: None,
        reasoning_effort: None,
-        initial_turns_page: None,
    })
 }

--- a/codex-rs/analytics/src/events.rs
+++ b/codex-rs/analytics/src/events.rs
@@ -147,7 +147,6 @@ pub(crate) struct CodexRuntimeMetadata {
 #[derive(Serialize)]
 pub(crate) struct ThreadInitializedEventParams {
    pub(crate) thread_id: String,
-    pub(crate) session_id: String,
    pub(crate) app_server_client: CodexAppServerClientMetadata,
    pub(crate) runtime: CodexRuntimeMetadata,
    pub(crate) model: String,
@@ -421,7 +420,6 @@ impl GuardianReviewAnalyticsResult {

 #[derive(Serialize)]
 pub(crate) struct GuardianReviewEventPayload {
-    pub(crate) session_id: String,
    pub(crate) app_server_client: CodexAppServerClientMetadata,
    pub(crate) runtime: CodexRuntimeMetadata,
    #[serde(flatten)]
@@ -740,7 +738,6 @@ pub(crate) struct CodexHookRunEventRequest {
 #[derive(Serialize)]
 pub(crate) struct CodexCompactionEventParams {
    pub(crate) thread_id: String,
-    pub(crate) session_id: String,
    pub(crate) turn_id: String,
    pub(crate) app_server_client: CodexAppServerClientMetadata,
    pub(crate) runtime: CodexRuntimeMetadata,
@@ -770,7 +767,6 @@ pub(crate) struct CodexCompactionEventRequest {
 #[derive(Serialize)]
 pub(crate) struct CodexTurnEventParams {
    pub(crate) thread_id: String,
-    pub(crate) session_id: String,
    pub(crate) turn_id: String,
    // TODO(rhan-oai): Populate once queued/default submission type is plumbed from
    // the turn/start callsites instead of always being reported as None.
@@ -825,7 +821,6 @@ pub(crate) struct CodexTurnEventRequest {
 #[derive(Serialize)]
 pub(crate) struct CodexTurnSteerEventParams {
    pub(crate) thread_id: String,
-    pub(crate) session_id: String,
    pub(crate) expected_turn_id: Option<String>,
    pub(crate) accepted_turn_id: Option<String>,
    pub(crate) app_server_client: CodexAppServerClientMetadata,
@@ -931,7 +926,6 @@ pub(crate) fn codex_plugin_metadata(plugin: PluginTelemetryMetadata) -> CodexPlu

 pub(crate) fn codex_compaction_event_params(
    input: CodexCompactionEvent,
-    session_id: String,
    app_server_client: CodexAppServerClientMetadata,
    runtime: CodexRuntimeMetadata,
    thread_source: Option<ThreadSource>,
@@ -940,7 +934,6 @@ pub(crate) fn codex_compaction_event_params(
 ) -> CodexCompactionEventParams {
    CodexCompactionEventParams {
        thread_id: input.thread_id,
-        session_id,
        turn_id: input.turn_id,
        app_server_client,
        runtime,
@@ -1033,7 +1026,6 @@ pub(crate) fn subagent_thread_started_event_request(
 ) -> ThreadInitializedEvent {
    let event_params = ThreadInitializedEventParams {
        thread_id: input.thread_id,
-        session_id: input.session_id,
        app_server_client: CodexAppServerClientMetadata {
            product_client_id: input.product_client_id,
            client_name: Some(input.client_name),
@@ -1069,9 +1061,12 @@ pub(crate) fn subagent_source_name(subagent_source: &SubAgentSource) -> String {
 }

 pub(crate) fn subagent_parent_thread_id(subagent_source: &SubAgentSource) -> Option<String> {
-    subagent_source
-        .parent_thread_id()
-        .map(|parent_thread_id| parent_thread_id.to_string())
+    match subagent_source {
+        SubAgentSource::ThreadSpawn {
+            parent_thread_id, ..
+        } => Some(parent_thread_id.to_string()),
+        _ => None,
+    }
 }

 fn analytics_hook_status(status: HookRunStatus) -> HookRunStatus {
--- a/codex-rs/analytics/src/facts.rs
+++ b/codex-rs/analytics/src/facts.rs
@@ -199,7 +199,6 @@ pub struct AppInvocation {

 #[derive(Clone)]
 pub struct SubAgentThreadStartedInput {
-    pub session_id: String,
    pub thread_id: String,
    pub parent_thread_id: Option<String>,
    pub product_client_id: String,
@@ -230,7 +229,6 @@ pub enum CompactionReason {
 #[serde(rename_all = "snake_case")]
 pub enum CompactionImplementation {
    Responses,
-    ResponsesCompactionV2,
    ResponsesCompact,
 }

--- a/codex-rs/analytics/src/reducer.rs
+++ b/codex-rs/analytics/src/reducer.rs
@@ -255,7 +255,6 @@ struct ItemReviewSummary {

 #[derive(Clone)]
 struct ThreadMetadataState {
-    session_id: String,
    thread_source: Option<ThreadSource>,
    initialization_mode: ThreadInitializationMode,
    subagent_source: Option<String>,
@@ -264,7 +263,6 @@ struct ThreadMetadataState {

 impl ThreadMetadataState {
    fn from_thread_metadata(
-        session_id: String,
        session_source: &SessionSource,
        thread_source: Option<ThreadSource>,
        initialization_mode: ThreadInitializationMode,
@@ -283,7 +281,6 @@ impl ThreadMetadataState {
            | SessionSource::Unknown => (None, None),
        };
        Self {
-            session_id,
            thread_source,
            initialization_mode,
            subagent_source,
@@ -528,7 +525,6 @@ impl AnalyticsReducer {
        thread_state
            .metadata
            .get_or_insert_with(|| ThreadMetadataState {
-                session_id: input.session_id.clone(),
                thread_source: Some(ThreadSource::Subagent),
                initialization_mode: ThreadInitializationMode::New,
                subagent_source: Some(subagent_source_name(&input.subagent_source)),
@@ -547,8 +543,8 @@ impl AnalyticsReducer {
        input: GuardianReviewEventParams,
        out: &mut Vec<TrackEventRequest>,
    ) {
-        let Some((connection_state, thread_metadata)) =
-            self.thread_context_or_warn(AnalyticsDropSite::guardian(&input))
+        let Some(connection_state) =
+            self.thread_connection_or_warn(AnalyticsDropSite::guardian(&input))
        else {
            return;
        };
@@ -556,7 +552,6 @@ impl AnalyticsReducer {
            GuardianReviewEventRequest {
                event_type: "codex_guardian_review",
                event_params: GuardianReviewEventPayload {
-                    session_id: thread_metadata.session_id.clone(),
                    app_server_client: connection_state.app_server_client.clone(),
                    runtime: connection_state.runtime.clone(),
                    guardian_review: input,
@@ -577,7 +572,7 @@ impl AnalyticsReducer {
                    (connection_id, request_id),
                    RequestState::TurnStart(PendingTurnStartState {
                        thread_id: params.thread_id,
-                        num_input_images: num_input_images(&params.submission.input),
+                        num_input_images: num_input_images(&params.input),
                    }),
                );
            }
@@ -1236,13 +1231,11 @@ impl AnalyticsReducer {
        out: &mut Vec<TrackEventRequest>,
    ) {
        let session_source: SessionSource = thread.source.into();
-        let session_id = thread.session_id;
        let thread_id = thread.id;
        let Some(connection_state) = self.connections.get(&connection_id) else {
            return;
        };
        let thread_metadata = ThreadMetadataState::from_thread_metadata(
-            session_id.clone(),
            &session_source,
            thread.thread_source.map(Into::into),
            initialization_mode,
@@ -1259,7 +1252,6 @@ impl AnalyticsReducer {
                event_type: "codex_thread_initialized",
                event_params: ThreadInitializedEventParams {
                    thread_id,
-                    session_id,
                    app_server_client: connection_state.app_server_client.clone(),
                    runtime: connection_state.runtime.clone(),
                    model,
@@ -1285,7 +1277,6 @@ impl AnalyticsReducer {
                event_type: "codex_compaction_event",
                event_params: codex_compaction_event_params(
                    input,
-                    thread_metadata.session_id.clone(),
                    connection_state.app_server_client.clone(),
                    connection_state.runtime.clone(),
                    thread_metadata.thread_source,
@@ -1388,7 +1379,6 @@ impl AnalyticsReducer {
            event_type: "codex_turn_steer_event",
            event_params: CodexTurnSteerEventParams {
                thread_id: pending_request.thread_id,
-                session_id: thread_metadata.session_id.clone(),
                expected_turn_id: Some(pending_request.expected_turn_id),
                accepted_turn_id,
                app_server_client: connection_state.app_server_client.clone(),
@@ -2457,7 +2447,6 @@ fn codex_turn_event_params(
    let token_usage = turn_state.token_usage.clone();
    CodexTurnEventParams {
        thread_id,
-        session_id: thread_metadata.session_id.clone(),
        turn_id,
        app_server_client,
        runtime,
--- a/codex-rs/app-server-client/src/lib.rs
+++ b/codex-rs/app-server-client/src/lib.rs
@@ -1122,9 +1122,7 @@ mod tests {
            websocket,
            JSONRPCMessage::Response(JSONRPCResponse {
                id: request.id,
-                result: serde_json::json!({
-                    "userAgent": "codex_cli_rs/9.8.7-test (Test OS; x86_64) rust",
-                }),
+                result: serde_json::json!({}),
            }),
        )
        .await;
@@ -1459,7 +1457,6 @@ mod tests {
            .await
            .expect("remote client should connect");

-        assert_eq!(client.server_version(), Some("9.8.7-test"));
        let response: GetAccountResponse = client
            .request_typed(ClientRequest::GetAccount {
                request_id: RequestId::Integer(1),
--- a/codex-rs/app-server-client/src/remote.rs
+++ b/codex-rs/app-server-client/src/remote.rs
@@ -150,7 +150,6 @@ pub struct RemoteAppServerClient {
    command_tx: mpsc::Sender<RemoteClientCommand>,
    event_rx: mpsc::UnboundedReceiver<AppServerEvent>,
    pending_events: VecDeque<AppServerEvent>,
-    server_version: Option<String>,
    worker_handle: tokio::task::JoinHandle<()>,
 }

@@ -181,10 +180,6 @@ impl RemoteAppServerClient {
        }
    }

-    pub fn server_version(&self) -> Option<&str> {
-        self.server_version.as_deref()
-    }
-
    async fn connect_with_stream<S>(
        channel_capacity: usize,
        endpoint: String,
@@ -195,7 +190,7 @@ impl RemoteAppServerClient {
        S: AsyncRead + AsyncWrite + Unpin + Send + 'static,
    {
        let mut stream = stream;
-        let (pending_events, server_version) = initialize_remote_connection(
+        let pending_events = initialize_remote_connection(
            &mut stream,
            &endpoint,
            initialize_params,
@@ -471,7 +466,6 @@ impl RemoteAppServerClient {
            command_tx,
            event_rx,
            pending_events: pending_events.into(),
-            server_version,
            worker_handle,
        })
    }
@@ -612,7 +606,6 @@ impl RemoteAppServerClient {
            command_tx,
            event_rx,
            pending_events: _pending_events,
-            server_version: _server_version,
            worker_handle,
        } = self;
        let mut worker_handle = worker_handle;
@@ -800,13 +793,12 @@ async fn initialize_remote_connection<S>(
    endpoint: &str,
    params: InitializeParams,
    initialize_timeout: Duration,
-) -> IoResult<(Vec<AppServerEvent>, Option<String>)>
+) -> IoResult<Vec<AppServerEvent>>
 where
    S: AsyncRead + AsyncWrite + Unpin,
 {
    let initialize_request_id = RequestId::String("initialize".to_string());
    let mut pending_events = Vec::new();
-    let mut server_version = None;
    write_jsonrpc_message(
        stream,
        JSONRPCMessage::Request(jsonrpc_request_from_client_request(
@@ -830,14 +822,6 @@ where
                    })?;
                    match message {
                        JSONRPCMessage::Response(response) if response.id == initialize_request_id => {
-                            server_version = response
-                                .result
-                                .get("userAgent")
-                                .and_then(serde_json::Value::as_str)
-                                .and_then(|user_agent| {
-                                    let (_, rest) = user_agent.split_once('/')?;
-                                    rest.split_whitespace().next().map(str::to_string)
-                                });
                            break Ok(());
                        }
                        JSONRPCMessage::Error(error) if error.id == initialize_request_id => {
@@ -929,7 +913,7 @@ where
    )
    .await?;

-    Ok((pending_events, server_version))
+    Ok(pending_events)
 }

 fn app_server_event_from_notification(notification: JSONRPCNotification) -> Option<AppServerEvent> {
@@ -1023,7 +1007,6 @@ mod tests {
            command_tx,
            event_rx,
            pending_events: VecDeque::new(),
-            server_version: None,
            worker_handle,
        };

--- a/codex-rs/app-server-daemon/src/lib.rs
+++ b/codex-rs/app-server-daemon/src/lib.rs
@@ -74,12 +74,6 @@ pub struct BootstrapOptions {
    pub remote_control_enabled: bool,
 }

-/// Passively probes an existing app-server socket and returns its reported
-/// app-server version.
-pub async fn probe_app_server_version(socket_path: &Path) -> Result<String> {
-    Ok(client::probe(socket_path).await?.app_server_version)
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub enum BootstrapStatus {
--- a/codex-rs/app-server-protocol/schema/json/ClientRequest.json
+++ b/codex-rs/app-server-protocol/schema/json/ClientRequest.json
@@ -12,28 +12,6 @@
      ],
      "type": "string"
    },
-    "AdditionalContextEntry": {
-      "properties": {
-        "kind": {
-          "$ref": "#/definitions/AdditionalContextKind"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "kind",
-        "value"
-      ],
-      "type": "object"
-    },
-    "AdditionalContextKind": {
-      "enum": [
-        "untrusted",
-        "application"
-      ],
-      "type": "string"
-    },
    "ApprovalsReviewer": {
      "description": "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
      "enum": [
@@ -445,6 +423,7 @@
          ]
        },
        "includeLayers": {
+          "default": false,
          "type": "boolean"
        }
      },
@@ -742,7 +721,8 @@
        }
      },
      "required": [
-        "classification"
+        "classification",
+        "includeLogs"
      ],
      "type": "object"
    },
@@ -1054,6 +1034,7 @@
    "GetAccountParams": {
      "properties": {
        "refreshToken": {
+          "default": false,
          "description": "When `true`, requests a proactive token refresh before returning.\n\nIn managed auth mode this triggers the normal refresh-token flow. In external auth mode this flag is ignored. Clients should refresh tokens themselves and call `account/login/start` with `chatgptAuthTokens`.",
          "type": "boolean"
        }
@@ -1085,8 +1066,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -1167,12 +1146,6 @@
            "integer",
            "null"
          ]
-        },
-        "threadId": {
-          "type": [
-            "string",
-            "null"
-          ]
        }
      },
      "type": "object"
@@ -2988,20 +2961,6 @@
      ],
      "type": "object"
    },
-    "SkillsExtraRootsSetParams": {
-      "properties": {
-        "extraRoots": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "extraRoots"
-      ],
-      "type": "object"
-    },
    "SkillsListParams": {
      "properties": {
        "cwds": {
@@ -3465,6 +3424,7 @@
    "ThreadReadParams": {
      "properties": {
        "includeTurns": {
+          "default": false,
          "description": "When true, include turns and their items from rollout history.",
          "type": "boolean"
        },
@@ -3557,42 +3517,6 @@
        }
      ]
    },
-    "ThreadResumeInitialTurnsPageParams": {
-      "properties": {
-        "itemsView": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "How much item detail to include for each returned turn; defaults to summary."
-        },
-        "limit": {
-          "description": "Optional turn page size.",
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "sortDirection": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/SortDirection"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional turn pagination direction; defaults to descending."
-        }
-      },
-      "type": "object"
-    },
    "ThreadResumeParams": {
      "description": "There are three ways to resume a thread: 1. By thread_id: load the thread from disk by thread_id and resume it. 2. By history: instantiate the thread from memory and resume it. 3. By path: load the thread from disk by path and resume it.\n\nFor non-running threads, the precedence is: history > non-empty path > thread_id. If using history or a non-empty path for a non-running thread, the thread_id param will be ignored.\n\nIf thread_id identifies a running thread, app-server rejoins that thread and treats a non-empty path as a consistency check against the active rollout path. Empty string path values are treated as absent.\n\nPrefer using thread_id whenever possible.",
      "properties": {
@@ -3999,12 +3923,6 @@
          ],
          "description": "Override where approval requests are routed for review on this turn and subsequent turns."
        },
-        "clientUserMessageId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
        "cwd": {
          "description": "Override the working directory for this turn and subsequent turns.",
          "type": [
@@ -4091,12 +4009,6 @@
    },
    "TurnSteerParams": {
      "properties": {
-        "clientUserMessageId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
        "expectedTurnId": {
          "description": "Required active turn id precondition. The request fails when it does not match the currently active turn.",
          "type": "string"
@@ -4118,23 +4030,6 @@
      ],
      "type": "object"
    },
-    "TurnSubmissionParams": {
-      "properties": {
-        "input": {
-          "items": {
-            "$ref": "#/definitions/UserInput"
-          },
-          "type": "array"
-        },
-        "outputSchema": {
-          "description": "Optional JSON Schema used to constrain the final assistant message for this turn."
-        }
-      },
-      "required": [
-        "input"
-      ],
-      "type": "object"
-    },
    "UserInput": {
      "oneOf": [
        {
@@ -4814,30 +4709,6 @@
      "title": "Skills/listRequest",
      "type": "object"
    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "skills/extraRoots/set"
-          ],
-          "title": "Skills/extraRoots/setRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/SkillsExtraRootsSetParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Skills/extraRoots/setRequest",
-      "type": "object"
-    },
    {
      "properties": {
        "id": {
--- a/codex-rs/app-server-protocol/schema/json/ServerNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/ServerNotification.json
@@ -84,28 +84,6 @@
      ],
      "type": "object"
    },
-    "AdditionalContextEntry": {
-      "properties": {
-        "kind": {
-          "$ref": "#/definitions/AdditionalContextKind"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "kind",
-        "value"
-      ],
-      "type": "object"
-    },
-    "AdditionalContextKind": {
-      "enum": [
-        "untrusted",
-        "application"
-      ],
-      "type": "string"
-    },
    "AdditionalFileSystemPermissions": {
      "properties": {
        "entries": {
@@ -2053,8 +2031,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -2676,65 +2652,6 @@
        }
      ]
    },
-    "QueuedTurn": {
-      "properties": {
-        "id": {
-          "type": "string"
-        },
-        "status": {
-          "$ref": "#/definitions/QueuedTurnStatus"
-        },
-        "submission": {
-          "$ref": "#/definitions/TurnSubmission"
-        }
-      },
-      "required": [
-        "id",
-        "status",
-        "submission"
-      ],
-      "type": "object"
-    },
-    "QueuedTurnStatus": {
-      "oneOf": [
-        {
-          "properties": {
-            "type": {
-              "enum": [
-                "pending"
-              ],
-              "title": "PendingQueuedTurnStatusType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "PendingQueuedTurnStatus",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "error": {
-              "$ref": "#/definitions/TurnError"
-            },
-            "type": {
-              "enum": [
-                "failed"
-              ],
-              "title": "FailedQueuedTurnStatusType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "error",
-            "type"
-          ],
-          "title": "FailedQueuedTurnStatus",
-          "type": "object"
-        }
-      ]
-    },
    "RateLimitReachedType": {
      "enum": [
        "rate_limit_reached",
@@ -3642,12 +3559,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
@@ -4327,30 +4238,6 @@
      ],
      "type": "object"
    },
-    "ThreadQueueChangedNotification": {
-      "properties": {
-        "dispatchingQueuedTurnId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "queuedTurns": {
-          "items": {
-            "$ref": "#/definitions/QueuedTurn"
-          },
-          "type": "array"
-        },
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "queuedTurns",
-        "threadId"
-      ],
-      "type": "object"
-    },
    "ThreadRealtimeAudioChunk": {
      "description": "EXPERIMENTAL - thread realtime audio chunk.",
      "properties": {
@@ -4583,16 +4470,6 @@
            }
          ]
        },
-        "runtimeWorkspaceRoots": {
-          "default": null,
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
        "sandboxPolicy": {
          "$ref": "#/definitions/SandboxPolicy"
        },
@@ -4934,21 +4811,6 @@
      ],
      "type": "object"
    },
-    "TurnEnvironmentParams": {
-      "properties": {
-        "cwd": {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        },
-        "environmentId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "cwd",
-        "environmentId"
-      ],
-      "type": "object"
-    },
    "TurnError": {
      "properties": {
        "additionalDetails": {
@@ -5077,23 +4939,6 @@
      ],
      "type": "string"
    },
-    "TurnSubmission": {
-      "properties": {
-        "input": {
-          "items": {
-            "$ref": "#/definitions/UserInput"
-          },
-          "type": "array"
-        },
-        "outputSchema": {
-          "description": "Optional JSON Schema used to constrain the final assistant message for this turn."
-        }
-      },
-      "required": [
-        "input"
-      ],
-      "type": "object"
-    },
    "UserInput": {
      "oneOf": [
        {
@@ -5632,26 +5477,6 @@
      "title": "Thread/settings/updatedNotification",
      "type": "object"
    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "thread/queue/changed"
-          ],
-          "title": "Thread/queue/changedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadQueueChangedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Thread/queue/changedNotification",
-      "type": "object"
-    },
    {
      "properties": {
        "method": {
@@ -6721,4 +6546,4 @@
    }
  ],
  "title": "ServerNotification"
-}
+}
--- 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
@@ -709,30 +709,6 @@
          "title": "Skills/listRequest",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "$ref": "#/definitions/v2/RequestId"
-            },
-            "method": {
-              "enum": [
-                "skills/extraRoots/set"
-              ],
-              "title": "Skills/extraRoots/setRequestMethod",
-              "type": "string"
-            },
-            "params": {
-              "$ref": "#/definitions/v2/SkillsExtraRootsSetParams"
-            }
-          },
-          "required": [
-            "id",
-            "method",
-            "params"
-          ],
-          "title": "Skills/extraRoots/setRequest",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
@@ -4171,26 +4147,6 @@
          "title": "Thread/settings/updatedNotification",
          "type": "object"
        },
-        {
-          "properties": {
-            "method": {
-              "enum": [
-                "thread/queue/changed"
-              ],
-              "title": "Thread/queue/changedNotificationMethod",
-              "type": "string"
-            },
-            "params": {
-              "$ref": "#/definitions/v2/ThreadQueueChangedNotification"
-            }
-          },
-          "required": [
-            "method",
-            "params"
-          ],
-          "title": "Thread/queue/changedNotification",
-          "type": "object"
-        },
        {
          "properties": {
            "method": {
@@ -5812,28 +5768,6 @@
        ],
        "type": "string"
      },
-      "AdditionalContextEntry": {
-        "properties": {
-          "kind": {
-            "$ref": "#/definitions/v2/AdditionalContextKind"
-          },
-          "value": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "kind",
-          "value"
-        ],
-        "type": "object"
-      },
-      "AdditionalContextKind": {
-        "enum": [
-          "untrusted",
-          "application"
-        ],
-        "type": "string"
-      },
      "AdditionalFileSystemPermissions": {
        "properties": {
          "entries": {
@@ -7427,6 +7361,19 @@
              }
            ]
          },
+          "profile": {
+            "type": [
+              "string",
+              "null"
+            ]
+          },
+          "profiles": {
+            "additionalProperties": {
+              "$ref": "#/definitions/v2/ProfileV2"
+            },
+            "default": {},
+            "type": "object"
+          },
          "review_model": {
            "type": [
              "string",
@@ -7744,6 +7691,7 @@
            ]
          },
          "includeLayers": {
+            "default": false,
            "type": "boolean"
          }
        },
@@ -7781,12 +7729,6 @@
      },
      "ConfigRequirements": {
        "properties": {
-          "allowAppshots": {
-            "type": [
-              "boolean",
-              "null"
-            ]
-          },
          "allowManagedHooksOnly": {
            "type": [
              "boolean",
@@ -8651,7 +8593,8 @@
          }
        },
        "required": [
-          "classification"
+          "classification",
+          "includeLogs"
        ],
        "title": "FeedbackUploadParams",
        "type": "object"
@@ -9427,6 +9370,7 @@
        "$schema": "http://json-schema.org/draft-07/schema#",
        "properties": {
          "refreshToken": {
+            "default": false,
            "description": "When `true`, requests a proactive token refresh before returning.\n\nIn managed auth mode this triggers the normal refresh-token flow. In external auth mode this flag is ignored. Clients should refresh tokens themselves and call `account/login/start` with `chatgptAuthTokens`.",
            "type": "boolean"
          }
@@ -10204,8 +10148,6 @@
      },
      "ImageDetail": {
        "enum": [
-          "auto",
-          "low",
          "high",
          "original"
        ],
@@ -10411,12 +10353,6 @@
              "integer",
              "null"
            ]
-          },
-          "threadId": {
-            "type": [
-              "string",
-              "null"
-            ]
          }
        },
        "title": "ListMcpServerStatusParams",
@@ -11008,47 +10944,6 @@
        "title": "McpResourceReadResponse",
        "type": "object"
      },
-      "McpServerInfo": {
-        "description": "Presentation metadata advertised by an initialized MCP server.",
-        "properties": {
-          "description": {
-            "type": [
-              "string",
-              "null"
-            ]
-          },
-          "icons": {
-            "items": true,
-            "type": [
-              "array",
-              "null"
-            ]
-          },
-          "name": {
-            "type": "string"
-          },
-          "title": {
-            "type": [
-              "string",
-              "null"
-            ]
-          },
-          "version": {
-            "type": "string"
-          },
-          "websiteUrl": {
-            "type": [
-              "string",
-              "null"
-            ]
-          }
-        },
-        "required": [
-          "name",
-          "version"
-        ],
-        "type": "object"
-      },
      "McpServerMigration": {
        "properties": {
          "name": {
@@ -11159,16 +11054,6 @@
            },
            "type": "array"
          },
-          "serverInfo": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/v2/McpServerInfo"
-              },
-              {
-                "type": "null"
-              }
-            ]
-          },
          "tools": {
            "additionalProperties": {
              "$ref": "#/definitions/v2/Tool"
@@ -11889,7 +11774,7 @@
      "NetworkUnixSocketPermission": {
        "enum": [
          "allow",
-          "deny"
+          "none"
        ],
        "type": "string"
      },
@@ -13288,65 +13173,107 @@
        ],
        "type": "object"
      },
-      "QueuedTurn": {
+      "ProfileV2": {
+        "additionalProperties": true,
        "properties": {
-          "id": {
-            "type": "string"
+          "approval_policy": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/v2/AskForApproval"
+              },
+              {
+                "type": "null"
+              }
+            ]
          },
-          "status": {
-            "$ref": "#/definitions/v2/QueuedTurnStatus"
+          "approvals_reviewer": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/v2/ApprovalsReviewer"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "description": "[UNSTABLE] Optional profile-level override for where approval requests are routed for review. If omitted, the enclosing config default is used."
          },
-          "submission": {
-            "$ref": "#/definitions/v2/TurnSubmission"
+          "chatgpt_base_url": {
+            "type": [
+              "string",
+              "null"
+            ]
+          },
+          "model": {
+            "type": [
+              "string",
+              "null"
+            ]
+          },
+          "model_provider": {
+            "type": [
+              "string",
+              "null"
+            ]
+          },
+          "model_reasoning_effort": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/v2/ReasoningEffort"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model_reasoning_summary": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/v2/ReasoningSummary"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "model_verbosity": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/v2/Verbosity"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "service_tier": {
+            "type": [
+              "string",
+              "null"
+            ]
+          },
+          "tools": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/v2/ToolsV2"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "web_search": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/v2/WebSearchMode"
+              },
+              {
+                "type": "null"
+              }
+            ]
          }
        },
-        "required": [
-          "id",
-          "status",
-          "submission"
-        ],
        "type": "object"
      },
-      "QueuedTurnStatus": {
-        "oneOf": [
-          {
-            "properties": {
-              "type": {
-                "enum": [
-                  "pending"
-                ],
-                "title": "PendingQueuedTurnStatusType",
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "title": "PendingQueuedTurnStatus",
-            "type": "object"
-          },
-          {
-            "properties": {
-              "error": {
-                "$ref": "#/definitions/v2/TurnError"
-              },
-              "type": {
-                "enum": [
-                  "failed"
-                ],
-                "title": "FailedQueuedTurnStatusType",
-                "type": "string"
-              }
-            },
-            "required": [
-              "error",
-              "type"
-            ],
-            "title": "FailedQueuedTurnStatus",
-            "type": "object"
-          }
-        ]
-      },
      "RateLimitReachedType": {
        "enum": [
          "rate_limit_reached",
@@ -15224,27 +15151,6 @@
        "title": "SkillsConfigWriteResponse",
        "type": "object"
      },
-      "SkillsExtraRootsSetParams": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "properties": {
-          "extraRoots": {
-            "items": {
-              "$ref": "#/definitions/v2/AbsolutePathBuf"
-            },
-            "type": "array"
-          }
-        },
-        "required": [
-          "extraRoots"
-        ],
-        "title": "SkillsExtraRootsSetParams",
-        "type": "object"
-      },
-      "SkillsExtraRootsSetResponse": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "SkillsExtraRootsSetResponse",
-        "type": "object"
-      },
      "SkillsListEntry": {
        "properties": {
          "cwd": {
@@ -16120,12 +16026,6 @@
        "oneOf": [
          {
            "properties": {
-              "clientId": {
-                "type": [
-                  "string",
-                  "null"
-                ]
-              },
              "content": {
                "items": {
                  "$ref": "#/definitions/v2/UserInput"
@@ -17061,36 +16961,11 @@
        "title": "ThreadNameUpdatedNotification",
        "type": "object"
      },
-      "ThreadQueueChangedNotification": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "properties": {
-          "dispatchingQueuedTurnId": {
-            "type": [
-              "string",
-              "null"
-            ]
-          },
-          "queuedTurns": {
-            "items": {
-              "$ref": "#/definitions/v2/QueuedTurn"
-            },
-            "type": "array"
-          },
-          "threadId": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "queuedTurns",
-          "threadId"
-        ],
-        "title": "ThreadQueueChangedNotification",
-        "type": "object"
-      },
      "ThreadReadParams": {
        "$schema": "http://json-schema.org/draft-07/schema#",
        "properties": {
          "includeTurns": {
+            "default": false,
            "description": "When true, include turns and their items from rollout history.",
            "type": "boolean"
          },
@@ -17357,42 +17232,6 @@
        "title": "ThreadRealtimeTranscriptDoneNotification",
        "type": "object"
      },
-      "ThreadResumeInitialTurnsPageParams": {
-        "properties": {
-          "itemsView": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/v2/TurnItemsView"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "description": "How much item detail to include for each returned turn; defaults to summary."
-          },
-          "limit": {
-            "description": "Optional turn page size.",
-            "format": "uint32",
-            "minimum": 0.0,
-            "type": [
-              "integer",
-              "null"
-            ]
-          },
-          "sortDirection": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/v2/SortDirection"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "description": "Optional turn pagination direction; defaults to descending."
-          }
-        },
-        "type": "object"
-      },
      "ThreadResumeParams": {
        "$schema": "http://json-schema.org/draft-07/schema#",
        "description": "There are three ways to resume a thread: 1. By thread_id: load the thread from disk by thread_id and resume it. 2. By history: instantiate the thread from memory and resume it. 3. By path: load the thread from disk by path and resume it.\n\nFor non-running threads, the precedence is: history > non-empty path > thread_id. If using history or a non-empty path for a non-running thread, the thread_id param will be ignored.\n\nIf thread_id identifies a running thread, app-server rejoins that thread and treats a non-empty path as a consistency check against the active rollout path. Empty string path values are treated as absent.\n\nPrefer using thread_id whenever possible.",
@@ -17688,16 +17527,6 @@
              }
            ]
          },
-          "runtimeWorkspaceRoots": {
-            "default": null,
-            "items": {
-              "$ref": "#/definitions/v2/AbsolutePathBuf"
-            },
-            "type": [
-              "array",
-              "null"
-            ]
-          },
          "sandboxPolicy": {
            "$ref": "#/definitions/v2/SandboxPolicy"
          },
@@ -18579,12 +18408,6 @@
            ],
            "description": "Override where approval requests are routed for review on this turn and subsequent turns."
          },
-          "clientUserMessageId": {
-            "type": [
-              "string",
-              "null"
-            ]
-          },
          "cwd": {
            "description": "Override the working directory for this turn and subsequent turns.",
            "type": [
@@ -18712,12 +18535,6 @@
      "TurnSteerParams": {
        "$schema": "http://json-schema.org/draft-07/schema#",
        "properties": {
-          "clientUserMessageId": {
-            "type": [
-              "string",
-              "null"
-            ]
-          },
          "expectedTurnId": {
            "description": "Required active turn id precondition. The request fails when it does not match the currently active turn.",
            "type": "string"
@@ -18753,66 +18570,6 @@
        "title": "TurnSteerResponse",
        "type": "object"
      },
-      "TurnSubmission": {
-        "properties": {
-          "input": {
-            "items": {
-              "$ref": "#/definitions/v2/UserInput"
-            },
-            "type": "array"
-          },
-          "outputSchema": {
-            "description": "Optional JSON Schema used to constrain the final assistant message for this turn."
-          }
-        },
-        "required": [
-          "input"
-        ],
-        "type": "object"
-      },
-      "TurnSubmissionParams": {
-        "properties": {
-          "input": {
-            "items": {
-              "$ref": "#/definitions/v2/UserInput"
-            },
-            "type": "array"
-          },
-          "outputSchema": {
-            "description": "Optional JSON Schema used to constrain the final assistant message for this turn."
-          }
-        },
-        "required": [
-          "input"
-        ],
-        "type": "object"
-      },
-      "TurnsPage": {
-        "properties": {
-          "backwardsCursor": {
-            "type": [
-              "string",
-              "null"
-            ]
-          },
-          "data": {
-            "items": {
-              "$ref": "#/definitions/v2/Turn"
-            },
-            "type": "array"
-          },
-          "nextCursor": {
-            "type": [
-              "string",
-              "null"
-            ]
-          }
-        },
-        "required": [
-          "data"
-        ],
-        "type": "object"
-      },
      "UserInput": {
        "oneOf": [
          {
--- 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
@@ -164,28 +164,6 @@
      ],
      "type": "string"
    },
-    "AdditionalContextEntry": {
-      "properties": {
-        "kind": {
-          "$ref": "#/definitions/AdditionalContextKind"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "kind",
-        "value"
-      ],
-      "type": "object"
-    },
-    "AdditionalContextKind": {
-      "enum": [
-        "untrusted",
-        "application"
-      ],
-      "type": "string"
-    },
    "AdditionalFileSystemPermissions": {
      "properties": {
        "entries": {
@@ -1457,30 +1435,6 @@
          "title": "Skills/listRequest",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "$ref": "#/definitions/RequestId"
-            },
-            "method": {
-              "enum": [
-                "skills/extraRoots/set"
-              ],
-              "title": "Skills/extraRoots/setRequestMethod",
-              "type": "string"
-            },
-            "params": {
-              "$ref": "#/definitions/SkillsExtraRootsSetParams"
-            }
-          },
-          "required": [
-            "id",
-            "method",
-            "params"
-          ],
-          "title": "Skills/extraRoots/setRequest",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
@@ -3776,6 +3730,19 @@
            }
          ]
        },
+        "profile": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "profiles": {
+          "additionalProperties": {
+            "$ref": "#/definitions/ProfileV2"
+          },
+          "default": {},
+          "type": "object"
+        },
        "review_model": {
          "type": [
            "string",
@@ -4093,6 +4060,7 @@
          ]
        },
        "includeLayers": {
+          "default": false,
          "type": "boolean"
        }
      },
@@ -4130,12 +4098,6 @@
    },
    "ConfigRequirements": {
      "properties": {
-        "allowAppshots": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
        "allowManagedHooksOnly": {
          "type": [
            "boolean",
@@ -5000,7 +4962,8 @@
        }
      },
      "required": [
-        "classification"
+        "classification",
+        "includeLogs"
      ],
      "title": "FeedbackUploadParams",
      "type": "object"
@@ -5887,6 +5850,7 @@
      "$schema": "http://json-schema.org/draft-07/schema#",
      "properties": {
        "refreshToken": {
+          "default": false,
          "description": "When `true`, requests a proactive token refresh before returning.\n\nIn managed auth mode this triggers the normal refresh-token flow. In external auth mode this flag is ignored. Clients should refresh tokens themselves and call `account/login/start` with `chatgptAuthTokens`.",
          "type": "boolean"
        }
@@ -6664,8 +6628,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -6920,12 +6882,6 @@
            "integer",
            "null"
          ]
-        },
-        "threadId": {
-          "type": [
-            "string",
-            "null"
-          ]
        }
      },
      "title": "ListMcpServerStatusParams",
@@ -7517,47 +7473,6 @@
      "title": "McpResourceReadResponse",
      "type": "object"
    },
-    "McpServerInfo": {
-      "description": "Presentation metadata advertised by an initialized MCP server.",
-      "properties": {
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "icons": {
-          "items": true,
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "name": {
-          "type": "string"
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "version": {
-          "type": "string"
-        },
-        "websiteUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "name",
-        "version"
-      ],
-      "type": "object"
-    },
    "McpServerMigration": {
      "properties": {
        "name": {
@@ -7668,16 +7583,6 @@
          },
          "type": "array"
        },
-        "serverInfo": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/McpServerInfo"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
        "tools": {
          "additionalProperties": {
            "$ref": "#/definitions/Tool"
@@ -8398,7 +8303,7 @@
    "NetworkUnixSocketPermission": {
      "enum": [
        "allow",
-        "deny"
+        "none"
      ],
      "type": "string"
    },
@@ -9797,65 +9702,107 @@
      ],
      "type": "object"
    },
-    "QueuedTurn": {
+    "ProfileV2": {
+      "additionalProperties": true,
      "properties": {
-        "id": {
-          "type": "string"
+        "approval_policy": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AskForApproval"
+            },
+            {
+              "type": "null"
+            }
+          ]
        },
-        "status": {
-          "$ref": "#/definitions/QueuedTurnStatus"
+        "approvals_reviewer": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ApprovalsReviewer"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "[UNSTABLE] Optional profile-level override for where approval requests are routed for review. If omitted, the enclosing config default is used."
        },
-        "submission": {
-          "$ref": "#/definitions/TurnSubmission"
+        "chatgpt_base_url": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "model": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "model_provider": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "model_reasoning_effort": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ReasoningEffort"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "model_reasoning_summary": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ReasoningSummary"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "model_verbosity": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Verbosity"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "service_tier": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "tools": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ToolsV2"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "web_search": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/WebSearchMode"
+            },
+            {
+              "type": "null"
+            }
+          ]
        }
      },
-      "required": [
-        "id",
-        "status",
-        "submission"
-      ],
      "type": "object"
    },
-    "QueuedTurnStatus": {
-      "oneOf": [
-        {
-          "properties": {
-            "type": {
-              "enum": [
-                "pending"
-              ],
-              "title": "PendingQueuedTurnStatusType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "PendingQueuedTurnStatus",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "error": {
-              "$ref": "#/definitions/TurnError"
-            },
-            "type": {
-              "enum": [
-                "failed"
-              ],
-              "title": "FailedQueuedTurnStatusType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "error",
-            "type"
-          ],
-          "title": "FailedQueuedTurnStatus",
-          "type": "object"
-        }
-      ]
-    },
    "RateLimitReachedType": {
      "enum": [
        "rate_limit_reached",
@@ -11577,26 +11524,6 @@
          "title": "Thread/settings/updatedNotification",
          "type": "object"
        },
-        {
-          "properties": {
-            "method": {
-              "enum": [
-                "thread/queue/changed"
-              ],
-              "title": "Thread/queue/changedNotificationMethod",
-              "type": "string"
-            },
-            "params": {
-              "$ref": "#/definitions/ThreadQueueChangedNotification"
-            }
-          },
-          "required": [
-            "method",
-            "params"
-          ],
-          "title": "Thread/queue/changedNotification",
-          "type": "object"
-        },
        {
          "properties": {
            "method": {
@@ -13048,27 +12975,6 @@
      "title": "SkillsConfigWriteResponse",
      "type": "object"
    },
-    "SkillsExtraRootsSetParams": {
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "properties": {
-        "extraRoots": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "extraRoots"
-      ],
-      "title": "SkillsExtraRootsSetParams",
-      "type": "object"
-    },
-    "SkillsExtraRootsSetResponse": {
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "title": "SkillsExtraRootsSetResponse",
-      "type": "object"
-    },
    "SkillsListEntry": {
      "properties": {
        "cwd": {
@@ -13944,12 +13850,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
@@ -14885,36 +14785,11 @@
      "title": "ThreadNameUpdatedNotification",
      "type": "object"
    },
-    "ThreadQueueChangedNotification": {
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "properties": {
-        "dispatchingQueuedTurnId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "queuedTurns": {
-          "items": {
-            "$ref": "#/definitions/QueuedTurn"
-          },
-          "type": "array"
-        },
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "queuedTurns",
-        "threadId"
-      ],
-      "title": "ThreadQueueChangedNotification",
-      "type": "object"
-    },
    "ThreadReadParams": {
      "$schema": "http://json-schema.org/draft-07/schema#",
      "properties": {
        "includeTurns": {
+          "default": false,
          "description": "When true, include turns and their items from rollout history.",
          "type": "boolean"
        },
@@ -15181,42 +15056,6 @@
      "title": "ThreadRealtimeTranscriptDoneNotification",
      "type": "object"
    },
-    "ThreadResumeInitialTurnsPageParams": {
-      "properties": {
-        "itemsView": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "How much item detail to include for each returned turn; defaults to summary."
-        },
-        "limit": {
-          "description": "Optional turn page size.",
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "sortDirection": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/SortDirection"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional turn pagination direction; defaults to descending."
-        }
-      },
-      "type": "object"
-    },
    "ThreadResumeParams": {
      "$schema": "http://json-schema.org/draft-07/schema#",
      "description": "There are three ways to resume a thread: 1. By thread_id: load the thread from disk by thread_id and resume it. 2. By history: instantiate the thread from memory and resume it. 3. By path: load the thread from disk by path and resume it.\n\nFor non-running threads, the precedence is: history > non-empty path > thread_id. If using history or a non-empty path for a non-running thread, the thread_id param will be ignored.\n\nIf thread_id identifies a running thread, app-server rejoins that thread and treats a non-empty path as a consistency check against the active rollout path. Empty string path values are treated as absent.\n\nPrefer using thread_id whenever possible.",
@@ -15512,16 +15351,6 @@
            }
          ]
        },
-        "runtimeWorkspaceRoots": {
-          "default": null,
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
        "sandboxPolicy": {
          "$ref": "#/definitions/SandboxPolicy"
        },
@@ -16403,12 +16232,6 @@
          ],
          "description": "Override where approval requests are routed for review on this turn and subsequent turns."
        },
-        "clientUserMessageId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
        "cwd": {
          "description": "Override the working directory for this turn and subsequent turns.",
          "type": [
@@ -16536,12 +16359,6 @@
    "TurnSteerParams": {
      "$schema": "http://json-schema.org/draft-07/schema#",
      "properties": {
-        "clientUserMessageId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
        "expectedTurnId": {
          "description": "Required active turn id precondition. The request fails when it does not match the currently active turn.",
          "type": "string"
@@ -16577,66 +16394,6 @@
      "title": "TurnSteerResponse",
      "type": "object"
    },
-    "TurnSubmission": {
-      "properties": {
-        "input": {
-          "items": {
-            "$ref": "#/definitions/UserInput"
-          },
-          "type": "array"
-        },
-        "outputSchema": {
-          "description": "Optional JSON Schema used to constrain the final assistant message for this turn."
-        }
-      },
-      "required": [
-        "input"
-      ],
-      "type": "object"
-    },
-    "TurnSubmissionParams": {
-      "properties": {
-        "input": {
-          "items": {
-            "$ref": "#/definitions/UserInput"
-          },
-          "type": "array"
-        },
-        "outputSchema": {
-          "description": "Optional JSON Schema used to constrain the final assistant message for this turn."
-        }
-      },
-      "required": [
-        "input"
-      ],
-      "type": "object"
-    },
-    "TurnsPage": {
-      "properties": {
-        "backwardsCursor": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "data": {
-          "items": {
-            "$ref": "#/definitions/Turn"
-          },
-          "type": "array"
-        },
-        "nextCursor": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "data"
-      ],
-      "type": "object"
-    },
    "UserInput": {
      "oneOf": [
        {
--- a/codex-rs/app-server-protocol/schema/json/v2/ConfigReadParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ConfigReadParams.json
@@ -9,6 +9,7 @@
      ]
    },
    "includeLayers": {
+      "default": false,
      "type": "boolean"
    }
  },
--- a/codex-rs/app-server-protocol/schema/json/v2/ConfigReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ConfigReadResponse.json
@@ -352,6 +352,19 @@
            }
          ]
        },
+        "profile": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "profiles": {
+          "additionalProperties": {
+            "$ref": "#/definitions/ProfileV2"
+          },
+          "default": {},
+          "type": "object"
+        },
        "review_model": {
          "type": [
            "string",
@@ -629,6 +642,107 @@
      ],
      "type": "string"
    },
+    "ProfileV2": {
+      "additionalProperties": true,
+      "properties": {
+        "approval_policy": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AskForApproval"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "approvals_reviewer": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ApprovalsReviewer"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "[UNSTABLE] Optional profile-level override for where approval requests are routed for review. If omitted, the enclosing config default is used."
+        },
+        "chatgpt_base_url": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "model": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "model_provider": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "model_reasoning_effort": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ReasoningEffort"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "model_reasoning_summary": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ReasoningSummary"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "model_verbosity": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Verbosity"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "service_tier": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "tools": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ToolsV2"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "web_search": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/WebSearchMode"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "type": "object"
+    },
    "ReasoningEffort": {
      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
      "enum": [
--- a/codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json
@@ -73,12 +73,6 @@
    },
    "ConfigRequirements": {
      "properties": {
-        "allowAppshots": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
        "allowManagedHooksOnly": {
          "type": [
            "boolean",
@@ -460,7 +454,7 @@
    "NetworkUnixSocketPermission": {
      "enum": [
        "allow",
-        "deny"
+        "none"
      ],
      "type": "string"
    },
--- a/codex-rs/app-server-protocol/schema/json/v2/FeedbackUploadParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FeedbackUploadParams.json
@@ -39,7 +39,8 @@
    }
  },
  "required": [
-    "classification"
+    "classification",
+    "includeLogs"
  ],
  "title": "FeedbackUploadParams",
  "type": "object"
--- a/codex-rs/app-server-protocol/schema/json/v2/GetAccountParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/GetAccountParams.json
@@ -2,6 +2,7 @@
  "$schema": "http://json-schema.org/draft-07/schema#",
  "properties": {
    "refreshToken": {
+      "default": false,
      "description": "When `true`, requests a proactive token refresh before returning.\n\nIn managed auth mode this triggers the normal refresh-token flow. In external auth mode this flag is ignored. Clients should refresh tokens themselves and call `account/login/start` with `chatgptAuthTokens`.",
      "type": "boolean"
    }
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
@@ -287,8 +287,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -500,12 +498,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
@@ -287,8 +287,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -500,12 +498,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/ListMcpServerStatusParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ListMcpServerStatusParams.json
@@ -36,12 +36,6 @@
        "integer",
        "null"
      ]
-    },
-    "threadId": {
-      "type": [
-        "string",
-        "null"
-      ]
    }
  },
  "title": "ListMcpServerStatusParams",
--- a/codex-rs/app-server-protocol/schema/json/v2/ListMcpServerStatusResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ListMcpServerStatusResponse.json
@@ -10,47 +10,6 @@
      ],
      "type": "string"
    },
-    "McpServerInfo": {
-      "description": "Presentation metadata advertised by an initialized MCP server.",
-      "properties": {
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "icons": {
-          "items": true,
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "name": {
-          "type": "string"
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "version": {
-          "type": "string"
-        },
-        "websiteUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "name",
-        "version"
-      ],
-      "type": "object"
-    },
    "McpServerStatus": {
      "properties": {
        "authStatus": {
@@ -71,16 +30,6 @@
          },
          "type": "array"
        },
-        "serverInfo": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/McpServerInfo"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
        "tools": {
          "additionalProperties": {
            "$ref": "#/definitions/Tool"
--- a/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json
@@ -165,8 +165,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
--- a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
@@ -424,8 +424,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -644,12 +642,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/SkillsExtraRootsSetParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/SkillsExtraRootsSetParams.json
@@ -1,22 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "AbsolutePathBuf": {
-      "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-      "type": "string"
-    }
-  },
-  "properties": {
-    "extraRoots": {
-      "items": {
-        "$ref": "#/definitions/AbsolutePathBuf"
-      },
-      "type": "array"
-    }
-  },
-  "required": [
-    "extraRoots"
-  ],
-  "title": "SkillsExtraRootsSetParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/SkillsExtraRootsSetResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/SkillsExtraRootsSetResponse.json
@@ -1,5 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "SkillsExtraRootsSetResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
@@ -529,8 +529,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -1121,12 +1119,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
@@ -450,8 +450,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -936,12 +934,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
@@ -450,8 +450,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -936,12 +934,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadQueueChangedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadQueueChangedNotification.json
@@ -1,510 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "AbsolutePathBuf": {
-      "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-      "type": "string"
-    },
-    "AdditionalContextEntry": {
-      "properties": {
-        "kind": {
-          "$ref": "#/definitions/AdditionalContextKind"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "kind",
-        "value"
-      ],
-      "type": "object"
-    },
-    "AdditionalContextKind": {
-      "enum": [
-        "untrusted",
-        "application"
-      ],
-      "type": "string"
-    },
-    "ByteRange": {
-      "properties": {
-        "end": {
-          "format": "uint",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "start": {
-          "format": "uint",
-          "minimum": 0.0,
-          "type": "integer"
-        }
-      },
-      "required": [
-        "end",
-        "start"
-      ],
-      "type": "object"
-    },
-    "CodexErrorInfo": {
-      "description": "This translation layer make sure that we expose codex error code in camel case.\n\nWhen 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.",
-      "oneOf": [
-        {
-          "enum": [
-            "contextWindowExceeded",
-            "usageLimitExceeded",
-            "serverOverloaded",
-            "cyberPolicy",
-            "internalServerError",
-            "unauthorized",
-            "badRequest",
-            "threadRollbackFailed",
-            "sandboxError",
-            "other"
-          ],
-          "type": "string"
-        },
-        {
-          "additionalProperties": false,
-          "properties": {
-            "httpConnectionFailed": {
-              "properties": {
-                "httpStatusCode": {
-                  "format": "uint16",
-                  "minimum": 0.0,
-                  "type": [
-                    "integer",
-                    "null"
-                  ]
-                }
-              },
-              "type": "object"
-            }
-          },
-          "required": [
-            "httpConnectionFailed"
-          ],
-          "title": "HttpConnectionFailedCodexErrorInfo",
-          "type": "object"
-        },
-        {
-          "additionalProperties": false,
-          "description": "Failed to connect to the response SSE stream.",
-          "properties": {
-            "responseStreamConnectionFailed": {
-              "properties": {
-                "httpStatusCode": {
-                  "format": "uint16",
-                  "minimum": 0.0,
-                  "type": [
-                    "integer",
-                    "null"
-                  ]
-                }
-              },
-              "type": "object"
-            }
-          },
-          "required": [
-            "responseStreamConnectionFailed"
-          ],
-          "title": "ResponseStreamConnectionFailedCodexErrorInfo",
-          "type": "object"
-        },
-        {
-          "additionalProperties": false,
-          "description": "The response SSE stream disconnected in the middle of a turn before completion.",
-          "properties": {
-            "responseStreamDisconnected": {
-              "properties": {
-                "httpStatusCode": {
-                  "format": "uint16",
-                  "minimum": 0.0,
-                  "type": [
-                    "integer",
-                    "null"
-                  ]
-                }
-              },
-              "type": "object"
-            }
-          },
-          "required": [
-            "responseStreamDisconnected"
-          ],
-          "title": "ResponseStreamDisconnectedCodexErrorInfo",
-          "type": "object"
-        },
-        {
-          "additionalProperties": false,
-          "description": "Reached the retry limit for responses.",
-          "properties": {
-            "responseTooManyFailedAttempts": {
-              "properties": {
-                "httpStatusCode": {
-                  "format": "uint16",
-                  "minimum": 0.0,
-                  "type": [
-                    "integer",
-                    "null"
-                  ]
-                }
-              },
-              "type": "object"
-            }
-          },
-          "required": [
-            "responseTooManyFailedAttempts"
-          ],
-          "title": "ResponseTooManyFailedAttemptsCodexErrorInfo",
-          "type": "object"
-        },
-        {
-          "additionalProperties": false,
-          "description": "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
-          "properties": {
-            "activeTurnNotSteerable": {
-              "properties": {
-                "turnKind": {
-                  "$ref": "#/definitions/NonSteerableTurnKind"
-                }
-              },
-              "required": [
-                "turnKind"
-              ],
-              "type": "object"
-            }
-          },
-          "required": [
-            "activeTurnNotSteerable"
-          ],
-          "title": "ActiveTurnNotSteerableCodexErrorInfo",
-          "type": "object"
-        }
-      ]
-    },
-    "ImageDetail": {
-      "enum": [
-        "auto",
-        "low",
-        "high",
-        "original"
-      ],
-      "type": "string"
-    },
-    "NonSteerableTurnKind": {
-      "enum": [
-        "review",
-        "compact"
-      ],
-      "type": "string"
-    },
-    "QueuedTurn": {
-      "properties": {
-        "id": {
-          "type": "string"
-        },
-        "status": {
-          "$ref": "#/definitions/QueuedTurnStatus"
-        },
-        "submission": {
-          "$ref": "#/definitions/TurnSubmission"
-        }
-      },
-      "required": [
-        "id",
-        "status",
-        "submission"
-      ],
-      "type": "object"
-    },
-    "QueuedTurnStatus": {
-      "oneOf": [
-        {
-          "properties": {
-            "type": {
-              "enum": [
-                "pending"
-              ],
-              "title": "PendingQueuedTurnStatusType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "PendingQueuedTurnStatus",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "error": {
-              "$ref": "#/definitions/TurnError"
-            },
-            "type": {
-              "enum": [
-                "failed"
-              ],
-              "title": "FailedQueuedTurnStatusType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "error",
-            "type"
-          ],
-          "title": "FailedQueuedTurnStatus",
-          "type": "object"
-        }
-      ]
-    },
-    "TextElement": {
-      "properties": {
-        "byteRange": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/ByteRange"
-            }
-          ],
-          "description": "Byte range in the parent `text` buffer that this element occupies."
-        },
-        "placeholder": {
-          "description": "Optional human-readable placeholder for the element, displayed in the UI.",
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "byteRange"
-      ],
-      "type": "object"
-    },
-    "TurnEnvironmentParams": {
-      "properties": {
-        "cwd": {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        },
-        "environmentId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "cwd",
-        "environmentId"
-      ],
-      "type": "object"
-    },
-    "TurnError": {
-      "properties": {
-        "additionalDetails": {
-          "default": null,
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "codexErrorInfo": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/CodexErrorInfo"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "message": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "message"
-      ],
-      "type": "object"
-    },
-    "TurnSubmission": {
-      "properties": {
-        "input": {
-          "items": {
-            "$ref": "#/definitions/UserInput"
-          },
-          "type": "array"
-        },
-        "outputSchema": {
-          "description": "Optional JSON Schema used to constrain the final assistant message for this turn."
-        }
-      },
-      "required": [
-        "input"
-      ],
-      "type": "object"
-    },
-    "UserInput": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "text_elements": {
-              "default": [],
-              "description": "UI-defined spans within `text` used to render or persist special elements.",
-              "items": {
-                "$ref": "#/definitions/TextElement"
-              },
-              "type": "array"
-            },
-            "type": {
-              "enum": [
-                "text"
-              ],
-              "title": "TextUserInputType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "TextUserInput",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "detail": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ImageDetail"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "default": null
-            },
-            "type": {
-              "enum": [
-                "image"
-              ],
-              "title": "ImageUserInputType",
-              "type": "string"
-            },
-            "url": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "type",
-            "url"
-          ],
-          "title": "ImageUserInput",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "detail": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ImageDetail"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "default": null
-            },
-            "path": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "localImage"
-              ],
-              "title": "LocalImageUserInputType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "path",
-            "type"
-          ],
-          "title": "LocalImageUserInput",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "path": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "skill"
-              ],
-              "title": "SkillUserInputType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "name",
-            "path",
-            "type"
-          ],
-          "title": "SkillUserInput",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "path": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "mention"
-              ],
-              "title": "MentionUserInputType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "name",
-            "path",
-            "type"
-          ],
-          "title": "MentionUserInput",
-          "type": "object"
-        }
-      ]
-    }
-  },
-  "properties": {
-    "dispatchingQueuedTurnId": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "queuedTurns": {
-      "items": {
-        "$ref": "#/definitions/QueuedTurn"
-      },
-      "type": "array"
-    },
-    "threadId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "queuedTurns",
-    "threadId"
-  ],
-  "title": "ThreadQueueChangedNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadParams.json
@@ -2,6 +2,7 @@
  "$schema": "http://json-schema.org/draft-07/schema#",
  "properties": {
    "includeTurns": {
+      "default": false,
      "description": "When true, include turns and their items from rollout history.",
      "type": "boolean"
    },
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
@@ -450,8 +450,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -936,12 +934,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json
@@ -224,8 +224,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -983,74 +981,6 @@
        "danger-full-access"
      ],
      "type": "string"
-    },
-    "SortDirection": {
-      "enum": [
-        "asc",
-        "desc"
-      ],
-      "type": "string"
-    },
-    "ThreadResumeInitialTurnsPageParams": {
-      "properties": {
-        "itemsView": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "How much item detail to include for each returned turn; defaults to summary."
-        },
-        "limit": {
-          "description": "Optional turn page size.",
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "sortDirection": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/SortDirection"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional turn pagination direction; defaults to descending."
-        }
-      },
-      "type": "object"
-    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
    }
  },
  "description": "There are three ways to resume a thread: 1. By thread_id: load the thread from disk by thread_id and resume it. 2. By history: instantiate the thread from memory and resume it. 3. By path: load the thread from disk by path and resume it.\n\nFor non-running threads, the precedence is: history > non-empty path > thread_id. If using history or a non-empty path for a non-running thread, the thread_id param will be ignored.\n\nIf thread_id identifies a running thread, app-server rejoins that thread and treats a non-empty path as a consistency check against the active rollout path. Empty string path values are treated as absent.\n\nPrefer using thread_id whenever possible.",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
@@ -529,8 +529,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -1121,12 +1119,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
@@ -2001,32 +1993,6 @@
      ],
      "type": "string"
    },
-    "TurnsPage": {
-      "properties": {
-        "backwardsCursor": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "data": {
-          "items": {
-            "$ref": "#/definitions/Turn"
-          },
-          "type": "array"
-        },
-        "nextCursor": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "data"
-      ],
-      "type": "object"
-    },
    "UserInput": {
      "oneOf": [
        {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json
@@ -450,8 +450,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -936,12 +934,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadSettingsUpdatedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadSettingsUpdatedNotification.json
@@ -332,16 +332,6 @@
            }
          ]
        },
-        "runtimeWorkspaceRoots": {
-          "default": null,
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
        "sandboxPolicy": {
          "$ref": "#/definitions/SandboxPolicy"
        },
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
@@ -529,8 +529,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -1121,12 +1119,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
@@ -450,8 +450,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -936,12 +934,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
@@ -450,8 +450,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -936,12 +934,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
@@ -424,8 +424,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -644,12 +642,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json
@@ -5,28 +5,6 @@
      "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
      "type": "string"
    },
-    "AdditionalContextEntry": {
-      "properties": {
-        "kind": {
-          "$ref": "#/definitions/AdditionalContextKind"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "kind",
-        "value"
-      ],
-      "type": "object"
-    },
-    "AdditionalContextKind": {
-      "enum": [
-        "untrusted",
-        "application"
-      ],
-      "type": "string"
-    },
    "ApprovalsReviewer": {
      "description": "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
      "enum": [
@@ -123,8 +101,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -516,12 +492,6 @@
      ],
      "description": "Override where approval requests are routed for review on this turn and subsequent turns."
    },
-    "clientUserMessageId": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
    "cwd": {
      "description": "Override the working directory for this turn and subsequent turns.",
      "type": [
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
@@ -424,8 +424,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -644,12 +642,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
@@ -424,8 +424,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -644,12 +642,6 @@
      "oneOf": [
        {
          "properties": {
-            "clientId": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "content": {
              "items": {
                "$ref": "#/definitions/UserInput"
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnSteerParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnSteerParams.json
@@ -1,28 +1,6 @@
 {
  "$schema": "http://json-schema.org/draft-07/schema#",
  "definitions": {
-    "AdditionalContextEntry": {
-      "properties": {
-        "kind": {
-          "$ref": "#/definitions/AdditionalContextKind"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "kind",
-        "value"
-      ],
-      "type": "object"
-    },
-    "AdditionalContextKind": {
-      "enum": [
-        "untrusted",
-        "application"
-      ],
-      "type": "string"
-    },
    "ByteRange": {
      "properties": {
        "end": {
@@ -44,8 +22,6 @@
    },
    "ImageDetail": {
      "enum": [
-        "auto",
-        "low",
        "high",
        "original"
      ],
@@ -218,12 +194,6 @@
    }
  },
  "properties": {
-    "clientUserMessageId": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
    "expectedTurnId": {
      "description": "Required active turn id precondition. The request fails when it does not match the currently active turn.",
      "type": "string"
--- a/codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts
--- a/codex-rs/app-server-protocol/schema/typescript/ImageDetail.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/ImageDetail.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 ImageDetail = "auto" | "low" | "high" | "original";
+export type ImageDetail = "high" | "original";
--- a/codex-rs/app-server-protocol/schema/typescript/McpServerInfo.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/McpServerInfo.ts
@@ -1,9 +0,0 @@
-// 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 { JsonValue } from "./serde_json/JsonValue";
-
-/**
- * Presentation metadata advertised by an initialized MCP server.
- */
-export type McpServerInfo = { name: string, title: string | null, version: string, description: string | null, icons: Array<JsonValue> | null, websiteUrl: string | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/ServerNotification.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/ServerNotification.ts
--- a/codex-rs/app-server-protocol/schema/typescript/index.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/index.ts
@@ -42,7 +42,6 @@ export type { InternalSessionSource } from "./InternalSessionSource";
 export type { LocalShellAction } from "./LocalShellAction";
 export type { LocalShellExecAction } from "./LocalShellExecAction";
 export type { LocalShellStatus } from "./LocalShellStatus";
-export type { McpServerInfo } from "./McpServerInfo";
 export type { MessagePhase } from "./MessagePhase";
 export type { ModeKind } from "./ModeKind";
 export type { NetworkPolicyAmendment } from "./NetworkPolicyAmendment";
--- a/codex-rs/app-server-protocol/schema/typescript/v2/AdditionalContextEntry.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/AdditionalContextEntry.ts
@@ -1,6 +0,0 @@
-// 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 { AdditionalContextKind } from "./AdditionalContextKind";
-
-export type AdditionalContextEntry = { value: string, kind: AdditionalContextKind, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/AdditionalContextKind.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/AdditionalContextKind.ts
@@ -1,5 +0,0 @@
-// 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 AdditionalContextKind = "untrusted" | "application";
--- a/codex-rs/app-server-protocol/schema/typescript/v2/Config.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/Config.ts
@@ -12,6 +12,7 @@ import type { AnalyticsConfig } from "./AnalyticsConfig";
 import type { ApprovalsReviewer } from "./ApprovalsReviewer";
 import type { AskForApproval } from "./AskForApproval";
 import type { ForcedChatgptWorkspaceIds } from "./ForcedChatgptWorkspaceIds";
+import type { ProfileV2 } from "./ProfileV2";
 import type { SandboxMode } from "./SandboxMode";
 import type { SandboxWorkspaceWrite } from "./SandboxWorkspaceWrite";
 import type { ToolsV2 } from "./ToolsV2";
@@ -20,4 +21,4 @@ export type Config = {model: string | null, review_model: string | null, model_c
 * [UNSTABLE] Optional default for where approval requests are routed for
 * review.
 */
-approvals_reviewer: ApprovalsReviewer | null, sandbox_mode: SandboxMode | null, sandbox_workspace_write: SandboxWorkspaceWrite | null, forced_chatgpt_workspace_id: ForcedChatgptWorkspaceIds | null, forced_login_method: ForcedLoginMethod | null, web_search: WebSearchMode | null, tools: ToolsV2 | null, instructions: string | null, developer_instructions: string | null, compact_prompt: string | null, model_reasoning_effort: ReasoningEffort | null, model_reasoning_summary: ReasoningSummary | null, model_verbosity: Verbosity | null, service_tier: string | null, analytics: AnalyticsConfig | null, desktop: { [key in string]?: JsonValue } | null} & ({ [key in string]?: number | string | boolean | Array<JsonValue> | { [key in string]?: JsonValue } | null });
+approvals_reviewer: ApprovalsReviewer | null, sandbox_mode: SandboxMode | null, sandbox_workspace_write: SandboxWorkspaceWrite | null, forced_chatgpt_workspace_id: ForcedChatgptWorkspaceIds | null, forced_login_method: ForcedLoginMethod | null, web_search: WebSearchMode | null, tools: ToolsV2 | null, profile: string | null, profiles: { [key in string]?: ProfileV2 }, instructions: string | null, developer_instructions: string | null, compact_prompt: string | null, model_reasoning_effort: ReasoningEffort | null, model_reasoning_summary: ReasoningSummary | null, model_verbosity: Verbosity | null, service_tier: string | null, analytics: AnalyticsConfig | null, desktop: { [key in string]?: JsonValue } | null} & ({ [key in string]?: number | string | boolean | Array<JsonValue> | { [key in string]?: JsonValue } | null });
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ConfigReadParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ConfigReadParams.ts
@@ -2,7 +2,7 @@

 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.

-export type ConfigReadParams = { includeLayers?: boolean,
+export type ConfigReadParams = { includeLayers: boolean,
 /**
 * Optional working directory to resolve project config layers. If specified,
 * return the effective config as seen from that directory (i.e., including any
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ConfigRequirements.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ConfigRequirements.ts
@@ -7,4 +7,4 @@ import type { ComputerUseRequirements } from "./ComputerUseRequirements";
 import type { ResidencyRequirement } from "./ResidencyRequirement";
 import type { SandboxMode } from "./SandboxMode";

-export type ConfigRequirements = {allowedApprovalPolicies: Array<AskForApproval> | null, allowedSandboxModes: Array<SandboxMode> | null, allowedPermissions: Array<string> | null, allowedWebSearchModes: Array<WebSearchMode> | null, allowManagedHooksOnly: boolean | null, allowAppshots: boolean | null, computerUse: ComputerUseRequirements | null, featureRequirements: { [key in string]?: boolean } | null, enforceResidency: ResidencyRequirement | null};
+export type ConfigRequirements = {allowedApprovalPolicies: Array<AskForApproval> | null, allowedSandboxModes: Array<SandboxMode> | null, allowedPermissions: Array<string> | null, allowedWebSearchModes: Array<WebSearchMode> | null, allowManagedHooksOnly: boolean | null, computerUse: ComputerUseRequirements | null, featureRequirements: { [key in string]?: boolean } | null, enforceResidency: ResidencyRequirement | null};
--- a/codex-rs/app-server-protocol/schema/typescript/v2/FeedbackUploadParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/FeedbackUploadParams.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 FeedbackUploadParams = { classification: string, reason?: string | null, threadId?: string | null, includeLogs?: boolean, extraLogFiles?: Array<string> | null, tags?: { [key in string]?: string } | null, };
+export type FeedbackUploadParams = { classification: string, reason?: string | null, threadId?: string | null, includeLogs: boolean, extraLogFiles?: Array<string> | null, tags?: { [key in string]?: string } | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/GetAccountParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/GetAccountParams.ts
@@ -10,4 +10,4 @@ export type GetAccountParams = {
 * external auth mode this flag is ignored. Clients should refresh tokens
 * themselves and call `account/login/start` with `chatgptAuthTokens`.
 */
-refreshToken?: boolean, };
+refreshToken: boolean, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ListMcpServerStatusParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ListMcpServerStatusParams.ts
@@ -16,4 +16,4 @@ limit?: number | null,
 * Controls how much MCP inventory data to fetch for each server.
 * Defaults to `Full` when omitted.
 */
-detail?: McpServerStatusDetail | null, threadId?: string | null, };
+detail?: McpServerStatusDetail | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/McpServerStatus.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/McpServerStatus.ts
@@ -1,10 +1,9 @@
 // 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 { McpServerInfo } from "../McpServerInfo";
 import type { Resource } from "../Resource";
 import type { ResourceTemplate } from "../ResourceTemplate";
 import type { Tool } from "../Tool";
 import type { McpAuthStatus } from "./McpAuthStatus";

-export type McpServerStatus = { name: string, serverInfo: McpServerInfo | null, tools: { [key in string]?: Tool }, resources: Array<Resource>, resourceTemplates: Array<ResourceTemplate>, authStatus: McpAuthStatus, };
+export type McpServerStatus = { name: string, tools: { [key in string]?: Tool }, resources: Array<Resource>, resourceTemplates: Array<ResourceTemplate>, authStatus: McpAuthStatus, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/NetworkUnixSocketPermission.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/NetworkUnixSocketPermission.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 NetworkUnixSocketPermission = "allow" | "deny";
+export type NetworkUnixSocketPermission = "allow" | "none";
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ProfileV2.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ProfileV2.ts
@@ -0,0 +1,18 @@
+// 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 { ReasoningEffort } from "../ReasoningEffort";
+import type { ReasoningSummary } from "../ReasoningSummary";
+import type { Verbosity } from "../Verbosity";
+import type { WebSearchMode } from "../WebSearchMode";
+import type { JsonValue } from "../serde_json/JsonValue";
+import type { ApprovalsReviewer } from "./ApprovalsReviewer";
+import type { AskForApproval } from "./AskForApproval";
+import type { ToolsV2 } from "./ToolsV2";
+
+export type ProfileV2 = {model: string | null, model_provider: string | null, approval_policy: AskForApproval | null, /**
+ * [UNSTABLE] Optional profile-level override for where approval requests
+ * are routed for review. If omitted, the enclosing config default is
+ * used.
+ */
+approvals_reviewer: ApprovalsReviewer | null, service_tier: string | null, model_reasoning_effort: ReasoningEffort | null, model_reasoning_summary: ReasoningSummary | null, model_verbosity: Verbosity | null, web_search: WebSearchMode | null, tools: ToolsV2 | null, chatgpt_base_url: string | null} & ({ [key in string]?: number | string | boolean | Array<JsonValue> | { [key in string]?: JsonValue } | null });
--- a/codex-rs/app-server-protocol/schema/typescript/v2/QueuedTurn.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/QueuedTurn.ts
@@ -1,7 +0,0 @@
-// 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 { QueuedTurnStatus } from "./QueuedTurnStatus";
-import type { TurnSubmission } from "./TurnSubmission";
-
-export type QueuedTurn = { id: string, submission: TurnSubmission, status: QueuedTurnStatus, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/QueuedTurnStatus.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/QueuedTurnStatus.ts
@@ -1,6 +0,0 @@
-// 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 { TurnError } from "./TurnError";
-
-export type QueuedTurnStatus = { "type": "pending" } | { "type": "failed", error: TurnError, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/SkillsExtraRootsSetParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/SkillsExtraRootsSetParams.ts
@@ -1,6 +0,0 @@
-// 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 { AbsolutePathBuf } from "../AbsolutePathBuf";
-
-export type SkillsExtraRootsSetParams = { extraRoots: Array<AbsolutePathBuf>, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/SkillsExtraRootsSetResponse.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/SkillsExtraRootsSetResponse.ts
@@ -1,5 +0,0 @@
-// 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 SkillsExtraRootsSetResponse = Record<string, never>;
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadItem.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadItem.ts
@@ -23,7 +23,7 @@ import type { PatchApplyStatus } from "./PatchApplyStatus";
 import type { UserInput } from "./UserInput";
 import type { WebSearchAction } from "./WebSearchAction";

-export type ThreadItem = { "type": "userMessage", id: string, clientId: string | null, content: Array<UserInput>, } | { "type": "hookPrompt", id: string, fragments: Array<HookPromptFragment>, } | { "type": "agentMessage", id: string, text: string, phase: MessagePhase | null, memoryCitation: MemoryCitation | null, } | { "type": "plan", id: string, text: string, } | { "type": "reasoning", id: string, summary: Array<string>, content: Array<string>, } | { "type": "commandExecution", id: string,
+export type ThreadItem = { "type": "userMessage", id: string, content: Array<UserInput>, } | { "type": "hookPrompt", id: string, fragments: Array<HookPromptFragment>, } | { "type": "agentMessage", id: string, text: string, phase: MessagePhase | null, memoryCitation: MemoryCitation | null, } | { "type": "plan", id: string, text: string, } | { "type": "reasoning", id: string, summary: Array<string>, content: Array<string>, } | { "type": "commandExecution", id: string,
 /**
 * The command to be executed.
 */
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadQueueChangedNotification.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadQueueChangedNotification.ts
@@ -1,6 +0,0 @@
-// 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 { QueuedTurn } from "./QueuedTurn";
-
-export type ThreadQueueChangedNotification = { threadId: string, queuedTurns: Array<QueuedTurn>, dispatchingQueuedTurnId: string | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadReadParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadReadParams.ts
@@ -6,4 +6,4 @@ export type ThreadReadParams = { threadId: string,
 /**
 * When true, include turns and their items from rollout history.
 */
-includeTurns?: boolean, };
+includeTurns: boolean, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadResumeInitialTurnsPageParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadResumeInitialTurnsPageParams.ts
@@ -1,19 +0,0 @@
-// 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 { SortDirection } from "./SortDirection";
-import type { TurnItemsView } from "./TurnItemsView";
-
-export type ThreadResumeInitialTurnsPageParams = {
-/**
- * Optional turn page size.
- */
-limit?: number | null,
-/**
- * Optional turn pagination direction; defaults to descending.
- */
-sortDirection?: SortDirection | null,
-/**
- * How much item detail to include for each returned turn; defaults to summary.
- */
-itemsView?: TurnItemsView | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadSettings.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadSettings.ts
@@ -11,4 +11,4 @@ import type { ApprovalsReviewer } from "./ApprovalsReviewer";
 import type { AskForApproval } from "./AskForApproval";
 import type { SandboxPolicy } from "./SandboxPolicy";

-export type ThreadSettings = { cwd: AbsolutePathBuf, runtimeWorkspaceRoots: Array<AbsolutePathBuf> | null, approvalPolicy: AskForApproval, approvalsReviewer: ApprovalsReviewer, sandboxPolicy: SandboxPolicy, activePermissionProfile: ActivePermissionProfile | null, model: string, modelProvider: string, serviceTier: string | null, effort: ReasoningEffort | null, summary: ReasoningSummary | null, collaborationMode: CollaborationMode, personality: Personality | null, };
+export type ThreadSettings = { cwd: AbsolutePathBuf, approvalPolicy: AskForApproval, approvalsReviewer: ApprovalsReviewer, sandboxPolicy: SandboxPolicy, activePermissionProfile: ActivePermissionProfile | null, model: string, modelProvider: string, serviceTier: string | null, effort: ReasoningEffort | null, summary: ReasoningSummary | null, collaborationMode: CollaborationMode, personality: Personality | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/TurnStartParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/TurnStartParams.ts
@@ -10,11 +10,7 @@ import type { AskForApproval } from "./AskForApproval";
 import type { SandboxPolicy } from "./SandboxPolicy";
 import type { UserInput } from "./UserInput";

-export type TurnStartParams = {threadId: string, clientUserMessageId?: string | null, input: Array<UserInput>, /**
- * Optional JSON Schema used to constrain the final assistant message for
- * this turn.
- */
-outputSchema?: JsonValue | null, /**
+export type TurnStartParams = {threadId: string, input: Array<UserInput>, /**
 * Override the working directory for this turn and subsequent turns.
 */
 cwd?: string | null, /**
@@ -42,4 +38,8 @@ effort?: ReasoningEffort | null, /**
 summary?: ReasoningSummary | null, /**
 * Override the personality for this turn and subsequent turns.
 */
-personality?: Personality | null};
+personality?: Personality | null, /**
+ * Optional JSON Schema used to constrain the final assistant message for
+ * this turn.
+ */
+outputSchema?: JsonValue | null};
--- a/codex-rs/app-server-protocol/schema/typescript/v2/TurnSteerParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/TurnSteerParams.ts
@@ -3,7 +3,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { UserInput } from "./UserInput";

-export type TurnSteerParams = {threadId: string, clientUserMessageId?: string | null, input: Array<UserInput>, /**
+export type TurnSteerParams = {threadId: string, input: Array<UserInput>, /**
 * Required active turn id precondition. The request fails when it does not
 * match the currently active turn.
 */
--- a/codex-rs/app-server-protocol/schema/typescript/v2/TurnSubmission.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/TurnSubmission.ts
@@ -1,11 +0,0 @@
-// 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 { JsonValue } from "../serde_json/JsonValue";
-import type { UserInput } from "./UserInput";
-
-export type TurnSubmission = {input: Array<UserInput>, /**
- * Optional JSON Schema used to constrain the final assistant message for
- * this turn.
- */
-outputSchema: JsonValue | null};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jif-oai	066fb39cf1	try more things	2026-05-22 18:58:38 +01:00
jif-oai	cfcb5f1cd5	a bit more	2026-05-22 18:35:36 +01:00
jif-oai	491e7033a7	chore: make specs more linears	2026-05-22 14:18:29 +01:00