feat(maestro): refresh the blocked-work indicator in the watcher (#83)
run_blocked_work_pass rides the liveness tick but probes on a slower cadence (DEFAULT_BLOCKED_WORK_INTERVAL, 15s): each probe is three git subprocesses per session. Sessions without a worktree are filtered out before any probe, so their indicator costs nothing. A failed probe keeps the previous value; settled exits clear it.
This commit is contained in:
@@ -33,6 +33,13 @@ pub const EVENTS_CAPACITY: usize = maestro_config::EVENTS_CAPACITY;
|
||||
/// How often the liveness watcher polls tmux for sessions that disappeared.
|
||||
pub const DEFAULT_LIVENESS_INTERVAL: Duration = Duration::from_secs(2);
|
||||
|
||||
/// How often the liveness watcher re-probes worktrees for the blocked-work
|
||||
/// indicator (#83). Each probe costs three git subprocesses per session, so
|
||||
/// the pass rides the same tick as everything else but runs on a slower
|
||||
/// cadence: an indicator a few seconds stale still warns before the kill
|
||||
/// attempt, which is all #83 needs.
|
||||
pub const DEFAULT_BLOCKED_WORK_INTERVAL: Duration = Duration::from_secs(15);
|
||||
|
||||
/// Per-session daemon-local bookkeeping that complements the public `Session`.
|
||||
#[derive(Debug)]
|
||||
pub struct SessionRecord {
|
||||
@@ -492,6 +499,17 @@ impl SessionManager {
|
||||
/// `SessionManager` clone is dropped — call this once from the daemon
|
||||
/// startup path after [`Self::recover`] has populated the map.
|
||||
pub fn start_liveness_watcher(&self, interval: Duration) {
|
||||
self.start_liveness_watcher_with_blocked_work(interval, DEFAULT_BLOCKED_WORK_INTERVAL);
|
||||
}
|
||||
|
||||
/// [`Self::start_liveness_watcher`] with the blocked-work cadence (#83)
|
||||
/// made explicit. Tests pass a small `blocked_work_interval` to watch the
|
||||
/// probe actually happen.
|
||||
pub fn start_liveness_watcher_with_blocked_work(
|
||||
&self,
|
||||
interval: Duration,
|
||||
blocked_work_interval: Duration,
|
||||
) {
|
||||
let weak = Arc::downgrade(&self.inner);
|
||||
tokio::spawn(async move {
|
||||
let mut ticker = tokio::time::interval(interval);
|
||||
@@ -499,6 +517,9 @@ impl SessionManager {
|
||||
// first tick fires immediately — skip it so we don't reap before
|
||||
// the caller has a chance to create anything.
|
||||
ticker.tick().await;
|
||||
// Start "due" so the first live tick probes: a recovered daemon
|
||||
// should not wait a full interval to show what blocks.
|
||||
let mut since_probe = blocked_work_interval;
|
||||
loop {
|
||||
ticker.tick().await;
|
||||
let Some(inner) = weak.upgrade() else {
|
||||
@@ -508,6 +529,11 @@ impl SessionManager {
|
||||
// Same tick, no new timer (NAP-340): refresh activity for the
|
||||
// survivors and emit SessionUpdated on any transition.
|
||||
run_activity_pass(&inner).await;
|
||||
since_probe += interval;
|
||||
if since_probe >= blocked_work_interval {
|
||||
since_probe = Duration::ZERO;
|
||||
run_blocked_work_pass(&inner).await;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -813,6 +839,61 @@ async fn run_activity_pass(inner: &Arc<Inner>) {
|
||||
}
|
||||
}
|
||||
|
||||
/// Refresh each running session's blocked-work indicator (#83): what its
|
||||
/// worktree holds right now that would block an unforced kill. Rides the
|
||||
/// liveness tick on its own (slower) cadence — see
|
||||
/// [`DEFAULT_BLOCKED_WORK_INTERVAL`] — because every probe is three git
|
||||
/// subprocesses per session.
|
||||
///
|
||||
/// Sessions without a worktree are filtered out BEFORE any probe: they can
|
||||
/// never block a kill, so their indicator must cost nothing at all. A failed
|
||||
/// probe keeps the previous value rather than clearing it — a transient git
|
||||
/// error must not read as "nothing blocks". Like the activity pass, this only
|
||||
/// emits `SessionUpdated` when the value actually changed.
|
||||
async fn run_blocked_work_pass(inner: &Arc<Inner>) {
|
||||
let targets: Vec<(Uuid, (PathBuf, PathBuf))> = {
|
||||
let sessions = inner.sessions.lock().await;
|
||||
sessions
|
||||
.iter()
|
||||
.filter(|(_, r)| r.session.status == SessionStatus::Running)
|
||||
.filter_map(|(id, r)| {
|
||||
let wt = r.worktree_base_repo.clone().zip(r.worktree_path.clone())?;
|
||||
Some((*id, wt))
|
||||
})
|
||||
.collect()
|
||||
};
|
||||
if targets.is_empty() {
|
||||
return;
|
||||
}
|
||||
|
||||
for (id, wt) in targets {
|
||||
// The kill guard's own probe (#79), so the indicator can never
|
||||
// disagree with what a kill attempt would find.
|
||||
let breakdown = match probe_worktree(&wt).await {
|
||||
Ok(breakdown) => breakdown,
|
||||
Err(e) => {
|
||||
tracing::debug!(%id, error = ?e, "blocked-work: probe failed; keeping previous value");
|
||||
continue;
|
||||
}
|
||||
};
|
||||
let updated = {
|
||||
let mut sessions = inner.sessions.lock().await;
|
||||
let Some(rec) = sessions.get_mut(&id) else {
|
||||
continue;
|
||||
};
|
||||
if rec.session.blocked_work == Some(breakdown) {
|
||||
None
|
||||
} else {
|
||||
rec.session.blocked_work = Some(breakdown);
|
||||
Some(rec.session.clone())
|
||||
}
|
||||
};
|
||||
if let Some(session) = updated {
|
||||
let _ = inner.events.send(CatalogEvent::SessionUpdated { session });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Mark a session whose tmux session has disappeared as [`SessionStatus::Dead`]
|
||||
/// and settle its worktree per the natural-exit rule (#82).
|
||||
///
|
||||
@@ -856,10 +937,13 @@ async fn mark_session_dead(inner: &Arc<Inner>, id: Uuid) {
|
||||
|
||||
if let Some(wt) = &worktree {
|
||||
if settle_worktree_on_exit(inner, id, wt, branch).await {
|
||||
session.worktree = None;
|
||||
// The tree is settled (removed or retained); a stale "in the
|
||||
// way" would describe something the session no longer holds.
|
||||
session.blocked_work = None;
|
||||
let mut sessions = inner.sessions.lock().await;
|
||||
if let Some(record) = sessions.get_mut(&id) {
|
||||
record.session.worktree = None;
|
||||
record.session.blocked_work = None;
|
||||
record.worktree_path = None;
|
||||
record.worktree_base_repo = None;
|
||||
record.worktree_branch = None;
|
||||
|
||||
Reference in New Issue
Block a user