2652 Git Commit Pushprompt Cbbdc7bb

Git Commit, Push & PR

Stage changes, create a conventional commit, push to the current branch, and optionally open a pull request to main using the GitHub MCP server.

Scope & Preconditions

• Workspace must be a git repository with a configured origin remote.
• GitHub MCP tools must be available in the current session (no gh auth needed).
• The git-commit skill at .github/skills/git-commit/SKILL.md defines the conventional commit format used in this repo.
• This prompt targets GPT-5 mini. Keep each step explicit and self-contained.

Inputs

Workflow

Step 1 — Inspect the working tree

Run the following commands and show the output to the user:

git status --short
git branch --show-current
git log --oneline origin/$(git branch --show-current)..HEAD 2>/dev/null || git log --oneline -5

If git status --short returns nothing, stop and tell the user there is nothing to commit.

Step 2 — Show a change summary

Run:

git diff --stat HEAD

Display the file count, insertions, and deletions as a brief summary.

Step 3 — Ask about staging

Present the list of unstaged/untracked files from Step 1 and ask:

Which files should be staged?

A) All changed files (recommended) B) Only already-staged files (skip git add) C) Specific files — I will list them

Wait for the user's answer before continuing.

• A: Run git add -A
• B: Do not run git add. Continue with whatever is already staged. If nothing is staged, stop and tell the user.
• C: Ask the user for the file paths, then run git add <paths>.

Step 4 — Generate or confirm the commit message

Read .github/skills/git-commit/SKILL.md to load the conventional commit format rules for this repository.

If the user provided a message via the argument-hint, use it as the subject line (wrapping it in the conventional format if needed).

Otherwise, run:

git diff --cached --stat
git diff --cached -- . ':(exclude)*.lock' ':(exclude)package-lock.json' | head -200

Use the output to generate a conventional commit message following the format:

<type>(<scope>): <short description in sentence case>

- <bullet summarising change 1>
- <bullet summarising change 2>

Present the proposed message to the user and ask:

Commit message — does this look right?

A) Yes, use it as-is B) Let me edit it — I'll paste the revised message

Wait for confirmation before continuing.

Step 5 — Commit

Run:

git commit -m "<confirmed message>"

If the pre-commit hook fails, show the full error output and stop. Ask the user to fix the issue and re-run the prompt.

Show the resulting commit hash and subject line.

Step 6 — Push

Ask:

Push to origin/<branch>?

A) Yes, push now B) No, skip push

If A, run:

git push origin $(git branch --show-current)

Show the push result. If the push fails, display the error and stop.

Step 7 — Pull request (optional)

Ask:

Open a pull request?

A) Yes — merge <current branch> → main B) Yes — different target branch (I'll specify) C) No, skip

If C, stop here and confirm the commit and push were successful.

If A or B:

1. Ask:

   PR title (leave blank to use the commit subject):

2. Ask:

   PR description (leave blank to auto-generate from commit list): Add any context, linked issues (Closes #N), or test notes here.

3. Ask:

   Draft PR? Y / N (default: N)

4. Check for an existing open PR from the current branch to the target using github/search_pull_requests with query: is:open head:<branch> base:<base>.

   • If one exists, tell the user and skip creation.
   • If none exists, call github/create_pull_request with:
     • owner: repository owner
     • repo: repository name
     • head: current branch
     • base: target branch
     • title: confirmed PR title
     • body: confirmed PR body
     • draft: user's choice

5. Show the PR URL returned by the MCP tool.

Output Expectations

At the end of the workflow, print a summary table:

Error Handling

• Nothing to commit: Stop at Step 1 and say "Working tree is clean."
• Pre-commit hook failure: Display full hook output. Do not retry automatically.
• Push rejected: Show the error. Suggest git pull --rebase if behind.
• MCP PR creation fails: Display the error. Provide the compare URL as fallback: https://github.com/<owner>/<repo>/compare/<base>...<head>

Quality Assurance

• Never force-push (--force) unless the user explicitly asks.
• Never commit directly to main — warn and stop if the current branch is main.
• Always show the commit hash after a successful commit.
• Always show the PR URL after a successful PR creation.
• Do not skip user confirmation at Steps 3, 4, 6, or 7.