Skip to content

fix: recognize consistent adopted stacks without resyncing history - #182

Merged
Yehonal merged 2 commits into
mainfrom
fix/adopted-stack-sync-remedy
Nov 17, 2026
Merged

Yehonal merged 2 commits into
mainfrom
fix/adopted-stack-sync-remedy

Conversation

@Yehonal

@Yehonal Yehonal commented Nov 17, 2026 •

Copy link
Copy Markdown
Collaborator

A successful exact-history adoption used to make both stack sync and stack absorb demand that the operator repeat the adoption. A consistent adopted stack now reports a successful, observational sync with rebuild/push previews. Stale adoption still requires explicit base/tip review; unverifiable Git results and pending operations remain blocking. The observational path is separate from manifest writers and passes the existing global-lock writer guard.

Absorb preserves the patch and names a non-adopted draft with the original manifest and path selection. Existing primary ownership and staged-path guards remain in force. Paths after -- are preserved by the absorb parser.

Validation: 9 regression fixtures cover no-op state preservation, empty/stale adoption, failed ancestry reads, pending operations, and execution of the printed staged/unstaged remedies. The latest 28-check run includes all new fixtures, metadata compatibility, the manifest writer guard, module boundaries, and docs. Adoption edge compatibility also passes. Independent review READY on 1fac63155fe1dcca098275f43f357cb570443df5; version-bump and public-content checks pass. Version 0.47.24.

@Yehonal
Yehonal merged commit afc513d into main Nov 17, 2026
39 of 40 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.

1 participant