Repository navigation
aeon-update: sync 24 upstream commits (6eddd85..ec7a50c) - #23
Merged
Merged
Conversation
github-actions
Bot
force-pushed
the
aeon-update/sync-ec7a50c
branch
from
November 2, 2026 11:10
2f0754a to
911c549
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upstream sync:
aeonfun/aeon6eddd85..ec7a50c24 commits (2026-10-26 → 2026-11-01) · 4 auto-merged · 5 manual · 6 operator-owned skipped · baseline →
ec7a50c.Applied cleanly
.github/workflows/aeon.yml— 上游改了 action pin(setup-nodev7、upload-artifactv7.0.2、foundry-toolchainv1)与 scorer 的score_output_sample;本地已含全部这些改动,同时保留本仓自己的 env 块(BASE_RPC_URL/RH_RPC_URL)。.github/workflows/messages.yml— 同setup-node@949feb2pin;本地保留--timeout 1200的自定义。.gitignore— 上游新增memory/*.lock规则;本地已有,并额外保留自己的 radar dry-run 忽略项。apps/dashboard/lib/skill-icons.data.ts— 上游新增github-filing-registry图标;本地已有。Needs manual review (conflicts — your local copy diverges from upstream)
这 5 个冲突本质是同一个原因:本仓的文档技能计数已被改写成
91 skills(本仓装了 fork-only skill),而上游在这 24 个提交里把计数从86改成了87。不是逻辑冲突,是同一个数字的两套真值。.github/README.md— 上游把 hero alt 文本和 packs 链接从86 skills→87 skills(commit933fbbd)。本地是91 skills。结论:本地更接近真实(91 个skills/目录),保持不动,不要接受上游的 87。docs/skill-packs.md— 上游把「86 skills」→「87 skills」,并把新的github-filing-registry加进 Dev & Code 组(17 → 18)。本地是 91 且已含该条目。建议:保持本地,仅核对本仓是否有github-filing-registry行即可(已有)。docs/examples/README.md— 上游86 skills→87 skills。同上,保持本地91。docs/aeon-setup.md— 上游86 skills→87 skills,并新增一段 aeon-connect MCP /get-started插件的说明(0.2.0)。这一段是本仓没有的新内容,值得手工摘进去;计数部分保持本地91。docs/assets/hero-animated.svg— 上游随计数改名而改的 alt 文本;本地已是91。保持不动。Operator config changed upstream (not auto-applied — reconcile by hand)
aeon.yml— 上游新增一条:github-filing-registry: { enabled: false, schedule: "workflow_dispatch" }。本仓aeon.yml第 19 行已经有这一条,无需动作。.github/dependabot.yml— 上游新增 OpenTelemetry 家族锁(@opentelemetry/api >=1.10.0等 5 条 ignore)。本仓文件与上游 HEAD 逐字节相同(blob1983ac5),已吸收。catalog/packs.json、catalog/skills.json、catalog/skill-icons.json、eyebrowlock.json— 均包含github-filing-registry,属本仓受管/可再生路径,不在本 PR 复制。本次同步没有带来的实质代码变更
值得单独说明:本轮 24 个提交里,与本仓运行相关的功能改动(push-retry 修复
24bc003、vuln-scanner 工具链 pind2c7d9c、pack 校验修复7b47542、CI 取消/超时9b752df)本仓已全部具备。新增的skills/github-filing-registry(默认enabled: false,workflow_dispatch)也已在本仓。Upstream commits
🤖 Generated with Claude Code