Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Standardize TUI menu description wording and punctuation (#47329)

Eric Traut00d92ad3ee7f
diff --git a/codex-rs/tui/src/app/agents_overview.rs b/codex-rs/tui/src/app/agents_overview.rs
index a36b7c3d2a..c5347606c5 100644
--- a/codex-rs/tui/src/app/agents_overview.rs
+++ b/codex-rs/tui/src/app/agents_overview.rs
@@ -97,7 +97,7 @@ impl App {
(!workload_identity_selected).then(|| SelectionItem {
name: "Start background server".to_string(),
description: Some(
- "Open `codex agents` in another terminal afterward.".to_string(),
+ "Open `codex agents` in another terminal afterward".to_string(),
),
actions: vec![Box::new(|tx| tx.send(AppEvent::StartAgentsDaemon))],
dismiss_on_select: true,
diff --git a/codex-rs/tui/src/app/background_requests.rs b/codex-rs/tui/src/app/background_requests.rs
index c3b9646a5c..4f2c2fdadb 100644
--- a/codex-rs/tui/src/app/background_requests.rs
+++ b/codex-rs/tui/src/app/background_requests.rs
@@ -997,24 +997,24 @@ fn plugin_remote_section_error_message(label: &str, err: &str) -> String {
fn plugin_remote_section_error_next_step(label: &str, err: &str) -> &'static str {
let err = err.to_ascii_lowercase();
if err.contains("api key auth is not supported") {
- "Sign in with ChatGPT auth; API key auth cannot load remote plugin catalogs."
+ "Sign in with ChatGPT auth; API key auth cannot load remote plugin catalogs"
} else if err.contains("authentication required")
|| err.contains("not signed in")
|| err.contains("not logged in")
{
- "Sign in to ChatGPT, then try loading this section again."
+ "Sign in to ChatGPT, then try loading this section again"
} else if err.contains("codex plugins are disabled")
|| err.contains("plugin sharing is disabled")
|| err.contains("plugin sharing is not enabled")
|| err.contains("feature disabled")
{
- "Ask a workspace admin to enable Codex plugins or plugin sharing."
+ "Ask a workspace admin to enable Codex plugins or plugin sharing"
} else if err.contains("workspace") && (err.contains("access") || err.contains("mismatch")) {
- "Switch to the matching workspace or ask the sharer for access."
+ "Switch to the matching workspace or ask the sharer for access"
} else if err.contains("not found") || err.contains("status 404") {
- "Check that you are signed in to the correct workspace and still have access."
+ "Check that you are signed in to the correct workspace and still have access"
} else if err.contains("old build") || err.contains("update codex") || err.contains("stale") {
- "Update Codex, then try opening the shared plugin again."
+ "Update Codex, then try opening the shared plugin again"
} else if err.contains("service unavailable")
|| err.contains("temporarily unavailable")
|| err.contains("status 503")
@@ -1022,11 +1022,11 @@ fn plugin_remote_section_error_next_step(label: &str, err: &str) -> &'static str
|| err.contains("request")
|| err.contains("status")
{
- "Try again later; local plugin functionality is still available."
+ "Try again later; local plugin functionality is still available"
} else if err.contains("disabled by admin") || err.contains("admin disabled") {
- "Ask a workspace admin to confirm plugin access."
+ "Ask a workspace admin to confirm plugin access"
} else if label == "Shared with me" && err.contains("plugin") && err.contains("disabled") {
- "Ask the sharer or a workspace admin to confirm plugin access."
+ "Ask the sharer or a workspace admin to confirm plugin access"
} else {
""
}
@@ -1036,7 +1036,7 @@ fn plugin_sharing_disabled_remote_section_error() -> PluginRemoteSectionError {
PluginRemoteSectionError {
section_id: "shared-with-me".to_string(),
label: "Shared with me".to_string(),
- message: "Plugin sharing is disabled for this Codex session. Enable plugin sharing to load shared plugins.".to_string(),
+ message: "Enable plugin sharing for this Codex session to load shared plugins".to_string(),
}
}
@@ -1496,42 +1496,42 @@ mod tests {
(
"Workspace",
"chatgpt authentication required for remote plugin catalog",
- "Sign in to ChatGPT, then try loading this section again.",
+ "Sign in to ChatGPT, then try loading this section again",
),
(
"OpenAI Curated",
"chatgpt authentication required for remote plugin catalog; api key auth is not supported",
- "Sign in with ChatGPT auth; API key auth cannot load remote plugin catalogs.",
+ "Sign in with ChatGPT auth; API key auth cannot load remote plugin catalogs",
),
(
"Shared with me",
"remote plugin catalog request failed with status 404: missing",
- "Check that you are signed in to the correct workspace and still have access.",
+ "Check that you are signed in to the correct workspace and still have access",
),
(
"Shared with me",
"workspace access mismatch",
- "Switch to the matching workspace or ask the sharer for access.",
+ "Switch to the matching workspace or ask the sharer for access",
),
(
"Shared with me",
"old build fallback",
- "Update Codex, then try opening the shared plugin again.",
+ "Update Codex, then try opening the shared plugin again",
),
(
"Shared with me",
"remote service unavailable",
- "Try again later; local plugin functionality is still available.",
+ "Try again later; local plugin functionality is still available",
),
(
"Workspace",
"plugin disabled by admin",
- "Ask a workspace admin to confirm plugin access.",
+ "Ask a workspace admin to confirm plugin access",
),
(
"Shared with me",
"plugin sharing is not enabled",
- "Ask a workspace admin to enable Codex plugins or plugin sharing.",
+ "Ask a workspace admin to enable Codex plugins or plugin sharing",
),
];
@@ -1550,7 +1550,8 @@ mod tests {
PluginRemoteSectionError {
section_id: "shared-with-me".to_string(),
label: "Shared with me".to_string(),
- message: "Plugin sharing is disabled for this Codex session. Enable plugin sharing to load shared plugins.".to_string(),
+ message: "Enable plugin sharing for this Codex session to load shared plugins"
+ .to_string(),
}
);
}
diff --git a/codex-rs/tui/src/app/daemon_menu.rs b/codex-rs/tui/src/app/daemon_menu.rs
index 08062f4d3c..bf9934dfcf 100644
--- a/codex-rs/tui/src/app/daemon_menu.rs
+++ b/codex-rs/tui/src/app/daemon_menu.rs
@@ -70,7 +70,7 @@ impl App {
disabled_reason: (unavailable.is_none()
&& source == DaemonUpdateSource::ThisCli
&& !has_package)
- .then(|| "This CLI has no local package to copy.".to_string()),
+ .then(|| "This CLI has no local package to copy".to_string()),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::ConfirmDaemonUpdate(source));
})],
diff --git a/codex-rs/tui/src/app/snapshots/codex_tui__app__daemon_menu__tests__daemon_unpackaged_cli.snap b/codex-rs/tui/src/app/snapshots/codex_tui__app__daemon_menu__tests__daemon_unpackaged_cli.snap
index af37495bb2..dd6f597fdc 100644
--- a/codex-rs/tui/src/app/snapshots/codex_tui__app__daemon_menu__tests__daemon_unpackaged_cli.snap
+++ b/codex-rs/tui/src/app/snapshots/codex_tui__app__daemon_menu__tests__daemon_unpackaged_cli.snap
@@ -7,6 +7,6 @@ expression: "render_bottom_popup(&app.chat_widget, 80)"
› 1. Install latest public stable
- Use this CLI build (disabled) This CLI has no local package to copy.
+ Use this CLI build (disabled) This CLI has no local package to copy
enter select · esc back
diff --git a/codex-rs/tui/src/app/tests/rate_limits.rs b/codex-rs/tui/src/app/tests/rate_limits.rs
index 28b62e1c9b..460b977b3c 100644
--- a/codex-rs/tui/src/app/tests/rate_limits.rs
+++ b/codex-rs/tui/src/app/tests/rate_limits.rs
@@ -304,7 +304,7 @@ async fn stale_rate_limit_reads_preserve_newer_workspace_hard_stop_for_every_ori
let popup = render_bottom_popup(&app.chat_widget, /*width*/ 100);
match origin_name {
"usage" => assert!(
- popup.contains("Redeem reset None available."),
+ popup.contains("Redeem reset None available"),
"expected usage reset availability, got: {popup}"
),
"reset-picker" => {
diff --git a/codex-rs/tui/src/bottom_pane/feedback_view.rs b/codex-rs/tui/src/bottom_pane/feedback_view.rs
index 3a4965a6a4..3ceba06831 100644
--- a/codex-rs/tui/src/bottom_pane/feedback_view.rs
+++ b/codex-rs/tui/src/bottom_pane/feedback_view.rs
@@ -150,31 +150,31 @@ pub(crate) fn feedback_selection_params(
make_feedback_item(
app_event_tx.clone(),
"bug",
- "Crash, error message, hang, or broken UI/behavior.",
+ "Crash, error message, hang, or broken UI/behavior",
FeedbackCategory::Bug,
),
make_feedback_item(
app_event_tx.clone(),
"bad result",
- "Output was off-target, incorrect, incomplete, or unhelpful.",
+ "Output was off-target, incorrect, incomplete, or unhelpful",
FeedbackCategory::BadResult,
),
make_feedback_item(
app_event_tx.clone(),
"good result",
- "Helpful, correct, high‑quality, or delightful result worth celebrating.",
+ "Helpful, correct, high‑quality, or delightful result worth celebrating",
FeedbackCategory::GoodResult,
),
make_feedback_item(
app_event_tx.clone(),
"safety check",
- "Benign usage blocked due to safety checks or refusals.",
+ "Benign usage blocked due to safety checks or refusals",
FeedbackCategory::SafetyCheck,
),
make_feedback_item(
app_event_tx,
"other",
- "Slowness, feature suggestion, UX feedback, or anything else.",
+ "Slowness, feature suggestion, UX feedback, or anything else",
FeedbackCategory::Other,
),
],
@@ -313,7 +313,7 @@ pub(crate) fn feedback_upload_consent_params(
super::SelectionItem {
name: "Yes".to_string(),
description: Some(
- "Share the current Codex session logs and diagnostics with the team for troubleshooting."
+ "Share the current Codex session logs and diagnostics with the team for troubleshooting"
.to_string(),
),
actions: vec![yes_action],
diff --git a/codex-rs/tui/src/bottom_pane/mcp_server_elicitation.rs b/codex-rs/tui/src/bottom_pane/mcp_server_elicitation.rs
index 568097e214..b687cfe330 100644
--- a/codex-rs/tui/src/bottom_pane/mcp_server_elicitation.rs
+++ b/codex-rs/tui/src/bottom_pane/mcp_server_elicitation.rs
@@ -249,9 +249,9 @@ impl McpServerElicitationFormRequest {
(McpServerElicitationResponseMode::FormContent, Vec::new())
} else if is_message_only_schema {
let allow_description = if is_tool_approval_action {
- "Run the tool and continue."
+ "Run the tool and continue"
} else {
- "Allow this request and continue."
+ "Allow this request and continue"
};
let mut options = vec![McpServerElicitationOption {
label: "Allow".to_string(),
@@ -260,9 +260,9 @@ impl McpServerElicitationFormRequest {
}];
if approval_supports_persist_mode(meta, APPROVAL_PERSIST_SESSION_VALUE) {
let description = if is_tool_approval_action {
- "Run the tool and remember this choice for this session."
+ "Run the tool and remember this choice for this session"
} else {
- "Allow this request and remember this choice for this session."
+ "Allow this request and remember this choice for this session"
};
options.push(McpServerElicitationOption {
label: "Allow for this session".to_string(),
@@ -272,9 +272,9 @@ impl McpServerElicitationFormRequest {
}
if approval_supports_persist_mode(meta, APPROVAL_PERSIST_ALWAYS_VALUE) {
let description = if is_tool_approval_action {
- "Run the tool and remember this choice for future tool calls."
+ "Run the tool and remember this choice for future tool calls"
} else {
- "Allow this request and remember this choice for future requests."
+ "Allow this request and remember this choice for future requests"
};
options.push(McpServerElicitationOption {
label: "Always allow".to_string(),
@@ -292,7 +292,7 @@ impl McpServerElicitationFormRequest {
options.extend([
McpServerElicitationOption {
label: "Deny".to_string(),
- description: Some("Decline this request and continue.".to_string()),
+ description: Some("Decline this request and continue".to_string()),
value: Value::String(APPROVAL_DECLINE_VALUE.to_string()),
},
McpServerElicitationOption {
@@ -1933,12 +1933,12 @@ mod tests {
options: vec![
McpServerElicitationOption {
label: "Allow".to_string(),
- description: Some("Allow this request and continue.".to_string()),
+ description: Some("Allow this request and continue".to_string()),
value: Value::String(APPROVAL_ACCEPT_ONCE_VALUE.to_string()),
},
McpServerElicitationOption {
label: "Deny".to_string(),
- description: Some("Decline this request and continue.".to_string()),
+ description: Some("Decline this request and continue".to_string()),
value: Value::String(APPROVAL_DECLINE_VALUE.to_string()),
},
McpServerElicitationOption {
@@ -1990,7 +1990,7 @@ mod tests {
options: vec![
McpServerElicitationOption {
label: "Allow".to_string(),
- description: Some("Run the tool and continue.".to_string()),
+ description: Some("Run the tool and continue".to_string()),
value: Value::String(APPROVAL_ACCEPT_ONCE_VALUE.to_string()),
},
McpServerElicitationOption {
diff --git a/codex-rs/tui/src/bottom_pane/memories_settings_view.rs b/codex-rs/tui/src/bottom_pane/memories_settings_view.rs
index 00b5882a59..cd78eb3994 100644
--- a/codex-rs/tui/src/bottom_pane/memories_settings_view.rs
+++ b/codex-rs/tui/src/bottom_pane/memories_settings_view.rs
@@ -82,19 +82,19 @@ impl MemoriesSettingsView {
MemoriesMenuItem::Setting {
setting: MemoriesSetting::Use,
name: "Use memories",
- description: "Use memories in the following threads. Applied at next thread.",
+ description: "Use memories starting with the next thread",
enabled: use_memories,
},
MemoriesMenuItem::Setting {
setting: MemoriesSetting::Generate,
name: "Generate memories",
- description: "Generate memories from the following threads. Current thread included.",
+ description: "Generate memories from this thread and future threads",
enabled: generate_memories,
},
MemoriesMenuItem::Action {
action: MemoriesAction::Reset,
name: "Reset all memories",
- description: "Clear local memory files and summaries. Existing threads stay intact.",
+ description: "Clear local memory files and summaries without changing existing threads",
},
],
state: ScrollState::new(),
@@ -175,8 +175,8 @@ impl MemoriesSettingsView {
format!(" {name}")
},
description: Some(match idx {
- 0 => "Delete local memory files and rollout summaries.".to_string(),
- 1 => "Return to memory settings.".to_string(),
+ 0 => "Delete local memory files and rollout summaries".to_string(),
+ 1 => "Return to memory settings".to_string(),
_ => unreachable!("reset confirmation only renders two rows"),
}),
..Default::default()
diff --git a/codex-rs/tui/src/bottom_pane/request_user_input/mod.rs b/codex-rs/tui/src/bottom_pane/request_user_input/mod.rs
index 39168deb89..c0e4633169 100644
--- a/codex-rs/tui/src/bottom_pane/request_user_input/mod.rs
+++ b/codex-rs/tui/src/bottom_pane/request_user_input/mod.rs
@@ -62,10 +62,10 @@ const SELECT_OPTION_PLACEHOLDER: &str = "Select an option to add notes";
pub(super) const TIP_SEPARATOR: &str = " | ";
pub(super) const DESIRED_SPACERS_BETWEEN_SECTIONS: u16 = 2;
const OTHER_OPTION_LABEL: &str = "None of the above";
-const OTHER_OPTION_DESCRIPTION: &str = "Optionally, add details in notes (tab).";
+const OTHER_OPTION_DESCRIPTION: &str = "Optionally, add details in notes (tab)";
const UNANSWERED_CONFIRM_TITLE: &str = "Submit with unanswered questions?";
const UNANSWERED_CONFIRM_GO_BACK: &str = "Go back";
-const UNANSWERED_CONFIRM_GO_BACK_DESC: &str = "Return to the first unanswered question.";
+const UNANSWERED_CONFIRM_GO_BACK_DESC: &str = "Return to the first unanswered question";
const UNANSWERED_CONFIRM_SUBMIT: &str = "Proceed";
const UNANSWERED_CONFIRM_SUBMIT_DESC_SINGULAR: &str = "question";
const UNANSWERED_CONFIRM_SUBMIT_DESC_PLURAL: &str = "questions";
@@ -945,7 +945,7 @@ impl RequestUserInputOverlay {
} else {
UNANSWERED_CONFIRM_SUBMIT_DESC_PLURAL
};
- format!("Submit with {count} unanswered {suffix}.")
+ format!("Submit with {count} unanswered {suffix}")
}
fn first_unanswered_index(&self) -> Option<usize> {
@@ -3347,7 +3347,10 @@ mod tests {
fn request_user_input_options_snapshot() {
let (tx, _rx) = test_sender();
let overlay = RequestUserInputOverlay::new(
- request_event("turn-1", vec![question_with_options("q1", "Area")]),
+ request_event(
+ "turn-1",
+ vec![question_with_options_and_other("q1", "Area")],
+ ),
tx,
/*has_input_focus*/ true,
/*enhanced_keys_supported*/ false,
diff --git a/codex-rs/tui/src/bottom_pane/request_user_input/snapshots/codex_tui__bottom_pane__request_user_input__tests__request_user_input_options.snap b/codex-rs/tui/src/bottom_pane/request_user_input/snapshots/codex_tui__bottom_pane__request_user_input__tests__request_user_input_options.snap
index c93576246d..a40d7e0cfa 100644
--- a/codex-rs/tui/src/bottom_pane/request_user_input/snapshots/codex_tui__bottom_pane__request_user_input__tests__request_user_input_options.snap
+++ b/codex-rs/tui/src/bottom_pane/request_user_input/snapshots/codex_tui__bottom_pane__request_user_input__tests__request_user_input_options.snap
@@ -6,8 +6,9 @@ expression: "render_snapshot(&overlay, area)"
Question 1/1 (1 unanswered)
Choose an option.
- › 1. Option 1 First choice.
- 2. Option 2 Second choice.
- 3. Option 3 Third choice.
+ › 1. Option 1 First choice.
+ 2. Option 2 Second choice.
+ 3. Option 3 Third choice.
+ 4. None of the above Optionally, add details in notes (tab)
tab to add notes | enter to submit answer | esc to interrupt
diff --git a/codex-rs/tui/src/bottom_pane/request_user_input/snapshots/codex_tui__bottom_pane__request_user_input__tests__request_user_input_unanswered_confirmation.snap b/codex-rs/tui/src/bottom_pane/request_user_input/snapshots/codex_tui__bottom_pane__request_user_input__tests__request_user_input_unanswered_confirmation.snap
index dd689c7267..59d1021ae9 100644
--- a/codex-rs/tui/src/bottom_pane/request_user_input/snapshots/codex_tui__bottom_pane__request_user_input__tests__request_user_input_unanswered_confirmation.snap
+++ b/codex-rs/tui/src/bottom_pane/request_user_input/snapshots/codex_tui__bottom_pane__request_user_input__tests__request_user_input_unanswered_confirmation.snap
@@ -6,8 +6,8 @@ expression: "render_snapshot(&overlay, area)"
Submit with unanswered questions?
2 unanswered questions
- › 1. Proceed Submit with 2 unanswered questions.
- 2. Go back Return to the first unanswered question.
+ › 1. Proceed Submit with 2 unanswered questions
+ 2. Go back Return to the first unanswered question
diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__command_popup__tests__command_popup_default_items.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__command_popup__tests__command_popup_default_items.snap
index 3e04054c91..a46aed6b7c 100644
--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__command_popup__tests__command_popup_default_items.snap
+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__command_popup__tests__command_popup_default_items.snap
@@ -33,7 +33,7 @@ expression: commands
/diff - show git diff (including untracked files)
/mention - mention a file
/status - show current session configuration and token usage
-/daemon - Manage the local background server.
+/daemon - Manage the local background server
/warnings - view retained warnings and diagnostic details
/cd - change the current working directory
/pwd - show the current working directory
diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_with_param_summary.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_with_param_summary.snap
index 0ac8f529ad..b82415ac0d 100644
--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_with_param_summary.snap
+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_with_param_summary.snap
@@ -10,7 +10,7 @@ expression: "render_snapshot(&overlay, Rect::new(0, 0, 120, 16))"
Title: Roadmap review
Notes: This is a deliberately long note that should truncate bef...
- › 1. Allow Run the tool and continue.
+ › 1. Allow Run the tool and continue
2. Cancel Cancel this tool call
diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_with_session_persist.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_with_session_persist.snap
index b8bb8f001c..7081772e99 100644
--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_with_session_persist.snap
+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_with_session_persist.snap
@@ -5,9 +5,9 @@ expression: "render_snapshot(&overlay, Rect::new(0, 0, 120, 16))"
Field 1/1
Allow this request?
- › 1. Allow Run the tool and continue.
- 2. Allow for this session Run the tool and remember this choice for this session.
- 3. Always allow Run the tool and remember this choice for future tool calls.
+ › 1. Allow Run the tool and continue
+ 2. Allow for this session Run the tool and remember this choice for this session
+ 3. Always allow Run the tool and remember this choice for future tool calls
4. Cancel Cancel this tool call
diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_without_schema.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_without_schema.snap
index 2d1c33fcbf..27e72e1f26 100644
--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_without_schema.snap
+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_approval_form_without_schema.snap
@@ -5,7 +5,7 @@ expression: "render_snapshot(&overlay, Rect::new(0, 0, 120, 16))"
Field 1/1
Allow this request?
- › 1. Allow Run the tool and continue.
+ › 1. Allow Run the tool and continue
2. Cancel Cancel this tool call
diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_message_only_form.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_message_only_form.snap
index e51ff1a6fa..73f4e8c2b0 100644
--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_message_only_form.snap
+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_message_only_form.snap
@@ -5,8 +5,8 @@ expression: "render_snapshot(&overlay, Rect::new(0, 0, 120, 16))"
Field 1/1
Boolean elicit MCP example: do you confirm?
- › 1. Allow Allow this request and continue.
- 2. Deny Decline this request and continue.
+ › 1. Allow Allow this request and continue
+ 2. Deny Decline this request and continue
3. Cancel Cancel this request
diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_message_only_form_with_persist_options.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_message_only_form_with_persist_options.snap
index 0a2d5d2f9d..9b0348f130 100644
--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_message_only_form_with_persist_options.snap
+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__mcp_server_elicitation__tests__mcp_server_elicitation_message_only_form_with_persist_options.snap
@@ -5,10 +5,10 @@ expression: "render_snapshot(&overlay, Rect::new(0, 0, 120, 16))"
Field 1/1
Boolean elicit MCP example: do you confirm?
- › 1. Allow Allow this request and continue.
- 2. Allow for this session Allow this request and remember this choice for this session.
- 3. Always allow Allow this request and remember this choice for future requests.
- 4. Deny Decline this request and continue.
+ › 1. Allow Allow this request and continue
+ 2. Allow for this session Allow this request and remember this choice for this session
+ 3. Always allow Allow this request and remember this choice for future requests
+ 4. Deny Decline this request and continue
5. Cancel Cancel this request
diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__memories_settings_view__tests__reset_confirmation_keeps_both_choices_at_wrap_boundary.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__memories_settings_view__tests__reset_confirmation_keeps_both_choices_at_wrap_boundary.snap
index 9bd31d9e83..c1eb9ca2cc 100644
--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__memories_settings_view__tests__reset_confirmation_keeps_both_choices_at_wrap_boundary.snap
+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__memories_settings_view__tests__reset_confirmation_keeps_both_choices_at_wrap_boundary.snap
@@ -10,8 +10,8 @@ width=68
› Reset all memories Delete local memory files and rollout
- summaries.
- Go back Return to memory settings.
+ summaries
+ Go back Return to memory settings
@@ -24,9 +24,8 @@ width=69
current Codex home.
-› Reset all memories Delete local memory files and rollout
- summaries.
- Go back Return to memory settings.
+› Reset all memories Delete local memory files and rollout summaries
+ Go back Return to memory settings
@@ -39,8 +38,8 @@ width=70
current Codex home.
-› Reset all memories Delete local memory files and rollout summaries.
- Go back Return to memory settings.
+› Reset all memories Delete local memory files and rollout summaries
+ Go back Return to memory settings
@@ -53,8 +52,8 @@ width=71
current Codex home.
-› Reset all memories Delete local memory files and rollout summaries.
- Go back Return to memory settings.
+› Reset all memories Delete local memory files and rollout summaries
+ Go back Return to memory settings
@@ -67,8 +66,8 @@ width=72
Codex home.
-› Reset all memories Delete local memory files and rollout summaries.
- Go back Return to memory settings.
+› Reset all memories Delete local memory files and rollout summaries
+ Go back Return to memory settings
diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__title_setup__tests__terminal_title_setup_basic.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__title_setup__tests__terminal_title_setup_basic.snap
index f4a7068606..21dbeb7627 100644
--- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__title_setup__tests__terminal_title_setup_basic.snap
+++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__title_setup__tests__terminal_title_setup_basic.snap
@@ -9,7 +9,7 @@ expression: "render_lines(&view, 84)"
Type to search
› [x] project-name Project name (falls back to current directory name)
- [x] activity Spinner while working, action-required message while blocked.
+ [x] activity Spinner while working, action-required message while blocked
[x] run-state Compact session run-state text (Ready, Working, Thinking)
[x] thread-title Current thread title, or thread identifier when unnamed
[ ] app-name Codex app name
diff --git a/codex-rs/tui/src/bottom_pane/title_setup.rs b/codex-rs/tui/src/bottom_pane/title_setup.rs
index a0815b4607..cc34c036f9 100644
--- a/codex-rs/tui/src/bottom_pane/title_setup.rs
+++ b/codex-rs/tui/src/bottom_pane/title_setup.rs
@@ -101,7 +101,7 @@ impl TerminalTitleItem {
TerminalTitleItem::Project => "Project name (falls back to current directory name)",
TerminalTitleItem::CurrentDir => "Current working directory",
TerminalTitleItem::Spinner => {
- "Spinner while working, action-required message while blocked."
+ "Spinner while working, action-required message while blocked"
}
TerminalTitleItem::Status => {
"Compact session run-state text (Ready, Working, Thinking)"
diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs
index 0f243e0eaf..984a9582cc 100644
--- a/codex-rs/tui/src/chatwidget.rs
+++ b/codex-rs/tui/src/chatwidget.rs
@@ -515,7 +515,7 @@ const USER_SHELL_COMMAND_HELP_TITLE: &str = "Prefix a command with ! to run it l
const USER_SHELL_COMMAND_HELP_HINT: &str = "Example: !ls";
const ASK_FOR_APPROVAL_LABEL: &str = "Ask for approval";
const APPROVE_FOR_ME_LABEL: &str = "Approve for me";
-const AUTO_REVIEW_DESCRIPTION: &str = "Only ask for actions detected as potentially unsafe.";
+const AUTO_REVIEW_DESCRIPTION: &str = "Only ask for actions detected as potentially unsafe";
const DEFAULT_OPENAI_BASE_URL: &str = "https://api.openai.com/v1";
const DEFAULT_STATUS_LINE_ITEMS: [&str; 3] = ["model-with-reasoning", "current-dir", "thread-name"];
@@ -1116,7 +1116,8 @@ impl ChatWidget {
SelectionItem {
name: "Yes, enable".to_string(),
description: Some(
- "Save on the server for new threads. This thread is unchanged.".to_string(),
+ "Save on the server for new threads without changing this thread"
+ .to_string(),
),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::EnableFeatureForNewThreads(feature));
@@ -1126,7 +1127,7 @@ impl ChatWidget {
},
SelectionItem {
name: "Not now".to_string(),
- description: Some(format!("Keep {name} disabled.")),
+ description: Some(format!("Keep {name} disabled")),
dismiss_on_select: true,
..Default::default()
},
diff --git a/codex-rs/tui/src/chatwidget/connectors.rs b/codex-rs/tui/src/chatwidget/connectors.rs
index b21b4511ec..eaa2c26a3a 100644
--- a/codex-rs/tui/src/chatwidget/connectors.rs
+++ b/codex-rs/tui/src/chatwidget/connectors.rs
@@ -219,7 +219,7 @@ impl ChatWidget {
subtitle: Some("Loading installed and available apps...".to_string()),
items: vec![SelectionItem {
name: "Loading apps...".to_string(),
- description: Some("This updates when the full list is ready.".to_string()),
+ description: Some("This updates when the full list is ready".to_string()),
is_disabled: true,
..Default::default()
}],
@@ -236,7 +236,7 @@ impl ChatWidget {
SelectionItem {
name: "App directory unavailable".to_string(),
description: Some(
- "The app directory request failed. Retry, or press Esc to continue."
+ "Retry the failed app directory request, or press Esc to continue"
.to_string(),
),
is_disabled: true,
@@ -244,7 +244,7 @@ impl ChatWidget {
},
SelectionItem {
name: "Retry".to_string(),
- description: Some("Reload installed and available apps.".to_string()),
+ description: Some("Reload installed and available apps".to_string()),
actions: vec![Box::new(|tx| {
tx.send(AppEvent::RefreshConnectors {
force_refetch: true,
@@ -295,12 +295,12 @@ impl ChatWidget {
let is_installed = connector.is_accessible;
let selected_label = if is_installed {
format!(
- "{status_label}. Press Enter to open the app page to install, manage, or enable/disable this app."
+ "{status_label} · Press Enter to open the app page to install, manage, or enable/disable this app"
)
} else {
- format!("{status_label}. Press Enter to open the app page to install this app.")
+ format!("{status_label} · Press Enter to open the app page to install this app")
};
- let missing_label = format!("{status_label}. App link unavailable.");
+ let missing_label = format!("{status_label} · App link unavailable");
let instructions = if connector.is_accessible {
"Manage this app in your browser."
} else {
diff --git a/codex-rs/tui/src/chatwidget/model_popups.rs b/codex-rs/tui/src/chatwidget/model_popups.rs
index 7e2df92ae9..03efe3110a 100644
--- a/codex-rs/tui/src/chatwidget/model_popups.rs
+++ b/codex-rs/tui/src/chatwidget/model_popups.rs
@@ -377,7 +377,7 @@ impl ChatWidget {
}
None => "the selected reasoning".to_string(),
};
- let plan_only_description = format!("Always use {reasoning_phrase} in Plan mode.");
+ let plan_only_description = format!("Always use {reasoning_phrase} in Plan mode");
let plan_reasoning_source = if let Some(plan_override) =
self.config.plan_mode_reasoning_effort.as_ref()
{
@@ -402,7 +402,7 @@ impl ChatWidget {
"built-in Plan default".to_string()
};
let all_modes_description = format!(
- "Set the global default reasoning level and the Plan mode override. This replaces the current {plan_reasoning_source}."
+ "Set the global default reasoning level and Plan mode override, replacing the current {plan_reasoning_source}"
);
let subtitle = format!("Choose where to apply {reasoning_phrase}.");
let warning = effort
@@ -498,7 +498,7 @@ impl ChatWidget {
};
let warning_text = warn_effort.as_ref().map(|effort| {
let effort_label = Self::reasoning_effort_label(effort);
- format!("⚠ {effort_label} reasoning effort can quickly consume Plus plan rate limits.")
+ format!("⚠ {effort_label} reasoning effort can quickly consume Plus plan rate limits")
});
let warn_for_model = preset.model.starts_with("gpt-5.1-codex")
|| preset.model.starts_with("gpt-5.1-codex-max")
diff --git a/codex-rs/tui/src/chatwidget/permission_popups.rs b/codex-rs/tui/src/chatwidget/permission_popups.rs
index b4798efe9c..fc98703f7e 100644
--- a/codex-rs/tui/src/chatwidget/permission_popups.rs
+++ b/codex-rs/tui/src/chatwidget/permission_popups.rs
@@ -4,6 +4,7 @@
//! Windows-specific sandbox prompting lives beside it in
//! `windows_sandbox_prompts`.
+use super::permissions_menu::permission_preset_description;
use super::*;
use crate::style::accent_color;
use codex_protocol::openai_models::MODEL_SPECIALTY_CYBER;
@@ -78,8 +79,7 @@ impl ChatWidget {
} else {
preset.label.to_string()
};
- let base_description =
- Some(preset.description.replace(" (Identical to Agent mode)", ""));
+ let base_description = Some(permission_preset_description(&preset).to_string());
let approval_disabled_reason = match self
.config
.permissions
@@ -210,7 +210,7 @@ impl ChatWidget {
let rationale = event
.rationale
.as_deref()
- .unwrap_or("Auto-review did not include a rationale.");
+ .unwrap_or("Auto-review did not include a rationale");
SelectionItem {
name: summary.clone(),
description: Some(rationale.to_string()),
diff --git a/codex-rs/tui/src/chatwidget/permissions_menu.rs b/codex-rs/tui/src/chatwidget/permissions_menu.rs
index da80735a76..ed653846f0 100644
--- a/codex-rs/tui/src/chatwidget/permissions_menu.rs
+++ b/codex-rs/tui/src/chatwidget/permissions_menu.rs
@@ -4,6 +4,19 @@ use super::*;
use crate::permission_discovery::PermissionDiscovery;
use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS;
+pub(super) fn permission_preset_description(preset: &ApprovalPreset) -> &'static str {
+ match preset.id {
+ "read-only" => "Read workspace files, with approval required for edits or internet access",
+ "auto" => {
+ "Read and edit workspace files and run commands, with approval required for internet access or edits outside the workspace"
+ }
+ "full-access" => {
+ "Use with caution: Codex can edit files outside this workspace and access the internet without approval"
+ }
+ _ => preset.description,
+ }
+}
+
pub(crate) fn auto_review_available(config: &Config) -> bool {
cyber_model_approval_reviewer(config) == Some(ApprovalsReviewer::AutoReview)
}
@@ -57,7 +70,7 @@ impl ChatWidget {
&preset.active_permission_profile.id,
&preset.permission_profile,
))
- .then(|| "Disabled by requirements.".to_string())
+ .then(|| "Disabled by requirements".to_string())
})
}
@@ -86,18 +99,14 @@ impl ChatWidget {
);
return;
};
- let mut items = vec![
- self.builtin_permission_mode_selection_item(
- &discovery,
- default,
- ":workspace",
- default
- .description
- .replace(" (Identical to Agent mode)", ""),
- AskForApproval::from(default.approval),
- ApprovalsReviewer::User,
- ),
- ];
+ let mut items = vec![self.builtin_permission_mode_selection_item(
+ &discovery,
+ default,
+ ":workspace",
+ permission_preset_description(default).to_string(),
+ AskForApproval::from(default.approval),
+ ApprovalsReviewer::User,
+ )];
if self.config.features.enabled(Feature::GuardianApproval) {
items.push(self.builtin_permission_mode_selection_item(
&discovery,
@@ -112,7 +121,7 @@ impl ChatWidget {
&discovery,
full_access,
BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS,
- full_access.description.to_string(),
+ permission_preset_description(full_access).to_string(),
AskForApproval::from(full_access.approval),
ApprovalsReviewer::User,
));
@@ -120,7 +129,7 @@ impl ChatWidget {
&discovery,
read_only,
":read-only",
- read_only.description.to_string(),
+ permission_preset_description(read_only).to_string(),
AskForApproval::from(read_only.approval),
ApprovalsReviewer::User,
));
@@ -136,7 +145,7 @@ impl ChatWidget {
profile
.description
.as_deref()
- .unwrap_or("Configured permission profile."),
+ .unwrap_or("Configured permission profile"),
active_profile_id.as_deref(),
discovery.disabled_reason(
&profile.id,
@@ -157,9 +166,9 @@ impl ChatWidget {
items.push(Self::permission_profile_selection_item(
id,
id,
- "Current permission profile.",
+ "Current permission profile",
Some(id),
- Some("Not available on this server.".to_string()),
+ Some("Not available on this server".to_string()),
));
}
self.bottom_pane.show_selection_view(SelectionViewParams {
diff --git a/codex-rs/tui/src/chatwidget/plan_implementation.rs b/codex-rs/tui/src/chatwidget/plan_implementation.rs
index d4a5d4aa18..9e273d8883 100644
--- a/codex-rs/tui/src/chatwidget/plan_implementation.rs
+++ b/codex-rs/tui/src/chatwidget/plan_implementation.rs
@@ -71,8 +71,8 @@ pub(super) fn selection_view_params(
};
let clear_context_description = clear_context_usage_label.map_or_else(
- || "Fresh thread with this plan.".to_string(),
- |label| format!("Fresh thread. Context: {label}."),
+ || "Fresh thread with this plan".to_string(),
+ |label| format!("Start a fresh thread (current context: {label})"),
);
SelectionViewParams {
@@ -82,7 +82,7 @@ pub(super) fn selection_view_params(
items: vec![
SelectionItem {
name: PLAN_IMPLEMENTATION_YES.to_string(),
- description: Some("Switch to Default and start coding.".to_string()),
+ description: Some("Switch to Default and start coding".to_string()),
selected_description: None,
is_current: false,
actions: implement_actions,
@@ -102,7 +102,7 @@ pub(super) fn selection_view_params(
},
SelectionItem {
name: PLAN_IMPLEMENTATION_NO.to_string(),
- description: Some("Continue planning with the model.".to_string()),
+ description: Some("Continue planning with the model".to_string()),
selected_description: None,
is_current: false,
actions: Vec::new(),
diff --git a/codex-rs/tui/src/chatwidget/plugin_catalog.rs b/codex-rs/tui/src/chatwidget/plugin_catalog.rs
index a21c09f9ac..34a739b2f4 100644
--- a/codex-rs/tui/src/chatwidget/plugin_catalog.rs
+++ b/codex-rs/tui/src/chatwidget/plugin_catalog.rs
@@ -69,7 +69,7 @@ const REMOTE_LOADING_TAB_ID_PREFIX: &str = "remote-loading:";
const REMOTE_EMPTY_TAB_ID_PREFIX: &str = "remote-empty:";
const REMOTE_ERROR_TAB_ID_PREFIX: &str = "remote-error:";
const OPENAI_CURATED_LOADING_DESCRIPTION: &str =
- "This updates when OpenAI Curated plugins finish loading.";
+ "This updates when OpenAI Curated plugins finish loading";
const WORKSPACE_SECTION_TAB_ORDER: u8 = 0;
const SHARED_WITH_ME_SECTION_TAB_ORDER: u8 = 1;
const SHARED_WITH_ME_LINK_SECTION_TAB_ORDER: u8 = 2;
@@ -170,18 +170,18 @@ const REMOTE_MARKETPLACE_SECTIONS: [RemoteMarketplaceSection; 2] = [
id: "workspace",
label: "Workspace",
loading_tab_id: "workspace-loading",
- loading_item_description: "This updates when workspace plugins finish loading.",
+ loading_item_description: "This updates when workspace plugins finish loading",
marketplace_names: &[REMOTE_WORKSPACE_MARKETPLACE_NAME],
show_empty_tab: true,
empty_item_name: "No workspace plugins available",
- empty_item_description: "No workspace directory plugins are available.",
+ empty_item_description: "No workspace directory plugins are available",
tab_order: WORKSPACE_SECTION_TAB_ORDER,
},
RemoteMarketplaceSection {
id: "shared-with-me",
label: "Shared with me",
loading_tab_id: "shared-with-me-loading",
- loading_item_description: "This updates when shared plugins finish loading.",
+ loading_item_description: "This updates when shared plugins finish loading",
marketplace_names: &[
REMOTE_WORKSPACE_SHARED_WITH_ME_MARKETPLACE_NAME,
REMOTE_WORKSPACE_SHARED_WITH_ME_PRIVATE_MARKETPLACE_NAME,
@@ -189,7 +189,7 @@ const REMOTE_MARKETPLACE_SECTIONS: [RemoteMarketplaceSection; 2] = [
],
show_empty_tab: false,
empty_item_name: "No shared plugins available",
- empty_item_description: "No plugins have been shared with you.",
+ empty_item_description: "No plugins have been shared with you",
tab_order: SHARED_WITH_ME_SECTION_TAB_ORDER,
},
];
@@ -349,7 +349,7 @@ impl ChatWidget {
)),
items: vec![SelectionItem {
name: "Loading plugins...".to_string(),
- description: Some("This updates when the marketplace list is ready.".to_string()),
+ description: Some("This updates when the marketplace list is ready".to_string()),
is_disabled: true,
..Default::default()
}],
@@ -369,7 +369,7 @@ impl ChatWidget {
items: vec![SelectionItem {
name: "Adding marketplace...".to_string(),
description: Some(
- "This updates when marketplace installation completes.".to_string(),
+ "This updates when marketplace installation completes".to_string(),
),
is_disabled: true,
..Default::default()
@@ -411,10 +411,10 @@ impl ChatWidget {
SelectionItem {
name: "Remove marketplace".to_string(),
description: Some(
- "Remove this marketplace from the available plugin list.".to_string(),
+ "Remove this marketplace from the available plugin list".to_string(),
),
selected_description: Some(
- "Remove this marketplace from the available plugin list.".to_string(),
+ "Remove this marketplace from the available plugin list".to_string(),
),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::OpenMarketplaceRemoveLoading {
@@ -430,8 +430,8 @@ impl ChatWidget {
},
SelectionItem {
name: "Back to plugins".to_string(),
- description: Some("Keep this marketplace installed.".to_string()),
- selected_description: Some("Keep this marketplace installed.".to_string()),
+ description: Some("Keep this marketplace installed".to_string()),
+ selected_description: Some("Keep this marketplace installed".to_string()),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::OpenPluginsList {
cwd: cwd_for_cancel.clone(),
@@ -461,7 +461,7 @@ impl ChatWidget {
subtitle: Some(format!("Removing {marketplace_display_name}...")),
items: vec![SelectionItem {
name: "Removing marketplace...".to_string(),
- description: Some("This updates when marketplace removal completes.".to_string()),
+ description: Some("This updates when marketplace removal completes".to_string()),
is_disabled: true,
..Default::default()
}],
@@ -486,7 +486,7 @@ impl ChatWidget {
)),
items: vec![SelectionItem {
name: loading_text,
- description: Some("This updates when marketplace upgrade completes.".to_string()),
+ description: Some("This updates when marketplace upgrade completes".to_string()),
is_disabled: true,
..Default::default()
}],
@@ -508,7 +508,7 @@ impl ChatWidget {
)),
items: vec![SelectionItem {
name: "Loading plugin details...".to_string(),
- description: Some("This updates when plugin details load.".to_string()),
+ description: Some("This updates when plugin details load".to_string()),
is_disabled: true,
..Default::default()
}],
@@ -526,7 +526,7 @@ impl ChatWidget {
subtitle: Some(format!("Installing {plugin_display_name}...")),
items: vec![SelectionItem {
name: "Installing plugin...".to_string(),
- description: Some("This updates when plugin installation completes.".to_string()),
+ description: Some("This updates when plugin installation completes".to_string()),
is_disabled: true,
..Default::default()
}],
@@ -544,7 +544,7 @@ impl ChatWidget {
subtitle: Some(format!("Uninstalling {plugin_display_name}...")),
items: vec![SelectionItem {
name: "Uninstalling plugin...".to_string(),
- description: Some("This updates when the plugin removal completes.".to_string()),
+ description: Some("This updates when the plugin removal completes".to_string()),
is_disabled: true,
..Default::default()
}],
@@ -571,16 +571,14 @@ impl ChatWidget {
let mut items = vec![
SelectionItem {
name: "Marketplace add failed".to_string(),
- description: Some(
- "Failed to add marketplace from the provided source.".to_string(),
- ),
+ description: Some("Failed to add marketplace from the provided source".to_string()),
is_disabled: true,
..Default::default()
},
SelectionItem {
name: "Try again".to_string(),
- description: Some("Enter a marketplace source.".to_string()),
- selected_description: Some("Enter a marketplace source.".to_string()),
+ description: Some("Enter a marketplace source".to_string()),
+ selected_description: Some("Enter a marketplace source".to_string()),
actions: vec![Box::new(|tx| {
tx.send(AppEvent::OpenMarketplaceAddPrompt);
})],
@@ -592,8 +590,8 @@ impl ChatWidget {
let cwd = self.config.cwd.to_path_buf();
items.push(SelectionItem {
name: "Back to plugins".to_string(),
- description: Some("Return to the plugin list.".to_string()),
- selected_description: Some("Return to the plugin list.".to_string()),
+ description: Some("Return to the plugin list".to_string()),
+ selected_description: Some("Return to the plugin list".to_string()),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::OpenPluginsList {
cwd: cwd.clone(),
@@ -624,14 +622,14 @@ impl ChatWidget {
let mut items = vec![
SelectionItem {
name: "Marketplace removal failed".to_string(),
- description: Some("Failed to remove the selected marketplace.".to_string()),
+ description: Some("Failed to remove the selected marketplace".to_string()),
is_disabled: true,
..Default::default()
},
SelectionItem {
name: "Try again".to_string(),
- description: Some("Review the confirmation prompt again.".to_string()),
- selected_description: Some("Review the confirmation prompt again.".to_string()),
+ description: Some("Review the confirmation prompt again".to_string()),
+ selected_description: Some("Review the confirmation prompt again".to_string()),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::OpenMarketplaceRemoveConfirm {
marketplace_name: marketplace_name.clone(),
@@ -646,8 +644,8 @@ impl ChatWidget {
let cwd = self.config.cwd.to_path_buf();
items.push(SelectionItem {
name: "Back to plugins".to_string(),
- description: Some("Return to the plugin list.".to_string()),
- selected_description: Some("Return to the plugin list.".to_string()),
+ description: Some("Return to the plugin list".to_string()),
+ selected_description: Some("Return to the plugin list".to_string()),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::OpenPluginsList {
cwd: cwd.clone(),
@@ -683,8 +681,8 @@ impl ChatWidget {
let cwd = self.config.cwd.to_path_buf();
items.push(SelectionItem {
name: "Back to plugins".to_string(),
- description: Some("Return to the plugin list.".to_string()),
- selected_description: Some("Return to the plugin list.".to_string()),
+ description: Some("Return to the plugin list".to_string()),
+ selected_description: Some("Return to the plugin list".to_string()),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::OpenPluginsList {
cwd: cwd.clone(),
@@ -741,7 +739,7 @@ impl ChatWidget {
&preferred_local_sources,
/*include_marketplace_names*/ true,
"No marketplace plugins available",
- "No plugins are available in the discovered marketplaces.",
+ "No plugins are available in the discovered marketplaces",
);
tabs.push(SelectionTab {
@@ -766,7 +764,7 @@ impl ChatWidget {
&preferred_local_sources,
/*include_marketplace_names*/ true,
"No installed plugins",
- "No installed plugins.",
+ "No installed plugins",
),
});
@@ -797,7 +795,7 @@ impl ChatWidget {
} else {
(
"No OpenAI Curated plugins available",
- "No OpenAI Curated plugins available.",
+ "No OpenAI Curated plugins available",
)
};
let mut curated_items = self.plugin_selection_items(
@@ -909,7 +907,7 @@ impl ChatWidget {
&preferred_local_sources,
/*include_marketplace_names*/ false,
"No plugins available in this marketplace",
- "No plugins available in this marketplace.",
+ "No plugins available in this marketplace",
),
},
));
@@ -952,11 +950,9 @@ impl ChatWidget {
items: vec![SelectionItem {
name: "Add marketplace".to_string(),
description: Some(
- "Enter owner/repo, a Git URL, or a local marketplace path.".to_string(),
- ),
- selected_description: Some(
- "Press Enter to enter a marketplace source.".to_string(),
+ "Enter owner/repo, a Git URL, or a local marketplace path".to_string(),
),
+ selected_description: Some("Press Enter to enter a marketplace source".to_string()),
actions: vec![Box::new(|tx| {
tx.send(AppEvent::OpenMarketplaceAddPrompt);
})],
@@ -1014,8 +1010,8 @@ impl ChatWidget {
let plugins_response = plugins_response.clone();
let mut items = vec![SelectionItem {
name: "Back to plugins".to_string(),
- description: Some("Return to the plugin list.".to_string()),
- selected_description: Some("Return to the plugin list.".to_string()),
+ description: Some("Return to the plugin list".to_string()),
+ selected_description: Some("Return to the plugin list".to_string()),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::OpenPluginsList {
cwd: cwd.clone(),
@@ -1030,7 +1026,7 @@ impl ChatWidget {
items.push(SelectionItem {
name: "Installed by admin".to_string(),
description: Some(
- "This plugin is installed by your workspace admin.".to_string(),
+ "This plugin is installed by your workspace admin".to_string(),
),
is_disabled: true,
..Default::default()
@@ -1040,8 +1036,8 @@ impl ChatWidget {
let plugin_display_name = display_name;
items.push(SelectionItem {
name: "Uninstall plugin".to_string(),
- description: Some("Remove this plugin now.".to_string()),
- selected_description: Some("Remove this plugin now.".to_string()),
+ description: Some("Remove this plugin now".to_string()),
+ selected_description: Some("Remove this plugin now".to_string()),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::OpenPluginUninstallLoading {
plugin_display_name: plugin_display_name.clone(),
@@ -1058,7 +1054,7 @@ impl ChatWidget {
items.push(SelectionItem {
name: "Uninstall plugin".to_string(),
description: Some(
- "This remote plugin did not provide an uninstall identity.".to_string(),
+ "This remote plugin did not provide an uninstall identity".to_string(),
),
is_disabled: true,
..Default::default()
@@ -1067,7 +1063,7 @@ impl ChatWidget {
} else if plugin.summary.availability == PluginAvailability::DisabledByAdmin {
items.push(SelectionItem {
name: "Install plugin".to_string(),
- description: Some("This plugin is disabled by your workspace admin.".to_string()),
+ description: Some("This plugin is disabled by your workspace admin".to_string()),
is_disabled: true,
..Default::default()
});
@@ -1075,7 +1071,7 @@ impl ChatWidget {
items.push(SelectionItem {
name: "Install plugin".to_string(),
description: Some(
- "This plugin is not installable from this marketplace.".to_string(),
+ "This plugin is not installable from this marketplace".to_string(),
),
is_disabled: true,
..Default::default()
@@ -1086,8 +1082,8 @@ impl ChatWidget {
let plugin_display_name = display_name;
items.push(SelectionItem {
name: "Install plugin".to_string(),
- description: Some("Install this plugin now.".to_string()),
- selected_description: Some("Install this plugin now.".to_string()),
+ description: Some("Install this plugin now".to_string()),
+ selected_description: Some("Install this plugin now".to_string()),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::OpenPluginInstallLoading {
plugin_display_name: plugin_display_name.clone(),
@@ -1104,7 +1100,7 @@ impl ChatWidget {
} else {
items.push(SelectionItem {
name: "Install plugin".to_string(),
- description: Some("This plugin did not provide an install location.".to_string()),
+ description: Some("This plugin did not provide an install location".to_string()),
is_disabled: true,
..Default::default()
});
@@ -1183,23 +1179,23 @@ impl ChatWidget {
let toggle_action = if plugin.enabled { "disable" } else { "enable" };
if can_view_details {
format!(
- "{selected_status_label} Space to {toggle_action}; Enter view details."
+ "{selected_status_label} Space to {toggle_action}; Enter view details"
)
} else {
- format!("{selected_status_label} Space to {toggle_action}.")
+ format!("{selected_status_label} Space to {toggle_action}")
}
} else if disabled_by_admin && can_view_details {
- format!("{selected_status_label} Press Enter to view plugin details.")
+ format!("{selected_status_label} Press Enter to view plugin details")
} else if disabled_by_admin {
- format!("{selected_status_label} Plugin details are unavailable.")
+ format!("{selected_status_label} Plugin details are unavailable")
} else if plugin.installed && can_view_details {
- format!("{selected_status_label} Press Enter to view plugin details.")
+ format!("{selected_status_label} Press Enter to view plugin details")
} else if plugin.installed {
- format!("{selected_status_label} Plugin details are unavailable.")
+ format!("{selected_status_label} Plugin details are unavailable")
} else if can_view_details {
- format!("{selected_status_label} Press Enter to install or view plugin details.")
+ format!("{selected_status_label} Press Enter to install or view plugin details")
} else {
- format!("{selected_status_label} Remote plugin details are not available yet.")
+ format!("{selected_status_label} Remote plugin details are not available yet")
};
let search_value = format!(
"{display_name} {} {} {} {} {}",
@@ -1992,7 +1988,7 @@ fn plugin_detail_description(plugin: &PluginDetail) -> Option<String> {
fn plugin_skill_summary(plugin: &PluginDetail) -> String {
if plugin.skills.is_empty() {
- "No plugin skills.".to_string()
+ "No plugin skills".to_string()
} else {
plugin
.skills
@@ -2005,7 +2001,7 @@ fn plugin_skill_summary(plugin: &PluginDetail) -> String {
fn plugin_app_summary(plugin: &PluginDetail) -> String {
if plugin.apps.is_empty() {
- "No plugin apps.".to_string()
+ "No plugin apps".to_string()
} else {
plugin
.apps
@@ -2018,7 +2014,7 @@ fn plugin_app_summary(plugin: &PluginDetail) -> String {
fn plugin_hook_summary(plugin: &PluginDetail) -> String {
if plugin.hooks.is_empty() {
- "No plugin hooks.".to_string()
+ "No plugin hooks".to_string()
} else {
let mut event_counts = Vec::<(codex_app_server_protocol::HookEventName, usize)>::new();
for hook in &plugin.hooks {
@@ -2041,7 +2037,7 @@ fn plugin_hook_summary(plugin: &PluginDetail) -> String {
fn plugin_mcp_summary(plugin: &PluginDetail) -> String {
if plugin.mcp_servers.is_empty() {
- "No plugin MCP servers.".to_string()
+ "No plugin MCP servers".to_string()
} else {
plugin.mcp_servers.join(", ")
}
diff --git a/codex-rs/tui/src/chatwidget/plugins.rs b/codex-rs/tui/src/chatwidget/plugins.rs
index 5462f9f58e..5888185873 100644
--- a/codex-rs/tui/src/chatwidget/plugins.rs
+++ b/codex-rs/tui/src/chatwidget/plugins.rs
@@ -897,7 +897,7 @@ impl ChatWidget {
items.push(SelectionItem {
name: install_label.to_string(),
description: Some("Open the ChatGPT app management page".to_string()),
- selected_description: Some("Open the app page in your browser.".to_string()),
+ selected_description: Some("Open the app page in your browser".to_string()),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::OpenUrlInBrowser {
url: install_url.clone(),
@@ -908,7 +908,7 @@ impl ChatWidget {
} else {
items.push(SelectionItem {
name: "ChatGPT apps link unavailable".to_string(),
- description: Some("This app did not provide an install/manage URL.".to_string()),
+ description: Some("This app did not provide an install/manage URL".to_string()),
is_disabled: true,
..Default::default()
});
@@ -917,8 +917,8 @@ impl ChatWidget {
if is_installed {
items.push(SelectionItem {
name: "Continue".to_string(),
- description: Some("This app is already installed.".to_string()),
- selected_description: Some("Advance to the next app.".to_string()),
+ description: Some("This app is already installed".to_string()),
+ selected_description: Some("Advance to the next app".to_string()),
actions: vec![Box::new(|tx| {
tx.send(AppEvent::PluginInstallAuthAdvance {
refresh_connectors: false,
@@ -930,10 +930,10 @@ impl ChatWidget {
items.push(SelectionItem {
name: "I've installed it".to_string(),
description: Some(
- "Trust your confirmation and continue to the next app.".to_string(),
+ "Trust your confirmation and continue to the next app".to_string(),
),
selected_description: Some(
- "Continue without waiting for refresh to complete.".to_string(),
+ "Continue without waiting for refresh to complete".to_string(),
),
actions: vec![Box::new(|tx| {
tx.send(AppEvent::PluginInstallAuthAdvance {
@@ -946,8 +946,8 @@ impl ChatWidget {
items.push(SelectionItem {
name: "Skip remaining app setup".to_string(),
- description: Some("Stop this follow-up flow for this plugin.".to_string()),
- selected_description: Some("Abandon remaining required app setup.".to_string()),
+ description: Some("Stop this follow-up flow for this plugin".to_string()),
+ selected_description: Some("Abandon remaining required app setup".to_string()),
actions: vec![Box::new(|tx| {
tx.send(AppEvent::PluginInstallAuthAbandon);
})],
diff --git a/codex-rs/tui/src/chatwidget/rate_limits.rs b/codex-rs/tui/src/chatwidget/rate_limits.rs
index a8b0489ea8..36f72ed722 100644
--- a/codex-rs/tui/src/chatwidget/rate_limits.rs
+++ b/codex-rs/tui/src/chatwidget/rate_limits.rs
@@ -490,7 +490,7 @@ impl ChatWidget {
tx.send(AppEvent::PersistRateLimitSwitchPromptHidden);
})];
let description = if preset.description.is_empty() {
- Some("Uses fewer credits for upcoming turns.".to_string())
+ Some("Uses fewer credits for upcoming turns".to_string())
} else {
Some(preset.description)
};
@@ -517,7 +517,7 @@ impl ChatWidget {
SelectionItem {
name: "Keep current model (never show again)".to_string(),
description: Some(
- "Hide future rate limit reminders about switching models.".to_string(),
+ "Hide future rate limit reminders about switching models".to_string(),
),
selected_description: None,
is_current: false,
diff --git a/codex-rs/tui/src/chatwidget/reset_credits.rs b/codex-rs/tui/src/chatwidget/reset_credits.rs
index 19f732b345..8128d54307 100644
--- a/codex-rs/tui/src/chatwidget/reset_credits.rs
+++ b/codex-rs/tui/src/chatwidget/reset_credits.rs
@@ -56,11 +56,11 @@ pub(super) fn reset_credit_options(
.as_deref()
.map(str::trim)
.filter(|description| !description.is_empty())
- .unwrap_or("Reset your current usage limits.");
+ .unwrap_or("Reset your current usage limits");
ResetCreditOption {
credit_id: Some(credit.id.clone()),
name: reset_title.to_string(),
- detail: Some(format!("{expiration}.")),
+ detail: Some(expiration),
description: reset_description.to_string(),
}
})
@@ -71,7 +71,7 @@ pub(super) fn reset_credit_options(
credit_id: None,
name: "Full reset".to_string(),
detail: None,
- description: "Reset your current usage limits.".to_string(),
+ description: "Reset your current usage limits".to_string(),
});
}
diff --git a/codex-rs/tui/src/chatwidget/skills.rs b/codex-rs/tui/src/chatwidget/skills.rs
index 680675bcd9..dc718a712e 100644
--- a/codex-rs/tui/src/chatwidget/skills.rs
+++ b/codex-rs/tui/src/chatwidget/skills.rs
@@ -30,7 +30,7 @@ impl ChatWidget {
let items = vec![
SelectionItem {
name: "List skills".to_string(),
- description: Some("Tip: press $ to open this list directly.".to_string()),
+ description: Some("Tip: press $ to open this list directly".to_string()),
actions: vec![Box::new(|tx| {
tx.send(AppEvent::OpenSkillsList);
})],
@@ -39,7 +39,7 @@ impl ChatWidget {
},
SelectionItem {
name: "Enable/Disable Skills".to_string(),
- description: Some("Enable or disable skills.".to_string()),
+ description: Some("Enable or disable skills".to_string()),
actions: vec![Box::new(|tx| {
tx.send(AppEvent::OpenManageSkillsPopup);
})],
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approvals_selection_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approvals_selection_popup.snap
index 3268643cd6..8717f1d03c 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approvals_selection_popup.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approvals_selection_popup.snap
@@ -5,11 +5,10 @@ expression: popup
Update Model Permissions
-› 1. Ask for approval Codex can read and edit files in the current workspace,
- and run commands. Approval is required to access the
- internet or edit other files.
- 2. Full Access Codex can edit files outside this workspace and access
- the internet without asking for approval. Exercise
- caution when using.
+› 1. Ask for approval Read and edit workspace files and run commands, with
+ approval required for internet access or edits outside
+ the workspace
+ 2. Full Access Use with caution: Codex can edit files outside this
+ workspace and access the internet without approval
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approvals_selection_popup@windows.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approvals_selection_popup@windows.snap
index f9c24c04e0..857b1152e8 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approvals_selection_popup@windows.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__approvals_selection_popup@windows.snap
@@ -5,14 +5,12 @@ expression: popup
Update Model Permissions
-› 1. Read Only (current) Codex can read files in the current workspace.
- Approval is required to edit files or access the
- internet.
- 2. Ask for approval Codex can read and edit files in the current
- workspace, and run commands. Approval is required to
- access the internet or edit other files.
- 3. Full Access Codex can edit files outside this workspace and access
- the internet without asking for approval. Exercise
- caution when using.
+› 1. Read Only (current) Read workspace files, with approval required for edits
+ or internet access
+ 2. Ask for approval Read and edit workspace files and run commands, with
+ approval required for internet access or edits outside
+ the workspace
+ 3. Full Access Use with caution: Codex can edit files outside this
+ workspace and access the internet without approval
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_mentions_only_callable_installed.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_mentions_only_callable_installed.snap
index 10998053d0..2387eade67 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_mentions_only_callable_installed.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_mentions_only_callable_installed.snap
@@ -1,6 +1,5 @@
---
source: tui/src/chatwidget/tests/popups_and_settings.rs
-assertion_line: 2316
expression: snapshot
---
› Google Drive [App] Connected files
@@ -19,8 +18,8 @@ expression: snapshot
ChatGPT apps link unavailable This app did not provide an install/manage
- URL.
-› 1. Continue Advance to the next app.
- 2. Skip remaining app setup Stop this follow-up flow for this plugin.
+ URL
+› 1. Continue Advance to the next app
+ 2. Skip remaining app setup Stop this follow-up flow for this plugin
esc close
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_popup_error_state.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_popup_error_state.snap
index 45afa12172..cb419b1ea7 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_popup_error_state.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_popup_error_state.snap
@@ -6,8 +6,8 @@ expression: popup
Failed to load apps.
- App directory unavailable The app directory request failed. Retry, or
- press Esc to continue.
-› 1. Retry Reload installed and available apps.
+ App directory unavailable Retry the failed app directory request, or press
+ Esc to continue
+› 1. Retry Reload installed and available apps
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_popup_loading_state.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_popup_loading_state.snap
index 0646248b4a..17f2926367 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_popup_loading_state.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_popup_loading_state.snap
@@ -6,6 +6,6 @@ expression: before
Loading installed and available apps...
-› Loading apps... This updates when the full list is ready.
+› Loading apps... This updates when the full list is ready
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__connector_scope_invalidation.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__connector_scope_invalidation.snap
index 19269aa4dd..47a411cbf9 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__connector_scope_invalidation.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__connector_scope_invalidation.snap
@@ -9,7 +9,7 @@ Before account change:
Type to search apps
-› Previous Account App Installed. App link unavailable.
+› Previous Account App Installed · App link unavailable
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap
index 7507512ca9..47c4b29d1d 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_good_result_consent_popup.snap
@@ -14,7 +14,7 @@ expression: popup
› 1. Yes Share the current Codex session logs and diagnostics with the team for
- troubleshooting.
+ troubleshooting
2. No
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_selection_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_selection_popup.snap
index e1c8a752b8..7fbc48e5c1 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_selection_popup.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_selection_popup.snap
@@ -5,11 +5,11 @@ expression: popup
How was this?
-› 1. bug Crash, error message, hang, or broken UI/behavior.
- 2. bad result Output was off-target, incorrect, incomplete, or unhelpful.
+› 1. bug Crash, error message, hang, or broken UI/behavior
+ 2. bad result Output was off-target, incorrect, incomplete, or unhelpful
3. good result Helpful, correct, high‑quality, or delightful result worth
- celebrating.
- 4. safety check Benign usage blocked due to safety checks or refusals.
- 5. other Slowness, feature suggestion, UX feedback, or anything else.
+ celebrating
+ 4. safety check Benign usage blocked due to safety checks or refusals
+ 5. other Slowness, feature suggestion, UX feedback, or anything else
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap
index f8bd1a503d..9d8b365ada 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__feedback_upload_consent_popup.snap
@@ -19,7 +19,7 @@ expression: popup
› 1. Yes Share the current Codex session logs and diagnostics with the team for
- troubleshooting.
+ troubleshooting
2. No
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_enable_prompt.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_enable_prompt.snap
index 48c3b2e1e5..33fddb5fcf 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_enable_prompt.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_enable_prompt.snap
@@ -6,8 +6,9 @@ expression: "render_bottom_popup(&chat, 80)"
Memories are disabled in this TUI session.
-› 1. Yes, enable Save on the server for new threads. This thread is unchanged.
- 2. Not now Keep memories disabled.
+› 1. Yes, enable Save on the server for new threads without changing this
+ thread
+ 2. Not now Keep memories disabled
Learn more: https://developers.openai.com/codex/memories
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_reset_confirmation.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_reset_confirmation.snap
index 89c61f00e8..e2cfc0f4df 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_reset_confirmation.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_reset_confirmation.snap
@@ -7,8 +7,8 @@ expression: popup
home.
-› Reset all memories Delete local memory files and rollout summaries.
- Go back Return to memory settings.
+› Reset all memories Delete local memory files and rollout summaries
+ Go back Return to memory settings
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_settings_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_settings_popup.snap
index 364dbce344..9375acca24 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_settings_popup.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__memories_settings_popup.snap
@@ -6,12 +6,10 @@ expression: popup
Choose how Codex uses and creates memories. Changes are saved to config.toml
-› [x] Use memories Use memories in the following threads. Applied at next
- thread.
- [ ] Generate memories Generate memories from the following threads. Current
- thread included.
- Reset all memories Clear local memory files and summaries. Existing
- threads stay intact.
+› [x] Use memories Use memories starting with the next thread
+ [ ] Generate memories Generate memories from this thread and future threads
+ Reset all memories Clear local memory files and summaries without changing
+ existing threads
Learn more: https://developers.openai.com/codex/memories
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__multi_agent_enable_prompt.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__multi_agent_enable_prompt.snap
index 7008bc9d81..6711141f37 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__multi_agent_enable_prompt.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__multi_agent_enable_prompt.snap
@@ -6,7 +6,8 @@ expression: "render_bottom_popup(&chat, 80)"
Subagents are disabled in this TUI session.
-› 1. Yes, enable Save on the server for new threads. This thread is unchanged.
- 2. Not now Keep subagents disabled.
+› 1. Yes, enable Save on the server for new threads without changing this
+ thread
+ 2. Not now Keep subagents disabled
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__permission_discovery_empty.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__permission_discovery_empty.snap
index de63f90840..bd52a731d1 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__permission_discovery_empty.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__permission_discovery_empty.snap
@@ -6,7 +6,7 @@ expression: "render_bottom_popup(&chat, 100)"
No permission profiles returned by the server.
-› current-profile (current) (disabled) Current permission profile. (disabled: Not available on
- this server.)
+› current-profile (current) (disabled) Current permission profile (disabled: Not available on
+ this server)
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__permission_discovery_remote.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__permission_discovery_remote.snap
index 69d64d57d3..4d8f9d7513 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__permission_discovery_remote.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__permission_discovery_remote.snap
@@ -5,15 +5,14 @@ expression: "render_bottom_popup(&chat, 110)"
Update Model Permissions
-› 1. Ask for approval (current) Codex can read and edit files in the current workspace, and run commands.
- Approval is required to access the internet or edit other files.
- Approve for me (disabled) Only ask for actions detected as potentially unsafe. (disabled: Disabled by
- requirements.)
- Full Access (disabled) Codex can edit files outside this workspace and access the internet without
- asking for approval. Exercise caution when using. (disabled: Disabled by
- requirements.)
- Read Only (disabled) Codex can read files in the current workspace. Approval is required to edit
- files or access the internet. (disabled: Disabled by requirements.)
+› 1. Ask for approval (current) Read and edit workspace files and run commands, with approval required for
+ internet access or edits outside the workspace
+ Approve for me (disabled) Only ask for actions detected as potentially unsafe (disabled: Disabled by
+ requirements)
+ Full Access (disabled) Use with caution: Codex can edit files outside this workspace and access the
+ internet without approval (disabled: Disabled by requirements)
+ Read Only (disabled) Read workspace files, with approval required for edits or internet access
+ (disabled: Disabled by requirements)
2. server-only Description from the connected server.
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup.snap
index f76538c969..2afc98d12f 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup.snap
@@ -5,8 +5,8 @@ expression: popup
Implement this plan?
-› 1. Yes, implement this plan Switch to Default and start coding.
- 2. Yes, clear context and implement Fresh thread with this plan.
- 3. No, stay in Plan mode Continue planning with the model.
+› 1. Yes, implement this plan Switch to Default and start coding
+ 2. Yes, clear context and implement Fresh thread with this plan
+ 3. No, stay in Plan mode Continue planning with the model
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup_context_usage.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup_context_usage.snap
index a510080946..977c576059 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup_context_usage.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup_context_usage.snap
@@ -5,8 +5,9 @@ expression: popup
Implement this plan?
-› 1. Yes, implement this plan Switch to Default and start coding.
- 2. Yes, clear context and implement Fresh thread. Context: 89% used.
- 3. No, stay in Plan mode Continue planning with the model.
+› 1. Yes, implement this plan Switch to Default and start coding
+ 2. Yes, clear context and implement Start a fresh thread (current context:
+ 89% used)
+ 3. No, stay in Plan mode Continue planning with the model
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup_no_selected.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup_no_selected.snap
index fa90ed5996..6d7565a129 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup_no_selected.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plan_implementation_popup_no_selected.snap
@@ -5,8 +5,8 @@ expression: popup
Implement this plan?
- 1. Yes, implement this plan Switch to Default and start coding.
-› 2. Yes, clear context and implement Fresh thread with this plan.
- 3. No, stay in Plan mode Continue planning with the model.
+ 1. Yes, implement this plan Switch to Default and start coding
+› 2. Yes, clear context and implement Fresh thread with this plan
+ 3. No, stay in Plan mode Continue planning with the model
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_error_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_error_popup.snap
index 648782443c..a93d955f4e 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_error_popup.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_error_popup.snap
@@ -7,6 +7,6 @@ expression: popup
Plugin detail unavailable Failed to load plugin details.
-› 1. Back to plugins Return to the plugin list.
+› 1. Back to plugins Return to the plugin list
esc close
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installable.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installable.snap
index c1c9bce115..9a08d197f4 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installable.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installable.snap
@@ -9,8 +9,8 @@ expression: strip_osc8_for_snapshot(&popup)
Turn Figma files into implementation context.
-› 1. Back to plugins Return to the plugin list.
- 2. Install plugin Install this plugin now.
+› 1. Back to plugins Return to the plugin list
+ 2. Install plugin Install this plugin now
Source Local
Auth Auth on install
Skills design-review, extract-copy
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installed.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installed.snap
index 5aa4a1f4d2..e1a09ce855 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installed.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installed.snap
@@ -7,8 +7,8 @@ expression: strip_osc8_for_snapshot(&popup)
Turn Figma files into implementation context.
-› 1. Back to plugins Return to the plugin list.
- Installed by admin This plugin is installed by your workspace admin.
+› 1. Back to plugins Return to the plugin list
+ Installed by admin This plugin is installed by your workspace admin
Source Local
Auth Auth on install
Skills design-review, extract-copy
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_local_share_read_only.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_local_share_read_only.snap
index 7595e2282a..9ae3c4b2b2 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_local_share_read_only.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_local_share_read_only.snap
@@ -8,13 +8,13 @@ expression: strip_osc8_for_snapshot(&popup)
Workspace docs.
-› 1. Back to plugins Return to the plugin list.
- 2. Install plugin Install this plugin now.
+› 1. Back to plugins Return to the plugin list
+ 2. Install plugin Install this plugin now
Source Local
Auth Auth on install
Version remote 7
Sharing Private · creator Test User · https://chatgpt.com/codex/plugins/share/docs
- Skills No plugin skills.
- Hooks No plugin hooks.
+ Skills No plugin skills
+ Hooks No plugin hooks
↓
esc close
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_npm_source.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_npm_source.snap
index ae4fe7831f..5d68af4f92 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_npm_source.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_npm_source.snap
@@ -9,8 +9,8 @@ expression: strip_osc8_for_snapshot(&popup)
Turn Figma files into implementation context.
-› 1. Back to plugins Return to the plugin list.
- 2. Install plugin Install this plugin now.
+› 1. Back to plugins Return to the plugin list
+ 2. Install plugin Install this plugin now
Source npm · @acme/figma-plugin@^1.2.0
Auth Auth on install
Skills design-review, extract-copy
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_admin_disabled_installed.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_admin_disabled_installed.snap
index e902b862e1..e6152eb3c9 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_admin_disabled_installed.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_admin_disabled_installed.snap
@@ -10,7 +10,7 @@ expression: popup
Type to search plugins
-› [!] Admin Blocked Disabled Press Enter to view plugin details.
+› [!] Admin Blocked Disabled Press Enter to view plugin details
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_curated_marketplace.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_curated_marketplace.snap
index f45379f04c..29ac7869e3 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_curated_marketplace.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_curated_marketplace.snap
@@ -10,7 +10,7 @@ expression: popup
Type to search plugins
-› [ ] Alpha Sync Disabled Space to enable; Enter view details.
+› [ ] Alpha Sync Disabled Space to enable; Enter view details
[-] Bravo Search Available · OpenAI Curated · Search docs and tickets.
[-] Hidden Repo Plugin Available · Repo Marketplace · Should not be shown in /plugins.
[-] Starter Admin assigned · OpenAI Curated · Included by default.
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_empty_shared_section_hidden.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_empty_shared_section_hidden.snap
index a945e7ad30..499988c639 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_empty_shared_section_hidden.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_empty_shared_section_hidden.snap
@@ -10,7 +10,7 @@ expression: loaded_popup
Type to search plugins
-› No workspace plugins available No workspace directory plugins are available.
+› No workspace plugins available No workspace directory plugins are available
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_loading_state.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_loading_state.snap
index 0589babff1..f9ad84b8dc 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_loading_state.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_loading_state.snap
@@ -7,6 +7,6 @@ expression: popup
This updates when the marketplace list is ready.
-› Loading plugins... This updates when the marketplace list is ready.
+› Loading plugins... This updates when the marketplace list is ready
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_marketplace_remove_confirmation.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_marketplace_remove_confirmation.snap
index e7912bbc6d..83da795e20 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_marketplace_remove_confirmation.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_marketplace_remove_confirmation.snap
@@ -7,7 +7,7 @@ expression: confirmation
This removes the configured marketplace from Codex.
-› 1. Remove marketplace Remove this marketplace from the available plugin list.
- 2. Back to plugins Keep this marketplace installed.
+› 1. Remove marketplace Remove this marketplace from the available plugin list
+ 2. Back to plugins Keep this marketplace installed
enter select · esc close
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_newly_installed_marketplace.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_newly_installed_marketplace.snap
index 39bf026558..bece0e6e85 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_newly_installed_marketplace.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_newly_installed_marketplace.snap
@@ -10,7 +10,7 @@ expression: popup
Type to search plugins
-› [-] Debug Plugin Available Press Enter to install or view plugin details.
+› [-] Debug Plugin Available Press Enter to install or view plugin details
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_search_filtered.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_search_filtered.snap
index 34e9416789..7aedb6bc0d 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_search_filtered.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_search_filtered.snap
@@ -10,7 +10,7 @@ expression: popup
sla
-› [-] Slack Available Press Enter to install or view plugin details.
+› [-] Slack Available Press Enter to install or view plugin details
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup.snap
index a10cbb8250..7f5d0192d0 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup.snap
@@ -5,17 +5,15 @@ expression: "render_bottom_popup(&chat, 80)"
Update Model Permissions
-› 1. Ask for approval (current) Codex can read and edit files in the current
- workspace, and run commands. Approval is
- required to access the internet or edit other
- files.
+› 1. Ask for approval (current) Read and edit workspace files and run commands,
+ with approval required for internet access or
+ edits outside the workspace
2. Approve for me Only ask for actions detected as potentially
- unsafe.
- 3. Full Access Codex can edit files outside this workspace and
- access the internet without asking for
- approval. Exercise caution when using.
- 4. Read Only Codex can read files in the current workspace.
- Approval is required to edit files or access
- the internet.
+ unsafe
+ 3. Full Access Use with caution: Codex can edit files outside
+ this workspace and access the internet without
+ approval
+ 4. Read Only Read workspace files, with approval required
+ for edits or internet access
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup_with_custom_profiles.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup_with_custom_profiles.snap
index 149306e70c..502d123d24 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup_with_custom_profiles.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup_with_custom_profiles.snap
@@ -5,19 +5,16 @@ expression: "render_bottom_popup(&chat, 80)"
Update Model Permissions
- 1. Ask for approval Codex can read and edit files in the current
- workspace, and run commands. Approval is required
- to access the internet or edit other files.
- 2. Approve for me Only ask for actions detected as potentially
- unsafe.
- 3. Full Access Codex can edit files outside this workspace and
- access the internet without asking for approval.
- Exercise caution when using.
- 4. Read Only Codex can read files in the current workspace.
- Approval is required to edit files or access the
- internet.
+ 1. Ask for approval Read and edit workspace files and run commands,
+ with approval required for internet access or edits
+ outside the workspace
+ 2. Approve for me Only ask for actions detected as potentially unsafe
+ 3. Full Access Use with caution: Codex can edit files outside this
+ workspace and access the internet without approval
+ 4. Read Only Read workspace files, with approval required for
+ edits or internet access
› 5. locked-down (current) Inspect and patch only approved workspace files.
web-enabled (disabled) Workspace profile with network access. (disabled:
- Disabled by requirements.)
+ Disabled by requirements)
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup_with_disallowed_full_access.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup_with_disallowed_full_access.snap
index 807c2b2321..0fde3e50f6 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup_with_disallowed_full_access.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__profile_permissions_selection_popup_with_disallowed_full_access.snap
@@ -5,17 +5,14 @@ expression: "render_bottom_popup(&chat, 80)"
Update Model Permissions
- 1. Ask for approval Codex can read and edit files in the current
- workspace, and run commands. Approval is required
- to access the internet or edit other files.
- 2. Approve for me Only ask for actions detected as potentially
- unsafe.
- Full Access (disabled) Codex can edit files outside this workspace and
- access the internet without asking for approval.
- Exercise caution when using. (disabled: Disabled by
- requirements.)
-› 3. Read Only (current) Codex can read files in the current workspace.
- Approval is required to edit files or access the
- internet.
+ 1. Ask for approval Read and edit workspace files and run commands,
+ with approval required for internet access or edits
+ outside the workspace
+ 2. Approve for me Only ask for actions detected as potentially unsafe
+ Full Access (disabled) Use with caution: Codex can edit files outside this
+ workspace and access the internet without approval
+ (disabled: Disabled by requirements)
+› 3. Read Only (current) Read workspace files, with approval required for
+ edits or internet access
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_confirmation.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_confirmation.snap
index f8ef479714..e2f0810bc7 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_confirmation.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_confirmation.snap
@@ -3,10 +3,10 @@ source: tui/src/chatwidget/tests/usage.rs
expression: "render_bottom_popup(&chat, 80)"
---
Use this reset?
- Full reset (Weekly + 5 hr) · Expires 09:39 on 18 Jun 2026.
+ Full reset (Weekly + 5 hr) · Expires 09:39 on 18 Jun 2026
1. Yes, use reset Reset your weekly and 5-hour usage limits.
-› 2. No, go back Choose a different reset.
+› 2. No, go back Choose a different reset
enter confirm · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_picker_narrow.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_picker_narrow.snap
index 37fc11f5e7..23aa024848 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_picker_narrow.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_picker_narrow.snap
@@ -7,8 +7,8 @@ expression: "render_bottom_popup(&chat, 44)"
› 1. Full reset Expires 9:39 AM on 18 Jun
- 2026.
- 2. Full reset Does not expire.
+ 2026
+ 2. Full reset Does not expire
3. Cancel
enter choose · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_popup_states.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_popup_states.snap
index 4cda207283..4f7ca6bab7 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_popup_states.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_reset_popup_states.snap
@@ -14,8 +14,8 @@ expression: "states.join(\"\\n---\\n\")"
2 usage limit resets available.
-› 1. Full reset (Weekly + 5 hr) Expires 09:39 on 18 Jun 2026.
- 2. Full reset (Weekly + 5 hr) Expires 08:59 on 27 Jun 2026.
+› 1. Full reset (Weekly + 5 hr) Expires 09:39 on 18 Jun 2026
+ 2. Full reset (Weekly + 5 hr) Expires 08:59 on 27 Jun 2026
3. Cancel
enter choose · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_switch_prompt_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_switch_prompt_popup.snap
index 33e4ec7d4c..24376e0044 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_switch_prompt_popup.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_switch_prompt_popup.snap
@@ -10,6 +10,6 @@ expression: popup
model.
2. Keep current model
3. Keep current model (never show again) Hide future rate limit reminders
- about switching models.
+ about switching models
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__skills_menu_default_mentions_shortcut.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__skills_menu_default_mentions_shortcut.snap
index 41297c5302..c1df1366df 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__skills_menu_default_mentions_shortcut.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__skills_menu_default_mentions_shortcut.snap
@@ -6,7 +6,7 @@ expression: popup
Choose an action
-› 1. List skills Tip: press $ to open this list directly.
- 2. Enable/Disable Skills Enable or disable skills.
+› 1. List skills Tip: press $ to open this list directly
+ 2. Enable/Disable Skills Enable or disable skills
enter select · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_hardcoded_only.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_hardcoded_only.snap
index a4de3c5a36..d471ee6030 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_hardcoded_only.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_hardcoded_only.snap
@@ -13,7 +13,7 @@ expression: terminal_title_popup_snapshot(&mut chat)
[ ] app-name Codex app name
[ ] project-name Project name (falls back to current directory name)
[ ] current-dir Current working directory
- [ ] activity Spinner while working, action-required message while blocked.
+ [ ] activity Spinner while working, action-required message while blocked
[ ] run-state Compact session run-state text (Ready, Working, Thinking)
↓
thread title | feat/awesome-feature | Tasks 0/0
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_live_only.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_live_only.snap
index dd24632059..52339e9ae4 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_live_only.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_live_only.snap
@@ -13,7 +13,7 @@ expression: terminal_title_popup_snapshot(&mut chat)
[x] task-progress Latest task progress from update_plan (omitted until available)
[ ] app-name Codex app name
[ ] current-dir Current working directory
- [ ] activity Spinner while working, action-required message while blocked.
+ [ ] activity Spinner while working, action-required message while blocked
[ ] run-state Compact session run-state text (Ready, Working, Thinking)
↓
preview-live-root | Live preview thread | feature/live-preview-branch | Tasks 2/5
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_mixed.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_mixed.snap
index a6e15a7fd5..15bdb1207e 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_mixed.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_mixed.snap
@@ -12,7 +12,7 @@ expression: terminal_title_popup_snapshot(&mut chat)
[x] task-progress Latest task progress from update_plan (omitted until available)
[ ] app-name Codex app name
[ ] current-dir Current working directory
- [ ] activity Spinner while working, action-required message while blocked.
+ [ ] activity Spinner while working, action-required message while blocked
[ ] run-state Compact session run-state text (Ready, Working, Thinking)
[ ] thread-name Current thread name (omitted when unnamed)
↓
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_rate_limits.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_rate_limits.snap
index c305956fa5..3eca27be4d 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_rate_limits.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_rate_limits.snap
@@ -12,7 +12,7 @@ expression: terminal_title_popup_snapshot(&mut chat)
[ ] app-name Codex app name
[ ] project-name Project name (falls back to current directory name)
[ ] current-dir Current working directory
- [ ] activity Spinner while working, action-required message while blocked.
+ [ ] activity Spinner while working, action-required message while blocked
[ ] run-state Compact session run-state text (Ready, Working, Thinking)
[ ] thread-name Current thread name (omitted when unnamed)
↓
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_thread_usage.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_thread_usage.snap
index 760c7705f0..3b417f4cfa 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_thread_usage.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__terminal_title_setup_popup_thread_usage.snap
@@ -12,7 +12,7 @@ expression: terminal_title_popup_snapshot(&mut chat)
[ ] app-name Codex app name
[ ] project-name Project name (falls back to current directory name)
[ ] current-dir Current working directory
- [ ] activity Spinner while working, action-required message while blocked.
+ [ ] activity Spinner while working, action-required message while blocked
[ ] run-state Compact session run-state text (Ready, Working, Thinking)
[ ] thread-name Current thread name (omitted when unnamed)
↓
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu.snap
index dbe3b3397b..672e740960 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu.snap
@@ -6,7 +6,7 @@ expression: "render_bottom_popup(&chat, 80)"
Account usage and resets.
-› 1. View analytics Usage history.
- 2. Redeem reset 2 available.
+› 1. View analytics Usage history
+ 2. Redeem reset 2 available
enter open · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu_before_reset_refresh.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu_before_reset_refresh.snap
index 6827282c64..61c55cade9 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu_before_reset_refresh.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu_before_reset_refresh.snap
@@ -6,7 +6,7 @@ expression: "render_bottom_popup(&chat, 80)"
Account usage and resets.
-› 1. View analytics Usage history.
- 2. Redeem reset Check availability.
+› 1. View analytics Usage history
+ 2. Redeem reset Check availability
enter open · esc back
diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu_without_resets.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu_without_resets.snap
index bcb1095000..32735af381 100644
--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu_without_resets.snap
+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__usage_command_menu_without_resets.snap
@@ -6,7 +6,7 @@ expression: "render_bottom_popup(&chat, 80)"
Account usage and resets.
-› 1. View analytics Usage history.
- Redeem reset None available.
+› 1. View analytics Usage history
+ Redeem reset None available
enter open · esc back
diff --git a/codex-rs/tui/src/chatwidget/tests/plan_mode.rs b/codex-rs/tui/src/chatwidget/tests/plan_mode.rs
index 708d13ddde..e0e2fbc4df 100644
--- a/codex-rs/tui/src/chatwidget/tests/plan_mode.rs
+++ b/codex-rs/tui/src/chatwidget/tests/plan_mode.rs
@@ -219,7 +219,7 @@ async fn plan_implementation_clear_context_requires_default_mode_and_plan() {
assert_eq!(
params.items[1].description.as_deref(),
- Some("Fresh thread with this plan.")
+ Some("Fresh thread with this plan")
);
let params = plan_implementation::selection_view_params(
@@ -229,7 +229,7 @@ async fn plan_implementation_clear_context_requires_default_mode_and_plan() {
);
assert_eq!(
params.items[1].description.as_deref(),
- Some("Fresh thread. Context: 89% used.")
+ Some("Start a fresh thread (current context: 89% used)")
);
}
@@ -665,10 +665,15 @@ async fn plan_reasoning_scope_popup_mentions_selected_reasoning() {
let popup = render_bottom_popup(&chat, /*width*/ 100);
assert!(popup.contains("Choose where to apply medium reasoning."));
- assert!(popup.contains("Always use medium reasoning in Plan mode."));
+ assert!(popup.contains("Always use medium reasoning in Plan mode"));
assert!(popup.contains("Apply to Plan mode override"));
assert!(popup.contains("Apply to global default and Plan mode override"));
- assert!(popup.contains("user-chosen Plan override (low)"));
+ assert!(
+ popup
+ .split_whitespace()
+ .collect::<String>()
+ .contains("user-chosenPlanoverride(low)")
+ );
}
#[tokio::test]
@@ -680,7 +685,12 @@ async fn plan_reasoning_scope_popup_mentions_built_in_plan_default_when_no_overr
);
let popup = render_bottom_popup(&chat, /*width*/ 100);
- assert!(popup.contains("built-in Plan default (medium)"));
+ assert!(
+ popup
+ .split_whitespace()
+ .collect::<String>()
+ .contains("built-inPlandefault(medium)")
+ );
}
#[tokio::test]
diff --git a/codex-rs/tui/src/chatwidget/tests/plugin_catalog_tests.rs b/codex-rs/tui/src/chatwidget/tests/plugin_catalog_tests.rs
index c558af4220..26c59d559b 100644
--- a/codex-rs/tui/src/chatwidget/tests/plugin_catalog_tests.rs
+++ b/codex-rs/tui/src/chatwidget/tests/plugin_catalog_tests.rs
@@ -104,12 +104,12 @@ async fn plugins_popup_uses_product_labels_for_remote_and_personal_tabs() {
insta::assert_snapshot!(
rows,
- @r###"
- › [-] Buildkite Available Press Enter to install or view plugin details.
- › [-] Docs Available Press Enter to install or view plugin details.
- › [-] Link Share Available Press Enter to install or view plugin details.
- › [-] Local Docs Available Press Enter to install or view plugin details.
- "###
+ @r"
+ › [-] Buildkite Available Press Enter to install or view plugin details
+ › [-] Docs Available Press Enter to install or view plugin details
+ › [-] Link Share Available Press Enter to install or view plugin details
+ › [-] Local Docs Available Press Enter to install or view plugin details
+ "
);
}
@@ -275,7 +275,7 @@ async fn plugin_detail_not_installable_plugin_disables_install_action() {
.find(|line| line.contains("Install plugin"))
.expect("expected install row");
assert!(
- install_row.contains("This plugin is not installable from this marketplace."),
+ install_row.contains("This plugin is not installable from this marketplace"),
"expected disabled not-installable row, got:\n{install_row}"
);
diff --git a/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs b/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs
index aba1cab996..209c6127cf 100644
--- a/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs
+++ b/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs
@@ -93,7 +93,7 @@ async fn marketplace_upgrade_loading_popup_snapshot() {
.join(" | ");
insta::assert_snapshot!(
upgrade_lines,
- @"Upgrading debug marketplace... | › Upgrading debug marketplace... This updates when marketplace upgrade completes."
+ @"Upgrading debug marketplace... | › Upgrading debug marketplace... This updates when marketplace upgrade completes"
);
}
@@ -810,7 +810,7 @@ async fn plugins_popup_remote_row_opens_remote_detail() {
.expect("expected remote plugin row");
assert!(
remote_row.contains("Available")
- && remote_row.contains("Press Enter to install or view plugin details."),
+ && remote_row.contains("Press Enter to install or view plugin details"),
"expected remote plugin row to be viewable, got:\n{remote_row}"
);
@@ -887,7 +887,7 @@ async fn plugin_detail_unmaterialized_default_uses_remote_install_path() {
);
let popup = render_bottom_popup(&chat, /*width*/ 100);
assert!(
- popup.contains("Install plugin") && popup.contains("Install this plugin now."),
+ popup.contains("Install plugin") && popup.contains("Install this plugin now"),
"expected remote detail to offer install, got:\n{popup}"
);
@@ -1020,8 +1020,8 @@ async fn plugin_detail_remote_without_remote_id_disables_uninstall_action() {
let popup = render_bottom_popup(&chat, /*width*/ 120);
assert!(
- popup.contains("This remote plugin did not provide an uninstall identity.")
- && !popup.contains("Remove this plugin now."),
+ popup.contains("This remote plugin did not provide an uninstall identity")
+ && !popup.contains("Remove this plugin now"),
"expected missing remote ID to disable uninstall, got:\n{popup}"
);
@@ -1116,8 +1116,8 @@ async fn plugin_detail_popup_shows_admin_disabled_status_snapshot() {
@" Admin Blocked · Disabled by admin · ChatGPT Marketplace"
);
assert!(
- popup.contains("This plugin is disabled by your workspace admin.")
- && !popup.contains("Install this plugin now."),
+ popup.contains("This plugin is disabled by your workspace admin")
+ && !popup.contains("Install this plugin now"),
"expected admin-disabled detail to block install, got:\n{popup}"
);
@@ -1155,7 +1155,7 @@ async fn plugins_popup_admin_disabled_installed_plugin_has_no_toggle_hint() {
assert!(
popup.contains("[!] Admin Blocked")
&& popup.contains("Disabled")
- && popup.contains("Press Enter to view plugin details.")
+ && popup.contains("Press Enter to view plugin details")
&& !popup.contains("Disabled by admin")
&& !popup.contains("Space to disable"),
"expected admin-disabled installed row to omit toggle hint, got:\n{popup}"
@@ -1200,7 +1200,7 @@ async fn plugins_popup_admin_disabled_available_plugin_has_view_only_hint() {
.find(|line| line.contains("Admin Blocked"))
.expect("expected admin-disabled plugin row");
assert!(
- admin_blocked_row.contains("Press Enter to view plugin details.")
+ admin_blocked_row.contains("Press Enter to view plugin details")
&& !admin_blocked_row.contains("install or view"),
"expected admin-disabled available plugin to stay view-only, got:\n{admin_blocked_row}"
);
@@ -1294,22 +1294,22 @@ async fn plugins_popup_remote_section_fallback_states_when_remote_plugin_disable
remote_section_state(&remote_curated_empty_popup),
]
.join("\n\n"),
- @r###"
- OpenAI Curated marketplace.
- Loading OpenAI Curated plugins... This updates when OpenAI Curated plugins finish loading.
+ @r"
+ OpenAI Curated marketplace.
+ Loading OpenAI Curated plugins... This updates when OpenAI Curated plugins finish loading
- Loading Workspace plugins.
- Loading Workspace plugins... This updates when workspace plugins finish loading.
+ Loading Workspace plugins.
+ Loading Workspace plugins... This updates when workspace plugins finish loading
- Loading Shared with me plugins.
- Loading Shared with me plugins... This updates when shared plugins finish loading.
+ Loading Shared with me plugins.
+ Loading Shared with me plugins... This updates when shared plugins finish loading
- Workspace unavailable.
- Workspace unavailable Sign in to ChatGPT to load workspace plugins.
+ Workspace unavailable.
+ Workspace unavailable Sign in to ChatGPT to load workspace plugins.
- OpenAI Curated marketplace.
- No OpenAI Curated plugins available No OpenAI Curated plugins available.
- "###
+ OpenAI Curated marketplace.
+ No OpenAI Curated plugins available No OpenAI Curated plugins available
+ "
);
}
@@ -1633,7 +1633,7 @@ async fn plugins_popup_refreshes_installed_counts_after_install() {
"expected /plugins to refresh installed counts after install, got:\n{after}"
);
assert!(
- after.contains("Installed Space to disable; Enter view details."),
+ after.contains("Installed Space to disable; Enter view details"),
"expected refreshed selected row copy to reflect the installed plugin state, got:\n{after}"
);
}
@@ -2865,7 +2865,7 @@ async fn apps_refresh_failure_without_full_snapshot_falls_back_to_installed_apps
"expected /apps to fall back to the installed apps snapshot, got:\n{popup}"
);
assert!(
- popup.contains("Installed. Press Enter to open the app page"),
+ popup.contains("Installed · Press Enter to open the app page"),
"expected the fallback popup to behave like the installed apps view, got:\n{popup}"
);
}
@@ -2906,11 +2906,11 @@ async fn apps_popup_shows_disabled_status_for_installed_but_disabled_apps() {
chat.add_connectors_output();
let popup = render_bottom_popup(&chat, /*width*/ 80);
assert!(
- popup.contains("Installed · Disabled. Press Enter to open the app page"),
+ popup.contains("Installed · Disabled · Press Enter to open the app page"),
"expected selected app description to include disabled status, got:\n{popup}"
);
assert!(
- popup.contains("enable/disable this app."),
+ popup.contains("enable/disable this app"),
"expected selected app description to mention enable/disable action, got:\n{popup}"
);
}
@@ -2985,7 +2985,7 @@ async fn apps_refresh_preserves_toggled_enabled_state() {
chat.add_connectors_output();
let popup = render_bottom_popup(&chat, /*width*/ 80);
assert!(
- popup.contains("Installed · Disabled. Press Enter to open the app page"),
+ popup.contains("Installed · Disabled · Press Enter to open the app page"),
"expected disabled status to persist after reload, got:\n{popup}"
);
}
@@ -3026,11 +3026,11 @@ async fn apps_popup_for_not_installed_app_uses_install_only_selected_description
chat.add_connectors_output();
let popup = render_bottom_popup(&chat, /*width*/ 80);
assert!(
- popup.contains("Can be installed. Press Enter to open the app page to install"),
+ popup.contains("Can be installed · Press Enter to open the app page to install"),
"expected selected app description to be install-only for not-installed apps, got:\n{popup}"
);
assert!(
- !popup.contains("enable/disable this app."),
+ !popup.contains("enable/disable this app"),
"did not expect enable/disable text for not-installed apps, got:\n{popup}"
);
}
diff --git a/codex-rs/tui/src/chatwidget/tests/usage.rs b/codex-rs/tui/src/chatwidget/tests/usage.rs
index f739f9b192..18cffed027 100644
--- a/codex-rs/tui/src/chatwidget/tests/usage.rs
+++ b/codex-rs/tui/src/chatwidget/tests/usage.rs
@@ -105,8 +105,8 @@ fn reset_credit_options_use_generic_copy_when_backend_copy_is_missing() {
vec![ResetCreditOption {
credit_id: Some("future-credit".to_string()),
name: "Full reset".to_string(),
- detail: Some("Does not expire.".to_string()),
- description: "Reset your current usage limits.".to_string(),
+ detail: Some("Does not expire".to_string()),
+ description: "Reset your current usage limits".to_string(),
}]
);
}
@@ -216,7 +216,7 @@ async fn usage_menu_refresh_failure_preserves_disabled_known_zero() {
Err("backend unavailable".to_string()),
);
- assert!(render_bottom_popup(&chat, /*width*/ 80).contains("None available."));
+ assert!(render_bottom_popup(&chat, /*width*/ 80).contains("None available"));
chat.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
assert_matches!(rx.try_recv(), Ok(AppEvent::OpenAnalytics { view: None }));
}
@@ -478,7 +478,7 @@ async fn rate_limit_reset_confirmation_uses_backend_copy_snapshot() {
request_id,
Some("weekly-credit"),
"Full reset (Weekly + 5 hr)",
- Some("Expires 09:39 on 18 Jun 2026."),
+ Some("Expires 09:39 on 18 Jun 2026"),
"Reset your weekly and 5-hour usage limits.",
)
);
@@ -554,7 +554,7 @@ async fn reset_picker_allows_only_one_pending_confirmation() {
chat.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
show_rate_limit_reset_confirmation_from_event(&mut chat, &mut rx);
- assert!(render_bottom_popup(&chat, /*width*/ 80).contains("Second reset · Does not expire."));
+ assert!(render_bottom_popup(&chat, /*width*/ 80).contains("Second reset · Does not expire"));
}
#[tokio::test]
@@ -579,7 +579,7 @@ async fn rate_limit_reset_picker_starts_with_soonest_expiries_and_keeps_all_rows
let rendered = render_bottom_popup(&chat, /*width*/ 80);
assert!(
- rendered.contains("Expires 09:39 on 18 Jun 2026."),
+ rendered.contains("Expires 09:39 on 18 Jun 2026"),
"{rendered}"
);
assert!(!rendered.contains("Full reset ("), "{rendered}");
@@ -601,8 +601,8 @@ async fn rate_limit_reset_picker_starts_with_soonest_expiries_and_keeps_all_rows
}) if picker_request_id == request_id
&& credit_id.as_deref() == Some("credit-8")
&& reset_title == "Full reset"
- && reset_detail.as_deref() == Some("Expires 09:39 on 26 Jun 2026.")
- && reset_description == "Reset your current usage limits."
+ && reset_detail.as_deref() == Some("Expires 09:39 on 26 Jun 2026")
+ && reset_description == "Reset your current usage limits"
);
}
@@ -821,8 +821,8 @@ async fn failed_post_consume_refresh_does_not_keep_stale_reset_count() {
chat.dispatch_command(SlashCommand::Usage);
let rendered = render_bottom_popup(&chat, /*width*/ 80);
- assert!(rendered.contains("Check availability."));
- assert!(!rendered.contains("2 available."));
+ assert!(rendered.contains("Check availability"));
+ assert!(!rendered.contains("2 available"));
}
#[tokio::test]
diff --git a/codex-rs/tui/src/chatwidget/usage.rs b/codex-rs/tui/src/chatwidget/usage.rs
index 838aa26314..11f0d31338 100644
--- a/codex-rs/tui/src/chatwidget/usage.rs
+++ b/codex-rs/tui/src/chatwidget/usage.rs
@@ -34,10 +34,10 @@ impl ChatWidget {
let (reset_action_enabled, reset_description) =
match (reset_eligible, self.available_rate_limit_reset_credits) {
(true, Some(available_count)) if available_count > 0 => {
- (true, format!("{available_count} available."))
+ (true, format!("{available_count} available"))
}
- (true, None) => (true, "Check availability.".to_string()),
- (true, Some(_)) | (false, _) => (false, "None available.".to_string()),
+ (true, None) => (true, "Check availability".to_string()),
+ (true, Some(_)) | (false, _) => (false, "None available".to_string()),
};
SelectionViewParams {
@@ -48,7 +48,7 @@ impl ChatWidget {
items: vec![
SelectionItem {
name: "View analytics".to_string(),
- description: Some("Usage history.".to_string()),
+ description: Some("Usage history".to_string()),
actions: vec![Box::new(|tx| {
tx.send(AppEvent::OpenAnalytics { view: None });
})],
@@ -260,7 +260,7 @@ impl ChatWidget {
},
SelectionItem {
name: "No, go back".to_string(),
- description: Some("Choose a different reset.".to_string()),
+ description: Some("Choose a different reset".to_string()),
actions: vec![Box::new(move |_| {
no_confirmation_gate.store(true, Ordering::Release);
})],
diff --git a/codex-rs/tui/src/keymap_setup.rs b/codex-rs/tui/src/keymap_setup.rs
index a80c166664..e2e26479e2 100644
--- a/codex-rs/tui/src/keymap_setup.rs
+++ b/codex-rs/tui/src/keymap_setup.rs
@@ -161,7 +161,7 @@ pub(crate) fn build_keymap_action_menu_params(
.map(|descriptor| descriptor.description)
.unwrap_or("Configure this shortcut.");
let remove_disabled_reason =
- (!custom_binding).then(|| "No custom root override to remove.".to_string());
+ (!custom_binding).then(|| "No custom root override to remove".to_string());
let label = action_label(&action);
let remove_context = context.clone();
let remove_action = action.clone();
@@ -192,7 +192,7 @@ pub(crate) fn build_keymap_action_menu_params(
0 => {
items.push(action_menu_item(
"Set key",
- "Capture a key for this unbound action.".to_string(),
+ "Capture a key for this unbound action".to_string(),
&context,
&action,
KeymapEditIntent::ReplaceAll,
@@ -202,7 +202,7 @@ pub(crate) fn build_keymap_action_menu_params(
1 => {
items.push(action_menu_item(
"Replace binding",
- format!("Capture a replacement key for `{current_binding}`."),
+ format!("Capture a replacement key for `{current_binding}`"),
&context,
&action,
KeymapEditIntent::ReplaceAll,
@@ -210,7 +210,7 @@ pub(crate) fn build_keymap_action_menu_params(
));
items.push(action_menu_item(
"Add alternate binding",
- format!("Keep `{current_binding}` and add another key."),
+ format!("Keep `{current_binding}` and add another key"),
&context,
&action,
KeymapEditIntent::AddAlternate,
@@ -222,7 +222,7 @@ pub(crate) fn build_keymap_action_menu_params(
let replace_one_action = action.clone();
items.push(SelectionItem {
name: "Replace one binding...".to_string(),
- description: Some("Choose which existing binding to replace.".to_string()),
+ description: Some("Choose which existing binding to replace".to_string()),
actions: vec![Box::new(move |tx| {
tx.send(AppEvent::OpenKeymapReplaceBindingMenu {
context: replace_one_context.clone(),
@@ -233,7 +233,7 @@ pub(crate) fn build_keymap_action_menu_params(
});
items.push(action_menu_item(
"Replace all bindings",
- format!("Replace `{current_binding}` with one key."),
+ format!("Replace `{current_binding}` with one key"),
&context,
&action,
KeymapEditIntent::ReplaceAll,
@@ -241,7 +241,7 @@ pub(crate) fn build_keymap_action_menu_params(
));
items.push(action_menu_item(
"Add alternate binding",
- format!("Keep `{current_binding}` and add another key."),
+ format!("Keep `{current_binding}` and add another key"),
&context,
&action,
KeymapEditIntent::AddAlternate,
@@ -252,7 +252,7 @@ pub(crate) fn build_keymap_action_menu_params(
if active_binding_count == 0 {
items.push(action_menu_item(
"Set key chord",
- "Capture two consecutive keys for this action.".to_string(),
+ "Capture two consecutive keys for this action".to_string(),
&context,
&action,
KeymapEditIntent::ReplaceAll,
@@ -261,7 +261,7 @@ pub(crate) fn build_keymap_action_menu_params(
} else {
items.push(action_menu_item(
"Replace with key chord",
- format!("Replace `{current_binding}` with a two-stroke key chord."),
+ format!("Replace `{current_binding}` with a two-stroke key chord"),
&context,
&action,
KeymapEditIntent::ReplaceAll,
@@ -269,7 +269,7 @@ pub(crate) fn build_keymap_action_menu_params(
));
items.push(action_menu_item(
"Add alternate key chord",
- format!("Keep `{current_binding}` and add a two-stroke key chord."),
+ format!("Keep `{current_binding}` and add a two-stroke key chord"),
&context,
&action,
KeymapEditIntent::AddAlternate,
@@ -278,7 +278,7 @@ pub(crate) fn build_keymap_action_menu_params(
}
items.push(SelectionItem {
name: "Remove custom binding".to_string(),
- description: custom_binding.then(|| "Restore the default keymap binding.".to_string()),
+ description: custom_binding.then(|| "Restore the default keymap binding".to_string()),
disabled_reason: remove_disabled_reason,
disabled_gutter_marker: Some("–"),
actions: vec![Box::new(move |tx| {
@@ -291,7 +291,7 @@ pub(crate) fn build_keymap_action_menu_params(
});
items.push(SelectionItem {
name: "Back to shortcuts".to_string(),
- description: Some("Return to the shortcut list.".to_string()),
+ description: Some("Return to the shortcut list".to_string()),
dismiss_on_select: true,
..Default::default()
});
@@ -333,7 +333,7 @@ pub(crate) fn build_keymap_replace_binding_menu_params(
[
SelectionItem {
name: binding.clone(),
- description: Some(format!("Replace `{binding}` with another key.")),
+ description: Some(format!("Replace `{binding}` with another key")),
actions: vec![open_capture_action(
context.clone(),
action.clone(),
@@ -347,7 +347,7 @@ pub(crate) fn build_keymap_replace_binding_menu_params(
},
SelectionItem {
name: format!("{binding} (key chord)"),
- description: Some(format!("Replace `{binding}` with a two-stroke key chord.")),
+ description: Some(format!("Replace `{binding}` with a two-stroke key chord")),
actions: vec![open_capture_action(
context.clone(),
action.clone(),
@@ -396,14 +396,14 @@ pub(crate) fn build_keymap_conflict_params(
items: vec![
SelectionItem {
name: "Pick another key".to_string(),
- description: Some("Return to key capture for this action.".to_string()),
+ description: Some("Return to key capture for this action".to_string()),
actions: vec![open_capture_action(context, action, intent, capture_mode)],
dismiss_on_select: true,
..Default::default()
},
SelectionItem {
name: "Cancel".to_string(),
- description: Some("Leave keymap unchanged.".to_string()),
+ description: Some("Leave keymap unchanged".to_string()),
dismiss_on_select: true,
..Default::default()
},
@@ -1105,7 +1105,7 @@ mod tests {
assert_eq!(debug_tab.items[0].name, "Inspect keypresses");
assert_eq!(
debug_tab.items[0].description.as_deref(),
- Some("Press Enter to start. Then press any key to inspect it; Ctrl+C exits.")
+ Some("Press Enter, then any key to inspect it (Ctrl+C exits)")
);
assert!(
params
@@ -1434,7 +1434,7 @@ mod tests {
let back = selection_item(&params, "Back to shortcuts");
assert_eq!(
remove.disabled_reason.as_deref(),
- Some("No custom root override to remove.")
+ Some("No custom root override to remove")
);
assert!(
!replace.dismiss_on_select,
diff --git a/codex-rs/tui/src/keymap_setup/menu_tests.rs b/codex-rs/tui/src/keymap_setup/menu_tests.rs
index 6beefc5e4d..128de29206 100644
--- a/codex-rs/tui/src/keymap_setup/menu_tests.rs
+++ b/codex-rs/tui/src/keymap_setup/menu_tests.rs
@@ -131,7 +131,7 @@ fn disabled_reason_wraps_in_the_description_column() {
.position(|row| row.contains("Remove custom binding (disabled)"))
.expect("disabled action stays visible");
let reason_start = rows[y].find("No custom root override").unwrap();
- let continuation_start = rows[y + 1].find("to remove.").unwrap();
+ let continuation_start = rows[y + 1].find("to remove").unwrap();
assert_eq!(
crate::width::display_width(&rows[y + 1][..continuation_start]),
crate::width::display_width(&rows[y][..reason_start])
diff --git a/codex-rs/tui/src/keymap_setup/picker.rs b/codex-rs/tui/src/keymap_setup/picker.rs
index 6ad29c5ff6..e962b3cace 100644
--- a/codex-rs/tui/src/keymap_setup/picker.rs
+++ b/codex-rs/tui/src/keymap_setup/picker.rs
@@ -221,7 +221,7 @@ fn build_keymap_picker_params_for_action(
items: keymap_selection_items(
rows.iter(),
"No shortcuts available",
- "No configurable shortcuts are available.",
+ "No configurable shortcuts are available",
),
});
@@ -237,7 +237,7 @@ fn build_keymap_picker_params_for_action(
items: keymap_selection_items(
common_rows,
"No common shortcuts",
- "No common shortcut actions are available.",
+ "No common shortcut actions are available",
),
});
@@ -255,7 +255,7 @@ fn build_keymap_picker_params_for_action(
items: keymap_selection_items(
custom_rows,
"No customized shortcuts",
- "No root-level keymap overrides have been configured.",
+ "No root-level keymap overrides have been configured",
),
});
@@ -273,7 +273,7 @@ fn build_keymap_picker_params_for_action(
items: keymap_selection_items(
unbound_rows,
"No unbound shortcuts",
- "Every configurable action currently has a shortcut.",
+ "Every configurable action currently has a shortcut",
),
});
@@ -290,7 +290,7 @@ fn build_keymap_picker_params_for_action(
items: keymap_selection_items(
tab_rows,
"No shortcuts in this group",
- "No configurable actions are available in this group.",
+ "No configurable actions are available in this group",
),
});
}
@@ -327,11 +327,11 @@ fn keymap_debug_tab() -> SelectionTab {
items: vec![SelectionItem {
name: "Inspect keypresses".to_string(),
description: Some(
- "Press Enter to start. Then press any key to inspect it; Ctrl+C exits."
+ "Press Enter, then any key to inspect it (Ctrl+C exits)"
.to_string(),
),
selected_description: Some(
- "Open a live inspector that shows the detected key, config key, and matching actions."
+ "Open a live inspector that shows the detected key, config key, and matching actions"
.to_string(),
),
actions: vec![Box::new(|tx| {
diff --git a/codex-rs/tui/src/onboarding/bedrock.rs b/codex-rs/tui/src/onboarding/bedrock.rs
index 43a11175e3..b6b6f8b840 100644
--- a/codex-rs/tui/src/onboarding/bedrock.rs
+++ b/codex-rs/tui/src/onboarding/bedrock.rs
@@ -566,7 +566,7 @@ impl BedrockState {
),
BedrockMethod::EnvironmentInstructions => (
"Environment variables".to_string(),
- "Configure AWS credentials in your environment, then return here.".to_string(),
+ "Configure AWS credentials in your environment, then return here".to_string(),
),
BedrockMethod::ApiKey => (
"Bedrock API key".to_string(),
diff --git a/codex-rs/tui/src/onboarding/bedrock_tests.rs b/codex-rs/tui/src/onboarding/bedrock_tests.rs
index d64baa6f93..13086f472e 100644
--- a/codex-rs/tui/src/onboarding/bedrock_tests.rs
+++ b/codex-rs/tui/src/onboarding/bedrock_tests.rs
@@ -158,7 +158,7 @@ fn discovery_prioritizes_profiles_and_keeps_bedrock_api_key_last() {
BedrockMethod::EnvironmentInstructions,
]
);
- insta::assert_snapshot!(render_visible(&profile_and_bearer), @r###"
+ insta::assert_snapshot!(render_visible(&profile_and_bearer), @r"
> Set up Amazon Bedrock
Choose how you authenticate with AWS.
@@ -170,12 +170,12 @@ fn discovery_prioritizes_profiles_and_keeps_bedrock_api_key_last() {
Enter an access key ID and secret access key
3. Environment variables
- Configure AWS credentials in your environment, then return here.
+ Configure AWS credentials in your environment, then return here
Press enter to continue
Press esc to go back
- "###);
+ ");
let profile_state = BedrockState::discovered(BedrockDiscoverResponse {
profiles: vec![profile],
@@ -263,7 +263,7 @@ fn discovery_prioritizes_profiles_and_keeps_bedrock_api_key_last() {
profiles: Vec::new(),
environment_credentials: Vec::new(),
});
- insta::assert_snapshot!(render_visible(&empty_state), @r###"
+ insta::assert_snapshot!(render_visible(&empty_state), @r"
> Set up Amazon Bedrock
No AWS credentials found.
@@ -276,7 +276,7 @@ fn discovery_prioritizes_profiles_and_keeps_bedrock_api_key_last() {
Enter an access key ID and secret access key
3. Environment variables
- Configure AWS credentials in your environment, then return here.
+ Configure AWS credentials in your environment, then return here
4. Bedrock API key
Enter a Bedrock API key
@@ -284,7 +284,7 @@ fn discovery_prioritizes_profiles_and_keeps_bedrock_api_key_last() {
Press enter to continue
Press esc to go back
- "###);
+ ");
let mut many_profiles = BedrockState::discovered(BedrockDiscoverResponse {
profiles: (0..12)
diff --git a/codex-rs/tui/src/permission_discovery.rs b/codex-rs/tui/src/permission_discovery.rs
index 6fce51f7b1..c40ada989c 100644
--- a/codex-rs/tui/src/permission_discovery.rs
+++ b/codex-rs/tui/src/permission_discovery.rs
@@ -61,7 +61,7 @@ impl PermissionDiscovery {
reviewer: Option<ApprovalsReviewer>,
) -> Option<String> {
let Some(profile) = self.profiles.iter().find(|profile| profile.id == id) else {
- return Some("Not available on this server.".to_string());
+ return Some("Not available on this server".to_string());
};
let requirements = self.requirements.as_ref();
if !profile.allowed
@@ -75,7 +75,7 @@ impl PermissionDiscovery {
.and_then(|r| r.allowed_approvals_reviewers.as_ref())
.is_some_and(|allowed| reviewer.is_some_and(|value| !allowed.contains(&value)))
{
- return Some("Disabled by requirements.".to_string());
+ return Some("Disabled by requirements".to_string());
}
None
}
diff --git a/codex-rs/tui/src/slash_command.rs b/codex-rs/tui/src/slash_command.rs
index 160d0407ec..301de2e054 100644
--- a/codex-rs/tui/src/slash_command.rs
+++ b/codex-rs/tui/src/slash_command.rs
@@ -113,7 +113,7 @@ impl SlashCommand {
SlashCommand::Skills => "use skills to improve how Codex performs specific tasks",
SlashCommand::Import => "import setup, this project, and recent chats from Claude Code",
SlashCommand::Hooks => "view and manage lifecycle hooks",
- SlashCommand::Daemon => "Manage the local background server.",
+ SlashCommand::Daemon => "Manage the local background server",
SlashCommand::Warnings => "view retained warnings and diagnostic details",
SlashCommand::Status => "show current session configuration and token usage",
SlashCommand::Cd => "change the current working directory",
diff --git a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_embedded.snap b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_embedded.snap
index 023e52b3c1..223ffd9eac 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_embedded.snap
+++ b/codex-rs/tui/src/snapshots/codex_tui__app__agents_overview__tests__agents_overview_embedded.snap
@@ -6,7 +6,7 @@ expression: "render_bottom_popup(&app.chat_widget, 96)"
This session isn’t connected to a shared background server.
-› 1. Start background server Open `codex agents` in another terminal afterward.
+› 1. Start background server Open `codex agents` in another terminal afterward
2. Return to this session
Starting a background server will not interrupt or move this session.
diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_action_menu.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_action_menu.snap
index d7abb6e928..4fc9794097 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_action_menu.snap
+++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_action_menu.snap
@@ -3,30 +3,30 @@ source: tui/src/keymap_setup.rs
expression: snapshot
---
unbound:
-Set key | Capture a key for this unbound action. | enabled
-Set key chord | Capture two consecutive keys for this action. | enabled
-Remove custom binding | Restore the default keymap binding. | enabled
-Back to shortcuts | Return to the shortcut list. | enabled
+Set key | Capture a key for this unbound action | enabled
+Set key chord | Capture two consecutive keys for this action | enabled
+Remove custom binding | Restore the default keymap binding | enabled
+Back to shortcuts | Return to the shortcut list | enabled
single:
-Replace binding | Capture a replacement key for `ctrl-enter`. | enabled
-Add alternate binding | Keep `ctrl-enter` and add another key. | enabled
-Replace with key chord | Replace `ctrl-enter` with a two-stroke key chord. | enabled
-Add alternate key chord | Keep `ctrl-enter` and add a two-stroke key chord. | enabled
-Remove custom binding | Restore the default keymap binding. | enabled
-Back to shortcuts | Return to the shortcut list. | enabled
+Replace binding | Capture a replacement key for `ctrl-enter` | enabled
+Add alternate binding | Keep `ctrl-enter` and add another key | enabled
+Replace with key chord | Replace `ctrl-enter` with a two-stroke key chord | enabled
+Add alternate key chord | Keep `ctrl-enter` and add a two-stroke key chord | enabled
+Remove custom binding | Restore the default keymap binding | enabled
+Back to shortcuts | Return to the shortcut list | enabled
multi:
-Replace one binding... | Choose which existing binding to replace. | enabled
-Replace all bindings | Replace `ctrl-enter, alt-shift-enter` with one key. | enabled
-Add alternate binding | Keep `ctrl-enter, alt-shift-enter` and add another key. | enabled
-Replace with key chord | Replace `ctrl-enter, alt-shift-enter` with a two-stroke key chord. | enabled
-Add alternate key chord | Keep `ctrl-enter, alt-shift-enter` and add a two-stroke key chord. | enabled
-Remove custom binding | Restore the default keymap binding. | enabled
-Back to shortcuts | Return to the shortcut list. | enabled
+Replace one binding... | Choose which existing binding to replace | enabled
+Replace all bindings | Replace `ctrl-enter, alt-shift-enter` with one key | enabled
+Add alternate binding | Keep `ctrl-enter, alt-shift-enter` and add another key | enabled
+Replace with key chord | Replace `ctrl-enter, alt-shift-enter` with a two-stroke key chord | enabled
+Add alternate key chord | Keep `ctrl-enter, alt-shift-enter` and add a two-stroke key chord | enabled
+Remove custom binding | Restore the default keymap binding | enabled
+Back to shortcuts | Return to the shortcut list | enabled
replace picker:
-ctrl-enter | Replace `ctrl-enter` with another key. | enabled
-ctrl-enter (key chord) | Replace `ctrl-enter` with a two-stroke key chord. | enabled
-alt-shift-enter | Replace `alt-shift-enter` with another key. | enabled
-alt-shift-enter (key chord) | Replace `alt-shift-enter` with a two-stroke key chord. | enabled
+ctrl-enter | Replace `ctrl-enter` with another key | enabled
+ctrl-enter (key chord) | Replace `ctrl-enter` with a two-stroke key chord | enabled
+alt-shift-enter | Replace `alt-shift-enter` with another key | enabled
+alt-shift-enter (key chord) | Replace `alt-shift-enter` with a two-stroke key chord | enabled
diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_action_menu_responsive.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_action_menu_responsive.snap
index f721aa731c..94b644aaa7 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_action_menu_responsive.snap
+++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_action_menu_responsive.snap
@@ -1,6 +1,5 @@
---
source: tui/src/keymap_setup.rs
-assertion_line: 1423
expression: snapshot
---
48 columns:
@@ -33,17 +32,17 @@ expression: snapshot
› 1. Replace binding Capture a replacement key
- for `ctrl-t`.
+ for `ctrl-t`
2. Add alternate binding Keep `ctrl-t` and add
- another key.
+ another key
3. Replace with key chord Replace `ctrl-t` with a
- two-stroke key chord.
+ two-stroke key chord
4. Add alternate key chord Keep `ctrl-t` and add a
- two-stroke key chord.
+ two-stroke key chord
– Remove custom binding (disabled) No custom root override
- to remove.
+ to remove
5. Back to shortcuts Return to the shortcut
- list.
+ list
Changes write the root `tui.keymap.*` override.
enter select · esc back
@@ -57,12 +56,12 @@ expression: snapshot
Open the transcript overlay.
-› 1. Replace binding Capture a replacement key for `ctrl-t`.
- 2. Add alternate binding Keep `ctrl-t` and add another key.
- 3. Replace with key chord Replace `ctrl-t` with a two-stroke key chord.
- 4. Add alternate key chord Keep `ctrl-t` and add a two-stroke key chord.
- – Remove custom binding (disabled) No custom root override to remove.
- 5. Back to shortcuts Return to the shortcut list.
+› 1. Replace binding Capture a replacement key for `ctrl-t`
+ 2. Add alternate binding Keep `ctrl-t` and add another key
+ 3. Replace with key chord Replace `ctrl-t` with a two-stroke key chord
+ 4. Add alternate key chord Keep `ctrl-t` and add a two-stroke key chord
+ – Remove custom binding (disabled) No custom root override to remove
+ 5. Back to shortcuts Return to the shortcut list
Changes write the root `tui.keymap.*` override.
enter select · esc back
diff --git a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_voice_toggle.snap b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_voice_toggle.snap
index d7762e3155..a7ea24a588 100644
--- a/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_voice_toggle.snap
+++ b/codex-rs/tui/src/snapshots/codex_tui__keymap_setup__tests__keymap_voice_toggle.snap
@@ -2,7 +2,6 @@
source: tui/src/keymap_setup.rs
expression: "render_picker(build_keymap_action_menu_params(\"chat\".into(),\n\"toggle_voice\".into(), &RuntimeKeymap::defaults(), &TuiKeymap::default(),),\n80,)"
---
-
Edit Shortcut
Toggle Voice · Chat
Current f8 · Default keymap
@@ -10,12 +9,12 @@ expression: "render_picker(build_keymap_action_menu_params(\"chat\".into(),\n\"t
Start or stop a voice conversation.
-› 1. Replace binding Capture a replacement key for `f8`.
- 2. Add alternate binding Keep `f8` and add another key.
- 3. Replace with key chord Replace `f8` with a two-stroke key chord.
- 4. Add alternate key chord Keep `f8` and add a two-stroke key chord.
- – Remove custom binding (disabled) No custom root override to remove.
- 5. Back to shortcuts Return to the shortcut list.
+› 1. Replace binding Capture a replacement key for `f8`
+ 2. Add alternate binding Keep `f8` and add another key
+ 3. Replace with key chord Replace `f8` with a two-stroke key chord
+ 4. Add alternate key chord Keep `f8` and add a two-stroke key chord
+ – Remove custom binding (disabled) No custom root override to remove
+ 5. Back to shortcuts Return to the shortcut list
Changes write the root `tui.keymap.*` override.
enter select · esc back
diff --git a/codex-rs/tui/styles.md b/codex-rs/tui/styles.md
index 3fc3e99890..af325e5d14 100644
--- a/codex-rs/tui/styles.md
+++ b/codex-rs/tui/styles.md
@@ -34,3 +34,11 @@
- Avoid ANSI `blue` and `yellow` because for now the style guide doesn't use them. Prefer a foreground color mentioned above.
(There are some rules to try to catch this in `clippy.toml`.)
+
+# Menu descriptions
+
+- Prefer concise built-in option descriptions and disabled-option explanations without trailing
+ periods.
+- When a description needs multiple sentences, keep normal punctuation, including the final period.
+ Do not combine sentences at the expense of clarity.
+- Preserve externally supplied descriptions as written.