feat: annotate experimental fields in app server protocol

.bazelrc

@@ -15,8 +15,8 @@ common --experimental_platform_in_output_dir
 common --noenable_runfiles
 
 common --enable_platform_specific_config
-common:linux --host_platform=//:local_linux
-common:windows --host_platform=//:local_windows
+# TODO(zbarsky): We need to untangle these libc constraints to get linux remote builds working.
+common:linux --host_platform=//:local
 common --@rules_cc//cc/toolchains/args/archiver_flags:use_libtool_on_macos=False
 common --@toolchains_llvm_bootstrapped//config:experimental_stub_libgcc_s
 
@@ -28,14 +28,7 @@ common:windows --@rules_rust//rust/settings:experimental_use_sh_toolchain_for_bo
 
 common --incompatible_strict_action_env
 # Not ideal, but We need to allow dotslash to be found
-common:linux --test_env=PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
-common:macos --test_env=PATH=/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
-
-# Pass through some env vars Windows needs to use powershell?
-common:windows --test_env=PATH
-common:windows --test_env=SYSTEMROOT
-common:windows --test_env=COMSPEC
-common:windows --test_env=WINDIR
+common --test_env=PATH=/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
 
 common --test_output=errors
 common --bes_results_url=https://app.buildbuddy.io/invocation/

.github/ISSUE_TEMPLATE/1-codex-app.yml

@@ -1,47 +0,0 @@
-name: 🖥️ Codex App Bug
-description: Report an issue with the Codex App
-labels:
-  - app
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Before submitting a new issue, please search for existing issues to see if your issue has already been reported.
-        If it has, please add a 👍 reaction (no need to leave a comment) to the existing issue instead of creating a new one.
-
-  - type: input
-    id: version
-    attributes:
-      label: What version of the Codex App are you using (From “About Codex” dialog)?
-    validations:
-      required: true
-  - type: input
-    id: plan
-    attributes:
-      label: What subscription do you have?
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      label: What issue are you seeing?
-      description: Please include the full error messages and prompts with PII redacted. If possible, please provide text instead of a screenshot.
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: What steps can reproduce the bug?
-      description: Explain the bug and provide a code snippet that can reproduce it. Please include session id, token limit usage, context window usage if applicable.
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: What is the expected behavior?
-      description: If possible, please provide text instead of a screenshot.
-  - type: textarea
-    id: notes
-    attributes:
-      label: Additional information
-      description: Is there anything else you think we should know?

.github/ISSUE_TEMPLATE/2-bug-report.yml

@@ -1,5 +1,5 @@
-name: 💻 CLI Bug
-description: Report an issue in the Codex CLI
+name: 🪲 Bug Report
+description: Report an issue that should be fixed
 labels:
   - bug
   - needs triage
@@ -7,16 +7,19 @@ body:
   - type: markdown
     attributes:
       value: |
-        Before submitting a new issue, please search for existing issues to see if your issue has already been reported.
-        If it has, please add a 👍 reaction (no need to leave a comment) to the existing issue instead of creating a new one.
+        Thank you for submitting a bug report! It helps make Codex better for everyone.
+
+        If you need help or support using Codex, and are not reporting a bug, please post on [codex/discussions](https://github.com/openai/codex/discussions), where you can ask questions or engage with others on ideas for how to improve codex.
 
         Make sure you are running the [latest](https://npmjs.com/package/@openai/codex) version of Codex CLI. The bug you are experiencing may already have been fixed.
 
+        Please try to include as much information as possible.
+
   - type: input
     id: version
     attributes:
-      label: What version of Codex CLI is running?
-      description: use `codex --version`
+      label: What version of Codex is running?
+      description: Copy the output of `codex --version`
     validations:
       required: true
   - type: input
@@ -29,13 +32,13 @@ body:
     id: model
     attributes:
       label: Which model were you using?
-      description: Like `gpt-5.2`, `gpt-5.2-codex`, etc.
+      description: Like `gpt-4.1`, `o4-mini`, `o3`, etc.
   - type: input
     id: platform
     attributes:
       label: What platform is your computer?
       description: |
-        For macOS and Linux: copy the output of `uname -mprs`
+        For MacOS and Linux: copy the output of `uname -mprs`
         For Windows: copy the output of `"$([Environment]::OSVersion | ForEach-Object VersionString) $(if ([Environment]::Is64BitOperatingSystem) { "x64" } else { "x86" })"` in the PowerShell console
   - type: input
     id: terminal
@@ -55,7 +58,7 @@ body:
     id: steps
     attributes:
       label: What steps can reproduce the bug?
-      description: Explain the bug and provide a code snippet that can reproduce it. Please include thread id if applicable.
+      description: Explain the bug and provide a code snippet that can reproduce it. Please include session id, token limit usage, context window usage if applicable.
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/4-bug-report.yml

@@ -1,37 +0,0 @@
-name: 🪲 Other Bug
-description: Report an issue in Codex Web, integrations, or other Codex components
-labels:
-  - bug
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Before submitting a new issue, please search for existing issues to see if your issue has already been reported.
-        If it has, please add a 👍 reaction (no need to leave a comment) to the existing issue instead of creating a new one.
-
-        If you need help or support using Codex and are not reporting a bug, please post on [codex/discussions](https://github.com/openai/codex/discussions), where you can ask questions or engage with others on ideas for how to improve codex.
-
-  - type: textarea
-    id: actual
-    attributes:
-      label: What issue are you seeing?
-      description: Please include the full error messages and prompts with PII redacted. If possible, please provide text instead of a screenshot.
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: What steps can reproduce the bug?
-      description: Explain the bug and provide a code snippet that can reproduce it.
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: What is the expected behavior?
-      description: If possible, please provide text instead of a screenshot.
-  - type: textarea
-    id: notes
-    attributes:
-      label: Additional information
-      description: Is there anything else you think we should know?

.github/ISSUE_TEMPLATE/4-feature-request.yml

@@ -12,13 +12,6 @@ body:
         1. Search existing issues for similar features. If you find one, 👍 it rather than opening a new one.
         2. The Codex team will try to balance the varying needs of the community when prioritizing or rejecting new features. Not all features will be accepted. See [Contributing](https://github.com/openai/codex#contributing) for more details.
 
-  - type: input
-    id: variant
-    attributes:
-      label: What variant of Codex are you using?
-      description: (e.g., App, IDE Extension, CLI, Web)
-    validations:
-      required: true
   - type: textarea
     id: feature
     attributes:

.github/ISSUE_TEMPLATE/5-vs-code-extension.yml

@@ -1,7 +1,8 @@
-name: 🧑‍💻 IDE Extension Bug
-description: Report an issue with the IDE extension
+name: 🧑‍💻 VS Code Extension
+description: Report an issue with the VS Code extension
 labels:
   - extension
+  - needs triage
 body:
   - type: markdown
     attributes:
@@ -12,7 +13,7 @@ body:
   - type: input
     id: version
     attributes:
-      label: What version of the IDE extension are you using?
+      label: What version of the VS Code extension are you using?
     validations:
       required: true
   - type: input
@@ -33,20 +34,20 @@ body:
     attributes:
       label: What platform is your computer?
       description: |
-        For macOS and Linux: copy the output of `uname -mprs`
+        For MacOS and Linux: copy the output of `uname -mprs`
         For Windows: copy the output of `"$([Environment]::OSVersion | ForEach-Object VersionString) $(if ([Environment]::Is64BitOperatingSystem) { "x64" } else { "x86" })"` in the PowerShell console
   - type: textarea
     id: actual
     attributes:
       label: What issue are you seeing?
-      description: Please include the full error messages and prompts with PII redacted. If possible, please provide text instead of a screenshot.
+      description: Please include the full error messages and prompts with PII redacted. If possible, please provide text instead of a screenshot. 
     validations:
       required: true
   - type: textarea
     id: steps
     attributes:
       label: What steps can reproduce the bug?
-      description: Explain the bug and provide a code snippet that can reproduce it.
+      description: Explain the bug and provide a code snippet that can reproduce it. Please include session id, token limit usage, context window usage if applicable.
     validations:
       required: true
   - type: textarea

.github/codex/labels/codex-rust-review.md

@@ -15,10 +15,10 @@ Things to look out for when doing the review:
 
 ## Code Organization
 
-- Each crate in the Cargo workspace in `codex-rs` has a specific purpose: make a note if you believe new code is not introduced in the correct crate.
+- Each create in the Cargo workspace in `codex-rs` has a specific purpose: make a note if you believe new code is not introduced in the correct crate.
 - When possible, try to keep the `core` crate as small as possible. Non-core but shared logic is often a good candidate for `codex-rs/common`.
 - Be wary of large files and offer suggestions for how to break things into more reasonably-sized files.
-- Rust files should generally be organized such that the public parts of the API appear near the top of the file and helper functions go below. This is analogous to the "inverted pyramid" structure that is favored in journalism.
+- Rust files should generally be organized such that the public parts of the API appear near the top of the file and helper functions go below. This is analagous to the "inverted pyramid" structure that is favored in journalism.
 
 ## Assertions in Tests
 

.github/scripts/install-musl-build-tools.sh

@@ -77,12 +77,6 @@ for arg in "\$@"; do
       fi
       continue
       ;;
-    -Wp,-U_FORTIFY_SOURCE)
-      # aws-lc-sys emits this GCC preprocessor forwarding form in debug
-      # builds, but zig cc expects the define flag directly.
-      args+=("-U_FORTIFY_SOURCE")
-      continue
-      ;;
   esac
   args+=("\${arg}")
 done
@@ -102,23 +96,15 @@ for arg in "\$@"; do
   fi
   case "\${arg}" in
     --target)
-      # Drop explicit --target and its value: we always pass zig's -target below.
       skip_next=1
       continue
       ;;
     --target=*|-target=*|-target)
-      # Zig expects -target and rejects Rust triples like *-unknown-linux-musl.
       if [[ "\${arg}" == "-target" ]]; then
         skip_next=1
       fi
       continue
       ;;
-    -Wp,-U_FORTIFY_SOURCE)
-      # aws-lc-sys emits this GCC forwarding form in debug builds; zig c++
-      # expects the define flag directly.
-      args+=("-U_FORTIFY_SOURCE")
-      continue
-      ;;
   esac
   args+=("\${arg}")
 done

.github/workflows/bazel.yml

@@ -100,7 +100,6 @@ jobs:
       - name: bazel test //...
         env:
           BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
-          CODEX_BWRAP_ENABLE_FFI: ${{ contains(matrix.target, 'unknown-linux') && '1' || '0' }}
         shell: bash
         run: |
           bazel $BAZEL_STARTUP_ARGS --bazelrc=.github/workflows/ci.bazelrc test //... \

.github/workflows/ci.bazelrc

@@ -1,13 +1,6 @@
 common --remote_download_minimal
+common --nobuild_runfile_links
 common --keep_going
-common --verbose_failures
-
-# Disable disk cache since we have remote one and aren't using persistent workers.
-common --disk_cache=
-
-# Rearrange caches on Windows so they're on the same volume as the checkout.
-common:windows --repo_contents_cache=D:/a/.cache/bazel-repo-contents-cache
-common:windows --repository_cache=D:/a/.cache/bazel-repo-cache
 
 # We prefer to run the build actions entirely remotely so we can dial up the concurrency.
 # We have platform-specific tests, so we want to execute the tests on all platforms using the strongest sandboxing available on each platform.
@@ -23,5 +16,5 @@ common:macos --config=remote
 common:macos --strategy=remote
 common:macos --strategy=TestRunner=darwin-sandbox,local
 
-# On windows we cannot cross-build the tests but run them locally due to what appears to be a Bazel bug
-# (windows vs unix path confusion)
+common:windows --strategy=TestRunner=local
+

.github/workflows/issue-labeler.yml

@@ -38,10 +38,9 @@ jobs:
             - If applicable, add one of the following labels to specify which sub-product or product surface the issue relates to.
             1. CLI — the Codex command line interface.
             2. extension — VS Code (or other IDE) extension-specific issues.
-            3. app - Issues related to the Codex desktop application.
-            4. codex-web — Issues targeting the Codex web UI/Cloud experience.
-            5. github-action — Issues with the Codex GitHub action.
-            6. iOS — Issues with the Codex iOS app.
+            3. codex-web — Issues targeting the Codex web UI/Cloud experience.
+            4. github-action — Issues with the Codex GitHub action.
+            5. iOS — Issues with the Codex iOS app.
 
             - Additionally add zero or more of the following labels that are relevant to the issue content. Prefer a small set of precise labels over many broad ones.
             1. windows-os — Bugs or friction specific to Windows environments (always when PowerShell is mentioned, path handling, copy/paste, OS-specific auth or tooling failures).

.github/workflows/rust-ci.yml

@@ -64,6 +64,8 @@ jobs:
           components: rustfmt
       - name: cargo fmt
         run: cargo fmt -- --config imports_granularity=Item --check
+      - name: Verify codegen for mcp-types
+        run: ./mcp-types/check_lib_rs.py
 
   cargo_shear:
     name: cargo shear
@@ -99,9 +101,6 @@ jobs:
       USE_SCCACHE: ${{ startsWith(matrix.runner, 'windows') && 'false' || 'true' }}
       CARGO_INCREMENTAL: "0"
       SCCACHE_CACHE_SIZE: 10G
-      # Keep cargo-based CI independent of system bwrap build deps.
-      # The bwrap FFI path is validated in Bazel workflows.
-      CODEX_BWRAP_ENABLE_FFI: "0"
 
     strategy:
       fail-fast: false
@@ -470,9 +469,6 @@ jobs:
       USE_SCCACHE: ${{ startsWith(matrix.runner, 'windows') && 'false' || 'true' }}
       CARGO_INCREMENTAL: "0"
       SCCACHE_CACHE_SIZE: 10G
-      # Keep cargo-based CI independent of system bwrap build deps.
-      # The bwrap FFI path is validated in Bazel workflows.
-      CODEX_BWRAP_ENABLE_FFI: "0"
 
     strategy:
       fail-fast: false
@@ -508,6 +504,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v6
+
       # Some integration tests rely on DotSlash being installed.
       # See https://github.com/openai/codex/pull/7617.
       - name: Install DotSlash

.github/workflows/rust-release.yml

@@ -45,6 +45,15 @@ jobs:
           echo "✅  Tag and Cargo.toml agree (${tag_ver})"
           echo "::endgroup::"
 
+      - name: Verify config schema fixture
+        shell: bash
+        working-directory: codex-rs
+        run: |
+          set -euo pipefail
+          echo "If this fails, run: just write-config-schema to overwrite fixture with intentional changes."
+          cargo run -p codex-core --bin codex-write-config-schema
+          git diff --exit-code core/config.schema.json
+
   build:
     needs: tag-check
     name: Build - ${{ matrix.runner }} - ${{ matrix.target }}
@@ -56,8 +65,6 @@ jobs:
     defaults:
       run:
         working-directory: codex-rs
-    env:
-      CODEX_BWRAP_ENABLE_FFI: ${{ contains(matrix.target, 'unknown-linux') && '1' || '0' }}
 
     strategy:
       fail-fast: false
@@ -82,13 +89,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v6
-      - name: Install Linux bwrap build dependencies
-        if: ${{ runner.os == 'Linux' }}
-        shell: bash
-        run: |
-          set -euo pipefail
-          sudo apt-get update -y
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends pkg-config libcap-dev
       - name: Install UBSan runtime (musl)
         if: ${{ matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl' }}
         shell: bash

AGENTS.md

@@ -15,14 +15,13 @@ In the codex-rs folder where the rust code lives:
 - 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.
 - If you change `ConfigToml` or nested config types, run `just write-config-schema` to update `codex-rs/core/config.schema.json`.
-- Do not create small helper methods that are referenced only once.
 
 Run `just fmt` (in `codex-rs` directory) automatically after you have finished making Rust code changes; do not ask for approval to run it. Additionally, run the tests:
 
 1. Run the test for the specific project that was changed. For example, if changes were made in `codex-rs/tui`, run `cargo test -p codex-tui`.
 2. Once those pass, if any changes were made in common, core, or protocol, run the complete test suite with `cargo test --all-features`. project-specific or individual tests can be run without asking the user, but do ask the user before running the complete test suite.
 
-Before finalizing a large change to `codex-rs`, run `just fix -p <project>` (in `codex-rs` directory) to fix any linter issues in the code. Prefer scoping with `-p` to avoid slow workspace‑wide Clippy builds; only run `just fix` without `-p` if you changed shared crates. Do not re-run tests after running `fix` or `fmt`.
+Before finalizing a large change to `codex-rs`, run `just fix -p <project>` (in `codex-rs` directory) to fix any linter issues in the code. Prefer scoping with `-p` to avoid slow workspace‑wide Clippy builds; only run `just fix` without `-p` if you changed shared crates.
 
 ## TUI style conventions
 
@@ -113,48 +112,3 @@ If you don’t have the tool:
   let request = mock.single_request();
   // assert using request.function_call_output(call_id) or request.json_body() or other helpers.
   ```
-
-## App-server API Development Best Practices
-
-These guidelines apply to app-server protocol work in `codex-rs`, especially:
-
-- `app-server-protocol/src/protocol/common.rs`
-- `app-server-protocol/src/protocol/v2.rs`
-- `app-server/README.md`
-
-### Core Rules
-
-- All active API development should happen in app-server v2. Do not add new API surface area to v1.
-- Follow payload naming consistently:
-  `*Params` for request payloads, `*Response` for responses, and `*Notification` for notifications.
-- Expose RPC methods as `<resource>/<method>` and keep `<resource>` singular (for example, `thread/read`, `app/list`).
-- Always expose fields as camelCase on the wire with `#[serde(rename_all = "camelCase")]` unless a tagged union or explicit compatibility requirement needs a targeted rename.
-- Exception: config RPC payloads are expected to use snake_case to mirror config.toml keys (see the config read/write/list APIs in `app-server-protocol/src/protocol/v2.rs`).
-- Always set `#[ts(export_to = "v2/")]` on v2 request/response/notification types so generated TypeScript lands in the correct namespace.
-- Never use `#[serde(skip_serializing_if = "Option::is_none")]` for v2 API payload fields.
-  Exception: client->server requests that intentionally have no params may use:
-  `params: #[ts(type = "undefined")] #[serde(skip_serializing_if = "Option::is_none")] Option<()>`.
-- Keep Rust and TS wire renames aligned. If a field or variant uses `#[serde(rename = "...")]`, add matching `#[ts(rename = "...")]`.
-- For discriminated unions, use explicit tagging in both serializers:
-  `#[serde(tag = "type", ...)]` and `#[ts(tag = "type", ...)]`.
-- Prefer plain `String` IDs at the API boundary (do UUID parsing/conversion internally if needed).
-- Timestamps should be integer Unix seconds (`i64`) and named `*_at` (for example, `created_at`, `updated_at`, `resets_at`).
-- For experimental API surface area:
-  use `#[experimental("method/or/field")]`, derive `ExperimentalApi` when field-level gating is needed, and use `inspect_params: true` in `common.rs` when only some fields of a method are experimental.
-
-### Client->server request payloads (`*Params`)
-
-- Every optional field must be annotated with `#[ts(optional = nullable)]`. Do not use `#[ts(optional = nullable)]` outside client->server request payloads (`*Params`).
-- Optional collection fields (for example `Vec`, `HashMap`) must use `Option<...>` + `#[ts(optional = nullable)]`. Do not use `#[serde(default)]` to model optional collections, and do not use `skip_serializing_if` on v2 payload fields.
-- When you want omission to mean `false` for boolean fields, use `#[serde(default, skip_serializing_if = "std::ops::Not::not")] pub field: bool` over `Option<bool>`.
-- For new list methods, implement cursor pagination by default:
-  request fields `pub cursor: Option<String>` and `pub limit: Option<u32>`,
-  response fields `pub data: Vec<...>` and `pub next_cursor: Option<String>`.
-
-### Development Workflow
-
-- Update docs/examples when API behavior changes (at minimum `app-server/README.md`).
-- Regenerate schema fixtures when API shapes change:
-  `just write-app-server-schema`
-  (and `just write-app-server-schema --experimental` when experimental API fixtures are affected).
-- Validate with `cargo test -p codex-app-server-protocol`.

BUILD.bazel

@@ -6,21 +6,13 @@ xcode_config(name = "disable_xcode")
 # TODO(zbarsky): Upstream a better libc constraint into rules_rust.
 # We only enable this on linux though for sanity, and because it breaks remote execution.
 platform(
-    name = "local_linux",
+    name = "local",
     constraint_values = [
-        # We mark the local platform as glibc-compatible because musl-built rust cannot dlopen proc macros.
         "@toolchains_llvm_bootstrapped//constraints/libc:gnu.2.28",
     ],
-    parents = ["@platforms//host"],
-)
-
-platform(
-    name = "local_windows",
-    constraint_values = [
-        # We just need to pick one of the ABIs. Do the same one we target.
-        "@rules_rs//rs/experimental/platforms/constraints:windows_gnullvm",
+    parents = [
+        "@platforms//host",
     ],
-    parents = ["@platforms//host"],
 )
 
 alias(

MODULE.bazel

@@ -1,14 +1,13 @@
 bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "toolchains_llvm_bootstrapped", version = "0.5.3")
-single_version_override(
+bazel_dep(name = "toolchains_llvm_bootstrapped", version = "0.3.1")
+archive_override(
     module_name = "toolchains_llvm_bootstrapped",
-    patch_strip = 1,
-    patches = [
-        "//patches:toolchains_llvm_bootstrapped_resource_dir.patch",
-    ],
+    integrity = "sha256-4/2h4tYSUSptxFVI9G50yJxWGOwHSeTeOGBlaLQBV8g=",
+    strip_prefix = "toolchains_llvm_bootstrapped-d20baf67e04d8e2887e3779022890d1dc5e6b948",
+    urls = ["https://github.com/cerisier/toolchains_llvm_bootstrapped/archive/d20baf67e04d8e2887e3779022890d1dc5e6b948.tar.gz"],
 )
 
-osx = use_extension("@toolchains_llvm_bootstrapped//extensions:osx.bzl", "osx")
+osx = use_extension("@toolchains_llvm_bootstrapped//toolchain/extension:osx.bzl", "osx")
 osx.framework(name = "ApplicationServices")
 osx.framework(name = "AppKit")
 osx.framework(name = "ColorSync")
@@ -17,7 +16,6 @@ osx.framework(name = "CoreGraphics")
 osx.framework(name = "CoreServices")
 osx.framework(name = "CoreText")
 osx.framework(name = "CFNetwork")
-osx.framework(name = "FontServices")
 osx.framework(name = "Foundation")
 osx.framework(name = "ImageIO")
 osx.framework(name = "Kernel")
@@ -33,92 +31,48 @@ register_toolchains(
 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.23")
-
-# Special toolchains branch
-archive_override(
-    module_name = "rules_rs",
-    integrity = "sha256-YbDRjZos4UmfIPY98znK1BgBWRQ1/ui3CtL6RqxE30I=",
-    strip_prefix = "rules_rs-6cf3d940fdc48baf3ebd6c37daf8e0be8fc73ecb",
-    url = "https://github.com/dzbarsky/rules_rs/archive/6cf3d940fdc48baf3ebd6c37daf8e0be8fc73ecb.tar.gz",
+bazel_dep(name = "rules_rust", version = "0.68.1")
+single_version_override(
+    module_name = "rules_rust",
+    patch_strip = 1,
+    patches = [
+        "//patches:rules_rust.patch",
+        "//patches:rules_rust_windows_gnu.patch",
+        "//patches:rules_rust_musl.patch",
+    ],
 )
 
-rules_rust = use_extension("@rules_rs//rs/experimental:rules_rust.bzl", "rules_rust")
-use_repo(rules_rust, "rules_rust")
+RUST_TRIPLES = [
+    "aarch64-unknown-linux-musl",
+    "aarch64-apple-darwin",
+    "aarch64-pc-windows-gnullvm",
+    "x86_64-unknown-linux-musl",
+    "x86_64-apple-darwin",
+    "x86_64-pc-windows-gnullvm",
+]
 
-toolchains = use_extension("@rules_rs//rs/experimental/toolchains:module_extension.bzl", "toolchains")
-toolchains.toolchain(
+rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
+rust.toolchain(
     edition = "2024",
-    version = "1.93.0",
-)
-use_repo(
-    toolchains,
-    "experimental_rust_toolchains_1_93_0",
-    "rust_toolchain_artifacts_macos_aarch64_1_93_0",
+    extra_target_triples = RUST_TRIPLES,
+    versions = ["1.93.0"],
 )
+use_repo(rust, "rust_toolchains")
 
-register_toolchains("@experimental_rust_toolchains_1_93_0//:all")
+register_toolchains("@rust_toolchains//:all")
+
+bazel_dep(name = "rules_rs", version = "0.0.23")
 
 crate = use_extension("@rules_rs//rs:extensions.bzl", "crate")
 crate.from_cargo(
     cargo_lock = "//codex-rs:Cargo.lock",
     cargo_toml = "//codex-rs:Cargo.toml",
-    platform_triples = [
-        "aarch64-unknown-linux-gnu",
-        "aarch64-unknown-linux-musl",
-        "aarch64-apple-darwin",
-        "aarch64-pc-windows-gnullvm",
-        "x86_64-unknown-linux-gnu",
-        "x86_64-unknown-linux-musl",
-        "x86_64-apple-darwin",
-        "x86_64-pc-windows-gnullvm",
-    ],
-)
-
-bazel_dep(name = "zstd", version = "1.5.7")
-
-crate.annotation(
-    crate = "zstd-sys",
-    gen_build_script = "off",
-    deps = ["@zstd"],
+    platform_triples = RUST_TRIPLES,
 )
 crate.annotation(
-    build_script_env = {
-        "AWS_LC_SYS_NO_JITTER_ENTROPY": "1",
-    },
-    crate = "aws-lc-sys",
-    patch_args = ["-p1"],
-    patches = [
-        "//patches:aws-lc-sys_memcmp_check.patch",
-    ],
-)
-
-inject_repo(crate, "zstd")
-
-bazel_dep(name = "bzip2", version = "1.0.8.bcr.3")
-
-crate.annotation(
-    crate = "bzip2-sys",
-    gen_build_script = "off",
-    deps = ["@bzip2//:bz2"],
-)
-
-inject_repo(crate, "bzip2")
-
-bazel_dep(name = "zlib", version = "1.3.1.bcr.8")
-
-crate.annotation(
-    crate = "libz-sys",
-    gen_build_script = "off",
-    deps = ["@zlib"],
-)
-
-inject_repo(crate, "zlib")
-
-# TODO(zbarsky): Enable annotation after fixing windows arm64 builds.
-crate.annotation(
-    crate = "lzma-sys",
-    gen_build_script = "on",
+    crate = "nucleo-matcher",
+    strip_prefix = "matcher",
+    version = "0.3.1",
 )
 
 bazel_dep(name = "openssl", version = "3.5.4.bcr.0")

README.md

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

announcement_tip.toml

@@ -14,10 +14,4 @@ target_app = "cli"
 [[announcements]]
 content = "This is a test announcement"
 version_regex = "^0\\.0\\.0$"
-to_date = "2026-05-10"
-
-[[announcements]]
-content = "**BREAKING NEWS**: `gpt-5.3-codex` is out! Upgrade to `0.98.0` for a faster, smarter, more steerable agent."
-from_date = "2026-02-01"
-to_date = "2026-02-16"
-version_regex = "^0\\.(?:[0-9]|[1-8][0-9]|9[0-7])\\."
+to_date = "2026-01-10"

codex-rs/Cargo.toml

@@ -5,19 +5,20 @@ members = [
     "async-utils",
     "app-server",
     "app-server-protocol",
+    "app-server-protocol-stable-export",
+    "app-server-json-schema",
+    "app-server-ts-types",
     "app-server-test-client",
     "debug-client",
     "apply-patch",
     "arg0",
     "feedback",
     "codex-backend-openapi-models",
-    "cloud-requirements",
     "cloud-tasks",
     "cloud-tasks-client",
     "cli",
     "common",
     "core",
-    "secrets",
     "exec",
     "exec-server",
     "execpolicy",
@@ -28,6 +29,7 @@ members = [
     "lmstudio",
     "login",
     "mcp-server",
+    "mcp-types",
     "network-proxy",
     "ollama",
     "process-hardening",
@@ -43,14 +45,12 @@ members = [
     "utils/cache",
     "utils/image",
     "utils/json-to-toml",
-    "utils/home-dir",
     "utils/pty",
     "utils/readiness",
     "utils/string",
     "codex-client",
     "codex-api",
     "state",
-    "codex-experimental-api-macros",
 ]
 resolver = "2"
 
@@ -69,22 +69,20 @@ app_test_support = { path = "app-server/tests/common" }
 codex-ansi-escape = { path = "ansi-escape" }
 codex-api = { path = "codex-api" }
 codex-app-server = { path = "app-server" }
+codex-app-server-json-schema = { path = "app-server-json-schema" }
 codex-app-server-protocol = { path = "app-server-protocol" }
-codex-app-server-test-client = { path = "app-server-test-client" }
+codex-app-server-ts-types = { path = "app-server-ts-types" }
 codex-apply-patch = { path = "apply-patch" }
 codex-arg0 = { path = "arg0" }
 codex-async-utils = { path = "async-utils" }
 codex-backend-client = { path = "backend-client" }
-codex-cloud-requirements = { path = "cloud-requirements" }
 codex-chatgpt = { path = "chatgpt" }
 codex-cli = { path = "cli"}
 codex-client = { path = "codex-client" }
 codex-common = { path = "common" }
 codex-core = { path = "core" }
-codex-secrets = { path = "secrets" }
 codex-exec = { path = "exec" }
 codex-execpolicy = { path = "execpolicy" }
-codex-experimental-api-macros = { path = "codex-experimental-api-macros" }
 codex-feedback = { path = "feedback" }
 codex-file-search = { path = "file-search" }
 codex-git = { path = "utils/git" }
@@ -93,7 +91,6 @@ codex-linux-sandbox = { path = "linux-sandbox" }
 codex-lmstudio = { path = "lmstudio" }
 codex-login = { path = "login" }
 codex-mcp-server = { path = "mcp-server" }
-codex-network-proxy = { path = "network-proxy" }
 codex-ollama = { path = "ollama" }
 codex-otel = { path = "otel" }
 codex-process-hardening = { path = "process-hardening" }
@@ -108,17 +105,16 @@ codex-utils-cache = { path = "utils/cache" }
 codex-utils-cargo-bin = { path = "utils/cargo-bin" }
 codex-utils-image = { path = "utils/image" }
 codex-utils-json-to-toml = { path = "utils/json-to-toml" }
-codex-utils-home-dir = { path = "utils/home-dir" }
 codex-utils-pty = { path = "utils/pty" }
 codex-utils-readiness = { path = "utils/readiness" }
 codex-utils-string = { path = "utils/string" }
 codex-windows-sandbox = { path = "windows-sandbox-rs" }
 core_test_support = { path = "core/tests/common" }
 exec_server_test_support = { path = "exec-server/tests/common" }
+mcp-types = { path = "mcp-types" }
 mcp_test_support = { path = "mcp-server/tests/common" }
 
 # External
-age = "0.11.1"
 allocative = "0.3.3"
 ansi-to-tui = "7.0.0"
 anyhow = "1"
@@ -130,7 +126,6 @@ async-stream = "0.3.6"
 async-trait = "0.1.89"
 axum = { version = "0.8", default-features = false }
 base64 = "0.22.1"
-bm25 = "2.3.2"
 bytes = "1.10.1"
 chardetng = "0.1.17"
 chrono = "0.4.43"
@@ -161,7 +156,6 @@ image = { version = "^0.25.9", default-features = false }
 include_dir = "0.7.4"
 indexmap = "2.12.0"
 insta = "1.46.0"
-inventory = "0.3.19"
 itertools = "0.14.0"
 keyring = { version = "3.6", default-features = false }
 landlock = "0.4.4"
@@ -196,8 +190,7 @@ ratatui-macros = "0.6.0"
 regex = "1.12.2"
 regex-lite = "0.1.8"
 reqwest = "0.12"
-rmcp = { version = "0.14.0", default-features = false }
-rustls = { version = "0.23", default-features = false, features = ["ring", "std"] }
+rmcp = { version = "0.12.0", default-features = false }
 runfiles = { git = "https://github.com/dzbarsky/rules_rust", rev = "b56cbaa8465e74127f1ea216f813cd377295ad81" }
 schemars = "0.8.22"
 seccompiler = "0.5.0"
@@ -224,13 +217,12 @@ tempfile = "3.23.0"
 test-log = "0.2.19"
 textwrap = "0.16.2"
 thiserror = "2.0.17"
-time = "0.3.47"
+time = "0.3"
 tiny_http = "0.12"
 tokio = "1"
 tokio-stream = "0.1.18"
 tokio-test = "0.4"
 tokio-tungstenite = { version = "0.28.0", features = ["proxy", "rustls-tls-native-roots"] }
-tungstenite = { version = "0.27.0", features = ["deflate", "proxy"] }
 tokio-util = "0.7.18"
 toml = "0.9.5"
 toml_edit = "0.24.0"
@@ -254,7 +246,6 @@ walkdir = "2.5.0"
 webbrowser = "1.0"
 which = "8"
 wildmatch = "2.6.1"
-zip = "2.4.2"
 
 wiremock = "0.6"
 zeroize = "1.8.2"
@@ -300,7 +291,7 @@ unwrap_used = "deny"
 # cargo-shear cannot see the platform-specific openssl-sys usage, so we
 # silence the false positive here instead of deleting a real dependency.
 [workspace.metadata.cargo-shear]
-ignored = ["icu_provider", "openssl-sys", "codex-utils-readiness", "codex-secrets"]
+ignored = ["icu_provider", "openssl-sys", "codex-utils-readiness"]
 
 [profile.release]
 lto = "fat"
@@ -321,11 +312,10 @@ opt-level = 0
 # ratatui = { path = "../../ratatui" }
 crossterm = { git = "https://github.com/nornagon/crossterm", branch = "nornagon/color-query" }
 ratatui = { git = "https://github.com/nornagon/ratatui", branch = "nornagon-v0.29.0-patch" }
-tokio-tungstenite = { git = "https://github.com/openai-oss-forks/tokio-tungstenite", rev = "132f5b39c862e3a970f731d709608b3e6276d5f6" }
-tungstenite = { git = "https://github.com/openai-oss-forks/tungstenite-rs", rev = "9200079d3b54a1ff51072e24d81fd354f085156f" }
+tokio-tungstenite = { git = "https://github.com/JakkuSakura/tokio-tungstenite", rev = "2ae536b0de793f3ddf31fc2f22d445bf1ef2023d" }
 
 # Uncomment to debug local changes.
 # rmcp = { path = "../../rust-sdk/crates/rmcp" }
 
-[patch."ssh://git@github.com/openai-oss-forks/tungstenite-rs.git"]
-tungstenite = { git = "https://github.com/openai-oss-forks/tungstenite-rs", rev = "9200079d3b54a1ff51072e24d81fd354f085156f" }
+[patch."ssh://git@github.com/JakkuSakura/tungstenite-rs.git"]
+tungstenite = { git = "https://github.com/JakkuSakura/tungstenite-rs", rev = "f514de8644821113e5d18a027d6d28a5c8cc0a6e" }

codex-rs/README.md

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

codex-rs/app-server-json-schema/BUILD.bazel

@@ -0,0 +1,21 @@
+load("//:defs.bzl", "codex_rust_crate")
+
+stable_files = glob(
+    include = ["stable/**"],
+    allow_empty = True,
+    exclude = [
+        "**/* *",
+        "BUILD.bazel",
+        "Cargo.toml",
+    ],
+)
+
+codex_rust_crate(
+    name = "app-server-json-schema",
+    compile_data = stable_files,
+    crate_name = "codex_app_server_json_schema",
+    extra_binaries = [
+        "//codex-rs/app-server-protocol-stable-export:codex-app-server-protocol-stable-export",
+    ],
+    test_data_extra = stable_files,
+)

codex-rs/app-server-json-schema/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "codex-app-server-json-schema"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+include_dir = { workspace = true }
+
+[dev-dependencies]
+anyhow = { workspace = true }
+codex-utils-cargo-bin = { workspace = true }
+pretty_assertions = { workspace = true }
+tempfile = { workspace = true }

codex-rs/app-server-json-schema/src/lib.rs

@@ -0,0 +1,39 @@
+use std::ffi::OsStr;
+use std::fs;
+use std::io;
+use std::path::Path;
+
+static STABLE_APP_SERVER_JSON_SCHEMA_DIR: include_dir::Dir<'_> =
+    include_dir::include_dir!("$CARGO_MANIFEST_DIR/stable");
+
+/// Write the bundled stable JSON Schema artifacts to `out_dir`.
+pub fn write_stable_json_schema(out_dir: &Path) -> io::Result<()> {
+    fs::create_dir_all(out_dir)?;
+    write_dir_recursive(&STABLE_APP_SERVER_JSON_SCHEMA_DIR, out_dir, "json")
+}
+
+fn write_dir_recursive(
+    dir: &include_dir::Dir<'_>,
+    out_dir: &Path,
+    extension: &str,
+) -> io::Result<()> {
+    for file in dir.files() {
+        if file
+            .path()
+            .extension()
+            .is_some_and(|ext| ext == OsStr::new(extension))
+        {
+            let out_path = out_dir.join(file.path());
+            if let Some(parent) = out_path.parent() {
+                fs::create_dir_all(parent)?;
+            }
+            fs::write(out_path, file.contents())?;
+        }
+    }
+
+    for child in dir.dirs() {
+        write_dir_recursive(child, out_dir, extension)?;
+    }
+
+    Ok(())
+}

codex-rs/app-server-json-schema/stable/ClientRequest.json

@@ -9,10 +9,6 @@
       "properties": {
         "conversationId": {
           "$ref": "#/definitions/ThreadId"
-        },
-        "experimentalRawEvents": {
-          "default": false,
-          "type": "boolean"
         }
       },
       "required": [
@@ -21,7 +17,6 @@
       "type": "object"
     },
     "AppsListParams": {
-      "description": "EXPERIMENTAL - list available apps/connectors.",
       "properties": {
         "cursor": {
           "description": "Opaque pagination cursor returned by a previous call.",
@@ -30,10 +25,6 @@
             "null"
           ]
         },
-        "forceRefetch": {
-          "description": "When true, bypass app caches and fetch the latest data from sources.",
-          "type": "boolean"
-        },
         "limit": {
           "description": "Optional page size; defaults to a reasonable server-side value.",
           "format": "uint32",
@@ -165,22 +156,6 @@
       ],
       "type": "object"
     },
-    "CollaborationMode": {
-      "description": "Collaboration mode for a Codex session.",
-      "properties": {
-        "mode": {
-          "$ref": "#/definitions/ModeKind"
-        },
-        "settings": {
-          "$ref": "#/definitions/Settings"
-        }
-      },
-      "required": [
-        "mode",
-        "settings"
-      ],
-      "type": "object"
-    },
     "CommandExecParams": {
       "properties": {
         "command": {
@@ -427,27 +402,6 @@
       ],
       "type": "object"
     },
-    "ExperimentalFeatureListParams": {
-      "properties": {
-        "cursor": {
-          "description": "Opaque pagination cursor returned by a previous call.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "limit": {
-          "description": "Optional page size; defaults to a reasonable server-side value.",
-          "format": "uint32",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
     "FeedbackUploadParams": {
       "properties": {
         "classification": {
@@ -506,19 +460,6 @@
       },
       "type": "object"
     },
-    "FunctionCallOutputBody": {
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "items": {
-            "$ref": "#/definitions/FunctionCallOutputContentItem"
-          },
-          "type": "array"
-        }
-      ]
-    },
     "FunctionCallOutputContentItem": {
       "description": "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
       "oneOf": [
@@ -565,10 +506,19 @@
       ]
     },
     "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.",
+      "description": "The payload we send back to OpenAI when reporting a tool call result.\n\n`content` preserves the historical plain-string payload so downstream integrations (tests, logging, etc.) can keep treating tool output as `String`. When an MCP server returns richer data we additionally populate `content_items` with the structured form that the Responses/Chat Completions APIs understand.",
       "properties": {
-        "body": {
-          "$ref": "#/definitions/FunctionCallOutputBody"
+        "content": {
+          "type": "string"
+        },
+        "content_items": {
+          "items": {
+            "$ref": "#/definitions/FunctionCallOutputContentItem"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
         },
         "success": {
           "type": [
@@ -578,7 +528,7 @@
         }
       },
       "required": [
-        "body"
+        "content"
       ],
       "type": "object"
     },
@@ -704,29 +654,8 @@
       ],
       "type": "object"
     },
-    "InitializeCapabilities": {
-      "description": "Client-declared capabilities negotiated during initialize.",
-      "properties": {
-        "experimentalApi": {
-          "default": false,
-          "description": "Opt into receiving experimental API methods and fields.",
-          "type": "boolean"
-        }
-      },
-      "type": "object"
-    },
     "InitializeParams": {
       "properties": {
-        "capabilities": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/InitializeCapabilities"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
         "clientInfo": {
           "$ref": "#/definitions/ClientInfo"
         }
@@ -993,33 +922,6 @@
           ],
           "title": "ChatgptLoginAccountParams",
           "type": "object"
-        },
-        {
-          "description": "[UNSTABLE] FOR OPENAI INTERNAL USE ONLY - DO NOT USE. The access token must contain the same scopes that Codex-managed ChatGPT auth tokens have.",
-          "properties": {
-            "accessToken": {
-              "description": "Access token (JWT) supplied by the client. This token is used for backend API requests.",
-              "type": "string"
-            },
-            "idToken": {
-              "description": "ID token (JWT) supplied by the client.\n\nThis token is used for identity and account metadata (email, plan type, workspace id).",
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "chatgptAuthTokens"
-              ],
-              "title": "ChatgptAuthTokensLoginAccountParamsType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "accessToken",
-            "idToken",
-            "type"
-          ],
-          "title": "ChatgptAuthTokensLoginAccountParams",
-          "type": "object"
         }
       ]
     },
@@ -1068,33 +970,6 @@
       ],
       "type": "string"
     },
-    "MessagePhase": {
-      "description": "Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as \"phase unknown\" and keep compatibility behavior for legacy models.",
-      "oneOf": [
-        {
-          "description": "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
-          "enum": [
-            "commentary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "The assistant's terminal answer text for the current turn.",
-          "enum": [
-            "final_answer"
-          ],
-          "type": "string"
-        }
-      ]
-    },
-    "ModeKind": {
-      "description": "Initial collaboration mode to use when the TUI starts.",
-      "enum": [
-        "plan",
-        "default"
-      ],
-      "type": "string"
-    },
     "ModelListParams": {
       "properties": {
         "cursor": {
@@ -1213,7 +1088,6 @@
     },
     "Personality": {
       "enum": [
-        "none",
         "friendly",
         "pragmatic"
       ],
@@ -1364,16 +1238,6 @@
               ],
               "writeOnly": true
             },
-            "phase": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/MessagePhase"
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
             "role": {
               "type": "string"
             },
@@ -1450,7 +1314,7 @@
               ]
             },
             "id": {
-              "description": "Legacy id field retained for compatibility with older payloads.",
+              "description": "Set when using the chat completions API.",
               "type": [
                 "string",
                 "null"
@@ -2167,34 +2031,6 @@
       },
       "type": "object"
     },
-    "Settings": {
-      "description": "Settings for a collaboration mode.",
-      "properties": {
-        "developer_instructions": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "model": {
-          "type": "string"
-        },
-        "reasoning_effort": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ReasoningEffort"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "required": [
-        "model"
-      ],
-      "type": "object"
-    },
     "SkillsConfigWriteParams": {
       "properties": {
         "enabled": {
@@ -2210,24 +2046,6 @@
       ],
       "type": "object"
     },
-    "SkillsListExtraRootsForCwd": {
-      "properties": {
-        "cwd": {
-          "type": "string"
-        },
-        "extraUserRoots": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "cwd",
-        "extraUserRoots"
-      ],
-      "type": "object"
-    },
     "SkillsListParams": {
       "properties": {
         "cwds": {
@@ -2240,39 +2058,10 @@
         "forceReload": {
           "description": "When true, bypass the skills cache and re-scan skills from disk.",
           "type": "boolean"
-        },
-        "perCwdExtraUserRoots": {
-          "default": null,
-          "description": "Optional per-cwd extra roots to scan as user-scoped skills.",
-          "items": {
-            "$ref": "#/definitions/SkillsListExtraRootsForCwd"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
         }
       },
       "type": "object"
     },
-    "SkillsRemoteReadParams": {
-      "type": "object"
-    },
-    "SkillsRemoteWriteParams": {
-      "properties": {
-        "hazelnutId": {
-          "type": "string"
-        },
-        "isPreload": {
-          "type": "boolean"
-        }
-      },
-      "required": [
-        "hazelnutId",
-        "isPreload"
-      ],
-      "type": "object"
-    },
     "TextElement": {
       "properties": {
         "byteRange": {
@@ -2307,17 +2096,6 @@
       ],
       "type": "object"
     },
-    "ThreadCompactStartParams": {
-      "properties": {
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "threadId"
-      ],
-      "type": "object"
-    },
     "ThreadForkParams": {
       "description": "There are two ways to fork a thread: 1. By thread_id: load the thread from disk by thread_id and fork it into a new thread. 2. By path: load the thread from disk by path and fork it into a new thread.\n\nIf using path, the thread_id param will be ignored.\n\nPrefer using thread_id whenever possible.",
       "properties": {
@@ -2585,21 +2363,6 @@
       ],
       "type": "object"
     },
-    "ThreadSetNameParams": {
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name",
-        "threadId"
-      ],
-      "type": "object"
-    },
     "ThreadSortKey": {
       "enum": [
         "created_at",
@@ -2659,6 +2422,15 @@
             "null"
           ]
         },
+        "dynamicTools": {
+          "items": {
+            "$ref": "#/definitions/DynamicToolSpec"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
         "ephemeral": {
           "type": [
             "boolean",
@@ -2816,29 +2588,6 @@
       ],
       "type": "object"
     },
-    "TurnSteerParams": {
-      "properties": {
-        "expectedTurnId": {
-          "description": "Required active turn id precondition. The request fails when it does not match the currently active turn.",
-          "type": "string"
-        },
-        "input": {
-          "items": {
-            "$ref": "#/definitions/UserInput"
-          },
-          "type": "array"
-        },
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "expectedTurnId",
-        "input",
-        "threadId"
-      ],
-      "type": "object"
-    },
     "UserInput": {
       "oneOf": [
         {
@@ -3007,15 +2756,6 @@
       "oneOf": [
         {
           "properties": {
-            "queries": {
-              "items": {
-                "type": "string"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
             "query": {
               "type": [
                 "string",
@@ -3228,30 +2968,6 @@
       "title": "Thread/archiveRequest",
       "type": "object"
     },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "thread/name/set"
-          ],
-          "title": "Thread/name/setRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadSetNameParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Thread/name/setRequest",
-      "type": "object"
-    },
     {
       "properties": {
         "id": {
@@ -3276,30 +2992,6 @@
       "title": "Thread/unarchiveRequest",
       "type": "object"
     },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "thread/compact/start"
-          ],
-          "title": "Thread/compact/startRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadCompactStartParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Thread/compact/startRequest",
-      "type": "object"
-    },
     {
       "properties": {
         "id": {
@@ -3420,54 +3112,6 @@
       "title": "Skills/listRequest",
       "type": "object"
     },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "skills/remote/read"
-          ],
-          "title": "Skills/remote/readRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/SkillsRemoteReadParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Skills/remote/readRequest",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "skills/remote/write"
-          ],
-          "title": "Skills/remote/writeRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/SkillsRemoteWriteParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Skills/remote/writeRequest",
-      "type": "object"
-    },
     {
       "properties": {
         "id": {
@@ -3540,30 +3184,6 @@
       "title": "Turn/startRequest",
       "type": "object"
     },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "turn/steer"
-          ],
-          "title": "Turn/steerRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/TurnSteerParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Turn/steerRequest",
-      "type": "object"
-    },
     {
       "properties": {
         "id": {
@@ -3636,30 +3256,6 @@
       "title": "Model/listRequest",
       "type": "object"
     },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "experimentalFeature/list"
-          ],
-          "title": "ExperimentalFeature/listRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ExperimentalFeatureListParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "ExperimentalFeature/listRequest",
-      "type": "object"
-    },
     {
       "properties": {
         "id": {

codex-rs/app-server-json-schema/stable/DynamicToolCallResponse.json

@@ -1,17 +1,17 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "properties": {
-    "hazelnutId": {
+    "output": {
       "type": "string"
     },
-    "isPreload": {
+    "success": {
       "type": "boolean"
     }
   },
   "required": [
-    "hazelnutId",
-    "isPreload"
+    "output",
+    "success"
   ],
-  "title": "SkillsRemoteWriteParams",
+  "title": "DynamicToolCallResponse",
   "type": "object"
 }

codex-rs/app-server-json-schema/stable/FileChangeRequestApprovalParams.json

@@ -1,13 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "properties": {
-    "grantRoot": {
-      "description": "[UNSTABLE] When set, the agent is asking the user to allow writes under this root for the remainder of the session (unclear if this is honored today).",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
     "itemId": {
       "type": "string"
     },

codex-rs/app-server-json-schema/stable/ServerRequest.json

@@ -38,35 +38,6 @@
       ],
       "type": "object"
     },
-    "ChatgptAuthTokensRefreshParams": {
-      "properties": {
-        "previousAccountId": {
-          "description": "Workspace/account identifier that Codex was previously using.\n\nClients that manage multiple accounts/workspaces can use this as a hint to refresh the token for the correct workspace.\n\nThis may be `null` when the prior ID token did not include a workspace identifier (`chatgpt_account_id`) or when the token could not be parsed.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "reason": {
-          "$ref": "#/definitions/ChatgptAuthTokensRefreshReason"
-        }
-      },
-      "required": [
-        "reason"
-      ],
-      "type": "object"
-    },
-    "ChatgptAuthTokensRefreshReason": {
-      "oneOf": [
-        {
-          "description": "Codex attempted a backend request and received `401 Unauthorized`.",
-          "enum": [
-            "unauthorized"
-          ],
-          "type": "string"
-        }
-      ]
-    },
     "CommandAction": {
       "oneOf": [
         {
@@ -374,13 +345,6 @@
     },
     "FileChangeRequestApprovalParams": {
       "properties": {
-        "grantRoot": {
-          "description": "[UNSTABLE] When set, the agent is asking the user to allow writes under this root for the remainder of the session (unclear if this is honored today).",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
         "itemId": {
           "type": "string"
         },
@@ -529,86 +493,6 @@
     },
     "ThreadId": {
       "type": "string"
-    },
-    "ToolRequestUserInputOption": {
-      "description": "EXPERIMENTAL. Defines a single selectable option for request_user_input.",
-      "properties": {
-        "description": {
-          "type": "string"
-        },
-        "label": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "description",
-        "label"
-      ],
-      "type": "object"
-    },
-    "ToolRequestUserInputParams": {
-      "description": "EXPERIMENTAL. Params sent with a request_user_input event.",
-      "properties": {
-        "itemId": {
-          "type": "string"
-        },
-        "questions": {
-          "items": {
-            "$ref": "#/definitions/ToolRequestUserInputQuestion"
-          },
-          "type": "array"
-        },
-        "threadId": {
-          "type": "string"
-        },
-        "turnId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "itemId",
-        "questions",
-        "threadId",
-        "turnId"
-      ],
-      "type": "object"
-    },
-    "ToolRequestUserInputQuestion": {
-      "description": "EXPERIMENTAL. Represents one request_user_input question and its required options.",
-      "properties": {
-        "header": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
-        },
-        "isOther": {
-          "default": false,
-          "type": "boolean"
-        },
-        "isSecret": {
-          "default": false,
-          "type": "boolean"
-        },
-        "options": {
-          "items": {
-            "$ref": "#/definitions/ToolRequestUserInputOption"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "question": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "header",
-        "id",
-        "question"
-      ],
-      "type": "object"
     }
   },
   "description": "Request initiated from the server and sent to the client.",
@@ -663,31 +547,6 @@
       "title": "Item/fileChange/requestApprovalRequest",
       "type": "object"
     },
-    {
-      "description": "EXPERIMENTAL - Request input from the user for a tool call.",
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "item/tool/requestUserInput"
-          ],
-          "title": "Item/tool/requestUserInputRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ToolRequestUserInputParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Item/tool/requestUserInputRequest",
-      "type": "object"
-    },
     {
       "description": "Execute a dynamic tool call on the client.",
       "properties": {
@@ -713,30 +572,6 @@
       "title": "Item/tool/callRequest",
       "type": "object"
     },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "account/chatgptAuthTokens/refresh"
-          ],
-          "title": "Account/chatgptAuthTokens/refreshRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ChatgptAuthTokensRefreshParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Account/chatgptAuthTokens/refreshRequest",
-      "type": "object"
-    },
     {
       "description": "DEPRECATED APIs below Request to approve a patch. This request is used for Turns started via the legacy APIs (i.e. SendUserTurn, SendUserMessage).",
       "properties": {

codex-rs/app-server-json-schema/stable/v1/AddConversationListenerParams.json

@@ -8,10 +8,6 @@
   "properties": {
     "conversationId": {
       "$ref": "#/definitions/ThreadId"
-    },
-    "experimentalRawEvents": {
-      "default": false,
-      "type": "boolean"
     }
   },
   "required": [

codex-rs/app-server-json-schema/stable/v1/AuthStatusChangeNotification.json

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
     "AuthMode": {
-      "description": "Authentication mode for OpenAI-backed providers.",
+      "description": "Authentication mode for OpenAI-backed providers.\n\nThis is used internally to determine the base URL for generating responses, and to gate ChatGPT-only behaviors like rate limits and available models (as opposed to API key-based auth).",
       "oneOf": [
         {
           "description": "OpenAI API key provided by the caller and stored by Codex.",
@@ -17,13 +17,6 @@
             "chatgpt"
           ],
           "type": "string"
-        },
-        {
-          "description": "[UNSTABLE] FOR OPENAI INTERNAL USE ONLY - DO NOT USE.\n\nChatGPT auth tokens are supplied by an external host app and are only stored in memory. Token refresh must be handled by the external host app.",
-          "enum": [
-            "chatgptAuthTokens"
-          ],
-          "type": "string"
         }
       ]
     }

codex-rs/app-server-json-schema/stable/v1/ForkConversationResponse.json

@@ -93,6 +93,34 @@
         }
       ]
     },
+    "Annotations": {
+      "description": "Optional annotations for the client. The client can use annotations to inform how objects are used or displayed",
+      "properties": {
+        "audience": {
+          "items": {
+            "$ref": "#/definitions/Role"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "lastModified": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "priority": {
+          "format": "double",
+          "type": [
+            "number",
+            "null"
+          ]
+        }
+      },
+      "type": "object"
+    },
     "AskForApproval": {
       "description": "Determines the conditions under which the user is consulted to approve running the command proposed by Codex.",
       "oneOf": [
@@ -126,6 +154,57 @@
         }
       ]
     },
+    "AudioContent": {
+      "description": "Audio provided to or from an LLM.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "data": {
+          "type": "string"
+        },
+        "mimeType": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "data",
+        "mimeType",
+        "type"
+      ],
+      "type": "object"
+    },
+    "BlobResourceContents": {
+      "properties": {
+        "blob": {
+          "type": "string"
+        },
+        "mimeType": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "uri": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "blob",
+        "uri"
+      ],
+      "type": "object"
+    },
     "ByteRange": {
       "properties": {
         "end": {
@@ -150,9 +229,10 @@
     "CallToolResult": {
       "description": "The server's response to a tool call.",
       "properties": {
-        "_meta": true,
         "content": {
-          "items": true,
+          "items": {
+            "$ref": "#/definitions/ContentBlock"
+          },
           "type": "array"
         },
         "isError": {
@@ -310,6 +390,25 @@
         }
       ]
     },
+    "ContentBlock": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TextContent"
+        },
+        {
+          "$ref": "#/definitions/ImageContent"
+        },
+        {
+          "$ref": "#/definitions/AudioContent"
+        },
+        {
+          "$ref": "#/definitions/ResourceLink"
+        },
+        {
+          "$ref": "#/definitions/EmbeddedResource"
+        }
+      ]
+    },
     "ContentItem": {
       "oneOf": [
         {
@@ -445,6 +544,42 @@
       ],
       "type": "object"
     },
+    "EmbeddedResource": {
+      "description": "The contents of a resource, embedded into a prompt or tool call result.\n\nIt is up to the client how best to render embedded resources for the benefit of the LLM and/or the user.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "resource": {
+          "$ref": "#/definitions/EmbeddedResourceResource"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "resource",
+        "type"
+      ],
+      "type": "object"
+    },
+    "EmbeddedResourceResource": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TextResourceContents"
+        },
+        {
+          "$ref": "#/definitions/BlobResourceContents"
+        }
+      ]
+    },
     "EventMsg": {
       "description": "Response event from the agent NOTE: Make sure none of these values have optional types, as it will mess up the extension code-gen.",
       "oneOf": [
@@ -545,14 +680,6 @@
         {
           "description": "Agent has started a turn. v1 wire format uses `task_started`; accept `turn_started` for v2 interop.",
           "properties": {
-            "collaboration_mode_kind": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ModeKind"
-                }
-              ],
-              "default": "default"
-            },
             "model_context_window": {
               "format": "int64",
               "type": [
@@ -914,14 +1041,12 @@
               "description": "How to sandbox commands executed in the system"
             },
             "session_id": {
-              "$ref": "#/definitions/ThreadId"
-            },
-            "thread_name": {
-              "description": "Optional user-facing thread name (may be unset).",
-              "type": [
-                "string",
-                "null"
-              ]
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ThreadId"
+                }
+              ],
+              "description": "Name left as session_id instead of thread_id for backwards compatibility."
             },
             "type": {
               "enum": [
@@ -945,33 +1070,6 @@
           "title": "SessionConfiguredEventMsg",
           "type": "object"
         },
-        {
-          "description": "Updated session metadata (e.g., thread name changes).",
-          "properties": {
-            "thread_id": {
-              "$ref": "#/definitions/ThreadId"
-            },
-            "thread_name": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "thread_name_updated"
-              ],
-              "title": "ThreadNameUpdatedEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "thread_id",
-            "type"
-          ],
-          "title": "ThreadNameUpdatedEventMsg",
-          "type": "object"
-        },
         {
           "description": "Incremental MCP startup progress updates.",
           "properties": {
@@ -2012,59 +2110,6 @@
           "title": "ListSkillsResponseEventMsg",
           "type": "object"
         },
-        {
-          "description": "List of remote skills available to the agent.",
-          "properties": {
-            "skills": {
-              "items": {
-                "$ref": "#/definitions/RemoteSkillSummary"
-              },
-              "type": "array"
-            },
-            "type": {
-              "enum": [
-                "list_remote_skills_response"
-              ],
-              "title": "ListRemoteSkillsResponseEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "skills",
-            "type"
-          ],
-          "title": "ListRemoteSkillsResponseEventMsg",
-          "type": "object"
-        },
-        {
-          "description": "Remote skill downloaded to local cache.",
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "name": {
-              "type": "string"
-            },
-            "path": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "remote_skill_downloaded"
-              ],
-              "title": "RemoteSkillDownloadedEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "name",
-            "path",
-            "type"
-          ],
-          "title": "RemoteSkillDownloadedEventMsg",
-          "type": "object"
-        },
         {
           "description": "Notification that skill data may have been updated and clients may want to reload.",
           "properties": {
@@ -2086,7 +2131,6 @@
           "properties": {
             "explanation": {
               "default": null,
-              "description": "Arguments for the `update_plan` todo/checklist tool (not plan mode).",
               "type": [
                 "string",
                 "null"
@@ -2312,38 +2356,6 @@
           "title": "AgentMessageContentDeltaEventMsg",
           "type": "object"
         },
-        {
-          "properties": {
-            "delta": {
-              "type": "string"
-            },
-            "item_id": {
-              "type": "string"
-            },
-            "thread_id": {
-              "type": "string"
-            },
-            "turn_id": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "plan_delta"
-              ],
-              "title": "PlanDeltaEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "delta",
-            "item_id",
-            "thread_id",
-            "turn_id",
-            "type"
-          ],
-          "title": "PlanDeltaEventMsg",
-          "type": "object"
-        },
         {
           "properties": {
             "delta": {
@@ -2775,95 +2787,6 @@
           ],
           "title": "CollabCloseEndEventMsg",
           "type": "object"
-        },
-        {
-          "description": "Collab interaction: resume begin.",
-          "properties": {
-            "call_id": {
-              "description": "Identifier for the collab tool call.",
-              "type": "string"
-            },
-            "receiver_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the receiver."
-            },
-            "sender_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the sender."
-            },
-            "type": {
-              "enum": [
-                "collab_resume_begin"
-              ],
-              "title": "CollabResumeBeginEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "call_id",
-            "receiver_thread_id",
-            "sender_thread_id",
-            "type"
-          ],
-          "title": "CollabResumeBeginEventMsg",
-          "type": "object"
-        },
-        {
-          "description": "Collab interaction: resume end.",
-          "properties": {
-            "call_id": {
-              "description": "Identifier for the collab tool call.",
-              "type": "string"
-            },
-            "receiver_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the receiver."
-            },
-            "sender_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the sender."
-            },
-            "status": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/AgentStatus"
-                }
-              ],
-              "description": "Last known status of the receiver agent reported to the sender agent after resume."
-            },
-            "type": {
-              "enum": [
-                "collab_resume_end"
-              ],
-              "title": "CollabResumeEndEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "call_id",
-            "receiver_thread_id",
-            "sender_thread_id",
-            "status",
-            "type"
-          ],
-          "title": "CollabResumeEndEventMsg",
-          "type": "object"
         }
       ]
     },
@@ -2953,19 +2876,6 @@
         }
       ]
     },
-    "FunctionCallOutputBody": {
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "items": {
-            "$ref": "#/definitions/FunctionCallOutputContentItem"
-          },
-          "type": "array"
-        }
-      ]
-    },
     "FunctionCallOutputContentItem": {
       "description": "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
       "oneOf": [
@@ -3012,10 +2922,19 @@
       ]
     },
     "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.",
+      "description": "The payload we send back to OpenAI when reporting a tool call result.\n\n`content` preserves the historical plain-string payload so downstream integrations (tests, logging, etc.) can keep treating tool output as `String`. When an MCP server returns richer data we additionally populate `content_items` with the structured form that the Responses/Chat Completions APIs understand.",
       "properties": {
-        "body": {
-          "$ref": "#/definitions/FunctionCallOutputBody"
+        "content": {
+          "type": "string"
+        },
+        "content_items": {
+          "items": {
+            "$ref": "#/definitions/FunctionCallOutputContentItem"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
         },
         "success": {
           "type": [
@@ -3025,7 +2944,7 @@
         }
       },
       "required": [
-        "body"
+        "content"
       ],
       "type": "object"
     },
@@ -3082,6 +3001,36 @@
       ],
       "type": "object"
     },
+    "ImageContent": {
+      "description": "An image provided to or from an LLM.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "data": {
+          "type": "string"
+        },
+        "mimeType": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "data",
+        "mimeType",
+        "type"
+      ],
+      "type": "object"
+    },
     "LocalShellAction": {
       "oneOf": [
         {
@@ -3257,33 +3206,6 @@
         }
       ]
     },
-    "MessagePhase": {
-      "description": "Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as \"phase unknown\" and keep compatibility behavior for legacy models.",
-      "oneOf": [
-        {
-          "description": "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
-          "enum": [
-            "commentary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "The assistant's terminal answer text for the current turn.",
-          "enum": [
-            "final_answer"
-          ],
-          "type": "string"
-        }
-      ]
-    },
-    "ModeKind": {
-      "description": "Initial collaboration mode to use when the TUI starts.",
-      "enum": [
-        "plan",
-        "default"
-      ],
-      "type": "string"
-    },
     "NetworkAccess": {
       "description": "Represents whether outbound network access is available to the agent.",
       "enum": [
@@ -3587,25 +3509,6 @@
         }
       ]
     },
-    "RemoteSkillSummary": {
-      "properties": {
-        "description": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "description",
-        "id",
-        "name"
-      ],
-      "type": "object"
-    },
     "RequestId": {
       "anyOf": [
         {
@@ -3615,8 +3518,7 @@
           "format": "int64",
           "type": "integer"
         }
-      ],
-      "description": "ID of a request, which can be either a string or an integer."
+      ]
     },
     "RequestUserInputQuestion": {
       "properties": {
@@ -3672,21 +3574,22 @@
     "Resource": {
       "description": "A known resource that the server is capable of reading.",
       "properties": {
-        "_meta": true,
-        "annotations": true,
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "description": {
           "type": [
             "string",
             "null"
           ]
         },
-        "icons": {
-          "items": true,
-          "type": [
-            "array",
-            "null"
-          ]
-        },
         "mimeType": {
           "type": [
             "string",
@@ -3719,10 +3622,74 @@
       ],
       "type": "object"
     },
+    "ResourceLink": {
+      "description": "A resource that the server is capable of reading, included in a prompt or tool call result.\n\nNote: resource links returned by tools are not guaranteed to appear in the results of `resources/list` requests.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "description": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "mimeType": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "name": {
+          "type": "string"
+        },
+        "size": {
+          "format": "int64",
+          "type": [
+            "integer",
+            "null"
+          ]
+        },
+        "title": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "type": {
+          "type": "string"
+        },
+        "uri": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "uri"
+      ],
+      "type": "object"
+    },
     "ResourceTemplate": {
       "description": "A template description for resources available on the server.",
       "properties": {
-        "annotations": true,
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "description": {
           "type": [
             "string",
@@ -3777,16 +3744,6 @@
               ],
               "writeOnly": true
             },
-            "phase": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/MessagePhase"
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
             "role": {
               "type": "string"
             },
@@ -3863,7 +3820,7 @@
               ]
             },
             "id": {
-              "description": "Legacy id field retained for compatibility with older payloads.",
+              "description": "Set when using the chat completions API.",
               "type": [
                 "string",
                 "null"
@@ -4323,6 +4280,14 @@
         }
       ]
     },
+    "Role": {
+      "description": "The sender or recipient of messages and data in a conversation.",
+      "enum": [
+        "assistant",
+        "user"
+      ],
+      "type": "string"
+    },
     "SandboxPolicy": {
       "description": "Determines execution restrictions for model shell commands.",
       "oneOf": [
@@ -4632,6 +4597,32 @@
       ],
       "type": "string"
     },
+    "TextContent": {
+      "description": "Text provided to or from an LLM.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "text": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "text",
+        "type"
+      ],
+      "type": "object"
+    },
     "TextElement": {
       "properties": {
         "byte_range": {
@@ -4655,6 +4646,27 @@
       ],
       "type": "object"
     },
+    "TextResourceContents": {
+      "properties": {
+        "mimeType": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "text": {
+          "type": "string"
+        },
+        "uri": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "text",
+        "uri"
+      ],
+      "type": "object"
+    },
     "ThreadId": {
       "type": "string"
     },
@@ -4715,26 +4727,38 @@
     "Tool": {
       "description": "Definition for a tool the client can call.",
       "properties": {
-        "_meta": true,
-        "annotations": true,
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ToolAnnotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "description": {
           "type": [
             "string",
             "null"
           ]
         },
-        "icons": {
-          "items": true,
-          "type": [
-            "array",
-            "null"
-          ]
+        "inputSchema": {
+          "$ref": "#/definitions/ToolInputSchema"
         },
-        "inputSchema": true,
         "name": {
           "type": "string"
         },
-        "outputSchema": true,
+        "outputSchema": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ToolOutputSchema"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "title": {
           "type": [
             "string",
@@ -4748,6 +4772,82 @@
       ],
       "type": "object"
     },
+    "ToolAnnotations": {
+      "description": "Additional properties describing a Tool to clients.\n\nNOTE: all properties in ToolAnnotations are **hints**. They are not guaranteed to provide a faithful description of tool behavior (including descriptive properties like `title`).\n\nClients should never make tool use decisions based on ToolAnnotations received from untrusted servers.",
+      "properties": {
+        "destructiveHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "idempotentHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "openWorldHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "readOnlyHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "title": {
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "type": "object"
+    },
+    "ToolInputSchema": {
+      "description": "A JSON Schema object defining the expected parameters for the tool.",
+      "properties": {
+        "properties": true,
+        "required": {
+          "items": {
+            "type": "string"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "type": {
+          "default": "object",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
+    "ToolOutputSchema": {
+      "description": "An optional JSON Schema object defining the structure of the tool's output returned in the structuredContent field of a CallToolResult.",
+      "properties": {
+        "properties": true,
+        "required": {
+          "items": {
+            "type": "string"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "type": {
+          "default": "object",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
     "TurnAbortReason": {
       "enum": [
         "interrupted",
@@ -4786,7 +4886,6 @@
           "type": "object"
         },
         {
-          "description": "Assistant-authored message payload used in turn-item streams.\n\n`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`.",
           "properties": {
             "content": {
               "items": {
@@ -4797,17 +4896,6 @@
             "id": {
               "type": "string"
             },
-            "phase": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/MessagePhase"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Optional phase metadata carried through from `ResponseItem::Message`.\n\nThis is currently used by TUI rendering to distinguish mid-turn commentary from a final answer and avoid status-indicator jitter."
-            },
             "type": {
               "enum": [
                 "AgentMessage"
@@ -4824,30 +4912,6 @@
           "title": "AgentMessageTurnItem",
           "type": "object"
         },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "Plan"
-              ],
-              "title": "PlanTurnItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "text",
-            "type"
-          ],
-          "title": "PlanTurnItem",
-          "type": "object"
-        },
         {
           "properties": {
             "id": {
@@ -5061,15 +5125,6 @@
       "oneOf": [
         {
           "properties": {
-            "queries": {
-              "items": {
-                "type": "string"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
             "query": {
               "type": [
                 "string",
@@ -5186,4 +5241,4 @@
   ],
   "title": "ForkConversationResponse",
   "type": "object"
-}
+}

codex-rs/app-server-json-schema/stable/v1/GetAuthStatusResponse.json

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
     "AuthMode": {
-      "description": "Authentication mode for OpenAI-backed providers.",
+      "description": "Authentication mode for OpenAI-backed providers.\n\nThis is used internally to determine the base URL for generating responses, and to gate ChatGPT-only behaviors like rate limits and available models (as opposed to API key-based auth).",
       "oneOf": [
         {
           "description": "OpenAI API key provided by the caller and stored by Codex.",
@@ -17,13 +17,6 @@
             "chatgpt"
           ],
           "type": "string"
-        },
-        {
-          "description": "[UNSTABLE] FOR OPENAI INTERNAL USE ONLY - DO NOT USE.\n\nChatGPT auth tokens are supplied by an external host app and are only stored in memory. Token refresh must be handled by the external host app.",
-          "enum": [
-            "chatgptAuthTokens"
-          ],
-          "type": "string"
         }
       ]
     }

codex-rs/app-server-json-schema/stable/v1/InitializeParams.json

@@ -21,30 +21,9 @@
         "version"
       ],
       "type": "object"
-    },
-    "InitializeCapabilities": {
-      "description": "Client-declared capabilities negotiated during initialize.",
-      "properties": {
-        "experimentalApi": {
-          "default": false,
-          "description": "Opt into receiving experimental API methods and fields.",
-          "type": "boolean"
-        }
-      },
-      "type": "object"
     }
   },
   "properties": {
-    "capabilities": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/InitializeCapabilities"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
     "clientInfo": {
       "$ref": "#/definitions/ClientInfo"
     }

codex-rs/app-server-json-schema/stable/v1/ResumeConversationParams.json

@@ -98,19 +98,6 @@
         }
       ]
     },
-    "FunctionCallOutputBody": {
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "items": {
-            "$ref": "#/definitions/FunctionCallOutputContentItem"
-          },
-          "type": "array"
-        }
-      ]
-    },
     "FunctionCallOutputContentItem": {
       "description": "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
       "oneOf": [
@@ -157,10 +144,19 @@
       ]
     },
     "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.",
+      "description": "The payload we send back to OpenAI when reporting a tool call result.\n\n`content` preserves the historical plain-string payload so downstream integrations (tests, logging, etc.) can keep treating tool output as `String`. When an MCP server returns richer data we additionally populate `content_items` with the structured form that the Responses/Chat Completions APIs understand.",
       "properties": {
-        "body": {
-          "$ref": "#/definitions/FunctionCallOutputBody"
+        "content": {
+          "type": "string"
+        },
+        "content_items": {
+          "items": {
+            "$ref": "#/definitions/FunctionCallOutputContentItem"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
         },
         "success": {
           "type": [
@@ -170,7 +166,7 @@
         }
       },
       "required": [
-        "body"
+        "content"
       ],
       "type": "object"
     },
@@ -270,25 +266,6 @@
       ],
       "type": "string"
     },
-    "MessagePhase": {
-      "description": "Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as \"phase unknown\" and keep compatibility behavior for legacy models.",
-      "oneOf": [
-        {
-          "description": "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
-          "enum": [
-            "commentary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "The assistant's terminal answer text for the current turn.",
-          "enum": [
-            "final_answer"
-          ],
-          "type": "string"
-        }
-      ]
-    },
     "NewConversationParams": {
       "properties": {
         "approvalPolicy": {
@@ -460,16 +437,6 @@
               ],
               "writeOnly": true
             },
-            "phase": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/MessagePhase"
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
             "role": {
               "type": "string"
             },
@@ -546,7 +513,7 @@
               ]
             },
             "id": {
-              "description": "Legacy id field retained for compatibility with older payloads.",
+              "description": "Set when using the chat completions API.",
               "type": [
                 "string",
                 "null"
@@ -808,15 +775,6 @@
       "oneOf": [
         {
           "properties": {
-            "queries": {
-              "items": {
-                "type": "string"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
             "query": {
               "type": [
                 "string",

codex-rs/app-server-json-schema/stable/v1/ResumeConversationResponse.json

@@ -93,6 +93,34 @@
         }
       ]
     },
+    "Annotations": {
+      "description": "Optional annotations for the client. The client can use annotations to inform how objects are used or displayed",
+      "properties": {
+        "audience": {
+          "items": {
+            "$ref": "#/definitions/Role"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "lastModified": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "priority": {
+          "format": "double",
+          "type": [
+            "number",
+            "null"
+          ]
+        }
+      },
+      "type": "object"
+    },
     "AskForApproval": {
       "description": "Determines the conditions under which the user is consulted to approve running the command proposed by Codex.",
       "oneOf": [
@@ -126,6 +154,57 @@
         }
       ]
     },
+    "AudioContent": {
+      "description": "Audio provided to or from an LLM.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "data": {
+          "type": "string"
+        },
+        "mimeType": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "data",
+        "mimeType",
+        "type"
+      ],
+      "type": "object"
+    },
+    "BlobResourceContents": {
+      "properties": {
+        "blob": {
+          "type": "string"
+        },
+        "mimeType": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "uri": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "blob",
+        "uri"
+      ],
+      "type": "object"
+    },
     "ByteRange": {
       "properties": {
         "end": {
@@ -150,9 +229,10 @@
     "CallToolResult": {
       "description": "The server's response to a tool call.",
       "properties": {
-        "_meta": true,
         "content": {
-          "items": true,
+          "items": {
+            "$ref": "#/definitions/ContentBlock"
+          },
           "type": "array"
         },
         "isError": {
@@ -310,6 +390,25 @@
         }
       ]
     },
+    "ContentBlock": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TextContent"
+        },
+        {
+          "$ref": "#/definitions/ImageContent"
+        },
+        {
+          "$ref": "#/definitions/AudioContent"
+        },
+        {
+          "$ref": "#/definitions/ResourceLink"
+        },
+        {
+          "$ref": "#/definitions/EmbeddedResource"
+        }
+      ]
+    },
     "ContentItem": {
       "oneOf": [
         {
@@ -445,6 +544,42 @@
       ],
       "type": "object"
     },
+    "EmbeddedResource": {
+      "description": "The contents of a resource, embedded into a prompt or tool call result.\n\nIt is up to the client how best to render embedded resources for the benefit of the LLM and/or the user.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "resource": {
+          "$ref": "#/definitions/EmbeddedResourceResource"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "resource",
+        "type"
+      ],
+      "type": "object"
+    },
+    "EmbeddedResourceResource": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TextResourceContents"
+        },
+        {
+          "$ref": "#/definitions/BlobResourceContents"
+        }
+      ]
+    },
     "EventMsg": {
       "description": "Response event from the agent NOTE: Make sure none of these values have optional types, as it will mess up the extension code-gen.",
       "oneOf": [
@@ -545,14 +680,6 @@
         {
           "description": "Agent has started a turn. v1 wire format uses `task_started`; accept `turn_started` for v2 interop.",
           "properties": {
-            "collaboration_mode_kind": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ModeKind"
-                }
-              ],
-              "default": "default"
-            },
             "model_context_window": {
               "format": "int64",
               "type": [
@@ -914,14 +1041,12 @@
               "description": "How to sandbox commands executed in the system"
             },
             "session_id": {
-              "$ref": "#/definitions/ThreadId"
-            },
-            "thread_name": {
-              "description": "Optional user-facing thread name (may be unset).",
-              "type": [
-                "string",
-                "null"
-              ]
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ThreadId"
+                }
+              ],
+              "description": "Name left as session_id instead of thread_id for backwards compatibility."
             },
             "type": {
               "enum": [
@@ -945,33 +1070,6 @@
           "title": "SessionConfiguredEventMsg",
           "type": "object"
         },
-        {
-          "description": "Updated session metadata (e.g., thread name changes).",
-          "properties": {
-            "thread_id": {
-              "$ref": "#/definitions/ThreadId"
-            },
-            "thread_name": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "thread_name_updated"
-              ],
-              "title": "ThreadNameUpdatedEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "thread_id",
-            "type"
-          ],
-          "title": "ThreadNameUpdatedEventMsg",
-          "type": "object"
-        },
         {
           "description": "Incremental MCP startup progress updates.",
           "properties": {
@@ -2012,59 +2110,6 @@
           "title": "ListSkillsResponseEventMsg",
           "type": "object"
         },
-        {
-          "description": "List of remote skills available to the agent.",
-          "properties": {
-            "skills": {
-              "items": {
-                "$ref": "#/definitions/RemoteSkillSummary"
-              },
-              "type": "array"
-            },
-            "type": {
-              "enum": [
-                "list_remote_skills_response"
-              ],
-              "title": "ListRemoteSkillsResponseEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "skills",
-            "type"
-          ],
-          "title": "ListRemoteSkillsResponseEventMsg",
-          "type": "object"
-        },
-        {
-          "description": "Remote skill downloaded to local cache.",
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "name": {
-              "type": "string"
-            },
-            "path": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "remote_skill_downloaded"
-              ],
-              "title": "RemoteSkillDownloadedEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "name",
-            "path",
-            "type"
-          ],
-          "title": "RemoteSkillDownloadedEventMsg",
-          "type": "object"
-        },
         {
           "description": "Notification that skill data may have been updated and clients may want to reload.",
           "properties": {
@@ -2086,7 +2131,6 @@
           "properties": {
             "explanation": {
               "default": null,
-              "description": "Arguments for the `update_plan` todo/checklist tool (not plan mode).",
               "type": [
                 "string",
                 "null"
@@ -2312,38 +2356,6 @@
           "title": "AgentMessageContentDeltaEventMsg",
           "type": "object"
         },
-        {
-          "properties": {
-            "delta": {
-              "type": "string"
-            },
-            "item_id": {
-              "type": "string"
-            },
-            "thread_id": {
-              "type": "string"
-            },
-            "turn_id": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "plan_delta"
-              ],
-              "title": "PlanDeltaEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "delta",
-            "item_id",
-            "thread_id",
-            "turn_id",
-            "type"
-          ],
-          "title": "PlanDeltaEventMsg",
-          "type": "object"
-        },
         {
           "properties": {
             "delta": {
@@ -2775,95 +2787,6 @@
           ],
           "title": "CollabCloseEndEventMsg",
           "type": "object"
-        },
-        {
-          "description": "Collab interaction: resume begin.",
-          "properties": {
-            "call_id": {
-              "description": "Identifier for the collab tool call.",
-              "type": "string"
-            },
-            "receiver_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the receiver."
-            },
-            "sender_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the sender."
-            },
-            "type": {
-              "enum": [
-                "collab_resume_begin"
-              ],
-              "title": "CollabResumeBeginEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "call_id",
-            "receiver_thread_id",
-            "sender_thread_id",
-            "type"
-          ],
-          "title": "CollabResumeBeginEventMsg",
-          "type": "object"
-        },
-        {
-          "description": "Collab interaction: resume end.",
-          "properties": {
-            "call_id": {
-              "description": "Identifier for the collab tool call.",
-              "type": "string"
-            },
-            "receiver_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the receiver."
-            },
-            "sender_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the sender."
-            },
-            "status": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/AgentStatus"
-                }
-              ],
-              "description": "Last known status of the receiver agent reported to the sender agent after resume."
-            },
-            "type": {
-              "enum": [
-                "collab_resume_end"
-              ],
-              "title": "CollabResumeEndEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "call_id",
-            "receiver_thread_id",
-            "sender_thread_id",
-            "status",
-            "type"
-          ],
-          "title": "CollabResumeEndEventMsg",
-          "type": "object"
         }
       ]
     },
@@ -2953,19 +2876,6 @@
         }
       ]
     },
-    "FunctionCallOutputBody": {
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "items": {
-            "$ref": "#/definitions/FunctionCallOutputContentItem"
-          },
-          "type": "array"
-        }
-      ]
-    },
     "FunctionCallOutputContentItem": {
       "description": "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
       "oneOf": [
@@ -3012,10 +2922,19 @@
       ]
     },
     "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.",
+      "description": "The payload we send back to OpenAI when reporting a tool call result.\n\n`content` preserves the historical plain-string payload so downstream integrations (tests, logging, etc.) can keep treating tool output as `String`. When an MCP server returns richer data we additionally populate `content_items` with the structured form that the Responses/Chat Completions APIs understand.",
       "properties": {
-        "body": {
-          "$ref": "#/definitions/FunctionCallOutputBody"
+        "content": {
+          "type": "string"
+        },
+        "content_items": {
+          "items": {
+            "$ref": "#/definitions/FunctionCallOutputContentItem"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
         },
         "success": {
           "type": [
@@ -3025,7 +2944,7 @@
         }
       },
       "required": [
-        "body"
+        "content"
       ],
       "type": "object"
     },
@@ -3082,6 +3001,36 @@
       ],
       "type": "object"
     },
+    "ImageContent": {
+      "description": "An image provided to or from an LLM.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "data": {
+          "type": "string"
+        },
+        "mimeType": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "data",
+        "mimeType",
+        "type"
+      ],
+      "type": "object"
+    },
     "LocalShellAction": {
       "oneOf": [
         {
@@ -3257,33 +3206,6 @@
         }
       ]
     },
-    "MessagePhase": {
-      "description": "Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as \"phase unknown\" and keep compatibility behavior for legacy models.",
-      "oneOf": [
-        {
-          "description": "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
-          "enum": [
-            "commentary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "The assistant's terminal answer text for the current turn.",
-          "enum": [
-            "final_answer"
-          ],
-          "type": "string"
-        }
-      ]
-    },
-    "ModeKind": {
-      "description": "Initial collaboration mode to use when the TUI starts.",
-      "enum": [
-        "plan",
-        "default"
-      ],
-      "type": "string"
-    },
     "NetworkAccess": {
       "description": "Represents whether outbound network access is available to the agent.",
       "enum": [
@@ -3587,25 +3509,6 @@
         }
       ]
     },
-    "RemoteSkillSummary": {
-      "properties": {
-        "description": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "description",
-        "id",
-        "name"
-      ],
-      "type": "object"
-    },
     "RequestId": {
       "anyOf": [
         {
@@ -3615,8 +3518,7 @@
           "format": "int64",
           "type": "integer"
         }
-      ],
-      "description": "ID of a request, which can be either a string or an integer."
+      ]
     },
     "RequestUserInputQuestion": {
       "properties": {
@@ -3672,21 +3574,22 @@
     "Resource": {
       "description": "A known resource that the server is capable of reading.",
       "properties": {
-        "_meta": true,
-        "annotations": true,
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "description": {
           "type": [
             "string",
             "null"
           ]
         },
-        "icons": {
-          "items": true,
-          "type": [
-            "array",
-            "null"
-          ]
-        },
         "mimeType": {
           "type": [
             "string",
@@ -3719,10 +3622,74 @@
       ],
       "type": "object"
     },
+    "ResourceLink": {
+      "description": "A resource that the server is capable of reading, included in a prompt or tool call result.\n\nNote: resource links returned by tools are not guaranteed to appear in the results of `resources/list` requests.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "description": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "mimeType": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "name": {
+          "type": "string"
+        },
+        "size": {
+          "format": "int64",
+          "type": [
+            "integer",
+            "null"
+          ]
+        },
+        "title": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "type": {
+          "type": "string"
+        },
+        "uri": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "uri"
+      ],
+      "type": "object"
+    },
     "ResourceTemplate": {
       "description": "A template description for resources available on the server.",
       "properties": {
-        "annotations": true,
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "description": {
           "type": [
             "string",
@@ -3777,16 +3744,6 @@
               ],
               "writeOnly": true
             },
-            "phase": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/MessagePhase"
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
             "role": {
               "type": "string"
             },
@@ -3863,7 +3820,7 @@
               ]
             },
             "id": {
-              "description": "Legacy id field retained for compatibility with older payloads.",
+              "description": "Set when using the chat completions API.",
               "type": [
                 "string",
                 "null"
@@ -4323,6 +4280,14 @@
         }
       ]
     },
+    "Role": {
+      "description": "The sender or recipient of messages and data in a conversation.",
+      "enum": [
+        "assistant",
+        "user"
+      ],
+      "type": "string"
+    },
     "SandboxPolicy": {
       "description": "Determines execution restrictions for model shell commands.",
       "oneOf": [
@@ -4632,6 +4597,32 @@
       ],
       "type": "string"
     },
+    "TextContent": {
+      "description": "Text provided to or from an LLM.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "text": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "text",
+        "type"
+      ],
+      "type": "object"
+    },
     "TextElement": {
       "properties": {
         "byte_range": {
@@ -4655,6 +4646,27 @@
       ],
       "type": "object"
     },
+    "TextResourceContents": {
+      "properties": {
+        "mimeType": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "text": {
+          "type": "string"
+        },
+        "uri": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "text",
+        "uri"
+      ],
+      "type": "object"
+    },
     "ThreadId": {
       "type": "string"
     },
@@ -4715,26 +4727,38 @@
     "Tool": {
       "description": "Definition for a tool the client can call.",
       "properties": {
-        "_meta": true,
-        "annotations": true,
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ToolAnnotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "description": {
           "type": [
             "string",
             "null"
           ]
         },
-        "icons": {
-          "items": true,
-          "type": [
-            "array",
-            "null"
-          ]
+        "inputSchema": {
+          "$ref": "#/definitions/ToolInputSchema"
         },
-        "inputSchema": true,
         "name": {
           "type": "string"
         },
-        "outputSchema": true,
+        "outputSchema": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ToolOutputSchema"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "title": {
           "type": [
             "string",
@@ -4748,6 +4772,82 @@
       ],
       "type": "object"
     },
+    "ToolAnnotations": {
+      "description": "Additional properties describing a Tool to clients.\n\nNOTE: all properties in ToolAnnotations are **hints**. They are not guaranteed to provide a faithful description of tool behavior (including descriptive properties like `title`).\n\nClients should never make tool use decisions based on ToolAnnotations received from untrusted servers.",
+      "properties": {
+        "destructiveHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "idempotentHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "openWorldHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "readOnlyHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "title": {
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "type": "object"
+    },
+    "ToolInputSchema": {
+      "description": "A JSON Schema object defining the expected parameters for the tool.",
+      "properties": {
+        "properties": true,
+        "required": {
+          "items": {
+            "type": "string"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "type": {
+          "default": "object",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
+    "ToolOutputSchema": {
+      "description": "An optional JSON Schema object defining the structure of the tool's output returned in the structuredContent field of a CallToolResult.",
+      "properties": {
+        "properties": true,
+        "required": {
+          "items": {
+            "type": "string"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "type": {
+          "default": "object",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
     "TurnAbortReason": {
       "enum": [
         "interrupted",
@@ -4786,7 +4886,6 @@
           "type": "object"
         },
         {
-          "description": "Assistant-authored message payload used in turn-item streams.\n\n`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`.",
           "properties": {
             "content": {
               "items": {
@@ -4797,17 +4896,6 @@
             "id": {
               "type": "string"
             },
-            "phase": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/MessagePhase"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Optional phase metadata carried through from `ResponseItem::Message`.\n\nThis is currently used by TUI rendering to distinguish mid-turn commentary from a final answer and avoid status-indicator jitter."
-            },
             "type": {
               "enum": [
                 "AgentMessage"
@@ -4824,30 +4912,6 @@
           "title": "AgentMessageTurnItem",
           "type": "object"
         },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "Plan"
-              ],
-              "title": "PlanTurnItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "text",
-            "type"
-          ],
-          "title": "PlanTurnItem",
-          "type": "object"
-        },
         {
           "properties": {
             "id": {
@@ -5061,15 +5125,6 @@
       "oneOf": [
         {
           "properties": {
-            "queries": {
-              "items": {
-                "type": "string"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
             "query": {
               "type": [
                 "string",
@@ -5186,4 +5241,4 @@
   ],
   "title": "ResumeConversationResponse",
   "type": "object"
-}
+}

codex-rs/app-server-json-schema/stable/v1/SessionConfiguredNotification.json

@@ -93,6 +93,34 @@
         }
       ]
     },
+    "Annotations": {
+      "description": "Optional annotations for the client. The client can use annotations to inform how objects are used or displayed",
+      "properties": {
+        "audience": {
+          "items": {
+            "$ref": "#/definitions/Role"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "lastModified": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "priority": {
+          "format": "double",
+          "type": [
+            "number",
+            "null"
+          ]
+        }
+      },
+      "type": "object"
+    },
     "AskForApproval": {
       "description": "Determines the conditions under which the user is consulted to approve running the command proposed by Codex.",
       "oneOf": [
@@ -126,6 +154,57 @@
         }
       ]
     },
+    "AudioContent": {
+      "description": "Audio provided to or from an LLM.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "data": {
+          "type": "string"
+        },
+        "mimeType": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "data",
+        "mimeType",
+        "type"
+      ],
+      "type": "object"
+    },
+    "BlobResourceContents": {
+      "properties": {
+        "blob": {
+          "type": "string"
+        },
+        "mimeType": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "uri": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "blob",
+        "uri"
+      ],
+      "type": "object"
+    },
     "ByteRange": {
       "properties": {
         "end": {
@@ -150,9 +229,10 @@
     "CallToolResult": {
       "description": "The server's response to a tool call.",
       "properties": {
-        "_meta": true,
         "content": {
-          "items": true,
+          "items": {
+            "$ref": "#/definitions/ContentBlock"
+          },
           "type": "array"
         },
         "isError": {
@@ -310,6 +390,25 @@
         }
       ]
     },
+    "ContentBlock": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TextContent"
+        },
+        {
+          "$ref": "#/definitions/ImageContent"
+        },
+        {
+          "$ref": "#/definitions/AudioContent"
+        },
+        {
+          "$ref": "#/definitions/ResourceLink"
+        },
+        {
+          "$ref": "#/definitions/EmbeddedResource"
+        }
+      ]
+    },
     "ContentItem": {
       "oneOf": [
         {
@@ -445,6 +544,42 @@
       ],
       "type": "object"
     },
+    "EmbeddedResource": {
+      "description": "The contents of a resource, embedded into a prompt or tool call result.\n\nIt is up to the client how best to render embedded resources for the benefit of the LLM and/or the user.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "resource": {
+          "$ref": "#/definitions/EmbeddedResourceResource"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "resource",
+        "type"
+      ],
+      "type": "object"
+    },
+    "EmbeddedResourceResource": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TextResourceContents"
+        },
+        {
+          "$ref": "#/definitions/BlobResourceContents"
+        }
+      ]
+    },
     "EventMsg": {
       "description": "Response event from the agent NOTE: Make sure none of these values have optional types, as it will mess up the extension code-gen.",
       "oneOf": [
@@ -545,14 +680,6 @@
         {
           "description": "Agent has started a turn. v1 wire format uses `task_started`; accept `turn_started` for v2 interop.",
           "properties": {
-            "collaboration_mode_kind": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ModeKind"
-                }
-              ],
-              "default": "default"
-            },
             "model_context_window": {
               "format": "int64",
               "type": [
@@ -914,14 +1041,12 @@
               "description": "How to sandbox commands executed in the system"
             },
             "session_id": {
-              "$ref": "#/definitions/ThreadId"
-            },
-            "thread_name": {
-              "description": "Optional user-facing thread name (may be unset).",
-              "type": [
-                "string",
-                "null"
-              ]
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ThreadId"
+                }
+              ],
+              "description": "Name left as session_id instead of thread_id for backwards compatibility."
             },
             "type": {
               "enum": [
@@ -945,33 +1070,6 @@
           "title": "SessionConfiguredEventMsg",
           "type": "object"
         },
-        {
-          "description": "Updated session metadata (e.g., thread name changes).",
-          "properties": {
-            "thread_id": {
-              "$ref": "#/definitions/ThreadId"
-            },
-            "thread_name": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "thread_name_updated"
-              ],
-              "title": "ThreadNameUpdatedEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "thread_id",
-            "type"
-          ],
-          "title": "ThreadNameUpdatedEventMsg",
-          "type": "object"
-        },
         {
           "description": "Incremental MCP startup progress updates.",
           "properties": {
@@ -2012,59 +2110,6 @@
           "title": "ListSkillsResponseEventMsg",
           "type": "object"
         },
-        {
-          "description": "List of remote skills available to the agent.",
-          "properties": {
-            "skills": {
-              "items": {
-                "$ref": "#/definitions/RemoteSkillSummary"
-              },
-              "type": "array"
-            },
-            "type": {
-              "enum": [
-                "list_remote_skills_response"
-              ],
-              "title": "ListRemoteSkillsResponseEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "skills",
-            "type"
-          ],
-          "title": "ListRemoteSkillsResponseEventMsg",
-          "type": "object"
-        },
-        {
-          "description": "Remote skill downloaded to local cache.",
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "name": {
-              "type": "string"
-            },
-            "path": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "remote_skill_downloaded"
-              ],
-              "title": "RemoteSkillDownloadedEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "name",
-            "path",
-            "type"
-          ],
-          "title": "RemoteSkillDownloadedEventMsg",
-          "type": "object"
-        },
         {
           "description": "Notification that skill data may have been updated and clients may want to reload.",
           "properties": {
@@ -2086,7 +2131,6 @@
           "properties": {
             "explanation": {
               "default": null,
-              "description": "Arguments for the `update_plan` todo/checklist tool (not plan mode).",
               "type": [
                 "string",
                 "null"
@@ -2312,38 +2356,6 @@
           "title": "AgentMessageContentDeltaEventMsg",
           "type": "object"
         },
-        {
-          "properties": {
-            "delta": {
-              "type": "string"
-            },
-            "item_id": {
-              "type": "string"
-            },
-            "thread_id": {
-              "type": "string"
-            },
-            "turn_id": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "plan_delta"
-              ],
-              "title": "PlanDeltaEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "delta",
-            "item_id",
-            "thread_id",
-            "turn_id",
-            "type"
-          ],
-          "title": "PlanDeltaEventMsg",
-          "type": "object"
-        },
         {
           "properties": {
             "delta": {
@@ -2775,95 +2787,6 @@
           ],
           "title": "CollabCloseEndEventMsg",
           "type": "object"
-        },
-        {
-          "description": "Collab interaction: resume begin.",
-          "properties": {
-            "call_id": {
-              "description": "Identifier for the collab tool call.",
-              "type": "string"
-            },
-            "receiver_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the receiver."
-            },
-            "sender_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the sender."
-            },
-            "type": {
-              "enum": [
-                "collab_resume_begin"
-              ],
-              "title": "CollabResumeBeginEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "call_id",
-            "receiver_thread_id",
-            "sender_thread_id",
-            "type"
-          ],
-          "title": "CollabResumeBeginEventMsg",
-          "type": "object"
-        },
-        {
-          "description": "Collab interaction: resume end.",
-          "properties": {
-            "call_id": {
-              "description": "Identifier for the collab tool call.",
-              "type": "string"
-            },
-            "receiver_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the receiver."
-            },
-            "sender_thread_id": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/ThreadId"
-                }
-              ],
-              "description": "Thread ID of the sender."
-            },
-            "status": {
-              "allOf": [
-                {
-                  "$ref": "#/definitions/AgentStatus"
-                }
-              ],
-              "description": "Last known status of the receiver agent reported to the sender agent after resume."
-            },
-            "type": {
-              "enum": [
-                "collab_resume_end"
-              ],
-              "title": "CollabResumeEndEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "call_id",
-            "receiver_thread_id",
-            "sender_thread_id",
-            "status",
-            "type"
-          ],
-          "title": "CollabResumeEndEventMsg",
-          "type": "object"
         }
       ]
     },
@@ -2953,19 +2876,6 @@
         }
       ]
     },
-    "FunctionCallOutputBody": {
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "items": {
-            "$ref": "#/definitions/FunctionCallOutputContentItem"
-          },
-          "type": "array"
-        }
-      ]
-    },
     "FunctionCallOutputContentItem": {
       "description": "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
       "oneOf": [
@@ -3012,10 +2922,19 @@
       ]
     },
     "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.",
+      "description": "The payload we send back to OpenAI when reporting a tool call result.\n\n`content` preserves the historical plain-string payload so downstream integrations (tests, logging, etc.) can keep treating tool output as `String`. When an MCP server returns richer data we additionally populate `content_items` with the structured form that the Responses/Chat Completions APIs understand.",
       "properties": {
-        "body": {
-          "$ref": "#/definitions/FunctionCallOutputBody"
+        "content": {
+          "type": "string"
+        },
+        "content_items": {
+          "items": {
+            "$ref": "#/definitions/FunctionCallOutputContentItem"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
         },
         "success": {
           "type": [
@@ -3025,7 +2944,7 @@
         }
       },
       "required": [
-        "body"
+        "content"
       ],
       "type": "object"
     },
@@ -3082,6 +3001,36 @@
       ],
       "type": "object"
     },
+    "ImageContent": {
+      "description": "An image provided to or from an LLM.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "data": {
+          "type": "string"
+        },
+        "mimeType": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "data",
+        "mimeType",
+        "type"
+      ],
+      "type": "object"
+    },
     "LocalShellAction": {
       "oneOf": [
         {
@@ -3257,33 +3206,6 @@
         }
       ]
     },
-    "MessagePhase": {
-      "description": "Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as \"phase unknown\" and keep compatibility behavior for legacy models.",
-      "oneOf": [
-        {
-          "description": "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
-          "enum": [
-            "commentary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "The assistant's terminal answer text for the current turn.",
-          "enum": [
-            "final_answer"
-          ],
-          "type": "string"
-        }
-      ]
-    },
-    "ModeKind": {
-      "description": "Initial collaboration mode to use when the TUI starts.",
-      "enum": [
-        "plan",
-        "default"
-      ],
-      "type": "string"
-    },
     "NetworkAccess": {
       "description": "Represents whether outbound network access is available to the agent.",
       "enum": [
@@ -3587,25 +3509,6 @@
         }
       ]
     },
-    "RemoteSkillSummary": {
-      "properties": {
-        "description": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "description",
-        "id",
-        "name"
-      ],
-      "type": "object"
-    },
     "RequestId": {
       "anyOf": [
         {
@@ -3615,8 +3518,7 @@
           "format": "int64",
           "type": "integer"
         }
-      ],
-      "description": "ID of a request, which can be either a string or an integer."
+      ]
     },
     "RequestUserInputQuestion": {
       "properties": {
@@ -3672,21 +3574,22 @@
     "Resource": {
       "description": "A known resource that the server is capable of reading.",
       "properties": {
-        "_meta": true,
-        "annotations": true,
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "description": {
           "type": [
             "string",
             "null"
           ]
         },
-        "icons": {
-          "items": true,
-          "type": [
-            "array",
-            "null"
-          ]
-        },
         "mimeType": {
           "type": [
             "string",
@@ -3719,10 +3622,74 @@
       ],
       "type": "object"
     },
+    "ResourceLink": {
+      "description": "A resource that the server is capable of reading, included in a prompt or tool call result.\n\nNote: resource links returned by tools are not guaranteed to appear in the results of `resources/list` requests.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "description": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "mimeType": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "name": {
+          "type": "string"
+        },
+        "size": {
+          "format": "int64",
+          "type": [
+            "integer",
+            "null"
+          ]
+        },
+        "title": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "type": {
+          "type": "string"
+        },
+        "uri": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "uri"
+      ],
+      "type": "object"
+    },
     "ResourceTemplate": {
       "description": "A template description for resources available on the server.",
       "properties": {
-        "annotations": true,
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "description": {
           "type": [
             "string",
@@ -3777,16 +3744,6 @@
               ],
               "writeOnly": true
             },
-            "phase": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/MessagePhase"
-                },
-                {
-                  "type": "null"
-                }
-              ]
-            },
             "role": {
               "type": "string"
             },
@@ -3863,7 +3820,7 @@
               ]
             },
             "id": {
-              "description": "Legacy id field retained for compatibility with older payloads.",
+              "description": "Set when using the chat completions API.",
               "type": [
                 "string",
                 "null"
@@ -4323,6 +4280,14 @@
         }
       ]
     },
+    "Role": {
+      "description": "The sender or recipient of messages and data in a conversation.",
+      "enum": [
+        "assistant",
+        "user"
+      ],
+      "type": "string"
+    },
     "SandboxPolicy": {
       "description": "Determines execution restrictions for model shell commands.",
       "oneOf": [
@@ -4632,6 +4597,32 @@
       ],
       "type": "string"
     },
+    "TextContent": {
+      "description": "Text provided to or from an LLM.",
+      "properties": {
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Annotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "text": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "text",
+        "type"
+      ],
+      "type": "object"
+    },
     "TextElement": {
       "properties": {
         "byte_range": {
@@ -4655,6 +4646,27 @@
       ],
       "type": "object"
     },
+    "TextResourceContents": {
+      "properties": {
+        "mimeType": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "text": {
+          "type": "string"
+        },
+        "uri": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "text",
+        "uri"
+      ],
+      "type": "object"
+    },
     "ThreadId": {
       "type": "string"
     },
@@ -4715,26 +4727,38 @@
     "Tool": {
       "description": "Definition for a tool the client can call.",
       "properties": {
-        "_meta": true,
-        "annotations": true,
+        "annotations": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ToolAnnotations"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "description": {
           "type": [
             "string",
             "null"
           ]
         },
-        "icons": {
-          "items": true,
-          "type": [
-            "array",
-            "null"
-          ]
+        "inputSchema": {
+          "$ref": "#/definitions/ToolInputSchema"
         },
-        "inputSchema": true,
         "name": {
           "type": "string"
         },
-        "outputSchema": true,
+        "outputSchema": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/ToolOutputSchema"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
         "title": {
           "type": [
             "string",
@@ -4748,6 +4772,82 @@
       ],
       "type": "object"
     },
+    "ToolAnnotations": {
+      "description": "Additional properties describing a Tool to clients.\n\nNOTE: all properties in ToolAnnotations are **hints**. They are not guaranteed to provide a faithful description of tool behavior (including descriptive properties like `title`).\n\nClients should never make tool use decisions based on ToolAnnotations received from untrusted servers.",
+      "properties": {
+        "destructiveHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "idempotentHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "openWorldHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "readOnlyHint": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "title": {
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "type": "object"
+    },
+    "ToolInputSchema": {
+      "description": "A JSON Schema object defining the expected parameters for the tool.",
+      "properties": {
+        "properties": true,
+        "required": {
+          "items": {
+            "type": "string"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "type": {
+          "default": "object",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
+    "ToolOutputSchema": {
+      "description": "An optional JSON Schema object defining the structure of the tool's output returned in the structuredContent field of a CallToolResult.",
+      "properties": {
+        "properties": true,
+        "required": {
+          "items": {
+            "type": "string"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "type": {
+          "default": "object",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
     "TurnAbortReason": {
       "enum": [
         "interrupted",
@@ -4786,7 +4886,6 @@
           "type": "object"
         },
         {
-          "description": "Assistant-authored message payload used in turn-item streams.\n\n`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`.",
           "properties": {
             "content": {
               "items": {
@@ -4797,17 +4896,6 @@
             "id": {
               "type": "string"
             },
-            "phase": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/MessagePhase"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Optional phase metadata carried through from `ResponseItem::Message`.\n\nThis is currently used by TUI rendering to distinguish mid-turn commentary from a final answer and avoid status-indicator jitter."
-            },
             "type": {
               "enum": [
                 "AgentMessage"
@@ -4824,30 +4912,6 @@
           "title": "AgentMessageTurnItem",
           "type": "object"
         },
-        {
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "text": {
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "Plan"
-              ],
-              "title": "PlanTurnItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "text",
-            "type"
-          ],
-          "title": "PlanTurnItem",
-          "type": "object"
-        },
         {
           "properties": {
             "id": {
@@ -5061,15 +5125,6 @@
       "oneOf": [
         {
           "properties": {
-            "queries": {
-              "items": {
-                "type": "string"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
             "query": {
               "type": [
                 "string",
@@ -5208,4 +5263,4 @@
   ],
   "title": "SessionConfiguredNotification",
   "type": "object"
-}
+}

codex-rs/app-server-json-schema/stable/v2/AccountUpdatedNotification.json

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
     "AuthMode": {
-      "description": "Authentication mode for OpenAI-backed providers.",
+      "description": "Authentication mode for OpenAI-backed providers.\n\nThis is used internally to determine the base URL for generating responses, and to gate ChatGPT-only behaviors like rate limits and available models (as opposed to API key-based auth).",
       "oneOf": [
         {
           "description": "OpenAI API key provided by the caller and stored by Codex.",
@@ -17,13 +17,6 @@
             "chatgpt"
           ],
           "type": "string"
-        },
-        {
-          "description": "[UNSTABLE] FOR OPENAI INTERNAL USE ONLY - DO NOT USE.\n\nChatGPT auth tokens are supplied by an external host app and are only stored in memory. Token refresh must be handled by the external host app.",
-          "enum": [
-            "chatgptAuthTokens"
-          ],
-          "type": "string"
         }
       ]
     }

codex-rs/app-server-json-schema/stable/v2/AppsListParams.json

@@ -18,6 +18,6 @@
       ]
     }
   },
-  "title": "ExperimentalFeatureListParams",
+  "title": "AppsListParams",
   "type": "object"
 }