mirror of
https://github.com/stablyai/orca.git
synced 2026-10-20 16:03:20 +00:00
- Create PR now fast-forwards behind-only branches before committing, using
git pull --ff-only. This prevents the dirty-then-ahead+behind stall that
occurred after commit without prior sync.
- Refactor runRemoteAction to return explicit status ('ok', 'failed',
'superseded', 'skipped') instead of boolean ok + nullable error. Allows
callers to distinguish real failures from action supersession or skips
without stale-cache issues.
- Remove isCreatePrIntentSyncConflictError function and sync-conflict-specific
copy since --ff-only fails cleanly if branch diverged; no merge conflicts
to resolve.
- Extract isBehindOnlyUpstream predicate to shared module so eligibility
checks and the one-click flow always agree.
100 lines
3.5 KiB
TypeScript
100 lines
3.5 KiB
TypeScript
import { isBehindOnlyUpstream, shouldForcePushWithLeaseForUpstream } from './git-upstream-status'
|
|
import type { HostedReviewCreationEligibility } from './hosted-review'
|
|
import { supportsHostedReviewCreation } from './hosted-review-creation-providers'
|
|
import type { GitUpstreamStatus } from './git-status-types'
|
|
import type { SourceControlPrimaryActionDecision } from './source-control-primary-action-decision-types'
|
|
|
|
export type CreateReviewIntentKind =
|
|
| 'dirty'
|
|
| 'message_required'
|
|
| 'no_upstream'
|
|
| 'needs_push'
|
|
| 'needs_sync'
|
|
| 'force_push'
|
|
|
|
export type CreateReviewIntentEligibility = {
|
|
eligible: boolean
|
|
kind: CreateReviewIntentKind | null
|
|
}
|
|
|
|
export function resolveCreateReviewIntentEligibility({
|
|
stagedCount,
|
|
hasStageableChanges,
|
|
hasMessage,
|
|
hasUnresolvedConflicts,
|
|
upstreamStatus,
|
|
hostedReviewCreation,
|
|
branchCommitsAhead,
|
|
hasCurrentBranch = true
|
|
}: {
|
|
stagedCount: number
|
|
hasStageableChanges: boolean
|
|
hasMessage: boolean
|
|
hasUnresolvedConflicts: boolean
|
|
upstreamStatus: GitUpstreamStatus | undefined
|
|
hostedReviewCreation?: HostedReviewCreationEligibility | null
|
|
branchCommitsAhead?: number
|
|
hasCurrentBranch?: boolean
|
|
}): CreateReviewIntentEligibility {
|
|
if (
|
|
hasUnresolvedConflicts ||
|
|
!hasCurrentBranch ||
|
|
!hostedReviewCreation ||
|
|
hostedReviewCreation.canCreate ||
|
|
// Fail closed when the existing-review lookup could not prove there is no
|
|
// review: a local blocker (e.g. needs_push) returned after a failed lookup
|
|
// must not offer a Create PR intent that would push under a false promise —
|
|
// the main preflight would refuse the create anyway (invariant 8).
|
|
hostedReviewCreation.reviewLookupOutcome === 'unavailable' ||
|
|
!supportsHostedReviewCreation(hostedReviewCreation.provider)
|
|
) {
|
|
return { eligible: false, kind: null }
|
|
}
|
|
|
|
if (hostedReviewCreation.blockedReason === 'dirty') {
|
|
if (stagedCount > 0 && !hasMessage) {
|
|
return { eligible: true, kind: 'message_required' }
|
|
}
|
|
return { eligible: stagedCount > 0 || hasStageableChanges, kind: 'dirty' }
|
|
}
|
|
|
|
if (hostedReviewCreation.blockedReason === 'no_upstream') {
|
|
const hasPublishableCommits = branchCommitsAhead === undefined ? false : branchCommitsAhead > 0
|
|
return {
|
|
eligible: hasPublishableCommits || stagedCount > 0 || hasStageableChanges,
|
|
kind: 'no_upstream'
|
|
}
|
|
}
|
|
|
|
if (hostedReviewCreation.blockedReason === 'needs_push') {
|
|
return { eligible: true, kind: 'needs_push' }
|
|
}
|
|
|
|
if (
|
|
hostedReviewCreation.blockedReason === 'needs_sync' &&
|
|
shouldForcePushWithLeaseForUpstream(upstreamStatus)
|
|
) {
|
|
return { eligible: true, kind: 'force_push' }
|
|
}
|
|
|
|
// Why: a behind-only branch is safe to prepare with `git pull --ff-only`, so
|
|
// the intent flow can handle it in one click. A genuinely diverged branch
|
|
// stays ineligible — auto-merging would reconcile without consent, so the
|
|
// user keeps the explicit sync-first step.
|
|
if (hostedReviewCreation.blockedReason === 'needs_sync' && isBehindOnlyUpstream(upstreamStatus)) {
|
|
return { eligible: true, kind: 'needs_sync' }
|
|
}
|
|
|
|
return { eligible: false, kind: null }
|
|
}
|
|
|
|
export function resolveVisibleCreateReviewHeaderAction({
|
|
createPrHeaderAction
|
|
}: {
|
|
createPrHeaderAction: SourceControlPrimaryActionDecision | null
|
|
}): SourceControlPrimaryActionDecision | null {
|
|
// Why: keep a stable header anchor; disable Create Review when the branch is
|
|
// not ready instead of hiding it and shifting toolbar layout.
|
|
return createPrHeaderAction
|
|
}
|