Reconcile public with private after sync outage (2026-06-02..06-03)#749
Merged
Conversation
Reconcile public with private after 2026-06-02..06-03 sync outage The auto-sync pipeline has been blocked since 2026-06-02 due to a chain of events kicked off by an out-of-band direct merge on public (PR #745 - #745). That left public ahead of private on the autopilot/* rename and seed-marks recovery refused to synthesize marks because the trees diverged. PR microsoft-foundry/foundry-samples-pr#429 reconciled the rename semantically on private; PR microsoft-foundry/foundry-samples-pr#431 normalized the file bytes (LF vs CRLF) so the autopilot/* trees were byte-equal across both sides. But during the 24+ hour sync outage, multiple legitimate PRs landed on private and never propagated to public: - PR #382 voicelive: foreground-background-agents-responses-voicelive - PR #400 agent-framework: 14-browser-automation-agent updates - PR #407 bring-your-own: optimization samples - PR #415 voicelive: hotel-booking-invocations-voicelive - PR #416 hosted-agents: SUPPORTED_TOOLBOX_SCENARIOS update - PR #417 bicep: private-network-standard-agent-setup updates - PR #420 bring-your-own: browser-automation updates - PR #422 bring-your-own: invocations/github-copilot update This PR brings public's tree byte-equal with private's tree (origin/main SHA ae0d13bad897a0d6d75a4eb214af7e82610269ff) over the sync include-set, so the next sync-to-public dispatch with seed_from_public_sha can rebuild the marks cache and resume automated forward sync. ADO: https://msdata.visualstudio.com/Vienna/_workitems/edit/5331347 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
|
👋 Thanks for your contribution, @brandom-msft! This repository is read-only. As a Microsoft contributor, please submit your PR to the private staging repository instead: See CONTRIBUTING.md for full instructions. |
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.
Why this PR exists
The forward sync from private (microsoft-foundry/foundry-samples-pr) to public has been deadlocked since 2026-06-02 following an out-of-band direct merge on public (PR #745 — autopilot rename), which left the two repos' trees divergent and seed-marks recovery refusing to synthesize a paired marks cache.
Two reconciliation PRs landed on private already:
But during the 24+ hour outage, multiple legitimate PRs landed on private and never propagated to public. This PR brings those forward in bulk so private and public are byte-equal over the sync include-set, unblocking the next
sync-to-publicdispatch withseed_from_public_sha.What's in this PR
42 files changed (+2265 / -77). All file content sourced from the private repo at
origin/mainSHAae0d13bad897a0d6d75a4eb214af7e82610269ff:infrastructure/infrastructure-setup-bicep/15-private-network-standard-agent-setup/(private PR Question: how to get the deployment endpoint and key using Terraform? #417)samples/python/hosted-agents/agent-framework/responses/14-browser-automation-agent/(private PR rename and reorder folders #400)foreground-background-agents-responses-voicelive,hotel-booking-invocations-voicelive(private PRs cdb updates to standard #382, [hosted-agents]misc: remove hugging-face-tool-agent and msft-docs-agent samples #415)SUPPORTED_TOOLBOX_SCENARIOS.md(private PR [hosted-agents]docs: add troubleshooting section for ARM64 local Docker builds #416)Verification
After merge, public
mainshould be byte-equal with privatemainover the sync include-set (everything exceptinternal/,docs/,.azure-pipelines/,.github/,CONTRIBUTING.md,README.md, andpublic-overlay/). I verified this locally:Why direct-on-public (rather than waiting for sync)
This is the sync recovery. Waiting for sync to deliver this content is circular — sync can't run until trees align, and the only way to align them right now is to land this delta directly. Tracked in ADO Feature 5331347.
After merge
sync-to-publicworkflow withseed_from_public_sha=<merge-commit-of-this-PR>feature/mirror-agent→mainpublic-overlay/.github/scripts/mirror-back.shto public, after which future out-of-band direct merges trigger automatic mirror-back rather than full sync outageADO: https://msdata.visualstudio.com/Vienna/_workitems/edit/5331347