tinacms 3.7.2 → 3.7.4

package/dist/index.js

@@ -33939,8 +33939,12 @@ const MermaidElementWithRef = ({ config }) => {
   const mermaidRef = useRef(null);
   useEffect(() => {
     if (mermaidRef.current) {
-      mermaid.initialize({ startOnLoad: true });
-      mermaid.init();
+      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)));
@@ -33973,15 +33977,28 @@ const CodeBlockElement = withRef$1(
       if (element.lang !== "mermaid") {
         return;
       }
-      if (mermaid.parse(codeLineToString(element))) {
-        setCodeBlockError(null);
-      }
-    }, [element.children]);
-    mermaid.parseError = (err) => {
-      setCodeBlockError(
-        String(err.message) || "An error occurred while parsing the diagram."
-      );
-    };
+      let isCancelled = false;
+      const validateMermaid = async () => {
+        try {
+          await mermaid.parse(
+            codeLineToString(element)
+          );
+          if (!isCancelled) {
+            setCodeBlockError(null);
+          }
+        } catch (err) {
+          if (!isCancelled) {
+            setCodeBlockError(
+              String(err.message) || "An error occurred while parsing the diagram."
+            );
+          }
+        }
+      };
+      validateMermaid();
+      return () => {
+        isCancelled = true;
+      };
+    }, [element.children, element.lang]);
     return /* @__PURE__ */ React__default.createElement(
       PlateElement,
       {
@@ -38289,29 +38306,27 @@ class Form {
           const templateName = namePath.slice(0, currentPathIndex + 2).join(".");
           if ((item == null ? void 0 : item.type) === "img") {
             const imageName = namePath.slice(0, currentPathIndex + 2).join(".");
+            const imageBaseName = templateName.replace(/\.props$/, "");
             return {
-              ...formOrObjectField,
-              // name: [formOrObjectField.name, 'img'].join('.'),
+              label: "Image",
               name: [imageName].join("."),
               fields: [
                 {
                   type: "image",
-                  // label: 'URL',
-                  name: [templateName, "url"].join("."),
+                  label: "URL",
+                  name: [imageBaseName, "url"].join("."),
                   component: "image"
                 },
                 {
                   type: "string",
                   label: "Alt",
-                  name: [templateName.replace(/\.props$/, ""), "alt"].join("."),
+                  name: [imageBaseName, "alt"].join("."),
                   component: "text"
                 },
                 {
                   type: "string",
                   label: "Caption",
-                  name: [templateName.replace(/\.props$/, ""), "caption"].join(
-                    "."
-                  ),
+                  name: [imageBaseName, "caption"].join("."),
                   component: "text"
                 }
               ]
@@ -39571,12 +39586,6 @@ const ResetModal = ({ close: close2, reset: reset2 }) => {
     "Reset"
   ))));
 };
-function AiFillWarning(props) {
-  return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 1024 1024" }, "child": [{ "tag": "path", "attr": { "d": "M955.7 856l-416-720c-6.2-10.7-16.9-16-27.7-16s-21.6 5.3-27.7 16l-416 720C56 877.4 71.4 904 96 904h832c24.6 0 40-26.6 27.7-48zM480 416c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v184c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V416zm32 352a48.01 48.01 0 0 1 0-96 48.01 48.01 0 0 1 0 96z" }, "child": [] }] })(props);
-}
-function AiOutlineLoading(props) {
-  return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 1024 1024" }, "child": [{ "tag": "path", "attr": { "d": "M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.45 440.45 0 0 0-94.3-139.9 437.71 437.71 0 0 0-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150c47 47 83.9 101.8 109.7 162.7 26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36z" }, "child": [] }] })(props);
-}
 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) => {
@@ -40226,19 +40235,19 @@ const RadioOption = ({ checked, htmlFor, children, ...props }) => /* @__PURE__ *
   /* @__PURE__ */ React.createElement(
     "span",
     {
-      className: `relative h-[19px] w-[19px] rounded border text-indigo-600 focus:ring-indigo-500 transition ease-out duration-150 ${checked ? "border-blue-500 bg-blue-500 shadow-sm group-hover:bg-blue-400 group-hover:border-blue-400" : "border-gray-200 bg-white shadow-inner group-hover:bg-gray-100"}`
+      className: `relative flex h-[19px] w-[19px] items-center justify-center rounded-full border transition ease-out duration-150 ${checked ? "border-blue-500 bg-white shadow-sm group-hover:border-blue-400" : "border-gray-300 bg-white group-hover:border-blue-300"}`
     },
     /* @__PURE__ */ React.createElement(
-      BiCheck,
+      "span",
       {
-        className: `absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-[17px] h-[17px] transition ease-out duration-150 ${checked ? "opacity-100 text-white group-hover:opacity-80" : "text-blue-500 opacity-0 grou-hover:opacity-30"}`
+        className: `h-[9px] w-[9px] rounded-full bg-blue-500 transition ease-out duration-150 ${checked ? "scale-100 opacity-100 group-hover:bg-blue-400" : "scale-75 opacity-0"}`
       }
     )
   ),
   /* @__PURE__ */ React.createElement(
     "span",
     {
-      className: `relative transition ease-out duration-150 ${checked ? "text-gray-800 opacity-100" : "text-gray-700 opacity-70 group-hover:opacity-100"}`
+      className: `relative transition ease-out duration-150 ${checked ? "text-gray-800 opacity-100" : "text-gray-700 opacity-100 group-hover:text-gray-800"}`
     },
     children
   )
@@ -41935,13 +41944,8 @@ const ImageField = wrapFieldsWithMeta(
     async function onChange(media) {
       var _a2, _b;
       if (media) {
-        const parsedValue = (
-          // @ts-ignore
-          typeof ((_b = (_a2 = cms == null ? void 0 : cms.media) == null ? void 0 : _a2.store) == null ? void 0 : _b.parse) === "function" ? (
-            // @ts-ignore
-            cms.media.store.parse(media)
-          ) : media
-        );
+        const item = Array.isArray(media) ? media[0] : media;
+        const parsedValue = typeof ((_b = (_a2 = cms == null ? void 0 : cms.media) == null ? void 0 : _a2.store) == null ? void 0 : _b.parse) === "function" ? cms.media.store.parse(item) : item.src || item;
         props.input.onChange(parsedValue);
       }
     }
@@ -43774,6 +43778,38 @@ const PasswordFieldPlugin = {
   },
   parse: parse$2
 };
+const DefaultDisplayOnlyField = () => {
+  return /* @__PURE__ */ React.createElement("div", { className: "rounded-lg border border-gray-200 bg-gray-50 p-3 text-sm text-gray-500 italic" }, "Display-only field — provide a component via ", /* @__PURE__ */ React.createElement("code", null, "ui.component"));
+};
+const DisplayOnlyFieldPlugin = {
+  name: "displayOnly",
+  Component: wrapFieldWithNoHeader(DefaultDisplayOnlyField)
+};
+const InfoBox = ({
+  message,
+  links
+}) => {
+  const InfoBoxComponent = () => {
+    return /* @__PURE__ */ React.createElement("div", { className: "relative w-full px-2 mb-5 last:mb-0" }, /* @__PURE__ */ React.createElement("div", { className: "rounded-lg border border-blue-200 bg-blue-50 p-3 text-sm w-full" }, /* @__PURE__ */ React.createElement("p", { className: "text-gray-700 whitespace-normal break-words" }, message), links && links.length > 0 && /* @__PURE__ */ React.createElement("ul", { className: "flex flex-col gap-1 mt-2" }, links.map((link) => /* @__PURE__ */ React.createElement("li", { key: link.url }, /* @__PURE__ */ React.createElement(
+      "a",
+      {
+        href: link.url,
+        target: "_blank",
+        rel: "noopener noreferrer",
+        className: "text-blue-600 underline hover:text-blue-800"
+      },
+      link.text
+    ))))));
+  };
+  InfoBoxComponent.displayName = "InfoBox";
+  return InfoBoxComponent;
+};
+function AiFillWarning(props) {
+  return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 1024 1024" }, "child": [{ "tag": "path", "attr": { "d": "M955.7 856l-416-720c-6.2-10.7-16.9-16-27.7-16s-21.6 5.3-27.7 16l-416 720C56 877.4 71.4 904 96 904h832c24.6 0 40-26.6 27.7-48zM480 416c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v184c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V416zm32 352a48.01 48.01 0 0 1 0-96 48.01 48.01 0 0 1 0 96z" }, "child": [] }] })(props);
+}
+function AiOutlineLoading(props) {
+  return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 1024 1024" }, "child": [{ "tag": "path", "attr": { "d": "M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.45 440.45 0 0 0-94.3-139.9 437.71 437.71 0 0 0-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150c47 47 83.9 101.8 109.7 162.7 26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36z" }, "child": [] }] })(props);
+}
 function GrCircleQuestion(props) {
   return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 24 24" }, "child": [{ "tag": "path", "attr": { "fill": "none", "strokeWidth": "2", "d": "M12,22 C17.5228475,22 22,17.5228475 22,12 C22,6.4771525 17.5228475,2 12,2 C6.4771525,2 2,6.4771525 2,12 C2,17.5228475 6.4771525,22 12,22 Z M12,15 L12,14 C12,13 12,12.5 13,12 C14,11.5 15,11 15,9.5 C15,8.5 14,7 12,7 C10,7 9,8.26413718 9,10 M12,16 L12,18" }, "child": [] }] })(props);
 }
@@ -44179,6 +44215,9 @@ function BranchSelectorTable({
     null
   );
   const cms = useCMS$1();
+  const isCurrentBranchDeleted = !branchList.some(
+    (b) => b.name === currentBranch
+  );
   const columns = [
     {
       accessorKey: "name",
@@ -44355,7 +44394,7 @@ function BranchSelectorTable({
     {
       className: cn(
         "bg-transparent hover:!bg-transparent",
-        currentBranch === currentBranchData.name ? "border-l-[3px] border-l-tina-orange bg-[#f8fafc]" : ""
+        isCurrentBranchDeleted ? "border-l-[3px] border-l-yellow-400 bg-yellow-50" : "border-l-[3px] border-l-tina-orange bg-[#f8fafc]"
       )
     },
     /* @__PURE__ */ React.createElement(TableCell, null, /* @__PURE__ */ React.createElement("div", { className: "flex flex-col gap-2" }, /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-2" }, currentBranchData.protected ? /* @__PURE__ */ React.createElement(BiLockAlt, { className: "w-4 h-auto opacity-70 text-blue-500 flex-shrink-0" }) : /* @__PURE__ */ React.createElement(BiGitBranch, { className: "w-4 h-auto opacity-70 text-gray-600 flex-shrink-0" }), /* @__PURE__ */ React.createElement("p", { className: "font-bold" }, currentBranchData.name)), /* @__PURE__ */ React.createElement("div", { className: "w-fit mt-1" }, /* @__PURE__ */ React.createElement(
@@ -44367,6 +44406,15 @@ function BranchSelectorTable({
       },
       /* @__PURE__ */ React.createElement(BiPencil, { className: "w-3 h-auto inline-block mr-1" }),
       "Currently editing"
+    )), isCurrentBranchDeleted && /* @__PURE__ */ React.createElement("div", { className: "w-fit" }, /* @__PURE__ */ React.createElement(
+      Badge,
+      {
+        displayIcon: false,
+        calloutStyle: "warning",
+        className: "w-fit flex-shrink-0"
+      },
+      /* @__PURE__ */ React.createElement(AiFillWarning, { className: "w-3 h-auto inline-block mr-1" }),
+      "Branch no longer exists"
     )))),
     /* @__PURE__ */ React.createElement(TableCell, null, ((_e = currentBranchData.indexStatus) == null ? void 0 : _e.timestamp) && /* @__PURE__ */ React.createElement("div", null, formatDistanceToNow(
       new Date(currentBranchData.indexStatus.timestamp)
@@ -46100,10 +46148,10 @@ function GridMediaItem({ item, active, onClick }) {
     "button",
     {
       className: cn(
-        "relative flex flex-col items-center justify-center w-full outline-none",
+        "relative flex flex-col gap-1 items-center w-full outline-none rounded-lg overflow-hidden border-2 transition",
         {
-          "shadow hover:shadow-md hover:scale-103 hover:border-gray-150": !active,
-          "ring-2 ring-tina-orange": active,
+          "border-black/10 hover:border-tina-orange/50 shadow-sm hover:shadow-md bg-white": !active,
+          "border-tina-orange bg-tina-orange/10 shadow-md": active,
           "cursor-pointer": item.type === "dir"
         }
       ),
@@ -46115,35 +46163,23 @@ function GridMediaItem({ item, active, onClick }) {
         }
       }
     },
-    /* @__PURE__ */ React__default.createElement(
-      "span",
-      {
-        className: cn(
-          "absolute bottom-0 left-0 w-full text-xs text-white px-2 py-1 truncate z-10",
-          active ? "bg-tina-orange/60" : "bg-black/60"
-        ),
-        style: { pointerEvents: "none" }
-      },
-      item.filename
-    ),
     item.new && /* @__PURE__ */ React__default.createElement("span", { className: "absolute top-1 right-1 rounded shadow bg-green-100 border border-green-200 text-[10px] tracking-wide font-bold text-green-600 px-1.5 py-0.5 z-10" }, "NEW"),
-    /* @__PURE__ */ React__default.createElement("div", { className: "relative w-full flex items-center justify-center" }, itemIsImage ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(
+    /* @__PURE__ */ React__default.createElement("div", { className: "w-full overflow-hidden aspect-[1/1]" }, itemIsImage ? /* @__PURE__ */ React__default.createElement(
       "img",
       {
-        className: cn(
-          "block overflow-hidden object-center object-contain max-w-full max-h-[16rem] m-auto shadow"
-        ),
+        className: "block w-full h-full object-center object-cover",
         style: checkerboardStyle,
         src: thumbnail,
         alt: item.filename
       }
-    )) : /* @__PURE__ */ React__default.createElement("div", { className: "p-4 w-full flex flex-col gap-4 items-center justify-center" }, /* @__PURE__ */ React__default.createElement(
+    ) : /* @__PURE__ */ React__default.createElement("div", { className: "w-full h-full flex flex-col items-center justify-center" }, /* @__PURE__ */ React__default.createElement(
       FileIcon,
       {
         className: `w-[40%] h-auto ${item.type === "dir" ? "fill-tina-orange" : "fill-gray-300"}`,
         size: 40
       }
-    )))
+    ))),
+    /* @__PURE__ */ React__default.createElement("div", { className: "mt-auto w-full px-2 py-1 text-sm truncate" }, item.filename)
   ));
 }
 const DeleteModal$1 = ({
@@ -48004,7 +48040,7 @@ const NavProvider = ({
 const name = "tinacms";
 const type = "module";
 const typings = "dist/index.d.ts";
-const version$1 = "3.7.2";
+const version$1 = "3.7.4";
 const main = "dist/index.js";
 const module = "./dist/index.js";
 const exports = {
@@ -48104,7 +48140,7 @@ const dependencies = {
   "graphql-tag": "catalog:",
   "is-hotkey": "catalog:",
   "lucide-react": "catalog:",
-  mermaid: "9.3.0",
+  mermaid: "^11.12.2",
   moment: "catalog:",
   "moment-timezone": "^0.6.0",
   "monaco-editor": "catalog:",
@@ -48966,7 +49002,7 @@ const TreeNodeComponent = ({
     node3.children.length > 0 && /* @__PURE__ */ React.createElement(
       BiChevronRight,
       {
-        className: `w-4 h-4 text-gray-500 transition-transform duration-150 -ml-1 ${isExpanded ? "rotate-90" : ""}`
+        className: `w-4 h-4 flex-none text-gray-500 transition-transform duration-150 -ml-1 ${isExpanded ? "rotate-90" : ""}`
       }
     ),
     isExpanded ? /* @__PURE__ */ React.createElement(BiFolderOpen, { className: "w-4 h-4 text-orange-500 flex-none" }) : /* @__PURE__ */ React.createElement(BiFolder, { className: "w-4 h-4 text-orange-500 flex-none" }),
@@ -49057,16 +49093,21 @@ const FormLists = (props) => {
       onChange: (e3) => setShowReferences(e3.target.checked),
       className: "w-4 h-4 text-orange-500 border-gray-300 rounded focus:ring-orange-500"
     }
-  ), /* @__PURE__ */ React.createElement("span", null, "Show all references"))), /* @__PURE__ */ React.createElement("div", { className: "flex-1 overflow-x-auto overflow-y-auto min-h-0" }, cms.state.formLists.map((formList, index) => /* @__PURE__ */ React.createElement("div", { key: `${formList.id}-${index}` }, /* @__PURE__ */ React.createElement(
+  ), /* @__PURE__ */ React.createElement("span", null, "Show all references"))), /* @__PURE__ */ React.createElement("div", { className: "flex-1 overflow-x-auto overflow-y-auto min-h-0 pb-16" }, /* @__PURE__ */ React.createElement(
     FormList,
     {
       setActiveFormId: (id2) => {
         cms.dispatch({ type: "forms:set-active-form-id", value: id2 });
       },
-      formList,
+      formList: {
+        id: "merged",
+        label: "All",
+        items: cms.state.formLists.flatMap((fl) => fl.items),
+        formIds: cms.state.formLists.flatMap((fl) => fl.formIds)
+      },
       showReferences
     }
-  )))));
+  )));
 };
 const FormList = (props) => {
   const cms = useCMS();
@@ -49784,7 +49825,8 @@ const DEFAULT_FIELDS = [
   ReferenceFieldPlugin,
   ButtonToggleFieldPlugin,
   HiddenFieldPlugin,
-  PasswordFieldPlugin
+  PasswordFieldPlugin,
+  DisplayOnlyFieldPlugin
 ];
 class TinaCMS extends CMS {
   constructor({
@@ -66034,37 +66076,20 @@ const pathRelativeToCollection = (collectionPath, fullPath) => {
     `Path ${fullPath} not within collection path ${collectionPath}`
   );
 };
-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 WORKFLOW_STEPS = [
+  { id: 1, name: "Creating branch", description: "Setting up workspace" },
+  { id: 2, name: "Updating branch", description: "Syncing content to branch" },
+  { id: 3, name: "Creating pull request", description: "Preparing for review" }
+];
+const formatTime = (seconds) => {
+  const mins = Math.floor(seconds / 60);
+  const secs = seconds % 60;
+  return `${mins}:${secs.toString().padStart(2, "0")}`;
 };
-const CreateBranchModal = ({
-  close: close2,
-  safeSubmit,
-  path: path3,
-  values,
-  crudType,
-  tinaForm
-}) => {
+function useEditorialWorkflow() {
   const cms = useCMS$1();
   const tinaApi = cms.api.tina;
   const { setCurrentBranch } = useBranchData();
-  const [disabled, setDisabled] = React.useState(false);
-  const [newBranchName, setNewBranchName] = React.useState(
-    formatDefaultBranchName(path3, crudType)
-  );
   const [isExecuting, setIsExecuting] = React.useState(false);
   const [errorMessage, setErrorMessage] = React.useState("");
   const [currentStep, setCurrentStep] = React.useState(0);
@@ -66083,33 +66108,21 @@ const CreateBranchModal = ({
         clearInterval(interval);
     };
   }, [isExecuting, currentStep]);
-  const formatTime = (seconds) => {
-    const mins = Math.floor(seconds / 60);
-    const secs = seconds % 60;
-    return `${mins}:${secs.toString().padStart(2, "0")}`;
+  const reset2 = () => {
+    setErrorMessage("");
+    setIsExecuting(false);
+    setCurrentStep(0);
   };
-  const steps = [
-    {
-      id: 1,
-      name: "Creating branch",
-      description: "Setting up workspace"
-    },
-    {
-      id: 2,
-      name: "Updating branch",
-      description: "Syncing content to branch"
-    },
-    {
-      id: 3,
-      name: "Creating pull request",
-      description: "Preparing for review"
-    }
-  ];
-  const executeEditorialWorkflow = async () => {
+  const executeWorkflow = async ({
+    branchName,
+    baseBranch,
+    path: path3,
+    values,
+    crudType,
+    tinaForm
+  }) => {
     var _a2;
     try {
-      const branchName = `tina/${newBranchName}`;
-      setDisabled(true);
       setIsExecuting(true);
       setCurrentStep(1);
       let graphql2 = "";
@@ -66139,7 +66152,7 @@ const CreateBranchModal = ({
       const relativePath = pathRelativeToCollection(collection.path, path3);
       const result = await tinaApi.executeEditorialWorkflow({
         branchName,
-        baseBranch: tinaApi.branch,
+        baseBranch,
         prTitle: `${branchName.replace("tina/", "").replace("-", " ")} (PR from TinaCMS)`,
         graphQLContentOp: {
           query: graphql2,
@@ -66186,124 +66199,215 @@ const CreateBranchModal = ({
         const folderPath = relativePath.includes("/") ? relativePath.substring(0, relativePath.lastIndexOf("/")) : "";
         window.location.hash = `#/collections/${collection.name}${folderPath ? `/${folderPath}` : ""}`;
       }
-      close2();
+      return true;
     } catch (e3) {
       console.error(e3);
-      let errorMessage2 = "Branch operation failed. Talking to GitHub was unsuccessful, please try again. If the problem persists please contact support at https://tina.io/support 🦙";
+      let errMessage = "Branch operation failed. Talking to GitHub was unsuccessful, please try again. If the problem persists please contact support at https://tina.io/support 🦙";
       const err = e3;
       if (err.errorCode) {
         switch (err.errorCode) {
           case EDITORIAL_WORKFLOW_ERROR.BRANCH_EXISTS:
-            errorMessage2 = "A branch with this name already exists";
+            errMessage = "A branch with this name already exists";
             break;
           case EDITORIAL_WORKFLOW_ERROR.BRANCH_HIERARCHY_CONFLICT:
-            errorMessage2 = err.message || "Branch name conflicts with an existing branch";
+            errMessage = err.message || "Branch name conflicts with an existing branch";
             break;
           case EDITORIAL_WORKFLOW_ERROR.VALIDATION_FAILED:
-            errorMessage2 = err.message || "Invalid branch name";
+            errMessage = err.message || "Invalid branch name";
             break;
           default:
-            errorMessage2 = err.message || errorMessage2;
+            errMessage = err.message || errMessage;
             break;
         }
       } else if (err.message) {
         if (err.message.toLowerCase().includes("already exists")) {
-          errorMessage2 = "A branch with this name already exists";
+          errMessage = "A branch with this name already exists";
         } else if (err.message.toLowerCase().includes("conflict")) {
-          errorMessage2 = err.message;
+          errMessage = err.message;
         }
       }
-      setErrorMessage(errorMessage2);
-      setDisabled(false);
+      setErrorMessage(errMessage);
       setIsExecuting(false);
       setCurrentStep(0);
+      return false;
     }
   };
-  const renderProgressIndicator = () => {
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: "flex justify-between my-8 relative px-5 sm:gap-x-8" }, /* @__PURE__ */ React.createElement(
-      "div",
-      {
-        className: "absolute top-5 h-0.5 bg-gray-200 -z-10",
-        style: { left: "50px", right: "50px" }
+  return {
+    isExecuting,
+    errorMessage,
+    currentStep,
+    elapsedTime,
+    executeWorkflow,
+    reset: reset2
+  };
+}
+const WorkflowProgressIndicator = ({
+  currentStep,
+  isExecuting,
+  elapsedTime
+}) => {
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: "flex justify-between my-8 relative px-5 sm:gap-x-8" }, /* @__PURE__ */ React.createElement(
+    "div",
+    {
+      className: "absolute top-5 h-0.5 bg-gray-200 -z-10",
+      style: { left: "50px", right: "50px" }
+    }
+  ), currentStep > 1 && currentStep <= WORKFLOW_STEPS.length && /* @__PURE__ */ React.createElement(
+    "div",
+    {
+      className: "absolute top-5 h-0.5 bg-tina-orange -z-10 transition-all duration-500",
+      style: {
+        left: "50px",
+        width: `calc((100% - 100px) * ${(currentStep - 1) / (WORKFLOW_STEPS.length - 1)})`
       }
-    ), currentStep > 1 && currentStep <= steps.length && /* @__PURE__ */ React.createElement(
-      "div",
-      {
-        className: "absolute top-5 h-0.5 bg-tina-orange -z-10 transition-all duration-500",
-        style: {
-          left: "50px",
-          width: `calc((100% - 100px) * ${(currentStep - 1) / (steps.length - 1)})`
-        }
+    }
+  ), currentStep > 2 && /* @__PURE__ */ React.createElement(
+    "div",
+    {
+      className: "absolute top-5 h-0.5 bg-green-500 -z-10 transition-all duration-500",
+      style: {
+        left: "50px",
+        width: `calc((100% - 100px) * ${Math.min(1, (currentStep - 2) / (WORKFLOW_STEPS.length - 1))})`
       }
-    ), currentStep > 2 && /* @__PURE__ */ React.createElement(
+    }
+  ), WORKFLOW_STEPS.map((step, index) => {
+    const stepNumber = index + 1;
+    const isActive = stepNumber === currentStep;
+    const isCompleted = stepNumber < currentStep;
+    return /* @__PURE__ */ React.createElement("div", { key: step.id, className: "flex flex-col items-center relative" }, /* @__PURE__ */ React.createElement(
       "div",
       {
-        className: "absolute top-5 h-0.5 bg-green-500 -z-10 transition-all duration-500",
-        style: {
-          left: "50px",
-          width: `calc((100% - 100px) * ${Math.min(1, (currentStep - 2) / (steps.length - 1))})`
-        }
-      }
-    ), steps.map((step, index) => {
-      const stepNumber = index + 1;
-      const isActive = stepNumber === currentStep;
-      const isCompleted = stepNumber < currentStep;
-      return /* @__PURE__ */ React.createElement(
-        "div",
+        className: `w-10 h-10 rounded-full flex items-center justify-center font-medium mb-3 border-2 transition-all duration-300 select-none ${isCompleted ? "bg-green-500 border-green-500 text-white" : isActive ? "bg-tina-orange border-tina-orange text-white" : "bg-white border-gray-200 text-gray-400"}`
+      },
+      isCompleted ? /* @__PURE__ */ React.createElement(
+        "svg",
         {
-          key: step.id,
-          className: "flex flex-col items-center relative"
+          className: "w-5 h-5",
+          fill: "currentColor",
+          viewBox: "0 0 20 20"
         },
         /* @__PURE__ */ React.createElement(
-          "div",
+          "path",
           {
-            className: `w-10 h-10 rounded-full flex items-center justify-center font-medium mb-3 border-2 transition-all duration-300 select-none ${isCompleted ? "bg-green-500 border-green-500 text-white" : isActive ? "bg-tina-orange border-tina-orange text-white" : "bg-white border-gray-200 text-gray-400"}`
-          },
-          isCompleted ? /* @__PURE__ */ React.createElement(
-            "svg",
-            {
-              className: "w-5 h-5",
-              fill: "currentColor",
-              viewBox: "0 0 20 20"
-            },
-            /* @__PURE__ */ React.createElement(
-              "path",
-              {
-                fillRule: "evenodd",
-                d: "M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z",
-                clipRule: "evenodd"
-              }
-            )
-          ) : isActive ? /* @__PURE__ */ React.createElement(AiOutlineLoading, { className: "animate-spin text-lg" }) : stepNumber
-        ),
-        /* @__PURE__ */ React.createElement("div", { className: "text-center max-w-24" }, /* @__PURE__ */ React.createElement("div", { className: "text-sm font-semibold leading-tight" }, step.name), /* @__PURE__ */ React.createElement("div", { className: "text-xs text-gray-400 mt-1 leading-tight" }, step.description))
+            fillRule: "evenodd",
+            d: "M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z",
+            clipRule: "evenodd"
+          }
+        )
+      ) : isActive ? /* @__PURE__ */ React.createElement(AiOutlineLoading, { className: "animate-spin text-lg" }) : stepNumber
+    ), /* @__PURE__ */ React.createElement("div", { className: "text-center max-w-24" }, /* @__PURE__ */ React.createElement("div", { className: "text-sm font-semibold leading-tight" }, step.name), /* @__PURE__ */ React.createElement("div", { className: "text-xs text-gray-400 mt-1 leading-tight" }, step.description)));
+  })), /* @__PURE__ */ React.createElement("div", { className: "flex items-center justify-between" }, /* @__PURE__ */ React.createElement("div", { className: "text-xs text-gray-500" }, "Estimated time: 1-2 min"), isExecuting && currentStep > 0 && /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-1 text-sm text-gray-500 tabular-nums" }, /* @__PURE__ */ React.createElement("svg", { className: "w-4 h-4", fill: "currentColor", viewBox: "0 0 20 20" }, /* @__PURE__ */ React.createElement(
+    "path",
+    {
+      fillRule: "evenodd",
+      d: "M10 18a8 8 0 100-16 8 8 0 000 16zm1-12a1 1 0 10-2 0v4a1 1 0 00.293.707l2.828 2.829a1 1 0 101.415-1.415L11 9.586V6z",
+      clipRule: "evenodd"
+    }
+  )), formatTime(elapsedTime))), /* @__PURE__ */ React.createElement(
+    "a",
+    {
+      className: "underline text-tina-orange-dark font-medium text-xs",
+      href: "https://tina.io/docs/r/editorial-workflow",
+      target: "_blank"
+    },
+    "Learn more about Editorial Workflow"
+  ));
+};
+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,
+  path: path3,
+  values,
+  crudType,
+  tinaForm,
+  onBaseBranchDeleted
+}) => {
+  const cms = useCMS$1();
+  const tinaApi = cms.api.tina;
+  const [newBranchName, setNewBranchName] = React.useState(
+    formatDefaultBranchName(path3, crudType)
+  );
+  const [isBranchGuardChecking, setIsBranchGuardChecking] = React.useState(false);
+  const {
+    isExecuting,
+    errorMessage,
+    currentStep,
+    elapsedTime,
+    executeWorkflow,
+    reset: reset2
+  } = useEditorialWorkflow();
+  const executeEditorialWorkflow = async () => {
+    setIsBranchGuardChecking(true);
+    const baseBranch = decodeURIComponent(tinaApi.branch);
+    let baseBranchExists = true;
+    try {
+      console.debug(
+        "[tina:branch-guard] executeEditorialWorkflow: checking base branch:",
+        baseBranch
       );
-    })), /* @__PURE__ */ React.createElement("div", { className: "flex items-center justify-between" }, /* @__PURE__ */ React.createElement("div", { className: "text-xs text-gray-500" }, "Estimated time: 1-2 min "), isExecuting && currentStep > 0 && /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-1 text-sm text-gray-500 tabular-nums" }, /* @__PURE__ */ React.createElement("svg", { className: "w-4 h-4", fill: "currentColor", viewBox: "0 0 20 20" }, /* @__PURE__ */ React.createElement(
-      "path",
-      {
-        fillRule: "evenodd",
-        d: "M10 18a8 8 0 100-16 8 8 0 000 16zm1-12a1 1 0 10-2 0v4a1 1 0 00.293.707l2.828 2.829a1 1 0 101.415-1.415L11 9.586V6z",
-        clipRule: "evenodd"
-      }
-    )), formatTime(elapsedTime))), /* @__PURE__ */ React.createElement(
-      "a",
-      {
-        className: "underline text-tina-orange-dark font-medium text-xs",
-        href: "https://tina.io/docs/tinacloud/editorial-workflow",
-        target: "_blank"
-      },
-      "Learn more about Editorial Workflow"
-    ));
+      baseBranchExists = await tinaApi.branchExists(baseBranch);
+    } catch (err) {
+      console.error(
+        "[tina:branch-guard] executeEditorialWorkflow: branchExists threw, failing open:",
+        err
+      );
+    }
+    console.debug(
+      "[tina:branch-guard] executeEditorialWorkflow: base branch exists?",
+      baseBranchExists
+    );
+    if (!baseBranchExists) {
+      console.debug(
+        "[tina:branch-guard] executeEditorialWorkflow: base branch deleted — handing off"
+      );
+      onBaseBranchDeleted == null ? void 0 : onBaseBranchDeleted();
+      return;
+    }
+    setIsBranchGuardChecking(false);
+    const success = await executeWorkflow({
+      branchName: `tina/${newBranchName}`,
+      baseBranch,
+      path: path3,
+      values,
+      crudType,
+      tinaForm
+    });
+    if (success) {
+      close2();
+    }
   };
   const renderStateContent = () => {
     if (isExecuting) {
-      return renderProgressIndicator();
+      return /* @__PURE__ */ React.createElement(
+        WorkflowProgressIndicator,
+        {
+          currentStep,
+          isExecuting,
+          elapsedTime
+        }
+      );
     } else {
       return /* @__PURE__ */ React.createElement("div", { className: "max-w-sm" }, errorMessage && /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-1 text-red-700 py-2 px-3 mb-4 bg-red-50 border border-red-200 rounded" }, /* @__PURE__ */ React.createElement(BiError, { className: "w-5 h-auto text-red-400 flex-shrink-0" }), /* @__PURE__ */ React.createElement("span", { className: "text-sm" }, /* @__PURE__ */ React.createElement("b", null, "Error:"), " ", errorMessage)), /* @__PURE__ */ React.createElement("p", { className: "text-lg text-gray-700 font-bold mb-2" }, "First, let's create a copy"), /* @__PURE__ */ React.createElement("p", { className: "text-sm text-gray-700 mb-4 max-w-sm" }, "To make changes, you need to create a copy then get it approved and merged for it to go live.", /* @__PURE__ */ React.createElement("br", null), /* @__PURE__ */ React.createElement("br", null), /* @__PURE__ */ React.createElement("span", { className: "text-gray-500" }, "Learn more about "), /* @__PURE__ */ React.createElement(
         "a",
         {
           className: "underline text-tina-orange-dark font-medium",
-          href: "https://tina.io/docs/tinacloud/editorial-workflow",
+          href: "https://tina.io/docs/r/editorial-workflow",
           target: "_blank"
         },
         "Editorial Workflow"
@@ -66315,7 +66419,7 @@ const CreateBranchModal = ({
           placeholder: "e.g. {{PAGE-NAME}}-updates",
           value: newBranchName,
           onChange: (e3) => {
-            setErrorMessage("");
+            reset2();
             setNewBranchName(e3.target.value);
           }
         }
@@ -66336,7 +66440,7 @@ const CreateBranchModal = ({
       variant: "primary",
       align: "start",
       className: "w-full sm:w-auto",
-      disabled: newBranchName === "" || disabled,
+      disabled: newBranchName === "" || isBranchGuardChecking,
       onMainAction: executeEditorialWorkflow,
       items: [
         {
@@ -66374,6 +66478,89 @@ const PrefixedTextField = ({
     }
   )));
 };
+const BranchDeletedModal = ({
+  branchName,
+  close: close2,
+  path: path3,
+  values,
+  crudType,
+  tinaForm
+}) => {
+  const cms = useCMS$1();
+  const tinaApi = cms.api.tina;
+  const [newBranchName, setNewBranchName] = React.useState("");
+  const baseBranch = tinaApi.protectedBranches[0] || cms.api.tina.schema.config.config.repoProvider.defaultBranchName || "main";
+  const {
+    isExecuting,
+    errorMessage,
+    currentStep,
+    elapsedTime,
+    executeWorkflow,
+    reset: reset2
+  } = useEditorialWorkflow();
+  const handleCreate = async () => {
+    const success = await executeWorkflow({
+      branchName: `tina/${newBranchName}`,
+      baseBranch,
+      path: path3,
+      values,
+      crudType,
+      tinaForm
+    });
+    if (success)
+      close2();
+  };
+  return /* @__PURE__ */ React.createElement(Modal, { className: "flex" }, /* @__PURE__ */ React.createElement(PopupModal, { className: "w-auto" }, /* @__PURE__ */ React.createElement(ModalHeader, { close: isExecuting ? void 0 : close2 }, "Branch no longer exists"), /* @__PURE__ */ React.createElement(ModalBody, { padded: true }, isExecuting ? /* @__PURE__ */ React.createElement(
+    WorkflowProgressIndicator,
+    {
+      currentStep,
+      isExecuting,
+      elapsedTime
+    }
+  ) : /* @__PURE__ */ React.createElement("div", { className: "max-w-sm" }, /* @__PURE__ */ React.createElement("div", { className: "flex items-start gap-3 p-3 mb-4 bg-yellow-50 border border-yellow-200 rounded text-yellow-800 text-sm" }, /* @__PURE__ */ React.createElement(
+    GitBranchIcon,
+    {
+      className: "w-4 h-4 mt-0.5 flex-shrink-0 text-yellow-600",
+      style: { fill: "none" }
+    }
+  ), /* @__PURE__ */ React.createElement("span", null, "The branch", " ", /* @__PURE__ */ React.createElement("span", { className: "font-mono font-semibold" }, branchName), " ", "no longer exists. It may have been merged or deleted. Your changes cannot be pushed to it.")), /* @__PURE__ */ React.createElement("p", { className: "text-sm text-gray-700 mb-4" }, "Create a new branch from", " ", /* @__PURE__ */ React.createElement("span", { className: "font-mono font-semibold" }, baseBranch), " to continue editing, or cancel and switch to an existing branch from the branch menu."), errorMessage && /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-1 text-red-700 py-2 px-3 mb-4 bg-red-50 border border-red-200 rounded" }, /* @__PURE__ */ React.createElement(BiError, { className: "w-5 h-auto text-red-400 flex-shrink-0" }), /* @__PURE__ */ React.createElement("span", { className: "text-sm" }, /* @__PURE__ */ React.createElement("b", null, "Error:"), " ", errorMessage)), /* @__PURE__ */ React.createElement(
+    PrefixedTextField,
+    {
+      name: "new-branch-name",
+      label: "New Branch Name",
+      placeholder: "e.g. my-updates",
+      value: newBranchName,
+      onChange: (e3) => {
+        reset2();
+        setNewBranchName(formatBranchName(e3.target.value));
+      }
+    }
+  ))), !isExecuting && /* @__PURE__ */ React.createElement(ModalActions, { align: "end" }, /* @__PURE__ */ React.createElement(
+    Button$2,
+    {
+      variant: "secondary",
+      className: "w-full sm:w-auto",
+      onClick: close2
+    },
+    "Cancel"
+  ), /* @__PURE__ */ React.createElement(
+    Button$2,
+    {
+      variant: "primary",
+      className: "w-full sm:w-auto",
+      disabled: !newBranchName,
+      onClick: handleCreate
+    },
+    /* @__PURE__ */ React.createElement(
+      GitBranchIcon,
+      {
+        className: "w-4 h-4 mr-1",
+        style: { fill: "none" }
+      }
+    ),
+    "Create new branch"
+  ))));
+};
 const NoFieldsPlaceholder = () => /* @__PURE__ */ React.createElement(
   "div",
   {
@@ -66430,6 +66617,8 @@ const FormBuilder = ({
   const cms = useCMS$1();
   const hideFooter = !!rest.hideFooter;
   const [createBranchModalOpen, setCreateBranchModalOpen] = React.useState(false);
+  const [deletedBranchModalOpen, setDeletedBranchModalOpen] = React.useState(false);
+  const [isGuardChecking, setIsGuardChecking] = React.useState(false);
   const tinaForm = form.tinaForm;
   const finalForm = form.tinaForm.finalForm;
   React.useEffect(() => {
@@ -66489,26 +66678,79 @@ const FormBuilder = ({
       const canSubmit = !pristine && !submitting && !hasValidationErrors && !(invalid && !dirtySinceLastSubmit);
       const safeSubmit = async () => {
         if (canSubmit) {
+          const alertsBefore = new Set(cms.alerts.all.map((a2) => a2.id));
+          console.debug(
+            "[tina:branch-guard] safeSubmit: calling handleSubmit"
+          );
           const result = await handleSubmit();
           if (result && result[FORM_ERROR]) {
             const error2 = result[FORM_ERROR];
+            const errorMsg = error2 instanceof Error ? error2.message : String(error2);
+            console.debug(
+              "[tina:branch-guard] safeSubmit: FORM_ERROR detected:",
+              errorMsg
+            );
+            if (/branch.*not found/i.test(errorMsg)) {
+              console.debug(
+                "[tina:branch-guard] safeSubmit: branch-not-found — dismissing alert and opening modal"
+              );
+              for (const alert of cms.alerts.all) {
+                if (!alertsBefore.has(alert.id) && alert.level === "error") {
+                  cms.alerts.dismiss(alert);
+                }
+              }
+              setDeletedBranchModalOpen(true);
+              return;
+            }
             captureEvent(SaveContentErrorEvent, {
               documentPath: tinaForm.path,
-              error: error2 instanceof Error ? error2.message : String(error2)
+              error: errorMsg
             });
           } else {
             captureEvent(SavedContentEvent, {
               documentPath: tinaForm.path
             });
           }
+        } else {
+          console.debug(
+            "[tina:branch-guard] safeSubmit: skipped — canSubmit is false"
+          );
         }
       };
       const safeHandleSubmit = async () => {
+        setIsGuardChecking(true);
+        const currentBranch = decodeURIComponent(cms.api.tina.getBranch());
+        let exists = true;
+        try {
+          console.debug(
+            "[tina:branch-guard] safeHandleSubmit: checking branch:",
+            currentBranch
+          );
+          exists = await cms.api.tina.branchExists(currentBranch);
+        } catch (err) {
+          console.error(
+            "[tina:branch-guard] safeHandleSubmit: branchExists threw, failing open:",
+            err
+          );
+        }
+        console.debug(
+          "[tina:branch-guard] safeHandleSubmit: branchExists returned:",
+          exists
+        );
+        if (!exists) {
+          console.debug(
+            "[tina:branch-guard] safeHandleSubmit: branch missing — opening modal"
+          );
+          setIsGuardChecking(false);
+          setDeletedBranchModalOpen(true);
+          return;
+        }
         if (usingProtectedBranch) {
           setCreateBranchModalOpen(true);
         } else {
-          safeSubmit();
+          await safeSubmit();
         }
+        setIsGuardChecking(false);
       };
       return /* @__PURE__ */ React.createElement(React.Fragment, null, createBranchModalOpen && /* @__PURE__ */ React.createElement(
         CreateBranchModal,
@@ -66518,7 +66760,21 @@ const FormBuilder = ({
           path: tinaForm.path,
           values: tinaForm.values,
           tinaForm,
-          close: () => setCreateBranchModalOpen(false)
+          close: () => setCreateBranchModalOpen(false),
+          onBaseBranchDeleted: () => {
+            setCreateBranchModalOpen(false);
+            setDeletedBranchModalOpen(true);
+          }
+        }
+      ), deletedBranchModalOpen && /* @__PURE__ */ React.createElement(
+        BranchDeletedModal,
+        {
+          branchName: decodeURIComponent(cms.api.tina.getBranch()),
+          close: () => setDeletedBranchModalOpen(false),
+          path: tinaForm.path,
+          values: tinaForm.values,
+          crudType: tinaForm.crudType,
+          tinaForm
         }
       ), /* @__PURE__ */ React.createElement(DragDropContext, { onDragEnd: moveArrayItem }, /* @__PURE__ */ React.createElement(FormKeyBindings, { onSubmit: safeHandleSubmit }), /* @__PURE__ */ React.createElement(FormPortalProvider, null, /* @__PURE__ */ React.createElement(FormWrapper, { id: tinaForm.id }, (tinaForm == null ? void 0 : tinaForm.fields.length) ? /* @__PURE__ */ React.createElement(
         FieldsBuilder,
@@ -66542,8 +66798,8 @@ const FormBuilder = ({
         Button$2,
         {
           onClick: safeHandleSubmit,
-          disabled: !canSubmit,
-          busy: submitting,
+          disabled: !canSubmit || isGuardChecking,
+          busy: submitting || isGuardChecking,
           variant: "primary"
         },
         submitting && /* @__PURE__ */ React.createElement(LoadingDots, null),
@@ -68183,7 +68439,9 @@ const useImageToolbarButton = (state) => {
       allowDelete: true,
       directory: "",
       onSelect: (media) => {
-        insertImg(editor, media);
+        var _a2, _b;
+        const src = typeof ((_b = (_a2 = cms == null ? void 0 : cms.media) == null ? void 0 : _a2.store) == null ? void 0 : _b.parse) === "function" ? cms.media.store.parse(media) : media.src;
+        insertImg(editor, { ...media, src: src || media.src });
       }
     });
   };
@@ -121847,6 +122105,12 @@ mutation addPendingDocumentMutation(
     var _a2;
     return this.usingEditorialWorkflow && ((_a2 = this.protectedBranches) == null ? void 0 : _a2.includes(decodeURIComponent(this.branch)));
   }
+  async branchExists(branchName) {
+    if (this.isLocalMode)
+      return true;
+    const branches = await this.listBranches({ includeIndexStatus: false });
+    return branches.some((b) => b.name === branchName);
+  }
   async createBranch({ baseBranch, branchName }) {
     const url = `${this.contentApiBase}/github/${this.clientId}/create_branch`;
     try {
@@ -124754,7 +125018,7 @@ const RenderForm$1 = ({
         }
         return true;
       }
-      const isValid = /[\.\-_\/a-zA-Z0-9]*$/.test(value);
+      const isValid = /^[\.\-_\/a-zA-Z0-9]*$/.test(value);
       if (value && !isValid) {
         return "Must contain only a-z, A-Z, 0-9, -, _, ., or /.";
       }
@@ -125134,6 +125398,16 @@ const ScreenPage = () => {
     } })));
   });
 };
+const TROUBLESHOOTING_URL = "https://tina.io/docs/tinacloud/troubleshooting";
+const ErrorModalContent = (props) => {
+  const { title, message } = props;
+  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement("div", null, title), /* @__PURE__ */ React__default.createElement("p", null, message), /* @__PURE__ */ React__default.createElement("a", { href: TROUBLESHOOTING_URL, target: "_blank", rel: "noopener noreferrer" }, "Learn more"));
+};
+const showErrorModal = (title, message, cms) => {
+  if (cms.alerts.all.some((a2) => a2.level === "error"))
+    return;
+  cms.alerts.error(() => /* @__PURE__ */ React__default.createElement(ErrorModalContent, { title, message }));
+};
 const getBackendType = (client) => {
   var _a2, _b, _c;
   if (!client)
@@ -125252,21 +125526,22 @@ const CheckSchema = ({
         localSchema: schemaJson
       }).then((isSchemaMatchedToCloud) => {
         if (isSchemaMatchedToCloud === false) {
-          cms.alerts.error(
-            `GraphQL Schema Mismatch - Editing may not work. 
-              
-              If you just switched branches, try going back to the previous branch.
-              
-              If you just pushed changes to the branch, try pulling the latest changes.
-              
-              For more information, please see https://tina.io/docs/tinacloud/troubleshooting`
+          showErrorModal(
+            "GraphQL Schema Mismatch",
+            "Editing may not work. If you just switched branches, try going back to the previous branch. If you just pushed changes, try pulling the latest.",
+            cms
           );
         }
       }).catch((error2) => {
         if (error2.message.includes("has not been indexed by TinaCloud")) {
           setSchemaMissingError(true);
         } else {
-          cms.alerts.error(`Unexpected error checking schema: ${error2}`);
+          console.error("Unexpected error checking schema:", error2);
+          showErrorModal(
+            "Unexpected Error",
+            "An unexpected error occurred while validating your Tina schema. If after refreshing the issue persists, reach out to us on Discord.",
+            cms
+          );
           throw error2;
         }
       });
@@ -125604,6 +125879,7 @@ export {
   DateFieldPlugin,
   DeleteImageButton,
   Dismissible,
+  DisplayOnlyFieldPlugin,
   DragHandle,
   DragIcon,
   DropdownButton,
@@ -125651,6 +125927,7 @@ export {
   ImageField,
   ImageFieldPlugin,
   ImageUpload,
+  InfoBox,
   InfoIcon,
   Input$1 as Input,
   ItalicIcon$1 as ItalicIcon,

package/dist/internalClient/index.d.ts

@@ -147,6 +147,7 @@ export declare class Client {
         githubPullRequestUrl?: string;
     }[]>;
     usingProtectedBranch(): boolean;
+    branchExists(branchName: string): Promise<boolean>;
     createBranch({ baseBranch, branchName }: BranchData): Promise<string>;
     getLatestVersion(): Promise<LatestVersionResponse>;
     /**

package/dist/toolkit/core/media.d.ts

@@ -71,6 +71,13 @@ export interface MediaStore {
      * @default false
      */
     isStatic?: boolean;
+    /**
+     * Converts a Media object to the value stored in a form field.
+     *
+     * Typically returns `media.src`. If not implemented, the image field
+     * plugin falls back to `media.src`.
+     */
+    parse?(media: Media): string;
 }
 export declare type MediaListOffset = string | number;
 /**

package/dist/toolkit/fields/plugins/display-only-field-plugin.d.ts

@@ -0,0 +1,12 @@
+import * as React from 'react';
+export declare const DisplayOnlyFieldPlugin: {
+    name: string;
+    Component: (props: any) => React.JSX.Element;
+};
+export declare const InfoBox: ({ message, links, }: {
+    message: string;
+    links?: {
+        text: string;
+        url: string;
+    }[];
+}) => React.FC<any>;

package/dist/toolkit/fields/plugins/index.d.ts

@@ -18,3 +18,4 @@ export * from './reference-field-plugin';
 export * from './button-toggle-field-plugin';
 export * from './hidden-field-plugin';
 export * from './password-field-plugin';
+export * from './display-only-field-plugin';

package/dist/toolkit/form-builder/branch-deleted-modal.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { Form } from '../forms';
+export declare const BranchDeletedModal: ({ branchName, close, path, values, crudType, tinaForm, }: {
+    branchName: string;
+    close: () => void;
+    path: string;
+    values: Record<string, unknown>;
+    crudType: string;
+    tinaForm?: Form;
+}) => React.JSX.Element;

package/dist/toolkit/form-builder/create-branch-modal.d.ts

@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { Form } from '../forms';
-export declare const CreateBranchModal: ({ close, safeSubmit, path, values, crudType, tinaForm, }: {
+export declare const CreateBranchModal: ({ close, safeSubmit, path, values, crudType, tinaForm, onBaseBranchDeleted, }: {
     safeSubmit: () => Promise<void>;
     close: () => void;
     path: string;
     values: Record<string, unknown>;
     crudType: string;
     tinaForm?: Form;
+    onBaseBranchDeleted?: () => void;
 }) => React.JSX.Element;
 export declare const PrefixedTextField: ({ label, prefix, ...props }: {
     [x: string]: any;

package/dist/toolkit/form-builder/use-editorial-workflow.d.ts

@@ -0,0 +1,26 @@
+import { Form } from '../forms';
+export declare const WORKFLOW_STEPS: {
+    id: number;
+    name: string;
+    description: string;
+}[];
+export declare const formatTime: (seconds: number) => string;
+export interface ExecuteWorkflowOptions {
+    branchName: string;
+    baseBranch: string;
+    path: string;
+    values: Record<string, unknown>;
+    crudType: string;
+    tinaForm?: Form;
+}
+export interface UseEditorialWorkflowResult {
+    isExecuting: boolean;
+    errorMessage: string;
+    currentStep: number;
+    elapsedTime: number;
+    /** Returns true on success, false on failure (error captured in errorMessage) */
+    executeWorkflow: (opts: ExecuteWorkflowOptions) => Promise<boolean>;
+    /** Reset error/executing state so the form can be retried */
+    reset: () => void;
+}
+export declare function useEditorialWorkflow(): UseEditorialWorkflowResult;

package/dist/toolkit/form-builder/workflow-progress-indicator.d.ts

@@ -0,0 +1,8 @@
+import * as React from 'react';
+interface WorkflowProgressIndicatorProps {
+    currentStep: number;
+    isExecuting: boolean;
+    elapsedTime: number;
+}
+export declare const WorkflowProgressIndicator: ({ currentStep, isExecuting, elapsedTime, }: WorkflowProgressIndicatorProps) => React.JSX.Element;
+export {};

package/package.json

@@ -2,7 +2,7 @@
   "name": "tinacms",
   "type": "module",
   "typings": "dist/index.d.ts",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "main": "dist/index.js",
   "module": "./dist/index.js",
   "exports": {
@@ -93,7 +93,7 @@
     "graphql-tag": "^2.12.6",
     "is-hotkey": "^0.2.0",
     "lucide-react": "^0.424.0",
-    "mermaid": "9.3.0",
+    "mermaid": "^11.12.2",
     "moment": "2.29.4",
     "moment-timezone": "^0.6.0",
     "monaco-editor": "0.31.0",
@@ -114,9 +114,9 @@
     "webfontloader": "1.6.28",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/mdx": "2.1.1",
-    "@tinacms/schema-tools": "2.7.1",
-    "@tinacms/search": "1.2.9"
+    "@tinacms/mdx": "2.1.2",
+    "@tinacms/schema-tools": "2.7.2",
+    "@tinacms/search": "1.2.11"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.8.1",