Skip to content

feat(pr-merge): VCS detection (GitHub/GitLab) + ship-stage PR body priority#134

Open
iamcxa wants to merge 2 commits into
spacedock-dev:mainfrom
iamcxa:feat/pr-merge-vcs-detection
Open

feat(pr-merge): VCS detection (GitHub/GitLab) + ship-stage PR body priority#134
iamcxa wants to merge 2 commits into
spacedock-dev:mainfrom
iamcxa:feat/pr-merge-vcs-detection

Conversation

@iamcxa
Copy link
Copy Markdown
Contributor

@iamcxa iamcxa commented Apr 19, 2026

pr-merge mod hardcodes gh CLI and ignores GitLab users. This PR adds VCS detection so the mod works with both GitHub and GitLab remotes.

What changed

  • Add VCS detection to startup, idle, and merge hooks (github→gh, gitlab→glab, unknown→warn)
  • Replace hardcoded gh pr view/create with VCS-conditional commands
  • Add PR body resolution: check for Ship stage PR Draft first, fall back to generic template
  • Rename ### PR body template to ### PR body template (fallback) to clarify priority

Review guidance

The VCS detection block (3 lines) is identical across startup/idle hooks — kept inline rather than extracted to avoid forward references in a prose document.

@clkao
Copy link
Copy Markdown
Collaborator

clkao commented Apr 19, 2026

@iamcxa Thanks! Can you split/rebase the PR so it contains only the pr-mod changes?

@iamcxa iamcxa force-pushed the feat/pr-merge-vcs-detection branch from ea3fd5f to 30d2623 Compare April 20, 2026 23:52
@iamcxa
Copy link
Copy Markdown
Contributor Author

iamcxa commented Apr 20, 2026

Done — rebased onto clkao/main HEAD (70575809), branch now contains only the pr-merge changes as requested:

  • cba2490b feat(pr-merge): VCS detection (gitlab/github) + PR body resolution
  • 30d2623e fix(pr-merge): sync docs/plans/_mods/ with mods/ (test requires identical copies)

Files touched: mods/pr-merge.md, docs/plans/_mods/pr-merge.md. Infrastructure commits (prompt-upgrade, skill-binding, workflow-adopt/sync renames) dropped — they're in their own PRs (#119, #120, #130). Ready for re-review.

@clkao
Copy link
Copy Markdown
Collaborator

clkao commented Apr 21, 2026

@iamcxa I am considering if we should ship this, or let the user adopt a github or gitlab specific ones. thoughts?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants