@ohhwells/bridge 0.1.39 → 0.1.40

package/dist/index.js

@@ -1,7 +1,7 @@
 "use client";
 
 // src/OhhwellsBridge.tsx
-import React9, { useCallback as useCallback2, useEffect as useEffect4, useLayoutEffect as useLayoutEffect2, useRef as useRef4, useState as useState5 } from "react";
+import React9, { useCallback as useCallback3, useEffect as useEffect7, useLayoutEffect as useLayoutEffect2, useRef as useRef5, useState as useState6 } from "react";
 import { createRoot } from "react-dom/client";
 import { flushSync } from "react-dom";
 
@@ -10,6 +10,9 @@ var linkHrefStore = /* @__PURE__ */ new Map();
 function setStoredLinkHref(key, href) {
   linkHrefStore.set(key, href);
 }
+function getStoredLinkHref(key) {
+  return linkHrefStore.get(key);
+}
 function enforceLinkHrefs() {
   document.querySelectorAll("[data-ohw-href-key]").forEach((el) => {
     const key = el.getAttribute("data-ohw-href-key") ?? "";
@@ -4349,6 +4352,7 @@ function ItemActionToolbar({
   onEditLink,
   onAddItem,
   onMore,
+  editLinkDisabled = false,
   addItemDisabled = true,
   moreDisabled = true,
   tooltipSide = "bottom"
@@ -4357,10 +4361,12 @@ function ItemActionToolbar({
     /* @__PURE__ */ jsx8(
       ToolbarActionTooltip,
       {
-        label: "Add link",
+        label: "Edit link",
         side: tooltipSide,
+        disabled: editLinkDisabled,
         buttonProps: {
           onMouseDown: (e) => {
+            if (editLinkDisabled) return;
             e.preventDefault();
             e.stopPropagation();
             onEditLink?.();
@@ -4747,8 +4753,8 @@ function MediaOverlay({
 }
 
 // src/OhhwellsBridge.tsx
-import { createPortal } from "react-dom";
-import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { createPortal as createPortal2 } from "react-dom";
+import { usePathname as usePathname2, useRouter as useRouter2, useSearchParams } from "next/navigation";
 
 // src/lib/session-search.ts
 var STORAGE_KEY = "ohw-preserved-search";
@@ -4778,6 +4784,7 @@ function parseSectionsFromRoot(root) {
   for (const el of root.querySelectorAll("[data-ohw-section]")) {
     const id = el.getAttribute("data-ohw-section") ?? "";
     if (!id || seen.has(id)) continue;
+    if (el.parentElement?.closest("[data-ohw-section]")) continue;
     seen.add(id);
     const label = el.getAttribute("data-ohw-section-label") ?? titleCaseSectionId(id);
     sections.push({ id, label });
@@ -5024,61 +5031,29 @@ function scrollToHashSectionWhenReady(behavior = "smooth") {
   tick();
 }
 
+// src/ui/link-modal/LinkPopover.tsx
+import { useEffect as useEffect6 } from "react";
+
 // src/ui/dialog.tsx
 import * as React7 from "react";
 import { Dialog as DialogPrimitive } from "radix-ui";
-
-// src/ui/icons.tsx
+import { X } from "lucide-react";
 import { jsx as jsx12, jsxs as jsxs6 } from "react/jsx-runtime";
-function IconX({ className, ...props }) {
-  return /* @__PURE__ */ jsxs6("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", className, ...props, children: [
-    /* @__PURE__ */ jsx12("path", { d: "M18 6 6 18" }),
-    /* @__PURE__ */ jsx12("path", { d: "m6 6 12 12" })
-  ] });
-}
-function IconChevronDown({ className, ...props }) {
-  return /* @__PURE__ */ jsx12("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", className, ...props, children: /* @__PURE__ */ jsx12("path", { d: "m6 9 6 6 6-6" }) });
-}
-function IconFile({ className, ...props }) {
-  return /* @__PURE__ */ jsxs6("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", className, ...props, children: [
-    /* @__PURE__ */ jsx12("path", { d: "M15 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7Z" }),
-    /* @__PURE__ */ jsx12("path", { d: "M14 2v4a2 2 0 0 0 2 2h4" })
-  ] });
-}
-function IconInfo({ className, ...props }) {
-  return /* @__PURE__ */ jsxs6("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", className, ...props, children: [
-    /* @__PURE__ */ jsx12("circle", { cx: "12", cy: "12", r: "10" }),
-    /* @__PURE__ */ jsx12("path", { d: "M12 16v-4" }),
-    /* @__PURE__ */ jsx12("path", { d: "M12 8h.01" })
-  ] });
-}
-function IconArrowRight({ className, ...props }) {
-  return /* @__PURE__ */ jsxs6("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", className, ...props, children: [
-    /* @__PURE__ */ jsx12("path", { d: "M5 12h14" }),
-    /* @__PURE__ */ jsx12("path", { d: "m12 5 7 7-7 7" })
-  ] });
-}
-function IconSection({ className, ...props }) {
-  return /* @__PURE__ */ jsxs6("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", className, ...props, children: [
-    /* @__PURE__ */ jsx12("rect", { width: "18", height: "7", x: "3", y: "3", rx: "1" }),
-    /* @__PURE__ */ jsx12("rect", { width: "9", height: "7", x: "3", y: "14", rx: "1" }),
-    /* @__PURE__ */ jsx12("rect", { width: "5", height: "7", x: "16", y: "14", rx: "1" })
-  ] });
-}
-
-// src/ui/dialog.tsx
-import { jsx as jsx13, jsxs as jsxs7 } from "react/jsx-runtime";
-function Dialog2({ ...props }) {
-  return /* @__PURE__ */ jsx13(DialogPrimitive.Root, { "data-slot": "dialog", ...props });
+function Dialog2({
+  ...props
+}) {
+  return /* @__PURE__ */ jsx12(DialogPrimitive.Root, { "data-slot": "dialog", ...props });
 }
-function DialogPortal({ ...props }) {
-  return /* @__PURE__ */ jsx13(DialogPrimitive.Portal, { ...props });
+function DialogPortal({
+  ...props
+}) {
+  return /* @__PURE__ */ jsx12(DialogPrimitive.Portal, { ...props });
 }
 function DialogOverlay({
   className,
   ...props
 }) {
-  return /* @__PURE__ */ jsx13(
+  return /* @__PURE__ */ jsx12(
     DialogPrimitive.Overlay,
     {
       "data-slot": "dialog-overlay",
@@ -5088,57 +5063,74 @@ function DialogOverlay({
     }
   );
 }
-var DialogContent = React7.forwardRef(({ className, children, showCloseButton = true, container, ...props }, ref) => {
-  const positionMode = container ? "absolute" : "fixed";
-  return /* @__PURE__ */ jsxs7(DialogPortal, { container: container ?? void 0, children: [
-    /* @__PURE__ */ jsx13(DialogOverlay, { className: cn(positionMode, "inset-0") }),
-    /* @__PURE__ */ jsxs7(
-      DialogPrimitive.Content,
-      {
-        ref,
-        "data-slot": "dialog-content",
-        className: cn(
-          positionMode,
-          "left-1/2 top-1/2 z-[2147483647] flex w-full max-w-[483px] -translate-x-1/2 -translate-y-1/2 flex-col overflow-hidden",
-          "rounded-xl border border-border bg-background font-sans shadow-lg outline-none",
-          container ? "max-h-[calc(100%-32px)] max-w-[calc(100%-16px)]" : "max-h-[calc(100vh-32px)] max-w-[calc(100vw-16px)]",
-          className
-        ),
-        onMouseDown: (e) => e.stopPropagation(),
-        ...props,
-        children: [
-          children,
-          showCloseButton ? /* @__PURE__ */ jsx13(
-            DialogPrimitive.Close,
-            {
-              type: "button",
-              className: "absolute right-[9px] top-[9px] rounded-sm p-1.5 text-foreground hover:bg-muted/50",
-              "aria-label": "Close",
-              children: /* @__PURE__ */ jsx13(IconX, { "aria-hidden": true })
-            }
-          ) : null
-        ]
-      }
-    )
-  ] });
-});
+var DialogContent = React7.forwardRef(
+  ({ className, children, showCloseButton = true, container, ...props }, ref) => {
+    const positionMode = container ? "absolute" : "fixed";
+    return /* @__PURE__ */ jsxs6(DialogPortal, { container: container ?? void 0, children: [
+      /* @__PURE__ */ jsx12(DialogOverlay, { className: cn(positionMode, "inset-0") }),
+      /* @__PURE__ */ jsxs6(
+        DialogPrimitive.Content,
+        {
+          ref,
+          "data-slot": "dialog-content",
+          className: cn(
+            positionMode,
+            "left-1/2 top-1/2 z-[2147483647] flex w-full max-w-[448px] -translate-x-1/2 -translate-y-1/2 flex-col overflow-visible",
+            "rounded-xl border border-border bg-background font-sans shadow-lg outline-none",
+            container ? "max-h-[calc(100%-32px)]" : "max-h-[calc(100vh-32px)]",
+            className
+          ),
+          onMouseDown: (e) => e.stopPropagation(),
+          ...props,
+          children: [
+            children,
+            showCloseButton ? /* @__PURE__ */ jsx12(
+              DialogPrimitive.Close,
+              {
+                type: "button",
+                className: "absolute right-[9px] top-[9px] rounded-sm p-1.5 text-foreground hover:bg-muted/50",
+                "aria-label": "Close",
+                children: /* @__PURE__ */ jsx12(X, { size: 16, "aria-hidden": true })
+              }
+            ) : null
+          ]
+        }
+      )
+    ] });
+  }
+);
 DialogContent.displayName = DialogPrimitive.Content.displayName;
-function DialogHeader({ className, ...props }) {
-  return /* @__PURE__ */ jsx13("div", { className: cn("flex flex-col gap-1.5", className), ...props });
+function DialogHeader({
+  className,
+  ...props
+}) {
+  return /* @__PURE__ */ jsx12("div", { className: cn("flex flex-col gap-1.5", className), ...props });
 }
-function DialogFooter({ className, ...props }) {
-  return /* @__PURE__ */ jsx13("div", { className: cn("flex items-center justify-end gap-2", className), ...props });
+function DialogFooter({
+  className,
+  ...props
+}) {
+  return /* @__PURE__ */ jsx12(
+    "div",
+    {
+      className: cn("flex items-center justify-end gap-2", className),
+      ...props
+    }
+  );
 }
-var DialogTitle = React7.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx13(
+var DialogTitle = React7.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx12(
   DialogPrimitive.Title,
   {
     ref,
-    className: cn("text-lg font-semibold leading-none tracking-tight text-card-foreground", className),
+    className: cn(
+      "text-lg font-semibold leading-none tracking-tight text-card-foreground",
+      className
+    ),
     ...props
   }
 ));
 DialogTitle.displayName = DialogPrimitive.Title.displayName;
-var DialogDescription = React7.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx13(
+var DialogDescription = React7.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx12(
   DialogPrimitive.Description,
   {
     ref,
@@ -5149,38 +5141,64 @@ var DialogDescription = React7.forwardRef(({ className, ...props }, ref) => /* @
 DialogDescription.displayName = DialogPrimitive.Description.displayName;
 var DialogClose = DialogPrimitive.Close;
 
+// src/ui/link-modal/LinkEditorPanel.tsx
+import { Info, X as X3 } from "lucide-react";
+
 // src/ui/link-modal/DestinationBreadcrumb.tsx
-import { jsx as jsx14, jsxs as jsxs8 } from "react/jsx-runtime";
-function DestinationBreadcrumb({ pageTitle, sectionLabel }) {
-  return /* @__PURE__ */ jsxs8("div", { className: "flex w-full flex-col gap-2", children: [
-    /* @__PURE__ */ jsx14("p", { className: "text-sm font-medium text-foreground", children: "Destination" }),
-    /* @__PURE__ */ jsxs8("div", { className: "flex items-center gap-3", children: [
-      /* @__PURE__ */ jsxs8("div", { className: "flex items-center gap-2", children: [
-        /* @__PURE__ */ jsx14(IconFile, { className: "shrink-0 text-foreground", "aria-hidden": true }),
-        /* @__PURE__ */ jsx14("span", { className: "text-sm font-medium leading-none text-foreground", children: pageTitle })
+import { ArrowRight, File, GalleryVertical } from "lucide-react";
+import { jsx as jsx13, jsxs as jsxs7 } from "react/jsx-runtime";
+function DestinationBreadcrumb({
+  pageTitle,
+  sectionLabel
+}) {
+  return /* @__PURE__ */ jsxs7("div", { className: "flex w-full flex-col gap-2", children: [
+    /* @__PURE__ */ jsx13("p", { className: "text-sm font-medium! text-foreground m-0", children: "Destination" }),
+    /* @__PURE__ */ jsxs7("div", { className: "flex items-center gap-3", children: [
+      /* @__PURE__ */ jsxs7("div", { className: "flex items-center gap-2", children: [
+        /* @__PURE__ */ jsx13(File, { size: 16, className: "shrink-0 text-foreground", "aria-hidden": true }),
+        /* @__PURE__ */ jsx13("span", { className: "text-sm font-medium leading-none text-foreground!", children: pageTitle })
       ] }),
-      /* @__PURE__ */ jsx14(IconArrowRight, { className: "shrink-0 text-muted-foreground", "aria-hidden": true }),
-      /* @__PURE__ */ jsxs8("div", { className: "flex min-w-0 flex-1 items-center gap-2", children: [
-        /* @__PURE__ */ jsx14(IconSection, { className: "shrink-0 text-foreground", "aria-hidden": true }),
-        /* @__PURE__ */ jsx14("span", { className: "truncate text-sm font-medium leading-none text-foreground", children: sectionLabel })
+      /* @__PURE__ */ jsx13(
+        ArrowRight,
+        {
+          size: 16,
+          className: "shrink-0 text-muted-foreground",
+          "aria-hidden": true
+        }
+      ),
+      /* @__PURE__ */ jsxs7("div", { className: "flex min-w-0 flex-1 items-center gap-2", children: [
+        /* @__PURE__ */ jsx13(
+          GalleryVertical,
+          {
+            size: 16,
+            className: "shrink-0 text-foreground",
+            "aria-hidden": true
+          }
+        ),
+        /* @__PURE__ */ jsx13("span", { className: "truncate text-sm font-medium leading-none text-foreground", children: sectionLabel })
       ] })
     ] })
   ] });
 }
 
 // src/ui/link-modal/SectionTreeItem.tsx
-import { jsx as jsx15, jsxs as jsxs9 } from "react/jsx-runtime";
-function SectionTreeItem({ section, onSelect, selected }) {
+import { GalleryVertical as GalleryVertical2 } from "lucide-react";
+import { jsx as jsx14, jsxs as jsxs8 } from "react/jsx-runtime";
+function SectionTreeItem({
+  section,
+  onSelect,
+  selected
+}) {
   const interactive = Boolean(onSelect);
-  return /* @__PURE__ */ jsxs9("div", { className: "flex h-9 w-full items-end pl-3", children: [
-    /* @__PURE__ */ jsx15(
+  return /* @__PURE__ */ jsxs8("div", { className: "flex h-9 w-full items-end pl-3", children: [
+    /* @__PURE__ */ jsx14(
       "div",
       {
         className: "mr-[-1px] h-9 w-2 shrink-0 rounded-bl-sm border-b border-l border-border mb-4",
         "aria-hidden": true
       }
     ),
-    /* @__PURE__ */ jsxs9(
+    /* @__PURE__ */ jsxs8(
       "div",
       {
         role: interactive ? "button" : void 0,
@@ -5198,32 +5216,30 @@ function SectionTreeItem({ section, onSelect, selected }) {
           interactive && selected && "border-primary"
         ),
         children: [
-          /* @__PURE__ */ jsx15(IconSection, { className: "shrink-0 text-foreground", "aria-hidden": true }),
-          /* @__PURE__ */ jsx15("span", { className: "truncate text-sm font-normal leading-5 text-foreground", children: section.label })
+          /* @__PURE__ */ jsx14(
+            GalleryVertical2,
+            {
+              size: 16,
+              className: "shrink-0 text-foreground",
+              "aria-hidden": true
+            }
+          ),
+          /* @__PURE__ */ jsx14("span", { className: "truncate text-sm font-normal leading-5 text-foreground", children: section.label })
         ]
       }
     )
   ] });
 }
-function SectionPickerList({ sections, onSelect }) {
-  if (sections.length === 0) {
-    return /* @__PURE__ */ jsx15("p", { className: "text-sm text-muted-foreground", children: "No sections found on this page." });
-  }
-  return /* @__PURE__ */ jsxs9("div", { className: "flex flex-col gap-1", children: [
-    /* @__PURE__ */ jsx15("p", { className: "text-sm text-muted-foreground", children: "Pick a section this link should scroll to." }),
-    sections.map((section) => /* @__PURE__ */ jsx15(SectionTreeItem, { section, onSelect }, section.id))
-  ] });
-}
 
 // src/ui/link-modal/UrlOrPageInput.tsx
-import { useId as useId2, useRef as useRef3, useState as useState3 } from "react";
+import { useEffect as useEffect3, useId as useId2, useRef as useRef3, useState as useState3 } from "react";
 
 // src/ui/input.tsx
 import * as React8 from "react";
-import { jsx as jsx16 } from "react/jsx-runtime";
+import { jsx as jsx15 } from "react/jsx-runtime";
 var Input = React8.forwardRef(
   ({ className, type, ...props }, ref) => {
-    return /* @__PURE__ */ jsx16(
+    return /* @__PURE__ */ jsx15(
       "input",
       {
         type,
@@ -5242,9 +5258,9 @@ Input.displayName = "Input";
 
 // src/ui/label.tsx
 import { Label as LabelPrimitive } from "radix-ui";
-import { jsx as jsx17 } from "react/jsx-runtime";
+import { jsx as jsx16 } from "react/jsx-runtime";
 function Label({ className, ...props }) {
-  return /* @__PURE__ */ jsx17(
+  return /* @__PURE__ */ jsx16(
     LabelPrimitive.Root,
     {
       "data-slot": "label",
@@ -5255,9 +5271,12 @@ function Label({ className, ...props }) {
 }
 
 // src/ui/link-modal/UrlOrPageInput.tsx
-import { jsx as jsx18, jsxs as jsxs10 } from "react/jsx-runtime";
-function FieldChevron({ onClick }) {
-  return /* @__PURE__ */ jsx18(
+import { ChevronDown, File as File2, X as X2 } from "lucide-react";
+import { jsx as jsx17, jsxs as jsxs9 } from "react/jsx-runtime";
+function FieldChevron({
+  onClick
+}) {
+  return /* @__PURE__ */ jsx17(
     "button",
     {
       type: "button",
@@ -5265,7 +5284,7 @@ function FieldChevron({ onClick }) {
       onClick,
       "aria-label": "Open page list",
       tabIndex: -1,
-      children: /* @__PURE__ */ jsx18(IconChevronDown, {})
+      children: /* @__PURE__ */ jsx17(ChevronDown, { size: 16 })
     }
   );
 }
@@ -5283,7 +5302,29 @@ function UrlOrPageInput({
 }) {
   const inputId = useId2();
   const inputRef = useRef3(null);
+  const rootRef = useRef3(null);
   const [isFocused, setIsFocused] = useState3(false);
+  useEffect3(() => {
+    if (!dropdownOpen) return;
+    const isOutside = (e) => {
+      const root = rootRef.current;
+      if (!root) return true;
+      const path = typeof e.composedPath === "function" ? e.composedPath() : [];
+      if (path.includes(root)) return false;
+      const target = e.target;
+      return !(target instanceof Node && root.contains(target));
+    };
+    const closeIfOutside = (e) => {
+      if (!isOutside(e)) return;
+      onDropdownOpenChange(false);
+    };
+    document.addEventListener("pointerdown", closeIfOutside, true);
+    document.addEventListener("mousedown", closeIfOutside, true);
+    return () => {
+      document.removeEventListener("pointerdown", closeIfOutside, true);
+      document.removeEventListener("mousedown", closeIfOutside, true);
+    };
+  }, [dropdownOpen, onDropdownOpenChange]);
   const openDropdown = () => {
     if (readOnly || filteredPages.length === 0) return;
     onDropdownOpenChange(true);
@@ -5301,15 +5342,22 @@ function UrlOrPageInput({
     requestAnimationFrame(() => inputRef.current?.focus());
   };
   const fieldClassName = cn(
-    "data-ohw-link-field flex h-10 w-full items-center overflow-hidden rounded-md border bg-background pl-3 pr-3 py-2 outline-none transition-[border-color,box-shadow]",
+    "data-ohw-link-field flex h-[36px] w-full items-center overflow-hidden rounded-md border bg-background pl-3 pr-3 py-2 outline-none transition-[border-color,box-shadow]",
     urlError ? "border-destructive shadow-[0_0_0_1px_var(--ohw-destructive)]" : isFocused ? "border-primary shadow-[0_0_0_1px_var(--ohw-primary)]" : "border-input"
   );
-  return /* @__PURE__ */ jsxs10("div", { className: "flex w-full flex-col gap-2 p-0", children: [
-    /* @__PURE__ */ jsx18(Label, { htmlFor: inputId, className: cn(urlError && "text-destructive"), children: "Destination" }),
-    /* @__PURE__ */ jsxs10("div", { className: "relative w-full", children: [
-      /* @__PURE__ */ jsxs10("div", { "data-ohw-link-field": true, className: fieldClassName, children: [
-        selectedPage ? /* @__PURE__ */ jsx18("div", { className: "flex shrink-0 items-center pr-2", children: /* @__PURE__ */ jsx18(IconFile, { className: "text-foreground", "aria-hidden": true }) }) : null,
-        readOnly ? /* @__PURE__ */ jsx18("span", { className: "min-w-0 flex-1 truncate text-sm leading-5 text-foreground", children: selectedPage?.title ?? value }) : /* @__PURE__ */ jsx18(
+  return /* @__PURE__ */ jsxs9("div", { className: "flex w-full flex-col gap-2 p-0", children: [
+    /* @__PURE__ */ jsx17(Label, { htmlFor: inputId, className: cn(urlError && "text-destructive"), children: "Destination" }),
+    /* @__PURE__ */ jsxs9("div", { ref: rootRef, className: "relative w-full", children: [
+      /* @__PURE__ */ jsxs9("div", { "data-ohw-link-field": true, className: fieldClassName, children: [
+        selectedPage ? /* @__PURE__ */ jsx17("div", { className: "flex shrink-0 items-center pr-2", children: /* @__PURE__ */ jsx17(
+          File2,
+          {
+            size: 16,
+            className: "shrink-0 text-foreground",
+            "aria-hidden": true
+          }
+        ) }) : null,
+        readOnly ? /* @__PURE__ */ jsx17("span", { className: "min-w-0 flex-1 truncate text-sm leading-5 text-foreground", children: selectedPage?.title ?? value }) : /* @__PURE__ */ jsx17(
           Input,
           {
             ref: inputRef,
@@ -5320,7 +5368,14 @@ function UrlOrPageInput({
               setIsFocused(true);
               if (!selectedPage) openDropdown();
             },
-            onBlur: () => setIsFocused(false),
+            onBlur: () => {
+              setIsFocused(false);
+              requestAnimationFrame(() => {
+                if (!rootRef.current?.contains(document.activeElement)) {
+                  onDropdownOpenChange(false);
+                }
+              });
+            },
             placeholder,
             className: cn(
               "min-w-0 flex-1 truncate border-0 bg-transparent p-0 text-sm font-normal leading-5 shadow-none outline-none ring-0 caret-foreground",
@@ -5328,7 +5383,7 @@ function UrlOrPageInput({
             )
           }
         ),
-        selectedPage && !readOnly ? /* @__PURE__ */ jsx18(
+        selectedPage && !readOnly ? /* @__PURE__ */ jsx17(
           "button",
           {
             type: "button",
@@ -5336,26 +5391,26 @@ function UrlOrPageInput({
             onMouseDown: clearSelection,
             "aria-label": "Clear selected page",
             tabIndex: -1,
-            children: /* @__PURE__ */ jsx18(IconX, { "aria-hidden": true })
+            children: /* @__PURE__ */ jsx17(X2, { size: 16, "aria-hidden": true })
           }
         ) : null,
-        !readOnly ? /* @__PURE__ */ jsx18(FieldChevron, { onClick: toggleDropdown }) : null
+        !readOnly ? /* @__PURE__ */ jsx17(FieldChevron, { onClick: toggleDropdown }) : null
       ] }),
-      dropdownOpen && !readOnly && filteredPages.length > 0 ? /* @__PURE__ */ jsx18(
+      dropdownOpen && !readOnly && filteredPages.length > 0 ? /* @__PURE__ */ jsx17(
         "div",
         {
           "data-ohw-link-page-dropdown": "",
-          className: "absolute left-0 right-0 h-20 top-[calc(100%+4px)] z-10 max-h-48 overflow-auto rounded-lg border border-border bg-popover py-1 shadow-lg",
+          className: "absolute left-0 right-0 top-[calc(100%+4px)] z-50 max-h-48 overflow-auto rounded-lg border border-border bg-popover py-1 shadow-lg",
           onMouseDown: (e) => e.preventDefault(),
-          children: filteredPages.map((page) => /* @__PURE__ */ jsxs10(
+          children: filteredPages.map((page) => /* @__PURE__ */ jsxs9(
             "button",
             {
               type: "button",
               className: "flex h-9 w-full items-center gap-2 border-0 bg-transparent px-3 text-left text-sm leading-5 text-foreground outline-none hover:bg-muted",
               onClick: () => onPageSelect(page),
               children: [
-                /* @__PURE__ */ jsx18(IconFile, { className: "shrink-0", "aria-hidden": true }),
-                /* @__PURE__ */ jsx18("span", { className: "truncate", children: page.title })
+                /* @__PURE__ */ jsx17(File2, { size: 16, className: "shrink-0", "aria-hidden": true }),
+                /* @__PURE__ */ jsx17("span", { className: "truncate", children: page.title })
               ]
             },
             page.path
@@ -5363,111 +5418,542 @@ function UrlOrPageInput({
         }
       ) : null
     ] }),
-    urlError ? /* @__PURE__ */ jsx18("p", { className: "text-sm font-medium text-destructive", children: urlError }) : null
+    urlError ? /* @__PURE__ */ jsx17("p", { className: "text-sm font-medium text-destructive", children: urlError }) : null
   ] });
 }
 
-// src/ui/link-modal/useLinkModalState.ts
-import { useCallback, useEffect as useEffect3, useMemo as useMemo2, useState as useState4 } from "react";
-function useLinkModalState({
-  open,
-  mode,
-  pages,
-  sections: _sections,
-  sectionsByPath,
-  initialTarget,
-  existingTargets,
-  onClose,
-  onSubmit
-}) {
-  const availablePages = useMemo2(
-    () => mode === "create" ? filterAvailablePages(pages, existingTargets) : pages,
-    [mode, pages, existingTargets]
-  );
-  const [searchValue, setSearchValue] = useState4("");
-  const [selectedPage, setSelectedPage] = useState4(null);
-  const [selectedSection, setSelectedSection] = useState4(null);
-  const [step, setStep] = useState4("input");
-  const [dropdownOpen, setDropdownOpen] = useState4(false);
-  const [urlError, setUrlError] = useState4("");
-  const reset = useCallback(() => {
-    setSearchValue("");
-    setSelectedPage(null);
-    setSelectedSection(null);
-    setStep("input");
-    setDropdownOpen(false);
-    setUrlError("");
-  }, []);
-  useEffect3(() => {
-    if (!open) return;
-    if (mode === "edit" && initialTarget) {
-      const { pageRoute } = parseTarget(initialTarget);
-      const targetSections = getSectionsForPath(sectionsByPath, pageRoute);
-      const init = getEditModeInitialState(initialTarget, pages, targetSections);
-      setSearchValue(init.searchValue);
-      setSelectedPage(init.selectedPage);
-      setSelectedSection(init.selectedSection);
-      setStep(init.step);
-    } else {
-      reset();
+// src/ui/link-modal/LinkEditorPanel.tsx
+import { Fragment as Fragment3, jsx as jsx18, jsxs as jsxs10 } from "react/jsx-runtime";
+function LinkEditorPanel({ state, onClose }) {
+  const isCancel = state.secondaryLabel === "Cancel" || state.secondaryLabel === "Back to sections";
+  return /* @__PURE__ */ jsxs10(Fragment3, { children: [
+    /* @__PURE__ */ jsx18(DialogClose, { asChild: true, children: /* @__PURE__ */ jsx18(
+      "button",
+      {
+        type: "button",
+        className: "absolute right-[9px] top-[9px] rounded-sm p-1.5 text-foreground hover:bg-muted/50 h-7",
+        "aria-label": "Close",
+        onClick: onClose,
+        children: /* @__PURE__ */ jsx18(X3, { size: 16, "aria-hidden": true })
+      }
+    ) }),
+    /* @__PURE__ */ jsx18(DialogHeader, { className: "w-full gap-1.5 p-6 pr-12", children: /* @__PURE__ */ jsx18(DialogTitle, { className: "m-0 w-full break-words", children: state.title }) }),
+    /* @__PURE__ */ jsxs10("div", { className: "flex w-full flex-col gap-3 px-6 pb-8 pt-1", children: [
+      state.showBreadcrumb && state.selectedPage && state.selectedSection ? /* @__PURE__ */ jsx18(
+        DestinationBreadcrumb,
+        {
+          pageTitle: state.selectedPage.title,
+          sectionLabel: state.selectedSection.label
+        }
+      ) : /* @__PURE__ */ jsx18(
+        UrlOrPageInput,
+        {
+          value: state.searchValue,
+          selectedPage: state.selectedPage,
+          dropdownOpen: state.dropdownOpen,
+          onDropdownOpenChange: state.setDropdownOpen,
+          filteredPages: state.filteredPages,
+          onInputChange: state.handleInputChange,
+          onPageSelect: state.handlePageSelect,
+          urlError: state.urlError
+        }
+      ),
+      state.showChooseSection ? /* @__PURE__ */ jsxs10("div", { className: "flex flex-col justify-center gap-2", children: [
+        /* @__PURE__ */ jsx18(
+          Button,
+          {
+            type: "button",
+            variant: "outline",
+            className: "w-fit cursor-pointer",
+            size: "sm",
+            onClick: state.handleChooseSection,
+            children: "Choose a section"
+          }
+        ),
+        /* @__PURE__ */ jsxs10("div", { className: "flex items-center gap-1 text-sm text-muted-foreground", children: [
+          /* @__PURE__ */ jsx18(Info, { size: 16, className: "shrink-0", "aria-hidden": true }),
+          /* @__PURE__ */ jsx18("span", { children: "Pick a section this link should scroll to." })
+        ] })
+      ] }) : null,
+      state.showSectionRow && state.selectedSection ? /* @__PURE__ */ jsx18(SectionTreeItem, { section: state.selectedSection, selected: true }) : null
+    ] }),
+    /* @__PURE__ */ jsxs10(DialogFooter, { className: "w-full px-6 pb-6", children: [
+      /* @__PURE__ */ jsx18(
+        Button,
+        {
+          type: "button",
+          variant: isCancel ? "outline" : "ghost",
+          className: "leading-6 shadow-none cursor-pointer",
+          style: isCancel ? {
+            backgroundColor: "var(--ohw-background)",
+            borderColor: "var(--ohw-border)",
+            color: "var(--ohw-foreground)"
+          } : void 0,
+          onClick: state.handleSecondary,
+          children: state.secondaryLabel
+        }
+      ),
+      /* @__PURE__ */ jsx18(
+        Button,
+        {
+          type: "button",
+          className: "border-0 leading-6 shadow-none hover:opacity-90 disabled:opacity-50 cursor-pointer",
+          style: {
+            backgroundColor: "var(--ohw-primary)",
+            color: "var(--ohw-primary-foreground)"
+          },
+          disabled: !state.isValid,
+          onClick: state.handleSubmit,
+          children: state.submitLabel
+        }
+      )
+    ] })
+  ] });
+}
+
+// src/ui/link-modal/SectionPickerOverlay.tsx
+import { useCallback, useEffect as useEffect4, useMemo as useMemo2, useRef as useRef4, useState as useState4 } from "react";
+import { createPortal } from "react-dom";
+import { ArrowLeft, Check } from "lucide-react";
+import { usePathname, useRouter } from "next/navigation";
+import { jsx as jsx19, jsxs as jsxs11 } from "react/jsx-runtime";
+var DIM_OVERLAY = "rgba(0, 0, 0, 0.45)";
+function rectsEqual(a, b) {
+  if (a.size !== b.size) return false;
+  for (const [id, rect] of a) {
+    const other = b.get(id);
+    if (!other || rect.top !== other.top || rect.left !== other.left || rect.width !== other.width || rect.height !== other.height) {
+      return false;
     }
-    setDropdownOpen(false);
-    setUrlError("");
-  }, [open, mode, initialTarget, pages, sectionsByPath, reset]);
-  const filteredPages = useMemo2(() => {
-    if (!searchValue.trim()) return availablePages;
-    return availablePages.filter((p) => p.title.toLowerCase().startsWith(searchValue.toLowerCase()));
-  }, [availablePages, searchValue]);
-  const activeSections = useMemo2(() => {
-    if (!selectedPage) return [];
-    return getSectionsForPath(sectionsByPath, selectedPage.path);
-  }, [selectedPage, sectionsByPath]);
-  const showBreadcrumb = step === "confirmed" && selectedPage && selectedSection;
-  const showSectionPicker = step === "sectionPicker" && selectedPage;
-  const showSectionRow = mode === "edit" && selectedPage && selectedSection && step === "input";
-  const showChooseSection = step === "input" && selectedPage && !selectedSection && !showSectionRow && activeSections.length > 0;
-  const handleInputChange = (value) => {
-    setSearchValue(value);
-    setSelectedPage(null);
-    setSelectedSection(null);
-    setStep("input");
-    setUrlError("");
-    const filtered = value.trim() ? availablePages.filter((p) => p.title.toLowerCase().startsWith(value.toLowerCase())) : availablePages;
-    setDropdownOpen(filtered.length > 0);
-    if (value.trim()) {
-      setUrlError(validateUrlInput(value, availablePages, pages));
+  }
+  return true;
+}
+function readSectionRects(sectionIds) {
+  const next = /* @__PURE__ */ new Map();
+  for (const id of sectionIds) {
+    const el = document.querySelector(
+      `[data-ohw-section="${CSS.escape(id)}"]`
+    );
+    if (el) next.set(id, el.getBoundingClientRect());
+  }
+  return next;
+}
+function hitTestSectionId(x, y, sectionIds, rects) {
+  for (const id of sectionIds) {
+    const rect = rects.get(id);
+    if (!rect || rect.width <= 0 || rect.height <= 0) continue;
+    if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) {
+      return id;
     }
-  };
-  const handlePageSelect = (page) => {
-    setSelectedPage({ path: page.path, title: page.title });
-    setSelectedSection(null);
-    setSearchValue(page.title);
-    setStep("input");
-    setDropdownOpen(false);
-    setUrlError("");
-  };
-  const handleChooseSection = () => {
-    setStep("sectionPicker");
-  };
-  const handleSectionSelect = (section) => {
-    setSelectedSection({ id: section.id, label: section.label });
-    if (mode === "create") {
-      setStep("confirmed");
-    } else {
-      setStep("input");
+  }
+  return null;
+}
+function useSectionRects(sectionIdsKey, enabled) {
+  const [rects, setRects] = useState4(/* @__PURE__ */ new Map());
+  const sectionIds = useMemo2(
+    () => sectionIdsKey ? sectionIdsKey.split("\0") : [],
+    [sectionIdsKey]
+  );
+  useEffect4(() => {
+    if (!enabled || sectionIds.length === 0) {
+      setRects((prev) => prev.size === 0 ? prev : /* @__PURE__ */ new Map());
+      return;
     }
-  };
-  const handleBackToSections = () => {
-    setStep("sectionPicker");
-  };
-  const handleClose = () => {
-    reset();
-    onClose();
-  };
-  const isValid = useMemo2(() => {
-    if (urlError) return false;
-    if (showBreadcrumb) return true;
-    if (selectedPage) return true;
+    const update = () => {
+      const next = readSectionRects(sectionIds);
+      setRects((prev) => rectsEqual(prev, next) ? prev : next);
+    };
+    update();
+    const opts = { capture: true, passive: true };
+    window.addEventListener("scroll", update, opts);
+    window.addEventListener("resize", update);
+    const vv = window.visualViewport;
+    vv?.addEventListener("resize", update);
+    vv?.addEventListener("scroll", update);
+    const ro = new ResizeObserver(update);
+    for (const id of sectionIds) {
+      const el = document.querySelector(
+        `[data-ohw-section="${CSS.escape(id)}"]`
+      );
+      if (el) ro.observe(el);
+    }
+    return () => {
+      window.removeEventListener("scroll", update, opts);
+      window.removeEventListener("resize", update);
+      vv?.removeEventListener("resize", update);
+      vv?.removeEventListener("scroll", update);
+      ro.disconnect();
+    };
+  }, [sectionIds, enabled]);
+  return rects;
+}
+function SectionPickerOverlay({
+  pagePath,
+  sections,
+  onBack,
+  onSelect
+}) {
+  const router = useRouter();
+  const pathname = usePathname();
+  const [selectedId, setSelectedId] = useState4(null);
+  const [hoveredId, setHoveredId] = useState4(null);
+  const pointerRef = useRef4(null);
+  const pointerScreenRef = useRef4(null);
+  const iframeOffsetTopRef = useRef4(null);
+  const sectionIdsRef = useRef4([]);
+  const [chromeClip, setChromeClip] = useState4(
+    () => ({
+      top: 0,
+      bottom: typeof window !== "undefined" ? window.innerHeight : 0
+    })
+  );
+  const normalizedTarget = normalizePath(pagePath);
+  const isOnTargetPage = normalizePath(pathname) === normalizedTarget;
+  useEffect4(() => {
+    if (isOnTargetPage) return;
+    const search = readPreservedSearch();
+    router.push(`${normalizedTarget}${search}`);
+  }, [isOnTargetPage, normalizedTarget, router]);
+  useEffect4(() => {
+    document.documentElement.setAttribute("data-ohw-section-picking", "");
+    document.querySelectorAll("[data-ohw-hovered]").forEach((el) => {
+      el.removeAttribute("data-ohw-hovered");
+    });
+    document.querySelectorAll("[data-ohw-state-hovered]").forEach((el) => {
+      el.removeAttribute("data-ohw-state-hovered");
+    });
+    return () => {
+      document.documentElement.removeAttribute("data-ohw-section-picking");
+    };
+  }, []);
+  const liveSections = useMemo2(() => {
+    if (!isOnTargetPage) return sections;
+    const live = collectSectionsFromDom();
+    if (live.length === 0) return sections;
+    const labels = new Map(sections.map((s) => [s.id, s.label]));
+    return live.map((s) => ({ id: s.id, label: labels.get(s.id) ?? s.label }));
+  }, [isOnTargetPage, sections, pathname]);
+  const sectionIdsKey = useMemo2(
+    () => liveSections.map((s) => s.id).join("\0"),
+    [liveSections]
+  );
+  const sectionIds = useMemo2(
+    () => liveSections.map((s) => s.id),
+    [liveSections]
+  );
+  sectionIdsRef.current = sectionIds;
+  const rects = useSectionRects(sectionIdsKey, isOnTargetPage);
+  const applyHoverAt = useCallback(
+    (x, y, liveRects) => {
+      const ids = sectionIdsRef.current;
+      const map = liveRects ?? readSectionRects(ids);
+      const next = hitTestSectionId(x, y, ids, map);
+      setHoveredId((prev) => prev === next ? prev : next);
+    },
+    []
+  );
+  useEffect4(() => {
+    const applyClip = (iframeOffsetTop, visibleCanvasTop, canvasH) => {
+      const top = Math.max(0, visibleCanvasTop - iframeOffsetTop);
+      const bottom = Math.min(
+        window.innerHeight,
+        visibleCanvasTop + canvasH - iframeOffsetTop
+      );
+      setChromeClip(
+        (prev) => prev.top === top && prev.bottom === bottom ? prev : { top, bottom: Math.max(top, bottom) }
+      );
+    };
+    const onParentScroll = (e) => {
+      if (e.data?.type !== "ow:parent-scroll") return;
+      const { iframeOffsetTop, headerH, canvasH } = e.data;
+      applyClip(iframeOffsetTop, headerH, canvasH);
+      iframeOffsetTopRef.current = iframeOffsetTop;
+      if (!pointerScreenRef.current && pointerRef.current) {
+        pointerScreenRef.current = {
+          x: pointerRef.current.x,
+          y: pointerRef.current.y + iframeOffsetTop
+        };
+      }
+      const screen = pointerScreenRef.current;
+      if (screen) {
+        const next = { x: screen.x, y: screen.y - iframeOffsetTop };
+        pointerRef.current = next;
+        applyHoverAt(next.x, next.y);
+      }
+    };
+    const onResize = () => {
+      setChromeClip((prev) => {
+        const bottom = Math.max(prev.top, window.innerHeight);
+        return prev.bottom === bottom ? prev : { ...prev, bottom };
+      });
+    };
+    window.addEventListener("message", onParentScroll);
+    window.addEventListener("resize", onResize);
+    return () => {
+      window.removeEventListener("message", onParentScroll);
+      window.removeEventListener("resize", onResize);
+    };
+  }, [applyHoverAt]);
+  useEffect4(() => {
+    const ptr = pointerRef.current;
+    if (!ptr) return;
+    applyHoverAt(ptr.x, ptr.y, rects);
+  }, [rects, applyHoverAt]);
+  useEffect4(() => {
+    const rememberPointer = (clientX, clientY) => {
+      pointerRef.current = { x: clientX, y: clientY };
+      const top = iframeOffsetTopRef.current;
+      if (top != null) {
+        pointerScreenRef.current = { x: clientX, y: clientY + top };
+      }
+      applyHoverAt(clientX, clientY, rects);
+    };
+    const onPointerMove = (e) => {
+      rememberPointer(e.clientX, e.clientY);
+    };
+    const onPointerSync = (e) => {
+      if (e.data?.type !== "ow:pointer-sync") return;
+      const { clientX, clientY } = e.data;
+      rememberPointer(clientX, clientY);
+    };
+    window.addEventListener("pointermove", onPointerMove, { passive: true });
+    window.addEventListener("message", onPointerSync);
+    return () => {
+      window.removeEventListener("pointermove", onPointerMove);
+      window.removeEventListener("message", onPointerSync);
+    };
+  }, [rects, applyHoverAt]);
+  const handleSelect = useCallback(
+    (section) => {
+      if (selectedId) return;
+      setSelectedId(section.id);
+      onSelect(section);
+    },
+    [selectedId, onSelect]
+  );
+  useEffect4(() => {
+    const onKeyDown = (e) => {
+      if (e.key === "Escape") {
+        e.preventDefault();
+        e.stopPropagation();
+        onBack();
+      }
+    };
+    window.addEventListener("keydown", onKeyDown, true);
+    return () => window.removeEventListener("keydown", onKeyDown, true);
+  }, [onBack]);
+  const portalRoot = typeof document !== "undefined" ? document.querySelector("[data-ohw-bridge-root]") ?? document.body : null;
+  if (!portalRoot) return null;
+  return createPortal(
+    /* @__PURE__ */ jsxs11(
+      "div",
+      {
+        "data-ohw-section-picker": "",
+        "data-ohw-bridge": "",
+        className: `pointer-events-none fixed inset-0 z-[2147483647] transition-opacity duration-200 ${"opacity-100"}`,
+        "aria-modal": true,
+        role: "dialog",
+        "aria-label": "Choose a section",
+        children: [
+          /* @__PURE__ */ jsx19(
+            "div",
+            {
+              className: "pointer-events-auto fixed left-5 z-[2]",
+              style: { top: chromeClip.top + 20 },
+              children: /* @__PURE__ */ jsxs11(
+                Button,
+                {
+                  type: "button",
+                  variant: "outline",
+                  size: "sm",
+                  className: "h-8 min-w-0 gap-1 border-border bg-background px-2 py-1.5 shadow-sm hover:bg-muted cursor-pointer",
+                  onClick: onBack,
+                  children: [
+                    /* @__PURE__ */ jsx19(ArrowLeft, { className: "size-4 shrink-0", "aria-hidden": true }),
+                    "Back"
+                  ]
+                }
+              )
+            }
+          ),
+          /* @__PURE__ */ jsx19(
+            "div",
+            {
+              className: "pointer-events-none fixed left-1/2 z-[2] rounded-lg px-4 py-3 text-xs leading-4 tracking-[0.18px] text-white shadow-md",
+              style: {
+                top: chromeClip.bottom - 20,
+                transform: "translate(-50%, -100%)",
+                backgroundColor: "var(--ohw-popover-foreground, #0c0a09)"
+              },
+              "data-ohw-section-picker-hint": "",
+              children: "Click on section to select"
+            }
+          ),
+          !isOnTargetPage ? /* @__PURE__ */ jsx19(
+            "div",
+            {
+              className: "pointer-events-none fixed left-1/2 z-[1] -translate-x-1/2 rounded-md bg-background/90 px-3 py-2 text-sm text-muted-foreground shadow-sm",
+              style: { top: chromeClip.top + 64 },
+              children: "Loading page preview\u2026"
+            }
+          ) : null,
+          isOnTargetPage && liveSections.length === 0 ? /* @__PURE__ */ jsx19("div", { className: "pointer-events-auto fixed inset-0 z-[1] flex items-center justify-center bg-muted/40", children: /* @__PURE__ */ jsx19("p", { className: "text-sm text-muted-foreground", children: "No sections found on this page." }) }) : null,
+          isOnTargetPage ? liveSections.map((section) => {
+            const rect = rects.get(section.id);
+            if (!rect || rect.width <= 0 || rect.height <= 0) return null;
+            const isSelected = selectedId === section.id;
+            const isHovered = hoveredId === section.id;
+            const isLit = isSelected || isHovered;
+            return /* @__PURE__ */ jsxs11(
+              "button",
+              {
+                type: "button",
+                className: "pointer-events-auto fixed z-[1] cursor-pointer border-0 bg-transparent p-0 transition-[background-color] duration-150",
+                style: {
+                  top: rect.top,
+                  left: rect.left,
+                  width: rect.width,
+                  height: rect.height,
+                  backgroundColor: isLit ? "transparent" : DIM_OVERLAY
+                },
+                "aria-label": `Select section ${section.label}`,
+                onClick: () => handleSelect(section),
+                children: [
+                  isLit ? /* @__PURE__ */ jsx19(
+                    "span",
+                    {
+                      className: "pointer-events-none absolute",
+                      style: {
+                        inset: 4,
+                        borderRadius: "var(--radius, 6px)",
+                        border: "1.5px dashed var(--primary, #0885FE)",
+                        boxSizing: "border-box"
+                      },
+                      "aria-hidden": true
+                    }
+                  ) : null,
+                  isSelected ? /* @__PURE__ */ jsx19(
+                    "span",
+                    {
+                      className: "absolute right-3 top-3 flex size-8 items-center justify-center rounded-full text-white",
+                      style: { backgroundColor: "var(--ohw-primary, #0885fe)" },
+                      "aria-hidden": true,
+                      children: /* @__PURE__ */ jsx19(Check, { className: "size-5" })
+                    }
+                  ) : null
+                ]
+              },
+              section.id
+            );
+          }) : null
+        ]
+      }
+    ),
+    portalRoot
+  );
+}
+
+// src/ui/link-modal/useLinkModalState.ts
+import { useCallback as useCallback2, useEffect as useEffect5, useMemo as useMemo3, useState as useState5 } from "react";
+function useLinkModalState({
+  open,
+  mode,
+  pages,
+  sections: _sections,
+  sectionsByPath,
+  initialTarget,
+  existingTargets: _existingTargets,
+  onClose,
+  onSubmit
+}) {
+  const availablePages = useMemo3(() => pages, [pages]);
+  const [searchValue, setSearchValue] = useState5("");
+  const [selectedPage, setSelectedPage] = useState5(null);
+  const [selectedSection, setSelectedSection] = useState5(null);
+  const [step, setStep] = useState5("input");
+  const [dropdownOpen, setDropdownOpen] = useState5(false);
+  const [urlError, setUrlError] = useState5("");
+  const reset = useCallback2(() => {
+    setSearchValue("");
+    setSelectedPage(null);
+    setSelectedSection(null);
+    setStep("input");
+    setDropdownOpen(false);
+    setUrlError("");
+  }, []);
+  useEffect5(() => {
+    if (!open) return;
+    if (mode === "edit" && initialTarget) {
+      const { pageRoute } = parseTarget(initialTarget);
+      const targetSections = getSectionsForPath(sectionsByPath, pageRoute);
+      const init = getEditModeInitialState(initialTarget, pages, targetSections);
+      setSearchValue(init.searchValue);
+      setSelectedPage(init.selectedPage);
+      setSelectedSection(init.selectedSection);
+      setStep(init.step);
+    } else {
+      reset();
+    }
+    setDropdownOpen(false);
+    setUrlError("");
+  }, [open, mode, initialTarget, reset]);
+  const filteredPages = useMemo3(() => {
+    if (!searchValue.trim()) return availablePages;
+    return availablePages.filter((p) => p.title.toLowerCase().startsWith(searchValue.toLowerCase()));
+  }, [availablePages, searchValue]);
+  const activeSections = useMemo3(() => {
+    if (!selectedPage) return [];
+    return getSectionsForPath(sectionsByPath, selectedPage.path);
+  }, [selectedPage, sectionsByPath]);
+  const showBreadcrumb = step === "confirmed" && selectedPage && selectedSection;
+  const showSectionPicker = step === "sectionPicker" && selectedPage;
+  const showSectionRow = mode === "edit" && selectedPage && selectedSection && step === "input";
+  const showChooseSection = step === "input" && selectedPage && !selectedSection && !showSectionRow && activeSections.length > 0;
+  const handleInputChange = (value) => {
+    setSearchValue(value);
+    setSelectedPage(null);
+    setSelectedSection(null);
+    setStep("input");
+    setUrlError("");
+    const filtered = value.trim() ? availablePages.filter((p) => p.title.toLowerCase().startsWith(value.toLowerCase())) : availablePages;
+    setDropdownOpen(filtered.length > 0);
+    if (value.trim()) {
+      setUrlError(validateUrlInput(value, availablePages, pages));
+    }
+  };
+  const handlePageSelect = (page) => {
+    setSelectedPage({ path: page.path, title: page.title });
+    setSelectedSection(null);
+    setSearchValue(page.title);
+    setStep("input");
+    setDropdownOpen(false);
+    setUrlError("");
+  };
+  const handleChooseSection = () => {
+    setStep("sectionPicker");
+  };
+  const handleSectionSelect = (section) => {
+    setSelectedSection({ id: section.id, label: section.label });
+    if (mode === "create") {
+      setStep("confirmed");
+    } else {
+      setStep("input");
+    }
+  };
+  const handleBackToSections = () => {
+    setStep("sectionPicker");
+  };
+  const handleSectionPickerBack = () => {
+    setStep("input");
+  };
+  const handleClose = () => {
+    reset();
+    onClose();
+  };
+  const isValid = useMemo3(() => {
+    if (urlError) return false;
+    if (showBreadcrumb) return true;
+    if (selectedPage) return true;
     if (!searchValue.trim()) return false;
     return validateUrlInput(searchValue, availablePages, pages) === "";
   }, [urlError, showBreadcrumb, selectedPage, searchValue, availablePages, pages]);
@@ -5497,7 +5983,7 @@ function useLinkModalState({
     onSubmit(normalizeUrl(searchValue));
     handleClose();
   };
-  const submitLabel = mode === "edit" ? "Save" : "Create";
+  const submitLabel = showBreadcrumb ? "Save" : mode === "edit" ? "Save" : "Create";
   const title = mode === "edit" ? "Edit navigation item" : "Create navigation item";
   const secondaryLabel = showBreadcrumb ? "Back to sections" : "Cancel";
   const handleSecondary = showBreadcrumb ? handleBackToSections : handleClose;
@@ -5524,23 +6010,29 @@ function useLinkModalState({
     handleChooseSection,
     handleSectionSelect,
     handleBackToSections,
+    handleSectionPickerBack,
     handleClose,
     handleSecondary,
     handleSubmit
   };
 }
 
-// src/ui/link-modal/LinkEditorPanel.tsx
-import { Fragment as Fragment3, jsx as jsx19, jsxs as jsxs11 } from "react/jsx-runtime";
-function LinkEditorPanel({
+// src/ui/link-modal/LinkPopover.tsx
+import { Fragment as Fragment4, jsx as jsx20, jsxs as jsxs12 } from "react/jsx-runtime";
+function postToParent(data) {
+  window.parent?.postMessage(data, "*");
+}
+function LinkPopover({
   open = true,
+  panelRef,
+  portalContainer,
+  onClose,
   mode = "create",
   pages,
   sections = [],
   sectionsByPath,
   initialTarget,
   existingTargets = [],
-  onClose,
   onSubmit
 }) {
   const state = useLinkModalState({
@@ -5554,115 +6046,109 @@ function LinkEditorPanel({
     onClose,
     onSubmit
   });
-  const isCancel = state.secondaryLabel === "Cancel";
-  return /* @__PURE__ */ jsxs11(Fragment3, { children: [
-    /* @__PURE__ */ jsx19(DialogClose, { asChild: true, children: /* @__PURE__ */ jsx19(
-      "button",
+  const sectionPickerActive = state.showSectionPicker && Boolean(state.selectedPage);
+  useEffect6(() => {
+    if (!open) return;
+    if (sectionPickerActive) {
+      postToParent({ type: "ui:unlock" });
+      postToParent({ type: "ow:section-picker", active: true });
+      document.documentElement.style.overflow = "";
+      document.body.style.overflow = "";
+      return () => {
+        postToParent({ type: "ow:section-picker", active: false });
+      };
+    }
+    postToParent({ type: "ow:section-picker", active: false });
+    postToParent({ type: "ui:lock" });
+    const html = document.documentElement;
+    const body = document.body;
+    const prevHtmlOverflow = html.style.overflow;
+    const prevBodyOverflow = body.style.overflow;
+    const prevHtmlOverscroll = html.style.overscrollBehavior;
+    const prevBodyOverscroll = body.style.overscrollBehavior;
+    html.style.overflow = "hidden";
+    body.style.overflow = "hidden";
+    html.style.overscrollBehavior = "none";
+    body.style.overscrollBehavior = "none";
+    const canScrollElement = (el, deltaY) => {
+      const { overflowY } = getComputedStyle(el);
+      if (overflowY !== "auto" && overflowY !== "scroll") return false;
+      if (el.scrollHeight <= el.clientHeight + 1) return false;
+      if (deltaY < 0) return el.scrollTop > 0;
+      if (deltaY > 0)
+        return el.scrollTop + el.clientHeight < el.scrollHeight - 1;
+      return true;
+    };
+    const allowsInternalScroll = (e) => {
+      const target = e.target;
+      if (!(target instanceof Element)) return false;
+      const scrollRoot = target.closest(
+        "[data-ohw-link-page-dropdown], [data-ohw-allow-scroll]"
+      );
+      if (!scrollRoot) return false;
+      const deltaY = e instanceof WheelEvent ? e.deltaY : 0;
+      return canScrollElement(scrollRoot, deltaY);
+    };
+    const preventBackgroundScroll = (e) => {
+      if (allowsInternalScroll(e)) return;
+      e.preventDefault();
+    };
+    const scrollOpts = { passive: false, capture: true };
+    document.addEventListener("wheel", preventBackgroundScroll, scrollOpts);
+    document.addEventListener("touchmove", preventBackgroundScroll, scrollOpts);
+    return () => {
+      postToParent({ type: "ui:unlock" });
+      html.style.overflow = prevHtmlOverflow;
+      body.style.overflow = prevBodyOverflow;
+      html.style.overscrollBehavior = prevHtmlOverscroll;
+      body.style.overscrollBehavior = prevBodyOverscroll;
+      document.removeEventListener(
+        "wheel",
+        preventBackgroundScroll,
+        scrollOpts
+      );
+      document.removeEventListener(
+        "touchmove",
+        preventBackgroundScroll,
+        scrollOpts
+      );
+    };
+  }, [open, sectionPickerActive]);
+  return /* @__PURE__ */ jsxs12(Fragment4, { children: [
+    /* @__PURE__ */ jsx20(
+      Dialog2,
       {
-        type: "button",
-        className: "absolute right-[9px] top-[9px] rounded-sm p-1.5 text-foreground hover:bg-muted/50",
-        "aria-label": "Close",
-        children: /* @__PURE__ */ jsx19(IconX, { "aria-hidden": true })
-      }
-    ) }),
-    /* @__PURE__ */ jsx19(DialogHeader, { className: "w-full gap-1.5 p-6 pr-12", children: /* @__PURE__ */ jsx19(DialogTitle, { className: "m-0 w-full break-words", children: state.title }) }),
-    /* @__PURE__ */ jsxs11("div", { className: "flex w-full flex-col gap-3 px-6 pb-8 pt-1", children: [
-      state.showBreadcrumb && state.selectedPage && state.selectedSection ? /* @__PURE__ */ jsx19(
-        DestinationBreadcrumb,
-        {
-          pageTitle: state.selectedPage.title,
-          sectionLabel: state.selectedSection.label
-        }
-      ) : /* @__PURE__ */ jsx19(
-        UrlOrPageInput,
-        {
-          value: state.searchValue,
-          selectedPage: state.selectedPage,
-          dropdownOpen: state.dropdownOpen,
-          onDropdownOpenChange: state.setDropdownOpen,
-          filteredPages: state.filteredPages,
-          onInputChange: state.handleInputChange,
-          onPageSelect: state.handlePageSelect,
-          urlError: state.urlError
-        }
-      ),
-      state.showChooseSection ? /* @__PURE__ */ jsxs11("div", { className: "flex flex-col justify-center gap-2", children: [
-        /* @__PURE__ */ jsx19(Button, { type: "button", variant: "outline", className: "w-fit cursor-pointer", size: "sm", onClick: state.handleChooseSection, children: "Choose a section" }),
-        /* @__PURE__ */ jsxs11("div", { className: "flex items-center gap-1 text-sm text-muted-foreground", children: [
-          /* @__PURE__ */ jsx19(IconInfo, { className: "shrink-0", "aria-hidden": true }),
-          /* @__PURE__ */ jsx19("span", { children: "Pick a section this link should scroll to." })
-        ] })
-      ] }) : null,
-      state.showSectionPicker ? /* @__PURE__ */ jsx19(SectionPickerList, { sections: state.activeSections, onSelect: state.handleSectionSelect }) : null,
-      state.showSectionRow && state.selectedSection ? /* @__PURE__ */ jsx19(SectionTreeItem, { section: state.selectedSection, selected: true }) : null
-    ] }),
-    /* @__PURE__ */ jsxs11(DialogFooter, { className: "w-full px-6 pb-6", children: [
-      /* @__PURE__ */ jsx19(
-        Button,
-        {
-          type: "button",
-          variant: isCancel ? "outline" : "ghost",
-          className: "leading-6 shadow-none cursor-pointer",
-          style: isCancel ? {
-            backgroundColor: "var(--ohw-background)",
-            borderColor: "var(--ohw-border)",
-            color: "var(--ohw-foreground)"
-          } : void 0,
-          onClick: state.handleSecondary,
-          children: state.secondaryLabel
-        }
-      ),
-      /* @__PURE__ */ jsx19(
-        Button,
-        {
-          type: "button",
-          className: "border-0 leading-6 shadow-none hover:opacity-90 disabled:opacity-50 cursor-pointer",
-          style: {
-            backgroundColor: "var(--ohw-primary)",
-            color: "var(--ohw-primary-foreground)"
-          },
-          disabled: !state.isValid,
-          onClick: state.handleSubmit,
-          children: state.submitLabel
-        }
-      )
-    ] })
+        open: open && !sectionPickerActive,
+        onOpenChange: (next) => {
+          if (!next) onClose?.();
+        },
+        children: /* @__PURE__ */ jsx20(
+          DialogContent,
+          {
+            ref: panelRef,
+            container: portalContainer,
+            "data-ohw-link-popover-root": "",
+            "data-ohw-link-modal-root": "",
+            "data-ohw-bridge": "",
+            showCloseButton: false,
+            className: "gap-0 p-0 w-full max-w-[448px] pointer-events-auto z-[2147483646] overflow-visible",
+            children: /* @__PURE__ */ jsx20(LinkEditorPanel, { state, onClose })
+          }
+        )
+      }
+    ),
+    sectionPickerActive && state.selectedPage ? /* @__PURE__ */ jsx20(
+      SectionPickerOverlay,
+      {
+        pagePath: state.selectedPage.path,
+        sections: state.activeSections,
+        onBack: state.handleSectionPickerBack,
+        onSelect: state.handleSectionSelect
+      }
+    ) : null
   ] });
 }
 
-// src/ui/link-modal/LinkPopover.tsx
-import { jsx as jsx20 } from "react/jsx-runtime";
-function LinkPopover({
-  open = true,
-  panelRef,
-  portalContainer,
-  onClose,
-  ...editorProps
-}) {
-  return /* @__PURE__ */ jsx20(
-    Dialog2,
-    {
-      open,
-      onOpenChange: (next) => {
-        if (!next) onClose?.();
-      },
-      children: /* @__PURE__ */ jsx20(
-        DialogContent,
-        {
-          ref: panelRef,
-          container: portalContainer,
-          "data-ohw-link-popover-root": "",
-          "data-ohw-link-modal-root": "",
-          "data-ohw-bridge": "",
-          showCloseButton: false,
-          className: "gap-0 p-0 w-full md:w-md pointer-events-auto",
-          children: /* @__PURE__ */ jsx20(LinkEditorPanel, { ...editorProps, open, onClose })
-        }
-      )
-    }
-  );
-}
-
 // src/ui/link-modal/devFixtures.ts
 var DEV_SITE_PAGES = [
   { path: "/", title: "Home" },
@@ -5682,16 +6168,21 @@ var DEV_SECTIONS_BY_PATH = {
     { id: "founder-teaser", label: "Founder" },
     { id: "plan-form", label: "Plan Form" },
     { id: "testimonials", label: "Testimonials" },
-    { id: "wordmark", label: "Wordmark" }
+    { id: "wordmark", label: "Wordmark" },
+    { id: "footer", label: "Footer" }
   ],
   "/about": [
     { id: "manifesto", label: "Manifesto" },
     { id: "story-letter", label: "Our Story" },
     { id: "lagree-explainer", label: "Lagree Explainer" },
     { id: "waitlist-cta", label: "Waitlist" },
-    { id: "personal-training", label: "Personal training" }
+    { id: "personal-training", label: "Personal training" },
+    { id: "footer", label: "Footer" }
+  ],
+  "/classes": [
+    { id: "class-library", label: "Class Library" },
+    { id: "footer", label: "Footer" }
   ],
-  "/classes": [{ id: "class-library", label: "Class Library" }],
   "/pricing": [
     { id: "page-header", label: "Page Header" },
     { id: "free-class-cta", label: "Free Class" },
@@ -5699,19 +6190,25 @@ var DEV_SECTIONS_BY_PATH = {
     { id: "monthly-memberships", label: "Memberships" },
     { id: "specialty-programs", label: "Specialty Programs" },
     { id: "package-matcher", label: "Packages" },
-    { id: "wordmark", label: "Wordmark" }
+    { id: "wordmark", label: "Wordmark" },
+    { id: "footer", label: "Footer" }
   ],
   "/studio": [
     { id: "studio-intro", label: "Studio Intro" },
     { id: "studio-features", label: "Studio Features" },
     { id: "studio-gallery", label: "Studio Gallery" },
-    { id: "studio-visit", label: "Visit Studio" }
+    { id: "studio-visit", label: "Visit Studio" },
+    { id: "footer", label: "Footer" }
+  ],
+  "/instructors": [
+    { id: "instructor-grid", label: "Instructors" },
+    { id: "footer", label: "Footer" }
   ],
-  "/instructors": [{ id: "instructor-grid", label: "Instructors" }],
   "/contact": [
     { id: "hello-hero", label: "Hello" },
     { id: "contact-form", label: "Contact Form" },
-    { id: "faq", label: "FAQ" }
+    { id: "faq", label: "FAQ" },
+    { id: "footer", label: "Footer" }
   ]
 };
 function shouldUseDevFixtures() {
@@ -5721,8 +6218,277 @@ function shouldUseDevFixtures() {
   return new URLSearchParams(q).get("ohw-fixtures") === "1";
 }
 
-// src/ui/badge.tsx
+// src/lib/nav-items.ts
+var NAV_COUNT_KEY = "__ohw_nav_count";
+var NAV_ORDER_KEY = "__ohw_nav_order";
+function getLinkHref(el) {
+  const key = el.getAttribute("data-ohw-href-key");
+  if (key) {
+    const stored = getStoredLinkHref(key);
+    if (stored !== void 0) return stored;
+  }
+  return el.getAttribute("href") ?? "";
+}
+function isNavbarButton(el) {
+  return el.hasAttribute("data-ohw-role") && el.getAttribute("data-ohw-role") === "navbar-button";
+}
+function isNavbarLinkItem(el) {
+  if (!el.matches("[data-ohw-href-key]")) return false;
+  if (isNavbarButton(el)) return false;
+  if (!el.querySelector('[data-ohw-editable="text"]')) return false;
+  return Boolean(el.closest("nav, [data-ohw-nav-container], [data-ohw-nav-drawer]"));
+}
+function getNavbarDesktopContainer() {
+  return document.querySelector("[data-ohw-nav-container]");
+}
+function getNavbarDrawerContainer() {
+  return document.querySelector("[data-ohw-nav-drawer]");
+}
+function listNavbarItems() {
+  const desktop = getNavbarDesktopContainer();
+  if (desktop) {
+    return Array.from(desktop.querySelectorAll("[data-ohw-href-key]")).filter(isNavbarLinkItem);
+  }
+  const drawer = getNavbarDrawerContainer();
+  if (drawer) {
+    return Array.from(drawer.querySelectorAll("[data-ohw-href-key]")).filter(isNavbarLinkItem);
+  }
+  return Array.from(document.querySelectorAll("nav [data-ohw-href-key]")).filter(isNavbarLinkItem);
+}
+function parseNavIndexFromKey(key) {
+  if (!key) return null;
+  const match = key.match(/^nav-(\d+)-href$/);
+  if (!match) return null;
+  return parseInt(match[1], 10);
+}
+function getNavbarIndicesInDom() {
+  const indices = /* @__PURE__ */ new Set();
+  for (const item of listNavbarItems()) {
+    const idx = parseNavIndexFromKey(item.getAttribute("data-ohw-href-key"));
+    if (idx !== null) indices.add(idx);
+  }
+  return [...indices].sort((a, b) => a - b);
+}
+function getNextNavbarIndex() {
+  const indices = getNavbarIndicesInDom();
+  if (indices.length === 0) return 0;
+  return Math.max(...indices) + 1;
+}
+function getNavbarExistingTargets() {
+  return listNavbarItems().map((el) => getLinkHref(el)).filter(Boolean);
+}
+function getNavOrderFromDom() {
+  return listNavbarItems().map((el) => el.getAttribute("data-ohw-href-key")).filter((key) => Boolean(key));
+}
+function parseNavOrder(content) {
+  const raw = content[NAV_ORDER_KEY];
+  if (!raw) return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed)) return null;
+    return parsed.filter((key) => typeof key === "string" && key.length > 0);
+  } catch {
+    return null;
+  }
+}
+function findCounterpartByHrefKey(hrefKey, root) {
+  return root.querySelector(`[data-ohw-href-key="${CSS.escape(hrefKey)}"]`);
+}
+function cloneNavLinkShell(template) {
+  const anchor = document.createElement("a");
+  if (template) {
+    anchor.style.cssText = template.style.cssText;
+    if (template.className) anchor.className = template.className;
+  }
+  anchor.style.cursor = "pointer";
+  anchor.style.textDecoration = "none";
+  return anchor;
+}
+function buildNavLink(index, href, label, template) {
+  const anchor = cloneNavLinkShell(template);
+  anchor.href = href;
+  anchor.setAttribute("data-ohw-href-key", `nav-${index}-href`);
+  const span = document.createElement("span");
+  span.setAttribute("data-ohw-editable", "text");
+  span.setAttribute("data-ohw-key", `nav-${index}-label`);
+  span.textContent = label;
+  anchor.appendChild(span);
+  return anchor;
+}
+function insertNavLinkInContainer(container, anchor, afterHrefKey) {
+  if (!afterHrefKey) {
+    container.appendChild(anchor);
+    return;
+  }
+  const afterEl = findCounterpartByHrefKey(afterHrefKey, container);
+  if (afterEl?.parentElement === container) {
+    afterEl.insertAdjacentElement("afterend", anchor);
+    return;
+  }
+  container.appendChild(anchor);
+}
+function insertNavbarItemDom(index, href, label, afterAnchor) {
+  const afterHrefKey = afterAnchor?.getAttribute("data-ohw-href-key") ?? null;
+  const desktopItems = getNavbarDesktopContainer()?.querySelectorAll("[data-ohw-href-key]") ?? [];
+  const drawerItems = getNavbarDrawerContainer()?.querySelectorAll("[data-ohw-href-key]") ?? [];
+  const desktopTemplate = Array.from(desktopItems).find(isNavbarLinkItem) ?? null;
+  const drawerTemplate = Array.from(drawerItems).find(isNavbarLinkItem) ?? null;
+  let primary = null;
+  const desktopContainer = getNavbarDesktopContainer();
+  if (desktopContainer) {
+    const desktopAnchor = buildNavLink(index, href, label, desktopTemplate);
+    insertNavLinkInContainer(desktopContainer, desktopAnchor, afterHrefKey);
+    primary = desktopAnchor;
+  }
+  const drawerContainer = getNavbarDrawerContainer();
+  if (drawerContainer) {
+    const drawerAnchor = buildNavLink(index, href, label, drawerTemplate);
+    insertNavLinkInContainer(drawerContainer, drawerAnchor, afterHrefKey);
+    if (!primary) primary = drawerAnchor;
+  }
+  if (!primary) {
+    const fallback = buildNavLink(index, href, label, listNavbarItems()[0] ?? null);
+    const nav = document.querySelector("nav");
+    nav?.appendChild(fallback);
+    primary = fallback;
+  }
+  return primary;
+}
+function applyNavOrderToContainer(container, order) {
+  const seen = /* @__PURE__ */ new Set();
+  for (const hrefKey of order) {
+    if (seen.has(hrefKey)) continue;
+    seen.add(hrefKey);
+    const el = findCounterpartByHrefKey(hrefKey, container);
+    if (el) container.appendChild(el);
+  }
+  for (const el of container.querySelectorAll("[data-ohw-href-key]")) {
+    if (!isNavbarLinkItem(el)) continue;
+    const key = el.getAttribute("data-ohw-href-key");
+    if (!key || seen.has(key)) continue;
+    container.appendChild(el);
+  }
+}
+function applyNavOrder(order) {
+  const desktop = getNavbarDesktopContainer();
+  if (desktop) applyNavOrderToContainer(desktop, order);
+  const drawer = getNavbarDrawerContainer();
+  if (drawer) applyNavOrderToContainer(drawer, order);
+}
+function collectNavbarIndicesFromContent(content) {
+  const indices = /* @__PURE__ */ new Set();
+  for (const key of Object.keys(content)) {
+    const idx = parseNavIndexFromKey(key);
+    if (idx !== null) indices.add(idx);
+  }
+  const countRaw = content[NAV_COUNT_KEY];
+  if (countRaw) {
+    const count = parseInt(countRaw, 10);
+    if (Number.isFinite(count) && count > 0) {
+      for (let i = 0; i < count; i++) indices.add(i);
+    }
+  }
+  return [...indices].sort((a, b) => a - b);
+}
+function navbarIndexExistsInDom(index) {
+  return document.querySelector(`[data-ohw-href-key="nav-${index}-href"]`) !== null;
+}
+function reconcileNavbarItemsFromContent(content) {
+  const indices = collectNavbarIndicesFromContent(content);
+  for (const index of indices) {
+    if (navbarIndexExistsInDom(index)) continue;
+    const href = content[`nav-${index}-href`];
+    const label = content[`nav-${index}-label`];
+    if (!href && !label) continue;
+    insertNavbarItemDom(index, href ?? "/", label ?? "Untitled", null);
+  }
+  const order = parseNavOrder(content);
+  if (order?.length) applyNavOrder(order);
+}
+function buildNavOrderAfterInsert(afterAnchor, newHrefKey) {
+  const order = getNavOrderFromDom();
+  if (!afterAnchor) {
+    if (!order.includes(newHrefKey)) order.push(newHrefKey);
+    return order;
+  }
+  const afterKey = afterAnchor.getAttribute("data-ohw-href-key");
+  if (!afterKey) {
+    if (!order.includes(newHrefKey)) order.push(newHrefKey);
+    return order;
+  }
+  const withoutNew = order.filter((key) => key !== newHrefKey);
+  const pos = withoutNew.indexOf(afterKey);
+  if (pos >= 0) {
+    withoutNew.splice(pos + 1, 0, newHrefKey);
+    return withoutNew;
+  }
+  withoutNew.push(newHrefKey);
+  return withoutNew;
+}
+function insertNavbarItem(href, label, afterAnchor = null) {
+  const index = getNextNavbarIndex();
+  const anchor = insertNavbarItemDom(index, href, label, afterAnchor);
+  if (!anchor) throw new Error("Failed to insert navbar item");
+  const hrefKey = `nav-${index}-href`;
+  const order = buildNavOrderAfterInsert(afterAnchor, hrefKey);
+  applyNavOrder(order);
+  return {
+    anchor,
+    index,
+    hrefKey,
+    labelKey: `nav-${index}-label`,
+    href,
+    label,
+    order
+  };
+}
+
+// src/ui/navbar-container-chrome.tsx
+import { Plus as Plus2 } from "lucide-react";
 import { jsx as jsx21 } from "react/jsx-runtime";
+function NavbarContainerChrome({
+  rect,
+  onAdd
+}) {
+  const chromeGap = 6;
+  return /* @__PURE__ */ jsx21(
+    "div",
+    {
+      "data-ohw-navbar-container-chrome": "",
+      "data-ohw-bridge": "",
+      className: "pointer-events-none fixed z-[2147483647]",
+      style: {
+        top: rect.top - chromeGap,
+        left: rect.left - chromeGap,
+        width: rect.width + chromeGap * 2,
+        height: rect.height + chromeGap * 2
+      },
+      children: /* @__PURE__ */ jsx21(
+        "button",
+        {
+          type: "button",
+          "data-ohw-navbar-add-button": "",
+          className: "pointer-events-auto absolute left-1/2 flex p-0.5 rounded-[10px] size-7 -translate-x-1/2 translate-y-1/2 items-center justify-center border border-border bg-background shadow-sm transition-colors hover:bg-muted/80",
+          style: { top: "70%" },
+          "aria-label": "Add item",
+          onMouseDown: (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+          },
+          onClick: (e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            onAdd();
+          },
+          children: /* @__PURE__ */ jsx21(Plus2, { className: "size-4 shrink-0 text-foreground", "aria-hidden": true })
+        }
+      )
+    }
+  );
+}
+
+// src/ui/badge.tsx
+import { jsx as jsx22 } from "react/jsx-runtime";
 var badgeVariants = cva(
   "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
   {
@@ -5740,12 +6506,12 @@ var badgeVariants = cva(
   }
 );
 function Badge({ className, variant, ...props }) {
-  return /* @__PURE__ */ jsx21("div", { className: cn(badgeVariants({ variant }), className), ...props });
+  return /* @__PURE__ */ jsx22("div", { className: cn(badgeVariants({ variant }), className), ...props });
 }
 
 // src/OhhwellsBridge.tsx
 import { Link as Link2 } from "lucide-react";
-import { Fragment as Fragment4, jsx as jsx22, jsxs as jsxs12 } from "react/jsx-runtime";
+import { Fragment as Fragment5, jsx as jsx23, jsxs as jsxs13 } from "react/jsx-runtime";
 var PRIMARY2 = "#0885FE";
 var IMAGE_FADE_MS = 300;
 function runOpacityFade(el, onDone) {
@@ -5924,7 +6690,7 @@ function mountSchedulingWidget(insertAfter, notifyOnConnect = false, scheduleId,
   const root = createRoot(container);
   flushSync(() => {
     root.render(
-      /* @__PURE__ */ jsx22(
+      /* @__PURE__ */ jsx23(
         SchedulingWidget,
         {
           notifyOnConnect,
@@ -5964,7 +6730,7 @@ function mountSchedulingEntries(entries, notifyOnConnect = false) {
     }
   }
 }
-function getLinkHref(el) {
+function getLinkHref2(el) {
   const anchor = el instanceof HTMLAnchorElement ? el : el.querySelector("a");
   return anchor?.getAttribute("href") ?? "";
 }
@@ -6001,7 +6767,7 @@ function collectEditableNodes() {
       return { key: el.dataset.ohwKey ?? "", type: "video", text: getVideoEl(el)?.src ?? "" };
     }
     if (el.dataset.ohwEditable === "link") {
-      return { key: el.dataset.ohwKey ?? "", type: "link", text: getLinkHref(el) };
+      return { key: el.dataset.ohwKey ?? "", type: "link", text: getLinkHref2(el) };
     }
     return {
       key: el.dataset.ohwKey ?? "",
@@ -6012,7 +6778,7 @@ function collectEditableNodes() {
   document.querySelectorAll("[data-ohw-href-key]").forEach((el) => {
     const key = el.getAttribute("data-ohw-href-key") ?? "";
     if (!key) return;
-    nodes.push({ key, type: "link", text: getLinkHref(el) });
+    nodes.push({ key, type: "link", text: getLinkHref2(el) });
   });
   document.querySelectorAll('[data-ohw-editable="video"]').forEach((el) => {
     const key = el.dataset.ohwKey ?? "";
@@ -6104,7 +6870,7 @@ function applyLinkByKey(key, val) {
 }
 function isInsideLinkEditor(target) {
   return Boolean(
-    target.closest("[data-ohw-link-popover-root]") || target.closest("[data-ohw-link-modal-root]") || target.closest("[data-ohw-link-page-dropdown]") || target.closest('[data-slot="popover-content"]') || target.closest('[data-slot="dialog-content"]') || target.closest('[data-slot="dialog-overlay"]')
+    target.closest("[data-ohw-link-popover-root]") || target.closest("[data-ohw-link-modal-root]") || target.closest("[data-ohw-link-page-dropdown]") || target.closest("[data-ohw-section-picker]") || target.closest("[data-ohw-navbar-container-chrome]") || target.closest("[data-ohw-navbar-add-button]") || target.closest('[data-slot="popover-content"]') || target.closest('[data-slot="dialog-content"]') || target.closest('[data-slot="dialog-overlay"]')
   );
 }
 function getHrefKeyFromElement(el) {
@@ -6115,7 +6881,7 @@ function getHrefKeyFromElement(el) {
   if (!key) return null;
   return { anchor, key };
 }
-function isNavbarButton(el) {
+function isNavbarButton2(el) {
   return Boolean(el.closest('[data-ohw-role="navbar-button"]'));
 }
 function getNavigationItemAnchor(el) {
@@ -6127,19 +6893,8 @@ function getNavigationItemAnchor(el) {
 function isNavigationItem(el) {
   return getNavigationItemAnchor(el) !== null;
 }
-function getNavigationItemAddHintTarget(anchor) {
-  const items = listNavigationItems();
-  const idx = items.indexOf(anchor);
-  if (idx >= 0 && idx < items.length - 1) return items[idx + 1];
-  return anchor;
-}
-function listNavigationItems() {
-  return Array.from(
-    document.querySelectorAll("nav [data-ohw-href-key], footer [data-ohw-href-key]")
-  ).filter((el) => isNavigationItem(el));
-}
 function getNavigationItemReorderState(anchor) {
-  if (isNavbarButton(anchor)) return { key: null, disabled: false };
+  if (isNavbarButton2(anchor)) return { key: null, disabled: false };
   return getReorderHandleStateFromAnchor(anchor);
 }
 function getReorderHandleState(el) {
@@ -6161,6 +6916,104 @@ function clearHrefKeyHover(anchor) {
 function isInsideNavigationItem(el) {
   return getNavigationItemAnchor(el) !== null;
 }
+function getNavigationRoot(el) {
+  const explicit = el.closest("[data-ohw-nav-root]");
+  if (explicit) return explicit;
+  return el.closest("nav, footer, aside");
+}
+function findFooterItemGroup(item) {
+  const footer = item.closest("footer");
+  if (!footer) return null;
+  let node = item.parentElement;
+  while (node && node !== footer) {
+    const hasDirectNavItems = Array.from(
+      node.querySelectorAll(":scope > [data-ohw-href-key]")
+    ).some(isNavigationItem);
+    if (hasDirectNavItems) return node;
+    node = node.parentElement;
+  }
+  return null;
+}
+function isNavigationRoot(el) {
+  return el.hasAttribute("data-ohw-nav-root") || el.matches("nav, footer, aside");
+}
+function isInferredFooterGroup(el) {
+  const footer = el.closest("footer");
+  if (!footer || el === footer) return false;
+  return Array.from(el.querySelectorAll(":scope > [data-ohw-href-key]")).some(isNavigationItem);
+}
+function isNavigationContainer(el) {
+  return el.hasAttribute("data-ohw-nav-container") || isNavigationRoot(el) || isInferredFooterGroup(el);
+}
+function isPointOverNavigation(x, y) {
+  const navRoot = document.querySelector("[data-ohw-nav-root]") ?? document.querySelector("nav");
+  if (!navRoot) return false;
+  const r2 = navRoot.getBoundingClientRect();
+  return x >= r2.left && x <= r2.right && y >= r2.top && y <= r2.bottom;
+}
+function isPointOverNavItem(container, x, y) {
+  return Array.from(container.querySelectorAll("[data-ohw-href-key]")).some((el) => {
+    if (!isNavigationItem(el) || isNavbarButton2(el)) return false;
+    const itemRect = el.getBoundingClientRect();
+    return x >= itemRect.left && x <= itemRect.right && y >= itemRect.top && y <= itemRect.bottom;
+  });
+}
+function resolveNavContainerSelectionTarget(target, clientX, clientY) {
+  if (getNavigationItemAnchor(target)) return null;
+  if (target.closest('[data-ohw-role="navbar-button"]')) return null;
+  const plainLink = target.closest("a");
+  if (plainLink && !plainLink.hasAttribute("data-ohw-href-key") && !plainLink.closest("[data-ohw-nav-container]")) {
+    return null;
+  }
+  const fromClosest = target.closest("[data-ohw-nav-container]");
+  if (fromClosest && !isPointOverNavItem(fromClosest, clientX, clientY)) {
+    return fromClosest;
+  }
+  const navRoot = target.closest("[data-ohw-nav-root]");
+  if (!navRoot) return null;
+  const container = navRoot.querySelector("[data-ohw-nav-container]");
+  if (!container || isPointOverNavItem(container, clientX, clientY)) return null;
+  if (target === navRoot || target.hasAttribute("data-ohw-nav-root")) {
+    return container;
+  }
+  return null;
+}
+function getNavigationSelectionParent(el) {
+  if (isNavigationItem(el)) {
+    const explicit = el.closest("[data-ohw-nav-container]");
+    if (explicit) return explicit;
+    const footerGroup = findFooterItemGroup(el);
+    if (footerGroup) return footerGroup;
+    return getNavigationRoot(el);
+  }
+  if (el.hasAttribute("data-ohw-nav-container") || isInferredFooterGroup(el)) {
+    return getNavigationRoot(el);
+  }
+  return null;
+}
+function placeCaretAtPoint(el, x, y) {
+  const selection = window.getSelection();
+  if (!selection) return;
+  if (typeof document.caretRangeFromPoint === "function") {
+    const range = document.caretRangeFromPoint(x, y);
+    if (range && el.contains(range.startContainer)) {
+      selection.removeAllRanges();
+      selection.addRange(range);
+      return;
+    }
+  }
+  const caretPositionFromPoint = document.caretPositionFromPoint;
+  if (typeof caretPositionFromPoint === "function") {
+    const position = caretPositionFromPoint(x, y);
+    if (position && el.contains(position.offsetNode)) {
+      const range = document.createRange();
+      range.setStart(position.offsetNode, position.offset);
+      range.collapse(true);
+      selection.removeAllRanges();
+      selection.addRange(range);
+    }
+  }
+}
 function collectSections() {
   return collectSectionsFromDom();
 }
@@ -6308,7 +7161,7 @@ function EditGlowChrome({
   dragDisabled = false
 }) {
   const GAP = 6;
-  return /* @__PURE__ */ jsxs12(
+  return /* @__PURE__ */ jsxs13(
     "div",
     {
       ref: elRef,
@@ -6323,7 +7176,7 @@ function EditGlowChrome({
         zIndex: 2147483646
       },
       children: [
-        /* @__PURE__ */ jsx22(
+        /* @__PURE__ */ jsx23(
           "div",
           {
             style: {
@@ -6336,7 +7189,7 @@ function EditGlowChrome({
             }
           }
         ),
-        reorderHrefKey && /* @__PURE__ */ jsx22(
+        reorderHrefKey && /* @__PURE__ */ jsx23(
           "div",
           {
             "data-ohw-drag-handle-container": "",
@@ -6348,7 +7201,7 @@ function EditGlowChrome({
               transform: "translate(calc(-100% - 7px), -50%)",
               pointerEvents: dragDisabled ? "none" : "auto"
             },
-            children: /* @__PURE__ */ jsx22(
+            children: /* @__PURE__ */ jsx23(
               DragHandle,
               {
                 "aria-label": `Reorder ${reorderHrefKey}`,
@@ -6452,7 +7305,7 @@ function FloatingToolbar({
   onEditLink
 }) {
   const { top, left, transform } = calcToolbarPos(rect, parentScroll, 330);
-  return /* @__PURE__ */ jsx22(
+  return /* @__PURE__ */ jsx23(
     "div",
     {
       ref: elRef,
@@ -6464,12 +7317,12 @@ function FloatingToolbar({
         zIndex: 2147483647,
         pointerEvents: "auto"
       },
-      children: /* @__PURE__ */ jsxs12(CustomToolbar, { children: [
-        TOOLBAR_GROUPS.map((btns, gi) => /* @__PURE__ */ jsxs12(React9.Fragment, { children: [
-          gi > 0 && /* @__PURE__ */ jsx22(CustomToolbarDivider, {}),
+      children: /* @__PURE__ */ jsxs13(CustomToolbar, { children: [
+        TOOLBAR_GROUPS.map((btns, gi) => /* @__PURE__ */ jsxs13(React9.Fragment, { children: [
+          gi > 0 && /* @__PURE__ */ jsx23(CustomToolbarDivider, {}),
           btns.map((btn) => {
             const isActive = activeCommands.has(btn.cmd);
-            return /* @__PURE__ */ jsx22(
+            return /* @__PURE__ */ jsx23(
               CustomToolbarButton,
               {
                 title: btn.title,
@@ -6478,7 +7331,7 @@ function FloatingToolbar({
                   e.preventDefault();
                   onCommand(btn.cmd);
                 },
-                children: /* @__PURE__ */ jsx22(
+                children: /* @__PURE__ */ jsx23(
                   "svg",
                   {
                     width: "16",
@@ -6499,7 +7352,7 @@ function FloatingToolbar({
             );
           })
         ] }, gi)),
-        showEditLink ? /* @__PURE__ */ jsx22(
+        showEditLink ? /* @__PURE__ */ jsx23(
           CustomToolbarButton,
           {
             type: "button",
@@ -6513,7 +7366,7 @@ function FloatingToolbar({
               e.preventDefault();
               e.stopPropagation();
             },
-            children: /* @__PURE__ */ jsx22(Link2, { className: "size-4 shrink-0", "aria-hidden": true })
+            children: /* @__PURE__ */ jsx23(Link2, { className: "size-4 shrink-0", "aria-hidden": true })
           }
         ) : null
       ] })
@@ -6530,7 +7383,7 @@ function StateToggle({
   states,
   onStateChange
 }) {
-  return /* @__PURE__ */ jsx22(
+  return /* @__PURE__ */ jsx23(
     ToggleGroup,
     {
       "data-ohw-state-toggle": "",
@@ -6544,7 +7397,7 @@ function StateToggle({
         left: rect.right - 8,
         transform: "translateX(-100%)"
       },
-      children: states.map((state) => /* @__PURE__ */ jsx22(ToggleGroupItem, { value: state, size: "sm", children: state }, state))
+      children: states.map((state) => /* @__PURE__ */ jsx23(ToggleGroupItem, { value: state, size: "sm", children: state }, state))
     }
   );
 }
@@ -6567,12 +7420,12 @@ function resolveSubdomain(subdomainFromQuery) {
   return "";
 }
 function OhhwellsBridge() {
-  const pathname = usePathname();
-  const router = useRouter();
+  const pathname = usePathname2();
+  const router = useRouter2();
   const searchParams = useSearchParams();
   const isEditMode = isEditSessionActive();
-  const [bridgeRoot, setBridgeRoot] = useState5(null);
-  useEffect4(() => {
+  const [bridgeRoot, setBridgeRoot] = useState6(null);
+  useEffect7(() => {
     const figtreeFontId = "ohw-figtree-font";
     if (!document.getElementById(figtreeFontId)) {
       const preconnect1 = Object.assign(document.createElement("link"), { rel: "preconnect", href: "https://fonts.googleapis.com" });
@@ -6600,83 +7453,91 @@ function OhhwellsBridge() {
   const subdomainFromQuery = searchParams.get("subdomain");
   const subdomain = resolveSubdomain(subdomainFromQuery);
   useLinkHrefGuardian(pathname, subdomain, isEditMode);
-  const postToParent = useCallback2((data) => {
+  const postToParent2 = useCallback3((data) => {
     if (typeof window !== "undefined" && window.parent !== window) {
       window.parent.postMessage(data, "*");
     }
   }, []);
-  const [fetchState, setFetchState] = useState5("idle");
-  const autoSaveTimers = useRef4(/* @__PURE__ */ new Map());
-  const activeElRef = useRef4(null);
-  const selectedElRef = useRef4(null);
-  const originalContentRef = useRef4(null);
-  const activeStateElRef = useRef4(null);
-  const parentScrollRef = useRef4(null);
-  const visibleViewportRef = useRef4(null);
-  const [dialogPortalContainer, setDialogPortalContainer] = useState5(null);
-  const attachVisibleViewport = useCallback2((node) => {
+  const [fetchState, setFetchState] = useState6("idle");
+  const autoSaveTimers = useRef5(/* @__PURE__ */ new Map());
+  const activeElRef = useRef5(null);
+  const selectedElRef = useRef5(null);
+  const originalContentRef = useRef5(null);
+  const activeStateElRef = useRef5(null);
+  const parentScrollRef = useRef5(null);
+  const visibleViewportRef = useRef5(null);
+  const [dialogPortalContainer, setDialogPortalContainer] = useState6(null);
+  const attachVisibleViewport = useCallback3((node) => {
     visibleViewportRef.current = node;
     setDialogPortalContainer(node);
     if (node) applyVisibleViewport(node, parentScrollRef.current);
   }, []);
-  const toolbarElRef = useRef4(null);
-  const glowElRef = useRef4(null);
-  const hoveredImageRef = useRef4(null);
-  const hoveredImageHasTextOverlapRef = useRef4(false);
-  const dragOverElRef = useRef4(null);
-  const [mediaHover, setMediaHover] = useState5(null);
-  const [uploadingRects, setUploadingRects] = useState5({});
-  const hoveredGapRef = useRef4(null);
-  const imageUnhoverTimerRef = useRef4(null);
-  const imageShowTimerRef = useRef4(null);
-  const editStylesRef = useRef4(null);
-  const activateRef = useRef4(() => {
+  const toolbarElRef = useRef5(null);
+  const glowElRef = useRef5(null);
+  const hoveredImageRef = useRef5(null);
+  const hoveredImageHasTextOverlapRef = useRef5(false);
+  const dragOverElRef = useRef5(null);
+  const [mediaHover, setMediaHover] = useState6(null);
+  const [uploadingRects, setUploadingRects] = useState6({});
+  const hoveredGapRef = useRef5(null);
+  const imageUnhoverTimerRef = useRef5(null);
+  const imageShowTimerRef = useRef5(null);
+  const editStylesRef = useRef5(null);
+  const activateRef = useRef5(() => {
+  });
+  const deactivateRef = useRef5(() => {
   });
-  const deactivateRef = useRef4(() => {
+  const selectRef = useRef5(() => {
   });
-  const selectRef = useRef4(() => {
+  const selectFrameRef = useRef5(() => {
   });
-  const deselectRef = useRef4(() => {
+  const deselectRef = useRef5(() => {
   });
-  const reselectNavigationItemRef = useRef4(() => {
+  const reselectNavigationItemRef = useRef5(() => {
   });
-  const commitNavigationTextEditRef = useRef4(() => {
+  const commitNavigationTextEditRef = useRef5(() => {
   });
-  const refreshActiveCommandsRef = useRef4(() => {
+  const refreshActiveCommandsRef = useRef5(() => {
   });
-  const postToParentRef = useRef4(postToParent);
-  postToParentRef.current = postToParent;
-  const sectionsLoadedRef = useRef4(false);
-  const pendingScheduleConfigRequests = useRef4([]);
-  const [toolbarRect, setToolbarRect] = useState5(null);
-  const [toolbarVariant, setToolbarVariant] = useState5("none");
-  const toolbarVariantRef = useRef4("none");
+  const postToParentRef = useRef5(postToParent2);
+  postToParentRef.current = postToParent2;
+  const sectionsLoadedRef = useRef5(false);
+  const pendingScheduleConfigRequests = useRef5([]);
+  const [toolbarRect, setToolbarRect] = useState6(null);
+  const [toolbarVariant, setToolbarVariant] = useState6("none");
+  const toolbarVariantRef = useRef5("none");
   toolbarVariantRef.current = toolbarVariant;
-  const [reorderHrefKey, setReorderHrefKey] = useState5(null);
-  const [reorderDragDisabled, setReorderDragDisabled] = useState5(false);
-  const [toggleState, setToggleState] = useState5(null);
-  const [maxBadge, setMaxBadge] = useState5(null);
-  const [activeCommands, setActiveCommands] = useState5(/* @__PURE__ */ new Set());
-  const [sectionGap, setSectionGap] = useState5(null);
-  const [toolbarShowEditLink, setToolbarShowEditLink] = useState5(false);
-  const hoveredItemElRef = useRef4(null);
-  const [hoveredItemRect, setHoveredItemRect] = useState5(null);
-  const siblingHintElRef = useRef4(null);
-  const [siblingHintRect, setSiblingHintRect] = useState5(null);
-  const [isItemDragging, setIsItemDragging] = useState5(false);
-  const [linkPopover, setLinkPopover] = useState5(null);
-  const [sitePages, setSitePages] = useState5([]);
-  const [sectionsByPath, setSectionsByPath] = useState5({});
-  const sectionsPrefetchGenRef = useRef4(0);
-  const setLinkPopoverRef = useRef4(setLinkPopover);
-  const linkPopoverPanelRef = useRef4(null);
-  const linkPopoverOpenRef = useRef4(false);
-  const linkPopoverGraceUntilRef = useRef4(0);
+  const [reorderHrefKey, setReorderHrefKey] = useState6(null);
+  const [reorderDragDisabled, setReorderDragDisabled] = useState6(false);
+  const [toggleState, setToggleState] = useState6(null);
+  const [maxBadge, setMaxBadge] = useState6(null);
+  const [activeCommands, setActiveCommands] = useState6(/* @__PURE__ */ new Set());
+  const [sectionGap, setSectionGap] = useState6(null);
+  const [toolbarShowEditLink, setToolbarShowEditLink] = useState6(false);
+  const hoveredNavContainerRef = useRef5(null);
+  const [hoveredNavContainerRect, setHoveredNavContainerRect] = useState6(null);
+  const hoveredItemElRef = useRef5(null);
+  const [hoveredItemRect, setHoveredItemRect] = useState6(null);
+  const siblingHintElRef = useRef5(null);
+  const [siblingHintRect, setSiblingHintRect] = useState6(null);
+  const [isItemDragging, setIsItemDragging] = useState6(false);
+  const [linkPopover, setLinkPopover] = useState6(null);
+  const linkPopoverSessionRef = useRef5(null);
+  const addNavAfterAnchorRef = useRef5(null);
+  const editContentRef = useRef5({});
+  const [sitePages, setSitePages] = useState6([]);
+  const [sectionsByPath, setSectionsByPath] = useState6({});
+  const sectionsPrefetchGenRef = useRef5(0);
+  const setLinkPopoverRef = useRef5(setLinkPopover);
+  const linkPopoverPanelRef = useRef5(null);
+  const linkPopoverOpenRef = useRef5(false);
+  const linkPopoverGraceUntilRef = useRef5(0);
   setLinkPopoverRef.current = setLinkPopover;
+  linkPopoverSessionRef.current = linkPopover;
   const bumpLinkPopoverGrace = () => {
     linkPopoverGraceUntilRef.current = Date.now() + 350;
   };
-  const runSectionsPrefetch = useCallback2((pages) => {
+  const runSectionsPrefetch = useCallback3((pages) => {
     if (!isEditMode || shouldUseDevFixtures() || pages.length === 0) return;
     const gen = ++sectionsPrefetchGenRef.current;
     const paths = pages.map((p) => p.path);
@@ -6695,9 +7556,9 @@ function OhhwellsBridge() {
       );
     });
   }, [isEditMode, pathname]);
-  const runSectionsPrefetchRef = useRef4(runSectionsPrefetch);
+  const runSectionsPrefetchRef = useRef5(runSectionsPrefetch);
   runSectionsPrefetchRef.current = runSectionsPrefetch;
-  useEffect4(() => {
+  useEffect7(() => {
     if (!linkPopover) return;
     if (hoveredImageRef.current) {
       hoveredImageRef.current = null;
@@ -6706,7 +7567,7 @@ function OhhwellsBridge() {
     hoveredGapRef.current = null;
     setSectionGap(null);
     setMediaHover(null);
-    postToParent({ type: "ow:link-modal-lock", locked: true });
+    postToParent2({ type: "ow:link-modal-lock", locked: true });
     const html = document.documentElement;
     const body = document.body;
     const prevHtmlOverflow = html.style.overflow;
@@ -6723,15 +7584,16 @@ function OhhwellsBridge() {
     const scrollOpts = { passive: false, capture: true };
     document.addEventListener("wheel", preventBackgroundScroll, scrollOpts);
     document.addEventListener("touchmove", preventBackgroundScroll, scrollOpts);
+    postToParent2({ type: "ow:image-unhover" });
     return () => {
-      postToParent({ type: "ow:link-modal-lock", locked: false });
+      postToParent2({ type: "ow:link-modal-lock", locked: false });
       html.style.overflow = prevHtmlOverflow;
       body.style.overflow = prevBodyOverflow;
       document.removeEventListener("wheel", preventBackgroundScroll, scrollOpts);
       document.removeEventListener("touchmove", preventBackgroundScroll, scrollOpts);
     };
-  }, [linkPopover, postToParent]);
-  useEffect4(() => {
+  }, [linkPopover, postToParent2]);
+  useEffect7(() => {
     if (!isEditMode) return;
     const useFixtures = shouldUseDevFixtures();
     if (useFixtures) {
@@ -6752,17 +7614,17 @@ function OhhwellsBridge() {
       runSectionsPrefetchRef.current(mapped);
     };
     window.addEventListener("message", onSitePages);
-    if (!useFixtures) postToParent({ type: "ow:request-site-pages" });
+    if (!useFixtures) postToParent2({ type: "ow:request-site-pages" });
     return () => window.removeEventListener("message", onSitePages);
-  }, [isEditMode, postToParent]);
-  useEffect4(() => {
+  }, [isEditMode, postToParent2]);
+  useEffect7(() => {
     if (!isEditMode || shouldUseDevFixtures()) return;
     void loadAllSectionsManifest().then((manifest) => {
       if (Object.keys(manifest).length === 0) return;
       setSectionsByPath((prev) => ({ ...manifest, ...prev }));
     });
   }, [isEditMode]);
-  useEffect4(() => {
+  useEffect7(() => {
     const update = () => {
       const el = activeElRef.current ?? selectedElRef.current;
       if (el) setToolbarRect(getEditMeasureEl(el).getBoundingClientRect());
@@ -6786,10 +7648,10 @@ function OhhwellsBridge() {
       vvp.removeEventListener("resize", update);
     };
   }, []);
-  const refreshStateRules = useCallback2(() => {
+  const refreshStateRules = useCallback3(() => {
     editStylesRef.current?.forceHover && (editStylesRef.current.forceHover.textContent = collectStateRules());
   }, []);
-  const processConfigRequest = useCallback2((insertAfterVal) => {
+  const processConfigRequest = useCallback3((insertAfterVal) => {
     const tracker = getSectionsTracker();
     let entries = [];
     try {
@@ -6812,7 +7674,7 @@ function OhhwellsBridge() {
     }
     window.postMessage({ type: "ow:schedule-config", insertAfter: insertAfterVal, scheduleId: null }, "*");
   }, [isEditMode]);
-  const deactivate = useCallback2(() => {
+  const deactivate = useCallback3(() => {
     const el = activeElRef.current;
     if (!el) return;
     const key = el.dataset.ohwKey;
@@ -6841,21 +7703,23 @@ function OhhwellsBridge() {
     setMaxBadge(null);
     setActiveCommands(/* @__PURE__ */ new Set());
     setToolbarShowEditLink(false);
-    postToParent({ type: "ow:exit-edit" });
-  }, [postToParent]);
-  const deselect = useCallback2(() => {
+    postToParent2({ type: "ow:exit-edit" });
+  }, [postToParent2]);
+  const deselect = useCallback3(() => {
     selectedElRef.current = null;
     setReorderHrefKey(null);
     setReorderDragDisabled(false);
     siblingHintElRef.current = null;
     setSiblingHintRect(null);
     setIsItemDragging(false);
+    hoveredNavContainerRef.current = null;
+    setHoveredNavContainerRect(null);
     if (!activeElRef.current) {
       setToolbarRect(null);
       setToolbarVariant("none");
     }
   }, []);
-  const reselectNavigationItem = useCallback2((navAnchor) => {
+  const reselectNavigationItem = useCallback3((navAnchor) => {
     selectedElRef.current = navAnchor;
     const { key, disabled } = getNavigationItemReorderState(navAnchor);
     setReorderHrefKey(key);
@@ -6865,7 +7729,7 @@ function OhhwellsBridge() {
     setToolbarShowEditLink(false);
     setActiveCommands(/* @__PURE__ */ new Set());
   }, []);
-  const commitNavigationTextEdit = useCallback2((navAnchor) => {
+  const commitNavigationTextEdit = useCallback3((navAnchor) => {
     const el = activeElRef.current;
     if (!el) return;
     const key = el.dataset.ohwKey;
@@ -6878,9 +7742,9 @@ function OhhwellsBridge() {
       const html = sanitizeHtml(el.innerHTML);
       const original = originalContentRef.current ?? "";
       if (html !== sanitizeHtml(original)) {
-        postToParent({ type: "ow:change", nodes: [{ key, text: html }] });
+        postToParent2({ type: "ow:change", nodes: [{ key, text: html }] });
         const h = document.documentElement.scrollHeight;
-        if (h > 50) postToParent({ type: "ow:height", height: h });
+        if (h > 50) postToParent2({ type: "ow:height", height: h });
       }
     }
     el.removeAttribute("contenteditable");
@@ -6888,31 +7752,38 @@ function OhhwellsBridge() {
     setMaxBadge(null);
     setActiveCommands(/* @__PURE__ */ new Set());
     setToolbarShowEditLink(false);
-    postToParent({ type: "ow:exit-edit" });
+    postToParent2({ type: "ow:exit-edit" });
     reselectNavigationItem(navAnchor);
-  }, [postToParent, reselectNavigationItem]);
-  const handleAddNavigationItem = useCallback2(() => {
-    const selected = selectedElRef.current;
-    if (!selected) return;
-    const target = getNavigationItemAddHintTarget(selected);
-    siblingHintElRef.current = target;
-    setSiblingHintRect(target.getBoundingClientRect());
+  }, [postToParent2, reselectNavigationItem]);
+  const handleAddTopLevelNavItem = useCallback3(() => {
+    const items = listNavbarItems();
+    addNavAfterAnchorRef.current = items[items.length - 1] ?? null;
+    deselectRef.current();
+    deactivateRef.current();
+    bumpLinkPopoverGrace();
+    setLinkPopover({
+      key: "__add-nav__",
+      mode: "create",
+      intent: "add-nav"
+    });
   }, []);
-  const handleItemDragStart = useCallback2(() => {
+  const handleItemDragStart = useCallback3(() => {
     siblingHintElRef.current = null;
     setSiblingHintRect(null);
     setIsItemDragging(true);
   }, []);
-  const handleItemDragEnd = useCallback2(() => {
+  const handleItemDragEnd = useCallback3(() => {
     setIsItemDragging(false);
   }, []);
   reselectNavigationItemRef.current = reselectNavigationItem;
   commitNavigationTextEditRef.current = commitNavigationTextEdit;
-  const select = useCallback2((anchor) => {
+  const select = useCallback3((anchor) => {
     if (!isNavigationItem(anchor)) return;
     if (activeElRef.current) deactivate();
     selectedElRef.current = anchor;
     clearHrefKeyHover(anchor);
+    hoveredNavContainerRef.current = null;
+    setHoveredNavContainerRect(null);
     setHoveredItemRect(null);
     hoveredItemElRef.current = null;
     siblingHintElRef.current = null;
@@ -6926,7 +7797,26 @@ function OhhwellsBridge() {
     setToolbarShowEditLink(false);
     setActiveCommands(/* @__PURE__ */ new Set());
   }, [deactivate]);
-  const activate = useCallback2((el) => {
+  const selectFrame = useCallback3((el) => {
+    if (!isNavigationContainer(el)) return;
+    if (activeElRef.current) deactivate();
+    selectedElRef.current = el;
+    clearHrefKeyHover(el);
+    hoveredNavContainerRef.current = null;
+    setHoveredNavContainerRect(null);
+    setHoveredItemRect(null);
+    hoveredItemElRef.current = null;
+    siblingHintElRef.current = null;
+    setSiblingHintRect(null);
+    setIsItemDragging(false);
+    setReorderHrefKey(null);
+    setReorderDragDisabled(false);
+    setToolbarVariant("select-frame");
+    setToolbarRect(el.getBoundingClientRect());
+    setToolbarShowEditLink(false);
+    setActiveCommands(/* @__PURE__ */ new Set());
+  }, [deactivate]);
+  const activate = useCallback3((el, options) => {
     if (activeElRef.current === el) return;
     selectedElRef.current = null;
     deactivate();
@@ -6944,6 +7834,9 @@ function OhhwellsBridge() {
     activeElRef.current = el;
     originalContentRef.current = el.innerHTML;
     el.focus();
+    if (options?.caretX !== void 0 && options?.caretY !== void 0) {
+      placeCaretAtPoint(el, options.caretX, options.caretY);
+    }
     setToolbarShowEditLink(Boolean(getHrefKeyFromElement(el)));
     const navAnchor = getNavigationItemAnchor(el);
     if (navAnchor) {
@@ -6955,12 +7848,13 @@ function OhhwellsBridge() {
       setReorderDragDisabled(reorderDisabled);
     }
     setToolbarRect(getEditMeasureEl(el).getBoundingClientRect());
-    postToParent({ type: "ow:enter-edit", key: el.dataset.ohwKey });
+    postToParent2({ type: "ow:enter-edit", key: el.dataset.ohwKey });
     requestAnimationFrame(() => refreshActiveCommandsRef.current());
-  }, [deactivate, postToParent]);
+  }, [deactivate, postToParent2]);
   activateRef.current = activate;
   deactivateRef.current = deactivate;
   selectRef.current = select;
+  selectFrameRef.current = selectFrame;
   deselectRef.current = deselect;
   useLayoutEffect2(() => {
     if (!subdomain || isEditMode) {
@@ -7002,6 +7896,7 @@ function OhhwellsBridge() {
         });
         applyLinkByKey(key, val);
       }
+      reconcileNavbarItemsFromContent(content);
       enforceLinkHrefs();
       initSectionsFromContent(content, true);
       sectionsLoadedRef.current = true;
@@ -7030,7 +7925,7 @@ function OhhwellsBridge() {
       cancelled = true;
     };
   }, [subdomain, isEditMode]);
-  useEffect4(() => {
+  useEffect7(() => {
     if (!subdomain || isEditMode) return;
     let debounceTimer = null;
     let observer = null;
@@ -7061,6 +7956,7 @@ function OhhwellsBridge() {
           });
           applyLinkByKey(key, val);
         }
+        reconcileNavbarItemsFromContent(content);
       } finally {
         observer?.observe(document.body, { childList: true, subtree: true });
       }
@@ -7084,20 +7980,38 @@ function OhhwellsBridge() {
     const visible = Boolean(subdomain) && fetchState !== "done";
     el.style.display = visible ? "flex" : "none";
   }, [subdomain, fetchState]);
-  useEffect4(() => {
-    postToParent({ type: "ow:navigation", path: pathname });
-  }, [pathname, postToParent]);
-  useEffect4(() => {
+  useEffect7(() => {
+    postToParent2({ type: "ow:navigation", path: pathname });
+  }, [pathname, postToParent2]);
+  useEffect7(() => {
     if (!isEditMode) return;
+    if (linkPopoverSessionRef.current?.intent === "add-nav") return;
+    if (document.querySelector("[data-ohw-section-picker]")) return;
     setLinkPopover(null);
     deselectRef.current();
     deactivateRef.current();
   }, [pathname, isEditMode]);
-  useEffect4(() => {
+  useEffect7(() => {
+    const contentForNav = () => {
+      if (isEditMode) return editContentRef.current;
+      if (!subdomain) return {};
+      return contentCache.get(subdomain) ?? {};
+    };
+    const run = () => reconcileNavbarItemsFromContent(contentForNav());
+    run();
+    const nav = document.querySelector("nav");
+    if (!nav) return;
+    const observer = new MutationObserver(() => {
+      requestAnimationFrame(run);
+    });
+    observer.observe(nav, { childList: true, subtree: true });
+    return () => observer.disconnect();
+  }, [isEditMode, pathname, subdomain, fetchState]);
+  useEffect7(() => {
     if (!isEditMode) return;
     const measure = () => {
       const h = document.body.scrollHeight;
-      if (h > 50) postToParent({ type: "ow:height", height: h });
+      if (h > 50) postToParent2({ type: "ow:height", height: h });
     };
     const t1 = setTimeout(measure, 50);
     const t2 = setTimeout(measure, 500);
@@ -7116,8 +8030,8 @@ function OhhwellsBridge() {
       if (resizeTimer) clearTimeout(resizeTimer);
       window.removeEventListener("resize", handleResize);
     };
-  }, [pathname, isEditMode, postToParent]);
-  useEffect4(() => {
+  }, [pathname, isEditMode, postToParent2]);
+  useEffect7(() => {
     if (!subdomainFromQuery || isEditMode) return;
     const handleClick = (e) => {
       const anchor = e.target.closest("a");
@@ -7133,7 +8047,7 @@ function OhhwellsBridge() {
     document.addEventListener("click", handleClick, true);
     return () => document.removeEventListener("click", handleClick, true);
   }, [subdomainFromQuery, isEditMode, router]);
-  useEffect4(() => {
+  useEffect7(() => {
     if (!isEditMode) {
       editStylesRef.current?.base.remove();
       editStylesRef.current?.forceHover.remove();
@@ -7206,6 +8120,13 @@ function OhhwellsBridge() {
       if (target.closest("[data-ohw-max-badge]")) return;
       if (isInsideLinkEditor(target)) return;
       if (target.closest('[data-ohw-edit-chrome], [data-ohw-item-interaction], [data-ohw-drag-handle-container], [data-slot="drag-handle"]')) {
+        const navFromChrome = resolveNavContainerSelectionTarget(target, e.clientX, e.clientY);
+        if (navFromChrome) {
+          e.preventDefault();
+          e.stopPropagation();
+          selectFrameRef.current(navFromChrome);
+          return;
+        }
         e.preventDefault();
         e.stopPropagation();
         return;
@@ -7220,7 +8141,8 @@ function OhhwellsBridge() {
           bumpLinkPopoverGrace();
           setLinkPopoverRef.current({
             key: editable.dataset.ohwKey ?? "",
-            target: getLinkHref(editable)
+            mode: "edit",
+            target: getLinkHref2(editable)
           });
           return;
         }
@@ -7236,7 +8158,7 @@ function OhhwellsBridge() {
           e.preventDefault();
           e.stopPropagation();
           if (selectedElRef.current === navAnchor) {
-            activateRef.current(editable);
+            activateRef.current(editable, { caretX: e.clientX, caretY: e.clientY });
             return;
           }
           selectRef.current(navAnchor);
@@ -7255,6 +8177,22 @@ function OhhwellsBridge() {
         selectRef.current(hrefAnchor);
         return;
       }
+      const navContainerToSelect = resolveNavContainerSelectionTarget(target, e.clientX, e.clientY);
+      if (navContainerToSelect) {
+        e.preventDefault();
+        e.stopPropagation();
+        selectFrameRef.current(navContainerToSelect);
+        return;
+      }
+      const selectedContainer = selectedElRef.current;
+      if (selectedContainer && isNavigationContainer(selectedContainer)) {
+        const navItem = getNavigationItemAnchor(target);
+        if (!navItem && (selectedContainer === target || selectedContainer.contains(target))) {
+          e.preventDefault();
+          e.stopPropagation();
+          return;
+        }
+      }
       if (activeElRef.current) {
         const sel = window.getSelection();
         if (sel && !sel.isCollapsed) {
@@ -7281,9 +8219,26 @@ function OhhwellsBridge() {
       deactivateRef.current();
     };
     const handleMouseOver = (e) => {
+      if (document.documentElement.hasAttribute("data-ohw-section-picking")) return;
       const target = e.target;
+      if (toolbarVariantRef.current !== "select-frame") {
+        const navContainer = target.closest("[data-ohw-nav-container]");
+        if (navContainer && !getNavigationItemAnchor(target)) {
+          hoveredNavContainerRef.current = navContainer;
+          setHoveredNavContainerRect(navContainer.getBoundingClientRect());
+          hoveredItemElRef.current = null;
+          setHoveredItemRect(null);
+          return;
+        }
+        if (!target.closest("[data-ohw-nav-container]")) {
+          hoveredNavContainerRef.current = null;
+          setHoveredNavContainerRect(null);
+        }
+      }
       const navAnchor = getNavigationItemAnchor(target);
       if (navAnchor) {
+        hoveredNavContainerRef.current = null;
+        setHoveredNavContainerRect(null);
         const selected2 = selectedElRef.current;
         if (selected2 === navAnchor || selected2?.contains(navAnchor)) return;
         clearHrefKeyHover(navAnchor);
@@ -7308,6 +8263,14 @@ function OhhwellsBridge() {
     };
     const handleMouseOut = (e) => {
       const target = e.target;
+      if (target.closest("[data-ohw-nav-container]")) {
+        const related2 = e.relatedTarget instanceof Element ? e.relatedTarget : null;
+        if (related2?.closest("[data-ohw-nav-container], [data-ohw-navbar-container-chrome], [data-ohw-navbar-add-button]")) {
+          return;
+        }
+        hoveredNavContainerRef.current = null;
+        setHoveredNavContainerRect(null);
+      }
       const navAnchor = getNavigationItemAnchor(target);
       if (navAnchor) {
         const related2 = e.relatedTarget instanceof Element ? e.relatedTarget : null;
@@ -7429,6 +8392,56 @@ function OhhwellsBridge() {
       }
       return smallest;
     };
+    const dismissImageHover = () => {
+      if (hoveredImageRef.current) {
+        hoveredImageRef.current = null;
+        hoveredImageHasTextOverlapRef.current = false;
+        resumeAnimTracks();
+        postToParentRef.current({ type: "ow:image-unhover" });
+      }
+    };
+    const probeNavigationHoverAt = (x, y) => {
+      if (toolbarVariantRef.current === "select-frame") {
+        hoveredNavContainerRef.current = null;
+        setHoveredNavContainerRect(null);
+        return;
+      }
+      const navContainer = document.querySelector("[data-ohw-nav-container]");
+      if (!navContainer) {
+        hoveredNavContainerRef.current = null;
+        setHoveredNavContainerRect(null);
+        return;
+      }
+      const containerRect = navContainer.getBoundingClientRect();
+      const overContainer = x >= containerRect.left && x <= containerRect.right && y >= containerRect.top && y <= containerRect.bottom;
+      if (!overContainer) {
+        hoveredNavContainerRef.current = null;
+        setHoveredNavContainerRect(null);
+        return;
+      }
+      const navItemHit = Array.from(
+        navContainer.querySelectorAll("[data-ohw-href-key]")
+      ).find((el) => {
+        if (!isNavigationItem(el) || isNavbarButton2(el)) return false;
+        const itemRect = el.getBoundingClientRect();
+        return x >= itemRect.left && x <= itemRect.right && y >= itemRect.top && y <= itemRect.bottom;
+      });
+      if (navItemHit) {
+        hoveredNavContainerRef.current = null;
+        setHoveredNavContainerRect(null);
+        const selected = selectedElRef.current;
+        if (selected !== navItemHit && !selected?.contains(navItemHit)) {
+          clearHrefKeyHover(navItemHit);
+          hoveredItemElRef.current = navItemHit;
+          setHoveredItemRect(navItemHit.getBoundingClientRect());
+        }
+        return;
+      }
+      hoveredNavContainerRef.current = navContainer;
+      setHoveredNavContainerRect(containerRect);
+      hoveredItemElRef.current = null;
+      setHoveredItemRect(null);
+    };
     const probeImageAt = (clientX, clientY, isDragOver = false, fromParentViewport = false) => {
       if (linkPopoverOpenRef.current) {
         if (hoveredImageRef.current) {
@@ -7437,18 +8450,22 @@ function OhhwellsBridge() {
           resumeAnimTracks();
           clearImageHover();
         }
+        dismissImageHover();
+        return;
+      }
+      const { x, y } = toProbeCoords(clientX, clientY, fromParentViewport);
+      if (isPointOverNavigation(x, y)) {
+        dismissImageHover();
+        probeNavigationHoverAt(x, y);
         return;
       }
+      hoveredNavContainerRef.current = null;
+      setHoveredNavContainerRect(null);
       const toggleEl = document.querySelector("[data-ohw-state-toggle]");
       if (toggleEl) {
-        const { x, y } = toProbeCoords(clientX, clientY, fromParentViewport);
         const tr = toggleEl.getBoundingClientRect();
         if (x >= tr.left && x <= tr.right && y >= tr.top && y <= tr.bottom) {
-          if (hoveredImageRef.current) {
-            hoveredImageRef.current = null;
-            resumeAnimTracks();
-            clearImageHover();
-          }
+          dismissImageHover();
           return;
         }
       }
@@ -7461,15 +8478,18 @@ function OhhwellsBridge() {
           resumeAnimTracks();
           clearImageHover();
         }
-        return;
+        if (activeElRef.current) {
+          dismissImageHover();
+          return;
+        }
       }
       if (imgEl) {
-        const { x, y } = toProbeCoords(clientX, clientY, fromParentViewport);
+        const { x: x2, y: y2 } = toProbeCoords(clientX, clientY, fromParentViewport);
         const overMediaChrome = Array.from(
           document.querySelectorAll("[data-ohw-media-chrome]")
         ).some((el) => {
           const r2 = el.getBoundingClientRect();
-          return x >= r2.left && x <= r2.right && y >= r2.top && y <= r2.bottom;
+          return x2 >= r2.left && x2 <= r2.right && y2 >= r2.top && y2 <= r2.bottom;
         });
         if (overMediaChrome) {
           if (hoveredImageRef.current) {
@@ -7480,7 +8500,7 @@ function OhhwellsBridge() {
           }
           return;
         }
-        const topEl = document.elementFromPoint(x, y);
+        const topEl = document.elementFromPoint(x2, y2);
         if (topEl?.closest('[data-ohw-toolbar], [data-ohw-edit-chrome], [data-ohw-item-interaction], [data-ohw-drag-handle-container], [data-slot="drag-handle"]')) {
           if (hoveredImageRef.current) {
             hoveredImageRef.current = null;
@@ -7503,7 +8523,7 @@ function OhhwellsBridge() {
           document.querySelectorAll(NON_MEDIA_SELECTOR)
         ).find((el) => {
           const er = el.getBoundingClientRect();
-          return x >= er.left && x <= er.right && y >= er.top && y <= er.bottom;
+          return x2 >= er.left && x2 <= er.right && y2 >= er.top && y2 <= er.bottom;
         });
         if (imageUnhoverTimerRef.current) {
           clearTimeout(imageUnhoverTimerRef.current);
@@ -7579,12 +8599,12 @@ function OhhwellsBridge() {
           resumeAnimTracks();
           clearImageHover();
         }
-        const { x, y } = toProbeCoords(clientX, clientY, fromParentViewport);
+        const { x: x2, y: y2 } = toProbeCoords(clientX, clientY, fromParentViewport);
         const textEl = Array.from(
           document.querySelectorAll(NON_MEDIA_SELECTOR)
         ).find((el) => {
           const er = el.getBoundingClientRect();
-          return x >= er.left && x <= er.right && y >= er.top && y <= er.bottom;
+          return x2 >= er.left && x2 <= er.right && y2 >= er.top && y2 <= er.bottom;
         });
         document.querySelectorAll("[data-ohw-hovered]").forEach((el) => el.removeAttribute("data-ohw-hovered"));
         if (textEl && !textEl.hasAttribute("contenteditable")) {
@@ -7608,6 +8628,14 @@ function OhhwellsBridge() {
       }
     };
     const probeHoverCardsAt = (clientX, clientY, fromParentViewport = false) => {
+      if (linkPopoverOpenRef.current || document.documentElement.hasAttribute("data-ohw-section-picking")) {
+        if (activeStateElRef.current) {
+          activeStateElRef.current.removeAttribute("data-ohw-state-hovered");
+          activeStateElRef.current = null;
+          setToggleState(null);
+        }
+        return;
+      }
       const { x, y } = toProbeCoords(clientX, clientY, fromParentViewport);
       const toggleEl = document.querySelector("[data-ohw-state-toggle]");
       if (toggleEl) {
@@ -7884,6 +8912,8 @@ function OhhwellsBridge() {
         sectionsLoadedRef.current = true;
         pendingScheduleConfigRequests.current.splice(0).forEach(processConfigRequest);
       }
+      editContentRef.current = { ...editContentRef.current, ...content };
+      reconcileNavbarItemsFromContent(editContentRef.current);
       enforceLinkHrefs();
       postToParentRef.current({ type: "ow:hydrate-done" });
     };
@@ -7891,6 +8921,7 @@ function OhhwellsBridge() {
     const handleDeactivate = (e) => {
       if (e.data?.type !== "ow:deactivate") return;
       if (Date.now() < linkPopoverGraceUntilRef.current) return;
+      if (document.querySelector("[data-ohw-section-picker]")) return;
       if (linkPopoverOpenRef.current) {
         setLinkPopoverRef.current(null);
         return;
@@ -7899,13 +8930,31 @@ function OhhwellsBridge() {
       deactivateRef.current();
     };
     window.addEventListener("message", handleDeactivate);
+    const handleUiEscape = (e) => {
+      if (e.data?.type !== "ui:escape") return;
+      if (linkPopoverOpenRef.current) {
+        setLinkPopoverRef.current(null);
+      }
+    };
+    window.addEventListener("message", handleUiEscape);
     const handleKeyDown = (e) => {
+      if (e.key === "Escape" && document.querySelector("[data-ohw-section-picker]")) return;
       if (e.key === "Escape" && linkPopoverOpenRef.current) {
         setLinkPopoverRef.current(null);
         return;
       }
       if (e.key === "Escape" && selectedElRef.current && !activeElRef.current) {
-        deselectRef.current();
+        if (toolbarVariantRef.current === "select-frame") {
+          deselectRef.current();
+          return;
+        }
+        const parent = getNavigationSelectionParent(selectedElRef.current);
+        if (parent) {
+          e.preventDefault();
+          selectFrameRef.current(parent);
+        } else {
+          deselectRef.current();
+        }
         return;
       }
       if (e.key === "Escape" && activeElRef.current) {
@@ -7963,6 +9012,9 @@ function OhhwellsBridge() {
       if (hoveredItemElRef.current) {
         setHoveredItemRect(hoveredItemElRef.current.getBoundingClientRect());
       }
+      if (hoveredNavContainerRef.current) {
+        setHoveredNavContainerRect(hoveredNavContainerRef.current.getBoundingClientRect());
+      }
       if (siblingHintElRef.current) {
         setSiblingHintRect(siblingHintElRef.current.getBoundingClientRect());
       }
@@ -8159,9 +9211,45 @@ function OhhwellsBridge() {
         return clientX >= r2.left && clientX <= r2.right && clientY >= r2.top && clientY <= r2.bottom;
       });
       if (textEditable) {
-        activateRef.current(textEditable);
+        const hrefCtx = getHrefKeyFromElement(textEditable);
+        const navAnchor = hrefCtx ? getNavigationItemAnchor(hrefCtx.anchor) : null;
+        if (navAnchor) {
+          if (selectedElRef.current === navAnchor) {
+            activateRef.current(textEditable, { caretX: clientX, caretY: clientY });
+          } else {
+            selectRef.current(navAnchor);
+          }
+          return;
+        }
+        activateRef.current(textEditable, { caretX: clientX, caretY: clientY });
         return;
       }
+      const navContainer = document.querySelector("[data-ohw-nav-container]");
+      if (navContainer) {
+        const r2 = navContainer.getBoundingClientRect();
+        const pad = 8;
+        const over = clientX >= r2.left - pad && clientX <= r2.right + pad && clientY >= r2.top - pad && clientY <= r2.bottom + pad;
+        if (over && !isPointOverNavItem(navContainer, clientX, clientY)) {
+          selectFrameRef.current(navContainer);
+          return;
+        }
+      }
+      const navRoot = document.querySelector("[data-ohw-nav-root]");
+      if (navRoot && navContainer) {
+        const rr = navRoot.getBoundingClientRect();
+        if (clientX >= rr.left && clientX <= rr.right && clientY >= rr.top && clientY <= rr.bottom && !isPointOverNavItem(navContainer, clientX, clientY)) {
+          const book = navRoot.querySelector('[data-ohw-role="navbar-button"]');
+          if (book) {
+            const br = book.getBoundingClientRect();
+            if (clientX >= br.left && clientX <= br.right && clientY >= br.top && clientY <= br.bottom) {
+              deactivateRef.current();
+              return;
+            }
+          }
+          selectFrameRef.current(navContainer);
+          return;
+        }
+      }
       deactivateRef.current();
     };
     window.addEventListener("message", handleSave);
@@ -8224,13 +9312,14 @@ function OhhwellsBridge() {
       window.removeEventListener("message", handleClickAt);
       window.removeEventListener("message", handleHydrate);
       window.removeEventListener("message", handleDeactivate);
+      window.removeEventListener("message", handleUiEscape);
       autoSaveTimers.current.forEach(clearTimeout);
       autoSaveTimers.current.clear();
       if (imageUnhoverTimerRef.current) clearTimeout(imageUnhoverTimerRef.current);
       if (imageShowTimerRef.current) clearTimeout(imageShowTimerRef.current);
     };
   }, [isEditMode, refreshStateRules]);
-  useEffect4(() => {
+  useEffect7(() => {
     const handler = (e) => {
       if (e.data?.type !== "ow:request-schedule-config") return;
       const insertAfterVal = e.data.insertAfter;
@@ -8246,7 +9335,7 @@ function OhhwellsBridge() {
     window.addEventListener("message", handler);
     return () => window.removeEventListener("message", handler);
   }, [processConfigRequest]);
-  useEffect4(() => {
+  useEffect7(() => {
     if (!isEditMode) return;
     document.querySelectorAll("[data-ohw-active-state]").forEach((el) => {
       el.removeAttribute("data-ohw-active-state");
@@ -8267,27 +9356,27 @@ function OhhwellsBridge() {
         const next = { ...prev, [pathKey]: sections };
         return shouldUseDevFixtures() ? { ...DEV_SECTIONS_BY_PATH, ...next } : next;
       });
-      postToParent({ type: "ow:ready", version: "1", path: pathname, nodes: collectEditableNodes(), sections });
-      postToParent({ type: "ow:request-site-pages" });
+      postToParent2({ type: "ow:ready", version: "1", path: pathname, nodes: collectEditableNodes(), sections });
+      postToParent2({ type: "ow:request-site-pages" });
     }, 150);
     return () => {
       cancelAnimationFrame(raf);
       clearTimeout(timer);
     };
-  }, [pathname, isEditMode, refreshStateRules, postToParent]);
-  useEffect4(() => {
+  }, [pathname, isEditMode, refreshStateRules, postToParent2]);
+  useEffect7(() => {
     scrollToHashSectionWhenReady();
     const onHashChange = () => scrollToHashSectionWhenReady();
     window.addEventListener("hashchange", onHashChange);
     return () => window.removeEventListener("hashchange", onHashChange);
   }, [pathname]);
-  const handleCommand = useCallback2((cmd) => {
+  const handleCommand = useCallback3((cmd) => {
     document.execCommand(cmd, false);
     activeElRef.current?.focus();
     if (activeElRef.current) setToolbarRect(getEditMeasureEl(activeElRef.current).getBoundingClientRect());
     refreshActiveCommandsRef.current();
   }, []);
-  const handleStateChange = useCallback2((state) => {
+  const handleStateChange = useCallback3((state) => {
     if (!activeStateElRef.current) return;
     const el = activeStateElRef.current;
     if (state === "Default") {
@@ -8300,18 +9389,22 @@ function OhhwellsBridge() {
     }
     setToggleState((prev) => prev ? { ...prev, activeState: state } : null);
   }, [deactivate]);
-  const closeLinkPopover = useCallback2(() => setLinkPopover(null), []);
-  const openLinkPopoverForActive = useCallback2(() => {
+  const closeLinkPopover = useCallback3(() => {
+    addNavAfterAnchorRef.current = null;
+    setLinkPopover(null);
+  }, []);
+  const openLinkPopoverForActive = useCallback3(() => {
     const hrefCtx = getHrefKeyFromElement(activeElRef.current);
     if (!hrefCtx) return;
     bumpLinkPopoverGrace();
     setLinkPopover({
       key: hrefCtx.key,
-      target: getLinkHref(hrefCtx.anchor)
+      mode: "edit",
+      target: getLinkHref2(hrefCtx.anchor)
     });
     deactivate();
   }, [deactivate]);
-  const openLinkPopoverForSelected = useCallback2(() => {
+  const openLinkPopoverForSelected = useCallback3(() => {
     const anchor = selectedElRef.current;
     if (!anchor) return;
     const key = anchor.getAttribute("data-ohw-href-key");
@@ -8319,30 +9412,77 @@ function OhhwellsBridge() {
     bumpLinkPopoverGrace();
     setLinkPopover({
       key,
-      target: getLinkHref(anchor)
+      mode: "edit",
+      target: getLinkHref2(anchor)
     });
     deselect();
   }, [deselect]);
-  const handleLinkPopoverSubmit = useCallback2(
+  const handleLinkPopoverSubmit = useCallback3(
     (target) => {
-      if (!linkPopover) return;
-      const { key } = linkPopover;
+      const session = linkPopoverSessionRef.current;
+      if (!session) return;
+      if (session.intent === "add-nav") {
+        const trimmed = target.trim();
+        let href = trimmed;
+        let label = "Untitled";
+        if (trimmed) {
+          const { pageRoute, sectionId } = parseTarget(trimmed);
+          const page = resolvePage(pageRoute, sitePages);
+          const pageSections = getSectionsForPath(sectionsByPath, pageRoute);
+          const section = sectionId ? pageSections.find((s) => s.id === sectionId) : void 0;
+          label = section?.label ?? page.title;
+          href = trimmed;
+        }
+        const afterAnchor = addNavAfterAnchorRef.current;
+        const { anchor, hrefKey, labelKey, index, order } = insertNavbarItem(href, label, afterAnchor);
+        applyLinkByKey(hrefKey, href);
+        document.querySelectorAll(`[data-ohw-key="${labelKey}"]`).forEach((el) => {
+          el.textContent = label;
+        });
+        const navCount = String(index + 1);
+        const orderJson = JSON.stringify(order);
+        editContentRef.current = {
+          ...editContentRef.current,
+          [hrefKey]: href,
+          [labelKey]: label,
+          [NAV_COUNT_KEY]: navCount,
+          [NAV_ORDER_KEY]: orderJson
+        };
+        postToParent2({
+          type: "ow:change",
+          nodes: [
+            { key: hrefKey, text: href },
+            { key: labelKey, text: label },
+            { key: NAV_COUNT_KEY, text: navCount },
+            { key: NAV_ORDER_KEY, text: orderJson }
+          ]
+        });
+        postToParent2({ type: "ow:toast", title: "Link added", toastType: "success" });
+        addNavAfterAnchorRef.current = null;
+        setLinkPopover(null);
+        enforceLinkHrefs();
+        requestAnimationFrame(() => {
+          selectRef.current(anchor);
+        });
+        return;
+      }
+      const { key } = session;
       applyLinkByKey(key, target);
-      postToParent({ type: "ow:change", nodes: [{ key, text: target }] });
+      postToParent2({ type: "ow:change", nodes: [{ key, text: target }] });
       setLinkPopover(null);
     },
-    [linkPopover, postToParent]
+    [postToParent2, sitePages, sectionsByPath]
   );
   const showEditLink = toolbarShowEditLink;
   const currentSections = sectionsByPath[pathname] ?? [];
   linkPopoverOpenRef.current = linkPopover !== null;
-  const handleMediaReplace = useCallback2(
+  const handleMediaReplace = useCallback3(
     (key) => {
-      postToParent({ type: "ow:image-pick", key, elementType: mediaHover?.elementType ?? "image" });
+      postToParent2({ type: "ow:image-pick", key, elementType: mediaHover?.elementType ?? "image" });
     },
-    [postToParent, mediaHover?.elementType]
+    [postToParent2, mediaHover?.elementType]
   );
-  const handleMediaFadeOutComplete = useCallback2((key) => {
+  const handleMediaFadeOutComplete = useCallback3((key) => {
     setUploadingRects((prev) => {
       if (!(key in prev)) return prev;
       const next = { ...prev };
@@ -8350,7 +9490,7 @@ function OhhwellsBridge() {
       return next;
     });
   }, []);
-  const handleVideoSettingsChange = useCallback2(
+  const handleVideoSettingsChange = useCallback3(
     (key, settings) => {
       document.querySelectorAll(`[data-ohw-key="${key}"]`).forEach((el) => {
         const video = getVideoEl(el);
@@ -8358,7 +9498,7 @@ function OhhwellsBridge() {
         if (typeof settings.autoplay === "boolean") video.autoplay = settings.autoplay;
         if (typeof settings.muted === "boolean") video.muted = settings.muted;
         syncVideoPlayback(video);
-        postToParent({
+        postToParent2({
           type: "ow:change",
           nodes: [
             { key: `${key}${VIDEO_AUTOPLAY_SUFFIX}`, text: String(video.autoplay) },
@@ -8370,12 +9510,12 @@ function OhhwellsBridge() {
         );
       });
     },
-    [postToParent]
+    [postToParent2]
   );
-  return bridgeRoot ? createPortal(
-    /* @__PURE__ */ jsxs12(Fragment4, { children: [
-      /* @__PURE__ */ jsx22("div", { ref: attachVisibleViewport, "data-ohw-visible-viewport": "", "aria-hidden": true }),
-      Object.entries(uploadingRects).map(([key, { rect, fadingOut }]) => /* @__PURE__ */ jsx22(
+  return bridgeRoot ? createPortal2(
+    /* @__PURE__ */ jsxs13(Fragment5, { children: [
+      /* @__PURE__ */ jsx23("div", { ref: attachVisibleViewport, "data-ohw-visible-viewport": "", "aria-hidden": true }),
+      Object.entries(uploadingRects).map(([key, { rect, fadingOut }]) => /* @__PURE__ */ jsx23(
         MediaOverlay,
         {
           hover: { key, rect, elementType: "image", isDragOver: false, hasTextOverlap: false },
@@ -8386,7 +9526,7 @@ function OhhwellsBridge() {
         },
         `uploading-${key}`
       )),
-      mediaHover && !(mediaHover.key in uploadingRects) && /* @__PURE__ */ jsx22(
+      mediaHover && !(mediaHover.key in uploadingRects) && /* @__PURE__ */ jsx23(
         MediaOverlay,
         {
           hover: mediaHover,
@@ -8395,31 +9535,40 @@ function OhhwellsBridge() {
           onVideoSettingsChange: handleVideoSettingsChange
         }
       ),
-      siblingHintRect && !isItemDragging && /* @__PURE__ */ jsx22(ItemInteractionLayer, { rect: siblingHintRect, state: "sibling-hint" }),
-      hoveredItemRect && !siblingHintRect && !isItemDragging && hoveredItemElRef.current !== selectedElRef.current && /* @__PURE__ */ jsx22(ItemInteractionLayer, { rect: hoveredItemRect, state: "hover" }),
-      toolbarRect && toolbarVariant === "link-action" && /* @__PURE__ */ jsx22(
+      siblingHintRect && !isItemDragging && /* @__PURE__ */ jsx23(ItemInteractionLayer, { rect: siblingHintRect, state: "sibling-hint" }),
+      hoveredNavContainerRect && toolbarVariant !== "select-frame" && !linkPopover && !isItemDragging && !siblingHintRect && /* @__PURE__ */ jsx23(ItemInteractionLayer, { rect: hoveredNavContainerRect, state: "hover" }),
+      toolbarVariant === "select-frame" && toolbarRect && !linkPopover && !isItemDragging && /* @__PURE__ */ jsx23(
+        NavbarContainerChrome,
+        {
+          rect: toolbarRect,
+          onAdd: handleAddTopLevelNavItem
+        }
+      ),
+      hoveredItemRect && !hoveredNavContainerRect && !siblingHintRect && !isItemDragging && hoveredItemElRef.current !== selectedElRef.current && /* @__PURE__ */ jsx23(ItemInteractionLayer, { rect: hoveredItemRect, state: "hover" }),
+      toolbarRect && (toolbarVariant === "link-action" || toolbarVariant === "select-frame") && /* @__PURE__ */ jsx23(
         ItemInteractionLayer,
         {
           rect: toolbarRect,
           elRef: glowElRef,
           state: isItemDragging ? "dragging" : resolveItemInteractionState(toolbarRect, parentScrollRef.current),
-          showHandle: Boolean(reorderHrefKey),
+          showHandle: toolbarVariant === "link-action" && Boolean(reorderHrefKey),
           dragDisabled: reorderDragDisabled,
           dragHandleLabel: reorderHrefKey ? `Reorder ${reorderHrefKey}` : "Reorder item",
           onDragHandleDragStart: handleItemDragStart,
           onDragHandleDragEnd: handleItemDragEnd,
-          toolbar: isItemDragging ? void 0 : /* @__PURE__ */ jsx22(
+          toolbar: toolbarVariant === "link-action" && !isItemDragging ? /* @__PURE__ */ jsx23(
             ItemActionToolbar,
             {
               onEditLink: openLinkPopoverForSelected,
-              onAddItem: handleAddNavigationItem,
-              addItemDisabled: false
+              addItemDisabled: true,
+              editLinkDisabled: false,
+              moreDisabled: true
             }
-          )
+          ) : void 0
         }
       ),
-      toolbarRect && toolbarVariant === "rich-text" && /* @__PURE__ */ jsxs12(Fragment4, { children: [
-        /* @__PURE__ */ jsx22(
+      toolbarRect && toolbarVariant === "rich-text" && /* @__PURE__ */ jsxs13(Fragment5, { children: [
+        /* @__PURE__ */ jsx23(
           EditGlowChrome,
           {
             rect: toolbarRect,
@@ -8428,7 +9577,7 @@ function OhhwellsBridge() {
             dragDisabled: reorderDragDisabled
           }
         ),
-        /* @__PURE__ */ jsx22(
+        /* @__PURE__ */ jsx23(
           FloatingToolbar,
           {
             rect: toolbarRect,
@@ -8441,7 +9590,7 @@ function OhhwellsBridge() {
           }
         )
       ] }),
-      maxBadge && /* @__PURE__ */ jsxs12(
+      maxBadge && /* @__PURE__ */ jsxs13(
         "div",
         {
           "data-ohw-max-badge": "",
@@ -8467,7 +9616,7 @@ function OhhwellsBridge() {
           ]
         }
       ),
-      toggleState && /* @__PURE__ */ jsx22(
+      toggleState && !linkPopover && /* @__PURE__ */ jsx23(
         StateToggle,
         {
           rect: toggleState.rect,
@@ -8476,15 +9625,15 @@ function OhhwellsBridge() {
           onStateChange: handleStateChange
         }
       ),
-      sectionGap && /* @__PURE__ */ jsxs12(
+      sectionGap && !linkPopover && /* @__PURE__ */ jsxs13(
         "div",
         {
           "data-ohw-section-insert-line": "",
           className: "fixed left-0 w-full z-2147483646 flex items-center pointer-events-none",
           style: { top: sectionGap.y, transform: "translateY(-50%)" },
           children: [
-            /* @__PURE__ */ jsx22("div", { className: "flex-1 bg-primary", style: { height: 3 } }),
-            /* @__PURE__ */ jsx22(
+            /* @__PURE__ */ jsx23("div", { className: "flex-1 bg-primary", style: { height: 3 } }),
+            /* @__PURE__ */ jsx23(
               Badge,
               {
                 className: "px-8 py-1 bg-primary hover:bg-primary text-primary-foreground text-xs font-medium shrink-0 rounded-full cursor-pointer pointer-events-auto",
@@ -8497,25 +9646,26 @@ function OhhwellsBridge() {
                 children: "Add Section"
               }
             ),
-            /* @__PURE__ */ jsx22("div", { className: "flex-1 bg-primary", style: { height: 3 } })
+            /* @__PURE__ */ jsx23("div", { className: "flex-1 bg-primary", style: { height: 3 } })
           ]
         }
       ),
-      linkPopover && dialogPortalContainer ? /* @__PURE__ */ jsx22(
+      linkPopover && dialogPortalContainer ? /* @__PURE__ */ jsx23(
         LinkPopover,
         {
           panelRef: linkPopoverPanelRef,
           portalContainer: dialogPortalContainer,
           open: true,
-          mode: "edit",
+          mode: linkPopover.mode ?? "edit",
           pages: sitePages,
           sections: currentSections,
           sectionsByPath,
           initialTarget: linkPopover.target,
+          existingTargets: linkPopover.intent === "add-nav" ? getNavbarExistingTargets() : [],
           onClose: closeLinkPopover,
           onSubmit: handleLinkPopoverSubmit
         },
-        `${linkPopover.key}-${pathname}`
+        linkPopover.key
       ) : null
     ] }),
     bridgeRoot