chore: stop default AI co-author trailers

Author: Li-Sanze

.githooks/commit-msg

@@ -15,28 +15,6 @@ if [[ -z "$ROOT_DIR" || ! -d "$ROOT_DIR" ]]; then
   exit 0
 fi
 
-ensure_trailer_block() {
-  local file="$1"
-  shift
-  local missing=()
-  local line
-
-  for line in "$@"; do
-    if ! grep -Fqx "$line" "$file"; then
-      missing+=("$line")
-    fi
-  done
-
-  if [[ ${#missing[@]} -eq 0 ]]; then
-    return 0
-  fi
-
-  printf '\n' >>"$file"
-  for line in "${missing[@]}"; do
-    printf '%s\n' "$line" >>"$file"
-  done
-}
-
 upsert_trailer() {
   local file="$1"
   local key="$2"
@@ -72,13 +50,6 @@ upsert_trailer() {
   printf '\n%s: %s\n' "$key" "$value" >>"$file"
 }
 
-if [[ "${SOPIFY_DISABLE_AI_ATTRIBUTION:-0}" != "1" ]]; then
-  ensure_trailer_block \
-    "$MESSAGE_FILE" \
-    "Co-authored-by: Claude <claude@anthropic.com>" \
-    "Co-authored-by: ChatGPT <chatgpt@openai.com>"
-fi
-
 STATE_FILE="$(git -C "$ROOT_DIR" rev-parse --git-path .sopify-release-sync-state)"
 
 if [[ ! -f "$STATE_FILE" ]]; then

CONTRIBUTING.md

@@ -98,21 +98,17 @@ Behavior summary:
 - `pre-commit` runs `scripts/release-preflight.sh` and then `scripts/release-sync.sh`.
 - Release-managed files are re-staged into the same commit when checks pass.
 - When `CHANGELOG.md -> [Unreleased]` is empty, `release-sync` auto-drafts grouped notes from the current staged files.
-- `commit-msg` appends `Co-authored-by` trailers for Claude and ChatGPT by default, and only appends `Release-Sync`, `Release-Version`, and `Release-Date` when the pre-commit handoff exists.
+- `commit-msg` only appends `Release-Sync`, `Release-Version`, and `Release-Date` when the pre-commit handoff exists.
 
 AI attribution:
 
-- Default commit trailers:
-  - `Co-authored-by: Claude <claude@anthropic.com>`
-  - `Co-authored-by: ChatGPT <chatgpt@openai.com>`
-- Set `SOPIFY_DISABLE_AI_ATTRIBUTION=1` for a single commit when you need to skip the automatic AI attribution footers.
-- `SOPIFY_DISABLE_RELEASE_HOOK=1` disables the entire release hook chain and therefore also skips the default AI attribution trailers; use it only for maintainer/debug flows.
-- Repository-level AI collaborator acknowledgements live in [CONTRIBUTORS.md](./CONTRIBUTORS.md).
+- AI collaboration is acknowledged at the repository level in [CONTRIBUTORS.md](./CONTRIBUTORS.md).
+- The repository no longer appends standard `Co-authored-by` trailers for AI assistants by default, so GitHub contributor attribution remains tied to human commit authors unless you add co-author trailers manually.
+- `SOPIFY_DISABLE_RELEASE_HOOK=1` disables the entire release hook chain; use it only for maintainer/debug flows.
 
 Common environment toggles:
 
 - `SOPIFY_DISABLE_RELEASE_HOOK=1`
-- `SOPIFY_DISABLE_AI_ATTRIBUTION=1`
 - `SOPIFY_SKIP_RELEASE_PREFLIGHT=1`
 - `SOPIFY_AUTO_DRAFT_CHANGELOG=0`
 - `SOPIFY_RELEASE_HOOK_DRY_RUN=1`

CONTRIBUTING_CN.md

@@ -98,21 +98,17 @@ git config core.hooksPath .githooks
 - `pre-commit` 会先运行 `scripts/release-preflight.sh`，再运行 `scripts/release-sync.sh`
 - release-managed 文件会在检查通过后自动回到同一个 commit
 - 当 `CHANGELOG.md -> [Unreleased]` 为空时，`release-sync` 会根据当前 staged files 自动生成分组草稿
-- `commit-msg` 默认会为 Claude 与 ChatGPT 追加 `Co-authored-by` footer；只有存在 pre-commit handoff 时，才会继续追加 `Release-Sync`、`Release-Version`、`Release-Date`
+- `commit-msg` 只有在存在 pre-commit handoff 时，才会追加 `Release-Sync`、`Release-Version`、`Release-Date`
 
 AI attribution 说明：
 
-- 默认追加的 commit trailers：
-  - `Co-authored-by: Claude <claude@anthropic.com>`
-  - `Co-authored-by: ChatGPT <chatgpt@openai.com>`
-- 若某一次提交需要跳过这些 AI attribution footer，可在该次提交前设置 `SOPIFY_DISABLE_AI_ATTRIBUTION=1`
-- `SOPIFY_DISABLE_RELEASE_HOOK=1` 会关闭整条 release hook 链，因此也会一并跳过默认的 AI attribution；只建议在维护/调试场景使用
 - 仓库级 AI 协作声明见 [CONTRIBUTORS.md](./CONTRIBUTORS.md)
+- 仓库默认不再为 AI 助手追加标准 `Co-authored-by` trailer；除非你手动填写，否则 GitHub contributor attribution 会只归属于人类 commit author
+- `SOPIFY_DISABLE_RELEASE_HOOK=1` 会关闭整条 release hook 链；只建议在维护/调试场景使用
 
 常用环境变量：
 
 - `SOPIFY_DISABLE_RELEASE_HOOK=1`
-- `SOPIFY_DISABLE_AI_ATTRIBUTION=1`
 - `SOPIFY_SKIP_RELEASE_PREFLIGHT=1`
 - `SOPIFY_AUTO_DRAFT_CHANGELOG=0`
 - `SOPIFY_RELEASE_HOOK_DRY_RUN=1`

CONTRIBUTORS.md

@@ -15,13 +15,8 @@ GitHub's automatic contributor graph only reflects commits tied to GitHub accoun
 
 ## Commit-Level Attribution
 
-This repository's `commit-msg` hook appends the following trailers by default:
+This repository no longer appends standard AI `Co-authored-by` trailers by default.
 
-```text
-Co-authored-by: Claude <claude@anthropic.com>
-Co-authored-by: ChatGPT <chatgpt@openai.com>
-```
+AI participation is acknowledged here at the repository level so GitHub's contributor graph remains tied to human commit authors unless a maintainer explicitly adds co-author trailers by hand.
 
-Set `SOPIFY_DISABLE_AI_ATTRIBUTION=1` for a single commit if you need to skip those trailers locally.
-
-Set `SOPIFY_DISABLE_RELEASE_HOOK=1` only for maintainer/debug scenarios. It disables the entire `commit-msg` hook, which also skips the default AI attribution trailers.
+Set `SOPIFY_DISABLE_RELEASE_HOOK=1` only for maintainer/debug scenarios. It disables the entire `commit-msg` hook.

tests/test_release_hooks.py

@@ -162,7 +162,7 @@ def _init_release_hook_fixture(root: Path, *, missing_claude_targets: bool = Fal
 
 
 class ReleaseHookTests(unittest.TestCase):
-    def test_commit_msg_appends_default_ai_attribution_trailers(self) -> None:
+    def test_commit_msg_leaves_message_unchanged_without_release_state(self) -> None:
         with tempfile.TemporaryDirectory() as temp_dir:
             root = Path(temp_dir)
             _init_release_hook_fixture(root)
@@ -181,33 +181,10 @@ def test_commit_msg_appends_default_ai_attribution_trailers(self) -> None:
 
             self.assertEqual(completed.returncode, 0, msg=completed.stderr)
             message = message_file.read_text(encoding="utf-8")
-            self.assertIn("Co-authored-by: Claude <claude@anthropic.com>", message)
-            self.assertIn("Co-authored-by: ChatGPT <chatgpt@openai.com>", message)
+            self.assertEqual(message, "docs: update contribution guide\n")
             self.assertNotIn("Release-Sync:", message)
 
-    def test_commit_msg_respects_ai_attribution_disable_toggle(self) -> None:
-        with tempfile.TemporaryDirectory() as temp_dir:
-            root = Path(temp_dir)
-            _init_release_hook_fixture(root)
-
-            message_file = root / "COMMIT_EDITMSG"
-            _write(message_file, "docs: update contribution guide\n")
-
-            completed = subprocess.run(
-                ["bash", str(root / ".githooks" / "commit-msg"), str(message_file)],
-                cwd=root,
-                capture_output=True,
-                text=True,
-                check=False,
-                env={**_git_subprocess_env(), "SOPIFY_DISABLE_AI_ATTRIBUTION": "1"},
-            )
-
-            self.assertEqual(completed.returncode, 0, msg=completed.stderr)
-            message = message_file.read_text(encoding="utf-8")
-            self.assertNotIn("Co-authored-by: Claude <claude@anthropic.com>", message)
-            self.assertNotIn("Co-authored-by: ChatGPT <chatgpt@openai.com>", message)
-
-    def test_commit_msg_does_not_duplicate_existing_ai_attribution_trailers(self) -> None:
+    def test_commit_msg_preserves_manual_coauthor_trailers_without_duplication(self) -> None:
         with tempfile.TemporaryDirectory() as temp_dir:
             root = Path(temp_dir)
             _init_release_hook_fixture(root)