Add subagent field to notify payload

For notify events, a notifier may want to behave differently for subagents than for the main thread, so we can expose that info in the notify payload.

.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

.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.

.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
@@ -164,13 +156,6 @@ 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

.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 }}

.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: |

.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

.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: |

.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:

.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

.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]": {

BUILD.bazel

@@ -1,4 +1,11 @@
 load("@apple_support//xcode:xcode_config.bzl", "xcode_config")
+load("@rules_cc//cc:defs.bzl", "cc_shared_library")
+
+cc_shared_library(
+    name = "clang",
+    deps = ["@llvm-project//clang:libclang"],
+    visibility = ["//visibility:public"],
+)
 
 xcode_config(name = "disable_xcode")
 
@@ -9,7 +16,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 +35,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"])

MODULE.bazel

@@ -1,18 +1,18 @@
 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.6")
 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")
+register_toolchains("@toolchains_llvm_bootstrapped//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")
@@ -33,13 +33,21 @@ osx.framework(name = "Kernel")
 osx.framework(name = "OSLog")
 osx.framework(name = "Security")
 osx.framework(name = "SystemConfiguration")
-use_repo(osx, "macos_sdk")
+use_repo(osx, "macosx15.4.sdk")
 
 # 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-O34UF4H7b1Qacu3vlu2Od4ILGVApzg5j1zl952SFL3w=",
+    strip_prefix = "rules_rs-097123c2aa72672e371e69e7035869f5a45c7b2b",
+    url = "https://github.com/dzbarsky/rules_rs/archive/097123c2aa72672e371e69e7035869f5a45c7b2b.tar.gz",
+)
 
 rules_rust = use_extension("@rules_rs//rs/experimental:rules_rust.bzl", "rules_rust")
 use_repo(rules_rust, "rules_rust")
@@ -49,9 +57,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 +79,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")
@@ -128,9 +139,11 @@ crate.annotation(
         "OPENSSL_NO_VENDOR": "1",
         "OPENSSL_STATIC": "1",
     },
+    crate_features = [
+        "dep:openssl-src",
+    ],
     crate = "openssl-sys",
     data = ["@openssl//:gen_dir"],
-    gen_build_script = "on",
 )
 
 inject_repo(crate, "openssl")
@@ -140,28 +153,27 @@ crate.annotation(
     workspace_cargo_toml = "rust/runfiles/Cargo.toml",
 )
 
-llvm = use_extension("@llvm//extensions:llvm.bzl", "llvm")
+llvm = use_extension("@toolchains_llvm_bootstrapped//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",
+        "@macosx15.4.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)",
+        "BINDGEN_EXTRA_CLANG_ARGS": "-isystem $(location @toolchains_llvm_bootstrapped//:builtin_headers)",
+        "COREAUDIO_SDK_PATH": "$(location @macosx15.4.sdk//sysroot)",
+        "LIBCLANG_PATH": "$(location @codex//:clang)",
     },
     build_script_tools = [
-        "@llvm-project//clang:libclang_interface_output",
-        "@llvm//:builtin_headers",
+        "@codex//:clang",
+        "@toolchains_llvm_bootstrapped//:builtin_headers",
     ],
     crate = "coreaudio-sys",
-    gen_build_script = "on",
 )
 
-inject_repo(crate, "llvm", "llvm-project", "macos_sdk")
+inject_repo(crate, "codex", "toolchains_llvm_bootstrapped", "macosx15.4.sdk")
 
 # Fix readme inclusions
 crate.annotation(
@@ -172,6 +184,28 @@ crate.annotation(
     ],
 )
 
+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(
+    additive_build_file_content = WINDOWS_IMPORT_LIB,
+    crate = "windows_x86_64_gnullvm",
+    gen_build_script = "off",
+    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"],
+)
+
 bazel_dep(name = "alsa_lib", version = "1.2.9.bcr.4")
 
 crate.annotation(

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"]

codex-rs/.config/nextest.toml

@@ -11,9 +11,3 @@ slow-timeout = { period = "1m", terminate-after = 4 }
 [[profile.default.overrides]]
 filter = 'test(approval_matrix_covers_all_modes)'
 slow-timeout = { period = "30s", terminate-after = 2 }
-
-[[profile.default.overrides]]
-# Schema fixture generation can take longer than the default timeout on slower
-# Windows runners when app-server protocol fixture sets grow.
-filter = 'test(schema_fixtures_match_generated)'
-slow-timeout = { period = "1m", terminate-after = 2 }

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",
@@ -24,6 +23,7 @@ members = [
     "hooks",
     "secrets",
     "exec",
+    "exec-server",
     "execpolicy",
     "execpolicy-legacy",
     "keyring-store",
@@ -59,14 +59,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 +80,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" }
@@ -125,7 +118,6 @@ 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 +135,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 +147,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 +163,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 +170,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,9 +181,9 @@ 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"
@@ -245,7 +232,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 +252,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 +278,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 +343,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"

codex-rs/README.md

@@ -51,7 +51,6 @@ You can enable notifications by configuring a script that is run whenever the ag
 ### `codex exec` to run Codex programmatically/non-interactively
 
 To run Codex non-interactively, run `codex exec PROMPT` (you can also pass the prompt via `stdin`) and Codex will work on your task until it decides that it is done and exits. Output is printed to the terminal directly. You can set the `RUST_LOG` environment variable to see more about what's going on.
-Use `codex exec --fork <SESSION_ID> PROMPT` to fork an existing session without launching the interactive picker/UI.
 Use `codex exec --ephemeral ...` to run without persisting session rollout files to disk.
 
 ### Experimenting with the Codex Sandbox
@@ -89,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
 

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",
-)

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"] }

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.

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
-        }));
-    }
-}

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 }

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": [

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": [

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": {

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": [

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.",

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",

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"
-}

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"
-}

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"
-}

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"
-}

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": {

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": {

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",

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": [

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": [

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"
-}

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": [

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"
-}

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"
-}

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"
     }
   },

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"
-}

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"
-}

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"
-}

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"
-}

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": [

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": {

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",

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"
-}

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"
-}

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"
-}

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"
-}

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": {

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": {

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": [

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"
-}

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"
-}

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"
-}

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"
-}

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"
         }
       ]

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": {

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"
-}

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"
-}

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"
-}

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"
     }

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"
     }

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": [
         {

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": {

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"
-}

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": {

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"
-}

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"
-}

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"
-}

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"
-}

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"
-}

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"
     }

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"
     }

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": {

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",

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"
     }

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": {

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": {

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"
-}

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"
-}

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": {

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": [
         {

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": {

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": {

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"
     }

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, };

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 ExecApprovalRequestSkillMetadata = { path_to_skills_md: string, };
+export type AddConversationSubscriptionResponse = { subscriptionId: string, };

codex-rs/app-server-protocol/schema/typescript/ArchiveConversationParams.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, };

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 ImageGenerationBeginEvent = { call_id: string, };
+export type ArchiveConversationResponse = Record<string, never>;