Merge branch 'main' into feature/agents-md-launch

codex-rs/tui/src/app.rs

@@ -360,6 +360,11 @@ impl App<'_> {
                             widget.add_status_output();
                         }
                     }
+                    SlashCommand::Prompts => {
+                        if let AppState::Chat { widget } = &mut self.app_state {
+                            widget.add_prompts_output();
+                        }
+                    }
                     #[cfg(debug_assertions)]
                     SlashCommand::TestApproval => {
                         use std::collections::HashMap;

codex-rs/tui/src/chatwidget.rs

@@ -556,6 +556,10 @@ impl ChatWidget<'_> {
         ));
     }
 
+    pub(crate) fn add_prompts_output(&mut self) {
+        self.add_to_history(HistoryCell::new_prompts_output());
+    }
+
     /// Forward file-search results to the bottom pane.
     pub(crate) fn apply_file_search_result(&mut self, query: String, matches: Vec<FileMatch>) {
         self.bottom_pane.on_file_search_result(query, matches);

codex-rs/tui/src/history_cell.rs

@@ -14,6 +14,7 @@ use codex_core::plan_tool::UpdatePlanArgs;
 use codex_core::project_doc::collect_instructions_info_sync;
 use codex_core::protocol::FileChange;
 use codex_core::protocol::McpInvocation;
+use codex_core::protocol::SandboxPolicy;
 use codex_core::protocol::SessionConfiguredEvent;
 use codex_core::protocol::TokenUsage;
 use codex_login::get_auth_file;
@@ -111,6 +112,9 @@ pub(crate) enum HistoryCell {
     /// Output from the `/status` command.
     StatusOutput { view: TextBlock },
 
+    /// Output from the `/prompts` command.
+    PromptsOutput { view: TextBlock },
+
     /// Error event from the backend.
     ErrorEvent { view: TextBlock },
 
@@ -132,6 +136,27 @@ pub(crate) enum HistoryCell {
 
 const TOOL_CALL_MAX_LINES: usize = 3;
 
+fn title_case(s: &str) -> String {
+    if s.is_empty() {
+        return String::new();
+    }
+    let mut chars = s.chars();
+    let first = match chars.next() {
+        Some(c) => c,
+        None => return String::new(),
+    };
+    let rest: String = chars.as_str().to_ascii_lowercase();
+    first.to_uppercase().collect::<String>() + &rest
+}
+
+fn pretty_provider_name(id: &str) -> String {
+    if id.eq_ignore_ascii_case("openai") {
+        "OpenAI".to_string()
+    } else {
+        title_case(id)
+    }
+}
+
 impl HistoryCell {
     /// Return a cloned, plain representation of the cell's lines suitable for
     /// one‑shot insertion into the terminal scrollback. Image cells are
@@ -143,6 +168,7 @@ impl HistoryCell {
             | HistoryCell::BackgroundEvent { view }
             | HistoryCell::GitDiffOutput { view }
             | HistoryCell::StatusOutput { view }
+            | HistoryCell::PromptsOutput { view }
             | HistoryCell::ErrorEvent { view }
             | HistoryCell::SessionInfo { view }
             | HistoryCell::CompletedExecCommand { view }
@@ -252,10 +278,10 @@ impl HistoryCell {
                 format!(" /status - {}", SlashCommand::Status.description()).dim(),
             ));
             lines.push(Line::from(
-                format!(" /compact - {}", SlashCommand::Compact.description()).dim(),
+                format!(" /diff - {}", SlashCommand::Diff.description()).dim(),
             ));
             lines.push(Line::from(
-                format!(" /new - {}", SlashCommand::New.description()).dim(),
+                format!(" /prompts - {}", SlashCommand::Prompts.description()).dim(),
             ));
             lines.push(Line::from("".dim()));
 
@@ -550,35 +576,65 @@ impl HistoryCell {
             ]));
         }
 
-        // Config
-        for (key, value) in create_config_summary_entries(config) {
-            lines.push(Line::from(vec![format!("{key}: ").bold(), value.into()]));
-        }
+        let config_entries = create_config_summary_entries(config);
+        let lookup = |k: &str| -> String {
+            config_entries
+                .iter()
+                .find(|(key, _)| *key == k)
+                .map(|(_, v)| v.clone())
+                .unwrap_or_default()
+        };
+
+        // 📂 Workspace
+        lines.push(Line::from(vec!["📂 ".into(), "Workspace".bold()]));
+        // Path (home-relative, e.g., ~/code/project)
+        let cwd_str = match relativize_to_home(&config.cwd) {
+            Some(rel) if !rel.as_os_str().is_empty() => format!("~/{}", rel.display()),
+            Some(_) => "~".to_string(),
+            None => config.cwd.display().to_string(),
+        };
+        lines.push(Line::from(vec!["  • Path: ".into(), cwd_str.into()]));
+        // Approval mode (as-is)
+        lines.push(Line::from(vec![
+            "  • Approval Mode: ".into(),
+            lookup("approval").into(),
+        ]));
+        // Sandbox (simplified name only)
+        let sandbox_name = match &config.sandbox_policy {
+            SandboxPolicy::DangerFullAccess => "danger-full-access",
+            SandboxPolicy::ReadOnly => "read-only",
+            SandboxPolicy::WorkspaceWrite { .. } => "workspace-write",
+        };
+        lines.push(Line::from(vec![
+            "  • Sandbox: ".into(),
+            sandbox_name.into(),
+        ]));
 
         lines.push(Line::from(""));
 
-        // Auth
+        // 👤 Account (only if ChatGPT tokens exist), shown under the first block
         let auth_file = get_auth_file(&config.codex_home);
         if let Ok(auth) = try_read_auth_json(&auth_file) {
-            if auth.tokens.as_ref().is_some() {
-                lines.push(Line::from("signed in with chatgpt".bold()));
+            if let Some(tokens) = auth.tokens.clone() {
+                lines.push(Line::from(vec!["👤 ".into(), "Account".bold()]));
+                lines.push(Line::from("  • Signed in with ChatGPT"));
 
-                if let Some(tokens) = auth.tokens.as_ref() {
-                    let info = tokens.id_token.clone();
-                    if let Some(email) = info.email {
-                        lines.push(Line::from(vec!["  login: ".bold(), email.into()]));
+                let info = tokens.id_token;
+                if let Some(email) = info.email {
+                    lines.push(Line::from(vec!["  • Login: ".into(), email.into()]));
+                }
+
+                match auth.openai_api_key.as_deref() {
+                    Some(key) if !key.is_empty() => {
+                        lines.push(Line::from("  • Using API key"));
                     }
-
-                    match auth.openai_api_key.as_deref() {
-                        Some(key) if !key.is_empty() => {
-                            lines.push(Line::from("  using api key"));
-                        }
-                        _ => {
-                            let plan_text = info
-                                .chatgpt_plan_type
-                                .unwrap_or_else(|| "Unknown".to_string());
-                            lines.push(Line::from(vec!["  plan: ".bold(), plan_text.into()]));
-                        }
+                    _ => {
+                        let plan_text = info
+                            .chatgpt_plan_type
+                            .as_deref()
+                            .map(title_case)
+                            .unwrap_or_else(|| "Unknown".to_string());
+                        lines.push(Line::from(vec!["  • Plan: ".into(), plan_text.into()]));
                     }
                 }
 
@@ -586,20 +642,56 @@ impl HistoryCell {
             }
         }
 
-        // Token usage
-        lines.push(Line::from("token usage".bold()));
+        // 🧠 Model
+        lines.push(Line::from(vec!["🧠 ".into(), "Model".bold()]));
         lines.push(Line::from(vec![
-            "  input: ".bold(),
-            usage.non_cached_input().to_string().into(),
-            " ".into(),
-            format!("(+ {} cached)", usage.cached_input()).into(),
+            "  • Name: ".into(),
+            config.model.clone().into(),
         ]));
+        let provider_disp = pretty_provider_name(&config.model_provider_id);
         lines.push(Line::from(vec![
-            "  output: ".bold(),
+            "  • Provider: ".into(),
+            provider_disp.into(),
+        ]));
+        // Only show Reasoning fields if present in config summary
+        let reff = lookup("reasoning effort");
+        if !reff.is_empty() {
+            lines.push(Line::from(vec![
+                "  • Reasoning Effort: ".into(),
+                title_case(&reff).into(),
+            ]));
+        }
+        let rsum = lookup("reasoning summaries");
+        if !rsum.is_empty() {
+            lines.push(Line::from(vec![
+                "  • Reasoning Summaries: ".into(),
+                title_case(&rsum).into(),
+            ]));
+        }
+
+        lines.push(Line::from(""));
+
+        // 📊 Token Usage
+        lines.push(Line::from(vec!["📊 ".into(), "Token Usage".bold()]));
+        // Input: <input> [+ <cached> cached]
+        let mut input_line_spans: Vec<Span<'static>> = vec![
+            "  • Input: ".into(),
+            usage.non_cached_input().to_string().into(),
+        ];
+        if let Some(cached) = usage.cached_input_tokens {
+            if cached > 0 {
+                input_line_spans.push(format!(" (+ {cached} cached)").into());
+            }
+        }
+        lines.push(Line::from(input_line_spans));
+        // Output: <output>
+        lines.push(Line::from(vec![
+            "  • Output: ".into(),
             usage.output_tokens.to_string().into(),
         ]));
+        // Total: <total>
         lines.push(Line::from(vec![
-            "  total: ".bold(),
+            "  • Total: ".into(),
             usage.blended_total().to_string().into(),
         ]));
 
@@ -609,6 +701,23 @@ impl HistoryCell {
         }
     }
 
+    pub(crate) fn new_prompts_output() -> Self {
+        let lines: Vec<Line<'static>> = vec![
+            Line::from("/prompts".magenta()),
+            Line::from(""),
+            Line::from(" 1. Explain this codebase"),
+            Line::from(" 2. Summarize recent commits"),
+            Line::from(" 3. Implement {feature}"),
+            Line::from(" 4. Find and fix a bug in @filename"),
+            Line::from(" 5. Write tests for @filename"),
+            Line::from(" 6. Improve documentation in @filename"),
+            Line::from(""),
+        ];
+        HistoryCell::PromptsOutput {
+            view: TextBlock::new(lines),
+        }
+    }
+
     pub(crate) fn new_error_event(message: String) -> Self {
         let lines: Vec<Line<'static>> =
             vec![vec!["🖐 ".red().bold(), message.into()].into(), "".into()];

codex-rs/tui/src/slash_command.rs

@@ -17,6 +17,7 @@ pub enum SlashCommand {
     Compact,
     Diff,
     Status,
+    Prompts,
     Logout,
     Quit,
     #[cfg(debug_assertions)]
@@ -33,6 +34,7 @@ impl SlashCommand {
             SlashCommand::Quit => "exit Codex",
             SlashCommand::Diff => "show git diff (including untracked files)",
             SlashCommand::Status => "show current session configuration and token usage",
+            SlashCommand::Prompts => "show example prompts",
             SlashCommand::Logout => "log out of Codex",
             #[cfg(debug_assertions)]
             SlashCommand::TestApproval => "test approval request",