Skip to content

fix(tui): make edit-last-turn boundaries authoritative #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
h3c-hexin merged 3 commits into from
Aug 25, 2026
Merged

fix(tui): make edit-last-turn boundaries authoritative #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cc61b6
fix(tui): 编辑重发按真实用户消息定位截断点
Aug 19, 2026
8e60226
Merge remote-tracking branch 'origin/pinvou3-clean' into fix/edit-las…
h3c-hexin Aug 25, 2026
3743ce5
fix(tui): make edit replay boundaries authoritative
h3c-hexin Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 74 additions & 32 deletions crates/tui/src/core/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use crate::compaction::{
};
use crate::config::{ApiProvider, Config, DEFAULT_MAX_SUBAGENTS, DEFAULT_TEXT_MODEL};
use crate::core::model_client::SharedModelClient;
use crate::error_taxonomy::{ErrorCategory, ErrorEnvelope, StreamError};
use crate::error_taxonomy::{ErrorCategory, ErrorEnvelope, ErrorSeverity, StreamError};
use crate::features::{Feature, Features};
use crate::mcp::{McpConfig, McpPool};
#[cfg(test)]
Expand Down Expand Up @@ -2993,49 +2993,68 @@ impl Engine {
// set; a fresh SendMessage is the only operation that
// may install replacement authority.
if self.control_plane_restricted {
let _ = self
.tx_event
.send(Event::error(ErrorEnvelope::fatal(
"Restricted turns cannot edit and replay the last turn"
.to_string(),
)))
.await;
self.reject_edit_last_turn(ErrorEnvelope::new(
ErrorCategory::Authorization,
ErrorSeverity::Error,
false,
"edit_last_turn_restricted",
"Restricted turns cannot edit and replay the last turn",
))
.await;
continue;
}
let route = match self.current_runtime_route() {
Ok(route) => route,
Err(err) => {
let _ = self
.tx_event
.send(Event::error(ErrorEnvelope::fatal_auth(format!(
self.reject_edit_last_turn(ErrorEnvelope::new(
ErrorCategory::Authentication,
ErrorSeverity::Critical,
false,
"edit_last_turn_invalid_route",
format!(
"Cannot edit the last turn because its provider route is no longer valid: {err}"
))))
.await;
let outcome = SendMessageOutcome::NotStarted {
error: Some(format!(
"provider route is no longer valid: {err}"
)),
};
self.reconcile_non_completed_goal_turn(&outcome).await;
),
))
.await;
continue;
}
};
// #383: /edit — remove the last user+assistant exchange
// from the session, then re-send with the new content.
// Pop messages from the tail until we've removed the
// most recent user message and everything after it.
// First, find the last user message index.
let mut cut = None;
for (idx, msg) in self.session.messages.iter().enumerate().rev() {
if msg.role == "user" {
cut = Some(idx);
break;
// Tool results and runtime-owned internal envelopes are
// also persisted with role "user", so locate the cut
// point by genuine user prompt — a bare role scan would
// land mid-turn on a tool_result and keep the old
// prompt plus its tool round-trips in history.
let idx = match crate::runtime_handoff::edit_last_turn_target(
&self.session.messages,
) {
crate::runtime_handoff::EditLastTurnTarget::Editable(idx) => idx,
crate::runtime_handoff::EditLastTurnTarget::Unsupported => {
self.reject_edit_last_turn(ErrorEnvelope::new(
ErrorCategory::InvalidInput,
ErrorSeverity::Error,
false,
"edit_last_turn_unsupported_user_content",
"Cannot edit the last turn because the latest user message has no editable text content.",
))
.await;
continue;
}
}
if let Some(idx) = cut {
self.session.messages.truncate_to(idx);
self.session.bump_messages_revision();
}
crate::runtime_handoff::EditLastTurnTarget::Missing => {
self.reject_edit_last_turn(ErrorEnvelope::new(
ErrorCategory::State,
ErrorSeverity::Error,
false,
"edit_last_turn_no_user_prompt",
"Cannot edit the last turn because the session history has no user message to replace.",
))
.await;
continue;
}
};
self.session.messages.truncate_to(idx);
self.session.bump_messages_revision();
// Now dispatch the new message as a normal send,
// reusing the engine's stored mode/model config.
let mode = self.current_mode;
Expand Down Expand Up @@ -3847,6 +3866,29 @@ impl Engine {
}
}

/// Reject an edit operation before model dispatch while still completing
/// the submitted host lifecycle. `Event::Error` is advisory to embedded
/// hosts; `TurnComplete(Failed)` is the authoritative terminal signal that
/// releases their busy state and closes the admitted operation.
async fn reject_edit_last_turn(&mut self, envelope: ErrorEnvelope) {
let message = envelope.message.clone();
let _ = self.tx_event.send(Event::error(envelope)).await;
let _ = self
.tx_event
.send(Event::TurnComplete {
usage: Usage::default(),
status: TurnOutcomeStatus::Failed,
error: Some(message.clone()),
tool_catalog: None,
base_url: None,
})
.await;
let outcome = SendMessageOutcome::NotStarted {
error: Some(message),
};
self.reconcile_non_completed_goal_turn(&outcome).await;
}

/// Reconcile a turn that did not complete with the autonomous goal loop.
/// Hosted engines leave lifecycle decisions to their durable host. The
/// interactive engine must cancel any older queued synthetic token first,
Expand Down
Loading
Loading