canopycms 0.8.0 → 0.8.2

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;

package/dist/editor/branch-status.js

@@ -1,3 +1,4 @@
+import { escapeForLog } from '../utils/escape-text.js';
 /** @internal Exported for tests. */
 export const PROTECTED_BRANCH_PRESENTATION = {
     label: 'Protected',
@@ -27,3 +28,77 @@ export function branchStatusPresentation(status, isProtected = false) {
         return BRANCH_STATUS_PRESENTATION[status];
     return { label: status, color: 'gray', variant: 'light' };
 }
+/** The badge for a branch something holds, in the bar, on the card and in System health. */
+export const HOLD_BADGE = { label: 'Needs action', color: 'yellow' };
+/**
+ * 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 function branchHoldMessage(hold, viewer) {
+    switch (hold.kind) {
+        case 'conflicts': {
+            const stuck = "This branch conflicts with its base branch, so its pull request can't be updated.";
+            if (viewer.role === 'review')
+                return `${stuck} Use "Request changes" to send it back to its editor.`;
+            if (viewer.role === 'none')
+                return `${stuck} Its editor needs to withdraw it from review.`;
+            return `${stuck} Use "Withdraw from review", check any flagged entries, then submit it again.`;
+        }
+        case 'retargeted':
+            return `This pull request now merges into ${escapeForLog(hold.base)} on GitHub, so CanopyCMS isn't updating it. Update it on the pull request${viewer.isAdmin ? '' : ', or ask an admin'}.`;
+        case 'rewritten': {
+            const stuck = "This branch was changed on GitHub in a way CanopyCMS can't combine with the work here, so changes here can't reach GitHub. Nothing is lost.";
+            if (viewer.inSystemHealth)
+                return `${stuck} A developer needs to merge the missing commit back into the branch on GitHub. The "Rebase failing" warning icon in this row names it.`;
+            return viewer.isAdmin
+                ? `${stuck} See the "Branches" tab in "System health".`
+                : `${stuck} Ask an admin for help.`;
+        }
+        case 'submit-unfinished': {
+            const stuck = hold.opened
+                ? "The last submit of this branch didn't finish, so its pull request may not have its latest changes."
+                : "The last submit of this branch didn't finish, so its pull request wasn't opened.";
+            if (hold.notQueued) {
+                if (viewer.role === 'review')
+                    return `${stuck} Use "Request changes" to send it back to its editor.`;
+                return viewer.role === 'withdraw'
+                    ? `${stuck} Use "Withdraw from review", then submit the branch again.`
+                    : `${stuck} Its editor needs to withdraw it from review and submit it again.`;
+            }
+            const retry = viewer.inSystemHealth
+                ? 'Retry the submit from the "Tasks" tab'
+                : viewer.isAdmin
+                    ? 'Retry the submit from the "Tasks" tab in "System health"'
+                    : 'Ask an admin to retry the submit';
+            const instead = viewer.role === 'withdraw'
+                ? ', or use "Withdraw from review", then submit the branch again'
+                : viewer.role === 'review'
+                    ? ', or use "Request changes" to send it back to its editor'
+                    : '';
+            return `${stuck} ${retry}${instead}.`;
+        }
+        case 'unpublished-at-merge': {
+            const stuck = 'This pull request merged before the last submit finished, so some changes may not be in the merge.';
+            if (viewer.inSystemHealth)
+                return `${stuck} The "Overview" tab says what to do.`;
+            return viewer.isAdmin
+                ? `${stuck} See the "Overview" tab in "System health".`
+                : `${stuck} Ask an admin to check it.`;
+        }
+    }
+}
+/** Ends `text` as a sentence, for a recorded reason that another sentence follows. */
+export function endSentence(text) {
+    const trimmed = text.trimEnd();
+    return /[.!?:][)"']*$/.test(trimmed) ? trimmed : `${trimmed}.`;
+}
+/** Why a branch in review with a failed sync stays behind its base, after the failure itself. */
+export 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 const syncFailedFallback = (isAdmin, status) => {
+    if (status === 'archived')
+        return 'GitHub sync failed.';
+    return isAdmin
+        ? 'GitHub sync failed. Retry it from the "Tasks" tab in "System health".'
+        : 'GitHub sync failed. Ask an admin to retry it.';
+};

package/dist/editor/components/EditorHeader.d.ts

@@ -1,5 +1,5 @@
 import { type Ref } from 'react';
-import type { BranchStatus, PullRequestState } from '../../types.js';
+import type { BranchHold, BranchStatus, PullRequestState } from '../../types.js';
 import type { SaveAllProgress } from '../hooks/save-all.js';
 export interface EditorHeaderProps {
     branchName: string;
@@ -60,6 +60,10 @@ export interface EditorHeaderProps {
     branchServerProtected?: boolean;
     /** Whether the current branch is read-only (protected base branch in prod); disables Save all. */
     branchReadOnly?: boolean;
+    /** What holds the branch (api/branch.ts). */
+    branchHold?: BranchHold;
+    /** The server refuses Approve on this branch. */
+    branchApproveBlocked?: boolean;
     /** Server-computed: content writes are rejected on this branch; see `branchLockState`. */
     branchWriteBlocked?: boolean;
     /** No branch details yet: the fail-closed lock defaults are guesses the status doesn't name. */
@@ -74,4 +78,4 @@ export interface EditorHeaderProps {
  * warning, Save all, the way forward and Submit or Withdraw, or to a reviewer of someone else's
  * submission Approve and Request changes. The open entry's own controls are in `EntryHeader`.
  */
-export declare function EditorHeader({ branchName, branchLabel, busy, modifiedCount, onShowUnsaved, branchToggleRef, onBranchReloadData, onBranchDiscardDrafts, onBranchManagerOpen, onNewBranch, onSaveAll, saveAllProgress, singleSaving, entryListFailed, onSubmit, onWithdraw, onApprove, onRequestChanges, draftStorageFailed, branchStatus, userContext, branchCreatedBy, branchPullRequestState, branchAccess, branchIsProtected, branchServerProtected, branchReadOnly, branchWriteBlocked, branchLoading, branchPending, branchMissing, }: EditorHeaderProps): import("react/jsx-runtime").JSX.Element;
+export declare function EditorHeader({ branchName, branchLabel, busy, modifiedCount, onShowUnsaved, branchToggleRef, onBranchReloadData, onBranchDiscardDrafts, onBranchManagerOpen, onNewBranch, onSaveAll, saveAllProgress, singleSaving, entryListFailed, onSubmit, onWithdraw, onApprove, onRequestChanges, draftStorageFailed, branchStatus, userContext, branchCreatedBy, branchPullRequestState, branchAccess, branchIsProtected, branchServerProtected, branchReadOnly, branchHold, branchApproveBlocked, branchWriteBlocked, branchLoading, branchPending, branchMissing, }: EditorHeaderProps): import("react/jsx-runtime").JSX.Element;