mirror of
https://github.com/affaan-m/ECC.git
synced 2026-10-14 20:25:26 +02:00
Resolve six conflicts: - hooks/hooks.metadata.json: keep this branch's gateguard description and fingerprint, add upstream's hookify-runtime entries. - package.json: keep both gateguard-report.js and github-coordination.js. - scripts/hooks/gateguard-fact-force.js, tests/hooks/gateguard-fact-force.test.js, skills/gateguard/SKILL.md: upstream added a simpler session denial cap; this branch already has the fuller one (cap threaded through markCheckedAndCountDenial, malformed-value warning, miss and target notes), so keep it. Upstream's taskset and su wrapper handling, fail-closed recursion limit and soft-hyphen sanitising merged cleanly and their tests pass. - manifests/context-packs/skill-triggers@1.json: take upstream's file and recompute registryDigest for the merged registry.