Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b3c73fd2cb | ||
|
|
7d06bec21e | ||
|
|
ad2e700391 | ||
|
|
2dcef860a6 | ||
|
|
0bb5df7245 | ||
|
|
cb070e4f84 | ||
|
|
8fde211348 |
+13
-3
@@ -106,14 +106,24 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
# The runner container is root with no `nixbld` group, but the installer
|
||||||
|
# writes `build-users-group = nixbld` anyway and then fails on it, so the
|
||||||
|
# config goes in first. Flakes are off by default and `nix build .#…`
|
||||||
|
# needs them. Written again afterwards in case the installer replaced it.
|
||||||
- name: Install nix
|
- name: Install nix
|
||||||
run: |
|
run: |
|
||||||
curl -fsSL https://nixos.org/nix/install | sh -s -- --daemon --yes
|
mkdir -p /etc/nix
|
||||||
echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
|
printf 'build-users-group =\nexperimental-features = nix-command flakes\n' > /etc/nix/nix.conf
|
||||||
|
curl -fsSL https://nixos.org/nix/install | sh -s -- --no-daemon --yes
|
||||||
|
printf 'build-users-group =\nexperimental-features = nix-command flakes\n' > /etc/nix/nix.conf
|
||||||
|
echo "$HOME/.nix-profile/bin" >> "$GITHUB_PATH"
|
||||||
|
|
||||||
|
# The installer does not enable flakes, so `nix build .#…` needs the
|
||||||
|
# features passed explicitly — a local machine that has them in
|
||||||
|
# nix.conf will build fine while CI fails without this.
|
||||||
- name: build flake packages
|
- name: build flake packages
|
||||||
run: |
|
run: |
|
||||||
nix build \
|
nix --extra-experimental-features "nix-command flakes" build \
|
||||||
.#webFrontend \
|
.#webFrontend \
|
||||||
.#maestro \
|
.#maestro \
|
||||||
.#maestro-web \
|
.#maestro-web \
|
||||||
|
|||||||
@@ -73,6 +73,9 @@ async fn run(config_override: Option<PathBuf>) -> Result<(), Box<dyn Error>> {
|
|||||||
// One store instance shared with the API handlers: forced kills (#81)
|
// One store instance shared with the API handlers: forced kills (#81)
|
||||||
// record here, `GET /api/worktrees` (#80) reads back from here.
|
// record here, `GET /api/worktrees` (#80) reads back from here.
|
||||||
.with_retained_store((*retained).clone());
|
.with_retained_store((*retained).clone());
|
||||||
|
// Spawned sessions learn where to report back (#103). Derived from the
|
||||||
|
// configured bind address; set before any spawn can happen.
|
||||||
|
manager.set_daemon_url(format!("http://{}", config.bind_addr));
|
||||||
|
|
||||||
let recovered = manager.recover().await?;
|
let recovered = manager.recover().await?;
|
||||||
tracing::info!(recovered, "adopted existing tmux sessions");
|
tracing::info!(recovered, "adopted existing tmux sessions");
|
||||||
|
|||||||
@@ -131,6 +131,11 @@ struct Inner {
|
|||||||
/// Retained-worktree store (#78). `None` when not wired (tests); a forced
|
/// Retained-worktree store (#78). `None` when not wired (tests); a forced
|
||||||
/// kill (#81) without one fails rather than destroying unrecorded work.
|
/// kill (#81) without one fails rather than destroying unrecorded work.
|
||||||
retained: Option<crate::retained_store::RetainedStore>,
|
retained: Option<crate::retained_store::RetainedStore>,
|
||||||
|
/// The daemon's own HTTP base URL (#103), exported to spawned sessions as
|
||||||
|
/// `MAESTRO_URL`. `None` when unknown — those sessions simply don't get
|
||||||
|
/// the variable. A mutex because the runner sets it after construction,
|
||||||
|
/// possibly while clones are already serving.
|
||||||
|
daemon_url: std::sync::Mutex<Option<String>>,
|
||||||
sessions: Mutex<HashMap<Uuid, SessionRecord>>,
|
sessions: Mutex<HashMap<Uuid, SessionRecord>>,
|
||||||
events: broadcast::Sender<CatalogEvent>,
|
events: broadcast::Sender<CatalogEvent>,
|
||||||
}
|
}
|
||||||
@@ -170,6 +175,7 @@ impl SessionManager {
|
|||||||
replay_bytes,
|
replay_bytes,
|
||||||
spawn_history: None,
|
spawn_history: None,
|
||||||
retained: None,
|
retained: None,
|
||||||
|
daemon_url: std::sync::Mutex::new(None),
|
||||||
sessions: Mutex::new(HashMap::new()),
|
sessions: Mutex::new(HashMap::new()),
|
||||||
events,
|
events,
|
||||||
}),
|
}),
|
||||||
@@ -202,6 +208,14 @@ impl SessionManager {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Set the daemon's own HTTP base URL (#103), exported to every session
|
||||||
|
/// spawned afterwards as `MAESTRO_URL`. Unlike the `with_*` builders this
|
||||||
|
/// is a plain setter: the daemon runner learns its bound address after
|
||||||
|
/// construction, and clones may already exist by then.
|
||||||
|
pub fn set_daemon_url(&self, url: String) {
|
||||||
|
*self.inner.daemon_url.lock().expect("daemon_url mutex") = Some(url);
|
||||||
|
}
|
||||||
|
|
||||||
/// Recent working dirs for the spawn form's picker (#24), newest-first and
|
/// Recent working dirs for the spawn form's picker (#24), newest-first and
|
||||||
/// deduped by dir. Empty when no history is wired or it's disabled.
|
/// deduped by dir. Empty when no history is wired or it's disabled.
|
||||||
pub fn recent_dirs(&self) -> Vec<RecentDir> {
|
pub fn recent_dirs(&self) -> Vec<RecentDir> {
|
||||||
@@ -278,7 +292,11 @@ impl SessionManager {
|
|||||||
self.inner.worktree_mgr.add_existing(base_repo, branch)
|
self.inner.worktree_mgr.add_existing(base_repo, branch)
|
||||||
}
|
}
|
||||||
.map_err(SessionError::Worktree)?;
|
.map_err(SessionError::Worktree)?;
|
||||||
(path.clone(), Some(path), Some(base_repo.clone()))
|
// Record the repository, not whatever the request named: a
|
||||||
|
// spawn from inside a linked worktree passes that worktree as
|
||||||
|
// `base_repo`, and clients group sessions by this path (#99).
|
||||||
|
let repo = crate::worktree::main_checkout_of(base_repo);
|
||||||
|
(path.clone(), Some(path), Some(repo))
|
||||||
}
|
}
|
||||||
None => (req.cwd.clone(), None, None),
|
None => (req.cwd.clone(), None, None),
|
||||||
};
|
};
|
||||||
@@ -300,7 +318,7 @@ impl SessionManager {
|
|||||||
return Err(e.into());
|
return Err(e.into());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let session_env = match sanitize_env(&req.env) {
|
let mut session_env = match sanitize_env(&req.env) {
|
||||||
Ok(env) => env,
|
Ok(env) => env,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let _ = std::fs::remove_file(&fifo_path);
|
let _ = std::fs::remove_file(&fifo_path);
|
||||||
@@ -308,6 +326,19 @@ impl SessionManager {
|
|||||||
return Err(e);
|
return Err(e);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
// Identity + reporting target for the in-session hook (#106). Ours
|
||||||
|
// win over whatever the request carried, so a client cannot spoof
|
||||||
|
// another session's identity (#103).
|
||||||
|
session_env.insert("MAESTRO_SESSION_ID".into(), id.to_string());
|
||||||
|
if let Some(url) = self
|
||||||
|
.inner
|
||||||
|
.daemon_url
|
||||||
|
.lock()
|
||||||
|
.expect("daemon_url mutex")
|
||||||
|
.clone()
|
||||||
|
{
|
||||||
|
session_env.insert("MAESTRO_URL".into(), url);
|
||||||
|
}
|
||||||
let spawned = {
|
let spawned = {
|
||||||
let tmux = self.inner.tmux.clone();
|
let tmux = self.inner.tmux.clone();
|
||||||
let cwd = effective_cwd.clone();
|
let cwd = effective_cwd.clone();
|
||||||
|
|||||||
@@ -264,6 +264,25 @@ impl Tmux {
|
|||||||
check(out)
|
check(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `tmux show-environment -t maestro-<id>`, parsed into KEY=VALUE pairs.
|
||||||
|
/// Test-facing view of what a spawned session actually inherits.
|
||||||
|
pub fn show_environment(&self, id: Uuid) -> Result<BTreeMap<String, String>, TmuxError> {
|
||||||
|
let name = session_name(id);
|
||||||
|
let out = self
|
||||||
|
.cmd()
|
||||||
|
.args(["show-environment", "-t", &name])
|
||||||
|
.output()?;
|
||||||
|
check(out.clone())?;
|
||||||
|
let stdout = String::from_utf8_lossy(&out.stdout);
|
||||||
|
let mut env = BTreeMap::new();
|
||||||
|
for line in stdout.lines() {
|
||||||
|
if let Some((k, v)) = line.split_once('=') {
|
||||||
|
env.insert(k.to_string(), v.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(env)
|
||||||
|
}
|
||||||
|
|
||||||
/// `tmux kill-server`. Best-effort cleanup used mostly by tests.
|
/// `tmux kill-server`. Best-effort cleanup used mostly by tests.
|
||||||
pub fn kill_server(&self) -> Result<(), TmuxError> {
|
pub fn kill_server(&self) -> Result<(), TmuxError> {
|
||||||
let out = self.cmd().arg("kill-server").output()?;
|
let out = self.cmd().arg("kill-server").output()?;
|
||||||
|
|||||||
@@ -174,6 +174,13 @@ impl WorktreeManager {
|
|||||||
/// The repository's main checkout. `--git-common-dir` points at the shared
|
/// The repository's main checkout. `--git-common-dir` points at the shared
|
||||||
/// `.git` for every linked worktree, so its parent is the main tree. Falls
|
/// `.git` for every linked worktree, so its parent is the main tree. Falls
|
||||||
/// back to the input when git can't answer.
|
/// back to the input when git can't answer.
|
||||||
|
/// The repository a path belongs to: the main checkout, even when `path` is a
|
||||||
|
/// linked worktree. Clients group sessions by this (#99), and placement uses it
|
||||||
|
/// so a worktree is never nested inside another.
|
||||||
|
pub fn main_checkout_of(path: &Path) -> PathBuf {
|
||||||
|
main_checkout(path)
|
||||||
|
}
|
||||||
|
|
||||||
fn main_checkout(path: &Path) -> PathBuf {
|
fn main_checkout(path: &Path) -> PathBuf {
|
||||||
let out = Command::new("git")
|
let out = Command::new("git")
|
||||||
.arg("-C")
|
.arg("-C")
|
||||||
|
|||||||
@@ -30,6 +30,24 @@ impl Fx {
|
|||||||
Self::with_sidecar_dir(|tmp| tmp.join("sidecars"))
|
Self::with_sidecar_dir(|tmp| tmp.join("sidecars"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Variant whose manager knows the daemon's own base URL (#103), the way
|
||||||
|
/// the production runner wires it from `[daemon].bind_addr`.
|
||||||
|
fn with_daemon_url(url: &str) -> Self {
|
||||||
|
let fx = Self::new();
|
||||||
|
fx.manager.set_daemon_url(url.to_string());
|
||||||
|
fx
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The env map of the (single, expected) spawn call.
|
||||||
|
fn spawned_env(&self) -> BTreeMap<String, String> {
|
||||||
|
let calls = self.fake.calls();
|
||||||
|
let Some(Call::NewSessionPiped { env, .. }) = calls.first() else {
|
||||||
|
panic!("expected a spawn call, got {calls:?}");
|
||||||
|
};
|
||||||
|
assert_eq!(calls.len(), 1, "expected exactly one spawn: {calls:?}");
|
||||||
|
env.clone()
|
||||||
|
}
|
||||||
|
|
||||||
fn with_sidecar_dir(pick: impl Fn(&std::path::Path) -> PathBuf) -> Self {
|
fn with_sidecar_dir(pick: impl Fn(&std::path::Path) -> PathBuf) -> Self {
|
||||||
let tmp = TempDir::new().expect("tempdir");
|
let tmp = TempDir::new().expect("tempdir");
|
||||||
let fake = Arc::new(FakePanes::new());
|
let fake = Arc::new(FakePanes::new());
|
||||||
@@ -261,16 +279,23 @@ async fn requested_env_reaches_tmux() {
|
|||||||
|
|
||||||
fx.manager.create(req).await.expect("create");
|
fx.manager.create(req).await.expect("create");
|
||||||
|
|
||||||
|
let spawned = match fx.fake.calls().first() {
|
||||||
|
Some(Call::NewSessionPiped { env, .. }) => env.clone(),
|
||||||
|
other => panic!("expected a spawn call, got {other:?}"),
|
||||||
|
};
|
||||||
|
let id = spawned
|
||||||
|
.get("MAESTRO_SESSION_ID")
|
||||||
|
.expect("spawn must export MAESTRO_SESSION_ID (#103)")
|
||||||
|
.clone();
|
||||||
|
// The daemon-owned variable rides alongside whatever was requested.
|
||||||
let want: BTreeMap<String, String> = [
|
let want: BTreeMap<String, String> = [
|
||||||
("EMPTY".to_string(), String::new()),
|
("EMPTY".to_string(), String::new()),
|
||||||
("FOO".to_string(), "bar".to_string()),
|
("FOO".to_string(), "bar".to_string()),
|
||||||
|
("MAESTRO_SESSION_ID".to_string(), id),
|
||||||
]
|
]
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.collect();
|
.collect();
|
||||||
match fx.fake.calls().first() {
|
assert_eq!(&spawned, &want);
|
||||||
Some(Call::NewSessionPiped { env, .. }) => assert_eq!(env, &want),
|
|
||||||
other => panic!("expected a spawn call, got {other:?}"),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -396,3 +421,70 @@ fn attaching_spawn_history_after_cloning_panics() {
|
|||||||
7,
|
7,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Every tmux-spawned session learns who it is (#103): its own UUID under
|
||||||
|
/// `MAESTRO_SESSION_ID`, so the reporting hook in #106 can name the session
|
||||||
|
/// it is running inside.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn spawn_exports_maestro_session_id() {
|
||||||
|
let fx = Fx::new();
|
||||||
|
let s = fx.manager.create(fx.request("bash")).await.expect("create");
|
||||||
|
|
||||||
|
let env = fx.spawned_env();
|
||||||
|
assert_eq!(
|
||||||
|
env.get("MAESTRO_SESSION_ID").map(String::as_str),
|
||||||
|
Some(&s.id.to_string()[..]),
|
||||||
|
"MAESTRO_SESSION_ID must be the session's UUID, got {env:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The hook also needs to know where to report to: `MAESTRO_URL` carries the
|
||||||
|
/// daemon's base URL derived from `[daemon].bind_addr` (#103).
|
||||||
|
#[tokio::test]
|
||||||
|
async fn spawn_exports_maestro_url_when_the_daemon_is_wired() {
|
||||||
|
let fx = Fx::with_daemon_url("http://127.0.0.1:7070");
|
||||||
|
fx.manager.create(fx.request("bash")).await.expect("create");
|
||||||
|
|
||||||
|
let env = fx.spawned_env();
|
||||||
|
assert_eq!(
|
||||||
|
env.get("MAESTRO_URL").map(String::as_str),
|
||||||
|
Some("http://127.0.0.1:7070"),
|
||||||
|
"MAESTRO_URL must be the daemon's base URL, got {env:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Without a wired URL (tests, or a caller that never set one) only the
|
||||||
|
/// session id is injected — an empty or bogus `MAESTRO_URL` would send the
|
||||||
|
/// #106 hook's reports nowhere useful.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn spawn_omits_maestro_url_when_not_wired() {
|
||||||
|
let fx = Fx::new();
|
||||||
|
fx.manager.create(fx.request("bash")).await.expect("create");
|
||||||
|
|
||||||
|
let env = fx.spawned_env();
|
||||||
|
assert!(
|
||||||
|
!env.contains_key("MAESTRO_URL"),
|
||||||
|
"MAESTRO_URL must be absent when no daemon URL is known, got {env:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The daemon-owned variables win over anything the spawner sent: a client
|
||||||
|
/// cannot spoof another session's identity.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn spawn_overrides_client_supplied_maestro_variables() {
|
||||||
|
let fx = Fx::with_daemon_url("http://127.0.0.1:7070");
|
||||||
|
let mut req = fx.request("bash");
|
||||||
|
req.env.insert(
|
||||||
|
"MAESTRO_SESSION_ID".into(),
|
||||||
|
"00000000-0000-0000-0000-000000000000".into(),
|
||||||
|
);
|
||||||
|
req.env.insert("MAESTRO_URL".into(), "http://evil:1".into());
|
||||||
|
let s = fx.manager.create(req).await.expect("create");
|
||||||
|
|
||||||
|
let env = fx.spawned_env();
|
||||||
|
assert_eq!(env.get("MAESTRO_SESSION_ID"), Some(&s.id.to_string()));
|
||||||
|
assert_eq!(
|
||||||
|
env.get("MAESTRO_URL"),
|
||||||
|
Some(&"http://127.0.0.1:7070".to_string())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
@@ -947,3 +947,101 @@ async fn liveness_watcher_leaves_running_sessions_alone() {
|
|||||||
|
|
||||||
fx.manager.kill(s.id, false).await.unwrap();
|
fx.manager.kill(s.id, false).await.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// #99: clients group a session under `worktree.base_repo`, so that field has
|
||||||
|
/// to name the repository even when the spawn request pointed at a linked
|
||||||
|
/// worktree. Recording the request verbatim put the session in a folder of its
|
||||||
|
/// own — `<repo>/worktrees/<branch>` — instead of under the repo.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn worktree_base_repo_records_the_main_checkout_not_the_request() {
|
||||||
|
let fx = DaemonFixture::new();
|
||||||
|
let repo = TempDir::new().unwrap();
|
||||||
|
init_repo(repo.path());
|
||||||
|
|
||||||
|
// A linked worktree of that repo, then a spawn whose `base_repo` names it
|
||||||
|
// rather than the main checkout — what happens when the operator spawns
|
||||||
|
// from inside a worktree.
|
||||||
|
let first = fx
|
||||||
|
.manager
|
||||||
|
.create(CreateSessionRequest {
|
||||||
|
cwd: repo.path().to_path_buf(),
|
||||||
|
command: "sleep 30".into(),
|
||||||
|
env: HashMap::new(),
|
||||||
|
metadata: HashMap::new(),
|
||||||
|
worktree: Some(WorktreeSpec {
|
||||||
|
base_repo: repo.path().to_path_buf(),
|
||||||
|
branch: "feat/one".into(),
|
||||||
|
create_branch: true,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.expect("create first");
|
||||||
|
let inner_worktree = first.worktree.expect("first has a worktree").path;
|
||||||
|
|
||||||
|
let second = fx
|
||||||
|
.manager
|
||||||
|
.create(CreateSessionRequest {
|
||||||
|
cwd: inner_worktree.clone(),
|
||||||
|
command: "sleep 30".into(),
|
||||||
|
env: HashMap::new(),
|
||||||
|
metadata: HashMap::new(),
|
||||||
|
worktree: Some(WorktreeSpec {
|
||||||
|
base_repo: inner_worktree.clone(),
|
||||||
|
branch: "feat/two".into(),
|
||||||
|
create_branch: true,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.expect("create second");
|
||||||
|
|
||||||
|
let wt = second.worktree.expect("second has a worktree");
|
||||||
|
assert_eq!(
|
||||||
|
wt.base_repo,
|
||||||
|
repo.path()
|
||||||
|
.canonicalize()
|
||||||
|
.unwrap_or_else(|_| repo.path().to_path_buf()),
|
||||||
|
"base_repo must be the repository, not the worktree the request named",
|
||||||
|
);
|
||||||
|
assert_ne!(wt.base_repo, inner_worktree, "the worktree is not the repo");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// #103: every tmux-spawned session carries the daemon's identity variables in
|
||||||
|
/// its environment — its UUID under `MAESTRO_SESSION_ID` and the daemon's base
|
||||||
|
/// URL under `MAESTRO_URL` — so the in-session reporting hook (#106) can find
|
||||||
|
/// both without any out-of-band channel.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn spawned_sessions_export_maestro_session_id_and_url() {
|
||||||
|
let fx = DaemonFixture::new();
|
||||||
|
fx.manager
|
||||||
|
.set_daemon_url("http://127.0.0.1:7071".to_string());
|
||||||
|
let cwd = TempDir::new().unwrap();
|
||||||
|
|
||||||
|
let s = fx
|
||||||
|
.manager
|
||||||
|
.create(CreateSessionRequest {
|
||||||
|
cwd: cwd.path().to_path_buf(),
|
||||||
|
command: "sleep 30".into(),
|
||||||
|
env: HashMap::new(),
|
||||||
|
metadata: HashMap::new(),
|
||||||
|
worktree: None,
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.expect("create");
|
||||||
|
|
||||||
|
let env = fx
|
||||||
|
.tmux
|
||||||
|
.tmux
|
||||||
|
.show_environment(s.id)
|
||||||
|
.expect("show-environment");
|
||||||
|
assert_eq!(
|
||||||
|
env.get("MAESTRO_SESSION_ID"),
|
||||||
|
Some(&s.id.to_string()),
|
||||||
|
"session env: {env:?}"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
env.get("MAESTRO_URL"),
|
||||||
|
Some(&"http://127.0.0.1:7071".to_string())
|
||||||
|
);
|
||||||
|
|
||||||
|
fx.manager.kill(s.id, false).await.expect("kill");
|
||||||
|
}
|
||||||
|
|||||||
+5
-1
@@ -272,7 +272,11 @@ function showMultiView(): void {
|
|||||||
// cloned session's dir + command.
|
// cloned session's dir + command.
|
||||||
function requestOpenSpawn(): void {
|
function requestOpenSpawn(): void {
|
||||||
showMultiView();
|
showMultiView();
|
||||||
mv.openDraft();
|
// A new tab, not a split of the pane you were reading (#100). "Spawn
|
||||||
|
// similar" and the fast-forward key below deliberately keep the old
|
||||||
|
// behaviour: both act on the session in front of you, so a split beside it
|
||||||
|
// is the point.
|
||||||
|
mv.openDraft(undefined, { newTab: true });
|
||||||
}
|
}
|
||||||
document.addEventListener(OPEN_SPAWN_EVENT, () => requestOpenSpawn());
|
document.addEventListener(OPEN_SPAWN_EVENT, () => requestOpenSpawn());
|
||||||
document.addEventListener("catalog-spawn-similar", (ev) => {
|
document.addEventListener("catalog-spawn-similar", (ev) => {
|
||||||
|
|||||||
@@ -282,3 +282,54 @@ describe("multiview pane-drag swap (#73)", () => {
|
|||||||
expect(nameInputOf(leaf2).value).toBe("west");
|
expect(nameInputOf(leaf2).value).toBe("west");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("openDraft newTab (#100)", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
stubFetch();
|
||||||
|
document.body.replaceChildren();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.unstubAllGlobals();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("opens its own tab instead of splitting the focused session", async () => {
|
||||||
|
const layout = emptyLayout();
|
||||||
|
const tab = layout.tabs[0];
|
||||||
|
const first = splitLeaf(tab, "", "s1", "row", true);
|
||||||
|
tab.focusedLeafId = first;
|
||||||
|
const mv = makeMv(layout);
|
||||||
|
document.body.appendChild(mv.el);
|
||||||
|
mv.render();
|
||||||
|
|
||||||
|
mv.openDraft(undefined, { newTab: true });
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
expect(layout.tabs).toHaveLength(2);
|
||||||
|
// The tab you were reading is untouched: still one pane, still its session.
|
||||||
|
const original = leaves(layout.tabs[0].root);
|
||||||
|
expect(original).toHaveLength(1);
|
||||||
|
expect(original[0].sessionId).toBe("s1");
|
||||||
|
// The draft is alone in the new, now-active tab.
|
||||||
|
const fresh = leaves(layout.tabs[1].root);
|
||||||
|
expect(fresh).toHaveLength(1);
|
||||||
|
expect(fresh[0].sessionId).toBeNull();
|
||||||
|
expect(fresh[0].draft).not.toBeNull();
|
||||||
|
expect(layout.activeTabId).toBe(layout.tabs[1].id);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("still splits when newTab is not asked for", async () => {
|
||||||
|
const layout = emptyLayout();
|
||||||
|
const tab = layout.tabs[0];
|
||||||
|
tab.focusedLeafId = splitLeaf(tab, "", "s1", "row", true);
|
||||||
|
const mv = makeMv(layout);
|
||||||
|
document.body.appendChild(mv.el);
|
||||||
|
mv.render();
|
||||||
|
|
||||||
|
mv.openDraft();
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
expect(layout.tabs).toHaveLength(1);
|
||||||
|
expect(leaves(tab.root)).toHaveLength(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
+12
-3
@@ -57,7 +57,7 @@ export interface MultiView {
|
|||||||
/** Open a draft pane (issue #62): reuse the focused pane if it is already
|
/** Open a draft pane (issue #62): reuse the focused pane if it is already
|
||||||
* empty, otherwise split the focused pane. `seed` pre-fills the form
|
* empty, otherwise split the focused pane. `seed` pre-fills the form
|
||||||
* ("Spawn similar" clones a session's cwd + command). */
|
* ("Spawn similar" clones a session's cwd + command). */
|
||||||
openDraft: (seed?: Partial<Draft>) => void;
|
openDraft: (seed?: Partial<Draft>, opts?: { newTab?: boolean }) => void;
|
||||||
/** Start dragging a sidebar session into the canvas (issue #32). The
|
/** Start dragging a sidebar session into the canvas (issue #32). The
|
||||||
* controller owns drag-vs-tap: a tap lets the row's normal click open it, a
|
* controller owns drag-vs-tap: a tap lets the row's normal click open it, a
|
||||||
* drag shows drop zones to place it. */
|
* drag shows drop zones to place it. */
|
||||||
@@ -412,9 +412,18 @@ export function createMultiView(opts: MultiViewOptions): MultiView {
|
|||||||
opts.onOpenSessionsChange?.();
|
opts.onOpenSessionsChange?.();
|
||||||
}
|
}
|
||||||
|
|
||||||
function openDraft(seed?: Partial<Draft>): void {
|
function openDraft(seed?: Partial<Draft>, opts?: { newTab?: boolean }): void {
|
||||||
const tab = activeTab(layout);
|
|
||||||
const draft = (): Draft => ({ command: "", cwd: "", name: "", ...seed });
|
const draft = (): Draft => ({ command: "", cwd: "", name: "", ...seed });
|
||||||
|
if (opts?.newTab) {
|
||||||
|
// Spawn opens its own tab rather than halving whatever you were reading
|
||||||
|
// (#100). The empty-pane reuse below still applies within a tab.
|
||||||
|
const fresh = addTab(layout);
|
||||||
|
fresh.focusedLeafId = splitLeaf(fresh, "", null, "row", true);
|
||||||
|
findLeaf(fresh.root!, fresh.focusedLeafId)!.draft = draft();
|
||||||
|
render();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const tab = activeTab(layout);
|
||||||
if (!tab.root || !tab.focusedLeafId || !findLeaf(tab.root, tab.focusedLeafId)) {
|
if (!tab.root || !tab.focusedLeafId || !findLeaf(tab.root, tab.focusedLeafId)) {
|
||||||
// Empty tab (or stale focus): the draft becomes the first pane.
|
// Empty tab (or stale focus): the draft becomes the first pane.
|
||||||
tab.focusedLeafId = splitLeaf(tab, "", null, "row", true);
|
tab.focusedLeafId = splitLeaf(tab, "", null, "row", true);
|
||||||
|
|||||||
@@ -95,3 +95,59 @@ describe("mergeLinear", () => {
|
|||||||
expect(merged.path).toBe("a/b");
|
expect(merged.path).toBe("a/b");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("worktree sessions group under their repository (#99)", () => {
|
||||||
|
/** A session the daemon spawned into a worktree of `repo`. */
|
||||||
|
function worktreeSession(id: string, repo: string, wt: string): Session {
|
||||||
|
return { ...session(id, wt), worktree: { path: wt, base_repo: repo } } as Session;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Top-level folder names, after linear chains are collapsed. */
|
||||||
|
function topFolders(root: TreeFolder): string[] {
|
||||||
|
return root.children.filter((c) => c.kind === "folder").map((c) => (c as TreeFolder).name);
|
||||||
|
}
|
||||||
|
|
||||||
|
it("nests under the repo, not the worktree directory", () => {
|
||||||
|
const root = buildTree(
|
||||||
|
[
|
||||||
|
worktreeSession(
|
||||||
|
"a",
|
||||||
|
"/home/n/tea/agent-skills",
|
||||||
|
"/home/n/tea/agent-skills/worktrees/largo-clarinet",
|
||||||
|
),
|
||||||
|
],
|
||||||
|
"/home/n",
|
||||||
|
"",
|
||||||
|
) as TreeFolder;
|
||||||
|
|
||||||
|
expect(topFolders(root)).toEqual(["~/tea/agent-skills"]);
|
||||||
|
const repo = root.children[0] as TreeFolder;
|
||||||
|
expect(repo.children).toHaveLength(1);
|
||||||
|
expect(repo.children[0].kind).toBe("leaf");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("puts a repo's plain and worktree sessions side by side", () => {
|
||||||
|
const root = buildTree(
|
||||||
|
[
|
||||||
|
session("plain", "/home/n/tea/agent-skills"),
|
||||||
|
worktreeSession(
|
||||||
|
"wt",
|
||||||
|
"/home/n/tea/agent-skills",
|
||||||
|
"/home/n/tea/agent-skills/worktrees/largo-clarinet",
|
||||||
|
),
|
||||||
|
],
|
||||||
|
"/home/n",
|
||||||
|
"",
|
||||||
|
) as TreeFolder;
|
||||||
|
|
||||||
|
expect(topFolders(root)).toEqual(["~/tea/agent-skills"]);
|
||||||
|
const repo = root.children[0] as TreeFolder;
|
||||||
|
expect(repo.children).toHaveLength(2);
|
||||||
|
expect(repo.children.every((c) => c.kind === "leaf")).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("leaves a session without a worktree where it is", () => {
|
||||||
|
const root = buildTree([session("a", "/home/n/tea/arr")], "/home/n", "") as TreeFolder;
|
||||||
|
expect(topFolders(root)).toEqual(["~/tea/arr"]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
+4
-2
@@ -2,7 +2,7 @@
|
|||||||
// so it can be tested directly.
|
// so it can be tested directly.
|
||||||
|
|
||||||
import type { Session } from "./types.js";
|
import type { Session } from "./types.js";
|
||||||
import { abbreviateCwd, sessionCwd, sessionName } from "./types.js";
|
import { abbreviateCwd, sessionName, sessionTreePath } from "./types.js";
|
||||||
|
|
||||||
export interface TreeFolder {
|
export interface TreeFolder {
|
||||||
kind: "folder";
|
kind: "folder";
|
||||||
@@ -30,7 +30,9 @@ export function buildTree(sessions: Session[], home: string | undefined, filter:
|
|||||||
const lc = filter.trim().toLowerCase();
|
const lc = filter.trim().toLowerCase();
|
||||||
|
|
||||||
for (const s of sessions) {
|
for (const s of sessions) {
|
||||||
const cwd = sessionCwd(s);
|
// Grouped by repository, so a worktree session lands under its repo
|
||||||
|
// rather than in a folder of its own (#99).
|
||||||
|
const cwd = sessionTreePath(s);
|
||||||
const dir = cwd ? abbreviateCwd(cwd, home) : "";
|
const dir = cwd ? abbreviateCwd(cwd, home) : "";
|
||||||
if (lc) {
|
if (lc) {
|
||||||
const haystack = `${sessionName(s)} ${dir}`.toLowerCase();
|
const haystack = `${sessionName(s)} ${dir}`.toLowerCase();
|
||||||
|
|||||||
+22
-1
@@ -36,6 +36,16 @@ export interface Session {
|
|||||||
* without a worktree; all counts default to 0 on the wire for older
|
* without a worktree; all counts default to 0 on the wire for older
|
||||||
* daemons. */
|
* daemons. */
|
||||||
blocked_work?: InTheWay | null;
|
blocked_work?: InTheWay | null;
|
||||||
|
/** The worktree the daemon created for this session, absent when it did not
|
||||||
|
* create one. `base_repo` is the repository's main checkout, which is what
|
||||||
|
* the session tree groups by (#99). */
|
||||||
|
worktree?: SessionWorktree | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A session's daemon-created worktree (`SessionWorktree` on the wire). */
|
||||||
|
export interface SessionWorktree {
|
||||||
|
path: string;
|
||||||
|
base_repo: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** One directory's immediate subdirectories (NAP-329). */
|
/** One directory's immediate subdirectories (NAP-329). */
|
||||||
@@ -231,12 +241,23 @@ export function sessionName(s: Session): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** The directory a session lives in: its live `current_cwd` if the daemon has
|
/** The directory a session lives in: its live `current_cwd` if the daemon has
|
||||||
* observed one, else the spawn `cwd`. Drives the directory-based session tree. */
|
* observed one, else the spawn `cwd`. */
|
||||||
export function sessionCwd(s: Session): string | undefined {
|
export function sessionCwd(s: Session): string | undefined {
|
||||||
if (typeof s.current_cwd === "string" && s.current_cwd) return s.current_cwd;
|
if (typeof s.current_cwd === "string" && s.current_cwd) return s.current_cwd;
|
||||||
return s.cwd || undefined;
|
return s.cwd || undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 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. `base_repo` is the main checkout — the daemon resolves it. */
|
||||||
|
export function sessionTreePath(s: Session): string | undefined {
|
||||||
|
const repo = s.worktree?.base_repo;
|
||||||
|
if (typeof repo === "string" && repo) return repo;
|
||||||
|
return sessionCwd(s);
|
||||||
|
}
|
||||||
|
|
||||||
/** Collapse a daemon's home dir to `~`. `home` comes from `DaemonInfo.home_dir`;
|
/** Collapse a daemon's home dir to `~`. `home` comes from `DaemonInfo.home_dir`;
|
||||||
* absent/empty leaves the path untouched. Mirrors the CLI's `abbreviate_dir`. */
|
* absent/empty leaves the path untouched. Mirrors the CLI's `abbreviate_dir`. */
|
||||||
export function abbreviateCwd(cwd: string, home?: string): string {
|
export function abbreviateCwd(cwd: string, home?: string): string {
|
||||||
|
|||||||
Reference in New Issue
Block a user