diff --git a/.squad/agents/booster/history.md b/.squad/agents/booster/history.md
index 2a7ec1918..e052a5a1d 100644
--- a/.squad/agents/booster/history.md
+++ b/.squad/agents/booster/history.md
@@ -142,3 +142,5 @@ Post-e2e follow-up triage recorded Booster findings D and F. Finding F confirmed
 
 gh-aw workstream triage complete (7-agent read-only pass). Reconciled outcome: CLOSE 7 issues (#1738,#1762,#1764,#1768,#1763,#1604,#1609); SHIP-NOW 5 (#1772,#1758,#1759,#1732-compile,#1761); 2 contested (#1730,#1756); 12 deferred. Both P0s (#1772,#1758) still real — structural defects unresolved. Wave:1 cap=6. Tomorrow is a full-day E2E series against aspiregregator-squad-e2e. E2E will break at S3 if #1772 is not fixed first.
 
+
+- 📌 **Team update (2026-08-21 — Agentic-Workflows Audit):** Authored PR #1815 chore(gh-aw): ignore downloaded workflow logs under .github/aw/logs. Created .github/aw/logs/.gitignore (* + !.gitignore). LF-only blob verified via hex inspection. Correctly requested reviewer pass; Flight approved and squash-merged at 2026-08-21T16:23:46Z. PR #1815 MERGED ✅.
diff --git a/.squad/agents/flight/history.md b/.squad/agents/flight/history.md
index 20f48d2ea..f84b9270e 100644
--- a/.squad/agents/flight/history.md
+++ b/.squad/agents/flight/history.md
@@ -73,3 +73,5 @@ gh-aw workstream triage complete (7-agent read-only pass). Reconciled outcome: C
 
 Batch 2: pre-merge gate review of PRs #1775/#1776/#1777/#1778 in progress. All four are green and mergeable. Key validation points: (1) #1777 and #1778 tests verified to fail against pre-fix state; (2) #1778 scope covers #1759+#1756+#1758 all three; (3) `max: 2` and activation guard are complementary not redundant. Board is clean: M1-M5 created, wave labels corrected, #1779 filed to M3.
 
+
+- 📌 **Team update (2026-08-21 — Agentic-Workflows Audit):** Reviewed PR #1815. Independently re-verified all five of Booster's claims. Resolved git-negation-semantics question (* + !.gitignore correct for flat-file dirs). Judged .github/aw/logs/.gitignore correct placement over root .gitignore rule (colocation beats surviving directory deletion). Squash-merged at 2026-08-21T16:23:46Z. Decision captured in decisions.md: gitignore-colocation. PR #1815 APPROVED + MERGED ✅.
diff --git a/.squad/decisions.md b/.squad/decisions.md
index 588d85807..2ece6a429 100644
--- a/.squad/decisions.md
+++ b/.squad/decisions.md
@@ -3,6 +3,74 @@
 > Team decisions that all agents must respect. Managed by Scribe.
 
 
+---
+
+### 2026-08-21: E4 conflict was add/add, not a divergence
+**Date:** 2026-08-21
+**Raised by:** Coordinator
+**Status:** Decided
+
+#### Context
+
+The conflict on PR #1813 for `.squad/e2e/E4-agent-binding-verification.md` was an add/add, not a content divergence. The file did not exist at the merge base. `dev` added the procedure via #1791 with `⛔ NOT YET EXECUTED`; the branch added the same file updated to `✅ EXECUTED` with results.
+
+#### Decision
+
+Resolution kept the executed version plus dev's sibling files.
+
+---
+
+### 2026-08-21: Git plumbing merge pattern for dirty working trees
+**Date:** 2026-08-21
+**Raised by:** Sims / Coordinator
+**Status:** Decided
+
+#### Context
+
+When CRLF normalization (or other `.gitattributes` fallout) makes the working tree dirty enough that `git merge` refuses to start, a conflict must be resolved via plumbing.
+
+#### Decision
+
+Established pattern:
+1. `git merge-tree --write-tree` to analyse the merge and identify conflicts.
+2. `git mktree` to rebuild the affected subtree with the resolved blob SHAs.
+3. Walk the tree hierarchy replacing SHAs up to the root tree.
+4. `git commit-tree` with two parents and a ref update to land the merge commit.
+
+#### Risk — mandatory pairing
+
+Hand-building trees can silently drop sibling entries. This technique MUST be paired with a tree-inventory diff before and after to verify nothing was lost. The coordinator verified PR #1813's plumbing merge: 1 file changed (+124/−14), `.squad/e2e/` and `.squad/` inventories identical, all 47 markdown headings present before the merge survive after it. The 14 deletions were the status banner and the Phase 0d correction — intentional, not loss.
+
+---
+
+### 2026-08-21: gitignore placement — colocation over root rules
+**Date:** 2026-08-21
+**Raised by:** Flight
+**Status:** Decided
+
+#### Decision
+
+When adding a `.gitignore` to exclude files written by a tool under a specific subdirectory (e.g., `.github/aw/logs/`), the correct placement is a `.gitignore` inside that directory — not a rule in the root `.gitignore`.
+
+#### Rationale
+
+Colocation with the artifact directory improves discoverability, and the ignore rule survives even if someone cleans the root `.gitignore`. Nested-directory re-inclusion semantics (`*` + `!.gitignore`) work correctly for flat-file directories; subdirectories within an excluded directory remain ignored, which is the desired behavior for tool-generated log dumps.
+
+---
+
+### 2026-08-21: scaling-tribble session produced no work — intent unrecorded
+**Date:** 2026-08-21
+**Raised by:** Coordinator
+**Status:** Noted / Open
+
+#### Finding
+
+The `bradygaster-scaling-tribble` worktree ("Custom runners for agentic workflows") produced absolutely no work: single reset in reflog, no commits, no stash.
+
+#### Action
+
+The intent behind that session is unrecorded. This may need to be re-opened as a fresh session or issue.
+
 ---
 
 ### 2026-08-19: Squad's responsibility matrix stops at this repo