From f09f571717e6070305796fd99244a7016ab4319f Mon Sep 17 00:00:00 2001
From: JacobPEvans <20714140+JacobPEvans@users.noreply.github.com>
Date: Wed, 29 Apr 2026 01:15:54 -0400
Subject: [PATCH 1/2] chore(git-standards): forbid emoji in commits and PR
 titles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds an explicit "Commit & PR Title Style" section to the pr-standards
skill (loaded on demand whenever an agent drafts a PR), and a one-line
cross-reference bullet in git-workflow-standards.

Companion to the soul.md flip in ai-assistant-instructions. Together
these eliminate the gap that caused recent automated AI-fix PRs (#263,
#257) to land with `🤖` prefixes — soul.md was endorsing gitmoji and
neither plugin skill said otherwise.

Applies to human, AI-assisted, and bot-authored PRs alike. Conventional-
commit prefixes carry the signal.

(claude)
---
 git-standards/skills/git-workflow-standards/SKILL.md | 1 +
 git-standards/skills/pr-standards/SKILL.md           | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/git-standards/skills/git-workflow-standards/SKILL.md b/git-standards/skills/git-workflow-standards/SKILL.md
index 1887663..ac4be60 100644
--- a/git-standards/skills/git-workflow-standards/SKILL.md
+++ b/git-standards/skills/git-workflow-standards/SKILL.md
@@ -48,6 +48,7 @@ worktrees with uncommitted changes are NEVER stale. Use `git worktree remove` (n
 - Long-running branches: rebase from main weekly
 - Before PRs: ensure branch is on latest main
 - Never branch from feature branches — always from main
+- Commit messages: conventional-commit prefixes only, no emoji (see `pr-standards`)
 
 | Method | When |
 | --- | --- |
diff --git a/git-standards/skills/pr-standards/SKILL.md b/git-standards/skills/pr-standards/SKILL.md
index b8ce16a..646e6a6 100644
--- a/git-standards/skills/pr-standards/SKILL.md
+++ b/git-standards/skills/pr-standards/SKILL.md
@@ -64,6 +64,13 @@ for feedback. Just resolve the thread.
 Exception: explicit requests like
 `@gemini-code-assist review the security implications of this change`.
 
+## Commit & PR Title Style
+
+No emoji or gitmoji in commit messages, PR titles, or PR descriptions.
+Use conventional-commit prefixes (`feat:`, `fix:`, `chore:`, `docs:`, etc.).
+Applies to all PRs — human, AI-assisted, and bot-authored automated fixes.
+No `🤖`, no `✨`, no `🐛`. The `type(scope):` prefix carries the signal.
+
 ## GitHub Issue Standards
 
 ### Title Prefixes

From b422698a5a222465a207eef64cbfc2e2caea5be5 Mon Sep 17 00:00:00 2001
From: JacobPEvans <20714140+JacobPEvans@users.noreply.github.com>
Date: Wed, 29 Apr 2026 01:24:16 -0400
Subject: [PATCH 2/2] fix(git-standards): clarify emoji-ban scope and
 conventional-commit phrasing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Addresses copilot review feedback (threads VOoy, VOpG, VOpT) on PR #266.

Changes:
- Rename section header from "Commit & PR Title Style" to
  "Commit, PR Title & PR Description Style" (header now matches body scope)
- Split rule into two parts: emoji ban (commits + titles + descriptions
  + release notes) and conventional-commit prefix requirement (commit
  subjects + PR titles only)
- Replace ambiguous "Use conventional-commit prefixes only" with "are
  required at the start of commit subjects and PR titles only" — the
  original "only" was meant to scope where prefixes apply, but read as
  if the prefix should be the entire message
- Add release notes to the ban for parity with the soul.md update in
  ai-assistant-instructions PR #604

(claude)
---
 git-standards/skills/pr-standards/SKILL.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/git-standards/skills/pr-standards/SKILL.md b/git-standards/skills/pr-standards/SKILL.md
index 646e6a6..52e531b 100644
--- a/git-standards/skills/pr-standards/SKILL.md
+++ b/git-standards/skills/pr-standards/SKILL.md
@@ -64,10 +64,12 @@ for feedback. Just resolve the thread.
 Exception: explicit requests like
 `@gemini-code-assist review the security implications of this change`.
 
-## Commit & PR Title Style
+## Commit, PR Title & PR Description Style
 
-No emoji or gitmoji in commit messages, PR titles, or PR descriptions.
-Use conventional-commit prefixes (`feat:`, `fix:`, `chore:`, `docs:`, etc.).
+No emoji or gitmoji in commit messages, PR titles, PR descriptions, or
+release notes. Conventional-commit prefixes (`feat:`, `fix:`, `chore:`,
+`docs:`, etc.) are required at the start of commit subjects and PR titles
+only — descriptions and release notes are plain prose.
 Applies to all PRs — human, AI-assisted, and bot-authored automated fixes.
 No `🤖`, no `✨`, no `🐛`. The `type(scope):` prefix carries the signal.