Sync 1.1.1 progressive history into main - #26
Merged
Conversation
Replicates the final state of the 1.1.1 progressive history onto main. - Project version bumped to 1.1.1, with the matching CHANGELOG entry covering the caching-configuration consolidation. - docs/TUTORIAL.md's "Based on version" banner retargeted to 1.1.1. - AGENTS.md gains a bullet for the cache-profiles module under the caching enhancement. - One code line: drops a stray comment marker left in lib/cache/cache-profiles.ts. The trees are identical afterward, so main and the 1.1.1 tag agree.
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
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
1 participant
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.
Description
Replicates the final state of the
1.1.1progressive history ontomain, keeping the traditional branch and the latest progressive history in sync. Generated bybcedu-lab-sync'ssync-to-main.1.1.1folded the caching-configuration consolidation (originally merged tomainin #25) into the progressive history's existing steps — the cache lifetime profiles and the enable switch moved intolib/cache/cache-profiles.ts, aCacheLifetimeProfileinterface andCACHE_PROFILE_*constants were added, andCACHE_COMPONENTS_ENABLEDbecameCACHE_ENABLED. Those code changes are already onmain; what remains is the forward metadata delta plus one stray-comment cleanup.Metadata (4 files).
package.json→1.1.1;CHANGELOG.mdgains the 1.1.1 entry;docs/TUTORIAL.md's "Based on version" banner retargets to1.1.1;AGENTS.mdgains a bullet for the cache-profiles module under the caching enhancement.Code (1 line). Drops an orphaned
//comment marker left inlib/cache/cache-profiles.tswhen its header comment was trimmed. No behavior change.No lab or enhancement was added, removed, or renumbered — the 1.1.1 history has the same 99 commits and identical commit subjects as 1.1.0.
Verification
validate-syncpasses:git diff 1.1.1 sync/1.1.1-to-mainis empty — the trees are byte-identical, both locally and on the remote. This is the invariant the two histories must satisfy (different commit SHAs, identical file content).mainwith no conflicts.1.1.1bybcedu-lab-publishand all resolve on that chain.One defect was found and fixed in the progressive history rather than patched here:
docs/TUTORIAL.md's banner read "Based on version 1.1.1" while the following line still said "tagged1.1.0". The1.1.1metadata commit was amended and the tag re-pointed, then this branch was regenerated from the corrected history — so the fix lives in the history that produced it, not as drift onmain.Note for reviewers
mainand1.1.1have deliberately different commit histories —mainis the traditional append-only branch,1.1.1is the tutorial-shaped progressive chain. Only their final trees are expected to match, and they do.