canopycms 0.8.1 → 0.8.2

package/dist/editor/BranchManager.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from 'react';
-import { ActionIcon, Badge, Button, Group, Menu, Paper, ScrollArea, Stack, Text, TextInput, Textarea, Collapse, Tooltip, } from '@mantine/core';
+import { ActionIcon, Anchor, Badge, Button, Group, Menu, Paper, ScrollArea, Stack, Text, TextInput, Textarea, Collapse, Tooltip, } from '@mantine/core';
 import { IconDots, IconExternalLink } from '@tabler/icons-react';
 import { BranchComments } from './comments/BranchComments.js';
 import { UserBadge } from './components/UserBadge.js';
@@ -13,9 +13,10 @@ import { parseCreatedBranchName } from '../paths/validation.js';
 import { DestructiveMenuItem } from './components/DestructiveMenuItem.js';
 import { ReasonedMenuItem } from './components/ReasonedMenuItem.js';
 import { RelativeTime } from './components/RelativeTime.js';
-import { branchStatusPresentation } from './branch-status.js';
+import { HOLD_BADGE, SYNC_FAILED_IN_REVIEW_NOTE, branchHoldMessage, endSentence, syncFailedFallback, branchStatusPresentation, } from './branch-status.js';
+import { TooltipDetail } from './components/TooltipDetail.js';
 import { branchAddress, displayBranchName } from './branch-names.js';
-import { CLOSED_PULL_REQUEST_REASON, EDITOR_ACTIONS } from './copy.js';
+import { CLOSED_PULL_REQUEST_REASON, EDITOR_ACTIONS, rewrittenSubmitReason, UNFINISHED_SUBMIT_APPROVE_REASON, } from './copy.js';
 import { isReviewerOfOthersReview } from '../authorization/review-role.js';
 import { SYSTEM_USER_ID } from '../system-users.js';
 /**
@@ -51,8 +52,8 @@ export const getBranchPermissions = (branch, user) => {
         (userIsCreator || userInACL || isSystemBranch || userIsAdmin || userIsReviewer);
     // Submit: can perform workflow actions AND the server says submit isn't
     // blocked. `submitBlocked` is the server's own compound answer -- status
-    // past 'editing' OR the protected base branch -- computed once in
-    // `getBranchWriteProtection` (protected-branch.ts) and threaded through
+    // past 'editing', the protected base branch, or a rewrite on GitHub --
+    // computed once in `toBranchListItem` (api/branch.ts) and threaded through
     // unchanged.
     //
     // `?? true`, not a bare `!branch.submitBlocked`: the field is optional (like
@@ -80,10 +81,11 @@ export const getBranchPermissions = (branch, user) => {
     // Approve and Request changes: a Reviewer or Admin other than the creator, who for an author
     // would only do what Withdraw does. Neither applies to the protected base branch, whose way
     // out of review is Withdraw. A closed PR refuses both (Request changes converts the PR to
-    // a draft); Approve also needs the branch submitted, Request changes accepts approved too.
+    // a draft); Approve also needs the branch submitted and its last submit finished, Request changes
+    // accepts approved too.
     const reviewsOthers = (userIsAdmin || userIsReviewer) && !userIsCreator && !branch.isProtected;
     const prLive = branch.pullRequestState !== 'closed';
-    const canApprove = reviewsOthers && branch.status === 'submitted' && prLive;
+    const canApprove = reviewsOthers && branch.status === 'submitted' && prLive && !branch.approveBlocked;
     const canRequestChanges = reviewsOthers && (branch.status === 'submitted' || branch.status === 'approved') && prLive;
     return {
         hasWorkflowAccess: canPerformWorkflowActions,
@@ -102,7 +104,7 @@ const noUserLookup = async () => null;
  * author's way back. A user without workflow access is offered neither, since it
  * would never apply to them; a reason is given only for a block that depends on the branch's state.
  */
-const workflowAction = (b, perms, onSubmit, onWithdraw) => {
+const workflowAction = (b, perms, onSubmit, onWithdraw, userIsAdmin) => {
     if (!perms.hasWorkflowAccess)
         return undefined;
     if (b.status === 'submitted' || b.status === 'approved') {
@@ -119,7 +121,11 @@ const workflowAction = (b, perms, onSubmit, onWithdraw) => {
             color: 'brand',
             testId: `submit-branch-button-${b.name}`,
             run: () => onSubmit?.(b.name),
-            blockedReason: perms.canSubmit ? undefined : "This branch can't be submitted right now.",
+            blockedReason: perms.canSubmit
+                ? undefined
+                : b.hold?.kind === 'rewritten'
+                    ? rewrittenSubmitReason(userIsAdmin)
+                    : "This branch can't be submitted right now.",
         };
     }
     return undefined;
@@ -133,6 +139,9 @@ const reviewsOthersBranch = (b, user) => isReviewerOfOthersReview({
     isProtected: b.isProtected,
     pullRequestState: b.pullRequestState,
 }, user);
+/** Lets the card's details shrink beside its actions, which a long unbroken name would push out. */
+const CARD_DETAILS = { minWidth: 0, flex: 1 };
+const WRAP_ANYWHERE = { overflowWrap: 'anywhere' };
 /**
  * One branch: its state, and one primary action, with the rest in a "…" menu. The current branch
  * shows its workflow action; to a reviewer of someone else's submission it shows Approve, with
@@ -143,9 +152,9 @@ const reviewsOthersBranch = (b, user) => isReviewerOfOthersReview({
 const BranchCard = ({ branch: b, isCurrent, workflowBlockedReason, user, onSelect, onSubmit, onWithdraw, onApprove, onRequestChanges, onDelete, onGetUserMetadata, onGetOwnerMetadata = onGetUserMetadata, }) => {
     const statusBadge = branchStatusPresentation(b.status, b.isProtected);
     const perms = getBranchPermissions(b, user);
-    const action = workflowAction(b, perms, onSubmit, onWithdraw);
-    const workflow = action && workflowBlockedReason ? { ...action, blockedReason: workflowBlockedReason } : action;
     const userIsAdmin = isAdmin(user?.groups);
+    const action = workflowAction(b, perms, onSubmit, onWithdraw, userIsAdmin);
+    const workflow = action && workflowBlockedReason ? { ...action, blockedReason: workflowBlockedReason } : action;
     // The open branch holds back its review actions as it does its workflow action; the reason is
     // given only for the open branch.
     const heldBack = (a) => a && workflowBlockedReason ? { ...a, blockedReason: workflowBlockedReason } : a;
@@ -157,7 +166,11 @@ const BranchCard = ({ branch: b, isCurrent, workflowBlockedReason, user, onSelec
             color: 'brand',
             testId: `approve-branch-button-${b.name}`,
             run: () => onApprove?.(b.name),
-            blockedReason: perms.canApprove ? undefined : CLOSED_PULL_REQUEST_REASON,
+            blockedReason: perms.canApprove
+                ? undefined
+                : b.pullRequestState === 'closed'
+                    ? CLOSED_PULL_REQUEST_REASON
+                    : UNFINISHED_SUBMIT_APPROVE_REASON,
         }
         : undefined);
     const requestChanges = heldBack(reviewsOthers && (b.status === 'submitted' || b.status === 'approved')
@@ -178,24 +191,36 @@ const BranchCard = ({ branch: b, isCurrent, workflowBlockedReason, user, onSelec
     // alone once approved. Reviewing another one, Review opens it and the actions wait in the menu.
     const primary = !isCurrent ? undefined : reviewing ? (approve ?? requestChanges) : workflow;
     const secondary = isCurrent && reviewing && approve ? requestChanges : undefined;
-    // Two visible actions, or the long "Withdraw from review", would crowd the title at the drawer's
-    // width, so they take a row below it. Open and Review stay beside the title.
-    const actionRow = !!secondary || primary?.label === EDITOR_ACTIONS.withdrawFromReview;
+    // Two visible actions, the long "Withdraw from review", or any action beside a hold's line would
+    // crowd the details at the drawer's width, so they take a row below. Open and Review stay beside
+    // the title.
+    const actionRow = !!secondary || primary?.label === EDITOR_ACTIONS.withdrawFromReview || (!!primary && !!b.hold);
     const menuActions = [approve, requestChanges, workflow].filter((a) => !!a && a !== primary && a !== secondary);
     const showViewPullRequest = !!b.pullRequestUrl;
     const showDelete = !b.isProtected && (userIsAdmin || (!!user && b.createdBy === user.userId));
     const hasMenu = menuActions.length > 0 || showViewPullRequest || showDelete;
     const menuLabel = `More actions for ${displayBranchName(b)}`;
     const [menuOpen, setMenuOpen] = useState(false);
-    return (_jsxs(Paper, { withBorder: true, p: "md", shadow: "xs", "aria-current": isCurrent ? 'true' : undefined, "data-current": isCurrent || undefined, "data-testid": `branch-list-item-${b.name}`, children: [_jsxs(Group, { justify: "space-between", align: "flex-start", wrap: "nowrap", children: [_jsxs(Stack, { gap: 4, children: [_jsxs(Group, { gap: "xs", children: [_jsx(Text, { fw: 600, children: displayBranchName(b) }), isCurrent && (_jsx(Badge, { color: "brand", variant: "filled", "data-testid": `branch-current-badge-${b.name}`, children: "Current" })), statusBadge && (_jsx(Badge, { color: statusBadge.color, variant: statusBadge.variant, "data-testid": `branch-status-badge-${b.name}`, "data-status": b.status, "data-protected": b.isProtected || undefined, children: statusBadge.label })), b.status === 'archived' && b.mergedAt && (_jsx(Badge, { color: "teal", variant: "light", "data-testid": `branch-merged-badge-${b.name}`, children: "Merged" })), b.pullRequestNumber && (_jsxs(Badge, { color: b.pullRequestState === 'closed'
+    const inReview = b.status === 'submitted' || b.status === 'approved';
+    const holdViewer = {
+        role: reviewing ? 'review' : perms.canWithdraw ? 'withdraw' : 'none',
+        isAdmin: userIsAdmin,
+    };
+    return (_jsxs(Paper, { withBorder: true, p: "md", shadow: "xs", "aria-current": isCurrent ? 'true' : undefined, "data-current": isCurrent || undefined, "data-testid": `branch-list-item-${b.name}`, children: [_jsxs(Group, { justify: "space-between", align: "flex-start", wrap: "nowrap", children: [_jsxs(Stack, { gap: 4, style: CARD_DETAILS, children: [_jsxs(Group, { gap: "xs", children: [_jsx(Text, { fw: 600, style: WRAP_ANYWHERE, children: displayBranchName(b) }), isCurrent && (_jsx(Badge, { color: "brand", variant: "filled", "data-testid": `branch-current-badge-${b.name}`, children: "Current" })), statusBadge && (_jsx(Badge, { color: statusBadge.color, variant: statusBadge.variant, "data-testid": `branch-status-badge-${b.name}`, "data-status": b.status, "data-protected": b.isProtected || undefined, children: statusBadge.label })), b.hold && (_jsx(Badge, { color: HOLD_BADGE.color, variant: "light", "data-testid": `held-badge-${b.name}`, children: HOLD_BADGE.label })), b.status === 'archived' && b.mergedAt && (_jsx(Badge, { color: "teal", variant: "light", "data-testid": `branch-merged-badge-${b.name}`, children: "Merged" })), b.pullRequestNumber && (_jsxs(Badge, { color: b.pullRequestState === 'closed'
                                             ? 'red'
                                             : b.pullRequestState === 'merged'
                                                 ? 'violet'
-                                                : 'blue', variant: "light", children: ["PR #", b.pullRequestNumber, b.pullRequestState === 'closed' ? ' (closed)' : ''] })), b.commentCount !== undefined && b.commentCount > 0 && (_jsxs(Badge, { color: "grape", variant: "light", children: [b.commentCount, " ", b.commentCount === 1 ? 'comment' : 'comments'] })), b.syncStatus === 'sync-failed' && (_jsx(Tooltip, { label: "GitHub sync failed \u2014 an admin can retry it from System health.", disabled: Boolean(b.syncFailureReason), multiline: true, maw: 320, children: _jsx(Badge, { color: "red", variant: "light", "data-testid": `sync-failed-badge-${b.name}`, children: "Sync failed" }) })), b.syncStatus === 'pending-sync' && (_jsx(Tooltip, { label: "Changes are on their way to GitHub.", children: _jsx(Badge, { color: "gray", variant: "light", "data-testid": `pending-sync-badge-${b.name}`, children: "Syncing\u2026" }) })), b.conflictStatus === 'conflicts-detected' && (_jsx(Tooltip, { label: "This branch's version was kept for conflicting entries during a rebase \u2014 review the flagged entries.", children: _jsxs(Badge, { color: "orange", variant: "light", "data-testid": `conflicts-badge-${b.name}`, children: ["Conflicts", b.conflictFiles?.length ? ` (${b.conflictFiles.length})` : ''] }) }))] }), b.syncStatus === 'sync-failed' && b.syncFailureReason && (_jsxs(Text, { size: "xs", c: "var(--canopy-danger-text)", maw: 480, "data-testid": `sync-failed-reason-${b.name}`, children: [b.syncFailureReason, b.status === 'submitted' && ' Withdraw it from review to make changes.'] })), _jsxs(Group, { gap: "xs", align: "center", children: [b.updatedAt && (_jsx(RelativeTime, { iso: b.updatedAt, prefix: "Updated ", size: "xs", c: "dimmed" })), b.createdBy && (_jsxs(Group, { gap: "xs", align: "center", wrap: "nowrap", children: [_jsx(Text, { size: "xs", c: "dimmed", children: "\u2022" }), _jsxs(Group, { gap: 4, align: "center", wrap: "nowrap", children: [_jsx(Text, { size: "xs", c: "dimmed", children: "Owner:" }), _jsx(UserBadge, { userId: b.createdBy, getUserMetadata: onGetOwnerMetadata ?? noUserLookup, variant: "avatar-name", size: "xs", showEmailTooltip: true, showBadge: true, badgeVariant: "light", color: "gray" })] })] }))] }), b.access && (_jsx(BranchAccessList, { users: b.access.users, groups: b.access.groups, withheldUsers: b.access.withheldUsers, withheldGroups: b.access.withheldGroups, getUserMetadata: onGetOwnerMetadata ?? noUserLookup }))] }), _jsxs(Group, { gap: 8, wrap: "nowrap", children: [!isCurrent && (_jsx(Button, { variant: "light", onClick: () => onSelect?.(b.name), "data-testid": reviewing ? `review-branch-button-${b.name}` : `switch-to-branch-button-${b.name}`, children: reviewing ? EDITOR_ACTIONS.review : 'Open' })), !actionRow && primary && _jsx(CardActionButton, { action: primary }), hasMenu && (_jsxs(Menu, { withinPortal: true, shadow: "sm", position: "bottom-end", width: 280, onChange: setMenuOpen, children: [_jsx(Tooltip, { label: menuLabel, disabled: menuOpen, children: _jsx(Menu.Target, { children: _jsx(ActionIcon, { variant: "subtle", color: "gray", "aria-label": menuLabel, "data-testid": `branch-actions-menu-${b.name}`, children: _jsx(IconDots, { size: 16, "aria-hidden": true }) }) }) }), _jsxs(Menu.Dropdown, { children: [menuActions.map((action) => (_jsx(ReasonedMenuItem, { blockedReason: action.blockedReason, showReason: !action.reasonShownBy, reasonId: `${action.testId}-reason`, reasonDescribedBy: action.reasonShownBy ? `${action.reasonShownBy}-reason` : undefined, onClick: action.run, "data-testid": action.testId, children: action.label }, action.testId))), showViewPullRequest && (_jsx(Menu.Item, { component: "a", href: b.pullRequestUrl, target: "_blank", rel: "noopener noreferrer", leftSection: _jsx(IconExternalLink, { size: 14, "aria-hidden": true }), "data-testid": `view-pull-request-${b.name}`, children: b.pullRequestNumber
+                                                : 'blue', variant: "light", children: ["PR #", b.pullRequestNumber, b.pullRequestState === 'closed' ? ' (closed)' : ''] })), b.commentCount !== undefined && b.commentCount > 0 && (_jsxs(Badge, { color: "grape", variant: "light", children: [b.commentCount, " ", b.commentCount === 1 ? 'comment' : 'comments'] })), b.syncStatus === 'sync-failed' && (_jsx(Badge, { color: "red", variant: "light", "data-testid": `sync-failed-badge-${b.name}`, children: "Sync failed" })), b.syncStatus === 'pending-sync' && (_jsx(Tooltip, { label: "Changes are on their way to GitHub.", children: _jsx(Badge, { color: "gray", variant: "light", "data-testid": `pending-sync-badge-${b.name}`, children: "Syncing\u2026" }) })), b.conflictStatus === 'conflicts-detected' && (_jsx(TooltipDetail, { detail: "This branch's version was kept for conflicting entries. Review the flagged entries.", children: _jsxs(Badge, { color: "orange", variant: "light", "data-testid": `conflicts-badge-${b.name}`, children: ["Conflicts", b.conflictFiles?.length ? ` (${b.conflictFiles.length})` : ''] }) }))] }), b.hold && (_jsxs(Text, { size: "xs", maw: 480, style: WRAP_ANYWHERE, "data-testid": `branch-hold-${b.name}`, children: [branchHoldMessage(b.hold, holdViewer), b.hold.kind === 'retargeted' && b.pullRequestUrl && (_jsxs(_Fragment, { children: [' ', _jsx(Anchor, { href: b.pullRequestUrl, target: "_blank", rel: "noreferrer", inherit: true, children: "View pull request" })] }))] })), b.syncStatus === 'sync-failed' &&
+                                (b.hold ? b.hold.kind !== 'rewritten' && !!b.syncFailureReason?.trim() : true) && (_jsxs(Text, { size: "xs", c: "var(--canopy-danger-text)", maw: 480, style: WRAP_ANYWHERE, "data-testid": `sync-failed-reason-${b.name}`, children: [endSentence(b.syncFailureReason?.trim() || syncFailedFallback(userIsAdmin, b.status)), !b.hold && inReview && b.pullRequestNumber && ` ${SYNC_FAILED_IN_REVIEW_NOTE}`, !b.hold &&
+                                        inReview &&
+                                        holdViewer.role === 'withdraw' &&
+                                        ' Withdraw the branch from review to make changes.'] })), _jsxs(Group, { gap: "xs", align: "center", children: [b.updatedAt && (_jsx(RelativeTime, { iso: b.updatedAt, prefix: "Updated ", size: "xs", c: "dimmed" })), b.createdBy && (_jsxs(Group, { gap: "xs", align: "center", wrap: "nowrap", children: [_jsx(Text, { size: "xs", c: "dimmed", children: "\u2022" }), _jsxs(Group, { gap: 4, align: "center", wrap: "nowrap", children: [_jsx(Text, { size: "xs", c: "dimmed", children: "Owner:" }), _jsx(UserBadge, { userId: b.createdBy, getUserMetadata: onGetOwnerMetadata ?? noUserLookup, variant: "avatar-name", size: "xs", showEmailTooltip: true, showBadge: true, badgeVariant: "light", color: "gray" })] })] }))] }), b.access && (_jsx(BranchAccessList, { users: b.access.users, groups: b.access.groups, withheldUsers: b.access.withheldUsers, withheldGroups: b.access.withheldGroups, getUserMetadata: onGetOwnerMetadata ?? noUserLookup }))] }), _jsxs(Group, { gap: 8, wrap: "nowrap", children: [!isCurrent && (_jsx(Button, { variant: "light", onClick: () => onSelect?.(b.name), "data-testid": reviewing ? `review-branch-button-${b.name}` : `switch-to-branch-button-${b.name}`, children: reviewing ? EDITOR_ACTIONS.review : 'Open' })), !actionRow && primary && _jsx(CardActionButton, { action: primary }), hasMenu && (_jsxs(Menu, { withinPortal: true, shadow: "sm", position: "bottom-end", width: 280, onChange: setMenuOpen, children: [_jsx(Tooltip, { label: menuLabel, disabled: menuOpen, children: _jsx(Menu.Target, { children: _jsx(ActionIcon, { variant: "subtle", color: "gray", "aria-label": menuLabel, "data-testid": `branch-actions-menu-${b.name}`, children: _jsx(IconDots, { size: 16, "aria-hidden": true }) }) }) }), _jsxs(Menu.Dropdown, { children: [menuActions.map((action) => (_jsx(ReasonedMenuItem, { blockedReason: action.blockedReason, showReason: !action.reasonShownBy, reasonId: `${action.testId}-reason`, reasonDescribedBy: action.reasonShownBy ? `${action.reasonShownBy}-reason` : undefined, onClick: action.run, "data-testid": action.testId, children: action.label }, action.testId))), showViewPullRequest && (_jsx(Menu.Item, { component: "a", href: b.pullRequestUrl, target: "_blank", rel: "noopener noreferrer", leftSection: _jsx(IconExternalLink, { size: 14, "aria-hidden": true }), "data-testid": `view-pull-request-${b.name}`, children: b.pullRequestNumber
                                                     ? `View pull request #${b.pullRequestNumber}`
                                                     : 'View pull request' })), showDelete && (_jsxs(_Fragment, { children: [(menuActions.length > 0 || showViewPullRequest) && _jsx(Menu.Divider, {}), _jsx(DestructiveMenuItem, { "data-testid": `delete-branch-button-${b.name}`, blockedReason: b.status === 'submitted' || b.status === 'approved'
                                                             ? 'This branch is in review. Withdraw it from review before deleting it.'
-                                                            : undefined, onClick: () => onDelete?.(b.name), children: "Delete branch" })] }))] })] }))] })] }), actionRow && (_jsxs(Group, { justify: "flex-end", gap: 8, wrap: "nowrap", mt: "sm", "data-testid": `branch-action-row-${b.name}`, children: [secondary && _jsx(CardActionButton, { action: secondary }), primary && _jsx(CardActionButton, { action: primary })] }))] }));
+                                                            : b.hold?.kind === 'unpublished-at-merge' && !userIsAdmin
+                                                                ? 'This branch may hold changes that never reached GitHub. Ask an admin to check it before deleting it.'
+                                                                : undefined, onClick: () => onDelete?.(b.name), children: "Delete branch" })] }))] })] }))] })] }), actionRow && (_jsxs(Group, { justify: "flex-end", gap: 8, wrap: "nowrap", mt: "sm", "data-testid": `branch-action-row-${b.name}`, children: [secondary && _jsx(CardActionButton, { action: secondary }), primary && _jsx(CardActionButton, { action: primary })] }))] }));
 };
 const CardActionButton = ({ action }) => (_jsx(Tooltip, { label: action.blockedReason, disabled: !action.blockedReason, multiline: true, maw: 280, children: _jsx(Button, { variant: "light", color: action.color, onClick: () => {
             if (!action.blockedReason)

package/dist/editor/Editor.js

@@ -1578,6 +1578,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
                         branchMissing,
                         reviewing: branchReviewing,
                         pullRequestClosed: branchPullRequestClosed,
+                        approveBlocked: currentBranch?.approveBlocked,
                     }), dirtyPaths: dirtyPaths, reveal: contentReveal, onRevealed: () => setContentReveal(undefined), entryFilter: entryFilter === 'changed' && !changesOffered ? 'all' : entryFilter, onEntryFilterChange: setEntryFilter, onShowUnsaved: showUnsaved, onShowDeletedChanges: (entry, label) => showEntryChanges(entry, label, 'deleted row'), branchChanges: changesOffered
                     ? {
                         base: branchChanges.data?.base ?? currentBranch?.baseBranch ?? 'the base branch',
@@ -1601,7 +1602,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
                     // branchWriteBlocked reuses branchContentLocked itself rather than
                     // re-deriving `?? true` a second time here, so there is exactly one
                     // fail-closed computation of "are writes blocked" in this component.
-                    branchIsProtected: currentBranch?.isProtected ?? true, branchServerProtected: currentBranch?.isProtected, branchReadOnly: currentBranch?.readOnly, branchWriteBlocked: branchContentLocked, branchLoading: branchLoading, branchPending: branchPending, branchMissing: branchMissing, branchToggleRef: branchToggleRef, onBranchReloadData: () => {
+                    branchIsProtected: currentBranch?.isProtected ?? true, branchServerProtected: currentBranch?.isProtected, branchReadOnly: currentBranch?.readOnly, branchHold: currentBranch?.hold, branchApproveBlocked: currentBranch?.approveBlocked, branchWriteBlocked: branchContentLocked, branchLoading: branchLoading, branchPending: branchPending, branchMissing: branchMissing, branchToggleRef: branchToggleRef, onBranchReloadData: () => {
                         void Promise.all([handleReloadBranchData(), refreshEntries(branchNameState)]).catch(console.error);
                     }, onBranchDiscardDrafts: () => handleDiscardDrafts(() => branchToggleRef.current), onBranchManagerOpen: openBranchManager, onNewBranch: () => openBranchManager({ create: true }), onSaveAll: runSaveAll, saveAllProgress: saveAllProgress, 
                     // On any entry: EntryHeader's `saving` is the open entry's alone.
@@ -1634,7 +1635,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
                             // True exactly while the form below shows "Setting up…" or "Loading content…".
                             entryLoading: !currentEntry && ((!branchNameState && busy) || entriesInitializing), branchName: branchNameState, busy: busy, breadcrumbSegments: breadcrumbSegments, 
                             // A draft kept for an unavailable entry stays in storage but cannot be saved.
-                            hasUnsavedChanges: !currentEntryUnavailable && !contentReadOnly && isSelectedDirty(), entryHasDraft: isSelectedDirty(), entryReadOnly: currentEntry?.canEdit === false, entryUnavailable: currentEntryUnavailable, draftStorageFailed: draftStorageFailed, branchStatus: currentBranch?.status, branchReadOnly: currentBranch?.readOnly, branchWriteBlocked: branchContentLocked, branchLoading: branchLoading, branchPending: branchPending, branchMissing: branchMissing, branchReviewing: branchReviewing, branchPullRequestClosed: branchPullRequestClosed, onCollectionOpen: (path) => revealInContentPanel({ kind: 'collection', path }), onEntryReveal: () => currentEntry && revealInContentPanel({ kind: 'entry', path: currentEntry.path }), navigatorToggleRef: navigatorToggleRef, onShowChanges: openEntryChange
+                            hasUnsavedChanges: !currentEntryUnavailable && !contentReadOnly && isSelectedDirty(), entryHasDraft: isSelectedDirty(), entryReadOnly: currentEntry?.canEdit === false, entryUnavailable: currentEntryUnavailable, draftStorageFailed: draftStorageFailed, branchStatus: currentBranch?.status, branchReadOnly: currentBranch?.readOnly, branchWriteBlocked: branchContentLocked, branchLoading: branchLoading, branchPending: branchPending, branchMissing: branchMissing, branchReviewing: branchReviewing, branchPullRequestClosed: branchPullRequestClosed, branchApproveBlocked: currentBranch?.approveBlocked, onCollectionOpen: (path) => revealInContentPanel({ kind: 'collection', path }), onEntryReveal: () => currentEntry && revealInContentPanel({ kind: 'entry', path: currentEntry.path }), navigatorToggleRef: navigatorToggleRef, onShowChanges: openEntryChange
                                 ? () => showEntryChanges(openEntryChange, currentEntry?.label ?? currentEntry?.slug ?? '', 'header')
                                 : undefined, showChangesPending: changesOffered && !!currentEntry, showChangesRef: showChangesRef, onFileReload: () => handleReload(() => navigatorToggleRef.current), onFileDiscardDraft: () => handleDiscardFileDraft(() => navigatorToggleRef.current), onEntryRename: () => currentEntry && handleRenameEntry(currentEntry.path, true), onEntryDelete: () => currentEntry && handleDeleteEntry(currentEntry.path, true), onSave: currentEntryUnavailable ? noop : handleSave, saveAllRunning: !!saveAllProgress, saving: singleSaving?.branch === branchNameState &&
                                 singleSaving.contentId === currentEntry?.contentId, savedSignal: lastSaved?.seq, savedHere: lastSaved?.branch === branchNameState &&

package/dist/editor/admin/SystemHealthPanel.js

@@ -9,8 +9,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * only for admins (see isAdmin(userContext?.groups)); this component does not
  * re-check that itself, same as GroupManager and PermissionManager.
  */
-import { Alert, Badge, Box, Button, Code, Group, Loader, Modal, Paper, SegmentedControl, SimpleGrid, Spoiler, Stack, Table, Tabs, Text, ThemeIcon, Tooltip, VisuallyHidden, } from '@mantine/core';
-import { useId } from 'react';
+import { useRef } from 'react';
+import { Alert, Badge, Button, Code, Group, Loader, Modal, Paper, SegmentedControl, SimpleGrid, Spoiler, Stack, Table, Tabs, Text, ThemeIcon, Tooltip, } from '@mantine/core';
 import { IconAlertCircle, IconAlertTriangle } from '@tabler/icons-react';
 import { openConfirm } from '../utils/confirm-modal.js';
 import { focusReturnProps } from '../utils/focus-return.js';
@@ -18,7 +18,9 @@ import { formatRelativeTime } from '../relative-time.js';
 import { EDITOR_ACTIONS } from '../copy.js';
 import { useSystemHealth, } from './useSystemHealth.js';
 import { escapeForLog } from '../../utils/escape-text.js';
-import { branchStatusPresentation } from '../branch-status.js';
+import { TooltipDetail } from '../components/TooltipDetail.js';
+import { DISMISS_UNPUBLISHED_ATTRIBUTE, UnpublishedAtMergeAlert } from './UnpublishedAtMergeAlert.js';
+import { HOLD_BADGE, branchHoldMessage, branchStatusPresentation, endSentence, } from '../branch-status.js';
 // ============================================================================
 // Small pure helpers
 // ============================================================================
@@ -104,6 +106,14 @@ const BASE_REFRESH_LABELS = {
     'skipped-not-provisioned': 'not yet provisioned',
     failed: 'refresh failed',
 };
+/**
+ * A failed sync's detail, with the advice to retry only when a retry can help. The worker refuses
+ * every push while a rewrite stands, an archived branch has nothing left to finish, and a submit
+ * that was never queued has no task.
+ */
+function syncFailedDetail(reason = 'GitHub sync failed.', retryable) {
+    return retryable ? `${endSentence(reason)}\nRetry it from the "Tasks" tab.` : reason;
+}
 /**
  * The worker holding the base branch for an editor deploy, or the cycle it stopped waiting.
  * The rule and its bound live in worker/schema-gate.ts.
@@ -121,7 +131,7 @@ function BaseHoldAlert({ hold }) {
  * and never listed. Names come from GitHub and are attacker-chosen, so each is shown escaped.
  */
 function DivergedBranchesAlert({ names }) {
-    return (_jsx(Alert, { color: "orange", icon: _jsx(IconAlertTriangle, { size: 16 }), title: `${plural(names.length, 'branch')} diverged from GitHub`, "data-testid": "diverged-branches-alert", children: _jsxs(Stack, { gap: 4, children: [_jsx(Text, { size: "sm", children: "This deployment's copy of each branch below holds editor work that conflicts with the branch on GitHub, usually because the GitHub branch was rebased or force-pushed, or because another CanopyCMS deployment sharing this repository uses the same branch name. Neither copy has been changed, and publishing the branch fails until they agree." }), _jsx(Text, { size: "sm", children: "A developer decides which version to keep. To keep GitHub's, first push it to a new branch name on GitHub, because \"Delete branch\" in the editor also deletes a published branch on GitHub; then delete this branch in the editor (withdraw it from review first if it is in review). The editor's changes cannot be copied to another branch: to keep them, leave this branch as it is, or re-enter them by hand in a new branch. For the base branch or a settings branch, ask a developer to check what changed on GitHub." }), _jsx(Group, { gap: 4, children: names.map((name) => (_jsx(Code, { children: escapeForLog(name) }, name))) })] }) }));
+    return (_jsx(Alert, { color: "orange", icon: _jsx(IconAlertTriangle, { size: 16 }), title: `${plural(names.length, 'branch')} diverged from GitHub`, "data-testid": "diverged-branches-alert", children: _jsxs(Stack, { gap: 4, children: [_jsx(Text, { size: "sm", children: "This deployment's copy of each branch below holds editor work that conflicts with the branch on GitHub, usually because the GitHub branch was rebased or force-pushed, or because another CanopyCMS deployment sharing this repository uses the same branch name. Neither copy has been changed, and publishing the branch fails until they agree. A branch that only gained commits on GitHub clears on its own at the next sync." }), _jsx(Text, { size: "sm", children: "A developer decides which version to keep. To keep GitHub's, first push it to a new branch name on GitHub, because \"Delete branch\" in the editor also deletes a published branch on GitHub; then delete this branch in the editor (withdraw it from review first if it is in review). The editor's changes cannot be copied to another branch: to keep them, leave this branch as it is, or re-enter them by hand in a new branch. For the base branch or a settings branch, ask a developer to check what changed on GitHub." }), _jsx(Group, { gap: 4, children: names.map((name) => (_jsx(Code, { children: escapeForLog(name) }, name))) })] }) }));
 }
 /**
  * The branch namespace the CMS creates branches in, against the one the GitHub gateway writes. A
@@ -249,10 +259,32 @@ function duplicateScanSummary(health, healthyDirNames) {
 const PURGE_CONFIRM_TEXT = 'The directory is moved to a hidden trash name and kept for 30 days, then deleted. Any git work inside was never pushed and will be lost when the trash is swept.';
 export function SystemHealthPanel({ opened, onClose, returnFocusTo }) {
     const health = useSystemHealth({ isOpen: opened });
-    return (_jsx(Modal, { opened: opened, onClose: onClose, title: "System health", size: "xl", ...focusReturnProps(returnFocusTo), children: _jsxs(Tabs, { defaultValue: "overview", children: [_jsxs(Tabs.List, { children: [_jsx(Tabs.Tab, { value: "overview", children: "Overview" }), _jsx(Tabs.Tab, { value: "tasks", children: "Tasks" }), _jsx(Tabs.Tab, { value: "branches", children: "Branches" })] }), _jsx(Tabs.Panel, { value: "overview", pt: "md", children: _jsx(OverviewTab, { health: health }) }), _jsx(Tabs.Panel, { value: "tasks", pt: "md", children: _jsx(TasksTab, { health: health }) }), _jsx(Tabs.Panel, { value: "branches", pt: "md", children: _jsx(BranchesTab, { health: health }) })] }) }));
+    const overviewTabRef = useRef(null);
+    return (_jsx(Modal, { opened: opened, onClose: onClose, title: "System health", size: "xl", ...focusReturnProps(returnFocusTo), children: _jsxs(Tabs, { defaultValue: "overview", children: [_jsxs(Tabs.List, { children: [_jsx(Tabs.Tab, { ref: overviewTabRef, value: "overview", children: "Overview" }), _jsx(Tabs.Tab, { value: "tasks", children: "Tasks" }), _jsx(Tabs.Tab, { value: "branches", children: "Branches" })] }), _jsx(Tabs.Panel, { value: "overview", pt: "md", children: _jsx(OverviewTab, { health: health, overviewTabRef: overviewTabRef }) }), _jsx(Tabs.Panel, { value: "tasks", pt: "md", children: _jsx(TasksTab, { health: health }) }), _jsx(Tabs.Panel, { value: "branches", pt: "md", children: _jsx(BranchesTab, { health: health }) })] }) }));
 }
-function OverviewTab({ health }) {
+function OverviewTab({ health, overviewTabRef, }) {
     const { status, statusLoading, isRecentFatalError, error, refresh } = health;
+    const unpublished = (health.branchHealth?.entries ?? []).flatMap((entry) => entry.kind === 'healthy' && entry.branch?.unpublishedAtMerge
+        ? [
+            {
+                dirName: entry.dirName,
+                name: entry.branch.name,
+                pullRequestUrl: entry.branch.pullRequestUrl,
+            },
+        ]
+        : []);
+    // The row goes with the dismissal, so focus moves to the next one, else to the tab.
+    const overviewRef = useRef(null);
+    const handleDismissUnpublished = async (dirName) => {
+        await health.dismissUnpublished(dirName);
+        setTimeout(() => {
+            const overview = overviewRef.current;
+            if (!overview || overview.contains(document.activeElement))
+                return;
+            const next = overview.querySelector(`[${DISMISS_UNPUBLISHED_ATTRIBUTE}]`);
+            (next ?? overviewTabRef.current)?.focus();
+        });
+    };
     if (!status && statusLoading) {
         return (_jsxs(Group, { justify: "center", py: "xl", children: [_jsx(Loader, { size: "md" }), _jsx(Text, { size: "sm", c: "dimmed", children: "Loading status..." })] }));
     }
@@ -271,9 +303,9 @@ function OverviewTab({ health }) {
     const versionSkew = status.worker.state === 'alive' &&
         workerVersion !== undefined &&
         workerVersion !== build.canopycmsVersion;
-    return (_jsxs(Stack, { gap: "md", children: [error && (_jsx(Alert, { color: "red", icon: _jsx(IconAlertCircle, { size: 16 }), variant: "light", children: error })), _jsxs(Group, { gap: "sm", children: [_jsx(Badge, { color: liveness.color, variant: "light", size: "lg", children: liveness.label }), status.mode === 'dev' && (_jsx(Text, { size: "xs", c: "dimmed", children: "No worker runs in dev mode" }))] }), isRecentFatalError && lastFatalError && (_jsxs(Alert, { color: "red", icon: _jsx(IconAlertCircle, { size: 16 }), title: lastFatalError.phase === 'startup'
+    return (_jsxs(Stack, { ref: overviewRef, gap: "md", children: [error && (_jsx(Alert, { color: "red", icon: _jsx(IconAlertCircle, { size: 16 }), variant: "light", children: error })), _jsxs(Group, { gap: "sm", children: [_jsx(Badge, { color: liveness.color, variant: "light", size: "lg", children: liveness.label }), status.mode === 'dev' && (_jsx(Text, { size: "xs", c: "dimmed", children: "No worker runs in dev mode" }))] }), isRecentFatalError && lastFatalError && (_jsxs(Alert, { color: "red", icon: _jsx(IconAlertCircle, { size: 16 }), title: lastFatalError.phase === 'startup'
                     ? 'The worker failed to start'
-                    : 'The worker stopped while running', children: [_jsx(Text, { size: "sm", children: lastFatalError.message }), _jsxs(Text, { size: "xs", c: "dimmed", mt: 4, children: ["at ", lastFatalError.at] })] })), status.settingsWorkspaceError && (_jsx(Alert, { color: "red", icon: _jsx(IconAlertCircle, { size: 16 }), title: "Settings workspace unavailable: groups and path rules are not loading", children: _jsx(Text, { size: "sm", children: status.settingsWorkspaceError }) })), status.schemaIssues && status.schemaIssues.length > 0 && (_jsx(Alert, { color: "yellow", icon: _jsx(IconAlertTriangle, { size: 16 }), title: "Content types this editor version doesn't know", "data-testid": "schema-issues-alert", children: _jsx(Stack, { gap: 4, children: status.schemaIssues.map((issue) => (_jsx(Text, { size: "sm", children: issue.kind === 'unknown-schema' ? (_jsxs(_Fragment, { children: [_jsx(Code, { children: issue.metaFile }), " names ", _jsx(Code, { children: issue.schemaRef }), ", so entry type ", _jsx(Code, { children: issue.entryType }), " is unavailable"] })) : (issue.message) }, `${issue.kind}:${issue.message}`))) }) })), _jsx(BranchNamespaceAlert, { own: status.branchNamespace, gateway: status.workerStatus?.gatewayBranchNamespace }), status.workerStatus?.baseHold && _jsx(BaseHoldAlert, { hold: status.workerStatus.baseHold }), status.statusReadError && (_jsxs(Text, { size: "xs", c: "orange", children: ["Warning: could not read worker status (", status.statusReadError, ")"] })), lastGitSync?.tracked && lastGitSync.tracked.diverged.length > 0 && (_jsx(DivergedBranchesAlert, { names: lastGitSync.tracked.diverged })), status.workerStatus?.unpublishableBranches && (_jsx(UnpublishableBranchesAlert, { report: status.workerStatus.unpublishableBranches, namespace: status.workerStatus.gatewayBranchNamespace })), status.workerStatus?.lastGitSyncError && (_jsxs(Alert, { color: "orange", icon: _jsx(IconAlertCircle, { size: 16 }), title: "Last git sync failed", children: [_jsx(Text, { size: "sm", children: status.workerStatus.lastGitSyncError.message }), _jsxs(Text, { size: "xs", c: "dimmed", mt: 4, children: ["at ", status.workerStatus.lastGitSyncError.at] })] })), versionSkew && (_jsx(Alert, { color: "orange", icon: _jsx(IconAlertCircle, { size: 16 }), title: "API and worker versions differ", "data-testid": "version-skew-warning", children: _jsxs(Text, { size: "sm", children: ["The API runs canopycms ", build.canopycmsVersion, " but the worker runs canopycms", ' ', workerVersion, ". They were deployed from different builds."] }) })), _jsxs(Paper, { withBorder: true, p: "sm", children: [_jsx(Text, { size: "sm", fw: 600, children: "Build" }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-api-version", children: ["API: canopycms ", build.canopycmsVersion] }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-source-revision", children: ["Source revision:", ' ', build.sourceRevision ? (_jsx(Tooltip, { label: build.sourceRevision, children: _jsx(Code, { children: build.sourceRevision.slice(0, 12) }) })) : ('not set (pass the CANOPY_SOURCE_SHA build arg to the image build)')] }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-worker-version", children: ["Worker version: ", workerVersion ? `canopycms ${workerVersion}` : 'unknown'] }), lastShutdown && (_jsxs(Text, { size: "xs", c: lastShutdown.outcome === 'drained' ? 'dimmed' : 'orange', "data-testid": "build-last-shutdown", children: ["Last worker shutdown: ", lastShutdown.reason, " at ", lastShutdown.at, lastShutdown.outcome === 'deadline' &&
+                    : 'The worker stopped while running', children: [_jsx(Text, { size: "sm", children: lastFatalError.message }), _jsxs(Text, { size: "xs", c: "dimmed", mt: 4, children: ["at ", lastFatalError.at] })] })), status.settingsWorkspaceError && (_jsx(Alert, { color: "red", icon: _jsx(IconAlertCircle, { size: 16 }), title: "Settings workspace unavailable: groups and path rules are not loading", children: _jsx(Text, { size: "sm", children: status.settingsWorkspaceError }) })), status.schemaIssues && status.schemaIssues.length > 0 && (_jsx(Alert, { color: "yellow", icon: _jsx(IconAlertTriangle, { size: 16 }), title: "Content types this editor version doesn't know", "data-testid": "schema-issues-alert", children: _jsx(Stack, { gap: 4, children: status.schemaIssues.map((issue) => (_jsx(Text, { size: "sm", children: issue.kind === 'unknown-schema' ? (_jsxs(_Fragment, { children: [_jsx(Code, { children: issue.metaFile }), " names ", _jsx(Code, { children: issue.schemaRef }), ", so entry type ", _jsx(Code, { children: issue.entryType }), " is unavailable"] })) : (issue.message) }, `${issue.kind}:${issue.message}`))) }) })), _jsx(BranchNamespaceAlert, { own: status.branchNamespace, gateway: status.workerStatus?.gatewayBranchNamespace }), status.workerStatus?.baseHold && _jsx(BaseHoldAlert, { hold: status.workerStatus.baseHold }), unpublished.length > 0 && (_jsx(UnpublishedAtMergeAlert, { branches: unpublished, onDismiss: handleDismissUnpublished })), status.statusReadError && (_jsxs(Text, { size: "xs", c: "orange", children: ["Warning: could not read worker status (", status.statusReadError, ")"] })), lastGitSync?.tracked && lastGitSync.tracked.diverged.length > 0 && (_jsx(DivergedBranchesAlert, { names: lastGitSync.tracked.diverged })), status.workerStatus?.unpublishableBranches && (_jsx(UnpublishableBranchesAlert, { report: status.workerStatus.unpublishableBranches, namespace: status.workerStatus.gatewayBranchNamespace })), status.workerStatus?.lastGitSyncError && (_jsxs(Alert, { color: "orange", icon: _jsx(IconAlertCircle, { size: 16 }), title: "Last git sync failed", children: [_jsx(Text, { size: "sm", children: status.workerStatus.lastGitSyncError.message }), _jsxs(Text, { size: "xs", c: "dimmed", mt: 4, children: ["at ", status.workerStatus.lastGitSyncError.at] })] })), versionSkew && (_jsx(Alert, { color: "orange", icon: _jsx(IconAlertCircle, { size: 16 }), title: "API and worker versions differ", "data-testid": "version-skew-warning", children: _jsxs(Text, { size: "sm", children: ["The API runs canopycms ", build.canopycmsVersion, " but the worker runs canopycms", ' ', workerVersion, ". They were deployed from different builds."] }) })), _jsxs(Paper, { withBorder: true, p: "sm", children: [_jsx(Text, { size: "sm", fw: 600, children: "Build" }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-api-version", children: ["API: canopycms ", build.canopycmsVersion] }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-source-revision", children: ["Source revision:", ' ', build.sourceRevision ? (_jsx(Tooltip, { label: build.sourceRevision, children: _jsx(Code, { children: build.sourceRevision.slice(0, 12) }) })) : ('not set (pass the CANOPY_SOURCE_SHA build arg to the image build)')] }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-worker-version", children: ["Worker version: ", workerVersion ? `canopycms ${workerVersion}` : 'unknown'] }), lastShutdown && (_jsxs(Text, { size: "xs", c: lastShutdown.outcome === 'drained' ? 'dimmed' : 'orange', "data-testid": "build-last-shutdown", children: ["Last worker shutdown: ", lastShutdown.reason, " at ", lastShutdown.at, lastShutdown.outcome === 'deadline' &&
                                 ` · drain deadline hit, aborted ${lastShutdown.abandoned?.join(', ') ?? 'in-flight work'}`, lastShutdown.outcome === 'drained' &&
                                 lastShutdown.drainMs !== undefined &&
                                 ` · drained in ${(lastShutdown.drainMs / 1000).toFixed(1)}s`, lastShutdown.outcome === 'not-drained' && ' (a crash or a forced stop)'] })), lastFatalError?.phase === 'startup' && (_jsxs(Text, { size: "xs", c: "orange", "data-testid": "build-failed-start", children: ["Last start failed at ", lastFatalError.at] })), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-media", children: ["Media storage:", ' ', status.assetStore.configured ? 'configured' : 'not configured — uploads are disabled'] }), _jsxs(Text, { size: "xs", c: status.imageProcessing.available ? 'dimmed' : 'orange', "data-testid": "build-image-processing", children: ["Image processing:", ' ', status.imageProcessing.available
@@ -384,33 +416,35 @@ const firstFailed = (iso) => {
     const date = new Date(iso);
     return Number.isNaN(date.getTime()) ? iso : `${formatRelativeTime(iso)}, ${date.toLocaleString()}`;
 };
-/**
- * A detail that only a Tooltip would show: hidden text for assistive tech, plus a Tooltip that
- * opens on hover, focus and touch. The trigger is a focusable span, not a button: it does nothing
- * when pressed, so it must not be announced as one. A trigger with no text of its own, such as an
- * icon, takes its name from `name`.
- */
-function TooltipDetail({ detail, name, maw = 320, preLine = false, children, }) {
-    const detailId = useId();
-    return (_jsxs(_Fragment, { children: [_jsx(Tooltip
-            // A sighted user sees only the icon, so the tooltip names it too.
-            , { 
-                // A sighted user sees only the icon, so the tooltip names it too.
-                label: name ? `${name}: ${detail}` : detail, multiline: true, maw: maw, style: preLine ? { whiteSpace: 'pre-line' } : undefined, events: { hover: true, focus: true, touch: true }, children: _jsx(Box, { component: "span", tabIndex: 0, role: name ? 'img' : undefined, "aria-label": name, "aria-describedby": detailId, className: "mantine-focus-auto", children: children }) }), _jsx(VisuallyHidden, { id: detailId, children: detail })] }));
-}
 function BranchHealthRow({ entry, baseWarning, duplicateIdScan, onMarkMerged, onRepair, onPurge, onDuplicateIds, }) {
     if (entry.kind === 'healthy' && entry.branch) {
         const b = entry.branch;
-        // Mirrors the rebase loop's skip logic (worker/rebase.ts): the worker
-        // rebases every branch except 'submitted'/'approved' (under an active PR)
-        // and 'archived' (already merged). An exclusion list, not `status ===
-        // 'editing'`, so a status added later still shows its rebase failures by
-        // default instead of silently hiding them.
-        const showRebaseFailure = !['submitted', 'approved', 'archived'].includes(b.status) && !!b.rebaseFailure;
+        // The worker looks at every branch but 'archived' (already merged): one in review is not
+        // rebased, but commits from GitHub are still brought into it. An exclusion, not a list of
+        // statuses, so a status added later still shows its failures by default.
+        const showRebaseFailure = b.status !== 'archived' && !!b.rebaseFailure;
+        const inReview = b.status === 'submitted' || b.status === 'approved';
+        const hold = b.rewrittenOnGitHub !== undefined && b.status !== 'archived'
+            ? { kind: 'rewritten' }
+            : !inReview
+                ? b.unpublishedAtMerge
+                    ? { kind: 'unpublished-at-merge' }
+                    : undefined
+                : b.submitUnfinished
+                    ? {
+                        kind: 'submit-unfinished',
+                        opened: b.pullRequestNumber !== undefined,
+                        notQueued: b.submitNotQueued,
+                    }
+                    : b.pullRequestHold;
         const canMarkMerged = (b.status === 'submitted' || b.status === 'approved') && !!b.pullRequestNumber;
-        return (_jsxs(Table.Tr, { children: [_jsx(Table.Td, { children: _jsxs(Group, { gap: 4, wrap: "nowrap", children: [_jsx(Text, { size: "sm", children: entry.dirName }), entry.isBaseBranch && (_jsx(Badge, { size: "xs", color: "gray", variant: "outline", children: "Base" }))] }) }), _jsx(Table.Td, { children: _jsx(Badge, { color: branchStatusPresentation(b.status)?.color ?? 'neutral', variant: "light", children: branchStatusPresentation(b.status)?.label }) }), _jsx(Table.Td, { children: b.pullRequestNumber ? (_jsxs(Text, { size: "xs", c: "blue", component: "a", href: b.pullRequestUrl, target: "_blank", rel: "noopener noreferrer", style: { textDecoration: 'underline' }, children: ["PR #", b.pullRequestNumber, b.pullRequestState ? ` (${b.pullRequestState})` : ''] })) : (_jsx(Text, { size: "xs", c: "dimmed", children: "\u2014" })) }), _jsx(Table.Td, { children: b.syncStatus === 'sync-failed' ? (_jsx(TooltipDetail, { detail: b.syncFailureReason
-                            ? `${b.syncFailureReason} — retry from the "Tasks" tab`
-                            : 'GitHub sync failed — retry from the "Tasks" tab', children: _jsx(Badge, { color: "red", variant: "light", children: "Sync failed" }) })) : b.syncStatus === 'pending-sync' ? (_jsx(Badge, { color: "gray", variant: "light", children: "Pending sync" })) : null }), _jsx(Table.Td, { children: _jsxs(Group, { gap: 6, wrap: "nowrap", children: [!!b.conflictFiles?.length && (_jsxs(Badge, { color: "orange", variant: "light", children: [b.conflictFiles.length, " conflict", b.conflictFiles.length === 1 ? '' : 's'] })), showRebaseFailure && b.rebaseFailure && (_jsx(TooltipDetail, { name: "Rebase failing", detail: `${b.rebaseFailure.message} (first failed ${firstFailed(b.rebaseFailure.firstAt)})`, children: _jsx(ThemeIcon, { color: "yellow", variant: "light", size: "sm", radius: "xl", "data-testid": `rebase-failure-${entry.dirName}`, children: _jsx(IconAlertTriangle, { size: 12 }) }) })), baseWarning && (_jsx(TooltipDetail, { name: "Base branch refresh failing", detail: baseWarning, maw: 420, preLine: true, children: _jsx(ThemeIcon, { color: "yellow", variant: "light", size: "sm", radius: "xl", "data-testid": `base-refresh-warning-${entry.dirName}`, children: _jsx(IconAlertTriangle, { size: 12 }) }) })), duplicateIdScan?.state === 'found' && (_jsx(Tooltip, { label: "Review and fix", children: _jsx(Badge, { component: "button", type: "button", color: "orange", variant: "light", style: { cursor: 'pointer' }, "data-testid": `duplicate-content-ids-${entry.dirName}`, onClick: () => onDuplicateIds(entry.dirName, duplicateIdScan.duplicates), children: plural(duplicateIdScan.duplicates.length, 'duplicate ID') }) })), duplicateIdScan !== undefined &&
+        return (_jsxs(Table.Tr, { children: [_jsx(Table.Td, { children: _jsxs(Group, { gap: 4, wrap: "nowrap", children: [_jsx(Text, { size: "sm", children: entry.dirName }), entry.isBaseBranch && (_jsx(Badge, { size: "xs", color: "gray", variant: "outline", children: "Base" }))] }) }), _jsx(Table.Td, { children: _jsx(Badge, { color: branchStatusPresentation(b.status)?.color ?? 'neutral', variant: "light", children: branchStatusPresentation(b.status)?.label }) }), _jsx(Table.Td, { children: b.pullRequestNumber ? (_jsxs(Text, { size: "xs", c: "blue", component: "a", href: b.pullRequestUrl, target: "_blank", rel: "noopener noreferrer", style: { textDecoration: 'underline' }, children: ["PR #", b.pullRequestNumber, b.pullRequestState ? ` (${b.pullRequestState})` : ''] })) : (_jsx(Text, { size: "xs", c: "dimmed", children: "\u2014" })) }), _jsx(Table.Td, { children: b.syncStatus === 'sync-failed' ? (_jsx(TooltipDetail, { preLine: true, detail: syncFailedDetail(b.syncFailureReason, hold?.kind !== 'rewritten' &&
+                            b.status !== 'archived' &&
+                            !(b.submitUnfinished && b.submitNotQueued)), children: _jsx(Badge, { color: "red", variant: "light", children: "Sync failed" }) })) : b.syncStatus === 'pending-sync' ? (_jsx(Badge, { color: "gray", variant: "light", children: "Pending sync" })) : null }), _jsx(Table.Td, { children: _jsxs(Group, { gap: 6, children: [!!b.conflictFiles?.length && (_jsxs(Badge, { color: "orange", variant: "light", children: [b.conflictFiles.length, " conflict", b.conflictFiles.length === 1 ? '' : 's'] })), hold && (_jsx(TooltipDetail, { detail: branchHoldMessage(hold, {
+                                    role: 'none',
+                                    isAdmin: true,
+                                    inSystemHealth: true,
+                                }), children: _jsx(Badge, { color: HOLD_BADGE.color, variant: "light", "data-testid": `held-pr-${entry.dirName}`, children: HOLD_BADGE.label }) })), showRebaseFailure && b.rebaseFailure && (_jsx(TooltipDetail, { name: "Rebase failing", detail: `${b.rebaseFailure.message} (first failed ${firstFailed(b.rebaseFailure.firstAt)})`, children: _jsx(ThemeIcon, { color: "yellow", variant: "light", size: "sm", radius: "xl", "data-testid": `rebase-failure-${entry.dirName}`, children: _jsx(IconAlertTriangle, { size: 12 }) }) })), baseWarning && (_jsx(TooltipDetail, { name: "Base branch refresh failing", detail: baseWarning, maw: 420, preLine: true, children: _jsx(ThemeIcon, { color: "yellow", variant: "light", size: "sm", radius: "xl", "data-testid": `base-refresh-warning-${entry.dirName}`, children: _jsx(IconAlertTriangle, { size: 12 }) }) })), duplicateIdScan?.state === 'found' && (_jsx(Tooltip, { label: "Review and fix", children: _jsx(Badge, { component: "button", type: "button", color: "orange", variant: "light", style: { cursor: 'pointer' }, "data-testid": `duplicate-content-ids-${entry.dirName}`, onClick: () => onDuplicateIds(entry.dirName, duplicateIdScan.duplicates), children: plural(duplicateIdScan.duplicates.length, 'duplicate ID') }) })), duplicateIdScan !== undefined &&
                                 duplicateIdScan?.state !== 'found' &&
                                 duplicateIdScan?.state !== 'none' && (_jsx(Tooltip, { label: duplicateUncheckedReason(duplicateIdScan), multiline: true, maw: 320, children: _jsx(Badge, { color: "gray", variant: "outline", "data-testid": `duplicate-ids-unchecked-${entry.dirName}`, children: "IDs not checked" }) }))] }) }), _jsx(Table.Td, { children: _jsx(Text, { size: "xs", c: "dimmed", children: b.updatedAt }) }), _jsx(Table.Td, { children: canMarkMerged && (_jsx(Button, { variant: "light", "data-testid": `mark-merged-${b.name}`, onClick: () => onMarkMerged(b.name), children: "Mark merged" })) })] }));
     }

package/dist/editor/admin/UnpublishedAtMergeAlert.d.ts

@@ -0,0 +1,16 @@
+/** Marks each row's Dismiss, for the panel to move focus to once a row has gone. */
+export declare const DISMISS_UNPUBLISHED_ATTRIBUTE = "data-dismiss-unpublished";
+export interface UnpublishedBranch {
+    dirName: string;
+    name: string;
+    pullRequestUrl?: string;
+}
+/**
+ * Branches merged before a submit finished, listed until an admin dismisses them or deletes the
+ * branch: archiving leaves no retry or new submit to finish it. Names come from GitHub and are
+ * attacker-chosen, so each is shown escaped.
+ */
+export declare function UnpublishedAtMergeAlert({ branches, onDismiss, }: {
+    branches: readonly UnpublishedBranch[];
+    onDismiss: (dirName: string) => Promise<void>;
+}): import("react/jsx-runtime").JSX.Element;

package/dist/editor/admin/UnpublishedAtMergeAlert.js

@@ -0,0 +1,50 @@
+'use client';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useId, useRef, useState } from 'react';
+import { Alert, Anchor, Button, Code, Group, Stack, Text } from '@mantine/core';
+import { IconAlertTriangle } from '@tabler/icons-react';
+import { EDITOR_ACTIONS } from '../copy.js';
+import { escapeForLog } from '../../utils/escape-text.js';
+/** Marks each row's Dismiss, for the panel to move focus to once a row has gone. */
+export const DISMISS_UNPUBLISHED_ATTRIBUTE = 'data-dismiss-unpublished';
+/** One branch, whose Dismiss asks in its own row: System health is already a modal. */
+function UnpublishedRow({ branch, onDismiss, }) {
+    const { dirName, pullRequestUrl } = branch;
+    const name = escapeForLog(branch.name);
+    const [asking, setAsking] = useState(false);
+    const [dismissing, setDismissing] = useState(false);
+    const dismissRef = useRef(null);
+    const confirmRef = useRef(null);
+    const asked = useRef(false);
+    const questionId = useId();
+    // The button pressed is replaced each way, so focus follows to its counterpart.
+    useEffect(() => {
+        if (asking)
+            confirmRef.current?.focus();
+        else if (asked.current)
+            dismissRef.current?.focus();
+        asked.current = asking;
+    }, [asking]);
+    const dismiss = async () => {
+        setDismissing(true);
+        try {
+            await onDismiss(dirName);
+        }
+        finally {
+            setDismissing(false);
+            setAsking(false);
+        }
+    };
+    return (_jsxs(Group, { gap: "xs", justify: "space-between", "data-testid": `unpublished-branch-${dirName}`, children: [_jsxs(Group, { gap: "xs", style: { minWidth: 0, flex: '1 1 200px' }, children: [_jsx(Code, { style: { overflowWrap: 'anywhere', minWidth: 0 }, children: name }), pullRequestUrl && (_jsx(Anchor, { href: pullRequestUrl, target: "_blank", rel: "noopener noreferrer", size: "xs", c: "var(--mantine-color-text)", underline: "always", children: "View pull request" }))] }), asking ? (_jsxs(Group, { gap: 4, style: { maxWidth: '100%' }, children: [_jsx(Text, { id: questionId, size: "xs", children: "Dismiss this warning? It won't come back, and the branch can then be deleted." }), _jsx(Button, { ref: confirmRef, size: "compact-xs", variant: "default", loading: dismissing, "aria-label": `Dismiss the warning for ${name}`, "aria-describedby": questionId, "data-testid": `confirm-dismiss-unpublished-${dirName}`, onClick: () => void dismiss(), children: "Dismiss" }), _jsx(Button, { size: "compact-xs", variant: "subtle", color: "gray", disabled: dismissing, "aria-label": `Cancel dismissing the warning for ${name}`, "data-testid": `cancel-dismiss-unpublished-${dirName}`, onClick: () => setAsking(false), children: "Cancel" })] })) : (_jsx(Button, { ref: dismissRef, size: "compact-xs", variant: "default", style: { flexShrink: 0 }, "aria-label": `Dismiss the warning for ${name}`, "data-testid": `dismiss-unpublished-${dirName}`, [DISMISS_UNPUBLISHED_ATTRIBUTE]: true, onClick: () => setAsking(true), children: "Dismiss" }))] }));
+}
+/**
+ * Branches merged before a submit finished, listed until an admin dismisses them or deletes the
+ * branch: archiving leaves no retry or new submit to finish it. Names come from GitHub and are
+ * attacker-chosen, so each is shown escaped.
+ */
+export function UnpublishedAtMergeAlert({ branches, onDismiss, }) {
+    const count = `${branches.length} ${branches.length === 1 ? 'branch' : 'branches'}`;
+    return (_jsx(Alert, { color: "orange", icon: _jsx(IconAlertTriangle, { size: 16 }), title: `${count} merged with an unfinished submit`, 
+        // The default clips focus rings at the edge, and scrolls sideways on Tab.
+        styles: { message: { overflow: 'visible' } }, "data-testid": "unpublished-at-merge-alert", children: _jsxs(Stack, { gap: 4, children: [_jsx(Text, { size: "sm", children: "Merged on GitHub before the last submit finished, so commits from that submit may not be in the merge. They're still on this deployment's copy of the branch." }), _jsxs(Text, { size: "sm", children: ["Close System health and open the branch from \"", EDITOR_ACTIONS.switchBranch, "\u2026\", where it's read-only, then compare it with the pull request. Make anything that's missing on a new branch, then use \"Dismiss\"."] }), _jsx(Stack, { gap: 4, mt: 4, children: branches.map((branch) => (_jsx(UnpublishedRow, { branch: branch, onDismiss: onDismiss }, branch.dirName))) })] }) }));
+}

package/dist/editor/admin/useSystemHealth.d.ts

@@ -51,6 +51,8 @@ export interface UseSystemHealthReturn {
     purgeDir: (dirName: string) => Promise<void>;
     repairDir: (dirName: string) => Promise<void>;
     markMerged: (branchName: string) => Promise<void>;
+    /** Stops listing a branch merged with an unfinished submit, a warning that doesn't come back. */
+    dismissUnpublished: (dirName: string) => Promise<void>;
 }
 export declare function useSystemHealth(options: UseSystemHealthOptions): UseSystemHealthReturn;
 export {};

package/dist/editor/admin/useSystemHealth.js

@@ -12,8 +12,10 @@
  * never on the poll.
  */
 import { useCallback, useEffect, useRef, useState } from 'react';
+import { useSWRConfig } from 'swr';
 import { notifications } from '@mantine/notifications';
 import { useApiClient } from '../context/index.js';
+import { BRANCHES_KEY } from '../hooks/useBranchesData.js';
 const POLL_INTERVAL_MS = 30_000;
 /**
  * Crash-loop rider window: a worker that fatally exits and restarts
@@ -24,6 +26,7 @@ const POLL_INTERVAL_MS = 30_000;
 const CRASH_LOOP_WINDOW_MS = 30 * 60_000;
 export function useSystemHealth(options) {
     const apiClient = useApiClient();
+    const { mutate } = useSWRConfig();
     const [status, setStatus] = useState(null);
     const [statusLoading, setStatusLoading] = useState(false);
     const [isRecentFatalError, setIsRecentFatalError] = useState(false);
@@ -213,6 +216,23 @@ export function useSystemHealth(options) {
             notifications.show({ message, color: 'red' });
         }
     }, [apiClient, refresh]);
+    const dismissUnpublished = useCallback(async (dirName) => {
+        try {
+            const result = await apiClient.admin.dismissUnpublished({ dirName });
+            if (!result.ok && result.status !== 409) {
+                throw new Error(result.error || 'Failed to dismiss the warning');
+            }
+            if (!result.ok)
+                notifications.show({ message: result.error, color: 'yellow' });
+            await refresh();
+            // The branch's own "Needs action" comes from the list.
+            await mutate(BRANCHES_KEY);
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : 'Failed to dismiss the warning';
+            notifications.show({ message, color: 'red' });
+        }
+    }, [apiClient, mutate, refresh]);
     const repairDuplicateIds = useCallback(async (dirName) => {
         try {
             const result = await apiClient.admin.repairContentDuplicates({ dirName });
@@ -268,5 +288,6 @@ export function useSystemHealth(options) {
         purgeDir,
         repairDir,
         markMerged,
+        dismissUnpublished,
     };
 }

package/dist/editor/branch-lock.d.ts

@@ -15,6 +15,8 @@ export interface BranchLockInput {
      * way forward is Withdraw and the reason says why Approve is not offered.
      */
     pullRequestClosed?: boolean;
+    /** The server refuses Approve on this branch, so no reason may offer it. */
+    approveBlocked?: boolean;
 }
 /**
  * Which lock applies. `branchWriteBlocked` is the server's own answer (getBranchProtection), so

package/dist/editor/branch-lock.js

@@ -30,9 +30,11 @@ export function describeBranchLock(lock) {
     if (lock.pullRequestClosed)
         return CLOSED_PULL_REQUEST_REASON;
     if (lock.branchStatus === 'submitted')
-        return lock.reviewing
-            ? 'This branch is in review. Approve it, or request changes to send it back to its editor.'
-            : 'This branch is in review. Withdraw it to make changes.';
+        return !lock.reviewing
+            ? 'This branch is in review. Withdraw it to make changes.'
+            : lock.approveBlocked
+                ? 'This branch is in review. Request changes to send it back to its editor.'
+                : 'This branch is in review. Approve it, or request changes to send it back to its editor.';
     if (lock.branchStatus === 'approved')
         return lock.reviewing
             ? 'This branch is approved. Request changes to send it back to its editor.'

package/dist/editor/branch-status.d.ts

@@ -1,4 +1,4 @@
-import type { BranchStatus } from '../types.js';
+import type { BranchHold, BranchStatus } from '../types.js';
 export interface BranchStatusPresentation {
     label: string;
     color: string;
@@ -15,3 +15,27 @@ export declare const BRANCH_STATUS_PRESENTATION: Record<BranchStatus, BranchStat
  * Returns undefined when there is nothing to show.
  */
 export declare function branchStatusPresentation(status: string | undefined, isProtected?: boolean): BranchStatusPresentation | undefined;
+/** The badge for a branch something holds, in the bar, on the card and in System health. */
+export declare const HOLD_BADGE: {
+    readonly label: "Needs action";
+    readonly color: "yellow";
+};
+/** Who is reading a hold, which decides the way forward it can offer them. */
+export interface HoldViewer {
+    /** `withdraw`: may withdraw it. `review`: reviews someone else's. `none`: can do neither. */
+    role: 'withdraw' | 'review' | 'none';
+    isAdmin: boolean;
+    /** Reading it in System health, which can't send an admin to itself. */
+    inSystemHealth?: boolean;
+}
+/**
+ * What's stuck and what this viewer can do about it. A retargeted base comes from GitHub and is
+ * attacker-chosen, so it's shown escaped.
+ */
+export declare function branchHoldMessage(hold: BranchHold, viewer: HoldViewer): string;
+/** Ends `text` as a sentence, for a recorded reason that another sentence follows. */
+export declare function endSentence(text: string): string;
+/** Why a branch in review with a failed sync stays behind its base, after the failure itself. */
+export declare const SYNC_FAILED_IN_REVIEW_NOTE = "Until it syncs, CanopyCMS won't update this pull request from its base.";
+/** The failed-sync line when the worker recorded no reason. An archived branch has nothing to retry. */
+export declare const syncFailedFallback: (isAdmin: boolean, status?: string) => string;