Repository navigation
fix(finalize): merge on plan-gated branch rules; finish worktree removals Git started (0525) - #393
Merged
danielhanold merged 11 commits intoOct 5, 2026
Conversation
Docket-Plan-Path: docs/superpowers/plans/2026-10-05-finalize-stops-on-a-private-repo-without-the-branch-rules-ap.md
…nup reports remnants
…eanup path Review finding: a workspace-remnant warning was lost on the safety-net sweep path because sweepRunCleanup copied only Result/Reason/Message from the FinalizeCleanup result, and a cleaned result has no reason. The sweep entry now carries the remnant as its reason and appends the remnant message naming the leftover folder; CleanupOpResult.HumanText also names the remnant warning.
Review finding (minor): internal/workspace/cleanup.go:stillRegistered's checks are not each mutation-tested — the only still-registered test left a registration matching both the feature-ref and the path check. Add a table unit test whose true rows each match exactly one check (feature ref only, lexical path only, canonical/symlinked path only) plus false rows for an unrelated unresolvable registration and a detached registration carrying the feature ref.
…anup disposition; F4 cleanup warning comments
danielhanold
force-pushed
the
fix/finalize-stops-on-a-private-repo-without-the-branch-rules-ap
branch
from
October 5, 2026 12:00
86f4efc to
f4fdb0f
Compare
danielhanold
deleted the
fix/finalize-stops-on-a-private-repo-without-the-branch-rules-ap
branch
October 5, 2026 12:01
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
↩ Change 0525 — Finalize stops on a private repo without the branch-rules API, and leaves half-removed workspaces
Summary
branch-rules-unavailablewarning, which the skill records in the closeout notes. Every other failed rules read still stops asmerge-probe-unknown.git worktree removefails after Git has already dropped the registration, cleanup finishes deleting the owned.worktrees/<slug>folder, marks the workspace cleaned, and removes the branches. A folder that still can't be deleted is reported in aworkspace-remnantwarning, which shows on finalize cleanup, its human text, and the maintenance sweep. A Git refusal while the path is still registered stays blocked and untouched. ADR-0140 records this as an exception to ADR-0035.workspace-blockedmessage now names what blocked it.docs/guide/landing-changes.mdare updated to match.Review (deep tier)
workspace-remnantwarning was dropped on the maintenance-sweep path and missing from human textstillRegisteredchecks were not each mutation-testedcleanupWarning/FindingWorkspaceRemnantThe first post-fix gate run went red on the TempDir fixture guard because the new test used a bare
t.TempDir(). A premium repair commit (86f4efc) fixed it, and the next gate run was green.command: go run ./cmd/docket development test
result: green
head_sha: f4fdb0f
ran_at: 2026-10-05T12:00:34Z