diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..38ec4db
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Synced from thatfactory/agent-guidelines; keep tracked but collapse GitHub diffs.
+AgentGuidelines/** linguist-generated
diff --git a/AgentGuidelines/CHANGELOG.md b/AgentGuidelines/CHANGELOG.md
index faa1a6b..a190b2d 100644
--- a/AgentGuidelines/CHANGELOG.md
+++ b/AgentGuidelines/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project are documented in this file.
 
+## [0.0.8] - 2026-07-23
+
+### Added
+
+- Consumer guidance for keeping `AgentGuidelines/` tracked while collapsing synchronized files in GitHub pull-request diffs with `.gitattributes`.
+- Pull-request conventions for isolated subtree commits, explicit version notes, central review links, and continued CI validation.
+
 ## [0.0.7] - 2026-07-23
 
 ### Added
diff --git a/AgentGuidelines/Guidelines/Development.md b/AgentGuidelines/Guidelines/Development.md
index 8ab764d..afce49f 100644
--- a/AgentGuidelines/Guidelines/Development.md
+++ b/AgentGuidelines/Guidelines/Development.md
@@ -8,6 +8,17 @@ When developing a new feature or responding to a feature request, consider share
 
 Before changing a project, verify that it uses the latest released version of `agent-guidelines`. Check the project's `AgentGuidelines/VERSION` against the latest release, update the subtree or equivalent when it is behind, and read the updated applicable guides before starting implementation. This check is manual and must be performed at the beginning of each project task.
 
+## Guidelines changes in pull requests
+
+Keep `AgentGuidelines/` tracked so consumers retain a reproducible, versioned copy for agents and CI. Do not add the subtree to `.gitignore`. Instead, add this rule to the consumer's tracked `.gitattributes` so GitHub collapses synchronized guideline files in pull-request diffs by default while reviewers can still expand them:
+
+```gitattributes
+# Synced from thatfactory/agent-guidelines; keep tracked but collapse GitHub diffs.
+AgentGuidelines/** linguist-generated
+```
+
+Keep each subtree update in its own commit. In the pull-request description, state the old and new guideline versions and link to the central release or pull request where the guideline changes were reviewed. Continue validating the checked-in subtree in CI. Because generated-file diffs are collapsed by default, never edit the subtree locally; make shared changes in the source repository and consume a tagged release.
+
 ## Logging
 
 Applications own their orchestration, lifecycle, and product-domain diagnostics. Follow the shared [logging guide](Logging.md) and rely on each dependency to log its own implementation. Do not duplicate or reformat package-internal operations in the application log.
diff --git a/AgentGuidelines/README.md b/AgentGuidelines/README.md
index 9f5c94c..c40ea35 100644
--- a/AgentGuidelines/README.md
+++ b/AgentGuidelines/README.md
@@ -85,10 +85,17 @@ From the consumer repository root, install a tagged release:
 git subtree add \
   --prefix=AgentGuidelines \
   https://github.com/thatfactory/agent-guidelines.git \
-  0.0.7 \
+  0.0.8 \
   --squash
 ```
 
+Keep the subtree tracked, but add this to the consumer's tracked `.gitattributes` so GitHub collapses synchronized guideline files in pull-request diffs by default:
+
+```gitattributes
+# Synced from thatfactory/agent-guidelines; keep tracked but collapse GitHub diffs.
+AgentGuidelines/** linguist-generated
+```
+
 Copy and adapt [the consumer template](Templates/AGENTS.md). Keep the consumer file small: describe the product or package, map its concrete physical folders, point to the applicable shared guides, and state only genuine exceptions.
 
 ## Update a consumer
@@ -99,11 +106,11 @@ Review the target release's changelog, then pull it deliberately:
 git subtree pull \
   --prefix=AgentGuidelines \
   https://github.com/thatfactory/agent-guidelines.git \
-  0.0.7 \
+  0.0.8 \
   --squash
 ```
 
-Confirm `AgentGuidelines/VERSION`, review the subtree diff, validate local `AGENTS.md` pointers, and run the consumer's relevant tests. Updates are intentionally not automatic: one guideline release cannot silently change every project.
+Confirm `AgentGuidelines/VERSION`, ensure the `.gitattributes` rule above is present, review the subtree diff, validate local `AGENTS.md` pointers, and run the consumer's relevant tests. Keep the subtree update in its own commit, and identify the old and new versions plus the central release or pull request in the consumer pull-request description. Updates are intentionally not automatic: one guideline release cannot silently change every project.
 
 ## Maintain the source of truth
 
diff --git a/AgentGuidelines/Scripts/validate_guidelines.py b/AgentGuidelines/Scripts/validate_guidelines.py
index 3b76c8a..b816c50 100644
--- a/AgentGuidelines/Scripts/validate_guidelines.py
+++ b/AgentGuidelines/Scripts/validate_guidelines.py
@@ -86,6 +86,7 @@ def validate_readme_contract(errors: list[str]) -> None:
         "https://github.com/thatfactory/agent-guidelines.git": "subtree remote",
         "git subtree add": "subtree installation command",
         "git subtree pull": "subtree update command",
+        "AgentGuidelines/** linguist-generated": "generated subtree attribute",
     }
     for value, description in required.items():
         if value not in readme:
diff --git a/AgentGuidelines/VERSION b/AgentGuidelines/VERSION
index 5a5831a..d169b2f 100644
--- a/AgentGuidelines/VERSION
+++ b/AgentGuidelines/VERSION
@@ -1 +1 @@
-0.0.7
+0.0.8