Skip to content

fix: provide merge context to beta conflict resolver #19055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hona merged 6 commits into from
Mar 25, 2026
Merged

fix: provide merge context to beta conflict resolver #19055

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73a84a6
fix: provide merge context to beta conflict resolver
Hona Mar 25, 2026
5655613
fix: exclude processed PRs from resolver context
Hona Mar 25, 2026
eddd9e0
refactor: simplify beta resolver prompt assembly
Hona Mar 25, 2026
8280691
Update beta.ts
Hona Mar 25, 2026
b320a7b
Update beta.ts
Hona Mar 25, 2026
4cfe2b9
fix: treat pending beta PRs as context only
Hona Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions script/beta.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,32 @@ async function cleanup() {
} catch {}
}

async function fix(pr: PR, files: string[]) {
async function fix(pr: PR, files: string[], prs: PR[], applied: number[], idx: number) {
console.log(` Trying to auto-resolve ${files.length} conflict(s) with opencode...`)

const done =
prs
.filter((x) => applied.includes(x.number))
.map((x) => `- #${x.number}: ${x.title}`)
.join("\n") || "(none yet)"

const next =
prs
.slice(idx + 1)
.map((x) => `- #${x.number}: ${x.title}`)
.join("\n") || "(none)"

const prompt = [
`Resolve the current git merge conflicts while merging PR #${pr.number} into the beta branch.`,
`PR #${pr.number}: ${pr.title}`,
`Only touch these files: ${files.join(", ")}.`,
`Merged PRs on HEAD:\n${done}`,
`Pending PRs after this one (context only):\n${next}`,
"IMPORTANT: The conflict resolution must be consistent with already-merged PRs.",
"Pending PRs are context only; do not introduce their changes unless they are already present on HEAD.",
"Prefer already-merged PRs over the base branch when resolving stacked conflicts.",
Comment on lines 69 to +76
Copy link

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR titles (and potentially author/login/labels if added later) are untrusted user-controlled input. Including ${pr.title} (and the done/next title lists) directly in the LLM prompt enables prompt-injection (e.g., a PR title containing instructions to ignore constraints or modify additional files). Consider sanitizing titles (strip newlines/control chars, truncate), and/or embedding these fields as quoted/escaped data (e.g., JSON-encoded) with explicit instruction to treat them as data only.

Copilot uses AI. Check for mistakes.
"If a PR already deleted a file/directory, do not re-add it, instead apply changes in the new semantic location.",
"If a PR already changed an import, keep that change.",
"Keep the merge in progress, do not abort the merge, and do not create a commit.",
"When done, leave the working tree with no unmerged files.",
].join("\n")
Expand Down Expand Up @@ -99,7 +120,7 @@ async function main() {
const applied: number[] = []
const failed: FailedPR[] = []

for (const pr of prs) {
for (const [idx, pr] of prs.entries()) {
console.log(`\nProcessing PR #${pr.number}: ${pr.title}`)

console.log(" Fetching PR head...")
Expand All @@ -119,7 +140,7 @@ async function main() {
const files = await conflicts()
if (files.length > 0) {
console.log(" Failed to merge (conflicts)")
if (!(await fix(pr, files))) {
if (!(await fix(pr, files, prs, applied, idx))) {
await cleanup()
failed.push({ number: pr.number, title: pr.title, reason: "Merge conflicts" })
await commentOnPR(pr.number, "Merge conflicts with dev branch")
Expand Down
Loading