Delay goal file writes until replace confirmation

openai · etraut-openai · Jun 12, 2026 · Jun 11, 2026 · Jun 11, 2026 · Jun 11, 2026
commit f2b7e7007a7077a2933627a690c3028b618cd2ff
diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs
@@ -4221,6 +4221,54 @@ async fn set_thread_goal_objective_materializes_long_objective_before_goal_set()
     Ok(())
 }
 
+#[tokio::test]
+async fn set_thread_goal_objective_confirms_replacement_before_materializing() -> Result<()> {
+    let mut app = make_test_app().await;
+    let mut app_server = crate::start_embedded_app_server_for_picker(app.chat_widget.config_ref())
+        .await
+        .expect("embedded app server");
+    let started = app_server
+        .start_thread(app.chat_widget.config_ref())
+        .await
+        .expect("thread/start should succeed");
+    let thread_id = started.session.thread_id;
+    app.enqueue_primary_thread_session(started.session, started.turns)
+        .await
+        .expect("primary thread should be registered");
+    app_server
+        .thread_goal_set(
+            thread_id,
+            Some("keep this goal".to_string()),
+            Some(codex_app_server_protocol::ThreadGoalStatus::Active),
+            /*token_budget*/ None,
+        )
+        .await?;
+    let attachments_dir = app.chat_widget.config_ref().codex_home.join("attachments");
+
+    let accepted = app
+        .set_thread_goal_objective(
+            &mut app_server,
+            thread_id,
+            "x".repeat(MAX_THREAD_GOAL_OBJECTIVE_CHARS + 1),
+            crate::app_event::ThreadGoalSetMode::ConfirmIfExists,
+        )
+        .await;
+
+    assert!(!accepted);
+    assert!(!attachments_dir.exists());
+    assert_eq!(
+        app_server
+            .thread_goal_get(thread_id)
+            .await?
+            .goal
+            .expect("goal should still be set")
+            .objective,
+        "keep this goal"
+    );
+    app_server.shutdown().await?;
+    Ok(())
+}
+
 fn test_thread_session(thread_id: ThreadId, cwd: PathBuf) -> ThreadSessionState {
     ThreadSessionState {
         thread_id,

diff --git a/codex-rs/tui/src/app/thread_goal_actions.rs b/codex-rs/tui/src/app/thread_goal_actions.rs
@@ -144,23 +144,6 @@ impl App {
         mode: ThreadGoalSetMode,
     ) -> bool {
         let codex_home = app_server.codex_home_path(&self.config.codex_home);
-        let objective = match goal_files::materialize_goal_objective(
-            app_server,
-            codex_home.as_ref(),
-            objective,
-        )
-        .await
-        {
-            Ok(objective) => objective,
-            Err(err) => {
-                if self.current_displayed_thread_id() == Some(thread_id) {
-                    self.chat_widget.add_error_message(err.to_string());
-                    return true;
-                }
-                return false;
-            }
-        };
-
         let mode = if matches!(mode, ThreadGoalSetMode::ConfirmIfExists) {
             let result = app_server.thread_goal_get(thread_id).await;
             if self.current_displayed_thread_id() != Some(thread_id) {
@@ -170,11 +153,7 @@ impl App {
             match result {
                 Ok(response) => match response.goal.as_ref() {
                     Some(goal) if should_confirm_before_replacing_goal(goal) => {
-                        self.show_replace_thread_goal_confirmation(
-                            thread_id,
-                            objective,
-                            codex_home.as_ref(),
-                        );
+                        self.show_replace_thread_goal_confirmation(thread_id, objective);
                         return false;
                     }
                     Some(_) => ThreadGoalSetMode::ReplaceExisting,
@@ -190,6 +169,23 @@ impl App {
             mode
         };
 
+        let objective = match goal_files::materialize_goal_objective(
+            app_server,
+            codex_home.as_ref(),
+            objective,
+        )
+        .await
+        {
+            Ok(objective) => objective,
+            Err(err) => {
+                if self.current_displayed_thread_id() == Some(thread_id) {
+                    self.chat_widget.add_error_message(err.to_string());
+                    return true;
+                }
+                return false;
+            }
+        };
+
         let replacing_goal = matches!(mode, ThreadGoalSetMode::ReplaceExisting);
         if replacing_goal {
             let result = app_server.thread_goal_clear(thread_id).await;
@@ -293,18 +289,8 @@ impl App {
         }
     }
 
-    fn show_replace_thread_goal_confirmation(
-        &mut self,
-        thread_id: ThreadId,
-        objective: String,
-        codex_home: Option<&goal_files::GoalFilePath>,
-    ) {
+    fn show_replace_thread_goal_confirmation(&mut self, thread_id: ThreadId, objective: String) {
         let replace_objective = objective.clone();
-        let subtitle = if let Some(path) = goal_files::objective_file_path(&objective, codex_home) {
-            format!("New objective file: {path}")
-        } else {
-            format!("New objective: {objective}")
-        };
         let replace_actions: Vec<SelectionAction> = vec![Box::new(move |tx| {
             tx.send(AppEvent::SetThreadGoalObjective {
                 thread_id,
@@ -329,7 +315,7 @@ impl App {
         ];
         self.chat_widget.show_selection_view(SelectionViewParams {
             title: Some("Replace goal?".to_string()),
-            subtitle: Some(subtitle),
+            subtitle: Some(format!("New objective: {objective}")),
             footer_hint: Some(standard_popup_hint_line()),
             items,
             ..Default::default()