[codex-core] Simplify pre-turn compaction flow [ci changed_files]

Co-authored-by: Codex <noreply@openai.com>
[codex-core] Stop threading inline compaction threshold [ci changed_files]
2026-03-18 12:43:50 +00:00 · 2026-03-11 03:16:05 +00:00 · 2026-03-11 03:01:33 +00:00 · 2026-03-11 02:49:05 +00:00 · 2026-03-11 02:48:35 +00:00 · 2026-03-11 02:48:35 +00:00
2167 changed files with 76364 additions and 239803 deletions
--- a/.bazelrc
+++ b/.bazelrc
@@ -56,7 +56,3 @@ common --jobs=30
 common:remote --extra_execution_platforms=//:rbe
 common:remote --remote_executor=grpcs://remote.buildbuddy.io
 common:remote --jobs=800
-# TODO(team): Evaluate if this actually helps, zbarsky is not sure, everything seems bottlenecked on `core` either way.
-# Enable pipelined compilation since we are not bound by local CPU count.
-#common:remote --@rules_rust//rust/settings:pipelined_compilation
-
--- a/.github/actions/linux-code-sign/action.yml
+++ b/.github/actions/linux-code-sign/action.yml
@@ -17,7 +17,6 @@ runs:
    - name: Cosign Linux artifacts
      shell: bash
      env:
-        ARTIFACTS_DIR: ${{ inputs.artifacts-dir }}
        COSIGN_EXPERIMENTAL: "1"
        COSIGN_YES: "true"
        COSIGN_OIDC_CLIENT_ID: "sigstore"
@@ -25,7 +24,7 @@ runs:
      run: |
        set -euo pipefail

-        dest="$ARTIFACTS_DIR"
+        dest="${{ inputs.artifacts-dir }}"
        if [[ ! -d "$dest" ]]; then
          echo "Destination $dest does not exist"
          exit 1
--- a/.github/actions/macos-code-sign/action.yml
+++ b/.github/actions/macos-code-sign/action.yml
@@ -117,8 +117,6 @@ runs:
    - name: Sign macOS binaries
      if: ${{ inputs.sign-binaries == 'true' }}
      shell: bash
-      env:
-        TARGET: ${{ inputs.target }}
      run: |
        set -euo pipefail

@@ -133,7 +131,7 @@ runs:
        fi

        for binary in codex codex-responses-api-proxy; do
-          path="codex-rs/target/${TARGET}/release/${binary}"
+          path="codex-rs/target/${{ inputs.target }}/release/${binary}"
          codesign --force --options runtime --timestamp --sign "$APPLE_CODESIGN_IDENTITY" "${keychain_args[@]}" "$path"
        done

@@ -141,7 +139,6 @@ runs:
      if: ${{ inputs.sign-binaries == 'true' }}
      shell: bash
      env:
-        TARGET: ${{ inputs.target }}
        APPLE_NOTARIZATION_KEY_P8: ${{ inputs.apple-notarization-key-p8 }}
        APPLE_NOTARIZATION_KEY_ID: ${{ inputs.apple-notarization-key-id }}
        APPLE_NOTARIZATION_ISSUER_ID: ${{ inputs.apple-notarization-issuer-id }}
@@ -166,7 +163,7 @@ runs:

        notarize_binary() {
          local binary="$1"
-          local source_path="codex-rs/target/${TARGET}/release/${binary}"
+          local source_path="codex-rs/target/${{ inputs.target }}/release/${binary}"
          local archive_path="${RUNNER_TEMP}/${binary}.zip"

          if [[ ! -f "$source_path" ]]; then
@@ -187,7 +184,6 @@ runs:
      if: ${{ inputs.sign-dmg == 'true' }}
      shell: bash
      env:
-        TARGET: ${{ inputs.target }}
        APPLE_NOTARIZATION_KEY_P8: ${{ inputs.apple-notarization-key-p8 }}
        APPLE_NOTARIZATION_KEY_ID: ${{ inputs.apple-notarization-key-id }}
        APPLE_NOTARIZATION_ISSUER_ID: ${{ inputs.apple-notarization-issuer-id }}
@@ -210,8 +206,7 @@ runs:

        source "$GITHUB_ACTION_PATH/notary_helpers.sh"

-        dmg_name="codex-${TARGET}.dmg"
-        dmg_path="codex-rs/target/${TARGET}/release/${dmg_name}"
+        dmg_path="codex-rs/target/${{ inputs.target }}/release/codex-${{ inputs.target }}.dmg"

        if [[ ! -f "$dmg_path" ]]; then
          echo "dmg $dmg_path not found"
@@ -224,7 +219,7 @@ runs:
        fi

        codesign --force --timestamp --sign "$APPLE_CODESIGN_IDENTITY" "${keychain_args[@]}" "$dmg_path"
-        notarize_submission "$dmg_name" "$dmg_path" "$notary_key_path"
+        notarize_submission "codex-${{ inputs.target }}.dmg" "$dmg_path" "$notary_key_path"
        xcrun stapler staple "$dmg_path"

    - name: Remove signing keychain
--- a/.github/blob-size-allowlist.txt
+++ b/.github/blob-size-allowlist.txt
@@ -1,9 +0,0 @@
-# Paths are matched exactly, relative to the repository root.
-# Keep this list short and limited to intentional large checked-in assets.
-
-.github/codex-cli-splash.png
-MODULE.bazel.lock
-codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
-codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
-codex-rs/tui/tests/fixtures/oss-story.jsonl
-codex-rs/tui_app_server/tests/fixtures/oss-story.jsonl
--- a/.github/workflows/blob-size-policy.yml
+++ b/.github/workflows/blob-size-policy.yml
@@ -1,32 +0,0 @@
-name: blob-size-policy
-
-on:
-  pull_request: {}
-
-jobs:
-  check:
-    name: Blob size policy
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - name: Determine PR comparison range
-        id: range
-        shell: bash
-        run: |
-          set -euo pipefail
-          echo "base=$(git rev-parse HEAD^1)" >> "$GITHUB_OUTPUT"
-          echo "head=$(git rev-parse HEAD^2)" >> "$GITHUB_OUTPUT"
-
-      - name: Check changed blob sizes
-        env:
-          BASE_SHA: ${{ steps.range.outputs.base }}
-          HEAD_SHA: ${{ steps.range.outputs.head }}
-        run: |
-          python3 scripts/check_blob_size.py \
-            --base "$BASE_SHA" \
-            --head "$HEAD_SHA" \
-            --max-bytes 512000 \
-            --allowlist .github/blob-size-allowlist.txt
--- a/.github/workflows/issue-deduplicator.yml
+++ b/.github/workflows/issue-deduplicator.yml
@@ -396,7 +396,6 @@ jobs:
        env:
          GH_TOKEN: ${{ github.token }}
          GH_REPO: ${{ github.repository }}
-          ISSUE_NUMBER: ${{ github.event.issue.number }}
        run: |
-          gh issue edit "$ISSUE_NUMBER" --remove-label codex-deduplicate || true
+          gh issue edit "${{ github.event.issue.number }}" --remove-label codex-deduplicate || true
          echo "Attempted to remove label: codex-deduplicate"
--- a/.github/workflows/rust-ci.yml
+++ b/.github/workflows/rust-ci.yml
@@ -14,8 +14,6 @@ jobs:
    name: Detect changed areas
    runs-on: ubuntu-24.04
    outputs:
-      argument_comment_lint: ${{ steps.detect.outputs.argument_comment_lint }}
-      argument_comment_lint_package: ${{ steps.detect.outputs.argument_comment_lint_package }}
      codex: ${{ steps.detect.outputs.codex }}
      workflows: ${{ steps.detect.outputs.workflows }}
    steps:
@@ -41,18 +39,12 @@ jobs:
          fi

          codex=false
-          argument_comment_lint=false
-          argument_comment_lint_package=false
          workflows=false
          for f in "${files[@]}"; do
            [[ $f == codex-rs/* ]] && codex=true
-            [[ $f == codex-rs/* || $f == tools/argument-comment-lint/* || $f == justfile ]] && argument_comment_lint=true
-            [[ $f == tools/argument-comment-lint/* || $f == .github/workflows/rust-ci.yml ]] && argument_comment_lint_package=true
            [[ $f == .github/* ]] && workflows=true
          done

-          echo "argument_comment_lint=$argument_comment_lint" >> "$GITHUB_OUTPUT"
-          echo "argument_comment_lint_package=$argument_comment_lint_package" >> "$GITHUB_OUTPUT"
          echo "codex=$codex" >> "$GITHUB_OUTPUT"
          echo "workflows=$workflows" >> "$GITHUB_OUTPUT"

@@ -91,44 +83,6 @@ jobs:
      - name: cargo shear
        run: cargo shear

-  argument_comment_lint:
-    name: Argument comment lint
-    runs-on: ubuntu-24.04
-    needs: changed
-    if: ${{ needs.changed.outputs.argument_comment_lint == 'true' || needs.changed.outputs.workflows == 'true' || github.event_name == 'push' }}
-    steps:
-      - uses: actions/checkout@v6
-      - name: Install Linux sandbox build dependencies
-        run: |
-          sudo DEBIAN_FRONTEND=noninteractive apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends pkg-config libcap-dev
-      - uses: dtolnay/rust-toolchain@1.93.0
-        with:
-          toolchain: nightly-2025-09-18
-          components: llvm-tools-preview, rustc-dev, rust-src
-      - name: Cache cargo-dylint tooling
-        id: cargo_dylint_cache
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.cargo/bin/cargo-dylint
-            ~/.cargo/bin/dylint-link
-            ~/.cargo/registry/index
-            ~/.cargo/registry/cache
-            ~/.cargo/git/db
-          key: argument-comment-lint-${{ runner.os }}-${{ hashFiles('tools/argument-comment-lint/Cargo.lock', 'tools/argument-comment-lint/rust-toolchain', '.github/workflows/rust-ci.yml') }}
-      - name: Install cargo-dylint tooling
-        if: ${{ steps.cargo_dylint_cache.outputs.cache-hit != 'true' }}
-        run: cargo install --locked cargo-dylint dylint-link
-      - name: Test argument comment lint package
-        if: ${{ needs.changed.outputs.argument_comment_lint_package == 'true' || github.event_name == 'push' }}
-        working-directory: tools/argument-comment-lint
-        run: cargo test
-      - name: Run argument comment lint on codex-rs
-        run: |
-          bash -n tools/argument-comment-lint/run.sh
-          ./tools/argument-comment-lint/run.sh
-
  # --- CI to validate on different os/targets --------------------------------
  lint_build:
    name: Lint/Build — ${{ matrix.runner }} - ${{ matrix.target }}${{ matrix.profile == 'release' && ' (release)' || '' }}
@@ -703,15 +657,13 @@ jobs:
  # --- Gatherer job that you mark as the ONLY required status -----------------
  results:
    name: CI results (required)
-    needs:
-      [changed, general, cargo_shear, argument_comment_lint, lint_build, tests]
+    needs: [changed, general, cargo_shear, lint_build, tests]
    if: always()
    runs-on: ubuntu-24.04
    steps:
      - name: Summarize
        shell: bash
        run: |
-          echo "arglint: ${{ needs.argument_comment_lint.result }}"
          echo "general: ${{ needs.general.result }}"
          echo "shear  : ${{ needs.cargo_shear.result }}"
          echo "lint   : ${{ needs.lint_build.result }}"
@@ -719,21 +671,16 @@ jobs:

          # If nothing relevant changed (PR touching only root README, etc.),
          # declare success regardless of other jobs.
-          if [[ '${{ needs.changed.outputs.argument_comment_lint }}' != 'true' && '${{ needs.changed.outputs.codex }}' != 'true' && '${{ needs.changed.outputs.workflows }}' != 'true' && '${{ github.event_name }}' != 'push' ]]; then
+          if [[ '${{ needs.changed.outputs.codex }}' != 'true' && '${{ needs.changed.outputs.workflows }}' != 'true' && '${{ github.event_name }}' != 'push' ]]; then
            echo 'No relevant changes -> CI not required.'
            exit 0
          fi

-          if [[ '${{ needs.changed.outputs.argument_comment_lint }}' == 'true' || '${{ needs.changed.outputs.workflows }}' == 'true' || '${{ github.event_name }}' == 'push' ]]; then
-            [[ '${{ needs.argument_comment_lint.result }}' == 'success' ]] || { echo 'argument_comment_lint failed'; exit 1; }
-          fi
-
-          if [[ '${{ needs.changed.outputs.codex }}' == 'true' || '${{ needs.changed.outputs.workflows }}' == 'true' || '${{ github.event_name }}' == 'push' ]]; then
-            [[ '${{ needs.general.result }}' == 'success' ]] || { echo 'general failed'; exit 1; }
-            [[ '${{ needs.cargo_shear.result }}' == 'success' ]] || { echo 'cargo_shear failed'; exit 1; }
-            [[ '${{ needs.lint_build.result }}' == 'success' ]] || { echo 'lint_build failed'; exit 1; }
-            [[ '${{ needs.tests.result }}' == 'success' ]] || { echo 'tests failed'; exit 1; }
-          fi
+          # Otherwise require the jobs to have succeeded
+          [[ '${{ needs.general.result }}' == 'success' ]] || { echo 'general failed'; exit 1; }
+          [[ '${{ needs.cargo_shear.result }}' == 'success' ]] || { echo 'cargo_shear failed'; exit 1; }
+          [[ '${{ needs.lint_build.result }}' == 'success' ]] || { echo 'lint_build failed'; exit 1; }
+          [[ '${{ needs.tests.result }}' == 'success' ]] || { echo 'tests failed'; exit 1; }

      - name: sccache summary note
        if: always()
--- a/.github/workflows/rust-release.yml
+++ b/.github/workflows/rust-release.yml
@@ -490,10 +490,9 @@ jobs:
      - name: Stage npm packages
        env:
          GH_TOKEN: ${{ github.token }}
-          RELEASE_VERSION: ${{ steps.release_name.outputs.name }}
        run: |
          ./scripts/stage_npm_packages.py \
-            --release-version "$RELEASE_VERSION" \
+            --release-version "${{ steps.release_name.outputs.name }}" \
            --package codex \
            --package codex-responses-api-proxy \
            --package codex-sdk
@@ -562,12 +561,10 @@ jobs:
      - name: Download npm tarballs from release
        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE_TAG: ${{ needs.release.outputs.tag }}
-          RELEASE_VERSION: ${{ needs.release.outputs.version }}
        run: |
          set -euo pipefail
-          version="$RELEASE_VERSION"
-          tag="$RELEASE_TAG"
+          version="${{ needs.release.outputs.version }}"
+          tag="${{ needs.release.outputs.tag }}"
          mkdir -p dist/npm
          patterns=(
            "codex-npm-${version}.tgz"
--- a/.github/workflows/shell-tool-mcp.yml
+++ b/.github/workflows/shell-tool-mcp.yml
@@ -31,14 +31,11 @@ jobs:
    steps:
      - name: Compute version and tags
        id: compute
-        env:
-          RELEASE_TAG_INPUT: ${{ inputs.release-tag }}
-          RELEASE_VERSION_INPUT: ${{ inputs.release-version }}
        run: |
          set -euo pipefail

-          version="$RELEASE_VERSION_INPUT"
-          release_tag="$RELEASE_TAG_INPUT"
+          version="${{ inputs.release-version }}"
+          release_tag="${{ inputs.release-tag }}"

          if [[ -z "$version" ]]; then
            if [[ -n "$release_tag" && "$release_tag" =~ ^rust-v.+ ]]; then
@@ -486,22 +483,20 @@ jobs:
          STAGING_DIR: ${{ runner.temp }}/shell-tool-mcp

      - name: Ensure binaries are executable
-        env:
-          STAGING_DIR: ${{ steps.staging.outputs.dir }}
        run: |
          set -euo pipefail
+          staging="${{ steps.staging.outputs.dir }}"
          chmod +x \
-            "$STAGING_DIR"/vendor/*/bash/*/bash \
-            "$STAGING_DIR"/vendor/*/zsh/*/zsh
+            "$staging"/vendor/*/bash/*/bash \
+            "$staging"/vendor/*/zsh/*/zsh

      - name: Create npm tarball
        shell: bash
-        env:
-          STAGING_DIR: ${{ steps.staging.outputs.dir }}
        run: |
          set -euo pipefail
          mkdir -p dist/npm
-          pack_info=$(cd "$STAGING_DIR" && npm pack --ignore-scripts --json --pack-destination "${GITHUB_WORKSPACE}/dist/npm")
+          staging="${{ steps.staging.outputs.dir }}"
+          pack_info=$(cd "$staging" && npm pack --ignore-scripts --json --pack-destination "${GITHUB_WORKSPACE}/dist/npm")
          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"

--- a/AGENTS.md
+++ b/AGENTS.md
@@ -11,11 +11,6 @@ In the codex-rs folder where the rust code lives:
 - Always collapse if statements per https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if
 - Always inline format! args when possible per https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args
 - Use method references over closures when possible per https://rust-lang.github.io/rust-clippy/master/index.html#redundant_closure_for_method_calls
- Avoid bool or ambiguous `Option` parameters that force callers to write hard-to-read code such as `foo(false)` or `bar(None)`. Prefer enums, named methods, newtypes, or other idiomatic Rust API shapes when they keep the callsite self-documenting.
- When you cannot make that API change and still need a small positional-literal callsite in Rust, follow the `argument_comment_lint` convention:
-  - Use an exact `/*param_name*/` comment before opaque literal arguments such as `None`, booleans, and numeric literals when passing them by position.
-  - Do not add these comments for string or char literals unless the comment adds real clarity; those literals are intentionally exempt from the lint.
-  - If you add one of these comments, the parameter name must exactly match the callee signature.
 - When possible, make `match` statements exhaustive and avoid wildcard arms.
 - When writing tests, prefer comparing the equality of entire objects over fields one by one.
 - When making a change that adds or changes an API, ensure that the documentation in the `docs/` folder is up to date if applicable.
@@ -24,10 +19,6 @@ In the codex-rs folder where the rust code lives:
  repo root to refresh `MODULE.bazel.lock`, and include that lockfile update in the same change.
 - After dependency changes, run `just bazel-lock-check` from the repo root so lockfile drift is caught
  locally before CI.
- Bazel does not automatically make source-tree files available to compile-time Rust file access. If
-  you add `include_str!`, `include_bytes!`, `sqlx::migrate!`, or similar build-time file or
-  directory reads, update the crate's `BUILD.bazel` (`compile_data`, `build_script_data`, or test
-  data) or Bazel may fail even when Cargo passes.
 - Do not create small helper methods that are referenced only once.
 - Avoid large modules:
  - Prefer adding new modules instead of growing existing ones.
@@ -54,8 +45,6 @@ See `codex-rs/tui/styles.md`.

 ## TUI code conventions

- When a change lands in `codex-rs/tui` and `codex-rs/tui_app_server` has a parallel implementation of the same behavior, reflect the change in `codex-rs/tui_app_server` too unless there is a documented reason not to.
-
 - Use concise styling helpers from ratatui’s Stylize trait.
  - Basic spans: use "text".into()
  - Styled spans: use "text".red(), "text".green(), "text".magenta(), "text".dim(), etc.
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,7 +1,14 @@
 module(name = "codex")

 bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "llvm", version = "0.6.7")
+bazel_dep(name = "llvm", version = "0.6.1")
+single_version_override(
+    module_name = "llvm",
+    patch_strip = 1,
+    patches = [
+        "//patches:toolchains_llvm_bootstrapped_resource_dir.patch",
+    ],
+)

 register_toolchains("@llvm//toolchain:all")

@@ -32,7 +39,7 @@ use_repo(osx, "macos_sdk")
 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.43")
+bazel_dep(name = "rules_rs", version = "0.0.40")

 rules_rust = use_extension("@rules_rs//rs/experimental:rules_rust.bzl", "rules_rust")
 use_repo(rules_rust, "rules_rust")
@@ -84,6 +91,7 @@ crate.annotation(
 inject_repo(crate, "zstd")

 bazel_dep(name = "bzip2", version = "1.0.8.bcr.3")
+bazel_dep(name = "libcap", version = "2.27.bcr.1")

 crate.annotation(
    crate = "bzip2-sys",
@@ -141,13 +149,13 @@ crate.annotation(
        "@macos_sdk//sysroot",
    ],
    build_script_env = {
-        "BINDGEN_EXTRA_CLANG_ARGS": "-Xclang -internal-isystem -Xclang $(location @llvm//:builtin_resource_dir)/include",
+        "BINDGEN_EXTRA_CLANG_ARGS": "-isystem $(location @llvm//:builtin_headers)",
        "COREAUDIO_SDK_PATH": "$(location @macos_sdk//sysroot)",
        "LIBCLANG_PATH": "$(location @llvm-project//clang:libclang_interface_output)",
    },
    build_script_tools = [
        "@llvm-project//clang:libclang_interface_output",
-        "@llvm//:builtin_resource_dir",
+        "@llvm//:builtin_headers",
    ],
    crate = "coreaudio-sys",
    gen_build_script = "on",
@@ -176,8 +184,6 @@ inject_repo(crate, "alsa_lib")

 use_repo(crate, "crates")

-bazel_dep(name = "libcap", version = "2.27.bcr.1")
-
 rbe_platform_repository = use_repo_rule("//:rbe.bzl", "rbe_platform_repository")

 rbe_platform_repository(
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -24,6 +24,10 @@
    "https://bcr.bazel.build/modules/apple_support/1.24.2/MODULE.bazel": "0e62471818affb9f0b26f128831d5c40b074d32e6dda5a0d3852847215a41ca4",
    "https://bcr.bazel.build/modules/apple_support/2.1.0/MODULE.bazel": "b15c125dabed01b6803c129cd384de4997759f02f8ec90dc5136bcf6dfc5086a",
    "https://bcr.bazel.build/modules/apple_support/2.1.0/source.json": "78064cfefe18dee4faaf51893661e0d403784f3efe88671d727cdcdc67ed8fb3",
+    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.14.0/MODULE.bazel": "2b31ffcc9bdc8295b2167e07a757dbbc9ac8906e7028e5170a3708cecaac119f",
+    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.19.3/MODULE.bazel": "253d739ba126f62a5767d832765b12b59e9f8d2bc88cc1572f4a73e46eb298ca",
+    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.19.3/source.json": "ffab9254c65ba945f8369297ad97ca0dec213d3adc6e07877e23a48624a8b456",
+    "https://bcr.bazel.build/modules/aspect_bazel_lib/2.8.1/MODULE.bazel": "812d2dd42f65dca362152101fbec418029cc8fd34cbad1a2fde905383d705838",
    "https://bcr.bazel.build/modules/aspect_tools_telemetry/0.3.2/MODULE.bazel": "598e7fe3b54f5fa64fdbeead1027653963a359cc23561d43680006f3b463d5a4",
    "https://bcr.bazel.build/modules/aspect_tools_telemetry/0.3.2/source.json": "c6f5c39e6f32eb395f8fdaea63031a233bbe96d49a3bfb9f75f6fce9b74bec6c",
    "https://bcr.bazel.build/modules/bazel_features/1.1.1/MODULE.bazel": "27b8c79ef57efe08efccbd9dd6ef70d61b4798320b8d3c134fd571f78963dbcd",
@@ -49,8 +53,8 @@
    "https://bcr.bazel.build/modules/bazel_features/1.9.0/MODULE.bazel": "885151d58d90d8d9c811eb75e3288c11f850e1d6b481a8c9f766adee4712358b",
    "https://bcr.bazel.build/modules/bazel_features/1.9.1/MODULE.bazel": "8f679097876a9b609ad1f60249c49d68bfab783dd9be012faf9d82547b14815a",
    "https://bcr.bazel.build/modules/bazel_lib/3.0.0/MODULE.bazel": "22b70b80ac89ad3f3772526cd9feee2fa412c2b01933fea7ed13238a448d370d",
-    "https://bcr.bazel.build/modules/bazel_lib/3.2.2/MODULE.bazel": "e2c890c8a515d6bca9c66d47718aa9e44b458fde64ec7204b8030bf2d349058c",
-    "https://bcr.bazel.build/modules/bazel_lib/3.2.2/source.json": "9e84e115c20e14652c5c21401ae85ff4daa8702e265b5c0b3bf89353f17aa212",
+    "https://bcr.bazel.build/modules/bazel_lib/3.2.0/MODULE.bazel": "39b50d94b9be6bda507862254e20c263f9b950e3160112348d10a938be9ce2c2",
+    "https://bcr.bazel.build/modules/bazel_lib/3.2.0/source.json": "a6f45a903134bebbf33a6166dd42b4c7ab45169de094b37a85f348ca41170a84",
    "https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8",
    "https://bcr.bazel.build/modules/bazel_skylib/1.1.1/MODULE.bazel": "1add3e7d93ff2e6998f9e118022c84d163917d912f5afafb3058e3d2f1545b5e",
    "https://bcr.bazel.build/modules/bazel_skylib/1.2.0/MODULE.bazel": "44fe84260e454ed94ad326352a698422dbe372b21a1ac9f3eab76eb531223686",
@@ -69,8 +73,8 @@
    "https://bcr.bazel.build/modules/buildozer/8.2.1/source.json": "7c33f6a26ee0216f85544b4bca5e9044579e0219b6898dd653f5fb449cf2e484",
    "https://bcr.bazel.build/modules/bzip2/1.0.8.bcr.3/MODULE.bazel": "29ecf4babfd3c762be00d7573c288c083672ab60e79c833ff7f49ee662e54471",
    "https://bcr.bazel.build/modules/bzip2/1.0.8.bcr.3/source.json": "8be4a3ef2599693f759e5c0990a4cc5a246ac08db4c900a38f852ba25b5c39be",
-    "https://bcr.bazel.build/modules/gawk/5.3.2.bcr.3/MODULE.bazel": "f1b7bb2dd53e8f2ef984b39485ec8a44e9076dda5c4b8efd2fb4c6a6e856a31d",
-    "https://bcr.bazel.build/modules/gawk/5.3.2.bcr.3/source.json": "ebe931bfe362e4b41e59ee00a528db6074157ff2ced92eb9e970acab2e1089c9",
+    "https://bcr.bazel.build/modules/gawk/5.3.2.bcr.1/MODULE.bazel": "cdf8cbe5ee750db04b78878c9633cc76e80dcf4416cbe982ac3a9222f80713c8",
+    "https://bcr.bazel.build/modules/gawk/5.3.2.bcr.1/source.json": "fa7b512dfcb5eafd90ce3959cf42a2a6fe96144ebbb4b3b3928054895f2afac2",
    "https://bcr.bazel.build/modules/google_benchmark/1.8.2/MODULE.bazel": "a70cf1bba851000ba93b58ae2f6d76490a9feb74192e57ab8e8ff13c34ec50cb",
    "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
    "https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/MODULE.bazel": "22c31a561553727960057361aa33bf20fb2e98584bc4fec007906e27053f80c6",
@@ -78,18 +82,22 @@
    "https://bcr.bazel.build/modules/googletest/1.15.2/MODULE.bazel": "6de1edc1d26cafb0ea1a6ab3f4d4192d91a312fd2d360b63adaa213cd00b2108",
    "https://bcr.bazel.build/modules/googletest/1.17.0/MODULE.bazel": "dbec758171594a705933a29fcf69293d2468c49ec1f2ebca65c36f504d72df46",
    "https://bcr.bazel.build/modules/googletest/1.17.0/source.json": "38e4454b25fc30f15439c0378e57909ab1fd0a443158aa35aec685da727cd713",
+    "https://bcr.bazel.build/modules/jq.bzl/0.1.0/MODULE.bazel": "2ce69b1af49952cd4121a9c3055faa679e748ce774c7f1fda9657f936cae902f",
+    "https://bcr.bazel.build/modules/jq.bzl/0.1.0/source.json": "746bf13cac0860f091df5e4911d0c593971cd8796b5ad4e809b2f8e133eee3d5",
    "https://bcr.bazel.build/modules/jsoncpp/1.9.5/MODULE.bazel": "31271aedc59e815656f5736f282bb7509a97c7ecb43e927ac1a37966e0578075",
    "https://bcr.bazel.build/modules/jsoncpp/1.9.6/MODULE.bazel": "2f8d20d3b7d54143213c4dfc3d98225c42de7d666011528dc8fe91591e2e17b0",
    "https://bcr.bazel.build/modules/jsoncpp/1.9.6/source.json": "a04756d367a2126c3541682864ecec52f92cdee80a35735a3cb249ce015ca000",
    "https://bcr.bazel.build/modules/libcap/2.27.bcr.1/MODULE.bazel": "7c034d7a4d92b2293294934377f5d1cbc88119710a11079fa8142120f6f08768",
    "https://bcr.bazel.build/modules/libcap/2.27.bcr.1/source.json": "3b116cbdbd25a68ffb587b672205f6d353a4c19a35452e480d58fc89531e0a10",
    "https://bcr.bazel.build/modules/libpfm/4.11.0/MODULE.bazel": "45061ff025b301940f1e30d2c16bea596c25b176c8b6b3087e92615adbd52902",
-    "https://bcr.bazel.build/modules/llvm/0.6.7/MODULE.bazel": "d37a2e10571864dc6a5bb53c29216d90b9400bbcadb422337f49107fd2eaf0d2",
-    "https://bcr.bazel.build/modules/llvm/0.6.7/source.json": "c40bcce08d2adbd658aae609976ce4ae4fdc44f3299fffa29c7fa9bf7e7d6d2b",
+    "https://bcr.bazel.build/modules/llvm/0.6.0/MODULE.bazel": "42c2182c49f13d2df83a4a4a95ab55d31efda47b2d67acf419bf6b31522b2a30",
+    "https://bcr.bazel.build/modules/llvm/0.6.1/MODULE.bazel": "29170ab19f4e2dc9b6bbf9b3d101738e84142f63ba29a13cc33e0d40f74c79b0",
+    "https://bcr.bazel.build/modules/llvm/0.6.1/source.json": "2d8cdd3a5f8e1d16132dbbe97250133101e4863c0376d23273d9afd7363cc331",
    "https://bcr.bazel.build/modules/nlohmann_json/3.6.1/MODULE.bazel": "6f7b417dcc794d9add9e556673ad25cb3ba835224290f4f848f8e2db1e1fca74",
    "https://bcr.bazel.build/modules/nlohmann_json/3.6.1/source.json": "f448c6e8963fdfa7eb831457df83ad63d3d6355018f6574fb017e8169deb43a9",
    "https://bcr.bazel.build/modules/openssl/3.5.4.bcr.0/MODULE.bazel": "0f6b8f20b192b9ff0781406256150bcd46f19e66d807dcb0c540548439d6fc35",
    "https://bcr.bazel.build/modules/openssl/3.5.4.bcr.0/source.json": "543ed7627cc18e6460b9c1ae4a1b6b1debc5a5e0aca878b00f7531c7186b73da",
+    "https://bcr.bazel.build/modules/package_metadata/0.0.2/MODULE.bazel": "fb8d25550742674d63d7b250063d4580ca530499f045d70748b1b142081ebb92",
    "https://bcr.bazel.build/modules/package_metadata/0.0.5/MODULE.bazel": "ef4f9439e3270fdd6b9fd4dbc3d2f29d13888e44c529a1b243f7a31dfbc2e8e4",
    "https://bcr.bazel.build/modules/package_metadata/0.0.5/source.json": "2326db2f6592578177751c3e1f74786b79382cd6008834c9d01ec865b9126a85",
    "https://bcr.bazel.build/modules/platforms/0.0.10/MODULE.bazel": "8cb8efaf200bdeb2150d93e162c40f388529a25852b332cec879373771e48ed5",
@@ -147,6 +155,7 @@
    "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/MODULE.bazel": "40c97d1144356f52905566c55811f13b299453a14ac7769dfba2ac38192337a8",
    "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74",
    "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86",
+    "https://bcr.bazel.build/modules/rules_java/6.3.0/MODULE.bazel": "a97c7678c19f236a956ad260d59c86e10a463badb7eb2eda787490f4c969b963",
    "https://bcr.bazel.build/modules/rules_java/6.5.2/MODULE.bazel": "1d440d262d0e08453fa0c4d8f699ba81609ed0e9a9a0f02cd10b3e7942e61e31",
    "https://bcr.bazel.build/modules/rules_java/7.10.0/MODULE.bazel": "530c3beb3067e870561739f1144329a21c851ff771cd752a49e06e3dc9c2e71a",
    "https://bcr.bazel.build/modules/rules_java/7.12.2/MODULE.bazel": "579c505165ee757a4280ef83cda0150eea193eed3bef50b1004ba88b99da6de6",
@@ -195,8 +204,8 @@
    "https://bcr.bazel.build/modules/rules_python/1.6.0/MODULE.bazel": "7e04ad8f8d5bea40451cf80b1bd8262552aa73f841415d20db96b7241bd027d8",
    "https://bcr.bazel.build/modules/rules_python/1.7.0/MODULE.bazel": "d01f995ecd137abf30238ad9ce97f8fc3ac57289c8b24bd0bf53324d937a14f8",
    "https://bcr.bazel.build/modules/rules_python/1.7.0/source.json": "028a084b65dcf8f4dc4f82f8778dbe65df133f234b316828a82e060d81bdce32",
-    "https://bcr.bazel.build/modules/rules_rs/0.0.43/MODULE.bazel": "7adfc2a97d90218ebeb9882de9eb18d9c6b0b41d2884be6ab92c9daadb17c78d",
-    "https://bcr.bazel.build/modules/rules_rs/0.0.43/source.json": "c315361abf625411f506ab935e660f49f14dc64fa30c125ca0a177c34cd63a2a",
+    "https://bcr.bazel.build/modules/rules_rs/0.0.40/MODULE.bazel": "63238bcb69010753dbd37b5ed08cb79d3af2d88a40b0fda0b110f60f307e86d4",
+    "https://bcr.bazel.build/modules/rules_rs/0.0.40/source.json": "ae3b17d2f9e4fbcd3de543318e71f83d8522c8527f385bf2b2a7665ec504827e",
    "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c",
    "https://bcr.bazel.build/modules/rules_shell/0.3.0/MODULE.bazel": "de4402cd12f4cc8fda2354fce179fdb068c0b9ca1ec2d2b17b3e21b24c1a937b",
    "https://bcr.bazel.build/modules/rules_shell/0.4.1/MODULE.bazel": "00e501db01bbf4e3e1dd1595959092c2fadf2087b2852d3f553b5370f5633592",
@@ -211,17 +220,21 @@
    "https://bcr.bazel.build/modules/sed/4.9.bcr.3/source.json": "31c0cf4c135ed3fa58298cd7bcfd4301c54ea4cf59d7c4e2ea0a180ce68eb34f",
    "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
    "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c",
+    "https://bcr.bazel.build/modules/stardoc/0.6.2/MODULE.bazel": "7060193196395f5dd668eda046ccbeacebfd98efc77fed418dbe2b82ffaa39fd",
    "https://bcr.bazel.build/modules/stardoc/0.7.0/MODULE.bazel": "05e3d6d30c099b6770e97da986c53bd31844d7f13d41412480ea265ac9e8079c",
    "https://bcr.bazel.build/modules/stardoc/0.7.2/MODULE.bazel": "fc152419aa2ea0f51c29583fab1e8c99ddefd5b3778421845606ee628629e0e5",
    "https://bcr.bazel.build/modules/stardoc/0.7.2/source.json": "58b029e5e901d6802967754adf0a9056747e8176f017cfe3607c0851f4d42216",
    "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/MODULE.bazel": "5e463fbfba7b1701d957555ed45097d7f984211330106ccd1352c6e0af0dcf91",
    "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.2/MODULE.bazel": "75aab2373a4bbe2a1260b9bf2a1ebbdbf872d3bd36f80bff058dccd82e89422f",
    "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.2/source.json": "5fba48bbe0ba48761f9e9f75f92876cafb5d07c0ce059cc7a8027416de94a05b",
-    "https://bcr.bazel.build/modules/tar.bzl/0.9.0/MODULE.bazel": "452a22d7f02b1c9d7a22ab25edf20f46f3e1101f0f67dc4bfbf9a474ddf02445",
-    "https://bcr.bazel.build/modules/tar.bzl/0.9.0/source.json": "c732760a374831a2cf5b08839e4be75017196b4d796a5aa55235272ee17cd839",
+    "https://bcr.bazel.build/modules/tar.bzl/0.2.1/MODULE.bazel": "52d1c00a80a8cc67acbd01649e83d8dd6a9dc426a6c0b754a04fe8c219c76468",
+    "https://bcr.bazel.build/modules/tar.bzl/0.6.0/MODULE.bazel": "a3584b4edcfafcabd9b0ef9819808f05b372957bbdff41601429d5fd0aac2e7c",
+    "https://bcr.bazel.build/modules/tar.bzl/0.6.0/source.json": "4a620381df075a16cb3a7ed57bd1d05f7480222394c64a20fa51bdb636fda658",
    "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43",
    "https://bcr.bazel.build/modules/with_cfg.bzl/0.12.0/MODULE.bazel": "b573395fe63aef4299ba095173e2f62ccfee5ad9bbf7acaa95dba73af9fc2b38",
    "https://bcr.bazel.build/modules/with_cfg.bzl/0.12.0/source.json": "3f3fbaeafecaf629877ad152a2c9def21f8d330d91aa94c5dc75bbb98c10b8b8",
+    "https://bcr.bazel.build/modules/yq.bzl/0.1.1/MODULE.bazel": "9039681f9bcb8958ee2c87ffc74bdafba9f4369096a2b5634b88abc0eaefa072",
+    "https://bcr.bazel.build/modules/yq.bzl/0.1.1/source.json": "2d2bad780a9f2b9195a4a370314d2c17ae95eaa745cefc2e12fbc49759b15aa3",
    "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0",
    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.5/MODULE.bazel": "eec517b5bbe5492629466e11dae908d043364302283de25581e3eb944326c4ca",
    "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.8/MODULE.bazel": "772c674bb78a0342b8caf32ab5c25085c493ca4ff08398208dcbe4375fe9f776",
@@ -235,7 +248,7 @@
    "@@aspect_tools_telemetry+//:extension.bzl%telemetry": {
      "general": {
        "bzlTransitiveDigest": "dnnhvKMf9MIXMulhbhHBblZdDAfAkiSVjApIXpUz9Y8=",
-        "usagesDigest": "aAcu2vTLy2HUXbcYIow0P6OHLLog/f5FFk8maEC/fpQ=",
+        "usagesDigest": "2ScE07TNSr/xo2GnYHCRI4JX4hiql6iZaNKUIUshUv4=",
        "recordedInputs": [
          "REPO_MAPPING:aspect_tools_telemetry+,bazel_lib bazel_lib+",
          "REPO_MAPPING:aspect_tools_telemetry+,bazel_skylib bazel_skylib+"
@@ -248,17 +261,18 @@
                "abseil-cpp": "20250814.1",
                "alsa_lib": "1.2.9.bcr.4",
                "apple_support": "2.1.0",
+                "aspect_bazel_lib": "2.19.3",
                "aspect_tools_telemetry": "0.3.2",
-                "bazel_features": "1.42.0",
-                "bazel_lib": "3.2.2",
+                "bazel_features": "1.34.0",
+                "bazel_lib": "3.2.0",
                "bazel_skylib": "1.8.2",
                "buildozer": "8.2.1",
                "bzip2": "1.0.8.bcr.3",
-                "gawk": "5.3.2.bcr.3",
+                "gawk": "5.3.2.bcr.1",
                "googletest": "1.17.0",
+                "jq.bzl": "0.1.0",
                "jsoncpp": "1.9.6",
                "libcap": "2.27.bcr.1",
-                "llvm": "0.6.7",
                "nlohmann_json": "3.6.1",
                "openssl": "3.5.4.bcr.0",
                "package_metadata": "0.0.5",
@@ -278,15 +292,15 @@
                "rules_platform": "0.1.0",
                "rules_proto": "7.1.0",
                "rules_python": "1.7.0",
-                "rules_rs": "0.0.40",
                "rules_shell": "0.6.1",
                "rules_swift": "3.1.2",
                "sed": "4.9.bcr.3",
                "stardoc": "0.7.2",
                "swift_argument_parser": "1.3.1.2",
-                "tar.bzl": "0.9.0",
-                "toolchains_llvm_bootstrapped": "0.5.2",
+                "tar.bzl": "0.6.0",
+                "toolchains_llvm_bootstrapped": "0.5.6",
                "with_cfg.bzl": "0.12.0",
+                "yq.bzl": "0.1.1",
                "zlib": "1.3.1.bcr.8",
                "zstd": "1.5.7"
              }
--- a/codex-rs/Cargo.lock
+++ b/codex-rs/Cargo.lock
@@ -1442,8 +1442,6 @@ dependencies = [
 "codex-utils-pty",
 "core_test_support",
 "futures",
- "opentelemetry",
- "opentelemetry_sdk",
 "owo-colors",
 "pretty_assertions",
 "reqwest",
@@ -1459,10 +1457,8 @@ dependencies = [
 "tokio-util",
 "toml 0.9.11+spec-1.1.0",
 "tracing",
- "tracing-opentelemetry",
 "tracing-subscriber",
 "uuid",
- "walkdir",
 "wiremock",
 ]

@@ -1476,15 +1472,12 @@ dependencies = [
 "codex-core",
 "codex-feedback",
 "codex-protocol",
- "futures",
 "pretty_assertions",
 "serde",
 "serde_json",
 "tokio",
- "tokio-tungstenite",
 "toml 0.9.11+spec-1.1.0",
 "tracing",
- "url",
 ]

 [[package]]
@@ -1600,7 +1593,6 @@ version = "0.0.0"
 dependencies = [
 "anyhow",
 "codex-backend-openapi-models",
- "codex-client",
 "codex-core",
 "codex-protocol",
 "pretty_assertions",
@@ -1624,7 +1616,6 @@ version = "0.0.0"
 dependencies = [
 "anyhow",
 "clap",
- "codex-connectors",
 "codex-core",
 "codex-git",
 "codex-utils-cargo-bin",
@@ -1634,6 +1625,7 @@ dependencies = [
 "serde_json",
 "tempfile",
 "tokio",
+ "urlencoding",
 ]

 [[package]]
@@ -1663,7 +1655,6 @@ dependencies = [
 "codex-state",
 "codex-stdio-to-uds",
 "codex-tui",
- "codex-tui-app-server",
 "codex-utils-cargo-bin",
 "codex-utils-cli",
 "codex-windows-sandbox",
@@ -1689,22 +1680,15 @@ version = "0.0.0"
 dependencies = [
 "async-trait",
 "bytes",
- "codex-utils-cargo-bin",
- "codex-utils-rustls-provider",
 "eventsource-stream",
 "futures",
 "http 1.4.0",
 "opentelemetry",
 "opentelemetry_sdk",
- "pretty_assertions",
 "rand 0.9.2",
 "reqwest",
- "rustls",
- "rustls-native-certs",
- "rustls-pki-types",
 "serde",
 "serde_json",
- "tempfile",
 "thiserror 2.0.18",
 "tokio",
 "tracing",
@@ -1745,7 +1729,6 @@ dependencies = [
 "base64 0.22.1",
 "chrono",
 "clap",
- "codex-client",
 "codex-cloud-tasks-client",
 "codex-core",
 "codex-login",
@@ -1804,18 +1787,6 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "codex-connectors"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "codex-app-server-protocol",
- "pretty_assertions",
- "serde",
- "tokio",
- "urlencoding",
-]
-
 [[package]]
 name = "codex-core"
 version = "0.0.0"
@@ -1840,7 +1811,6 @@ dependencies = [
 "codex-async-utils",
 "codex-client",
 "codex-config",
- "codex-connectors",
 "codex-execpolicy",
 "codex-file-search",
 "codex-git",
@@ -2147,7 +2117,6 @@ dependencies = [
 "base64 0.22.1",
 "chrono",
 "codex-app-server-protocol",
- "codex-client",
 "codex-core",
 "core_test_support",
 "pretty_assertions",
@@ -2350,7 +2319,6 @@ version = "0.0.0"
 dependencies = [
 "anyhow",
 "axum",
- "codex-client",
 "codex-keyring-store",
 "codex-protocol",
 "codex-utils-cargo-bin",
@@ -2474,6 +2442,7 @@ name = "codex-stdio-to-uds"
 version = "0.0.0"
 dependencies = [
 "anyhow",
+ "assert_cmd",
 "codex-utils-cargo-bin",
 "pretty_assertions",
 "tempfile",
@@ -2505,98 +2474,6 @@ dependencies = [
 "codex-backend-client",
 "codex-chatgpt",
 "codex-cli",
- "codex-client",
- "codex-cloud-requirements",
- "codex-core",
- "codex-feedback",
- "codex-file-search",
- "codex-login",
- "codex-otel",
- "codex-protocol",
- "codex-shell-command",
- "codex-state",
- "codex-tui-app-server",
- "codex-utils-absolute-path",
- "codex-utils-approval-presets",
- "codex-utils-cargo-bin",
- "codex-utils-cli",
- "codex-utils-elapsed",
- "codex-utils-fuzzy-match",
- "codex-utils-oss",
- "codex-utils-pty",
- "codex-utils-sandbox-summary",
- "codex-utils-sleep-inhibitor",
- "codex-utils-string",
- "codex-windows-sandbox",
- "color-eyre",
- "cpal",
- "crossterm",
- "derive_more 2.1.1",
- "diffy",
- "dirs",
- "dunce",
- "hound",
- "image",
- "insta",
- "itertools 0.14.0",
- "lazy_static",
- "libc",
- "pathdiff",
- "pretty_assertions",
- "pulldown-cmark",
- "rand 0.9.2",
- "ratatui",
- "ratatui-macros",
- "regex-lite",
- "reqwest",
- "rmcp",
- "serde",
- "serde_json",
- "serial_test",
- "shlex",
- "strum 0.27.2",
- "strum_macros 0.28.0",
- "supports-color 3.0.2",
- "syntect",
- "tempfile",
- "textwrap 0.16.2",
- "thiserror 2.0.18",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "toml 0.9.11+spec-1.1.0",
- "tracing",
- "tracing-appender",
- "tracing-subscriber",
- "two-face",
- "unicode-segmentation",
- "unicode-width 0.2.1",
- "url",
- "uuid",
- "vt100",
- "webbrowser",
- "which",
- "windows-sys 0.52.0",
- "winsplit",
-]
-
-[[package]]
-name = "codex-tui-app-server"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "arboard",
- "assert_matches",
- "base64 0.22.1",
- "chrono",
- "clap",
- "codex-ansi-escape",
- "codex-app-server-client",
- "codex-app-server-protocol",
- "codex-arg0",
- "codex-chatgpt",
- "codex-cli",
- "codex-client",
 "codex-cloud-requirements",
 "codex-core",
 "codex-feedback",
@@ -2845,7 +2722,6 @@ dependencies = [
 "chrono",
 "codex-protocol",
 "codex-utils-absolute-path",
- "codex-utils-pty",
 "codex-utils-string",
 "dirs-next",
 "dunce",
@@ -2854,7 +2730,6 @@ dependencies = [
 "serde",
 "serde_json",
 "tempfile",
- "tokio",
 "windows 0.58.0",
 "windows-sys 0.52.0",
 "winres",
--- a/codex-rs/Cargo.toml
+++ b/codex-rs/Cargo.toml
@@ -16,7 +16,6 @@ members = [
    "cloud-tasks",
    "cloud-tasks-client",
    "cli",
-    "connectors",
    "config",
    "shell-command",
    "shell-escalation",
@@ -42,7 +41,6 @@ members = [
    "stdio-to-uds",
    "otel",
    "tui",
-    "tui_app_server",
    "utils/absolute-path",
    "utils/cargo-bin",
    "utils/git",
@@ -100,7 +98,6 @@ codex-chatgpt = { path = "chatgpt" }
 codex-cli = { path = "cli" }
 codex-client = { path = "codex-client" }
 codex-cloud-requirements = { path = "cloud-requirements" }
-codex-connectors = { path = "connectors" }
 codex-config = { path = "config" }
 codex-core = { path = "core" }
 codex-exec = { path = "exec" }
@@ -130,7 +127,6 @@ codex-state = { path = "state" }
 codex-stdio-to-uds = { path = "stdio-to-uds" }
 codex-test-macros = { path = "test-macros" }
 codex-tui = { path = "tui" }
-codex-tui-app-server = { path = "tui_app_server" }
 codex-utils-absolute-path = { path = "utils/absolute-path" }
 codex-utils-approval-presets = { path = "utils/approval-presets" }
 codex-utils-cache = { path = "utils/cache" }
@@ -242,8 +238,6 @@ rustls = { version = "0.23", default-features = false, features = [
    "ring",
    "std",
 ] }
-rustls-native-certs = "0.8.3"
-rustls-pki-types = "1.14.0"
 schemars = "0.8.22"
 seccompiler = "0.5.0"
 semver = "1.0"
--- a/codex-rs/app-server-client/Cargo.toml
+++ b/codex-rs/app-server-client/Cargo.toml
@@ -18,14 +18,11 @@ codex-arg0 = { workspace = true }
 codex-core = { workspace = true }
 codex-feedback = { workspace = true }
 codex-protocol = { workspace = true }
-futures = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true, features = ["sync", "time", "rt"] }
-tokio-tungstenite = { workspace = true }
 toml = { workspace = true }
 tracing = { workspace = true }
-url = { workspace = true }

 [dev-dependencies]
 pretty_assertions = { workspace = true }
--- a/codex-rs/app-server-client/src/lib.rs
+++ b/codex-rs/app-server-client/src/lib.rs
@@ -15,8 +15,6 @@
 //! bridging async `mpsc` channels on both sides. Queues are bounded so overload
 //! surfaces as channel-full errors rather than unbounded memory growth.

-mod remote;
-
 use std::error::Error;
 use std::fmt;
 use std::io::Error as IoError;
@@ -35,18 +33,12 @@ 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::JSONRPCNotification;
 use codex_app_server_protocol::RequestId;
 use codex_app_server_protocol::Result as JsonRpcResult;
-use codex_app_server_protocol::ServerNotification;
-use codex_app_server_protocol::ServerRequest;
 use codex_arg0::Arg0DispatchPaths;
-use codex_core::AuthManager;
-use codex_core::ThreadManager;
 use codex_core::config::Config;
 use codex_core::config_loader::CloudRequirementsLoader;
 use codex_core::config_loader::LoaderOverrides;
-use codex_core::models_manager::collaboration_mode_presets::CollaborationModesConfig;
 use codex_feedback::CodexFeedback;
 use codex_protocol::protocol::SessionSource;
 use serde::de::DeserializeOwned;
@@ -56,9 +48,6 @@ use tokio::time::timeout;
 use toml::Value as TomlValue;
 use tracing::warn;

-pub use crate::remote::RemoteAppServerClient;
-pub use crate::remote::RemoteAppServerConnectArgs;
-
 const SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);

 /// Raw app-server request result for typed in-process requests.
@@ -68,30 +57,6 @@ const SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);
 /// `MessageProcessor` continues to produce that shape internally.
 pub type RequestResult = std::result::Result<JsonRpcResult, JSONRPCErrorError>;

-#[derive(Debug, Clone)]
-pub enum AppServerEvent {
-    Lagged { skipped: usize },
-    ServerNotification(ServerNotification),
-    LegacyNotification(JSONRPCNotification),
-    ServerRequest(ServerRequest),
-    Disconnected { message: String },
-}
-
-impl From<InProcessServerEvent> for AppServerEvent {
-    fn from(value: InProcessServerEvent) -> Self {
-        match value {
-            InProcessServerEvent::Lagged { skipped } => Self::Lagged { skipped },
-            InProcessServerEvent::ServerNotification(notification) => {
-                Self::ServerNotification(notification)
-            }
-            InProcessServerEvent::LegacyNotification(notification) => {
-                Self::LegacyNotification(notification)
-            }
-            InProcessServerEvent::ServerRequest(request) => Self::ServerRequest(request),
-        }
-    }
-}
-
 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
@@ -158,16 +123,6 @@ impl Error for TypedRequestError {
    }
 }

-#[derive(Clone)]
-struct SharedCoreManagers {
-    // Temporary bootstrap escape hatch for embedders that still need direct
-    // core handles during the in-process app-server migration. Once TUI/exec
-    // stop depending on direct manager access, remove this wrapper and keep
-    // manager ownership entirely inside the app-server runtime.
-    auth_manager: Arc<AuthManager>,
-    thread_manager: Arc<ThreadManager>,
-}
-
 #[derive(Clone)]
 pub struct InProcessClientStartArgs {
    /// Resolved argv0 dispatch paths used by command execution internals.
@@ -201,30 +156,6 @@ pub struct InProcessClientStartArgs {
 }

 impl InProcessClientStartArgs {
-    fn shared_core_managers(&self) -> SharedCoreManagers {
-        let auth_manager = AuthManager::shared(
-            self.config.codex_home.clone(),
-            self.enable_codex_api_key_env,
-            self.config.cli_auth_credentials_store_mode,
-        );
-        let thread_manager = Arc::new(ThreadManager::new(
-            self.config.as_ref(),
-            auth_manager.clone(),
-            self.session_source.clone(),
-            CollaborationModesConfig {
-                default_mode_request_user_input: self
-                    .config
-                    .features
-                    .enabled(codex_core::features::Feature::DefaultModeRequestUserInput),
-            },
-        ));
-
-        SharedCoreManagers {
-            auth_manager,
-            thread_manager,
-        }
-    }
-
    /// Builds initialize params from caller-provided metadata.
    pub fn initialize_params(&self) -> InitializeParams {
        let capabilities = InitializeCapabilities {
@@ -246,7 +177,7 @@ impl InProcessClientStartArgs {
        }
    }

-    fn into_runtime_start_args(self, shared_core: &SharedCoreManagers) -> InProcessStartArgs {
+    fn into_runtime_start_args(self) -> InProcessStartArgs {
        let initialize = self.initialize_params();
        InProcessStartArgs {
            arg0_paths: self.arg0_paths,
@@ -254,8 +185,6 @@ impl InProcessClientStartArgs {
            cli_overrides: self.cli_overrides,
            loader_overrides: self.loader_overrides,
            cloud_requirements: self.cloud_requirements,
-            auth_manager: Some(shared_core.auth_manager.clone()),
-            thread_manager: Some(shared_core.thread_manager.clone()),
            feedback: self.feedback,
            config_warnings: self.config_warnings,
            session_source: self.session_source,
@@ -309,24 +238,6 @@ pub struct InProcessAppServerClient {
    command_tx: mpsc::Sender<ClientCommand>,
    event_rx: mpsc::Receiver<InProcessServerEvent>,
    worker_handle: tokio::task::JoinHandle<()>,
-    auth_manager: Arc<AuthManager>,
-    thread_manager: Arc<ThreadManager>,
-}
-
-#[derive(Clone)]
-pub struct InProcessAppServerRequestHandle {
-    command_tx: mpsc::Sender<ClientCommand>,
-}
-
-#[derive(Clone)]
-pub enum AppServerRequestHandle {
-    InProcess(InProcessAppServerRequestHandle),
-    Remote(crate::remote::RemoteAppServerRequestHandle),
-}
-
-pub enum AppServerClient {
-    InProcess(InProcessAppServerClient),
-    Remote(RemoteAppServerClient),
 }

 impl InProcessAppServerClient {
@@ -337,9 +248,8 @@ impl InProcessAppServerClient {
    /// 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 shared_core = args.shared_core_managers();
        let mut handle =
-            codex_app_server::in_process::start(args.into_runtime_start_args(&shared_core)).await?;
+            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);
@@ -490,27 +400,9 @@ impl InProcessAppServerClient {
            command_tx,
            event_rx,
            worker_handle,
-            auth_manager: shared_core.auth_manager,
-            thread_manager: shared_core.thread_manager,
        })
    }

-    /// Temporary bootstrap escape hatch for embedders migrating toward RPC-only usage.
-    pub fn auth_manager(&self) -> Arc<AuthManager> {
-        self.auth_manager.clone()
-    }
-
-    /// Temporary bootstrap escape hatch for embedders migrating toward RPC-only usage.
-    pub fn thread_manager(&self) -> Arc<ThreadManager> {
-        self.thread_manager.clone()
-    }
-
-    pub fn request_handle(&self) -> InProcessAppServerRequestHandle {
-        InProcessAppServerRequestHandle {
-            command_tx: self.command_tx.clone(),
-        }
-    }
-
    /// Sends a typed client request and returns raw JSON-RPC result.
    ///
    /// Callers that expect a concrete response type should usually prefer
@@ -663,8 +555,6 @@ impl InProcessAppServerClient {
            command_tx,
            event_rx,
            worker_handle,
-            auth_manager: _,
-            thread_manager: _,
        } = self;
        let mut worker_handle = worker_handle;
        // Drop the caller-facing receiver before asking the worker to shut
@@ -695,141 +585,9 @@ impl InProcessAppServerClient {
    }
 }

-impl InProcessAppServerRequestHandle {
-    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",
-            )
-        })?
-    }
-
-    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 })
-    }
-}
-
-impl AppServerRequestHandle {
-    pub async fn request(&self, request: ClientRequest) -> IoResult<RequestResult> {
-        match self {
-            Self::InProcess(handle) => handle.request(request).await,
-            Self::Remote(handle) => handle.request(request).await,
-        }
-    }
-
-    pub async fn request_typed<T>(&self, request: ClientRequest) -> Result<T, TypedRequestError>
-    where
-        T: DeserializeOwned,
-    {
-        match self {
-            Self::InProcess(handle) => handle.request_typed(request).await,
-            Self::Remote(handle) => handle.request_typed(request).await,
-        }
-    }
-}
-
-impl AppServerClient {
-    pub async fn request(&self, request: ClientRequest) -> IoResult<RequestResult> {
-        match self {
-            Self::InProcess(client) => client.request(request).await,
-            Self::Remote(client) => client.request(request).await,
-        }
-    }
-
-    pub async fn request_typed<T>(&self, request: ClientRequest) -> Result<T, TypedRequestError>
-    where
-        T: DeserializeOwned,
-    {
-        match self {
-            Self::InProcess(client) => client.request_typed(request).await,
-            Self::Remote(client) => client.request_typed(request).await,
-        }
-    }
-
-    pub async fn notify(&self, notification: ClientNotification) -> IoResult<()> {
-        match self {
-            Self::InProcess(client) => client.notify(notification).await,
-            Self::Remote(client) => client.notify(notification).await,
-        }
-    }
-
-    pub async fn resolve_server_request(
-        &self,
-        request_id: RequestId,
-        result: JsonRpcResult,
-    ) -> IoResult<()> {
-        match self {
-            Self::InProcess(client) => client.resolve_server_request(request_id, result).await,
-            Self::Remote(client) => client.resolve_server_request(request_id, result).await,
-        }
-    }
-
-    pub async fn reject_server_request(
-        &self,
-        request_id: RequestId,
-        error: JSONRPCErrorError,
-    ) -> IoResult<()> {
-        match self {
-            Self::InProcess(client) => client.reject_server_request(request_id, error).await,
-            Self::Remote(client) => client.reject_server_request(request_id, error).await,
-        }
-    }
-
-    pub async fn next_event(&mut self) -> Option<AppServerEvent> {
-        match self {
-            Self::InProcess(client) => client.next_event().await.map(Into::into),
-            Self::Remote(client) => client.next_event().await,
-        }
-    }
-
-    pub async fn shutdown(self) -> IoResult<()> {
-        match self {
-            Self::InProcess(client) => client.shutdown().await,
-            Self::Remote(client) => client.shutdown().await,
-        }
-    }
-
-    pub fn request_handle(&self) -> AppServerRequestHandle {
-        match self {
-            Self::InProcess(client) => AppServerRequestHandle::InProcess(client.request_handle()),
-            Self::Remote(client) => AppServerRequestHandle::Remote(client.request_handle()),
-        }
-    }
-}
-
 /// Extracts the JSON-RPC method name for diagnostics without extending the
 /// protocol crate with in-process-only helpers.
-pub(crate) fn request_method_name(request: &ClientRequest) -> String {
+fn request_method_name(request: &ClientRequest) -> String {
    serde_json::to_value(request)
        .ok()
        .and_then(|value| {
@@ -844,29 +602,14 @@ pub(crate) fn request_method_name(request: &ClientRequest) -> String {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use codex_app_server_protocol::AccountUpdatedNotification;
    use codex_app_server_protocol::ConfigRequirementsReadResponse;
-    use codex_app_server_protocol::GetAccountResponse;
-    use codex_app_server_protocol::JSONRPCMessage;
-    use codex_app_server_protocol::JSONRPCRequest;
-    use codex_app_server_protocol::JSONRPCResponse;
-    use codex_app_server_protocol::ServerNotification;
    use codex_app_server_protocol::SessionSource as ApiSessionSource;
    use codex_app_server_protocol::ThreadStartParams;
    use codex_app_server_protocol::ThreadStartResponse;
-    use codex_app_server_protocol::ToolRequestUserInputParams;
-    use codex_app_server_protocol::ToolRequestUserInputQuestion;
-    use codex_core::AuthManager;
-    use codex_core::ThreadManager;
    use codex_core::config::ConfigBuilder;
-    use futures::SinkExt;
-    use futures::StreamExt;
    use pretty_assertions::assert_eq;
-    use tokio::net::TcpListener;
    use tokio::time::Duration;
    use tokio::time::timeout;
-    use tokio_tungstenite::accept_async;
-    use tokio_tungstenite::tungstenite::Message;

    async fn build_test_config() -> Config {
        match ConfigBuilder::default().build().await {
@@ -904,97 +647,6 @@ mod tests {
        start_test_client_with_capacity(session_source, DEFAULT_IN_PROCESS_CHANNEL_CAPACITY).await
    }

-    async fn start_test_remote_server<F, Fut>(handler: F) -> String
-    where
-        F: FnOnce(tokio_tungstenite::WebSocketStream<tokio::net::TcpStream>) -> Fut
-            + Send
-            + 'static,
-        Fut: std::future::Future<Output = ()> + Send + 'static,
-    {
-        let listener = TcpListener::bind("127.0.0.1:0")
-            .await
-            .expect("listener should bind");
-        let addr = listener.local_addr().expect("listener address");
-        tokio::spawn(async move {
-            let (stream, _) = listener.accept().await.expect("accept should succeed");
-            let websocket = accept_async(stream)
-                .await
-                .expect("websocket upgrade should succeed");
-            handler(websocket).await;
-        });
-        format!("ws://{addr}")
-    }
-
-    async fn expect_remote_initialize(
-        websocket: &mut tokio_tungstenite::WebSocketStream<tokio::net::TcpStream>,
-    ) {
-        let JSONRPCMessage::Request(request) = read_websocket_message(websocket).await else {
-            panic!("expected initialize request");
-        };
-        assert_eq!(request.method, "initialize");
-        write_websocket_message(
-            websocket,
-            JSONRPCMessage::Response(JSONRPCResponse {
-                id: request.id,
-                result: serde_json::json!({}),
-            }),
-        )
-        .await;
-
-        let JSONRPCMessage::Notification(notification) = read_websocket_message(websocket).await
-        else {
-            panic!("expected initialized notification");
-        };
-        assert_eq!(notification.method, "initialized");
-    }
-
-    async fn read_websocket_message(
-        websocket: &mut tokio_tungstenite::WebSocketStream<tokio::net::TcpStream>,
-    ) -> JSONRPCMessage {
-        loop {
-            let frame = websocket
-                .next()
-                .await
-                .expect("frame should be available")
-                .expect("frame should decode");
-            match frame {
-                Message::Text(text) => {
-                    return serde_json::from_str::<JSONRPCMessage>(&text)
-                        .expect("text frame should be valid JSON-RPC");
-                }
-                Message::Binary(_) | Message::Ping(_) | Message::Pong(_) | Message::Frame(_) => {
-                    continue;
-                }
-                Message::Close(_) => panic!("unexpected close frame"),
-            }
-        }
-    }
-
-    async fn write_websocket_message(
-        websocket: &mut tokio_tungstenite::WebSocketStream<tokio::net::TcpStream>,
-        message: JSONRPCMessage,
-    ) {
-        websocket
-            .send(Message::Text(
-                serde_json::to_string(&message)
-                    .expect("message should serialize")
-                    .into(),
-            ))
-            .await
-            .expect("message should send");
-    }
-
-    fn test_remote_connect_args(websocket_url: String) -> RemoteAppServerConnectArgs {
-        RemoteAppServerConnectArgs {
-            websocket_url,
-            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: 8,
-        }
-    }
-
    #[tokio::test]
    async fn typed_request_roundtrip_works() {
        let client = start_test_client(SessionSource::Exec).await;
@@ -1050,35 +702,6 @@ mod tests {
        }
    }

-    #[tokio::test]
-    async fn shared_thread_manager_tracks_threads_started_via_app_server() {
-        let client = start_test_client(SessionSource::Cli).await;
-
-        let response: ThreadStartResponse = client
-            .request_typed(ClientRequest::ThreadStart {
-                request_id: RequestId::Integer(3),
-                params: ThreadStartParams {
-                    ephemeral: Some(true),
-                    ..ThreadStartParams::default()
-                },
-            })
-            .await
-            .expect("thread/start should succeed");
-        let created_thread_id = codex_protocol::ThreadId::from_string(&response.thread.id)
-            .expect("thread id should parse");
-        timeout(
-            Duration::from_secs(2),
-            client.thread_manager().get_thread(created_thread_id),
-        )
-        .await
-        .expect("timed out waiting for retained thread manager to observe started thread")
-        .expect("started thread should be visible through the shared thread manager");
-        let thread_ids = client.thread_manager().list_thread_ids().await;
-        assert!(thread_ids.contains(&created_thread_id));
-
-        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;
@@ -1092,354 +715,6 @@ mod tests {
        client.shutdown().await.expect("shutdown should complete");
    }

-    #[tokio::test]
-    async fn remote_typed_request_roundtrip_works() {
-        let websocket_url = start_test_remote_server(|mut websocket| async move {
-            expect_remote_initialize(&mut websocket).await;
-            let JSONRPCMessage::Request(request) = read_websocket_message(&mut websocket).await
-            else {
-                panic!("expected account/read request");
-            };
-            assert_eq!(request.method, "account/read");
-            write_websocket_message(
-                &mut websocket,
-                JSONRPCMessage::Response(JSONRPCResponse {
-                    id: request.id,
-                    result: serde_json::to_value(GetAccountResponse {
-                        account: None,
-                        requires_openai_auth: false,
-                    })
-                    .expect("response should serialize"),
-                }),
-            )
-            .await;
-        })
-        .await;
-        let client = RemoteAppServerClient::connect(test_remote_connect_args(websocket_url))
-            .await
-            .expect("remote client should connect");
-
-        let response: GetAccountResponse = client
-            .request_typed(ClientRequest::GetAccount {
-                request_id: RequestId::Integer(1),
-                params: codex_app_server_protocol::GetAccountParams {
-                    refresh_token: false,
-                },
-            })
-            .await
-            .expect("typed request should succeed");
-        assert_eq!(response.account, None);
-
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[tokio::test]
-    async fn remote_duplicate_request_id_keeps_original_waiter() {
-        let (first_request_seen_tx, first_request_seen_rx) = tokio::sync::oneshot::channel();
-        let websocket_url = start_test_remote_server(|mut websocket| async move {
-            expect_remote_initialize(&mut websocket).await;
-            let JSONRPCMessage::Request(request) = read_websocket_message(&mut websocket).await
-            else {
-                panic!("expected account/read request");
-            };
-            assert_eq!(request.method, "account/read");
-            first_request_seen_tx
-                .send(request.id.clone())
-                .expect("request id should send");
-            assert!(
-                timeout(
-                    Duration::from_millis(100),
-                    read_websocket_message(&mut websocket)
-                )
-                .await
-                .is_err(),
-                "duplicate request should not be forwarded to the server"
-            );
-            write_websocket_message(
-                &mut websocket,
-                JSONRPCMessage::Response(JSONRPCResponse {
-                    id: request.id,
-                    result: serde_json::to_value(GetAccountResponse {
-                        account: None,
-                        requires_openai_auth: false,
-                    })
-                    .expect("response should serialize"),
-                }),
-            )
-            .await;
-            let _ = websocket.next().await;
-        })
-        .await;
-        let client = RemoteAppServerClient::connect(test_remote_connect_args(websocket_url))
-            .await
-            .expect("remote client should connect");
-        let first_request_handle = client.request_handle();
-        let second_request_handle = first_request_handle.clone();
-
-        let first_request = tokio::spawn(async move {
-            first_request_handle
-                .request_typed::<GetAccountResponse>(ClientRequest::GetAccount {
-                    request_id: RequestId::Integer(1),
-                    params: codex_app_server_protocol::GetAccountParams {
-                        refresh_token: false,
-                    },
-                })
-                .await
-        });
-
-        let first_request_id = first_request_seen_rx
-            .await
-            .expect("server should observe the first request");
-        assert_eq!(first_request_id, RequestId::Integer(1));
-
-        let second_err = second_request_handle
-            .request_typed::<GetAccountResponse>(ClientRequest::GetAccount {
-                request_id: RequestId::Integer(1),
-                params: codex_app_server_protocol::GetAccountParams {
-                    refresh_token: false,
-                },
-            })
-            .await
-            .expect_err("duplicate request id should be rejected");
-        assert_eq!(
-            second_err.to_string(),
-            "account/read transport error: duplicate remote app-server request id `1`"
-        );
-
-        let first_response = first_request
-            .await
-            .expect("first request task should join")
-            .expect("first request should succeed");
-        assert_eq!(
-            first_response,
-            GetAccountResponse {
-                account: None,
-                requires_openai_auth: false,
-            }
-        );
-
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[tokio::test]
-    async fn remote_notifications_arrive_over_websocket() {
-        let websocket_url = start_test_remote_server(|mut websocket| async move {
-            expect_remote_initialize(&mut websocket).await;
-            write_websocket_message(
-                &mut websocket,
-                JSONRPCMessage::Notification(
-                    serde_json::from_value(
-                        serde_json::to_value(ServerNotification::AccountUpdated(
-                            AccountUpdatedNotification {
-                                auth_mode: None,
-                                plan_type: None,
-                            },
-                        ))
-                        .expect("notification should serialize"),
-                    )
-                    .expect("notification should convert to JSON-RPC"),
-                ),
-            )
-            .await;
-        })
-        .await;
-        let mut client = RemoteAppServerClient::connect(test_remote_connect_args(websocket_url))
-            .await
-            .expect("remote client should connect");
-
-        let event = client.next_event().await.expect("event should arrive");
-        assert!(matches!(
-            event,
-            AppServerEvent::ServerNotification(ServerNotification::AccountUpdated(_))
-        ));
-
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[tokio::test]
-    async fn remote_server_request_resolution_roundtrip_works() {
-        let websocket_url = start_test_remote_server(|mut websocket| async move {
-            expect_remote_initialize(&mut websocket).await;
-            let request_id = RequestId::String("srv-1".to_string());
-            let server_request = JSONRPCRequest {
-                id: request_id.clone(),
-                method: "item/tool/requestUserInput".to_string(),
-                params: Some(
-                    serde_json::to_value(ToolRequestUserInputParams {
-                        thread_id: "thread-1".to_string(),
-                        turn_id: "turn-1".to_string(),
-                        item_id: "call-1".to_string(),
-                        questions: vec![ToolRequestUserInputQuestion {
-                            id: "question-1".to_string(),
-                            header: "Mode".to_string(),
-                            question: "Pick one".to_string(),
-                            is_other: false,
-                            is_secret: false,
-                            options: Some(vec![]),
-                        }],
-                    })
-                    .expect("params should serialize"),
-                ),
-                trace: None,
-            };
-            write_websocket_message(&mut websocket, JSONRPCMessage::Request(server_request)).await;
-
-            let JSONRPCMessage::Response(response) = read_websocket_message(&mut websocket).await
-            else {
-                panic!("expected server request response");
-            };
-            assert_eq!(response.id, request_id);
-        })
-        .await;
-        let mut client = RemoteAppServerClient::connect(test_remote_connect_args(websocket_url))
-            .await
-            .expect("remote client should connect");
-
-        let AppServerEvent::ServerRequest(request) = client
-            .next_event()
-            .await
-            .expect("request event should arrive")
-        else {
-            panic!("expected server request event");
-        };
-        client
-            .resolve_server_request(request.id().clone(), serde_json::json!({}))
-            .await
-            .expect("server request should resolve");
-
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[tokio::test]
-    async fn remote_server_request_received_during_initialize_is_delivered() {
-        let websocket_url = start_test_remote_server(|mut websocket| async move {
-            let JSONRPCMessage::Request(request) = read_websocket_message(&mut websocket).await
-            else {
-                panic!("expected initialize request");
-            };
-            assert_eq!(request.method, "initialize");
-
-            let request_id = RequestId::String("srv-init".to_string());
-            write_websocket_message(
-                &mut websocket,
-                JSONRPCMessage::Request(JSONRPCRequest {
-                    id: request_id.clone(),
-                    method: "item/tool/requestUserInput".to_string(),
-                    params: Some(
-                        serde_json::to_value(ToolRequestUserInputParams {
-                            thread_id: "thread-1".to_string(),
-                            turn_id: "turn-1".to_string(),
-                            item_id: "call-1".to_string(),
-                            questions: vec![ToolRequestUserInputQuestion {
-                                id: "question-1".to_string(),
-                                header: "Mode".to_string(),
-                                question: "Pick one".to_string(),
-                                is_other: false,
-                                is_secret: false,
-                                options: Some(vec![]),
-                            }],
-                        })
-                        .expect("params should serialize"),
-                    ),
-                    trace: None,
-                }),
-            )
-            .await;
-            write_websocket_message(
-                &mut websocket,
-                JSONRPCMessage::Response(JSONRPCResponse {
-                    id: request.id,
-                    result: serde_json::json!({}),
-                }),
-            )
-            .await;
-
-            let JSONRPCMessage::Notification(notification) =
-                read_websocket_message(&mut websocket).await
-            else {
-                panic!("expected initialized notification");
-            };
-            assert_eq!(notification.method, "initialized");
-
-            let JSONRPCMessage::Response(response) = read_websocket_message(&mut websocket).await
-            else {
-                panic!("expected server request response");
-            };
-            assert_eq!(response.id, request_id);
-        })
-        .await;
-        let mut client = RemoteAppServerClient::connect(test_remote_connect_args(websocket_url))
-            .await
-            .expect("remote client should connect");
-
-        let AppServerEvent::ServerRequest(request) = client
-            .next_event()
-            .await
-            .expect("request event should arrive")
-        else {
-            panic!("expected server request event");
-        };
-        client
-            .resolve_server_request(request.id().clone(), serde_json::json!({}))
-            .await
-            .expect("server request should resolve");
-
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[tokio::test]
-    async fn remote_unknown_server_request_is_rejected() {
-        let websocket_url = start_test_remote_server(|mut websocket| async move {
-            expect_remote_initialize(&mut websocket).await;
-            let request_id = RequestId::String("srv-unknown".to_string());
-            write_websocket_message(
-                &mut websocket,
-                JSONRPCMessage::Request(JSONRPCRequest {
-                    id: request_id.clone(),
-                    method: "thread/unknown".to_string(),
-                    params: None,
-                    trace: None,
-                }),
-            )
-            .await;
-
-            let JSONRPCMessage::Error(response) = read_websocket_message(&mut websocket).await
-            else {
-                panic!("expected JSON-RPC error response");
-            };
-            assert_eq!(response.id, request_id);
-            assert_eq!(response.error.code, -32601);
-            assert_eq!(
-                response.error.message,
-                "unsupported remote app-server request `thread/unknown`"
-            );
-        })
-        .await;
-        let client = RemoteAppServerClient::connect(test_remote_connect_args(websocket_url))
-            .await
-            .expect("remote client should connect");
-
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[tokio::test]
-    async fn remote_disconnect_surfaces_as_event() {
-        let websocket_url = start_test_remote_server(|mut websocket| async move {
-            expect_remote_initialize(&mut websocket).await;
-            websocket.close(None).await.expect("close should succeed");
-        })
-        .await;
-        let mut client = RemoteAppServerClient::connect(test_remote_connect_args(websocket_url))
-            .await
-            .expect("remote client should connect");
-
-        let event = client
-            .next_event()
-            .await
-            .expect("disconnect event should arrive");
-        assert!(matches!(event, AppServerEvent::Disconnected { .. }));
-    }
-
    #[test]
    fn typed_request_error_exposes_sources() {
        let transport = TypedRequestError::Transport {
@@ -1471,22 +746,6 @@ mod tests {
        let (command_tx, _command_rx) = mpsc::channel(1);
        let (event_tx, event_rx) = mpsc::channel(1);
        let worker_handle = tokio::spawn(async {});
-        let config = build_test_config().await;
-        let auth_manager = AuthManager::shared(
-            config.codex_home.clone(),
-            false,
-            config.cli_auth_credentials_store_mode,
-        );
-        let thread_manager = Arc::new(ThreadManager::new(
-            &config,
-            auth_manager.clone(),
-            SessionSource::Exec,
-            CollaborationModesConfig {
-                default_mode_request_user_input: config
-                    .features
-                    .enabled(codex_core::features::Feature::DefaultModeRequestUserInput),
-            },
-        ));
        event_tx
            .send(InProcessServerEvent::Lagged { skipped: 3 })
            .await
@@ -1497,8 +756,6 @@ mod tests {
            command_tx,
            event_rx,
            worker_handle,
-            auth_manager,
-            thread_manager,
        };

        let event = timeout(Duration::from_secs(2), client.next_event())
@@ -1541,30 +798,4 @@ mod tests {
            skipped: 1
        }));
    }
-
-    #[tokio::test]
-    async fn accessors_expose_retained_shared_managers() {
-        let client = start_test_client(SessionSource::Cli).await;
-
-        assert!(
-            Arc::ptr_eq(&client.auth_manager(), &client.auth_manager()),
-            "auth_manager accessor should clone the retained shared manager"
-        );
-        assert!(
-            Arc::ptr_eq(&client.thread_manager(), &client.thread_manager()),
-            "thread_manager accessor should clone the retained shared manager"
-        );
-
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[tokio::test]
-    async fn shutdown_completes_promptly_with_retained_shared_managers() {
-        let client = start_test_client(SessionSource::Cli).await;
-
-        timeout(Duration::from_secs(1), client.shutdown())
-            .await
-            .expect("shutdown should not wait for the 5s fallback timeout")
-            .expect("shutdown should complete");
-    }
 }
--- a/codex-rs/app-server-client/src/remote.rs
+++ b/codex-rs/app-server-client/src/remote.rs
@@ -1,911 +0,0 @@
-/*
-This module implements the websocket-backed app-server client transport.
-
-It owns the remote connection lifecycle, including the initialize/initialized
-handshake, JSON-RPC request/response routing, server-request resolution, and
-notification streaming. The rest of the crate uses the same `AppServerEvent`
-surface for both in-process and remote transports, so callers such as
-`tui_app_server` can switch between them without changing their higher-level
-session logic.
-*/
-
-use std::collections::HashMap;
-use std::collections::VecDeque;
-use std::io::Error as IoError;
-use std::io::ErrorKind;
-use std::io::Result as IoResult;
-use std::time::Duration;
-
-use crate::AppServerEvent;
-use crate::RequestResult;
-use crate::SHUTDOWN_TIMEOUT;
-use crate::TypedRequestError;
-use crate::request_method_name;
-use codex_app_server_protocol::ClientInfo;
-use codex_app_server_protocol::ClientNotification;
-use codex_app_server_protocol::ClientRequest;
-use codex_app_server_protocol::InitializeCapabilities;
-use codex_app_server_protocol::InitializeParams;
-use codex_app_server_protocol::JSONRPCError;
-use codex_app_server_protocol::JSONRPCErrorError;
-use codex_app_server_protocol::JSONRPCMessage;
-use codex_app_server_protocol::JSONRPCNotification;
-use codex_app_server_protocol::JSONRPCRequest;
-use codex_app_server_protocol::JSONRPCResponse;
-use codex_app_server_protocol::RequestId;
-use codex_app_server_protocol::Result as JsonRpcResult;
-use codex_app_server_protocol::ServerNotification;
-use codex_app_server_protocol::ServerRequest;
-use futures::SinkExt;
-use futures::StreamExt;
-use serde::de::DeserializeOwned;
-use tokio::net::TcpStream;
-use tokio::sync::mpsc;
-use tokio::sync::oneshot;
-use tokio::time::timeout;
-use tokio_tungstenite::MaybeTlsStream;
-use tokio_tungstenite::WebSocketStream;
-use tokio_tungstenite::connect_async;
-use tokio_tungstenite::tungstenite::Message;
-use tracing::warn;
-use url::Url;
-
-const CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
-const INITIALIZE_TIMEOUT: Duration = Duration::from_secs(10);
-
-#[derive(Debug, Clone)]
-pub struct RemoteAppServerConnectArgs {
-    pub websocket_url: String,
-    pub client_name: String,
-    pub client_version: String,
-    pub experimental_api: bool,
-    pub opt_out_notification_methods: Vec<String>,
-    pub channel_capacity: usize,
-}
-
-impl RemoteAppServerConnectArgs {
-    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),
-        }
-    }
-}
-
-enum RemoteClientCommand {
-    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<()>>,
-    },
-}
-
-pub struct RemoteAppServerClient {
-    command_tx: mpsc::Sender<RemoteClientCommand>,
-    event_rx: mpsc::Receiver<AppServerEvent>,
-    pending_events: VecDeque<AppServerEvent>,
-    worker_handle: tokio::task::JoinHandle<()>,
-}
-
-#[derive(Clone)]
-pub struct RemoteAppServerRequestHandle {
-    command_tx: mpsc::Sender<RemoteClientCommand>,
-}
-
-impl RemoteAppServerClient {
-    pub async fn connect(args: RemoteAppServerConnectArgs) -> IoResult<Self> {
-        let channel_capacity = args.channel_capacity.max(1);
-        let websocket_url = args.websocket_url.clone();
-        let url = Url::parse(&websocket_url).map_err(|err| {
-            IoError::new(
-                ErrorKind::InvalidInput,
-                format!("invalid websocket URL `{websocket_url}`: {err}"),
-            )
-        })?;
-        let stream = timeout(CONNECT_TIMEOUT, connect_async(url.as_str()))
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::TimedOut,
-                    format!("timed out connecting to remote app server at `{websocket_url}`"),
-                )
-            })?
-            .map(|(stream, _response)| stream)
-            .map_err(|err| {
-                IoError::other(format!(
-                    "failed to connect to remote app server at `{websocket_url}`: {err}"
-                ))
-            })?;
-        let mut stream = stream;
-        let pending_events = initialize_remote_connection(
-            &mut stream,
-            &websocket_url,
-            args.initialize_params(),
-            INITIALIZE_TIMEOUT,
-        )
-        .await?;
-
-        let (command_tx, mut command_rx) = mpsc::channel::<RemoteClientCommand>(channel_capacity);
-        let (event_tx, event_rx) = mpsc::channel::<AppServerEvent>(channel_capacity);
-        let worker_handle = tokio::spawn(async move {
-            let mut pending_requests =
-                HashMap::<RequestId, oneshot::Sender<IoResult<RequestResult>>>::new();
-            let mut skipped_events = 0usize;
-            loop {
-                tokio::select! {
-                    command = command_rx.recv() => {
-                        let Some(command) = command else {
-                            let _ = stream.close(None).await;
-                            break;
-                        };
-                        match command {
-                            RemoteClientCommand::Request { request, response_tx } => {
-                                let request_id = request_id_from_client_request(&request);
-                                if pending_requests.contains_key(&request_id) {
-                                    let _ = response_tx.send(Err(IoError::new(
-                                        ErrorKind::InvalidInput,
-                                        format!("duplicate remote app-server request id `{request_id}`"),
-                                    )));
-                                    continue;
-                                }
-                                pending_requests.insert(request_id.clone(), response_tx);
-                                if let Err(err) = write_jsonrpc_message(
-                                    &mut stream,
-                                    JSONRPCMessage::Request(jsonrpc_request_from_client_request(*request)),
-                                    &websocket_url,
-                                )
-                                .await
-                                {
-                                    let err_message = err.to_string();
-                                    if let Some(response_tx) = pending_requests.remove(&request_id) {
-                                        let _ = response_tx.send(Err(err));
-                                    }
-                                    let _ = deliver_event(
-                                        &event_tx,
-                                        &mut skipped_events,
-                                        AppServerEvent::Disconnected {
-                                            message: format!(
-                                                "remote app server at `{websocket_url}` write failed: {err_message}"
-                                            ),
-                                        },
-                                        &mut stream,
-                                    )
-                                    .await;
-                                    break;
-                                }
-                            }
-                            RemoteClientCommand::Notify { notification, response_tx } => {
-                                let result = write_jsonrpc_message(
-                                    &mut stream,
-                                    JSONRPCMessage::Notification(
-                                        jsonrpc_notification_from_client_notification(notification),
-                                    ),
-                                    &websocket_url,
-                                )
-                                .await;
-                                let _ = response_tx.send(result);
-                            }
-                            RemoteClientCommand::ResolveServerRequest {
-                                request_id,
-                                result,
-                                response_tx,
-                            } => {
-                                let result = write_jsonrpc_message(
-                                    &mut stream,
-                                    JSONRPCMessage::Response(JSONRPCResponse {
-                                        id: request_id,
-                                        result,
-                                    }),
-                                    &websocket_url,
-                                )
-                                .await;
-                                let _ = response_tx.send(result);
-                            }
-                            RemoteClientCommand::RejectServerRequest {
-                                request_id,
-                                error,
-                                response_tx,
-                            } => {
-                                let result = write_jsonrpc_message(
-                                    &mut stream,
-                                    JSONRPCMessage::Error(JSONRPCError {
-                                        error,
-                                        id: request_id,
-                                    }),
-                                    &websocket_url,
-                                )
-                                .await;
-                                let _ = response_tx.send(result);
-                            }
-                            RemoteClientCommand::Shutdown { response_tx } => {
-                                let close_result = stream.close(None).await.map_err(|err| {
-                                    IoError::other(format!(
-                                        "failed to close websocket app server `{websocket_url}`: {err}"
-                                    ))
-                                });
-                                let _ = response_tx.send(close_result);
-                                break;
-                            }
-                        }
-                    }
-                    message = stream.next() => {
-                        match message {
-                            Some(Ok(Message::Text(text))) => {
-                                match serde_json::from_str::<JSONRPCMessage>(&text) {
-                                    Ok(JSONRPCMessage::Response(response)) => {
-                                        if let Some(response_tx) = pending_requests.remove(&response.id) {
-                                            let _ = response_tx.send(Ok(Ok(response.result)));
-                                        }
-                                    }
-                                    Ok(JSONRPCMessage::Error(error)) => {
-                                        if let Some(response_tx) = pending_requests.remove(&error.id) {
-                                            let _ = response_tx.send(Ok(Err(error.error)));
-                                        }
-                                    }
-                                    Ok(JSONRPCMessage::Notification(notification)) => {
-                                        let event = app_server_event_from_notification(notification);
-                                        if let Err(err) = deliver_event(
-                                            &event_tx,
-                                            &mut skipped_events,
-                                            event,
-                                            &mut stream,
-                                        )
-                                        .await
-                                        {
-                                            warn!(%err, "failed to deliver remote app-server event");
-                                            break;
-                                        }
-                                    }
-                                    Ok(JSONRPCMessage::Request(request)) => {
-                                        let request_id = request.id.clone();
-                                        let method = request.method.clone();
-                                        match ServerRequest::try_from(request) {
-                                            Ok(request) => {
-                                                if let Err(err) = deliver_event(
-                                                    &event_tx,
-                                                    &mut skipped_events,
-                                                    AppServerEvent::ServerRequest(request),
-                                                    &mut stream,
-                                                )
-                                                .await
-                                                {
-                                                    warn!(%err, "failed to deliver remote app-server server request");
-                                                    break;
-                                                }
-                                            }
-                                            Err(err) => {
-                                                warn!(%err, method, "rejecting unknown remote app-server request");
-                                                if let Err(reject_err) = write_jsonrpc_message(
-                                                    &mut stream,
-                                                    JSONRPCMessage::Error(JSONRPCError {
-                                                        error: JSONRPCErrorError {
-                                                            code: -32601,
-                                                            message: format!(
-                                                                "unsupported remote app-server request `{method}`"
-                                                            ),
-                                                            data: None,
-                                                        },
-                                                        id: request_id,
-                                                    }),
-                                                    &websocket_url,
-                                                )
-                                                .await
-                                                {
-                                                    let err_message = reject_err.to_string();
-                                                    let _ = deliver_event(
-                                                        &event_tx,
-                                                        &mut skipped_events,
-                                                        AppServerEvent::Disconnected {
-                                                            message: format!(
-                                                                "remote app server at `{websocket_url}` write failed: {err_message}"
-                                                            ),
-                                                        },
-                                                        &mut stream,
-                                                    )
-                                                    .await;
-                                                    break;
-                                                }
-                                            }
-                                        }
-                                    }
-                                    Err(err) => {
-                                        let _ = deliver_event(
-                                            &event_tx,
-                                            &mut skipped_events,
-                                            AppServerEvent::Disconnected {
-                                                message: format!(
-                                                    "remote app server at `{websocket_url}` sent invalid JSON-RPC: {err}"
-                                                ),
-                                            },
-                                            &mut stream,
-                                        )
-                                        .await;
-                                        break;
-                                    }
-                                }
-                            }
-                            Some(Ok(Message::Close(frame))) => {
-                                let reason = frame
-                                    .as_ref()
-                                    .map(|frame| frame.reason.to_string())
-                                    .filter(|reason| !reason.is_empty())
-                                    .unwrap_or_else(|| "connection closed".to_string());
-                                let _ = deliver_event(
-                                    &event_tx,
-                                    &mut skipped_events,
-                                    AppServerEvent::Disconnected {
-                                        message: format!(
-                                            "remote app server at `{websocket_url}` disconnected: {reason}"
-                                        ),
-                                    },
-                                    &mut stream,
-                                )
-                                .await;
-                                break;
-                            }
-                            Some(Ok(Message::Binary(_)))
-                            | Some(Ok(Message::Ping(_)))
-                            | Some(Ok(Message::Pong(_)))
-                            | Some(Ok(Message::Frame(_))) => {}
-                            Some(Err(err)) => {
-                                let _ = deliver_event(
-                                    &event_tx,
-                                    &mut skipped_events,
-                                    AppServerEvent::Disconnected {
-                                        message: format!(
-                                            "remote app server at `{websocket_url}` transport failed: {err}"
-                                        ),
-                                    },
-                                    &mut stream,
-                                )
-                                .await;
-                                break;
-                            }
-                            None => {
-                                let _ = deliver_event(
-                                    &event_tx,
-                                    &mut skipped_events,
-                                    AppServerEvent::Disconnected {
-                                        message: format!(
-                                            "remote app server at `{websocket_url}` closed the connection"
-                                        ),
-                                    },
-                                    &mut stream,
-                                )
-                                .await;
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            let err = IoError::new(
-                ErrorKind::BrokenPipe,
-                "remote app-server worker channel is closed",
-            );
-            for (_, response_tx) in pending_requests {
-                let _ = response_tx.send(Err(IoError::new(err.kind(), err.to_string())));
-            }
-        });
-
-        Ok(Self {
-            command_tx,
-            event_rx,
-            pending_events: pending_events.into(),
-            worker_handle,
-        })
-    }
-
-    pub fn request_handle(&self) -> RemoteAppServerRequestHandle {
-        RemoteAppServerRequestHandle {
-            command_tx: self.command_tx.clone(),
-        }
-    }
-
-    pub async fn request(&self, request: ClientRequest) -> IoResult<RequestResult> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(RemoteClientCommand::Request {
-                request: Box::new(request),
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "remote app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "remote app-server request channel is closed",
-            )
-        })?
-    }
-
-    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 })
-    }
-
-    pub async fn notify(&self, notification: ClientNotification) -> IoResult<()> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(RemoteClientCommand::Notify {
-                notification,
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "remote app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "remote app-server notify channel is closed",
-            )
-        })?
-    }
-
-    pub async fn resolve_server_request(
-        &self,
-        request_id: RequestId,
-        result: JsonRpcResult,
-    ) -> IoResult<()> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(RemoteClientCommand::ResolveServerRequest {
-                request_id,
-                result,
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "remote app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "remote app-server resolve channel is closed",
-            )
-        })?
-    }
-
-    pub async fn reject_server_request(
-        &self,
-        request_id: RequestId,
-        error: JSONRPCErrorError,
-    ) -> IoResult<()> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(RemoteClientCommand::RejectServerRequest {
-                request_id,
-                error,
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "remote app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "remote app-server reject channel is closed",
-            )
-        })?
-    }
-
-    pub async fn next_event(&mut self) -> Option<AppServerEvent> {
-        if let Some(event) = self.pending_events.pop_front() {
-            return Some(event);
-        }
-        self.event_rx.recv().await
-    }
-
-    pub async fn shutdown(self) -> IoResult<()> {
-        let Self {
-            command_tx,
-            event_rx,
-            pending_events: _pending_events,
-            worker_handle,
-        } = self;
-        let mut worker_handle = worker_handle;
-        drop(event_rx);
-        let (response_tx, response_rx) = oneshot::channel();
-        if command_tx
-            .send(RemoteClientCommand::Shutdown { response_tx })
-            .await
-            .is_ok()
-            && let Ok(command_result) = timeout(SHUTDOWN_TIMEOUT, response_rx).await
-        {
-            command_result.map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "remote 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(())
-    }
-}
-
-impl RemoteAppServerRequestHandle {
-    pub async fn request(&self, request: ClientRequest) -> IoResult<RequestResult> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(RemoteClientCommand::Request {
-                request: Box::new(request),
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "remote app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "remote app-server request channel is closed",
-            )
-        })?
-    }
-
-    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 })
-    }
-}
-
-async fn initialize_remote_connection(
-    stream: &mut WebSocketStream<MaybeTlsStream<TcpStream>>,
-    websocket_url: &str,
-    params: InitializeParams,
-    initialize_timeout: Duration,
-) -> IoResult<Vec<AppServerEvent>> {
-    let initialize_request_id = RequestId::String("initialize".to_string());
-    let mut pending_events = Vec::new();
-    write_jsonrpc_message(
-        stream,
-        JSONRPCMessage::Request(jsonrpc_request_from_client_request(
-            ClientRequest::Initialize {
-                request_id: initialize_request_id.clone(),
-                params,
-            },
-        )),
-        websocket_url,
-    )
-    .await?;
-
-    timeout(initialize_timeout, async {
-        loop {
-            match stream.next().await {
-                Some(Ok(Message::Text(text))) => {
-                    let message = serde_json::from_str::<JSONRPCMessage>(&text).map_err(|err| {
-                        IoError::other(format!(
-                            "remote app server at `{websocket_url}` sent invalid initialize response: {err}"
-                        ))
-                    })?;
-                    match message {
-                        JSONRPCMessage::Response(response) if response.id == initialize_request_id => {
-                            break Ok(());
-                        }
-                        JSONRPCMessage::Error(error) if error.id == initialize_request_id => {
-                            break Err(IoError::other(format!(
-                                "remote app server at `{websocket_url}` rejected initialize: {}",
-                                error.error.message
-                            )));
-                        }
-                        JSONRPCMessage::Notification(notification) => {
-                            pending_events.push(app_server_event_from_notification(notification));
-                        }
-                        JSONRPCMessage::Request(request) => {
-                            let request_id = request.id.clone();
-                            let method = request.method.clone();
-                            match ServerRequest::try_from(request) {
-                                Ok(request) => {
-                                    pending_events.push(AppServerEvent::ServerRequest(request));
-                                }
-                                Err(err) => {
-                                    warn!(%err, method, "rejecting unknown remote app-server request during initialize");
-                                    write_jsonrpc_message(
-                                        stream,
-                                        JSONRPCMessage::Error(JSONRPCError {
-                                            error: JSONRPCErrorError {
-                                                code: -32601,
-                                                message: format!(
-                                                    "unsupported remote app-server request `{method}`"
-                                                ),
-                                                data: None,
-                                            },
-                                            id: request_id,
-                                        }),
-                                        websocket_url,
-                                    )
-                                    .await?;
-                                }
-                            }
-                        }
-                        JSONRPCMessage::Response(_) | JSONRPCMessage::Error(_) => {}
-                    }
-                }
-                Some(Ok(Message::Binary(_)))
-                | Some(Ok(Message::Ping(_)))
-                | Some(Ok(Message::Pong(_)))
-                | Some(Ok(Message::Frame(_))) => {}
-                Some(Ok(Message::Close(frame))) => {
-                    let reason = frame
-                        .as_ref()
-                        .map(|frame| frame.reason.to_string())
-                        .filter(|reason| !reason.is_empty())
-                        .unwrap_or_else(|| "connection closed during initialize".to_string());
-                    break Err(IoError::new(
-                        ErrorKind::ConnectionAborted,
-                        format!(
-                            "remote app server at `{websocket_url}` closed during initialize: {reason}"
-                        ),
-                    ));
-                }
-                Some(Err(err)) => {
-                    break Err(IoError::other(format!(
-                        "remote app server at `{websocket_url}` transport failed during initialize: {err}"
-                    )));
-                }
-                None => {
-                    break Err(IoError::new(
-                        ErrorKind::UnexpectedEof,
-                        format!("remote app server at `{websocket_url}` closed during initialize"),
-                    ));
-                }
-            }
-        }
-    })
-    .await
-    .map_err(|_| {
-        IoError::new(
-            ErrorKind::TimedOut,
-            format!("timed out waiting for initialize response from `{websocket_url}`"),
-        )
-    })??;
-
-    write_jsonrpc_message(
-        stream,
-        JSONRPCMessage::Notification(jsonrpc_notification_from_client_notification(
-            ClientNotification::Initialized,
-        )),
-        websocket_url,
-    )
-    .await?;
-
-    Ok(pending_events)
-}
-
-fn app_server_event_from_notification(notification: JSONRPCNotification) -> AppServerEvent {
-    match ServerNotification::try_from(notification.clone()) {
-        Ok(notification) => AppServerEvent::ServerNotification(notification),
-        Err(_) => AppServerEvent::LegacyNotification(notification),
-    }
-}
-
-async fn deliver_event(
-    event_tx: &mpsc::Sender<AppServerEvent>,
-    skipped_events: &mut usize,
-    event: AppServerEvent,
-    stream: &mut WebSocketStream<MaybeTlsStream<TcpStream>>,
-) -> IoResult<()> {
-    if *skipped_events > 0 {
-        if event_requires_delivery(&event) {
-            if event_tx
-                .send(AppServerEvent::Lagged {
-                    skipped: *skipped_events,
-                })
-                .await
-                .is_err()
-            {
-                return Err(IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "remote app-server event consumer channel is closed",
-                ));
-            }
-            *skipped_events = 0;
-        } else {
-            match event_tx.try_send(AppServerEvent::Lagged {
-                skipped: *skipped_events,
-            }) {
-                Ok(()) => *skipped_events = 0,
-                Err(mpsc::error::TrySendError::Full(_)) => {
-                    *skipped_events = (*skipped_events).saturating_add(1);
-                    reject_if_server_request_dropped(stream, &event).await?;
-                    return Ok(());
-                }
-                Err(mpsc::error::TrySendError::Closed(_)) => {
-                    return Err(IoError::new(
-                        ErrorKind::BrokenPipe,
-                        "remote app-server event consumer channel is closed",
-                    ));
-                }
-            }
-        }
-    }
-
-    if event_requires_delivery(&event) {
-        event_tx.send(event).await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "remote app-server event consumer channel is closed",
-            )
-        })?;
-        return Ok(());
-    }
-
-    match event_tx.try_send(event) {
-        Ok(()) => Ok(()),
-        Err(mpsc::error::TrySendError::Full(event)) => {
-            *skipped_events = (*skipped_events).saturating_add(1);
-            reject_if_server_request_dropped(stream, &event).await
-        }
-        Err(mpsc::error::TrySendError::Closed(_)) => Err(IoError::new(
-            ErrorKind::BrokenPipe,
-            "remote app-server event consumer channel is closed",
-        )),
-    }
-}
-
-async fn reject_if_server_request_dropped(
-    stream: &mut WebSocketStream<MaybeTlsStream<TcpStream>>,
-    event: &AppServerEvent,
-) -> IoResult<()> {
-    let AppServerEvent::ServerRequest(request) = event else {
-        return Ok(());
-    };
-    write_jsonrpc_message(
-        stream,
-        JSONRPCMessage::Error(JSONRPCError {
-            error: JSONRPCErrorError {
-                code: -32001,
-                message: "remote app-server event queue is full".to_string(),
-                data: None,
-            },
-            id: request.id().clone(),
-        }),
-        "<remote-app-server>",
-    )
-    .await
-}
-
-fn event_requires_delivery(event: &AppServerEvent) -> bool {
-    match event {
-        AppServerEvent::ServerNotification(ServerNotification::TurnCompleted(_)) => true,
-        AppServerEvent::LegacyNotification(notification) => matches!(
-            notification
-                .method
-                .strip_prefix("codex/event/")
-                .unwrap_or(&notification.method),
-            "task_complete" | "turn_aborted" | "shutdown_complete"
-        ),
-        AppServerEvent::Disconnected { .. } => true,
-        AppServerEvent::Lagged { .. }
-        | AppServerEvent::ServerNotification(_)
-        | AppServerEvent::ServerRequest(_) => false,
-    }
-}
-
-fn request_id_from_client_request(request: &ClientRequest) -> RequestId {
-    jsonrpc_request_from_client_request(request.clone()).id
-}
-
-fn jsonrpc_request_from_client_request(request: ClientRequest) -> JSONRPCRequest {
-    let value = match serde_json::to_value(request) {
-        Ok(value) => value,
-        Err(err) => panic!("client request should serialize: {err}"),
-    };
-    match serde_json::from_value(value) {
-        Ok(request) => request,
-        Err(err) => panic!("client request should encode as JSON-RPC request: {err}"),
-    }
-}
-
-fn jsonrpc_notification_from_client_notification(
-    notification: ClientNotification,
-) -> JSONRPCNotification {
-    let value = match serde_json::to_value(notification) {
-        Ok(value) => value,
-        Err(err) => panic!("client notification should serialize: {err}"),
-    };
-    match serde_json::from_value(value) {
-        Ok(notification) => notification,
-        Err(err) => panic!("client notification should encode as JSON-RPC notification: {err}"),
-    }
-}
-
-async fn write_jsonrpc_message(
-    stream: &mut WebSocketStream<MaybeTlsStream<TcpStream>>,
-    message: JSONRPCMessage,
-    websocket_url: &str,
-) -> IoResult<()> {
-    let payload = serde_json::to_string(&message).map_err(IoError::other)?;
-    stream
-        .send(Message::Text(payload.into()))
-        .await
-        .map_err(|err| {
-            IoError::other(format!(
-                "failed to write websocket message to `{websocket_url}`: {err}"
-            ))
-        })
-}
--- a/codex-rs/app-server-protocol/schema/json/ClientRequest.json
+++ b/codex-rs/app-server-protocol/schema/json/ClientRequest.json
@@ -5,14 +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"
    },
-    "ApprovalsReviewer": {
-      "description": "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `guardian_subagent` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request.",
-      "enum": [
-        "user",
-        "guardian_subagent"
-      ],
-      "type": "string"
-    },
    "AppsListParams": {
      "description": "EXPERIMENTAL - list available apps/connectors.",
      "properties": {
@@ -60,7 +52,7 @@
        {
          "additionalProperties": false,
          "properties": {
-            "granular": {
+            "reject": {
              "properties": {
                "mcp_elicitations": {
                  "type": "boolean"
@@ -89,9 +81,9 @@
            }
          },
          "required": [
-            "granular"
+            "reject"
          ],
-          "title": "GranularAskForApproval",
+          "title": "RejectAskForApproval",
          "type": "object"
        }
      ]
@@ -506,9 +498,6 @@
    },
    "DynamicToolSpec": {
      "properties": {
-        "deferLoading": {
-          "type": "boolean"
-        },
        "description": {
          "type": "string"
        },
@@ -645,164 +634,6 @@
      ],
      "type": "object"
    },
-    "FsCopyParams": {
-      "description": "Copy a file or directory tree on the host filesystem.",
-      "properties": {
-        "destinationPath": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            }
-          ],
-          "description": "Absolute destination path."
-        },
-        "recursive": {
-          "description": "Required for directory copies; ignored for file copies.",
-          "type": "boolean"
-        },
-        "sourcePath": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            }
-          ],
-          "description": "Absolute source path."
-        }
-      },
-      "required": [
-        "destinationPath",
-        "sourcePath"
-      ],
-      "type": "object"
-    },
-    "FsCreateDirectoryParams": {
-      "description": "Create a directory on the host filesystem.",
-      "properties": {
-        "path": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            }
-          ],
-          "description": "Absolute directory path to create."
-        },
-        "recursive": {
-          "description": "Whether parent directories should also be created. Defaults to `true`.",
-          "type": [
-            "boolean",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "path"
-      ],
-      "type": "object"
-    },
-    "FsGetMetadataParams": {
-      "description": "Request metadata for an absolute path.",
-      "properties": {
-        "path": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            }
-          ],
-          "description": "Absolute path to inspect."
-        }
-      },
-      "required": [
-        "path"
-      ],
-      "type": "object"
-    },
-    "FsReadDirectoryParams": {
-      "description": "List direct child names for a directory.",
-      "properties": {
-        "path": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            }
-          ],
-          "description": "Absolute directory path to read."
-        }
-      },
-      "required": [
-        "path"
-      ],
-      "type": "object"
-    },
-    "FsReadFileParams": {
-      "description": "Read a file from the host filesystem.",
-      "properties": {
-        "path": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            }
-          ],
-          "description": "Absolute path to read."
-        }
-      },
-      "required": [
-        "path"
-      ],
-      "type": "object"
-    },
-    "FsRemoveParams": {
-      "description": "Remove a file or directory tree from the host filesystem.",
-      "properties": {
-        "force": {
-          "description": "Whether missing paths should be ignored. Defaults to `true`.",
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
-        "path": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            }
-          ],
-          "description": "Absolute path to remove."
-        },
-        "recursive": {
-          "description": "Whether directory removal should recurse. Defaults to `true`.",
-          "type": [
-            "boolean",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "path"
-      ],
-      "type": "object"
-    },
-    "FsWriteFileParams": {
-      "description": "Write a file on the host filesystem.",
-      "properties": {
-        "dataBase64": {
-          "description": "File contents encoded as base64.",
-          "type": "string"
-        },
-        "path": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            }
-          ],
-          "description": "Absolute path to write."
-        }
-      },
-      "required": [
-        "dataBase64",
-        "path"
-      ],
-      "type": "object"
-    },
    "FunctionCallOutputBody": {
      "anyOf": [
        {
@@ -871,6 +702,24 @@
        }
      ]
    },
+    "FunctionCallOutputPayload": {
+      "description": "The payload we send back to OpenAI when reporting a tool call result.\n\n`body` serializes directly as the wire value for `function_call_output.output`. `success` remains internal metadata for downstream handling.",
+      "properties": {
+        "body": {
+          "$ref": "#/definitions/FunctionCallOutputBody"
+        },
+        "success": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        }
+      },
+      "required": [
+        "body"
+      ],
+      "type": "object"
+    },
    "FuzzyFileSearchParams": {
      "properties": {
        "cancellationToken": {
@@ -937,6 +786,15 @@
      ],
      "type": "object"
    },
+    "HazelnutScope": {
+      "enum": [
+        "example",
+        "workspace-shared",
+        "all-shared",
+        "personal"
+      ],
+      "type": "string"
+    },
    "ImageDetail": {
      "enum": [
        "auto",
@@ -955,7 +813,7 @@
          "type": "boolean"
        },
        "optOutNotificationMethods": {
-          "description": "Exact notification method names that should be suppressed for this connection (for example `thread/started`).",
+          "description": "Exact notification method names that should be suppressed for this connection (for example `codex/event/session_configured`).",
          "items": {
            "type": "string"
          },
@@ -1253,10 +1111,6 @@
    },
    "PluginInstallParams": {
      "properties": {
-        "forceRemoteSync": {
-          "description": "When true, apply the remote plugin change before the local install flow.",
-          "type": "boolean"
-        },
        "marketplacePath": {
          "$ref": "#/definitions/AbsolutePathBuf"
        },
@@ -1289,27 +1143,8 @@
      },
      "type": "object"
    },
-    "PluginReadParams": {
-      "properties": {
-        "marketplacePath": {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        },
-        "pluginName": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "marketplacePath",
-        "pluginName"
-      ],
-      "type": "object"
-    },
    "PluginUninstallParams": {
      "properties": {
-        "forceRemoteSync": {
-          "description": "When true, apply the remote plugin change before the local uninstall flow.",
-          "type": "boolean"
-        },
        "pluginId": {
          "type": "string"
        }
@@ -1319,6 +1154,15 @@
      ],
      "type": "object"
    },
+    "ProductSurface": {
+      "enum": [
+        "chatgpt",
+        "codex",
+        "api",
+        "atlas"
+      ],
+      "type": "string"
+    },
    "ReadOnlyAccess": {
      "oneOf": [
        {
@@ -1547,6 +1391,10 @@
                "null"
              ]
            },
+            "id": {
+              "type": "string",
+              "writeOnly": true
+            },
            "summary": {
              "items": {
                "$ref": "#/definitions/ReasoningItemReasoningSummary"
@@ -1562,6 +1410,7 @@
            }
          },
          "required": [
+            "id",
            "summary",
            "type"
          ],
@@ -1625,12 +1474,6 @@
            "name": {
              "type": "string"
            },
-            "namespace": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "type": {
              "enum": [
                "function_call"
@@ -1648,54 +1491,13 @@
          "title": "FunctionCallResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "call_id": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "execution": {
-              "type": "string"
-            },
-            "id": {
-              "type": [
-                "string",
-                "null"
-              ],
-              "writeOnly": true
-            },
-            "status": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "tool_search_call"
-              ],
-              "title": "ToolSearchCallResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "execution",
-            "type"
-          ],
-          "title": "ToolSearchCallResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "call_id": {
              "type": "string"
            },
            "output": {
-              "$ref": "#/definitions/FunctionCallOutputBody"
+              "$ref": "#/definitions/FunctionCallOutputPayload"
            },
            "type": {
              "enum": [
@@ -1760,7 +1562,7 @@
              "type": "string"
            },
            "output": {
-              "$ref": "#/definitions/FunctionCallOutputBody"
+              "$ref": "#/definitions/FunctionCallOutputPayload"
            },
            "type": {
              "enum": [
@@ -1778,41 +1580,6 @@
          "title": "CustomToolCallOutputResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "call_id": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "execution": {
-              "type": "string"
-            },
-            "status": {
-              "type": "string"
-            },
-            "tools": {
-              "items": true,
-              "type": "array"
-            },
-            "type": {
-              "enum": [
-                "tool_search_output"
-              ],
-              "title": "ToolSearchOutputResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "execution",
-            "status",
-            "tools",
-            "type"
-          ],
-          "title": "ToolSearchOutputResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "action": {
@@ -2392,6 +2159,42 @@
      },
      "type": "object"
    },
+    "SkillsRemoteReadParams": {
+      "properties": {
+        "enabled": {
+          "default": false,
+          "type": "boolean"
+        },
+        "hazelnutScope": {
+          "allOf": [
+            {
+              "$ref": "#/definitions/HazelnutScope"
+            }
+          ],
+          "default": "example"
+        },
+        "productSurface": {
+          "allOf": [
+            {
+              "$ref": "#/definitions/ProductSurface"
+            }
+          ],
+          "default": "codex"
+        }
+      },
+      "type": "object"
+    },
+    "SkillsRemoteWriteParams": {
+      "properties": {
+        "hazelnutId": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "hazelnutId"
+      ],
+      "type": "object"
+    },
    "TextElement": {
      "properties": {
        "byteRange": {
@@ -2450,17 +2253,6 @@
            }
          ]
        },
-        "approvalsReviewer": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ApprovalsReviewer"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Override where approval requests are routed for review on this thread and subsequent turns."
-        },
        "baseInstructions": {
          "type": [
            "string",
@@ -2702,12 +2494,6 @@
        "data": {
          "type": "string"
        },
-        "itemId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
        "numChannels": {
          "format": "uint16",
          "minimum": 0.0,
@@ -2747,17 +2533,6 @@
            }
          ]
        },
-        "approvalsReviewer": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ApprovalsReviewer"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Override where approval requests are routed for review on this thread and subsequent turns."
-        },
        "baseInstructions": {
          "type": [
            "string",
@@ -2875,21 +2650,6 @@
      ],
      "type": "object"
    },
-    "ThreadShellCommandParams": {
-      "properties": {
-        "command": {
-          "type": "string"
-        },
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "command",
-        "threadId"
-      ],
-      "type": "object"
-    },
    "ThreadSortKey": {
      "enum": [
        "created_at",
@@ -2924,17 +2684,6 @@
            }
          ]
        },
-        "approvalsReviewer": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ApprovalsReviewer"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Override where approval requests are routed for review on this thread and subsequent turns."
-        },
        "baseInstructions": {
          "type": [
            "string",
@@ -3074,17 +2823,6 @@
          ],
          "description": "Override the approval policy for this turn and subsequent turns."
        },
-        "approvalsReviewer": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ApprovalsReviewer"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Override where approval requests are routed for review on this turn and subsequent turns."
-        },
        "cwd": {
          "description": "Override the working directory for this turn and subsequent turns.",
          "type": [
@@ -3595,30 +3333,6 @@
      "title": "Thread/compact/startRequest",
      "type": "object"
    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "thread/shellCommand"
-          ],
-          "title": "Thread/shellCommandRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadShellCommandParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Thread/shellCommandRequest",
-      "type": "object"
-    },
    {
      "properties": {
        "id": {
@@ -3770,13 +3484,13 @@
        },
        "method": {
          "enum": [
-            "plugin/read"
+            "skills/remote/list"
          ],
-          "title": "Plugin/readRequestMethod",
+          "title": "Skills/remote/listRequestMethod",
          "type": "string"
        },
        "params": {
-          "$ref": "#/definitions/PluginReadParams"
+          "$ref": "#/definitions/SkillsRemoteReadParams"
        }
      },
      "required": [
@@ -3784,7 +3498,31 @@
        "method",
        "params"
      ],
-      "title": "Plugin/readRequest",
+      "title": "Skills/remote/listRequest",
+      "type": "object"
+    },
+    {
+      "properties": {
+        "id": {
+          "$ref": "#/definitions/RequestId"
+        },
+        "method": {
+          "enum": [
+            "skills/remote/export"
+          ],
+          "title": "Skills/remote/exportRequestMethod",
+          "type": "string"
+        },
+        "params": {
+          "$ref": "#/definitions/SkillsRemoteWriteParams"
+        }
+      },
+      "required": [
+        "id",
+        "method",
+        "params"
+      ],
+      "title": "Skills/remote/exportRequest",
      "type": "object"
    },
    {
@@ -3811,174 +3549,6 @@
      "title": "App/listRequest",
      "type": "object"
    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "fs/readFile"
-          ],
-          "title": "Fs/readFileRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/FsReadFileParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Fs/readFileRequest",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "fs/writeFile"
-          ],
-          "title": "Fs/writeFileRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/FsWriteFileParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Fs/writeFileRequest",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "fs/createDirectory"
-          ],
-          "title": "Fs/createDirectoryRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/FsCreateDirectoryParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Fs/createDirectoryRequest",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "fs/getMetadata"
-          ],
-          "title": "Fs/getMetadataRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/FsGetMetadataParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Fs/getMetadataRequest",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "fs/readDirectory"
-          ],
-          "title": "Fs/readDirectoryRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/FsReadDirectoryParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Fs/readDirectoryRequest",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "fs/remove"
-          ],
-          "title": "Fs/removeRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/FsRemoveParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Fs/removeRequest",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "fs/copy"
-          ],
-          "title": "Fs/copyRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/FsCopyParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Fs/copyRequest",
-      "type": "object"
-    },
    {
      "properties": {
        "id": {
--- a/codex-rs/app-server-protocol/schema/json/EventMsg.json
+++ b/codex-rs/app-server-protocol/schema/json/EventMsg.json
--- a/codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalParams.json
+++ b/codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalParams.json
@@ -28,6 +28,41 @@
      },
      "type": "object"
    },
+    "AdditionalMacOsPermissions": {
+      "properties": {
+        "accessibility": {
+          "type": "boolean"
+        },
+        "automations": {
+          "$ref": "#/definitions/MacOsAutomationPermission"
+        },
+        "calendar": {
+          "type": "boolean"
+        },
+        "contacts": {
+          "$ref": "#/definitions/MacOsContactsPermission"
+        },
+        "launchServices": {
+          "type": "boolean"
+        },
+        "preferences": {
+          "$ref": "#/definitions/MacOsPreferencesPermission"
+        },
+        "reminders": {
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "accessibility",
+        "automations",
+        "calendar",
+        "contacts",
+        "launchServices",
+        "preferences",
+        "reminders"
+      ],
+      "type": "object"
+    },
    "AdditionalNetworkPermissions": {
      "properties": {
        "enabled": {
@@ -39,8 +74,7 @@
      },
      "type": "object"
    },
-    "RequestPermissionProfile": {
-      "additionalProperties": false,
+    "AdditionalPermissionProfile": {
      "properties": {
        "fileSystem": {
          "anyOf": [
@@ -52,6 +86,16 @@
            }
          ]
        },
+        "macos": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AdditionalMacOsPermissions"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
        "network": {
          "anyOf": [
            {
@@ -64,6 +108,49 @@
        }
      },
      "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"
+        }
+      ]
+    },
+    "MacOsContactsPermission": {
+      "enum": [
+        "none",
+        "read_only",
+        "read_write"
+      ],
+      "type": "string"
+    },
+    "MacOsPreferencesPermission": {
+      "enum": [
+        "none",
+        "read_only",
+        "read_write"
+      ],
+      "type": "string"
    }
  },
  "properties": {
@@ -71,7 +158,7 @@
      "type": "string"
    },
    "permissions": {
-      "$ref": "#/definitions/RequestPermissionProfile"
+      "$ref": "#/definitions/AdditionalPermissionProfile"
    },
    "reason": {
      "type": [
--- a/codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalResponse.json
@@ -39,6 +39,65 @@
      },
      "type": "object"
    },
+    "GrantedMacOsPermissions": {
+      "properties": {
+        "accessibility": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "automations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/MacOsAutomationPermission"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "calendar": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "contacts": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/MacOsContactsPermission"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "launchServices": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "preferences": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/MacOsPreferencesPermission"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "reminders": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        }
+      },
+      "type": "object"
+    },
    "GrantedPermissionProfile": {
      "properties": {
        "fileSystem": {
@@ -51,6 +110,16 @@
            }
          ]
        },
+        "macos": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/GrantedMacOsPermissions"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
        "network": {
          "anyOf": [
            {
@@ -64,6 +133,49 @@
      },
      "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"
+        }
+      ]
+    },
+    "MacOsContactsPermission": {
+      "enum": [
+        "none",
+        "read_only",
+        "read_write"
+      ],
+      "type": "string"
+    },
+    "MacOsPreferencesPermission": {
+      "enum": [
+        "none",
+        "read_only",
+        "read_write"
+      ],
+      "type": "string"
+    },
    "PermissionGrantScope": {
      "enum": [
        "turn",
--- a/codex-rs/app-server-protocol/schema/json/ServerNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/ServerNotification.json
@@ -535,7 +535,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -725,7 +724,6 @@
    "CommandExecutionOutputDeltaNotification": {
      "properties": {
        "delta": {
-          "description": "Raw bytes from the command stream (may not be valid UTF-8).",
          "type": "string"
        },
        "itemId": {
@@ -746,15 +744,6 @@
      ],
      "type": "object"
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -1067,61 +1056,6 @@
      },
      "type": "object"
    },
-    "GuardianApprovalReview": {
-      "description": "[UNSTABLE] Temporary guardian approval review payload used by `item/autoApprovalReview/*` notifications. This shape is expected to change soon.",
-      "properties": {
-        "rationale": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "riskLevel": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/GuardianRiskLevel"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "riskScore": {
-          "format": "uint8",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "status": {
-          "$ref": "#/definitions/GuardianApprovalReviewStatus"
-        }
-      },
-      "required": [
-        "status"
-      ],
-      "type": "object"
-    },
-    "GuardianApprovalReviewStatus": {
-      "description": "[UNSTABLE] Lifecycle state for a guardian approval review.",
-      "enum": [
-        "inProgress",
-        "approved",
-        "denied",
-        "aborted"
-      ],
-      "type": "string"
-    },
-    "GuardianRiskLevel": {
-      "description": "[UNSTABLE] Risk level assigned by guardian approval review.",
-      "enum": [
-        "low",
-        "medium",
-        "high"
-      ],
-      "type": "string"
-    },
    "HookCompletedNotification": {
      "properties": {
        "run": {
@@ -1319,56 +1253,6 @@
      ],
      "type": "object"
    },
-    "ItemGuardianApprovalReviewCompletedNotification": {
-      "description": "[UNSTABLE] Temporary notification payload for guardian automatic approval review. This shape is expected to change soon.\n\nTODO(ccunningham): Attach guardian review state to the reviewed tool item's lifecycle instead of sending separate standalone review notifications so the app-server API can persist and replay review state via `thread/read`.",
-      "properties": {
-        "action": true,
-        "review": {
-          "$ref": "#/definitions/GuardianApprovalReview"
-        },
-        "targetItemId": {
-          "type": "string"
-        },
-        "threadId": {
-          "type": "string"
-        },
-        "turnId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "review",
-        "targetItemId",
-        "threadId",
-        "turnId"
-      ],
-      "type": "object"
-    },
-    "ItemGuardianApprovalReviewStartedNotification": {
-      "description": "[UNSTABLE] Temporary notification payload for guardian automatic approval review. This shape is expected to change soon.\n\nTODO(ccunningham): Attach guardian review state to the reviewed tool item's lifecycle instead of sending separate standalone review notifications so the app-server API can persist and replay review state via `thread/read`.",
-      "properties": {
-        "action": true,
-        "review": {
-          "$ref": "#/definitions/GuardianApprovalReview"
-        },
-        "targetItemId": {
-          "type": "string"
-        },
-        "threadId": {
-          "type": "string"
-        },
-        "turnId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "review",
-        "targetItemId",
-        "threadId",
-        "turnId"
-      ],
-      "type": "object"
-    },
    "ItemStartedNotification": {
      "properties": {
        "item": {
@@ -1704,25 +1588,6 @@
      ],
      "type": "object"
    },
-    "RealtimeConversationVersion": {
-      "enum": [
-        "v1",
-        "v2"
-      ],
-      "type": "string"
-    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "ReasoningSummaryPartAddedNotification": {
      "properties": {
        "itemId": {
@@ -2319,11 +2184,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -2334,14 +2194,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -2523,13 +2375,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -2537,17 +2382,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
@@ -2780,12 +2614,6 @@
        "data": {
          "type": "string"
        },
-        "itemId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
        "numChannels": {
          "format": "uint16",
          "minimum": 0.0,
@@ -2887,14 +2715,10 @@
        },
        "threadId": {
          "type": "string"
-        },
-        "version": {
-          "$ref": "#/definitions/RealtimeConversationVersion"
        }
      },
      "required": [
-        "threadId",
-        "version"
+        "threadId"
      ],
      "type": "object"
    },
@@ -3852,46 +3676,6 @@
      "title": "Item/startedNotification",
      "type": "object"
    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "item/autoApprovalReview/started"
-          ],
-          "title": "Item/autoApprovalReview/startedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ItemGuardianApprovalReviewStartedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Item/autoApprovalReview/startedNotification",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "item/autoApprovalReview/completed"
-          ],
-          "title": "Item/autoApprovalReview/completedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ItemGuardianApprovalReviewCompletedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Item/autoApprovalReview/completedNotification",
-      "type": "object"
-    },
    {
      "properties": {
        "method": {
--- a/codex-rs/app-server-protocol/schema/json/ServerRequest.json
+++ b/codex-rs/app-server-protocol/schema/json/ServerRequest.json
@@ -1449,7 +1449,7 @@
          "type": "string"
        },
        "permissions": {
-          "$ref": "#/definitions/RequestPermissionProfile"
+          "$ref": "#/definitions/AdditionalPermissionProfile"
        },
        "reason": {
          "type": [
@@ -1483,32 +1483,6 @@
        }
      ]
    },
-    "RequestPermissionProfile": {
-      "additionalProperties": false,
-      "properties": {
-        "fileSystem": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalFileSystemPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "network": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalNetworkPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "type": "object"
-    },
    "ThreadId": {
      "type": "string"
    },
--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
--- a/codex-rs/app-server-protocol/schema/json/v1/InitializeParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v1/InitializeParams.json
@@ -31,7 +31,7 @@
          "type": "boolean"
        },
        "optOutNotificationMethods": {
-          "description": "Exact notification method names that should be suppressed for this connection (for example `thread/started`).",
+          "description": "Exact notification method names that should be suppressed for this connection (for example `codex/event/session_configured`).",
          "items": {
            "type": "string"
          },
--- a/codex-rs/app-server-protocol/schema/json/v1/InitializeResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v1/InitializeResponse.json
@@ -1,21 +1,11 @@
 {
  "$schema": "http://json-schema.org/draft-07/schema#",
  "properties": {
-    "platformFamily": {
-      "description": "Platform family for the running app-server target, for example `\"unix\"` or `\"windows\"`.",
-      "type": "string"
-    },
-    "platformOs": {
-      "description": "Operating system for the running app-server target, for example `\"macos\"`, `\"linux\"`, or `\"windows\"`.",
-      "type": "string"
-    },
    "userAgent": {
      "type": "string"
    }
  },
  "required": [
-    "platformFamily",
-    "platformOs",
    "userAgent"
  ],
  "title": "InitializeResponse",
--- a/codex-rs/app-server-protocol/schema/json/v2/CommandExecutionOutputDeltaNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/CommandExecutionOutputDeltaNotification.json
@@ -2,7 +2,6 @@
  "$schema": "http://json-schema.org/draft-07/schema#",
  "properties": {
    "delta": {
-      "description": "Raw bytes from the command stream (may not be valid UTF-8).",
      "type": "string"
    },
    "itemId": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ConfigReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ConfigReadResponse.json
@@ -96,14 +96,6 @@
    "AppToolsConfig": {
      "type": "object"
    },
-    "ApprovalsReviewer": {
-      "description": "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `guardian_subagent` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request.",
-      "enum": [
-        "user",
-        "guardian_subagent"
-      ],
-      "type": "string"
-    },
    "AppsConfig": {
      "properties": {
        "_default": {
@@ -151,7 +143,7 @@
        {
          "additionalProperties": false,
          "properties": {
-            "granular": {
+            "reject": {
              "properties": {
                "mcp_elicitations": {
                  "type": "boolean"
@@ -180,9 +172,9 @@
            }
          },
          "required": [
-            "granular"
+            "reject"
          ],
-          "title": "GranularAskForApproval",
+          "title": "RejectAskForApproval",
          "type": "object"
        }
      ]
@@ -210,17 +202,6 @@
            }
          ]
        },
-        "approvals_reviewer": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ApprovalsReviewer"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "[UNSTABLE] Optional default for where approval requests are routed for review."
-        },
        "compact_prompt": {
          "type": [
            "string",
@@ -597,17 +578,6 @@
            }
          ]
        },
-        "approvals_reviewer": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ApprovalsReviewer"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "[UNSTABLE] Optional profile-level override for where approval requests are routed for review. If omitted, the enclosing config default is used."
-        },
        "chatgpt_base_url": {
          "type": [
            "string",
--- a/codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json
@@ -15,7 +15,7 @@
        {
          "additionalProperties": false,
          "properties": {
-            "granular": {
+            "reject": {
              "properties": {
                "mcp_elicitations": {
                  "type": "boolean"
@@ -44,9 +44,9 @@
            }
          },
          "required": [
-            "granular"
+            "reject"
          ],
-          "title": "GranularAskForApproval",
+          "title": "RejectAskForApproval",
          "type": "object"
        }
      ]
--- a/codex-rs/app-server-protocol/schema/json/v2/FsCopyParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsCopyParams.json
@@ -1,38 +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"
-    }
-  },
-  "description": "Copy a file or directory tree on the host filesystem.",
-  "properties": {
-    "destinationPath": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        }
-      ],
-      "description": "Absolute destination path."
-    },
-    "recursive": {
-      "description": "Required for directory copies; ignored for file copies.",
-      "type": "boolean"
-    },
-    "sourcePath": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        }
-      ],
-      "description": "Absolute source path."
-    }
-  },
-  "required": [
-    "destinationPath",
-    "sourcePath"
-  ],
-  "title": "FsCopyParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsCopyResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsCopyResponse.json
@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Successful response for `fs/copy`.",
-  "title": "FsCopyResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsCreateDirectoryParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsCreateDirectoryParams.json
@@ -1,32 +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"
-    }
-  },
-  "description": "Create a directory on the host filesystem.",
-  "properties": {
-    "path": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        }
-      ],
-      "description": "Absolute directory path to create."
-    },
-    "recursive": {
-      "description": "Whether parent directories should also be created. Defaults to `true`.",
-      "type": [
-        "boolean",
-        "null"
-      ]
-    }
-  },
-  "required": [
-    "path"
-  ],
-  "title": "FsCreateDirectoryParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsCreateDirectoryResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsCreateDirectoryResponse.json
@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Successful response for `fs/createDirectory`.",
-  "title": "FsCreateDirectoryResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsGetMetadataParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsGetMetadataParams.json
@@ -1,25 +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"
-    }
-  },
-  "description": "Request metadata for an absolute path.",
-  "properties": {
-    "path": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        }
-      ],
-      "description": "Absolute path to inspect."
-    }
-  },
-  "required": [
-    "path"
-  ],
-  "title": "FsGetMetadataParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsGetMetadataResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsGetMetadataResponse.json
@@ -1,32 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Metadata returned by `fs/getMetadata`.",
-  "properties": {
-    "createdAtMs": {
-      "description": "File creation time in Unix milliseconds when available, otherwise `0`.",
-      "format": "int64",
-      "type": "integer"
-    },
-    "isDirectory": {
-      "description": "Whether the path currently resolves to a directory.",
-      "type": "boolean"
-    },
-    "isFile": {
-      "description": "Whether the path currently resolves to a regular file.",
-      "type": "boolean"
-    },
-    "modifiedAtMs": {
-      "description": "File modification time in Unix milliseconds when available, otherwise `0`.",
-      "format": "int64",
-      "type": "integer"
-    }
-  },
-  "required": [
-    "createdAtMs",
-    "isDirectory",
-    "isFile",
-    "modifiedAtMs"
-  ],
-  "title": "FsGetMetadataResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsReadDirectoryParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsReadDirectoryParams.json
@@ -1,25 +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"
-    }
-  },
-  "description": "List direct child names for a directory.",
-  "properties": {
-    "path": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        }
-      ],
-      "description": "Absolute directory path to read."
-    }
-  },
-  "required": [
-    "path"
-  ],
-  "title": "FsReadDirectoryParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsReadDirectoryResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsReadDirectoryResponse.json
@@ -1,43 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "FsReadDirectoryEntry": {
-      "description": "A directory entry returned by `fs/readDirectory`.",
-      "properties": {
-        "fileName": {
-          "description": "Direct child entry name only, not an absolute or relative path.",
-          "type": "string"
-        },
-        "isDirectory": {
-          "description": "Whether this entry resolves to a directory.",
-          "type": "boolean"
-        },
-        "isFile": {
-          "description": "Whether this entry resolves to a regular file.",
-          "type": "boolean"
-        }
-      },
-      "required": [
-        "fileName",
-        "isDirectory",
-        "isFile"
-      ],
-      "type": "object"
-    }
-  },
-  "description": "Directory entries returned by `fs/readDirectory`.",
-  "properties": {
-    "entries": {
-      "description": "Direct child entries in the requested directory.",
-      "items": {
-        "$ref": "#/definitions/FsReadDirectoryEntry"
-      },
-      "type": "array"
-    }
-  },
-  "required": [
-    "entries"
-  ],
-  "title": "FsReadDirectoryResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsReadFileParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsReadFileParams.json
@@ -1,25 +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"
-    }
-  },
-  "description": "Read a file from the host filesystem.",
-  "properties": {
-    "path": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        }
-      ],
-      "description": "Absolute path to read."
-    }
-  },
-  "required": [
-    "path"
-  ],
-  "title": "FsReadFileParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsReadFileResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsReadFileResponse.json
@@ -1,15 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Base64-encoded file contents returned by `fs/readFile`.",
-  "properties": {
-    "dataBase64": {
-      "description": "File contents encoded as base64.",
-      "type": "string"
-    }
-  },
-  "required": [
-    "dataBase64"
-  ],
-  "title": "FsReadFileResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsRemoveParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsRemoveParams.json
@@ -1,39 +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"
-    }
-  },
-  "description": "Remove a file or directory tree from the host filesystem.",
-  "properties": {
-    "force": {
-      "description": "Whether missing paths should be ignored. Defaults to `true`.",
-      "type": [
-        "boolean",
-        "null"
-      ]
-    },
-    "path": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        }
-      ],
-      "description": "Absolute path to remove."
-    },
-    "recursive": {
-      "description": "Whether directory removal should recurse. Defaults to `true`.",
-      "type": [
-        "boolean",
-        "null"
-      ]
-    }
-  },
-  "required": [
-    "path"
-  ],
-  "title": "FsRemoveParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsRemoveResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsRemoveResponse.json
@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Successful response for `fs/remove`.",
-  "title": "FsRemoveResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsWriteFileParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsWriteFileParams.json
@@ -1,30 +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"
-    }
-  },
-  "description": "Write a file on the host filesystem.",
-  "properties": {
-    "dataBase64": {
-      "description": "File contents encoded as base64.",
-      "type": "string"
-    },
-    "path": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        }
-      ],
-      "description": "Absolute path to write."
-    }
-  },
-  "required": [
-    "dataBase64",
-    "path"
-  ],
-  "title": "FsWriteFileParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/FsWriteFileResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/FsWriteFileResponse.json
@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Successful response for `fs/writeFile`.",
-  "title": "FsWriteFileResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
@@ -41,7 +41,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -177,15 +176,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -384,18 +374,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "TextElement": {
      "properties": {
        "byteRange": {
@@ -582,11 +560,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -597,14 +570,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -786,13 +751,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -800,17 +758,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemGuardianApprovalReviewCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemGuardianApprovalReviewCompletedNotification.json
@@ -1,84 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "GuardianApprovalReview": {
-      "description": "[UNSTABLE] Temporary guardian approval review payload used by `item/autoApprovalReview/*` notifications. This shape is expected to change soon.",
-      "properties": {
-        "rationale": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "riskLevel": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/GuardianRiskLevel"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "riskScore": {
-          "format": "uint8",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "status": {
-          "$ref": "#/definitions/GuardianApprovalReviewStatus"
-        }
-      },
-      "required": [
-        "status"
-      ],
-      "type": "object"
-    },
-    "GuardianApprovalReviewStatus": {
-      "description": "[UNSTABLE] Lifecycle state for a guardian approval review.",
-      "enum": [
-        "inProgress",
-        "approved",
-        "denied",
-        "aborted"
-      ],
-      "type": "string"
-    },
-    "GuardianRiskLevel": {
-      "description": "[UNSTABLE] Risk level assigned by guardian approval review.",
-      "enum": [
-        "low",
-        "medium",
-        "high"
-      ],
-      "type": "string"
-    }
-  },
-  "description": "[UNSTABLE] Temporary notification payload for guardian automatic approval review. This shape is expected to change soon.\n\nTODO(ccunningham): Attach guardian review state to the reviewed tool item's lifecycle instead of sending separate standalone review notifications so the app-server API can persist and replay review state via `thread/read`.",
-  "properties": {
-    "action": true,
-    "review": {
-      "$ref": "#/definitions/GuardianApprovalReview"
-    },
-    "targetItemId": {
-      "type": "string"
-    },
-    "threadId": {
-      "type": "string"
-    },
-    "turnId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "review",
-    "targetItemId",
-    "threadId",
-    "turnId"
-  ],
-  "title": "ItemGuardianApprovalReviewCompletedNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemGuardianApprovalReviewStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemGuardianApprovalReviewStartedNotification.json
@@ -1,84 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "GuardianApprovalReview": {
-      "description": "[UNSTABLE] Temporary guardian approval review payload used by `item/autoApprovalReview/*` notifications. This shape is expected to change soon.",
-      "properties": {
-        "rationale": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "riskLevel": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/GuardianRiskLevel"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "riskScore": {
-          "format": "uint8",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "status": {
-          "$ref": "#/definitions/GuardianApprovalReviewStatus"
-        }
-      },
-      "required": [
-        "status"
-      ],
-      "type": "object"
-    },
-    "GuardianApprovalReviewStatus": {
-      "description": "[UNSTABLE] Lifecycle state for a guardian approval review.",
-      "enum": [
-        "inProgress",
-        "approved",
-        "denied",
-        "aborted"
-      ],
-      "type": "string"
-    },
-    "GuardianRiskLevel": {
-      "description": "[UNSTABLE] Risk level assigned by guardian approval review.",
-      "enum": [
-        "low",
-        "medium",
-        "high"
-      ],
-      "type": "string"
-    }
-  },
-  "description": "[UNSTABLE] Temporary notification payload for guardian automatic approval review. This shape is expected to change soon.\n\nTODO(ccunningham): Attach guardian review state to the reviewed tool item's lifecycle instead of sending separate standalone review notifications so the app-server API can persist and replay review state via `thread/read`.",
-  "properties": {
-    "action": true,
-    "review": {
-      "$ref": "#/definitions/GuardianApprovalReview"
-    },
-    "targetItemId": {
-      "type": "string"
-    },
-    "threadId": {
-      "type": "string"
-    },
-    "turnId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "review",
-    "targetItemId",
-    "threadId",
-    "turnId"
-  ],
-  "title": "ItemGuardianApprovalReviewStartedNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
@@ -41,7 +41,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -177,15 +176,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -384,18 +374,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "TextElement": {
      "properties": {
        "byteRange": {
@@ -582,11 +560,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -597,14 +570,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -786,13 +751,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -800,17 +758,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginInstallParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginInstallParams.json
@@ -7,10 +7,6 @@
    }
  },
  "properties": {
-    "forceRemoteSync": {
-      "description": "When true, apply the remote plugin change before the local install flow.",
-      "type": "boolean"
-    },
    "marketplacePath": {
      "$ref": "#/definitions/AbsolutePathBuf"
    },
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginInstallResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginInstallResponse.json
@@ -2,7 +2,7 @@
  "$schema": "http://json-schema.org/draft-07/schema#",
  "definitions": {
    "AppSummary": {
-      "description": "EXPERIMENTAL - app metadata summary for plugin responses.",
+      "description": "EXPERIMENTAL - app metadata summary for plugin-install responses.",
      "properties": {
        "description": {
          "type": [
@@ -28,13 +28,6 @@
        "name"
      ],
      "type": "object"
-    },
-    "PluginAuthPolicy": {
-      "enum": [
-        "ON_INSTALL",
-        "ON_USE"
-      ],
-      "type": "string"
    }
  },
  "properties": {
@@ -43,14 +36,10 @@
        "$ref": "#/definitions/AppSummary"
      },
      "type": "array"
-    },
-    "authPolicy": {
-      "$ref": "#/definitions/PluginAuthPolicy"
    }
  },
  "required": [
-    "appsNeedingAuth",
-    "authPolicy"
+    "appsNeedingAuth"
  ],
  "title": "PluginInstallResponse",
  "type": "object"
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginListResponse.json
@@ -5,32 +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"
    },
-    "MarketplaceInterface": {
-      "properties": {
-        "displayName": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "PluginAuthPolicy": {
-      "enum": [
-        "ON_INSTALL",
-        "ON_USE"
-      ],
-      "type": "string"
-    },
-    "PluginInstallPolicy": {
-      "enum": [
-        "NOT_AVAILABLE",
-        "AVAILABLE",
-        "INSTALLED_BY_DEFAULT"
-      ],
-      "type": "string"
-    },
    "PluginInterface": {
      "properties": {
        "brandColor": {
@@ -62,12 +36,8 @@
          ]
        },
        "defaultPrompt": {
-          "description": "Starter prompts for the plugin. Capped at 3 entries with a maximum of 128 characters per entry.",
-          "items": {
-            "type": "string"
-          },
          "type": [
-            "array",
+            "string",
            "null"
          ]
        },
@@ -138,16 +108,6 @@
    },
    "PluginMarketplaceEntry": {
      "properties": {
-        "interface": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/MarketplaceInterface"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
        "name": {
          "type": "string"
        },
@@ -194,18 +154,12 @@
    },
    "PluginSummary": {
      "properties": {
-        "authPolicy": {
-          "$ref": "#/definitions/PluginAuthPolicy"
-        },
        "enabled": {
          "type": "boolean"
        },
        "id": {
          "type": "string"
        },
-        "installPolicy": {
-          "$ref": "#/definitions/PluginInstallPolicy"
-        },
        "installed": {
          "type": "boolean"
        },
@@ -227,10 +181,8 @@
        }
      },
      "required": [
-        "authPolicy",
        "enabled",
        "id",
-        "installPolicy",
        "installed",
        "name",
        "source"
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginReadParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginReadParams.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": "PluginReadParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginReadResponse.json
@@ -1,358 +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"
-    },
-    "AppSummary": {
-      "description": "EXPERIMENTAL - app metadata summary for plugin responses.",
-      "properties": {
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "id": {
-          "type": "string"
-        },
-        "installUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "id",
-        "name"
-      ],
-      "type": "object"
-    },
-    "PluginAuthPolicy": {
-      "enum": [
-        "ON_INSTALL",
-        "ON_USE"
-      ],
-      "type": "string"
-    },
-    "PluginDetail": {
-      "properties": {
-        "apps": {
-          "items": {
-            "$ref": "#/definitions/AppSummary"
-          },
-          "type": "array"
-        },
-        "description": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "marketplaceName": {
-          "type": "string"
-        },
-        "marketplacePath": {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        },
-        "mcpServers": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "skills": {
-          "items": {
-            "$ref": "#/definitions/SkillSummary"
-          },
-          "type": "array"
-        },
-        "summary": {
-          "$ref": "#/definitions/PluginSummary"
-        }
-      },
-      "required": [
-        "apps",
-        "marketplaceName",
-        "marketplacePath",
-        "mcpServers",
-        "skills",
-        "summary"
-      ],
-      "type": "object"
-    },
-    "PluginInstallPolicy": {
-      "enum": [
-        "NOT_AVAILABLE",
-        "AVAILABLE",
-        "INSTALLED_BY_DEFAULT"
-      ],
-      "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": {
-          "description": "Starter prompts for the plugin. Capped at 3 entries with a maximum of 128 characters per entry.",
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "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"
-    },
-    "PluginSource": {
-      "oneOf": [
-        {
-          "properties": {
-            "path": {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            "type": {
-              "enum": [
-                "local"
-              ],
-              "title": "LocalPluginSourceType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "path",
-            "type"
-          ],
-          "title": "LocalPluginSource",
-          "type": "object"
-        }
-      ]
-    },
-    "PluginSummary": {
-      "properties": {
-        "authPolicy": {
-          "$ref": "#/definitions/PluginAuthPolicy"
-        },
-        "enabled": {
-          "type": "boolean"
-        },
-        "id": {
-          "type": "string"
-        },
-        "installPolicy": {
-          "$ref": "#/definitions/PluginInstallPolicy"
-        },
-        "installed": {
-          "type": "boolean"
-        },
-        "interface": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/PluginInterface"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "name": {
-          "type": "string"
-        },
-        "source": {
-          "$ref": "#/definitions/PluginSource"
-        }
-      },
-      "required": [
-        "authPolicy",
-        "enabled",
-        "id",
-        "installPolicy",
-        "installed",
-        "name",
-        "source"
-      ],
-      "type": "object"
-    },
-    "SkillInterface": {
-      "properties": {
-        "brandColor": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "defaultPrompt": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "displayName": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "iconLarge": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "iconSmall": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "shortDescription": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "SkillSummary": {
-      "properties": {
-        "description": {
-          "type": "string"
-        },
-        "interface": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/SkillInterface"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "name": {
-          "type": "string"
-        },
-        "path": {
-          "type": "string"
-        },
-        "shortDescription": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "description",
-        "name",
-        "path"
-      ],
-      "type": "object"
-    }
-  },
-  "properties": {
-    "plugin": {
-      "$ref": "#/definitions/PluginDetail"
-    }
-  },
-  "required": [
-    "plugin"
-  ],
-  "title": "PluginReadResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginUninstallParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginUninstallParams.json
@@ -1,10 +1,6 @@
 {
  "$schema": "http://json-schema.org/draft-07/schema#",
  "properties": {
-    "forceRemoteSync": {
-      "description": "When true, apply the remote plugin change before the local uninstall flow.",
-      "type": "boolean"
-    },
    "pluginId": {
      "type": "string"
    }
--- a/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json
@@ -133,6 +133,24 @@
        }
      ]
    },
+    "FunctionCallOutputPayload": {
+      "description": "The payload we send back to OpenAI when reporting a tool call result.\n\n`body` serializes directly as the wire value for `function_call_output.output`. `success` remains internal metadata for downstream handling.",
+      "properties": {
+        "body": {
+          "$ref": "#/definitions/FunctionCallOutputBody"
+        },
+        "success": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        }
+      },
+      "required": [
+        "body"
+      ],
+      "type": "object"
+    },
    "GhostCommit": {
      "description": "Details of a ghost commit created from a repository state.",
      "properties": {
@@ -395,6 +413,10 @@
                "null"
              ]
            },
+            "id": {
+              "type": "string",
+              "writeOnly": true
+            },
            "summary": {
              "items": {
                "$ref": "#/definitions/ReasoningItemReasoningSummary"
@@ -410,6 +432,7 @@
            }
          },
          "required": [
+            "id",
            "summary",
            "type"
          ],
@@ -473,12 +496,6 @@
            "name": {
              "type": "string"
            },
-            "namespace": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "type": {
              "enum": [
                "function_call"
@@ -496,54 +513,13 @@
          "title": "FunctionCallResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "call_id": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "execution": {
-              "type": "string"
-            },
-            "id": {
-              "type": [
-                "string",
-                "null"
-              ],
-              "writeOnly": true
-            },
-            "status": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "tool_search_call"
-              ],
-              "title": "ToolSearchCallResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "execution",
-            "type"
-          ],
-          "title": "ToolSearchCallResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "call_id": {
              "type": "string"
            },
            "output": {
-              "$ref": "#/definitions/FunctionCallOutputBody"
+              "$ref": "#/definitions/FunctionCallOutputPayload"
            },
            "type": {
              "enum": [
@@ -608,7 +584,7 @@
              "type": "string"
            },
            "output": {
-              "$ref": "#/definitions/FunctionCallOutputBody"
+              "$ref": "#/definitions/FunctionCallOutputPayload"
            },
            "type": {
              "enum": [
@@ -626,41 +602,6 @@
          "title": "CustomToolCallOutputResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "call_id": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "execution": {
-              "type": "string"
-            },
-            "status": {
-              "type": "string"
-            },
-            "tools": {
-              "items": true,
-              "type": "array"
-            },
-            "type": {
-              "enum": [
-                "tool_search_output"
-              ],
-              "title": "ToolSearchOutputResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "execution",
-            "status",
-            "tools",
-            "type"
-          ],
-          "title": "ToolSearchOutputResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "action": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
@@ -155,7 +155,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -291,15 +290,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -498,18 +488,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "TextElement": {
      "properties": {
        "byteRange": {
@@ -696,11 +674,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -711,14 +684,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -900,13 +865,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -914,17 +872,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/json/v2/SkillsRemoteReadParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/SkillsRemoteReadParams.json
@@ -0,0 +1,47 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "HazelnutScope": {
+      "enum": [
+        "example",
+        "workspace-shared",
+        "all-shared",
+        "personal"
+      ],
+      "type": "string"
+    },
+    "ProductSurface": {
+      "enum": [
+        "chatgpt",
+        "codex",
+        "api",
+        "atlas"
+      ],
+      "type": "string"
+    }
+  },
+  "properties": {
+    "enabled": {
+      "default": false,
+      "type": "boolean"
+    },
+    "hazelnutScope": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/HazelnutScope"
+        }
+      ],
+      "default": "example"
+    },
+    "productSurface": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/ProductSurface"
+        }
+      ],
+      "default": "codex"
+    }
+  },
+  "title": "SkillsRemoteReadParams",
+  "type": "object"
+}
--- a/codex-rs/app-server-protocol/schema/json/v2/SkillsRemoteReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/SkillsRemoteReadResponse.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "RemoteSkillSummary": {
+      "properties": {
+        "description": {
+          "type": "string"
+        },
+        "id": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "description",
+        "id",
+        "name"
+      ],
+      "type": "object"
+    }
+  },
+  "properties": {
+    "data": {
+      "items": {
+        "$ref": "#/definitions/RemoteSkillSummary"
+      },
+      "type": "array"
+    }
+  },
+  "required": [
+    "data"
+  ],
+  "title": "SkillsRemoteReadResponse",
+  "type": "object"
+}
--- a/codex-rs/app-server-protocol/schema/json/v2/SkillsRemoteWriteParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/SkillsRemoteWriteParams.json
@@ -0,0 +1,13 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "properties": {
+    "hazelnutId": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "hazelnutId"
+  ],
+  "title": "SkillsRemoteWriteParams",
+  "type": "object"
+}
--- a/codex-rs/app-server-protocol/schema/json/v2/SkillsRemoteWriteResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/SkillsRemoteWriteResponse.json
@@ -1,17 +1,17 @@
 {
  "$schema": "http://json-schema.org/draft-07/schema#",
  "properties": {
-    "command": {
+    "id": {
      "type": "string"
    },
-    "threadId": {
+    "path": {
      "type": "string"
    }
  },
  "required": [
-    "command",
-    "threadId"
+    "id",
+    "path"
  ],
-  "title": "ThreadShellCommandParams",
+  "title": "SkillsRemoteWriteResponse",
  "type": "object"
 }
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json
@@ -1,14 +1,6 @@
 {
  "$schema": "http://json-schema.org/draft-07/schema#",
  "definitions": {
-    "ApprovalsReviewer": {
-      "description": "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `guardian_subagent` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request.",
-      "enum": [
-        "user",
-        "guardian_subagent"
-      ],
-      "type": "string"
-    },
    "AskForApproval": {
      "oneOf": [
        {
@@ -23,7 +15,7 @@
        {
          "additionalProperties": false,
          "properties": {
-            "granular": {
+            "reject": {
              "properties": {
                "mcp_elicitations": {
                  "type": "boolean"
@@ -52,9 +44,9 @@
            }
          },
          "required": [
-            "granular"
+            "reject"
          ],
-          "title": "GranularAskForApproval",
+          "title": "RejectAskForApproval",
          "type": "object"
        }
      ]
@@ -87,17 +79,6 @@
        }
      ]
    },
-    "approvalsReviewer": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ApprovalsReviewer"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "description": "Override where approval requests are routed for review on this thread and subsequent turns."
-    },
    "baseInstructions": {
      "type": [
        "string",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
@@ -5,14 +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"
    },
-    "ApprovalsReviewer": {
-      "description": "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `guardian_subagent` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request.",
-      "enum": [
-        "user",
-        "guardian_subagent"
-      ],
-      "type": "string"
-    },
    "AskForApproval": {
      "oneOf": [
        {
@@ -27,7 +19,7 @@
        {
          "additionalProperties": false,
          "properties": {
-            "granular": {
+            "reject": {
              "properties": {
                "mcp_elicitations": {
                  "type": "boolean"
@@ -56,9 +48,9 @@
            }
          },
          "required": [
-            "granular"
+            "reject"
          ],
-          "title": "GranularAskForApproval",
+          "title": "RejectAskForApproval",
          "type": "object"
        }
      ]
@@ -217,7 +209,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -353,15 +344,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -1176,11 +1158,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -1191,14 +1168,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -1380,13 +1349,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -1394,17 +1356,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
@@ -1986,14 +1937,6 @@
    "approvalPolicy": {
      "$ref": "#/definitions/AskForApproval"
    },
-    "approvalsReviewer": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/ApprovalsReviewer"
-        }
-      ],
-      "description": "Reviewer currently used for approval requests on this thread."
-    },
    "cwd": {
      "type": "string"
    },
@@ -2032,7 +1975,6 @@
  },
  "required": [
    "approvalPolicy",
-    "approvalsReviewer",
    "cwd",
    "model",
    "modelProvider",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
@@ -155,7 +155,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -291,15 +290,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -521,18 +511,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "SessionSource": {
      "oneOf": [
        {
@@ -934,11 +912,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -949,14 +922,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -1138,13 +1103,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -1152,17 +1110,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
@@ -155,7 +155,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -291,15 +290,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -521,18 +511,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "SessionSource": {
      "oneOf": [
        {
@@ -934,11 +912,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -949,14 +922,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -1138,13 +1103,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -1152,17 +1110,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
@@ -155,7 +155,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -291,15 +290,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -521,18 +511,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "SessionSource": {
      "oneOf": [
        {
@@ -934,11 +912,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -949,14 +922,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -1138,13 +1103,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -1152,17 +1110,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeOutputAudioDeltaNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeOutputAudioDeltaNotification.json
@@ -7,12 +7,6 @@
        "data": {
          "type": "string"
        },
-        "itemId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
        "numChannels": {
          "format": "uint16",
          "minimum": 0.0,
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRealtimeStartedNotification.json
@@ -1,14 +1,5 @@
 {
  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "RealtimeConversationVersion": {
-      "enum": [
-        "v1",
-        "v2"
-      ],
-      "type": "string"
-    }
-  },
  "description": "EXPERIMENTAL - emitted when thread realtime startup is accepted.",
  "properties": {
    "sessionId": {
@@ -19,14 +10,10 @@
    },
    "threadId": {
      "type": "string"
-    },
-    "version": {
-      "$ref": "#/definitions/RealtimeConversationVersion"
    }
  },
  "required": [
-    "threadId",
-    "version"
+    "threadId"
  ],
  "title": "ThreadRealtimeStartedNotification",
  "type": "object"
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json
@@ -1,14 +1,6 @@
 {
  "$schema": "http://json-schema.org/draft-07/schema#",
  "definitions": {
-    "ApprovalsReviewer": {
-      "description": "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `guardian_subagent` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request.",
-      "enum": [
-        "user",
-        "guardian_subagent"
-      ],
-      "type": "string"
-    },
    "AskForApproval": {
      "oneOf": [
        {
@@ -23,7 +15,7 @@
        {
          "additionalProperties": false,
          "properties": {
-            "granular": {
+            "reject": {
              "properties": {
                "mcp_elicitations": {
                  "type": "boolean"
@@ -52,9 +44,9 @@
            }
          },
          "required": [
-            "granular"
+            "reject"
          ],
-          "title": "GranularAskForApproval",
+          "title": "RejectAskForApproval",
          "type": "object"
        }
      ]
@@ -191,6 +183,24 @@
        }
      ]
    },
+    "FunctionCallOutputPayload": {
+      "description": "The payload we send back to OpenAI when reporting a tool call result.\n\n`body` serializes directly as the wire value for `function_call_output.output`. `success` remains internal metadata for downstream handling.",
+      "properties": {
+        "body": {
+          "$ref": "#/definitions/FunctionCallOutputBody"
+        },
+        "success": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        }
+      },
+      "required": [
+        "body"
+      ],
+      "type": "object"
+    },
    "GhostCommit": {
      "description": "Details of a ghost commit created from a repository state.",
      "properties": {
@@ -461,6 +471,10 @@
                "null"
              ]
            },
+            "id": {
+              "type": "string",
+              "writeOnly": true
+            },
            "summary": {
              "items": {
                "$ref": "#/definitions/ReasoningItemReasoningSummary"
@@ -476,6 +490,7 @@
            }
          },
          "required": [
+            "id",
            "summary",
            "type"
          ],
@@ -539,12 +554,6 @@
            "name": {
              "type": "string"
            },
-            "namespace": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "type": {
              "enum": [
                "function_call"
@@ -562,54 +571,13 @@
          "title": "FunctionCallResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "arguments": true,
-            "call_id": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "execution": {
-              "type": "string"
-            },
-            "id": {
-              "type": [
-                "string",
-                "null"
-              ],
-              "writeOnly": true
-            },
-            "status": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "tool_search_call"
-              ],
-              "title": "ToolSearchCallResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "arguments",
-            "execution",
-            "type"
-          ],
-          "title": "ToolSearchCallResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "call_id": {
              "type": "string"
            },
            "output": {
-              "$ref": "#/definitions/FunctionCallOutputBody"
+              "$ref": "#/definitions/FunctionCallOutputPayload"
            },
            "type": {
              "enum": [
@@ -674,7 +642,7 @@
              "type": "string"
            },
            "output": {
-              "$ref": "#/definitions/FunctionCallOutputBody"
+              "$ref": "#/definitions/FunctionCallOutputPayload"
            },
            "type": {
              "enum": [
@@ -692,41 +660,6 @@
          "title": "CustomToolCallOutputResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "call_id": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "execution": {
-              "type": "string"
-            },
-            "status": {
-              "type": "string"
-            },
-            "tools": {
-              "items": true,
-              "type": "array"
-            },
-            "type": {
-              "enum": [
-                "tool_search_output"
-              ],
-              "title": "ToolSearchOutputResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "execution",
-            "status",
-            "tools",
-            "type"
-          ],
-          "title": "ToolSearchOutputResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "action": {
@@ -987,17 +920,6 @@
        }
      ]
    },
-    "approvalsReviewer": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ApprovalsReviewer"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "description": "Override where approval requests are routed for review on this thread and subsequent turns."
-    },
    "baseInstructions": {
      "type": [
        "string",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
@@ -5,14 +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"
    },
-    "ApprovalsReviewer": {
-      "description": "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `guardian_subagent` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request.",
-      "enum": [
-        "user",
-        "guardian_subagent"
-      ],
-      "type": "string"
-    },
    "AskForApproval": {
      "oneOf": [
        {
@@ -27,7 +19,7 @@
        {
          "additionalProperties": false,
          "properties": {
-            "granular": {
+            "reject": {
              "properties": {
                "mcp_elicitations": {
                  "type": "boolean"
@@ -56,9 +48,9 @@
            }
          },
          "required": [
-            "granular"
+            "reject"
          ],
-          "title": "GranularAskForApproval",
+          "title": "RejectAskForApproval",
          "type": "object"
        }
      ]
@@ -217,7 +209,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -353,15 +344,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -1176,11 +1158,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -1191,14 +1168,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -1380,13 +1349,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -1394,17 +1356,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
@@ -1986,14 +1937,6 @@
    "approvalPolicy": {
      "$ref": "#/definitions/AskForApproval"
    },
-    "approvalsReviewer": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/ApprovalsReviewer"
-        }
-      ],
-      "description": "Reviewer currently used for approval requests on this thread."
-    },
    "cwd": {
      "type": "string"
    },
@@ -2032,7 +1975,6 @@
  },
  "required": [
    "approvalPolicy",
-    "approvalsReviewer",
    "cwd",
    "model",
    "modelProvider",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json
@@ -155,7 +155,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -291,15 +290,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -521,18 +511,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "SessionSource": {
      "oneOf": [
        {
@@ -934,11 +912,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -949,14 +922,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -1138,13 +1103,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -1152,17 +1110,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadShellCommandResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadShellCommandResponse.json
@@ -1,5 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "ThreadShellCommandResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json
@@ -1,14 +1,6 @@
 {
  "$schema": "http://json-schema.org/draft-07/schema#",
  "definitions": {
-    "ApprovalsReviewer": {
-      "description": "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `guardian_subagent` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request.",
-      "enum": [
-        "user",
-        "guardian_subagent"
-      ],
-      "type": "string"
-    },
    "AskForApproval": {
      "oneOf": [
        {
@@ -23,7 +15,7 @@
        {
          "additionalProperties": false,
          "properties": {
-            "granular": {
+            "reject": {
              "properties": {
                "mcp_elicitations": {
                  "type": "boolean"
@@ -52,18 +44,15 @@
            }
          },
          "required": [
-            "granular"
+            "reject"
          ],
-          "title": "GranularAskForApproval",
+          "title": "RejectAskForApproval",
          "type": "object"
        }
      ]
    },
    "DynamicToolSpec": {
      "properties": {
-        "deferLoading": {
-          "type": "boolean"
-        },
        "description": {
          "type": "string"
        },
@@ -114,17 +103,6 @@
        }
      ]
    },
-    "approvalsReviewer": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ApprovalsReviewer"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "description": "Override where approval requests are routed for review on this thread and subsequent turns."
-    },
    "baseInstructions": {
      "type": [
        "string",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
@@ -5,14 +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"
    },
-    "ApprovalsReviewer": {
-      "description": "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `guardian_subagent` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request.",
-      "enum": [
-        "user",
-        "guardian_subagent"
-      ],
-      "type": "string"
-    },
    "AskForApproval": {
      "oneOf": [
        {
@@ -27,7 +19,7 @@
        {
          "additionalProperties": false,
          "properties": {
-            "granular": {
+            "reject": {
              "properties": {
                "mcp_elicitations": {
                  "type": "boolean"
@@ -56,9 +48,9 @@
            }
          },
          "required": [
-            "granular"
+            "reject"
          ],
-          "title": "GranularAskForApproval",
+          "title": "RejectAskForApproval",
          "type": "object"
        }
      ]
@@ -217,7 +209,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -353,15 +344,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -1176,11 +1158,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -1191,14 +1168,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -1380,13 +1349,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -1394,17 +1356,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
@@ -1986,14 +1937,6 @@
    "approvalPolicy": {
      "$ref": "#/definitions/AskForApproval"
    },
-    "approvalsReviewer": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/ApprovalsReviewer"
-        }
-      ],
-      "description": "Reviewer currently used for approval requests on this thread."
-    },
    "cwd": {
      "type": "string"
    },
@@ -2032,7 +1975,6 @@
  },
  "required": [
    "approvalPolicy",
-    "approvalsReviewer",
    "cwd",
    "model",
    "modelProvider",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
@@ -155,7 +155,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -291,15 +290,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -521,18 +511,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "SessionSource": {
      "oneOf": [
        {
@@ -934,11 +912,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -949,14 +922,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -1138,13 +1103,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -1152,17 +1110,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
@@ -155,7 +155,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -291,15 +290,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -521,18 +511,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "SessionSource": {
      "oneOf": [
        {
@@ -934,11 +912,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -949,14 +922,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -1138,13 +1103,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -1152,17 +1110,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
@@ -155,7 +155,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -291,15 +290,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -498,18 +488,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "TextElement": {
      "properties": {
        "byteRange": {
@@ -696,11 +674,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -711,14 +684,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -900,13 +865,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -914,17 +872,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json
@@ -5,14 +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"
    },
-    "ApprovalsReviewer": {
-      "description": "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `guardian_subagent` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request.",
-      "enum": [
-        "user",
-        "guardian_subagent"
-      ],
-      "type": "string"
-    },
    "AskForApproval": {
      "oneOf": [
        {
@@ -27,7 +19,7 @@
        {
          "additionalProperties": false,
          "properties": {
-            "granular": {
+            "reject": {
              "properties": {
                "mcp_elicitations": {
                  "type": "boolean"
@@ -56,9 +48,9 @@
            }
          },
          "required": [
-            "granular"
+            "reject"
          ],
-          "title": "GranularAskForApproval",
+          "title": "RejectAskForApproval",
          "type": "object"
        }
      ]
@@ -510,17 +502,6 @@
      ],
      "description": "Override the approval policy for this turn and subsequent turns."
    },
-    "approvalsReviewer": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ApprovalsReviewer"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "description": "Override where approval requests are routed for review on this turn and subsequent turns."
-    },
    "cwd": {
      "description": "Override the working directory for this turn and subsequent turns.",
      "type": [
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
@@ -155,7 +155,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -291,15 +290,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -498,18 +488,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "TextElement": {
      "properties": {
        "byteRange": {
@@ -696,11 +674,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -711,14 +684,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -900,13 +865,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -914,17 +872,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
@@ -155,7 +155,6 @@
      "enum": [
        "pendingInit",
        "running",
-        "interrupted",
        "completed",
        "errored",
        "shutdown",
@@ -291,15 +290,6 @@
        }
      ]
    },
-    "CommandExecutionSource": {
-      "enum": [
-        "agent",
-        "userShell",
-        "unifiedExecStartup",
-        "unifiedExecInteraction"
-      ],
-      "type": "string"
-    },
    "CommandExecutionStatus": {
      "enum": [
        "inProgress",
@@ -498,18 +488,6 @@
        }
      ]
    },
-    "ReasoningEffort": {
-      "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
-      "enum": [
-        "none",
-        "minimal",
-        "low",
-        "medium",
-        "high",
-        "xhigh"
-      ],
-      "type": "string"
-    },
    "TextElement": {
      "properties": {
        "byteRange": {
@@ -696,11 +674,6 @@
                "null"
              ]
            },
-            "formattedOutput": {
-              "default": "",
-              "description": "The command's output after applying the model-facing formatter/truncation policy.",
-              "type": "string"
-            },
            "id": {
              "type": "string"
            },
@@ -711,14 +684,6 @@
                "null"
              ]
            },
-            "source": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/CommandExecutionSource"
-                }
-              ],
-              "default": "agent"
-            },
            "status": {
              "$ref": "#/definitions/CommandExecutionStatus"
            },
@@ -900,13 +865,6 @@
              "description": "Unique identifier for this collab tool call.",
              "type": "string"
            },
-            "model": {
-              "description": "Model requested for the spawned agent, when applicable.",
-              "type": [
-                "string",
-                "null"
-              ]
-            },
            "prompt": {
              "description": "Prompt text sent as part of the collab tool call, when available.",
              "type": [
@@ -914,17 +872,6 @@
                "null"
              ]
            },
-            "reasoningEffort": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ReasoningEffort"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Reasoning effort requested for the spawned agent, when applicable."
-            },
            "receiverThreadIds": {
              "description": "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
              "items": {
--- a/codex-rs/app-server-protocol/schema/typescript/AgentMessageContent.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AgentMessageContent.ts
@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AgentMessageContent = { "type": "Text", text: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/AgentMessageContentDeltaEvent.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AgentMessageContentDeltaEvent.ts
@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AgentMessageContentDeltaEvent = { thread_id: string, turn_id: string, item_id: string, delta: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadShellCommandResponse.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadShellCommandResponse.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 ThreadShellCommandResponse = Record<string, never>;
+export type AgentMessageDeltaEvent = { delta: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/AgentMessageEvent.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AgentMessageEvent.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 { MessagePhase } from "./MessagePhase";
+
+export type AgentMessageEvent = { message: string, phase: MessagePhase | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/AgentMessageItem.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AgentMessageItem.ts
@@ -0,0 +1,21 @@
+// 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 { AgentMessageContent } from "./AgentMessageContent";
+import type { MessagePhase } from "./MessagePhase";
+
+/**
+ * Assistant-authored message payload used in turn-item streams.
+ *
+ * `phase` is optional because not all providers/models emit it. Consumers
+ * should use it when present, but retain legacy completion semantics when it
+ * is `None`.
+ */
+export type AgentMessageItem = { id: string, content: Array<AgentMessageContent>, 
+/**
+ * Optional phase metadata carried through from `ResponseItem::Message`.
+ *
+ * This is currently used by TUI rendering to distinguish mid-turn
+ * commentary from a final answer and avoid status-indicator jitter.
+ */
+phase?: MessagePhase, };
--- a/codex-rs/app-server-protocol/schema/typescript/AgentReasoningDeltaEvent.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AgentReasoningDeltaEvent.ts
@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AgentReasoningDeltaEvent = { delta: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/RealtimeConversationVersion.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/RealtimeConversationVersion.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 RealtimeConversationVersion = "v1" | "v2";
+export type AgentReasoningEvent = { text: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/AgentReasoningRawContentDeltaEvent.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AgentReasoningRawContentDeltaEvent.ts
@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AgentReasoningRawContentDeltaEvent = { delta: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/AgentReasoningRawContentEvent.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AgentReasoningRawContentEvent.ts
@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AgentReasoningRawContentEvent = { text: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/AgentReasoningSectionBreakEvent.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AgentReasoningSectionBreakEvent.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 PluginInstallPolicy = "NOT_AVAILABLE" | "AVAILABLE" | "INSTALLED_BY_DEFAULT";
+export type AgentReasoningSectionBreakEvent = { item_id: string, summary_index: bigint, };
--- a/codex-rs/app-server-protocol/schema/typescript/AgentStatus.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AgentStatus.ts
@@ -0,0 +1,8 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+/**
+ * Agent lifecycle status, derived from emitted events.
+ */
+export type AgentStatus = "pending_init" | "running" | { "completed": string | null } | { "errored": string } | "shutdown" | "not_found";
--- a/codex-rs/app-server-protocol/schema/typescript/ApplyPatchApprovalRequestEvent.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/ApplyPatchApprovalRequestEvent.ts
@@ -0,0 +1,23 @@
+// 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 { FileChange } from "./FileChange";
+
+export type ApplyPatchApprovalRequestEvent = { 
+/**
+ * Responses API call id for the associated patch apply call, if available.
+ */
+call_id: string, 
+/**
+ * Turn ID that this patch belongs to.
+ * Uses `#[serde(default)]` for backwards compatibility with older senders.
+ */
+turn_id: string, changes: { [key in string]?: FileChange }, 
+/**
+ * Optional explanatory reason (e.g. request for extra write access).
+ */
+reason: string | null, 
+/**
+ * When set, the agent is asking the user to allow writes under this root for the remainder of the session.
+ */
+grant_root: string | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/AskForApproval.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/AskForApproval.ts
@@ -0,0 +1,10 @@
+// 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 { RejectConfig } from "./RejectConfig";
+
+/**
+ * Determines the conditions under which the user is consulted to approve
+ * running the command proposed by Codex.
+ */
+export type AskForApproval = "untrusted" | "on-failure" | "on-request" | { "reject": RejectConfig } | "never";
--- a/codex-rs/app-server-protocol/schema/typescript/BackgroundEventEvent.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/BackgroundEventEvent.ts
@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type BackgroundEventEvent = { message: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/ByteRange.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/ByteRange.ts
@@ -0,0 +1,13 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ByteRange = { 
+/**
+ * Start byte offset (inclusive) within the UTF-8 text buffer.
+ */
+start: number, 
+/**
+ * End byte offset (exclusive) within the UTF-8 text buffer.
+ */
+end: number, };
--- a/codex-rs/app-server-protocol/schema/typescript/CallToolResult.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/CallToolResult.ts
@@ -0,0 +1,9 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { JsonValue } from "./serde_json/JsonValue";
+
+/**
+ * The server's response to a tool call.
+ */
+export type CallToolResult = { content: Array<JsonValue>, structuredContent?: JsonValue, isError?: boolean, _meta?: JsonValue, };
--- a/codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts
@@ -20,13 +20,6 @@ import type { ExperimentalFeatureListParams } from "./v2/ExperimentalFeatureList
 import type { ExternalAgentConfigDetectParams } from "./v2/ExternalAgentConfigDetectParams";
 import type { ExternalAgentConfigImportParams } from "./v2/ExternalAgentConfigImportParams";
 import type { FeedbackUploadParams } from "./v2/FeedbackUploadParams";
-import type { FsCopyParams } from "./v2/FsCopyParams";
-import type { FsCreateDirectoryParams } from "./v2/FsCreateDirectoryParams";
-import type { FsGetMetadataParams } from "./v2/FsGetMetadataParams";
-import type { FsReadDirectoryParams } from "./v2/FsReadDirectoryParams";
-import type { FsReadFileParams } from "./v2/FsReadFileParams";
-import type { FsRemoveParams } from "./v2/FsRemoveParams";
-import type { FsWriteFileParams } from "./v2/FsWriteFileParams";
 import type { GetAccountParams } from "./v2/GetAccountParams";
 import type { ListMcpServerStatusParams } from "./v2/ListMcpServerStatusParams";
 import type { LoginAccountParams } from "./v2/LoginAccountParams";
@@ -34,11 +27,12 @@ import type { McpServerOauthLoginParams } from "./v2/McpServerOauthLoginParams";
 import type { ModelListParams } from "./v2/ModelListParams";
 import type { PluginInstallParams } from "./v2/PluginInstallParams";
 import type { PluginListParams } from "./v2/PluginListParams";
-import type { PluginReadParams } from "./v2/PluginReadParams";
 import type { PluginUninstallParams } from "./v2/PluginUninstallParams";
 import type { ReviewStartParams } from "./v2/ReviewStartParams";
 import type { SkillsConfigWriteParams } from "./v2/SkillsConfigWriteParams";
 import type { SkillsListParams } from "./v2/SkillsListParams";
+import type { SkillsRemoteReadParams } from "./v2/SkillsRemoteReadParams";
+import type { SkillsRemoteWriteParams } from "./v2/SkillsRemoteWriteParams";
 import type { ThreadArchiveParams } from "./v2/ThreadArchiveParams";
 import type { ThreadCompactStartParams } from "./v2/ThreadCompactStartParams";
 import type { ThreadForkParams } from "./v2/ThreadForkParams";
@@ -49,7 +43,6 @@ import type { ThreadReadParams } from "./v2/ThreadReadParams";
 import type { ThreadResumeParams } from "./v2/ThreadResumeParams";
 import type { ThreadRollbackParams } from "./v2/ThreadRollbackParams";
 import type { ThreadSetNameParams } from "./v2/ThreadSetNameParams";
-import type { ThreadShellCommandParams } from "./v2/ThreadShellCommandParams";
 import type { ThreadStartParams } from "./v2/ThreadStartParams";
 import type { ThreadUnarchiveParams } from "./v2/ThreadUnarchiveParams";
 import type { ThreadUnsubscribeParams } from "./v2/ThreadUnsubscribeParams";
@@ -61,4 +54,4 @@ import type { WindowsSandboxSetupStartParams } from "./v2/WindowsSandboxSetupSta
 /**
 * Request from the client to the server.
 */
-export type ClientRequest ={ "method": "initialize", id: RequestId, params: InitializeParams, } | { "method": "thread/start", id: RequestId, params: ThreadStartParams, } | { "method": "thread/resume", id: RequestId, params: ThreadResumeParams, } | { "method": "thread/fork", id: RequestId, params: ThreadForkParams, } | { "method": "thread/archive", id: RequestId, params: ThreadArchiveParams, } | { "method": "thread/unsubscribe", id: RequestId, params: ThreadUnsubscribeParams, } | { "method": "thread/name/set", id: RequestId, params: ThreadSetNameParams, } | { "method": "thread/metadata/update", id: RequestId, params: ThreadMetadataUpdateParams, } | { "method": "thread/unarchive", id: RequestId, params: ThreadUnarchiveParams, } | { "method": "thread/compact/start", id: RequestId, params: ThreadCompactStartParams, } | { "method": "thread/shellCommand", id: RequestId, params: ThreadShellCommandParams, } | { "method": "thread/rollback", id: RequestId, params: ThreadRollbackParams, } | { "method": "thread/list", id: RequestId, params: ThreadListParams, } | { "method": "thread/loaded/list", id: RequestId, params: ThreadLoadedListParams, } | { "method": "thread/read", id: RequestId, params: ThreadReadParams, } | { "method": "skills/list", id: RequestId, params: SkillsListParams, } | { "method": "plugin/list", id: RequestId, params: PluginListParams, } | { "method": "plugin/read", id: RequestId, params: PluginReadParams, } | { "method": "app/list", id: RequestId, params: AppsListParams, } | { "method": "fs/readFile", id: RequestId, params: FsReadFileParams, } | { "method": "fs/writeFile", id: RequestId, params: FsWriteFileParams, } | { "method": "fs/createDirectory", id: RequestId, params: FsCreateDirectoryParams, } | { "method": "fs/getMetadata", id: RequestId, params: FsGetMetadataParams, } | { "method": "fs/readDirectory", id: RequestId, params: FsReadDirectoryParams, } | { "method": "fs/remove", id: RequestId, params: FsRemoveParams, } | { "method": "fs/copy", id: RequestId, params: FsCopyParams, } | { "method": "skills/config/write", id: RequestId, params: SkillsConfigWriteParams, } | { "method": "plugin/install", id: RequestId, params: PluginInstallParams, } | { "method": "plugin/uninstall", id: RequestId, params: PluginUninstallParams, } | { "method": "turn/start", id: RequestId, params: TurnStartParams, } | { "method": "turn/steer", id: RequestId, params: TurnSteerParams, } | { "method": "turn/interrupt", id: RequestId, params: TurnInterruptParams, } | { "method": "review/start", id: RequestId, params: ReviewStartParams, } | { "method": "model/list", id: RequestId, params: ModelListParams, } | { "method": "experimentalFeature/list", id: RequestId, params: ExperimentalFeatureListParams, } | { "method": "mcpServer/oauth/login", id: RequestId, params: McpServerOauthLoginParams, } | { "method": "config/mcpServer/reload", id: RequestId, params: undefined, } | { "method": "mcpServerStatus/list", id: RequestId, params: ListMcpServerStatusParams, } | { "method": "windowsSandbox/setupStart", id: RequestId, params: WindowsSandboxSetupStartParams, } | { "method": "account/login/start", id: RequestId, params: LoginAccountParams, } | { "method": "account/login/cancel", id: RequestId, params: CancelLoginAccountParams, } | { "method": "account/logout", id: RequestId, params: undefined, } | { "method": "account/rateLimits/read", id: RequestId, params: undefined, } | { "method": "feedback/upload", id: RequestId, params: FeedbackUploadParams, } | { "method": "command/exec", id: RequestId, params: CommandExecParams, } | { "method": "command/exec/write", id: RequestId, params: CommandExecWriteParams, } | { "method": "command/exec/terminate", id: RequestId, params: CommandExecTerminateParams, } | { "method": "command/exec/resize", id: RequestId, params: CommandExecResizeParams, } | { "method": "config/read", id: RequestId, params: ConfigReadParams, } | { "method": "externalAgentConfig/detect", id: RequestId, params: ExternalAgentConfigDetectParams, } | { "method": "externalAgentConfig/import", id: RequestId, params: ExternalAgentConfigImportParams, } | { "method": "config/value/write", id: RequestId, params: ConfigValueWriteParams, } | { "method": "config/batchWrite", id: RequestId, params: ConfigBatchWriteParams, } | { "method": "configRequirements/read", id: RequestId, params: undefined, } | { "method": "account/read", id: RequestId, params: GetAccountParams, } | { "method": "getConversationSummary", id: RequestId, params: GetConversationSummaryParams, } | { "method": "gitDiffToRemote", id: RequestId, params: GitDiffToRemoteParams, } | { "method": "getAuthStatus", id: RequestId, params: GetAuthStatusParams, } | { "method": "fuzzyFileSearch", id: RequestId, params: FuzzyFileSearchParams, };
+export type ClientRequest ={ "method": "initialize", id: RequestId, params: InitializeParams, } | { "method": "thread/start", id: RequestId, params: ThreadStartParams, } | { "method": "thread/resume", id: RequestId, params: ThreadResumeParams, } | { "method": "thread/fork", id: RequestId, params: ThreadForkParams, } | { "method": "thread/archive", id: RequestId, params: ThreadArchiveParams, } | { "method": "thread/unsubscribe", id: RequestId, params: ThreadUnsubscribeParams, } | { "method": "thread/name/set", id: RequestId, params: ThreadSetNameParams, } | { "method": "thread/metadata/update", id: RequestId, params: ThreadMetadataUpdateParams, } | { "method": "thread/unarchive", id: RequestId, params: ThreadUnarchiveParams, } | { "method": "thread/compact/start", id: RequestId, params: ThreadCompactStartParams, } | { "method": "thread/rollback", id: RequestId, params: ThreadRollbackParams, } | { "method": "thread/list", id: RequestId, params: ThreadListParams, } | { "method": "thread/loaded/list", id: RequestId, params: ThreadLoadedListParams, } | { "method": "thread/read", id: RequestId, params: ThreadReadParams, } | { "method": "skills/list", id: RequestId, params: SkillsListParams, } | { "method": "plugin/list", id: RequestId, params: PluginListParams, } | { "method": "skills/remote/list", id: RequestId, params: SkillsRemoteReadParams, } | { "method": "skills/remote/export", id: RequestId, params: SkillsRemoteWriteParams, } | { "method": "app/list", id: RequestId, params: AppsListParams, } | { "method": "skills/config/write", id: RequestId, params: SkillsConfigWriteParams, } | { "method": "plugin/install", id: RequestId, params: PluginInstallParams, } | { "method": "plugin/uninstall", id: RequestId, params: PluginUninstallParams, } | { "method": "turn/start", id: RequestId, params: TurnStartParams, } | { "method": "turn/steer", id: RequestId, params: TurnSteerParams, } | { "method": "turn/interrupt", id: RequestId, params: TurnInterruptParams, } | { "method": "review/start", id: RequestId, params: ReviewStartParams, } | { "method": "model/list", id: RequestId, params: ModelListParams, } | { "method": "experimentalFeature/list", id: RequestId, params: ExperimentalFeatureListParams, } | { "method": "mcpServer/oauth/login", id: RequestId, params: McpServerOauthLoginParams, } | { "method": "config/mcpServer/reload", id: RequestId, params: undefined, } | { "method": "mcpServerStatus/list", id: RequestId, params: ListMcpServerStatusParams, } | { "method": "windowsSandbox/setupStart", id: RequestId, params: WindowsSandboxSetupStartParams, } | { "method": "account/login/start", id: RequestId, params: LoginAccountParams, } | { "method": "account/login/cancel", id: RequestId, params: CancelLoginAccountParams, } | { "method": "account/logout", id: RequestId, params: undefined, } | { "method": "account/rateLimits/read", id: RequestId, params: undefined, } | { "method": "feedback/upload", id: RequestId, params: FeedbackUploadParams, } | { "method": "command/exec", id: RequestId, params: CommandExecParams, } | { "method": "command/exec/write", id: RequestId, params: CommandExecWriteParams, } | { "method": "command/exec/terminate", id: RequestId, params: CommandExecTerminateParams, } | { "method": "command/exec/resize", id: RequestId, params: CommandExecResizeParams, } | { "method": "config/read", id: RequestId, params: ConfigReadParams, } | { "method": "externalAgentConfig/detect", id: RequestId, params: ExternalAgentConfigDetectParams, } | { "method": "externalAgentConfig/import", id: RequestId, params: ExternalAgentConfigImportParams, } | { "method": "config/value/write", id: RequestId, params: ConfigValueWriteParams, } | { "method": "config/batchWrite", id: RequestId, params: ConfigBatchWriteParams, } | { "method": "configRequirements/read", id: RequestId, params: undefined, } | { "method": "account/read", id: RequestId, params: GetAccountParams, } | { "method": "getConversationSummary", id: RequestId, params: GetConversationSummaryParams, } | { "method": "gitDiffToRemote", id: RequestId, params: GitDiffToRemoteParams, } | { "method": "getAuthStatus", id: RequestId, params: GetAuthStatusParams, } | { "method": "fuzzyFileSearch", id: RequestId, params: FuzzyFileSearchParams, };
--- a/codex-rs/app-server-protocol/schema/typescript/CodexErrorInfo.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/CodexErrorInfo.ts
@@ -0,0 +1,8 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+/**
+ * Codex errors that we expose to clients.
+ */
+export type CodexErrorInfo = "context_window_exceeded" | "usage_limit_exceeded" | "server_overloaded" | { "http_connection_failed": { http_status_code: number | null, } } | { "response_stream_connection_failed": { http_status_code: number | null, } } | "internal_server_error" | "unauthorized" | "bad_request" | "sandbox_error" | { "response_stream_disconnected": { http_status_code: number | null, } } | { "response_too_many_failed_attempts": { http_status_code: number | null, } } | "thread_rollback_failed" | "other";
--- a/codex-rs/app-server-protocol/schema/typescript/CollabAgentInteractionBeginEvent.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/CollabAgentInteractionBeginEvent.ts
@@ -0,0 +1,23 @@
+// 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 CollabAgentInteractionBeginEvent = { 
+/**
+ * Identifier for the collab tool call.
+ */
+call_id: string, 
+/**
+ * Thread ID of the sender.
+ */
+sender_thread_id: ThreadId, 
+/**
+ * Thread ID of the receiver.
+ */
+receiver_thread_id: ThreadId, 
+/**
+ * Prompt sent from the sender to the receiver. Can be empty to prevent CoT
+ * leaking at the beginning.
+ */
+prompt: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/CollabAgentInteractionEndEvent.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/CollabAgentInteractionEndEvent.ts
@@ -0,0 +1,36 @@
+// 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 { AgentStatus } from "./AgentStatus";
+import type { ThreadId } from "./ThreadId";
+
+export type CollabAgentInteractionEndEvent = { 
+/**
+ * Identifier for the collab tool call.
+ */
+call_id: string, 
+/**
+ * Thread ID of the sender.
+ */
+sender_thread_id: ThreadId, 
+/**
+ * Thread ID of the receiver.
+ */
+receiver_thread_id: ThreadId, 
+/**
+ * Optional nickname assigned to the receiver agent.
+ */
+receiver_agent_nickname?: string | null, 
+/**
+ * Optional role assigned to the receiver agent.
+ */
+receiver_agent_role?: string | null, 
+/**
+ * Prompt sent from the sender to the receiver. Can be empty to prevent CoT
+ * leaking at the beginning.
+ */
+prompt: string, 
+/**
+ * Last known status of the receiver agent reported to the sender agent.
+ */
+status: AgentStatus, };
--- a/codex-rs/app-server-protocol/schema/typescript/CollabAgentRef.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/CollabAgentRef.ts
@@ -0,0 +1,18 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ThreadId } from "./ThreadId";
+
+export type CollabAgentRef = { 
+/**
+ * Thread ID of the receiver/new agent.
+ */
+thread_id: ThreadId, 
+/**
+ * Optional nickname assigned to an AgentControl-spawned sub-agent.
+ */
+agent_nickname?: string | null, 
+/**
+ * Optional role (agent_role) assigned to an AgentControl-spawned sub-agent.
+ */
+agent_role?: string | null, };
--- a/Show More
+++ b/Show More