core: preserve SBPL file no-newline style

core: allow CoreServices in macOS seatbelt platform defaults
2026-03-09 16:13:23 +00:00 · 2026-02-22 19:06:32 -08:00 · 2026-02-22 18:52:06 -08:00
1018 changed files with 31560 additions and 153743 deletions
--- a/.bazelrc
+++ b/.bazelrc
@@ -18,7 +18,7 @@ common --enable_platform_specific_config
 common:linux --host_platform=//:local_linux
 common:windows --host_platform=//:local_windows
 common --@rules_cc//cc/toolchains/args/archiver_flags:use_libtool_on_macos=False
-common --@llvm//config:experimental_stub_libgcc_s
+common --@toolchains_llvm_bootstrapped//config:experimental_stub_libgcc_s

 # We need to use the sh toolchain on windows so we don't send host bash paths to the linux executor.
 common:windows --@rules_rust//rust/settings:experimental_use_sh_toolchain_for_bootstrap_process_wrapper
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update && \
 RUN apt-get update && \
    apt-get install -y --no-install-recommends \
    build-essential curl git ca-certificates \
-    pkg-config libcap-dev clang musl-tools libssl-dev just && \
+    pkg-config clang musl-tools libssl-dev just && \
    rm -rf /var/lib/apt/lists/*

 # Ubuntu 24.04 ships with user 'ubuntu' already created with UID 1000.
--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -28,17 +28,14 @@ jobs:
            target: x86_64-apple-darwin

          # Linux
+          - os: ubuntu-24.04-arm
+            target: aarch64-unknown-linux-gnu
          - os: ubuntu-24.04
            target: x86_64-unknown-linux-gnu
+          - os: ubuntu-24.04-arm
+            target: aarch64-unknown-linux-musl
          - os: ubuntu-24.04
            target: x86_64-unknown-linux-musl
-          # 2026-02-27 Bazel tests have been flaky on arm in CI.
-          # Disable until we can investigate and stabilize them.
-          # - os: ubuntu-24.04-arm
-          #   target: aarch64-unknown-linux-musl
-          # - os: ubuntu-24.04-arm
-          #   target: aarch64-unknown-linux-gnu
-
          # TODO: Enable Windows once we fix the toolchain issues there.
          #- os: windows-latest
          #  target: x86_64-pc-windows-gnullvm
@@ -50,11 +47,6 @@ jobs:
    steps:
      - uses: actions/checkout@v6

-      - name: Set up Node.js for js_repl tests
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: codex-rs/node-version.txt
-
      # Some integration tests rely on DotSlash being installed.
      # See https://github.com/openai/codex/pull/7617.
      - name: Install DotSlash
@@ -115,45 +107,6 @@ jobs:
          BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
        shell: bash
        run: |
-          set -o pipefail
-
-          bazel_console_log="$(mktemp)"
-
-          print_failed_bazel_test_logs() {
-            local console_log="$1"
-            local testlogs_dir
-
-            testlogs_dir="$(bazel $BAZEL_STARTUP_ARGS info bazel-testlogs 2>/dev/null || echo bazel-testlogs)"
-
-            local failed_targets=()
-            while IFS= read -r target; do
-              failed_targets+=("$target")
-            done < <(
-              grep -E '^FAIL: //' "$console_log" \
-                | sed -E 's#^FAIL: (//[^ ]+).*#\1#' \
-                | sort -u
-            )
-
-            if [[ ${#failed_targets[@]} -eq 0 ]]; then
-              echo "No failed Bazel test targets were found in console output."
-              return
-            fi
-
-            for target in "${failed_targets[@]}"; do
-              local rel_path="${target#//}"
-              rel_path="${rel_path/:/\/}"
-              local test_log="${testlogs_dir}/${rel_path}/test.log"
-
-              echo "::group::Bazel test log tail for ${target}"
-              if [[ -f "$test_log" ]]; then
-                tail -n 200 "$test_log"
-              else
-                echo "Missing test log: $test_log"
-              fi
-              echo "::endgroup::"
-            done
-          }
-
          bazel_args=(
            test
            //...
@@ -164,28 +117,12 @@ jobs:
            --build_metadata=VISIBILITY=PUBLIC
          )

-          if [[ "${RUNNER_OS:-}" != "Windows" ]]; then
-            # Bazel test sandboxes on macOS may resolve an older Homebrew `node`
-            # before the `actions/setup-node` runtime on PATH.
-            node_bin="$(which node)"
-            bazel_args+=("--test_env=CODEX_JS_REPL_NODE_PATH=${node_bin}")
-          fi
-
          if [[ -n "${BUILDBUDDY_API_KEY:-}" ]]; then
            echo "BuildBuddy API key is available; using remote Bazel configuration."
-            # Work around Bazel 9 remote repo contents cache / overlay materialization failures
-            # seen in CI (for example "is not a symlink" or permission errors while
-            # materializing external repos such as rules_perl). We still use BuildBuddy for
-            # remote execution/cache; this only disables the startup-level repo contents cache.
-            set +e
            bazel $BAZEL_STARTUP_ARGS \
-              --noexperimental_remote_repo_contents_cache \
              --bazelrc=.github/workflows/ci.bazelrc \
              "${bazel_args[@]}" \
-              "--remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY" \
-              2>&1 | tee "$bazel_console_log"
-            bazel_status=${PIPESTATUS[0]}
-            set -e
+              "--remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY"
          else
            echo "BuildBuddy API key is not available; using local Bazel configuration."
            # Keep fork/community PRs on Bazel but disable remote services that are
@@ -204,18 +141,9 @@ jobs:
            #   clear remote cache/execution endpoints configured in .bazelrc.
            #   https://bazel.build/reference/command-line-reference#common_options-flag--remote_cache
            #   https://bazel.build/reference/command-line-reference#common_options-flag--remote_executor
-            set +e
            bazel $BAZEL_STARTUP_ARGS \
              --noexperimental_remote_repo_contents_cache \
              "${bazel_args[@]}" \
              --remote_cache= \
-              --remote_executor= \
-              2>&1 | tee "$bazel_console_log"
-            bazel_status=${PIPESTATUS[0]}
-            set -e
-          fi
-
-          if [[ ${bazel_status:-0} -ne 0 ]]; then
-            print_failed_bazel_test_logs "$bazel_console_log"
-            exit "$bazel_status"
+              --remote_executor=
          fi
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
          echo "pack_output=$PACK_OUTPUT" >> "$GITHUB_OUTPUT"

      - name: Upload staged npm package artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: codex-npm-staging
          path: ${{ steps.stage_npm_package.outputs.pack_output }}
--- a/.github/workflows/issue-deduplicator.yml
+++ b/.github/workflows/issue-deduplicator.yml
@@ -7,17 +7,15 @@ on:
      - labeled

 jobs:
-  gather-duplicates-all:
-    name: Identify potential duplicates (all issues)
+  gather-duplicates:
+    name: Identify potential duplicates
    # 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
    permissions:
      contents: read
    outputs:
-      issues_json: ${{ steps.normalize-all.outputs.issues_json }}
-      reason: ${{ steps.normalize-all.outputs.reason }}
-      has_matches: ${{ steps.normalize-all.outputs.has_matches }}
+      codex_output: ${{ steps.select-final.outputs.codex_output }}
    steps:
      - uses: actions/checkout@v6

@@ -31,6 +29,7 @@ jobs:

          CURRENT_ISSUE_FILE=codex-current-issue.json
          EXISTING_ALL_FILE=codex-existing-issues-all.json
+          EXISTING_OPEN_FILE=codex-existing-issues-open.json

          gh issue list --repo "$REPO" \
            --json number,title,body,createdAt,updatedAt,state,labels \
@@ -48,6 +47,22 @@ jobs:
              }]' \
            > "$EXISTING_ALL_FILE"

+          gh issue list --repo "$REPO" \
+            --json number,title,body,createdAt,updatedAt,state,labels \
+            --limit 1000 \
+            --state open \
+            --search "sort:created-desc" \
+            | jq '[.[] | {
+                number,
+                title,
+                body: ((.body // "")[0:4000]),
+                createdAt,
+                updatedAt,
+                state,
+                labels: ((.labels // []) | map(.name))
+              }]' \
+            > "$EXISTING_OPEN_FILE"
+
          gh issue view "$ISSUE_NUMBER" \
            --repo "$REPO" \
            --json number,title,body \
@@ -56,6 +71,7 @@ jobs:

          echo "Prepared duplicate detection input files."
          echo "all_issue_count=$(jq 'length' "$EXISTING_ALL_FILE")"
+          echo "open_issue_count=$(jq 'length' "$EXISTING_OPEN_FILE")"

      # Prompt instructions are intentionally inline in this workflow. The old
      # .github/prompts/issue-deduplicator.txt file is obsolete and removed.
@@ -142,59 +158,9 @@ jobs:
            echo "has_matches=$has_matches"
          } >> "$GITHUB_OUTPUT"

-  gather-duplicates-open:
-    name: Identify potential duplicates (open issues fallback)
-    # Pass 1 may drop sudo on the runner, so run the fallback in a fresh job.
-    needs: gather-duplicates-all
-    if: ${{ needs.gather-duplicates-all.result == 'success' && needs.gather-duplicates-all.outputs.has_matches != 'true' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    outputs:
-      issues_json: ${{ steps.normalize-open.outputs.issues_json }}
-      reason: ${{ steps.normalize-open.outputs.reason }}
-      has_matches: ${{ steps.normalize-open.outputs.has_matches }}
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Prepare Codex inputs
-        env:
-          GH_TOKEN: ${{ github.token }}
-          REPO: ${{ github.repository }}
-          ISSUE_NUMBER: ${{ github.event.issue.number }}
-        run: |
-          set -eo pipefail
-
-          CURRENT_ISSUE_FILE=codex-current-issue.json
-          EXISTING_OPEN_FILE=codex-existing-issues-open.json
-
-          gh issue list --repo "$REPO" \
-            --json number,title,body,createdAt,updatedAt,state,labels \
-            --limit 1000 \
-            --state open \
-            --search "sort:created-desc" \
-            | jq '[.[] | {
-                number,
-                title,
-                body: ((.body // "")[0:4000]),
-                createdAt,
-                updatedAt,
-                state,
-                labels: ((.labels // []) | map(.name))
-              }]' \
-            > "$EXISTING_OPEN_FILE"
-
-          gh issue view "$ISSUE_NUMBER" \
-            --repo "$REPO" \
-            --json number,title,body \
-            | jq '{number, title, body: ((.body // "")[0:4000])}' \
-            > "$CURRENT_ISSUE_FILE"
-
-          echo "Prepared fallback duplicate detection input files."
-          echo "open_issue_count=$(jq 'length' "$EXISTING_OPEN_FILE")"
-
      - id: codex-open
        name: Find duplicates (pass 2, open issues)
+        if: ${{ steps.normalize-all.outputs.has_matches != 'true' }}
        uses: openai/codex-action@main
        with:
          openai-api-key: ${{ secrets.CODEX_OPENAI_API_KEY }}
@@ -234,6 +200,7 @@ jobs:

      - id: normalize-open
        name: Normalize pass 2 output
+        if: ${{ steps.normalize-all.outputs.has_matches != 'true' }}
        env:
          CODEX_OUTPUT: ${{ steps.codex-open.outputs.final-message }}
          CURRENT_ISSUE_NUMBER: ${{ github.event.issue.number }}
@@ -276,27 +243,15 @@ jobs:
            echo "has_matches=$has_matches"
          } >> "$GITHUB_OUTPUT"

-  select-final:
-    name: Select final duplicate set
-    needs:
-      - gather-duplicates-all
-      - gather-duplicates-open
-    if: ${{ always() && needs.gather-duplicates-all.result == 'success' && (needs.gather-duplicates-open.result == 'success' || needs.gather-duplicates-open.result == 'skipped') }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    outputs:
-      codex_output: ${{ steps.select-final.outputs.codex_output }}
-    steps:
      - id: select-final
        name: Select final duplicate set
        env:
-          PASS1_ISSUES: ${{ needs.gather-duplicates-all.outputs.issues_json }}
-          PASS1_REASON: ${{ needs.gather-duplicates-all.outputs.reason }}
-          PASS2_ISSUES: ${{ needs.gather-duplicates-open.outputs.issues_json }}
-          PASS2_REASON: ${{ needs.gather-duplicates-open.outputs.reason }}
-          PASS1_HAS_MATCHES: ${{ needs.gather-duplicates-all.outputs.has_matches }}
-          PASS2_HAS_MATCHES: ${{ needs.gather-duplicates-open.outputs.has_matches }}
+          PASS1_ISSUES: ${{ steps.normalize-all.outputs.issues_json }}
+          PASS1_REASON: ${{ steps.normalize-all.outputs.reason }}
+          PASS2_ISSUES: ${{ steps.normalize-open.outputs.issues_json }}
+          PASS2_REASON: ${{ steps.normalize-open.outputs.reason }}
+          PASS1_HAS_MATCHES: ${{ steps.normalize-all.outputs.has_matches }}
+          PASS2_HAS_MATCHES: ${{ steps.normalize-open.outputs.has_matches }}
        run: |
          set -eo pipefail

@@ -334,8 +289,8 @@ jobs:

  comment-on-issue:
    name: Comment with potential duplicates
-    needs: select-final
-    if: ${{ always() && needs.select-final.result == 'success' }}
+    needs: gather-duplicates
+    if: ${{ needs.gather-duplicates.result != 'skipped' }}
    runs-on: ubuntu-latest
    permissions:
      contents: read
@@ -344,7 +299,7 @@ jobs:
      - name: Comment on issue
        uses: actions/github-script@v8
        env:
-          CODEX_OUTPUT: ${{ needs.select-final.outputs.codex_output }}
+          CODEX_OUTPUT: ${{ needs.gather-duplicates.outputs.codex_output }}
        with:
          github-token: ${{ github.token }}
          script: |
--- a/.github/workflows/rust-ci.yml
+++ b/.github/workflows/rust-ci.yml
@@ -392,7 +392,7 @@ jobs:

      - name: Upload Cargo timings (clippy)
        if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: cargo-timings-rust-ci-clippy-${{ matrix.target }}-${{ matrix.profile }}
          path: codex-rs/target/**/cargo-timings/cargo-timing.html
@@ -499,10 +499,6 @@ jobs:

    steps:
      - uses: actions/checkout@v6
-      - name: Set up Node.js for js_repl tests
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: codex-rs/node-version.txt
      - name: Install Linux build dependencies
        if: ${{ runner.os == 'Linux' }}
        shell: bash
@@ -605,7 +601,7 @@ jobs:

      - name: Upload Cargo timings (nextest)
        if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: cargo-timings-rust-ci-nextest-${{ matrix.target }}-${{ matrix.profile }}
          path: codex-rs/target/**/cargo-timings/cargo-timing.html
--- a/.github/workflows/rust-release-windows.yml
+++ b/.github/workflows/rust-release-windows.yml
@@ -92,7 +92,7 @@ jobs:
          cargo build --target ${{ matrix.target }} --release --timings ${{ matrix.build_args }}

      - name: Upload Cargo timings
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: cargo-timings-rust-release-windows-${{ matrix.target }}-${{ matrix.bundle }}
          path: codex-rs/target/**/cargo-timings/cargo-timing.html
@@ -112,7 +112,7 @@ jobs:
          fi

      - name: Upload Windows binaries
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: windows-binaries-${{ matrix.target }}-${{ matrix.bundle }}
          path: |
@@ -150,13 +150,13 @@ jobs:
      - uses: actions/checkout@v6

      - name: Download prebuilt Windows primary binaries
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          name: windows-binaries-${{ matrix.target }}-primary
          path: codex-rs/target/${{ matrix.target }}/release

      - name: Download prebuilt Windows helper binaries
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          name: windows-binaries-${{ matrix.target }}-helpers
          path: codex-rs/target/${{ matrix.target }}/release
@@ -257,7 +257,7 @@ jobs:
            "${GITHUB_WORKSPACE}/.github/workflows/zstd" -T0 -19 "$dest/$base"
          done

-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v6
        with:
          name: ${{ matrix.target }}
          path: |
--- a/.github/workflows/rust-release.yml
+++ b/.github/workflows/rust-release.yml
@@ -57,9 +57,7 @@ jobs:
      run:
        working-directory: codex-rs
    env:
-      # 2026-03-04: temporarily change releases to use thin LTO because
-      # Ubuntu ARM is timing out at 60 minutes.
-      CARGO_PROFILE_RELEASE_LTO: ${{ contains(github.ref_name, '-alpha') && 'thin' || 'thin' }}
+      CARGO_PROFILE_RELEASE_LTO: ${{ contains(github.ref_name, '-alpha') && 'thin' || 'fat' }}

    strategy:
      fail-fast: false
@@ -180,12 +178,6 @@ jobs:
        shell: bash
        run: |
          set -euo pipefail
-          # Avoid problematic aws-lc jitter entropy code path on musl builders.
-          echo "AWS_LC_SYS_NO_JITTER_ENTROPY=1" >> "$GITHUB_ENV"
-          target_no_jitter="AWS_LC_SYS_NO_JITTER_ENTROPY_${{ matrix.target }}"
-          target_no_jitter="${target_no_jitter//-/_}"
-          echo "${target_no_jitter}=1" >> "$GITHUB_ENV"
-
          # Clear global Rust flags so host/proc-macro builds don't pull in UBSan.
          echo "RUSTFLAGS=" >> "$GITHUB_ENV"
          echo "CARGO_ENCODED_RUSTFLAGS=" >> "$GITHUB_ENV"
@@ -213,11 +205,10 @@ jobs:
      - name: Cargo build
        shell: bash
        run: |
-          echo "CARGO_PROFILE_RELEASE_LTO: ${CARGO_PROFILE_RELEASE_LTO}"
          cargo build --target ${{ matrix.target }} --release --timings --bin codex --bin codex-responses-api-proxy

      - name: Upload Cargo timings
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: cargo-timings-rust-release-${{ matrix.target }}
          path: codex-rs/target/**/cargo-timings/cargo-timing.html
@@ -356,7 +347,7 @@ jobs:
            zstd -T0 -19 --rm "$dest/$base"
          done

-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v6
        with:
          name: ${{ matrix.target }}
          # Upload the per-binary .zst files as well as the new .tar.gz
@@ -420,7 +411,7 @@ jobs:

          echo "path=${notes_path}" >> "${GITHUB_OUTPUT}"

-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
        with:
          path: dist

@@ -497,11 +488,6 @@ jobs:
            --package codex-responses-api-proxy \
            --package codex-sdk

-      - name: Stage installer scripts
-        run: |
-          cp scripts/install/install.sh dist/install.sh
-          cp scripts/install/install.ps1 dist/install.ps1
-
      - name: Create GitHub Release
        uses: softprops/action-gh-release@v2
        with:
@@ -643,29 +629,6 @@ jobs:
            exit "${publish_status}"
          done

-  winget:
-    name: winget
-    needs: release
-    # Only publish stable/mainline releases to WinGet; pre-releases include a
-    # '-' in the semver string (e.g., 1.2.3-alpha.1).
-    if: ${{ !contains(needs.release.outputs.version, '-') }}
-    # This job only invokes a GitHub Action to open/update the winget-pkgs PR;
-    # it does not execute Windows-only tooling, so Linux is sufficient.
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - name: Publish to WinGet
-        uses: vedantmgoyal9/winget-releaser@19e706d4c9121098010096f9c495a70a7518b30f
-        with:
-          identifier: OpenAI.Codex
-          version: ${{ needs.release.outputs.version }}
-          release-tag: ${{ needs.release.outputs.tag }}
-          fork-user: openai-oss-forks
-          installers-regex: '^codex-(?:x86_64|aarch64)-pc-windows-msvc\.exe\.zip$'
-          token: ${{ secrets.WINGET_PUBLISH_PAT }}
-
  update-branch:
    name: Update latest-alpha-cli branch
    permissions:
--- a/.github/workflows/shell-tool-mcp.yml
+++ b/.github/workflows/shell-tool-mcp.yml
@@ -67,6 +67,128 @@ jobs:
          echo "npm_tag=${npm_tag}" >> "$GITHUB_OUTPUT"
          echo "should_publish=${should_publish}" >> "$GITHUB_OUTPUT"

+  rust-binaries:
+    name: Build Rust - ${{ matrix.target }}
+    needs: metadata
+    runs-on: ${{ matrix.runner }}
+    timeout-minutes: 30
+    env:
+      CARGO_PROFILE_RELEASE_LTO: ${{ contains(needs.metadata.outputs.version, '-alpha') && 'thin' || 'fat' }}
+    defaults:
+      run:
+        working-directory: codex-rs
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: macos-15-xlarge
+            target: aarch64-apple-darwin
+          - runner: macos-15-xlarge
+            target: x86_64-apple-darwin
+          - runner: ubuntu-24.04
+            target: x86_64-unknown-linux-musl
+            install_musl: true
+          - runner: ubuntu-24.04-arm
+            target: aarch64-unknown-linux-musl
+            install_musl: true
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Install UBSan runtime (musl)
+        if: ${{ matrix.install_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@1.93.0
+        with:
+          targets: ${{ matrix.target }}
+
+      - if: ${{ matrix.install_musl }}
+        name: Install Zig
+        uses: mlugg/setup-zig@v2
+        with:
+          version: 0.14.0
+
+      - if: ${{ matrix.install_musl }}
+        name: Install musl build dependencies
+        env:
+          TARGET: ${{ matrix.target }}
+        run: bash "${GITHUB_WORKSPACE}/.github/scripts/install-musl-build-tools.sh"
+
+      - if: ${{ matrix.install_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.install_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"
+
+      - name: Build exec server binaries
+        run: cargo build --release --target ${{ matrix.target }} --bin codex-exec-mcp-server --bin codex-execve-wrapper
+
+      - name: Stage exec server binaries
+        run: |
+          dest="${GITHUB_WORKSPACE}/artifacts/vendor/${{ matrix.target }}"
+          mkdir -p "$dest"
+          cp "target/${{ matrix.target }}/release/codex-exec-mcp-server" "$dest/"
+          cp "target/${{ matrix.target }}/release/codex-execve-wrapper" "$dest/"
+
+      - uses: actions/upload-artifact@v6
+        with:
+          name: shell-tool-mcp-rust-${{ matrix.target }}
+          path: artifacts/**
+          if-no-files-found: error
+
  bash-linux:
    name: Build Bash (Linux) - ${{ matrix.variant }} - ${{ matrix.target }}
    needs: metadata
@@ -146,8 +268,9 @@ jobs:
        shell: bash
        run: |
          set -euo pipefail
-          git clone https://git.savannah.gnu.org/git/bash /tmp/bash
+          git clone --depth 1 https://github.com/bolinfest/bash /tmp/bash
          cd /tmp/bash
+          git fetch --depth 1 origin a8a1c2fac029404d3f42cd39f5a20f24b6e4fe4b
          git checkout a8a1c2fac029404d3f42cd39f5a20f24b6e4fe4b
          git apply "${GITHUB_WORKSPACE}/shell-tool-mcp/patches/bash-exec-wrapper.patch"
          ./configure --without-bash-malloc
@@ -158,7 +281,7 @@ jobs:
          mkdir -p "$dest"
          cp bash "$dest/bash"

-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v6
        with:
          name: shell-tool-mcp-bash-${{ matrix.target }}-${{ matrix.variant }}
          path: artifacts/**
@@ -187,8 +310,9 @@ jobs:
        shell: bash
        run: |
          set -euo pipefail
-          git clone https://git.savannah.gnu.org/git/bash /tmp/bash
+          git clone --depth 1 https://github.com/bolinfest/bash /tmp/bash
          cd /tmp/bash
+          git fetch --depth 1 origin a8a1c2fac029404d3f42cd39f5a20f24b6e4fe4b
          git checkout a8a1c2fac029404d3f42cd39f5a20f24b6e4fe4b
          git apply "${GITHUB_WORKSPACE}/shell-tool-mcp/patches/bash-exec-wrapper.patch"
          ./configure --without-bash-malloc
@@ -199,7 +323,7 @@ jobs:
          mkdir -p "$dest"
          cp bash "$dest/bash"

-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v6
        with:
          name: shell-tool-mcp-bash-${{ matrix.target }}-${{ matrix.variant }}
          path: artifacts/**
@@ -325,7 +449,7 @@ jobs:
          grep -Fx "smoke-zsh" "$tmpdir/stdout.txt"
          grep -Fx "/bin/echo" "$tmpdir/wrapper.log"

-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v6
        with:
          name: shell-tool-mcp-zsh-${{ matrix.target }}-${{ matrix.variant }}
          path: artifacts/**
@@ -403,7 +527,7 @@ jobs:
          grep -Fx "smoke-zsh" "$tmpdir/stdout.txt"
          grep -Fx "/bin/echo" "$tmpdir/wrapper.log"

-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v6
        with:
          name: shell-tool-mcp-zsh-${{ matrix.target }}-${{ matrix.variant }}
          path: artifacts/**
@@ -413,6 +537,7 @@ jobs:
    name: Package npm module
    needs:
      - metadata
+      - rust-binaries
      - bash-linux
      - bash-darwin
      - zsh-linux
@@ -441,7 +566,7 @@ jobs:
        run: pnpm --filter @openai/codex-shell-tool-mcp run build

      - name: Download build artifacts
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          path: artifacts

@@ -454,6 +579,7 @@ jobs:
          mkdir -p "$staging" "$staging/vendor"
          cp shell-tool-mcp/README.md "$staging/"
          cp shell-tool-mcp/package.json "$staging/"
+          cp -R shell-tool-mcp/bin "$staging/"

          found_vendor="false"
          shopt -s nullglob
@@ -487,6 +613,8 @@ jobs:
          set -euo pipefail
          staging="${{ steps.staging.outputs.dir }}"
          chmod +x \
+            "$staging"/vendor/*/codex-exec-mcp-server \
+            "$staging"/vendor/*/codex-execve-wrapper \
            "$staging"/vendor/*/bash/*/bash \
            "$staging"/vendor/*/zsh/*/zsh

@@ -500,7 +628,7 @@ jobs:
          filename=$(PACK_INFO="$pack_info" node -e 'const data = JSON.parse(process.env.PACK_INFO); console.log(data[0].filename);')
          mv "dist/npm/${filename}" "dist/npm/codex-shell-tool-mcp-npm-${PACKAGE_VERSION}.tgz"

-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v6
        with:
          name: codex-shell-tool-mcp-npm
          path: dist/npm/codex-shell-tool-mcp-npm-${{ env.PACKAGE_VERSION }}.tgz
@@ -529,7 +657,7 @@ jobs:
        run: npm install -g npm@latest

      - name: Download npm tarball
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          name: codex-shell-tool-mcp-npm
          path: dist/npm
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
    "rust-analyzer.checkOnSave": true,
    "rust-analyzer.check.command": "clippy",
-    "rust-analyzer.check.extraArgs": ["--tests"],
+    "rust-analyzer.check.extraArgs": ["--all-features", "--tests"],
    "rust-analyzer.rustfmt.extraArgs": ["--config", "imports_granularity=Item"],
    "rust-analyzer.cargo.targetDir": "${workspaceFolder}/codex-rs/target/rust-analyzer",
    "[rust]": {
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -9,7 +9,7 @@ platform(
    name = "local_linux",
    constraint_values = [
        # We mark the local platform as glibc-compatible because musl-built rust cannot dlopen proc macros.
-        "@llvm//constraints/libc:gnu.2.28",
+        "@toolchains_llvm_bootstrapped//constraints/libc:gnu.2.28",
    ],
    parents = ["@platforms//host"],
 )
@@ -28,8 +28,4 @@ alias(
    actual = "@rbe_platform",
 )

-exports_files([
-    "AGENTS.md",
-    "workspace_root_test_launcher.bat.tpl",
-    "workspace_root_test_launcher.sh.tpl",
-])
+exports_files(["AGENTS.md"])
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,18 +1,14 @@
-module(name = "codex")
-
 bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "llvm", version = "0.6.1")
+bazel_dep(name = "toolchains_llvm_bootstrapped", version = "0.5.3")
 single_version_override(
-    module_name = "llvm",
+    module_name = "toolchains_llvm_bootstrapped",
    patch_strip = 1,
    patches = [
        "//patches:toolchains_llvm_bootstrapped_resource_dir.patch",
    ],
 )

-register_toolchains("@llvm//toolchain:all")
-
-osx = use_extension("@llvm//extensions:osx.bzl", "osx")
+osx = use_extension("@toolchains_llvm_bootstrapped//extensions:osx.bzl", "osx")
 osx.framework(name = "ApplicationServices")
 osx.framework(name = "AppKit")
 osx.framework(name = "ColorSync")
@@ -20,12 +16,8 @@ osx.framework(name = "CoreFoundation")
 osx.framework(name = "CoreGraphics")
 osx.framework(name = "CoreServices")
 osx.framework(name = "CoreText")
-osx.framework(name = "AudioToolbox")
 osx.framework(name = "CFNetwork")
 osx.framework(name = "FontServices")
-osx.framework(name = "AudioUnit")
-osx.framework(name = "CoreAudio")
-osx.framework(name = "CoreAudioTypes")
 osx.framework(name = "Foundation")
 osx.framework(name = "ImageIO")
 osx.framework(name = "IOKit")
@@ -33,13 +25,24 @@ osx.framework(name = "Kernel")
 osx.framework(name = "OSLog")
 osx.framework(name = "Security")
 osx.framework(name = "SystemConfiguration")
-use_repo(osx, "macos_sdk")
+
+register_toolchains(
+    "@toolchains_llvm_bootstrapped//toolchain:all",
+)

 # Needed to disable xcode...
 bazel_dep(name = "apple_support", version = "2.1.0")
 bazel_dep(name = "rules_cc", version = "0.2.16")
 bazel_dep(name = "rules_platform", version = "0.1.0")
-bazel_dep(name = "rules_rs", version = "0.0.40")
+bazel_dep(name = "rules_rs", version = "0.0.23")
+
+# Special toolchains branch
+archive_override(
+    module_name = "rules_rs",
+    integrity = "sha256-YbDRjZos4UmfIPY98znK1BgBWRQ1/ui3CtL6RqxE30I=",
+    strip_prefix = "rules_rs-6cf3d940fdc48baf3ebd6c37daf8e0be8fc73ecb",
+    url = "https://github.com/dzbarsky/rules_rs/archive/6cf3d940fdc48baf3ebd6c37daf8e0be8fc73ecb.tar.gz",
+)

 rules_rust = use_extension("@rules_rs//rs/experimental:rules_rust.bzl", "rules_rust")
 use_repo(rules_rust, "rules_rust")
@@ -49,9 +52,13 @@ toolchains.toolchain(
    edition = "2024",
    version = "1.93.0",
 )
-use_repo(toolchains, "default_rust_toolchains")
+use_repo(
+    toolchains,
+    "experimental_rust_toolchains_1_93_0",
+    "rust_toolchain_artifacts_macos_aarch64_1_93_0",
+)

-register_toolchains("@default_rust_toolchains//:all")
+register_toolchains("@experimental_rust_toolchains_1_93_0//:all")

 crate = use_extension("@rules_rs//rs:extensions.bzl", "crate")
 crate.from_cargo(
@@ -67,7 +74,6 @@ crate.from_cargo(
        "x86_64-apple-darwin",
        "x86_64-pc-windows-gnullvm",
    ],
-    use_experimental_platforms = True,
 )

 bazel_dep(name = "zstd", version = "1.5.7")
@@ -130,7 +136,6 @@ crate.annotation(
    },
    crate = "openssl-sys",
    data = ["@openssl//:gen_dir"],
-    gen_build_script = "on",
 )

 inject_repo(crate, "openssl")
@@ -140,29 +145,6 @@ crate.annotation(
    workspace_cargo_toml = "rust/runfiles/Cargo.toml",
 )

-llvm = use_extension("@llvm//extensions:llvm.bzl", "llvm")
-use_repo(llvm, "llvm-project")
-
-crate.annotation(
-    # Provide the hermetic SDK path so the build script doesn't try to invoke an unhermetic `xcrun --show-sdk-path`.
-    build_script_data = [
-        "@macos_sdk//sysroot",
-    ],
-    build_script_env = {
-        "BINDGEN_EXTRA_CLANG_ARGS": "-isystem $(location @llvm//:builtin_headers)",
-        "COREAUDIO_SDK_PATH": "$(location @macos_sdk//sysroot)",
-        "LIBCLANG_PATH": "$(location @llvm-project//clang:libclang_interface_output)",
-    },
-    build_script_tools = [
-        "@llvm-project//clang:libclang_interface_output",
-        "@llvm//:builtin_headers",
-    ],
-    crate = "coreaudio-sys",
-    gen_build_script = "on",
-)
-
-inject_repo(crate, "llvm", "llvm-project", "macos_sdk")
-
 # Fix readme inclusions
 crate.annotation(
    crate = "windows-link",
@@ -172,16 +154,27 @@ crate.annotation(
    ],
 )

-bazel_dep(name = "alsa_lib", version = "1.2.9.bcr.4")
+WINDOWS_IMPORT_LIB = """
+load("@rules_cc//cc:defs.bzl", "cc_import")
+
+cc_import(
+    name = "windows_import_lib",
+    static_library = glob(["lib/*.a"])[0],
+)
+"""

 crate.annotation(
-    crate = "alsa-sys",
+    additive_build_file_content = WINDOWS_IMPORT_LIB,
+    crate = "windows_x86_64_gnullvm",
    gen_build_script = "off",
-    deps = ["@alsa_lib"],
+    deps = [":windows_import_lib"],
+)
+crate.annotation(
+    additive_build_file_content = WINDOWS_IMPORT_LIB,
+    crate = "windows_aarch64_gnullvm",
+    gen_build_script = "off",
+    deps = [":windows_import_lib"],
 )
-
-inject_repo(crate, "alsa_lib")
-
 use_repo(crate, "crates")

 rbe_platform_repository = use_repo_rule("//:rbe.bzl", "rbe_platform_repository")
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
--- a/codex-rs/.cargo/config.toml
+++ b/codex-rs/.cargo/config.toml
@@ -1,11 +1,5 @@
 [target.'cfg(all(windows, target_env = "msvc"))']
 rustflags = ["-C", "link-arg=/STACK:8388608"]

-# MSVC emits a warning about code that may trip "Cortex-A53 MPCore processor bug #843419" (see
-# https://developer.arm.com/documentation/epm048406/latest) which is sometimes emitted by LLVM.
-# Since Arm64 Windows 10+ isn't supported on that processor, it's safe to disable the warning.
-[target.aarch64-pc-windows-msvc]
-rustflags = ["-C", "link-arg=/STACK:8388608", "-C", "link-arg=/arm64hazardfree"]
-
 [target.'cfg(all(windows, target_env = "gnu"))']
 rustflags = ["-C", "link-arg=-Wl,--stack,8388608"]
--- a/codex-rs/Cargo.lock
+++ b/codex-rs/Cargo.lock
@@ -291,28 +291,6 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"

-[[package]]
-name = "alsa"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
-dependencies = [
- "alsa-sys",
- "bitflags 2.10.0",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "alsa-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -480,58 +458,6 @@ dependencies = [
 "term",
 ]

-[[package]]
-name = "askama"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08e1676b346cadfec169374f949d7490fd80a24193d37d2afce0c047cf695e57"
-dependencies = [
- "askama_macros",
- "itoa",
- "percent-encoding",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "askama_derive"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7661ff56517787343f376f75db037426facd7c8d3049cef8911f1e75016f3a37"
-dependencies = [
- "askama_parser",
- "basic-toml",
- "memchr",
- "proc-macro2",
- "quote",
- "rustc-hash 2.1.1",
- "serde",
- "serde_derive",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "askama_macros"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713ee4dbfd1eb719c2dab859465b01fa1d21cb566684614a713a6b7a99a4e47b"
-dependencies = [
- "askama_derive",
-]
-
-[[package]]
-name = "askama_parser"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d62d674238a526418b30c0def480d5beadb9d8964e7f38d635b03bf639c704c"
-dependencies = [
- "rustc-hash 2.1.1",
- "serde",
- "serde_derive",
- "unicode-ident",
- "winnow",
-]
-
 [[package]]
 name = "asn1-rs"
 version = "0.7.1"
@@ -935,24 +861,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "bindgen"
-version = "0.72.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
-dependencies = [
- "bitflags 2.10.0",
- "cexpr",
- "clang-sys",
- "itertools 0.13.0",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 2.1.1",
- "shlex",
- "syn 2.0.114",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -1190,15 +1098,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"

-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom 7.1.3",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -1283,17 +1182,6 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.58"
@@ -1424,21 +1312,20 @@ dependencies = [
 "codex-chatgpt",
 "codex-cloud-requirements",
 "codex-core",
+ "codex-execpolicy",
 "codex-feedback",
 "codex-file-search",
 "codex-login",
- "codex-otel",
 "codex-protocol",
 "codex-rmcp-client",
 "codex-shell-command",
- "codex-state",
 "codex-utils-absolute-path",
 "codex-utils-cargo-bin",
 "codex-utils-cli",
 "codex-utils-json-to-toml",
- "codex-utils-pty",
 "core_test_support",
 "futures",
+ "os_info",
 "owo-colors",
 "pretty_assertions",
 "rmcp",
@@ -1458,24 +1345,6 @@ dependencies = [
 "wiremock",
 ]

-[[package]]
-name = "codex-app-server-client"
-version = "0.0.0"
-dependencies = [
- "codex-app-server",
- "codex-app-server-protocol",
- "codex-arg0",
- "codex-core",
- "codex-feedback",
- "codex-protocol",
- "pretty_assertions",
- "serde",
- "serde_json",
- "tokio",
- "toml 0.9.11+spec-1.1.0",
- "tracing",
-]
-
 [[package]]
 name = "codex-app-server-protocol"
 version = "0.0.0"
@@ -1488,14 +1357,12 @@ dependencies = [
 "codex-utils-cargo-bin",
 "inventory",
 "pretty_assertions",
- "rmcp",
 "schemars 0.8.22",
 "serde",
 "serde_json",
- "serde_with",
 "shlex",
 "similar",
- "strum_macros 0.28.0",
+ "strum_macros 0.27.2",
 "tempfile",
 "thiserror 2.0.18",
 "tracing",
@@ -1510,15 +1377,9 @@ dependencies = [
 "anyhow",
 "clap",
 "codex-app-server-protocol",
- "codex-core",
- "codex-otel",
 "codex-protocol",
- "codex-utils-cli",
 "serde",
 "serde_json",
- "tokio",
- "tracing",
- "tracing-subscriber",
 "tungstenite",
 "url",
 "uuid",
@@ -1547,32 +1408,12 @@ dependencies = [
 "anyhow",
 "codex-apply-patch",
 "codex-linux-sandbox",
- "codex-shell-escalation",
 "codex-utils-home-dir",
 "dotenvy",
 "tempfile",
 "tokio",
 ]

-[[package]]
-name = "codex-artifacts"
-version = "0.0.0"
-dependencies = [
- "codex-package-manager",
- "pretty_assertions",
- "reqwest",
- "serde",
- "serde_json",
- "sha2",
- "tempfile",
- "thiserror 2.0.18",
- "tokio",
- "url",
- "which",
- "wiremock",
- "zip",
-]
-
 [[package]]
 name = "codex-async-utils"
 version = "0.0.0"
@@ -1648,7 +1489,6 @@ dependencies = [
 "codex-protocol",
 "codex-responses-api-proxy",
 "codex-rmcp-client",
- "codex-state",
 "codex-stdio-to-uds",
 "codex-tui",
 "codex-utils-cargo-bin",
@@ -1660,14 +1500,11 @@ dependencies = [
 "pretty_assertions",
 "regex-lite",
 "serde_json",
- "sqlx",
 "supports-color 3.0.2",
 "tempfile",
 "tokio",
 "toml 0.9.11+spec-1.1.0",
 "tracing",
- "tracing-appender",
- "tracing-subscriber",
 ]

 [[package]]
@@ -1789,7 +1626,6 @@ version = "0.0.0"
 dependencies = [
 "anyhow",
 "arc-swap",
- "askama",
 "assert_cmd",
 "assert_matches",
 "async-channel",
@@ -1803,7 +1639,6 @@ dependencies = [
 "codex-app-server-protocol",
 "codex-apply-patch",
 "codex-arg0",
- "codex-artifacts",
 "codex-async-utils",
 "codex-client",
 "codex-config",
@@ -1818,23 +1653,17 @@ dependencies = [
 "codex-rmcp-client",
 "codex-secrets",
 "codex-shell-command",
- "codex-shell-escalation",
 "codex-skills",
 "codex-state",
- "codex-test-macros",
 "codex-utils-absolute-path",
- "codex-utils-cache",
 "codex-utils-cargo-bin",
 "codex-utils-home-dir",
- "codex-utils-image",
 "codex-utils-pty",
 "codex-utils-readiness",
- "codex-utils-stream-parser",
 "codex-utils-string",
 "codex-windows-sandbox",
 "core-foundation 0.9.4",
 "core_test_support",
- "csv",
 "ctor 0.6.3",
 "dirs",
 "dunce",
@@ -1843,9 +1672,9 @@ dependencies = [
 "eventsource-stream",
 "futures",
 "http 1.4.0",
- "iana-time-zone",
 "image",
 "indexmap 2.13.0",
+ "indoc",
 "insta",
 "keyring",
 "landlock",
@@ -1854,7 +1683,6 @@ dependencies = [
 "notify",
 "once_cell",
 "openssl-sys",
- "opentelemetry",
 "opentelemetry_sdk",
 "os_info",
 "predicates",
@@ -1884,7 +1712,6 @@ dependencies = [
 "toml 0.9.11+spec-1.1.0",
 "toml_edit 0.24.0+spec-1.1.0",
 "tracing",
- "tracing-opentelemetry",
 "tracing-subscriber",
 "tracing-test",
 "url",
@@ -1917,14 +1744,10 @@ dependencies = [
 "anyhow",
 "assert_cmd",
 "clap",
- "codex-app-server-client",
- "codex-app-server-protocol",
 "codex-apply-patch",
 "codex-arg0",
 "codex-cloud-requirements",
 "codex-core",
- "codex-feedback",
- "codex-otel",
 "codex-protocol",
 "codex-utils-absolute-path",
 "codex-utils-cargo-bin",
@@ -1934,8 +1757,6 @@ dependencies = [
 "codex-utils-sandbox-summary",
 "core_test_support",
 "libc",
- "opentelemetry",
- "opentelemetry_sdk",
 "owo-colors",
 "predicates",
 "pretty_assertions",
@@ -1947,7 +1768,6 @@ dependencies = [
 "tempfile",
 "tokio",
 "tracing",
- "tracing-opentelemetry",
 "tracing-subscriber",
 "ts-rs",
 "uuid",
@@ -1955,13 +1775,41 @@ dependencies = [
 "wiremock",
 ]

+[[package]]
+name = "codex-exec-server"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "clap",
+ "codex-core",
+ "codex-execpolicy",
+ "codex-protocol",
+ "codex-shell-command",
+ "codex-utils-cargo-bin",
+ "exec_server_test_support",
+ "libc",
+ "maplit",
+ "path-absolutize",
+ "pretty_assertions",
+ "rmcp",
+ "serde",
+ "serde_json",
+ "shlex",
+ "socket2 0.6.2",
+ "tempfile",
+ "tokio",
+ "tokio-util",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "codex-execpolicy"
 version = "0.0.0"
 dependencies = [
 "anyhow",
 "clap",
- "codex-utils-absolute-path",
 "multimap",
 "pretty_assertions",
 "serde",
@@ -2112,7 +1960,6 @@ dependencies = [
 "codex-app-server-protocol",
 "codex-core",
 "core_test_support",
- "pretty_assertions",
 "rand 0.9.2",
 "reqwest",
 "serde",
@@ -2121,7 +1968,6 @@ dependencies = [
 "tempfile",
 "tiny_http",
 "tokio",
- "tracing",
 "url",
 "urlencoding",
 "webbrowser",
@@ -2161,10 +2007,8 @@ version = "0.0.0"
 dependencies = [
 "anyhow",
 "async-trait",
- "chrono",
 "clap",
 "codex-utils-absolute-path",
- "codex-utils-home-dir",
 "codex-utils-rustls-provider",
 "globset",
 "pretty_assertions",
@@ -2214,7 +2058,6 @@ dependencies = [
 "codex-utils-absolute-path",
 "codex-utils-string",
 "eventsource-stream",
- "gethostname",
 "http 1.4.0",
 "opentelemetry",
 "opentelemetry-appender-tracing",
@@ -2226,7 +2069,7 @@ dependencies = [
 "reqwest",
 "serde",
 "serde_json",
- "strum_macros 0.28.0",
+ "strum_macros 0.27.2",
 "thiserror 2.0.18",
 "tokio",
 "tokio-tungstenite",
@@ -2235,26 +2078,6 @@ dependencies = [
 "tracing-subscriber",
 ]

-[[package]]
-name = "codex-package-manager"
-version = "0.0.0"
-dependencies = [
- "fd-lock",
- "flate2",
- "pretty_assertions",
- "reqwest",
- "serde",
- "serde_json",
- "sha2",
- "tar",
- "tempfile",
- "thiserror 2.0.18",
- "tokio",
- "url",
- "wiremock",
- "zip",
-]
-
 [[package]]
 name = "codex-process-hardening"
 version = "0.0.0"
@@ -2282,7 +2105,7 @@ dependencies = [
 "serde_json",
 "serde_with",
 "strum 0.27.2",
- "strum_macros 0.28.0",
+ "strum_macros 0.27.2",
 "sys-locale",
 "tempfile",
 "tracing",
@@ -2328,9 +2151,7 @@ dependencies = [
 "serde_json",
 "serial_test",
 "sha2",
- "sse-stream",
 "tempfile",
- "thiserror 2.0.18",
 "tiny_http",
 "tokio",
 "tracing",
@@ -2379,27 +2200,6 @@ dependencies = [
 "which",
 ]

-[[package]]
-name = "codex-shell-escalation"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "clap",
- "codex-protocol",
- "codex-utils-absolute-path",
- "libc",
- "pretty_assertions",
- "serde",
- "serde_json",
- "socket2 0.6.2",
- "tempfile",
- "tokio",
- "tokio-util",
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "codex-skills"
 version = "0.0.0"
@@ -2416,6 +2216,7 @@ dependencies = [
 "anyhow",
 "chrono",
 "clap",
+ "codex-otel",
 "codex-protocol",
 "dirs",
 "log",
@@ -2442,15 +2243,6 @@ dependencies = [
 "uds_windows",
 ]

-[[package]]
-name = "codex-test-macros"
-version = "0.0.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.114",
-]
-
 [[package]]
 name = "codex-tui"
 version = "0.0.0"
@@ -2486,16 +2278,13 @@ dependencies = [
 "codex-utils-pty",
 "codex-utils-sandbox-summary",
 "codex-utils-sleep-inhibitor",
- "codex-utils-string",
 "codex-windows-sandbox",
 "color-eyre",
- "cpal",
 "crossterm",
 "derive_more 2.1.1",
 "diffy",
 "dirs",
 "dunce",
- "hound",
 "image",
 "insta",
 "itertools 0.14.0",
@@ -2515,7 +2304,7 @@ dependencies = [
 "serial_test",
 "shlex",
 "strum 0.27.2",
- "strum_macros 0.28.0",
+ "strum_macros 0.27.2",
 "supports-color 3.0.2",
 "syntect",
 "tempfile",
@@ -2686,16 +2475,7 @@ name = "codex-utils-sleep-inhibitor"
 version = "0.0.0"
 dependencies = [
 "core-foundation 0.9.4",
- "libc",
 "tracing",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "codex-utils-stream-parser"
-version = "0.0.0"
-dependencies = [
- "pretty_assertions",
 ]

 [[package]]
@@ -2703,7 +2483,6 @@ name = "codex-utils-string"
 version = "0.0.0"
 dependencies = [
 "pretty_assertions",
- "regex-lite",
 ]

 [[package]]
@@ -2936,49 +2715,6 @@ dependencies = [
 "zstd",
 ]

-[[package]]
-name = "coreaudio-rs"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation-sys",
- "coreaudio-sys",
-]
-
-[[package]]
-name = "coreaudio-sys"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceec7a6067e62d6f931a2baf6f3a751f4a892595bcec1461a3c94ef9949864b6"
-dependencies = [
- "bindgen",
-]
-
-[[package]]
-name = "cpal"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
-dependencies = [
- "alsa",
- "core-foundation-sys",
- "coreaudio-rs",
- "dasp_sample",
- "jni",
- "js-sys",
- "libc",
- "mach2",
- "ndk",
- "ndk-context",
- "oboe",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows 0.54.0",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -3279,12 +3015,6 @@ dependencies = [
 "syn 2.0.114",
 ]

-[[package]]
-name = "dasp_sample"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
-
 [[package]]
 name = "data-encoding"
 version = "2.10.0"
@@ -3831,6 +3561,19 @@ dependencies = [
 "pin-project-lite",
 ]

+[[package]]
+name = "exec_server_test_support"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "codex-core",
+ "codex-protocol",
+ "codex-utils-cargo-bin",
+ "rmcp",
+ "serde_json",
+ "tokio",
+]
+
 [[package]]
 name = "eyre"
 version = "0.6.12"
@@ -3907,17 +3650,6 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "filetime"
-version = "0.2.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db"
-dependencies = [
- "cfg-if",
- "libc",
- "libredox",
-]
-
 [[package]]
 name = "find-crate"
 version = "0.6.3"
@@ -4321,12 +4053,6 @@ version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"

-[[package]]
-name = "glob"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
-
 [[package]]
 name = "globset"
 version = "0.4.18"
@@ -4543,12 +4269,6 @@ dependencies = [
 "windows-link",
 ]

-[[package]]
-name = "hound"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f"
-
 [[package]]
 name = "http"
 version = "0.2.12"
@@ -5394,9 +5114,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.182"
+version = "0.2.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
+checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"

 [[package]]
 name = "libdbus-sys"
@@ -5407,16 +5127,6 @@ dependencies = [
 "pkg-config",
 ]

-[[package]]
-name = "libloading"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
-dependencies = [
- "cfg-if",
- "windows-link",
-]
-
 [[package]]
 name = "libm"
 version = "0.2.16"
@@ -5608,15 +5318,6 @@ dependencies = [
 "pkg-config",
 ]

-[[package]]
-name = "mach2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "maplit"
 version = "1.0.2"
@@ -5800,35 +5501,12 @@ dependencies = [
 "tempfile",
 ]

-[[package]]
-name = "ndk"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
-dependencies = [
- "bitflags 2.10.0",
- "jni-sys",
- "log",
- "ndk-sys",
- "num_enum",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "ndk-context"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"

-[[package]]
-name = "ndk-sys"
-version = "0.5.0+25.2.9519653"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
-dependencies = [
- "jni-sys",
-]
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -6016,17 +5694,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"

-[[package]]
-name = "num-derive"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.114",
-]
-
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -6078,28 +5745,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "num_enum"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
-dependencies = [
- "num_enum_derive",
- "rustversion",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.114",
-]
-
 [[package]]
 name = "num_threads"
 version = "0.1.7"
@@ -6309,29 +5954,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "oboe"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
-dependencies = [
- "jni",
- "ndk",
- "ndk-context",
- "num-derive",
- "num-traits",
- "oboe-sys",
-]
-
-[[package]]
-name = "oboe-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "oid-registry"
 version = "0.8.1"
@@ -6588,9 +6210,9 @@ dependencies = [

 [[package]]
 name = "owo-colors"
-version = "4.3.0"
+version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d"
+checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52"
 dependencies = [
 "supports-color 2.1.0",
 "supports-color 3.0.2",
@@ -7760,7 +7382,6 @@ dependencies = [
 "js-sys",
 "log",
 "mime",
- "mime_guess",
 "native-tls",
 "percent-encoding",
 "pin-project-lite",
@@ -8568,9 +8189,9 @@ dependencies = [

 [[package]]
 name = "serde_with"
-version = "3.17.0"
+version = "3.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "381b283ce7bc6b476d903296fb59d0d36633652b633b27f64db4fb46dcbfc3b9"
+checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7"
 dependencies = [
 "base64 0.22.1",
 "chrono",
@@ -8587,9 +8208,9 @@ dependencies = [

 [[package]]
 name = "serde_with_macros"
-version = "3.17.0"
+version = "3.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6d4e30573c8cb306ed6ab1dca8423eec9a463ea0e155f45399455e0368b27e0"
+checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c"
 dependencies = [
 "darling 0.21.3",
 "proc-macro2",
@@ -9238,9 +8859,9 @@ dependencies = [

 [[package]]
 name = "strum_macros"
-version = "0.28.0"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664"
+checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -9372,17 +8993,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"

-[[package]]
-name = "tar"
-version = "0.4.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.24.0"
@@ -10774,16 +10384,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

-[[package]]
-name = "windows"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
-dependencies = [
- "windows-core 0.54.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.58.0"
@@ -10815,16 +10415,6 @@ dependencies = [
 "windows-core 0.62.2",
 ]

-[[package]]
-name = "windows-core"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
-dependencies = [
- "windows-result 0.1.2",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.58.0"
@@ -10933,15 +10523,6 @@ dependencies = [
 "windows-strings 0.5.1",
 ]

-[[package]]
-name = "windows-result"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.2.0"
@@ -11435,16 +11016,6 @@ dependencies = [
 "time",
 ]

-[[package]]
-name = "xattr"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
-dependencies = [
- "libc",
- "rustix 1.1.3",
-]
-
 [[package]]
 name = "xdg-home"
 version = "1.3.0"
--- a/codex-rs/Cargo.toml
+++ b/codex-rs/Cargo.toml
@@ -4,7 +4,6 @@ members = [
    "ansi-escape",
    "async-utils",
    "app-server",
-    "app-server-client",
    "app-server-protocol",
    "app-server-test-client",
    "debug-client",
@@ -18,12 +17,12 @@ members = [
    "cli",
    "config",
    "shell-command",
-    "shell-escalation",
    "skills",
    "core",
    "hooks",
    "secrets",
    "exec",
+    "exec-server",
    "execpolicy",
    "execpolicy-legacy",
    "keyring-store",
@@ -59,14 +58,10 @@ members = [
    "utils/approval-presets",
    "utils/oss",
    "utils/fuzzy-match",
-    "utils/stream-parser",
    "codex-client",
    "codex-api",
    "state",
    "codex-experimental-api-macros",
-    "test-macros",
-    "package-manager",
-    "artifacts",
 ]
 resolver = "2"

@@ -84,10 +79,7 @@ license = "Apache-2.0"
 app_test_support = { path = "app-server/tests/common" }
 codex-ansi-escape = { path = "ansi-escape" }
 codex-api = { path = "codex-api" }
-codex-artifacts = { path = "artifacts" }
-codex-package-manager = { path = "package-manager" }
 codex-app-server = { path = "app-server" }
-codex-app-server-client = { path = "app-server-client" }
 codex-app-server-protocol = { path = "app-server-protocol" }
 codex-app-server-test-client = { path = "app-server-test-client" }
 codex-apply-patch = { path = "apply-patch" }
@@ -121,11 +113,9 @@ codex-responses-api-proxy = { path = "responses-api-proxy" }
 codex-rmcp-client = { path = "rmcp-client" }
 codex-secrets = { path = "secrets" }
 codex-shell-command = { path = "shell-command" }
-codex-shell-escalation = { path = "shell-escalation" }
 codex-skills = { path = "skills" }
 codex-state = { path = "state" }
 codex-stdio-to-uds = { path = "stdio-to-uds" }
-codex-test-macros = { path = "test-macros" }
 codex-tui = { path = "tui" }
 codex-utils-absolute-path = { path = "utils/absolute-path" }
 codex-utils-approval-presets = { path = "utils/approval-presets" }
@@ -143,10 +133,10 @@ codex-utils-readiness = { path = "utils/readiness" }
 codex-utils-rustls-provider = { path = "utils/rustls-provider" }
 codex-utils-sandbox-summary = { path = "utils/sandbox-summary" }
 codex-utils-sleep-inhibitor = { path = "utils/sleep-inhibitor" }
-codex-utils-stream-parser = { path = "utils/stream-parser" }
 codex-utils-string = { path = "utils/string" }
 codex-windows-sandbox = { path = "windows-sandbox-rs" }
 core_test_support = { path = "core/tests/common" }
+exec_server_test_support = { path = "exec-server/tests/common" }
 mcp_test_support = { path = "mcp-server/tests/common" }

 # External
@@ -155,7 +145,6 @@ allocative = "0.3.3"
 ansi-to-tui = "7.0.0"
 anyhow = "1"
 arboard = { version = "3", features = ["wayland-data-control"] }
-askama = "0.15.4"
 assert_cmd = "2"
 assert_matches = "1.5.0"
 async-channel = "2.3.1"
@@ -172,7 +161,6 @@ clap_complete = "4"
 color-eyre = "0.6.3"
 crossbeam-channel = "0.5.15"
 crossterm = "0.28.1"
-csv = "1.3.1"
 ctor = "0.6.3"
 derive_more = "2"
 diffy = "0.4.2"
@@ -180,13 +168,10 @@ dirs = "6"
 dotenvy = "0.15.7"
 dunce = "1.0.4"
 encoding_rs = "0.8.35"
-fd-lock = "4.0.4"
 env-flags = "0.1.1"
 env_logger = "0.11.9"
 eventsource-stream = "0.2.3"
-flate2 = "1.1.4"
 futures = { version = "0.3", default-features = false }
-gethostname = "1.1.0"
 globset = "0.4"
 http = "1.3.1"
 icu_decimal = "2.1"
@@ -194,16 +179,16 @@ icu_locale_core = "2.1"
 icu_provider = { version = "2.1", features = ["sync"] }
 ignore = "0.4.23"
 image = { version = "^0.25.9", default-features = false }
-iana-time-zone = "0.1.64"
 include_dir = "0.7.4"
 indexmap = "2.12.0"
+indoc = "2.0"
 insta = "1.46.3"
 inventory = "0.3.19"
 itertools = "0.14.0"
 keyring = { version = "3.6", default-features = false }
 landlock = "0.4.4"
 lazy_static = "1"
-libc = "0.2.182"
+libc = "0.2.177"
 log = "0.4"
 lru = "0.16.3"
 maplit = "1.0.2"
@@ -219,7 +204,7 @@ opentelemetry-otlp = "0.31.0"
 opentelemetry-semantic-conventions = "0.31.0"
 opentelemetry_sdk = "0.31.0"
 os_info = "3.12.0"
-owo-colors = "4.3.0"
+owo-colors = "4.2.0"
 path-absolutize = "3.1.1"
 pathdiff = "0.2"
 portable-pty = "0.9.0"
@@ -245,7 +230,7 @@ sentry = "0.46.0"
 serde = "1"
 serde_json = "1"
 serde_path_to_error = "0.1.20"
-serde_with = "3.17"
+serde_with = "3.16"
 serde_yaml = "0.9"
 serial_test = "3.2.0"
 sha1 = "0.10.6"
@@ -265,12 +250,10 @@ sqlx = { version = "0.8.6", default-features = false, features = [
 ] }
 starlark = "0.13.0"
 strum = "0.27.2"
-strum_macros = "0.28.0"
+strum_macros = "0.27.2"
 supports-color = "3.0.2"
-syntect = "5"
 sys-locale = "0.3.2"
 tempfile = "3.23.0"
-tar = "0.4.44"
 test-log = "0.2.19"
 textwrap = "0.16.2"
 thiserror = "2.0.17"
@@ -293,6 +276,7 @@ tracing-subscriber = "0.3.22"
 tracing-test = "0.2.5"
 tree-sitter = "0.25.10"
 tree-sitter-bash = "0.25"
+syntect = "5"
 ts-rs = "11"
 tungstenite = { version = "0.27.0", features = ["deflate", "proxy"] }
 uds_windows = "1.1.0"
@@ -357,12 +341,11 @@ ignored = [
    "icu_provider",
    "openssl-sys",
    "codex-utils-readiness",
-    "codex-secrets"
+    "codex-secrets",
 ]

 [profile.release]
 lto = "fat"
-split-debuginfo = "off"
 # Because we bundle some of these executables with the TypeScript CLI, we
 # remove everything to make the binary as small as possible.
 strip = "symbols"
--- a/codex-rs/README.md
+++ b/codex-rs/README.md
@@ -88,7 +88,6 @@ 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/app-server-client/BUILD.bazel
+++ b/codex-rs/app-server-client/BUILD.bazel
@@ -1,6 +0,0 @@
-load("//:defs.bzl", "codex_rust_crate")
-
-codex_rust_crate(
-    name = "app-server-client",
-    crate_name = "codex_app_server_client",
-)
--- a/codex-rs/app-server-client/Cargo.toml
+++ b/codex-rs/app-server-client/Cargo.toml
@@ -1,30 +0,0 @@
-[package]
-name = "codex-app-server-client"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[lib]
-name = "codex_app_server_client"
-path = "src/lib.rs"
-
-[lints]
-workspace = true
-
-[dependencies]
-codex-app-server = { workspace = true }
-codex-app-server-protocol = { workspace = true }
-codex-arg0 = { workspace = true }
-codex-core = { workspace = true }
-codex-feedback = { workspace = true }
-codex-protocol = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true, features = ["sync", "time", "rt"] }
-toml = { workspace = true }
-tracing = { workspace = true }
-
-[dev-dependencies]
-pretty_assertions = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
--- a/codex-rs/app-server-client/README.md
+++ b/codex-rs/app-server-client/README.md
@@ -1,67 +0,0 @@
-# codex-app-server-client
-
-Shared in-process app-server client used by conversational CLI surfaces:
-
- `codex-exec`
- `codex-tui`
-
-## Purpose
-
-This crate centralizes startup and lifecycle management for an in-process
-`codex-app-server` runtime, so CLI clients do not need to duplicate:
-
- app-server bootstrap and initialize handshake
- in-memory request/event transport wiring
- lifecycle orchestration around caller-provided startup identity
- graceful shutdown behavior
-
-## Startup identity
-
-Callers pass both the app-server `SessionSource` and the initialize
-`client_info.name` explicitly when starting the facade.
-
-That keeps thread metadata (for example in `thread/list` and `thread/read`)
-aligned with the originating runtime without baking TUI/exec-specific policy
-into the shared client layer.
-
-## Transport model
-
-The in-process path uses typed channels:
-
- client -> server: `ClientRequest` / `ClientNotification`
- server -> client: `InProcessServerEvent`
-  - `ServerRequest`
-  - `ServerNotification`
-  - `LegacyNotification`
-
-JSON serialization is still used at external transport boundaries
-(stdio/websocket), but the in-process hot path is typed.
-
-Typed requests still receive app-server responses through the JSON-RPC
-result envelope internally. That is intentional: the in-process path is
-meant to preserve app-server semantics while removing the process
-boundary, not to introduce a second response contract.
-
-## Bootstrap behavior
-
-The client facade starts an already-initialized in-process runtime, but
-thread bootstrap still follows normal app-server flow:
-
- caller sends `thread/start` or `thread/resume`
- app-server returns the immediate typed response
- richer session metadata may arrive later as a `SessionConfigured`
-  legacy event
-
-Surfaces such as TUI and exec may therefore need a short bootstrap
-phase where they reconcile startup response data with later events.
-
-## Backpressure and shutdown
-
- Queues are bounded and use `DEFAULT_IN_PROCESS_CHANNEL_CAPACITY` by default.
- Full queues return explicit overload behavior instead of unbounded growth.
- `shutdown()` performs a bounded graceful shutdown and then aborts if timeout
-  is exceeded.
-
-If the client falls behind on event consumption, the worker emits
-`InProcessServerEvent::Lagged` and may reject pending server requests so
-approval flows do not hang indefinitely behind a saturated queue.
--- a/codex-rs/app-server-client/src/lib.rs
+++ b/codex-rs/app-server-client/src/lib.rs
@@ -1,801 +0,0 @@
-//! Shared in-process app-server client facade for CLI surfaces.
-//!
-//! This crate wraps [`codex_app_server::in_process`] behind a single async API
-//! used by surfaces like TUI and exec. It centralizes:
-//!
-//! - Runtime startup and initialize-capabilities handshake.
-//! - Typed caller-provided startup identity (`SessionSource` + client name).
-//! - Typed and raw request/notification dispatch.
-//! - Server request resolution and rejection.
-//! - Event consumption with backpressure signaling ([`InProcessServerEvent::Lagged`]).
-//! - Bounded graceful shutdown with abort fallback.
-//!
-//! The facade interposes a worker task between the caller and the underlying
-//! [`InProcessClientHandle`](codex_app_server::in_process::InProcessClientHandle),
-//! bridging async `mpsc` channels on both sides. Queues are bounded so overload
-//! surfaces as channel-full errors rather than unbounded memory growth.
-
-use std::error::Error;
-use std::fmt;
-use std::io::Error as IoError;
-use std::io::ErrorKind;
-use std::io::Result as IoResult;
-use std::sync::Arc;
-use std::time::Duration;
-
-pub use codex_app_server::in_process::DEFAULT_IN_PROCESS_CHANNEL_CAPACITY;
-pub use codex_app_server::in_process::InProcessServerEvent;
-use codex_app_server::in_process::InProcessStartArgs;
-use codex_app_server_protocol::ClientInfo;
-use codex_app_server_protocol::ClientNotification;
-use codex_app_server_protocol::ClientRequest;
-use codex_app_server_protocol::ConfigWarningNotification;
-use codex_app_server_protocol::InitializeCapabilities;
-use codex_app_server_protocol::InitializeParams;
-use codex_app_server_protocol::JSONRPCErrorError;
-use codex_app_server_protocol::RequestId;
-use codex_app_server_protocol::Result as JsonRpcResult;
-use codex_arg0::Arg0DispatchPaths;
-use codex_core::config::Config;
-use codex_core::config_loader::CloudRequirementsLoader;
-use codex_core::config_loader::LoaderOverrides;
-use codex_feedback::CodexFeedback;
-use codex_protocol::protocol::SessionSource;
-use serde::de::DeserializeOwned;
-use tokio::sync::mpsc;
-use tokio::sync::oneshot;
-use tokio::time::timeout;
-use toml::Value as TomlValue;
-use tracing::warn;
-
-const SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);
-
-/// Raw app-server request result for typed in-process requests.
-///
-/// Even on the in-process path, successful responses still travel back through
-/// the same JSON-RPC result envelope used by socket/stdio transports because
-/// `MessageProcessor` continues to produce that shape internally.
-pub type RequestResult = std::result::Result<JsonRpcResult, JSONRPCErrorError>;
-
-fn event_requires_delivery(event: &InProcessServerEvent) -> bool {
-    // These terminal events drive surface shutdown/completion state. Dropping
-    // them under backpressure can leave exec/TUI waiting forever even though
-    // the underlying turn has already ended.
-    match event {
-        InProcessServerEvent::ServerNotification(
-            codex_app_server_protocol::ServerNotification::TurnCompleted(_),
-        ) => true,
-        InProcessServerEvent::LegacyNotification(notification) => matches!(
-            notification
-                .method
-                .strip_prefix("codex/event/")
-                .unwrap_or(&notification.method),
-            "task_complete" | "turn_aborted" | "shutdown_complete"
-        ),
-        _ => false,
-    }
-}
-
-/// Layered error for [`InProcessAppServerClient::request_typed`].
-///
-/// This keeps transport failures, server-side JSON-RPC failures, and response
-/// decode failures distinct so callers can decide whether to retry, surface a
-/// server error, or treat the response as an internal request/response mismatch.
-#[derive(Debug)]
-pub enum TypedRequestError {
-    Transport {
-        method: String,
-        source: IoError,
-    },
-    Server {
-        method: String,
-        source: JSONRPCErrorError,
-    },
-    Deserialize {
-        method: String,
-        source: serde_json::Error,
-    },
-}
-
-impl fmt::Display for TypedRequestError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Transport { method, source } => {
-                write!(f, "{method} transport error: {source}")
-            }
-            Self::Server { method, source } => {
-                write!(f, "{method} failed: {}", source.message)
-            }
-            Self::Deserialize { method, source } => {
-                write!(f, "{method} response decode error: {source}")
-            }
-        }
-    }
-}
-
-impl Error for TypedRequestError {
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
-        match self {
-            Self::Transport { source, .. } => Some(source),
-            Self::Server { .. } => None,
-            Self::Deserialize { source, .. } => Some(source),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct InProcessClientStartArgs {
-    /// Resolved argv0 dispatch paths used by command execution internals.
-    pub arg0_paths: Arg0DispatchPaths,
-    /// Shared config used to initialize app-server runtime.
-    pub config: Arc<Config>,
-    /// CLI config overrides that are already parsed into TOML values.
-    pub cli_overrides: Vec<(String, TomlValue)>,
-    /// Loader override knobs used by config API paths.
-    pub loader_overrides: LoaderOverrides,
-    /// Preloaded cloud requirements provider.
-    pub cloud_requirements: CloudRequirementsLoader,
-    /// Feedback sink used by app-server/core telemetry and logs.
-    pub feedback: CodexFeedback,
-    /// Startup warnings emitted after initialize succeeds.
-    pub config_warnings: Vec<ConfigWarningNotification>,
-    /// Session source recorded in app-server thread metadata.
-    pub session_source: SessionSource,
-    /// Whether auth loading should honor the `CODEX_API_KEY` environment variable.
-    pub enable_codex_api_key_env: bool,
-    /// Client name reported during initialize.
-    pub client_name: String,
-    /// Client version reported during initialize.
-    pub client_version: String,
-    /// Whether experimental APIs are requested at initialize time.
-    pub experimental_api: bool,
-    /// Notification methods this client opts out of receiving.
-    pub opt_out_notification_methods: Vec<String>,
-    /// Queue capacity for command/event channels (clamped to at least 1).
-    pub channel_capacity: usize,
-}
-
-impl InProcessClientStartArgs {
-    /// Builds initialize params from caller-provided metadata.
-    pub fn initialize_params(&self) -> InitializeParams {
-        let capabilities = InitializeCapabilities {
-            experimental_api: self.experimental_api,
-            opt_out_notification_methods: if self.opt_out_notification_methods.is_empty() {
-                None
-            } else {
-                Some(self.opt_out_notification_methods.clone())
-            },
-        };
-
-        InitializeParams {
-            client_info: ClientInfo {
-                name: self.client_name.clone(),
-                title: None,
-                version: self.client_version.clone(),
-            },
-            capabilities: Some(capabilities),
-        }
-    }
-
-    fn into_runtime_start_args(self) -> InProcessStartArgs {
-        let initialize = self.initialize_params();
-        InProcessStartArgs {
-            arg0_paths: self.arg0_paths,
-            config: self.config,
-            cli_overrides: self.cli_overrides,
-            loader_overrides: self.loader_overrides,
-            cloud_requirements: self.cloud_requirements,
-            feedback: self.feedback,
-            config_warnings: self.config_warnings,
-            session_source: self.session_source,
-            enable_codex_api_key_env: self.enable_codex_api_key_env,
-            initialize,
-            channel_capacity: self.channel_capacity,
-        }
-    }
-}
-
-/// Internal command sent from public facade methods to the worker task.
-///
-/// Each variant carries a oneshot sender so the caller can `await` the
-/// result without holding a mutable reference to the client.
-enum ClientCommand {
-    Request {
-        request: Box<ClientRequest>,
-        response_tx: oneshot::Sender<IoResult<RequestResult>>,
-    },
-    Notify {
-        notification: ClientNotification,
-        response_tx: oneshot::Sender<IoResult<()>>,
-    },
-    ResolveServerRequest {
-        request_id: RequestId,
-        result: JsonRpcResult,
-        response_tx: oneshot::Sender<IoResult<()>>,
-    },
-    RejectServerRequest {
-        request_id: RequestId,
-        error: JSONRPCErrorError,
-        response_tx: oneshot::Sender<IoResult<()>>,
-    },
-    Shutdown {
-        response_tx: oneshot::Sender<IoResult<()>>,
-    },
-}
-
-/// Async facade over the in-process app-server runtime.
-///
-/// This type owns a worker task that bridges between:
-/// - caller-facing async `mpsc` channels used by TUI/exec
-/// - [`codex_app_server::in_process::InProcessClientHandle`], which speaks to
-///   the embedded `MessageProcessor`
-///
-/// The facade intentionally preserves the server's request/notification/event
-/// model instead of exposing direct core runtime handles. That keeps in-process
-/// callers aligned with app-server behavior while still avoiding a process
-/// boundary.
-pub struct InProcessAppServerClient {
-    command_tx: mpsc::Sender<ClientCommand>,
-    event_rx: mpsc::Receiver<InProcessServerEvent>,
-    worker_handle: tokio::task::JoinHandle<()>,
-}
-
-impl InProcessAppServerClient {
-    /// Starts the in-process runtime and facade worker task.
-    ///
-    /// The returned client is ready for requests and event consumption. If the
-    /// internal event queue is saturated later, server requests are rejected
-    /// with overload error instead of being silently dropped.
-    pub async fn start(args: InProcessClientStartArgs) -> IoResult<Self> {
-        let channel_capacity = args.channel_capacity.max(1);
-        let mut handle =
-            codex_app_server::in_process::start(args.into_runtime_start_args()).await?;
-        let request_sender = handle.sender();
-        let (command_tx, mut command_rx) = mpsc::channel::<ClientCommand>(channel_capacity);
-        let (event_tx, event_rx) = mpsc::channel::<InProcessServerEvent>(channel_capacity);
-
-        let worker_handle = tokio::spawn(async move {
-            let mut event_stream_enabled = true;
-            let mut skipped_events = 0usize;
-            loop {
-                tokio::select! {
-                    command = command_rx.recv() => {
-                        match command {
-                            Some(ClientCommand::Request { request, response_tx }) => {
-                                let request_sender = request_sender.clone();
-                                // Request waits happen on a detached task so
-                                // this loop can keep draining runtime events
-                                // while the request is blocked on client input.
-                                tokio::spawn(async move {
-                                    let result = request_sender.request(*request).await;
-                                    let _ = response_tx.send(result);
-                                });
-                            }
-                            Some(ClientCommand::Notify {
-                                notification,
-                                response_tx,
-                            }) => {
-                                let result = request_sender.notify(notification);
-                                let _ = response_tx.send(result);
-                            }
-                            Some(ClientCommand::ResolveServerRequest {
-                                request_id,
-                                result,
-                                response_tx,
-                            }) => {
-                                let send_result =
-                                    request_sender.respond_to_server_request(request_id, result);
-                                let _ = response_tx.send(send_result);
-                            }
-                            Some(ClientCommand::RejectServerRequest {
-                                request_id,
-                                error,
-                                response_tx,
-                            }) => {
-                                let send_result = request_sender.fail_server_request(request_id, error);
-                                let _ = response_tx.send(send_result);
-                            }
-                            Some(ClientCommand::Shutdown { response_tx }) => {
-                                let shutdown_result = handle.shutdown().await;
-                                let _ = response_tx.send(shutdown_result);
-                                break;
-                            }
-                            None => {
-                                let _ = handle.shutdown().await;
-                                break;
-                            }
-                        }
-                    }
-                    event = handle.next_event(), if event_stream_enabled => {
-                        let Some(event) = event else {
-                            break;
-                        };
-
-                        if skipped_events > 0 {
-                            if event_requires_delivery(&event) {
-                                // Surface lag before the terminal event, but
-                                // do not let the lag marker itself cause us to
-                                // drop the completion/abort notification that
-                                // the caller is blocked on.
-                                if event_tx
-                                    .send(InProcessServerEvent::Lagged {
-                                        skipped: skipped_events,
-                                    })
-                                    .await
-                                    .is_err()
-                                {
-                                    event_stream_enabled = false;
-                                    continue;
-                                }
-                                skipped_events = 0;
-                            } else {
-                                match event_tx.try_send(InProcessServerEvent::Lagged {
-                                    skipped: skipped_events,
-                                }) {
-                                    Ok(()) => {
-                                        skipped_events = 0;
-                                    }
-                                    Err(mpsc::error::TrySendError::Full(_)) => {
-                                        skipped_events = skipped_events.saturating_add(1);
-                                        warn!(
-                                            "dropping in-process app-server event because consumer queue is full"
-                                        );
-                                        if let InProcessServerEvent::ServerRequest(request) = event {
-                                            let _ = request_sender.fail_server_request(
-                                                request.id().clone(),
-                                                JSONRPCErrorError {
-                                                    code: -32001,
-                                                    message: "in-process app-server event queue is full".to_string(),
-                                                    data: None,
-                                                },
-                                            );
-                                        }
-                                        continue;
-                                    }
-                                    Err(mpsc::error::TrySendError::Closed(_)) => {
-                                        event_stream_enabled = false;
-                                        continue;
-                                    }
-                                }
-                            }
-                        }
-
-                        if event_requires_delivery(&event) {
-                            // Block until the consumer catches up for
-                            // terminal notifications; this preserves the
-                            // completion signal even when the queue is
-                            // otherwise saturated.
-                            if event_tx.send(event).await.is_err() {
-                                event_stream_enabled = false;
-                            }
-                            continue;
-                        }
-
-                        match event_tx.try_send(event) {
-                            Ok(()) => {}
-                            Err(mpsc::error::TrySendError::Full(event)) => {
-                                skipped_events = skipped_events.saturating_add(1);
-                                warn!("dropping in-process app-server event because consumer queue is full");
-                                if let InProcessServerEvent::ServerRequest(request) = event {
-                                    let _ = request_sender.fail_server_request(
-                                        request.id().clone(),
-                                        JSONRPCErrorError {
-                                            code: -32001,
-                                            message: "in-process app-server event queue is full".to_string(),
-                                            data: None,
-                                        },
-                                    );
-                                }
-                            }
-                            Err(mpsc::error::TrySendError::Closed(_)) => {
-                                event_stream_enabled = false;
-                            }
-                        }
-                    }
-                }
-            }
-        });
-
-        Ok(Self {
-            command_tx,
-            event_rx,
-            worker_handle,
-        })
-    }
-
-    /// Sends a typed client request and returns raw JSON-RPC result.
-    ///
-    /// Callers that expect a concrete response type should usually prefer
-    /// [`request_typed`](Self::request_typed).
-    pub async fn request(&self, request: ClientRequest) -> IoResult<RequestResult> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(ClientCommand::Request {
-                request: Box::new(request),
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "in-process app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "in-process app-server request channel is closed",
-            )
-        })?
-    }
-
-    /// Sends a typed client request and decodes the successful response body.
-    ///
-    /// This still deserializes from a JSON value produced by app-server's
-    /// JSON-RPC result envelope. Because the caller chooses `T`, `Deserialize`
-    /// failures indicate an internal request/response mismatch at the call site
-    /// (or an in-process bug), not transport skew from an external client.
-    pub async fn request_typed<T>(&self, request: ClientRequest) -> Result<T, TypedRequestError>
-    where
-        T: DeserializeOwned,
-    {
-        let method = request_method_name(&request);
-        let response =
-            self.request(request)
-                .await
-                .map_err(|source| TypedRequestError::Transport {
-                    method: method.clone(),
-                    source,
-                })?;
-        let result = response.map_err(|source| TypedRequestError::Server {
-            method: method.clone(),
-            source,
-        })?;
-        serde_json::from_value(result)
-            .map_err(|source| TypedRequestError::Deserialize { method, source })
-    }
-
-    /// Sends a typed client notification.
-    pub async fn notify(&self, notification: ClientNotification) -> IoResult<()> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(ClientCommand::Notify {
-                notification,
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "in-process app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "in-process app-server notify channel is closed",
-            )
-        })?
-    }
-
-    /// Resolves a pending server request.
-    ///
-    /// This should only be called with request IDs obtained from the current
-    /// client's event stream.
-    pub async fn resolve_server_request(
-        &self,
-        request_id: RequestId,
-        result: JsonRpcResult,
-    ) -> IoResult<()> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(ClientCommand::ResolveServerRequest {
-                request_id,
-                result,
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "in-process app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "in-process app-server resolve channel is closed",
-            )
-        })?
-    }
-
-    /// Rejects a pending server request with JSON-RPC error payload.
-    pub async fn reject_server_request(
-        &self,
-        request_id: RequestId,
-        error: JSONRPCErrorError,
-    ) -> IoResult<()> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(ClientCommand::RejectServerRequest {
-                request_id,
-                error,
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "in-process app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "in-process app-server reject channel is closed",
-            )
-        })?
-    }
-
-    /// Returns the next in-process event, or `None` when worker exits.
-    ///
-    /// Callers are expected to drain this stream promptly. If they fall behind,
-    /// the worker emits [`InProcessServerEvent::Lagged`] markers and may reject
-    /// pending server requests rather than letting approval flows hang.
-    pub async fn next_event(&mut self) -> Option<InProcessServerEvent> {
-        self.event_rx.recv().await
-    }
-
-    /// Shuts down worker and in-process runtime with bounded wait.
-    ///
-    /// If graceful shutdown exceeds timeout, the worker task is aborted to
-    /// avoid leaking background tasks in embedding callers.
-    pub async fn shutdown(self) -> IoResult<()> {
-        let Self {
-            command_tx,
-            event_rx,
-            worker_handle,
-        } = self;
-        let mut worker_handle = worker_handle;
-        // Drop the caller-facing receiver before asking the worker to shut
-        // down. That unblocks any pending must-deliver `event_tx.send(..)`
-        // so the worker can reach `handle.shutdown()` instead of timing out
-        // and getting aborted with the runtime still attached.
-        drop(event_rx);
-        let (response_tx, response_rx) = oneshot::channel();
-        if command_tx
-            .send(ClientCommand::Shutdown { response_tx })
-            .await
-            .is_ok()
-            && let Ok(command_result) = timeout(SHUTDOWN_TIMEOUT, response_rx).await
-        {
-            command_result.map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "in-process app-server shutdown channel is closed",
-                )
-            })??;
-        }
-
-        if let Err(_elapsed) = timeout(SHUTDOWN_TIMEOUT, &mut worker_handle).await {
-            worker_handle.abort();
-            let _ = worker_handle.await;
-        }
-        Ok(())
-    }
-}
-
-/// Extracts the JSON-RPC method name for diagnostics without extending the
-/// protocol crate with in-process-only helpers.
-fn request_method_name(request: &ClientRequest) -> String {
-    serde_json::to_value(request)
-        .ok()
-        .and_then(|value| {
-            value
-                .get("method")
-                .and_then(serde_json::Value::as_str)
-                .map(ToOwned::to_owned)
-        })
-        .unwrap_or_else(|| "<unknown>".to_string())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use codex_app_server_protocol::ConfigRequirementsReadResponse;
-    use codex_app_server_protocol::SessionSource as ApiSessionSource;
-    use codex_app_server_protocol::ThreadStartParams;
-    use codex_app_server_protocol::ThreadStartResponse;
-    use codex_core::config::ConfigBuilder;
-    use pretty_assertions::assert_eq;
-    use tokio::time::Duration;
-    use tokio::time::timeout;
-
-    async fn build_test_config() -> Config {
-        match ConfigBuilder::default().build().await {
-            Ok(config) => config,
-            Err(_) => Config::load_default_with_cli_overrides(Vec::new())
-                .expect("default config should load"),
-        }
-    }
-
-    async fn start_test_client_with_capacity(
-        session_source: SessionSource,
-        channel_capacity: usize,
-    ) -> InProcessAppServerClient {
-        InProcessAppServerClient::start(InProcessClientStartArgs {
-            arg0_paths: Arg0DispatchPaths::default(),
-            config: Arc::new(build_test_config().await),
-            cli_overrides: Vec::new(),
-            loader_overrides: LoaderOverrides::default(),
-            cloud_requirements: CloudRequirementsLoader::default(),
-            feedback: CodexFeedback::new(),
-            config_warnings: Vec::new(),
-            session_source,
-            enable_codex_api_key_env: false,
-            client_name: "codex-app-server-client-test".to_string(),
-            client_version: "0.0.0-test".to_string(),
-            experimental_api: true,
-            opt_out_notification_methods: Vec::new(),
-            channel_capacity,
-        })
-        .await
-        .expect("in-process app-server client should start")
-    }
-
-    async fn start_test_client(session_source: SessionSource) -> InProcessAppServerClient {
-        start_test_client_with_capacity(session_source, DEFAULT_IN_PROCESS_CHANNEL_CAPACITY).await
-    }
-
-    #[tokio::test]
-    async fn typed_request_roundtrip_works() {
-        let client = start_test_client(SessionSource::Exec).await;
-        let _response: ConfigRequirementsReadResponse = client
-            .request_typed(ClientRequest::ConfigRequirementsRead {
-                request_id: RequestId::Integer(1),
-                params: None,
-            })
-            .await
-            .expect("typed request should succeed");
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[tokio::test]
-    async fn typed_request_reports_json_rpc_errors() {
-        let client = start_test_client(SessionSource::Exec).await;
-        let err = client
-            .request_typed::<ConfigRequirementsReadResponse>(ClientRequest::ThreadRead {
-                request_id: RequestId::Integer(99),
-                params: codex_app_server_protocol::ThreadReadParams {
-                    thread_id: "missing-thread".to_string(),
-                    include_turns: false,
-                },
-            })
-            .await
-            .expect_err("missing thread should return a JSON-RPC error");
-        assert!(
-            err.to_string().starts_with("thread/read failed:"),
-            "expected method-qualified JSON-RPC failure message"
-        );
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[tokio::test]
-    async fn caller_provided_session_source_is_applied() {
-        for (session_source, expected_source) in [
-            (SessionSource::Exec, ApiSessionSource::Exec),
-            (SessionSource::Cli, ApiSessionSource::Cli),
-        ] {
-            let client = start_test_client(session_source).await;
-            let parsed: ThreadStartResponse = client
-                .request_typed(ClientRequest::ThreadStart {
-                    request_id: RequestId::Integer(2),
-                    params: ThreadStartParams {
-                        ephemeral: Some(true),
-                        ..ThreadStartParams::default()
-                    },
-                })
-                .await
-                .expect("thread/start should succeed");
-            assert_eq!(parsed.thread.source, expected_source);
-            client.shutdown().await.expect("shutdown should complete");
-        }
-    }
-
-    #[tokio::test]
-    async fn tiny_channel_capacity_still_supports_request_roundtrip() {
-        let client = start_test_client_with_capacity(SessionSource::Exec, 1).await;
-        let _response: ConfigRequirementsReadResponse = client
-            .request_typed(ClientRequest::ConfigRequirementsRead {
-                request_id: RequestId::Integer(1),
-                params: None,
-            })
-            .await
-            .expect("typed request should succeed");
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[test]
-    fn typed_request_error_exposes_sources() {
-        let transport = TypedRequestError::Transport {
-            method: "config/read".to_string(),
-            source: IoError::new(ErrorKind::BrokenPipe, "closed"),
-        };
-        assert_eq!(std::error::Error::source(&transport).is_some(), true);
-
-        let server = TypedRequestError::Server {
-            method: "thread/read".to_string(),
-            source: JSONRPCErrorError {
-                code: -32603,
-                data: None,
-                message: "internal".to_string(),
-            },
-        };
-        assert_eq!(std::error::Error::source(&server).is_some(), false);
-
-        let deserialize = TypedRequestError::Deserialize {
-            method: "thread/start".to_string(),
-            source: serde_json::from_str::<u32>("\"nope\"")
-                .expect_err("invalid integer should return deserialize error"),
-        };
-        assert_eq!(std::error::Error::source(&deserialize).is_some(), true);
-    }
-
-    #[tokio::test]
-    async fn next_event_surfaces_lagged_markers() {
-        let (command_tx, _command_rx) = mpsc::channel(1);
-        let (event_tx, event_rx) = mpsc::channel(1);
-        let worker_handle = tokio::spawn(async {});
-        event_tx
-            .send(InProcessServerEvent::Lagged { skipped: 3 })
-            .await
-            .expect("lagged marker should enqueue");
-        drop(event_tx);
-
-        let mut client = InProcessAppServerClient {
-            command_tx,
-            event_rx,
-            worker_handle,
-        };
-
-        let event = timeout(Duration::from_secs(2), client.next_event())
-            .await
-            .expect("lagged marker should arrive before timeout");
-        assert!(matches!(
-            event,
-            Some(InProcessServerEvent::Lagged { skipped: 3 })
-        ));
-
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[test]
-    fn event_requires_delivery_marks_terminal_events() {
-        assert!(event_requires_delivery(
-            &InProcessServerEvent::ServerNotification(
-                codex_app_server_protocol::ServerNotification::TurnCompleted(
-                    codex_app_server_protocol::TurnCompletedNotification {
-                        thread_id: "thread".to_string(),
-                        turn: codex_app_server_protocol::Turn {
-                            id: "turn".to_string(),
-                            items: Vec::new(),
-                            status: codex_app_server_protocol::TurnStatus::Completed,
-                            error: None,
-                        },
-                    }
-                )
-            )
-        ));
-        assert!(event_requires_delivery(
-            &InProcessServerEvent::LegacyNotification(
-                codex_app_server_protocol::JSONRPCNotification {
-                    method: "codex/event/turn_aborted".to_string(),
-                    params: None,
-                }
-            )
-        ));
-        assert!(!event_requires_delivery(&InProcessServerEvent::Lagged {
-            skipped: 1
-        }));
-    }
-}
--- a/codex-rs/app-server-protocol/Cargo.toml
+++ b/codex-rs/app-server-protocol/Cargo.toml
@@ -20,16 +20,9 @@ codex-utils-absolute-path = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-serde_with = { workspace = true }
 shlex = { workspace = true }
 strum_macros = { workspace = true }
 thiserror = { workspace = true }
-rmcp = { workspace = true, default-features = false, features = [
-    "base64",
-    "macros",
-    "schemars",
-    "server",
-] }
 ts-rs = { workspace = true }
 inventory = { workspace = true }
 tracing = { workspace = true }
--- a/codex-rs/app-server-protocol/schema/json/ApplyPatchApprovalResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/ApplyPatchApprovalResponse.json
@@ -1,28 +1,6 @@
 {
  "$schema": "http://json-schema.org/draft-07/schema#",
  "definitions": {
-    "NetworkPolicyAmendment": {
-      "properties": {
-        "action": {
-          "$ref": "#/definitions/NetworkPolicyRuleAction"
-        },
-        "host": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "action",
-        "host"
-      ],
-      "type": "object"
-    },
-    "NetworkPolicyRuleAction": {
-      "enum": [
-        "allow",
-        "deny"
-      ],
-      "type": "string"
-    },
    "ReviewDecision": {
      "description": "User's decision in response to an ExecApprovalRequest.",
      "oneOf": [
@@ -59,34 +37,12 @@
          "type": "object"
        },
        {
-          "description": "User has approved this request and wants future prompts in the same session-scoped approval cache to be automatically approved for the remainder of the session.",
+          "description": "User has approved this command and wants to automatically approve any future identical instances (`command` and `cwd` match exactly) for the remainder of the session.",
          "enum": [
            "approved_for_session"
          ],
          "type": "string"
        },
-        {
-          "additionalProperties": false,
-          "description": "User chose to persist a network policy rule (allow/deny) for future requests to the same host.",
-          "properties": {
-            "network_policy_amendment": {
-              "properties": {
-                "network_policy_amendment": {
-                  "$ref": "#/definitions/NetworkPolicyAmendment"
-                }
-              },
-              "required": [
-                "network_policy_amendment"
-              ],
-              "type": "object"
-            }
-          },
-          "required": [
-            "network_policy_amendment"
-          ],
-          "title": "NetworkPolicyAmendmentReviewDecision",
-          "type": "object"
-        },
        {
          "description": "User has denied this command and the agent should not execute it, but it should continue the session and try something else.",
          "enum": [
--- a/codex-rs/app-server-protocol/schema/json/ClientRequest.json
+++ b/codex-rs/app-server-protocol/schema/json/ClientRequest.json
--- a/codex-rs/app-server-protocol/schema/json/CommandExecutionRequestApprovalParams.json
+++ b/codex-rs/app-server-protocol/schema/json/CommandExecutionRequestApprovalParams.json
@@ -1,102 +1,6 @@
 {
  "$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"
-    },
-    "AdditionalFileSystemPermissions": {
-      "properties": {
-        "read": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "write": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "AdditionalMacOsPermissions": {
-      "properties": {
-        "accessibility": {
-          "type": "boolean"
-        },
-        "automations": {
-          "$ref": "#/definitions/MacOsAutomationPermission"
-        },
-        "calendar": {
-          "type": "boolean"
-        },
-        "preferences": {
-          "$ref": "#/definitions/MacOsPreferencesPermission"
-        }
-      },
-      "required": [
-        "accessibility",
-        "automations",
-        "calendar",
-        "preferences"
-      ],
-      "type": "object"
-    },
-    "AdditionalNetworkPermissions": {
-      "properties": {
-        "enabled": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "AdditionalPermissionProfile": {
-      "properties": {
-        "fileSystem": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalFileSystemPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "macos": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalMacOsPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "network": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalNetworkPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "type": "object"
-    },
    "CommandAction": {
      "oneOf": [
        {
@@ -207,131 +111,6 @@
        }
      ]
    },
-    "CommandExecutionApprovalDecision": {
-      "oneOf": [
-        {
-          "description": "User approved the command.",
-          "enum": [
-            "accept"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "User approved the command and future prompts in the same session-scoped approval cache should run without prompting.",
-          "enum": [
-            "acceptForSession"
-          ],
-          "type": "string"
-        },
-        {
-          "additionalProperties": false,
-          "description": "User approved the command, and wants to apply the proposed execpolicy amendment so future matching commands can run without prompting.",
-          "properties": {
-            "acceptWithExecpolicyAmendment": {
-              "properties": {
-                "execpolicy_amendment": {
-                  "items": {
-                    "type": "string"
-                  },
-                  "type": "array"
-                }
-              },
-              "required": [
-                "execpolicy_amendment"
-              ],
-              "type": "object"
-            }
-          },
-          "required": [
-            "acceptWithExecpolicyAmendment"
-          ],
-          "title": "AcceptWithExecpolicyAmendmentCommandExecutionApprovalDecision",
-          "type": "object"
-        },
-        {
-          "additionalProperties": false,
-          "description": "User chose a persistent network policy rule (allow/deny) for this host.",
-          "properties": {
-            "applyNetworkPolicyAmendment": {
-              "properties": {
-                "network_policy_amendment": {
-                  "$ref": "#/definitions/NetworkPolicyAmendment"
-                }
-              },
-              "required": [
-                "network_policy_amendment"
-              ],
-              "type": "object"
-            }
-          },
-          "required": [
-            "applyNetworkPolicyAmendment"
-          ],
-          "title": "ApplyNetworkPolicyAmendmentCommandExecutionApprovalDecision",
-          "type": "object"
-        },
-        {
-          "description": "User denied the command. The agent will continue the turn.",
-          "enum": [
-            "decline"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "User denied the command. The turn will also be immediately interrupted.",
-          "enum": [
-            "cancel"
-          ],
-          "type": "string"
-        }
-      ]
-    },
-    "CommandExecutionRequestApprovalSkillMetadata": {
-      "properties": {
-        "pathToSkillsMd": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "pathToSkillsMd"
-      ],
-      "type": "object"
-    },
-    "MacOsAutomationPermission": {
-      "oneOf": [
-        {
-          "enum": [
-            "none",
-            "all"
-          ],
-          "type": "string"
-        },
-        {
-          "additionalProperties": false,
-          "properties": {
-            "bundle_ids": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          "required": [
-            "bundle_ids"
-          ],
-          "title": "BundleIdsMacOsAutomationPermission",
-          "type": "object"
-        }
-      ]
-    },
-    "MacOsPreferencesPermission": {
-      "enum": [
-        "none",
-        "read_only",
-        "read_write"
-      ],
-      "type": "string"
-    },
    "NetworkApprovalContext": {
      "properties": {
        "host": {
@@ -355,28 +134,6 @@
        "socks5Udp"
      ],
      "type": "string"
-    },
-    "NetworkPolicyAmendment": {
-      "properties": {
-        "action": {
-          "$ref": "#/definitions/NetworkPolicyRuleAction"
-        },
-        "host": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "action",
-        "host"
-      ],
-      "type": "object"
-    },
-    "NetworkPolicyRuleAction": {
-      "enum": [
-        "allow",
-        "deny"
-      ],
-      "type": "string"
    }
  },
  "properties": {
@@ -423,7 +180,7 @@
          "type": "null"
        }
      ],
-      "description": "Optional context for a managed-network approval prompt."
+      "description": "Optional context for managed-network approval prompts."
    },
    "proposedExecpolicyAmendment": {
      "description": "Optional proposed execpolicy amendment to allow similar commands without prompting.",
@@ -435,16 +192,6 @@
        "null"
      ]
    },
-    "proposedNetworkPolicyAmendments": {
-      "description": "Optional proposed network policy amendments (allow/deny host) for future requests.",
-      "items": {
-        "$ref": "#/definitions/NetworkPolicyAmendment"
-      },
-      "type": [
-        "array",
-        "null"
-      ]
-    },
    "reason": {
      "description": "Optional explanatory reason (e.g. request for network access).",
      "type": [
--- a/codex-rs/app-server-protocol/schema/json/CommandExecutionRequestApprovalResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/CommandExecutionRequestApprovalResponse.json
@@ -11,7 +11,7 @@
          "type": "string"
        },
        {
-          "description": "User approved the command and future prompts in the same session-scoped approval cache should run without prompting.",
+          "description": "User approved the command and future identical commands should run without prompting.",
          "enum": [
            "acceptForSession"
          ],
@@ -42,28 +42,6 @@
          "title": "AcceptWithExecpolicyAmendmentCommandExecutionApprovalDecision",
          "type": "object"
        },
-        {
-          "additionalProperties": false,
-          "description": "User chose a persistent network policy rule (allow/deny) for this host.",
-          "properties": {
-            "applyNetworkPolicyAmendment": {
-              "properties": {
-                "network_policy_amendment": {
-                  "$ref": "#/definitions/NetworkPolicyAmendment"
-                }
-              },
-              "required": [
-                "network_policy_amendment"
-              ],
-              "type": "object"
-            }
-          },
-          "required": [
-            "applyNetworkPolicyAmendment"
-          ],
-          "title": "ApplyNetworkPolicyAmendmentCommandExecutionApprovalDecision",
-          "type": "object"
-        },
        {
          "description": "User denied the command. The agent will continue the turn.",
          "enum": [
@@ -79,28 +57,6 @@
          "type": "string"
        }
      ]
-    },
-    "NetworkPolicyAmendment": {
-      "properties": {
-        "action": {
-          "$ref": "#/definitions/NetworkPolicyRuleAction"
-        },
-        "host": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "action",
-        "host"
-      ],
-      "type": "object"
-    },
-    "NetworkPolicyRuleAction": {
-      "enum": [
-        "allow",
-        "deny"
-      ],
-      "type": "string"
    }
  },
  "properties": {
--- a/codex-rs/app-server-protocol/schema/json/EventMsg.json
+++ b/codex-rs/app-server-protocol/schema/json/EventMsg.json
--- a/codex-rs/app-server-protocol/schema/json/ExecCommandApprovalResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/ExecCommandApprovalResponse.json
@@ -1,28 +1,6 @@
 {
  "$schema": "http://json-schema.org/draft-07/schema#",
  "definitions": {
-    "NetworkPolicyAmendment": {
-      "properties": {
-        "action": {
-          "$ref": "#/definitions/NetworkPolicyRuleAction"
-        },
-        "host": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "action",
-        "host"
-      ],
-      "type": "object"
-    },
-    "NetworkPolicyRuleAction": {
-      "enum": [
-        "allow",
-        "deny"
-      ],
-      "type": "string"
-    },
    "ReviewDecision": {
      "description": "User's decision in response to an ExecApprovalRequest.",
      "oneOf": [
@@ -59,34 +37,12 @@
          "type": "object"
        },
        {
-          "description": "User has approved this request and wants future prompts in the same session-scoped approval cache to be automatically approved for the remainder of the session.",
+          "description": "User has approved this command and wants to automatically approve any future identical instances (`command` and `cwd` match exactly) for the remainder of the session.",
          "enum": [
            "approved_for_session"
          ],
          "type": "string"
        },
-        {
-          "additionalProperties": false,
-          "description": "User chose to persist a network policy rule (allow/deny) for future requests to the same host.",
-          "properties": {
-            "network_policy_amendment": {
-              "properties": {
-                "network_policy_amendment": {
-                  "$ref": "#/definitions/NetworkPolicyAmendment"
-                }
-              },
-              "required": [
-                "network_policy_amendment"
-              ],
-              "type": "object"
-            }
-          },
-          "required": [
-            "network_policy_amendment"
-          ],
-          "title": "NetworkPolicyAmendmentReviewDecision",
-          "type": "object"
-        },
        {
          "description": "User has denied this command and the agent should not execute it, but it should continue the session and try something else.",
          "enum": [
--- a/codex-rs/app-server-protocol/schema/json/JSONRPCMessage.json
+++ b/codex-rs/app-server-protocol/schema/json/JSONRPCMessage.json
@@ -70,18 +70,7 @@
        "method": {
          "type": "string"
        },
-        "params": true,
-        "trace": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/W3cTraceContext"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional W3C Trace Context for distributed tracing."
-        }
+        "params": true
      },
      "required": [
        "id",
@@ -113,23 +102,6 @@
          "type": "integer"
        }
      ]
-    },
-    "W3cTraceContext": {
-      "properties": {
-        "traceparent": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "tracestate": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
    }
  },
  "description": "Refers to any valid JSON-RPC object that can be decoded off the wire, or encoded to be sent.",
--- a/codex-rs/app-server-protocol/schema/json/JSONRPCRequest.json
+++ b/codex-rs/app-server-protocol/schema/json/JSONRPCRequest.json
@@ -11,23 +11,6 @@
          "type": "integer"
        }
      ]
-    },
-    "W3cTraceContext": {
-      "properties": {
-        "traceparent": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "tracestate": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
    }
  },
  "description": "A request that expects a response.",
@@ -38,18 +21,7 @@
    "method": {
      "type": "string"
    },
-    "params": true,
-    "trace": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/W3cTraceContext"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "description": "Optional W3C Trace Context for distributed tracing."
-    }
+    "params": true
  },
  "required": [
    "id",
--- a/codex-rs/app-server-protocol/schema/json/McpServerElicitationRequestParams.json
+++ b/codex-rs/app-server-protocol/schema/json/McpServerElicitationRequestParams.json
@@ -1,609 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "McpElicitationArrayType": {
-      "enum": [
-        "array"
-      ],
-      "type": "string"
-    },
-    "McpElicitationBooleanSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationBooleanType"
-        }
-      },
-      "required": [
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationBooleanType": {
-      "enum": [
-        "boolean"
-      ],
-      "type": "string"
-    },
-    "McpElicitationConstOption": {
-      "additionalProperties": false,
-      "properties": {
-        "const": {
-          "type": "string"
-        },
-        "title": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "const",
-        "title"
-      ],
-      "type": "object"
-    },
-    "McpElicitationEnumSchema": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/McpElicitationSingleSelectEnumSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationMultiSelectEnumSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationLegacyTitledEnumSchema"
-        }
-      ]
-    },
-    "McpElicitationLegacyTitledEnumSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "enum": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "enumNames": {
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationStringType"
-        }
-      },
-      "required": [
-        "enum",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationMultiSelectEnumSchema": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/McpElicitationUntitledMultiSelectEnumSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationTitledMultiSelectEnumSchema"
-        }
-      ]
-    },
-    "McpElicitationNumberSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "format": "double",
-          "type": [
-            "number",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "maximum": {
-          "format": "double",
-          "type": [
-            "number",
-            "null"
-          ]
-        },
-        "minimum": {
-          "format": "double",
-          "type": [
-            "number",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationNumberType"
-        }
-      },
-      "required": [
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationNumberType": {
-      "enum": [
-        "number",
-        "integer"
-      ],
-      "type": "string"
-    },
-    "McpElicitationObjectType": {
-      "enum": [
-        "object"
-      ],
-      "type": "string"
-    },
-    "McpElicitationPrimitiveSchema": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/McpElicitationEnumSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationStringSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationNumberSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationBooleanSchema"
-        }
-      ]
-    },
-    "McpElicitationSchema": {
-      "additionalProperties": false,
-      "description": "Typed form schema for MCP `elicitation/create` requests.\n\nThis matches the `requestedSchema` shape from the MCP 2025-11-25 `ElicitRequestFormParams` schema.",
-      "properties": {
-        "$schema": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "properties": {
-          "additionalProperties": {
-            "$ref": "#/definitions/McpElicitationPrimitiveSchema"
-          },
-          "type": "object"
-        },
-        "required": {
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationObjectType"
-        }
-      },
-      "required": [
-        "properties",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationSingleSelectEnumSchema": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/McpElicitationUntitledSingleSelectEnumSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationTitledSingleSelectEnumSchema"
-        }
-      ]
-    },
-    "McpElicitationStringFormat": {
-      "enum": [
-        "email",
-        "uri",
-        "date",
-        "date-time"
-      ],
-      "type": "string"
-    },
-    "McpElicitationStringSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "format": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/McpElicitationStringFormat"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "maxLength": {
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "minLength": {
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationStringType"
-        }
-      },
-      "required": [
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationStringType": {
-      "enum": [
-        "string"
-      ],
-      "type": "string"
-    },
-    "McpElicitationTitledEnumItems": {
-      "additionalProperties": false,
-      "properties": {
-        "anyOf": {
-          "items": {
-            "$ref": "#/definitions/McpElicitationConstOption"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "anyOf"
-      ],
-      "type": "object"
-    },
-    "McpElicitationTitledMultiSelectEnumSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "items": {
-          "$ref": "#/definitions/McpElicitationTitledEnumItems"
-        },
-        "maxItems": {
-          "format": "uint64",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "minItems": {
-          "format": "uint64",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationArrayType"
-        }
-      },
-      "required": [
-        "items",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationTitledSingleSelectEnumSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "oneOf": {
-          "items": {
-            "$ref": "#/definitions/McpElicitationConstOption"
-          },
-          "type": "array"
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationStringType"
-        }
-      },
-      "required": [
-        "oneOf",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationUntitledEnumItems": {
-      "additionalProperties": false,
-      "properties": {
-        "enum": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationStringType"
-        }
-      },
-      "required": [
-        "enum",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationUntitledMultiSelectEnumSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "items": {
-          "$ref": "#/definitions/McpElicitationUntitledEnumItems"
-        },
-        "maxItems": {
-          "format": "uint64",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "minItems": {
-          "format": "uint64",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationArrayType"
-        }
-      },
-      "required": [
-        "items",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationUntitledSingleSelectEnumSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "enum": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationStringType"
-        }
-      },
-      "required": [
-        "enum",
-        "type"
-      ],
-      "type": "object"
-    }
-  },
-  "oneOf": [
-    {
-      "properties": {
-        "_meta": true,
-        "message": {
-          "type": "string"
-        },
-        "mode": {
-          "enum": [
-            "form"
-          ],
-          "type": "string"
-        },
-        "requestedSchema": {
-          "$ref": "#/definitions/McpElicitationSchema"
-        }
-      },
-      "required": [
-        "message",
-        "mode",
-        "requestedSchema"
-      ],
-      "type": "object"
-    },
-    {
-      "properties": {
-        "_meta": true,
-        "elicitationId": {
-          "type": "string"
-        },
-        "message": {
-          "type": "string"
-        },
-        "mode": {
-          "enum": [
-            "url"
-          ],
-          "type": "string"
-        },
-        "url": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "elicitationId",
-        "message",
-        "mode",
-        "url"
-      ],
-      "type": "object"
-    }
-  ],
-  "properties": {
-    "serverName": {
-      "type": "string"
-    },
-    "threadId": {
-      "type": "string"
-    },
-    "turnId": {
-      "description": "Active Codex turn when this elicitation was observed, if app-server could correlate one.\n\nThis is nullable because MCP models elicitation as a standalone server-to-client request identified by the MCP server request id. It may be triggered during a turn, but turn context is app-server correlation rather than part of the protocol identity of the elicitation itself.",
-      "type": [
-        "string",
-        "null"
-      ]
-    }
-  },
-  "required": [
-    "serverName",
-    "threadId"
-  ],
-  "title": "McpServerElicitationRequestParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/McpServerElicitationRequestResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/McpServerElicitationRequestResponse.json
@@ -1,29 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "McpServerElicitationAction": {
-      "enum": [
-        "accept",
-        "decline",
-        "cancel"
-      ],
-      "type": "string"
-    }
-  },
-  "properties": {
-    "_meta": {
-      "description": "Optional client metadata for form-mode action handling."
-    },
-    "action": {
-      "$ref": "#/definitions/McpServerElicitationAction"
-    },
-    "content": {
-      "description": "Structured user input for accepted elicitations, mirroring RMCP `CreateElicitationResult`.\n\nThis is nullable because decline/cancel responses have no content."
-    }
-  },
-  "required": [
-    "action"
-  ],
-  "title": "McpServerElicitationRequestResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalParams.json
+++ b/codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalParams.json
@@ -1,164 +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"
-    },
-    "AdditionalFileSystemPermissions": {
-      "properties": {
-        "read": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "write": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "AdditionalMacOsPermissions": {
-      "properties": {
-        "accessibility": {
-          "type": "boolean"
-        },
-        "automations": {
-          "$ref": "#/definitions/MacOsAutomationPermission"
-        },
-        "calendar": {
-          "type": "boolean"
-        },
-        "preferences": {
-          "$ref": "#/definitions/MacOsPreferencesPermission"
-        }
-      },
-      "required": [
-        "accessibility",
-        "automations",
-        "calendar",
-        "preferences"
-      ],
-      "type": "object"
-    },
-    "AdditionalNetworkPermissions": {
-      "properties": {
-        "enabled": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "AdditionalPermissionProfile": {
-      "properties": {
-        "fileSystem": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalFileSystemPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "macos": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalMacOsPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "network": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalNetworkPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "MacOsAutomationPermission": {
-      "oneOf": [
-        {
-          "enum": [
-            "none",
-            "all"
-          ],
-          "type": "string"
-        },
-        {
-          "additionalProperties": false,
-          "properties": {
-            "bundle_ids": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          "required": [
-            "bundle_ids"
-          ],
-          "title": "BundleIdsMacOsAutomationPermission",
-          "type": "object"
-        }
-      ]
-    },
-    "MacOsPreferencesPermission": {
-      "enum": [
-        "none",
-        "read_only",
-        "read_write"
-      ],
-      "type": "string"
-    }
-  },
-  "properties": {
-    "itemId": {
-      "type": "string"
-    },
-    "permissions": {
-      "$ref": "#/definitions/AdditionalPermissionProfile"
-    },
-    "reason": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "threadId": {
-      "type": "string"
-    },
-    "turnId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "itemId",
-    "permissions",
-    "threadId",
-    "turnId"
-  ],
-  "title": "PermissionsRequestApprovalParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalResponse.json
@@ -1,160 +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"
-    },
-    "AdditionalFileSystemPermissions": {
-      "properties": {
-        "read": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "write": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "AdditionalNetworkPermissions": {
-      "properties": {
-        "enabled": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "GrantedMacOsPermissions": {
-      "properties": {
-        "accessibility": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
-        "automations": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/MacOsAutomationPermission"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "calendar": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
-        "preferences": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/MacOsPreferencesPermission"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "GrantedPermissionProfile": {
-      "properties": {
-        "fileSystem": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalFileSystemPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "macos": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/GrantedMacOsPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "network": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalNetworkPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "MacOsAutomationPermission": {
-      "oneOf": [
-        {
-          "enum": [
-            "none",
-            "all"
-          ],
-          "type": "string"
-        },
-        {
-          "additionalProperties": false,
-          "properties": {
-            "bundle_ids": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          "required": [
-            "bundle_ids"
-          ],
-          "title": "BundleIdsMacOsAutomationPermission",
-          "type": "object"
-        }
-      ]
-    },
-    "MacOsPreferencesPermission": {
-      "enum": [
-        "none",
-        "read_only",
-        "read_write"
-      ],
-      "type": "string"
-    }
-  },
-  "properties": {
-    "permissions": {
-      "$ref": "#/definitions/GrantedPermissionProfile"
-    }
-  },
-  "required": [
-    "permissions"
-  ],
-  "title": "PermissionsRequestApprovalResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/ServerNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/ServerNotification.json
@@ -46,16 +46,6 @@
              "type": "null"
            }
          ]
-        },
-        "planType": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/PlanType"
-            },
-            {
-              "type": "null"
-            }
-          ]
        }
      },
      "type": "object"
@@ -201,13 +191,6 @@
        },
        "name": {
          "type": "string"
-        },
-        "pluginDisplayNames": {
-          "default": [],
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
        }
      },
      "required": [
@@ -670,57 +653,6 @@
        }
      ]
    },
-    "CommandExecOutputDeltaNotification": {
-      "description": "Base64-encoded output chunk emitted for a streaming `command/exec` request.\n\nThese notifications are connection-scoped. If the originating connection closes, the server terminates the process.",
-      "properties": {
-        "capReached": {
-          "description": "`true` on the final streamed chunk for a stream when `outputBytesCap` truncated later output on that stream.",
-          "type": "boolean"
-        },
-        "deltaBase64": {
-          "description": "Base64-encoded output bytes.",
-          "type": "string"
-        },
-        "processId": {
-          "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-          "type": "string"
-        },
-        "stream": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/CommandExecOutputStream"
-            }
-          ],
-          "description": "Output stream for this chunk."
-        }
-      },
-      "required": [
-        "capReached",
-        "deltaBase64",
-        "processId",
-        "stream"
-      ],
-      "type": "object"
-    },
-    "CommandExecOutputStream": {
-      "description": "Stream label for `command/exec/outputDelta` notifications.",
-      "oneOf": [
-        {
-          "description": "stdout stream. PTY mode multiplexes terminal output here.",
-          "enum": [
-            "stdout"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "stderr stream.",
-          "enum": [
-            "stderr"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "CommandExecutionOutputDeltaNotification": {
      "properties": {
        "delta": {
@@ -846,58 +778,6 @@
      ],
      "type": "object"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "ErrorNotification": {
      "properties": {
        "error": {
@@ -1490,32 +1370,6 @@
      ],
      "type": "object"
    },
-    "RequestId": {
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "format": "int64",
-          "type": "integer"
-        }
-      ]
-    },
-    "ServerRequestResolvedNotification": {
-      "properties": {
-        "requestId": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "requestId",
-        "threadId"
-      ],
-      "type": "object"
-    },
    "SessionSource": {
      "oneOf": [
        {
@@ -1543,10 +1397,6 @@
        }
      ]
    },
-    "SkillsChangedNotification": {
-      "description": "Notification emitted when watched local skill files change.\n\nTreat this as an invalidation signal and re-run `skills/list` with the client's current parameters when refreshed skill metadata is needed.",
-      "type": "object"
-    },
    "SubAgentSource": {
      "oneOf": [
        {
@@ -1727,10 +1577,6 @@
          "description": "Working directory captured for the thread.",
          "type": "string"
        },
-        "ephemeral": {
-          "description": "Whether the thread is ephemeral and should not be materialized on disk.",
-          "type": "boolean"
-        },
        "gitInfo": {
          "anyOf": [
            {
@@ -1800,7 +1646,6 @@
        "cliVersion",
        "createdAt",
        "cwd",
-        "ephemeral",
        "id",
        "modelProvider",
        "preview",
@@ -1829,17 +1674,6 @@
      ],
      "type": "object"
    },
-    "ThreadClosedNotification": {
-      "properties": {
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "threadId"
-      ],
-      "type": "object"
-    },
    "ThreadId": {
      "type": "string"
    },
@@ -2131,59 +1965,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -2309,40 +2090,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
@@ -2430,120 +2177,6 @@
      ],
      "type": "object"
    },
-    "ThreadRealtimeAudioChunk": {
-      "description": "EXPERIMENTAL - thread realtime audio chunk.",
-      "properties": {
-        "data": {
-          "type": "string"
-        },
-        "numChannels": {
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "sampleRate": {
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "samplesPerChannel": {
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "data",
-        "numChannels",
-        "sampleRate"
-      ],
-      "type": "object"
-    },
-    "ThreadRealtimeClosedNotification": {
-      "description": "EXPERIMENTAL - emitted when thread realtime transport closes.",
-      "properties": {
-        "reason": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "threadId"
-      ],
-      "type": "object"
-    },
-    "ThreadRealtimeErrorNotification": {
-      "description": "EXPERIMENTAL - emitted when thread realtime encounters an error.",
-      "properties": {
-        "message": {
-          "type": "string"
-        },
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "message",
-        "threadId"
-      ],
-      "type": "object"
-    },
-    "ThreadRealtimeItemAddedNotification": {
-      "description": "EXPERIMENTAL - raw non-audio thread realtime item emitted by the backend.",
-      "properties": {
-        "item": true,
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "item",
-        "threadId"
-      ],
-      "type": "object"
-    },
-    "ThreadRealtimeOutputAudioDeltaNotification": {
-      "description": "EXPERIMENTAL - streamed output audio emitted by thread realtime.",
-      "properties": {
-        "audio": {
-          "$ref": "#/definitions/ThreadRealtimeAudioChunk"
-        },
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "audio",
-        "threadId"
-      ],
-      "type": "object"
-    },
-    "ThreadRealtimeStartedNotification": {
-      "description": "EXPERIMENTAL - emitted when thread realtime startup is accepted.",
-      "properties": {
-        "sessionId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "threadId"
-      ],
-      "type": "object"
-    },
    "ThreadStartedNotification": {
      "properties": {
        "thread": {
@@ -3278,46 +2911,6 @@
      "title": "Thread/unarchivedNotification",
      "type": "object"
    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "thread/closed"
-          ],
-          "title": "Thread/closedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadClosedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Thread/closedNotification",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "skills/changed"
-          ],
-          "title": "Skills/changedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/SkillsChangedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Skills/changedNotification",
-      "type": "object"
-    },
    {
      "properties": {
        "method": {
@@ -3519,27 +3112,6 @@
      "title": "Item/plan/deltaNotification",
      "type": "object"
    },
-    {
-      "description": "Stream base64-encoded stdout/stderr chunks for a running `command/exec` session.",
-      "properties": {
-        "method": {
-          "enum": [
-            "command/exec/outputDelta"
-          ],
-          "title": "Command/exec/outputDeltaNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/CommandExecOutputDeltaNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Command/exec/outputDeltaNotification",
-      "type": "object"
-    },
    {
      "properties": {
        "method": {
@@ -3600,26 +3172,6 @@
      "title": "Item/fileChange/outputDeltaNotification",
      "type": "object"
    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "serverRequest/resolved"
-          ],
-          "title": "ServerRequest/resolvedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ServerRequestResolvedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "ServerRequest/resolvedNotification",
-      "type": "object"
-    },
    {
      "properties": {
        "method": {
@@ -3901,106 +3453,6 @@
      "title": "FuzzyFileSearch/sessionCompletedNotification",
      "type": "object"
    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "thread/realtime/started"
-          ],
-          "title": "Thread/realtime/startedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadRealtimeStartedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Thread/realtime/startedNotification",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "thread/realtime/itemAdded"
-          ],
-          "title": "Thread/realtime/itemAddedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadRealtimeItemAddedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Thread/realtime/itemAddedNotification",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "thread/realtime/outputAudio/delta"
-          ],
-          "title": "Thread/realtime/outputAudio/deltaNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadRealtimeOutputAudioDeltaNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Thread/realtime/outputAudio/deltaNotification",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "thread/realtime/error"
-          ],
-          "title": "Thread/realtime/errorNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadRealtimeErrorNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Thread/realtime/errorNotification",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "thread/realtime/closed"
-          ],
-          "title": "Thread/realtime/closedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadRealtimeClosedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Thread/realtime/closedNotification",
-      "type": "object"
-    },
    {
      "description": "Notifies the user of world-writable directories on Windows, which cannot be protected by the sandbox.",
      "properties": {
--- a/codex-rs/app-server-protocol/schema/json/ServerRequest.json
+++ b/codex-rs/app-server-protocol/schema/json/ServerRequest.json
@@ -1,102 +1,6 @@
 {
  "$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"
-    },
-    "AdditionalFileSystemPermissions": {
-      "properties": {
-        "read": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "write": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "AdditionalMacOsPermissions": {
-      "properties": {
-        "accessibility": {
-          "type": "boolean"
-        },
-        "automations": {
-          "$ref": "#/definitions/MacOsAutomationPermission"
-        },
-        "calendar": {
-          "type": "boolean"
-        },
-        "preferences": {
-          "$ref": "#/definitions/MacOsPreferencesPermission"
-        }
-      },
-      "required": [
-        "accessibility",
-        "automations",
-        "calendar",
-        "preferences"
-      ],
-      "type": "object"
-    },
-    "AdditionalNetworkPermissions": {
-      "properties": {
-        "enabled": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "AdditionalPermissionProfile": {
-      "properties": {
-        "fileSystem": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalFileSystemPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "macos": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalMacOsPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "network": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalNetworkPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "type": "object"
-    },
    "ApplyPatchApprovalParams": {
      "properties": {
        "callId": {
@@ -273,85 +177,6 @@
        }
      ]
    },
-    "CommandExecutionApprovalDecision": {
-      "oneOf": [
-        {
-          "description": "User approved the command.",
-          "enum": [
-            "accept"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "User approved the command and future prompts in the same session-scoped approval cache should run without prompting.",
-          "enum": [
-            "acceptForSession"
-          ],
-          "type": "string"
-        },
-        {
-          "additionalProperties": false,
-          "description": "User approved the command, and wants to apply the proposed execpolicy amendment so future matching commands can run without prompting.",
-          "properties": {
-            "acceptWithExecpolicyAmendment": {
-              "properties": {
-                "execpolicy_amendment": {
-                  "items": {
-                    "type": "string"
-                  },
-                  "type": "array"
-                }
-              },
-              "required": [
-                "execpolicy_amendment"
-              ],
-              "type": "object"
-            }
-          },
-          "required": [
-            "acceptWithExecpolicyAmendment"
-          ],
-          "title": "AcceptWithExecpolicyAmendmentCommandExecutionApprovalDecision",
-          "type": "object"
-        },
-        {
-          "additionalProperties": false,
-          "description": "User chose a persistent network policy rule (allow/deny) for this host.",
-          "properties": {
-            "applyNetworkPolicyAmendment": {
-              "properties": {
-                "network_policy_amendment": {
-                  "$ref": "#/definitions/NetworkPolicyAmendment"
-                }
-              },
-              "required": [
-                "network_policy_amendment"
-              ],
-              "type": "object"
-            }
-          },
-          "required": [
-            "applyNetworkPolicyAmendment"
-          ],
-          "title": "ApplyNetworkPolicyAmendmentCommandExecutionApprovalDecision",
-          "type": "object"
-        },
-        {
-          "description": "User denied the command. The agent will continue the turn.",
-          "enum": [
-            "decline"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "User denied the command. The turn will also be immediately interrupted.",
-          "enum": [
-            "cancel"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "CommandExecutionRequestApprovalParams": {
      "properties": {
        "approvalId": {
@@ -397,7 +222,7 @@
              "type": "null"
            }
          ],
-          "description": "Optional context for a managed-network approval prompt."
+          "description": "Optional context for managed-network approval prompts."
        },
        "proposedExecpolicyAmendment": {
          "description": "Optional proposed execpolicy amendment to allow similar commands without prompting.",
@@ -409,16 +234,6 @@
            "null"
          ]
        },
-        "proposedNetworkPolicyAmendments": {
-          "description": "Optional proposed network policy amendments (allow/deny host) for future requests.",
-          "items": {
-            "$ref": "#/definitions/NetworkPolicyAmendment"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
        "reason": {
          "description": "Optional explanatory reason (e.g. request for network access).",
          "type": [
@@ -440,17 +255,6 @@
      ],
      "type": "object"
    },
-    "CommandExecutionRequestApprovalSkillMetadata": {
-      "properties": {
-        "pathToSkillsMd": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "pathToSkillsMd"
-      ],
-      "type": "object"
-    },
    "DynamicToolCallParams": {
      "properties": {
        "arguments": true,
@@ -626,646 +430,6 @@
      ],
      "type": "object"
    },
-    "MacOsAutomationPermission": {
-      "oneOf": [
-        {
-          "enum": [
-            "none",
-            "all"
-          ],
-          "type": "string"
-        },
-        {
-          "additionalProperties": false,
-          "properties": {
-            "bundle_ids": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          "required": [
-            "bundle_ids"
-          ],
-          "title": "BundleIdsMacOsAutomationPermission",
-          "type": "object"
-        }
-      ]
-    },
-    "MacOsPreferencesPermission": {
-      "enum": [
-        "none",
-        "read_only",
-        "read_write"
-      ],
-      "type": "string"
-    },
-    "McpElicitationArrayType": {
-      "enum": [
-        "array"
-      ],
-      "type": "string"
-    },
-    "McpElicitationBooleanSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationBooleanType"
-        }
-      },
-      "required": [
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationBooleanType": {
-      "enum": [
-        "boolean"
-      ],
-      "type": "string"
-    },
-    "McpElicitationConstOption": {
-      "additionalProperties": false,
-      "properties": {
-        "const": {
-          "type": "string"
-        },
-        "title": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "const",
-        "title"
-      ],
-      "type": "object"
-    },
-    "McpElicitationEnumSchema": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/McpElicitationSingleSelectEnumSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationMultiSelectEnumSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationLegacyTitledEnumSchema"
-        }
-      ]
-    },
-    "McpElicitationLegacyTitledEnumSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "enum": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "enumNames": {
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationStringType"
-        }
-      },
-      "required": [
-        "enum",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationMultiSelectEnumSchema": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/McpElicitationUntitledMultiSelectEnumSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationTitledMultiSelectEnumSchema"
-        }
-      ]
-    },
-    "McpElicitationNumberSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "format": "double",
-          "type": [
-            "number",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "maximum": {
-          "format": "double",
-          "type": [
-            "number",
-            "null"
-          ]
-        },
-        "minimum": {
-          "format": "double",
-          "type": [
-            "number",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationNumberType"
-        }
-      },
-      "required": [
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationNumberType": {
-      "enum": [
-        "number",
-        "integer"
-      ],
-      "type": "string"
-    },
-    "McpElicitationObjectType": {
-      "enum": [
-        "object"
-      ],
-      "type": "string"
-    },
-    "McpElicitationPrimitiveSchema": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/McpElicitationEnumSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationStringSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationNumberSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationBooleanSchema"
-        }
-      ]
-    },
-    "McpElicitationSchema": {
-      "additionalProperties": false,
-      "description": "Typed form schema for MCP `elicitation/create` requests.\n\nThis matches the `requestedSchema` shape from the MCP 2025-11-25 `ElicitRequestFormParams` schema.",
-      "properties": {
-        "$schema": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "properties": {
-          "additionalProperties": {
-            "$ref": "#/definitions/McpElicitationPrimitiveSchema"
-          },
-          "type": "object"
-        },
-        "required": {
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationObjectType"
-        }
-      },
-      "required": [
-        "properties",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationSingleSelectEnumSchema": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/McpElicitationUntitledSingleSelectEnumSchema"
-        },
-        {
-          "$ref": "#/definitions/McpElicitationTitledSingleSelectEnumSchema"
-        }
-      ]
-    },
-    "McpElicitationStringFormat": {
-      "enum": [
-        "email",
-        "uri",
-        "date",
-        "date-time"
-      ],
-      "type": "string"
-    },
-    "McpElicitationStringSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "format": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/McpElicitationStringFormat"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "maxLength": {
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "minLength": {
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationStringType"
-        }
-      },
-      "required": [
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationStringType": {
-      "enum": [
-        "string"
-      ],
-      "type": "string"
-    },
-    "McpElicitationTitledEnumItems": {
-      "additionalProperties": false,
-      "properties": {
-        "anyOf": {
-          "items": {
-            "$ref": "#/definitions/McpElicitationConstOption"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "anyOf"
-      ],
-      "type": "object"
-    },
-    "McpElicitationTitledMultiSelectEnumSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "items": {
-          "$ref": "#/definitions/McpElicitationTitledEnumItems"
-        },
-        "maxItems": {
-          "format": "uint64",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "minItems": {
-          "format": "uint64",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationArrayType"
-        }
-      },
-      "required": [
-        "items",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationTitledSingleSelectEnumSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "oneOf": {
-          "items": {
-            "$ref": "#/definitions/McpElicitationConstOption"
-          },
-          "type": "array"
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationStringType"
-        }
-      },
-      "required": [
-        "oneOf",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationUntitledEnumItems": {
-      "additionalProperties": false,
-      "properties": {
-        "enum": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationStringType"
-        }
-      },
-      "required": [
-        "enum",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationUntitledMultiSelectEnumSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "items": {
-          "$ref": "#/definitions/McpElicitationUntitledEnumItems"
-        },
-        "maxItems": {
-          "format": "uint64",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "minItems": {
-          "format": "uint64",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationArrayType"
-        }
-      },
-      "required": [
-        "items",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpElicitationUntitledSingleSelectEnumSchema": {
-      "additionalProperties": false,
-      "properties": {
-        "default": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "enum": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "type": {
-          "$ref": "#/definitions/McpElicitationStringType"
-        }
-      },
-      "required": [
-        "enum",
-        "type"
-      ],
-      "type": "object"
-    },
-    "McpServerElicitationRequestParams": {
-      "oneOf": [
-        {
-          "properties": {
-            "_meta": true,
-            "message": {
-              "type": "string"
-            },
-            "mode": {
-              "enum": [
-                "form"
-              ],
-              "type": "string"
-            },
-            "requestedSchema": {
-              "$ref": "#/definitions/McpElicitationSchema"
-            }
-          },
-          "required": [
-            "message",
-            "mode",
-            "requestedSchema"
-          ],
-          "type": "object"
-        },
-        {
-          "properties": {
-            "_meta": true,
-            "elicitationId": {
-              "type": "string"
-            },
-            "message": {
-              "type": "string"
-            },
-            "mode": {
-              "enum": [
-                "url"
-              ],
-              "type": "string"
-            },
-            "url": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "elicitationId",
-            "message",
-            "mode",
-            "url"
-          ],
-          "type": "object"
-        }
-      ],
-      "properties": {
-        "serverName": {
-          "type": "string"
-        },
-        "threadId": {
-          "type": "string"
-        },
-        "turnId": {
-          "description": "Active Codex turn when this elicitation was observed, if app-server could correlate one.\n\nThis is nullable because MCP models elicitation as a standalone server-to-client request identified by the MCP server request id. It may be triggered during a turn, but turn context is app-server correlation rather than part of the protocol identity of the elicitation itself.",
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "serverName",
-        "threadId"
-      ],
-      "type": "object"
-    },
    "NetworkApprovalContext": {
      "properties": {
        "host": {
@@ -1290,28 +454,6 @@
      ],
      "type": "string"
    },
-    "NetworkPolicyAmendment": {
-      "properties": {
-        "action": {
-          "$ref": "#/definitions/NetworkPolicyRuleAction"
-        },
-        "host": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "action",
-        "host"
-      ],
-      "type": "object"
-    },
-    "NetworkPolicyRuleAction": {
-      "enum": [
-        "allow",
-        "deny"
-      ],
-      "type": "string"
-    },
    "ParsedCommand": {
      "oneOf": [
        {
@@ -1423,35 +565,6 @@
        }
      ]
    },
-    "PermissionsRequestApprovalParams": {
-      "properties": {
-        "itemId": {
-          "type": "string"
-        },
-        "permissions": {
-          "$ref": "#/definitions/AdditionalPermissionProfile"
-        },
-        "reason": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "threadId": {
-          "type": "string"
-        },
-        "turnId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "itemId",
-        "permissions",
-        "threadId",
-        "turnId"
-      ],
-      "type": "object"
-    },
    "RequestId": {
      "anyOf": [
        {
@@ -1624,56 +737,6 @@
      "title": "Item/tool/requestUserInputRequest",
      "type": "object"
    },
-    {
-      "description": "Request input for an MCP server elicitation.",
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "mcpServer/elicitation/request"
-          ],
-          "title": "McpServer/elicitation/requestRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/McpServerElicitationRequestParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "McpServer/elicitation/requestRequest",
-      "type": "object"
-    },
-    {
-      "description": "Request approval for additional permissions from the user.",
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "item/permissions/requestApproval"
-          ],
-          "title": "Item/permissions/requestApprovalRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/PermissionsRequestApprovalParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Item/permissions/requestApprovalRequest",
-      "type": "object"
-    },
    {
      "description": "Execute a dynamic tool call on the client.",
      "properties": {
--- 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
--- 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
--- a/codex-rs/app-server-protocol/schema/json/v2/AccountUpdatedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/AccountUpdatedNotification.json
@@ -26,20 +26,6 @@
          "type": "string"
        }
      ]
-    },
-    "PlanType": {
-      "enum": [
-        "free",
-        "go",
-        "plus",
-        "pro",
-        "team",
-        "business",
-        "enterprise",
-        "edu",
-        "unknown"
-      ],
-      "type": "string"
    }
  },
  "properties": {
@@ -52,16 +38,6 @@
          "type": "null"
        }
      ]
-    },
-    "planType": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/PlanType"
-        },
-        {
-          "type": "null"
-        }
-      ]
    }
  },
  "title": "AccountUpdatedNotification",
--- a/codex-rs/app-server-protocol/schema/json/v2/AppListUpdatedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/AppListUpdatedNotification.json
@@ -119,13 +119,6 @@
        },
        "name": {
          "type": "string"
-        },
-        "pluginDisplayNames": {
-          "default": [],
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
        }
      },
      "required": [
--- a/codex-rs/app-server-protocol/schema/json/v2/AppsListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/AppsListResponse.json
@@ -119,13 +119,6 @@
        },
        "name": {
          "type": "string"
-        },
-        "pluginDisplayNames": {
-          "default": [],
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
        }
      },
      "required": [
--- a/codex-rs/app-server-protocol/schema/json/v2/CommandExecOutputDeltaNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/CommandExecOutputDeltaNotification.json
@@ -1,55 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "CommandExecOutputStream": {
-      "description": "Stream label for `command/exec/outputDelta` notifications.",
-      "oneOf": [
-        {
-          "description": "stdout stream. PTY mode multiplexes terminal output here.",
-          "enum": [
-            "stdout"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "stderr stream.",
-          "enum": [
-            "stderr"
-          ],
-          "type": "string"
-        }
-      ]
-    }
-  },
-  "description": "Base64-encoded output chunk emitted for a streaming `command/exec` request.\n\nThese notifications are connection-scoped. If the originating connection closes, the server terminates the process.",
-  "properties": {
-    "capReached": {
-      "description": "`true` on the final streamed chunk for a stream when `outputBytesCap` truncated later output on that stream.",
-      "type": "boolean"
-    },
-    "deltaBase64": {
-      "description": "Base64-encoded output bytes.",
-      "type": "string"
-    },
-    "processId": {
-      "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-      "type": "string"
-    },
-    "stream": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/CommandExecOutputStream"
-        }
-      ],
-      "description": "Output stream for this chunk."
-    }
-  },
-  "required": [
-    "capReached",
-    "deltaBase64",
-    "processId",
-    "stream"
-  ],
-  "title": "CommandExecOutputDeltaNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/CommandExecParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/CommandExecParams.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"
    },
-    "CommandExecTerminalSize": {
-      "description": "PTY size in character cells for `command/exec` PTY sessions.",
-      "properties": {
-        "cols": {
-          "description": "Terminal width in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "rows": {
-          "description": "Terminal height in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        }
-      },
-      "required": [
-        "cols",
-        "rows"
-      ],
-      "type": "object"
-    },
    "NetworkAccess": {
      "enum": [
        "restricted",
@@ -111,10 +89,6 @@
                "type": "fullAccess"
              }
            },
-            "networkAccess": {
-              "default": false,
-              "type": "boolean"
-            },
            "type": {
              "enum": [
                "readOnly"
@@ -201,54 +175,14 @@
      ]
    }
  },
-  "description": "Run a standalone command (argv vector) in the server sandbox without creating a thread or turn.\n\nThe final `command/exec` response is deferred until the process exits and is sent only after all `command/exec/outputDelta` notifications for that connection have been emitted.",
  "properties": {
    "command": {
-      "description": "Command argv vector. Empty arrays are rejected.",
      "items": {
        "type": "string"
      },
      "type": "array"
    },
    "cwd": {
-      "description": "Optional working directory. Defaults to the server cwd.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "disableOutputCap": {
-      "description": "Disable stdout/stderr capture truncation for this request.\n\nCannot be combined with `outputBytesCap`.",
-      "type": "boolean"
-    },
-    "disableTimeout": {
-      "description": "Disable the timeout entirely for this request.\n\nCannot be combined with `timeoutMs`.",
-      "type": "boolean"
-    },
-    "env": {
-      "additionalProperties": {
-        "type": [
-          "string",
-          "null"
-        ]
-      },
-      "description": "Optional environment overrides merged into the server-computed environment.\n\nMatching names override inherited values. Set a key to `null` to unset an inherited variable.",
-      "type": [
-        "object",
-        "null"
-      ]
-    },
-    "outputBytesCap": {
-      "description": "Optional per-stream stdout/stderr capture cap in bytes.\n\nWhen omitted, the server default applies. Cannot be combined with `disableOutputCap`.",
-      "format": "uint",
-      "minimum": 0.0,
-      "type": [
-        "integer",
-        "null"
-      ]
-    },
-    "processId": {
-      "description": "Optional client-supplied, connection-scoped process id.\n\nRequired for `tty`, `streamStdin`, `streamStdoutStderr`, and follow-up `command/exec/write`, `command/exec/resize`, and `command/exec/terminate` calls. When omitted, buffered execution gets an internal id that is not exposed to the client.",
      "type": [
        "string",
        "null"
@@ -262,39 +196,14 @@
        {
          "type": "null"
        }
-      ],
-      "description": "Optional sandbox policy for this command.\n\nUses the same shape as thread/turn execution sandbox configuration and defaults to the user's configured policy when omitted."
-    },
-    "size": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/CommandExecTerminalSize"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "description": "Optional initial PTY size in character cells. Only valid when `tty` is true."
-    },
-    "streamStdin": {
-      "description": "Allow follow-up `command/exec/write` requests to write stdin bytes.\n\nRequires a client-supplied `processId`.",
-      "type": "boolean"
-    },
-    "streamStdoutStderr": {
-      "description": "Stream stdout/stderr via `command/exec/outputDelta` notifications.\n\nStreamed bytes are not duplicated into the final response and require a client-supplied `processId`.",
-      "type": "boolean"
+      ]
    },
    "timeoutMs": {
-      "description": "Optional timeout in milliseconds.\n\nWhen omitted, the server default applies. Cannot be combined with `disableTimeout`.",
      "format": "int64",
      "type": [
        "integer",
        "null"
      ]
-    },
-    "tty": {
-      "description": "Enable PTY mode.\n\nThis implies `streamStdin` and `streamStdoutStderr`.",
-      "type": "boolean"
    }
  },
  "required": [
--- a/codex-rs/app-server-protocol/schema/json/v2/CommandExecResizeParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/CommandExecResizeParams.json
@@ -1,48 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "CommandExecTerminalSize": {
-      "description": "PTY size in character cells for `command/exec` PTY sessions.",
-      "properties": {
-        "cols": {
-          "description": "Terminal width in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "rows": {
-          "description": "Terminal height in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        }
-      },
-      "required": [
-        "cols",
-        "rows"
-      ],
-      "type": "object"
-    }
-  },
-  "description": "Resize a running PTY-backed `command/exec` session.",
-  "properties": {
-    "processId": {
-      "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-      "type": "string"
-    },
-    "size": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/CommandExecTerminalSize"
-        }
-      ],
-      "description": "New PTY size in character cells."
-    }
-  },
-  "required": [
-    "processId",
-    "size"
-  ],
-  "title": "CommandExecResizeParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/CommandExecResizeResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/CommandExecResizeResponse.json
@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Empty success response for `command/exec/resize`.",
-  "title": "CommandExecResizeResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/CommandExecResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/CommandExecResponse.json
@@ -1,18 +1,14 @@
 {
  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Final buffered result for `command/exec`.",
  "properties": {
    "exitCode": {
-      "description": "Process exit code.",
      "format": "int32",
      "type": "integer"
    },
    "stderr": {
-      "description": "Buffered stderr capture.\n\nEmpty when stderr was streamed via `command/exec/outputDelta`.",
      "type": "string"
    },
    "stdout": {
-      "description": "Buffered stdout capture.\n\nEmpty when stdout was streamed via `command/exec/outputDelta`.",
      "type": "string"
    }
  },
--- a/codex-rs/app-server-protocol/schema/json/v2/CommandExecTerminateParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/CommandExecTerminateParams.json
@@ -1,15 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Terminate a running `command/exec` session.",
-  "properties": {
-    "processId": {
-      "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-      "type": "string"
-    }
-  },
-  "required": [
-    "processId"
-  ],
-  "title": "CommandExecTerminateParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/CommandExecTerminateResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/CommandExecTerminateResponse.json
@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Empty success response for `command/exec/terminate`.",
-  "title": "CommandExecTerminateResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/CommandExecWriteParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/CommandExecWriteParams.json
@@ -1,26 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Write stdin bytes to a running `command/exec` session, close stdin, or both.",
-  "properties": {
-    "closeStdin": {
-      "description": "Close stdin after writing `deltaBase64`, if present.",
-      "type": "boolean"
-    },
-    "deltaBase64": {
-      "description": "Optional base64-encoded stdin bytes to write.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "processId": {
-      "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-      "type": "string"
-    }
-  },
-  "required": [
-    "processId"
-  ],
-  "title": "CommandExecWriteParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/CommandExecWriteResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/CommandExecWriteResponse.json
@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Empty success response for `command/exec/write`.",
-  "title": "CommandExecWriteResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ConfigBatchWriteParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ConfigBatchWriteParams.json
@@ -45,10 +45,6 @@
        "string",
        "null"
      ]
-    },
-    "reloadUserConfig": {
-      "description": "When true, hot-reload the updated user config into all loaded threads after writing.",
-      "type": "boolean"
    }
  },
  "required": [
--- a/codex-rs/app-server-protocol/schema/json/v2/ConfigReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ConfigReadResponse.json
@@ -323,16 +323,6 @@
            }
          ]
        },
-        "service_tier": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ServiceTier"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
        "tools": {
          "anyOf": [
            {
@@ -618,26 +608,6 @@
            }
          ]
        },
-        "service_tier": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ServiceTier"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "tools": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ToolsV2"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
        "web_search": {
          "anyOf": [
            {
@@ -715,13 +685,6 @@
      },
      "type": "object"
    },
-    "ServiceTier": {
-      "enum": [
-        "fast",
-        "flex"
-      ],
-      "type": "string"
-    },
    "ToolsV2": {
      "properties": {
        "view_image": {
@@ -731,13 +694,9 @@
          ]
        },
        "web_search": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/WebSearchToolConfig"
-            },
-            {
-              "type": "null"
-            }
+          "type": [
+            "boolean",
+            "null"
          ]
        }
      },
@@ -752,44 +711,6 @@
      ],
      "type": "string"
    },
-    "WebSearchContextSize": {
-      "enum": [
-        "low",
-        "medium",
-        "high"
-      ],
-      "type": "string"
-    },
-    "WebSearchLocation": {
-      "additionalProperties": false,
-      "properties": {
-        "city": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "country": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "region": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "timezone": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
    "WebSearchMode": {
      "enum": [
        "disabled",
@@ -797,41 +718,6 @@
        "live"
      ],
      "type": "string"
-    },
-    "WebSearchToolConfig": {
-      "additionalProperties": false,
-      "properties": {
-        "allowed_domains": {
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "context_size": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/WebSearchContextSize"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "location": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/WebSearchLocation"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "type": "object"
    }
  },
  "properties": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json
@@ -81,15 +81,6 @@
              "type": "null"
            }
          ]
-        },
-        "featureRequirements": {
-          "additionalProperties": {
-            "type": "boolean"
-          },
-          "type": [
-            "object",
-            "null"
-          ]
        }
      },
      "type": "object"
@@ -132,6 +123,12 @@
            "null"
          ]
        },
+        "dangerouslyAllowNonLoopbackAdmin": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
        "dangerouslyAllowNonLoopbackProxy": {
          "type": [
            "boolean",
--- a/codex-rs/app-server-protocol/schema/json/v2/ExternalAgentConfigDetectParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ExternalAgentConfigDetectParams.json
@@ -1,21 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "properties": {
-    "cwds": {
-      "description": "Zero or more working directories to include for repo-scoped detection.",
-      "items": {
-        "type": "string"
-      },
-      "type": [
-        "array",
-        "null"
-      ]
-    },
-    "includeHome": {
-      "description": "If true, include detection under the user's home (~/.claude, ~/.codex, etc.).",
-      "type": "boolean"
-    }
-  },
-  "title": "ExternalAgentConfigDetectParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ExternalAgentConfigDetectResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ExternalAgentConfigDetectResponse.json
@@ -1,49 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "ExternalAgentConfigMigrationItem": {
-      "properties": {
-        "cwd": {
-          "description": "Null or empty means home-scoped migration; non-empty means repo-scoped migration.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "description": {
-          "type": "string"
-        },
-        "itemType": {
-          "$ref": "#/definitions/ExternalAgentConfigMigrationItemType"
-        }
-      },
-      "required": [
-        "description",
-        "itemType"
-      ],
-      "type": "object"
-    },
-    "ExternalAgentConfigMigrationItemType": {
-      "enum": [
-        "AGENTS_MD",
-        "CONFIG",
-        "SKILLS",
-        "MCP_SERVER_CONFIG"
-      ],
-      "type": "string"
-    }
-  },
-  "properties": {
-    "items": {
-      "items": {
-        "$ref": "#/definitions/ExternalAgentConfigMigrationItem"
-      },
-      "type": "array"
-    }
-  },
-  "required": [
-    "items"
-  ],
-  "title": "ExternalAgentConfigDetectResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ExternalAgentConfigImportParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ExternalAgentConfigImportParams.json
@@ -1,49 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "ExternalAgentConfigMigrationItem": {
-      "properties": {
-        "cwd": {
-          "description": "Null or empty means home-scoped migration; non-empty means repo-scoped migration.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "description": {
-          "type": "string"
-        },
-        "itemType": {
-          "$ref": "#/definitions/ExternalAgentConfigMigrationItemType"
-        }
-      },
-      "required": [
-        "description",
-        "itemType"
-      ],
-      "type": "object"
-    },
-    "ExternalAgentConfigMigrationItemType": {
-      "enum": [
-        "AGENTS_MD",
-        "CONFIG",
-        "SKILLS",
-        "MCP_SERVER_CONFIG"
-      ],
-      "type": "string"
-    }
-  },
-  "properties": {
-    "migrationItems": {
-      "items": {
-        "$ref": "#/definitions/ExternalAgentConfigMigrationItem"
-      },
-      "type": "array"
-    }
-  },
-  "required": [
-    "migrationItems"
-  ],
-  "title": "ExternalAgentConfigImportParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ExternalAgentConfigImportResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ExternalAgentConfigImportResponse.json
@@ -1,5 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "ExternalAgentConfigImportResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
@@ -185,58 +185,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -685,59 +633,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -863,40 +758,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
@@ -185,58 +185,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -685,59 +633,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -863,40 +758,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ModelListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ModelListResponse.json
@@ -22,16 +22,6 @@
    },
    "Model": {
      "properties": {
-        "availabilityNux": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ModelAvailabilityNux"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
        "defaultReasoningEffort": {
          "$ref": "#/definitions/ReasoningEffort"
        },
@@ -78,16 +68,6 @@
            "string",
            "null"
          ]
-        },
-        "upgradeInfo": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ModelUpgradeInfo"
-            },
-            {
-              "type": "null"
-            }
-          ]
        }
      },
      "required": [
@@ -102,46 +82,6 @@
      ],
      "type": "object"
    },
-    "ModelAvailabilityNux": {
-      "properties": {
-        "message": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "message"
-      ],
-      "type": "object"
-    },
-    "ModelUpgradeInfo": {
-      "properties": {
-        "migrationMarkdown": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "model": {
-          "type": "string"
-        },
-        "modelLink": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "upgradeCopy": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "model"
-      ],
-      "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/PluginInstallParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginInstallParams.json
@@ -1,23 +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": {
-    "marketplacePath": {
-      "$ref": "#/definitions/AbsolutePathBuf"
-    },
-    "pluginName": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "marketplacePath",
-    "pluginName"
-  ],
-  "title": "PluginInstallParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginInstallResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginInstallResponse.json
@@ -1,46 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "AppSummary": {
-      "description": "EXPERIMENTAL - app metadata summary for plugin-install responses.",
-      "properties": {
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "id": {
-          "type": "string"
-        },
-        "installUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "id",
-        "name"
-      ],
-      "type": "object"
-    }
-  },
-  "properties": {
-    "appsNeedingAuth": {
-      "items": {
-        "$ref": "#/definitions/AppSummary"
-      },
-      "type": "array"
-    }
-  },
-  "required": [
-    "appsNeedingAuth"
-  ],
-  "title": "PluginInstallResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginListParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginListParams.json
@@ -1,23 +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": {
-    "cwds": {
-      "description": "Optional working directories used to discover repo marketplaces. When omitted, only home-scoped marketplaces and the official curated marketplace are considered.",
-      "items": {
-        "$ref": "#/definitions/AbsolutePathBuf"
-      },
-      "type": [
-        "array",
-        "null"
-      ]
-    }
-  },
-  "title": "PluginListParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginListResponse.json
@@ -1,206 +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"
-    },
-    "PluginInterface": {
-      "properties": {
-        "brandColor": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "capabilities": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "category": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "composerIcon": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "defaultPrompt": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "developerName": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "displayName": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "logo": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "longDescription": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "privacyPolicyUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "screenshots": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": "array"
-        },
-        "shortDescription": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "termsOfServiceUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "websiteUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "capabilities",
-        "screenshots"
-      ],
-      "type": "object"
-    },
-    "PluginMarketplaceEntry": {
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "path": {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        },
-        "plugins": {
-          "items": {
-            "$ref": "#/definitions/PluginSummary"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "name",
-        "path",
-        "plugins"
-      ],
-      "type": "object"
-    },
-    "PluginSource": {
-      "oneOf": [
-        {
-          "properties": {
-            "path": {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            "type": {
-              "enum": [
-                "local"
-              ],
-              "title": "LocalPluginSourceType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "path",
-            "type"
-          ],
-          "title": "LocalPluginSource",
-          "type": "object"
-        }
-      ]
-    },
-    "PluginSummary": {
-      "properties": {
-        "enabled": {
-          "type": "boolean"
-        },
-        "id": {
-          "type": "string"
-        },
-        "installed": {
-          "type": "boolean"
-        },
-        "interface": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/PluginInterface"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "name": {
-          "type": "string"
-        },
-        "source": {
-          "$ref": "#/definitions/PluginSource"
-        }
-      },
-      "required": [
-        "enabled",
-        "id",
-        "installed",
-        "name",
-        "source"
-      ],
-      "type": "object"
-    }
-  },
-  "properties": {
-    "marketplaces": {
-      "items": {
-        "$ref": "#/definitions/PluginMarketplaceEntry"
-      },
-      "type": "array"
-    }
-  },
-  "required": [
-    "marketplaces"
-  ],
-  "title": "PluginListResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json
@@ -103,16 +103,6 @@
        },
        {
          "properties": {
-            "detail": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ImageDetail"
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
            "image_url": {
              "type": "string"
            },
@@ -183,15 +173,6 @@
      ],
      "type": "object"
    },
-    "ImageDetail": {
-      "enum": [
-        "auto",
-        "low",
-        "high",
-        "original"
-      ],
-      "type": "string"
-    },
    "LocalShellAction": {
      "oneOf": [
        {
@@ -584,7 +565,7 @@
              "type": "string"
            },
            "output": {
-              "$ref": "#/definitions/FunctionCallOutputPayload"
+              "type": "string"
            },
            "type": {
              "enum": [
@@ -607,7 +588,7 @@
            "action": {
              "anyOf": [
                {
-                  "$ref": "#/definitions/ResponsesApiWebSearchAction"
+                  "$ref": "#/definitions/WebSearchAction"
                },
                {
                  "type": "null"
@@ -641,40 +622,6 @@
          "title": "WebSearchCallResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revised_prompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "image_generation_call"
-              ],
-              "title": "ImageGenerationCallResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationCallResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "ghost_commit": {
@@ -733,7 +680,7 @@
        }
      ]
    },
-    "ResponsesApiWebSearchAction": {
+    "WebSearchAction": {
      "oneOf": [
        {
          "properties": {
@@ -756,14 +703,14 @@
              "enum": [
                "search"
              ],
-              "title": "SearchResponsesApiWebSearchActionType",
+              "title": "SearchWebSearchActionType",
              "type": "string"
            }
          },
          "required": [
            "type"
          ],
-          "title": "SearchResponsesApiWebSearchAction",
+          "title": "SearchWebSearchAction",
          "type": "object"
        },
        {
@@ -772,7 +719,7 @@
              "enum": [
                "open_page"
              ],
-              "title": "OpenPageResponsesApiWebSearchActionType",
+              "title": "OpenPageWebSearchActionType",
              "type": "string"
            },
            "url": {
@@ -785,7 +732,7 @@
          "required": [
            "type"
          ],
-          "title": "OpenPageResponsesApiWebSearchAction",
+          "title": "OpenPageWebSearchAction",
          "type": "object"
        },
        {
@@ -800,7 +747,7 @@
              "enum": [
                "find_in_page"
              ],
-              "title": "FindInPageResponsesApiWebSearchActionType",
+              "title": "FindInPageWebSearchActionType",
              "type": "string"
            },
            "url": {
@@ -813,7 +760,7 @@
          "required": [
            "type"
          ],
-          "title": "FindInPageResponsesApiWebSearchAction",
+          "title": "FindInPageWebSearchAction",
          "type": "object"
        },
        {
@@ -822,14 +769,14 @@
              "enum": [
                "other"
              ],
-              "title": "OtherResponsesApiWebSearchActionType",
+              "title": "OtherWebSearchActionType",
              "type": "string"
            }
          },
          "required": [
            "type"
          ],
-          "title": "OtherResponsesApiWebSearchAction",
+          "title": "OtherWebSearchAction",
          "type": "object"
        }
      ]
--- a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
@@ -299,58 +299,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -799,59 +747,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -977,40 +872,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ServerRequestResolvedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ServerRequestResolvedNotification.json
@@ -1,30 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "RequestId": {
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "format": "int64",
-          "type": "integer"
-        }
-      ]
-    }
-  },
-  "properties": {
-    "requestId": {
-      "$ref": "#/definitions/RequestId"
-    },
-    "threadId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "requestId",
-    "threadId"
-  ],
-  "title": "ServerRequestResolvedNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/SkillsChangedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/SkillsChangedNotification.json
@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Notification emitted when watched local skill files change.\n\nTreat this as an invalidation signal and re-run `skills/list` with the client's current parameters when refreshed skill metadata is needed.",
-  "title": "SkillsChangedNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadClosedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadClosedNotification.json
@@ -1,13 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "properties": {
-    "threadId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "threadId"
-  ],
-  "title": "ThreadClosedNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json
@@ -50,13 +50,6 @@
        "danger-full-access"
      ],
      "type": "string"
-    },
-    "ServiceTier": {
-      "enum": [
-        "fast",
-        "flex"
-      ],
-      "type": "string"
    }
  },
  "description": "There are two ways to fork a thread: 1. By thread_id: load the thread from disk by thread_id and fork it into a new thread. 2. By path: load the thread from disk by path and fork it into a new thread.\n\nIf using path, the thread_id param will be ignored.\n\nPrefer using thread_id whenever possible.",
@@ -119,23 +112,6 @@
        }
      ]
    },
-    "serviceTier": {
-      "anyOf": [
-        {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ServiceTier"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
    "threadId": {
      "type": "string"
    }
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
@@ -345,58 +345,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -653,10 +601,6 @@
                "type": "fullAccess"
              }
            },
-            "networkAccess": {
-              "default": false,
-              "type": "boolean"
-            },
            "type": {
              "enum": [
                "readOnly"
@@ -742,13 +686,6 @@
        }
      ]
    },
-    "ServiceTier": {
-      "enum": [
-        "fast",
-        "flex"
-      ],
-      "type": "string"
-    },
    "SessionSource": {
      "oneOf": [
        {
@@ -893,10 +830,6 @@
          "description": "Working directory captured for the thread.",
          "type": "string"
        },
-        "ephemeral": {
-          "description": "Whether the thread is ephemeral and should not be materialized on disk.",
-          "type": "boolean"
-        },
        "gitInfo": {
          "anyOf": [
            {
@@ -966,7 +899,6 @@
        "cliVersion",
        "createdAt",
        "cwd",
-        "ephemeral",
        "id",
        "modelProvider",
        "preview",
@@ -1275,59 +1207,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -1453,40 +1332,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
@@ -1951,16 +1796,6 @@
    "sandbox": {
      "$ref": "#/definitions/SandboxPolicy"
    },
-    "serviceTier": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ServiceTier"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
    "thread": {
      "$ref": "#/definitions/Thread"
    }
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadListParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadListParams.json
@@ -65,13 +65,6 @@
        "null"
      ]
    },
-    "searchTerm": {
-      "description": "Optional substring filter for the extracted thread title.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
    "sortKey": {
      "anyOf": [
        {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
@@ -299,58 +299,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -655,10 +603,6 @@
          "description": "Working directory captured for the thread.",
          "type": "string"
        },
-        "ephemeral": {
-          "description": "Whether the thread is ephemeral and should not be materialized on disk.",
-          "type": "boolean"
-        },
        "gitInfo": {
          "anyOf": [
            {
@@ -728,7 +672,6 @@
        "cliVersion",
        "createdAt",
        "cwd",
-        "ephemeral",
        "id",
        "modelProvider",
        "preview",
@@ -1037,59 +980,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -1215,40 +1105,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateParams.json
@@ -1,52 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "ThreadMetadataGitInfoUpdateParams": {
-      "properties": {
-        "branch": {
-          "description": "Omit to leave the stored branch unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "originUrl": {
-          "description": "Omit to leave the stored origin URL unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "sha": {
-          "description": "Omit to leave the stored commit unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    }
-  },
-  "properties": {
-    "gitInfo": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ThreadMetadataGitInfoUpdateParams"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "description": "Patch the stored Git metadata for this thread. Omit a field to leave it unchanged, set it to `null` to clear it, or provide a string to replace the stored value."
-    },
-    "threadId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "threadId"
-  ],
-  "title": "ThreadMetadataUpdateParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
@@ -299,58 +299,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -655,10 +603,6 @@
          "description": "Working directory captured for the thread.",
          "type": "string"
        },
-        "ephemeral": {
-          "description": "Whether the thread is ephemeral and should not be materialized on disk.",
-          "type": "boolean"
-        },
        "gitInfo": {
          "anyOf": [
            {
@@ -728,7 +672,6 @@
        "cliVersion",
        "createdAt",
        "cwd",
-        "ephemeral",
        "id",
        "modelProvider",
        "preview",
@@ -1037,59 +980,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -1215,40 +1105,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeClosedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeClosedNotification.json
@@ -1,20 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "EXPERIMENTAL - emitted when thread realtime transport closes.",
-  "properties": {
-    "reason": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "threadId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "threadId"
-  ],
-  "title": "ThreadRealtimeClosedNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeErrorNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeErrorNotification.json
@@ -1,18 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "EXPERIMENTAL - emitted when thread realtime encounters an error.",
-  "properties": {
-    "message": {
-      "type": "string"
-    },
-    "threadId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "message",
-    "threadId"
-  ],
-  "title": "ThreadRealtimeErrorNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeItemAddedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeItemAddedNotification.json
@@ -1,16 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "EXPERIMENTAL - raw non-audio thread realtime item emitted by the backend.",
-  "properties": {
-    "item": true,
-    "threadId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "item",
-    "threadId"
-  ],
-  "title": "ThreadRealtimeItemAddedNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeOutputAudioDeltaNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeOutputAudioDeltaNotification.json
@@ -1,52 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "ThreadRealtimeAudioChunk": {
-      "description": "EXPERIMENTAL - thread realtime audio chunk.",
-      "properties": {
-        "data": {
-          "type": "string"
-        },
-        "numChannels": {
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "sampleRate": {
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "samplesPerChannel": {
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "data",
-        "numChannels",
-        "sampleRate"
-      ],
-      "type": "object"
-    }
-  },
-  "description": "EXPERIMENTAL - streamed output audio emitted by thread realtime.",
-  "properties": {
-    "audio": {
-      "$ref": "#/definitions/ThreadRealtimeAudioChunk"
-    },
-    "threadId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "audio",
-    "threadId"
-  ],
-  "title": "ThreadRealtimeOutputAudioDeltaNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeStartedNotification.json
@@ -1,20 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "EXPERIMENTAL - emitted when thread realtime startup is accepted.",
-  "properties": {
-    "sessionId": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "threadId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "threadId"
-  ],
-  "title": "ThreadRealtimeStartedNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json
@@ -145,16 +145,6 @@
        },
        {
          "properties": {
-            "detail": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ImageDetail"
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
            "image_url": {
              "type": "string"
            },
@@ -225,15 +215,6 @@
      ],
      "type": "object"
    },
-    "ImageDetail": {
-      "enum": [
-        "auto",
-        "low",
-        "high",
-        "original"
-      ],
-      "type": "string"
-    },
    "LocalShellAction": {
      "oneOf": [
        {
@@ -634,7 +615,7 @@
              "type": "string"
            },
            "output": {
-              "$ref": "#/definitions/FunctionCallOutputPayload"
+              "type": "string"
            },
            "type": {
              "enum": [
@@ -657,7 +638,7 @@
            "action": {
              "anyOf": [
                {
-                  "$ref": "#/definitions/ResponsesApiWebSearchAction"
+                  "$ref": "#/definitions/WebSearchAction"
                },
                {
                  "type": "null"
@@ -691,40 +672,6 @@
          "title": "WebSearchCallResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revised_prompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "image_generation_call"
-              ],
-              "title": "ImageGenerationCallResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationCallResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "ghost_commit": {
@@ -783,7 +730,15 @@
        }
      ]
    },
-    "ResponsesApiWebSearchAction": {
+    "SandboxMode": {
+      "enum": [
+        "read-only",
+        "workspace-write",
+        "danger-full-access"
+      ],
+      "type": "string"
+    },
+    "WebSearchAction": {
      "oneOf": [
        {
          "properties": {
@@ -806,14 +761,14 @@
              "enum": [
                "search"
              ],
-              "title": "SearchResponsesApiWebSearchActionType",
+              "title": "SearchWebSearchActionType",
              "type": "string"
            }
          },
          "required": [
            "type"
          ],
-          "title": "SearchResponsesApiWebSearchAction",
+          "title": "SearchWebSearchAction",
          "type": "object"
        },
        {
@@ -822,7 +777,7 @@
              "enum": [
                "open_page"
              ],
-              "title": "OpenPageResponsesApiWebSearchActionType",
+              "title": "OpenPageWebSearchActionType",
              "type": "string"
            },
            "url": {
@@ -835,7 +790,7 @@
          "required": [
            "type"
          ],
-          "title": "OpenPageResponsesApiWebSearchAction",
+          "title": "OpenPageWebSearchAction",
          "type": "object"
        },
        {
@@ -850,7 +805,7 @@
              "enum": [
                "find_in_page"
              ],
-              "title": "FindInPageResponsesApiWebSearchActionType",
+              "title": "FindInPageWebSearchActionType",
              "type": "string"
            },
            "url": {
@@ -863,7 +818,7 @@
          "required": [
            "type"
          ],
-          "title": "FindInPageResponsesApiWebSearchAction",
+          "title": "FindInPageWebSearchAction",
          "type": "object"
        },
        {
@@ -872,32 +827,17 @@
              "enum": [
                "other"
              ],
-              "title": "OtherResponsesApiWebSearchActionType",
+              "title": "OtherWebSearchActionType",
              "type": "string"
            }
          },
          "required": [
            "type"
          ],
-          "title": "OtherResponsesApiWebSearchAction",
+          "title": "OtherWebSearchAction",
          "type": "object"
        }
      ]
-    },
-    "SandboxMode": {
-      "enum": [
-        "read-only",
-        "workspace-write",
-        "danger-full-access"
-      ],
-      "type": "string"
-    },
-    "ServiceTier": {
-      "enum": [
-        "fast",
-        "flex"
-      ],
-      "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\nThe precedence is: history > path > thread_id. If using history or path, the thread_id param will be ignored.\n\nPrefer using thread_id whenever possible.",
@@ -970,23 +910,6 @@
        }
      ]
    },
-    "serviceTier": {
-      "anyOf": [
-        {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ServiceTier"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
    "threadId": {
      "type": "string"
    }
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
@@ -345,58 +345,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -653,10 +601,6 @@
                "type": "fullAccess"
              }
            },
-            "networkAccess": {
-              "default": false,
-              "type": "boolean"
-            },
            "type": {
              "enum": [
                "readOnly"
@@ -742,13 +686,6 @@
        }
      ]
    },
-    "ServiceTier": {
-      "enum": [
-        "fast",
-        "flex"
-      ],
-      "type": "string"
-    },
    "SessionSource": {
      "oneOf": [
        {
@@ -893,10 +830,6 @@
          "description": "Working directory captured for the thread.",
          "type": "string"
        },
-        "ephemeral": {
-          "description": "Whether the thread is ephemeral and should not be materialized on disk.",
-          "type": "boolean"
-        },
        "gitInfo": {
          "anyOf": [
            {
@@ -966,7 +899,6 @@
        "cliVersion",
        "createdAt",
        "cwd",
-        "ephemeral",
        "id",
        "modelProvider",
        "preview",
@@ -1275,59 +1207,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -1453,40 +1332,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
@@ -1951,16 +1796,6 @@
    "sandbox": {
      "$ref": "#/definitions/SandboxPolicy"
    },
-    "serviceTier": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ServiceTier"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
    "thread": {
      "$ref": "#/definitions/Thread"
    }
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json
@@ -299,58 +299,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -655,10 +603,6 @@
          "description": "Working directory captured for the thread.",
          "type": "string"
        },
-        "ephemeral": {
-          "description": "Whether the thread is ephemeral and should not be materialized on disk.",
-          "type": "boolean"
-        },
        "gitInfo": {
          "anyOf": [
            {
@@ -728,7 +672,6 @@
        "cliVersion",
        "createdAt",
        "cwd",
-        "ephemeral",
        "id",
        "modelProvider",
        "preview",
@@ -1037,59 +980,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -1215,40 +1105,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json
@@ -75,13 +75,6 @@
        "danger-full-access"
      ],
      "type": "string"
-    },
-    "ServiceTier": {
-      "enum": [
-        "fast",
-        "flex"
-      ],
-      "type": "string"
    }
  },
  "properties": {
@@ -157,29 +150,6 @@
          "type": "null"
        }
      ]
-    },
-    "serviceName": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "serviceTier": {
-      "anyOf": [
-        {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ServiceTier"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        {
-          "type": "null"
-        }
-      ]
    }
  },
  "title": "ThreadStartParams",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
@@ -345,58 +345,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -653,10 +601,6 @@
                "type": "fullAccess"
              }
            },
-            "networkAccess": {
-              "default": false,
-              "type": "boolean"
-            },
            "type": {
              "enum": [
                "readOnly"
@@ -742,13 +686,6 @@
        }
      ]
    },
-    "ServiceTier": {
-      "enum": [
-        "fast",
-        "flex"
-      ],
-      "type": "string"
-    },
    "SessionSource": {
      "oneOf": [
        {
@@ -893,10 +830,6 @@
          "description": "Working directory captured for the thread.",
          "type": "string"
        },
-        "ephemeral": {
-          "description": "Whether the thread is ephemeral and should not be materialized on disk.",
-          "type": "boolean"
-        },
        "gitInfo": {
          "anyOf": [
            {
@@ -966,7 +899,6 @@
        "cliVersion",
        "createdAt",
        "cwd",
-        "ephemeral",
        "id",
        "modelProvider",
        "preview",
@@ -1275,59 +1207,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -1453,40 +1332,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
@@ -1951,16 +1796,6 @@
    "sandbox": {
      "$ref": "#/definitions/SandboxPolicy"
    },
-    "serviceTier": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ServiceTier"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
    "thread": {
      "$ref": "#/definitions/Thread"
    }
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
@@ -299,58 +299,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -655,10 +603,6 @@
          "description": "Working directory captured for the thread.",
          "type": "string"
        },
-        "ephemeral": {
-          "description": "Whether the thread is ephemeral and should not be materialized on disk.",
-          "type": "boolean"
-        },
        "gitInfo": {
          "anyOf": [
            {
@@ -728,7 +672,6 @@
        "cliVersion",
        "createdAt",
        "cwd",
-        "ephemeral",
        "id",
        "modelProvider",
        "preview",
@@ -1037,59 +980,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -1215,40 +1105,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
@@ -299,58 +299,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -655,10 +603,6 @@
          "description": "Working directory captured for the thread.",
          "type": "string"
        },
-        "ephemeral": {
-          "description": "Whether the thread is ephemeral and should not be materialized on disk.",
-          "type": "boolean"
-        },
        "gitInfo": {
          "anyOf": [
            {
@@ -728,7 +672,6 @@
        "cliVersion",
        "createdAt",
        "cwd",
-        "ephemeral",
        "id",
        "modelProvider",
        "preview",
@@ -1037,59 +980,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -1215,40 +1105,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnsubscribeParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnsubscribeParams.json
@@ -1,13 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "properties": {
-    "threadId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "threadId"
-  ],
-  "title": "ThreadUnsubscribeParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnsubscribeResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnsubscribeResponse.json
@@ -1,23 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "ThreadUnsubscribeStatus": {
-      "enum": [
-        "notLoaded",
-        "notSubscribed",
-        "unsubscribed"
-      ],
-      "type": "string"
-    }
-  },
-  "properties": {
-    "status": {
-      "$ref": "#/definitions/ThreadUnsubscribeStatus"
-    }
-  },
-  "required": [
-    "status"
-  ],
-  "title": "ThreadUnsubscribeResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
@@ -299,58 +299,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -799,59 +747,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -977,40 +872,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json
@@ -214,10 +214,6 @@
                "type": "fullAccess"
              }
            },
-            "networkAccess": {
-              "default": false,
-              "type": "boolean"
-            },
            "type": {
              "enum": [
                "readOnly"
@@ -303,13 +299,6 @@
        }
      ]
    },
-    "ServiceTier": {
-      "enum": [
-        "fast",
-        "flex"
-      ],
-      "type": "string"
-    },
    "Settings": {
      "description": "Settings for a collaboration mode.",
      "properties": {
@@ -550,24 +539,6 @@
      ],
      "description": "Override the sandbox policy for this turn and subsequent turns."
    },
-    "serviceTier": {
-      "anyOf": [
-        {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ServiceTier"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "description": "Override the service tier for this turn and subsequent turns."
-    },
    "summary": {
      "anyOf": [
        {
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
@@ -299,58 +299,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -799,59 +747,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -977,40 +872,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
@@ -299,58 +299,6 @@
      ],
      "type": "string"
    },
-    "DynamicToolCallOutputContentItem": {
-      "oneOf": [
-        {
-          "properties": {
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputText"
-              ],
-              "title": "InputTextDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "text",
-            "type"
-          ],
-          "title": "InputTextDynamicToolCallOutputContentItem",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "imageUrl": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "inputImage"
-              ],
-              "title": "InputImageDynamicToolCallOutputContentItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "imageUrl",
-            "type"
-          ],
-          "title": "InputImageDynamicToolCallOutputContentItem",
-          "type": "object"
-        }
-      ]
-    },
-    "DynamicToolCallStatus": {
-      "enum": [
-        "inProgress",
-        "completed",
-        "failed"
-      ],
-      "type": "string"
-    },
    "FileUpdateChange": {
      "properties": {
        "diff": {
@@ -799,59 +747,6 @@
          "title": "McpToolCallThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "contentItems": {
-              "items": {
-                "$ref": "#/definitions/DynamicToolCallOutputContentItem"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "durationMs": {
-              "description": "The duration of the dynamic tool call in milliseconds.",
-              "format": "int64",
-              "type": [
-                "integer",
-                "null"
-              ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "status": {
-              "$ref": "#/definitions/DynamicToolCallStatus"
-            },
-            "success": {
-              "type": [
-                "boolean",
-                "null"
-              ]
-            },
-            "tool": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "dynamicToolCall"
-              ],
-              "title": "DynamicToolCallThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "id",
-            "status",
-            "tool",
-            "type"
-          ],
-          "title": "DynamicToolCallThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "agentsStates": {
@@ -977,40 +872,6 @@
          "title": "ImageViewThreadItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "result": {
-              "type": "string"
-            },
-            "revisedPrompt": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "status": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "imageGeneration"
-              ],
-              "title": "ImageGenerationThreadItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "result",
-            "status",
-            "type"
-          ],
-          "title": "ImageGenerationThreadItem",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
--- a/codex-rs/app-server-protocol/schema/json/v2/WindowsSandboxSetupStartParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/WindowsSandboxSetupStartParams.json
@@ -1,10 +1,6 @@
 {
  "$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"
-    },
    "WindowsSandboxSetupMode": {
      "enum": [
        "elevated",
@@ -14,16 +10,6 @@
    }
  },
  "properties": {
-    "cwd": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
    "mode": {
      "$ref": "#/definitions/WindowsSandboxSetupMode"
    }
--- a/codex-rs/app-server-protocol/schema/typescript/AddConversationListenerParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AddConversationListenerParams.ts
@@ -0,0 +1,6 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ThreadId } from "./ThreadId";
+
+export type AddConversationListenerParams = { conversationId: ThreadId, experimentalRawEvents: boolean, };
--- a/codex-rs/app-server-protocol/schema/typescript/AddConversationSubscriptionResponse.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AddConversationSubscriptionResponse.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 MacOsPreferencesPermission = "none" | "read_only" | "read_write";
+export type AddConversationSubscriptionResponse = { subscriptionId: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/DynamicToolCallOutputContentItem.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/DynamicToolCallOutputContentItem.ts
@@ -1,5 +1,6 @@
 // GENERATED CODE! DO NOT MODIFY BY HAND!

 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ThreadId } from "./ThreadId";

-export type DynamicToolCallOutputContentItem = { "type": "inputText", text: string, } | { "type": "inputImage", imageUrl: string, };
+export type ArchiveConversationParams = { conversationId: ThreadId, rolloutPath: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/ArchiveConversationResponse.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/ArchiveConversationResponse.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 ArchiveConversationResponse = Record<string, never>;
--- a/codex-rs/app-server-protocol/schema/typescript/AuthStatusChangeNotification.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AuthStatusChangeNotification.ts
@@ -0,0 +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 { AuthMode } from "./AuthMode";
+
+/**
+ * Deprecated notification. Use AccountUpdatedNotification instead.
+ */
+export type AuthStatusChangeNotification = { authMethod: AuthMode | null, };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Conrad Kramer	032b478ec1	core: preserve SBPL file no-newline style	2026-02-22 19:06:32 -08:00
Conrad Kramer	33cf7f67c2	core: allow CoreServices in macOS seatbelt platform defaults	2026-02-22 18:52:06 -08:00