Add auto-heal workflow#2695
Merged
Merged
Conversation
TalZaccai
approved these changes
Jul 18, 2026
robgruen
marked this pull request as ready for review
July 18, 2026 00:05
robgruen
enabled auto-merge
July 18, 2026 00:05
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Jul 18, 2026
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.
This pull request introduces robust automation and improved handling for merge conflicts in generated files, specifically the
pnpm-lock.yamllockfile and autogeneratedREADME.AUTOGEN.mdfiles. It does this by adding a GitHub Actions workflow to auto-heal these conflicts, local git merge drivers to automate conflict resolution, and scripts to support these workflows. Additionally, it enhances Azure Key Vault secret management by improving privilege elevation logic.The most important changes are:
Automated merge conflict healing and merge driver setup
.github/workflows/heal-generated-files.ymland the supporting scriptts/tools/scripts/heal-generated-files.mjsto automatically resolve conflicts in generated files on open PRs, merging main and pushing resolved branches. This keeps the merge queue moving without manual intervention. [1] [2]ts/tools/scripts/setup-merge-driver.mjsand updates.gitattributesto register merge drivers forpnpm-lock.yaml(regenerated on merge) andREADME.AUTOGEN.md(keep ours), ensuring safe and automatic conflict resolution during merges. [1] [2]pnpm-lock.yaml: Addsts/tools/scripts/merge-pnpm-lock.mjsto rebuild the lockfile from merged manifests, preventing silent corruption from text merges.ts/package.jsonto automate merge driver setup: Ensures merge drivers are registered on everypnpm installby adding a postinstall script. [1] [2]Azure Key Vault secret management improvements
ts/tools/scripts/getKeys.mjsto self-activate the minimum required Azure roles for both reading and writing secrets, improving reliability and maintainability of secret operations. [1] [2] [3] [4] [5]These changes collectively automate and safeguard the handling of merge conflicts in critical generated files and streamline secret management workflows.