agent/codex
2
0
Fork 0
mirror of https://github.com/pchuan98/codex.git synced 2026-07-01 00:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reject transcript backtrack in side conversations (#27791)

Browse Source 
## Why

Fixes #27735.

Side conversations are ephemeral forks, and thread rollback currently
requires persisted thread history. The normal backtrack path already
rejected editing previous prompts in side conversations, but
transcript-mode backtrack could still call the rollback path and surface
the core `thread/rollback` failure as a TUI error.

## What changed

- Moved the existing side-conversation edit rejection message into
`app_backtrack.rs` so backtrack rollback code can reuse it.
- Added a side-conversation guard in `apply_backtrack_rollback` so
transcript-mode confirmation is rejected before submitting
`thread/rollback`.

## Verification

- `just test -p codex-tui
app::tests::side_backtrack_rejection_reports_unavailable_message_snapshot`
This commit is contained in:
Eric Traut
2026-06-12 08:58:08 -07:00
committed by GitHub
Unverified
parent b65fe3d897
commit 5b8e3c6d40
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/tui/src/app/input.rs
+1 -3
View File
@@ -4,9 +4,7 @@
//! entry, Ctrl-L clear, external editor launch, and agent navigation shortcuts.
use super::*;
const SIDE_EDIT_PREVIOUS_UNAVAILABLE_MESSAGE: &str =
"Editing previous prompts is unavailable in side conversations.";
use crate::app_backtrack::SIDE_EDIT_PREVIOUS_UNAVAILABLE_MESSAGE;
impl App {
pub(super) async fn launch_external_editor(&mut self, tui: &mut tui::Tui) {
codex-rs/tui/src/app_backtrack.rs
+9
View File
@@ -47,6 +47,8 @@ use crossterm::event::KeyEvent;
use crossterm::event::KeyEventKind;
const NO_PREVIOUS_MESSAGE_TO_EDIT: &str = "No previous message to edit.";
pub(crate) const SIDE_EDIT_PREVIOUS_UNAVAILABLE_MESSAGE: &str =
"Editing previous prompts is unavailable in side conversations.";
/// Aggregates all backtrack-related state used by the App.
#[derive(Default)]
@@ -191,6 +193,13 @@ impl App {
/// The composer prefill is applied immediately as a UX convenience; it does not imply that
/// core has accepted the rollback.
pub(crate) fn apply_backtrack_rollback(&mut self, selection: BacktrackSelection) {
if self.chat_widget.side_conversation_active() {
self.reset_backtrack_state();
self.chat_widget
.add_error_message(SIDE_EDIT_PREVIOUS_UNAVAILABLE_MESSAGE.to_string());
return;
}
let user_total = user_count(&self.transcript_cells);
if user_total == 0 {
return;