5881c0d6d4
We continue the separation between `codex app-server` and `codex mcp-server`. In particular, we introduce a new crate, `codex-app-server-protocol`, and migrate `codex-rs/protocol/src/mcp_protocol.rs` into it, renaming it `codex-rs/app-server-protocol/src/protocol.rs`. Because `ConversationId` was defined in `mcp_protocol.rs`, we move it into its own file, `codex-rs/protocol/src/conversation_id.rs`, and because it is referenced in a ton of places, we have to touch a lot of files as part of this PR. We also decide to get away from proper JSON-RPC 2.0 semantics, so we also introduce `codex-rs/app-server-protocol/src/jsonrpc_lite.rs`, which is basically the same `JSONRPCMessage` type defined in `mcp-types` except with all of the `"jsonrpc": "2.0"` removed. Getting rid of `"jsonrpc": "2.0"` makes our serialization logic considerably simpler, as we can lean heavier on serde to serialize directly into the wire format that we use now.
38 lines
1.5 KiB
Rust
38 lines
1.5 KiB
Rust
use serde::Deserialize;
|
|
use std::path::PathBuf;
|
|
|
|
use crate::protocol::AskForApproval;
|
|
use codex_protocol::config_types::ReasoningEffort;
|
|
use codex_protocol::config_types::ReasoningSummary;
|
|
use codex_protocol::config_types::Verbosity;
|
|
|
|
/// Collection of common configuration options that a user can define as a unit
|
|
/// in `config.toml`.
|
|
#[derive(Debug, Clone, Default, PartialEq, Deserialize)]
|
|
pub struct ConfigProfile {
|
|
pub model: Option<String>,
|
|
/// The key in the `model_providers` map identifying the
|
|
/// [`ModelProviderInfo`] to use.
|
|
pub model_provider: Option<String>,
|
|
pub approval_policy: Option<AskForApproval>,
|
|
pub model_reasoning_effort: Option<ReasoningEffort>,
|
|
pub model_reasoning_summary: Option<ReasoningSummary>,
|
|
pub model_verbosity: Option<Verbosity>,
|
|
pub chatgpt_base_url: Option<String>,
|
|
pub experimental_instructions_file: Option<PathBuf>,
|
|
}
|
|
|
|
impl From<ConfigProfile> for codex_app_server_protocol::Profile {
|
|
fn from(config_profile: ConfigProfile) -> Self {
|
|
Self {
|
|
model: config_profile.model,
|
|
model_provider: config_profile.model_provider,
|
|
approval_policy: config_profile.approval_policy,
|
|
model_reasoning_effort: config_profile.model_reasoning_effort,
|
|
model_reasoning_summary: config_profile.model_reasoning_summary,
|
|
model_verbosity: config_profile.model_verbosity,
|
|
chatgpt_base_url: config_profile.chatgpt_base_url,
|
|
}
|
|
}
|
|
}
|