Merge branch 'main' into plan-session-update-support

Author: CSRessel

codex-rs/tui/docs.md

@@ -39,7 +39,7 @@ The auto-worktree startup flow branches on the `AutoWorktree` enum (see `@/codex
 | `Ask` | After TUI init, in `run_ratatui_app()` | Sets `pending_worktree_ask = true`, deferred to a TUI popup shown after onboarding but before `App::run()` |
 | `Off` | N/A | Skips worktree creation entirely |
 
-The `Ask` popup is implemented by `nori::worktree_ask::run_worktree_ask_popup()`, a standalone mini-app screen (same pattern as `update_prompt.rs`) that runs its own event loop before the main `App`. It presents two options ("Yes, create a worktree" / "No, continue without a worktree") and returns a boolean. If the user confirms, `setup_auto_worktree()` is called and config is reloaded with the new cwd via `load_config_or_exit()`. Ctrl-C, Escape, and the "No" option all skip worktree creation. On failure, the TUI continues with the original cwd.
+The `Ask` popup is implemented by `nori::worktree_ask::run_worktree_ask_popup()`, a standalone mini-app screen using the same pre-`App` event-loop pattern as `nori::update_prompt` in release builds. It presents two options ("Yes, create a worktree" / "No, continue without a worktree") and returns a boolean. If the user confirms, `setup_auto_worktree()` is called and config is reloaded with the new cwd via `load_config_or_exit()`. Ctrl-C, Escape, and the "No" option all skip worktree creation. On failure, the TUI continues with the original cwd.
 
 The main event loop in `app/mod.rs` processes:
 
@@ -390,8 +390,6 @@ The fork context flows through `ChatWidgetInit.fork_context` -> `spawn_agent()`
 
 **Session context injection:** Both `spawn_acp_agent()` and `spawn_acp_agent_resume()` in `chatwidget/agent.rs` set `AcpBackendConfig.session_context` to the contents of `@/codex-rs/tui/session_context.md` (loaded at compile time via `include_str!`). This tells the ACP agent that it is running inside the nori CLI and provides a source-code URL for self-referential questions. The context is prepended (without `SUMMARY_PREFIX` framing) to the first user prompt only and then consumed (see `@/codex-rs/acp/docs.md` for the hook context injection mechanism).
 
-Debug-only commands (not shown in help): `/rollout`, `/test-approval`
-
 The `/logout` command is only available when the `login` feature is enabled. The `/config` command requires the `nori-config` feature.
 
 
@@ -847,10 +845,10 @@ The `--dangerously-bypass-approvals-and-sandbox` flag (alias: `--yolo`) works in
 
 **Update Checking:**
 
-The TUI uses Nori-specific update checking via files in `@/codex-rs/tui/src/nori/`:
-- `update_action.rs`: Update action handling
-- `updates.rs`: Version checking against GitHub releases
-- `update_prompt.rs`: User prompting for updates
+The TUI uses Nori-specific update checking via the modules in `@/codex-rs/tui/src/nori/`:
+- `nori/update_action.rs`: Update action handling
+- `nori/updates.rs`: Version checking against GitHub releases
+- `nori/update_prompt.rs`: User prompting for updates
 
 **Error Reporting:**
 

codex-rs/tui/src/chatwidget/key_handling.rs

@@ -221,54 +221,6 @@ impl ChatWidget {
             SlashCommand::Mcp => {
                 self.open_mcp_servers_popup();
             }
-            SlashCommand::Rollout => {
-                if let Some(path) = self.rollout_path() {
-                    self.add_info_message(
-                        format!("Current rollout path: {}", path.display()),
-                        None,
-                    );
-                } else {
-                    self.add_info_message("Rollout path is not available yet.".to_string(), None);
-                }
-            }
-            SlashCommand::TestApproval => {
-                use codex_core::protocol::EventMsg;
-                use std::collections::HashMap;
-
-                use codex_core::protocol::ApplyPatchApprovalRequestEvent;
-                use codex_core::protocol::FileChange;
-
-                self.app_event_tx.send(AppEvent::CodexEvent(Event {
-                    id: "1".to_string(),
-                    // msg: EventMsg::ExecApprovalRequest(ExecApprovalRequestEvent {
-                    //     call_id: "1".to_string(),
-                    //     command: vec!["git".into(), "apply".into()],
-                    //     cwd: self.config.cwd.clone(),
-                    //     reason: Some("test".to_string()),
-                    // }),
-                    msg: EventMsg::ApplyPatchApprovalRequest(ApplyPatchApprovalRequestEvent {
-                        call_id: "1".to_string(),
-                        turn_id: "turn-1".to_string(),
-                        changes: HashMap::from([
-                            (
-                                PathBuf::from("/tmp/test.txt"),
-                                FileChange::Add {
-                                    content: "test".to_string(),
-                                },
-                            ),
-                            (
-                                PathBuf::from("/tmp/test2.txt"),
-                                FileChange::Update {
-                                    unified_diff: "+test\n-test2".to_string(),
-                                    move_path: None,
-                                },
-                            ),
-                        ]),
-                        reason: None,
-                        grant_root: Some(PathBuf::from("/tmp")),
-                    }),
-                }));
-            }
             SlashCommand::SwitchSkillset => {
                 self.handle_switch_skillset_command();
             }

codex-rs/tui/src/chatwidget/tests/part2.rs

@@ -31,42 +31,6 @@ fn slash_undo_sends_op() {
     }
 }
 
-#[test]
-fn slash_rollout_displays_current_path() {
-    let (mut chat, mut rx, _op_rx) = make_chatwidget_manual();
-    let rollout_path = PathBuf::from("/tmp/codex-test-rollout.jsonl");
-    chat.current_rollout_path = Some(rollout_path.clone());
-
-    chat.dispatch_command(SlashCommand::Rollout);
-
-    let cells = drain_insert_history(&mut rx);
-    assert_eq!(cells.len(), 1, "expected info message for rollout path");
-    let rendered = lines_to_single_string(&cells[0]);
-    assert!(
-        rendered.contains(&rollout_path.display().to_string()),
-        "expected rollout path to be shown: {rendered}"
-    );
-}
-
-#[test]
-fn slash_rollout_handles_missing_path() {
-    let (mut chat, mut rx, _op_rx) = make_chatwidget_manual();
-
-    chat.dispatch_command(SlashCommand::Rollout);
-
-    let cells = drain_insert_history(&mut rx);
-    assert_eq!(
-        cells.len(),
-        1,
-        "expected info message explaining missing path"
-    );
-    let rendered = lines_to_single_string(&cells[0]);
-    assert!(
-        rendered.contains("not available"),
-        "expected missing rollout path message: {rendered}"
-    );
-}
-
 #[test]
 fn slash_first_prompt_shows_initial_prompt() {
     let (mut chat, mut rx, _op_rx) = make_chatwidget_manual();

codex-rs/tui/src/lib.rs

@@ -445,8 +445,6 @@ async fn run_ratatui_app(
                 show_trust_screen: should_show_trust_screen,
                 skip_welcome: cli.skip_welcome,
                 skip_trust_directory: cli.skip_trust_directory,
-                login_status,
-                auth_manager: auth_manager.clone(),
                 config: initial_config.clone(),
             },
             &mut tui,

codex-rs/tui/src/nori/onboarding/onboarding_screen.rs

@@ -7,10 +7,6 @@
 //! The flow is designed to be used instead of the default Codex onboarding
 //! screen when building with Nori branding.
 
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use codex_core::AuthManager;
 use codex_core::config::Config;
 use codex_core::git_info::get_git_repo_root;
 use color_eyre::eyre::Result;
@@ -23,8 +19,8 @@ use ratatui::prelude::Widget;
 use ratatui::style::Color;
 use ratatui::widgets::Clear;
 use ratatui::widgets::WidgetRef;
+use std::path::PathBuf;
 
-use crate::LoginStatus;
 use crate::onboarding::TrustDirectorySelection;
 use crate::onboarding::onboarding_screen::KeyboardHandler;
 use crate::onboarding::onboarding_screen::StepState;
@@ -56,12 +52,6 @@ pub(crate) struct NoriOnboardingScreenArgs {
     pub skip_welcome: bool,
     /// Whether to skip the trust directory prompt (--skip-trust-directory flag).
     pub skip_trust_directory: bool,
-    /// Current login status (unused in Nori but kept for API compatibility).
-    #[allow(dead_code)]
-    pub login_status: LoginStatus,
-    /// Auth manager (unused in Nori but kept for API compatibility).
-    #[allow(dead_code)]
-    pub auth_manager: Arc<AuthManager>,
     /// Application configuration.
     pub config: Config,
 }
@@ -90,8 +80,6 @@ impl NoriOnboardingScreen {
             show_trust_screen,
             skip_welcome,
             skip_trust_directory,
-            login_status: _,
-            auth_manager: _,
             config,
         } = args;
 
@@ -375,11 +363,30 @@ pub(crate) async fn run_nori_onboarding_app(
 #[cfg(test)]
 mod tests {
     use super::*;
+    use codex_core::config::Config;
+    use codex_core::config::ConfigOverrides;
+    use codex_core::config::ConfigToml;
 
     #[test]
     fn nori_step_implements_required_traits() {
         // This test verifies the NoriStep enum implements all required traits.
         // The compilation of this test is the actual verification.
         let _welcome = NoriStep::Welcome(NoriWelcomeWidget::new());
     }
+
+    #[test]
+    fn nori_onboarding_args_only_require_live_fields() -> std::io::Result<()> {
+        let _args = NoriOnboardingScreenArgs {
+            show_trust_screen: true,
+            skip_welcome: false,
+            skip_trust_directory: false,
+            config: Config::load_from_base_config_with_overrides(
+                ConfigToml::default(),
+                ConfigOverrides::default(),
+                std::env::temp_dir(),
+            )?,
+        };
+
+        Ok(())
+    }
 }

codex-rs/tui/src/slash_command.rs

@@ -33,8 +33,6 @@ pub enum SlashCommand {
     Logout,
     Quit,
     Exit,
-    Rollout,
-    TestApproval,
     SwitchSkillset,
     Fork,
 }
@@ -63,8 +61,6 @@ impl SlashCommand {
             SlashCommand::Mcp => "manage MCP server connections",
             SlashCommand::Login => "log in to the current agent",
             SlashCommand::Logout => "show logout instructions",
-            SlashCommand::Rollout => "print the rollout file path",
-            SlashCommand::TestApproval => "test approval request",
             SlashCommand::SwitchSkillset => "switch between available skillsets",
             SlashCommand::Fork => "rewind conversation to a previous message",
         }
@@ -102,14 +98,11 @@ impl SlashCommand {
             | SlashCommand::FirstPrompt
             | SlashCommand::Quit
             | SlashCommand::Exit => true,
-            SlashCommand::Rollout => true,
-            SlashCommand::TestApproval => true,
         }
     }
 
     fn is_visible(self) -> bool {
         match self {
-            SlashCommand::Rollout | SlashCommand::TestApproval => cfg!(debug_assertions),
             #[cfg(not(feature = "login"))]
             SlashCommand::Logout => false,
             _ => true,
@@ -290,6 +283,28 @@ mod tests {
         );
     }
 
+    #[test]
+    fn legacy_debug_commands_are_not_exposed() {
+        let commands = built_in_slash_commands();
+
+        assert!(
+            commands.iter().all(|(name, _)| *name != "rollout"),
+            "/rollout should not be visible in commands list"
+        );
+        assert!(
+            commands.iter().all(|(name, _)| *name != "test-approval"),
+            "/test-approval should not be visible in commands list"
+        );
+        assert!(
+            "rollout".parse::<SlashCommand>().is_err(),
+            "/rollout should not parse as a slash command"
+        );
+        assert!(
+            "test-approval".parse::<SlashCommand>().is_err(),
+            "/test-approval should not parse as a slash command"
+        );
+    }
+
     #[test]
     fn browse_parses_from_string() {
         let cmd: SlashCommand = "browse".parse().expect("/browse should parse from string");