A dormant session comes back under the same uuid and sidecar, so its
name, created_at, env and worktree ownership survive; only the tmux
session and the PTY bridge are new. The command is the matching preset's
resume_command with {agent_session} filled in, falling back to the
command the session was spawned with.
Refused with 409 for a session that is already running or whose cwd is
gone. Attaching to a session with no bridge now answers 409
not_attachable instead of 404 unknown_session, so a client can tell a
resumable session from one that does not exist.
100 lines
3.3 KiB
Rust
100 lines
3.3 KiB
Rust
//! Choosing the command a resumed session comes back on (#166).
|
|
//!
|
|
//! A session records the command it was spawned with. Bringing it back means
|
|
//! running that preset's `resume_command` (#165) instead, so an agent picks up
|
|
//! its old conversation rather than starting a fresh one. Everything else
|
|
//! about the session — id, sidecar, name, `created_at`, env, worktree — is
|
|
//! untouched, so only the command is decided here.
|
|
|
|
use maestro_protocol::{Session, SpawnPreset};
|
|
|
|
/// The command to respawn `session` with.
|
|
///
|
|
/// The preset is matched on the command the session was spawned with, which is
|
|
/// what the sidecar holds. A session with no matching preset, a preset with no
|
|
/// `resume_command`, or a `resume_command` needing an agent session id the
|
|
/// session never reported all fall back to the original command: respawning
|
|
/// what the operator asked for is always honest, where a half-filled resume
|
|
/// template is not.
|
|
pub fn resume_command(session: &Session, presets: &[SpawnPreset]) -> String {
|
|
presets
|
|
.iter()
|
|
.find(|p| p.command == session.command)
|
|
.and_then(|p| p.resume_command_for(session.agent_session_id.as_deref()))
|
|
.unwrap_or_else(|| session.command.clone())
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use std::collections::HashMap;
|
|
|
|
fn presets() -> Vec<SpawnPreset> {
|
|
vec![
|
|
SpawnPreset {
|
|
id: "claude".into(),
|
|
label: "Claude".into(),
|
|
command: "claude".into(),
|
|
resume_command: Some("claude --resume {agent_session}".into()),
|
|
},
|
|
SpawnPreset {
|
|
id: "zsh".into(),
|
|
label: "Shell".into(),
|
|
command: "zsh".into(),
|
|
resume_command: None,
|
|
},
|
|
]
|
|
}
|
|
|
|
fn session(command: &str, agent_session_id: Option<&str>) -> Session {
|
|
Session {
|
|
id: uuid::Uuid::new_v4(),
|
|
cwd: "/tmp".into(),
|
|
command: command.into(),
|
|
env: HashMap::new(),
|
|
metadata: HashMap::new(),
|
|
worktree: None,
|
|
status: maestro_protocol::SessionStatus::Dormant,
|
|
created_at: chrono::Utc::now(),
|
|
foreground: None,
|
|
activity: maestro_protocol::ActivityState::Idle,
|
|
activity_detail: None,
|
|
last_activity_at: chrono::Utc::now(),
|
|
activity_since: chrono::Utc::now(),
|
|
current_cwd: None,
|
|
blocked_work: None,
|
|
last_focused_at: None,
|
|
agent_session_id: agent_session_id.map(str::to_string),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn uses_the_matching_presets_resume_command() {
|
|
assert_eq!(
|
|
resume_command(&session("claude", Some("conv-7")), &presets()),
|
|
"claude --resume conv-7"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn falls_back_when_the_agent_session_id_is_unknown() {
|
|
assert_eq!(
|
|
resume_command(&session("claude", None), &presets()),
|
|
"claude"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn falls_back_for_a_preset_without_a_resume_command() {
|
|
assert_eq!(resume_command(&session("zsh", None), &presets()), "zsh");
|
|
}
|
|
|
|
#[test]
|
|
fn falls_back_when_no_preset_matches() {
|
|
assert_eq!(
|
|
resume_command(&session("bash --noprofile", Some("conv-7")), &presets()),
|
|
"bash --noprofile"
|
|
);
|
|
}
|
|
}
|