Finishing A Development Branch

Finishing a Development Branch

Overview

Core principle: Verify tests → Verify UML model alignment → Detect environment → Present options → Execute choice → Clean up.

Announce at start: "I'm using the finishing-a-development-branch skill to complete this work."

The Iron Law

NO UML MODEL ELEMENTS OR DIAGRAMS THAT DO NOT MATCH THE CODE

If the UML model element or diagram is inconsistent with the code, it must be brought into alignment with the code.

Step 1: Verify Tests

Run the project's full test suite (npm test / cargo test / pytest / go test ./...).

If tests fail, report the failures and stop — the menu comes after a green suite:

Tests failing (<N> failures). Must fix before completing:

[Show failures]

If tests pass: continue to Step 2.

Step 2: Verify UML Model Alignment

First, confirm Astah has this branch's model open. Call get_proj_path and compare it against this working tree:

git rev-parse --show-toplevel

If it does not match, stop and report both paths to your human partner. The model you are about to verify is not the model this branch carries: Astah keeps one project open for the whole machine and writes back to the path it opened, regardless of anyone's working directory. Verifying against the wrong .asta is worse than not verifying — it produces a green Iron Law check for a pair that was never actually compared, and the merge proceeds on a stale model. Let your human partner decide which copy is authoritative before you verify anything.

Then use Astah Pro MCP tools to verify that the implementation is consistent with the model and diagrams:

• Compare the model and diagrams with the actual source files.
• Check that model elements (classes, interfaces, enumerations, attributes, operations, relationships, and dependencies) are consistent with the structural definitions in the code.
• Check that use case diagrams reflect functionality actually provided by the code.
• Check that class diagrams reflect the class structure and relationships in the code.
• Check that sequence diagrams reflect the method call order in the code.
• Check that activity diagrams reflect the code logic.
• Check that state machine diagrams reflect the state transitions in the code.
• Check that note contents in diagrams are consistent with the code.
• Check that UML diagrams conform to the diagram layout guide.

If mismatches found:

UML model alignment issues found:
- [list each mismatch with file:code line and model-element/diagram reference]

Cannot proceed until resolved. Update model, then re-run verification.

Stop. Don't proceed to Step 3.

If aligned: continue to Step 3.

Step 3: Detect Environment

GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P)
GIT_COMMON=$(cd "$(git rev-parse --git-common-dir)" 2>/dev/null && pwd -P)
# Capture now, while still inside the workspace — Step 6 changes directory
# before cleanup (Step 7) needs this value
WORKTREE_PATH=$(git rev-parse --show-toplevel)

This determines which menu to show and how cleanup works:

Step 4: Determine Base Branch

The base branch is whatever this work forked from — usually named in the plan, the conversation, or the branch's upstream. If it is not already known, ask: "This branch split from - is that correct?" Confirm before merging: merging into the wrong base is expensive to undo.

Step 5: Present Options

Normal repo and named-branch worktree — present exactly these 3 options:

Implementation complete. What would you like to do?

1. Merge back to <base-branch> locally
2. Push and create a Pull Request
3. Keep the branch as-is (I'll handle it later)

Which option?

Detached HEAD — present exactly these 2 options:

Implementation complete. You're on a detached HEAD (externally managed workspace).

1. Push as new branch and create a Pull Request
2. Keep as-is (I'll handle it later)

Which option?

Present the menu exactly as written — concise, with every option coming from the list above. Discarding the work happens only in response to your human partner explicitly asking for it (see "If your human partner asks to discard the work" below). Wait for their answer; the integration decision is theirs.

Step 6: Execute Choice

Option 1: Merge Locally

# Get main repo root for CWD safety
MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)
cd "$MAIN_ROOT"

# Merge first — verify success before removing anything
git checkout <base-branch>
git pull
git merge <feature-branch>

# Verify tests on merged result
<test command>

If tests fail on the merged result: stop, leave the worktree and branch in place, and investigate — nothing has been pushed, so the merge is local and recoverable.

Once the merged result is green: clean up the worktree (Step 7), then delete the branch:

git branch -d <feature-branch>

Option 2: Push and Create PR

git push -u origin <feature-branch>
# From a detached HEAD, name the new branch on the remote:
# git push origin HEAD:refs/heads/<new-branch>

Then create the pull/merge request against with the forge's tooling — its CLI if one is available, or the creation URL most forges print when you push — following the repo's PR template and conventions if present, and report the URL to your human partner.

Keep the worktree — your human partner iterates on PR feedback there.

Option 3: Keep As-Is

Report: "Keeping branch . Worktree preserved at ."

If your human partner asks to discard the work

This path exists only as a response to an explicit request to throw the work away. Confirm first:

This will permanently delete:
- Branch <name>
- All commits: <commit-list>
- Worktree at <path>

Type 'discard' to confirm.

Wait for that exact confirmation. When it arrives:

MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)
cd "$MAIN_ROOT"

Then clean up the worktree (Step 7) and force-delete the branch:

git branch -D <feature-branch>

Step 7: Cleanup Workspace

Runs for Option 1 and confirmed discards. Options 2 and 3 always preserve the worktree. Both callers have already changed directory to the main repo root — worktree removal must run from outside the worktree — and use the GIT_DIR/GIT_COMMON/WORKTREE_PATH values captured in Step 3, from before that directory change.

If GIT_DIR == GIT_COMMON: Normal repo, no worktree to clean up. Done.

If WORKTREE_PATH is under .worktrees/ or worktrees/: Superpowers created this worktree — we own cleanup:

git worktree remove "$WORKTREE_PATH"
git worktree prune  # Self-healing: clean up any stale registrations

Otherwise: The host environment owns this workspace — leave it in place. If your platform provides a workspace-exit tool, use it.

Quick Reference

Common Rationalizations