Skip to content

docs: propose July 28 upstream checkpoint - #147

Draft
yaacovcorcos wants to merge 1 commit into
mainfrom
docs/upstream-state-20260728
Draft

docs: propose July 28 upstream checkpoint#147
yaacovcorcos wants to merge 1 commit into
mainfrom
docs/upstream-state-20260728

Conversation

@yaacovcorcos

@yaacovcorcos yaacovcorcos commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Status: blocked draft — do not merge

This PR remains a checkpoint proposal only. Its local worktree has been cleanly aligned with the main produced by merged #148, but that alignment is intentionally not pushed because two evidence-ordering P2s remain unresolved.

Current exact state

  • Hosted base: ef9f5e8aa635f57df3cd7a5920828923ce6babef.
  • Hosted head: ddba5bb1f567d02475a9a21df2bad7064efb0eed.
  • Current owned origin/main: 8f4403d7d0294132775b2f40282eb2b22edeb887 (merged fix(desktop): preserve Windows Ctrl-minus zoom #148).
  • Preserved local aligned candidate: c47738c5c22bd86caf854fb16aef2b5770b9b160.
  • Proposed reviewedThrough: b989c1da95ba97fb285b62e956a04c1a16067356.
  • Current fetched Synara tip: 6b4e54972295f70185bffbdbcb245db39d5abec2.
  • Exact unreviewed remainder: b989c1da..6b4e54972 (3 commits).
  • integrationBase remains literal 9be46c3ce6a7521b64436b7334bc6fce16e3cac4; update mode remains divergent-cherry-pick.

Remaining blockers

  1. Scient PR Scope desktop signing credentials by platform #60 merged the July 28 research evidence, but authoritative Scient main still labels that record Status: 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.
  2. Synara advanced after this proposal was authored. Current automation policy requires reviewing and dispositioning the complete boundary-to-current-tip range before advancing the checkpoint. The exact remaining commits are:
    • 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-tip passed with current=true and unreviewed=0 is historical and no longer current. It must not be used as merge evidence.

Local alignment evidence

Safest completion path

  1. Review and disposition all three commits through 6b4e54972.
  2. Publish and accept the required Scient-owned evidence activation/extension without changing integrationBase.
  3. Update this desktop checkpoint to the resulting fully reviewed tip.
  4. Normally align the branch with then-current main, rerun strict --require-reviewed-tip, full verification, exactly three final reviews, and hosted CI.
  5. Only then consider merging this PR.

No donor ancestry, release authority, updater control, credentials, sessions, or product code are changed by this draft.

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.
@yaacovcorcos yaacovcorcos added the upstream-review Official source changes awaiting review label Jul 28, 2026
@github-actions github-actions Bot added size:XS vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Jul 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS upstream-review Official source changes awaiting review vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant