mirror of
https://github.com/openai/codex.git
synced 2026-10-24 18:18:41 +00:00
## Why The TUI currently handles keyboard shortcuts as hard-coded event matches spread across app, composer, pager, list, approval, and navigation code. That makes shortcuts hard to customize, makes displayed hints easy to drift from actual behavior, and makes future keymap work riskier because there is no central action inventory. This PR adds the foundation for configurable, action-based keymaps without adding the interactive remapping UI yet. Onboarding intentionally stays on fixed startup shortcuts because users cannot reasonably configure keymaps before completing onboarding. This is PR1 in the keymap stack: - PR1: #18593: configurable keymap foundation - PR2: #18594: `/keymap` picker and guided remapping UI - PR3: #18595: Vim composer mode and the remap option ## Design Notes The new model resolves named actions into concrete runtime bindings once from config, then passes those bindings to the UI surfaces that handle input or render shortcut hints. The main concepts are: - **Context**: a scope where an action is active, such as `global`, `chat`, `composer`, `editor`, `pager`, `list`, or `approval`. - **Action**: a named operation inside a context, such as `global.open_transcript`, `composer.submit`, or `pager.close`. - **Binding**: one or more single-key shortcuts assigned to an action, written as config strings such as `ctrl-t`, `alt-backspace`, or `page-down`. Multi-step sequences such as `ctrl-x ctrl-s`, `g g`, or leader-key flows are not part of this PR. - **Resolution order**: context-specific config wins first, supported global fallbacks come next, and built-in defaults fill in anything unset. - **Explicit unbinding**: an empty array removes an action binding in that scope and does not fall through to a fallback binding. - **Conflict validation**: a resolved keymap rejects duplicate active bindings inside the same scope so one keypress cannot dispatch two actions. ## What Changed - Added `TuiKeymap` config support under `[tui.keymap]`, including typed contexts/actions, key alias normalization, generated schema coverage, and user-facing config errors. - Added `RuntimeKeymap` resolution in `codex-rs/tui/src/keymap.rs`, including fallback precedence, built-in defaults, explicit unbinding, and per-context conflict validation. - Rewired existing TUI handlers to consume resolved keymap actions instead of directly matching hard-coded keys in each component. - Updated key hint rendering and footer/pager/list surfaces so displayed shortcuts follow the resolved keymap. - Kept onboarding shortcuts fixed in `codex-rs/tui/src/onboarding/keys.rs` instead of exposing them through `[tui.keymap]`. ## Validation The branch includes focused coverage for config parsing, key normalization, runtime fallback resolution, explicit unbinding, duplicate-key conflict validation, default keymap consistency, onboarding startup key behavior, and UI hint snapshots affected by resolved key bindings.
270 lines
9.7 KiB
Rust
270 lines
9.7 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,
|
|
Keymap,
|
|
#[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::Keymap => "remap TUI shortcuts",
|
|
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::Keymap
|
|
| 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::Title
|
|
| SlashCommand::Statusline
|
|
| 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::Theme => 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 certain_commands_are_available_during_task() {
|
|
assert!(SlashCommand::Goal.available_during_task());
|
|
assert!(SlashCommand::Title.available_during_task());
|
|
assert!(SlashCommand::Statusline.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)
|
|
);
|
|
}
|
|
}
|