feat: add worktree cli and socket api

1 files changed, 337 insertions, 6 deletions

diff --git a/tests/cli_wrapper.rs b/tests/cli_wrapper.rs
index 93d0161f..902ea467 100644
--- a/tests/cli_wrapper.rs
+++ b/tests/cli_wrapper.rs
@@ -24,6 +24,31 @@ fn unique_test_dir() -> PathBuf {
     PathBuf::from(format!("/tmp/hcli-{}-{nanos}", std::process::id()))
 }
 
+fn run_git(repo: &Path, args: &[&str]) {
+    let status = Command::new("git")
+        .arg("-C")
+        .arg(repo)
+        .args(args)
+        .status()
+        .unwrap();
+    assert!(
+        status.success(),
+        "git command failed: git -C {} {}",
+        repo.display(),
+        args.join(" ")
+    );
+}
+
+fn create_committed_repo(path: &Path) {
+    fs::create_dir_all(path).unwrap();
+    run_git(path, &["init", "--quiet"]);
+    run_git(path, &["config", "user.email", "herdr@example.invalid"]);
+    run_git(path, &["config", "user.name", "Herdr Test"]);
+    fs::write(path.join("README.md"), "test\n").unwrap();
+    run_git(path, &["add", "README.md"]);
+    run_git(path, &["commit", "--quiet", "-m", "initial"]);
+}
+
 struct SpawnedHerdr {
     _master: Box<dyn MasterPty + Send>,
     child: Box<dyn Child + Send + Sync>,
@@ -220,8 +245,25 @@ fn run_cli(socket_path: &Path, args: &[&str]) -> std::process::Output {
     command.output().unwrap()
 }
 
+fn run_cli_in_dir(socket_path: &Path, args: &[&str], current_dir: &Path) -> std::process::Output {
+    let mut command = Command::new(env!("CARGO_BIN_EXE_herdr"));
+    command.args(args);
+    command.current_dir(current_dir);
+    command.env("HERDR_SOCKET_PATH", socket_path);
+    command.output().unwrap()
+}
+
 fn run_cli_json(socket_path: &Path, args: &[&str]) -> serde_json::Value {
     let output = run_cli(socket_path, args);
+    parse_cli_json_output(args, output)
+}
+
+fn run_cli_json_in_dir(socket_path: &Path, args: &[&str], current_dir: &Path) -> serde_json::Value {
+    let output = run_cli_in_dir(socket_path, args, current_dir);
+    parse_cli_json_output(args, output)
+}
+
+fn parse_cli_json_output(args: &[&str], output: std::process::Output) -> serde_json::Value {
     assert!(
         output.status.success(),
         "command failed: herdr {}\nstatus: {:?}\nstderr: {}\nstdout: {}",
@@ -560,6 +602,7 @@ fn help_commands_exit_successfully() {
         &["status", "-h"],
         &["server", "-h"],
         &["workspace", "-h"],
+        &["worktree", "-h"],
         &["tab", "-h"],
         &["pane", "-h"],
         &["wait", "-h"],
@@ -968,7 +1011,7 @@ fn status_commands_report_client_and_server_versions() {
         "stdout: {full_stdout}"
     );
     assert!(
-        full_stdout.contains("  protocol: 9"),
+        full_stdout.contains("  protocol: 10"),
         "stdout: {full_stdout}"
     );
     assert!(full_stdout.contains("server:\n"), "stdout: {full_stdout}");
@@ -1001,7 +1044,7 @@ fn status_commands_report_client_and_server_versions() {
         "stdout: {server_stdout}"
     );
     assert!(
-        server_stdout.contains("protocol: 9"),
+        server_stdout.contains("protocol: 10"),
         "stdout: {server_stdout}"
     );
 
@@ -1013,7 +1056,7 @@ fn status_commands_report_client_and_server_versions() {
         "stdout: {client_stdout}"
     );
     assert!(
-        client_stdout.contains("protocol: 9"),
+        client_stdout.contains("protocol: 10"),
         "stdout: {client_stdout}"
     );
     assert!(
@@ -1023,7 +1066,7 @@ fn status_commands_report_client_and_server_versions() {
 
     let full_json = run_cli_json(&socket_path, &["status", "--json"]);
     assert_eq!(full_json["client"]["version"], env!("CARGO_PKG_VERSION"));
-    assert_eq!(full_json["client"]["protocol"], 9);
+    assert_eq!(full_json["client"]["protocol"], 10);
     assert_eq!(full_json["server"]["status"], "running");
     assert_eq!(full_json["server"]["running"], true);
     assert_eq!(full_json["server"]["compatible"], true);
@@ -1037,12 +1080,12 @@ fn status_commands_report_client_and_server_versions() {
     let server_json = run_cli_json(&socket_path, &["status", "server", "--json"]);
     assert_eq!(server_json["status"], "running");
     assert_eq!(server_json["version"], env!("CARGO_PKG_VERSION"));
-    assert_eq!(server_json["protocol"], 9);
+    assert_eq!(server_json["protocol"], 10);
     assert_eq!(server_json["compatible"], true);
 
     let client_json = run_cli_json(&socket_path, &["status", "client", "--json"]);
     assert_eq!(client_json["version"], env!("CARGO_PKG_VERSION"));
-    assert_eq!(client_json["protocol"], 9);
+    assert_eq!(client_json["protocol"], 10);
     assert!(client_json["binary"]
         .as_str()
         .is_some_and(|path| !path.is_empty()));
@@ -1218,6 +1261,294 @@ fn workspace_and_pane_management_commands_work() {
 }
 
 #[test]
+fn worktree_management_commands_work() {
+    let base = unique_test_dir();
+    let config_home = base.join("config");
+    let runtime_dir = base.join("runtime");
+    let socket_path = runtime_dir.join("herdr.sock");
+    let repo = base.join("repo");
+    let checkout = base.join("checkout");
+    create_committed_repo(&repo);
+
+    let herdr = spawn_herdr(&config_home, &runtime_dir, &socket_path);
+    wait_for_socket(&socket_path, Duration::from_secs(5));
+
+    let branch = "worktree/cli-wrapper";
+    let created = run_cli_json(
+        &socket_path,
+        &[
+            "worktree",
+            "create",
+            "--cwd",
+            repo.to_str().unwrap(),
+            "--branch",
+            branch,
+            "--path",
+            checkout.to_str().unwrap(),
+            "--json",
+        ],
+    );
+    assert_eq!(created["result"]["type"], "worktree_created");
+    assert_eq!(created["result"]["worktree"]["branch"], branch);
+    let child_workspace_id = created["result"]["workspace"]["workspace_id"]
+        .as_str()
+        .unwrap()
+        .to_string();
+    assert!(checkout.join("README.md").exists());
+
+    let workspaces = run_cli_json(&socket_path, &["workspace", "list"]);
+    let workspace_list = workspaces["result"]["workspaces"].as_array().unwrap();
+    let parent_workspace_id = workspace_list
+        .iter()
+        .find(|workspace| workspace["worktree"]["is_linked_worktree"].as_bool() == Some(false))
+        .and_then(|workspace| workspace["workspace_id"].as_str())
+        .unwrap()
+        .to_string();
+    assert!(workspace_list.iter().any(|workspace| {
+        workspace["workspace_id"].as_str() == Some(child_workspace_id.as_str())
+            && workspace["worktree"]["is_linked_worktree"].as_bool() == Some(true)
+    }));
+
+    let listed = run_cli_json(
+        &socket_path,
+        &[
+            "worktree",
+            "list",
+            "--workspace",
+            &parent_workspace_id,
+            "--json",
+        ],
+    );
+    let listed_entry = listed["result"]["worktrees"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .find(|entry| entry["branch"].as_str() == Some(branch))
+        .unwrap();
+    assert_eq!(
+        listed_entry["open_workspace_id"].as_str(),
+        Some(child_workspace_id.as_str())
+    );
+
+    let opened = run_cli_json(
+        &socket_path,
+        &[
+            "worktree",
+            "open",
+            "--workspace",
+            &parent_workspace_id,
+            "--branch",
+            branch,
+            "--json",
+        ],
+    );
+    assert_eq!(opened["result"]["type"], "worktree_opened");
+    assert_eq!(opened["result"]["already_open"], true);
+    assert_eq!(
+        opened["result"]["workspace"]["workspace_id"].as_str(),
+        Some(child_workspace_id.as_str())
+    );
+
+    fs::write(checkout.join("README.md"), "dirty\n").unwrap();
+    let safe_remove = run_cli(
+        &socket_path,
+        &[
+            "worktree",
+            "remove",
+            "--workspace",
+            &child_workspace_id,
+            "--json",
+        ],
+    );
+    assert_eq!(safe_remove.status.code(), Some(1));
+    let safe_remove_json: serde_json::Value = serde_json::from_slice(&safe_remove.stderr).unwrap();
+    assert_eq!(
+        safe_remove_json["error"]["code"],
+        "dirty_worktree_requires_force"
+    );
+    assert!(checkout.exists());
+
+    let force_removed = run_cli_json(
+        &socket_path,
+        &[
+            "worktree",
+            "remove",
+            "--workspace",
+            &child_workspace_id,
+            "--force",
+            "--json",
+        ],
+    );
+    assert_eq!(force_removed["result"]["type"], "worktree_removed");
+    assert_eq!(force_removed["result"]["forced"], true);
+    assert!(!checkout.exists());
+
+    cleanup_spawned_herdr(herdr, base);
+}
+
+#[test]
+fn worktree_open_existing_checkout_by_path_and_branch() {
+    let base = unique_test_dir();
+    let config_home = base.join("config");
+    let runtime_dir = base.join("runtime");
+    let socket_path = runtime_dir.join("herdr.sock");
+    let repo = base.join("repo");
+    let checkout = base.join("external-checkout");
+    create_committed_repo(&repo);
+    let branch = "worktree/cli-open-existing";
+    run_git(
+        &repo,
+        &[
+            "worktree",
+            "add",
+            "--quiet",
+            "-b",
+            branch,
+            checkout.to_str().unwrap(),
+            "HEAD",
+        ],
+    );
+
+    let herdr = spawn_herdr(&config_home, &runtime_dir, &socket_path);
+    wait_for_socket(&socket_path, Duration::from_secs(5));
+
+    let opened = run_cli_json_in_dir(
+        &socket_path,
+        &[
+            "worktree",
+            "open",
+            "--cwd",
+            "repo",
+            "--path",
+            "external-checkout",
+            "--json",
+        ],
+        &base,
+    );
+    assert_eq!(opened["result"]["type"], "worktree_opened");
+    assert_eq!(opened["result"]["already_open"], false);
+    assert_eq!(opened["result"]["worktree"]["branch"], branch);
+    assert_eq!(
+        opened["result"]["workspace"]["worktree"]["is_linked_worktree"],
+        true
+    );
+    let child_workspace_id = opened["result"]["workspace"]["workspace_id"]
+        .as_str()
+        .unwrap()
+        .to_string();
+
+    let workspaces = run_cli_json(&socket_path, &["workspace", "list"]);
+    let workspace_list = workspaces["result"]["workspaces"].as_array().unwrap();
+    let parent_workspace_id = workspace_list
+        .iter()
+        .find(|workspace| workspace["worktree"]["is_linked_worktree"].as_bool() == Some(false))
+        .and_then(|workspace| workspace["workspace_id"].as_str())
+        .unwrap()
+        .to_string();
+
+    let listed = run_cli_json(
+        &socket_path,
+        &[
+            "worktree",
+            "list",
+            "--workspace",
+            &parent_workspace_id,
+            "--json",
+        ],
+    );
+    let listed_entry = listed["result"]["worktrees"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .find(|entry| entry["branch"].as_str() == Some(branch))
+        .unwrap();
+    assert_eq!(
+        listed_entry["open_workspace_id"].as_str(),
+        Some(child_workspace_id.as_str())
+    );
+
+    let reopened = run_cli_json(
+        &socket_path,
+        &[
+            "worktree",
+            "open",
+            "--workspace",
+            &parent_workspace_id,
+            "--branch",
+            branch,
+            "--json",
+        ],
+    );
+    assert_eq!(reopened["result"]["type"], "worktree_opened");
+    assert_eq!(reopened["result"]["already_open"], true);
+    assert_eq!(
+        reopened["result"]["workspace"]["workspace_id"].as_str(),
+        Some(child_workspace_id.as_str())
+    );
+
+    let removed = run_cli_json(
+        &socket_path,
+        &[
+            "worktree",
+            "remove",
+            "--workspace",
+            &child_workspace_id,
+            "--force",
+            "--json",
+        ],
+    );
+    assert_eq!(removed["result"]["type"], "worktree_removed");
+
+    cleanup_spawned_herdr(herdr, base);
+}
+
+#[test]
+fn worktree_cli_rejects_local_argument_errors_before_socket_use() {
+    let base = unique_test_dir();
+    fs::create_dir_all(&base).unwrap();
+    let socket_path = base.join("missing.sock");
+    let cases: &[&[&str]] = &[
+        &["worktree", "list", "--workspace", "1", "--cwd", "/tmp"],
+        &["worktree", "create", "--workspace", "1", "--cwd", "/tmp"],
+        &["worktree", "open", "--workspace", "1"],
+        &[
+            "worktree",
+            "open",
+            "--workspace",
+            "1",
+            "--path",
+            "a",
+            "--branch",
+            "b",
+        ],
+        &[
+            "worktree",
+            "open",
+            "--workspace",
+            "1",
+            "--cwd",
+            "/tmp",
+            "--branch",
+            "b",
+        ],
+    ];
+
+    for args in cases {
+        let output = run_cli(&socket_path, args);
+        assert_eq!(
+            output.status.code(),
+            Some(2),
+            "herdr {} should fail as local parse error; stdout={} stderr={}",
+            args.join(" "),
+            String::from_utf8_lossy(&output.stdout),
+            String::from_utf8_lossy(&output.stderr)
+        );
+    }
+
+    cleanup_test_base(&base);
+}
+
+#[test]
 fn tab_management_commands_work() {
     let base = unique_test_dir();
     let config_home = base.join("config");