From 21d9c6330dc4eb43a27a49e6e19539c56c8718c4 Mon Sep 17 00:00:00 2001
From: Michael Bolin <mbolin@openai.com>
Date: Thu, 26 Feb 2026 12:39:18 -0800
Subject: [PATCH] fix: sort codex features list alphabetically

---
 codex-rs/cli/src/main.rs       |  1 +
 codex-rs/cli/tests/features.rs | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/codex-rs/cli/src/main.rs b/codex-rs/cli/src/main.rs
index 42ded11c06a..c271fe0b9eb 100644
--- a/codex-rs/cli/src/main.rs
+++ b/codex-rs/cli/src/main.rs
@@ -808,6 +808,7 @@ async fn cli_main(arg0_paths: Arg0DispatchPaths) -> anyhow::Result<()> {
                     stage_width = stage_width.max(stage.len());
                     rows.push((name, stage, enabled));
                 }
+                rows.sort_unstable_by_key(|(name, _, _)| *name);
 
                 for (name, stage, enabled) in rows {
                     println!("{name:<name_width$}  {stage:<stage_width$}  {enabled}");
diff --git a/codex-rs/cli/tests/features.rs b/codex-rs/cli/tests/features.rs
index 6b2ed72f8af..17a7eff679c 100644
--- a/codex-rs/cli/tests/features.rs
+++ b/codex-rs/cli/tests/features.rs
@@ -2,6 +2,7 @@ use std::path::Path;
 
 use anyhow::Result;
 use predicates::str::contains;
+use pretty_assertions::assert_eq;
 use tempfile::TempDir;
 
 fn codex_command(codex_home: &Path) -> Result<assert_cmd::Command> {
@@ -58,3 +59,33 @@ async fn features_enable_under_development_feature_prints_warning() -> Result<()
 
     Ok(())
 }
+
+#[tokio::test]
+async fn features_list_is_sorted_alphabetically_by_feature_name() -> Result<()> {
+    let codex_home = TempDir::new()?;
+
+    let mut cmd = codex_command(codex_home.path())?;
+    let output = cmd
+        .args(["features", "list"])
+        .assert()
+        .success()
+        .get_output()
+        .stdout
+        .clone();
+    let stdout = String::from_utf8(output)?;
+
+    let actual_names = stdout
+        .lines()
+        .map(|line| {
+            line.split_once("  ")
+                .map(|(name, _)| name.trim_end().to_string())
+                .expect("feature list output should contain aligned columns")
+        })
+        .collect::<Vec<_>>();
+    let mut expected_names = actual_names.clone();
+    expected_names.sort();
+
+    assert_eq!(actual_names, expected_names);
+
+    Ok(())
+}