Skip to content

feat: AVE-2026-00082 -- local skill name collision (deterministic router shadowing)- #269 - #281

Merged
chaksaray merged 1 commit into
mainfrom
feat/AVE-2026-00082-into-main
Sep 22, 2026
Merged

chaksaray merged 1 commit into
mainfrom
feat/AVE-2026-00082-into-main

Conversation

@chaksaray

Copy link
Copy Markdown
Contributor

Summary

Mirrors #269's merge into develop (AVE-2026-00082, local skill name collision / deterministic router shadowing) into main, matching the established pattern for this repo's dual-branch workflow (e.g. #270 -> #279 for AVE-2026-00081, #266 -> #267 for the framework_sources fix).

Supersedes #280. That PR (develop -> main) showed a merge conflict; a content-only sync commit on develop satisfied the record content and this repo's branch-protection rules (no merge commits, signed commits) but couldn't resolve GitHub's graph-based mergeability check for #280 itself, since develop and main share a merge-base far enough back that both sides have independently edited the same lines since. Fixing that properly would need either a real merge commit (blocked by branch protection on develop) or a full rebase of develop onto main (too disruptive to other open work already based on develop, including #277). A fresh branch off current main carrying just this diff -- the same shape as the other already-merged mirror PRs -- avoids both problems.

Changes

  • records/AVE-2026-00082.json + both conformance fixtures, copied as-published from develop.
  • README.md / CHANGELOG.md: record added to the index, counts updated to the verified total (82 records: 1 CRITICAL / 15 HIGH / 64 MEDIUM / 2 LOW, computed directly from the merged corpus, not carried forward from either branch's own possibly-stale count).
  • dist/ave-records-latest.json + manifest: regenerated via node scripts/build-records.js from the full merged records/ directory.

Test plan

  • python3 scripts/validate_records.py -- all 82 records valid
  • python3 scripts/check_fixtures.py -- all 82 records have positive/negative fixtures
  • pytest tests/ -x -q -- 478 passed
  • Diff against main is exactly the intended 7 files, no unrelated drift

…ter shadowing)- #269

Mirrors #269's merge into develop, matching the established pattern
(e.g. #270 -> #279 for AVE-2026-00081). Fresh branch off main rather
than reusing #280 (develop -> main), whose head/base had diverged
enough since #269 merged that a content-only sync commit couldn't
resolve GitHub's graph-based mergeability check without either a real
merge commit (blocked by this repo's branch-protection rule on
develop) or a full rebase of develop (too disruptive to other open
work based on it).
@chaksaray
chaksaray merged commit b963978 into main Sep 22, 2026
8 checks passed
@chaksaray
chaksaray deleted the feat/AVE-2026-00082-into-main branch September 22, 2026 00:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant