canopycms 0.12.1 → 0.13.0

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

@@ -1214,7 +1214,7 @@ var init_client_safe_strategy = __esm({
         return false;
       }
       syncsBranchesWithBase() {
-        return false;
+        return true;
       }
       getPermissionsFileName() {
         return "permissions.json";
@@ -1405,6 +1405,9 @@ var init_client_unsafe_strategy = __esm({
           autoDetectRemotePath: path9.join(this.getWorkspaceRoot(), "remote.git")
         };
       }
+      baseUpdateRunsInRequest() {
+        return false;
+      }
       requiresExistingRepo() {
         return false;
       }
@@ -1457,6 +1460,9 @@ var init_client_unsafe_strategy = __esm({
           envVarName: "CANOPYCMS_REMOTE_URL"
         };
       }
+      baseUpdateRunsInRequest() {
+        return true;
+      }
       requiresExistingRepo() {
         return false;
       }
@@ -8031,6 +8037,7 @@ var branchMetadataShape = {
   archivedAt: z7.string().optional(),
   rebaseFailure: z7.object({ message: z7.string(), firstAt: z7.string(), lastAt: z7.string() }).optional(),
   historyRewrittenFrom: z7.string().optional(),
+  historyRewrittenTo: z7.string().optional(),
   lastGitHubTip: z7.string().optional(),
   keptOverGitHub: z7.array(z7.string()).optional(),
   rewrittenOnGitHub: z7.string().optional(),
@@ -8045,13 +8052,16 @@ var branchMetadataShape = {
     z7.object({ kind: z7.literal("conflicts") }),
     z7.object({ kind: z7.literal("retargeted"), base: z7.string() })
   ]).optional().catch(void 0),
-  // Dropped when malformed: it only decorates the PR body, so it never fails a read.
+  // Dropped when malformed, never failing a read: it decorates the PR body, and without `commit`
+  // the worker judges a move against the clone's head before it (worker/github-commits.ts).
   review: z7.object({
     state: z7.enum(["approved", "changes-requested"]),
     by: z7.object({ userId: z7.string(), name: z7.string().optional() }),
-    at: z7.string()
+    at: z7.string(),
+    commit: z7.string().optional()
   }).optional().catch(void 0),
   baseUpdateRequestedAt: z7.string().optional().catch(void 0),
+  latestChangesWaiting: z7.string().optional().catch(void 0),
   // Dropped when malformed: it only ends the editor's wait, which then times out instead.
   lastBaseUpdate: z7.object({
     at: z7.string(),
@@ -10312,10 +10322,14 @@ var GitManager = class _GitManager {
     const status = await this.status();
     return status.files.map((f) => f.path);
   }
+  /** The remote's URL as configured; `git remote -v`'s listing would split a path with a space. */
   async getRemoteUrl() {
-    const remotes = await this.git.getRemotes(true);
-    const remote = remotes.find((r) => r.name === this.remote);
-    return remote?.refs.push || remote?.refs.fetch;
+    try {
+      const url = (await this.git.raw(["remote", "get-url", this.remote])).trim();
+      return url === "" ? void 0 : url;
+    } catch {
+      return void 0;
+    }
   }
   /**
    * Excludes `pattern` (e.g. `.canopy-meta/`) from this workspace's git, so it

package/dist/cli/github-app-manifest.d.ts

@@ -11,7 +11,7 @@ export type PermissionSet = Readonly<Record<string, PermissionLevel>>;
  * The App's entire security surface. Every entry names the call site that
  * forces it — a permission justified only in a commit message can't be
  * re-checked. Enumerated from `github-service.ts`,
- * `worker/{task-runner,rebase}.ts`, and every git call reaching github.com;
+ * `worker/{task-runner,rebase,conflicts-status}.ts`, and every git call reaching github.com;
  * `canopycms-cdk` makes no REST calls at all.
  * - `contents: write` — git over HTTPS (first-boot clone, per-cycle branch
  *   fetch, pushes) and `octokit.git.deleteRef`. GitHub's reference puts ref
@@ -21,6 +21,9 @@ export type PermissionSet = Readonly<Record<string, PermissionLevel>>;
  * - `pull_requests: write` — `pulls.create`/`pulls.update`, and the GraphQL
  *   mutations `markPullRequestReadyForReview`/`convertPullRequestToDraft`,
  *   derived by analogy since GitHub's reference has no line for them.
+ * - `statuses: write` — `repos.createCommitStatus`, in worker/github-gateway.ts
+ *   `setConflictsStatus`: the "CanopyCMS conflicts" status the git sync sets on
+ *   each pull request's head (worker/conflicts-status.ts).
  * - `metadata: read` — implied by any repository permission; declared so
  *   this object states the whole surface, not just the non-automatic part.
  * Nothing else: no `issues`, `administration`, `actions`, or organisation

package/dist/cli/github-app-manifest.js

@@ -9,7 +9,7 @@ const PERMISSION_LEVELS = ['read', 'write', 'admin'];
  * The App's entire security surface. Every entry names the call site that
  * forces it — a permission justified only in a commit message can't be
  * re-checked. Enumerated from `github-service.ts`,
- * `worker/{task-runner,rebase}.ts`, and every git call reaching github.com;
+ * `worker/{task-runner,rebase,conflicts-status}.ts`, and every git call reaching github.com;
  * `canopycms-cdk` makes no REST calls at all.
  * - `contents: write` — git over HTTPS (first-boot clone, per-cycle branch
  *   fetch, pushes) and `octokit.git.deleteRef`. GitHub's reference puts ref
@@ -19,6 +19,9 @@ const PERMISSION_LEVELS = ['read', 'write', 'admin'];
  * - `pull_requests: write` — `pulls.create`/`pulls.update`, and the GraphQL
  *   mutations `markPullRequestReadyForReview`/`convertPullRequestToDraft`,
  *   derived by analogy since GitHub's reference has no line for them.
+ * - `statuses: write` — `repos.createCommitStatus`, in worker/github-gateway.ts
+ *   `setConflictsStatus`: the "CanopyCMS conflicts" status the git sync sets on
+ *   each pull request's head (worker/conflicts-status.ts).
  * - `metadata: read` — implied by any repository permission; declared so
  *   this object states the whole surface, not just the non-automatic part.
  * Nothing else: no `issues`, `administration`, `actions`, or organisation
@@ -30,6 +33,7 @@ const PERMISSION_LEVELS = ['read', 'write', 'admin'];
 export const CANOPY_APP_PERMISSIONS = {
     contents: 'write',
     pull_requests: 'write',
+    statuses: 'write',
     metadata: 'read',
 };
 /**

package/dist/cli/init.js

@@ -1588,7 +1588,7 @@ var DevClientSafeStrategy = class {
     return false;
   }
   syncsBranchesWithBase() {
-    return false;
+    return true;
   }
   getPermissionsFileName() {
     return "permissions.json";
@@ -1777,6 +1777,9 @@ var ProdStrategy = class extends ProdClientSafeStrategy {
       autoDetectRemotePath: path.join(this.getWorkspaceRoot(), "remote.git")
     };
   }
+  baseUpdateRunsInRequest() {
+    return false;
+  }
   requiresExistingRepo() {
     return false;
   }
@@ -1829,6 +1832,9 @@ var DevStrategy = class extends DevClientSafeStrategy {
       envVarName: "CANOPYCMS_REMOTE_URL"
     };
   }
+  baseUpdateRunsInRequest() {
+    return true;
+  }
   requiresExistingRepo() {
     return false;
   }

package/dist/editor/Editor.js

@@ -197,6 +197,8 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
     const requestLatestRef = useRef(async () => { });
     const modifiedCountRef = useRef(0);
     const namesBranchRef = useRef(() => false);
+    // Set once the entries and the changes read exist.
+    const rereadPinnedBranchRef = useRef(async () => { });
     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,
@@ -206,6 +208,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
         getUnsaved: () => resolveUnsavedRef.current(),
         onStamped: (stamped) => applySubmitStampsRef.current(stamped),
         onChangesRequested: (branch) => reloadCommentsRef.current(branch),
+        onReviewPinned: (branch) => rereadPinnedBranchRef.current(branch),
         // Only the open branch, with nothing unsaved: its wait and answer show where the user is.
         latestChangesAfterWithdraw: (branch) => namesBranchRef.current(branch) && modifiedCountRef.current === 0
             ? () => requestLatestRef.current()
@@ -270,7 +273,8 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
     // Set once the branch actions below exist; they depend on the drafts, which depend on the entries.
     const switchBranchRef = useRef(async () => { });
     // Set once the changes read exists; it waits on the panel state, declared after the entries.
-    const reloadChangesRef = useRef(() => { });
+    const reloadChangesRef = useRef(async () => { });
+    const rereadChangesRef = useRef(async () => { });
     // 2. Entry manager (depends on branchNameState, owns selectedPath)
     const { selectedPath, setSelectedPath, closeEntry, entries: entriesState, collections: collectionsFromApi, currentEntry, availableSchemas, entriesInitializing, entriesLoadFailed, navigatorOpen, setNavigatorOpen, refreshEntries, refreshContent, handleCreateEntry, renameEntry, loadEntry, readEntryValue, saveEntry, getEntryVersion, adoptEntryVersion, followMovedEntry, recreateEntry, createModalOpen, createModalCollection, createModalError, createModalCreating, createModalExistingSlugs, handleCreateModalSubmit, closeCreateModal, } = useEntryManager({
         initialEntries: entries,
@@ -291,7 +295,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
         // A short name in the URL is no switch to another branch.
         sameBranch: namesBranch,
         urlBranchName,
-        onContentRefresh: (branch) => reloadChangesRef.current(branch),
+        onContentRefresh: (branch) => void reloadChangesRef.current(branch),
         conflictResolutions: {
             pending: conflictChoices.pending,
             onSaved: (branch, contentId, sent) => {
@@ -376,7 +380,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
         setPreviewError(null);
     }, [currentEntry?.contentId]);
     // 3. Draft manager (depends on branchNameState, selectedPath from useEntryManager)
-    const { drafts, setDrafts, loadedValues, setLoadedValues, loadedValue, effectiveValue, modifiedCount, editedFiles, handleSave, singleSaving, lastSaved, handleSaveAll, saveAllProgress, isSaveAllRunning, handleDiscardDrafts, handleDiscardFileDraft, handleReload, isSelectedDirty, isDirtyForEntry, resolveUnsaved, fieldErrors, draftStorageFailed, applySubmitStamps, } = useDraftManager({
+    const { drafts, setDrafts, loadedValues, setLoadedValues, forgetLoadedValues, readGeneration, loadedValue, effectiveValue, modifiedCount, editedFiles, handleSave, singleSaving, lastSaved, handleSaveAll, saveAllProgress, isSaveAllRunning, handleDiscardDrafts, handleDiscardFileDraft, handleReload, isSelectedDirty, isDirtyForEntry, resolveUnsaved, fieldErrors, draftStorageFailed, applySubmitStamps, } = useDraftManager({
         branchName: branchNameState,
         selectedPath,
         currentEntry,
@@ -420,6 +424,17 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
         onShowConflicts: () => showConflictsRef.current(),
     });
     requestLatestRef.current = baseUpdate.request;
+    // The open branch was pinned for its reviews: its entries, their changes and every clean entry
+    // are read again, every one while it is locked, which shows the saved copy over a draft.
+    rereadPinnedBranchRef.current = async (branch) => {
+        if (!namesBranch(branch, branchNameState))
+            return;
+        forgetLoadedValues((id) => !branchContentLocked && draftsRef.current[id] !== undefined);
+        await Promise.all([
+            refreshEntries(branchNameState, { withChanges: false }),
+            rereadChangesRef.current(),
+        ]);
+    };
     modifiedCountRef.current = modifiedCount;
     namesBranchRef.current = (branch) => namesBranch(branch, branchNameState);
     // The request in flight counts as waiting: a save landing before the worker reads the branch
@@ -792,6 +807,8 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
         // write still the state of the branch on screen?".
         const requestBranch = branchNameState;
         const inFlightKey = `${requestBranch}:${contentId ?? ''}`;
+        const generation = readGeneration.current;
+        const loadingKey = `${inFlightKey}#${generation}`;
         const load = async () => {
             if (!currentEntry || !contentId || loadedValues[contentId] !== undefined)
                 return;
@@ -801,13 +818,13 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
             // Guard against overlapping renders re-firing the same in-flight load
             // (e.g. `currentEntry` getting a new object reference from an entries
             // refresh while the fetch below is still pending).
-            if (loadingEntryIdsRef.current.has(inFlightKey))
+            if (loadingEntryIdsRef.current.has(loadingKey))
                 return;
-            loadingEntryIdsRef.current.add(inFlightKey);
+            loadingEntryIdsRef.current.add(loadingKey);
             setEntriesLoading(true);
             setLoadFailedKey((failed) => (failed === inFlightKey ? null : failed));
             try {
-                const loaded = await loadEntry(currentEntry);
+                const loaded = await loadEntry(currentEntry, () => readGeneration.current === generation);
                 // A branch switch during the await makes this response another
                 // branch's content. Writing it would (a) show it as the new branch's
                 // content and (b) satisfy the skip gate above, permanently suppressing
@@ -816,6 +833,8 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
                 // instead; the new branch has its own load running under its own key.
                 if (currentBranchRef.current !== requestBranch)
                     return;
+                if (readGeneration.current !== generation)
+                    return;
                 setLoadedValues((prev) => ({ ...prev, [contentId]: loaded }));
                 // No draft is seeded here. `effectiveValue` is
                 // `drafts[id] ?? loadedValues[id]`, so the form renders from the line
@@ -825,7 +844,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
                 // session as a dirty, stale full-content snapshot.
             }
             finally {
-                loadingEntryIdsRef.current.delete(inFlightKey);
+                loadingEntryIdsRef.current.delete(loadingKey);
                 // Clear the shared flag if this load's entry is still selected on the
                 // branch it was loaded for, OR if no other load remains in flight. The
                 // second arm matters when the user navigates from a slow-loading entry
@@ -834,7 +853,8 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
                 // this stale settle would leave `entriesLoading` (and therefore
                 // `busy`) stuck true with nothing left to clear it.
                 if ((currentBranchRef.current === requestBranch &&
-                    currentContentIdRef.current === contentId) ||
+                    currentContentIdRef.current === contentId &&
+                    readGeneration.current === generation) ||
                     loadingEntryIdsRef.current.size === 0) {
                     setEntriesLoading(false);
                 }
@@ -850,7 +870,9 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
             // Same staleness guard as above: don't tell the user an entry failed
             // to load when they've already navigated to a different one (or to a
             // different branch).
-            if (currentBranchRef.current === requestBranch && currentContentIdRef.current === contentId) {
+            if (currentBranchRef.current === requestBranch &&
+                currentContentIdRef.current === contentId &&
+                readGeneration.current === generation) {
                 notifications.show({ message: 'Failed to load entry', color: 'red' });
                 setLoadFailedKey(inFlightKey);
             }
@@ -1348,10 +1370,11 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
     const changesAvailable = !!currentBranch && currentBranch.isProtected === false;
     const changesRead = (contentPanelShown || !!currentEntry) && changesAvailable;
     const branchChanges = useBranchChangesData(apiClient, branchNameState, changesRead);
-    reloadChangesRef.current = (branch) => {
+    reloadChangesRef.current = async (branch) => {
         if (branch === branchNameState)
-            void branchChanges.reload();
+            await branchChanges.reload();
     };
+    rereadChangesRef.current = branchChanges.reread;
     // Submit, withdraw and a review move the branch's status, which no entries refresh follows.
     const changesStatusRef = useRef({ branch: branchNameState, status: currentBranch?.status });
     useEffect(() => {
@@ -1424,7 +1447,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
                 focusFieldTarget(target.element);
         });
     };
-    const resolveEntryConflict = async (logicalPath, id, mergeSha, choice) => {
+    const resolveEntryConflict = async (logicalPath, id, mergeSha, choice, entryGone) => {
         const branch = branchNameState;
         const failed = {
             tone: 'error',
@@ -1432,7 +1455,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
         };
         let answer;
         try {
-            answer = await apiClient.conflicts.resolveEntry({ branch, entryPath: logicalPath }, { id: id, mergeSha, choice });
+            answer = await apiClient.conflicts.resolveEntry({ branch, entryPath: logicalPath }, { id: id, mergeSha, choice, ...(entryGone && { entryGone }) });
         }
         catch (err) {
             if (!isUnanswered(err))
@@ -1513,7 +1536,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
         });
     };
     const changesResolveEntry = changesSubject && entryConflict.data
-        ? async (choice) => {
+        ? async (choice, { entryGone }) => {
             const { contentId: id, mergeSha, kind } = entryConflict.data ?? {};
             if (!id || !mergeSha)
                 return undefined;
@@ -1528,7 +1551,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
                 setChangesOpen(false);
                 return undefined;
             }
-            return resolveEntryConflict(changesSubject.logicalPath, id, mergeSha, choice);
+            return resolveEntryConflict(changesSubject.logicalPath, id, mergeSha, choice, entryGone);
         }
         : undefined;
     const confirmEntryChoice = (target) => {
@@ -2077,7 +2100,7 @@ const EditorContent = ({ entries, title, siteTitle = title, branchName = '', col
                     // fail-closed computation of "are writes blocked" in this component.
                     branchIsProtected: currentBranch?.isProtected ?? true, branchServerProtected: currentBranch?.isProtected, branchReadOnly: currentBranch?.readOnly, branchHold: currentBranch?.hold, openConflicts: openConflictCount, conflictRecordHeld: branchConflicts.data?.held
                         ? { ...(userIsAdmin && { onRelease: handleReleaseConflictsHold }) }
-                        : undefined, branchApproveBlocked: currentBranch?.approveBlocked, branchWriteBlocked: branchContentLocked, branchLoading: branchLoading, branchPending: branchPending, branchMissing: branchMissing, branchToggleRef: branchToggleRef, baseUpdate: baseUpdateControl, latestWait: latestWait, onBranchReloadData: () => {
+                        : undefined, branchApproveBlocked: currentBranch?.approveBlocked, branchWriteBlocked: branchContentLocked, branchLoading: branchLoading, branchPending: branchPending, branchMissing: branchMissing, branchToggleRef: branchToggleRef, baseUpdate: baseUpdateControl, latestWait: latestWait, latestChangesWaiting: baseUpdate.latestChangesWaiting, onBranchReloadData: () => {
                         void Promise.all([handleReloadBranchData(), refreshEntries(branchNameState)]).catch(console.error);
                     }, onBranchDiscardDrafts: () => handleDiscardDrafts(() => branchToggleRef.current), onBranchManagerOpen: openBranchManager, onNewBranch: () => openBranchManager({ create: true }), onSaveAll: runSaveAll, saveAllProgress: saveAllProgress, 
                     // On any entry: EntryHeader's `saving` is the open entry's alone.

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

@@ -0,0 +1,8 @@
+import type { ConflictsStatusFailure } from '../../types.js';
+/**
+ * The last git sync could not set the "CanopyCMS conflicts" status on some pull requests
+ * (worker/conflicts-status.ts).
+ */
+export declare function ConflictsStatusAlert({ failure }: {
+    failure: ConflictsStatusFailure;
+}): import("react/jsx-runtime").JSX.Element;

package/dist/editor/admin/ConflictsStatusAlert.js

@@ -0,0 +1,22 @@
+'use client';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { Alert, Code, Group, List, Stack, Text } from '@mantine/core';
+import { IconAlertTriangle } from '@tabler/icons-react';
+import { escapeForLog } from '../../utils/escape-text.js';
+import { RelativeTime } from '../components/RelativeTime.js';
+/** A long unbroken name wraps inside the alert rather than widening it. */
+const WRAP = { overflowWrap: 'anywhere' };
+const WHY = {
+    permission: (_jsxs(_Fragment, { children: [_jsx(Text, { size: "sm", children: "GitHub refused it: the worker's GitHub credential lacks the \"Commit statuses\" permission." }), _jsxs(List, { size: "sm", spacing: 2, children: [_jsxs(List.Item, { children: ["A GitHub App: its owner adds \"Commit statuses: read and write\" in the App's permissions on GitHub, then an owner of the account it is installed on accepts the request in the installation's settings.", ' ', _jsx(Code, { style: { whiteSpace: 'nowrap' }, children: "canopycms init-github-app verify" }), " confirms it."] }), _jsx(List.Item, { children: "A fine-grained token: give it \"Commit statuses: read and write\". A classic token's repo scope already has it." })] })] })),
+    unreachable: (_jsx(Text, { size: "sm", children: "GitHub couldn't be reached, or was busy. The next git sync tries again." })),
+    other: (_jsx(Text, { size: "sm", children: "GitHub refused it, or the branch's record of conflicts couldn't be read. The next git sync tries again; if it keeps failing, the worker log names each branch and why." })),
+};
+/**
+ * The last git sync could not set the "CanopyCMS conflicts" status on some pull requests
+ * (worker/conflicts-status.ts).
+ */
+export function ConflictsStatusAlert({ failure }) {
+    const unlisted = failure.count - failure.branches.length;
+    const pullRequests = `${failure.count} pull request${failure.count === 1 ? '' : 's'}`;
+    return (_jsx(Alert, { color: "orange", icon: _jsx(IconAlertTriangle, { size: 16 }), title: `Conflicts status not set on ${pullRequests}`, "data-testid": "conflicts-status-alert", children: _jsxs(Stack, { gap: 4, children: [_jsx(Text, { size: "sm", children: "The \"CanopyCMS conflicts\" check on the pull request of each branch below keeps its last result, or has none yet. Where it is a required check, merging waits on it. Saving, submitting and pull request updates are unaffected." }), WHY[failure.reason], _jsx(Group, { gap: 4, children: failure.branches.map((name) => (_jsx(Code, { style: WRAP, children: escapeForLog(name) }, name))) }), unlisted > 0 && _jsxs(Text, { size: "sm", children: ["And ", unlisted, " more."] }), _jsxs(Text, { size: "xs", c: "dimmed", style: WRAP, children: ["The last error: \u201C", escapeForLog(failure.message), "\u201D"] }), _jsx(RelativeTime, { iso: failure.at, prefix: "Last tried ", size: "xs", c: "dimmed" })] }) }));
+}

package/dist/editor/admin/SystemHealthPanel.js

@@ -21,6 +21,7 @@ import { ageDeletionHold, archivedBefore, archivedCutoff, deletableByAge, } from
 import { escapeForLog } from '../../utils/escape-text.js';
 import { TooltipDetail } from '../components/TooltipDetail.js';
 import { DISMISS_UNPUBLISHED_ATTRIBUTE, UnpublishedAtMergeAlert } from './UnpublishedAtMergeAlert.js';
+import { ConflictsStatusAlert } from './ConflictsStatusAlert.js';
 import { HOLD_BADGE, branchHoldMessage, branchStatusPresentation, endSentence, } from '../branch-status.js';
 // ============================================================================
 // Small pure helpers
@@ -132,7 +133,7 @@ function BaseHoldAlert({ hold }) {
  * and never listed. Names come from GitHub and are attacker-chosen, so each is shown escaped.
  */
 function DivergedBranchesAlert({ names }) {
-    return (_jsx(Alert, { color: "orange", icon: _jsx(IconAlertTriangle, { size: 16 }), title: `${plural(names.length, 'branch')} diverged from GitHub`, "data-testid": "diverged-branches-alert", children: _jsxs(Stack, { gap: 4, children: [_jsx(Text, { size: "sm", children: "This deployment's copy of each branch below holds editor work that conflicts with the branch on GitHub, usually because the GitHub branch was rebased or force-pushed, or because another CanopyCMS deployment sharing this repository uses the same branch name. Neither copy has been changed, and publishing the branch fails until they agree. A branch that only gained commits on GitHub clears on its own at the next sync." }), _jsx(Text, { size: "sm", children: "A developer decides which version to keep. To keep GitHub's, first push it to a new branch name on GitHub, because \"Delete branch\" in the editor also deletes a published branch on GitHub; then delete this branch in the editor (withdraw it from review first if it is in review). The editor's changes cannot be copied to another branch: to keep them, leave this branch as it is, or re-enter them by hand in a new branch. For the base branch or a settings branch, ask a developer to check what changed on GitHub." }), _jsx(Group, { gap: 4, children: names.map((name) => (_jsx(Code, { children: escapeForLog(name) }, name))) })] }) }));
+    return (_jsx(Alert, { color: "orange", icon: _jsx(IconAlertTriangle, { size: 16 }), title: `${plural(names.length, 'branch')} diverged from GitHub`, "data-testid": "diverged-branches-alert", children: _jsxs(Stack, { gap: 4, children: [_jsx(Text, { size: "sm", children: "This deployment's copy of each branch below holds editor work that conflicts with the branch on GitHub, usually because the GitHub branch was rebased or force-pushed, or because another CanopyCMS deployment sharing this repository uses the same branch name. Neither copy has been changed, and publishing the branch fails until they agree. A branch that only gained commits on GitHub clears on its own at the next sync." }), _jsx(Text, { size: "sm", children: "A developer decides which version to keep. To keep GitHub's, first push it to a new branch name on GitHub, because \"Delete branch\" in the editor also deletes a published branch on GitHub; then delete this branch in the editor (withdraw it from review first if it is in review). The editor's changes cannot be copied to another branch: to keep them, leave this branch as it is, or re-enter them by hand in a new branch. For the base branch or a settings branch, ask a developer to check what changed on GitHub." }), _jsx(Group, { gap: 4, children: names.map((name) => (_jsx(Code, { style: { overflowWrap: 'anywhere' }, children: escapeForLog(name) }, name))) })] }) }));
 }
 /**
  * The branch namespace the CMS creates branches in, against the one the GitHub gateway writes. A
@@ -150,7 +151,7 @@ function BranchNamespaceAlert({ own, gateway, }) {
 }
 /** Branch refs from metadata the CMS Lambda can write, so each is shown escaped. */
 function BranchRefs({ branches }) {
-    return (_jsx(Group, { gap: 4, children: branches.map((branch, i) => (_jsx(Code, { children: escapeForLog(branch.name) }, i))) }));
+    return (_jsx(Group, { gap: 4, children: branches.map((branch, i) => (_jsx(Code, { style: { overflowWrap: 'anywhere' }, children: escapeForLog(branch.name) }, i))) }));
 }
 /**
  * Editor branches the GitHub gateway will not publish, by ref, which is what a developer lists
@@ -307,7 +308,7 @@ function OverviewTab({ health, overviewTabRef, }) {
         workerVersion !== build.canopycmsVersion;
     return (_jsxs(Stack, { ref: overviewRef, gap: "md", children: [error && (_jsx(Alert, { color: "red", icon: _jsx(IconAlertCircle, { size: 16 }), variant: "light", children: error })), _jsxs(Group, { gap: "sm", children: [_jsx(Badge, { color: liveness.color, variant: "light", size: "lg", children: liveness.label }), status.mode === 'dev' && (_jsx(Text, { size: "xs", c: "dimmed", children: "No worker runs in dev mode" }))] }), isRecentFatalError && lastFatalError && (_jsxs(Alert, { color: "red", icon: _jsx(IconAlertCircle, { size: 16 }), title: lastFatalError.phase === 'startup'
                     ? 'The worker failed to start'
-                    : 'The worker stopped while running', children: [_jsx(Text, { size: "sm", children: lastFatalError.message }), _jsxs(Text, { size: "xs", c: "dimmed", mt: 4, children: ["at ", lastFatalError.at] })] })), status.settingsWorkspaceError && (_jsx(Alert, { color: "red", icon: _jsx(IconAlertCircle, { size: 16 }), title: "Settings workspace unavailable: groups and path rules are not loading", children: _jsx(Text, { size: "sm", children: status.settingsWorkspaceError }) })), status.schemaIssues && status.schemaIssues.length > 0 && (_jsx(Alert, { color: "yellow", icon: _jsx(IconAlertTriangle, { size: 16 }), title: "Content types this editor version doesn't know", "data-testid": "schema-issues-alert", children: _jsx(Stack, { gap: 4, children: status.schemaIssues.map((issue) => (_jsx(Text, { size: "sm", children: issue.kind === 'unknown-schema' ? (_jsxs(_Fragment, { children: [_jsx(Code, { children: issue.metaFile }), " names ", _jsx(Code, { children: issue.schemaRef }), ", so entry type ", _jsx(Code, { children: issue.entryType }), " is unavailable"] })) : (issue.message) }, `${issue.kind}:${issue.message}`))) }) })), _jsx(BranchNamespaceAlert, { own: status.branchNamespace, gateway: status.workerStatus?.gatewayBranchNamespace }), status.workerStatus?.baseHold && _jsx(BaseHoldAlert, { hold: status.workerStatus.baseHold }), unpublished.length > 0 && (_jsx(UnpublishedAtMergeAlert, { branches: unpublished, onDismiss: handleDismissUnpublished })), status.statusReadError && (_jsxs(Text, { size: "xs", c: "orange", children: ["Warning: could not read worker status (", status.statusReadError, ")"] })), lastGitSync?.tracked && lastGitSync.tracked.diverged.length > 0 && (_jsx(DivergedBranchesAlert, { names: lastGitSync.tracked.diverged })), status.workerStatus?.unpublishableBranches && (_jsx(UnpublishableBranchesAlert, { report: status.workerStatus.unpublishableBranches, namespace: status.workerStatus.gatewayBranchNamespace })), status.workerStatus?.lastGitSyncError && (_jsxs(Alert, { color: "orange", icon: _jsx(IconAlertCircle, { size: 16 }), title: "Last git sync failed", children: [_jsx(Text, { size: "sm", children: status.workerStatus.lastGitSyncError.message }), _jsxs(Text, { size: "xs", c: "dimmed", mt: 4, children: ["at ", status.workerStatus.lastGitSyncError.at] })] })), versionSkew && (_jsx(Alert, { color: "orange", icon: _jsx(IconAlertCircle, { size: 16 }), title: "API and worker versions differ", "data-testid": "version-skew-warning", children: _jsxs(Text, { size: "sm", children: ["The API runs canopycms ", build.canopycmsVersion, " but the worker runs canopycms", ' ', workerVersion, ". They were deployed from different builds."] }) })), _jsxs(Paper, { withBorder: true, p: "sm", children: [_jsx(Text, { size: "sm", fw: 600, children: "Build" }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-api-version", children: ["API: canopycms ", build.canopycmsVersion] }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-source-revision", children: ["Source revision:", ' ', build.sourceRevision ? (_jsx(Tooltip, { label: build.sourceRevision, children: _jsx(Code, { children: build.sourceRevision.slice(0, 12) }) })) : ('not set (pass the CANOPY_SOURCE_SHA build arg to the image build)')] }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-worker-version", children: ["Worker version: ", workerVersion ? `canopycms ${workerVersion}` : 'unknown'] }), lastShutdown && (_jsxs(Text, { size: "xs", c: lastShutdown.outcome === 'drained' ? 'dimmed' : 'orange', "data-testid": "build-last-shutdown", children: ["Last worker shutdown: ", lastShutdown.reason, " at ", lastShutdown.at, lastShutdown.outcome === 'deadline' &&
+                    : 'The worker stopped while running', children: [_jsx(Text, { size: "sm", children: lastFatalError.message }), _jsxs(Text, { size: "xs", c: "dimmed", mt: 4, children: ["at ", lastFatalError.at] })] })), status.settingsWorkspaceError && (_jsx(Alert, { color: "red", icon: _jsx(IconAlertCircle, { size: 16 }), title: "Settings workspace unavailable: groups and path rules are not loading", children: _jsx(Text, { size: "sm", children: status.settingsWorkspaceError }) })), status.schemaIssues && status.schemaIssues.length > 0 && (_jsx(Alert, { color: "yellow", icon: _jsx(IconAlertTriangle, { size: 16 }), title: "Content types this editor version doesn't know", "data-testid": "schema-issues-alert", children: _jsx(Stack, { gap: 4, children: status.schemaIssues.map((issue) => (_jsx(Text, { size: "sm", children: issue.kind === 'unknown-schema' ? (_jsxs(_Fragment, { children: [_jsx(Code, { children: issue.metaFile }), " names ", _jsx(Code, { children: issue.schemaRef }), ", so entry type ", _jsx(Code, { children: issue.entryType }), " is unavailable"] })) : (issue.message) }, `${issue.kind}:${issue.message}`))) }) })), _jsx(BranchNamespaceAlert, { own: status.branchNamespace, gateway: status.workerStatus?.gatewayBranchNamespace }), status.workerStatus?.baseHold && _jsx(BaseHoldAlert, { hold: status.workerStatus.baseHold }), unpublished.length > 0 && (_jsx(UnpublishedAtMergeAlert, { branches: unpublished, onDismiss: handleDismissUnpublished })), status.statusReadError && (_jsxs(Text, { size: "xs", c: "orange", children: ["Warning: could not read worker status (", status.statusReadError, ")"] })), lastGitSync?.tracked && lastGitSync.tracked.diverged.length > 0 && (_jsx(DivergedBranchesAlert, { names: lastGitSync.tracked.diverged })), status.workerStatus?.unpublishableBranches && (_jsx(UnpublishableBranchesAlert, { report: status.workerStatus.unpublishableBranches, namespace: status.workerStatus.gatewayBranchNamespace })), status.workerStatus?.conflictsStatusFailure && (_jsx(ConflictsStatusAlert, { failure: status.workerStatus.conflictsStatusFailure })), status.workerStatus?.lastGitSyncError && (_jsxs(Alert, { color: "orange", icon: _jsx(IconAlertCircle, { size: 16 }), title: "Last git sync failed", children: [_jsx(Text, { size: "sm", children: status.workerStatus.lastGitSyncError.message }), _jsxs(Text, { size: "xs", c: "dimmed", mt: 4, children: ["at ", status.workerStatus.lastGitSyncError.at] })] })), versionSkew && (_jsx(Alert, { color: "orange", icon: _jsx(IconAlertCircle, { size: 16 }), title: "API and worker versions differ", "data-testid": "version-skew-warning", children: _jsxs(Text, { size: "sm", children: ["The API runs canopycms ", build.canopycmsVersion, " but the worker runs canopycms", ' ', workerVersion, ". They were deployed from different builds."] }) })), _jsxs(Paper, { withBorder: true, p: "sm", children: [_jsx(Text, { size: "sm", fw: 600, children: "Build" }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-api-version", children: ["API: canopycms ", build.canopycmsVersion] }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-source-revision", children: ["Source revision:", ' ', build.sourceRevision ? (_jsx(Tooltip, { label: build.sourceRevision, children: _jsx(Code, { children: build.sourceRevision.slice(0, 12) }) })) : ('not set (pass the CANOPY_SOURCE_SHA build arg to the image build)')] }), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-worker-version", children: ["Worker version: ", workerVersion ? `canopycms ${workerVersion}` : 'unknown'] }), lastShutdown && (_jsxs(Text, { size: "xs", c: lastShutdown.outcome === 'drained' ? 'dimmed' : 'orange', "data-testid": "build-last-shutdown", children: ["Last worker shutdown: ", lastShutdown.reason, " at ", lastShutdown.at, lastShutdown.outcome === 'deadline' &&
                                 ` · drain deadline hit, aborted ${lastShutdown.abandoned?.join(', ') ?? 'in-flight work'}`, lastShutdown.outcome === 'drained' &&
                                 lastShutdown.drainMs !== undefined &&
                                 ` · drained in ${(lastShutdown.drainMs / 1000).toFixed(1)}s`, lastShutdown.outcome === 'not-drained' && ' (a crash or a forced stop)'] })), lastFatalError?.phase === 'startup' && (_jsxs(Text, { size: "xs", c: "orange", "data-testid": "build-failed-start", children: ["Last start failed at ", lastFatalError.at] })), _jsxs(Text, { size: "xs", c: "dimmed", "data-testid": "build-media", children: ["Media storage:", ' ', status.assetStore.configured ? 'configured' : 'not configured — uploads are disabled'] }), _jsxs(Text, { size: "xs", c: status.imageProcessing.available ? 'dimmed' : 'orange', "data-testid": "build-image-processing", children: ["Image processing:", ' ', status.imageProcessing.available

package/dist/editor/base-update-wait.d.ts

@@ -38,6 +38,10 @@ export declare const GET_LATEST_CHANGES_TOOLTIP = "Bring in changes made on the
 /** The Tooltip; an admin also learns which branch the changes come from. */
 export declare function getLatestChangesTooltip(baseBranch: string | undefined, isAdmin: boolean): string;
 export declare const GETTING_LATEST_CHANGES = "Getting latest changes\u2026";
+/** The bar's badge while the automatic sync leaves the base out for the branch's saved work. */
+export declare const LATEST_CHANGES_WAITING = "Latest changes waiting";
+/** The badge's detail: below `md` the action is in the branch menu, and unsaved changes hold it. */
+export declare function latestChangesWaitingDetail(inMenu: boolean, saveFirst: boolean): string;
 export declare const SAVE_FIRST_REASON = "Save your changes first.";
 export declare const WAITING_NOTICE = "Getting the latest changes. You can edit again when it finishes.";
 export declare const SLOW_NOTICE = "This is taking longer than usual. You can keep editing; the latest changes will come in when the server gets to them.";

package/dist/editor/base-update-wait.js

@@ -50,6 +50,13 @@ export function getLatestChangesTooltip(baseBranch, isAdmin) {
         : GET_LATEST_CHANGES_TOOLTIP;
 }
 export const GETTING_LATEST_CHANGES = 'Getting latest changes…';
+/** The bar's badge while the automatic sync leaves the base out for the branch's saved work. */
+export const LATEST_CHANGES_WAITING = 'Latest changes waiting';
+/** The badge's detail: below `md` the action is in the branch menu, and unsaved changes hold it. */
+export function latestChangesWaitingDetail(inMenu, saveFirst) {
+    const control = `"Get latest changes"${inMenu ? ' in the branch menu' : ''}`;
+    return `Newer changes made on the site are waiting for this branch. ${saveFirst ? `Save your changes, then choose ${control}` : `Choose ${control}`} to bring them in.`;
+}
 export const SAVE_FIRST_REASON = 'Save your changes first.';
 export const WAITING_NOTICE = 'Getting the latest changes. You can edit again when it finishes.';
 export const SLOW_NOTICE = 'This is taking longer than usual. You can keep editing; the latest changes will come in when the server gets to them.';

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

@@ -56,6 +56,8 @@ export declare const LATEST_UNPLACEABLE_REASON = "The latest version of this can
  * @internal Exported for tests.
  */
 export declare function conflictHeading(card: ConflictCard): string;
+/** @internal Exported for tests: how long a settled entry card waits for the reload to take it. */
+export declare const SETTLED_HOLD_MS = 10000;
 /**
  * Why an entry-level choice didn't act: `warning` where nothing is lost or the outcome is unknown,
  * `error` for a failure a retry may pass.
@@ -64,6 +66,14 @@ export interface EntryChoiceRefusal {
     message: string;
     tone: 'warning' | 'error';
 }
+/** An entry-level choice settled in place: what to say, and whether the entry stays deleted. */
+export interface EntryChoiceDone {
+    message: string;
+    entryGone: boolean;
+}
+type ResolveEntryChoice = (choice: EntryConflictChoice, options: {
+    entryGone?: true;
+}) => Promise<EntryChoiceRefusal | undefined>;
 /** The open entry's form, which field choices change. */
 interface ConflictsForm {
     value: FormValue;
@@ -85,7 +95,9 @@ export interface ConflictsGroupProps {
     /** Closes the drawer and focuses the field in the form. */
     onEdit?: (field: FieldConflict) => void;
     /** Settles an entry-level conflict; resolves with why it couldn't, when it couldn't. */
-    onResolveEntry?: (choice: EntryConflictChoice) => Promise<EntryChoiceRefusal | undefined>;
+    onResolveEntry?: ResolveEntryChoice;
+    /** An entry-level choice settled in place, its card about to go. */
+    onEntryDone?: (done: EntryChoiceDone) => void;
     /** Why this user can't change the entry: the choices are hidden. */
     noEditReason?: string;
     /** Why the choices can't act now: they stay, disabled, saying so. */