kent/consciousness
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify main ui event loop

Browse source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2026-04-06 19:07:25 -04:00
parent 0d20d66196
commit 3cb53d7a5d
1 changed files with 20 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/user/mod.rs
View file

@ -312,29 +312,6 @@ fn is_global_event(event: &ratatui::crossterm::event::Event) -> bool {
} }
} }
fn diff_mind_state(
cur: &crate::mind::MindState,
prev: &crate::mind::MindState,
dirty: &mut bool,
) {
if cur.dmn.label() != prev.dmn.label() || cur.dmn_turns != prev.dmn_turns {
*dirty = true;
}
// Input consumed — Mind started a turn with it
if !prev.input.is_empty() && cur.input.is_empty() {
*dirty = true;
}
if cur.turn_active != prev.turn_active {
*dirty = true;
}
if cur.scoring_in_flight != prev.scoring_in_flight {
*dirty = true;
}
if cur.compaction_in_flight != prev.compaction_in_flight {
*dirty = true;
}
}
pub async fn run( pub async fn run(
mut app: tui::App, mut app: tui::App,
mind: &crate::mind::Mind, mind: &crate::mind::Mind,
@ -384,8 +361,6 @@ pub async fn run(
let agent_changed = agent.lock().await.changed.clone(); let agent_changed = agent.lock().await.changed.clone();
let mut turn_watch = mind.turn_watch(); let mut turn_watch = mind.turn_watch();
let mut dirty = true;
let mut prev_mind = shared_mind.lock().unwrap().clone();
let mut pending: Vec<ratatui::crossterm::event::Event> = Vec::new(); let mut pending: Vec<ratatui::crossterm::event::Event> = Vec::new();
terminal.hide_cursor()?; terminal.hide_cursor()?;
@ -417,17 +392,12 @@ pub async fn run(
} }
} }
_ = agent_changed.notified() => { _ = agent_changed.notified() => {}
dirty = true;
}
_ = turn_watch.changed() => { _ = turn_watch.changed() => {}
dirty = true;
}
Some(channels) = channel_rx.recv() => { Some(channels) = channel_rx.recv() => {
app.set_channel_status(channels); app.set_channel_status(channels);
dirty = true;
} }
} }
@ -439,14 +409,9 @@ pub async fn run(
let model = ag.model().to_string(); let model = ag.model().to_string();
ag.notify(format!("model: {}", model)); ag.notify(format!("model: {}", model));
startup_done = true; startup_done = true;
dirty = true;
} }
} }
{
let cur = shared_mind.lock().unwrap();
diff_mind_state(&cur, &prev_mind, &mut dirty);
prev_mind = cur.clone();
}
while let Ok(_notif) = notify_rx.try_recv() { while let Ok(_notif) = notify_rx.try_recv() {
let tx = channel_tx.clone(); let tx = channel_tx.clone();
tokio::spawn(async move { tokio::spawn(async move {
@ -457,24 +422,26 @@ pub async fn run(
if !pending.is_empty() { idle_state.user_activity(); } if !pending.is_empty() { idle_state.user_activity(); }
while !pending.is_empty() { let mut dirty = false;
while !pending.is_empty() || dirty {
let global_pos = pending.iter().position(|e| is_global_event(e)) let global_pos = pending.iter().position(|e| is_global_event(e))
.unwrap_or(pending.len()); .unwrap_or(pending.len());
if global_pos > 0 { let mut frame = terminal.get_frame();
let mut frame = terminal.get_frame(); let area = frame.area();
let area = frame.area(); screens[active_screen - 1].tick(&mut frame, area, &pending[..global_pos], &mut app);
screens[active_screen - 1].tick(&mut frame, area, &pending[..global_pos], &mut app); drop(frame);
drop(frame); terminal.flush()?;
terminal.flush()?; terminal.swap_buffers();
terminal.swap_buffers(); terminal.backend_mut().flush()?;
terminal.backend_mut().flush()?; dirty = false;
dirty = false;
}
pending = pending.split_off(global_pos); pending = pending.split_off(global_pos);
if pending.is_empty() { break; } if pending.is_empty() { break; }
dirty = true;
// Global event is first — handle it // Global event is first — handle it
use ratatui::crossterm::event::{Event, KeyCode, KeyModifiers}; use ratatui::crossterm::event::{Event, KeyCode, KeyModifiers};
let event = pending.remove(0); let event = pending.remove(0);
@ -495,21 +462,12 @@ pub async fn run(
} }
} }
} }
Event::Resize(_, _) => { let _ = terminal.clear(); } Event::Resize(_, _) => {
let _ = terminal.autoresize();
let _ = terminal.clear();
}
_ => {} _ => {}
} }
dirty = true;
}
if dirty {
let mut frame = terminal.get_frame();
let area = frame.area();
screens[active_screen - 1].tick(&mut frame, area, &[], &mut app);
drop(frame);
terminal.flush()?;
terminal.swap_buffers();
terminal.backend_mut().flush()?;
dirty = false;
} }
if app.should_quit { if app.should_quit {