tinacms 3.12.0 → 3.13.0

package/dist/index.js

@@ -20,8 +20,7 @@ import { SlashInputPlugin, SlashPlugin } from "@udecode/plate-slash-command/reac
 import { TablePlugin, TableRowPlugin, useTableCellElement, TableProvider, useTableElement, useTableMergeState, useTableBordersDropdownMenuContentState, TableCellPlugin, TableCellHeaderPlugin } from "@udecode/plate-table/react";
 import { PlateElement, useReadOnly, useElement, PlateLeaf, useSelected, useFocused, useEditorRef, withRef as withRef$1, useComposedRef, useEditorPlugin, useElementSelector, withHOC, usePluginOption, useRemoveNodeButton, useEditorSelector, ParagraphPlugin, createPlatePlugin, PlateContent, PlateContainer, useEditorState, useMarkToolbarButtonState, useMarkToolbarButton, usePlateEditor, useFormInputProps, useEditorSelection, useEditorReadOnly, useOnClickOutside, useEventEditorValue, Plate } from "@udecode/plate/react";
 import { isLangSupported, formatCodeBlock, insertEmptyCodeBlock, isCodeBlockEmpty, unwrapCodeBlock, isSelectionAtCodeBlockStart } from "@udecode/plate-code-block";
-import { X, Search, ChevronDown, Check, AlertTriangle, BracesIcon, Heading6 as Heading6$1, Heading5 as Heading5$1, Heading4 as Heading4$1, Heading3 as Heading3$1, Heading2 as Heading2$1, Heading1 as Heading1$1, ChevronRight, Twitter, SunMedium, Moon, SeparatorHorizontal, Eye, Link2Off, Underline, Trash, Text, Table as Table$1, Superscript, Subscript, Strikethrough, Highlighter, Settings, RectangleHorizontal, RotateCcw, Pilcrow, Outdent, MoreHorizontal, Minus, WrapText, Keyboard, Indent, ExternalLink, Smile, Edit2, GripVertical, MessageSquarePlus, MessageSquare, Ungroup, Combine, RectangleVertical, Baseline, FileCode, PaintBucket, ChevronsUpDown, Quote, AlignRight as AlignRight$1, AlignLeft as AlignLeft$1, AlignJustify, AlignCenter as AlignCenter$1, Plus, PaintBucketIcon, CombineIcon, SquareSplitHorizontalIcon, Grid2X2Icon, Trash2Icon, ArrowUp, ArrowDown, XIcon, ArrowLeft, ArrowRight, EraserIcon, Info, CircleAlert, CircleCheck as CircleCheck$1, ChevronDownIcon as ChevronDownIcon$1, File as File$1, ChevronUp, Edit, Pencil, Clock, CalendarCheck, Calendar as Calendar$1, CalendarDays, RotateCw, ChevronLeft, WifiOff, TriangleAlert, RefreshCw, GitBranch, CircleHelp, Loader2, Lock, ArrowUpDown, GitFork, Globe, Copy, Folder as Folder$1, Clapperboard, LayoutGrid, List as List$1, CloudUpload, ArrowDownToLine, TextCursorInput, Images, AlertCircle, Image, Database, CheckCircle2, ImageOff, KeyRound, Cloud, LoaderCircle, ScrollText, RefreshCwOff, OctagonAlert, Menu, FilePlus, LogOut, FileStack, FolderOpen, History, Users, PanelLeft, Files, User, FileText, GitBranchIcon, Circle as Circle$1, ListOrdered, Grid3x3Icon, CircleX, Link, Unlink, SquarePen, Trash2, House, Unlock } from "lucide-react";
-import mermaid from "mermaid";
+import { X, Search, ChevronDown, Check, AlertTriangle, BracesIcon, Heading6 as Heading6$1, Heading5 as Heading5$1, Heading4 as Heading4$1, Heading3 as Heading3$1, Heading2 as Heading2$1, Heading1 as Heading1$1, ChevronRight, Twitter, SunMedium, Moon, SeparatorHorizontal, Eye, Link2Off, Underline, Trash, Text, Table as Table$1, Superscript, Subscript, Strikethrough, Highlighter, Settings, RectangleHorizontal, RotateCcw, Pilcrow, Outdent, MoreHorizontal, Minus, WrapText, Keyboard, Indent, ExternalLink, Smile, Edit2, GripVertical, MessageSquarePlus, MessageSquare, Ungroup, Combine, RectangleVertical, Baseline, FileCode, PaintBucket, ChevronsUpDown, Quote, AlignRight as AlignRight$1, AlignLeft as AlignLeft$1, AlignJustify, AlignCenter as AlignCenter$1, Plus, PaintBucketIcon, CombineIcon, SquareSplitHorizontalIcon, Grid2X2Icon, Trash2Icon, ArrowUp, ArrowDown, XIcon, ArrowLeft, ArrowRight, EraserIcon, Info, CircleAlert, CircleCheck as CircleCheck$1, CircleIcon, ChevronDownIcon as ChevronDownIcon$1, File as File$1, ChevronUp, Edit, Pencil, Clock, CalendarCheck, Calendar as Calendar$1, CalendarDays, RotateCw, ChevronLeft, WifiOff, TriangleAlert, RefreshCw, GitBranch, CircleHelp, Loader2, Lock, ArrowUpDown, GitFork, Globe, Copy, Folder as Folder$1, Clapperboard, LayoutGrid, List as List$1, CloudUpload, ArrowDownToLine, TextCursorInput, Images, AlertCircle, Image, Database, CheckCircle2, ImageOff, KeyRound, Cloud, LoaderCircle, ScrollText, RefreshCwOff, OctagonAlert, Menu, FilePlus, LogOut, FileStack, FolderOpen, History, Users, PanelLeft, Files, User, FileText, GitBranchIcon, Circle as Circle$1, ListOrdered, Grid3x3Icon, CircleX, Link, Unlink, SquarePen, Trash2, House, Unlock } from "lucide-react";
 import { Slot } from "@radix-ui/react-slot";
 import { cva } from "class-variance-authority";
 import { Command as Command$2 } from "cmdk";
@@ -33,7 +32,7 @@ import { useHTMLInputCursorState, useComboboxInput } from "@udecode/plate-combob
 import { useComboboxContext, Combobox as Combobox$1, useComboboxStore, ComboboxProvider, Portal, ComboboxPopover, ComboboxItem } from "@ariakit/react";
 import { filterWords } from "@udecode/plate-combobox";
 import { toggleList, unwrapList, getListItemEntry } from "@udecode/plate-list";
-import { normalizeHeadingLevels, ALL_HEADING_LEVELS, ASYNC_POLLER_ERROR, canonicalPath, ERR_BRANCH_EXISTS, ERR_BRANCH_CONFLICT, isHeadingLevel, TinaSchema, addNamespaceToSchema, parseURL, ERR_HAS_REFERENCES, ERR_ALREADY_EXISTS, isValidRelativePath, RELATIVE_PATH_ALLOWED_CHARS_MESSAGE, resolveForm, RELATIVE_PATH_REGEX, normalizePath, ERR_NOT_INDEXED, validateSchema } from "@tinacms/schema-tools";
+import { normalizeHeadingLevels, ALL_HEADING_LEVELS, MEDIA_MIME_TYPES, extensionOf, resolveMediaAccept, ASYNC_POLLER_ERROR, MEDIA_CATEGORIES, canonicalPath, ERR_BRANCH_EXISTS, ERR_BRANCH_CONFLICT, isHeadingLevel, TinaSchema, addNamespaceToSchema, parseURL, ERR_HAS_REFERENCES, ERR_ALREADY_EXISTS, isValidRelativePath, RELATIVE_PATH_ALLOWED_CHARS_MESSAGE, resolveForm, RELATIVE_PATH_REGEX, normalizePath, ERR_NOT_INDEXED, validateSchema } from "@tinacms/schema-tools";
 import { NAMER, resolveField } from "@tinacms/schema-tools";
 import { useBlockSelected, BlockSelectionPlugin } from "@udecode/plate-selection/react";
 import "@udecode/plate-dnd";
@@ -52,8 +51,9 @@ import PropTypes from "prop-types";
 import { useSensors, useSensor, PointerSensor, KeyboardSensor, DndContext, closestCenter } from "@dnd-kit/core";
 import { sortableKeyboardCoordinates, SortableContext, verticalListSortingStrategy, useSortable, defaultAnimateLayoutChanges } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
-import { format as format$3, formatDistanceToNow } from "date-fns";
-import { useReactTable, getSortedRowModel, getCoreRowModel, flexRender, getExpandedRowModel, getFilteredRowModel } from "@tanstack/react-table";
+import { buildSchema, print, getIntrospectionQuery, buildClientSchema, parse as parse$3 } from "graphql";
+import { diff as diff$1 } from "@graphql-inspector/core";
+import { processDocumentForIndexing, queryToSearchIndexQuery, optionsToSearchIndexOptions, parseSearchIndexResponse } from "@tinacms/search/index-client";
 import { HexColorPicker } from "react-colorful";
 import { Command as Command$3 } from "@udecode/cmdk";
 import { isHotkey } from "is-hotkey";
@@ -62,19 +62,18 @@ import { ExitBreakPlugin, SoftBreakPlugin } from "@udecode/plate-break/react";
 import { ResetNodePlugin } from "@udecode/plate-reset-node/react";
 import { TrailingBlockPlugin } from "@udecode/plate-trailing-block";
 import { BaseBlockquotePlugin } from "@udecode/plate-block-quote";
+import { autoformatSmartQuotes, autoformatPunctuation, autoformatLegal, autoformatArrow, autoformatMath } from "@udecode/plate-autoformat";
 import { HeadingPlugin } from "@udecode/plate-heading/react";
 import { IndentListPlugin } from "@udecode/plate-indent-list/react";
 import { NodeIdPlugin } from "@udecode/plate-node-id";
 import { offset, flip, shift, limitShift, useVirtualFloating, getSelectionBoundingClientRect } from "@udecode/plate-floating";
 import { getLinkAttributes } from "@udecode/plate-link";
-import { autoformatSmartQuotes, autoformatPunctuation, autoformatLegal, autoformatArrow, autoformatMath } from "@udecode/plate-autoformat";
 import * as yup from "yup";
+import { format as format$3, formatDistanceToNow } from "date-fns";
 import { enUS } from "date-fns/locale";
 import { DayPicker } from "react-day-picker";
 import * as SelectPrimitive from "@radix-ui/react-select";
-import { buildSchema, print, getIntrospectionQuery, buildClientSchema, parse as parse$3 } from "graphql";
-import { diff as diff$1 } from "@graphql-inspector/core";
-import { processDocumentForIndexing, queryToSearchIndexQuery, optionsToSearchIndexOptions, parseSearchIndexResponse } from "@tinacms/search/index-client";
+import { useReactTable, getSortedRowModel, getCoreRowModel, flexRender, getExpandedRowModel, getFilteredRowModel } from "@tanstack/react-table";
 import * as dropzone from "react-dropzone";
 import gql from "graphql-tag";
 import { useLocation, NavLink, useNavigate, useParams, Navigate, Link as Link$1, HashRouter, Routes, Route } from "react-router-dom";
@@ -1396,20 +1395,6 @@ function CodeBlockCombobox({
     )))))
   ));
 }
-const MermaidElementWithRef = ({ config }) => {
-  const mermaidRef = useRef(null);
-  useEffect(() => {
-    if (mermaidRef.current) {
-      const renderMermaid = async () => {
-        await mermaid.run({
-          nodes: [mermaidRef.current.querySelector(".mermaid")]
-        });
-      };
-      renderMermaid();
-    }
-  }, [config]);
-  return /* @__PURE__ */ React__default.createElement("div", { contentEditable: false, className: "border-border border-b pt-10" }, /* @__PURE__ */ React__default.createElement("div", { ref: mermaidRef }, /* @__PURE__ */ React__default.createElement("pre", { className: "mermaid not-tina-prose" }, config)));
-};
 function ErrorMessage$1({ error }) {
   if (!error) return null;
   return /* @__PURE__ */ React__default.createElement(
@@ -1423,6 +1408,52 @@ function ErrorMessage$1({ error }) {
     /* @__PURE__ */ React__default.createElement("div", { className: "ml-3 flex-1" }, /* @__PURE__ */ React__default.createElement("pre", { className: "m-0 font-mono text-sm text-red-700 whitespace-pre-wrap break-words" }, error))
   );
 }
+const RENDERER_FAILED = "The diagram renderer did not load.";
+const MermaidElementWithRef = ({ config }) => {
+  const mermaidRef = useRef(null);
+  const [status, setStatus] = useState("loading");
+  const [error, setError] = useState(null);
+  useEffect(() => {
+    let isCancelled = false;
+    setStatus("loading");
+    const render = async () => {
+      var _a;
+      try {
+        const node = (_a = mermaidRef.current) == null ? void 0 : _a.querySelector(".mermaid");
+        if (!node) throw new Error(RENDERER_FAILED);
+        const { default: mermaid } = await import("mermaid");
+        await mermaid.run({ nodes: [node] });
+        if (!isCancelled) {
+          setError(null);
+          setStatus("ready");
+        }
+      } catch (cause) {
+        if (isCancelled) {
+          return;
+        }
+        if (cause instanceof Error) {
+          setError(cause.message || RENDERER_FAILED);
+        } else {
+          setError(RENDERER_FAILED);
+        }
+        setStatus("failed");
+      }
+    };
+    render();
+    return () => {
+      isCancelled = true;
+    };
+  }, [config]);
+  return /* @__PURE__ */ React__default.createElement("div", { contentEditable: false, className: "border-border border-b pt-10" }, /* @__PURE__ */ React__default.createElement("div", { className: "relative" }, /* @__PURE__ */ React__default.createElement(
+    "div",
+    {
+      ref: mermaidRef,
+      className: status === "loading" ? "opacity-0" : void 0
+    },
+    /* @__PURE__ */ React__default.createElement("pre", { className: "mermaid not-tina-prose" }, config)
+  ), status === "loading" && /* @__PURE__ */ React__default.createElement("div", { className: "absolute inset-0 flex items-center justify-center text-sm text-muted-foreground" }, "Loading diagram…")), status === "failed" && /* @__PURE__ */ React__default.createElement(ErrorMessage$1, { error }));
+};
+const PARSE_FAILED = "An error occurred while parsing the diagram.";
 function codeLineToString(content) {
   return (content.children || []).map(
     (line) => (line.children || []).map((textNode) => textNode.text).join("")
@@ -1440,17 +1471,21 @@ const CodeBlockElement = withRef(
       let isCancelled = false;
       const validateMermaid = async () => {
         try {
+          const { default: mermaid } = await import("mermaid");
           await mermaid.parse(
             codeLineToString(element)
           );
           if (!isCancelled) {
             setCodeBlockError(null);
           }
-        } catch (err) {
-          if (!isCancelled) {
-            setCodeBlockError(
-              String(err.message) || "An error occurred while parsing the diagram."
-            );
+        } catch (cause) {
+          if (isCancelled) {
+            return;
+          }
+          if (cause instanceof Error) {
+            setCodeBlockError(cause.message || PARSE_FAILED);
+          } else {
+            setCodeBlockError(PARSE_FAILED);
           }
         }
       };
@@ -2759,7 +2794,7 @@ const DropdownMenuTrigger$1 = DropdownMenuPrimitive.Trigger;
 const DropdownMenuGroup = DropdownMenuPrimitive.Group;
 const DropdownMenuPortal = DropdownMenuPrimitive.Portal;
 const DropdownMenuSub = DropdownMenuPrimitive.Sub;
-const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;
+const DropdownMenuRadioGroup$1 = DropdownMenuPrimitive.RadioGroup;
 const DropdownMenuSubTrigger = withRef(({ children, className, inset, ...props }, ref) => /* @__PURE__ */ React__default.createElement(
   DropdownMenuPrimitive.SubTrigger,
   {
@@ -2818,7 +2853,7 @@ const DropdownMenuCheckboxItem = withRef(({ children, className, ...props }, ref
   /* @__PURE__ */ React__default.createElement("span", { className: "absolute left-2 flex size-3.5 items-center justify-center" }, /* @__PURE__ */ React__default.createElement(DropdownMenuPrimitive.ItemIndicator, null, /* @__PURE__ */ React__default.createElement(Icons.check, { className: "size-4" }))),
   children
 ));
-const DropdownMenuRadioItem = withRef(({ children, className, hideIcon, ...props }, ref) => /* @__PURE__ */ React__default.createElement(
+const DropdownMenuRadioItem$1 = withRef(({ children, className, hideIcon, ...props }, ref) => /* @__PURE__ */ React__default.createElement(
   DropdownMenuPrimitive.RadioItem,
   {
     className: cn$1(
@@ -2842,7 +2877,7 @@ const dropdownMenuLabelVariants = cva(
     }
   }
 );
-const DropdownMenuLabel = withVariants(
+const DropdownMenuLabel$1 = withVariants(
   DropdownMenuPrimitive.Label,
   dropdownMenuLabelVariants,
   ["inset"]
@@ -4166,6 +4201,17 @@ TinaField.propTypes = {
   Component: PropTypes.any.isRequired,
   children: PropTypes.any
 };
+const isErrorNamed = (error, name2) => error instanceof Error && error.name === name2;
+class SessionExpiredError extends Error {
+  constructor() {
+    super("Your session has ended. Please sign in again.");
+    this.name = "SessionExpiredError";
+  }
+}
+const isSessionExpiredError = (error) => error instanceof SessionExpiredError || isErrorNamed(error, "SessionExpiredError");
+const dispatchSessionExpired = (events) => {
+  events.dispatch({ type: "cms:session-expired" });
+};
 const LoadingDots = ({
   dotSize = 8,
   color = "white"
@@ -4225,6 +4271,8 @@ const Button$2 = ({
     medium: `text-sm h-10 px-8`,
     custom: ``
   };
+  const isDisabled = disabled || busy;
+  const inertProps = typeof Tag2 !== "string" || Tag2 === "button" ? { disabled: isDisabled } : isDisabled && { "aria-disabled": true, tabIndex: -1, href: void 0 };
   return /* @__PURE__ */ React.createElement(
     Tag2,
     {
@@ -4236,7 +4284,9 @@ const Button$2 = ({
         roundedClasses[rounded],
         className
       ),
-      ...props
+      ...props,
+      ...inertProps,
+      onClick: isDisabled ? void 0 : props.onClick
     },
     busy ? /* @__PURE__ */ React.createElement(LoadingDots, { color: "currentColor" }) : children
   );
@@ -4279,7 +4329,8 @@ const IconButton = ({
         stateClasses[state],
         className
       ),
-      ...props
+      ...props,
+      disabled: disabled || busy
     },
     children
   );
@@ -4469,6 +4520,54 @@ function DropdownMenuItem({
     }
   );
 }
+function DropdownMenuRadioGroup({
+  ...props
+}) {
+  return /* @__PURE__ */ React.createElement(
+    DropdownMenuPrimitive.RadioGroup,
+    {
+      "data-slot": "dropdown-menu-radio-group",
+      ...props
+    }
+  );
+}
+function DropdownMenuRadioItem({
+  className,
+  children,
+  ...props
+}) {
+  return /* @__PURE__ */ React.createElement(
+    DropdownMenuPrimitive.RadioItem,
+    {
+      "data-slot": "dropdown-menu-radio-item",
+      className: cn(
+        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      ),
+      ...props
+    },
+    /* @__PURE__ */ React.createElement("span", { className: "pointer-events-none absolute left-2 flex size-3.5 items-center justify-center" }, /* @__PURE__ */ React.createElement(DropdownMenuPrimitive.ItemIndicator, null, /* @__PURE__ */ React.createElement(CircleIcon, { className: "size-2 fill-current" }))),
+    children
+  );
+}
+function DropdownMenuLabel({
+  className,
+  inset,
+  ...props
+}) {
+  return /* @__PURE__ */ React.createElement(
+    DropdownMenuPrimitive.Label,
+    {
+      "data-slot": "dropdown-menu-label",
+      "data-inset": inset,
+      className: cn(
+        "px-2 py-1.5 text-sm font-medium data-[inset]:pl-8",
+        className
+      ),
+      ...props
+    }
+  );
+}
 function DropdownMenuSeparator({
   className,
   ...props
@@ -4698,6 +4797,56 @@ const SortableProvider = ({
 }) => {
   return /* @__PURE__ */ React__default.createElement(SortableContext, { items, strategy: verticalListSortingStrategy }, children);
 };
+const formatDefaultBranchName = (filePath, crudType) => {
+  let result = filePath;
+  const contentPrefix = "content/";
+  if (result.startsWith(contentPrefix)) {
+    result = result.substring(contentPrefix.length);
+  }
+  const lastDot = result.lastIndexOf(".");
+  const lastSlash = Math.max(result.lastIndexOf("/"), result.lastIndexOf("\\"));
+  if (lastDot > lastSlash && lastDot > 0) {
+    result = result.slice(0, lastDot);
+  }
+  result = normalizeBranchName(result);
+  if (crudType === "delete") {
+    result = `❌-${result}`;
+  }
+  return result;
+};
+const trimRefComponent = (part) => {
+  let result = part.replace(/\.{2,}/g, ".");
+  while (result.startsWith(".")) {
+    result = result.slice(1);
+  }
+  let previous = "";
+  while (previous !== result) {
+    previous = result;
+    if (result.endsWith(".lock")) {
+      result = result.slice(0, -".lock".length);
+    } else if (result.endsWith(".")) {
+      result = result.slice(0, -1);
+    }
+  }
+  return result;
+};
+const normalizeBranchName = (name2) => name2.replace(/[\x00-\x20\x7f~^:?*\[\\]+/g, "-").replace(/@\{/g, "-").split("/").map(trimRefComponent).filter(Boolean).join("/");
+function formatBranchName(str) {
+  let result = "";
+  let replacingInvalidChars = false;
+  for (const char of str.toLowerCase()) {
+    const code = char.charCodeAt(0);
+    const isValid = char === "/" || char === "-" || char === "_" || code >= 48 && code <= 57 || code >= 97 && code <= 122;
+    if (isValid) {
+      result += char;
+      replacingInvalidChars = false;
+    } else if (!replacingInvalidChars) {
+      result += "-";
+      replacingInvalidChars = true;
+    }
+  }
+  return result;
+}
 const textFieldClasses = "shadow-inner focus:shadow-outline focus:border-blue-500 focus:outline-none block text-base placeholder:text-gray-300 px-3 py-2 text-gray-600 w-full bg-white border border-gray-200 transition-all ease-out duration-150 focus:text-gray-900 rounded";
 const disabledClasses$1 = "opacity-50 pointer-events-none cursor-not-allowed";
 const BaseTextField = React.forwardRef(({ className, disabled, ...rest }, ref) => {
@@ -5502,12 +5651,38 @@ const dropzoneAcceptFromString = (str) => {
     ...(str || DEFAULT_MEDIA_UPLOAD_TYPES).split(",").map((x) => ({ [x]: [] }))
   );
 };
-const isImage = (filename) => {
-  return /\.(gif|jpg|jpeg|tiff|png|svg|webp|avif)(\?.*)?$/i.test(filename);
-};
-const isVideo = (filename) => {
-  return /\.(mp4|webm|ogg|m4v|mov|avi|flv|mkv)(\?.*)?$/i.test(filename);
+const dropzoneAcceptFromExtensions = (extensions) => {
+  if (!extensions.length) return void 0;
+  const accept = {};
+  for (const ext of extensions) {
+    const mimeType = MEDIA_MIME_TYPES[ext];
+    accept[mimeType] ?? (accept[mimeType] = []);
+    accept[mimeType].push(`.${ext}`);
+  }
+  return accept;
 };
+const PREVIEWABLE_IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([
+  "gif",
+  "jpg",
+  "jpeg",
+  "tiff",
+  "png",
+  "svg",
+  "webp",
+  "avif"
+]);
+const PREVIEWABLE_VIDEO_EXTENSIONS = /* @__PURE__ */ new Set([
+  "mp4",
+  "webm",
+  "ogg",
+  "m4v",
+  "mov",
+  "avi",
+  "flv",
+  "mkv"
+]);
+const isImage = (filename) => PREVIEWABLE_IMAGE_EXTENSIONS.has(extensionOf(filename ?? ""));
+const isVideo = (filename) => PREVIEWABLE_VIDEO_EXTENSIONS.has(extensionOf(filename ?? ""));
 const absoluteImgURL = (str) => {
   if (str.startsWith("http")) return str;
   return `${window.location.origin}${str}`;
@@ -5569,12 +5744,13 @@ const StyledImage = ({ src }) => {
 const StyledFile = ({ src }) => {
   return /* @__PURE__ */ React.createElement("div", { className: "max-w-full w-full flex-1 flex justify-start items-center gap-3" }, /* @__PURE__ */ React.createElement("div", { className: "w-12 h-12 bg-white shadow border border-gray-100 rounded flex justify-center flex-none" }, /* @__PURE__ */ React.createElement(File$1, { className: "w-3/5 h-full text-gray-300" })), /* @__PURE__ */ React.createElement("span", { className: "text-base text-left flex-1 text-gray-500 w-full break-words truncate" }, src));
 };
-const ImageUpload = React.forwardRef(({ onDrop, onClear, onClick, value, src, loading }, ref) => {
+const ImageUpload = React.forwardRef(({ onDrop, onClear, onClick, value, src, loading, accept }, ref) => {
   const cms = useCMS();
   const { getRootProps, getInputProps } = useDropzone$1({
-    accept: dropzoneAcceptFromString(
-      cms.media.accept || DEFAULT_MEDIA_UPLOAD_TYPES
-    ),
+    // A field's `accept` overrides the global `media.accept`, so a file the
+    // field would refuse is rejected here rather than uploaded and then
+    // discarded by the insert guard.
+    accept: dropzoneAcceptFromExtensions(resolveMediaAccept(accept)) ?? dropzoneAcceptFromString(cms.media.accept || DEFAULT_MEDIA_UPLOAD_TYPES),
     onDrop,
     noClick: !!onClick
   });
@@ -6193,6 +6369,7 @@ const Group$1 = ({ tinaForm, form, field, input, meta, index }) => {
   return /* @__PURE__ */ React__default.createElement(
     ListFieldMeta,
     {
+      "data-test": `list-${field.name}`,
       name: input.name,
       label: field.label,
       description: field.description,
@@ -6203,6 +6380,7 @@ const Group$1 = ({ tinaForm, form, field, input, meta, index }) => {
       actions: (!fixedLength || fixedLength && !isMax) && /* @__PURE__ */ React__default.createElement(
         IconButton,
         {
+          "data-test": `add-item-${field.name}`,
           onClick: addItem,
           disabled: isMax,
           variant: "primary",
@@ -6295,7 +6473,14 @@ const Item$1 = ({
       /* @__PURE__ */ React__default.createElement(GroupLabel, null, title),
       /* @__PURE__ */ React__default.createElement(Pencil, { className: "h-5 w-auto text-gray-200 group-hover:text-inherit transition-colors duration-150 ease-out" })
     ),
-    (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React__default.createElement(ItemDeleteButton, { disabled: isMin, onClick: removeItem })
+    (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React__default.createElement(
+      ItemDeleteButton,
+      {
+        disabled: isMin,
+        onClick: removeItem,
+        fieldName: `${field.name}.${index}`
+      }
+    )
   )));
 };
 const ItemClickTarget = ({ children, ...props }) => {
@@ -6342,11 +6527,16 @@ const ItemHeader = ({
     children
   );
 };
-const ItemDeleteButton = ({ onClick, disabled = false }) => {
+const ItemDeleteButton = ({
+  onClick,
+  disabled = false,
+  fieldName = ""
+}) => {
   return /* @__PURE__ */ React__default.createElement(
     "button",
     {
       type: "button",
+      "data-test": fieldName ? `delete-item-${fieldName}` : "delete-item",
       className: `w-8 px-1 py-2.5 flex items-center justify-center text-gray-200 hover:opacity-100 opacity-30 hover:bg-gray-50 ${disabled && "pointer-events-none opacity-30 cursor-not-allowed"}`,
       onClick
     },
@@ -6389,7 +6579,8 @@ const PopoverContent = React.forwardRef(({ className, align = "center", sideOffs
 PopoverContent.displayName = PopoverPrimitive.Content.displayName;
 const BlockSelector = ({
   templates,
-  addItem
+  addItem,
+  fieldName
 }) => {
   const showFilter = React.useMemo(() => {
     return Object.entries(templates).length > 6;
@@ -6404,6 +6595,7 @@ const BlockSelector = ({
   return /* @__PURE__ */ React.createElement(Popover, { open, onOpenChange: setOpen }, /* @__PURE__ */ React.createElement(PopoverTrigger, { asChild: true }, /* @__PURE__ */ React.createElement("span", null, /* @__PURE__ */ React.createElement(
     IconButton,
     {
+      "data-test": fieldName ? `add-item-${fieldName}` : void 0,
       variant: open ? "secondary" : "primary",
       size: "small",
       className: `${open ? `rotate-45 pointer-events-none` : ``}`
@@ -6703,7 +6895,8 @@ const constructUrlWithBasePath = (url, basePath) => {
 const BlockSelectorBig = ({
   templates,
   addItem,
-  label
+  label,
+  fieldName
 }) => {
   const FormPortal = useFormPortal();
   const [pickerIsOpen, setPickerIsOpen] = React.useState(false);
@@ -6748,6 +6941,7 @@ const BlockSelectorBig = ({
   return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
     IconButton,
     {
+      "data-test": fieldName ? `add-item-${fieldName}` : void 0,
       variant: pickerIsOpen ? "secondary" : "primary",
       size: "small",
       className: `${pickerIsOpen ? "rotate-45 pointer-events-none" : ""}`,
@@ -6962,6 +7156,7 @@ const Blocks = ({
   return /* @__PURE__ */ React.createElement(
     ListFieldMeta,
     {
+      "data-test": `list-${field.name}`,
       name: input.name,
       label: field.label,
       description: field.description,
@@ -6970,9 +7165,17 @@ const Blocks = ({
       index,
       tinaForm,
       actions: (!fixedLength || fixedLength && !isMax) && // @ts-ignore
-      (!field.visualSelector ? /* @__PURE__ */ React.createElement(BlockSelector, { templates: field.templates, addItem }) : /* @__PURE__ */ React.createElement(
+      (!field.visualSelector ? /* @__PURE__ */ React.createElement(
+        BlockSelector,
+        {
+          templates: field.templates,
+          addItem,
+          fieldName: field.name
+        }
+      ) : /* @__PURE__ */ React.createElement(
         BlockSelectorBig,
         {
+          fieldName: field.name,
           label: field.label || field.name,
           templates: field.templates,
           addItem
@@ -7074,7 +7277,14 @@ const BlockListItem = ({
     /* @__PURE__ */ React.createElement(GroupLabel, null, label || template.label),
     isNew && /* @__PURE__ */ React.createElement("span", { className: "mr-1.5 inline-flex items-center px-1.5 py-0.5 rounded text-[10px] border-[0.5px] border-tina-orange/50 font-semibold bg-tina-orange/10 text-tina-orange leading-none" }, "NEW"),
     /* @__PURE__ */ React.createElement(Pencil, { className: "h-5 w-auto text-gray-200 group-hover:text-inherit transition-colors duration-150 ease-out" })
-  ), (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React.createElement(ItemDeleteButton, { disabled: isMin, onClick: removeItem }))));
+  ), (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React.createElement(
+    ItemDeleteButton,
+    {
+      disabled: isMin,
+      onClick: removeItem,
+      fieldName: `${field.name}.${index}`
+    }
+  ))));
 };
 const InvalidBlockListItem = ({
   tinaForm,
@@ -7090,7 +7300,13 @@ const InvalidBlockListItem = ({
       isDragging: snapshot.isDragging,
       dragHandleProps: provider.dragHandleProps
     }
-  ), /* @__PURE__ */ React.createElement(ItemClickTarget, null, /* @__PURE__ */ React.createElement(GroupLabel, { error: true }, "Invalid Block")), /* @__PURE__ */ React.createElement(ItemDeleteButton, { onClick: removeItem })));
+  ), /* @__PURE__ */ React.createElement(ItemClickTarget, null, /* @__PURE__ */ React.createElement(GroupLabel, { error: true }, "Invalid Block")), /* @__PURE__ */ React.createElement(
+    ItemDeleteButton,
+    {
+      onClick: removeItem,
+      fieldName: `${field.name}.${index}`
+    }
+  )));
 };
 const BlocksField = Blocks;
 const BlocksFieldPlugin = {
@@ -7148,6 +7364,7 @@ const List = ({ tinaForm, form, field, input, meta, index }) => {
   return /* @__PURE__ */ React.createElement(
     ListFieldMeta,
     {
+      "data-test": `list-${field.name}`,
       name: input.name,
       label: field.label,
       description: field.description,
@@ -7157,6 +7374,7 @@ const List = ({ tinaForm, form, field, input, meta, index }) => {
       actions: /* @__PURE__ */ React.createElement(
         IconButton,
         {
+          "data-test": `add-item-${field.name}`,
           onClick: addItem,
           variant: "primary",
           size: "small",
@@ -7215,7 +7433,14 @@ const Item = ({
       isDragging: snapshot.isDragging,
       dragHandleProps: provider.dragHandleProps
     }
-  ), /* @__PURE__ */ React.createElement(ItemClickTarget, null, /* @__PURE__ */ React.createElement(FieldsBuilder, { padding: false, form: tinaForm, fields })), (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React.createElement(ItemDeleteButton, { disabled: isMin, onClick: removeItem })));
+  ), /* @__PURE__ */ React.createElement(ItemClickTarget, null, /* @__PURE__ */ React.createElement(FieldsBuilder, { padding: false, form: tinaForm, fields })), (!fixedLength || fixedLength && !isMin) && /* @__PURE__ */ React.createElement(
+    ItemDeleteButton,
+    {
+      disabled: isMin,
+      onClick: removeItem,
+      fieldName: `${field.name}.${index}`
+    }
+  )));
 };
 const ListField = List;
 const ListFieldPlugin = {
@@ -7245,6 +7470,16 @@ const ImageField = wrapFieldsWithMeta(
       var _a, _b;
       if (media) {
         const item = Array.isArray(media) ? media[0] : media;
+        const allowed = resolveMediaAccept(
+          props.field.accept
+        );
+        const ext = extensionOf(item.filename) || extensionOf(item.src ?? "");
+        if (allowed.length && !allowed.includes(ext)) {
+          cms.alerts.error(
+            `${item.filename} is not an accepted file type. This field accepts ${allowed.join(", ")}.`
+          );
+          return;
+        }
         const parsedValue = typeof ((_b = (_a = cms == null ? void 0 : cms.media) == null ? void 0 : _a.store) == null ? void 0 : _b.parse) === "function" ? cms.media.store.parse(item) : item.src || item;
         props.input.onChange(parsedValue);
       }
@@ -7257,12 +7492,14 @@ const ImageField = wrapFieldsWithMeta(
         value,
         src,
         loading: isImgUploading,
+        accept: props.field.accept,
         onClick: () => {
           const directory = uploadDir(props.form.getState().values);
           cms.media.open({
             allowDelete: true,
             directory,
-            onSelect: onChange
+            onSelect: onChange,
+            accept: props.field.accept
           });
         },
         onDrop: async ([file], fileRejections) => {
@@ -8647,6 +8884,34 @@ const InfoBox = ({
   InfoBoxComponent.displayName = "InfoBox";
   return InfoBoxComponent;
 };
+function useLocalStorage(key, initialValue) {
+  const [storedValue, setStoredValue] = React.useState(() => {
+    try {
+      const valueFromStorage = typeof window !== "undefined" && window.localStorage && window.localStorage.getItem(key);
+      if (valueFromStorage != null) {
+        return JSON.parse(valueFromStorage);
+      }
+    } catch (error) {
+    }
+    return initialValue;
+  });
+  React.useEffect(() => {
+    const valueFromStorage = window.localStorage && window.localStorage.getItem(key);
+    if (valueFromStorage != null && valueFromStorage != void 0) {
+      setStoredValue(JSON.parse(valueFromStorage));
+    }
+  }, [key]);
+  const setValue = (value) => {
+    try {
+      const valueToStore = value instanceof Function ? value(storedValue) : value;
+      setStoredValue(valueToStore);
+      localStorage.setItem(key, JSON.stringify(valueToStore));
+    } catch (error) {
+      console.log(error);
+    }
+  };
+  return [storedValue, setValue];
+}
 const Badge = ({
   children,
   calloutStyle = "warning",
@@ -8708,11 +8973,6 @@ const useBranchData = () => {
   }, [branchData.currentBranch]);
   return branchData;
 };
-function formatBranchName$1(str) {
-  const pattern = /[^/\w-]+/g;
-  const formattedStr = str.replace(pattern, "");
-  return formattedStr.toLowerCase();
-}
 const BranchSwitcherLegacy = ({
   listBranches,
   createBranch,
@@ -8735,7 +8995,7 @@ const BranchSwitcherLegacy = ({
   const handleCreateBranch = React.useCallback((value) => {
     setListState("loading");
     createBranch({
-      branchName: formatBranchName$1(value),
+      branchName: normalizeBranchName(formatBranchName(value)),
       baseBranch: currentBranch
     }).then(async (createdBranchName) => {
       cms.alerts.success("Branch created.");
@@ -8905,6 +9165,9 @@ const BranchSelector = ({
   ));
 };
 const CreateBranch = ({ currentBranch, newBranchName, onCreateBranch, setNewBranchName }) => {
+  const normalizedBranchName = normalizeBranchName(
+    formatBranchName(newBranchName)
+  );
   return /* @__PURE__ */ React.createElement("div", { className: "border-t border-gray-150 pt-4 mt-3 flex flex-col gap-3" }, /* @__PURE__ */ React.createElement("div", { className: "text-sm" }, "Create a new branch from ", /* @__PURE__ */ React.createElement("b", null, currentBranch), ". Once created you will need to wait for indexing to complete before you can switch branches."), /* @__PURE__ */ React.createElement("div", { className: "flex justify-between items-center w-full gap-3" }, /* @__PURE__ */ React.createElement(
     BaseTextField,
     {
@@ -8918,8 +9181,11 @@ const CreateBranch = ({ currentBranch, newBranchName, onCreateBranch, setNewBran
       className: "flex-0 flex items-center gap-2 whitespace-nowrap",
       size: "medium",
       variant: "white",
-      disabled: newBranchName === "",
-      onClick: () => onCreateBranch(newBranchName)
+      disabled: normalizedBranchName === "",
+      onClick: () => {
+        if (!normalizedBranchName) return;
+        onCreateBranch(normalizedBranchName);
+      }
     },
     /* @__PURE__ */ React.createElement(Plus, { className: "w-5 h-auto opacity-70" }),
     " Create Branch"
@@ -9373,22 +9639,6 @@ const PullRequestCell = ({
   }
   return null;
 };
-function formatBranchName(str) {
-  let result = "";
-  let replacingInvalidChars = false;
-  for (const char of str.toLowerCase()) {
-    const code = char.charCodeAt(0);
-    const isValid = char === "/" || char === "-" || char === "_" || code >= 48 && code <= 57 || code >= 97 && code <= 122;
-    if (isValid) {
-      result += char;
-      replacingInvalidChars = false;
-    } else if (!replacingInvalidChars) {
-      result += "-";
-      replacingInvalidChars = true;
-    }
-  }
-  return result;
-}
 const tableHeadingStyle = "px-3 py-3 text-left text-xs font-bold text-gray-700 tracking-wider sticky top-0 bg-gray-100 z-20 border-b-2 border-gray-200 ";
 const BranchSwitcher = (props) => {
   const cms = useCMS$1();
@@ -9429,7 +9679,7 @@ const EditoralBranchSwitcher = ({
   const handleCreateBranch = React.useCallback((value) => {
     setListState("loading");
     createBranch({
-      branchName: formatBranchName(value),
+      branchName: normalizeBranchName(formatBranchName(value)),
       baseBranch: currentBranch
     }).then(async (createdBranchName) => {
       cms.alerts.success("Branch created.");
@@ -9573,46 +9823,58 @@ const sortBranchListFn = (sortValue) => {
     }
   };
 };
-const BranchCreator = ({ setViewState, handleCreateBranch, currentBranch }) => {
+const BranchCreator = ({
+  setViewState,
+  handleCreateBranch,
+  currentBranch
+}) => {
   const [branchName, setBranchName] = React.useState("");
-  return /* @__PURE__ */ React.createElement("form", null, /* @__PURE__ */ React.createElement("div", { className: "" }, /* @__PURE__ */ React.createElement("p", { className: "text-base text-gray-700 mb-4" }, "Create a new branch from ", /* @__PURE__ */ React.createElement("strong", null, currentBranch), "."), /* @__PURE__ */ React.createElement("div", { className: "mb-3" }, /* @__PURE__ */ React.createElement(FieldLabel, { name: "current-branch-name" }, "Current Branch Name"), /* @__PURE__ */ React.createElement(
-    BaseTextField,
-    {
-      name: "current-branch-name",
-      value: currentBranch,
-      disabled: true
-    }
-  )), /* @__PURE__ */ React.createElement("div", { className: "mb-6" }, /* @__PURE__ */ React.createElement(FieldLabel, { name: "branch-name" }, "New Branch Name"), /* @__PURE__ */ React.createElement(
-    PrefixedTextField,
-    {
-      placeholder: "",
-      name: "branch-name",
-      value: branchName,
-      onChange: (e) => setBranchName(e.target.value)
-    }
-  ))), /* @__PURE__ */ React.createElement("div", { className: "w-full flex justify-between gap-4 items-center" }, /* @__PURE__ */ React.createElement(
-    Button$2,
-    {
-      style: { flexGrow: 1 },
-      onClick: () => {
-        setViewState("list");
+  const normalizedBranchName = normalizeBranchName(
+    formatBranchName(branchName)
+  );
+  return (
+    // Submit is handled by the button below; without this the implicit
+    // submission from pressing Enter in the field reloads the page
+    /* @__PURE__ */ React.createElement("form", { onSubmit: (e) => e.preventDefault() }, /* @__PURE__ */ React.createElement("div", { className: "" }, /* @__PURE__ */ React.createElement("p", { className: "text-base text-gray-700 mb-4" }, "Create a new branch from ", /* @__PURE__ */ React.createElement("strong", null, currentBranch), "."), /* @__PURE__ */ React.createElement("div", { className: "mb-3" }, /* @__PURE__ */ React.createElement(FieldLabel, { name: "current-branch-name" }, "Current Branch Name"), /* @__PURE__ */ React.createElement(
+      BaseTextField,
+      {
+        name: "current-branch-name",
+        value: currentBranch,
+        disabled: true
       }
-    },
-    "Cancel"
-  ), /* @__PURE__ */ React.createElement(
-    Button$2,
-    {
-      variant: "primary",
-      type: "submit",
-      style: { flexGrow: 2 },
-      disabled: branchName === "",
-      onClick: () => {
-        handleCreateBranch("tina/" + branchName);
+    )), /* @__PURE__ */ React.createElement("div", { className: "mb-6" }, /* @__PURE__ */ React.createElement(FieldLabel, { name: "branch-name" }, "New Branch Name"), /* @__PURE__ */ React.createElement(
+      PrefixedTextField,
+      {
+        placeholder: "",
+        name: "branch-name",
+        value: branchName,
+        onChange: (e) => setBranchName(e.target.value)
       }
-    },
-    "Create Branch ",
-    /* @__PURE__ */ React.createElement(GitBranch, { className: "w-5 h-full ml-1 opacity-70" })
-  )));
+    ))), /* @__PURE__ */ React.createElement("div", { className: "w-full flex justify-between gap-4 items-center" }, /* @__PURE__ */ React.createElement(
+      Button$2,
+      {
+        style: { flexGrow: 1 },
+        onClick: () => {
+          setViewState("list");
+        }
+      },
+      "Cancel"
+    ), /* @__PURE__ */ React.createElement(
+      Button$2,
+      {
+        variant: "primary",
+        type: "submit",
+        style: { flexGrow: 2 },
+        disabled: normalizedBranchName === "",
+        onClick: () => {
+          if (!normalizedBranchName) return;
+          handleCreateBranch("tina/" + normalizedBranchName);
+        }
+      },
+      "Create Branch ",
+      /* @__PURE__ */ React.createElement(GitBranch, { className: "w-5 h-full ml-1 opacity-70" })
+    )))
+  );
 };
 const extractPullRequestId = (url) => {
   return url.split("/").pop() || "";
@@ -9809,9 +10071,21 @@ let Alerts$1 = class Alerts {
         this.add(level, message, timeout);
       }
     });
+    /**
+     * While suppressed (the window between a session expiring and the user
+     * signing back in), new alerts are dropped so nothing paints over the
+     * login modal. Alerts already showing are left alone.
+     */
+    __publicField(this, "suppressed", false);
     this.events = events;
     this.map = map;
     this.events.subscribe("*", this.mapEventToAlert);
+    this.events.subscribe("cms:session-expired", () => {
+      this.suppressed = true;
+    });
+    this.events.subscribe("cms:login", () => {
+      this.suppressed = false;
+    });
   }
   setMap(eventsToAlerts) {
     this.map = {
@@ -9820,6 +10094,10 @@ let Alerts$1 = class Alerts {
     };
   }
   add(level, message, timeout = 4e3) {
+    if (this.suppressed) {
+      return () => {
+      };
+    }
     const alert = {
       level,
       message,
@@ -9860,219 +10138,6 @@ let Alerts$1 = class Alerts {
     return this.add("error", message, timeout);
   }
 };
-class PluginTypeManager {
-  constructor(events) {
-    /**
-     * @ignore
-     */
-    __publicField(this, "plugins", {});
-    this.events = events;
-  }
-  /**
-   * Gets the [[PluginType|collection of plugins]] for the given type.
-   *
-   * #### Example: Basic Usage
-   *
-   * ```ts
-   * const colorPlugins = cms.plugins.get("color")
-   * ```
-   *
-   * #### Example: Advanced Types
-   *
-   * A type param can be added to specify the kind of Plugin
-   * that is being listed.
-   *
-   * ```ts
-   * const colorPlugins = cms.plugins.get<ColorPlugin>("color")
-   * ```
-   *
-   * @param type The type of plugins to be retrieved
-   * @typeparam P A subclass of Plugin. Optional.
-   */
-  getType(type2) {
-    return this.plugins[type2] = this.plugins[type2] || new PluginType(type2, this.events);
-  }
-  /**
-   * An alias to [[get]]
-   *
-   * ### !DEPRECATED!
-   *
-   * This name is unnecessarily verbose and weird.
-   */
-  findOrCreateMap(type2) {
-    return this.getType(type2);
-  }
-  /**
-   * Adds a Plugin to the CMS.
-   *
-   * #### Example: Basic Usage
-   *
-   * ```js
-   * cms.plugins.add({ __type: "color", name: "red" })
-   * ```
-   *
-   * #### Example: Advanced Types
-   *
-   * ```ts
-   * interface ColorPlugin extends Plugin {
-   *   __type: "color"
-   *   hex: string
-   *   rgb: string
-   * }
-   *
-   * cms.plugins.add<ColorPlugin>({
-   *   __type: "color",
-   *   name: "red",
-   *   hex: "#FF0000",
-   *   rgb: "RGBA(255, 0, 0, 1)"
-   * })
-   * ```
-   *
-   * @typeparam P A subclass of Plugin. Optional.
-   * @param plugin
-   * @todo Consider returning the plugin which was just added.
-   */
-  add(plugin) {
-    this.findOrCreateMap(plugin.__type).add(plugin);
-  }
-  /**
-   * Removes the given plugin from the CMS.
-   *
-   * #### Example
-   *
-   * In this example a plugin is added to the CMS and removed
-   * 5 seconds later.
-   *
-   * ```ts
-   * const redPlugin = {
-   *   __type: "color",
-   *   name: "red",
-   *   hex: "#FF0000",
-   *   rgb: "RGBA(255, 0, 0, 1)"
-   * }
-   *
-   * cms.plugins.add(redPlugin)
-   *
-   * setTimeout(() => {
-   *   cms.plugins.remove(redPlugin)
-   * }, 5000)
-   * ```
-   *
-   * @typeparam P A subclass of Plugin. Optional.
-   * @param plugin The plugin to be removed from the CMS.
-   */
-  remove(plugin) {
-    this.findOrCreateMap(plugin.__type).remove(plugin);
-  }
-  /**
-   * Returns a list of all the plugins of the given type.
-   *
-   * #### Example: Basic Usage
-   *
-   * ```ts
-   * cms.plugins.all("color").forEach(color => {
-   *   console.log(color.name)
-   * })
-   * ```
-   *
-   * #### Example: Advanced Types
-   *
-   * A generic can be added to specify the type of plugins
-   * that are being retrieved.
-   *
-   * ```ts
-   * cms.plugins.all<ColorPlugin>("color").forEach(color => {
-   *   console.log(color.name, color.hex)
-   * })
-   * ```
-   *
-   * @typeparam P A subclass of Plugin. Optional.
-   * @param type The name of the plugin
-   * @returns An array of all plugins of the given type.
-   */
-  all(type2) {
-    return this.findOrCreateMap(type2).all();
-  }
-}
-class PluginType {
-  /**
-   *
-   * @param __type The `__type` of plugin being managed.
-   */
-  constructor(__type, events) {
-    /**
-     * @ignore
-     */
-    __publicField(this, "__plugins", {});
-    this.__type = __type;
-    this.events = events;
-  }
-  /**
-   * Adds a new plugin to the collection.
-   *
-   * ### Example
-   *
-   * ```ts
-   * interface ColorPlugin extends Plugin {
-   *   hex: string
-   * }
-   *
-   * const colorPlugins = new PluginType<ColorPlugin>("color")
-   *
-   * colorPlugins.add({ name: "red", hex: "#f00" })
-   * ```
-   *
-   * @param plugin A new plugin. The `__type` is optional and will be added if it's missing.
-   */
-  add(plugin) {
-    const p = plugin;
-    if (!p.__type) {
-      p.__type = this.__type;
-    }
-    this.__plugins[p.name] = p;
-    this.events.dispatch({ type: `plugin:add:${this.__type}` });
-  }
-  all() {
-    return Object.keys(this.__plugins).map((name2) => this.__plugins[name2]);
-  }
-  /**
-   *
-   * Looks up a plugin by it's `name`.
-   *
-   * ### Example
-   *
-   * ```ts
-   * const colorPlugins = new PluginType<ColorPlugin>("color")
-   *
-   * colorPlugins.add({ name: "red", hex: "#f00" })
-   *
-   * colorPlugins.find("red")  // { __type: "color", name: "red", hex: "#f00" }
-   * colorPlugin.find("large") // undefined
-   * ```
-   *
-   * @param name The `name` of the plugin to be retrieved.
-   */
-  find(name2) {
-    return this.__plugins[name2];
-  }
-  /**
-   * Pass this function a plugin or the `name` of a plugin to have
-   * it be removed from the CMS.
-   *
-   * @param pluginOrName The `name` of a plugin, or the plugin itself.
-   * @returns The plugin that was removed, or `undefined` if it was not found.
-   */
-  remove(pluginOrName) {
-    const name2 = typeof pluginOrName === "string" ? pluginOrName : pluginOrName.name;
-    const plugin = this.__plugins[name2];
-    delete this.__plugins[name2];
-    this.events.dispatch({ type: `plugin:remove:${this.__type}` });
-    return plugin;
-  }
-  subscribe(cb) {
-    return this.events.subscribe(`plugin:*:${this.__type}`, cb);
-  }
-}
 class EventBus {
   constructor() {
     __publicField(this, "listeners", /* @__PURE__ */ new Set());
@@ -10151,6 +10216,19 @@ class Listener {
     return !ignoresEvent;
   }
 }
+class Flags {
+  constructor(events) {
+    __publicField(this, "_flags", /* @__PURE__ */ new Map());
+    this.events = events;
+  }
+  get(key) {
+    return this._flags.get(key);
+  }
+  set(key, value) {
+    this._flags.set(key, value);
+    this.events.dispatch({ type: "flag:set", key, value });
+  }
+}
 const EDITORIAL_WORKFLOW_STATUS = {
   QUEUED: "queued",
   PROCESSING: "processing",
@@ -10238,6 +10316,26 @@ const MEDIA_WORKFLOW_STATUS_TO_STEP = {
   [EDITORIAL_WORKFLOW_STATUS.COMPLETE]: MEDIA_WORKFLOW_STEP.COMPLETE
 };
 const s3ErrorRegex = /<Error>.*<Code>(.+)<\/Code>.*<Message>(.+)<\/Message>.*/;
+const CANONICAL_THUMBNAIL_SIZES = [
+  { w: 75, h: 75 },
+  { w: 400, h: 400 },
+  { w: 1e3, h: 1e3 }
+];
+const RENAME_ERROR_CODES = [
+  "NOT_FOUND",
+  "NAME_COLLISION",
+  "INVALID_FILENAME",
+  "INVALID_PATH",
+  "UNAUTHORIZED",
+  "UNSUPPORTED",
+  "BACKEND_FAILURE"
+];
+class MediaRenameCancelled extends Error {
+  constructor() {
+    super("Media rename cancelled.");
+    __publicField(this, "ERR_TYPE", "MediaRenameCancelled");
+  }
+}
 class DummyMediaStore {
   constructor() {
     __publicField(this, "accept", "*");
@@ -10279,10 +10377,9 @@ class TinaMediaStore {
     __publicField(this, "workflowBranchOverride");
     __publicField(this, "mediaWorkflowInProgress", false);
     /**
-     * Renaming is only implemented against the local dev server. This is an
-     * instance property rather than a prototype method on purpose: the media
+     * An instance property rather than a prototype method on purpose: the media
      * manager decides whether to offer the action by checking whether the store
-     * defines `rename`, so a cloud-backed instance must not carry one — a
+     * defines `rename`, so an instance that cannot rename must not carry one — a
      * prototype method would advertise support everywhere and surface an action
      * that always fails.
      */
@@ -10300,8 +10397,8 @@ class TinaMediaStore {
       this.isStatic = true;
       this.staticMedia = staticMedia;
     }
-    if (!this.isStatic && ((_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode)) {
-      this.rename = (from, to2) => this.rename_local(from, to2);
+    if (!this.isStatic && !this.isUnsupportedSelfHostedRepoMedia()) {
+      this.rename = ((_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode) ? (from, to2) => this.rename_local(from, to2) : (from, to2) => this.rename_cloud(from, to2);
     }
   }
   /**
@@ -10347,27 +10444,29 @@ class TinaMediaStore {
     return await this.api.authProvider.isAuthenticated();
   }
   /**
-   * Returns the workflow branch override or current branch as a single-encoded
-   * query-param value, or an empty string when no branch is set.
-   *
-   * `this.api.branch` is already URL-encoded by `Client.setBranch()`, so we
-   * decode then re-encode here to defend against double-encoding when this
-   * value is concatenated into a URL.
-   *
-   * `Client.setBranch()` runs the constructor's `options.branch` through
-   * `encodeURIComponent` without a guard, so an unset `options.branch`
-   * lands here as the literal string `"undefined"`. We treat that and the
-   * empty case as no-branch so we don't send `?branch=undefined` to the
-   * assets-api (which would route the call to a non-existent staging path).
+   * The v2 cloud endpoint and the local dev server both filter by `ext` before
+   * paginating. `staticMedia` is a build-time snapshot with no such pass, and
+   * filtering a page client-side would leave a near-empty grid while matches
+   * sit further down — so a static store reports no support and the control
+   * stays hidden, the same way `searchable` is gated.
    */
-  encodedBranchParam() {
-    if (this.workflowBranchOverride) {
-      return encodeURIComponent(this.workflowBranchOverride);
-    }
+  get extensionFilterable() {
+    return !this.isStatic;
+  }
+  /**
+   * `Client.setBranch()` encodes an unset branch to the literal `"undefined"`,
+   * which the assets API would read as a real (non-existent) staging path.
+   */
+  currentBranch() {
+    if (this.workflowBranchOverride) return this.workflowBranchOverride;
     if (!this.api.branch) return "";
     const decoded = decodeURIComponent(this.api.branch);
-    if (!decoded || decoded === "undefined") return "";
-    return encodeURIComponent(decoded);
+    return decoded === "undefined" ? "" : decoded;
+  }
+  /** `this.api.branch` arrives encoded, so encode the decoded name once here. */
+  encodedBranchParam() {
+    const branch = this.currentBranch();
+    return branch ? encodeURIComponent(branch) : "";
   }
   shortStableHash(input) {
     let hash = 2166136261;
@@ -10405,7 +10504,7 @@ class TinaMediaStore {
     const encodedBranch = this.encodedBranchParam();
     return encodedBranch ? `?branch=${encodedBranch}` : "";
   }
-  requestMediaBranchChoice(branchName, baseBranch, opType, repoPath) {
+  requestMediaBranchChoice(branchName, baseBranch, request) {
     if (!this.cms.events.hasExplicitListenerFor("media:workflow:confirm-branch")) {
       throw new Error(
         "Cannot start a media editorial workflow: no branch prompt is mounted. Ensure <MediaWorkflowOverlay /> is rendered (TinaCloudProvider mounts it automatically)."
@@ -10416,12 +10515,13 @@ class TinaMediaStore {
         type: "media:workflow:confirm-branch",
         branchName,
         baseBranch,
+        // A rename on a protected branch can only go through the workflow.
+        allowSaveToProtectedBranch: request.opType !== "rename",
         onConfirm: async (selectedBranchName) => {
           const context = await this.prepareMediaBranch(
             selectedBranchName,
             baseBranch,
-            opType,
-            repoPath
+            request
           );
           resolve({
             kind: "workflow",
@@ -10433,7 +10533,7 @@ class TinaMediaStore {
       });
     });
   }
-  async prepareMediaBranch(branchName, baseBranch, opType, repoPath) {
+  async prepareMediaBranch(branchName, baseBranch, request) {
     if (this.mediaWorkflowInProgress) {
       throw new Error("A media workflow is already in progress.");
     }
@@ -10448,8 +10548,9 @@ class TinaMediaStore {
         branchName,
         baseBranch,
         prTitle: getEditorialWorkflowPrTitle(branchName),
-        operation: opType,
-        repoPath
+        operation: request.opType,
+        repoPath: request.repoPath,
+        targetRepoPath: request.targetRepoPath
       });
       const branchContext = {
         branchName: workflow.branchName || branchName,
@@ -10525,12 +10626,10 @@ class TinaMediaStore {
     const branchName = `media-${opType}-${mediaSlug}`;
     const repoFilename = opType === "upload" && filename ? sanitizeFilename(filename) : filename;
     const repoPath = this.joinMediaPath(directory, repoFilename);
-    return this.requestMediaBranchChoice(
-      branchName,
-      baseBranch,
+    return this.requestMediaBranchChoice(branchName, baseBranch, {
       opType,
       repoPath
-    );
+    });
   }
   async waitForRequestStatus(requestId, timeoutMessage) {
     const startTime = Date.now();
@@ -10794,6 +10893,160 @@ class TinaMediaStore {
       lastSlash === -1 ? to2 : to2.slice(lastSlash + 1)
     );
   }
+  /**
+   * `from`/`to` are media-root-relative `directory/filename` paths. `to` is
+   * already sanitised by `previewRename` and is passed through untouched.
+   */
+  async rename_cloud(from, to2) {
+    this.setup();
+    if (!await this.isAuthenticated()) {
+      throw new MediaRenameError({
+        code: "UNAUTHORIZED",
+        message: "You don't have permission to rename this file."
+      });
+    }
+    const decision = await this.prepareRenameBranch(from, to2);
+    if (decision.kind === "cancelled") {
+      throw new MediaRenameCancelled();
+    }
+    if (decision.kind === "workflow") {
+      return this.renameCloudViaWorkflow(from, to2, decision.context);
+    }
+    return this.renameCloudDirect(from, to2);
+  }
+  /** `currentBranch()` is the workflow branch while one is active. */
+  async postCloudRename(from, to2) {
+    const branch = this.currentBranch() || void 0;
+    const res = await this.api.authProvider.fetchWithToken(
+      `${this.url}/rename`,
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ from, to: to2, branch })
+      }
+    );
+    const body = await res.json().catch(() => null);
+    if (res.status !== 200 || (body == null ? void 0 : body.success) !== true) {
+      throw this.toCloudRenameError(res.status, body);
+    }
+    return body;
+  }
+  async renameCloudDirect(from, to2) {
+    const result = await this.postCloudRename(from, to2);
+    if (result.requestId) {
+      try {
+        await this.waitForRequestStatus(
+          result.requestId,
+          "Time out waiting for rename to complete"
+        );
+      } catch (error) {
+        const detail = error instanceof Error && error.message ? `${error.message}. ` : "Failed to confirm the rename. ";
+        throw new MediaRenameError({
+          code: "BACKEND_FAILURE",
+          message: `${detail}The file may still have been renamed — refresh the media library to check.`
+        });
+      }
+    }
+    return this.resolveRenamedMedia(result.path || to2, result.src);
+  }
+  /**
+   * Completion is the workflow status, not the rename request status: only the
+   * former waits for the branch, the media index and the pull request.
+   */
+  async renameCloudViaWorkflow(from, to2, branchContext) {
+    let renamed;
+    try {
+      const result = await this.postCloudRename(from, to2);
+      await this.finalizeMediaWorkflow(branchContext, async () => {
+        renamed = await this.resolveRenamedMedia(result.path || to2, result.src);
+      });
+    } catch (err) {
+      this.resetWorkflowState();
+      this.cms.events.dispatch({ type: "media:workflow:finish" });
+      throw err;
+    }
+    if (!renamed) {
+      throw new MediaRenameError({
+        code: "BACKEND_FAILURE",
+        message: "The rename was staged but the branch workflow did not complete. Check the branch in TinaCloud before trying again."
+      });
+    }
+    return renamed;
+  }
+  async prepareRenameBranch(from, to2) {
+    if (!this.api.usingProtectedBranch()) return { kind: "direct" };
+    const baseBranch = decodeURIComponent(this.api.branch || "");
+    const { directory, filename } = this.splitMediaPath(from);
+    const branchName = `media-rename-${this.branchSlugForMediaPath(
+      directory,
+      filename
+    )}`;
+    return this.requestMediaBranchChoice(branchName, baseBranch, {
+      opType: "rename",
+      repoPath: from,
+      targetRepoPath: to2
+    });
+  }
+  splitMediaPath(path) {
+    const lastSlash = path.lastIndexOf("/");
+    return lastSlash === -1 ? { directory: "", filename: path } : {
+      directory: path.slice(0, lastSlash),
+      filename: path.slice(lastSlash + 1)
+    };
+  }
+  /**
+   * The listing is the source of truth for `src` (staging path, per-stage CDN
+   * host) and thumbnails; the rename response is the fallback when the entry
+   * isn't on the first page.
+   */
+  async resolveRenamedMedia(targetPath, srcFromResponse) {
+    const { directory, filename } = this.splitMediaPath(targetPath);
+    try {
+      const listed = await this.list({
+        directory,
+        limit: 100,
+        thumbnailSizes: CANONICAL_THUMBNAIL_SIZES
+      });
+      const entry = listed.items.find(
+        (item) => item.type === "file" && item.filename === filename
+      );
+      if (entry) return entry;
+    } catch (error) {
+      console.error("Failed to fetch the canonical media entry:", error);
+    }
+    const src = srcFromResponse || "";
+    return {
+      type: "file",
+      id: filename,
+      filename,
+      directory,
+      src,
+      thumbnails: CANONICAL_THUMBNAIL_SIZES.reduce(
+        (acc, size) => {
+          acc[`${size.w}x${size.h}`] = this.genThumbnail(src, size);
+          return acc;
+        },
+        {}
+      )
+    };
+  }
+  toCloudRenameError(status, body) {
+    const message = typeof (body == null ? void 0 : body.message) === "string" && body.message ? body.message : "Failed to rename the file.";
+    if (RENAME_ERROR_CODES.includes(body == null ? void 0 : body.code)) {
+      return new MediaRenameError({ code: body.code, message });
+    }
+    let code;
+    if (status === 401 || status === 403) {
+      code = "UNAUTHORIZED";
+    } else if (status === 404) {
+      code = "NOT_FOUND";
+    } else if (status === 409) {
+      code = "NAME_COLLISION";
+    } else {
+      code = "BACKEND_FAILURE";
+    }
+    return new MediaRenameError({ code, message });
+  }
   toRenameError(status, body) {
     if (body == null ? void 0 : body.code) {
       return new MediaRenameError({
@@ -10821,6 +11074,7 @@ class TinaMediaStore {
     return !this.isLocal ? `${src}?fit=crop&max-w=${dimensions.w}&max-h=${dimensions.h}` : src;
   }
   async list(options) {
+    var _a, _b;
     this.setup();
     if (this.staticMedia) {
       const offset2 = options.offset || 0;
@@ -10852,13 +11106,16 @@ class TinaMediaStore {
           nextOffset: hasMore2 ? Number(offset2) + 20 : null
         };
       }
-      return { items: media, nextOffset: hasMore ? Number(offset2) + 20 : null };
+      return {
+        items: media,
+        nextOffset: hasMore ? Number(offset2) + 20 : null
+      };
     }
     let res;
     if (!this.isLocal) {
       const encodedBranch = this.encodedBranchParam();
       res = await this.api.authProvider.fetchWithToken(
-        `${this.listUrl}/list/${options.directory || ""}?limit=${options.limit || 20}${options.offset ? `&cursor=${options.offset}` : ""}${encodedBranch ? `&branch=${encodedBranch}` : ""}${options.search ? `&search=${encodeURIComponent(options.search)}` : ""}`
+        `${this.listUrl}/list/${options.directory || ""}?limit=${options.limit || 20}${options.offset ? `&cursor=${options.offset}` : ""}${encodedBranch ? `&branch=${encodedBranch}` : ""}${options.search ? `&search=${encodeURIComponent(options.search)}` : ""}${((_a = options.ext) == null ? void 0 : _a.length) ? `&ext=${encodeURIComponent(options.ext.join(","))}` : ""}`
       );
       if (res.status == 401) {
         throw E_UNAUTHORIZED;
@@ -10868,7 +11125,7 @@ class TinaMediaStore {
       }
     } else {
       res = await this.fetchFunction(
-        `${this.url}/list/${options.directory || ""}?limit=${options.limit || 20}${options.offset ? `&cursor=${options.offset}` : ""}${options.search ? `&search=${encodeURIComponent(options.search)}` : ""}`
+        `${this.url}/list/${options.directory || ""}?limit=${options.limit || 20}${options.offset ? `&cursor=${options.offset}` : ""}${options.search ? `&search=${encodeURIComponent(options.search)}` : ""}${((_b = options.ext) == null ? void 0 : _b.length) ? `&ext=${encodeURIComponent(options.ext.join(","))}` : ""}`
       );
       if (res.status == 404) {
         throw E_BAD_ROUTE;
@@ -11113,17 +11370,217 @@ const E_SELF_HOSTED_MEDIA = new MediaListError({
   message: "Self-hosted TinaCMS can't serve media from your repo through TinaCloud. Configure an external media store (e.g. S3, Cloudinary, DigitalOcean Spaces, or Azure) with media.loadCustomStore, or add media to your repo manually.",
   docsLink: "https://tina.io/docs/r/backend-media-handler/"
 });
-class Flags {
+class PluginTypeManager {
   constructor(events) {
-    __publicField(this, "_flags", /* @__PURE__ */ new Map());
+    /**
+     * @ignore
+     */
+    __publicField(this, "plugins", {});
     this.events = events;
   }
-  get(key) {
-    return this._flags.get(key);
+  /**
+   * Gets the [[PluginType|collection of plugins]] for the given type.
+   *
+   * #### Example: Basic Usage
+   *
+   * ```ts
+   * const colorPlugins = cms.plugins.get("color")
+   * ```
+   *
+   * #### Example: Advanced Types
+   *
+   * A type param can be added to specify the kind of Plugin
+   * that is being listed.
+   *
+   * ```ts
+   * const colorPlugins = cms.plugins.get<ColorPlugin>("color")
+   * ```
+   *
+   * @param type The type of plugins to be retrieved
+   * @typeparam P A subclass of Plugin. Optional.
+   */
+  getType(type2) {
+    return this.plugins[type2] = this.plugins[type2] || new PluginType(type2, this.events);
   }
-  set(key, value) {
-    this._flags.set(key, value);
-    this.events.dispatch({ type: "flag:set", key, value });
+  /**
+   * An alias to [[get]]
+   *
+   * ### !DEPRECATED!
+   *
+   * This name is unnecessarily verbose and weird.
+   */
+  findOrCreateMap(type2) {
+    return this.getType(type2);
+  }
+  /**
+   * Adds a Plugin to the CMS.
+   *
+   * #### Example: Basic Usage
+   *
+   * ```js
+   * cms.plugins.add({ __type: "color", name: "red" })
+   * ```
+   *
+   * #### Example: Advanced Types
+   *
+   * ```ts
+   * interface ColorPlugin extends Plugin {
+   *   __type: "color"
+   *   hex: string
+   *   rgb: string
+   * }
+   *
+   * cms.plugins.add<ColorPlugin>({
+   *   __type: "color",
+   *   name: "red",
+   *   hex: "#FF0000",
+   *   rgb: "RGBA(255, 0, 0, 1)"
+   * })
+   * ```
+   *
+   * @typeparam P A subclass of Plugin. Optional.
+   * @param plugin
+   * @todo Consider returning the plugin which was just added.
+   */
+  add(plugin) {
+    this.findOrCreateMap(plugin.__type).add(plugin);
+  }
+  /**
+   * Removes the given plugin from the CMS.
+   *
+   * #### Example
+   *
+   * In this example a plugin is added to the CMS and removed
+   * 5 seconds later.
+   *
+   * ```ts
+   * const redPlugin = {
+   *   __type: "color",
+   *   name: "red",
+   *   hex: "#FF0000",
+   *   rgb: "RGBA(255, 0, 0, 1)"
+   * }
+   *
+   * cms.plugins.add(redPlugin)
+   *
+   * setTimeout(() => {
+   *   cms.plugins.remove(redPlugin)
+   * }, 5000)
+   * ```
+   *
+   * @typeparam P A subclass of Plugin. Optional.
+   * @param plugin The plugin to be removed from the CMS.
+   */
+  remove(plugin) {
+    this.findOrCreateMap(plugin.__type).remove(plugin);
+  }
+  /**
+   * Returns a list of all the plugins of the given type.
+   *
+   * #### Example: Basic Usage
+   *
+   * ```ts
+   * cms.plugins.all("color").forEach(color => {
+   *   console.log(color.name)
+   * })
+   * ```
+   *
+   * #### Example: Advanced Types
+   *
+   * A generic can be added to specify the type of plugins
+   * that are being retrieved.
+   *
+   * ```ts
+   * cms.plugins.all<ColorPlugin>("color").forEach(color => {
+   *   console.log(color.name, color.hex)
+   * })
+   * ```
+   *
+   * @typeparam P A subclass of Plugin. Optional.
+   * @param type The name of the plugin
+   * @returns An array of all plugins of the given type.
+   */
+  all(type2) {
+    return this.findOrCreateMap(type2).all();
+  }
+}
+class PluginType {
+  /**
+   *
+   * @param __type The `__type` of plugin being managed.
+   */
+  constructor(__type, events) {
+    /**
+     * @ignore
+     */
+    __publicField(this, "__plugins", {});
+    this.__type = __type;
+    this.events = events;
+  }
+  /**
+   * Adds a new plugin to the collection.
+   *
+   * ### Example
+   *
+   * ```ts
+   * interface ColorPlugin extends Plugin {
+   *   hex: string
+   * }
+   *
+   * const colorPlugins = new PluginType<ColorPlugin>("color")
+   *
+   * colorPlugins.add({ name: "red", hex: "#f00" })
+   * ```
+   *
+   * @param plugin A new plugin. The `__type` is optional and will be added if it's missing.
+   */
+  add(plugin) {
+    const p = plugin;
+    if (!p.__type) {
+      p.__type = this.__type;
+    }
+    this.__plugins[p.name] = p;
+    this.events.dispatch({ type: `plugin:add:${this.__type}` });
+  }
+  all() {
+    return Object.keys(this.__plugins).map((name2) => this.__plugins[name2]);
+  }
+  /**
+   *
+   * Looks up a plugin by it's `name`.
+   *
+   * ### Example
+   *
+   * ```ts
+   * const colorPlugins = new PluginType<ColorPlugin>("color")
+   *
+   * colorPlugins.add({ name: "red", hex: "#f00" })
+   *
+   * colorPlugins.find("red")  // { __type: "color", name: "red", hex: "#f00" }
+   * colorPlugin.find("large") // undefined
+   * ```
+   *
+   * @param name The `name` of the plugin to be retrieved.
+   */
+  find(name2) {
+    return this.__plugins[name2];
+  }
+  /**
+   * Pass this function a plugin or the `name` of a plugin to have
+   * it be removed from the CMS.
+   *
+   * @param pluginOrName The `name` of a plugin, or the plugin itself.
+   * @returns The plugin that was removed, or `undefined` if it was not found.
+   */
+  remove(pluginOrName) {
+    const name2 = typeof pluginOrName === "string" ? pluginOrName : pluginOrName.name;
+    const plugin = this.__plugins[name2];
+    delete this.__plugins[name2];
+    this.events.dispatch({ type: `plugin:remove:${this.__type}` });
+    return plugin;
+  }
+  subscribe(cb) {
+    return this.events.subscribe(`plugin:*:${this.__type}`, cb);
   }
 }
 const _CMS = class _CMS {
@@ -11236,14 +11693,28 @@ const _CMS = class _CMS {
       this.unsubscribeHooks[name2]();
     }
     if (api.events instanceof EventBus) {
-      const unsubscribeHost = api.events.subscribe(
-        "*",
-        this.events.dispatch
-      );
-      const unsubscribeGuest = this.events.subscribe(
-        "*",
-        (e) => api.events.dispatch(e)
-      );
+      let forwardingToCms = null;
+      let forwardingToApi = null;
+      const unsubscribeHost = api.events.subscribe("*", (e) => {
+        if (e === forwardingToApi) return;
+        const previous = forwardingToCms;
+        forwardingToCms = e;
+        try {
+          this.events.dispatch(e);
+        } finally {
+          forwardingToCms = previous;
+        }
+      });
+      const unsubscribeGuest = this.events.subscribe("*", (e) => {
+        if (e === forwardingToCms) return;
+        const previous = forwardingToApi;
+        forwardingToApi = e;
+        try {
+          api.events.dispatch(e);
+        } finally {
+          forwardingToApi = previous;
+        }
+      });
       this.unsubscribeHooks[name2] = () => {
         unsubscribeHost();
         unsubscribeGuest();
@@ -11580,13 +12051,16 @@ const RenameModal$1 = ({
       variant: "primary",
       disabled: !canSubmit,
       onClick: async () => {
-        if (!canSubmit) return;
         setProcessing(true);
         setError(null);
         try {
           await renameFunc(sanitized);
           close2();
         } catch (e) {
+          if ((e == null ? void 0 : e.ERR_TYPE) === "MediaRenameCancelled") {
+            close2();
+            return;
+          }
           setError(renameErrorMessage(e, sanitized));
           setProcessing(false);
         }
@@ -11696,6 +12170,7 @@ function MediaPicker({
   allowDelete,
   onSelect,
   close: close2,
+  accept: fieldAccept,
   ...props
 }) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
@@ -11732,6 +12207,7 @@ function MediaPicker({
   const [mediaFilter, setMediaFilter] = useState(
     "all"
   );
+  const [typeFilter, setTypeFilter] = useState("all");
   const [offsetHistory, setOffsetHistory] = useState([]);
   const offset2 = offsetHistory[offsetHistory.length - 1];
   const resetOffset = () => setOffsetHistory([]);
@@ -11744,8 +12220,25 @@ function MediaPicker({
     resetList();
     setActiveItem(false);
   };
+  const changeTypeFilter = (next) => {
+    if (next === typeFilter) return;
+    setTypeFilter(next);
+    setLoadFolders(true);
+    resetOffset();
+    resetList();
+    setActiveItem(false);
+  };
   const listRequestRef = useRef(0);
   const newMediaSrcsRef = useRef(/* @__PURE__ */ new Set());
+  const fieldExtensions = React__default.useMemo(
+    () => resolveMediaAccept(fieldAccept),
+    [fieldAccept]
+  );
+  const acceptedExtensions = React__default.useMemo(() => {
+    if (!cms.media.store.extensionFilterable) return [];
+    if (fieldExtensions.length) return fieldExtensions;
+    return typeFilter === "all" ? [] : resolveMediaAccept(typeFilter);
+  }, [fieldExtensions, typeFilter, cms.media.store.extensionFilterable]);
   async function loadMedia(loadFolders2 = true) {
     const requestId = ++listRequestRef.current;
     setListState("loading");
@@ -11760,7 +12253,8 @@ function MediaPicker({
           { w: 1e3, h: 1e3 }
         ],
         filesOnly: !loadFolders2,
-        search: debouncedSearch || void 0
+        search: debouncedSearch || void 0,
+        ext: acceptedExtensions.length ? acceptedExtensions : void 0
       });
       if (requestId !== listRequestRef.current) return;
       setList((prev) => {
@@ -11803,9 +12297,6 @@ function MediaPicker({
   }, [refreshing]);
   useEffect(() => {
     if (!cms.media.isConfigured) return;
-    if (refreshing) return;
-    loadMedia(loadFolders);
-    if (loadFolders) setLoadFolders(false);
     return cms.events.subscribe(
       ["media:delete:success", "media:rename:success", "media:pageSize"],
       (event) => {
@@ -11819,7 +12310,19 @@ function MediaPicker({
         resetList();
       }
     );
-  }, [offset2, directory, debouncedSearch, cms.media.isConfigured]);
+  }, [cms.media.isConfigured]);
+  useEffect(() => {
+    if (!cms.media.isConfigured) return;
+    if (refreshing) return;
+    loadMedia(loadFolders);
+    if (loadFolders) setLoadFolders(false);
+  }, [
+    offset2,
+    directory,
+    debouncedSearch,
+    acceptedExtensions,
+    cms.media.isConfigured
+  ]);
   const onClickMediaItem = (item) => {
     if (!item) {
       setActiveItem(false);
@@ -11853,12 +12356,12 @@ function MediaPicker({
     };
   }
   const [uploading, setUploading] = useState(false);
-  const accept = Array.isArray(
+  const globalAccept = Array.isArray(
     (_c = (_b = (_a = cms.api.tina.schema.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.media) == null ? void 0 : _c.accept
   ) ? (_f = (_e = (_d = cms.api.tina.schema.schema) == null ? void 0 : _d.config) == null ? void 0 : _e.media) == null ? void 0 : _f.accept.join(",") : (_i = (_h = (_g = cms.api.tina.schema.schema) == null ? void 0 : _g.config) == null ? void 0 : _h.media) == null ? void 0 : _i.accept;
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    accept: dropzoneAcceptFromString(
-      accept || cms.media.accept || DEFAULT_MEDIA_UPLOAD_TYPES
+    accept: dropzoneAcceptFromExtensions(fieldExtensions) ?? dropzoneAcceptFromString(
+      globalAccept || cms.media.accept || DEFAULT_MEDIA_UPLOAD_TYPES
     ),
     maxSize: cms.media.maxSize,
     multiple: true,
@@ -12075,7 +12578,15 @@ function MediaPicker({
       setValue: setSearch,
       clear: () => setSearch("")
     }
-  ), /* @__PURE__ */ React__default.createElement("div", { className: "ml-auto" }, /* @__PURE__ */ React__default.createElement(
+  ), /* @__PURE__ */ React__default.createElement("div", { className: "ml-auto flex items-center gap-3" }, cms.media.store.extensionFilterable && /* @__PURE__ */ React__default.createElement(
+    MediaTypeFilter,
+    {
+      value: typeFilter,
+      setValue: changeTypeFilter,
+      lockedTo: fieldAccept,
+      lockedExtensions: fieldExtensions
+    }
+  ), /* @__PURE__ */ React__default.createElement(
     MediaFilterToggle,
     {
       value: mediaFilter,
@@ -12340,6 +12851,62 @@ const MediaFilterToggle = ({
     option.label
   )));
 };
+const TYPE_FILTER_LABELS = {
+  image: "Images",
+  video: "Video",
+  audio: "Audio",
+  document: "Documents"
+};
+const acceptEntryLabel = (entry) => entry in MEDIA_CATEGORIES ? TYPE_FILTER_LABELS[entry] : entry.toUpperCase();
+const MediaTypeFilter = ({
+  value,
+  setValue,
+  lockedTo,
+  lockedExtensions
+}) => {
+  if (lockedExtensions.length) {
+    const entries = Array.isArray(lockedTo) ? lockedTo : [lockedTo];
+    const label = entries.length > 3 ? `${entries.length} types only` : `${entries.map(acceptEntryLabel).join(", ")} only`;
+    const description = `This field accepts ${lockedExtensions.join(", ")}`;
+    return /* @__PURE__ */ React__default.createElement(
+      "span",
+      {
+        className: "grow-0 flex items-center gap-1.5 whitespace-nowrap rounded-lg border border-dashed border-gray-200 bg-gray-100 px-3 py-1.5 text-sm text-gray-500",
+        title: description
+      },
+      /* @__PURE__ */ React__default.createElement(Lock, { className: "w-3.5 h-3.5 opacity-80", "aria-hidden": "true" }),
+      label,
+      /* @__PURE__ */ React__default.createElement("span", { className: "sr-only" }, description)
+    );
+  }
+  const active = value !== "all";
+  return /* @__PURE__ */ React__default.createElement(DropdownMenu, null, /* @__PURE__ */ React__default.createElement(DropdownMenuTrigger, { asChild: true }, /* @__PURE__ */ React__default.createElement(
+    "button",
+    {
+      type: "button",
+      className: `grow-0 flex items-center gap-2 whitespace-nowrap rounded-lg border bg-white px-3 py-1.5 text-sm transition-colors ease-out duration-150 ${active ? "border-tina-orange text-tina-orange font-medium" : "border-gray-200 text-gray-700 hover:border-gray-300"}`
+    },
+    active ? TYPE_FILTER_LABELS[value] : "Any type",
+    /* @__PURE__ */ React__default.createElement(
+      ChevronDown,
+      {
+        className: `w-4 h-4 ${active ? "opacity-90" : "text-gray-400"}`
+      }
+    )
+  )), /* @__PURE__ */ React__default.createElement(DropdownMenuContent, { align: "end", className: "min-w-52" }, /* @__PURE__ */ React__default.createElement(
+    DropdownMenuRadioGroup,
+    {
+      value,
+      onValueChange: (next) => setValue(next)
+    },
+    /* @__PURE__ */ React__default.createElement(DropdownMenuRadioItem, { value: "all" }, "Any type"),
+    /* @__PURE__ */ React__default.createElement(DropdownMenuSeparator, null),
+    /* @__PURE__ */ React__default.createElement(DropdownMenuLabel, null, "Category"),
+    Object.keys(MEDIA_CATEGORIES).map(
+      (category) => /* @__PURE__ */ React__default.createElement(DropdownMenuRadioItem, { key: category, value: category }, TYPE_FILTER_LABELS[category])
+    )
+  )));
+};
 const ViewModeToggle = ({ viewMode, setViewMode }) => {
   const base = "relative flex items-center justify-center w-9 py-1.5 transition-colors ease-out duration-150";
   const active = "bg-white text-tina-orange";
@@ -13591,7 +14158,7 @@ const FormModal = ({ plugin, close: close2 }) => {
 const name = "tinacms";
 const type = "module";
 const typings = "dist/index.d.ts";
-const version = "3.12.0";
+const version = "3.13.0";
 const main = "dist/index.js";
 const module$1 = "./dist/index.js";
 const exports$1 = { ".": "./dist/index.js", "./dist/client": "./dist/client.js", "./react": "./dist/react.js", "./dist/react": "./dist/react.js", "./tina-field": "./dist/tina-field.js", "./dist/tina-field": "./dist/tina-field.js", "./dist/rich-text": "./dist/rich-text/index.js", "./dist/rich-text/static": "./dist/rich-text/static.js", "./dist/rich-text/prism": "./dist/rich-text/prism.js" };
@@ -13599,8 +14166,8 @@ const files = ["dist"];
 const buildConfig = { "entryPoints": ["src/index.ts", "src/rich-text/index.tsx", "src/rich-text/static.tsx", "src/rich-text/prism.tsx", "src/react.tsx", "src/tina-field.ts", { "name": "src/client.ts", "target": "node" }] };
 const license = "Apache-2.0";
 const scripts = { "types": "pnpm tsc && pnpm tsc-alias", "build": "tinacms-scripts build", "test": "vitest run", "test-watch": "vitest" };
-const dependencies = { "@ariakit/react": "catalog:", "@dnd-kit/core": "catalog:", "@dnd-kit/sortable": "catalog:", "@dnd-kit/utilities": "catalog:", "@floating-ui/dom": "catalog:", "@floating-ui/react-dom": "catalog:", "@graphql-inspector/core": "^6.2.1", "@radix-ui/react-dialog": "catalog:", "@radix-ui/react-dropdown-menu": "catalog:", "@radix-ui/react-popover": "catalog:", "@radix-ui/react-select": "catalog:", "@radix-ui/react-separator": "catalog:", "@radix-ui/react-slot": "catalog:", "@radix-ui/react-toolbar": "catalog:", "@radix-ui/react-tooltip": "catalog:", "@react-hook/window-size": "catalog:", "@tanstack/react-table": "^8.21.3", "@tinacms/bridge": "workspace:^", "@tinacms/mdx": "workspace:^", "@tinacms/schema-tools": "workspace:^", "@tinacms/search": "workspace:^", "@udecode/cmdk": "catalog:", "@udecode/cn": "catalog:", "@udecode/plate": "catalog:", "@udecode/plate-autoformat": "catalog:", "@udecode/plate-basic-marks": "catalog:", "@udecode/plate-block-quote": "catalog:", "@udecode/plate-break": "catalog:", "@udecode/plate-code-block": "catalog:", "@udecode/plate-combobox": "catalog:", "@udecode/plate-dnd": "catalog:", "@udecode/plate-floating": "catalog:", "@udecode/plate-heading": "catalog:", "@udecode/plate-highlight": "catalog:", "@udecode/plate-horizontal-rule": "catalog:", "@udecode/plate-indent-list": "catalog:", "@udecode/plate-link": "catalog:", "@udecode/plate-list": "catalog:", "@udecode/plate-node-id": "catalog:", "@udecode/plate-reset-node": "catalog:", "@udecode/plate-resizable": "catalog:", "@udecode/plate-selection": "catalog:", "@udecode/plate-slash-command": "catalog:", "@udecode/plate-table": "catalog:", "@udecode/plate-trailing-block": "catalog:", "class-variance-authority": "catalog:", "clsx": "catalog:", "cmdk": "catalog:", "color-string": "catalog:", "crypto-js": "catalog:", "date-fns": "4.1.0", "es-toolkit": "^1.42.0", "final-form": "catalog:", "final-form-arrays": "catalog:", "final-form-set-field-data": "catalog:", "graphql": "15.8.0", "graphql-tag": "catalog:", "is-hotkey": "catalog:", "lucide-react": "catalog:", "mermaid": "catalog:", "posthog-js": "^1.347.1", "prism-react-renderer": "catalog:", "prop-types": "catalog:", "react-colorful": "catalog:", "react-day-picker": "^9.13.0", "react-dnd": "catalog:", "react-dnd-html5-backend": "catalog:", "react-dropzone": "catalog:", "react-final-form": "catalog:", "react-router-dom": "catalog:", "react-use": "catalog:", "tailwind-merge": "^2.6.0", "webfontloader": "catalog:", "yup": "^1.6.1", "zod": "catalog:" };
-const devDependencies = { "@graphql-tools/utils": "catalog:", "@testing-library/dom": "catalog:", "@testing-library/jest-dom": "catalog:", "@testing-library/react": "catalog:", "@testing-library/user-event": "catalog:", "@tinacms/scripts": "workspace:*", "@types/atob": "catalog:", "@types/codemirror": "catalog:", "@types/color-string": "catalog:", "@types/node": "^22.13.1", "@types/prop-types": "catalog:", "@types/react": "^18.3.18", "@types/react-dom": "catalog:", "happy-dom": "catalog:", "identity-obj-proxy": "catalog:", "jest-file-snapshot": "^0.7.0", "lowlight": "catalog:", "next": "14.2.35", "react": "^18.3.1", "react-dom": "^18.3.1", "react-is": "^18.3.1", "tsc-alias": "catalog:", "tslib": "catalog:", "typescript": "^5.7.3", "vite": "^5.4.14", "vitest": "^2.1.9" };
+const dependencies = { "@ariakit/react": "catalog:", "@dnd-kit/core": "catalog:", "@dnd-kit/sortable": "catalog:", "@dnd-kit/utilities": "catalog:", "@floating-ui/dom": "catalog:", "@floating-ui/react-dom": "catalog:", "@graphql-inspector/core": "^6.2.1", "@radix-ui/react-dialog": "catalog:", "@radix-ui/react-dropdown-menu": "catalog:", "@radix-ui/react-popover": "catalog:", "@radix-ui/react-select": "catalog:", "@radix-ui/react-separator": "catalog:", "@radix-ui/react-slot": "catalog:", "@radix-ui/react-toolbar": "catalog:", "@radix-ui/react-tooltip": "catalog:", "@react-hook/window-size": "catalog:", "@tanstack/react-table": "^8.21.3", "@tinacms/bridge": "workspace:^", "@tinacms/mdx": "workspace:^", "@tinacms/schema-tools": "workspace:^", "@tinacms/search": "workspace:^", "@udecode/cmdk": "catalog:", "@udecode/cn": "catalog:", "@udecode/plate": "catalog:", "@udecode/plate-autoformat": "catalog:", "@udecode/plate-basic-marks": "catalog:", "@udecode/plate-block-quote": "catalog:", "@udecode/plate-break": "catalog:", "@udecode/plate-code-block": "catalog:", "@udecode/plate-combobox": "catalog:", "@udecode/plate-dnd": "catalog:", "@udecode/plate-floating": "catalog:", "@udecode/plate-heading": "catalog:", "@udecode/plate-highlight": "catalog:", "@udecode/plate-horizontal-rule": "catalog:", "@udecode/plate-indent-list": "catalog:", "@udecode/plate-link": "catalog:", "@udecode/plate-list": "catalog:", "@udecode/plate-node-id": "catalog:", "@udecode/plate-reset-node": "catalog:", "@udecode/plate-resizable": "catalog:", "@udecode/plate-selection": "catalog:", "@udecode/plate-slash-command": "catalog:", "@udecode/plate-table": "catalog:", "@udecode/plate-trailing-block": "catalog:", "class-variance-authority": "catalog:", "clsx": "catalog:", "cmdk": "catalog:", "color-string": "catalog:", "date-fns": "4.1.0", "es-toolkit": "^1.42.0", "final-form": "catalog:", "final-form-arrays": "catalog:", "final-form-set-field-data": "catalog:", "graphql": "15.8.0", "graphql-tag": "catalog:", "is-hotkey": "catalog:", "lucide-react": "catalog:", "mermaid": "catalog:", "posthog-js": "^1.347.1", "prism-react-renderer": "catalog:", "prop-types": "catalog:", "react-colorful": "catalog:", "react-day-picker": "^9.13.0", "react-dnd": "catalog:", "react-dnd-html5-backend": "catalog:", "react-dropzone": "catalog:", "react-final-form": "catalog:", "react-router-dom": "catalog:", "react-use": "catalog:", "tailwind-merge": "^2.6.0", "webfontloader": "catalog:", "yup": "^1.6.1", "zod": "catalog:" };
+const devDependencies = { "@graphql-tools/utils": "catalog:", "@testing-library/dom": "catalog:", "@testing-library/jest-dom": "catalog:", "@testing-library/react": "catalog:", "@testing-library/user-event": "catalog:", "@tinacms/scripts": "workspace:*", "@types/atob": "catalog:", "@types/codemirror": "catalog:", "@types/color-string": "catalog:", "@types/node": "^22.13.1", "@types/prop-types": "catalog:", "@types/react": "^18.3.18", "@types/react-dom": "catalog:", "happy-dom": "catalog:", "identity-obj-proxy": "catalog:", "jest-file-snapshot": "^0.7.0", "lowlight": "catalog:", "next": "15.5.21", "react": "^18.3.1", "react-dom": "^18.3.1", "react-is": "^18.3.1", "tsc-alias": "catalog:", "tslib": "catalog:", "typescript": "^5.7.3", "vite": "^5.4.14", "vitest": "^2.1.9" };
 const peerDependencies = { "react": ">=16.14.0", "react-dom": ">=16.14.0" };
 const publishConfig = { "registry": "https://registry.npmjs.org" };
 const repository = { "url": "https://github.com/tinacms/tinacms.git", "directory": "packages/tinacms" };
@@ -13699,7 +14266,11 @@ const useGetEvents = (cms, cursor, existingEvents) => {
       var _a, _b, _c, _d, _e;
       let doFetchEvents = false;
       if (!((_b = (_a = cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isCustomContentApi)) {
-        doFetchEvents = await ((_e = (_d = (_c = cms.api) == null ? void 0 : _c.tina) == null ? void 0 : _d.authProvider) == null ? void 0 : _e.isAuthenticated());
+        try {
+          doFetchEvents = await ((_e = (_d = (_c = cms.api) == null ? void 0 : _c.tina) == null ? void 0 : _d.authProvider) == null ? void 0 : _e.isAuthenticated());
+        } catch {
+          doFetchEvents = false;
+        }
       }
       if (doFetchEvents) {
         try {
@@ -13732,7 +14303,11 @@ function useSyncStatus(cms) {
       var _a2, _b2, _c, _d, _e;
       let doFetchEvents = false;
       if (!((_b2 = (_a2 = cms.api) == null ? void 0 : _a2.tina) == null ? void 0 : _b2.isCustomContentApi)) {
-        doFetchEvents = await ((_e = (_d = (_c = cms.api) == null ? void 0 : _c.tina) == null ? void 0 : _d.authProvider) == null ? void 0 : _e.isAuthenticated());
+        try {
+          doFetchEvents = await ((_e = (_d = (_c = cms.api) == null ? void 0 : _c.tina) == null ? void 0 : _d.authProvider) == null ? void 0 : _e.isAuthenticated());
+        } catch {
+          doFetchEvents = false;
+        }
       }
       if (doFetchEvents) {
         const { events } = await cms.api.tina.fetchEvents();
@@ -16256,34 +16831,6 @@ const BranchPreviewButton = (props) => {
     /* @__PURE__ */ React.createElement(ExternalLink, { className: "h-5 w-auto" })
   );
 };
-function useLocalStorage(key, initialValue) {
-  const [storedValue, setStoredValue] = React.useState(() => {
-    try {
-      const valueFromStorage = typeof window !== "undefined" && window.localStorage && window.localStorage.getItem(key);
-      if (valueFromStorage != null) {
-        return JSON.parse(valueFromStorage);
-      }
-    } catch (error) {
-    }
-    return initialValue;
-  });
-  React.useEffect(() => {
-    const valueFromStorage = window.localStorage && window.localStorage.getItem(key);
-    if (valueFromStorage != null && valueFromStorage != void 0) {
-      setStoredValue(JSON.parse(valueFromStorage));
-    }
-  }, [key]);
-  const setValue = (value) => {
-    try {
-      const valueToStore = value instanceof Function ? value(storedValue) : value;
-      setStoredValue(valueToStore);
-      localStorage.setItem(key, JSON.stringify(valueToStore));
-    } catch (error) {
-      console.log(error);
-    }
-  };
-  return [storedValue, setValue];
-}
 const CREATE_DOCUMENT_GQL = `#graphql
 mutation($collection: String!, $relativePath: String!, $params: DocumentMutation!) {
   createDocument(
@@ -16923,22 +17470,6 @@ const resolveSaveOptions = (lastChoice, disablePublish) => {
   const menu = SAVE_CHOICE_ORDER.filter((choice) => choice !== main2);
   return { main: main2, menu };
 };
-const formatDefaultBranchName = (filePath, crudType) => {
-  let result = filePath;
-  const contentPrefix = "content/";
-  if (result.startsWith(contentPrefix)) {
-    result = result.substring(contentPrefix.length);
-  }
-  const lastDot = result.lastIndexOf(".");
-  const lastSlash = Math.max(result.lastIndexOf("/"), result.lastIndexOf("\\"));
-  if (lastDot > lastSlash && lastDot > 0) {
-    result = result.slice(0, lastDot);
-  }
-  if (crudType === "delete") {
-    result = `❌-${result}`;
-  }
-  return result;
-};
 const CreateBranchModal = ({
   close: close2,
   safeSubmit,
@@ -16954,6 +17485,7 @@ const CreateBranchModal = ({
     formatDefaultBranchName(path, crudType)
   );
   const [isBranchGuardChecking, setIsBranchGuardChecking] = React.useState(false);
+  const normalizedBranchName = normalizeBranchName(newBranchName);
   const branchGuardAbortRef = React.useRef(null);
   const {
     isExecuting,
@@ -16981,7 +17513,7 @@ const CreateBranchModal = ({
     branchGuardAbortRef.current = abortController;
     setIsBranchGuardChecking(true);
     const baseBranch = decodeURIComponent(tinaApi.branch);
-    const targetBranch = `tina/${newBranchName}`;
+    const targetBranch = `tina/${normalizedBranchName}`;
     const { baseBranchExists, targetBranchExists } = await checkBranchGuard(
       tinaApi,
       baseBranch,
@@ -17042,7 +17574,7 @@ const CreateBranchModal = ({
         close2();
       },
       errorMessage,
-      disabled: newBranchName === "" || isBranchGuardChecking,
+      disabled: normalizedBranchName === "" || isBranchGuardChecking,
       onBranchNameChange: (value) => {
         abortBranchGuard();
         reset();
@@ -17059,6 +17591,35 @@ const CreateBranchModal = ({
     }
   );
 };
+const getInitials = (name2) => {
+  const atIndex = name2.indexOf("@");
+  const localPart = atIndex === -1 ? name2 : name2.slice(0, atIndex);
+  return localPart.split(/[\s._-]+/).filter(Boolean).slice(0, 2).map((part) => [...part][0].toUpperCase()).join("");
+};
+const CommittingAs = () => {
+  var _a, _b, _c;
+  const cms = useCMS$1();
+  const user = (_b = (_a = cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.user;
+  const author = typeof user === "object" && user !== null ? user : void 0;
+  const mode = (_c = author == null ? void 0 : author.gitAuthoring) == null ? void 0 : _c.mode;
+  if (mode !== "bot" && mode !== "user") {
+    return null;
+  }
+  const authorName = mode === "bot" ? "TinaCloud bot" : author.fullName || author.email;
+  if (!authorName) {
+    return null;
+  }
+  return /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-3 mt-4 pt-4 border-t border-gray-100" }, /* @__PURE__ */ React.createElement("span", { className: "flex items-center justify-center w-8 h-8 rounded-full bg-gray-100 text-gray-600 text-xs font-medium flex-shrink-0" }, getInitials(authorName)), /* @__PURE__ */ React.createElement("div", { className: "flex-1 min-w-0" }, /* @__PURE__ */ React.createElement("p", { className: "text-xs text-gray-500" }, "Committing as"), /* @__PURE__ */ React.createElement("p", { className: "text-sm text-gray-700 font-medium truncate" }, authorName)), /* @__PURE__ */ React.createElement(
+    "a",
+    {
+      className: "text-sm underline text-tina-orange-dark font-medium flex-shrink-0",
+      href: cms.api.tina.gitSettingsLink,
+      target: "_blank",
+      rel: "noreferrer"
+    },
+    "Change"
+  ));
+};
 const CreateBranchPromptModal = ({
   branchName,
   close: close2,
@@ -17068,7 +17629,8 @@ const CreateBranchPromptModal = ({
   onCreateBranch,
   onSaveToProtectedBranch,
   showSaveOptions = false,
-  disablePublish = false
+  disablePublish = false,
+  allowSaveToProtectedBranch = true
 }) => {
   const [lastChoice, setLastChoice] = useLocalStorage(
     SAVE_CHOICE_KEY,
@@ -17115,7 +17677,7 @@ const CreateBranchPromptModal = ({
         onBranchNameChange(e.target.value);
       }
     }
-  ))), /* @__PURE__ */ React.createElement(ModalActions, { align: "end" }, /* @__PURE__ */ React.createElement(
+  ), /* @__PURE__ */ React.createElement(CommittingAs, null))), /* @__PURE__ */ React.createElement(ModalActions, { align: "end" }, /* @__PURE__ */ React.createElement(
     Button$2,
     {
       variant: "secondary",
@@ -17148,7 +17710,7 @@ const CreateBranchPromptModal = ({
     },
     /* @__PURE__ */ React.createElement(MainIcon, { className: "w-4 h-4 mr-1", style: { fill: "none" } }),
     mainChoice.label
-  ) : /* @__PURE__ */ React.createElement(
+  ) : allowSaveToProtectedBranch ? /* @__PURE__ */ React.createElement(
     DropdownButton,
     {
       variant: "primary",
@@ -17172,6 +17734,25 @@ const CreateBranchPromptModal = ({
       }
     ),
     "Save to a new branch"
+  ) : (
+    // A plain button: the dropdown's only item is the one being dropped.
+    /* @__PURE__ */ React.createElement(
+      Button$2,
+      {
+        variant: "primary",
+        className: "w-full sm:w-auto",
+        disabled,
+        onClick: () => onCreateBranch(false)
+      },
+      /* @__PURE__ */ React.createElement(
+        GitBranchIcon,
+        {
+          className: "w-4 h-4 mr-1",
+          style: { fill: "none" }
+        }
+      ),
+      "Save to a new branch"
+    )
   ))));
 };
 const PrefixedTextField = ({
@@ -17200,6 +17781,7 @@ const BranchDeletedModal = ({
   const cms = useCMS$1();
   const tinaApi = cms.api.tina;
   const [newBranchName, setNewBranchName] = React.useState("");
+  const normalizedBranchName = normalizeBranchName(newBranchName);
   const baseBranch = tinaApi.protectedBranches[0] || cms.api.tina.schema.config.config.repoProvider.defaultBranchName || "main";
   const {
     isExecuting,
@@ -17211,7 +17793,7 @@ const BranchDeletedModal = ({
   } = useEditorialWorkflow();
   const handleCreate = async () => {
     const { success } = await executeWorkflow({
-      branchName: `tina/${newBranchName}`,
+      branchName: `tina/${normalizedBranchName}`,
       baseBranch,
       path,
       values,
@@ -17258,7 +17840,7 @@ const BranchDeletedModal = ({
     {
       variant: "primary",
       className: "w-full sm:w-auto",
-      disabled: !newBranchName,
+      disabled: !normalizedBranchName,
       onClick: handleCreate
     },
     /* @__PURE__ */ React.createElement(
@@ -17523,6 +18105,10 @@ const FormBuilder = ({
               setDeletedBranchModalOpen(true);
               return;
             }
+            if (isSessionExpiredError(error)) {
+              captureWorkflowChoice(false, errorMsg);
+              return;
+            }
             captureEvent(SaveContentErrorEvent, {
               documentPath: tinaForm.path,
               error: errorMsg
@@ -18623,7 +19209,7 @@ function HeadingsMenu(props) {
       className: "min-w-0 rounded-none rounded-bl rounded-br border-border"
     },
     /* @__PURE__ */ React__default.createElement(
-      DropdownMenuRadioGroup,
+      DropdownMenuRadioGroup$1,
       {
         className: "flex flex-col gap-0.5",
         onValueChange: (type2) => {
@@ -18639,7 +19225,7 @@ function HeadingsMenu(props) {
         }
         return true;
       }).map(({ icon: Icon, label, value: itemValue }) => /* @__PURE__ */ React__default.createElement(
-        DropdownMenuRadioItem,
+        DropdownMenuRadioItem$1,
         {
           className: "min-w-[180px]",
           key: itemValue,
@@ -19395,549 +19981,6 @@ const useCreateEditor = ({
     components
   });
 };
-const popoverVariants = cva(
-  "z-[999999] w-auto rounded-md border bg-popover p-1 text-popover-foreground shadow-md outline-hidden"
-);
-const inputVariants = cva(
-  "flex h-[28px] w-full rounded-md border-none bg-transparent px-1.5 py-1 text-base placeholder:text-muted-foreground focus-visible:ring-transparent focus-visible:outline-none md:text-sm"
-);
-function LinkFloatingToolbar({
-  state
-}) {
-  const activeCommentId = usePluginOption({ key: "comment" }, "activeId");
-  const activeSuggestionId = usePluginOption({ key: "suggestion" }, "activeId");
-  const { api, editor } = useEditorPlugin(LinkPlugin);
-  const isUrlValidator = usePluginOption(LinkPlugin, "isUrl");
-  const [currentUrl, setCurrentUrl] = React.useState("");
-  const [isValidUrl, setIsValidUrl] = React.useState(true);
-  const handleUrlInput = React.useCallback(
-    (e) => {
-      const value = e.currentTarget.value;
-      setCurrentUrl(value);
-      if (value && isUrlValidator) {
-        const valid = isUrlValidator(value);
-        setIsValidUrl(valid);
-      } else {
-        setIsValidUrl(true);
-      }
-    },
-    [isUrlValidator]
-  );
-  const floatingOptions = React.useMemo(() => {
-    return {
-      middleware: [
-        offset(8),
-        flip({
-          fallbackPlacements: ["bottom-end", "top-start", "top-end"],
-          padding: 12
-        }),
-        shift({ padding: 8, limiter: limitShift() })
-      ],
-      placement: activeSuggestionId || activeCommentId ? "top-start" : "bottom-start"
-    };
-  }, [activeCommentId, activeSuggestionId]);
-  const insertState = useFloatingLinkInsertState({
-    ...state,
-    floatingOptions: {
-      ...floatingOptions,
-      ...state == null ? void 0 : state.floatingOptions
-    }
-  });
-  const {
-    hidden,
-    props: insertProps,
-    ref: insertRef,
-    textInputProps
-  } = useFloatingLinkInsert(insertState);
-  const editState = useFloatingLinkEditState({
-    ...state,
-    floatingOptions: {
-      ...floatingOptions,
-      ...state == null ? void 0 : state.floatingOptions
-    }
-  });
-  const {
-    editButtonProps,
-    props: editProps,
-    ref: editRef,
-    unlinkButtonProps
-  } = useFloatingLinkEdit(editState);
-  const inputProps = useFormInputProps({
-    preventDefaultOnEnterKeydown: true
-  });
-  if (hidden) return null;
-  const input = /* @__PURE__ */ React.createElement(
-    "div",
-    {
-      className: "z-[999999] flex w-[330px] flex-col relative",
-      ...inputProps
-    },
-    !isValidUrl && currentUrl && /* @__PURE__ */ React.createElement("div", { className: "absolute -top-16 left-0 right-0 z-[1000000] mb-2" }, /* @__PURE__ */ React.createElement(
-      "div",
-      {
-        className: "bg-red-50 border border-red-200 rounded-md p-2 shadow-lg",
-        role: "alert",
-        "aria-live": "polite"
-      },
-      /* @__PURE__ */ React.createElement("div", { className: "flex items-center" }, /* @__PURE__ */ React.createElement(CircleX, { className: "size-4 text-red-500 mr-2 flex-shrink-0" }), /* @__PURE__ */ React.createElement("span", { className: "text-sm text-red-700 text-wrap" }, "Invalid URL. Please prefix link with https:// or use a relative path like /about")),
-      /* @__PURE__ */ React.createElement("div", { className: "absolute -bottom-1 left-4 w-2 h-2 bg-red-50 border-r border-b border-red-200 transform rotate-45" })
-    )),
-    /* @__PURE__ */ React.createElement("div", { className: "flex items-center" }, /* @__PURE__ */ React.createElement("div", { className: "flex items-center pr-1 pl-2 text-muted-foreground" }, /* @__PURE__ */ React.createElement(Link, { className: "size-4" })), /* @__PURE__ */ React.createElement(
-      FloatingLinkUrlInput,
-      {
-        className: inputVariants(),
-        placeholder: "Paste link",
-        "data-plate-focus": true,
-        onInput: handleUrlInput
-      }
-    )),
-    /* @__PURE__ */ React.createElement(Separator, { className: "my-1" }),
-    /* @__PURE__ */ React.createElement("div", { className: "flex items-center" }, /* @__PURE__ */ React.createElement("div", { className: "flex items-center pr-1 pl-2 text-muted-foreground" }, /* @__PURE__ */ React.createElement(Text, { className: "size-4" })), /* @__PURE__ */ React.createElement(
-      "input",
-      {
-        className: inputVariants(),
-        placeholder: "Text to display",
-        "data-plate-focus": true,
-        ...textInputProps
-      }
-    )),
-    /* @__PURE__ */ React.createElement(Separator, { className: "my-1" }),
-    /* @__PURE__ */ React.createElement("div", { className: "flex items-center justify-end gap-2 px-2 py-1" }, /* @__PURE__ */ React.createElement(
-      "button",
-      {
-        type: "button",
-        className: buttonVariants$2({ size: "sm", variant: "ghost" }),
-        onClick: () => {
-          api.floatingLink.hide();
-        }
-      },
-      "Cancel"
-    ), /* @__PURE__ */ React.createElement(
-      "button",
-      {
-        type: "button",
-        className: buttonVariants$2({
-          size: "sm",
-          variant: "tinaPrimary"
-        }),
-        onClick: () => {
-          if (isValidUrl && currentUrl) {
-            submitFloatingLink(editor);
-          }
-        },
-        disabled: !isValidUrl && !!currentUrl
-      },
-      "OK"
-    ))
-  );
-  const editContent = editState.isEditing ? input : /* @__PURE__ */ React.createElement("div", { className: "box-content flex items-center" }, /* @__PURE__ */ React.createElement(
-    "button",
-    {
-      className: buttonVariants$2({ size: "sm", variant: "ghost" }),
-      type: "button",
-      ...editButtonProps
-    },
-    "Edit link"
-  ), /* @__PURE__ */ React.createElement(Separator, { orientation: "vertical" }), /* @__PURE__ */ React.createElement(LinkOpenButton, null), /* @__PURE__ */ React.createElement(Separator, { orientation: "vertical" }), /* @__PURE__ */ React.createElement(
-    "button",
-    {
-      className: buttonVariants$2({
-        size: "icon",
-        variant: "ghost"
-      }),
-      type: "button",
-      ...unlinkButtonProps
-    },
-    /* @__PURE__ */ React.createElement(Unlink, { width: 18 })
-  ));
-  return /* @__PURE__ */ React.createElement(PortalBody, null, /* @__PURE__ */ React.createElement(
-    "div",
-    {
-      ref: insertRef,
-      className: popoverVariants(),
-      ...insertProps,
-      style: {
-        ...insertProps.style,
-        zIndex: 999999
-      }
-    },
-    input
-  ), /* @__PURE__ */ React.createElement(
-    "div",
-    {
-      ref: editRef,
-      className: popoverVariants(),
-      ...editProps,
-      style: { ...editProps.style, zIndex: 999999 }
-    },
-    editContent
-  ));
-}
-function LinkOpenButton() {
-  const editor = useEditorRef();
-  const selection = useEditorSelection();
-  const attributes = React.useMemo(
-    () => {
-      const entry = editor.api.node({
-        match: { type: editor.getType(LinkPlugin) }
-      });
-      if (!entry) {
-        return {};
-      }
-      const [element] = entry;
-      return getLinkAttributes(editor, element);
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [editor, selection]
-  );
-  return /* @__PURE__ */ React.createElement(
-    "a",
-    {
-      ...attributes,
-      className: buttonVariants$2({
-        size: "icon",
-        variant: "ghost"
-      }),
-      onMouseOver: (e) => {
-        e.stopPropagation();
-      },
-      "aria-label": "Open link in a new tab",
-      target: "_blank"
-    },
-    /* @__PURE__ */ React.createElement(ExternalLink, { width: 18 })
-  );
-}
-const protocolAndDomainRE = /^(?:\w+:)?\/\/(\S+)$/;
-const emailLintRE = /mailto:([^?\\]+)/;
-const telLintRE = /tel:([\d-]+)/;
-const localhostDomainRE = /^localhost[\d:?]*(?:[^\d:?]\S*)?$/;
-const nonLocalhostDomainRE = /^[^\s.]+\.\S{2,}$/;
-const localUrlRE = /^\/\S+/;
-const isUrl = (string) => {
-  if (typeof string !== "string") {
-    return false;
-  }
-  if (string.startsWith("#")) {
-    return true;
-  }
-  const generalMatch = string.match(protocolAndDomainRE);
-  const emailLinkMatch = string.match(emailLintRE);
-  const telLinkMatch = string.match(telLintRE);
-  const localUrlMatch = string.match(localUrlRE);
-  if (emailLinkMatch || telLinkMatch || localUrlMatch) {
-    return true;
-  }
-  if (generalMatch) {
-    const everythingAfterProtocol = generalMatch[1];
-    if (!everythingAfterProtocol) {
-      return false;
-    }
-    try {
-      new URL(string);
-    } catch {
-      return false;
-    }
-    return localhostDomainRE.test(everythingAfterProtocol) || nonLocalhostDomainRE.test(everythingAfterProtocol);
-  }
-  return false;
-};
-const buildError = (element) => {
-  return {
-    message: element.message,
-    position: element.position && {
-      endColumn: element.position.end.column,
-      startColumn: element.position.start.column,
-      startLineNumber: element.position.start.line,
-      endLineNumber: element.position.end.line
-    }
-  };
-};
-const buildErrorMessage = (element) => {
-  if (!element) {
-    return "";
-  }
-  const errorMessage = buildError(element);
-  const message = errorMessage ? `${errorMessage.message}${errorMessage.position ? ` at line: ${errorMessage.position.startLineNumber}, column: ${errorMessage.position.startColumn}` : ""}` : null;
-  return message;
-};
-const ELEMENT_INVALID_MARKDOWN = "invalid_markdown";
-const createInvalidMarkdownPlugin = createPlatePlugin({
-  key: ELEMENT_INVALID_MARKDOWN,
-  options: {
-    isElement: true,
-    isVoid: true,
-    isInline: false
-  },
-  node: {
-    component: InvalidMarkdownElement
-  }
-});
-function InvalidMarkdownElement({
-  attributes,
-  element,
-  children
-}) {
-  return /* @__PURE__ */ React__default.createElement("div", { ...attributes }, /* @__PURE__ */ React__default.createElement(ErrorMessage, { error: element }), children);
-}
-function ErrorMessage({ error }) {
-  const message = buildErrorMessage(error);
-  const { setRawMode } = useEditorContext();
-  return /* @__PURE__ */ React__default.createElement("div", { contentEditable: false, className: "bg-red-50 sm:rounded-lg" }, /* @__PURE__ */ React__default.createElement("div", { className: "px-4 py-5 sm:p-6" }, /* @__PURE__ */ React__default.createElement("h3", { className: "text-lg leading-6 font-medium text-red-800" }, "❌ Error parsing markdown"), /* @__PURE__ */ React__default.createElement("div", { className: "mt-2 max-w-xl text-sm text-red-800 space-y-4" }, /* @__PURE__ */ React__default.createElement("p", null, message), /* @__PURE__ */ React__default.createElement("p", null, "To fix these errors, edit the content in raw-mode."), /* @__PURE__ */ React__default.createElement(
-    "button",
-    {
-      type: "button",
-      onClick: () => setRawMode(true),
-      className: "rounded-l border-r-0 shadow rounded bg-white cursor-pointer relative inline-flex items-center px-2 py-2 border border-gray-200 hover:text-white text-sm font-medium transition-all ease-out duration-150 hover:bg-gray-500 focus:z-10 focus:outline-none focus:ring-1 focus:ring-gray-500 focus:border-gray-500"
-    },
-    "Switch to raw-mode"
-  ))));
-}
-const useCustomFloatingToolbarState = ({
-  editorId,
-  floatingOptions,
-  focusedEditorId,
-  hideToolbar,
-  showWhenReadOnly
-}) => {
-  const editor = useEditorRef();
-  const selectionExpanded = useEditorSelector(
-    () => editor.api.isExpanded(),
-    []
-  );
-  const selectionText = useEditorSelector(() => editor.api.string(), []);
-  const readOnly = useEditorReadOnly();
-  const focused = useFocused();
-  const [open, setOpen] = React__default.useState(false);
-  const [waitForCollapsedSelection, setWaitForCollapsedSelection] = React__default.useState(false);
-  const [mousedown, setMousedown] = React__default.useState(false);
-  const floating = useVirtualFloating(
-    mergeProps(
-      {
-        open,
-        getBoundingClientRect: () => getSelectionBoundingClientRect(editor),
-        onOpenChange: setOpen
-      },
-      floatingOptions
-    )
-  );
-  return {
-    editorId,
-    floating,
-    focused,
-    focusedEditorId,
-    hideToolbar,
-    mousedown,
-    open,
-    readOnly,
-    selectionExpanded,
-    selectionText,
-    setMousedown,
-    setOpen,
-    setWaitForCollapsedSelection,
-    showWhenReadOnly,
-    waitForCollapsedSelection
-  };
-};
-const useCustomFloatingToolbar = ({
-  editorId,
-  floating,
-  focusedEditorId,
-  hideToolbar,
-  mousedown,
-  open,
-  readOnly,
-  selectionExpanded,
-  selectionText,
-  setMousedown,
-  setOpen,
-  setWaitForCollapsedSelection,
-  showWhenReadOnly,
-  waitForCollapsedSelection
-}) => {
-  React__default.useEffect(() => {
-    if (!(editorId === focusedEditorId)) {
-      setWaitForCollapsedSelection(true);
-    }
-    if (!selectionExpanded) {
-      setWaitForCollapsedSelection(false);
-    }
-  }, [
-    editorId,
-    focusedEditorId,
-    selectionExpanded,
-    setWaitForCollapsedSelection
-  ]);
-  React__default.useEffect(() => {
-    const mouseup = () => setMousedown(false);
-    const mousedown2 = () => setMousedown(true);
-    document.addEventListener("mouseup", mouseup);
-    document.addEventListener("mousedown", mousedown2);
-    return () => {
-      document.removeEventListener("mouseup", mouseup);
-      document.removeEventListener("mousedown", mousedown2);
-    };
-  }, []);
-  React__default.useEffect(() => {
-    if (!selectionExpanded || !selectionText || mousedown && !open || hideToolbar || readOnly && !showWhenReadOnly) {
-      setOpen(false);
-    } else if (selectionText && selectionExpanded && (!waitForCollapsedSelection || readOnly)) {
-      setOpen(true);
-    }
-  }, [
-    setOpen,
-    editorId,
-    focusedEditorId,
-    hideToolbar,
-    showWhenReadOnly,
-    selectionExpanded,
-    selectionText,
-    mousedown,
-    waitForCollapsedSelection,
-    open,
-    readOnly
-  ]);
-  const { update } = floating;
-  useEditorSelector(() => {
-    update == null ? void 0 : update();
-  }, [update]);
-  const clickOutsideRef = useOnClickOutside(
-    () => {
-      setOpen(false);
-    },
-    {
-      ignoreClass: "ignore-click-outside/toolbar"
-    }
-  );
-  return {
-    clickOutsideRef,
-    hidden: !open,
-    props: {
-      style: floating.style
-    },
-    ref: floating.refs.setFloating
-  };
-};
-const FloatingToolbar = withRef(({ children, state, ...props }, propRef) => {
-  const editorId = useEditorRef();
-  const focusedEditorId = useEventEditorValue("focus");
-  const test = useCustomFloatingToolbarState({
-    editorId: editorId.id,
-    focusedEditorId,
-    ...state,
-    floatingOptions: {
-      middleware: [
-        offset(12),
-        flip({
-          fallbackPlacements: [
-            "top-start",
-            "top-end",
-            "bottom-start",
-            "bottom-end"
-          ],
-          padding: 12
-        })
-      ],
-      placement: "top",
-      ...state == null ? void 0 : state.floatingOptions
-    }
-  });
-  const {
-    hidden,
-    props: rootProps,
-    ref: floatingRef
-  } = useCustomFloatingToolbar(test);
-  const ref = useComposedRef$1(propRef, floatingRef);
-  if (hidden) return null;
-  return /* @__PURE__ */ React__default.createElement(PortalBody, null, /* @__PURE__ */ React__default.createElement(
-    Toolbar,
-    {
-      className: cn$1(
-        "absolute z-[10799] whitespace-nowrap border bg-popover px-1 opacity-100 shadow-md print:hidden rounded-md"
-      ),
-      ...props,
-      ...rootProps,
-      ref
-    },
-    children
-  ));
-});
-function TurnIntoDropdownMenu(props) {
-  const { headingLevels } = useToolbarContext();
-  const items = [
-    paragraphItem,
-    ...headingLevels.map((level) => headingItemsByLevel[level])
-  ];
-  const value = useEditorSelector((editor2) => {
-    let initialNodeType = ParagraphPlugin.key;
-    let allNodesMatchInitialNodeType = false;
-    const codeBlockEntries = editor2.api.nodes({
-      match: (n) => editor2.api.isBlock(n),
-      mode: "highest"
-    });
-    const nodes = Array.from(codeBlockEntries);
-    if (nodes.length > 0) {
-      initialNodeType = nodes[0][0].type;
-      allNodesMatchInitialNodeType = nodes.every(([node]) => {
-        const type2 = (node == null ? void 0 : node.type) || ParagraphPlugin.key;
-        return type2 === initialNodeType;
-      });
-    }
-    return allNodesMatchInitialNodeType ? initialNodeType : ParagraphPlugin.key;
-  }, []);
-  const editor = useEditorRef();
-  const openState = useOpenState();
-  const selectedItem = getHeadingItem(value) ?? paragraphItem;
-  const { icon: SelectedItemIcon, label: selectedItemLabel } = selectedItem;
-  const editorState = useEditorState();
-  const userInTable = helpers.isNodeActive(editorState, TablePlugin.key);
-  if (userInTable) return null;
-  return /* @__PURE__ */ React__default.createElement(DropdownMenu$1, { modal: false, ...openState, ...props }, /* @__PURE__ */ React__default.createElement(DropdownMenuTrigger$1, { asChild: true }, /* @__PURE__ */ React__default.createElement(
-    ToolbarButton,
-    {
-      className: "lg:min-w-[130px]",
-      isDropdown: true,
-      showArrow: true,
-      pressed: openState.open,
-      tooltip: "Turn into"
-    },
-    /* @__PURE__ */ React__default.createElement("span", { className: "" }, selectedItemLabel)
-  )), /* @__PURE__ */ React__default.createElement(DropdownMenuContent$1, { align: "start", className: "min-w-0" }, /* @__PURE__ */ React__default.createElement(DropdownMenuLabel, null, "Turn into"), /* @__PURE__ */ React__default.createElement(
-    DropdownMenuRadioGroup,
-    {
-      className: "flex flex-col gap-0.5",
-      onValueChange: (type2) => {
-        if (type2 === "ul" || type2 === "ol") {
-          toggleList(editor, { type: type2 });
-        } else {
-          unwrapList(editor);
-          editor.tf.toggleBlock(type2);
-        }
-        editor.tf.collapse();
-        editor.tf.focus();
-      },
-      value
-    },
-    items.map(({ icon: Icon, label, value: itemValue }) => /* @__PURE__ */ React__default.createElement(
-      DropdownMenuRadioItem,
-      {
-        className: "min-w-[180px]",
-        key: itemValue,
-        value: itemValue
-      },
-      /* @__PURE__ */ React__default.createElement(Icon, { className: "mr-2 size-5" }),
-      label
-    ))
-  )));
-}
-function FloatingToolbarButtons() {
-  return /* @__PURE__ */ React__default.createElement("div", { className: "rounded-md" }, /* @__PURE__ */ React__default.createElement(TurnIntoDropdownMenu, null));
-}
-const FloatingToolbarPlugin = createPlatePlugin({
-  key: "floating-toolbar",
-  render: {
-    afterEditable: () => /* @__PURE__ */ React__default.createElement(FloatingToolbar, null, /* @__PURE__ */ React__default.createElement(FloatingToolbarButtons, null))
-  }
-});
 function _1c(hljs) {
   const UNDERSCORE_IDENT_RE = "[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]+";
   const v7_keywords = "далее ";
@@ -70583,6 +70626,252 @@ class HastEmitter {
     return "";
   }
 }
+const popoverVariants = cva(
+  "z-[999999] w-auto rounded-md border bg-popover p-1 text-popover-foreground shadow-md outline-hidden"
+);
+const inputVariants = cva(
+  "flex h-[28px] w-full rounded-md border-none bg-transparent px-1.5 py-1 text-base placeholder:text-muted-foreground focus-visible:ring-transparent focus-visible:outline-none md:text-sm"
+);
+function LinkFloatingToolbar({
+  state
+}) {
+  const activeCommentId = usePluginOption({ key: "comment" }, "activeId");
+  const activeSuggestionId = usePluginOption({ key: "suggestion" }, "activeId");
+  const { api, editor } = useEditorPlugin(LinkPlugin);
+  const isUrlValidator = usePluginOption(LinkPlugin, "isUrl");
+  const [currentUrl, setCurrentUrl] = React.useState("");
+  const [isValidUrl, setIsValidUrl] = React.useState(true);
+  const handleUrlInput = React.useCallback(
+    (e) => {
+      const value = e.currentTarget.value;
+      setCurrentUrl(value);
+      if (value && isUrlValidator) {
+        const valid = isUrlValidator(value);
+        setIsValidUrl(valid);
+      } else {
+        setIsValidUrl(true);
+      }
+    },
+    [isUrlValidator]
+  );
+  const floatingOptions = React.useMemo(() => {
+    return {
+      middleware: [
+        offset(8),
+        flip({
+          fallbackPlacements: ["bottom-end", "top-start", "top-end"],
+          padding: 12
+        }),
+        shift({ padding: 8, limiter: limitShift() })
+      ],
+      placement: activeSuggestionId || activeCommentId ? "top-start" : "bottom-start"
+    };
+  }, [activeCommentId, activeSuggestionId]);
+  const insertState = useFloatingLinkInsertState({
+    ...state,
+    floatingOptions: {
+      ...floatingOptions,
+      ...state == null ? void 0 : state.floatingOptions
+    }
+  });
+  const {
+    hidden,
+    props: insertProps,
+    ref: insertRef,
+    textInputProps
+  } = useFloatingLinkInsert(insertState);
+  const editState = useFloatingLinkEditState({
+    ...state,
+    floatingOptions: {
+      ...floatingOptions,
+      ...state == null ? void 0 : state.floatingOptions
+    }
+  });
+  const {
+    editButtonProps,
+    props: editProps,
+    ref: editRef,
+    unlinkButtonProps
+  } = useFloatingLinkEdit(editState);
+  const inputProps = useFormInputProps({
+    preventDefaultOnEnterKeydown: true
+  });
+  if (hidden) return null;
+  const input = /* @__PURE__ */ React.createElement(
+    "div",
+    {
+      className: "z-[999999] flex w-[330px] flex-col relative",
+      ...inputProps
+    },
+    !isValidUrl && currentUrl && /* @__PURE__ */ React.createElement("div", { className: "absolute -top-16 left-0 right-0 z-[1000000] mb-2" }, /* @__PURE__ */ React.createElement(
+      "div",
+      {
+        className: "bg-red-50 border border-red-200 rounded-md p-2 shadow-lg",
+        role: "alert",
+        "aria-live": "polite"
+      },
+      /* @__PURE__ */ React.createElement("div", { className: "flex items-center" }, /* @__PURE__ */ React.createElement(CircleX, { className: "size-4 text-red-500 mr-2 flex-shrink-0" }), /* @__PURE__ */ React.createElement("span", { className: "text-sm text-red-700 text-wrap" }, "Invalid URL. Please prefix link with https:// or use a relative path like /about")),
+      /* @__PURE__ */ React.createElement("div", { className: "absolute -bottom-1 left-4 w-2 h-2 bg-red-50 border-r border-b border-red-200 transform rotate-45" })
+    )),
+    /* @__PURE__ */ React.createElement("div", { className: "flex items-center" }, /* @__PURE__ */ React.createElement("div", { className: "flex items-center pr-1 pl-2 text-muted-foreground" }, /* @__PURE__ */ React.createElement(Link, { className: "size-4" })), /* @__PURE__ */ React.createElement(
+      FloatingLinkUrlInput,
+      {
+        className: inputVariants(),
+        placeholder: "Paste link",
+        "data-plate-focus": true,
+        onInput: handleUrlInput
+      }
+    )),
+    /* @__PURE__ */ React.createElement(Separator, { className: "my-1" }),
+    /* @__PURE__ */ React.createElement("div", { className: "flex items-center" }, /* @__PURE__ */ React.createElement("div", { className: "flex items-center pr-1 pl-2 text-muted-foreground" }, /* @__PURE__ */ React.createElement(Text, { className: "size-4" })), /* @__PURE__ */ React.createElement(
+      "input",
+      {
+        className: inputVariants(),
+        placeholder: "Text to display",
+        "data-plate-focus": true,
+        ...textInputProps
+      }
+    )),
+    /* @__PURE__ */ React.createElement(Separator, { className: "my-1" }),
+    /* @__PURE__ */ React.createElement("div", { className: "flex items-center justify-end gap-2 px-2 py-1" }, /* @__PURE__ */ React.createElement(
+      "button",
+      {
+        type: "button",
+        className: buttonVariants$2({ size: "sm", variant: "ghost" }),
+        onClick: () => {
+          api.floatingLink.hide();
+        }
+      },
+      "Cancel"
+    ), /* @__PURE__ */ React.createElement(
+      "button",
+      {
+        type: "button",
+        className: buttonVariants$2({
+          size: "sm",
+          variant: "tinaPrimary"
+        }),
+        onClick: () => {
+          if (isValidUrl && currentUrl) {
+            submitFloatingLink(editor);
+          }
+        },
+        disabled: !isValidUrl && !!currentUrl
+      },
+      "OK"
+    ))
+  );
+  const editContent = editState.isEditing ? input : /* @__PURE__ */ React.createElement("div", { className: "box-content flex items-center" }, /* @__PURE__ */ React.createElement(
+    "button",
+    {
+      className: buttonVariants$2({ size: "sm", variant: "ghost" }),
+      type: "button",
+      ...editButtonProps
+    },
+    "Edit link"
+  ), /* @__PURE__ */ React.createElement(Separator, { orientation: "vertical" }), /* @__PURE__ */ React.createElement(LinkOpenButton, null), /* @__PURE__ */ React.createElement(Separator, { orientation: "vertical" }), /* @__PURE__ */ React.createElement(
+    "button",
+    {
+      className: buttonVariants$2({
+        size: "icon",
+        variant: "ghost"
+      }),
+      type: "button",
+      ...unlinkButtonProps
+    },
+    /* @__PURE__ */ React.createElement(Unlink, { width: 18 })
+  ));
+  return /* @__PURE__ */ React.createElement(PortalBody, null, /* @__PURE__ */ React.createElement(
+    "div",
+    {
+      ref: insertRef,
+      className: popoverVariants(),
+      ...insertProps,
+      style: {
+        ...insertProps.style,
+        zIndex: 999999
+      }
+    },
+    input
+  ), /* @__PURE__ */ React.createElement(
+    "div",
+    {
+      ref: editRef,
+      className: popoverVariants(),
+      ...editProps,
+      style: { ...editProps.style, zIndex: 999999 }
+    },
+    editContent
+  ));
+}
+function LinkOpenButton() {
+  const editor = useEditorRef();
+  const selection = useEditorSelection();
+  const attributes = React.useMemo(
+    () => {
+      const entry = editor.api.node({
+        match: { type: editor.getType(LinkPlugin) }
+      });
+      if (!entry) {
+        return {};
+      }
+      const [element] = entry;
+      return getLinkAttributes(editor, element);
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [editor, selection]
+  );
+  return /* @__PURE__ */ React.createElement(
+    "a",
+    {
+      ...attributes,
+      className: buttonVariants$2({
+        size: "icon",
+        variant: "ghost"
+      }),
+      onMouseOver: (e) => {
+        e.stopPropagation();
+      },
+      "aria-label": "Open link in a new tab",
+      target: "_blank"
+    },
+    /* @__PURE__ */ React.createElement(ExternalLink, { width: 18 })
+  );
+}
+const protocolAndDomainRE = /^(?:\w+:)?\/\/(\S+)$/;
+const emailLintRE = /mailto:([^?\\]+)/;
+const telLintRE = /tel:([\d-]+)/;
+const localhostDomainRE = /^localhost[\d:?]*(?:[^\d:?]\S*)?$/;
+const nonLocalhostDomainRE = /^[^\s.]+\.\S{2,}$/;
+const localUrlRE = /^\/\S+/;
+const isUrl = (string) => {
+  if (typeof string !== "string") {
+    return false;
+  }
+  if (string.startsWith("#")) {
+    return true;
+  }
+  const generalMatch = string.match(protocolAndDomainRE);
+  const emailLinkMatch = string.match(emailLintRE);
+  const telLinkMatch = string.match(telLintRE);
+  const localUrlMatch = string.match(localUrlRE);
+  if (emailLinkMatch || telLinkMatch || localUrlMatch) {
+    return true;
+  }
+  if (generalMatch) {
+    const everythingAfterProtocol = generalMatch[1];
+    if (!everythingAfterProtocol) {
+      return false;
+    }
+    try {
+      new URL(string);
+    } catch {
+      return false;
+    }
+    return localhostDomainRE.test(everythingAfterProtocol) || nonLocalhostDomainRE.test(everythingAfterProtocol);
+  }
+  return false;
+};
 const createHTMLBlockPlugin = createPlatePlugin({
   key: "html",
   node: {
@@ -70599,18 +70888,26 @@ const createHTMLInlinePlugin = createPlatePlugin({
     isInline: true
   }
 });
-const KEY_BLOCKQUOTE_ENTER_BREAK = "blockquote-enter-break";
-const createBlockquoteEnterBreakPlugin = createPlatePlugin({
-  key: KEY_BLOCKQUOTE_ENTER_BREAK,
+const KEY_HARD_BREAK = "tina-hard-break";
+const NO_HARD_BREAK = [
+  CodeBlockPlugin.key,
+  TableCellPlugin.key,
+  TableCellHeaderPlugin.key
+];
+const createHardBreakPlugin = createPlatePlugin({
+  key: KEY_HARD_BREAK,
   handlers: {
     onKeyDown: ({ editor, event }) => {
       var _a;
-      if (event.key !== "Enter") return;
-      const blockquoteEntry = editor.api.above({
+      if (event.key !== "Enter" || event.metaKey || event.ctrlKey) return;
+      const inBlockquote = editor.api.above({
         match: { type: BlockquotePlugin.key }
       });
-      if (!blockquoteEntry) return;
+      if (!event.shiftKey && !inBlockquote) return;
+      if (editor.api.some({ match: { type: NO_HARD_BREAK } })) return;
+      if (!editor.selection) return;
       event.preventDefault();
+      if (editor.api.isExpanded()) editor.tf.delete();
       const cursorPosition = (_a = editor.selection) == null ? void 0 : _a.focus;
       if (!cursorPosition) return;
       editor.tf.insertNodes(
@@ -70638,6 +70935,303 @@ const createBreakPlugin = createPlatePlugin({
     }
   }
 });
+const buildError = (element) => {
+  return {
+    message: element.message,
+    position: element.position && {
+      endColumn: element.position.end.column,
+      startColumn: element.position.start.column,
+      startLineNumber: element.position.start.line,
+      endLineNumber: element.position.end.line
+    }
+  };
+};
+const buildErrorMessage = (element) => {
+  if (!element) {
+    return "";
+  }
+  const errorMessage = buildError(element);
+  const message = errorMessage ? `${errorMessage.message}${errorMessage.position ? ` at line: ${errorMessage.position.startLineNumber}, column: ${errorMessage.position.startColumn}` : ""}` : null;
+  return message;
+};
+const ELEMENT_INVALID_MARKDOWN = "invalid_markdown";
+const createInvalidMarkdownPlugin = createPlatePlugin({
+  key: ELEMENT_INVALID_MARKDOWN,
+  options: {
+    isElement: true,
+    isVoid: true,
+    isInline: false
+  },
+  node: {
+    component: InvalidMarkdownElement
+  }
+});
+function InvalidMarkdownElement({
+  attributes,
+  element,
+  children
+}) {
+  return /* @__PURE__ */ React__default.createElement("div", { ...attributes }, /* @__PURE__ */ React__default.createElement(ErrorMessage, { error: element }), children);
+}
+function ErrorMessage({ error }) {
+  const message = buildErrorMessage(error);
+  const { setRawMode } = useEditorContext();
+  return /* @__PURE__ */ React__default.createElement("div", { contentEditable: false, className: "bg-red-50 sm:rounded-lg" }, /* @__PURE__ */ React__default.createElement("div", { className: "px-4 py-5 sm:p-6" }, /* @__PURE__ */ React__default.createElement("h3", { className: "text-lg leading-6 font-medium text-red-800" }, "❌ Error parsing markdown"), /* @__PURE__ */ React__default.createElement("div", { className: "mt-2 max-w-xl text-sm text-red-800 space-y-4" }, /* @__PURE__ */ React__default.createElement("p", null, message), /* @__PURE__ */ React__default.createElement("p", null, "To fix these errors, edit the content in raw-mode."), /* @__PURE__ */ React__default.createElement(
+    "button",
+    {
+      type: "button",
+      onClick: () => setRawMode(true),
+      className: "rounded-l border-r-0 shadow rounded bg-white cursor-pointer relative inline-flex items-center px-2 py-2 border border-gray-200 hover:text-white text-sm font-medium transition-all ease-out duration-150 hover:bg-gray-500 focus:z-10 focus:outline-none focus:ring-1 focus:ring-gray-500 focus:border-gray-500"
+    },
+    "Switch to raw-mode"
+  ))));
+}
+const useCustomFloatingToolbarState = ({
+  editorId,
+  floatingOptions,
+  focusedEditorId,
+  hideToolbar,
+  showWhenReadOnly
+}) => {
+  const editor = useEditorRef();
+  const selectionExpanded = useEditorSelector(
+    () => editor.api.isExpanded(),
+    []
+  );
+  const selectionText = useEditorSelector(() => editor.api.string(), []);
+  const readOnly = useEditorReadOnly();
+  const focused = useFocused();
+  const [open, setOpen] = React__default.useState(false);
+  const [waitForCollapsedSelection, setWaitForCollapsedSelection] = React__default.useState(false);
+  const [mousedown, setMousedown] = React__default.useState(false);
+  const floating = useVirtualFloating(
+    mergeProps(
+      {
+        open,
+        getBoundingClientRect: () => getSelectionBoundingClientRect(editor),
+        onOpenChange: setOpen
+      },
+      floatingOptions
+    )
+  );
+  return {
+    editorId,
+    floating,
+    focused,
+    focusedEditorId,
+    hideToolbar,
+    mousedown,
+    open,
+    readOnly,
+    selectionExpanded,
+    selectionText,
+    setMousedown,
+    setOpen,
+    setWaitForCollapsedSelection,
+    showWhenReadOnly,
+    waitForCollapsedSelection
+  };
+};
+const useCustomFloatingToolbar = ({
+  editorId,
+  floating,
+  focusedEditorId,
+  hideToolbar,
+  mousedown,
+  open,
+  readOnly,
+  selectionExpanded,
+  selectionText,
+  setMousedown,
+  setOpen,
+  setWaitForCollapsedSelection,
+  showWhenReadOnly,
+  waitForCollapsedSelection
+}) => {
+  React__default.useEffect(() => {
+    if (!(editorId === focusedEditorId)) {
+      setWaitForCollapsedSelection(true);
+    }
+    if (!selectionExpanded) {
+      setWaitForCollapsedSelection(false);
+    }
+  }, [
+    editorId,
+    focusedEditorId,
+    selectionExpanded,
+    setWaitForCollapsedSelection
+  ]);
+  React__default.useEffect(() => {
+    const mouseup = () => setMousedown(false);
+    const mousedown2 = () => setMousedown(true);
+    document.addEventListener("mouseup", mouseup);
+    document.addEventListener("mousedown", mousedown2);
+    return () => {
+      document.removeEventListener("mouseup", mouseup);
+      document.removeEventListener("mousedown", mousedown2);
+    };
+  }, []);
+  React__default.useEffect(() => {
+    if (!selectionExpanded || !selectionText || mousedown && !open || hideToolbar || readOnly && !showWhenReadOnly) {
+      setOpen(false);
+    } else if (selectionText && selectionExpanded && (!waitForCollapsedSelection || readOnly)) {
+      setOpen(true);
+    }
+  }, [
+    setOpen,
+    editorId,
+    focusedEditorId,
+    hideToolbar,
+    showWhenReadOnly,
+    selectionExpanded,
+    selectionText,
+    mousedown,
+    waitForCollapsedSelection,
+    open,
+    readOnly
+  ]);
+  const { update } = floating;
+  useEditorSelector(() => {
+    update == null ? void 0 : update();
+  }, [update]);
+  const clickOutsideRef = useOnClickOutside(
+    () => {
+      setOpen(false);
+    },
+    {
+      ignoreClass: "ignore-click-outside/toolbar"
+    }
+  );
+  return {
+    clickOutsideRef,
+    hidden: !open,
+    props: {
+      style: floating.style
+    },
+    ref: floating.refs.setFloating
+  };
+};
+const FloatingToolbar = withRef(({ children, state, ...props }, propRef) => {
+  const editorId = useEditorRef();
+  const focusedEditorId = useEventEditorValue("focus");
+  const test = useCustomFloatingToolbarState({
+    editorId: editorId.id,
+    focusedEditorId,
+    ...state,
+    floatingOptions: {
+      middleware: [
+        offset(12),
+        flip({
+          fallbackPlacements: [
+            "top-start",
+            "top-end",
+            "bottom-start",
+            "bottom-end"
+          ],
+          padding: 12
+        })
+      ],
+      placement: "top",
+      ...state == null ? void 0 : state.floatingOptions
+    }
+  });
+  const {
+    hidden,
+    props: rootProps,
+    ref: floatingRef
+  } = useCustomFloatingToolbar(test);
+  const ref = useComposedRef$1(propRef, floatingRef);
+  if (hidden) return null;
+  return /* @__PURE__ */ React__default.createElement(PortalBody, null, /* @__PURE__ */ React__default.createElement(
+    Toolbar,
+    {
+      className: cn$1(
+        "absolute z-[10799] whitespace-nowrap border bg-popover px-1 opacity-100 shadow-md print:hidden rounded-md"
+      ),
+      ...props,
+      ...rootProps,
+      ref
+    },
+    children
+  ));
+});
+function TurnIntoDropdownMenu(props) {
+  const { headingLevels } = useToolbarContext();
+  const items = [
+    paragraphItem,
+    ...headingLevels.map((level) => headingItemsByLevel[level])
+  ];
+  const value = useEditorSelector((editor2) => {
+    let initialNodeType = ParagraphPlugin.key;
+    let allNodesMatchInitialNodeType = false;
+    const codeBlockEntries = editor2.api.nodes({
+      match: (n) => editor2.api.isBlock(n),
+      mode: "highest"
+    });
+    const nodes = Array.from(codeBlockEntries);
+    if (nodes.length > 0) {
+      initialNodeType = nodes[0][0].type;
+      allNodesMatchInitialNodeType = nodes.every(([node]) => {
+        const type2 = (node == null ? void 0 : node.type) || ParagraphPlugin.key;
+        return type2 === initialNodeType;
+      });
+    }
+    return allNodesMatchInitialNodeType ? initialNodeType : ParagraphPlugin.key;
+  }, []);
+  const editor = useEditorRef();
+  const openState = useOpenState();
+  const selectedItem = getHeadingItem(value) ?? paragraphItem;
+  const { icon: SelectedItemIcon, label: selectedItemLabel } = selectedItem;
+  const editorState = useEditorState();
+  const userInTable = helpers.isNodeActive(editorState, TablePlugin.key);
+  if (userInTable) return null;
+  return /* @__PURE__ */ React__default.createElement(DropdownMenu$1, { modal: false, ...openState, ...props }, /* @__PURE__ */ React__default.createElement(DropdownMenuTrigger$1, { asChild: true }, /* @__PURE__ */ React__default.createElement(
+    ToolbarButton,
+    {
+      className: "lg:min-w-[130px]",
+      isDropdown: true,
+      showArrow: true,
+      pressed: openState.open,
+      tooltip: "Turn into"
+    },
+    /* @__PURE__ */ React__default.createElement("span", { className: "" }, selectedItemLabel)
+  )), /* @__PURE__ */ React__default.createElement(DropdownMenuContent$1, { align: "start", className: "min-w-0" }, /* @__PURE__ */ React__default.createElement(DropdownMenuLabel$1, null, "Turn into"), /* @__PURE__ */ React__default.createElement(
+    DropdownMenuRadioGroup$1,
+    {
+      className: "flex flex-col gap-0.5",
+      onValueChange: (type2) => {
+        if (type2 === "ul" || type2 === "ol") {
+          toggleList(editor, { type: type2 });
+        } else {
+          unwrapList(editor);
+          editor.tf.toggleBlock(type2);
+        }
+        editor.tf.collapse();
+        editor.tf.focus();
+      },
+      value
+    },
+    items.map(({ icon: Icon, label, value: itemValue }) => /* @__PURE__ */ React__default.createElement(
+      DropdownMenuRadioItem$1,
+      {
+        className: "min-w-[180px]",
+        key: itemValue,
+        value: itemValue
+      },
+      /* @__PURE__ */ React__default.createElement(Icon, { className: "mr-2 size-5" }),
+      label
+    ))
+  )));
+}
+function FloatingToolbarButtons() {
+  return /* @__PURE__ */ React__default.createElement("div", { className: "rounded-md" }, /* @__PURE__ */ React__default.createElement(TurnIntoDropdownMenu, null));
+}
+const FloatingToolbarPlugin = createPlatePlugin({
+  key: "floating-toolbar",
+  render: {
+    afterEditable: () => /* @__PURE__ */ React__default.createElement(FloatingToolbar, null, /* @__PURE__ */ React__default.createElement(FloatingToolbarButtons, null))
+  }
+});
 [
   HEADING_KEYS.h1,
   HEADING_KEYS.h2,
@@ -70702,7 +71296,7 @@ const createEditorPlugins = ({
   createImgPlugin,
   createHTMLBlockPlugin,
   createHTMLInlinePlugin,
-  createBlockquoteEnterBreakPlugin,
+  createHardBreakPlugin,
   createInvalidMarkdownPlugin,
   CorrectNodeBehaviorPlugin,
   ClearHighlightOnEnterPlugin,
@@ -70801,6 +71395,8 @@ const createEditorPlugins = ({
       ]
     }
   }),
+  // Only reached where `createHardBreakPlugin` bails (code blocks, table
+  // cells) — everywhere else it has already inserted a `break` element.
   SoftBreakPlugin.configure({
     options: {
       rules: [
@@ -70981,6 +71577,7 @@ const MediaWorkflowOverlay = () => {
           phase: "confirming",
           branchName: event.branchName,
           baseBranch: event.baseBranch,
+          allowSaveToProtectedBranch: event.allowSaveToProtectedBranch,
           onConfirm: event.onConfirm,
           onCancel: event.onCancel,
           onSaveToProtectedBranch: event.onSaveToProtectedBranch
@@ -71033,7 +71630,7 @@ const MediaWorkflowOverlay = () => {
     if (state.phase !== "confirming") return;
     const confirmState = state;
     const branchName = confirmState.branchName;
-    const targetBranch = `tina/${branchName}`;
+    const targetBranch = `tina/${normalizeBranchName(branchName)}`;
     abortPreflight();
     const abortController = new AbortController();
     preflightAbortRef.current = abortController;
@@ -71101,7 +71698,7 @@ const MediaWorkflowOverlay = () => {
           state.onCancel();
           setState({ phase: "idle" });
         },
-        disabled: state.branchName === "" || state.isChecking,
+        disabled: normalizeBranchName(state.branchName) === "" || state.isChecking,
         errorMessage: state.errorMessage,
         onBranchNameChange: (branchName) => {
           abortPreflight();
@@ -71115,6 +71712,7 @@ const MediaWorkflowOverlay = () => {
           );
         },
         onCreateBranch: handleCreateBranch,
+        allowSaveToProtectedBranch: state.allowSaveToProtectedBranch,
         onSaveToProtectedBranch: () => {
           abortPreflight();
           state.onSaveToProtectedBranch();
@@ -71304,6 +71902,14 @@ const DefaultSessionProvider = ({
   children
 }) => /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children);
 class AbstractAuthProvider {
+  constructor() {
+    /**
+     * Turns a tokened 401 into the auth wall re-arming. The Client assigns this
+     * automatically; AbstractAuthProvider.fetchWithToken invokes it. A provider
+     * that implements its own fetchWithToken must invoke it itself.
+     */
+    __publicField(this, "sessionExpiredListener");
+  }
   /**
    * Wraps the normal fetch function with same API but adds the authorization header token.
    *
@@ -71314,16 +71920,24 @@ class AbstractAuthProvider {
    * @param init fetch function init
    */
   async fetchWithToken(input, init) {
+    var _a;
     const headers = (init == null ? void 0 : init.headers) || {};
-    const token = await this.getToken();
-    const accessToken = (token == null ? void 0 : token.access_token) ?? (token == null ? void 0 : token.id_token);
+    const accessToken = await this.getAccessToken();
     if (accessToken) {
       headers["Authorization"] = "Bearer " + accessToken;
     }
-    return await fetch(input, {
+    const res = await fetch(input, {
       ...init || {},
       headers: new Headers(headers)
     });
+    if (res.status === 401 && accessToken) {
+      (_a = this.sessionExpiredListener) == null ? void 0 : _a.call(this);
+    }
+    return res;
+  }
+  async getAccessToken() {
+    const token = await this.getToken();
+    return (token == null ? void 0 : token.access_token) ?? (token == null ? void 0 : token.id_token) ?? null;
   }
   async authorize(context) {
     return this.getToken();
@@ -71362,6 +71976,7 @@ class TinaCloudAuthProvider extends AbstractAuthProvider {
     __publicField(this, "frontendUrl");
     __publicField(this, "token");
     // used with memory storage
+    __publicField(this, "hasWarnedNoSession", false);
     __publicField(this, "setToken");
     __publicField(this, "getToken");
     this.frontendUrl = frontendUrl;
@@ -71430,16 +72045,36 @@ class TinaCloudAuthProvider extends AbstractAuthProvider {
     }
     const url = `${this.identityApiUrl}/v2/apps/${this.clientId}/currentUser`;
     try {
-      const res = await this.fetchWithToken(url, {
-        method: "GET"
-      });
+      if (!await this.getAccessToken()) {
+        if (!this.hasWarnedNoSession) {
+          this.hasWarnedNoSession = true;
+          console.warn(
+            "TinaCMS: no TinaCloud session found. If login fails, check the console inside the login popup window for the underlying error."
+          );
+        }
+        return null;
+      }
+      let res;
+      try {
+        res = await this.fetchWithToken(url, { method: "GET" });
+      } catch (networkError) {
+        console.warn("TinaCMS: session check failed, retrying.", networkError);
+        await new Promise((resolve) => setTimeout(resolve, 300));
+        res = await this.fetchWithToken(url, { method: "GET" });
+      }
       const val = await res.json();
       if (!res.status.toString().startsWith("2")) {
-        console.error(val.error);
+        console.error(
+          `TinaCMS: TinaCloud session check failed (status ${res.status}).`,
+          (val == null ? void 0 : val.error) ?? val
+        );
         return null;
       }
       return val;
     } catch (e) {
+      if (e instanceof TypeError || isErrorNamed(e, "AbortError")) {
+        throw e;
+      }
       console.error(e);
       return null;
     }
@@ -71556,6 +72191,8 @@ class Client {
     // automatically hooked into global event bus when attached via cms.
     __publicField(this, "protectedBranches", []);
     __publicField(this, "usingEditorialWorkflow", false);
+    // Whatever the auth provider returned from getUser().
+    __publicField(this, "user");
     __publicField(this, "addPendingContent", async (props) => {
       const mutation = `#graphql
 mutation addPendingDocumentMutation(
@@ -71655,13 +72292,24 @@ mutation addPendingDocumentMutation(
       }
     );
     this.clientId = options.clientId;
-    this.authProvider = ((_u = (_t = (_s = this.schema) == null ? void 0 : _s.config) == null ? void 0 : _t.config) == null ? void 0 : _u.authProvider) || new TinaCloudAuthProvider({
-      clientId: options.clientId,
-      identityApiUrl: this.identityApiUrl,
-      getTokenFn: options.getTokenFn,
-      tokenStorage,
-      frontendUrl: this.frontendUrl
-    });
+    this.authProvider = this.adoptAuthProvider(
+      ((_u = (_t = (_s = this.schema) == null ? void 0 : _s.config) == null ? void 0 : _t.config) == null ? void 0 : _u.authProvider) || new TinaCloudAuthProvider({
+        clientId: options.clientId,
+        identityApiUrl: this.identityApiUrl,
+        getTokenFn: options.getTokenFn,
+        tokenStorage,
+        frontendUrl: this.frontendUrl
+      })
+    );
+  }
+  /**
+   * Every provider swap must come through here: the listener is what turns a
+   * REST 401 into the auth wall re-arming, and a bare field assignment would
+   * silently drop it.
+   */
+  adoptAuthProvider(provider) {
+    provider.sessionExpiredListener = () => dispatchSessionExpired(this.events);
+    return provider;
   }
   get isLocalMode() {
     return false;
@@ -71706,6 +72354,17 @@ mutation addPendingDocumentMutation(
         variables
       })
     });
+    if (res.status === 401) {
+      res.json().catch(() => {
+      });
+      if (this.isCustomContentApi) {
+        console.error(
+          `TinaCMS: the content API at ${this.contentApiUrl} returned 401. If signing in again does not resolve this, check the backend's auth configuration (clientId: ${this.options.clientId}, branch: ${this.branch}).`
+        );
+      }
+      dispatchSessionExpired(this.events);
+      throw new SessionExpiredError();
+    }
     if (res.status !== 200) {
       let errorMessage = `Unable to complete request, ${res.statusText}`;
       const resBody = await res.json();
@@ -72127,6 +72786,10 @@ mutation addPendingDocumentMutation(
       throw error;
     }
   }
+  /**
+   * The server normalises `branchName`, so follow-up calls must use the
+   * `branchName` from the response rather than the one they sent.
+   */
   async startMediaEditorialWorkflow(options) {
     const url = `${this.contentApiBase}/editorial-workflow/${this.clientId}/media`;
     return await this.postEditorialWorkflow(
@@ -72151,7 +72814,9 @@ class LocalClient extends Client {
       customContentApiUrl: props && props.customContentApiUrl ? props.customContentApiUrl : DEFAULT_LOCAL_TINA_GQL_SERVER_URL
     };
     super(clientProps);
-    this.authProvider = ((_c = (_b = (_a = this.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.config) == null ? void 0 : _c.authProvider) || new LocalAuthProvider();
+    this.authProvider = this.adoptAuthProvider(
+      ((_c = (_b = (_a = this.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.config) == null ? void 0 : _c.authProvider) || new LocalAuthProvider()
+    );
   }
   get isLocalMode() {
     return true;
@@ -72396,6 +73061,7 @@ const useTinaAuthRedirect = (params, enabled = true) => {
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+const SESSION_EXPIRED_MESSAGE = "Your session has ended. Please sign in again to continue editing.";
 const AuthWallInner = ({
   children,
   cms,
@@ -72417,6 +73083,15 @@ const AuthWallInner = ({
   const [showChildren, setShowChildren] = useState(false);
   const [authProps, setAuthProps] = useState({ username: "", password: "" });
   const [authenticated, setAuthenticated] = useState(false);
+  const [sessionExpired, setSessionExpired] = useState(false);
+  React__default.useEffect(
+    () => cms.events.subscribe("cms:session-expired", () => {
+      setSessionExpired(true);
+      setShowChildren(false);
+      setActiveModal("authenticate");
+    }),
+    []
+  );
   React__default.useEffect(() => {
     let mounted = true;
     if (isAuthRedirect) {
@@ -72432,6 +73107,7 @@ const AuthWallInner = ({
           if (!mounted) return;
           if (isAuthorized) {
             const user = await client.authProvider.getUser();
+            client.user = user;
             if (user.passwordChangeRequired) {
               window.location.hash = "#/screens/change_password";
             }
@@ -72467,6 +73143,7 @@ const AuthWallInner = ({
   }, [authenticated]);
   const onAuthenticated = async () => {
     setAuthenticated(true);
+    setSessionExpired(false);
     setActiveModal(null);
     cms.events.dispatch({ type: "cms:login" });
   };
@@ -72486,7 +73163,7 @@ const AuthWallInner = ({
       }
       return onAuthenticated();
     } catch (e) {
-      if (e instanceof AuthenticationCancelledError || (e == null ? void 0 : e.name) === "AuthenticationCancelledError") {
+      if (e instanceof AuthenticationCancelledError || isErrorNamed(e, "AuthenticationCancelledError")) {
         return;
       }
       console.error(e);
@@ -72513,6 +73190,7 @@ const AuthWallInner = ({
     ModalBuilder,
     {
       title: modalTitle,
+      error: sessionExpired ? SESSION_EXPIRED_MESSAGE : void 0,
       message: isTinaCloud ? /* @__PURE__ */ React__default.createElement(
         "img",
         {
@@ -72538,6 +73216,7 @@ const AuthWallInner = ({
     ModalBuilder,
     {
       title: modalTitle,
+      error: sessionExpired ? SESSION_EXPIRED_MESSAGE : void 0,
       message: "",
       close,
       busy: isAuthRedirect,
@@ -72759,9 +73438,14 @@ const TinaCloudProvider = (props) => {
     }
   }, []);
   React__default.useEffect(() => {
-    const setupEditorialWorkflow = () => {
-      client.getProject().then(async (project) => {
-        var _a2;
+    const setupEditorialWorkflow = async () => {
+      var _a2;
+      try {
+        const token = await client.authProvider.getToken();
+        if (!(token == null ? void 0 : token.access_token) && !(token == null ? void 0 : token.id_token)) {
+          return;
+        }
+        const project = await client.getProject();
         if ((_a2 = project == null ? void 0 : project.features) == null ? void 0 : _a2.includes("editorial-workflow")) {
           cms.flags.set("branch-switcher", true);
           client.usingEditorialWorkflow = true;
@@ -72770,7 +73454,9 @@ const TinaCloudProvider = (props) => {
             setCurrentBranch(project.defaultBranch || "main");
           }
         }
-      });
+      } catch (e) {
+        console.error("TinaCMS: unable to load project settings", e);
+      }
     };
     if (isTinaCloud) {
       setupEditorialWorkflow();
@@ -73826,6 +74512,7 @@ const CollectionListPage = () => {
                 );
                 return (_b2 = (_a2 = doc == null ? void 0 : doc.document) == null ? void 0 : _a2._sys) == null ? void 0 : _b2.hasReferences;
               } catch (error) {
+                if (isSessionExpiredError(error)) throw error;
                 cms.alerts.error(
                   "Document was not found, ask a developer for help or check the console for an error message"
                 );
@@ -73841,6 +74528,7 @@ const CollectionListPage = () => {
                 );
                 reFetchCollection();
               } catch (error) {
+                if (isSessionExpiredError(error)) throw error;
                 if (error.message.includes(ERR_HAS_REFERENCES)) {
                   cms.alerts.error(
                     error.message.split("\n	").filter(Boolean)[1]
@@ -73870,6 +74558,7 @@ const CollectionListPage = () => {
                 );
                 reFetchCollection();
               } catch (error) {
+                if (isSessionExpiredError(error)) throw error;
                 cms.alerts.warn(
                   "Document was not deleted, ask a developer for help or check the console for an error message"
                 );
@@ -73902,6 +74591,7 @@ const CollectionListPage = () => {
                 );
                 reFetchCollection();
               } catch (error) {
+                if (isSessionExpiredError(error)) throw error;
                 if (error.message && error.message.includes(ERR_ALREADY_EXISTS)) {
                   cms.alerts.error(
                     `Document was not renamed. The filename "${vars.newRelativePath}" is already used by another document, please choose a different name.`
@@ -73948,6 +74638,7 @@ const CollectionListPage = () => {
                 );
                 cms.alerts.info("Folder was successfully created");
               } catch (error) {
+                if (isSessionExpiredError(error)) throw error;
                 if (error.message && error.message.includes(ERR_ALREADY_EXISTS)) {
                   cms.alerts.error(
                     `Folder was not created, folder with name "${vars.folderName}" already exists ${folder.name ? `in ${folder.name}` : ""}`
@@ -74511,6 +75202,7 @@ const DeleteModal = ({
   useEffect(() => {
     checkRefsFunc().then((result) => {
       setHasRefs(result);
+    }).catch(() => {
     });
   }, [filename, checkRefsFunc]);
   return /* @__PURE__ */ React__default.createElement(Modal, null, /* @__PURE__ */ React__default.createElement(PopupModal, null, /* @__PURE__ */ React__default.createElement(ModalHeader, { close: close2 }, "Delete ", filename), /* @__PURE__ */ React__default.createElement(ModalBody, { padded: true }, /* @__PURE__ */ React__default.createElement("p", null, `Are you sure you want to delete ${filename}?${hasRefs ? " References to this document will also be deleted." : ""}`)), /* @__PURE__ */ React__default.createElement(ModalActions, null, /* @__PURE__ */ React__default.createElement(Button$2, { style: { flexGrow: 2 }, onClick: close2 }, "Cancel"), /* @__PURE__ */ React__default.createElement(
@@ -74519,7 +75211,10 @@ const DeleteModal = ({
       style: { flexGrow: 3 },
       variant: "danger",
       onClick: async () => {
-        await deleteFunc();
+        try {
+          await deleteFunc();
+        } catch {
+        }
         close2();
       }
     },
@@ -74657,6 +75352,18 @@ const shouldAutoOpenCollectionDocument = ({
   ((_b = (_a = collection.documents) == null ? void 0 : _a.edges) == null ? void 0 : _b.length) === 1 && // Check to make sure the file is not a folder
   ((_e = (_d = (_c = collection.documents) == null ? void 0 : _c.edges[0]) == null ? void 0 : _d.node) == null ? void 0 : _e.__typename) !== "Folder";
 };
+const UnableToLoadModal = ({ message }) => /* @__PURE__ */ React__default.createElement(Modal, null, /* @__PURE__ */ React__default.createElement(PopupModal, null, /* @__PURE__ */ React__default.createElement(ModalHeader, null, "Unable to load"), /* @__PURE__ */ React__default.createElement(ModalBody, { padded: true }, /* @__PURE__ */ React__default.createElement("div", { className: "tina-prose" }, message)), /* @__PURE__ */ React__default.createElement(ModalActions, null, /* @__PURE__ */ React__default.createElement("div", { className: "flex-1" }), /* @__PURE__ */ React__default.createElement(
+  Button$2,
+  {
+    style: { flexGrow: 1 },
+    className: "w-full",
+    variant: "primary",
+    onClick: () => {
+      window.location.reload();
+    }
+  },
+  "Reload"
+))));
 const isValidSortKey = (sortKey, collection) => {
   if (collection.fields) {
     const sortKeys = collection.fields.map((x) => x.name);
@@ -74697,10 +75404,13 @@ const useGetCollection = (cms, collectionName, includeDocuments = true, folder,
   useEffect(() => {
     let cancelled = false;
     const fetchCollection = async () => {
-      if (await api.isAuthenticated() && !folder.loading && !cancelled) {
-        const { name: name2, order } = JSON.parse(sortKey || "{}");
-        const validSortKey = isValidSortKey(name2, collectionExtra) ? name2 : void 0;
-        try {
+      if (folder.loading) {
+        return;
+      }
+      try {
+        if (await api.isAuthenticated() && !cancelled) {
+          const { name: name2, order } = JSON.parse(sortKey || "{}");
+          const validSortKey = isValidSortKey(name2, collectionExtra) ? name2 : void 0;
           const collection2 = await api.fetchCollection(
             collectionName,
             includeDocuments,
@@ -74711,14 +75421,21 @@ const useGetCollection = (cms, collectionName, includeDocuments = true, folder,
             filterArgs
           );
           setCollection(collection2);
-        } catch (error2) {
+        } else if (!cancelled) {
+          dispatchSessionExpired(cms.events);
+          setCollection(void 0);
+        }
+      } catch (error2) {
+        setCollection(void 0);
+        if (!isSessionExpiredError(error2)) {
           cms.alerts.error(
             `[${error2.name}] GetCollection failed: ${error2.message}`
           );
           console.error(error2);
-          setCollection(void 0);
           setError(error2);
         }
+      }
+      if (!cancelled) {
         setLoading(false);
       }
     };
@@ -74751,8 +75468,11 @@ const useSearchCollection = (cms, collectionName, includeDocuments = true, folde
   useEffect(() => {
     let cancelled = false;
     const searchCollection = async () => {
-      if (await api.isAuthenticated() && !folder.loading && !cancelled) {
-        try {
+      if (folder.loading) {
+        return;
+      }
+      try {
+        if (await api.isAuthenticated() && !cancelled) {
           const response = await cms.api.search.query(search, {
             limit: 15,
             cursor: after,
@@ -74765,6 +75485,15 @@ const useSearchCollection = (cms, collectionName, includeDocuments = true, folde
               return api.fetchDocument(collection2, relativePath, false);
             })
           );
+          if (docs.some(
+            (p) => p.status === "rejected" && isSessionExpiredError(p.reason)
+          )) {
+            setCollection(void 0);
+            if (!cancelled) {
+              setLoading(false);
+            }
+            return;
+          }
           const edges = docs.filter((p) => {
             var _a;
             return p.status === "fulfilled" && !!((_a = p.value) == null ? void 0 : _a.document);
@@ -74786,14 +75515,21 @@ const useSearchCollection = (cms, collectionName, includeDocuments = true, folde
             }
           };
           setCollection(collectionData);
-        } catch (error2) {
+        } else if (!cancelled) {
+          dispatchSessionExpired(cms.events);
+          setCollection(void 0);
+        }
+      } catch (error2) {
+        setCollection(void 0);
+        if (!isSessionExpiredError(error2)) {
           cms.alerts.error(
             `[${error2.name}] GetCollection failed: ${error2.message}`
           );
           console.error(error2);
-          setCollection(void 0);
           setError(error2);
         }
+      }
+      if (!cancelled) {
         setLoading(false);
       }
     };
@@ -74851,7 +75587,7 @@ const GetCollection = ({
   );
   useEffect(() => {
     var _a, _b, _c, _d;
-    if (loading) return;
+    if (loading || !collection) return;
     const collectionDefinition = cms.api.tina.schema.getCollection(
       collection.name
     );
@@ -74880,6 +75616,9 @@ const GetCollection = ({
   if (loading) {
     return /* @__PURE__ */ React__default.createElement(LoadingPage, null);
   }
+  if (!collection) {
+    return /* @__PURE__ */ React__default.createElement(UnableToLoadModal, { message: "This collection could not be loaded." });
+  }
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children(collection, loading, reFetchCollection, collectionExtra));
 };
 const createDocument = async (cms, collection, template, mutationInfo, folder, values) => {
@@ -74898,9 +75637,7 @@ const createDocument = async (cms, collection, template, mutationInfo, folder, v
   if (await api.isAuthenticated()) {
     await api.createDocument(collection, relativePath, params);
   } else {
-    const authMessage = `CreateDocument failed: User is no longer authenticated; please login and try again.`;
-    cms.alerts.error(authMessage);
-    console.error(authMessage);
+    dispatchSessionExpired(cms.events);
     return false;
   }
 };
@@ -75083,7 +75820,7 @@ const RenderForm$1 = ({
       onSubmit: async (values) => {
         try {
           const folderName2 = folder.fullyQualifiedName ? folder.name : "";
-          await createDocument(
+          const result = await createDocument(
             cms,
             collection,
             template,
@@ -75091,6 +75828,7 @@ const RenderForm$1 = ({
             folderName2,
             values
           );
+          if (result === false) return;
           cms.alerts.success("Document created!");
           setTimeout(() => {
             navigate(
@@ -75098,6 +75836,7 @@ const RenderForm$1 = ({
             );
           }, 10);
         } catch (error) {
+          if (isSessionExpiredError(error)) throw error;
           const defaultErrorText = "There was a problem saving your document.";
           if (error.message && error.message.includes(ERR_ALREADY_EXISTS)) {
             cms.alerts.error(
@@ -75160,8 +75899,8 @@ const useGetDocument = (cms, collectionName, relativePath) => {
   useEffect(() => {
     let isCancelled = false;
     const fetchDocument = async () => {
-      if (api.isAuthenticated() && !isCancelled) {
-        try {
+      try {
+        if (await api.isAuthenticated() && !isCancelled) {
           const response = await api.fetchDocument(
             collectionName,
             relativePath
@@ -75169,19 +75908,24 @@ const useGetDocument = (cms, collectionName, relativePath) => {
           if (!isCancelled) {
             setDocument(response.document);
           }
-        } catch (error2) {
-          if (!isCancelled) {
+        } else if (!isCancelled) {
+          dispatchSessionExpired(cms.events);
+          setDocument(void 0);
+        }
+      } catch (error2) {
+        if (!isCancelled) {
+          setDocument(void 0);
+          if (!isSessionExpiredError(error2)) {
             cms.alerts.error(
               `[${error2.name}] GetDocument failed: ${error2.message}`
             );
             console.error(error2);
-            setDocument(void 0);
             setError(error2);
           }
         }
-        if (!isCancelled) {
-          setLoading(false);
-        }
+      }
+      if (!isCancelled) {
+        setLoading(false);
       }
     };
     setLoading(true);
@@ -75209,6 +75953,9 @@ const GetDocument = ({
   if (loading) {
     return /* @__PURE__ */ React__default.createElement(LoadingPage, null);
   }
+  if (!document2) {
+    return /* @__PURE__ */ React__default.createElement(UnableToLoadModal, { message: "This document could not be loaded." });
+  }
   return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children(document2, loading));
 };
 const CollectionDuplicatePage = () => {
@@ -75260,9 +76007,7 @@ const updateDocument = async (cms, relativePath, collection, mutationInfo, value
   if (await api.isAuthenticated()) {
     await api.updateDocument(collection, relativePath, params);
   } else {
-    const authMessage = `UpdateDocument failed: User is no longer authenticated; please login and try again.`;
-    cms.alerts.error(authMessage);
-    console.error(authMessage);
+    dispatchSessionExpired(cms.events);
     return false;
   }
 };
@@ -75340,15 +76085,17 @@ const RenderForm = ({
       initialValues: document2._values,
       onSubmit: async (values) => {
         try {
-          await updateDocument(
+          const result = await updateDocument(
             cms,
             relativePath,
             collection,
             mutationInfo,
             values
           );
+          if (result === false) return;
           cms.alerts.success("Document updated!");
         } catch (error) {
+          if (isSessionExpiredError(error)) throw error;
           cms.alerts.error(
             () => ErrorDialog({
               title: "There was a problem saving your document",
@@ -75558,6 +76305,9 @@ const CheckSchema = ({
           );
         }
       }).catch((error) => {
+        if (isSessionExpiredError(error)) {
+          return;
+        }
         if (error.message.includes(ERR_NOT_INDEXED)) {
           setSchemaMissingError(true);
         } else {
@@ -75871,6 +76621,7 @@ export {
   BlocksFieldPlugin,
   BoldIcon$1 as BoldIcon,
   BranchButton,
+  BranchCreator,
   BranchDataProvider,
   BranchItem,
   BranchPreviewButton,
@@ -76021,6 +76772,7 @@ export {
   Select$1 as Select,
   SelectField,
   SelectFieldPlugin,
+  SessionExpiredError,
   SettingsIcon,
   StrikethroughIcon,
   StyledFile,
@@ -76073,6 +76825,7 @@ export {
   get,
   getFilteredBranchList,
   getStaticPropsForTina,
+  isSessionExpiredError,
   passwordFieldClasses,
   resolveField,
   safeAssertShape,