mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
881cf191d7
## Why The standalone `codex-app-server` binary already routed a `CliConfigOverrides` value into app-server startup, but its own clap args did not expose the shared `-c/--config` option. That meant `codex-app-server -c key=value` was rejected before the existing config override path could run, unlike the main `codex` CLI. ## What Changed - Flatten `CliConfigOverrides` into `AppServerArgs` in `codex-rs/app-server/src/main.rs`. - Pass parsed overrides to `run_main_with_transport_options` instead of always using `CliConfigOverrides::default()`. - Add a binary parser test covering both `-c` and `--config` for the standalone app-server. ## Verification - `just test -p codex-app-server app_server_accepts_cli_config_overrides` The broader `just test -p codex-app-server` run was also attempted. It compiled and ran 812 tests, with 796 passing, but failed in this local sandbox on unrelated `sandbox-exec: sandbox_apply: Operation not permitted` command-exec/turn integration paths and a skills watcher timeout.
134 lines
4.1 KiB
Rust
134 lines
4.1 KiB
Rust
use clap::Parser;
|
|
use codex_app_server::AppServerRuntimeOptions;
|
|
use codex_app_server::AppServerTransport;
|
|
use codex_app_server::AppServerWebsocketAuthArgs;
|
|
use codex_app_server::PluginStartupTasks;
|
|
use codex_app_server::run_main_with_transport_options;
|
|
use codex_arg0::Arg0DispatchPaths;
|
|
use codex_arg0::arg0_dispatch_or_else;
|
|
use codex_config::LoaderOverrides;
|
|
use codex_protocol::protocol::SessionSource;
|
|
use codex_utils_cli::CliConfigOverrides;
|
|
use std::path::PathBuf;
|
|
|
|
// Debug-only test hook: lets integration tests point the server at a temporary
|
|
// managed config file without writing to /etc.
|
|
const MANAGED_CONFIG_PATH_ENV_VAR: &str = "CODEX_APP_SERVER_MANAGED_CONFIG_PATH";
|
|
const DISABLE_MANAGED_CONFIG_ENV_VAR: &str = "CODEX_APP_SERVER_DISABLE_MANAGED_CONFIG";
|
|
|
|
#[derive(Debug, Parser)]
|
|
#[command(version)]
|
|
struct AppServerArgs {
|
|
#[command(flatten)]
|
|
config_overrides: CliConfigOverrides,
|
|
|
|
/// Transport endpoint URL. Supported values: `stdio://` (default),
|
|
/// `unix://`, `unix://PATH`, `ws://IP:PORT`, `off`.
|
|
#[arg(
|
|
long = "listen",
|
|
value_name = "URL",
|
|
default_value = AppServerTransport::DEFAULT_LISTEN_URL
|
|
)]
|
|
listen: AppServerTransport,
|
|
|
|
/// Session source used to derive product restrictions and metadata.
|
|
#[arg(
|
|
long = "session-source",
|
|
value_name = "SOURCE",
|
|
default_value = "vscode",
|
|
value_parser = SessionSource::from_startup_arg
|
|
)]
|
|
session_source: SessionSource,
|
|
|
|
#[command(flatten)]
|
|
auth: AppServerWebsocketAuthArgs,
|
|
|
|
/// Fail if config.toml contains unknown configuration fields.
|
|
#[arg(long = "strict-config", default_value_t = false)]
|
|
strict_config: bool,
|
|
|
|
/// Hidden debug-only test hook used by integration tests that spawn the
|
|
/// production app-server binary.
|
|
#[cfg(debug_assertions)]
|
|
#[arg(long = "disable-plugin-startup-tasks-for-tests", hide = true)]
|
|
disable_plugin_startup_tasks_for_tests: bool,
|
|
|
|
/// Enable remote control for this app-server process.
|
|
#[arg(long = "remote-control", hide = true)]
|
|
remote_control: bool,
|
|
}
|
|
|
|
fn main() -> anyhow::Result<()> {
|
|
arg0_dispatch_or_else(|arg0_paths: Arg0DispatchPaths| async move {
|
|
let AppServerArgs {
|
|
config_overrides,
|
|
listen,
|
|
session_source,
|
|
auth,
|
|
strict_config,
|
|
#[cfg(debug_assertions)]
|
|
disable_plugin_startup_tasks_for_tests,
|
|
remote_control,
|
|
} = AppServerArgs::parse();
|
|
let loader_overrides = if disable_managed_config_from_debug_env() {
|
|
LoaderOverrides::without_managed_config_for_tests()
|
|
} else {
|
|
managed_config_path_from_debug_env()
|
|
.map(LoaderOverrides::with_managed_config_path_for_tests)
|
|
.unwrap_or_default()
|
|
};
|
|
let transport = listen;
|
|
let auth = auth.try_into_settings()?;
|
|
let mut runtime_options = AppServerRuntimeOptions::default();
|
|
#[cfg(debug_assertions)]
|
|
if disable_plugin_startup_tasks_for_tests {
|
|
runtime_options.plugin_startup_tasks = PluginStartupTasks::Skip;
|
|
}
|
|
runtime_options.remote_control_enabled = remote_control;
|
|
|
|
run_main_with_transport_options(
|
|
arg0_paths,
|
|
config_overrides,
|
|
loader_overrides,
|
|
strict_config,
|
|
/*default_analytics_enabled*/ false,
|
|
transport,
|
|
session_source,
|
|
auth,
|
|
runtime_options,
|
|
)
|
|
.await?;
|
|
Ok(())
|
|
})
|
|
}
|
|
|
|
fn disable_managed_config_from_debug_env() -> bool {
|
|
#[cfg(debug_assertions)]
|
|
{
|
|
if let Ok(value) = std::env::var(DISABLE_MANAGED_CONFIG_ENV_VAR) {
|
|
return matches!(value.as_str(), "1" | "true" | "TRUE" | "yes" | "YES");
|
|
}
|
|
}
|
|
|
|
false
|
|
}
|
|
|
|
fn managed_config_path_from_debug_env() -> Option<PathBuf> {
|
|
#[cfg(debug_assertions)]
|
|
{
|
|
if let Ok(value) = std::env::var(MANAGED_CONFIG_PATH_ENV_VAR) {
|
|
return if value.is_empty() {
|
|
None
|
|
} else {
|
|
Some(PathBuf::from(value))
|
|
};
|
|
}
|
|
}
|
|
|
|
None
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "main_tests.rs"]
|
|
mod tests;
|