From 31f07c00473e9d8bd6d447cf04081c0a9631e34a Mon Sep 17 00:00:00 2001
From: Trevin Chow <trevin@trevinchow.com>
Date: Wed, 25 Mar 2026 21:41:17 -0700
Subject: [PATCH] fix: add default-branch guard to commit skills (#386)

---
 .../skills/git-commit-push-pr/SKILL.md                | 11 ++++++++++-
 .../compound-engineering/skills/git-commit/SKILL.md   | 11 +++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/plugins/compound-engineering/skills/git-commit-push-pr/SKILL.md b/plugins/compound-engineering/skills/git-commit-push-pr/SKILL.md
index 37c597f..c86b360 100644
--- a/plugins/compound-engineering/skills/git-commit-push-pr/SKILL.md
+++ b/plugins/compound-engineering/skills/git-commit-push-pr/SKILL.md
@@ -18,8 +18,17 @@ command git status
 command git diff HEAD
 command git branch --show-current
 command git log --oneline -10
+command git rev-parse --abbrev-ref origin/HEAD
 ```
 
+The last command returns the remote default branch (e.g., `origin/main`). Strip the `origin/` prefix to get the branch name. If the command fails or returns a bare `HEAD`, try:
+
+```bash
+command gh repo view --json defaultBranchRef --jq '.defaultBranchRef.name'
+```
+
+If both fail, fall back to `main`.
+
 If there are no changes, report that and stop.
 
 ### Step 2: Determine conventions
@@ -47,7 +56,7 @@ Interpret the result:
 
 ### Step 4: Branch, stage, and commit
 
-1. If on `main` or the repo's default branch, create a descriptive feature branch first (`command git checkout -b <branch-name>`). Derive the branch name from the change content.
+1. If on `main`, `master`, or the resolved default branch from Step 1, create a descriptive feature branch first (`command git checkout -b <branch-name>`). Derive the branch name from the change content.
 2. Before staging everything together, scan the changed files for naturally distinct concerns. If modified files clearly group into separate logical changes (e.g., a refactor in one set of files and a new feature in another), create separate commits for each group. Keep this lightweight -- group at the **file level only** (no `git add -p`), split only when obvious, and aim for two or three logical commits at most. If it's ambiguous, one commit is fine.
 3. Stage relevant files by name. Avoid `git add -A` or `git add .` to prevent accidentally including sensitive files.
 4. Commit following the conventions from Step 2. Use a heredoc for the message.
diff --git a/plugins/compound-engineering/skills/git-commit/SKILL.md b/plugins/compound-engineering/skills/git-commit/SKILL.md
index e856963..ca9b64a 100644
--- a/plugins/compound-engineering/skills/git-commit/SKILL.md
+++ b/plugins/compound-engineering/skills/git-commit/SKILL.md
@@ -18,10 +18,21 @@ command git status
 command git diff HEAD
 command git branch --show-current
 command git log --oneline -10
+command git rev-parse --abbrev-ref origin/HEAD
 ```
 
+The last command returns the remote default branch (e.g., `origin/main`). Strip the `origin/` prefix to get the branch name. If the command fails or returns a bare `HEAD`, try:
+
+```bash
+command gh repo view --json defaultBranchRef --jq '.defaultBranchRef.name'
+```
+
+If both fail, fall back to `main`.
+
 If there are no changes (nothing staged, nothing modified), report that and stop.
 
+If the current branch matches `main`, `master`, or the resolved default branch name, warn the user and ask whether to continue committing here or create a feature branch first. Use the platform's blocking question tool (`AskUserQuestion` in Claude Code, `request_user_input` in Codex, `ask_user` in Gemini). If no question tool is available, present the options and wait for the user's reply before proceeding. If the user chooses to create a branch, derive the name from the change content and switch to it before continuing.
+
 ### Step 2: Determine commit message convention
 
 Follow this priority order: