ci / rust (push) Failing after 3s
Local primitives for `maestrod`, no network code yet: - `tmux`: subprocess wrapper around new-session, kill-session, list-sessions (filtered to maestro-*), send-keys -l, pipe-pane -o, resize-window, kill-server. - `sidecar`: atomic JSON metadata store keyed by session UUID, with load_all for daemon restart recovery. - `worktree`: `git worktree add -b` with collision-proof generated paths and `git worktree remove --force` for cleanup_on_kill. Integration tests use real tmux (isolated via unique socket + temp TMUX_TMPDIR) and real git (tmpdir repo). Closes NAP-212.
92 lines
2.6 KiB
Rust
92 lines
2.6 KiB
Rust
//! `git worktree` helper used when a `CreateSession` request includes a
|
|
//! `worktree` spec.
|
|
|
|
use std::path::{Path, PathBuf};
|
|
use std::process::{Command, Output};
|
|
|
|
use uuid::Uuid;
|
|
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum WorktreeError {
|
|
#[error("failed to spawn git: {0}")]
|
|
Spawn(#[from] std::io::Error),
|
|
#[error("git exited with code {code}: {stderr}")]
|
|
NonZero { code: i32, stderr: String },
|
|
}
|
|
|
|
/// Generates a unique path under `root` and runs `git worktree add` rooted at
|
|
/// `base_repo`. Each call appends a UUID-suffixed directory so concurrent
|
|
/// `add()`s never collide.
|
|
#[derive(Debug, Clone)]
|
|
pub struct WorktreeManager {
|
|
root: PathBuf,
|
|
}
|
|
|
|
impl WorktreeManager {
|
|
pub fn new(root: impl Into<PathBuf>) -> Self {
|
|
Self { root: root.into() }
|
|
}
|
|
|
|
pub fn root(&self) -> &Path {
|
|
&self.root
|
|
}
|
|
|
|
/// `git -C <base_repo> worktree add -b <branch> <generated-path>`.
|
|
/// Returns the path of the new worktree on success.
|
|
pub fn add(&self, base_repo: &Path, branch: &str) -> Result<PathBuf, WorktreeError> {
|
|
std::fs::create_dir_all(&self.root)?;
|
|
let path = self.generate_path(branch);
|
|
let out = Command::new("git")
|
|
.arg("-C")
|
|
.arg(base_repo)
|
|
.args(["worktree", "add", "-b", branch])
|
|
.arg(&path)
|
|
.output()?;
|
|
check(out)?;
|
|
Ok(path)
|
|
}
|
|
|
|
/// `git -C <base_repo> worktree remove --force <path>`.
|
|
pub fn remove(&self, base_repo: &Path, path: &Path) -> Result<(), WorktreeError> {
|
|
let out = Command::new("git")
|
|
.arg("-C")
|
|
.arg(base_repo)
|
|
.args(["worktree", "remove", "--force"])
|
|
.arg(path)
|
|
.output()?;
|
|
check(out)
|
|
}
|
|
|
|
fn generate_path(&self, branch: &str) -> PathBuf {
|
|
let slug = sanitize_branch_for_path(branch);
|
|
let unique = Uuid::new_v4().simple();
|
|
self.root.join(format!("{slug}-{unique}"))
|
|
}
|
|
}
|
|
|
|
fn sanitize_branch_for_path(branch: &str) -> String {
|
|
let mut out = String::with_capacity(branch.len());
|
|
for c in branch.chars() {
|
|
if c.is_ascii_alphanumeric() || c == '-' || c == '_' {
|
|
out.push(c);
|
|
} else if c == '/' || c == '.' {
|
|
out.push('-');
|
|
}
|
|
}
|
|
if out.is_empty() {
|
|
out.push_str("wt");
|
|
}
|
|
out
|
|
}
|
|
|
|
fn check(out: Output) -> Result<(), WorktreeError> {
|
|
if out.status.success() {
|
|
Ok(())
|
|
} else {
|
|
Err(WorktreeError::NonZero {
|
|
code: out.status.code().unwrap_or(-1),
|
|
stderr: String::from_utf8_lossy(&out.stderr).into_owned(),
|
|
})
|
|
}
|
|
}
|