canopycms 0.8.3 → 0.10.0

package/dist/editor/BranchManager.js

@@ -1,8 +1,8 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from 'react';
-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 { ActionIcon, Anchor, Badge, Button, CloseButton, Group, Menu, Paper, ScrollArea, Stack, Text, TextInput, Textarea, Collapse, Tooltip, UnstyledButton, VisuallyHidden, } from '@mantine/core';
+import { IconChevronDown, IconChevronRight, IconDots, IconExternalLink } from '@tabler/icons-react';
 import { BranchComments } from './comments/BranchComments.js';
 import { UserBadge } from './components/UserBadge.js';
 import { BranchAccessList } from './components/BranchAccessList.js';
@@ -16,7 +16,7 @@ import { RelativeTime } from './components/RelativeTime.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, rewrittenSubmitReason, UNFINISHED_SUBMIT_APPROVE_REASON, } from './copy.js';
+import { CLOSED_PULL_REQUEST_REASON, DELETE_NEEDS_ADMIN_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';
 /**
@@ -149,7 +149,7 @@ const WRAP_ANYWHERE = { overflowWrap: 'anywhere' };
  * reviewer Review, which opens it; the other cards show Open, which the current one never needs.
  * No action is shown twice.
  */
-const BranchCard = ({ branch: b, isCurrent, workflowBlockedReason, user, onSelect, onSubmit, onWithdraw, onApprove, onRequestChanges, onDelete, onGetUserMetadata, onGetOwnerMetadata = onGetUserMetadata, }) => {
+const BranchCard = ({ branch: b, isCurrent, workflowBlockedReason, user, onSelect, onSubmit, onWithdraw, onApprove, onRequestChanges, onArchive, onDelete, onGetUserMetadata, onGetOwnerMetadata = onGetUserMetadata, }) => {
     const statusBadge = branchStatusPresentation(b.status, b.isProtected);
     const perms = getBranchPermissions(b, user);
     const userIsAdmin = isAdmin(user?.groups);
@@ -195,7 +195,15 @@ const BranchCard = ({ branch: b, isCurrent, workflowBlockedReason, user, onSelec
     // 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 archive = heldBack(userIsAdmin && b.status !== 'archived' && b.pullRequestState === 'closed'
+        ? {
+            label: EDITOR_ACTIONS.archiveBranch,
+            color: 'orange',
+            testId: `archive-branch-button-${b.name}`,
+            run: () => onArchive?.(b.name),
+        }
+        : undefined);
+    const menuActions = [approve, requestChanges, workflow, archive].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;
@@ -206,11 +214,8 @@ const BranchCard = ({ branch: b, isCurrent, workflowBlockedReason, user, onSelec
         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(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' &&
+    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 &&
+                                        (b.pullRequestState === 'closed' ? (_jsx(Badge, { color: "red", variant: "light", "data-testid": `pr-closed-badge-${b.name}`, children: "PR closed" })) : (_jsxs(Badge, { color: b.pullRequestState === 'merged' ? 'violet' : 'blue', variant: "light", children: ["PR #", b.pullRequestNumber] }))), 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.title && (_jsx(Text, { size: "xs", c: "dimmed", style: WRAP_ANYWHERE, "data-testid": `branch-title-${b.name}`, children: b.title })), 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' &&
@@ -218,15 +223,65 @@ const BranchCard = ({ branch: b, isCurrent, workflowBlockedReason, user, onSelec
                                                     ? `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.'
-                                                            : 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.'
+                                                            : (b.hold?.kind === 'unpublished-at-merge' ||
+                                                                b.hold?.kind === 'rewritten-at-merge') &&
+                                                                !userIsAdmin
+                                                                ? DELETE_NEEDS_ADMIN_REASON
                                                                 : 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)
                 action.run();
         }, "data-disabled": action.blockedReason ? true : undefined, "aria-disabled": action.blockedReason ? true : undefined, "data-testid": action.testId, children: action.label }) }));
-export const BranchManager = ({ branches, mode, user, currentBranchName, currentWorkflowBlockedReason, startCreating = false, onSelect, onBeforeCreate, onCreate, onDelete, onSubmit, onWithdraw, onApprove, onRequestChanges, onClose: _, comments = [], currentUserId, canResolve = false, onAddComment, onResolveThread, highlightThreadId, onGetUserMetadata, onGetOwnerMetadata, onGetCommentUserMetadata, }) => {
+/** The filter box appears once the list has more branches than this. */
+const BRANCH_FILTER_THRESHOLD = 10;
+const newestFirst = (a, b) => (b.updatedAt ?? '').localeCompare(a.updatedAt ?? '');
+/**
+ * Each branch's place, newest first, kept while the list stays open so a listing arriving in the
+ * background moves no card. A branch that first appears then goes last.
+ */
+const useOpeningOrder = (branches) => {
+    const [places] = useState(() => new Map());
+    for (const { name } of [...branches].sort(newestFirst)) {
+        if (!places.has(name))
+            places.set(name, places.size);
+    }
+    return places;
+};
+/**
+ * The list's two parts: the current branch, whatever its status, then live branches in `places`;
+ * and the other archived branches in `places`.
+ * @internal Exported for tests.
+ */
+export const arrangeBranches = (branches, currentBranchName, places) => {
+    const others = branches
+        .filter((b) => b.name !== currentBranchName)
+        .sort((a, b) => (places.get(a.name) ?? 0) - (places.get(b.name) ?? 0));
+    return {
+        live: [
+            ...branches.filter((b) => b.name === currentBranchName),
+            ...others.filter((b) => b.status !== 'archived'),
+        ],
+        archived: others.filter((b) => b.status === 'archived'),
+    };
+};
+/**
+ * Whether `query` appears in what the card shows of the branch: its name, title or owner's name,
+ * ignoring case.
+ * @internal Exported for tests.
+ */
+export const matchesBranchFilter = (branch, query) => {
+    const needle = query.trim().toLowerCase();
+    return [displayBranchName(branch), branch.title, branch.ownerName].some((text) => text?.toLowerCase().includes(needle));
+};
+/** The "Archived (n)" heading and what it reveals. */
+const ArchivedSection = ({ count, open, onToggle, forcedOpen, children }) => {
+    const Chevron = open ? IconChevronDown : IconChevronRight;
+    return (_jsxs(Stack, { gap: "sm", "data-testid": "archived-branches", children: [forcedOpen ? (_jsxs(Text, { size: "sm", fw: 600, "data-testid": "archived-branches-toggle", children: ["Archived (", count, ")"] })) : (_jsx(UnstyledButton, { onClick: onToggle, "aria-expanded": open, px: 4, 
+                // Inset and content-width, or the ScrollArea clips the focus ring.
+                style: { alignSelf: 'flex-start', outlineOffset: -2 }, "data-testid": "archived-branches-toggle", children: _jsxs(Group, { gap: 4, wrap: "nowrap", children: [_jsx(Chevron, { size: 16, "aria-hidden": true }), _jsxs(Text, { size: "sm", fw: 600, children: ["Archived (", count, ")"] })] }) })), open && children] }));
+};
+export const BranchManager = ({ branches, mode, user, currentBranchName, currentWorkflowBlockedReason, startCreating = false, onSelect, onBeforeCreate, onCreate, onDelete, onSubmit, onWithdraw, onApprove, onRequestChanges, onArchive, onClose: _, comments = [], currentUserId, canResolve = false, onAddComment, onResolveThread, highlightThreadId, onGetUserMetadata, onGetOwnerMetadata, onGetCommentUserMetadata, }) => {
     const supportsBranching = clientOperatingStrategy(mode).supportsBranching();
     const [showCreateForm, setShowCreateForm] = useState(startCreating);
     const [newBranchName, setNewBranchName] = useState('');
@@ -285,12 +340,27 @@ export const BranchManager = ({ branches, mode, user, currentBranchName, current
             setCreating(false);
         }
     };
-    const orderedBranches = currentBranchName
-        ? [
-            ...branches.filter((b) => b.name === currentBranchName),
-            ...branches.filter((b) => b.name !== currentBranchName),
-        ]
-        : branches;
+    const [filter, setFilter] = useState('');
+    const filterRef = useRef(null);
+    // Both clear controls unmount as they act, so focus moves to the box they cleared.
+    const clearFilter = () => {
+        setFilter('');
+        filterRef.current?.focus();
+    };
+    const [archivedOpen, setArchivedOpen] = useState(false);
+    // Read through this, so a list shrinking past the threshold can't leave a filter no box shows.
+    const showFilter = branches.length > BRANCH_FILTER_THRESHOLD;
+    const query = showFilter ? filter.trim() : '';
+    const places = useOpeningOrder(branches);
+    const { live, archived } = arrangeBranches(query ? branches.filter((b) => matchesBranchFilter(b, query)) : branches, currentBranchName, places);
+    const matchCount = live.length + archived.length;
+    const renderCard = (b) => {
+        // The editor resolves a shadowed outside branch's full name to the namespace branch whose
+        // short name it is, so a card's actions name its branch by `branchAddress`.
+        const address = branchAddress(branches, b);
+        const act = (run) => run && (() => run(address));
+        return (_jsx(BranchCard, { branch: b, isCurrent: b.name === currentBranchName, workflowBlockedReason: b.name === currentBranchName ? currentWorkflowBlockedReason : undefined, user: user, onSelect: act(onSelect), onSubmit: act(onSubmit), onWithdraw: act(onWithdraw), onApprove: act(onApprove), onRequestChanges: act(onRequestChanges), onArchive: act(onArchive), onDelete: act(onDelete), onGetUserMetadata: onGetUserMetadata, onGetOwnerMetadata: onGetOwnerMetadata }, b.name));
+    };
     const hasBranchThreads = comments.some((t) => t.type === 'branch');
     return (_jsxs(Stack, { h: "100%", style: { display: 'flex', flexDirection: 'column' }, gap: 0, "data-testid": "branch-manager", children: [currentUserId && onAddComment && onResolveThread && hasBranchThreads && (_jsx(Stack, { pt: "sm", children: _jsx(BranchComments, { comments: comments, currentUserId: currentUserId, canResolve: canResolve, onAddComment: onAddComment, onResolveThread: onResolveThread, highlightThreadId: highlightThreadId, onGetUserMetadata: onGetCommentUserMetadata }) })), !!supportsBranching && (_jsxs(Stack, { gap: "sm", pt: "sm", children: [_jsx(Button, { variant: "light", size: "sm", fullWidth: true, onClick: () => {
                             if (showCreateForm)
@@ -304,11 +374,7 @@ export const BranchManager = ({ branches, mode, user, currentBranchName, current
                                             createdBranchName?.ok &&
                                             createdBranchName.shortName !== typedBranchName
                                             ? `Will be named ${createdBranchName.shortName}`
-                                            : undefined, error: nameError, value: newBranchName, onChange: (e) => setNewBranchName(e.target.value), required: true, disabled: creating, ref: nameInputRef, "data-autofocus": startCreating || undefined, "data-testid": "branch-name-input" }), _jsx(TextInput, { label: "Title", placeholder: "Brief description", value: newBranchTitle, onChange: (e) => setNewBranchTitle(e.target.value), disabled: creating, "data-testid": "branch-title-input" }), _jsx(Textarea, { label: "Description", placeholder: "Detailed description of the changes", value: newBranchDescription, onChange: (e) => setNewBranchDescription(e.target.value), minRows: 2, disabled: creating, "data-testid": "branch-description-textarea" }), _jsx(Button, { size: "sm", onClick: handleCreate, disabled: !createdBranchName?.ok, loading: creating, fullWidth: true, "data-testid": "create-branch-submit", children: "Create branch" })] }) }) })] })), _jsx(ScrollArea, { style: { flex: 1 }, pb: "md", children: branches.length === 0 ? (_jsx(Text, { size: "sm", c: "dimmed", py: "md", children: !supportsBranching ? 'Branch management is not available.' : 'No branches available.' })) : (_jsx(Stack, { gap: "sm", children: orderedBranches.map((b) => {
-                        // The editor resolves a shadowed outside branch's full name to the namespace branch
-                        // whose short name it is, so a card's actions name its branch by `branchAddress`.
-                        const address = branchAddress(branches, b);
-                        const act = (run) => run && (() => run(address));
-                        return (_jsx(BranchCard, { branch: b, isCurrent: b.name === currentBranchName, workflowBlockedReason: b.name === currentBranchName ? currentWorkflowBlockedReason : undefined, user: user, onSelect: act(onSelect), onSubmit: act(onSubmit), onWithdraw: act(onWithdraw), onApprove: act(onApprove), onRequestChanges: act(onRequestChanges), onDelete: act(onDelete), onGetUserMetadata: onGetUserMetadata, onGetOwnerMetadata: onGetOwnerMetadata }, b.name));
-                    }) })) })] }));
+                                            : undefined, error: nameError, value: newBranchName, onChange: (e) => setNewBranchName(e.target.value), required: true, disabled: creating, ref: nameInputRef, "data-autofocus": startCreating || undefined, "data-testid": "branch-name-input" }), _jsx(TextInput, { label: "Title", placeholder: "Brief description", value: newBranchTitle, onChange: (e) => setNewBranchTitle(e.target.value), disabled: creating, "data-testid": "branch-title-input" }), _jsx(Textarea, { label: "Description", placeholder: "Detailed description of the changes", value: newBranchDescription, onChange: (e) => setNewBranchDescription(e.target.value), minRows: 2, disabled: creating, "data-testid": "branch-description-textarea" }), _jsx(Button, { size: "sm", onClick: handleCreate, disabled: !createdBranchName?.ok, loading: creating, fullWidth: true, "data-testid": "create-branch-submit", children: "Create branch" })] }) }) })] })), showFilter && (_jsx(TextInput, { pt: "sm", ref: filterRef, "aria-label": "Filter branches", placeholder: "Filter by name, title or owner", value: filter, onChange: (e) => setFilter(e.target.value), rightSectionPointerEvents: "all", rightSection: filter && (_jsx(Tooltip, { label: "Clear search", withinPortal: true, children: _jsx(CloseButton, { size: "sm", "aria-label": "Clear search", onClick: clearFilter }) })), "data-testid": "branch-filter-input" })), showFilter && (_jsx(VisuallyHidden, { role: "status", "data-testid": "branch-filter-status", children: query && `${matchCount} ${matchCount === 1 ? 'branch matches' : 'branches match'}` })), _jsx(ScrollArea, { style: { flex: 1 }, pt: showFilter ? 'sm' : undefined, pb: "md", children: branches.length === 0 ? (_jsx(Text, { size: "sm", c: "dimmed", py: "md", children: !supportsBranching ? 'Branch management is not available.' : 'No branches available.' })) : (_jsxs(Stack, { gap: "sm", children: [live.map(renderCard), archived.length > 0 && (_jsx(ArchivedSection, { count: archived.length, open: archivedOpen || !!query, onToggle: () => setArchivedOpen(!archivedOpen), forcedOpen: !!query, children: archived.map(renderCard) })), matchCount === 0 && (_jsxs(Stack, { gap: 4, py: "sm", align: "flex-start", "data-testid": "branch-filter-empty", children: [_jsxs(Text, { size: "sm", c: "dimmed", children: ["No branches match \u201C", query, "\u201D."] }), _jsx(Button, { size: "compact-sm", variant: "subtle", 
+                                    // Inset, or the ScrollArea clips the focus ring.
+                                    style: { outlineOffset: -2 }, onClick: clearFilter, children: "Clear search" })] }))] })) })] }));
 };

package/dist/editor/Editor.js

@@ -167,7 +167,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
     // Reloads the open branch's comments after a request for changes, whose note is a comment; the
     // comment system is built further down.
     const reloadCommentsRef = useRef(() => { });
-    const { branchName: branchNameState, setBranchName, branches, branchSummaries, currentBranch, currentAddress, listedBranch, namesBranch, urlBranchName, branchesLoadFailed, branchesLoaded, addCreatedBranch, handleSubmit, handleWithdraw, handleApprove, handleRequestChanges, handleDelete, handleReloadBranchData, loadBranches, } = useBranchManager({
+    const { branchName: branchNameState, setBranchName, branches, branchSummaries, currentBranch, currentAddress, listedBranch, namesBranch, urlBranchName, branchesLoadFailed, branchesLoaded, addCreatedBranch, handleSubmit, handleWithdraw, handleApprove, handleRequestChanges, handleDelete, handleArchive, handleReloadBranchData, loadBranches, } = useBranchManager({
         initialBranch: branchName,
         operatingMode,
         setBusy: setBranchesLoading,
@@ -1705,6 +1705,10 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
                                     handleRequestChanges(name).catch((err) => console.error(err));
                                 }, onDelete: (name) => {
                                     handleDelete(name).catch((err) => console.error(err));
+                                }, onArchive: (name) => {
+                                    if (namesBranch(name, branchNameState) && isSaveAllRunning())
+                                        return;
+                                    handleArchive(name).catch((err) => console.error(err));
                                 }, onClose: () => setBranchManagerOpen(false), comments: comments, currentUserId: commentUserId, canResolve: canResolveAnyComment, onAddComment: handleAddComment, onResolveThread: handleResolveThread, highlightThreadId: highlightThreadId, onGetUserMetadata: canResolveUserNames ? handleGetUserMetadata : undefined, onGetOwnerMetadata: getCommentUserMetadata, onGetCommentUserMetadata: getCommentUserMetadata }, branchManagerOpening.seq) }), changesSubject && (_jsx(LazyEntryChangesDrawer, { opened: changesOpen, onClose: () => setChangesOpen(false), onExited: () => setChangesShown(false), returnFocusTo: changesReturnTarget, base: branchChanges.data?.base ?? currentBranch?.baseBranch ?? 'the base branch', subject: {
                                 ...changesSubject,
                                 unsavedEdits: changesSubject.logicalPath === currentEntry?.path && isSelectedDirty(),

package/dist/editor/FormRenderer.js

@@ -12,6 +12,7 @@ import { TextField } from './fields/TextField.js';
 import { ToggleField } from './fields/ToggleField.js';
 import { NumberField } from './fields/NumberField.js';
 import { NumberListField } from './fields/NumberListField.js';
+import { DateField } from './fields/DateField.js';
 import { DateTimeField } from './fields/DateTimeField.js';
 import { BlockField } from './fields/BlockField.js';
 import { SelectField } from './fields/SelectField.js';
@@ -53,6 +54,8 @@ const normalizeOptions = (options) => {
     return options.map((opt) => (typeof opt === 'string' ? { label: opt, value: opt } : opt));
 };
 const fieldKey = (path) => formatCanopyPath(path);
+/** A value of another type as text, for `DateField` to quote: the form cannot save it. */
+const dateFieldText = (value) => typeof value === 'string' ? value : value == null ? '' : JSON.stringify(value);
 const noop = () => { };
 const FENCE_STYLE = { border: 0, padding: 0, margin: 0, minWidth: 0 };
 const READ_ONLY_FORM_CLASS = 'canopy-read-only-form';
@@ -214,6 +217,8 @@ export const FormRenderer = ({ fields, value, onChange, customRenderers, branch
                             : [], onChange: (v) => update(v), dataCanopyField: normalizeCanopyPath(path), readOnly: readOnly, maxItems: field.maxItems }, fieldKey(path)));
                 }
                 return wrapWithComments(_jsx(NumberField, { id: fieldId, label: label, description: field.description, value: typeof currentValue === 'number' ? currentValue : undefined, onChange: (v) => update(v), dataCanopyField: normalizeCanopyPath(path), readOnly: readOnly }, fieldKey(path)));
+            case 'date':
+                return wrapWithComments(_jsx(DateField, { id: fieldId, label: label, description: field.description, value: dateFieldText(currentValue), onChange: (v) => update(v), dataCanopyField: normalizeCanopyPath(path), readOnly: readOnly, required: field.required === true }, fieldKey(path)));
             case 'datetime':
                 return wrapWithComments(_jsx(DateTimeField, { id: fieldId, label: label, description: field.description, value: typeof currentValue === 'string' ? currentValue : '', onChange: (v) => update(v), dataCanopyField: normalizeCanopyPath(path), readOnly: readOnly, stampOnPublish: 'stampOnPublish' in field && field.stampOnPublish === true }, fieldKey(path)));
             case 'markdown':

package/dist/editor/admin/SystemHealthPanel.js

@@ -9,14 +9,15 @@ 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 { 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 { useRef, useState } from 'react';
+import { Alert, Badge, Button, Code, Group, Loader, Modal, NumberInput, 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';
 import { formatRelativeTime } from '../relative-time.js';
 import { EDITOR_ACTIONS } from '../copy.js';
 import { useSystemHealth, } from './useSystemHealth.js';
+import { ageDeletionHold, archivedBefore, archivedCutoff, deletableByAge, } from '../../branch-archive.js';
 import { escapeForLog } from '../../utils/escape-text.js';
 import { TooltipDetail } from '../components/TooltipDetail.js';
 import { DISMISS_UNPUBLISHED_ATTRIBUTE, UnpublishedAtMergeAlert } from './UnpublishedAtMergeAlert.js';
@@ -256,6 +257,7 @@ function duplicateScanSummary(health, healthyDirNames) {
         return { text: 'No duplicate content IDs found.', color: 'dimmed' };
     return { text: parts.join(' '), color: 'orange' };
 }
+const DEFAULT_CLEANUP_DAYS = 90;
 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 });
@@ -348,6 +350,55 @@ function TasksTab({ health }) {
                                 ? corruptRows.map((file) => (_jsxs(Table.Tr, { children: [_jsx(Table.Td, { children: _jsx("span", { title: file.fileName, children: truncate(file.fileName, 30) }) }), _jsxs(Table.Td, { children: [file.size, " bytes"] }), _jsx(Table.Td, { children: file.mtime }), _jsx(Table.Td, { children: _jsx(Code, { block: true, style: { maxWidth: 320, whiteSpace: 'pre-wrap' }, children: file.rawSnippet }) }), _jsx(Table.Td, { children: _jsx(Button, { variant: "light", color: "red", "data-testid": `delete-task-${file.fileName}`, onClick: () => handleDeleteClick('corrupt', file.fileName), children: "Delete" }) })] }, file.fileName)))
                                 : taskRows.map((task) => (_jsxs(Table.Tr, { children: [_jsx(Table.Td, { children: _jsx("span", { title: task.id, children: truncate(task.id, 12) }) }), _jsx(Table.Td, { children: task.action }), _jsx(Table.Td, { children: task.createdAt }), _jsx(Table.Td, { children: task.retryCount ?? 0 }), _jsx(Table.Td, { children: task.error ? (_jsx(Tooltip, { label: task.error, multiline: true, maw: 400, children: _jsx(Text, { size: "xs", style: { cursor: 'help' }, children: truncate(task.error, 50) }) })) : (_jsx(Text, { size: "xs", c: "dimmed", children: "\u2014" })) }), _jsx(Table.Td, { children: _jsxs(Group, { gap: "xs", children: [taskStatus === 'failed' && (_jsx(Button, { variant: "light", "data-testid": `retry-task-${task.id}`, onClick: () => handleRetryClick(task), children: "Retry" })), canDelete && (_jsx(Button, { variant: "light", color: "red", "data-testid": `delete-task-${task.id}`, onClick: () => handleDeleteClick(taskStatus, `${task.id}.json`), children: "Delete" }))] }) })] }, task.id))) })] }) }))] }));
 }
+/** What `lastGitSync.archivedSweep` left undone, or nothing when it finished clean. */
+const sweepTrouble = ({ failed = [], warnings = [] } = {}) => [
+    failed.length === 0
+        ? ''
+        : ` The last sweep could not delete ${failed.map((f) => f.branch).join(', ')} and tries again next sync.`,
+    ...warnings.map((warning) => ` ${endSentence(warning)}`),
+].join('');
+const dayCount = (days) => `${days} ${days === 1 ? 'day' : 'days'}`;
+/** The deployment's retention, and the admin's own delete by the same rule. */
+function ArchivedBranchesCleanup({ health }) {
+    const [days, setDays] = useState(DEFAULT_CLEANUP_DAYS);
+    const workerStatus = health.status?.workerStatus;
+    const generatedAt = health.branchHealth?.generatedAt;
+    const olderThanDays = typeof days === 'number' && Number.isInteger(days) && days > 0 ? days : null;
+    // The scan's own clock, which keeps this render pure and matches the listing it counts.
+    const cutoff = olderThanDays !== null && generatedAt
+        ? archivedCutoff(olderThanDays, Date.parse(generatedAt))
+        : null;
+    const candidates = (health.branchHealth?.entries ?? []).filter((e) => !e.isBaseBranch);
+    const branchesMatching = (matches) => cutoff === null
+        ? []
+        : candidates.flatMap((e) => (e.branch && matches(e.branch, cutoff) ? [e.branch] : []));
+    const due = branchesMatching(deletableByAge);
+    const old = branchesMatching(archivedBefore);
+    const heldFor = (hold) => old.filter((branch) => ageDeletionHold(branch) === hold).map((branch) => branch.name);
+    const notMerged = heldFor('not-merged');
+    const unpublished = heldFor('unpublished');
+    const anyDeletable = candidates.some((e) => e.branch && deletableByAge(e.branch, Number.POSITIVE_INFINITY));
+    const dueLabel = `${due.length} archived ${due.length === 1 ? 'branch' : 'branches'}`;
+    const blockedReason = olderThanDays === null
+        ? 'Enter a whole number of days.'
+        : due.length === 0
+            ? `No merged archived branches are older than ${dayCount(olderThanDays)}.${olderThanDays > 1 && anyDeletable ? ' Lower the number of days to include newer ones.' : ''}${old.length > 0 ? ' Older branches kept from this delete go one at a time, from the "Branches" drawer.' : ''}`
+            : undefined;
+    const handleDeleteClick = () => {
+        if (blockedReason || olderThanDays === null)
+            return;
+        openConfirm({
+            title: 'Delete archived branches',
+            children: (_jsxs(Stack, { gap: "xs", children: [_jsxs(Text, { size: "sm", children: ["Delete ", dueLabel, " and their comments from the editor? Their GitHub branches stay. This cannot be undone."] }), _jsx(Text, { size: "xs", "data-testid": "delete-archived-names", children: due.map((branch) => branch.name).join(', ') }), notMerged.length > 0 && (_jsxs(Text, { size: "xs", "data-testid": "delete-archived-not-merged", children: ["Kept, as they were not merged: ", notMerged.join(', '), "."] })), unpublished.length > 0 && (_jsxs(Text, { size: "xs", "data-testid": "delete-archived-unpublished", children: ["Kept, as they may hold changes missing from GitHub: ", unpublished.join(', '), "."] }))] })),
+            labels: { confirm: 'Delete branches', cancel: 'Cancel' },
+            confirmProps: { color: 'red', 'data-testid': 'confirm-delete-archived' },
+            onConfirm: () => health.deleteArchivedBranches(olderThanDays, due.map((branch) => branch.name)),
+        });
+    };
+    return (_jsxs(Stack, { gap: 4, mb: "sm", "data-testid": "archived-branches-cleanup", children: [_jsx(Text, { size: "sm", fw: 600, children: "Archived branches" }), _jsxs(Group, { align: "flex-end", gap: "xs", children: [_jsx(NumberInput, { label: "Delete merged archived branches older than", suffix: days === 1 ? ' day' : ' days', size: "xs", w: 280, min: 1, allowDecimal: false, allowNegative: false, value: days, onChange: setDays, "data-testid": "archived-days-input" }), _jsx(Tooltip, { label: blockedReason, disabled: !blockedReason, multiline: true, maw: 280, position: "top-end", children: _jsxs(Button, { size: "xs", variant: "light", color: "red", onClick: handleDeleteClick, loading: health.deletingArchivedBranches, "data-disabled": blockedReason ? true : undefined, "aria-disabled": blockedReason ? true : undefined, "data-testid": "delete-archived-button", children: ["Delete ", blockedReason ? 'archived branches' : dueLabel] }) })] }), workerStatus?.lastGitSync && (_jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "archived-retention-note", children: [workerStatus.archivedBranchRetentionDays === undefined
+                        ? 'This deployment keeps archived branches until someone deletes them.'
+                        : `This deployment deletes merged branches ${dayCount(workerStatus.archivedBranchRetentionDays)} after archiving.`, sweepTrouble(workerStatus.lastGitSync?.archivedSweep)] }))] }));
+}
 function BranchesTab({ health }) {
     const { branchHealth, branchHealthLoading } = health;
     const entries = branchHealth?.entries ?? [];
@@ -399,7 +450,7 @@ function BranchesTab({ health }) {
     if (entries.length === 0) {
         return (_jsx(Text, { size: "sm", c: "dimmed", py: "md", children: "No branch directories found." }));
     }
-    return (_jsxs(Stack, { gap: "xs", children: [_jsxs(Group, { justify: "space-between", align: "center", wrap: "nowrap", children: [_jsx(Text, { size: "xs", c: duplicateSummary.color, "data-testid": "duplicate-id-summary", children: duplicateSummary.text }), _jsx(Button, { size: "compact-xs", variant: "subtle", loading: health.duplicateIdScanLoading, onClick: () => health.checkDuplicateIds(), children: "Check again" })] }), _jsx(Table.ScrollContainer, { minWidth: 700, children: _jsxs(Table, { children: [_jsx(Table.Thead, { children: _jsxs(Table.Tr, { children: [_jsx(Table.Th, { children: "Name" }), _jsx(Table.Th, { children: "Status" }), _jsx(Table.Th, { children: "PR" }), _jsx(Table.Th, { children: "Sync" }), _jsx(Table.Th, { children: "Warnings" }), _jsx(Table.Th, { children: "Updated" }), _jsx(Table.Th, { children: "Actions" })] }) }), _jsx(Table.Tbody, { children: entries.map((entry) => (_jsx(BranchHealthRow, { entry: entry, baseWarning: entry.isBaseBranch ? baseWarning : null, duplicateIdScan: health.duplicateIdScan
+    return (_jsxs(Stack, { gap: "xs", children: [_jsx(ArchivedBranchesCleanup, { health: health }), _jsxs(Group, { justify: "space-between", align: "center", wrap: "nowrap", children: [_jsx(Text, { size: "xs", c: duplicateSummary.color, "data-testid": "duplicate-id-summary", children: duplicateSummary.text }), _jsx(Button, { size: "compact-xs", variant: "subtle", loading: health.duplicateIdScanLoading, onClick: () => health.checkDuplicateIds(), children: "Check again" })] }), _jsx(Table.ScrollContainer, { minWidth: 700, children: _jsxs(Table, { children: [_jsx(Table.Thead, { children: _jsxs(Table.Tr, { children: [_jsx(Table.Th, { children: "Name" }), _jsx(Table.Th, { children: "Status" }), _jsx(Table.Th, { children: "PR" }), _jsx(Table.Th, { children: "Sync" }), _jsx(Table.Th, { children: "Warnings" }), _jsx(Table.Th, { children: "Updated" }), _jsx(Table.Th, { children: "Actions" })] }) }), _jsx(Table.Tbody, { children: entries.map((entry) => (_jsx(BranchHealthRow, { entry: entry, baseWarning: entry.isBaseBranch ? baseWarning : null, duplicateIdScan: health.duplicateIdScan
                                     ? (health.duplicateIdScan.byDir[entry.dirName] ?? null)
                                     : undefined, onMarkMerged: handleMarkMergedClick, onRepair: handleRepairClick, onPurge: handlePurgeClick, onDuplicateIds: handleDuplicateIdsClick }, entry.dirName))) })] }) })] }));
 }
@@ -419,7 +470,7 @@ const firstFailed = (iso) => {
 function BranchHealthRow({ entry, baseWarning, duplicateIdScan, onMarkMerged, onRepair, onPurge, onDuplicateIds, }) {
     if (entry.kind === 'healthy' && entry.branch) {
         const b = entry.branch;
-        // The worker looks at every branch but 'archived' (already merged): one in review is not
+        // The worker looks at every branch but 'archived' (finished): 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;
@@ -429,7 +480,9 @@ function BranchHealthRow({ entry, baseWarning, duplicateIdScan, onMarkMerged, on
             : !inReview
                 ? b.unpublishedAtMerge
                     ? { kind: 'unpublished-at-merge' }
-                    : undefined
+                    : b.status === 'archived' && b.rewrittenOnGitHub !== undefined
+                        ? { kind: 'rewritten-at-merge', commit: b.rewrittenOnGitHub }
+                        : undefined
                 : b.submitUnfinished
                     ? {
                         kind: 'submit-unfinished',
@@ -437,7 +490,9 @@ function BranchHealthRow({ entry, baseWarning, duplicateIdScan, onMarkMerged, on
                         notQueued: b.submitNotQueued,
                     }
                     : b.pullRequestHold;
-        const canMarkMerged = (b.status === 'submitted' || b.status === 'approved') && !!b.pullRequestNumber;
+        const canMarkMerged = (b.status === 'submitted' || b.status === 'approved') &&
+            !!b.pullRequestNumber &&
+            b.pullRequestState !== 'closed';
         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, {

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

@@ -51,6 +51,9 @@ export interface UseSystemHealthReturn {
     purgeDir: (dirName: string) => Promise<void>;
     repairDir: (dirName: string) => Promise<void>;
     markMerged: (branchName: string) => Promise<void>;
+    /** Deletes those of `branches` still past `olderThanDays`, then says what it could not. */
+    deleteArchivedBranches: (olderThanDays: number, branches: string[]) => Promise<void>;
+    deletingArchivedBranches: boolean;
     /** Stops listing a branch merged with an unfinished submit, a warning that doesn't come back. */
     dismissUnpublished: (dirName: string) => Promise<void>;
 }

package/dist/editor/admin/useSystemHealth.js

@@ -16,7 +16,16 @@ import { useSWRConfig } from 'swr';
 import { notifications } from '@mantine/notifications';
 import { useApiClient } from '../context/index.js';
 import { BRANCHES_KEY } from '../hooks/useBranchesData.js';
+import { isGatewayFailure, isUnanswered, UnansweredError } from '../unanswered.js';
 const POLL_INTERVAL_MS = 30_000;
+const EMPTY_DELETE = {
+    deleted: [],
+    skipped: { notMerged: [], unpublished: [] },
+    failed: [],
+    remaining: 0,
+    warnings: [],
+};
+const countBranches = (count) => `${count} archived ${count === 1 ? 'branch' : 'branches'}`;
 /**
  * Crash-loop rider window: a worker that fatally exits and restarts
  * repeatedly can flap between 'absent' and 'alive' and never sit still long
@@ -38,6 +47,7 @@ export function useSystemHealth(options) {
     const [duplicateIdScan, setDuplicateIdScan] = useState(null);
     const [duplicateIdScanLoading, setDuplicateIdScanLoading] = useState(false);
     const [duplicateIdScanError, setDuplicateIdScanError] = useState(null);
+    const [deletingArchivedBranches, setDeletingArchivedBranches] = useState(false);
     const [error, setError] = useState(null);
     // refresh() has no status argument, so it needs the CURRENT taskStatus
     // without depending on it (that would tear down/rebuild the poll interval
@@ -266,6 +276,53 @@ export function useSystemHealth(options) {
             notifications.show({ message, color: 'red' });
         }
     }, [apiClient, refresh]);
+    const deleteArchivedBranches = useCallback(async (olderThanDays, branches) => {
+        setDeletingArchivedBranches(true);
+        try {
+            const result = await apiClient.admin.deleteArchivedBranches({ olderThanDays, branches });
+            if (isGatewayFailure(result))
+                throw new UnansweredError();
+            if (!result.ok)
+                throw new Error(result.error || 'Failed to delete archived branches');
+            const { deleted, skipped, failed, remaining, warnings } = result.data ?? EMPTY_DELETE;
+            const left = [
+                failed.length > 0
+                    ? `${countBranches(failed.length)} not deleted: busy, or changed since listed`
+                    : '',
+                remaining > 0 ? `${countBranches(remaining)} not reached, run this again` : '',
+                skipped.notMerged.length > 0
+                    ? `${countBranches(skipped.notMerged.length)} kept: not merged`
+                    : '',
+                skipped.unpublished.length > 0
+                    ? `${countBranches(skipped.unpublished.length)} kept: may hold unpublished changes`
+                    : '',
+                ...warnings,
+            ].filter(Boolean);
+            const message = `Deleted ${countBranches(deleted.length)}`;
+            notifications.show(left.length > 0
+                ? { message: `${message}. ${left.join('. ')}.`, color: 'yellow', autoClose: false }
+                : { message, color: 'green' });
+            await mutate(BRANCHES_KEY);
+            await refresh();
+        }
+        catch (err) {
+            if (isUnanswered(err)) {
+                notifications.show({
+                    message: 'Deleting archived branches may have gone through even though the server didn\'t answer. Check the "Branches" tab.',
+                    color: 'yellow',
+                    autoClose: false,
+                });
+                await mutate(BRANCHES_KEY);
+                await refresh();
+                return;
+            }
+            const message = err instanceof Error ? err.message : 'Failed to delete archived branches';
+            notifications.show({ message, color: 'red', autoClose: false });
+        }
+        finally {
+            setDeletingArchivedBranches(false);
+        }
+    }, [apiClient, mutate, refresh]);
     return {
         status,
         statusLoading,
@@ -288,6 +345,8 @@ export function useSystemHealth(options) {
         purgeDir,
         repairDir,
         markMerged,
+        deleteArchivedBranches,
+        deletingArchivedBranches,
         dismissUnpublished,
     };
 }

package/dist/editor/branch-status.js

@@ -77,6 +77,15 @@ export function branchHoldMessage(hold, viewer) {
                     : '';
             return `${stuck} ${retry}${instead}.`;
         }
+        case 'rewritten-at-merge': {
+            const commit = hold.commit
+                ? ` GitHub no longer contains commit ${escapeForLog(hold.commit)}.`
+                : '';
+            const stuck = `This branch was changed on GitHub before it was archived, so some changes here may be missing from GitHub.${commit}`;
+            return viewer.isAdmin
+                ? `${stuck} Check them before deleting the branch.`
+                : `${stuck} Ask an admin to check it.`;
+        }
         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)

package/dist/editor/components/EntryChangesDrawer.js

@@ -266,9 +266,10 @@ const Value = ({ value, alt, }) => {
 };
 /**
  * A date in full, in the viewer's time zone: a comparison needs the value, so this is the one
- * place the editor shows a date absolute first and relative after.
+ * place the editor shows a date absolute first and relative after. A day has no relative form: it
+ * may be a future event, and a past one is not hours ago.
  */
-const DateValue = ({ value, text }) => (_jsxs(Stack, { gap: 0, children: [_jsx(Text, { size: "sm", style: TEXT_STYLE, children: text ?? value.text }), _jsx(Text, { size: "xs", c: "dimmed", children: formatRelativeTime(value.dateOnly ? `${value.iso}T00:00:00` : value.iso) })] }));
+const DateValue = ({ value, text }) => (_jsxs(Stack, { gap: 0, children: [_jsx(Text, { size: "sm", style: TEXT_STYLE, children: text ?? value.text }), !value.dateOnly && (_jsx(Text, { size: "xs", c: "dimmed", children: formatRelativeTime(value.iso) }))] }));
 const SideColumn = ({ label, change, side, }) => {
     const value = change[side] ?? { kind: 'empty' };
     const words = change.text?.mode === 'words' ? change.text : undefined;

package/dist/editor/copy.d.ts

@@ -14,6 +14,7 @@ export declare const EDITOR_ACTIONS: {
     readonly requestChanges: "Request changes";
     readonly switchBranch: "Switch branch";
     readonly newBranch: "New branch";
+    readonly archiveBranch: "Archive branch";
     readonly remove: "Remove";
     readonly restore: "Restore";
     readonly clear: "Clear";
@@ -34,5 +35,7 @@ export declare const rewrittenSubmitReason: (isAdmin: boolean) => string;
  * says how to finish the submit, where it can be retried at all.
  */
 export declare const UNFINISHED_SUBMIT_APPROVE_REASON = "The last submit didn't finish, so this branch can't be approved yet. Use \"Request changes\" to send it back to its editor.";
+/** Why only an admin may delete a branch that may hold commits nothing else has. */
+export declare const DELETE_NEEDS_ADMIN_REASON = "This branch may hold changes that are missing from GitHub. Ask an admin to check it before deleting it.";
 /** Why Approve and Request changes can't act: the pull request they act on is gone. */
 export declare const CLOSED_PULL_REQUEST_REASON = "The pull request was closed on GitHub. Use \"Withdraw from review\", then submit it again to open a new one.";

package/dist/editor/copy.js

@@ -14,6 +14,7 @@ export const EDITOR_ACTIONS = {
     requestChanges: 'Request changes',
     switchBranch: 'Switch branch',
     newBranch: 'New branch',
+    archiveBranch: 'Archive branch',
     remove: 'Remove',
     restore: 'Restore',
     clear: 'Clear',
@@ -36,5 +37,7 @@ export const rewrittenSubmitReason = (isAdmin) => isAdmin
  * says how to finish the submit, where it can be retried at all.
  */
 export const UNFINISHED_SUBMIT_APPROVE_REASON = 'The last submit didn\'t finish, so this branch can\'t be approved yet. Use "Request changes" to send it back to its editor.';
+/** Why only an admin may delete a branch that may hold commits nothing else has. */
+export const DELETE_NEEDS_ADMIN_REASON = 'This branch may hold changes that are missing from GitHub. Ask an admin to check it before deleting it.';
 /** Why Approve and Request changes can't act: the pull request they act on is gone. */
 export const CLOSED_PULL_REQUEST_REASON = 'The pull request was closed on GitHub. Use "Withdraw from review", then submit it again to open a new one.';

package/dist/editor/entry-diff.js

@@ -8,6 +8,7 @@ import { diffLines, diffWordsWithSpace } from 'diff';
 import equal from 'fast-deep-equal';
 import { ITEM_KEY } from '../item-keys.js';
 import { findBodyFieldName } from '../utils/body-field.js';
+import { isCalendarDay, localMidnight } from '../utils/calendar-day.js';
 import { flattenGroupFields } from '../utils/flatten-group-fields.js';
 import { isPlainRecord, resolveBlockItem } from '../validation/field-traversal.js';
 import { listItemHeading, listItemTitle } from './fields/list-item-title.js';
@@ -89,7 +90,7 @@ const ISO_CHARS = /^[\d:.+\-TZ]+$/;
 const formatDate = (iso, dateOnly, precision = 'minute') => {
     if (dateOnly) {
         const [year, month, day] = iso.split('-').map(Number);
-        return new Date(year, month - 1, day).toLocaleDateString(undefined, {
+        return localMidnight(year, month, day).toLocaleDateString(undefined, {
             year: 'numeric',
             month: 'short',
             day: 'numeric',
@@ -190,6 +191,11 @@ class Walker {
                 }
                 break;
             }
+            case 'date':
+                if (isCalendarDay(value)) {
+                    return { kind: 'date', iso: value, text: formatDate(value, true), dateOnly: true };
+                }
+                break;
             case 'datetime':
                 if (typeof value === 'string' && !Number.isNaN(Date.parse(value))) {
                     return DATE_ONLY.test(value)

package/dist/editor/fields/DateField.d.ts

@@ -0,0 +1,19 @@
+import React from 'react';
+export interface DateFieldProps {
+    id?: string;
+    label?: string;
+    description?: string;
+    value: string;
+    onChange: (value: string) => void;
+    dataCanopyField?: string;
+    /** Shows the value without accepting edits. */
+    readOnly?: boolean;
+    /** A required field has no Remove: a save needs a day in it. */
+    required?: boolean;
+}
+/**
+ * Editor for `type: 'date'` fields: a day, stored as `YYYY-MM-DD`, with no time and no zone. Only
+ * a pick or Remove writes, so a loaded value saves back unchanged, and a save refuses one that is
+ * no real day.
+ */
+export declare const DateField: React.FC<DateFieldProps>;