Merge branch 'flugelhorn'
This commit is contained in:
@@ -601,9 +601,27 @@ impl App {
|
||||
Some(None)
|
||||
}
|
||||
|
||||
/// Put the spawn form up with a fresh draft behind it.
|
||||
/// Put the spawn form up with a fresh draft behind it, preselecting the
|
||||
/// project of the session the operator was last on — so `n` then Enter
|
||||
/// spawns another session there, the way "spawn similar" would. A
|
||||
/// worktree session seeds its *base repository*, not its checkout: the
|
||||
/// daemon never adopts an existing worktree (docs/WORKTREES.md), same
|
||||
/// rule as web/src/spawnSimilar.ts.
|
||||
fn open_spawn_modal(&mut self) {
|
||||
self.draft = Some(DraftPane::default());
|
||||
let seed_cwd = self.state.active_session().and_then(|sid| {
|
||||
self.catalog
|
||||
.snapshot()
|
||||
.sessions
|
||||
.iter()
|
||||
.find(|s| s.id == sid)
|
||||
.map(|s| match &s.worktree {
|
||||
Some(wt) => wt.base_repo.clone(),
|
||||
None => s.cwd.clone(),
|
||||
})
|
||||
});
|
||||
let mut draft = DraftPane::default();
|
||||
draft.seed_cwd = seed_cwd;
|
||||
self.draft = Some(draft);
|
||||
self.state.open_spawn_modal();
|
||||
}
|
||||
|
||||
@@ -860,6 +878,9 @@ impl App {
|
||||
return;
|
||||
};
|
||||
draft.home_dir = home_dir;
|
||||
// The fast path resolved its own project; its pick wins over the
|
||||
// focused session's, so the seed never lands on top of it.
|
||||
draft.seed_cwd = None;
|
||||
if !presets.is_empty() {
|
||||
draft.set_presets(presets);
|
||||
}
|
||||
@@ -1676,6 +1697,41 @@ mod tests {
|
||||
assert_eq!(draft.command(), "claude");
|
||||
}
|
||||
|
||||
/// Opening the form preselects the project of the session in the pane, so
|
||||
/// `n` then Enter spawns another session there.
|
||||
#[test]
|
||||
fn opening_the_spawn_modal_seeds_the_focused_sessions_project() {
|
||||
use maestro_protocol::{CatalogEvent, SessionWorktree};
|
||||
|
||||
let sid = Uuid::from_u128(21);
|
||||
let mut app = make_app();
|
||||
app.catalog.apply_event(CatalogEvent::Snapshot {
|
||||
sessions: vec![test_session(sid, "/repos/maestro")],
|
||||
});
|
||||
app.state.attach_to_focused(sid);
|
||||
app.dispatch(Action::OpenSpawnModal);
|
||||
assert_eq!(
|
||||
app.draft.as_ref().unwrap().seed_cwd.as_deref(),
|
||||
Some(std::path::Path::new("/repos/maestro"))
|
||||
);
|
||||
|
||||
// A worktree session seeds its base repository: the daemon never
|
||||
// adopts an existing worktree (docs/WORKTREES.md).
|
||||
let mut wt_session = test_session(sid, "/repos/maestro/worktrees/flugelhorn");
|
||||
wt_session.worktree = Some(SessionWorktree {
|
||||
base_repo: "/repos/maestro".into(),
|
||||
path: "/repos/maestro/worktrees/flugelhorn".into(),
|
||||
});
|
||||
app.catalog.apply_event(CatalogEvent::Snapshot {
|
||||
sessions: vec![wt_session],
|
||||
});
|
||||
app.dispatch(Action::OpenSpawnModal);
|
||||
assert_eq!(
|
||||
app.draft.as_ref().unwrap().seed_cwd.as_deref(),
|
||||
Some(std::path::Path::new("/repos/maestro"))
|
||||
);
|
||||
}
|
||||
|
||||
/// A valid form flows through: pick a project (set directly — the picker
|
||||
/// itself is covered in `draft.rs`), select the custom tile, type a
|
||||
/// command, then submit from the Spawn row.
|
||||
@@ -1689,11 +1745,11 @@ mod tests {
|
||||
draft.base_repo = Some(std::path::PathBuf::from("/srv/work"));
|
||||
draft.probed_cwd = Some(std::path::PathBuf::from("/srv/work"));
|
||||
draft.selected_preset = draft.presets.len() - 1; // custom
|
||||
app.handle_draft_input(&InputKey::Tab); // preset → custom command
|
||||
app.handle_draft_input(&InputKey::Tab); // dir picker → preset
|
||||
app.handle_draft_input(&InputKey::Tab); // → custom command
|
||||
for c in "claude".chars() {
|
||||
app.handle_draft_input(&InputKey::char(c));
|
||||
}
|
||||
app.handle_draft_input(&InputKey::Tab); // → dir picker
|
||||
app.handle_draft_input(&InputKey::Tab); // → name
|
||||
for c in "crimson-otter".chars() {
|
||||
app.handle_draft_input(&InputKey::char(c));
|
||||
|
||||
+131
-49
@@ -221,6 +221,11 @@ pub struct DraftPane {
|
||||
pub cwd_raw_visible: bool,
|
||||
pub cwd_raw: crate::text_input::TextInput,
|
||||
pub picked_cwd: Option<PathBuf>,
|
||||
/// Directory to preselect once the project scan lands — the project of
|
||||
/// the session the operator was last looking at, so `n` then Enter
|
||||
/// respawns there without touching the picker. Consumed by the first
|
||||
/// [`Self::set_projects`]; `None` once applied or when nothing seeded it.
|
||||
pub seed_cwd: Option<PathBuf>,
|
||||
/// The repository picked in step one ([`group_key`] of its main box),
|
||||
/// `None` until a box is picked. Looked up fresh in `groups` rather than
|
||||
/// cached, so a project-list refresh can't leave it stale.
|
||||
@@ -293,6 +298,7 @@ impl Default for DraftPane {
|
||||
cwd_raw_visible: false,
|
||||
cwd_raw: crate::text_input::TextInput::default(),
|
||||
picked_cwd: None,
|
||||
seed_cwd: None,
|
||||
selected_group_key: None,
|
||||
worktree_choice: WorktreeChoice::New,
|
||||
name: crate::text_input::TextInput::default(),
|
||||
@@ -315,7 +321,9 @@ impl Default for DraftPane {
|
||||
branches_for: None,
|
||||
needs_branches: false,
|
||||
error: None,
|
||||
focused_field: DraftField::Preset,
|
||||
// The picker owns the keyboard on open: typing filters projects
|
||||
// straight away, and Tab from here reaches the command tiles.
|
||||
focused_field: DraftField::DirPicker,
|
||||
home_dir: String::new(),
|
||||
}
|
||||
}
|
||||
@@ -358,6 +366,26 @@ impl DraftPane {
|
||||
})
|
||||
.collect();
|
||||
self.highlighted = self.highlighted.min(self.entry_count().saturating_sub(1));
|
||||
self.apply_seed_cwd();
|
||||
}
|
||||
|
||||
/// Preselect the seeded directory now that the scan has landed: highlight
|
||||
/// its repository box and pick it, so Enter from the untouched picker
|
||||
/// spawns there. A seed no box matches is dropped — the operator picks by
|
||||
/// hand, exactly as before.
|
||||
fn apply_seed_cwd(&mut self) {
|
||||
let Some(seed) = self.seed_cwd.take() else {
|
||||
return;
|
||||
};
|
||||
let hit = self.visible_groups().iter().enumerate().find_map(|(i, g)| {
|
||||
let matches = g.main.path == seed || g.worktrees.iter().any(|w| w.project.path == seed);
|
||||
matches.then(|| (i, (*g).clone()))
|
||||
});
|
||||
let Some((index, group)) = hit else {
|
||||
return;
|
||||
};
|
||||
self.highlighted = index;
|
||||
self.select_group(&group);
|
||||
}
|
||||
|
||||
/// Fill the local name batch from `GET /api/names`, seeding the field
|
||||
@@ -705,14 +733,14 @@ impl DraftPane {
|
||||
}
|
||||
|
||||
fn field_order(&self) -> Vec<DraftField> {
|
||||
let mut order = vec![DraftField::Preset];
|
||||
if self.is_custom() {
|
||||
order.push(DraftField::CustomCommand);
|
||||
}
|
||||
order.push(DraftField::DirPicker);
|
||||
let mut order = vec![DraftField::DirPicker];
|
||||
if self.cwd_raw_visible {
|
||||
order.push(DraftField::CwdRaw);
|
||||
}
|
||||
order.push(DraftField::Preset);
|
||||
if self.is_custom() {
|
||||
order.push(DraftField::CustomCommand);
|
||||
}
|
||||
order.push(DraftField::Name);
|
||||
order.push(DraftField::Advanced);
|
||||
if !self.advanced_collapsed {
|
||||
@@ -1116,15 +1144,17 @@ impl DraftPane {
|
||||
+ u16::from(self.error.is_some());
|
||||
let list_capacity = (inner.height.saturating_sub(fixed)).max(1) as usize;
|
||||
|
||||
let mut constraints = vec![Constraint::Length(1)];
|
||||
if show_custom {
|
||||
constraints.push(Constraint::Length(1));
|
||||
}
|
||||
constraints.push(Constraint::Length(1));
|
||||
// The picker leads the form: it is where focus lands on open, and Tab
|
||||
// walks down from it into the command tiles.
|
||||
let mut constraints = vec![Constraint::Length(1)]; // dir filter
|
||||
constraints.push(Constraint::Length(list_capacity as u16));
|
||||
if show_raw {
|
||||
constraints.push(Constraint::Length(1));
|
||||
}
|
||||
constraints.push(Constraint::Length(1)); // command tiles
|
||||
if show_custom {
|
||||
constraints.push(Constraint::Length(1));
|
||||
}
|
||||
constraints.push(Constraint::Length(1)); // name
|
||||
constraints.push(Constraint::Length(1)); // advanced header
|
||||
if show_wt_choice {
|
||||
@@ -1163,36 +1193,6 @@ impl DraftPane {
|
||||
// Tracks where the terminal cursor belongs for the focused text field.
|
||||
let mut cursor: Option<(u16, u16)> = None;
|
||||
|
||||
// -- command presets ---------------------------------------------------
|
||||
let tiles_row = next_row();
|
||||
let mut tiles = vec![Span::raw(format!("{:<GUTTER$}", "cmd:"))];
|
||||
for (i, preset) in self.presets.iter().enumerate() {
|
||||
if i > 0 {
|
||||
tiles.push(Span::raw(" "));
|
||||
}
|
||||
let mut style = Style::default();
|
||||
if i == self.selected_preset {
|
||||
style = style.add_modifier(Modifier::REVERSED);
|
||||
}
|
||||
tiles.push(Span::styled(format!("[{}]", preset.label), style));
|
||||
}
|
||||
f.render_widget(Paragraph::new(Line::from(tiles)), tiles_row);
|
||||
|
||||
// -- custom command (only while a custom tile is selected) -------------
|
||||
if show_custom {
|
||||
let row = next_row();
|
||||
draw_gutter(f, row, "");
|
||||
let col = draw_text_field(
|
||||
f,
|
||||
&self.custom_command,
|
||||
row,
|
||||
field_style(DraftField::CustomCommand),
|
||||
);
|
||||
if self.focused_field == DraftField::CustomCommand {
|
||||
cursor = Some((col, row.y));
|
||||
}
|
||||
}
|
||||
|
||||
// -- directory picker ----------------------------------------------------
|
||||
let filter_row = next_row();
|
||||
draw_gutter(f, filter_row, "dir:");
|
||||
@@ -1280,6 +1280,36 @@ impl DraftPane {
|
||||
}
|
||||
}
|
||||
|
||||
// -- command presets ---------------------------------------------------
|
||||
let tiles_row = next_row();
|
||||
let mut tiles = vec![Span::raw(format!("{:<GUTTER$}", "cmd:"))];
|
||||
for (i, preset) in self.presets.iter().enumerate() {
|
||||
if i > 0 {
|
||||
tiles.push(Span::raw(" "));
|
||||
}
|
||||
let mut style = Style::default();
|
||||
if i == self.selected_preset {
|
||||
style = style.add_modifier(Modifier::REVERSED);
|
||||
}
|
||||
tiles.push(Span::styled(format!("[{}]", preset.label), style));
|
||||
}
|
||||
f.render_widget(Paragraph::new(Line::from(tiles)), tiles_row);
|
||||
|
||||
// -- custom command (only while a custom tile is selected) -------------
|
||||
if show_custom {
|
||||
let row = next_row();
|
||||
draw_gutter(f, row, "");
|
||||
let col = draw_text_field(
|
||||
f,
|
||||
&self.custom_command,
|
||||
row,
|
||||
field_style(DraftField::CustomCommand),
|
||||
);
|
||||
if self.focused_field == DraftField::CustomCommand {
|
||||
cursor = Some((col, row.y));
|
||||
}
|
||||
}
|
||||
|
||||
// -- name + reroll ---------------------------------------------------------
|
||||
let name_row = next_row();
|
||||
draw_gutter(f, name_row, "name:");
|
||||
@@ -1681,7 +1711,10 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn left_right_cycles_presets_wrapping_into_custom() {
|
||||
let mut draft = DraftPane::default();
|
||||
let mut draft = DraftPane {
|
||||
focused_field: DraftField::Preset,
|
||||
..DraftPane::default()
|
||||
};
|
||||
draft.on_input(&InputKey::Right);
|
||||
assert_eq!(draft.command(), "opencode");
|
||||
draft.on_input(&InputKey::Left);
|
||||
@@ -1704,17 +1737,22 @@ mod tests {
|
||||
draft.selected_preset = draft.presets.len() - 1;
|
||||
assert!(draft.is_custom());
|
||||
assert_eq!(
|
||||
draft.field_order()[..2],
|
||||
[DraftField::Preset, DraftField::CustomCommand],
|
||||
"custom command sits between presets and the dir picker"
|
||||
draft.field_order()[..3],
|
||||
[
|
||||
DraftField::DirPicker,
|
||||
DraftField::Preset,
|
||||
DraftField::CustomCommand
|
||||
],
|
||||
"the picker leads; custom command sits right after the tiles"
|
||||
);
|
||||
draft.next_field(); // DirPicker → Preset
|
||||
draft.next_field();
|
||||
assert_eq!(draft.focused_field, DraftField::CustomCommand);
|
||||
typed(&mut draft, "bash -l");
|
||||
assert_eq!(draft.command(), "bash -l");
|
||||
// Tab walks past the hidden fields in order.
|
||||
draft.next_field();
|
||||
assert_eq!(draft.focused_field, DraftField::DirPicker);
|
||||
assert_eq!(draft.focused_field, DraftField::Name);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -1777,8 +1815,11 @@ mod tests {
|
||||
],
|
||||
Utc::now(),
|
||||
);
|
||||
draft.next_field(); // Preset → DirPicker
|
||||
assert_eq!(draft.focused_field, DraftField::DirPicker);
|
||||
assert_eq!(
|
||||
draft.focused_field,
|
||||
DraftField::DirPicker,
|
||||
"the form opens with the project filter focused"
|
||||
);
|
||||
typed(&mut draft, "maes");
|
||||
assert_eq!(
|
||||
draft.visible_groups().len(),
|
||||
@@ -1890,6 +1931,47 @@ mod tests {
|
||||
assert_eq!(draft.on_input(&InputKey::Enter), DraftInputResult::Submit);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_seeded_directory_is_preselected_so_one_enter_spawns_there() {
|
||||
let mut draft = DraftPane {
|
||||
seed_cwd: Some(PathBuf::from("/repos/other")),
|
||||
..DraftPane::default()
|
||||
};
|
||||
draft.set_projects(
|
||||
vec![
|
||||
project("maestro", "/repos/maestro", 1, Some("claude")),
|
||||
project("other", "/repos/other", 2, Some("zsh")),
|
||||
],
|
||||
Utc::now(),
|
||||
);
|
||||
assert_eq!(
|
||||
draft.picked_cwd.as_deref(),
|
||||
Some(Path::new("/repos/other")),
|
||||
"the seeded project is picked before a key is pressed"
|
||||
);
|
||||
assert_eq!(draft.selection(), 1, "and its row is the highlighted one");
|
||||
assert_eq!(
|
||||
draft.on_input(&InputKey::Enter),
|
||||
DraftInputResult::Submit,
|
||||
"one Enter spawns in the seeded project"
|
||||
);
|
||||
assert_eq!(draft.picked_cwd.as_deref(), Some(Path::new("/repos/other")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_seed_no_project_matches_leaves_the_picker_untouched() {
|
||||
let mut draft = DraftPane {
|
||||
seed_cwd: Some(PathBuf::from("/gone")),
|
||||
..DraftPane::default()
|
||||
};
|
||||
draft.set_projects(
|
||||
vec![project("maestro", "/repos/maestro", 1, None)],
|
||||
Utc::now(),
|
||||
);
|
||||
assert_eq!(draft.picked_cwd, None);
|
||||
assert_eq!(draft.selection(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn dir_picker_enter_on_other_directory_never_submits_directly_97() {
|
||||
let mut draft = DraftPane::default();
|
||||
@@ -2140,7 +2222,7 @@ mod tests {
|
||||
let mut terminal = Terminal::new(backend).unwrap();
|
||||
terminal.draw(|f| draft.render(f, f.area(), true)).unwrap();
|
||||
let pos = terminal.get_cursor_position().unwrap();
|
||||
assert_eq!(pos, ratatui::layout::Position::new(GUTTER as u16 + 2, 1));
|
||||
assert_eq!(pos, ratatui::layout::Position::new(GUTTER as u16 + 2, 0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
Reference in New Issue
Block a user