docs: propose July 28 upstream checkpoint - #147
Draft
yaacovcorcos wants to merge 1 commit into
Draft
Conversation
Advance the proposed Synara reviewed-through revision to b989c1da while preserving the literal integration base. This remains dependent on maintainer acceptance of the corresponding Scient review record.
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.
Status: blocked draft — do not merge
This PR remains a checkpoint proposal only. Its local worktree has been cleanly aligned with the
mainproduced by merged #148, but that alignment is intentionally not pushed because two evidence-ordering P2s remain unresolved.Current exact state
ef9f5e8aa635f57df3cd7a5920828923ce6babef.ddba5bb1f567d02475a9a21df2bad7064efb0eed.origin/main:8f4403d7d0294132775b2f40282eb2b22edeb887(merged fix(desktop): preserve Windows Ctrl-minus zoom #148).c47738c5c22bd86caf854fb16aef2b5770b9b160.reviewedThrough:b989c1da95ba97fb285b62e956a04c1a16067356.6b4e54972295f70185bffbdbcb245db39d5abec2.b989c1da..6b4e54972(3 commits).integrationBaseremains literal9be46c3ce6a7521b64436b7334bc6fce16e3cac4; update mode remainsdivergent-cherry-pick.Remaining blockers
mainstill labels that recordStatus: Draft, lists it under “Draft reviews awaiting maintainer acceptance,” and keeps the July 26 checkpoint as the accepted boundary. The parent evidence must be activated through its owning repository before desktop state can reference it as authoritative.94652247a— runtime modes and auto-approval support;30deb50eb— Environment-panel Pull action;6b4e54972— repository PR-template generation.The previous claim that
bun run scient:upstream-check --require-reviewed-tippassed withcurrent=trueandunreviewed=0is historical and no longer current. It must not be used as merge evidence.Local alignment evidence
maininto the preserved local branch completed without conflict.bun run scient:upstream-check --intakepassed locally atc47738c5c22bd86caf854fb16aef2b5770b9b160and truthfully reportedcurrent=false,unreviewedCommits=3.git diff --checkand the local worktree are clean.Safest completion path
6b4e54972.integrationBase.main, rerun strict--require-reviewed-tip, full verification, exactly three final reviews, and hosted CI.No donor ancestry, release authority, updater control, credentials, sessions, or product code are changed by this draft.