Skip to content

[UPSTREAM-SYNC] state: clear stale catchup_in_progress; record release_sync v2026.9.24 - #3442

Open
Da-Mikey wants to merge 1 commit into
Lexus2016:mainfrom
Da-Mikey:sync/upstream-state-cleanup-2026-10-01
Open

Da-Mikey wants to merge 1 commit into
Lexus2016:mainfrom
Da-Mikey:sync/upstream-state-cleanup-2026-10-01

Conversation

@Da-Mikey

@Da-Mikey Da-Mikey commented Oct 1, 2026

Copy link
Copy Markdown
Contributor

What

State-file bookkeeping only — no code changes.

Why

  1. Stale catchup_in_progress removed. The block referenced sync/upstream-catchup / PR sync(upstream): catch up to v2026.7.30 — all 87 conflicted files integrated #1641, but PR sync(upstream): catch up to v2026.7.30 — all 87 conflicted files integrated #1641 merged 2026-08-04 and the branch no longer exists on origin. Per the evolution-upstream-sync skill (release-track pre-flight step 4) a merged catch-up must be cleared, otherwise it blocks the incremental cursor behind a phantom catch-up.
  2. New release_sync block records the release-track marker. Latest upstream published release v2026.9.24 (v0.21.5) is already fully contained in main (git rev-list --count main..v2026.9.24 = 0; git merge-base --is-ancestor v2026.9.24 origin/main = true), landed via PR merge upstream v2026.9.24 #3436 merged 2026-09-29T17:47:15Z. Release merges are tracked here, not in synced_through_commit (the incremental 25-commit cursor is not advanced by release merges).

Verification

  • .evolution/upstream-sync-state.json parses as valid JSON; release_sync.integrated_tag ancestry re-checked against origin/main at run time.
  • No code, no workflow files, no dependency changes.

Notes

Pushed from the Da-Mikey fork because the Da-Mikey gh identity has no push access to Lexus2016/hermes-agent-evolution. Merge stays owner-gated.

…_sync v2026.9.24

The catchup_in_progress block was a phantom: its PR Lexus2016#1641 merged 2026-08-04
and branch sync/upstream-catchup no longer exists on origin. Per the
evolution-upstream-sync skill (release-track pre-flight step 4) it is removed so
it cannot block the incremental cursor behind a catch-up that already landed.

Release-track merges are tracked in the new release_sync block instead: latest
upstream release v2026.9.24 (v0.21.5) is fully contained in main
(main..v2026.9.24 = 0 commits), merged via PR Lexus2016#3436 on 2026-09-29.
@github-actions github-actions Bot added the enhancement New feature or request label Oct 1, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant