mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
61dfe0b86c
## Why `argument-comment-lint` was green in CI even though the repo still had many uncommented literal arguments. The main gap was target coverage: the repo wrapper did not force Cargo to inspect test-only call sites, so examples like the `latest_session_lookup_params(true, ...)` tests in `codex-rs/tui_app_server/src/lib.rs` never entered the blocking CI path. This change cleans up the existing backlog, makes the default repo lint path cover all Cargo targets, and starts rolling that stricter CI enforcement out on the platform where it is currently validated. ## What changed - mechanically fixed existing `argument-comment-lint` violations across the `codex-rs` workspace, including tests, examples, and benches - updated `tools/argument-comment-lint/run-prebuilt-linter.sh` and `tools/argument-comment-lint/run.sh` so non-`--fix` runs default to `--all-targets` unless the caller explicitly narrows the target set - fixed both wrappers so forwarded cargo arguments after `--` are preserved with a single separator - documented the new default behavior in `tools/argument-comment-lint/README.md` - updated `rust-ci` so the macOS lint lane keeps the plain wrapper invocation and therefore enforces `--all-targets`, while Linux and Windows temporarily pass `-- --lib --bins` That temporary CI split keeps the stricter all-targets check where it is already cleaned up, while leaving room to finish the remaining Linux- and Windows-specific target-gated cleanup before enabling `--all-targets` on those runners. The Linux and Windows failures on the intermediate revision were caused by the wrapper forwarding bug, not by additional lint findings in those lanes. ## Validation - `bash -n tools/argument-comment-lint/run.sh` - `bash -n tools/argument-comment-lint/run-prebuilt-linter.sh` - shell-level wrapper forwarding check for `-- --lib --bins` - shell-level wrapper forwarding check for `-- --tests` - `just argument-comment-lint` - `cargo test` in `tools/argument-comment-lint` - `cargo test -p codex-terminal-detection` ## Follow-up - Clean up remaining Linux-only target-gated callsites, then switch the Linux lint lane back to the plain wrapper invocation. - Clean up remaining Windows-only target-gated callsites, then switch the Windows lint lane back to the plain wrapper invocation.
914 lines
32 KiB
Rust
914 lines
32 KiB
Rust
use std::io::IsTerminal;
|
|
use std::path::PathBuf;
|
|
|
|
use codex_app_server_protocol::CommandExecutionStatus;
|
|
use codex_app_server_protocol::McpToolCallStatus;
|
|
use codex_app_server_protocol::PatchApplyStatus;
|
|
use codex_app_server_protocol::ServerNotification;
|
|
use codex_app_server_protocol::ThreadItem;
|
|
use codex_app_server_protocol::ThreadTokenUsage;
|
|
use codex_app_server_protocol::TurnStatus;
|
|
use codex_core::WireApi;
|
|
use codex_core::config::Config;
|
|
use codex_protocol::num_format::format_with_separators;
|
|
use codex_protocol::protocol::SandboxPolicy;
|
|
use codex_protocol::protocol::SessionConfiguredEvent;
|
|
use owo_colors::OwoColorize;
|
|
use owo_colors::Style;
|
|
|
|
use crate::event_processor::CodexStatus;
|
|
use crate::event_processor::EventProcessor;
|
|
use crate::event_processor::handle_last_message;
|
|
|
|
pub(crate) struct EventProcessorWithHumanOutput {
|
|
bold: Style,
|
|
cyan: Style,
|
|
dimmed: Style,
|
|
green: Style,
|
|
italic: Style,
|
|
magenta: Style,
|
|
red: Style,
|
|
yellow: Style,
|
|
show_agent_reasoning: bool,
|
|
show_raw_agent_reasoning: bool,
|
|
last_message_path: Option<PathBuf>,
|
|
final_message: Option<String>,
|
|
final_message_rendered: bool,
|
|
emit_final_message_on_shutdown: bool,
|
|
last_total_token_usage: Option<ThreadTokenUsage>,
|
|
}
|
|
|
|
impl EventProcessorWithHumanOutput {
|
|
pub(crate) fn create_with_ansi(
|
|
with_ansi: bool,
|
|
config: &Config,
|
|
last_message_path: Option<PathBuf>,
|
|
) -> Self {
|
|
let style = |styled: Style, plain: Style| if with_ansi { styled } else { plain };
|
|
Self {
|
|
bold: style(Style::new().bold(), Style::new()),
|
|
cyan: style(Style::new().cyan(), Style::new()),
|
|
dimmed: style(Style::new().dimmed(), Style::new()),
|
|
green: style(Style::new().green(), Style::new()),
|
|
italic: style(Style::new().italic(), Style::new()),
|
|
magenta: style(Style::new().magenta(), Style::new()),
|
|
red: style(Style::new().red(), Style::new()),
|
|
yellow: style(Style::new().yellow(), Style::new()),
|
|
show_agent_reasoning: !config.hide_agent_reasoning,
|
|
show_raw_agent_reasoning: config.show_raw_agent_reasoning,
|
|
last_message_path,
|
|
final_message: None,
|
|
final_message_rendered: false,
|
|
emit_final_message_on_shutdown: false,
|
|
last_total_token_usage: None,
|
|
}
|
|
}
|
|
|
|
fn render_item_started(&self, item: &ThreadItem) {
|
|
match item {
|
|
ThreadItem::CommandExecution { command, cwd, .. } => {
|
|
eprintln!(
|
|
"{}\n{} in {}",
|
|
"exec".style(self.italic).style(self.magenta),
|
|
command.style(self.bold),
|
|
cwd.display()
|
|
);
|
|
}
|
|
ThreadItem::McpToolCall { server, tool, .. } => {
|
|
eprintln!(
|
|
"{} {} {}",
|
|
"mcp:".style(self.bold),
|
|
format!("{server}/{tool}").style(self.cyan),
|
|
"started".style(self.dimmed)
|
|
);
|
|
}
|
|
ThreadItem::WebSearch { query, .. } => {
|
|
eprintln!("{} {}", "web search:".style(self.bold), query);
|
|
}
|
|
ThreadItem::FileChange { .. } => {
|
|
eprintln!("{}", "apply patch".style(self.bold));
|
|
}
|
|
ThreadItem::CollabAgentToolCall { tool, .. } => {
|
|
eprintln!("{} {:?}", "collab:".style(self.bold), tool);
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
|
|
fn render_item_completed(&mut self, item: ThreadItem) {
|
|
match item {
|
|
ThreadItem::AgentMessage { text, .. } => {
|
|
eprintln!(
|
|
"{}\n{}",
|
|
"codex".style(self.italic).style(self.magenta),
|
|
text
|
|
);
|
|
self.final_message = Some(text);
|
|
self.final_message_rendered = true;
|
|
}
|
|
ThreadItem::Reasoning {
|
|
summary, content, ..
|
|
} => {
|
|
if self.show_agent_reasoning
|
|
&& let Some(text) =
|
|
reasoning_text(&summary, &content, self.show_raw_agent_reasoning)
|
|
&& !text.trim().is_empty()
|
|
{
|
|
eprintln!("{}", text.style(self.dimmed));
|
|
}
|
|
}
|
|
ThreadItem::CommandExecution {
|
|
command: _,
|
|
aggregated_output,
|
|
exit_code,
|
|
status,
|
|
duration_ms,
|
|
..
|
|
} => {
|
|
let duration_suffix = duration_ms
|
|
.map(|duration_ms| format!(" in {duration_ms}ms"))
|
|
.unwrap_or_default();
|
|
match status {
|
|
CommandExecutionStatus::Completed => {
|
|
eprintln!(
|
|
"{}",
|
|
format!(" succeeded{duration_suffix}:").style(self.green)
|
|
);
|
|
}
|
|
CommandExecutionStatus::Failed => {
|
|
let exit_code = exit_code.unwrap_or(1);
|
|
eprintln!(
|
|
"{}",
|
|
format!(" exited {exit_code}{duration_suffix}:").style(self.red)
|
|
);
|
|
}
|
|
CommandExecutionStatus::Declined => {
|
|
eprintln!(
|
|
"{}",
|
|
format!(" declined{duration_suffix}:").style(self.yellow)
|
|
);
|
|
}
|
|
CommandExecutionStatus::InProgress => {
|
|
eprintln!(
|
|
"{}",
|
|
format!(" in progress{duration_suffix}:").style(self.dimmed)
|
|
);
|
|
}
|
|
}
|
|
if let Some(output) = aggregated_output
|
|
&& !output.trim().is_empty()
|
|
{
|
|
eprintln!("{output}");
|
|
}
|
|
}
|
|
ThreadItem::FileChange {
|
|
changes, status, ..
|
|
} => {
|
|
let status_text = match status {
|
|
PatchApplyStatus::Completed => "completed",
|
|
PatchApplyStatus::Failed => "failed",
|
|
PatchApplyStatus::Declined => "declined",
|
|
PatchApplyStatus::InProgress => "in_progress",
|
|
};
|
|
eprintln!("{} {}", "patch:".style(self.bold), status_text);
|
|
for change in changes {
|
|
eprintln!("{}", change.path.style(self.dimmed));
|
|
}
|
|
}
|
|
ThreadItem::McpToolCall {
|
|
server,
|
|
tool,
|
|
status,
|
|
error,
|
|
..
|
|
} => {
|
|
let status_text = match status {
|
|
McpToolCallStatus::Completed => "completed".style(self.green),
|
|
McpToolCallStatus::Failed => "failed".style(self.red),
|
|
McpToolCallStatus::InProgress => "in_progress".style(self.dimmed),
|
|
};
|
|
eprintln!(
|
|
"{} {} {}",
|
|
"mcp:".style(self.bold),
|
|
format!("{server}/{tool}").style(self.cyan),
|
|
format!("({status_text})").style(self.dimmed)
|
|
);
|
|
if let Some(error) = error {
|
|
eprintln!("{}", error.message.style(self.red));
|
|
}
|
|
}
|
|
ThreadItem::WebSearch { query, .. } => {
|
|
eprintln!("{} {}", "web search:".style(self.bold), query);
|
|
}
|
|
ThreadItem::ContextCompaction { .. } => {
|
|
eprintln!("{}", "context compacted".style(self.dimmed));
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl EventProcessor for EventProcessorWithHumanOutput {
|
|
fn print_config_summary(
|
|
&mut self,
|
|
config: &Config,
|
|
prompt: &str,
|
|
session_configured_event: &SessionConfiguredEvent,
|
|
) {
|
|
const VERSION: &str = env!("CARGO_PKG_VERSION");
|
|
eprintln!("OpenAI Codex v{VERSION} (research preview)\n--------");
|
|
for (key, value) in config_summary_entries(config, session_configured_event) {
|
|
eprintln!("{} {}", format!("{key}:").style(self.bold), value);
|
|
}
|
|
eprintln!("--------");
|
|
eprintln!("{}\n{}", "user".style(self.cyan), prompt);
|
|
}
|
|
|
|
fn process_server_notification(&mut self, notification: ServerNotification) -> CodexStatus {
|
|
match notification {
|
|
ServerNotification::ConfigWarning(notification) => {
|
|
let details = notification
|
|
.details
|
|
.map(|details| format!(" ({details})"))
|
|
.unwrap_or_default();
|
|
eprintln!(
|
|
"{} {}{}",
|
|
"warning:".style(self.yellow).style(self.bold),
|
|
notification.summary,
|
|
details
|
|
);
|
|
CodexStatus::Running
|
|
}
|
|
ServerNotification::Error(notification) => {
|
|
eprintln!(
|
|
"{} {}",
|
|
"ERROR:".style(self.red).style(self.bold),
|
|
notification.error
|
|
);
|
|
CodexStatus::Running
|
|
}
|
|
ServerNotification::DeprecationNotice(notification) => {
|
|
eprintln!(
|
|
"{} {}",
|
|
"deprecated:".style(self.yellow).style(self.bold),
|
|
notification.summary
|
|
);
|
|
if let Some(details) = notification.details {
|
|
eprintln!("{}", details.style(self.dimmed));
|
|
}
|
|
CodexStatus::Running
|
|
}
|
|
ServerNotification::HookStarted(notification) => {
|
|
eprintln!(
|
|
"{} {}",
|
|
"hook:".style(self.bold),
|
|
format!("{:?}", notification.run.event_name).style(self.dimmed)
|
|
);
|
|
CodexStatus::Running
|
|
}
|
|
ServerNotification::HookCompleted(notification) => {
|
|
eprintln!(
|
|
"{} {} {:?}",
|
|
"hook:".style(self.bold),
|
|
format!("{:?}", notification.run.event_name).style(self.dimmed),
|
|
notification.run.status
|
|
);
|
|
CodexStatus::Running
|
|
}
|
|
ServerNotification::ItemStarted(notification) => {
|
|
self.render_item_started(¬ification.item);
|
|
CodexStatus::Running
|
|
}
|
|
ServerNotification::ItemCompleted(notification) => {
|
|
self.render_item_completed(notification.item);
|
|
CodexStatus::Running
|
|
}
|
|
ServerNotification::ModelRerouted(notification) => {
|
|
eprintln!(
|
|
"{} {} -> {}",
|
|
"model rerouted:".style(self.yellow).style(self.bold),
|
|
notification.from_model,
|
|
notification.to_model
|
|
);
|
|
CodexStatus::Running
|
|
}
|
|
ServerNotification::ThreadTokenUsageUpdated(notification) => {
|
|
self.last_total_token_usage = Some(notification.token_usage);
|
|
CodexStatus::Running
|
|
}
|
|
ServerNotification::TurnCompleted(notification) => match notification.turn.status {
|
|
TurnStatus::Completed => {
|
|
let rendered_message = self
|
|
.final_message_rendered
|
|
.then(|| self.final_message.clone())
|
|
.flatten();
|
|
if let Some(final_message) =
|
|
final_message_from_turn_items(notification.turn.items.as_slice())
|
|
{
|
|
self.final_message_rendered =
|
|
rendered_message.as_deref() == Some(final_message.as_str());
|
|
self.final_message = Some(final_message);
|
|
}
|
|
self.emit_final_message_on_shutdown = true;
|
|
CodexStatus::InitiateShutdown
|
|
}
|
|
TurnStatus::Failed => {
|
|
self.final_message = None;
|
|
self.final_message_rendered = false;
|
|
self.emit_final_message_on_shutdown = false;
|
|
if let Some(error) = notification.turn.error {
|
|
eprintln!("{} {}", "ERROR:".style(self.red).style(self.bold), error);
|
|
}
|
|
CodexStatus::InitiateShutdown
|
|
}
|
|
TurnStatus::Interrupted => {
|
|
self.final_message = None;
|
|
self.final_message_rendered = false;
|
|
self.emit_final_message_on_shutdown = false;
|
|
eprintln!("{}", "turn interrupted".style(self.dimmed));
|
|
CodexStatus::InitiateShutdown
|
|
}
|
|
TurnStatus::InProgress => CodexStatus::Running,
|
|
},
|
|
ServerNotification::TurnDiffUpdated(notification) => {
|
|
if !notification.diff.trim().is_empty() {
|
|
eprintln!("{}", notification.diff);
|
|
}
|
|
CodexStatus::Running
|
|
}
|
|
ServerNotification::TurnPlanUpdated(notification) => {
|
|
if let Some(explanation) = notification.explanation {
|
|
eprintln!("{}", explanation.style(self.italic));
|
|
}
|
|
for step in notification.plan {
|
|
match step.status {
|
|
codex_app_server_protocol::TurnPlanStepStatus::Completed => {
|
|
eprintln!(" {} {}", "✓".style(self.green), step.step);
|
|
}
|
|
codex_app_server_protocol::TurnPlanStepStatus::InProgress => {
|
|
eprintln!(" {} {}", "→".style(self.cyan), step.step);
|
|
}
|
|
codex_app_server_protocol::TurnPlanStepStatus::Pending => {
|
|
eprintln!(
|
|
" {} {}",
|
|
"•".style(self.dimmed),
|
|
step.step.style(self.dimmed)
|
|
);
|
|
}
|
|
}
|
|
}
|
|
CodexStatus::Running
|
|
}
|
|
ServerNotification::TurnStarted(_) => CodexStatus::Running,
|
|
_ => CodexStatus::Running,
|
|
}
|
|
}
|
|
|
|
fn process_warning(&mut self, message: String) -> CodexStatus {
|
|
eprintln!(
|
|
"{} {message}",
|
|
"warning:".style(self.yellow).style(self.bold)
|
|
);
|
|
CodexStatus::Running
|
|
}
|
|
|
|
fn print_final_output(&mut self) {
|
|
if self.emit_final_message_on_shutdown
|
|
&& let Some(path) = self.last_message_path.as_deref()
|
|
{
|
|
handle_last_message(self.final_message.as_deref(), path);
|
|
}
|
|
|
|
if let Some(usage) = &self.last_total_token_usage {
|
|
eprintln!(
|
|
"{}\n{}",
|
|
"tokens used".style(self.dimmed),
|
|
format_with_separators(blended_total(usage))
|
|
);
|
|
}
|
|
|
|
#[allow(clippy::print_stdout)]
|
|
if should_print_final_message_to_stdout(
|
|
self.emit_final_message_on_shutdown
|
|
.then_some(self.final_message.as_deref())
|
|
.flatten(),
|
|
std::io::stdout().is_terminal(),
|
|
std::io::stderr().is_terminal(),
|
|
) && let Some(message) = self.final_message.as_deref()
|
|
{
|
|
println!("{message}");
|
|
} else if should_print_final_message_to_tty(
|
|
self.emit_final_message_on_shutdown
|
|
.then_some(self.final_message.as_deref())
|
|
.flatten(),
|
|
self.final_message_rendered,
|
|
std::io::stdout().is_terminal(),
|
|
std::io::stderr().is_terminal(),
|
|
) && let Some(message) = self.final_message.as_deref()
|
|
{
|
|
eprintln!(
|
|
"{}\n{}",
|
|
"codex".style(self.italic).style(self.magenta),
|
|
message
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn config_summary_entries(
|
|
config: &Config,
|
|
session_configured_event: &SessionConfiguredEvent,
|
|
) -> Vec<(&'static str, String)> {
|
|
let mut entries = vec![
|
|
("workdir", config.cwd.display().to_string()),
|
|
("model", session_configured_event.model.clone()),
|
|
(
|
|
"provider",
|
|
session_configured_event.model_provider_id.clone(),
|
|
),
|
|
(
|
|
"approval",
|
|
config.permissions.approval_policy.value().to_string(),
|
|
),
|
|
(
|
|
"sandbox",
|
|
summarize_sandbox_policy(config.permissions.sandbox_policy.get()),
|
|
),
|
|
];
|
|
if config.model_provider.wire_api == WireApi::Responses {
|
|
entries.push((
|
|
"reasoning effort",
|
|
config
|
|
.model_reasoning_effort
|
|
.map(|effort| effort.to_string())
|
|
.unwrap_or_else(|| "none".to_string()),
|
|
));
|
|
entries.push((
|
|
"reasoning summaries",
|
|
config
|
|
.model_reasoning_summary
|
|
.map(|summary| summary.to_string())
|
|
.unwrap_or_else(|| "none".to_string()),
|
|
));
|
|
}
|
|
entries.push((
|
|
"session id",
|
|
session_configured_event.session_id.to_string(),
|
|
));
|
|
entries
|
|
}
|
|
|
|
fn summarize_sandbox_policy(sandbox_policy: &SandboxPolicy) -> String {
|
|
match sandbox_policy {
|
|
SandboxPolicy::DangerFullAccess => "danger-full-access".to_string(),
|
|
SandboxPolicy::ReadOnly { network_access, .. } => {
|
|
let mut summary = "read-only".to_string();
|
|
if *network_access {
|
|
summary.push_str(" (network access enabled)");
|
|
}
|
|
summary
|
|
}
|
|
SandboxPolicy::ExternalSandbox { network_access } => {
|
|
let mut summary = "external-sandbox".to_string();
|
|
if matches!(
|
|
network_access,
|
|
codex_protocol::protocol::NetworkAccess::Enabled
|
|
) {
|
|
summary.push_str(" (network access enabled)");
|
|
}
|
|
summary
|
|
}
|
|
SandboxPolicy::WorkspaceWrite {
|
|
writable_roots,
|
|
network_access,
|
|
exclude_tmpdir_env_var,
|
|
exclude_slash_tmp,
|
|
read_only_access: _,
|
|
} => {
|
|
let mut summary = "workspace-write".to_string();
|
|
let mut writable_entries = vec!["workdir".to_string()];
|
|
if !*exclude_slash_tmp {
|
|
writable_entries.push("/tmp".to_string());
|
|
}
|
|
if !*exclude_tmpdir_env_var {
|
|
writable_entries.push("$TMPDIR".to_string());
|
|
}
|
|
writable_entries.extend(
|
|
writable_roots
|
|
.iter()
|
|
.map(|path| path.to_string_lossy().to_string()),
|
|
);
|
|
summary.push_str(&format!(" [{}]", writable_entries.join(", ")));
|
|
if *network_access {
|
|
summary.push_str(" (network access enabled)");
|
|
}
|
|
summary
|
|
}
|
|
}
|
|
}
|
|
|
|
fn reasoning_text(
|
|
summary: &[String],
|
|
content: &[String],
|
|
show_raw_agent_reasoning: bool,
|
|
) -> Option<String> {
|
|
let entries = if show_raw_agent_reasoning && !content.is_empty() {
|
|
content
|
|
} else {
|
|
summary
|
|
};
|
|
if entries.is_empty() {
|
|
None
|
|
} else {
|
|
Some(entries.join("\n"))
|
|
}
|
|
}
|
|
|
|
fn final_message_from_turn_items(items: &[ThreadItem]) -> Option<String> {
|
|
items
|
|
.iter()
|
|
.rev()
|
|
.find_map(|item| match item {
|
|
ThreadItem::AgentMessage { text, .. } => Some(text.clone()),
|
|
_ => None,
|
|
})
|
|
.or_else(|| {
|
|
items.iter().rev().find_map(|item| match item {
|
|
ThreadItem::Plan { text, .. } => Some(text.clone()),
|
|
_ => None,
|
|
})
|
|
})
|
|
}
|
|
|
|
fn blended_total(usage: &ThreadTokenUsage) -> i64 {
|
|
let cached_input = usage.total.cached_input_tokens.max(0);
|
|
let non_cached_input = (usage.total.input_tokens - cached_input).max(0);
|
|
(non_cached_input + usage.total.output_tokens.max(0)).max(0)
|
|
}
|
|
|
|
fn should_print_final_message_to_stdout(
|
|
final_message: Option<&str>,
|
|
stdout_is_terminal: bool,
|
|
stderr_is_terminal: bool,
|
|
) -> bool {
|
|
final_message.is_some() && !(stdout_is_terminal && stderr_is_terminal)
|
|
}
|
|
|
|
fn should_print_final_message_to_tty(
|
|
final_message: Option<&str>,
|
|
final_message_rendered: bool,
|
|
stdout_is_terminal: bool,
|
|
stderr_is_terminal: bool,
|
|
) -> bool {
|
|
final_message.is_some() && !final_message_rendered && stdout_is_terminal && stderr_is_terminal
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use codex_app_server_protocol::ThreadItem;
|
|
use codex_app_server_protocol::Turn;
|
|
use codex_app_server_protocol::TurnStatus;
|
|
use owo_colors::Style;
|
|
|
|
use super::EventProcessorWithHumanOutput;
|
|
use super::final_message_from_turn_items;
|
|
use super::reasoning_text;
|
|
use super::should_print_final_message_to_stdout;
|
|
use super::should_print_final_message_to_tty;
|
|
use crate::event_processor::EventProcessor;
|
|
use codex_app_server_protocol::ServerNotification;
|
|
|
|
#[test]
|
|
fn suppresses_final_stdout_message_when_both_streams_are_terminals() {
|
|
assert!(!should_print_final_message_to_stdout(
|
|
Some("hello"),
|
|
/*stdout_is_terminal*/ true,
|
|
/*stderr_is_terminal*/ true
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn prints_final_stdout_message_when_stdout_is_not_terminal() {
|
|
assert!(should_print_final_message_to_stdout(
|
|
Some("hello"),
|
|
/*stdout_is_terminal*/ false,
|
|
/*stderr_is_terminal*/ true
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn prints_final_stdout_message_when_stderr_is_not_terminal() {
|
|
assert!(should_print_final_message_to_stdout(
|
|
Some("hello"),
|
|
/*stdout_is_terminal*/ true,
|
|
/*stderr_is_terminal*/ false
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn suppresses_final_stdout_message_when_missing() {
|
|
assert!(!should_print_final_message_to_stdout(
|
|
/*final_message*/ None, /*stdout_is_terminal*/ false,
|
|
/*stderr_is_terminal*/ false
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn prints_final_tty_message_when_not_yet_rendered() {
|
|
assert!(should_print_final_message_to_tty(
|
|
Some("hello"),
|
|
/*final_message_rendered*/ false,
|
|
/*stdout_is_terminal*/ true,
|
|
/*stderr_is_terminal*/ true
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn suppresses_final_tty_message_when_already_rendered() {
|
|
assert!(!should_print_final_message_to_tty(
|
|
Some("hello"),
|
|
/*final_message_rendered*/ true,
|
|
/*stdout_is_terminal*/ true,
|
|
/*stderr_is_terminal*/ true
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn reasoning_text_prefers_summary_when_raw_reasoning_is_hidden() {
|
|
let text = reasoning_text(
|
|
&["summary".to_string()],
|
|
&["raw".to_string()],
|
|
/*show_raw_agent_reasoning*/ false,
|
|
);
|
|
|
|
assert_eq!(text.as_deref(), Some("summary"));
|
|
}
|
|
|
|
#[test]
|
|
fn reasoning_text_uses_raw_content_when_enabled() {
|
|
let text = reasoning_text(
|
|
&["summary".to_string()],
|
|
&["raw".to_string()],
|
|
/*show_raw_agent_reasoning*/ true,
|
|
);
|
|
|
|
assert_eq!(text.as_deref(), Some("raw"));
|
|
}
|
|
|
|
#[test]
|
|
fn final_message_from_turn_items_uses_latest_agent_message() {
|
|
let message = final_message_from_turn_items(&[
|
|
ThreadItem::AgentMessage {
|
|
id: "msg-1".to_string(),
|
|
text: "first".to_string(),
|
|
phase: None,
|
|
memory_citation: None,
|
|
},
|
|
ThreadItem::Plan {
|
|
id: "plan-1".to_string(),
|
|
text: "plan".to_string(),
|
|
},
|
|
ThreadItem::AgentMessage {
|
|
id: "msg-2".to_string(),
|
|
text: "second".to_string(),
|
|
phase: None,
|
|
memory_citation: None,
|
|
},
|
|
]);
|
|
|
|
assert_eq!(message.as_deref(), Some("second"));
|
|
}
|
|
|
|
#[test]
|
|
fn final_message_from_turn_items_falls_back_to_latest_plan() {
|
|
let message = final_message_from_turn_items(&[
|
|
ThreadItem::Reasoning {
|
|
id: "reasoning-1".to_string(),
|
|
summary: vec!["inspect".to_string()],
|
|
content: Vec::new(),
|
|
},
|
|
ThreadItem::Plan {
|
|
id: "plan-1".to_string(),
|
|
text: "first plan".to_string(),
|
|
},
|
|
ThreadItem::Plan {
|
|
id: "plan-2".to_string(),
|
|
text: "final plan".to_string(),
|
|
},
|
|
]);
|
|
|
|
assert_eq!(message.as_deref(), Some("final plan"));
|
|
}
|
|
|
|
#[test]
|
|
fn turn_completed_recovers_final_message_from_turn_items() {
|
|
let mut processor = EventProcessorWithHumanOutput {
|
|
bold: Style::new(),
|
|
cyan: Style::new(),
|
|
dimmed: Style::new(),
|
|
green: Style::new(),
|
|
italic: Style::new(),
|
|
magenta: Style::new(),
|
|
red: Style::new(),
|
|
yellow: Style::new(),
|
|
show_agent_reasoning: true,
|
|
show_raw_agent_reasoning: false,
|
|
last_message_path: None,
|
|
final_message: None,
|
|
final_message_rendered: false,
|
|
emit_final_message_on_shutdown: false,
|
|
last_total_token_usage: None,
|
|
};
|
|
|
|
let status = processor.process_server_notification(ServerNotification::TurnCompleted(
|
|
codex_app_server_protocol::TurnCompletedNotification {
|
|
thread_id: "thread-1".to_string(),
|
|
turn: Turn {
|
|
id: "turn-1".to_string(),
|
|
items: vec![ThreadItem::AgentMessage {
|
|
id: "msg-1".to_string(),
|
|
text: "final answer".to_string(),
|
|
phase: None,
|
|
memory_citation: None,
|
|
}],
|
|
status: TurnStatus::Completed,
|
|
error: None,
|
|
},
|
|
},
|
|
));
|
|
|
|
assert_eq!(
|
|
status,
|
|
crate::event_processor::CodexStatus::InitiateShutdown
|
|
);
|
|
assert_eq!(processor.final_message.as_deref(), Some("final answer"));
|
|
}
|
|
|
|
#[test]
|
|
fn turn_completed_overwrites_stale_final_message_from_turn_items() {
|
|
let mut processor = EventProcessorWithHumanOutput {
|
|
bold: Style::new(),
|
|
cyan: Style::new(),
|
|
dimmed: Style::new(),
|
|
green: Style::new(),
|
|
italic: Style::new(),
|
|
magenta: Style::new(),
|
|
red: Style::new(),
|
|
yellow: Style::new(),
|
|
show_agent_reasoning: true,
|
|
show_raw_agent_reasoning: false,
|
|
last_message_path: None,
|
|
final_message: Some("stale answer".to_string()),
|
|
final_message_rendered: true,
|
|
emit_final_message_on_shutdown: false,
|
|
last_total_token_usage: None,
|
|
};
|
|
|
|
let status = processor.process_server_notification(ServerNotification::TurnCompleted(
|
|
codex_app_server_protocol::TurnCompletedNotification {
|
|
thread_id: "thread-1".to_string(),
|
|
turn: Turn {
|
|
id: "turn-1".to_string(),
|
|
items: vec![ThreadItem::AgentMessage {
|
|
id: "msg-1".to_string(),
|
|
text: "final answer".to_string(),
|
|
phase: None,
|
|
memory_citation: None,
|
|
}],
|
|
status: TurnStatus::Completed,
|
|
error: None,
|
|
},
|
|
},
|
|
));
|
|
|
|
assert_eq!(
|
|
status,
|
|
crate::event_processor::CodexStatus::InitiateShutdown
|
|
);
|
|
assert_eq!(processor.final_message.as_deref(), Some("final answer"));
|
|
assert!(!processor.final_message_rendered);
|
|
}
|
|
|
|
#[test]
|
|
fn turn_completed_preserves_streamed_final_message_when_turn_items_are_empty() {
|
|
let mut processor = EventProcessorWithHumanOutput {
|
|
bold: Style::new(),
|
|
cyan: Style::new(),
|
|
dimmed: Style::new(),
|
|
green: Style::new(),
|
|
italic: Style::new(),
|
|
magenta: Style::new(),
|
|
red: Style::new(),
|
|
yellow: Style::new(),
|
|
show_agent_reasoning: true,
|
|
show_raw_agent_reasoning: false,
|
|
last_message_path: None,
|
|
final_message: Some("streamed answer".to_string()),
|
|
final_message_rendered: false,
|
|
emit_final_message_on_shutdown: false,
|
|
last_total_token_usage: None,
|
|
};
|
|
|
|
let status = processor.process_server_notification(ServerNotification::TurnCompleted(
|
|
codex_app_server_protocol::TurnCompletedNotification {
|
|
thread_id: "thread-1".to_string(),
|
|
turn: Turn {
|
|
id: "turn-1".to_string(),
|
|
items: Vec::new(),
|
|
status: TurnStatus::Completed,
|
|
error: None,
|
|
},
|
|
},
|
|
));
|
|
|
|
assert_eq!(
|
|
status,
|
|
crate::event_processor::CodexStatus::InitiateShutdown
|
|
);
|
|
assert_eq!(processor.final_message.as_deref(), Some("streamed answer"));
|
|
assert!(processor.emit_final_message_on_shutdown);
|
|
}
|
|
|
|
#[test]
|
|
fn turn_failed_clears_stale_final_message() {
|
|
let mut processor = EventProcessorWithHumanOutput {
|
|
bold: Style::new(),
|
|
cyan: Style::new(),
|
|
dimmed: Style::new(),
|
|
green: Style::new(),
|
|
italic: Style::new(),
|
|
magenta: Style::new(),
|
|
red: Style::new(),
|
|
yellow: Style::new(),
|
|
show_agent_reasoning: true,
|
|
show_raw_agent_reasoning: false,
|
|
last_message_path: None,
|
|
final_message: Some("partial answer".to_string()),
|
|
final_message_rendered: true,
|
|
emit_final_message_on_shutdown: true,
|
|
last_total_token_usage: None,
|
|
};
|
|
|
|
let status = processor.process_server_notification(ServerNotification::TurnCompleted(
|
|
codex_app_server_protocol::TurnCompletedNotification {
|
|
thread_id: "thread-1".to_string(),
|
|
turn: Turn {
|
|
id: "turn-1".to_string(),
|
|
items: Vec::new(),
|
|
status: TurnStatus::Failed,
|
|
error: None,
|
|
},
|
|
},
|
|
));
|
|
|
|
assert_eq!(
|
|
status,
|
|
crate::event_processor::CodexStatus::InitiateShutdown
|
|
);
|
|
assert_eq!(processor.final_message, None);
|
|
assert!(!processor.final_message_rendered);
|
|
assert!(!processor.emit_final_message_on_shutdown);
|
|
}
|
|
|
|
#[test]
|
|
fn turn_interrupted_clears_stale_final_message() {
|
|
let mut processor = EventProcessorWithHumanOutput {
|
|
bold: Style::new(),
|
|
cyan: Style::new(),
|
|
dimmed: Style::new(),
|
|
green: Style::new(),
|
|
italic: Style::new(),
|
|
magenta: Style::new(),
|
|
red: Style::new(),
|
|
yellow: Style::new(),
|
|
show_agent_reasoning: true,
|
|
show_raw_agent_reasoning: false,
|
|
last_message_path: None,
|
|
final_message: Some("partial answer".to_string()),
|
|
final_message_rendered: true,
|
|
emit_final_message_on_shutdown: true,
|
|
last_total_token_usage: None,
|
|
};
|
|
|
|
let status = processor.process_server_notification(ServerNotification::TurnCompleted(
|
|
codex_app_server_protocol::TurnCompletedNotification {
|
|
thread_id: "thread-1".to_string(),
|
|
turn: Turn {
|
|
id: "turn-1".to_string(),
|
|
items: Vec::new(),
|
|
status: TurnStatus::Interrupted,
|
|
error: None,
|
|
},
|
|
},
|
|
));
|
|
|
|
assert_eq!(
|
|
status,
|
|
crate::event_processor::CodexStatus::InitiateShutdown
|
|
);
|
|
assert_eq!(processor.final_message, None);
|
|
assert!(!processor.final_message_rendered);
|
|
assert!(!processor.emit_final_message_on_shutdown);
|
|
}
|
|
}
|