[codex-analytics] add tool item event schemas

[codex-analytics] add core item timing production
2026-05-08 13:26:34 +00:00 · 2026-05-02 23:28:33 -07:00 · 2026-05-02 20:56:20 -07:00
682 changed files with 33201 additions and 60773 deletions
--- a/.bazelrc
+++ b/.bazelrc
@@ -79,10 +79,6 @@ common:ci --disk_cache=
 # Shared config for the main Bazel CI workflow.
 common:ci-bazel --config=ci
 common:ci-bazel --build_metadata=TAG_workflow=bazel
-# Bazel CI cross-compiles in several legs, and the V8-backed code-mode tests
-# are not stable in that setup yet. Keep running the rest of the Rust
-# integration suites through the workspace-root launcher.
-common:ci-bazel --test_env=CODEX_BAZEL_TEST_SKIP_FILTERS=suite::code_mode::

 # Shared config for Bazel-backed Rust linting.
 build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
@@ -168,9 +164,9 @@ common:ci-windows-cross --strategy=remote
 common:ci-windows-cross --strategy=TestRunner=local
 common:ci-windows-cross --local_test_jobs=4
 common:ci-windows-cross --test_env=RUST_TEST_THREADS=1
-# Native Windows CI still covers the PowerShell tests. The cross-built gnullvm
-# binaries currently hang in PowerShell AST parser tests when those binaries are
-# run on the Windows runner.
+# Native Windows CI still covers these tests. The cross-built gnullvm binaries
+# currently crash in V8-backed code-mode tests and hang in PowerShell AST parser
+# tests when those binaries are run on the Windows runner.
 common:ci-windows-cross --test_env=CODEX_BAZEL_TEST_SKIP_FILTERS=suite::code_mode::,powershell
 common:ci-windows-cross --platforms=//:windows_x86_64_gnullvm
 common:ci-windows-cross --extra_execution_platforms=//:rbe,//:windows_x86_64_msvc
@@ -183,15 +179,5 @@ common:ci-v8 --build_metadata=TAG_os=linux
 common:ci-v8 --config=remote
 common:ci-v8 --strategy=remote

-# Source-built Bazel V8 artifacts use the in-process sandbox by default. This
-# does not affect Cargo's default prebuilt rusty_v8 path.
-common --@v8//:v8_enable_pointer_compression=True
-common --@v8//:v8_enable_sandbox=True
-
-# Keep currently published rusty_v8 release artifacts non-sandboxed until the
-# artifact migration ships matching Rust feature selection for Cargo consumers.
-common:v8-release-compat --@v8//:v8_enable_pointer_compression=False
-common:v8-release-compat --@v8//:v8_enable_sandbox=False
-
 # Optional per-user local overrides.
 try-import %workspace%/user.bazelrc
--- a/.github/dotslash-config.json
+++ b/.github/dotslash-config.json
@@ -11,11 +11,11 @@
          "path": "codex"
        },
        "linux-x86_64": {
-          "regex": "^codex-x86_64-unknown-linux-musl-bundle\\.tar\\.zst$",
+          "regex": "^codex-x86_64-unknown-linux-musl\\.zst$",
          "path": "codex"
        },
        "linux-aarch64": {
-          "regex": "^codex-aarch64-unknown-linux-musl-bundle\\.tar\\.zst$",
+          "regex": "^codex-aarch64-unknown-linux-musl\\.zst$",
          "path": "codex"
        },
        "windows-x86_64": {
@@ -84,18 +84,6 @@
        }
      }
    },
-    "bwrap": {
-      "platforms": {
-        "linux-x86_64": {
-          "regex": "^bwrap-x86_64-unknown-linux-musl\\.zst$",
-          "path": "bwrap"
-        },
-        "linux-aarch64": {
-          "regex": "^bwrap-aarch64-unknown-linux-musl\\.zst$",
-          "path": "bwrap"
-        }
-      }
-    },
    "codex-command-runner": {
      "platforms": {
        "windows-x86_64": {
--- a/.github/scripts/rusty_v8_bazel.py
+++ b/.github/scripts/rusty_v8_bazel.py
@@ -63,10 +63,8 @@ def bazel_output_files(
    platform: str,
    labels: list[str],
    compilation_mode: str = "fastbuild",
-    bazel_configs: list[str] | None = None,
 ) -> list[Path]:
    expression = "set(" + " ".join(labels) + ")"
-    bazel_configs = bazel_configs or []
    result = subprocess.run(
        [
            "bazel",
@@ -74,7 +72,6 @@ def bazel_output_files(
            "-c",
            compilation_mode,
            f"--platforms=@llvm//platforms:{platform}",
-            *[f"--config={config}" for config in bazel_configs],
            "--output=files",
            expression,
        ],
@@ -90,9 +87,7 @@ def bazel_build(
    platform: str,
    labels: list[str],
    compilation_mode: str = "fastbuild",
-    bazel_configs: list[str] | None = None,
 ) -> None:
-    bazel_configs = bazel_configs or []
    subprocess.run(
        [
            "bazel",
@@ -100,7 +95,6 @@ def bazel_build(
            "-c",
            compilation_mode,
            f"--platforms=@llvm//platforms:{platform}",
-            *[f"--config={config}" for config in bazel_configs],
            *labels,
        ],
        cwd=ROOT,
@@ -112,14 +106,13 @@ def ensure_bazel_output_files(
    platform: str,
    labels: list[str],
    compilation_mode: str = "fastbuild",
-    bazel_configs: list[str] | None = None,
 ) -> list[Path]:
-    outputs = bazel_output_files(platform, labels, compilation_mode, bazel_configs)
+    outputs = bazel_output_files(platform, labels, compilation_mode)
    if all(path.exists() for path in outputs):
        return outputs

-    bazel_build(platform, labels, compilation_mode, bazel_configs)
-    outputs = bazel_output_files(platform, labels, compilation_mode, bazel_configs)
+    bazel_build(platform, labels, compilation_mode)
+    outputs = bazel_output_files(platform, labels, compilation_mode)
    missing = [str(path) for path in outputs if not path.exists()]
    if missing:
        raise SystemExit(f"missing built outputs for {labels}: {missing}")
@@ -194,9 +187,8 @@ def single_bazel_output_file(
    platform: str,
    label: str,
    compilation_mode: str = "fastbuild",
-    bazel_configs: list[str] | None = None,
 ) -> Path:
-    outputs = ensure_bazel_output_files(platform, [label], compilation_mode, bazel_configs)
+    outputs = ensure_bazel_output_files(platform, [label], compilation_mode)
    if len(outputs) != 1:
        raise SystemExit(f"expected exactly one output for {label}, found {outputs}")
    return outputs[0]
@@ -206,17 +198,11 @@ def merged_musl_archive(
    platform: str,
    lib_path: Path,
    compilation_mode: str = "fastbuild",
-    bazel_configs: list[str] | None = None,
 ) -> Path:
-    llvm_ar = single_bazel_output_file(platform, LLVM_AR_LABEL, compilation_mode, bazel_configs)
-    llvm_ranlib = single_bazel_output_file(
-        platform,
-        LLVM_RANLIB_LABEL,
-        compilation_mode,
-        bazel_configs,
-    )
+    llvm_ar = single_bazel_output_file(platform, LLVM_AR_LABEL, compilation_mode)
+    llvm_ranlib = single_bazel_output_file(platform, LLVM_RANLIB_LABEL, compilation_mode)
    runtime_archives = [
-        single_bazel_output_file(platform, label, compilation_mode, bazel_configs)
+        single_bazel_output_file(platform, label, compilation_mode)
        for label in MUSL_RUNTIME_ARCHIVE_LABELS
    ]

@@ -247,13 +233,11 @@ def stage_release_pair(
    target: str,
    output_dir: Path,
    compilation_mode: str = "fastbuild",
-    bazel_configs: list[str] | None = None,
 ) -> None:
    outputs = ensure_bazel_output_files(
        platform,
        [release_pair_label(target)],
        compilation_mode,
-        bazel_configs,
    )

    try:
@@ -270,7 +254,7 @@ def stage_release_pair(
    staged_library = output_dir / staged_archive_name(target, lib_path)
    staged_binding = output_dir / f"src_binding_release_{target}.rs"
    source_archive = (
-        merged_musl_archive(platform, lib_path, compilation_mode, bazel_configs)
+        merged_musl_archive(platform, lib_path, compilation_mode)
        if is_musl_archive_target(target, lib_path)
        else lib_path
    )
@@ -309,12 +293,6 @@ def parse_args() -> argparse.Namespace:
    stage_release_pair_parser.add_argument("--platform", required=True)
    stage_release_pair_parser.add_argument("--target", required=True)
    stage_release_pair_parser.add_argument("--output-dir", required=True)
-    stage_release_pair_parser.add_argument(
-        "--bazel-config",
-        action="append",
-        default=[],
-        dest="bazel_configs",
-    )
    stage_release_pair_parser.add_argument(
        "--compilation-mode",
        default="fastbuild",
@@ -352,7 +330,6 @@ def main() -> int:
            target=args.target,
            output_dir=Path(args.output_dir),
            compilation_mode=args.compilation_mode,
-            bazel_configs=args.bazel_configs,
        )
        return 0
    if args.command == "resolved-v8-crate-version":
--- a/.github/scripts/verify_cargo_workspace_manifests.py
+++ b/.github/scripts/verify_cargo_workspace_manifests.py
@@ -25,10 +25,7 @@ TOP_LEVEL_NAME_EXCEPTIONS = {
 UTILITY_NAME_EXCEPTIONS = {
    "path-utils": "codex-utils-path",
 }
-MANIFEST_FEATURE_EXCEPTIONS = {
-    "codex-rs/code-mode/Cargo.toml": {"sandbox": ("v8/v8_enable_sandbox",)},
-    "codex-rs/v8-poc/Cargo.toml": {"sandbox": ("v8/v8_enable_sandbox",)},
-}
+MANIFEST_FEATURE_EXCEPTIONS = {}
 OPTIONAL_DEPENDENCY_EXCEPTIONS = set()
 INTERNAL_DEPENDENCY_FEATURE_EXCEPTIONS = {}

--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -18,9 +18,9 @@ concurrency:
 jobs:
  test:
    # PRs use a fast Windows cross-compiled test leg for pre-merge signal.
-    # Post-merge pushes to main also run the native Windows test job below for
-    # broader Windows signal without putting PR latency back on the critical
-    # path. Cargo CI owns V8/code-mode test coverage for now.
+    # Post-merge pushes to main also run the native Windows test job below,
+    # which keeps V8/code-mode coverage without putting PR latency back on the
+    # critical path.
    timeout-minutes: 30
    strategy:
      fail-fast: false
@@ -46,8 +46,8 @@ jobs:

          # Windows fast path: build the windows-gnullvm binaries with Linux
          # RBE, then run the resulting Windows tests on the Windows runner.
-          # Cargo CI preserves V8/code-mode coverage while Bazel CI keeps broad
-          # non-code-mode signal.
+          # The main-only native Windows job below preserves full V8/code-mode
+          # coverage post-merge.
          - os: windows-latest
            target: x86_64-pc-windows-gnullvm
    runs-on: ${{ matrix.os }}
@@ -88,11 +88,6 @@ jobs:
            # path. V8 consumers under `//codex-rs/...` still participate
            # transitively through `//...`.
            -//third_party/v8:all
-            # V8-backed code-mode tests are covered by Cargo CI. Bazel CI
-            # cross-compiles in several legs, and those tests are not stable in
-            # that setup yet.
-            -//codex-rs/code-mode:code-mode-unit-tests
-            -//codex-rs/v8-poc:v8-poc-unit-tests
          )

          bazel_wrapper_args=(
@@ -110,6 +105,15 @@ jobs:
              --windows-cross-compile
              --remote-download-toplevel
            )
+            # Tradeoff: the Linux-RBE-built windows-gnullvm V8 archive
+            # currently crashes during direct V8/code-mode smoke tests on the
+            # Windows runner. Keep the broader fast Windows suite in PR CI and
+            # rely on the main-only native Windows job below for full
+            # V8/code-mode signal while we investigate the cross-built archive.
+            bazel_targets+=(
+              -//codex-rs/code-mode:code-mode-unit-tests
+              -//codex-rs/v8-poc:v8-poc-unit-tests
+            )
          fi

          ./.github/scripts/run-bazel-ci.sh \
@@ -140,8 +144,9 @@ jobs:

  test-windows-native-main:
    # Native Windows Bazel tests are slower and frequently approach the
-    # 30-minute PR budget. Run this only for post-merge commits to main and give
-    # it a larger timeout.
+    # 30-minute PR budget, but they provide the full V8/code-mode signal that
+    # the fast cross-compiled PR leg intentionally trades away. Run this only
+    # for post-merge commits to main and give it a larger timeout.
    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
    timeout-minutes: 40
    runs-on: windows-latest
@@ -169,11 +174,6 @@ jobs:
            # path. V8 consumers under `//codex-rs/...` still participate
            # transitively through `//...`.
            -//third_party/v8:all
-            # Keep this aligned with the main Bazel job. The native Windows
-            # job preserves broad post-merge coverage, but code-mode/V8 tests
-            # are covered by Cargo CI rather than Bazel for now.
-            -//codex-rs/code-mode:code-mode-unit-tests
-            -//codex-rs/v8-poc:v8-poc-unit-tests
          )

          bazel_test_args=(
@@ -371,22 +371,6 @@ jobs:
            -- \
            "${bazel_targets[@]}"

-      - name: Verify Bazel builds bwrap
-        if: runner.os == 'Linux'
-        env:
-          BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
-        shell: bash
-        run: |
-          ./.github/scripts/run-bazel-ci.sh \
-            --remote-download-toplevel \
-            --print-failed-action-summary \
-            -- \
-            build \
-            --build_metadata=COMMIT_SHA=${GITHUB_SHA} \
-            --build_metadata=TAG_job=verify-bwrap \
-            -- \
-            //codex-rs/bwrap:bwrap
-
      - name: Upload Bazel execution logs
        if: always() && !cancelled()
        continue-on-error: true
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,12 +52,10 @@ jobs:
          CODEX_VERSION=0.125.0
          WORKFLOW_URL="https://github.com/openai/codex/actions/runs/24901475298"
          OUTPUT_DIR="${RUNNER_TEMP}"
-          # This reused workflow predates the standalone bwrap artifact.
          python3 ./scripts/stage_npm_packages.py \
            --release-version "$CODEX_VERSION" \
            --workflow-url "$WORKFLOW_URL" \
            --package codex \
-            --allow-missing-native-component bwrap \
            --output-dir "$OUTPUT_DIR"
          PACK_OUTPUT="${OUTPUT_DIR}/codex-npm-${CODEX_VERSION}.tgz"
          echo "pack_output=$PACK_OUTPUT" >> "$GITHUB_OUTPUT"
--- a/.github/workflows/issue-labeler.yml
+++ b/.github/workflows/issue-labeler.yml
@@ -44,7 +44,7 @@ jobs:
            6. 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.
-            - For agent-area issues, prefer the most specific applicable label. Use "agent" only as a fallback for agent-related issues that do not fit a more specific agent-area label. Prefer "app-server" over "session" or "config" when the issue is about app-server protocol, API, RPC, schema, launch, or bridge behavior. Use "memory" for agentic memory storage/retrieval and "performance" for high process memory utilization or memory leaks.
+            - For agent-area issues, prefer the most specific applicable label. Use "agent" only as a fallback for agent-related issues that do not fit a more specific agent-area label. Prefer "app-server" over "session" or "config" when the issue is about app-server protocol, API, RPC, schema, launch, or bridge behavior.
            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).
            2. mcp — Topics involving Model Context Protocol servers/clients.
            3. mcp-server — Problems related to the codex mcp-server command, where codex runs as an MCP server.
@@ -68,15 +68,7 @@ jobs:
            21. session - Issues involving session or thread management, including resume, fork, archive, rename/title, thread history, rollout persistence, compaction, checkpoints, retention, and cross-session state.
            22. config - Issues involving config.toml, config keys, config key merging, config updates, profiles, hooks config, project config, agent role TOMLs, instruction/personality config, and config schema behavior.
            23. plan - Issues involving plan mode, planning workflows, or plan-specific tools/behavior.
-            24. computer-use - Issues involving agentic computer use or SkyComputerUseService.
-            25. browser - Issues involving agentic browser use, IAB, or the built-in browser within the Codex app.
-            26. memory - Issues involving agentic memory storage and retrieval.
-            27. imagen - Issues involving image generation.
-            28. remote - Issues involving remote access, remote control, or SSH.
-            29. performance - Issues involving slow, laggy performance, high memory utilization, or memory leaks.
-            30. automations - Issues involving scheduled automation tasks or heartbeats.
-            31. pets - Issues involving pets avatars and animations.
-            32. agent - Fallback only for core agent loop or agent-related issues that do not fit app-server, connectivity, subagent, session, config, plan, computer-use, browser, memory, imagen, remote, performance, automations, or pets.
+            24. agent - Fallback only for core agent loop or agent-related issues that do not fit app-server, connectivity, subagent, session, config, or plan.

            Issue number: ${{ github.event.issue.number }}

--- a/.github/workflows/rust-release.yml
+++ b/.github/workflows/rust-release.yml
@@ -96,7 +96,7 @@ jobs:
            target: x86_64-unknown-linux-musl
            bundle: primary
            artifact_name: x86_64-unknown-linux-musl
-            binaries: "codex codex-responses-api-proxy bwrap"
+            binaries: "codex codex-responses-api-proxy"
            build_dmg: "false"
          - runner: ubuntu-24.04
            target: x86_64-unknown-linux-musl
@@ -108,7 +108,7 @@ jobs:
            target: aarch64-unknown-linux-musl
            bundle: primary
            artifact_name: aarch64-unknown-linux-musl
-            binaries: "codex codex-responses-api-proxy bwrap"
+            binaries: "codex codex-responses-api-proxy"
            build_dmg: "false"
          - runner: ubuntu-24.04-arm
            target: aarch64-unknown-linux-musl
@@ -255,24 +255,6 @@ jobs:
        with:
          target: ${{ matrix.target }}

-      - if: ${{ contains(matrix.target, 'linux') && matrix.bundle == 'primary' }}
-        name: Build bwrap and export digest
-        shell: bash
-        run: |
-          set -euo pipefail
-          target="${{ matrix.target }}"
-          cargo build --target "$target" --release --timings --bin bwrap
-
-          bwrap_path="target/${target}/release/bwrap"
-          if [[ ! -f "$bwrap_path" ]]; then
-            echo "bwrap binary ${bwrap_path} not found"
-            exit 1
-          fi
-
-          digest="$(sha256sum "$bwrap_path" | awk '{print $1}')"
-          echo "CODEX_BWRAP_SHA256=${digest}" >> "$GITHUB_ENV"
-          echo "Built bwrap ${bwrap_path} with sha256:${digest}"
-
      - name: Cargo build
        shell: bash
        run: |
@@ -379,17 +361,6 @@ jobs:
            fi
          done

-          if [[ "${{ matrix.target }}" == *linux* && "${{ matrix.bundle }}" == "primary" ]]; then
-            bundle_root="${RUNNER_TEMP}/codex-${{ matrix.target }}-bundle"
-            rm -rf "$bundle_root"
-            mkdir -p "$bundle_root/codex-resources"
-            cp "$dest/codex-${{ matrix.target }}" "$bundle_root/codex"
-            cp "$dest/bwrap-${{ matrix.target }}" "$bundle_root/codex-resources/bwrap"
-            chmod 0755 "$bundle_root/codex" "$bundle_root/codex-resources/bwrap"
-            tar -C "$bundle_root" -cf - codex codex-resources/bwrap |
-              zstd -T0 -19 -o "$dest/codex-${{ matrix.target }}-bundle.tar.zst"
-          fi
-
          if [[ "${{ matrix.build_dmg }}" == "true" ]]; then
            cp target/${{ matrix.target }}/release/codex-${{ matrix.target }}.dmg "$dest/codex-${{ matrix.target }}.dmg"
          fi
@@ -413,7 +384,7 @@ jobs:
            base="$(basename "$f")"
            # Skip files that are already archives (shouldn't happen, but be
            # safe).
-            if [[ "$base" == *.tar.gz || "$base" == *.tar.zst || "$base" == *.zip || "$base" == *.dmg ]]; then
+            if [[ "$base" == *.tar.gz || "$base" == *.zip || "$base" == *.dmg ]]; then
              continue
            fi

@@ -433,8 +404,8 @@ jobs:
      - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
        with:
          name: ${{ matrix.artifact_name }}
-          # Upload the per-binary .zst files, .tar.gz equivalents, and any
-          # prebuilt archives staged above.
+          # Upload the per-binary .zst files as well as the new .tar.gz
+          # equivalents we generated in the previous step.
          path: |
            codex-rs/dist/${{ matrix.target }}/*

--- a/.github/workflows/rusty-v8-release.yml
+++ b/.github/workflows/rusty-v8-release.yml
@@ -1,12 +1,20 @@
 name: rusty-v8-release

 on:
-  push:
-    tags:
-      - "rusty-v8-v*.*.*"
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        description: Optional release tag. Defaults to rusty-v8-v<resolved_v8_version>.
+        required: false
+        type: string
+      publish:
+        description: Publish the staged musl artifacts to a GitHub release.
+        required: false
+        default: true
+        type: boolean

 concurrency:
-  group: ${{ github.workflow }}::${{ github.ref_name }}
+  group: ${{ github.workflow }}::${{ inputs.release_tag || github.run_id }}
  cancel-in-progress: false

 jobs:
@@ -35,17 +43,15 @@ jobs:
      - name: Resolve release tag
        id: release_tag
        env:
-          GITHUB_REF_NAME: ${{ github.ref_name }}
+          RELEASE_TAG_INPUT: ${{ inputs.release_tag }}
          V8_VERSION: ${{ steps.v8_version.outputs.version }}
        shell: bash
        run: |
          set -euo pipefail

-          expected_release_tag="rusty-v8-v${V8_VERSION}"
-          release_tag="${GITHUB_REF_NAME}"
-          if [[ "${release_tag}" != "${expected_release_tag}" ]]; then
-            echo "Tag ${release_tag} does not match resolved v8 crate version ${V8_VERSION}." >&2
-            exit 1
+          release_tag="${RELEASE_TAG_INPUT}"
+          if [[ -z "${release_tag}" ]]; then
+            release_tag="rusty-v8-v${V8_VERSION}"
          fi

          echo "release_tag=${release_tag}" >> "$GITHUB_OUTPUT"
@@ -105,7 +111,6 @@ jobs:
            -c
            opt
            "--platforms=@llvm//platforms:${PLATFORM}"
-            --config=v8-release-compat
            "${pair_target}"
            "${extra_targets[@]}"
            --build_metadata=COMMIT_SHA=$(git rev-parse HEAD)
@@ -129,7 +134,6 @@ jobs:
            --platform "${PLATFORM}" \
            --target "${TARGET}" \
            --compilation-mode opt \
-            --bazel-config v8-release-compat \
            --output-dir "dist/${TARGET}"

      - name: Upload staged musl artifacts
@@ -139,6 +143,7 @@ jobs:
          path: dist/${{ matrix.target }}/*

  publish-release:
+    if: ${{ inputs.publish }}
    needs:
      - metadata
      - build
@@ -148,6 +153,16 @@ jobs:
      actions: read

    steps:
+      - name: Ensure publishing from default branch
+        if: ${{ github.ref_name != github.event.repository.default_branch }}
+        env:
+          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          echo "Publishing is only allowed from ${DEFAULT_BRANCH}; current ref is ${GITHUB_REF_NAME}." >&2
+          exit 1
+
      - name: Ensure release tag is new
        env:
          GH_TOKEN: ${{ github.token }}
--- a/.github/workflows/v8-canary.yml
+++ b/.github/workflows/v8-canary.yml
@@ -105,7 +105,6 @@ jobs:
          bazel_args=(
            build
            "--platforms=@llvm//platforms:${PLATFORM}"
-            --config=v8-release-compat
            "${pair_target}"
            "${extra_targets[@]}"
            --build_metadata=COMMIT_SHA=$(git rev-parse HEAD)
@@ -128,7 +127,6 @@ jobs:
          python3 .github/scripts/rusty_v8_bazel.py stage-release-pair \
            --platform "${PLATFORM}" \
            --target "${TARGET}" \
-            --bazel-config v8-release-compat \
            --output-dir "dist/${TARGET}"

      - name: Upload staged musl artifacts
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -327,18 +327,6 @@ crate.annotation(
        "RUSTY_V8_SRC_BINDING_PATH": "$(execpath @v8_targets//:rusty_v8_binding_for_target)",
    },
    crate = "v8",
-    # Keep the Rust feature aligned with the source-built Bazel artifacts.
-    # Windows MSVC still consumes upstream non-sandboxed prebuilts.
-    crate_features_select = {
-        "aarch64-apple-darwin": ["v8_enable_sandbox"],
-        "aarch64-pc-windows-gnullvm": ["v8_enable_sandbox"],
-        "aarch64-unknown-linux-gnu": ["v8_enable_sandbox"],
-        "aarch64-unknown-linux-musl": ["v8_enable_sandbox"],
-        "x86_64-apple-darwin": ["v8_enable_sandbox"],
-        "x86_64-pc-windows-gnullvm": ["v8_enable_sandbox"],
-        "x86_64-unknown-linux-gnu": ["v8_enable_sandbox"],
-        "x86_64-unknown-linux-musl": ["v8_enable_sandbox"],
-    },
    gen_build_script = "on",
    patch_args = ["-p1"],
    patches = [
--- a/codex-cli/scripts/build_npm_package.py
+++ b/codex-cli/scripts/build_npm_package.py
@@ -69,8 +69,8 @@ PACKAGE_EXPANSIONS: dict[str, list[str]] = {

 PACKAGE_NATIVE_COMPONENTS: dict[str, list[str]] = {
    "codex": [],
-    "codex-linux-x64": ["bwrap", "codex", "rg"],
-    "codex-linux-arm64": ["bwrap", "codex", "rg"],
+    "codex-linux-x64": ["codex", "rg"],
+    "codex-linux-arm64": ["codex", "rg"],
    "codex-darwin-x64": ["codex", "rg"],
    "codex-darwin-arm64": ["codex", "rg"],
    "codex-win32-x64": ["codex", "rg", "codex-windows-sandbox-setup", "codex-command-runner"],
@@ -87,7 +87,6 @@ PACKAGE_TARGET_FILTERS: dict[str, str] = {
 PACKAGE_CHOICES = tuple(PACKAGE_NATIVE_COMPONENTS)

 COMPONENT_DEST_DIR: dict[str, str] = {
-    "bwrap": "codex-resources",
    "codex": "codex",
    "codex-responses-api-proxy": "codex-responses-api-proxy",
    "codex-windows-sandbox-setup": "codex",
@@ -138,16 +137,6 @@ def parse_args() -> argparse.Namespace:
        type=Path,
        help="Directory containing pre-installed native binaries to bundle (vendor root).",
    )
-    parser.add_argument(
-        "--allow-missing-native-component",
-        dest="allow_missing_native_components",
-        action="append",
-        default=[],
-        help=(
-            "Native component that may be absent from --vendor-src. Intended for CI "
-            "compatibility with older artifact workflows; releases should not use this."
-        ),
-    )
    return parser.parse_args()


@@ -188,7 +177,6 @@ def main() -> int:
                staging_dir,
                native_components,
                target_filter={target_filter} if target_filter else None,
-                allow_missing_components=set(args.allow_missing_native_components),
            )

        if release_version:
@@ -377,14 +365,12 @@ def copy_native_binaries(
    staging_dir: Path,
    components: list[str],
    target_filter: set[str] | None = None,
-    allow_missing_components: set[str] | None = None,
 ) -> None:
    vendor_src = vendor_src.resolve()
    if not vendor_src.exists():
        raise RuntimeError(f"Vendor source directory not found: {vendor_src}")

    components_set = {component for component in components if component in COMPONENT_DEST_DIR}
-    allow_missing_components = allow_missing_components or set()
    if not components_set:
        return

@@ -413,8 +399,6 @@ def copy_native_binaries(

            src_component_dir = target_dir / dest_dir_name
            if not src_component_dir.exists():
-                if component in allow_missing_components:
-                    continue
                raise RuntimeError(
                    f"Missing native component '{component}' in vendor source: {src_component_dir}"
                )
--- a/codex-cli/scripts/install_native_deps.py
+++ b/codex-cli/scripts/install_native_deps.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Install Codex native binaries (Rust CLI, bwrap, and ripgrep helpers)."""
+"""Install Codex native binaries (Rust CLI plus ripgrep helpers)."""

 import argparse
 from contextlib import contextmanager
@@ -42,15 +42,8 @@ class BinaryComponent:


 WINDOWS_TARGETS = tuple(target for target in BINARY_TARGETS if "windows" in target)
-LINUX_TARGETS = tuple(target for target in BINARY_TARGETS if "linux" in target)

 BINARY_COMPONENTS = {
-    "bwrap": BinaryComponent(
-        artifact_prefix="bwrap",
-        dest_dir="codex-resources",
-        binary_basename="bwrap",
-        targets=LINUX_TARGETS,
-    ),
    "codex": BinaryComponent(
        artifact_prefix="codex",
        dest_dir="codex",
@@ -142,7 +135,7 @@ def parse_args() -> argparse.Namespace:
        choices=tuple(list(BINARY_COMPONENTS) + ["rg"]),
        help=(
            "Limit installation to the specified components."
-            " May be repeated. Defaults to bwrap, codex, codex-windows-sandbox-setup,"
+            " May be repeated. Defaults to codex, codex-windows-sandbox-setup,"
            " codex-command-runner, and rg."
        ),
    )
@@ -166,7 +159,6 @@ def main() -> int:
    vendor_dir.mkdir(parents=True, exist_ok=True)

    components = args.components or [
-        "bwrap",
        "codex",
        "codex-windows-sandbox-setup",
        "codex-command-runner",
--- a/codex-rs/Cargo.lock
+++ b/codex-rs/Cargo.lock
@@ -1944,7 +1944,6 @@ dependencies = [
 "pretty_assertions",
 "serde",
 "serde_json",
- "tempfile",
 "tokio",
 "tokio-tungstenite",
 "toml 0.9.11+spec-1.1.0",
@@ -2126,15 +2125,6 @@ dependencies = [
 "serde_with",
 ]

-[[package]]
-name = "codex-bwrap"
-version = "0.0.0"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "codex-chatgpt"
 version = "0.0.0"
@@ -2421,7 +2411,6 @@ dependencies = [
 "bm25",
 "chrono",
 "clap",
- "codex-agent-graph-store",
 "codex-analytics",
 "codex-api",
 "codex-app-server-protocol",
@@ -2711,7 +2700,6 @@ dependencies = [
 "serde",
 "serde_json",
 "serial_test",
- "sha2",
 "tempfile",
 "test-case",
 "thiserror 2.0.18",
@@ -2720,7 +2708,6 @@ dependencies = [
 "tokio-util",
 "tracing",
 "uuid",
- "wiremock",
 ]

 [[package]]
@@ -2881,7 +2868,6 @@ dependencies = [
 "codex-plugin",
 "codex-protocol",
 "codex-utils-absolute-path",
- "codex-utils-output-truncation",
 "futures",
 "pretty_assertions",
 "regex",
@@ -2890,8 +2876,6 @@ dependencies = [
 "serde_json",
 "tempfile",
 "tokio",
- "tracing",
- "uuid",
 ]

 [[package]]
@@ -2915,6 +2899,7 @@ dependencies = [
 name = "codex-linux-sandbox"
 version = "0.0.0"
 dependencies = [
+ "cc",
 "clap",
 "codex-core",
 "codex-process-hardening",
@@ -2924,11 +2909,11 @@ dependencies = [
 "globset",
 "landlock",
 "libc",
+ "pkg-config",
 "pretty_assertions",
 "seccompiler",
 "serde",
 "serde_json",
- "sha2",
 "tempfile",
 "tokio",
 "url",
@@ -3053,23 +3038,6 @@ dependencies = [
 "wiremock",
 ]

-[[package]]
-name = "codex-memories-mcp"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "codex-utils-absolute-path",
- "codex-utils-output-truncation",
- "pretty_assertions",
- "rmcp",
- "schemars 0.8.22",
- "serde",
- "serde_json",
- "tempfile",
- "thiserror 2.0.18",
- "tokio",
-]
-
 [[package]]
 name = "codex-memories-read"
 version = "0.0.0"
@@ -4231,7 +4199,6 @@ dependencies = [
 "codex-core",
 "codex-exec-server",
 "codex-features",
- "codex-hooks",
 "codex-login",
 "codex-model-provider-info",
 "codex-models-manager",
--- a/codex-rs/Cargo.toml
+++ b/codex-rs/Cargo.toml
@@ -5,7 +5,6 @@ members = [
    "agent-graph-store",
    "agent-identity",
    "backend-client",
-    "bwrap",
    "ansi-escape",
    "async-utils",
    "app-server",
@@ -53,7 +52,6 @@ members = [
    "login",
    "codex-mcp",
    "mcp-server",
-    "memories/mcp",
    "memories/read",
    "memories/write",
    "model-provider-info",
@@ -170,7 +168,6 @@ codex-keyring-store = { path = "keyring-store" }
 codex-linux-sandbox = { path = "linux-sandbox" }
 codex-lmstudio = { path = "lmstudio" }
 codex-login = { path = "login" }
-codex-memories-mcp = { path = "memories/mcp" }
 codex-memories-read = { path = "memories/read" }
 codex-memories-write = { path = "memories/write" }
 codex-mcp = { path = "codex-mcp" }
@@ -464,7 +461,6 @@ unwrap_used = "deny"
 [workspace.metadata.cargo-shear]
 ignored = [
    "codex-agent-graph-store",
-    "codex-memories-mcp",
    "icu_provider",
    "openssl-sys",
    "codex-utils-readiness",
--- a/codex-rs/README.md
+++ b/codex-rs/README.md
@@ -46,7 +46,7 @@ Use `codex mcp` to add/list/get/remove MCP server launchers defined in `config.t

 ### Notifications

-You can enable notifications by configuring a script that is run whenever the agent finishes a turn. The [notify documentation](../docs/config.md#notify) includes a detailed example that explains how to get desktop notifications via [terminal-notifier](https://github.com/julienXX/terminal-notifier) on macOS. When Codex detects that it is running under WSL 2 inside Windows Terminal (`WT_SESSION` is set), the TUI automatically falls back to native Windows toast notifications so approval prompts and completed turns surface even though Windows Terminal does not implement OSC 9.
+The legacy `notify` setting is deprecated and will be removed in a future release. Existing configurations still work, but new automation should use lifecycle hooks instead. The [notify documentation](../docs/config.md#notify) explains the remaining compatibility behavior. When Codex detects that it is running under WSL 2 inside Windows Terminal (`WT_SESSION` is set), the TUI automatically falls back to native Windows toast notifications so approval prompts and completed turns surface even though Windows Terminal does not implement OSC 9.

 ### `codex exec` to run Codex programmatically/non-interactively

--- a/codex-rs/analytics/src/analytics_client_tests.rs
+++ b/codex-rs/analytics/src/analytics_client_tests.rs
@@ -12,6 +12,7 @@ use crate::events::CodexPluginUsedEventRequest;
 use crate::events::CodexRuntimeMetadata;
 use crate::events::CodexToolItemEventBase;
 use crate::events::CodexTurnEventRequest;
+use crate::events::CommandExecutionFamily;
 use crate::events::CommandExecutionSource;
 use crate::events::GuardianApprovalRequestSource;
 use crate::events::GuardianReviewDecision;
@@ -79,7 +80,6 @@ use codex_app_server_protocol::Thread;
 use codex_app_server_protocol::ThreadArchiveParams;
 use codex_app_server_protocol::ThreadArchiveResponse;
 use codex_app_server_protocol::ThreadResumeResponse;
-use codex_app_server_protocol::ThreadSource as AppServerThreadSource;
 use codex_app_server_protocol::ThreadStartResponse;
 use codex_app_server_protocol::ThreadStatus as AppServerThreadStatus;
 use codex_app_server_protocol::Turn;
@@ -108,7 +108,6 @@ use codex_protocol::protocol::HookSource;
 use codex_protocol::protocol::SandboxPolicy;
 use codex_protocol::protocol::SessionSource;
 use codex_protocol::protocol::SubAgentSource;
-use codex_protocol::protocol::ThreadSource;
 use codex_protocol::protocol::TokenUsage;
 use codex_utils_absolute_path::test_support::PathBufExt;
 use codex_utils_absolute_path::test_support::test_path_buf;
@@ -120,11 +119,14 @@ use std::sync::Arc;
 use std::sync::Mutex;
 use tokio::sync::mpsc;

-fn sample_thread_with_metadata(
+fn sample_thread(thread_id: &str, ephemeral: bool) -> Thread {
+    sample_thread_with_source(thread_id, ephemeral, AppServerSessionSource::Exec)
+}
+
+fn sample_thread_with_source(
    thread_id: &str,
    ephemeral: bool,
    source: AppServerSessionSource,
-    thread_source: Option<AppServerThreadSource>,
 ) -> Thread {
    Thread {
        id: thread_id.to_string(),
@@ -139,7 +141,6 @@ fn sample_thread_with_metadata(
        cwd: test_path_buf("/tmp").abs(),
        cli_version: "0.0.0".to_string(),
        source,
-        thread_source,
        agent_nickname: None,
        agent_role: None,
        git_info: None,
@@ -154,13 +155,7 @@ fn sample_thread_start_response(
    model: &str,
 ) -> ClientResponsePayload {
    ClientResponsePayload::ThreadStart(ThreadStartResponse {
-        session_id: format!("session-{thread_id}"),
-        thread: sample_thread_with_metadata(
-            thread_id,
-            ephemeral,
-            AppServerSessionSource::Exec,
-            Some(AppServerThreadSource::User),
-        ),
+        thread: sample_thread(thread_id, ephemeral),
        model: model.to_string(),
        model_provider: "openai".to_string(),
        service_tier: None,
@@ -204,7 +199,6 @@ fn sample_thread_resume_response(
        ephemeral,
        model,
        AppServerSessionSource::Exec,
-        Some(AppServerThreadSource::User),
    )
 }

@@ -213,11 +207,9 @@ fn sample_thread_resume_response_with_source(
    ephemeral: bool,
    model: &str,
    source: AppServerSessionSource,
-    thread_source: Option<AppServerThreadSource>,
 ) -> ClientResponsePayload {
    ClientResponsePayload::ThreadResume(ThreadResumeResponse {
-        session_id: format!("session-{thread_id}"),
-        thread: sample_thread_with_metadata(thread_id, ephemeral, source, thread_source),
+        thread: sample_thread_with_source(thread_id, ephemeral, source),
        model: model.to_string(),
        model_provider: "openai".to_string(),
        service_tier: None,
@@ -255,7 +247,6 @@ fn sample_turn_start_response(turn_id: &str) -> ClientResponsePayload {
    ClientResponsePayload::TurnStart(codex_app_server_protocol::TurnStartResponse {
        turn: Turn {
            id: turn_id.to_string(),
-            items_view: codex_app_server_protocol::TurnItemsView::Full,
            items: vec![],
            status: AppServerTurnStatus::InProgress,
            error: None,
@@ -271,7 +262,6 @@ fn sample_turn_started_notification(thread_id: &str, turn_id: &str) -> ServerNot
        thread_id: thread_id.to_string(),
        turn: Turn {
            id: turn_id.to_string(),
-            items_view: codex_app_server_protocol::TurnItemsView::Full,
            items: vec![],
            status: AppServerTurnStatus::InProgress,
            error: None,
@@ -306,7 +296,6 @@ fn sample_turn_completed_notification(
        thread_id: thread_id.to_string(),
        turn: Turn {
            id: turn_id.to_string(),
-            items_view: codex_app_server_protocol::TurnItemsView::Full,
            items: vec![],
            status,
            error: codex_error_info.map(|codex_error_info| AppServerTurnError {
@@ -762,7 +751,7 @@ fn compaction_event_serializes_expected_shape() {
            },
            sample_app_server_client_metadata(),
            sample_runtime_metadata(),
-            Some(ThreadSource::User),
+            Some("user"),
            /*subagent_source*/ None,
            /*parent_thread_id*/ None,
        ),
@@ -861,7 +850,7 @@ fn thread_initialized_event_serializes_expected_shape() {
            },
            model: "gpt-5".to_string(),
            ephemeral: true,
-            thread_source: Some(ThreadSource::User),
+            thread_source: Some("user"),
            initialization_mode: ThreadInitializationMode::New,
            subagent_source: None,
            parent_thread_id: None,
@@ -929,8 +918,10 @@ fn command_execution_event_serializes_expected_shape() {
                parent_thread_id: None,
                tool_name: "shell".to_string(),
                started_at_ms: 123_000,
-                completed_at_ms: 125_000,
+                completed_at_ms: Some(125_000),
                duration_ms: Some(2000),
+                execution_duration_ms: Some(1800),
+                execution_started: true,
                review_count: 0,
                guardian_review_count: 0,
                user_review_count: 0,
@@ -939,14 +930,12 @@ fn command_execution_event_serializes_expected_shape() {
                failure_kind: None,
                requested_additional_permissions: false,
                requested_network_access: false,
+                retry_count: 0,
            },
            command_execution_source: CommandExecutionSource::Agent,
+            command_execution_family: CommandExecutionFamily::Shell,
            exit_code: Some(0),
-            command_total_action_count: 4,
-            command_read_action_count: 1,
-            command_list_files_action_count: 1,
-            command_search_action_count: 1,
-            command_unknown_action_count: 1,
+            command_action_count: Some(1),
        },
    });

@@ -979,6 +968,8 @@ fn command_execution_event_serializes_expected_shape() {
                "started_at_ms": 123000,
                "completed_at_ms": 125000,
                "duration_ms": 2000,
+                "execution_duration_ms": 1800,
+                "execution_started": true,
                "review_count": 0,
                "guardian_review_count": 0,
                "user_review_count": 0,
@@ -987,13 +978,11 @@ fn command_execution_event_serializes_expected_shape() {
                "failure_kind": null,
                "requested_additional_permissions": false,
                "requested_network_access": false,
+                "retry_count": 0,
                "command_execution_source": "agent",
+                "command_execution_family": "shell",
                "exit_code": 0,
-                "command_total_action_count": 4,
-                "command_read_action_count": 1,
-                "command_list_files_action_count": 1,
-                "command_search_action_count": 1,
-                "command_unknown_action_count": 1
+                "command_action_count": 1
            }
        })
    );
@@ -1205,7 +1194,6 @@ async fn compaction_event_ingests_custom_fact() {
                        agent_nickname: None,
                        agent_role: None,
                    }),
-                    Some(AppServerThreadSource::Subagent),
                )),
            },
            &mut events,
@@ -1932,7 +1920,6 @@ async fn reducer_ingests_skill_invoked_fact() {
                    skill_name: "doc".to_string(),
                    skill_scope: codex_protocol::protocol::SkillScope::User,
                    skill_path,
-                    plugin_id: None,
                    invocation_type: InvocationType::Explicit,
                }],
            })),
@@ -1950,10 +1937,8 @@ async fn reducer_ingests_skill_invoked_fact() {
            "event_params": {
                "product_client_id": originator().value,
                "skill_scope": "user",
-                "plugin_id": null,
                "repo_url": null,
                "thread_id": "thread-1",
-                "turn_id": "turn-1",
                "invoke_type": "explicit",
                "model_slug": "gpt-5"
            }
@@ -1961,41 +1946,6 @@ async fn reducer_ingests_skill_invoked_fact() {
    );
 }

-#[tokio::test]
-async fn reducer_includes_plugin_id_for_plugin_skill_invocations() {
-    let mut reducer = AnalyticsReducer::default();
-    let mut events = Vec::new();
-    let tracking = TrackEventsContext {
-        model_slug: "gpt-5".to_string(),
-        thread_id: "thread-1".to_string(),
-        turn_id: "turn-1".to_string(),
-    };
-    let skill_path =
-        PathBuf::from("/Users/abc/.codex/plugins/cache/test/sample/skills/doc/SKILL.md");
-
-    reducer
-        .ingest(
-            AnalyticsFact::Custom(CustomAnalyticsFact::SkillInvoked(SkillInvokedInput {
-                tracking,
-                invocations: vec![SkillInvocation {
-                    skill_name: "sample:doc".to_string(),
-                    skill_scope: codex_protocol::protocol::SkillScope::User,
-                    skill_path,
-                    plugin_id: Some("sample@test".to_string()),
-                    invocation_type: InvocationType::Explicit,
-                }],
-            })),
-            &mut events,
-        )
-        .await;
-
-    let payload = serde_json::to_value(&events).expect("serialize events");
-    assert_eq!(
-        payload[0]["event_params"]["plugin_id"],
-        json!("sample@test")
-    );
-}
-
 #[tokio::test]
 async fn reducer_ingests_hook_run_fact() {
    let mut reducer = AnalyticsReducer::default();
@@ -2126,7 +2076,7 @@ fn turn_event_serializes_expected_shape() {
            runtime: sample_runtime_metadata(),
            submission_type: None,
            ephemeral: false,
-            thread_source: Some(ThreadSource::User),
+            thread_source: Some("user".to_string()),
            initialization_mode: ThreadInitializationMode::New,
            subagent_source: None,
            parent_thread_id: None,
--- a/codex-rs/analytics/src/client_tests.rs
+++ b/codex-rs/analytics/src/client_tests.rs
@@ -87,7 +87,6 @@ fn sample_thread(thread_id: &str) -> Thread {
        cwd: test_path_buf("/tmp").abs(),
        cli_version: "0.0.0".to_string(),
        source: AppServerSessionSource::Exec,
-        thread_source: None,
        agent_nickname: None,
        agent_role: None,
        git_info: None,
@@ -102,7 +101,6 @@ fn sample_permission_profile() -> AppServerPermissionProfile {

 fn sample_thread_start_response() -> ClientResponsePayload {
    ClientResponsePayload::ThreadStart(ThreadStartResponse {
-        session_id: "session-1".to_string(),
        thread: sample_thread("thread-1"),
        model: "gpt-5".to_string(),
        model_provider: "openai".to_string(),
@@ -120,7 +118,6 @@ fn sample_thread_start_response() -> ClientResponsePayload {

 fn sample_thread_resume_response() -> ClientResponsePayload {
    ClientResponsePayload::ThreadResume(ThreadResumeResponse {
-        session_id: "session-2".to_string(),
        thread: sample_thread("thread-2"),
        model: "gpt-5".to_string(),
        model_provider: "openai".to_string(),
@@ -138,7 +135,6 @@ fn sample_thread_resume_response() -> ClientResponsePayload {

 fn sample_thread_fork_response() -> ClientResponsePayload {
    ClientResponsePayload::ThreadFork(ThreadForkResponse {
-        session_id: "session-3".to_string(),
        thread: sample_thread("thread-3"),
        model: "gpt-5".to_string(),
        model_provider: "openai".to_string(),
@@ -158,7 +154,6 @@ fn sample_turn_start_response() -> ClientResponsePayload {
    ClientResponsePayload::TurnStart(TurnStartResponse {
        turn: Turn {
            id: "turn-1".to_string(),
-            items_view: codex_app_server_protocol::TurnItemsView::Full,
            items: Vec::new(),
            status: AppServerTurnStatus::InProgress,
            error: None,
--- a/codex-rs/analytics/src/events.rs
+++ b/codex-rs/analytics/src/events.rs
@@ -33,7 +33,6 @@ use codex_protocol::protocol::HookEventName;
 use codex_protocol::protocol::HookRunStatus;
 use codex_protocol::protocol::HookSource;
 use codex_protocol::protocol::SubAgentSource;
-use codex_protocol::protocol::ThreadSource;
 use codex_protocol::protocol::TokenUsage;
 use serde::Serialize;

@@ -95,10 +94,8 @@ pub(crate) struct SkillInvocationEventRequest {
 pub(crate) struct SkillInvocationEventParams {
    pub(crate) product_client_id: Option<String>,
    pub(crate) skill_scope: Option<String>,
-    pub(crate) plugin_id: Option<String>,
    pub(crate) repo_url: Option<String>,
    pub(crate) thread_id: Option<String>,
-    pub(crate) turn_id: Option<String>,
    pub(crate) invoke_type: Option<InvocationType>,
    pub(crate) model_slug: Option<String>,
 }
@@ -127,7 +124,7 @@ pub(crate) struct ThreadInitializedEventParams {
    pub(crate) runtime: CodexRuntimeMetadata,
    pub(crate) model: String,
    pub(crate) ephemeral: bool,
-    pub(crate) thread_source: Option<ThreadSource>,
+    pub(crate) thread_source: Option<&'static str>,
    pub(crate) initialization_mode: ThreadInitializationMode,
    pub(crate) subagent_source: Option<String>,
    pub(crate) parent_thread_id: Option<String>,
@@ -453,8 +450,10 @@ pub(crate) struct CodexToolItemEventBase {
    pub(crate) parent_thread_id: Option<String>,
    pub(crate) tool_name: String,
    pub(crate) started_at_ms: u64,
-    pub(crate) completed_at_ms: u64,
+    pub(crate) completed_at_ms: Option<u64>,
    pub(crate) duration_ms: Option<u64>,
+    pub(crate) execution_duration_ms: Option<u64>,
+    pub(crate) execution_started: bool,
    pub(crate) review_count: u64,
    pub(crate) guardian_review_count: u64,
    pub(crate) user_review_count: u64,
@@ -463,6 +462,16 @@ pub(crate) struct CodexToolItemEventBase {
    pub(crate) failure_kind: Option<ToolItemFailureKind>,
    pub(crate) requested_additional_permissions: bool,
    pub(crate) requested_network_access: bool,
+    pub(crate) retry_count: u64,
+}
+
+#[allow(dead_code)]
+#[derive(Clone, Copy, Debug, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub(crate) enum CommandExecutionFamily {
+    Shell,
+    UserShell,
+    UnifiedExec,
 }

 #[allow(dead_code)]
@@ -490,12 +499,9 @@ pub(crate) struct CodexCommandExecutionEventParams {
    #[serde(flatten)]
    pub(crate) base: CodexToolItemEventBase,
    pub(crate) command_execution_source: CommandExecutionSource,
+    pub(crate) command_execution_family: CommandExecutionFamily,
    pub(crate) exit_code: Option<i32>,
-    pub(crate) command_total_action_count: u64,
-    pub(crate) command_read_action_count: u64,
-    pub(crate) command_list_files_action_count: u64,
-    pub(crate) command_search_action_count: u64,
-    pub(crate) command_unknown_action_count: u64,
+    pub(crate) command_action_count: Option<u64>,
 }

 #[derive(Serialize)]
@@ -528,6 +534,7 @@ pub(crate) struct CodexMcpToolCallEventParams {
    pub(crate) mcp_server_name: String,
    pub(crate) mcp_tool_name: String,
    pub(crate) mcp_error_present: bool,
+    pub(crate) mcp_error_code: Option<String>,
 }

 #[derive(Serialize)]
@@ -648,7 +655,7 @@ pub(crate) struct CodexCompactionEventParams {
    pub(crate) turn_id: String,
    pub(crate) app_server_client: CodexAppServerClientMetadata,
    pub(crate) runtime: CodexRuntimeMetadata,
-    pub(crate) thread_source: Option<ThreadSource>,
+    pub(crate) thread_source: Option<&'static str>,
    pub(crate) subagent_source: Option<String>,
    pub(crate) parent_thread_id: Option<String>,
    pub(crate) trigger: CompactionTrigger,
@@ -681,7 +688,7 @@ pub(crate) struct CodexTurnEventParams {
    pub(crate) app_server_client: CodexAppServerClientMetadata,
    pub(crate) runtime: CodexRuntimeMetadata,
    pub(crate) ephemeral: bool,
-    pub(crate) thread_source: Option<ThreadSource>,
+    pub(crate) thread_source: Option<String>,
    pub(crate) initialization_mode: ThreadInitializationMode,
    pub(crate) subagent_source: Option<String>,
    pub(crate) parent_thread_id: Option<String>,
@@ -734,7 +741,7 @@ pub(crate) struct CodexTurnSteerEventParams {
    pub(crate) accepted_turn_id: Option<String>,
    pub(crate) app_server_client: CodexAppServerClientMetadata,
    pub(crate) runtime: CodexRuntimeMetadata,
-    pub(crate) thread_source: Option<ThreadSource>,
+    pub(crate) thread_source: Option<String>,
    pub(crate) subagent_source: Option<String>,
    pub(crate) parent_thread_id: Option<String>,
    pub(crate) num_input_images: usize,
@@ -837,7 +844,7 @@ pub(crate) fn codex_compaction_event_params(
    input: CodexCompactionEvent,
    app_server_client: CodexAppServerClientMetadata,
    runtime: CodexRuntimeMetadata,
-    thread_source: Option<ThreadSource>,
+    thread_source: Option<&'static str>,
    subagent_source: Option<String>,
    parent_thread_id: Option<String>,
 ) -> CodexCompactionEventParams {
@@ -941,7 +948,7 @@ pub(crate) fn subagent_thread_started_event_request(
        runtime: current_runtime_metadata(),
        model: input.model,
        ephemeral: input.ephemeral,
-        thread_source: Some(ThreadSource::Subagent),
+        thread_source: Some("subagent"),
        initialization_mode: ThreadInitializationMode::New,
        subagent_source: Some(subagent_source_name(&input.subagent_source)),
        parent_thread_id: input
--- a/codex-rs/analytics/src/facts.rs
+++ b/codex-rs/analytics/src/facts.rs
@@ -173,7 +173,6 @@ pub struct SkillInvocation {
    pub skill_name: String,
    pub skill_scope: SkillScope,
    pub skill_path: PathBuf,
-    pub plugin_id: Option<String>,
    pub invocation_type: InvocationType,
 }

--- a/codex-rs/analytics/src/reducer.rs
+++ b/codex-rs/analytics/src/reducer.rs
@@ -64,7 +64,6 @@ use codex_protocol::config_types::ReasoningSummary;
 use codex_protocol::models::PermissionProfile;
 use codex_protocol::protocol::SessionSource;
 use codex_protocol::protocol::SkillScope;
-use codex_protocol::protocol::ThreadSource;
 use codex_protocol::protocol::TokenUsage;
 use sha1::Digest;
 use std::collections::HashMap;
@@ -148,7 +147,7 @@ enum MissingAnalyticsContext {

 #[derive(Clone)]
 struct ThreadMetadataState {
-    thread_source: Option<ThreadSource>,
+    thread_source: Option<&'static str>,
    initialization_mode: ThreadInitializationMode,
    subagent_source: Option<String>,
    parent_thread_id: Option<String>,
@@ -157,7 +156,6 @@ struct ThreadMetadataState {
 impl ThreadMetadataState {
    fn from_thread_metadata(
        session_source: &SessionSource,
-        thread_source: Option<ThreadSource>,
        initialization_mode: ThreadInitializationMode,
    ) -> Self {
        let (subagent_source, parent_thread_id) = match session_source {
@@ -174,7 +172,7 @@ impl ThreadMetadataState {
            | SessionSource::Unknown => (None, None),
        };
        Self {
-            thread_source,
+            thread_source: session_source.thread_source_name(),
            initialization_mode,
            subagent_source,
            parent_thread_id,
@@ -350,7 +348,7 @@ impl AnalyticsReducer {
        thread_state
            .metadata
            .get_or_insert_with(|| ThreadMetadataState {
-                thread_source: Some(ThreadSource::Subagent),
+                thread_source: Some("subagent"),
                initialization_mode: ThreadInitializationMode::New,
                subagent_source: Some(subagent_source_name(&input.subagent_source)),
                parent_thread_id,
@@ -498,13 +496,11 @@ impl AnalyticsReducer {
                    skill_name: invocation.skill_name.clone(),
                    event_params: SkillInvocationEventParams {
                        thread_id: Some(tracking.thread_id.clone()),
-                        turn_id: Some(tracking.turn_id.clone()),
                        invoke_type: Some(invocation.invocation_type),
                        model_slug: Some(tracking.model_slug.clone()),
                        product_client_id: Some(originator().value),
                        repo_url,
                        skill_scope: Some(skill_scope.to_string()),
-                        plugin_id: invocation.plugin_id,
                    },
                },
            ));
@@ -751,16 +747,13 @@ impl AnalyticsReducer {
        initialization_mode: ThreadInitializationMode,
        out: &mut Vec<TrackEventRequest>,
    ) {
-        let session_source: SessionSource = thread.source.into();
+        let thread_source: SessionSource = thread.source.into();
        let thread_id = thread.id;
        let Some(connection_state) = self.connections.get(&connection_id) else {
            return;
        };
-        let thread_metadata = ThreadMetadataState::from_thread_metadata(
-            &session_source,
-            thread.thread_source.map(Into::into),
-            initialization_mode,
-        );
+        let thread_metadata =
+            ThreadMetadataState::from_thread_metadata(&thread_source, initialization_mode);
        self.threads.insert(
            thread_id.clone(),
            ThreadAnalyticsState {
@@ -862,7 +855,7 @@ impl AnalyticsReducer {
                accepted_turn_id,
                app_server_client: connection_state.app_server_client.clone(),
                runtime: connection_state.runtime.clone(),
-                thread_source: thread_metadata.thread_source,
+                thread_source: thread_metadata.thread_source.map(str::to_string),
                subagent_source: thread_metadata.subagent_source.clone(),
                parent_thread_id: thread_metadata.parent_thread_id.clone(),
                num_input_images: pending_request.num_input_images,
@@ -1028,7 +1021,7 @@ fn codex_turn_event_params(
        runtime,
        submission_type,
        ephemeral,
-        thread_source: thread_metadata.thread_source,
+        thread_source: thread_metadata.thread_source.map(str::to_string),
        initialization_mode: thread_metadata.initialization_mode,
        subagent_source: thread_metadata.subagent_source.clone(),
        parent_thread_id: thread_metadata.parent_thread_id.clone(),
--- a/codex-rs/app-server-client/Cargo.toml
+++ b/codex-rs/app-server-client/Cargo.toml
@@ -33,5 +33,4 @@ url = { workspace = true }
 [dev-dependencies]
 pretty_assertions = { workspace = true }
 serde_json = { workspace = true }
-tempfile = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
--- a/codex-rs/app-server-client/src/lib.rs
+++ b/codex-rs/app-server-client/src/lib.rs
@@ -46,7 +46,6 @@ use codex_config::LoaderOverrides;
 use codex_config::NoopThreadConfigLoader;
 use codex_config::RemoteThreadConfigLoader;
 use codex_config::ThreadConfigLoader;
-pub use codex_core::StateDbHandle;
 use codex_core::config::Config;
 pub use codex_exec_server::EnvironmentManager;
 pub use codex_exec_server::EnvironmentManagerArgs;
@@ -344,8 +343,6 @@ pub struct InProcessClientStartArgs {
    pub feedback: CodexFeedback,
    /// SQLite tracing layer used to flush recently emitted logs before feedback upload.
    pub log_db: Option<LogDbLayer>,
-    /// Process-wide SQLite state handle shared with the embedded app-server.
-    pub state_db: Option<StateDbHandle>,
    /// Environment manager used by core execution and filesystem operations.
    pub environment_manager: Arc<EnvironmentManager>,
    /// Startup warnings emitted after initialize succeeds.
@@ -407,7 +404,6 @@ impl InProcessClientStartArgs {
            thread_config_loader,
            feedback: self.feedback,
            log_db: self.log_db,
-            state_db: self.state_db,
            environment_manager: self.environment_manager,
            config_warnings: self.config_warnings,
            session_source: self.session_source,
@@ -954,13 +950,9 @@ mod tests {
    use codex_app_server_protocol::ToolRequestUserInputParams;
    use codex_app_server_protocol::ToolRequestUserInputQuestion;
    use codex_core::config::ConfigBuilder;
-    use codex_core::init_state_db_from_config;
    use futures::SinkExt;
    use futures::StreamExt;
    use pretty_assertions::assert_eq;
-    use std::ops::Deref;
-    use std::path::Path;
-    use tempfile::TempDir;
    use tokio::net::TcpListener;
    use tokio::time::Duration;
    use tokio::time::timeout;
@@ -979,59 +971,18 @@ mod tests {
        }
    }

-    async fn build_test_config_for_codex_home(codex_home: &Path) -> Config {
-        match ConfigBuilder::default()
-            .codex_home(codex_home.to_path_buf())
-            .build()
-            .await
-        {
-            Ok(config) => config,
-            Err(_) => Config::load_default_with_cli_overrides_for_codex_home(
-                codex_home.to_path_buf(),
-                Vec::new(),
-            )
-            .await
-            .expect("default config should load"),
-        }
-    }
-
-    struct TestClient {
-        _codex_home: TempDir,
-        client: InProcessAppServerClient,
-    }
-
-    impl Deref for TestClient {
-        type Target = InProcessAppServerClient;
-
-        fn deref(&self) -> &Self::Target {
-            &self.client
-        }
-    }
-
-    impl TestClient {
-        async fn shutdown(self) -> IoResult<()> {
-            self.client.shutdown().await
-        }
-    }
-
    async fn start_test_client_with_capacity(
        session_source: SessionSource,
        channel_capacity: usize,
-    ) -> TestClient {
-        let codex_home = TempDir::new().expect("temp dir");
-        let config = Arc::new(build_test_config_for_codex_home(codex_home.path()).await);
-        let state_db = init_state_db_from_config(config.as_ref())
-            .await
-            .expect("state db should initialize for in-process test");
-        let client = InProcessAppServerClient::start(InProcessClientStartArgs {
+    ) -> InProcessAppServerClient {
+        InProcessAppServerClient::start(InProcessClientStartArgs {
            arg0_paths: Arg0DispatchPaths::default(),
-            config,
+            config: Arc::new(build_test_config().await),
            cli_overrides: Vec::new(),
            loader_overrides: LoaderOverrides::default(),
            cloud_requirements: CloudRequirementsLoader::default(),
            feedback: CodexFeedback::new(),
            log_db: None,
-            state_db: Some(state_db),
            environment_manager: Arc::new(EnvironmentManager::default_for_tests()),
            config_warnings: Vec::new(),
            session_source,
@@ -1043,15 +994,10 @@ mod tests {
            channel_capacity,
        })
        .await
-        .expect("in-process app-server client should start");
-
-        TestClient {
-            _codex_home: codex_home,
-            client,
-        }
+        .expect("in-process app-server client should start")
    }

-    async fn start_test_client(session_source: SessionSource) -> TestClient {
+    async fn start_test_client(session_source: SessionSource) -> InProcessAppServerClient {
        start_test_client_with_capacity(session_source, DEFAULT_IN_PROCESS_CHANNEL_CAPACITY).await
    }

@@ -1188,7 +1134,7 @@ mod tests {
        ServerNotification::ItemCompleted(codex_app_server_protocol::ItemCompletedNotification {
            thread_id: "thread".to_string(),
            turn_id: "turn".to_string(),
-            completed_at_ms: 0,
+            completed_at_ms: None,
            item: codex_app_server_protocol::ThreadItem::AgentMessage {
                id: "item".to_string(),
                text: text.to_string(),
@@ -1203,7 +1149,6 @@ mod tests {
            thread_id: "thread".to_string(),
            turn: codex_app_server_protocol::Turn {
                id: "turn".to_string(),
-                items_view: codex_app_server_protocol::TurnItemsView::Full,
                items: Vec::new(),
                status: codex_app_server_protocol::TurnStatus::Completed,
                error: None,
@@ -2034,7 +1979,6 @@ mod tests {
                        thread_id: "thread".to_string(),
                        turn: codex_app_server_protocol::Turn {
                            id: "turn".to_string(),
-                            items_view: codex_app_server_protocol::TurnItemsView::Full,
                            items: Vec::new(),
                            status: codex_app_server_protocol::TurnStatus::Completed,
                            error: None,
@@ -2064,7 +2008,7 @@ mod tests {
                    codex_app_server_protocol::ItemCompletedNotification {
                        thread_id: "thread".to_string(),
                        turn_id: "turn".to_string(),
-                        completed_at_ms: 0,
+                        completed_at_ms: None,
                        item: codex_app_server_protocol::ThreadItem::AgentMessage {
                            id: "item".to_string(),
                            text: "hello".to_string(),
@@ -2115,7 +2059,6 @@ mod tests {
            cloud_requirements: CloudRequirementsLoader::default(),
            feedback: CodexFeedback::new(),
            log_db: None,
-            state_db: None,
            environment_manager: environment_manager.clone(),
            config_warnings: Vec::new(),
            session_source: SessionSource::Exec,
@@ -2155,7 +2098,6 @@ mod tests {
            cloud_requirements: CloudRequirementsLoader::default(),
            feedback: CodexFeedback::new(),
            log_db: None,
-            state_db: None,
            environment_manager: Arc::new(EnvironmentManager::default_for_tests()),
            config_warnings: Vec::new(),
            session_source: SessionSource::Exec,
--- a/codex-rs/app-server-protocol/schema/json/ClientRequest.json
+++ b/codex-rs/app-server-protocol/schema/json/ClientRequest.json
@@ -2197,37 +2197,11 @@
      ],
      "type": "object"
    },
-    "PluginShareDiscoverability": {
-      "enum": [
-        "LISTED",
-        "UNLISTED",
-        "PRIVATE"
-      ],
-      "type": "string"
-    },
    "PluginShareListParams": {
      "type": "object"
    },
-    "PluginSharePrincipalType": {
-      "enum": [
-        "user",
-        "group",
-        "workspace"
-      ],
-      "type": "string"
-    },
    "PluginShareSaveParams": {
      "properties": {
-        "discoverability": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/PluginShareDiscoverability"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
        "pluginPath": {
          "$ref": "#/definitions/AbsolutePathBuf"
        },
@@ -2236,15 +2210,6 @@
            "string",
            "null"
          ]
-        },
-        "shareTargets": {
-          "items": {
-            "$ref": "#/definitions/PluginShareTarget"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
        }
      },
      "required": [
@@ -2252,39 +2217,6 @@
      ],
      "type": "object"
    },
-    "PluginShareTarget": {
-      "properties": {
-        "principalId": {
-          "type": "string"
-        },
-        "principalType": {
-          "$ref": "#/definitions/PluginSharePrincipalType"
-        }
-      },
-      "required": [
-        "principalId",
-        "principalType"
-      ],
-      "type": "object"
-    },
-    "PluginShareUpdateTargetsParams": {
-      "properties": {
-        "remotePluginId": {
-          "type": "string"
-        },
-        "shareTargets": {
-          "items": {
-            "$ref": "#/definitions/PluginShareTarget"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "remotePluginId",
-        "shareTargets"
-      ],
-      "type": "object"
-    },
    "PluginSkillReadParams": {
      "properties": {
        "remoteMarketplaceName": {
@@ -2333,28 +2265,6 @@
      ],
      "type": "object"
    },
-    "ProcessTerminalSize": {
-      "description": "PTY size in character cells for `process/spawn` PTY sessions.",
-      "properties": {
-        "cols": {
-          "description": "Terminal width in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "rows": {
-          "description": "Terminal height in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        }
-      },
-      "required": [
-        "cols",
-        "rows"
-      ],
-      "type": "object"
-    },
    "RealtimeOutputModality": {
      "enum": [
        "text",
@@ -2940,28 +2850,6 @@
          "title": "CompactionResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "encrypted_content": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "context_compaction"
-              ],
-              "title": "ContextCompactionResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "ContextCompactionResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "type": {
@@ -3626,17 +3514,6 @@
        },
        "threadId": {
          "type": "string"
-        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional client-supplied analytics source classification for this forked thread."
        }
      },
      "required": [
@@ -4111,14 +3988,6 @@
      ],
      "type": "string"
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadSourceKind": {
      "enum": [
        "cli",
@@ -4252,17 +4121,6 @@
              "type": "null"
            }
          ]
-        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional client-supplied analytics source classification for this thread."
        }
      },
      "type": "object"
@@ -5245,30 +5103,6 @@
      "title": "Plugin/share/saveRequest",
      "type": "object"
    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "plugin/share/updateTargets"
-          ],
-          "title": "Plugin/share/updateTargetsRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/PluginShareUpdateTargetsParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Plugin/share/updateTargetsRequest",
-      "type": "object"
-    },
    {
      "properties": {
        "id": {
@@ -6036,29 +5870,6 @@
      "title": "WindowsSandbox/setupStartRequest",
      "type": "object"
    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "windowsSandbox/readiness"
-          ],
-          "title": "WindowsSandbox/readinessRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "type": "null"
-        }
-      },
-      "required": [
-        "id",
-        "method"
-      ],
-      "title": "WindowsSandbox/readinessRequest",
-      "type": "object"
-    },
    {
      "properties": {
        "id": {
--- a/codex-rs/app-server-protocol/schema/json/ServerNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/ServerNotification.json
@@ -1933,9 +1933,12 @@
    "ItemCompletedNotification": {
      "properties": {
        "completedAtMs": {
-          "description": "Unix timestamp (in milliseconds) when this item lifecycle completed.",
+          "description": "Unix timestamp (in milliseconds) when this item lifecycle completed, if known.",
          "format": "int64",
-          "type": "integer"
+          "type": [
+            "integer",
+            "null"
+          ]
        },
        "item": {
          "$ref": "#/definitions/ThreadItem"
@@ -1948,7 +1951,6 @@
        }
      },
      "required": [
-        "completedAtMs",
        "item",
        "threadId",
        "turnId"
@@ -2037,9 +2039,12 @@
          "$ref": "#/definitions/ThreadItem"
        },
        "startedAtMs": {
-          "description": "Unix timestamp (in milliseconds) when this item lifecycle started.",
+          "description": "Unix timestamp (in milliseconds) when this item lifecycle started, if known.",
          "format": "int64",
-          "type": "integer"
+          "type": [
+            "integer",
+            "null"
+          ]
        },
        "threadId": {
          "type": "string"
@@ -2050,7 +2055,6 @@
      },
      "required": [
        "item",
-        "startedAtMs",
        "threadId",
        "turnId"
      ],
@@ -2415,96 +2419,6 @@
      ],
      "type": "string"
    },
-    "ProcessExitedNotification": {
-      "description": "Final process exit notification for `process/spawn`.",
-      "properties": {
-        "exitCode": {
-          "description": "Process exit code.",
-          "format": "int32",
-          "type": "integer"
-        },
-        "processHandle": {
-          "description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
-          "type": "string"
-        },
-        "stderr": {
-          "description": "Buffered stderr capture.\n\nEmpty when stderr was streamed via `process/outputDelta`.",
-          "type": "string"
-        },
-        "stderrCapReached": {
-          "description": "Whether stderr reached `outputBytesCap`.\n\nIn streaming mode, stderr is empty and cap state is also reported on the final stderr `process/outputDelta` notification.",
-          "type": "boolean"
-        },
-        "stdout": {
-          "description": "Buffered stdout capture.\n\nEmpty when stdout was streamed via `process/outputDelta`.",
-          "type": "string"
-        },
-        "stdoutCapReached": {
-          "description": "Whether stdout reached `outputBytesCap`.\n\nIn streaming mode, stdout is empty and cap state is also reported on the final stdout `process/outputDelta` notification.",
-          "type": "boolean"
-        }
-      },
-      "required": [
-        "exitCode",
-        "processHandle",
-        "stderr",
-        "stderrCapReached",
-        "stdout",
-        "stdoutCapReached"
-      ],
-      "type": "object"
-    },
-    "ProcessOutputDeltaNotification": {
-      "description": "Base64-encoded output chunk emitted for a streaming `process/spawn` request.",
-      "properties": {
-        "capReached": {
-          "description": "True on the final streamed chunk for this stream when output was truncated by `outputBytesCap`.",
-          "type": "boolean"
-        },
-        "deltaBase64": {
-          "description": "Base64-encoded output bytes.",
-          "type": "string"
-        },
-        "processHandle": {
-          "description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
-          "type": "string"
-        },
-        "stream": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/ProcessOutputStream"
-            }
-          ],
-          "description": "Output stream this chunk belongs to."
-        }
-      },
-      "required": [
-        "capReached",
-        "deltaBase64",
-        "processHandle",
-        "stream"
-      ],
-      "type": "object"
-    },
-    "ProcessOutputStream": {
-      "description": "Stream label for `process/outputDelta` notifications.",
-      "oneOf": [
-        {
-          "description": "stdout stream. PTY mode multiplexes terminal output here.",
-          "enum": [
-            "stdout"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "stderr stream.",
-          "enum": [
-            "stderr"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "RateLimitReachedType": {
      "enum": [
        "rate_limit_reached",
@@ -3088,17 +3002,6 @@
          ],
          "description": "Current runtime status for the thread."
        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional analytics source classification for this thread."
-        },
        "turns": {
          "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
          "items": {
@@ -4105,14 +4008,6 @@
      ],
      "type": "object"
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadStartedNotification": {
      "properties": {
        "thread": {
@@ -4331,21 +4226,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -4428,31 +4314,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnPlanStep": {
      "properties": {
        "status": {
@@ -5306,48 +5167,6 @@
      "title": "Command/exec/outputDeltaNotification",
      "type": "object"
    },
-    {
-      "description": "Stream base64-encoded stdout/stderr chunks for a running `process/spawn` session.",
-      "properties": {
-        "method": {
-          "enum": [
-            "process/outputDelta"
-          ],
-          "title": "Process/outputDeltaNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ProcessOutputDeltaNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Process/outputDeltaNotification",
-      "type": "object"
-    },
-    {
-      "description": "Final exit notification for a `process/spawn` session.",
-      "properties": {
-        "method": {
-          "enum": [
-            "process/exited"
-          ],
-          "title": "Process/exitedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ProcessExitedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Process/exitedNotification",
-      "type": "object"
-    },
    {
      "properties": {
        "method": {
--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
@@ -810,30 +810,6 @@
          "title": "Plugin/share/saveRequest",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "$ref": "#/definitions/v2/RequestId"
-            },
-            "method": {
-              "enum": [
-                "plugin/share/updateTargets"
-              ],
-              "title": "Plugin/share/updateTargetsRequestMethod",
-              "type": "string"
-            },
-            "params": {
-              "$ref": "#/definitions/v2/PluginShareUpdateTargetsParams"
-            }
-          },
-          "required": [
-            "id",
-            "method",
-            "params"
-          ],
-          "title": "Plugin/share/updateTargetsRequest",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
@@ -1601,29 +1577,6 @@
          "title": "WindowsSandbox/setupStartRequest",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "$ref": "#/definitions/v2/RequestId"
-            },
-            "method": {
-              "enum": [
-                "windowsSandbox/readiness"
-              ],
-              "title": "WindowsSandbox/readinessRequestMethod",
-              "type": "string"
-            },
-            "params": {
-              "type": "null"
-            }
-          },
-          "required": [
-            "id",
-            "method"
-          ],
-          "title": "WindowsSandbox/readinessRequest",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
@@ -4295,48 +4248,6 @@
          "title": "Command/exec/outputDeltaNotification",
          "type": "object"
        },
-        {
-          "description": "Stream base64-encoded stdout/stderr chunks for a running `process/spawn` session.",
-          "properties": {
-            "method": {
-              "enum": [
-                "process/outputDelta"
-              ],
-              "title": "Process/outputDeltaNotificationMethod",
-              "type": "string"
-            },
-            "params": {
-              "$ref": "#/definitions/v2/ProcessOutputDeltaNotification"
-            }
-          },
-          "required": [
-            "method",
-            "params"
-          ],
-          "title": "Process/outputDeltaNotification",
-          "type": "object"
-        },
-        {
-          "description": "Final exit notification for a `process/spawn` session.",
-          "properties": {
-            "method": {
-              "enum": [
-                "process/exited"
-              ],
-              "title": "Process/exitedNotificationMethod",
-              "type": "string"
-            },
-            "params": {
-              "$ref": "#/definitions/v2/ProcessExitedNotification"
-            }
-          },
-          "required": [
-            "method",
-            "params"
-          ],
-          "title": "Process/exitedNotification",
-          "type": "object"
-        },
        {
          "properties": {
            "method": {
@@ -9857,9 +9768,6 @@
              "null"
            ]
          },
-          "currentHash": {
-            "type": "string"
-          },
          "displayOrder": {
            "format": "int64",
            "type": "integer"
@@ -9907,13 +9815,9 @@
            "format": "uint64",
            "minimum": 0.0,
            "type": "integer"
-          },
-          "trustStatus": {
-            "$ref": "#/definitions/v2/HookTrustStatus"
          }
        },
        "required": [
-          "currentHash",
          "displayOrder",
          "enabled",
          "eventName",
@@ -9922,8 +9826,7 @@
          "key",
          "source",
          "sourcePath",
-          "timeoutSec",
-          "trustStatus"
+          "timeoutSec"
        ],
        "type": "object"
      },
@@ -10113,15 +10016,6 @@
        "title": "HookStartedNotification",
        "type": "object"
      },
-      "HookTrustStatus": {
-        "enum": [
-          "managed",
-          "untrusted",
-          "trusted",
-          "modified"
-        ],
-        "type": "string"
-      },
      "HooksListEntry": {
        "properties": {
          "cwd": {
@@ -10216,9 +10110,12 @@
        "$schema": "http://json-schema.org/draft-07/schema#",
        "properties": {
          "completedAtMs": {
-            "description": "Unix timestamp (in milliseconds) when this item lifecycle completed.",
+            "description": "Unix timestamp (in milliseconds) when this item lifecycle completed, if known.",
            "format": "int64",
-            "type": "integer"
+            "type": [
+              "integer",
+              "null"
+            ]
          },
          "item": {
            "$ref": "#/definitions/v2/ThreadItem"
@@ -10231,7 +10128,6 @@
          }
        },
        "required": [
-          "completedAtMs",
          "item",
          "threadId",
          "turnId"
@@ -10326,9 +10222,12 @@
            "$ref": "#/definitions/v2/ThreadItem"
          },
          "startedAtMs": {
-            "description": "Unix timestamp (in milliseconds) when this item lifecycle started.",
+            "description": "Unix timestamp (in milliseconds) when this item lifecycle started, if known.",
            "format": "int64",
-            "type": "integer"
+            "type": [
+              "integer",
+              "null"
+            ]
          },
          "threadId": {
            "type": "string"
@@ -10339,7 +10238,6 @@
        },
        "required": [
          "item",
-          "startedAtMs",
          "threadId",
          "turnId"
        ],
@@ -11330,7 +11228,6 @@
        "properties": {
          "additionalSpeedTiers": {
            "default": [],
-            "description": "Deprecated: use `serviceTiers` instead.",
            "items": {
              "type": "string"
            },
@@ -11377,13 +11274,6 @@
          "model": {
            "type": "string"
          },
-          "serviceTiers": {
-            "default": [],
-            "items": {
-              "$ref": "#/definitions/v2/ModelServiceTier"
-            },
-            "type": "array"
-          },
          "supportedReasoningEfforts": {
            "items": {
              "$ref": "#/definitions/v2/ReasoningEffortOption"
@@ -11548,25 +11438,6 @@
        "title": "ModelReroutedNotification",
        "type": "object"
      },
-      "ModelServiceTier": {
-        "properties": {
-          "description": {
-            "type": "string"
-          },
-          "id": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "description",
-          "id",
-          "name"
-        ],
-        "type": "object"
-      },
      "ModelUpgradeInfo": {
        "properties": {
          "migrationMarkdown": {
@@ -12503,14 +12374,6 @@
        "title": "PluginShareDeleteResponse",
        "type": "object"
      },
-      "PluginShareDiscoverability": {
-        "enum": [
-          "LISTED",
-          "UNLISTED",
-          "PRIVATE"
-        ],
-        "type": "string"
-      },
      "PluginShareListItem": {
        "properties": {
          "localPluginPath": {
@@ -12557,46 +12420,9 @@
        "title": "PluginShareListResponse",
        "type": "object"
      },
-      "PluginSharePrincipal": {
-        "properties": {
-          "name": {
-            "type": "string"
-          },
-          "principalId": {
-            "type": "string"
-          },
-          "principalType": {
-            "$ref": "#/definitions/v2/PluginSharePrincipalType"
-          }
-        },
-        "required": [
-          "name",
-          "principalId",
-          "principalType"
-        ],
-        "type": "object"
-      },
-      "PluginSharePrincipalType": {
-        "enum": [
-          "user",
-          "group",
-          "workspace"
-        ],
-        "type": "string"
-      },
      "PluginShareSaveParams": {
        "$schema": "http://json-schema.org/draft-07/schema#",
        "properties": {
-          "discoverability": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/v2/PluginShareDiscoverability"
-              },
-              {
-                "type": "null"
-              }
-            ]
-          },
          "pluginPath": {
            "$ref": "#/definitions/v2/AbsolutePathBuf"
          },
@@ -12605,15 +12431,6 @@
              "string",
              "null"
            ]
-          },
-          "shareTargets": {
-            "items": {
-              "$ref": "#/definitions/v2/PluginShareTarget"
-            },
-            "type": [
-              "array",
-              "null"
-            ]
          }
        },
        "required": [
@@ -12639,57 +12456,6 @@
        "title": "PluginShareSaveResponse",
        "type": "object"
      },
-      "PluginShareTarget": {
-        "properties": {
-          "principalId": {
-            "type": "string"
-          },
-          "principalType": {
-            "$ref": "#/definitions/v2/PluginSharePrincipalType"
-          }
-        },
-        "required": [
-          "principalId",
-          "principalType"
-        ],
-        "type": "object"
-      },
-      "PluginShareUpdateTargetsParams": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "properties": {
-          "remotePluginId": {
-            "type": "string"
-          },
-          "shareTargets": {
-            "items": {
-              "$ref": "#/definitions/v2/PluginShareTarget"
-            },
-            "type": "array"
-          }
-        },
-        "required": [
-          "remotePluginId",
-          "shareTargets"
-        ],
-        "title": "PluginShareUpdateTargetsParams",
-        "type": "object"
-      },
-      "PluginShareUpdateTargetsResponse": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "properties": {
-          "principals": {
-            "items": {
-              "$ref": "#/definitions/v2/PluginSharePrincipal"
-            },
-            "type": "array"
-          }
-        },
-        "required": [
-          "principals"
-        ],
-        "title": "PluginShareUpdateTargetsResponse",
-        "type": "object"
-      },
      "PluginSkillReadParams": {
        "$schema": "http://json-schema.org/draft-07/schema#",
        "properties": {
@@ -12839,13 +12605,6 @@
              }
            ]
          },
-          "keywords": {
-            "default": [],
-            "items": {
-              "type": "string"
-            },
-            "type": "array"
-          },
          "name": {
            "type": "string"
          },
@@ -12900,122 +12659,6 @@
        ],
        "type": "object"
      },
-      "ProcessExitedNotification": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Final process exit notification for `process/spawn`.",
-        "properties": {
-          "exitCode": {
-            "description": "Process exit code.",
-            "format": "int32",
-            "type": "integer"
-          },
-          "processHandle": {
-            "description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
-            "type": "string"
-          },
-          "stderr": {
-            "description": "Buffered stderr capture.\n\nEmpty when stderr was streamed via `process/outputDelta`.",
-            "type": "string"
-          },
-          "stderrCapReached": {
-            "description": "Whether stderr reached `outputBytesCap`.\n\nIn streaming mode, stderr is empty and cap state is also reported on the final stderr `process/outputDelta` notification.",
-            "type": "boolean"
-          },
-          "stdout": {
-            "description": "Buffered stdout capture.\n\nEmpty when stdout was streamed via `process/outputDelta`.",
-            "type": "string"
-          },
-          "stdoutCapReached": {
-            "description": "Whether stdout reached `outputBytesCap`.\n\nIn streaming mode, stdout is empty and cap state is also reported on the final stdout `process/outputDelta` notification.",
-            "type": "boolean"
-          }
-        },
-        "required": [
-          "exitCode",
-          "processHandle",
-          "stderr",
-          "stderrCapReached",
-          "stdout",
-          "stdoutCapReached"
-        ],
-        "title": "ProcessExitedNotification",
-        "type": "object"
-      },
-      "ProcessOutputDeltaNotification": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Base64-encoded output chunk emitted for a streaming `process/spawn` request.",
-        "properties": {
-          "capReached": {
-            "description": "True on the final streamed chunk for this stream when output was truncated by `outputBytesCap`.",
-            "type": "boolean"
-          },
-          "deltaBase64": {
-            "description": "Base64-encoded output bytes.",
-            "type": "string"
-          },
-          "processHandle": {
-            "description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
-            "type": "string"
-          },
-          "stream": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/v2/ProcessOutputStream"
-              }
-            ],
-            "description": "Output stream this chunk belongs to."
-          }
-        },
-        "required": [
-          "capReached",
-          "deltaBase64",
-          "processHandle",
-          "stream"
-        ],
-        "title": "ProcessOutputDeltaNotification",
-        "type": "object"
-      },
-      "ProcessOutputStream": {
-        "description": "Stream label for `process/outputDelta` notifications.",
-        "oneOf": [
-          {
-            "description": "stdout stream. PTY mode multiplexes terminal output here.",
-            "enum": [
-              "stdout"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "stderr stream.",
-            "enum": [
-              "stderr"
-            ],
-            "type": "string"
-          }
-        ]
-      },
-      "ProcessTerminalSize": {
-        "description": "PTY size in character cells for `process/spawn` PTY sessions.",
-        "properties": {
-          "cols": {
-            "description": "Terminal width in character cells.",
-            "format": "uint16",
-            "minimum": 0.0,
-            "type": "integer"
-          },
-          "rows": {
-            "description": "Terminal height in character cells.",
-            "format": "uint16",
-            "minimum": 0.0,
-            "type": "integer"
-          }
-        },
-        "required": [
-          "cols",
-          "rows"
-        ],
-        "type": "object"
-      },
      "ProfileV2": {
        "additionalProperties": true,
        "properties": {
@@ -14164,28 +13807,6 @@
            "title": "CompactionResponseItem",
            "type": "object"
          },
-          {
-            "properties": {
-              "encrypted_content": {
-                "type": [
-                  "string",
-                  "null"
-                ]
-              },
-              "type": {
-                "enum": [
-                  "context_compaction"
-                ],
-                "title": "ContextCompactionResponseItemType",
-                "type": "string"
-              }
-            },
-            "required": [
-              "type"
-            ],
-            "title": "ContextCompactionResponseItem",
-            "type": "object"
-          },
          {
            "properties": {
              "type": {
@@ -15361,17 +14982,6 @@
            ],
            "description": "Current runtime status for the thread."
          },
-          "threadSource": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/v2/ThreadSource"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "description": "Optional analytics source classification for this thread."
-          },
          "turns": {
            "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
            "items": {
@@ -15586,17 +15196,6 @@
          },
          "threadId": {
            "type": "string"
-          },
-          "threadSource": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/v2/ThreadSource"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "description": "Optional client-supplied analytics source classification for this forked thread."
          }
        },
        "required": [
@@ -15664,11 +15263,6 @@
              }
            ]
          },
-          "sessionId": {
-            "default": "",
-            "description": "Session id shared by threads that belong to the same session tree.",
-            "type": "string"
-          },
          "thread": {
            "$ref": "#/definitions/v2/Thread"
          }
@@ -17176,11 +16770,6 @@
              }
            ]
          },
-          "sessionId": {
-            "default": "",
-            "description": "Session id shared by threads that belong to the same session tree.",
-            "type": "string"
-          },
          "thread": {
            "$ref": "#/definitions/v2/Thread"
          }
@@ -17287,14 +16876,6 @@
        ],
        "type": "string"
      },
-      "ThreadSource": {
-        "enum": [
-          "user",
-          "subagent",
-          "memory_consolidation"
-        ],
-        "type": "string"
-      },
      "ThreadSourceKind": {
        "enum": [
          "cli",
@@ -17429,17 +17010,6 @@
                "type": "null"
              }
            ]
-          },
-          "threadSource": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/v2/ThreadSource"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "description": "Optional client-supplied analytics source classification for this thread."
          }
        },
        "title": "ThreadStartParams",
@@ -17504,11 +17074,6 @@
              }
            ]
          },
-          "sessionId": {
-            "default": "",
-            "description": "Session id shared by threads that belong to the same session tree.",
-            "type": "string"
-          },
          "thread": {
            "$ref": "#/definitions/v2/Thread"
          }
@@ -17875,21 +17440,12 @@
            "type": "string"
          },
          "items": {
-            "description": "Thread items currently included in this turn payload.",
+            "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
            "items": {
              "$ref": "#/definitions/v2/ThreadItem"
            },
            "type": "array"
          },
-          "itemsView": {
-            "allOf": [
-              {
-                "$ref": "#/definitions/v2/TurnItemsView"
-              }
-            ],
-            "default": "full",
-            "description": "Describes how much of `items` has been loaded for this turn."
-          },
          "startedAt": {
            "description": "Unix timestamp (in seconds) when the turn started.",
            "format": "int64",
@@ -18013,31 +17569,6 @@
        "title": "TurnInterruptResponse",
        "type": "object"
      },
-      "TurnItemsView": {
-        "oneOf": [
-          {
-            "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-            "enum": [
-              "notLoaded"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "`items` contains only a display summary for this turn.",
-            "enum": [
-              "summary"
-            ],
-            "type": "string"
-          },
-          {
-            "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-            "enum": [
-              "full"
-            ],
-            "type": "string"
-          }
-        ]
-      },
      "TurnPlanStep": {
        "properties": {
          "status": {
@@ -18621,27 +18152,6 @@
        },
        "type": "object"
      },
-      "WindowsSandboxReadiness": {
-        "enum": [
-          "ready",
-          "notConfigured",
-          "updateRequired"
-        ],
-        "type": "string"
-      },
-      "WindowsSandboxReadinessResponse": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "properties": {
-          "status": {
-            "$ref": "#/definitions/v2/WindowsSandboxReadiness"
-          }
-        },
-        "required": [
-          "status"
-        ],
-        "title": "WindowsSandboxReadinessResponse",
-        "type": "object"
-      },
      "WindowsSandboxSetupCompletedNotification": {
        "$schema": "http://json-schema.org/draft-07/schema#",
        "properties": {
--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
@@ -1569,30 +1569,6 @@
          "title": "Plugin/share/saveRequest",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "$ref": "#/definitions/RequestId"
-            },
-            "method": {
-              "enum": [
-                "plugin/share/updateTargets"
-              ],
-              "title": "Plugin/share/updateTargetsRequestMethod",
-              "type": "string"
-            },
-            "params": {
-              "$ref": "#/definitions/PluginShareUpdateTargetsParams"
-            }
-          },
-          "required": [
-            "id",
-            "method",
-            "params"
-          ],
-          "title": "Plugin/share/updateTargetsRequest",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
@@ -2360,29 +2336,6 @@
          "title": "WindowsSandbox/setupStartRequest",
          "type": "object"
        },
-        {
-          "properties": {
-            "id": {
-              "$ref": "#/definitions/RequestId"
-            },
-            "method": {
-              "enum": [
-                "windowsSandbox/readiness"
-              ],
-              "title": "WindowsSandbox/readinessRequestMethod",
-              "type": "string"
-            },
-            "params": {
-              "type": "null"
-            }
-          },
-          "required": [
-            "id",
-            "method"
-          ],
-          "title": "WindowsSandbox/readinessRequest",
-          "type": "object"
-        },
        {
          "properties": {
            "id": {
@@ -6424,9 +6377,6 @@
            "null"
          ]
        },
-        "currentHash": {
-          "type": "string"
-        },
        "displayOrder": {
          "format": "int64",
          "type": "integer"
@@ -6474,13 +6424,9 @@
          "format": "uint64",
          "minimum": 0.0,
          "type": "integer"
-        },
-        "trustStatus": {
-          "$ref": "#/definitions/HookTrustStatus"
        }
      },
      "required": [
-        "currentHash",
        "displayOrder",
        "enabled",
        "eventName",
@@ -6489,8 +6435,7 @@
        "key",
        "source",
        "sourcePath",
-        "timeoutSec",
-        "trustStatus"
+        "timeoutSec"
      ],
      "type": "object"
    },
@@ -6680,15 +6625,6 @@
      "title": "HookStartedNotification",
      "type": "object"
    },
-    "HookTrustStatus": {
-      "enum": [
-        "managed",
-        "untrusted",
-        "trusted",
-        "modified"
-      ],
-      "type": "string"
-    },
    "HooksListEntry": {
      "properties": {
        "cwd": {
@@ -6827,9 +6763,12 @@
      "$schema": "http://json-schema.org/draft-07/schema#",
      "properties": {
        "completedAtMs": {
-          "description": "Unix timestamp (in milliseconds) when this item lifecycle completed.",
+          "description": "Unix timestamp (in milliseconds) when this item lifecycle completed, if known.",
          "format": "int64",
-          "type": "integer"
+          "type": [
+            "integer",
+            "null"
+          ]
        },
        "item": {
          "$ref": "#/definitions/ThreadItem"
@@ -6842,7 +6781,6 @@
        }
      },
      "required": [
-        "completedAtMs",
        "item",
        "threadId",
        "turnId"
@@ -6937,9 +6875,12 @@
          "$ref": "#/definitions/ThreadItem"
        },
        "startedAtMs": {
-          "description": "Unix timestamp (in milliseconds) when this item lifecycle started.",
+          "description": "Unix timestamp (in milliseconds) when this item lifecycle started, if known.",
          "format": "int64",
-          "type": "integer"
+          "type": [
+            "integer",
+            "null"
+          ]
        },
        "threadId": {
          "type": "string"
@@ -6950,7 +6891,6 @@
      },
      "required": [
        "item",
-        "startedAtMs",
        "threadId",
        "turnId"
      ],
@@ -7941,7 +7881,6 @@
      "properties": {
        "additionalSpeedTiers": {
          "default": [],
-          "description": "Deprecated: use `serviceTiers` instead.",
          "items": {
            "type": "string"
          },
@@ -7988,13 +7927,6 @@
        "model": {
          "type": "string"
        },
-        "serviceTiers": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/ModelServiceTier"
-          },
-          "type": "array"
-        },
        "supportedReasoningEfforts": {
          "items": {
            "$ref": "#/definitions/ReasoningEffortOption"
@@ -8159,25 +8091,6 @@
      "title": "ModelReroutedNotification",
      "type": "object"
    },
-    "ModelServiceTier": {
-      "properties": {
-        "description": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "description",
-        "id",
-        "name"
-      ],
-      "type": "object"
-    },
    "ModelUpgradeInfo": {
      "properties": {
        "migrationMarkdown": {
@@ -9114,14 +9027,6 @@
      "title": "PluginShareDeleteResponse",
      "type": "object"
    },
-    "PluginShareDiscoverability": {
-      "enum": [
-        "LISTED",
-        "UNLISTED",
-        "PRIVATE"
-      ],
-      "type": "string"
-    },
    "PluginShareListItem": {
      "properties": {
        "localPluginPath": {
@@ -9168,46 +9073,9 @@
      "title": "PluginShareListResponse",
      "type": "object"
    },
-    "PluginSharePrincipal": {
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "principalId": {
-          "type": "string"
-        },
-        "principalType": {
-          "$ref": "#/definitions/PluginSharePrincipalType"
-        }
-      },
-      "required": [
-        "name",
-        "principalId",
-        "principalType"
-      ],
-      "type": "object"
-    },
-    "PluginSharePrincipalType": {
-      "enum": [
-        "user",
-        "group",
-        "workspace"
-      ],
-      "type": "string"
-    },
    "PluginShareSaveParams": {
      "$schema": "http://json-schema.org/draft-07/schema#",
      "properties": {
-        "discoverability": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/PluginShareDiscoverability"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
        "pluginPath": {
          "$ref": "#/definitions/AbsolutePathBuf"
        },
@@ -9216,15 +9084,6 @@
            "string",
            "null"
          ]
-        },
-        "shareTargets": {
-          "items": {
-            "$ref": "#/definitions/PluginShareTarget"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
        }
      },
      "required": [
@@ -9250,57 +9109,6 @@
      "title": "PluginShareSaveResponse",
      "type": "object"
    },
-    "PluginShareTarget": {
-      "properties": {
-        "principalId": {
-          "type": "string"
-        },
-        "principalType": {
-          "$ref": "#/definitions/PluginSharePrincipalType"
-        }
-      },
-      "required": [
-        "principalId",
-        "principalType"
-      ],
-      "type": "object"
-    },
-    "PluginShareUpdateTargetsParams": {
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "properties": {
-        "remotePluginId": {
-          "type": "string"
-        },
-        "shareTargets": {
-          "items": {
-            "$ref": "#/definitions/PluginShareTarget"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "remotePluginId",
-        "shareTargets"
-      ],
-      "title": "PluginShareUpdateTargetsParams",
-      "type": "object"
-    },
-    "PluginShareUpdateTargetsResponse": {
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "properties": {
-        "principals": {
-          "items": {
-            "$ref": "#/definitions/PluginSharePrincipal"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "principals"
-      ],
-      "title": "PluginShareUpdateTargetsResponse",
-      "type": "object"
-    },
    "PluginSkillReadParams": {
      "$schema": "http://json-schema.org/draft-07/schema#",
      "properties": {
@@ -9450,13 +9258,6 @@
            }
          ]
        },
-        "keywords": {
-          "default": [],
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
        "name": {
          "type": "string"
        },
@@ -9511,122 +9312,6 @@
      ],
      "type": "object"
    },
-    "ProcessExitedNotification": {
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "description": "Final process exit notification for `process/spawn`.",
-      "properties": {
-        "exitCode": {
-          "description": "Process exit code.",
-          "format": "int32",
-          "type": "integer"
-        },
-        "processHandle": {
-          "description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
-          "type": "string"
-        },
-        "stderr": {
-          "description": "Buffered stderr capture.\n\nEmpty when stderr was streamed via `process/outputDelta`.",
-          "type": "string"
-        },
-        "stderrCapReached": {
-          "description": "Whether stderr reached `outputBytesCap`.\n\nIn streaming mode, stderr is empty and cap state is also reported on the final stderr `process/outputDelta` notification.",
-          "type": "boolean"
-        },
-        "stdout": {
-          "description": "Buffered stdout capture.\n\nEmpty when stdout was streamed via `process/outputDelta`.",
-          "type": "string"
-        },
-        "stdoutCapReached": {
-          "description": "Whether stdout reached `outputBytesCap`.\n\nIn streaming mode, stdout is empty and cap state is also reported on the final stdout `process/outputDelta` notification.",
-          "type": "boolean"
-        }
-      },
-      "required": [
-        "exitCode",
-        "processHandle",
-        "stderr",
-        "stderrCapReached",
-        "stdout",
-        "stdoutCapReached"
-      ],
-      "title": "ProcessExitedNotification",
-      "type": "object"
-    },
-    "ProcessOutputDeltaNotification": {
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "description": "Base64-encoded output chunk emitted for a streaming `process/spawn` request.",
-      "properties": {
-        "capReached": {
-          "description": "True on the final streamed chunk for this stream when output was truncated by `outputBytesCap`.",
-          "type": "boolean"
-        },
-        "deltaBase64": {
-          "description": "Base64-encoded output bytes.",
-          "type": "string"
-        },
-        "processHandle": {
-          "description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
-          "type": "string"
-        },
-        "stream": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/ProcessOutputStream"
-            }
-          ],
-          "description": "Output stream this chunk belongs to."
-        }
-      },
-      "required": [
-        "capReached",
-        "deltaBase64",
-        "processHandle",
-        "stream"
-      ],
-      "title": "ProcessOutputDeltaNotification",
-      "type": "object"
-    },
-    "ProcessOutputStream": {
-      "description": "Stream label for `process/outputDelta` notifications.",
-      "oneOf": [
-        {
-          "description": "stdout stream. PTY mode multiplexes terminal output here.",
-          "enum": [
-            "stdout"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "stderr stream.",
-          "enum": [
-            "stderr"
-          ],
-          "type": "string"
-        }
-      ]
-    },
-    "ProcessTerminalSize": {
-      "description": "PTY size in character cells for `process/spawn` PTY sessions.",
-      "properties": {
-        "cols": {
-          "description": "Terminal width in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "rows": {
-          "description": "Terminal height in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        }
-      },
-      "required": [
-        "cols",
-        "rows"
-      ],
-      "type": "object"
-    },
    "ProfileV2": {
      "additionalProperties": true,
      "properties": {
@@ -10775,28 +10460,6 @@
          "title": "CompactionResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "encrypted_content": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "context_compaction"
-              ],
-              "title": "ContextCompactionResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "ContextCompactionResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "type": {
@@ -11705,48 +11368,6 @@
          "title": "Command/exec/outputDeltaNotification",
          "type": "object"
        },
-        {
-          "description": "Stream base64-encoded stdout/stderr chunks for a running `process/spawn` session.",
-          "properties": {
-            "method": {
-              "enum": [
-                "process/outputDelta"
-              ],
-              "title": "Process/outputDeltaNotificationMethod",
-              "type": "string"
-            },
-            "params": {
-              "$ref": "#/definitions/ProcessOutputDeltaNotification"
-            }
-          },
-          "required": [
-            "method",
-            "params"
-          ],
-          "title": "Process/outputDeltaNotification",
-          "type": "object"
-        },
-        {
-          "description": "Final exit notification for a `process/spawn` session.",
-          "properties": {
-            "method": {
-              "enum": [
-                "process/exited"
-              ],
-              "title": "Process/exitedNotificationMethod",
-              "type": "string"
-            },
-            "params": {
-              "$ref": "#/definitions/ProcessExitedNotification"
-            }
-          },
-          "required": [
-            "method",
-            "params"
-          ],
-          "title": "Process/exitedNotification",
-          "type": "object"
-        },
        {
          "properties": {
            "method": {
@@ -13247,17 +12868,6 @@
          ],
          "description": "Current runtime status for the thread."
        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional analytics source classification for this thread."
-        },
        "turns": {
          "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
          "items": {
@@ -13472,17 +13082,6 @@
        },
        "threadId": {
          "type": "string"
-        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional client-supplied analytics source classification for this forked thread."
        }
      },
      "required": [
@@ -13550,11 +13149,6 @@
            }
          ]
        },
-        "sessionId": {
-          "default": "",
-          "description": "Session id shared by threads that belong to the same session tree.",
-          "type": "string"
-        },
        "thread": {
          "$ref": "#/definitions/Thread"
        }
@@ -15062,11 +14656,6 @@
            }
          ]
        },
-        "sessionId": {
-          "default": "",
-          "description": "Session id shared by threads that belong to the same session tree.",
-          "type": "string"
-        },
        "thread": {
          "$ref": "#/definitions/Thread"
        }
@@ -15173,14 +14762,6 @@
      ],
      "type": "string"
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadSourceKind": {
      "enum": [
        "cli",
@@ -15315,17 +14896,6 @@
              "type": "null"
            }
          ]
-        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional client-supplied analytics source classification for this thread."
        }
      },
      "title": "ThreadStartParams",
@@ -15390,11 +14960,6 @@
            }
          ]
        },
-        "sessionId": {
-          "default": "",
-          "description": "Session id shared by threads that belong to the same session tree.",
-          "type": "string"
-        },
        "thread": {
          "$ref": "#/definitions/Thread"
        }
@@ -15761,21 +15326,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -15899,31 +15455,6 @@
      "title": "TurnInterruptResponse",
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnPlanStep": {
      "properties": {
        "status": {
@@ -16507,27 +16038,6 @@
      },
      "type": "object"
    },
-    "WindowsSandboxReadiness": {
-      "enum": [
-        "ready",
-        "notConfigured",
-        "updateRequired"
-      ],
-      "type": "string"
-    },
-    "WindowsSandboxReadinessResponse": {
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "properties": {
-        "status": {
-          "$ref": "#/definitions/WindowsSandboxReadiness"
-        }
-      },
-      "required": [
-        "status"
-      ],
-      "title": "WindowsSandboxReadinessResponse",
-      "type": "object"
-    },
    "WindowsSandboxSetupCompletedNotification": {
      "$schema": "http://json-schema.org/draft-07/schema#",
      "properties": {
--- a/codex-rs/app-server-protocol/schema/json/v2/HooksListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/HooksListResponse.json
@@ -47,9 +47,6 @@
            "null"
          ]
        },
-        "currentHash": {
-          "type": "string"
-        },
        "displayOrder": {
          "format": "int64",
          "type": "integer"
@@ -97,13 +94,9 @@
          "format": "uint64",
          "minimum": 0.0,
          "type": "integer"
-        },
-        "trustStatus": {
-          "$ref": "#/definitions/HookTrustStatus"
        }
      },
      "required": [
-        "currentHash",
        "displayOrder",
        "enabled",
        "eventName",
@@ -112,8 +105,7 @@
        "key",
        "source",
        "sourcePath",
-        "timeoutSec",
-        "trustStatus"
+        "timeoutSec"
      ],
      "type": "object"
    },
@@ -132,15 +124,6 @@
      ],
      "type": "string"
    },
-    "HookTrustStatus": {
-      "enum": [
-        "managed",
-        "untrusted",
-        "trusted",
-        "modified"
-      ],
-      "type": "string"
-    },
    "HooksListEntry": {
      "properties": {
        "cwd": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
@@ -1371,9 +1371,12 @@
  },
  "properties": {
    "completedAtMs": {
-      "description": "Unix timestamp (in milliseconds) when this item lifecycle completed.",
+      "description": "Unix timestamp (in milliseconds) when this item lifecycle completed, if known.",
      "format": "int64",
-      "type": "integer"
+      "type": [
+        "integer",
+        "null"
+      ]
    },
    "item": {
      "$ref": "#/definitions/ThreadItem"
@@ -1386,7 +1389,6 @@
    }
  },
  "required": [
-    "completedAtMs",
    "item",
    "threadId",
    "turnId"
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
@@ -1374,9 +1374,12 @@
      "$ref": "#/definitions/ThreadItem"
    },
    "startedAtMs": {
-      "description": "Unix timestamp (in milliseconds) when this item lifecycle started.",
+      "description": "Unix timestamp (in milliseconds) when this item lifecycle started, if known.",
      "format": "int64",
-      "type": "integer"
+      "type": [
+        "integer",
+        "null"
+      ]
    },
    "threadId": {
      "type": "string"
@@ -1387,7 +1390,6 @@
  },
  "required": [
    "item",
-    "startedAtMs",
    "threadId",
    "turnId"
  ],
--- a/codex-rs/app-server-protocol/schema/json/v2/ModelListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ModelListResponse.json
@@ -24,7 +24,6 @@
      "properties": {
        "additionalSpeedTiers": {
          "default": [],
-          "description": "Deprecated: use `serviceTiers` instead.",
          "items": {
            "type": "string"
          },
@@ -71,13 +70,6 @@
        "model": {
          "type": "string"
        },
-        "serviceTiers": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/ModelServiceTier"
-          },
-          "type": "array"
-        },
        "supportedReasoningEfforts": {
          "items": {
            "$ref": "#/definitions/ReasoningEffortOption"
@@ -128,25 +120,6 @@
      ],
      "type": "object"
    },
-    "ModelServiceTier": {
-      "properties": {
-        "description": {
-          "type": "string"
-        },
-        "id": {
-          "type": "string"
-        },
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "description",
-        "id",
-        "name"
-      ],
-      "type": "object"
-    },
    "ModelUpgradeInfo": {
      "properties": {
        "migrationMarkdown": {
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginListResponse.json
@@ -347,13 +347,6 @@
            }
          ]
        },
-        "keywords": {
-          "default": [],
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
        "name": {
          "type": "string"
        },
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginReadResponse.json
@@ -366,13 +366,6 @@
            }
          ]
        },
-        "keywords": {
-          "default": [],
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
        "name": {
          "type": "string"
        },
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginShareListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginShareListResponse.json
@@ -307,13 +307,6 @@
            }
          ]
        },
-        "keywords": {
-          "default": [],
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
        "name": {
          "type": "string"
        },
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginShareSaveParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginShareSaveParams.json
@@ -4,50 +4,9 @@
    "AbsolutePathBuf": {
      "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
      "type": "string"
-    },
-    "PluginShareDiscoverability": {
-      "enum": [
-        "LISTED",
-        "UNLISTED",
-        "PRIVATE"
-      ],
-      "type": "string"
-    },
-    "PluginSharePrincipalType": {
-      "enum": [
-        "user",
-        "group",
-        "workspace"
-      ],
-      "type": "string"
-    },
-    "PluginShareTarget": {
-      "properties": {
-        "principalId": {
-          "type": "string"
-        },
-        "principalType": {
-          "$ref": "#/definitions/PluginSharePrincipalType"
-        }
-      },
-      "required": [
-        "principalId",
-        "principalType"
-      ],
-      "type": "object"
    }
  },
  "properties": {
-    "discoverability": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/PluginShareDiscoverability"
-        },
-        {
-          "type": "null"
-        }
-      ]
-    },
    "pluginPath": {
      "$ref": "#/definitions/AbsolutePathBuf"
    },
@@ -56,15 +15,6 @@
        "string",
        "null"
      ]
-    },
-    "shareTargets": {
-      "items": {
-        "$ref": "#/definitions/PluginShareTarget"
-      },
-      "type": [
-        "array",
-        "null"
-      ]
    }
  },
  "required": [
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginShareUpdateTargetsParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginShareUpdateTargetsParams.json
@@ -1,45 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "PluginSharePrincipalType": {
-      "enum": [
-        "user",
-        "group",
-        "workspace"
-      ],
-      "type": "string"
-    },
-    "PluginShareTarget": {
-      "properties": {
-        "principalId": {
-          "type": "string"
-        },
-        "principalType": {
-          "$ref": "#/definitions/PluginSharePrincipalType"
-        }
-      },
-      "required": [
-        "principalId",
-        "principalType"
-      ],
-      "type": "object"
-    }
-  },
-  "properties": {
-    "remotePluginId": {
-      "type": "string"
-    },
-    "shareTargets": {
-      "items": {
-        "$ref": "#/definitions/PluginShareTarget"
-      },
-      "type": "array"
-    }
-  },
-  "required": [
-    "remotePluginId",
-    "shareTargets"
-  ],
-  "title": "PluginShareUpdateTargetsParams",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/PluginShareUpdateTargetsResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/PluginShareUpdateTargetsResponse.json
@@ -1,45 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "PluginSharePrincipal": {
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "principalId": {
-          "type": "string"
-        },
-        "principalType": {
-          "$ref": "#/definitions/PluginSharePrincipalType"
-        }
-      },
-      "required": [
-        "name",
-        "principalId",
-        "principalType"
-      ],
-      "type": "object"
-    },
-    "PluginSharePrincipalType": {
-      "enum": [
-        "user",
-        "group",
-        "workspace"
-      ],
-      "type": "string"
-    }
-  },
-  "properties": {
-    "principals": {
-      "items": {
-        "$ref": "#/definitions/PluginSharePrincipal"
-      },
-      "type": "array"
-    }
-  },
-  "required": [
-    "principals"
-  ],
-  "title": "PluginShareUpdateTargetsResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ProcessExitedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ProcessExitedNotification.json
@@ -1,41 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Final process exit notification for `process/spawn`.",
-  "properties": {
-    "exitCode": {
-      "description": "Process exit code.",
-      "format": "int32",
-      "type": "integer"
-    },
-    "processHandle": {
-      "description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
-      "type": "string"
-    },
-    "stderr": {
-      "description": "Buffered stderr capture.\n\nEmpty when stderr was streamed via `process/outputDelta`.",
-      "type": "string"
-    },
-    "stderrCapReached": {
-      "description": "Whether stderr reached `outputBytesCap`.\n\nIn streaming mode, stderr is empty and cap state is also reported on the final stderr `process/outputDelta` notification.",
-      "type": "boolean"
-    },
-    "stdout": {
-      "description": "Buffered stdout capture.\n\nEmpty when stdout was streamed via `process/outputDelta`.",
-      "type": "string"
-    },
-    "stdoutCapReached": {
-      "description": "Whether stdout reached `outputBytesCap`.\n\nIn streaming mode, stdout is empty and cap state is also reported on the final stdout `process/outputDelta` notification.",
-      "type": "boolean"
-    }
-  },
-  "required": [
-    "exitCode",
-    "processHandle",
-    "stderr",
-    "stderrCapReached",
-    "stdout",
-    "stdoutCapReached"
-  ],
-  "title": "ProcessExitedNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/ProcessOutputDeltaNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ProcessOutputDeltaNotification.json
@@ -1,55 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "ProcessOutputStream": {
-      "description": "Stream label for `process/outputDelta` notifications.",
-      "oneOf": [
-        {
-          "description": "stdout stream. PTY mode multiplexes terminal output here.",
-          "enum": [
-            "stdout"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "stderr stream.",
-          "enum": [
-            "stderr"
-          ],
-          "type": "string"
-        }
-      ]
-    }
-  },
-  "description": "Base64-encoded output chunk emitted for a streaming `process/spawn` request.",
-  "properties": {
-    "capReached": {
-      "description": "True on the final streamed chunk for this stream when output was truncated by `outputBytesCap`.",
-      "type": "boolean"
-    },
-    "deltaBase64": {
-      "description": "Base64-encoded output bytes.",
-      "type": "string"
-    },
-    "processHandle": {
-      "description": "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
-      "type": "string"
-    },
-    "stream": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/ProcessOutputStream"
-        }
-      ],
-      "description": "Output stream this chunk belongs to."
-    }
-  },
-  "required": [
-    "capReached",
-    "deltaBase64",
-    "processHandle",
-    "stream"
-  ],
-  "title": "ProcessOutputDeltaNotification",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json
@@ -732,28 +732,6 @@
          "title": "CompactionResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "encrypted_content": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "context_compaction"
-              ],
-              "title": "ContextCompactionResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "ContextCompactionResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "type": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
@@ -1324,21 +1324,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -1386,31 +1377,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json
@@ -137,14 +137,6 @@
        "flex"
      ],
      "type": "string"
-    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
    }
  },
  "description": "There are two ways to fork a thread: 1. By thread_id: load the thread from disk by thread_id and fork it into a new thread. 2. By path: load the thread from disk by path and fork it into a new thread.\n\nIf using path, the thread_id param will be ignored.\n\nPrefer using thread_id whenever possible.",
@@ -240,17 +232,6 @@
    },
    "threadId": {
      "type": "string"
-    },
-    "threadSource": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ThreadSource"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "description": "Optional client-supplied analytics source classification for this forked thread."
    }
  },
  "required": [
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
@@ -1419,17 +1419,6 @@
          ],
          "description": "Current runtime status for the thread."
        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional analytics source classification for this thread."
-        },
        "turns": {
          "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
          "items": {
@@ -2128,14 +2117,6 @@
        }
      ]
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadStatus": {
      "oneOf": [
        {
@@ -2244,21 +2225,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -2306,31 +2278,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
@@ -2619,11 +2566,6 @@
        }
      ]
    },
-    "sessionId": {
-      "default": "",
-      "description": "Session id shared by threads that belong to the same session tree.",
-      "type": "string"
-    },
    "thread": {
      "$ref": "#/definitions/Thread"
    }
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
@@ -869,17 +869,6 @@
          ],
          "description": "Current runtime status for the thread."
        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional analytics source classification for this thread."
-        },
        "turns": {
          "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
          "items": {
@@ -1578,14 +1567,6 @@
        }
      ]
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadStatus": {
      "oneOf": [
        {
@@ -1694,21 +1675,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -1756,31 +1728,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
@@ -869,17 +869,6 @@
          ],
          "description": "Current runtime status for the thread."
        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional analytics source classification for this thread."
-        },
        "turns": {
          "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
          "items": {
@@ -1578,14 +1567,6 @@
        }
      ]
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadStatus": {
      "oneOf": [
        {
@@ -1694,21 +1675,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -1756,31 +1728,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
@@ -869,17 +869,6 @@
          ],
          "description": "Current runtime status for the thread."
        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional analytics source classification for this thread."
-        },
        "turns": {
          "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
          "items": {
@@ -1578,14 +1567,6 @@
        }
      ]
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadStatus": {
      "oneOf": [
        {
@@ -1694,21 +1675,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -1756,31 +1728,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json
@@ -862,28 +862,6 @@
          "title": "CompactionResponseItem",
          "type": "object"
        },
-        {
-          "properties": {
-            "encrypted_content": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "context_compaction"
-              ],
-              "title": "ContextCompactionResponseItemType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "ContextCompactionResponseItem",
-          "type": "object"
-        },
        {
          "properties": {
            "type": {
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
@@ -1419,17 +1419,6 @@
          ],
          "description": "Current runtime status for the thread."
        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional analytics source classification for this thread."
-        },
        "turns": {
          "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
          "items": {
@@ -2128,14 +2117,6 @@
        }
      ]
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadStatus": {
      "oneOf": [
        {
@@ -2244,21 +2225,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -2306,31 +2278,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
@@ -2619,11 +2566,6 @@
        }
      ]
    },
-    "sessionId": {
-      "default": "",
-      "description": "Session id shared by threads that belong to the same session tree.",
-      "type": "string"
-    },
    "thread": {
      "$ref": "#/definitions/Thread"
    }
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json
@@ -869,17 +869,6 @@
          ],
          "description": "Current runtime status for the thread."
        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional analytics source classification for this thread."
-        },
        "turns": {
          "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
          "items": {
@@ -1578,14 +1567,6 @@
        }
      ]
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadStatus": {
      "oneOf": [
        {
@@ -1694,21 +1675,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -1756,31 +1728,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json
@@ -172,14 +172,6 @@
      ],
      "type": "string"
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadStartSource": {
      "enum": [
        "startup",
@@ -320,17 +312,6 @@
          "type": "null"
        }
      ]
-    },
-    "threadSource": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/ThreadSource"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "description": "Optional client-supplied analytics source classification for this thread."
    }
  },
  "title": "ThreadStartParams",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
@@ -1419,17 +1419,6 @@
          ],
          "description": "Current runtime status for the thread."
        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional analytics source classification for this thread."
-        },
        "turns": {
          "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
          "items": {
@@ -2128,14 +2117,6 @@
        }
      ]
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadStatus": {
      "oneOf": [
        {
@@ -2244,21 +2225,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -2306,31 +2278,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
@@ -2619,11 +2566,6 @@
        }
      ]
    },
-    "sessionId": {
-      "default": "",
-      "description": "Session id shared by threads that belong to the same session tree.",
-      "type": "string"
-    },
    "thread": {
      "$ref": "#/definitions/Thread"
    }
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
@@ -869,17 +869,6 @@
          ],
          "description": "Current runtime status for the thread."
        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional analytics source classification for this thread."
-        },
        "turns": {
          "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
          "items": {
@@ -1578,14 +1567,6 @@
        }
      ]
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadStatus": {
      "oneOf": [
        {
@@ -1694,21 +1675,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -1756,31 +1728,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
@@ -869,17 +869,6 @@
          ],
          "description": "Current runtime status for the thread."
        },
-        "threadSource": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ThreadSource"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional analytics source classification for this thread."
-        },
        "turns": {
          "description": "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
          "items": {
@@ -1578,14 +1567,6 @@
        }
      ]
    },
-    "ThreadSource": {
-      "enum": [
-        "user",
-        "subagent",
-        "memory_consolidation"
-      ],
-      "type": "string"
-    },
    "ThreadStatus": {
      "oneOf": [
        {
@@ -1694,21 +1675,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -1756,31 +1728,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
@@ -1324,21 +1324,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -1386,31 +1377,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
@@ -1324,21 +1324,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -1386,31 +1377,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
@@ -1324,21 +1324,12 @@
          "type": "string"
        },
        "items": {
-          "description": "Thread items currently included in this turn payload.",
+          "description": "Only populated on a `thread/resume` or `thread/fork` response. For all other responses and notifications returning a Turn, the items field will be an empty list.",
          "items": {
            "$ref": "#/definitions/ThreadItem"
          },
          "type": "array"
        },
-        "itemsView": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/TurnItemsView"
-            }
-          ],
-          "default": "full",
-          "description": "Describes how much of `items` has been loaded for this turn."
-        },
        "startedAt": {
          "description": "Unix timestamp (in seconds) when the turn started.",
          "format": "int64",
@@ -1386,31 +1377,6 @@
      ],
      "type": "object"
    },
-    "TurnItemsView": {
-      "oneOf": [
-        {
-          "description": "`items` was not loaded for this turn. The field is intentionally empty.",
-          "enum": [
-            "notLoaded"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains only a display summary for this turn.",
-          "enum": [
-            "summary"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "`items` contains every ThreadItem available from persisted app-server history for this turn.",
-          "enum": [
-            "full"
-          ],
-          "type": "string"
-        }
-      ]
-    },
    "TurnStatus": {
      "enum": [
        "completed",
--- a/codex-rs/app-server-protocol/schema/json/v2/WindowsSandboxReadinessResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/WindowsSandboxReadinessResponse.json
@@ -1,23 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "WindowsSandboxReadiness": {
-      "enum": [
-        "ready",
-        "notConfigured",
-        "updateRequired"
-      ],
-      "type": "string"
-    }
-  },
-  "properties": {
-    "status": {
-      "$ref": "#/definitions/WindowsSandboxReadiness"
-    }
-  },
-  "required": [
-    "status"
-  ],
-  "title": "WindowsSandboxReadinessResponse",
-  "type": "object"
-}
--- a/codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts
--- a/codex-rs/app-server-protocol/schema/typescript/ResponseItem.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/ResponseItem.ts
@@ -14,4 +14,4 @@ export type ResponseItem = { "type": "message", role: string, content: Array<Con
 /**
 * Set when using the Responses API.
 */
-call_id: string | null, status: LocalShellStatus, action: LocalShellAction, } | { "type": "function_call", name: string, namespace?: string, arguments: string, call_id: string, } | { "type": "tool_search_call", call_id: string | null, status?: string, execution: string, arguments: unknown, } | { "type": "function_call_output", call_id: string, output: FunctionCallOutputBody, } | { "type": "custom_tool_call", status?: string, call_id: string, name: string, input: string, } | { "type": "custom_tool_call_output", call_id: string, name?: string, output: FunctionCallOutputBody, } | { "type": "tool_search_output", call_id: string | null, status: string, execution: string, tools: unknown[], } | { "type": "web_search_call", status?: string, action?: WebSearchAction, } | { "type": "image_generation_call", id: string, status: string, revised_prompt?: string, result: string, } | { "type": "compaction", encrypted_content: string, } | { "type": "context_compaction", encrypted_content?: string, } | { "type": "other" };
+call_id: string | null, status: LocalShellStatus, action: LocalShellAction, } | { "type": "function_call", name: string, namespace?: string, arguments: string, call_id: string, } | { "type": "tool_search_call", call_id: string | null, status?: string, execution: string, arguments: unknown, } | { "type": "function_call_output", call_id: string, output: FunctionCallOutputBody, } | { "type": "custom_tool_call", status?: string, call_id: string, name: string, input: string, } | { "type": "custom_tool_call_output", call_id: string, name?: string, output: FunctionCallOutputBody, } | { "type": "tool_search_output", call_id: string | null, status: string, execution: string, tools: unknown[], } | { "type": "web_search_call", status?: string, action?: WebSearchAction, } | { "type": "image_generation_call", id: string, status: string, revised_prompt?: string, result: string, } | { "type": "compaction", encrypted_content: string, } | { "type": "other" };
--- a/codex-rs/app-server-protocol/schema/typescript/ServerNotification.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/ServerNotification.ts
--- a/codex-rs/app-server-protocol/schema/typescript/v2/HookMetadata.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/HookMetadata.ts
@@ -5,6 +5,5 @@ import type { AbsolutePathBuf } from "../AbsolutePathBuf";
 import type { HookEventName } from "./HookEventName";
 import type { HookHandlerType } from "./HookHandlerType";
 import type { HookSource } from "./HookSource";
-import type { HookTrustStatus } from "./HookTrustStatus";

-export type HookMetadata = { key: string, eventName: HookEventName, handlerType: HookHandlerType, matcher: string | null, command: string | null, timeoutSec: bigint, statusMessage: string | null, sourcePath: AbsolutePathBuf, source: HookSource, pluginId: string | null, displayOrder: bigint, enabled: boolean, isManaged: boolean, currentHash: string, trustStatus: HookTrustStatus, };
+export type HookMetadata = { key: string, eventName: HookEventName, handlerType: HookHandlerType, matcher: string | null, command: string | null, timeoutSec: bigint, statusMessage: string | null, sourcePath: AbsolutePathBuf, source: HookSource, pluginId: string | null, displayOrder: bigint, enabled: boolean, isManaged: boolean, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/HookTrustStatus.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/HookTrustStatus.ts
@@ -1,5 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type HookTrustStatus = "managed" | "untrusted" | "trusted" | "modified";
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ItemCompletedNotification.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ItemCompletedNotification.ts
@@ -5,6 +5,6 @@ import type { ThreadItem } from "./ThreadItem";

 export type ItemCompletedNotification = { item: ThreadItem, threadId: string, turnId: string,
 /**
- * Unix timestamp (in milliseconds) when this item lifecycle completed.
+ * Unix timestamp (in milliseconds) when this item lifecycle completed, if known.
 */
-completedAtMs: number, };
+completedAtMs: number | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ItemStartedNotification.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ItemStartedNotification.ts
@@ -5,6 +5,6 @@ import type { ThreadItem } from "./ThreadItem";

 export type ItemStartedNotification = { item: ThreadItem, threadId: string, turnId: string,
 /**
- * Unix timestamp (in milliseconds) when this item lifecycle started.
+ * Unix timestamp (in milliseconds) when this item lifecycle started, if known.
 */
-startedAtMs: number, };
+startedAtMs: number | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/Model.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/Model.ts
@@ -4,12 +4,7 @@
 import type { InputModality } from "../InputModality";
 import type { ReasoningEffort } from "../ReasoningEffort";
 import type { ModelAvailabilityNux } from "./ModelAvailabilityNux";
-import type { ModelServiceTier } from "./ModelServiceTier";
 import type { ModelUpgradeInfo } from "./ModelUpgradeInfo";
 import type { ReasoningEffortOption } from "./ReasoningEffortOption";

-export type Model = { id: string, model: string, upgrade: string | null, upgradeInfo: ModelUpgradeInfo | null, availabilityNux: ModelAvailabilityNux | null, displayName: string, description: string, hidden: boolean, supportedReasoningEfforts: Array<ReasoningEffortOption>, defaultReasoningEffort: ReasoningEffort, inputModalities: Array<InputModality>, supportsPersonality: boolean,
-/**
- * Deprecated: use `serviceTiers` instead.
- */
-additionalSpeedTiers: Array<string>, serviceTiers: Array<ModelServiceTier>, isDefault: boolean, };
+export type Model = { id: string, model: string, upgrade: string | null, upgradeInfo: ModelUpgradeInfo | null, availabilityNux: ModelAvailabilityNux | null, displayName: string, description: string, hidden: boolean, supportedReasoningEfforts: Array<ReasoningEffortOption>, defaultReasoningEffort: ReasoningEffort, inputModalities: Array<InputModality>, supportsPersonality: boolean, additionalSpeedTiers: Array<string>, isDefault: boolean, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ModelServiceTier.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ModelServiceTier.ts
@@ -1,5 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ModelServiceTier = { id: string, name: string, description: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/PluginShareDiscoverability.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/PluginShareDiscoverability.ts
@@ -1,5 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type PluginShareDiscoverability = "LISTED" | "UNLISTED" | "PRIVATE";
--- a/codex-rs/app-server-protocol/schema/typescript/v2/PluginSharePrincipal.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/PluginSharePrincipal.ts
@@ -1,6 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PluginSharePrincipalType } from "./PluginSharePrincipalType";
-
-export type PluginSharePrincipal = { principalType: PluginSharePrincipalType, principalId: string, name: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/PluginSharePrincipalType.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/PluginSharePrincipalType.ts
@@ -1,5 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type PluginSharePrincipalType = "user" | "group" | "workspace";
--- a/codex-rs/app-server-protocol/schema/typescript/v2/PluginShareSaveParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/PluginShareSaveParams.ts
@@ -2,7 +2,5 @@

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

-export type PluginShareSaveParams = { pluginPath: AbsolutePathBuf, remotePluginId?: string | null, discoverability?: PluginShareDiscoverability | null, shareTargets?: Array<PluginShareTarget> | null, };
+export type PluginShareSaveParams = { pluginPath: AbsolutePathBuf, remotePluginId?: string | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/PluginShareTarget.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/PluginShareTarget.ts
@@ -1,6 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PluginSharePrincipalType } from "./PluginSharePrincipalType";
-
-export type PluginShareTarget = { principalType: PluginSharePrincipalType, principalId: string, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/PluginShareUpdateTargetsParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/PluginShareUpdateTargetsParams.ts
@@ -1,6 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PluginShareTarget } from "./PluginShareTarget";
-
-export type PluginShareUpdateTargetsParams = { remotePluginId: string, shareTargets: Array<PluginShareTarget>, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/PluginShareUpdateTargetsResponse.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/PluginShareUpdateTargetsResponse.ts
@@ -1,6 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PluginSharePrincipal } from "./PluginSharePrincipal";
-
-export type PluginShareUpdateTargetsResponse = { principals: Array<PluginSharePrincipal>, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/PluginSummary.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/PluginSummary.ts
@@ -11,4 +11,4 @@ export type PluginSummary = { id: string, name: string, source: PluginSource, in
 /**
 * Availability state for installing and using the plugin.
 */
-availability: PluginAvailability, interface: PluginInterface | null, keywords: Array<string>, };
+availability: PluginAvailability, interface: PluginInterface | null, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ProcessExitedNotification.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ProcessExitedNotification.ts
@@ -1,42 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-/**
- * Final process exit notification for `process/spawn`.
- */
-export type ProcessExitedNotification = {
-/**
- * Client-supplied, connection-scoped `processHandle` from `process/spawn`.
- */
-processHandle: string,
-/**
- * Process exit code.
- */
-exitCode: number,
-/**
- * Buffered stdout capture.
- *
- * Empty when stdout was streamed via `process/outputDelta`.
- */
-stdout: string,
-/**
- * Whether stdout reached `outputBytesCap`.
- *
- * In streaming mode, stdout is empty and cap state is also reported on the
- * final stdout `process/outputDelta` notification.
- */
-stdoutCapReached: boolean,
-/**
- * Buffered stderr capture.
- *
- * Empty when stderr was streamed via `process/outputDelta`.
- */
-stderr: string,
-/**
- * Whether stderr reached `outputBytesCap`.
- *
- * In streaming mode, stderr is empty and cap state is also reported on the
- * final stderr `process/outputDelta` notification.
- */
-stderrCapReached: boolean, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ProcessOutputDeltaNotification.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ProcessOutputDeltaNotification.ts
@@ -1,26 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ProcessOutputStream } from "./ProcessOutputStream";
-
-/**
- * Base64-encoded output chunk emitted for a streaming `process/spawn` request.
- */
-export type ProcessOutputDeltaNotification = {
-/**
- * Client-supplied, connection-scoped `processHandle` from `process/spawn`.
- */
-processHandle: string,
-/**
- * Output stream this chunk belongs to.
- */
-stream: ProcessOutputStream,
-/**
- * Base64-encoded output bytes.
- */
-deltaBase64: string,
-/**
- * True on the final streamed chunk for this stream when output was
- * truncated by `outputBytesCap`.
- */
-capReached: boolean, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ProcessOutputStream.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ProcessOutputStream.ts
@@ -1,8 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-/**
- * Stream label for `process/outputDelta` notifications.
- */
-export type ProcessOutputStream = "stdout" | "stderr";
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ProcessTerminalSize.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ProcessTerminalSize.ts
@@ -1,16 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-/**
- * PTY size in character cells for `process/spawn` PTY sessions.
- */
-export type ProcessTerminalSize = {
-/**
- * Terminal height in character cells.
- */
-rows: number,
-/**
- * Terminal width in character cells.
- */
-cols: number, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/Thread.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/Thread.ts
@@ -4,7 +4,6 @@
 import type { AbsolutePathBuf } from "../AbsolutePathBuf";
 import type { GitInfo } from "./GitInfo";
 import type { SessionSource } from "./SessionSource";
-import type { ThreadSource } from "./ThreadSource";
 import type { ThreadStatus } from "./ThreadStatus";
 import type { Turn } from "./Turn";

@@ -53,10 +52,6 @@ cliVersion: string,
 * Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).
 */
 source: SessionSource,
-/**
- * Optional analytics source classification for this thread.
- */
-threadSource: ThreadSource | null,
 /**
 * Optional random unique nickname assigned to an AgentControl-spawned sub-agent.
 */
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadForkParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadForkParams.ts
@@ -6,7 +6,6 @@ import type { JsonValue } from "../serde_json/JsonValue";
 import type { ApprovalsReviewer } from "./ApprovalsReviewer";
 import type { AskForApproval } from "./AskForApproval";
 import type { SandboxMode } from "./SandboxMode";
-import type { ThreadSource } from "./ThreadSource";

 /**
 * There are two ways to fork a thread:
@@ -24,7 +23,4 @@ model?: string | null, modelProvider?: string | null, serviceTier?: ServiceTier
 * Override where approval requests are routed for review on this thread
 * and subsequent turns.
 */
-approvalsReviewer?: ApprovalsReviewer | null, sandbox?: SandboxMode | null, config?: { [key in string]?: JsonValue } | null, baseInstructions?: string | null, developerInstructions?: string | null, ephemeral?: boolean, /**
- * Optional client-supplied analytics source classification for this forked thread.
- */
-threadSource?: ThreadSource | null};
+approvalsReviewer?: ApprovalsReviewer | null, sandbox?: SandboxMode | null, config?: { [key in string]?: JsonValue } | null, baseInstructions?: string | null, developerInstructions?: string | null, ephemeral?: boolean};
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadForkResponse.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadForkResponse.ts
@@ -9,10 +9,7 @@ import type { AskForApproval } from "./AskForApproval";
 import type { SandboxPolicy } from "./SandboxPolicy";
 import type { Thread } from "./Thread";

-export type ThreadForkResponse = {/**
- * Session id shared by threads that belong to the same session tree.
- */
-sessionId: string, thread: Thread, model: string, modelProvider: string, serviceTier: ServiceTier | null, cwd: AbsolutePathBuf, /**
+export type ThreadForkResponse = {thread: Thread, model: string, modelProvider: string, serviceTier: ServiceTier | null, cwd: AbsolutePathBuf, /**
 * Instruction source files currently loaded for this thread.
 */
 instructionSources: Array<AbsolutePathBuf>, approvalPolicy: AskForApproval, /**
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadResumeResponse.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadResumeResponse.ts
@@ -9,10 +9,7 @@ import type { AskForApproval } from "./AskForApproval";
 import type { SandboxPolicy } from "./SandboxPolicy";
 import type { Thread } from "./Thread";

-export type ThreadResumeResponse = {/**
- * Session id shared by threads that belong to the same session tree.
- */
-sessionId: string, thread: Thread, model: string, modelProvider: string, serviceTier: ServiceTier | null, cwd: AbsolutePathBuf, /**
+export type ThreadResumeResponse = {thread: Thread, model: string, modelProvider: string, serviceTier: ServiceTier | null, cwd: AbsolutePathBuf, /**
 * Instruction source files currently loaded for this thread.
 */
 instructionSources: Array<AbsolutePathBuf>, approvalPolicy: AskForApproval, /**
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadSource.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadSource.ts
@@ -1,5 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ThreadSource = "user" | "subagent" | "memory_consolidation";
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadStartParams.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadStartParams.ts
@@ -7,14 +7,10 @@ import type { JsonValue } from "../serde_json/JsonValue";
 import type { ApprovalsReviewer } from "./ApprovalsReviewer";
 import type { AskForApproval } from "./AskForApproval";
 import type { SandboxMode } from "./SandboxMode";
-import type { ThreadSource } from "./ThreadSource";
 import type { ThreadStartSource } from "./ThreadStartSource";

 export type ThreadStartParams = {model?: string | null, modelProvider?: string | null, serviceTier?: ServiceTier | null | null, cwd?: string | null, approvalPolicy?: AskForApproval | null, /**
 * Override where approval requests are routed for review on this thread
 * and subsequent turns.
 */
-approvalsReviewer?: ApprovalsReviewer | null, sandbox?: SandboxMode | null, config?: { [key in string]?: JsonValue } | null, serviceName?: string | null, baseInstructions?: string | null, developerInstructions?: string | null, personality?: Personality | null, ephemeral?: boolean | null, sessionStartSource?: ThreadStartSource | null, /**
- * Optional client-supplied analytics source classification for this thread.
- */
-threadSource?: ThreadSource | null};
+approvalsReviewer?: ApprovalsReviewer | null, sandbox?: SandboxMode | null, config?: { [key in string]?: JsonValue } | null, serviceName?: string | null, baseInstructions?: string | null, developerInstructions?: string | null, personality?: Personality | null, ephemeral?: boolean | null, sessionStartSource?: ThreadStartSource | null};
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadStartResponse.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadStartResponse.ts
@@ -9,10 +9,7 @@ import type { AskForApproval } from "./AskForApproval";
 import type { SandboxPolicy } from "./SandboxPolicy";
 import type { Thread } from "./Thread";

-export type ThreadStartResponse = {/**
- * Session id shared by threads that belong to the same session tree.
- */
-sessionId: string, thread: Thread, model: string, modelProvider: string, serviceTier: ServiceTier | null, cwd: AbsolutePathBuf, /**
+export type ThreadStartResponse = {thread: Thread, model: string, modelProvider: string, serviceTier: ServiceTier | null, cwd: AbsolutePathBuf, /**
 * Instruction source files currently loaded for this thread.
 */
 instructionSources: Array<AbsolutePathBuf>, approvalPolicy: AskForApproval, /**
--- a/codex-rs/app-server-protocol/schema/typescript/v2/Turn.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/Turn.ts
@@ -3,18 +3,15 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ThreadItem } from "./ThreadItem";
 import type { TurnError } from "./TurnError";
-import type { TurnItemsView } from "./TurnItemsView";
 import type { TurnStatus } from "./TurnStatus";

 export type Turn = { id: string,
 /**
- * Thread items currently included in this turn payload.
+ * Only populated on a `thread/resume` or `thread/fork` response.
+ * For all other responses and notifications returning a Turn,
+ * the items field will be an empty list.
 */
-items: Array<ThreadItem>,
-/**
- * Describes how much of `items` has been loaded for this turn.
- */
-itemsView: TurnItemsView, status: TurnStatus,
+items: Array<ThreadItem>, status: TurnStatus,
 /**
 * Only populated when the Turn's status is failed.
 */
--- a/codex-rs/app-server-protocol/schema/typescript/v2/TurnItemsView.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/TurnItemsView.ts
@@ -1,5 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type TurnItemsView = "notLoaded" | "summary" | "full";
--- a/codex-rs/app-server-protocol/schema/typescript/v2/WindowsSandboxReadiness.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/WindowsSandboxReadiness.ts
@@ -1,5 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type WindowsSandboxReadiness = "ready" | "notConfigured" | "updateRequired";
--- a/codex-rs/app-server-protocol/schema/typescript/v2/WindowsSandboxReadinessResponse.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/WindowsSandboxReadinessResponse.ts
@@ -1,6 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { WindowsSandboxReadiness } from "./WindowsSandboxReadiness";
-
-export type WindowsSandboxReadinessResponse = { status: WindowsSandboxReadiness, };
--- a/codex-rs/app-server-protocol/schema/typescript/v2/index.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/index.ts
@@ -168,7 +168,6 @@ export type { HookRunSummary } from "./HookRunSummary";
 export type { HookScope } from "./HookScope";
 export type { HookSource } from "./HookSource";
 export type { HookStartedNotification } from "./HookStartedNotification";
-export type { HookTrustStatus } from "./HookTrustStatus";
 export type { HooksListEntry } from "./HooksListEntry";
 export type { HooksListParams } from "./HooksListParams";
 export type { HooksListResponse } from "./HooksListResponse";
@@ -246,7 +245,6 @@ export type { ModelProviderCapabilitiesReadParams } from "./ModelProviderCapabil
 export type { ModelProviderCapabilitiesReadResponse } from "./ModelProviderCapabilitiesReadResponse";
 export type { ModelRerouteReason } from "./ModelRerouteReason";
 export type { ModelReroutedNotification } from "./ModelReroutedNotification";
-export type { ModelServiceTier } from "./ModelServiceTier";
 export type { ModelUpgradeInfo } from "./ModelUpgradeInfo";
 export type { ModelVerification } from "./ModelVerification";
 export type { ModelVerificationNotification } from "./ModelVerificationNotification";
@@ -285,17 +283,11 @@ export type { PluginReadParams } from "./PluginReadParams";
 export type { PluginReadResponse } from "./PluginReadResponse";
 export type { PluginShareDeleteParams } from "./PluginShareDeleteParams";
 export type { PluginShareDeleteResponse } from "./PluginShareDeleteResponse";
-export type { PluginShareDiscoverability } from "./PluginShareDiscoverability";
 export type { PluginShareListItem } from "./PluginShareListItem";
 export type { PluginShareListParams } from "./PluginShareListParams";
 export type { PluginShareListResponse } from "./PluginShareListResponse";
-export type { PluginSharePrincipal } from "./PluginSharePrincipal";
-export type { PluginSharePrincipalType } from "./PluginSharePrincipalType";
 export type { PluginShareSaveParams } from "./PluginShareSaveParams";
 export type { PluginShareSaveResponse } from "./PluginShareSaveResponse";
-export type { PluginShareTarget } from "./PluginShareTarget";
-export type { PluginShareUpdateTargetsParams } from "./PluginShareUpdateTargetsParams";
-export type { PluginShareUpdateTargetsResponse } from "./PluginShareUpdateTargetsResponse";
 export type { PluginSkillReadParams } from "./PluginSkillReadParams";
 export type { PluginSkillReadResponse } from "./PluginSkillReadResponse";
 export type { PluginSource } from "./PluginSource";
@@ -303,10 +295,6 @@ export type { PluginSummary } from "./PluginSummary";
 export type { PluginUninstallParams } from "./PluginUninstallParams";
 export type { PluginUninstallResponse } from "./PluginUninstallResponse";
 export type { PluginsMigration } from "./PluginsMigration";
-export type { ProcessExitedNotification } from "./ProcessExitedNotification";
-export type { ProcessOutputDeltaNotification } from "./ProcessOutputDeltaNotification";
-export type { ProcessOutputStream } from "./ProcessOutputStream";
-export type { ProcessTerminalSize } from "./ProcessTerminalSize";
 export type { ProfileV2 } from "./ProfileV2";
 export type { RateLimitReachedType } from "./RateLimitReachedType";
 export type { RateLimitSnapshot } from "./RateLimitSnapshot";
@@ -402,7 +390,6 @@ export type { ThreadSetNameResponse } from "./ThreadSetNameResponse";
 export type { ThreadShellCommandParams } from "./ThreadShellCommandParams";
 export type { ThreadShellCommandResponse } from "./ThreadShellCommandResponse";
 export type { ThreadSortKey } from "./ThreadSortKey";
-export type { ThreadSource } from "./ThreadSource";
 export type { ThreadSourceKind } from "./ThreadSourceKind";
 export type { ThreadStartParams } from "./ThreadStartParams";
 export type { ThreadStartResponse } from "./ThreadStartResponse";
@@ -432,7 +419,6 @@ export type { TurnEnvironmentParams } from "./TurnEnvironmentParams";
 export type { TurnError } from "./TurnError";
 export type { TurnInterruptParams } from "./TurnInterruptParams";
 export type { TurnInterruptResponse } from "./TurnInterruptResponse";
-export type { TurnItemsView } from "./TurnItemsView";
 export type { TurnPlanStep } from "./TurnPlanStep";
 export type { TurnPlanStepStatus } from "./TurnPlanStepStatus";
 export type { TurnPlanUpdatedNotification } from "./TurnPlanUpdatedNotification";
@@ -445,8 +431,6 @@ export type { TurnSteerResponse } from "./TurnSteerResponse";
 export type { UserInput } from "./UserInput";
 export type { WarningNotification } from "./WarningNotification";
 export type { WebSearchAction } from "./WebSearchAction";
-export type { WindowsSandboxReadiness } from "./WindowsSandboxReadiness";
-export type { WindowsSandboxReadinessResponse } from "./WindowsSandboxReadinessResponse";
 export type { WindowsSandboxSetupCompletedNotification } from "./WindowsSandboxSetupCompletedNotification";
 export type { WindowsSandboxSetupMode } from "./WindowsSandboxSetupMode";
 export type { WindowsSandboxSetupStartParams } from "./WindowsSandboxSetupStartParams";
--- a/codex-rs/app-server-protocol/src/protocol/common.rs
+++ b/codex-rs/app-server-protocol/src/protocol/common.rs
@@ -77,11 +77,9 @@ macro_rules! experimental_type_entry {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum ClientRequestSerializationScope {
    Global(&'static str),
-    GlobalSharedRead(&'static str),
    Thread { thread_id: String },
    ThreadPath { path: PathBuf },
    CommandExecProcess { process_id: String },
-    Process { process_handle: String },
    FuzzyFileSearchSession { session_id: String },
    FsWatch { watch_id: String },
    McpOauth { server_name: String },
@@ -94,9 +92,6 @@ macro_rules! serialization_scope_expr {
    ($actual_params:ident, global($key:literal)) => {
        Some(ClientRequestSerializationScope::Global($key))
    };
-    ($actual_params:ident, global_shared_read($key:literal)) => {
-        Some(ClientRequestSerializationScope::GlobalSharedRead($key))
-    };
    ($actual_params:ident, thread_id($params:ident . $field:ident)) => {
        Some(ClientRequestSerializationScope::Thread {
            thread_id: $actual_params.$field.clone(),
@@ -132,11 +127,6 @@ macro_rules! serialization_scope_expr {
            process_id: $actual_params.$field.clone(),
        })
    };
-    ($actual_params:ident, process_handle($params:ident . $field:ident)) => {
-        Some(ClientRequestSerializationScope::Process {
-            process_handle: $actual_params.$field.clone(),
-        })
-    };
    ($actual_params:ident, fuzzy_session_id($params:ident . $field:ident)) => {
        Some(ClientRequestSerializationScope::FuzzyFileSearchSession {
            session_id: $actual_params.$field.clone(),
@@ -589,7 +579,7 @@ client_request_definitions! {
    },
    SkillsList => "skills/list" {
        params: v2::SkillsListParams,
-        serialization: global_shared_read("config"),
+        serialization: global("config"),
        response: v2::SkillsListResponse,
    },
    HooksList => "hooks/list" {
@@ -614,7 +604,7 @@ client_request_definitions! {
    },
    PluginList => "plugin/list" {
        params: v2::PluginListParams,
-        serialization: global_shared_read("config"),
+        serialization: global("config"),
        response: v2::PluginListResponse,
    },
    PluginRead => "plugin/read" {
@@ -632,11 +622,6 @@ client_request_definitions! {
        serialization: global("config"),
        response: v2::PluginShareSaveResponse,
    },
-    PluginShareUpdateTargets => "plugin/share/updateTargets" {
-        params: v2::PluginShareUpdateTargetsParams,
-        serialization: global("config"),
-        response: v2::PluginShareUpdateTargetsResponse,
-    },
    PluginShareList => "plugin/share/list" {
        params: v2::PluginShareListParams,
        serialization: global("config"),
@@ -852,11 +837,6 @@ client_request_definitions! {
        serialization: global("windows-sandbox-setup"),
        response: v2::WindowsSandboxSetupStartResponse,
    },
-    WindowsSandboxReadiness => "windowsSandbox/readiness" {
-        params: #[ts(type = "undefined")] #[serde(skip_serializing_if = "Option::is_none")] Option<()>,
-        serialization: global("config"),
-        response: v2::WindowsSandboxReadinessResponse,
-    },

    LoginAccount => "account/login/start" {
        params: v2::LoginAccountParams,
@@ -920,38 +900,10 @@ client_request_definitions! {
        serialization: command_process_id(params.process_id),
        response: v2::CommandExecResizeResponse,
    },
-    #[experimental("process/spawn")]
-    /// Spawn a standalone process (argv vector) without a Codex sandbox.
-    ProcessSpawn => "process/spawn" {
-        params: v2::ProcessSpawnParams,
-        serialization: process_handle(params.process_handle),
-        response: v2::ProcessSpawnResponse,
-    },
-    #[experimental("process/writeStdin")]
-    /// Write stdin bytes to a running `process/spawn` session or close stdin.
-    ProcessWriteStdin => "process/writeStdin" {
-        params: v2::ProcessWriteStdinParams,
-        serialization: process_handle(params.process_handle),
-        response: v2::ProcessWriteStdinResponse,
-    },
-    #[experimental("process/kill")]
-    /// Terminate a running `process/spawn` session by client-supplied `processHandle`.
-    ProcessKill => "process/kill" {
-        params: v2::ProcessKillParams,
-        serialization: process_handle(params.process_handle),
-        response: v2::ProcessKillResponse,
-    },
-    #[experimental("process/resizePty")]
-    /// Resize a running PTY-backed `process/spawn` session by client-supplied `processHandle`.
-    ProcessResizePty => "process/resizePty" {
-        params: v2::ProcessResizePtyParams,
-        serialization: process_handle(params.process_handle),
-        response: v2::ProcessResizePtyResponse,
-    },

    ConfigRead => "config/read" {
        params: v2::ConfigReadParams,
-        serialization: global_shared_read("config"),
+        serialization: global("config"),
        response: v2::ConfigReadResponse,
    },
    ExternalAgentConfigDetect => "externalAgentConfig/detect" {
@@ -1449,12 +1401,6 @@ server_notification_definitions! {
    PlanDelta => "item/plan/delta" (v2::PlanDeltaNotification),
    /// Stream base64-encoded stdout/stderr chunks for a running `command/exec` session.
    CommandExecOutputDelta => "command/exec/outputDelta" (v2::CommandExecOutputDeltaNotification),
-    /// Stream base64-encoded stdout/stderr chunks for a running `process/spawn` session.
-    #[experimental("process/outputDelta")]
-    ProcessOutputDelta => "process/outputDelta" (v2::ProcessOutputDeltaNotification),
-    /// Final exit notification for a `process/spawn` session.
-    #[experimental("process/exited")]
-    ProcessExited => "process/exited" (v2::ProcessExitedNotification),
    CommandExecutionOutputDelta => "item/commandExecution/outputDelta" (v2::CommandExecutionOutputDeltaNotification),
    TerminalInteraction => "item/commandExecution/terminalInteraction" (v2::TerminalInteractionNotification),
    /// Deprecated legacy apply_patch output stream notification.
@@ -1659,28 +1605,6 @@ mod tests {
            Some(ClientRequestSerializationScope::Global("config"))
        );

-        let skills_list = ClientRequest::SkillsList {
-            request_id: request_id(),
-            params: v2::SkillsListParams {
-                cwds: Vec::new(),
-                force_reload: false,
-                per_cwd_extra_user_roots: None,
-            },
-        };
-        assert_eq!(
-            skills_list.serialization_scope(),
-            Some(ClientRequestSerializationScope::GlobalSharedRead("config"))
-        );
-
-        let plugin_list = ClientRequest::PluginList {
-            request_id: request_id(),
-            params: v2::PluginListParams { cwds: None },
-        };
-        assert_eq!(
-            plugin_list.serialization_scope(),
-            Some(ClientRequestSerializationScope::GlobalSharedRead("config"))
-        );
-
        let plugin_uninstall = ClientRequest::PluginUninstall {
            request_id: request_id(),
            params: v2::PluginUninstallParams {
@@ -1731,7 +1655,7 @@ mod tests {
        };
        assert_eq!(
            config_read.serialization_scope(),
-            Some(ClientRequestSerializationScope::GlobalSharedRead("config"))
+            Some(ClientRequestSerializationScope::Global("config"))
        );

        let account_read = ClientRequest::GetAccount {
@@ -2202,7 +2126,6 @@ mod tests {
        let response = ClientResponse::ThreadStart {
            request_id: RequestId::Integer(7),
            response: v2::ThreadStartResponse {
-                session_id: "67e55044-10b1-426f-9247-bb680e5fe0c7".to_string(),
                thread: v2::Thread {
                    id: "67e55044-10b1-426f-9247-bb680e5fe0c8".to_string(),
                    forked_from_id: None,
@@ -2216,7 +2139,6 @@ mod tests {
                    cwd: cwd.clone(),
                    cli_version: "0.0.0".to_string(),
                    source: v2::SessionSource::Exec,
-                    thread_source: None,
                    agent_nickname: None,
                    agent_role: None,
                    git_info: None,
@@ -2244,7 +2166,6 @@ mod tests {
                "method": "thread/start",
                "id": 7,
                "response": {
-                    "sessionId": "67e55044-10b1-426f-9247-bb680e5fe0c7",
                    "thread": {
                        "id": "67e55044-10b1-426f-9247-bb680e5fe0c8",
                        "forkedFromId": null,
@@ -2260,7 +2181,6 @@ mod tests {
                        "cwd": absolute_path_string("tmp"),
                        "cliVersion": "0.0.0",
                        "source": "exec",
-                        "threadSource": null,
                        "agentNickname": null,
                        "agentRole": null,
                        "gitInfo": null,
--- a/codex-rs/app-server-protocol/src/protocol/event_mapping.rs
+++ b/codex-rs/app-server-protocol/src/protocol/event_mapping.rs
@@ -12,6 +12,9 @@ use crate::protocol::v2::DynamicToolCallStatus;
 use crate::protocol::v2::FileChangePatchUpdatedNotification;
 use crate::protocol::v2::ItemCompletedNotification;
 use crate::protocol::v2::ItemStartedNotification;
+use crate::protocol::v2::McpToolCallError;
+use crate::protocol::v2::McpToolCallResult;
+use crate::protocol::v2::McpToolCallStatus;
 use crate::protocol::v2::PlanDeltaNotification;
 use crate::protocol::v2::ReasoningSummaryPartAddedNotification;
 use crate::protocol::v2::ReasoningSummaryTextDeltaNotification;
@@ -20,6 +23,7 @@ use crate::protocol::v2::TerminalInteractionNotification;
 use crate::protocol::v2::ThreadItem;
 use codex_protocol::dynamic_tools::DynamicToolCallOutputContentItem as CoreDynamicToolCallOutputContentItem;
 use codex_protocol::protocol::EventMsg;
+use serde_json::Value as JsonValue;
 use std::collections::HashMap;

 /// Build the v2 app-server notification that directly corresponds to a single core event.
@@ -69,7 +73,67 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id: response.turn_id,
                item,
-                completed_at_ms: response.completed_at_ms,
+                completed_at_ms: None,
+            })
+        }
+        EventMsg::McpToolCallBegin(begin_event) => {
+            let item = ThreadItem::McpToolCall {
+                id: begin_event.call_id,
+                server: begin_event.invocation.server,
+                tool: begin_event.invocation.tool,
+                status: McpToolCallStatus::InProgress,
+                arguments: begin_event.invocation.arguments.unwrap_or(JsonValue::Null),
+                mcp_app_resource_uri: begin_event.mcp_app_resource_uri,
+                result: None,
+                error: None,
+                duration_ms: None,
+            };
+            ServerNotification::ItemStarted(ItemStartedNotification {
+                thread_id,
+                turn_id,
+                item,
+                started_at_ms: None,
+            })
+        }
+        EventMsg::McpToolCallEnd(end_event) => {
+            let status = if end_event.is_success() {
+                McpToolCallStatus::Completed
+            } else {
+                McpToolCallStatus::Failed
+            };
+            let duration_ms = i64::try_from(end_event.duration.as_millis()).ok();
+            let (result, error) = match &end_event.result {
+                Ok(value) => (
+                    Some(Box::new(McpToolCallResult {
+                        content: value.content.clone(),
+                        structured_content: value.structured_content.clone(),
+                        meta: value.meta.clone(),
+                    })),
+                    None,
+                ),
+                Err(message) => (
+                    None,
+                    Some(McpToolCallError {
+                        message: message.clone(),
+                    }),
+                ),
+            };
+            let item = ThreadItem::McpToolCall {
+                id: end_event.call_id,
+                server: end_event.invocation.server,
+                tool: end_event.invocation.tool,
+                status,
+                arguments: end_event.invocation.arguments.unwrap_or(JsonValue::Null),
+                mcp_app_resource_uri: end_event.mcp_app_resource_uri,
+                result,
+                error,
+                duration_ms,
+            };
+            ServerNotification::ItemCompleted(ItemCompletedNotification {
+                thread_id,
+                turn_id,
+                item,
+                completed_at_ms: None,
            })
        }
        EventMsg::CollabAgentSpawnBegin(begin_event) => {
@@ -88,7 +152,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item,
-                started_at_ms: begin_event.started_at_ms,
+                started_at_ms: None,
            })
        }
        EventMsg::CollabAgentSpawnEnd(end_event) => {
@@ -127,7 +191,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item,
-                completed_at_ms: end_event.completed_at_ms,
+                completed_at_ms: None,
            })
        }
        EventMsg::CollabAgentInteractionBegin(begin_event) => {
@@ -147,7 +211,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item,
-                started_at_ms: begin_event.started_at_ms,
+                started_at_ms: None,
            })
        }
        EventMsg::CollabAgentInteractionEnd(end_event) => {
@@ -175,7 +239,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item,
-                completed_at_ms: end_event.completed_at_ms,
+                completed_at_ms: None,
            })
        }
        EventMsg::CollabWaitingBegin(begin_event) => {
@@ -199,7 +263,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item,
-                started_at_ms: begin_event.started_at_ms,
+                started_at_ms: None,
            })
        }
        EventMsg::CollabWaitingEnd(end_event) => {
@@ -235,7 +299,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item,
-                completed_at_ms: end_event.completed_at_ms,
+                completed_at_ms: None,
            })
        }
        EventMsg::CollabCloseBegin(begin_event) => {
@@ -254,7 +318,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item,
-                started_at_ms: begin_event.started_at_ms,
+                started_at_ms: None,
            })
        }
        EventMsg::CollabCloseEnd(end_event) => {
@@ -287,7 +351,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item,
-                completed_at_ms: end_event.completed_at_ms,
+                completed_at_ms: None,
            })
        }
        EventMsg::CollabResumeBegin(begin_event) => {
@@ -306,7 +370,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item,
-                started_at_ms: begin_event.started_at_ms,
+                started_at_ms: None,
            })
        }
        EventMsg::CollabResumeEnd(end_event) => {
@@ -339,7 +403,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item,
-                completed_at_ms: end_event.completed_at_ms,
+                completed_at_ms: None,
            })
        }
        EventMsg::AgentMessageContentDelta(event) => {
@@ -413,7 +477,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item: build_command_execution_begin_item(&exec_command_begin_event),
-                started_at_ms: exec_command_begin_event.started_at_ms,
+                started_at_ms: None,
            })
        }
        EventMsg::ExecCommandOutputDelta(exec_command_output_delta_event) => {
@@ -442,7 +506,7 @@ pub fn item_event_to_server_notification(
                thread_id,
                turn_id,
                item: build_command_execution_end_item(&exec_command_end_event),
-                completed_at_ms: exec_command_end_event.completed_at_ms,
+                completed_at_ms: None,
            })
        }
        _ => unreachable!("unsupported item event"),
@@ -453,11 +517,17 @@ pub fn item_event_to_server_notification(
 mod tests {
    use super::*;
    use codex_protocol::ThreadId;
+    use codex_protocol::mcp::CallToolResult;
    use codex_protocol::protocol::CollabResumeBeginEvent;
    use codex_protocol::protocol::CollabResumeEndEvent;
    use codex_protocol::protocol::ExecCommandOutputDeltaEvent;
    use codex_protocol::protocol::ExecOutputStream;
+    use codex_protocol::protocol::McpInvocation;
+    use codex_protocol::protocol::McpToolCallBeginEvent;
+    use codex_protocol::protocol::McpToolCallEndEvent;
    use pretty_assertions::assert_eq;
+    use rmcp::model::Content;
+    use std::time::Duration;

    fn assert_item_started_server_notification(
        notification: ServerNotification,
@@ -495,7 +565,6 @@ mod tests {
    fn collab_resume_begin_maps_to_item_started_resume_agent() {
        let event = CollabResumeBeginEvent {
            call_id: "call-1".to_string(),
-            started_at_ms: 123,
            sender_thread_id: ThreadId::new(),
            receiver_thread_id: ThreadId::new(),
            receiver_agent_nickname: None,
@@ -512,7 +581,7 @@ mod tests {
            ItemStartedNotification {
                thread_id: "thread-1".to_string(),
                turn_id: "turn-1".to_string(),
-                started_at_ms: event.started_at_ms,
+                started_at_ms: None,
                item: ThreadItem::CollabAgentToolCall {
                    id: event.call_id,
                    tool: CollabAgentTool::ResumeAgent,
@@ -532,7 +601,6 @@ mod tests {
    fn collab_resume_end_maps_to_item_completed_resume_agent() {
        let event = CollabResumeEndEvent {
            call_id: "call-2".to_string(),
-            completed_at_ms: 456,
            sender_thread_id: ThreadId::new(),
            receiver_thread_id: ThreadId::new(),
            receiver_agent_nickname: None,
@@ -551,7 +619,7 @@ mod tests {
            ItemCompletedNotification {
                thread_id: "thread-2".to_string(),
                turn_id: "turn-2".to_string(),
-                completed_at_ms: event.completed_at_ms,
+                completed_at_ms: None,
                item: ThreadItem::CollabAgentToolCall {
                    id: event.call_id,
                    tool: CollabAgentTool::ResumeAgent,
@@ -572,6 +640,183 @@ mod tests {
        );
    }

+    #[test]
+    fn mcp_tool_call_begin_maps_to_item_started_notification_with_args() {
+        let begin_event = McpToolCallBeginEvent {
+            call_id: "call_123".to_string(),
+            invocation: McpInvocation {
+                server: "codex".to_string(),
+                tool: "list_mcp_resources".to_string(),
+                arguments: Some(serde_json::json!({"server": ""})),
+            },
+            mcp_app_resource_uri: Some("ui://widget/list-resources.html".to_string()),
+        };
+
+        let notification = item_event_to_server_notification(
+            EventMsg::McpToolCallBegin(begin_event.clone()),
+            "thread-1",
+            "turn_1",
+        );
+        assert_item_started_server_notification(
+            notification,
+            ItemStartedNotification {
+                thread_id: "thread-1".to_string(),
+                turn_id: "turn_1".to_string(),
+                started_at_ms: None,
+                item: ThreadItem::McpToolCall {
+                    id: begin_event.call_id,
+                    server: begin_event.invocation.server,
+                    tool: begin_event.invocation.tool,
+                    status: McpToolCallStatus::InProgress,
+                    arguments: serde_json::json!({"server": ""}),
+                    mcp_app_resource_uri: Some("ui://widget/list-resources.html".to_string()),
+                    result: None,
+                    error: None,
+                    duration_ms: None,
+                },
+            },
+        );
+    }
+
+    #[test]
+    fn mcp_tool_call_begin_maps_to_item_started_notification_without_args() {
+        let begin_event = McpToolCallBeginEvent {
+            call_id: "call_456".to_string(),
+            invocation: McpInvocation {
+                server: "codex".to_string(),
+                tool: "list_mcp_resources".to_string(),
+                arguments: None,
+            },
+            mcp_app_resource_uri: None,
+        };
+
+        let notification = item_event_to_server_notification(
+            EventMsg::McpToolCallBegin(begin_event.clone()),
+            "thread-2",
+            "turn_2",
+        );
+        assert_item_started_server_notification(
+            notification,
+            ItemStartedNotification {
+                thread_id: "thread-2".to_string(),
+                turn_id: "turn_2".to_string(),
+                started_at_ms: None,
+                item: ThreadItem::McpToolCall {
+                    id: begin_event.call_id,
+                    server: begin_event.invocation.server,
+                    tool: begin_event.invocation.tool,
+                    status: McpToolCallStatus::InProgress,
+                    arguments: JsonValue::Null,
+                    mcp_app_resource_uri: None,
+                    result: None,
+                    error: None,
+                    duration_ms: None,
+                },
+            },
+        );
+    }
+
+    #[test]
+    fn mcp_tool_call_end_maps_to_item_completed_notification_on_success() {
+        let content = vec![
+            serde_json::to_value(Content::text("{\"resources\":[]}"))
+                .expect("content should serialize"),
+        ];
+        let result = CallToolResult {
+            content: content.clone(),
+            is_error: Some(false),
+            structured_content: None,
+            meta: Some(serde_json::json!({
+                "ui/resourceUri": "ui://widget/list-resources.html"
+            })),
+        };
+
+        let end_event = McpToolCallEndEvent {
+            call_id: "call_789".to_string(),
+            invocation: McpInvocation {
+                server: "codex".to_string(),
+                tool: "list_mcp_resources".to_string(),
+                arguments: Some(serde_json::json!({"server": ""})),
+            },
+            mcp_app_resource_uri: Some("ui://widget/list-resources.html".to_string()),
+            duration: Duration::from_nanos(92708),
+            result: Ok(result),
+        };
+
+        let notification = item_event_to_server_notification(
+            EventMsg::McpToolCallEnd(end_event.clone()),
+            "thread-3",
+            "turn_3",
+        );
+        assert_item_completed_server_notification(
+            notification,
+            ItemCompletedNotification {
+                thread_id: "thread-3".to_string(),
+                turn_id: "turn_3".to_string(),
+                completed_at_ms: None,
+                item: ThreadItem::McpToolCall {
+                    id: end_event.call_id,
+                    server: end_event.invocation.server,
+                    tool: end_event.invocation.tool,
+                    status: McpToolCallStatus::Completed,
+                    arguments: serde_json::json!({"server": ""}),
+                    mcp_app_resource_uri: Some("ui://widget/list-resources.html".to_string()),
+                    result: Some(Box::new(McpToolCallResult {
+                        content,
+                        structured_content: None,
+                        meta: Some(serde_json::json!({
+                            "ui/resourceUri": "ui://widget/list-resources.html"
+                        })),
+                    })),
+                    error: None,
+                    duration_ms: Some(0),
+                },
+            },
+        );
+    }
+
+    #[test]
+    fn mcp_tool_call_end_maps_to_item_completed_notification_on_error() {
+        let end_event = McpToolCallEndEvent {
+            call_id: "call_err".to_string(),
+            invocation: McpInvocation {
+                server: "codex".to_string(),
+                tool: "list_mcp_resources".to_string(),
+                arguments: None,
+            },
+            mcp_app_resource_uri: None,
+            duration: Duration::from_millis(1),
+            result: Err("boom".to_string()),
+        };
+
+        let notification = item_event_to_server_notification(
+            EventMsg::McpToolCallEnd(end_event.clone()),
+            "thread-4",
+            "turn_4",
+        );
+        assert_item_completed_server_notification(
+            notification,
+            ItemCompletedNotification {
+                thread_id: "thread-4".to_string(),
+                turn_id: "turn_4".to_string(),
+                completed_at_ms: None,
+                item: ThreadItem::McpToolCall {
+                    id: end_event.call_id,
+                    server: end_event.invocation.server,
+                    tool: end_event.invocation.tool,
+                    status: McpToolCallStatus::Failed,
+                    arguments: JsonValue::Null,
+                    mcp_app_resource_uri: None,
+                    result: None,
+                    error: Some(McpToolCallError {
+                        message: "boom".to_string(),
+                    }),
+                    duration_ms: Some(1),
+                },
+            },
+        );
+    }
+
    #[test]
    fn exec_command_output_delta_maps_to_command_execution_output_delta() {
        let notification = item_event_to_server_notification(
--- a/codex-rs/app-server-protocol/src/protocol/thread_history.rs
+++ b/codex-rs/app-server-protocol/src/protocol/thread_history.rs
@@ -17,7 +17,6 @@ use crate::protocol::v2::ThreadItem;
 use crate::protocol::v2::Turn;
 use crate::protocol::v2::TurnError as V2TurnError;
 use crate::protocol::v2::TurnError;
-use crate::protocol::v2::TurnItemsView;
 use crate::protocol::v2::TurnStatus;
 use crate::protocol::v2::UserInput;
 use crate::protocol::v2::WebSearchAction;
@@ -360,7 +359,6 @@ impl ThreadHistoryBuilder {
            | codex_protocol::items::TurnItem::ImageView(_)
            | codex_protocol::items::TurnItem::ImageGeneration(_)
            | codex_protocol::items::TurnItem::FileChange(_)
-            | codex_protocol::items::TurnItem::McpToolCall(_)
            | codex_protocol::items::TurnItem::ContextCompaction(_) => {}
        }
    }
@@ -384,7 +382,6 @@ impl ThreadHistoryBuilder {
            | codex_protocol::items::TurnItem::ImageView(_)
            | codex_protocol::items::TurnItem::ImageGeneration(_)
            | codex_protocol::items::TurnItem::FileChange(_)
-            | codex_protocol::items::TurnItem::McpToolCall(_)
            | codex_protocol::items::TurnItem::ContextCompaction(_) => {}
        }
    }
@@ -1167,7 +1164,6 @@ impl From<PendingTurn> for Turn {
        Self {
            id: value.id,
            items: value.items,
-            items_view: TurnItemsView::Full,
            error: value.error,
            status: value.status,
            started_at: value.started_at,
@@ -1182,7 +1178,6 @@ impl From<&PendingTurn> for Turn {
        Self {
            id: value.id.clone(),
            items: value.items.clone(),
-            items_view: TurnItemsView::Full,
            error: value.error.clone(),
            status: value.status.clone(),
            started_at: value.started_at,
@@ -1359,7 +1354,7 @@ mod tests {
                    id: "user-item-id".to_string(),
                    content: Vec::new(),
                }),
-                started_at_ms: 0,
+                started_at_ms: None,
            }),
            EventMsg::TurnComplete(TurnCompleteEvent {
                turn_id: turn_id.to_string(),
@@ -1456,7 +1451,6 @@ mod tests {
                started_at: None,
                completed_at: None,
                duration_ms: None,
-                items_view: TurnItemsView::Full,
                items: vec![
                    ThreadItem::UserMessage {
                        id: "item-1".into(),
@@ -1825,7 +1819,6 @@ mod tests {
                call_id: "exec-1".into(),
                process_id: Some("pid-1".into()),
                turn_id: "turn-1".into(),
-                completed_at_ms: 0,
                command: vec!["echo".into(), "hello world".into()],
                cwd: test_path_buf("/tmp").abs(),
                parsed_cmd: vec![ParsedCommand::Unknown {
@@ -1989,7 +1982,6 @@ mod tests {
                codex_protocol::dynamic_tools::DynamicToolCallRequest {
                    call_id: "dyn-1".into(),
                    turn_id: "turn-1".into(),
-                    started_at_ms: 0,
                    namespace: Some("codex_app".into()),
                    tool: "lookup_ticket".into(),
                    arguments: serde_json::json!({"id":"ABC-123"}),
@@ -1998,7 +1990,6 @@ mod tests {
            EventMsg::DynamicToolCallResponse(DynamicToolCallResponseEvent {
                call_id: "dyn-1".into(),
                turn_id: "turn-1".into(),
-                completed_at_ms: 0,
                namespace: Some("codex_app".into()),
                tool: "lookup_ticket".into(),
                arguments: serde_json::json!({"id":"ABC-123"}),
@@ -2054,7 +2045,6 @@ mod tests {
                call_id: "exec-declined".into(),
                process_id: Some("pid-2".into()),
                turn_id: "turn-1".into(),
-                completed_at_ms: 0,
                command: vec!["ls".into()],
                cwd: test_path_buf("/tmp").abs(),
                parsed_cmd: vec![ParsedCommand::Unknown { cmd: "ls".into() }],
@@ -2302,7 +2292,6 @@ mod tests {
                call_id: "exec-late".into(),
                process_id: Some("pid-42".into()),
                turn_id: "turn-a".into(),
-                completed_at_ms: 0,
                command: vec!["echo".into(), "done".into()],
                cwd: test_path_buf("/tmp").abs(),
                parsed_cmd: vec![ParsedCommand::Unknown {
@@ -2394,7 +2383,6 @@ mod tests {
                call_id: "exec-unknown-turn".into(),
                process_id: Some("pid-42".into()),
                turn_id: "turn-missing".into(),
-                completed_at_ms: 0,
                command: vec!["echo".into(), "done".into()],
                cwd: test_path_buf("/tmp").abs(),
                parsed_cmd: vec![ParsedCommand::Unknown {
@@ -2727,7 +2715,6 @@ mod tests {
                started_at: None,
                completed_at: None,
                duration_ms: None,
-                items_view: TurnItemsView::Full,
                items: Vec::new(),
            }]
        );
@@ -2744,7 +2731,6 @@ mod tests {
            }),
            EventMsg::CollabResumeEnd(codex_protocol::protocol::CollabResumeEndEvent {
                call_id: "resume-1".into(),
-                completed_at_ms: 0,
                sender_thread_id: ThreadId::try_from("00000000-0000-0000-0000-000000000001")
                    .expect("valid sender thread id"),
                receiver_thread_id: ThreadId::try_from("00000000-0000-0000-0000-000000000002")
@@ -2801,7 +2787,6 @@ mod tests {
            }),
            EventMsg::CollabAgentSpawnEnd(codex_protocol::protocol::CollabAgentSpawnEndEvent {
                call_id: "spawn-1".into(),
-                completed_at_ms: 0,
                sender_thread_id,
                new_thread_id: Some(spawned_thread_id),
                new_agent_nickname: Some("Scout".into()),
@@ -2863,7 +2848,6 @@ mod tests {
            EventMsg::CollabAgentInteractionBegin(
                codex_protocol::protocol::CollabAgentInteractionBeginEvent {
                    call_id: "send-1".into(),
-                    started_at_ms: 0,
                    sender_thread_id: sender,
                    receiver_thread_id: receiver,
                    prompt: "new task".into(),
@@ -2872,7 +2856,6 @@ mod tests {
            EventMsg::CollabAgentInteractionEnd(
                codex_protocol::protocol::CollabAgentInteractionEndEvent {
                    call_id: "send-1".into(),
-                    completed_at_ms: 0,
                    sender_thread_id: sender,
                    receiver_thread_id: receiver,
                    receiver_agent_nickname: None,
@@ -2987,7 +2970,6 @@ mod tests {
                started_at: None,
                completed_at: None,
                duration_ms: None,
-                items_view: TurnItemsView::Full,
                items: vec![ThreadItem::UserMessage {
                    id: "item-1".into(),
                    content: vec![UserInput::Text {
--- a/codex-rs/app-server-protocol/src/protocol/v2.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2.rs
--- a/codex-rs/app-server-protocol/src/protocol/v2/account.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/account.rs
@@ -1,383 +0,0 @@
-use crate::protocol::common::AuthMode;
-use codex_experimental_api_macros::ExperimentalApi;
-use codex_protocol::account::PlanType;
-use codex_protocol::account::ProviderAccount;
-use codex_protocol::protocol::CreditsSnapshot as CoreCreditsSnapshot;
-use codex_protocol::protocol::RateLimitReachedType as CoreRateLimitReachedType;
-use codex_protocol::protocol::RateLimitSnapshot as CoreRateLimitSnapshot;
-use codex_protocol::protocol::RateLimitWindow as CoreRateLimitWindow;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use std::collections::HashMap;
-use ts_rs::TS;
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(tag = "type", rename_all = "camelCase")]
-#[ts(tag = "type")]
-#[ts(export_to = "v2/")]
-pub enum Account {
-    #[serde(rename = "apiKey", rename_all = "camelCase")]
-    #[ts(rename = "apiKey", rename_all = "camelCase")]
-    ApiKey {},
-
-    #[serde(rename = "chatgpt", rename_all = "camelCase")]
-    #[ts(rename = "chatgpt", rename_all = "camelCase")]
-    Chatgpt { email: String, plan_type: PlanType },
-
-    #[serde(rename = "amazonBedrock", rename_all = "camelCase")]
-    #[ts(rename = "amazonBedrock", rename_all = "camelCase")]
-    AmazonBedrock {},
-}
-
-impl From<ProviderAccount> for Account {
-    fn from(account: ProviderAccount) -> Self {
-        match account {
-            ProviderAccount::ApiKey => Self::ApiKey {},
-            ProviderAccount::Chatgpt { email, plan_type } => Self::Chatgpt { email, plan_type },
-            ProviderAccount::AmazonBedrock => Self::AmazonBedrock {},
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS, ExperimentalApi)]
-#[serde(tag = "type")]
-#[ts(tag = "type")]
-#[ts(export_to = "v2/")]
-pub enum LoginAccountParams {
-    #[serde(rename = "apiKey", rename_all = "camelCase")]
-    #[ts(rename = "apiKey", rename_all = "camelCase")]
-    ApiKey {
-        #[serde(rename = "apiKey")]
-        #[ts(rename = "apiKey")]
-        api_key: String,
-    },
-    #[serde(rename = "chatgpt", rename_all = "camelCase")]
-    #[ts(rename = "chatgpt", rename_all = "camelCase")]
-    Chatgpt {
-        #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-        codex_streamlined_login: bool,
-    },
-    #[serde(rename = "chatgptDeviceCode")]
-    #[ts(rename = "chatgptDeviceCode")]
-    ChatgptDeviceCode,
-    /// [UNSTABLE] FOR OPENAI INTERNAL USE ONLY - DO NOT USE.
-    /// The access token must contain the same scopes that Codex-managed ChatGPT auth tokens have.
-    #[experimental("account/login/start.chatgptAuthTokens")]
-    #[serde(rename = "chatgptAuthTokens", rename_all = "camelCase")]
-    #[ts(rename = "chatgptAuthTokens", rename_all = "camelCase")]
-    ChatgptAuthTokens {
-        /// Access token (JWT) supplied by the client.
-        /// This token is used for backend API requests and email extraction.
-        access_token: String,
-        /// Workspace/account identifier supplied by the client.
-        chatgpt_account_id: String,
-        /// Optional plan type supplied by the client.
-        ///
-        /// When `null`, Codex attempts to derive the plan type from access-token
-        /// claims. If unavailable, the plan defaults to `unknown`.
-        #[ts(optional = nullable)]
-        chatgpt_plan_type: Option<String>,
-    },
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(tag = "type", rename_all = "camelCase")]
-#[ts(tag = "type")]
-#[ts(export_to = "v2/")]
-pub enum LoginAccountResponse {
-    #[serde(rename = "apiKey", rename_all = "camelCase")]
-    #[ts(rename = "apiKey", rename_all = "camelCase")]
-    ApiKey {},
-    #[serde(rename = "chatgpt", rename_all = "camelCase")]
-    #[ts(rename = "chatgpt", rename_all = "camelCase")]
-    Chatgpt {
-        // Use plain String for identifiers to avoid TS/JSON Schema quirks around uuid-specific types.
-        // Convert to/from UUIDs at the application layer as needed.
-        login_id: String,
-        /// URL the client should open in a browser to initiate the OAuth flow.
-        auth_url: String,
-    },
-    #[serde(rename = "chatgptDeviceCode", rename_all = "camelCase")]
-    #[ts(rename = "chatgptDeviceCode", rename_all = "camelCase")]
-    ChatgptDeviceCode {
-        // Use plain String for identifiers to avoid TS/JSON Schema quirks around uuid-specific types.
-        // Convert to/from UUIDs at the application layer as needed.
-        login_id: String,
-        /// URL the client should open in a browser to complete device code authorization.
-        verification_url: String,
-        /// One-time code the user must enter after signing in.
-        user_code: String,
-    },
-    #[serde(rename = "chatgptAuthTokens", rename_all = "camelCase")]
-    #[ts(rename = "chatgptAuthTokens", rename_all = "camelCase")]
-    ChatgptAuthTokens {},
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CancelLoginAccountParams {
-    pub login_id: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub enum CancelLoginAccountStatus {
-    Canceled,
-    NotFound,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CancelLoginAccountResponse {
-    pub status: CancelLoginAccountStatus,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct LogoutAccountResponse {}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub enum ChatgptAuthTokensRefreshReason {
-    /// Codex attempted a backend request and received `401 Unauthorized`.
-    Unauthorized,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ChatgptAuthTokensRefreshParams {
-    pub reason: ChatgptAuthTokensRefreshReason,
-    /// Workspace/account identifier that Codex was previously using.
-    ///
-    /// Clients that manage multiple accounts/workspaces can use this as a hint
-    /// to refresh the token for the correct workspace.
-    ///
-    /// This may be `null` when the prior auth state did not include a workspace
-    /// identifier (`chatgpt_account_id`).
-    #[ts(optional = nullable)]
-    pub previous_account_id: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ChatgptAuthTokensRefreshResponse {
-    pub access_token: String,
-    pub chatgpt_account_id: String,
-    pub chatgpt_plan_type: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct GetAccountRateLimitsResponse {
-    /// Backward-compatible single-bucket view; mirrors the historical payload.
-    pub rate_limits: RateLimitSnapshot,
-    /// Multi-bucket view keyed by metered `limit_id` (for example, `codex`).
-    pub rate_limits_by_limit_id: Option<HashMap<String, RateLimitSnapshot>>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct SendAddCreditsNudgeEmailParams {
-    pub credit_type: AddCreditsNudgeCreditType,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/", rename_all = "snake_case")]
-pub enum AddCreditsNudgeCreditType {
-    Credits,
-    UsageLimit,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct SendAddCreditsNudgeEmailResponse {
-    pub status: AddCreditsNudgeEmailStatus,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/", rename_all = "snake_case")]
-pub enum AddCreditsNudgeEmailStatus {
-    Sent,
-    CooldownActive,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct GetAccountParams {
-    /// When `true`, requests a proactive token refresh before returning.
-    ///
-    /// In managed auth mode this triggers the normal refresh-token flow. In
-    /// external auth mode this flag is ignored. Clients should refresh tokens
-    /// themselves and call `account/login/start` with `chatgptAuthTokens`.
-    #[serde(default)]
-    pub refresh_token: bool,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct GetAccountResponse {
-    pub account: Option<Account>,
-    pub requires_openai_auth: bool,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct AccountUpdatedNotification {
-    pub auth_mode: Option<AuthMode>,
-    pub plan_type: Option<PlanType>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct AccountRateLimitsUpdatedNotification {
-    pub rate_limits: RateLimitSnapshot,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct RateLimitSnapshot {
-    pub limit_id: Option<String>,
-    pub limit_name: Option<String>,
-    pub primary: Option<RateLimitWindow>,
-    pub secondary: Option<RateLimitWindow>,
-    pub credits: Option<CreditsSnapshot>,
-    pub plan_type: Option<PlanType>,
-    pub rate_limit_reached_type: Option<RateLimitReachedType>,
-}
-
-impl From<CoreRateLimitSnapshot> for RateLimitSnapshot {
-    fn from(value: CoreRateLimitSnapshot) -> Self {
-        Self {
-            limit_id: value.limit_id,
-            limit_name: value.limit_name,
-            primary: value.primary.map(RateLimitWindow::from),
-            secondary: value.secondary.map(RateLimitWindow::from),
-            credits: value.credits.map(CreditsSnapshot::from),
-            plan_type: value.plan_type,
-            rate_limit_reached_type: value
-                .rate_limit_reached_type
-                .map(RateLimitReachedType::from),
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/", rename_all = "snake_case")]
-pub enum RateLimitReachedType {
-    RateLimitReached,
-    WorkspaceOwnerCreditsDepleted,
-    WorkspaceMemberCreditsDepleted,
-    WorkspaceOwnerUsageLimitReached,
-    WorkspaceMemberUsageLimitReached,
-}
-
-impl From<CoreRateLimitReachedType> for RateLimitReachedType {
-    fn from(value: CoreRateLimitReachedType) -> Self {
-        match value {
-            CoreRateLimitReachedType::RateLimitReached => Self::RateLimitReached,
-            CoreRateLimitReachedType::WorkspaceOwnerCreditsDepleted => {
-                Self::WorkspaceOwnerCreditsDepleted
-            }
-            CoreRateLimitReachedType::WorkspaceMemberCreditsDepleted => {
-                Self::WorkspaceMemberCreditsDepleted
-            }
-            CoreRateLimitReachedType::WorkspaceOwnerUsageLimitReached => {
-                Self::WorkspaceOwnerUsageLimitReached
-            }
-            CoreRateLimitReachedType::WorkspaceMemberUsageLimitReached => {
-                Self::WorkspaceMemberUsageLimitReached
-            }
-        }
-    }
-}
-
-impl From<RateLimitReachedType> for CoreRateLimitReachedType {
-    fn from(value: RateLimitReachedType) -> Self {
-        match value {
-            RateLimitReachedType::RateLimitReached => Self::RateLimitReached,
-            RateLimitReachedType::WorkspaceOwnerCreditsDepleted => {
-                Self::WorkspaceOwnerCreditsDepleted
-            }
-            RateLimitReachedType::WorkspaceMemberCreditsDepleted => {
-                Self::WorkspaceMemberCreditsDepleted
-            }
-            RateLimitReachedType::WorkspaceOwnerUsageLimitReached => {
-                Self::WorkspaceOwnerUsageLimitReached
-            }
-            RateLimitReachedType::WorkspaceMemberUsageLimitReached => {
-                Self::WorkspaceMemberUsageLimitReached
-            }
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct RateLimitWindow {
-    pub used_percent: i32,
-    #[ts(type = "number | null")]
-    pub window_duration_mins: Option<i64>,
-    #[ts(type = "number | null")]
-    pub resets_at: Option<i64>,
-}
-
-impl From<CoreRateLimitWindow> for RateLimitWindow {
-    fn from(value: CoreRateLimitWindow) -> Self {
-        Self {
-            used_percent: value.used_percent.round() as i32,
-            window_duration_mins: value.window_minutes,
-            resets_at: value.resets_at,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CreditsSnapshot {
-    pub has_credits: bool,
-    pub unlimited: bool,
-    pub balance: Option<String>,
-}
-
-impl From<CoreCreditsSnapshot> for CreditsSnapshot {
-    fn from(value: CoreCreditsSnapshot) -> Self {
-        Self {
-            has_credits: value.has_credits,
-            unlimited: value.unlimited,
-            balance: value.balance,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct AccountLoginCompletedNotification {
-    // Use plain String for identifiers to avoid TS/JSON Schema quirks around uuid-specific types.
-    // Convert to/from UUIDs at the application layer as needed.
-    pub login_id: Option<String>,
-    pub success: bool,
-    pub error: Option<String>,
-}
--- a/codex-rs/app-server-protocol/src/protocol/v2/apps.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/apps.rs
@@ -1,146 +0,0 @@
-use super::shared::default_enabled;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use std::collections::HashMap;
-use ts_rs::TS;
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-/// EXPERIMENTAL - list available apps/connectors.
-pub struct AppsListParams {
-    /// Opaque pagination cursor returned by a previous call.
-    #[ts(optional = nullable)]
-    pub cursor: Option<String>,
-    /// Optional page size; defaults to a reasonable server-side value.
-    #[ts(optional = nullable)]
-    pub limit: Option<u32>,
-    /// Optional thread id used to evaluate app feature gating from that thread's config.
-    #[ts(optional = nullable)]
-    pub thread_id: Option<String>,
-    /// When true, bypass app caches and fetch the latest data from sources.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub force_refetch: bool,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-/// EXPERIMENTAL - app metadata returned by app-list APIs.
-pub struct AppBranding {
-    pub category: Option<String>,
-    pub developer: Option<String>,
-    pub website: Option<String>,
-    pub privacy_policy: Option<String>,
-    pub terms_of_service: Option<String>,
-    pub is_discoverable_app: bool,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct AppReview {
-    pub status: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct AppScreenshot {
-    pub url: Option<String>,
-    #[serde(alias = "file_id")]
-    pub file_id: Option<String>,
-    #[serde(alias = "user_prompt")]
-    pub user_prompt: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct AppMetadata {
-    pub review: Option<AppReview>,
-    pub categories: Option<Vec<String>>,
-    pub sub_categories: Option<Vec<String>>,
-    pub seo_description: Option<String>,
-    pub screenshots: Option<Vec<AppScreenshot>>,
-    pub developer: Option<String>,
-    pub version: Option<String>,
-    pub version_id: Option<String>,
-    pub version_notes: Option<String>,
-    pub first_party_type: Option<String>,
-    pub first_party_requires_install: Option<bool>,
-    pub show_in_composer_when_unlinked: Option<bool>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-/// EXPERIMENTAL - app metadata returned by app-list APIs.
-pub struct AppInfo {
-    pub id: String,
-    pub name: String,
-    pub description: Option<String>,
-    pub logo_url: Option<String>,
-    pub logo_url_dark: Option<String>,
-    pub distribution_channel: Option<String>,
-    pub branding: Option<AppBranding>,
-    pub app_metadata: Option<AppMetadata>,
-    pub labels: Option<HashMap<String, String>>,
-    pub install_url: Option<String>,
-    #[serde(default)]
-    pub is_accessible: bool,
-    /// Whether this app is enabled in config.toml.
-    /// Example:
-    /// ```toml
-    /// [apps.bad_app]
-    /// enabled = false
-    /// ```
-    #[serde(default = "default_enabled")]
-    pub is_enabled: bool,
-    #[serde(default)]
-    pub plugin_display_names: Vec<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-/// EXPERIMENTAL - app metadata summary for plugin responses.
-pub struct AppSummary {
-    pub id: String,
-    pub name: String,
-    pub description: Option<String>,
-    pub install_url: Option<String>,
-    pub needs_auth: bool,
-}
-
-impl From<AppInfo> for AppSummary {
-    fn from(value: AppInfo) -> Self {
-        Self {
-            id: value.id,
-            name: value.name,
-            description: value.description,
-            install_url: value.install_url,
-            needs_auth: false,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-/// EXPERIMENTAL - app list response.
-pub struct AppsListResponse {
-    pub data: Vec<AppInfo>,
-    /// Opaque cursor to pass to the next call to continue after the last item.
-    /// If None, there are no more items to return.
-    pub next_cursor: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-/// EXPERIMENTAL - notification emitted when the app list changes.
-pub struct AppListUpdatedNotification {
-    pub data: Vec<AppInfo>,
-}
--- a/codex-rs/app-server-protocol/src/protocol/v2/collaboration_mode.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/collaboration_mode.rs
@@ -1,45 +0,0 @@
-use codex_protocol::config_types::CollaborationModeMask as CoreCollaborationModeMask;
-use codex_protocol::config_types::ModeKind;
-use codex_protocol::openai_models::ReasoningEffort;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use ts_rs::TS;
-
-/// EXPERIMENTAL - list collaboration mode presets.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CollaborationModeListParams {}
-
-/// EXPERIMENTAL - collaboration mode preset metadata for clients.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CollaborationModeMask {
-    pub name: String,
-    pub mode: Option<ModeKind>,
-    pub model: Option<String>,
-    #[serde(rename = "reasoning_effort")]
-    #[ts(rename = "reasoning_effort")]
-    pub reasoning_effort: Option<Option<ReasoningEffort>>,
-}
-
-impl From<CoreCollaborationModeMask> for CollaborationModeMask {
-    fn from(value: CoreCollaborationModeMask) -> Self {
-        Self {
-            name: value.name,
-            mode: value.mode,
-            model: value.model,
-            reasoning_effort: value.reasoning_effort,
-        }
-    }
-}
-
-/// EXPERIMENTAL - collaboration mode presets response.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CollaborationModeListResponse {
-    pub data: Vec<CollaborationModeMask>,
-}
--- a/codex-rs/app-server-protocol/src/protocol/v2/command_exec.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/command_exec.rs
@@ -1,214 +0,0 @@
-use super::PermissionProfile;
-use super::SandboxPolicy;
-use codex_experimental_api_macros::ExperimentalApi;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use std::collections::HashMap;
-use std::path::PathBuf;
-use ts_rs::TS;
-
-/// PTY size in character cells for `command/exec` PTY sessions.
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CommandExecTerminalSize {
-    /// Terminal height in character cells.
-    pub rows: u16,
-    /// Terminal width in character cells.
-    pub cols: u16,
-}
-
-/// Run a standalone command (argv vector) in the server sandbox without
-/// creating a thread or turn.
-///
-/// The final `command/exec` response is deferred until the process exits and is
-/// sent only after all `command/exec/outputDelta` notifications for that
-/// connection have been emitted.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS, ExperimentalApi)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CommandExecParams {
-    /// Command argv vector. Empty arrays are rejected.
-    pub command: Vec<String>,
-    /// Optional client-supplied, connection-scoped process id.
-    ///
-    /// Required for `tty`, `streamStdin`, `streamStdoutStderr`, and follow-up
-    /// `command/exec/write`, `command/exec/resize`, and
-    /// `command/exec/terminate` calls. When omitted, buffered execution gets an
-    /// internal id that is not exposed to the client.
-    #[ts(optional = nullable)]
-    pub process_id: Option<String>,
-    /// Enable PTY mode.
-    ///
-    /// This implies `streamStdin` and `streamStdoutStderr`.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub tty: bool,
-    /// Allow follow-up `command/exec/write` requests to write stdin bytes.
-    ///
-    /// Requires a client-supplied `processId`.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub stream_stdin: bool,
-    /// Stream stdout/stderr via `command/exec/outputDelta` notifications.
-    ///
-    /// Streamed bytes are not duplicated into the final response and require a
-    /// client-supplied `processId`.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub stream_stdout_stderr: bool,
-    /// Optional per-stream stdout/stderr capture cap in bytes.
-    ///
-    /// When omitted, the server default applies. Cannot be combined with
-    /// `disableOutputCap`.
-    #[ts(type = "number | null")]
-    #[ts(optional = nullable)]
-    pub output_bytes_cap: Option<usize>,
-    /// Disable stdout/stderr capture truncation for this request.
-    ///
-    /// Cannot be combined with `outputBytesCap`.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub disable_output_cap: bool,
-    /// Disable the timeout entirely for this request.
-    ///
-    /// Cannot be combined with `timeoutMs`.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub disable_timeout: bool,
-    /// Optional timeout in milliseconds.
-    ///
-    /// When omitted, the server default applies. Cannot be combined with
-    /// `disableTimeout`.
-    #[ts(type = "number | null")]
-    #[ts(optional = nullable)]
-    pub timeout_ms: Option<i64>,
-    /// Optional working directory. Defaults to the server cwd.
-    #[ts(optional = nullable)]
-    pub cwd: Option<PathBuf>,
-    /// Optional environment overrides merged into the server-computed
-    /// environment.
-    ///
-    /// Matching names override inherited values. Set a key to `null` to unset
-    /// an inherited variable.
-    #[ts(optional = nullable)]
-    pub env: Option<HashMap<String, Option<String>>>,
-    /// Optional initial PTY size in character cells. Only valid when `tty` is
-    /// true.
-    #[ts(optional = nullable)]
-    pub size: Option<CommandExecTerminalSize>,
-    /// Optional sandbox policy for this command.
-    ///
-    /// Uses the same shape as thread/turn execution sandbox configuration and
-    /// defaults to the user's configured policy when omitted. Cannot be
-    /// combined with `permissionProfile`.
-    #[ts(optional = nullable)]
-    pub sandbox_policy: Option<SandboxPolicy>,
-    /// Optional full permissions profile for this command.
-    ///
-    /// Defaults to the user's configured permissions when omitted. Cannot be
-    /// combined with `sandboxPolicy`.
-    #[experimental("command/exec.permissionProfile")]
-    #[ts(optional = nullable)]
-    pub permission_profile: Option<PermissionProfile>,
-}
-
-/// Final buffered result for `command/exec`.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CommandExecResponse {
-    /// Process exit code.
-    pub exit_code: i32,
-    /// Buffered stdout capture.
-    ///
-    /// Empty when stdout was streamed via `command/exec/outputDelta`.
-    pub stdout: String,
-    /// Buffered stderr capture.
-    ///
-    /// Empty when stderr was streamed via `command/exec/outputDelta`.
-    pub stderr: String,
-}
-
-/// Write stdin bytes to a running `command/exec` session, close stdin, or
-/// both.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CommandExecWriteParams {
-    /// Client-supplied, connection-scoped `processId` from the original
-    /// `command/exec` request.
-    pub process_id: String,
-    /// Optional base64-encoded stdin bytes to write.
-    #[ts(optional = nullable)]
-    pub delta_base64: Option<String>,
-    /// Close stdin after writing `deltaBase64`, if present.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub close_stdin: bool,
-}
-
-/// Empty success response for `command/exec/write`.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CommandExecWriteResponse {}
-
-/// Terminate a running `command/exec` session.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CommandExecTerminateParams {
-    /// Client-supplied, connection-scoped `processId` from the original
-    /// `command/exec` request.
-    pub process_id: String,
-}
-
-/// Empty success response for `command/exec/terminate`.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CommandExecTerminateResponse {}
-
-/// Resize a running PTY-backed `command/exec` session.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CommandExecResizeParams {
-    /// Client-supplied, connection-scoped `processId` from the original
-    /// `command/exec` request.
-    pub process_id: String,
-    /// New PTY size in character cells.
-    pub size: CommandExecTerminalSize,
-}
-
-/// Empty success response for `command/exec/resize`.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CommandExecResizeResponse {}
-
-/// Stream label for `command/exec/outputDelta` notifications.
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub enum CommandExecOutputStream {
-    /// stdout stream. PTY mode multiplexes terminal output here.
-    Stdout,
-    /// stderr stream.
-    Stderr,
-}
-/// Base64-encoded output chunk emitted for a streaming `command/exec` request.
-///
-/// These notifications are connection-scoped. If the originating connection
-/// closes, the server terminates the process.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CommandExecOutputDeltaNotification {
-    /// Client-supplied, connection-scoped `processId` from the original
-    /// `command/exec` request.
-    pub process_id: String,
-    /// Output stream for this chunk.
-    pub stream: CommandExecOutputStream,
-    /// Base64-encoded output bytes.
-    pub delta_base64: String,
-    /// `true` on the final streamed chunk for a stream when `outputBytesCap`
-    /// truncated later output on that stream.
-    pub cap_reached: bool,
-}
--- a/codex-rs/app-server-protocol/src/protocol/v2/config.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/config.rs
@@ -1,703 +0,0 @@
-use super::ApprovalsReviewer;
-use super::AskForApproval;
-use super::SandboxMode;
-use super::shared::default_enabled;
-use codex_experimental_api_macros::ExperimentalApi;
-use codex_protocol::config_types::ForcedLoginMethod;
-use codex_protocol::config_types::ReasoningSummary;
-use codex_protocol::config_types::ServiceTier;
-use codex_protocol::config_types::Verbosity;
-use codex_protocol::config_types::WebSearchMode;
-use codex_protocol::config_types::WebSearchToolConfig;
-use codex_protocol::openai_models::ReasoningEffort;
-use codex_utils_absolute_path::AbsolutePathBuf;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use serde_json::Value as JsonValue;
-use std::collections::BTreeMap;
-use std::collections::HashMap;
-use std::path::PathBuf;
-use ts_rs::TS;
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(tag = "type", rename_all = "camelCase")]
-#[ts(tag = "type")]
-#[ts(export_to = "v2/")]
-pub enum ConfigLayerSource {
-    /// Managed preferences layer delivered by MDM (macOS only).
-    #[serde(rename_all = "camelCase")]
-    #[ts(rename_all = "camelCase")]
-    Mdm {
-        domain: String,
-        key: String,
-    },
-
-    /// Managed config layer from a file (usually `managed_config.toml`).
-    #[serde(rename_all = "camelCase")]
-    #[ts(rename_all = "camelCase")]
-    System {
-        /// This is the path to the system config.toml file, though it is not
-        /// guaranteed to exist.
-        file: AbsolutePathBuf,
-    },
-
-    /// User config layer from $CODEX_HOME/config.toml. This layer is special
-    /// in that it is expected to be:
-    /// - writable by the user
-    /// - generally outside the workspace directory
-    #[serde(rename_all = "camelCase")]
-    #[ts(rename_all = "camelCase")]
-    User {
-        /// This is the path to the user's config.toml file, though it is not
-        /// guaranteed to exist.
-        file: AbsolutePathBuf,
-    },
-
-    /// Path to a .codex/ folder within a project. There could be multiple of
-    /// these between `cwd` and the project/repo root.
-    #[serde(rename_all = "camelCase")]
-    #[ts(rename_all = "camelCase")]
-    Project {
-        dot_codex_folder: AbsolutePathBuf,
-    },
-
-    /// Session-layer overrides supplied via `-c`/`--config`.
-    SessionFlags,
-
-    /// `managed_config.toml` was designed to be a config that was loaded
-    /// as the last layer on top of everything else. This scheme did not quite
-    /// work out as intended, but we keep this variant as a "best effort" while
-    /// we phase out `managed_config.toml` in favor of `requirements.toml`.
-    #[serde(rename_all = "camelCase")]
-    #[ts(rename_all = "camelCase")]
-    LegacyManagedConfigTomlFromFile {
-        file: AbsolutePathBuf,
-    },
-
-    LegacyManagedConfigTomlFromMdm,
-}
-
-impl ConfigLayerSource {
-    /// A settings from a layer with a higher precedence will override a setting
-    /// from a layer with a lower precedence.
-    pub fn precedence(&self) -> i16 {
-        match self {
-            ConfigLayerSource::Mdm { .. } => 0,
-            ConfigLayerSource::System { .. } => 10,
-            ConfigLayerSource::User { .. } => 20,
-            ConfigLayerSource::Project { .. } => 25,
-            ConfigLayerSource::SessionFlags => 30,
-            ConfigLayerSource::LegacyManagedConfigTomlFromFile { .. } => 40,
-            ConfigLayerSource::LegacyManagedConfigTomlFromMdm => 50,
-        }
-    }
-}
-
-/// Compares [ConfigLayerSource] by precedence, so `A < B` means settings from
-/// layer `A` will be overridden by settings from layer `B`.
-impl PartialOrd for ConfigLayerSource {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.precedence().cmp(&other.precedence()))
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Default, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/")]
-pub struct SandboxWorkspaceWrite {
-    #[serde(default)]
-    pub writable_roots: Vec<PathBuf>,
-    #[serde(default)]
-    pub network_access: bool,
-    #[serde(default)]
-    pub exclude_tmpdir_env_var: bool,
-    #[serde(default)]
-    pub exclude_slash_tmp: bool,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/")]
-pub struct ToolsV2 {
-    pub web_search: Option<WebSearchToolConfig>,
-    pub view_image: Option<bool>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS, ExperimentalApi)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/")]
-pub struct ProfileV2 {
-    pub model: Option<String>,
-    pub model_provider: Option<String>,
-    #[experimental(nested)]
-    pub approval_policy: Option<AskForApproval>,
-    /// [UNSTABLE] Optional profile-level override for where approval requests
-    /// are routed for review. If omitted, the enclosing config default is
-    /// used.
-    #[experimental("config/read.approvalsReviewer")]
-    pub approvals_reviewer: Option<ApprovalsReviewer>,
-    pub service_tier: Option<ServiceTier>,
-    pub model_reasoning_effort: Option<ReasoningEffort>,
-    pub model_reasoning_summary: Option<ReasoningSummary>,
-    pub model_verbosity: Option<Verbosity>,
-    pub web_search: Option<WebSearchMode>,
-    pub tools: Option<ToolsV2>,
-    pub chatgpt_base_url: Option<String>,
-    #[serde(default, flatten)]
-    pub additional: HashMap<String, JsonValue>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/")]
-pub struct AnalyticsConfig {
-    pub enabled: Option<bool>,
-    #[serde(default, flatten)]
-    pub additional: HashMap<String, JsonValue>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/")]
-pub enum AppToolApproval {
-    Auto,
-    Prompt,
-    Approve,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/")]
-pub struct AppsDefaultConfig {
-    #[serde(default = "default_enabled")]
-    pub enabled: bool,
-    #[serde(default = "default_enabled")]
-    pub destructive_enabled: bool,
-    #[serde(default = "default_enabled")]
-    pub open_world_enabled: bool,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/")]
-pub struct AppToolConfig {
-    pub enabled: Option<bool>,
-    pub approval_mode: Option<AppToolApproval>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/")]
-pub struct AppToolsConfig {
-    #[serde(default, flatten)]
-    pub tools: HashMap<String, AppToolConfig>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/")]
-pub struct AppConfig {
-    #[serde(default = "default_enabled")]
-    pub enabled: bool,
-    pub destructive_enabled: Option<bool>,
-    pub open_world_enabled: Option<bool>,
-    pub default_tools_approval_mode: Option<AppToolApproval>,
-    pub default_tools_enabled: Option<bool>,
-    pub tools: Option<AppToolsConfig>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/")]
-pub struct AppsConfig {
-    #[serde(default, rename = "_default")]
-    pub default: Option<AppsDefaultConfig>,
-    #[serde(default, flatten)]
-    pub apps: HashMap<String, AppConfig>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS, ExperimentalApi)]
-#[serde(rename_all = "snake_case")]
-#[ts(export_to = "v2/")]
-pub struct Config {
-    pub model: Option<String>,
-    pub review_model: Option<String>,
-    pub model_context_window: Option<i64>,
-    pub model_auto_compact_token_limit: Option<i64>,
-    pub model_provider: Option<String>,
-    #[experimental(nested)]
-    pub approval_policy: Option<AskForApproval>,
-    /// [UNSTABLE] Optional default for where approval requests are routed for
-    /// review.
-    #[experimental("config/read.approvalsReviewer")]
-    pub approvals_reviewer: Option<ApprovalsReviewer>,
-    pub sandbox_mode: Option<SandboxMode>,
-    pub sandbox_workspace_write: Option<SandboxWorkspaceWrite>,
-    pub forced_chatgpt_workspace_id: Option<String>,
-    pub forced_login_method: Option<ForcedLoginMethod>,
-    pub web_search: Option<WebSearchMode>,
-    pub tools: Option<ToolsV2>,
-    pub profile: Option<String>,
-    #[experimental(nested)]
-    #[serde(default)]
-    pub profiles: HashMap<String, ProfileV2>,
-    pub instructions: Option<String>,
-    pub developer_instructions: Option<String>,
-    pub compact_prompt: Option<String>,
-    pub model_reasoning_effort: Option<ReasoningEffort>,
-    pub model_reasoning_summary: Option<ReasoningSummary>,
-    pub model_verbosity: Option<Verbosity>,
-    pub service_tier: Option<ServiceTier>,
-    pub analytics: Option<AnalyticsConfig>,
-    #[experimental("config/read.apps")]
-    #[serde(default)]
-    pub apps: Option<AppsConfig>,
-    #[serde(default, flatten)]
-    pub additional: HashMap<String, JsonValue>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfigLayerMetadata {
-    pub name: ConfigLayerSource,
-    pub version: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfigLayer {
-    pub name: ConfigLayerSource,
-    pub version: String,
-    pub config: JsonValue,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub disabled_reason: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub enum MergeStrategy {
-    Replace,
-    Upsert,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub enum WriteStatus {
-    Ok,
-    OkOverridden,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct OverriddenMetadata {
-    pub message: String,
-    pub overriding_layer: ConfigLayerMetadata,
-    pub effective_value: JsonValue,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfigWriteResponse {
-    pub status: WriteStatus,
-    pub version: String,
-    /// Canonical path to the config file that was written.
-    pub file_path: AbsolutePathBuf,
-    pub overridden_metadata: Option<OverriddenMetadata>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub enum ConfigWriteErrorCode {
-    ConfigLayerReadonly,
-    ConfigVersionConflict,
-    ConfigValidationError,
-    ConfigPathNotFound,
-    ConfigSchemaUnknownKey,
-    UserLayerNotFound,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfigReadParams {
-    #[serde(default)]
-    pub include_layers: bool,
-    /// Optional working directory to resolve project config layers. If specified,
-    /// return the effective config as seen from that directory (i.e., including any
-    /// project layers between `cwd` and the project/repo root).
-    #[ts(optional = nullable)]
-    pub cwd: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS, ExperimentalApi)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfigReadResponse {
-    #[experimental(nested)]
-    pub config: Config,
-    pub origins: HashMap<String, ConfigLayerMetadata>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub layers: Option<Vec<ConfigLayer>>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS, ExperimentalApi)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfigRequirements {
-    #[experimental(nested)]
-    pub allowed_approval_policies: Option<Vec<AskForApproval>>,
-    #[experimental("configRequirements/read.allowedApprovalsReviewers")]
-    pub allowed_approvals_reviewers: Option<Vec<ApprovalsReviewer>>,
-    pub allowed_sandbox_modes: Option<Vec<SandboxMode>>,
-    pub allowed_web_search_modes: Option<Vec<WebSearchMode>>,
-    pub feature_requirements: Option<BTreeMap<String, bool>>,
-    #[experimental("configRequirements/read.hooks")]
-    pub hooks: Option<ManagedHooksRequirements>,
-    pub enforce_residency: Option<ResidencyRequirement>,
-    #[experimental("configRequirements/read.network")]
-    pub network: Option<NetworkRequirements>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ManagedHooksRequirements {
-    pub managed_dir: Option<PathBuf>,
-    pub windows_managed_dir: Option<PathBuf>,
-    #[serde(rename = "PreToolUse")]
-    #[ts(rename = "PreToolUse")]
-    pub pre_tool_use: Vec<ConfiguredHookMatcherGroup>,
-    #[serde(rename = "PermissionRequest")]
-    #[ts(rename = "PermissionRequest")]
-    pub permission_request: Vec<ConfiguredHookMatcherGroup>,
-    #[serde(rename = "PostToolUse")]
-    #[ts(rename = "PostToolUse")]
-    pub post_tool_use: Vec<ConfiguredHookMatcherGroup>,
-    #[serde(rename = "SessionStart")]
-    #[ts(rename = "SessionStart")]
-    pub session_start: Vec<ConfiguredHookMatcherGroup>,
-    #[serde(rename = "UserPromptSubmit")]
-    #[ts(rename = "UserPromptSubmit")]
-    pub user_prompt_submit: Vec<ConfiguredHookMatcherGroup>,
-    #[serde(rename = "Stop")]
-    #[ts(rename = "Stop")]
-    pub stop: Vec<ConfiguredHookMatcherGroup>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfiguredHookMatcherGroup {
-    pub matcher: Option<String>,
-    pub hooks: Vec<ConfiguredHookHandler>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(tag = "type")]
-#[ts(tag = "type", export_to = "v2/")]
-pub enum ConfiguredHookHandler {
-    #[serde(rename = "command")]
-    #[ts(rename = "command")]
-    Command {
-        command: String,
-        #[serde(rename = "timeoutSec")]
-        #[ts(rename = "timeoutSec")]
-        timeout_sec: Option<u64>,
-        r#async: bool,
-        #[serde(rename = "statusMessage")]
-        #[ts(rename = "statusMessage")]
-        status_message: Option<String>,
-    },
-    #[serde(rename = "prompt")]
-    #[ts(rename = "prompt")]
-    Prompt {},
-    #[serde(rename = "agent")]
-    #[ts(rename = "agent")]
-    Agent {},
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct NetworkRequirements {
-    pub enabled: Option<bool>,
-    pub http_port: Option<u16>,
-    pub socks_port: Option<u16>,
-    pub allow_upstream_proxy: Option<bool>,
-    pub dangerously_allow_non_loopback_proxy: Option<bool>,
-    pub dangerously_allow_all_unix_sockets: Option<bool>,
-    /// Canonical network permission map for `experimental_network`.
-    pub domains: Option<BTreeMap<String, NetworkDomainPermission>>,
-    /// When true, only managed allowlist entries are respected while managed
-    /// network enforcement is active.
-    pub managed_allowed_domains_only: Option<bool>,
-    /// Legacy compatibility view derived from `domains`.
-    pub allowed_domains: Option<Vec<String>>,
-    /// Legacy compatibility view derived from `domains`.
-    pub denied_domains: Option<Vec<String>>,
-    /// Canonical unix socket permission map for `experimental_network`.
-    pub unix_sockets: Option<BTreeMap<String, NetworkUnixSocketPermission>>,
-    /// Legacy compatibility view derived from `unix_sockets`.
-    pub allow_unix_sockets: Option<Vec<String>>,
-    pub allow_local_binding: Option<bool>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "lowercase")]
-#[ts(export_to = "v2/")]
-pub enum NetworkDomainPermission {
-    Allow,
-    Deny,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "lowercase")]
-#[ts(export_to = "v2/")]
-pub enum NetworkUnixSocketPermission {
-    Allow,
-    None,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub enum ResidencyRequirement {
-    Us,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS, ExperimentalApi)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfigRequirementsReadResponse {
-    /// Null if no requirements are configured (e.g. no requirements.toml/MDM entries).
-    #[experimental(nested)]
-    pub requirements: Option<ConfigRequirements>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, Hash, JsonSchema, TS)]
-#[ts(export_to = "v2/")]
-pub enum ExternalAgentConfigMigrationItemType {
-    #[serde(rename = "AGENTS_MD")]
-    #[ts(rename = "AGENTS_MD")]
-    AgentsMd,
-    #[serde(rename = "CONFIG")]
-    #[ts(rename = "CONFIG")]
-    Config,
-    #[serde(rename = "SKILLS")]
-    #[ts(rename = "SKILLS")]
-    Skills,
-    #[serde(rename = "PLUGINS")]
-    #[ts(rename = "PLUGINS")]
-    Plugins,
-    #[serde(rename = "MCP_SERVER_CONFIG")]
-    #[ts(rename = "MCP_SERVER_CONFIG")]
-    McpServerConfig,
-    #[serde(rename = "SUBAGENTS")]
-    #[ts(rename = "SUBAGENTS")]
-    Subagents,
-    #[serde(rename = "HOOKS")]
-    #[ts(rename = "HOOKS")]
-    Hooks,
-    #[serde(rename = "COMMANDS")]
-    #[ts(rename = "COMMANDS")]
-    Commands,
-    #[serde(rename = "SESSIONS")]
-    #[ts(rename = "SESSIONS")]
-    Sessions,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct PluginsMigration {
-    #[serde(rename = "marketplaceName")]
-    #[ts(rename = "marketplaceName")]
-    pub marketplace_name: String,
-    #[serde(rename = "pluginNames")]
-    #[ts(rename = "pluginNames")]
-    pub plugin_names: Vec<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct SessionMigration {
-    pub path: PathBuf,
-    pub cwd: PathBuf,
-    pub title: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct McpServerMigration {
-    pub name: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct HookMigration {
-    pub name: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct SubagentMigration {
-    pub name: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct CommandMigration {
-    pub name: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Default, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct MigrationDetails {
-    #[serde(default)]
-    pub plugins: Vec<PluginsMigration>,
-    #[serde(default)]
-    pub sessions: Vec<SessionMigration>,
-    #[serde(default)]
-    pub mcp_servers: Vec<McpServerMigration>,
-    #[serde(default)]
-    pub hooks: Vec<HookMigration>,
-    #[serde(default)]
-    pub subagents: Vec<SubagentMigration>,
-    #[serde(default)]
-    pub commands: Vec<CommandMigration>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ExternalAgentConfigMigrationItem {
-    pub item_type: ExternalAgentConfigMigrationItemType,
-    pub description: String,
-    /// Null or empty means home-scoped migration; non-empty means repo-scoped migration.
-    pub cwd: Option<PathBuf>,
-    pub details: Option<MigrationDetails>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ExternalAgentConfigDetectResponse {
-    pub items: Vec<ExternalAgentConfigMigrationItem>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ExternalAgentConfigDetectParams {
-    /// If true, include detection under the user's home (~/.claude, ~/.codex, etc.).
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub include_home: bool,
-    /// Zero or more working directories to include for repo-scoped detection.
-    #[ts(optional = nullable)]
-    pub cwds: Option<Vec<PathBuf>>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ExternalAgentConfigImportParams {
-    pub migration_items: Vec<ExternalAgentConfigMigrationItem>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ExternalAgentConfigImportResponse {}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ExternalAgentConfigImportCompletedNotification {}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfigValueWriteParams {
-    pub key_path: String,
-    pub value: JsonValue,
-    pub merge_strategy: MergeStrategy,
-    /// Path to the config file to write; defaults to the user's `config.toml` when omitted.
-    #[ts(optional = nullable)]
-    pub file_path: Option<String>,
-    #[ts(optional = nullable)]
-    pub expected_version: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfigBatchWriteParams {
-    pub edits: Vec<ConfigEdit>,
-    /// Path to the config file to write; defaults to the user's `config.toml` when omitted.
-    #[ts(optional = nullable)]
-    pub file_path: Option<String>,
-    #[ts(optional = nullable)]
-    pub expected_version: Option<String>,
-    /// When true, hot-reload the updated user config into all loaded threads after writing.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub reload_user_config: bool,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfigEdit {
-    pub key_path: String,
-    pub value: JsonValue,
-    pub merge_strategy: MergeStrategy,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct TextPosition {
-    /// 1-based line number.
-    pub line: usize,
-    /// 1-based column number (in Unicode scalar values).
-    pub column: usize,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct TextRange {
-    pub start: TextPosition,
-    pub end: TextPosition,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct ConfigWarningNotification {
-    /// Concise summary of the warning.
-    pub summary: String,
-    /// Optional extra guidance or error details.
-    pub details: Option<String>,
-    /// Optional path to the config file that triggered the warning.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    #[ts(optional)]
-    pub path: Option<String>,
-    /// Optional range for the error location inside the config file.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    #[ts(optional)]
-    pub range: Option<TextRange>,
-}
--- a/codex-rs/app-server-protocol/src/protocol/v2/device_key.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2/device_key.rs
@@ -1,181 +0,0 @@
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde::Serialize;
-use ts_rs::TS;
-
-/// Device-key algorithm reported at enrollment and signing boundaries.
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(rename_all = "snake_case", export_to = "v2/")]
-pub enum DeviceKeyAlgorithm {
-    EcdsaP256Sha256,
-}
-
-/// Platform protection class for a controller-local device key.
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(rename_all = "snake_case", export_to = "v2/")]
-pub enum DeviceKeyProtectionClass {
-    HardwareSecureEnclave,
-    HardwareTpm,
-    OsProtectedNonextractable,
-}
-
-/// Protection policy for creating or loading a controller-local device key.
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(rename_all = "snake_case", export_to = "v2/")]
-pub enum DeviceKeyProtectionPolicy {
-    HardwareOnly,
-    AllowOsProtectedNonextractable,
-}
-
-/// Create a controller-local device key with a random key id.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct DeviceKeyCreateParams {
-    /// Defaults to `hardware_only` when omitted.
-    #[ts(optional = nullable)]
-    pub protection_policy: Option<DeviceKeyProtectionPolicy>,
-    pub account_user_id: String,
-    pub client_id: String,
-}
-
-/// Device-key metadata and public key returned by create/public APIs.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct DeviceKeyCreateResponse {
-    pub key_id: String,
-    /// SubjectPublicKeyInfo DER encoded as base64.
-    pub public_key_spki_der_base64: String,
-    pub algorithm: DeviceKeyAlgorithm,
-    pub protection_class: DeviceKeyProtectionClass,
-}
-
-/// Fetch a controller-local device key public key by id.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct DeviceKeyPublicParams {
-    pub key_id: String,
-}
-
-/// Device-key public metadata returned by `device/key/public`.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct DeviceKeyPublicResponse {
-    pub key_id: String,
-    /// SubjectPublicKeyInfo DER encoded as base64.
-    pub public_key_spki_der_base64: String,
-    pub algorithm: DeviceKeyAlgorithm,
-    pub protection_class: DeviceKeyProtectionClass,
-}
-
-/// Current remote-control connection status and environment id exposed to clients.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct RemoteControlStatusChangedNotification {
-    pub status: RemoteControlConnectionStatus,
-    pub environment_id: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(rename_all = "camelCase", export_to = "v2/")]
-pub enum RemoteControlConnectionStatus {
-    Disabled,
-    Connecting,
-    Connected,
-    Errored,
-}
-
-/// Audience for a remote-control client connection device-key proof.
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(rename_all = "snake_case", export_to = "v2/")]
-pub enum RemoteControlClientConnectionAudience {
-    RemoteControlClientWebsocket,
-}
-
-/// Audience for a remote-control client enrollment device-key proof.
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(rename_all = "snake_case", export_to = "v2/")]
-pub enum RemoteControlClientEnrollmentAudience {
-    RemoteControlClientEnrollment,
-}
-
-/// Structured payloads accepted by `device/key/sign`.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(tag = "type", rename_all = "camelCase")]
-#[ts(tag = "type", export_to = "v2/")]
-pub enum DeviceKeySignPayload {
-    /// Payload bound to one remote-control controller websocket `/client` connection challenge.
-    #[serde(rename_all = "camelCase")]
-    #[ts(rename_all = "camelCase")]
-    RemoteControlClientConnection {
-        nonce: String,
-        audience: RemoteControlClientConnectionAudience,
-        /// Backend-issued websocket session id that this proof authorizes.
-        session_id: String,
-        /// Origin of the backend endpoint that issued the challenge and will verify this proof.
-        target_origin: String,
-        /// Websocket route path that this proof authorizes.
-        target_path: String,
-        account_user_id: String,
-        client_id: String,
-        /// Remote-control token expiration as Unix seconds.
-        #[ts(type = "number")]
-        token_expires_at: i64,
-        /// SHA-256 of the controller-scoped remote-control token, encoded as unpadded base64url.
-        token_sha256_base64url: String,
-        /// Must contain exactly `remote_control_controller_websocket`.
-        scopes: Vec<String>,
-    },
-    /// Payload bound to a remote-control client `/client/enroll` ownership challenge.
-    #[serde(rename_all = "camelCase")]
-    #[ts(rename_all = "camelCase")]
-    RemoteControlClientEnrollment {
-        nonce: String,
-        audience: RemoteControlClientEnrollmentAudience,
-        /// Backend-issued enrollment challenge id that this proof authorizes.
-        challenge_id: String,
-        /// Origin of the backend endpoint that issued the challenge and will verify this proof.
-        target_origin: String,
-        /// HTTP route path that this proof authorizes.
-        target_path: String,
-        account_user_id: String,
-        client_id: String,
-        /// SHA-256 of the requested device identity operation, encoded as unpadded base64url.
-        device_identity_sha256_base64url: String,
-        /// Enrollment challenge expiration as Unix seconds.
-        #[ts(type = "number")]
-        challenge_expires_at: i64,
-    },
-}
-
-/// Sign an accepted structured payload with a controller-local device key.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct DeviceKeySignParams {
-    pub key_id: String,
-    pub payload: DeviceKeySignPayload,
-}
-
-/// ASN.1 DER signature returned by `device/key/sign`.
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export_to = "v2/")]
-pub struct DeviceKeySignResponse {
-    /// ECDSA signature DER encoded as base64.
-    pub signature_der_base64: String,
-    /// Exact bytes signed by the device key, encoded as base64. Verifiers must verify this byte
-    /// string directly and must not reserialize `payload`.
-    pub signed_payload_base64: String,
-    pub algorithm: DeviceKeyAlgorithm,
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
rhan-oai	89bba5d2c3	[codex-analytics] add tool item event schemas	2026-05-02 23:28:33 -07:00
rhan-oai	73ff402725	[codex-analytics] add core item timing production	2026-05-02 20:56:20 -07:00