openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-30 19:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 99ef3ed879 into sapling-pr-archive-bolinfest

Browse Source
This commit is contained in:
Michael Bolin
2026-04-29 10:03:45 -07:00
committed by GitHub
parent e953514cb6 99ef3ed879
commit 2ec581eba5
51 changed files with 1933 additions and 1259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/app-server/src/lib.rs
+9 -6
View File
@@ -418,12 +418,15 @@ pub async fn run_main_with_transport_options(
auth: AppServerWebsocketAuthSettings,
runtime_options: AppServerRuntimeOptions,
) -> IoResult<()> {
let environment_manager = Arc::new(EnvironmentManager::new(EnvironmentManagerArgs::from_env(
ExecServerRuntimePaths::from_optional_paths(
arg0_paths.codex_self_exe.clone(),
arg0_paths.codex_linux_sandbox_exe.clone(),
)?,
)));
let environment_manager = Arc::new(
EnvironmentManager::new(EnvironmentManagerArgs::new(
ExecServerRuntimePaths::from_optional_paths(
arg0_paths.codex_self_exe.clone(),
arg0_paths.codex_linux_sandbox_exe.clone(),
)?,
))
.await,
);
let (transport_event_tx, mut transport_event_rx) =
mpsc::channel::<TransportEvent>(CHANNEL_CAPACITY);
let (outgoing_tx, mut outgoing_rx) = mpsc::channel::<OutgoingEnvelope>(CHANNEL_CAPACITY);
codex-rs/app-server/tests/suite/v2/turn_start.rs
+14 -4
View File
@@ -325,10 +325,20 @@ async fn turn_start_emits_thread_scoped_warning_notification_for_trimmed_skills(
let warning: WarningNotification =
serde_json::from_value(params).expect("deserialize warning notification");
assert_eq!(warning.thread_id.as_deref(), Some(thread.id.as_str()));
assert_eq!(
warning.message,
"Warning: Exceeded skills context budget of 2%. All skill descriptions were removed and 7 additional skills were not included in the model-visible skills list."
);
let prefix = "Exceeded skills context budget of 2%. All skill descriptions were removed and ";
let plural_suffix = " additional skills were not included in the model-visible skills list.";
let singular_suffix = " additional skill was not included in the model-visible skills list.";
let omitted_count = warning
.message
.strip_prefix(prefix)
.and_then(|message| {
message
.strip_suffix(plural_suffix)
.or_else(|| message.strip_suffix(singular_suffix))
})
.and_then(|count| count.parse::<usize>().ok())
.expect("warning should report an omitted skill count");
assert!(omitted_count >= 1, "expected at least one omitted skill");
timeout(
DEFAULT_READ_TIMEOUT,