This commit is contained in:
jif-oai
2025-11-13 17:18:20 +01:00
parent d2e876403a
commit c77254d070
9 changed files with 17 additions and 17 deletions

View File

@@ -111,12 +111,12 @@ use codex_core::RolloutRecorder;
use codex_core::SessionMeta;
use codex_core::auth::CLIENT_ID;
use codex_core::auth::login_with_api_key;
use codex_core::client::http::get_codex_user_agent;
use codex_core::config::Config;
use codex_core::config::ConfigOverrides;
use codex_core::config::ConfigToml;
use codex_core::config::edit::ConfigEditsBuilder;
use codex_core::config_loader::load_config_as_toml;
use codex_core::default_client::get_codex_user_agent;
use codex_core::exec::ExecParams;
use codex_core::exec_env::create_env;
use codex_core::find_conversation_path_by_id_str;

View File

@@ -14,9 +14,9 @@ use codex_app_server_protocol::JSONRPCRequest;
use codex_app_server_protocol::JSONRPCResponse;
use codex_core::AuthManager;
use codex_core::ConversationManager;
use codex_core::client::http::USER_AGENT_SUFFIX;
use codex_core::client::http::get_codex_user_agent;
use codex_core::config::Config;
use codex_core::default_client::USER_AGENT_SUFFIX;
use codex_core::default_client::get_codex_user_agent;
use codex_feedback::CodexFeedback;
use codex_protocol::protocol::SessionSource;
use std::sync::Arc;

View File

@@ -5,6 +5,7 @@ use crate::types::RateLimitWindowSnapshot;
use crate::types::TurnAttemptsSiblingTurnsResponse;
use anyhow::Result;
use codex_core::auth::CodexAuth;
use codex_core::client::http::get_codex_user_agent;
use codex_protocol::protocol::RateLimitSnapshot;
use codex_protocol::protocol::RateLimitWindow;
use reqwest::header::AUTHORIZATION;
@@ -14,7 +15,6 @@ use reqwest::header::HeaderName;
use reqwest::header::HeaderValue;
use reqwest::header::USER_AGENT;
use serde::de::DeserializeOwned;
use codex_core::client::http::get_codex_user_agent;
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum PathStyle {

View File

@@ -1,5 +1,5 @@
use codex_core::client::http::create_client;
use codex_core::config::Config;
use codex_core::default_client::create_client;
use crate::chatgpt_token::get_chatgpt_token_data;
use crate::chatgpt_token::init_chatgpt_token_from_auth;

View File

@@ -1114,10 +1114,10 @@ mod tests {
provider: ModelProviderInfo,
otel_event_manager: OtelEventManager,
) -> Vec<Result<ResponseEvent>> {
let owned_chunks: Vec<Vec<u8>> = chunks.iter().map(|chunk| (*chunk).to_vec()).collect();
let stream = futures::stream::iter(
owned_chunks
chunks
.iter()
.map(|chunk| (*chunk).to_vec())
.into_iter()
.map(|bytes| Ok::<Bytes, CodexErr>(Bytes::from(bytes))),
);

View File

@@ -71,7 +71,7 @@ mod tests {
if self.fatal {
CodexErr::InternalServerError
} else {
CodexErr::Io(std::io::Error::new(std::io::ErrorKind::Other, "retryable"))
CodexErr::Io(std::io::Error::other("retryable"))
}
}
}

View File

@@ -10,14 +10,19 @@ mod event_processor_with_human_output;
pub mod event_processor_with_jsonl_output;
pub mod exec_events;
use crate::cli::Command as ExecCommand;
use crate::event_processor::CodexStatus;
use crate::event_processor::EventProcessor;
pub use cli::Cli;
use codex_core::AuthManager;
use codex_core::BUILT_IN_OSS_MODEL_PROVIDER_ID;
use codex_core::ConversationManager;
use codex_core::NewConversation;
use codex_core::auth::enforce_login_restrictions;
use codex_core::client::http::set_default_originator;
use codex_core::config::Config;
use codex_core::config::ConfigOverrides;
use codex_core::find_conversation_path_by_id_str;
use codex_core::git_info::get_git_repo_root;
use codex_core::protocol::AskForApproval;
use codex_core::protocol::Event;
@@ -41,12 +46,6 @@ use tracing::info;
use tracing_subscriber::EnvFilter;
use tracing_subscriber::prelude::*;
use crate::cli::Command as ExecCommand;
use crate::event_processor::CodexStatus;
use crate::event_processor::EventProcessor;
use codex_core::default_client::set_default_originator;
use codex_core::find_conversation_path_by_id_str;
pub async fn run_main(cli: Cli, codex_linux_sandbox_exe: Option<PathBuf>) -> anyhow::Result<()> {
if let Err(err) = set_default_originator("codex_exec".to_string()) {
tracing::warn!(?err, "Failed to set codex exec originator override {err:?}");

View File

@@ -17,6 +17,7 @@ use chrono::Utc;
use codex_core::auth::AuthCredentialsStoreMode;
use codex_core::auth::AuthDotJson;
use codex_core::auth::save_auth;
use codex_core::client::http::originator;
use codex_core::token_data::TokenData;
use codex_core::token_data::parse_id_token;
use rand::RngCore;
@@ -26,7 +27,6 @@ use tiny_http::Request;
use tiny_http::Response;
use tiny_http::Server;
use tiny_http::StatusCode;
use codex_core::client::http::originator;
const DEFAULT_ISSUER: &str = "https://auth.openai.com";
const DEFAULT_PORT: u16 = 1455;

View File

@@ -12,6 +12,8 @@ use codex_protocol::protocol::SessionSource;
use codex_core::AuthManager;
use codex_core::ConversationManager;
use codex_core::client::http::USER_AGENT_SUFFIX;
use codex_core::client::http::get_codex_user_agent;
use codex_core::config::Config;
use codex_core::protocol::Submission;
use mcp_types::CallToolRequestParams;
@@ -33,7 +35,6 @@ use serde_json::json;
use std::sync::Arc;
use tokio::sync::Mutex;
use tokio::task;
use codex_core::client::http::{get_codex_user_agent, USER_AGENT_SUFFIX};
pub(crate) struct MessageProcessor {
outgoing: Arc<OutgoingMessageSender>,