canopycms 0.9.0 → 0.10.0

package/dist/branch-archive.js

@@ -0,0 +1,27 @@
+/** When the branch was archived, or undefined for one that records neither time. */
+export const archivedTime = (branch) => {
+    const recorded = branch.archivedAt ?? branch.mergedAt;
+    if (recorded === undefined)
+        return undefined;
+    const time = Date.parse(recorded);
+    return Number.isNaN(time) ? undefined : time;
+};
+/** Archived before `cutoffMs`. `updatedAt` is no clock: any metadata write moves it. */
+export const archivedBefore = (branch, cutoffMs) => {
+    const time = archivedTime(branch);
+    return branch.status === 'archived' && time !== undefined && time < cutoffMs;
+};
+/**
+ * What keeps a branch from deletion by age, past any age: one archived without merging holds work
+ * that reached no base branch, and one merged with an unfinished submit, or rewritten on GitHub,
+ * may hold the only copy of commits the merge left out.
+ */
+export const ageDeletionHold = (branch) => branch.mergedAt === undefined
+    ? 'not-merged'
+    : branch.unpublishedAtMerge === true || branch.rewrittenOnGitHub !== undefined
+        ? 'unpublished'
+        : undefined;
+/** The one rule the retention sweep and the admin bulk delete both select by. */
+export const deletableByAge = (branch, cutoffMs) => archivedBefore(branch, cutoffMs) && ageDeletionHold(branch) === undefined;
+/** `now` less `days`, as the cutoff the functions above take. */
+export const archivedCutoff = (days, now) => now - days * 24 * 60 * 60_000;

package/dist/branch-delete.d.ts

@@ -0,0 +1,45 @@
+import type { BranchRegistry } from './branch-registry.js';
+import type { BranchContext, BranchMetadata } from './types.js';
+export interface DeleteBranchWorkspaceOptions {
+    context: Pick<BranchContext, 'branch' | 'branchRoot' | 'baseRoot'>;
+    registry: Pick<BranchRegistry, 'invalidate'>;
+    /**
+     * For a delete a person asked for. Deletion by age passes none: commits pushed to a GitHub branch
+     * after its merge have no other copy, and reconcile prunes the mirror's head once GitHub drops it.
+     */
+    remoteCopies?: {
+        /** The branch it forked from, or the deployment's base branch. */
+        baseBranch: string;
+        /** Removes the branch's head from `remote.git`; a failure costs a warning, not the delete. */
+        deleteMirrorHead: () => Promise<void>;
+        /** Deletes or queues deleting the branch on GitHub, resolving a warning if that failed. */
+        deleteOnGitHub: () => Promise<string | undefined>;
+    };
+    /**
+     * Re-decides from a fresh read inside the lock every save() takes, so a change before the rename
+     * keeps the branch and one after it fails. For a caller that chose the branch earlier.
+     */
+    stillWanted?: (current: BranchMetadata) => boolean;
+}
+export type DeleteBranchWorkspaceOutcome = {
+    kind: 'deleted';
+    cleanupWarning?: string;
+}
+/** `stillWanted` refused it, or it was already gone. */
+ | {
+    kind: 'kept';
+}
+/** The lock was not taken in time, or branch.json could not be read under it. */
+ | {
+    kind: 'busy';
+    error: string;
+};
+/**
+ * Delete a branch and everything stored with it: workspace, branch.json and comments.
+ *
+ * The directory leaves its name by one rename, under the server-enforced lockfile branch-metadata
+ * saves hold (utils/occ-json-write.ts), so a save() that reaches that lock after the rename fails
+ * rather than recreating the tree. The `rm` runs last: a process killed during it leaves only a
+ * `.deleting-*` directory the worker sweeps, never residue under a name that may be created again.
+ */
+export declare function deleteBranchWorkspace(options: DeleteBranchWorkspaceOptions): Promise<DeleteBranchWorkspaceOutcome>;

package/dist/branch-delete.js

@@ -0,0 +1,97 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { BRANCH_META_DIR, BRANCH_META_FILE, readBranchMetadataFile } from './branch-metadata-file.js';
+import { deletingDirName, removeLeftoverDir } from './branch-provisioning.js';
+import { RESERVED_SETTINGS_BRANCH_PREFIX, sanitizeBranchName } from './paths/branch-name.js';
+import { getErrorMessage, isNotFoundError, sanitizeErrorMessage } from './utils/error.js';
+import { filePathExists } from './utils/fs.js';
+import { canopyLogError, canopyLogWarn } from './utils/logger.js';
+import { withOccFileLock } from './utils/occ-json-write.js';
+/**
+ * Delete a branch and everything stored with it: workspace, branch.json and comments.
+ *
+ * The directory leaves its name by one rename, under the server-enforced lockfile branch-metadata
+ * saves hold (utils/occ-json-write.ts), so a save() that reaches that lock after the rename fails
+ * rather than recreating the tree. The `rm` runs last: a process killed during it leaves only a
+ * `.deleting-*` directory the worker sweeps, never residue under a name that may be created again.
+ */
+export async function deleteBranchWorkspace(options) {
+    const { context, registry, remoteCopies, stillWanted } = options;
+    const metadataFile = path.join(context.branchRoot, BRANCH_META_DIR, BRANCH_META_FILE);
+    let cleanupWarning;
+    let deletingPath;
+    const warn = (warning) => {
+        cleanupWarning = cleanupWarning ? `${cleanupWarning}; ${warning}` : warning;
+    };
+    let wanted = true;
+    try {
+        await withOccFileLock(metadataFile, async () => {
+            if (stillWanted) {
+                const current = await readBranchMetadataFile(context.branchRoot);
+                if (current === null || !stillWanted(current.branch)) {
+                    wanted = false;
+                    return;
+                }
+            }
+            if (context.branchRoot === context.baseRoot) {
+                await fs.unlink(metadataFile).catch((err) => {
+                    if (!isNotFoundError(err))
+                        throw err;
+                });
+                return;
+            }
+            const target = path.join(context.baseRoot, deletingDirName(path.basename(context.branchRoot)));
+            try {
+                await fs.rename(context.branchRoot, target);
+                deletingPath = target;
+            }
+            catch (err) {
+                if (isNotFoundError(err))
+                    return;
+                // Still deleted logically: without branch.json the branch is unlisted,
+                // and the worker quarantines what is left.
+                await fs.unlink(metadataFile).catch(() => { });
+                // [REDACT] Returned to the browser; the console line keeps the path.
+                warn(`Failed to remove branch directory: ${sanitizeErrorMessage(getErrorMessage(err))}`);
+                canopyLogError(`CanopyCMS: Failed to move branch directory for ${context.branch.name} aside:`, getErrorMessage(err));
+            }
+        });
+    }
+    catch (err) {
+        // A lock on a directory another delete took fails like any other.
+        if (!(await filePathExists(context.branchRoot)))
+            return { kind: 'kept' };
+        return { kind: 'busy', error: getErrorMessage(err) };
+    }
+    if (!wanted)
+        return { kind: 'kept' };
+    // Defense-in-depth only: callers refuse the base branch, and settings branches never resolve
+    // to a context here.
+    const sanitizedDeleted = sanitizeBranchName(context.branch.name);
+    if (remoteCopies &&
+        sanitizedDeleted !== sanitizeBranchName(remoteCopies.baseBranch) &&
+        !sanitizedDeleted.startsWith(RESERVED_SETTINGS_BRANCH_PREFIX)) {
+        try {
+            await remoteCopies.deleteMirrorHead();
+        }
+        catch (err) {
+            // Client-facing copy is sanitized (API-H2 — no absolute EFS paths); the console line keeps
+            // the raw detail for server logs.
+            warn(`Failed to remove the deleted branch's head from the local mirror: ${sanitizeErrorMessage(getErrorMessage(err))}`);
+            canopyLogWarn(`CanopyCMS: failed to remove deleted branch's mirror head (branch ${context.branch.name}): ${getErrorMessage(err)}`);
+        }
+        const warning = await remoteCopies.deleteOnGitHub();
+        if (warning)
+            warn(warning);
+    }
+    try {
+        await registry.invalidate();
+    }
+    catch (err) {
+        // The branch is gone; a listing corrects itself at the next bump.
+        warn(`Failed to refresh the branch list: ${sanitizeErrorMessage(getErrorMessage(err))}`);
+    }
+    if (deletingPath)
+        await removeLeftoverDir(deletingPath);
+    return { kind: 'deleted', ...(cleanupWarning && { cleanupWarning }) };
+}

package/dist/branch-metadata-file.d.ts

@@ -68,6 +68,7 @@ export declare const branchMetadataSchema: z.ZodObject<{
         merged: "merged";
     }>>;
     mergedAt: z.ZodOptional<z.ZodString>;
+    archivedAt: z.ZodOptional<z.ZodString>;
     rebaseFailure: z.ZodOptional<z.ZodObject<{
         message: z.ZodString;
         firstAt: z.ZodString;
@@ -183,6 +184,7 @@ export declare const branchMetadataSchema: z.ZodObject<{
         merged: "merged";
     }>>;
     mergedAt: z.ZodOptional<z.ZodString>;
+    archivedAt: z.ZodOptional<z.ZodString>;
     rebaseFailure: z.ZodOptional<z.ZodObject<{
         message: z.ZodString;
         firstAt: z.ZodString;
@@ -298,6 +300,7 @@ export declare const branchMetadataSchema: z.ZodObject<{
         merged: "merged";
     }>>;
     mergedAt: z.ZodOptional<z.ZodString>;
+    archivedAt: z.ZodOptional<z.ZodString>;
     rebaseFailure: z.ZodOptional<z.ZodObject<{
         message: z.ZodString;
         firstAt: z.ZodString;

package/dist/branch-metadata-file.js

@@ -77,6 +77,7 @@ const branchMetadataShape = {
         merged: 'merged',
     }).optional(),
     mergedAt: z.string().optional(),
+    archivedAt: z.string().optional(),
     rebaseFailure: z
         .object({ message: z.string(), firstAt: z.string(), lastAt: z.string() })
         .optional(),

package/dist/branch-metadata.d.ts

@@ -130,7 +130,12 @@ export declare const awaitsSubmitRetry: ({ submitUnfinished, status }: BranchMet
  * existing values for fields the incoming update omits, so the branch's ref and
  * its recorded PR number and URL survive untouched.
  */
-export declare function buildMergedBranchUpdate(branch: BranchMetadata, now?: Date): NonNullable<BranchMetadataUpdate['branch']>;
+export declare function buildMergedBranchUpdate(branch: BranchMetadata, mergedAt?: Date): NonNullable<BranchMetadataUpdate['branch']>;
+/**
+ * The metadata update for archiving a branch whose PR closed without merging. Records no merge:
+ * `mergedAt` is what tells the two apart, and `pullRequestState` stays `closed`.
+ */
+export declare function buildUnmergedArchiveUpdate(): NonNullable<BranchMetadataUpdate['branch']>;
 /** {@link BranchMetadataFileManager.get} as a function. */
 export declare const getBranchMetadataFileManager: (branchRoot: string, baseRoot: string, options?: {
     settleMs?: number;

package/dist/branch-metadata.js

@@ -282,11 +282,13 @@ const owesSubmit = (branch) => awaitsSubmitRetry(branch) ||
  * existing values for fields the incoming update omits, so the branch's ref and
  * its recorded PR number and URL survive untouched.
  */
-export function buildMergedBranchUpdate(branch, now = new Date()) {
+export function buildMergedBranchUpdate(branch, mergedAt = new Date()) {
     return {
         status: 'archived',
         pullRequestState: 'merged',
-        mergedAt: now.toISOString(),
+        mergedAt: mergedAt.toISOString(),
+        // Now, not the merge: retention's clock must not start before a worker outage that hid it.
+        archivedAt: new Date().toISOString(),
         // The merge settled every conflict the record named.
         conflictStatus: 'clean',
         conflictFiles: [],
@@ -294,6 +296,17 @@ export function buildMergedBranchUpdate(branch, now = new Date()) {
         ...(owesSubmit(branch) ? { unpublishedAtMerge: true } : {}),
     };
 }
+/**
+ * The metadata update for archiving a branch whose PR closed without merging. Records no merge:
+ * `mergedAt` is what tells the two apart, and `pullRequestState` stays `closed`.
+ */
+export function buildUnmergedArchiveUpdate() {
+    return {
+        status: 'archived',
+        archivedAt: new Date().toISOString(),
+        submitUnfinished: undefined,
+    };
+}
 /** {@link BranchMetadataFileManager.get} as a function. */
 export const getBranchMetadataFileManager = (branchRoot, baseRoot, options) => {
     return BranchMetadataFileManager.get(branchRoot, baseRoot, options);

package/dist/cli/cli.js

@@ -12459,6 +12459,7 @@ var init_generate_ai_content = __esm({
         merged: "merged"
       }).optional(),
       mergedAt: z72.string().optional(),
+      archivedAt: z72.string().optional(),
       rebaseFailure: z72.object({ message: z72.string(), firstAt: z72.string(), lastAt: z72.string() }).optional(),
       historyRewrittenFrom: z72.string().optional(),
       lastGitHubTip: z72.string().optional(),
@@ -17935,6 +17936,7 @@ var init_branch_metadata_file = __esm({
         merged: "merged"
       }).optional(),
       mergedAt: z16.string().optional(),
+      archivedAt: z16.string().optional(),
       rebaseFailure: z16.object({ message: z16.string(), firstAt: z16.string(), lastAt: z16.string() }).optional(),
       historyRewrittenFrom: z16.string().optional(),
       lastGitHubTip: z16.string().optional(),

package/dist/cli/generate-ai-content.js

@@ -7908,6 +7908,7 @@ var branchMetadataShape = {
     merged: "merged"
   }).optional(),
   mergedAt: z7.string().optional(),
+  archivedAt: z7.string().optional(),
   rebaseFailure: z7.object({ message: z7.string(), firstAt: z7.string(), lastAt: z7.string() }).optional(),
   historyRewrittenFrom: z7.string().optional(),
   lastGitHubTip: z7.string().optional(),

package/dist/editor/BranchManager.d.ts

@@ -9,8 +9,11 @@ export interface BranchSummary {
     name: string;
     /** What the card shows for the branch (`displayBranchName`); the full `name` keys it. */
     shortName?: string;
+    title?: string;
     status: string;
     createdBy?: string;
+    /** The creator's display name, which the filter searches. */
+    ownerName?: string;
     updatedAt?: string;
     access?: {
         users?: string[];
@@ -99,6 +102,8 @@ export interface BranchManagerProps {
     onWithdraw?: (name: string) => void;
     onApprove?: (name: string) => void;
     onRequestChanges?: (name: string) => void;
+    /** Archives a branch whose pull request closed without merging; offered to admins only. */
+    onArchive?: (name: string) => void;
     onClose?: () => void;
     comments?: CommentThread[];
     currentUserId?: string;
@@ -114,4 +119,19 @@ export interface BranchManagerProps {
     /** Names the people in branch comments; without it they show as ids */
     onGetCommentUserMetadata?: (userId: string) => Promise<UserSearchResult | null>;
 }
+/**
+ * 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 declare const arrangeBranches: (branches: readonly BranchSummary[], currentBranchName: string | undefined, places: ReadonlyMap<string, number>) => {
+    live: BranchSummary[];
+    archived: BranchSummary[];
+};
+/**
+ * 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 declare const matchesBranchFilter: (branch: BranchSummary, query: string) => boolean;
 export declare const BranchManager: React.FC<BranchManagerProps>;

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(),