refactr

Author: aibrahim-oai

codex-rs/core/src/client.rs

@@ -572,21 +572,12 @@ fn parse_rate_limit_window(
     window_minutes_header: &str,
     resets_header: &str,
 ) -> Option<RateLimitWindow> {
-    let used_percent: Option<f64> = parse_header_f64(headers, used_percent_header);
+    let used_percent = parse_header_f64(headers, used_percent_header)?;
 
-    used_percent.and_then(|used_percent| {
-        let window_minutes = parse_header_u64(headers, window_minutes_header);
-        let resets_in_seconds = parse_header_u64(headers, resets_header);
-
-        let has_data = used_percent != 0.0
-            || window_minutes.is_some_and(|minutes| minutes != 0)
-            || resets_in_seconds.is_some_and(|seconds| seconds != 0);
-
-        has_data.then_some(RateLimitWindow {
-            used_percent,
-            window_minutes,
-            resets_in_seconds,
-        })
+    Some(RateLimitWindow {
+        used_percent,
+        window_minutes: parse_header_u64(headers, window_minutes_header),
+        resets_in_seconds: parse_header_u64(headers, resets_header),
     })
 }
 

codex-rs/next_step.md

@@ -0,0 +1,273 @@
+# Next Step: Restore "Plus" Edits
+
+This branch now carries only the exec cell refactor. Reapply the functionality changes documented below on the follow-up branch.
+
+## Code patches to restore
+
+### core/src/client.rs
+```diff
+diff --git a/codex-rs/core/src/client.rs b/codex-rs/core/src/client.rs
+index 1d1082c2..aedea488 100644
+--- a/codex-rs/core/src/client.rs
++++ b/codex-rs/core/src/client.rs
+@@ -572,12 +572,21 @@ fn parse_rate_limit_window(
+     window_minutes_header: &str,
+     resets_header: &str,
+ ) -> Option<RateLimitWindow> {
+-    let used_percent = parse_header_f64(headers, used_percent_header)?;
++    let used_percent: Option<f64> = parse_header_f64(headers, used_percent_header);
+ 
+-    Some(RateLimitWindow {
+-        used_percent,
+-        window_minutes: parse_header_u64(headers, window_minutes_header),
+-        resets_in_seconds: parse_header_u64(headers, resets_header),
++    used_percent.and_then(|used_percent| {
++        let window_minutes = parse_header_u64(headers, window_minutes_header);
++        let resets_in_seconds = parse_header_u64(headers, resets_header);
++
++        let has_data = used_percent != 0.0
++            || window_minutes.is_some_and(|minutes| minutes != 0)
++            || resets_in_seconds.is_some_and(|seconds| seconds != 0);
++
++        has_data.then_some(RateLimitWindow {
++            used_percent,
++            window_minutes,
++            resets_in_seconds,
++        })
+     })
+ }
+```
+
+### tui/src/bottom_pane/chat_composer.rs
+```diff
+diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rs
+index eb654815..7530794c 100644
+--- a/codex-rs/tui/src/bottom_pane/chat_composer.rs
++++ b/codex-rs/tui/src/bottom_pane/chat_composer.rs
+@@ -1330,9 +1330,11 @@ impl WidgetRef for ChatComposer {
+                     }
+                 }
+ 
+-                Line::from(hint)
+-                    .style(Style::default().dim())
+-                    .render_ref(hint_rect, buf);
++                let hint = hint
++                    .into_iter()
++                    .map(|span| span.patch_style(Style::default().dim()))
++                    .collect::<Vec<_>>();
++                Line::from(hint).render_ref(hint_rect, buf);
+             }
+         }
+        let border_style = if self.has_focus {
+@@ -1356,9 +1358,8 @@ impl WidgetRef for ChatComposer {
+        let mut state = self.textarea_state.borrow_mut();
+         StatefulWidgetRef::render_ref(&(&self.textarea), textarea_rect, buf, &mut state);
+         if self.textarea.text().is_empty() {
+-            Line::from(self.placeholder_text.as_str())
+-                .style(Style::default().dim())
+-                .render_ref(textarea_rect.inner(Margin::new(0, 0)), buf);
++            let placeholder = Span::from(self.placeholder_text.as_str()).dim();
++            Line::from(vec![placeholder]).render_ref(textarea_rect.inner(Margin::new(0, 0)), buf);
+         }
+     }
+ }
+```
+
+### tui/src/chatwidget.rs (rate-limit label helper)
+```diff
+diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs
+index 8bd15b53..66e54cf6 100644
+--- a/codex-rs/tui/src/chatwidget.rs
++++ b/codex-rs/tui/src/chatwidget.rs
+@@
+-fn get_limits_duration(windows_minutes: u64) -> String {
++pub(crate) fn get_limits_duration(windows_minutes: u64) -> String {
+```
+
+### tui/src/status/card.rs
+```diff
+diff --git a/codex-rs/tui/src/status/card.rs b/codex-rs/tui/src/status/card.rs
+index a977240b..8f7188d5 100644
+--- a/codex-rs/tui/src/status/card.rs
++++ b/codex-rs/tui/src/status/card.rs
+@@ -145,7 +145,7 @@ impl StatusHistoryCell {
+-                    let base_spans = formatter.full_spans(row.label, value_spans);
++                    let base_spans = formatter.full_spans(row.label.as_str(), value_spans);
+@@
+-    fn collect_rate_limit_labels(
+-        &self,
+-        seen: &mut BTreeSet<&'static str>,
+-        labels: &mut Vec<&'static str>,
+-    ) {
++    fn collect_rate_limit_labels(&self, seen: &mut BTreeSet<String>, labels: &mut Vec<String>) {
+@@
+-                        push_label(labels, seen, row.label);
++                        push_label(labels, seen, row.label.as_str());
+@@
+-        let mut labels: Vec<&'static str> =
+-            vec!["Model", "Directory", "Approval", "Sandbox", "Agents.md"];
+-        let mut seen: BTreeSet<&'static str> = labels.iter().copied().collect();
++        let mut labels: Vec<String> =
++            vec!["Model", "Directory", "Approval", "Sandbox", "Agents.md"]
++                .into_iter()
++                .map(str::to_string)
++                .collect();
++        let mut seen: BTreeSet<String> = labels.iter().cloned().collect();
+@@
+-        let formatter = FieldFormatter::from_labels(labels.iter().copied());
++        let formatter = FieldFormatter::from_labels(labels.iter().map(String::as_str));
+```
+
+### tui/src/status/format.rs
+```diff
+diff --git a/codex-rs/tui/src/status/format.rs b/codex-rs/tui/src/status/format.rs
+index 556e5bd1..fda72904 100644
+--- a/codex-rs/tui/src/status/format.rs
++++ b/codex-rs/tui/src/status/format.rs
+@@ -15,10 +15,13 @@ pub(crate) struct FieldFormatter {
+-pub(crate) fn from_labels(labels: impl IntoIterator<Item = &'static str>) -> Self {
++pub(crate) fn from_labels<S>(labels: impl IntoIterator<Item = S>) -> Self
++where
++    S: AsRef<str>,
++{
+@@
+-            .map(UnicodeWidthStr::width)
++            .map(|label| UnicodeWidthStr::width(label.as_ref()))
+@@
+-        label: &'static str,
++        label: &str,
+@@
+-pub(crate) fn push_label(
+-    labels: &mut Vec<&'static str>,
+-    seen: &mut BTreeSet<&'static str>,
+-    label: &'static str,
+-) {
+-    if seen.insert(label) {
+-        labels.push(label);
++pub(crate) fn push_label(labels: &mut Vec<String>, seen: &mut BTreeSet<String>, label: &str) {
++    if seen.contains(label) {
++        return;
++    }
++
++    let owned = label.to_string();
++    seen.insert(owned.clone());
++    labels.push(owned);
+ }
+```
+
+### tui/src/status/rate_limits.rs
+```diff
+diff --git a/codex-rs/tui/src/status/rate_limits.rs b/codex-rs/tui/src/status/rate_limits.rs
+index 17d2f170..8da3a1c6 100644
+--- a/codex-rs/tui/src/status/rate_limits.rs
++++ b/codex-rs/tui/src/status/rate_limits.rs
+@@ -1,3 +1,5 @@
++use crate::chatwidget::get_limits_duration;
++
+@@
+-    pub label: &'static str,
++    pub label: String,
+@@
+-    pub resets_at: Option<String>,
++    pub resets_at: Option<String>,
++    pub window_minutes: Option<u64>,
+@@
+-            let mut rows = Vec::with_capacity(2);
+-
+-            if let Some(primary) = snapshot.primary.as_ref() {
+-                rows.push(StatusRateLimitRow {
+-                    label: "5h limit",
+-                    percent_used: primary.used_percent,
+-                    resets_at: primary.resets_at.clone(),
+-                });
+-            }
+-
+-            if let Some(secondary) = snapshot.secondary.as_ref() {
+-                rows.push(StatusRateLimitRow {
+-                    label: "Weekly limit",
+-                    percent_used: secondary.used_percent,
+-                    resets_at: secondary.resets_at.clone(),
+-                });
+-            }
++            let mut rows = Vec::with_capacity(2);
++
++            if let Some(primary) = snapshot.primary.as_ref() {
++                let label: String = primary
++                    .window_minutes
++                    .map(get_limits_duration)
++                    .unwrap_or_else(|| "5h".to_string());
++                let label = capitalize_first(&label);
++                rows.push(StatusRateLimitRow {
++                    label: format!("{label} limit"),
++                    percent_used: primary.used_percent,
++                    resets_at: primary.resets_at.clone(),
++                });
++            }
++
++            if let Some(secondary) = snapshot.secondary.as_ref() {
++                let label: String = secondary
++                    .window_minutes
++                    .map(get_limits_duration)
++                    .unwrap_or_else(|| "weekly".to_string());
++                let label = capitalize_first(&label);
++                rows.push(StatusRateLimitRow {
++                    label: format!("{label} limit"),
++                    percent_used: secondary.used_percent,
++                    resets_at: secondary.resets_at.clone(),
++                });
++            }
+@@
++fn capitalize_first(label: &str) -> String {
++    let mut chars = label.chars();
++    match chars.next() {
++        Some(first) => {
++            let mut capitalized = first.to_uppercase().collect::<String>();
++            capitalized.push_str(chars.as_str());
++            capitalized
++        }
++        None => String::new(),
++    }
++}
+```
+
+### tui/src/status/tests.rs
+```diff
+diff --git a/codex-rs/tui/src/status/tests.rs b/codex-rs/tui/src/status/tests.rs
+index 467b9dd7..d583a5e5 100644
+--- a/codex-rs/tui/src/status/tests.rs
++++ b/codex-rs/tui/src/status/tests.rs
+@@ -93,7 +93,7 @@ fn status_snapshot_includes_reasoning_details() {
+-        secondary: Some(RateLimitWindow {
+-            used_percent: 45.0,
+-            window_minutes: Some(1_440),
+-            resets_in_seconds: Some(1_200),
+-        }),
++        secondary: Some(RateLimitWindow {
++            used_percent: 45.0,
++            window_minutes: Some(10_080),
++            resets_in_seconds: Some(1_200),
++        }),
+@@
++#[test]
++fn status_snapshot_includes_monthly_limit() { /* … */ }
++
+@@
++#[test]
++fn status_snapshot_shows_missing_limits_message() { /* … */ }
+```
+
+## Snapshot updates to recreate
+
+Regenerate the following snapshots after restoring the code above:
+
+- `tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__binary_size_ideal_response.snap`
+- `tui/src/snapshots/codex_tui__history_cell__tests__multiline_command_both_lines_wrap_with_correct_prefixes.snap`
+- `tui/src/snapshots/codex_tui__history_cell__tests__multiline_command_without_wrap_uses_branch_then_eight_spaces.snap`
+- `tui/src/snapshots/codex_tui__history_cell__tests__multiline_command_wraps_with_extra_indent_on_subsequent_lines.snap`
+- `tui/src/snapshots/codex_tui__history_cell__tests__ran_cell_multiline_with_stderr_snapshot.snap`
+- `tui/src/snapshots/codex_tui__history_cell__tests__single_line_command_wraps_with_four_space_continuation.snap`
+- `tui/src/snapshots/codex_tui__history_cell__tests__stderr_tail_more_than_five_lines_snapshot.snap`
+- `tui/src/status/snapshots/codex_tui__status__tests__status_snapshot_includes_monthly_limit.snap`
+- `tui/src/status/snapshots/codex_tui__status__tests__status_snapshot_shows_missing_limits_message.snap`
+
+Re-run `cargo test -p codex-tui` and accept the new snapshots (`cargo insta accept -p codex-tui`) when reintroducing the "Plus" feature work.

codex-rs/tui/src/bottom_pane/chat_composer.rs

@@ -1330,11 +1330,9 @@ impl WidgetRef for ChatComposer {
                     }
                 }
 
-                let hint = hint
-                    .into_iter()
-                    .map(|span| span.patch_style(Style::default().dim()))
-                    .collect::<Vec<_>>();
-                Line::from(hint).render_ref(hint_rect, buf);
+                Line::from(hint)
+                    .style(Style::default().dim())
+                    .render_ref(hint_rect, buf);
             }
         }
         let border_style = if self.has_focus {
@@ -1358,8 +1356,9 @@ impl WidgetRef for ChatComposer {
         let mut state = self.textarea_state.borrow_mut();
         StatefulWidgetRef::render_ref(&(&self.textarea), textarea_rect, buf, &mut state);
         if self.textarea.text().is_empty() {
-            let placeholder = Span::from(self.placeholder_text.as_str()).dim();
-            Line::from(vec![placeholder]).render_ref(textarea_rect.inner(Margin::new(0, 0)), buf);
+            Line::from(self.placeholder_text.as_str())
+                .style(Style::default().dim())
+                .render_ref(textarea_rect.inner(Margin::new(0, 0)), buf);
         }
     }
 }

codex-rs/tui/src/chatwidget.rs

@@ -186,7 +186,7 @@ impl RateLimitWarningState {
     }
 }
 
-pub(crate) fn get_limits_duration(windows_minutes: u64) -> String {
+fn get_limits_duration(windows_minutes: u64) -> String {
     const MINUTES_PER_HOUR: u64 = 60;
     const MINUTES_PER_DAY: u64 = 24 * MINUTES_PER_HOUR;
     const MINUTES_PER_WEEK: u64 = 7 * MINUTES_PER_DAY;

codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__binary_size_ideal_response.snap

@@ -17,15 +17,11 @@ expression: visible_after
   through crates for heavy dependencies in Cargo.toml, including cli, core,
   exec, linux-sandbox, tui, login, ollama, and mcp.
 
-• Ran for d in ansi-escape apply-patch arg0 cli common core exec execpolicy
-  │ file-search linux-sandbox login mcp-client mcp-server mcp-types ollama
-  │ tui; do echo "--- $d/Cargo.toml"; sed -n '1,200p' $d/Cargo.toml; echo;
-  │ … +1 lines
-  └ --- ansi-escape/Cargo.toml
-    [package]
-    … +7 lines
-    ] }
-    tracing = { version
+• Ran
+  └ for d in ansi-escape apply-patch arg0 cli common core exec execpolicy
+        file-search linux-sandbox login mcp-client mcp-server mcp-types ollama
+        tui; do echo "--- $d/Cargo.toml"; sed -n '1,200p' $d/Cargo.toml; echo;
+        done
 
 • Explored
   └ Read Cargo.toml