Compare commits
58
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2ab07c2343 | ||
|
|
342e732ef0 | ||
|
|
3205270b51 | ||
|
|
d8e31f2760 | ||
|
|
fdf9ea1b31 | ||
|
|
22cbfbc9bc | ||
|
|
8157793282 | ||
|
|
839dd27925 | ||
|
|
a1816a0838 | ||
|
|
e01b0616b1 | ||
|
|
74d8d3c37a | ||
|
|
cc9b027bd1 | ||
|
|
10a25e5b83 | ||
|
|
4c3f65027d | ||
|
|
76eb3d1386 | ||
|
|
877f409194 | ||
|
|
39d4014dcb | ||
|
|
f02510465c | ||
|
|
8e251bf8be | ||
|
|
bc95d16a98 | ||
|
|
975f3ef0c5 | ||
|
|
f0108c5645 | ||
|
|
c534cee7cc | ||
|
|
c2ac3f7eb6 | ||
|
|
c118020b29 | ||
|
|
7cb14c7aae | ||
|
|
80a9399905 | ||
|
|
9d9a2e723d | ||
|
|
bbafff5a98 | ||
|
|
17e1dc4049 | ||
|
|
436cb194c3 | ||
|
|
6471da2624 | ||
|
|
2a43c76176 | ||
|
|
f689c916bf | ||
|
|
88233cb96d | ||
|
|
54d84e3eaa | ||
|
|
efbccb4e11 | ||
|
|
41c498401b | ||
|
|
6ca347b657 | ||
|
|
1b4981f9ce | ||
|
|
1b289a0450 | ||
|
|
3c5bb51e88 | ||
|
|
f60587a6d6 | ||
|
|
43946c3c46 | ||
|
|
eb605a3d05 | ||
|
|
4c9409a785 | ||
|
|
c24a2133d4 | ||
|
|
75ccfe10d2 | ||
|
|
ea3e18d1f2 | ||
|
|
4f0e887a50 | ||
|
|
cfebfd441b | ||
|
|
81312aa0c5 | ||
|
|
52be48b0a6 | ||
|
|
202b5008b8 | ||
|
|
015f2be5fb | ||
|
|
5a594b2b7f | ||
|
|
8370ddf066 | ||
|
|
5c4e083c2d |
Generated
+11
@@ -1065,6 +1065,7 @@ dependencies = [
|
|||||||
"futures-util",
|
"futures-util",
|
||||||
"libc",
|
"libc",
|
||||||
"maestro-config",
|
"maestro-config",
|
||||||
|
"maestro-hooks",
|
||||||
"maestro-protocol",
|
"maestro-protocol",
|
||||||
"maestro-testing",
|
"maestro-testing",
|
||||||
"nix",
|
"nix",
|
||||||
@@ -1102,6 +1103,7 @@ dependencies = [
|
|||||||
"futures-util",
|
"futures-util",
|
||||||
"libc",
|
"libc",
|
||||||
"maestro-config",
|
"maestro-config",
|
||||||
|
"maestro-hooks",
|
||||||
"maestro-names",
|
"maestro-names",
|
||||||
"maestro-protocol",
|
"maestro-protocol",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
@@ -1137,6 +1139,15 @@ dependencies = [
|
|||||||
"uuid",
|
"uuid",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "maestro-hooks"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"serde_json",
|
||||||
|
"tempfile",
|
||||||
|
"thiserror 1.0.69",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "maestro-installer"
|
name = "maestro-installer"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ dirs = "5"
|
|||||||
futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
|
futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
|
||||||
libc = "0.2"
|
libc = "0.2"
|
||||||
maestro-config = { path = "crates/maestro-config" }
|
maestro-config = { path = "crates/maestro-config" }
|
||||||
|
maestro-hooks = { path = "crates/maestro-hooks" }
|
||||||
maestro-names = { path = "crates/maestro-names" }
|
maestro-names = { path = "crates/maestro-names" }
|
||||||
maestro-protocol = { path = "crates/maestro-protocol" }
|
maestro-protocol = { path = "crates/maestro-protocol" }
|
||||||
maestro-testing = { path = "crates/maestro-testing" }
|
maestro-testing = { path = "crates/maestro-testing" }
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ dirs.workspace = true
|
|||||||
futures-util.workspace = true
|
futures-util.workspace = true
|
||||||
libc.workspace = true
|
libc.workspace = true
|
||||||
maestro-config.workspace = true
|
maestro-config.workspace = true
|
||||||
|
maestro-hooks.workspace = true
|
||||||
maestro-protocol = { workspace = true, features = ["client"] }
|
maestro-protocol = { workspace = true, features = ["client"] }
|
||||||
nix.workspace = true
|
nix.workspace = true
|
||||||
serde_json.workspace = true
|
serde_json.workspace = true
|
||||||
|
|||||||
@@ -43,6 +43,23 @@ pub enum Command {
|
|||||||
Kill(KillArgs),
|
Kill(KillArgs),
|
||||||
/// List retained worktrees, or reclaim one by ID (#86).
|
/// List retained worktrees, or reclaim one by ID (#86).
|
||||||
Worktrees(WorktreesArgs),
|
Worktrees(WorktreesArgs),
|
||||||
|
/// Install or update the agent activity hook (#106).
|
||||||
|
Hooks(HooksArgs),
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `maestro hooks <install>`
|
||||||
|
#[derive(Debug, clap::Args)]
|
||||||
|
pub struct HooksArgs {
|
||||||
|
#[command(subcommand)]
|
||||||
|
pub command: HooksCommand,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Subcommand)]
|
||||||
|
pub enum HooksCommand {
|
||||||
|
/// Write the Claude Code activity hook into ~/.claude/settings.json.
|
||||||
|
/// Idempotent: an older maestro hook is updated in place, every other
|
||||||
|
/// hook is left untouched.
|
||||||
|
Install,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// `maestro worktrees <list|reclaim>`
|
/// `maestro worktrees <list|reclaim>`
|
||||||
@@ -275,6 +292,23 @@ mod tests {
|
|||||||
assert!(err.to_string().contains("KEY=VALUE"));
|
assert!(err.to_string().contains("KEY=VALUE"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_hooks_install() {
|
||||||
|
let cli = Cli::try_parse_from(["maestro", "hooks", "install"]).unwrap();
|
||||||
|
match cli.command {
|
||||||
|
Command::Hooks(h) => {
|
||||||
|
assert!(matches!(h.command, HooksCommand::Install));
|
||||||
|
}
|
||||||
|
_ => panic!("wrong subcommand"),
|
||||||
|
}
|
||||||
|
// No subcommand → help, like `worktrees`.
|
||||||
|
let err = Cli::try_parse_from(["maestro", "hooks"]).unwrap_err();
|
||||||
|
assert!(matches!(
|
||||||
|
err.kind(),
|
||||||
|
clap::error::ErrorKind::DisplayHelpOnMissingArgumentOrSubcommand
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parses_worktrees_list() {
|
fn parses_worktrees_list() {
|
||||||
let cli = Cli::try_parse_from(["maestro", "worktrees", "list", "--json"]).unwrap();
|
let cli = Cli::try_parse_from(["maestro", "worktrees", "list", "--json"]).unwrap();
|
||||||
|
|||||||
@@ -24,6 +24,10 @@ pub enum CliError {
|
|||||||
#[error("{0}")]
|
#[error("{0}")]
|
||||||
Attach(#[from] crate::attach::AttachError),
|
Attach(#[from] crate::attach::AttachError),
|
||||||
#[error("{0}")]
|
#[error("{0}")]
|
||||||
|
Hooks(#[from] maestro_hooks::HooksError),
|
||||||
|
#[error("could not determine the home directory ($HOME unset?)")]
|
||||||
|
NoHome,
|
||||||
|
#[error("{0}")]
|
||||||
Io(#[from] std::io::Error),
|
Io(#[from] std::io::Error),
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,6 +44,15 @@ pub async fn dispatch(
|
|||||||
None => default_config_path()?,
|
None => default_config_path()?,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// `hooks install` is purely local: it must work with the daemon down, so
|
||||||
|
// it never touches the client.
|
||||||
|
if let Command::Hooks(args) = &command {
|
||||||
|
match args.command {
|
||||||
|
crate::cli::HooksCommand::Install => run_hooks_install()?,
|
||||||
|
}
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
let daemon = client(&config_path, daemon_url_override)?;
|
let daemon = client(&config_path, daemon_url_override)?;
|
||||||
|
|
||||||
match command {
|
match command {
|
||||||
@@ -77,6 +90,7 @@ pub async fn dispatch(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Command::Hooks(_) => unreachable!("hooks handled before the daemon client exists"),
|
||||||
Command::Worktrees(args) => match args.command {
|
Command::Worktrees(args) => match args.command {
|
||||||
WorktreesCommand::List(list_args) => {
|
WorktreesCommand::List(list_args) => {
|
||||||
let mut stdout = std::io::stdout().lock();
|
let mut stdout = std::io::stdout().lock();
|
||||||
@@ -101,6 +115,25 @@ pub async fn dispatch(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `maestro hooks install` (#106): write the shipped hook script under the
|
||||||
|
/// user's data dir and register it in their Claude Code settings. Idempotent
|
||||||
|
/// and foreign-hook-preserving — the guarantees live in [`maestro_hooks`].
|
||||||
|
#[allow(clippy::result_large_err)]
|
||||||
|
fn run_hooks_install() -> Result<(), CliError> {
|
||||||
|
let home = dirs::home_dir().ok_or(CliError::NoHome)?;
|
||||||
|
let changed = maestro_hooks::install_for_home(&home)?;
|
||||||
|
if changed {
|
||||||
|
println!(
|
||||||
|
"installed claude-code activity hook: {} → {}",
|
||||||
|
maestro_hooks::script_path(&home).display(),
|
||||||
|
maestro_hooks::settings_path(&home).display()
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
println!("claude-code activity hook already up to date");
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// Default detach byte, matching `maestro attach --detach-key`'s `^q`.
|
/// Default detach byte, matching `maestro attach --detach-key`'s `^q`.
|
||||||
const CTRL_Q: u8 = 0x11;
|
const CTRL_Q: u8 = 0x11;
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
|
|
||||||
|
use maestro_protocol::display::abbreviate_dir;
|
||||||
use maestro_protocol::{
|
use maestro_protocol::{
|
||||||
ActivityState, ClientError, CreateSessionRequest, DaemonClient, DaemonInfo, Session,
|
ActivityState, ClientError, CreateSessionRequest, DaemonClient, DaemonInfo, Session,
|
||||||
SessionStatus, WorktreeSpec,
|
SessionStatus, WorktreeSpec,
|
||||||
@@ -138,21 +139,6 @@ pub(crate) fn blocked_label(s: &Session) -> String {
|
|||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Render a path with the daemon's home dir collapsed to `~`. Mirrors the web
|
|
||||||
/// UI's abbreviation so CLI and browser show the same directory shorthand.
|
|
||||||
pub(crate) fn abbreviate_dir(path: &std::path::Path, home: &str) -> String {
|
|
||||||
let p = path.to_string_lossy();
|
|
||||||
if !home.is_empty() {
|
|
||||||
if p == home {
|
|
||||||
return "~".into();
|
|
||||||
}
|
|
||||||
if let Some(rest) = p.strip_prefix(&format!("{home}/")) {
|
|
||||||
return format!("~/{rest}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
p.into_owned()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
@@ -176,6 +162,7 @@ mod tests {
|
|||||||
created_at: Utc.with_ymd_and_hms(2026, 5, 25, 12, 0, 0).unwrap(),
|
created_at: Utc.with_ymd_and_hms(2026, 5, 25, 12, 0, 0).unwrap(),
|
||||||
foreground: None,
|
foreground: None,
|
||||||
activity: Default::default(),
|
activity: Default::default(),
|
||||||
|
activity_detail: None,
|
||||||
last_activity_at: chrono::Utc::now(),
|
last_activity_at: chrono::Utc::now(),
|
||||||
activity_since: chrono::Utc::now(),
|
activity_since: chrono::Utc::now(),
|
||||||
current_cwd: None,
|
current_cwd: None,
|
||||||
|
|||||||
@@ -6,10 +6,10 @@
|
|||||||
|
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
|
|
||||||
|
use maestro_protocol::display::abbreviate_dir;
|
||||||
use maestro_protocol::{ClientError, DaemonClient, DaemonInfo, InTheWay, RetainedWorktree};
|
use maestro_protocol::{ClientError, DaemonClient, DaemonInfo, InTheWay, RetainedWorktree};
|
||||||
|
|
||||||
use crate::cli::{ListWorktreesArgs, ReclaimArgs};
|
use crate::cli::{ListWorktreesArgs, ReclaimArgs};
|
||||||
use crate::sessions::abbreviate_dir;
|
|
||||||
|
|
||||||
/// `maestro worktrees list`
|
/// `maestro worktrees list`
|
||||||
pub async fn run_list(
|
pub async fn run_list(
|
||||||
|
|||||||
@@ -22,7 +22,8 @@ use std::collections::BTreeMap;
|
|||||||
use std::net::SocketAddr;
|
use std::net::SocketAddr;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
use serde::Deserialize;
|
use serde::de::Error as _;
|
||||||
|
use serde::{Deserialize, Deserializer};
|
||||||
|
|
||||||
/// Directory name under `$XDG_CONFIG_HOME` (default `~/.config`).
|
/// Directory name under `$XDG_CONFIG_HOME` (default `~/.config`).
|
||||||
pub const DIR_NAME: &str = "maestro";
|
pub const DIR_NAME: &str = "maestro";
|
||||||
@@ -64,6 +65,24 @@ pub struct MaestroConfigFile {
|
|||||||
pub tui: TuiSection,
|
pub tui: TuiSection,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub spawn: SpawnSection,
|
pub spawn: SpawnSection,
|
||||||
|
#[serde(default)]
|
||||||
|
pub hooks: HooksSection,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `[hooks]` — agent-hook installation settings (#106).
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Deserialize)]
|
||||||
|
pub struct HooksSection {
|
||||||
|
/// Whether the daemon installs the Claude Code activity hook into
|
||||||
|
/// `~/.claude/settings.json` on first start when no maestro hook is
|
||||||
|
/// there yet. Default `true`; set `auto_install = false` to opt out.
|
||||||
|
#[serde(default)]
|
||||||
|
pub auto_install: Option<bool>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl HooksSection {
|
||||||
|
pub fn auto_install(&self) -> bool {
|
||||||
|
self.auto_install.unwrap_or(true)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Default, PartialEq, Eq, Deserialize)]
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Deserialize)]
|
||||||
@@ -128,11 +147,14 @@ pub struct WebSection {
|
|||||||
|
|
||||||
/// `[tui]` — `maestro tui` settings (NAP-275 epic, phase 2 NAP-277).
|
/// `[tui]` — `maestro tui` settings (NAP-275 epic, phase 2 NAP-277).
|
||||||
///
|
///
|
||||||
/// Leader key, chord timeout, and per-mode keymap overrides. The TUI ships
|
/// Theme, leader key, chord timeout, and per-mode keymap overrides. The TUI
|
||||||
/// with a default keymap; entries in `keymap_normal` / `keymap_insert` are
|
/// ships with a default keymap; entries in `keymap_normal` / `keymap_insert`
|
||||||
/// applied **over** the defaults, so a partial override is enough.
|
/// are applied **over** the defaults, so a partial override is enough.
|
||||||
#[derive(Debug, Clone, Default, PartialEq, Eq, Deserialize)]
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Deserialize)]
|
||||||
pub struct TuiSection {
|
pub struct TuiSection {
|
||||||
|
/// Named palette preset. Defaults to the dark preset.
|
||||||
|
#[serde(default, deserialize_with = "deserialize_theme")]
|
||||||
|
pub theme: Option<TuiTheme>,
|
||||||
/// Canonical key form, e.g. `"ctrl-a"`. Default `ctrl-a`.
|
/// Canonical key form, e.g. `"ctrl-a"`. Default `ctrl-a`.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub leader: Option<String>,
|
pub leader: Option<String>,
|
||||||
@@ -149,6 +171,33 @@ pub struct TuiSection {
|
|||||||
pub keymap_insert: BTreeMap<String, String>,
|
pub keymap_insert: BTreeMap<String, String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Palette presets supported by the TUI's `[tui].theme` setting.
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub enum TuiTheme {
|
||||||
|
/// The terminal-native dark palette and the default.
|
||||||
|
Dark,
|
||||||
|
/// A high-contrast light palette.
|
||||||
|
Light,
|
||||||
|
/// Named ANSI colours, allowing the terminal to provide the colour set.
|
||||||
|
Ansi,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn deserialize_theme<'de, D>(deserializer: D) -> Result<Option<TuiTheme>, D::Error>
|
||||||
|
where
|
||||||
|
D: Deserializer<'de>,
|
||||||
|
{
|
||||||
|
let raw = Option::<String>::deserialize(deserializer)?;
|
||||||
|
raw.map(|name| match name.as_str() {
|
||||||
|
"dark" => Ok(TuiTheme::Dark),
|
||||||
|
"light" => Ok(TuiTheme::Light),
|
||||||
|
"ansi" => Ok(TuiTheme::Ansi),
|
||||||
|
_ => Err(D::Error::custom(format!(
|
||||||
|
"invalid [tui].theme {name:?}; expected \"dark\", \"light\", or \"ansi\""
|
||||||
|
))),
|
||||||
|
})
|
||||||
|
.transpose()
|
||||||
|
}
|
||||||
|
|
||||||
/// `[spawn]` — command presets for the spawn form (#22, part of #21).
|
/// `[spawn]` — command presets for the spawn form (#22, part of #21).
|
||||||
///
|
///
|
||||||
/// Defined in shared config so every binary sees the same list: the web reads
|
/// Defined in shared config so every binary sees the same list: the web reads
|
||||||
@@ -375,6 +424,26 @@ mod tests {
|
|||||||
assert_eq!(cfg, MaestroConfigFile::default());
|
assert_eq!(cfg, MaestroConfigFile::default());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn hooks_auto_install_defaults_true_and_is_opt_out() {
|
||||||
|
// Absent file / absent [hooks] ⇒ auto_install on.
|
||||||
|
assert!(HooksSection::default().auto_install());
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let path = dir.path().join("config.toml");
|
||||||
|
std::fs::write(&path, "").unwrap();
|
||||||
|
assert!(MaestroConfigFile::load(&path).unwrap().hooks.auto_install());
|
||||||
|
|
||||||
|
std::fs::write(
|
||||||
|
&path,
|
||||||
|
r#"
|
||||||
|
[hooks]
|
||||||
|
auto_install = false
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert!(!MaestroConfigFile::load(&path).unwrap().hooks.auto_install());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn spawn_presets_default_to_builtins_plus_custom() {
|
fn spawn_presets_default_to_builtins_plus_custom() {
|
||||||
// Absent [spawn].presets → built-ins, with the implicit custom tile last.
|
// Absent [spawn].presets → built-ins, with the implicit custom tile last.
|
||||||
@@ -558,6 +627,30 @@ bind_addr = "127.0.0.1:9090"
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn tui_theme_parses_named_presets_and_defaults_when_absent() {
|
||||||
|
assert_eq!(TuiSection::default().theme, None);
|
||||||
|
let cfg = file_with("[tui]\ntheme = \"light\"\n");
|
||||||
|
assert_eq!(cfg.tui.theme, Some(TuiTheme::Light));
|
||||||
|
let cfg = file_with("[tui]\ntheme = \"ansi\"\n");
|
||||||
|
assert_eq!(cfg.tui.theme, Some(TuiTheme::Ansi));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn tui_theme_rejects_unknown_names_with_the_field_name() {
|
||||||
|
let err =
|
||||||
|
toml::from_str::<MaestroConfigFile>("[tui]\ntheme = \"solarized\"\n").unwrap_err();
|
||||||
|
let message = err.to_string();
|
||||||
|
assert!(
|
||||||
|
message.contains("[tui].theme"),
|
||||||
|
"diagnostic should name the field: {message}"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
message.contains("solarized"),
|
||||||
|
"diagnostic should name the invalid value: {message}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
fn file_with(body: &str) -> MaestroConfigFile {
|
fn file_with(body: &str) -> MaestroConfigFile {
|
||||||
toml::from_str(body).expect("parse")
|
toml::from_str(body).expect("parse")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ dirs.workspace = true
|
|||||||
futures-util.workspace = true
|
futures-util.workspace = true
|
||||||
libc.workspace = true
|
libc.workspace = true
|
||||||
maestro-config.workspace = true
|
maestro-config.workspace = true
|
||||||
|
maestro-hooks.workspace = true
|
||||||
maestro-names.workspace = true
|
maestro-names.workspace = true
|
||||||
maestro-protocol.workspace = true
|
maestro-protocol.workspace = true
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
|
|||||||
@@ -15,6 +15,44 @@ use maestro_protocol::ActivityState;
|
|||||||
/// Active↔Idle. This window *is* the debounce the issue calls for.
|
/// Active↔Idle. This window *is* the debounce the issue calls for.
|
||||||
pub const ACTIVE_WINDOW: Duration = Duration::from_secs(3);
|
pub const ACTIVE_WINDOW: Duration = Duration::from_secs(3);
|
||||||
|
|
||||||
|
/// How long an agent-reported state (#105) stays in force before inference
|
||||||
|
/// resumes. Long enough for a working agent's heartbeat to hold between
|
||||||
|
/// reports, short enough that an agent dying mid-run cannot pin its session
|
||||||
|
/// at `Error` forever.
|
||||||
|
pub const REPORT_TTL: Duration = Duration::from_secs(300);
|
||||||
|
|
||||||
|
/// Server-side cap (#105) on a reported `detail`, in characters. The meta
|
||||||
|
/// line renders it inline, so an unbounded string would own the whole card.
|
||||||
|
pub const MAX_REPORT_DETAIL_CHARS: usize = 256;
|
||||||
|
|
||||||
|
/// An agent-reported activity state (#105) still within its TTL. While one
|
||||||
|
/// is [`Self::in_force`], it outranks [`decide`]'s inference; when it
|
||||||
|
/// lapses, inference resumes and any reported detail is cleared with it.
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct ReportedActivity {
|
||||||
|
pub state: ActivityState,
|
||||||
|
pub expires_at: std::time::Instant,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ReportedActivity {
|
||||||
|
pub fn new(state: ActivityState, ttl: Duration) -> Self {
|
||||||
|
Self {
|
||||||
|
state,
|
||||||
|
expires_at: std::time::Instant::now() + ttl,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn in_force(&self, now: std::time::Instant) -> bool {
|
||||||
|
now < self.expires_at
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Cap a reported detail to [`MAX_REPORT_DETAIL_CHARS`] characters,
|
||||||
|
/// char-boundary safe.
|
||||||
|
pub fn truncate_detail(detail: Option<String>) -> Option<String> {
|
||||||
|
detail.map(|d| d.chars().take(MAX_REPORT_DETAIL_CHARS).collect())
|
||||||
|
}
|
||||||
|
|
||||||
/// Combine the observed signals into an [`ActivityState`]:
|
/// Combine the observed signals into an [`ActivityState`]:
|
||||||
/// recent output ⇒ `Active`; else blocked on a terminal read ⇒ `AwaitingInput`;
|
/// recent output ⇒ `Active`; else blocked on a terminal read ⇒ `AwaitingInput`;
|
||||||
/// else `Idle`.
|
/// else `Idle`.
|
||||||
@@ -59,4 +97,25 @@ mod tests {
|
|||||||
ActivityState::Idle
|
ActivityState::Idle
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn report_is_in_force_until_exactly_its_expiry() {
|
||||||
|
let ttl = Duration::from_secs(300);
|
||||||
|
let report = ReportedActivity::new(ActivityState::Error, ttl);
|
||||||
|
assert!(report.in_force(report.expires_at - Duration::from_millis(1)));
|
||||||
|
assert!(!report.in_force(report.expires_at));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn detail_truncates_to_the_cap_without_panic_on_multibyte_input() {
|
||||||
|
let long = "é".repeat(MAX_REPORT_DETAIL_CHARS + 10);
|
||||||
|
let capped = truncate_detail(Some(long)).unwrap();
|
||||||
|
assert_eq!(capped.chars().count(), MAX_REPORT_DETAIL_CHARS);
|
||||||
|
|
||||||
|
assert_eq!(truncate_detail(None), None);
|
||||||
|
assert_eq!(
|
||||||
|
truncate_detail(Some("short".into())).as_deref(),
|
||||||
|
Some("short")
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,6 +47,20 @@ async fn run(config_override: Option<PathBuf>) -> Result<(), Box<dyn Error>> {
|
|||||||
let _ = default_state_dir();
|
let _ = default_state_dir();
|
||||||
std::fs::create_dir_all(config.sidecar_dir())?;
|
std::fs::create_dir_all(config.sidecar_dir())?;
|
||||||
std::fs::create_dir_all(config.fifo_dir())?;
|
std::fs::create_dir_all(config.fifo_dir())?;
|
||||||
|
|
||||||
|
// First-start hook auto-install (#106). Best-effort, before serving: a
|
||||||
|
// session spawned right away should already carry the hook.
|
||||||
|
if config.hooks_auto_install {
|
||||||
|
match crate::hooks::auto_install(&config.home_dir) {
|
||||||
|
crate::hooks::AutoInstallOutcome::Installed => {
|
||||||
|
tracing::info!("installed claude-code activity hook (#106)");
|
||||||
|
}
|
||||||
|
crate::hooks::AutoInstallOutcome::Failed => {
|
||||||
|
tracing::warn!("hooks auto-install failed; run `maestro hooks install` manually");
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
// No worktree dir to pre-create: without an override the worktrees live
|
// No worktree dir to pre-create: without an override the worktrees live
|
||||||
// under their base repos, created on demand (#56).
|
// under their base repos, created on demand (#56).
|
||||||
|
|
||||||
|
|||||||
@@ -88,6 +88,10 @@ pub struct DaemonConfig {
|
|||||||
/// Project-discovery depth (#54): `[spawn].project_scan_depth`, default
|
/// Project-discovery depth (#54): `[spawn].project_scan_depth`, default
|
||||||
/// [`DEFAULT_PROJECT_SCAN_DEPTH`].
|
/// [`DEFAULT_PROJECT_SCAN_DEPTH`].
|
||||||
pub project_scan_depth: u32,
|
pub project_scan_depth: u32,
|
||||||
|
/// Whether the daemon installs the Claude Code activity hook on first
|
||||||
|
/// start when none is present (#106): `[hooks].auto_install`, default
|
||||||
|
/// `true`.
|
||||||
|
pub hooks_auto_install: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DaemonConfig {
|
impl DaemonConfig {
|
||||||
@@ -197,6 +201,7 @@ pub fn load_config(path: &Path, env: EnvOverrides) -> Result<DaemonConfig, Confi
|
|||||||
spawn_presets,
|
spawn_presets,
|
||||||
project_roots,
|
project_roots,
|
||||||
project_scan_depth,
|
project_scan_depth,
|
||||||
|
hooks_auto_install: file.hooks.auto_install(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,6 +238,27 @@ pub fn system_hostname() -> String {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn hooks_auto_install_defaults_true_and_is_opt_out() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let path = dir.path().join("config.toml");
|
||||||
|
|
||||||
|
std::fs::write(&path, "").unwrap();
|
||||||
|
let cfg = load_config(&path, EnvOverrides::default()).unwrap();
|
||||||
|
assert!(cfg.hooks_auto_install);
|
||||||
|
|
||||||
|
std::fs::write(
|
||||||
|
&path,
|
||||||
|
r#"
|
||||||
|
[hooks]
|
||||||
|
auto_install = false
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let cfg = load_config(&path, EnvOverrides::default()).unwrap();
|
||||||
|
assert!(!cfg.hooks_auto_install);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn empty_file_defaults_everything() {
|
fn empty_file_defaults_everything() {
|
||||||
let dir = tempfile::tempdir().unwrap();
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
//! First-start hook auto-install (#106).
|
||||||
|
//!
|
||||||
|
//! The daemon runs [`auto_install`] once at startup: when the user's
|
||||||
|
//! `~/.claude/settings.json` carries no maestro hook yet (and
|
||||||
|
//! `[hooks].auto_install` hasn't opted out — checked by the caller), the same
|
||||||
|
//! installer `maestro hooks install` uses writes it. Best-effort: a failure is
|
||||||
|
//! warned about and never blocks startup. The same global hook serves every
|
||||||
|
//! Claude Code session on the machine, so nothing here targets repositories
|
||||||
|
//! or worktrees.
|
||||||
|
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
/// Install the Claude Code activity hook for `home_dir` unless one is already
|
||||||
|
/// present or the home dir is unresolvable (`""`). Returns what happened.
|
||||||
|
pub fn auto_install(home_dir: &str) -> AutoInstallOutcome {
|
||||||
|
if home_dir.is_empty() {
|
||||||
|
return AutoInstallOutcome::Skipped;
|
||||||
|
}
|
||||||
|
let settings = maestro_hooks::settings_path(Path::new(home_dir));
|
||||||
|
if maestro_hooks::is_installed(&settings) {
|
||||||
|
return AutoInstallOutcome::AlreadyPresent;
|
||||||
|
}
|
||||||
|
match maestro_hooks::install_for_home(Path::new(home_dir)) {
|
||||||
|
Ok(_) => AutoInstallOutcome::Installed,
|
||||||
|
Err(e) => {
|
||||||
|
tracing::warn!(error = %e, "hooks auto-install failed (non-fatal)");
|
||||||
|
AutoInstallOutcome::Failed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What [`auto_install`] did, so callers can log and tests can assert.
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub enum AutoInstallOutcome {
|
||||||
|
Installed,
|
||||||
|
AlreadyPresent,
|
||||||
|
Failed,
|
||||||
|
Skipped,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
/// Everything happens under a temp `$HOME`; the developer's own
|
||||||
|
/// `~/.claude/settings.json` is never read or written.
|
||||||
|
#[test]
|
||||||
|
fn installs_when_settings_carry_no_maestro_hook() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let outcome = auto_install(dir.path().to_str().unwrap());
|
||||||
|
assert_eq!(outcome, AutoInstallOutcome::Installed);
|
||||||
|
let settings = dir.path().join(".claude/settings.json");
|
||||||
|
assert!(maestro_hooks::is_installed(&settings));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn second_start_is_a_noop() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let home = dir.path().to_str().unwrap();
|
||||||
|
auto_install(home);
|
||||||
|
// A foreign edit between starts survives; presence alone skips.
|
||||||
|
let settings = dir.path().join(".claude/settings.json");
|
||||||
|
let before = std::fs::read_to_string(&settings).unwrap();
|
||||||
|
assert_eq!(auto_install(home), AutoInstallOutcome::AlreadyPresent);
|
||||||
|
assert_eq!(
|
||||||
|
before,
|
||||||
|
std::fs::read_to_string(&settings).unwrap(),
|
||||||
|
"already-installed settings must not be rewritten"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn unresolvable_home_is_skipped() {
|
||||||
|
assert_eq!(auto_install(""), AutoInstallOutcome::Skipped);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@ pub mod cli;
|
|||||||
pub mod config;
|
pub mod config;
|
||||||
pub mod dirlist;
|
pub mod dirlist;
|
||||||
pub mod gitroot;
|
pub mod gitroot;
|
||||||
|
pub mod hooks;
|
||||||
pub mod local_api;
|
pub mod local_api;
|
||||||
pub mod panes;
|
pub mod panes;
|
||||||
pub mod proc;
|
pub mod proc;
|
||||||
@@ -27,5 +28,6 @@ pub mod tmux;
|
|||||||
pub mod worktree;
|
pub mod worktree;
|
||||||
pub mod worktree_probe;
|
pub mod worktree_probe;
|
||||||
|
|
||||||
|
pub use activity::MAX_REPORT_DETAIL_CHARS;
|
||||||
pub use config::{default_config_path, default_state_dir, load_config, DaemonConfig, EnvOverrides};
|
pub use config::{default_config_path, default_state_dir, load_config, DaemonConfig, EnvOverrides};
|
||||||
pub use session::{SessionError, SessionManager};
|
pub use session::{SessionError, SessionManager};
|
||||||
|
|||||||
@@ -15,12 +15,12 @@ use std::sync::Arc;
|
|||||||
use axum::extract::{Path, Query, State};
|
use axum::extract::{Path, Query, State};
|
||||||
use axum::http::StatusCode;
|
use axum::http::StatusCode;
|
||||||
use axum::response::{IntoResponse, Response};
|
use axum::response::{IntoResponse, Response};
|
||||||
use axum::routing::{any, delete, get};
|
use axum::routing::{any, delete, get, post};
|
||||||
use axum::{Json, Router};
|
use axum::{Json, Router};
|
||||||
use maestro_config::SpawnPreset;
|
use maestro_config::SpawnPreset;
|
||||||
use maestro_protocol::{
|
use maestro_protocol::{
|
||||||
routes, ApiError, CatalogEvent, CreateSessionRequest, DaemonInfo, GitRoot, NameBatch, Session,
|
routes, ApiError, CatalogEvent, CreateSessionRequest, DaemonInfo, GitRoot, NameBatch,
|
||||||
PROTOCOL_VERSION,
|
ReportActivityRequest, Session, PROTOCOL_VERSION,
|
||||||
};
|
};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
@@ -46,6 +46,7 @@ pub struct LocalApiState {
|
|||||||
pub fn router(state: LocalApiState) -> Router {
|
pub fn router(state: LocalApiState) -> Router {
|
||||||
Router::new()
|
Router::new()
|
||||||
.route(routes::SESSIONS, get(list_sessions).post(create_session))
|
.route(routes::SESSIONS, get(list_sessions).post(create_session))
|
||||||
|
.route(routes::patterns::SESSION_ACTIVITY, post(report_activity))
|
||||||
.route(routes::patterns::SESSION, delete(kill_session))
|
.route(routes::patterns::SESSION, delete(kill_session))
|
||||||
.route(routes::DIRS, get(list_dir))
|
.route(routes::DIRS, get(list_dir))
|
||||||
.route(routes::RECENT_DIRS, get(recent_dirs))
|
.route(routes::RECENT_DIRS, get(recent_dirs))
|
||||||
@@ -318,6 +319,29 @@ async fn reclaim_worktree(State(s): State<LocalApiState>, Path(id): Path<Uuid>)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `POST /api/sessions/:id/activity` (#105): an agent reports its own state.
|
||||||
|
/// The report holds above the daemon's inference for a TTL, then inference
|
||||||
|
/// resumes — an agent that dies mid-run cannot pin its session at `Error`
|
||||||
|
/// forever. Unknown session is 404; an unknown state value is rejected by the
|
||||||
|
/// JSON decoder (422) rather than coerced. Answers `204 No Content`.
|
||||||
|
async fn report_activity(
|
||||||
|
State(s): State<LocalApiState>,
|
||||||
|
Path(id): Path<Uuid>,
|
||||||
|
Json(body): Json<ReportActivityRequest>,
|
||||||
|
) -> Response {
|
||||||
|
match s.manager.report_activity(id, body.state, body.detail).await {
|
||||||
|
Ok(()) => StatusCode::NO_CONTENT.into_response(),
|
||||||
|
Err(e) => {
|
||||||
|
let info = e.to_error_info();
|
||||||
|
error_response(
|
||||||
|
session_error_status(&info.code),
|
||||||
|
info.code.as_str(),
|
||||||
|
info.message.as_str(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn error_response(status: StatusCode, code: &str, message: &str) -> Response {
|
fn error_response(status: StatusCode, code: &str, message: &str) -> Response {
|
||||||
(status, Json(ApiError::new(code, message))).into_response()
|
(status, Json(ApiError::new(code, message))).into_response()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,6 +57,16 @@ pub struct SessionRecord {
|
|||||||
/// fall back to a probe.
|
/// fall back to a probe.
|
||||||
pub worktree_branch: Option<String>,
|
pub worktree_branch: Option<String>,
|
||||||
pub bridge: PtyBridge,
|
pub bridge: PtyBridge,
|
||||||
|
/// Agent-reported activity (#105) still within its TTL. While in force it
|
||||||
|
/// outranks the activity pass's own inference; when it lapses, inference
|
||||||
|
/// resumes and [`Session::activity_detail`] is cleared with it. This
|
||||||
|
/// field is daemon-local bookkeeping only — it never rides the wire.
|
||||||
|
pub reported_activity: Option<crate::activity::ReportedActivity>,
|
||||||
|
/// Flipped once the natural-exit settle step (#82) has been applied or
|
||||||
|
/// refused for this session. `Dead` is observable before settling ends
|
||||||
|
/// (#115), so this is the observable that says its outcomes are safe to
|
||||||
|
/// assert on. Daemon-local bookkeeping; never rides the wire.
|
||||||
|
pub settled: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, thiserror::Error)]
|
#[derive(Debug, thiserror::Error)]
|
||||||
@@ -136,6 +146,9 @@ struct Inner {
|
|||||||
/// the variable. A mutex because the runner sets it after construction,
|
/// the variable. A mutex because the runner sets it after construction,
|
||||||
/// possibly while clones are already serving.
|
/// possibly while clones are already serving.
|
||||||
daemon_url: std::sync::Mutex<Option<String>>,
|
daemon_url: std::sync::Mutex<Option<String>>,
|
||||||
|
/// TTL an agent-reported activity state (#105) stays in force. A const in
|
||||||
|
/// production; overridable for tests that watch the lapse happen.
|
||||||
|
report_ttl: Duration,
|
||||||
sessions: Mutex<HashMap<Uuid, SessionRecord>>,
|
sessions: Mutex<HashMap<Uuid, SessionRecord>>,
|
||||||
events: broadcast::Sender<CatalogEvent>,
|
events: broadcast::Sender<CatalogEvent>,
|
||||||
}
|
}
|
||||||
@@ -176,6 +189,7 @@ impl SessionManager {
|
|||||||
spawn_history: None,
|
spawn_history: None,
|
||||||
retained: None,
|
retained: None,
|
||||||
daemon_url: std::sync::Mutex::new(None),
|
daemon_url: std::sync::Mutex::new(None),
|
||||||
|
report_ttl: crate::activity::REPORT_TTL,
|
||||||
sessions: Mutex::new(HashMap::new()),
|
sessions: Mutex::new(HashMap::new()),
|
||||||
events,
|
events,
|
||||||
}),
|
}),
|
||||||
@@ -208,6 +222,15 @@ impl SessionManager {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Override the agent-report TTL (#105). Tests pass a short one to watch
|
||||||
|
/// inference resume without waiting out [`crate::activity::REPORT_TTL`].
|
||||||
|
pub fn with_activity_report_ttl(mut self, ttl: Duration) -> Self {
|
||||||
|
let inner = Arc::get_mut(&mut self.inner)
|
||||||
|
.expect("with_activity_report_ttl must be called before the SessionManager is cloned");
|
||||||
|
inner.report_ttl = ttl;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
/// Set the daemon's own HTTP base URL (#103), exported to every session
|
/// Set the daemon's own HTTP base URL (#103), exported to every session
|
||||||
/// spawned afterwards as `MAESTRO_URL`. Unlike the `with_*` builders this
|
/// spawned afterwards as `MAESTRO_URL`. Unlike the `with_*` builders this
|
||||||
/// is a plain setter: the daemon runner learns its bound address after
|
/// is a plain setter: the daemon runner learns its bound address after
|
||||||
@@ -276,6 +299,17 @@ impl SessionManager {
|
|||||||
sessions.get(&id).map(|r| r.session.status)
|
sessions.get(&id).map(|r| r.session.status)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Whether the natural-exit settle step (#82) has finished for this
|
||||||
|
/// session: `Some(true)` once applied or refused, `Some(false)` while
|
||||||
|
/// still pending, `None` if the session is unknown. `Dead` is observable
|
||||||
|
/// before settling ends (#115), so anything asserting on a dead
|
||||||
|
/// session's worktree waits on this rather than inferring settle
|
||||||
|
/// completion from its side effects.
|
||||||
|
pub async fn is_settled(&self, id: Uuid) -> Option<bool> {
|
||||||
|
let sessions = self.inner.sessions.lock().await;
|
||||||
|
sessions.get(&id).map(|r| r.settled)
|
||||||
|
}
|
||||||
|
|
||||||
/// Spawn a new session. On success returns the freshly-created `Session`.
|
/// Spawn a new session. On success returns the freshly-created `Session`.
|
||||||
pub async fn create(&self, req: CreateSessionRequest) -> Result<Session, SessionError> {
|
pub async fn create(&self, req: CreateSessionRequest) -> Result<Session, SessionError> {
|
||||||
let (effective_cwd, worktree_path, worktree_base_repo) = match &req.worktree {
|
let (effective_cwd, worktree_path, worktree_base_repo) = match &req.worktree {
|
||||||
@@ -379,6 +413,7 @@ impl SessionManager {
|
|||||||
// activity watcher refines `foreground`/`activity` on its next tick.
|
// activity watcher refines `foreground`/`activity` on its next tick.
|
||||||
foreground: None,
|
foreground: None,
|
||||||
activity: ActivityState::Active,
|
activity: ActivityState::Active,
|
||||||
|
activity_detail: None,
|
||||||
last_activity_at: Utc::now(),
|
last_activity_at: Utc::now(),
|
||||||
activity_since: chrono::Utc::now(),
|
activity_since: chrono::Utc::now(),
|
||||||
|
|
||||||
@@ -409,6 +444,8 @@ impl SessionManager {
|
|||||||
worktree_base_repo,
|
worktree_base_repo,
|
||||||
worktree_branch: req.worktree.as_ref().map(|w| w.branch.clone()),
|
worktree_branch: req.worktree.as_ref().map(|w| w.branch.clone()),
|
||||||
bridge,
|
bridge,
|
||||||
|
reported_activity: None,
|
||||||
|
settled: false,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -602,6 +639,7 @@ impl SessionManager {
|
|||||||
// recovered session had already been sitting idle.
|
// recovered session had already been sitting idle.
|
||||||
foreground: None,
|
foreground: None,
|
||||||
activity: ActivityState::Idle,
|
activity: ActivityState::Idle,
|
||||||
|
activity_detail: None,
|
||||||
last_activity_at: Utc::now(),
|
last_activity_at: Utc::now(),
|
||||||
activity_since: chrono::Utc::now(),
|
activity_since: chrono::Utc::now(),
|
||||||
|
|
||||||
@@ -635,6 +673,8 @@ impl SessionManager {
|
|||||||
// recovered session probes git for it at retain time.
|
// recovered session probes git for it at retain time.
|
||||||
worktree_branch: None,
|
worktree_branch: None,
|
||||||
bridge,
|
bridge,
|
||||||
|
reported_activity: None,
|
||||||
|
settled: false,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
let _ = self
|
let _ = self
|
||||||
@@ -675,6 +715,47 @@ impl SessionManager {
|
|||||||
.await
|
.await
|
||||||
.map_err(SessionError::Tmux)
|
.map_err(SessionError::Tmux)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Accept an agent-reported activity state (#105), the only path that can
|
||||||
|
/// produce `ActivityState::Error`. The report outranks the activity pass's
|
||||||
|
/// own inference until its TTL lapses — so an agent that dies mid-run
|
||||||
|
/// cannot pin its session at `Error` forever. An unknown session is
|
||||||
|
/// [`SessionError::NotFound`]; the reported `detail` is capped
|
||||||
|
/// server-side.
|
||||||
|
///
|
||||||
|
/// A report that changes the effective state restarts `activity_since`
|
||||||
|
/// (#104's clock); re-reporting an unchanged state only extends the TTL
|
||||||
|
/// and stays silent on the event stream at steady state.
|
||||||
|
pub async fn report_activity(
|
||||||
|
&self,
|
||||||
|
id: Uuid,
|
||||||
|
state: ActivityState,
|
||||||
|
detail: Option<String>,
|
||||||
|
) -> Result<(), SessionError> {
|
||||||
|
let updated = {
|
||||||
|
let mut sessions = self.inner.sessions.lock().await;
|
||||||
|
let rec = sessions.get_mut(&id).ok_or(SessionError::NotFound(id))?;
|
||||||
|
let detail = crate::activity::truncate_detail(detail);
|
||||||
|
let changed = rec.session.activity != state || rec.session.activity_detail != detail;
|
||||||
|
if rec.session.activity != state {
|
||||||
|
rec.session.activity_since = Utc::now();
|
||||||
|
}
|
||||||
|
rec.session.activity = state;
|
||||||
|
rec.session.activity_detail = detail;
|
||||||
|
rec.reported_activity = Some(crate::activity::ReportedActivity::new(
|
||||||
|
state,
|
||||||
|
self.inner.report_ttl,
|
||||||
|
));
|
||||||
|
changed.then(|| rec.session.clone())
|
||||||
|
};
|
||||||
|
if let Some(session) = updated {
|
||||||
|
let _ = self
|
||||||
|
.inner
|
||||||
|
.events
|
||||||
|
.send(CatalogEvent::SessionUpdated { session });
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Run a blocking `tmux` subprocess call on the blocking thread pool so it
|
/// Run a blocking `tmux` subprocess call on the blocking thread pool so it
|
||||||
@@ -845,8 +926,22 @@ async fn run_activity_pass(inner: &Arc<Inner>) {
|
|||||||
let Some(rec) = sessions.get_mut(&id) else {
|
let Some(rec) = sessions.get_mut(&id) else {
|
||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
|
// #105: an agent report lapses at its TTL — drop it and its
|
||||||
|
// detail so this tick's inference takes over again.
|
||||||
|
if let Some(report) = &rec.reported_activity {
|
||||||
|
if !report.in_force(std::time::Instant::now()) {
|
||||||
|
rec.reported_activity = None;
|
||||||
|
rec.session.activity_detail = None;
|
||||||
|
}
|
||||||
|
}
|
||||||
let idle = rec.bridge.idle_for();
|
let idle = rec.bridge.idle_for();
|
||||||
let activity = crate::activity::decide(idle, awaiting);
|
// #105: while a report is in force it supplies the state and
|
||||||
|
// nothing here may overwrite it; only an unreported session is
|
||||||
|
// decided by inference.
|
||||||
|
let activity = match &rec.reported_activity {
|
||||||
|
Some(report) => report.state,
|
||||||
|
None => crate::activity::decide(idle, awaiting),
|
||||||
|
};
|
||||||
let foreground = Some(pane.command.clone());
|
let foreground = Some(pane.command.clone());
|
||||||
// The pane's live cwd, drives the dir-based session tree; empty means
|
// The pane's live cwd, drives the dir-based session tree; empty means
|
||||||
// tmux reported none.
|
// tmux reported none.
|
||||||
@@ -992,6 +1087,14 @@ async fn mark_session_dead(inner: &Arc<Inner>, id: Uuid) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Settle has now been applied or refused either way (#115): from here on
|
||||||
|
// its outcomes are safe to observe.
|
||||||
|
{
|
||||||
|
let mut sessions = inner.sessions.lock().await;
|
||||||
|
if let Some(record) = sessions.get_mut(&id) {
|
||||||
|
record.settled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let _ = inner.sidecar.write(&session);
|
let _ = inner.sidecar.write(&session);
|
||||||
let _ = inner.events.send(CatalogEvent::SessionUpdated { session });
|
let _ = inner.events.send(CatalogEvent::SessionUpdated { session });
|
||||||
|
|||||||
@@ -189,8 +189,23 @@ fn a_foreground_pipeline_whose_leader_exited_is_still_awaiting_input() {
|
|||||||
"never observed a foreground group whose leader had exited"
|
"never observed a foreground group whose leader had exited"
|
||||||
);
|
);
|
||||||
|
|
||||||
assert!(
|
// The leader can be gone while the surviving stage is still setting up:
|
||||||
awaiting_input(pane.pane_pid, &pane.tty, &ProcGroups::snapshot()),
|
// `true` exits as soon as both stages are forked, before the reader has
|
||||||
"a surviving pipeline member still holds the tty"
|
// opened the tty and parked. Poll for the answer, but only accept it
|
||||||
);
|
// while the state this test exists for still holds — otherwise a shell
|
||||||
|
// that regained the terminal would satisfy it vacuously.
|
||||||
|
let deadline = std::time::Instant::now() + Duration::from_secs(5);
|
||||||
|
let mut holds = false;
|
||||||
|
while std::time::Instant::now() < deadline {
|
||||||
|
let groups = ProcGroups::snapshot();
|
||||||
|
let still_leaderless = pgrp_and_tpgid(pane.pane_pid).is_some_and(|(pgrp, tpgid)| {
|
||||||
|
tpgid > 0 && tpgid != pgrp && pgrp_and_tpgid(tpgid).is_none()
|
||||||
|
});
|
||||||
|
if still_leaderless && awaiting_input(pane.pane_pid, &pane.tty, &groups) {
|
||||||
|
holds = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
std::thread::sleep(Duration::from_millis(20));
|
||||||
|
}
|
||||||
|
assert!(holds, "a surviving pipeline member still holds the tty");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,164 @@
|
|||||||
|
//! Agent-reported activity (#105): `POST /api/sessions/:id/activity`
|
||||||
|
//! semantics at the SessionManager level — precedence over the daemon's own
|
||||||
|
//! inference, detail handling, and lapse back to inference at the TTL.
|
||||||
|
|
||||||
|
mod common;
|
||||||
|
|
||||||
|
use std::sync::Arc;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use common::TmuxFixture;
|
||||||
|
use maestro_daemon::sidecar::SidecarStore;
|
||||||
|
use maestro_daemon::worktree::WorktreeManager;
|
||||||
|
use maestro_daemon::SessionManager;
|
||||||
|
use maestro_protocol::{ActivityState, CreateSessionRequest};
|
||||||
|
use tempfile::TempDir;
|
||||||
|
use tokio::time::sleep;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
struct Fixture {
|
||||||
|
manager: SessionManager,
|
||||||
|
_tmux: TmuxFixture,
|
||||||
|
_state_dir: TempDir,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn fixture(ttl: Duration) -> Fixture {
|
||||||
|
let tmux = TmuxFixture::new();
|
||||||
|
let state_dir = TempDir::new().unwrap();
|
||||||
|
let manager = SessionManager::new(
|
||||||
|
Arc::new(tmux.tmux.clone()),
|
||||||
|
SidecarStore::new(state_dir.path().join("sessions")),
|
||||||
|
WorktreeManager::new(None),
|
||||||
|
state_dir.path().join("fifos"),
|
||||||
|
)
|
||||||
|
.with_activity_report_ttl(ttl);
|
||||||
|
Fixture {
|
||||||
|
manager,
|
||||||
|
_tmux: tmux,
|
||||||
|
_state_dir: state_dir,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn spawn_sleeping(manager: &SessionManager) -> Uuid {
|
||||||
|
manager
|
||||||
|
.create(CreateSessionRequest {
|
||||||
|
cwd: "/tmp".into(),
|
||||||
|
command: "sleep 60".into(),
|
||||||
|
env: Default::default(),
|
||||||
|
metadata: Default::default(),
|
||||||
|
worktree: None,
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.id
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn observed(manager: &SessionManager, id: Uuid) -> maestro_protocol::Session {
|
||||||
|
manager
|
||||||
|
.snapshot()
|
||||||
|
.await
|
||||||
|
.into_iter()
|
||||||
|
.find(|s| s.id == id)
|
||||||
|
.expect("session still tracked")
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn report_on_unknown_session_is_not_found() {
|
||||||
|
let fx = fixture(Duration::from_secs(300)).await;
|
||||||
|
let err = fx
|
||||||
|
.manager
|
||||||
|
.report_activity(Uuid::new_v4(), ActivityState::Idle, None)
|
||||||
|
.await
|
||||||
|
.unwrap_err();
|
||||||
|
assert!(matches!(err, maestro_daemon::SessionError::NotFound(_)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn report_sets_error_state_and_detail() {
|
||||||
|
let fx = fixture(Duration::from_secs(300)).await;
|
||||||
|
let id = spawn_sleeping(&fx.manager).await;
|
||||||
|
|
||||||
|
fx.manager
|
||||||
|
.report_activity(
|
||||||
|
id,
|
||||||
|
ActivityState::Error,
|
||||||
|
Some("cargo build failed: link error".into()),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let s = observed(&fx.manager, id).await;
|
||||||
|
assert_eq!(s.activity, ActivityState::Error);
|
||||||
|
assert_eq!(
|
||||||
|
s.activity_detail.as_deref(),
|
||||||
|
Some("cargo build failed: link error")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn replacing_a_report_replaces_both_state_and_detail() {
|
||||||
|
let fx = fixture(Duration::from_secs(300)).await;
|
||||||
|
let id = spawn_sleeping(&fx.manager).await;
|
||||||
|
|
||||||
|
fx.manager
|
||||||
|
.report_activity(id, ActivityState::Error, Some("first failure".into()))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
fx.manager
|
||||||
|
.report_activity(
|
||||||
|
id,
|
||||||
|
ActivityState::AwaitingInput,
|
||||||
|
Some("needs approval".into()),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let s = observed(&fx.manager, id).await;
|
||||||
|
assert_eq!(s.activity, ActivityState::AwaitingInput);
|
||||||
|
assert_eq!(s.activity_detail.as_deref(), Some("needs approval"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn detail_is_capped_server_side() {
|
||||||
|
let fx = fixture(Duration::from_secs(300)).await;
|
||||||
|
let id = spawn_sleeping(&fx.manager).await;
|
||||||
|
|
||||||
|
let long = "x".repeat(10_000);
|
||||||
|
fx.manager
|
||||||
|
.report_activity(id, ActivityState::Error, Some(long))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let s = observed(&fx.manager, id).await;
|
||||||
|
let detail = s.activity_detail.expect("detail present");
|
||||||
|
assert_eq!(
|
||||||
|
detail.chars().count(),
|
||||||
|
maestro_daemon::MAX_REPORT_DETAIL_CHARS
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn reported_state_survives_watcher_ticks_until_the_ttl_then_inference_resumes() {
|
||||||
|
let fx = fixture(Duration::from_millis(150)).await;
|
||||||
|
let id = spawn_sleeping(&fx.manager).await;
|
||||||
|
fx.manager.start_liveness_watcher(Duration::from_millis(50));
|
||||||
|
|
||||||
|
fx.manager
|
||||||
|
.report_activity(id, ActivityState::Error, Some("agent died mid-run".into()))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
// Several watcher ticks inside the TTL: nothing infers `Error`, so the
|
||||||
|
// report must hold above inference.
|
||||||
|
sleep(Duration::from_millis(80)).await;
|
||||||
|
let s = observed(&fx.manager, id).await;
|
||||||
|
assert_eq!(s.activity, ActivityState::Error);
|
||||||
|
assert_eq!(s.activity_detail.as_deref(), Some("agent died mid-run"));
|
||||||
|
|
||||||
|
// After the TTL lapses, inference resumes and the detail goes with it.
|
||||||
|
common::wait_for_async(Duration::from_secs(5), || async {
|
||||||
|
let s = observed(&fx.manager, id).await;
|
||||||
|
s.activity != ActivityState::Error && s.activity_detail.is_none()
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
}
|
||||||
@@ -346,6 +346,109 @@ async fn delete_owned_session_kills_it() {
|
|||||||
assert!(!h.manager.has(session.id).await);
|
assert!(!h.manager.has(session.id).await);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Spawn a session through the manager and return its id.
|
||||||
|
async fn spawn_via_manager(h: &Harness) -> Uuid {
|
||||||
|
h.manager
|
||||||
|
.create(CreateSessionRequest {
|
||||||
|
cwd: "/tmp".into(),
|
||||||
|
command: "sleep 60".into(),
|
||||||
|
env: HashMap::new(),
|
||||||
|
metadata: HashMap::new(),
|
||||||
|
worktree: None,
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.id
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The agent activity endpoint on the wire (#105): a report lands in the
|
||||||
|
/// session snapshot with its detail.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn post_activity_reports_error_with_detail() {
|
||||||
|
let h = spawn("naps-laptop").await;
|
||||||
|
let id = spawn_via_manager(&h).await;
|
||||||
|
|
||||||
|
let resp = reqwest::Client::new()
|
||||||
|
.post(url(h.addr, &format!("/api/sessions/{id}/activity")))
|
||||||
|
.json(&serde_json::json!({
|
||||||
|
"state": "Error",
|
||||||
|
"detail": "cargo build failed"
|
||||||
|
}))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), reqwest::StatusCode::NO_CONTENT);
|
||||||
|
|
||||||
|
let sessions: Vec<Session> = reqwest::get(url(h.addr, "/api/sessions"))
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.json()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let s = sessions.iter().find(|s| s.id == id).unwrap();
|
||||||
|
assert_eq!(s.activity, maestro_protocol::ActivityState::Error);
|
||||||
|
assert_eq!(s.activity_detail.as_deref(), Some("cargo build failed"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn post_activity_to_unknown_session_returns_404() {
|
||||||
|
let h = spawn("naps-laptop").await;
|
||||||
|
let resp = reqwest::Client::new()
|
||||||
|
.post(url(
|
||||||
|
h.addr,
|
||||||
|
&format!("/api/sessions/{}/activity", Uuid::new_v4()),
|
||||||
|
))
|
||||||
|
.json(&serde_json::json!({ "state": "Idle" }))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), reqwest::StatusCode::NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Unknown state values are rejected rather than coerced (#105).
|
||||||
|
#[tokio::test]
|
||||||
|
async fn post_activity_rejects_an_unknown_state_value() {
|
||||||
|
let h = spawn("naps-laptop").await;
|
||||||
|
let id = spawn_via_manager(&h).await;
|
||||||
|
|
||||||
|
let resp = reqwest::Client::new()
|
||||||
|
.post(url(h.addr, &format!("/api/sessions/{id}/activity")))
|
||||||
|
.json(&serde_json::json!({ "state": "Teleported" }))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert!(resp.status().is_client_error(), "got {}", resp.status());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn post_activity_caps_an_overlong_detail_server_side() {
|
||||||
|
let h = spawn("naps-laptop").await;
|
||||||
|
let id = spawn_via_manager(&h).await;
|
||||||
|
|
||||||
|
let resp = reqwest::Client::new()
|
||||||
|
.post(url(h.addr, &format!("/api/sessions/{id}/activity")))
|
||||||
|
.json(&serde_json::json!({
|
||||||
|
"state": "Error",
|
||||||
|
"detail": "x".repeat(10_000)
|
||||||
|
}))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(resp.status(), reqwest::StatusCode::NO_CONTENT);
|
||||||
|
|
||||||
|
let sessions: Vec<Session> = reqwest::get(url(h.addr, "/api/sessions"))
|
||||||
|
.await
|
||||||
|
.unwrap()
|
||||||
|
.json()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let s = sessions.iter().find(|s| s.id == id).unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
s.activity_detail.as_ref().map(|d| d.chars().count()),
|
||||||
|
Some(maestro_daemon::MAX_REPORT_DETAIL_CHARS)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/// The kill guard on the wire (#79): `DELETE /api/sessions/:id` answers 409
|
/// The kill guard on the wire (#79): `DELETE /api/sessions/:id` answers 409
|
||||||
/// with the structured breakdown, and the session keeps running.
|
/// with the structured breakdown, and the session keeps running.
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
|
|||||||
@@ -397,6 +397,12 @@ async fn watcher_refreshes_the_blocked_work_indicator() {
|
|||||||
init_bare_repo(origin.path());
|
init_bare_repo(origin.path());
|
||||||
push_all_to_origin(repo.path(), origin.path());
|
push_all_to_origin(repo.path(), origin.path());
|
||||||
|
|
||||||
|
// Subscribe before the watcher starts so every pass's emission is
|
||||||
|
// captured — otherwise the breakdown event can land between the
|
||||||
|
// snapshot observation below and the drain, and the quiet window
|
||||||
|
// would see it as an illegitimate re-emit.
|
||||||
|
let mut events = fx.manager.events();
|
||||||
|
|
||||||
fx.manager.start_liveness_watcher_with_blocked_work(
|
fx.manager.start_liveness_watcher_with_blocked_work(
|
||||||
Duration::from_millis(50),
|
Duration::from_millis(50),
|
||||||
Duration::from_millis(100),
|
Duration::from_millis(100),
|
||||||
@@ -418,14 +424,38 @@ async fn watcher_refreshes_the_blocked_work_indicator() {
|
|||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
// A steady state must not re-emit every tick (#83 change-detection).
|
// Consume through the emission that carried the breakdown (#83
|
||||||
let mut events = fx.manager.events();
|
// change-detection): the quiet window below must start after the last
|
||||||
|
// legitimate change, not race it into the channel.
|
||||||
|
loop {
|
||||||
|
match tokio::time::timeout(Duration::from_secs(5), events.recv()).await {
|
||||||
|
Ok(Ok(CatalogEvent::SessionUpdated { session }))
|
||||||
|
if matches!(
|
||||||
|
&session.blocked_work,
|
||||||
|
Some(b) if b.uncommitted_files >= 1 && b.untracked_files >= 1
|
||||||
|
) =>
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Ok(Ok(_)) => continue,
|
||||||
|
_ => panic!("never saw the SessionUpdated carrying the breakdown"),
|
||||||
|
}
|
||||||
|
}
|
||||||
while events.try_recv().is_ok() {}
|
while events.try_recv().is_ok() {}
|
||||||
tokio::time::sleep(Duration::from_millis(400)).await;
|
tokio::time::sleep(Duration::from_millis(400)).await;
|
||||||
assert!(
|
// Only a *changed* indicator counts as a re-emit (#83 change-detection).
|
||||||
!matches!(events.try_recv(), Ok(CatalogEvent::SessionUpdated { .. })),
|
// The activity pass may still legitimately announce e.g. Active→Idle
|
||||||
"an unchanged worktree must not re-emit SessionUpdated"
|
// (its debounce is time-based, not worktree-based), and its payload
|
||||||
);
|
// carries today's blocked_work unchanged.
|
||||||
|
while let Ok(CatalogEvent::SessionUpdated { session }) = events.try_recv() {
|
||||||
|
assert!(
|
||||||
|
matches!(
|
||||||
|
&session.blocked_work,
|
||||||
|
Some(b) if b.uncommitted_files >= 1 && b.untracked_files >= 1
|
||||||
|
),
|
||||||
|
"an unchanged worktree must not re-emit a changed indicator"
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Cleanup on kill is unconditional once the guard passes (#79): even a spec
|
/// Cleanup on kill is unconditional once the guard passes (#79): even a spec
|
||||||
@@ -769,6 +799,14 @@ async fn natural_exit_of_a_guarded_worktree_retains_it_in_the_store() {
|
|||||||
"a dirty worktree must be retained on natural exit"
|
"a dirty worktree must be retained on natural exit"
|
||||||
);
|
);
|
||||||
// ...in the store, under the exit reason.
|
// ...in the store, under the exit reason.
|
||||||
|
// (`Dead` is observable a moment before the settle step's store write lands.)
|
||||||
|
wait_for_async(Duration::from_secs(3), || async {
|
||||||
|
fx.retained_store()
|
||||||
|
.load_all()
|
||||||
|
.map(|all| all.len() == 1)
|
||||||
|
.unwrap_or(false)
|
||||||
|
})
|
||||||
|
.await;
|
||||||
let all = fx.retained_store().load_all().expect("load_all");
|
let all = fx.retained_store().load_all().expect("load_all");
|
||||||
assert_eq!(all.len(), 1);
|
assert_eq!(all.len(), 1);
|
||||||
assert_eq!(all[0].path, wt_path);
|
assert_eq!(all[0].path, wt_path);
|
||||||
@@ -840,6 +878,17 @@ async fn natural_exit_of_a_pristine_worktree_removes_it() {
|
|||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
|
// (`Dead` is observable a moment before the settle step removes the tree.)
|
||||||
|
wait_for_async(Duration::from_secs(3), || async {
|
||||||
|
!wt_path.exists()
|
||||||
|
&& fx
|
||||||
|
.retained_store()
|
||||||
|
.load_all()
|
||||||
|
.map(|all| all.is_empty())
|
||||||
|
.unwrap_or(false)
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
assert!(
|
assert!(
|
||||||
!wt_path.exists(),
|
!wt_path.exists(),
|
||||||
"a pristine worktree leaves nothing behind"
|
"a pristine worktree leaves nothing behind"
|
||||||
@@ -897,6 +946,14 @@ async fn natural_exit_without_a_retained_store_destroys_nothing() {
|
|||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
|
// The settle step has been applied or refused either way — here refused,
|
||||||
|
// since there is no store to record the tree into. Only from this point
|
||||||
|
// is "the tree survived" a settled fact rather than a race (#115).
|
||||||
|
wait_for_async(Duration::from_secs(3), || async {
|
||||||
|
manager.is_settled(s.id).await == Some(true)
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
assert!(
|
assert!(
|
||||||
wt_path.exists(),
|
wt_path.exists(),
|
||||||
"nothing may be destroyed when it cannot be recorded"
|
"nothing may be destroyed when it cannot be recorded"
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ fn sample(id: Uuid) -> Session {
|
|||||||
.with_timezone(&Utc),
|
.with_timezone(&Utc),
|
||||||
foreground: None,
|
foreground: None,
|
||||||
activity: Default::default(),
|
activity: Default::default(),
|
||||||
|
activity_detail: None,
|
||||||
last_activity_at: chrono::Utc::now(),
|
last_activity_at: chrono::Utc::now(),
|
||||||
activity_since: chrono::Utc::now(),
|
activity_since: chrono::Utc::now(),
|
||||||
current_cwd: Some(PathBuf::from("/tmp/work/crates")),
|
current_cwd: Some(PathBuf::from("/tmp/work/crates")),
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
[package]
|
||||||
|
name = "maestro-hooks"
|
||||||
|
version.workspace = true
|
||||||
|
edition.workspace = true
|
||||||
|
license.workspace = true
|
||||||
|
repository.workspace = true
|
||||||
|
publish.workspace = true
|
||||||
|
description = "Agent activity hooks (#106): shipped script + idempotent settings.json installer"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
serde_json.workspace = true
|
||||||
|
thiserror.workspace = true
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
tempfile.workspace = true
|
||||||
@@ -0,0 +1,261 @@
|
|||||||
|
//! Claude Code activity hook (#106).
|
||||||
|
//!
|
||||||
|
//! Two halves, both shared by the `maestro hooks install` CLI subcommand and
|
||||||
|
//! the daemon's first-start auto-install:
|
||||||
|
//!
|
||||||
|
//! * [`HOOK_SCRIPT`] — the hook itself, written to disk at install time. It
|
||||||
|
//! posts an [`ActivityState`](maestro-protocol) to
|
||||||
|
//! `$MAESTRO_URL/api/sessions/$MAESTRO_SESSION_ID/activity` (#105). The same
|
||||||
|
//! global hook runs in every Claude Code session on the machine, so it exits
|
||||||
|
//! 0 and silently when either #103 env var is unset, and it never lets a
|
||||||
|
//! daemon failure escape (short curl timeout, status ignored).
|
||||||
|
//! * [`install`] — idempotent registration of that script in
|
||||||
|
//! `~/.claude/settings.json`. Only entries maestro itself wrote (identified
|
||||||
|
//! by [`HOOK_MARKER`]) are touched; every other hook and every other field
|
||||||
|
//! in the file is preserved verbatim.
|
||||||
|
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
/// Marker substring every maestro-installed hook command carries. The
|
||||||
|
/// installer rewrites or removes exactly these entries — nothing else in the
|
||||||
|
/// user's settings file.
|
||||||
|
pub const HOOK_MARKER: &str = "maestro-claude-hook";
|
||||||
|
|
||||||
|
/// File name of the installed script (carries [`HOOK_MARKER`]).
|
||||||
|
pub const SCRIPT_FILE_NAME: &str = "maestro-claude-hook.sh";
|
||||||
|
|
||||||
|
/// Claude Code hook event → `ActivityState` spelling posted to the daemon.
|
||||||
|
///
|
||||||
|
/// `PreToolUse` is what makes a session `Active` *during* a long tool call —
|
||||||
|
/// `PostToolUse` alone only fires once it ends (#114). `StopFailure` is
|
||||||
|
/// Claude Code's own name for "the turn ended on an API error"; there is no
|
||||||
|
/// failure signal in `Stop` or `SessionEnd` payloads, so those never report
|
||||||
|
/// `Error`.
|
||||||
|
pub const HOOK_EVENTS: [(&str, &str); 5] = [
|
||||||
|
// Tool starting: the agent is demonstrably producing work, even if the
|
||||||
|
// tool itself runs for minutes.
|
||||||
|
("PreToolUse", "Active"),
|
||||||
|
// Tool finished successfully.
|
||||||
|
("PostToolUse", "Active"),
|
||||||
|
// Permission / idle notices: Claude is blocked on the user.
|
||||||
|
("Notification", "AwaitingInput"),
|
||||||
|
// Turn ended: waiting on the user again.
|
||||||
|
("Stop", "AwaitingInput"),
|
||||||
|
// Turn ended on an API error; the payload's `error` field is forwarded
|
||||||
|
// as the report's `detail` (#114).
|
||||||
|
("StopFailure", "Error"),
|
||||||
|
];
|
||||||
|
|
||||||
|
/// The shipped hook script. POSIX sh so any `/bin/sh` works.
|
||||||
|
pub const HOOK_SCRIPT: &str = r#"#!/bin/sh
|
||||||
|
# Installed by maestro (#106): report Claude Code activity to its daemon.
|
||||||
|
# Exits silently unless running inside a session maestro spawned (#103 env).
|
||||||
|
# Event -> ActivityState mapping:
|
||||||
|
# PreToolUse -> Active (tool started; agent is working)
|
||||||
|
# PostToolUse -> Active (tool finished)
|
||||||
|
# Notification -> AwaitingInput (permission / idle notice)
|
||||||
|
# Stop -> AwaitingInput (turn ended; waiting on the user)
|
||||||
|
# StopFailure -> Error (turn ended on an API error)
|
||||||
|
state="$1"
|
||||||
|
[ -n "$MAESTRO_SESSION_ID" ] || exit 0
|
||||||
|
[ -n "$MAESTRO_URL" ] || exit 0
|
||||||
|
payload=$(cat 2>/dev/null) || true
|
||||||
|
body="{\"state\":\"$state\"}"
|
||||||
|
# StopFailure payloads carry the outcome in "error". Only a plain enum
|
||||||
|
# spelling is reported as the detail — anything else (quotes, backslashes,
|
||||||
|
# prose) would risk breaking the JSON body, and the spelling already names
|
||||||
|
# the failure.
|
||||||
|
detail=$(printf '%s' "$payload" | sed -n 's/.*"error"[[:space:]]*:[[:space:]]*"\([a-z_]*\)".*/\1/p')
|
||||||
|
if [ -n "$detail" ]; then
|
||||||
|
body="{\"state\":\"$state\",\"detail\":\"$detail\"}"
|
||||||
|
fi
|
||||||
|
curl -fsS --connect-timeout 1 --max-time 2 \
|
||||||
|
-H 'Content-Type: application/json' \
|
||||||
|
-d "$body" \
|
||||||
|
"$MAESTRO_URL/api/sessions/$MAESTRO_SESSION_ID/activity" \
|
||||||
|
>/dev/null 2>&1 || true
|
||||||
|
exit 0
|
||||||
|
"#;
|
||||||
|
|
||||||
|
#[derive(Debug, thiserror::Error)]
|
||||||
|
pub enum HooksError {
|
||||||
|
#[error("io: {0}")]
|
||||||
|
Io(#[from] std::io::Error),
|
||||||
|
#[error("json: {0}")]
|
||||||
|
Json(#[from] serde_json::Error),
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Where the script is written for a given home directory:
|
||||||
|
/// `<home>/.local/share/maestro/maestro-claude-hook.sh`.
|
||||||
|
pub fn script_path(home: &Path) -> std::path::PathBuf {
|
||||||
|
home.join(".local/share/maestro").join(SCRIPT_FILE_NAME)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The user-level Claude Code settings file for a given home directory.
|
||||||
|
pub fn settings_path(home: &Path) -> std::path::PathBuf {
|
||||||
|
home.join(".claude/settings.json")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Whether `settings_path` already carries a maestro hook (#106).
|
||||||
|
pub fn is_installed(settings_path: &Path) -> bool {
|
||||||
|
settings_json(settings_path)
|
||||||
|
.map(|root| find_maestro_commands(&root).next().is_some())
|
||||||
|
.unwrap_or(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Write [`HOOK_SCRIPT`] to `path`, executable. Parent directories are
|
||||||
|
/// created as needed — this is always under the caller's chosen data dir,
|
||||||
|
/// never inside a repository.
|
||||||
|
pub fn write_script(path: &Path) -> Result<(), HooksError> {
|
||||||
|
if let Some(dir) = path.parent() {
|
||||||
|
std::fs::create_dir_all(dir)?;
|
||||||
|
}
|
||||||
|
std::fs::write(path, HOOK_SCRIPT)?;
|
||||||
|
#[cfg(unix)]
|
||||||
|
{
|
||||||
|
use std::os::unix::fs::PermissionsExt;
|
||||||
|
let mut perms = std::fs::metadata(path)?.permissions();
|
||||||
|
perms.set_mode(0o755);
|
||||||
|
std::fs::set_permissions(path, perms)?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Install the full hook setup for `home`: write the script under
|
||||||
|
/// `.local/share/maestro/` and register it in `.claude/settings.json`.
|
||||||
|
/// Idempotent; returns whether anything changed on disk.
|
||||||
|
pub fn install_for_home(home: &Path) -> Result<bool, HooksError> {
|
||||||
|
let script = script_path(home);
|
||||||
|
let settings = settings_path(home);
|
||||||
|
let before = std::fs::read_to_string(&settings).unwrap_or_default();
|
||||||
|
write_script(&script)?;
|
||||||
|
install(&settings, &script)?;
|
||||||
|
let after = std::fs::read_to_string(&settings).unwrap_or_default();
|
||||||
|
Ok(before != after)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Register the hook command for every event in [`HOOK_EVENTS`] in the
|
||||||
|
/// settings file at `settings_path`. Idempotent: existing maestro entries are
|
||||||
|
/// updated in place wherever they sit, stale ones removed, duplicates folded;
|
||||||
|
/// every non-maestro entry and every unrelated top-level field survives.
|
||||||
|
///
|
||||||
|
/// Never inspects or writes anywhere but `settings_path` — callers pass the
|
||||||
|
/// user's real home or a temp one in tests, never a repository.
|
||||||
|
pub fn install(settings_path: &Path, script_path: &Path) -> Result<(), HooksError> {
|
||||||
|
let mut root = settings_json(settings_path)?;
|
||||||
|
|
||||||
|
// Strip every maestro entry wherever it currently sits, so an older
|
||||||
|
// install under different events is replaced rather than duplicated.
|
||||||
|
strip_maestro_entries(&mut root);
|
||||||
|
|
||||||
|
let hooks = ensure_object(&mut root, "hooks");
|
||||||
|
for (event, state) in HOOK_EVENTS {
|
||||||
|
let groups = ensure_array(hooks, event);
|
||||||
|
let mut group = serde_json::Map::new();
|
||||||
|
group.insert(
|
||||||
|
"hooks".into(),
|
||||||
|
serde_json::json!([{
|
||||||
|
"type": "command",
|
||||||
|
"command": format!("{} {state}", script_path.display()),
|
||||||
|
}]),
|
||||||
|
);
|
||||||
|
groups.push(serde_json::Value::Object(group));
|
||||||
|
}
|
||||||
|
|
||||||
|
write_atomic(settings_path, &root)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn settings_json(path: &Path) -> Result<serde_json::Value, HooksError> {
|
||||||
|
match std::fs::read_to_string(path) {
|
||||||
|
Ok(s) => Ok(serde_json::from_str(&s)?),
|
||||||
|
Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
|
||||||
|
Ok(serde_json::Value::Object(Default::default()))
|
||||||
|
}
|
||||||
|
Err(e) => Err(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Every command string in the file belonging to a maestro hook.
|
||||||
|
fn find_maestro_commands(root: &serde_json::Value) -> impl Iterator<Item = &str> {
|
||||||
|
root.get("hooks")
|
||||||
|
.and_then(|h| h.as_object())
|
||||||
|
.into_iter()
|
||||||
|
.flat_map(|events| events.values())
|
||||||
|
.filter_map(|groups| groups.as_array())
|
||||||
|
.flatten()
|
||||||
|
.filter_map(|group| group.get("hooks"))
|
||||||
|
.filter_map(|inner| inner.as_array())
|
||||||
|
.flatten()
|
||||||
|
.filter_map(|hook| hook.get("command"))
|
||||||
|
.filter_map(|cmd| cmd.as_str())
|
||||||
|
.filter(|cmd| cmd.contains(HOOK_MARKER))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Remove all maestro inner-hook entries from every event group, dropping
|
||||||
|
/// groups left empty. Non-maestro siblings survive untouched.
|
||||||
|
fn strip_maestro_entries(root: &mut serde_json::Value) {
|
||||||
|
let Some(events) = root.get_mut("hooks").and_then(|h| h.as_object_mut()) else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
for (_, groups) in events.iter_mut() {
|
||||||
|
let Some(list) = groups.as_array_mut() else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
for group in list.iter_mut() {
|
||||||
|
let Some(inner) = group.get_mut("hooks").and_then(|h| h.as_array_mut()) else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
inner.retain(|hook| {
|
||||||
|
!hook
|
||||||
|
.get("command")
|
||||||
|
.and_then(|c| c.as_str())
|
||||||
|
.is_some_and(|c| c.contains(HOOK_MARKER))
|
||||||
|
});
|
||||||
|
}
|
||||||
|
list.retain(|group| {
|
||||||
|
group
|
||||||
|
.get("hooks")
|
||||||
|
.and_then(|h| h.as_array())
|
||||||
|
.is_some_and(|h| !h.is_empty())
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// An event left with no groups at all (ours emptied it, or the user's
|
||||||
|
// file carried an empty list) reads better gone.
|
||||||
|
events.retain(|_, groups| groups.as_array().is_some_and(|g| !g.is_empty()));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ensure_object<'a>(
|
||||||
|
root: &'a mut serde_json::Value,
|
||||||
|
key: &str,
|
||||||
|
) -> &'a mut serde_json::Map<String, serde_json::Value> {
|
||||||
|
if !root.get(key).map(|v| v.is_object()).unwrap_or(false) {
|
||||||
|
root[key] = serde_json::json!({});
|
||||||
|
}
|
||||||
|
root.get_mut(key).unwrap().as_object_mut().unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ensure_array<'a>(
|
||||||
|
parent: &'a mut serde_json::Map<String, serde_json::Value>,
|
||||||
|
key: &str,
|
||||||
|
) -> &'a mut Vec<serde_json::Value> {
|
||||||
|
let v = parent
|
||||||
|
.entry(key.to_string())
|
||||||
|
.or_insert_with(|| serde_json::json!([]));
|
||||||
|
if !v.is_array() {
|
||||||
|
*v = serde_json::json!([]);
|
||||||
|
}
|
||||||
|
v.as_array_mut().unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_atomic(path: &Path, value: &serde_json::Value) -> Result<(), HooksError> {
|
||||||
|
if let Some(dir) = path.parent() {
|
||||||
|
std::fs::create_dir_all(dir)?;
|
||||||
|
}
|
||||||
|
let tmp = path.with_extension("json.maestro-tmp");
|
||||||
|
std::fs::write(&tmp, serde_json::to_string_pretty(value)? + "\n")?;
|
||||||
|
std::fs::rename(&tmp, path)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests;
|
||||||
@@ -0,0 +1,340 @@
|
|||||||
|
//! Tests for the shipped hook script (run as a real `/bin/sh` subprocess)
|
||||||
|
//! and the settings-file installer. Everything happens under a temp `$HOME`;
|
||||||
|
//! the developer's own `~/.claude/settings.json` is never touched.
|
||||||
|
|
||||||
|
use std::io::{Read, Write};
|
||||||
|
use std::process::{Command, Stdio};
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn sh(script: &str, args: &[&str], envs: &[(&str, &str)], payload: &[u8]) -> std::process::Output {
|
||||||
|
let mut cmd = Command::new("/bin/sh");
|
||||||
|
// `sh -c CMD NAME ARGS…`: NAME fills $0, so the real arguments start at $1.
|
||||||
|
let mut argv = vec!["-c", script, HOOK_MARKER];
|
||||||
|
argv.extend(args.iter().copied());
|
||||||
|
cmd.args(&argv);
|
||||||
|
// A clean env: only what the test passes, plus PATH so curl can spawn.
|
||||||
|
cmd.env_clear();
|
||||||
|
cmd.env("PATH", std::env::var("PATH").unwrap_or_default());
|
||||||
|
for (k, v) in envs {
|
||||||
|
cmd.env(k, v);
|
||||||
|
}
|
||||||
|
let mut child = cmd
|
||||||
|
.stdin(Stdio::piped())
|
||||||
|
.stdout(Stdio::piped())
|
||||||
|
.stderr(Stdio::piped())
|
||||||
|
.spawn()
|
||||||
|
.expect("spawn /bin/sh");
|
||||||
|
// Feed a Claude-Code-style payload on stdin; the script must drain it.
|
||||||
|
child.stdin.take().unwrap().write_all(payload).ok();
|
||||||
|
child.wait_with_output().expect("wait")
|
||||||
|
}
|
||||||
|
|
||||||
|
const SESSION: &str = "01234567-89ab-cdef-0123-456789abcdef";
|
||||||
|
|
||||||
|
/// Accept exactly one HTTP request on a throwaway listener, answer 204, and
|
||||||
|
/// hand back the raw request text. Runs `run` with the base URL once the
|
||||||
|
/// acceptor thread is in place.
|
||||||
|
fn capture_request(run: impl FnOnce(String) -> std::process::Output) -> String {
|
||||||
|
let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
|
||||||
|
let addr = listener.local_addr().unwrap();
|
||||||
|
let handle = std::thread::spawn(move || {
|
||||||
|
let (mut sock, _) = listener.accept().unwrap();
|
||||||
|
let mut buf = [0u8; 4096];
|
||||||
|
let n = sock.read(&mut buf).unwrap();
|
||||||
|
sock.write_all(b"HTTP/1.1 204 No Content\r\nContent-Length: 0\r\n\r\n")
|
||||||
|
.unwrap();
|
||||||
|
String::from_utf8_lossy(&buf[..n]).to_string()
|
||||||
|
});
|
||||||
|
let out = run(format!("http://{addr}"));
|
||||||
|
assert!(out.status.success(), "{:?}", out.stderr);
|
||||||
|
handle.join().unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn session_envs(url: &str) -> Vec<(&'static str, String)> {
|
||||||
|
vec![
|
||||||
|
("MAESTRO_URL", url.to_string()),
|
||||||
|
("MAESTRO_SESSION_ID", SESSION.to_string()),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn owned_envs<'a>(envs: &'a [(&'static str, String)]) -> Vec<(&'static str, &'a str)> {
|
||||||
|
envs.iter().map(|(k, v)| (*k, v.as_str())).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The hook must be invisible outside maestro: no env vars (#103 unset) ⇒
|
||||||
|
/// exit 0, no output, stdin drained.
|
||||||
|
#[test]
|
||||||
|
fn script_exits_silently_without_maestro_env() {
|
||||||
|
for (event, _) in HOOK_EVENTS {
|
||||||
|
let out = sh(HOOK_SCRIPT, &[event], &[], br#"{"session_id":"x"}"#);
|
||||||
|
assert!(out.status.success(), "{event:?}: {:?}", out.stderr);
|
||||||
|
assert!(out.stdout.is_empty(), "{event:?}: {:?}", out.stdout);
|
||||||
|
assert!(out.stderr.is_empty(), "{event:?}: {:?}", out.stderr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// With both env vars set the script POSTs the mapped state to the daemon's
|
||||||
|
/// activity endpoint and still exits 0.
|
||||||
|
#[test]
|
||||||
|
fn script_posts_mapped_state_to_the_activity_endpoint() {
|
||||||
|
// The installer bakes the mapped state into the command's argv; the
|
||||||
|
// script relays whatever it is given.
|
||||||
|
let request = capture_request(|url| {
|
||||||
|
sh(
|
||||||
|
HOOK_SCRIPT,
|
||||||
|
&["Active"],
|
||||||
|
&owned_envs(&session_envs(&url)),
|
||||||
|
br#"{"session_id":"x"}"#,
|
||||||
|
)
|
||||||
|
});
|
||||||
|
assert!(request.starts_with("POST "), "{request}");
|
||||||
|
assert!(
|
||||||
|
request.contains(&format!("/api/sessions/{SESSION}/activity")),
|
||||||
|
"{request}"
|
||||||
|
);
|
||||||
|
assert!(request.contains(r#""state":"Active""#), "{request}");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Every event maps to the state the contract specifies.
|
||||||
|
#[test]
|
||||||
|
fn event_state_mapping_matches_the_contract() {
|
||||||
|
let map: std::collections::HashMap<&str, &str> = HOOK_EVENTS.into_iter().collect();
|
||||||
|
assert_eq!(map["PreToolUse"], "Active");
|
||||||
|
assert_eq!(map["PostToolUse"], "Active");
|
||||||
|
assert_eq!(map["Notification"], "AwaitingInput");
|
||||||
|
assert_eq!(map["Stop"], "AwaitingInput");
|
||||||
|
assert_eq!(map["StopFailure"], "Error");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A `StopFailure` payload names the API error that ended the turn; the
|
||||||
|
/// script reports its `error` spelling as the report's `detail` so a card
|
||||||
|
/// can show why (#114).
|
||||||
|
#[test]
|
||||||
|
fn script_reports_the_error_spelling_as_detail() {
|
||||||
|
let request = capture_request(|url| {
|
||||||
|
sh(
|
||||||
|
HOOK_SCRIPT,
|
||||||
|
&["Error"],
|
||||||
|
&owned_envs(&session_envs(&url)),
|
||||||
|
br#"{"session_id":"abc","hook_event_name":"StopFailure","error":"rate_limit","error_details":"429 Too Many Requests"}"#,
|
||||||
|
)
|
||||||
|
});
|
||||||
|
assert!(request.contains(r#""state":"Error""#), "{request}");
|
||||||
|
assert!(request.contains(r#""detail":"rate_limit""#), "{request}");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An `error` value that is not a plain enum spelling (or a payload without
|
||||||
|
/// one at all) must never produce a broken body — no detail is posted.
|
||||||
|
#[test]
|
||||||
|
fn script_posts_no_detail_for_an_unexpected_error_value() {
|
||||||
|
let request = capture_request(|url| {
|
||||||
|
sh(
|
||||||
|
HOOK_SCRIPT,
|
||||||
|
&["Error"],
|
||||||
|
&owned_envs(&session_envs(&url)),
|
||||||
|
br#"{"hook_event_name":"StopFailure","error":"429 \"Too Many\" \\ requests"}"#,
|
||||||
|
)
|
||||||
|
});
|
||||||
|
assert!(request.contains(r#""state":"Error""#), "{request}");
|
||||||
|
assert!(!request.contains("detail"), "{request}");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Events whose payload carries no error fields post a bare body — never an
|
||||||
|
/// empty or stale detail.
|
||||||
|
#[test]
|
||||||
|
fn script_posts_no_detail_for_events_without_an_error() {
|
||||||
|
let request = capture_request(|url| {
|
||||||
|
sh(
|
||||||
|
HOOK_SCRIPT,
|
||||||
|
&["AwaitingInput"],
|
||||||
|
&owned_envs(&session_envs(&url)),
|
||||||
|
br#"{"hook_event_name":"Stop","stop_hook_active":false}"#,
|
||||||
|
)
|
||||||
|
});
|
||||||
|
assert!(request.contains(r#""state":"AwaitingInput""#), "{request}");
|
||||||
|
assert!(!request.contains("detail"), "{request}");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A dead or unreachable daemon must never fail — or slow down — a session.
|
||||||
|
#[test]
|
||||||
|
fn script_ignores_daemon_failure() {
|
||||||
|
// Port 1 on localhost is closed in practice; curl fails fast.
|
||||||
|
let out = sh(
|
||||||
|
HOOK_SCRIPT,
|
||||||
|
&["Stop"],
|
||||||
|
&[
|
||||||
|
("MAESTRO_URL", "http://127.0.0.1:1"),
|
||||||
|
("MAESTRO_SESSION_ID", "00000000-0000-0000-0000-000000000000"),
|
||||||
|
],
|
||||||
|
br#"{"session_id":"x"}"#,
|
||||||
|
);
|
||||||
|
assert!(out.status.success());
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- installer -------------------------------------------------------------
|
||||||
|
|
||||||
|
fn installed_commands(settings: &Path) -> Vec<String> {
|
||||||
|
serde_json::from_str::<serde_json::Value>(&std::fs::read_to_string(settings).unwrap())
|
||||||
|
.unwrap()
|
||||||
|
.get("hooks")
|
||||||
|
.and_then(|h| h.as_object())
|
||||||
|
.into_iter()
|
||||||
|
.flat_map(|events| events.values())
|
||||||
|
.filter_map(|g| g.as_array())
|
||||||
|
.flatten()
|
||||||
|
.filter_map(|g| g.get("hooks"))
|
||||||
|
.filter_map(|h| h.as_array())
|
||||||
|
.flatten()
|
||||||
|
.filter_map(|h| h.get("command"))
|
||||||
|
.filter_map(|c| c.as_str())
|
||||||
|
.map(str::to_string)
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Fresh install registers exactly one command per event, all pointing at the
|
||||||
|
/// script with the right state argument.
|
||||||
|
#[test]
|
||||||
|
fn fresh_install_registers_every_event() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let home = dir.path();
|
||||||
|
write_script(&script_path(home)).unwrap();
|
||||||
|
install(&settings_path(home), &script_path(home)).unwrap();
|
||||||
|
|
||||||
|
let cmds = installed_commands(&settings_path(home));
|
||||||
|
assert_eq!(cmds.len(), HOOK_EVENTS.len());
|
||||||
|
let joined = cmds.join("\n");
|
||||||
|
assert_eq!(joined.matches("Active").count(), 2);
|
||||||
|
assert!(joined.contains("Error"));
|
||||||
|
assert_eq!(joined.matches("AwaitingInput").count(), 2);
|
||||||
|
for cmd in &cmds {
|
||||||
|
assert!(cmd.contains(SCRIPT_FILE_NAME));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Running install twice changes nothing further — no duplicates.
|
||||||
|
#[test]
|
||||||
|
fn install_is_idempotent() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let home = dir.path();
|
||||||
|
install(&settings_path(home), &script_path(home)).unwrap();
|
||||||
|
let once = std::fs::read_to_string(settings_path(home)).unwrap();
|
||||||
|
|
||||||
|
install(&settings_path(home), &script_path(home)).unwrap();
|
||||||
|
let twice = std::fs::read_to_string(settings_path(home)).unwrap();
|
||||||
|
assert_eq!(once, twice);
|
||||||
|
assert_eq!(
|
||||||
|
installed_commands(&settings_path(home)).len(),
|
||||||
|
HOOK_EVENTS.len()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An older maestro entry under the same events is updated in place, not
|
||||||
|
/// duplicated next to the new one.
|
||||||
|
#[test]
|
||||||
|
fn install_updates_an_older_maestro_hook_in_place() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let settings = dir.path().join(".claude/settings.json");
|
||||||
|
std::fs::create_dir_all(settings.parent().unwrap()).unwrap();
|
||||||
|
let old_script = "/old/location/maestro-claude-hook.sh Active";
|
||||||
|
std::fs::write(
|
||||||
|
&settings,
|
||||||
|
serde_json::json!({
|
||||||
|
"model": "sonnet",
|
||||||
|
"hooks": {
|
||||||
|
"Stop": [{"hooks": [{"type": "command", "command": old_script}]}],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.to_string(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let new_script = dir
|
||||||
|
.path()
|
||||||
|
.join(".local/share/maestro")
|
||||||
|
.join(SCRIPT_FILE_NAME);
|
||||||
|
install(&settings, &new_script).unwrap();
|
||||||
|
|
||||||
|
let cmds = installed_commands(&settings);
|
||||||
|
assert_eq!(
|
||||||
|
cmds.len(),
|
||||||
|
HOOK_EVENTS.len(),
|
||||||
|
"old entry replaced, not kept: {cmds:?}"
|
||||||
|
);
|
||||||
|
assert!(!cmds.iter().any(|c| c == old_script));
|
||||||
|
let root: serde_json::Value =
|
||||||
|
serde_json::from_str(&std::fs::read_to_string(&settings).unwrap()).unwrap();
|
||||||
|
assert_eq!(root["model"], "sonnet", "unrelated fields survive");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A stale maestro entry under an event we no longer use is cleaned up too;
|
||||||
|
/// the user's own hooks are never touched.
|
||||||
|
#[test]
|
||||||
|
fn install_preserves_foreign_hooks_and_removes_stale_maestro_ones() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let settings = dir.path().join(".claude/settings.json");
|
||||||
|
std::fs::create_dir_all(settings.parent().unwrap()).unwrap();
|
||||||
|
std::fs::write(
|
||||||
|
&settings,
|
||||||
|
serde_json::json!({
|
||||||
|
"hooks": {
|
||||||
|
"PreToolUse": [{"matcher": "Bash", "hooks": [
|
||||||
|
{"type": "command", "command": "my-own-linter.sh"},
|
||||||
|
]}],
|
||||||
|
"UserPromptSubmit": [{"hooks": [
|
||||||
|
{"type": "command", "command": "/old/maestro-claude-hook.sh Active"},
|
||||||
|
]}],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.to_string(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let new_script = dir
|
||||||
|
.path()
|
||||||
|
.join(".local/share/maestro")
|
||||||
|
.join(SCRIPT_FILE_NAME);
|
||||||
|
install(&settings, &new_script).unwrap();
|
||||||
|
|
||||||
|
let root: serde_json::Value =
|
||||||
|
serde_json::from_str(&std::fs::read_to_string(&settings).unwrap()).unwrap();
|
||||||
|
// Foreign hook untouched.
|
||||||
|
let pre = root["hooks"]["PreToolUse"].as_array().unwrap();
|
||||||
|
assert_eq!(pre[0]["hooks"][0]["command"], "my-own-linter.sh");
|
||||||
|
// Stale maestro event gone.
|
||||||
|
assert!(root["hooks"].get("UserPromptSubmit").is_none());
|
||||||
|
// Our events present, nothing else maestro-related anywhere.
|
||||||
|
let cmds = installed_commands(&settings);
|
||||||
|
assert_eq!(
|
||||||
|
cmds.iter().filter(|c| c.contains(HOOK_MARKER)).count(),
|
||||||
|
HOOK_EVENTS.len(),
|
||||||
|
"{cmds:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `is_installed` flips only once a maestro entry exists.
|
||||||
|
#[test]
|
||||||
|
fn is_installed_tracks_reality() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let home = dir.path();
|
||||||
|
assert!(!is_installed(&settings_path(home)));
|
||||||
|
install_for_home(home).unwrap();
|
||||||
|
assert!(is_installed(&settings_path(home)));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The full home-level install leaves the script executable.
|
||||||
|
#[test]
|
||||||
|
fn install_for_home_writes_an_executable_script() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let home = dir.path();
|
||||||
|
install_for_home(home).unwrap();
|
||||||
|
#[cfg(unix)]
|
||||||
|
{
|
||||||
|
use std::os::unix::fs::PermissionsExt;
|
||||||
|
let mode = std::fs::metadata(script_path(home))
|
||||||
|
.unwrap()
|
||||||
|
.permissions()
|
||||||
|
.mode();
|
||||||
|
assert_eq!(mode & 0o111, 0o111);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,7 +16,7 @@ use uuid::Uuid;
|
|||||||
use crate::routes::{self, UrlError};
|
use crate::routes::{self, UrlError};
|
||||||
use crate::{
|
use crate::{
|
||||||
ApiError, BranchInfo, CreateSessionRequest, DaemonInfo, DirListing, ErrorInfo, GitRoot,
|
ApiError, BranchInfo, CreateSessionRequest, DaemonInfo, DirListing, ErrorInfo, GitRoot,
|
||||||
KillOutcome, Project, RecentDirs, RetainedWorktree, Session,
|
KillOutcome, Project, RecentDirs, ReportActivityRequest, RetainedWorktree, Session,
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Time budget for establishing a TCP connection to the daemon.
|
/// Time budget for establishing a TCP connection to the daemon.
|
||||||
@@ -134,6 +134,21 @@ impl DaemonClient {
|
|||||||
json(resp).await
|
json(resp).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `POST /api/sessions/:id/activity` (#105): report an agent-observed
|
||||||
|
/// state. The daemon holds it above its own inference for a TTL, then
|
||||||
|
/// resumes inference. Answers `204 No Content`.
|
||||||
|
pub async fn report_activity(
|
||||||
|
&self,
|
||||||
|
id: Uuid,
|
||||||
|
req: &ReportActivityRequest,
|
||||||
|
) -> Result<(), ClientError> {
|
||||||
|
let resp = self
|
||||||
|
.send(Method::POST, &routes::session_activity(id), &[], Some(req))
|
||||||
|
.await?;
|
||||||
|
check(resp).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn daemon_info(&self) -> Result<DaemonInfo, ClientError> {
|
pub async fn daemon_info(&self) -> Result<DaemonInfo, ClientError> {
|
||||||
self.get(routes::INFO, &[]).await
|
self.get(routes::INFO, &[]).await
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,321 @@
|
|||||||
|
//! Path-abbreviation helpers shared by every client that renders a session's
|
||||||
|
//! directory (CLI, TUI, web (#117)). Ports of `web/src/types.ts` and
|
||||||
|
//! `web/src/tree.ts`'s `abbreviateCwd`, `abbreviateFolderName`, `mergeLinear`,
|
||||||
|
//! and `sessionTreePath` — keep them in sync.
|
||||||
|
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use crate::Session;
|
||||||
|
|
||||||
|
/// Collapse a daemon's home dir to `~`. `home` empty leaves the path
|
||||||
|
/// untouched. Mirrors the web's `abbreviateCwd`.
|
||||||
|
pub fn abbreviate_dir(path: &Path, home: &str) -> String {
|
||||||
|
let p = path.to_string_lossy();
|
||||||
|
if !home.is_empty() {
|
||||||
|
if p == home {
|
||||||
|
return "~".into();
|
||||||
|
}
|
||||||
|
if let Some(rest) = p.strip_prefix(&format!("{home}/")) {
|
||||||
|
return format!("~/{rest}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p.into_owned()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Result of [`abbreviate_folder_name`]: the last path segment kept verbatim,
|
||||||
|
/// and — when there was something to collapse — the shortened lead-in a
|
||||||
|
/// caller can render dimmed (the web's `.folder-stem`).
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
pub struct AbbreviatedFolderName {
|
||||||
|
/// The collapsed earlier segments, joined by `/`, with no trailing
|
||||||
|
/// slash. `None` when `name` had two or fewer segments — nothing to
|
||||||
|
/// gain from collapsing, so `last` carries the name unabbreviated.
|
||||||
|
pub stem: Option<String>,
|
||||||
|
pub last: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `~/git.naps.pt/naps62/maestro` → stem `~/g/n`, last `maestro`: keep the
|
||||||
|
/// last segment verbatim, collapse every earlier one to its first character.
|
||||||
|
/// Two-or-fewer segments are left alone. Mirrors the web's
|
||||||
|
/// `abbreviateFolderName`, minus the HTML escaping/wrapping — a ratatui
|
||||||
|
/// caller styles `stem` dim itself rather than parsing markup out of it.
|
||||||
|
pub fn abbreviate_folder_name(name: &str) -> AbbreviatedFolderName {
|
||||||
|
let parts: Vec<&str> = name.split('/').collect();
|
||||||
|
if parts.len() <= 2 {
|
||||||
|
return AbbreviatedFolderName {
|
||||||
|
stem: None,
|
||||||
|
last: name.to_string(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
let last = parts[parts.len() - 1].to_string();
|
||||||
|
let stem = parts[..parts.len() - 1]
|
||||||
|
.iter()
|
||||||
|
.map(|p| {
|
||||||
|
if *p == "~" {
|
||||||
|
"~".to_string()
|
||||||
|
} else {
|
||||||
|
p.chars().next().map(String::from).unwrap_or_default()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join("/");
|
||||||
|
AbbreviatedFolderName {
|
||||||
|
stem: Some(stem),
|
||||||
|
last,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The directory a session lives in: its live `current_cwd` if the daemon
|
||||||
|
/// has observed one, else the spawn `cwd`. Mirrors the web's `sessionCwd`.
|
||||||
|
fn session_cwd(s: &Session) -> Option<PathBuf> {
|
||||||
|
if let Some(cur) = &s.current_cwd {
|
||||||
|
if !cur.as_os_str().is_empty() {
|
||||||
|
return Some(cur.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !s.cwd.as_os_str().is_empty() {
|
||||||
|
return Some(s.cwd.clone());
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Where a session sits in the directory tree. A worktree session belongs to
|
||||||
|
/// its repository, not to the worktree (#99): otherwise `~/tea/agent-skills`
|
||||||
|
/// grows a `~/tea/agent-skills/worktrees/largo-clarinet` folder holding one
|
||||||
|
/// session of the same name, and the repository stops being where you look
|
||||||
|
/// for the work. Mirrors the web's `sessionTreePath`.
|
||||||
|
pub fn session_tree_path(s: &Session) -> Option<PathBuf> {
|
||||||
|
if let Some(wt) = &s.worktree {
|
||||||
|
return Some(wt.base_repo.clone());
|
||||||
|
}
|
||||||
|
session_cwd(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One node of a directory tree grouping sessions by path, generic over the
|
||||||
|
/// leaf payload since building the tree itself (grouping key, sort order,
|
||||||
|
/// filtering) is not this crate's job — only [`merge_linear`] is.
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
pub enum TreeNode<T> {
|
||||||
|
Folder(TreeFolder<T>),
|
||||||
|
Leaf(T),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
pub struct TreeFolder<T> {
|
||||||
|
pub name: String,
|
||||||
|
pub path: String,
|
||||||
|
pub children: Vec<TreeNode<T>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Fold a folder with a single folder-child into one node (`a` + `b` →
|
||||||
|
/// `a/b`), repeating down the chain, then recurse into the surviving
|
||||||
|
/// branches. The merged node keeps the deepest path so collapse/expand state
|
||||||
|
/// stays stable as it grows. Mirrors the web's `mergeLinear`.
|
||||||
|
pub fn merge_linear<T>(folder: TreeFolder<T>) -> TreeFolder<T> {
|
||||||
|
let mut cur = folder;
|
||||||
|
loop {
|
||||||
|
let single_folder_child =
|
||||||
|
cur.children.len() == 1 && matches!(cur.children[0], TreeNode::Folder(_));
|
||||||
|
if !single_folder_child {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
let child = match cur.children.pop().expect("checked len == 1 above") {
|
||||||
|
TreeNode::Folder(f) => f,
|
||||||
|
TreeNode::Leaf(_) => unreachable!("checked matches! above"),
|
||||||
|
};
|
||||||
|
cur = TreeFolder {
|
||||||
|
name: format!("{}/{}", cur.name, child.name),
|
||||||
|
path: child.path,
|
||||||
|
children: child.children,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
cur.children = cur
|
||||||
|
.children
|
||||||
|
.into_iter()
|
||||||
|
.map(|c| match c {
|
||||||
|
TreeNode::Folder(f) => TreeNode::Folder(merge_linear(f)),
|
||||||
|
leaf => leaf,
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
cur
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use crate::{SessionStatus, SessionWorktree};
|
||||||
|
use chrono::{TimeZone, Utc};
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
fn session(cwd: &str) -> Session {
|
||||||
|
Session {
|
||||||
|
id: Uuid::from_u128(1),
|
||||||
|
cwd: PathBuf::from(cwd),
|
||||||
|
command: "bash".into(),
|
||||||
|
env: HashMap::new(),
|
||||||
|
metadata: HashMap::new(),
|
||||||
|
worktree: None,
|
||||||
|
status: SessionStatus::Running,
|
||||||
|
created_at: Utc.with_ymd_and_hms(2026, 8, 25, 12, 0, 0).unwrap(),
|
||||||
|
foreground: None,
|
||||||
|
activity: Default::default(),
|
||||||
|
activity_detail: None,
|
||||||
|
last_activity_at: Utc::now(),
|
||||||
|
activity_since: Utc::now(),
|
||||||
|
current_cwd: None,
|
||||||
|
blocked_work: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn abbreviate_dir_collapses_home() {
|
||||||
|
assert_eq!(
|
||||||
|
abbreviate_dir(Path::new("/home/naps/maestro"), "/home/naps"),
|
||||||
|
"~/maestro"
|
||||||
|
);
|
||||||
|
assert_eq!(abbreviate_dir(Path::new("/home/naps"), "/home/naps"), "~");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn abbreviate_dir_leaves_paths_outside_home_untouched() {
|
||||||
|
assert_eq!(
|
||||||
|
abbreviate_dir(Path::new("/srv/work/api"), "/home/naps"),
|
||||||
|
"/srv/work/api"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
abbreviate_dir(Path::new("/srv/work/api"), ""),
|
||||||
|
"/srv/work/api"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn abbreviate_folder_name_collapses_the_stem() {
|
||||||
|
let got = abbreviate_folder_name("~/git.naps.pt/naps62/maestro");
|
||||||
|
assert_eq!(
|
||||||
|
got,
|
||||||
|
AbbreviatedFolderName {
|
||||||
|
stem: Some("~/g/n".into()),
|
||||||
|
last: "maestro".into(),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Two-or-fewer segments are left alone — nothing to gain from collapsing.
|
||||||
|
#[test]
|
||||||
|
fn abbreviate_folder_name_two_segment_no_op() {
|
||||||
|
assert_eq!(
|
||||||
|
abbreviate_folder_name("~/work"),
|
||||||
|
AbbreviatedFolderName {
|
||||||
|
stem: None,
|
||||||
|
last: "~/work".into(),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
abbreviate_folder_name("work"),
|
||||||
|
AbbreviatedFolderName {
|
||||||
|
stem: None,
|
||||||
|
last: "work".into(),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn session_tree_path_prefers_worktree_base_repo() {
|
||||||
|
let mut s = session("/home/n/tea/agent-skills/worktrees/largo-clarinet");
|
||||||
|
s.worktree = Some(SessionWorktree {
|
||||||
|
path: PathBuf::from("/home/n/tea/agent-skills/worktrees/largo-clarinet"),
|
||||||
|
base_repo: PathBuf::from("/home/n/tea/agent-skills"),
|
||||||
|
});
|
||||||
|
assert_eq!(
|
||||||
|
session_tree_path(&s),
|
||||||
|
Some(PathBuf::from("/home/n/tea/agent-skills"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn session_tree_path_falls_back_to_cwd_without_a_worktree() {
|
||||||
|
let s = session("/home/n/tea/arr");
|
||||||
|
assert_eq!(
|
||||||
|
session_tree_path(&s),
|
||||||
|
Some(PathBuf::from("/home/n/tea/arr"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn session_tree_path_prefers_live_current_cwd_over_spawn_cwd() {
|
||||||
|
let mut s = session("/home/n/tea/arr");
|
||||||
|
s.current_cwd = Some(PathBuf::from("/home/n/tea/arr/crates"));
|
||||||
|
assert_eq!(
|
||||||
|
session_tree_path(&s),
|
||||||
|
Some(PathBuf::from("/home/n/tea/arr/crates"))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn leaf(name: &str) -> TreeNode<String> {
|
||||||
|
TreeNode::Leaf(name.into())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn folder(name: &str, path: &str, children: Vec<TreeNode<String>>) -> TreeFolder<String> {
|
||||||
|
TreeFolder {
|
||||||
|
name: name.into(),
|
||||||
|
path: path.into(),
|
||||||
|
children,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The web's mergeLinear test: keeps the deepest path so collapse state
|
||||||
|
/// survives growth.
|
||||||
|
#[test]
|
||||||
|
fn merge_linear_folds_a_chain_and_keeps_the_deepest_path() {
|
||||||
|
let tree = folder("a", "a", vec![TreeNode::Folder(folder("b", "a/b", vec![]))]);
|
||||||
|
let merged = merge_linear(tree);
|
||||||
|
assert_eq!(merged.name, "a/b");
|
||||||
|
assert_eq!(merged.path, "a/b");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn merge_linear_stops_where_a_directory_branches() {
|
||||||
|
let tree = folder(
|
||||||
|
"git",
|
||||||
|
"git",
|
||||||
|
vec![
|
||||||
|
TreeNode::Folder(folder("one", "git/one", vec![])),
|
||||||
|
TreeNode::Folder(folder("two", "git/two", vec![])),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
let merged = merge_linear(tree);
|
||||||
|
assert_eq!(merged.name, "git");
|
||||||
|
assert_eq!(merged.children.len(), 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn merge_linear_stops_at_a_leaf() {
|
||||||
|
let tree = folder("a", "a", vec![leaf("session")]);
|
||||||
|
let merged = merge_linear(tree);
|
||||||
|
assert_eq!(merged.name, "a");
|
||||||
|
assert_eq!(merged.children, vec![leaf("session")]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn merge_linear_recurses_into_surviving_branches() {
|
||||||
|
let tree = folder(
|
||||||
|
"root",
|
||||||
|
"root",
|
||||||
|
vec![
|
||||||
|
TreeNode::Folder(folder(
|
||||||
|
"a",
|
||||||
|
"root/a",
|
||||||
|
vec![TreeNode::Folder(folder("b", "root/a/b", vec![leaf("s")]))],
|
||||||
|
)),
|
||||||
|
leaf("other"),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
let merged = merge_linear(tree);
|
||||||
|
assert_eq!(merged.children.len(), 2);
|
||||||
|
let TreeNode::Folder(nested) = &merged.children[0] else {
|
||||||
|
panic!("expected folder")
|
||||||
|
};
|
||||||
|
assert_eq!(nested.name, "a/b");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
#[cfg(feature = "client")]
|
#[cfg(feature = "client")]
|
||||||
pub mod client;
|
pub mod client;
|
||||||
|
pub mod display;
|
||||||
pub mod routes;
|
pub mod routes;
|
||||||
|
|
||||||
#[cfg(feature = "client")]
|
#[cfg(feature = "client")]
|
||||||
@@ -75,6 +76,12 @@ pub struct Session {
|
|||||||
/// byte stream.
|
/// byte stream.
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub activity: ActivityState,
|
pub activity: ActivityState,
|
||||||
|
/// Short human-readable string an agent reported alongside its activity
|
||||||
|
/// (#105) — e.g. why it is in `Error`. Shown on a sidebar card's meta line
|
||||||
|
/// while the report is in force; cleared when the report lapses or is
|
||||||
|
/// replaced. `None` unless an agent reported one.
|
||||||
|
#[serde(default)]
|
||||||
|
pub activity_detail: Option<String>,
|
||||||
/// Wall-clock time of the session's most recent observed PTY output.
|
/// Wall-clock time of the session's most recent observed PTY output.
|
||||||
/// Drives "idle for Ns" displays. Defaults to the Unix epoch on payloads
|
/// Drives "idle for Ns" displays. Defaults to the Unix epoch on payloads
|
||||||
/// from daemons that predate the field.
|
/// from daemons that predate the field.
|
||||||
@@ -152,6 +159,45 @@ impl<'de> Deserialize<'de> for ActivityState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// HTTP `POST /api/sessions/:id/activity` body (#105): an agent's report of
|
||||||
|
/// its own state. The daemon holds the reported state above its own inference
|
||||||
|
/// for a fixed TTL, then resumes inference.
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub struct ReportActivityRequest {
|
||||||
|
/// Parsed strictly, unlike [`ActivityState`]'s own lenient `Deserialize`
|
||||||
|
/// (#110). Leniency exists so a client reading a *newer* daemon's snapshot
|
||||||
|
/// degrades an unrecognised state to `Idle` instead of dropping the whole
|
||||||
|
/// session. A report travelling the other way has no such excuse: an agent
|
||||||
|
/// posting a state this daemon does not know is a bug in the agent, and
|
||||||
|
/// silently recording it as `Idle` would hide that behind a 204.
|
||||||
|
#[serde(deserialize_with = "strict_activity_state")]
|
||||||
|
pub state: ActivityState,
|
||||||
|
/// Short human string shown next to the state (e.g. an error message).
|
||||||
|
/// The daemon caps its length server-side.
|
||||||
|
#[serde(default)]
|
||||||
|
pub detail: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Reject an unknown [`ActivityState`] spelling instead of degrading it to
|
||||||
|
/// `Idle`. Used only by [`ReportActivityRequest`]; see the note there.
|
||||||
|
fn strict_activity_state<'de, D>(deserializer: D) -> Result<ActivityState, D::Error>
|
||||||
|
where
|
||||||
|
D: serde::Deserializer<'de>,
|
||||||
|
{
|
||||||
|
use serde::de::Error as _;
|
||||||
|
let s = String::deserialize(deserializer)?;
|
||||||
|
match s.as_str() {
|
||||||
|
"Active" => Ok(ActivityState::Active),
|
||||||
|
"Idle" => Ok(ActivityState::Idle),
|
||||||
|
"AwaitingInput" => Ok(ActivityState::AwaitingInput),
|
||||||
|
"Error" => Ok(ActivityState::Error),
|
||||||
|
other => Err(D::Error::unknown_variant(
|
||||||
|
other,
|
||||||
|
&["Active", "Idle", "AwaitingInput", "Error"],
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Optional worktree request attached to a `CreateSessionRequest`.
|
/// Optional worktree request attached to a `CreateSessionRequest`.
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub struct WorktreeSpec {
|
pub struct WorktreeSpec {
|
||||||
@@ -565,6 +611,7 @@ mod tests {
|
|||||||
.with_timezone(&Utc),
|
.with_timezone(&Utc),
|
||||||
foreground: Some("claude".into()),
|
foreground: Some("claude".into()),
|
||||||
activity: ActivityState::Active,
|
activity: ActivityState::Active,
|
||||||
|
activity_detail: None,
|
||||||
last_activity_at: DateTime::parse_from_rfc3339("2026-05-24T12:05:00Z")
|
last_activity_at: DateTime::parse_from_rfc3339("2026-05-24T12:05:00Z")
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.with_timezone(&Utc),
|
.with_timezone(&Utc),
|
||||||
@@ -689,6 +736,49 @@ mod tests {
|
|||||||
assert!(serde_json::from_value::<Session>(json).is_err());
|
assert!(serde_json::from_value::<Session>(json).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn activity_detail_defaults_to_none_on_legacy_payload() {
|
||||||
|
// #105: a daemon predating the detail field omits it; it must
|
||||||
|
// deserialize to `None` rather than failing, and a present value
|
||||||
|
// round-trips.
|
||||||
|
let json = serde_json::json!({
|
||||||
|
"id": Uuid::from_u128(1),
|
||||||
|
"cwd": "/tmp",
|
||||||
|
"command": "bash",
|
||||||
|
"status": "Running",
|
||||||
|
"created_at": "2026-05-24T12:00:00Z"
|
||||||
|
});
|
||||||
|
let s: Session = serde_json::from_value(json).unwrap();
|
||||||
|
assert_eq!(s.activity_detail, None);
|
||||||
|
|
||||||
|
let mut reported = sample_session();
|
||||||
|
reported.activity = ActivityState::Error;
|
||||||
|
reported.activity_detail = Some("build failed".into());
|
||||||
|
assert_eq!(reported.clone(), round_trip(&reported));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn report_activity_request_defaults_detail_and_rejects_unknown_state() {
|
||||||
|
let bare: ReportActivityRequest =
|
||||||
|
serde_json::from_value(serde_json::json!({ "state": "Error" })).unwrap();
|
||||||
|
assert_eq!(bare.state, ActivityState::Error);
|
||||||
|
assert_eq!(bare.detail, None);
|
||||||
|
|
||||||
|
let full = ReportActivityRequest {
|
||||||
|
state: ActivityState::AwaitingInput,
|
||||||
|
detail: Some("waiting on permission".into()),
|
||||||
|
};
|
||||||
|
assert_eq!(full, round_trip(&full));
|
||||||
|
|
||||||
|
// Unknown state values are rejected rather than coerced (#105).
|
||||||
|
assert!(
|
||||||
|
serde_json::from_value::<ReportActivityRequest>(serde_json::json!({
|
||||||
|
"state": "Teleported"
|
||||||
|
}))
|
||||||
|
.is_err()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn session_round_trips() {
|
fn session_round_trips() {
|
||||||
let s = sample_session();
|
let s = sample_session();
|
||||||
|
|||||||
@@ -47,6 +47,11 @@ pub fn session(id: Uuid) -> String {
|
|||||||
format!("{SESSIONS}/{id}")
|
format!("{SESSIONS}/{id}")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `POST /api/sessions/:id/activity` (#105): an agent reports its own state.
|
||||||
|
pub fn session_activity(id: Uuid) -> String {
|
||||||
|
format!("{SESSIONS}/{id}/activity")
|
||||||
|
}
|
||||||
|
|
||||||
/// `DELETE /api/worktrees/:id` — reclaim one retained worktree (#80).
|
/// `DELETE /api/worktrees/:id` — reclaim one retained worktree (#80).
|
||||||
pub fn worktree(id: Uuid) -> String {
|
pub fn worktree(id: Uuid) -> String {
|
||||||
format!("{WORKTREES}/{id}")
|
format!("{WORKTREES}/{id}")
|
||||||
@@ -61,6 +66,7 @@ pub fn attach(id: Uuid) -> String {
|
|||||||
/// registers the same paths [`session`] and [`attach`] build.
|
/// registers the same paths [`session`] and [`attach`] build.
|
||||||
pub mod patterns {
|
pub mod patterns {
|
||||||
pub const SESSION: &str = "/api/sessions/:id";
|
pub const SESSION: &str = "/api/sessions/:id";
|
||||||
|
pub const SESSION_ACTIVITY: &str = "/api/sessions/:id/activity";
|
||||||
pub const ATTACH: &str = "/api/attach/:id";
|
pub const ATTACH: &str = "/api/attach/:id";
|
||||||
pub const WORKTREE: &str = "/api/worktrees/:id";
|
pub const WORKTREE: &str = "/api/worktrees/:id";
|
||||||
}
|
}
|
||||||
@@ -169,6 +175,10 @@ mod tests {
|
|||||||
session(id()),
|
session(id()),
|
||||||
"/api/sessions/6f1a7c0e-0f5e-4a2b-9a3d-6b1c2d3e4f50"
|
"/api/sessions/6f1a7c0e-0f5e-4a2b-9a3d-6b1c2d3e4f50"
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
session_activity(id()),
|
||||||
|
"/api/sessions/6f1a7c0e-0f5e-4a2b-9a3d-6b1c2d3e4f50/activity"
|
||||||
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
attach(id()),
|
attach(id()),
|
||||||
"/api/attach/6f1a7c0e-0f5e-4a2b-9a3d-6b1c2d3e4f50"
|
"/api/attach/6f1a7c0e-0f5e-4a2b-9a3d-6b1c2d3e4f50"
|
||||||
@@ -191,6 +201,10 @@ mod tests {
|
|||||||
patterns::SESSION.trim_end_matches(":id"),
|
patterns::SESSION.trim_end_matches(":id"),
|
||||||
session(id()).trim_end_matches(&id().to_string())
|
session(id()).trim_end_matches(&id().to_string())
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
patterns::SESSION_ACTIVITY.trim_end_matches(":id/activity"),
|
||||||
|
session(id()).trim_end_matches(&id().to_string())
|
||||||
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
patterns::ATTACH.trim_end_matches(":id"),
|
patterns::ATTACH.trim_end_matches(":id"),
|
||||||
attach(id()).trim_end_matches(&id().to_string())
|
attach(id()).trim_end_matches(&id().to_string())
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ pub fn session(id: Uuid, cwd: &str, command: &str) -> Session {
|
|||||||
created_at: Utc::now(),
|
created_at: Utc::now(),
|
||||||
foreground: None,
|
foreground: None,
|
||||||
activity: Default::default(),
|
activity: Default::default(),
|
||||||
|
activity_detail: None,
|
||||||
last_activity_at: Utc::now(),
|
last_activity_at: Utc::now(),
|
||||||
activity_since: chrono::Utc::now(),
|
activity_since: chrono::Utc::now(),
|
||||||
current_cwd: None,
|
current_cwd: None,
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ pub enum Action {
|
|||||||
// Sidebar highlight movement
|
// Sidebar highlight movement
|
||||||
SidebarNext,
|
SidebarNext,
|
||||||
SidebarPrev,
|
SidebarPrev,
|
||||||
|
ToggleSidebarGroup,
|
||||||
|
|
||||||
// Catalog actions on the highlighted sidebar row
|
// Catalog actions on the highlighted sidebar row
|
||||||
AttachHighlighted,
|
AttachHighlighted,
|
||||||
@@ -81,6 +82,7 @@ impl Action {
|
|||||||
"FocusSidebar" => return Ok(Action::FocusSidebar),
|
"FocusSidebar" => return Ok(Action::FocusSidebar),
|
||||||
"SidebarNext" => return Ok(Action::SidebarNext),
|
"SidebarNext" => return Ok(Action::SidebarNext),
|
||||||
"SidebarPrev" => return Ok(Action::SidebarPrev),
|
"SidebarPrev" => return Ok(Action::SidebarPrev),
|
||||||
|
"ToggleSidebarGroup" => return Ok(Action::ToggleSidebarGroup),
|
||||||
"AttachHighlighted" => return Ok(Action::AttachHighlighted),
|
"AttachHighlighted" => return Ok(Action::AttachHighlighted),
|
||||||
"ToggleAttachHighlighted" => return Ok(Action::ToggleAttachHighlighted),
|
"ToggleAttachHighlighted" => return Ok(Action::ToggleAttachHighlighted),
|
||||||
"NewDraftPane" => return Ok(Action::NewDraftPane),
|
"NewDraftPane" => return Ok(Action::NewDraftPane),
|
||||||
|
|||||||
@@ -30,14 +30,16 @@ use crate::catalog::CatalogStore;
|
|||||||
use crate::config::TuiConfig;
|
use crate::config::TuiConfig;
|
||||||
use crate::draft::DraftInputResult;
|
use crate::draft::DraftInputResult;
|
||||||
use crate::emulators::SessionEmulators;
|
use crate::emulators::SessionEmulators;
|
||||||
use crate::input::{canonicalise, ChordResult, ChordState, ClickTracker, InputKey};
|
use crate::input::{
|
||||||
|
canonicalise, ChordResult, ChordState, ClickTracker, InputKey, MouseKind, Region,
|
||||||
|
};
|
||||||
use crate::keymap::Mode;
|
use crate::keymap::Mode;
|
||||||
use crate::overlays::HelpOverlay;
|
use crate::overlays::HelpOverlay;
|
||||||
use crate::pane::{Pane, PaneStatus};
|
use crate::pane::{Pane, PaneStatus};
|
||||||
use crate::render::{draw, RegionMap, RenderInputs};
|
use crate::render::{draw, RegionMap, RenderInputs};
|
||||||
use crate::session_task::{SessionInput, SessionTask};
|
use crate::session_task::{SessionInput, SessionTask};
|
||||||
use crate::sidebar::Sidebar;
|
use crate::sidebar::Sidebar;
|
||||||
use crate::state::{AppState, Focus, OverlayKind, PaneRef};
|
use crate::state::{AppState, Focus, OverlayKind, PaneRef, SidebarItem};
|
||||||
use crate::tabs::TabBar;
|
use crate::tabs::TabBar;
|
||||||
use crate::worktrees::WorktreesView;
|
use crate::worktrees::WorktreesView;
|
||||||
use crate::TuiError;
|
use crate::TuiError;
|
||||||
@@ -52,6 +54,7 @@ enum OverlayDecision {
|
|||||||
|
|
||||||
pub struct App {
|
pub struct App {
|
||||||
cfg: TuiConfig,
|
cfg: TuiConfig,
|
||||||
|
home_dir: String,
|
||||||
catalog: CatalogStore,
|
catalog: CatalogStore,
|
||||||
emulators: SessionEmulators,
|
emulators: SessionEmulators,
|
||||||
state: AppState,
|
state: AppState,
|
||||||
@@ -137,6 +140,7 @@ impl App {
|
|||||||
.expect("build reqwest client");
|
.expect("build reqwest client");
|
||||||
Self {
|
Self {
|
||||||
cfg,
|
cfg,
|
||||||
|
home_dir: std::env::var("HOME").unwrap_or_default(),
|
||||||
catalog,
|
catalog,
|
||||||
emulators: SessionEmulators::default(),
|
emulators: SessionEmulators::default(),
|
||||||
state: AppState::new(),
|
state: AppState::new(),
|
||||||
@@ -158,6 +162,9 @@ impl App {
|
|||||||
mut self,
|
mut self,
|
||||||
terminal: &mut Terminal<CrosstermBackend<Stdout>>,
|
terminal: &mut Terminal<CrosstermBackend<Stdout>>,
|
||||||
) -> Result<(), TuiError> {
|
) -> Result<(), TuiError> {
|
||||||
|
if let Ok(info) = self.daemon.daemon_info().await {
|
||||||
|
self.home_dir = info.home_dir;
|
||||||
|
}
|
||||||
let mut events = EventStream::new();
|
let mut events = EventStream::new();
|
||||||
loop {
|
loop {
|
||||||
self.redraw(terminal)?;
|
self.redraw(terminal)?;
|
||||||
@@ -197,6 +204,10 @@ impl App {
|
|||||||
return Ok(false);
|
return Ok(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if self.handle_sidebar_mouse(&key) {
|
||||||
|
return Ok(false);
|
||||||
|
}
|
||||||
|
|
||||||
let known = self.cfg.keymap.known_bindings(self.state.mode);
|
let known = self.cfg.keymap.known_bindings(self.state.mode);
|
||||||
match self.chord.feed(&key, &known) {
|
match self.chord.feed(&key, &known) {
|
||||||
ChordResult::Pending => Ok(false),
|
ChordResult::Pending => Ok(false),
|
||||||
@@ -224,6 +235,34 @@ impl App {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Clicks select rendered sidebar items directly. Double-clicks continue
|
||||||
|
/// through the keymap so the configured attach binding remains intact.
|
||||||
|
fn handle_sidebar_mouse(&mut self, key: &InputKey) -> bool {
|
||||||
|
let InputKey::Mouse {
|
||||||
|
kind: MouseKind::Click,
|
||||||
|
region: Region::SidebarRow,
|
||||||
|
row,
|
||||||
|
..
|
||||||
|
} = key
|
||||||
|
else {
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
let Some(item) = self.region.sidebar_item_at(*row) else {
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
self.state.focus = Focus::Sidebar;
|
||||||
|
match item {
|
||||||
|
SidebarItem::Group(key) => {
|
||||||
|
self.state.sidebar_highlight = Some(SidebarItem::Group(key.clone()));
|
||||||
|
self.toggle_sidebar_group(key);
|
||||||
|
}
|
||||||
|
SidebarItem::Session(id) => {
|
||||||
|
self.state.sidebar_highlight = Some(SidebarItem::Session(id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
/// Carry out what `dispatch` decided. The only place in `App` that talks to
|
/// Carry out what `dispatch` decided. The only place in `App` that talks to
|
||||||
/// the daemon.
|
/// the daemon.
|
||||||
async fn perform(&mut self, effects: Vec<Effect>) {
|
async fn perform(&mut self, effects: Vec<Effect>) {
|
||||||
@@ -330,15 +369,22 @@ impl App {
|
|||||||
self.state.focus = Focus::Pane;
|
self.state.focus = Focus::Pane;
|
||||||
}
|
}
|
||||||
Action::SidebarNext => {
|
Action::SidebarNext => {
|
||||||
let order = visible_sidebar_order(&self.catalog.snapshot());
|
let order = visible_sidebar_order(
|
||||||
|
&self.catalog.snapshot(),
|
||||||
|
&self.state.collapsed_sidebar_groups,
|
||||||
|
);
|
||||||
self.state.move_sidebar_highlight(&order, 1);
|
self.state.move_sidebar_highlight(&order, 1);
|
||||||
self.state.focus = Focus::Sidebar;
|
self.state.focus = Focus::Sidebar;
|
||||||
}
|
}
|
||||||
Action::SidebarPrev => {
|
Action::SidebarPrev => {
|
||||||
let order = visible_sidebar_order(&self.catalog.snapshot());
|
let order = visible_sidebar_order(
|
||||||
|
&self.catalog.snapshot(),
|
||||||
|
&self.state.collapsed_sidebar_groups,
|
||||||
|
);
|
||||||
self.state.move_sidebar_highlight(&order, -1);
|
self.state.move_sidebar_highlight(&order, -1);
|
||||||
self.state.focus = Focus::Sidebar;
|
self.state.focus = Focus::Sidebar;
|
||||||
}
|
}
|
||||||
|
Action::ToggleSidebarGroup => self.toggle_highlighted_sidebar_group(),
|
||||||
Action::NewTab => self.state.new_tab(),
|
Action::NewTab => self.state.new_tab(),
|
||||||
Action::CloseTab => {
|
Action::CloseTab => {
|
||||||
if let Some(sid) = self.state.close_tab() {
|
if let Some(sid) = self.state.close_tab() {
|
||||||
@@ -403,13 +449,50 @@ impl App {
|
|||||||
/// Return the session under the sidebar highlight, falling back to the
|
/// Return the session under the sidebar highlight, falling back to the
|
||||||
/// first listed session so the user can attach without arrowing first.
|
/// first listed session so the user can attach without arrowing first.
|
||||||
fn pick_sidebar_target(&self) -> Option<Uuid> {
|
fn pick_sidebar_target(&self) -> Option<Uuid> {
|
||||||
if let Some(sid) = self.state.sidebar_highlight {
|
if let Some(SidebarItem::Session(sid)) = self.state.sidebar_highlight {
|
||||||
return Some(sid);
|
return Some(sid);
|
||||||
}
|
}
|
||||||
|
if self.state.sidebar_highlight.is_some() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
let snap = self.catalog.snapshot();
|
let snap = self.catalog.snapshot();
|
||||||
snap.sessions.first().map(|s| s.id)
|
snap.sessions.first().map(|s| s.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn toggle_highlighted_sidebar_group(&mut self) {
|
||||||
|
let key = match self.state.sidebar_highlight.clone() {
|
||||||
|
Some(SidebarItem::Group(key)) => Some(key),
|
||||||
|
Some(SidebarItem::Session(id)) => self
|
||||||
|
.catalog
|
||||||
|
.snapshot()
|
||||||
|
.sessions
|
||||||
|
.into_iter()
|
||||||
|
.find(|s| s.id == id)
|
||||||
|
.and_then(|s| maestro_protocol::display::session_tree_path(&s)),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
if let Some(key) = key {
|
||||||
|
self.toggle_sidebar_group(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn toggle_sidebar_group(&mut self, key: PathBuf) {
|
||||||
|
let contains_highlight = match self.state.sidebar_highlight {
|
||||||
|
Some(SidebarItem::Session(id)) => {
|
||||||
|
self.catalog
|
||||||
|
.snapshot()
|
||||||
|
.sessions
|
||||||
|
.iter()
|
||||||
|
.find(|s| s.id == id)
|
||||||
|
.and_then(maestro_protocol::display::session_tree_path)
|
||||||
|
.as_ref()
|
||||||
|
== Some(&key)
|
||||||
|
}
|
||||||
|
_ => false,
|
||||||
|
};
|
||||||
|
self.state.toggle_sidebar_group(key, contains_highlight);
|
||||||
|
}
|
||||||
|
|
||||||
/// Encode a keystroke for the focused pane. `None` when there is nothing
|
/// Encode a keystroke for the focused pane. `None` when there is nothing
|
||||||
/// attached to send it to.
|
/// attached to send it to.
|
||||||
fn forward_to_session(&mut self, key: &InputKey) -> Option<Effect> {
|
fn forward_to_session(&mut self, key: &InputKey) -> Option<Effect> {
|
||||||
@@ -811,7 +894,7 @@ impl App {
|
|||||||
.collect();
|
.collect();
|
||||||
let sidebar = Sidebar {
|
let sidebar = Sidebar {
|
||||||
sessions: snap.sessions.clone(),
|
sessions: snap.sessions.clone(),
|
||||||
highlight: self.state.sidebar_highlight,
|
highlight: self.state.sidebar_highlight.clone(),
|
||||||
attached,
|
attached,
|
||||||
};
|
};
|
||||||
let tab_bar = TabBar {
|
let tab_bar = TabBar {
|
||||||
@@ -833,6 +916,7 @@ impl App {
|
|||||||
|
|
||||||
let inputs = RenderInputs {
|
let inputs = RenderInputs {
|
||||||
sidebar: &sidebar,
|
sidebar: &sidebar,
|
||||||
|
home_dir: &self.home_dir,
|
||||||
tab_bar: &tab_bar,
|
tab_bar: &tab_bar,
|
||||||
pane: pane.as_ref(),
|
pane: pane.as_ref(),
|
||||||
state: &self.state,
|
state: &self.state,
|
||||||
@@ -881,8 +965,16 @@ impl App {
|
|||||||
/// Order the sidebar walks for `j`/`k`: the sessions in the same order
|
/// Order the sidebar walks for `j`/`k`: the sessions in the same order
|
||||||
/// [`crate::sidebar::Sidebar::render`] emits them. Keeps highlight movement in
|
/// [`crate::sidebar::Sidebar::render`] emits them. Keeps highlight movement in
|
||||||
/// visual sync with what the user sees.
|
/// visual sync with what the user sees.
|
||||||
fn visible_sidebar_order(snap: &crate::catalog::CatalogSnapshot) -> Vec<Uuid> {
|
fn visible_sidebar_order(
|
||||||
snap.sessions.iter().map(|s| s.id).collect()
|
snap: &crate::catalog::CatalogSnapshot,
|
||||||
|
collapsed: &std::collections::HashSet<PathBuf>,
|
||||||
|
) -> Vec<SidebarItem> {
|
||||||
|
Sidebar {
|
||||||
|
sessions: snap.sessions.clone(),
|
||||||
|
highlight: None,
|
||||||
|
attached: HashSet::new(),
|
||||||
|
}
|
||||||
|
.rendered_items_with_collapsed(collapsed)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Wire encoding for a keystroke headed to a session's PTY. `None` for keys
|
/// Wire encoding for a keystroke headed to a session's PTY. `None` for keys
|
||||||
@@ -1126,6 +1218,7 @@ mod tests {
|
|||||||
created_at: Utc::now(),
|
created_at: Utc::now(),
|
||||||
foreground: None,
|
foreground: None,
|
||||||
activity: Default::default(),
|
activity: Default::default(),
|
||||||
|
activity_detail: None,
|
||||||
last_activity_at: Utc::now(),
|
last_activity_at: Utc::now(),
|
||||||
activity_since: chrono::Utc::now(),
|
activity_since: chrono::Utc::now(),
|
||||||
current_cwd: None,
|
current_cwd: None,
|
||||||
@@ -1133,9 +1226,32 @@ mod tests {
|
|||||||
}],
|
}],
|
||||||
});
|
});
|
||||||
app.dispatch(Action::SidebarNext);
|
app.dispatch(Action::SidebarNext);
|
||||||
|
app.dispatch(Action::SidebarNext);
|
||||||
app
|
app
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn test_session(sid: Uuid, cwd: &str) -> maestro_protocol::Session {
|
||||||
|
use chrono::Utc;
|
||||||
|
use maestro_protocol::{Session, SessionStatus};
|
||||||
|
Session {
|
||||||
|
id: sid,
|
||||||
|
command: "bash".into(),
|
||||||
|
cwd: cwd.into(),
|
||||||
|
env: Default::default(),
|
||||||
|
metadata: Default::default(),
|
||||||
|
worktree: None,
|
||||||
|
status: SessionStatus::Running,
|
||||||
|
created_at: Utc::now(),
|
||||||
|
foreground: None,
|
||||||
|
activity: Default::default(),
|
||||||
|
activity_detail: None,
|
||||||
|
last_activity_at: Utc::now(),
|
||||||
|
activity_since: Utc::now(),
|
||||||
|
current_cwd: None,
|
||||||
|
blocked_work: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn attach_highlighted_asks_for_an_attach() {
|
fn attach_highlighted_asks_for_an_attach() {
|
||||||
let sid = Uuid::from_u128(11);
|
let sid = Uuid::from_u128(11);
|
||||||
@@ -1147,6 +1263,94 @@ mod tests {
|
|||||||
assert_eq!(app.state.active_tab().session(), Some(sid));
|
assert_eq!(app.state.active_tab().session(), Some(sid));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn group_highlight_is_not_a_session_action_target() {
|
||||||
|
use maestro_protocol::CatalogEvent;
|
||||||
|
|
||||||
|
let sid = Uuid::from_u128(14);
|
||||||
|
let mut app = make_app();
|
||||||
|
app.catalog.apply_event(CatalogEvent::Snapshot {
|
||||||
|
sessions: vec![test_session(sid, "/repo")],
|
||||||
|
});
|
||||||
|
app.dispatch(Action::SidebarNext);
|
||||||
|
assert_eq!(
|
||||||
|
app.state.sidebar_highlight,
|
||||||
|
Some(SidebarItem::Group(PathBuf::from("/repo")))
|
||||||
|
);
|
||||||
|
assert!(app.dispatch(Action::AttachHighlighted).is_empty());
|
||||||
|
assert!(app.dispatch(Action::KillHighlighted).is_empty());
|
||||||
|
assert!(app.state.overlay().is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn collapsing_the_group_containing_a_card_highlight_keeps_a_visible_group_highlight() {
|
||||||
|
let sid = Uuid::from_u128(15);
|
||||||
|
let mut app = app_with_highlighted_session(sid);
|
||||||
|
assert_eq!(app.state.sidebar_highlight, Some(SidebarItem::Session(sid)));
|
||||||
|
assert!(app.dispatch(Action::ToggleSidebarGroup).is_empty());
|
||||||
|
assert_eq!(
|
||||||
|
app.state.sidebar_highlight,
|
||||||
|
Some(SidebarItem::Group(PathBuf::from("/")))
|
||||||
|
);
|
||||||
|
assert!(app
|
||||||
|
.state
|
||||||
|
.collapsed_sidebar_groups
|
||||||
|
.contains(&PathBuf::from("/")));
|
||||||
|
assert_eq!(app.state.focus, Focus::Sidebar);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn clicking_a_group_toggles_it_and_selects_the_group() {
|
||||||
|
let sid = Uuid::from_u128(16);
|
||||||
|
let mut app = app_with_highlighted_session(sid);
|
||||||
|
app.region.sidebar = Some(ratatui::layout::Rect::new(0, 0, 28, 10));
|
||||||
|
app.region.sidebar_items = vec![SidebarItem::Group(PathBuf::from("/"))];
|
||||||
|
let click = InputKey::Mouse {
|
||||||
|
kind: MouseKind::Click,
|
||||||
|
region: Region::SidebarRow,
|
||||||
|
col: 3,
|
||||||
|
row: 2,
|
||||||
|
};
|
||||||
|
assert!(app.handle_sidebar_mouse(&click));
|
||||||
|
assert_eq!(
|
||||||
|
app.state.sidebar_highlight,
|
||||||
|
Some(SidebarItem::Group(PathBuf::from("/")))
|
||||||
|
);
|
||||||
|
assert!(app
|
||||||
|
.state
|
||||||
|
.collapsed_sidebar_groups
|
||||||
|
.contains(&PathBuf::from("/")));
|
||||||
|
assert_eq!(app.state.focus, Focus::Sidebar);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn sidebar_click_dismisses_a_toast_before_handling_the_click() {
|
||||||
|
use crossterm::event::{MouseButton, MouseEvent, MouseEventKind};
|
||||||
|
|
||||||
|
let sid = Uuid::from_u128(17);
|
||||||
|
let mut app = app_with_highlighted_session(sid);
|
||||||
|
app.state.toast("notice");
|
||||||
|
app.region.sidebar = Some(ratatui::layout::Rect::new(0, 0, 28, 10));
|
||||||
|
app.region.sidebar_items = vec![SidebarItem::Group(PathBuf::from("/"))];
|
||||||
|
|
||||||
|
let quit = app
|
||||||
|
.handle_event(CtEvent::Mouse(MouseEvent {
|
||||||
|
kind: MouseEventKind::Down(MouseButton::Left),
|
||||||
|
column: 3,
|
||||||
|
row: 2,
|
||||||
|
modifiers: crossterm::event::KeyModifiers::NONE,
|
||||||
|
}))
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
assert!(!quit);
|
||||||
|
assert!(app.state.overlay().is_none());
|
||||||
|
assert!(app
|
||||||
|
.state
|
||||||
|
.collapsed_sidebar_groups
|
||||||
|
.contains(&PathBuf::from("/")));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn confirming_a_kill_asks_for_the_kill() {
|
fn confirming_a_kill_asks_for_the_kill() {
|
||||||
let sid = Uuid::from_u128(12);
|
let sid = Uuid::from_u128(12);
|
||||||
@@ -1644,6 +1848,7 @@ mod tests {
|
|||||||
created_at: Utc::now(),
|
created_at: Utc::now(),
|
||||||
foreground: None,
|
foreground: None,
|
||||||
activity: Default::default(),
|
activity: Default::default(),
|
||||||
|
activity_detail: None,
|
||||||
last_activity_at: chrono::Utc::now(),
|
last_activity_at: chrono::Utc::now(),
|
||||||
activity_since: chrono::Utc::now(),
|
activity_since: chrono::Utc::now(),
|
||||||
|
|
||||||
|
|||||||
@@ -193,6 +193,7 @@ mod tests {
|
|||||||
created_at: Utc::now(),
|
created_at: Utc::now(),
|
||||||
foreground: None,
|
foreground: None,
|
||||||
activity: Default::default(),
|
activity: Default::default(),
|
||||||
|
activity_detail: None,
|
||||||
last_activity_at: chrono::Utc::now(),
|
last_activity_at: chrono::Utc::now(),
|
||||||
activity_since: chrono::Utc::now(),
|
activity_since: chrono::Utc::now(),
|
||||||
current_cwd: None,
|
current_cwd: None,
|
||||||
|
|||||||
@@ -8,13 +8,15 @@
|
|||||||
|
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use maestro_config::TuiSection;
|
use maestro_config::{TuiSection, TuiTheme};
|
||||||
|
|
||||||
use crate::input::InputKey;
|
use crate::input::InputKey;
|
||||||
use crate::keymap::{Keymap, KeymapError, Mode};
|
use crate::keymap::{Keymap, KeymapError, Mode};
|
||||||
|
use crate::palette::Palette;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct TuiConfig {
|
pub struct TuiConfig {
|
||||||
|
pub palette: Palette,
|
||||||
pub leader: InputKey,
|
pub leader: InputKey,
|
||||||
pub chord_timeout: Duration,
|
pub chord_timeout: Duration,
|
||||||
pub keymap: Keymap,
|
pub keymap: Keymap,
|
||||||
@@ -43,6 +45,7 @@ const DEFAULT_NORMAL: &[(&str, &str)] = &[
|
|||||||
("k", "SidebarPrev"),
|
("k", "SidebarPrev"),
|
||||||
("down", "SidebarNext"),
|
("down", "SidebarNext"),
|
||||||
("up", "SidebarPrev"),
|
("up", "SidebarPrev"),
|
||||||
|
("c", "ToggleSidebarGroup"),
|
||||||
// Catalog actions
|
// Catalog actions
|
||||||
("enter", "AttachHighlighted"),
|
("enter", "AttachHighlighted"),
|
||||||
("s", "NewDraftPane"),
|
("s", "NewDraftPane"),
|
||||||
@@ -76,6 +79,11 @@ impl TuiConfig {
|
|||||||
/// field of the loaded `MaestroConfigFile`). The shipped defaults are
|
/// field of the loaded `MaestroConfigFile`). The shipped defaults are
|
||||||
/// applied first, then user overrides on top.
|
/// applied first, then user overrides on top.
|
||||||
pub fn load(section: &TuiSection) -> Result<Self, TuiConfigError> {
|
pub fn load(section: &TuiSection) -> Result<Self, TuiConfigError> {
|
||||||
|
let palette = match section.theme.unwrap_or(TuiTheme::Dark) {
|
||||||
|
TuiTheme::Dark => Palette::DARK,
|
||||||
|
TuiTheme::Light => Palette::LIGHT,
|
||||||
|
TuiTheme::Ansi => Palette::ANSI,
|
||||||
|
};
|
||||||
let leader_str = section.leader.as_deref().unwrap_or("ctrl-a");
|
let leader_str = section.leader.as_deref().unwrap_or("ctrl-a");
|
||||||
let leader = InputKey::parse(leader_str)
|
let leader = InputKey::parse(leader_str)
|
||||||
.map_err(|_| TuiConfigError::BadLeader(leader_str.to_string()))?;
|
.map_err(|_| TuiConfigError::BadLeader(leader_str.to_string()))?;
|
||||||
@@ -131,6 +139,7 @@ impl TuiConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Ok(TuiConfig {
|
Ok(TuiConfig {
|
||||||
|
palette,
|
||||||
leader,
|
leader,
|
||||||
chord_timeout,
|
chord_timeout,
|
||||||
keymap,
|
keymap,
|
||||||
@@ -143,6 +152,28 @@ impl TuiConfig {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use crate::action::Action;
|
use crate::action::Action;
|
||||||
|
use maestro_config::{TuiSection, TuiTheme};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn absent_theme_selects_the_dark_default() {
|
||||||
|
let cfg = TuiConfig::load(&TuiSection::default()).unwrap();
|
||||||
|
assert_eq!(cfg.palette, Palette::DARK);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn named_themes_select_the_matching_complete_palette() {
|
||||||
|
for (theme, expected) in [
|
||||||
|
(TuiTheme::Dark, Palette::DARK),
|
||||||
|
(TuiTheme::Light, Palette::LIGHT),
|
||||||
|
(TuiTheme::Ansi, Palette::ANSI),
|
||||||
|
] {
|
||||||
|
let section = TuiSection {
|
||||||
|
theme: Some(theme),
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
assert_eq!(TuiConfig::load(§ion).unwrap().palette, expected);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn defaults_cover_core_actions() {
|
fn defaults_cover_core_actions() {
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ use chrono::{DateTime, Utc};
|
|||||||
use maestro_config::{builtin_presets, custom_preset};
|
use maestro_config::{builtin_presets, custom_preset};
|
||||||
use maestro_protocol::{BranchInfo, CreateSessionRequest, Project, SpawnPreset, WorktreeSpec};
|
use maestro_protocol::{BranchInfo, CreateSessionRequest, Project, SpawnPreset, WorktreeSpec};
|
||||||
use ratatui::layout::{Constraint, Layout, Rect};
|
use ratatui::layout::{Constraint, Layout, Rect};
|
||||||
use ratatui::style::{Color, Modifier, Style};
|
use ratatui::style::{Modifier, Style};
|
||||||
use ratatui::text::{Line, Span};
|
use ratatui::text::{Line, Span};
|
||||||
use ratatui::widgets::{Block, Borders, Paragraph};
|
use ratatui::widgets::{Block, Borders, Paragraph};
|
||||||
use ratatui::Frame;
|
use ratatui::Frame;
|
||||||
@@ -1510,7 +1510,7 @@ impl DraftPane {
|
|||||||
f.render_widget(
|
f.render_widget(
|
||||||
Paragraph::new(Line::from(Span::styled(
|
Paragraph::new(Line::from(Span::styled(
|
||||||
format!("error: {error}"),
|
format!("error: {error}"),
|
||||||
Style::default().fg(Color::Red),
|
crate::palette::active().error_style(),
|
||||||
))),
|
))),
|
||||||
row,
|
row,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ pub mod fast_forward;
|
|||||||
pub mod input;
|
pub mod input;
|
||||||
pub mod keymap;
|
pub mod keymap;
|
||||||
pub mod overlays;
|
pub mod overlays;
|
||||||
|
pub mod palette;
|
||||||
pub mod pane;
|
pub mod pane;
|
||||||
pub mod projects;
|
pub mod projects;
|
||||||
pub mod render;
|
pub mod render;
|
||||||
@@ -89,6 +90,7 @@ pub async fn run(cfg: RunConfig) -> Result<(), TuiError> {
|
|||||||
Err(_) => maestro_config::MaestroConfigFile::default(),
|
Err(_) => maestro_config::MaestroConfigFile::default(),
|
||||||
};
|
};
|
||||||
let tui_cfg = TuiConfig::load(&cfg_file.tui).map_err(|e| TuiError::Config(e.to_string()))?;
|
let tui_cfg = TuiConfig::load(&cfg_file.tui).map_err(|e| TuiError::Config(e.to_string()))?;
|
||||||
|
palette::set_active(tui_cfg.palette);
|
||||||
|
|
||||||
let catalog = CatalogStore::default();
|
let catalog = CatalogStore::default();
|
||||||
let ws_url = daemon
|
let ws_url = daemon
|
||||||
|
|||||||
@@ -0,0 +1,501 @@
|
|||||||
|
//! Named colour roles for the TUI.
|
||||||
|
//!
|
||||||
|
//! Every colour the TUI paints on its own chrome comes from here, named for
|
||||||
|
//! what it means rather than what it looks like: the card surface, the
|
||||||
|
//! selection surface, the panel border in its focused and unfocused forms,
|
||||||
|
//! the text weights (`fg` / `muted` / `dim`), and one role per
|
||||||
|
//! [`ActivityState`]. Call sites ask the palette for a role; they never spell
|
||||||
|
//! a colour out.
|
||||||
|
//!
|
||||||
|
//! Values are [`Color::Rgb`], so contrast is a property of the palette rather
|
||||||
|
//! than of the user's terminal theme — and can therefore be asserted (see
|
||||||
|
//! [`contrast_ratio`] and this module's tests).
|
||||||
|
//!
|
||||||
|
//! Each surface carries its own activity colours. A state colour picked for
|
||||||
|
//! the dark card background is not legible on the selection background, so
|
||||||
|
//! the selected card uses the selection surface's own state colours; the dot
|
||||||
|
//! keeps carrying the state either way (docs/SIDEBAR.md).
|
||||||
|
//!
|
||||||
|
//! [`Palette::DARK`] is the default. [`Palette::LIGHT`] is its light peer and
|
||||||
|
//! [`Palette::ANSI`] uses terminal-provided ANSI colours.
|
||||||
|
//!
|
||||||
|
//! Out of scope: PTY cell colours. Those belong to the program running in the
|
||||||
|
//! pane and pass through `pane::translate_color` verbatim.
|
||||||
|
|
||||||
|
use maestro_protocol::ActivityState;
|
||||||
|
use ratatui::style::{Color, Modifier, Style};
|
||||||
|
|
||||||
|
/// A background and the foreground roles legible on it.
|
||||||
|
///
|
||||||
|
/// The sidebar has two: the card surface every card sits on, and the
|
||||||
|
/// selection surface the highlighted card swaps in.
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub struct Surface {
|
||||||
|
/// The surface itself.
|
||||||
|
pub bg: Color,
|
||||||
|
/// Primary text on this surface.
|
||||||
|
pub fg: Color,
|
||||||
|
/// Secondary text — the blocked-work, exited, detail and command
|
||||||
|
/// fragments of a card's meta line.
|
||||||
|
pub muted: Color,
|
||||||
|
/// The quietest legible text on this surface, for decoration that must
|
||||||
|
/// not compete with content.
|
||||||
|
pub dim: Color,
|
||||||
|
/// `ActivityState::Active`.
|
||||||
|
pub active: Color,
|
||||||
|
/// `ActivityState::Idle`.
|
||||||
|
pub idle: Color,
|
||||||
|
/// `ActivityState::AwaitingInput`.
|
||||||
|
pub awaiting: Color,
|
||||||
|
/// `ActivityState::Error`.
|
||||||
|
pub error: Color,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Surface {
|
||||||
|
/// The bare surface: a background with no foreground override.
|
||||||
|
pub fn base(&self) -> Style {
|
||||||
|
Style::default().bg(self.bg)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Primary text on this surface.
|
||||||
|
pub fn text_style(&self) -> Style {
|
||||||
|
Style::default().bg(self.bg).fg(self.fg)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Secondary text on this surface.
|
||||||
|
pub fn muted_style(&self) -> Style {
|
||||||
|
Style::default().bg(self.bg).fg(self.muted)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The quietest text on this surface.
|
||||||
|
pub fn dim_style(&self) -> Style {
|
||||||
|
Style::default().bg(self.bg).fg(self.dim)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The colour carrying `state` on this surface.
|
||||||
|
pub fn activity(&self, state: ActivityState) -> Color {
|
||||||
|
match state {
|
||||||
|
ActivityState::Active => self.active,
|
||||||
|
ActivityState::Idle => self.idle,
|
||||||
|
ActivityState::AwaitingInput => self.awaiting,
|
||||||
|
ActivityState::Error => self.error,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Every foreground role on this surface, paired with its role name.
|
||||||
|
/// Used by the contrast tests, and by anything that needs to reason about
|
||||||
|
/// the surface as a whole.
|
||||||
|
pub fn roles(&self) -> [(&'static str, Color); 7] {
|
||||||
|
[
|
||||||
|
("fg", self.fg),
|
||||||
|
("muted", self.muted),
|
||||||
|
("dim", self.dim),
|
||||||
|
("active", self.active),
|
||||||
|
("idle", self.idle),
|
||||||
|
("awaiting", self.awaiting),
|
||||||
|
("error", self.error),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The full set of colour roles the TUI paints with.
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub struct Palette {
|
||||||
|
/// The surface an unselected card sits on.
|
||||||
|
pub card: Surface,
|
||||||
|
/// The surface the highlighted card swaps in.
|
||||||
|
pub selection: Surface,
|
||||||
|
/// Background for TUI-owned chrome outside cards. Fixed-RGB chrome must
|
||||||
|
/// paint this background too; otherwise its contrast depends on the
|
||||||
|
/// operator's terminal theme.
|
||||||
|
pub chrome_bg: Color,
|
||||||
|
/// Panel border while that panel holds focus.
|
||||||
|
pub border_focused: Color,
|
||||||
|
/// Panel border while it does not.
|
||||||
|
pub border_unfocused: Color,
|
||||||
|
/// Focus affordances that are not the border itself — markers, titles and
|
||||||
|
/// the like on the panel that holds focus.
|
||||||
|
pub focus_accent: Color,
|
||||||
|
/// Sidebar group headings.
|
||||||
|
pub group_row: Color,
|
||||||
|
/// Status-bar mode indicator, normal mode.
|
||||||
|
pub mode_normal_bg: Color,
|
||||||
|
pub mode_normal_fg: Color,
|
||||||
|
/// Status-bar mode indicator, insert mode.
|
||||||
|
pub mode_insert_bg: Color,
|
||||||
|
pub mode_insert_fg: Color,
|
||||||
|
/// Error text outside a card — form errors, failed actions.
|
||||||
|
pub error_text: Color,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Palette {
|
||||||
|
/// The dark terminal-native palette and the default preset.
|
||||||
|
pub const DARK: Palette = Palette {
|
||||||
|
card: Surface {
|
||||||
|
bg: Color::Rgb(0x1f, 0x23, 0x2b),
|
||||||
|
fg: Color::Rgb(0xe5, 0xe7, 0xeb),
|
||||||
|
muted: Color::Rgb(0xae, 0xb7, 0xc4),
|
||||||
|
dim: Color::Rgb(0x85, 0x8f, 0x9e),
|
||||||
|
active: Color::Rgb(0x72, 0xd6, 0x87),
|
||||||
|
idle: Color::Rgb(0xae, 0xb7, 0xc4),
|
||||||
|
awaiting: Color::Rgb(0xf2, 0xc9, 0x5c),
|
||||||
|
error: Color::Rgb(0xff, 0x82, 0x7a),
|
||||||
|
},
|
||||||
|
selection: Surface {
|
||||||
|
bg: Color::Rgb(0x3d, 0x51, 0x44),
|
||||||
|
fg: Color::Rgb(0xf3, 0xf7, 0xf4),
|
||||||
|
muted: Color::Rgb(0xd0, 0xd9, 0xd3),
|
||||||
|
dim: Color::Rgb(0xa1, 0xb0, 0xa6),
|
||||||
|
active: Color::Rgb(0x9a, 0xf0, 0xa6),
|
||||||
|
idle: Color::Rgb(0xc4, 0xcf, 0xc7),
|
||||||
|
awaiting: Color::Rgb(0xf6, 0xd9, 0x78),
|
||||||
|
error: Color::Rgb(0xff, 0xa8, 0xa3),
|
||||||
|
},
|
||||||
|
chrome_bg: Color::Rgb(0x1f, 0x23, 0x2b),
|
||||||
|
border_focused: Color::Rgb(0x72, 0xd6, 0x87),
|
||||||
|
border_unfocused: Color::Rgb(0x68, 0x73, 0x84),
|
||||||
|
focus_accent: Color::Rgb(0x72, 0xd6, 0x87),
|
||||||
|
group_row: Color::Rgb(0xb6, 0xc1, 0xd3),
|
||||||
|
mode_normal_bg: Color::Rgb(0x72, 0xd6, 0x87),
|
||||||
|
mode_normal_fg: Color::Rgb(0x1f, 0x23, 0x2b),
|
||||||
|
mode_insert_bg: Color::Rgb(0xf2, 0xc9, 0x5c),
|
||||||
|
mode_insert_fg: Color::Rgb(0x1f, 0x23, 0x2b),
|
||||||
|
error_text: Color::Rgb(0xff, 0x82, 0x7a),
|
||||||
|
};
|
||||||
|
|
||||||
|
/// A high-contrast light peer to [`Self::DARK`].
|
||||||
|
pub const LIGHT: Palette = Palette {
|
||||||
|
card: Surface {
|
||||||
|
bg: Color::Rgb(0xff, 0xff, 0xff),
|
||||||
|
fg: Color::Rgb(0x27, 0x31, 0x3d),
|
||||||
|
muted: Color::Rgb(0x4c, 0x5b, 0x6b),
|
||||||
|
dim: Color::Rgb(0x68, 0x78, 0x8a),
|
||||||
|
active: Color::Rgb(0x21, 0x7a, 0x3c),
|
||||||
|
idle: Color::Rgb(0x4c, 0x5b, 0x6b),
|
||||||
|
awaiting: Color::Rgb(0x8f, 0x63, 0x00),
|
||||||
|
error: Color::Rgb(0xb4, 0x23, 0x18),
|
||||||
|
},
|
||||||
|
selection: Surface {
|
||||||
|
bg: Color::Rgb(0xb5, 0xcf, 0xba),
|
||||||
|
fg: Color::Rgb(0x1d, 0x2a, 0x24),
|
||||||
|
muted: Color::Rgb(0x3f, 0x55, 0x45),
|
||||||
|
dim: Color::Rgb(0x52, 0x68, 0x5a),
|
||||||
|
active: Color::Rgb(0x15, 0x5b, 0x2e),
|
||||||
|
idle: Color::Rgb(0x3f, 0x55, 0x45),
|
||||||
|
awaiting: Color::Rgb(0x69, 0x46, 0x00),
|
||||||
|
error: Color::Rgb(0xa5, 0x1d, 0x14),
|
||||||
|
},
|
||||||
|
chrome_bg: Color::Rgb(0xff, 0xff, 0xff),
|
||||||
|
border_focused: Color::Rgb(0x21, 0x7a, 0x3c),
|
||||||
|
border_unfocused: Color::Rgb(0x65, 0x73, 0x6b),
|
||||||
|
focus_accent: Color::Rgb(0x21, 0x7a, 0x3c),
|
||||||
|
group_row: Color::Rgb(0x3f, 0x55, 0x45),
|
||||||
|
mode_normal_bg: Color::Rgb(0x21, 0x7a, 0x3c),
|
||||||
|
mode_normal_fg: Color::Rgb(0xff, 0xff, 0xff),
|
||||||
|
mode_insert_bg: Color::Rgb(0xb6, 0x81, 0x08),
|
||||||
|
mode_insert_fg: Color::Rgb(0x0b, 0x12, 0x0e),
|
||||||
|
error_text: Color::Rgb(0xb4, 0x23, 0x18),
|
||||||
|
};
|
||||||
|
|
||||||
|
/// A palette of named ANSI colours for terminals without truecolour.
|
||||||
|
pub const ANSI: Palette = Palette {
|
||||||
|
card: Surface {
|
||||||
|
bg: Color::Black,
|
||||||
|
fg: Color::White,
|
||||||
|
muted: Color::Gray,
|
||||||
|
dim: Color::DarkGray,
|
||||||
|
active: Color::Green,
|
||||||
|
idle: Color::Gray,
|
||||||
|
awaiting: Color::Yellow,
|
||||||
|
error: Color::Red,
|
||||||
|
},
|
||||||
|
selection: Surface {
|
||||||
|
bg: Color::Blue,
|
||||||
|
fg: Color::White,
|
||||||
|
muted: Color::White,
|
||||||
|
dim: Color::LightBlue,
|
||||||
|
active: Color::LightGreen,
|
||||||
|
idle: Color::White,
|
||||||
|
awaiting: Color::LightYellow,
|
||||||
|
error: Color::LightRed,
|
||||||
|
},
|
||||||
|
chrome_bg: Color::Black,
|
||||||
|
border_focused: Color::LightGreen,
|
||||||
|
border_unfocused: Color::DarkGray,
|
||||||
|
focus_accent: Color::LightGreen,
|
||||||
|
group_row: Color::LightCyan,
|
||||||
|
mode_normal_bg: Color::Green,
|
||||||
|
mode_normal_fg: Color::Black,
|
||||||
|
mode_insert_bg: Color::Yellow,
|
||||||
|
mode_insert_fg: Color::Black,
|
||||||
|
error_text: Color::LightRed,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// The default preset, retained as a named compatibility constant.
|
||||||
|
pub const DEFAULT: Palette = Self::DARK;
|
||||||
|
|
||||||
|
/// All preset names and their complete palettes.
|
||||||
|
pub fn presets() -> [(&'static str, Palette); 3] {
|
||||||
|
[
|
||||||
|
("dark", Self::DARK),
|
||||||
|
("light", Self::LIGHT),
|
||||||
|
("ansi", Self::ANSI),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Resolve a config name to a palette.
|
||||||
|
pub fn named(name: &str) -> Option<Palette> {
|
||||||
|
match name {
|
||||||
|
"dark" => Some(Self::DARK),
|
||||||
|
"light" => Some(Self::LIGHT),
|
||||||
|
"ansi" => Some(Self::ANSI),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Every role, including the backgrounds it is painted against.
|
||||||
|
pub fn roles(&self) -> [(&'static str, Color); 26] {
|
||||||
|
[
|
||||||
|
("card.bg", self.card.bg),
|
||||||
|
("card.fg", self.card.fg),
|
||||||
|
("card.muted", self.card.muted),
|
||||||
|
("card.dim", self.card.dim),
|
||||||
|
("card.active", self.card.active),
|
||||||
|
("card.idle", self.card.idle),
|
||||||
|
("card.awaiting", self.card.awaiting),
|
||||||
|
("card.error", self.card.error),
|
||||||
|
("selection.bg", self.selection.bg),
|
||||||
|
("selection.fg", self.selection.fg),
|
||||||
|
("selection.muted", self.selection.muted),
|
||||||
|
("selection.dim", self.selection.dim),
|
||||||
|
("selection.active", self.selection.active),
|
||||||
|
("selection.idle", self.selection.idle),
|
||||||
|
("selection.awaiting", self.selection.awaiting),
|
||||||
|
("selection.error", self.selection.error),
|
||||||
|
("chrome_bg", self.chrome_bg),
|
||||||
|
("border_focused", self.border_focused),
|
||||||
|
("border_unfocused", self.border_unfocused),
|
||||||
|
("focus_accent", self.focus_accent),
|
||||||
|
("group_row", self.group_row),
|
||||||
|
("mode_normal_bg", self.mode_normal_bg),
|
||||||
|
("mode_normal_fg", self.mode_normal_fg),
|
||||||
|
("mode_insert_bg", self.mode_insert_bg),
|
||||||
|
("mode_insert_fg", self.mode_insert_fg),
|
||||||
|
("error_text", self.error_text),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The surface a card sits on: the selection surface when it is the
|
||||||
|
/// highlighted card, the card surface otherwise.
|
||||||
|
pub fn surface(&self, selected: bool) -> &Surface {
|
||||||
|
if selected {
|
||||||
|
&self.selection
|
||||||
|
} else {
|
||||||
|
&self.card
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Border style for a panel, by whether it holds focus.
|
||||||
|
pub fn border_style(&self, focused: bool) -> Style {
|
||||||
|
if focused {
|
||||||
|
Style::default().bg(self.chrome_bg).fg(self.border_focused)
|
||||||
|
} else {
|
||||||
|
Style::default()
|
||||||
|
.bg(self.chrome_bg)
|
||||||
|
.fg(self.border_unfocused)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Style for a sidebar group heading.
|
||||||
|
pub fn group_row_style(&self) -> Style {
|
||||||
|
Style::default()
|
||||||
|
.bg(self.chrome_bg)
|
||||||
|
.fg(self.group_row)
|
||||||
|
.add_modifier(Modifier::BOLD)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Style for the status bar's mode indicator.
|
||||||
|
pub fn mode_style(&self, insert: bool) -> Style {
|
||||||
|
if insert {
|
||||||
|
Style::default()
|
||||||
|
.fg(self.mode_insert_fg)
|
||||||
|
.bg(self.mode_insert_bg)
|
||||||
|
} else {
|
||||||
|
Style::default()
|
||||||
|
.fg(self.mode_normal_fg)
|
||||||
|
.bg(self.mode_normal_bg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Style for error text outside a card.
|
||||||
|
pub fn error_style(&self) -> Style {
|
||||||
|
Style::default().bg(self.chrome_bg).fg(self.error_text)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for Palette {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::DEFAULT
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn active_slot() -> &'static std::sync::RwLock<Palette> {
|
||||||
|
static ACTIVE: std::sync::OnceLock<std::sync::RwLock<Palette>> = std::sync::OnceLock::new();
|
||||||
|
ACTIVE.get_or_init(|| std::sync::RwLock::new(Palette::DEFAULT))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Set the palette used by the running TUI.
|
||||||
|
pub(crate) fn set_active(palette: Palette) {
|
||||||
|
*active_slot().write().expect("active palette lock poisoned") = palette;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The palette in force. Config-driven preset selection lands here at TUI
|
||||||
|
/// startup, before the first frame is drawn.
|
||||||
|
pub fn active() -> Palette {
|
||||||
|
*active_slot().read().expect("active palette lock poisoned")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// WCAG relative luminance of an RGB role. Non-RGB colours have no fixed
|
||||||
|
/// luminance — they are whatever the terminal theme says — so they return
|
||||||
|
/// `None` and cannot be contrast-checked.
|
||||||
|
pub fn relative_luminance(color: Color) -> Option<f64> {
|
||||||
|
let Color::Rgb(r, g, b) = color else {
|
||||||
|
return None;
|
||||||
|
};
|
||||||
|
fn channel(v: u8) -> f64 {
|
||||||
|
let v = v as f64 / 255.0;
|
||||||
|
if v <= 0.03928 {
|
||||||
|
v / 12.92
|
||||||
|
} else {
|
||||||
|
((v + 0.055) / 1.055).powf(2.4)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Some(0.2126 * channel(r) + 0.7152 * channel(g) + 0.0722 * channel(b))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// WCAG contrast ratio between two RGB roles, 1.0 (identical) to 21.0
|
||||||
|
/// (black on white). `None` if either colour is not RGB.
|
||||||
|
pub fn contrast_ratio(a: Color, b: Color) -> Option<f64> {
|
||||||
|
let (la, lb) = (relative_luminance(a)?, relative_luminance(b)?);
|
||||||
|
let (hi, lo) = if la >= lb { (la, lb) } else { (lb, la) };
|
||||||
|
Some((hi + 0.05) / (lo + 0.05))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
const STATES: [ActivityState; 4] = [
|
||||||
|
ActivityState::Active,
|
||||||
|
ActivityState::Idle,
|
||||||
|
ActivityState::AwaitingInput,
|
||||||
|
ActivityState::Error,
|
||||||
|
];
|
||||||
|
|
||||||
|
/// Text roles clear WCAG AA (4.5:1) against their own surface; `dim` is
|
||||||
|
/// decoration and only has to clear the 3:1 non-text threshold.
|
||||||
|
#[test]
|
||||||
|
fn every_role_is_legible_on_its_own_surface() {
|
||||||
|
for (preset, p) in [("dark", Palette::DARK), ("light", Palette::LIGHT)] {
|
||||||
|
for (surface_name, surface) in [("card", &p.card), ("selection", &p.selection)] {
|
||||||
|
for (role, color) in surface.roles() {
|
||||||
|
let ratio = contrast_ratio(surface.bg, color)
|
||||||
|
.unwrap_or_else(|| panic!("{preset}.{surface_name}.{role} must be RGB"));
|
||||||
|
let floor = if role == "dim" { 3.0 } else { 4.5 };
|
||||||
|
assert!(
|
||||||
|
ratio >= floor,
|
||||||
|
"{preset}.{surface_name}.{role} contrast {ratio:.2} is below {floor}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn every_preset_supplies_every_role() {
|
||||||
|
for (name, p) in Palette::presets() {
|
||||||
|
assert_eq!(p.roles().len(), 26, "{name} role set is incomplete");
|
||||||
|
}
|
||||||
|
assert_eq!(Palette::named("dark"), Some(Palette::DARK));
|
||||||
|
assert_eq!(Palette::named("light"), Some(Palette::LIGHT));
|
||||||
|
assert_eq!(Palette::named("ansi"), Some(Palette::ANSI));
|
||||||
|
assert_eq!(Palette::named("unknown"), None);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The selection background exists to be seen as a different surface, not
|
||||||
|
/// merely a slightly different shade of the card.
|
||||||
|
#[test]
|
||||||
|
fn selection_background_is_distinguishable_from_the_card_background() {
|
||||||
|
for (name, p) in [("dark", Palette::DARK), ("light", Palette::LIGHT)] {
|
||||||
|
let ratio = contrast_ratio(p.card.bg, p.selection.bg).unwrap();
|
||||||
|
assert!(
|
||||||
|
ratio >= 1.6,
|
||||||
|
"{name} card and selection backgrounds differ by only {ratio:.2}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The bug this palette fixes: a state colour chosen for the dark card
|
||||||
|
/// background is not legible on the selection background, so the
|
||||||
|
/// selection surface carries its own — distinct — state colours.
|
||||||
|
#[test]
|
||||||
|
fn selection_state_colours_are_not_the_card_state_colours() {
|
||||||
|
for (name, p) in Palette::presets() {
|
||||||
|
for state in STATES {
|
||||||
|
assert_ne!(
|
||||||
|
p.card.activity(state),
|
||||||
|
p.selection.activity(state),
|
||||||
|
"{name} {state:?} must have a selection-specific colour"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Other panels' roles are RGB too, so a preset swap moves all of them.
|
||||||
|
/// Foregrounds are checked against the chrome background they are
|
||||||
|
/// actually painted on; they must never rely on the terminal default.
|
||||||
|
#[test]
|
||||||
|
fn chrome_roles_are_rgb_values() {
|
||||||
|
for (preset, p) in [("dark", Palette::DARK), ("light", Palette::LIGHT)] {
|
||||||
|
for (name, color) in p.roles().into_iter().skip(16) {
|
||||||
|
assert!(
|
||||||
|
relative_luminance(color).is_some(),
|
||||||
|
"{preset}.{name} must be an RGB value"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// The mode indicator paints fg on bg; both pairs must stay readable.
|
||||||
|
for (name, fg, bg) in [
|
||||||
|
("normal", p.mode_normal_fg, p.mode_normal_bg),
|
||||||
|
("insert", p.mode_insert_fg, p.mode_insert_bg),
|
||||||
|
] {
|
||||||
|
let ratio = contrast_ratio(fg, bg).unwrap();
|
||||||
|
assert!(
|
||||||
|
ratio >= 4.5,
|
||||||
|
"{preset} mode {name} contrast {ratio:.2} is below 4.5"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
for (name, fg, floor) in [
|
||||||
|
("border_focused", p.border_focused, 3.0),
|
||||||
|
("border_unfocused", p.border_unfocused, 3.0),
|
||||||
|
("focus_accent", p.focus_accent, 3.0),
|
||||||
|
("group_row", p.group_row, 4.5),
|
||||||
|
("error_text", p.error_text, 4.5),
|
||||||
|
] {
|
||||||
|
let ratio = contrast_ratio(fg, p.chrome_bg).unwrap();
|
||||||
|
assert!(
|
||||||
|
ratio >= floor,
|
||||||
|
"{preset}.{name} contrast {ratio:.2} is below {floor} on chrome_bg"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn contrast_ratio_matches_known_values() {
|
||||||
|
let black = Color::Rgb(0, 0, 0);
|
||||||
|
let white = Color::Rgb(255, 255, 255);
|
||||||
|
assert!((contrast_ratio(black, white).unwrap() - 21.0).abs() < 0.01);
|
||||||
|
assert!((contrast_ratio(white, white).unwrap() - 1.0).abs() < 0.01);
|
||||||
|
assert_eq!(contrast_ratio(Color::Cyan, white), None);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -106,6 +106,9 @@ fn translate_cell_style(cell: &vt100::Cell) -> Style {
|
|||||||
s
|
s
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// PTY cell colours pass through verbatim: they belong to the program
|
||||||
|
/// running in the pane, not to the TUI's own chrome, so they are deliberately
|
||||||
|
/// not palette roles (see `crate::palette`).
|
||||||
fn translate_color(c: vt100::Color) -> Option<Color> {
|
fn translate_color(c: vt100::Color) -> Option<Color> {
|
||||||
match c {
|
match c {
|
||||||
vt100::Color::Default => None,
|
vt100::Color::Default => None,
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
//! hit-test mouse clicks.
|
//! hit-test mouse clicks.
|
||||||
|
|
||||||
use ratatui::layout::{Constraint, Direction, Layout, Rect};
|
use ratatui::layout::{Constraint, Direction, Layout, Rect};
|
||||||
use ratatui::style::{Color, Style};
|
use ratatui::style::Style;
|
||||||
use ratatui::text::Span;
|
use ratatui::text::Span;
|
||||||
use ratatui::widgets::{Block, Borders, Paragraph};
|
use ratatui::widgets::{Block, Borders, Paragraph};
|
||||||
use ratatui::Frame;
|
use ratatui::Frame;
|
||||||
@@ -11,9 +11,10 @@ use ratatui::Frame;
|
|||||||
use crate::input::Region;
|
use crate::input::Region;
|
||||||
use crate::keymap::Mode;
|
use crate::keymap::Mode;
|
||||||
use crate::overlays::{HelpOverlay, KillConfirm, Toast};
|
use crate::overlays::{HelpOverlay, KillConfirm, Toast};
|
||||||
|
use crate::palette;
|
||||||
use crate::pane::Pane;
|
use crate::pane::Pane;
|
||||||
use crate::sidebar::Sidebar;
|
use crate::sidebar::Sidebar;
|
||||||
use crate::state::{AppState, Focus, OverlayKind};
|
use crate::state::{AppState, Focus, OverlayKind, SidebarItem};
|
||||||
use crate::tabs::TabBar;
|
use crate::tabs::TabBar;
|
||||||
use crate::worktrees::{ReclaimConfirm, WorktreesView};
|
use crate::worktrees::{ReclaimConfirm, WorktreesView};
|
||||||
|
|
||||||
@@ -22,6 +23,7 @@ use crate::worktrees::{ReclaimConfirm, WorktreesView};
|
|||||||
#[derive(Debug, Default, Clone)]
|
#[derive(Debug, Default, Clone)]
|
||||||
pub struct RegionMap {
|
pub struct RegionMap {
|
||||||
pub sidebar: Option<Rect>,
|
pub sidebar: Option<Rect>,
|
||||||
|
pub sidebar_items: Vec<SidebarItem>,
|
||||||
pub tab_bar: Option<Rect>,
|
pub tab_bar: Option<Rect>,
|
||||||
pub pane: Option<Rect>,
|
pub pane: Option<Rect>,
|
||||||
pub modal: Option<Rect>,
|
pub modal: Option<Rect>,
|
||||||
@@ -51,6 +53,24 @@ impl RegionMap {
|
|||||||
}
|
}
|
||||||
Region::Unknown
|
Region::Unknown
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Resolve a mouse row against the rendered sidebar sequence. The title
|
||||||
|
/// occupies one inner row; groups occupy one row and visible cards two.
|
||||||
|
pub fn sidebar_item_at(&self, row: u16) -> Option<SidebarItem> {
|
||||||
|
let area = self.sidebar?;
|
||||||
|
let mut cursor = area.y.saturating_add(2);
|
||||||
|
for item in &self.sidebar_items {
|
||||||
|
let height = match item {
|
||||||
|
SidebarItem::Group(_) => 1,
|
||||||
|
SidebarItem::Session(_) => 2,
|
||||||
|
};
|
||||||
|
if row >= cursor && row < cursor.saturating_add(height) {
|
||||||
|
return Some(item.clone());
|
||||||
|
}
|
||||||
|
cursor = cursor.saturating_add(height);
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn inside(r: Rect, col: u16, row: u16) -> bool {
|
fn inside(r: Rect, col: u16, row: u16) -> bool {
|
||||||
@@ -62,6 +82,7 @@ fn inside(r: Rect, col: u16, row: u16) -> bool {
|
|||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct RenderInputs<'a> {
|
pub struct RenderInputs<'a> {
|
||||||
pub sidebar: &'a Sidebar,
|
pub sidebar: &'a Sidebar,
|
||||||
|
pub home_dir: &'a str,
|
||||||
pub tab_bar: &'a TabBar,
|
pub tab_bar: &'a TabBar,
|
||||||
pub pane: Option<&'a Pane>,
|
pub pane: Option<&'a Pane>,
|
||||||
/// Inline spawn form when the active tab's pane is a draft (issue #63).
|
/// Inline spawn form when the active tab's pane is a draft (issue #63).
|
||||||
@@ -101,44 +122,46 @@ pub fn draw(f: &mut Frame, inputs: RenderInputs<'_>) -> RegionMap {
|
|||||||
let right = cols[1];
|
let right = cols[1];
|
||||||
|
|
||||||
if inputs.state.sidebar_visible {
|
if inputs.state.sidebar_visible {
|
||||||
inputs
|
inputs.sidebar.render_with_focus_and_collapsed_home(
|
||||||
.sidebar
|
f,
|
||||||
.render_with_focus(f, sidebar_area, inputs.state.focus == Focus::Sidebar);
|
sidebar_area,
|
||||||
|
inputs.state.focus == Focus::Sidebar,
|
||||||
|
&inputs.state.collapsed_sidebar_groups,
|
||||||
|
inputs.home_dir,
|
||||||
|
);
|
||||||
map.sidebar = Some(sidebar_area);
|
map.sidebar = Some(sidebar_area);
|
||||||
|
map.sidebar_items = inputs
|
||||||
|
.sidebar
|
||||||
|
.rendered_items_with_collapsed(&inputs.state.collapsed_sidebar_groups);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1-row tab bar + 1-row horizontal rule (doubles as the pane's focus
|
// The pane always owns its full border, so focus changes only recolour
|
||||||
// indicator) + flex pane area below. Saves the 4 rows the old
|
// chrome and never change the rectangles handed to the input router.
|
||||||
// `Length(3) + Borders::ALL` layout was eating before any content showed.
|
|
||||||
let rows = Layout::default()
|
let rows = Layout::default()
|
||||||
.direction(Direction::Vertical)
|
.direction(Direction::Vertical)
|
||||||
.constraints([
|
.constraints([Constraint::Length(1), Constraint::Min(0)])
|
||||||
Constraint::Length(1),
|
|
||||||
Constraint::Length(1),
|
|
||||||
Constraint::Min(0),
|
|
||||||
])
|
|
||||||
.split(right);
|
.split(right);
|
||||||
let tab_area = rows[0];
|
let tab_area = rows[0];
|
||||||
let separator_area = rows[1];
|
let pane_area = rows[1];
|
||||||
let pane_area = rows[2];
|
|
||||||
|
|
||||||
inputs.tab_bar.render(f, tab_area);
|
inputs.tab_bar.render(f, tab_area);
|
||||||
map.tab_bar = Some(tab_area);
|
map.tab_bar = Some(tab_area);
|
||||||
|
|
||||||
let pane_focused = inputs.state.focus == Focus::Pane;
|
let pane_focused = inputs.state.focus == Focus::Pane;
|
||||||
f.render_widget(
|
let pane_block = Block::default()
|
||||||
Block::default()
|
.borders(Borders::ALL)
|
||||||
.borders(Borders::TOP)
|
.border_style(focus_style(pane_focused));
|
||||||
.border_style(focus_style(pane_focused)),
|
let pane_inner = pane_block.inner(pane_area);
|
||||||
separator_area,
|
f.render_widget(pane_block, pane_area);
|
||||||
);
|
|
||||||
if let Some(p) = inputs.pane {
|
if let Some(p) = inputs.pane {
|
||||||
p.render(f, pane_area);
|
p.render(f, pane_inner);
|
||||||
}
|
}
|
||||||
if let Some(d) = inputs.draft {
|
if let Some(d) = inputs.draft {
|
||||||
d.render(f, pane_area, pane_focused);
|
d.render(f, pane_inner, pane_focused);
|
||||||
}
|
}
|
||||||
map.pane = Some(pane_area);
|
// `RegionMap::pane` is also the PTY resize source. Keep it aligned with
|
||||||
|
// the cells the emulator actually owns, excluding the persistent border.
|
||||||
|
map.pane = Some(pane_inner);
|
||||||
|
|
||||||
// Status bar — always visible, never eclipsed by overlays so the user can
|
// Status bar — always visible, never eclipsed by overlays so the user can
|
||||||
// always see the current mode + key hints.
|
// always see the current mode + key hints.
|
||||||
@@ -193,14 +216,10 @@ pub fn draw(f: &mut Frame, inputs: RenderInputs<'_>) -> RegionMap {
|
|||||||
map
|
map
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Border style for a panel based on whether it currently has focus.
|
/// Border style for a panel based on whether it currently has focus. Both
|
||||||
/// Focused = cyan; unfocused = the terminal default.
|
/// forms are palette roles (`border_focused` / `border_unfocused`).
|
||||||
fn focus_style(focused: bool) -> Style {
|
fn focus_style(focused: bool) -> Style {
|
||||||
if focused {
|
palette::active().border_style(focused)
|
||||||
Style::default().fg(Color::Cyan)
|
|
||||||
} else {
|
|
||||||
Style::default()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Render the always-visible status bar at the bottom of the frame. Surfaces
|
/// Render the always-visible status bar at the bottom of the frame. Surfaces
|
||||||
@@ -219,10 +238,7 @@ fn render_status_bar(f: &mut Frame, area: Rect, state: &AppState) {
|
|||||||
Mode::Normal => "j/k: nav • enter: attach • s: new draft • ?: help • ^Wq: quit",
|
Mode::Normal => "j/k: nav • enter: attach • s: new draft • ?: help • ^Wq: quit",
|
||||||
Mode::Insert => "^a: back to normal",
|
Mode::Insert => "^a: back to normal",
|
||||||
};
|
};
|
||||||
let mode_style = match state.mode {
|
let mode_style = palette::active().mode_style(state.mode == Mode::Insert);
|
||||||
Mode::Normal => Style::default().fg(Color::Black).bg(Color::Cyan),
|
|
||||||
Mode::Insert => Style::default().fg(Color::Black).bg(Color::Yellow),
|
|
||||||
};
|
|
||||||
let line = ratatui::text::Line::from(vec![
|
let line = ratatui::text::Line::from(vec![
|
||||||
Span::styled(format!(" {mode_label} "), mode_style),
|
Span::styled(format!(" {mode_label} "), mode_style),
|
||||||
Span::raw(format!(" {focus_label} • {hint}")),
|
Span::raw(format!(" {focus_label} • {hint}")),
|
||||||
@@ -244,6 +260,7 @@ mod tests {
|
|||||||
width: 10,
|
width: 10,
|
||||||
height: 20,
|
height: 20,
|
||||||
}),
|
}),
|
||||||
|
sidebar_items: Vec::new(),
|
||||||
tab_bar: Some(Rect {
|
tab_bar: Some(Rect {
|
||||||
x: 10,
|
x: 10,
|
||||||
y: 0,
|
y: 0,
|
||||||
@@ -273,6 +290,7 @@ mod tests {
|
|||||||
width: 10,
|
width: 10,
|
||||||
height: 20,
|
height: 20,
|
||||||
}),
|
}),
|
||||||
|
sidebar_items: Vec::new(),
|
||||||
tab_bar: Some(Rect {
|
tab_bar: Some(Rect {
|
||||||
x: 10,
|
x: 10,
|
||||||
y: 0,
|
y: 0,
|
||||||
@@ -297,6 +315,40 @@ mod tests {
|
|||||||
assert_eq!(map.region_at(3, 12), Region::SidebarRow); // outside modal
|
assert_eq!(map.region_at(3, 12), Region::SidebarRow); // outside modal
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn sidebar_mouse_rows_follow_group_and_two_line_card_heights() {
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
let group_a = SidebarItem::Group(PathBuf::from("/a"));
|
||||||
|
let card_a = SidebarItem::Session(Uuid::from_u128(1));
|
||||||
|
let group_b = SidebarItem::Group(PathBuf::from("/b"));
|
||||||
|
let card_b = SidebarItem::Session(Uuid::from_u128(2));
|
||||||
|
let map = RegionMap {
|
||||||
|
sidebar: Some(Rect::new(0, 0, 28, 10)),
|
||||||
|
sidebar_items: vec![group_a.clone(), card_a.clone(), group_b.clone(), card_b],
|
||||||
|
..RegionMap::default()
|
||||||
|
};
|
||||||
|
assert_eq!(map.sidebar_item_at(2), Some(group_a));
|
||||||
|
assert_eq!(map.sidebar_item_at(3), Some(card_a.clone()));
|
||||||
|
assert_eq!(map.sidebar_item_at(4), Some(card_a));
|
||||||
|
assert_eq!(map.sidebar_item_at(5), Some(group_b));
|
||||||
|
|
||||||
|
let collapsed = RegionMap {
|
||||||
|
sidebar: Some(Rect::new(0, 0, 28, 10)),
|
||||||
|
sidebar_items: vec![
|
||||||
|
SidebarItem::Group(PathBuf::from("/a")),
|
||||||
|
SidebarItem::Group(PathBuf::from("/b")),
|
||||||
|
SidebarItem::Session(Uuid::from_u128(2)),
|
||||||
|
],
|
||||||
|
..RegionMap::default()
|
||||||
|
};
|
||||||
|
assert_eq!(
|
||||||
|
collapsed.sidebar_item_at(3),
|
||||||
|
Some(SidebarItem::Group(PathBuf::from("/b")))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/// Issue #63: an empty pane is a draft — the frame must show the spawn
|
/// Issue #63: an empty pane is a draft — the frame must show the spawn
|
||||||
/// form where the terminal would otherwise be.
|
/// form where the terminal would otherwise be.
|
||||||
#[test]
|
#[test]
|
||||||
@@ -323,6 +375,7 @@ mod tests {
|
|||||||
let help = HelpOverlay { lines: Vec::new() };
|
let help = HelpOverlay { lines: Vec::new() };
|
||||||
let inputs = RenderInputs {
|
let inputs = RenderInputs {
|
||||||
sidebar: &sidebar,
|
sidebar: &sidebar,
|
||||||
|
home_dir: "",
|
||||||
tab_bar: &tab_bar,
|
tab_bar: &tab_bar,
|
||||||
pane: None,
|
pane: None,
|
||||||
draft: Some(draft),
|
draft: Some(draft),
|
||||||
@@ -357,4 +410,99 @@ mod tests {
|
|||||||
assert!(out.contains(s), "missing {s:?}:\n{out}");
|
assert!(out.contains(s), "missing {s:?}:\n{out}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn panel_rectangles_are_stable_when_focus_moves() {
|
||||||
|
use crate::overlays::HelpOverlay;
|
||||||
|
use crate::sidebar::Sidebar;
|
||||||
|
use std::collections::HashSet;
|
||||||
|
|
||||||
|
let sidebar = Sidebar {
|
||||||
|
sessions: Vec::new(),
|
||||||
|
highlight: None,
|
||||||
|
attached: HashSet::new(),
|
||||||
|
};
|
||||||
|
let tab_bar = TabBar {
|
||||||
|
tab_names: vec!["1".into()],
|
||||||
|
active_idx: 0,
|
||||||
|
};
|
||||||
|
let help = HelpOverlay { lines: Vec::new() };
|
||||||
|
let draw_map = |focus| {
|
||||||
|
let mut state = AppState::new();
|
||||||
|
state.focus = focus;
|
||||||
|
let inputs = RenderInputs {
|
||||||
|
sidebar: &sidebar,
|
||||||
|
home_dir: "",
|
||||||
|
tab_bar: &tab_bar,
|
||||||
|
pane: None,
|
||||||
|
draft: None,
|
||||||
|
state: &state,
|
||||||
|
help: &help,
|
||||||
|
worktrees: None,
|
||||||
|
};
|
||||||
|
let backend = ratatui::backend::TestBackend::new(80, 24);
|
||||||
|
let mut terminal = ratatui::Terminal::new(backend).unwrap();
|
||||||
|
let mut map = None;
|
||||||
|
terminal.draw(|f| map = Some(draw(f, inputs))).unwrap();
|
||||||
|
map.unwrap()
|
||||||
|
};
|
||||||
|
|
||||||
|
let sidebar_focus = draw_map(Focus::Sidebar);
|
||||||
|
let pane_focus = draw_map(Focus::Pane);
|
||||||
|
assert_eq!(sidebar_focus.sidebar, pane_focus.sidebar);
|
||||||
|
assert_eq!(sidebar_focus.tab_bar, pane_focus.tab_bar);
|
||||||
|
assert_eq!(sidebar_focus.pane, pane_focus.pane);
|
||||||
|
assert_eq!(sidebar_focus.pane, Some(Rect::new(29, 2, 50, 20)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn panel_border_colours_follow_focus_without_restyling_the_pane() {
|
||||||
|
use crate::overlays::HelpOverlay;
|
||||||
|
use crate::sidebar::Sidebar;
|
||||||
|
use std::collections::HashSet;
|
||||||
|
|
||||||
|
let sidebar = Sidebar {
|
||||||
|
sessions: Vec::new(),
|
||||||
|
highlight: None,
|
||||||
|
attached: HashSet::new(),
|
||||||
|
};
|
||||||
|
let tab_bar = TabBar {
|
||||||
|
tab_names: vec!["1".into()],
|
||||||
|
active_idx: 0,
|
||||||
|
};
|
||||||
|
let help = HelpOverlay { lines: Vec::new() };
|
||||||
|
let render = |focus| {
|
||||||
|
let mut state = AppState::new();
|
||||||
|
state.focus = focus;
|
||||||
|
let inputs = RenderInputs {
|
||||||
|
sidebar: &sidebar,
|
||||||
|
home_dir: "",
|
||||||
|
tab_bar: &tab_bar,
|
||||||
|
pane: None,
|
||||||
|
draft: None,
|
||||||
|
state: &state,
|
||||||
|
help: &help,
|
||||||
|
worktrees: None,
|
||||||
|
};
|
||||||
|
let backend = ratatui::backend::TestBackend::new(80, 24);
|
||||||
|
let mut terminal = ratatui::Terminal::new(backend).unwrap();
|
||||||
|
terminal
|
||||||
|
.draw(|f| {
|
||||||
|
draw(f, inputs);
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
terminal.backend().buffer().clone()
|
||||||
|
};
|
||||||
|
|
||||||
|
let sidebar_focused = render(Focus::Sidebar);
|
||||||
|
let pane_focused = render(Focus::Pane);
|
||||||
|
let p = palette::active();
|
||||||
|
assert_eq!(sidebar_focused[(0, 0)].style().fg, Some(p.border_focused));
|
||||||
|
assert_eq!(pane_focused[(0, 0)].style().fg, Some(p.border_unfocused));
|
||||||
|
assert_eq!(
|
||||||
|
sidebar_focused[(28, 1)].style().fg,
|
||||||
|
Some(p.border_unfocused)
|
||||||
|
);
|
||||||
|
assert_eq!(pane_focused[(28, 1)].style().fg, Some(p.border_focused));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+640
-109
@@ -2,12 +2,13 @@
|
|||||||
//!
|
//!
|
||||||
//! Line 1: status glyph (● attached / ○ live / ✗ dead) + name.
|
//! Line 1: status glyph (● attached / ○ live / ✗ dead) + name.
|
||||||
//! Line 2: activity dot + duration in the state's colour, plus the
|
//! Line 2: activity dot + duration in the state's colour, plus the
|
||||||
//! blocked-work and exited fragments when they apply. Absent entirely when
|
//! adaptive detail, blocked-work, exited, and command fragments.
|
||||||
//! it has nothing to say.
|
|
||||||
|
|
||||||
use std::collections::HashSet;
|
use std::collections::{BTreeMap, HashSet};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
use chrono::Utc;
|
use chrono::Utc;
|
||||||
|
use maestro_protocol::display::{abbreviate_dir, abbreviate_folder_name, session_tree_path};
|
||||||
use maestro_protocol::{ActivityState, Session, SessionStatus};
|
use maestro_protocol::{ActivityState, Session, SessionStatus};
|
||||||
use ratatui::layout::Rect;
|
use ratatui::layout::Rect;
|
||||||
use ratatui::style::{Color, Modifier, Style};
|
use ratatui::style::{Color, Modifier, Style};
|
||||||
@@ -16,8 +17,11 @@ use ratatui::widgets::{Block, Borders, Paragraph};
|
|||||||
use ratatui::Frame;
|
use ratatui::Frame;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
/// Time-in-state alone earns a meta line only once the session has sat in
|
use crate::palette;
|
||||||
/// its current activity state this long (docs/SIDEBAR.md).
|
use crate::state::SidebarItem;
|
||||||
|
|
||||||
|
/// Time-in-state earns a duration fragment once the session has sat in its
|
||||||
|
/// current activity state this long (docs/SIDEBAR.md).
|
||||||
const META_LINE_AFTER_SECS: i64 = 30;
|
const META_LINE_AFTER_SECS: i64 = 30;
|
||||||
/// A payload predating #102 defaults `activity_since` to the Unix epoch. Per
|
/// A payload predating #102 defaults `activity_since` to the Unix epoch. Per
|
||||||
/// docs/SIDEBAR.md such a session contributes no duration — the dot still
|
/// docs/SIDEBAR.md such a session contributes no duration — the dot still
|
||||||
@@ -30,43 +34,63 @@ const META_INDENT: &str = " ";
|
|||||||
/// Spawn-similar and kill, shown on the highlighted card's top-right corner.
|
/// Spawn-similar and kill, shown on the highlighted card's top-right corner.
|
||||||
const ACTIONS: &str = "⧉ ✕";
|
const ACTIONS: &str = "⧉ ✕";
|
||||||
|
|
||||||
/// Every card sits on this background so cards read as cards against the
|
/// Cards use the selection surface only while the sidebar owns focus. An
|
||||||
/// panel; the highlighted card swaps it for the focus background instead
|
/// unfocused highlight remains an edge-marked cursor without claiming the
|
||||||
/// (`Modifier::REVERSED` made the card unreadable against a background).
|
/// keyboard via a filled selection background.
|
||||||
const CARD_BG: Color = Color::Black;
|
fn card_base(highlighted: bool, focused: bool) -> Style {
|
||||||
fn card_base(highlighted: bool) -> Style {
|
palette::active()
|
||||||
if highlighted {
|
.surface(highlighted && focused)
|
||||||
Style::default().fg(Color::Black).bg(Color::Cyan)
|
.text_style()
|
||||||
} else {
|
|
||||||
Style::default().bg(CARD_BG)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Renderable sidebar state.
|
/// Renderable sidebar state.
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct Sidebar {
|
pub struct Sidebar {
|
||||||
pub sessions: Vec<Session>,
|
pub sessions: Vec<Session>,
|
||||||
pub highlight: Option<Uuid>,
|
pub highlight: Option<SidebarItem>,
|
||||||
pub attached: HashSet<Uuid>,
|
pub attached: HashSet<Uuid>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
pub struct SidebarGroup {
|
||||||
|
pub key: PathBuf,
|
||||||
|
pub sessions: Vec<Session>,
|
||||||
|
pub collapsed: bool,
|
||||||
|
}
|
||||||
|
|
||||||
impl Sidebar {
|
impl Sidebar {
|
||||||
pub fn render(&self, f: &mut Frame, area: Rect) {
|
pub fn render(&self, f: &mut Frame, area: Rect) {
|
||||||
self.render_with_focus(f, area, false);
|
self.render_with_focus(f, area, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Same as [`Sidebar::render`] but tints the right-edge separator in the
|
/// Render the panel with a persistent border. Focus changes its colour
|
||||||
/// focus colour when `focused`. Box borders eat too many rows/cols for
|
/// and whether the highlighted card claims the selection surface, never
|
||||||
/// the v1 layout — a single vertical rule keeps the panel boundary
|
/// its geometry.
|
||||||
/// without stealing space.
|
|
||||||
pub fn render_with_focus(&self, f: &mut Frame, area: Rect, focused: bool) {
|
pub fn render_with_focus(&self, f: &mut Frame, area: Rect, focused: bool) {
|
||||||
let border_style = if focused {
|
self.render_with_focus_and_collapsed(f, area, focused, &HashSet::new());
|
||||||
Style::default().fg(Color::Cyan)
|
}
|
||||||
} else {
|
|
||||||
Style::default()
|
pub fn render_with_focus_and_collapsed(
|
||||||
};
|
&self,
|
||||||
|
f: &mut Frame,
|
||||||
|
area: Rect,
|
||||||
|
focused: bool,
|
||||||
|
collapsed: &HashSet<PathBuf>,
|
||||||
|
) {
|
||||||
|
self.render_with_focus_and_collapsed_home(f, area, focused, collapsed, &home_dir());
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn render_with_focus_and_collapsed_home(
|
||||||
|
&self,
|
||||||
|
f: &mut Frame,
|
||||||
|
area: Rect,
|
||||||
|
focused: bool,
|
||||||
|
collapsed: &HashSet<PathBuf>,
|
||||||
|
home: &str,
|
||||||
|
) {
|
||||||
|
let border_style = palette::active().border_style(focused);
|
||||||
let block = Block::default()
|
let block = Block::default()
|
||||||
.borders(Borders::RIGHT)
|
.borders(Borders::ALL)
|
||||||
.border_style(border_style);
|
.border_style(border_style);
|
||||||
let inner = block.inner(area);
|
let inner = block.inner(area);
|
||||||
f.render_widget(block, area);
|
f.render_widget(block, area);
|
||||||
@@ -76,25 +100,117 @@ impl Sidebar {
|
|||||||
"sessions",
|
"sessions",
|
||||||
Style::default().add_modifier(Modifier::BOLD),
|
Style::default().add_modifier(Modifier::BOLD),
|
||||||
))];
|
))];
|
||||||
for s in &self.sessions {
|
for group in self.groups(collapsed) {
|
||||||
let highlighted = self.highlight == Some(s.id);
|
lines.push(Line::from(self.group_row(&group, width, focused, home)));
|
||||||
let base = card_base(highlighted);
|
if !group.collapsed {
|
||||||
lines.push(Line::from(self.name_row(s, width)));
|
for s in &group.sessions {
|
||||||
if let Some(meta) = self.meta_row(s, width) {
|
let highlighted = self.highlight == Some(SidebarItem::Session(s.id));
|
||||||
lines.push(Line::from(pad_to_width(meta, width, base)));
|
let base = card_base(highlighted, focused);
|
||||||
|
lines.push(Line::from(self.name_row(s, width, focused)));
|
||||||
|
let meta = self.meta_row(s, width, focused);
|
||||||
|
lines.push(Line::from(pad_to_width(meta, width, base)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
f.render_widget(Paragraph::new(lines), inner);
|
f.render_widget(Paragraph::new(lines), inner);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn name_row(&self, s: &Session, width: usize) -> Vec<Span<'static>> {
|
/// Items in exactly the order and height they occupy on screen.
|
||||||
|
pub fn rendered_items(&self) -> Vec<SidebarItem> {
|
||||||
|
self.rendered_items_with_collapsed(&HashSet::new())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn rendered_items_with_collapsed(&self, collapsed: &HashSet<PathBuf>) -> Vec<SidebarItem> {
|
||||||
|
self.groups(collapsed)
|
||||||
|
.into_iter()
|
||||||
|
.flat_map(|group| {
|
||||||
|
let mut items = vec![SidebarItem::Group(group.key)];
|
||||||
|
if !group.collapsed {
|
||||||
|
items.extend(
|
||||||
|
group
|
||||||
|
.sessions
|
||||||
|
.into_iter()
|
||||||
|
.map(|s| SidebarItem::Session(s.id)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
items
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn groups(&self, collapsed: &HashSet<PathBuf>) -> Vec<SidebarGroup> {
|
||||||
|
let mut grouped: BTreeMap<PathBuf, Vec<Session>> = BTreeMap::new();
|
||||||
|
for session in &self.sessions {
|
||||||
|
if let Some(key) = session_tree_path(session) {
|
||||||
|
grouped.entry(key).or_default().push(session.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
grouped
|
||||||
|
.into_iter()
|
||||||
|
.map(|(key, mut sessions)| {
|
||||||
|
sessions
|
||||||
|
.sort_by(|a, b| name_for(a).cmp(&name_for(b)).then_with(|| a.id.cmp(&b.id)));
|
||||||
|
SidebarGroup {
|
||||||
|
collapsed: collapsed.contains(&key),
|
||||||
|
key,
|
||||||
|
sessions,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn group_row(
|
||||||
|
&self,
|
||||||
|
group: &SidebarGroup,
|
||||||
|
width: usize,
|
||||||
|
focused: bool,
|
||||||
|
home: &str,
|
||||||
|
) -> Vec<Span<'static>> {
|
||||||
|
let highlighted = self.highlight == Some(SidebarItem::Group(group.key.clone()));
|
||||||
|
let palette = palette::active();
|
||||||
|
let surface = palette.surface(highlighted && focused);
|
||||||
|
let base = Style::default().bg(surface.bg).fg(if highlighted {
|
||||||
|
surface.fg
|
||||||
|
} else {
|
||||||
|
palette.group_row
|
||||||
|
});
|
||||||
|
let edge = highlighted && !focused;
|
||||||
|
let prefix = if edge { "▏ " } else { " " };
|
||||||
|
let chevron = if group.collapsed { "▸ " } else { "▾ " };
|
||||||
|
let path = abbreviate_dir(&group.key, home);
|
||||||
|
let name = abbreviate_folder_name(&path);
|
||||||
|
let count = format!(" ({})", group.sessions.len());
|
||||||
|
let prefix = Span::styled(
|
||||||
|
prefix,
|
||||||
|
if edge {
|
||||||
|
base.fg(palette.focus_accent)
|
||||||
|
} else {
|
||||||
|
base
|
||||||
|
},
|
||||||
|
);
|
||||||
|
let chevron = Span::styled(chevron, base);
|
||||||
|
let count = Span::styled(count, surface.muted_style());
|
||||||
|
let label_budget = width.saturating_sub(prefix.width() + chevron.width() + count.width());
|
||||||
|
let mut label = Vec::new();
|
||||||
|
if let Some(stem) = name.stem {
|
||||||
|
label.push(Span::styled(format!("{stem}/"), surface.dim_style()));
|
||||||
|
}
|
||||||
|
label.push(Span::styled(name.last, base));
|
||||||
|
|
||||||
|
let mut spans = vec![prefix, chevron];
|
||||||
|
spans.extend(fit_to_width(label, label_budget));
|
||||||
|
spans.push(count);
|
||||||
|
pad_to_width(spans, width, base)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn name_row(&self, s: &Session, width: usize, focused: bool) -> Vec<Span<'static>> {
|
||||||
let glyph = match (s.status, self.attached.contains(&s.id)) {
|
let glyph = match (s.status, self.attached.contains(&s.id)) {
|
||||||
(SessionStatus::Dead, _) => "✗",
|
(SessionStatus::Dead, _) => "✗",
|
||||||
(SessionStatus::Running, true) => "●",
|
(SessionStatus::Running, true) => "●",
|
||||||
(SessionStatus::Running, false) => "○",
|
(SessionStatus::Running, false) => "○",
|
||||||
};
|
};
|
||||||
let highlighted = self.highlight == Some(s.id);
|
let highlighted = self.highlight == Some(SidebarItem::Session(s.id));
|
||||||
let base = card_base(highlighted);
|
let base = card_base(highlighted, focused);
|
||||||
// Line-1 actions are keyboard affordances shown on the highlighted
|
// Line-1 actions are keyboard affordances shown on the highlighted
|
||||||
// row only; they reserve their width so the name truncates with `…`
|
// row only; they reserve their width so the name truncates with `…`
|
||||||
// before it can ever reach them (docs/SIDEBAR.md).
|
// before it can ever reach them (docs/SIDEBAR.md).
|
||||||
@@ -110,8 +226,16 @@ impl Sidebar {
|
|||||||
let sep = if highlighted { 1 } else { 0 };
|
let sep = if highlighted { 1 } else { 0 };
|
||||||
let name_budget = usable.saturating_sub(prefix + sep);
|
let name_budget = usable.saturating_sub(prefix + sep);
|
||||||
|
|
||||||
|
let edge = highlighted && !focused;
|
||||||
let mut spans: Vec<Span<'static>> = vec![
|
let mut spans: Vec<Span<'static>> = vec![
|
||||||
Span::styled(INDENT, base),
|
Span::styled(
|
||||||
|
if edge { "▏ " } else { INDENT },
|
||||||
|
if edge {
|
||||||
|
base.fg(palette::active().focus_accent)
|
||||||
|
} else {
|
||||||
|
base
|
||||||
|
},
|
||||||
|
),
|
||||||
Span::styled(format!("{glyph} "), base),
|
Span::styled(format!("{glyph} "), base),
|
||||||
];
|
];
|
||||||
spans.extend(
|
spans.extend(
|
||||||
@@ -121,10 +245,7 @@ impl Sidebar {
|
|||||||
);
|
);
|
||||||
let used: usize = spans.iter().map(|sp| sp.width()).sum();
|
let used: usize = spans.iter().map(|sp| sp.width()).sum();
|
||||||
if let Some(fill) = usable.checked_sub(used).filter(|&n| n > 0) {
|
if let Some(fill) = usable.checked_sub(used).filter(|&n| n > 0) {
|
||||||
spans.push(Span::styled(
|
spans.push(Span::styled(" ".repeat(fill), base));
|
||||||
" ".repeat(fill),
|
|
||||||
Style::default().bg(base.bg.unwrap_or(Color::Reset)),
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
if highlighted {
|
if highlighted {
|
||||||
spans.push(Span::styled(ACTIONS, base));
|
spans.push(Span::styled(ACTIONS, base));
|
||||||
@@ -132,8 +253,8 @@ impl Sidebar {
|
|||||||
spans
|
spans
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The adaptive second line: `<dot> <duration> [<blocked work> | exited]`.
|
/// The adaptive second line: `<dot> [<duration>] [<detail>] [<blocked work> | exited] <command>`.
|
||||||
fn meta_row(&self, s: &Session, width: usize) -> Option<Vec<Span<'static>>> {
|
fn meta_row(&self, s: &Session, width: usize, focused: bool) -> Vec<Span<'static>> {
|
||||||
let now = Utc::now();
|
let now = Utc::now();
|
||||||
let held = held_for(s, now);
|
let held = held_for(s, now);
|
||||||
let held_secs = held.map(|d| d.num_seconds()).unwrap_or(0);
|
let held_secs = held.map(|d| d.num_seconds()).unwrap_or(0);
|
||||||
@@ -141,44 +262,70 @@ impl Sidebar {
|
|||||||
// on line 1; the kill confirm names the specifics.
|
// on line 1; the kill confirm names the specifics.
|
||||||
let blocked = s.blocked_work.filter(|b| !b.is_clear());
|
let blocked = s.blocked_work.filter(|b| !b.is_clear());
|
||||||
let dead = s.status == SessionStatus::Dead;
|
let dead = s.status == SessionStatus::Dead;
|
||||||
let errored = s.activity == ActivityState::Error;
|
let highlighted = self.highlight == Some(SidebarItem::Session(s.id));
|
||||||
if (held.is_none() || held_secs < META_LINE_AFTER_SECS)
|
let base = card_base(highlighted, focused);
|
||||||
&& blocked.is_none()
|
let dot_style =
|
||||||
&& !dead
|
base.patch(Style::default().fg(activity_color(s.activity, highlighted, focused)));
|
||||||
&& !errored
|
let muted = palette::active()
|
||||||
{
|
.surface(highlighted && focused)
|
||||||
return None;
|
.muted_style();
|
||||||
}
|
let edge = highlighted && !focused;
|
||||||
let base = card_base(self.highlight == Some(s.id));
|
|
||||||
let dot_style = base.patch(Style::default().fg(activity_color(s.activity)));
|
|
||||||
let muted = Style::default().bg(base.bg.unwrap_or(Color::Reset));
|
|
||||||
let mut spans = vec![
|
let mut spans = vec![
|
||||||
Span::styled(META_INDENT, base),
|
Span::styled(
|
||||||
|
if edge { " ▏ " } else { META_INDENT },
|
||||||
|
if edge {
|
||||||
|
base.fg(palette::active().focus_accent)
|
||||||
|
} else {
|
||||||
|
base
|
||||||
|
},
|
||||||
|
),
|
||||||
Span::styled("●", dot_style),
|
Span::styled("●", dot_style),
|
||||||
];
|
];
|
||||||
if let Some(d) = held {
|
if let Some(d) = held.filter(|_| held_secs >= META_LINE_AFTER_SECS) {
|
||||||
spans.push(Span::styled(" ", base));
|
spans.push(Span::styled(" ", base));
|
||||||
spans.push(Span::styled(format_state_duration(d), dot_style));
|
spans.push(Span::styled(format_state_duration(d), dot_style));
|
||||||
}
|
}
|
||||||
|
let mut tail: Vec<Span<'static>> = Vec::new();
|
||||||
if let Some(b) = blocked {
|
if let Some(b) = blocked {
|
||||||
spans.push(Span::styled(format!(" ⚠ {b}"), muted));
|
tail.push(Span::styled(format!(" ⚠ {b}"), muted));
|
||||||
}
|
}
|
||||||
if dead {
|
if dead {
|
||||||
spans.push(Span::styled(" exited", muted));
|
tail.push(Span::styled(" exited", muted));
|
||||||
}
|
}
|
||||||
Some(fit_to_width(spans, width))
|
let command = Span::styled(format!(" {}", s.command), muted);
|
||||||
|
|
||||||
|
// Reserve the triggered status fragments before detail and command.
|
||||||
|
// If the row is exceptionally narrow, keep one column for the
|
||||||
|
// unconditional command and truncate the status tail first. Detail
|
||||||
|
// then receives only space left after the full command reservation;
|
||||||
|
// when the full command cannot fit, it is the final truncation target.
|
||||||
|
let head_w: usize = spans.iter().map(|sp| sp.width()).sum();
|
||||||
|
let available = width.saturating_sub(head_w);
|
||||||
|
let command_floor = usize::from(available > 0);
|
||||||
|
let tail = fit_to_width(tail, available.saturating_sub(command_floor));
|
||||||
|
let tail_w: usize = tail.iter().map(|sp| sp.width()).sum();
|
||||||
|
let command_w = command.width().min(available.saturating_sub(tail_w));
|
||||||
|
if let Some(detail) = s.activity_detail.as_deref().filter(|d| !d.is_empty()) {
|
||||||
|
let budget = available.saturating_sub(tail_w + command_w);
|
||||||
|
spans.extend(fit_to_width(
|
||||||
|
vec![Span::styled(format!(" {detail}"), muted)],
|
||||||
|
budget,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
spans.extend(tail);
|
||||||
|
spans.extend(fit_to_width(vec![command], command_w));
|
||||||
|
spans
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// ratatui colour for an [`ActivityState`], per docs/SIDEBAR.md. The state
|
/// Palette role carrying an [`ActivityState`], per docs/SIDEBAR.md. The
|
||||||
/// word is never spelled out — this colour carries it.
|
/// state word is never spelled out — this colour carries it. The highlighted
|
||||||
fn activity_color(state: ActivityState) -> Color {
|
/// card takes its state colours from the selection surface: a colour picked
|
||||||
match state {
|
/// for the dark card background is not legible on the selection background.
|
||||||
ActivityState::Active => Color::Green,
|
fn activity_color(state: ActivityState, highlighted: bool, focused: bool) -> Color {
|
||||||
ActivityState::Idle => Color::DarkGray,
|
palette::active()
|
||||||
ActivityState::AwaitingInput => Color::Yellow,
|
.surface(highlighted && focused)
|
||||||
ActivityState::Error => Color::Red,
|
.activity(state)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// docs/SIDEBAR.md duration format — floored whole seconds / minutes / hours,
|
/// docs/SIDEBAR.md duration format — floored whole seconds / minutes / hours,
|
||||||
@@ -232,8 +379,7 @@ fn fit_to_width(spans: Vec<Span<'static>>, max: usize) -> Vec<Span<'static>> {
|
|||||||
fn pad_to_width(mut spans: Vec<Span<'static>>, width: usize, base: Style) -> Vec<Span<'static>> {
|
fn pad_to_width(mut spans: Vec<Span<'static>>, width: usize, base: Style) -> Vec<Span<'static>> {
|
||||||
let used: usize = spans.iter().map(|sp| sp.width()).sum();
|
let used: usize = spans.iter().map(|sp| sp.width()).sum();
|
||||||
if let Some(fill) = width.checked_sub(used).filter(|&n| n > 0) {
|
if let Some(fill) = width.checked_sub(used).filter(|&n| n > 0) {
|
||||||
let pad_style = Style::default().bg(base.bg.unwrap_or(Color::Reset));
|
spans.push(Span::styled(" ".repeat(fill), base));
|
||||||
spans.push(Span::styled(" ".repeat(fill), pad_style));
|
|
||||||
}
|
}
|
||||||
spans
|
spans
|
||||||
}
|
}
|
||||||
@@ -247,6 +393,10 @@ fn name_for(s: &Session) -> String {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn home_dir() -> String {
|
||||||
|
std::env::var("HOME").unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
@@ -271,6 +421,7 @@ mod tests {
|
|||||||
created_at: Utc::now(),
|
created_at: Utc::now(),
|
||||||
foreground: None,
|
foreground: None,
|
||||||
activity: Default::default(),
|
activity: Default::default(),
|
||||||
|
activity_detail: None,
|
||||||
last_activity_at: Utc::now(),
|
last_activity_at: Utc::now(),
|
||||||
activity_since: Utc::now(),
|
activity_since: Utc::now(),
|
||||||
current_cwd: None,
|
current_cwd: None,
|
||||||
@@ -279,9 +430,24 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn draw(sidebar: &Sidebar, w: u16, h: u16) -> Buffer {
|
fn draw(sidebar: &Sidebar, w: u16, h: u16) -> Buffer {
|
||||||
|
draw_with_focus(sidebar, w, h, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn draw_with_focus(sidebar: &Sidebar, w: u16, h: u16, focused: bool) -> Buffer {
|
||||||
let backend = TestBackend::new(w, h);
|
let backend = TestBackend::new(w, h);
|
||||||
let mut terminal = Terminal::new(backend).unwrap();
|
let mut terminal = Terminal::new(backend).unwrap();
|
||||||
terminal.draw(|f| sidebar.render(f, f.area())).unwrap();
|
terminal
|
||||||
|
.draw(|f| sidebar.render_with_focus(f, f.area(), focused))
|
||||||
|
.unwrap();
|
||||||
|
terminal.backend().buffer().clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn draw_collapsed(sidebar: &Sidebar, w: u16, h: u16, collapsed: &HashSet<PathBuf>) -> Buffer {
|
||||||
|
let backend = TestBackend::new(w, h);
|
||||||
|
let mut terminal = Terminal::new(backend).unwrap();
|
||||||
|
terminal
|
||||||
|
.draw(|f| sidebar.render_with_focus_and_collapsed(f, f.area(), true, collapsed))
|
||||||
|
.unwrap();
|
||||||
terminal.backend().buffer().clone()
|
terminal.backend().buffer().clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -307,7 +473,10 @@ mod tests {
|
|||||||
|
|
||||||
/// Row text without the trailing space padding and right border.
|
/// Row text without the trailing space padding and right border.
|
||||||
fn content(row: &str) -> &str {
|
fn content(row: &str) -> &str {
|
||||||
row.trim_end().trim_end_matches('│').trim_end()
|
row.trim()
|
||||||
|
.trim_start_matches('│')
|
||||||
|
.trim_end_matches('│')
|
||||||
|
.trim()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -328,6 +497,102 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn groups_worktrees_under_their_base_repository() {
|
||||||
|
let mut s = session_named(1, "claude");
|
||||||
|
s.cwd = "/home/u/repos/worktrees/feature".into();
|
||||||
|
s.worktree = Some(maestro_protocol::SessionWorktree {
|
||||||
|
path: s.cwd.clone(),
|
||||||
|
base_repo: "/home/u/repos/maestro".into(),
|
||||||
|
});
|
||||||
|
let groups = (Sidebar {
|
||||||
|
sessions: vec![s],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
})
|
||||||
|
.groups(&HashSet::new());
|
||||||
|
assert_eq!(groups[0].key, PathBuf::from("/home/u/repos/maestro"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn does_not_render_groups_without_sessions() {
|
||||||
|
let sidebar = Sidebar {
|
||||||
|
sessions: Vec::new(),
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
assert!(sidebar.groups(&HashSet::new()).is_empty());
|
||||||
|
assert!(sidebar.rendered_items().is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn collapsing_a_group_hides_cards_but_keeps_the_count_and_item() {
|
||||||
|
let sidebar = Sidebar {
|
||||||
|
sessions: vec![session_named(1, "claude"), session_named(2, "bash")],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let key = PathBuf::from("/tmp");
|
||||||
|
let mut collapsed = HashSet::new();
|
||||||
|
collapsed.insert(key.clone());
|
||||||
|
let groups = sidebar.groups(&collapsed);
|
||||||
|
assert_eq!(groups[0].sessions.len(), 2);
|
||||||
|
assert!(groups[0].collapsed);
|
||||||
|
assert_eq!(
|
||||||
|
sidebar.rendered_items_with_collapsed(&collapsed),
|
||||||
|
vec![SidebarItem::Group(key)]
|
||||||
|
);
|
||||||
|
let rendered = render_to_string(&draw_collapsed(&sidebar, 40, 6, &collapsed));
|
||||||
|
assert!(rendered.contains("(2)"));
|
||||||
|
assert!(!rendered.contains("claude"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn long_group_labels_yield_to_the_always_visible_count() {
|
||||||
|
let mut session = session_named(1, "claude");
|
||||||
|
session.cwd = "/very/long/project/path/extraordinarily-long-project-name".into();
|
||||||
|
let sidebar = Sidebar {
|
||||||
|
sessions: vec![session],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let key = PathBuf::from("/very/long/project/path/extraordinarily-long-project-name");
|
||||||
|
let collapsed = HashSet::from([key]);
|
||||||
|
let rendered = render_to_string(&draw_collapsed(&sidebar, 28, 6, &collapsed));
|
||||||
|
|
||||||
|
assert!(rendered.contains('…'));
|
||||||
|
assert!(
|
||||||
|
rendered.contains("(1)"),
|
||||||
|
"group count was truncated: {rendered:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn shared_display_helpers_abbreviate_group_labels() {
|
||||||
|
let path = maestro_protocol::display::abbreviate_dir(
|
||||||
|
std::path::Path::new("/home/u/git.naps.pt/naps62/maestro"),
|
||||||
|
"/home/u",
|
||||||
|
);
|
||||||
|
let name = maestro_protocol::display::abbreviate_folder_name(&path);
|
||||||
|
assert_eq!(path, "~/git.naps.pt/naps62/maestro");
|
||||||
|
assert_eq!(name.stem.as_deref(), Some("~/g/n"));
|
||||||
|
assert_eq!(name.last, "maestro");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rendered_cards_are_always_two_lines_after_one_group_row() {
|
||||||
|
let sidebar = Sidebar {
|
||||||
|
sessions: vec![session_named(1, "claude")],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let all = rows(&draw(&sidebar, 40, 8));
|
||||||
|
assert!(all[2].contains("/tmp"));
|
||||||
|
assert!(all[3].contains("claude"));
|
||||||
|
assert!(all[4].contains("bash"));
|
||||||
|
assert!(!all[5].contains("bash"));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn attached_session_uses_filled_glyph() {
|
fn attached_session_uses_filled_glyph() {
|
||||||
let sid = Uuid::from_u128(1);
|
let sid = Uuid::from_u128(1);
|
||||||
@@ -403,10 +668,10 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A freshly-active session stays one line — never an empty placeholder
|
/// A fresh session still gets its unconditional second line, but no
|
||||||
/// row (docs/SIDEBAR.md).
|
/// duration until it has been held in state for 30 seconds.
|
||||||
#[test]
|
#[test]
|
||||||
fn freshly_active_session_stays_one_line() {
|
fn fresh_session_renders_two_lines_without_duration() {
|
||||||
let mut s = session_named(1, "claude");
|
let mut s = session_named(1, "claude");
|
||||||
s.activity_since = Utc::now() - Duration::seconds(10);
|
s.activity_since = Utc::now() - Duration::seconds(10);
|
||||||
let sb = Sidebar {
|
let sb = Sidebar {
|
||||||
@@ -415,12 +680,22 @@ mod tests {
|
|||||||
attached: Default::default(),
|
attached: Default::default(),
|
||||||
};
|
};
|
||||||
let all = rows(&draw(&sb, 28, 8));
|
let all = rows(&draw(&sb, 28, 8));
|
||||||
assert_eq!(content(&all[0]), "sessions");
|
assert_eq!(content(&all[1]), "sessions");
|
||||||
assert!(row_containing(&all, "claude").contains('○'));
|
assert!(row_containing(&all, "claude").contains('○'));
|
||||||
assert!(
|
assert!(
|
||||||
content(&all[2]).is_empty(),
|
all[4].contains('●'),
|
||||||
"line 2 must be absent, got {:?}",
|
"line 2 must carry the dot: {:?}",
|
||||||
all[2]
|
all[3]
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
all[4].contains("bash"),
|
||||||
|
"line 2 must carry the command: {:?}",
|
||||||
|
all[3]
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
!all[4].contains("10s"),
|
||||||
|
"fresh cards have no duration: {:?}",
|
||||||
|
all[3]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -459,12 +734,13 @@ mod tests {
|
|||||||
/// is never spelled out (docs/SIDEBAR.md colour table).
|
/// is never spelled out (docs/SIDEBAR.md colour table).
|
||||||
#[test]
|
#[test]
|
||||||
fn meta_line_dot_uses_the_contract_colour_per_state() {
|
fn meta_line_dot_uses_the_contract_colour_per_state() {
|
||||||
for (state, expected) in [
|
for state in [
|
||||||
(ActivityState::Active, Color::Green),
|
ActivityState::Active,
|
||||||
(ActivityState::Idle, Color::DarkGray),
|
ActivityState::Idle,
|
||||||
(ActivityState::AwaitingInput, Color::Yellow),
|
ActivityState::AwaitingInput,
|
||||||
(ActivityState::Error, Color::Red),
|
ActivityState::Error,
|
||||||
] {
|
] {
|
||||||
|
let expected = palette::active().card.activity(state);
|
||||||
let mut s = session_named(1, "claude");
|
let mut s = session_named(1, "claude");
|
||||||
s.activity = state;
|
s.activity = state;
|
||||||
s.activity_since = Utc::now() - Duration::seconds(120);
|
s.activity_since = Utc::now() - Duration::seconds(120);
|
||||||
@@ -480,6 +756,54 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The selected card keeps carrying its state on the dot, but in the
|
||||||
|
/// selection surface's own colours. A state colour picked for the dark
|
||||||
|
/// card background painted onto the selection background is the contrast
|
||||||
|
/// bug this palette fixes — this test fails if it comes back.
|
||||||
|
#[test]
|
||||||
|
fn selected_card_never_paints_a_card_state_colour_on_the_selection_background() {
|
||||||
|
let p = palette::active();
|
||||||
|
for state in [
|
||||||
|
ActivityState::Active,
|
||||||
|
ActivityState::Idle,
|
||||||
|
ActivityState::AwaitingInput,
|
||||||
|
ActivityState::Error,
|
||||||
|
] {
|
||||||
|
let mut s = session_named(1, "claude");
|
||||||
|
s.activity = state;
|
||||||
|
s.activity_since = Utc::now() - Duration::seconds(120);
|
||||||
|
let sb = Sidebar {
|
||||||
|
sessions: vec![s],
|
||||||
|
highlight: Some(SidebarItem::Session(Uuid::from_u128(1))),
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let buf = draw(&sb, 28, 8);
|
||||||
|
let on_selection = |fg: Color| {
|
||||||
|
(0..buf.area.height).any(|y| {
|
||||||
|
(0..buf.area.width).any(|x| {
|
||||||
|
let st = buf[(x, y)].style();
|
||||||
|
st.bg == Some(p.selection.bg) && st.fg == Some(fg)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
};
|
||||||
|
assert!(
|
||||||
|
!on_selection(p.card.activity(state)),
|
||||||
|
"{state:?}: card surface colour {:?} painted onto the selection background",
|
||||||
|
p.card.activity(state)
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
on_selection(p.selection.activity(state)),
|
||||||
|
"{state:?}: the dot must still carry the state on the selected card"
|
||||||
|
);
|
||||||
|
let ratio = palette::contrast_ratio(p.selection.bg, p.selection.activity(state))
|
||||||
|
.expect("palette roles are RGB");
|
||||||
|
assert!(
|
||||||
|
ratio >= 4.5,
|
||||||
|
"{state:?} on the selection background is only {ratio:.2}:1"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Rule 3 of docs/SIDEBAR.md: a dead session always gets a meta line,
|
/// Rule 3 of docs/SIDEBAR.md: a dead session always gets a meta line,
|
||||||
/// even freshly dead, with the muted `exited` fragment.
|
/// even freshly dead, with the muted `exited` fragment.
|
||||||
#[test]
|
#[test]
|
||||||
@@ -501,11 +825,12 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The sidebar is narrow: the meta line truncates with `…` and never
|
/// The sidebar is narrow: the command truncates with `…` and never wraps
|
||||||
/// wraps onto a third row (docs/SIDEBAR.md).
|
/// onto a third row (docs/SIDEBAR.md).
|
||||||
#[test]
|
#[test]
|
||||||
fn meta_line_truncates_instead_of_wrapping() {
|
fn meta_line_command_truncates_instead_of_wrapping() {
|
||||||
let mut s = session_named(1, "claude");
|
let mut s = session_named(1, "claude");
|
||||||
|
s.command = "a command that cannot fit".into();
|
||||||
s.activity_since = Utc::now() - Duration::seconds(5);
|
s.activity_since = Utc::now() - Duration::seconds(5);
|
||||||
s.blocked_work = Some(InTheWay {
|
s.blocked_work = Some(InTheWay {
|
||||||
uncommitted_files: 120,
|
uncommitted_files: 120,
|
||||||
@@ -521,7 +846,94 @@ mod tests {
|
|||||||
let meta = content(&all[idx + 1]);
|
let meta = content(&all[idx + 1]);
|
||||||
assert!(
|
assert!(
|
||||||
meta.trim_end().ends_with('…'),
|
meta.trim_end().ends_with('…'),
|
||||||
"truncated meta line must end with …: {meta:?}"
|
"truncated command must end with …: {meta:?}"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
content(&all[idx + 2]).trim().is_empty(),
|
||||||
|
"meta line must not wrap: {:?}",
|
||||||
|
all[idx + 2]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// #112: the agent-reported detail sits right after the duration on the
|
||||||
|
/// meta line, in the muted style (docs/SIDEBAR.md).
|
||||||
|
#[test]
|
||||||
|
fn errored_session_shows_its_reported_detail_on_the_meta_line() {
|
||||||
|
let mut s = session_named(1, "claude");
|
||||||
|
s.activity = ActivityState::Error;
|
||||||
|
s.activity_since = Utc::now() - Duration::seconds(90);
|
||||||
|
s.activity_detail = Some("cargo build failed".into());
|
||||||
|
let sb = Sidebar {
|
||||||
|
sessions: vec![s],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let all = rows(&draw(&sb, 40, 8));
|
||||||
|
let idx = all.iter().position(|l| l.contains("claude")).unwrap();
|
||||||
|
let meta = &all[idx + 1];
|
||||||
|
assert!(meta.contains('●'), "meta line carries the dot: {meta:?}");
|
||||||
|
assert!(
|
||||||
|
meta.contains("1m"),
|
||||||
|
"duration precedes the detail: {meta:?}"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
meta.contains("cargo build failed"),
|
||||||
|
"reported detail must render: {meta:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A fresh Error report earns line 2 on its own (contract rule 4), with
|
||||||
|
/// the detail even though no duration has accrued.
|
||||||
|
#[test]
|
||||||
|
fn fresh_errored_session_earns_a_meta_line_for_its_detail() {
|
||||||
|
let mut s = session_named(1, "claude");
|
||||||
|
s.activity = ActivityState::Error;
|
||||||
|
s.activity_since = Utc::now() - Duration::seconds(5);
|
||||||
|
s.activity_detail = Some("waiting for approval".into());
|
||||||
|
let sb = Sidebar {
|
||||||
|
sessions: vec![s],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let all = rows(&draw(&sb, 40, 8));
|
||||||
|
let idx = all.iter().position(|l| l.contains("claude")).unwrap();
|
||||||
|
assert!(
|
||||||
|
all[idx + 1].contains("waiting for approval"),
|
||||||
|
"detail must render on a fresh report's own meta line: {:?}",
|
||||||
|
all[idx + 1]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// #112 via docs/SIDEBAR.md: the detail truncates with `…` ahead of the
|
||||||
|
/// trailing fragments — a long detail never pushes blocked work or
|
||||||
|
/// `exited` off the line, and never wraps.
|
||||||
|
#[test]
|
||||||
|
fn long_detail_yields_to_blocked_work_and_exited() {
|
||||||
|
let mut s = session_named(1, "claude");
|
||||||
|
s.status = SessionStatus::Dead;
|
||||||
|
s.activity_since = Utc::now() - Duration::seconds(5);
|
||||||
|
s.activity_detail =
|
||||||
|
Some("an absurdly long error message that cannot possibly fit ".repeat(3));
|
||||||
|
s.blocked_work = Some(InTheWay {
|
||||||
|
unpushed_commits: 2,
|
||||||
|
..InTheWay::default()
|
||||||
|
});
|
||||||
|
let sb = Sidebar {
|
||||||
|
sessions: vec![s],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let all = rows(&draw(&sb, 42, 8));
|
||||||
|
let idx = all.iter().position(|l| l.contains("claude")).unwrap();
|
||||||
|
let meta = content(&all[idx + 1]);
|
||||||
|
assert!(meta.contains('…'), "truncated detail ends with …: {meta:?}");
|
||||||
|
assert!(
|
||||||
|
meta.contains("2 unpushed commits"),
|
||||||
|
"blocked work stays on the line: {meta:?}"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
meta.contains("exited"),
|
||||||
|
"exited fragment stays on the line: {meta:?}"
|
||||||
);
|
);
|
||||||
assert!(
|
assert!(
|
||||||
content(&all[idx + 2]).trim().is_empty(),
|
content(&all[idx + 2]).trim().is_empty(),
|
||||||
@@ -549,10 +961,6 @@ mod tests {
|
|||||||
rendered.contains("exited"),
|
rendered.contains("exited"),
|
||||||
"dead session must still show line 2:\n{rendered}"
|
"dead session must still show line 2:\n{rendered}"
|
||||||
);
|
);
|
||||||
assert!(
|
|
||||||
!rendered.contains('h') || !rendered.contains("● "),
|
|
||||||
"no duration may follow the dot for an epoch stamp:\n{rendered}"
|
|
||||||
);
|
|
||||||
for line in rendered.lines().filter(|l| l.contains('●')) {
|
for line in rendered.lines().filter(|l| l.contains('●')) {
|
||||||
assert!(
|
assert!(
|
||||||
!line
|
!line
|
||||||
@@ -579,6 +987,7 @@ mod tests {
|
|||||||
created_at: Utc::now(),
|
created_at: Utc::now(),
|
||||||
foreground: None,
|
foreground: None,
|
||||||
activity: Default::default(),
|
activity: Default::default(),
|
||||||
|
activity_detail: None,
|
||||||
last_activity_at: Utc::now(),
|
last_activity_at: Utc::now(),
|
||||||
activity_since: Utc::now(),
|
activity_since: Utc::now(),
|
||||||
current_cwd: None,
|
current_cwd: None,
|
||||||
@@ -596,6 +1005,90 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn command_renders_on_line_two_even_when_name_is_metadata() {
|
||||||
|
let s = session_named(1, "friendly name");
|
||||||
|
let sb = Sidebar {
|
||||||
|
sessions: vec![s],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let all = rows(&draw(&sb, 40, 6));
|
||||||
|
assert!(
|
||||||
|
all[3].contains("friendly name"),
|
||||||
|
"name must stay on line 1: {:?}",
|
||||||
|
all[2]
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
all[4].contains("bash"),
|
||||||
|
"command must be on line 2: {:?}",
|
||||||
|
all[3]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn narrow_meta_line_keeps_dot_and_truncates_command() {
|
||||||
|
let s = session_named(1, "name");
|
||||||
|
let sb = Sidebar {
|
||||||
|
sessions: vec![s],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let all = rows(&draw(&sb, 10, 6));
|
||||||
|
assert!(
|
||||||
|
all[4].contains('●'),
|
||||||
|
"dot must survive narrow cards: {:?}",
|
||||||
|
all[3]
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
all[4].contains('…'),
|
||||||
|
"command should truncate: {:?}",
|
||||||
|
all[3]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn blocked_warning_survives_before_a_truncated_command() {
|
||||||
|
let mut s = session_named(1, "name");
|
||||||
|
s.command = "a command that cannot fit".into();
|
||||||
|
s.blocked_work = Some(InTheWay {
|
||||||
|
uncommitted_files: 1,
|
||||||
|
..Default::default()
|
||||||
|
});
|
||||||
|
let sb = Sidebar {
|
||||||
|
sessions: vec![s],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let all = rows(&draw(&sb, 29, 6));
|
||||||
|
assert!(all[4].contains("⚠ 1 uncommitted file"), "{:?}", all[4]);
|
||||||
|
let meta = content(&all[4]);
|
||||||
|
assert!(meta.ends_with('…'), "command must truncate: {meta:?}");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn long_detail_yields_to_status_and_command() {
|
||||||
|
let mut s = session_named(1, "name");
|
||||||
|
s.activity_detail = Some("a very long agent-reported detail".into());
|
||||||
|
s.blocked_work = Some(InTheWay {
|
||||||
|
uncommitted_files: 1,
|
||||||
|
..Default::default()
|
||||||
|
});
|
||||||
|
let sb = Sidebar {
|
||||||
|
sessions: vec![s],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let all = rows(&draw(&sb, 40, 6));
|
||||||
|
assert!(all[4].contains("⚠ 1 uncommitted file"), "{:?}", all[4]);
|
||||||
|
assert!(
|
||||||
|
all[4].contains("bash"),
|
||||||
|
"command must survive: {:?}",
|
||||||
|
all[3]
|
||||||
|
);
|
||||||
|
assert!(all[4].contains('…'), "detail must truncate: {:?}", all[4]);
|
||||||
|
}
|
||||||
|
|
||||||
/// Reversed video makes a card unreadable against a background; cards
|
/// Reversed video makes a card unreadable against a background; cards
|
||||||
/// use explicit backgrounds instead (docs/SIDEBAR.md, #108).
|
/// use explicit backgrounds instead (docs/SIDEBAR.md, #108).
|
||||||
#[test]
|
#[test]
|
||||||
@@ -604,7 +1097,7 @@ mod tests {
|
|||||||
highlighted.activity_since = Utc::now() - Duration::seconds(120);
|
highlighted.activity_since = Utc::now() - Duration::seconds(120);
|
||||||
let sb = Sidebar {
|
let sb = Sidebar {
|
||||||
sessions: vec![highlighted],
|
sessions: vec![highlighted],
|
||||||
highlight: Some(Uuid::from_u128(1)),
|
highlight: Some(SidebarItem::Session(Uuid::from_u128(1))),
|
||||||
attached: Default::default(),
|
attached: Default::default(),
|
||||||
};
|
};
|
||||||
let buf = draw(&sb, 28, 8);
|
let buf = draw(&sb, 28, 8);
|
||||||
@@ -629,36 +1122,74 @@ mod tests {
|
|||||||
let two = session_named(2, "bash");
|
let two = session_named(2, "bash");
|
||||||
let sb = Sidebar {
|
let sb = Sidebar {
|
||||||
sessions: vec![one, two],
|
sessions: vec![one, two],
|
||||||
highlight: Some(Uuid::from_u128(1)),
|
highlight: Some(SidebarItem::Session(Uuid::from_u128(1))),
|
||||||
attached: Default::default(),
|
attached: Default::default(),
|
||||||
};
|
};
|
||||||
let buf = draw(&sb, 28, 8);
|
let buf = draw(&sb, 28, 8);
|
||||||
let all = rows(&buf);
|
let all = rows(&buf);
|
||||||
let claude_y = all.iter().position(|l| l.contains("claude")).unwrap();
|
let claude_y = all.iter().position(|l| l.contains("claude")).unwrap();
|
||||||
let bash_y = all.iter().position(|l| l.contains("bash")).unwrap();
|
let bash_y = all.iter().position(|l| l.contains("○ bash")).unwrap();
|
||||||
|
|
||||||
|
let p = palette::active();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
buf[(0, claude_y as u16)].style().bg,
|
buf[(1, claude_y as u16)].style().bg,
|
||||||
Some(Color::Cyan),
|
Some(p.selection.bg),
|
||||||
"focused card must sit on the focus background"
|
"focused card must sit on the selection surface"
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
buf[(0, claude_y as u16)].style().fg,
|
buf[(1, claude_y as u16)].style().fg,
|
||||||
Some(Color::Black),
|
Some(p.selection.fg),
|
||||||
"focused card text must stay readable on cyan"
|
"focused card text must use the selection foreground role"
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
buf[(0, bash_y as u16)].style().bg,
|
buf[(1, bash_y as u16)].style().bg,
|
||||||
Some(Color::Black),
|
Some(p.card.bg),
|
||||||
"unfocused cards must still have a card background"
|
"unfocused cards must still sit on the card surface"
|
||||||
);
|
);
|
||||||
// The panel itself (header row) stays on the terminal default.
|
// The panel itself (header row) stays on the terminal default.
|
||||||
assert!(
|
assert!(
|
||||||
matches!(buf[(0, 0)].style().bg, None | Some(Color::Reset)),
|
matches!(buf[(1, 1)].style().bg, None | Some(Color::Reset)),
|
||||||
"panel must keep the terminal default background"
|
"panel must keep the terminal default background"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn highlighted_card_is_hollow_when_sidebar_is_unfocused() {
|
||||||
|
let sb = Sidebar {
|
||||||
|
sessions: vec![session_named(1, "claude")],
|
||||||
|
highlight: Some(SidebarItem::Session(Uuid::from_u128(1))),
|
||||||
|
attached: Default::default(),
|
||||||
|
};
|
||||||
|
let buf = draw_with_focus(&sb, 28, 8, false);
|
||||||
|
let y = (0..buf.area.height)
|
||||||
|
.find(|&y| (0..buf.area.width).any(|x| buf[(x, y)].symbol() == "c"))
|
||||||
|
.expect("highlighted session row");
|
||||||
|
assert_eq!(
|
||||||
|
buf[(1, y)].style().bg,
|
||||||
|
Some(palette::active().card.bg),
|
||||||
|
"unfocused highlight must not paint the selection surface"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
(0..buf.area.width).any(|x| buf[(x, y)].symbol() == "▏"),
|
||||||
|
"unfocused highlight must retain a visible edge marker"
|
||||||
|
);
|
||||||
|
let ordinary = draw_with_focus(
|
||||||
|
&Sidebar {
|
||||||
|
sessions: vec![session_named(1, "claude")],
|
||||||
|
highlight: None,
|
||||||
|
attached: Default::default(),
|
||||||
|
},
|
||||||
|
28,
|
||||||
|
8,
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
!(0..ordinary.area.height)
|
||||||
|
.any(|row| (0..ordinary.area.width).any(|x| ordinary[(x, row)].symbol() == "▏")),
|
||||||
|
"ordinary unhighlighted cards must not carry the cursor marker"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/// The card background paints the full card width, not just the glyphs.
|
/// The card background paints the full card width, not just the glyphs.
|
||||||
#[test]
|
#[test]
|
||||||
fn card_background_covers_the_full_card_width() {
|
fn card_background_covers_the_full_card_width() {
|
||||||
@@ -670,10 +1201,10 @@ mod tests {
|
|||||||
};
|
};
|
||||||
let buf = draw(&sb, 28, 8);
|
let buf = draw(&sb, 28, 8);
|
||||||
let y = buf.content.iter().position(|c| c.symbol() == "c").unwrap() as u16 / buf.area.width;
|
let y = buf.content.iter().position(|c| c.symbol() == "c").unwrap() as u16 / buf.area.width;
|
||||||
for x in 0..27 {
|
for x in 1..27 {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
buf[(x, y)].style().bg,
|
buf[(x, y)].style().bg,
|
||||||
Some(Color::Black),
|
Some(palette::active().card.bg),
|
||||||
"gap in card background at col {x}"
|
"gap in card background at col {x}"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -684,7 +1215,7 @@ mod tests {
|
|||||||
fn highlighted_row_anchors_the_actions_top_right() {
|
fn highlighted_row_anchors_the_actions_top_right() {
|
||||||
let sb = Sidebar {
|
let sb = Sidebar {
|
||||||
sessions: vec![session_named(1, "claude")],
|
sessions: vec![session_named(1, "claude")],
|
||||||
highlight: Some(Uuid::from_u128(1)),
|
highlight: Some(SidebarItem::Session(Uuid::from_u128(1))),
|
||||||
attached: Default::default(),
|
attached: Default::default(),
|
||||||
};
|
};
|
||||||
let all = rows(&draw(&sb, 28, 8));
|
let all = rows(&draw(&sb, 28, 8));
|
||||||
@@ -701,7 +1232,7 @@ mod tests {
|
|||||||
let two = session_named(2, "bash");
|
let two = session_named(2, "bash");
|
||||||
let sb = Sidebar {
|
let sb = Sidebar {
|
||||||
sessions: vec![one, two],
|
sessions: vec![one, two],
|
||||||
highlight: Some(Uuid::from_u128(1)),
|
highlight: Some(SidebarItem::Session(Uuid::from_u128(1))),
|
||||||
attached: Default::default(),
|
attached: Default::default(),
|
||||||
};
|
};
|
||||||
let all = rows(&draw(&sb, 28, 8));
|
let all = rows(&draw(&sb, 28, 8));
|
||||||
@@ -722,7 +1253,7 @@ mod tests {
|
|||||||
}
|
}
|
||||||
let sb = Sidebar {
|
let sb = Sidebar {
|
||||||
sessions: vec![s],
|
sessions: vec![s],
|
||||||
highlight: Some(Uuid::from_u128(1)),
|
highlight: Some(SidebarItem::Session(Uuid::from_u128(1))),
|
||||||
attached: Default::default(),
|
attached: Default::default(),
|
||||||
};
|
};
|
||||||
let all = rows(&draw(&sb, 28, 8));
|
let all = rows(&draw(&sb, 28, 8));
|
||||||
|
|||||||
@@ -8,6 +8,9 @@
|
|||||||
//!
|
//!
|
||||||
//! v1.5 will replace `Tab::pane`'s single slot with a split tree.
|
//! v1.5 will replace `Tab::pane`'s single slot with a split tree.
|
||||||
|
|
||||||
|
use std::collections::HashSet;
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
use crate::draft::DraftPane;
|
use crate::draft::DraftPane;
|
||||||
@@ -19,6 +22,16 @@ pub enum Focus {
|
|||||||
Pane,
|
Pane,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// One selectable item in the rendered sidebar sequence.
|
||||||
|
///
|
||||||
|
/// Group paths, unlike a session's position in the catalog, survive catalog
|
||||||
|
/// redraws and make a highlighted collapsed group unambiguous.
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
|
||||||
|
pub enum SidebarItem {
|
||||||
|
Group(PathBuf),
|
||||||
|
Session(Uuid),
|
||||||
|
}
|
||||||
|
|
||||||
/// What a tab's pane slot holds: a live session, or an inline draft form.
|
/// What a tab's pane slot holds: a live session, or an inline draft form.
|
||||||
// The draft variant dwarfs `Session(Uuid)`; tabs are moved rarely enough
|
// The draft variant dwarfs `Session(Uuid)`; tabs are moved rarely enough
|
||||||
// that boxing every access costs more than the copy does.
|
// that boxing every access costs more than the copy does.
|
||||||
@@ -70,7 +83,10 @@ pub struct AppState {
|
|||||||
pub focus: Focus,
|
pub focus: Focus,
|
||||||
pub mode: Mode,
|
pub mode: Mode,
|
||||||
pub sidebar_visible: bool,
|
pub sidebar_visible: bool,
|
||||||
pub sidebar_highlight: Option<Uuid>,
|
pub sidebar_highlight: Option<SidebarItem>,
|
||||||
|
/// Group paths whose cards are hidden. This is UI state rather than
|
||||||
|
/// catalog state, so it survives every catalog redraw.
|
||||||
|
pub collapsed_sidebar_groups: HashSet<PathBuf>,
|
||||||
/// Private: every transition goes through [`AppState::show_overlay`],
|
/// Private: every transition goes through [`AppState::show_overlay`],
|
||||||
/// [`AppState::dismiss_overlay`] or [`AppState::toast`]. Poking the field
|
/// [`AppState::dismiss_overlay`] or [`AppState::toast`]. Poking the field
|
||||||
/// from four call sites is what left a toast on screen with no way to
|
/// from four call sites is what left a toast on screen with no way to
|
||||||
@@ -96,6 +112,7 @@ impl AppState {
|
|||||||
mode: Mode::Normal,
|
mode: Mode::Normal,
|
||||||
sidebar_visible: true,
|
sidebar_visible: true,
|
||||||
sidebar_highlight: None,
|
sidebar_highlight: None,
|
||||||
|
collapsed_sidebar_groups: HashSet::new(),
|
||||||
overlay: None,
|
overlay: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -213,19 +230,32 @@ impl AppState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Move the sidebar highlight by `delta` (positive = down) within the
|
/// Move the sidebar highlight by `delta` (positive = down) within the
|
||||||
/// given ordered list of selectable session ids. Wraps. No-op on empty.
|
/// rendered item sequence. Wraps. No-op on empty.
|
||||||
pub fn move_sidebar_highlight(&mut self, order: &[Uuid], delta: i32) {
|
pub fn move_sidebar_highlight(&mut self, order: &[SidebarItem], delta: i32) {
|
||||||
if order.is_empty() {
|
if order.is_empty() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let len = order.len() as i32;
|
let len = order.len() as i32;
|
||||||
let cur = self
|
let cur = self
|
||||||
.sidebar_highlight
|
.sidebar_highlight
|
||||||
.and_then(|id| order.iter().position(|x| *x == id))
|
.as_ref()
|
||||||
|
.and_then(|id| order.iter().position(|x| x == id))
|
||||||
.map(|i| i as i32)
|
.map(|i| i as i32)
|
||||||
.unwrap_or(-1);
|
.unwrap_or(-1);
|
||||||
let next = (cur + delta).rem_euclid(len) as usize;
|
let next = (cur + delta).rem_euclid(len) as usize;
|
||||||
self.sidebar_highlight = Some(order[next]);
|
self.sidebar_highlight = Some(order[next].clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Toggle a group. When collapsing a group containing the current card,
|
||||||
|
/// leave the highlight on the group row that remains visible.
|
||||||
|
pub fn toggle_sidebar_group(&mut self, key: PathBuf, contains_highlight: bool) {
|
||||||
|
if self.collapsed_sidebar_groups.remove(&key) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
self.collapsed_sidebar_groups.insert(key.clone());
|
||||||
|
if contains_highlight {
|
||||||
|
self.sidebar_highlight = Some(SidebarItem::Group(key));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Toggle sidebar visibility.
|
/// Toggle sidebar visibility.
|
||||||
@@ -318,22 +348,30 @@ mod tests {
|
|||||||
let a = Uuid::from_u128(1);
|
let a = Uuid::from_u128(1);
|
||||||
let b = Uuid::from_u128(2);
|
let b = Uuid::from_u128(2);
|
||||||
let c = Uuid::from_u128(3);
|
let c = Uuid::from_u128(3);
|
||||||
let order = vec![a, b, c];
|
let order = vec![
|
||||||
|
SidebarItem::Session(a),
|
||||||
|
SidebarItem::Group("repo".into()),
|
||||||
|
SidebarItem::Session(b),
|
||||||
|
SidebarItem::Session(c),
|
||||||
|
];
|
||||||
|
|
||||||
// No prior highlight + delta +1 lands on first item.
|
// No prior highlight + delta +1 lands on first item.
|
||||||
state.move_sidebar_highlight(&order, 1);
|
state.move_sidebar_highlight(&order, 1);
|
||||||
assert_eq!(state.sidebar_highlight, Some(a));
|
assert_eq!(state.sidebar_highlight, Some(SidebarItem::Session(a)));
|
||||||
|
|
||||||
state.move_sidebar_highlight(&order, 1);
|
state.move_sidebar_highlight(&order, 1);
|
||||||
assert_eq!(state.sidebar_highlight, Some(b));
|
assert_eq!(
|
||||||
|
state.sidebar_highlight,
|
||||||
|
Some(SidebarItem::Group("repo".into()))
|
||||||
|
);
|
||||||
state.move_sidebar_highlight(&order, 1);
|
state.move_sidebar_highlight(&order, 1);
|
||||||
assert_eq!(state.sidebar_highlight, Some(c));
|
assert_eq!(state.sidebar_highlight, Some(SidebarItem::Session(b)));
|
||||||
// Wraps forward.
|
// Wraps forward.
|
||||||
state.move_sidebar_highlight(&order, 1);
|
state.move_sidebar_highlight(&order, 1);
|
||||||
assert_eq!(state.sidebar_highlight, Some(a));
|
assert_eq!(state.sidebar_highlight, Some(SidebarItem::Session(c)));
|
||||||
// Wraps backward.
|
// Wraps backward.
|
||||||
state.move_sidebar_highlight(&order, -1);
|
state.move_sidebar_highlight(&order, -1);
|
||||||
assert_eq!(state.sidebar_highlight, Some(c));
|
assert_eq!(state.sidebar_highlight, Some(SidebarItem::Session(b)));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -343,6 +381,22 @@ mod tests {
|
|||||||
assert_eq!(state.sidebar_highlight, None);
|
assert_eq!(state.sidebar_highlight, None);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn collapsing_highlighted_group_moves_a_card_highlight_to_the_group() {
|
||||||
|
let key = PathBuf::from("/repo");
|
||||||
|
let mut state = AppState::new();
|
||||||
|
state.sidebar_highlight = Some(SidebarItem::Session(Uuid::from_u128(9)));
|
||||||
|
state.toggle_sidebar_group(key.clone(), true);
|
||||||
|
assert_eq!(
|
||||||
|
state.sidebar_highlight,
|
||||||
|
Some(SidebarItem::Group(key.clone()))
|
||||||
|
);
|
||||||
|
assert!(state.collapsed_sidebar_groups.contains(&key));
|
||||||
|
state.toggle_sidebar_group(key.clone(), false);
|
||||||
|
assert!(!state.collapsed_sidebar_groups.contains(&key));
|
||||||
|
assert_eq!(state.sidebar_highlight, Some(SidebarItem::Group(key)));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn attach_binds_focuses_pane_and_enters_insert_mode() {
|
fn attach_binds_focuses_pane_and_enters_insert_mode() {
|
||||||
let mut state = AppState::new();
|
let mut state = AppState::new();
|
||||||
|
|||||||
@@ -19,8 +19,7 @@ use tracing_subscriber::EnvFilter;
|
|||||||
#[command(
|
#[command(
|
||||||
name = "maestro",
|
name = "maestro",
|
||||||
version,
|
version,
|
||||||
about = "Unified CLI / daemon / TUI for the Maestro terminal-session orchestrator",
|
about = "Unified CLI / daemon / TUI for the Maestro terminal-session orchestrator"
|
||||||
arg_required_else_help = true
|
|
||||||
)]
|
)]
|
||||||
struct Cli {
|
struct Cli {
|
||||||
/// Override the daemon HTTP base clients talk to (e.g.
|
/// Override the daemon HTTP base clients talk to (e.g.
|
||||||
@@ -37,8 +36,11 @@ struct Cli {
|
|||||||
#[arg(short, long, global = true, action = clap::ArgAction::Count)]
|
#[arg(short, long, global = true, action = clap::ArgAction::Count)]
|
||||||
verbose: u8,
|
verbose: u8,
|
||||||
|
|
||||||
|
/// A missing subcommand defaults to the TUI (#119): a bare `maestro` opens
|
||||||
|
/// the terminal UI. Builds without the `tui` feature have no UI surface,
|
||||||
|
/// so they print help and exit 0 instead.
|
||||||
#[command(subcommand)]
|
#[command(subcommand)]
|
||||||
command: Command,
|
command: Option<Command>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Subcommand)]
|
#[derive(Debug, Subcommand)]
|
||||||
@@ -55,6 +57,9 @@ enum Command {
|
|||||||
/// Kill a session by ID.
|
/// Kill a session by ID.
|
||||||
#[cfg(feature = "cli")]
|
#[cfg(feature = "cli")]
|
||||||
Kill(maestro_cli::cli::KillArgs),
|
Kill(maestro_cli::cli::KillArgs),
|
||||||
|
/// Install or update the agent activity hook (#106).
|
||||||
|
#[cfg(feature = "cli")]
|
||||||
|
Hooks(maestro_cli::cli::HooksArgs),
|
||||||
/// Per-host daemon: tmux wrapper + session API.
|
/// Per-host daemon: tmux wrapper + session API.
|
||||||
#[cfg(feature = "daemon")]
|
#[cfg(feature = "daemon")]
|
||||||
Daemon {
|
Daemon {
|
||||||
@@ -86,7 +91,22 @@ fn main() -> ExitCode {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn dispatch(cli: Cli) -> Result<(), Box<dyn std::error::Error>> {
|
async fn dispatch(cli: Cli) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
match cli.command {
|
let command = match cli.command {
|
||||||
|
Some(command) => command,
|
||||||
|
None => {
|
||||||
|
#[cfg(feature = "tui")]
|
||||||
|
{
|
||||||
|
Command::Tui(maestro_tui::cli::TuiArgs { daemon_url: None })
|
||||||
|
}
|
||||||
|
#[cfg(not(feature = "tui"))]
|
||||||
|
{
|
||||||
|
use clap::CommandFactory;
|
||||||
|
let _ = <Cli as CommandFactory>::command().print_help();
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
match command {
|
||||||
#[cfg(feature = "cli")]
|
#[cfg(feature = "cli")]
|
||||||
Command::List(args) => {
|
Command::List(args) => {
|
||||||
maestro_cli::dispatch(
|
maestro_cli::dispatch(
|
||||||
@@ -123,6 +143,15 @@ async fn dispatch(cli: Cli) -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
)
|
)
|
||||||
.await?
|
.await?
|
||||||
}
|
}
|
||||||
|
#[cfg(feature = "cli")]
|
||||||
|
Command::Hooks(args) => {
|
||||||
|
maestro_cli::dispatch(
|
||||||
|
maestro_cli::cli::Command::Hooks(args),
|
||||||
|
cli.config,
|
||||||
|
cli.daemon_url,
|
||||||
|
)
|
||||||
|
.await?
|
||||||
|
}
|
||||||
#[cfg(feature = "daemon")]
|
#[cfg(feature = "daemon")]
|
||||||
Command::Daemon { cmd } => maestro_daemon::cli::dispatch(cli.config, cmd).await?,
|
Command::Daemon { cmd } => maestro_daemon::cli::dispatch(cli.config, cmd).await?,
|
||||||
#[cfg(feature = "tui")]
|
#[cfg(feature = "tui")]
|
||||||
@@ -154,15 +183,19 @@ fn init_tracing(cli: &Cli) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "cli")]
|
#[cfg(feature = "cli")]
|
||||||
fn is_cli_subcommand(command: &Command) -> bool {
|
fn is_cli_subcommand(command: &Option<Command>) -> bool {
|
||||||
matches!(
|
matches!(
|
||||||
command,
|
command,
|
||||||
Command::List(_) | Command::Spawn(_) | Command::Attach(_) | Command::Kill(_)
|
Some(Command::List(_))
|
||||||
|
| Some(Command::Spawn(_))
|
||||||
|
| Some(Command::Attach(_))
|
||||||
|
| Some(Command::Kill(_))
|
||||||
|
| Some(Command::Hooks(_))
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(feature = "cli"))]
|
#[cfg(not(feature = "cli"))]
|
||||||
fn is_cli_subcommand(_command: &Command) -> bool {
|
fn is_cli_subcommand(_command: &Option<Command>) -> bool {
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -200,12 +233,20 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Parse argv the way `main` does, returning just the dispatched subcommand.
|
/// Parse argv the way `main` does, returning just the dispatched subcommand.
|
||||||
fn command_of(argv: &[&str]) -> Command {
|
fn command_of(argv: &[&str]) -> Option<Command> {
|
||||||
Cli::try_parse_from(argv)
|
Cli::try_parse_from(argv)
|
||||||
.unwrap_or_else(|e| panic!("parse {argv:?}: {e}"))
|
.unwrap_or_else(|e| panic!("parse {argv:?}: {e}"))
|
||||||
.command
|
.command
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn bare_invocation_parses_to_no_subcommand() {
|
||||||
|
// The TUI-vs-help default is applied in `dispatch`; parsing must not
|
||||||
|
// reject an empty argv.
|
||||||
|
assert!(command_of(&["maestro"]).is_none());
|
||||||
|
assert!(command_of(&["maestro", "--verbose"]).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(feature = "cli")]
|
#[cfg(feature = "cli")]
|
||||||
#[test]
|
#[test]
|
||||||
fn cli_subcommands_are_classified_as_cli() {
|
fn cli_subcommands_are_classified_as_cli() {
|
||||||
|
|||||||
@@ -54,11 +54,35 @@ fn version_flag_succeeds() {
|
|||||||
assert!(text.contains("maestro"), "--version output: {text}");
|
assert!(text.contains("maestro"), "--version output: {text}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A bare `maestro` must never fall back to help on a build that has a TUI:
|
||||||
|
/// the missing subcommand defaults to `tui` (#119). Point at a port with
|
||||||
|
/// nothing listening so the TUI's health probe fails fast instead of blocking
|
||||||
|
/// on a terminal.
|
||||||
|
#[cfg(feature = "tui")]
|
||||||
#[test]
|
#[test]
|
||||||
fn no_args_prints_help_and_fails() {
|
fn bare_invocation_dispatches_to_the_tui() {
|
||||||
// `arg_required_else_help = true` => exit non-zero but show usage.
|
let (ok, text) = run(&["--daemon-url", "http://127.0.0.1:9"]);
|
||||||
|
assert!(
|
||||||
|
!ok,
|
||||||
|
"TUI against a dead daemon should exit non-zero:\n{text}"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
text.contains("daemon unreachable"),
|
||||||
|
"bare invocation should have run the TUI's daemon probe:\n{text}"
|
||||||
|
);
|
||||||
|
assert!(
|
||||||
|
!text.contains("Usage"),
|
||||||
|
"bare invocation must not print help when a TUI exists:\n{text}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Builds without the `tui` feature keep the historical behaviour: no args =>
|
||||||
|
/// help, exit 0 (#119).
|
||||||
|
#[cfg(not(feature = "tui"))]
|
||||||
|
#[test]
|
||||||
|
fn bare_invocation_prints_help_and_exits_zero() {
|
||||||
let (ok, text) = run(&[]);
|
let (ok, text) = run(&[]);
|
||||||
assert!(!ok, "bare invocation should fail:\n{text}");
|
assert!(ok, "bare invocation should exit 0:\n{text}");
|
||||||
assert!(text.contains("Usage"), "expected usage text:\n{text}");
|
assert!(text.contains("Usage"), "expected usage text:\n{text}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -119,6 +119,9 @@ The wizard always installs the default-feature build.
|
|||||||
|
|
||||||
`maestro tui` is the keyboard-and-mouse driven terminal UI client. It ships
|
`maestro tui` is the keyboard-and-mouse driven terminal UI client. It ships
|
||||||
in the default feature set, so a vanilla `cargo install maestro` builds it.
|
in the default feature set, so a vanilla `cargo install maestro` builds it.
|
||||||
|
A bare `maestro` opens the TUI too — the missing subcommand defaults to `tui`
|
||||||
|
(#119), so `maestro --daemon-url http://host:7070` works as well. Builds
|
||||||
|
without the `tui` feature have no UI to open and print help instead (exit 0).
|
||||||
Drop the `tui` feature to skip it on hosts that don't need the UI surface
|
Drop the `tui` feature to skip it on hosts that don't need the UI surface
|
||||||
(`--no-default-features --features cli,daemon`).
|
(`--no-default-features --features cli,daemon`).
|
||||||
|
|
||||||
@@ -131,6 +134,7 @@ cover every v1 action — only override what you want to change:
|
|||||||
|
|
||||||
```toml
|
```toml
|
||||||
[tui]
|
[tui]
|
||||||
|
theme = "dark" # dark (default), light, or ansi
|
||||||
leader = "ctrl-a" # one byte that escapes Insert mode
|
leader = "ctrl-a" # one byte that escapes Insert mode
|
||||||
chord_timeout_ms = 1000 # how long to hold a partial chord like `g`
|
chord_timeout_ms = 1000 # how long to hold a partial chord like `g`
|
||||||
|
|
||||||
@@ -149,6 +153,11 @@ chord_timeout_ms = 1000 # how long to hold a partial chord like `g`
|
|||||||
# want extra Insert-mode bindings)
|
# want extra Insert-mode bindings)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
`theme` selects the complete TUI palette. `dark` is the default and follows
|
||||||
|
Maestro's terminal-native dark product palette; `light` is its light peer;
|
||||||
|
`ansi` uses the terminal's named ANSI colours for terminals without truecolour.
|
||||||
|
An unknown name is rejected as an `[tui].theme` configuration error.
|
||||||
|
|
||||||
The full action vocabulary is the `Action` enum in
|
The full action vocabulary is the `Action` enum in
|
||||||
`crates/maestro-tui/src/action.rs`.
|
`crates/maestro-tui/src/action.rs`.
|
||||||
|
|
||||||
|
|||||||
+78
-39
@@ -5,8 +5,7 @@ sidebar (#107) and the TUI sidebar (#108) describe a session the same way.
|
|||||||
Read this before changing either. Both clients implement exactly what is
|
Read this before changing either. Both clients implement exactly what is
|
||||||
written here; if it needs to change, change it here first.
|
written here; if it needs to change, change it here first.
|
||||||
|
|
||||||
A card has **line 1** always and **line 2** only when line 2 has something to
|
A card is always two lines: **line 1** and **line 2**.
|
||||||
say.
|
|
||||||
|
|
||||||
## Line 1 — name + actions
|
## Line 1 — name + actions
|
||||||
|
|
||||||
@@ -25,56 +24,75 @@ badge move off this row into line 2.
|
|||||||
|
|
||||||
## Line 2 — meta line (adaptive)
|
## Line 2 — meta line (adaptive)
|
||||||
|
|
||||||
Rendered only when at least one of these holds:
|
Line 2 always renders — never an empty placeholder row either, since its
|
||||||
|
unconditional fragments (see below) always have something to show. Its
|
||||||
|
*fragments* are adaptive: some show only when their trigger holds. The line
|
||||||
|
itself is not.
|
||||||
|
|
||||||
1. The session has been held in its current activity state longer than
|
Line 2 reads left to right:
|
||||||
**30 seconds** (`activity_since` from #102). A freshly-active session
|
|
||||||
stays one line.
|
|
||||||
2. Its worktree holds blocked work: `blocked_work` is `Some` and not clear
|
|
||||||
(`InTheWay::is_clear()`), rendered in `formatInTheWay`'s phrasing on web
|
|
||||||
and as `⚠ <summary>` on the TUI.
|
|
||||||
3. It has exited: `status == Dead`.
|
|
||||||
4. An agent-reported state (#105) of `Error` is in force (see Precedence).
|
|
||||||
|
|
||||||
Otherwise line 2 is absent — never an empty placeholder row.
|
|
||||||
|
|
||||||
When present, line 2 reads left to right:
|
|
||||||
|
|
||||||
```
|
```
|
||||||
<dot> <duration> [<blocked work> | exited] [<command>]
|
<dot> [<duration>] [<detail>] [<blocked work> | exited] <command>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Its minimum content is therefore the dot and the command.
|
||||||
|
|
||||||
`<dot>` is a single filled glyph (`●` on both clients) carrying the activity
|
`<dot>` is a single filled glyph (`●` on both clients) carrying the activity
|
||||||
state's colour, and `<duration>` follows in the same colour. There is no state
|
state's colour, and `<duration>` follows in the same colour when shown. There
|
||||||
word and no second badge: the dot exists so the state is still legible when a
|
is no state word and no second badge: the dot exists so the state is still
|
||||||
row is dimmed or the terminal renders the duration in the default fg. The dot
|
legible when a row is dimmed or the terminal renders the duration in the
|
||||||
and duration are unconditional parts of line 2; the bracketed fragments appear
|
default fg. The dot is an unconditional part of line 2; the bracketed
|
||||||
only when their trigger holds. A payload that predates #102 (no usable
|
fragments appear only when their trigger holds.
|
||||||
`activity_since`) contributes no duration — the dot still renders.
|
|
||||||
|
|
||||||
`<command>` is optional and muted: the session's command line, shown only when
|
`<duration>` renders only once the session has been held in its current
|
||||||
the rendered name came from `metadata.name` and differs from the command (the
|
activity state longer than **30 seconds** (`activity_since` from #102) — under
|
||||||
web has always surfaced this; the TUI may omit it).
|
that threshold the duration is absent and the dot renders alone. A payload
|
||||||
|
that predates #102 (no usable `activity_since`) likewise contributes no
|
||||||
|
duration — the dot still renders. This rule now governs only the duration
|
||||||
|
fragment; it no longer decides whether line 2 exists.
|
||||||
|
|
||||||
|
`<detail>` is an agent-reported string (#105) — e.g. why a session is in
|
||||||
|
`Error`. It sits right after the duration, in the muted style, and shows only
|
||||||
|
while an agent-reported state is in force (see Precedence): when the report
|
||||||
|
lapses at its TTL or is replaced, the detail goes with it. The detail
|
||||||
|
truncates with `…` ahead of the trailing fragments — a long detail never
|
||||||
|
pushes `<blocked work>`, `exited`, or `<command>` off the line, and neither
|
||||||
|
client ever lets it wrap.
|
||||||
|
|
||||||
|
`<command>` is unconditional and muted: the session's command line, shown on
|
||||||
|
every card in both clients — no omission in the TUI, no name-vs-command
|
||||||
|
comparison gating it. A session named by its command line then shows the same
|
||||||
|
string on both lines; that is accepted, the price of a row that never changes
|
||||||
|
height.
|
||||||
|
|
||||||
## Colour per activity state
|
## Colour per activity state
|
||||||
|
|
||||||
The state word is never spelled out — the colour carries it.
|
The state word is never spelled out — the colour carries it.
|
||||||
|
|
||||||
| Activity state | Web token | ratatui colour |
|
| Activity state | Web token | TUI palette role |
|
||||||
| ---------------- | --------- | ----------------- |
|
| ---------------- | --------- | ---------------- |
|
||||||
| `Active` | `--live` | `Color::Green` |
|
| `Active` | `--live` | `active` |
|
||||||
| `Idle` | `--muted` | `Color::DarkGray` |
|
| `Idle` | `--muted` | `idle` |
|
||||||
| `AwaitingInput` | `--warn` | `Color::Yellow` |
|
| `AwaitingInput` | `--warn` | `awaiting` |
|
||||||
| `Error` | `--danger`| `Color::Red` |
|
| `Error` | `--danger`| `error` |
|
||||||
|
|
||||||
Web tokens resolve per theme automatically (`styles.css` defines dark, light,
|
Web tokens resolve per theme automatically (`styles.css` defines dark, light,
|
||||||
and `prefers-color-scheme` variants for each). The TUI uses the plain ratatui
|
and `prefers-color-scheme` variants for each). The TUI names roles, not
|
||||||
named colours above; do not introduce RGB values or a new palette module for
|
colours: a role's value comes from the active palette
|
||||||
this.
|
(`maestro-tui/src/palette.rs`), never from a colour spelled out at the use
|
||||||
|
site.
|
||||||
|
|
||||||
|
A palette holds one role set per **surface** — the card surface every card
|
||||||
|
sits on, and the selection surface the highlighted card swaps in — so each
|
||||||
|
state role resolves to the value picked for the surface it is painted on. The
|
||||||
|
highlighted card therefore takes its state colours from the selection
|
||||||
|
surface; a colour chosen for the card background is never painted onto the
|
||||||
|
selection background. Contrast is a property of the palette (values are RGB)
|
||||||
|
and is asserted in the palette's tests, not left to the terminal theme.
|
||||||
|
|
||||||
The duration text inherits its state's colour; the blocked-work, exited and
|
The duration text inherits its state's colour; the blocked-work, exited and
|
||||||
command fragments use the muted colour (`--faint` / default style), since the
|
command fragments use the surface's `muted` role, since the ⚠ glyph already
|
||||||
⚠ glyph already signals severity.
|
signals severity.
|
||||||
|
|
||||||
## Duration format
|
## Duration format
|
||||||
|
|
||||||
@@ -94,11 +112,32 @@ cutover points land within one tick.
|
|||||||
## Precedence
|
## Precedence
|
||||||
|
|
||||||
An agent-reported `ActivityState` (#105) overrides the daemon's inference for
|
An agent-reported `ActivityState` (#105) overrides the daemon's inference for
|
||||||
the TTL the report carries; when the TTL expires, inference resumes. Clients
|
**five minutes** (the TTL is fixed by the daemon; re-reporting extends it).
|
||||||
never blend the two: whichever source is in force supplies both the colour and
|
When the TTL expires, inference resumes and the session's reported detail —
|
||||||
the clock for `activity_since`.
|
if any — clears with the report. Clients never blend the two: whichever source
|
||||||
|
is in force supplies both the colour and the clock for `activity_since`.
|
||||||
|
|
||||||
|
Two rulings specific to a reported `Error` (#114):
|
||||||
|
|
||||||
|
- **The five-minute TTL applies to `Error` like to any other state.** A
|
||||||
|
session that failed is still failed after five minutes, but a card pinned
|
||||||
|
red forever lies once the session moves on; when the report lapses the card
|
||||||
|
returns to the daemon's own inference — usually `Idle` for a session that
|
||||||
|
has gone quiet.
|
||||||
|
- **Only a new report clears an `Error` before its TTL.** The next
|
||||||
|
`ActivityState` of any kind replaces it (with #106's hook that is typically
|
||||||
|
`PreToolUse` → `Active` when the user prompts again). PTY output and
|
||||||
|
process changes do not clear it — only the agent itself may withdraw what
|
||||||
|
the agent itself reported. Re-reporting `Error` extends the TTL rather than
|
||||||
|
stacking reports.
|
||||||
|
|
||||||
If a client receives an `ActivityState` variant it does not know, it must not
|
If a client receives an `ActivityState` variant it does not know, it must not
|
||||||
fail rendering: treat it as `Idle` (neutral/dim, line-2 rules apply as usual)
|
fail rendering: treat it as `Idle` (neutral/dim, line-2 rules apply as usual)
|
||||||
until the daemon sends a variant it does know. Rust clients deserialize
|
until the daemon sends a variant it does know. Rust clients deserialize
|
||||||
activity leniently for the same reason.
|
activity leniently for the same reason.
|
||||||
|
|
||||||
|
Leniency runs one way only. It covers a client *reading* a newer daemon, where
|
||||||
|
dropping the whole session would be worse than dimming one card. A report
|
||||||
|
arriving at `POST /api/sessions/:id/activity` is parsed strictly and an unknown
|
||||||
|
state is a 4xx: an agent posting a state the daemon does not know is a bug in
|
||||||
|
the agent, and answering 204 would hide it.
|
||||||
|
|||||||
@@ -4,9 +4,7 @@ import {
|
|||||||
activityColorSlug,
|
activityColorSlug,
|
||||||
activityDurationLabel,
|
activityDurationLabel,
|
||||||
activityHeldMs,
|
activityHeldMs,
|
||||||
showsMetaLine,
|
|
||||||
} from "./activity.js";
|
} from "./activity.js";
|
||||||
import type { Session } from "./types.js";
|
|
||||||
|
|
||||||
describe("activityHeldMs", () => {
|
describe("activityHeldMs", () => {
|
||||||
it("measures time spent in the current state", () => {
|
it("measures time spent in the current state", () => {
|
||||||
@@ -60,42 +58,3 @@ describe("activityColorSlug", () => {
|
|||||||
expect(activityColorSlug("Teleported")).toBe("idle");
|
expect(activityColorSlug("Teleported")).toBe("idle");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
function session(overrides: Partial<Session>): Session {
|
|
||||||
return {
|
|
||||||
id: "11111111-2222-3333-4444-555555555555",
|
|
||||||
cwd: "/home/naps/tea/maestro",
|
|
||||||
command: "claude",
|
|
||||||
env: {},
|
|
||||||
metadata: {},
|
|
||||||
status: "Running",
|
|
||||||
created_at: "2026-08-24T10:00:00Z",
|
|
||||||
activity: "Active",
|
|
||||||
...overrides,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("showsMetaLine", () => {
|
|
||||||
const fresh = new Date(Date.now() - 10_000).toISOString();
|
|
||||||
|
|
||||||
it("stays hidden for a freshly-active session", () => {
|
|
||||||
expect(showsMetaLine(session({ activity_since: fresh }))).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("appears once the state has been held past 30 seconds", () => {
|
|
||||||
const held = new Date(Date.now() - 31_000).toISOString();
|
|
||||||
expect(showsMetaLine(session({ activity_since: held }))).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("appears for blocked work, exited sessions and reported errors", () => {
|
|
||||||
expect(
|
|
||||||
showsMetaLine(session({ activity_since: fresh, blocked_work: { uncommitted_files: 1 } })),
|
|
||||||
).toBe(true);
|
|
||||||
expect(showsMetaLine(session({ activity_since: fresh, status: "Dead" }))).toBe(true);
|
|
||||||
expect(showsMetaLine(session({ activity_since: fresh, activity: "Error" }))).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("needs no activity timestamp when another trigger holds", () => {
|
|
||||||
expect(showsMetaLine(session({ activity_since: undefined, status: "Dead" }))).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
+3
-15
@@ -2,11 +2,10 @@
|
|||||||
// the shared duration format. Both clients compute it identically; the TUI
|
// the shared duration format. Both clients compute it identically; the TUI
|
||||||
// mirrors this in crates/maestro-tui.
|
// mirrors this in crates/maestro-tui.
|
||||||
|
|
||||||
import type { ActivityState, IsoTimestamp, Session } from "./types.js";
|
import type { ActivityState, IsoTimestamp } from "./types.js";
|
||||||
import { sessionBlockers } from "./types.js";
|
|
||||||
|
|
||||||
/** A state held shorter than this keeps the card to one line (contract rule 1). */
|
/** A state held shorter than this has no duration fragment. */
|
||||||
const META_LINE_MIN_HOLD_MS = 30_000;
|
export const META_LINE_MIN_HOLD_MS = 30_000;
|
||||||
|
|
||||||
// Payloads predating #102 default `activity_since` to the Unix epoch; anything
|
// Payloads predating #102 default `activity_since` to the Unix epoch; anything
|
||||||
// implausibly old is treated as "never observed" rather than a huge duration.
|
// implausibly old is treated as "never observed" rather than a huge duration.
|
||||||
@@ -43,14 +42,3 @@ export function activityColorSlug(state: ActivityState | string): string {
|
|||||||
return "idle";
|
return "idle";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Line 2 renders only when at least one contract trigger holds. */
|
|
||||||
export function showsMetaLine(s: Session, now: number = Date.now()): boolean {
|
|
||||||
const held = activityHeldMs(s.activity_since, now);
|
|
||||||
return (
|
|
||||||
(held !== null && held >= META_LINE_MIN_HOLD_MS) ||
|
|
||||||
sessionBlockers(s) !== null ||
|
|
||||||
s.status === "Dead" ||
|
|
||||||
s.activity === "Error"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|||||||
+48
-2
@@ -105,6 +105,38 @@ describe("blocked-work indicator (#83)", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("agent-reported detail (#112)", () => {
|
||||||
|
const ago = (ms: number): string => new Date(Date.now() - ms).toISOString();
|
||||||
|
|
||||||
|
it("renders the reported detail right after the duration on line 2", () => {
|
||||||
|
const s = session({
|
||||||
|
id: "aaaaaaaa-0000-0000-0000-000000000020",
|
||||||
|
status: "Dead",
|
||||||
|
activity: "Error",
|
||||||
|
activity_since: ago(90_000),
|
||||||
|
activity_detail: "cargo build failed",
|
||||||
|
});
|
||||||
|
const el = renderSidebar(storeWith([s])).el;
|
||||||
|
const line2 = rowFor(el, s.id)?.querySelector<HTMLElement>(".card-line2");
|
||||||
|
expect(line2?.querySelector(".activity-detail")?.textContent).toBe("cargo build failed");
|
||||||
|
const order = [...line2!.children].map((c) => c.className);
|
||||||
|
expect(order.indexOf("activity-detail")).toBeGreaterThan(order.indexOf("activity-duration"));
|
||||||
|
expect(order.indexOf("activity-detail")).toBeLessThan(
|
||||||
|
order.findIndex((c) => c.startsWith("card-flag")),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("omits the detail when no report is in force", () => {
|
||||||
|
const s = session({
|
||||||
|
id: "aaaaaaaa-0000-0000-0000-000000000021",
|
||||||
|
activity: "Active",
|
||||||
|
activity_since: ago(90_000),
|
||||||
|
});
|
||||||
|
const el = renderSidebar(storeWith([s])).el;
|
||||||
|
expect(rowFor(el, s.id)?.querySelector(".activity-detail")).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe("session cards (#107)", () => {
|
describe("session cards (#107)", () => {
|
||||||
const ago = (ms: number): string => new Date(Date.now() - ms).toISOString();
|
const ago = (ms: number): string => new Date(Date.now() - ms).toISOString();
|
||||||
|
|
||||||
@@ -118,14 +150,18 @@ describe("session cards (#107)", () => {
|
|||||||
expect(line1?.querySelector(".leaf-actions")).toBe(line1?.lastElementChild);
|
expect(line1?.querySelector(".leaf-actions")).toBe(line1?.lastElementChild);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("stays a single line while freshly active", () => {
|
it("always renders line 2 for a freshly spawned session", () => {
|
||||||
const s = session({
|
const s = session({
|
||||||
id: "aaaaaaaa-0000-0000-0000-000000000011",
|
id: "aaaaaaaa-0000-0000-0000-000000000011",
|
||||||
activity: "Active",
|
activity: "Active",
|
||||||
activity_since: ago(5_000),
|
activity_since: ago(5_000),
|
||||||
});
|
});
|
||||||
const el = renderSidebar(storeWith([s])).el;
|
const el = renderSidebar(storeWith([s])).el;
|
||||||
expect(rowFor(el, s.id)?.querySelector(".card-line2")).toBeNull();
|
const line2 = rowFor(el, s.id)?.querySelector<HTMLElement>(".card-line2");
|
||||||
|
expect(line2).not.toBeNull();
|
||||||
|
expect(line2?.querySelector(".activity-dot")).not.toBeNull();
|
||||||
|
expect(line2?.querySelector(".activity-duration")).toBeNull();
|
||||||
|
expect(line2?.querySelector(".leaf-cmd")?.textContent).toBe("claude");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("shows dot + floored duration once the state has been held past 30s", () => {
|
it("shows dot + floored duration once the state has been held past 30s", () => {
|
||||||
@@ -141,6 +177,16 @@ describe("session cards (#107)", () => {
|
|||||||
expect(line2?.querySelector(".activity-duration")?.textContent).toBe("4m");
|
expect(line2?.querySelector(".activity-duration")?.textContent).toBe("4m");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("renders the command when the session name equals it", () => {
|
||||||
|
const s = session({
|
||||||
|
id: "aaaaaaaa-0000-0000-0000-00000000001b",
|
||||||
|
command: "claude",
|
||||||
|
metadata: { name: "claude" },
|
||||||
|
});
|
||||||
|
const el = renderSidebar(storeWith([s])).el;
|
||||||
|
expect(rowFor(el, s.id)?.querySelector(".card-line2 .leaf-cmd")?.textContent).toBe("claude");
|
||||||
|
});
|
||||||
|
|
||||||
it("maps each activity state to its contract slug", () => {
|
it("maps each activity state to its contract slug", () => {
|
||||||
const mk = (id: string, activity: string) =>
|
const mk = (id: string, activity: string) =>
|
||||||
session({
|
session({
|
||||||
|
|||||||
+14
-14
@@ -4,7 +4,12 @@ import { HUD_TOGGLE_EVENT, isHudEnabled, toggleHud } from "./debug.js";
|
|||||||
import { CatalogStore } from "./events.js";
|
import { CatalogStore } from "./events.js";
|
||||||
import type { Session } from "./types.js";
|
import type { Session } from "./types.js";
|
||||||
import { abbreviateFolderName, formatInTheWay, sessionBlockers, sessionName } from "./types.js";
|
import { abbreviateFolderName, formatInTheWay, sessionBlockers, sessionName } from "./types.js";
|
||||||
import { activityColorSlug, activityDurationLabel, activityHeldMs, showsMetaLine } from "./activity.js";
|
import {
|
||||||
|
activityColorSlug,
|
||||||
|
activityDurationLabel,
|
||||||
|
activityHeldMs,
|
||||||
|
META_LINE_MIN_HOLD_MS,
|
||||||
|
} from "./activity.js";
|
||||||
import type { TreeNode } from "./tree.js";
|
import type { TreeNode } from "./tree.js";
|
||||||
import { buildTree } from "./tree.js";
|
import { buildTree } from "./tree.js";
|
||||||
import { createThemeToggle } from "./theme.js";
|
import { createThemeToggle } from "./theme.js";
|
||||||
@@ -28,27 +33,25 @@ const STATE_WORDS: Record<string, string> = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
function metaLine(s: Session, now: number): string {
|
function metaLine(s: Session, now: number): string {
|
||||||
const name = sessionName(s);
|
|
||||||
const dead = s.status === "Dead";
|
const dead = s.status === "Dead";
|
||||||
const blockers = sessionBlockers(s);
|
const blockers = sessionBlockers(s);
|
||||||
const slug = activityColorSlug(s.activity ?? "Idle");
|
const slug = activityColorSlug(s.activity ?? "Idle");
|
||||||
const stateWord = STATE_WORDS[slug] ?? STATE_WORDS.idle;
|
const stateWord = STATE_WORDS[slug] ?? STATE_WORDS.idle;
|
||||||
const held = activityHeldMs(s.activity_since, now);
|
const held = activityHeldMs(s.activity_since, now);
|
||||||
const duration = held !== null ? activityDurationLabel(held) : null;
|
const duration =
|
||||||
// The directory is the enclosing folder, so only surface the command — and
|
held !== null && held >= META_LINE_MIN_HOLD_MS ? activityDurationLabel(held) : null;
|
||||||
// only when it isn't already what the name shows.
|
|
||||||
const showCmd = s.command !== name;
|
|
||||||
|
|
||||||
const fragments = [
|
const fragments = [
|
||||||
`<span class="activity-dot" role="img" title="${escapeHtml(stateWord)}" aria-label="${escapeHtml(stateWord)}"></span>`,
|
`<span class="activity-dot" role="img" title="${escapeHtml(stateWord)}" aria-label="${escapeHtml(stateWord)}"></span>`,
|
||||||
duration ? `<span class="activity-duration">${duration}</span>` : "",
|
duration ? `<span class="activity-duration">${duration}</span>` : "",
|
||||||
|
s.activity_detail
|
||||||
|
? `<span class="activity-detail">${escapeHtml(s.activity_detail)}</span>`
|
||||||
|
: "",
|
||||||
blockers
|
blockers
|
||||||
? `<span class="card-flag leaf-blocked" title="Kill will be refused unless forced">⚠ ${escapeHtml(formatInTheWay(blockers))}</span>`
|
? `<span class="card-flag leaf-blocked" title="Kill will be refused unless forced">⚠ ${escapeHtml(formatInTheWay(blockers))}</span>`
|
||||||
: "",
|
: "",
|
||||||
dead ? `<span class="card-flag">exited</span>` : "",
|
dead ? `<span class="card-flag">exited</span>` : "",
|
||||||
showCmd
|
`<span class="card-flag leaf-cmd" title="${escapeHtml(s.command)}">${escapeHtml(s.command)}</span>`,
|
||||||
? `<span class="card-flag leaf-cmd" title="${escapeHtml(s.command)}">${escapeHtml(s.command)}</span>`
|
|
||||||
: "",
|
|
||||||
];
|
];
|
||||||
return `<span class="card-line2" data-activity="${slug}">${fragments.join("")}</span>`;
|
return `<span class="card-line2" data-activity="${slug}">${fragments.join("")}</span>`;
|
||||||
}
|
}
|
||||||
@@ -103,10 +106,7 @@ function renderNode(node: TreeNode, depth: number): HTMLElement {
|
|||||||
"aria-label",
|
"aria-label",
|
||||||
`${name}, ${running ? "running" : "exited"}, ${stateWord}`,
|
`${name}, ${running ? "running" : "exited"}, ${stateWord}`,
|
||||||
);
|
);
|
||||||
// docs/SIDEBAR.md line 1: name + top-right actions in the same flow line —
|
// docs/SIDEBAR.md: line 1 reserves action width, and line 2 is unconditional.
|
||||||
// the actions reserve their width, so the name truncates before it can ever
|
|
||||||
// reach them. Line 2 renders only when a contract trigger holds.
|
|
||||||
const showMeta = showsMetaLine(s, now);
|
|
||||||
row.innerHTML = `
|
row.innerHTML = `
|
||||||
<span class="card-line1">
|
<span class="card-line1">
|
||||||
<span class="leaf-name">${escapeHtml(name)}</span>
|
<span class="leaf-name">${escapeHtml(name)}</span>
|
||||||
@@ -115,7 +115,7 @@ function renderNode(node: TreeNode, depth: number): HTMLElement {
|
|||||||
<button class="leaf-act leaf-kill" type="button" title="Kill session" aria-label="Kill ${escapeHtml(name)}">✕</button>
|
<button class="leaf-act leaf-kill" type="button" title="Kill session" aria-label="Kill ${escapeHtml(name)}">✕</button>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
${showMeta ? metaLine(s, now) : ""}
|
${metaLine(s, now)}
|
||||||
`;
|
`;
|
||||||
const similarBtn = row.querySelector(".leaf-clone") as HTMLButtonElement;
|
const similarBtn = row.querySelector(".leaf-clone") as HTMLButtonElement;
|
||||||
similarBtn.addEventListener("click", (ev) => {
|
similarBtn.addEventListener("click", (ev) => {
|
||||||
|
|||||||
+25
-6
@@ -736,7 +736,6 @@ textarea {
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: var(--sp-2);
|
gap: var(--sp-2);
|
||||||
min-height: 30px;
|
|
||||||
margin: 1px var(--sp-2);
|
margin: 1px var(--sp-2);
|
||||||
padding: 4px var(--sp-3);
|
padding: 4px var(--sp-3);
|
||||||
border-radius: var(--r-1);
|
border-radius: var(--r-1);
|
||||||
@@ -787,12 +786,13 @@ textarea {
|
|||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* #107: session cards per docs/SIDEBAR.md — line 1 (name + top-right actions)
|
/* #120: every session card has two lines, so its row height is stable. */
|
||||||
always, line 2 (meta) only when it has something to say. */
|
|
||||||
.tree-leaf.session-card {
|
.tree-leaf.session-card {
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: stretch;
|
align-items: stretch;
|
||||||
gap: 1px;
|
gap: 1px;
|
||||||
|
/* 24px action row + 16px meta row + 1px gap + 8px vertical padding. */
|
||||||
|
height: 49px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.card-line1 {
|
.card-line1 {
|
||||||
@@ -851,16 +851,35 @@ textarea {
|
|||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Blocked-work / exited / command fragments recede: the ⚠ glyph already
|
/* Agent-reported detail (#112): sits after the duration, shrinks with an
|
||||||
signals severity and "exited" dims with the row. */
|
ellipsis so it never pushes the trailing fragments off the line. */
|
||||||
.card-flag {
|
.activity-detail {
|
||||||
color: var(--faint);
|
color: var(--faint);
|
||||||
|
/* Consume only the space left after the trailing status + command. */
|
||||||
|
flex: 1 1 0;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Blocked-work / exited / command fragments recede: the ⚠ glyph already
|
||||||
|
signals severity and "exited" dims with the row. */
|
||||||
|
.card-flag {
|
||||||
|
color: var(--faint);
|
||||||
|
flex: 0 0 auto;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Status fragments stay intact. The unconditional command is the final
|
||||||
|
truncation target when even the complete trailing set cannot fit. */
|
||||||
|
.leaf-cmd {
|
||||||
|
flex: 0 1 auto;
|
||||||
|
}
|
||||||
|
|
||||||
/* Actions live in line 1's flow at its right edge — never overlaid on the
|
/* Actions live in line 1's flow at its right edge — never overlaid on the
|
||||||
name (#107). They reserve their width even while hover-faded. */
|
name (#107). They reserve their width even while hover-faded. */
|
||||||
.leaf-actions {
|
.leaf-actions {
|
||||||
|
|||||||
@@ -26,6 +26,10 @@ export interface Session {
|
|||||||
foreground?: string | null;
|
foreground?: string | null;
|
||||||
/** Inferred activity. Defaults to `Idle` on the wire when omitted. */
|
/** Inferred activity. Defaults to `Idle` on the wire when omitted. */
|
||||||
activity?: ActivityState;
|
activity?: ActivityState;
|
||||||
|
/** Short human string an agent reported alongside its state (#105) — e.g.
|
||||||
|
* why it is in `Error`. Shown on a sidebar card's meta line while the
|
||||||
|
* report is in force; cleared when the report lapses or is replaced. */
|
||||||
|
activity_detail?: string | null;
|
||||||
/** Wall-clock of the most recent observed PTY output (NAP-340). */
|
/** Wall-clock of the most recent observed PTY output (NAP-340). */
|
||||||
last_activity_at?: IsoTimestamp;
|
last_activity_at?: IsoTimestamp;
|
||||||
/** Wall-clock of when the session entered its current `activity` state
|
/** Wall-clock of when the session entered its current `activity` state
|
||||||
|
|||||||
Reference in New Issue
Block a user