Finishing Work

Overview

Verify tests, present integration options, execute choice, clean up.

Core principle: Verify tests → Present options → Execute → Clean up.

Steps

Step 1: Verify Tests

Before presenting options, verify tests pass:

# Go
go test ./...

# Python
uv run pytest

If tests fail: fix first. Don't proceed to Step 2.

Step 2: Present Options

Present exactly these 4 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)
4. Discard this work

Which option?

Step 3: Execute Choice

Option 1 — Merge Locally:

git checkout <base-branch>
git pull
git merge <feature-branch>
# Verify tests on merged result
git branch -d <feature-branch>

Option 2 — Push and Create PR:

git push -u origin <feature-branch>
gh pr create --title "<title>" --body "$(cat <<'EOF'
## Summary
<2-3 bullets>

## Test Plan
- [ ] <verification steps>
EOF
)"

Option 3 — Keep As-Is: Report: "Keeping branch. Worktree preserved."

Option 4 — Discard: Confirm first — require typed "discard" confirmation.

Step 4: Reflect and Document

Before cleanup, briefly note friction encountered during this work:

• •What went off-script? (unexpected failures, wrong assumptions, missing context)
• •What slowed you down? (unclear requirements, tooling gaps, flaky tests)
• •What should change? (skill updates, new rules, missing automation)
• •Were you corrected? If the user corrected you on something generalizable, propose a skill or rule edit so it doesn't recur.

If genuinely clean run, say so — but clean runs should be rare. Most work has micro-friction worth capturing.

Log friction to the relevant bd issue notes or ~/.oro/projects/<name>/decisions&discoveries.md if it's a broader insight.

Then invoke review-docs to check that documentation still matches the code that just landed. Stale docs are worse than no docs.

Then invoke documenting-solutions to capture any non-trivial problems solved during this work. This is not optional — if you learned something worth knowing next time, document it.

Step 5: Landing the Plane

After integration choice is executed:

1. •File issues — Create bd entries for remaining/discovered work
2. •Quality gates — Run ./quality_gate.sh (Go) or uv run pytest && ruff check . && ruff format --check . (Python)
3. •Commit — Conventional Commits format
4. •Push — git pull --rebase && git push (pre-commit hook auto-syncs beads)
5. •Verify — git status shows "up to date with origin"

Quick Reference

Red Flags

• •Proceeding with failing tests
• •Merging without verifying tests on result
• •Deleting work without confirmation
• •Force-pushing without explicit request
• •Saying "ready to push" instead of just pushing