Skip to content

aeon-update: sync 24 upstream commits (6eddd85..ec7a50c) - #23

Merged
icepy merged 1 commit into
mainfrom
aeon-update/sync-ec7a50c
Nov 3, 2026
Merged

icepy merged 1 commit into
mainfrom
aeon-update/sync-ec7a50c

Conversation

@github-actions

@github-actions github-actions Bot commented Nov 2, 2026

Copy link
Copy Markdown

Upstream sync: aeonfun/aeon 6eddd85..ec7a50c

24 commits (2026-10-26 → 2026-11-01) · 4 auto-merged · 5 manual · 6 operator-owned skipped · baseline → ec7a50c.

注意:本 PR 的实际 diff 只有 memory/topics/aeon-update-state.json。
4 个 auto-merge 文件(.github/workflows/aeon.yml、.github/workflows/messages.yml、.gitignore、apps/dashboard/lib/skill-icons.data.ts)的合并结果与本仓 main 现有内容逐字节相同 —— 也就是说这些上游改动本仓早已吸收。因此没有可提交的代码变更,本 PR 的唯一作用是推进基线水位线到 ec7a50c,让下一轮不再重复比较这 24 个提交。

Applied cleanly

  • Auto-merged (3-way), 结果与 main 一致、无实际内容变更:
    • .github/workflows/aeon.yml — 上游改了 action pin(setup-node v7、upload-artifact v7.0.2、foundry-toolchain v1)与 scorer 的 score_output_sample;本地已含全部这些改动,同时保留本仓自己的 env 块(BASE_RPC_URL / RH_RPC_URL)。
    • .github/workflows/messages.yml — 同 setup-node@949feb2 pin;本地保留 --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(commit 933fbbd)。本地是 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 逐字节相同(blob 1983ac5),已吸收。
  • catalog/packs.json、catalog/skills.json、catalog/skill-icons.json、eyebrowlock.json — 均包含 github-filing-registry,属本仓受管/可再生路径,不在本 PR 复制。

本次同步没有带来的实质代码变更

值得单独说明:本轮 24 个提交里,与本仓运行相关的功能改动(push-retry 修复 24bc003、vuln-scanner 工具链 pin d2c7d9c、pack 校验修复 7b47542、CI 取消/超时 9b752df)本仓已全部具备。新增的 skills/github-filing-registry(默认 enabled: false,workflow_dispatch)也已在本仓。

Upstream commits

SHA Summary
24bc003 fix(push-retry): retry GitHub's inline cannot-lock-ref rejection (aeonfun#1270)
a3938e3 docs(packs): update the Sentinel Pack listing to its 6 skills (aeonfun#1269)
e4d9e35 docs(packs): list the Cohesivity pack (aeonfun#1271)
82c874f docs: sync PRs aeonfun#1269-aeonfun#1271 to aeon docs (aeonfun#1272)
89db6f8 docs(packs): add Lazybrief community pack to the registry (aeonfun#1273)
0940788 docs(ecosystem): drop dead agentlink.id link, keep @agentlinkhq (aeonfun#1274)
fc9fe5c Fix changelog scorer evidence selection (aeonfun#1275)
67ccc90 chore(deps): bundle Dependabot bumps 2026-10-26 (aeonfun#1282)
d2c7d9c security(vuln-scanner): pin osv-scanner and trufflehog, drop in-run download (aeonfun#1286)
e6058e3 docs(sc-audit): document standalone use in Claude Code (aeonfun#1285)
fd8e3c2 docs(packs): update the Sentinel Pack listing to its 8 skills (aeonfun#1287)
cc750ca docs(ecosystem): drop 18 rows with no Aeon tie or a dead project, fix AgentLink link (aeonfun#1288)
95a4d1d docs(ecosystem): add 19 projects building with Aeon (aeonfun#1289)
28f1614 docs(ecosystem): add 7 Aeon builds found in community chats (aeonfun#1290)
f471db4 docs(ecosystem): refresh dead X avatar links for LoneStarOracle and Capacitr (aeonfun#1291)
2eeea09 docs(ecosystem): remove ether-btc, icepy, ModifyMe, Nadai, runitback, Westworld (aeonfun#1293)
933fbbd [skills] Add github-filing-registry - persistent GitHub filing ledger (aeonfun#1294)
a69404c docs(packs): list the Vauban Pack (aeonfun#1292)
9b752df ci: cancel superseded runs + job timeouts (aeonfun#1295)
28816c7 chore(deps): bump @hono/node-server in /apps/mcp-server (aeonfun#1296)
1ade386 chore(deps): bundle Dependabot bumps (webhook, mcp-server, dashboard, actions) (aeonfun#1302)
7b47542 fix(validate-pack): find a --path pack's LICENSE next to its manifest (aeonfun#1301)
34539cc fix(remotion): override zod to 4.6.6 (aeonfun#1304)
ec7a50c chore(deps): bump @vercel/otel in /apps/dashboard (aeonfun#1303)

🤖 Generated with Claude Code

24 upstream commits from aeonfun/aeon. 4 files 3-way merged (result byte-identical to what main already had), 5 need manual review. Baseline advanced to ec7a50c.
@github-actions
github-actions Bot force-pushed the aeon-update/sync-ec7a50c branch from 2f0754a to 911c549 Compare November 2, 2026 11:10
@icepy
icepy merged commit 4126c85 into main Nov 3, 2026
2 checks passed
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.

2 participants