mirror of
https://github.com/openai/codex.git
synced 2026-11-16 22:00:36 +00:00
Refactor exec to use the shared app-server client (#61706)
## What changed - Use `AppServerClient` throughout exec and extract turn completion into `finish_turn`, including handling for server and thread-stream disconnections. - Move remote address parsing and auth-token resolution into `codex-app-server-client`, with re-exports from the TUI. - Allow human-readable exec output to be initialized without a local `Config`. ## Testing Move remote address and auth-token tests into `codex-app-server-client`, retaining coverage for WebSocket and Unix socket addresses, invalid addresses, and missing, empty, or whitespace-padded tokens. GitOrigin-RevId: 465b17a1c03392a7d4e7700d83ce67c2cf5ef021
This commit is contained in:
+2
-88
@@ -39,6 +39,8 @@ use codex_app_server_client::RemoteAppServerClient;
|
||||
use codex_app_server_client::RemoteAppServerConnectArgs;
|
||||
pub use codex_app_server_client::RemoteAppServerEndpoint;
|
||||
use codex_app_server_client::cloud_backend;
|
||||
pub use codex_app_server_client::resolve_remote_addr;
|
||||
pub use codex_app_server_client::resolve_remote_endpoint;
|
||||
use codex_app_server_protocol::Account as AppServerAccount;
|
||||
use codex_app_server_protocol::AskForApproval;
|
||||
use codex_app_server_protocol::ConfigWarningNotification;
|
||||
@@ -97,7 +99,6 @@ use tracing::warn;
|
||||
use tracing_appender::non_blocking;
|
||||
use tracing_subscriber::EnvFilter;
|
||||
use tracing_subscriber::prelude::*;
|
||||
use url::Url;
|
||||
use uuid::Uuid;
|
||||
|
||||
pub(crate) use codex_app_server_client::legacy_core;
|
||||
@@ -441,93 +442,6 @@ fn remove_legacy_tui_log_file(codex_home: &Path) {
|
||||
let _ = std::fs::remove_file(codex_home.join("log").join(TUI_LOG_FILE_NAME));
|
||||
}
|
||||
|
||||
fn remote_addr_has_explicit_port(addr: &str, parsed: &Url) -> bool {
|
||||
let Some(host) = parsed.host_str() else {
|
||||
return false;
|
||||
};
|
||||
if parsed.port().is_some() {
|
||||
return true;
|
||||
}
|
||||
|
||||
let Some((_, rest)) = addr.split_once("://") else {
|
||||
return false;
|
||||
};
|
||||
let authority_end = rest.find(['/', '?', '#']).unwrap_or(rest.len());
|
||||
let authority = &rest[..authority_end];
|
||||
let host_and_port = authority
|
||||
.rsplit_once('@')
|
||||
.map_or(authority, |(_, host_and_port)| host_and_port);
|
||||
let explicit_default_port = match parsed.scheme() {
|
||||
"ws" => 80,
|
||||
"wss" => 443,
|
||||
_ => return false,
|
||||
};
|
||||
let expected_host = if host.contains(':') {
|
||||
format!("[{host}]")
|
||||
} else {
|
||||
host.to_string()
|
||||
};
|
||||
host_and_port == format!("{expected_host}:{explicit_default_port}")
|
||||
}
|
||||
|
||||
fn websocket_url_supports_auth_token(parsed: &Url) -> bool {
|
||||
match (parsed.scheme(), parsed.host()) {
|
||||
("wss", Some(_)) => true,
|
||||
("ws", Some(url::Host::Domain(domain))) => domain.eq_ignore_ascii_case("localhost"),
|
||||
("ws", Some(url::Host::Ipv4(addr))) => addr.is_loopback(),
|
||||
("ws", Some(url::Host::Ipv6(addr))) => addr.is_loopback(),
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn resolve_remote_addr(addr: &str) -> color_eyre::Result<RemoteAppServerEndpoint> {
|
||||
if let Some(socket_path) = addr.strip_prefix("unix://") {
|
||||
let socket_path = if socket_path.is_empty() {
|
||||
let codex_home = find_codex_home().wrap_err("failed to resolve CODEX_HOME")?;
|
||||
codex_app_server_client::app_server_control_socket_path(&codex_home)
|
||||
.map_err(color_eyre::Report::new)?
|
||||
} else {
|
||||
AbsolutePathBuf::relative_to_current_dir(socket_path)
|
||||
.map_err(color_eyre::Report::new)?
|
||||
};
|
||||
return Ok(RemoteAppServerEndpoint::UnixSocket { socket_path });
|
||||
}
|
||||
|
||||
let parsed = match Url::parse(addr) {
|
||||
Ok(parsed) => parsed,
|
||||
Err(_) => {
|
||||
color_eyre::eyre::bail!(
|
||||
"invalid remote address `{addr}`; expected `ws://host:port`, `wss://host:port`, `unix://`, or `unix://PATH`"
|
||||
);
|
||||
}
|
||||
};
|
||||
if matches!(parsed.scheme(), "ws" | "wss")
|
||||
&& parsed.host_str().is_some()
|
||||
&& remote_addr_has_explicit_port(addr, &parsed)
|
||||
&& parsed.path() == "/"
|
||||
&& parsed.query().is_none()
|
||||
&& parsed.fragment().is_none()
|
||||
{
|
||||
return Ok(RemoteAppServerEndpoint::WebSocket {
|
||||
websocket_url: parsed.to_string(),
|
||||
auth_token: None,
|
||||
});
|
||||
}
|
||||
|
||||
color_eyre::eyre::bail!(
|
||||
"invalid remote address `{addr}`; expected `ws://host:port`, `wss://host:port`, `unix://`, or `unix://PATH`"
|
||||
);
|
||||
}
|
||||
|
||||
pub fn remote_addr_supports_auth_token(endpoint: &RemoteAppServerEndpoint) -> bool {
|
||||
match endpoint {
|
||||
RemoteAppServerEndpoint::WebSocket { websocket_url, .. } => {
|
||||
Url::parse(websocket_url).is_ok_and(|parsed| websocket_url_supports_auth_token(&parsed))
|
||||
}
|
||||
RemoteAppServerEndpoint::UnixSocket { .. } => false,
|
||||
}
|
||||
}
|
||||
|
||||
async fn connect_remote_app_server(
|
||||
endpoint: RemoteAppServerEndpoint,
|
||||
) -> color_eyre::Result<AppServerClient> {
|
||||
|
||||
@@ -747,81 +747,6 @@ fn session_target_display_label_falls_back_to_thread_id() {
|
||||
assert_eq!(target.display_label(), format!("thread {thread_id}"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_remote_addr_accepts_websocket_url() {
|
||||
assert_eq!(
|
||||
resolve_remote_addr("ws://127.0.0.1:4500").expect("ws URL should normalize"),
|
||||
RemoteAppServerEndpoint::WebSocket {
|
||||
websocket_url: "ws://127.0.0.1:4500/".to_string(),
|
||||
auth_token: None,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_remote_addr_accepts_secure_websocket_url() {
|
||||
assert_eq!(
|
||||
resolve_remote_addr("wss://example.com:443").expect("wss URL should normalize"),
|
||||
RemoteAppServerEndpoint::WebSocket {
|
||||
websocket_url: "wss://example.com/".to_string(),
|
||||
auth_token: None,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_remote_addr_accepts_default_socket() -> color_eyre::Result<()> {
|
||||
let codex_home = find_codex_home().wrap_err("failed to resolve CODEX_HOME")?;
|
||||
assert_eq!(
|
||||
resolve_remote_addr("unix://")?,
|
||||
RemoteAppServerEndpoint::UnixSocket {
|
||||
socket_path: codex_app_server_client::app_server_control_socket_path(&codex_home)?,
|
||||
}
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_remote_addr_accepts_relative_socket_path() -> color_eyre::Result<()> {
|
||||
assert_eq!(
|
||||
resolve_remote_addr("unix://codex.sock")?,
|
||||
RemoteAppServerEndpoint::UnixSocket {
|
||||
socket_path: AbsolutePathBuf::relative_to_current_dir("codex.sock")?,
|
||||
}
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_remote_addr_accepts_absolute_socket_path() -> color_eyre::Result<()> {
|
||||
let temp_dir = TempDir::new()?;
|
||||
let socket_path = temp_dir.path().join("codex.sock");
|
||||
assert_eq!(
|
||||
resolve_remote_addr(&format!("unix://{}", socket_path.display()))?,
|
||||
RemoteAppServerEndpoint::UnixSocket {
|
||||
socket_path: AbsolutePathBuf::from_absolute_path(&socket_path)?,
|
||||
}
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_remote_addr_rejects_invalid_remote_addresses() {
|
||||
for addr in [
|
||||
"ws://127.0.0.1",
|
||||
"wss://example.com",
|
||||
"127.0.0.1:4500",
|
||||
"https://127.0.0.1:4500",
|
||||
] {
|
||||
let err = resolve_remote_addr(addr).expect_err("invalid remote addresses should fail");
|
||||
assert!(
|
||||
err.to_string().contains(
|
||||
"expected `ws://host:port`, `wss://host:port`, `unix://`, or `unix://PATH`"
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn default_daemon_auto_connect_skips_missing_socket() -> color_eyre::Result<()> {
|
||||
let codex_home = TempDir::new()?;
|
||||
|
||||
Reference in New Issue
Block a user