Skip to content

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions apps/api/src/handlers/artifacts/upload-complete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,10 @@ export async function markArtifactUploadComplete(
);
}
if (notification === 'in_progress') {
// Another request is mid-delivery; 503 keeps the worker retrying until
// that delivery settles instead of reporting success while it can still
// fail and release its claim.
return c.json(
{ error: 'Artifact published; parent notification is in progress' },
503,
);
}

return new Response(null, { status: 200 });
}
1 change: 0 additions & 1 deletion apps/bullmq/src/jobs/pr-review-notification.test.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions apps/bullmq/src/jobs/pr-review-notification.ts
Original file line number Diff line number Diff line change
Expand Up @@ -784,19 +784,18 @@ export const prReviewNotificationJob = async (
suggestedActionPrompt: followUp.prompt,
}
: {}),
canonicalDeliveryOwned: data.ownershipVersion === 'canonical',
...(options.reviewActionDeliveryId
? { reviewActionDeliveryId: options.reviewActionDeliveryId }
: {}),
});
const deliveredToFastParent = await notifyFastParent({
const admittedToFastParent = await notifyFastParent({
includeSuggestedAction: Boolean(followUp && !autoHandleUserId),
...(webReviewActionDeliveryId
? { reviewActionDeliveryId: webReviewActionDeliveryId }
: {}),
});

if (deliveredToFastParent && webReviewActionDeliveryId) {
if (admittedToFastParent && webReviewActionDeliveryId) {
const { attached } =
await attachPendingPrReviewActionMessageWithRetirement(
webReviewActionDeliveryId,
Expand All @@ -818,7 +817,7 @@ export const prReviewNotificationJob = async (

let autoHandledText: string | null = null;
const ownsAutoHandleDispatch =
directAutoHandleRoute !== null || deliveredToFastParent;
directAutoHandleRoute !== null || admittedToFastParent;
if (
followUp &&
autoHandlePreference &&
Expand Down Expand Up @@ -953,7 +952,7 @@ ${delivery.text}`;
}
}

if (deliveredToFastParent && (!autoHandleUserId || autoHandledText)) {
if (admittedToFastParent && (!autoHandleUserId || autoHandledText)) {
await recordPrReviewNotificationDeliveryBestEffort({
runId: latestJob.id,
taskId: data.taskId,
Expand Down
9 changes: 5 additions & 4 deletions apps/bullmq/src/jobs/pull-request-mergeability-check.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ async function postConflictNotification(params: {

const title =
params.candidate.prTitle ?? `Pull request #${params.candidate.prNumber}`;
const deliveredToFastParent =
await notifyFastAgentParentOnPullRequestConflict({
const admittedToFastParent = await notifyFastAgentParentOnPullRequestConflict(
{
run: latestRun,
pullRequest: {
provider: 'github',
Expand All @@ -114,8 +114,9 @@ async function postConflictNotification(params: {
url: params.candidate.prUrl,
},
conflictDetectedAt: params.conflictDetectedAt,
});
if (deliveredToFastParent) return true;
},
);
if (admittedToFastParent) return true;

const route = await resolvePrReviewNotificationRoute(latestRun);
const text = buildCandidateConflictText(params.candidate);
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading