Skip to content

feat(finishing-branch): add issue-closing keywords to PR template #657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvanhorn wants to merge 3 commits into
base: main
Choose a base branch
from
+13 −3
Open

feat(finishing-branch): add issue-closing keywords to PR template #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1fe962
fix(opencode): correct TodoWrite tool mapping to todowrite
mvanhorn Mar 9, 2026
84ffc0f
feat(finishing-branch): add issue-closing keywords to PR template
mvanhorn Mar 9, 2026
0c40f02
fix(finishing-branch): clarify closing keywords for actually resolved…
mvanhorn Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .opencode/INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ git pull
### Tool mapping

When skills reference Claude Code tools:
- `TodoWrite` → `update_plan`
- `TodoWrite` → `todowrite`
- `Task` with subagents → `@mention` syntax
- `Skill` tool → OpenCode's native `skill` tool
- File operations → your native tools
Expand Down
2 changes: 1 addition & 1 deletion .opencode/plugins/superpowers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const SuperpowersPlugin = async ({ client, directory }) => {

const toolMapping = `**Tool Mapping for OpenCode:**
When skills reference tools you don't have, substitute OpenCode equivalents:
- \`TodoWrite\` → \`update_plan\`
- \`TodoWrite\` → \`todowrite\`
- \`Task\` tool with subagents → Use OpenCode's subagent system (@mention)
- \`Skill\` tool → OpenCode's native \`skill\` tool
- \`Read\`, \`Write\`, \`Edit\`, \`Bash\` → Your native tools
Expand Down
2 changes: 1 addition & 1 deletion docs/README.opencode.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ Superpowers uses OpenCode's native `skill` tool for skill discovery and loading.

Skills written for Claude Code are automatically adapted for OpenCode. The bootstrap provides mapping instructions:

- `TodoWrite` → `update_plan`
- `TodoWrite` → `todowrite`
- `Task` with subagents → OpenCode's `@mention` system
- `Skill` tool → OpenCode's native `skill` tool
- File operations → Native OpenCode tools
Expand Down
10 changes: 10 additions & 0 deletions skills/finishing-a-development-branch/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,14 @@ Then: Cleanup worktree (Step 5)

#### Option 2: Push and Create PR

**Check for related GitHub issues** before creating the PR:
- Look at the branch name for issue numbers (e.g., `fix-123`, `issue-456`, `600-feat-...`)
- Check commit messages for issue references (`#123`, `fixes #123`)
- Check plan files or task descriptions for issue links
- Only use closing keywords for issues this PR actually resolves; ignore incidental references from unrelated commits or notes
- If the PR resolves multiple issues, include one closing line per issue
- If no resolved issue is found, omit the closing line entirely - don't fabricate one

```bash
# Push branch
git push -u origin <feature-branch>
Expand All @@ -99,6 +107,8 @@ gh pr create --title "<title>" --body "$(cat <<'EOF'

## Test Plan
- [ ] <verification steps>

<One `Closes #NNN` line per issue this PR resolves, otherwise omit this block>
EOF
)"
```
Expand Down