323957ad34
Merge `origin/main` (commits0fd93fdplanning +615db99normative) into plan5-frontend-projects. Merge-base48f27b4. plan5 был 113 ahead / 2 behind. CONFLICTS RESOLVED (2 files, manual): — CLAUDE.md: шапка → v1.90; §0 cross-refs → take origin/main (Pravila v1.11 / PSR_v1 v2.0 / Tooling v1.16); §2 Animation default stack → take origin/main (motion-runtime guidance); §5 п.12 → take origin/main (marker «Резерв (снят 12.05.2026)»); §6 фаза + §8 self-review → keep plan5 (Plan 4 MERGED + Plan 5 frontend + Quiet Luxury context); §9 → keep both v1.88 entries explicitly labelled (plan5 schema-sync + origin/main R15 removal — version-number collision result of parallel- branch bump'ов) + v1.89 plan5 factual fix + new v1.90 merge entry. — docs/CHANGELOG_claude_md.md: keep all three entries (v1.90/v1.89/v1.88). FAST-FORWARDED (3 files, no conflict — plan5 не редактировал): — docs/Plugin_stack_rules_v1.md v1.7 → v2.0 (R15 удалён, 162 lines diff) — docs/Pravila_raboty_Claude_v1_1.md v1.10 → v1.11 (§11.5/§13.2 счётчик 16→15 правил + cross-refs) — docs/Tooling_v8_3.md v1.15 → v1.16 (§9.2 reformulated в technical guidance: motion-v ✅, framer-motion technical block) ADDED FROM origin/main (2 files): — docs/superpowers/plans/2026-05-12-remove-r15-motion-restrictions.md — docs/superpowers/specs/2026-05-12-remove-r15-motion-restrictions-design.md cspell-words.txt +1: «форкнулась» (валидный дев-жаргон, в merge-entries). 0 code changes (resources/js/, app/, db/ нетронуты). 0 npm install (motion-v / gsap / anime.js теперь разрешены, не делается). 0 schema changes. POST-MERGE TODO (отдельные шаги): — /claude-md-management:revise-claude-md polish (per §5 п.10) — memory updates: feedback_plugin_paired_stack + project_state + reference_archive (бывшая «branch-divergent state» note → resolved) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>