naps62/maestro
Archived
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(maestro): daemon assigns the session handle

Browse Source 
The spawn form no longer prefills a name, so create() fills one in: a
requested name is marked User, an absent one gets a generated handle marked
Generated. Rename always settles to User.

Refs #131
This commit is contained in:
Miguel Palhas
2026-09-02 17:49:09 +01:00
parent 13903aa601
commit 3dee4a4e47
2 changed files with 114 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/maestro-daemon/src/session.rs
+48 -7
View File
@@ -12,8 +12,8 @@ use std::time::Duration;
use chrono::Utc;
use maestro_protocol::{
ActivityState, CatalogEvent, CreateSessionRequest, ErrorInfo, Session, SessionStatus,
WorktreeSpec,
ActivityState, CatalogEvent, CreateSessionRequest, ErrorInfo, NameSource, Session,
SessionStatus, WorktreeSpec, NAME_KEY, NAME_SOURCE_KEY,
};
use tokio::sync::{broadcast, Mutex};
use uuid::Uuid;
@@ -404,6 +404,8 @@ impl SessionManager {
// `cwd`), not a generated worktree checkout path — that's what the
// recents picker offers to reuse.
let history_cwd = req.cwd.clone();
let mut metadata = req.metadata;
resolve_name(&mut metadata);
let worktree_branch = req.worktree.as_ref().map(|w| w.branch.clone());
let session = Session {
@@ -411,7 +413,7 @@ impl SessionManager {
cwd: effective_cwd,
command: req.command,
env: req.env,
metadata: req.metadata,
metadata,
worktree: worktree_path.as_ref().zip(worktree_base_repo.as_ref()).map(
|(path, base_repo)| maestro_protocol::SessionWorktree {
path: path.clone(),
@@ -740,11 +742,22 @@ impl SessionManager {
let mut sessions = self.inner.sessions.lock().await;
let rec = sessions.get_mut(&id).ok_or(SessionError::NotFound(id))?;
let mut renamed = rec.session.clone();
// A person typed this, so it is settled: autonaming skips it and
// no client dims it (#131).
match maestro_protocol::normalize_session_name(name) {
Some(name) => renamed
.metadata
.insert("name".into(), serde_json::Value::String(name)),
None => renamed.metadata.remove("name"),
Some(name) => {
renamed
.metadata
.insert(NAME_KEY.into(), serde_json::Value::String(name));
renamed.metadata.insert(
NAME_SOURCE_KEY.into(),
serde_json::Value::String(NameSource::User.as_str().into()),
);
}
None => {
renamed.metadata.remove(NAME_KEY);
renamed.metadata.remove(NAME_SOURCE_KEY);
}
};
self.inner
.sidecar
@@ -806,6 +819,34 @@ impl SessionManager {
/// milliseconds on a loaded host, and `send_keys` rides the per-keystroke hot
/// path — running it inline would starve HTTP handlers, the events WS, the
/// liveness watcher, and PTY readers (NAP-256).
/// Settle a spawn request's name (#131).
///
/// A name the request carried is normalized and marked [`NameSource::User`] —
/// a person typed it, so nothing overwrites it later. A request that carried
/// none (the spawn form's name field now starts empty) gets one of the
/// daemon's own handles, marked [`NameSource::Generated`]: provisional, dimmed
/// by both sidebars, and the only kind autonaming replaces.
fn resolve_name(metadata: &mut HashMap<String, serde_json::Value>) {
let requested = metadata
.get(NAME_KEY)
.and_then(|v| v.as_str())
.and_then(maestro_protocol::normalize_session_name);
let (name, source) = match requested {
Some(name) => (name, NameSource::User),
None => (
maestro_names::generate_batch(1)
.pop()
.unwrap_or_else(|| "session".into()),
NameSource::Generated,
),
};
metadata.insert(NAME_KEY.into(), serde_json::Value::String(name));
metadata.insert(
NAME_SOURCE_KEY.into(),
serde_json::Value::String(source.as_str().into()),
);
}
/// Turn a request's environment into tmux `-e KEY=VAL` material.
///
/// A key containing `=` or NUL would be parsed by tmux as a different