Repository navigation
fix(aeon-update): keep the new baseline off main until the sync PR merges - #1256
Merged
Merged
Conversation
…rges A sync run committed its state file and run log on the PR branch. The post-run commit then hit a stash-pop conflict on the log, and its fallback restored whole memory/ and output/ trees from the stash, which is the branch head plus the post-run edits. So the branch-only baseline landed on main before the PR merged (aeon-agent e1535314 wrote 75f3b55 while #273 was open), the PR conflicted, and closing it unmerged would have skipped its commits on the next run. - commit-run-results.sh: on a pop conflict, restore only the files the stash changed, never files the agent committed only on its branch. - aeon-update: stage only the synced files plus the state file (no logs, token usage, output, dashboard feed or generated helpers), amend only the state file, stay on the branch for the log, and do nothing while an earlier sync PR is still open (new AEON_UPDATE_PR_OPEN). - test: the pop-conflict case now also commits a branch-only state file and checks it stays off main. - eyebrowlock: aeon-update hash + finding line (92 -> 100), v0.5.6 rescan. Co-Authored-By: Claude <noreply@anthropic.com>
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.
Bug
An
aeon-updatesync moved its baseline on the instance's main before its PR merged. On aeon-agent, main commit e1535314 wrotebaseline_sha75f3b55 tomemory/topics/aeon-update-state.jsonwhile PR #273 (3a747cd..75f3b55) was still open. That made the PR conflict, and closing it unmerged would have made the next run skip those 13 commits. The design says the baseline moves only on merge.Cause
The run committed the state file and its run log on the PR branch. The post-run commit (
scripts/commit-run-results.sh) stashes post-run state, pushes the branch, and pops the stash on main. The pop conflicted on the log (the branch had a copy main lacked), and the fallback then restored the wholememory/andoutput/trees from the stash. The stash tree is the branch head plus the post-run edits, so the branch-only state file was copied onto main too (run 39522418979: "post-run state conflicted with main on pop; keeping this run's copy").Fix
commit-run-results.sh: on a pop conflict, restore only the files the stash itself changed. Files the agent committed only on its branch stay off main.aeon-updateSKILL.md: stage only the synced files plus the state file (never logs, token usage,output/, the dashboard feed or the generatednotify/secretcurlhelpers), amend only the state file forlast_pr, and write the log after the commit while staying on the branch, so the pop no longer conflicts.aeon-update/sync-*PR is open, the run writes nothing and exitsAEON_UPDATE_PR_OPEN(one line only if upstream moved past it).reportmode andpending_conflictshandling are unchanged.test_commit_results_feature_branch.shnow also commits a branch-only state file and checks it stays off main (fails on the old script, passes now).eyebrowlock.json: aeon-update entry re-hashed with eyebrow v0.5.6 (finding line 92 -> 100).Need help on this PR? Tag
@codesmith-botwith what you need.