eat v0.2 rigor

[MohammedAlkindi]

Summary by CodeRabbit

• New Features

  • Added fleet undo to roll back the most recent merge, including restoration of related branches and worktrees when applicable.
  • Added merge-conflict prediction for supported Git versions.
  • Added --files-only to retain file-level collision checks.
  • Added mutation locking to prevent concurrent repository changes.
  • Enhanced fleet doctor with conflict-prediction, lock, and undo status checks.

• Documentation

  • Updated the README, architecture guide, and changelog with the new workflows and collision-detection behavior.
  • Documented updated project naming and publishing details.

[coderabbitai]

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 84735e0c-99fc-4e6f-8675-714630181763

📥 Commits

Reviewing files that changed from the base of the PR and between 05144f8 and ae996db.

📒 Files selected for processing (18)

• CHANGELOG.md
• README.md
• docs/architecture.md
• src/cli.ts
• src/commands/check.ts
• src/commands/doctor.ts
• src/commands/merge.ts
• src/commands/undo.ts
• src/lib/git.ts
• src/lib/lock.ts
• src/lib/mergetree.ts
• src/lib/undo.ts
• tests/check.test.ts
• tests/doctor.test.ts
• tests/git-version.test.ts
• tests/merge.test.ts
• tests/mergetree.test.ts
• tests/undo.test.ts

---

📝 Walkthrough

Walkthrough

The PR adds Git-version-gated merge-tree conflict prediction, files-only compatibility, single-level rollback through fleet undo, merge undo metadata, and expanded fleet doctor diagnostics for Git capability, mutation locks, and pending undo state.

Changes

Fleet merge safety

Layer / File(s)	Summary
Merge-tree collision prediction src/lib/git.ts, src/lib/mergetree.ts, src/commands/check.ts, src/cli.ts, tests/check.test.ts, tests/mergetree.test.ts, tests/git-version.test.ts, README.md, docs/architecture.md, CHANGELOG.md	fleet check selects merge-tree or file-level prediction, classifies conflicts and uncommitted edits, reports clean merges, and supports --files-only.
Merge undo recording and restoration src/commands/merge.ts, src/commands/undo.ts, src/lib/undo.ts, src/lib/git.ts, src/cli.ts, tests/merge.test.ts, tests/undo.test.ts, README.md, docs/architecture.md	fleet merge records rollback refs and metadata, while fleet undo validates state and restores the target branch, agent branch, worktree, and persisted state.
Diagnostics for capability, locks, and undo state src/commands/doctor.ts, src/lib/lock.ts, tests/doctor.test.ts, docs/architecture.md, CHANGELOG.md	fleet doctor reports merge-tree availability, lock status, stale-lock cleanup, and pending undo records; lock ownership inspection is exposed through holdingLock().

Estimated code review effort: 4 (Complex) | ~45 minutes

Sequence Diagram(s)

Merge-tree check flow

sequenceDiagram
  participant FleetCheck
  participant GitCapability
  participant MergeTree
  FleetCheck->>GitCapability: Check merge-tree support
  FleetCheck->>MergeTree: Predict shared branch conflicts
  MergeTree-->>FleetCheck: Return conflicted paths
  FleetCheck-->>FleetCheck: Classify verdicts and render results

Loading

Merge undo flow

sequenceDiagram
  participant FleetMerge
  participant GitRefs
  participant UndoRecord
  participant FleetUndo
  FleetMerge->>GitRefs: Pin pre-merge commits
  FleetMerge->>UndoRecord: Write successful merge record
  FleetUndo->>UndoRecord: Read pending record
  FleetUndo->>GitRefs: Reset and restore branch state
  FleetUndo->>UndoRecord: Clear record and refs

Loading

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch claude/feat-v0.2-rigor

---

_{Comment @coderabbitai help to get the list of available commands.}