feat(ng-dev/pr): surface caretaker note comment inline during merge - #3952
Open
mattrbeck wants to merge 4 commits into
Open
feat(ng-dev/pr): surface caretaker note comment inline during merge#3952mattrbeck wants to merge 4 commits into
mattrbeck wants to merge 4 commits into
Conversation
There was a problem hiding this comment.
Code Review
This pull request introduces functionality to fetch and display caretaker notes directly from GitHub pull request comments when prompting the caretaker during a merge. It adds helper functions to extract, match (via regex), and format these notes, along with corresponding unit tests. The review feedback highlights a security concern where caretaker notes could be spoofed by untrusted GitHub users. It suggests restricting the notes to comments authored by trusted users (e.g., owners, members, or collaborators) and adding unit tests to verify this behavior.
mattrbeck
force-pushed
the
surface-caretaker-note
branch
from
September 3, 2026 02:22
099715b to
a687efe
Compare
Apply magenta color styling to the quoted caretaker note when prompting during merge.
Restrict caretaker note extraction to comments authored by users with author association of OWNER, MEMBER, or COLLABORATOR to prevent spoofing from untrusted users.
mattrbeck
force-pushed
the
surface-caretaker-note
branch
from
September 4, 2026 01:08
a687efe to
617424f
Compare
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.
When merging a PR that has the
merge: caretaker notelabel applied, the CLI previously only showed a warning and a quick link to the PR on GitHub.This change:
magentaformatting to the quoted comment block to make the caretaker note clearly distinguishable in the terminal.