fix(maestro): fifth-review findings, incl. the guarded-worktree dead end
The cleanup guard plus deterministic paths had created a trap: one untracked file an agent left behind — a log, a .env, a stray artifact — made the guard refuse removal, the directory stayed, and every later spawn of that branch hit PathExists. The branch was burned permanently and the product offered no way to clear it. A leftover tree registered for the same branch is now adopted, so the operator lands back in their own unsaved work. A tree a *live* session holds is still rejected, since two sessions must not share a checkout. Also: - Fast-forward still awaited /api/info, /api/projects and /api/names inline, the exact freeze the draft loaders were restructured to avoid. It posts to the same channel now. - Draft updates were routed by tab index, which shifts when a tab closes: an in-flight load could be dropped or land on the wrong pane. Drafts carry an id and are found by it. - extend_names left the name it had just displayed at the head of the queue, so the next reroll produced it again and the key looked dead. - The fast-forward fallback discarded info.home_dir, so its draft showed unabbreviated paths and seeded "Other directory…" with / — disagreeing with the normal draft entry point. - Web fast-forward mounted via openSession, which replaces the focused pane: pressing it while attached evicted that session from the layout. It reuses an empty pane or splits, as the TUI does. - branchEdited was inferred from the seeded branch value, but in "new" mode that value is the auto-synced session name — so any form rebuild froze the branch against later rerolls. - resolveBaseRepo ignored the worktree checkbox, rebuilding the fieldset expanded under an unticked box and probing gitroot for a worktree the operator had turned off. - short_hash used DefaultHasher, whose algorithm is not stable across Rust releases, in a directory name — a toolchain bump would orphan every worktree under the override root. Now FNV-1a.
This commit is contained in:
+114
-44
@@ -219,7 +219,7 @@ impl App {
|
||||
Effect::Spawn(req) => self.submit_spawn(req).await,
|
||||
Effect::Kill(id) => self.submit_kill(id).await,
|
||||
Effect::LoadDraft(tab_idx) => self.spawn_load_draft(tab_idx),
|
||||
Effect::FastForward => self.fast_forward_spawn().await,
|
||||
Effect::FastForward => self.spawn_fast_forward(),
|
||||
Effect::RefillNames(tab_idx) => self.spawn_refill_names(tab_idx),
|
||||
Effect::ProbeGitRoot { tab, seq, path } => {
|
||||
self.spawn_probe_git_root(tab, seq, path)
|
||||
@@ -395,43 +395,21 @@ impl App {
|
||||
effects
|
||||
}
|
||||
|
||||
/// One `/api/names` batch. [`DaemonClient`] has no typed call for this
|
||||
/// route yet, so it goes through plain reqwest against the same base URL
|
||||
/// and query contract (`routes::NAMES` + `routes::COUNT_QUERY`).
|
||||
async fn fetch_names(&self, count: usize) -> Vec<String> {
|
||||
let url = format!(
|
||||
"{}{}",
|
||||
maestro_protocol::routes::normalize_base(self.daemon.base()),
|
||||
routes::NAMES
|
||||
);
|
||||
match self
|
||||
.http
|
||||
.get(url)
|
||||
.query(&[(routes::COUNT_QUERY, count)])
|
||||
.send()
|
||||
.await
|
||||
{
|
||||
Ok(resp) => resp
|
||||
.json::<NameBatch>()
|
||||
.await
|
||||
.map(|batch| batch.names)
|
||||
.unwrap_or_default(),
|
||||
Err(_) => Vec::new(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Populate a freshly opened draft: presets from `/api/info` (falling back
|
||||
/// to the built-ins already in place), projects from `/api/projects`, and
|
||||
/// a first name batch. Applies only if that tab still shows the draft —
|
||||
/// a slow response must never clobber what replaced it.
|
||||
/// Kick off the draft's initial data load without blocking the loop.
|
||||
fn spawn_load_draft(&self, tab: usize) {
|
||||
let Some(draft) = self.draft_id(tab) else {
|
||||
return;
|
||||
};
|
||||
let (daemon, http, base, tx) = self.loader_handles();
|
||||
tokio::spawn(async move {
|
||||
let (info, projects) = tokio::join!(daemon.daemon_info(), daemon.list_projects());
|
||||
let names = fetch_names(&http, &base, crate::draft::NAME_BATCH_SIZE).await;
|
||||
let _ = tx.send(DraftUpdate::Data {
|
||||
tab,
|
||||
draft,
|
||||
info: info.ok(),
|
||||
projects: projects.ok(),
|
||||
names,
|
||||
@@ -440,14 +418,20 @@ impl App {
|
||||
}
|
||||
|
||||
fn spawn_refill_names(&self, tab: usize) {
|
||||
let Some(draft) = self.draft_id(tab) else {
|
||||
return;
|
||||
};
|
||||
let (_, http, base, tx) = self.loader_handles();
|
||||
tokio::spawn(async move {
|
||||
let names = fetch_names(&http, &base, crate::draft::NAME_BATCH_SIZE).await;
|
||||
let _ = tx.send(DraftUpdate::Names { tab, names });
|
||||
let _ = tx.send(DraftUpdate::Names { draft, names });
|
||||
});
|
||||
}
|
||||
|
||||
fn spawn_probe_git_root(&self, tab: usize, seq: u32, path: PathBuf) {
|
||||
let Some(draft) = self.draft_id(tab) else {
|
||||
return;
|
||||
};
|
||||
let (daemon, _, _, tx) = self.loader_handles();
|
||||
tokio::spawn(async move {
|
||||
let root = daemon
|
||||
@@ -455,11 +439,14 @@ impl App {
|
||||
.await
|
||||
.ok()
|
||||
.and_then(|g| g.root);
|
||||
let _ = tx.send(DraftUpdate::GitRoot { tab, seq, root });
|
||||
let _ = tx.send(DraftUpdate::GitRoot { draft, seq, root });
|
||||
});
|
||||
}
|
||||
|
||||
fn spawn_load_branches(&self, tab: usize) {
|
||||
let Some(draft) = self.draft_id(tab) else {
|
||||
return;
|
||||
};
|
||||
let Some(cwd) = self
|
||||
.state
|
||||
.tabs
|
||||
@@ -475,10 +462,22 @@ impl App {
|
||||
let (_, http, base, tx) = self.loader_handles();
|
||||
tokio::spawn(async move {
|
||||
let branches = fetch_branches(&http, &base, &cwd).await;
|
||||
let _ = tx.send(DraftUpdate::Branches { tab, cwd, branches });
|
||||
let _ = tx.send(DraftUpdate::Branches {
|
||||
draft,
|
||||
cwd,
|
||||
branches,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/// The draft pane living in `tab`, by identity.
|
||||
fn draft_id(&self, tab: usize) -> Option<u64> {
|
||||
match self.state.tabs.get(tab).and_then(|t| t.pane.as_ref()) {
|
||||
Some(PaneRef::Draft(d)) => Some(d.id),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
fn loader_handles(
|
||||
&self,
|
||||
) -> (
|
||||
@@ -497,11 +496,34 @@ impl App {
|
||||
|
||||
/// Fold a finished background load into the draft that asked for it.
|
||||
async fn apply_draft_update(&mut self, update: DraftUpdate) {
|
||||
let tab_idx = match &update {
|
||||
DraftUpdate::Data { tab, .. }
|
||||
| DraftUpdate::Names { tab, .. }
|
||||
| DraftUpdate::GitRoot { tab, .. }
|
||||
| DraftUpdate::Branches { tab, .. } => *tab,
|
||||
if let DraftUpdate::FastForward {
|
||||
info,
|
||||
projects,
|
||||
names,
|
||||
} = update
|
||||
{
|
||||
self.fast_forward_spawn(info, projects, names).await;
|
||||
return;
|
||||
}
|
||||
let want = match &update {
|
||||
DraftUpdate::Data { draft, .. }
|
||||
| DraftUpdate::Names { draft, .. }
|
||||
| DraftUpdate::GitRoot { draft, .. }
|
||||
| DraftUpdate::Branches { draft, .. } => *draft,
|
||||
// Handled above; it targets no particular draft.
|
||||
DraftUpdate::FastForward { .. } => unreachable!(),
|
||||
};
|
||||
// Find it by identity: closing a tab shifts every index to its right,
|
||||
// so an in-flight load addressed by index would be dropped or land on
|
||||
// whatever pane inherited the slot (#67 review).
|
||||
let Some(tab_idx) = self
|
||||
.state
|
||||
.tabs
|
||||
.iter()
|
||||
.position(|t| matches!(&t.pane, Some(PaneRef::Draft(d)) if d.id == want))
|
||||
else {
|
||||
// The draft went away while the request was in flight.
|
||||
return;
|
||||
};
|
||||
let Some(PaneRef::Draft(draft)) = self
|
||||
.state
|
||||
@@ -509,7 +531,6 @@ impl App {
|
||||
.get_mut(tab_idx)
|
||||
.and_then(|t| t.pane.as_mut())
|
||||
else {
|
||||
// The pane went away while the request was in flight.
|
||||
return;
|
||||
};
|
||||
let mut follow_up_branches = false;
|
||||
@@ -545,6 +566,7 @@ impl App {
|
||||
DraftUpdate::Branches { cwd, branches, .. } => {
|
||||
draft.set_branches(&cwd, branches);
|
||||
}
|
||||
DraftUpdate::FastForward { .. } => unreachable!(),
|
||||
}
|
||||
if follow_up_branches {
|
||||
self.spawn_load_branches(tab_idx);
|
||||
@@ -557,11 +579,38 @@ impl App {
|
||||
/// branch named after that name. Anything unresolvable — no projects
|
||||
/// known yet, no command, no name — downgrades to a draft pane seeded
|
||||
/// with whatever did resolve.
|
||||
async fn fast_forward_spawn(&mut self) {
|
||||
let (info, projects) = tokio::join!(self.daemon.daemon_info(), self.daemon.list_projects());
|
||||
let names = self.fetch_names(crate::draft::NAME_BATCH_SIZE).await;
|
||||
/// Load what the fast path needs without blocking the loop — the same
|
||||
/// reason the draft loaders were moved off it (#67 review): a cold
|
||||
/// `/api/projects` walks all of `$HOME`, and pressing the key must not
|
||||
/// freeze keys, frames and attached panes until it returns.
|
||||
fn spawn_fast_forward(&self) {
|
||||
let (daemon, http, base, tx) = self.loader_handles();
|
||||
tokio::spawn(async move {
|
||||
let (info, projects) = tokio::join!(daemon.daemon_info(), daemon.list_projects());
|
||||
let names = fetch_names(&http, &base, crate::draft::NAME_BATCH_SIZE).await;
|
||||
let _ = tx.send(DraftUpdate::FastForward {
|
||||
info: info.ok(),
|
||||
projects: projects.ok(),
|
||||
names,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async fn fast_forward_spawn(
|
||||
&mut self,
|
||||
info: Option<maestro_protocol::DaemonInfo>,
|
||||
projects: Option<Vec<maestro_protocol::Project>>,
|
||||
names: Vec<String>,
|
||||
) {
|
||||
// Keep the home dir: without it the pre-filled draft renders
|
||||
// unabbreviated paths and "Other directory…" seeds `/` instead of
|
||||
// home, so the two draft entry points disagreed (#67 review).
|
||||
let home_dir = info
|
||||
.as_ref()
|
||||
.map(|i| i.home_dir.clone())
|
||||
.unwrap_or_default();
|
||||
let presets = match info {
|
||||
Ok(info) if !info.presets.is_empty() => info.presets,
|
||||
Some(info) if !info.presets.is_empty() => info.presets,
|
||||
_ => Vec::new(),
|
||||
};
|
||||
let discovered = projects.unwrap_or_default();
|
||||
@@ -581,6 +630,7 @@ impl App {
|
||||
let Some(PaneRef::Draft(draft)) = self.state.active_tab_mut().pane.as_mut() else {
|
||||
return;
|
||||
};
|
||||
draft.home_dir = home_dir;
|
||||
if !presets.is_empty() {
|
||||
draft.set_presets(presets);
|
||||
}
|
||||
@@ -782,25 +832,31 @@ fn render_help_lines(cfg: &TuiConfig) -> Vec<String> {
|
||||
#[derive(Debug)]
|
||||
enum DraftUpdate {
|
||||
Data {
|
||||
tab: usize,
|
||||
draft: u64,
|
||||
info: Option<maestro_protocol::DaemonInfo>,
|
||||
projects: Option<Vec<maestro_protocol::Project>>,
|
||||
names: Vec<String>,
|
||||
},
|
||||
Names {
|
||||
tab: usize,
|
||||
draft: u64,
|
||||
names: Vec<String>,
|
||||
},
|
||||
GitRoot {
|
||||
tab: usize,
|
||||
draft: u64,
|
||||
seq: u32,
|
||||
root: Option<PathBuf>,
|
||||
},
|
||||
Branches {
|
||||
tab: usize,
|
||||
draft: u64,
|
||||
cwd: PathBuf,
|
||||
branches: Vec<BranchInfo>,
|
||||
},
|
||||
/// A fast-forward's data arrived; resolution and spawn happen on the loop.
|
||||
FastForward {
|
||||
info: Option<maestro_protocol::DaemonInfo>,
|
||||
projects: Option<Vec<maestro_protocol::Project>>,
|
||||
names: Vec<String>,
|
||||
},
|
||||
}
|
||||
|
||||
/// `GET /api/names?count=N`. Free function: the spawned loaders have no `self`.
|
||||
@@ -1062,7 +1118,14 @@ mod tests {
|
||||
|
||||
let mut app = make_app_at(&base);
|
||||
let effects = app.dispatch(Action::FastForwardSpawn);
|
||||
// The fast path loads off the event loop now; the run loop drains the
|
||||
// channel, so do that by hand.
|
||||
app.perform(effects).await;
|
||||
let update = tokio::time::timeout(Duration::from_secs(5), app.draft_rx.recv())
|
||||
.await
|
||||
.expect("load completed")
|
||||
.expect("channel open");
|
||||
app.apply_draft_update(update).await;
|
||||
|
||||
let posts = posted.lock().unwrap();
|
||||
assert_eq!(posts.len(), 1, "one immediate POST, no form shown");
|
||||
@@ -1106,7 +1169,14 @@ mod tests {
|
||||
|
||||
let mut app = make_app_at(&base);
|
||||
let effects = app.dispatch(Action::FastForwardSpawn);
|
||||
// The fast path loads off the event loop now; the run loop drains the
|
||||
// channel, so do that by hand.
|
||||
app.perform(effects).await;
|
||||
let update = tokio::time::timeout(Duration::from_secs(5), app.draft_rx.recv())
|
||||
.await
|
||||
.expect("load completed")
|
||||
.expect("channel open");
|
||||
app.apply_draft_update(update).await;
|
||||
|
||||
assert!(
|
||||
matches!(app.state.active_tab().pane, Some(PaneRef::Draft(_))),
|
||||
|
||||
@@ -114,6 +114,11 @@ pub enum DraftInputResult {
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub struct DraftPane {
|
||||
/// Identity for routing async load results back to *this* draft.
|
||||
///
|
||||
/// Tab indices shift when a tab closes, so an in-flight load addressed by
|
||||
/// index could be dropped or land on the wrong pane (#67 review).
|
||||
pub id: u64,
|
||||
/// Includes the implicit custom tile (empty `command`) last.
|
||||
pub presets: Vec<SpawnPreset>,
|
||||
pub selected_preset: usize,
|
||||
@@ -164,6 +169,9 @@ pub struct DraftPane {
|
||||
pub home_dir: String,
|
||||
}
|
||||
|
||||
/// Source of [`DraftPane::id`].
|
||||
static NEXT_DRAFT_ID: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1);
|
||||
|
||||
impl Default for DraftPane {
|
||||
fn default() -> Self {
|
||||
// Built-ins until `/api/info` answers — the form must be usable even
|
||||
@@ -171,6 +179,7 @@ impl Default for DraftPane {
|
||||
let mut presets = builtin_presets();
|
||||
presets.push(custom_preset());
|
||||
Self {
|
||||
id: NEXT_DRAFT_ID.fetch_add(1, std::sync::atomic::Ordering::Relaxed),
|
||||
presets,
|
||||
selected_preset: 0,
|
||||
custom_command: crate::text_input::TextInput::default(),
|
||||
@@ -256,10 +265,16 @@ impl DraftPane {
|
||||
|
||||
/// Append a refill batch; the first name replaces the field (this only
|
||||
/// happens after an explicit reroll on an empty batch).
|
||||
pub fn extend_names(&mut self, names: Vec<String>) {
|
||||
if let Some(first) = names.first() {
|
||||
self.set_name(first.clone());
|
||||
///
|
||||
/// The shown name is *consumed*, not left at the head — queueing it too
|
||||
/// made the next reroll produce the same name and the key look dead
|
||||
/// (#67 review).
|
||||
pub fn extend_names(&mut self, mut names: Vec<String>) {
|
||||
if names.is_empty() {
|
||||
return;
|
||||
}
|
||||
let first = names.remove(0);
|
||||
self.set_name(first);
|
||||
self.name_queue.extend(names);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user