Add stage-commit-push and commit-staged-push skills, deduplicate trigger phrases

Author: tobihagemann

README.md

@@ -366,9 +366,9 @@ Each session handles one prompt to keep context focused.
 | Skill | What it does |
 |---|---|
 | [`/code-style`](skills/code-style/SKILL.md) | Enforce mirror, reuse, and symmetry principles |
+| [`/write-tests`](skills/write-tests/SKILL.md) | Write missing tests matching project conventions |
 | [`/simplify-code`](skills/simplify-code/SKILL.md) | Multi-agent review for reuse, quality, efficiency, clarity |
 | [`/review-code`](skills/review-code/SKILL.md) | AI code review, apply fixes, simplify, and verify |
-| [`/write-tests`](skills/write-tests/SKILL.md) | Write missing tests for changed code |
 | [`/peer-review`](skills/peer-review/SKILL.md) | AI code review interface that delegates to `/codex` by default |
 | [`/codex`](skills/codex/SKILL.md) | AI code review and task execution via codex CLI |
 | [`/evaluate-findings`](skills/evaluate-findings/SKILL.md) | Confidence-based triage of review feedback |
@@ -379,9 +379,11 @@ Each session handles one prompt to keep context focused.
 | Skill | What it does |
 |---|---|
 | [`/stage`](skills/stage/SKILL.md) | Stage implementation changes with precise file selection |
-| [`/commit-rules`](skills/commit-rules/SKILL.md) | Shared commit message rules and technical constraints |
 | [`/stage-commit`](skills/stage-commit/SKILL.md) | Stage files and commit in one step |
+| [`/stage-commit-push`](skills/stage-commit-push/SKILL.md) | Stage, commit, and push in one step |
 | [`/commit-staged`](skills/commit-staged/SKILL.md) | Commit already-staged files with good message |
+| [`/commit-staged-push`](skills/commit-staged-push/SKILL.md) | Commit already-staged files and push |
+| [`/commit-rules`](skills/commit-rules/SKILL.md) | Shared commit message rules and technical constraints |
 | [`/create-pr`](skills/create-pr/SKILL.md) | Draft and create a GitHub PR |
 | [`/update-pr`](skills/update-pr/SKILL.md) | Update existing PR title and description |
 | [`/fetch-pr-comments`](skills/fetch-pr-comments/SKILL.md) | Read-only summary of unresolved PR comments |

skills/commit-staged-push/SKILL.md

@@ -0,0 +1,18 @@
+---
+name: commit-staged-push
+description: Commit already-staged changes and push in one step. Use when the user asks to "commit and push staged changes", "commit and push what's staged", or "commit staged and push".
+---
+
+# Commit and Push
+
+## Step 1: Commit
+
+Run the `/commit-staged` skill.
+
+## Step 2: Push
+
+Push to the current branch's remote:
+
+```bash
+git push
+```

skills/commit-staged/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: commit-staged
-description: Commit already-staged changes with a message matching existing commit style. Use when the user asks to "commit staged changes", "commit what's staged", "commit these changes", "commit my changes", or "make a commit".
+description: Commit already-staged changes with a message matching existing commit style. Use when the user asks to "commit staged changes" or "commit what's staged".
 ---
 
 # Commit Staged Changes

skills/resolve-pr-comments/SKILL.md

@@ -40,18 +40,14 @@ Run the `/evaluate-findings` skill on the unresolved threads to assess each comm
 
 Run the `/self-improve` skill.
 
-## Step 4: Stage and Commit
+## Step 4: Stage, Commit, and Push
 
-If any fixes were applied, use `AskUserQuestion` to ask if the user wants to stage and commit the changes now.
+If any fixes were applied, use `AskUserQuestion` to ask if the user wants to stage, commit, and push the changes now.
 
-- **Yes** — run the `/stage-commit` skill
+- **Yes** — run the `/stage-commit-push` skill
 - **No** — leave changes unstaged, proceed to replies
 
-## Step 5: Wait for Push
-
-Use `AskUserQuestion` to ask if the user has already pushed. Wait for confirmation before proceeding to replies.
-
-## Step 6: Reply to Each Thread
+## Step 5: Reply to Each Thread
 
 Run `/github-voice` to load writing style rules before composing replies. Keep replies to one or two sentences. Avoid bullet-point reasoning or bolded labels.
 
@@ -75,7 +71,7 @@ Only add a brief description after the SHA if the fix meaningfully diverges from
 
 **Reply format for skips:** Just state the reasoning for not changing it.
 
-## Step 7: Summary
+## Step 6: Summary
 
 After processing all threads, present a summary table:
 

skills/stage-commit-push/SKILL.md

@@ -0,0 +1,18 @@
+---
+name: stage-commit-push
+description: Stage files, create a commit, and push in one step. Use when the user asks to "stage commit and push", "add commit and push", "commit and push", or "commit and push my changes".
+---
+
+# Stage, Commit, and Push
+
+## Step 1: Stage and Commit
+
+Run the `/stage-commit` skill.
+
+## Step 2: Push
+
+Push to the current branch's remote:
+
+```bash
+git push
+```

skills/stage-commit/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: stage-commit
-description: Stage files and create a commit in one step with a message matching existing commit style. Use when the user asks to "stage and commit", "add and commit", "commit these files", or "stage my changes and commit".
+description: Stage files and create a commit in one step with a message matching existing commit style. Use when the user asks to "stage and commit", "add and commit", "commit my changes", or "commit these changes".
 ---
 
 # Stage and Commit Changes