Files
archived-orca/src/shared/github/pull-request-stack-merge.ts
T
Kelvin Amoaba 89e272abc5 fix(mobile): use desktop's merge gating and PR link rules in the PR panel (#33982)
* fix(mobile): gate PR merge and linking on desktop's shared rules

Merge state moves to src/shared so the phone stops offering Merge on drafts,
conflicts and blocked PRs, and stops letting branch PRs override explicit links.

* fix(mobile): keep stack merges and stale-link recovery in the PR panel

Mobile now applies desktop's stack override and drops a linked PR the branch has moved
past, and only offers Ready for review when a relaying desktop also forwards it.

* fix(mobile): persist stale PR link clears and add a merge recheck

The phone now writes desktop's link clear instead of rereading the stale link, and a
blocked Merge can be rechecked since nothing on mobile polls PR state.

* fix(mobile): guard stale PR link clears like desktop

Re-reads the worktree before clearing so a link chosen after the lookup survives, and
localizes the merge-state strings the lift exposed to the coverage gate.

* test(mobile): drop identity test for worktree link params

* refactor(mobile): share one stack-merge decision and trim PR panel wiring

* fix(mobile): default worktree bare/archived flags for the stale-link guard

* fix(mobile): label the PR merge button from its default merge method
2026-10-27 02:12:00 +00:00

105 lines
2.9 KiB
TypeScript

import type { GitHubPRStack, GitHubPRStackEntry } from './pull-request-types'
export type GitHubPRStackMergeScope = {
count: number
complete: boolean
entries: GitHubPRStackEntry[]
}
export type GitHubPRStackMergeBlocker = {
reason:
| 'draft'
| 'closed'
| 'conflicts'
| 'changes_requested'
| 'review_required'
| 'behind'
| 'blocked'
prNumber: number
}
export function isGitHubPRStackMergeQueueRequired(
reviewMergeQueueRequired: boolean | null | undefined,
stackMergeQueueRequired: boolean | null | undefined
): boolean {
return reviewMergeQueueRequired === true || stackMergeQueueRequired === true
}
export function getGitHubPRStackMergeScope(stack: GitHubPRStack): GitHubPRStackMergeScope {
const entries = [...(stack.entries ?? [])]
.filter((entry) => entry.position <= stack.position)
.sort((a, b) => a.position - b.position)
const count = stack.position
const complete =
entries.length === count && entries.every((entry, index) => entry.position === index + 1)
return { count, complete, entries }
}
function stackEntryBlockerReason(
entry: GitHubPRStackEntry
): GitHubPRStackMergeBlocker['reason'] | null {
if (entry.state === 'draft') {
return 'draft'
}
if (entry.state === 'closed') {
return 'closed'
}
if (entry.mergeable === 'CONFLICTING' || entry.mergeStateStatus === 'DIRTY') {
return 'conflicts'
}
if (entry.reviewDecision === 'CHANGES_REQUESTED') {
return 'changes_requested'
}
if (entry.reviewDecision === 'REVIEW_REQUIRED') {
return 'review_required'
}
if (entry.mergeStateStatus === 'BEHIND') {
return 'behind'
}
if (entry.mergeStateStatus === 'BLOCKED') {
return 'blocked'
}
return null
}
export function getGitHubPRStackMergeBlocker(
scope: GitHubPRStackMergeScope
): GitHubPRStackMergeBlocker | null {
for (const entry of scope.entries) {
const reason = stackEntryBlockerReason(entry)
if (reason) {
return { reason, prNumber: entry.number }
}
}
return null
}
export type GitHubPRStackMergeDecision = {
scope: GitHubPRStackMergeScope
blocker: GitHubPRStackMergeBlocker | null
usesMergeQueue: boolean
directMergeAvailable: boolean
}
// A stack merge lands every PR below this one, so the stack's readiness replaces this PR's merge state.
export function resolveGitHubPRStackMergeDecision(args: {
stack: GitHubPRStack
reviewMergeQueueRequired: boolean | null | undefined
stackMergeQueueRequired: boolean | null | undefined
directMergeAvailable: boolean
}): GitHubPRStackMergeDecision {
const scope = getGitHubPRStackMergeScope(args.stack)
const blocker = getGitHubPRStackMergeBlocker(scope)
const usesMergeQueue = isGitHubPRStackMergeQueueRequired(
args.reviewMergeQueueRequired,
args.stackMergeQueueRequired
)
return {
scope,
blocker,
usesMergeQueue,
directMergeAvailable:
!blocker && (scope.complete || args.directMergeAvailable || usesMergeQueue)
}
}