Clean up mind loop: fix double locks, async agent triggers, input peek
- push_node: notify before dropping state lock instead of relocking - Mind::run: single lock for timeout + turn_active + has_input; single lock for turn_handle + complete_turn - Agent triggers (subconscious/unconscious) spawned as async tasks so they don't block the select loop - has_pending_input() peek for DMN sleep guard — don't sleep when there's user input waiting - unconscious: merge collect_results into trigger, single store load Co-Authored-By: Proof of Concept <poc@bcachefs.org>
This commit is contained in:
parent
0314619579
commit
d82a2ae90d
3 changed files with 49 additions and 52 deletions
|
|
@ -165,6 +165,11 @@ impl MindState {
|
|||
}
|
||||
}
|
||||
|
||||
/// Is there pending user input waiting?
|
||||
fn has_pending_input(&self) -> bool {
|
||||
!self.turn_active && !self.input.is_empty()
|
||||
}
|
||||
|
||||
/// Consume pending user input if no turn is active.
|
||||
/// Returns the text to send; caller is responsible for pushing it
|
||||
/// into the Agent's context and starting the turn.
|
||||
|
|
@ -254,7 +259,7 @@ pub struct Mind {
|
|||
pub shared: Arc<SharedMindState>,
|
||||
pub config: SessionConfig,
|
||||
subconscious: Arc<tokio::sync::Mutex<Subconscious>>,
|
||||
unconscious: tokio::sync::Mutex<Unconscious>,
|
||||
unconscious: Arc<tokio::sync::Mutex<Unconscious>>,
|
||||
turn_tx: mpsc::Sender<(Result<TurnResult>, StreamTarget)>,
|
||||
turn_watch: tokio::sync::watch::Sender<bool>,
|
||||
bg_tx: mpsc::UnboundedSender<BgEvent>,
|
||||
|
|
@ -295,7 +300,7 @@ impl Mind {
|
|||
|
||||
Self { agent, shared, config,
|
||||
subconscious,
|
||||
unconscious: tokio::sync::Mutex::new(Unconscious::new()),
|
||||
unconscious: Arc::new(tokio::sync::Mutex::new(Unconscious::new())),
|
||||
turn_tx, turn_watch, bg_tx,
|
||||
bg_rx: std::sync::Mutex::new(Some(bg_rx)), _supervisor: sup }
|
||||
}
|
||||
|
|
@ -480,9 +485,13 @@ impl Mind {
|
|||
) {
|
||||
let mut bg_rx = self.bg_rx.lock().unwrap().take()
|
||||
.expect("Mind::run() called twice");
|
||||
let mut sub_handle: Option<tokio::task::JoinHandle<()>> = None;
|
||||
let mut unc_handle: Option<tokio::task::JoinHandle<()>> = None;
|
||||
loop {
|
||||
let timeout = self.shared.lock().unwrap().dmn.interval();
|
||||
let turn_active = self.shared.lock().unwrap().turn_active;
|
||||
let (timeout, turn_active, has_input) = {
|
||||
let me = self.shared.lock().unwrap();
|
||||
(me.dmn.interval(), me.turn_active, me.has_pending_input())
|
||||
};
|
||||
|
||||
let mut cmds = Vec::new();
|
||||
|
||||
|
|
@ -505,8 +514,11 @@ impl Mind {
|
|||
}
|
||||
|
||||
Some((result, target)) = turn_rx.recv() => {
|
||||
self.shared.lock().unwrap().turn_handle = None;
|
||||
let model_switch = self.shared.lock().unwrap().complete_turn(&result, target);
|
||||
let model_switch = {
|
||||
let mut s = self.shared.lock().unwrap();
|
||||
s.turn_handle = None;
|
||||
s.complete_turn(&result, target)
|
||||
};
|
||||
let _ = self.turn_watch.send(false);
|
||||
|
||||
if let Some(name) = model_switch {
|
||||
|
|
@ -519,7 +531,7 @@ impl Mind {
|
|||
}
|
||||
}
|
||||
|
||||
_ = tokio::time::sleep(timeout), if !turn_active => {
|
||||
_ = tokio::time::sleep(timeout), if !has_input => {
|
||||
let tick = self.shared.lock().unwrap().dmn_tick();
|
||||
if let Some((prompt, target)) = tick {
|
||||
self.start_turn(&prompt, target).await;
|
||||
|
|
@ -527,16 +539,22 @@ impl Mind {
|
|||
}
|
||||
}
|
||||
|
||||
// Subconscious: collect finished results, trigger due agents
|
||||
if !self.config.no_agents {
|
||||
let mut sub = self.subconscious.lock().await;
|
||||
sub.collect_results(&self.agent).await;
|
||||
sub.trigger(&self.agent).await;
|
||||
drop(sub);
|
||||
|
||||
let mut unc = self.unconscious.lock().await;
|
||||
unc.collect_results().await;
|
||||
unc.trigger();
|
||||
if sub_handle.as_ref().map_or(true, |h| h.is_finished()) {
|
||||
let sub = self.subconscious.clone();
|
||||
let agent = self.agent.clone();
|
||||
sub_handle = Some(tokio::spawn(async move {
|
||||
let mut s = sub.lock().await;
|
||||
s.collect_results(&agent).await;
|
||||
s.trigger(&agent).await;
|
||||
}));
|
||||
}
|
||||
if unc_handle.as_ref().map_or(true, |h| h.is_finished()) {
|
||||
let unc = self.unconscious.clone();
|
||||
unc_handle = Some(tokio::spawn(async move {
|
||||
unc.lock().await.trigger();
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
// Check for pending user input → push to agent context and start turn
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue