resolve code mode host from install context

This commit is contained in:
Channing Conger
2026-07-10 00:29:53 +00:00
parent 8fc5ae3ddf
commit 941eba8ea7
5 changed files with 41 additions and 80 deletions
+13 -32
View File
@@ -1,5 +1,3 @@
use std::io;
use std::path::PathBuf;
use std::sync::Arc;
use codex_code_mode_protocol::CodeModeSessionProvider;
@@ -8,14 +6,16 @@ use codex_code_mode_protocol::FunctionCallOutputContentItem;
use codex_code_mode_protocol::RuntimeResponse;
use pretty_assertions::assert_eq;
use super::OwnedProcessHost;
use super::ProcessOwnedCodeModeSession;
use super::ProcessOwnedCodeModeSessionProvider;
use super::resolve_host_program;
use crate::NoopCodeModeSessionDelegate;
#[test]
fn provider_reuses_its_live_process_host() {
let provider = ProcessOwnedCodeModeSessionProvider::default();
let provider = ProcessOwnedCodeModeSessionProvider::with_host_program(
"codex-code-mode-host-for-test".into(),
);
let first = provider.process_host().expect("owned process host");
let second = provider.process_host().expect("owned process host");
@@ -24,34 +24,10 @@ fn provider_reuses_its_live_process_host() {
}
#[test]
fn host_program_is_next_to_the_main_executable_even_when_missing() {
let executable_name = if cfg!(windows) {
"codex-code-mode-host.exe"
} else {
"codex-code-mode-host"
};
fn provider_without_host_program_uses_in_process_mode() {
let provider = ProcessOwnedCodeModeSessionProvider::in_process();
assert_eq!(
resolve_host_program(Ok(PathBuf::from("/opt/codex/bin/codex"))),
PathBuf::from("/opt/codex/bin").join(executable_name)
);
}
#[test]
fn host_program_falls_back_to_its_name_when_main_executable_is_unknown() {
let executable_name = if cfg!(windows) {
"codex-code-mode-host.exe"
} else {
"codex-code-mode-host"
};
assert_eq!(
resolve_host_program(Err(io::Error::new(
io::ErrorKind::NotFound,
"missing executable"
))),
PathBuf::from(executable_name)
);
assert!(provider.process_host().is_none());
}
#[tokio::test]
@@ -92,7 +68,12 @@ async fn provider_falls_back_to_in_process_session_when_host_is_missing() {
#[tokio::test]
async fn shutdown_before_open_does_not_spawn_the_host() {
let session = ProcessOwnedCodeModeSession::new();
let session = ProcessOwnedCodeModeSession::with_process_host(
Arc::new(NoopCodeModeSessionDelegate),
Arc::new(OwnedProcessHost::new(
"codex-code-mode-host-does-not-exist".into(),
)),
);
session.shutdown().await.expect("shutdown session");
let error = session