skills.rest
aaronjmars
aaronjmarsCOMMUNITY
Explore all skills by this author →
𝕏@aaronjmarsGitHub

aeon-update

Sync upstream Aeon framework commits into a forked instance as a reviewable pull request.

714|255|Updated Mar 4, 2026
Search Tags:#Automation#upstream#gitHub#fork#Sync#Pull request#3-way merge
One-click install
npx skills add https://github.com/aaronjmars/aeon --skill aeon-update
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: aeon-update
Source: https://github.com/aaronjmars/aeon/tree/main/skills/aeon-update
Command: npx skills add https://github.com/aaronjmars/aeon --skill aeon-update

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Forked instances of the Aeon framework drift out of date with the upstream repository, and manually rebasing risks overwriting operator-owned configuration like aeon.yml, soul/, and memory/. This Skill automates the downstream sync by computing the delta since the last baseline and landing framework changes as a reviewable PR.

Core Features & Use Cases

  • 3-way merge of customized files: Uses git merge-file to combine operator customizations with upstream changes when edits touch disjoint regions, only flagging true overlaps as conflicts.
  • Operator config protection: Never writes to aeon.yml, STRATEGY.md, soul/, memory/, or .mcp.json; upstream changes to these are surfaced in the PR body for manual reconciliation.
  • Baseline watermark tracking: Stores the last-synced upstream SHA in memory/topics/aeon-update-state.json and advances it only when the operator merges the PR, carrying unresolved conflicts forward.
  • Use Case: An operator running a forked Aeon instance schedules the weekly cron; the skill detects 12 new upstream commits, auto-applies 9 clean file updates, regenerates the skill catalogs, and opens a PR listing 2 conflicts needing manual review.

Quick Start

Ask the agent to run the aeon-update skill in report mode to preview what upstream changes would be synced from the parent repository.

Frequently Asked Questions about aeon-update

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I sync a forked repo with upstream changes using GitHub CLI?▼

Use gh api to compare a baseline SHA against upstream HEAD, then apply changed files on a branch and open a PR with gh pr create. This skill automates that flow, including 3-way merges for locally customized files.

How do I update a fork without overwriting my local config files?▼

Partition changed files into operator-owned paths (like aeon.yml or memory/) that are never auto-written and owned paths that are safe to apply. Surface operator-owned upstream changes in the PR body for manual reconciliation instead.

What is a 3-way merge with git merge-file?▼

git merge-file combines a local file, a common ancestor version, and an updated version, exiting 0 when the two sets of edits touch disjoint regions. It preserves local customizations while applying upstream changes, and only genuine line overlaps become conflicts.

Can I preview upstream changes before applying them?▼

Yes, run the skill in report mode (dry run) by passing the report token. It computes the full delta and notifies you of what would change without mutating any files, opening a PR, or advancing the baseline state.

What happens when the baseline SHA is unreachable after a history rewrite?▼

The run stops with AEON_UPDATE_BASELINE_UNREACHABLE and notifies the operator. Recovery is done by re-running with reset=fork-point to re-anchor the baseline at the merge-base, or reset=<sha> to set a specific commit.

Related Skills

Explore More Software Engineering Skills→
aaronjmarsaaronjmars
626

fork-skill-digest

Compute weekly divergence digests for aeon fork fleets from aeon.yml settings.

Community
Advanced
codacy-open-source-projects-scanscodacy-open-source-projects-scans
1

fix-sync

Resolve merge conflicts in ClickHouse sync pull requests using the gh CLI.

Official
Advanced
Atrium-HermesAtrium-Hermes

fork-release-tracker

Tracks fork releases from a parent repository via the GitHub API and writes weekly summaries.

Community
Advanced
EpiphyticEpiphytic
7

rebase

Rebase Git branches onto remote targets with structured conflict resolution guidance.

Official
Intermediate