Skip to content

feat: add the worktree-done Makefile target - #41

Merged
N4M3Z merged 4 commits into
mainfrom
change/worktree-done
Aug 27, 2026
Merged

feat: add the worktree-done Makefile target#41
N4M3Z merged 4 commits into
mainfrom
change/worktree-done

Conversation

@N4M3Z

@N4M3Z N4M3Z commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

The worktree target creates an identity worktree; nothing removed one. The worktree-done target verifies a clean tree and a fully merged branch, then removes the worktree and deletes the branch.

ignore:spec: the target automates the documented cleanup step and changes no check.

Release Notes

  • Use Jujutsu workspaces for make worktree in colocated repositories.
  • Add make worktree-done to remove merged worktrees or workspaces after cleanliness checks.

The worktree target creates an identity worktree; nothing removed
one. The worktree-done target verifies a clean tree and a fully
merged branch, then removes the worktree and deletes the branch.
Landing the work includes this step.

Co-Authored-By: Martin Zeman <N4M3Z@users.noreply.github.com>
@N4M3Z N4M3Z added the ignore:spec Allowed defect: protected paths change without a specification, reason in body label Aug 24, 2026
@github-actions github-actions Bot added size:small auto: changed-lines bucket area:docs auto: documentation and markdown area:templates labels Aug 24, 2026
@N4M3Z

N4M3Z commented Aug 24, 2026

Copy link
Copy Markdown
Contributor Author

@cursor review

@cursor

cursor Bot commented Aug 24, 2026

Copy link
Copy Markdown

Bugbot is paused — on-demand spend limit reached

Bugbot uses usage-based billing for this team and has hit its on-demand spend limit.

A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue.

@runewright runewright Bot added the issue:cursor Provider blocker: clear the cursor problem before re-summoning label Aug 24, 2026
@macroscopeapp

macroscopeapp Bot commented Aug 24, 2026

Copy link
Copy Markdown

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — The PR adds a substantial worktree/workspace cleanup capability that can delete directories and local branches, relies on GitHub merge-state verification, and changes existing Jujutsu worktree behavior. Tests and ownership are strong positives, but the new multi-path logic and irreversible side effects merit human review.

Notes:

  • Macroscope's correctness review did not run, so approvability was decided on eligibility alone.

You can add or adjust custom eligibility rules. Learn more.

@N4M3Z

N4M3Z commented Aug 24, 2026

Copy link
Copy Markdown
Contributor Author

Failing step: Quality, Release notes attestation.

Cause: The pull request body has no Release Notes section with a list entry.

Suggested fix: Add a Release Notes heading and one list entry. Use - N/A for non-user-facing work.

A colocated repo must not use git worktrees: they change refs
behind jj. The worktree target now creates a jj workspace when .jj
exists and a git worktree otherwise. The worktree-done target
forgets the workspace after an unmerged-change check, with the same
git path as the fallback.

Co-Authored-By: Martin Zeman <N4M3Z@users.noreply.github.com>
@github-actions github-actions Bot added size:med auto: changed-lines bucket and removed size:small auto: changed-lines bucket labels Aug 24, 2026
@N4M3Z N4M3Z added the review:runeseer Summons the adjudicating correctness lane label Aug 24, 2026
@runeseer

runeseer Bot commented Aug 24, 2026

Copy link
Copy Markdown

Runeseer review — clean

Looks good. The head commit is unchanged since the last review, and both previously raised issues in the worktree-done target — the stale workspace snapshot before removal, and the branch deletion check against the fetched default branch — remain fixed.

  • No open correctness issues.
  • Cursor's review is paused for billing reasons, so its lane contributed nothing this round.
  • Macroscope withheld approval on eligibility grounds only; its correctness review did not run. The deleting behavior it flags is worth an owner's eye.

No open findings · Reviewed 51b593c1 · review run · $0.42 · 0m43s · 11 turns

@github-actions github-actions Bot removed the review:runeseer Summons the adjudicating correctness lane label Aug 24, 2026
@github-actions github-actions Bot added size:large auto: changed-lines bucket area:workflows auto: CI and automation under .github size:med auto: changed-lines bucket and removed size:med auto: changed-lines bucket labels Aug 26, 2026
@N4M3Z N4M3Z added the review:runeseer Summons the adjudicating correctness lane label Aug 26, 2026

@runeseer runeseer Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Earned approval: review/correctness returned a clean verdict for eb3a2a2. Dismissed automatically on any new push.

@github-actions github-actions Bot removed the review:runeseer Summons the adjudicating correctness lane label Aug 26, 2026
@N4M3Z N4M3Z added the review:macroscope Summons the macroscope lane label Aug 26, 2026
@github-actions github-actions Bot added the area:specs auto: canonical specifications label Aug 26, 2026
@N4M3Z N4M3Z added the review:runeseer Summons the adjudicating correctness lane label Aug 26, 2026

@runeseer runeseer Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Earned approval: review/correctness returned a clean verdict for 51b593c. Dismissed automatically on any new push.

@github-actions github-actions Bot removed review:macroscope Summons the macroscope lane review:runeseer Summons the adjudicating correctness lane labels Aug 26, 2026
@N4M3Z N4M3Z added review Summons the full ordered review sequence and removed issue:cursor Provider blocker: clear the cursor problem before re-summoning labels Aug 26, 2026
@N4M3Z

N4M3Z commented Aug 26, 2026

Copy link
Copy Markdown
Contributor Author

@cursor review

@cursor

cursor Bot commented Aug 26, 2026

Copy link
Copy Markdown

Bugbot is paused — on-demand spend limit reached

Bugbot uses usage-based billing for this team and has hit its on-demand spend limit.

A team admin can raise the spend limit in the Cursor dashboard, or wait for the next billing cycle to continue.

@runewright runewright Bot added issue:cursor Provider blocker: clear the cursor problem before re-summoning and removed review Summons the full ordered review sequence labels Aug 26, 2026
@N4M3Z N4M3Z added review:macroscope Summons the macroscope lane skip:cursor Owner override: the cursor lane never runs review Summons the full ordered review sequence and removed issue:cursor Provider blocker: clear the cursor problem before re-summoning labels Aug 26, 2026
@runewright runewright Bot added stage:macroscope Round record: the macroscope stage settled on this head review:runeseer Summons the adjudicating correctness lane labels Aug 27, 2026
@github-actions github-actions Bot removed review Summons the full ordered review sequence review:macroscope Summons the macroscope lane review:runeseer Summons the adjudicating correctness lane labels Aug 27, 2026

@runeseer runeseer Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Earned approval: review/correctness returned a clean verdict for 51b593c. Dismissed automatically on any new push.

@N4M3Z
N4M3Z merged commit 55e67ab into main Aug 27, 2026
120 of 132 checks passed
@runeseer runeseer Bot mentioned this pull request Aug 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:docs auto: documentation and markdown area:specs auto: canonical specifications area:templates area:workflows auto: CI and automation under .github ignore:spec Allowed defect: protected paths change without a specification, reason in body size:large auto: changed-lines bucket skip:cursor Owner override: the cursor lane never runs stage:macroscope Round record: the macroscope stage settled on this head

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant