mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
## What changed - Group preferences into Appearance, Notifications, Input, Sessions, and Text selection tabs, with search and links to existing theme, status line, terminal title, and keyboard editors. - Persist preference changes to the selected local configuration file, apply supported changes immediately, and show save errors, configuration overrides, and restart requirements in the panel. - Add a delayed notification test and controls for notification timing while preserving custom event filters. - Add `tui.copy_on_select_clear_selection`, disabled by default, to clear transcript selection highlights only after confirmed automatic clipboard delivery. - Keep local configuration editors usable while disconnected and prevent held activation keys or buffered input from triggering actions across editor and reconnect transitions. ## Testing Add regression tests and rendering snapshots for panel navigation, search, dependency states, editor handoffs, offline persistence, notification timers, custom filter preservation, and confirmed-copy deselection. GitOrigin-RevId: a16d218046060fcb6e61705a803fcd9297266e6e
135 lines
4.6 KiB
Rust
135 lines
4.6 KiB
Rust
//! Desktop notification coalescing for `ChatWidget`.
|
|
|
|
use super::*;
|
|
|
|
impl ChatWidget {
|
|
pub(super) fn notify(&mut self, notification: Notification) {
|
|
if !notification.allowed_for(&self.local_settings.tui.notification_settings.notifications) {
|
|
return;
|
|
}
|
|
if let Some(existing) = self.pending_notification.as_ref()
|
|
&& existing.priority() > notification.priority()
|
|
{
|
|
return;
|
|
}
|
|
self.pending_notification = Some(notification);
|
|
self.request_redraw();
|
|
}
|
|
|
|
pub(crate) fn maybe_post_pending_notification(&mut self, tui: &mut crate::tui::Tui) {
|
|
if let Some(notif) = self.pending_notification.take() {
|
|
tui.notify(notif.display());
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub(crate) enum Notification {
|
|
AgentTurnComplete { response: String },
|
|
ExecApprovalRequested { command: String },
|
|
EditApprovalRequested { cwd: PathBuf, changes: Vec<PathBuf> },
|
|
ElicitationRequested { server_name: String },
|
|
PlanModePrompt { title: String },
|
|
AsyncQuestion { title: String },
|
|
}
|
|
|
|
impl Notification {
|
|
pub(super) fn display(&self) -> String {
|
|
match self {
|
|
Notification::AgentTurnComplete { response } => {
|
|
Notification::agent_turn_preview(response)
|
|
.unwrap_or_else(|| "Agent turn complete".to_string())
|
|
}
|
|
Notification::ExecApprovalRequested { command } => {
|
|
format!(
|
|
"Approval requested: {}",
|
|
truncate_text(command, /*max_graphemes*/ 30)
|
|
)
|
|
}
|
|
Notification::EditApprovalRequested { cwd, changes } => {
|
|
format!(
|
|
"Codex wants to edit {}",
|
|
if changes.len() == 1 {
|
|
#[allow(clippy::unwrap_used)]
|
|
display_path_for(changes.first().unwrap(), cwd)
|
|
} else {
|
|
format!("{} files", changes.len())
|
|
}
|
|
)
|
|
}
|
|
Notification::ElicitationRequested { server_name } => {
|
|
format!("Approval requested by {server_name}")
|
|
}
|
|
Notification::PlanModePrompt { title } => {
|
|
format!("Plan mode prompt: {title}")
|
|
}
|
|
Notification::AsyncQuestion { title } => {
|
|
format!("Question: {title}")
|
|
}
|
|
}
|
|
}
|
|
|
|
fn type_name(&self) -> &str {
|
|
match self {
|
|
Notification::AgentTurnComplete { .. } => "agent-turn-complete",
|
|
Notification::ExecApprovalRequested { .. }
|
|
| Notification::EditApprovalRequested { .. }
|
|
| Notification::ElicitationRequested { .. } => "approval-requested",
|
|
Notification::PlanModePrompt { .. } => "plan-mode-prompt",
|
|
Notification::AsyncQuestion { .. } => "async-question",
|
|
}
|
|
}
|
|
|
|
fn priority(&self) -> u8 {
|
|
match self {
|
|
Notification::AgentTurnComplete { .. } => 0,
|
|
Notification::ExecApprovalRequested { .. }
|
|
| Notification::EditApprovalRequested { .. }
|
|
| Notification::ElicitationRequested { .. }
|
|
| Notification::PlanModePrompt { .. }
|
|
| Notification::AsyncQuestion { .. } => 1,
|
|
}
|
|
}
|
|
|
|
pub(super) fn allowed_for(&self, settings: &Notifications) -> bool {
|
|
match settings {
|
|
Notifications::Enabled(enabled) => *enabled,
|
|
Notifications::Custom(allowed) => allowed.iter().any(|a| a == self.type_name()),
|
|
}
|
|
}
|
|
|
|
pub(super) fn agent_turn_preview(response: &str) -> Option<String> {
|
|
let mut normalized = String::new();
|
|
for part in response.split_whitespace() {
|
|
if !normalized.is_empty() {
|
|
normalized.push(' ');
|
|
}
|
|
normalized.push_str(part);
|
|
}
|
|
let trimmed = normalized.trim();
|
|
if trimmed.is_empty() {
|
|
None
|
|
} else {
|
|
Some(truncate_text(trimmed, AGENT_NOTIFICATION_PREVIEW_GRAPHEMES))
|
|
}
|
|
}
|
|
|
|
pub(super) fn user_input_request_summary(
|
|
questions: &[codex_app_server_protocol::ToolRequestUserInputQuestion],
|
|
) -> Option<String> {
|
|
let first_question = questions.first()?;
|
|
let summary = if first_question.header.trim().is_empty() {
|
|
first_question.question.trim()
|
|
} else {
|
|
first_question.header.trim()
|
|
};
|
|
if summary.is_empty() {
|
|
None
|
|
} else {
|
|
Some(truncate_text(summary, /*max_graphemes*/ 30))
|
|
}
|
|
}
|
|
}
|
|
|
|
const AGENT_NOTIFICATION_PREVIEW_GRAPHEMES: usize = 200;
|