feat(maestro): show blocked work in the CLI table and warn on kill (#83)
This commit is contained in:
@@ -62,6 +62,11 @@ pub async fn dispatch(
|
||||
run_attach_url(&daemon.attach_url(args.session_id)?, detach).await?;
|
||||
}
|
||||
Command::Kill(args) => {
|
||||
// #83: warn BEFORE the attempt, so the refusal is not a surprise.
|
||||
// Best-effort: an unreachable list must not block the kill.
|
||||
if !args.force {
|
||||
warn_if_blocked(&daemon, args.session_id).await;
|
||||
}
|
||||
let outcome = run_kill(&daemon, &args).await?;
|
||||
println!("killed {}", args.session_id);
|
||||
if let Some(w) = outcome.retained {
|
||||
@@ -99,6 +104,25 @@ pub async fn dispatch(
|
||||
/// Default detach byte, matching `maestro attach --detach-key`'s `^q`.
|
||||
const CTRL_Q: u8 = 0x11;
|
||||
|
||||
/// #83: say "this will be refused" before the operator commits to it, in the
|
||||
/// same words [`maestro_protocol::InTheWay`] uses everywhere else.
|
||||
async fn warn_if_blocked(daemon: &DaemonClient, id: uuid::Uuid) {
|
||||
let Ok(sessions) = daemon.list_sessions().await else {
|
||||
return;
|
||||
};
|
||||
if let Some(b) = sessions
|
||||
.iter()
|
||||
.find(|s| s.id == id)
|
||||
.and_then(|s| s.blocked_work)
|
||||
{
|
||||
if !b.is_clear() {
|
||||
eprintln!(
|
||||
"warning: this kill will be refused — the session's worktree holds unsaved work ({b}); use --force to retain it"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// HTTP client pointed at the daemon's API. That surface needs no auth —
|
||||
/// reaching `bind_addr` is the authorization.
|
||||
#[allow(clippy::result_large_err)]
|
||||
|
||||
Reference in New Issue
Block a user