mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
## Why Auto-review can deny an action that the user later decides they want to retry. Today there is no TUI surface for selecting a recent denial and sending explicit approval context back into the session, so users have to restate intent manually and the retry can be reviewed without the original denied action context. This adds a narrow TUI-driven path for approving a recent denied action while still keeping the retry inside the normal auto-review flow. ## What Changed - Added `/auto-review-denials` to open a picker of recent denied auto-review actions. - Added a small in-memory TUI store for the 10 most recent denied auto-review events. - Selecting a denial sends the structured denied event back through the existing core/app-server op path. - Core now injects a developer message containing the approved action JSON rather than the full assessment event. - Auto-review transcript collection now preserves this specific approval developer message so follow-up review sessions can see the user approval context. - Added TUI snapshot/unit coverage for the picker and approval dispatch path. - Added core coverage for retaining the approval developer message in the auto-review transcript. ## Verification - `cargo test -p codex-core collect_guardian_transcript_entries_keeps_manual_approval_developer_message` - `cargo test -p codex-tui auto_review_denials` - `cargo test -p codex-tui approving_recent_denial_emits_structured_core_op_once` ## Notes This intentionally keeps retries going through auto-review. The approval signal is context for the exact previously denied action, not a blanket bypass for similar future actions.
265 lines
9.5 KiB
Rust
265 lines
9.5 KiB
Rust
use strum::IntoEnumIterator;
|
|
use strum_macros::AsRefStr;
|
|
use strum_macros::EnumIter;
|
|
use strum_macros::EnumString;
|
|
use strum_macros::IntoStaticStr;
|
|
|
|
/// Commands that can be invoked by starting a message with a leading slash.
|
|
#[derive(
|
|
Debug, Clone, Copy, PartialEq, Eq, Hash, EnumString, EnumIter, AsRefStr, IntoStaticStr,
|
|
)]
|
|
#[strum(serialize_all = "kebab-case")]
|
|
pub enum SlashCommand {
|
|
// DO NOT ALPHA-SORT! Enum order is presentation order in the popup, so
|
|
// more frequently used commands should be listed first.
|
|
Model,
|
|
Fast,
|
|
Approvals,
|
|
Permissions,
|
|
#[strum(serialize = "setup-default-sandbox")]
|
|
ElevateSandbox,
|
|
#[strum(serialize = "sandbox-add-read-dir")]
|
|
SandboxReadRoot,
|
|
Experimental,
|
|
#[strum(to_string = "autoreview")]
|
|
AutoReview,
|
|
Memories,
|
|
Skills,
|
|
Review,
|
|
Rename,
|
|
New,
|
|
Resume,
|
|
Fork,
|
|
Init,
|
|
Compact,
|
|
Plan,
|
|
Goal,
|
|
Collab,
|
|
Agent,
|
|
Side,
|
|
// Undo,
|
|
Copy,
|
|
Diff,
|
|
Mention,
|
|
Status,
|
|
DebugConfig,
|
|
Title,
|
|
Statusline,
|
|
Theme,
|
|
Mcp,
|
|
Apps,
|
|
Plugins,
|
|
Logout,
|
|
Quit,
|
|
Exit,
|
|
Feedback,
|
|
Rollout,
|
|
Ps,
|
|
#[strum(to_string = "stop", serialize = "clean")]
|
|
Stop,
|
|
Clear,
|
|
Personality,
|
|
Realtime,
|
|
Settings,
|
|
TestApproval,
|
|
#[strum(serialize = "subagents")]
|
|
MultiAgents,
|
|
// Debugging commands.
|
|
#[strum(serialize = "debug-m-drop")]
|
|
MemoryDrop,
|
|
#[strum(serialize = "debug-m-update")]
|
|
MemoryUpdate,
|
|
}
|
|
|
|
impl SlashCommand {
|
|
/// User-visible description shown in the popup.
|
|
pub fn description(self) -> &'static str {
|
|
match self {
|
|
SlashCommand::Feedback => "send logs to maintainers",
|
|
SlashCommand::New => "start a new chat during a conversation",
|
|
SlashCommand::Init => "create an AGENTS.md file with instructions for Codex",
|
|
SlashCommand::Compact => "summarize conversation to prevent hitting the context limit",
|
|
SlashCommand::Review => "review my current changes and find issues",
|
|
SlashCommand::Rename => "rename the current thread",
|
|
SlashCommand::Resume => "resume a saved chat",
|
|
SlashCommand::Clear => "clear the terminal and start a new chat",
|
|
SlashCommand::Fork => "fork the current chat",
|
|
// SlashCommand::Undo => "ask Codex to undo a turn",
|
|
SlashCommand::Quit | SlashCommand::Exit => "exit Codex",
|
|
SlashCommand::Copy => "copy last response as markdown",
|
|
SlashCommand::Diff => "show git diff (including untracked files)",
|
|
SlashCommand::Mention => "mention a file",
|
|
SlashCommand::Skills => "use skills to improve how Codex performs specific tasks",
|
|
SlashCommand::Status => "show current session configuration and token usage",
|
|
SlashCommand::DebugConfig => "show config layers and requirement sources for debugging",
|
|
SlashCommand::Title => "configure which items appear in the terminal title",
|
|
SlashCommand::Statusline => "configure which items appear in the status line",
|
|
SlashCommand::Theme => "choose a syntax highlighting theme",
|
|
SlashCommand::Ps => "list background terminals",
|
|
SlashCommand::Stop => "stop all background terminals",
|
|
SlashCommand::MemoryDrop => "DO NOT USE",
|
|
SlashCommand::MemoryUpdate => "DO NOT USE",
|
|
SlashCommand::Model => "choose what model and reasoning effort to use",
|
|
SlashCommand::Fast => {
|
|
"toggle Fast mode to enable fastest inference with increased plan usage"
|
|
}
|
|
SlashCommand::Personality => "choose a communication style for Codex",
|
|
SlashCommand::Realtime => "toggle realtime voice mode (experimental)",
|
|
SlashCommand::Settings => "configure realtime microphone/speaker",
|
|
SlashCommand::Plan => "switch to Plan mode",
|
|
SlashCommand::Goal => "set or view the goal for a long-running task",
|
|
SlashCommand::Collab => "change collaboration mode (experimental)",
|
|
SlashCommand::Agent | SlashCommand::MultiAgents => "switch the active agent thread",
|
|
SlashCommand::Side => "start a side conversation in an ephemeral fork",
|
|
SlashCommand::Approvals => "choose what Codex is allowed to do",
|
|
SlashCommand::Permissions => "choose what Codex is allowed to do",
|
|
SlashCommand::ElevateSandbox => "set up elevated agent sandbox",
|
|
SlashCommand::SandboxReadRoot => {
|
|
"let sandbox read a directory: /sandbox-add-read-dir <absolute_path>"
|
|
}
|
|
SlashCommand::Experimental => "toggle experimental features",
|
|
SlashCommand::AutoReview => "approve one retry of a recent auto-review denial",
|
|
SlashCommand::Memories => "configure memory use and generation",
|
|
SlashCommand::Mcp => "list configured MCP tools; use /mcp verbose for details",
|
|
SlashCommand::Apps => "manage apps",
|
|
SlashCommand::Plugins => "browse plugins",
|
|
SlashCommand::Logout => "log out of Codex",
|
|
SlashCommand::Rollout => "print the rollout file path",
|
|
SlashCommand::TestApproval => "test approval request",
|
|
}
|
|
}
|
|
|
|
/// Command string without the leading '/'. Provided for compatibility with
|
|
/// existing code that expects a method named `command()`.
|
|
pub fn command(self) -> &'static str {
|
|
self.into()
|
|
}
|
|
|
|
/// Whether this command supports inline args (for example `/review ...`).
|
|
pub fn supports_inline_args(self) -> bool {
|
|
matches!(
|
|
self,
|
|
SlashCommand::Review
|
|
| SlashCommand::Rename
|
|
| SlashCommand::Plan
|
|
| SlashCommand::Goal
|
|
| SlashCommand::Fast
|
|
| SlashCommand::Mcp
|
|
| SlashCommand::Side
|
|
| SlashCommand::Resume
|
|
| SlashCommand::SandboxReadRoot
|
|
)
|
|
}
|
|
|
|
/// Whether this command remains available inside an active side conversation.
|
|
pub fn available_in_side_conversation(self) -> bool {
|
|
matches!(
|
|
self,
|
|
SlashCommand::Copy | SlashCommand::Diff | SlashCommand::Mention | SlashCommand::Status
|
|
)
|
|
}
|
|
|
|
/// Whether this command can be run while a task is in progress.
|
|
pub fn available_during_task(self) -> bool {
|
|
match self {
|
|
SlashCommand::New
|
|
| SlashCommand::Resume
|
|
| SlashCommand::Fork
|
|
| SlashCommand::Init
|
|
| SlashCommand::Compact
|
|
// | SlashCommand::Undo
|
|
| SlashCommand::Model
|
|
| SlashCommand::Fast
|
|
| SlashCommand::Personality
|
|
| SlashCommand::Approvals
|
|
| SlashCommand::Permissions
|
|
| SlashCommand::ElevateSandbox
|
|
| SlashCommand::SandboxReadRoot
|
|
| SlashCommand::Experimental
|
|
| SlashCommand::Memories
|
|
| SlashCommand::Review
|
|
| SlashCommand::Plan
|
|
| SlashCommand::Clear
|
|
| SlashCommand::Logout
|
|
| SlashCommand::MemoryDrop
|
|
| SlashCommand::MemoryUpdate => false,
|
|
SlashCommand::Diff
|
|
| SlashCommand::Copy
|
|
| SlashCommand::Rename
|
|
| SlashCommand::Mention
|
|
| SlashCommand::Skills
|
|
| SlashCommand::Status
|
|
| SlashCommand::DebugConfig
|
|
| SlashCommand::Ps
|
|
| SlashCommand::Stop
|
|
| SlashCommand::Goal
|
|
| SlashCommand::Mcp
|
|
| SlashCommand::Apps
|
|
| SlashCommand::Plugins
|
|
| SlashCommand::AutoReview
|
|
| SlashCommand::Feedback
|
|
| SlashCommand::Quit
|
|
| SlashCommand::Exit
|
|
| SlashCommand::Side => true,
|
|
SlashCommand::Rollout => true,
|
|
SlashCommand::TestApproval => true,
|
|
SlashCommand::Realtime => true,
|
|
SlashCommand::Settings => true,
|
|
SlashCommand::Collab => true,
|
|
SlashCommand::Agent | SlashCommand::MultiAgents => true,
|
|
SlashCommand::Statusline => false,
|
|
SlashCommand::Theme => false,
|
|
SlashCommand::Title => false,
|
|
}
|
|
}
|
|
|
|
fn is_visible(self) -> bool {
|
|
match self {
|
|
SlashCommand::SandboxReadRoot => cfg!(target_os = "windows"),
|
|
SlashCommand::Copy => !cfg!(target_os = "android"),
|
|
SlashCommand::Rollout | SlashCommand::TestApproval => cfg!(debug_assertions),
|
|
_ => true,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Return all built-in commands in a Vec paired with their command string.
|
|
pub fn built_in_slash_commands() -> Vec<(&'static str, SlashCommand)> {
|
|
SlashCommand::iter()
|
|
.filter(|command| command.is_visible())
|
|
.map(|c| (c.command(), c))
|
|
.collect()
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use pretty_assertions::assert_eq;
|
|
use std::str::FromStr;
|
|
|
|
use super::SlashCommand;
|
|
|
|
#[test]
|
|
fn stop_command_is_canonical_name() {
|
|
assert_eq!(SlashCommand::Stop.command(), "stop");
|
|
}
|
|
|
|
#[test]
|
|
fn clean_alias_parses_to_stop_command() {
|
|
assert_eq!(SlashCommand::from_str("clean"), Ok(SlashCommand::Stop));
|
|
}
|
|
|
|
#[test]
|
|
fn goal_command_is_available_during_task() {
|
|
assert!(SlashCommand::Goal.available_during_task());
|
|
}
|
|
|
|
#[test]
|
|
fn auto_review_command_is_autoreview() {
|
|
assert_eq!(SlashCommand::AutoReview.command(), "autoreview");
|
|
assert_eq!(
|
|
SlashCommand::from_str("autoreview"),
|
|
Ok(SlashCommand::AutoReview)
|
|
);
|
|
}
|
|
}
|