Merge remote-tracking branch 'origin/main' into planning

# Conflicts:
#	CHANGELOG.md
#	content/_meta/README.md
#	content/_meta/npc-authoring-style-guide.md
#	wiki/_templates/cultural-group.md
#	wiki/_templates/institution.md
#	wiki/_templates/star-system.md
#	wiki/characters/devra.md
#	wiki/characters/drin.md
#	wiki/characters/harek.md
#	wiki/characters/lera-sessik.md
#	wiki/characters/maret-korr.md
#	wiki/characters/naia-tamm.md
#	wiki/characters/nils-davan.md
#	wiki/characters/pell.md
#	wiki/characters/renn.md
#	wiki/characters/resha.md
#	wiki/characters/sabel.md
#	wiki/characters/sera-venn.md
#	wiki/characters/torek-lintar.md
#	wiki/characters/voss.md
#	wiki/star-systems/krenn/index.md

docs/design/content-structure-canonical.md

@@ -1,3 +1,15 @@
+---
+title: "Content Structure — Canonical Template (v0.2+)"
+description: "Post-cleanup canonical directory layout for campaign content, superseding v0.1 content-directory-structure"
+type: design
+status: active
+ticket: "#656"
+decision_refs: [D-117, D-138]
+author: ""
+created: 2026-03-13
+updated: 2026-03-13
+---
+
 # Content Structure — Canonical Template (v0.2+)
 
 **Created:** 2026-03-13 (Sprint 26, #656 cleanup)