feat(maestro): add maestro send for typing into a session
Adds POST /api/sessions/:id/input and a CLI command on top of it, so a script (or another agent) can hand an instruction to a running session without attaching to it. The text goes in as one write and the Enter follows 150ms later: agents that run a full-screen prompt coalesce a burst of input into a paste, and a newline inside that burst becomes a line break instead of sending the message. `--no-enter` skips the Enter and leaves the text in the prompt. The session argument takes an ID, a unique ID prefix, or a session name; names win over prefixes. A session whose pane has exited is refused (409) rather than silently accepted — unlike a stray keystroke on an attach socket, a send that goes nowhere is worth hearing about. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
766eabbcb6
commit
28778b2224
@@ -5,12 +5,13 @@ use std::io::Write;
|
||||
|
||||
use maestro_protocol::display::abbreviate_dir;
|
||||
use maestro_protocol::{
|
||||
ActivityState, ClientError, CreateSessionRequest, DaemonClient, DaemonInfo, Session,
|
||||
SessionStatus, WorktreeSpec,
|
||||
ActivityState, ClientError, CreateSessionRequest, DaemonClient, DaemonInfo, SendInputRequest,
|
||||
Session, SessionStatus, WorktreeSpec,
|
||||
};
|
||||
use serde_json::Value;
|
||||
|
||||
use crate::cli::{KillArgs, ListArgs, SpawnArgs};
|
||||
use crate::cli::{KillArgs, ListArgs, SendArgs, SpawnArgs};
|
||||
use crate::dispatch::CliError;
|
||||
|
||||
/// `maestro list`
|
||||
pub async fn run_list(
|
||||
@@ -66,6 +67,92 @@ pub async fn run_kill(client: &DaemonClient, args: &KillArgs) -> Result<(), Clie
|
||||
client.kill_session(args.session_id, args.force).await
|
||||
}
|
||||
|
||||
/// Nothing on the daemon answers to what the operator named.
|
||||
#[derive(Debug, thiserror::Error)]
|
||||
pub enum ResolveError {
|
||||
#[error("no session matches {0:?} — run `maestro list` to see what is running")]
|
||||
NoMatch(String),
|
||||
#[error("{0:?} matches {1} sessions; use a session id instead")]
|
||||
Ambiguous(String, usize),
|
||||
}
|
||||
|
||||
/// Turn what the operator typed into a session id: a full ID, a unique ID
|
||||
/// prefix, or a session's name (#125), matched case-insensitively. Names come
|
||||
/// first — an operator who named a session after a hex string meant the name.
|
||||
pub fn resolve_session(sessions: &[Session], needle: &str) -> Result<uuid::Uuid, ResolveError> {
|
||||
let needle = needle.trim();
|
||||
let by_name: Vec<&Session> = sessions
|
||||
.iter()
|
||||
.filter(|s| {
|
||||
maestro_protocol::display::custom_name(s)
|
||||
.is_some_and(|n| n.eq_ignore_ascii_case(needle))
|
||||
})
|
||||
.collect();
|
||||
match by_name.len() {
|
||||
1 => return Ok(by_name[0].id),
|
||||
0 => {}
|
||||
n => return Err(ResolveError::Ambiguous(needle.to_string(), n)),
|
||||
}
|
||||
|
||||
let by_id: Vec<&Session> = sessions
|
||||
.iter()
|
||||
.filter(|s| {
|
||||
s.id.to_string()
|
||||
.to_ascii_lowercase()
|
||||
.starts_with(&needle.to_ascii_lowercase())
|
||||
})
|
||||
.collect();
|
||||
match by_id.len() {
|
||||
1 => Ok(by_id[0].id),
|
||||
0 => Err(ResolveError::NoMatch(needle.to_string())),
|
||||
n => Err(ResolveError::Ambiguous(needle.to_string(), n)),
|
||||
}
|
||||
}
|
||||
|
||||
/// `maestro send`. Answers with the session that was typed into, so the
|
||||
/// caller can name it once the daemon has accepted the text.
|
||||
///
|
||||
/// A bare ID skips the catalog fetch; anything else needs the list to match
|
||||
/// against. Text comes from the arguments, or from stdin when there is none —
|
||||
/// the shape a heredoc or a pipe wants.
|
||||
#[allow(clippy::result_large_err)]
|
||||
pub async fn run_send(
|
||||
client: &DaemonClient,
|
||||
args: &SendArgs,
|
||||
stdin: &mut impl std::io::Read,
|
||||
) -> Result<uuid::Uuid, CliError> {
|
||||
let text = if args.text.is_empty() {
|
||||
let mut buf = String::new();
|
||||
stdin.read_to_string(&mut buf)?;
|
||||
// One trailing newline is how a pipe ends, not part of the message —
|
||||
// keeping it would submit the text twice.
|
||||
buf.strip_suffix('\n')
|
||||
.map(|t| t.strip_suffix('\r').unwrap_or(t))
|
||||
.unwrap_or(&buf)
|
||||
.to_string()
|
||||
} else {
|
||||
args.text.join(" ")
|
||||
};
|
||||
if text.is_empty() {
|
||||
return Err(CliError::NothingToSend);
|
||||
}
|
||||
|
||||
let id = match uuid::Uuid::parse_str(args.session.trim()) {
|
||||
Ok(id) => id,
|
||||
Err(_) => {
|
||||
let sessions = client.list_sessions().await?;
|
||||
resolve_session(&sessions, &args.session)?
|
||||
}
|
||||
};
|
||||
|
||||
let req = SendInputRequest {
|
||||
text,
|
||||
submit: !args.no_enter,
|
||||
};
|
||||
client.send_input(id, &req).await?;
|
||||
Ok(id)
|
||||
}
|
||||
|
||||
#[allow(clippy::write_literal)]
|
||||
fn print_session_table(out: &mut impl Write, sessions: &[Session], info: &DaemonInfo) {
|
||||
if sessions.is_empty() {
|
||||
@@ -218,6 +305,63 @@ mod tests {
|
||||
assert!(out.contains("bash [claude]"), "{out}");
|
||||
}
|
||||
|
||||
fn named(id: u128, name: &str) -> Session {
|
||||
let mut s = session("/tmp", "claude", id);
|
||||
s.metadata
|
||||
.insert("name".into(), serde_json::Value::String(name.into()));
|
||||
s
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolves_by_name_id_prefix_and_reports_what_it_cannot() {
|
||||
use super::{resolve_session, ResolveError};
|
||||
|
||||
// Ids that differ in their first characters, so a short prefix is
|
||||
// enough to pick one — the ergonomics the prefix match exists for.
|
||||
let (a, b) = (1u128 << 124, 2u128 << 124);
|
||||
let sessions = vec![named(a, "planner"), named(b, "builder")];
|
||||
let one = Uuid::from_u128(a);
|
||||
|
||||
assert_eq!(resolve_session(&sessions, "planner").unwrap(), one);
|
||||
// Names match case-insensitively and ignore surrounding space.
|
||||
assert_eq!(resolve_session(&sessions, " Planner ").unwrap(), one);
|
||||
// An id prefix works when it picks exactly one session.
|
||||
let prefix = &one.to_string()[..8];
|
||||
assert_eq!(resolve_session(&sessions, prefix).unwrap(), one);
|
||||
assert!(matches!(
|
||||
resolve_session(&sessions, "nope"),
|
||||
Err(ResolveError::NoMatch(_))
|
||||
));
|
||||
}
|
||||
|
||||
/// Two sessions sharing a name is legal — the daemon never enforced
|
||||
/// uniqueness — so `send` must refuse rather than pick one.
|
||||
#[test]
|
||||
fn an_ambiguous_name_is_refused() {
|
||||
use super::{resolve_session, ResolveError};
|
||||
|
||||
let sessions = vec![named(1 << 124, "worker"), named(2 << 124, "worker")];
|
||||
assert!(matches!(
|
||||
resolve_session(&sessions, "worker"),
|
||||
Err(ResolveError::Ambiguous(_, 2))
|
||||
));
|
||||
}
|
||||
|
||||
/// A session named after its own id prefix means the name: an operator
|
||||
/// who typed a name they chose should not be routed by hex coincidence.
|
||||
#[test]
|
||||
fn names_win_over_id_prefixes() {
|
||||
use super::resolve_session;
|
||||
|
||||
let two = Uuid::from_u128(2 << 124);
|
||||
let prefix = two.to_string()[..8].to_string();
|
||||
let sessions = vec![named(1 << 124, &prefix), session("/tmp", "bash", 2 << 124)];
|
||||
assert_eq!(
|
||||
resolve_session(&sessions, &prefix).unwrap(),
|
||||
Uuid::from_u128(1 << 124)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_sessions() {
|
||||
let mut buf = Vec::new();
|
||||
|
||||
Reference in New Issue
Block a user