chore: sync main back into staging (drift after ea1d5149)

[github-actions]

19 commit(s) in main are not in staging's ancestry after push to main at ea1d514.

This drift will cause conflicts on the next staging → main promotion.

Required action

1. Create a chore/sync-main-to-staging branch from origin/staging
2. git merge origin/main -X ours --no-edit (prefer staging for any conflicts)
3. PR the branch into staging, merge, redeploy staging
4. Close this issue

Auto-opened by the detect-staging-drift workflow.

[wilhel1812]

Hotfix branch for shared simulation private-site persistence is prepared on . Next step is PR to main, then immediate main->staging sync once it lands.

[wilhel1812]

Hotfix branch for shared simulation private-site persistence is prepared on hotfix/shared-sim-private-sites. Next step is PR to main, then immediate main->staging sync once it lands.

[github-actions]

⚠️ Issues closed as completed must have a milestone assigned. Please assign a milestone before closing, or add label no-milestone-close-ok for an approved exception.

[wilhel1812]

Attempted the required main -> staging sync in PR #736. The sync branch merged origin/main into origin/staging cleanly and checks passed, but GitHub rejected an ancestry-preserving merge because merge commits are disabled for this repository. The PR was squash-merged by repository policy, producing staging commit 6be7b2c, but that does not preserve main ancestry; + 0863752 fix: unblock blank simulation workflows (#179)

• 700a0c2 release: v0.11.0 (release: v0.11.0 #214)

• 1d2d50f ci: add workflow to require milestone on completed issue close (ci: require milestone on completed issue close #217)

• d401938 release: v0.12.0 (release: v0.12.0 #280)
• 47627f6 Release v0.12.1 hotfix (Release v0.12.1 hotfix #286)
• 3ee9c7a chore: finalize v0.12.1 version (Release v0.12.1 finalization #288)
• 8ddc48d hotfix: reconcile production auth fix and v0.12.2 in main (hotfix: reconcile production auth fix and v0.12.2 in main #334)
• 8e0bfd4 fix: align required status checks to PR head SHA (fix: align required status checks to PR head SHA #335)
• 7f2a3ba release: 0.13.0 (release: 0.13.0 #368)
• 07a4c48 chore: back-merge staging into main after 0.13.0 release (chore: back-merge staging into main after 0.13.0 release #371)
• 19d9705 hotfix: promote staging 0.14.0 release content to main (hotfix: promote verified 0.14.0 release content to main #405)
• da5fe53 hotfix: promote save-selected-link fix to production (v0.14.1) (hotfix: promote save-selected-link fix to production (v0.14.1) #419)

• a3caac9 ci: allow approved no-milestone issue closures (hotfix(ci): allow approved no-milestone closures #441)

• 1b5a4d2 hotfix(ci): enforce milestone via explicit payload label check (hotfix(ci): robust no-milestone override check #443)
• 7afd929 Release 0.15.0: reconcile main with verified staging snapshot (Release 0.15.0: promote verified staging snapshot #560)
• c42e145 Fix 0.15.0 changelog scope and codify release-note coverage rule (Fix 0.15.0 changelog scope and codify release-note coverage rule #563)
• 19e53ef Release v0.16.0 (Release v0.16.0 #640)
• c88d7c6 hotfix(ci): support drift and approved milestone-close exceptions (hotfix(ci): allow drift and approved close exceptions #643)
• ea1d514 fix: persist newly added sites to cloud sync
• 7efc176 release: v0.16.1
• 021b9e5 fix: fetch tags in prod release workflow (fix: fetch tags in prod release workflow #708)
• be7bec5 fix: deploy prod release tag in workflow (fix: deploy the tagged prod release commit #709)
• 93d272e fix: resolve prod release tag safely (fix: resolve prod release tag safely #710)
• e306d4a fix: allow tagged detached head for prod deploy (fix: allow tagged detached head for prod deploy #711)
• ad3ae34 fix: allow tagged prod release checkout (fix: allow tagged prod release checkout #712)
• 51e5b46 fix: build prod release from tagged worktree (fix: build prod release from tagged worktree #713)
• 9220d8e fix: ignore prod d1 auth probe failure (fix: ignore prod d1 auth probe failure #714)
• 43dae87 fix: verify prod deploy against workflow sha (fix: verify prod deploy against workflow sha #715)
• 457d1be fix: downgrade prod deploy postverify to warning (fix: downgrade prod deploy postverify to warning #716)
• c1ff3be fix: preserve shared simulations with private sites (fix: preserve shared simulations with private sites #717)
• c373058 fix: correct deploy verification arguments (fix: correct deploy verification arguments #718)

• f79e750 chore: release 0.17.0 to production (chore: release 0.17.0 to production #723) still reports the main-only commits. Drift remains until repo settings allow an ancestry-preserving merge or an approved alternative sync method is chosen.

[wilhel1812]

Resolved via PR #746 using an ancestry-preserving merge commit into staging.

Verification:

• Merge commit: c1020601defb3444353fef1c01bc4799ea80bbb7
• git cherry -v origin/staging origin/main returns no main-only commits
• Staging deploy completed successfully for c1020601
• Build info from CI: 0.17.0+c1020601

Repository protections were restored after the one-off merge: staging requires linear history again, and repository merges are back to squash-only.

[wilhel1812]

Closing after staging drift was resolved and staging deploy completed successfully for c102060.