mika kuns
10e561f336
Persists the merge commit SHA on WorktreeEntity for every successful single-task and unit merge, and adds a TaskMergeService.RevertMergeAsync + revert_merge MCP tool that undoes a merged task's merge via `git revert -m 1` (never reset/rewrite, since the target checkout is shared). Rejects cleanly when there's no recorded SHA, the repo is mid-merge/mid-revert, or the target has foreign uncommitted changes; a conflicting revert aborts immediately. Also exposes the new mergeCommit field via get_task_worktree.
26 lines
683 B
C#
26 lines
683 B
C#
namespace ClaudeDo.Data.Models;
|
|
|
|
public enum WorktreeState
|
|
{
|
|
Active,
|
|
Merged,
|
|
Discarded,
|
|
Kept,
|
|
}
|
|
|
|
public sealed class WorktreeEntity
|
|
{
|
|
public required string TaskId { get; init; }
|
|
public required string Path { get; set; }
|
|
public required string BranchName { get; set; }
|
|
public required string BaseCommit { get; set; }
|
|
public string? HeadCommit { get; set; }
|
|
public string? DiffStat { get; set; }
|
|
public string? MergeCommit { get; set; }
|
|
public WorktreeState State { get; set; } = WorktreeState.Active;
|
|
public required DateTime CreatedAt { get; init; }
|
|
|
|
// Navigation property
|
|
public TaskEntity Task { get; set; } = null!;
|
|
}
|