clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
pash
2026-02-01 21:45:06 -08:00
parent 24f027b4ab
commit 21f259ced0
8 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
codex-rs/core/src/client.rs
View File

@@ -147,18 +147,7 @@ impl ModelClient {
}
}
pub fn new_session(&self) -> ModelClientSession {
self.new_session_with_turn_metadata_and_cwd(None, None)
}
pub fn new_session_with_turn_metadata(
&self,
turn_metadata_header: Option<String>,
) -> ModelClientSession {
self.new_session_with_turn_metadata_and_cwd(turn_metadata_header, None)
}
pub fn new_session_with_turn_metadata_and_cwd(
pub fn new_session(
&self,
turn_metadata_header: Option<String>,
turn_metadata_cwd: Option<PathBuf>,

2
codex-rs/core/src/codex.rs
View File

@@ -3383,7 +3383,7 @@ pub(crate) async fn run_turn(
// many turns, from the perspective of the user, it is a single turn.
let turn_diff_tracker = Arc::new(tokio::sync::Mutex::new(TurnDiffTracker::new()));
let mut client_session = turn_context.client.new_session_with_turn_metadata_and_cwd(
let mut client_session = turn_context.client.new_session(
turn_context.turn_metadata_header.clone(),
Some(turn_context.cwd.clone()),
);

2
codex-rs/core/src/compact.rs
View File

@@ -335,7 +335,7 @@ async fn drain_to_completed(
turn_context: &TurnContext,
prompt: &Prompt,
) -> CodexResult<()> {
let mut client_session = turn_context.client.new_session_with_turn_metadata_and_cwd(
let mut client_session = turn_context.client.new_session(
turn_context.turn_metadata_header.clone(),
Some(turn_context.cwd.clone()),
);

2
codex-rs/core/tests/chat_completions_payload.rs
View File

@@ -102,7 +102,7 @@ async fn run_request(input: Vec<ResponseItem>) -> Value {
SessionSource::Exec,
TransportManager::new(),
)
.new_session();
.new_session(None, None);
let mut prompt = Prompt::default();
prompt.input = input;

2
codex-rs/core/tests/chat_completions_sse.rs
View File

@@ -103,7 +103,7 @@ async fn run_stream_with_bytes(sse_body: &[u8]) -> Vec<ResponseEvent> {
SessionSource::Exec,
TransportManager::new(),
)
.new_session();
.new_session(None, None);
let mut prompt = Prompt::default();
prompt.input = vec![ResponseItem::Message {

6
codex-rs/core/tests/responses_headers.rs
View File

@@ -100,7 +100,7 @@ async fn responses_stream_includes_subagent_header_on_review() {
session_source,
TransportManager::new(),
)
.new_session();
.new_session(None, None);
let mut prompt = Prompt::default();
prompt.input = vec![ResponseItem::Message {
@@ -294,7 +294,7 @@ async fn responses_stream_includes_subagent_header_on_other() {
session_source,
TransportManager::new(),
)
.new_session();
.new_session(None, None);
let mut prompt = Prompt::default();
prompt.input = vec![ResponseItem::Message {
@@ -451,7 +451,7 @@ async fn responses_respects_model_info_overrides_from_config() {
session_source,
TransportManager::new(),
)
.new_session();
.new_session(None, None);
let mut prompt = Prompt::default();
prompt.input = vec![ResponseItem::Message {

2
codex-rs/core/tests/suite/client.rs
View File

@@ -1190,7 +1190,7 @@ async fn azure_responses_request_includes_store_and_reasoning_ids() {
SessionSource::Exec,
TransportManager::new(),
)
.new_session();
.new_session(None, None);
let mut prompt = Prompt::default();
prompt.input.push(ResponseItem::Reasoning {

10
codex-rs/core/tests/suite/client_websockets.rs
View File

@@ -53,7 +53,7 @@ async fn responses_websocket_streams_request() {
.await;
let harness = websocket_harness(&server).await;
let mut session = harness.client.new_session();
let mut session = harness.client.new_session(None, None);
let prompt = prompt_with_input(vec![message_item("hello")]);
stream_until_complete(&mut session, &prompt).await;
@@ -83,7 +83,7 @@ async fn responses_websocket_emits_websocket_telemetry_events() {
let harness = websocket_harness(&server).await;
harness.otel_manager.reset_runtime_metrics();
let mut session = harness.client.new_session();
let mut session = harness.client.new_session(None, None);
let prompt = prompt_with_input(vec![message_item("hello")]);
stream_until_complete(&mut session, &prompt).await;
@@ -113,7 +113,7 @@ async fn responses_websocket_emits_reasoning_included_event() {
.await;
let harness = websocket_harness(&server).await;
let mut session = harness.client.new_session();
let mut session = harness.client.new_session(None, None);
let prompt = prompt_with_input(vec![message_item("hello")]);
let mut stream = session
@@ -147,7 +147,7 @@ async fn responses_websocket_appends_on_prefix() {
.await;
let harness = websocket_harness(&server).await;
let mut session = harness.client.new_session();
let mut session = harness.client.new_session(None, None);
let prompt_one = prompt_with_input(vec![message_item("hello")]);
let prompt_two = prompt_with_input(vec![message_item("hello"), message_item("second")]);
@@ -183,7 +183,7 @@ async fn responses_websocket_creates_on_non_prefix() {
.await;
let harness = websocket_harness(&server).await;
let mut session = harness.client.new_session();
let mut session = harness.client.new_session(None, None);
let prompt_one = prompt_with_input(vec![message_item("hello")]);
let prompt_two = prompt_with_input(vec![message_item("different")]);