From 66c7229f4ffc0b45d792d5837e715624f571e558 Mon Sep 17 00:00:00 2001 From: Aaron Stainback Date: Tue, 28 Apr 2026 23:52:58 -0400 Subject: [PATCH 1/3] chore(.gitattributes): suppress diffs on docs/lost-substrate/artifacts/** (multi-AI synthesis packet item 1/6) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Item 1 of 6 from the 2026-04-29 multi-AI synthesis packet (Gemini + Claude.ai + Ani + Amara + Alexa) on corruption-triage hardening. Per Gemini's correction (and Amara's confirmation): if raw diagnostic artifacts must be tracked alongside their analytical conclusions, the PR-diff and merge-driver attributes should suppress them so reviewers see the prose findings instead of walls of raw fsck/rev-list output. The composing rule (already landed): memory/feedback_repo_is_soulfile_dont_commit_raw_diagnostic_dumps _aaron_amara_2026_04_29.md says default discipline is extract + recipe; raw dumps are escape- hatched only when load-bearing AND large. This .gitattributes line is the secondary guard for cases where raw-tracking is unavoidable — it tracks the file but stops it from poisoning the PR-review surface. `linguist-generated=true` also signals to GitHub Linguist that the content is generated, so it's excluded from language-stats and collapsed by default in diffs. Co-Authored-By: Claude Opus 4.7 --- .gitattributes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitattributes b/.gitattributes index ad500c30..ee3d8b86 100644 --- a/.gitattributes +++ b/.gitattributes @@ -40,3 +40,12 @@ *.exe binary *.pdb binary *.jar binary + +# Diagnostic artifacts (corruption triage, profile dumps, etc.): +# track but suppress diffs and merge attempts so PR review stays +# focused on conclusions, not raw evidence walls. Per the soulfile- +# cleanliness rule (`memory/feedback_repo_is_soulfile_dont_commit_ +# raw_diagnostic_dumps_aaron_amara_2026_04_29.md`): default is +# extracts + recipe, not raw dumps; this attribute kicks in only +# when a raw artifact is genuinely load-bearing AND tracked. +docs/lost-substrate/artifacts/** linguist-generated=true -diff -merge From ace91be9ad6ca7a33e7fc9edd26c1b72b528eff2 Mon Sep 17 00:00:00 2001 From: Aaron Stainback Date: Wed, 29 Apr 2026 00:18:04 -0400 Subject: [PATCH 2/3] chore(.gitattributes): remove -merge from text-diff-suppression (Codex P2 thread) Codex correctly flagged that '-merge' on text files unsets the merge driver and makes 3-way merges fail with conflict markers (behavior intended for binary files). For text artifacts, '-diff' alone gives the review-readability mitigation without breaking merge semantics. Also added a comment-block recalibrating the rationale per Aaron's 2026-04-29 'text compresses, binary balloons' framing: the artifacts directory is mostly text, so the concern is review-readability not soul-storage. Composes with the recalibrated soulfile memory file. Co-Authored-By: Claude Opus 4.7 --- .gitattributes | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitattributes b/.gitattributes index ee3d8b86..282d56e7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -42,10 +42,19 @@ *.jar binary # Diagnostic artifacts (corruption triage, profile dumps, etc.): -# track but suppress diffs and merge attempts so PR review stays -# focused on conclusions, not raw evidence walls. Per the soulfile- -# cleanliness rule (`memory/feedback_repo_is_soulfile_dont_commit_ -# raw_diagnostic_dumps_aaron_amara_2026_04_29.md`): default is -# extracts + recipe, not raw dumps; this attribute kicks in only -# when a raw artifact is genuinely load-bearing AND tracked. -docs/lost-substrate/artifacts/** linguist-generated=true -diff -merge +# track but suppress diffs so PR review stays focused on +# conclusions, not raw evidence walls. The artifacts directory +# is mostly text (fsck output / rev-list output / config +# snapshots) — text compresses well in git pack-delta storage, +# so the cost is review-readability, not soul-storage. Per the +# recalibrated soulfile-cleanliness rule +# (memory/feedback_repo_is_soulfile_dont_commit_raw_diagnostic_dumps_*.md): +# - text artifacts → track freely; .gitattributes diff +# suppression for review-noise +# - binary artifacts → git-lfs or non-soul repo +# Note: `-merge` is intentionally NOT used here. `-merge` unsets +# the merge driver (binary-file behavior) and would break 3-way +# text merges with conflict markers — undesirable for the +# tracked text artifacts. `-diff` alone gives the diff +# suppression we want without changing merge semantics. +docs/lost-substrate/artifacts/** linguist-generated=true -diff From 6494de7fceeb01267c232a9bca7f4113fed34e08 Mon Sep 17 00:00:00 2001 From: Aaron Stainback Date: Wed, 29 Apr 2026 00:27:09 -0400 Subject: [PATCH 3/3] chore(.gitattributes): narrow diff-suppression to raw-evidence file types only (Codex P2 thread) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Codex correctly flagged that the previous glob 'docs/lost-substrate/ artifacts/**' suppressed diffs on every file under the directory, including human-readable summaries like 'triage-report.md'. triage-report.md is the conclusion narrative — reviewers should see it on every PR diff. Narrowed to raw-evidence file types only: '*.txt' (fsck output / rev-list output / config snapshots / refs dumps) and '*.log'. Markdown summaries pass through normal diff rendering. Co-Authored-By: Claude Opus 4.7 --- .gitattributes | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 282d56e7..7b5c50b0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -57,4 +57,9 @@ # text merges with conflict markers — undesirable for the # tracked text artifacts. `-diff` alone gives the diff # suppression we want without changing merge semantics. -docs/lost-substrate/artifacts/** linguist-generated=true -diff +# Narrow to raw-evidence file types only — fsck/rev-list outputs, +# refs dumps, config snapshots, log files. Markdown summaries (like +# triage-report.md) are NOT suppressed — those are human-readable +# conclusions and should remain reviewable in PRs. +docs/lost-substrate/artifacts/**/*.txt linguist-generated=true -diff +docs/lost-substrate/artifacts/**/*.log linguist-generated=true -diff