test(core): add watchdog due helper for stack validation

Use the existing model_info::with_config_overrides path for alias-specific context window and auto-compact overrides instead of mutating those fields inline in ModelsManager.

The custom alias path now folds alias-level override values into a temporary config and reuses the centralized override helper, which keeps the precedence behavior unchanged while removing duplicated override logic.

.devcontainer/Dockerfile

@@ -11,7 +11,7 @@ RUN apt-get update && \
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     build-essential curl git ca-certificates \
-    pkg-config libcap-dev clang musl-tools libssl-dev just && \
+    pkg-config clang musl-tools libssl-dev just && \
     rm -rf /var/lib/apt/lists/*
 
 # Ubuntu 24.04 ships with user 'ubuntu' already created with UID 1000.

BUILD.bazel

@@ -28,8 +28,4 @@ alias(
     actual = "@rbe_platform",
 )
 
-exports_files([
-    "AGENTS.md",
-    "workspace_root_test_launcher.bat.tpl",
-    "workspace_root_test_launcher.sh.tpl",
-])
+exports_files(["AGENTS.md"])

codex-rs/.config/nextest.toml

@@ -2,12 +2,6 @@
 # Do not increase, fix your test instead
 slow-timeout = { period = "15s", terminate-after = 2 }
 
-[test-groups.app_server_protocol_codegen]
-max-threads = 1
-
-[test-groups.app_server_integration]
-max-threads = 1
-
 
 [[profile.default.overrides]]
 # Do not add new tests here
@@ -17,13 +11,3 @@ slow-timeout = { period = "1m", terminate-after = 4 }
 [[profile.default.overrides]]
 filter = 'test(approval_matrix_covers_all_modes)'
 slow-timeout = { period = "30s", terminate-after = 2 }
-
-[[profile.default.overrides]]
-filter = 'package(codex-app-server-protocol) & (test(typescript_schema_fixtures_match_generated) | test(json_schema_fixtures_match_generated) | test(generate_ts_with_experimental_api_retains_experimental_entries) | test(generated_ts_optional_nullable_fields_only_in_params) | test(generate_json_filters_experimental_fields_and_methods))'
-test-group = 'app_server_protocol_codegen'
-
-[[profile.default.overrides]]
-# These integration tests spawn a fresh app-server subprocess per case.
-# Keep the library unit tests parallel.
-filter = 'package(codex-app-server) & kind(test)'
-test-group = 'app_server_integration'

codex-rs/Cargo.lock

@@ -827,7 +827,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8"
 dependencies = [
  "axum-core",
- "base64 0.22.1",
  "bytes",
  "form_urlencoded",
  "futures-util",
@@ -846,10 +845,8 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sha1",
  "sync_wrapper",
  "tokio",
- "tokio-tungstenite",
  "tower",
  "tower-layer",
  "tower-service",
@@ -1439,12 +1436,10 @@ dependencies = [
  "codex-utils-cargo-bin",
  "codex-utils-cli",
  "codex-utils-json-to-toml",
- "codex-utils-pty",
  "core_test_support",
  "futures",
  "owo-colors",
  "pretty_assertions",
- "reqwest",
  "rmcp",
  "serde",
  "serde_json",
@@ -1462,24 +1457,6 @@ dependencies = [
  "wiremock",
 ]
 
-[[package]]
-name = "codex-app-server-client"
-version = "0.0.0"
-dependencies = [
- "codex-app-server",
- "codex-app-server-protocol",
- "codex-arg0",
- "codex-core",
- "codex-feedback",
- "codex-protocol",
- "pretty_assertions",
- "serde",
- "serde_json",
- "tokio",
- "toml 0.9.11+spec-1.1.0",
- "tracing",
-]
-
 [[package]]
 name = "codex-app-server-protocol"
 version = "0.0.0"
@@ -1921,13 +1898,10 @@ dependencies = [
  "anyhow",
  "assert_cmd",
  "clap",
- "codex-app-server-client",
- "codex-app-server-protocol",
  "codex-apply-patch",
  "codex-arg0",
  "codex-cloud-requirements",
  "codex-core",
- "codex-feedback",
  "codex-otel",
  "codex-protocol",
  "codex-utils-absolute-path",
@@ -2420,6 +2394,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "clap",
+ "codex-otel",
  "codex-protocol",
  "dirs",
  "log",

codex-rs/Cargo.toml

@@ -4,7 +4,6 @@ members = [
     "ansi-escape",
     "async-utils",
     "app-server",
-    "app-server-client",
     "app-server-protocol",
     "app-server-test-client",
     "debug-client",
@@ -87,7 +86,6 @@ codex-api = { path = "codex-api" }
 codex-artifacts = { path = "artifacts" }
 codex-package-manager = { path = "package-manager" }
 codex-app-server = { path = "app-server" }
-codex-app-server-client = { path = "app-server-client" }
 codex-app-server-protocol = { path = "app-server-protocol" }
 codex-app-server-test-client = { path = "app-server-test-client" }
 codex-apply-patch = { path = "apply-patch" }

codex-rs/README.md

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

codex-rs/app-server-client/BUILD.bazel

@@ -1,6 +0,0 @@
-load("//:defs.bzl", "codex_rust_crate")
-
-codex_rust_crate(
-    name = "app-server-client",
-    crate_name = "codex_app_server_client",
-)

codex-rs/app-server-client/Cargo.toml

@@ -1,30 +0,0 @@
-[package]
-name = "codex-app-server-client"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[lib]
-name = "codex_app_server_client"
-path = "src/lib.rs"
-
-[lints]
-workspace = true
-
-[dependencies]
-codex-app-server = { workspace = true }
-codex-app-server-protocol = { workspace = true }
-codex-arg0 = { workspace = true }
-codex-core = { workspace = true }
-codex-feedback = { workspace = true }
-codex-protocol = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true, features = ["sync", "time", "rt"] }
-toml = { workspace = true }
-tracing = { workspace = true }
-
-[dev-dependencies]
-pretty_assertions = { workspace = true }
-serde_json = { workspace = true }
-tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

codex-rs/app-server-client/README.md

@@ -1,67 +0,0 @@
-# codex-app-server-client
-
-Shared in-process app-server client used by conversational CLI surfaces:
-
-- `codex-exec`
-- `codex-tui`
-
-## Purpose
-
-This crate centralizes startup and lifecycle management for an in-process
-`codex-app-server` runtime, so CLI clients do not need to duplicate:
-
-- app-server bootstrap and initialize handshake
-- in-memory request/event transport wiring
-- lifecycle orchestration around caller-provided startup identity
-- graceful shutdown behavior
-
-## Startup identity
-
-Callers pass both the app-server `SessionSource` and the initialize
-`client_info.name` explicitly when starting the facade.
-
-That keeps thread metadata (for example in `thread/list` and `thread/read`)
-aligned with the originating runtime without baking TUI/exec-specific policy
-into the shared client layer.
-
-## Transport model
-
-The in-process path uses typed channels:
-
-- client -> server: `ClientRequest` / `ClientNotification`
-- server -> client: `InProcessServerEvent`
-  - `ServerRequest`
-  - `ServerNotification`
-  - `LegacyNotification`
-
-JSON serialization is still used at external transport boundaries
-(stdio/websocket), but the in-process hot path is typed.
-
-Typed requests still receive app-server responses through the JSON-RPC
-result envelope internally. That is intentional: the in-process path is
-meant to preserve app-server semantics while removing the process
-boundary, not to introduce a second response contract.
-
-## Bootstrap behavior
-
-The client facade starts an already-initialized in-process runtime, but
-thread bootstrap still follows normal app-server flow:
-
-- caller sends `thread/start` or `thread/resume`
-- app-server returns the immediate typed response
-- richer session metadata may arrive later as a `SessionConfigured`
-  legacy event
-
-Surfaces such as TUI and exec may therefore need a short bootstrap
-phase where they reconcile startup response data with later events.
-
-## Backpressure and shutdown
-
-- Queues are bounded and use `DEFAULT_IN_PROCESS_CHANNEL_CAPACITY` by default.
-- Full queues return explicit overload behavior instead of unbounded growth.
-- `shutdown()` performs a bounded graceful shutdown and then aborts if timeout
-  is exceeded.
-
-If the client falls behind on event consumption, the worker emits
-`InProcessServerEvent::Lagged` and may reject pending server requests so
-approval flows do not hang indefinitely behind a saturated queue.

codex-rs/app-server-client/src/lib.rs

@@ -1,801 +0,0 @@
-//! Shared in-process app-server client facade for CLI surfaces.
-//!
-//! This crate wraps [`codex_app_server::in_process`] behind a single async API
-//! used by surfaces like TUI and exec. It centralizes:
-//!
-//! - Runtime startup and initialize-capabilities handshake.
-//! - Typed caller-provided startup identity (`SessionSource` + client name).
-//! - Typed and raw request/notification dispatch.
-//! - Server request resolution and rejection.
-//! - Event consumption with backpressure signaling ([`InProcessServerEvent::Lagged`]).
-//! - Bounded graceful shutdown with abort fallback.
-//!
-//! The facade interposes a worker task between the caller and the underlying
-//! [`InProcessClientHandle`](codex_app_server::in_process::InProcessClientHandle),
-//! bridging async `mpsc` channels on both sides. Queues are bounded so overload
-//! surfaces as channel-full errors rather than unbounded memory growth.
-
-use std::error::Error;
-use std::fmt;
-use std::io::Error as IoError;
-use std::io::ErrorKind;
-use std::io::Result as IoResult;
-use std::sync::Arc;
-use std::time::Duration;
-
-pub use codex_app_server::in_process::DEFAULT_IN_PROCESS_CHANNEL_CAPACITY;
-pub use codex_app_server::in_process::InProcessServerEvent;
-use codex_app_server::in_process::InProcessStartArgs;
-use codex_app_server_protocol::ClientInfo;
-use codex_app_server_protocol::ClientNotification;
-use codex_app_server_protocol::ClientRequest;
-use codex_app_server_protocol::ConfigWarningNotification;
-use codex_app_server_protocol::InitializeCapabilities;
-use codex_app_server_protocol::InitializeParams;
-use codex_app_server_protocol::JSONRPCErrorError;
-use codex_app_server_protocol::RequestId;
-use codex_app_server_protocol::Result as JsonRpcResult;
-use codex_arg0::Arg0DispatchPaths;
-use codex_core::config::Config;
-use codex_core::config_loader::CloudRequirementsLoader;
-use codex_core::config_loader::LoaderOverrides;
-use codex_feedback::CodexFeedback;
-use codex_protocol::protocol::SessionSource;
-use serde::de::DeserializeOwned;
-use tokio::sync::mpsc;
-use tokio::sync::oneshot;
-use tokio::time::timeout;
-use toml::Value as TomlValue;
-use tracing::warn;
-
-const SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);
-
-/// Raw app-server request result for typed in-process requests.
-///
-/// Even on the in-process path, successful responses still travel back through
-/// the same JSON-RPC result envelope used by socket/stdio transports because
-/// `MessageProcessor` continues to produce that shape internally.
-pub type RequestResult = std::result::Result<JsonRpcResult, JSONRPCErrorError>;
-
-fn event_requires_delivery(event: &InProcessServerEvent) -> bool {
-    // These terminal events drive surface shutdown/completion state. Dropping
-    // them under backpressure can leave exec/TUI waiting forever even though
-    // the underlying turn has already ended.
-    match event {
-        InProcessServerEvent::ServerNotification(
-            codex_app_server_protocol::ServerNotification::TurnCompleted(_),
-        ) => true,
-        InProcessServerEvent::LegacyNotification(notification) => matches!(
-            notification
-                .method
-                .strip_prefix("codex/event/")
-                .unwrap_or(&notification.method),
-            "task_complete" | "turn_aborted" | "shutdown_complete"
-        ),
-        _ => false,
-    }
-}
-
-/// Layered error for [`InProcessAppServerClient::request_typed`].
-///
-/// This keeps transport failures, server-side JSON-RPC failures, and response
-/// decode failures distinct so callers can decide whether to retry, surface a
-/// server error, or treat the response as an internal request/response mismatch.
-#[derive(Debug)]
-pub enum TypedRequestError {
-    Transport {
-        method: String,
-        source: IoError,
-    },
-    Server {
-        method: String,
-        source: JSONRPCErrorError,
-    },
-    Deserialize {
-        method: String,
-        source: serde_json::Error,
-    },
-}
-
-impl fmt::Display for TypedRequestError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Transport { method, source } => {
-                write!(f, "{method} transport error: {source}")
-            }
-            Self::Server { method, source } => {
-                write!(f, "{method} failed: {}", source.message)
-            }
-            Self::Deserialize { method, source } => {
-                write!(f, "{method} response decode error: {source}")
-            }
-        }
-    }
-}
-
-impl Error for TypedRequestError {
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
-        match self {
-            Self::Transport { source, .. } => Some(source),
-            Self::Server { .. } => None,
-            Self::Deserialize { source, .. } => Some(source),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct InProcessClientStartArgs {
-    /// Resolved argv0 dispatch paths used by command execution internals.
-    pub arg0_paths: Arg0DispatchPaths,
-    /// Shared config used to initialize app-server runtime.
-    pub config: Arc<Config>,
-    /// CLI config overrides that are already parsed into TOML values.
-    pub cli_overrides: Vec<(String, TomlValue)>,
-    /// Loader override knobs used by config API paths.
-    pub loader_overrides: LoaderOverrides,
-    /// Preloaded cloud requirements provider.
-    pub cloud_requirements: CloudRequirementsLoader,
-    /// Feedback sink used by app-server/core telemetry and logs.
-    pub feedback: CodexFeedback,
-    /// Startup warnings emitted after initialize succeeds.
-    pub config_warnings: Vec<ConfigWarningNotification>,
-    /// Session source recorded in app-server thread metadata.
-    pub session_source: SessionSource,
-    /// Whether auth loading should honor the `CODEX_API_KEY` environment variable.
-    pub enable_codex_api_key_env: bool,
-    /// Client name reported during initialize.
-    pub client_name: String,
-    /// Client version reported during initialize.
-    pub client_version: String,
-    /// Whether experimental APIs are requested at initialize time.
-    pub experimental_api: bool,
-    /// Notification methods this client opts out of receiving.
-    pub opt_out_notification_methods: Vec<String>,
-    /// Queue capacity for command/event channels (clamped to at least 1).
-    pub channel_capacity: usize,
-}
-
-impl InProcessClientStartArgs {
-    /// Builds initialize params from caller-provided metadata.
-    pub fn initialize_params(&self) -> InitializeParams {
-        let capabilities = InitializeCapabilities {
-            experimental_api: self.experimental_api,
-            opt_out_notification_methods: if self.opt_out_notification_methods.is_empty() {
-                None
-            } else {
-                Some(self.opt_out_notification_methods.clone())
-            },
-        };
-
-        InitializeParams {
-            client_info: ClientInfo {
-                name: self.client_name.clone(),
-                title: None,
-                version: self.client_version.clone(),
-            },
-            capabilities: Some(capabilities),
-        }
-    }
-
-    fn into_runtime_start_args(self) -> InProcessStartArgs {
-        let initialize = self.initialize_params();
-        InProcessStartArgs {
-            arg0_paths: self.arg0_paths,
-            config: self.config,
-            cli_overrides: self.cli_overrides,
-            loader_overrides: self.loader_overrides,
-            cloud_requirements: self.cloud_requirements,
-            feedback: self.feedback,
-            config_warnings: self.config_warnings,
-            session_source: self.session_source,
-            enable_codex_api_key_env: self.enable_codex_api_key_env,
-            initialize,
-            channel_capacity: self.channel_capacity,
-        }
-    }
-}
-
-/// Internal command sent from public facade methods to the worker task.
-///
-/// Each variant carries a oneshot sender so the caller can `await` the
-/// result without holding a mutable reference to the client.
-enum ClientCommand {
-    Request {
-        request: Box<ClientRequest>,
-        response_tx: oneshot::Sender<IoResult<RequestResult>>,
-    },
-    Notify {
-        notification: ClientNotification,
-        response_tx: oneshot::Sender<IoResult<()>>,
-    },
-    ResolveServerRequest {
-        request_id: RequestId,
-        result: JsonRpcResult,
-        response_tx: oneshot::Sender<IoResult<()>>,
-    },
-    RejectServerRequest {
-        request_id: RequestId,
-        error: JSONRPCErrorError,
-        response_tx: oneshot::Sender<IoResult<()>>,
-    },
-    Shutdown {
-        response_tx: oneshot::Sender<IoResult<()>>,
-    },
-}
-
-/// Async facade over the in-process app-server runtime.
-///
-/// This type owns a worker task that bridges between:
-/// - caller-facing async `mpsc` channels used by TUI/exec
-/// - [`codex_app_server::in_process::InProcessClientHandle`], which speaks to
-///   the embedded `MessageProcessor`
-///
-/// The facade intentionally preserves the server's request/notification/event
-/// model instead of exposing direct core runtime handles. That keeps in-process
-/// callers aligned with app-server behavior while still avoiding a process
-/// boundary.
-pub struct InProcessAppServerClient {
-    command_tx: mpsc::Sender<ClientCommand>,
-    event_rx: mpsc::Receiver<InProcessServerEvent>,
-    worker_handle: tokio::task::JoinHandle<()>,
-}
-
-impl InProcessAppServerClient {
-    /// Starts the in-process runtime and facade worker task.
-    ///
-    /// The returned client is ready for requests and event consumption. If the
-    /// internal event queue is saturated later, server requests are rejected
-    /// with overload error instead of being silently dropped.
-    pub async fn start(args: InProcessClientStartArgs) -> IoResult<Self> {
-        let channel_capacity = args.channel_capacity.max(1);
-        let mut handle =
-            codex_app_server::in_process::start(args.into_runtime_start_args()).await?;
-        let request_sender = handle.sender();
-        let (command_tx, mut command_rx) = mpsc::channel::<ClientCommand>(channel_capacity);
-        let (event_tx, event_rx) = mpsc::channel::<InProcessServerEvent>(channel_capacity);
-
-        let worker_handle = tokio::spawn(async move {
-            let mut event_stream_enabled = true;
-            let mut skipped_events = 0usize;
-            loop {
-                tokio::select! {
-                    command = command_rx.recv() => {
-                        match command {
-                            Some(ClientCommand::Request { request, response_tx }) => {
-                                let request_sender = request_sender.clone();
-                                // Request waits happen on a detached task so
-                                // this loop can keep draining runtime events
-                                // while the request is blocked on client input.
-                                tokio::spawn(async move {
-                                    let result = request_sender.request(*request).await;
-                                    let _ = response_tx.send(result);
-                                });
-                            }
-                            Some(ClientCommand::Notify {
-                                notification,
-                                response_tx,
-                            }) => {
-                                let result = request_sender.notify(notification);
-                                let _ = response_tx.send(result);
-                            }
-                            Some(ClientCommand::ResolveServerRequest {
-                                request_id,
-                                result,
-                                response_tx,
-                            }) => {
-                                let send_result =
-                                    request_sender.respond_to_server_request(request_id, result);
-                                let _ = response_tx.send(send_result);
-                            }
-                            Some(ClientCommand::RejectServerRequest {
-                                request_id,
-                                error,
-                                response_tx,
-                            }) => {
-                                let send_result = request_sender.fail_server_request(request_id, error);
-                                let _ = response_tx.send(send_result);
-                            }
-                            Some(ClientCommand::Shutdown { response_tx }) => {
-                                let shutdown_result = handle.shutdown().await;
-                                let _ = response_tx.send(shutdown_result);
-                                break;
-                            }
-                            None => {
-                                let _ = handle.shutdown().await;
-                                break;
-                            }
-                        }
-                    }
-                    event = handle.next_event(), if event_stream_enabled => {
-                        let Some(event) = event else {
-                            break;
-                        };
-
-                        if skipped_events > 0 {
-                            if event_requires_delivery(&event) {
-                                // Surface lag before the terminal event, but
-                                // do not let the lag marker itself cause us to
-                                // drop the completion/abort notification that
-                                // the caller is blocked on.
-                                if event_tx
-                                    .send(InProcessServerEvent::Lagged {
-                                        skipped: skipped_events,
-                                    })
-                                    .await
-                                    .is_err()
-                                {
-                                    event_stream_enabled = false;
-                                    continue;
-                                }
-                                skipped_events = 0;
-                            } else {
-                                match event_tx.try_send(InProcessServerEvent::Lagged {
-                                    skipped: skipped_events,
-                                }) {
-                                    Ok(()) => {
-                                        skipped_events = 0;
-                                    }
-                                    Err(mpsc::error::TrySendError::Full(_)) => {
-                                        skipped_events = skipped_events.saturating_add(1);
-                                        warn!(
-                                            "dropping in-process app-server event because consumer queue is full"
-                                        );
-                                        if let InProcessServerEvent::ServerRequest(request) = event {
-                                            let _ = request_sender.fail_server_request(
-                                                request.id().clone(),
-                                                JSONRPCErrorError {
-                                                    code: -32001,
-                                                    message: "in-process app-server event queue is full".to_string(),
-                                                    data: None,
-                                                },
-                                            );
-                                        }
-                                        continue;
-                                    }
-                                    Err(mpsc::error::TrySendError::Closed(_)) => {
-                                        event_stream_enabled = false;
-                                        continue;
-                                    }
-                                }
-                            }
-                        }
-
-                        if event_requires_delivery(&event) {
-                            // Block until the consumer catches up for
-                            // terminal notifications; this preserves the
-                            // completion signal even when the queue is
-                            // otherwise saturated.
-                            if event_tx.send(event).await.is_err() {
-                                event_stream_enabled = false;
-                            }
-                            continue;
-                        }
-
-                        match event_tx.try_send(event) {
-                            Ok(()) => {}
-                            Err(mpsc::error::TrySendError::Full(event)) => {
-                                skipped_events = skipped_events.saturating_add(1);
-                                warn!("dropping in-process app-server event because consumer queue is full");
-                                if let InProcessServerEvent::ServerRequest(request) = event {
-                                    let _ = request_sender.fail_server_request(
-                                        request.id().clone(),
-                                        JSONRPCErrorError {
-                                            code: -32001,
-                                            message: "in-process app-server event queue is full".to_string(),
-                                            data: None,
-                                        },
-                                    );
-                                }
-                            }
-                            Err(mpsc::error::TrySendError::Closed(_)) => {
-                                event_stream_enabled = false;
-                            }
-                        }
-                    }
-                }
-            }
-        });
-
-        Ok(Self {
-            command_tx,
-            event_rx,
-            worker_handle,
-        })
-    }
-
-    /// Sends a typed client request and returns raw JSON-RPC result.
-    ///
-    /// Callers that expect a concrete response type should usually prefer
-    /// [`request_typed`](Self::request_typed).
-    pub async fn request(&self, request: ClientRequest) -> IoResult<RequestResult> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(ClientCommand::Request {
-                request: Box::new(request),
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "in-process app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "in-process app-server request channel is closed",
-            )
-        })?
-    }
-
-    /// Sends a typed client request and decodes the successful response body.
-    ///
-    /// This still deserializes from a JSON value produced by app-server's
-    /// JSON-RPC result envelope. Because the caller chooses `T`, `Deserialize`
-    /// failures indicate an internal request/response mismatch at the call site
-    /// (or an in-process bug), not transport skew from an external client.
-    pub async fn request_typed<T>(&self, request: ClientRequest) -> Result<T, TypedRequestError>
-    where
-        T: DeserializeOwned,
-    {
-        let method = request_method_name(&request);
-        let response =
-            self.request(request)
-                .await
-                .map_err(|source| TypedRequestError::Transport {
-                    method: method.clone(),
-                    source,
-                })?;
-        let result = response.map_err(|source| TypedRequestError::Server {
-            method: method.clone(),
-            source,
-        })?;
-        serde_json::from_value(result)
-            .map_err(|source| TypedRequestError::Deserialize { method, source })
-    }
-
-    /// Sends a typed client notification.
-    pub async fn notify(&self, notification: ClientNotification) -> IoResult<()> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(ClientCommand::Notify {
-                notification,
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "in-process app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "in-process app-server notify channel is closed",
-            )
-        })?
-    }
-
-    /// Resolves a pending server request.
-    ///
-    /// This should only be called with request IDs obtained from the current
-    /// client's event stream.
-    pub async fn resolve_server_request(
-        &self,
-        request_id: RequestId,
-        result: JsonRpcResult,
-    ) -> IoResult<()> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(ClientCommand::ResolveServerRequest {
-                request_id,
-                result,
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "in-process app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "in-process app-server resolve channel is closed",
-            )
-        })?
-    }
-
-    /// Rejects a pending server request with JSON-RPC error payload.
-    pub async fn reject_server_request(
-        &self,
-        request_id: RequestId,
-        error: JSONRPCErrorError,
-    ) -> IoResult<()> {
-        let (response_tx, response_rx) = oneshot::channel();
-        self.command_tx
-            .send(ClientCommand::RejectServerRequest {
-                request_id,
-                error,
-                response_tx,
-            })
-            .await
-            .map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "in-process app-server worker channel is closed",
-                )
-            })?;
-        response_rx.await.map_err(|_| {
-            IoError::new(
-                ErrorKind::BrokenPipe,
-                "in-process app-server reject channel is closed",
-            )
-        })?
-    }
-
-    /// Returns the next in-process event, or `None` when worker exits.
-    ///
-    /// Callers are expected to drain this stream promptly. If they fall behind,
-    /// the worker emits [`InProcessServerEvent::Lagged`] markers and may reject
-    /// pending server requests rather than letting approval flows hang.
-    pub async fn next_event(&mut self) -> Option<InProcessServerEvent> {
-        self.event_rx.recv().await
-    }
-
-    /// Shuts down worker and in-process runtime with bounded wait.
-    ///
-    /// If graceful shutdown exceeds timeout, the worker task is aborted to
-    /// avoid leaking background tasks in embedding callers.
-    pub async fn shutdown(self) -> IoResult<()> {
-        let Self {
-            command_tx,
-            event_rx,
-            worker_handle,
-        } = self;
-        let mut worker_handle = worker_handle;
-        // Drop the caller-facing receiver before asking the worker to shut
-        // down. That unblocks any pending must-deliver `event_tx.send(..)`
-        // so the worker can reach `handle.shutdown()` instead of timing out
-        // and getting aborted with the runtime still attached.
-        drop(event_rx);
-        let (response_tx, response_rx) = oneshot::channel();
-        if command_tx
-            .send(ClientCommand::Shutdown { response_tx })
-            .await
-            .is_ok()
-            && let Ok(command_result) = timeout(SHUTDOWN_TIMEOUT, response_rx).await
-        {
-            command_result.map_err(|_| {
-                IoError::new(
-                    ErrorKind::BrokenPipe,
-                    "in-process app-server shutdown channel is closed",
-                )
-            })??;
-        }
-
-        if let Err(_elapsed) = timeout(SHUTDOWN_TIMEOUT, &mut worker_handle).await {
-            worker_handle.abort();
-            let _ = worker_handle.await;
-        }
-        Ok(())
-    }
-}
-
-/// Extracts the JSON-RPC method name for diagnostics without extending the
-/// protocol crate with in-process-only helpers.
-fn request_method_name(request: &ClientRequest) -> String {
-    serde_json::to_value(request)
-        .ok()
-        .and_then(|value| {
-            value
-                .get("method")
-                .and_then(serde_json::Value::as_str)
-                .map(ToOwned::to_owned)
-        })
-        .unwrap_or_else(|| "<unknown>".to_string())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use codex_app_server_protocol::ConfigRequirementsReadResponse;
-    use codex_app_server_protocol::SessionSource as ApiSessionSource;
-    use codex_app_server_protocol::ThreadStartParams;
-    use codex_app_server_protocol::ThreadStartResponse;
-    use codex_core::config::ConfigBuilder;
-    use pretty_assertions::assert_eq;
-    use tokio::time::Duration;
-    use tokio::time::timeout;
-
-    async fn build_test_config() -> Config {
-        match ConfigBuilder::default().build().await {
-            Ok(config) => config,
-            Err(_) => Config::load_default_with_cli_overrides(Vec::new())
-                .expect("default config should load"),
-        }
-    }
-
-    async fn start_test_client_with_capacity(
-        session_source: SessionSource,
-        channel_capacity: usize,
-    ) -> InProcessAppServerClient {
-        InProcessAppServerClient::start(InProcessClientStartArgs {
-            arg0_paths: Arg0DispatchPaths::default(),
-            config: Arc::new(build_test_config().await),
-            cli_overrides: Vec::new(),
-            loader_overrides: LoaderOverrides::default(),
-            cloud_requirements: CloudRequirementsLoader::default(),
-            feedback: CodexFeedback::new(),
-            config_warnings: Vec::new(),
-            session_source,
-            enable_codex_api_key_env: false,
-            client_name: "codex-app-server-client-test".to_string(),
-            client_version: "0.0.0-test".to_string(),
-            experimental_api: true,
-            opt_out_notification_methods: Vec::new(),
-            channel_capacity,
-        })
-        .await
-        .expect("in-process app-server client should start")
-    }
-
-    async fn start_test_client(session_source: SessionSource) -> InProcessAppServerClient {
-        start_test_client_with_capacity(session_source, DEFAULT_IN_PROCESS_CHANNEL_CAPACITY).await
-    }
-
-    #[tokio::test]
-    async fn typed_request_roundtrip_works() {
-        let client = start_test_client(SessionSource::Exec).await;
-        let _response: ConfigRequirementsReadResponse = client
-            .request_typed(ClientRequest::ConfigRequirementsRead {
-                request_id: RequestId::Integer(1),
-                params: None,
-            })
-            .await
-            .expect("typed request should succeed");
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[tokio::test]
-    async fn typed_request_reports_json_rpc_errors() {
-        let client = start_test_client(SessionSource::Exec).await;
-        let err = client
-            .request_typed::<ConfigRequirementsReadResponse>(ClientRequest::ThreadRead {
-                request_id: RequestId::Integer(99),
-                params: codex_app_server_protocol::ThreadReadParams {
-                    thread_id: "missing-thread".to_string(),
-                    include_turns: false,
-                },
-            })
-            .await
-            .expect_err("missing thread should return a JSON-RPC error");
-        assert!(
-            err.to_string().starts_with("thread/read failed:"),
-            "expected method-qualified JSON-RPC failure message"
-        );
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[tokio::test]
-    async fn caller_provided_session_source_is_applied() {
-        for (session_source, expected_source) in [
-            (SessionSource::Exec, ApiSessionSource::Exec),
-            (SessionSource::Cli, ApiSessionSource::Cli),
-        ] {
-            let client = start_test_client(session_source).await;
-            let parsed: ThreadStartResponse = client
-                .request_typed(ClientRequest::ThreadStart {
-                    request_id: RequestId::Integer(2),
-                    params: ThreadStartParams {
-                        ephemeral: Some(true),
-                        ..ThreadStartParams::default()
-                    },
-                })
-                .await
-                .expect("thread/start should succeed");
-            assert_eq!(parsed.thread.source, expected_source);
-            client.shutdown().await.expect("shutdown should complete");
-        }
-    }
-
-    #[tokio::test]
-    async fn tiny_channel_capacity_still_supports_request_roundtrip() {
-        let client = start_test_client_with_capacity(SessionSource::Exec, 1).await;
-        let _response: ConfigRequirementsReadResponse = client
-            .request_typed(ClientRequest::ConfigRequirementsRead {
-                request_id: RequestId::Integer(1),
-                params: None,
-            })
-            .await
-            .expect("typed request should succeed");
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[test]
-    fn typed_request_error_exposes_sources() {
-        let transport = TypedRequestError::Transport {
-            method: "config/read".to_string(),
-            source: IoError::new(ErrorKind::BrokenPipe, "closed"),
-        };
-        assert_eq!(std::error::Error::source(&transport).is_some(), true);
-
-        let server = TypedRequestError::Server {
-            method: "thread/read".to_string(),
-            source: JSONRPCErrorError {
-                code: -32603,
-                data: None,
-                message: "internal".to_string(),
-            },
-        };
-        assert_eq!(std::error::Error::source(&server).is_some(), false);
-
-        let deserialize = TypedRequestError::Deserialize {
-            method: "thread/start".to_string(),
-            source: serde_json::from_str::<u32>("\"nope\"")
-                .expect_err("invalid integer should return deserialize error"),
-        };
-        assert_eq!(std::error::Error::source(&deserialize).is_some(), true);
-    }
-
-    #[tokio::test]
-    async fn next_event_surfaces_lagged_markers() {
-        let (command_tx, _command_rx) = mpsc::channel(1);
-        let (event_tx, event_rx) = mpsc::channel(1);
-        let worker_handle = tokio::spawn(async {});
-        event_tx
-            .send(InProcessServerEvent::Lagged { skipped: 3 })
-            .await
-            .expect("lagged marker should enqueue");
-        drop(event_tx);
-
-        let mut client = InProcessAppServerClient {
-            command_tx,
-            event_rx,
-            worker_handle,
-        };
-
-        let event = timeout(Duration::from_secs(2), client.next_event())
-            .await
-            .expect("lagged marker should arrive before timeout");
-        assert!(matches!(
-            event,
-            Some(InProcessServerEvent::Lagged { skipped: 3 })
-        ));
-
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
-    #[test]
-    fn event_requires_delivery_marks_terminal_events() {
-        assert!(event_requires_delivery(
-            &InProcessServerEvent::ServerNotification(
-                codex_app_server_protocol::ServerNotification::TurnCompleted(
-                    codex_app_server_protocol::TurnCompletedNotification {
-                        thread_id: "thread".to_string(),
-                        turn: codex_app_server_protocol::Turn {
-                            id: "turn".to_string(),
-                            items: Vec::new(),
-                            status: codex_app_server_protocol::TurnStatus::Completed,
-                            error: None,
-                        },
-                    }
-                )
-            )
-        ));
-        assert!(event_requires_delivery(
-            &InProcessServerEvent::LegacyNotification(
-                codex_app_server_protocol::JSONRPCNotification {
-                    method: "codex/event/turn_aborted".to_string(),
-                    params: None,
-                }
-            )
-        ));
-        assert!(!event_requires_delivery(&InProcessServerEvent::Lagged {
-            skipped: 1
-        }));
-    }
-}

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

@@ -57,9 +57,6 @@
                 "mcp_elicitations": {
                   "type": "boolean"
                 },
-                "request_permissions": {
-                  "type": "boolean"
-                },
                 "rules": {
                   "type": "boolean"
                 },
@@ -69,7 +66,6 @@
               },
               "required": [
                 "mcp_elicitations",
-                "request_permissions",
                 "rules",
                 "sandbox_approval"
               ],
@@ -152,54 +148,14 @@
       "type": "object"
     },
     "CommandExecParams": {
-      "description": "Run a standalone command (argv vector) in the server sandbox without creating a thread or turn.\n\nThe final `command/exec` response is deferred until the process exits and is sent only after all `command/exec/outputDelta` notifications for that connection have been emitted.",
       "properties": {
         "command": {
-          "description": "Command argv vector. Empty arrays are rejected.",
           "items": {
             "type": "string"
           },
           "type": "array"
         },
         "cwd": {
-          "description": "Optional working directory. Defaults to the server cwd.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "disableOutputCap": {
-          "description": "Disable stdout/stderr capture truncation for this request.\n\nCannot be combined with `outputBytesCap`.",
-          "type": "boolean"
-        },
-        "disableTimeout": {
-          "description": "Disable the timeout entirely for this request.\n\nCannot be combined with `timeoutMs`.",
-          "type": "boolean"
-        },
-        "env": {
-          "additionalProperties": {
-            "type": [
-              "string",
-              "null"
-            ]
-          },
-          "description": "Optional environment overrides merged into the server-computed environment.\n\nMatching names override inherited values. Set a key to `null` to unset an inherited variable.",
-          "type": [
-            "object",
-            "null"
-          ]
-        },
-        "outputBytesCap": {
-          "description": "Optional per-stream stdout/stderr capture cap in bytes.\n\nWhen omitted, the server default applies. Cannot be combined with `disableOutputCap`.",
-          "format": "uint",
-          "minimum": 0.0,
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "processId": {
-          "description": "Optional client-supplied, connection-scoped process id.\n\nRequired for `tty`, `streamStdin`, `streamStdoutStderr`, and follow-up `command/exec/write`, `command/exec/resize`, and `command/exec/terminate` calls. When omitted, buffered execution gets an internal id that is not exposed to the client.",
           "type": [
             "string",
             "null"
@@ -213,39 +169,14 @@
             {
               "type": "null"
             }
-          ],
-          "description": "Optional sandbox policy for this command.\n\nUses the same shape as thread/turn execution sandbox configuration and defaults to the user's configured policy when omitted."
-        },
-        "size": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/CommandExecTerminalSize"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional initial PTY size in character cells. Only valid when `tty` is true."
-        },
-        "streamStdin": {
-          "description": "Allow follow-up `command/exec/write` requests to write stdin bytes.\n\nRequires a client-supplied `processId`.",
-          "type": "boolean"
-        },
-        "streamStdoutStderr": {
-          "description": "Stream stdout/stderr via `command/exec/outputDelta` notifications.\n\nStreamed bytes are not duplicated into the final response and require a client-supplied `processId`.",
-          "type": "boolean"
+          ]
         },
         "timeoutMs": {
-          "description": "Optional timeout in milliseconds.\n\nWhen omitted, the server default applies. Cannot be combined with `disableTimeout`.",
           "format": "int64",
           "type": [
             "integer",
             "null"
           ]
-        },
-        "tty": {
-          "description": "Enable PTY mode.\n\nThis implies `streamStdin` and `streamStdoutStderr`.",
-          "type": "boolean"
         }
       },
       "required": [
@@ -253,87 +184,6 @@
       ],
       "type": "object"
     },
-    "CommandExecResizeParams": {
-      "description": "Resize a running PTY-backed `command/exec` session.",
-      "properties": {
-        "processId": {
-          "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-          "type": "string"
-        },
-        "size": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/CommandExecTerminalSize"
-            }
-          ],
-          "description": "New PTY size in character cells."
-        }
-      },
-      "required": [
-        "processId",
-        "size"
-      ],
-      "type": "object"
-    },
-    "CommandExecTerminalSize": {
-      "description": "PTY size in character cells for `command/exec` PTY sessions.",
-      "properties": {
-        "cols": {
-          "description": "Terminal width in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "rows": {
-          "description": "Terminal height in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        }
-      },
-      "required": [
-        "cols",
-        "rows"
-      ],
-      "type": "object"
-    },
-    "CommandExecTerminateParams": {
-      "description": "Terminate a running `command/exec` session.",
-      "properties": {
-        "processId": {
-          "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-          "type": "string"
-        }
-      },
-      "required": [
-        "processId"
-      ],
-      "type": "object"
-    },
-    "CommandExecWriteParams": {
-      "description": "Write stdin bytes to a running `command/exec` session, close stdin, or both.",
-      "properties": {
-        "closeStdin": {
-          "description": "Close stdin after writing `deltaBase64`, if present.",
-          "type": "boolean"
-        },
-        "deltaBase64": {
-          "description": "Optional base64-encoded stdin bytes to write.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "processId": {
-          "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-          "type": "string"
-        }
-      },
-      "required": [
-        "processId"
-      ],
-      "type": "object"
-    },
     "ConfigBatchWriteParams": {
       "properties": {
         "edits": {
@@ -354,10 +204,6 @@
             "string",
             "null"
           ]
-        },
-        "reloadUserConfig": {
-          "description": "When true, hot-reload the updated user config into all loaded threads after writing.",
-          "type": "boolean"
         }
       },
       "required": [
@@ -1123,7 +969,7 @@
     "PluginListParams": {
       "properties": {
         "cwds": {
-          "description": "Optional working directories used to discover repo marketplaces. When omitted, only home-scoped marketplaces and the official curated marketplace are considered.",
+          "description": "Optional working directories used to discover repo marketplaces. When omitted, only home-scoped marketplaces are considered.",
           "items": {
             "$ref": "#/definitions/AbsolutePathBuf"
           },
@@ -1135,17 +981,6 @@
       },
       "type": "object"
     },
-    "PluginUninstallParams": {
-      "properties": {
-        "pluginId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "pluginId"
-      ],
-      "type": "object"
-    },
     "ProductSurface": {
       "enum": [
         "chatgpt",
@@ -1577,7 +1412,7 @@
             "action": {
               "anyOf": [
                 {
-                  "$ref": "#/definitions/ResponsesApiWebSearchAction"
+                  "$ref": "#/definitions/WebSearchAction"
                 },
                 {
                   "type": "null"
@@ -1703,107 +1538,6 @@
         }
       ]
     },
-    "ResponsesApiWebSearchAction": {
-      "oneOf": [
-        {
-          "properties": {
-            "queries": {
-              "items": {
-                "type": "string"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "query": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "search"
-              ],
-              "title": "SearchResponsesApiWebSearchActionType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "SearchResponsesApiWebSearchAction",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "type": {
-              "enum": [
-                "open_page"
-              ],
-              "title": "OpenPageResponsesApiWebSearchActionType",
-              "type": "string"
-            },
-            "url": {
-              "type": [
-                "string",
-                "null"
-              ]
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "OpenPageResponsesApiWebSearchAction",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "pattern": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "find_in_page"
-              ],
-              "title": "FindInPageResponsesApiWebSearchActionType",
-              "type": "string"
-            },
-            "url": {
-              "type": [
-                "string",
-                "null"
-              ]
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "FindInPageResponsesApiWebSearchAction",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "type": {
-              "enum": [
-                "other"
-              ],
-              "title": "OtherResponsesApiWebSearchActionType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "OtherResponsesApiWebSearchAction",
-          "type": "object"
-        }
-      ]
-    },
     "ReviewDelivery": {
       "enum": [
         "inline",
@@ -3050,6 +2784,107 @@
         }
       ]
     },
+    "WebSearchAction": {
+      "oneOf": [
+        {
+          "properties": {
+            "queries": {
+              "items": {
+                "type": "string"
+              },
+              "type": [
+                "array",
+                "null"
+              ]
+            },
+            "query": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "type": {
+              "enum": [
+                "search"
+              ],
+              "title": "SearchWebSearchActionType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "SearchWebSearchAction",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "open_page"
+              ],
+              "title": "OpenPageWebSearchActionType",
+              "type": "string"
+            },
+            "url": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "OpenPageWebSearchAction",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "pattern": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "type": {
+              "enum": [
+                "find_in_page"
+              ],
+              "title": "FindInPageWebSearchActionType",
+              "type": "string"
+            },
+            "url": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "FindInPageWebSearchAction",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "other"
+              ],
+              "title": "OtherWebSearchActionType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "OtherWebSearchAction",
+          "type": "object"
+        }
+      ]
+    },
     "WindowsSandboxSetupMode": {
       "enum": [
         "elevated",
@@ -3060,13 +2895,9 @@
     "WindowsSandboxSetupStartParams": {
       "properties": {
         "cwd": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            {
-              "type": "null"
-            }
+          "type": [
+            "string",
+            "null"
           ]
         },
         "mode": {
@@ -3586,30 +3417,6 @@
       "title": "Plugin/installRequest",
       "type": "object"
     },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "plugin/uninstall"
-          ],
-          "title": "Plugin/uninstallRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/PluginUninstallParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Plugin/uninstallRequest",
-      "type": "object"
-    },
     {
       "properties": {
         "id": {
@@ -3968,7 +3775,7 @@
       "type": "object"
     },
     {
-      "description": "Execute a standalone command (argv vector) under the server's sandbox.",
+      "description": "Execute a command (argv vector) under the server's sandbox.",
       "properties": {
         "id": {
           "$ref": "#/definitions/RequestId"
@@ -3992,81 +3799,6 @@
       "title": "Command/execRequest",
       "type": "object"
     },
-    {
-      "description": "Write stdin bytes to a running `command/exec` session or close stdin.",
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "command/exec/write"
-          ],
-          "title": "Command/exec/writeRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/CommandExecWriteParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Command/exec/writeRequest",
-      "type": "object"
-    },
-    {
-      "description": "Terminate a running `command/exec` session by client-supplied `processId`.",
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "command/exec/terminate"
-          ],
-          "title": "Command/exec/terminateRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/CommandExecTerminateParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Command/exec/terminateRequest",
-      "type": "object"
-    },
-    {
-      "description": "Resize a running PTY-backed `command/exec` session by client-supplied `processId`.",
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "command/exec/resize"
-          ],
-          "title": "Command/exec/resizeRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/CommandExecResizeParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Command/exec/resizeRequest",
-      "type": "object"
-    },
     {
       "properties": {
         "id": {

codex-rs/app-server-protocol/schema/json/CommandExecutionRequestApprovalParams.json

@@ -286,17 +286,6 @@
         }
       ]
     },
-    "CommandExecutionRequestApprovalSkillMetadata": {
-      "properties": {
-        "pathToSkillsMd": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "pathToSkillsMd"
-      ],
-      "type": "object"
-    },
     "MacOsAutomationPermission": {
       "oneOf": [
         {

codex-rs/app-server-protocol/schema/json/EventMsg.json

@@ -29,6 +29,14 @@
         }
       ]
     },
+    "AgentSpawnMode": {
+      "enum": [
+        "spawn",
+        "fork",
+        "watchdog"
+      ],
+      "type": "string"
+    },
     "AgentStatus": {
       "description": "Agent lifecycle status, derived from emitted events.",
       "oneOf": [
@@ -1414,7 +1422,7 @@
         {
           "properties": {
             "action": {
-              "$ref": "#/definitions/ResponsesApiWebSearchAction"
+              "$ref": "#/definitions/WebSearchAction"
             },
             "call_id": {
               "type": "string"
@@ -1866,17 +1874,6 @@
                 "null"
               ]
             },
-            "skill_metadata": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/ExecApprovalRequestSkillMetadata"
-                },
-                {
-                  "type": "null"
-                }
-              ],
-              "description": "Optional skill metadata when the approval was triggered by a skill script."
-            },
             "turn_id": {
               "default": "",
               "description": "Turn ID that this command belongs to. Uses `#[serde(default)]` for backwards compatibility.",
@@ -1900,42 +1897,6 @@
           "title": "ExecApprovalRequestEventMsg",
           "type": "object"
         },
-        {
-          "properties": {
-            "call_id": {
-              "description": "Responses API call id for the associated tool call, if available.",
-              "type": "string"
-            },
-            "permissions": {
-              "$ref": "#/definitions/PermissionProfile"
-            },
-            "reason": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "turn_id": {
-              "default": "",
-              "description": "Turn ID that this request belongs to. Uses `#[serde(default)]` for backwards compatibility.",
-              "type": "string"
-            },
-            "type": {
-              "enum": [
-                "request_permissions"
-              ],
-              "title": "RequestPermissionsEventMsgType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "call_id",
-            "permissions",
-            "type"
-          ],
-          "title": "RequestPermissionsEventMsg",
-          "type": "object"
-        },
         {
           "properties": {
             "call_id": {
@@ -3036,6 +2997,15 @@
               ],
               "description": "Thread ID of the sender."
             },
+            "spawn_mode": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/AgentSpawnMode"
+                }
+              ],
+              "default": "spawn",
+              "description": "Spawn mode used for this agent."
+            },
             "status": {
               "allOf": [
                 {
@@ -3489,17 +3459,6 @@
         }
       ]
     },
-    "ExecApprovalRequestSkillMetadata": {
-      "properties": {
-        "path_to_skills_md": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "path_to_skills_md"
-      ],
-      "type": "object"
-    },
     "ExecCommandSource": {
       "enum": [
         "agent",
@@ -4683,10 +4642,6 @@
           "description": "Reject MCP elicitation prompts.",
           "type": "boolean"
         },
-        "request_permissions": {
-          "description": "Reject approval prompts related to built-in permission requests.",
-          "type": "boolean"
-        },
         "rules": {
           "description": "Reject prompts triggered by execpolicy `prompt` rules.",
           "type": "boolean"
@@ -4698,7 +4653,6 @@
       },
       "required": [
         "mcp_elicitations",
-        "request_permissions",
         "rules",
         "sandbox_approval"
       ],
@@ -5135,7 +5089,7 @@
             "action": {
               "anyOf": [
                 {
-                  "$ref": "#/definitions/ResponsesApiWebSearchAction"
+                  "$ref": "#/definitions/WebSearchAction"
                 },
                 {
                   "type": "null"
@@ -5261,107 +5215,6 @@
         }
       ]
     },
-    "ResponsesApiWebSearchAction": {
-      "oneOf": [
-        {
-          "properties": {
-            "queries": {
-              "items": {
-                "type": "string"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "query": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "search"
-              ],
-              "title": "SearchResponsesApiWebSearchActionType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "SearchResponsesApiWebSearchAction",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "type": {
-              "enum": [
-                "open_page"
-              ],
-              "title": "OpenPageResponsesApiWebSearchActionType",
-              "type": "string"
-            },
-            "url": {
-              "type": [
-                "string",
-                "null"
-              ]
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "OpenPageResponsesApiWebSearchAction",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "pattern": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "find_in_page"
-              ],
-              "title": "FindInPageResponsesApiWebSearchActionType",
-              "type": "string"
-            },
-            "url": {
-              "type": [
-                "string",
-                "null"
-              ]
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "FindInPageResponsesApiWebSearchAction",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "type": {
-              "enum": [
-                "other"
-              ],
-              "title": "OtherResponsesApiWebSearchActionType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "OtherResponsesApiWebSearchAction",
-          "type": "object"
-        }
-      ]
-    },
     "Result_of_CallToolResult_or_String": {
       "oneOf": [
         {
@@ -6259,7 +6112,7 @@
         {
           "properties": {
             "action": {
-              "$ref": "#/definitions/ResponsesApiWebSearchAction"
+              "$ref": "#/definitions/WebSearchAction"
             },
             "id": {
               "type": "string"
@@ -6470,6 +6323,107 @@
           "type": "object"
         }
       ]
+    },
+    "WebSearchAction": {
+      "oneOf": [
+        {
+          "properties": {
+            "queries": {
+              "items": {
+                "type": "string"
+              },
+              "type": [
+                "array",
+                "null"
+              ]
+            },
+            "query": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "type": {
+              "enum": [
+                "search"
+              ],
+              "title": "SearchWebSearchActionType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "SearchWebSearchAction",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "open_page"
+              ],
+              "title": "OpenPageWebSearchActionType",
+              "type": "string"
+            },
+            "url": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "OpenPageWebSearchAction",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "pattern": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "type": {
+              "enum": [
+                "find_in_page"
+              ],
+              "title": "FindInPageWebSearchActionType",
+              "type": "string"
+            },
+            "url": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "FindInPageWebSearchAction",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "other"
+              ],
+              "title": "OtherWebSearchActionType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "OtherWebSearchAction",
+          "type": "object"
+        }
+      ]
     }
   },
   "description": "Response event from the agent NOTE: Make sure none of these values have optional types, as it will mess up the extension code-gen.",
@@ -7289,7 +7243,7 @@
     {
       "properties": {
         "action": {
-          "$ref": "#/definitions/ResponsesApiWebSearchAction"
+          "$ref": "#/definitions/WebSearchAction"
         },
         "call_id": {
           "type": "string"
@@ -7741,17 +7695,6 @@
             "null"
           ]
         },
-        "skill_metadata": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ExecApprovalRequestSkillMetadata"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Optional skill metadata when the approval was triggered by a skill script."
-        },
         "turn_id": {
           "default": "",
           "description": "Turn ID that this command belongs to. Uses `#[serde(default)]` for backwards compatibility.",
@@ -7775,42 +7718,6 @@
       "title": "ExecApprovalRequestEventMsg",
       "type": "object"
     },
-    {
-      "properties": {
-        "call_id": {
-          "description": "Responses API call id for the associated tool call, if available.",
-          "type": "string"
-        },
-        "permissions": {
-          "$ref": "#/definitions/PermissionProfile"
-        },
-        "reason": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "turn_id": {
-          "default": "",
-          "description": "Turn ID that this request belongs to. Uses `#[serde(default)]` for backwards compatibility.",
-          "type": "string"
-        },
-        "type": {
-          "enum": [
-            "request_permissions"
-          ],
-          "title": "RequestPermissionsEventMsgType",
-          "type": "string"
-        }
-      },
-      "required": [
-        "call_id",
-        "permissions",
-        "type"
-      ],
-      "title": "RequestPermissionsEventMsg",
-      "type": "object"
-    },
     {
       "properties": {
         "call_id": {
@@ -8911,6 +8818,15 @@
           ],
           "description": "Thread ID of the sender."
         },
+        "spawn_mode": {
+          "allOf": [
+            {
+              "$ref": "#/definitions/AgentSpawnMode"
+            }
+          ],
+          "default": "spawn",
+          "description": "Spawn mode used for this agent."
+        },
         "status": {
           "allOf": [
             {

codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalParams.json

@@ -1,164 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "AbsolutePathBuf": {
-      "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-      "type": "string"
-    },
-    "AdditionalFileSystemPermissions": {
-      "properties": {
-        "read": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "write": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "AdditionalMacOsPermissions": {
-      "properties": {
-        "accessibility": {
-          "type": "boolean"
-        },
-        "automations": {
-          "$ref": "#/definitions/MacOsAutomationPermission"
-        },
-        "calendar": {
-          "type": "boolean"
-        },
-        "preferences": {
-          "$ref": "#/definitions/MacOsPreferencesPermission"
-        }
-      },
-      "required": [
-        "accessibility",
-        "automations",
-        "calendar",
-        "preferences"
-      ],
-      "type": "object"
-    },
-    "AdditionalNetworkPermissions": {
-      "properties": {
-        "enabled": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "AdditionalPermissionProfile": {
-      "properties": {
-        "fileSystem": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalFileSystemPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "macos": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalMacOsPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "network": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalNetworkPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "MacOsAutomationPermission": {
-      "oneOf": [
-        {
-          "enum": [
-            "none",
-            "all"
-          ],
-          "type": "string"
-        },
-        {
-          "additionalProperties": false,
-          "properties": {
-            "bundle_ids": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          "required": [
-            "bundle_ids"
-          ],
-          "title": "BundleIdsMacOsAutomationPermission",
-          "type": "object"
-        }
-      ]
-    },
-    "MacOsPreferencesPermission": {
-      "enum": [
-        "none",
-        "read_only",
-        "read_write"
-      ],
-      "type": "string"
-    }
-  },
-  "properties": {
-    "itemId": {
-      "type": "string"
-    },
-    "permissions": {
-      "$ref": "#/definitions/AdditionalPermissionProfile"
-    },
-    "reason": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "threadId": {
-      "type": "string"
-    },
-    "turnId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "itemId",
-    "permissions",
-    "threadId",
-    "turnId"
-  ],
-  "title": "PermissionsRequestApprovalParams",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalResponse.json

@@ -1,175 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "AbsolutePathBuf": {
-      "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-      "type": "string"
-    },
-    "AdditionalFileSystemPermissions": {
-      "properties": {
-        "read": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "write": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "AdditionalNetworkPermissions": {
-      "properties": {
-        "enabled": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "GrantedMacOsPermissions": {
-      "properties": {
-        "accessibility": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
-        "automations": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/MacOsAutomationPermission"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "calendar": {
-          "type": [
-            "boolean",
-            "null"
-          ]
-        },
-        "preferences": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/MacOsPreferencesPermission"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "GrantedPermissionProfile": {
-      "properties": {
-        "fileSystem": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalFileSystemPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "macos": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/GrantedMacOsPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "network": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AdditionalNetworkPermissions"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "type": "object"
-    },
-    "MacOsAutomationPermission": {
-      "oneOf": [
-        {
-          "enum": [
-            "none",
-            "all"
-          ],
-          "type": "string"
-        },
-        {
-          "additionalProperties": false,
-          "properties": {
-            "bundle_ids": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            }
-          },
-          "required": [
-            "bundle_ids"
-          ],
-          "title": "BundleIdsMacOsAutomationPermission",
-          "type": "object"
-        }
-      ]
-    },
-    "MacOsPreferencesPermission": {
-      "enum": [
-        "none",
-        "read_only",
-        "read_write"
-      ],
-      "type": "string"
-    },
-    "PermissionGrantScope": {
-      "enum": [
-        "turn",
-        "session"
-      ],
-      "type": "string"
-    }
-  },
-  "properties": {
-    "permissions": {
-      "$ref": "#/definitions/GrantedPermissionProfile"
-    },
-    "scope": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/PermissionGrantScope"
-        }
-      ],
-      "default": "turn"
-    }
-  },
-  "required": [
-    "permissions"
-  ],
-  "title": "PermissionsRequestApprovalResponse",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/ServerNotification.json

@@ -670,57 +670,6 @@
         }
       ]
     },
-    "CommandExecOutputDeltaNotification": {
-      "description": "Base64-encoded output chunk emitted for a streaming `command/exec` request.\n\nThese notifications are connection-scoped. If the originating connection closes, the server terminates the process.",
-      "properties": {
-        "capReached": {
-          "description": "`true` on the final streamed chunk for a stream when `outputBytesCap` truncated later output on that stream.",
-          "type": "boolean"
-        },
-        "deltaBase64": {
-          "description": "Base64-encoded output bytes.",
-          "type": "string"
-        },
-        "processId": {
-          "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-          "type": "string"
-        },
-        "stream": {
-          "allOf": [
-            {
-              "$ref": "#/definitions/CommandExecOutputStream"
-            }
-          ],
-          "description": "Output stream for this chunk."
-        }
-      },
-      "required": [
-        "capReached",
-        "deltaBase64",
-        "processId",
-        "stream"
-      ],
-      "type": "object"
-    },
-    "CommandExecOutputStream": {
-      "description": "Stream label for `command/exec/outputDelta` notifications.",
-      "oneOf": [
-        {
-          "description": "stdout stream. PTY mode multiplexes terminal output here.",
-          "enum": [
-            "stdout"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "stderr stream.",
-          "enum": [
-            "stderr"
-          ],
-          "type": "string"
-        }
-      ]
-    },
     "CommandExecutionOutputDeltaNotification": {
       "properties": {
         "delta": {
@@ -3519,27 +3468,6 @@
       "title": "Item/plan/deltaNotification",
       "type": "object"
     },
-    {
-      "description": "Stream base64-encoded stdout/stderr chunks for a running `command/exec` session.",
-      "properties": {
-        "method": {
-          "enum": [
-            "command/exec/outputDelta"
-          ],
-          "title": "Command/exec/outputDeltaNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/CommandExecOutputDeltaNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Command/exec/outputDeltaNotification",
-      "type": "object"
-    },
     {
       "properties": {
         "method": {

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

@@ -440,17 +440,6 @@
       ],
       "type": "object"
     },
-    "CommandExecutionRequestApprovalSkillMetadata": {
-      "properties": {
-        "pathToSkillsMd": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "pathToSkillsMd"
-      ],
-      "type": "object"
-    },
     "DynamicToolCallParams": {
       "properties": {
         "arguments": true,
@@ -1423,35 +1412,6 @@
         }
       ]
     },
-    "PermissionsRequestApprovalParams": {
-      "properties": {
-        "itemId": {
-          "type": "string"
-        },
-        "permissions": {
-          "$ref": "#/definitions/AdditionalPermissionProfile"
-        },
-        "reason": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "threadId": {
-          "type": "string"
-        },
-        "turnId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "itemId",
-        "permissions",
-        "threadId",
-        "turnId"
-      ],
-      "type": "object"
-    },
     "RequestId": {
       "anyOf": [
         {
@@ -1649,31 +1609,6 @@
       "title": "McpServer/elicitation/requestRequest",
       "type": "object"
     },
-    {
-      "description": "Request approval for additional permissions from the user.",
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "item/permissions/requestApproval"
-          ],
-          "title": "Item/permissions/requestApprovalRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/PermissionsRequestApprovalParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Item/permissions/requestApprovalRequest",
-      "type": "object"
-    },
     {
       "description": "Execute a dynamic tool call on the client.",
       "properties": {

codex-rs/app-server-protocol/schema/json/v2/CommandExecOutputDeltaNotification.json

@@ -1,55 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "CommandExecOutputStream": {
-      "description": "Stream label for `command/exec/outputDelta` notifications.",
-      "oneOf": [
-        {
-          "description": "stdout stream. PTY mode multiplexes terminal output here.",
-          "enum": [
-            "stdout"
-          ],
-          "type": "string"
-        },
-        {
-          "description": "stderr stream.",
-          "enum": [
-            "stderr"
-          ],
-          "type": "string"
-        }
-      ]
-    }
-  },
-  "description": "Base64-encoded output chunk emitted for a streaming `command/exec` request.\n\nThese notifications are connection-scoped. If the originating connection closes, the server terminates the process.",
-  "properties": {
-    "capReached": {
-      "description": "`true` on the final streamed chunk for a stream when `outputBytesCap` truncated later output on that stream.",
-      "type": "boolean"
-    },
-    "deltaBase64": {
-      "description": "Base64-encoded output bytes.",
-      "type": "string"
-    },
-    "processId": {
-      "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-      "type": "string"
-    },
-    "stream": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/CommandExecOutputStream"
-        }
-      ],
-      "description": "Output stream for this chunk."
-    }
-  },
-  "required": [
-    "capReached",
-    "deltaBase64",
-    "processId",
-    "stream"
-  ],
-  "title": "CommandExecOutputDeltaNotification",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/CommandExecParams.json

@@ -5,28 +5,6 @@
       "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
       "type": "string"
     },
-    "CommandExecTerminalSize": {
-      "description": "PTY size in character cells for `command/exec` PTY sessions.",
-      "properties": {
-        "cols": {
-          "description": "Terminal width in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "rows": {
-          "description": "Terminal height in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        }
-      },
-      "required": [
-        "cols",
-        "rows"
-      ],
-      "type": "object"
-    },
     "NetworkAccess": {
       "enum": [
         "restricted",
@@ -201,54 +179,14 @@
       ]
     }
   },
-  "description": "Run a standalone command (argv vector) in the server sandbox without creating a thread or turn.\n\nThe final `command/exec` response is deferred until the process exits and is sent only after all `command/exec/outputDelta` notifications for that connection have been emitted.",
   "properties": {
     "command": {
-      "description": "Command argv vector. Empty arrays are rejected.",
       "items": {
         "type": "string"
       },
       "type": "array"
     },
     "cwd": {
-      "description": "Optional working directory. Defaults to the server cwd.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "disableOutputCap": {
-      "description": "Disable stdout/stderr capture truncation for this request.\n\nCannot be combined with `outputBytesCap`.",
-      "type": "boolean"
-    },
-    "disableTimeout": {
-      "description": "Disable the timeout entirely for this request.\n\nCannot be combined with `timeoutMs`.",
-      "type": "boolean"
-    },
-    "env": {
-      "additionalProperties": {
-        "type": [
-          "string",
-          "null"
-        ]
-      },
-      "description": "Optional environment overrides merged into the server-computed environment.\n\nMatching names override inherited values. Set a key to `null` to unset an inherited variable.",
-      "type": [
-        "object",
-        "null"
-      ]
-    },
-    "outputBytesCap": {
-      "description": "Optional per-stream stdout/stderr capture cap in bytes.\n\nWhen omitted, the server default applies. Cannot be combined with `disableOutputCap`.",
-      "format": "uint",
-      "minimum": 0.0,
-      "type": [
-        "integer",
-        "null"
-      ]
-    },
-    "processId": {
-      "description": "Optional client-supplied, connection-scoped process id.\n\nRequired for `tty`, `streamStdin`, `streamStdoutStderr`, and follow-up `command/exec/write`, `command/exec/resize`, and `command/exec/terminate` calls. When omitted, buffered execution gets an internal id that is not exposed to the client.",
       "type": [
         "string",
         "null"
@@ -262,39 +200,14 @@
         {
           "type": "null"
         }
-      ],
-      "description": "Optional sandbox policy for this command.\n\nUses the same shape as thread/turn execution sandbox configuration and defaults to the user's configured policy when omitted."
-    },
-    "size": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/CommandExecTerminalSize"
-        },
-        {
-          "type": "null"
-        }
-      ],
-      "description": "Optional initial PTY size in character cells. Only valid when `tty` is true."
-    },
-    "streamStdin": {
-      "description": "Allow follow-up `command/exec/write` requests to write stdin bytes.\n\nRequires a client-supplied `processId`.",
-      "type": "boolean"
-    },
-    "streamStdoutStderr": {
-      "description": "Stream stdout/stderr via `command/exec/outputDelta` notifications.\n\nStreamed bytes are not duplicated into the final response and require a client-supplied `processId`.",
-      "type": "boolean"
+      ]
     },
     "timeoutMs": {
-      "description": "Optional timeout in milliseconds.\n\nWhen omitted, the server default applies. Cannot be combined with `disableTimeout`.",
       "format": "int64",
       "type": [
         "integer",
         "null"
       ]
-    },
-    "tty": {
-      "description": "Enable PTY mode.\n\nThis implies `streamStdin` and `streamStdoutStderr`.",
-      "type": "boolean"
     }
   },
   "required": [

codex-rs/app-server-protocol/schema/json/v2/CommandExecResizeParams.json

@@ -1,48 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "CommandExecTerminalSize": {
-      "description": "PTY size in character cells for `command/exec` PTY sessions.",
-      "properties": {
-        "cols": {
-          "description": "Terminal width in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        },
-        "rows": {
-          "description": "Terminal height in character cells.",
-          "format": "uint16",
-          "minimum": 0.0,
-          "type": "integer"
-        }
-      },
-      "required": [
-        "cols",
-        "rows"
-      ],
-      "type": "object"
-    }
-  },
-  "description": "Resize a running PTY-backed `command/exec` session.",
-  "properties": {
-    "processId": {
-      "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-      "type": "string"
-    },
-    "size": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/CommandExecTerminalSize"
-        }
-      ],
-      "description": "New PTY size in character cells."
-    }
-  },
-  "required": [
-    "processId",
-    "size"
-  ],
-  "title": "CommandExecResizeParams",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/CommandExecResizeResponse.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Empty success response for `command/exec/resize`.",
-  "title": "CommandExecResizeResponse",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/CommandExecResponse.json

@@ -1,18 +1,14 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Final buffered result for `command/exec`.",
   "properties": {
     "exitCode": {
-      "description": "Process exit code.",
       "format": "int32",
       "type": "integer"
     },
     "stderr": {
-      "description": "Buffered stderr capture.\n\nEmpty when stderr was streamed via `command/exec/outputDelta`.",
       "type": "string"
     },
     "stdout": {
-      "description": "Buffered stdout capture.\n\nEmpty when stdout was streamed via `command/exec/outputDelta`.",
       "type": "string"
     }
   },

codex-rs/app-server-protocol/schema/json/v2/CommandExecTerminateParams.json

@@ -1,15 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Terminate a running `command/exec` session.",
-  "properties": {
-    "processId": {
-      "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-      "type": "string"
-    }
-  },
-  "required": [
-    "processId"
-  ],
-  "title": "CommandExecTerminateParams",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/CommandExecTerminateResponse.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Empty success response for `command/exec/terminate`.",
-  "title": "CommandExecTerminateResponse",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/CommandExecWriteParams.json

@@ -1,26 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Write stdin bytes to a running `command/exec` session, close stdin, or both.",
-  "properties": {
-    "closeStdin": {
-      "description": "Close stdin after writing `deltaBase64`, if present.",
-      "type": "boolean"
-    },
-    "deltaBase64": {
-      "description": "Optional base64-encoded stdin bytes to write.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "processId": {
-      "description": "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-      "type": "string"
-    }
-  },
-  "required": [
-    "processId"
-  ],
-  "title": "CommandExecWriteParams",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/CommandExecWriteResponse.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "description": "Empty success response for `command/exec/write`.",
-  "title": "CommandExecWriteResponse",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/ConfigBatchWriteParams.json

@@ -45,10 +45,6 @@
         "string",
         "null"
       ]
-    },
-    "reloadUserConfig": {
-      "description": "When true, hot-reload the updated user config into all loaded threads after writing.",
-      "type": "boolean"
     }
   },
   "required": [

codex-rs/app-server-protocol/schema/json/v2/ConfigReadResponse.json

@@ -148,9 +148,6 @@
                 "mcp_elicitations": {
                   "type": "boolean"
                 },
-                "request_permissions": {
-                  "type": "boolean"
-                },
                 "rules": {
                   "type": "boolean"
                 },
@@ -160,7 +157,6 @@
               },
               "required": [
                 "mcp_elicitations",
-                "request_permissions",
                 "rules",
                 "sandbox_approval"
               ],
@@ -632,16 +628,6 @@
             }
           ]
         },
-        "tools": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/ToolsV2"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
         "web_search": {
           "anyOf": [
             {
@@ -735,13 +721,9 @@
           ]
         },
         "web_search": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/WebSearchToolConfig"
-            },
-            {
-              "type": "null"
-            }
+          "type": [
+            "boolean",
+            "null"
           ]
         }
       },
@@ -756,44 +738,6 @@
       ],
       "type": "string"
     },
-    "WebSearchContextSize": {
-      "enum": [
-        "low",
-        "medium",
-        "high"
-      ],
-      "type": "string"
-    },
-    "WebSearchLocation": {
-      "additionalProperties": false,
-      "properties": {
-        "city": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "country": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "region": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "timezone": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "type": "object"
-    },
     "WebSearchMode": {
       "enum": [
         "disabled",
@@ -801,41 +745,6 @@
         "live"
       ],
       "type": "string"
-    },
-    "WebSearchToolConfig": {
-      "additionalProperties": false,
-      "properties": {
-        "allowed_domains": {
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "context_size": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/WebSearchContextSize"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "location": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/WebSearchLocation"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        }
-      },
-      "type": "object"
     }
   },
   "properties": {

codex-rs/app-server-protocol/schema/json/v2/ConfigRequirementsReadResponse.json

@@ -20,9 +20,6 @@
                 "mcp_elicitations": {
                   "type": "boolean"
                 },
-                "request_permissions": {
-                  "type": "boolean"
-                },
                 "rules": {
                   "type": "boolean"
                 },
@@ -32,7 +29,6 @@
               },
               "required": [
                 "mcp_elicitations",
-                "request_permissions",
                 "rules",
                 "sandbox_approval"
               ],

codex-rs/app-server-protocol/schema/json/v2/PluginListParams.json

@@ -8,7 +8,7 @@
   },
   "properties": {
     "cwds": {
-      "description": "Optional working directories used to discover repo marketplaces. When omitted, only home-scoped marketplaces and the official curated marketplace are considered.",
+      "description": "Optional working directories used to discover repo marketplaces. When omitted, only home-scoped marketplaces are considered.",
       "items": {
         "$ref": "#/definitions/AbsolutePathBuf"
       },

codex-rs/app-server-protocol/schema/json/v2/PluginListResponse.json

@@ -1,118 +1,13 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
-    "AbsolutePathBuf": {
-      "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-      "type": "string"
-    },
-    "PluginInterface": {
-      "properties": {
-        "brandColor": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "capabilities": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "category": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "composerIcon": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "defaultPrompt": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "developerName": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "displayName": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "logo": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "longDescription": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "privacyPolicyUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "screenshots": {
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": "array"
-        },
-        "shortDescription": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "termsOfServiceUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "websiteUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "capabilities",
-        "screenshots"
-      ],
-      "type": "object"
-    },
     "PluginMarketplaceEntry": {
       "properties": {
         "name": {
           "type": "string"
         },
         "path": {
-          "$ref": "#/definitions/AbsolutePathBuf"
+          "type": "string"
         },
         "plugins": {
           "items": {
@@ -133,7 +28,7 @@
         {
           "properties": {
             "path": {
-              "$ref": "#/definitions/AbsolutePathBuf"
+              "type": "string"
             },
             "type": {
               "enum": [
@@ -157,22 +52,6 @@
         "enabled": {
           "type": "boolean"
         },
-        "id": {
-          "type": "string"
-        },
-        "installed": {
-          "type": "boolean"
-        },
-        "interface": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/PluginInterface"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
         "name": {
           "type": "string"
         },
@@ -182,8 +61,6 @@
       },
       "required": [
         "enabled",
-        "id",
-        "installed",
         "name",
         "source"
       ],

codex-rs/app-server-protocol/schema/json/v2/PluginUninstallParams.json

@@ -1,13 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "properties": {
-    "pluginId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "pluginId"
-  ],
-  "title": "PluginUninstallParams",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/PluginUninstallResponse.json

@@ -1,5 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "PluginUninstallResponse",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json

@@ -607,7 +607,7 @@
             "action": {
               "anyOf": [
                 {
-                  "$ref": "#/definitions/ResponsesApiWebSearchAction"
+                  "$ref": "#/definitions/WebSearchAction"
                 },
                 {
                   "type": "null"
@@ -733,7 +733,7 @@
         }
       ]
     },
-    "ResponsesApiWebSearchAction": {
+    "WebSearchAction": {
       "oneOf": [
         {
           "properties": {
@@ -756,14 +756,14 @@
               "enum": [
                 "search"
               ],
-              "title": "SearchResponsesApiWebSearchActionType",
+              "title": "SearchWebSearchActionType",
               "type": "string"
             }
           },
           "required": [
             "type"
           ],
-          "title": "SearchResponsesApiWebSearchAction",
+          "title": "SearchWebSearchAction",
           "type": "object"
         },
         {
@@ -772,7 +772,7 @@
               "enum": [
                 "open_page"
               ],
-              "title": "OpenPageResponsesApiWebSearchActionType",
+              "title": "OpenPageWebSearchActionType",
               "type": "string"
             },
             "url": {
@@ -785,7 +785,7 @@
           "required": [
             "type"
           ],
-          "title": "OpenPageResponsesApiWebSearchAction",
+          "title": "OpenPageWebSearchAction",
           "type": "object"
         },
         {
@@ -800,7 +800,7 @@
               "enum": [
                 "find_in_page"
               ],
-              "title": "FindInPageResponsesApiWebSearchActionType",
+              "title": "FindInPageWebSearchActionType",
               "type": "string"
             },
             "url": {
@@ -813,7 +813,7 @@
           "required": [
             "type"
           ],
-          "title": "FindInPageResponsesApiWebSearchAction",
+          "title": "FindInPageWebSearchAction",
           "type": "object"
         },
         {
@@ -822,14 +822,14 @@
               "enum": [
                 "other"
               ],
-              "title": "OtherResponsesApiWebSearchActionType",
+              "title": "OtherWebSearchActionType",
               "type": "string"
             }
           },
           "required": [
             "type"
           ],
-          "title": "OtherResponsesApiWebSearchAction",
+          "title": "OtherWebSearchAction",
           "type": "object"
         }
       ]

codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json

@@ -20,9 +20,6 @@
                 "mcp_elicitations": {
                   "type": "boolean"
                 },
-                "request_permissions": {
-                  "type": "boolean"
-                },
                 "rules": {
                   "type": "boolean"
                 },
@@ -32,7 +29,6 @@
               },
               "required": [
                 "mcp_elicitations",
-                "request_permissions",
                 "rules",
                 "sandbox_approval"
               ],

codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json

@@ -24,9 +24,6 @@
                 "mcp_elicitations": {
                   "type": "boolean"
                 },
-                "request_permissions": {
-                  "type": "boolean"
-                },
                 "rules": {
                   "type": "boolean"
                 },
@@ -36,7 +33,6 @@
               },
               "required": [
                 "mcp_elicitations",
-                "request_permissions",
                 "rules",
                 "sandbox_approval"
               ],

codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json

@@ -20,9 +20,6 @@
                 "mcp_elicitations": {
                   "type": "boolean"
                 },
-                "request_permissions": {
-                  "type": "boolean"
-                },
                 "rules": {
                   "type": "boolean"
                 },
@@ -32,7 +29,6 @@
               },
               "required": [
                 "mcp_elicitations",
-                "request_permissions",
                 "rules",
                 "sandbox_approval"
               ],
@@ -661,7 +657,7 @@
             "action": {
               "anyOf": [
                 {
-                  "$ref": "#/definitions/ResponsesApiWebSearchAction"
+                  "$ref": "#/definitions/WebSearchAction"
                 },
                 {
                   "type": "null"
@@ -787,7 +783,22 @@
         }
       ]
     },
-    "ResponsesApiWebSearchAction": {
+    "SandboxMode": {
+      "enum": [
+        "read-only",
+        "workspace-write",
+        "danger-full-access"
+      ],
+      "type": "string"
+    },
+    "ServiceTier": {
+      "enum": [
+        "fast",
+        "flex"
+      ],
+      "type": "string"
+    },
+    "WebSearchAction": {
       "oneOf": [
         {
           "properties": {
@@ -810,14 +821,14 @@
               "enum": [
                 "search"
               ],
-              "title": "SearchResponsesApiWebSearchActionType",
+              "title": "SearchWebSearchActionType",
               "type": "string"
             }
           },
           "required": [
             "type"
           ],
-          "title": "SearchResponsesApiWebSearchAction",
+          "title": "SearchWebSearchAction",
           "type": "object"
         },
         {
@@ -826,7 +837,7 @@
               "enum": [
                 "open_page"
               ],
-              "title": "OpenPageResponsesApiWebSearchActionType",
+              "title": "OpenPageWebSearchActionType",
               "type": "string"
             },
             "url": {
@@ -839,7 +850,7 @@
           "required": [
             "type"
           ],
-          "title": "OpenPageResponsesApiWebSearchAction",
+          "title": "OpenPageWebSearchAction",
           "type": "object"
         },
         {
@@ -854,7 +865,7 @@
               "enum": [
                 "find_in_page"
               ],
-              "title": "FindInPageResponsesApiWebSearchActionType",
+              "title": "FindInPageWebSearchActionType",
               "type": "string"
             },
             "url": {
@@ -867,7 +878,7 @@
           "required": [
             "type"
           ],
-          "title": "FindInPageResponsesApiWebSearchAction",
+          "title": "FindInPageWebSearchAction",
           "type": "object"
         },
         {
@@ -876,32 +887,17 @@
               "enum": [
                 "other"
               ],
-              "title": "OtherResponsesApiWebSearchActionType",
+              "title": "OtherWebSearchActionType",
               "type": "string"
             }
           },
           "required": [
             "type"
           ],
-          "title": "OtherResponsesApiWebSearchAction",
+          "title": "OtherWebSearchAction",
           "type": "object"
         }
       ]
-    },
-    "SandboxMode": {
-      "enum": [
-        "read-only",
-        "workspace-write",
-        "danger-full-access"
-      ],
-      "type": "string"
-    },
-    "ServiceTier": {
-      "enum": [
-        "fast",
-        "flex"
-      ],
-      "type": "string"
     }
   },
   "description": "There are three ways to resume a thread: 1. By thread_id: load the thread from disk by thread_id and resume it. 2. By history: instantiate the thread from memory and resume it. 3. By path: load the thread from disk by path and resume it.\n\nThe precedence is: history > path > thread_id. If using history or path, the thread_id param will be ignored.\n\nPrefer using thread_id whenever possible.",

codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json

@@ -24,9 +24,6 @@
                 "mcp_elicitations": {
                   "type": "boolean"
                 },
-                "request_permissions": {
-                  "type": "boolean"
-                },
                 "rules": {
                   "type": "boolean"
                 },
@@ -36,7 +33,6 @@
               },
               "required": [
                 "mcp_elicitations",
-                "request_permissions",
                 "rules",
                 "sandbox_approval"
               ],

codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json

@@ -20,9 +20,6 @@
                 "mcp_elicitations": {
                   "type": "boolean"
                 },
-                "request_permissions": {
-                  "type": "boolean"
-                },
                 "rules": {
                   "type": "boolean"
                 },
@@ -32,7 +29,6 @@
               },
               "required": [
                 "mcp_elicitations",
-                "request_permissions",
                 "rules",
                 "sandbox_approval"
               ],

codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json

@@ -24,9 +24,6 @@
                 "mcp_elicitations": {
                   "type": "boolean"
                 },
-                "request_permissions": {
-                  "type": "boolean"
-                },
                 "rules": {
                   "type": "boolean"
                 },
@@ -36,7 +33,6 @@
               },
               "required": [
                 "mcp_elicitations",
-                "request_permissions",
                 "rules",
                 "sandbox_approval"
               ],

codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json

@@ -24,9 +24,6 @@
                 "mcp_elicitations": {
                   "type": "boolean"
                 },
-                "request_permissions": {
-                  "type": "boolean"
-                },
                 "rules": {
                   "type": "boolean"
                 },
@@ -36,7 +33,6 @@
               },
               "required": [
                 "mcp_elicitations",
-                "request_permissions",
                 "rules",
                 "sandbox_approval"
               ],

codex-rs/app-server-protocol/schema/json/v2/WindowsSandboxSetupStartParams.json

@@ -1,10 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
-    "AbsolutePathBuf": {
-      "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-      "type": "string"
-    },
     "WindowsSandboxSetupMode": {
       "enum": [
         "elevated",
@@ -15,13 +11,9 @@
   },
   "properties": {
     "cwd": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        },
-        {
-          "type": "null"
-        }
+      "type": [
+        "string",
+        "null"
       ]
     },
     "mode": {

codex-rs/app-server-protocol/schema/typescript/AgentSpawnMode.ts

@@ -2,4 +2,4 @@
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type PermissionGrantScope = "turn" | "session";
+export type AgentSpawnMode = "spawn" | "fork" | "watchdog";

codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts

@@ -10,9 +10,6 @@ import type { RequestId } from "./RequestId";
 import type { AppsListParams } from "./v2/AppsListParams";
 import type { CancelLoginAccountParams } from "./v2/CancelLoginAccountParams";
 import type { CommandExecParams } from "./v2/CommandExecParams";
-import type { CommandExecResizeParams } from "./v2/CommandExecResizeParams";
-import type { CommandExecTerminateParams } from "./v2/CommandExecTerminateParams";
-import type { CommandExecWriteParams } from "./v2/CommandExecWriteParams";
 import type { ConfigBatchWriteParams } from "./v2/ConfigBatchWriteParams";
 import type { ConfigReadParams } from "./v2/ConfigReadParams";
 import type { ConfigValueWriteParams } from "./v2/ConfigValueWriteParams";
@@ -27,7 +24,6 @@ import type { McpServerOauthLoginParams } from "./v2/McpServerOauthLoginParams";
 import type { ModelListParams } from "./v2/ModelListParams";
 import type { PluginInstallParams } from "./v2/PluginInstallParams";
 import type { PluginListParams } from "./v2/PluginListParams";
-import type { PluginUninstallParams } from "./v2/PluginUninstallParams";
 import type { ReviewStartParams } from "./v2/ReviewStartParams";
 import type { SkillsConfigWriteParams } from "./v2/SkillsConfigWriteParams";
 import type { SkillsListParams } from "./v2/SkillsListParams";
@@ -54,4 +50,4 @@ import type { WindowsSandboxSetupStartParams } from "./v2/WindowsSandboxSetupSta
 /**
  * Request from the client to the server.
  */
-export type ClientRequest ={ "method": "initialize", id: RequestId, params: InitializeParams, } | { "method": "thread/start", id: RequestId, params: ThreadStartParams, } | { "method": "thread/resume", id: RequestId, params: ThreadResumeParams, } | { "method": "thread/fork", id: RequestId, params: ThreadForkParams, } | { "method": "thread/archive", id: RequestId, params: ThreadArchiveParams, } | { "method": "thread/unsubscribe", id: RequestId, params: ThreadUnsubscribeParams, } | { "method": "thread/name/set", id: RequestId, params: ThreadSetNameParams, } | { "method": "thread/metadata/update", id: RequestId, params: ThreadMetadataUpdateParams, } | { "method": "thread/unarchive", id: RequestId, params: ThreadUnarchiveParams, } | { "method": "thread/compact/start", id: RequestId, params: ThreadCompactStartParams, } | { "method": "thread/rollback", id: RequestId, params: ThreadRollbackParams, } | { "method": "thread/list", id: RequestId, params: ThreadListParams, } | { "method": "thread/loaded/list", id: RequestId, params: ThreadLoadedListParams, } | { "method": "thread/read", id: RequestId, params: ThreadReadParams, } | { "method": "skills/list", id: RequestId, params: SkillsListParams, } | { "method": "plugin/list", id: RequestId, params: PluginListParams, } | { "method": "skills/remote/list", id: RequestId, params: SkillsRemoteReadParams, } | { "method": "skills/remote/export", id: RequestId, params: SkillsRemoteWriteParams, } | { "method": "app/list", id: RequestId, params: AppsListParams, } | { "method": "skills/config/write", id: RequestId, params: SkillsConfigWriteParams, } | { "method": "plugin/install", id: RequestId, params: PluginInstallParams, } | { "method": "plugin/uninstall", id: RequestId, params: PluginUninstallParams, } | { "method": "turn/start", id: RequestId, params: TurnStartParams, } | { "method": "turn/steer", id: RequestId, params: TurnSteerParams, } | { "method": "turn/interrupt", id: RequestId, params: TurnInterruptParams, } | { "method": "review/start", id: RequestId, params: ReviewStartParams, } | { "method": "model/list", id: RequestId, params: ModelListParams, } | { "method": "experimentalFeature/list", id: RequestId, params: ExperimentalFeatureListParams, } | { "method": "mcpServer/oauth/login", id: RequestId, params: McpServerOauthLoginParams, } | { "method": "config/mcpServer/reload", id: RequestId, params: undefined, } | { "method": "mcpServerStatus/list", id: RequestId, params: ListMcpServerStatusParams, } | { "method": "windowsSandbox/setupStart", id: RequestId, params: WindowsSandboxSetupStartParams, } | { "method": "account/login/start", id: RequestId, params: LoginAccountParams, } | { "method": "account/login/cancel", id: RequestId, params: CancelLoginAccountParams, } | { "method": "account/logout", id: RequestId, params: undefined, } | { "method": "account/rateLimits/read", id: RequestId, params: undefined, } | { "method": "feedback/upload", id: RequestId, params: FeedbackUploadParams, } | { "method": "command/exec", id: RequestId, params: CommandExecParams, } | { "method": "command/exec/write", id: RequestId, params: CommandExecWriteParams, } | { "method": "command/exec/terminate", id: RequestId, params: CommandExecTerminateParams, } | { "method": "command/exec/resize", id: RequestId, params: CommandExecResizeParams, } | { "method": "config/read", id: RequestId, params: ConfigReadParams, } | { "method": "externalAgentConfig/detect", id: RequestId, params: ExternalAgentConfigDetectParams, } | { "method": "externalAgentConfig/import", id: RequestId, params: ExternalAgentConfigImportParams, } | { "method": "config/value/write", id: RequestId, params: ConfigValueWriteParams, } | { "method": "config/batchWrite", id: RequestId, params: ConfigBatchWriteParams, } | { "method": "configRequirements/read", id: RequestId, params: undefined, } | { "method": "account/read", id: RequestId, params: GetAccountParams, } | { "method": "getConversationSummary", id: RequestId, params: GetConversationSummaryParams, } | { "method": "gitDiffToRemote", id: RequestId, params: GitDiffToRemoteParams, } | { "method": "getAuthStatus", id: RequestId, params: GetAuthStatusParams, } | { "method": "fuzzyFileSearch", id: RequestId, params: FuzzyFileSearchParams, };
+export type ClientRequest ={ "method": "initialize", id: RequestId, params: InitializeParams, } | { "method": "thread/start", id: RequestId, params: ThreadStartParams, } | { "method": "thread/resume", id: RequestId, params: ThreadResumeParams, } | { "method": "thread/fork", id: RequestId, params: ThreadForkParams, } | { "method": "thread/archive", id: RequestId, params: ThreadArchiveParams, } | { "method": "thread/unsubscribe", id: RequestId, params: ThreadUnsubscribeParams, } | { "method": "thread/name/set", id: RequestId, params: ThreadSetNameParams, } | { "method": "thread/metadata/update", id: RequestId, params: ThreadMetadataUpdateParams, } | { "method": "thread/unarchive", id: RequestId, params: ThreadUnarchiveParams, } | { "method": "thread/compact/start", id: RequestId, params: ThreadCompactStartParams, } | { "method": "thread/rollback", id: RequestId, params: ThreadRollbackParams, } | { "method": "thread/list", id: RequestId, params: ThreadListParams, } | { "method": "thread/loaded/list", id: RequestId, params: ThreadLoadedListParams, } | { "method": "thread/read", id: RequestId, params: ThreadReadParams, } | { "method": "skills/list", id: RequestId, params: SkillsListParams, } | { "method": "plugin/list", id: RequestId, params: PluginListParams, } | { "method": "skills/remote/list", id: RequestId, params: SkillsRemoteReadParams, } | { "method": "skills/remote/export", id: RequestId, params: SkillsRemoteWriteParams, } | { "method": "app/list", id: RequestId, params: AppsListParams, } | { "method": "skills/config/write", id: RequestId, params: SkillsConfigWriteParams, } | { "method": "plugin/install", id: RequestId, params: PluginInstallParams, } | { "method": "turn/start", id: RequestId, params: TurnStartParams, } | { "method": "turn/steer", id: RequestId, params: TurnSteerParams, } | { "method": "turn/interrupt", id: RequestId, params: TurnInterruptParams, } | { "method": "review/start", id: RequestId, params: ReviewStartParams, } | { "method": "model/list", id: RequestId, params: ModelListParams, } | { "method": "experimentalFeature/list", id: RequestId, params: ExperimentalFeatureListParams, } | { "method": "mcpServer/oauth/login", id: RequestId, params: McpServerOauthLoginParams, } | { "method": "config/mcpServer/reload", id: RequestId, params: undefined, } | { "method": "mcpServerStatus/list", id: RequestId, params: ListMcpServerStatusParams, } | { "method": "windowsSandbox/setupStart", id: RequestId, params: WindowsSandboxSetupStartParams, } | { "method": "account/login/start", id: RequestId, params: LoginAccountParams, } | { "method": "account/login/cancel", id: RequestId, params: CancelLoginAccountParams, } | { "method": "account/logout", id: RequestId, params: undefined, } | { "method": "account/rateLimits/read", id: RequestId, params: undefined, } | { "method": "feedback/upload", id: RequestId, params: FeedbackUploadParams, } | { "method": "command/exec", id: RequestId, params: CommandExecParams, } | { "method": "config/read", id: RequestId, params: ConfigReadParams, } | { "method": "externalAgentConfig/detect", id: RequestId, params: ExternalAgentConfigDetectParams, } | { "method": "externalAgentConfig/import", id: RequestId, params: ExternalAgentConfigImportParams, } | { "method": "config/value/write", id: RequestId, params: ConfigValueWriteParams, } | { "method": "config/batchWrite", id: RequestId, params: ConfigBatchWriteParams, } | { "method": "configRequirements/read", id: RequestId, params: undefined, } | { "method": "account/read", id: RequestId, params: GetAccountParams, } | { "method": "getConversationSummary", id: RequestId, params: GetConversationSummaryParams, } | { "method": "gitDiffToRemote", id: RequestId, params: GitDiffToRemoteParams, } | { "method": "getAuthStatus", id: RequestId, params: GetAuthStatusParams, } | { "method": "fuzzyFileSearch", id: RequestId, params: FuzzyFileSearchParams, };

codex-rs/app-server-protocol/schema/typescript/CollabAgentSpawnEndEvent.ts

@@ -1,6 +1,7 @@
 // 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 { AgentSpawnMode } from "./AgentSpawnMode";
 import type { AgentStatus } from "./AgentStatus";
 import type { ThreadId } from "./ThreadId";
 
@@ -30,6 +31,10 @@ new_agent_role?: string | null,
  * beginning.
  */
 prompt: string, 
+/**
+ * Spawn mode used for this agent.
+ */
+spawn_mode: AgentSpawnMode, 
 /**
  * Last known status of the new agent reported to the sender agent.
  */

codex-rs/app-server-protocol/schema/typescript/EventMsg.ts

@@ -56,7 +56,6 @@ import type { RealtimeConversationStartedEvent } from "./RealtimeConversationSta
 import type { ReasoningContentDeltaEvent } from "./ReasoningContentDeltaEvent";
 import type { ReasoningRawContentDeltaEvent } from "./ReasoningRawContentDeltaEvent";
 import type { RemoteSkillDownloadedEvent } from "./RemoteSkillDownloadedEvent";
-import type { RequestPermissionsEvent } from "./RequestPermissionsEvent";
 import type { RequestUserInputEvent } from "./RequestUserInputEvent";
 import type { ReviewRequest } from "./ReviewRequest";
 import type { SessionConfiguredEvent } from "./SessionConfiguredEvent";
@@ -82,4 +81,4 @@ import type { WebSearchEndEvent } from "./WebSearchEndEvent";
  * Response event from the agent
  * NOTE: Make sure none of these values have optional types, as it will mess up the extension code-gen.
  */
-export type EventMsg = { "type": "error" } & ErrorEvent | { "type": "warning" } & WarningEvent | { "type": "realtime_conversation_started" } & RealtimeConversationStartedEvent | { "type": "realtime_conversation_realtime" } & RealtimeConversationRealtimeEvent | { "type": "realtime_conversation_closed" } & RealtimeConversationClosedEvent | { "type": "model_reroute" } & ModelRerouteEvent | { "type": "context_compacted" } & ContextCompactedEvent | { "type": "thread_rolled_back" } & ThreadRolledBackEvent | { "type": "task_started" } & TurnStartedEvent | { "type": "task_complete" } & TurnCompleteEvent | { "type": "token_count" } & TokenCountEvent | { "type": "agent_message" } & AgentMessageEvent | { "type": "user_message" } & UserMessageEvent | { "type": "agent_message_delta" } & AgentMessageDeltaEvent | { "type": "agent_reasoning" } & AgentReasoningEvent | { "type": "agent_reasoning_delta" } & AgentReasoningDeltaEvent | { "type": "agent_reasoning_raw_content" } & AgentReasoningRawContentEvent | { "type": "agent_reasoning_raw_content_delta" } & AgentReasoningRawContentDeltaEvent | { "type": "agent_reasoning_section_break" } & AgentReasoningSectionBreakEvent | { "type": "session_configured" } & SessionConfiguredEvent | { "type": "thread_name_updated" } & ThreadNameUpdatedEvent | { "type": "mcp_startup_update" } & McpStartupUpdateEvent | { "type": "mcp_startup_complete" } & McpStartupCompleteEvent | { "type": "mcp_tool_call_begin" } & McpToolCallBeginEvent | { "type": "mcp_tool_call_end" } & McpToolCallEndEvent | { "type": "web_search_begin" } & WebSearchBeginEvent | { "type": "web_search_end" } & WebSearchEndEvent | { "type": "image_generation_begin" } & ImageGenerationBeginEvent | { "type": "image_generation_end" } & ImageGenerationEndEvent | { "type": "exec_command_begin" } & ExecCommandBeginEvent | { "type": "exec_command_output_delta" } & ExecCommandOutputDeltaEvent | { "type": "terminal_interaction" } & TerminalInteractionEvent | { "type": "exec_command_end" } & ExecCommandEndEvent | { "type": "view_image_tool_call" } & ViewImageToolCallEvent | { "type": "exec_approval_request" } & ExecApprovalRequestEvent | { "type": "request_permissions" } & RequestPermissionsEvent | { "type": "request_user_input" } & RequestUserInputEvent | { "type": "dynamic_tool_call_request" } & DynamicToolCallRequest | { "type": "dynamic_tool_call_response" } & DynamicToolCallResponseEvent | { "type": "elicitation_request" } & ElicitationRequestEvent | { "type": "apply_patch_approval_request" } & ApplyPatchApprovalRequestEvent | { "type": "deprecation_notice" } & DeprecationNoticeEvent | { "type": "background_event" } & BackgroundEventEvent | { "type": "undo_started" } & UndoStartedEvent | { "type": "undo_completed" } & UndoCompletedEvent | { "type": "stream_error" } & StreamErrorEvent | { "type": "patch_apply_begin" } & PatchApplyBeginEvent | { "type": "patch_apply_end" } & PatchApplyEndEvent | { "type": "turn_diff" } & TurnDiffEvent | { "type": "get_history_entry_response" } & GetHistoryEntryResponseEvent | { "type": "mcp_list_tools_response" } & McpListToolsResponseEvent | { "type": "list_custom_prompts_response" } & ListCustomPromptsResponseEvent | { "type": "list_skills_response" } & ListSkillsResponseEvent | { "type": "list_remote_skills_response" } & ListRemoteSkillsResponseEvent | { "type": "remote_skill_downloaded" } & RemoteSkillDownloadedEvent | { "type": "skills_update_available" } | { "type": "plan_update" } & UpdatePlanArgs | { "type": "turn_aborted" } & TurnAbortedEvent | { "type": "shutdown_complete" } | { "type": "entered_review_mode" } & ReviewRequest | { "type": "exited_review_mode" } & ExitedReviewModeEvent | { "type": "raw_response_item" } & RawResponseItemEvent | { "type": "item_started" } & ItemStartedEvent | { "type": "item_completed" } & ItemCompletedEvent | { "type": "agent_message_content_delta" } & AgentMessageContentDeltaEvent | { "type": "plan_delta" } & PlanDeltaEvent | { "type": "reasoning_content_delta" } & ReasoningContentDeltaEvent | { "type": "reasoning_raw_content_delta" } & ReasoningRawContentDeltaEvent | { "type": "collab_agent_spawn_begin" } & CollabAgentSpawnBeginEvent | { "type": "collab_agent_spawn_end" } & CollabAgentSpawnEndEvent | { "type": "collab_agent_interaction_begin" } & CollabAgentInteractionBeginEvent | { "type": "collab_agent_interaction_end" } & CollabAgentInteractionEndEvent | { "type": "collab_waiting_begin" } & CollabWaitingBeginEvent | { "type": "collab_waiting_end" } & CollabWaitingEndEvent | { "type": "collab_close_begin" } & CollabCloseBeginEvent | { "type": "collab_close_end" } & CollabCloseEndEvent | { "type": "collab_resume_begin" } & CollabResumeBeginEvent | { "type": "collab_resume_end" } & CollabResumeEndEvent;
+export type EventMsg = { "type": "error" } & ErrorEvent | { "type": "warning" } & WarningEvent | { "type": "realtime_conversation_started" } & RealtimeConversationStartedEvent | { "type": "realtime_conversation_realtime" } & RealtimeConversationRealtimeEvent | { "type": "realtime_conversation_closed" } & RealtimeConversationClosedEvent | { "type": "model_reroute" } & ModelRerouteEvent | { "type": "context_compacted" } & ContextCompactedEvent | { "type": "thread_rolled_back" } & ThreadRolledBackEvent | { "type": "task_started" } & TurnStartedEvent | { "type": "task_complete" } & TurnCompleteEvent | { "type": "token_count" } & TokenCountEvent | { "type": "agent_message" } & AgentMessageEvent | { "type": "user_message" } & UserMessageEvent | { "type": "agent_message_delta" } & AgentMessageDeltaEvent | { "type": "agent_reasoning" } & AgentReasoningEvent | { "type": "agent_reasoning_delta" } & AgentReasoningDeltaEvent | { "type": "agent_reasoning_raw_content" } & AgentReasoningRawContentEvent | { "type": "agent_reasoning_raw_content_delta" } & AgentReasoningRawContentDeltaEvent | { "type": "agent_reasoning_section_break" } & AgentReasoningSectionBreakEvent | { "type": "session_configured" } & SessionConfiguredEvent | { "type": "thread_name_updated" } & ThreadNameUpdatedEvent | { "type": "mcp_startup_update" } & McpStartupUpdateEvent | { "type": "mcp_startup_complete" } & McpStartupCompleteEvent | { "type": "mcp_tool_call_begin" } & McpToolCallBeginEvent | { "type": "mcp_tool_call_end" } & McpToolCallEndEvent | { "type": "web_search_begin" } & WebSearchBeginEvent | { "type": "web_search_end" } & WebSearchEndEvent | { "type": "image_generation_begin" } & ImageGenerationBeginEvent | { "type": "image_generation_end" } & ImageGenerationEndEvent | { "type": "exec_command_begin" } & ExecCommandBeginEvent | { "type": "exec_command_output_delta" } & ExecCommandOutputDeltaEvent | { "type": "terminal_interaction" } & TerminalInteractionEvent | { "type": "exec_command_end" } & ExecCommandEndEvent | { "type": "view_image_tool_call" } & ViewImageToolCallEvent | { "type": "exec_approval_request" } & ExecApprovalRequestEvent | { "type": "request_user_input" } & RequestUserInputEvent | { "type": "dynamic_tool_call_request" } & DynamicToolCallRequest | { "type": "dynamic_tool_call_response" } & DynamicToolCallResponseEvent | { "type": "elicitation_request" } & ElicitationRequestEvent | { "type": "apply_patch_approval_request" } & ApplyPatchApprovalRequestEvent | { "type": "deprecation_notice" } & DeprecationNoticeEvent | { "type": "background_event" } & BackgroundEventEvent | { "type": "undo_started" } & UndoStartedEvent | { "type": "undo_completed" } & UndoCompletedEvent | { "type": "stream_error" } & StreamErrorEvent | { "type": "patch_apply_begin" } & PatchApplyBeginEvent | { "type": "patch_apply_end" } & PatchApplyEndEvent | { "type": "turn_diff" } & TurnDiffEvent | { "type": "get_history_entry_response" } & GetHistoryEntryResponseEvent | { "type": "mcp_list_tools_response" } & McpListToolsResponseEvent | { "type": "list_custom_prompts_response" } & ListCustomPromptsResponseEvent | { "type": "list_skills_response" } & ListSkillsResponseEvent | { "type": "list_remote_skills_response" } & ListRemoteSkillsResponseEvent | { "type": "remote_skill_downloaded" } & RemoteSkillDownloadedEvent | { "type": "skills_update_available" } | { "type": "plan_update" } & UpdatePlanArgs | { "type": "turn_aborted" } & TurnAbortedEvent | { "type": "shutdown_complete" } | { "type": "entered_review_mode" } & ReviewRequest | { "type": "exited_review_mode" } & ExitedReviewModeEvent | { "type": "raw_response_item" } & RawResponseItemEvent | { "type": "item_started" } & ItemStartedEvent | { "type": "item_completed" } & ItemCompletedEvent | { "type": "agent_message_content_delta" } & AgentMessageContentDeltaEvent | { "type": "plan_delta" } & PlanDeltaEvent | { "type": "reasoning_content_delta" } & ReasoningContentDeltaEvent | { "type": "reasoning_raw_content_delta" } & ReasoningRawContentDeltaEvent | { "type": "collab_agent_spawn_begin" } & CollabAgentSpawnBeginEvent | { "type": "collab_agent_spawn_end" } & CollabAgentSpawnEndEvent | { "type": "collab_agent_interaction_begin" } & CollabAgentInteractionBeginEvent | { "type": "collab_agent_interaction_end" } & CollabAgentInteractionEndEvent | { "type": "collab_waiting_begin" } & CollabWaitingBeginEvent | { "type": "collab_waiting_end" } & CollabWaitingEndEvent | { "type": "collab_close_begin" } & CollabCloseBeginEvent | { "type": "collab_close_end" } & CollabCloseEndEvent | { "type": "collab_resume_begin" } & CollabResumeBeginEvent | { "type": "collab_resume_end" } & CollabResumeEndEvent;

codex-rs/app-server-protocol/schema/typescript/ExecApprovalRequestEvent.ts

@@ -1,7 +1,6 @@
 // GENERATED CODE! DO NOT MODIFY BY HAND!
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ExecApprovalRequestSkillMetadata } from "./ExecApprovalRequestSkillMetadata";
 import type { ExecPolicyAmendment } from "./ExecPolicyAmendment";
 import type { NetworkApprovalContext } from "./NetworkApprovalContext";
 import type { NetworkPolicyAmendment } from "./NetworkPolicyAmendment";
@@ -54,10 +53,6 @@ proposed_network_policy_amendments?: Array<NetworkPolicyAmendment>,
  * Optional additional filesystem permissions requested for this command.
  */
 additional_permissions?: PermissionProfile, 
-/**
- * Optional skill metadata when the approval was triggered by a skill script.
- */
-skill_metadata?: ExecApprovalRequestSkillMetadata, 
 /**
  * Ordered list of decisions the client may present for this prompt.
  *

codex-rs/app-server-protocol/schema/typescript/ExecApprovalRequestSkillMetadata.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 ExecApprovalRequestSkillMetadata = { path_to_skills_md: string, };

codex-rs/app-server-protocol/schema/typescript/RejectConfig.ts

@@ -11,10 +11,6 @@ sandbox_approval: boolean,
  * Reject prompts triggered by execpolicy `prompt` rules.
  */
 rules: boolean, 
-/**
- * Reject approval prompts related to built-in permission requests.
- */
-request_permissions: boolean, 
 /**
  * Reject MCP elicitation prompts.
  */

codex-rs/app-server-protocol/schema/typescript/RequestPermissionsEvent.ts

@@ -1,15 +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 { PermissionProfile } from "./PermissionProfile";
-
-export type RequestPermissionsEvent = { 
-/**
- * Responses API call id for the associated tool call, if available.
- */
-call_id: string, 
-/**
- * Turn ID that this request belongs to.
- * Uses `#[serde(default)]` for backwards compatibility.
- */
-turn_id: string, reason: string | null, permissions: PermissionProfile, };

codex-rs/app-server-protocol/schema/typescript/ServerNotification.ts

@@ -8,7 +8,6 @@ import type { AccountRateLimitsUpdatedNotification } from "./v2/AccountRateLimit
 import type { AccountUpdatedNotification } from "./v2/AccountUpdatedNotification";
 import type { AgentMessageDeltaNotification } from "./v2/AgentMessageDeltaNotification";
 import type { AppListUpdatedNotification } from "./v2/AppListUpdatedNotification";
-import type { CommandExecOutputDeltaNotification } from "./v2/CommandExecOutputDeltaNotification";
 import type { CommandExecutionOutputDeltaNotification } from "./v2/CommandExecutionOutputDeltaNotification";
 import type { ConfigWarningNotification } from "./v2/ConfigWarningNotification";
 import type { ContextCompactedNotification } from "./v2/ContextCompactedNotification";
@@ -50,4 +49,4 @@ import type { WindowsWorldWritableWarningNotification } from "./v2/WindowsWorldW
 /**
  * Notification sent from the server to the client.
  */
-export type ServerNotification = { "method": "error", "params": ErrorNotification } | { "method": "thread/started", "params": ThreadStartedNotification } | { "method": "thread/status/changed", "params": ThreadStatusChangedNotification } | { "method": "thread/archived", "params": ThreadArchivedNotification } | { "method": "thread/unarchived", "params": ThreadUnarchivedNotification } | { "method": "thread/closed", "params": ThreadClosedNotification } | { "method": "skills/changed", "params": SkillsChangedNotification } | { "method": "thread/name/updated", "params": ThreadNameUpdatedNotification } | { "method": "thread/tokenUsage/updated", "params": ThreadTokenUsageUpdatedNotification } | { "method": "turn/started", "params": TurnStartedNotification } | { "method": "turn/completed", "params": TurnCompletedNotification } | { "method": "turn/diff/updated", "params": TurnDiffUpdatedNotification } | { "method": "turn/plan/updated", "params": TurnPlanUpdatedNotification } | { "method": "item/started", "params": ItemStartedNotification } | { "method": "item/completed", "params": ItemCompletedNotification } | { "method": "rawResponseItem/completed", "params": RawResponseItemCompletedNotification } | { "method": "item/agentMessage/delta", "params": AgentMessageDeltaNotification } | { "method": "item/plan/delta", "params": PlanDeltaNotification } | { "method": "command/exec/outputDelta", "params": CommandExecOutputDeltaNotification } | { "method": "item/commandExecution/outputDelta", "params": CommandExecutionOutputDeltaNotification } | { "method": "item/commandExecution/terminalInteraction", "params": TerminalInteractionNotification } | { "method": "item/fileChange/outputDelta", "params": FileChangeOutputDeltaNotification } | { "method": "serverRequest/resolved", "params": ServerRequestResolvedNotification } | { "method": "item/mcpToolCall/progress", "params": McpToolCallProgressNotification } | { "method": "mcpServer/oauthLogin/completed", "params": McpServerOauthLoginCompletedNotification } | { "method": "account/updated", "params": AccountUpdatedNotification } | { "method": "account/rateLimits/updated", "params": AccountRateLimitsUpdatedNotification } | { "method": "app/list/updated", "params": AppListUpdatedNotification } | { "method": "item/reasoning/summaryTextDelta", "params": ReasoningSummaryTextDeltaNotification } | { "method": "item/reasoning/summaryPartAdded", "params": ReasoningSummaryPartAddedNotification } | { "method": "item/reasoning/textDelta", "params": ReasoningTextDeltaNotification } | { "method": "thread/compacted", "params": ContextCompactedNotification } | { "method": "model/rerouted", "params": ModelReroutedNotification } | { "method": "deprecationNotice", "params": DeprecationNoticeNotification } | { "method": "configWarning", "params": ConfigWarningNotification } | { "method": "fuzzyFileSearch/sessionUpdated", "params": FuzzyFileSearchSessionUpdatedNotification } | { "method": "fuzzyFileSearch/sessionCompleted", "params": FuzzyFileSearchSessionCompletedNotification } | { "method": "thread/realtime/started", "params": ThreadRealtimeStartedNotification } | { "method": "thread/realtime/itemAdded", "params": ThreadRealtimeItemAddedNotification } | { "method": "thread/realtime/outputAudio/delta", "params": ThreadRealtimeOutputAudioDeltaNotification } | { "method": "thread/realtime/error", "params": ThreadRealtimeErrorNotification } | { "method": "thread/realtime/closed", "params": ThreadRealtimeClosedNotification } | { "method": "windows/worldWritableWarning", "params": WindowsWorldWritableWarningNotification } | { "method": "windowsSandbox/setupCompleted", "params": WindowsSandboxSetupCompletedNotification } | { "method": "account/login/completed", "params": AccountLoginCompletedNotification };
+export type ServerNotification = { "method": "error", "params": ErrorNotification } | { "method": "thread/started", "params": ThreadStartedNotification } | { "method": "thread/status/changed", "params": ThreadStatusChangedNotification } | { "method": "thread/archived", "params": ThreadArchivedNotification } | { "method": "thread/unarchived", "params": ThreadUnarchivedNotification } | { "method": "thread/closed", "params": ThreadClosedNotification } | { "method": "skills/changed", "params": SkillsChangedNotification } | { "method": "thread/name/updated", "params": ThreadNameUpdatedNotification } | { "method": "thread/tokenUsage/updated", "params": ThreadTokenUsageUpdatedNotification } | { "method": "turn/started", "params": TurnStartedNotification } | { "method": "turn/completed", "params": TurnCompletedNotification } | { "method": "turn/diff/updated", "params": TurnDiffUpdatedNotification } | { "method": "turn/plan/updated", "params": TurnPlanUpdatedNotification } | { "method": "item/started", "params": ItemStartedNotification } | { "method": "item/completed", "params": ItemCompletedNotification } | { "method": "rawResponseItem/completed", "params": RawResponseItemCompletedNotification } | { "method": "item/agentMessage/delta", "params": AgentMessageDeltaNotification } | { "method": "item/plan/delta", "params": PlanDeltaNotification } | { "method": "item/commandExecution/outputDelta", "params": CommandExecutionOutputDeltaNotification } | { "method": "item/commandExecution/terminalInteraction", "params": TerminalInteractionNotification } | { "method": "item/fileChange/outputDelta", "params": FileChangeOutputDeltaNotification } | { "method": "serverRequest/resolved", "params": ServerRequestResolvedNotification } | { "method": "item/mcpToolCall/progress", "params": McpToolCallProgressNotification } | { "method": "mcpServer/oauthLogin/completed", "params": McpServerOauthLoginCompletedNotification } | { "method": "account/updated", "params": AccountUpdatedNotification } | { "method": "account/rateLimits/updated", "params": AccountRateLimitsUpdatedNotification } | { "method": "app/list/updated", "params": AppListUpdatedNotification } | { "method": "item/reasoning/summaryTextDelta", "params": ReasoningSummaryTextDeltaNotification } | { "method": "item/reasoning/summaryPartAdded", "params": ReasoningSummaryPartAddedNotification } | { "method": "item/reasoning/textDelta", "params": ReasoningTextDeltaNotification } | { "method": "thread/compacted", "params": ContextCompactedNotification } | { "method": "model/rerouted", "params": ModelReroutedNotification } | { "method": "deprecationNotice", "params": DeprecationNoticeNotification } | { "method": "configWarning", "params": ConfigWarningNotification } | { "method": "fuzzyFileSearch/sessionUpdated", "params": FuzzyFileSearchSessionUpdatedNotification } | { "method": "fuzzyFileSearch/sessionCompleted", "params": FuzzyFileSearchSessionCompletedNotification } | { "method": "thread/realtime/started", "params": ThreadRealtimeStartedNotification } | { "method": "thread/realtime/itemAdded", "params": ThreadRealtimeItemAddedNotification } | { "method": "thread/realtime/outputAudio/delta", "params": ThreadRealtimeOutputAudioDeltaNotification } | { "method": "thread/realtime/error", "params": ThreadRealtimeErrorNotification } | { "method": "thread/realtime/closed", "params": ThreadRealtimeClosedNotification } | { "method": "windows/worldWritableWarning", "params": WindowsWorldWritableWarningNotification } | { "method": "windowsSandbox/setupCompleted", "params": WindowsSandboxSetupCompletedNotification } | { "method": "account/login/completed", "params": AccountLoginCompletedNotification };

codex-rs/app-server-protocol/schema/typescript/ServerRequest.ts

@@ -9,10 +9,9 @@ import type { CommandExecutionRequestApprovalParams } from "./v2/CommandExecutio
 import type { DynamicToolCallParams } from "./v2/DynamicToolCallParams";
 import type { FileChangeRequestApprovalParams } from "./v2/FileChangeRequestApprovalParams";
 import type { McpServerElicitationRequestParams } from "./v2/McpServerElicitationRequestParams";
-import type { PermissionsRequestApprovalParams } from "./v2/PermissionsRequestApprovalParams";
 import type { ToolRequestUserInputParams } from "./v2/ToolRequestUserInputParams";
 
 /**
  * Request initiated from the server and sent to the client.
  */
-export type ServerRequest = { "method": "item/commandExecution/requestApproval", id: RequestId, params: CommandExecutionRequestApprovalParams, } | { "method": "item/fileChange/requestApproval", id: RequestId, params: FileChangeRequestApprovalParams, } | { "method": "item/tool/requestUserInput", id: RequestId, params: ToolRequestUserInputParams, } | { "method": "mcpServer/elicitation/request", id: RequestId, params: McpServerElicitationRequestParams, } | { "method": "item/permissions/requestApproval", id: RequestId, params: PermissionsRequestApprovalParams, } | { "method": "item/tool/call", id: RequestId, params: DynamicToolCallParams, } | { "method": "account/chatgptAuthTokens/refresh", id: RequestId, params: ChatgptAuthTokensRefreshParams, } | { "method": "applyPatchApproval", id: RequestId, params: ApplyPatchApprovalParams, } | { "method": "execCommandApproval", id: RequestId, params: ExecCommandApprovalParams, };
+export type ServerRequest = { "method": "item/commandExecution/requestApproval", id: RequestId, params: CommandExecutionRequestApprovalParams, } | { "method": "item/fileChange/requestApproval", id: RequestId, params: FileChangeRequestApprovalParams, } | { "method": "item/tool/requestUserInput", id: RequestId, params: ToolRequestUserInputParams, } | { "method": "mcpServer/elicitation/request", id: RequestId, params: McpServerElicitationRequestParams, } | { "method": "item/tool/call", id: RequestId, params: DynamicToolCallParams, } | { "method": "account/chatgptAuthTokens/refresh", id: RequestId, params: ChatgptAuthTokensRefreshParams, } | { "method": "applyPatchApproval", id: RequestId, params: ApplyPatchApprovalParams, } | { "method": "execCommandApproval", id: RequestId, params: ExecCommandApprovalParams, };

codex-rs/app-server-protocol/schema/typescript/WebSearchContextSize.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 WebSearchContextSize = "low" | "medium" | "high";

codex-rs/app-server-protocol/schema/typescript/WebSearchLocation.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 WebSearchLocation = { country: string | null, region: string | null, city: string | null, timezone: string | null, };

codex-rs/app-server-protocol/schema/typescript/WebSearchToolConfig.ts

@@ -1,7 +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 { WebSearchContextSize } from "./WebSearchContextSize";
-import type { WebSearchLocation } from "./WebSearchLocation";
-
-export type WebSearchToolConfig = { context_size: WebSearchContextSize | null, allowed_domains: Array<string> | null, location: WebSearchLocation | null, };

codex-rs/app-server-protocol/schema/typescript/index.ts

@@ -11,6 +11,7 @@ export type { AgentReasoningEvent } from "./AgentReasoningEvent";
 export type { AgentReasoningRawContentDeltaEvent } from "./AgentReasoningRawContentDeltaEvent";
 export type { AgentReasoningRawContentEvent } from "./AgentReasoningRawContentEvent";
 export type { AgentReasoningSectionBreakEvent } from "./AgentReasoningSectionBreakEvent";
+export type { AgentSpawnMode } from "./AgentSpawnMode";
 export type { AgentStatus } from "./AgentStatus";
 export type { ApplyPatchApprovalParams } from "./ApplyPatchApprovalParams";
 export type { ApplyPatchApprovalRequestEvent } from "./ApplyPatchApprovalRequestEvent";
@@ -53,7 +54,6 @@ export type { ElicitationRequestEvent } from "./ElicitationRequestEvent";
 export type { ErrorEvent } from "./ErrorEvent";
 export type { EventMsg } from "./EventMsg";
 export type { ExecApprovalRequestEvent } from "./ExecApprovalRequestEvent";
-export type { ExecApprovalRequestSkillMetadata } from "./ExecApprovalRequestSkillMetadata";
 export type { ExecCommandApprovalParams } from "./ExecCommandApprovalParams";
 export type { ExecCommandApprovalResponse } from "./ExecCommandApprovalResponse";
 export type { ExecCommandBeginEvent } from "./ExecCommandBeginEvent";
@@ -155,7 +155,6 @@ export type { RejectConfig } from "./RejectConfig";
 export type { RemoteSkillDownloadedEvent } from "./RemoteSkillDownloadedEvent";
 export type { RemoteSkillSummary } from "./RemoteSkillSummary";
 export type { RequestId } from "./RequestId";
-export type { RequestPermissionsEvent } from "./RequestPermissionsEvent";
 export type { RequestUserInputEvent } from "./RequestUserInputEvent";
 export type { RequestUserInputQuestion } from "./RequestUserInputQuestion";
 export type { RequestUserInputQuestionOption } from "./RequestUserInputQuestionOption";
@@ -213,10 +212,7 @@ export type { ViewImageToolCallEvent } from "./ViewImageToolCallEvent";
 export type { WarningEvent } from "./WarningEvent";
 export type { WebSearchAction } from "./WebSearchAction";
 export type { WebSearchBeginEvent } from "./WebSearchBeginEvent";
-export type { WebSearchContextSize } from "./WebSearchContextSize";
 export type { WebSearchEndEvent } from "./WebSearchEndEvent";
 export type { WebSearchItem } from "./WebSearchItem";
-export type { WebSearchLocation } from "./WebSearchLocation";
 export type { WebSearchMode } from "./WebSearchMode";
-export type { WebSearchToolConfig } from "./WebSearchToolConfig";
 export * as v2 from "./v2";

codex-rs/app-server-protocol/schema/typescript/v2/AskForApproval.ts

@@ -2,4 +2,4 @@
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type AskForApproval = "untrusted" | "on-failure" | "on-request" | { "reject": { sandbox_approval: boolean, rules: boolean, request_permissions: boolean, mcp_elicitations: boolean, } } | "never";
+export type AskForApproval = "untrusted" | "on-failure" | "on-request" | { "reject": { sandbox_approval: boolean, rules: boolean, mcp_elicitations: boolean, } } | "never";

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecOutputDeltaNotification.ts

@@ -1,30 +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 { CommandExecOutputStream } from "./CommandExecOutputStream";
-
-/**
- * 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.
- */
-export type CommandExecOutputDeltaNotification = { 
-/**
- * Client-supplied, connection-scoped `processId` from the original
- * `command/exec` request.
- */
-processId: string, 
-/**
- * Output stream for this chunk.
- */
-stream: CommandExecOutputStream, 
-/**
- * Base64-encoded output bytes.
- */
-deltaBase64: string, 
-/**
- * `true` on the final streamed chunk for a stream when `outputBytesCap`
- * truncated later output on that stream.
- */
-capReached: boolean, };

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecOutputStream.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 `command/exec/outputDelta` notifications.
- */
-export type CommandExecOutputStream = "stdout" | "stderr";

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecParams.ts

@@ -1,97 +1,6 @@
 // GENERATED CODE! DO NOT MODIFY BY HAND!
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CommandExecTerminalSize } from "./CommandExecTerminalSize";
 import type { SandboxPolicy } from "./SandboxPolicy";
 
-/**
- * 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.
- */
-export type CommandExecParams = { 
-/**
- * Command argv vector. Empty arrays are rejected.
- */
-command: Array<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.
- */
-processId?: string | null, 
-/**
- * Enable PTY mode.
- *
- * This implies `streamStdin` and `streamStdoutStderr`.
- */
-tty?: boolean, 
-/**
- * Allow follow-up `command/exec/write` requests to write stdin bytes.
- *
- * Requires a client-supplied `processId`.
- */
-streamStdin?: boolean, 
-/**
- * Stream stdout/stderr via `command/exec/outputDelta` notifications.
- *
- * Streamed bytes are not duplicated into the final response and require a
- * client-supplied `processId`.
- */
-streamStdoutStderr?: boolean, 
-/**
- * Optional per-stream stdout/stderr capture cap in bytes.
- *
- * When omitted, the server default applies. Cannot be combined with
- * `disableOutputCap`.
- */
-outputBytesCap?: number | null, 
-/**
- * Disable stdout/stderr capture truncation for this request.
- *
- * Cannot be combined with `outputBytesCap`.
- */
-disableOutputCap?: boolean, 
-/**
- * Disable the timeout entirely for this request.
- *
- * Cannot be combined with `timeoutMs`.
- */
-disableTimeout?: boolean, 
-/**
- * Optional timeout in milliseconds.
- *
- * When omitted, the server default applies. Cannot be combined with
- * `disableTimeout`.
- */
-timeoutMs?: number | null, 
-/**
- * Optional working directory. Defaults to the server cwd.
- */
-cwd?: string | null, 
-/**
- * Optional environment overrides merged into the server-computed
- * environment.
- *
- * Matching names override inherited values. Set a key to `null` to unset
- * an inherited variable.
- */
-env?: { [key in string]?: string | null } | null, 
-/**
- * Optional initial PTY size in character cells. Only valid when `tty` is
- * true.
- */
-size?: CommandExecTerminalSize | null, 
-/**
- * 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.
- */
-sandboxPolicy?: SandboxPolicy | null, };
+export type CommandExecParams = { command: Array<string>, timeoutMs?: number | null, cwd?: string | null, sandboxPolicy?: SandboxPolicy | null, };

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecResizeParams.ts

@@ -1,18 +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 { CommandExecTerminalSize } from "./CommandExecTerminalSize";
-
-/**
- * Resize a running PTY-backed `command/exec` session.
- */
-export type CommandExecResizeParams = { 
-/**
- * Client-supplied, connection-scoped `processId` from the original
- * `command/exec` request.
- */
-processId: string, 
-/**
- * New PTY size in character cells.
- */
-size: CommandExecTerminalSize, };

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecResizeResponse.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.
-
-/**
- * Empty success response for `command/exec/resize`.
- */
-export type CommandExecResizeResponse = Record<string, never>;

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecResponse.ts

@@ -2,23 +2,4 @@
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-/**
- * Final buffered result for `command/exec`.
- */
-export type CommandExecResponse = { 
-/**
- * Process exit code.
- */
-exitCode: number, 
-/**
- * Buffered stdout capture.
- *
- * Empty when stdout was streamed via `command/exec/outputDelta`.
- */
-stdout: string, 
-/**
- * Buffered stderr capture.
- *
- * Empty when stderr was streamed via `command/exec/outputDelta`.
- */
-stderr: string, };
+export type CommandExecResponse = { exitCode: number, stdout: string, stderr: string, };

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecTerminalSize.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 `command/exec` PTY sessions.
- */
-export type CommandExecTerminalSize = { 
-/**
- * Terminal height in character cells.
- */
-rows: number, 
-/**
- * Terminal width in character cells.
- */
-cols: number, };

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecTerminateParams.ts

@@ -1,13 +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.
-
-/**
- * Terminate a running `command/exec` session.
- */
-export type CommandExecTerminateParams = { 
-/**
- * Client-supplied, connection-scoped `processId` from the original
- * `command/exec` request.
- */
-processId: string, };

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecTerminateResponse.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.
-
-/**
- * Empty success response for `command/exec/terminate`.
- */
-export type CommandExecTerminateResponse = Record<string, never>;

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecWriteParams.ts

@@ -1,22 +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.
-
-/**
- * Write stdin bytes to a running `command/exec` session, close stdin, or
- * both.
- */
-export type CommandExecWriteParams = { 
-/**
- * Client-supplied, connection-scoped `processId` from the original
- * `command/exec` request.
- */
-processId: string, 
-/**
- * Optional base64-encoded stdin bytes to write.
- */
-deltaBase64?: string | null, 
-/**
- * Close stdin after writing `deltaBase64`, if present.
- */
-closeStdin?: boolean, };

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecWriteResponse.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.
-
-/**
- * Empty success response for `command/exec/write`.
- */
-export type CommandExecWriteResponse = Record<string, never>;

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecutionRequestApprovalParams.ts

@@ -4,7 +4,6 @@
 import type { AdditionalPermissionProfile } from "./AdditionalPermissionProfile";
 import type { CommandAction } from "./CommandAction";
 import type { CommandExecutionApprovalDecision } from "./CommandExecutionApprovalDecision";
-import type { CommandExecutionRequestApprovalSkillMetadata } from "./CommandExecutionRequestApprovalSkillMetadata";
 import type { ExecPolicyAmendment } from "./ExecPolicyAmendment";
 import type { NetworkApprovalContext } from "./NetworkApprovalContext";
 import type { NetworkPolicyAmendment } from "./NetworkPolicyAmendment";
@@ -44,10 +43,6 @@ commandActions?: Array<CommandAction> | null,
  * Optional additional permissions requested for this command.
  */
 additionalPermissions?: AdditionalPermissionProfile | null, 
-/**
- * Optional skill metadata when the approval was triggered by a skill script.
- */
-skillMetadata?: CommandExecutionRequestApprovalSkillMetadata | null, 
 /**
  * Optional proposed execpolicy amendment to allow similar commands without prompting.
  */

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecutionRequestApprovalSkillMetadata.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 CommandExecutionRequestApprovalSkillMetadata = { pathToSkillsMd: string, };

codex-rs/app-server-protocol/schema/typescript/v2/ConfigBatchWriteParams.ts

@@ -7,8 +7,4 @@ export type ConfigBatchWriteParams = { edits: Array<ConfigEdit>,
 /**
  * Path to the config file to write; defaults to the user's `config.toml` when omitted.
  */
-filePath?: string | null, expectedVersion?: string | null, 
-/**
- * When true, hot-reload the updated user config into all loaded threads after writing.
- */
-reloadUserConfig?: boolean, };
+filePath?: string | null, expectedVersion?: string | null, };

codex-rs/app-server-protocol/schema/typescript/v2/GrantedMacOsPermissions.ts

@@ -1,7 +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 { MacOsAutomationPermission } from "../MacOsAutomationPermission";
-import type { MacOsPreferencesPermission } from "../MacOsPreferencesPermission";
-
-export type GrantedMacOsPermissions = { preferences?: MacOsPreferencesPermission, automations?: MacOsAutomationPermission, accessibility?: boolean, calendar?: boolean, };

codex-rs/app-server-protocol/schema/typescript/v2/GrantedPermissionProfile.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.
-import type { AdditionalFileSystemPermissions } from "./AdditionalFileSystemPermissions";
-import type { AdditionalNetworkPermissions } from "./AdditionalNetworkPermissions";
-import type { GrantedMacOsPermissions } from "./GrantedMacOsPermissions";
-
-export type GrantedPermissionProfile = { network?: AdditionalNetworkPermissions, fileSystem?: AdditionalFileSystemPermissions, macos?: GrantedMacOsPermissions, };

codex-rs/app-server-protocol/schema/typescript/v2/PermissionsRequestApprovalParams.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 { AdditionalPermissionProfile } from "./AdditionalPermissionProfile";
-
-export type PermissionsRequestApprovalParams = { threadId: string, turnId: string, itemId: string, reason: string | null, permissions: AdditionalPermissionProfile, };

codex-rs/app-server-protocol/schema/typescript/v2/PermissionsRequestApprovalResponse.ts

@@ -1,7 +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 { GrantedPermissionProfile } from "./GrantedPermissionProfile";
-import type { PermissionGrantScope } from "./PermissionGrantScope";
-
-export type PermissionsRequestApprovalResponse = { permissions: GrantedPermissionProfile, scope: PermissionGrantScope, };

codex-rs/app-server-protocol/schema/typescript/v2/PluginInterface.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 { AbsolutePathBuf } from "../AbsolutePathBuf";
-
-export type PluginInterface = { displayName: string | null, shortDescription: string | null, longDescription: string | null, developerName: string | null, category: string | null, capabilities: Array<string>, websiteUrl: string | null, privacyPolicyUrl: string | null, termsOfServiceUrl: string | null, defaultPrompt: string | null, brandColor: string | null, composerIcon: AbsolutePathBuf | null, logo: AbsolutePathBuf | null, screenshots: Array<AbsolutePathBuf>, };

codex-rs/app-server-protocol/schema/typescript/v2/PluginListParams.ts

@@ -6,6 +6,6 @@ import type { AbsolutePathBuf } from "../AbsolutePathBuf";
 export type PluginListParams = { 
 /**
  * Optional working directories used to discover repo marketplaces. When omitted,
- * only home-scoped marketplaces and the official curated marketplace are considered.
+ * only home-scoped marketplaces are considered.
  */
 cwds?: Array<AbsolutePathBuf> | null, };

codex-rs/app-server-protocol/schema/typescript/v2/PluginMarketplaceEntry.ts

@@ -1,7 +1,6 @@
 // GENERATED CODE! DO NOT MODIFY BY HAND!
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AbsolutePathBuf } from "../AbsolutePathBuf";
 import type { PluginSummary } from "./PluginSummary";
 
-export type PluginMarketplaceEntry = { name: string, path: AbsolutePathBuf, plugins: Array<PluginSummary>, };
+export type PluginMarketplaceEntry = { name: string, path: string, plugins: Array<PluginSummary>, };

codex-rs/app-server-protocol/schema/typescript/v2/PluginSource.ts

@@ -1,6 +1,5 @@
 // GENERATED CODE! DO NOT MODIFY BY HAND!
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AbsolutePathBuf } from "../AbsolutePathBuf";
 
-export type PluginSource = { "type": "local", path: AbsolutePathBuf, };
+export type PluginSource = { "type": "local", path: string, };

codex-rs/app-server-protocol/schema/typescript/v2/PluginSummary.ts

@@ -1,7 +1,6 @@
 // GENERATED CODE! DO NOT MODIFY BY HAND!
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { PluginInterface } from "./PluginInterface";
 import type { PluginSource } from "./PluginSource";
 
-export type PluginSummary = { id: string, name: string, source: PluginSource, installed: boolean, enabled: boolean, interface: PluginInterface | null, };
+export type PluginSummary = { name: string, source: PluginSource, enabled: boolean, };

codex-rs/app-server-protocol/schema/typescript/v2/PluginUninstallParams.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 PluginUninstallParams = { pluginId: string, };

codex-rs/app-server-protocol/schema/typescript/v2/PluginUninstallResponse.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 PluginUninstallResponse = Record<string, never>;

codex-rs/app-server-protocol/schema/typescript/v2/ProfileV2.ts

@@ -8,6 +8,5 @@ import type { Verbosity } from "../Verbosity";
 import type { WebSearchMode } from "../WebSearchMode";
 import type { JsonValue } from "../serde_json/JsonValue";
 import type { AskForApproval } from "./AskForApproval";
-import type { ToolsV2 } from "./ToolsV2";
 
-export type ProfileV2 = { model: string | null, model_provider: string | null, approval_policy: AskForApproval | null, service_tier: ServiceTier | null, model_reasoning_effort: ReasoningEffort | null, model_reasoning_summary: ReasoningSummary | null, model_verbosity: Verbosity | null, web_search: WebSearchMode | null, tools: ToolsV2 | null, chatgpt_base_url: string | null, } & ({ [key in string]?: number | string | boolean | Array<JsonValue> | { [key in string]?: JsonValue } | null });
+export type ProfileV2 = { model: string | null, model_provider: string | null, approval_policy: AskForApproval | null, service_tier: ServiceTier | null, model_reasoning_effort: ReasoningEffort | null, model_reasoning_summary: ReasoningSummary | null, model_verbosity: Verbosity | null, web_search: WebSearchMode | null, chatgpt_base_url: string | null, } & ({ [key in string]?: number | string | boolean | Array<JsonValue> | { [key in string]?: JsonValue } | null });

codex-rs/app-server-protocol/schema/typescript/v2/ToolsV2.ts

@@ -1,6 +1,5 @@
 // GENERATED CODE! DO NOT MODIFY BY HAND!
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { WebSearchToolConfig } from "../WebSearchToolConfig";
 
-export type ToolsV2 = { web_search: WebSearchToolConfig | null, view_image: boolean | null, };
+export type ToolsV2 = { web_search: boolean | null, view_image: boolean | null, };

codex-rs/app-server-protocol/schema/typescript/v2/TurnStartParams.ts

@@ -36,8 +36,7 @@ summary?: ReasoningSummary | null, /**
  * Override the personality for this turn and subsequent turns.
  */
 personality?: Personality | null, /**
- * Optional JSON Schema used to constrain the final assistant message for
- * this turn.
+ * Optional JSON Schema used to constrain the final assistant message for this turn.
  */
 outputSchema?: JsonValue | null, /**
  * EXPERIMENTAL - Set a pre-set collaboration mode.

codex-rs/app-server-protocol/schema/typescript/v2/WindowsSandboxSetupStartParams.ts

@@ -1,7 +1,6 @@
 // GENERATED CODE! DO NOT MODIFY BY HAND!
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AbsolutePathBuf } from "../AbsolutePathBuf";
 import type { WindowsSandboxSetupMode } from "./WindowsSandboxSetupMode";
 
-export type WindowsSandboxSetupStartParams = { mode: WindowsSandboxSetupMode, cwd?: AbsolutePathBuf | null, };
+export type WindowsSandboxSetupStartParams = { mode: WindowsSandboxSetupMode, cwd?: string | null, };

codex-rs/app-server-protocol/schema/typescript/v2/index.ts

@@ -38,22 +38,12 @@ export type { CollabAgentTool } from "./CollabAgentTool";
 export type { CollabAgentToolCallStatus } from "./CollabAgentToolCallStatus";
 export type { CollaborationModeMask } from "./CollaborationModeMask";
 export type { CommandAction } from "./CommandAction";
-export type { CommandExecOutputDeltaNotification } from "./CommandExecOutputDeltaNotification";
-export type { CommandExecOutputStream } from "./CommandExecOutputStream";
 export type { CommandExecParams } from "./CommandExecParams";
-export type { CommandExecResizeParams } from "./CommandExecResizeParams";
-export type { CommandExecResizeResponse } from "./CommandExecResizeResponse";
 export type { CommandExecResponse } from "./CommandExecResponse";
-export type { CommandExecTerminalSize } from "./CommandExecTerminalSize";
-export type { CommandExecTerminateParams } from "./CommandExecTerminateParams";
-export type { CommandExecTerminateResponse } from "./CommandExecTerminateResponse";
-export type { CommandExecWriteParams } from "./CommandExecWriteParams";
-export type { CommandExecWriteResponse } from "./CommandExecWriteResponse";
 export type { CommandExecutionApprovalDecision } from "./CommandExecutionApprovalDecision";
 export type { CommandExecutionOutputDeltaNotification } from "./CommandExecutionOutputDeltaNotification";
 export type { CommandExecutionRequestApprovalParams } from "./CommandExecutionRequestApprovalParams";
 export type { CommandExecutionRequestApprovalResponse } from "./CommandExecutionRequestApprovalResponse";
-export type { CommandExecutionRequestApprovalSkillMetadata } from "./CommandExecutionRequestApprovalSkillMetadata";
 export type { CommandExecutionStatus } from "./CommandExecutionStatus";
 export type { Config } from "./Config";
 export type { ConfigBatchWriteParams } from "./ConfigBatchWriteParams";
@@ -99,8 +89,6 @@ export type { GetAccountParams } from "./GetAccountParams";
 export type { GetAccountRateLimitsResponse } from "./GetAccountRateLimitsResponse";
 export type { GetAccountResponse } from "./GetAccountResponse";
 export type { GitInfo } from "./GitInfo";
-export type { GrantedMacOsPermissions } from "./GrantedMacOsPermissions";
-export type { GrantedPermissionProfile } from "./GrantedPermissionProfile";
 export type { HazelnutScope } from "./HazelnutScope";
 export type { ItemCompletedNotification } from "./ItemCompletedNotification";
 export type { ItemStartedNotification } from "./ItemStartedNotification";
@@ -161,20 +149,14 @@ export type { NetworkRequirements } from "./NetworkRequirements";
 export type { OverriddenMetadata } from "./OverriddenMetadata";
 export type { PatchApplyStatus } from "./PatchApplyStatus";
 export type { PatchChangeKind } from "./PatchChangeKind";
-export type { PermissionGrantScope } from "./PermissionGrantScope";
-export type { PermissionsRequestApprovalParams } from "./PermissionsRequestApprovalParams";
-export type { PermissionsRequestApprovalResponse } from "./PermissionsRequestApprovalResponse";
 export type { PlanDeltaNotification } from "./PlanDeltaNotification";
 export type { PluginInstallParams } from "./PluginInstallParams";
 export type { PluginInstallResponse } from "./PluginInstallResponse";
-export type { PluginInterface } from "./PluginInterface";
 export type { PluginListParams } from "./PluginListParams";
 export type { PluginListResponse } from "./PluginListResponse";
 export type { PluginMarketplaceEntry } from "./PluginMarketplaceEntry";
 export type { PluginSource } from "./PluginSource";
 export type { PluginSummary } from "./PluginSummary";
-export type { PluginUninstallParams } from "./PluginUninstallParams";
-export type { PluginUninstallResponse } from "./PluginUninstallResponse";
 export type { ProductSurface } from "./ProductSurface";
 export type { ProfileV2 } from "./ProfileV2";
 export type { RateLimitSnapshot } from "./RateLimitSnapshot";

codex-rs/app-server-protocol/src/export.rs

@@ -23,7 +23,6 @@ use schemars::schema_for;
 use serde::Serialize;
 use serde_json::Map;
 use serde_json::Value;
-use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::collections::HashSet;
 use std::ffi::OsStr;
@@ -33,10 +32,9 @@ use std::io::Write;
 use std::path::Path;
 use std::path::PathBuf;
 use std::process::Command;
-use std::thread;
 use ts_rs::TS;
 
-pub(crate) const GENERATED_TS_HEADER: &str = "// GENERATED CODE! DO NOT MODIFY BY HAND!\n\n";
+const HEADER: &str = "// GENERATED CODE! DO NOT MODIFY BY HAND!\n\n";
 const IGNORED_DEFINITIONS: &[&str] = &["Option<()>"];
 const JSON_V1_ALLOWLIST: &[&str] = &["InitializeParams", "InitializeResponse"];
 const SPECIAL_DEFINITIONS: &[&str] = &[
@@ -139,29 +137,9 @@ pub fn generate_ts_with_options(
     }
 
     if options.ensure_headers {
-        let worker_count = thread::available_parallelism()
-            .map_or(1, usize::from)
-            .min(ts_files.len().max(1));
-        let chunk_size = ts_files.len().div_ceil(worker_count);
-        thread::scope(|scope| -> Result<()> {
-            let mut workers = Vec::new();
-            for chunk in ts_files.chunks(chunk_size.max(1)) {
-                workers.push(scope.spawn(move || -> Result<()> {
-                    for file in chunk {
-                        prepend_header_if_missing(file)?;
-                    }
-                    Ok(())
-                }));
-            }
-
-            for worker in workers {
-                worker
-                    .join()
-                    .map_err(|_| anyhow!("TypeScript header worker panicked"))??;
-            }
-
-            Ok(())
-        })?;
+        for file in &ts_files {
+            prepend_header_if_missing(file)?;
+        }
     }
 
     // Optionally run Prettier on all generated TS files.
@@ -253,41 +231,6 @@ fn filter_experimental_ts(out_dir: &Path) -> Result<()> {
     Ok(())
 }
 
-pub(crate) fn filter_experimental_ts_tree(tree: &mut BTreeMap<PathBuf, String>) -> Result<()> {
-    let registered_fields = experimental_fields();
-    let experimental_method_types = experimental_method_types();
-    if let Some(content) = tree.get_mut(Path::new("ClientRequest.ts")) {
-        let filtered =
-            filter_client_request_ts_contents(std::mem::take(content), EXPERIMENTAL_CLIENT_METHODS);
-        *content = filtered;
-    }
-
-    let mut fields_by_type_name: HashMap<String, HashSet<String>> = HashMap::new();
-    for field in registered_fields {
-        fields_by_type_name
-            .entry(field.type_name.to_string())
-            .or_default()
-            .insert(field.field_name.to_string());
-    }
-
-    for (path, content) in tree.iter_mut() {
-        let Some(type_name) = path.file_stem().and_then(|stem| stem.to_str()) else {
-            continue;
-        };
-        let Some(experimental_field_names) = fields_by_type_name.get(type_name) else {
-            continue;
-        };
-        let filtered = filter_experimental_type_fields_ts_contents(
-            std::mem::take(content),
-            experimental_field_names,
-        );
-        *content = filtered;
-    }
-
-    remove_generated_type_entries(tree, &experimental_method_types, "ts");
-    Ok(())
-}
-
 /// Removes union arms from `ClientRequest.ts` for methods marked experimental.
 fn filter_client_request_ts(out_dir: &Path, experimental_methods: &[&str]) -> Result<()> {
     let path = out_dir.join("ClientRequest.ts");
@@ -296,15 +239,9 @@ fn filter_client_request_ts(out_dir: &Path, experimental_methods: &[&str]) -> Re
     }
     let mut content =
         fs::read_to_string(&path).with_context(|| format!("Failed to read {}", path.display()))?;
-    content = filter_client_request_ts_contents(content, experimental_methods);
 
-    fs::write(&path, content).with_context(|| format!("Failed to write {}", path.display()))?;
-    Ok(())
-}
-
-fn filter_client_request_ts_contents(mut content: String, experimental_methods: &[&str]) -> String {
     let Some((prefix, body, suffix)) = split_type_alias(&content) else {
-        return content;
+        return Ok(());
     };
     let experimental_methods: HashSet<&str> = experimental_methods
         .iter()
@@ -322,9 +259,12 @@ fn filter_client_request_ts_contents(mut content: String, experimental_methods:
     let new_body = filtered_arms.join(" | ");
     content = format!("{prefix}{new_body}{suffix}");
     let import_usage_scope = split_type_alias(&content)
-        .map(|(_, filtered_body, _)| filtered_body)
+        .map(|(_, body, _)| body)
         .unwrap_or_else(|| new_body.clone());
-    prune_unused_type_imports(content, &import_usage_scope)
+    content = prune_unused_type_imports(content, &import_usage_scope);
+
+    fs::write(&path, content).with_context(|| format!("Failed to write {}", path.display()))?;
+    Ok(())
 }
 
 /// Removes experimental properties from generated TypeScript type files.
@@ -362,17 +302,8 @@ fn filter_experimental_fields_in_ts_file(
 ) -> Result<()> {
     let mut content =
         fs::read_to_string(path).with_context(|| format!("Failed to read {}", path.display()))?;
-    content = filter_experimental_type_fields_ts_contents(content, experimental_field_names);
-    fs::write(path, content).with_context(|| format!("Failed to write {}", path.display()))?;
-    Ok(())
-}
-
-fn filter_experimental_type_fields_ts_contents(
-    mut content: String,
-    experimental_field_names: &HashSet<String>,
-) -> String {
     let Some((open_brace, close_brace)) = type_body_brace_span(&content) else {
-        return content;
+        return Ok(());
     };
     let inner = &content[open_brace + 1..close_brace];
     let fields = split_top_level_multi(inner, &[',', ';']);
@@ -391,7 +322,9 @@ fn filter_experimental_type_fields_ts_contents(
     let import_usage_scope = split_type_alias(&content)
         .map(|(_, body, _)| body)
         .unwrap_or_else(|| new_inner.clone());
-    prune_unused_type_imports(content, &import_usage_scope)
+    content = prune_unused_type_imports(content, &import_usage_scope);
+    fs::write(path, content).with_context(|| format!("Failed to write {}", path.display()))?;
+    Ok(())
 }
 
 fn filter_experimental_schema(bundle: &mut Value) -> Result<()> {
@@ -593,23 +526,6 @@ fn remove_generated_type_files(
     Ok(())
 }
 
-fn remove_generated_type_entries(
-    tree: &mut BTreeMap<PathBuf, String>,
-    type_names: &HashSet<String>,
-    extension: &str,
-) {
-    for type_name in type_names {
-        for subdir in ["", "v1", "v2"] {
-            let path = if subdir.is_empty() {
-                PathBuf::from(format!("{type_name}.{extension}"))
-            } else {
-                PathBuf::from(subdir).join(format!("{type_name}.{extension}"))
-            };
-            tree.remove(&path);
-        }
-    }
-}
-
 fn remove_experimental_method_type_definitions(bundle: &mut Value) {
     let type_names = experimental_method_types();
     let Some(definitions) = bundle.get_mut("definitions").and_then(Value::as_object_mut) else {
@@ -1238,40 +1154,13 @@ fn insert_into_namespace(
         .or_insert_with(|| Value::Object(Map::new()));
     match entry {
         Value::Object(map) => {
-            insert_definition(map, name, schema, &format!("namespace `{namespace}`"))
+            map.insert(name, schema);
+            Ok(())
         }
         _ => Err(anyhow!("expected namespace {namespace} to be an object")),
     }
 }
 
-fn insert_definition(
-    definitions: &mut Map<String, Value>,
-    name: String,
-    schema: Value,
-    location: &str,
-) -> Result<()> {
-    if let Some(existing) = definitions.get(&name) {
-        if existing == &schema {
-            return Ok(());
-        }
-
-        let existing_title = existing
-            .get("title")
-            .and_then(Value::as_str)
-            .unwrap_or("<untitled>");
-        let new_title = schema
-            .get("title")
-            .and_then(Value::as_str)
-            .unwrap_or("<untitled>");
-        return Err(anyhow!(
-            "schema definition collision in {location}: {name} (existing title: {existing_title}, new title: {new_title}); use #[schemars(rename = \"...\")] to rename one of the conflicting schema definitions"
-        ));
-    }
-
-    definitions.insert(name, schema);
-    Ok(())
-}
-
 fn write_json_schema_with_return<T>(out_dir: &Path, name: &str) -> Result<GeneratedSchema>
 where
     T: JsonSchema,
@@ -1891,13 +1780,13 @@ fn prepend_header_if_missing(path: &Path) -> Result<()> {
             .with_context(|| format!("Failed to read {}", path.display()))?;
     }
 
-    if content.starts_with(GENERATED_TS_HEADER) {
+    if content.starts_with(HEADER) {
         return Ok(());
     }
 
     let mut f = fs::File::create(path)
         .with_context(|| format!("Failed to open {} for writing", path.display()))?;
-    f.write_all(GENERATED_TS_HEADER.as_bytes())
+    f.write_all(HEADER.as_bytes())
         .with_context(|| format!("Failed to write header to {}", path.display()))?;
     f.write_all(content.as_bytes())
         .with_context(|| format!("Failed to write content to {}", path.display()))?;
@@ -1942,15 +1831,35 @@ fn ts_files_in_recursive(dir: &Path) -> Result<Vec<PathBuf>> {
 /// Generate an index.ts file that re-exports all generated types.
 /// This allows consumers to import all types from a single file.
 fn generate_index_ts(out_dir: &Path) -> Result<PathBuf> {
-    let content = generated_index_ts_with_header(index_ts_entries(
-        &ts_files_in(out_dir)?
-            .iter()
-            .map(PathBuf::as_path)
-            .collect::<Vec<_>>(),
-        ts_files_in(&out_dir.join("v2"))
-            .map(|v| !v.is_empty())
-            .unwrap_or(false),
-    ));
+    let mut entries: Vec<String> = Vec::new();
+    let mut stems: Vec<String> = ts_files_in(out_dir)?
+        .into_iter()
+        .filter_map(|p| {
+            let stem = p.file_stem()?.to_string_lossy().into_owned();
+            if stem == "index" { None } else { Some(stem) }
+        })
+        .collect();
+    stems.sort();
+    stems.dedup();
+
+    for name in stems {
+        entries.push(format!("export type {{ {name} }} from \"./{name}\";\n"));
+    }
+
+    // If this is the root out_dir and a ./v2 folder exists with TS files,
+    // expose it as a namespace to avoid symbol collisions at the root.
+    let v2_dir = out_dir.join("v2");
+    let has_v2_ts = ts_files_in(&v2_dir).map(|v| !v.is_empty()).unwrap_or(false);
+    if has_v2_ts {
+        entries.push("export * as v2 from \"./v2\";\n".to_string());
+    }
+
+    let mut content =
+        String::with_capacity(HEADER.len() + entries.iter().map(String::len).sum::<usize>());
+    content.push_str(HEADER);
+    for line in &entries {
+        content.push_str(line);
+    }
 
     let index_path = out_dir.join("index.ts");
     let mut f = fs::File::create(&index_path)
@@ -1960,278 +1869,244 @@ fn generate_index_ts(out_dir: &Path) -> Result<PathBuf> {
     Ok(index_path)
 }
 
-pub(crate) fn generate_index_ts_tree(tree: &mut BTreeMap<PathBuf, String>) {
-    let root_entries = tree
-        .keys()
-        .filter(|path| path.components().count() == 1)
-        .map(PathBuf::as_path)
-        .collect::<Vec<_>>();
-    let has_v2_ts = tree.keys().any(|path| {
-        path.parent()
-            .is_some_and(|parent| parent == Path::new("v2"))
-            && path.extension() == Some(OsStr::new("ts"))
-            && path.file_stem().is_some_and(|stem| stem != "index")
-    });
-    tree.insert(
-        PathBuf::from("index.ts"),
-        index_ts_entries(&root_entries, has_v2_ts),
-    );
-
-    let v2_entries = tree
-        .keys()
-        .filter(|path| {
-            path.parent()
-                .is_some_and(|parent| parent == Path::new("v2"))
-        })
-        .map(PathBuf::as_path)
-        .collect::<Vec<_>>();
-    if !v2_entries.is_empty() {
-        tree.insert(
-            PathBuf::from("v2").join("index.ts"),
-            index_ts_entries(&v2_entries, false),
-        );
-    }
-}
-
-fn generated_index_ts_with_header(content: String) -> String {
-    let mut with_header = String::with_capacity(GENERATED_TS_HEADER.len() + content.len());
-    with_header.push_str(GENERATED_TS_HEADER);
-    with_header.push_str(&content);
-    with_header
-}
-
-fn index_ts_entries(paths: &[&Path], has_v2_ts: bool) -> String {
-    let mut stems: Vec<String> = paths
-        .iter()
-        .filter(|path| path.extension() == Some(OsStr::new("ts")))
-        .filter_map(|path| {
-            let stem = path.file_stem()?.to_string_lossy().into_owned();
-            if stem == "index" { None } else { Some(stem) }
-        })
-        .collect();
-    stems.sort();
-    stems.dedup();
-
-    let mut entries = String::new();
-    for name in stems {
-        entries.push_str(&format!("export type {{ {name} }} from \"./{name}\";\n"));
-    }
-    if has_v2_ts {
-        entries.push_str("export * as v2 from \"./v2\";\n");
-    }
-    entries
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::protocol::v2;
-    use crate::schema_fixtures::read_schema_fixture_subtree;
-    use anyhow::Context;
     use anyhow::Result;
     use pretty_assertions::assert_eq;
     use std::collections::BTreeSet;
-    use std::path::Path;
+    use std::fs;
     use std::path::PathBuf;
     use uuid::Uuid;
 
     #[test]
     fn generated_ts_optional_nullable_fields_only_in_params() -> Result<()> {
         // Assert that "?: T | null" only appears in generated *Params types.
-        let fixture_tree = read_schema_fixture_subtree(&schema_root()?, "typescript")?;
+        let output_dir = std::env::temp_dir().join(format!("codex_ts_types_{}", Uuid::now_v7()));
+        fs::create_dir(&output_dir)?;
 
-        let client_request_ts = std::str::from_utf8(
-            fixture_tree
-                .get(Path::new("ClientRequest.ts"))
-                .ok_or_else(|| anyhow::anyhow!("missing ClientRequest.ts fixture"))?,
-        )?;
+        struct TempDirGuard(PathBuf);
+
+        impl Drop for TempDirGuard {
+            fn drop(&mut self) {
+                let _ = fs::remove_dir_all(&self.0);
+            }
+        }
+
+        let _guard = TempDirGuard(output_dir.clone());
+
+        // Avoid doing more work than necessary to keep the test from timing out.
+        let options = GenerateTsOptions {
+            generate_indices: false,
+            ensure_headers: false,
+            run_prettier: false,
+            experimental_api: false,
+        };
+        generate_ts_with_options(&output_dir, None, options)?;
+
+        let client_request_ts = fs::read_to_string(output_dir.join("ClientRequest.ts"))?;
         assert_eq!(client_request_ts.contains("mock/experimentalMethod"), false);
         assert_eq!(
             client_request_ts.contains("MockExperimentalMethodParams"),
             false
         );
-        assert_eq!(fixture_tree.contains_key(Path::new("EventMsg.ts")), true);
-        let thread_start_ts = std::str::from_utf8(
-            fixture_tree
-                .get(Path::new("v2/ThreadStartParams.ts"))
-                .ok_or_else(|| anyhow::anyhow!("missing v2/ThreadStartParams.ts fixture"))?,
-        )?;
+        assert_eq!(output_dir.join("EventMsg.ts").exists(), true);
+        let thread_start_ts =
+            fs::read_to_string(output_dir.join("v2").join("ThreadStartParams.ts"))?;
         assert_eq!(thread_start_ts.contains("mockExperimentalField"), false);
         assert_eq!(
-            fixture_tree.contains_key(Path::new("v2/MockExperimentalMethodParams.ts")),
+            output_dir
+                .join("v2")
+                .join("MockExperimentalMethodParams.ts")
+                .exists(),
             false
         );
         assert_eq!(
-            fixture_tree.contains_key(Path::new("v2/MockExperimentalMethodResponse.ts")),
+            output_dir
+                .join("v2")
+                .join("MockExperimentalMethodResponse.ts")
+                .exists(),
             false
         );
 
         let mut undefined_offenders = Vec::new();
         let mut optional_nullable_offenders = BTreeSet::new();
-        for (path, contents) in &fixture_tree {
-            if !matches!(path.extension().and_then(|ext| ext.to_str()), Some("ts")) {
-                continue;
-            }
-
-            // Only allow "?: T | null" in objects representing JSON-RPC requests,
-            // which we assume are called "*Params".
-            let allow_optional_nullable = path
-                .file_stem()
-                .and_then(|stem| stem.to_str())
-                .is_some_and(|stem| {
-                    stem.ends_with("Params")
-                        || stem == "InitializeCapabilities"
-                        || matches!(
-                            stem,
-                            "CollabAgentRef"
-                                | "CollabAgentStatusEntry"
-                                | "CollabAgentSpawnEndEvent"
-                                | "CollabAgentInteractionEndEvent"
-                                | "CollabCloseEndEvent"
-                                | "CollabResumeBeginEvent"
-                                | "CollabResumeEndEvent"
-                        )
-                });
-
-            let contents = std::str::from_utf8(contents)?;
-            if contents.contains("| undefined") {
-                undefined_offenders.push(path.clone());
-            }
-
-            const SKIP_PREFIXES: &[&str] = &[
-                "const ",
-                "let ",
-                "var ",
-                "export const ",
-                "export let ",
-                "export var ",
-            ];
-
-            let mut search_start = 0;
-            while let Some(idx) = contents[search_start..].find("| null") {
-                let abs_idx = search_start + idx;
-                // Find the property-colon for this field by scanning forward
-                // from the start of the segment and ignoring nested braces,
-                // brackets, and parens. This avoids colons inside nested
-                // type literals like `{ [k in string]?: string }`.
-
-                let line_start_idx = contents[..abs_idx].rfind('\n').map(|i| i + 1).unwrap_or(0);
-
-                let mut segment_start_idx = line_start_idx;
-                if let Some(rel_idx) = contents[line_start_idx..abs_idx].rfind(',') {
-                    segment_start_idx = segment_start_idx.max(line_start_idx + rel_idx + 1);
-                }
-                if let Some(rel_idx) = contents[line_start_idx..abs_idx].rfind('{') {
-                    segment_start_idx = segment_start_idx.max(line_start_idx + rel_idx + 1);
-                }
-                if let Some(rel_idx) = contents[line_start_idx..abs_idx].rfind('}') {
-                    segment_start_idx = segment_start_idx.max(line_start_idx + rel_idx + 1);
+        let mut stack = vec![output_dir];
+        while let Some(dir) = stack.pop() {
+            for entry in fs::read_dir(&dir)? {
+                let entry = entry?;
+                let path = entry.path();
+                if path.is_dir() {
+                    stack.push(path);
+                    continue;
                 }
 
-                // Scan forward for the colon that separates the field name from its type.
-                let mut level_brace = 0_i32;
-                let mut level_brack = 0_i32;
-                let mut level_paren = 0_i32;
-                let mut in_single = false;
-                let mut in_double = false;
-                let mut escape = false;
-                let mut prop_colon_idx = None;
-                for (i, ch) in contents[segment_start_idx..abs_idx].char_indices() {
-                    let idx_abs = segment_start_idx + i;
-                    if escape {
-                        escape = false;
-                        continue;
+                if matches!(path.extension().and_then(|ext| ext.to_str()), Some("ts")) {
+                    // Only allow "?: T | null" in objects representing JSON-RPC requests,
+                    // which we assume are called "*Params".
+                    let allow_optional_nullable = path
+                        .file_stem()
+                        .and_then(|stem| stem.to_str())
+                        .is_some_and(|stem| {
+                            stem.ends_with("Params")
+                                || stem == "InitializeCapabilities"
+                                || matches!(
+                                    stem,
+                                    "CollabAgentRef"
+                                        | "CollabAgentStatusEntry"
+                                        | "CollabAgentSpawnEndEvent"
+                                        | "CollabAgentInteractionEndEvent"
+                                        | "CollabCloseEndEvent"
+                                        | "CollabResumeBeginEvent"
+                                        | "CollabResumeEndEvent"
+                                )
+                        });
+
+                    let contents = fs::read_to_string(&path)?;
+                    if contents.contains("| undefined") {
+                        undefined_offenders.push(path.clone());
                     }
-                    match ch {
-                        '\\' => {
-                            if in_single || in_double {
-                                escape = true;
+
+                    const SKIP_PREFIXES: &[&str] = &[
+                        "const ",
+                        "let ",
+                        "var ",
+                        "export const ",
+                        "export let ",
+                        "export var ",
+                    ];
+
+                    let mut search_start = 0;
+                    while let Some(idx) = contents[search_start..].find("| null") {
+                        let abs_idx = search_start + idx;
+                        // Find the property-colon for this field by scanning forward
+                        // from the start of the segment and ignoring nested braces,
+                        // brackets, and parens. This avoids colons inside nested
+                        // type literals like `{ [k in string]?: string }`.
+
+                        let line_start_idx =
+                            contents[..abs_idx].rfind('\n').map(|i| i + 1).unwrap_or(0);
+
+                        let mut segment_start_idx = line_start_idx;
+                        if let Some(rel_idx) = contents[line_start_idx..abs_idx].rfind(',') {
+                            segment_start_idx = segment_start_idx.max(line_start_idx + rel_idx + 1);
+                        }
+                        if let Some(rel_idx) = contents[line_start_idx..abs_idx].rfind('{') {
+                            segment_start_idx = segment_start_idx.max(line_start_idx + rel_idx + 1);
+                        }
+                        if let Some(rel_idx) = contents[line_start_idx..abs_idx].rfind('}') {
+                            segment_start_idx = segment_start_idx.max(line_start_idx + rel_idx + 1);
+                        }
+
+                        // Scan forward for the colon that separates the field name from its type.
+                        let mut level_brace = 0_i32;
+                        let mut level_brack = 0_i32;
+                        let mut level_paren = 0_i32;
+                        let mut in_single = false;
+                        let mut in_double = false;
+                        let mut escape = false;
+                        let mut prop_colon_idx = None;
+                        for (i, ch) in contents[segment_start_idx..abs_idx].char_indices() {
+                            let idx_abs = segment_start_idx + i;
+                            if escape {
+                                escape = false;
+                                continue;
+                            }
+                            match ch {
+                                '\\' => {
+                                    // Only treat as escape when inside a string.
+                                    if in_single || in_double {
+                                        escape = true;
+                                    }
+                                }
+                                '\'' => {
+                                    if !in_double {
+                                        in_single = !in_single;
+                                    }
+                                }
+                                '"' => {
+                                    if !in_single {
+                                        in_double = !in_double;
+                                    }
+                                }
+                                '{' if !in_single && !in_double => level_brace += 1,
+                                '}' if !in_single && !in_double => level_brace -= 1,
+                                '[' if !in_single && !in_double => level_brack += 1,
+                                ']' if !in_single && !in_double => level_brack -= 1,
+                                '(' if !in_single && !in_double => level_paren += 1,
+                                ')' if !in_single && !in_double => level_paren -= 1,
+                                ':' if !in_single
+                                    && !in_double
+                                    && level_brace == 0
+                                    && level_brack == 0
+                                    && level_paren == 0 =>
+                                {
+                                    prop_colon_idx = Some(idx_abs);
+                                    break;
+                                }
+                                _ => {}
                             }
                         }
-                        '\'' => {
-                            if !in_double {
-                                in_single = !in_single;
-                            }
+
+                        let Some(colon_idx) = prop_colon_idx else {
+                            search_start = abs_idx + 5;
+                            continue;
+                        };
+
+                        let mut field_prefix = contents[segment_start_idx..colon_idx].trim();
+                        if field_prefix.is_empty() {
+                            search_start = abs_idx + 5;
+                            continue;
                         }
-                        '"' => {
-                            if !in_single {
-                                in_double = !in_double;
-                            }
+
+                        if let Some(comment_idx) = field_prefix.rfind("*/") {
+                            field_prefix = field_prefix[comment_idx + 2..].trim_start();
                         }
-                        '{' if !in_single && !in_double => level_brace += 1,
-                        '}' if !in_single && !in_double => level_brace -= 1,
-                        '[' if !in_single && !in_double => level_brack += 1,
-                        ']' if !in_single && !in_double => level_brack -= 1,
-                        '(' if !in_single && !in_double => level_paren += 1,
-                        ')' if !in_single && !in_double => level_paren -= 1,
-                        ':' if !in_single
-                            && !in_double
-                            && level_brace == 0
-                            && level_brack == 0
-                            && level_paren == 0 =>
+
+                        if field_prefix.is_empty() {
+                            search_start = abs_idx + 5;
+                            continue;
+                        }
+
+                        if SKIP_PREFIXES
+                            .iter()
+                            .any(|prefix| field_prefix.starts_with(prefix))
                         {
-                            prop_colon_idx = Some(idx_abs);
-                            break;
+                            search_start = abs_idx + 5;
+                            continue;
                         }
-                        _ => {}
+
+                        if field_prefix.contains('(') {
+                            search_start = abs_idx + 5;
+                            continue;
+                        }
+
+                        // If the last non-whitespace before ':' is '?', then this is an
+                        // optional field with a nullable type (i.e., "?: T | null").
+                        // These are only allowed in *Params types.
+                        if field_prefix.chars().rev().find(|c| !c.is_whitespace()) == Some('?')
+                            && !allow_optional_nullable
+                        {
+                            let line_number =
+                                contents[..abs_idx].chars().filter(|c| *c == '\n').count() + 1;
+                            let offending_line_end = contents[line_start_idx..]
+                                .find('\n')
+                                .map(|i| line_start_idx + i)
+                                .unwrap_or(contents.len());
+                            let offending_snippet =
+                                contents[line_start_idx..offending_line_end].trim();
+
+                            optional_nullable_offenders.insert(format!(
+                                "{}:{}: {offending_snippet}",
+                                path.display(),
+                                line_number
+                            ));
+                        }
+
+                        search_start = abs_idx + 5;
                     }
                 }
-
-                let Some(colon_idx) = prop_colon_idx else {
-                    search_start = abs_idx + 5;
-                    continue;
-                };
-
-                let mut field_prefix = contents[segment_start_idx..colon_idx].trim();
-                if field_prefix.is_empty() {
-                    search_start = abs_idx + 5;
-                    continue;
-                }
-
-                if let Some(comment_idx) = field_prefix.rfind("*/") {
-                    field_prefix = field_prefix[comment_idx + 2..].trim_start();
-                }
-
-                if field_prefix.is_empty() {
-                    search_start = abs_idx + 5;
-                    continue;
-                }
-
-                if SKIP_PREFIXES
-                    .iter()
-                    .any(|prefix| field_prefix.starts_with(prefix))
-                {
-                    search_start = abs_idx + 5;
-                    continue;
-                }
-
-                if field_prefix.contains('(') {
-                    search_start = abs_idx + 5;
-                    continue;
-                }
-
-                // If the last non-whitespace before ':' is '?', then this is an
-                // optional field with a nullable type (i.e., "?: T | null").
-                // These are only allowed in *Params types.
-                if field_prefix.chars().rev().find(|c| !c.is_whitespace()) == Some('?')
-                    && !allow_optional_nullable
-                {
-                    let line_number =
-                        contents[..abs_idx].chars().filter(|c| *c == '\n').count() + 1;
-                    let offending_line_end = contents[line_start_idx..]
-                        .find('\n')
-                        .map(|i| line_start_idx + i)
-                        .unwrap_or(contents.len());
-                    let offending_snippet = contents[line_start_idx..offending_line_end].trim();
-
-                    optional_nullable_offenders.insert(format!(
-                        "{}:{}: {offending_snippet}",
-                        path.display(),
-                        line_number
-                    ));
-                }
-
-                search_start = abs_idx + 5;
             }
         }
 
@@ -2251,48 +2126,59 @@ mod tests {
         Ok(())
     }
 
-    fn schema_root() -> Result<PathBuf> {
-        let typescript_index = codex_utils_cargo_bin::find_resource!("schema/typescript/index.ts")
-            .context("resolve TypeScript schema index.ts")?;
-        let schema_root = typescript_index
-            .parent()
-            .and_then(|parent| parent.parent())
-            .context("derive schema root from schema/typescript/index.ts")?
-            .to_path_buf();
-        Ok(schema_root)
-    }
-
     #[test]
     fn generate_ts_with_experimental_api_retains_experimental_entries() -> Result<()> {
-        let client_request_ts = ClientRequest::export_to_string()?;
+        let output_dir =
+            std::env::temp_dir().join(format!("codex_ts_types_experimental_{}", Uuid::now_v7()));
+        fs::create_dir(&output_dir)?;
+
+        struct TempDirGuard(PathBuf);
+
+        impl Drop for TempDirGuard {
+            fn drop(&mut self) {
+                let _ = fs::remove_dir_all(&self.0);
+            }
+        }
+
+        let _guard = TempDirGuard(output_dir.clone());
+
+        let options = GenerateTsOptions {
+            generate_indices: false,
+            ensure_headers: false,
+            run_prettier: false,
+            experimental_api: true,
+        };
+        generate_ts_with_options(&output_dir, None, options)?;
+
+        let client_request_ts = fs::read_to_string(output_dir.join("ClientRequest.ts"))?;
         assert_eq!(client_request_ts.contains("mock/experimentalMethod"), true);
         assert_eq!(
-            client_request_ts.contains("MockExperimentalMethodParams"),
+            output_dir
+                .join("v2")
+                .join("MockExperimentalMethodParams.ts")
+                .exists(),
             true
         );
         assert_eq!(
-            v2::MockExperimentalMethodParams::export_to_string()?
-                .contains("MockExperimentalMethodParams"),
-            true
-        );
-        assert_eq!(
-            v2::MockExperimentalMethodResponse::export_to_string()?
-                .contains("MockExperimentalMethodResponse"),
+            output_dir
+                .join("v2")
+                .join("MockExperimentalMethodResponse.ts")
+                .exists(),
             true
         );
 
-        let thread_start_ts = v2::ThreadStartParams::export_to_string()?;
+        let thread_start_ts =
+            fs::read_to_string(output_dir.join("v2").join("ThreadStartParams.ts"))?;
         assert_eq!(thread_start_ts.contains("mockExperimentalField"), true);
-        let command_execution_request_approval_ts =
-            v2::CommandExecutionRequestApprovalParams::export_to_string()?;
+        let command_execution_request_approval_ts = fs::read_to_string(
+            output_dir
+                .join("v2")
+                .join("CommandExecutionRequestApprovalParams.ts"),
+        )?;
         assert_eq!(
             command_execution_request_approval_ts.contains("additionalPermissions"),
             true
         );
-        assert_eq!(
-            command_execution_request_approval_ts.contains("skillMetadata"),
-            true
-        );
 
         Ok(())
     }
@@ -2713,10 +2599,6 @@ export type Config = { stableField: Keep, unstableField: string | null } & ({ [k
             command_execution_request_approval_json.contains("additionalPermissions"),
             false
         );
-        assert_eq!(
-            command_execution_request_approval_json.contains("skillMetadata"),
-            false
-        );
 
         let client_request_json = fs::read_to_string(output_dir.join("ClientRequest.json"))?;
         assert_eq!(
@@ -2728,7 +2610,6 @@ export type Config = { stableField: Keep, unstableField: string | null } & ({ [k
             fs::read_to_string(output_dir.join("codex_app_server_protocol.schemas.json"))?;
         assert_eq!(bundle_json.contains("mockExperimentalField"), false);
         assert_eq!(bundle_json.contains("additionalPermissions"), false);
-        assert_eq!(bundle_json.contains("skillMetadata"), false);
         assert_eq!(bundle_json.contains("MockExperimentalMethodParams"), false);
         assert_eq!(
             bundle_json.contains("MockExperimentalMethodResponse"),
@@ -2738,7 +2619,6 @@ export type Config = { stableField: Keep, unstableField: string | null } & ({ [k
             fs::read_to_string(output_dir.join("codex_app_server_protocol.v2.schemas.json"))?;
         assert_eq!(flat_v2_bundle_json.contains("mockExperimentalField"), false);
         assert_eq!(flat_v2_bundle_json.contains("additionalPermissions"), false);
-        assert_eq!(flat_v2_bundle_json.contains("skillMetadata"), false);
         assert_eq!(
             flat_v2_bundle_json.contains("MockExperimentalMethodParams"),
             false

codex-rs/app-server-protocol/src/lib.rs

@@ -17,9 +17,6 @@ pub use protocol::thread_history::*;
 pub use protocol::v1::*;
 pub use protocol::v2::*;
 pub use schema_fixtures::SchemaFixtureOptions;
-#[doc(hidden)]
-pub use schema_fixtures::generate_typescript_schema_fixture_subtree_for_tests;
-pub use schema_fixtures::read_schema_fixture_subtree;
 pub use schema_fixtures::read_schema_fixture_tree;
 pub use schema_fixtures::write_schema_fixtures;
 pub use schema_fixtures::write_schema_fixtures_with_options;

codex-rs/app-server-protocol/src/protocol/common.rs

@@ -110,26 +110,6 @@ macro_rules! client_request_definitions {
             )*
         }
 
-        impl ClientRequest {
-            pub fn id(&self) -> &RequestId {
-                match self {
-                    $(Self::$variant { request_id, .. } => request_id,)*
-                }
-            }
-
-            pub fn method(&self) -> String {
-                serde_json::to_value(self)
-                    .ok()
-                    .and_then(|value| {
-                        value
-                            .get("method")
-                            .and_then(serde_json::Value::as_str)
-                            .map(str::to_owned)
-                    })
-                    .unwrap_or_else(|| "<unknown>".to_string())
-            }
-        }
-
         impl crate::experimental_api::ExperimentalApi for ClientRequest {
             fn experimental_reason(&self) -> Option<&'static str> {
                 match self {
@@ -171,12 +151,6 @@ macro_rules! client_request_definitions {
             Ok(())
         }
 
-        pub(crate) fn visit_client_response_types(v: &mut impl ::ts_rs::TypeVisitor) {
-            $(
-                v.visit::<$response>();
-            )*
-        }
-
         #[allow(clippy::vec_init_then_push)]
         pub fn export_client_response_schemas(
             out_dir: &::std::path::Path,
@@ -298,10 +272,6 @@ client_request_definitions! {
         params: v2::PluginInstallParams,
         response: v2::PluginInstallResponse,
     },
-    PluginUninstall => "plugin/uninstall" {
-        params: v2::PluginUninstallParams,
-        response: v2::PluginUninstallResponse,
-    },
     TurnStart => "turn/start" {
         params: v2::TurnStartParams,
         inspect_params: true,
@@ -407,26 +377,11 @@ client_request_definitions! {
         response: v2::FeedbackUploadResponse,
     },
 
-    /// Execute a standalone command (argv vector) under the server's sandbox.
+    /// Execute a command (argv vector) under the server's sandbox.
     OneOffCommandExec => "command/exec" {
         params: v2::CommandExecParams,
         response: v2::CommandExecResponse,
     },
-    /// Write stdin bytes to a running `command/exec` session or close stdin.
-    CommandExecWrite => "command/exec/write" {
-        params: v2::CommandExecWriteParams,
-        response: v2::CommandExecWriteResponse,
-    },
-    /// Terminate a running `command/exec` session by client-supplied `processId`.
-    CommandExecTerminate => "command/exec/terminate" {
-        params: v2::CommandExecTerminateParams,
-        response: v2::CommandExecTerminateResponse,
-    },
-    /// Resize a running PTY-backed `command/exec` session by client-supplied `processId`.
-    CommandExecResize => "command/exec/resize" {
-        params: v2::CommandExecResizeParams,
-        response: v2::CommandExecResizeResponse,
-    },
 
     ConfigRead => "config/read" {
         params: v2::ConfigReadParams,
@@ -555,12 +510,6 @@ macro_rules! server_request_definitions {
             Ok(())
         }
 
-        pub(crate) fn visit_server_response_types(v: &mut impl ::ts_rs::TypeVisitor) {
-            $(
-                v.visit::<$response>();
-            )*
-        }
-
         #[allow(clippy::vec_init_then_push)]
         pub fn export_server_response_schemas(
             out_dir: &Path,
@@ -711,12 +660,6 @@ server_request_definitions! {
         response: v2::McpServerElicitationRequestResponse,
     },
 
-    /// Request approval for additional permissions from the user.
-    PermissionsRequestApproval => "item/permissions/requestApproval" {
-        params: v2::PermissionsRequestApprovalParams,
-        response: v2::PermissionsRequestApprovalResponse,
-    },
-
     /// Execute a dynamic tool call on the client.
     DynamicToolCall => "item/tool/call" {
         params: v2::DynamicToolCallParams,
@@ -838,8 +781,6 @@ server_notification_definitions! {
     AgentMessageDelta => "item/agentMessage/delta" (v2::AgentMessageDeltaNotification),
     /// EXPERIMENTAL - proposed plan streaming deltas for plan items.
     PlanDelta => "item/plan/delta" (v2::PlanDeltaNotification),
-    /// Stream base64-encoded stdout/stderr chunks for a running `command/exec` session.
-    CommandExecOutputDelta => "command/exec/outputDelta" (v2::CommandExecOutputDeltaNotification),
     CommandExecutionOutputDelta => "item/commandExecution/outputDelta" (v2::CommandExecutionOutputDeltaNotification),
     TerminalInteraction => "item/commandExecution/terminalInteraction" (v2::TerminalInteractionNotification),
     FileChangeOutputDelta => "item/fileChange/outputDelta" (v2::FileChangeOutputDeltaNotification),
@@ -1178,8 +1119,6 @@ mod tests {
             request_id: RequestId::Integer(1),
             params: None,
         };
-        assert_eq!(request.id(), &RequestId::Integer(1));
-        assert_eq!(request.method(), "account/rateLimits/read");
         assert_eq!(
             json!({
                 "method": "account/rateLimits/read",
@@ -1584,7 +1523,6 @@ mod tests {
                 }),
                 macos: None,
             }),
-            skill_metadata: None,
             proposed_execpolicy_amendment: None,
             proposed_network_policy_amendments: None,
             available_decisions: None,
@@ -1595,31 +1533,4 @@ mod tests {
             Some("item/commandExecution/requestApproval.additionalPermissions")
         );
     }
-
-    #[test]
-    fn command_execution_request_approval_skill_metadata_is_marked_experimental() {
-        let params = v2::CommandExecutionRequestApprovalParams {
-            thread_id: "thr_123".to_string(),
-            turn_id: "turn_123".to_string(),
-            item_id: "call_123".to_string(),
-            approval_id: None,
-            reason: None,
-            network_approval_context: None,
-            command: Some("cat file".to_string()),
-            cwd: None,
-            command_actions: None,
-            additional_permissions: None,
-            skill_metadata: Some(v2::CommandExecutionRequestApprovalSkillMetadata {
-                path_to_skills_md: PathBuf::from("/tmp/SKILLS.md"),
-            }),
-            proposed_execpolicy_amendment: None,
-            proposed_network_policy_amendments: None,
-            available_decisions: None,
-        };
-        let reason = crate::experimental_api::ExperimentalApi::experimental_reason(&params);
-        assert_eq!(
-            reason,
-            Some("item/commandExecution/requestApproval.skillMetadata")
-        );
-    }
 }

codex-rs/app-server-protocol/src/protocol/mappers.rs

@@ -1,22 +1,14 @@
 use crate::protocol::v1;
 use crate::protocol::v2;
+
 impl From<v1::ExecOneOffCommandParams> for v2::CommandExecParams {
     fn from(value: v1::ExecOneOffCommandParams) -> Self {
         Self {
             command: value.command,
-            process_id: None,
-            tty: false,
-            stream_stdin: false,
-            stream_stdout_stderr: false,
-            output_bytes_cap: None,
-            disable_output_cap: false,
-            disable_timeout: false,
             timeout_ms: value
                 .timeout_ms
                 .map(|timeout| i64::try_from(timeout).unwrap_or(60_000)),
             cwd: value.cwd,
-            env: None,
-            size: None,
             sandbox_policy: value.sandbox_policy.map(std::convert::Into::into),
         }
     }

codex-rs/app-server-protocol/src/protocol/thread_history.rs

@@ -183,6 +183,7 @@ impl ThreadHistoryBuilder {
             RolloutItem::Compacted(payload) => self.handle_compacted(payload),
             RolloutItem::TurnContext(_)
             | RolloutItem::SessionMeta(_)
+            | RolloutItem::ForkReference(_)
             | RolloutItem::ResponseItem(_) => {}
         }
     }

codex-rs/app-server-protocol/src/protocol/v1.rs

@@ -429,8 +429,7 @@ pub struct SendUserTurnParams {
     pub service_tier: Option<Option<ServiceTier>>,
     pub effort: Option<ReasoningEffort>,
     pub summary: ReasoningSummary,
-    /// Optional JSON Schema used to constrain the final assistant message for
-    /// this turn.
+    /// Optional JSON Schema used to constrain the final assistant message for this turn.
     pub output_schema: Option<serde_json::Value>,
 }
 

codex-rs/app-server-protocol/src/schema_fixtures.rs

@@ -1,25 +1,11 @@
-use crate::ClientNotification;
-use crate::ClientRequest;
-use crate::ServerNotification;
-use crate::ServerRequest;
-use crate::export::GENERATED_TS_HEADER;
-use crate::export::filter_experimental_ts_tree;
-use crate::export::generate_index_ts_tree;
-use crate::protocol::common::visit_client_response_types;
-use crate::protocol::common::visit_server_response_types;
 use anyhow::Context;
 use anyhow::Result;
-use codex_protocol::protocol::EventMsg;
 use serde_json::Map;
 use serde_json::Value;
-use std::any::TypeId;
 use std::cmp::Ordering;
 use std::collections::BTreeMap;
-use std::collections::HashSet;
 use std::path::Path;
 use std::path::PathBuf;
-use ts_rs::TS;
-use ts_rs::TypeVisitor;
 
 #[derive(Clone, Copy, Debug, Default)]
 pub struct SchemaFixtureOptions {
@@ -41,42 +27,6 @@ pub fn read_schema_fixture_tree(schema_root: &Path) -> Result<BTreeMap<PathBuf,
     Ok(all)
 }
 
-pub fn read_schema_fixture_subtree(
-    schema_root: &Path,
-    label: &str,
-) -> Result<BTreeMap<PathBuf, Vec<u8>>> {
-    let subtree_root = schema_root.join(label);
-    collect_files_recursive(&subtree_root)
-        .with_context(|| format!("read schema fixture subtree {}", subtree_root.display()))
-}
-
-#[doc(hidden)]
-pub fn generate_typescript_schema_fixture_subtree_for_tests() -> Result<BTreeMap<PathBuf, Vec<u8>>>
-{
-    let mut files = BTreeMap::new();
-    let mut seen = HashSet::new();
-
-    collect_typescript_fixture_file::<ClientRequest>(&mut files, &mut seen)?;
-    visit_typescript_fixture_dependencies(&mut files, &mut seen, |visitor| {
-        visit_client_response_types(visitor);
-    })?;
-    collect_typescript_fixture_file::<ClientNotification>(&mut files, &mut seen)?;
-    collect_typescript_fixture_file::<ServerRequest>(&mut files, &mut seen)?;
-    visit_typescript_fixture_dependencies(&mut files, &mut seen, |visitor| {
-        visit_server_response_types(visitor);
-    })?;
-    collect_typescript_fixture_file::<ServerNotification>(&mut files, &mut seen)?;
-    collect_typescript_fixture_file::<EventMsg>(&mut files, &mut seen)?;
-
-    filter_experimental_ts_tree(&mut files)?;
-    generate_index_ts_tree(&mut files);
-
-    Ok(files
-        .into_iter()
-        .map(|(path, content)| (path, content.into_bytes()))
-        .collect())
-}
-
 /// Regenerates `schema/typescript/` and `schema/json/`.
 ///
 /// This is intended to be used by tooling (e.g., `just write-app-server-schema`).
@@ -136,12 +86,6 @@ fn read_file_bytes(path: &Path) -> Result<Vec<u8>> {
         let text = String::from_utf8(bytes)
             .with_context(|| format!("expected UTF-8 TypeScript in {}", path.display()))?;
         let text = text.replace("\r\n", "\n").replace('\r', "\n");
-        // Fixture comparisons care about schema content, not whether the generator
-        // re-prepended the standard banner to every TypeScript file.
-        let text = text
-            .strip_prefix(GENERATED_TS_HEADER)
-            .unwrap_or(&text)
-            .to_string();
         return Ok(text.into_bytes());
     }
     Ok(bytes)
@@ -265,73 +209,6 @@ fn collect_files_recursive(root: &Path) -> Result<BTreeMap<PathBuf, Vec<u8>>> {
     Ok(files)
 }
 
-fn collect_typescript_fixture_file<T: TS + 'static + ?Sized>(
-    files: &mut BTreeMap<PathBuf, String>,
-    seen: &mut HashSet<TypeId>,
-) -> Result<()> {
-    let Some(output_path) = T::output_path() else {
-        return Ok(());
-    };
-    if !seen.insert(TypeId::of::<T>()) {
-        return Ok(());
-    }
-
-    let contents = T::export_to_string().context("export TypeScript fixture content")?;
-    let output_path = normalize_relative_fixture_path(&output_path);
-    files.insert(
-        output_path,
-        contents.replace("\r\n", "\n").replace('\r', "\n"),
-    );
-
-    let mut visitor = TypeScriptFixtureCollector {
-        files,
-        seen,
-        error: None,
-    };
-    T::visit_dependencies(&mut visitor);
-    if let Some(error) = visitor.error {
-        return Err(error);
-    }
-
-    Ok(())
-}
-
-fn normalize_relative_fixture_path(path: &Path) -> PathBuf {
-    path.components().collect()
-}
-
-fn visit_typescript_fixture_dependencies(
-    files: &mut BTreeMap<PathBuf, String>,
-    seen: &mut HashSet<TypeId>,
-    visit: impl FnOnce(&mut TypeScriptFixtureCollector<'_>),
-) -> Result<()> {
-    let mut visitor = TypeScriptFixtureCollector {
-        files,
-        seen,
-        error: None,
-    };
-    visit(&mut visitor);
-    if let Some(error) = visitor.error {
-        return Err(error);
-    }
-    Ok(())
-}
-
-struct TypeScriptFixtureCollector<'a> {
-    files: &'a mut BTreeMap<PathBuf, String>,
-    seen: &'a mut HashSet<TypeId>,
-    error: Option<anyhow::Error>,
-}
-
-impl TypeVisitor for TypeScriptFixtureCollector<'_> {
-    fn visit<T: TS + 'static + ?Sized>(&mut self) {
-        if self.error.is_some() {
-            return;
-        }
-        self.error = collect_typescript_fixture_file::<T>(self.files, self.seen).err();
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

codex-rs/app-server-protocol/tests/schema_fixtures.rs

@@ -1,60 +1,19 @@
 use anyhow::Context;
 use anyhow::Result;
-use codex_app_server_protocol::generate_json_with_experimental;
-use codex_app_server_protocol::generate_typescript_schema_fixture_subtree_for_tests;
-use codex_app_server_protocol::read_schema_fixture_subtree;
+use codex_app_server_protocol::read_schema_fixture_tree;
+use codex_app_server_protocol::write_schema_fixtures;
 use similar::TextDiff;
-use std::collections::BTreeMap;
 use std::path::Path;
-use std::path::PathBuf;
 
 #[test]
-fn typescript_schema_fixtures_match_generated() -> Result<()> {
+fn schema_fixtures_match_generated() -> Result<()> {
     let schema_root = schema_root()?;
-    let fixture_tree = read_tree(&schema_root, "typescript")?;
-    let generated_tree = generate_typescript_schema_fixture_subtree_for_tests()
-        .context("generate in-memory typescript schema fixtures")?;
-
-    assert_schema_trees_match("typescript", &fixture_tree, &generated_tree)?;
-
-    Ok(())
-}
-
-#[test]
-fn json_schema_fixtures_match_generated() -> Result<()> {
-    assert_schema_fixtures_match_generated("json", |output_dir| {
-        generate_json_with_experimental(output_dir, false)
-    })
-}
-
-fn assert_schema_fixtures_match_generated(
-    label: &'static str,
-    generate: impl FnOnce(&Path) -> Result<()>,
-) -> Result<()> {
-    let schema_root = schema_root()?;
-    let fixture_tree = read_tree(&schema_root, label)?;
+    let fixture_tree = read_tree(&schema_root)?;
 
     let temp_dir = tempfile::tempdir().context("create temp dir")?;
-    let generated_root = temp_dir.path().join(label);
-    generate(&generated_root).with_context(|| {
-        format!(
-            "generate {label} schema fixtures into {}",
-            generated_root.display()
-        )
-    })?;
+    write_schema_fixtures(temp_dir.path(), None).context("generate schema fixtures")?;
+    let generated_tree = read_tree(temp_dir.path())?;
 
-    let generated_tree = read_tree(temp_dir.path(), label)?;
-
-    assert_schema_trees_match(label, &fixture_tree, &generated_tree)?;
-
-    Ok(())
-}
-
-fn assert_schema_trees_match(
-    label: &str,
-    fixture_tree: &BTreeMap<PathBuf, Vec<u8>>,
-    generated_tree: &BTreeMap<PathBuf, Vec<u8>>,
-) -> Result<()> {
     let fixture_paths = fixture_tree
         .keys()
         .map(|p| p.display().to_string())
@@ -73,13 +32,13 @@ fn assert_schema_trees_match(
             .to_string();
 
         panic!(
-            "Vendored {label} app-server schema fixture file set doesn't match freshly generated output. \
+            "Vendored app-server schema fixture file set doesn't match freshly generated output. \
 Run `just write-app-server-schema` to overwrite with your changes.\n\n{diff}"
         );
     }
 
     // If the file sets match, diff contents for each file for a nicer error.
-    for (path, expected) in fixture_tree {
+    for (path, expected) in &fixture_tree {
         let actual = generated_tree
             .get(path)
             .ok_or_else(|| anyhow::anyhow!("missing generated file: {}", path.display()))?;
@@ -95,7 +54,7 @@ Run `just write-app-server-schema` to overwrite with your changes.\n\n{diff}"
             .header("fixture", "generated")
             .to_string();
         panic!(
-            "Vendored {label} app-server schema fixture {} differs from generated output. \
+            "Vendored app-server schema fixture {} differs from generated output. \
 Run `just write-app-server-schema` to overwrite with your changes.\n\n{diff}",
             path.display()
         );
@@ -104,7 +63,7 @@ Run `just write-app-server-schema` to overwrite with your changes.\n\n{diff}",
     Ok(())
 }
 
-fn schema_root() -> Result<PathBuf> {
+fn schema_root() -> Result<std::path::PathBuf> {
     // In Bazel runfiles (especially manifest-only mode), resolving directories is not
     // reliable. Resolve a known file, then walk up to the schema root.
     let typescript_index = codex_utils_cargo_bin::find_resource!("schema/typescript/index.ts")
@@ -133,11 +92,6 @@ fn schema_root() -> Result<PathBuf> {
     Ok(schema_root)
 }
 
-fn read_tree(root: &Path, label: &str) -> Result<BTreeMap<PathBuf, Vec<u8>>> {
-    read_schema_fixture_subtree(root, label).with_context(|| {
-        format!(
-            "read {label} schema fixture subtree from {}",
-            root.display()
-        )
-    })
+fn read_tree(root: &Path) -> Result<std::collections::BTreeMap<std::path::PathBuf, Vec<u8>>> {
+    read_schema_fixture_tree(root).context("read schema fixture tree")
 }

codex-rs/app-server-test-client/src/lib.rs

@@ -96,7 +96,6 @@ const NOTIFICATIONS_TO_OPT_OUT: &[&str] = &[
     "codex/event/item_started",
     "codex/event/item_completed",
     // v2 item deltas.
-    "command/exec/outputDelta",
     "item/agentMessage/delta",
     "item/plan/delta",
     "item/commandExecution/outputDelta",
@@ -1507,7 +1506,6 @@ impl CodexClient {
             cwd,
             command_actions,
             additional_permissions,
-            skill_metadata,
             proposed_execpolicy_amendment,
             proposed_network_policy_amendments,
             available_decisions,
@@ -1542,9 +1540,6 @@ impl CodexClient {
         if let Some(additional_permissions) = additional_permissions.as_ref() {
             println!("< additional permissions: {additional_permissions:?}");
         }
-        if let Some(skill_metadata) = skill_metadata.as_ref() {
-            println!("< skill metadata: {skill_metadata:?}");
-        }
         if let Some(execpolicy_amendment) = proposed_execpolicy_amendment.as_ref() {
             println!("< proposed execpolicy amendment: {execpolicy_amendment:?}");
         }

codex-rs/app-server/Cargo.toml

@@ -18,20 +18,12 @@ workspace = true
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-base64 = { workspace = true }
-axum = { workspace = true, default-features = false, features = [
-    "http1",
-    "json",
-    "tokio",
-    "ws",
-] }
 codex-arg0 = { workspace = true }
 codex-cloud-requirements = { workspace = true }
 codex-core = { workspace = true }
 codex-otel = { workspace = true }
 codex-shell-command = { workspace = true }
 codex-utils-cli = { workspace = true }
-codex-utils-pty = { workspace = true }
 codex-backend-client = { workspace = true }
 codex-file-search = { workspace = true }
 codex-chatgpt = { workspace = true }
@@ -67,16 +59,15 @@ uuid = { workspace = true, features = ["serde", "v7"] }
 
 [dev-dependencies]
 app_test_support = { workspace = true }
-base64 = { workspace = true }
 axum = { workspace = true, default-features = false, features = [
     "http1",
     "json",
     "tokio",
 ] }
+base64 = { workspace = true }
 core_test_support = { workspace = true }
 codex-utils-cargo-bin = { workspace = true }
 pretty_assertions = { workspace = true }
-reqwest = { workspace = true, features = ["rustls-tls"] }
 rmcp = { workspace = true, default-features = false, features = [
     "elicitation",
     "server",