Struct WorktreeReconciler 

pub struct WorktreeReconciler { /* private fields */ }

Orchestrates the diff → verify → merge cycle for a completed worktree.

The reconciler is internal infrastructure and uses Command::new("git") directly (consistent with WorktreeManager), bypassing the tool safety layer.

Implementations

impl WorktreeReconciler

pub fn new(workspace_root: impl Into<PathBuf>, main_branch: &str) -> Self

Create a reconciler for the given workspace.

main_branch defaults to "main" if empty.

pub fn branch_name(worktree_name: &str) -> String

The branch name for a given worktree name (convention: loop/{name}).

pub fn git_diff(&self, base: &str, head: &str) -> Result<String>

Run git diff {base}...{head} and return the unified diff text.

pub fn git_diff_name_only(&self, base: &str, head: &str) -> Result<Vec<PathBuf>>

Run git diff --name-only {base}...{head} and return changed file paths.

pub fn git_diff_stat(&self, base: &str, head: &str) -> Result<String>

Run git diff --stat {base}...{head} and return the summary text.

pub fn branch_has_commits(&self, base: &str, head: &str) -> Result<bool>

Check whether a branch has any commits ahead of the base.

pub fn git_merge(&self, branch: &str) -> Result<()>

Merge a branch into the workspace. Prefers --ff-only; falls back to a standard merge if fast-forward is not possible.

pub fn git_branch_delete(&self, branch: &str) -> Result<()>

Delete a local branch (must be fully merged).

pub fn is_worktree_clean(&self, worktree_path: &Path) -> Result<bool>

Check whether a worktree working directory is clean (no uncommitted changes).

pub fn reconcile( &self, worktree_name: &str, worktree_path: &Path, verifier: &(dyn DiffVerifier + Send + Sync), ) -> Result<ReconcileResult>

Reconcile a completed worktree: diff → verify → merge → cleanup.

1. Verify the worktree is clean.
2. Check the branch has commits ahead of main.
3. Capture the diff and changed files.
4. Ask verifier to approve or reject the diff.
5. If approved, merge the branch and clean up the worktree.
6. If rejected, return the result without merging.

verifier receives (diff_text, changed_files) and returns a verdict. This decouples the reconciler from SubagentController to keep the git module free of subagent dependencies.