Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions crates/jcode-tui/src/tui/app/commands_review.rs
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ pub(super) fn reset_current_session(app: &mut App) {
app.queued_messages.clear();
app.pasted_contents.clear();
app.pending_images.clear();
app.clear_inline_image_state();
app.active_skill = None;
app.improve_mode = None;
let mut session = Session::create(None, None);
Expand Down
1 change: 1 addition & 0 deletions crates/jcode-tui/src/tui/app/remote/key_handling.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1677,6 +1677,7 @@ async fn handle_remote_key_internal(
app.queued_messages.clear();
app.pasted_contents.clear();
app.pending_images.clear();
app.clear_inline_image_state();
app.clear_streaming_render_state();
app.clear_live_usage_state();
// Full transcript discard: diagrams and side panel pages
Expand Down
9 changes: 9 additions & 0 deletions crates/jcode-tui/src/tui/app/state_ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,15 @@ impl App {
self.side_pane_images_signature_cache.set(None);
}

/// Drop rendered inline images and every cache keyed by their contents.
/// Use this when the entire transcript is discarded.
pub(crate) fn clear_inline_image_state(&mut self) {
self.remote_side_pane_images.clear();
self.invalidate_side_pane_images_signature();
self.expanded_images.clear();
self.expanded_images_version = self.expanded_images_version.wrapping_add(1);
}

/// Bump the display-messages version without rescanning the transcript to
/// recompute counters. Callers that have already maintained the cached
/// counters incrementally (e.g. a single append) use this to stay O(1).
Expand Down
26 changes: 26 additions & 0 deletions crates/jcode-tui/src/tui/app/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1723,16 +1723,40 @@ fn assert_clear_usage_reset(app: &App) {
assert!(!app.kv_cache.current_api_usage_recorded);
}

fn seed_stale_clear_image(app: &mut App) -> u64 {
app.remote_side_pane_images = vec![crate::session::RenderedImage {
media_type: "image/png".to_string(),
data: "stale-image".to_string(),
label: Some("stale.png".to_string()),
source: crate::session::RenderedImageSource::UserInput,
anchor: None,
}];
let _ = crate::tui::TuiState::side_pane_images_signature(app);
app.expanded_images_version
}

fn assert_clear_image_reset(app: &App, previous_version: u64) {
assert!(app.remote_side_pane_images.is_empty());
assert_eq!(app.side_pane_images_signature_cache.get(), None);
assert!(app.expanded_images.is_empty());
assert_eq!(
app.expanded_images_version,
previous_version.wrapping_add(1)
);
}

#[test]
fn local_clear_resets_provider_reported_context_usage() {
let mut app = create_test_app();
seed_stale_clear_usage(&mut app);
seed_stale_clear_swarm_plan(&mut app);
let image_version = seed_stale_clear_image(&mut app);

assert!(super::commands::handle_session_command(&mut app, "/clear"));

assert_clear_usage_reset(&app);
assert_clear_swarm_plan_reset(&app);
assert_clear_image_reset(&app, image_version);
}

#[test]
Expand All @@ -1745,6 +1769,7 @@ fn remote_clear_resets_provider_reported_context_usage() {
app.is_remote = true;
seed_stale_clear_usage(&mut app);
seed_stale_clear_swarm_plan(&mut app);
let image_version = seed_stale_clear_image(&mut app);
app.input = "/clear".to_string();
app.cursor_pos = app.input.len();

Expand All @@ -1753,6 +1778,7 @@ fn remote_clear_resets_provider_reported_context_usage() {

assert_clear_usage_reset(&app);
assert_clear_swarm_plan_reset(&app);
assert_clear_image_reset(&app, image_version);
}

fn seed_stale_clear_swarm_plan(app: &mut App) {
Expand Down
Loading